[SCM] Civilization turn-based strategy game branch, upstream, updated. upstream/2.1.9-1-gfc1f4a5
Karl Goetz
karl.goetz at kgoetz.id.au
Fri Nov 27 04:38:14 UTC 2009
The following commit has been merged in the upstream branch:
commit fc1f4a563c5a6549422f3519ef47c344023b5186
Author: Karl Goetz <karl at kgoetz.id.au>
Date: Wed Nov 25 19:58:17 2009 +1030
Imported Upstream version 2.1.10
diff --git a/ChangeLog b/ChangeLog
index 1f9b065..c6d736c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,98 +1,1638 @@
+------------------------------------------------------------------------
+r16407 | dmarks | 2009-11-22 19:33:41 +0100 (Sun, 22 Nov 2009) | 1 line
+Changed paths:
+ M /branches/S2_1/ChangeLog
+
+fix contributor name mistake in changelog
+------------------------------------------------------------------------
+r16406 | dmarks | 2009-11-22 16:29:44 +0100 (Sun, 22 Nov 2009) | 1 line
+Changed paths:
+ M /branches/S2_1/ChangeLog
+
+more verbose changelog for changes since 2.1.8
+------------------------------------------------------------------------
+r16405 | dmarks | 2009-11-22 13:52:35 +0100 (Sun, 22 Nov 2009) | 1 line
+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
+
+changes after running 'make update-po'
+------------------------------------------------------------------------
+r16404 | cazfi | 2009-11-22 10:21:07 +0100 (Sun, 22 Nov 2009) | 6 lines
+Changed paths:
+ M /branches/S2_1/client/gui-gtk-2.0/repodlgs.c
+
+Fixed clicking of technologies on research report.
+
+Reported by Ann (kudra), patch by Pepeto
+
+See gna bug #14812
+
+------------------------------------------------------------------------
+r16401 | cazfi | 2009-11-21 20:05:46 +0100 (Sat, 21 Nov 2009) | 6 lines
+Changed paths:
+ M /branches/S2_1/server/savegame.c
+
+Fixed loading of old savegames
+
+Patch by Pepeto
+
+See gna bug #14805
+
+------------------------------------------------------------------------
+r16392 | jcreus | 2009-11-20 23:45:41 +0100 (Fri, 20 Nov 2009) | 1 line
+Changed paths:
+ M /branches/S2_1/po/ca.po
+
+more last touches
+------------------------------------------------------------------------
+r16391 | jcreus | 2009-11-20 23:33:10 +0100 (Fri, 20 Nov 2009) | 1 line
+Changed paths:
+ M /branches/S2_1/po/ca.po
+
+last touches
+------------------------------------------------------------------------
+r16390 | cazfi | 2009-11-20 13:55:30 +0100 (Fri, 20 Nov 2009) | 6 lines
+Changed paths:
+ M /branches/S2_1/server/savegame.c
+
+Save missing server settings to the savegame.
+
+Patch by Matthias Pfafferodt
+
+See gna bug #14306
+
+------------------------------------------------------------------------
+r16387 | cazfi | 2009-11-20 11:00:00 +0100 (Fri, 20 Nov 2009) | 6 lines
+Changed paths:
+ M /branches/S2_1/m4/sound.m4
+
+Use linking flags given by 'sdl-config --libs' when detecting SDL_mixer.
+
+Patch by George Koehler
+
+See gna bug #14751
+
+------------------------------------------------------------------------
+r16384 | cazfi | 2009-11-20 10:49:50 +0100 (Fri, 20 Nov 2009) | 7 lines
+Changed paths:
+ M /branches/S2_1/client/connectdlg_common.c
+ M /branches/S2_1/client/connectdlg_common.h
+ M /branches/S2_1/client/gui-win32/connectdlg.c
+
+Renamed current_filename as fc_current_filename to avoid namespace
+conflicts.
+
+Originally reported by George Koehler in gna bug #14751
+
+Patch from gna bug #14793
+
+------------------------------------------------------------------------
+r16381 | cazfi | 2009-11-18 16:52:20 +0100 (Wed, 18 Nov 2009) | 6 lines
+Changed paths:
+ M /branches/S2_1/configure.ac
+
+Added support for Haiku
+
+Requested by begasus at skynet.be
+
+See gna bug #14715
+
+------------------------------------------------------------------------
+r16372 | pepeto | 2009-11-17 14:40:07 +0100 (Tue, 17 Nov 2009) | 7 lines
+Changed paths:
+ M /branches/S2_1/client/citydlg_common.c
+
+Display trade route lines at map and infos in city dialog even if the trade
+route doesn't give trade bonus.
+
+Reported by freeciv at tech.geek.nz
+
+See gna bug #14745
+
+------------------------------------------------------------------------
+r16368 | dmarks | 2009-11-15 13:18:36 +0100 (Sun, 15 Nov 2009) | 1 line
+Changed paths:
+ M /branches/S2_1/po/da.po
+
+Updated Danish localization, 4358 translated messages, by Joe Dalton <joedalton2 at yahoo.dk>
+------------------------------------------------------------------------
+r16366 | jcreus | 2009-11-14 22:32:41 +0100 (Sat, 14 Nov 2009) | 1 line
+Changed paths:
+ M /branches/S2_1/po/ca.po
+
+4358 translated messages
+------------------------------------------------------------------------
+r16365 | pepeto | 2009-11-14 12:15:14 +0100 (Sat, 14 Nov 2009) | 6 lines
+Changed paths:
+ M /branches/S2_1/bootstrap/freeciv-server.desktop.in
+ M /branches/S2_1/bootstrap/freeciv.desktop.in
+
+Freeciv desktop files cleanup.
+
+Patch by Egor Vyscrebentsov (evyscr)
+
+See gna bug #14749
+
+------------------------------------------------------------------------
+r16310 | pepeto | 2009-11-04 15:12:20 +0100 (Wed, 04 Nov 2009) | 6 lines
+Changed paths:
+ M /branches/S2_1/server/savegame.c
+
+Loading a scenario begins at turn 0 and not -2.
+
+Reported by kinetic
+
+See gna bug #14658
+
+------------------------------------------------------------------------
+r16296 | pepeto | 2009-11-03 00:16:11 +0100 (Tue, 03 Nov 2009) | 8 lines
+Changed paths:
+ M /branches/S2_1/client/clinet.c
+
+When receiving many packet from the server in the same time, freeze the
+reports and the agents. Anyway, in a such case, the user cannot issue orders
+at this moment, nor really inspecting the reports.
+
+Requested by Goswin von Brederlow for adding multiple settlers under CMA.
+
+See gna bug #14617
+
+------------------------------------------------------------------------
+r16293 | pepeto | 2009-11-03 00:10:15 +0100 (Tue, 03 Nov 2009) | 6 lines
+Changed paths:
+ M /branches/S2_1/client/gui-gtk-2.0/messagewin.c
+ M /branches/S2_1/client/messagewin_common.c
+
+Avoid crash when clicking a message in turn change.
+
+Reported by mity
+
+See gna bug #14652
+
+------------------------------------------------------------------------
+r16280 | pepeto | 2009-10-31 13:00:47 +0100 (Sat, 31 Oct 2009) | 7 lines
+Changed paths:
+ M /branches/S2_1/server/stdinhand.c
+
+Use get_tokens() in /set command instead of my_isalnum(), because it was cutting
+the UTF8 strings. Consider '=' as a delimiter in this function.
+
+Reported by Christian Knoke (chrisk)
+
+See gna bug #13500
+
+------------------------------------------------------------------------
+r16273 | pepeto | 2009-10-30 10:42:27 +0100 (Fri, 30 Oct 2009) | 4 lines
+Changed paths:
+ M /branches/S2_1/server/sernet.c
+
+Get server control back when autogame is over.
+
+See gna bug #14641
+
+------------------------------------------------------------------------
+r16270 | pepeto | 2009-10-30 10:38:45 +0100 (Fri, 30 Oct 2009) | 10 lines
+Changed paths:
+ M /branches/S2_1/server/srv_main.c
+
+When saving a game:
+* A dot in the path is not considered as an extension.
+* A dot at the start of the filename is not considered as an extension.
+* If you give a path without filename, the game will be saved in this path
+with a generated filename.
+
+Reported by Alvaro Rodriguez
+
+See gna bug #14603
+
+------------------------------------------------------------------------
+r16267 | pepeto | 2009-10-30 10:34:01 +0100 (Fri, 30 Oct 2009) | 4 lines
+Changed paths:
+ M /branches/S2_1/doc/man/civserver.6
+
+Documents the --identity server parameter in the man page.
+
+See gna bug #14631
+
+------------------------------------------------------------------------
+r16258 | pepeto | 2009-10-29 12:01:32 +0100 (Thu, 29 Oct 2009) | 5 lines
+Changed paths:
+ M /branches/S2_1/client/packhand.c
+
+Caravans arriving in a city from a transport don't popup if we are sure the
+transporter is still moving.
+
+See gna bug #14606
+
+------------------------------------------------------------------------
+r16233 | cazfi | 2009-10-27 08:52:54 +0100 (Tue, 27 Oct 2009) | 7 lines
+Changed paths:
+ M /branches/S2_1/client/repodlgs_common.c
+ M /branches/S2_1/common/packets.def
+ M /branches/S2_1/common/packets_gen.c
+ M /branches/S2_1/common/packets_gen.h
+ M /branches/S2_1/server/stdinhand.c
+ M /branches/S2_1/version.in
+
+Do not override server settings loaded from saved game with
+client preferences.
+
+Reported by Christian Knoke
+
+See gna bug #13465
+
+------------------------------------------------------------------------
+r16222 | pepeto | 2009-10-26 12:54:35 +0100 (Mon, 26 Oct 2009) | 4 lines
+Changed paths:
+ M /branches/S2_1/client/packhand.c
+
+Updates the map canvas when a new traderoute is established.
+
+See gna bug #14597
+
+------------------------------------------------------------------------
+r16215 | pepeto | 2009-10-26 12:36:27 +0100 (Mon, 26 Oct 2009) | 4 lines
+Changed paths:
+ M /branches/S2_1/client/packhand.c
+
+Update the full citybar when the occupied status of a foreigner city changes.
+
+See gna bug #14596
+
+------------------------------------------------------------------------
+r16192 | pepeto | 2009-10-24 00:30:51 +0200 (Sat, 24 Oct 2009) | 6 lines
+Changed paths:
+ M /branches/S2_1/client/gui-gtk-2.0/gui_stuff.c
+
+Removed gtk critical message:
+gtk_tree_view_set_cursor_on_cell: assertion `tree_view->priv->tree != NULL'
+failed
+
+See gna bug #14563
+
+------------------------------------------------------------------------
+r16177 | pepeto | 2009-10-22 21:46:03 +0200 (Thu, 22 Oct 2009) | 6 lines
+Changed paths:
+ M /branches/S2_1/common/unit.c
+
+Diplomats can establish embassies, even if Marco Polo's Embassy is built.
+
+Originally reported by Ann (kudra)
+
+See gna bug #14548
+
+------------------------------------------------------------------------
+r16164 | pepeto | 2009-10-20 21:32:06 +0200 (Tue, 20 Oct 2009) | 7 lines
+Changed paths:
+ M /branches/S2_1/ai/aiexplorer.c
+
+Consider that AI explorers moved when they changed tile instead of if their
+moves decreased (could be wrong on railroads for example).
+
+Reported by Ann (kudra)
+
+See gna bug #14533
+
+------------------------------------------------------------------------
+r16153 | pepeto | 2009-10-19 00:14:30 +0200 (Mon, 19 Oct 2009) | 6 lines
+Changed paths:
+ M /branches/S2_1/server/maphand.c
+
+Do not bounce units on empty enemy cities on terrain changes.
+
+Reported by spikethehobbitmage _at_ excite _dot_ com
+
+See gna bug #14532
+
+------------------------------------------------------------------------
+r16148 | pepeto | 2009-10-19 00:05:37 +0200 (Mon, 19 Oct 2009) | 7 lines
+Changed paths:
+ M /branches/S2_1/server/stdinhand.c
+
+Detach all connections when loading a game (don't forget global observers).
+It was causing client crashes.
+
+Reported by Jordi Negrevernis i Font (jorneg)
+
+See gna bug #14542
+
+------------------------------------------------------------------------
+r16145 | pepeto | 2009-10-17 13:40:54 +0200 (Sat, 17 Oct 2009) | 7 lines
+Changed paths:
+ M /branches/S2_1/server/maphand.c
+
+Giving shared vision really reveal tiles and units which are in your city view
+range but still unknown, causing crash on client side.
+
+Reported by Ann (kudra)
+
+See gna bug #14275
+
+------------------------------------------------------------------------
+r16138 | pepeto | 2009-10-15 19:44:53 +0200 (Thu, 15 Oct 2009) | 4 lines
+Changed paths:
+ M /branches/S2_1/server/stdinhand.c
+
+Send player info after the usage of the /away command.
+
+See gna bug #14455
+
+------------------------------------------------------------------------
+r16133 | pepeto | 2009-10-15 19:34:21 +0200 (Thu, 15 Oct 2009) | 4 lines
+Changed paths:
+ M /branches/S2_1/server/unithand.c
+
+Removed send_unit_info duplication.
+
+See gna bug #14510
+
+------------------------------------------------------------------------
+r16130 | cazfi | 2009-10-15 08:02:28 +0200 (Thu, 15 Oct 2009) | 2 lines
+Changed paths:
+ M /branches/S2_1/po/es.po
+
+Updated translation by Jordi Negrevernis i Font
+
+------------------------------------------------------------------------
+r16128 | pepeto | 2009-10-13 21:07:42 +0200 (Tue, 13 Oct 2009) | 4 lines
+Changed paths:
+ M /branches/S2_1/server/srv_main.c
+
+Don't send attribute block to observers.
+
+See gna bug #14499
+
+------------------------------------------------------------------------
+r16123 | pepeto | 2009-10-13 20:50:19 +0200 (Tue, 13 Oct 2009) | 7 lines
+Changed paths:
+ M /branches/S2_1/client/gui-gtk-2.0/diplodlg.c
+ M /branches/S2_1/client/gui-sdl/diplodlg.c
+ M /branches/S2_1/common/diptreaty.c
+ M /branches/S2_1/server/diplhand.c
+
+Establishing embassies is always possible in the diplomacy meetings, even if
+the Marco Polo Embassy is built.
+
+Reported by Ann (kudra)
+
+See gna bug #14448
+
+------------------------------------------------------------------------
+r16120 | pepeto | 2009-10-13 20:44:47 +0200 (Tue, 13 Oct 2009) | 6 lines
+Changed paths:
+ M /branches/S2_1/ai/advdiplomacy.c
+
+AI players accept when trying to ally them, but previously allied with an enemy.
+
+Reported by Ann (kudra)
+
+See gna bug #14151
+
+------------------------------------------------------------------------
+r16117 | pepeto | 2009-10-13 20:37:47 +0200 (Tue, 13 Oct 2009) | 7 lines
+Changed paths:
+ M /branches/S2_1/client/gui-gtk-2.0/gui_main.c
+ M /branches/S2_1/client/gui-gtk-2.0/pages.c
+
+In the gtk-2.0 client, make the game page scrollable for small screens. Also
+maximilize that page and get normal size else.
+
+Reported by Ann (kudra)
+
+See gna bug #14100
+
+------------------------------------------------------------------------
+r16108 | pepeto | 2009-10-12 00:24:36 +0200 (Mon, 12 Oct 2009) | 7 lines
+Changed paths:
+ M /branches/S2_1/server/unithand.c
+
+When transfering unit from a player to another, the unit info is sent
+immediately to all players.
+
+Reported by Jordi Negrevernis i Font (jorneg)
+
+See gna patch #1328
+
+------------------------------------------------------------------------
+r16099 | pepeto | 2009-10-11 23:56:58 +0200 (Sun, 11 Oct 2009) | 7 lines
+Changed paths:
+ M /branches/S2_1/server/maphand.c
+
+Sharing vision when the fog of war is disabled don't let black square over
+vision giver units.
+
+Reported by Jere Toivanen and probably Ann (kudra)
+
+See gna bug #14275
+
+------------------------------------------------------------------------
+r16052 | pepeto | 2009-10-05 23:16:00 +0200 (Mon, 05 Oct 2009) | 6 lines
+Changed paths:
+ M /branches/S2_1/server/savegame.c
+
+Consider S_S_OVER as savegame server state.
+
+Patch by Matthias Pfafferodt (syntron)
+
+See gna bug #14305
+
+------------------------------------------------------------------------
+r16049 | pepeto | 2009-10-05 23:11:32 +0200 (Mon, 05 Oct 2009) | 7 lines
+Changed paths:
+ M /branches/S2_1/server/srv_main.c
+
+The loss of the last human player doesn't transform the game into an autogame,
+causing the clients freezing.
+
+Reported by Hendrik Maryns (hamaryns)
+
+See gna bug #14036
+
+------------------------------------------------------------------------
+r16038 | pepeto | 2009-10-03 19:03:52 +0200 (Sat, 03 Oct 2009) | 6 lines
+Changed paths:
+ M /branches/S2_1/server/scripting/api.pkg
+ M /branches/S2_1/server/scripting/api_gen.c
+ M /branches/S2_1/server/scripting/api_gen.h
+
+Make notify.all and notify.player working in lua scripts.
+
+Reported by matz
+
+See gna bug #14221
+
+------------------------------------------------------------------------
+r16035 | pepeto | 2009-10-03 00:54:27 +0200 (Sat, 03 Oct 2009) | 4 lines
+Changed paths:
+ M /branches/S2_1/server/commands.c
+ M /branches/S2_1/server/commands.h
+ M /branches/S2_1/server/stdinhand.c
+
+Added /cancelvote command, ported from Warclient.
+
+See gna patch #1292
+
+------------------------------------------------------------------------
+r16014 | pepeto | 2009-09-29 23:43:08 +0200 (Tue, 29 Sep 2009) | 4 lines
+Changed paths:
+ M /branches/S2_1/common/aicore/path_finding.c
+
+Do not set to 0 values allocated with fc_calloc() in pf_*_node_init().
+
+See gna patch #1318
+
+------------------------------------------------------------------------
+r16011 | pepeto | 2009-09-29 23:35:29 +0200 (Tue, 29 Sep 2009) | 7 lines
+Changed paths:
+ M /branches/S2_1/data/default/cities.ruleset
+
+Really use amplio electric ages sprites for cities. Use modern style as
+alternative for other tilesets.
+
+Patch by Jacob Nevins <jtn>
+
+See gna bug #14376.
+
+------------------------------------------------------------------------
+r16006 | pepeto | 2009-09-29 08:35:37 +0200 (Tue, 29 Sep 2009) | 7 lines
+Changed paths:
+ M /branches/S2_1/server/stdinhand.c
+
+After the removal of hard coded 'set autotoggle 1' in client side, '/take -'
+was not toggling the player ai status anymore.
+
+Reported by Toni Spets <hifi>
+
+See gna bug #14369
+
+------------------------------------------------------------------------
+r15987 | pepeto | 2009-09-26 19:07:12 +0200 (Sat, 26 Sep 2009) | 6 lines
+Changed paths:
+ M /branches/S2_1/client/civclient.c
+ M /branches/S2_1/server/connecthand.c
+ M /branches/S2_1/server/report.c
+ M /branches/S2_1/server/report.h
+ M /branches/S2_1/server/srv_main.c
+ M /branches/S2_1/server/stdinhand.c
+
+/detach, /observe and /take work normally after the game ended.
+
+Patch by Book and me
+
+See gna bug #13727
+
+------------------------------------------------------------------------
+r15982 | pepeto | 2009-09-26 18:48:38 +0200 (Sat, 26 Sep 2009) | 6 lines
+Changed paths:
+ M /branches/S2_1/common/aicore/path_finding.c
+ M /branches/S2_1/common/aicore/path_finding.h
+ M /branches/S2_1/common/aicore/pf_tools.c
+ M /branches/S2_1/common/movement.c
+ M /branches/S2_1/common/player.c
+ M /branches/S2_1/common/player.h
+
+Don't navigate through unaccessible territorial waters.
+
+Reported by David Ja¨a <jasad>
+
+See gna bug #13928
+
+------------------------------------------------------------------------
+r15979 | pepeto | 2009-09-26 18:27:43 +0200 (Sat, 26 Sep 2009) | 5 lines
+Changed paths:
+ M /branches/S2_1/common/aicore/path_finding.c
+
+Fix that pf_fuel_map finishes don't make infinite loops with the client
+interaction.
+
+See gna bug #14035
+
+------------------------------------------------------------------------
+r15969 | cazfi | 2009-09-21 18:19:39 +0200 (Mon, 21 Sep 2009) | 6 lines
+Changed paths:
+ M /branches/S2_1/server/sernet.c
+
+Removed duplicate allocation of ping_timers
+
+Patch by Pepeto
+
+See gna bug #14337
+
+------------------------------------------------------------------------
+r15966 | chrisk | 2009-09-19 09:56:56 +0200 (Sat, 19 Sep 2009) | 2 lines
+Changed paths:
+ M /branches/S2_1/po/de.po
+
+
+4323 translated messages, 9 fuzzy translations, 14 untranslated messages.
+------------------------------------------------------------------------
+r15952 | cazfi | 2009-09-16 01:57:10 +0200 (Wed, 16 Sep 2009) | 7 lines
+Changed paths:
+ M /branches/S2_1/server/stdinhand.c
+
+Prevented /rulesetdir after savegame of already running game has been
+loaded.
+
+Patch by Matthias Pfafferodt
+
+See gna bug #14230
+
+------------------------------------------------------------------------
+r15949 | cazfi | 2009-09-16 01:49:37 +0200 (Wed, 16 Sep 2009) | 5 lines
+Changed paths:
+ M /branches/S2_1/server/sernet.c
+ M /branches/S2_1/server/srv_main.c
+ M /branches/S2_1/server/srv_main.h
+
+Renamed automatic game finished and quitidle saves so that they
+do not overwrite normal autosaves.
+
+See gna bug #14245
+
+------------------------------------------------------------------------
+r15933 | cazfi | 2009-09-12 02:02:35 +0200 (Sat, 12 Sep 2009) | 13 lines
+Changed paths:
+ M /branches/S2_1/server/stdinhand.c
+
+Fixed /cmdlevel bugs:
+- When issuing /cmdlevel command for all connections, it stops at the
+ first connection it cannot set the access level. The expected behaviour
+ would be to continue to iterate the connections.
+- When issuing "/cmdlevel basic" (e.g.) whereas you are the first
+ connection and there is a second connection with hack access, then you
+ set your connection access to "basic", and the second fails because you
+ only have basic access. The caller access level should changed at last.
+
+Patch by Pepeto
+
+See gna bug #14237
+
+------------------------------------------------------------------------
+r15929 | cazfi | 2009-09-12 01:16:26 +0200 (Sat, 12 Sep 2009) | 7 lines
+Changed paths:
+ M /branches/S2_1/server/techtools.c
+
+Fixed a crash when several members of the same team have same
+initial tech.
+
+Patch by Pepeto
+
+See gna bug #14259
+
+------------------------------------------------------------------------
+r15919 | cazfi | 2009-09-09 01:25:19 +0200 (Wed, 09 Sep 2009) | 6 lines
+Changed paths:
+ M /branches/S2_1/server/unittools.c
+
+Leave no units to current tile when bouncing them.
+
+Patch by Matthias Pfafferodt
+
+See gna bug #14078
------------------------------------------------------------------------
-r15604 | dmarks | 2009-03-25 08:07:13 +0900 (Wed, 25 Mar 2009) | 1 line
+r15914 | cazfi | 2009-09-07 22:39:27 +0200 (Mon, 07 Sep 2009) | 6 lines
+Changed paths:
+ M /branches/S2_1/server/barbarian.c
+ M /branches/S2_1/server/srv_main.c
+ M /branches/S2_1/server/techtools.c
+ M /branches/S2_1/server/techtools.h
+
+Fixed a team play crash when ruleset defines global init techs
+
+Patch by Pepeto
+
+See gna RT #20855
+
+------------------------------------------------------------------------
+r15912 | cazfi | 2009-09-07 00:39:54 +0200 (Mon, 07 Sep 2009) | 6 lines
+Changed paths:
+ M /branches/S2_1/client/citydlg_common.c
+ M /branches/S2_1/client/gui-gtk-2.0/cityrep.c
+ M /branches/S2_1/client/gui-gtk-2.0/wldlg.c
+ M /branches/S2_1/client/gui-mui/wldlg.c
+ M /branches/S2_1/client/gui-mui/worklistclass.c
+ M /branches/S2_1/client/gui-sdl/optiondlg.c
+ M /branches/S2_1/client/gui-sdl/wldlg.c
+ M /branches/S2_1/client/gui-win32/wldlg.c
+ M /branches/S2_1/client/gui-xaw/wldlg.c
+ M /branches/S2_1/client/packhand.c
+ M /branches/S2_1/common/city.c
+ M /branches/S2_1/common/dataio.c
+ M /branches/S2_1/common/generate_packets.py
+ M /branches/S2_1/common/packets_gen.c
+ M /branches/S2_1/common/worklist.c
+ M /branches/S2_1/common/worklist.h
+ M /branches/S2_1/server/cityhand.c
+ M /branches/S2_1/server/citytools.c
+ M /branches/S2_1/server/savegame.c
+
+Renamed *_worklist() functions as worklist_*()
+
+Patch by Pepeto
+
+See gna bug #13879
+
+------------------------------------------------------------------------
+r15878 | cazfi | 2009-08-17 22:47:52 +0200 (Mon, 17 Aug 2009) | 6 lines
+Changed paths:
+ M /branches/S2_1/common/aicore/path_finding.c
+
+Fixed handling of units with 0 move rate.
+
+Patch by Pepeto
+
+See gna bug #13889
+
+------------------------------------------------------------------------
+r15875 | cazfi | 2009-08-12 23:30:22 +0200 (Wed, 12 Aug 2009) | 4 lines
+Changed paths:
+ M /branches/S2_1/m4/xaw-client.m4
+
+Fixed autoconf-2.64 warning.
+
+See gna bug #14045
+
+------------------------------------------------------------------------
+r15871 | cazfi | 2009-08-11 00:11:08 +0200 (Tue, 11 Aug 2009) | 7 lines
+Changed paths:
+ M /branches/S2_1/client/control.c
+
+Do not send illegal packets when unloading allied units from
+transport.
+
+Patch by Pepeto
+
+See gna bug #14032
+
+------------------------------------------------------------------------
+r15864 | cazfi | 2009-07-31 23:29:06 +0200 (Fri, 31 Jul 2009) | 6 lines
+Changed paths:
+ M /branches/S2_1/client/control.c
+ M /branches/S2_1/client/control.h
+
+Fixed a crash when unload all command is issued to multiple units.
+
+Patch by Pepeto
+
+See gna bug #14031
+
+------------------------------------------------------------------------
+r15859 | cazfi | 2009-07-30 23:00:48 +0200 (Thu, 30 Jul 2009) | 7 lines
+Changed paths:
+ M /branches/S2_1/client/gui-gtk-2.0/gui_main.c
+
+Fixed gtk warnings when switching from observing one player to
+another.
+
+Patch by Pepeto
+
+See gna bug #13763
+
+------------------------------------------------------------------------
+r15854 | cazfi | 2009-07-29 20:45:55 +0200 (Wed, 29 Jul 2009) | 2 lines
+Changed paths:
+ M /branches/S2_1/po/fi.po
+
+Updated translation by Sini Ruohomaa
+
+------------------------------------------------------------------------
+r15850 | cazfi | 2009-07-26 23:58:01 +0200 (Sun, 26 Jul 2009) | 7 lines
+Changed paths:
+ M /branches/S2_1/server/techtools.c
+
+Fixed crash when lua script triggered by "tech_researched" gives
+another technology to player.
+
+Reported by gorillaz
+
+See gna bug #13819
+
+------------------------------------------------------------------------
+r15848 | cazfi | 2009-07-26 00:16:27 +0200 (Sun, 26 Jul 2009) | 7 lines
+Changed paths:
+ M /branches/S2_1/data/civ2/effects.ruleset
+ M /branches/S2_1/data/default/effects.ruleset
+
+Fixed partisan appearance to require Guerilla Warfare to be known
+by someone.
+
+Patch by Joel Kenny
+
+See gna bug #13944
+
+------------------------------------------------------------------------
+r15825 | cazfi | 2009-07-10 23:37:32 +0200 (Fri, 10 Jul 2009) | 4 lines
+Changed paths:
+ M /branches/S2_1/doc/TODO
+
+Updated wishlist URL in TODO.
+
+See gna bug #13851
+
+------------------------------------------------------------------------
+r15820 | cazfi | 2009-07-09 00:22:31 +0200 (Thu, 09 Jul 2009) | 6 lines
+Changed paths:
+ M /branches/S2_1/common/aicore/path_finding.c
+
+Initialize unreachable nodes just once.
+
+Patch by Pepeto
+
+See gna bug #13881
+
+------------------------------------------------------------------------
+r15817 | jcreus | 2009-07-08 23:36:23 +0200 (Wed, 08 Jul 2009) | 1 line
+Changed paths:
+ M /branches/S2_1/po/ca.po
+
+small correction
+------------------------------------------------------------------------
+r15812 | jcreus | 2009-07-07 02:05:39 +0200 (Tue, 07 Jul 2009) | 1 line
+Changed paths:
+ M /branches/S2_1/po/ca.po
+
+updating Catalan translation
+------------------------------------------------------------------------
+r15805 | cazfi | 2009-07-05 22:48:42 +0200 (Sun, 05 Jul 2009) | 7 lines
+Changed paths:
+ M /branches/S2_1/client/ggzclient.c
+
+Changed ggz profile to point to freeciv.ggzgamingzone.org instead
+of non-functional pubserver.
+
+Patch by Jason Dorje Short
+
+See RT #39923
+
+------------------------------------------------------------------------
+r15801 | cazfi | 2009-07-04 21:54:25 +0200 (Sat, 04 Jul 2009) | 4 lines
+Changed paths:
+ M /branches/S2_1/client/civclient.c
+ M /branches/S2_1/server/srv_main.c
+ M /branches/S2_1/utility/shared.c
+ M /branches/S2_1/utility/shared.h
+
+Free memory allocated by init_nls()
+
+See gna #13707
+
+------------------------------------------------------------------------
+r15794 | cazfi | 2009-07-02 23:08:45 +0200 (Thu, 02 Jul 2009) | 6 lines
+Changed paths:
+ M /branches/S2_1/client/gui-gtk-2.0/gui_main.c
+ M /branches/S2_1/client/gui-gtk-2.0/pages.c
+
+Display flags at start page player list.
+
+Patch by Pepeto
+
+See gna #13726
+
+------------------------------------------------------------------------
+r15789 | mbook | 2009-07-01 02:22:35 +0200 (Wed, 01 Jul 2009) | 6 lines
+Changed paths:
+ M /branches/S2_1/server/unithand.c
+
+Reset done_moving when unit orders cleared.
+
+See gna #13817
+See RT #40563
+
+Patch by: pepeto <pepeto69 at free.fr>
+------------------------------------------------------------------------
+r15786 | mbook | 2009-06-30 21:34:01 +0200 (Tue, 30 Jun 2009) | 13 lines
+Changed paths:
+ M /branches/S2_1/server/diplomats.c
+
+Fix bug in diplomat contest calculation.
+
+- Because ">" was used instead of "<" in
+ diplomat_success_vs_defender(), an attacking
+ diplomat's chances were actually decreased
+ when they should have increased.
+- Fixed F_SUPERSPY handling to match comment
+ in diplomat_infiltrate_tile().
+- Improved some formatting and comment style.
+
+See gna #13790
+
+Reported by: Szunti (freeciv forum guest)
+------------------------------------------------------------------------
+r15783 | mbook | 2009-06-29 19:37:56 +0200 (Mon, 29 Jun 2009) | 7 lines
+Changed paths:
+ M /branches/S2_1/ai/advdiplomacy.c
+
+AI does not ask for help against unmet enemies.
+
+See gna #13559
+See RT #39700
+
+Requested by: Matthias Pfafferodt <matthias.pfafferodt at mapfa.de>
+Patch by: <per.mathisen at gmail.com>
+------------------------------------------------------------------------
+r15781 | cazfi | 2009-06-27 21:41:08 +0200 (Sat, 27 Jun 2009) | 4 lines
+Changed paths:
+ M /branches/S2_1/client/gui-gtk-2.0/gui_main.c
+
+Fixed creation of GGZ page.
+
+See gna #13791
+
+------------------------------------------------------------------------
+r15779 | mbook | 2009-06-27 03:03:51 +0200 (Sat, 27 Jun 2009) | 11 lines
+Changed paths:
+ M /branches/S2_1/client/packhand.c
+
+Do not clobber changed flag in handle_tile_info().
+
+- When a tile has the same resource as set in the info
+ packet, 'tile_changed' is reset causing later code
+ to miss previous changes to the tile.
+- In particular, agent calls would be missed due to
+ this bug.
+
+See #13763
+
+Patch by: Bernd Jendrissek <bernd.jendrissek at gmail.com>
+------------------------------------------------------------------------
+r15778 | mbook | 2009-06-27 02:54:24 +0200 (Sat, 27 Jun 2009) | 11 lines
+Changed paths:
+ M /branches/S2_1/ai/aiexplorer.c
+ M /branches/S2_1/ai/aiferry.c
+ M /branches/S2_1/ai/aitools.c
+ M /branches/S2_1/client/goto.c
+ M /branches/S2_1/common/aicore/path_finding.c
+ M /branches/S2_1/common/aicore/path_finding.h
+ M /branches/S2_1/common/aicore/pf_tools.c
+ M /branches/S2_1/common/aicore/pf_tools.h
+
+Backport of improved goto code from trunk.
+
+- See RT tickets listed below for details.
+
+See gna #13736
+See gna #13742
+See RT #40536
+See RT #40563
+
+S2_1 port by: pepeto <pepeto69 at free.fr>
+Original trunk patches by pepeto and myself.
+------------------------------------------------------------------------
+r15776 | cazfi | 2009-06-26 22:46:43 +0200 (Fri, 26 Jun 2009) | 4 lines
+Changed paths:
+ M /branches/S2_1/doc/CodingStyle
+
+Removed obsolete configure.in reference from CodingStyle.
+
+See gna #13682
+
+------------------------------------------------------------------------
+r15774 | cazfi | 2009-06-25 22:04:09 +0200 (Thu, 25 Jun 2009) | 5 lines
+Changed paths:
+ M /branches/S2_1/client/gui-gtk-2.0/gui_main.c
+ M /branches/S2_1/client/mapview_common.c
+ M /branches/S2_1/client/tilespec.c
+ M /branches/S2_1/client/tilespec.h
+ M /branches/S2_1/doc/README.graphics
+
+Added support for units taller than 1.5 x terrain tile height in
+isometric tilesets.
+
+See gna #13671
+
+------------------------------------------------------------------------
+r15771 | cazfi | 2009-06-23 20:46:46 +0200 (Tue, 23 Jun 2009) | 7 lines
+Changed paths:
+ M /branches/S2_1/client/mapview_common.c
+
+Hide production part of full citybar from enemy cities for player observers.
+It used to show all enemy cities always building "Airport"
+
+Patch by Pepeto
+
+See gna #13723
+
+------------------------------------------------------------------------
+r15768 | mbook | 2009-06-22 06:22:33 +0200 (Mon, 22 Jun 2009) | 5 lines
+Changed paths:
+ M /branches/S2_1/server/report.c
+
+Fix bug in tech score when player has no techs.
+
+See gna #13733
+
+Patch by: pepeto <pepeto69 at free.fr>
+------------------------------------------------------------------------
+r15767 | mbook | 2009-06-22 06:13:50 +0200 (Mon, 22 Jun 2009) | 5 lines
+Changed paths:
+ M /branches/S2_1/client/packhand.c
+
+Update game.player_ptr on conn info packet.
+
+See gna #13732
+
+Patch by: pepeto <pepeto69 at free.fr>
+------------------------------------------------------------------------
+r15764 | cazfi | 2009-06-20 22:47:13 +0200 (Sat, 20 Jun 2009) | 7 lines
+Changed paths:
+ M /branches/S2_1/client/text.c
+
+Show ping of actual player connection instead of player's first connection,
+which may be observer.
+
+Patch by pepeto
+
+See gna #13725
+
+------------------------------------------------------------------------
+r15756 | mbook | 2009-06-19 06:48:31 +0200 (Fri, 19 Jun 2009) | 5 lines
+Changed paths:
+ M /branches/S2_1/utility/iterator.h
+
+Avoid compiler warning about strict-aliasing.
+
+See gna #13719
+
+Patch by: pepeto <pepeto69 at free.fr>
+------------------------------------------------------------------------
+r15752 | mbook | 2009-06-18 03:58:19 +0200 (Thu, 18 Jun 2009) | 5 lines
+Changed paths:
+ M /branches/S2_1/client/agents/agents.c
+
+Fix va_list corruption in agent code.
+
+See gna #13714
+
+Patch by: Bernd Jendrissek <bernd.jendrissek at gmail.com>
+------------------------------------------------------------------------
+r15751 | mbook | 2009-06-18 03:53:43 +0200 (Thu, 18 Jun 2009) | 5 lines
+Changed paths:
+ M /branches/S2_1/client/agents/agents.c
+
+Agent calls to different agents are never equal.
+
+See gna #13713
+
+Patch by: Bernd Jendrissek <bernd.jendrissek at gmail.com>
+------------------------------------------------------------------------
+r15736 | cazfi | 2009-06-09 23:22:14 +0200 (Tue, 09 Jun 2009) | 7 lines
+Changed paths:
+ M /branches/S2_1/client/helpdata.c
+
+Fixed help browser crash when ruleset has fuel using unit for which
+there is no suitable carrier unit.
+
+Reported by Ugo Degrigny
+
+See gna #13649
+
+------------------------------------------------------------------------
+r15731 | cazfi | 2009-06-09 19:50:47 +0200 (Tue, 09 Jun 2009) | 4 lines
+Changed paths:
+ M /branches/S2_1/data/helpdata.txt
+
+Updated bug URL in About page to point to gna.
+
+See gna #13644
+
+------------------------------------------------------------------------
+r15721 | cazfi | 2009-06-05 23:41:57 +0200 (Fri, 05 Jun 2009) | 6 lines
+Changed paths:
+ M /branches/S2_1/server/ruleset.c
+
+Added ruleset loading time check that MAX_NUM_REQS is not exceeded.
+
+Problem reported by Matthias Pfafferodt
+
+See gna #13600
+
+------------------------------------------------------------------------
+r15717 | cazfi | 2009-06-04 22:46:08 +0200 (Thu, 04 Jun 2009) | 6 lines
+Changed paths:
+ M /branches/S2_1/data/default/buildings.ruleset
+
+Fixed Hydro Plant help text.
+
+Patch by Jacob Nevins
+
+See RT #40805
+
+------------------------------------------------------------------------
+r15697 | cazfi | 2009-06-01 23:50:25 +0200 (Mon, 01 Jun 2009) | 2 lines
+Changed paths:
+ M /branches/S2_1/po/da.po
+
+Updated translation by Joe Dalton.
+
+------------------------------------------------------------------------
+r15692 | mbook | 2009-06-01 02:54:07 +0200 (Mon, 01 Jun 2009) | 6 lines
+Changed paths:
+ M /branches/S2_1/client/gui-gtk-2.0/gamedlgs.c
+
+Put local options in scrolled window.
+
+- Also, make 400 pixels the default height
+ for the options dialog window.
+
+See GNA #13525
+------------------------------------------------------------------------
+r15683 | mbook | 2009-05-28 03:58:18 +0200 (Thu, 28 May 2009) | 11 lines
+Changed paths:
+ M /branches/S2_1/client/gui-gtk-2.0/gui_main.c
+ M /branches/S2_1/client/gui-gtk-2.0/gui_main.h
+
+Option for small display widget layout.
+
+- Gui option 'small_display_layout' controls whether
+ the left "panel" on the main game page extends all
+ the way down the window.
+- Option requires a program restart in order to take
+ effect.
+- The main map canvas is given a minimum size of 300
+ by 300 pixels.
+
+See GNA #13524
+------------------------------------------------------------------------
+r15682 | cazfi | 2009-05-26 01:15:32 +0200 (Tue, 26 May 2009) | 2 lines
+Changed paths:
+ M /branches/S2_1/po/POTFILES.in
+
+Added voting.c to POTFILES.in
+
+------------------------------------------------------------------------
+r15678 | cazfi | 2009-05-24 20:21:34 +0200 (Sun, 24 May 2009) | 4 lines
+Changed paths:
+ M /branches/S2_1/configure.ac
+
+Changed bug address to point to gna
+
+See gna #13422
+
+------------------------------------------------------------------------
+r15674 | mbook | 2009-05-23 03:33:09 +0200 (Sat, 23 May 2009) | 1 line
+Changed paths:
+ M /branches/S2_1/server/voting.c
+
+Fix small whitespace mistake.
+------------------------------------------------------------------------
+r15673 | mbook | 2009-05-23 03:33:07 +0200 (Sat, 23 May 2009) | 3 lines
+Changed paths:
+ M /branches/S2_1/client/packhand_gen.c
+ M /branches/S2_1/client/packhand_gen.h
+ M /branches/S2_1/common/packets_gen.c
+ M /branches/S2_1/common/packets_gen.h
+ M /branches/S2_1/server/hand_gen.c
+ M /branches/S2_1/server/hand_gen.h
+
+Auto-generated files for new packets.
+
+See GNA #13515
+------------------------------------------------------------------------
+r15672 | mbook | 2009-05-23 03:33:03 +0200 (Sat, 23 May 2009) | 20 lines
+Changed paths:
+ M /branches/S2_1/client/civclient.c
+ M /branches/S2_1/client/gui-ftwl/pages.c
+ M /branches/S2_1/client/gui-gtk-2.0/pages.c
+ M /branches/S2_1/client/gui-sdl/pages.c
+ M /branches/S2_1/client/gui-stub/pages.c
+ M /branches/S2_1/client/gui-win32/pages.c
+ M /branches/S2_1/client/gui-xaw/pages.c
+ M /branches/S2_1/client/include/pages_g.h
+ M /branches/S2_1/client/packhand.c
+ M /branches/S2_1/common/packets.def
+ M /branches/S2_1/server/commands.c
+ M /branches/S2_1/server/commands.h
+ M /branches/S2_1/server/connecthand.c
+ M /branches/S2_1/server/plrhand.c
+ M /branches/S2_1/server/plrhand.h
+ M /branches/S2_1/server/sernet.c
+ M /branches/S2_1/server/srv_main.c
+ M /branches/S2_1/server/stdinhand.c
+ M /branches/S2_1/server/voting.c
+ M /branches/S2_1/version.in
+
+Improved voting code ported from warclient.
+
+- It is now possible to make votes in pregame.
+- Added new capability based voteinfo packets.
+- Added optional capability "voteinfo".
+- Moved all voting related code on the server
+ side to server/voting.[ch].
+- Added gui function voteinfo_gui_update() and
+ stubs for all guis.
+- Added vote parameters to command definitions.
+- Added helper function command_access_level().
+- Modified notify_team() to send to all players
+ if the first argument is NULL.
+- Cleaned up vote_command() in stdinhand.c.
+- Some rearrangement of handle_stdin_input().
+
+See GNA #13515
+
+Warclient code originally by pepeto, woodswolf,
+and myself.
+------------------------------------------------------------------------
+r15671 | mbook | 2009-05-23 03:32:56 +0200 (Sat, 23 May 2009) | 3 lines
+Changed paths:
+ M /branches/S2_1/client/Makefile.am
+ A /branches/S2_1/client/voteinfo.c
+ A /branches/S2_1/client/voteinfo.h
+ M /branches/S2_1/server/Makefile.am
+ A /branches/S2_1/server/voting.c
+ A /branches/S2_1/server/voting.h
+
+Add new source files implementing improved voting.
+
+See GNA #13515
+------------------------------------------------------------------------
+r15670 | mbook | 2009-05-23 00:36:30 +0200 (Sat, 23 May 2009) | 7 lines
+Changed paths:
+ M /branches/S2_1/client/mapview_common.c
+
+Avoid crash due to corrupted worked field.
+
+See GNA #13498
+
+Reported by:
+ Christian Knoke <chrisk at cknoke.de>
+ kevin in Korea (Kevin551) <kevin.in.korea at gmail.com>
+------------------------------------------------------------------------
+r15669 | cazfi | 2009-05-22 20:26:26 +0200 (Fri, 22 May 2009) | 5 lines
+Changed paths:
+ M /branches/S2_1/server/unithand.c
+
+Added proper error message to case where user tries to add Settlers to
+city owned by ally.
+
+See gna #13539
+
+------------------------------------------------------------------------
+r15667 | mbook | 2009-05-16 06:23:54 +0200 (Sat, 16 May 2009) | 12 lines
+Changed paths:
+ M /branches/S2_1/client/gui-gtk-2.0/dialogs.c
+ M /branches/S2_1/client/gui-sdl/dialogs.c
+
+Fix bug causing wrong player nation select.
+
+- Because players might be renumbered in pregame,
+ the player pointer stored by the races dialog
+ might become invalid or wrong.
+- The player name is used instead to try and
+ uniquely identify which player's nation should
+ be selected by the dialog.
+
+See #40773
+
+Reported by: Karl-Ingo Friese <kif at gdv.uni-hannover.de>
+------------------------------------------------------------------------
+r15665 | mbook | 2009-05-13 01:30:21 +0200 (Wed, 13 May 2009) | 3 lines
+Changed paths:
+ M /branches/S2_1/common/city.c
+
+Split up assertion condtion in city accessor.
+
+See GNA #13498
+------------------------------------------------------------------------
+r15658 | mbook | 2009-05-08 21:05:20 +0200 (Fri, 08 May 2009) | 5 lines
+Changed paths:
+ M /branches/S2_1/server/gamehand.c
+
+Fix lost hack access in single player mode.
+
+See GNA #13494
+
+Reported by: Christian Knoke <chrisk at cknoke.de>
+------------------------------------------------------------------------
+r15656 | mbook | 2009-05-08 18:22:30 +0200 (Fri, 08 May 2009) | 3 lines
+Changed paths:
+ M /branches/S2_1/common/connection.c
+ M /branches/S2_1/common/connection.h
+
+Some connection accessor functions.
+
+See GNA #13490
+------------------------------------------------------------------------
+r15655 | mbook | 2009-05-08 18:22:26 +0200 (Fri, 08 May 2009) | 3 lines
+Changed paths:
+ M /branches/S2_1/utility/shared.c
+ M /branches/S2_1/utility/shared.h
+
+Add free_tokens() helper function.
+
+See GNA #13488
+------------------------------------------------------------------------
+r15653 | cazfi | 2009-05-06 16:01:12 +0200 (Wed, 06 May 2009) | 7 lines
+Changed paths:
+ M /branches/S2_1/common/improvement.c
+ M /branches/S2_1/common/improvement.h
+ M /branches/S2_1/common/unittype.c
+
+Fixed a bug that even if wonder set as improvement requirement for unit
+was built, unit was not buildable.
+
+Reported by banjo.
+
+See RT #39530
+
+------------------------------------------------------------------------
+r15646 | mbook | 2009-05-05 03:10:43 +0200 (Tue, 05 May 2009) | 11 lines
+Changed paths:
+ M /branches/S2_1/client/gui-gtk-2.0/gui_main.c
+ M /branches/S2_1/common/connection.c
+ M /branches/S2_1/common/connection.h
+ M /branches/S2_1/server/commands.c
+ M /branches/S2_1/server/connecthand.c
+ M /branches/S2_1/server/connecthand.h
+ M /branches/S2_1/server/sernet.c
+ M /branches/S2_1/server/srv_main.c
+ M /branches/S2_1/server/stdinhand.c
+
+Improved access levels ported from Warclient.
+
+- Added two new access levels, ALLOW_BASIC and
+ ALLOW_ADMIN, for players and remote server
+ operators respectively.
+- Added field server.granted_access_level to struct
+ connection to keep track of a user's initial access
+ level during attaching and detaching.
+- Fixed out-of-date comment about SSET_SERVER_ONLY.
+
+See GNA #13433
+------------------------------------------------------------------------
+r15639 | cazfi | 2009-05-03 21:26:43 +0200 (Sun, 03 May 2009) | 4 lines
+Changed paths:
+ M /branches/S2_1/m4/sound.m4
+
+Fixed explicit --enable-sdl-mixer to not to disable sdl-mixer.
+
+See gna ticket #13444
+
+------------------------------------------------------------------------
+r15637 | cazfi | 2009-05-03 18:25:06 +0200 (Sun, 03 May 2009) | 7 lines
+Changed paths:
+ M /branches/S2_1/client/gui-win32/helpdlg.c
+
+Show correct Requirement and Obsolete by tech for wonders in win32-client
+help browser.
+
+Reported by Daniel Doran
+
+See RT ticket #40765
+
+------------------------------------------------------------------------
+r15632 | cazfi | 2009-04-29 23:25:23 +0200 (Wed, 29 Apr 2009) | 7 lines
+Changed paths:
+ M /branches/S2_1/server/report.c
+ M /branches/S2_1/server/report.h
+ M /branches/S2_1/server/srv_main.c
+
+Write civscore.log in the beginning of the turn, immediately after values are
+calculated. Write also final values when game ends.
+
+Requested by Theodore Munk
+
+See gna ticket #13419
+
+------------------------------------------------------------------------
+r15630 | cazfi | 2009-04-29 23:16:18 +0200 (Wed, 29 Apr 2009) | 6 lines
+Changed paths:
+ M /branches/S2_1/server/score.c
+
+Put spaceship state to civscore.log instead of score given by spaceship.
+
+Requested by Theodore Munk
+
+See gna ticket #13402
+
+------------------------------------------------------------------------
+r15628 | cazfi | 2009-04-29 23:06:33 +0200 (Wed, 29 Apr 2009) | 4 lines
+Changed paths:
+ M /branches/S2_1/client/attribute.c
+
+Do not send attribute block if observing or dead
+
+See gna ticket #13410
+
+------------------------------------------------------------------------
+r15624 | mbook | 2009-04-27 18:48:15 +0200 (Mon, 27 Apr 2009) | 5 lines
+Changed paths:
+ M /branches/S2_1/server/gamehand.c
+
+Fix wrong enum type for unit role.
+
+See gna ticket #13401
+
+Reported by: gilles
+------------------------------------------------------------------------
+r15623 | cazfi | 2009-04-25 10:27:02 +0200 (Sat, 25 Apr 2009) | 5 lines
+Changed paths:
+ M /branches/S2_1/server/report.c
+
+Record players total score to civscore.log.
+Requested by Theodore Munk
+
+See gna ticket #13403
+
+------------------------------------------------------------------------
+r15617 | cazfi | 2009-04-23 17:41:57 +0200 (Thu, 23 Apr 2009) | 4 lines
+Changed paths:
+ M /branches/S2_1/client/civclient.c
+ M /branches/S2_1/client/servers.h
+ M /branches/S2_1/server/meta.h
+
+Restored http://meta.freeciv.org/metaserver.phtml as default metaserver.
+
+See gna ticket #13407
+
+------------------------------------------------------------------------
+r15614 | cazfi | 2009-04-13 19:43:15 +0200 (Mon, 13 Apr 2009) | 4 lines
+Changed paths:
+ M /branches/S2_1/server/civserver.c
+ M /branches/S2_1/server/meta.c
+ M /branches/S2_1/server/srv_main.c
+ M /branches/S2_1/server/srv_main.h
+
+Added commandline parameter to set hostname visible on metaserver
+
+See #40755
+
+------------------------------------------------------------------------
+r15608 | dmarks | 2009-03-29 14:04:02 +0200 (Sun, 29 Mar 2009) | 1 line
+Changed paths:
+ M /branches/S2_1/ChangeLog
+
+Update changelog for 2.1.9 (different format due to server issues)
+------------------------------------------------------------------------
+r15606 | dmarks | 2009-03-25 00:23:09 +0100 (Wed, 25 Mar 2009) | 1 line
+Changed paths:
+ M /branches/S2_1/version.in
+
+Bump version to 2.1.9+
+------------------------------------------------------------------------
+r15604 | dmarks | 2009-03-25 00:07:13 +0100 (Wed, 25 Mar 2009) | 1 line
+Changed paths:
+ M /branches/S2_1/po/de.po
Changes after running update-po
------------------------------------------------------------------------
-r15603 | chrisk | 2009-03-25 06:09:52 +0900 (Wed, 25 Mar 2009) | 2 lines
+r15603 | chrisk | 2009-03-24 22:09:52 +0100 (Tue, 24 Mar 2009) | 2 lines
+Changed paths:
+ M /branches/S2_1/po/de.po
4330 translated messages.
------------------------------------------------------------------------
-r15601 | dmarks | 2009-03-24 22:11:57 +0900 (Tue, 24 Mar 2009) | 1 line
+r15601 | dmarks | 2009-03-24 14:11:57 +0100 (Tue, 24 Mar 2009) | 1 line
+Changed paths:
+ M /branches/S2_1/po/sv.po
Fix grammatical oddness in Swedish translation. Patch by Erik Larsson <erik at kaldo.se> in PR#40622
------------------------------------------------------------------------
-r15600 | chrisk | 2009-03-24 20:05:59 +0900 (Tue, 24 Mar 2009) | 2 lines
+r15600 | chrisk | 2009-03-24 12:05:59 +0100 (Tue, 24 Mar 2009) | 2 lines
+Changed paths:
+ M /branches/S2_1/po/de.po
4330 translated messages.
------------------------------------------------------------------------
-r15599 | dmarks | 2009-03-24 09:31:07 +0900 (Tue, 24 Mar 2009) | 1 line
+r15599 | dmarks | 2009-03-24 01:31:07 +0100 (Tue, 24 Mar 2009) | 1 line
+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
Changes after running update-po
------------------------------------------------------------------------
-r15598 | jcreus | 2009-03-24 07:46:38 +0900 (Tue, 24 Mar 2009) | 1 line
+r15598 | jcreus | 2009-03-23 23:46:38 +0100 (Mon, 23 Mar 2009) | 1 line
+Changed paths:
+ M /branches/S2_1/po/ca.po
4330 translated messages
------------------------------------------------------------------------
-r15596 | mbook | 2009-03-24 03:19:27 +0900 (Tue, 24 Mar 2009) | 4 lines
+r15596 | mbook | 2009-03-23 19:19:27 +0100 (Mon, 23 Mar 2009) | 4 lines
+Changed paths:
+ M /branches/S2_1/client/civclient.c
Automatically update old metaserver address.
See #40752
------------------------------------------------------------------------
-r15595 | dmarks | 2009-03-23 19:29:19 +0900 (Mon, 23 Mar 2009) | 1 line
+r15595 | dmarks | 2009-03-23 11:29:19 +0100 (Mon, 23 Mar 2009) | 1 line
+Changed paths:
+ M /branches/S2_1/po/ko.po
Fix gettext error
------------------------------------------------------------------------
-r15594 | dmarks | 2009-03-22 19:19:02 +0900 (Sun, 22 Mar 2009) | 1 line
+r15594 | dmarks | 2009-03-22 11:19:02 +0100 (Sun, 22 Mar 2009) | 1 line
+Changed paths:
+ M /branches/S2_1/NEWS
Update NEWS for 2.1.9
------------------------------------------------------------------------
-r15593 | dmarks | 2009-03-22 19:06:30 +0900 (Sun, 22 Mar 2009) | 1 line
+r15593 | dmarks | 2009-03-22 11:06:30 +0100 (Sun, 22 Mar 2009) | 1 line
+Changed paths:
+ M /branches/S2_1/po/en_GB.po
77 translated messages, 4251 untranslated messages.
------------------------------------------------------------------------
-r15592 | dmarks | 2009-03-22 18:58:31 +0900 (Sun, 22 Mar 2009) | 1 line
+r15592 | dmarks | 2009-03-22 10:58:31 +0100 (Sun, 22 Mar 2009) | 1 line
+Changed paths:
+ M /branches/S2_1/po/ko.po
2503 translated messages, 1825 untranslated messages.
------------------------------------------------------------------------
-r15591 | dmarks | 2009-03-22 18:42:17 +0900 (Sun, 22 Mar 2009) | 1 line
+r15591 | dmarks | 2009-03-22 10:42:17 +0100 (Sun, 22 Mar 2009) | 1 line
+Changed paths:
+ M /branches/S2_1/po/ko.po
2501 translated messages, 1827 untranslated messages.
------------------------------------------------------------------------
-r15590 | dmarks | 2009-03-22 18:22:44 +0900 (Sun, 22 Mar 2009) | 1 line
+r15590 | dmarks | 2009-03-22 10:22:44 +0100 (Sun, 22 Mar 2009) | 1 line
+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
Changes after running update-po
------------------------------------------------------------------------
-r15589 | dmarks | 2009-03-22 16:06:52 +0900 (Sun, 22 Mar 2009) | 1 line
+r15589 | dmarks | 2009-03-22 08:06:52 +0100 (Sun, 22 Mar 2009) | 1 line
+Changed paths:
+ M /branches/S2_1/po/ko.po
2494 translated messages, 1834 untranslated messages.
------------------------------------------------------------------------
-r15587 | mbook | 2009-03-22 12:24:59 +0900 (Sun, 22 Mar 2009) | 4 lines
+r15587 | mbook | 2009-03-22 04:24:59 +0100 (Sun, 22 Mar 2009) | 4 lines
+Changed paths:
+ M /branches/S2_1/client/servers.h
+ M /branches/S2_1/server/meta.h
Use cazfi.net metaserver as the default.
See #40752
------------------------------------------------------------------------
-r15586 | dmarks | 2009-03-22 12:15:51 +0900 (Sun, 22 Mar 2009) | 1 line
+r15586 | dmarks | 2009-03-22 04:15:51 +0100 (Sun, 22 Mar 2009) | 1 line
+Changed paths:
+ M /branches/S2_1/po/ko.po
Straighten out some fuzzies in Korean translation.
------------------------------------------------------------------------
-r15584 | chrisk | 2009-03-20 21:37:19 +0900 (Fri, 20 Mar 2009) | 2 lines
+r15584 | chrisk | 2009-03-20 13:37:19 +0100 (Fri, 20 Mar 2009) | 2 lines
+Changed paths:
+ M /branches/S2_1/po/de.po
city report headers, waste is Verschwendung
4328 translated messages.
------------------------------------------------------------------------
-r15583 | chrisk | 2009-03-18 20:39:39 +0900 (Wed, 18 Mar 2009) | 2 lines
+r15583 | chrisk | 2009-03-18 12:39:39 +0100 (Wed, 18 Mar 2009) | 2 lines
+Changed paths:
+ M /branches/S2_1/po/de.po
Tried to get the shortcuts right
4328 translated messages.
------------------------------------------------------------------------
-r15582 | chrisk | 2009-03-17 22:19:32 +0900 (Tue, 17 Mar 2009) | 2 lines
+r15582 | chrisk | 2009-03-17 14:19:32 +0100 (Tue, 17 Mar 2009) | 2 lines
+Changed paths:
+ M /branches/S2_1/po/de.po
4328 translated messages.
------------------------------------------------------------------------
-r15580 | chrisk | 2009-03-17 04:28:13 +0900 (Tue, 17 Mar 2009) | 2 lines
+r15580 | chrisk | 2009-03-16 20:28:13 +0100 (Mon, 16 Mar 2009) | 2 lines
+Changed paths:
+ M /branches/S2_1/po/de.po
4316 translated messages, 7 fuzzy translations, 5 untranslated messages.
------------------------------------------------------------------------
-r15578 | mbook | 2009-03-16 08:58:27 +0900 (Mon, 16 Mar 2009) | 6 lines
+r15578 | mbook | 2009-03-16 00:58:27 +0100 (Mon, 16 Mar 2009) | 6 lines
+Changed paths:
+ M /branches/S2_1/client/gui-gtk-2.0/gui_main.c
Work around crash due to missing NULL pointer check in gtk notebook code.
@@ -101,7 +1641,9 @@ See #40743
Reported by: Brendon Oram <bjoram at gmail.com>
------------------------------------------------------------------------
-r15576 | mbook | 2009-03-16 08:33:28 +0900 (Mon, 16 Mar 2009) | 6 lines
+r15576 | mbook | 2009-03-16 00:33:28 +0100 (Mon, 16 Mar 2009) | 6 lines
+Changed paths:
+ M /branches/S2_1/common/unit.c
Fix data type bug causing unit power factor to lose precision.
@@ -110,26 +1652,38 @@ See #40746
Reported by: kevin in Korea <kevin.in.korea at gmail.com>
------------------------------------------------------------------------
-r15575 | cazfi | 2009-03-10 00:54:34 +0900 (Tue, 10 Mar 2009) | 2 lines
+r15575 | cazfi | 2009-03-09 16:54:34 +0100 (Mon, 09 Mar 2009) | 2 lines
+Changed paths:
+ M /branches/S2_1/po/da.po
Updated translation by Joe Dalton
------------------------------------------------------------------------
-r15574 | cazfi | 2009-03-09 03:42:13 +0900 (Mon, 09 Mar 2009) | 2 lines
+r15574 | cazfi | 2009-03-08 19:42:13 +0100 (Sun, 08 Mar 2009) | 2 lines
+Changed paths:
+ M /branches/S2_1/po/da.po
Updated translation by Joe Dalton
------------------------------------------------------------------------
-r15570 | jcreus | 2009-03-08 03:20:38 +0900 (Sun, 08 Mar 2009) | 1 line
+r15570 | jcreus | 2009-03-07 19:20:38 +0100 (Sat, 07 Mar 2009) | 1 line
+Changed paths:
+ M /branches/S2_1/po/ca.po
4328 messages
------------------------------------------------------------------------
-r15568 | cazfi | 2009-03-06 23:25:30 +0900 (Fri, 06 Mar 2009) | 2 lines
+r15568 | cazfi | 2009-03-06 15:25:30 +0100 (Fri, 06 Mar 2009) | 2 lines
+Changed paths:
+ M /branches/S2_1/po/fi.po
Updated translation by Sini Ruohomaa.
------------------------------------------------------------------------
-r15566 | mbook | 2009-03-04 07:59:28 +0900 (Wed, 04 Mar 2009) | 20 lines
+r15566 | mbook | 2009-03-03 23:59:28 +0100 (Tue, 03 Mar 2009) | 20 lines
+Changed paths:
+ M /branches/S2_1/client/gui-gtk-2.0/gui_main.c
+ M /branches/S2_1/client/gui-gtk-2.0/pages.c
+ M /branches/S2_1/client/gui-gtk-2.0/plrdlg.c
Rearrange widget layout to fit on an 800x600 display.
@@ -152,7 +1706,9 @@ Requested by:
Vadim Peretokin <vperetokin at gmail.com>
------------------------------------------------------------------------
-r15564 | mbook | 2009-03-04 07:41:50 +0900 (Wed, 04 Mar 2009) | 8 lines
+r15564 | mbook | 2009-03-03 23:41:50 +0100 (Tue, 03 Mar 2009) | 8 lines
+Changed paths:
+ M /branches/S2_1/client/climisc.c
Sort small wonders separately in production lists.
@@ -163,7 +1719,9 @@ Sort small wonders separately in production lists.
See #40740
------------------------------------------------------------------------
-r15562 | mbook | 2009-03-04 07:36:36 +0900 (Wed, 04 Mar 2009) | 15 lines
+r15562 | mbook | 2009-03-03 23:36:36 +0100 (Tue, 03 Mar 2009) | 15 lines
+Changed paths:
+ M /branches/S2_1/client/text.c
Improved popit info text.
@@ -181,7 +1739,12 @@ See #40488
Requested by: Tomasz Niemcewicz <niemcewiczt at gmail.com>
------------------------------------------------------------------------
-r15560 | mbook | 2009-03-04 07:26:24 +0900 (Wed, 04 Mar 2009) | 6 lines
+r15560 | mbook | 2009-03-03 23:26:24 +0100 (Tue, 03 Mar 2009) | 6 lines
+Changed paths:
+ M /branches/S2_1/client/gui-gtk-2.0/chatline.c
+ M /branches/S2_1/client/gui-gtk-2.0/gui_main.c
+ M /branches/S2_1/client/gui-gtk-2.0/gui_main.h
+ M /branches/S2_1/client/gui-gtk-2.0/pages.c
Multiplayer allies-only chat toggle button and option.
@@ -190,7 +1753,9 @@ See #40487
Requested by: Tomasz Niemcewicz <niemcewiczt at gmail.com>
------------------------------------------------------------------------
-r15557 | cazfi | 2009-03-02 02:35:28 +0900 (Mon, 02 Mar 2009) | 5 lines
+r15557 | cazfi | 2009-03-01 18:35:28 +0100 (Sun, 01 Mar 2009) | 5 lines
+Changed paths:
+ M /branches/S2_1/common/aicore/cm.c
Workaround for gcc optimization bug causing server to crash immediately
when new city is founded.
@@ -198,36 +1763,48 @@ when new city is founded.
Reported by many in #40610
------------------------------------------------------------------------
-r15555 | cazfi | 2009-03-02 02:28:50 +0900 (Mon, 02 Mar 2009) | 2 lines
+r15555 | cazfi | 2009-03-01 18:28:50 +0100 (Sun, 01 Mar 2009) | 2 lines
+Changed paths:
+ M /branches/S2_1/po/da.po
Updated translation by Joe Dalton.
------------------------------------------------------------------------
-r15553 | cproc | 2009-03-01 07:37:27 +0900 (Sun, 01 Mar 2009) | 3 lines
+r15553 | cproc | 2009-02-28 23:37:27 +0100 (Sat, 28 Feb 2009) | 3 lines
+Changed paths:
+ M /branches/S2_1/autogen.sh
add a "--no-configure-run" option to autogen.sh
See PR#40739.
------------------------------------------------------------------------
-r15550 | elmo | 2009-02-27 07:04:15 +0900 (Fri, 27 Feb 2009) | 1 line
+r15550 | elmo | 2009-02-26 23:04:15 +0100 (Thu, 26 Feb 2009) | 1 line
+Changed paths:
+ M /branches/S2_1/po/et.po
Some new translations, some fixes to oddites
------------------------------------------------------------------------
-r15548 | mbook | 2009-02-26 12:23:39 +0900 (Thu, 26 Feb 2009) | 4 lines
+r15548 | mbook | 2009-02-26 04:23:39 +0100 (Thu, 26 Feb 2009) | 4 lines
+Changed paths:
+ M /branches/S2_1/client/gui-gtk-2.0/pages.c
Fix missing Q_() for qualified column name.
See #40738
------------------------------------------------------------------------
-r15545 | cazfi | 2009-02-25 01:35:44 +0900 (Wed, 25 Feb 2009) | 4 lines
+r15545 | cazfi | 2009-02-24 17:35:44 +0100 (Tue, 24 Feb 2009) | 4 lines
+Changed paths:
+ M /branches/S2_1/client/gui-xaw/connectdlg.c
Fixed compiler warnings.
See #40736
------------------------------------------------------------------------
-r15542 | mbook | 2009-02-23 06:56:48 +0900 (Mon, 23 Feb 2009) | 6 lines
+r15542 | mbook | 2009-02-22 22:56:48 +0100 (Sun, 22 Feb 2009) | 6 lines
+Changed paths:
+ M /branches/S2_1/client/gui-gtk-2.0/messagewin.c
Avoid gtk warning due to focusing unrealized treeview.
@@ -236,7 +1813,9 @@ See #40731
Reported by: Marko Lindqvist <cazfi74 at gmail.com>
------------------------------------------------------------------------
-r15541 | cazfi | 2009-02-23 03:01:50 +0900 (Mon, 23 Feb 2009) | 5 lines
+r15541 | cazfi | 2009-02-22 19:01:50 +0100 (Sun, 22 Feb 2009) | 5 lines
+Changed paths:
+ M /branches/S2_1/client/gui-gtk-2.0/chatline.c
Use localtime() instead of localtime_r() since latter does not exist on all
supported platforms (MinGW).
@@ -244,7 +1823,12 @@ supported platforms (MinGW).
See #40726
------------------------------------------------------------------------
-r15538 | mbook | 2009-02-22 09:03:26 +0900 (Sun, 22 Feb 2009) | 19 lines
+r15538 | mbook | 2009-02-22 01:03:26 +0100 (Sun, 22 Feb 2009) | 19 lines
+Changed paths:
+ M /branches/S2_1/client/control.c
+ M /branches/S2_1/client/control.h
+ M /branches/S2_1/client/gui-gtk-2.0/menu.c
+ M /branches/S2_1/client/gui-xaw/menu.c
Improved mass unit selection.
@@ -266,7 +1850,9 @@ Improved mass unit selection.
See #40727
------------------------------------------------------------------------
-r15536 | mbook | 2009-02-22 08:46:13 +0900 (Sun, 22 Feb 2009) | 7 lines
+r15536 | mbook | 2009-02-22 00:46:13 +0100 (Sun, 22 Feb 2009) | 7 lines
+Changed paths:
+ M /branches/S2_1/client/gui-gtk-2.0/cityrep.c
City report "Add 2nd Last" production menu item.
@@ -276,7 +1862,9 @@ Suggested by guest Carstairs in the wishlist forum:
http://forum.freeciv.org/viewtopic.php?t=5797
------------------------------------------------------------------------
-r15534 | mbook | 2009-02-22 08:41:23 +0900 (Sun, 22 Feb 2009) | 7 lines
+r15534 | mbook | 2009-02-22 00:41:23 +0100 (Sun, 22 Feb 2009) | 7 lines
+Changed paths:
+ M /branches/S2_1/client/gui-gtk-2.0/cityrep.c
Added set and append worklist menu items to the city report.
@@ -286,37 +1874,55 @@ Suggested by guest Carstairs in the wishlist forum:
http://forum.freeciv.org/viewtopic.php?t=5797
------------------------------------------------------------------------
-r15532 | mbook | 2009-02-22 08:35:23 +0900 (Sun, 22 Feb 2009) | 4 lines
+r15532 | mbook | 2009-02-22 00:35:23 +0100 (Sun, 22 Feb 2009) | 4 lines
+Changed paths:
+ M /branches/S2_1/client/options.c
+ M /branches/S2_1/client/options.h
+ M /branches/S2_1/client/packhand.c
Option to disable caravan popup.
See #40730
------------------------------------------------------------------------
-r15530 | mbook | 2009-02-22 08:24:42 +0900 (Sun, 22 Feb 2009) | 6 lines
+r15530 | mbook | 2009-02-22 00:24:42 +0100 (Sun, 22 Feb 2009) | 6 lines
+Changed paths:
+ M /branches/S2_1/client/gui-gtk-2.0/pages.c
+ M /branches/S2_1/data/default/units.ruleset
+ M /branches/S2_1/data/nation/slovakian.ruleset
Fix "leader" translation ambiguity.
See #40725
-Reported by: Susanna Bj?\195?\182rverud <susanna.bjorverud at telia.com>
+Reported by: Susanna Björverud <susanna.bjorverud at telia.com>
------------------------------------------------------------------------
-r15528 | mbook | 2009-02-22 08:20:22 +0900 (Sun, 22 Feb 2009) | 4 lines
+r15528 | mbook | 2009-02-22 00:20:22 +0100 (Sun, 22 Feb 2009) | 4 lines
+Changed paths:
+ M /branches/S2_1/client/gui-gtk-2.0/cityrep.c
Clear worklist menu item in the city report.
See #40723
------------------------------------------------------------------------
-r15526 | mbook | 2009-02-22 08:16:34 +0900 (Sun, 22 Feb 2009) | 4 lines
+r15526 | mbook | 2009-02-22 00:16:34 +0100 (Sun, 22 Feb 2009) | 4 lines
+Changed paths:
+ M /branches/S2_1/client/gui-gtk-2.0/gui_main.c
+ M /branches/S2_1/client/gui-gtk-2.0/gui_main.h
+ M /branches/S2_1/client/gui-gtk-2.0/messagewin.c
Option to hide message window buttons.
See #40733
------------------------------------------------------------------------
-r15524 | mbook | 2009-02-22 08:08:30 +0900 (Sun, 22 Feb 2009) | 11 lines
+r15524 | mbook | 2009-02-22 00:08:30 +0100 (Sun, 22 Feb 2009) | 11 lines
+Changed paths:
+ M /branches/S2_1/client/gui-gtk-2.0/gui_main.c
+ M /branches/S2_1/client/gui-gtk-2.0/gui_main.h
+ M /branches/S2_1/client/gui-gtk-2.0/messagewin.c
Option to have new events appear at the top of the message window.
@@ -330,14 +1936,22 @@ Option to have new events appear at the top of the message window.
See #40718
------------------------------------------------------------------------
-r15522 | mbook | 2009-02-22 07:17:28 +0900 (Sun, 22 Feb 2009) | 4 lines
+r15522 | mbook | 2009-02-21 23:17:28 +0100 (Sat, 21 Feb 2009) | 4 lines
+Changed paths:
+ M /branches/S2_1/client/gui-gtk-2.0/gui_main.c
+ M /branches/S2_1/client/gui-gtk-2.0/gui_main.h
+ M /branches/S2_1/client/gui-gtk-2.0/pages.c
Option to have the metaserver tab appear first in the network page.
See #40701
------------------------------------------------------------------------
-r15520 | mbook | 2009-02-22 06:16:03 +0900 (Sun, 22 Feb 2009) | 7 lines
+r15520 | mbook | 2009-02-21 22:16:03 +0100 (Sat, 21 Feb 2009) | 7 lines
+Changed paths:
+ M /branches/S2_1/client/gui-gtk-2.0/gui_main.c
+ M /branches/S2_1/client/gui-gtk-2.0/gui_main.h
+ M /branches/S2_1/client/gui-gtk-2.0/messagewin.c
Option to split the lower area into two notebooks.
@@ -347,7 +1961,10 @@ Option to split the lower area into two notebooks.
See #40705
------------------------------------------------------------------------
-r15518 | mbook | 2009-02-22 06:08:41 +0900 (Sun, 22 Feb 2009) | 9 lines
+r15518 | mbook | 2009-02-21 22:08:41 +0100 (Sat, 21 Feb 2009) | 9 lines
+Changed paths:
+ M /branches/S2_1/client/cityrepdata.c
+ M /branches/S2_1/client/gui-gtk-2.0/cityrep.c
Revert city report column ordering changes of r12989.
@@ -359,7 +1976,13 @@ Revert city report column ordering changes of r12989.
See #40680
------------------------------------------------------------------------
-r15516 | mbook | 2009-02-20 14:08:25 +0900 (Fri, 20 Feb 2009) | 9 lines
+r15516 | mbook | 2009-02-20 06:08:25 +0100 (Fri, 20 Feb 2009) | 9 lines
+Changed paths:
+ M /branches/S2_1/client/control.c
+ M /branches/S2_1/client/control.h
+ M /branches/S2_1/client/goto.c
+ M /branches/S2_1/client/options.c
+ M /branches/S2_1/client/options.h
Option to not clear unit orders on selection.
@@ -371,14 +1994,21 @@ Option to not clear unit orders on selection.
See #40724
------------------------------------------------------------------------
-r15514 | mbook | 2009-02-20 11:03:49 +0900 (Fri, 20 Feb 2009) | 4 lines
+r15514 | mbook | 2009-02-20 03:03:49 +0100 (Fri, 20 Feb 2009) | 4 lines
+Changed paths:
+ M /branches/S2_1/client/gui-gtk-2.0/pages.c
Focus chat entry when switching to the start/pregame page.
See #40722
------------------------------------------------------------------------
-r15512 | mbook | 2009-02-20 10:56:26 +0900 (Fri, 20 Feb 2009) | 8 lines
+r15512 | mbook | 2009-02-20 02:56:26 +0100 (Fri, 20 Feb 2009) | 8 lines
+Changed paths:
+ M /branches/S2_1/client/gui-gtk-2.0/chatline.c
+ M /branches/S2_1/client/gui-gtk-2.0/chatline.h
+ M /branches/S2_1/client/gui-gtk-2.0/gui_main.c
+ M /branches/S2_1/client/gui-gtk-2.0/pages.c
Improved automatic chatline scrolling.
@@ -389,14 +2019,25 @@ Improved automatic chatline scrolling.
See #40721
------------------------------------------------------------------------
-r15510 | mbook | 2009-02-20 10:46:06 +0900 (Fri, 20 Feb 2009) | 4 lines
+r15510 | mbook | 2009-02-20 02:46:06 +0100 (Fri, 20 Feb 2009) | 4 lines
+Changed paths:
+ M /branches/S2_1/client/gui-gtk-2.0/messagewin.c
Right click on message window row centers on event tile.
See #40719
------------------------------------------------------------------------
-r15508 | mbook | 2009-02-20 10:35:01 +0900 (Fri, 20 Feb 2009) | 12 lines
+r15508 | mbook | 2009-02-20 02:35:01 +0100 (Fri, 20 Feb 2009) | 12 lines
+Changed paths:
+ M /branches/S2_1/client/goto.c
+ M /branches/S2_1/client/goto.h
+ M /branches/S2_1/client/gui-gtk-2.0/mapctrl.c
+ M /branches/S2_1/client/mapctrl_common.c
+ M /branches/S2_1/client/mapview_common.c
+ M /branches/S2_1/client/mapview_common.h
+ M /branches/S2_1/client/packhand.c
+ M /branches/S2_1/client/tilespec.c
Map decoration drawing speedup and cleanup.
@@ -411,18 +2052,34 @@ Map decoration drawing speedup and cleanup.
See #40717
------------------------------------------------------------------------
-r15507 | mbook | 2009-02-20 10:17:20 +0900 (Fri, 20 Feb 2009) | 4 lines
+r15507 | mbook | 2009-02-20 02:17:20 +0100 (Fri, 20 Feb 2009) | 4 lines
+Changed paths:
+ M /branches/S2_1/utility/Makefile.am
+ M /branches/S2_1/utility/hash.c
+ M /branches/S2_1/utility/hash.h
+ A /branches/S2_1/utility/iterator.h
Backport generic iterator interface and improved hash table iteration from trunk.
See #40716
------------------------------------------------------------------------
-r15506 | jcreus | 2009-02-19 08:22:13 +0900 (Thu, 19 Feb 2009) | 1 line
+r15506 | jcreus | 2009-02-19 00:22:13 +0100 (Thu, 19 Feb 2009) | 1 line
+Changed paths:
+ M /branches/S2_1/po/ca.po
Updating Catalan translation
------------------------------------------------------------------------
-r15504 | mbook | 2009-02-18 13:31:03 +0900 (Wed, 18 Feb 2009) | 13 lines
+r15504 | mbook | 2009-02-18 05:31:03 +0100 (Wed, 18 Feb 2009) | 13 lines
+Changed paths:
+ M /branches/S2_1/client/gui-gtk-2.0/gui_stuff.c
+ M /branches/S2_1/client/gui-gtk-2.0/gui_stuff.h
+ M /branches/S2_1/client/gui-gtk-2.0/pages.c
+ M /branches/S2_1/client/gui-sdl/connectdlg.c
+ M /branches/S2_1/client/gui-win32/connectdlg.c
+ M /branches/S2_1/client/gui-xaw/connectdlg.c
+ M /branches/S2_1/client/servers.c
+ M /branches/S2_1/client/servers.h
Server player list addition and server scan cleanup.
@@ -438,7 +2095,11 @@ Server player list addition and server scan cleanup.
See #40707
------------------------------------------------------------------------
-r15502 | mbook | 2009-02-18 13:13:41 +0900 (Wed, 18 Feb 2009) | 7 lines
+r15502 | mbook | 2009-02-18 05:13:41 +0100 (Wed, 18 Feb 2009) | 7 lines
+Changed paths:
+ M /branches/S2_1/client/climisc.c
+ M /branches/S2_1/client/climisc.h
+ M /branches/S2_1/client/gui-gtk-2.0/gui_main.c
Buy city production directly from mapview.
@@ -448,14 +2109,23 @@ Buy city production directly from mapview.
See #40704
------------------------------------------------------------------------
-r15500 | mbook | 2009-02-18 13:05:31 +0900 (Wed, 18 Feb 2009) | 4 lines
+r15500 | mbook | 2009-02-18 05:05:31 +0100 (Wed, 18 Feb 2009) | 4 lines
+Changed paths:
+ M /branches/S2_1/client/control.c
+ M /branches/S2_1/client/control.h
+ M /branches/S2_1/client/gui-gtk-2.0/menu.c
+ M /branches/S2_1/client/mapview_common.c
+ M /branches/S2_1/client/options.c
+ M /branches/S2_1/client/options.h
Option to show production buy cost in the city description.
See #40702
------------------------------------------------------------------------
-r15498 | mbook | 2009-02-18 12:20:26 +0900 (Wed, 18 Feb 2009) | 7 lines
+r15498 | mbook | 2009-02-18 04:20:26 +0100 (Wed, 18 Feb 2009) | 7 lines
+Changed paths:
+ M /branches/S2_1/client/cityrepdata.c
Revert city report concise status symbols changes.
@@ -465,7 +2135,13 @@ Revert city report concise status symbols changes.
See #40700
------------------------------------------------------------------------
-r15496 | mbook | 2009-02-18 11:26:17 +0900 (Wed, 18 Feb 2009) | 8 lines
+r15496 | mbook | 2009-02-18 03:26:17 +0100 (Wed, 18 Feb 2009) | 8 lines
+Changed paths:
+ M /branches/S2_1/client/gui-gtk-2.0/gui_main.c
+ M /branches/S2_1/client/gui-gtk-2.0/gui_main.h
+ M /branches/S2_1/client/gui-gtk-2.0/mapview.c
+ M /branches/S2_1/client/mapctrl_common.c
+ M /branches/S2_1/client/mapview_common.c
Use XOR drawing operation for selection rectangle.
@@ -476,7 +2152,14 @@ Use XOR drawing operation for selection rectangle.
See #40646
------------------------------------------------------------------------
-r15485 | mbook | 2009-02-16 09:18:21 +0900 (Mon, 16 Feb 2009) | 6 lines
+r15485 | mbook | 2009-02-16 01:18:21 +0100 (Mon, 16 Feb 2009) | 6 lines
+Changed paths:
+ M /branches/S2_1/data/nation/armenian.ruleset
+ M /branches/S2_1/data/nation/illyrian.ruleset
+ M /branches/S2_1/data/nation/malian.ruleset
+ M /branches/S2_1/data/nation/mayan.ruleset
+ M /branches/S2_1/data/nation/soviet.ruleset
+ M /branches/S2_1/data/nation/westphalian.ruleset
Minor fixes and improvements in nation legend texts.
@@ -485,7 +2168,12 @@ See #40694
Reported by: Sini Ruohomaa <sini.ruohomaa at cs.helsinki.fi>
------------------------------------------------------------------------
-r15484 | mbook | 2009-02-16 09:18:18 +0900 (Mon, 16 Feb 2009) | 10 lines
+r15484 | mbook | 2009-02-16 01:18:18 +0100 (Mon, 16 Feb 2009) | 10 lines
+Changed paths:
+ M /branches/S2_1/server/diplomats.c
+ M /branches/S2_1/server/unithand.c
+ M /branches/S2_1/server/unittools.c
+ M /branches/S2_1/server/unittools.h
Fix veteran notify message grammar.
@@ -498,7 +2186,10 @@ See #40693
Reported by: Sini Ruohomaa <sini.ruohomaa at cs.helsinki.fi>
------------------------------------------------------------------------
-r15483 | mbook | 2009-02-16 09:18:15 +0900 (Mon, 16 Feb 2009) | 6 lines
+r15483 | mbook | 2009-02-16 01:18:15 +0100 (Mon, 16 Feb 2009) | 6 lines
+Changed paths:
+ M /branches/S2_1/client/gui-sdl/graphics.c
+ M /branches/S2_1/client/gui-sdl/gui_string.c
Fix typo and unused code in SDL strings.
@@ -507,7 +2198,10 @@ See #40691
Reported by: Sini Ruohomaa <sini.ruohomaa at cs.helsinki.fi>
------------------------------------------------------------------------
-r15482 | mbook | 2009-02-16 09:18:12 +0900 (Mon, 16 Feb 2009) | 6 lines
+r15482 | mbook | 2009-02-16 01:18:12 +0100 (Mon, 16 Feb 2009) | 6 lines
+Changed paths:
+ M /branches/S2_1/client/text.c
+ M /branches/S2_1/server/report.c
Fix "<government> of the <nation>" constructs.
@@ -516,7 +2210,9 @@ See #40689
Reported by: Sini Ruohomaa <sini.ruohomaa at cs.helsinki.fi>
------------------------------------------------------------------------
-r15481 | mbook | 2009-02-16 09:18:10 +0900 (Mon, 16 Feb 2009) | 6 lines
+r15481 | mbook | 2009-02-16 01:18:10 +0100 (Mon, 16 Feb 2009) | 6 lines
+Changed paths:
+ M /branches/S2_1/server/unittools.c
Fix and improve gold upkeep disband message.
@@ -525,7 +2221,9 @@ See #40687
Reported by: Sini Ruohomaa <sini.ruohomaa at cs.helsinki.fi>
------------------------------------------------------------------------
-r15480 | mbook | 2009-02-16 09:18:07 +0900 (Mon, 16 Feb 2009) | 6 lines
+r15480 | mbook | 2009-02-16 01:18:07 +0100 (Mon, 16 Feb 2009) | 6 lines
+Changed paths:
+ M /branches/S2_1/server/savegame.c
Do not translate internal game loading error message.
@@ -534,7 +2232,9 @@ See #40690
Reported by: Sini Ruohomaa <sini.ruohomaa at cs.helsinki.fi>
------------------------------------------------------------------------
-r15479 | mbook | 2009-02-16 09:18:05 +0900 (Mon, 16 Feb 2009) | 6 lines
+r15479 | mbook | 2009-02-16 01:18:05 +0100 (Mon, 16 Feb 2009) | 6 lines
+Changed paths:
+ M /branches/S2_1/data/scenario/tutorial.sav
Fix typos in tutorial scenario.
@@ -543,14 +2243,20 @@ See #40699
Reported by: Sini Ruohomaa <sini.ruohomaa at cs.helsinki.fi>
------------------------------------------------------------------------
-r15478 | mbook | 2009-02-16 09:18:02 +0900 (Mon, 16 Feb 2009) | 4 lines
+r15478 | mbook | 2009-02-16 01:18:02 +0100 (Mon, 16 Feb 2009) | 4 lines
+Changed paths:
+ M /branches/S2_1/client/gui-gtk-2.0/mapview.c
Capitalize first letter of civilization frame label.
See #40692
------------------------------------------------------------------------
-r15477 | mbook | 2009-02-16 09:18:00 +0900 (Mon, 16 Feb 2009) | 6 lines
+r15477 | mbook | 2009-02-16 01:18:00 +0100 (Mon, 16 Feb 2009) | 6 lines
+Changed paths:
+ M /branches/S2_1/client/cityrepdata.c
+ M /branches/S2_1/client/gui-xaw/citydlg.c
+ M /branches/S2_1/data/default/units.ruleset
Fix "workers" translation ambiguity.
@@ -559,7 +2265,9 @@ See #40684
Reported by: Sini Ruohomaa <sini.ruohomaa at cs.helsinki.fi>
------------------------------------------------------------------------
-r15476 | mbook | 2009-02-16 09:17:57 +0900 (Mon, 16 Feb 2009) | 6 lines
+r15476 | mbook | 2009-02-16 01:17:57 +0100 (Mon, 16 Feb 2009) | 6 lines
+Changed paths:
+ M /branches/S2_1/client/text.c
Fix sentence fragments in text_happiness_units().
@@ -568,7 +2276,9 @@ See #40685
Reported by: Sini Ruohomaa <sini.ruohomaa at cs.helsinki.fi>
------------------------------------------------------------------------
-r15475 | mbook | 2009-02-16 09:17:54 +0900 (Mon, 16 Feb 2009) | 6 lines
+r15475 | mbook | 2009-02-16 01:17:54 +0100 (Mon, 16 Feb 2009) | 6 lines
+Changed paths:
+ M /branches/S2_1/data/helpdata.txt
Fix typo and awkward phrasing in diplomacy help text.
@@ -577,7 +2287,9 @@ See #40686
Reported by: Sini Ruohomaa <sini.ruohomaa at cs.helsinki.fi>
------------------------------------------------------------------------
-r15474 | mbook | 2009-02-16 09:17:50 +0900 (Mon, 16 Feb 2009) | 6 lines
+r15474 | mbook | 2009-02-16 01:17:50 +0100 (Mon, 16 Feb 2009) | 6 lines
+Changed paths:
+ M /branches/S2_1/server/plrhand.c
Fix civil war message grammar.
@@ -586,35 +2298,51 @@ See #40688
Reported by: Sini Ruohomaa <sini.ruohomaa at cs.helsinki.fi>
------------------------------------------------------------------------
-r15471 | mbook | 2009-02-16 04:18:31 +0900 (Mon, 16 Feb 2009) | 4 lines
+r15471 | mbook | 2009-02-15 20:18:31 +0100 (Sun, 15 Feb 2009) | 4 lines
+Changed paths:
+ M /branches/S2_1/server/settings.c
+ M /branches/S2_1/server/srv_main.c
Improved autogenerated savename with turn number.
See #40681
------------------------------------------------------------------------
-r15468 | mbook | 2009-02-10 13:10:43 +0900 (Tue, 10 Feb 2009) | 4 lines
+r15468 | mbook | 2009-02-10 05:10:43 +0100 (Tue, 10 Feb 2009) | 4 lines
+Changed paths:
+ M /branches/S2_1/client/mapctrl_common.c
+ M /branches/S2_1/client/options.c
+ M /branches/S2_1/client/options.h
Option to select cities before units with the selection rectangle.
See #40703
------------------------------------------------------------------------
-r15466 | mbook | 2009-02-10 12:52:32 +0900 (Tue, 10 Feb 2009) | 4 lines
+r15466 | mbook | 2009-02-10 04:52:32 +0100 (Tue, 10 Feb 2009) | 4 lines
+Changed paths:
+ M /branches/S2_1/client/gui-gtk-2.0/chatline.c
+ M /branches/S2_1/client/gui-gtk-2.0/gui_main.c
+ M /branches/S2_1/client/gui-gtk-2.0/gui_main.h
Option to prefix chat messages with the current time.
See #40706
------------------------------------------------------------------------
-r15465 | mbook | 2009-02-10 12:19:36 +0900 (Tue, 10 Feb 2009) | 4 lines
+r15465 | mbook | 2009-02-10 04:19:36 +0100 (Tue, 10 Feb 2009) | 4 lines
+Changed paths:
+ M /branches/S2_1/client/gui-gtk-2.0/mapctrl.c
+ M /branches/S2_1/client/mapctrl_common.c
Fix unit selection append feature I previously broke.
See #40698
------------------------------------------------------------------------
-r15464 | mbook | 2009-02-10 12:15:17 +0900 (Tue, 10 Feb 2009) | 6 lines
+r15464 | mbook | 2009-02-10 04:15:17 +0100 (Tue, 10 Feb 2009) | 6 lines
+Changed paths:
+ M /branches/S2_1/client/gui-gtk-2.0/cityrep.c
S2_1 port of the total buy cost label update bug fix.
@@ -623,7 +2351,9 @@ See #40695
Reported by: Christian Knoke <chrisk at cknoke.de>
------------------------------------------------------------------------
-r15462 | mbook | 2009-02-08 03:46:45 +0900 (Sun, 08 Feb 2009) | 6 lines
+r15462 | mbook | 2009-02-07 19:46:45 +0100 (Sat, 07 Feb 2009) | 6 lines
+Changed paths:
+ M /branches/S2_1/client/goto.c
Fix assertion failure when doing irrigation-connect on a mine.
@@ -632,12 +2362,21 @@ See #40676
Reported By: Ann Barcomb <ann at domaintje.com>
------------------------------------------------------------------------
-r15460 | cazfi | 2009-02-04 05:14:13 +0900 (Wed, 04 Feb 2009) | 2 lines
+r15460 | cazfi | 2009-02-03 21:14:13 +0100 (Tue, 03 Feb 2009) | 2 lines
+Changed paths:
+ M /branches/S2_1/po/fi.po
Updated translation by Sini Ruohomaa.
------------------------------------------------------------------------
-r15456 | mbook | 2009-01-30 12:42:47 +0900 (Fri, 30 Jan 2009) | 9 lines
+r15456 | mbook | 2009-01-30 04:42:47 +0100 (Fri, 30 Jan 2009) | 9 lines
+Changed paths:
+ M /branches/S2_1/client/control.c
+ M /branches/S2_1/client/control.h
+ M /branches/S2_1/client/gui-gtk-2.0/menu.c
+ M /branches/S2_1/client/mapview_common.c
+ M /branches/S2_1/client/options.c
+ M /branches/S2_1/client/options.h
Minimal mapview traderoute lines by popular request.
@@ -649,7 +2388,9 @@ See #40668
Ported from warclient code originally by pepeto and myself.
------------------------------------------------------------------------
-r15452 | mbook | 2009-01-29 11:31:24 +0900 (Thu, 29 Jan 2009) | 7 lines
+r15452 | mbook | 2009-01-29 03:31:24 +0100 (Thu, 29 Jan 2009) | 7 lines
+Changed paths:
+ M /branches/S2_1/client/gui-gtk-2.0/mapctrl.c
Re-enable copy to production clipboard.
@@ -659,21 +2400,29 @@ Re-enable copy to production clipboard.
See #40679
------------------------------------------------------------------------
-r15450 | mbook | 2009-01-29 10:35:12 +0900 (Thu, 29 Jan 2009) | 4 lines
+r15450 | mbook | 2009-01-29 02:35:12 +0100 (Thu, 29 Jan 2009) | 4 lines
+Changed paths:
+ M /branches/S2_1/client/control.c
+ M /branches/S2_1/client/options.c
+ M /branches/S2_1/client/options.h
Option to disable all mouse cursor changes.
See #40678
------------------------------------------------------------------------
-r15449 | mbook | 2009-01-29 10:29:39 +0900 (Thu, 29 Jan 2009) | 4 lines
+r15449 | mbook | 2009-01-29 02:29:39 +0100 (Thu, 29 Jan 2009) | 4 lines
+Changed paths:
+ M /branches/S2_1/client/gui-gtk-2.0/cityrep.c
Move governor menu to its own menu item in the city report.
See #40677
------------------------------------------------------------------------
-r15444 | mbook | 2009-01-29 06:47:32 +0900 (Thu, 29 Jan 2009) | 9 lines
+r15444 | mbook | 2009-01-28 22:47:32 +0100 (Wed, 28 Jan 2009) | 9 lines
+Changed paths:
+ M /branches/S2_1/server/unittools.c
Fix teleporting exploit by modifying bounce_unit() behavior.
@@ -685,14 +2434,18 @@ Fix teleporting exploit by modifying bounce_unit() behavior.
See #40658
------------------------------------------------------------------------
-r15441 | mbook | 2009-01-26 14:30:57 +0900 (Mon, 26 Jan 2009) | 4 lines
+r15441 | mbook | 2009-01-26 06:30:57 +0100 (Mon, 26 Jan 2009) | 4 lines
+Changed paths:
+ M /branches/S2_1/client/connectdlg_common.c
Somewhat clearer client hack access messages.
See #40662
------------------------------------------------------------------------
-r15438 | cazfi | 2009-01-26 00:53:44 +0900 (Mon, 26 Jan 2009) | 5 lines
+r15438 | cazfi | 2009-01-25 16:53:44 +0100 (Sun, 25 Jan 2009) | 5 lines
+Changed paths:
+ M /branches/S2_1/m4/auth.m4
Fixed a bug that mysql libraries wewre never searched from alternative
locations.
@@ -700,7 +2453,10 @@ locations.
See #40674
------------------------------------------------------------------------
-r15425 | cazfi | 2009-01-17 20:44:55 +0900 (Sat, 17 Jan 2009) | 6 lines
+r15425 | cazfi | 2009-01-17 12:44:55 +0100 (Sat, 17 Jan 2009) | 6 lines
+Changed paths:
+ M /branches/S2_1/configure.ac
+ M /branches/S2_1/m4/ggz.m4
Fixed bashisms from configure to make it work with Solaris /bin/sh
@@ -709,7 +2465,10 @@ Patch by Halton Huo
See #40659
------------------------------------------------------------------------
-r15415 | mbook | 2009-01-12 11:18:15 +0900 (Mon, 12 Jan 2009) | 9 lines
+r15415 | mbook | 2009-01-12 03:18:15 +0100 (Mon, 12 Jan 2009) | 9 lines
+Changed paths:
+ M /branches/S2_1/client/gui-gtk-2.0/repodlgs.c
+ M /branches/S2_1/client/helpdata.c
Fix compilation with Sun Studio Community Edition compiler.
@@ -721,7 +2480,9 @@ See #40616
Reported by: James McClain <james.mcclain at gmail.com>
------------------------------------------------------------------------
-r15411 | mbook | 2009-01-10 12:44:08 +0900 (Sat, 10 Jan 2009) | 6 lines
+r15411 | mbook | 2009-01-10 04:44:08 +0100 (Sat, 10 Jan 2009) | 6 lines
+Changed paths:
+ M /branches/S2_1/data/default.serv
Fix startunits in default server script.
@@ -730,7 +2491,9 @@ See #40611
Reported by: Brandon Van Every <bvanevery at gmail.com>
------------------------------------------------------------------------
-r15397 | mbook | 2009-01-07 15:50:23 +0900 (Wed, 07 Jan 2009) | 7 lines
+r15397 | mbook | 2009-01-07 07:50:23 +0100 (Wed, 07 Jan 2009) | 7 lines
+Changed paths:
+ M /branches/S2_1/ai/aiexplorer.c
Make auto-explore respect borders.
@@ -740,7 +2503,10 @@ Patch by: Thomas Kuehne <thomas at kuehne.cn>
(With minor changes by me.)
------------------------------------------------------------------------
-r15390 | mbook | 2008-12-30 13:16:41 +0900 (Tue, 30 Dec 2008) | 10 lines
+r15390 | mbook | 2008-12-30 05:16:41 +0100 (Tue, 30 Dec 2008) | 10 lines
+Changed paths:
+ M /branches/S2_1/server/sernet.c
+ M /branches/S2_1/utility/timing.c
Check for NULL ping timers when closing a connection.
@@ -753,7 +2519,10 @@ See #40605
Reported by: Marko Lindqvist <cazfi74 at gmail.com>
------------------------------------------------------------------------
-r15385 | mbook | 2008-12-27 14:23:51 +0900 (Sat, 27 Dec 2008) | 6 lines
+r15385 | mbook | 2008-12-27 06:23:51 +0100 (Sat, 27 Dec 2008) | 6 lines
+Changed paths:
+ M /branches/S2_1/common/map.h
+ M /branches/S2_1/server/generator/mapgen.c
Fix river generation for island generator.
@@ -762,7 +2531,9 @@ See #15947
Patch by: Brendon Oram <bjoram at gmail.com>
------------------------------------------------------------------------
-r15367 | mbook | 2008-12-17 11:58:08 +0900 (Wed, 17 Dec 2008) | 6 lines
+r15367 | mbook | 2008-12-17 03:58:08 +0100 (Wed, 17 Dec 2008) | 6 lines
+Changed paths:
+ M /branches/S2_1/server/generator/mapgen.c
Prevent island generator from connecting continents.
@@ -771,24 +2542,33 @@ See #17435
Patch by: Brendon Oram <bjoram at gmail.com>
------------------------------------------------------------------------
-r15361 | mbook | 2008-12-06 13:58:41 +0900 (Sat, 06 Dec 2008) | 4 lines
+r15361 | mbook | 2008-12-06 05:58:41 +0100 (Sat, 06 Dec 2008) | 4 lines
+Changed paths:
+ M /branches/S2_1/server/auth.c
Remove is_safe_filename check in load_auth_config.
See #40577
------------------------------------------------------------------------
-r15348 | jcreus | 2008-11-30 23:05:12 +0900 (Sun, 30 Nov 2008) | 1 line
+r15348 | jcreus | 2008-11-30 15:05:12 +0100 (Sun, 30 Nov 2008) | 1 line
+Changed paths:
+ M /branches/S2_1/po/ca.po
4290 messages
------------------------------------------------------------------------
-r15346 | dmarks | 2008-11-30 21:46:55 +0900 (Sun, 30 Nov 2008) | 1 line
+r15346 | dmarks | 2008-11-30 13:46:55 +0100 (Sun, 30 Nov 2008) | 1 line
+Changed paths:
+ M /branches/S2_1/version.in
Bump version to 2.1.8+
------------------------------------------------------------------------
-r15344 | dmarks | 2008-11-30 21:44:26 +0900 (Sun, 30 Nov 2008) | 1 line
+r15344 | dmarks | 2008-11-30 13:44:26 +0100 (Sun, 30 Nov 2008) | 1 line
+Changed paths:
+ M /branches/S2_1/ChangeLog
Update changelog for 2.1.8
+------------------------------------------------------------------------
Sun, 30 Nov 2008 03:48:06 -0800 dmarks:
diff --git a/Makefile.in b/Makefile.in
index 8f612f9..cba7816 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,84 +14,160 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = .
+DIST_COMMON = README $(am__configure_deps) $(noinst_HEADERS) \
+ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ $(srcdir)/config.h.in $(top_srcdir)/bootstrap/civ.in \
+ $(top_srcdir)/bootstrap/freeciv.spec.in \
+ $(top_srcdir)/bootstrap/ser.in \
+ $(top_srcdir)/bootstrap/undep.sh.in $(top_srcdir)/configure \
+ $(top_srcdir)/intl/Makefile.in ABOUT-NLS AUTHORS COPYING \
+ ChangeLog INSTALL NEWS bootstrap/config.guess \
+ bootstrap/config.rpath bootstrap/config.sub bootstrap/depcomp \
+ bootstrap/install-sh bootstrap/missing bootstrap/mkinstalldirs
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno config.status.lineno
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = config.h
+CONFIG_CLEAN_FILES = intl/Makefile freeciv.spec bootstrap/undep.sh civ \
+ ser
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
+HEADERS = $(noinst_HEADERS)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+ distdir dist dist-all distcheck
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = data intl utility common tests win32 ai dependencies \
+ server client po doc manual
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+am__remove_distdir = \
+ { test ! -d "$(distdir)" \
+ || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+ && rm -fr "$(distdir)"; }; }
+am__relativize = \
+ dir0=`pwd`; \
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+ sed_rest='s,^[^/]*/*,,'; \
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+ sed_butlast='s,/*[^/]*$$,,'; \
+ while test -n "$$dir1"; do \
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+ if test "$$first" != "."; then \
+ if test "$$first" = ".."; then \
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+ else \
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+ if test "$$first2" = "$$first"; then \
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+ else \
+ dir2="../$$dir2"; \
+ fi; \
+ dir0="$$dir0"/"$$first"; \
+ fi; \
+ fi; \
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+ done; \
+ reldir="$$dir2"
+DIST_ARCHIVES = $(distdir).tar.gz
+GZIP_ENV = --best
+distuninstallcheck_listfiles = find . -type f -print
+distcleancheck_listfiles = find . -type f -print
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -101,10 +178,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -112,27 +193,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -140,6 +233,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -150,17 +245,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -173,29 +289,48 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I m4
-
- at CLIENT_TRUE@CSUBDIRS = client
@CLIENT_FALSE at CSUBDIRS =
-
- at SERVER_TRUE@SSUBDIRS = ai dependencies server
+ at CLIENT_TRUE@CSUBDIRS = client
@SERVER_FALSE at SSUBDIRS =
-
+ at SERVER_TRUE@SSUBDIRS = ai dependencies server
@CLIENT_FALSE@@SERVER_TRUE at MSUBDIRS =
@CLIENT_TRUE@@SERVER_TRUE at MSUBDIRS = manual
@SERVER_FALSE at MSUBDIRS =
-
- at MAKE_DATA_TRUE@DSUBDIRS = data
@MAKE_DATA_FALSE at DSUBDIRS =
-
+ at MAKE_DATA_TRUE@DSUBDIRS = data
SUBDIRS = $(DSUBDIRS) intl utility common tests win32 $(SSUBDIRS) $(CSUBDIRS) po doc $(MSUBDIRS)
-
EXTRA_DIST = autogen.sh \
config.mac.h \
configure.ac \
@@ -267,64 +402,59 @@ EXTRA_DIST = autogen.sh \
vms/vms_build.com \
scripts/setup_auth_server.sh
-
noinst_HEADERS = version.in
-subdir = .
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = intl/Makefile freeciv.spec bootstrap/undep.sh civ \
- ser
-DIST_SOURCES =
-HEADERS = $(noinst_HEADERS)
-
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
- uninstall-info-recursive all-recursive install-data-recursive \
- install-exec-recursive installdirs-recursive install-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.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
$(MAKE) $(AM_MAKEFLAGS) all-recursive
.SUFFIXES:
-
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
-
-$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+am--refresh:
+ @:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
+ $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ echo ' $(SHELL) ./config.status'; \
+ $(SHELL) ./config.status;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
-$(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/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)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ $(am__cd) $(srcdir) && $(AUTOCONF)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+$(am__aclocal_m4_deps):
config.h: stamp-h1
@if test ! -f $@; then \
rm -f stamp-h1; \
- $(MAKE) stamp-h1; \
+ $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
else :; fi
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status config.h
-
-$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && $(AUTOHEADER)
- touch $(srcdir)/config.h.in
+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
+ rm -f stamp-h1
+ touch $@
distclean-hdr:
-rm -f config.h stamp-h1
@@ -338,7 +468,6 @@ civ: $(top_builddir)/config.status $(top_srcdir)/bootstrap/civ.in
cd $(top_builddir) && $(SHELL) ./config.status $@
ser: $(top_builddir)/config.status $(top_srcdir)/bootstrap/ser.in
cd $(top_builddir) && $(SHELL) ./config.status $@
-uninstall-info-am:
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
@@ -347,7 +476,13 @@ uninstall-info-am:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @set fnord $$MAKEFLAGS; amf=$$2; \
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -358,16 +493,21 @@ $(RECURSIVE_TARGETS):
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
- @set fnord $$MAKEFLAGS; amf=$$2; \
+$(RECURSIVE_CLEAN_TARGETS):
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -387,130 +527,212 @@ maintainer-clean-recursive:
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+ctags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
-
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ empty_fix=.; \
+ else \
+ include_option=--include; \
+ empty_fix=; \
+ fi; \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+ test ! -f $$subdir/TAGS || \
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = .
-distdir = $(PACKAGE)-$(VERSION)
-
-am__remove_distdir = \
- { test ! -d $(distdir) \
- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
- && rm -fr $(distdir); }; }
-
-GZIP_ENV = --best
-distcleancheck_listfiles = find . -type f -print
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
$(am__remove_distdir)
- mkdir $(distdir)
- $(mkinstalldirs) $(distdir)/amiga $(distdir)/bootstrap $(distdir)/data $(distdir)/intl $(distdir)/m4 $(distdir)/po $(distdir)/scripts $(distdir)/vms
- @list='$(DISTFILES)'; for file in $$list; do \
+ test -d "$(distdir)" || mkdir "$(distdir)"
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d $(distdir)/$$subdir \
- || mkdir $(distdir)/$$subdir \
+ test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
- (cd $$subdir && \
+ fi; \
+ done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+ dir1=$$subdir; dir2="$(top_distdir)"; \
+ $(am__relativize); \
+ new_top_distdir=$$reldir; \
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+ ($(am__cd) $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$(top_distdir)" \
- distdir=../$(distdir)/$$subdir \
+ top_distdir="$$new_top_distdir" \
+ distdir="$$new_distdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
+ am__skip_mode_fix=: \
distdir) \
|| exit 1; \
fi; \
done
- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+ -test -n "$(am__skip_mode_fix)" \
+ || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
- || chmod -R a+r $(distdir)
+ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
+ || chmod -R a+r "$(distdir)"
dist-gzip: distdir
- $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ $(am__remove_distdir)
+
+dist-bzip2: distdir
+ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+ $(am__remove_distdir)
+
+dist-lzma: distdir
+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+ $(am__remove_distdir)
+
+dist-xz: distdir
+ tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+ $(am__remove_distdir)
+
+dist-tarZ: distdir
+ tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+ $(am__remove_distdir)
+
+dist-shar: distdir
+ shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+ $(am__remove_distdir)
+
+dist-zip: distdir
+ -rm -f $(distdir).zip
+ zip -rq $(distdir).zip $(distdir)
$(am__remove_distdir)
dist dist-all: distdir
- $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(am__remove_distdir)
# This target untars the dist file and tries a VPATH configuration. Then
# it guarantees that the distribution is self-contained by making another
# tarfile.
distcheck: dist
- $(am__remove_distdir)
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
+ case '$(DIST_ARCHIVES)' in \
+ *.tar.gz*) \
+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+ *.tar.bz2*) \
+ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lzma*) \
+ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+ *.tar.xz*) \
+ xz -dc $(distdir).tar.xz | $(am__untar) ;;\
+ *.tar.Z*) \
+ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+ *.shar.gz*) \
+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+ *.zip*) \
+ unzip $(distdir).zip ;;\
+ esac
chmod -R a-w $(distdir); chmod a+w $(distdir)
- mkdir $(distdir)/=build
- mkdir $(distdir)/=inst
+ mkdir $(distdir)/_build
+ mkdir $(distdir)/_inst
chmod a-w $(distdir)
- dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \
- && cd $(distdir)/=build \
- && ../configure --srcdir=.. --prefix=$$dc_install_base \
+ test -d $(distdir)/_build || exit 0; \
+ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
+ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
+ && am__cwd=`pwd` \
+ && $(am__cd) $(distdir)/_build \
+ && ../configure --srcdir=.. --prefix="$$dc_install_base" \
--with-included-gettext \
$(DISTCHECK_CONFIGURE_FLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) \
@@ -519,23 +741,42 @@ distcheck: dist
&& $(MAKE) $(AM_MAKEFLAGS) install \
&& $(MAKE) $(AM_MAKEFLAGS) installcheck \
&& $(MAKE) $(AM_MAKEFLAGS) uninstall \
- && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \
- || { echo "ERROR: files left after uninstall:" ; \
- find $$dc_install_base -type f -print ; \
- exit 1; } >&2 ) \
- && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
- && rm -f $(distdir).tar.gz \
- && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
+ && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
+ distuninstallcheck \
+ && chmod -R a-w "$$dc_install_base" \
+ && ({ \
+ (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
+ distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
+ } || { rm -rf "$$dc_destdir"; exit 1; }) \
+ && rm -rf "$$dc_destdir" \
+ && $(MAKE) $(AM_MAKEFLAGS) dist \
+ && rm -rf $(DIST_ARCHIVES) \
+ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
+ && cd "$$am__cwd" \
+ || exit 1
$(am__remove_distdir)
- @echo "$(distdir).tar.gz is ready for distribution" | \
- sed 'h;s/./=/g;p;x;p;x'
+ @(echo "$(distdir) archives ready for distribution: "; \
+ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
+distuninstallcheck:
+ @$(am__cd) '$(distuninstallcheck_dir)' \
+ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+ || { echo "ERROR: files left after uninstall:" ; \
+ if test -n "$(DESTDIR)"; then \
+ echo " (check DESTDIR support)"; \
+ fi ; \
+ $(distuninstallcheck_listfiles) ; \
+ exit 1; } >&2
distcleancheck: distclean
- if test '$(srcdir)' = . ; then \
+ @if test '$(srcdir)' = . ; then \
echo "ERROR: distcleancheck can only run from a VPATH build" ; \
exit 1 ; \
fi
- test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
- || { echo "ERROR: files left after distclean:" ; \
+ @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+ || { echo "ERROR: files left in build directory after distclean:" ; \
$(distcleancheck_listfiles) ; \
exit 1; } >&2
check-am: all-am
@@ -543,7 +784,6 @@ check: check-recursive
all-am: Makefile $(HEADERS) config.h
installdirs: installdirs-recursive
installdirs-am:
-
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
@@ -555,7 +795,7 @@ install-am: all-am
installcheck: installcheck-recursive
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -563,7 +803,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -574,60 +815,93 @@ clean-am: clean-generic mostlyclean-am
distclean: distclean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+ -rm -f Makefile
distclean-am: clean-am distclean-generic distclean-hdr distclean-tags
dvi: dvi-recursive
dvi-am:
+html: html-recursive
+
+html-am:
+
info: info-recursive
info-am:
install-data-am:
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-recursive
+
+install-html-am:
+
install-info: install-info-recursive
+install-info-am:
+
install-man:
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
- -rm -rf autom4te.cache
+ -rm -rf $(top_srcdir)/autom4te.cache
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-recursive
mostlyclean-am: mostlyclean-generic
-uninstall-am: uninstall-info-am
+pdf: pdf-recursive
-uninstall-info: uninstall-info-recursive
+pdf-am:
-.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
- clean-generic clean-recursive dist dist-all dist-gzip distcheck \
- distclean distclean-generic distclean-hdr distclean-recursive \
- distclean-tags distcleancheck distdir dvi dvi-am dvi-recursive \
- info info-am info-recursive install install-am install-data \
- install-data-am install-data-recursive install-exec \
- install-exec-am install-exec-recursive install-info \
- install-info-am install-info-recursive install-man \
- install-recursive install-strip installcheck installcheck-am \
- installdirs installdirs-am installdirs-recursive \
- maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-generic \
- mostlyclean-recursive tags tags-recursive uninstall \
- uninstall-am uninstall-info-am uninstall-info-recursive \
- uninstall-recursive
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
+ ctags-recursive install-am install-strip tags-recursive
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am am--refresh check check-am clean clean-generic \
+ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
+ dist-lzma dist-shar dist-tarZ dist-xz dist-zip distcheck \
+ distclean distclean-generic distclean-hdr distclean-tags \
+ distcleancheck distdir distuninstallcheck dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags tags-recursive uninstall uninstall-am
src-check:
cd tests && $(MAKE) $(AM_MAKEFLAGS) src-check
.PHONY: src-check
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/aclocal.m4 b/aclocal.m4
index 339be12..a8a12c4 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,7 +1,7 @@
-# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*-
+# generated automatically by aclocal 1.11 -*- Autoconf -*-
-# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
# 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.
@@ -11,385 +11,57 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
-
-# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-AC_PREREQ([2.52])
-
-# serial 6
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated. We must strip everything past the first ":",
-# and everything past the last "/".
-
-# _AM_DIRNAME(PATH)
-# -----------------
-# Like AS_DIRNAME, only do it during macro expansion
-AC_DEFUN([_AM_DIRNAME],
- [m4_if(regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1,
- m4_if(regexp([$1], [^//\([^/]\|$\)]), -1,
- m4_if(regexp([$1], [^/.*]), -1,
- [.],
- patsubst([$1], [^\(/\).*], [\1])),
- patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])),
- patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl
-])# _AM_DIRNAME
-
-
-# The stamp files are numbered to have different names.
-# We could number them on a directory basis, but that's additional
-# complications, let's have a unique counter.
-m4_define([_AM_STAMP_Count], [0])
-
-
-# _AM_STAMP(HEADER)
-# -----------------
-# The name of the stamp file for HEADER.
-AC_DEFUN([_AM_STAMP],
-[m4_define([_AM_STAMP_Count], m4_incr(_AM_STAMP_Count))dnl
-AS_ESCAPE(_AM_DIRNAME(patsubst([$1],
- [:.*])))/stamp-h[]_AM_STAMP_Count])
-
-
-# _AM_CONFIG_HEADER(HEADER[:SOURCES], COMMANDS, INIT-COMMANDS)
-# ------------------------------------------------------------
-# We used to try to get a real timestamp in stamp-h. But the fear is that
-# that will cause unnecessary cvs conflicts.
-AC_DEFUN([_AM_CONFIG_HEADER],
-[# Add the stamp file to the list of files AC keeps track of,
-# along with our hook.
-AC_CONFIG_HEADERS([$1],
- [# update the timestamp
-echo 'timestamp for $1' >"_AM_STAMP([$1])"
-$2],
- [$3])
-])# _AM_CONFIG_HEADER
-
-
-# AM_CONFIG_HEADER(HEADER[:SOURCES]..., COMMANDS, INIT-COMMANDS)
-# --------------------------------------------------------------
-AC_DEFUN([AM_CONFIG_HEADER],
-[AC_FOREACH([_AM_File], [$1], [_AM_CONFIG_HEADER(_AM_File, [$2], [$3])])
-])# AM_CONFIG_HEADER
-
-# Do all the work for Automake. -*- Autoconf -*-
-
-# This macro actually does too much some checks are only needed if
-# your package does certain things. But this isn't really a big deal.
-
-# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 8
-
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery. Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-AC_PREREQ([2.52])
-
-# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow
-# the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out. PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition. After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
- AC_REQUIRE([AC_PROG_INSTALL])dnl
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
- test -f $srcdir/config.status; then
- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
+[m4_warning([this file was generated for autoconf 2.64.
+You have another version of autoconf. It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
- AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl
- AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_MISSING_PROG(AMTAR, tar)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_][CC],
- [_AM_DEPENDENCIES(CC)],
- [define([AC_PROG_][CC],
- defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_][CXX],
- [_AM_DEPENDENCIES(CXX)],
- [define([AC_PROG_][CXX],
- defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-])
-])
-
-# Copyright 2002 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+#
+# 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.
# AM_AUTOMAKE_VERSION(VERSION)
# ----------------------------
# Automake X.Y traces this macro to ensure aclocal.m4 has been
# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.6"])
+# (This private macro should not be called outside this file.)
+AC_DEFUN([AM_AUTOMAKE_VERSION],
+[am__api_version='1.11'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version. Point them to the right macro.
+m4_if([$1], [1.11], [],
+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
+
+# _AM_AUTOCONF_VERSION(VERSION)
+# -----------------------------
+# aclocal traces this macro to find the Autoconf version.
+# This is a private macro too. Using m4_define simplifies
+# the logic in aclocal, which can simply ignore this definition.
+m4_define([_AM_AUTOCONF_VERSION], [])
# AM_SET_CURRENT_AUTOMAKE_VERSION
# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
- [AM_AUTOMAKE_VERSION([1.6.3])])
-
-# Helper functions for option handling. -*- Autoconf -*-
-
-# Copyright 2001, 2002 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+[AM_AUTOMAKE_VERSION([1.11])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 2
-
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
-# _AM_SET_OPTION(NAME)
-# ------------------------------
-# Set option NAME. Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-
-# _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN([_AM_SET_OPTIONS],
-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+# AM_AUX_DIR_EXPAND -*- Autoconf -*-
+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
#
-# Check to make sure that the build environment is sane.
-#
-
-# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 3
-
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments. Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
- if test "$[*]" = "X"; then
- # -L didn't work.
- set X `ls -t $srcdir/configure conftest.file`
- fi
- rm -f conftest.file
- if test "$[*]" != "X $srcdir/configure conftest.file" \
- && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
-alias in your environment])
- fi
-
- test "$[2]" = conftest.file
- )
-then
- # Ok.
- :
-else
- AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT(yes)])
-
-# -*- Autoconf -*-
-
-
-# Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 3
-
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN([AM_MISSING_PROG],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-
-
-# AM_MISSING_HAS_RUN
-# ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
-AC_DEFUN([AM_MISSING_HAS_RUN],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
- am_missing_run="$MISSING --run "
-else
- am_missing_run=
- AC_MSG_WARN([`missing' script is too old or missing])
-fi
-])
-
-# AM_AUX_DIR_EXPAND
-
-# Copyright 2001 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# 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.
# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
@@ -429,98 +101,57 @@ fi
# absolute PATH. The drawback is that using absolute paths prevent a
# configured tree to be moved without reconfiguration.
-# Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])
-
-AC_DEFUN([AM_AUX_DIR_EXPAND], [
+AC_DEFUN([AM_AUX_DIR_EXPAND],
+[dnl Rely on autoconf to set up CDPATH properly.
+AC_PREREQ([2.50])dnl
# expand $ac_aux_dir to an absolute path
am_aux_dir=`cd $ac_aux_dir && pwd`
])
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
+# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright 2001 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-AC_DEFUN([AM_PROG_INSTALL_SH],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
-AC_SUBST(install_sh)])
-
-# AM_PROG_INSTALL_STRIP
-
-# Copyright 2001 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
+# Free Software Foundation, Inc.
+#
+# 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.
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# serial 9
-# One issue with vendor `install' (even GNU) is that you can't
-# specify the program used to strip binaries. This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'. However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-if test "$cross_compiling" != no; then
- AC_CHECK_TOOL([STRIP], [strip], :)
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+# -------------------------------------
+# Define a conditional.
+AC_DEFUN([AM_CONDITIONAL],
+[AC_PREREQ(2.52)dnl
+ ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
+m4_define([_AM_COND_VALUE_$1], [$2])dnl
+if $2; then
+ $1_TRUE=
+ $1_FALSE='#'
+else
+ $1_TRUE='#'
+ $1_FALSE=
fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
-# serial 4 -*- Autoconf -*-
-
-# Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+AC_CONFIG_COMMANDS_PRE(
+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+ AC_MSG_ERROR([[conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.]])
+fi])])
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
+# Free Software Foundation, Inc.
+#
+# 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.
+# serial 10
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
# written in clear, in which case automake, when reading aclocal.m4,
@@ -529,7 +160,6 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
# _AM_DEPENDENCIES(NAME)
# ----------------------
# See how the compiler implements dependency checking.
@@ -549,6 +179,7 @@ AC_REQUIRE([AM_DEP_TRACK])dnl
ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
[$1], CXX, [depcc="$CXX" am_compiler_list=],
[$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+ [$1], UPC, [depcc="$UPC" am_compiler_list=],
[$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
[depcc="$$1" am_compiler_list=])
@@ -565,20 +196,56 @@ AC_CACHE_CHECK([dependency style of $depcc],
# using a relative directory.
cp "$am_depcomp" conftest.dir
cd conftest.dir
+ # We will build objects and dependencies in a subdirectory because
+ # it helps to detect inapplicable dependency modes. For instance
+ # both Tru64's cc and ICC support -MD to output dependencies as a
+ # side effect of compilation, but ICC will put the dependencies in
+ # the current directory while Tru64 will put them in the object
+ # directory.
+ mkdir sub
am_cv_$1_dependencies_compiler_type=none
if test "$am_compiler_list" = ""; then
am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
fi
+ am__universal=false
+ m4_case([$1], [CC],
+ [case " $depcc " in #(
+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
+ esac],
+ [CXX],
+ [case " $depcc " in #(
+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
+ esac])
+
for depmode in $am_compiler_list; do
+ # Setup a source with many dependencies, because some compilers
+ # like to wrap large dependency lists on column 80 (with \), and
+ # we should not choose a depcomp mode which is confused by this.
+ #
# We need to recreate these files for each test, as the compiler may
# overwrite some of them when testing with obscure command lines.
# This happens at least with the AIX C compiler.
- echo '#include "conftest.h"' > conftest.c
- echo 'int i;' > conftest.h
- echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
+ : > sub/conftest.c
+ for i in 1 2 3 4 5 6; do
+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+ # Solaris 8's {/usr,}/bin/sh.
+ touch sub/conftst$i.h
+ done
+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # mode. It turns out that the SunPro C++ compiler does not properly
+ # handle `-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs
+ am__obj=sub/conftest.${OBJEXT-o}
+ am__minus_obj="-o $am__obj"
case $depmode in
+ gcc)
+ # This depmode causes a compiler race in universal mode.
+ test "$am__universal" = false || continue
+ ;;
nosideeffect)
# after this tag, mechanisms are not by side-effect, so they'll
# only be used when explicitly requested
@@ -588,19 +255,36 @@ AC_CACHE_CHECK([dependency style of $depcc],
break
fi
;;
+ msvisualcpp | msvcmsys)
+ # This compiler won't grok `-c -o', but also, the minuso test has
+ # not run yet. These depmodes are late enough in the game, and
+ # so weak that their functioning should not be impacted.
+ am__obj=conftest.${OBJEXT-o}
+ am__minus_obj=
+ ;;
none) break ;;
esac
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this.
if depmode=$depmode \
- source=conftest.c object=conftest.o \
- depfile=conftest.Po tmpdepfile=conftest.TPo \
- $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
- grep conftest.h conftest.Po > /dev/null 2>&1 &&
+ source=sub/conftest.c object=$am__obj \
+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+ >/dev/null 2>conftest.err &&
+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
- am_cv_$1_dependencies_compiler_type=$depmode
- break
+ # icc doesn't choke on unknown options, it will just issue warnings
+ # or remarks (even with -Werror). So we grep stderr for any message
+ # that says an option was ignored or not supported.
+ # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # icc: Command line warning: ignoring option '-M'; no argument required
+ # The diagnosis changed in icc 8.0:
+ # icc: Command line remark: option '-MP' not supported
+ if (grep 'ignoring option' conftest.err ||
+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+ am_cv_$1_dependencies_compiler_type=$depmode
+ break
+ fi
fi
done
@@ -611,6 +295,9 @@ else
fi
])
AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
+AM_CONDITIONAL([am__fastdep$1], [
+ test "x$enable_dependency_tracking" != xno \
+ && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
])
@@ -619,16 +306,8 @@ AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
# Choose a directory name for dependency files.
# This macro is AC_REQUIREd in _AM_DEPENDENCIES
AC_DEFUN([AM_SET_DEPDIR],
-[rm -f .deps 2>/dev/null
-mkdir .deps 2>/dev/null
-if test -d .deps; then
- DEPDIR=.deps
-else
- # MS-DOS does not allow filenames that begin with a dot.
- DEPDIR=_deps
-fi
-rmdir .deps 2>/dev/null
-AC_SUBST([DEPDIR])
+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
])
@@ -636,84 +315,81 @@ AC_SUBST([DEPDIR])
# ------------
AC_DEFUN([AM_DEP_TRACK],
[AC_ARG_ENABLE(dependency-tracking,
-[ --disable-dependency-tracking Speeds up one-time builds
- --enable-dependency-tracking Do not reject slow dependency extractors])
+[ --disable-dependency-tracking speeds up one-time build
+ --enable-dependency-tracking do not reject slow dependency extractors])
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
fi
AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])
+AC_SUBST([AMDEPBACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
])
-# Generate code to set up dependency tracking. -*- Autoconf -*-
-
-# Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# Generate code to set up dependency tracking. -*- Autoconf -*-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
+# Free Software Foundation, Inc.
+#
+# 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.
-#serial 2
+#serial 5
# _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[for mf in $CONFIG_FILES; do
- # Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # So let's grep whole file.
- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
- dirpart=`AS_DIRNAME("$mf")`
- else
- continue
- fi
- grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
- # Extract the definition of DEP_FILES from the Makefile without
- # running `make'.
- DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
- test -z "$DEPDIR" && continue
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n -e '/^U = / s///p' < "$mf"`
- test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
- # We invoke sed twice because it is the simplest approach to
- # changing $(DEPDIR) to its actual value in the expansion.
- for file in `sed -n -e '
- /^DEP_FILES = .*\\\\$/ {
- s/^DEP_FILES = //
- :loop
- s/\\\\$//
- p
- n
- /\\\\$/ b loop
- p
- }
- /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`AS_DIRNAME(["$file"])`
- AS_MKDIR_P([$dirpart/$fdir])
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
+[{
+ # Autoconf 2.62 quotes --file arguments for eval, but not when files
+ # are listed without --file. Let's play safe and only enable the eval
+ # if we detect the quoting.
+ case $CONFIG_FILES in
+ *\'*) eval set x "$CONFIG_FILES" ;;
+ *) set x $CONFIG_FILES ;;
+ esac
+ shift
+ for mf
+ do
+ # Strip MF so we end up with the name of the file.
+ mf=`echo "$mf" | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile or not.
+ # We used to match only the files named `Makefile.in', but
+ # some people rename them; so instead we look at the file content.
+ # Grep'ing the first line is not enough: some people post-process
+ # each Makefile.in and add a new line on top of each file to say so.
+ # Grep'ing the whole file is not good either: AIX grep has a line
+ # limit of 2048, but all sed's we know have understand at least 4000.
+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+ dirpart=`AS_DIRNAME("$mf")`
+ else
+ continue
+ fi
+ # Extract the definition of DEPDIR, am__include, and am__quote
+ # from the Makefile without running `make'.
+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+ test -z "$DEPDIR" && continue
+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
+ test -z "am__include" && continue
+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+ # When using ansi2knr, U may be empty or an underscore; expand it
+ U=`sed -n 's/^U = //p' < "$mf"`
+ # Find all dependency output files, they are included files with
+ # $(DEPDIR) in their names. We invoke sed twice because it is the
+ # simplest approach to changing $(DEPDIR) to its actual value in the
+ # expansion.
+ for file in `sed -n "
+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+ # Make sure the directory exists.
+ test -f "$dirpart/$file" && continue
+ fdir=`AS_DIRNAME(["$file"])`
+ AS_MKDIR_P([$dirpart/$fdir])
+ # echo "creating $dirpart/$file"
+ echo '# dummy' > "$dirpart/$file"
+ done
done
-done
+}
])# _AM_OUTPUT_DEPENDENCY_COMMANDS
@@ -730,5129 +406,629 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
[AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
])
-# Copyright 2001 Free Software Foundation, Inc. -*- Autoconf -*-
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 2
-
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
-AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
-doit:
- @echo done
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then
- am__include=include
- am__quote=
- _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
- am__include=.include
- am__quote="\""
- _am_result=BSD
- fi
-fi
-AC_SUBST(am__include)
-AC_SUBST(am__quote)
-AC_MSG_RESULT($_am_result)
-rm -f confinc confmf
-])
-
-# AM_CONDITIONAL -*- Autoconf -*-
-
-# Copyright 1997, 2000, 2001 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 5
-
-AC_PREREQ(2.52)
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])
-AC_SUBST([$1_FALSE])
-if $2; then
- $1_TRUE=
- $1_FALSE='#'
-else
- $1_TRUE='#'
- $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
- AC_MSG_ERROR([conditional \"$1\" was never defined.
-Usually this means the macro was only invoked conditionally.])
-fi])])
-
-# Add --enable-maintainer-mode option to configure.
-# From Jim Meyering
-
-# Copyright 1996, 1998, 2000, 2001 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 1
-
-AC_DEFUN([AM_MAINTAINER_MODE],
-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
- dnl maintainer-mode is disabled by default
- AC_ARG_ENABLE(maintainer-mode,
-[ --enable-maintainer-mode enable make rules and dependencies not useful
- (and sometimes confusing) to the casual installer],
- USE_MAINTAINER_MODE=$enableval,
- USE_MAINTAINER_MODE=no)
- AC_MSG_RESULT([$USE_MAINTAINER_MODE])
- AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
- MAINT=$MAINTAINER_MODE_TRUE
- AC_SUBST(MAINT)dnl
-]
-)
-
-# Do checks for Freeciv authentication support
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+# Free Software Foundation, Inc.
#
-# Called without any parameters.
-
-AC_DEFUN([FC_CHECK_AUTH],
-[
- dnl no=do not compile in authentication, yes=compile in auth, *=error
- AC_ARG_ENABLE([auth],
- [ --enable-auth[[=no/yes/try]] compile in authentication [[default=no]]],
- [case "${enableval}" in
- yes) auth=true
- must_auth=true ;;
- no) auth=false ;;
- try) auth=true ;;
- *) AC_MSG_ERROR([bad value ${enableval} for --enable-auth]) ;;
- esac], [auth=false])
-
- AC_ARG_WITH(mysql-prefix,[ --with-mysql-prefix=PFX Prefix where MySQL is installed (optional)],
- mysql_prefix="$withval", mysql_prefix="")
-
- if test x$auth = xtrue; then
-
- if test x$mysql_prefix = x; then
- AC_CHECK_HEADER(mysql/mysql.h, ,
- [AC_MSG_WARN([couldn't find mysql header: disabling auth]);
- auth=false])
-
- dnl we need to set -L correctly, we will check once in standard locations
- dnl then we will check with other LDFLAGS. if none of these work, we fail.
-
- AC_CHECK_LIB(mysqlclient, mysql_query,
- [AUTH_LIBS="-lmysqlclient $AUTH_LIBS"],
- [AC_MSG_WARN([couldn't find mysql libs in normal locations]);
- auth=false])
-
- if test x$auth = xfalse ; then
- fc_preauth_LDFLAGS="$LDFLAGS"
- fc_mysql_lib_loc="-L/usr/lib/mysql -L/usr/local/lib/mysql"
-
- for __ldpath in $fc_mysql_lib_loc; do
- unset ac_cv_lib_mysqlclient_mysql_query
- LDFLAGS="$LDFLAGS $__ldpath"
-
- AC_CHECK_LIB(mysqlclient, mysql_query,
- [AUTH_LIBS="-lmysqlclient $AUTH_LIBS";
- AC_MSG_WARN([had to add $__ldpath to LDFLAGS])
- auth=true],
- [AC_MSG_WARN([couldn't find mysql libs in $__ldpath])])
-
- if test x$auth = xtrue; then
- break
- else
- LDFLAGS="$fc_preauth_LDFLAGS"
- fi
- done
-
- if test x$auth = xfalse ; then
- AC_MSG_ERROR([couldn't find mysql libs at all])
- fi
- fi
- else
- AUTH_CFLAGS="-I$mysql_prefix/include $AUTH_CFLAGS"
- AUTH_LIBS="-L$mysql_prefix/lib/mysql -lmysqlclient $AUTH_LIBS"
- auth_saved_cflags="$CFLAGS"
- auth_saved_cppflags="$CPPFLAGS"
- auth_saved_libs="$LIBS"
- CFLAGS="$CFLAGS $AUTH_CFLAGS"
- CPPFLAGS="$CPPFLAGS $AUTH_CFLAGS"
- LIBS="$LIBS $AUTH_LIBS"
- AC_CHECK_HEADER(mysql/mysql.h, ,
- [AC_MSG_WARN([couldn't find mysql header in $mysql_prefix/include]);
- auth=false])
- if test x$auth = xtrue; then
- AC_CHECK_LIB(mysqlclient, mysql_query, ,
- [AC_MSG_WARN([couldn't find mysql libs in $mysql_prefix/lib/mysql]);
- auth=false])
- fi
- CFLAGS="$auth_saved_cflags"
- CPPFLAGS="$auth_saved_cppflags"
- LIBS="$auth_saved_libs"
- fi
-
- if test x$auth = xfalse; then
- if test x$must_auth = xtrue; then
- AC_MSG_ERROR([can't find mysql: cannot build authentication support])
- else
- AC_MSG_WARN([can't find mysql -- disabling authentication])
- fi
- fi
-
- AC_SUBST(LDFLAGS)
- AC_SUBST(AUTH_CFLAGS)
- AC_SUBST(AUTH_LIBS)
- fi
-
-
- if test x$auth = xtrue; then
- AC_DEFINE(HAVE_AUTH, 1, [compile with authentication])
- fi
-
-])
-
-# 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_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
-
- 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, [
- am_cv_func_iconv="no, consider installing GNU libiconv"
- am_cv_lib_iconv=no
- AC_TRY_LINK([#include <stdlib.h>
-#include <iconv.h>],
- [iconv_t cd = iconv_open("","");
- iconv(cd,NULL,NULL,NULL,NULL);
- iconv_close(cd);],
- am_cv_func_iconv=yes)
- if test "$am_cv_func_iconv" != yes; then
- am_save_LIBS="$LIBS"
- LIBS="$LIBS $LIBICONV"
- AC_TRY_LINK([#include <stdlib.h>
-#include <iconv.h>],
- [iconv_t cd = iconv_open("","");
- iconv(cd,NULL,NULL,NULL,NULL);
- iconv_close(cd);],
- am_cv_lib_iconv=yes
- am_cv_func_iconv=yes)
- LIBS="$am_save_LIBS"
- fi
- ])
- if test "$am_cv_func_iconv" = yes; then
- 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([
-#include <stdlib.h>
-#include <iconv.h>
-extern
-#ifdef __cplusplus
-"C"
-#endif
-#if defined(__STDC__) || defined(__cplusplus)
-size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
-#else
-size_t iconv();
-#endif
-], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
- am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
- am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
- AC_MSG_RESULT([$]{ac_t:-
- }[$]am_cv_proto_iconv)
- AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
- [Define as const if the declaration of iconv() needs const.])
- fi
-])
+# 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.
-# 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.
+# serial 8
-dnl From Bruno Haible.
+# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
+AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-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])])])
+# Do all the work for Automake. -*- Autoconf -*-
-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
-])
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
+#
+# 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.
-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"
-])
+# serial 16
-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"
-])
+# This macro actually does too much. Some checks are only needed if
+# your package does certain things. But this isn't really a big deal.
-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"
+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+# AM_INIT_AUTOMAKE([OPTIONS])
+# -----------------------------------------------
+# The call with PACKAGE and VERSION arguments is the old style
+# call (pre autoconf-2.50), which is being phased out. PACKAGE
+# and VERSION should now be passed to AC_INIT and removed from
+# the call to AM_INIT_AUTOMAKE.
+# We support both call styles for the transition. After
+# the next Automake release, Autoconf can make the AC_INIT
+# arguments mandatory, and then we can depend on a new Autoconf
+# release and drop the old call support.
+AC_DEFUN([AM_INIT_AUTOMAKE],
+[AC_PREREQ([2.62])dnl
+dnl Autoconf wants to disallow AM_ names. We explicitly allow
+dnl the ones we care about.
+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+AC_REQUIRE([AC_PROG_INSTALL])dnl
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+ # is not polluted with repeated "-I."
+ AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+ # test to see if srcdir already configured
+ if test -f $srcdir/config.status; then
+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
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_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)
+fi
- 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])
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+ if (cygpath --version) >/dev/null 2>/dev/null; then
+ CYGPATH_W='cygpath -w'
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=
+ CYGPATH_W=echo
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)
-])
+fi
+AC_SUBST([CYGPATH_W])
-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
-])
+# Define the identity of the package.
+dnl Distinguish between old-style and new-style calls.
+m4_ifval([$2],
+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+ AC_SUBST([PACKAGE], [$1])dnl
+ AC_SUBST([VERSION], [$2])],
+[_AM_SET_OPTIONS([$1])dnl
+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-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
-])
+_AM_IF_OPTION([no-define],,
+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-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])
-])
+# Some tools Automake needs.
+AC_REQUIRE([AM_SANITY_CHECK])dnl
+AC_REQUIRE([AC_ARG_PROGRAM])dnl
+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
+AM_MISSING_PROG(AUTOCONF, autoconf)
+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+AM_MISSING_PROG(AUTOHEADER, autoheader)
+AM_MISSING_PROG(MAKEINFO, makeinfo)
+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
+AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+# We need awk for the "check" target. The system "awk" is bad on
+# some platforms.
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
+ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+ [_AM_PROG_TAR([v7])])])
+_AM_IF_OPTION([no-dependencies],,
+[AC_PROVIDE_IFELSE([AC_PROG_CC],
+ [_AM_DEPENDENCIES(CC)],
+ [define([AC_PROG_CC],
+ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_CXX],
+ [_AM_DEPENDENCIES(CXX)],
+ [define([AC_PROG_CXX],
+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+ [_AM_DEPENDENCIES(OBJC)],
+ [define([AC_PROG_OBJC],
+ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+])
+_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
+dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_CONFIG_COMMANDS_PRE(dnl
+[m4_provide_if([_AM_COMPILER_EXEEXT],
+ [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
+])
+
+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
+dnl mangled by Autoconf and run in a shell conditional statement.
+m4_define([_AC_COMPILER_EXEEXT],
+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
-# 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.
+# When config.status generates a header, we must update the stamp-h file.
+# This file resides in the same directory as the config header
+# that is generated. The stamp files are numbered to have different names.
+
+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+# loop where config.status creates the headers, so we can generate
+# our stamp files there.
+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
+[# Compute $1's index in $config_headers.
+_am_arg=$1
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+ case $_am_header in
+ $_am_arg | $_am_arg:* )
+ break ;;
+ * )
+ _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+ esac
+done
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-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
-])
+# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
+#
+# 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.
-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
- ;;
+# AM_PROG_INSTALL_SH
+# ------------------
+# Define $install_sh.
+AC_DEFUN([AM_PROG_INSTALL_SH],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+if test x"${install_sh}" != xset; then
+ case $am_aux_dir in
+ *\ * | *\ *)
+ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
*)
- # If it is relative, then search for the first ld in PATH.
- with_gnu_ld=unknown
- ;;
+ install_sh="\${SHELL} $am_aux_dir/install-sh"
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,
- [lc_save_LIBS="$LIBS"
- LIBS="$LIBS $LIBICONV"
- AC_TRY_LINK([#include <libcharset.h>],
- [locale_charset()],
- am_cv_libcharset=yes,
- am_cv_libcharset=no)
- LIBS="$lc_save_LIBS"
- ])
- if test $am_cv_libcharset = yes; then
- AC_DEFINE(HAVE_LIBCHARSET, 1,
- [Define if you have <libcharset.h> and locale_charset().])
- 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.
-#
-# This file can be copied and used freely without restrictions. It can
-# be used in projects which are not available under the GNU General Public
-# License or the GNU Library General Public License but which still want
-# to provide support for the GNU gettext functionality.
-# Please note that the actual code of the GNU gettext library is covered
-# by the GNU Library General Public License, and the rest of the GNU
-# gettext package package is covered by the GNU General Public License.
-# They are *not* in the public domain.
-
-# serial 10
-
-dnl Usage: AM_WITH_NLS([TOOLSYMBOL], [NEEDSYMBOL], [LIBDIR]).
-dnl If TOOLSYMBOL is specified and is 'use-libtool', then a libtool library
-dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static,
-dnl depending on --{enable,disable}-{shared,static} and on the presence of
-dnl AM-DISABLE-SHARED). Otherwise, a static library
-dnl $(top_builddir)/intl/libintl.a will be created.
-dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
-dnl implementations (in libc or libintl) without the ngettext() function
-dnl will be ignored.
-dnl LIBDIR is used to find the intl libraries. If empty,
-dnl the value `$(top_builddir)/intl/' is used.
-dnl
-dnl The result of the configuration is one of three cases:
-dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
-dnl and used.
-dnl Catalog format: GNU --> install in $(datadir)
-dnl Catalog extension: .mo after installation, .gmo in source tree
-dnl 2) GNU gettext has been found in the system's C library.
-dnl Catalog format: GNU --> install in $(datadir)
-dnl Catalog extension: .mo after installation, .gmo in source tree
-dnl 3) No internationalization, always use English msgid.
-dnl Catalog format: none
-dnl Catalog extension: none
-dnl The use of .gmo is historical (it was needed to avoid overwriting the
-dnl GNU format catalogs when building on a platform with an X/Open gettext),
-dnl but we keep it in order not to force irrelevant filename changes on the
-dnl maintainers.
-dnl
-AC_DEFUN([AM_WITH_NLS],
- [AC_MSG_CHECKING([whether NLS is requested])
- dnl Default is enabled NLS
- AC_ARG_ENABLE(nls,
- [ --disable-nls do not use Native Language Support],
- USE_NLS=$enableval, USE_NLS=yes)
- AC_MSG_RESULT($USE_NLS)
- AC_SUBST(USE_NLS)
-
- BUILD_INCLUDED_LIBINTL=no
- USE_INCLUDED_LIBINTL=no
- INTLLIBS=
-
- dnl If we use NLS figure out what method
- if test "$USE_NLS" = "yes"; then
- AC_DEFINE(ENABLE_NLS, 1,
- [Define to 1 if translation of program messages to the user's native language
- is requested.])
- AC_MSG_CHECKING([whether included gettext is requested])
- AC_ARG_WITH(included-gettext,
- [ --with-included-gettext use the GNU gettext library included here],
- nls_cv_force_use_gnu_gettext=$withval,
- nls_cv_force_use_gnu_gettext=no)
- AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
-
- nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
- if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
- dnl User does not insist on using GNU NLS library. Figure out what
- dnl to use. If GNU gettext is available we use this. Else we have
- dnl to fall back to GNU NLS library.
- CATOBJEXT=NONE
-
- dnl Add a version number to the cache macros.
- define(gt_cv_func_gnugettext_libc, [gt_cv_func_gnugettext]ifelse([$2], need-ngettext, 2, 1)[_libc])
- define(gt_cv_func_gnugettext_libintl, [gt_cv_func_gnugettext]ifelse([$2], need-ngettext, 2, 1)[_libintl])
-
- AC_CHECK_HEADER(libintl.h,
- [AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
- [AC_TRY_LINK([#include <libintl.h>
-extern int _nl_msg_cat_cntr;],
- [bindtextdomain ("", "");
-return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr],
- gt_cv_func_gnugettext_libc=yes,
- gt_cv_func_gnugettext_libc=no)])
-
- if test "$gt_cv_func_gnugettext_libc" != "yes"; then
- AC_CACHE_CHECK([for GNU gettext in libintl],
- gt_cv_func_gnugettext_libintl,
- [gt_save_LIBS="$LIBS"
- LIBS="$LIBS -lintl $LIBICONV"
- AC_TRY_LINK([#include <libintl.h>
-extern int _nl_msg_cat_cntr;],
- [bindtextdomain ("", "");
-return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr],
- gt_cv_func_gnugettext_libintl=yes,
- gt_cv_func_gnugettext_libintl=no)
- LIBS="$gt_save_LIBS"])
- fi
-
- dnl If an already present or preinstalled GNU gettext() is found,
- dnl use it. But if this macro is used in GNU gettext, and GNU
- dnl gettext is already preinstalled in libintl, we update this
- dnl libintl. (Cf. the install rule in intl/Makefile.in.)
- if test "$gt_cv_func_gnugettext_libc" = "yes" \
- || { test "$gt_cv_func_gnugettext_libintl" = "yes" \
- && test "$PACKAGE" != gettext; }; then
- AC_DEFINE(HAVE_GETTEXT, 1,
- [Define if the GNU gettext() function is already present or preinstalled.])
-
- if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
- dnl If iconv() is in a separate libiconv library, then anyone
- dnl linking with libintl{.a,.so} also needs to link with
- dnl libiconv.
- INTLLIBS="-lintl $LIBICONV"
- fi
-
- gt_save_LIBS="$LIBS"
- LIBS="$LIBS $INTLLIBS"
- AC_CHECK_FUNCS(dcgettext)
- LIBS="$gt_save_LIBS"
-
- dnl Search for GNU msgfmt in the PATH.
- AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
- [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1], :)
- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-
- dnl Search for GNU xgettext in the PATH.
- AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
- [$ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1], :)
-
- CATOBJEXT=.gmo
- fi
- ])
-
- if test "$CATOBJEXT" = "NONE"; then
- dnl GNU gettext is not found in the C library.
- dnl Fall back on GNU gettext library.
- nls_cv_use_gnu_gettext=yes
- fi
- fi
-
- if test "$nls_cv_use_gnu_gettext" = "yes"; then
- dnl Mark actions used to generate GNU NLS library.
- INTLOBJS="\$(GETTOBJS)"
- AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
- [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1], :)
- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
- AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
- [$ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1], :)
- AC_SUBST(MSGFMT)
- BUILD_INCLUDED_LIBINTL=yes
- USE_INCLUDED_LIBINTL=yes
- CATOBJEXT=.gmo
- INTLLIBS="ifelse([$3],[],\$(top_builddir)/intl,[$3])/libintl.ifelse([$1], use-libtool, [l], [])a $LIBICONV"
- LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
- fi
-
- dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
- dnl Test whether we really found GNU msgfmt.
- if test "$GMSGFMT" != ":"; then
- dnl If it is no GNU msgfmt we define it as : so that the
- dnl Makefiles still can work.
- if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then
- : ;
- else
- AC_MSG_RESULT(
- [found msgfmt program is not GNU msgfmt; ignore it])
- GMSGFMT=":"
- fi
- fi
-
- dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
- dnl Test whether we really found GNU xgettext.
- if test "$XGETTEXT" != ":"; then
- dnl If it is no GNU xgettext we define it as : so that the
- dnl Makefiles still can work.
- if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then
- : ;
- else
- AC_MSG_RESULT(
- [found xgettext program is not GNU xgettext; ignore it])
- XGETTEXT=":"
- fi
- fi
-
- dnl We need to process the po/ directory.
- POSUB=po
- fi
- AC_OUTPUT_COMMANDS(
- [for ac_file in $CONFIG_FILES; do
- # Support "outfile[:infile[:infile...]]"
- case "$ac_file" in
- *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
- esac
- # PO directories have a Makefile.in generated from Makefile.in.in.
- case "$ac_file" in */Makefile.in)
- # Adjust a relative srcdir.
- ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
- ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
- ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
- # In autoconf-2.13 it is called $ac_given_srcdir.
- # In autoconf-2.50 it is called $srcdir.
- test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
- case "$ac_given_srcdir" in
- .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
- /*) top_srcdir="$ac_given_srcdir" ;;
- *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
- esac
- if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
- rm -f "$ac_dir/POTFILES"
- test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
- sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," -e "\$s/\(.*\) \\\\/\1/" < "$ac_given_srcdir/$ac_dir/POTFILES.in" > "$ac_dir/POTFILES"
- test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
- sed -e "/POTFILES =/r $ac_dir/POTFILES" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
- fi
- ;;
- esac
- done])
-
-
- dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
- dnl to 'yes' because some of the testsuite requires it.
- if test "$PACKAGE" = gettext; then
- BUILD_INCLUDED_LIBINTL=yes
- fi
-
- dnl intl/plural.c is generated from intl/plural.y. It requires bison,
- dnl because plural.y uses bison specific features. It requires at least
- dnl bison-1.26 because earlier versions generate a plural.c that doesn't
- dnl compile.
- dnl bison is only needed for the maintainer (who touches plural.y). But in
- dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
- dnl the rule in general Makefile. Now, some people carelessly touch the
- dnl files or have a broken "make" program, hence the plural.c rule will
- dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
- dnl present or too old.
- AC_CHECK_PROGS([INTLBISON], [bison])
- if test -z "$INTLBISON"; then
- ac_verc_fail=yes
- else
- dnl Found it, now check the version.
- AC_MSG_CHECKING([version of bison])
-changequote(<<,>>)dnl
- ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
- case $ac_prog_version in
- '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
- 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
-changequote([,])dnl
- ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
- *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
- esac
- AC_MSG_RESULT([$ac_prog_version])
- fi
- if test $ac_verc_fail = yes; then
- INTLBISON=:
- fi
-
- dnl These rules are solely for the distribution goal. While doing this
- dnl we only have to keep exactly one list of the available catalogs
- dnl in configure.in.
- for lang in $ALL_LINGUAS; do
- GMOFILES="$GMOFILES $lang.gmo"
- POFILES="$POFILES $lang.po"
- done
-
- dnl Make all variables we use known to autoconf.
- AC_SUBST(BUILD_INCLUDED_LIBINTL)
- AC_SUBST(USE_INCLUDED_LIBINTL)
- AC_SUBST(CATALOGS)
- AC_SUBST(CATOBJEXT)
- AC_SUBST(GMOFILES)
- AC_SUBST(INTLLIBS)
- AC_SUBST(INTLOBJS)
- AC_SUBST(POFILES)
- AC_SUBST(POSUB)
-
- dnl For backward compatibility. Some configure.ins may be using this.
- nls_cv_header_intl=
- nls_cv_header_libgt=
-
- dnl For backward compatibility. Some Makefiles may be using this.
- DATADIRNAME=share
- AC_SUBST(DATADIRNAME)
-
- dnl For backward compatibility. Some Makefiles may be using this.
- INSTOBJEXT=.mo
- AC_SUBST(INSTOBJEXT)
-
- dnl For backward compatibility. Some Makefiles may be using this.
- GENCAT=gencat
- AC_SUBST(GENCAT)
- ])
-
-dnl Usage: Just like AM_WITH_NLS, which see.
-AC_DEFUN([AM_GNU_GETTEXT],
- [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
- AC_REQUIRE([AC_PROG_CC])dnl
- AC_REQUIRE([AC_CANONICAL_HOST])dnl
- AC_REQUIRE([AC_PROG_RANLIB])dnl
- AC_REQUIRE([AC_ISC_POSIX])dnl
- AC_REQUIRE([AC_HEADER_STDC])dnl
- AC_REQUIRE([AC_C_CONST])dnl
- AC_REQUIRE([AC_C_INLINE])dnl
- AC_REQUIRE([AC_TYPE_OFF_T])dnl
- AC_REQUIRE([AC_TYPE_SIZE_T])dnl
- AC_REQUIRE([AC_FUNC_ALLOCA])dnl
- AC_REQUIRE([AC_FUNC_MMAP])dnl
- AC_REQUIRE([jm_GLIBC21])dnl
-
- AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
-stdlib.h string.h unistd.h sys/param.h])
- AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getcwd getegid geteuid \
-getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \
-strdup strtoul tsearch __argz_count __argz_stringify __argz_next])
-
- AM_ICONV
- AM_LANGINFO_CODESET
- AM_LC_MESSAGES
- AM_WITH_NLS([$1],[$2],[$3])
-
- if test "x$CATOBJEXT" != "x"; then
- if test "x$ALL_LINGUAS" = "x"; then
- LINGUAS=
- else
- AC_MSG_CHECKING(for catalogs to be installed)
- NEW_LINGUAS=
- for presentlang in $ALL_LINGUAS; do
- useit=no
- for desiredlang in ${LINGUAS-$ALL_LINGUAS}; do
- # Use the presentlang catalog if desiredlang is
- # a. equal to presentlang, or
- # b. a variant of presentlang (because in this case,
- # presentlang can be used as a fallback for messages
- # which are not translated in the desiredlang catalog).
- case "$desiredlang" in
- "$presentlang"*) useit=yes;;
- esac
- done
- if test $useit = yes; then
- NEW_LINGUAS="$NEW_LINGUAS $presentlang"
- fi
- done
- LINGUAS=$NEW_LINGUAS
- AC_MSG_RESULT($LINGUAS)
- fi
-
- dnl Construct list of names of catalog files to be constructed.
- if test -n "$LINGUAS"; then
- for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
- fi
- fi
-
- dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
- dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
- dnl Try to locate is.
- MKINSTALLDIRS=
- if test -n "$ac_aux_dir"; then
- MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
- fi
- if test -z "$MKINSTALLDIRS"; then
- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
- fi
- AC_SUBST(MKINSTALLDIRS)
-
- dnl Enable libtool support if the surrounding package wishes it.
- INTL_LIBTOOL_SUFFIX_PREFIX=ifelse([$1], use-libtool, [l], [])
- AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
- ])
+AC_SUBST(install_sh)])
-# Search path for a program which passes the given test.
-# Ulrich Drepper <drepper at cygnus.com>, 1996.
+# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
#
-# This file can be copied and used freely without restrictions. It can
-# be used in projects which are not available under the GNU General Public
-# License or the GNU Library General Public License but which still want
-# to provide support for the GNU gettext functionality.
-# Please note that the actual code of the GNU gettext library is covered
-# by the GNU Library General Public License, and the rest of the GNU
-# gettext package package is covered by the GNU General Public License.
-# They are *not* in the public domain.
+# 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.
# serial 2
-dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
-dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-AC_DEFUN([AM_PATH_PROG_WITH_TEST],
-[# Extract the first word of "$2", so it can be a program name with args.
-set dummy $2; ac_word=[$]2
-AC_MSG_CHECKING([for $ac_word])
-AC_CACHE_VAL(ac_cv_path_$1,
-[case "[$]$1" in
- /*)
- ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
- ;;
- *)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in ifelse([$5], , $PATH, [$5]); do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- if [$3]; then
- ac_cv_path_$1="$ac_dir/$ac_word"
- break
- fi
- fi
- done
- IFS="$ac_save_ifs"
-dnl If no 4th arg is given, leave the cache variable unset,
-dnl so AC_PATH_PROGS will keep looking.
-ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
-])dnl
- ;;
-esac])dnl
-$1="$ac_cv_path_$1"
-if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
- AC_MSG_RESULT([$]$1)
+# Check whether the underlying file-system supports filenames
+# with a leading dot. For instance MS-DOS doesn't.
+AC_DEFUN([AM_SET_LEADING_DOT],
+[rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+ am__leading_dot=.
else
- AC_MSG_RESULT(no)
+ am__leading_dot=_
fi
-AC_SUBST($1)dnl
-])
-
-#serial 1
-# This test replaces the one in autoconf.
-# Currently this macro should have the same name as the autoconf macro
-# because gettext's gettext.m4 (distributed in the automake package)
-# still uses it. Otherwise, the use in gettext.m4 makes autoheader
-# give these diagnostics:
-# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX
-# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX
-
-undefine([AC_ISC_POSIX])
+rmdir .tst 2>/dev/null
+AC_SUBST([am__leading_dot])])
-AC_DEFUN([AC_ISC_POSIX],
- [
- dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
- AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"])
- ]
-)
-
-
-#serial 2
-# Test for the GNU C Library, version 2.1 or newer.
-# From Bruno Haible.
-
-AC_DEFUN([jm_GLIBC21],
- [
- AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
- ac_cv_gnu_library_2_1,
- [AC_EGREP_CPP([Lucky GNU user],
- [
-#include <features.h>
-#ifdef __GNU_LIBRARY__
- #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
- Lucky GNU user
- #endif
-#endif
- ],
- ac_cv_gnu_library_2_1=yes,
- ac_cv_gnu_library_2_1=no)
- ]
- )
- AC_SUBST(GLIBC21)
- GLIBC21="$ac_cv_gnu_library_2_1"
- ]
-)
+# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
+# From Jim Meyering
-# Check whether LC_MESSAGES is available in <locale.h>.
-# Ulrich Drepper <drepper at cygnus.com>, 1995.
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
+# Free Software Foundation, Inc.
#
-# This file can be copied and used freely without restrictions. It can
-# be used in projects which are not available under the GNU General Public
-# License or the GNU Library General Public License but which still want
-# to provide support for the GNU gettext functionality.
-# Please note that the actual code of the GNU gettext library is covered
-# by the GNU Library General Public License, and the rest of the GNU
-# gettext package package is covered by the GNU General Public License.
-# They are *not* in the public domain.
-
-# serial 2
-
-AC_DEFUN([AM_LC_MESSAGES],
- [if test $ac_cv_header_locale_h = yes; then
- AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
- [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
- am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
- if test $am_cv_val_LC_MESSAGES = yes; then
- AC_DEFINE(HAVE_LC_MESSAGES, 1,
- [Define if your <locale.h> file defines LC_MESSAGES.])
- fi
- fi])
+# 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.
-dnl FC_CHECK_NGETTEXT_RUNTIME(EXTRA-LIBS, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
-dnl
-dnl This tests whether ngettext works at runtime. Here, "works"
-dnl means "doesn't dump core", as some versions (for exmaple the
-dnl version which comes with glibc 2.2.5 is broken, gettext
-dnl version 0.10.38 however is ok).
+# serial 5
-AC_DEFUN([FC_CHECK_NGETTEXT_RUNTIME],
-[
-templibs="$LIBS"
-LIBS="$1 $LIBS"
-templang="$LANG"
-LANG="de_DE"
-AC_TRY_RUN([
-/*
- * Check to make sure that ngettext works at runtime. Specifically,
- * some gettext versions dump core if the ngettext function is called.
- * (c) 2002 Raimar Falke <rfalke at freeciv.org>
- */
-#include <string.h>
-#include <libintl.h>
-#include <locale.h>
-#include <stdlib.h>
+# AM_MAINTAINER_MODE([DEFAULT-MODE])
+# ----------------------------------
+# Control maintainer-specific portions of Makefiles.
+# Default is to disable them, unless `enable' is passed literally.
+# For symmetry, `disable' may be passed as well. Anyway, the user
+# can override the default with the --enable/--disable switch.
+AC_DEFUN([AM_MAINTAINER_MODE],
+[m4_case(m4_default([$1], [disable]),
+ [enable], [m4_define([am_maintainer_other], [disable])],
+ [disable], [m4_define([am_maintainer_other], [enable])],
+ [m4_define([am_maintainer_other], [enable])
+ m4_warn([syntax], [unexpected argument to AM@&t at _MAINTAINER_MODE: $1])])
+AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
+ dnl maintainer-mode's default is 'disable' unless 'enable' is passed
+ AC_ARG_ENABLE([maintainer-mode],
+[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful
+ (and sometimes confusing) to the casual installer],
+ [USE_MAINTAINER_MODE=$enableval],
+ [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
+ AC_MSG_RESULT([$USE_MAINTAINER_MODE])
+ AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
+ MAINT=$MAINTAINER_MODE_TRUE
+ AC_SUBST([MAINT])dnl
+]
+)
-int main(int argc, char *argv[])
-{
- setlocale(LC_ALL, "");
+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
- if (strcmp(ngettext("unit", "units", 1), "unit") == 0 &&
- strcmp(ngettext("unit", "units", 2), "units") == 0) {
- return 0;
- } else {
- return 1;
- }
-}
-],
-[AC_MSG_RESULT(yes)
- [$2]],
-[AC_MSG_RESULT(no)
- [$3]],
-[AC_MSG_RESULT(unknown: cross-compiling)
- [$2]])
-LIBS="$templibs"
-LANG="$templang"
-])
+# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Macros to check compiler options
+# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
#
+# 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.
-# 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"
+# serial 4
+
+# AM_MAKE_INCLUDE()
+# -----------------
+# Check to see how make treats includes.
+AC_DEFUN([AM_MAKE_INCLUDE],
+[am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+ @echo this is the am__doit target
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+AC_MSG_CHECKING([for style of include used by $am_make])
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# Ignore all kinds of additional output from `make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+ am__include=include
+ am__quote=
+ _am_result=GNU
+ ;;
+esac
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+ echo '.include "confinc"' > confmf
+ case `$am_make -s -f confmf 2> /dev/null` in #(
+ *the\ am__doit\ target*)
+ am__include=.include
+ am__quote="\""
+ _am_result=BSD
+ ;;
+ esac
fi
+AC_SUBST([am__include])
+AC_SUBST([am__quote])
+AC_MSG_RESULT([$_am_result])
+rm -f confinc confmf
])
-# 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=""
+# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-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++
-#
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
+# Free Software Foundation, Inc.
#
-# $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])
-])
+# 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.
+# serial 6
-AC_DEFUN([FC_CXX_FLAGS],
-[
-FC_COMPILER_FLAGS([C++], [CXXFLAGS], [$1], [$2], [$3])
-])
+# AM_MISSING_PROG(NAME, PROGRAM)
+# ------------------------------
+AC_DEFUN([AM_MISSING_PROG],
+[AC_REQUIRE([AM_MISSING_HAS_RUN])
+$1=${$1-"${am_missing_run}$2"}
+AC_SUBST($1)])
-AC_DEFUN([FC_DEBUG], [
-AC_ARG_ENABLE(debug,
-[ --enable-debug[[=no/some/yes]] turn on debugging [[default=some]]],
-[case "${enableval}" in
- yes) enable_debug=yes ;;
- some) enable_debug=some ;;
- no) enable_debug=no ;;
- *) AC_MSG_ERROR(bad value ${enableval} for --enable-debug) ;;
-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], [Extra debugging support])
- FC_C_FLAGS([-Werror], [], [EXTRA_DEBUG_CFLAGS])
- FC_CXX_FLAGS([-Werror], [], [EXTRA_DEBUG_CXXFLAGS])
+# AM_MISSING_HAS_RUN
+# ------------------
+# Define MISSING if not defined so far and test if it supports --run.
+# If it does, set am_missing_run to use it, otherwise, to nothing.
+AC_DEFUN([AM_MISSING_HAS_RUN],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([missing])dnl
+if test x"${MISSING+set}" != xset; then
+ case $am_aux_dir in
+ *\ * | *\ *)
+ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+ *)
+ MISSING="\${SHELL} $am_aux_dir/missing" ;;
+ esac
+fi
+# Use eval to expand $SHELL
+if eval "$MISSING --run true"; then
+ am_missing_run="$MISSING --run "
else
- if test "x$enable_debug" = "xno"; then
- 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
+ am_missing_run=
+ AC_MSG_WARN([`missing' script is too old or missing])
fi
])
-# Check for the presence of C99 features. Generally the check will fail
-# if the feature isn't present (a C99 compiler isn't that much to ask,
-# right?).
-
-# Check C99-style variadic macros (required):
-#
-# #define PRINTF(msg, ...) (printf(msg, __VA_ARGS__)
-#
-AC_DEFUN([AC_C99_VARIADIC_MACROS],
-[
- dnl Check for variadic macros
- AC_CACHE_CHECK([for C99 variadic macros],
- [ac_cv_c99_variadic_macros],
- [AC_TRY_COMPILE(
- [#include <stdio.h>
- #define MSG(...) fprintf(stderr, __VA_ARGS__)
- ],
- [MSG("foo");
- MSG("%s", "foo");
- MSG("%s%d", "foo", 1);],
- ac_cv_c99_variadic_macros=yes,
- ac_cv_c99_variadic_macros=no)])
- if test "x${ac_cv_c99_variadic_macros}" != "xyes"; then
- AC_MSG_ERROR([A compiler supporting C99 variadic macros is required])
- fi
-])
-
-# Check C99-style variable-sized arrays (required):
-#
-# char concat_str[strlen(s1) + strlen(s2) + 1];
+# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
#
-AC_DEFUN([AC_C99_VARIABLE_ARRAYS],
-[
- dnl Check for variable arrays
- AC_CACHE_CHECK([for C99 variable arrays],
- [ac_cv_c99_variable_arrays],
- [AC_TRY_COMPILE(
- [],
- [char *s1 = "foo", *s2 = "bar";
- char s3[strlen(s1) + strlen(s2) + 1];
- sprintf(s3, "%s%s", s1, s2);],
- ac_cv_c99_variable_arrays=yes,
- ac_cv_c99_variable_arrays=no)])
- if test "x${ac_cv_c99_variable_arrays}" != "xyes"; then
- AC_MSG_ERROR([A compiler supporting C99 variable arrays is required])
- fi
-])
+# 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.
-# Check C99-style initializers (required):
+# AM_PROG_MKDIR_P
+# ---------------
+# Check for `mkdir -p'.
+AC_DEFUN([AM_PROG_MKDIR_P],
+[AC_PREREQ([2.60])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
+dnl while keeping a definition of mkdir_p for backward compatibility.
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
+dnl adjustment using top_builddir (which is defined more often than
+dnl MKDIR_P).
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
+case $mkdir_p in
+ [[\\/$]]* | ?:[[\\/]]*) ;;
+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+])
+
+# Helper functions for option handling. -*- Autoconf -*-
+
+# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
#
-# Examples:
-# struct timeval tv = {.tv_sec = 0, .tv_usec = 500000};
-# int fibonacci[6] = {[0] = 0, [1] = 1, [2] = 1, [3] = 2, [4] = 3, [5] = 5};
-# Note we do not check for multi-field initializers like
-# struct { struct { int b; } a; } = {.a.b = 5}
-# which are not supported by many compilers. It is best to avoid this
-# problem by writing these using nesting. The above case becomes
-# struct { struct { int b; } a; } = {.a = {.b = 5}}
-AC_DEFUN([AC_C99_INITIALIZERS],
-[
- dnl Check for C99 initializers
- AC_CACHE_CHECK([for C99 initializers],
- [ac_cv_c99_initializers],
- [AC_TRY_COMPILE(
- [struct foo {
- int an_integer;
- char *a_string;
- int an_array[5];
- union {int x, y;} a_union;
- };
- ],
- [struct foo bar = {.an_array = {0, [3] = 2, [2] = 1, [4] = 3},
- .an_integer = 999,
- .a_string = "does it work?",
- .a_union = {.y = 243}};],
- [ac_cv_c99_initializers=yes],
- [ac_cv_c99_initializers=no])])
- if test "${ac_cv_c99_initializers}" != "yes"; then
- AC_MSG_ERROR([A compiler supporting C99 initializers is required])
- fi
-])
-
-# Check C99-style stdint.h (required)
-AC_DEFUN([AC_C99_STDINT_H],
-[
- AC_CHECK_HEADERS([stdint.h])
- dnl Check for C99 stdint.h
- AC_CACHE_CHECK([for C99 stdint.h],
- [ac_cv_c99_stdint_h],
- [ac_cv_c99_stdint_h=$ac_cv_header_stdint_h])
- if test "${ac_cv_c99_stdint_h}" != "yes"; then
- AC_MSG_ERROR([A compiler supporting C99's stdint.h is required])
- fi
-])
-
-# Try to configure the GTK+-2.0 client (gui-gtk-2.0)
-
-# FC_GTK_CLIENT
-# Test for GTK+-2.0 libraries needed for gui-gtk-2.0
-
-AC_DEFUN([FC_GTK2_CLIENT],
-[
- if test "$client" = "gtk-2.0" || test "$client" = yes ; then
- AM_PATH_GTK_2_0(2.4.0,
- [
- client="gtk-2.0"
- CLIENT_CFLAGS="$GTK_CFLAGS"
- CLIENT_LIBS="$GTK_LIBS"
- if test x"$MINGW32" = "xyes"; then
- dnl Required to compile gtk2 on Windows platform
- CFLAGS="$CFLAGS -mms-bitfields"
- CLIENT_LDFLAGS="$LDFLAGS -mwindows"
- fi
- ],
- [
- FC_NO_CLIENT([gtk-2.0], [GTK+-2.0 libraries not found])
- ])
- fi
-])
-
-# Configure paths for GTK+
-# Owen Taylor 1997-2001
-
-dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES,
-dnl pass to pkg-config
-dnl
-AC_DEFUN([AM_PATH_GTK_2_0],
-[dnl
-dnl Get the cflags and libraries from pkg-config
-dnl
-AC_ARG_ENABLE(gtktest, [ --disable-gtktest do not try to compile and run a test GTK+ program],
- , enable_gtktest=yes)
-
- pkg_config_args=gtk+-2.0
- for module in . $4
- do
- case "$module" in
- gthread)
- pkg_config_args="$pkg_config_args gthread-2.0"
- ;;
- esac
- done
-
- no_gtk=""
-
- AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-
- if test x$PKG_CONFIG != xno ; then
- if pkg-config --atleast-pkgconfig-version 0.7 ; then
- :
- else
- echo *** pkg-config too old; version 0.7 or better required.
- no_gtk=yes
- PKG_CONFIG=no
- fi
- else
- no_gtk=yes
- fi
-
- min_gtk_version=ifelse([$1], ,2.0.0,$1)
- AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version)
-
- if test x$PKG_CONFIG != xno ; then
- ## don't try to run the test against uninstalled libtool libs
- if $PKG_CONFIG --uninstalled $pkg_config_args; then
- echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
- enable_gtktest=no
- fi
-
- if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then
- :
- else
- no_gtk=yes
- fi
- fi
-
- if test x"$no_gtk" = x ; then
- GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
- GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
- gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
- gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
- gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
- if test "x$enable_gtktest" = "xyes" ; then
- ac_save_CFLAGS="$CFLAGS"
- ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $GTK_CFLAGS"
- LIBS="$GTK_LIBS $LIBS"
-dnl
-dnl Now check if the installed GTK+ is sufficiently new. (Also sanity
-dnl checks the results of pkg-config to some extent)
-dnl
- rm -f conf.gtktest
- AC_TRY_RUN([
-#include <gtk/gtk.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int
-main ()
-{
- int major, minor, micro;
- char *tmp_version;
-
- system ("touch conf.gtktest");
-
- /* HP/UX 9 (%@#!) writes to sscanf strings */
- tmp_version = g_strdup("$min_gtk_version");
- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
- printf("%s, bad version string\n", "$min_gtk_version");
- exit(1);
- }
-
- if ((gtk_major_version != $gtk_config_major_version) ||
- (gtk_minor_version != $gtk_config_minor_version) ||
- (gtk_micro_version != $gtk_config_micro_version))
- {
- printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
- $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
- gtk_major_version, gtk_minor_version, gtk_micro_version);
- printf ("*** was found! If pkg-config was correct, then it is best\n");
- printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
- printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
- printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
- printf("*** required on your system.\n");
- printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
- printf("*** to point to the correct configuration files\n");
- }
- else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
- (gtk_minor_version != GTK_MINOR_VERSION) ||
- (gtk_micro_version != GTK_MICRO_VERSION))
- {
- printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
- GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
- printf("*** library (version %d.%d.%d)\n",
- gtk_major_version, gtk_minor_version, gtk_micro_version);
- }
- else
- {
- if ((gtk_major_version > major) ||
- ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
- ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
- {
- return 0;
- }
- else
- {
- printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
- gtk_major_version, gtk_minor_version, gtk_micro_version);
- printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
- major, minor, micro);
- printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
- printf("***\n");
- printf("*** If you have already installed a sufficiently new version, this error\n");
- printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
- printf("*** being found. The easiest way to fix this is to remove the old version\n");
- printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n");
- printf("*** correct copy of pkg-config. (In this case, you will have to\n");
- printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
- printf("*** so that the correct libraries are found at run-time))\n");
- }
- }
- return 1;
-}
-],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- if test "x$no_gtk" = x ; then
- AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version))
- ifelse([$2], , :, [$2])
- else
- AC_MSG_RESULT(no)
- if test "$PKG_CONFIG" = "no" ; then
- echo "*** A new enough version of pkg-config was not found."
- echo "*** See http://pkgconfig.sourceforge.net"
- else
- if test -f conf.gtktest ; then
- :
- else
- echo "*** Could not run GTK+ test program, checking why..."
- ac_save_CFLAGS="$CFLAGS"
- ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $GTK_CFLAGS"
- LIBS="$LIBS $GTK_LIBS"
- AC_TRY_LINK([
-#include <gtk/gtk.h>
-#include <stdio.h>
-], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
- [ echo "*** The test program compiled, but did not run. This usually means"
- echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
- echo "*** version of GTK+. If it is not finding GTK+, 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 GTK+ is incorrectly installed."])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- GTK_CFLAGS=""
- GTK_LIBS=""
- ifelse([$3], , :, [$3])
- fi
- AC_SUBST(GTK_CFLAGS)
- AC_SUBST(GTK_LIBS)
- rm -f conf.gtktest
-])
-
-# Fail because a client wasn't found, if it was requested
-
-# FC_NO_CLIENT($which_client, $error_message)
-# The $1 client has failed its configure check; it cannot be compiled. This
-# simple macro will exit if this was the requested client, giving an error
-# message including $2. If this wasn't the specified client, it will do
-# nothing and configure should continue...
-
-AC_DEFUN([FC_NO_CLIENT],
-[
- if test "$client" = "$1"; then
- AC_MSG_ERROR([specified client '$1' not configurable ($2)])
- fi
-])
-
-# Try to configure the SDL client (gui-sdl)
-
-dnl FC_SDL_CLIENT
-dnl Test for SDL and needed libraries for gui-sdl
-
-AC_DEFUN([FC_SDL_CLIENT],
-[
- if test "$client" = yes; then
- AC_MSG_WARN([Not checking for SDL; use --enable-client=sdl to enable])
- elif test "$client" = sdl ; then
- AM_PATH_SDL([1.1.4], [sdl_found="yes"], [sdl_found="no"])
- if test "$sdl_found" = yes; then
- ac_save_CPPFLAGS="$CPPFLAGS"
- ac_save_CFLAGS="$CFLAGS"
- ac_save_LIBS="$LIBS"
- CPPFLAGS="$CPPFLAGS $SDL_CFLAGS"
- CFLAGS="$CFLAGS $SDL_CFLAGS"
- LIBS="$LIBS $SDL_LIBS"
- AC_CHECK_LIB([SDL_image], [IMG_Load],
- [sdl_image_found="yes"], [sdl_image_found="no"])
- if test "$sdl_image_found" = "yes"; then
- AC_CHECK_HEADER([SDL/SDL_image.h],
- [sdl_image_h_found="yes"], [sdl_image_h_found="no"])
- if test "$sdl_image_h_found" = yes; then
- CPPFLAGS="$ac_save_CPPFLAGS"
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- AC_CHECK_FT2([2.1.3], [freetype_found="yes"],[freetype_found="no"])
- if test "$freetype_found" = yes; then
- CLIENT_CFLAGS="$SDL_CFLAGS $FT2_CFLAGS"
- CLIENT_LIBS="-lSDL_image $SDL_LIBS $FT2_LIBS"
- AC_DEFINE(SDL, 1, [SDL is used])
- found_client=yes
- elif test "$client" = "sdl"; then
- AC_MSG_ERROR([specified client 'sdl' not configurable (FreeType2 >= 2.1.3 is needed (www.freetype.org))])
- fi
- elif test "$client" = "sdl"; then
- AC_MSG_ERROR([specified client 'sdl' not configurable (SDL_image-devel is needed (www.libsdl.org))])
- fi
- elif test "$client" = "sdl"; then
- AC_MSG_ERROR([specified client 'sdl' not configurable (SDL_image is needed (www.libsdl.org))])
- fi
- fi
-
- if test "$found_client" = yes; then
- client=sdl
-
- dnl Check for libiconv (which is usually included in glibc, but may
- dnl be distributed separately).
- AM_ICONV
- AM_LIBCHARSET
- AM_LANGINFO_CODESET
- CLIENT_LIBS="$LIBICONV $CLIENT_LIBS"
-
- dnl Check for some other libraries - needed under BeOS for instance.
- dnl These should perhaps be checked for in all cases?
- AC_CHECK_LIB(socket, connect, CLIENT_LIBS="-lsocket $CLIENT_LIBS")
- AC_CHECK_LIB(bind, gethostbyaddr, CLIENT_LIBS="-lbind $CLIENT_LIBS")
-
- elif test "$client" = "sdl"; then
- AC_MSG_ERROR([specified client 'sdl' not configurable (SDL >= 1.1.4 is needed (www.libsdl.org))])
- fi
- fi
-])
-
-# Configure paths for SDL
-# Sam Lantinga 9/21/99
-# stolen from Manish Singh
-# stolen back from Frank Belew
-# stolen from Manish Singh
-# Shamelessly stolen from Owen Taylor
-# Taken to Freeciv from SDL release 1.2.12
-
-dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
-dnl
-AC_DEFUN([AM_PATH_SDL],
-[dnl
-dnl Get the cflags and libraries from the sdl-config script
-dnl
-AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)],
- sdl_prefix="$withval", sdl_prefix="")
-AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)],
- sdl_exec_prefix="$withval", sdl_exec_prefix="")
-AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program],
- , enable_sdltest=yes)
-
- if test x$sdl_exec_prefix != x ; then
- sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
- if test x${SDL_CONFIG+set} != xset ; then
- SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
- fi
- fi
- if test x$sdl_prefix != x ; then
- sdl_args="$sdl_args --prefix=$sdl_prefix"
- if test x${SDL_CONFIG+set} != xset ; then
- SDL_CONFIG=$sdl_prefix/bin/sdl-config
- fi
- fi
-
- if test "x$prefix" != xNONE; then
- PATH="$prefix/bin:$prefix/usr/bin:$PATH"
- fi
- AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
- min_sdl_version=ifelse([$1], ,0.11.0,$1)
- AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
- no_sdl=""
- if test "$SDL_CONFIG" = "no" ; then
- no_sdl=yes
- else
- SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
- SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs`
-
- sdl_major_version=`$SDL_CONFIG $sdl_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
- sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
- sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
- if test "x$enable_sdltest" = "xyes" ; then
- ac_save_CFLAGS="$CFLAGS"
- ac_save_CXXFLAGS="$CXXFLAGS"
- ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $SDL_CFLAGS"
- CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
- LIBS="$LIBS $SDL_LIBS"
-dnl
-dnl Now check if the installed SDL is sufficiently new. (Also sanity
-dnl checks the results of sdl-config to some extent
-dnl
- rm -f conf.sdltest
- AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "SDL.h"
-
-char*
-my_strdup (char *str)
-{
- char *new_str;
-
- if (str)
- {
- new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
- strcpy (new_str, str);
- }
- else
- new_str = NULL;
-
- return new_str;
-}
-
-int main (int argc, char *argv[])
-{
- int major, minor, micro;
- char *tmp_version;
+# 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.
- /* This hangs on some systems (?)
- system ("touch conf.sdltest");
- */
- { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
+# serial 4
- /* HP/UX 9 (%@#!) writes to sscanf strings */
- tmp_version = my_strdup("$min_sdl_version");
- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
- printf("%s, bad version string\n", "$min_sdl_version");
- exit(1);
- }
+# _AM_MANGLE_OPTION(NAME)
+# -----------------------
+AC_DEFUN([_AM_MANGLE_OPTION],
+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
- if (($sdl_major_version > major) ||
- (($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
- (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
- {
- return 0;
- }
- else
- {
- printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
- printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
- printf("*** best to upgrade to the required version.\n");
- printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
- printf("*** to point to the correct copy of sdl-config, and remove the file\n");
- printf("*** config.cache before re-running configure\n");
- return 1;
- }
-}
+# _AM_SET_OPTION(NAME)
+# ------------------------------
+# Set option NAME. Presently that only means defining a flag for this option.
+AC_DEFUN([_AM_SET_OPTION],
+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
- CFLAGS="$ac_save_CFLAGS"
- CXXFLAGS="$ac_save_CXXFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- if test "x$no_sdl" = x ; then
- AC_MSG_RESULT(yes)
- ifelse([$2], , :, [$2])
- else
- AC_MSG_RESULT(no)
- if test "$SDL_CONFIG" = "no" ; then
- echo "*** The sdl-config script installed by SDL could not be found"
- echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
- echo "*** your path, or set the SDL_CONFIG environment variable to the"
- echo "*** full path to sdl-config."
- else
- if test -f conf.sdltest ; then
- :
- else
- echo "*** Could not run SDL test program, checking why..."
- CFLAGS="$CFLAGS $SDL_CFLAGS"
- CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
- LIBS="$LIBS $SDL_LIBS"
- AC_TRY_LINK([
-#include <stdio.h>
-#include "SDL.h"
+# _AM_SET_OPTIONS(OPTIONS)
+# ----------------------------------
+# OPTIONS is a space-separated list of Automake options.
+AC_DEFUN([_AM_SET_OPTIONS],
+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-int main(int argc, char *argv[])
-{ return 0; }
-#undef main
-#define main K_and_R_C_main
-], [ return 0; ],
- [ echo "*** The test program compiled, but did not run. This usually means"
- echo "*** that the run-time linker is not finding SDL or finding the wrong"
- echo "*** version of SDL. If it is not finding SDL, 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 SDL was incorrectly installed"
- echo "*** or that you have moved SDL since it was installed. In the latter case, you"
- echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
- CFLAGS="$ac_save_CFLAGS"
- CXXFLAGS="$ac_save_CXXFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- SDL_CFLAGS=""
- SDL_LIBS=""
- ifelse([$3], , :, [$3])
- fi
- AC_SUBST(SDL_CFLAGS)
- AC_SUBST(SDL_LIBS)
- rm -f conf.sdltest
-])
+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+# -------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+AC_DEFUN([_AM_IF_OPTION],
+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# 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
+# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# 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).
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
+# Free Software Foundation, Inc.
#
-AC_DEFUN([AC_CHECK_FT2],
- [# 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=""])
+# 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.
- 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])
+# serial 5
- 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
+# AM_SANITY_CHECK
+# ---------------
+AC_DEFUN([AM_SANITY_CHECK],
+[AC_MSG_CHECKING([whether build environment is sane])
+# Just in case
+sleep 1
+echo timestamp > conftest.file
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name. Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+ *[[\\\"\#\$\&\'\`$am_lf]]*)
+ AC_MSG_ERROR([unsafe absolute working directory name]);;
+esac
+case $srcdir in
+ *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
+ AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
+esac
- 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
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments. Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$[*]" = "X"; then
+ # -L didn't work.
+ set X `ls -t "$srcdir/configure" conftest.file`
fi
+ rm -f conftest.file
+ if test "$[*]" != "X $srcdir/configure conftest.file" \
+ && test "$[*]" != "X conftest.file $srcdir/configure"; then
- 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>
-#include <stdlib.h>
-
-int
-main()
-{
- FT_Library library;
- FT_Error error;
-
- error = FT_Init_FreeType(&library);
-
- if (error)
- return 1;
- else
- {
- FT_Done_FreeType(library);
- return 0;
- }
-}
-
- ]])
- ],
- [],
- [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
- 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
- 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])
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
+alias in your environment])
fi
- AC_SUBST([FT2_CFLAGS])
- AC_SUBST([FT2_LIBS])])
-
-# end of freetype2.m4
-
-# Try to configure the XAW client (gui-xaw)
-
-# FC_XAW_CLIENT
-# Test for X and XAW libraries needed for gui-xaw
-
-AC_DEFUN([FC_XAW_CLIENT],
-[
- if test "$client" = yes ; then
- AC_MSG_WARN([Not checking for XAW; use --enable-client=xaw to enable])
- elif test "$client" = xaw ; then
- dnl Checks for X:
- AC_PATH_XTRA
-
- dnl Determine the Xfuncproto control definitions:
- FC_CHECK_X_PROTO_DEFINE(FUNCPROTO)
- if test -n "$fc_x_proto_value"; then
- AC_DEFINE_UNQUOTED(FUNCPROTO, $fc_x_proto_value, [Xfuncproto])
- fi
- FC_CHECK_X_PROTO_DEFINE(NARROWPROTO)
- if test -n "$fc_x_proto_value"; then
- AC_DEFINE_UNQUOTED(NARROWPROTO, $fc_x_proto_value, [Narrowproto])
- fi
-
- PKG_PROG_PKG_CONFIG
-
- dnl Check for libpng
- PKG_CHECK_MODULES([PNG], [libpng],
- [
- X_LIBS="$X_LIBS $PNG_LIBS"
- X_CFLAGS="$X_CFLAGS $PNG_CFLAGS"
- ],
- [
- AC_CHECK_LIB([png12], [png_read_image], [X_LIBS="$X_LIBS -lpng12 -lm"],
- [
- AC_CHECK_LIB([png], [png_read_image], [X_LIBS="$X_LIBS -lpng -lm"],
- [
- AC_MSG_ERROR([Could not find PNG library.])
- ])
- ])
- AC_CHECK_HEADER([png.h],,
- [
- AC_MSG_ERROR([libpng found but not png.h.
-You may need to install a libpng \"development\" package.])
- ])
- ])
-
- dnl Try to get additional Xpm paths:
- FC_XPM_PATHS
-
- if test "$xpm_incdir" != "no"; then
- X_CFLAGS="$X_CFLAGS -I$xpm_incdir"
- fi
- if test "$xpm_libdir" != "no"; then
- X_LIBS="$X_LIBS -L$xpm_libdir"
- dnl Try using R values set in AC_PATH_XTRA:
- if test "$ac_R_nospace" = "yes"; then
- X_LIBS="$X_LIBS -R$xpm_libdir"
- elif test "$ac_R_space" = "yes"; then
- X_LIBS="$X_LIBS -R $xpm_libdir"
- fi
- dnl Some sites may put xpm.h in a directory whose parent isn't "X11"
- if test "x$xpm_h_no_x11" = "xyes"; then
- AC_DEFINE(XPM_H_NO_X11, 1, [XPM support])
- fi
- fi
-
- dnl Checks for X libs:
- fc_save_X_LIBS="$X_LIBS"
- X_LIBS="$X_LIBS $X_PRE_LIBS"
- FC_CHECK_X_LIB(X11, XOpenDisplay, , haveX11=no)
- if test "x$haveX11" != "xno"; then
- FC_CHECK_X_LIB(Xext, XShapeCombineMask)
-
- dnl Insert X_PRE_LIBS (eg -lSM -lICE) into X_EXTRA_LIBS here:
- X_EXTRA_LIBS="$X_PRE_LIBS $X_EXTRA_LIBS"
- X_LIBS="$fc_save_X_LIBS"
-
- FC_CHECK_X_LIB(Xt, main)
- FC_CHECK_X_LIB(Xmu, main)
- FC_CHECK_X_LIB(Xpm, XpmReadFileToPixmap, , haveXpm=no)
- if test "x$haveXpm" != "xno"; then
- dnl Xaw or Xaw3d:
- if test -n "$WITH_XAW3D"; then
- FC_CHECK_X_LIB(Xaw3d, main, , AC_MSG_ERROR(did not find Xaw3d library))
- elif test "$client" = "xaw"; then
- FC_CHECK_X_LIB(Xaw, main, , AC_MSG_ERROR(did not find Xaw library))
- else
- FC_CHECK_X_LIB(Xaw3d, main, , noXaw3d=1)
- if test -n "$noXaw3d"; then
- FC_CHECK_X_LIB(Xaw, main, ,
- AC_MSG_ERROR(did not find either Xaw or Xaw3d library))
- fi
- fi
-
- CLIENT_CFLAGS="$X_CFLAGS"
- CLIENT_LIBS="$X_LIBS $X_EXTRA_LIBS"
-
- found_client=yes
- fi
- fi
-
- if test "x$found_client" = "xyes"; then
- client=xaw
- elif test "$client" = "xaw"; then
- if test "x$haveXpm" = "xno"; then
- AC_MSG_ERROR(specified client 'xaw' not configurable -- need Xpm library and development headers; perhaps try/adjust --with-xpm-lib)
- else
- AC_MSG_ERROR(specified client 'xaw' not configurable -- need X11 libraries and development headers; perhaps try/adjust --x-libraries)
- fi
- fi
- fi
-])
-
-
-dnl FC_CHECK_X_LIB(LIBRARY, FUNCTION [, ACTION-IF-FOUND [,
-dnl ACTION-IF-NOT-FOUND]])
-dnl
-dnl This macro is intended to search for X11-related libraries. It takes the
-dnl following variables for input:
-dnl X_LIBS -- prefixed to all linker lines
-dnl X_EXTRA_LIBS -- suffixed to all linker lines
-dnl LIBS -- suffixed to all linker lines (after X_EXTRA_LIBS)
-dnl Thus, the trial linker line will be "$X_LIBS -l$1 $X_EXTRA_LIBS $LIBS".
-dnl
-dnl The following variables are output:
-dnl X_EXTRA_LIBS -- contains "-l$1 $X_EXTRA_LIBS" if the link succeeds
-dnl
-dnl Thus, the intended usage of this macro is something like this:
-dnl AC_PATH_XTRA
-dnl X_LIBS="$X_LIBS $X_PRE_LIBS"
-dnl dnl Is it just me or is AC_PATH_XTRA broken?
-dnl FC_CHECK_X_LIB(X11, XOpenDisplay, , AC_MSG_ERROR("Need X11"))
-dnl FC_CHECK_X_LIB(Xext, XShapeCombineMask)
-dnl [etc.]
-dnl LIBS="$X_LIBS $X_EXTRA_LIBS $LIBS"
-dnl
-AC_DEFUN([FC_CHECK_X_LIB], [
- AC_MSG_CHECKING([for $2 in X library -l$1])
-
- dnl Use a cache variable name containing both the library and function name,
- dnl because the test really is for library $1 defining function $2, not
- dnl just for library $1. Separate tests with the same $1 and different $2s
- dnl may have different results.
-
- ac_lib_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'`
- AC_CACHE_VAL(ac_cv_lib_$ac_lib_var,
- [ac_save_LIBS="$LIBS"
- LIBS="$X_LIBS -l$1 $X_EXTRA_LIBS $LIBS"
- AC_TRY_LINK(dnl
- ifelse([$2], [main], ,
- [#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 $2();]
- )
- , [$2()],
- eval "ac_cv_lib_$ac_lib_var=yes",
- eval "ac_cv_lib_$ac_lib_var=no")
- LIBS="$ac_save_LIBS"
- ])dnl
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- AC_MSG_RESULT(yes)
- ifelse([$3], ,
- [changequote(, )dnl
- ac_tr_lib=HAVE_LIB`echo $1 | sed -e 's/[^a-zA-Z0-9_]/_/g' \
- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
- changequote([, ])dnl
-
- # The HAVE_LIBX** values are defined in FC_CHECK_X_LIB, but we need an
- # AH_TEMPLATE for them so that autoheader will know about them.
- AH_TEMPLATE([HAVE_LIBX11], [Define if the X11 lib is available])
- AH_TEMPLATE([HAVE_LIBXEXT], [Define if the Xext lib is available])
- AH_TEMPLATE([HAVE_LIBXT], [Define if the Xt lib is available])
- AH_TEMPLATE([HAVE_LIBXMU], [Define if the Xmu lib is available])
- AH_TEMPLATE([HAVE_LIBXPM], [Define if the Xpm lib is available])
- AH_TEMPLATE([HAVE_LIBXAW], [Define if the Xaw lib is to be used])
- AH_TEMPLATE([HAVE_LIBXAW3D], [Define if the Xaw3d lib is to be used])
- if (test $ac_tr_lib == HAVE_LIBX11 \
- || test $ac_tr_lib == HAVE_LIBXEXT \
- || test $ac_tr_lib == HAVE_LIBXT \
- || test $ac_tr_lib == HAVE_LIBXMU \
- || test $ac_tr_lib == HAVE_LIBXPM \
- || test $ac_tr_lib == HAVE_LIBXAW \
- || test $ac_tr_lib == HAVE_LIBXAW3D); then
- AC_DEFINE_UNQUOTED($ac_tr_lib)
- X_EXTRA_LIBS="-l$1 $X_EXTRA_LIBS"
- else
- AC_MSG_ERROR([Invalid define of $ac_tr_lib in $1])
- fi
- ], [$3])
- else
- AC_MSG_RESULT(no)
- ifelse([$4], , , [$4
- ])dnl
- fi
-])
-
-dnl FC_EXPAND_DIR(VARNAME, DIR)
-dnl expands occurrences of ${prefix} and ${exec_prefix} in the given DIR,
-dnl and assigns the resulting string to VARNAME
-dnl example: FC_EXPAND_DIR(LOCALEDIR, "$datadir/locale")
-dnl eg, then: AC_DEFINE_UNQUOTED(LOCALEDIR, "$LOCALEDIR")
-dnl by Alexandre Oliva
-dnl from http://www.cygnus.com/ml/automake/1998-Aug/0040.html
-AC_DEFUN([FC_EXPAND_DIR], [
- $1=$2
- $1=`(
- test "x$prefix" = xNONE && prefix="$ac_default_prefix"
- test "x$exec_prefix" = xNONE && exec_prefix="${prefix}"
- eval echo \""[$]$1"\"
- )`
-])
-
-
-dnl FC_XPM_PATHS
-dnl Allow user to specify extra include/lib paths for Xpm, with
-dnl --with-xpm=prefix --with-xpm-lib=dir --with-xpm-include=dir
-dnl The latter two override the prefix form.
-dnl Sets variables xpm_libdir and xpm_incdir
-dnl If user supplies a path, use that.
-dnl If user specifies "no", set that, meaning "no extra path"
-dnl If user specifies "yes" (default), then use /usr/local if it looks
-dnl likely, else set to "no".
-dnl Doesn't do any cache stuff.
-dnl
-AC_DEFUN([FC_XPM_PATHS],
-[AC_MSG_CHECKING(extra paths for Xpm)
-dnl General Xpm prefix:
-dnl "no" means no prefix is required, "yes" means try /usr/local
-AC_ARG_WITH(xpm-prefix,
- [ --with-xpm-prefix=DIR Xpm files are in DIR/lib and DIR/include,
- or use the following to set them separately:],
- xpm_prefix="$withval",
- xpm_prefix="yes"
-)
-if test "$xpm_prefix" = "yes" || test "$xpm_prefix" = "no"; then
- xpm_libdir="$xpm_prefix"
- xpm_incdir="$xpm_prefix"
-else
- xpm_libdir="$xpm_prefix/lib"
- xpm_incdir="$xpm_prefix/include"
-fi
-dnl May override general Xpm prefix with explicit individual paths:
-AC_ARG_WITH(xpm-lib,
- [ --with-xpm-lib=DIR Xpm library is in DIR],
- xpm_libdir="$withval"
-)
-AC_ARG_WITH(xpm-include,
- [ --with-xpm-include=DIR Xpm header file is in DIR (that is, DIR/X11/xpm.h)],
- xpm_incdir="$withval"
-)
-dnl If xpm-lib path was not specified, try /usr/local/lib if that
-dnl looks likely; we don't actually try to link.
-fc_xpm_default=/usr/local
-if test "$xpm_libdir" = "yes"; then
- xpm_libdir="no"
- fc_xpm_default_lib="$fc_xpm_default/lib"
- for fc_extension in a so sl; do
- if test -r $fc_xpm_default_lib/libXpm.$fc_extension; then
- xpm_libdir=$fc_xpm_default_lib
- break
- fi
- done
-fi
-dnl Likewise for xpm-include with /usr/local/include;
-dnl we don't actually try to include.
-if test "$xpm_incdir" = "yes"; then
- xpm_incdir="no"
- fc_xpm_default_inc="$fc_xpm_default/include"
- if test -r $fc_xpm_default_inc/X11/xpm.h; then
- xpm_incdir=$fc_xpm_default_inc
- elif test -r $fc_xpm_default_inc/xpm.h; then
- xpm_incdir=$fc_xpm_default_inc
- xpm_h_no_x11=yes
- fi
-fi
-AC_MSG_RESULT([library $xpm_libdir, include $xpm_incdir])
-])
-
-
-dnl FC_CHECK_X_PROTO_DEFINE(DEFINED-VARIABLE)
-dnl
-dnl This macro determines the value of the given defined
-dnl variable needed by Xfuncproto.h in order to compile correctly.
-dnl
-dnl Typical DEFINED-VARIABLEs are:
-dnl FUNCPROTO
-dnl NARROWPROTO
-dnl
-dnl The following variables are output:
-dnl fc_x_proto_value -- contains the value to which
-dnl the DEFINED-VARIABLE is set,
-dnl or "" if it has no known value.
-dnl
-dnl Example use:
-dnl FC_CHECK_X_PROTO_DEFINE(FUNCPROTO)
-dnl if test -n "$fc_x_proto_value"; then
-dnl AC_DEFINE_UNQUOTED(FUNCPROTO, $fc_x_proto_value)
-dnl fi
-dnl
-AC_DEFUN([FC_CHECK_X_PROTO_DEFINE],
-[AC_REQUIRE([FC_CHECK_X_PROTO_FETCH])dnl
-AC_MSG_CHECKING(for Xfuncproto control definition $1)
-# Search for the requested defined variable; return it's value:
-fc_x_proto_value=
-for fc_x_define in $fc_x_proto_defines; do
- fc_x_val=1
- eval `echo $fc_x_define | sed -e 's/=/ ; fc_x_val=/' | sed -e 's/^/fc_x_var=/'`
- if test "x$fc_x_var" = "x$1"; then
- fc_x_proto_value=$fc_x_val
- break
- fi
-done
-if test -n "$fc_x_proto_value"; then
- AC_MSG_RESULT([yes: $fc_x_proto_value])
-else
- AC_MSG_RESULT([no])
-fi
-])
-
-dnl FC_CHECK_X_PROTO_FETCH
-dnl
-dnl This macro fetches the Xfuncproto control definitions.
-dnl (Intended to be called once from FC_CHECK_X_PROTO_DEFINE.)
-dnl
-dnl The following variables are output:
-dnl fc_x_proto_defines -- contains the list of defines of
-dnl Xfuncproto control definitions
-dnl (defines may or may not include
-dnl the -D prefix, or an =VAL part).
-dnl
-dnl Example use:
-dnl AC_REQUIRE([FC_CHECK_X_PROTO_FETCH])
-dnl
-AC_DEFUN([FC_CHECK_X_PROTO_FETCH],
-[AC_REQUIRE([AC_PATH_X])dnl
-AC_MSG_CHECKING(whether Xfuncproto was supplied)
-dnl May override determined defines with explicit argument:
-AC_ARG_WITH(x-funcproto,
- [ --with-x-funcproto=DEFS Xfuncproto control definitions are DEFS
- (e.g.: --with-x-funcproto='FUNCPROTO=15 NARROWPROTO']dnl
-)
-if test "x$with_x_funcproto" = "x"; then
- fc_x_proto_defines=
- rm -fr conftestdir
- if mkdir conftestdir; then
- cd conftestdir
- # Make sure to not put "make" in the Imakefile rules, since we grep it out.
- cat > Imakefile <<'EOF'
-fcfindpd:
- @echo 'fc_x_proto_defines=" ${PROTO_DEFINES}"'
-EOF
- if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
- # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
- eval `${MAKE-make} fcfindpd 2>/dev/null | grep -v make | sed -e 's/ -D/ /g'`
- AC_MSG_RESULT([no, found: $fc_x_proto_defines])
- cd ..
- rm -fr conftestdir
- else
- dnl Oops -- no/bad xmkmf... Time to go a-guessing...
- AC_MSG_RESULT([no])
- cd ..
- rm -fr conftestdir
- dnl First, guess something for FUNCPROTO:
- AC_MSG_CHECKING([for compilable FUNCPROTO definition])
- dnl Try in order of preference...
- for fc_x_value in 15 11 3 1 ""; do
- FC_CHECK_X_PROTO_FUNCPROTO_COMPILE($fc_x_value)
- if test "x$fc_x_proto_FUNCPROTO" != "xno"; then
- break
- fi
- done
- if test "x$fc_x_proto_FUNCPROTO" != "xno"; then
- fc_x_proto_defines="$fc_x_proto_defines FUNCPROTO=$fc_x_proto_FUNCPROTO"
- AC_MSG_RESULT([yes, determined: $fc_x_proto_FUNCPROTO])
- else
- AC_MSG_RESULT([no, cannot determine])
- fi
- dnl Second, guess something for NARROWPROTO:
- AC_MSG_CHECKING([for workable NARROWPROTO definition])
- dnl Try in order of preference...
- for fc_x_value in 1 ""; do
- FC_CHECK_X_PROTO_NARROWPROTO_WORKS($fc_x_value)
- if test "x$fc_x_proto_NARROWPROTO" != "xno"; then
- break
- fi
- done
- if test "x$fc_x_proto_NARROWPROTO" != "xno"; then
- fc_x_proto_defines="$fc_x_proto_defines NARROWPROTO=$fc_x_proto_NARROWPROTO"
- AC_MSG_RESULT([yes, determined: $fc_x_proto_NARROWPROTO])
- else
- AC_MSG_RESULT([no, cannot determine])
- fi
- AC_MSG_CHECKING(whether Xfuncproto was determined)
- if test -n "$fc_x_proto_defines"; then
- AC_MSG_RESULT([yes: $fc_x_proto_defines])
- else
- AC_MSG_RESULT([no])
- fi
- fi
- else
- AC_MSG_RESULT([no, examination failed])
- fi
-else
- fc_x_proto_defines=$with_x_funcproto
- AC_MSG_RESULT([yes, given: $fc_x_proto_defines])
-fi
-])
-
-dnl FC_CHECK_X_PROTO_FUNCPROTO_COMPILE(FUNCPROTO-VALUE)
-dnl
-dnl This macro determines whether or not Xfuncproto.h will
-dnl compile given a value to use for the FUNCPROTO definition.
-dnl
-dnl Typical FUNCPROTO-VALUEs are:
-dnl 15, 11, 3, 1, ""
-dnl
-dnl The following variables are output:
-dnl fc_x_proto_FUNCPROTO -- contains the passed-in
-dnl FUNCPROTO-VALUE if Xfuncproto.h
-dnl compiled, or "no" if it did not.
-dnl
-dnl Example use:
-dnl FC_CHECK_X_PROTO_FUNCPROTO_COMPILE($fc_x_value)
-dnl if test "x$fc_x_proto_FUNCPROTO" != "xno"; then
-dnl echo Compile using FUNCPROTO=$fc_x_proto_FUNCPROTO
-dnl fi
-dnl
-AC_DEFUN([FC_CHECK_X_PROTO_FUNCPROTO_COMPILE],
-[AC_REQUIRE([AC_PATH_XTRA])dnl
-AC_LANG_SAVE
-AC_LANG_C
-fc_x_proto_FUNCPROTO=no
-if test "x$1" = "x"; then
- fc_x_compile="#undef FUNCPROTO"
-else
- fc_x_compile="#define FUNCPROTO $1"
-fi
-fc_x_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $X_CFLAGS"
-AC_TRY_COMPILE([
-$fc_x_compile
-#include <X11/Xfuncproto.h>
- ],[
-exit (0)
- ],
- [fc_x_proto_FUNCPROTO=$1])
-CFLAGS="$fc_x_save_CFLAGS"
-AC_LANG_RESTORE
-])
-
-dnl FC_CHECK_X_PROTO_NARROWPROTO_WORKS(NARROWPROTO-VALUE)
-dnl
-dnl This macro determines whether or not NARROWPROTO is required
-dnl to get a typical X function (XawScrollbarSetThumb) to work.
-dnl
-dnl Typical NARROWPROTO-VALUEs are:
-dnl 1, ""
-dnl
-dnl The following variables are required for input:
-dnl fc_x_proto_FUNCPROTO -- the value to use for FUNCPROTO.
-dnl
-dnl The following variables are output:
-dnl fc_x_proto_NARROWPROTO -- contains the passed-in
-dnl NARROWPROTO-VALUE if the test
-dnl worked, or "no" if it did not.
-dnl
-dnl Example use:
-dnl FC_CHECK_X_PROTO_NARROWPROTO_WORKS($fc_x_value)
-dnl if test "x$fc_x_proto_NARROWPROTO" != "xno"; then
-dnl echo Compile using NARROWPROTO=$fc_x_proto_NARROWPROTO
-dnl fi
-dnl
-AC_DEFUN([FC_CHECK_X_PROTO_NARROWPROTO_WORKS],
-[AC_REQUIRE([AC_PATH_XTRA])dnl
-AC_LANG_SAVE
-AC_LANG_C
-fc_x_proto_NARROWPROTO=no
-if test "x$1" = "x"; then
- fc_x_works="#undef NARROWPROTO"
-else
- fc_x_works="#define NARROWPROTO $1"
-fi
-if test "x$fc_x_proto_FUNCPROTO" = "x"; then
- fc_x_compile="#define FUNCPROTO 1"
+ test "$[2]" = conftest.file
+ )
+then
+ # Ok.
+ :
else
- fc_x_compile="#define FUNCPROTO $fc_x_proto_FUNCPROTO"
+ AC_MSG_ERROR([newly created file is older than distributed files!
+Check your system clock])
fi
-fc_x_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $X_CFLAGS $X_LIBS $X_PRE_LIBS -lXaw -lXt -lX11 $X_EXTRA_LIBS"
-AC_TRY_RUN([
-$fc_x_works
-$fc_x_compile
-#include <X11/Xfuncproto.h>
-#include <X11/Intrinsic.h>
-#include <X11/StringDefs.h>
-#include <X11/Xaw/Scrollbar.h>
-#define TOP_VAL 0.125
-#define SHOWN_VAL 0.25
-int main (int argc, char ** argv)
-{
- Widget toplevel;
- XtAppContext appcon;
- Widget scrollbar;
- double topbuf;
- double shownbuf;
- float * top = (float *)(&topbuf);
- float * shown = (float *)(&shownbuf);
- toplevel =
- XtAppInitialize
- (
- &appcon,
- "FcXTest",
- NULL, 0,
- &argc, argv,
- NULL,
- NULL, 0
- );
- scrollbar =
- XtVaCreateManagedWidget
- (
- "my_scrollbar",
- scrollbarWidgetClass,
- toplevel,
- NULL
- );
- XawScrollbarSetThumb (scrollbar, TOP_VAL, SHOWN_VAL);
- XtVaGetValues
- (
- scrollbar,
- XtNtopOfThumb, top,
- XtNshown, shown,
- NULL
- );
- if ((*top == TOP_VAL) && (*shown == SHOWN_VAL))
- {
- exit (0);
- }
- else
- {
- exit (1);
- }
- return (0);
-}
- ],
- [fc_x_proto_NARROWPROTO=$1], [], [:])
-CFLAGS="$fc_x_save_CFLAGS"
-AC_LANG_RESTORE
-])
-
+AC_MSG_RESULT(yes)])
-# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
-#
-# Copyright © 2004 Scott James Remnant <scott at netsplit.com>.
+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
+# 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.
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
-AC_DEFUN([PKG_PROG_PKG_CONFIG],
-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
- AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+# AM_PROG_INSTALL_STRIP
+# ---------------------
+# One issue with vendor `install' (even GNU) is that you can't
+# specify the program used to strip binaries. This is especially
+# annoying in cross-compiling environments, where the build's strip
+# is unlikely to handle the host's binaries.
+# Fortunately install-sh will honor a STRIPPROG variable, so we
+# always use install-sh in `make install-strip', and initialize
+# STRIPPROG with the value of the STRIP variable (set by the user).
+AC_DEFUN([AM_PROG_INSTALL_STRIP],
+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'. However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+if test "$cross_compiling" != no; then
+ AC_CHECK_TOOL([STRIP], [strip], :)
fi
-if test -n "$PKG_CONFIG"; then
- _pkg_min_version=m4_default([$1], [0.9.0])
- AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
- AC_MSG_RESULT([yes])
- else
- AC_MSG_RESULT([no])
- PKG_CONFIG=""
- fi
-
-fi[]dnl
-])# PKG_PROG_PKG_CONFIG
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists. Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
#
-#
-# Similar to PKG_CHECK_MODULES, make sure that the first instance of
-# this or PKG_CHECK_MODULES is called, or make sure to call
-# PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_EXISTS],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-if test -n "$PKG_CONFIG" && \
- AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
- m4_ifval([$2], [$2], [:])
-m4_ifvaln([$3], [else
- $3])dnl
-fi])
+# 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.
+# serial 2
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
-m4_define([_PKG_CONFIG],
-[if test -n "$PKG_CONFIG"; then
- if test -n "$$1"; then
- pkg_cv_[]$1="$$1"
- else
- PKG_CHECK_EXISTS([$3],
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
- [pkg_failed=yes])
- fi
-else
- pkg_failed=untried
-fi[]dnl
-])# _PKG_CONFIG
+# _AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+# This macro is traced by Automake.
+AC_DEFUN([_AM_SUBST_NOTMAKE])
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
+# AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Public sister of _AM_SUBST_NOTMAKE.
+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+# Check how to create a tarball. -*- Autoconf -*-
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
+# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_MODULES],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-
-pkg_failed=no
-AC_MSG_CHECKING([for $1])
-
-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-
-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-and $1[]_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.])
-
-if test $pkg_failed = yes; then
- _PKG_SHORT_ERRORS_SUPPORTED
- if test $_pkg_short_errors_supported = yes; then
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
- else
- $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-
- ifelse([$4], , [AC_MSG_ERROR(dnl
-[Package requirements ($2) were not met:
-
-$$1_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-_PKG_TEXT
-])],
- [AC_MSG_RESULT([no])
- $4])
-elif test $pkg_failed = untried; then
- ifelse([$4], , [AC_MSG_FAILURE(dnl
-[The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-_PKG_TEXT
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
- [$4])
-else
- $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
- $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
- AC_MSG_RESULT([yes])
- ifelse([$3], , :, [$3])
-fi[]dnl
-])# PKG_CHECK_MODULES
-
-# Try to configure the Win32 client (gui-win32)
-
-# FC_WIN32_CLIENT
-# Test for Win32 and needed libraries for gui-win32
-
-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"
- CLIENT_CFLAGS="$PNG_CFLAGS"
- ],
- [
- AC_CHECK_LIB([z], [gzgets],
- [
- AC_CHECK_HEADER([zlib.h],
- [
- AC_CHECK_LIB([png12], [png_read_image],,
- [
- AC_CHECK_LIB([png], [png_read_image],,
- [
- FC_NO_CLIENT([win32], [libpng is needed])
- ])
- ])
-
- AC_CHECK_HEADER([png.h],
- [
- found_client=yes
- client=win32
- CLIENT_LIBS="-lwsock32 -lcomctl32 -lpng -mwindows"
- ],
- [
- FC_NO_CLIENT([win32], [libpng-dev is needed])
- ])
- ],
- [
- FC_NO_CLIENT([win32], [zlib-dev is needed])
- ])
- ],
- [
- FC_NO_CLIENT([win32], [zlib is needed])
- ])
- ])
- else
- FC_NO_CLIENT([win32], [mingw32 is needed])
- fi
- fi
-])
-
-AC_DEFUN([FC_CHECK_SOUND],[
- AC_ARG_ENABLE(sdl-mixer,
- [ --disable-sdl-mixer Do not try to use the SDL mixer],
- USE_SOUND=no, USE_SOUND_SDL=yes)
-
- if test "x$USE_SOUND_SDL" = "xyes"; then
- dnl Add SDL support to client
- SDL_VERSION=1.0.0
- AM_PATH_SDL($SDL_VERSION, SDL=yes, SDL=no)
- if test "x$SDL" != "xno"; then
- AC_CHECK_HEADER(SDL/SDL_mixer.h, SDL_mixer_h=1, SDL_mixer_h=0)
- AC_CHECK_LIB(SDL_mixer, Mix_OpenAudio, SDL_mixer=yes)
- AC_MSG_CHECKING(building SDL_mixer support)
- if test "x$SDL_mixer_h" = "x1"; then
- if test "x$SDL_mixer" = "xyes"; then
- SOUND_CFLAGS="$SOUND_CFLAGS $SDL_CFLAGS"
- SOUND_LIBS="$SOUND_LIBS $SDL_LIBS -lSDL_mixer"
- AC_DEFINE(AUDIO_SDL, 1, [SDL_Mixer support])
- AC_DEFINE(SDL, 1, [SDL is used])
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT([no, found header but not library!])
- fi
- else
- AC_MSG_RESULT([no, install SDL_mixer first: http://www.libsdl.org/projects/SDL_mixer/index.html])
- SDL_mixer="xno"
- fi
- fi
- fi
-])
-
-dnl ======================================
-dnl GGZ Gaming Zone - Configuration Macros
-dnl ======================================
-dnl
-dnl Copyright (C) 2001 - 2007 Josef Spillner, josef at ggzgamingzone.org
-dnl This file has heavily been inspired by KDE's acinclude :)
-dnl It is published under the conditions of the GNU General Public License.
-dnl
-dnl ======================================
-dnl
-dnl This file is common to most GGZ modules, and should be kept in sync
-dnl between them all. The master copy resides with libggz.
-dnl Currently the following modules use it:
-dnl kde-games, kde-client, gtk-games, gtk-client, utils, grubby,
-dnl ggz-client-libs, ggzd, gnome-client, txt-client, sdl-games, libggz
-dnl See /docs/ggz-project/buildsystem for documentation.
-dnl
-dnl ======================================
-dnl
-dnl History:
-dnl See the SVN log for a full history.
-dnl
-dnl ------------------------------------------------------------------------
-dnl Content of this file:
-dnl ------------------------------------------------------------------------
-dnl High-level macros:
-dnl AC_GGZ_CHECK - Checks for presence of GGZ client and server libraries.
-dnl GGZ users can call this macro to determine at compile
-dnl time whether to include GGZ support. Server and client
-dnl are checked separately. GGZ_SERVER and GGZ_CLIENT are
-dnl defined in config.h, and created as conditionals in
-dnl the Makefiles.
-dnl AC_GGZ_CHECK_SERVER - The same, but server libs only.
-dnl
-dnl Low-level macros:
-dnl AC_GGZ_INIT - initialization and paths/options setup
-dnl AC_GGZ_VERSION - ensure a minimum version of GGZ
-dnl AC_GGZ_LIBGGZ - find the libggz headers and libraries
-dnl AC_GGZ_GGZCORE - find the ggzcore headers and libraries
-dnl AC_GGZ_CONFIG - find the ggz-config tool and set up configuration
-dnl AC_GGZ_GGZMOD - find the ggzmod library
-dnl AC_GGZ_GGZDMOD - find the ggzdmod library
-dnl AC_GGZ_SERVER - set up game and room path for ggzd game servers
-dnl
-dnl Each macro takes two arguments:
-dnl 1. Action-if-found (or empty for no action).
-dnl 2. Action-if-not-found (or empty for error, or "ignore" to ignore).
-dnl
-dnl Internal functions:
-dnl AC_GGZ_ERROR - user-friendly error messages
-dnl AC_GGZ_FIND_FILE - macro for convenience (thanks kde)
-dnl AC_GGZ_REMOVEDUPS - eliminate duplicate list elements
-dnl
+# 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.
-# Version number of this script.
-# First part is upstream (ggz) version and second Freeciv modifications.
-# serial 0014.2
+# serial 2
-dnl ------------------------------------------------------------------------
-dnl Find a directory containing a single file
-dnl Synopsis: AC_GGZ_FIND_FILE(file, directorylist, <returnvar>)
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([AC_GGZ_FIND_FILE],
-[
-$3=NO
-for i in $2;
+# _AM_PROG_TAR(FORMAT)
+# --------------------
+# Check how to create a tarball in format FORMAT.
+# FORMAT should be one of `v7', `ustar', or `pax'.
+#
+# Substitute a variable $(am__tar) that is a command
+# writing to stdout a FORMAT-tarball containing the directory
+# $tardir.
+# tardir=directory && $(am__tar) > result.tar
+#
+# Substitute a variable $(am__untar) that extract such
+# a tarball read from stdin.
+# $(am__untar) < result.tar
+AC_DEFUN([_AM_PROG_TAR],
+[# Always define AMTAR for backward compatibility.
+AM_MISSING_PROG([AMTAR], [tar])
+m4_if([$1], [v7],
+ [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+ [m4_case([$1], [ustar],, [pax],,
+ [m4_fatal([Unknown tar format])])
+AC_MSG_CHECKING([how to create a $1 tar archive])
+# Loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
+# Do not fold the above two line into one, because Tru64 sh and
+# Solaris sh will not grok spaces in the rhs of `-'.
+for _am_tool in $_am_tools
do
- for j in $1;
- do
- echo "configure: __oline__: $i/$j" >&AC_FD_CC
- if test -r "$i/$j"; then
- echo "taking that" >&AC_FD_CC
- $3=$i
- break 2
- fi
- done
-done
-])
-
-dnl ------------------------------------------------------------------------
-dnl Remove duplicate entries in a list, and remove all NO's
-dnl Synopsis: AC_GGZ_REMOVEDUPS(list, <returnlist>)
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([AC_GGZ_REMOVEDUPS],
-[
-ret=""
-for i in $1; do
- add=yes
- for j in $ret; do
- if test "x$i" = "x$j"; then
- add=no
- fi
- done
- if test "x$i" = "xNO"; then
- add=no
- fi
- if test "x$add" = "xyes"; then
- ret="$ret $i"
- fi
-done
-$2=$ret
-])
-
-dnl ------------------------------------------------------------------------
-dnl User-friendly error messages
-dnl Synopsis: AC_GGZ_ERROR(libraryname, headerdirlist, libdirlist)
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([AC_GGZ_ERROR],
-[
- AC_MSG_WARN([no
- The library '$1' does not seem to be installed correctly.
- Headers searched in: $2
- Libraries searched in: $3
- Please read QuickStart.GGZ in order to fix this.
- ])
- exit 1
-])
-
-dnl ------------------------------------------------------------------------
-dnl Initialization, common values and such
-dnl Synopsis: AC_GGZ_INIT([export], [defaults])
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([AC_GGZ_INIT],
-[
-if test "x$prefix" = "xNONE"; then
- prefix="${ac_default_prefix}"
-fi
-if test "x$exec_prefix" = "xNONE"; then
- exec_prefix='${prefix}'
-fi
-
-ac_ggz_prefix=""
-AC_ARG_WITH(ggz-dir,
- AC_HELP_STRING([--with-ggz-dir=DIR], [Path to GGZ Gaming Zone]),
- [ ac_ggz_prefix="$withval"
- ])
-
-if test "x$ac_ggz_prefix" != "xno" ; then
- if test "x${prefix}" = "xNONE"; then
- ac_ggz_prefix_incdir="${ac_default_prefix}/include"
- ac_ggz_prefix_libdir="${ac_default_prefix}/lib"
- ac_ggz_prefix_bindir="${ac_default_prefix}/bin"
- ac_ggz_prefix_etcdir="${ac_default_prefix}/etc"
- else
- unq_includedir="${includedir}"
- unq_libdir="${libdir}"
- unq_bindir="${bindir}"
- unq_sysconfdir="${sysconfdir}"
-
- eval unq_includedir=`echo $unq_includedir`
- eval unq_includedir=`echo $unq_includedir`
- eval unq_libdir=`echo $unq_libdir`
- eval unq_libdir=`echo $unq_libdir`
- eval unq_bindir=`echo $unq_bindir`
- eval unq_bindir=`echo $unq_bindir`
- eval unq_sysconfdir=`echo $unq_sysconfdir`
- eval unq_sysconfdir=`echo $unq_sysconfdir`
-
- ac_ggz_prefix_incdir="${unq_includedir}"
- ac_ggz_prefix_libdir="${unq_libdir}"
- ac_ggz_prefix_bindir="${unq_bindir}"
- ac_ggz_prefix_etcdir="${unq_sysconfdir}"
- fi
- ac_ggz_stdinc="$ac_ggz_prefix_incdir"
- ac_ggz_stdlib="$ac_ggz_prefix_libdir"
- ac_ggz_stdbin="$ac_ggz_prefix_bindir"
- ac_ggz_stdetc="$ac_ggz_prefix_etcdir/ggzd"
- if test "x$ac_ggz_prefix" != "x"; then
- ac_ggz_stdinc="$ac_ggz_stdinc $ac_ggz_prefix/include"
- ac_ggz_stdlib="$ac_ggz_stdlib $ac_ggz_prefix/lib $ac_ggz_prefix/lib64"
- ac_ggz_stdbin="$ac_ggz_stdbin $ac_ggz_prefix/bin"
- ac_ggz_stdetc="$ac_ggz_stdetc $ac_ggz_prefix/etc/ggzd"
- fi
- if test "x$1" = "xdefaults" || test "x$2" = "xdefaults"; then
- ac_ggz_stdinc="$ac_ggz_stdinc /usr/local/include /usr/include"
- ac_ggz_stdlib="$ac_ggz_stdlib /usr/local/lib /usr/local/lib64 /usr/lib /usr/lib64"
- ac_ggz_stdbin="$ac_ggz_stdbin /usr/local/bin /usr/bin"
- ac_ggz_stdetc="$ac_ggz_stdetc /usr/local/etc/ggzd /etc/ggzd"
- fi
- if test "x$1" = "xexport" || test "x$2" = "xexport"; then
- CPPFLAGS="$CPPFLAGS -I ${ac_ggz_prefix_incdir} -I /usr/local/include"
- LDFLAGS="$LDFLAGS -L${ac_ggz_prefix_libdir} -L/usr/local/lib"
- fi
-
- save_cflags=$CFLAGS
- save_cxxflags=$CXXFLAGS
- if test "x$GCC" = xyes; then
- CFLAGS="-Wall -Werror"
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
- [[void signedness(void){char c;if(c==-1)c=0;}]])],
- [],
- [save_cflags="$save_cflags -fsigned-char"
- save_cxxflags="$save_cxxflags -fsigned-char"])
- else
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
- [[#if defined(__SUNPRO_C) || (__SUNPRO_C >= 0x550)
- #else
- # include "Error: Only GCC and Sun Studio are supported compilers."
- #endif]], [[]])],
- [save_cflags="$save_cflags -xchar=signed"
- save_cxxflags="$save_cxxflags -xchar=signed"],
- [])
-
- fi
- CFLAGS=$save_cflags
- CXXFLAGS=$save_cxxflags
-fi
-])
-
-dnl ------------------------------------------------------------------------
-dnl Ensure that a minimum version of GGZ is present
-dnl Synopsis: AC_GGZ_VERSION(major, minor, micro,
-dnl action-if-found, action-if-not-found)
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([AC_GGZ_VERSION],
-[
- major=$1
- minor=$2
- micro=$3
-
- testprologue="#include <ggz.h>"
- testbody=""
- testbody="$testbody if(LIBGGZ_VERSION_MAJOR > $major) return 0;"
- testbody="$testbody if(LIBGGZ_VERSION_MAJOR < $major) return -1;"
- testbody="$testbody if(LIBGGZ_VERSION_MINOR > $minor) return 0;"
- testbody="$testbody if(LIBGGZ_VERSION_MINOR < $minor) return -1;"
- testbody="$testbody if(LIBGGZ_VERSION_MICRO > $micro) return 0;"
- testbody="$testbody if(LIBGGZ_VERSION_MICRO < $micro) return -1;"
- testbody="$testbody return 0;"
-
- save_libs=$LIBS
- save_ldflags=$LDFLAGS
- save_cppflags=$CPPFLAGS
- save_ldlibrary_path=$LD_LIBRARY_PATH
- LDFLAGS=$LIBGGZ_LDFLAGS
- LIBS=$LIB_GGZ
- CPPFLAGS=$LIBGGZ_INCLUDES
- LD_LIBRARY_PATH=$save_ldlibrary_path:$libggz_libraries
- export LD_LIBRARY_PATH
-
- AC_MSG_CHECKING([for GGZ library version: $major.$minor.$micro])
- AC_RUN_IFELSE(
- [AC_LANG_PROGRAM([[$testprologue]], [[$testbody]])],
- [ac_ggz_version_check=yes],
- [ac_ggz_version_check=no],
- [ac_ggz_version_check="skipped due to cross-compiling"]
- )
- if test "$ac_ggz_version_check" = "no"; then
- AC_MSG_RESULT([no])
- if test "x$5" = "x"; then
- AC_MSG_ERROR([The GGZ version is too old. Version $major.$minor.$micro is required.])
- fi
- $5
- else
- AC_MSG_RESULT($ac_ggz_version_check)
- $4
- fi
-
- LIBS=$save_libs
- LDFLAGS=$save_ldflags
- CPPFLAGS=$save_cppflags
- LD_LIBRARY_PATH=$save_ldlibrary_path
-])
-
-dnl ------------------------------------------------------------------------
-dnl Try to find the libggz headers and libraries.
-dnl $(LIBGGZ_LDFLAGS) will be -L ... (if needed)
-dnl and $(LIBGGZ_INCLUDES) will be -I ... (if needed)
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([AC_GGZ_LIBGGZ],
-[
-AC_MSG_CHECKING([for GGZ library: libggz])
-
-ac_libggz_includes=NO ac_libggz_libraries=NO
-libggz_libraries=""
-libggz_includes=""
-
-AC_ARG_WITH(libggz-dir,
- AC_HELP_STRING([--with-libggz-dir=DIR],[libggz installation prefix]),
- [ ac_libggz_includes="$withval"/include
- ac_libggz_libraries="$withval"/lib
- ])
-AC_ARG_WITH(libggz-includes,
- AC_HELP_STRING([--with-libggz-includes=DIR],
- [where the libggz includes are]),
- [ ac_libggz_includes="$withval"
- ])
-AC_ARG_WITH(libggz-libraries,
- AC_HELP_STRING([--with-libggz-libraries=DIR],[where the libggz libs are]),
- [ ac_libggz_libraries="$withval"
- ])
-
-AC_CACHE_VAL(ac_cv_have_libggz,
-[
-libggz_incdirs="$ac_libggz_includes $ac_ggz_stdinc"
-AC_GGZ_REMOVEDUPS($libggz_incdirs, libggz_incdirs)
-libggz_header=ggz.h
-
-AC_GGZ_FIND_FILE($libggz_header, $libggz_incdirs, libggz_incdir)
-ac_libggz_includes="$libggz_incdir"
-
-libggz_libdirs="$ac_libggz_libraries $ac_ggz_stdlib"
-AC_GGZ_REMOVEDUPS($libggz_libdirs, libggz_libdirs)
-
-libggz_libdir=NO
-for dir in $libggz_libdirs; do
- try="ls -1 $dir/libggz.la $dir/libggz.so"
- if test -n "`$try 2> /dev/null`"; then libggz_libdir=$dir; break; else echo "tried $dir" >&AC_FD_CC ; fi
-done
-
-ac_libggz_libraries="$libggz_libdir"
-
-if test "$ac_libggz_includes" = NO || test "$ac_libggz_libraries" = NO; then
- ac_cv_have_libggz="have_libggz=no"
- ac_libggz_notfound=""
-else
- have_libggz="yes"
-fi
-])
-
-eval "$ac_cv_have_libggz"
-
-if test "$have_libggz" != yes; then
- if test "x$2" = "xignore"; then
- AC_MSG_RESULT([$have_libggz (ignored)])
- else
- AC_MSG_RESULT([$have_libggz])
- if test "x$2" = "x"; then
- AC_GGZ_ERROR(libggz, $libggz_incdirs, $libggz_libdirs)
- fi
-
- # perform actions given by argument 2.
- $2
- fi
-else
- ac_cv_have_libggz="have_libggz=yes \
- ac_libggz_includes=$ac_libggz_includes ac_libggz_libraries=$ac_libggz_libraries"
- AC_MSG_RESULT([$have_libggz (libraries $ac_libggz_libraries, headers $ac_libggz_includes)])
-
- libggz_libraries="$ac_libggz_libraries"
- libggz_includes="$ac_libggz_includes"
-
- AC_SUBST(libggz_libraries)
- AC_SUBST(libggz_includes)
-
- LIBGGZ_INCLUDES="-I $libggz_includes"
- LIBGGZ_LDFLAGS="-L$libggz_libraries"
-
- AC_SUBST(LIBGGZ_INCLUDES)
- AC_SUBST(LIBGGZ_LDFLAGS)
-
- LIB_GGZ='-lggz'
- AC_SUBST(LIB_GGZ)
-
- # perform actions given by argument 1.
- $1
-fi
-
-])
-
-dnl ------------------------------------------------------------------------
-dnl Try to find the ggzcore headers and libraries.
-dnl $(GGZCORE_LDFLAGS) will be -L ... (if needed)
-dnl and $(GGZCORE_INCLUDES) will be -I ... (if needed)
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([AC_GGZ_GGZCORE],
-[
-AC_MSG_CHECKING([for GGZ library: ggzcore])
-
-ac_ggzcore_includes=NO ac_ggzcore_libraries=NO
-ggzcore_libraries=""
-ggzcore_includes=""
-
-AC_ARG_WITH(ggzcore-dir,
- AC_HELP_STRING([--with-ggzcore-dir=DIR],[ggzcore installation prefix]),
- [ ac_ggzcore_includes="$withval"/include
- ac_ggzcore_libraries="$withval"/lib
- ])
-AC_ARG_WITH(ggzcore-includes,
- AC_HELP_STRING([--with-ggzcore-includes=DIR],
- [where the ggzcore includes are]),
- [ ac_ggzcore_includes="$withval"
- ])
-AC_ARG_WITH(ggzcore-libraries,
- AC_HELP_STRING([--with-ggzcore-libraries=DIR],
- [where the ggzcore libs are]),
- [ ac_ggzcore_libraries="$withval"
- ])
-
-AC_CACHE_VAL(ac_cv_have_ggzcore,
-[
-ggzcore_incdirs="$ac_ggzcore_includes $ac_ggz_stdinc"
-AC_GGZ_REMOVEDUPS($ggzcore_incdirs, ggzcore_incdirs)
-ggzcore_header=ggzcore.h
-
-AC_GGZ_FIND_FILE($ggzcore_header, $ggzcore_incdirs, ggzcore_incdir)
-ac_ggzcore_includes="$ggzcore_incdir"
-
-ggzcore_libdirs="$ac_ggzcore_libraries $ac_ggz_stdlib"
-AC_GGZ_REMOVEDUPS($ggzcore_libdirs, ggzcore_libdirs)
-
-ggzcore_libdir=NO
-for dir in $ggzcore_libdirs; do
- try="ls -1 $dir/libggzcore.la $dir/libggzcore.so"
- if test -n "`$try 2> /dev/null`"; then ggzcore_libdir=$dir; break; else echo "tried $dir" >&AC_FD_CC ; fi
-done
-
-ac_ggzcore_libraries="$ggzcore_libdir"
-
-if test "$ac_ggzcore_includes" = NO || test "$ac_ggzcore_libraries" = NO; then
- ac_cv_have_ggzcore="have_ggzcore=no"
- ac_ggzcore_notfound=""
-else
- have_ggzcore="yes"
-fi
-])
-
-eval "$ac_cv_have_ggzcore"
-
-if test "$have_ggzcore" != yes; then
- if test "x$2" = "xignore"; then
- AC_MSG_RESULT([$have_ggzcore (intentionally ignored)])
- else
- AC_MSG_RESULT([$have_ggzcore])
- if test "x$2" = "x"; then
- AC_GGZ_ERROR(ggzcore, $ggzcore_incdirs, $ggzcore_libdirs)
- fi
-
- # Perform actions given by argument 2.
- $2
- fi
-else
- ac_cv_have_ggzcore="have_ggzcore=yes \
- ac_ggzcore_includes=$ac_ggzcore_includes ac_ggzcore_libraries=$ac_ggzcore_libraries"
- AC_MSG_RESULT([$have_ggzcore (libraries $ac_ggzcore_libraries, headers $ac_ggzcore_includes)])
-
- ggzcore_libraries="$ac_ggzcore_libraries"
- ggzcore_includes="$ac_ggzcore_includes"
-
- AC_SUBST(ggzcore_libraries)
- AC_SUBST(ggzcore_includes)
-
- GGZCORE_INCLUDES="-I $ggzcore_includes"
- GGZCORE_LDFLAGS="-L$ggzcore_libraries"
-
- AC_SUBST(GGZCORE_INCLUDES)
- AC_SUBST(GGZCORE_LDFLAGS)
-
- LIB_GGZCORE='-lggzcore'
- AC_SUBST(LIB_GGZCORE)
-
- # Perform actions given by argument 1.
- $1
-fi
-
-])
-
-dnl ------------------------------------------------------------------------
-dnl Try to find the ggz-config binary.
-dnl Sets GGZ_CONFIG to the path/name of the program.
-dnl Sets also: ggz_gamedir, ggz_datadir etc.
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([AC_GGZ_CONFIG],
-[
-AC_MSG_CHECKING([for GGZ configuration tool: ggz-config])
-
-ac_ggz_config=NO
-ggz_config=""
-
-AC_ARG_WITH(ggzconfig,
- AC_HELP_STRING([--with-ggzconfig=DIR],[path to ggz-config]),
- [ ac_ggz_config="$withval"
- ])
-
-ac_ggz_config_orig=$ac_ggz_config
-
-AC_CACHE_VAL(ac_cv_have_ggzconfig,
-[
-ggz_config_dirs="$ac_ggz_config $ac_ggz_stdbin"
-
-AC_GGZ_FIND_FILE(ggz-config, $ggz_config_dirs, ggz_config_dir)
-ac_ggz_config="$ggz_config_dir"
-
-if test "$ac_ggz_config" = NO; then
- ac_cv_have_ggzcore="have_ggz_config=no"
- ac_ggz_config_notfound=""
- have_ggz_config="no"
-else
- have_ggz_config="yes"
-fi
-])
-
-eval "$ac_cv_have_ggz_config"
-
-if test "$have_ggz_config" != yes; then
- if test "x$2" = "xignore"; then
- AC_MSG_RESULT([$have_ggz_config (intentionally ignored)])
- GGZ_CONFIG="true"
- ggzexecmoddir="\${libdir}/ggz"
- ggzdatadir="\${datadir}/ggz"
- AC_SUBST(GGZ_CONFIG)
- AC_SUBST(ggzexecmoddir)
- AC_SUBST(ggzdatadir)
- AC_DEFINE_UNQUOTED(GAMEDIR, "${libdir}/ggz", [Path where to install the games])
- AC_DEFINE_UNQUOTED(GGZDATADIR, "${datadir}/ggz", [Path where the games should look for their data files])
- else
- AC_MSG_RESULT([$have_ggz_config])
- if test "x$2" = "x"; then
- AC_MSG_ERROR([ggz-config not found. Please check your installation! ])
- fi
-
- # Perform actions given by argument 2.
- $2
- fi
-else
- pathto_app=`echo $prefix/bin/ | tr -s "/"`
- pathto_ggz=`echo $ac_ggz_config/ | tr -s "/"`
-
- if test "$ac_ggz_config_orig" != "NO"; then
- pathto_app=$pathto_ggz
- fi
-
- if test "x$pathto_app" != "x$pathto_ggz"; then
- AC_MSG_RESULT([$have_ggz_config (dismissed due to different prefix)])
- GGZ_CONFIG="true"
- ggzexecmoddir="\${libdir}/ggz"
- ggzdatadir="\${datadir}/ggz"
- AC_SUBST(GGZ_CONFIG)
- AC_SUBST(ggzexecmoddir)
- AC_SUBST(ggzdatadir)
- AC_DEFINE_UNQUOTED(GGZMODULECONFDIR, "${prefix}/etc", [Path where the game registry is located])
- AC_DEFINE_UNQUOTED(GAMEDIR, "${libdir}/ggz", [Path where to install the games])
- AC_DEFINE_UNQUOTED(GGZDATADIR, "${datadir}/ggz", [Path where the games should look for their data files])
- else
- ac_cv_have_ggz_config="have_ggz_config=yes \
- ac_ggz_config=$ac_ggz_config"
- AC_MSG_RESULT([$ac_ggz_config/ggz-config])
-
- ggz_config="$ac_ggz_config"
- AC_SUBST(ggz_config)
-
- AC_ARG_ENABLE([noregistry],
- AC_HELP_STRING([--enable-noregistry], [Do not register game modules.]),
- [enable_noregistry=yes], [enable_noregistry=no])
-
- GGZ_CONFIG="${ggz_config}/ggz-config"
- if test "$enable_noregistry" = yes; then
- GGZ_CONFIG="$GGZ_CONFIG --noregistry=$enableval"
- fi
- AC_SUBST(GGZ_CONFIG)
-
- ggzmoduleconfdir=`$GGZ_CONFIG --configdir`
- AC_DEFINE_UNQUOTED(GGZMODULECONFDIR, "${ggzmoduleconfdir}", [Path where the game registry is located])
- ggzexecmoddir=`$GGZ_CONFIG --gamedir`
- AC_DEFINE_UNQUOTED(GAMEDIR, "${ggzexecmoddir}", [Path where to install the games])
- ggzdatadir=`$GGZ_CONFIG --datadir`
- AC_DEFINE_UNQUOTED(GGZDATADIR, "${ggzdatadir}", [Path where the games should look for their data files])
- packagesrcdir=`cd $srcdir && pwd`
- AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [Path where the source is located])
-
- if test "$ggzmoduleconfdir" = ""; then
- AC_MSG_ERROR([ggz-config is unusable. Maybe LD_LIBRARY_PATH needs to be set.])
- fi
-
- AC_SUBST(ggzmoduleconfdir)
- AC_SUBST(ggzexecmoddir)
- AC_SUBST(ggzdatadir)
- AC_SUBST(packagesrcdir)
-
- # Perform actions given by argument 1.
- $1
- fi
-fi
-
-])
-
-dnl ------------------------------------------------------------------------
-dnl Try to find the ggzmod headers and libraries.
-dnl $(GGZMOD_LDFLAGS) will be -L ... (if needed)
-dnl and $(GGZMOD_INCLUDES) will be -I ... (if needed)
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([AC_GGZ_GGZMOD],
-[
-AC_MSG_CHECKING([for GGZ library: ggzmod])
-
-ac_ggzmod_includes=NO ac_ggzmod_libraries=NO
-ggzmod_libraries=""
-ggzmod_includes=""
-
-AC_ARG_WITH(ggzmod-dir,
- AC_HELP_STRING([--with-ggzmod-dir=DIR],[ggzmod installation prefix]),
- [ ac_ggzmod_includes="$withval"/include
- ac_ggzmod_libraries="$withval"/lib
- ])
-AC_ARG_WITH(ggzmod-includes,
- AC_HELP_STRING([--with-ggzmod-includes=DIR],
- [where the ggzmod includes are]),
- [ ac_ggzmod_includes="$withval"
- ])
-AC_ARG_WITH(ggzmod-libraries,
- AC_HELP_STRING([--with-ggzmod-libraries=DIR],
- [where the ggzmod libs are]),
- [ ac_ggzmod_libraries="$withval"
- ])
-
-AC_CACHE_VAL(ac_cv_have_ggzmod,
-[
-ggzmod_incdirs="$ac_ggzmod_includes $ac_ggz_stdinc"
-AC_GGZ_REMOVEDUPS($ggzmod_incdirs, ggzmod_incdirs)
-ggzmod_header=ggzmod.h
-
-AC_GGZ_FIND_FILE($ggzmod_header, $ggzmod_incdirs, ggzmod_incdir)
-ac_ggzmod_includes="$ggzmod_incdir"
-
-ggzmod_libdirs="$ac_ggzmod_libraries $ac_ggz_stdlib"
-AC_GGZ_REMOVEDUPS($ggzmod_libdirs, ggzmod_libdirs)
-
-ggzmod_libdir=NO
-for dir in $ggzmod_libdirs; do
- try="ls -1 $dir/libggzmod.la $dir/libggzmod.so"
- if test -n "`$try 2> /dev/null`"; then ggzmod_libdir=$dir; break; else echo "tried $dir" >&AC_FD_CC ; fi
-done
-
-ac_ggzmod_libraries="$ggzmod_libdir"
-
-if test "$ac_ggzmod_includes" = NO || test "$ac_ggzmod_libraries" = NO; then
- ac_cv_have_ggzmod="have_ggzmod=no"
- ac_ggzmod_notfound=""
-else
- have_ggzmod="yes"
-fi
-])
-
-eval "$ac_cv_have_ggzmod"
-
-if test "$have_ggzmod" != yes; then
- if test "x$2" = "xignore"; then
- AC_MSG_RESULT([$have_ggzmod (intentionally ignored)])
- else
- AC_MSG_RESULT([$have_ggzmod])
- if test "x$2" = "x"; then
- AC_GGZ_ERROR(ggzmod, $ggzmod_incdirs, $ggzmod_libdirs)
- fi
-
- # Perform actions given by argument 2.
- $2
- fi
-else
- ac_cv_have_ggzmod="have_ggzmod=yes \
- ac_ggzmod_includes=$ac_ggzmod_includes ac_ggzmod_libraries=$ac_ggzmod_libraries"
- AC_MSG_RESULT([$have_ggzmod (libraries $ac_ggzmod_libraries, headers $ac_ggzmod_includes)])
-
- ggzmod_libraries="$ac_ggzmod_libraries"
- ggzmod_includes="$ac_ggzmod_includes"
-
- AC_SUBST(ggzmod_libraries)
- AC_SUBST(ggzmod_includes)
-
- GGZMOD_INCLUDES="-I $ggzmod_includes"
- GGZMOD_LDFLAGS="-L$ggzmod_libraries"
-
- AC_SUBST(GGZMOD_INCLUDES)
- AC_SUBST(GGZMOD_LDFLAGS)
-
- LIB_GGZMOD='-lggzmod'
- AC_SUBST(LIB_GGZMOD)
-
- # Perform actions given by argument 1.
- $1
-fi
-
-])
-
-dnl ------------------------------------------------------------------------
-dnl Try to find the ggzdmod headers and libraries.
-dnl $(GGZDMOD_LDFLAGS) will be -L ... (if needed)
-dnl and $(GGZDMOD_INCLUDES) will be -I ... (if needed)
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([AC_GGZ_GGZDMOD],
-[
-AC_MSG_CHECKING([for GGZ library: ggzdmod])
-
-ac_ggzdmod_includes=NO ac_ggzdmod_libraries=NO
-ggzdmod_libraries=""
-ggzdmod_includes=""
-
-AC_ARG_WITH(ggzdmod-dir,
- AC_HELP_STRING([--with-ggzdmod-dir=DIR], [ggzdmod installation prefix]),
- [ ac_ggzdmod_includes="$withval"/include
- ac_ggzdmod_libraries="$withval"/lib
- ])
-AC_ARG_WITH(ggzdmod-includes,
- AC_HELP_STRING([--with-ggzdmod-includes=DIR],
- [where the ggzdmod includes are]),
- [ ac_ggzdmod_includes="$withval"
- ])
-AC_ARG_WITH(ggzdmod-libraries,
- AC_HELP_STRING([--with-ggzdmod-libraries=DIR],
- [where the ggzdmod libs are]),
- [ ac_ggzdmod_libraries="$withval"
- ])
-
-AC_CACHE_VAL(ac_cv_have_ggzdmod,
-[
-ggzdmod_incdirs="$ac_ggzdmod_includes $ac_ggz_stdinc"
-AC_GGZ_REMOVEDUPS($ggzdmod_incdirs, ggzdmod_incdirs)
-ggzdmod_header=ggzdmod.h
-
-AC_GGZ_FIND_FILE($ggzdmod_header, $ggzdmod_incdirs, ggzdmod_incdir)
-ac_ggzdmod_includes="$ggzdmod_incdir"
-
-ggzdmod_libdirs="$ac_ggzdmod_libraries $ac_ggz_stdlib"
-AC_GGZ_REMOVEDUPS($ggzdmod_libdirs, ggzdmod_libdirs)
-
-ggzdmod_libdir=NO
-for dir in $ggzdmod_libdirs; do
- try="ls -1 $dir/libggzdmod.la $dir/libggzdmod.so"
- if test -n "`$try 2> /dev/null`"; then ggzdmod_libdir=$dir; break; else echo "tried $dir" >&AC_FD_CC ; fi
-done
-
-ac_ggzdmod_libraries="$ggzdmod_libdir"
-
-if test "$ac_ggzdmod_includes" = NO || test "$ac_ggzdmod_libraries" = NO; then
- ac_cv_have_ggzdmod="have_ggzdmod=no"
- ac_ggzdmod_notfound=""
-else
- have_ggzdmod="yes"
-fi
-])
-
-eval "$ac_cv_have_ggzdmod"
+ case $_am_tool in
+ gnutar)
+ for _am_tar in tar gnutar gtar;
+ do
+ AM_RUN_LOG([$_am_tar --version]) && break
+ done
+ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+ am__untar="$_am_tar -xf -"
+ ;;
+ plaintar)
+ # Must skip GNU tar: if it does not support --format= it doesn't create
+ # ustar tarball either.
+ (tar --version) >/dev/null 2>&1 && continue
+ am__tar='tar chf - "$$tardir"'
+ am__tar_='tar chf - "$tardir"'
+ am__untar='tar xf -'
+ ;;
+ pax)
+ am__tar='pax -L -x $1 -w "$$tardir"'
+ am__tar_='pax -L -x $1 -w "$tardir"'
+ am__untar='pax -r'
+ ;;
+ cpio)
+ am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+ am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+ am__untar='cpio -i -H $1 -d'
+ ;;
+ none)
+ am__tar=false
+ am__tar_=false
+ am__untar=false
+ ;;
+ esac
-if test "$have_ggzdmod" != yes; then
- if test "x$2" = "xignore"; then
- AC_MSG_RESULT([$have_ggzdmod (intentionally ignored)])
- else
- AC_MSG_RESULT([$have_ggzdmod])
- if test "x$2" = "x"; then
- AC_GGZ_ERROR(ggzdmod, $ggzdmod_incdirs, $ggzdmod_libdirs)
- fi
+ # If the value was cached, stop now. We just wanted to have am__tar
+ # and am__untar set.
+ test -n "${am_cv_prog_tar_$1}" && break
- # Perform actions given by argument 2.
- $2
+ # tar/untar a dummy directory, and stop if the command works
+ rm -rf conftest.dir
+ mkdir conftest.dir
+ echo GrepMe > conftest.dir/file
+ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+ rm -rf conftest.dir
+ if test -s conftest.tar; then
+ AM_RUN_LOG([$am__untar <conftest.tar])
+ grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
fi
-else
- ac_cv_have_ggzdmod="have_ggzdmod=yes \
- ac_ggzdmod_includes=$ac_ggzdmod_includes ac_ggzdmod_libraries=$ac_ggzdmod_libraries"
- AC_MSG_RESULT([$have_ggzdmod (libraries $ac_ggzdmod_libraries, headers $ac_ggzdmod_includes)])
-
- ggzdmod_libraries="$ac_ggzdmod_libraries"
- ggzdmod_includes="$ac_ggzdmod_includes"
-
- AC_SUBST(ggzdmod_libraries)
- AC_SUBST(ggzdmod_includes)
-
- GGZDMOD_INCLUDES="-I $ggzdmod_includes"
- GGZDMOD_LDFLAGS="-L$ggzdmod_libraries"
-
- AC_SUBST(GGZDMOD_INCLUDES)
- AC_SUBST(GGZDMOD_LDFLAGS)
-
- LIB_GGZDMOD='-lggzdmod'
- AC_SUBST(LIB_GGZDMOD)
-
- # Perform actions given by argument 1.
- $1
-fi
-
-])
-
-dnl ------------------------------------------------------------------------
-dnl Try to find the ggz-gtk headers and libraries.
-dnl $(GGZGTK_LDFLAGS) will be -L ... (if needed)
-dnl and $(GGZGTK_INCLUDES) will be -I ... (if needed)
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([AC_GGZ_GTK],
-[
-AC_MSG_CHECKING([for GGZ library: ggz-gtk])
-
-ac_ggz_gtk_includes=NO ac_ggz_gtk_libraries=NO
-ggz_gtk_libraries=""
-ggz_gtk_includes=""
-
-AC_ARG_WITH(ggz-gtk-dir,
- AC_HELP_STRING([--with-ggz-gtk-dir=DIR], [ggz-gtk installation prefix]),
- [ ac_ggz_gtk_includes="$withval"/include
- ac_ggz_gtk_libraries="$withval"/lib
- ])
-AC_ARG_WITH(ggz-gtk-includes,
- AC_HELP_STRING([--with-ggz-gtk-includes=DIR],
- [where the ggz-gtk includes are]),
- [ ac_ggz_gtk_includes="$withval"
- ])
-AC_ARG_WITH(ggz-gtk-libraries,
- AC_HELP_STRING([--with-ggz-gtk-libraries=DIR],
- [where the ggz-gtk libs are]),
- [ ac_ggz_gtk_libraries="$withval"
- ])
-
-AC_CACHE_VAL(ac_cv_have_ggz_gtk,
-[
-ggz_gtk_incdirs="$ac_ggz_gtk_includes $ac_ggz_stdinc"
-AC_GGZ_REMOVEDUPS($ggz_gtk_incdirs, ggz_gtk_incdirs)
-ggz_gtk_header=ggz-gtk.h
-
-AC_GGZ_FIND_FILE($ggz_gtk_header, $ggz_gtk_incdirs, ggz_gtk_incdir)
-ac_ggz_gtk_includes="$ggz_gtk_incdir"
-
-ggz_gtk_libdirs="$ac_ggz_gtk_libraries $ac_ggz_stdlib"
-AC_GGZ_REMOVEDUPS($ggz_gtk_libdirs, ggz_gtk_libdirs)
-
-ggz_gtk_libdir=NO
-for dir in $ggz_gtk_libdirs; do
- try="ls -1 $dir/libggz-gtk.la $dir/libggz-gtk.so"
- if test -n "`$try 2> /dev/null`"; then ggz_gtk_libdir=$dir; break; else echo "tried $dir" >&AC_FD_CC ; fi
done
-
-ac_ggz_gtk_libraries="$ggz_gtk_libdir"
-
-if test "$ac_ggz_gtk_includes" = NO || test "$ac_ggz_gtk_libraries" = NO; then
- ac_cv_have_ggz_gtk="have_ggz_gtk=no"
- ac_ggz_gtk_notfound=""
-else
- have_ggz_gtk="yes"
-fi
-])
-
-eval "$ac_cv_have_ggz_gtk"
-
-if test "$have_ggz_gtk" != yes; then
- if test "x$2" = "xignore"; then
- AC_MSG_RESULT([$have_ggz_gtk (intentionally ignored)])
- else
- AC_MSG_RESULT([$have_ggz_gtk])
- if test "x$2" = "x"; then
- AC_GGZ_ERROR(ggz-gtk, $ggz_gtk_incdirs, $ggz_gtk_libdirs)
- fi
-
- # Perform actions given by argument 2.
- $2
- fi
-else
- ac_cv_have_ggz_gtk="have_ggz_gtk=yes \
- ac_ggz_gtk_includes=$ac_ggz_gtk_includes ac_ggz_gtk_libraries=$ac_ggz_gtk_libraries"
- AC_MSG_RESULT([$have_ggz_gtk (libraries $ac_ggz_gtk_libraries, headers $ac_ggz_gtk_includes)])
-
- ggz_gtk_libraries="$ac_ggz_gtk_libraries"
- ggz_gtk_includes="$ac_ggz_gtk_includes"
-
- AC_SUBST(ggz_gtk_libraries)
- AC_SUBST(ggz_gtk_includes)
-
- GGZ_GTK_INCLUDES="-I $ggz_gtk_includes"
- GGZ_GTK_LDFLAGS="-L$ggz_gtk_libraries"
-
- AC_SUBST(GGZ_GTK_INCLUDES)
- AC_SUBST(GGZ_GTK_LDFLAGS)
-
- LIB_GGZ_GTK='-lggz-gtk'
- AC_SUBST(LIB_GGZ_GTK)
-
- # Perform actions given by argument 1.
- $1
-fi
-])
-
-dnl ------------------------------------------------------------------------
-dnl Setup the game server configuration.
-dnl Sets ggzdconfdir (ggzd configuration).
-dnl Sets ggzddatadir (for game server data).
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([AC_GGZ_SERVER],
-[
-AC_MSG_CHECKING([for GGZ server: ggzd])
-AC_ARG_WITH(ggzd-confdir,
- AC_HELP_STRING([--with-ggzd-confdir=DIR], [directory for room/game data]),
-[ ac_ggzd_confdir="$withval"
-])
-
-AC_CACHE_VAL(ac_cv_have_ggzdconf,
-[
- if test "x$1" = "xforce"; then
- if test "x$ac_ggzd_confdir" = "x"; then
- ggzdconfdirs="$ac_ggz_stdetc"
- else
- ggzdconfdirs="$ac_ggzd_confdir"
- fi
- else
- ggzdconfdirs="$ac_ggzd_confdir $ac_ggz_stdetc"
- fi
-
- ggzdconfdir=NONE
- for dir in $ggzdconfdirs; do
- if test -n "`ls -d $dir/rooms 2> /dev/null`"; then
- if test -n "`ls -d $dir/rooms 2> /dev/null`"; then
- ggzdconfdir=$dir; break;
- else
- echo "tried $dir" >&AC_FD_CC;
- fi
- else
- echo "tried $dir" >&AC_FD_CC;
- fi
- done
-
- if test "x$ggzdconfdir" = "xNONE"; then
- have_ggzdconf="no"
- else
- have_ggzdconf="yes"
- fi
-])
-
-eval "$ac_cv_have_ggzdconf"
-
-if test "$have_ggzdconf" != yes; then
- if test "x$2" = "xignore"; then
- AC_MSG_RESULT([$have_ggzdconf (intentionally ignored)])
- elif test "x$2" = "xforce"; then
- if test "x$ac_ggzd_confdir" = "x"; then
- ggzdconfdir="\${prefix}/etc/ggzd"
- else
- ggzdconfdir=$ac_ggzd_confdir
- fi
- AC_MSG_RESULT([$have_ggzdconf (but forced to ${ggzdconfdir})])
- else
- AC_MSG_RESULT([$have_ggzdconf])
- if test "x$2" = "x"; then
- AC_MSG_ERROR([GGZ server configuration not found. Please check your installation! ])
- fi
-
- # Perform actions given by argument 2.
- $2
- fi
-else
- prefixed=0
- if test "x${prefix}" != "xNONE" && test "x${prefix}" != "x${ac_default_prefix}"; then
- if test "x$ac_ggzd_confdir" = "x"; then
- prefixed=1
- fi
- fi
- if test "x$ggzdconfdir" != "x${prefix}/etc/ggzd" && test "x$prefixed" = "x1"; then
- AC_MSG_RESULT([$have_ggzdconf ($ggzdconfdir, but using ${prefix}/etc/ggzd nevertheless)])
- ggzdconfdir="\${prefix}/etc/ggzd"
- else
- AC_MSG_RESULT([$have_ggzdconf ($ggzdconfdir)])
- fi
-fi
-
-if test "$have_ggzdconf" = yes || test "x$2" = "xforce"; then
- AC_SUBST(ggzdconfdir)
-
- ggzddatadir=${datadir}/${PACKAGE}
- AC_DEFINE_UNQUOTED(GGZDDATADIR, "${ggzddatadir}", [Game server data directory])
- AC_SUBST(ggzddatadir)
-
- if test "x${libdir}" = 'x${exec_prefix}/lib'; then
- if test "x${exec_prefix}" = "xNONE"; then
- if test "x${prefix}" = "xNONE"; then
- ggzdexecmoddir="\${ac_default_prefix}/lib/ggzd"
- ggzdexecmodpath="${ac_default_prefix}/lib/ggzd"
- else
- ggzdexecmoddir="\${prefix}/lib/ggzd"
- ggzdexecmodpath="${prefix}/lib/ggzd"
- fi
- else
- ggzdexecmoddir="\${exec_prefix}/lib/ggzd"
- ggzdexecmodpath="${exec_prefix}/lib/ggzd"
- fi
- else
- ggzdexecmoddir="\${libdir}/ggzd"
- ggzdexecmodpath="${libdir}/ggzd"
- fi
- AC_SUBST(ggzdexecmoddir)
- AC_SUBST(ggzdexecmodpath)
-
- # Perform actions given by argument 1.
- $1
-fi
-
-])
-
-dnl ------------------------------------------------------------------------
-dnl AC_GGZ_CHECK_SERVER
-dnl Check for presence of GGZ server libraries.
-dnl
-dnl Simply call this function in programs that use GGZ. GGZ_SERVER will
-dnl be #defined in config.h, and created as a conditional
-dnl in Makefile.am files, if server libraries are present.
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([AC_GGZ_CHECK_SERVER],
-[
- AC_GGZ_LIBGGZ([try_ggz="yes"], [try_ggz="no"])
- if test "$try_ggz" = "yes"; then
- # For now, version 0.0.14 is required. This could be an additional
- # parameter.
- AC_GGZ_VERSION([0], [99], [4], [], [try_ggz=no])
- fi
-
- ggz_server="no"
- AC_ARG_WITH(ggz-server,
- AC_HELP_STRING([--with-ggz-server], [Force GGZ server support]),
- [try_ggz_server=$withval])
-
- if test "x$try_ggz_server" != "xno"; then
- if test "$try_ggz" = "yes"; then
- # Must pass something as the action-if-failed, or the macro will exit
- AC_GGZ_GGZDMOD([ggz_server="yes"], [ggz_server="no"])
- fi
- if test "$ggz_server" = "yes"; then
- AC_GGZ_SERVER
- AC_DEFINE(GGZ_SERVER, 1, [Server support for GGZ])
- else
- if test "$try_ggz_server" = "yes"; then
- AC_MSG_ERROR([Could not configure GGZ server support. See above messages.])
- fi
- fi
- fi
-
- AM_CONDITIONAL(GGZ_SERVER, test "$ggz_server" = "yes")
-])
-
-dnl ------------------------------------------------------------------------
-dnl AC_GGZ_CHECK
-dnl Check for presence of GGZ client and server libraries.
-dnl
-dnl Simply call this function in programs that use GGZ. GGZ_SERVER and
-dnl GGZ_CLIENT will be #defined in config.h, and created as conditionals
-dnl in Makefile.am files.
-dnl
-dnl The only argument accepted gives the frontend for client embedding:
-dnl "gtk" => means the libggz-gtk library will be checked
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([AC_GGZ_CHECK],
-[
- AC_GGZ_INIT([defaults])
-
- if test x$ac_ggz_prefix != xno ; then
- AC_GGZ_LIBGGZ([try_ggz="yes"], [try_ggz="no"])
- else
- try_ggz=no
- fi
-
- 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])
- fi
-
- ggz_client="no"
- AC_ARG_WITH(ggz-client,
- AC_HELP_STRING([--with-ggz-client], [Force GGZ client support]),
- [try_ggz_client=$withval])
-
- if test "x$try_ggz_client" != "xno"; then
- if test "$try_ggz" = "yes"; then
- # Must pass something as the action-if-failed, or the macro will exit
- AC_GGZ_GGZMOD([AC_GGZ_CONFIG([ggz_client="yes"], [ggz_client="no"])],
- [ggz_client="no"])
- fi
- if test "$ggz_client" = "yes"; then
- AC_DEFINE(GGZ_CLIENT, 1, [Client support for GGZ])
- else
- if test "$try_ggz_client" = "yes"; then
- AC_MSG_ERROR([Could not configure GGZ client support. See above messages.])
- fi
- fi
- fi
-
- ggz_gtk="no"
- if test "$ggz_client" = "yes"; then
- if test "x$1" = "xgtk"; then
- AC_GGZ_GTK([ggz_gtk="yes"])
- if test $ggz_gtk = "yes"; then
- AC_DEFINE(GGZ_GTK, 1, [Support for embedded GGZ through libggz-gtk])
- fi
- fi
- fi
-
- AM_CONDITIONAL(GGZ_CLIENT, test "$ggz_client" = "yes")
- AM_CONDITIONAL(GGZ_GTK, test "$ggz_gtk" = "yes")
-
- AC_GGZ_CHECK_SERVER
-])
-
-
-dnl FC_CHECK_READLINE_RUNTIME(EXTRA-LIBS, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
-dnl
-dnl This tests whether readline works at runtime. Here, "works"
-dnl means "doesn't dump core", as some versions do if linked
-dnl against wrong ncurses library. Compiles with LIBS modified
-dnl to included -lreadline and parameter EXTRA-LIBS.
-dnl Should already have checked that header and library exist.
-dnl
-AC_DEFUN([FC_CHECK_READLINE_RUNTIME],
-[AC_MSG_CHECKING(whether readline works at runtime)
-templibs="$LIBS"
-LIBS="-lreadline $1 $LIBS"
-AC_TRY_RUN([
-/*
- * testrl.c
- * File revision 0
- * Check to make sure that readline works at runtime.
- * (Specifically, some readline packages link against a wrong
- * version of ncurses library and dump core at runtime.)
- * (c) 2000 Jacob Lundberg, jacob at chaos2.org
- */
-
-#include <stdio.h>
-/* We assume that the presence of readline has already been verified. */
-#include <readline/readline.h>
-#include <readline/history.h>
-
-/* Setup for readline. */
-#define TEMP_FILE "./conftest.readline.runtime"
-
-static void handle_readline_input_callback(char *line) {
-/* Generally taken from freeciv-1.11.4/server/sernet.c. */
- if(line) {
- if(*line)
- add_history(line);
- /* printf(line); */
- }
-}
-
-int main(void) {
-/* Try to init readline and see if it barfs. */
- using_history();
- read_history(TEMP_FILE);
- rl_initialize();
- rl_callback_handler_install("_ ", handle_readline_input_callback);
- rl_callback_handler_remove(); /* needed to re-set terminal */
- return(0);
-}
-],
-[AC_MSG_RESULT(yes)
- [$2]],
-[AC_MSG_RESULT(no)
- [$3]],
-[AC_MSG_RESULT(unknown: cross-compiling)
- [$2]])
-LIBS="$templibs"
-])
-
-AC_DEFUN([FC_HAS_READLINE],
-[
- dnl Readline library and header files.
- if test "$WITH_READLINE" = "yes" || test "$WITH_READLINE" = "maybe"; then
- HAVE_TERMCAP="";
- dnl Readline header
- AC_CHECK_HEADER(readline/readline.h,
- have_readline_header=1,
- have_readline_header=0)
- if test "$have_readline_header" = "0"; then
- if test "$WITH_READLINE" = "yes"; then
- AC_MSG_ERROR(Did not find readline header file.
-You may need to install a readline \"development\" package.)
- else
- AC_MSG_WARN(Did not find readline header file.
-Configuring server without readline support.)
- fi
- else
- dnl Readline lib
- AC_CHECK_LIB(readline, completion_matches,
- have_readline_lib=1, have_readline_lib=0)
- dnl Readline lib >= 4.2
- AC_CHECK_LIB(readline, rl_completion_matches,
- have_new_readline_lib=1, have_new_readline_lib=0)
- if test "$have_readline_lib" != "1" && test "$have_new_readline_lib" != "1"; then
- dnl Many readline installations are broken in that they
- dnl don't set the dependency on the curses lib up correctly.
- dnl We give them a hand by trying to guess what might be needed.
- dnl
- dnl Some older Unices may need both -lcurses and -ltermlib,
- dnl but we don't support that just yet. This check will take
- dnl the first lib that it finds and just link to that.
- AC_CHECK_LIB(tinfo, tgetent, HAVE_TERMCAP="-ltinfo",
- AC_CHECK_LIB(ncurses, tgetent, HAVE_TERMCAP="-lncurses",
- AC_CHECK_LIB(curses, tgetent, HAVE_TERMCAP="-lcurses",
- AC_CHECK_LIB(termcap, tgetent, HAVE_TERMCAP="-ltermcap",
- AC_CHECK_LIB(termlib, tgetent, HAVE_TERMCAP="-ltermlib")
- )
- )
- )
- )
-
- if test x"$HAVE_TERMCAP" != "x"; then
- dnl We can't check for completion_matches() again,
- dnl cause the result is cached. And autoconf doesn't
- dnl seem to have a way to uncache it.
- AC_CHECK_LIB(readline, filename_completion_function,
- have_readline_lib=1, have_readline_lib=0,
- "$HAVE_TERMCAP")
- if test "$have_readline_lib" = "1"; then
- AC_MSG_WARN(I had to manually add $HAVE_TERMCAP dependency to
-make readline library pass the test.)
- fi
- dnl We can't check for rl_completion_matches() again,
- dnl cause the result is cached. And autoconf doesn't
- dnl seem to have a way to uncache it.
- AC_CHECK_LIB(readline, rl_filename_completion_function,
- have_new_readline_lib=1, have_new_readline_lib=0,
- "$HAVE_TERMCAP")
- if test "$have_new_readline_lib" = "1"; then
- AC_MSG_WARN(I had to manually add $HAVE_TERMCAP dependency to
-make readline library pass the test.)
- fi
- fi
- fi
-
- if test "$have_new_readline_lib" = "1"; then
- FC_CHECK_READLINE_RUNTIME($HAVE_TERMCAP,
- have_new_readline_lib=1, have_new_readline_lib=0)
- if test "$have_new_readline_lib" = "1"; then
- SERVER_LIBS="-lreadline $SERVER_LIBS $HAVE_TERMCAP"
- AC_DEFINE_UNQUOTED(HAVE_LIBREADLINE, 1, [Readline support])
- AC_DEFINE_UNQUOTED(HAVE_NEWLIBREADLINE, 1, [Modern readline])
- else
- if test "$WITH_READLINE" = "yes"; then
- AC_MSG_ERROR(Specified --with-readline but the
-runtime test of readline failed.)
- else
- AC_MSG_WARN(Runtime test of readline failed.
-Configuring server without readline support.)
- fi
- fi
- else
- if test "$have_readline_lib" = "1"; then
- FC_CHECK_READLINE_RUNTIME($HAVE_TERMCAP,
- have_readline_lib=1, have_readline_lib=0)
- if test "$have_readline_lib" = "1"; then
- SERVER_LIBS="-lreadline $SERVER_LIBS $HAVE_TERMCAP"
- AC_DEFINE_UNQUOTED(HAVE_LIBREADLINE, 1, [Readline support])
- else
- if test "$WITH_READLINE" = "yes"; then
- AC_MSG_ERROR(Specified --with-readline but the
-runtime test of readline failed.)
- else
- AC_MSG_WARN(Runtime test of readline failed.
-Configuring server without readline support.)
- fi
- fi
- else
- if test "$WITH_READLINE" = "yes"; then
- AC_MSG_ERROR(Specified --with-readline but the
-test to link against the library failed.)
- else
- AC_MSG_WARN(Test to link against readline library failed.
-Configuring server without readline support.)
- fi
- fi
- fi
- fi
- fi
-])
-
-
-dnl @synopsis AC_FUNC_VSNPRINTF
-dnl
-dnl Check whether there is a reasonably sane vsnprintf() function installed.
-dnl "Reasonably sane" in this context means never clobbering memory beyond
-dnl the buffer supplied, and having a sensible return value. It is
-dnl explicitly allowed not to NUL-terminate the return value, however.
-dnl
-dnl @version $Id: vsnprintf.m4 4430 2002-04-13 13:52:03Z rfalke $
-dnl @author Gaute Strokkenes <gs234 at cam.ac.uk>
-dnl
-AC_DEFUN([AC_FUNC_VSNPRINTF],
-[AC_CACHE_CHECK(for working vsnprintf,
- ac_cv_func_working_vsnprintf,
-[AC_TRY_RUN(
-[#include <stdio.h>
-#include <stdarg.h>
-
-int
-doit(char * s, ...)
-{
- char buffer[32];
- va_list args;
- int r;
-
- buffer[5] = 'X';
-
- va_start(args, s);
- r = vsnprintf(buffer, 5, s, args);
- va_end(args);
-
- /* -1 is pre-C99, 7 is C99. */
-
- if (r != -1 && r != 7)
- exit(1);
-
- /* We deliberately do not care if the result is NUL-terminated or
- not, since this is easy to work around like this. */
-
- buffer[4] = 0;
-
- /* Simple sanity check. */
-
- if (strcmp(buffer, "1234"))
- exit(1);
-
- if (buffer[5] != 'X')
- exit(1);
-
- exit(0);
-}
-
-int
-main(void)
-{
- doit("1234567");
- exit(1);
-}], ac_cv_func_working_vsnprintf=yes, ac_cv_func_working_vsnprintf=no, ac_cv_func_working_vsnprintf=no)])
-dnl Note that the default is to be pessimistic in the case of cross compilation.
-dnl If you know that the target has a sensible vsnprintf(), you can get around this
-dnl by setting ac_func_vsnprintf to yes, as described in the Autoconf manual.
-if test $ac_cv_func_working_vsnprintf = yes; then
- AC_DEFINE(HAVE_WORKING_VSNPRINTF, 1,
- [Define if you have a version of the 'vsnprintf' function
- that honours the size argument and has a proper return value.])
-fi
-])# AC_FUNC_VSNPRINTF
-
-dnl FC_CHECK_GETTIMEOFDAY_RUNTIME(EXTRA-LIBS, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
-dnl
-dnl This tests whether gettimeofday works at runtime. Here, "works"
-dnl means: time doesn't go backward and time doesn't jump forward by
-dnl a huge amount. It seems that glibc 2.3.1 is broken in this respect.
-
-AC_DEFUN([FC_CHECK_GETTIMEOFDAY_RUNTIME],
-[
-templibs="$LIBS"
-LIBS="$1 $LIBS"
-AC_TRY_RUN([
-#include <sys/time.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <time.h>
-#include <stdlib.h>
-
-#define VERBOSE 0
-#define SECONDS 3
-
-int main(int argc, char **argv)
-{
- struct timeval tv[2], start, end;
- int calls;
-
- if (gettimeofday(&start, NULL) == -1) {
- return 1;
- }
- end = start;
- end.tv_sec += SECONDS;
-
- tv[0] = start;
- tv[1] = start;
-
- for (calls = 0;; calls++) {
- time_t sec;
-
- if (gettimeofday(&tv[0], NULL) == -1) {
- return 1;
- }
-
- if (tv[0].tv_sec < tv[1].tv_sec) {
-#if VERBOSE
- double diff =
- (tv[1].tv_sec - start.tv_sec) +
- ((tv[1].tv_usec - start.tv_usec) / 1e6);
- printf("after %fs: going backward by %lds\n", diff,
- tv[1].tv_sec - tv[0].tv_sec);
-#endif
- return 1;
- }
-
- if (tv[0].tv_sec == tv[1].tv_sec && tv[0].tv_usec < tv[1].tv_usec) {
-#if VERBOSE
- double diff =
- (tv[1].tv_sec - start.tv_sec) +
- ((tv[1].tv_usec - start.tv_usec) / 1e6);
- printf("after %fs: going backward by %ldus\n", diff,
- tv[1].tv_usec - tv[0].tv_usec);
-#endif
- return 1;
- }
-
- if (tv[0].tv_sec > tv[1].tv_sec + 1) {
-#if VERBOSE
- double diff =
- (tv[1].tv_sec - start.tv_sec) +
- ((tv[1].tv_usec - start.tv_usec) / 1e6);
- printf("after %fs: going forward by %lds\n", diff,
- tv[0].tv_sec - tv[1].tv_sec);
-#endif
- return 1;
- }
-
- sec = time(NULL);
-
- if (abs(sec - tv[0].tv_sec) > 1) {
-#if VERBOSE
- double diff =
- (tv[1].tv_sec - start.tv_sec) +
- ((tv[1].tv_usec - start.tv_usec) / 1e6);
- printf("after %fs: time() = %ld, gettimeofday = %ld, diff = %ld\n", diff,
- (long)sec, (long)tv[0].tv_sec, sec - (long)tv[0].tv_sec);
-#endif
- return 1;
- }
-
- if (timercmp(&tv[0], &end, >)) {
- break;
- }
- tv[1] = tv[0];
- }
-
-#if VERBOSE
- {
- double diff =
- (tv[1].tv_sec - start.tv_sec) +
- ((tv[1].tv_usec - start.tv_usec) / 1e6);
- printf("%d calls in %fs = %fus/call\n", calls, diff, 1e6 * diff / calls);
- }
-#endif
- return 0;
-}
-],
-[AC_MSG_RESULT(yes)
- [$2]],
-[AC_MSG_RESULT(no)
- [$3]],
-[AC_MSG_RESULT(unknown: cross-compiling)
- [$3]])
-LIBS="$templibs"
-])
-
+rm -rf conftest.dir
+
+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+AC_SUBST([am__tar])
+AC_SUBST([am__untar])
+]) # _AM_PROG_TAR
+
+m4_include([m4/auth.m4])
+m4_include([m4/c99.m4])
+m4_include([m4/codeset.m4])
+m4_include([m4/compiler.m4])
+m4_include([m4/debug.m4])
+m4_include([m4/freetype2.m4])
+m4_include([m4/gettext.m4])
+m4_include([m4/gettimeofday.m4])
+m4_include([m4/ggz.m4])
+m4_include([m4/glibc21.m4])
+m4_include([m4/gtk-2.0.m4])
+m4_include([m4/gtk2-client.m4])
+m4_include([m4/iconv.m4])
+m4_include([m4/isc-posix.m4])
+m4_include([m4/lcmessage.m4])
+m4_include([m4/lib-ld.m4])
+m4_include([m4/lib-link.m4])
+m4_include([m4/lib-prefix.m4])
+m4_include([m4/locale.m4])
+m4_include([m4/ngettext.m4])
+m4_include([m4/no-client.m4])
+m4_include([m4/pkg.m4])
+m4_include([m4/progtest.m4])
+m4_include([m4/readline.m4])
+m4_include([m4/sdl-client.m4])
+m4_include([m4/sdl.m4])
+m4_include([m4/sound.m4])
+m4_include([m4/vsnprintf.m4])
+m4_include([m4/win32-client.m4])
+m4_include([m4/x.m4])
+m4_include([m4/xaw-client.m4])
diff --git a/ai/Makefile.in b/ai/Makefile.in
index 7ee6147..5dcc3f2 100644
--- a/ai/Makefile.in
+++ b/ai/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,84 +14,118 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = ai
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+libcivai_a_AR = $(AR) $(ARFLAGS)
+libcivai_a_LIBADD =
+am_libcivai_a_OBJECTS = advdomestic.$(OBJEXT) advmilitary.$(OBJEXT) \
+ advdiplomacy.$(OBJEXT) advspace.$(OBJEXT) aiair.$(OBJEXT) \
+ aicity.$(OBJEXT) aidata.$(OBJEXT) aiexplorer.$(OBJEXT) \
+ aiferry.$(OBJEXT) aiguard.$(OBJEXT) aihand.$(OBJEXT) \
+ aihunt.$(OBJEXT) ailog.$(OBJEXT) aiparatrooper.$(OBJEXT) \
+ aisettler.$(OBJEXT) aitech.$(OBJEXT) aitools.$(OBJEXT) \
+ aiunit.$(OBJEXT) aidiplomat.$(OBJEXT)
+libcivai_a_OBJECTS = $(am_libcivai_a_OBJECTS)
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/bootstrap/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libcivai_a_SOURCES)
+DIST_SOURCES = $(libcivai_a_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -101,10 +136,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -112,27 +151,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -140,6 +191,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -150,17 +203,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -173,16 +247,39 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
noinst_LIBRARIES = libcivai.a
-
AM_CPPFLAGS = -I$(top_srcdir)/utility -I$(srcdir)/../common -I$(srcdir)/../server -I../intl -I$(top_srcdir)/common/aicore
-
libcivai_a_SOURCES = \
advdomestic.c \
advdomestic.h \
@@ -223,58 +320,40 @@ libcivai_a_SOURCES = \
aidiplomat.c \
aidiplomat.h
-subdir = ai
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-libcivai_a_AR = $(AR) cru
-libcivai_a_LIBADD =
-am_libcivai_a_OBJECTS = advdomestic.$(OBJEXT) advmilitary.$(OBJEXT) \
- advdiplomacy.$(OBJEXT) advspace.$(OBJEXT) aiair.$(OBJEXT) \
- aicity.$(OBJEXT) aidata.$(OBJEXT) aiexplorer.$(OBJEXT) \
- aiferry.$(OBJEXT) aiguard.$(OBJEXT) aihand.$(OBJEXT) \
- aihunt.$(OBJEXT) ailog.$(OBJEXT) aiparatrooper.$(OBJEXT) \
- aisettler.$(OBJEXT) aitech.$(OBJEXT) aitools.$(OBJEXT) \
- aiunit.$(OBJEXT) aidiplomat.$(OBJEXT)
-libcivai_a_OBJECTS = $(am_libcivai_a_OBJECTS)
-
-DEFS = @DEFS@
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-depcomp = $(SHELL) $(top_srcdir)/bootstrap/depcomp
-am__depfiles_maybe = depfiles
- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/advdiplomacy.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/advdomestic.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/advmilitary.Po ./$(DEPDIR)/advspace.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/aiair.Po ./$(DEPDIR)/aicity.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/aidata.Po ./$(DEPDIR)/aidiplomat.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/aiexplorer.Po ./$(DEPDIR)/aiferry.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/aiguard.Po ./$(DEPDIR)/aihand.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/aihunt.Po ./$(DEPDIR)/ailog.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/aiparatrooper.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/aisettler.Po ./$(DEPDIR)/aitech.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/aitools.Po ./$(DEPDIR)/aiunit.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-CFLAGS = @CFLAGS@
-DIST_SOURCES = $(libcivai_a_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(libcivai_a_SOURCES)
-
all: all-am
.SUFFIXES:
.SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu ai/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu ai/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu ai/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
clean-noinstLIBRARIES:
-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
@@ -284,7 +363,7 @@ libcivai.a: $(libcivai_a_OBJECTS) $(libcivai_a_DEPENDENCIES)
$(RANLIB) libcivai.a
mostlyclean-compile:
- -rm -f *.$(OBJEXT) core *.core
+ -rm -f *.$(OBJEXT)
distclean-compile:
-rm -f *.tab.c
@@ -309,90 +388,106 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/aitools.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/aiunit.Po at am__quote@
-distclean-depend:
- -rm -rf ./$(DEPDIR)
-
.c.o:
- at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
- at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- $(COMPILE) -c `cygpath -w $<`
-CCDEPMODE = @CCDEPMODE@
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: CTAGS
+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(LIBRARIES)
-
installdirs:
-
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -404,7 +499,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -412,7 +507,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -422,48 +518,85 @@ clean: clean-am
clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
distclean: distclean-am
-
-distclean-am: clean-am distclean-compile distclean-depend \
- distclean-generic distclean-tags
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-tags
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am:
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-compile mostlyclean-generic
-uninstall-am: uninstall-info-am
+pdf: pdf-am
+
+pdf-am:
-.PHONY: GTAGS all all-am check check-am clean clean-generic \
- clean-noinstLIBRARIES distclean distclean-compile \
- distclean-depend distclean-generic distclean-tags distdir dvi \
- dvi-am info info-am install install-am install-data \
- install-data-am install-exec install-exec-am install-info \
- install-info-am install-man install-strip installcheck \
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ clean-noinstLIBRARIES ctags distclean distclean-compile \
+ distclean-generic distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic tags uninstall uninstall-am \
- uninstall-info-am
+ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+ uninstall-am
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/ai/advdiplomacy.c b/ai/advdiplomacy.c
index 7ee698b..fc64acd 100644
--- a/ai/advdiplomacy.c
+++ b/ai/advdiplomacy.c
@@ -231,6 +231,25 @@ static int compute_tech_sell_price(struct player* giver, struct player* taker,
}
/**********************************************************************
+ Returns an enemy player to 'us' allied with 'them' if there is one.
+***********************************************************************/
+static const struct player *
+get_allied_with_enemy_player(const struct player *us,
+ const struct player *them)
+{
+ players_iterate(aplayer) {
+ if (aplayer != us
+ && aplayer != them
+ && aplayer->is_alive
+ && pplayers_allied(them, aplayer)
+ && pplayer_get_diplstate(us, aplayer)->type == DS_WAR) {
+ return aplayer;
+ }
+ } players_iterate_end;
+ return NULL;
+}
+
+/**********************************************************************
Evaluate gold worth of a single clause in a treaty. Note that it
sometimes matter a great deal who is giving what to whom, and
sometimes (such as with treaties) it does not matter at all.
@@ -247,6 +266,7 @@ static int ai_goldequiv_clause(struct player *pplayer,
int worth = 0; /* worth for pplayer of what aplayer gives */
bool give = (pplayer == pclause->from);
struct player *giver;
+ const struct player *penemy;
struct ai_dip_intel *adip = &ai->diplomacy.player_intel[player_index(aplayer)];
bool is_dangerous;
@@ -285,11 +305,10 @@ static int ai_goldequiv_clause(struct player *pplayer,
/* This guy is allied to one of our enemies. Only accept
* ceasefire. */
- if (adip->is_allied_with_enemy
+ if ((penemy = get_allied_with_enemy_player(pplayer, aplayer))
&& pclause->type != CLAUSE_CEASEFIRE) {
notify(aplayer, _("*%s (AI)* First break alliance with %s, %s."),
- player_name(pplayer),
- player_name(adip->is_allied_with_enemy),
+ player_name(pplayer), player_name(penemy),
player_name(aplayer));
worth = -BIG_NUMBER;
break;
@@ -1200,7 +1219,8 @@ void static war_countdown(struct player *pplayer, struct player *target,
players_iterate(ally) {
if (!pplayers_allied(pplayer, ally)
|| !ally->is_alive
- || ally == target) {
+ || ally == target
+ || NEVER_MET(pplayer, ally)) {
continue;
}
diff --git a/ai/aiexplorer.c b/ai/aiexplorer.c
index 75fe158..d5bd4b5 100644
--- a/ai/aiexplorer.c
+++ b/ai/aiexplorer.c
@@ -141,7 +141,7 @@ static bool ai_may_explore(const struct tile *ptile,
***************************************************************************/
static enum tile_behavior ai_explorer_tb(const struct tile *ptile,
enum known_type k,
- struct pf_parameter *param)
+ const struct pf_parameter *param)
{
if (!ai_may_explore(ptile, param->owner, param->unit_flags)) {
return TB_IGNORE;
@@ -298,7 +298,7 @@ enum unit_move_result ai_manage_explorer(struct unit *punit)
{
struct player *pplayer = unit_owner(punit);
/* Loop prevention */
- int init_moves = punit->moves_left;
+ const struct tile *init_tile = punit->tile;
/* The log of the want of the most desirable tile,
* given nearby water, cities, etc. */
@@ -412,8 +412,8 @@ enum unit_move_result ai_manage_explorer(struct unit *punit)
UNIT_LOG(LOG_DEBUG, punit, "exploration GOTO succeeded");
if (punit->moves_left > 0) {
/* We can still move on... */
- if (punit->moves_left < init_moves) {
- /* At least we moved (and maybe even got to where we wanted).
+ if (!same_pos(init_tile, punit->tile)) {
+ /* At least we moved (and maybe even got to where we wanted).
* Let's do more exploring.
* (Checking only whether our position changed is unsafe: can allow
* yoyoing on a RR) */
diff --git a/ai/aiferry.c b/ai/aiferry.c
index ee11fa1..71f3779 100644
--- a/ai/aiferry.c
+++ b/ai/aiferry.c
@@ -241,9 +241,9 @@ static int aiferry_avail_boats(struct player *pplayer)
excluded using a TB call-back.
**************************************************************************/
static int combined_land_sea_move(const struct tile *src_tile,
- enum direction8 dir,
- const struct tile *tgt_tile,
- struct pf_parameter *param)
+ enum direction8 dir,
+ const struct tile *tgt_tile,
+ const struct pf_parameter *param)
{
int move_cost;
@@ -266,7 +266,7 @@ static int combined_land_sea_move(const struct tile *src_tile,
pick our unit up.
****************************************************************************/
static int sea_move(const struct tile *ptile, enum known_type known,
- struct pf_parameter *param)
+ const struct pf_parameter *param)
{
if (is_ocean(ptile->terrain)) {
/* Approximately TURN_FACTOR / average ferry move rate
diff --git a/ai/aitools.c b/ai/aitools.c
index edc8501..4b1e548 100644
--- a/ai/aitools.c
+++ b/ai/aitools.c
@@ -371,7 +371,7 @@ struct tile *immediate_destination(struct unit *punit,
Return FALSE iff we died.
**************************************************************************/
bool ai_follow_path(struct unit *punit, struct pf_path *path,
- struct tile *ptile)
+ struct tile *ptile)
{
struct tile *old_tile = punit->goto_tile;
enum unit_activity activity = punit->activity;
@@ -399,7 +399,7 @@ bool ai_follow_path(struct unit *punit, struct pf_path *path,
void ai_log_path(struct unit *punit,
struct pf_path *path, struct pf_parameter *parameter)
{
- struct pf_position *last = pf_last_position(path);
+ const struct pf_position *last = pf_last_position(path);
const int cc = PF_TURN_FACTOR * last->total_MC
+ parameter->move_rate * last->total_EC;
const int tc = cc / (PF_TURN_FACTOR *parameter->move_rate);
@@ -498,8 +498,8 @@ static int stack_value(const struct tile *ptile,
if we have a bodyguard travelling with us.
*********************************************************************/
static double chance_killed_at(const struct tile *ptile,
- struct ai_risk_cost *risk_cost,
- struct pf_parameter *param)
+ struct ai_risk_cost *risk_cost,
+ const struct pf_parameter *param)
{
double db;
/* Compute the basic probability */
@@ -538,8 +538,8 @@ static double chance_killed_at(const struct tile *ptile,
the cost of destruction.
*********************************************************************/
static int stack_risk(const struct tile *ptile,
- struct ai_risk_cost *risk_cost,
- struct pf_parameter *param)
+ struct ai_risk_cost *risk_cost,
+ const struct pf_parameter *param)
{
double risk = 0;
/* Compute the risk of destruction, assuming we will stop at this tile */
@@ -580,8 +580,8 @@ static int stack_risk(const struct tile *ptile,
path might have to stop early because of ZoCs.
*********************************************************************/
static int prefer_short_stacks(const struct tile *ptile,
- enum known_type known,
- struct pf_parameter *param)
+ enum known_type known,
+ const struct pf_parameter *param)
{
return stack_risk(ptile, (struct ai_risk_cost *)param->data, param);
}
@@ -691,7 +691,7 @@ void ai_fill_unit_param(struct pf_parameter *parameter,
* but probably ought to be more cautious for non military units
*/
if (is_ai && !is_ferry && !is_air) {
- parameter->is_pos_dangerous = NULL;
+ parameter->get_moves_left_req = NULL;
}
if (is_ai && long_path) {
diff --git a/bootstrap/config.guess b/bootstrap/config.guess
index fd30ab0..da83314 100755
--- a/bootstrap/config.guess
+++ b/bootstrap/config.guess
@@ -1,9 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002 Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# Free Software Foundation, Inc.
-timestamp='2002-07-23'
+timestamp='2009-04-27'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -17,13 +18,15 @@ timestamp='2002-07-23'
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
+
# Originally written by Per Bothner <per at bothner.com>.
# Please send patches to <config-patches at gnu.org>. Submit a context
# diff and a properly formatted ChangeLog entry.
@@ -53,8 +56,8 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -66,11 +69,11 @@ Try \`$me --help' for more information."
while test $# -gt 0 ; do
case $1 in
--time-stamp | --time* | -t )
- echo "$timestamp" ; exit 0 ;;
+ echo "$timestamp" ; exit ;;
--version | -v )
- echo "$version" ; exit 0 ;;
+ echo "$version" ; exit ;;
--help | --h* | -h )
- echo "$usage"; exit 0 ;;
+ echo "$usage"; exit ;;
-- ) # Stop option processing
shift; break ;;
- ) # Use stdin as input.
@@ -98,30 +101,32 @@ trap 'exit 1' 1 2 15
# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
# use `HOST_CC' if defined, but it is deprecated.
-# This shell variable is my proudest work .. or something. --bje
+# Portable tmp directory creation inspired by the Autoconf team.
-set_cc_for_build='tmpdir=${TMPDIR-/tmp}/config-guess-$$ ;
-(old=`umask` && umask 077 && mkdir $tmpdir && umask $old && unset old)
- || (echo "$me: cannot create $tmpdir" >&2 && exit 1) ;
-dummy=$tmpdir/dummy ;
-files="$dummy.c $dummy.o $dummy.rel $dummy" ;
-trap '"'"'rm -f $files; rmdir $tmpdir; exit 1'"'"' 1 2 15 ;
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
case $CC_FOR_BUILD,$HOST_CC,$CC in
,,) echo "int x;" > $dummy.c ;
for c in cc gcc c89 c99 ; do
- if ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ; then
+ if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
CC_FOR_BUILD="$c"; break ;
fi ;
done ;
- rm -f $files ;
if test x"$CC_FOR_BUILD" = x ; then
CC_FOR_BUILD=no_compiler_found ;
fi
;;
,,*) CC_FOR_BUILD=$CC ;;
,*,*) CC_FOR_BUILD=$HOST_CC ;;
-esac ;
-unset files'
+esac ; set_cc_for_build= ;'
# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
# (ghazi at noc.rutgers.edu 1994-08-24)
@@ -156,6 +161,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
+ sh5el) machine=sh5le-unknown ;;
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac
# The Operating System including object format, if it has switched
@@ -178,144 +184,128 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
;;
esac
# The OS release
- release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+ # Debian GNU/NetBSD machines have a different userland, and
+ # thus, need a distinct triplet. However, they do not need
+ # kernel version information, so it can be replaced with a
+ # suitable tag, in the style of linux-gnu.
+ case "${UNAME_VERSION}" in
+ Debian*)
+ release='-gnu'
+ ;;
+ *)
+ release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+ ;;
+ esac
# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
# contains redundant information, the shorter form:
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
echo "${machine}-${os}${release}"
- exit 0 ;;
- amiga:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- arc:OpenBSD:*:*)
- echo mipsel-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- hp300:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- mac68k:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- macppc:OpenBSD:*:*)
- echo powerpc-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- mvme68k:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- mvme88k:OpenBSD:*:*)
- echo m88k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- mvmeppc:OpenBSD:*:*)
- echo powerpc-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- pmax:OpenBSD:*:*)
- echo mipsel-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- sgi:OpenBSD:*:*)
- echo mipseb-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- sun3:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- wgrisc:OpenBSD:*:*)
- echo mipsel-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:OpenBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
+ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+ exit ;;
+ *:ekkoBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+ exit ;;
+ *:SolidBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+ exit ;;
+ macppc:MirBSD:*:*)
+ echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+ exit ;;
+ *:MirBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+ exit ;;
alpha:OSF1:*:*)
- if test $UNAME_RELEASE = "V4.0"; then
+ case $UNAME_RELEASE in
+ *4.0)
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
- fi
+ ;;
+ *5.*)
+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+ ;;
+ esac
+ # According to Compaq, /usr/sbin/psrinfo has been available on
+ # OSF/1 and Tru64 systems produced since 1995. I hope that
+ # covers most systems running today. This code pipes the CPU
+ # types through head -n 1, so we only detect the type of CPU 0.
+ ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+ case "$ALPHA_CPU_TYPE" in
+ "EV4 (21064)")
+ UNAME_MACHINE="alpha" ;;
+ "EV4.5 (21064)")
+ UNAME_MACHINE="alpha" ;;
+ "LCA4 (21066/21068)")
+ UNAME_MACHINE="alpha" ;;
+ "EV5 (21164)")
+ UNAME_MACHINE="alphaev5" ;;
+ "EV5.6 (21164A)")
+ UNAME_MACHINE="alphaev56" ;;
+ "EV5.6 (21164PC)")
+ UNAME_MACHINE="alphapca56" ;;
+ "EV5.7 (21164PC)")
+ UNAME_MACHINE="alphapca57" ;;
+ "EV6 (21264)")
+ UNAME_MACHINE="alphaev6" ;;
+ "EV6.7 (21264A)")
+ UNAME_MACHINE="alphaev67" ;;
+ "EV6.8CB (21264C)")
+ UNAME_MACHINE="alphaev68" ;;
+ "EV6.8AL (21264B)")
+ UNAME_MACHINE="alphaev68" ;;
+ "EV6.8CX (21264D)")
+ UNAME_MACHINE="alphaev68" ;;
+ "EV6.9A (21264/EV69A)")
+ UNAME_MACHINE="alphaev69" ;;
+ "EV7 (21364)")
+ UNAME_MACHINE="alphaev7" ;;
+ "EV7.9 (21364A)")
+ UNAME_MACHINE="alphaev79" ;;
+ esac
+ # A Pn.n version is a patched version.
# A Vn.n version is a released version.
# A Tn.n version is a released field test version.
# A Xn.n version is an unreleased experimental baselevel.
# 1.2 uses "1.2" for uname -r.
- eval $set_cc_for_build
- cat <<EOF >$dummy.s
- .data
-\$Lformat:
- .byte 37,100,45,37,120,10,0 # "%d-%x\n"
-
- .text
- .globl main
- .align 4
- .ent main
-main:
- .frame \$30,16,\$26,0
- ldgp \$29,0(\$27)
- .prologue 1
- .long 0x47e03d80 # implver \$0
- lda \$2,-1
- .long 0x47e20c21 # amask \$2,\$1
- lda \$16,\$Lformat
- mov \$0,\$17
- not \$1,\$18
- jsr \$26,printf
- ldgp \$29,0(\$26)
- mov 0,\$16
- jsr \$26,exit
- .end main
-EOF
- $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
- if test "$?" = 0 ; then
- case `$dummy` in
- 0-0)
- UNAME_MACHINE="alpha"
- ;;
- 1-0)
- UNAME_MACHINE="alphaev5"
- ;;
- 1-1)
- UNAME_MACHINE="alphaev56"
- ;;
- 1-101)
- UNAME_MACHINE="alphapca56"
- ;;
- 2-303)
- UNAME_MACHINE="alphaev6"
- ;;
- 2-307)
- UNAME_MACHINE="alphaev67"
- ;;
- 2-1307)
- UNAME_MACHINE="alphaev68"
- ;;
- 3-1307)
- UNAME_MACHINE="alphaev7"
- ;;
- esac
- fi
- rm -f $dummy.s $dummy && rmdir $tmpdir
- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- exit 0 ;;
+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ exit ;;
Alpha\ *:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# Should we change UNAME_MACHINE based on the output of uname instead
# of the specific Alpha model?
echo alpha-pc-interix
- exit 0 ;;
+ exit ;;
21064:Windows_NT:50:3)
echo alpha-dec-winnt3.5
- exit 0 ;;
+ exit ;;
Amiga*:UNIX_System_V:4.0:*)
echo m68k-unknown-sysv4
- exit 0;;
+ exit ;;
*:[Aa]miga[Oo][Ss]:*:*)
echo ${UNAME_MACHINE}-unknown-amigaos
- exit 0 ;;
+ exit ;;
*:[Mm]orph[Oo][Ss]:*:*)
echo ${UNAME_MACHINE}-unknown-morphos
- exit 0 ;;
+ exit ;;
*:OS/390:*:*)
echo i370-ibm-openedition
- exit 0 ;;
+ exit ;;
+ *:z/VM:*:*)
+ echo s390-ibm-zvmoe
+ exit ;;
+ *:OS400:*:*)
+ echo powerpc-ibm-os400
+ exit ;;
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
echo arm-acorn-riscix${UNAME_RELEASE}
- exit 0;;
+ exit ;;
+ arm:riscos:*:*|arm:RISCOS:*:*)
+ echo arm-unknown-riscos
+ exit ;;
SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
echo hppa1.1-hitachi-hiuxmpp
- exit 0;;
+ exit ;;
Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
# akee at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
if test "`(/bin/universe) 2>/dev/null`" = att ; then
@@ -323,29 +313,48 @@ EOF
else
echo pyramid-pyramid-bsd
fi
- exit 0 ;;
+ exit ;;
NILE*:*:*:dcosx)
echo pyramid-pyramid-svr4
- exit 0 ;;
- DRS?6000:UNIX_SV:4.2*:7*)
+ exit ;;
+ DRS?6000:unix:4.0:6*)
+ echo sparc-icl-nx6
+ exit ;;
+ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
case `/usr/bin/uname -p` in
- sparc) echo sparc-icl-nx7 && exit 0 ;;
+ sparc) echo sparc-icl-nx7; exit ;;
esac ;;
+ s390x:SunOS:*:*)
+ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
sun4H:SunOS:5.*:*)
echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
- i86pc:SunOS:5.*:*)
- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+ eval $set_cc_for_build
+ SUN_ARCH="i386"
+ # If there is a compiler, see if it is configured for 64-bit objects.
+ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+ # This test works for both compilers.
+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_64BIT_ARCH >/dev/null
+ then
+ SUN_ARCH="x86_64"
+ fi
+ fi
+ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
sun4*:SunOS:6*:*)
# According to config.sub, this is the proper way to canonicalize
# SunOS6. Hard to guess exactly what SunOS6 will be like, but
# it's likely to be more like Solaris than SunOS4.
echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
sun4*:SunOS:*:*)
case "`/usr/bin/arch -k`" in
Series*|S4*)
@@ -354,10 +363,10 @@ EOF
esac
# Japanese Language versions have a version number like `4.1.3-JL'.
echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
- exit 0 ;;
+ exit ;;
sun3*:SunOS:*:*)
echo m68k-sun-sunos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
sun*:*:4.2BSD:*)
UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
@@ -369,10 +378,10 @@ EOF
echo sparc-sun-sunos${UNAME_RELEASE}
;;
esac
- exit 0 ;;
+ exit ;;
aushp:SunOS:*:*)
echo sparc-auspex-sunos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
# The situation for MiNT is a little confusing. The machine name
# can be virtually everything (everything which is not
# "atarist" or "atariste" at least should have a processor
@@ -383,37 +392,40 @@ EOF
# be no problem.
atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
echo m68k-atari-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
echo m68k-atari-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
echo m68k-atari-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
echo m68k-milan-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
echo m68k-hades-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
echo m68k-unknown-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
+ m68k:machten:*:*)
+ echo m68k-apple-machten${UNAME_RELEASE}
+ exit ;;
powerpc:machten:*:*)
echo powerpc-apple-machten${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
RISC*:Mach:*:*)
echo mips-dec-mach_bsd4.3
- exit 0 ;;
+ exit ;;
RISC*:ULTRIX:*:*)
echo mips-dec-ultrix${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
VAX*:ULTRIX*:*:*)
echo vax-dec-ultrix${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
2020:CLIX:*:* | 2430:CLIX:*:*)
echo clipper-intergraph-clix${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
mips:*:*:UMIPS | mips:*:*:RISCos)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
@@ -437,30 +449,33 @@ EOF
exit (-1);
}
EOF
- $CC_FOR_BUILD $dummy.c -o $dummy \
- && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
- && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
- rm -f $dummy.c $dummy && rmdir $tmpdir
+ $CC_FOR_BUILD -o $dummy $dummy.c &&
+ dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+ SYSTEM_NAME=`$dummy $dummyarg` &&
+ { echo "$SYSTEM_NAME"; exit; }
echo mips-mips-riscos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
Motorola:PowerMAX_OS:*:*)
echo powerpc-motorola-powermax
- exit 0 ;;
- Night_Hawk:*:*:PowerMAX_OS)
+ exit ;;
+ Motorola:*:4.3:PL8-*)
echo powerpc-harris-powermax
- exit 0 ;;
+ exit ;;
+ Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+ echo powerpc-harris-powermax
+ exit ;;
Night_Hawk:Power_UNIX:*:*)
echo powerpc-harris-powerunix
- exit 0 ;;
+ exit ;;
m88k:CX/UX:7*:*)
echo m88k-harris-cxux7
- exit 0 ;;
+ exit ;;
m88k:*:4*:R4*)
echo m88k-motorola-sysv4
- exit 0 ;;
+ exit ;;
m88k:*:3*:R3*)
echo m88k-motorola-sysv3
- exit 0 ;;
+ exit ;;
AViiON:dgux:*:*)
# DG/UX returns AViiON for all architectures
UNAME_PROCESSOR=`/usr/bin/uname -p`
@@ -476,29 +491,29 @@ EOF
else
echo i586-dg-dgux${UNAME_RELEASE}
fi
- exit 0 ;;
+ exit ;;
M88*:DolphinOS:*:*) # DolphinOS (SVR3)
echo m88k-dolphin-sysv3
- exit 0 ;;
+ exit ;;
M88*:*:R3*:*)
# Delta 88k system running SVR3
echo m88k-motorola-sysv3
- exit 0 ;;
+ exit ;;
XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
echo m88k-tektronix-sysv3
- exit 0 ;;
+ exit ;;
Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
echo m68k-tektronix-bsd
- exit 0 ;;
+ exit ;;
*:IRIX*:*:*)
echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
- exit 0 ;;
+ exit ;;
????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
- exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX '
+ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
+ exit ;; # Note that: echo "'`uname -s`'" gives 'AIX '
i*86:AIX:*:*)
echo i386-ibm-aix
- exit 0 ;;
+ exit ;;
ia64:AIX:*:*)
if [ -x /usr/bin/oslevel ] ; then
IBM_REV=`/usr/bin/oslevel`
@@ -506,7 +521,7 @@ EOF
IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
fi
echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
- exit 0 ;;
+ exit ;;
*:AIX:2:3)
if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
eval $set_cc_for_build
@@ -521,16 +536,19 @@ EOF
exit(0);
}
EOF
- $CC_FOR_BUILD $dummy.c -o $dummy && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
- rm -f $dummy.c $dummy && rmdir $tmpdir
- echo rs6000-ibm-aix3.2.5
+ if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+ then
+ echo "$SYSTEM_NAME"
+ else
+ echo rs6000-ibm-aix3.2.5
+ fi
elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
echo rs6000-ibm-aix3.2.4
else
echo rs6000-ibm-aix3.2
fi
- exit 0 ;;
- *:AIX:*:[45])
+ exit ;;
+ *:AIX:*:[456])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
IBM_ARCH=rs6000
@@ -543,28 +561,28 @@ EOF
IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
fi
echo ${IBM_ARCH}-ibm-aix${IBM_REV}
- exit 0 ;;
+ exit ;;
*:AIX:*:*)
echo rs6000-ibm-aix
- exit 0 ;;
+ exit ;;
ibmrt:4.4BSD:*|romp-ibm:BSD:*)
echo romp-ibm-bsd4.4
- exit 0 ;;
+ exit ;;
ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
- exit 0 ;; # report: romp-ibm BSD 4.3
+ exit ;; # report: romp-ibm BSD 4.3
*:BOSX:*:*)
echo rs6000-bull-bosx
- exit 0 ;;
+ exit ;;
DPX/2?00:B.O.S.:*:*)
echo m68k-bull-sysv3
- exit 0 ;;
+ exit ;;
9000/[34]??:4.3bsd:1.*:*)
echo m68k-hp-bsd
- exit 0 ;;
+ exit ;;
hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
echo m68k-hp-bsd4.4
- exit 0 ;;
+ exit ;;
9000/[34678]??:HP-UX:*:*)
HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
case "${UNAME_MACHINE}" in
@@ -620,17 +638,37 @@ EOF
exit (0);
}
EOF
- (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`$dummy`
- if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
- rm -f $dummy.c $dummy && rmdir $tmpdir
+ (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+ test -z "$HP_ARCH" && HP_ARCH=hppa
fi ;;
esac
+ if [ ${HP_ARCH} = "hppa2.0w" ]
+ then
+ eval $set_cc_for_build
+
+ # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+ # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler
+ # generating 64-bit code. GNU and HP use different nomenclature:
+ #
+ # $ CC_FOR_BUILD=cc ./config.guess
+ # => hppa2.0w-hp-hpux11.23
+ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+ # => hppa64-hp-hpux11.23
+
+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+ grep __LP64__ >/dev/null
+ then
+ HP_ARCH="hppa2.0w"
+ else
+ HP_ARCH="hppa64"
+ fi
+ fi
echo ${HP_ARCH}-hp-hpux${HPUX_REV}
- exit 0 ;;
+ exit ;;
ia64:HP-UX:*:*)
HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
echo ia64-hp-hpux${HPUX_REV}
- exit 0 ;;
+ exit ;;
3050*:HI-UX:*:*)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
@@ -658,146 +696,192 @@ EOF
exit (0);
}
EOF
- $CC_FOR_BUILD $dummy.c -o $dummy && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
- rm -f $dummy.c $dummy && rmdir $tmpdir
+ $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+ { echo "$SYSTEM_NAME"; exit; }
echo unknown-hitachi-hiuxwe2
- exit 0 ;;
+ exit ;;
9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
echo hppa1.1-hp-bsd
- exit 0 ;;
+ exit ;;
9000/8??:4.3bsd:*:*)
echo hppa1.0-hp-bsd
- exit 0 ;;
+ exit ;;
*9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
echo hppa1.0-hp-mpeix
- exit 0 ;;
+ exit ;;
hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
echo hppa1.1-hp-osf
- exit 0 ;;
+ exit ;;
hp8??:OSF1:*:*)
echo hppa1.0-hp-osf
- exit 0 ;;
+ exit ;;
i*86:OSF1:*:*)
if [ -x /usr/sbin/sysversion ] ; then
echo ${UNAME_MACHINE}-unknown-osf1mk
else
echo ${UNAME_MACHINE}-unknown-osf1
fi
- exit 0 ;;
+ exit ;;
parisc*:Lites*:*:*)
echo hppa1.1-hp-lites
- exit 0 ;;
+ exit ;;
C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
echo c1-convex-bsd
- exit 0 ;;
+ exit ;;
C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
if getsysinfo -f scalar_acc
then echo c32-convex-bsd
else echo c2-convex-bsd
fi
- exit 0 ;;
+ exit ;;
C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
echo c34-convex-bsd
- exit 0 ;;
+ exit ;;
C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
echo c38-convex-bsd
- exit 0 ;;
+ exit ;;
C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
echo c4-convex-bsd
- exit 0 ;;
+ exit ;;
CRAY*Y-MP:*:*:*)
echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;;
CRAY*[A-Z]90:*:*:*)
echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;;
CRAY*TS:*:*:*)
echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
- CRAY*T3D:*:*:*)
- echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;;
CRAY*T3E:*:*:*)
echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;;
CRAY*SV1:*:*:*)
echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;;
+ *:UNICOS/mp:*:*)
+ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ exit ;;
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
- exit 0 ;;
+ exit ;;
+ 5000:UNIX_System_V:4.*:*)
+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ exit ;;
i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
sparc*:BSD/OS:*:*)
echo sparc-unknown-bsdi${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:BSD/OS:*:*)
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:FreeBSD:*:*)
- # Determine whether the default compiler uses glibc.
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #include <features.h>
- #if __GLIBC__ >= 2
- LIBC=gnu
- #else
- LIBC=
- #endif
-EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
- rm -f $dummy.c && rmdir $tmpdir
- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
- exit 0 ;;
+ case ${UNAME_MACHINE} in
+ pc98)
+ echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ amd64)
+ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ *)
+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ esac
+ exit ;;
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
- exit 0 ;;
- i*:MINGW*:*)
+ exit ;;
+ *:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
- exit 0 ;;
+ exit ;;
+ i*:windows32*:*)
+ # uname -m includes "-pc" on this system.
+ echo ${UNAME_MACHINE}-mingw32
+ exit ;;
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
- exit 0 ;;
- x86:Interix*:3*)
- echo i386-pc-interix3
- exit 0 ;;
+ exit ;;
+ *:Interix*:[3456]*)
+ case ${UNAME_MACHINE} in
+ x86)
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
+ EM64T | authenticamd | genuineintel)
+ echo x86_64-unknown-interix${UNAME_RELEASE}
+ exit ;;
+ IA64)
+ echo ia64-unknown-interix${UNAME_RELEASE}
+ exit ;;
+ esac ;;
+ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+ echo i${UNAME_MACHINE}-pc-mks
+ exit ;;
i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
# UNAME_MACHINE based on the output of uname instead of i386?
- echo i386-pc-interix
- exit 0 ;;
+ echo i586-pc-interix
+ exit ;;
i*:UWIN*:*)
echo ${UNAME_MACHINE}-pc-uwin
- exit 0 ;;
+ exit ;;
+ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+ echo x86_64-unknown-cygwin
+ exit ;;
p*:CYGWIN*:*)
echo powerpcle-unknown-cygwin
- exit 0 ;;
+ exit ;;
prep*:SunOS:5.*:*)
echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
*:GNU:*:*)
+ # the GNU system
echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
- exit 0 ;;
+ exit ;;
+ *:GNU/*:*:*)
+ # other systems with GNU libc and userland
+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+ exit ;;
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
- exit 0 ;;
+ exit ;;
arm*:Linux:*:*)
+ eval $set_cc_for_build
+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep -q __ARM_EABI__
+ then
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ else
+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+ fi
+ exit ;;
+ avr32*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
+ cris:Linux:*:*)
+ echo cris-axis-linux-gnu
+ exit ;;
+ crisv32:Linux:*:*)
+ echo crisv32-axis-linux-gnu
+ exit ;;
+ frv:Linux:*:*)
+ echo frv-unknown-linux-gnu
+ exit ;;
ia64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
+ m32r*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
m68*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
mips:Linux:*:*)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
@@ -814,16 +898,45 @@ EOF
#endif
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
- rm -f $dummy.c && rmdir $tmpdir
- test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0
+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+ /^CPU/{
+ s: ::g
+ p
+ }'`"
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
+ mips64:Linux:*:*)
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #undef CPU
+ #undef mips64
+ #undef mips64el
+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+ CPU=mips64el
+ #else
+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+ CPU=mips64
+ #else
+ CPU=
+ #endif
+ #endif
+EOF
+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+ /^CPU/{
+ s: ::g
+ p
+ }'`"
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ ;;
+ or32:Linux:*:*)
+ echo or32-unknown-linux-gnu
+ exit ;;
ppc:Linux:*:*)
echo powerpc-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
ppc64:Linux:*:*)
echo powerpc64-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
EV5) UNAME_MACHINE=alphaev5 ;;
@@ -837,7 +950,10 @@ EOF
objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
- exit 0 ;;
+ exit ;;
+ padre:Linux:*:*)
+ echo sparc-unknown-linux-gnu
+ exit ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -845,22 +961,31 @@ EOF
PA8*) echo hppa2.0-unknown-linux-gnu ;;
*) echo hppa-unknown-linux-gnu ;;
esac
- exit 0 ;;
+ exit ;;
parisc64:Linux:*:* | hppa64:Linux:*:*)
echo hppa64-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
echo ${UNAME_MACHINE}-ibm-linux
- exit 0 ;;
+ exit ;;
+ sh64*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
sh*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
sparc:Linux:*:* | sparc64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
+ vax:Linux:*:*)
+ echo ${UNAME_MACHINE}-dec-linux-gnu
+ exit ;;
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
+ xtensa*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
# first see if it will tell us. cd to the root directory to prevent
@@ -878,15 +1003,12 @@ EOF
;;
a.out-i386-linux)
echo "${UNAME_MACHINE}-pc-linux-gnuaout"
- exit 0 ;;
- coff-i386)
- echo "${UNAME_MACHINE}-pc-linux-gnucoff"
- exit 0 ;;
+ exit ;;
"")
# Either a pre-BFD a.out linker (linux-gnuoldld) or
# one that does not give us useful --help.
echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
- exit 0 ;;
+ exit ;;
esac
# Determine whether the default compiler is a.out or elf
eval $set_cc_for_build
@@ -903,24 +1025,33 @@ EOF
LIBC=gnulibc1
# endif
#else
- #ifdef __INTEL_COMPILER
+ #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
LIBC=gnu
#else
LIBC=gnuaout
#endif
#endif
+ #ifdef __dietlibc__
+ LIBC=dietlibc
+ #endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
- rm -f $dummy.c && rmdir $tmpdir
- test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
- test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+ /^LIBC/{
+ s: ::g
+ p
+ }'`"
+ test x"${LIBC}" != x && {
+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+ exit
+ }
+ test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
;;
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
# earlier versions are messed up and put the nodename in both
# sysname and nodename.
echo i386-sequent-sysv4
- exit 0 ;;
+ exit ;;
i*86:UNIX_SV:4.2MP:2.*)
# Unixware is an offshoot of SVR4, but it has its own version
# number series starting with 2...
@@ -928,7 +1059,27 @@ EOF
# I just have to hope. -- rms.
# Use sysv4.2uw... so that sysv4* matches it.
echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
- exit 0 ;;
+ exit ;;
+ i*86:OS/2:*:*)
+ # If we were able to find `uname', then EMX Unix compatibility
+ # is probably installed.
+ echo ${UNAME_MACHINE}-pc-os2-emx
+ exit ;;
+ i*86:XTS-300:*:STOP)
+ echo ${UNAME_MACHINE}-unknown-stop
+ exit ;;
+ i*86:atheos:*:*)
+ echo ${UNAME_MACHINE}-unknown-atheos
+ exit ;;
+ i*86:syllable:*:*)
+ echo ${UNAME_MACHINE}-pc-syllable
+ exit ;;
+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+ echo i386-unknown-lynxos${UNAME_RELEASE}
+ exit ;;
+ i*86:*DOS:*:*)
+ echo ${UNAME_MACHINE}-pc-msdosdjgpp
+ exit ;;
i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
@@ -936,15 +1087,16 @@ EOF
else
echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
fi
- exit 0 ;;
- i*86:*:5:[78]*)
+ exit ;;
+ i*86:*:5:[678]*)
+ # UnixWare 7.x, OpenUNIX and OpenServer 6.
case `/bin/uname -X | grep "^Machine"` in
*486*) UNAME_MACHINE=i486 ;;
*Pentium) UNAME_MACHINE=i586 ;;
*Pent*|*Celeron) UNAME_MACHINE=i686 ;;
esac
echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
- exit 0 ;;
+ exit ;;
i*86:*:3.2:*)
if test -f /usr/options/cb.name; then
UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
@@ -962,73 +1114,86 @@ EOF
else
echo ${UNAME_MACHINE}-pc-sysv32
fi
- exit 0 ;;
- i*86:*DOS:*:*)
- echo ${UNAME_MACHINE}-pc-msdosdjgpp
- exit 0 ;;
+ exit ;;
pc:*:*:*)
# Left here for compatibility:
# uname -m prints for DJGPP always 'pc', but it prints nothing about
- # the processor, so we play safe by assuming i386.
- echo i386-pc-msdosdjgpp
- exit 0 ;;
+ # the processor, so we play safe by assuming i586.
+ # Note: whatever this is, it MUST be the same as what config.sub
+ # prints for the "djgpp" host, or else GDB configury will decide that
+ # this is a cross-build.
+ echo i586-pc-msdosdjgpp
+ exit ;;
Intel:Mach:3*:*)
echo i386-pc-mach3
- exit 0 ;;
+ exit ;;
paragon:*:*:*)
echo i860-intel-osf1
- exit 0 ;;
+ exit ;;
i860:*:4.*:*) # i860-SVR4
if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
else # Add other i860-SVR4 vendors below as they are discovered.
echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
fi
- exit 0 ;;
+ exit ;;
mini*:CTIX:SYS*5:*)
# "miniframe"
echo m68010-convergent-sysv
- exit 0 ;;
- M68*:*:R3V[567]*:*)
- test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
- 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0)
+ exit ;;
+ mc68k:UNIX:SYSTEM5:3.51m)
+ echo m68k-convergent-sysv
+ exit ;;
+ M680?0:D-NIX:5.3:*)
+ echo m68k-diab-dnix
+ exit ;;
+ M68*:*:R3V[5678]*:*)
+ test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
+ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
OS_REL=''
test -r /etc/.relid \
&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && echo i486-ncr-sysv4.3${OS_REL} && exit 0
+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
- && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && echo i486-ncr-sysv4 && exit 0 ;;
+ && { echo i486-ncr-sysv4; exit; } ;;
+ NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+ OS_REL='.3'
+ test -r /etc/.relid \
+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
echo m68k-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
mc68030:UNIX_System_V:4.*:*)
echo m68k-atari-sysv4
- exit 0 ;;
- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
- echo i386-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
TSUNAMI:LynxOS:2.*:*)
echo sparc-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
rs6000:LynxOS:2.*:*)
echo rs6000-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
echo powerpc-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
SM[BE]S:UNIX_SV:*:*)
echo mips-dde-sysv${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
RM*:ReliantUNIX-*:*:*)
echo mips-sni-sysv4
- exit 0 ;;
+ exit ;;
RM*:SINIX-*:*:*)
echo mips-sni-sysv4
- exit 0 ;;
+ exit ;;
*:SINIX-*:*:*)
if uname -p 2>/dev/null >/dev/null ; then
UNAME_MACHINE=`(uname -p) 2>/dev/null`
@@ -1036,61 +1201,84 @@ EOF
else
echo ns32k-sni-sysv
fi
- exit 0 ;;
+ exit ;;
PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
# says <Richard.M.Bartel at ccMail.Census.GOV>
echo i586-unisys-sysv4
- exit 0 ;;
+ exit ;;
*:UNIX_System_V:4*:FTX*)
# From Gerald Hewes <hewes at openmarket.com>.
# How about differentiating between stratus architectures? -djm
echo hppa1.1-stratus-sysv4
- exit 0 ;;
+ exit ;;
*:*:*:FTX*)
# From seanf at swdc.stratus.com.
echo i860-stratus-sysv4
- exit 0 ;;
+ exit ;;
+ i*86:VOS:*:*)
+ # From Paul.Green at stratus.com.
+ echo ${UNAME_MACHINE}-stratus-vos
+ exit ;;
*:VOS:*:*)
# From Paul.Green at stratus.com.
echo hppa1.1-stratus-vos
- exit 0 ;;
+ exit ;;
mc68*:A/UX:*:*)
echo m68k-apple-aux${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
news*:NEWS-OS:6*:*)
echo mips-sony-newsos6
- exit 0 ;;
+ exit ;;
R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
if [ -d /usr/nec ]; then
echo mips-nec-sysv${UNAME_RELEASE}
else
echo mips-unknown-sysv${UNAME_RELEASE}
fi
- exit 0 ;;
+ exit ;;
BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
echo powerpc-be-beos
- exit 0 ;;
+ exit ;;
BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only.
echo powerpc-apple-beos
- exit 0 ;;
+ exit ;;
BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
echo i586-pc-beos
- exit 0 ;;
+ exit ;;
+ BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
+ echo i586-pc-haiku
+ exit ;;
SX-4:SUPER-UX:*:*)
echo sx4-nec-superux${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
SX-5:SUPER-UX:*:*)
echo sx5-nec-superux${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
+ SX-6:SUPER-UX:*:*)
+ echo sx6-nec-superux${UNAME_RELEASE}
+ exit ;;
+ SX-7:SUPER-UX:*:*)
+ echo sx7-nec-superux${UNAME_RELEASE}
+ exit ;;
+ SX-8:SUPER-UX:*:*)
+ echo sx8-nec-superux${UNAME_RELEASE}
+ exit ;;
+ SX-8R:SUPER-UX:*:*)
+ echo sx8r-nec-superux${UNAME_RELEASE}
+ exit ;;
Power*:Rhapsody:*:*)
echo powerpc-apple-rhapsody${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:Rhapsody:*:*)
echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:Darwin:*:*)
- echo `uname -p`-apple-darwin${UNAME_RELEASE}
- exit 0 ;;
+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+ case $UNAME_PROCESSOR in
+ unknown) UNAME_PROCESSOR=powerpc ;;
+ esac
+ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+ exit ;;
*:procnto*:*:* | *:QNX:[0123456789]*:*)
UNAME_PROCESSOR=`uname -p`
if test "$UNAME_PROCESSOR" = "x86"; then
@@ -1098,22 +1286,25 @@ EOF
UNAME_MACHINE=pc
fi
echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:QNX:*:4*)
echo i386-pc-qnx
- exit 0 ;;
- NSR-[GKLNPTVW]:NONSTOP_KERNEL:*:*)
+ exit ;;
+ NSE-?:NONSTOP_KERNEL:*:*)
+ echo nse-tandem-nsk${UNAME_RELEASE}
+ exit ;;
+ NSR-?:NONSTOP_KERNEL:*:*)
echo nsr-tandem-nsk${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:NonStop-UX:*:*)
echo mips-compaq-nonstopux
- exit 0 ;;
+ exit ;;
BS2000:POSIX*:*:*)
echo bs2000-siemens-sysv
- exit 0 ;;
+ exit ;;
DS/*:UNIX_System_V:*:*)
echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:Plan9:*:*)
# "uname -m" is not consistent, so use $cputype instead. 386
# is converted to i386 for consistency with other x86
@@ -1124,36 +1315,50 @@ EOF
UNAME_MACHINE="$cputype"
fi
echo ${UNAME_MACHINE}-unknown-plan9
- exit 0 ;;
- i*86:OS/2:*:*)
- # If we were able to find `uname', then EMX Unix compatibility
- # is probably installed.
- echo ${UNAME_MACHINE}-pc-os2-emx
- exit 0 ;;
+ exit ;;
*:TOPS-10:*:*)
echo pdp10-unknown-tops10
- exit 0 ;;
+ exit ;;
*:TENEX:*:*)
echo pdp10-unknown-tenex
- exit 0 ;;
+ exit ;;
KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
echo pdp10-dec-tops20
- exit 0 ;;
+ exit ;;
XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
echo pdp10-xkl-tops20
- exit 0 ;;
+ exit ;;
*:TOPS-20:*:*)
echo pdp10-unknown-tops20
- exit 0 ;;
+ exit ;;
*:ITS:*:*)
echo pdp10-unknown-its
- exit 0 ;;
- i*86:XTS-300:*:STOP)
- echo ${UNAME_MACHINE}-unknown-stop
- exit 0 ;;
- i*86:atheos:*:*)
- echo ${UNAME_MACHINE}-unknown-atheos
- exit 0 ;;
+ exit ;;
+ SEI:*:*:SEIUX)
+ echo mips-sei-seiux${UNAME_RELEASE}
+ exit ;;
+ *:DragonFly:*:*)
+ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+ exit ;;
+ *:*VMS:*:*)
+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
+ case "${UNAME_MACHINE}" in
+ A*) echo alpha-dec-vms ; exit ;;
+ I*) echo ia64-dec-vms ; exit ;;
+ V*) echo vax-dec-vms ; exit ;;
+ esac ;;
+ *:XENIX:*:SysV)
+ echo i386-pc-xenix
+ exit ;;
+ i*86:skyos:*:*)
+ echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+ exit ;;
+ i*86:rdos:*:*)
+ echo ${UNAME_MACHINE}-pc-rdos
+ exit ;;
+ i*86:AROS:*:*)
+ echo ${UNAME_MACHINE}-pc-aros
+ exit ;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1185,7 +1390,7 @@ main ()
#endif
#if defined (__arm) && defined (__acorn) && defined (__unix)
- printf ("arm-acorn-riscix"); exit (0);
+ printf ("arm-acorn-riscix\n"); exit (0);
#endif
#if defined (hp300) && !defined (hpux)
@@ -1274,12 +1479,12 @@ main ()
}
EOF
-$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
-rm -f $dummy.c $dummy && rmdir $tmpdir
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+ { echo "$SYSTEM_NAME"; exit; }
# Apollos put the system type in the environment.
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
# Convex versions that predate uname can use getsysinfo(1)
@@ -1288,22 +1493,22 @@ then
case `getsysinfo -f cpu_type` in
c1*)
echo c1-convex-bsd
- exit 0 ;;
+ exit ;;
c2*)
if getsysinfo -f scalar_acc
then echo c32-convex-bsd
else echo c2-convex-bsd
fi
- exit 0 ;;
+ exit ;;
c34*)
echo c34-convex-bsd
- exit 0 ;;
+ exit ;;
c38*)
echo c38-convex-bsd
- exit 0 ;;
+ exit ;;
c4*)
echo c4-convex-bsd
- exit 0 ;;
+ exit ;;
esac
fi
@@ -1314,7 +1519,9 @@ This script, last modified $timestamp, has failed to recognize
the operating system you are using. It is advised that you
download the most up to date version of the config scripts from
- ftp://ftp.gnu.org/pub/gnu/config/
+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+and
+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
If the version you run ($0) is already up to date, please
send the following data and any information you think might be
diff --git a/bootstrap/config.sub b/bootstrap/config.sub
index 9ff085e..a39437d 100755
--- a/bootstrap/config.sub
+++ b/bootstrap/config.sub
@@ -1,9 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002 Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# Free Software Foundation, Inc.
-timestamp='2002-07-03'
+timestamp='2009-04-17'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -21,14 +22,15 @@ timestamp='2002-07-03'
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
+
# Please send patches to <config-patches at gnu.org>. Submit a context
# diff and a properly formatted ChangeLog entry.
#
@@ -70,8 +72,8 @@ Report bugs and patches to <config-patches at gnu.org>."
version="\
GNU config.sub ($timestamp)
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -83,11 +85,11 @@ Try \`$me --help' for more information."
while test $# -gt 0 ; do
case $1 in
--time-stamp | --time* | -t )
- echo "$timestamp" ; exit 0 ;;
+ echo "$timestamp" ; exit ;;
--version | -v )
- echo "$version" ; exit 0 ;;
+ echo "$version" ; exit ;;
--help | --h* | -h )
- echo "$usage"; exit 0 ;;
+ echo "$usage"; exit ;;
-- ) # Stop option processing
shift; break ;;
- ) # Use stdin as input.
@@ -99,7 +101,7 @@ while test $# -gt 0 ; do
*local*)
# First pass through any local machine types.
echo $1
- exit 0;;
+ exit ;;
* )
break ;;
@@ -118,7 +120,10 @@ esac
# Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
- nto-qnx* | linux-gnu* | freebsd*-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+ kopensolaris*-gnu* | \
+ storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;;
@@ -144,7 +149,7 @@ case $os in
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
- -apple | -axis)
+ -apple | -axis | -knuth | -cray)
os=
basic_machine=$1
;;
@@ -169,6 +174,10 @@ case $os in
-hiux*)
os=-hiuxwe2
;;
+ -sco6)
+ os=-sco5v6
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
-sco5)
os=-sco3.2v5
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -185,6 +194,10 @@ case $os in
# Don't forget version if it is 3.2v4 or newer.
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
+ -sco5v6*)
+ # Don't forget version if it is 3.2v4 or newer.
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
-sco*)
os=-sco3.2v2
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -228,40 +241,57 @@ case $basic_machine in
| a29k \
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+ | am33_2.0 \
+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+ | bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
- | fr30 | frv \
+ | fido | fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
- | ip2k \
- | m32r | m68000 | m68k | m88k | mcore \
+ | ip2k | iq2000 \
+ | lm32 \
+ | m32c | m32r | m32rle | m68000 | m68k | m88k \
+ | maxq | mb | microblaze | mcore | mep | metag \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
+ | mips64octeon | mips64octeonel \
| mips64orion | mips64orionel \
+ | mips64r5900 | mips64r5900el \
+ | mips64vr | mips64vrel \
| mips64vr4100 | mips64vr4100el \
| mips64vr4300 | mips64vr4300el \
| mips64vr5000 | mips64vr5000el \
+ | mips64vr5900 | mips64vr5900el \
| mipsisa32 | mipsisa32el \
+ | mipsisa32r2 | mipsisa32r2el \
| mipsisa64 | mipsisa64el \
+ | mipsisa64r2 | mipsisa64r2el \
| mipsisa64sb1 | mipsisa64sb1el \
+ | mipsisa64sr71k | mipsisa64sr71kel \
| mipstx39 | mipstx39el \
| mn10200 | mn10300 \
+ | moxie \
+ | mt \
+ | msp430 \
+ | nios | nios2 \
| ns16k | ns32k \
- | openrisc | or32 \
+ | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
- | sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+ | score \
+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
- | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
- | strongarm \
- | tahoe | thumb | tic80 | tron \
+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+ | spu | strongarm \
+ | tahoe | thumb | tic4x | tic80 | tron \
| v850 | v850e \
| we32k \
- | x86 | xscale | xstormy16 | xtensa \
- | z8k)
+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+ | z8k | z80)
basic_machine=$basic_machine-unknown
;;
m6811 | m68hc11 | m6812 | m68hc12)
@@ -271,6 +301,9 @@ case $basic_machine in
;;
m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
;;
+ ms1)
+ basic_machine=mt-unknown
+ ;;
# We use `pc' rather than `unknown'
# because (1) that's what they normally are, and
@@ -290,48 +323,67 @@ case $basic_machine in
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
- | avr-* \
- | bs2000-* \
- | c[123]* | c30-* | [cjt]90-* | c54x-* \
- | clipper-* | cydra-* \
+ | avr-* | avr32-* \
+ | bfin-* | bs2000-* \
+ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+ | clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
- | ip2k-* \
- | m32r-* \
+ | ip2k-* | iq2000-* \
+ | lm32-* \
+ | m32c-* | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | mcore-* \
+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \
| mips64-* | mips64el-* \
+ | mips64octeon-* | mips64octeonel-* \
| mips64orion-* | mips64orionel-* \
+ | mips64r5900-* | mips64r5900el-* \
+ | mips64vr-* | mips64vrel-* \
| mips64vr4100-* | mips64vr4100el-* \
| mips64vr4300-* | mips64vr4300el-* \
| mips64vr5000-* | mips64vr5000el-* \
+ | mips64vr5900-* | mips64vr5900el-* \
| mipsisa32-* | mipsisa32el-* \
+ | mipsisa32r2-* | mipsisa32r2el-* \
| mipsisa64-* | mipsisa64el-* \
+ | mipsisa64r2-* | mipsisa64r2el-* \
| mipsisa64sb1-* | mipsisa64sb1el-* \
- | mipstx39 | mipstx39el \
+ | mipsisa64sr71k-* | mipsisa64sr71kel-* \
+ | mipstx39-* | mipstx39el-* \
+ | mmix-* \
+ | mt-* \
+ | msp430-* \
+ | nios-* | nios2-* \
| none-* | np1-* | ns16k-* | ns32k-* \
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
| pyramid-* \
| romp-* | rs6000-* \
- | sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \
+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
- | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
- | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
- | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+ | sparclite-* \
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
+ | tahoe-* | thumb-* \
+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
+ | tron-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
- | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
- | xtensa-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+ | xstormy16-* | xtensa*-* \
| ymp-* \
- | z8k-*)
+ | z8k-* | z80-*)
+ ;;
+ # Recognize the basic CPU types without company name, with glob match.
+ xtensa*)
+ basic_machine=$basic_machine-unknown
;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
@@ -349,6 +401,9 @@ case $basic_machine in
basic_machine=a29k-amd
os=-udi
;;
+ abacus)
+ basic_machine=abacus-unknown
+ ;;
adobe68k)
basic_machine=m68010-adobe
os=-scout
@@ -363,6 +418,12 @@ case $basic_machine in
basic_machine=a29k-none
os=-bsd
;;
+ amd64)
+ basic_machine=x86_64-pc
+ ;;
+ amd64-*)
+ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
amdahl)
basic_machine=580-amdahl
os=-sysv
@@ -386,6 +447,10 @@ case $basic_machine in
basic_machine=m68k-apollo
os=-bsd
;;
+ aros)
+ basic_machine=i386-pc
+ os=-aros
+ ;;
aux)
basic_machine=m68k-apple
os=-aux
@@ -394,10 +459,22 @@ case $basic_machine in
basic_machine=ns32k-sequent
os=-dynix
;;
+ blackfin)
+ basic_machine=bfin-unknown
+ os=-linux
+ ;;
+ blackfin-*)
+ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
c90)
basic_machine=c90-cray
os=-unicos
;;
+ cegcc)
+ basic_machine=arm-unknown
+ os=-cegcc
+ ;;
convex-c1)
basic_machine=c1-convex
os=-bsd
@@ -422,12 +499,27 @@ case $basic_machine in
basic_machine=j90-cray
os=-unicos
;;
+ craynv)
+ basic_machine=craynv-cray
+ os=-unicosmp
+ ;;
+ cr16)
+ basic_machine=cr16-unknown
+ os=-elf
+ ;;
crds | unos)
basic_machine=m68k-crds
;;
+ crisv32 | crisv32-* | etraxfs*)
+ basic_machine=crisv32-axis
+ ;;
cris | cris-* | etrax*)
basic_machine=cris-axis
;;
+ crx)
+ basic_machine=crx-unknown
+ os=-elf
+ ;;
da30 | da30-*)
basic_machine=m68k-da30
;;
@@ -450,6 +542,14 @@ case $basic_machine in
basic_machine=m88k-motorola
os=-sysv3
;;
+ dicos)
+ basic_machine=i686-pc
+ os=-dicos
+ ;;
+ djgpp)
+ basic_machine=i586-pc
+ os=-msdosdjgpp
+ ;;
dpx20 | dpx20-*)
basic_machine=rs6000-bull
os=-bosx
@@ -600,6 +700,14 @@ case $basic_machine in
basic_machine=m68k-isi
os=-sysv
;;
+ m68knommu)
+ basic_machine=m68k-unknown
+ os=-linux
+ ;;
+ m68knommu-*)
+ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
m88k-omron*)
basic_machine=m88k-omron
;;
@@ -615,6 +723,10 @@ case $basic_machine in
basic_machine=i386-pc
os=-mingw32
;;
+ mingw32ce)
+ basic_machine=arm-unknown
+ os=-mingw32ce
+ ;;
miniframe)
basic_machine=m68000-convergent
;;
@@ -628,10 +740,6 @@ case $basic_machine in
mips3*)
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
;;
- mmix*)
- basic_machine=mmix-knuth
- os=-mmixware
- ;;
monitor)
basic_machine=m68k-rom68k
os=-coff
@@ -644,6 +752,9 @@ case $basic_machine in
basic_machine=i386-pc
os=-msdos
;;
+ ms1-*)
+ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+ ;;
mvs)
basic_machine=i370-ibm
os=-mvs
@@ -719,9 +830,12 @@ case $basic_machine in
basic_machine=hppa1.1-oki
os=-proelf
;;
- or32 | or32-*)
+ openrisc | openrisc-*)
basic_machine=or32-unknown
- os=-coff
+ ;;
+ os400)
+ basic_machine=powerpc-ibm
+ os=-os400
;;
OSE68000 | ose68000)
basic_machine=m68000-ericsson
@@ -739,55 +853,75 @@ case $basic_machine in
basic_machine=i860-intel
os=-osf
;;
+ parisc)
+ basic_machine=hppa-unknown
+ os=-linux
+ ;;
+ parisc-*)
+ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
pbd)
basic_machine=sparc-tti
;;
pbb)
basic_machine=m68k-tti
;;
- pc532 | pc532-*)
+ pc532 | pc532-*)
basic_machine=ns32k-pc532
;;
+ pc98)
+ basic_machine=i386-pc
+ ;;
+ pc98-*)
+ basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
pentium | p5 | k5 | k6 | nexgen | viac3)
basic_machine=i586-pc
;;
- pentiumpro | p6 | 6x86 | athlon)
+ pentiumpro | p6 | 6x86 | athlon | athlon_*)
basic_machine=i686-pc
;;
- pentiumii | pentium2)
+ pentiumii | pentium2 | pentiumiii | pentium3)
basic_machine=i686-pc
;;
+ pentium4)
+ basic_machine=i786-pc
+ ;;
pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
pentiumpro-* | p6-* | 6x86-* | athlon-*)
basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
- pentiumii-* | pentium2-*)
+ pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
+ pentium4-*)
+ basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
pn)
basic_machine=pn-gould
;;
power) basic_machine=power-ibm
;;
ppc) basic_machine=powerpc-unknown
- ;;
+ ;;
ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppcle | powerpclittle | ppc-le | powerpc-little)
basic_machine=powerpcle-unknown
- ;;
+ ;;
ppcle-* | powerpclittle-*)
basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppc64) basic_machine=powerpc64-unknown
- ;;
+ ;;
ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppc64le | powerpc64little | ppc64-le | powerpc64-little)
basic_machine=powerpc64le-unknown
- ;;
+ ;;
ppc64le-* | powerpc64little-*)
basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
@@ -798,6 +932,10 @@ case $basic_machine in
basic_machine=i586-unknown
os=-pw32
;;
+ rdos)
+ basic_machine=i386-pc
+ os=-rdos
+ ;;
rom68k)
basic_machine=m68k-rom68k
os=-coff
@@ -818,6 +956,20 @@ case $basic_machine in
basic_machine=a29k-amd
os=-udi
;;
+ sb1)
+ basic_machine=mipsisa64sb1-unknown
+ ;;
+ sb1el)
+ basic_machine=mipsisa64sb1el-unknown
+ ;;
+ sde)
+ basic_machine=mipsisa32-sde
+ os=-elf
+ ;;
+ sei)
+ basic_machine=mips-sei
+ os=-seiux
+ ;;
sequent)
basic_machine=i386-sequent
;;
@@ -825,6 +977,12 @@ case $basic_machine in
basic_machine=sh-hitachi
os=-hms
;;
+ sh5el)
+ basic_machine=sh5le-unknown
+ ;;
+ sh64)
+ basic_machine=sh64-unknown
+ ;;
sparclite-wrs | simso-wrs)
basic_machine=sparclite-wrs
os=-vxworks
@@ -883,7 +1041,7 @@ case $basic_machine in
sun386 | sun386i | roadrunner)
basic_machine=i386-sun
;;
- sv1)
+ sv1)
basic_machine=sv1-cray
os=-unicos
;;
@@ -891,10 +1049,6 @@ case $basic_machine in
basic_machine=i386-sequent
os=-dynix
;;
- t3d)
- basic_machine=alpha-cray
- os=-unicos
- ;;
t3e)
basic_machine=alphaev5-cray
os=-unicos
@@ -907,6 +1061,18 @@ case $basic_machine in
basic_machine=tic54x-unknown
os=-coff
;;
+ tic55x | c55x*)
+ basic_machine=tic55x-unknown
+ os=-coff
+ ;;
+ tic6x | c6x*)
+ basic_machine=tic6x-unknown
+ os=-coff
+ ;;
+ tile*)
+ basic_machine=tile-unknown
+ os=-linux-gnu
+ ;;
tx39)
basic_machine=mipstx39-unknown
;;
@@ -920,6 +1086,10 @@ case $basic_machine in
tower | tower-32)
basic_machine=m68k-ncr
;;
+ tpf)
+ basic_machine=s390x-ibm
+ os=-tpf
+ ;;
udi29k)
basic_machine=a29k-amd
os=-udi
@@ -941,8 +1111,8 @@ case $basic_machine in
os=-vms
;;
vpp*|vx|vx-*)
- basic_machine=f301-fujitsu
- ;;
+ basic_machine=f301-fujitsu
+ ;;
vxworks960)
basic_machine=i960-wrs
os=-vxworks
@@ -963,11 +1133,11 @@ case $basic_machine in
basic_machine=hppa1.1-winbond
os=-proelf
;;
- windows32)
- basic_machine=i386-pc
- os=-windows32-msvcrt
+ xbox)
+ basic_machine=i686-pc
+ os=-mingw32
;;
- xps | xps100)
+ xps | xps100)
basic_machine=xps100-honeywell
;;
ymp)
@@ -978,6 +1148,10 @@ case $basic_machine in
basic_machine=z8k-unknown
os=-sim
;;
+ z80-*-coff)
+ basic_machine=z80-unknown
+ os=-sim
+ ;;
none)
basic_machine=none-none
os=-none
@@ -997,6 +1171,9 @@ case $basic_machine in
romp)
basic_machine=romp-ibm
;;
+ mmix)
+ basic_machine=mmix-knuth
+ ;;
rs6000)
basic_machine=rs6000-ibm
;;
@@ -1013,16 +1190,13 @@ case $basic_machine in
we32k)
basic_machine=we32k-att
;;
- sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele)
+ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
basic_machine=sh-unknown
;;
- sh64)
- basic_machine=sh64-unknown
- ;;
- sparc | sparcv9 | sparcv9b)
+ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
basic_machine=sparc-sun
;;
- cydra)
+ cydra)
basic_machine=cydra-cydrome
;;
orion)
@@ -1037,10 +1211,6 @@ case $basic_machine in
pmac | pmac-mpw)
basic_machine=powerpc-apple
;;
- c4x*)
- basic_machine=c4x-none
- os=-coff
- ;;
*-unknown)
# Make sure to match an already-canonicalized machine name.
;;
@@ -1092,22 +1262,28 @@ case $os in
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
| -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+ | -kopensolaris* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
- | -aos* \
+ | -aos* | -aros* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
- | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+ | -openbsd* | -solidbsd* \
+ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- | -chorusos* | -chorusrdb* \
+ | -chorusos* | -chorusrdb* | -cegcc* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
- | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
+ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+ | -uxpv* | -beos* | -mpeix* | -udk* \
+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
- | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* | -powermax*)
+ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1119,16 +1295,21 @@ case $os in
;;
esac
;;
+ -nto-qnx*)
+ ;;
-nto*)
- os=-nto-qnx
+ os=`echo $os | sed -e 's|nto|nto-qnx|'`
;;
-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
- | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+ | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
| -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
;;
-mac*)
os=`echo $os | sed -e 's|mac|macos|'`
;;
+ -linux-dietlibc)
+ os=-linux-dietlibc
+ ;;
-linux*)
os=`echo $os | sed -e 's|linux|linux-gnu|'`
;;
@@ -1141,6 +1322,9 @@ case $os in
-opened*)
os=-openedition
;;
+ -os400*)
+ os=-os400
+ ;;
-wince*)
os=-wince
;;
@@ -1162,6 +1346,9 @@ case $os in
-atheos*)
os=-atheos
;;
+ -syllable*)
+ os=-syllable
+ ;;
-386bsd)
os=-bsd
;;
@@ -1172,7 +1359,7 @@ case $os in
os=-rtmk-nova
;;
-ns2 )
- os=-nextstep2
+ os=-nextstep2
;;
-nsk*)
os=-nsk
@@ -1184,6 +1371,9 @@ case $os in
-sinix*)
os=-sysv4
;;
+ -tpf*)
+ os=-tpf
+ ;;
-triton*)
os=-sysv3
;;
@@ -1211,8 +1401,20 @@ case $os in
-xenix)
os=-xenix
;;
- -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
- os=-mint
+ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+ os=-mint
+ ;;
+ -aros*)
+ os=-aros
+ ;;
+ -kaos*)
+ os=-kaos
+ ;;
+ -zvmoe)
+ os=-zvmoe
+ ;;
+ -dicos*)
+ os=-dicos
;;
-none)
;;
@@ -1236,6 +1438,12 @@ else
# system, and we'll never get to this point.
case $basic_machine in
+ score-*)
+ os=-elf
+ ;;
+ spu-*)
+ os=-elf
+ ;;
*-acorn)
os=-riscix1.2
;;
@@ -1245,11 +1453,14 @@ case $basic_machine in
arm*-semi)
os=-aout
;;
+ c4x-* | tic4x-*)
+ os=-coff
+ ;;
# This must come before the *-dec entry.
pdp10-*)
os=-tops20
;;
- pdp11-*)
+ pdp11-*)
os=-none
;;
*-dec | vax-*)
@@ -1270,6 +1481,9 @@ case $basic_machine in
m68*-cisco)
os=-aout
;;
+ mep-*)
+ os=-elf
+ ;;
mips*-cisco)
os=-elf
;;
@@ -1288,9 +1502,15 @@ case $basic_machine in
*-be)
os=-beos
;;
+ *-haiku)
+ os=-haiku
+ ;;
*-ibm)
os=-aix
;;
+ *-knuth)
+ os=-mmixware
+ ;;
*-wec)
os=-proelf
;;
@@ -1342,19 +1562,19 @@ case $basic_machine in
*-next)
os=-nextstep3
;;
- *-gould)
+ *-gould)
os=-sysv
;;
- *-highlevel)
+ *-highlevel)
os=-bsd
;;
*-encore)
os=-bsd
;;
- *-sgi)
+ *-sgi)
os=-irix
;;
- *-siemens)
+ *-siemens)
os=-sysv4
;;
*-masscomp)
@@ -1423,9 +1643,15 @@ case $basic_machine in
-mvs* | -opened*)
vendor=ibm
;;
+ -os400*)
+ vendor=ibm
+ ;;
-ptx*)
vendor=sequent
;;
+ -tpf*)
+ vendor=ibm
+ ;;
-vxsim* | -vxworks* | -windiss*)
vendor=wrs
;;
@@ -1450,7 +1676,7 @@ case $basic_machine in
esac
echo $basic_machine$os
-exit 0
+exit
# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
diff --git a/bootstrap/depcomp b/bootstrap/depcomp
index 807b991..df8eea7 100755
--- a/bootstrap/depcomp
+++ b/bootstrap/depcomp
@@ -1,7 +1,10 @@
#! /bin/sh
-
# depcomp - compile a program generating dependencies as side-effects
-# Copyright 1999, 2000 Free Software Foundation, Inc.
+
+scriptversion=2009-04-28.21; # UTC
+
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
+# Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -14,9 +17,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -25,22 +26,45 @@
# Originally written by Alexandre Oliva <oliva at dcc.unicamp.br>.
+case $1 in
+ '')
+ echo "$0: No command. Try \`$0 --help' for more information." 1>&2
+ exit 1;
+ ;;
+ -h | --h*)
+ cat <<\EOF
+Usage: depcomp [--help] [--version] PROGRAM [ARGS]
+
+Run PROGRAMS ARGS to compile a file, generating dependencies
+as side-effects.
+
+Environment variables:
+ depmode Dependency tracking mode.
+ source Source file read by `PROGRAMS ARGS'.
+ object Object file output by `PROGRAMS ARGS'.
+ DEPDIR directory where to store dependencies.
+ depfile Dependency file to output.
+ tmpdepfile Temporary file to use when outputing dependencies.
+ libtool Whether libtool is used (yes/no).
+
+Report bugs to <bug-automake at gnu.org>.
+EOF
+ exit $?
+ ;;
+ -v | --v*)
+ echo "depcomp $scriptversion"
+ exit $?
+ ;;
+esac
+
if test -z "$depmode" || test -z "$source" || test -z "$object"; then
echo "depcomp: Variables source, object and depmode must be set" 1>&2
exit 1
fi
-# `libtool' can also be set to `yes' or `no'.
-
-if test -z "$depfile"; then
- base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'`
- dir=`echo "$object" | sed 's,/.*$,/,'`
- if test "$dir" = "$object"; then
- dir=
- fi
- # FIXME: should be _deps on DOS.
- depfile="$dir.deps/$base"
-fi
+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
+depfile=${depfile-`echo "$object" |
+ sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
rm -f "$tmpdepfile"
@@ -61,12 +85,34 @@ if test "$depmode" = dashXmstdout; then
depmode=dashmstdout
fi
+cygpath_u="cygpath -u -f -"
+if test "$depmode" = msvcmsys; then
+ # This is just like msvisualcpp but w/o cygpath translation.
+ # Just convert the backslash-escaped backslashes to single forward
+ # slashes to satisfy depend.m4
+ cygpath_u="sed s,\\\\\\\\,/,g"
+ depmode=msvisualcpp
+fi
+
case "$depmode" in
gcc3)
## gcc 3 implements dependency tracking that does exactly what
## we want. Yay! Note: for some reason libtool 1.4 doesn't like
## it if -MD -MP comes after the -MF stuff. Hmm.
- "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
+## the command line argument order; so add the flags where they
+## appear in depend2.am. Note that the slowdown incurred here
+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
+ for arg
+ do
+ case $arg in
+ -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
+ *) set fnord "$@" "$arg" ;;
+ esac
+ shift # fnord
+ shift # $arg
+ done
+ "$@"
stat=$?
if test $stat -eq 0; then :
else
@@ -153,14 +199,14 @@ sgi)
' < "$tmpdepfile" \
| sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
tr '
-' ' ' >> $depfile
- echo >> $depfile
+' ' ' >> "$depfile"
+ echo >> "$depfile"
# The second pass generates a dummy entry for each header file.
tr ' ' '
' < "$tmpdepfile" \
| sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
- >> $depfile
+ >> "$depfile"
else
# The sourcefile does not contain any dependencies, so just
# store a dummy comment line, to avoid errors with the Makefile
@@ -172,31 +218,43 @@ sgi)
aix)
# The C for AIX Compiler uses -M and outputs the dependencies
- # in a .u file. This file always lives in the current directory.
- # Also, the AIX compiler puts `$object:' at the start of each line;
- # $object doesn't have directory information.
- stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'`
- tmpdepfile="$stripped.u"
- outname="$stripped.o"
+ # in a .u file. In older versions, this file always lives in the
+ # current directory. Also, the AIX compiler puts `$object:' at the
+ # start of each line; $object doesn't have directory information.
+ # Version 6 uses the directory in both cases.
+ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+ test "x$dir" = "x$object" && dir=
+ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
if test "$libtool" = yes; then
+ tmpdepfile1=$dir$base.u
+ tmpdepfile2=$base.u
+ tmpdepfile3=$dir.libs/$base.u
"$@" -Wc,-M
else
+ tmpdepfile1=$dir$base.u
+ tmpdepfile2=$dir$base.u
+ tmpdepfile3=$dir$base.u
"$@" -M
fi
-
stat=$?
+
if test $stat -eq 0; then :
else
- rm -f "$tmpdepfile"
+ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
exit $stat
fi
+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+ do
+ test -f "$tmpdepfile" && break
+ done
if test -f "$tmpdepfile"; then
# Each line is of the form `foo.o: dependent.h'.
# Do two passes, one to just change these to
# `$object: dependent.h' and one to simply `dependent.h:'.
- sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
- sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
+ sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+ # That's a tab and a space in the [].
+ sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
else
# The sourcefile does not contain any dependencies, so just
# store a dummy comment line, to avoid errors with the Makefile
@@ -206,6 +264,89 @@ aix)
rm -f "$tmpdepfile"
;;
+icc)
+ # Intel's C compiler understands `-MD -MF file'. However on
+ # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
+ # ICC 7.0 will fill foo.d with something like
+ # foo.o: sub/foo.c
+ # foo.o: sub/foo.h
+ # which is wrong. We want:
+ # sub/foo.o: sub/foo.c
+ # sub/foo.o: sub/foo.h
+ # sub/foo.c:
+ # sub/foo.h:
+ # ICC 7.1 will output
+ # foo.o: sub/foo.c sub/foo.h
+ # and will wrap long lines using \ :
+ # foo.o: sub/foo.c ... \
+ # sub/foo.h ... \
+ # ...
+
+ "$@" -MD -MF "$tmpdepfile"
+ stat=$?
+ if test $stat -eq 0; then :
+ else
+ rm -f "$tmpdepfile"
+ exit $stat
+ fi
+ rm -f "$depfile"
+ # Each line is of the form `foo.o: dependent.h',
+ # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+ # Do two passes, one to just change these to
+ # `$object: dependent.h' and one to simply `dependent.h:'.
+ sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+ # Some versions of the HPUX 10.20 sed can't process this invocation
+ # correctly. Breaking it into two sed invocations is a workaround.
+ sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
+ sed -e 's/$/ :/' >> "$depfile"
+ rm -f "$tmpdepfile"
+ ;;
+
+hp2)
+ # The "hp" stanza above does not work with aCC (C++) and HP's ia64
+ # compilers, which have integrated preprocessors. The correct option
+ # to use with these is +Maked; it writes dependencies to a file named
+ # 'foo.d', which lands next to the object file, wherever that
+ # happens to be.
+ # Much of this is similar to the tru64 case; see comments there.
+ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+ test "x$dir" = "x$object" && dir=
+ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+ if test "$libtool" = yes; then
+ tmpdepfile1=$dir$base.d
+ tmpdepfile2=$dir.libs/$base.d
+ "$@" -Wc,+Maked
+ else
+ tmpdepfile1=$dir$base.d
+ tmpdepfile2=$dir$base.d
+ "$@" +Maked
+ fi
+ stat=$?
+ if test $stat -eq 0; then :
+ else
+ rm -f "$tmpdepfile1" "$tmpdepfile2"
+ exit $stat
+ fi
+
+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
+ do
+ test -f "$tmpdepfile" && break
+ done
+ if test -f "$tmpdepfile"; then
+ sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
+ # Add `dependent.h:' lines.
+ sed -ne '2,${
+ s/^ *//
+ s/ \\*$//
+ s/$/:/
+ p
+ }' "$tmpdepfile" >> "$depfile"
+ else
+ echo "#dummy" > "$depfile"
+ fi
+ rm -f "$tmpdepfile" "$tmpdepfile2"
+ ;;
+
tru64)
# The Tru64 compiler uses -MD to generate dependencies as a side
# effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
@@ -217,31 +358,47 @@ tru64)
base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
if test "$libtool" = yes; then
- tmpdepfile1="$dir.libs/$base.lo.d"
- tmpdepfile2="$dir.libs/$base.d"
+ # With Tru64 cc, shared objects can also be used to make a
+ # static library. This mechanism is used in libtool 1.4 series to
+ # handle both shared and static libraries in a single compilation.
+ # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
+ #
+ # With libtool 1.5 this exception was removed, and libtool now
+ # generates 2 separate objects for the 2 libraries. These two
+ # compilations output dependencies in $dir.libs/$base.o.d and
+ # in $dir$base.o.d. We have to check for both files, because
+ # one of the two compilations can be disabled. We should prefer
+ # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+ # automatically cleaned when .libs/ is deleted, while ignoring
+ # the former would cause a distcleancheck panic.
+ tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4
+ tmpdepfile2=$dir$base.o.d # libtool 1.5
+ tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5
+ tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504
"$@" -Wc,-MD
else
- tmpdepfile1="$dir$base.o.d"
- tmpdepfile2="$dir$base.d"
+ tmpdepfile1=$dir$base.o.d
+ tmpdepfile2=$dir$base.d
+ tmpdepfile3=$dir$base.d
+ tmpdepfile4=$dir$base.d
"$@" -MD
fi
stat=$?
if test $stat -eq 0; then :
else
- rm -f "$tmpdepfile1" "$tmpdepfile2"
+ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
exit $stat
fi
- if test -f "$tmpdepfile1"; then
- tmpdepfile="$tmpdepfile1"
- else
- tmpdepfile="$tmpdepfile2"
- fi
+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
+ do
+ test -f "$tmpdepfile" && break
+ done
if test -f "$tmpdepfile"; then
sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
- # That's a space and a tab in the [].
- sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+ # That's a tab and a space in the [].
+ sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
else
echo "#dummy" > "$depfile"
fi
@@ -254,20 +411,18 @@ tru64)
dashmstdout)
# Important note: in order to support this mode, a compiler *must*
- # always write the proprocessed file to stdout, regardless of -o.
+ # always write the preprocessed file to stdout, regardless of -o.
"$@" || exit $?
# Remove the call to Libtool.
if test "$libtool" = yes; then
- while test $1 != '--mode=compile'; do
+ while test "X$1" != 'X--mode=compile'; do
shift
done
shift
fi
- # Remove `-o $object'. We will use -o /dev/null later,
- # however we can't do the remplacement now because
- # `-o $object' might simply not be used
+ # Remove `-o $object'.
IFS=" "
for arg
do
@@ -287,7 +442,11 @@ dashmstdout)
done
test -z "$dashmflag" && dashmflag=-M
- "$@" -o /dev/null $dashmflag | sed 's:^[^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
+ # Require at least two characters before searching for `:'
+ # in the target name. This is to cope with DOS-style filenames:
+ # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
+ "$@" $dashmflag |
+ sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
rm -f "$depfile"
cat < "$tmpdepfile" > "$depfile"
tr ' ' '
@@ -306,25 +465,41 @@ dashXmstdout)
makedepend)
"$@" || exit $?
+ # Remove any Libtool call
+ if test "$libtool" = yes; then
+ while test "X$1" != 'X--mode=compile'; do
+ shift
+ done
+ shift
+ fi
# X makedepend
shift
- cleared=no
- for arg in "$@"; do
+ cleared=no eat=no
+ for arg
+ do
case $cleared in
no)
set ""; shift
cleared=yes ;;
esac
+ if test $eat = yes; then
+ eat=no
+ continue
+ fi
case "$arg" in
-D*|-I*)
set fnord "$@" "$arg"; shift ;;
- -*)
+ # Strip any option that makedepend may not understand. Remove
+ # the object too, otherwise makedepend will parse it as a source file.
+ -arch)
+ eat=yes ;;
+ -*|$object)
;;
*)
set fnord "$@" "$arg"; shift ;;
esac
done
- obj_suffix="`echo $object | sed 's/^.*\././'`"
+ obj_suffix=`echo "$object" | sed 's/^.*\././'`
touch "$tmpdepfile"
${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
rm -f "$depfile"
@@ -339,12 +514,12 @@ makedepend)
cpp)
# Important note: in order to support this mode, a compiler *must*
- # always write the proprocessed file to stdout.
+ # always write the preprocessed file to stdout.
"$@" || exit $?
# Remove the call to Libtool.
if test "$libtool" = yes; then
- while test $1 != '--mode=compile'; do
+ while test "X$1" != 'X--mode=compile'; do
shift
done
shift
@@ -370,7 +545,8 @@ cpp)
done
"$@" -E |
- sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+ sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+ -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
sed '$ s: \\$::' > "$tmpdepfile"
rm -f "$depfile"
echo "$object : \\" > "$depfile"
@@ -381,13 +557,27 @@ cpp)
msvisualcpp)
# Important note: in order to support this mode, a compiler *must*
- # always write the proprocessed file to stdout, regardless of -o,
- # because we must use -o when running libtool.
+ # always write the preprocessed file to stdout.
"$@" || exit $?
+
+ # Remove the call to Libtool.
+ if test "$libtool" = yes; then
+ while test "X$1" != 'X--mode=compile'; do
+ shift
+ done
+ shift
+ fi
+
IFS=" "
for arg
do
case "$arg" in
+ -o)
+ shift
+ ;;
+ $object)
+ shift
+ ;;
"-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
set fnord "$@"
shift
@@ -400,16 +590,23 @@ msvisualcpp)
;;
esac
done
- "$@" -E |
- sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
+ "$@" -E 2>/dev/null |
+ sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
rm -f "$depfile"
echo "$object : \\" > "$depfile"
- . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
+ sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
echo " " >> "$depfile"
- . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
+ sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
rm -f "$tmpdepfile"
;;
+msvcmsys)
+ # This case exists only to let depend.m4 do its work. It works by
+ # looking at the text of this script. This case will never be run,
+ # since it is checked for above.
+ exit 1
+ ;;
+
none)
exec "$@"
;;
@@ -421,3 +618,13 @@ none)
esac
exit 0
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/bootstrap/freeciv-server.desktop.in b/bootstrap/freeciv-server.desktop.in
index dcd4f76..98df4c7 100644
--- a/bootstrap/freeciv-server.desktop.in
+++ b/bootstrap/freeciv-server.desktop.in
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Name=Freeciv server
Name[ca]=Freeciv server
Name[es]=Freeciv server
diff --git a/bootstrap/freeciv.desktop.in b/bootstrap/freeciv.desktop.in
index f9d8640..09d5281 100644
--- a/bootstrap/freeciv.desktop.in
+++ b/bootstrap/freeciv.desktop.in
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Name=Freeciv
Name[ca]=Freeciv
Name[es]=Freeciv
@@ -17,7 +16,7 @@ Comment[pt]=Jogo de estratégia por turnos inspirado na História da civilizaç
Comment[sv]=Turordningsbaserat strategispel inspirerat av den mänskliga
Comment[tr]=İnsanlık tarihinden esinlenerek yapılmış sıra tabanlı strateji oyunu
Exec=civclient
-Icon=freeciv-client.png
+Icon=freeciv-client
StartupNotify=true
Terminal=false
Type=Application
diff --git a/bootstrap/install-sh b/bootstrap/install-sh
index 11870f1..6781b98 100755
--- a/bootstrap/install-sh
+++ b/bootstrap/install-sh
@@ -1,251 +1,520 @@
#!/bin/sh
-#
# install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
+
+scriptversion=2009-04-28.21; # UTC
+
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
+#
+# Copyright (C) 1994 X Consortium
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-# Copyright 1991 by the Massachusetts Institute of Technology
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
#
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation, and that the name of M.I.T. not be used in advertising or
-# publicity pertaining to distribution of the software without specific,
-# written prior permission. M.I.T. makes no representations about the
-# suitability of this software for any purpose. It is provided "as is"
-# without express or implied warranty.
+#
+# FSF changes to this file are in the public domain.
#
# Calling this script install-sh is preferred over install.sh, to prevent
# `make' implicit rules from creating a file called install from it
# when there is no Makefile.
#
# This script is compatible with the BSD install script, but was written
-# from scratch. It can only install one file at a time, a restriction
-# shared with many OS's install programs.
+# from scratch.
+nl='
+'
+IFS=" "" $nl"
# set DOITPROG to echo to test this script
# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-transformbasename=""
-transform_arg=""
-instcmd="$mvprog"
-chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=""
-dst=""
-dir_arg=""
-
-while [ x"$1" != x ]; do
- case $1 in
- -c) instcmd="$cpprog"
- shift
- continue;;
-
- -d) dir_arg=true
- shift
- continue;;
-
- -m) chmodcmd="$chmodprog $2"
- shift
- shift
- continue;;
-
- -o) chowncmd="$chownprog $2"
- shift
- shift
- continue;;
-
- -g) chgrpcmd="$chgrpprog $2"
- shift
- shift
- continue;;
-
- -s) stripcmd="$stripprog"
- shift
- continue;;
-
- -t=*) transformarg=`echo $1 | sed 's/-t=//'`
- shift
- continue;;
-
- -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
- shift
- continue;;
-
- *) if [ x"$src" = x ]
- then
- src=$1
- else
- # this colon is to work around a 386BSD /bin/sh bug
- :
- dst=$1
- fi
- shift
- continue;;
- esac
-done
-
-if [ x"$src" = x ]
-then
- echo "install: no input file specified"
- exit 1
+doit=${DOITPROG-}
+if test -z "$doit"; then
+ doit_exec=exec
else
- :
+ doit_exec=$doit
fi
-if [ x"$dir_arg" != x ]; then
- dst=$src
- src=""
-
- if [ -d $dst ]; then
- instcmd=:
- chmodcmd=""
- else
- instcmd=$mkdirprog
- fi
-else
+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
+
+chgrpprog=${CHGRPPROG-chgrp}
+chmodprog=${CHMODPROG-chmod}
+chownprog=${CHOWNPROG-chown}
+cmpprog=${CMPPROG-cmp}
+cpprog=${CPPROG-cp}
+mkdirprog=${MKDIRPROG-mkdir}
+mvprog=${MVPROG-mv}
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
+
+posix_glob='?'
+initialize_posix_glob='
+ test "$posix_glob" != "?" || {
+ if (set -f) 2>/dev/null; then
+ posix_glob=
+ else
+ posix_glob=:
+ fi
+ }
+'
+
+posix_mkdir=
+
+# Desired mode of installed file.
+mode=0755
+
+chgrpcmd=
+chmodcmd=$chmodprog
+chowncmd=
+mvcmd=$mvprog
+rmcmd="$rmprog -f"
+stripcmd=
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad
-# if $src (and thus $dsttmp) contains '*'.
+src=
+dst=
+dir_arg=
+dst_arg=
- if [ -f "$src" ] || [ -d "$src" ]
- then
- :
- else
- echo "install: $src does not exist"
- exit 1
- fi
-
- if [ x"$dst" = x ]
- then
- echo "install: no destination specified"
- exit 1
- else
- :
- fi
+copy_on_change=false
+no_target_directory=
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+ or: $0 [OPTION]... SRCFILES... DIRECTORY
+ or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+ or: $0 [OPTION]... -d DIRECTORIES...
- if [ -d $dst ]
- then
- dst="$dst"/`basename $src`
- else
- :
- fi
-fi
+In the 1st form, copy SRCFILE to DSTFILE.
+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+In the 4th, create DIRECTORIES.
-## this sed command emulates the dirname command
-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+Options:
+ --help display this help and exit.
+ --version display version info and exit.
-# Make sure that the destination directory exists.
-# this part is taken from Noah Friedman's mkinstalldirs script
+ -c (ignored)
+ -C install only if different (preserve the last data modification time)
+ -d create directories instead of installing files.
+ -g GROUP $chgrpprog installed files to GROUP.
+ -m MODE $chmodprog installed files to MODE.
+ -o USER $chownprog installed files to USER.
+ -s $stripprog installed files.
+ -t DIRECTORY install into DIRECTORY.
+ -T report an error if DSTFILE is a directory.
-# Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='
- '
-IFS="${IFS-${defaultIFS}}"
+Environment variables override the default commands:
+ CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+ RMPROG STRIPPROG
+"
-oIFS="${IFS}"
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS="${oIFS}"
+while test $# -ne 0; do
+ case $1 in
+ -c) ;;
-pathcomp=''
+ -C) copy_on_change=true;;
-while [ $# -ne 0 ] ; do
- pathcomp="${pathcomp}${1}"
- shift
+ -d) dir_arg=true;;
- if [ ! -d "${pathcomp}" ] ;
- then
- $mkdirprog "${pathcomp}"
- else
- :
- fi
+ -g) chgrpcmd="$chgrpprog $2"
+ shift;;
- pathcomp="${pathcomp}/"
-done
-fi
+ --help) echo "$usage"; exit $?;;
-if [ x"$dir_arg" != x ]
-then
- $doit $instcmd $dst &&
+ -m) mode=$2
+ case $mode in
+ *' '* | *' '* | *'
+'* | *'*'* | *'?'* | *'['*)
+ echo "$0: invalid mode: $mode" >&2
+ exit 1;;
+ esac
+ shift;;
- if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi &&
- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi &&
- if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else : ; fi &&
- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else : ; fi
-else
+ -o) chowncmd="$chownprog $2"
+ shift;;
-# If we're going to rename the final executable, determine the name now.
+ -s) stripcmd=$stripprog;;
- if [ x"$transformarg" = x ]
- then
- dstfile=`basename $dst`
- else
- dstfile=`basename $dst $transformbasename |
- sed $transformarg`$transformbasename
- fi
+ -t) dst_arg=$2
+ shift;;
-# don't allow the sed command to completely eliminate the filename
+ -T) no_target_directory=true;;
- if [ x"$dstfile" = x ]
- then
- dstfile=`basename $dst`
- else
- :
- fi
-
-# Make a temp file name in the proper directory.
+ --version) echo "$0 $scriptversion"; exit $?;;
- dsttmp=$dstdir/#inst.$$#
+ --) shift
+ break;;
-# Move or copy the file name to the temp name
+ -*) echo "$0: invalid option: $1" >&2
+ exit 1;;
- $doit $instcmd $src $dsttmp &&
-
- trap "rm -f ${dsttmp}" 0 &&
+ *) break;;
+ esac
+ shift
+done
-# and set any options; do chmod last to preserve setuid bits
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
+ # When -d is used, all remaining arguments are directories to create.
+ # When -t is used, the destination is already specified.
+ # Otherwise, the last argument is the destination. Remove it from $@.
+ for arg
+ do
+ if test -n "$dst_arg"; then
+ # $@ is not empty: it contains at least $arg.
+ set fnord "$@" "$dst_arg"
+ shift # fnord
+ fi
+ shift # arg
+ dst_arg=$arg
+ done
+fi
-# If any of these fail, we abort the whole thing. If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
+if test $# -eq 0; then
+ if test -z "$dir_arg"; then
+ echo "$0: no input file specified." >&2
+ exit 1
+ fi
+ # It's OK to call `install-sh -d' without argument.
+ # This can happen when creating conditional directories.
+ exit 0
+fi
- if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else :;fi &&
- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else :;fi &&
- if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else :;fi &&
- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else :;fi &&
+if test -z "$dir_arg"; then
+ trap '(exit $?); exit' 1 2 13 15
+
+ # Set umask so as not to create temps with too-generous modes.
+ # However, 'strip' requires both read and write access to temps.
+ case $mode in
+ # Optimize common cases.
+ *644) cp_umask=133;;
+ *755) cp_umask=22;;
+
+ *[0-7])
+ if test -z "$stripcmd"; then
+ u_plus_rw=
+ else
+ u_plus_rw='% 200'
+ fi
+ cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+ *)
+ if test -z "$stripcmd"; then
+ u_plus_rw=
+ else
+ u_plus_rw=,u+rw
+ fi
+ cp_umask=$mode$u_plus_rw;;
+ esac
+fi
-# Now rename the file to the real destination.
+for src
+do
+ # Protect names starting with `-'.
+ case $src in
+ -*) src=./$src;;
+ esac
+
+ if test -n "$dir_arg"; then
+ dst=$src
+ dstdir=$dst
+ test -d "$dstdir"
+ dstdir_status=$?
+ else
+
+ # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+ # might cause directories to be created, which would be especially bad
+ # if $src (and thus $dsttmp) contains '*'.
+ if test ! -f "$src" && test ! -d "$src"; then
+ echo "$0: $src does not exist." >&2
+ exit 1
+ fi
+
+ if test -z "$dst_arg"; then
+ echo "$0: no destination specified." >&2
+ exit 1
+ fi
+
+ dst=$dst_arg
+ # Protect names starting with `-'.
+ case $dst in
+ -*) dst=./$dst;;
+ esac
- $doit $rmcmd -f $dstdir/$dstfile &&
- $doit $mvcmd $dsttmp $dstdir/$dstfile
+ # If destination is a directory, append the input filename; won't work
+ # if double slashes aren't ignored.
+ if test -d "$dst"; then
+ if test -n "$no_target_directory"; then
+ echo "$0: $dst_arg: Is a directory" >&2
+ exit 1
+ fi
+ dstdir=$dst
+ dst=$dstdir/`basename "$src"`
+ dstdir_status=0
+ else
+ # Prefer dirname, but fall back on a substitute if dirname fails.
+ dstdir=`
+ (dirname "$dst") 2>/dev/null ||
+ expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$dst" : 'X\(//\)[^/]' \| \
+ X"$dst" : 'X\(//\)$' \| \
+ X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X"$dst" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'
+ `
+
+ test -d "$dstdir"
+ dstdir_status=$?
+ fi
+ fi
+
+ obsolete_mkdir_used=false
+
+ if test $dstdir_status != 0; then
+ case $posix_mkdir in
+ '')
+ # Create intermediate dirs using mode 755 as modified by the umask.
+ # This is like FreeBSD 'install' as of 1997-10-28.
+ umask=`umask`
+ case $stripcmd.$umask in
+ # Optimize common cases.
+ *[2367][2367]) mkdir_umask=$umask;;
+ .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
+ *[0-7])
+ mkdir_umask=`expr $umask + 22 \
+ - $umask % 100 % 40 + $umask % 20 \
+ - $umask % 10 % 4 + $umask % 2
+ `;;
+ *) mkdir_umask=$umask,go-w;;
+ esac
+
+ # With -d, create the new directory with the user-specified mode.
+ # Otherwise, rely on $mkdir_umask.
+ if test -n "$dir_arg"; then
+ mkdir_mode=-m$mode
+ else
+ mkdir_mode=
+ fi
-fi &&
+ posix_mkdir=false
+ case $umask in
+ *[123567][0-7][0-7])
+ # POSIX mkdir -p sets u+wx bits regardless of umask, which
+ # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+ ;;
+ *)
+ tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+ trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+ if (umask $mkdir_umask &&
+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+ then
+ if test -z "$dir_arg" || {
+ # Check for POSIX incompatibilities with -m.
+ # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+ # other-writeable bit of parent directory when it shouldn't.
+ # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+ ls_ld_tmpdir=`ls -ld "$tmpdir"`
+ case $ls_ld_tmpdir in
+ d????-?r-*) different_mode=700;;
+ d????-?--*) different_mode=755;;
+ *) false;;
+ esac &&
+ $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+ ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+ test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+ }
+ }
+ then posix_mkdir=:
+ fi
+ rmdir "$tmpdir/d" "$tmpdir"
+ else
+ # Remove any dirs left behind by ancient mkdir implementations.
+ rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+ fi
+ trap '' 0;;
+ esac;;
+ esac
+ if
+ $posix_mkdir && (
+ umask $mkdir_umask &&
+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+ )
+ then :
+ else
+
+ # The umask is ridiculous, or mkdir does not conform to POSIX,
+ # or it failed possibly due to a race condition. Create the
+ # directory the slow way, step by step, checking for races as we go.
+
+ case $dstdir in
+ /*) prefix='/';;
+ -*) prefix='./';;
+ *) prefix='';;
+ esac
+
+ eval "$initialize_posix_glob"
+
+ oIFS=$IFS
+ IFS=/
+ $posix_glob set -f
+ set fnord $dstdir
+ shift
+ $posix_glob set +f
+ IFS=$oIFS
+
+ prefixes=
+
+ for d
+ do
+ test -z "$d" && continue
+
+ prefix=$prefix$d
+ if test -d "$prefix"; then
+ prefixes=
+ else
+ if $posix_mkdir; then
+ (umask=$mkdir_umask &&
+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+ # Don't fail if two instances are running concurrently.
+ test -d "$prefix" || exit 1
+ else
+ case $prefix in
+ *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+ *) qprefix=$prefix;;
+ esac
+ prefixes="$prefixes '$qprefix'"
+ fi
+ fi
+ prefix=$prefix/
+ done
+
+ if test -n "$prefixes"; then
+ # Don't fail if two instances are running concurrently.
+ (umask $mkdir_umask &&
+ eval "\$doit_exec \$mkdirprog $prefixes") ||
+ test -d "$dstdir" || exit 1
+ obsolete_mkdir_used=true
+ fi
+ fi
+ fi
+
+ if test -n "$dir_arg"; then
+ { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+ { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+ test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
+ else
+
+ # Make a couple of temp file names in the proper directory.
+ dsttmp=$dstdir/_inst.$$_
+ rmtmp=$dstdir/_rm.$$_
+
+ # Trap to clean up those temp files at exit.
+ trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+
+ # Copy the file name to the temp name.
+ (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
+
+ # and set any options; do chmod last to preserve setuid bits.
+ #
+ # If any of these fail, we abort the whole thing. If we want to
+ # ignore errors from any of these, just make sure not to ignore
+ # errors from the above "$doit $cpprog $src $dsttmp" command.
+ #
+ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
+ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
+ { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
+ { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+
+ # If -C, don't bother to copy if it wouldn't change the file.
+ if $copy_on_change &&
+ old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
+ new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
+
+ eval "$initialize_posix_glob" &&
+ $posix_glob set -f &&
+ set X $old && old=:$2:$4:$5:$6 &&
+ set X $new && new=:$2:$4:$5:$6 &&
+ $posix_glob set +f &&
+
+ test "$old" = "$new" &&
+ $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
+ then
+ rm -f "$dsttmp"
+ else
+ # Rename the file to the real destination.
+ $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
+
+ # The rename failed, perhaps because mv can't rename something else
+ # to itself, or perhaps because mv is so ancient that it does not
+ # support -f.
+ {
+ # Now remove or move aside any old file at destination location.
+ # We try this two ways since rm can't unlink itself on some
+ # systems and the destination file might be busy for other
+ # reasons. In this case, the final cleanup might fail but the new
+ # file should still install successfully.
+ {
+ test ! -f "$dst" ||
+ $doit $rmcmd -f "$dst" 2>/dev/null ||
+ { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+ { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+ } ||
+ { echo "$0: cannot unlink or rename $dst" >&2
+ (exit 1); exit 1
+ }
+ } &&
+
+ # Now rename the file to the real destination.
+ $doit $mvcmd "$dsttmp" "$dst"
+ }
+ fi || exit 1
+
+ trap '' 0
+ fi
+done
-exit 0
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/bootstrap/missing b/bootstrap/missing
index 6a37006..28055d2 100755
--- a/bootstrap/missing
+++ b/bootstrap/missing
@@ -1,6 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc.
+
+scriptversion=2009-04-28.21; # UTC
+
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
@@ -14,9 +18,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -29,6 +31,8 @@ if test $# -eq 0; then
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -38,18 +42,24 @@ else
configure_ac=configure.in
fi
-case "$1" in
+msg="missing on your system"
+
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
shift
"$@" && exit 0
+ # Exit code 63 means version mismatch. This often happens
+ # when the user try to use an ancient version of a tool on
+ # a file that requires a minimum version. In this case we
+ # we should proceed has if the program had been absent, or
+ # if --run hadn't been passed.
+ if test $? = 63; then
+ run=:
+ msg="probably too old"
+ fi
;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
-h|--h|--he|--hel|--help)
echo "\
@@ -67,6 +77,7 @@ Supported PROGRAM values:
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -74,11 +85,18 @@ Supported PROGRAM values:
lex create \`lex.yy.c', if possible, from existing .c
makeinfo touch the output file
tar try tar, gnutar, gtar, then tar without non-portable flags
- yacc create \`y.tab.[ch]', if possible, from existing .[ch]"
+ yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
+Send bug reports to <bug-automake at gnu.org>."
+ exit $?
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
- echo "missing 0.4 - GNU automake"
+ echo "missing $scriptversion (GNU Automake)"
+ exit $?
;;
-*)
@@ -87,42 +105,69 @@ Supported PROGRAM values:
exit 1
;;
- aclocal*)
+esac
+
+# normalize program name to check for.
+program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
+# Now exit if we have it, but it failed. Also exit now if we
+# don't have it and --version was passed (most likely to detect
+# the program). This is about non-GNU programs, so use $1 not
+# $program.
+case $1 in
+ lex*|yacc*)
+ # Not GNU programs, they don't have --version.
+ ;;
+
+ tar*)
+ if test -n "$run"; then
+ echo 1>&2 "ERROR: \`tar' requires --run"
+ exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ exit 1
+ fi
+ ;;
+
+ *)
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
# We have it, but it failed.
exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ # Could not run --version or --help. This is probably someone
+ # running `$TOOL --version' or `$TOOL --help' to check whether
+ # $TOOL exists and not knowing $TOOL uses missing.
+ exit 1
fi
+ ;;
+esac
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case $program in
+ aclocal*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`acinclude.m4' or \`${configure_ac}'. You might want
to install the \`Automake' and \`Perl' packages. Grab them from
any GNU archive site."
touch aclocal.m4
;;
- autoconf)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
+ autoconf*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
archive site."
touch configure
;;
- autoheader)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
+ autoheader*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
to install the \`Autoconf' and \`GNU m4' packages. Grab them
from any GNU archive site."
@@ -130,7 +175,7 @@ WARNING: \`$1' is missing on your system. You should only need it if
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -140,13 +185,8 @@ WARNING: \`$1' is missing on your system. You should only need it if
;;
automake*)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
You might want to install the \`Automake' and \`Perl' packages.
Grab them from any GNU archive site."
@@ -155,21 +195,16 @@ WARNING: \`$1' is missing on your system. You should only need it if
while read f; do touch "$f"; done
;;
- autom4te)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
+ autom4te*)
echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
- system. You might have modified some files without having the
+WARNING: \`$1' is needed, but is $msg.
+ You might have modified some files without having the
proper tools for further handling them.
- You can get \`$1Help2man' as part of \`Autoconf' from any GNU
+ You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -183,111 +218,108 @@ WARNING: \`$1' is needed, and you do not seem to have it handy on your
fi
;;
- bison|yacc)
+ bison*|yacc*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
- lex|flex)
+ lex*|flex*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
- help2man)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
+ help2man*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
- exit 1
+ exit $?
fi
;;
- makeinfo)
- if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
- # We have makeinfo, but it failed.
- exit 1
- fi
-
+ makeinfo*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
indirectly affecting the aspect of the manual. The spurious
call might also be the consequence of using a buggy \`make' (AIX,
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ # The file to touch is that specified with -o ...
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
- file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
+ # ... or it is the one specified with @setfilename ...
+ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
+ # ... or it is derived from the source name (dir/f.texi becomes f.info)
+ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
+ # If the file does not exist, the user really needs makeinfo;
+ # let's fail without touching anything.
+ test -f $file || exit 1
touch $file
;;
- tar)
+ tar*)
shift
- if test -n "$run"; then
- echo 1>&2 "ERROR: \`tar' requires --run"
- exit 1
- fi
# We have already tried tar in the generic part.
# Look for gnutar/gtar before invocation to avoid ugly error
@@ -300,13 +332,13 @@ WARNING: \`$1' is missing on your system. You should only need it if
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
@@ -323,10 +355,10 @@ WARNING: I can't seem to be able to run \`tar' with the given arguments.
*)
echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
- system. You might have modified some files without having the
+WARNING: \`$1' is needed, and is $msg.
+ You might have modified some files without having the
proper tools for further handling them. Check the \`README' file,
- it often tells you about the needed prerequirements for installing
+ it often tells you about the needed prerequisites for installing
this package. You may also peek at any GNU archive site, in case
some other package would contain this missing \`$1' program."
exit 1
@@ -334,3 +366,11 @@ WARNING: \`$1' is needed, and you do not seem to have it handy on your
esac
exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/client/Makefile.am b/client/Makefile.am
index 3479c7c..9429d2c 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -116,6 +116,8 @@ civclient_SOURCES = $(AUDIO_SDL_FILES) \
themes_common.h \
tilespec.c \
tilespec.h \
+ voteinfo.c \
+ voteinfo.h \
audio.c \
audio.h \
audio_none.c \
diff --git a/client/Makefile.in b/client/Makefile.in
index 318470e..9e231e6 100644
--- a/client/Makefile.in
+++ b/client/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,84 +14,207 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
+VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+bin_PROGRAMS = civclient$(EXEEXT)
+subdir = client
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ $(top_srcdir)/bootstrap/freeciv.desktop.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES = freeciv.desktop
+CONFIG_CLEAN_VPATH_FILES =
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopfiledir)"
+PROGRAMS = $(bin_PROGRAMS)
+am__civclient_SOURCES_DIST = audio_sdl.c audio_sdl.h attribute.h \
+ attribute.c citydlg_common.c citydlg_common.h cityrepdata.c \
+ cityrepdata.h civclient.c civclient.h chatline_common.c \
+ chatline_common.h connectdlg_common.c connectdlg_common.h \
+ climisc.c climisc.h climap.c climap.h clinet.c clinet.h \
+ colors_common.c colors_common.h control.c control.h \
+ ggzclient.c ggzclient.h goto.c goto.h helpdata.c helpdata.h \
+ mapctrl_common.c mapctrl_common.h mapview_common.c \
+ mapview_common.h messagewin_common.c messagewin_common.h \
+ overview_common.c overview_common.h packhand.c packhand.h \
+ packhand_gen.h packhand_gen.c plrdlg_common.c plrdlg_common.h \
+ options.c options.h repodlgs_common.c repodlgs_common.h \
+ reqtree.c reqtree.h servers.c servers.h text.c text.h \
+ themes_common.c themes_common.h tilespec.c tilespec.h \
+ voteinfo.c voteinfo.h audio.c audio.h audio_none.c \
+ audio_none.h
+am__objects_1 = audio_sdl.$(OBJEXT)
+ at AUDIO_SDL_TRUE@am__objects_2 = $(am__objects_1)
+am_civclient_OBJECTS = $(am__objects_2) attribute.$(OBJEXT) \
+ citydlg_common.$(OBJEXT) cityrepdata.$(OBJEXT) \
+ civclient.$(OBJEXT) chatline_common.$(OBJEXT) \
+ connectdlg_common.$(OBJEXT) climisc.$(OBJEXT) climap.$(OBJEXT) \
+ clinet.$(OBJEXT) colors_common.$(OBJEXT) control.$(OBJEXT) \
+ ggzclient.$(OBJEXT) goto.$(OBJEXT) helpdata.$(OBJEXT) \
+ mapctrl_common.$(OBJEXT) mapview_common.$(OBJEXT) \
+ messagewin_common.$(OBJEXT) overview_common.$(OBJEXT) \
+ packhand.$(OBJEXT) packhand_gen.$(OBJEXT) \
+ plrdlg_common.$(OBJEXT) options.$(OBJEXT) \
+ repodlgs_common.$(OBJEXT) reqtree.$(OBJEXT) servers.$(OBJEXT) \
+ text.$(OBJEXT) themes_common.$(OBJEXT) tilespec.$(OBJEXT) \
+ voteinfo.$(OBJEXT) audio.$(OBJEXT) audio_none.$(OBJEXT)
+civclient_OBJECTS = $(am_civclient_OBJECTS)
+am__DEPENDENCIES_1 =
+civclient_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(civclient_LDFLAGS) \
+ $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/bootstrap/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(civclient_SOURCES)
+DIST_SOURCES = $(am__civclient_SOURCES_DIST)
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+DATA = $(desktopfile_DATA)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+ distdir
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = gui-ftwl gui-gtk-2.0 gui-sdl gui-stub gui-win32 gui-xaw \
+ include agents
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+ dir0=`pwd`; \
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+ sed_rest='s,^[^/]*/*,,'; \
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+ sed_butlast='s,/*[^/]*$$,,'; \
+ while test -n "$$dir1"; do \
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+ if test "$$first" != "."; then \
+ if test "$$first" = ".."; then \
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+ else \
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+ if test "$$first2" = "$$first"; then \
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+ else \
+ dir2="../$$dir2"; \
+ fi; \
+ dir0="$$dir0"/"$$first"; \
+ fi; \
+ fi; \
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+ done; \
+ reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -101,10 +225,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -112,27 +240,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -140,6 +280,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -150,17 +292,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -173,12 +336,37 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
@CLIENT_GUI_FTWL_TRUE at GUI_SUBDIR = gui-ftwl
@CLIENT_GUI_GTK_2_0_TRUE at GUI_SUBDIR = gui-gtk-2.0
@CLIENT_GUI_SDL_TRUE at GUI_SUBDIR = gui-sdl
@@ -186,26 +374,16 @@ packagesrcdir = @packagesrcdir@
@CLIENT_GUI_WIN32_TRUE at GUI_SUBDIR = gui-win32
@CLIENT_GUI_XAW_TRUE at GUI_SUBDIR = gui-xaw
@CLIENT_GUI_FTWL_TRUE at LIBFTWL = ../utility/ftwl/libftwl.a
-
ALL_AUDIO_SDL_FILES = audio_sdl.c audio_sdl.h
-
@AUDIO_SDL_TRUE at AUDIO_SDL_FILES = $(ALL_AUDIO_SDL_FILES)
-
@MINGW32_TRUE at CLIENTICON = ../win32/clienticon.o
-
EXTRA_DIST = \
$(ALL_AUDIO_SDL_FILES)
-
- at MAKE_CLIENT_INCLUDE_TRUE@CLI_INCLUDE = include
@MAKE_CLIENT_INCLUDE_FALSE at CLI_INCLUDE =
-
+ at MAKE_CLIENT_INCLUDE_TRUE@CLI_INCLUDE = include
SUBDIRS = $(GUI_SUBDIR) $(CLI_INCLUDE) agents
-
-bin_PROGRAMS = civclient
-
AM_CPPFLAGS = -I$(top_srcdir)/utility -I$(srcdir)/include -I$(top_srcdir)/common -I$(top_srcdir)/common/aicore -I../intl -I$(srcdir)/agents $(CLIENT_CFLAGS) $(SOUND_CFLAGS) $(LIBGGZ_INCLUDES) $(GGZMOD_INCLUDES) $(GGZ_GTK_INCLUDES)
-
civclient_SOURCES = $(AUDIO_SDL_FILES) \
attribute.h \
attribute.c \
@@ -263,12 +441,13 @@ civclient_SOURCES = $(AUDIO_SDL_FILES) \
themes_common.h \
tilespec.c \
tilespec.h \
+ voteinfo.c \
+ voteinfo.h \
audio.c \
audio.h \
audio_none.c \
audio_none.h
-
civclient_LDFLAGS = $(CLIENT_LDFLAGS) $(GGZMOD_LDFLAGS)
fc_civclient_libs = ../utility/libcivutility.a \
$(LIBFTWL) \
@@ -285,116 +464,85 @@ desktopfiledir = $(prefix)/share/applications
desktopfile_DATA = \
freeciv.desktop
-subdir = client
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = freeciv.desktop
-bin_PROGRAMS = civclient$(EXEEXT)
-PROGRAMS = $(bin_PROGRAMS)
-
-am__objects_1 = audio_sdl.$(OBJEXT)
- at AUDIO_SDL_TRUE@am__objects_2 = $(am__objects_1)
-am_civclient_OBJECTS = $(am__objects_2) attribute.$(OBJEXT) \
- citydlg_common.$(OBJEXT) cityrepdata.$(OBJEXT) \
- civclient.$(OBJEXT) chatline_common.$(OBJEXT) \
- connectdlg_common.$(OBJEXT) climisc.$(OBJEXT) climap.$(OBJEXT) \
- clinet.$(OBJEXT) colors_common.$(OBJEXT) control.$(OBJEXT) \
- ggzclient.$(OBJEXT) goto.$(OBJEXT) helpdata.$(OBJEXT) \
- mapctrl_common.$(OBJEXT) mapview_common.$(OBJEXT) \
- messagewin_common.$(OBJEXT) overview_common.$(OBJEXT) \
- packhand.$(OBJEXT) packhand_gen.$(OBJEXT) \
- plrdlg_common.$(OBJEXT) options.$(OBJEXT) \
- repodlgs_common.$(OBJEXT) reqtree.$(OBJEXT) servers.$(OBJEXT) \
- text.$(OBJEXT) themes_common.$(OBJEXT) tilespec.$(OBJEXT) \
- audio.$(OBJEXT) audio_none.$(OBJEXT)
-civclient_OBJECTS = $(am_civclient_OBJECTS)
-
-DEFS = @DEFS@
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-depcomp = $(SHELL) $(top_srcdir)/bootstrap/depcomp
-am__depfiles_maybe = depfiles
- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/attribute.Po ./$(DEPDIR)/audio.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/audio_none.Po ./$(DEPDIR)/audio_sdl.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/chatline_common.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/citydlg_common.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/cityrepdata.Po ./$(DEPDIR)/civclient.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/climap.Po ./$(DEPDIR)/climisc.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/clinet.Po ./$(DEPDIR)/colors_common.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/connectdlg_common.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/control.Po ./$(DEPDIR)/ggzclient.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/goto.Po ./$(DEPDIR)/helpdata.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/mapctrl_common.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/mapview_common.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/messagewin_common.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/options.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/overview_common.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/packhand.Po ./$(DEPDIR)/packhand_gen.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/plrdlg_common.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/repodlgs_common.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/reqtree.Po ./$(DEPDIR)/servers.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/text.Po ./$(DEPDIR)/themes_common.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/tilespec.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-CFLAGS = @CFLAGS@
-DIST_SOURCES = $(civclient_SOURCES)
-DATA = $(desktopfile_DATA)
-
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
- uninstall-info-recursive all-recursive install-data-recursive \
- install-exec-recursive installdirs-recursive install-recursive \
- uninstall-recursive check-recursive installcheck-recursive
-DIST_COMMON = Makefile.am Makefile.in
-DIST_SUBDIRS = gui-win32 gui-gtk-2.0 gui-stub gui-xaw gui-ftwl gui-sdl \
- include agents
-SOURCES = $(civclient_SOURCES)
-
all: all-recursive
.SUFFIXES:
.SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu client/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu client/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu client/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
freeciv.desktop: $(top_builddir)/config.status $(top_srcdir)/bootstrap/freeciv.desktop.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(bindir)
- @list='$(bin_PROGRAMS)'; for p in $$list; do \
- p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
- if test -f $$p \
- ; then \
- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
- $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \
- else :; fi; \
- done
+ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p; \
+ then echo "$$p"; echo "$$p"; else :; fi; \
+ done | \
+ sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+ sed 'N;N;N;s,\n, ,g' | \
+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+ if ($$2 == $$4) files[d] = files[d] " " $$1; \
+ else { print "f", $$3 "/" $$4, $$1; } } \
+ END { for (d in files) print "f", d, files[d] }' | \
+ while read type dir files; do \
+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+ test -z "$$files" || { \
+ echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+ $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+ } \
+ ; done
uninstall-binPROGRAMS:
@$(NORMAL_UNINSTALL)
- @list='$(bin_PROGRAMS)'; for p in $$list; do \
- f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
- rm -f $(DESTDIR)$(bindir)/$$f; \
- done
+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ files=`for p in $$list; do echo "$$p"; done | \
+ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+ -e 's/$$/$(EXEEXT)/' `; \
+ test -n "$$list" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(bindir)" && rm -f $$files
clean-binPROGRAMS:
-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
civclient$(EXEEXT): $(civclient_OBJECTS) $(civclient_DEPENDENCIES)
@rm -f civclient$(EXEEXT)
- $(LINK) $(civclient_LDFLAGS) $(civclient_OBJECTS) $(civclient_LDADD) $(LIBS)
+ $(civclient_LINK) $(civclient_OBJECTS) $(civclient_LDADD) $(LIBS)
mostlyclean-compile:
- -rm -f *.$(OBJEXT) core *.core
+ -rm -f *.$(OBJEXT)
distclean-compile:
-rm -f *.tab.c
@@ -430,41 +578,41 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/text.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/themes_common.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tilespec.Po at am__quote@
-
-distclean-depend:
- -rm -rf ./$(DEPDIR)
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/voteinfo.Po at am__quote@
.c.o:
- at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
- at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- $(COMPILE) -c `cygpath -w $<`
-CCDEPMODE = @CCDEPMODE@
-uninstall-info-am:
-desktopfileDATA_INSTALL = $(INSTALL_DATA)
+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
install-desktopfileDATA: $(desktopfile_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(desktopfiledir)
- @list='$(desktopfile_DATA)'; for p in $$list; do \
+ test -z "$(desktopfiledir)" || $(MKDIR_P) "$(DESTDIR)$(desktopfiledir)"
+ @list='$(desktopfile_DATA)'; test -n "$(desktopfiledir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(desktopfileDATA_INSTALL) $$d$$p $(DESTDIR)$(desktopfiledir)/$$f"; \
- $(desktopfileDATA_INSTALL) $$d$$p $(DESTDIR)$(desktopfiledir)/$$f; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(desktopfiledir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(desktopfiledir)" || exit $$?; \
done
uninstall-desktopfileDATA:
@$(NORMAL_UNINSTALL)
- @list='$(desktopfile_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(desktopfiledir)/$$f"; \
- rm -f $(DESTDIR)$(desktopfiledir)/$$f; \
- done
+ @list='$(desktopfile_DATA)'; test -n "$(desktopfiledir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(desktopfiledir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(desktopfiledir)" && rm -f $$files
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
@@ -473,7 +621,13 @@ uninstall-desktopfileDATA:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @set fnord $$MAKEFLAGS; amf=$$2; \
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -484,16 +638,21 @@ $(RECURSIVE_TARGETS):
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
- @set fnord $$MAKEFLAGS; amf=$$2; \
+$(RECURSIVE_CLEAN_TARGETS):
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -513,89 +672,137 @@ maintainer-clean-recursive:
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+ctags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
-
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ empty_fix=.; \
+ else \
+ include_option=--include; \
+ empty_fix=; \
+ fi; \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+ test ! -f $$subdir/TAGS || \
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d $(distdir)/$$subdir \
- || mkdir $(distdir)/$$subdir \
+ test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
- (cd $$subdir && \
+ fi; \
+ done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+ dir1=$$subdir; dir2="$(top_distdir)"; \
+ $(am__relativize); \
+ new_top_distdir=$$reldir; \
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+ ($(am__cd) $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$(top_distdir)" \
- distdir=../$(distdir)/$$subdir \
+ top_distdir="$$new_top_distdir" \
+ distdir="$$new_distdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
+ am__skip_mode_fix=: \
distdir) \
|| exit 1; \
fi; \
@@ -605,8 +812,9 @@ check: check-recursive
all-am: Makefile $(PROGRAMS) $(DATA)
installdirs: installdirs-recursive
installdirs-am:
- $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(desktopfiledir)
-
+ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopfiledir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
@@ -618,7 +826,7 @@ install-am: all-am
installcheck: installcheck-recursive
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -626,7 +834,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -636,58 +845,89 @@ clean: clean-recursive
clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
distclean: distclean-recursive
-
-distclean-am: clean-am distclean-compile distclean-depend \
- distclean-generic distclean-tags
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-tags
dvi: dvi-recursive
dvi-am:
+html: html-recursive
+
+html-am:
+
info: info-recursive
info-am:
install-data-am: install-desktopfileDATA
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
install-exec-am: install-binPROGRAMS
+install-html: install-html-recursive
+
+install-html-am:
+
install-info: install-info-recursive
+install-info-am:
+
install-man:
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-recursive
mostlyclean-am: mostlyclean-compile mostlyclean-generic
-uninstall-am: uninstall-binPROGRAMS uninstall-desktopfileDATA \
- uninstall-info-am
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
-uninstall-info: uninstall-info-recursive
+ps-am:
-.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
- clean-binPROGRAMS clean-generic clean-recursive distclean \
- distclean-compile distclean-depend distclean-generic \
- distclean-recursive distclean-tags distdir dvi dvi-am \
- dvi-recursive info info-am info-recursive install install-am \
+uninstall-am: uninstall-binPROGRAMS uninstall-desktopfileDATA
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+ install-am install-strip tags-recursive
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am check check-am clean clean-binPROGRAMS \
+ clean-generic ctags ctags-recursive distclean \
+ distclean-compile distclean-generic distclean-tags distdir dvi \
+ dvi-am html html-am info info-am install install-am \
install-binPROGRAMS install-data install-data-am \
- install-data-recursive install-desktopfileDATA install-exec \
- install-exec-am install-exec-recursive install-info \
- install-info-am install-info-recursive install-man \
- install-recursive install-strip installcheck installcheck-am \
- installdirs installdirs-am installdirs-recursive \
- maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-recursive tags tags-recursive \
- uninstall uninstall-am uninstall-binPROGRAMS \
- uninstall-desktopfileDATA uninstall-info-am \
- uninstall-info-recursive uninstall-recursive
+ install-desktopfileDATA install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs installdirs-am \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
+ tags tags-recursive uninstall uninstall-am \
+ uninstall-binPROGRAMS uninstall-desktopfileDATA
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/client/agents/Makefile.in b/client/agents/Makefile.in
index aa7ac83..bb31848 100644
--- a/client/agents/Makefile.in
+++ b/client/agents/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,84 +14,113 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = client/agents
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+libagents_a_AR = $(AR) $(ARFLAGS)
+libagents_a_LIBADD =
+am_libagents_a_OBJECTS = agents.$(OBJEXT) cma_core.$(OBJEXT) \
+ cma_fec.$(OBJEXT) sha.$(OBJEXT)
+libagents_a_OBJECTS = $(am_libagents_a_OBJECTS)
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/bootstrap/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libagents_a_SOURCES)
+DIST_SOURCES = $(libagents_a_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -101,10 +131,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -112,27 +146,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -140,6 +186,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -150,17 +198,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -173,16 +242,39 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
noinst_LIBRARIES = libagents.a
-
AM_CPPFLAGS = -I. -I$(srcdir)/.. -I$(top_srcdir)/common/aicore -I$(srcdir)/../include -I$(top_srcdir)/utility -I$(top_srcdir)/common -I../../intl -I$(srcdir)/../gui-gtk $(CLIENT_CFLAGS)
-
libagents_a_SOURCES = \
agents.c \
agents.h \
@@ -193,44 +285,40 @@ libagents_a_SOURCES = \
sha.c \
sha.h
-subdir = client/agents
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-libagents_a_AR = $(AR) cru
-libagents_a_LIBADD =
-am_libagents_a_OBJECTS = agents.$(OBJEXT) cma_core.$(OBJEXT) \
- cma_fec.$(OBJEXT) sha.$(OBJEXT)
-libagents_a_OBJECTS = $(am_libagents_a_OBJECTS)
-
-DEFS = @DEFS@
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-depcomp = $(SHELL) $(top_srcdir)/bootstrap/depcomp
-am__depfiles_maybe = depfiles
- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/agents.Po ./$(DEPDIR)/cma_core.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/cma_fec.Po ./$(DEPDIR)/sha.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-CFLAGS = @CFLAGS@
-DIST_SOURCES = $(libagents_a_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(libagents_a_SOURCES)
-
all: all-am
.SUFFIXES:
.SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu client/agents/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu client/agents/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu client/agents/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
clean-noinstLIBRARIES:
-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
@@ -240,7 +328,7 @@ libagents.a: $(libagents_a_OBJECTS) $(libagents_a_DEPENDENCIES)
$(RANLIB) libagents.a
mostlyclean-compile:
- -rm -f *.$(OBJEXT) core *.core
+ -rm -f *.$(OBJEXT)
distclean-compile:
-rm -f *.tab.c
@@ -250,90 +338,106 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/cma_fec.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/sha.Po at am__quote@
-distclean-depend:
- -rm -rf ./$(DEPDIR)
-
.c.o:
- at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
- at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- $(COMPILE) -c `cygpath -w $<`
-CCDEPMODE = @CCDEPMODE@
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: CTAGS
+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(LIBRARIES)
-
installdirs:
-
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -345,7 +449,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -353,7 +457,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -363,48 +468,85 @@ clean: clean-am
clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
distclean: distclean-am
-
-distclean-am: clean-am distclean-compile distclean-depend \
- distclean-generic distclean-tags
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-tags
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am:
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-compile mostlyclean-generic
-uninstall-am: uninstall-info-am
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
-.PHONY: GTAGS all all-am check check-am clean clean-generic \
- clean-noinstLIBRARIES distclean distclean-compile \
- distclean-depend distclean-generic distclean-tags distdir dvi \
- dvi-am info info-am install install-am install-data \
- install-data-am install-exec install-exec-am install-info \
- install-info-am install-man install-strip installcheck \
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ clean-noinstLIBRARIES ctags distclean distclean-compile \
+ distclean-generic distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic tags uninstall uninstall-am \
- uninstall-info-am
+ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+ uninstall-am
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/client/agents/agents.c b/client/agents/agents.c
index cc79e8d..d6154f5 100644
--- a/client/agents/agents.c
+++ b/client/agents/agents.c
@@ -85,6 +85,10 @@ static bool currently_running = FALSE;
static bool calls_are_equal(const struct call *pcall1,
const struct call *pcall2)
{
+ if (pcall1->agent != pcall2->agent) {
+ return FALSE;
+ }
+
if (pcall1->type != pcall2->type && pcall1->cb_type != pcall2->cb_type) {
return FALSE;
}
@@ -112,7 +116,8 @@ static void enqueue_call(struct my_agent *agent,
{
va_list ap;
struct call *pcall2;
- int x, y, arg = 0;
+ int arg = 0;
+ const struct tile *ptile;
va_start(ap, cb_type);
@@ -126,9 +131,8 @@ static void enqueue_call(struct my_agent *agent,
arg = va_arg(ap, int);
break;
case OCT_TILE:
- x = va_arg(ap, int);
- y = va_arg(ap, int);
- arg = map_pos_to_index(x, y);
+ ptile = va_arg(ap, const struct tile *);
+ arg = ptile->index;
break;
case OCT_NEW_TURN:
/* nothing */
diff --git a/client/attribute.c b/client/attribute.c
index 7312d12..8e2d139 100644
--- a/client/attribute.c
+++ b/client/attribute.c
@@ -17,14 +17,19 @@
#include <assert.h>
+/* utility */
#include "dataio.h"
#include "fcintl.h"
-#include "game.h"
#include "hash.h"
#include "log.h"
#include "mem.h"
+
+/* common */
+#include "game.h"
#include "packets.h"
+/* client */
+#include "civclient.h"
#include "clinet.h"
#include "attribute.h"
@@ -323,7 +328,7 @@ void attribute_flush(void)
{
struct player *pplayer = game.player_ptr;
- if (!pplayer) {
+ if (!pplayer || client_is_observer() || !pplayer->is_alive) {
return;
}
diff --git a/client/citydlg_common.c b/client/citydlg_common.c
index f94851d..202a798 100644
--- a/client/citydlg_common.c
+++ b/client/citydlg_common.c
@@ -406,18 +406,21 @@ void get_city_dialog_output_text(const struct city *pcity,
int i;
for (i = 0; i < NUM_TRADEROUTES; i++) {
- if (pcity->trade[i] != 0 && pcity->trade_value[i] != 0) {
- /* There have been bugs causing the trade city to not be sent
- * properly to the client. If this happens we trust the
- * trade_value[] array and simply don't give the name of the
- * city. */
- struct city *trade_city = game_find_city_by_number(pcity->trade[i]);
- /* TRANS: "unknown" location */
- const char *name = trade_city ? city_name(trade_city) : _("(unknown)");
-
- cat_snprintf(buf, bufsz, _("%+4d : Trade route with %s\n"),
- pcity->trade_value[i], name);
- total += pcity->trade_value[i];
+ if (pcity->trade[i] != 0) {
+ /* There have been bugs causing the trade city to not be sent
+ * properly to the client. If this happens we trust the
+ * trade_value[] array and simply don't give the name of the
+ * city.
+ *
+ * NB: ()pcity->trade_value[i] == 0) is valid case. The traderoute
+ * is established but doesn't give trade surplus. */
+ struct city *trade_city = game_find_city_by_number(pcity->trade[i]);
+ /* TRANS: "unknown" location */
+ const char *name = trade_city ? city_name(trade_city) : _("(unknown)");
+
+ cat_snprintf(buf, bufsz, _("%+4d : Trade route with %s\n"),
+ pcity->trade_value[i], name);
+ total += pcity->trade_value[i];
}
}
} else if (otype == O_GOLD) {
@@ -613,7 +616,7 @@ int city_set_worklist(struct city *pcity, struct worklist *pworklist)
{
struct worklist copy;
- copy_worklist(©, pworklist);
+ worklist_copy(©, pworklist);
/* Don't send the worklist name to the server. */
copy.name[0] = '\0';
@@ -704,7 +707,7 @@ bool city_queue_insert(struct city *pcity, int position,
**************************************************************************/
bool city_queue_clear(struct city *pcity)
{
- init_worklist(&pcity->worklist);
+ worklist_init(&pcity->worklist);
return TRUE;
}
@@ -746,7 +749,7 @@ bool city_queue_insert_worklist(struct city *pcity, int position,
**************************************************************************/
void city_get_queue(struct city *pcity, struct worklist *pqueue)
{
- copy_worklist(pqueue, &pcity->worklist);
+ worklist_copy(pqueue, &pcity->worklist);
/* The GUI wants current production to be in the task list, but the
worklist API wants it out for reasons unknown. Perhaps someone enjoyed
@@ -766,7 +769,7 @@ bool city_set_queue(struct city *pcity, struct worklist *pqueue)
struct worklist copy;
struct city_production target;
- copy_worklist(©, pqueue);
+ worklist_copy(©, pqueue);
/* The GUI wants current production to be in the task list, but the
worklist API wants it out for reasons unknown. Perhaps someone enjoyed
diff --git a/client/civclient.c b/client/civclient.c
index f56ab3d..7f438f4 100644
--- a/client/civclient.c
+++ b/client/civclient.c
@@ -75,6 +75,7 @@
#include "servers.h"
#include "tilespec.h"
#include "themes_common.h"
+#include "voteinfo.h"
#include "civclient.h"
@@ -370,6 +371,7 @@ int main(int argc, char *argv[])
init_player_dlg_common();
init_themes();
settable_options_init();
+ voteinfo_queue_init();
load_general_options();
@@ -386,7 +388,7 @@ int main(int argc, char *argv[])
sz_strlcpy(user_name, default_user_name);
if (metaserver[0] == '\0') {
/* FIXME: Find a cleaner way to achieve this. */
- const char *oldaddr = "http://meta.freeciv.org/metaserver.phtml";
+ const char *oldaddr = "http://www.cazfi.net/freeciv/metaserver/";
if (0 == strcmp(default_metaserver, oldaddr)) {
freelog(LOG_NORMAL, _("Updating old metaserver address \"%s\"."),
oldaddr);
@@ -439,11 +441,15 @@ void client_exit(void)
chatline_common_done();
message_options_free();
+ voteinfo_queue_free();
client_game_free();
helpdata_done(); /* client_exit() unlinks help text list */
conn_list_free(game.all_connections);
conn_list_free(game.est_connections);
+
+ free_nls();
+
exit(EXIT_SUCCESS);
}
@@ -515,22 +521,6 @@ void set_client_state(enum client_states newstate)
&& (C_S_PREPARING == newstate);
enum client_states oldstate = civclient_state;
- if (C_S_OVER == newstate) {
- /*
- * Extra kludge for end-game handling of the CMA.
- */
- if (game.player_ptr) {
- city_list_iterate(game.player_ptr->cities, pcity) {
- if (cma_is_city_under_agent(pcity, NULL)) {
- cma_release_city(pcity);
- }
- } city_list_iterate_end;
- }
- popdown_all_city_dialogs();
- popdown_all_game_dialogs();
- set_unit_focus(NULL);
- }
-
if (civclient_state != newstate) {
/* If changing from pre-game state to _either_ select race
@@ -540,7 +530,7 @@ void set_client_state(enum client_states newstate)
&& C_S_RUNNING == newstate) {
audio_stop(); /* stop intro sound loop */
}
-
+
civclient_state = newstate;
switch (civclient_state) {
@@ -559,6 +549,34 @@ void set_client_state(enum client_states newstate)
can_slide = TRUE;
set_client_page(PAGE_GAME);
break;
+ case C_S_OVER:
+ if (C_S_RUNNING == oldstate) {
+ /*
+ * Extra kludge for end-game handling of the CMA.
+ */
+ if (game.player_ptr) {
+ city_list_iterate(game.player_ptr->cities, pcity) {
+ if (cma_is_city_under_agent(pcity, NULL)) {
+ cma_release_city(pcity);
+ }
+ } city_list_iterate_end;
+ }
+ popdown_all_city_dialogs();
+ popdown_all_game_dialogs();
+ set_unit_focus(NULL);
+ } else {
+ init_city_report_game_data();
+ precalc_tech_data();
+ if (game.player_ptr) {
+ update_research(game.player_ptr);
+ }
+ role_unit_precalcs();
+ boot_help_texts(); /* reboot */
+ set_unit_focus(NULL);
+ set_client_page(PAGE_GAME);
+ center_on_something();
+ }
+ break;
case C_S_PREPARING:
popdown_all_city_dialogs();
close_all_diplomacy_dialogs();
@@ -709,6 +727,8 @@ double real_timer_callback(void)
{
double time_until_next_call = 1.0;
+ voteinfo_queue_check_removed();
+
{
double autoconnect_time = try_to_autoconnect();
time_until_next_call = MIN(time_until_next_call, autoconnect_time);
diff --git a/client/clinet.c b/client/clinet.c
index 02324e4..636923e 100644
--- a/client/clinet.c
+++ b/client/clinet.c
@@ -375,6 +375,8 @@ void input_from_server(int fd)
if (read_from_connection(&aconnection, FALSE) >= 0) {
enum packet_type type;
+ reports_freeze();
+ agents_freeze_hint();
while (TRUE) {
bool result;
void *packet = get_packet_from_connection(&aconnection,
@@ -389,6 +391,8 @@ void input_from_server(int fd)
break;
}
}
+ agents_thaw_hint();
+ reports_thaw();
} else {
close_socket_callback(&aconnection);
}
diff --git a/client/connectdlg_common.c b/client/connectdlg_common.c
index 9f26b6e..62e6b0c 100644
--- a/client/connectdlg_common.c
+++ b/client/connectdlg_common.c
@@ -68,7 +68,6 @@ static pid_t server_pid = - 1;
#endif
char leader_name[MAX_LEN_NAME];
-char *current_filename = NULL;
static char challenge_fullname[MAX_LEN_PATH];
static bool client_has_hack = FALSE;
diff --git a/client/connectdlg_common.h b/client/connectdlg_common.h
index 79ff82d..d436ad0 100644
--- a/client/connectdlg_common.h
+++ b/client/connectdlg_common.h
@@ -32,7 +32,6 @@ void send_save_game(char *filename);
void set_ruleset(const char *ruleset);
extern char leader_name[MAX_LEN_NAME];
-extern char *current_filename;
enum skill_levels {
NOVICE,
diff --git a/client/control.c b/client/control.c
index 17e2073..fabae28 100644
--- a/client/control.c
+++ b/client/control.c
@@ -1111,17 +1111,17 @@ void request_unit_connect(enum unit_activity activity)
}
/**************************************************************************
-...
+ Returns one of the unit of the transporter which can have focus next.
**************************************************************************/
-void request_unit_unload_all(struct unit *punit)
+struct unit *request_unit_unload_all(struct unit *punit)
{
struct tile *ptile = punit->tile;
struct unit *plast = NULL;
- if(get_transporter_capacity(punit) == 0) {
+ if (get_transporter_capacity(punit) == 0) {
create_event(punit->tile, E_BAD_COMMAND,
_("Only transporter units can be unloaded."));
- return;
+ return NULL;
}
unit_list_iterate(ptile->units, pcargo) {
@@ -1138,15 +1138,7 @@ void request_unit_unload_all(struct unit *punit)
}
} unit_list_iterate_end;
-
- if (plast) {
- /* Unfocus the ship, and advance the focus to the last unloaded unit.
- * If there is no unit unloaded (which shouldn't happen, but could if
- * the caller doesn't check if the transporter is loaded), the we
- * don't do anything. */
- punit->focus_status = FOCUS_WAIT;
- set_unit_focus(plast);
- }
+ return plast;
}
/**************************************************************************
@@ -1462,9 +1454,12 @@ void request_unit_unload(struct unit *pcargo)
&& can_unit_survive_at_tile(pcargo, pcargo->tile)) {
dsend_packet_unit_unload(&aconnection, pcargo->id, ptrans->id);
- /* Activate the unit. */
- dsend_packet_unit_change_activity(&aconnection, pcargo->id,
- ACTIVITY_IDLE, S_LAST);
+ if (unit_owner(pcargo) == game.player_ptr
+ && pcargo->activity != ACTIVITY_IDLE) {
+ /* Activate the unit. */
+ dsend_packet_unit_change_activity(&aconnection, pcargo->id,
+ ACTIVITY_IDLE, S_LAST);
+ }
}
}
@@ -2468,9 +2463,24 @@ void key_unit_traderoute(void)
**************************************************************************/
void key_unit_unload_all(void)
{
+ struct unit *pnext_focus = NULL, *plast;
+
unit_list_iterate(get_units_in_focus(), punit) {
- request_unit_unload_all(punit);
+ if ((plast = request_unit_unload_all(punit))) {
+ pnext_focus = plast;
+ }
} unit_list_iterate_end;
+
+ if (pnext_focus) {
+ unit_list_iterate(get_units_in_focus(), punit) {
+ /* Unfocus the ships, and advance the focus to the last unloaded unit.
+ * If there is no unit unloaded (which shouldn't happen, but could if
+ * the caller doesn't check if the transporter is loaded), the we
+ * don't do anything. */
+ punit->focus_status = FOCUS_WAIT;
+ } unit_list_iterate_end;
+ set_unit_focus(pnext_focus);
+ }
}
/**************************************************************************
diff --git a/client/control.h b/client/control.h
index bb996ec..13aac87 100644
--- a/client/control.h
+++ b/client/control.h
@@ -90,7 +90,7 @@ void request_unit_paradrop(struct unit_list *punits);
void request_unit_patrol(void);
void request_unit_pillage(struct unit *punit);
void request_unit_sentry(struct unit *punit);
-void request_unit_unload_all(struct unit *punit);
+struct unit *request_unit_unload_all(struct unit *punit);
void request_unit_airlift(struct unit *punit, struct city *pcity);
void request_unit_return(struct unit *punit);
void request_unit_upgrade(struct unit *punit);
diff --git a/client/ggzclient.c b/client/ggzclient.c
index e3e6c0f..4668b91 100644
--- a/client/ggzclient.c
+++ b/client/ggzclient.c
@@ -55,7 +55,7 @@ void ggz_initialize(void)
user_username(buf, sizeof(buf));
cat_snprintf(buf, sizeof(buf), "%d", myrand(100));
- ggz_embed_ensure_server("Pubserver", "pubserver.freeciv.org",
+ ggz_embed_ensure_server("Pubserver", "freeciv.ggzgamingzone.org",
5688, buf);
}
#endif
diff --git a/client/goto.c b/client/goto.c
index 8115325..2f0f77a 100644
--- a/client/goto.c
+++ b/client/goto.c
@@ -389,7 +389,7 @@ bool goto_pop_waypoint(void)
all shortest paths).
***********************************************************************/
static int get_EC(const struct tile *ptile, enum known_type known,
- struct pf_parameter *param)
+ const struct pf_parameter *param)
{
return 1;
}
@@ -399,8 +399,8 @@ static int get_EC(const struct tile *ptile, enum known_type known,
don't plan our route through enemy city/tile.
***********************************************************************/
static enum tile_behavior get_TB_aggr(const struct tile *ptile,
- enum known_type known,
- struct pf_parameter *param)
+ enum known_type known,
+ const struct pf_parameter *param)
{
if (known == TILE_UNKNOWN) {
if (!goto_into_unknown) {
@@ -419,8 +419,8 @@ static enum tile_behavior get_TB_aggr(const struct tile *ptile,
don't attack enemy units but enter enemy cities.
***********************************************************************/
static enum tile_behavior get_TB_caravan(const struct tile *ptile,
- enum known_type known,
- struct pf_parameter *param)
+ enum known_type known,
+ const struct pf_parameter *param)
{
if (known == TILE_UNKNOWN) {
if (!goto_into_unknown) {
@@ -520,10 +520,10 @@ static bool is_non_allied_city_adjacent(struct player *pplayer,
get_activity_rate(punit) / ACTIVITY_FACTOR.
****************************************************************************/
static int get_connect_road(const struct tile *src_tile, enum direction8 dir,
- const struct tile *dest_tile,
- int src_cost, int src_extra,
- int *dest_cost, int *dest_extra,
- struct pf_parameter *param)
+ const struct tile *dest_tile,
+ int src_cost, int src_extra,
+ int *dest_cost, int *dest_extra,
+ const struct pf_parameter *param)
{
int activity_time, move_cost, moves_left;
int total_cost, total_extra;
@@ -620,11 +620,11 @@ static int get_connect_road(const struct tile *src_tile, enum direction8 dir,
param->data should contain the result of get_activity_rate(punit) / 10.
****************************************************************************/
static int get_connect_irrig(const struct tile *src_tile,
- enum direction8 dir,
- const struct tile *dest_tile,
+ enum direction8 dir,
+ const struct tile *dest_tile,
int src_cost, int src_extra,
int *dest_cost, int *dest_extra,
- struct pf_parameter *param)
+ const struct pf_parameter *param)
{
int activity_time, move_cost, moves_left, total_cost;
@@ -690,9 +690,10 @@ static int get_connect_irrig(const struct tile *src_tile,
PF callback to prohibit going into the unknown (conditionally). Also
makes sure we don't plan to attack anyone.
***********************************************************************/
-static enum tile_behavior no_fights_or_unknown_goto(const struct tile *ptile,
- enum known_type known,
- struct pf_parameter *p)
+static enum tile_behavior
+no_fights_or_unknown_goto(const struct tile *ptile,
+ enum known_type known,
+ const struct pf_parameter *p)
{
if (known == TILE_UNKNOWN && goto_into_unknown) {
/* Special case allowing goto into the unknown. */
@@ -723,7 +724,7 @@ static void fill_client_goto_parameter(struct unit *punit,
} else {
parameter->get_costs = get_connect_road;
}
- parameter->is_pos_dangerous = NULL;
+ parameter->get_moves_left_req = NULL;
*connect_speed = get_activity_rate(punit) / ACTIVITY_FACTOR;
parameter->data = connect_speed;
@@ -742,7 +743,7 @@ static void fill_client_goto_parameter(struct unit *punit,
}
break;
case HOVER_NUKE:
- parameter->is_pos_dangerous = NULL; /* nuclear safety? pwah! */
+ parameter->get_moves_left_req = NULL; /* nuclear safety? pwah! */
/* FALLTHRU */
default:
*connect_initial = 0;
@@ -1056,7 +1057,9 @@ void send_patrol_route(void)
map = pf_create_map(¶meter);
return_path = pf_get_path(map, goto_map->parts[0].start_tile);
if (!return_path) {
- die("No return path found!");
+ /* Cannot make a path */
+ pf_destroy_map(map);
+ continue;
}
for (i = 0; i < goto_map->num_parts; i++) {
diff --git a/client/gui-ftwl/Makefile.in b/client/gui-ftwl/Makefile.in
index 38be274..9a9205b 100644
--- a/client/gui-ftwl/Makefile.in
+++ b/client/gui-ftwl/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,84 +14,159 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = client/gui-ftwl
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+libguiclient_a_AR = $(AR) $(ARFLAGS)
+libguiclient_a_LIBADD =
+am_libguiclient_a_OBJECTS = canvas.$(OBJEXT) chatline.$(OBJEXT) \
+ citydlg.$(OBJEXT) cityrep.$(OBJEXT) colors.$(OBJEXT) \
+ connectdlg.$(OBJEXT) dialogs.$(OBJEXT) diplodlg.$(OBJEXT) \
+ finddlg.$(OBJEXT) gotodlg.$(OBJEXT) graphics.$(OBJEXT) \
+ gui_main.$(OBJEXT) gui_text.$(OBJEXT) helpdlg.$(OBJEXT) \
+ inteldlg.$(OBJEXT) mapctrl.$(OBJEXT) mapview.$(OBJEXT) \
+ menu.$(OBJEXT) messagedlg.$(OBJEXT) messagewin.$(OBJEXT) \
+ pages.$(OBJEXT) plrdlg.$(OBJEXT) ratesdlg.$(OBJEXT) \
+ repodlgs.$(OBJEXT) spaceshipdlg.$(OBJEXT) sprite.$(OBJEXT) \
+ themes.$(OBJEXT) wldlg.$(OBJEXT) chat.$(OBJEXT)
+libguiclient_a_OBJECTS = $(am_libguiclient_a_OBJECTS)
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/bootstrap/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libguiclient_a_SOURCES)
+DIST_SOURCES = $(libguiclient_a_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+ distdir
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+ dir0=`pwd`; \
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+ sed_rest='s,^[^/]*/*,,'; \
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+ sed_butlast='s,/*[^/]*$$,,'; \
+ while test -n "$$dir1"; do \
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+ if test "$$first" != "."; then \
+ if test "$$first" = ".."; then \
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+ else \
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+ if test "$$first2" = "$$first"; then \
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+ else \
+ dir2="../$$dir2"; \
+ fi; \
+ dir0="$$dir0"/"$$first"; \
+ fi; \
+ fi; \
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+ done; \
+ reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -101,10 +177,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -112,27 +192,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -140,6 +232,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -150,17 +244,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -173,17 +288,40 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
SUBDIRS =
-
noinst_LIBRARIES = libguiclient.a
AM_CPPFLAGS = -I. -I$(top_srcdir)/utility -I$(top_srcdir)/utility/ftwl -I$(top_srcdir)/common -I$(top_srcdir)/common/aicore -I$(srcdir)/.. -I$(srcdir)/../include -I../../intl $(CLIENT_CFLAGS)
-
libguiclient_a_SOURCES = \
canvas.c \
canvas.h \
@@ -243,71 +381,40 @@ libguiclient_a_SOURCES = \
chat.c \
chat.h
-subdir = client/gui-ftwl
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-libguiclient_a_AR = $(AR) cru
-libguiclient_a_LIBADD =
-am_libguiclient_a_OBJECTS = canvas.$(OBJEXT) chatline.$(OBJEXT) \
- citydlg.$(OBJEXT) cityrep.$(OBJEXT) colors.$(OBJEXT) \
- connectdlg.$(OBJEXT) dialogs.$(OBJEXT) diplodlg.$(OBJEXT) \
- finddlg.$(OBJEXT) gotodlg.$(OBJEXT) graphics.$(OBJEXT) \
- gui_main.$(OBJEXT) gui_text.$(OBJEXT) helpdlg.$(OBJEXT) \
- inteldlg.$(OBJEXT) mapctrl.$(OBJEXT) mapview.$(OBJEXT) \
- menu.$(OBJEXT) messagedlg.$(OBJEXT) messagewin.$(OBJEXT) \
- pages.$(OBJEXT) plrdlg.$(OBJEXT) ratesdlg.$(OBJEXT) \
- repodlgs.$(OBJEXT) spaceshipdlg.$(OBJEXT) sprite.$(OBJEXT) \
- themes.$(OBJEXT) wldlg.$(OBJEXT) chat.$(OBJEXT)
-libguiclient_a_OBJECTS = $(am_libguiclient_a_OBJECTS)
-
-DEFS = @DEFS@
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-depcomp = $(SHELL) $(top_srcdir)/bootstrap/depcomp
-am__depfiles_maybe = depfiles
- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/canvas.Po ./$(DEPDIR)/chat.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/chatline.Po ./$(DEPDIR)/citydlg.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/cityrep.Po ./$(DEPDIR)/colors.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/connectdlg.Po ./$(DEPDIR)/dialogs.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/diplodlg.Po ./$(DEPDIR)/finddlg.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/gotodlg.Po ./$(DEPDIR)/graphics.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/gui_main.Po ./$(DEPDIR)/gui_text.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/helpdlg.Po ./$(DEPDIR)/inteldlg.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/mapctrl.Po ./$(DEPDIR)/mapview.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/menu.Po ./$(DEPDIR)/messagedlg.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/messagewin.Po ./$(DEPDIR)/pages.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/plrdlg.Po ./$(DEPDIR)/ratesdlg.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/repodlgs.Po ./$(DEPDIR)/spaceshipdlg.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/sprite.Po ./$(DEPDIR)/themes.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/wldlg.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-CFLAGS = @CFLAGS@
-DIST_SOURCES = $(libguiclient_a_SOURCES)
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
- uninstall-info-recursive all-recursive install-data-recursive \
- install-exec-recursive installdirs-recursive install-recursive \
- uninstall-recursive check-recursive installcheck-recursive
-DIST_COMMON = Makefile.am Makefile.in
-DIST_SUBDIRS = $(SUBDIRS)
-SOURCES = $(libguiclient_a_SOURCES)
-
all: all-recursive
.SUFFIXES:
.SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu client/gui-ftwl/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu client/gui-ftwl/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu client/gui-ftwl/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
clean-noinstLIBRARIES:
-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
@@ -317,7 +424,7 @@ libguiclient.a: $(libguiclient_a_OBJECTS) $(libguiclient_a_DEPENDENCIES)
$(RANLIB) libguiclient.a
mostlyclean-compile:
- -rm -f *.$(OBJEXT) core *.core
+ -rm -f *.$(OBJEXT)
distclean-compile:
-rm -f *.tab.c
@@ -352,22 +459,19 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/themes.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/wldlg.Po at am__quote@
-distclean-depend:
- -rm -rf ./$(DEPDIR)
-
.c.o:
- at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
- at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- $(COMPILE) -c `cygpath -w $<`
-CCDEPMODE = @CCDEPMODE@
-uninstall-info-am:
+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
@@ -376,7 +480,13 @@ uninstall-info-am:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @set fnord $$MAKEFLAGS; amf=$$2; \
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -387,16 +497,21 @@ $(RECURSIVE_TARGETS):
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
- @set fnord $$MAKEFLAGS; amf=$$2; \
+$(RECURSIVE_CLEAN_TARGETS):
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -416,89 +531,137 @@ maintainer-clean-recursive:
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+ctags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
-
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ empty_fix=.; \
+ else \
+ include_option=--include; \
+ empty_fix=; \
+ fi; \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+ test ! -f $$subdir/TAGS || \
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
- list='$(SUBDIRS)'; for subdir in $$list; do \
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d $(distdir)/$$subdir \
- || mkdir $(distdir)/$$subdir \
+ test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
- (cd $$subdir && \
+ fi; \
+ done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+ dir1=$$subdir; dir2="$(top_distdir)"; \
+ $(am__relativize); \
+ new_top_distdir=$$reldir; \
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+ ($(am__cd) $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$(top_distdir)" \
- distdir=../$(distdir)/$$subdir \
+ top_distdir="$$new_top_distdir" \
+ distdir="$$new_distdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
+ am__skip_mode_fix=: \
distdir) \
|| exit 1; \
fi; \
@@ -508,7 +671,6 @@ check: check-recursive
all-am: Makefile $(LIBRARIES)
installdirs: installdirs-recursive
installdirs-am:
-
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
@@ -520,7 +682,7 @@ install-am: all-am
installcheck: installcheck-recursive
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -528,7 +690,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -538,55 +701,87 @@ clean: clean-recursive
clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
distclean: distclean-recursive
-
-distclean-am: clean-am distclean-compile distclean-depend \
- distclean-generic distclean-tags
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-tags
dvi: dvi-recursive
dvi-am:
+html: html-recursive
+
+html-am:
+
info: info-recursive
info-am:
install-data-am:
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-recursive
+
+install-html-am:
+
install-info: install-info-recursive
+install-info-am:
+
install-man:
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-recursive
mostlyclean-am: mostlyclean-compile mostlyclean-generic
-uninstall-am: uninstall-info-am
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
- clean-generic clean-noinstLIBRARIES clean-recursive distclean \
- distclean-compile distclean-depend distclean-generic \
- distclean-recursive distclean-tags distdir dvi dvi-am \
- dvi-recursive info info-am info-recursive install install-am \
- install-data install-data-am install-data-recursive \
- install-exec install-exec-am install-exec-recursive \
- install-info install-info-am install-info-recursive install-man \
- install-recursive install-strip installcheck installcheck-am \
- installdirs installdirs-am installdirs-recursive \
- maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-recursive tags tags-recursive \
- uninstall uninstall-am uninstall-info-am \
- uninstall-info-recursive uninstall-recursive
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+ install-am install-strip tags-recursive
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am check check-am clean clean-generic \
+ clean-noinstLIBRARIES ctags ctags-recursive distclean \
+ distclean-compile distclean-generic distclean-tags distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs installdirs-am \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
+ tags tags-recursive uninstall uninstall-am
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/client/gui-ftwl/pages.c b/client/gui-ftwl/pages.c
index 66d2037..03bc0b4 100644
--- a/client/gui-ftwl/pages.c
+++ b/client/gui-ftwl/pages.c
@@ -63,3 +63,12 @@ void update_start_page(void)
{
/* PORTME*/
}
+
+/****************************************************************************
+ Refresh all vote related GUI widgets. Called by the voteinfo module when
+ the client receives new vote information from the server.
+****************************************************************************/
+void voteinfo_gui_update(void)
+{
+ /* PORTME */
+}
diff --git a/client/gui-gtk-2.0/Makefile.in b/client/gui-gtk-2.0/Makefile.in
index bf31b82..f16a7e9 100644
--- a/client/gui-gtk-2.0/Makefile.in
+++ b/client/gui-gtk-2.0/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,84 +14,124 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = client/gui-gtk-2.0
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+libguiclient_a_AR = $(AR) $(ARFLAGS)
+libguiclient_a_LIBADD =
+am_libguiclient_a_OBJECTS = canvas.$(OBJEXT) caravan_dialog.$(OBJEXT) \
+ chatline.$(OBJEXT) choice_dialog.$(OBJEXT) citydlg.$(OBJEXT) \
+ cityrep.$(OBJEXT) cma_fe.$(OBJEXT) colors.$(OBJEXT) \
+ connectdlg.$(OBJEXT) dialogs.$(OBJEXT) diplodlg.$(OBJEXT) \
+ diplomat_dialog.$(OBJEXT) finddlg.$(OBJEXT) gamedlgs.$(OBJEXT) \
+ gotodlg.$(OBJEXT) graphics.$(OBJEXT) gtkpixcomm.$(OBJEXT) \
+ gui_main.$(OBJEXT) gui_stuff.$(OBJEXT) happiness.$(OBJEXT) \
+ helpdlg.$(OBJEXT) inputdlg.$(OBJEXT) inteldlg.$(OBJEXT) \
+ mapctrl.$(OBJEXT) mapview.$(OBJEXT) menu.$(OBJEXT) \
+ messagedlg.$(OBJEXT) messagewin.$(OBJEXT) pages.$(OBJEXT) \
+ plrdlg.$(OBJEXT) repodlgs.$(OBJEXT) resources.$(OBJEXT) \
+ spaceshipdlg.$(OBJEXT) sprite.$(OBJEXT) theme_dlg.$(OBJEXT) \
+ themes.$(OBJEXT) tileset_dlg.$(OBJEXT) wldlg.$(OBJEXT)
+libguiclient_a_OBJECTS = $(am_libguiclient_a_OBJECTS)
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/bootstrap/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libguiclient_a_SOURCES)
+DIST_SOURCES = $(libguiclient_a_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -101,10 +142,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -112,27 +157,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -140,6 +197,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -150,17 +209,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -173,24 +253,46 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
noinst_LIBRARIES = libguiclient.a
AM_CPPFLAGS = -I. -I$(srcdir)/.. -I$(srcdir)/../include -I$(top_srcdir)/utility -I$(top_srcdir)/common -I$(top_srcdir)/common/aicore -I../../intl -I$(srcdir)/../agents $(CLIENT_CFLAGS) $(GGZ_GTK_INCLUDES)
-
# The AM_CPPFLAGS "-I." is so resources.c includes the locally generated
# Freeciv.h in the builddir, in preference to the one
# in the source dir (when compiling from another dir). --dwp
BUILT_SOURCES = Freeciv.h
CLEANFILES = Freeciv.h
-
libguiclient_a_DEPENDENCIES = rc2c
-
libguiclient_a_SOURCES = \
rc2c \
Freeciv.h \
@@ -267,75 +369,41 @@ libguiclient_a_SOURCES = \
wldlg.c \
wldlg.h
-subdir = client/gui-gtk-2.0
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-libguiclient_a_AR = $(AR) cru
-libguiclient_a_LIBADD =
-am_libguiclient_a_OBJECTS = canvas.$(OBJEXT) caravan_dialog.$(OBJEXT) \
- chatline.$(OBJEXT) choice_dialog.$(OBJEXT) citydlg.$(OBJEXT) \
- cityrep.$(OBJEXT) cma_fe.$(OBJEXT) colors.$(OBJEXT) \
- connectdlg.$(OBJEXT) dialogs.$(OBJEXT) diplodlg.$(OBJEXT) \
- diplomat_dialog.$(OBJEXT) finddlg.$(OBJEXT) gamedlgs.$(OBJEXT) \
- gotodlg.$(OBJEXT) graphics.$(OBJEXT) gtkpixcomm.$(OBJEXT) \
- gui_main.$(OBJEXT) gui_stuff.$(OBJEXT) happiness.$(OBJEXT) \
- helpdlg.$(OBJEXT) inputdlg.$(OBJEXT) inteldlg.$(OBJEXT) \
- mapctrl.$(OBJEXT) mapview.$(OBJEXT) menu.$(OBJEXT) \
- messagedlg.$(OBJEXT) messagewin.$(OBJEXT) pages.$(OBJEXT) \
- plrdlg.$(OBJEXT) repodlgs.$(OBJEXT) resources.$(OBJEXT) \
- spaceshipdlg.$(OBJEXT) sprite.$(OBJEXT) theme_dlg.$(OBJEXT) \
- themes.$(OBJEXT) tileset_dlg.$(OBJEXT) wldlg.$(OBJEXT)
-libguiclient_a_OBJECTS = $(am_libguiclient_a_OBJECTS)
-
-DEFS = @DEFS@
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-depcomp = $(SHELL) $(top_srcdir)/bootstrap/depcomp
-am__depfiles_maybe = depfiles
- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/canvas.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/caravan_dialog.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/chatline.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/choice_dialog.Po ./$(DEPDIR)/citydlg.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/cityrep.Po ./$(DEPDIR)/cma_fe.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/colors.Po ./$(DEPDIR)/connectdlg.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/dialogs.Po ./$(DEPDIR)/diplodlg.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/diplomat_dialog.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/finddlg.Po ./$(DEPDIR)/gamedlgs.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/gotodlg.Po ./$(DEPDIR)/graphics.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/gtkpixcomm.Po ./$(DEPDIR)/gui_main.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/gui_stuff.Po ./$(DEPDIR)/happiness.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/helpdlg.Po ./$(DEPDIR)/inputdlg.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/inteldlg.Po ./$(DEPDIR)/mapctrl.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/mapview.Po ./$(DEPDIR)/menu.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/messagedlg.Po ./$(DEPDIR)/messagewin.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/pages.Po ./$(DEPDIR)/plrdlg.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/repodlgs.Po ./$(DEPDIR)/resources.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/spaceshipdlg.Po ./$(DEPDIR)/sprite.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/theme_dlg.Po ./$(DEPDIR)/themes.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/tileset_dlg.Po ./$(DEPDIR)/wldlg.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-CFLAGS = @CFLAGS@
-DIST_SOURCES = $(libguiclient_a_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(libguiclient_a_SOURCES)
-
all: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) all-am
.SUFFIXES:
.SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu client/gui-gtk-2.0/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu client/gui-gtk-2.0/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu client/gui-gtk-2.0/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
clean-noinstLIBRARIES:
-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
@@ -345,7 +413,7 @@ libguiclient.a: $(libguiclient_a_OBJECTS) $(libguiclient_a_DEPENDENCIES)
$(RANLIB) libguiclient.a
mostlyclean-compile:
- -rm -f *.$(OBJEXT) core *.core
+ -rm -f *.$(OBJEXT)
distclean-compile:
-rm -f *.tab.c
@@ -389,91 +457,109 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tileset_dlg.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/wldlg.Po at am__quote@
-distclean-depend:
- -rm -rf ./$(DEPDIR)
-
.c.o:
- at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
- at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- $(COMPILE) -c `cygpath -w $<`
-CCDEPMODE = @CCDEPMODE@
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: CTAGS
+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
-check: check-am
+check: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) check-am
all-am: Makefile $(LIBRARIES)
-
installdirs:
-
-install: install-am
+install: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) install-am
install-exec: install-exec-am
install-data: install-data-am
uninstall: uninstall-am
@@ -484,7 +570,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -493,7 +579,8 @@ clean-generic:
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -504,48 +591,84 @@ clean: clean-am
clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
distclean: distclean-am
-
-distclean-am: clean-am distclean-compile distclean-depend \
- distclean-generic distclean-tags
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-tags
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am:
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-compile mostlyclean-generic
-uninstall-am: uninstall-info-am
+pdf: pdf-am
+
+pdf-am:
-.PHONY: GTAGS all all-am check check-am clean clean-generic \
- clean-noinstLIBRARIES distclean distclean-compile \
- distclean-depend distclean-generic distclean-tags distdir dvi \
- dvi-am info info-am install install-am install-data \
- install-data-am install-exec install-exec-am install-info \
- install-info-am install-man install-strip installcheck \
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: all check install install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ clean-noinstLIBRARIES ctags distclean distclean-compile \
+ distclean-generic distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic tags uninstall uninstall-am \
- uninstall-info-am
+ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+ uninstall-am
Freeciv.h: $(top_srcdir)/data/freeciv.rc-2.0
@@ -553,6 +676,7 @@ Freeciv.h: $(top_srcdir)/data/freeciv.rc-2.0
echo '/* DO NOT EDIT THIS FILE, EDIT ../../data/freeciv.rc-2.0 */' >> Freeciv.h
echo '/*********************************************************/' >> Freeciv.h
$(srcdir)/rc2c $(top_srcdir)/data/freeciv.rc-2.0 >> Freeciv.h
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/client/gui-gtk-2.0/cityrep.c b/client/gui-gtk-2.0/cityrep.c
index c04c090..58201ad 100644
--- a/client/gui-gtk-2.0/cityrep.c
+++ b/client/gui-gtk-2.0/cityrep.c
@@ -1921,7 +1921,7 @@ static void clear_worklist_foreach_func(GtkTreeModel *model,
gtk_tree_model_get(model, it, 0, &pcity, -1);
if (pcity && game_find_city_by_number(pcity->id)) {
struct worklist empty;
- init_worklist(&empty);
+ worklist_init(&empty);
city_set_worklist(pcity, &empty);
}
}
diff --git a/client/gui-gtk-2.0/dialogs.c b/client/gui-gtk-2.0/dialogs.c
index a4efb61..0f78848 100644
--- a/client/gui-gtk-2.0/dialogs.c
+++ b/client/gui-gtk-2.0/dialogs.c
@@ -60,7 +60,7 @@
/******************************************************************/
static GtkWidget *races_shell;
-struct player *races_player;
+static char races_player_name[MAX_LEN_NAME];
static GtkWidget *races_nation_list[MAX_NUM_NATION_GROUPS + 1];
static GtkWidget *races_leader;
static GList *races_leader_list;
@@ -88,6 +88,7 @@ static void races_city_style_callback(GtkTreeSelection *select, gpointer data);
static gboolean races_selection_func(GtkTreeSelection *select,
GtkTreeModel *model, GtkTreePath *path,
gboolean selected, gpointer data);
+static const struct player *get_races_player(void);
static int selected_nation;
static int selected_sex;
@@ -625,6 +626,7 @@ static GtkWidget* create_list_of_nations_in_group(struct nation_group* group,
GtkTreeSelection *select;
GtkCellRenderer *render;
GtkTreeViewColumn *column;
+ const struct player *races_player = get_races_player();
store = gtk_list_store_new(5, G_TYPE_INT, G_TYPE_BOOLEAN,
GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING);
@@ -777,7 +779,11 @@ static void create_races_dialog(struct player *pplayer)
GTK_RESPONSE_ACCEPT,
NULL);
races_shell = shell;
- races_player = pplayer;
+ if (pplayer) {
+ sz_strlcpy(races_player_name, player_name(pplayer));
+ } else {
+ races_player_name[0] = '\0';
+ }
setup_dialog(shell, toplevel);
gtk_window_set_position(GTK_WINDOW(shell), GTK_WIN_POS_CENTER_ON_PARENT);
@@ -1233,13 +1239,22 @@ static void races_city_style_callback(GtkTreeSelection *select, gpointer data)
**************************************************************************/
static void races_response(GtkWidget *w, gint response, gpointer data)
{
+ const struct player *races_player;
+ int plrno;
+
+ races_player = get_races_player();
+ if (!races_player) {
+ popdown_races_dialog();
+ return;
+ }
+ plrno = player_number(races_player);
+
if (response == GTK_RESPONSE_ACCEPT) {
const char *s;
if (selected_nation == -1) {
- dsend_packet_nation_select_req(&aconnection,
- races_player->player_no,
- -1, FALSE, "", 0);
+ dsend_packet_nation_select_req(&aconnection, plrno,
+ -1, FALSE, "", 0);
popdown_races_dialog();
return;
}
@@ -1263,13 +1278,10 @@ static void races_response(GtkWidget *w, gint response, gpointer data)
return;
}
- dsend_packet_nation_select_req(&aconnection,
- player_number(races_player), selected_nation,
- selected_sex, s, selected_city_style);
+ dsend_packet_nation_select_req(&aconnection, plrno, selected_nation,
+ selected_sex, s, selected_city_style);
} else if (response == GTK_RESPONSE_NO) {
- dsend_packet_nation_select_req(&aconnection,
- player_number(races_player),
- -1, FALSE, "", 0);
+ dsend_packet_nation_select_req(&aconnection, plrno, -1, FALSE, "", 0);
} else if (response == GTK_RESPONSE_CANCEL) {
/* Nothing - this allows the player to keep his currently selected
* nation. */
@@ -1334,3 +1346,16 @@ void popdown_all_game_dialogs(void)
gui_dialog_destroy_all();
}
+/**************************************************************************
+ Helper function to work-around the fact that players may be renumbered
+ over the life-time of the nation selection dialog. It uses player names
+ ('races_player_name') to try to uniquely determine the player that the
+ user wants to modify.
+
+ NB: May return NULL.
+**************************************************************************/
+static const struct player *get_races_player(void)
+{
+ return find_player_by_name(races_player_name);
+}
+
diff --git a/client/gui-gtk-2.0/diplodlg.c b/client/gui-gtk-2.0/diplodlg.c
index 2159e63..fe17f4e 100644
--- a/client/gui-gtk-2.0/diplodlg.c
+++ b/client/gui-gtk-2.0/diplodlg.c
@@ -203,10 +203,7 @@ static void popup_diplomacy_dialog(int other_player_id, int initiated_from)
static void popup_add_menu(GtkMenuShell *parent, gpointer data)
{
struct Diplomacy_dialog *pdialog;
-
- gpointer plr;
- struct player *plr0, *plr1;
-
+ struct player *pgiver, *pother;
GtkWidget *item, *menu;
@@ -214,29 +211,23 @@ static void popup_add_menu(GtkMenuShell *parent, gpointer data)
gtk_container_foreach(GTK_CONTAINER(parent),
(GtkCallback) gtk_widget_destroy, NULL);
- pdialog = (struct Diplomacy_dialog *)data;
- plr = g_object_get_data(G_OBJECT(parent), "plr");
-
- plr0 = pdialog->treaty.plr0;
- plr1 = pdialog->treaty.plr1;
-
- if (plr == plr1) {
- plr1 = plr0;
- plr0 = plr;
- }
+ pdialog = (struct Diplomacy_dialog *) data;
+ pgiver = (struct player *) g_object_get_data(G_OBJECT(parent), "plr");
+ pother = (pgiver == pdialog->treaty.plr0
+ ? pdialog->treaty.plr1 : pdialog->treaty.plr0);
/* Maps. */
menu = gtk_menu_new();
item = gtk_menu_item_new_with_mnemonic(_("World-map"));
gtk_menu_shell_append(GTK_MENU_SHELL(menu),item);
- g_object_set_data(G_OBJECT(item), "plr", plr);
+ g_object_set_data(G_OBJECT(item), "plr", pgiver);
g_signal_connect(item, "activate",
G_CALLBACK(diplomacy_dialog_map_callback), pdialog);
item = gtk_menu_item_new_with_mnemonic(_("Sea-map"));
gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
- g_object_set_data(G_OBJECT(item), "plr", plr);
+ g_object_set_data(G_OBJECT(item), "plr", pgiver);
g_signal_connect(item, "activate",
G_CALLBACK(diplomacy_dialog_seamap_callback), pdialog);
@@ -254,18 +245,18 @@ static void popup_add_menu(GtkMenuShell *parent, gpointer data)
menu = gtk_menu_new();
for (i = 1, flag = FALSE; i < game.control.num_tech_types; i++) {
- if (get_invention(plr0, i) == TECH_KNOWN
- && (get_invention(plr1, i) == TECH_UNKNOWN
- || get_invention(plr1, i) == TECH_REACHABLE)
- && tech_is_available(plr1, i)) {
+ if (get_invention(pgiver, i) == TECH_KNOWN
+ && (get_invention(pother, i) == TECH_UNKNOWN
+ || get_invention(pother, i) == TECH_REACHABLE)
+ && tech_is_available(pother, i)) {
item
= gtk_menu_item_new_with_label(advance_name_for_player(game.player_ptr, i));
gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
g_signal_connect(item, "activate",
G_CALLBACK(diplomacy_dialog_tech_callback),
- GINT_TO_POINTER((player_number(plr0) << 24) |
- (player_number(plr1) << 16) |
+ GINT_TO_POINTER((player_number(pgiver) << 24) |
+ (player_number(pother) << 16) |
i));
flag = TRUE;
}
@@ -289,7 +280,7 @@ static void popup_add_menu(GtkMenuShell *parent, gpointer data)
- Kris Bubendorfer
*****************************************************************/
{
- int i = 0, j = 0, n = city_list_size(plr0->cities);
+ int i = 0, j = 0, n = city_list_size(pgiver->cities);
struct city **city_list_ptrs;
if (n > 0) {
@@ -298,7 +289,7 @@ static void popup_add_menu(GtkMenuShell *parent, gpointer data)
city_list_ptrs = NULL;
}
- city_list_iterate(plr0->cities, pcity) {
+ city_list_iterate(pgiver->cities, pcity) {
if (!is_capital(pcity)) {
city_list_ptrs[i] = pcity;
i++;
@@ -315,8 +306,8 @@ static void popup_add_menu(GtkMenuShell *parent, gpointer data)
gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
g_signal_connect(item, "activate",
G_CALLBACK(diplomacy_dialog_city_callback),
- GINT_TO_POINTER((player_number(plr0) << 24) |
- (player_number(plr1) << 16) |
+ GINT_TO_POINTER((player_number(pgiver) << 24) |
+ (player_number(pother) << 16) |
city_list_ptrs[j]->id));
}
free(city_list_ptrs);
@@ -331,11 +322,11 @@ static void popup_add_menu(GtkMenuShell *parent, gpointer data)
/* Give shared vision. */
item = gtk_menu_item_new_with_mnemonic(_("_Give shared vision"));
- g_object_set_data(G_OBJECT(item), "plr", plr);
+ g_object_set_data(G_OBJECT(item), "plr", pgiver);
g_signal_connect(item, "activate",
G_CALLBACK(diplomacy_dialog_vision_callback), pdialog);
- if (gives_shared_vision(plr0, plr1)) {
+ if (gives_shared_vision(pgiver, pother)) {
gtk_widget_set_sensitive(item, FALSE);
}
gtk_menu_shell_append(GTK_MENU_SHELL(parent), item);
@@ -344,11 +335,12 @@ static void popup_add_menu(GtkMenuShell *parent, gpointer data)
/* Give embassy. */
item = gtk_menu_item_new_with_mnemonic(_("Give _embassy"));
- g_object_set_data(G_OBJECT(item), "plr", plr);
+ g_object_set_data(G_OBJECT(item), "plr", pgiver);
g_signal_connect(item, "activate",
G_CALLBACK(diplomacy_dialog_embassy_callback), pdialog);
- if (player_has_embassy(plr1, plr0)) {
+ /* Don't take in account the embassy effects. */
+ if (BV_ISSET(pother->embassy, player_index(pgiver))) {
gtk_widget_set_sensitive(item, FALSE);
}
gtk_menu_shell_append(GTK_MENU_SHELL(parent), item);
@@ -356,7 +348,7 @@ static void popup_add_menu(GtkMenuShell *parent, gpointer data)
/* Pacts. */
- if (plr == pdialog->treaty.plr0) {
+ if (pgiver == pdialog->treaty.plr0) {
menu = gtk_menu_new();
item = gtk_menu_item_new_with_mnemonic(Q_("?diplomatic_state:Cease-fire"));
gtk_menu_shell_append(GTK_MENU_SHELL(menu),item);
diff --git a/client/gui-gtk-2.0/gamedlgs.c b/client/gui-gtk-2.0/gamedlgs.c
index ee97459..bc0d9d1 100644
--- a/client/gui-gtk-2.0/gamedlgs.c
+++ b/client/gui-gtk-2.0/gamedlgs.c
@@ -448,7 +448,7 @@ static void option_command_callback(GtkWidget *win, gint rid)
*****************************************************************/
static void create_option_dialog(void)
{
- GtkWidget *ebox, *label, *notebook, *align, *vbox[COC_MAX];
+ GtkWidget *ebox, *label, *notebook, *align, *vbox[COC_MAX], *sw;
int i, len[COC_MAX];
GtkSizeGroup *group[2][COC_MAX];
GtkTooltips *tips;
@@ -461,17 +461,26 @@ static void create_option_dialog(void)
GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
NULL);
setup_dialog(option_dialog_shell, toplevel);
- gtk_window_set_position (GTK_WINDOW(option_dialog_shell), GTK_WIN_POS_MOUSE);
+ gtk_window_set_position(GTK_WINDOW(option_dialog_shell),
+ GTK_WIN_POS_MOUSE);
+ gtk_window_set_default_size(GTK_WINDOW(option_dialog_shell), -1, 400);
notebook = gtk_notebook_new();
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(option_dialog_shell)->vbox),
- notebook, FALSE, FALSE, 0);
+ notebook, TRUE, TRUE, 0);
for (i = 0; i < COC_MAX; i++) {
label = gtk_label_new_with_mnemonic(_(client_option_class_names[i]));
+
+ sw = gtk_scrolled_window_new(NULL, NULL);
+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
+ GTK_POLICY_NEVER,
+ GTK_POLICY_AUTOMATIC);
+ gtk_notebook_append_page(GTK_NOTEBOOK(notebook), sw, label);
+
align = gtk_alignment_new(0.0, 0.0, 1.0, 0.0);
gtk_container_set_border_width(GTK_CONTAINER(align), 8);
- gtk_notebook_append_page(GTK_NOTEBOOK(notebook), align, label);
+ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw), align);
vbox[i] = gtk_vbox_new(TRUE, 0);
gtk_container_add(GTK_CONTAINER(align), vbox[i]);
diff --git a/client/gui-gtk-2.0/gui_main.c b/client/gui-gtk-2.0/gui_main.c
index af4b844..9797c67 100644
--- a/client/gui-gtk-2.0/gui_main.c
+++ b/client/gui-gtk-2.0/gui_main.c
@@ -75,6 +75,7 @@
#include "optiondlg.h"
#include "options.h"
#include "pages.h"
+#include "plrdlg.h"
#include "spaceshipdlg.h"
#include "resources.h"
#include "text.h"
@@ -101,6 +102,7 @@ bool new_messages_go_to_top = FALSE;
bool show_message_window_buttons = TRUE;
bool metaserver_tab_first = FALSE;
bool allied_chat_only = FALSE;
+bool small_display_layout = FALSE;
GtkWidget *toplevel;
GdkWindow *root_window;
@@ -238,7 +240,17 @@ client_option gui_options[] = {
"can also be set using a toggle button beside "
"the chat entry (only visible in multiplayer "
"games)."),
- COC_NETWORK, allied_chat_only_callback)
+ COC_NETWORK, allied_chat_only_callback),
+ GEN_BOOL_OPTION(small_display_layout,
+ N_("Arrange widgets for small displays"),
+ N_("If this option is enabled, widgets in the main "
+ "window will be arrange so that they take up the "
+ "least amount of total screen space. Specifically, "
+ "the left panel containing the overview, player "
+ "status, and the unit information box will be "
+ "extended over the entire left side of the window. "
+ "This option requires a restart in order to take "
+ "effect."), COC_INTERFACE)
};
const int num_gui_options = ARRAY_SIZE(gui_options);
@@ -893,7 +905,7 @@ static void populate_unit_pixmap_table(void)
/* Note, we ref this and other widgets here so that we can unref them
* in reset_unit_table. */
- unit_pixmap = gtk_pixcomm_new(tileset_full_tile_width(tileset), tileset_full_tile_height(tileset));
+ unit_pixmap = gtk_pixcomm_new(tileset_unit_width(tileset), tileset_unit_height(tileset));
gtk_widget_ref(unit_pixmap);
gtk_pixcomm_clear(GTK_PIXCOMM(unit_pixmap));
unit_pixmap_button = gtk_event_box_new();
@@ -905,8 +917,8 @@ static void populate_unit_pixmap_table(void)
GINT_TO_POINTER(-1));
for (i = 0; i < num_units_below; i++) {
- unit_below_pixmap[i] = gtk_pixcomm_new(tileset_full_tile_width(tileset),
- tileset_full_tile_height(tileset));
+ unit_below_pixmap[i] = gtk_pixcomm_new(tileset_unit_width(tileset),
+ tileset_unit_height(tileset));
gtk_widget_ref(unit_below_pixmap[i]);
unit_below_pixmap_button[i] = gtk_event_box_new();
gtk_widget_ref(unit_below_pixmap_button[i]);
@@ -1018,7 +1030,7 @@ static gboolean right_notebook_button_release(GtkWidget *widget,
**************************************************************************/
static void setup_widgets(void)
{
- GtkWidget *box, *ebox, *hbox, *sbox, *align, *label;
+ GtkWidget *page, *box, *ebox, *hbox, *sbox, *align, *label;
GtkWidget *frame, *table, *table2, *paned, *hpaned, *sw, *text;
GtkWidget *button;
int i;
@@ -1060,36 +1072,50 @@ static void setup_widgets(void)
main_tips = gtk_tooltips_new();
- /* the window is divided into two panes. "top" and "message window" */
+ /* *** everything in the top *** */
+
+ page = gtk_scrolled_window_new(NULL, NULL);
+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(page),
+ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(page),
+ GTK_SHADOW_ETCHED_IN);
+ gtk_notebook_append_page(GTK_NOTEBOOK(notebook), page, NULL);
+
+ top_vbox = gtk_vbox_new(FALSE, 5);
+ hbox = gtk_hbox_new(FALSE, 0);
paned = gtk_vpaned_new();
- gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
- paned, NULL);
+
+ if (small_display_layout) {
+ /* The window is divided into two horizontal panels: overview +
+ * civinfo + unitinfo, main view + message window. */
+ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(page),
+ top_vbox);
+ gtk_box_pack_end(GTK_BOX(top_vbox), hbox, TRUE, TRUE, 0);
+ gtk_box_pack_end(GTK_BOX(hbox), paned, TRUE, TRUE, 0);
+ } else {
+ /* The window is divided into two vertical panes: overview +
+ * + civinfo + unitinfo + main view, message window. */
+ gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(page), paned);
+ gtk_paned_pack1(GTK_PANED(paned), top_vbox, TRUE, FALSE);
+ gtk_box_pack_end(GTK_BOX(top_vbox), hbox, TRUE, TRUE, 0);
+ }
#ifdef GGZ_GTK
gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
ggz_gtk_create_main_area(toplevel), NULL);
#endif
- /* *** everything in the top *** */
-
- top_vbox = gtk_vbox_new(FALSE, 5);
- gtk_paned_pack1(GTK_PANED(paned), top_vbox, TRUE, FALSE);
-
- hbox = gtk_hbox_new(FALSE, 0);
- gtk_box_pack_end(GTK_BOX(top_vbox), hbox, TRUE, TRUE, 0);
-
/* this holds the overview canvas, production info, etc. */
vbox = gtk_vbox_new(FALSE, 3);
gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);
-
/* overview canvas */
ahbox = detached_widget_new();
- gtk_container_add(GTK_CONTAINER(vbox), ahbox);
+ gtk_box_pack_start(GTK_BOX(vbox), ahbox, FALSE, FALSE, 0);
avbox = detached_widget_fill(ahbox);
align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0);
- gtk_box_pack_start(GTK_BOX(avbox), align, TRUE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(avbox), align, FALSE, FALSE, 0);
overview_canvas = gtk_drawing_area_new();
@@ -1112,7 +1138,7 @@ static void setup_widgets(void)
/* The rest */
ahbox = detached_widget_new();
- gtk_container_add(GTK_CONTAINER(vbox), ahbox);
+ gtk_box_pack_start(GTK_BOX(vbox), ahbox, TRUE, TRUE, 0);
avbox = detached_widget_fill(ahbox);
/* Info on player's civilization, when game is running. */
@@ -1254,10 +1280,17 @@ static void setup_widgets(void)
unit_pixmap_table = table;
+ /* The top notebook containing the map view and dialogs. */
+
top_notebook = gtk_notebook_new();
gtk_notebook_set_tab_pos(GTK_NOTEBOOK(top_notebook), GTK_POS_BOTTOM);
gtk_notebook_set_scrollable(GTK_NOTEBOOK(top_notebook), TRUE);
- gtk_box_pack_start(GTK_BOX(hbox), top_notebook, TRUE, TRUE, 0);
+
+ if (small_display_layout) {
+ gtk_paned_pack1(GTK_PANED(paned), top_notebook, TRUE, TRUE);
+ } else {
+ gtk_box_pack_start(GTK_BOX(hbox), top_notebook, TRUE, TRUE, 0);
+ }
/* Map canvas and scrollbars */
@@ -1272,6 +1305,7 @@ static void setup_widgets(void)
GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0);
map_canvas = gtk_drawing_area_new();
+ gtk_widget_set_size_request(map_canvas, 300, 300);
GTK_WIDGET_SET_FLAGS(map_canvas, GTK_CAN_FOCUS);
for (i = 0; i < 5; i++) {
@@ -1648,7 +1682,7 @@ void ui_exit()
**************************************************************************/
void update_conn_list_dialog(void)
{
- GtkTreeIter it[player_count()];
+ GtkTreeIter iter, parent;
if (game.player_ptr) {
char *text;
@@ -1709,6 +1743,7 @@ void update_conn_list_dialog(void)
gtk_tree_store_clear(conn_model);
players_iterate(pplayer) {
+ GdkPixbuf *pixbuf = pplayer->nation ? get_flag(pplayer->nation) : NULL;
enum cmdlevel_id access_level = ALLOW_NONE;
int conn_id = -1;
@@ -1732,7 +1767,7 @@ void update_conn_list_dialog(void)
sz_strlcpy(name, _("<Hard AI>"));
break;
}
- } else if (access_level <= ALLOW_INFO) {
+ } else if (access_level <= ALLOW_BASIC) {
sz_strlcpy(name, pplayer->username);
} else {
my_snprintf(name, sizeof(name), "%s*", pplayer->username);
@@ -1782,8 +1817,8 @@ void update_conn_list_dialog(void)
}
} conn_list_iterate_end;
- gtk_tree_store_append(conn_model, &it[player_index(pplayer)], NULL);
- gtk_tree_store_set(conn_model, &it[player_index(pplayer)],
+ gtk_tree_store_append(conn_model, &iter, NULL);
+ gtk_tree_store_set(conn_model, &iter,
0, player_number(pplayer),
1, name,
2, is_ready,
@@ -1793,31 +1828,40 @@ void update_conn_list_dialog(void)
6, record_text,
7, rating_text,
8, conn_id,
+ 9, pixbuf,
-1);
+ parent = iter;
+
+ /* Insert observers of this player as child nodes. */
+ conn_list_iterate(pplayer->connections, pconn) {
+ if (pconn->id == conn_id) {
+ continue;
+ }
+ gtk_tree_store_append(conn_model, &iter, &parent);
+ gtk_tree_store_set(conn_model, &iter,
+ 0, -1,
+ 1, pconn->username,
+ 5, _("Observer"),
+ 8, pconn->id, -1);
+ } conn_list_iterate_end;
+
+ if (pixbuf) {
+ g_object_unref(pixbuf);
+ }
} players_iterate_end;
- conn_list_iterate(game.est_connections, pconn) {
- GtkTreeIter conn_it, *parent;
- if (pconn->player && !pconn->observer) {
+ /* Finally, insert global observers and detached connections. */
+ conn_list_iterate(game.est_connections, pconn) {
+ if (pconn->player != NULL) {
continue; /* Already listed above. */
}
- sz_strlcpy(name, pconn->username);
- is_ready = TRUE;
- nation = "";
- leader = "";
team = pconn->observer ? _("Observer") : _("Detached");
- parent = pconn->player ? &it[player_index(pconn->player)] : NULL;
-
- gtk_tree_store_append(conn_model, &conn_it, parent);
- gtk_tree_store_set(conn_model, &conn_it,
+ gtk_tree_store_append(conn_model, &iter, NULL);
+ gtk_tree_store_set(conn_model, &iter,
0, -1,
- 1, name,
- 2, is_ready,
- 3, leader,
- 4, nation,
+ 1, pconn->username,
5, team,
- 8, pconn->id,
- -1);
+ 8, pconn->id, -1);
} conn_list_iterate_end;
}
}
diff --git a/client/gui-gtk-2.0/gui_main.h b/client/gui-gtk-2.0/gui_main.h
index 7bc7071..7431b5f 100644
--- a/client/gui-gtk-2.0/gui_main.h
+++ b/client/gui-gtk-2.0/gui_main.h
@@ -32,6 +32,7 @@ extern bool new_messages_go_to_top;
extern bool show_message_window_buttons;
extern bool metaserver_tab_first;
extern bool allied_chat_only;
+extern bool small_display_layout;
extern GdkGC * civ_gc;
extern GdkGC * mask_fg_gc;
diff --git a/client/gui-gtk-2.0/gui_stuff.c b/client/gui-gtk-2.0/gui_stuff.c
index 8937bb0..3bdbdea 100644
--- a/client/gui-gtk-2.0/gui_stuff.c
+++ b/client/gui-gtk-2.0/gui_stuff.c
@@ -245,9 +245,13 @@ gint gtk_tree_selection_get_row(GtkTreeSelection *selection)
**************************************************************************/
void gtk_tree_view_focus(GtkTreeView *view)
{
+ GtkTreeModel *model;
GtkTreePath *path;
+ GtkTreeIter iter;
- if ((path = gtk_tree_path_new_first())) {
+ if ((model = gtk_tree_view_get_model(view))
+ && gtk_tree_model_get_iter_first(model, &iter)
+ && (path = gtk_tree_model_get_path(model, &iter))) {
gtk_tree_view_set_cursor(view, path, NULL, FALSE);
gtk_tree_path_free(path);
gtk_widget_grab_focus(GTK_WIDGET(view));
diff --git a/client/gui-gtk-2.0/messagewin.c b/client/gui-gtk-2.0/messagewin.c
index d424041..e6025b3 100644
--- a/client/gui-gtk-2.0/messagewin.c
+++ b/client/gui-gtk-2.0/messagewin.c
@@ -322,13 +322,15 @@ static void meswin_row_activated_callback(GtkTreeView *view,
gtk_tree_model_get(model, &iter, 2, &row, -1);
pmsg = get_message(row);
- meswin_double_click(row);
- meswin_set_visited(&iter, TRUE);
+ if (pmsg) {
+ meswin_double_click(row);
+ meswin_set_visited(&iter, TRUE);
- gui_dialog_set_response_sensitive(meswin_shell, CMD_GOTO,
- pmsg->location_ok);
- gui_dialog_set_response_sensitive(meswin_shell, CMD_POPCITY,
- pmsg->city_ok);
+ gui_dialog_set_response_sensitive(meswin_shell, CMD_GOTO,
+ pmsg->location_ok);
+ gui_dialog_set_response_sensitive(meswin_shell, CMD_POPCITY,
+ pmsg->city_ok);
+ }
}
/**************************************************************************
diff --git a/client/gui-gtk-2.0/pages.c b/client/gui-gtk-2.0/pages.c
index 067d03f..6453358 100644
--- a/client/gui-gtk-2.0/pages.c
+++ b/client/gui-gtk-2.0/pages.c
@@ -1562,12 +1562,12 @@ GtkWidget *create_start_page(void)
gtk_box_pack_start(GTK_BOX(vbox), align, FALSE, FALSE, 8);
- conn_model = gtk_tree_store_new(9, G_TYPE_INT,
+ conn_model = gtk_tree_store_new(10, G_TYPE_INT,
G_TYPE_STRING, G_TYPE_BOOLEAN,
G_TYPE_STRING, G_TYPE_STRING,
G_TYPE_STRING, G_TYPE_STRING,
- G_TYPE_STRING,
- G_TYPE_INT);
+ G_TYPE_STRING, G_TYPE_INT,
+ GDK_TYPE_PIXBUF);
view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(conn_model));
g_object_unref(conn_model);
@@ -1591,9 +1591,8 @@ GtkWidget *create_start_page(void)
/* FIXME: should change to always be minimum-width. */
rend = gtk_cell_renderer_toggle_new();
- col = gtk_tree_view_column_new_with_attributes(_("Ready"),
- rend,
- "active", 2, NULL);
+ col = gtk_tree_view_column_new_with_attributes(_("Ready"), rend,
+ "active", 2, NULL);
gtk_tree_view_insert_column(GTK_TREE_VIEW(view), col, -1);
rend = gtk_cell_renderer_text_new();
@@ -1601,16 +1600,19 @@ GtkWidget *create_start_page(void)
-1, Q_("?player:Leader"),
rend, "text", 3, NULL);
+ rend = gtk_cell_renderer_pixbuf_new();
+ col = gtk_tree_view_column_new_with_attributes(_("Flag"), rend,
+ "pixbuf", 9, NULL);
+ gtk_tree_view_insert_column(GTK_TREE_VIEW(view), col, -1);
+
rend = gtk_cell_renderer_text_new();
- col = gtk_tree_view_column_new_with_attributes(_("Nation"),
- rend,
- "text", 4, NULL);
+ col = gtk_tree_view_column_new_with_attributes(_("Nation"), rend,
+ "text", 4, NULL);
gtk_tree_view_insert_column(GTK_TREE_VIEW(view), col, -1);
rend = gtk_cell_renderer_text_new();
- col = gtk_tree_view_column_new_with_attributes(_("Team"),
- rend,
- "text", 5, NULL);
+ col = gtk_tree_view_column_new_with_attributes(_("Team"), rend,
+ "text", 5, NULL);
gtk_tree_view_insert_column(GTK_TREE_VIEW(view), col, -1);
g_signal_connect(view, "button-press-event",
@@ -2242,6 +2244,7 @@ void set_client_page(enum client_pages page)
break;
case PAGE_GAME:
enable_menus(FALSE);
+ gtk_window_unmaximize(GTK_WINDOW(toplevel));
break;
default:
break;
@@ -2264,6 +2267,7 @@ void set_client_page(enum client_pages page)
case PAGE_GAME:
reset_unit_table();
enable_menus(TRUE);
+ gtk_window_maximize(GTK_WINDOW(toplevel));
break;
case PAGE_LOAD:
update_load_page();
@@ -2571,3 +2575,12 @@ void gui_set_rulesets(int num_rulesets, char **rulesets)
g_list_free(opts);
}
+
+/****************************************************************************
+ Refresh all vote related GUI widgets. Called by the voteinfo module when
+ the client receives new vote information from the server.
+****************************************************************************/
+void voteinfo_gui_update(void)
+{
+ /* PORTME */
+}
diff --git a/client/gui-gtk-2.0/repodlgs.c b/client/gui-gtk-2.0/repodlgs.c
index 1272966..007385b 100644
--- a/client/gui-gtk-2.0/repodlgs.c
+++ b/client/gui-gtk-2.0/repodlgs.c
@@ -243,9 +243,9 @@ static GtkWidget *create_reqtree_diagram(void)
g_signal_connect(G_OBJECT(science_drawing_area), "button-release-event",
G_CALLBACK(button_release_event_callback), NULL);
gtk_widget_add_events(science_drawing_area,
- GDK_BUTTON_RELEASE_MASK | GDK_BUTTON2_MOTION_MASK |
- GDK_BUTTON3_MOTION_MASK);
-
+ GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ | GDK_BUTTON2_MOTION_MASK | GDK_BUTTON3_MOTION_MASK);
+
gtk_layout_set_size(GTK_LAYOUT(science_drawing_area), width, height);
gtk_container_add(GTK_CONTAINER(sw), science_drawing_area);
diff --git a/client/gui-gtk-2.0/wldlg.c b/client/gui-gtk-2.0/wldlg.c
index 8398f7b..e01fcb0 100644
--- a/client/gui-gtk-2.0/wldlg.c
+++ b/client/gui-gtk-2.0/wldlg.c
@@ -173,7 +173,7 @@ static void worklists_response(GtkWidget *w, gint response)
}
/* Validate this slot. */
- init_worklist(&plr->worklists[i]);
+ worklist_init(&plr->worklists[i]);
plr->worklists[i].is_valid = TRUE;
strcpy(plr->worklists[i].name, _("new"));
@@ -1412,7 +1412,7 @@ void refresh_worklist(GtkWidget *editor)
if (ptr->pcity) {
city_get_queue(ptr->pcity, &queue);
} else {
- copy_worklist(&queue, pwl);
+ worklist_copy(&queue, pwl);
}
for (i = 0; i < worklist_length(&queue); i++) {
@@ -1476,7 +1476,7 @@ static void commit_worklist(struct worklist_data *ptr)
model = GTK_TREE_MODEL(ptr->dst);
- init_worklist(&queue);
+ worklist_init(&queue);
sz_strlcpy(queue.name, pwl->name);
i = 0;
@@ -1505,6 +1505,6 @@ static void commit_worklist(struct worklist_data *ptr)
refresh_worklist(ptr->editor);
}
} else {
- copy_worklist(pwl, &queue);
+ worklist_copy(pwl, &queue);
}
}
diff --git a/client/gui-sdl/Makefile.in b/client/gui-sdl/Makefile.in
index cde0e90..206a0b0 100644
--- a/client/gui-sdl/Makefile.in
+++ b/client/gui-sdl/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,84 +14,131 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = client/gui-sdl
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+libguiclient_a_AR = $(AR) $(ARFLAGS)
+libguiclient_a_LIBADD =
+am_libguiclient_a_OBJECTS = SDL_rotozoom.$(OBJEXT) SDL_ttf.$(OBJEXT) \
+ alphablit.$(OBJEXT) canvas.$(OBJEXT) caravan_dialog.$(OBJEXT) \
+ chatline.$(OBJEXT) citydlg.$(OBJEXT) cityrep.$(OBJEXT) \
+ cma_fe.$(OBJEXT) colors.$(OBJEXT) connectdlg.$(OBJEXT) \
+ dialogs.$(OBJEXT) diplodlg.$(OBJEXT) diplomat_dialog.$(OBJEXT) \
+ finddlg.$(OBJEXT) gotodlg.$(OBJEXT) graphics.$(OBJEXT) \
+ gui_iconv.$(OBJEXT) gui_main.$(OBJEXT) gui_mouse.$(OBJEXT) \
+ gui_string.$(OBJEXT) gui_tilespec.$(OBJEXT) \
+ happiness.$(OBJEXT) helpdlg.$(OBJEXT) inputdlg.$(OBJEXT) \
+ inteldlg.$(OBJEXT) mapctrl.$(OBJEXT) mapview.$(OBJEXT) \
+ menu.$(OBJEXT) messagedlg.$(OBJEXT) messagewin.$(OBJEXT) \
+ optiondlg.$(OBJEXT) pages.$(OBJEXT) plrdlg.$(OBJEXT) \
+ repodlgs.$(OBJEXT) spaceshipdlg.$(OBJEXT) sprite.$(OBJEXT) \
+ themebackgrounds.$(OBJEXT) themecolors.$(OBJEXT) \
+ themes.$(OBJEXT) themespec.$(OBJEXT) unistring.$(OBJEXT) \
+ widget.$(OBJEXT) widget_button.$(OBJEXT) \
+ widget_checkbox.$(OBJEXT) widget_core.$(OBJEXT) \
+ widget_edit.$(OBJEXT) widget_icon.$(OBJEXT) \
+ widget_label.$(OBJEXT) widget_scrollbar.$(OBJEXT) \
+ widget_window.$(OBJEXT) wldlg.$(OBJEXT)
+libguiclient_a_OBJECTS = $(am_libguiclient_a_OBJECTS)
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/bootstrap/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libguiclient_a_SOURCES)
+DIST_SOURCES = $(libguiclient_a_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -101,10 +149,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -112,27 +164,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -140,6 +204,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -150,17 +216,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -173,16 +260,39 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
noinst_LIBRARIES = libguiclient.a
-
AM_CPPFLAGS = -I$(srcdir)/.. -I$(srcdir)/../include -I$(top_srcdir)/utility -I$(top_srcdir)/common -I$(top_srcdir)/common/aicore -I../../intl -I$(srcdir)/../agents $(CLIENT_CFLAGS)
-
libguiclient_a_SOURCES = \
SDL_rotozoom.c \
SDL_rotozoom.h \
@@ -288,92 +398,40 @@ libguiclient_a_SOURCES = \
wldlg.c \
wldlg.h
-subdir = client/gui-sdl
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-libguiclient_a_AR = $(AR) cru
-libguiclient_a_LIBADD =
-am_libguiclient_a_OBJECTS = SDL_rotozoom.$(OBJEXT) SDL_ttf.$(OBJEXT) \
- alphablit.$(OBJEXT) canvas.$(OBJEXT) caravan_dialog.$(OBJEXT) \
- chatline.$(OBJEXT) citydlg.$(OBJEXT) cityrep.$(OBJEXT) \
- cma_fe.$(OBJEXT) colors.$(OBJEXT) connectdlg.$(OBJEXT) \
- dialogs.$(OBJEXT) diplodlg.$(OBJEXT) diplomat_dialog.$(OBJEXT) \
- finddlg.$(OBJEXT) gotodlg.$(OBJEXT) graphics.$(OBJEXT) \
- gui_iconv.$(OBJEXT) gui_main.$(OBJEXT) gui_mouse.$(OBJEXT) \
- gui_string.$(OBJEXT) gui_tilespec.$(OBJEXT) happiness.$(OBJEXT) \
- helpdlg.$(OBJEXT) inputdlg.$(OBJEXT) inteldlg.$(OBJEXT) \
- mapctrl.$(OBJEXT) mapview.$(OBJEXT) menu.$(OBJEXT) \
- messagedlg.$(OBJEXT) messagewin.$(OBJEXT) optiondlg.$(OBJEXT) \
- pages.$(OBJEXT) plrdlg.$(OBJEXT) repodlgs.$(OBJEXT) \
- spaceshipdlg.$(OBJEXT) sprite.$(OBJEXT) \
- themebackgrounds.$(OBJEXT) themecolors.$(OBJEXT) \
- themes.$(OBJEXT) themespec.$(OBJEXT) unistring.$(OBJEXT) \
- widget.$(OBJEXT) widget_button.$(OBJEXT) \
- widget_checkbox.$(OBJEXT) widget_core.$(OBJEXT) \
- widget_edit.$(OBJEXT) widget_icon.$(OBJEXT) \
- widget_label.$(OBJEXT) widget_scrollbar.$(OBJEXT) \
- widget_window.$(OBJEXT) wldlg.$(OBJEXT)
-libguiclient_a_OBJECTS = $(am_libguiclient_a_OBJECTS)
-
-DEFS = @DEFS@
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-depcomp = $(SHELL) $(top_srcdir)/bootstrap/depcomp
-am__depfiles_maybe = depfiles
- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/SDL_rotozoom.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/SDL_ttf.Po ./$(DEPDIR)/alphablit.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/canvas.Po ./$(DEPDIR)/caravan_dialog.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/chatline.Po ./$(DEPDIR)/citydlg.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/cityrep.Po ./$(DEPDIR)/cma_fe.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/colors.Po ./$(DEPDIR)/connectdlg.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/dialogs.Po ./$(DEPDIR)/diplodlg.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/diplomat_dialog.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/finddlg.Po ./$(DEPDIR)/gotodlg.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/graphics.Po ./$(DEPDIR)/gui_iconv.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/gui_main.Po ./$(DEPDIR)/gui_mouse.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/gui_string.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/gui_tilespec.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/happiness.Po ./$(DEPDIR)/helpdlg.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/inputdlg.Po ./$(DEPDIR)/inteldlg.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/mapctrl.Po ./$(DEPDIR)/mapview.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/menu.Po ./$(DEPDIR)/messagedlg.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/messagewin.Po ./$(DEPDIR)/optiondlg.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/pages.Po ./$(DEPDIR)/plrdlg.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/repodlgs.Po ./$(DEPDIR)/spaceshipdlg.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/sprite.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/themebackgrounds.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/themecolors.Po ./$(DEPDIR)/themes.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/themespec.Po ./$(DEPDIR)/unistring.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/widget.Po ./$(DEPDIR)/widget_button.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/widget_checkbox.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/widget_core.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/widget_edit.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/widget_icon.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/widget_label.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/widget_scrollbar.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/widget_window.Po ./$(DEPDIR)/wldlg.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-CFLAGS = @CFLAGS@
-DIST_SOURCES = $(libguiclient_a_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(libguiclient_a_SOURCES)
-
all: all-am
.SUFFIXES:
.SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu client/gui-sdl/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu client/gui-sdl/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu client/gui-sdl/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
clean-noinstLIBRARIES:
-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
@@ -383,7 +441,7 @@ libguiclient.a: $(libguiclient_a_OBJECTS) $(libguiclient_a_DEPENDENCIES)
$(RANLIB) libguiclient.a
mostlyclean-compile:
- -rm -f *.$(OBJEXT) core *.core
+ -rm -f *.$(OBJEXT)
distclean-compile:
-rm -f *.tab.c
@@ -441,90 +499,106 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/widget_window.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/wldlg.Po at am__quote@
-distclean-depend:
- -rm -rf ./$(DEPDIR)
-
.c.o:
- at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
- at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- $(COMPILE) -c `cygpath -w $<`
-CCDEPMODE = @CCDEPMODE@
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: CTAGS
+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(LIBRARIES)
-
installdirs:
-
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -536,7 +610,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -544,7 +618,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -554,48 +629,85 @@ clean: clean-am
clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
distclean: distclean-am
-
-distclean-am: clean-am distclean-compile distclean-depend \
- distclean-generic distclean-tags
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-tags
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am:
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-compile mostlyclean-generic
-uninstall-am: uninstall-info-am
+pdf: pdf-am
+
+pdf-am:
-.PHONY: GTAGS all all-am check check-am clean clean-generic \
- clean-noinstLIBRARIES distclean distclean-compile \
- distclean-depend distclean-generic distclean-tags distdir dvi \
- dvi-am info info-am install install-am install-data \
- install-data-am install-exec install-exec-am install-info \
- install-info-am install-man install-strip installcheck \
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ clean-noinstLIBRARIES ctags distclean distclean-compile \
+ distclean-generic distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic tags uninstall uninstall-am \
- uninstall-info-am
+ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+ uninstall-am
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/client/gui-sdl/dialogs.c b/client/gui-sdl/dialogs.c
index ac9aab4..bb1164e 100644
--- a/client/gui-sdl/dialogs.c
+++ b/client/gui-sdl/dialogs.c
@@ -72,7 +72,7 @@
#include "dialogs.h"
-struct player *races_player;
+static char races_player_name[MAX_LEN_NAME];
extern bool is_unit_move_blocked;
extern void popdown_diplomat_dialog(void);
@@ -2197,6 +2197,7 @@ static int races_dialog_ok_callback(struct widget *pStart_Button)
if (Main.event.button.button == SDL_BUTTON_LEFT) {
struct NAT *pSetup = (struct NAT *)(pNationDlg->pEndWidgetList->data.ptr);
char *pStr = convert_to_chars(pSetup->pName_Edit->string16->text);
+ const struct player *races_player;
/* perform a minimum of sanity test on the name */
if (strlen(pStr) == 0) {
@@ -2208,10 +2209,14 @@ static int races_dialog_ok_callback(struct widget *pStart_Button)
return (-1);
}
- dsend_packet_nation_select_req(&aconnection, player_number(races_player),
- pSetup->nation,
- pSetup->leader_sex, pStr,
- pSetup->nation_city_style);
+ races_player = find_player_by_name(races_player_name);
+ if (races_player) {
+ dsend_packet_nation_select_req(&aconnection,
+ player_number(races_player),
+ pSetup->nation,
+ pSetup->leader_sex, pStr,
+ pSetup->nation_city_style);
+ }
FC_FREE(pStr);
popdown_races_dialog();
@@ -2677,7 +2682,11 @@ void popup_races_dialog(struct player *pplayer)
return;
}
- races_player = pplayer;
+ if (pplayer) {
+ sz_strlcpy(races_player_name, player_name(pplayer));
+ } else {
+ races_player_name[0] = '\0';
+ }
pNationDlg = fc_calloc(1, sizeof(struct ADVANCED_DLG));
diff --git a/client/gui-sdl/diplodlg.c b/client/gui-sdl/diplodlg.c
index b56bb2a..3a19fee 100644
--- a/client/gui-sdl/diplodlg.c
+++ b/client/gui-sdl/diplodlg.c
@@ -558,7 +558,8 @@ static struct ADVANCED_DLG * popup_diplomatic_objects(struct player *pPlayer0,
count++;
}
- if (!player_has_embassy(pPlayer1, pPlayer0)) {
+ /* Don't take in account the embassy effects. */
+ if (!BV_ISSET(pPlayer1->embassy, player_index(pPlayer0))) {
pBuf = create_iconlabel_from_chars(NULL, pWindow->dst,
_("Give embassy"), adj_font(12),
(WF_RESTORE_BACKGROUND|WF_DRAW_TEXT_LABEL_WITH_SPACE));
diff --git a/client/gui-sdl/optiondlg.c b/client/gui-sdl/optiondlg.c
index 089ae96..2d47e18 100644
--- a/client/gui-sdl/optiondlg.c
+++ b/client/gui-sdl/optiondlg.c
@@ -134,7 +134,7 @@ static int edit_worklist_callback(struct widget *pWidget)
}
if (i + 1 < MAX_NUM_WORKLISTS &&
game.player_ptr->worklists[i + 1].is_valid) {
- copy_worklist(&game.player_ptr->worklists[i],
+ worklist_copy(&game.player_ptr->worklists[i],
&game.player_ptr->worklists[i + 1]);
} else {
game.player_ptr->worklists[i].is_valid = FALSE;
@@ -210,7 +210,7 @@ static int add_new_worklist_callback(struct widget *pWidget)
}
/* Validate this slot. */
- init_worklist(&game.player_ptr->worklists[j]);
+ worklist_init(&game.player_ptr->worklists[j]);
game.player_ptr->worklists[j].is_valid = TRUE;
strcpy(game.player_ptr->worklists[j].name, _("empty worklist"));
diff --git a/client/gui-sdl/pages.c b/client/gui-sdl/pages.c
index bd6bd36..ae4c31a 100644
--- a/client/gui-sdl/pages.c
+++ b/client/gui-sdl/pages.c
@@ -403,3 +403,12 @@ void update_start_page(void)
{
/* PORTME*/
}
+
+/****************************************************************************
+ Refresh all vote related GUI widgets. Called by the voteinfo module when
+ the client receives new vote information from the server.
+****************************************************************************/
+void voteinfo_gui_update(void)
+{
+ /* PORTME */
+}
diff --git a/client/gui-sdl/wldlg.c b/client/gui-sdl/wldlg.c
index b3c22e7..41b29f4 100644
--- a/client/gui-sdl/wldlg.c
+++ b/client/gui-sdl/wldlg.c
@@ -152,7 +152,7 @@ static int ok_worklist_editor_callback(struct widget *pWidget)
city_set_worklist(pCity, pEditor->pCopy_WorkList);
} else {
/* commit global worklist */
- copy_worklist(pEditor->pOrginal_WorkList, pEditor->pCopy_WorkList);
+ worklist_copy(pEditor->pOrginal_WorkList, pEditor->pCopy_WorkList);
update_worklist_report_dialog();
}
@@ -712,7 +712,7 @@ static void set_global_worklist(struct widget *pWidget)
*pWorkList = &game.player_ptr->worklists[MAX_ID - pWidget->ID];
/* clear tmp worklist */
- init_worklist(&wl);
+ worklist_init(&wl);
wl_count = 0;
/* copy global worklist to city worklist */
@@ -747,7 +747,7 @@ static void set_global_worklist(struct widget *pWidget)
}
/* --------------------------------- */
- copy_worklist(pEditor->pCopy_WorkList, &wl);
+ worklist_copy(pEditor->pCopy_WorkList, &wl);
/* --------------------------------- */
/* create new widget list */
@@ -1009,7 +1009,7 @@ void popup_worklist_editor(struct city *pCity, struct worklist *pWorkList)
pEditor->pCity = pCity;
pEditor->pOrginal_WorkList = pWorkList;
pEditor->pCopy_WorkList = fc_calloc(1, sizeof(struct worklist));
- copy_worklist(pEditor->pCopy_WorkList, pWorkList);
+ worklist_copy(pEditor->pCopy_WorkList, pWorkList);
if(pCity) {
pEditor->currently_building = pCity->production;
diff --git a/client/gui-stub/Makefile.in b/client/gui-stub/Makefile.in
index 0726d1c..199cb6f 100644
--- a/client/gui-stub/Makefile.in
+++ b/client/gui-stub/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,84 +14,121 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = client/gui-stub
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+libguiclient_a_AR = $(AR) $(ARFLAGS)
+libguiclient_a_LIBADD =
+am_libguiclient_a_OBJECTS = canvas.$(OBJEXT) chatline.$(OBJEXT) \
+ citydlg.$(OBJEXT) cityrep.$(OBJEXT) colors.$(OBJEXT) \
+ connectdlg.$(OBJEXT) dialogs.$(OBJEXT) diplodlg.$(OBJEXT) \
+ finddlg.$(OBJEXT) gotodlg.$(OBJEXT) graphics.$(OBJEXT) \
+ gui_main.$(OBJEXT) helpdlg.$(OBJEXT) inteldlg.$(OBJEXT) \
+ mapctrl.$(OBJEXT) mapview.$(OBJEXT) menu.$(OBJEXT) \
+ messagedlg.$(OBJEXT) messagewin.$(OBJEXT) pages.$(OBJEXT) \
+ plrdlg.$(OBJEXT) ratesdlg.$(OBJEXT) repodlgs.$(OBJEXT) \
+ spaceshipdlg.$(OBJEXT) sprite.$(OBJEXT) themes.$(OBJEXT) \
+ wldlg.$(OBJEXT)
+libguiclient_a_OBJECTS = $(am_libguiclient_a_OBJECTS)
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/bootstrap/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libguiclient_a_SOURCES)
+DIST_SOURCES = $(libguiclient_a_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -101,10 +139,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -112,27 +154,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -140,6 +194,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -150,17 +206,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -173,15 +250,39 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
noinst_LIBRARIES = libguiclient.a
AM_CPPFLAGS = -I. -I$(srcdir)/.. -I$(srcdir)/../include -I$(top_srcdir)/utility -I$(top_srcdir)/common -I../../intl $(CLIENT_CFLAGS)
-
libguiclient_a_SOURCES = \
canvas.c \
canvas.h \
@@ -237,64 +338,40 @@ libguiclient_a_SOURCES = \
wldlg.c \
wldlg.h
-subdir = client/gui-stub
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-libguiclient_a_AR = $(AR) cru
-libguiclient_a_LIBADD =
-am_libguiclient_a_OBJECTS = canvas.$(OBJEXT) chatline.$(OBJEXT) \
- citydlg.$(OBJEXT) cityrep.$(OBJEXT) colors.$(OBJEXT) \
- connectdlg.$(OBJEXT) dialogs.$(OBJEXT) diplodlg.$(OBJEXT) \
- finddlg.$(OBJEXT) gotodlg.$(OBJEXT) graphics.$(OBJEXT) \
- gui_main.$(OBJEXT) helpdlg.$(OBJEXT) inteldlg.$(OBJEXT) \
- mapctrl.$(OBJEXT) mapview.$(OBJEXT) menu.$(OBJEXT) \
- messagedlg.$(OBJEXT) messagewin.$(OBJEXT) pages.$(OBJEXT) \
- plrdlg.$(OBJEXT) ratesdlg.$(OBJEXT) repodlgs.$(OBJEXT) \
- spaceshipdlg.$(OBJEXT) sprite.$(OBJEXT) themes.$(OBJEXT) \
- wldlg.$(OBJEXT)
-libguiclient_a_OBJECTS = $(am_libguiclient_a_OBJECTS)
-
-DEFS = @DEFS@
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-depcomp = $(SHELL) $(top_srcdir)/bootstrap/depcomp
-am__depfiles_maybe = depfiles
- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/canvas.Po ./$(DEPDIR)/chatline.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/citydlg.Po ./$(DEPDIR)/cityrep.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/colors.Po ./$(DEPDIR)/connectdlg.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/dialogs.Po ./$(DEPDIR)/diplodlg.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/finddlg.Po ./$(DEPDIR)/gotodlg.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/graphics.Po ./$(DEPDIR)/gui_main.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/helpdlg.Po ./$(DEPDIR)/inteldlg.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/mapctrl.Po ./$(DEPDIR)/mapview.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/menu.Po ./$(DEPDIR)/messagedlg.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/messagewin.Po ./$(DEPDIR)/pages.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/plrdlg.Po ./$(DEPDIR)/ratesdlg.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/repodlgs.Po ./$(DEPDIR)/spaceshipdlg.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/sprite.Po ./$(DEPDIR)/themes.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/wldlg.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-CFLAGS = @CFLAGS@
-DIST_SOURCES = $(libguiclient_a_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(libguiclient_a_SOURCES)
-
all: all-am
.SUFFIXES:
.SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu client/gui-stub/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu client/gui-stub/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu client/gui-stub/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
clean-noinstLIBRARIES:
-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
@@ -304,7 +381,7 @@ libguiclient.a: $(libguiclient_a_OBJECTS) $(libguiclient_a_DEPENDENCIES)
$(RANLIB) libguiclient.a
mostlyclean-compile:
- -rm -f *.$(OBJEXT) core *.core
+ -rm -f *.$(OBJEXT)
distclean-compile:
-rm -f *.tab.c
@@ -337,90 +414,106 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/themes.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/wldlg.Po at am__quote@
-distclean-depend:
- -rm -rf ./$(DEPDIR)
-
.c.o:
- at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
- at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- $(COMPILE) -c `cygpath -w $<`
-CCDEPMODE = @CCDEPMODE@
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: CTAGS
+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(LIBRARIES)
-
installdirs:
-
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -432,7 +525,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -440,7 +533,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -450,48 +544,85 @@ clean: clean-am
clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
distclean: distclean-am
-
-distclean-am: clean-am distclean-compile distclean-depend \
- distclean-generic distclean-tags
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-tags
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am:
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-compile mostlyclean-generic
-uninstall-am: uninstall-info-am
+pdf: pdf-am
+
+pdf-am:
-.PHONY: GTAGS all all-am check check-am clean clean-generic \
- clean-noinstLIBRARIES distclean distclean-compile \
- distclean-depend distclean-generic distclean-tags distdir dvi \
- dvi-am info info-am install install-am install-data \
- install-data-am install-exec install-exec-am install-info \
- install-info-am install-man install-strip installcheck \
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ clean-noinstLIBRARIES ctags distclean distclean-compile \
+ distclean-generic distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic tags uninstall uninstall-am \
- uninstall-info-am
+ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+ uninstall-am
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/client/gui-stub/pages.c b/client/gui-stub/pages.c
index bf65ed2..832130c 100644
--- a/client/gui-stub/pages.c
+++ b/client/gui-stub/pages.c
@@ -53,3 +53,12 @@ void update_start_page(void)
{
/* PORTME */
}
+
+/****************************************************************************
+ Refresh all vote related GUI widgets. Called by the voteinfo module when
+ the client receives new vote information from the server.
+****************************************************************************/
+void voteinfo_gui_update(void)
+{
+ /* PORTME */
+}
diff --git a/client/gui-win32/Makefile.in b/client/gui-win32/Makefile.in
index 004c093..7f47f90 100644
--- a/client/gui-win32/Makefile.in
+++ b/client/gui-win32/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,84 +14,122 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = client/gui-win32
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+libguiclient_a_AR = $(AR) $(ARFLAGS)
+libguiclient_a_LIBADD =
+am_libguiclient_a_OBJECTS = canvas.$(OBJEXT) chatline.$(OBJEXT) \
+ citydlg.$(OBJEXT) cma_fe.$(OBJEXT) cityrep.$(OBJEXT) \
+ colors.$(OBJEXT) connectdlg.$(OBJEXT) dialogs.$(OBJEXT) \
+ diplodlg.$(OBJEXT) finddlg.$(OBJEXT) gotodlg.$(OBJEXT) \
+ graphics.$(OBJEXT) gui_main.$(OBJEXT) gui_stuff.$(OBJEXT) \
+ happiness.$(OBJEXT) helpdlg.$(OBJEXT) inputdlg.$(OBJEXT) \
+ inteldlg.$(OBJEXT) mapctrl.$(OBJEXT) mapview.$(OBJEXT) \
+ menu.$(OBJEXT) messagedlg.$(OBJEXT) messagewin.$(OBJEXT) \
+ optiondlg.$(OBJEXT) pages.$(OBJEXT) plrdlg.$(OBJEXT) \
+ ratesdlg.$(OBJEXT) repodlgs.$(OBJEXT) spaceshipdlg.$(OBJEXT) \
+ sprite.$(OBJEXT) themes.$(OBJEXT) wldlg.$(OBJEXT)
+libguiclient_a_OBJECTS = $(am_libguiclient_a_OBJECTS)
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/bootstrap/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libguiclient_a_SOURCES)
+DIST_SOURCES = $(libguiclient_a_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -101,10 +140,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -112,27 +155,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -140,6 +195,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -150,17 +207,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -173,16 +251,39 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
noinst_LIBRARIES = libguiclient.a
-
AM_CPPFLAGS = -I. -I$(srcdir)/.. -I$(srcdir)/../agents -I$(top_srcdir)/utility -I$(srcdir)/../include -I$(top_srcdir)/common/aicore -I$(top_srcdir)/common -I../../intl $(CLIENT_CFLAGS)
-
libguiclient_a_SOURCES = \
canvas.c \
canvas.h \
@@ -248,67 +349,40 @@ libguiclient_a_SOURCES = \
wldlg.c \
wldlg.h
-subdir = client/gui-win32
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-libguiclient_a_AR = $(AR) cru
-libguiclient_a_LIBADD =
-am_libguiclient_a_OBJECTS = canvas.$(OBJEXT) chatline.$(OBJEXT) \
- citydlg.$(OBJEXT) cma_fe.$(OBJEXT) cityrep.$(OBJEXT) \
- colors.$(OBJEXT) connectdlg.$(OBJEXT) dialogs.$(OBJEXT) \
- diplodlg.$(OBJEXT) finddlg.$(OBJEXT) gotodlg.$(OBJEXT) \
- graphics.$(OBJEXT) gui_main.$(OBJEXT) gui_stuff.$(OBJEXT) \
- happiness.$(OBJEXT) helpdlg.$(OBJEXT) inputdlg.$(OBJEXT) \
- inteldlg.$(OBJEXT) mapctrl.$(OBJEXT) mapview.$(OBJEXT) \
- menu.$(OBJEXT) messagedlg.$(OBJEXT) messagewin.$(OBJEXT) \
- optiondlg.$(OBJEXT) pages.$(OBJEXT) plrdlg.$(OBJEXT) \
- ratesdlg.$(OBJEXT) repodlgs.$(OBJEXT) spaceshipdlg.$(OBJEXT) \
- sprite.$(OBJEXT) themes.$(OBJEXT) wldlg.$(OBJEXT)
-libguiclient_a_OBJECTS = $(am_libguiclient_a_OBJECTS)
-
-DEFS = @DEFS@
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-depcomp = $(SHELL) $(top_srcdir)/bootstrap/depcomp
-am__depfiles_maybe = depfiles
- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/canvas.Po ./$(DEPDIR)/chatline.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/citydlg.Po ./$(DEPDIR)/cityrep.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/cma_fe.Po ./$(DEPDIR)/colors.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/connectdlg.Po ./$(DEPDIR)/dialogs.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/diplodlg.Po ./$(DEPDIR)/finddlg.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/gotodlg.Po ./$(DEPDIR)/graphics.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/gui_main.Po ./$(DEPDIR)/gui_stuff.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/happiness.Po ./$(DEPDIR)/helpdlg.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/inputdlg.Po ./$(DEPDIR)/inteldlg.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/mapctrl.Po ./$(DEPDIR)/mapview.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/menu.Po ./$(DEPDIR)/messagedlg.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/messagewin.Po ./$(DEPDIR)/optiondlg.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/pages.Po ./$(DEPDIR)/plrdlg.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/ratesdlg.Po ./$(DEPDIR)/repodlgs.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/spaceshipdlg.Po ./$(DEPDIR)/sprite.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/themes.Po ./$(DEPDIR)/wldlg.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-CFLAGS = @CFLAGS@
-DIST_SOURCES = $(libguiclient_a_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(libguiclient_a_SOURCES)
-
all: all-am
.SUFFIXES:
.SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu client/gui-win32/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu client/gui-win32/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu client/gui-win32/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
clean-noinstLIBRARIES:
-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
@@ -318,7 +392,7 @@ libguiclient.a: $(libguiclient_a_OBJECTS) $(libguiclient_a_DEPENDENCIES)
$(RANLIB) libguiclient.a
mostlyclean-compile:
- -rm -f *.$(OBJEXT) core *.core
+ -rm -f *.$(OBJEXT)
distclean-compile:
-rm -f *.tab.c
@@ -356,90 +430,106 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/themes.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/wldlg.Po at am__quote@
-distclean-depend:
- -rm -rf ./$(DEPDIR)
-
.c.o:
- at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
- at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- $(COMPILE) -c `cygpath -w $<`
-CCDEPMODE = @CCDEPMODE@
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: CTAGS
+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(LIBRARIES)
-
installdirs:
-
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -451,7 +541,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -459,7 +549,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -469,48 +560,85 @@ clean: clean-am
clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
distclean: distclean-am
-
-distclean-am: clean-am distclean-compile distclean-depend \
- distclean-generic distclean-tags
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-tags
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am:
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-compile mostlyclean-generic
-uninstall-am: uninstall-info-am
+pdf: pdf-am
+
+pdf-am:
-.PHONY: GTAGS all all-am check check-am clean clean-generic \
- clean-noinstLIBRARIES distclean distclean-compile \
- distclean-depend distclean-generic distclean-tags distdir dvi \
- dvi-am info info-am install install-am install-data \
- install-data-am install-exec install-exec-am install-info \
- install-info-am install-man install-strip installcheck \
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ clean-noinstLIBRARIES ctags distclean distclean-compile \
+ distclean-generic distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic tags uninstall uninstall-am \
- uninstall-info-am
+ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+ uninstall-am
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/client/gui-win32/connectdlg.c b/client/gui-win32/connectdlg.c
index 67d9c0d..605d2ed 100644
--- a/client/gui-win32/connectdlg.c
+++ b/client/gui-win32/connectdlg.c
@@ -58,6 +58,8 @@
#include "gui_main.h"
+char *fc_current_filename;
+
static enum {
LOGIN_TYPE,
NEW_PASSWORD_TYPE,
@@ -734,16 +736,16 @@ void handle_save_load(const char *title, bool is_save)
if (is_save) {
if (GetSaveFileName(&ofn)) {
- if (current_filename) {
- free(current_filename);
+ if (fc_current_filename) {
+ free(fc_current_filename);
}
GetCurrentDirectory(MAX_PATH, saved_games_dirname);
SetCurrentDirectory(dirname);
- current_filename = mystrdup(ofn.lpstrFile);
+ fc_current_filename = mystrdup(ofn.lpstrFile);
- send_save_game(current_filename);
+ send_save_game(fc_current_filename);
} else {
SetCurrentDirectory(dirname);
}
@@ -751,14 +753,14 @@ void handle_save_load(const char *title, bool is_save)
if (GetOpenFileName(&ofn)) {
char cmd[MAX_LEN_MSG];
- if (current_filename) {
- free(current_filename);
+ if (fc_current_filename) {
+ free(fc_current_filename);
}
GetCurrentDirectory(MAX_PATH, saved_games_dirname);
SetCurrentDirectory(dirname);
- current_filename = mystrdup(ofn.lpstrFile);
+ fc_current_filename = mystrdup(ofn.lpstrFile);
my_snprintf(cmd, sizeof(cmd), "/load %s", ofn.lpstrFile);
send_chat(cmd);
diff --git a/client/gui-win32/helpdlg.c b/client/gui-win32/helpdlg.c
index 9ddeeb7..0378c98 100644
--- a/client/gui-win32/helpdlg.c
+++ b/client/gui-win32/helpdlg.c
@@ -492,6 +492,7 @@ static void help_update_improvement(const struct help_item *pitem,
get_req_source_text(&preq->source, req_buf,
sizeof(req_buf)));
i++;
+ break;
} requirement_vector_iterate_end;
/* create_tech_tree(help_improvement_tree, 0, imp->tech_req, 3);*/
}
@@ -522,8 +523,6 @@ static void help_update_wonder(const struct help_item *pitem,
sprintf(buf, "%d", impr_build_shield_cost(which));
SetWindowText(help_ilabel[1], buf);
- sprintf(buf, "%d", imp->upkeep);
- SetWindowText(help_ilabel[3], buf);
/* FIXME: this should show ranges and all the MAX_NUM_REQS reqs.
* Currently it's limited to 1 req but this code is partially prepared
@@ -531,12 +530,19 @@ static void help_update_wonder(const struct help_item *pitem,
* definition. */
i = 0;
requirement_vector_iterate(&imp->reqs, preq) {
- SetWindowText(help_ilabel[5 + i],
+ SetWindowText(help_ilabel[3 + i],
get_req_source_text(&preq->source, req_buf,
sizeof(req_buf)));
i++;
+ break;
} requirement_vector_iterate_end;
-/* create_tech_tree(help_improvement_tree, 0, imp->tech_req, 3);*/
+ if (imp->obsolete_by != A_LAST) {
+ SetWindowText(help_ilabel[5],
+ advance_name_for_player(game.player_ptr,
+ imp->obsolete_by));
+ } else {
+ SetWindowText(help_ilabel[5], _("None"));
+ }
}
else {
/* can't find wonder */
diff --git a/client/gui-win32/pages.c b/client/gui-win32/pages.c
index ed9ac0f..04dca49 100644
--- a/client/gui-win32/pages.c
+++ b/client/gui-win32/pages.c
@@ -54,3 +54,12 @@ void gui_set_rulesets(int num_rulesets, char **rulesets)
{
/* PORTME */
}
+
+/****************************************************************************
+ Refresh all vote related GUI widgets. Called by the voteinfo module when
+ the client receives new vote information from the server.
+****************************************************************************/
+void voteinfo_gui_update(void)
+{
+ /* PORTME */
+}
diff --git a/client/gui-win32/wldlg.c b/client/gui-win32/wldlg.c
index ce32c32..001e553 100644
--- a/client/gui-win32/wldlg.c
+++ b/client/gui-win32/wldlg.c
@@ -210,7 +210,7 @@ enum wl_report_ids {
};
static void global_commit_worklist(struct worklist *pwl, void *data);
-static void copy_worklist_to_editor(struct worklist *pwl,
+static void worklist_copy_to_editor(struct worklist *pwl,
struct worklist_editor *peditor,
int where);
static void worklist_really_insert_item(struct worklist_editor *peditor,
@@ -272,7 +272,7 @@ static void global_delete_callback(struct worklist_report *preport, int sel)
break;
for (j = sel; j < i - 1; j++) {
- copy_worklist(&preport->pplr->worklists[j],
+ worklist_copy(&preport->pplr->worklists[j],
&preport->pplr->worklists[j + 1]);
}
@@ -320,7 +320,7 @@ static void global_insert_callback(struct worklist_report *preport)
return;
/* Validate this slot. */
- init_worklist(&preport->pplr->worklists[j]);
+ worklist_init(&preport->pplr->worklists[j]);
preport->pplr->worklists[j].is_valid = TRUE;
strcpy(preport->pplr->worklists[j].name, _("empty worklist"));
@@ -487,7 +487,7 @@ static void global_commit_worklist(struct worklist *pwl, void *data)
{
struct worklist_report *preport = (struct worklist_report *) data;
- copy_worklist(&preport->pplr->worklists[preport->wl_idx], pwl);
+ worklist_copy(&preport->pplr->worklists[preport->wl_idx], pwl);
}
/****************************************************************
@@ -499,7 +499,7 @@ static void copy_editor_to_worklist(struct worklist_editor *peditor,
int i, n;
/* Fill in this worklist with the parameters set in the worklist dialog. */
- init_worklist(pwl);
+ worklist_init(pwl);
n = 0;
for (i = 0; i < MAX_LEN_WORKLIST; i++) {
@@ -634,7 +634,7 @@ static void worklist_insert_item(struct worklist_editor *peditor,
struct player *pplr = city_owner(peditor->pcity);
struct worklist *pwl = &pplr->worklists[wid_id(wid)];
- copy_worklist_to_editor(pwl, peditor, where);
+ worklist_copy_to_editor(pwl, peditor, where);
where += worklist_length(pwl);
} else {
worklist_really_insert_item(peditor, where, wid);
@@ -958,7 +958,7 @@ static void worklist_really_insert_item(struct worklist_editor *peditor,
/*****************************************************************
copies a worklist to the editor for editing
******************************************************************/
-static void copy_worklist_to_editor(struct worklist *pwl,
+static void worklist_copy_to_editor(struct worklist *pwl,
struct worklist_editor *peditor,
int where)
{
@@ -995,11 +995,11 @@ static void worklist_prep(struct worklist_editor *peditor)
wid_encode(peditor->pcity->production.is_unit, FALSE,
peditor->pcity->production.value);
peditor->worklist_wids[1] = WORKLIST_END;
- copy_worklist_to_editor(&peditor->pcity->worklist, peditor,
+ worklist_copy_to_editor(&peditor->pcity->worklist, peditor,
MAX_LEN_WORKLIST);
} else {
peditor->worklist_wids[0] = WORKLIST_END;
- copy_worklist_to_editor(peditor->pwl, peditor, MAX_LEN_WORKLIST);
+ worklist_copy_to_editor(peditor->pwl, peditor, MAX_LEN_WORKLIST);
}
}
diff --git a/client/gui-xaw/Freeciv.h b/client/gui-xaw/Freeciv.h
index 80eb6ea..70a2c16 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.9",
+"Freeciv*version: 2.1.10",
"Freeciv.title: Freeciv",
"Freeciv.iconName: Freeciv",
"Freeciv*borderColor: black",
diff --git a/client/gui-xaw/Makefile.in b/client/gui-xaw/Makefile.in
index 56ceb30..ec76a29 100644
--- a/client/gui-xaw/Makefile.in
+++ b/client/gui-xaw/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,84 +14,123 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = client/gui-xaw
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+libguiclient_a_AR = $(AR) $(ARFLAGS)
+libguiclient_a_LIBADD =
+am_libguiclient_a_OBJECTS = actions.$(OBJEXT) canvas.$(OBJEXT) \
+ chatline.$(OBJEXT) citydlg.$(OBJEXT) cityrep.$(OBJEXT) \
+ cma_fe.$(OBJEXT) colors.$(OBJEXT) connectdlg.$(OBJEXT) \
+ dialogs.$(OBJEXT) diplodlg.$(OBJEXT) diplomat_dialog.$(OBJEXT) \
+ finddlg.$(OBJEXT) gotodlg.$(OBJEXT) graphics.$(OBJEXT) \
+ gui_main.$(OBJEXT) gui_stuff.$(OBJEXT) helpdlg.$(OBJEXT) \
+ inputdlg.$(OBJEXT) inteldlg.$(OBJEXT) mapctrl.$(OBJEXT) \
+ mapview.$(OBJEXT) menu.$(OBJEXT) messagedlg.$(OBJEXT) \
+ messagewin.$(OBJEXT) optiondlg.$(OBJEXT) pages.$(OBJEXT) \
+ pixcomm.$(OBJEXT) plrdlg.$(OBJEXT) ratesdlg.$(OBJEXT) \
+ repodlgs.$(OBJEXT) resources.$(OBJEXT) spaceshipdlg.$(OBJEXT) \
+ themes.$(OBJEXT) wldlg.$(OBJEXT)
+libguiclient_a_OBJECTS = $(am_libguiclient_a_OBJECTS)
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/bootstrap/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libguiclient_a_SOURCES)
+DIST_SOURCES = $(libguiclient_a_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -101,10 +141,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -112,27 +156,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -140,6 +196,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -150,17 +208,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -173,24 +252,46 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
noinst_LIBRARIES = libguiclient.a
AM_CPPFLAGS = -I. -I$(srcdir)/.. -I$(srcdir)/../include -I$(top_srcdir)/utility -I$(top_srcdir)/common -I../../intl -I$(top_srcdir)/common/aicore -I../../intl -I$(srcdir)/../agents $(CLIENT_CFLAGS)
-
# The AM_CPPFLAGS "-I." is so resources.c includes the locally generated
# Freeciv.h in the builddir, in preference to the one
# in the source dir (when compiling from another dir). --dwp
BUILT_SOURCES = Freeciv.h
CLEANFILES = Freeciv.h
-
libguiclient_a_DEPENDENCIES = ad2c
-
libguiclient_a_SOURCES = \
ad2c \
Freeciv.h \
@@ -263,71 +364,41 @@ libguiclient_a_SOURCES = \
wldlg.c \
wldlg.h
-subdir = client/gui-xaw
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-libguiclient_a_AR = $(AR) cru
-libguiclient_a_LIBADD =
-am_libguiclient_a_OBJECTS = actions.$(OBJEXT) canvas.$(OBJEXT) \
- chatline.$(OBJEXT) citydlg.$(OBJEXT) cityrep.$(OBJEXT) \
- cma_fe.$(OBJEXT) colors.$(OBJEXT) connectdlg.$(OBJEXT) \
- dialogs.$(OBJEXT) diplodlg.$(OBJEXT) diplomat_dialog.$(OBJEXT) \
- finddlg.$(OBJEXT) gotodlg.$(OBJEXT) graphics.$(OBJEXT) \
- gui_main.$(OBJEXT) gui_stuff.$(OBJEXT) helpdlg.$(OBJEXT) \
- inputdlg.$(OBJEXT) inteldlg.$(OBJEXT) mapctrl.$(OBJEXT) \
- mapview.$(OBJEXT) menu.$(OBJEXT) messagedlg.$(OBJEXT) \
- messagewin.$(OBJEXT) optiondlg.$(OBJEXT) pages.$(OBJEXT) \
- pixcomm.$(OBJEXT) plrdlg.$(OBJEXT) ratesdlg.$(OBJEXT) \
- repodlgs.$(OBJEXT) resources.$(OBJEXT) spaceshipdlg.$(OBJEXT) \
- themes.$(OBJEXT) wldlg.$(OBJEXT)
-libguiclient_a_OBJECTS = $(am_libguiclient_a_OBJECTS)
-
-DEFS = @DEFS@
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-depcomp = $(SHELL) $(top_srcdir)/bootstrap/depcomp
-am__depfiles_maybe = depfiles
- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/actions.Po ./$(DEPDIR)/canvas.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/chatline.Po ./$(DEPDIR)/citydlg.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/cityrep.Po ./$(DEPDIR)/cma_fe.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/colors.Po ./$(DEPDIR)/connectdlg.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/dialogs.Po ./$(DEPDIR)/diplodlg.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/diplomat_dialog.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/finddlg.Po ./$(DEPDIR)/gotodlg.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/graphics.Po ./$(DEPDIR)/gui_main.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/gui_stuff.Po ./$(DEPDIR)/helpdlg.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/inputdlg.Po ./$(DEPDIR)/inteldlg.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/mapctrl.Po ./$(DEPDIR)/mapview.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/menu.Po ./$(DEPDIR)/messagedlg.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/messagewin.Po ./$(DEPDIR)/optiondlg.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/pages.Po ./$(DEPDIR)/pixcomm.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/plrdlg.Po ./$(DEPDIR)/ratesdlg.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/repodlgs.Po ./$(DEPDIR)/resources.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/spaceshipdlg.Po ./$(DEPDIR)/themes.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/wldlg.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-CFLAGS = @CFLAGS@
-DIST_SOURCES = $(libguiclient_a_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(libguiclient_a_SOURCES)
-
all: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) all-am
.SUFFIXES:
.SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu client/gui-xaw/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu client/gui-xaw/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu client/gui-xaw/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
clean-noinstLIBRARIES:
-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
@@ -337,7 +408,7 @@ libguiclient.a: $(libguiclient_a_OBJECTS) $(libguiclient_a_DEPENDENCIES)
$(RANLIB) libguiclient.a
mostlyclean-compile:
- -rm -f *.$(OBJEXT) core *.core
+ -rm -f *.$(OBJEXT)
distclean-compile:
-rm -f *.tab.c
@@ -377,91 +448,109 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/themes.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/wldlg.Po at am__quote@
-distclean-depend:
- -rm -rf ./$(DEPDIR)
-
.c.o:
- at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
- at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- $(COMPILE) -c `cygpath -w $<`
-CCDEPMODE = @CCDEPMODE@
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: CTAGS
+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
-check: check-am
+check: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) check-am
all-am: Makefile $(LIBRARIES)
-
installdirs:
-
-install: install-am
+install: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) install-am
install-exec: install-exec-am
install-data: install-data-am
uninstall: uninstall-am
@@ -472,7 +561,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -481,7 +570,8 @@ clean-generic:
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -492,48 +582,84 @@ clean: clean-am
clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
distclean: distclean-am
-
-distclean-am: clean-am distclean-compile distclean-depend \
- distclean-generic distclean-tags
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-tags
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am:
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-compile mostlyclean-generic
-uninstall-am: uninstall-info-am
+pdf: pdf-am
+
+pdf-am:
-.PHONY: GTAGS all all-am check check-am clean clean-generic \
- clean-noinstLIBRARIES distclean distclean-compile \
- distclean-depend distclean-generic distclean-tags distdir dvi \
- dvi-am info info-am install install-am install-data \
- install-data-am install-exec install-exec-am install-info \
- install-info-am install-man install-strip installcheck \
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: all check install install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ clean-noinstLIBRARIES ctags distclean distclean-compile \
+ distclean-generic distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic tags uninstall uninstall-am \
- uninstall-info-am
+ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+ uninstall-am
Freeciv.h: $(top_builddir)/data/Freeciv
@@ -541,6 +667,7 @@ Freeciv.h: $(top_builddir)/data/Freeciv
echo '/* DO NOT EDIT THIS FILE, EDIT ../../data/Freeciv */' >> Freeciv.h
echo '/**************************************************/' >> Freeciv.h
$(srcdir)/ad2c $(top_builddir)/data/Freeciv >> Freeciv.h
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/client/gui-xaw/pages.c b/client/gui-xaw/pages.c
index 0f35c18..e4591a3 100644
--- a/client/gui-xaw/pages.c
+++ b/client/gui-xaw/pages.c
@@ -295,3 +295,12 @@ void start_page_msg_close(Widget w)
{
popdown_start_page();
}
+
+/****************************************************************************
+ Refresh all vote related GUI widgets. Called by the voteinfo module when
+ the client receives new vote information from the server.
+****************************************************************************/
+void voteinfo_gui_update(void)
+{
+ /* PORTME */
+}
diff --git a/client/gui-xaw/wldlg.c b/client/gui-xaw/wldlg.c
index 02da234..bac2960 100644
--- a/client/gui-xaw/wldlg.c
+++ b/client/gui-xaw/wldlg.c
@@ -671,7 +671,7 @@ void insert_worklist_callback(Widget w, XtPointer client_data,
return;
/* Validate this slot. */
- init_worklist(&pdialog->pplr->worklists[j]);
+ worklist_init(&pdialog->pplr->worklists[j]);
pdialog->pplr->worklists[j].is_valid = TRUE;
strcpy(pdialog->pplr->worklists[j].name, _("empty worklist"));
@@ -701,7 +701,7 @@ void delete_worklist_callback(Widget w, XtPointer client_data,
break;
for (j = retList->list_index; j < i-1; j++) {
- copy_worklist(&pdialog->pplr->worklists[j],
+ worklist_copy(&pdialog->pplr->worklists[j],
&pdialog->pplr->worklists[j+1]);
}
@@ -744,7 +744,7 @@ void commit_player_worklist(struct worklist *pwl, void *data)
pdialog = (struct worklist_report_dialog *)data;
- copy_worklist(&pdialog->pplr->worklists[pdialog->wl_idx], pwl);
+ worklist_copy(&pdialog->pplr->worklists[pdialog->wl_idx], pwl);
}
/****************************************************************
@@ -1107,7 +1107,7 @@ void worklist_ok_callback(Widget w, XtPointer client_data, XtPointer call_data)
/* Fill in this worklist with the parameters set in the worklist
dialog. */
- init_worklist(&wl);
+ worklist_init(&wl);
for (i = 0; i < MAX_LEN_WORKLIST; i++) {
if (pdialog->worklist_ids[i] == WORKLIST_END) {
diff --git a/client/helpdata.c b/client/helpdata.c
index fa8f6be..658455b 100644
--- a/client/helpdata.c
+++ b/client/helpdata.c
@@ -1073,17 +1073,25 @@ char *helptext_unit(char *buf, size_t bufsz, struct unit_type *utype,
strcat(astr.str, deli_str);
}
}
-
- assert(num_allowed_units > 0);
- cat_snprintf(buf, bufsz,
- PL_("* Unit has to be in a city, or on a %s"
- " after %d turn.\n",
- "* Unit has to be in a city, or on a %s"
- " after %d turns.\n",
- utype->fuel),
- astr.str,
- utype->fuel);
+ if (num_allowed_units == 0) {
+ cat_snprintf(buf, bufsz,
+ PL_("* Unit has to be in a city, or a base"
+ " after %d turn.\n",
+ "* Unit has to be in a city, or a base"
+ " after %d turns.\n",
+ utype->fuel),
+ utype->fuel);
+ } else {
+ cat_snprintf(buf, bufsz,
+ PL_("* Unit has to be in a city, a base, or on a %s"
+ " after %d turn.\n",
+ "* Unit has to be in a city, a base, or on a %s"
+ " after %d turns.\n",
+ utype->fuel),
+ astr.str,
+ utype->fuel);
+ }
astr_free(&astr);
}
if (strlen(buf) > 0) {
diff --git a/client/include/Makefile.in b/client/include/Makefile.in
index 11565e3..0e2985a 100644
--- a/client/include/Makefile.in
+++ b/client/include/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,84 +14,100 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = client/include
+DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+HEADERS = $(noinst_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -101,10 +118,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -112,27 +133,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -140,6 +173,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -150,17 +185,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -173,12 +229,37 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
noinst_HEADERS = \
canvas_g.h \
chatline_g.h \
@@ -208,91 +289,126 @@ noinst_HEADERS = \
themes_g.h \
wldlg_g.h
-subdir = client/include
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-HEADERS = $(noinst_HEADERS)
-
-DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu client/include/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu client/include/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu client/include/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: CTAGS
+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(HEADERS)
-
installdirs:
-
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -304,7 +420,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -312,7 +428,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -322,45 +439,80 @@ clean: clean-am
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic distclean-tags
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am:
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic
-uninstall-am: uninstall-info-am
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ ctags distclean distclean-generic distclean-tags distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags uninstall uninstall-am
-.PHONY: GTAGS all all-am check check-am clean clean-generic distclean \
- distclean-generic distclean-tags distdir dvi dvi-am info \
- info-am install install-am install-data install-data-am \
- install-exec install-exec-am install-info install-info-am \
- install-man install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic tags uninstall uninstall-am \
- uninstall-info-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/client/include/pages_g.h b/client/include/pages_g.h
index 41508c9..166499b 100644
--- a/client/include/pages_g.h
+++ b/client/include/pages_g.h
@@ -30,5 +30,6 @@ enum client_pages {
void set_client_page(enum client_pages page);
enum client_pages get_client_page(void);
void update_start_page(void);
+void voteinfo_gui_update(void);
#endif /* FC__PAGES_G_H */
diff --git a/client/mapview_common.c b/client/mapview_common.c
index 023a4b7..b41be97 100644
--- a/client/mapview_common.c
+++ b/client/mapview_common.c
@@ -920,12 +920,12 @@ void put_one_element(struct canvas *pcanvas, enum mapview_layer layer,
/**************************************************************************
Draw the given unit onto the canvas store at the given location. The
- area of drawing is tileset_full_tile_height(tileset) x tileset_full_tile_width(tileset).
+ area of drawing is tileset_unit_height(tileset) x tileset_unit_width(tileset).
**************************************************************************/
void put_unit(const struct unit *punit,
struct canvas *pcanvas, int canvas_x, int canvas_y)
{
- canvas_y += (tileset_full_tile_height(tileset) - tileset_tile_height(tileset));
+ canvas_y += (tileset_unit_height(tileset) - tileset_tile_height(tileset));
mapview_layer_iterate(layer) {
put_one_element(pcanvas, layer, NULL, NULL, NULL,
punit, NULL, canvas_x, canvas_y, NULL);
@@ -1382,7 +1382,7 @@ static void show_full_citybar(struct canvas *pcanvas,
/* We can see the city's production or growth values if
* we are observing or playing as the owner of the city. */
- const bool can_see_inside = (client_is_observer()
+ const bool can_see_inside = (!game.player_ptr
|| city_owner(pcity) == game.player_ptr);
const bool should_draw_productions = (can_see_inside
&& draw_city_productions);
@@ -1941,6 +1941,7 @@ void move_unit_map_canvas(struct unit *punit,
tile_to_canvas_pos(&start_x, &start_y, src_tile);
if (tileset_is_isometric(tileset)) {
start_y -= tileset_tile_height(tileset) / 2;
+ start_y -= tileset_unit_height(tileset) - tileset_full_tile_height(tileset);
}
/* Bring the backing store up to date, but don't flush. */
@@ -1960,11 +1961,11 @@ void move_unit_map_canvas(struct unit *punit,
/* Backup the canvas store to the temp store. */
canvas_copy(mapview.tmp_store, mapview.store,
new_x, new_y, new_x, new_y,
- tileset_full_tile_width(tileset), tileset_full_tile_height(tileset));
+ tileset_unit_width(tileset), tileset_unit_height(tileset));
/* Draw */
put_unit(punit, mapview.store, new_x, new_y);
- dirty_rect(new_x, new_y, tileset_full_tile_width(tileset), tileset_full_tile_height(tileset));
+ dirty_rect(new_x, new_y, tileset_unit_width(tileset), tileset_unit_height(tileset));
/* Flush. */
flush_dirty();
@@ -1973,8 +1974,8 @@ void move_unit_map_canvas(struct unit *punit,
/* Restore the backup. It won't take effect until the next flush. */
canvas_copy(mapview.store, mapview.tmp_store,
new_x, new_y, new_x, new_y,
- tileset_full_tile_width(tileset), tileset_full_tile_height(tileset));
- dirty_rect(new_x, new_y, tileset_full_tile_width(tileset), tileset_full_tile_height(tileset));
+ tileset_unit_width(tileset), tileset_unit_height(tileset));
+ dirty_rect(new_x, new_y, tileset_unit_width(tileset), tileset_unit_height(tileset));
} while (mytime < timing_sec);
}
}
@@ -1994,13 +1995,18 @@ void move_unit_map_canvas(struct unit *punit,
struct city *find_city_or_settler_near_tile(const struct tile *ptile,
struct unit **punit)
{
- struct city *pcity = ptile->worked, *closest_city;
+ struct city *pcity = NULL, *closest_city;
struct unit *closest_settler = NULL, *best_settler = NULL;
if (punit) {
*punit = NULL;
}
+ if (ptile && ptile->worked) {
+ /* Make sure the city exists. */
+ pcity = game_find_city_by_number(ptile->worked->id);
+ }
+
if (pcity) {
if (!game.player_ptr || city_owner(pcity) == game.player_ptr) {
/* rule a */
@@ -2237,7 +2243,7 @@ void unqueue_mapview_updates(bool write_to_screen)
* edge/corner graphics).
*/
const int W = tileset_tile_width(tileset), H = tileset_tile_height(tileset);
- const int UW = tileset_full_tile_width(tileset), UH = tileset_full_tile_height(tileset);
+ const int UW = tileset_unit_width(tileset), UH = tileset_unit_height(tileset);
const int city_width = get_citydlg_canvas_width() + W;
const int city_height = get_citydlg_canvas_height() + H;
const struct {
diff --git a/client/messagewin_common.c b/client/messagewin_common.c
index 241e05e..3748d93 100644
--- a/client/messagewin_common.c
+++ b/client/messagewin_common.c
@@ -158,12 +158,16 @@ void add_notify_window(char *message, struct tile *ptile,
}
/**************************************************************************
- Returns the pointer to a message.
+ Returns the pointer to a message. Returns NULL on error.
**************************************************************************/
struct message *get_message(int message_index)
{
- assert(message_index >= 0 && message_index < messages_total);
- return &messages[message_index];
+ if (message_index >= 0 && message_index < messages_total) {
+ return &messages[message_index];
+ } else {
+ /* Can happen in turn change... */
+ return NULL;
+ }
}
/**************************************************************************
diff --git a/client/packhand.c b/client/packhand.c
index b28dcf6..3c92b3e 100644
--- a/client/packhand.c
+++ b/client/packhand.c
@@ -69,6 +69,7 @@
#include "repodlgs_g.h"
#include "spaceshipdlg_g.h"
#include "tilespec.h"
+#include "voteinfo.h"
#include "wldlg_g.h"
#include "packhand.h"
@@ -428,6 +429,7 @@ void handle_city_info(struct packet_city_info *packet)
bool popup, update_descriptions = FALSE, name_changed = FALSE;
bool shield_stock_changed = FALSE;
bool production_changed = FALSE;
+ bool traderoutes_changed = FALSE;
struct unit_list *pfocus_units = get_units_in_focus();
struct city *pcity = game_find_city_by_number(packet->id);
@@ -498,8 +500,11 @@ void handle_city_info(struct packet_city_info *packet)
pcity->city_options = packet->city_options;
for (i = 0; i < NUM_TRADEROUTES; i++) {
- pcity->trade[i]=packet->trade[i];
- pcity->trade_value[i]=packet->trade_value[i];
+ if (pcity->trade[i] != packet->trade[i]) {
+ pcity->trade[i] = packet->trade[i];
+ traderoutes_changed = TRUE;
+ }
+ pcity->trade_value[i] = packet->trade_value[i];
}
output_type_iterate(o) {
@@ -530,13 +535,13 @@ void handle_city_info(struct packet_city_info *packet)
pcity->production.is_unit = packet->production_is_unit;
pcity->production.value = packet->production_value;
if (city_is_new) {
- init_worklist(&pcity->worklist);
+ worklist_init(&pcity->worklist);
for (i = 0; i < ARRAY_SIZE(pcity->improvements); i++) {
pcity->improvements[i] = I_NONE;
}
}
- copy_worklist(&pcity->worklist, &packet->worklist);
+ worklist_copy(&pcity->worklist, &packet->worklist);
pcity->did_buy=packet->did_buy;
pcity->did_sell=packet->did_sell;
pcity->was_happy=packet->was_happy;
@@ -631,6 +636,10 @@ void handle_city_info(struct packet_city_info *packet)
&& caravan_city_id == pcity->id) {
caravan_dialog_update();
}
+
+ if (traderoutes_changed && draw_city_traderoutes) {
+ update_map_canvas_visible();
+ }
}
/****************************************************************************
@@ -749,7 +758,12 @@ void handle_city_short_info(struct packet_city_short_info *packet)
/* We can't actually see the internals of the city, but the server tells
* us this much. */
- pcity->client.occupied = packet->occupied;
+ if (pcity->client.occupied != packet->occupied) {
+ pcity->client.occupied = packet->occupied;
+ if (draw_full_citybar) {
+ update_descriptions = TRUE;
+ }
+ }
pcity->client.happy = packet->happy;
pcity->client.unhappy = packet->unhappy;
@@ -785,7 +799,7 @@ void handle_city_short_info(struct packet_city_short_info *packet)
BV_CLR_ALL(pcity->city_options);
pcity->production.is_unit = FALSE;
pcity->production.value = 0;
- init_worklist(&pcity->worklist);
+ worklist_init(&pcity->worklist);
pcity->airlift = FALSE;
pcity->did_buy = FALSE;
pcity->did_sell = FALSE;
@@ -1196,12 +1210,14 @@ static bool handle_unit_packet_common(struct unit *packet_unit)
bool new_occupied =
(unit_list_size(pcity->tile->units) > 0);
- if (pcity->client.occupied != new_occupied) {
- pcity->client.occupied = new_occupied;
- refresh_city_mapcanvas(pcity, pcity->tile, FALSE, FALSE);
- update_city_description(pcity);
- }
- }
+ if (pcity->client.occupied != new_occupied) {
+ pcity->client.occupied = new_occupied;
+ refresh_city_mapcanvas(pcity, pcity->tile, FALSE, FALSE);
+ if (draw_full_citybar) {
+ update_city_description(pcity);
+ }
+ }
+ }
if(pcity->id==punit->homecity)
repaint_city = TRUE;
@@ -1215,6 +1231,9 @@ static bool handle_unit_packet_common(struct unit *packet_unit)
if (!pcity->client.occupied) {
pcity->client.occupied = TRUE;
refresh_city_mapcanvas(pcity, pcity->tile, FALSE, FALSE);
+ if (draw_full_citybar) {
+ update_city_description(pcity);
+ }
}
}
@@ -1222,18 +1241,29 @@ static bool handle_unit_packet_common(struct unit *packet_unit)
repaint_city = TRUE;
else
refresh_city_dialog(pcity);
-
- if((unit_has_type_flag(punit, F_TRADE_ROUTE) || unit_has_type_flag(punit, F_HELP_WONDER))
- && game.player_ptr
- && !game.player_ptr->ai.control
- && unit_owner(punit) == game.player_ptr
- && !unit_has_orders(punit)
- && can_client_issue_orders()
- && popup_caravan_arrival
- && (unit_can_help_build_wonder_here(punit)
- || unit_can_est_traderoute_here(punit))) {
- process_caravan_arrival(punit);
- }
+
+ if (popup_caravan_arrival
+ && NULL != game.player_ptr
+ && !game.player_ptr->ai.control
+ && can_client_issue_orders()
+ && !unit_has_orders(punit)) {
+ if (punit->transported_by == -1
+ && game.player_ptr == unit_owner(punit)
+ && (unit_can_help_build_wonder_here(punit)
+ || unit_can_est_traderoute_here(punit))) {
+ process_caravan_arrival(punit);
+ }
+ /* Check for transported units. */
+ unit_list_iterate(game.player_ptr->units, pcargo) {
+ if (pcargo->transported_by == punit->id
+ && game.player_ptr == unit_owner(pcargo)
+ && !unit_has_orders(pcargo)
+ && (unit_can_help_build_wonder_here(pcargo)
+ || unit_can_est_traderoute_here(pcargo))) {
+ process_caravan_arrival(pcargo);
+ }
+ } unit_list_iterate_end;
+ }
}
} /*** End of Change position. ***/
@@ -1769,7 +1799,7 @@ void handle_conn_info(struct packet_conn_info *pinfo)
aconnection.established = pconn->established;
aconnection.observer = pconn->observer;
aconnection.access_level = pconn->access_level;
- aconnection.player = pplayer;
+ game.player_ptr = aconnection.player = pplayer;
}
}
update_players_dialog();
@@ -2038,9 +2068,9 @@ void handle_tile_info(struct packet_tile_info *packet)
} tile_special_type_iterate_end;
if (NULL != ptile->resource) {
- tile_changed = (ptile->resource->index != packet->resource);
+ tile_changed |= (ptile->resource->index != packet->resource);
} else {
- tile_changed = (-1 != packet->resource);
+ tile_changed |= (-1 != packet->resource);
}
/* always called after setting terrain */
@@ -2966,3 +2996,73 @@ void handle_ruleset_effect_req(struct packet_ruleset_effect_req *packet)
recv_ruleset_effect_req(packet);
}
+/**************************************************************************
+ A vote no longer exists. Remove from queue and update gui.
+**************************************************************************/
+void handle_vote_remove(int vote_no)
+{
+ voteinfo_queue_delayed_remove(vote_no);
+ voteinfo_gui_update();
+}
+
+/**************************************************************************
+ Find and update the corresponding vote and refresh the GUI.
+**************************************************************************/
+void handle_vote_update(int vote_no, int yes, int no, int abstain,
+ int num_voters)
+{
+ struct voteinfo *vi;
+
+ vi = voteinfo_queue_find(vote_no);
+ if (vi == NULL) {
+ freelog(LOG_ERROR, "Got packet_vote_update for non-existant vote %d!",
+ vote_no);
+ return;
+ }
+
+ vi->yes = yes;
+ vi->no = no;
+ vi->abstain = abstain;
+ vi->num_voters = num_voters;
+
+ voteinfo_gui_update();
+}
+
+/**************************************************************************
+ Create a new vote and add it to the queue. Refresh the GUI.
+**************************************************************************/
+void handle_vote_new(struct packet_vote_new *packet)
+{
+ if (voteinfo_queue_find(packet->vote_no)) {
+ freelog(LOG_ERROR, "Got a packet_vote_new for already existing "
+ "vote %d!", packet->vote_no);
+ return;
+ }
+
+ voteinfo_queue_add(packet->vote_no,
+ packet->user,
+ packet->desc,
+ packet->percent_required,
+ packet->flags);
+ voteinfo_gui_update();
+}
+
+/**************************************************************************
+ Update the vote's status and refresh the GUI.
+**************************************************************************/
+void handle_vote_resolve(int vote_no, bool passed)
+{
+ struct voteinfo *vi;
+
+ vi = voteinfo_queue_find(vote_no);
+ if (vi == NULL) {
+ freelog(LOG_ERROR, "Got packet_vote_resolve for non-existant "
+ "vote %d!", vote_no);
+ return;
+ }
+
+ vi->resolved = TRUE;
+ vi->passed = passed;
+
+ voteinfo_gui_update();
+}
diff --git a/client/packhand_gen.c b/client/packhand_gen.c
index 2f31087..0b110a8 100644
--- a/client/packhand_gen.c
+++ b/client/packhand_gen.c
@@ -338,6 +338,30 @@ bool client_handle_packet(enum packet_type type, void *packet)
handle_ruleset_resource(packet);
return TRUE;
+ case PACKET_VOTE_NEW:
+ handle_vote_new(packet);
+ return TRUE;
+
+ case PACKET_VOTE_UPDATE:
+ handle_vote_update(
+ ((struct packet_vote_update *)packet)->vote_no,
+ ((struct packet_vote_update *)packet)->yes,
+ ((struct packet_vote_update *)packet)->no,
+ ((struct packet_vote_update *)packet)->abstain,
+ ((struct packet_vote_update *)packet)->num_voters);
+ return TRUE;
+
+ case PACKET_VOTE_REMOVE:
+ handle_vote_remove(
+ ((struct packet_vote_remove *)packet)->vote_no);
+ return TRUE;
+
+ case PACKET_VOTE_RESOLVE:
+ handle_vote_resolve(
+ ((struct packet_vote_resolve *)packet)->vote_no,
+ ((struct packet_vote_resolve *)packet)->passed);
+ return TRUE;
+
default:
return FALSE;
}
diff --git a/client/packhand_gen.h b/client/packhand_gen.h
index 964b3c0..dfd8d6a 100644
--- a/client/packhand_gen.h
+++ b/client/packhand_gen.h
@@ -111,5 +111,10 @@ struct packet_ruleset_effect_req;
void handle_ruleset_effect_req(struct packet_ruleset_effect_req *packet);
struct packet_ruleset_resource;
void handle_ruleset_resource(struct packet_ruleset_resource *packet);
+struct packet_vote_new;
+void handle_vote_new(struct packet_vote_new *packet);
+void handle_vote_update(int vote_no, int yes, int no, int abstain, int num_voters);
+void handle_vote_remove(int vote_no);
+void handle_vote_resolve(int vote_no, bool passed);
#endif /* FC__PACKHAND_GEN_H */
diff --git a/client/repodlgs_common.c b/client/repodlgs_common.c
index c453170..11d04ab 100644
--- a/client/repodlgs_common.c
+++ b/client/repodlgs_common.c
@@ -350,10 +350,13 @@ void handle_options_settable(struct packet_options_settable *packet)
o->extra_help = mystrdup(packet->extra_help);
/* have no proper final packet, test for the last instead */
- if (i == (num_settable_options - 1) && !settable_options_loaded) {
+ if (i == (num_settable_options - 1) && !settable_options_loaded
+ && packet->initial_setting) {
/* 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. */
+ * client with the "Start New Game" button.
+ * Do now override settings that are already saved to savegame
+ * and now loaded. */
load_settable_options(is_server_running());
settable_options_loaded = TRUE;
}
diff --git a/client/servers.h b/client/servers.h
index 6b7ec12..1dcea79 100644
--- a/client/servers.h
+++ b/client/servers.h
@@ -14,7 +14,7 @@
#ifndef FC__SERVERS_H
#define FC__SERVERS_H
-#define METALIST_ADDR "http://www.cazfi.net/freeciv/metaserver/"
+#define METALIST_ADDR "http://meta.freeciv.org/metaserver.phtml"
#define SERVER_LAN_PORT 4555
#define SERVER_LAN_TTL 1
diff --git a/client/text.c b/client/text.c
index 7ab9db6..0b85f2d 100644
--- a/client/text.c
+++ b/client/text.c
@@ -1135,14 +1135,19 @@ const char *get_ping_time_text(const struct player *pplayer)
astr_clear(&str);
- if (conn_list_size(pplayer->connections) > 0
- && conn_list_get(pplayer->connections, 0)->ping_time != -1.0) {
- double ping_time_in_ms =
- 1000 * conn_list_get(pplayer->connections, 0)->ping_time;
-
- astr_add(&str, _("%6d.%02d ms"), (int) ping_time_in_ms,
- ((int) (ping_time_in_ms * 100.0)) % 100);
- }
+ conn_list_iterate(pplayer->connections, pconn) {
+ if (!pconn->observer
+ /* Certainly not needed, but safer. */
+ && 0 == strcmp(pconn->username, pplayer->username)) {
+ if (pconn->ping_time != -1) {
+ double ping_time_in_ms = 1000 * pconn->ping_time;
+
+ astr_add(&str, _("%6d.%02d ms"), (int) ping_time_in_ms,
+ ((int) (ping_time_in_ms * 100.0)) % 100);
+ }
+ break;
+ }
+ } conn_list_iterate_end;
return str.str;
}
diff --git a/client/tilespec.c b/client/tilespec.c
index dde0d79..102ee8e 100644
--- a/client/tilespec.c
+++ b/client/tilespec.c
@@ -376,6 +376,7 @@ struct tileset {
int normal_tile_width, normal_tile_height;
int full_tile_width, full_tile_height;
+ int unit_tile_width, unit_tile_height;
int small_sprite_width, small_sprite_height;
char *main_intro_filename;
@@ -530,6 +531,22 @@ int tileset_full_tile_height(const struct tileset *t)
}
/****************************************************************************
+ Return the unit tile width of the current tileset.
+****************************************************************************/
+int tileset_unit_width(const struct tileset *t)
+{
+ return t->unit_tile_width;
+}
+
+/****************************************************************************
+ Return the unit tile height of the current tileset.
+****************************************************************************/
+int tileset_unit_height(const struct tileset *t)
+{
+ return t->unit_tile_height;
+}
+
+/****************************************************************************
Return the small sprite width of the current tileset. The small sprites
are used for various theme graphics (e.g., citymap citizens/specialists
as well as panel indicator icons).
@@ -1385,6 +1402,10 @@ struct tileset *tileset_read_toplevel(const char *tileset_name, bool verbose)
t->full_tile_width = t->normal_tile_width;
t->full_tile_height = t->normal_tile_height;
}
+ t->unit_tile_width
+ = secfile_lookup_int_default(file, t->full_tile_width, "tilespec.unit_width");
+ t->unit_tile_height
+ = secfile_lookup_int_default(file, t->full_tile_height, "tilespec.unit_height");
t->small_sprite_width
= secfile_lookup_int(file, "tilespec.small_tile_width");
t->small_sprite_height
diff --git a/client/tilespec.h b/client/tilespec.h
index 10438a6..1337392 100644
--- a/client/tilespec.h
+++ b/client/tilespec.h
@@ -250,6 +250,8 @@ int tileset_tile_width(const struct tileset *t);
int tileset_tile_height(const struct tileset *t);
int tileset_full_tile_width(const struct tileset *t);
int tileset_full_tile_height(const struct tileset *t);
+int tileset_unit_width(const struct tileset *t);
+int tileset_unit_height(const struct tileset *t);
int tileset_small_sprite_width(const struct tileset *t);
int tileset_small_sprite_height(const struct tileset *t);
int tileset_citybar_offset_y(const struct tileset *t);
diff --git a/client/voteinfo.c b/client/voteinfo.c
new file mode 100644
index 0000000..682b61f
--- /dev/null
+++ b/client/voteinfo.c
@@ -0,0 +1,271 @@
+/***********************************************************************
+ Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+***********************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <time.h>
+
+#include "log.h"
+#include "packets.h"
+
+#include "clinet.h"
+#include "pages_g.h"
+
+#include "voteinfo.h"
+
+
+struct voteinfo_list *voteinfo_queue = NULL;
+static int voteinfo_queue_current_index = 0;
+
+
+/**************************************************************************
+ Remove the vote with number 'vote_no' after a small amount of time so
+ that the user can see that it was removed.
+**************************************************************************/
+void voteinfo_queue_delayed_remove(int vote_no)
+{
+ struct voteinfo *vi;
+
+ if (voteinfo_queue == NULL) {
+ freelog(LOG_ERROR, "voteinfo_queue_delayed_remove called before "
+ "votinfo_queue_init!");
+ return;
+ }
+
+ vi = voteinfo_queue_find(vote_no);
+ if (vi == NULL) {
+ return;
+ }
+ vi->remove_time = time(NULL);
+}
+
+/**************************************************************************
+ Check for old votes that should be removed from the queue. This function
+ should be called periodically from a timer callback.
+**************************************************************************/
+void voteinfo_queue_check_removed(void)
+{
+ time_t now;
+ struct voteinfo_list *removed;
+
+ if (voteinfo_queue == NULL) {
+ return;
+ }
+
+ now = time(NULL);
+ removed = voteinfo_list_new();
+ voteinfo_list_iterate(voteinfo_queue, vi) {
+ if (vi != NULL && vi->remove_time > 0 && now - vi->remove_time > 2) {
+ voteinfo_list_append(removed, vi);
+ }
+ } voteinfo_list_iterate_end;
+
+ voteinfo_list_iterate(removed, vi) {
+ voteinfo_queue_remove(vi->vote_no);
+ } voteinfo_list_iterate_end;
+
+ if (voteinfo_list_size(removed) > 0) {
+ voteinfo_gui_update();
+ }
+
+ voteinfo_list_free(removed);
+}
+
+/**************************************************************************
+ Remove the given vote from the queue immediately.
+**************************************************************************/
+void voteinfo_queue_remove(int vote_no)
+{
+ struct voteinfo *vi;
+
+ if (voteinfo_queue == NULL) {
+ freelog(LOG_ERROR, "voteinfo_queue_prepare_remove called before "
+ "votinfo_queue_init!");
+ return;
+ }
+
+ vi = voteinfo_queue_find(vote_no);
+ if (vi == NULL) {
+ return;
+ }
+
+ voteinfo_list_unlink(voteinfo_queue, vi);
+ free(vi);
+}
+
+/**************************************************************************
+ Create a new voteinfo record and place it in the queue.
+**************************************************************************/
+void voteinfo_queue_add(int vote_no, const char *user, const char *desc,
+ int percent_required, int flags)
+{
+ struct voteinfo *vi;
+
+ if (voteinfo_queue == NULL) {
+ freelog(LOG_ERROR, "voteinfo_queue_add called before "
+ "votinfo_queue_init!");
+ return;
+ }
+
+ vi = fc_calloc(1, sizeof(struct voteinfo));
+ vi->vote_no = vote_no;
+ sz_strlcpy(vi->user, user);
+ sz_strlcpy(vi->desc, desc);
+ vi->percent_required = percent_required;
+ vi->flags = flags;
+
+ voteinfo_list_append(voteinfo_queue, vi);
+}
+
+/**************************************************************************
+ Find the voteinfo record corresponding to the given vote number.
+**************************************************************************/
+struct voteinfo *voteinfo_queue_find(int vote_no)
+{
+ if (voteinfo_queue == NULL) {
+ freelog(LOG_ERROR, "voteinfo_queue_find called before "
+ "votinfo_queue_init!");
+ return NULL;
+ }
+
+ voteinfo_list_iterate(voteinfo_queue, vi) {
+ if (vi->vote_no == vote_no) {
+ return vi;
+ }
+ } voteinfo_list_iterate_end;
+ return NULL;
+}
+
+/**************************************************************************
+ Initialize data structures used by this module.
+**************************************************************************/
+void voteinfo_queue_init(void)
+{
+ if (voteinfo_queue != NULL) {
+ voteinfo_queue_free();
+ }
+ voteinfo_queue = voteinfo_list_new();
+ voteinfo_queue_current_index = 0;
+}
+
+/**************************************************************************
+ Free memory allocated by this module.
+**************************************************************************/
+void voteinfo_queue_free(void)
+{
+ if (voteinfo_queue == NULL) {
+ return;
+ }
+
+ voteinfo_list_iterate(voteinfo_queue, vi) {
+ if (vi != NULL) {
+ free(vi);
+ }
+ } voteinfo_list_iterate_end;
+
+ voteinfo_list_unlink_all(voteinfo_queue);
+ voteinfo_list_free(voteinfo_queue);
+ voteinfo_queue = NULL;
+ voteinfo_queue_current_index = 0;
+}
+
+/**************************************************************************
+ Get the voteinfo record at the start of the vote queue. If 'pindex' is
+ non-NULL, it is set to queue index of that record. This function is
+ used in conjunction with voteinfo_queue_next().
+**************************************************************************/
+struct voteinfo *voteinfo_queue_get_current(int *pindex)
+{
+ struct voteinfo *vi;
+ int size;
+
+ if (voteinfo_queue == NULL) {
+ return NULL;
+ }
+
+ size = voteinfo_list_size(voteinfo_queue);
+
+ if (size <= 0) {
+ return NULL;
+ }
+
+ if (!(0 <= voteinfo_queue_current_index
+ && voteinfo_queue_current_index < size)) {
+ voteinfo_queue_next();
+ }
+
+ vi = voteinfo_list_get(voteinfo_queue, voteinfo_queue_current_index);
+
+ if (vi != NULL && pindex != NULL) {
+ *pindex = voteinfo_queue_current_index;
+ }
+
+ return vi;
+}
+
+/**************************************************************************
+ Convenience function for submitting a vote to the server.
+ NB: Only to be used if the server has the "voteinfo" capability.
+**************************************************************************/
+void voteinfo_do_vote(int vote_no, enum client_vote_type vote)
+{
+ struct voteinfo *vi;
+ struct packet_vote_submit packet;
+
+ vi = voteinfo_queue_find(vote_no);
+ if (vi == NULL) {
+ return;
+ }
+
+ packet.vote_no = vi->vote_no;
+
+ switch (vote) {
+ case CVT_YES:
+ packet.value = 1;
+ break;
+ case CVT_NO:
+ packet.value = -1;
+ break;
+ case CVT_ABSTAIN:
+ packet.value = 0;
+ break;
+ default:
+ return;
+ break;
+ }
+
+ send_packet_vote_submit(&aconnection, &packet);
+ vi->client_vote = vote;
+}
+
+/**************************************************************************
+ Cycle through the votes in the queue.
+**************************************************************************/
+void voteinfo_queue_next(void)
+{
+ int size;
+
+ if (voteinfo_queue == NULL) {
+ return;
+ }
+
+ size = voteinfo_list_size(voteinfo_queue);
+
+ voteinfo_queue_current_index++;
+ if (voteinfo_queue_current_index >= size) {
+ voteinfo_queue_current_index = 0;
+ }
+}
+
diff --git a/client/voteinfo.h b/client/voteinfo.h
new file mode 100644
index 0000000..d592e53
--- /dev/null
+++ b/client/voteinfo.h
@@ -0,0 +1,67 @@
+/***********************************************************************
+ Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+***********************************************************************/
+#ifndef FC__VOTEINFO_H
+#define FC__VOTEINFO_H
+
+#include "fc_types.h"
+
+enum client_vote_type {
+ CVT_NONE = 0,
+ CVT_YES,
+ CVT_NO,
+ CVT_ABSTAIN
+};
+
+struct voteinfo {
+ /* Set by the server via packets. */
+ int vote_no;
+ char user[MAX_LEN_NAME];
+ char desc[512];
+ int percent_required;
+ int flags;
+ int yes;
+ int no;
+ int abstain;
+ int num_voters;
+ bool resolved;
+ bool passed;
+
+ /* Set/used by the client. */
+ enum client_vote_type client_vote;
+ time_t remove_time;
+};
+
+void voteinfo_queue_init(void);
+void voteinfo_queue_free(void);
+void voteinfo_queue_remove(int vote_no);
+void voteinfo_queue_delayed_remove(int vote_no);
+void voteinfo_queue_check_removed(void);
+void voteinfo_queue_add(int vote_no, const char *user, const char *desc,
+ int percent_required, int flags);
+struct voteinfo *voteinfo_queue_find(int vote_no);
+void voteinfo_do_vote(int vote_no, enum client_vote_type vote);
+struct voteinfo *voteinfo_queue_get_current(int *pindex);
+void voteinfo_queue_next(void);
+
+/* Define struct voteinfo_list type. */
+#define SPECLIST_TAG voteinfo
+#define SPECLIST_TYPE struct voteinfo
+#include "speclist.h"
+#define voteinfo_list_iterate(alist, pitem)\
+ TYPED_LIST_ITERATE(struct voteinfo, alist, pitem)
+#define voteinfo_list_iterate_end LIST_ITERATE_END
+
+extern struct voteinfo_list *voteinfo_queue;
+
+#endif /* FC__VOTEINFO_H */
+
diff --git a/common/Makefile.in b/common/Makefile.in
index bec870a..29e241b 100644
--- a/common/Makefile.in
+++ b/common/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,84 +14,160 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = common
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+libcivcommon_a_AR = $(AR) $(ARFLAGS)
+libcivcommon_a_LIBADD =
+am_libcivcommon_a_OBJECTS = capstr.$(OBJEXT) city.$(OBJEXT) \
+ combat.$(OBJEXT) connection.$(OBJEXT) dataio.$(OBJEXT) \
+ diptreaty.$(OBJEXT) effects.$(OBJEXT) events.$(OBJEXT) \
+ game.$(OBJEXT) government.$(OBJEXT) idex.$(OBJEXT) \
+ improvement.$(OBJEXT) map.$(OBJEXT) movement.$(OBJEXT) \
+ nation.$(OBJEXT) packets.$(OBJEXT) packets_gen.$(OBJEXT) \
+ player.$(OBJEXT) requirements.$(OBJEXT) spaceship.$(OBJEXT) \
+ specialist.$(OBJEXT) team.$(OBJEXT) tech.$(OBJEXT) \
+ terrain.$(OBJEXT) tile.$(OBJEXT) unit.$(OBJEXT) \
+ unitlist.$(OBJEXT) unittype.$(OBJEXT) worklist.$(OBJEXT) \
+ version.$(OBJEXT)
+libcivcommon_a_OBJECTS = $(am_libcivcommon_a_OBJECTS)
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/bootstrap/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libcivcommon_a_SOURCES)
+DIST_SOURCES = $(libcivcommon_a_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+ distdir
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+ dir0=`pwd`; \
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+ sed_rest='s,^[^/]*/*,,'; \
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+ sed_butlast='s,/*[^/]*$$,,'; \
+ while test -n "$$dir1"; do \
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+ if test "$$first" != "."; then \
+ if test "$$first" = ".."; then \
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+ else \
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+ if test "$$first2" = "$$first"; then \
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+ else \
+ dir2="../$$dir2"; \
+ fi; \
+ dir0="$$dir0"/"$$first"; \
+ fi; \
+ fi; \
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+ done; \
+ reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -101,10 +178,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -112,27 +193,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -140,6 +233,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -150,17 +245,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -173,18 +289,40 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
SUBDIRS = aicore
-
noinst_LIBRARIES = libcivcommon.a
-
AM_CPPFLAGS = -I../intl -I$(top_srcdir)/utility -I$(srcdir)/aicore
-
libcivcommon_a_SOURCES = \
capstr.c \
capstr.h \
@@ -250,76 +388,42 @@ libcivcommon_a_SOURCES = \
version.c \
version.h
-
BUILT_SOURCES = packets_gen.c packets_gen.h
-subdir = common
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-libcivcommon_a_AR = $(AR) cru
-libcivcommon_a_LIBADD =
-am_libcivcommon_a_OBJECTS = capstr.$(OBJEXT) city.$(OBJEXT) \
- combat.$(OBJEXT) connection.$(OBJEXT) dataio.$(OBJEXT) \
- diptreaty.$(OBJEXT) effects.$(OBJEXT) events.$(OBJEXT) \
- game.$(OBJEXT) government.$(OBJEXT) idex.$(OBJEXT) \
- improvement.$(OBJEXT) map.$(OBJEXT) movement.$(OBJEXT) \
- nation.$(OBJEXT) packets.$(OBJEXT) packets_gen.$(OBJEXT) \
- player.$(OBJEXT) requirements.$(OBJEXT) spaceship.$(OBJEXT) \
- specialist.$(OBJEXT) team.$(OBJEXT) tech.$(OBJEXT) \
- terrain.$(OBJEXT) tile.$(OBJEXT) unit.$(OBJEXT) \
- unitlist.$(OBJEXT) unittype.$(OBJEXT) worklist.$(OBJEXT) \
- version.$(OBJEXT)
-libcivcommon_a_OBJECTS = $(am_libcivcommon_a_OBJECTS)
-
-DEFS = @DEFS@
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-depcomp = $(SHELL) $(top_srcdir)/bootstrap/depcomp
-am__depfiles_maybe = depfiles
- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/capstr.Po ./$(DEPDIR)/city.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/combat.Po ./$(DEPDIR)/connection.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/dataio.Po ./$(DEPDIR)/diptreaty.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/effects.Po ./$(DEPDIR)/events.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/game.Po ./$(DEPDIR)/government.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/idex.Po ./$(DEPDIR)/improvement.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/map.Po ./$(DEPDIR)/movement.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/nation.Po ./$(DEPDIR)/packets.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/packets_gen.Po ./$(DEPDIR)/player.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/requirements.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/spaceship.Po ./$(DEPDIR)/specialist.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/team.Po ./$(DEPDIR)/tech.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/terrain.Po ./$(DEPDIR)/tile.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/unit.Po ./$(DEPDIR)/unitlist.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/unittype.Po ./$(DEPDIR)/version.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/worklist.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-CFLAGS = @CFLAGS@
-DIST_SOURCES = $(libcivcommon_a_SOURCES)
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
- uninstall-info-recursive all-recursive install-data-recursive \
- install-exec-recursive installdirs-recursive install-recursive \
- uninstall-recursive check-recursive installcheck-recursive
-DIST_COMMON = Makefile.am Makefile.in
-DIST_SUBDIRS = $(SUBDIRS)
-SOURCES = $(libcivcommon_a_SOURCES)
-
all: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) all-recursive
.SUFFIXES:
.SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu common/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu common/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu common/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
clean-noinstLIBRARIES:
-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
@@ -329,7 +433,7 @@ libcivcommon.a: $(libcivcommon_a_OBJECTS) $(libcivcommon_a_DEPENDENCIES)
$(RANLIB) libcivcommon.a
mostlyclean-compile:
- -rm -f *.$(OBJEXT) core *.core
+ -rm -f *.$(OBJEXT)
distclean-compile:
-rm -f *.tab.c
@@ -365,22 +469,19 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/version.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/worklist.Po at am__quote@
-distclean-depend:
- -rm -rf ./$(DEPDIR)
-
.c.o:
- at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
- at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- $(COMPILE) -c `cygpath -w $<`
-CCDEPMODE = @CCDEPMODE@
-uninstall-info-am:
+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
@@ -389,7 +490,13 @@ uninstall-info-am:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @set fnord $$MAKEFLAGS; amf=$$2; \
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -400,16 +507,21 @@ $(RECURSIVE_TARGETS):
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
- @set fnord $$MAKEFLAGS; amf=$$2; \
+$(RECURSIVE_CLEAN_TARGETS):
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -429,100 +541,149 @@ maintainer-clean-recursive:
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+ctags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
-
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ empty_fix=.; \
+ else \
+ include_option=--include; \
+ empty_fix=; \
+ fi; \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+ test ! -f $$subdir/TAGS || \
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
- list='$(SUBDIRS)'; for subdir in $$list; do \
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d $(distdir)/$$subdir \
- || mkdir $(distdir)/$$subdir \
+ test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
- (cd $$subdir && \
+ fi; \
+ done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+ dir1=$$subdir; dir2="$(top_distdir)"; \
+ $(am__relativize); \
+ new_top_distdir=$$reldir; \
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+ ($(am__cd) $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$(top_distdir)" \
- distdir=../$(distdir)/$$subdir \
+ top_distdir="$$new_top_distdir" \
+ distdir="$$new_distdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
+ am__skip_mode_fix=: \
distdir) \
|| exit 1; \
fi; \
done
check-am: all-am
-check: check-recursive
+check: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) check-recursive
all-am: Makefile $(LIBRARIES)
installdirs: installdirs-recursive
installdirs-am:
-
-install: install-recursive
+install: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
uninstall: uninstall-recursive
@@ -533,7 +694,7 @@ install-am: all-am
installcheck: installcheck-recursive
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -541,7 +702,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -552,55 +714,87 @@ clean: clean-recursive
clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
distclean: distclean-recursive
-
-distclean-am: clean-am distclean-compile distclean-depend \
- distclean-generic distclean-tags
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-tags
dvi: dvi-recursive
dvi-am:
+html: html-recursive
+
+html-am:
+
info: info-recursive
info-am:
install-data-am:
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-recursive
+
+install-html-am:
+
install-info: install-info-recursive
+install-info-am:
+
install-man:
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-recursive
mostlyclean-am: mostlyclean-compile mostlyclean-generic
-uninstall-am: uninstall-info-am
+pdf: pdf-recursive
-uninstall-info: uninstall-info-recursive
+pdf-am:
-.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
- clean-generic clean-noinstLIBRARIES clean-recursive distclean \
- distclean-compile distclean-depend distclean-generic \
- distclean-recursive distclean-tags distdir dvi dvi-am \
- dvi-recursive info info-am info-recursive install install-am \
- install-data install-data-am install-data-recursive \
- install-exec install-exec-am install-exec-recursive \
- install-info install-info-am install-info-recursive install-man \
- install-recursive install-strip installcheck installcheck-am \
- installdirs installdirs-am installdirs-recursive \
- maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-recursive tags tags-recursive \
- uninstall uninstall-am uninstall-info-am \
- uninstall-info-recursive uninstall-recursive
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \
+ ctags-recursive install install-am install-strip \
+ tags-recursive
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am check check-am clean clean-generic \
+ clean-noinstLIBRARIES ctags ctags-recursive distclean \
+ distclean-compile distclean-generic distclean-tags distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs installdirs-am \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
+ tags tags-recursive uninstall uninstall-am
# ./generate_packets makes both packets_gen.[ch]
@@ -619,6 +813,7 @@ packets_generate: packets.def generate_packets.py
#libcivcommon_a_DEPENDENCIES = ../utility/libcivutility.a
#libcivcommon_a_LIBADD = ../utility/libcivutility.a
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/common/aicore/Makefile.in b/common/aicore/Makefile.in
index ff6292f..88e9bac 100644
--- a/common/aicore/Makefile.in
+++ b/common/aicore/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,84 +14,114 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = common/aicore
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+libaicore_a_AR = $(AR) $(ARFLAGS)
+libaicore_a_LIBADD =
+am_libaicore_a_OBJECTS = aisupport.$(OBJEXT) path_finding.$(OBJEXT) \
+ pf_tools.$(OBJEXT) cm.$(OBJEXT) citymap.$(OBJEXT) \
+ caravan.$(OBJEXT)
+libaicore_a_OBJECTS = $(am_libaicore_a_OBJECTS)
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/bootstrap/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libaicore_a_SOURCES)
+DIST_SOURCES = $(libaicore_a_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -101,10 +132,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -112,27 +147,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -140,6 +187,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -150,17 +199,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -173,16 +243,39 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
noinst_LIBRARIES = libaicore.a
-
AM_CPPFLAGS = -I$(top_srcdir)/utility -I.. -I$(top_srcdir)/common -I../../intl
-
libaicore_a_SOURCES = \
aisupport.c \
aisupport.h \
@@ -197,46 +290,40 @@ libaicore_a_SOURCES = \
caravan.c \
caravan.h
-subdir = common/aicore
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-libaicore_a_AR = $(AR) cru
-libaicore_a_LIBADD =
-am_libaicore_a_OBJECTS = aisupport.$(OBJEXT) path_finding.$(OBJEXT) \
- pf_tools.$(OBJEXT) cm.$(OBJEXT) citymap.$(OBJEXT) \
- caravan.$(OBJEXT)
-libaicore_a_OBJECTS = $(am_libaicore_a_OBJECTS)
-
-DEFS = @DEFS@
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-depcomp = $(SHELL) $(top_srcdir)/bootstrap/depcomp
-am__depfiles_maybe = depfiles
- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/aisupport.Po ./$(DEPDIR)/caravan.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/citymap.Po ./$(DEPDIR)/cm.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/path_finding.Po ./$(DEPDIR)/pf_tools.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-CFLAGS = @CFLAGS@
-DIST_SOURCES = $(libaicore_a_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(libaicore_a_SOURCES)
-
all: all-am
.SUFFIXES:
.SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu common/aicore/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu common/aicore/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu common/aicore/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
clean-noinstLIBRARIES:
-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
@@ -246,7 +333,7 @@ libaicore.a: $(libaicore_a_OBJECTS) $(libaicore_a_DEPENDENCIES)
$(RANLIB) libaicore.a
mostlyclean-compile:
- -rm -f *.$(OBJEXT) core *.core
+ -rm -f *.$(OBJEXT)
distclean-compile:
-rm -f *.tab.c
@@ -258,90 +345,106 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/path_finding.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pf_tools.Po at am__quote@
-distclean-depend:
- -rm -rf ./$(DEPDIR)
-
.c.o:
- at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
- at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- $(COMPILE) -c `cygpath -w $<`
-CCDEPMODE = @CCDEPMODE@
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: CTAGS
+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(LIBRARIES)
-
installdirs:
-
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -353,7 +456,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -361,7 +464,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -371,48 +475,85 @@ clean: clean-am
clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
distclean: distclean-am
-
-distclean-am: clean-am distclean-compile distclean-depend \
- distclean-generic distclean-tags
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-tags
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am:
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-compile mostlyclean-generic
-uninstall-am: uninstall-info-am
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
-.PHONY: GTAGS all all-am check check-am clean clean-generic \
- clean-noinstLIBRARIES distclean distclean-compile \
- distclean-depend distclean-generic distclean-tags distdir dvi \
- dvi-am info info-am install install-am install-data \
- install-data-am install-exec install-exec-am install-info \
- install-info-am install-man install-strip installcheck \
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ clean-noinstLIBRARIES ctags distclean distclean-compile \
+ distclean-generic distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic tags uninstall uninstall-am \
- uninstall-info-am
+ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+ uninstall-am
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/common/aicore/path_finding.c b/common/aicore/path_finding.c
index 40e265f..11764af 100644
--- a/common/aicore/path_finding.c
+++ b/common/aicore/path_finding.c
@@ -30,88 +30,68 @@
#define INITIAL_QUEUE_SIZE 100
+#ifdef DEBUG
+#define PF_DEBUG
+#endif
+
/* Since speed is quite important to us and alloccation of large arrays is
* slow, we try to pack info in the smallest types possible */
typedef short mapindex_t;
typedef unsigned char utiny_t;
-/* ===================== Internal structures ====================== */
-/*
- * Some comments on implementation:
- * 1. cost (aka total_MC) is sum of MCs altered to fit to the turn_mode
- * see adjust_cost
- * 2. dir_to_here is for backtracking along the tree of shortest paths
- * 3. node_known_type, behavior, zoc_number and extra_tile are all cached
- * values.
- * It is possible to shove them into a separate array which is allocated
- * only if a corresponding option in the parameter is set. A less drastic
- * measure would be to pack the first three into one byte. All of there are
- * time-saving measures and should be tested once we get an established
- * user-base.
- */
-struct pf_node {
- int cost; /* total_MC */
- int extra_cost; /* total_EC */
- utiny_t dir_to_here; /* direction from which we came */
+/* ===================== Internal structures ===================== */
- /* Cached values */
- int extra_tile; /* EC */
- utiny_t node_known_type;
- utiny_t behavior;
- utiny_t zoc_number; /* 1 if allied, 2 if my zoc, 0 otherwise */
-};
-
-/*
- * All danger-related fields go into here. For speed we separate it
- * from mainstream node.
- */
-struct danger_node {
- bool is_dangerous;
- bool waited; /* TRUE if waited to get here */
- struct pf_danger_pos {
- enum direction8 dir;
- int cost;
- int extra_cost;
- } *danger_segment; /* Segment leading across the danger area
- * back to the nearest safe node:
- * need to remeber costs and stuff */
+#ifdef PF_DEBUG
+/* The mode we use the pf_map. Used for cast converion checks. */
+enum pf_mode {
+ PF_NORMAL = 1, /* Usual goto */
+ PF_DANGER, /* Goto with dangerous positions */
+ PF_FUEL /* Goto with fueled units */
};
+#endif /* PF_DEBUG */
enum pf_node_status {
NS_UNINIT = 0, /* memory is calloced, hence zero
* means uninitialised */
+ NS_INIT, /* node initialized, but no path found yet */
NS_NEW, /* the optimal route isn't found yet */
NS_WAITING, /* the optimal route is found,
* considering waiting */
NS_PROCESSED /* the optimal route is found */
};
+enum pf_zoc_type {
+ ZOC_NO, /* No ZoC */
+ ZOC_ALLIED, /* Allied ZoC */
+ ZOC_MINE /* My ZoC */
+};
-/*
- * The map structure itself. (x, y) is the current position of the iteration
- * (aka internal buffer); index is map_pos_to_index(x, y);
- */
+/* Abstract base class for pf_normal_map,
+ * pf_danger_map, and pf_fuel_map. */
struct pf_map {
- struct tile *tile; /* The current position */
- struct pf_parameter *params; /* Initial parameters */
- struct pqueue *queue; /* Queue of nodes we have reached but not
- * processed yet (NS_NEW), sorted by their
- * total_CC*/
- struct pf_node *lattice; /* Lattice of nodes */
- utiny_t *status; /* Array of node statuses
- * (enum pf_node_status really) */
- struct pqueue *danger_queue; /* Dangerous positions go there */
- struct danger_node *d_lattice; /* Lattice with danger stuff */
+#ifdef PF_DEBUG
+ /* The mode of the map, for conversion checking. */
+ enum pf_mode mode;
+#endif /* PF_DEBUG */
+
+ /* "Virtual" function table. See the comment header
+ * for each pf_<function name> for details. */
+ void (*destroy)(struct pf_map *pfm); /* Destructor. */
+ struct pf_path *(*get_path)(struct pf_map *pfm, struct tile *ptile);
+ bool (*get_position)(struct pf_map *pfm, struct tile *ptile,
+ struct pf_position *pos);
+ bool (*iterate)(struct pf_map *pfm); /* Actually called pf_next. */
+
+ /* Private data. */
+ struct tile *tile; /* The current position. */
+ struct pf_parameter params; /* Initial parameters. */
};
-static bool danger_iterate_map(struct pf_map *pf_map);
-static struct pf_path* danger_construct_path(const struct pf_map *pf_map,
- struct tile *ptile);
-static struct pf_path *danger_get_path(struct pf_map *pf_map,
- struct tile *ptile);
+/* Down-cast macro. */
+#define PF_MAP(pfm) ((struct pf_map *) (pfm))
-/* =================== manipulating the cost ===================== */
+/* ==================== Common functions ====================== */
/****************************************************************************
Return the number of "moves" started with.
@@ -121,103 +101,170 @@ static struct pf_path *danger_get_path(struct pf_map *pf_map,
turn. Thus the rest of the PF code doesn't actually know that the unit
has fuel, it just thinks it has that many more MP.
****************************************************************************/
-int get_moves_left_initially(const struct pf_parameter *param)
+static int get_moves_left_initially(const struct pf_parameter *param)
{
return (param->moves_left_initially
- + (param->fuel_left_initially - 1) * param->move_rate);
+ + (param->fuel_left_initially - 1) * param->move_rate);
}
-/****************************************************************************
+/*************************************************************************
Return the "move rate".
- This is different from the parameter's move_rate because of fuel. For units
- with fuel > 1 all moves on the same tank of fuel are considered to be one
- turn. Thus the rest of the PF code doesn't actually know that the unit
- has fuel, it just thinks it has that many more MP.
-****************************************************************************/
+ This is different from the parameter's move_rate because of fuel. For
+ units with fuel > 1 all moves on the same tank of fuel are considered
+ to be one turn. Thus the rest of the PF code doesn't actually know that
+ the unit has fuel, it just thinks it has that many more MP.
+*************************************************************************/
static int get_move_rate(const struct pf_parameter *param)
{
return param->move_rate * param->fuel;
}
/********************************************************************
- Number of turns required to reach node
+ Number of turns required to reach node.
+ See comment in pf_create_map() about the usage of
+ get_moves_left_initially().
********************************************************************/
-static int get_turn(const struct pf_map *pf_map, int cost)
+static int get_turn(const struct pf_parameter *param, int cost)
{
+ if (get_move_rate(param) <= 0) {
+ /* This unit cannot move by itself. */
+ return FC_INFINITY;
+ }
+
/* Negative cost can happen when a unit initially has more MP than its
* move-rate (due to wonders transfer etc). Although this may be a bug,
* we'd better be ready.
*
* Note that cost==0 corresponds to the current turn with full MP. */
- return (cost < 0 ? 0 : cost / get_move_rate(pf_map->params));
+ return (cost < 0 ? 0 : cost / get_move_rate(param));
}
/********************************************************************
Moves left after node is reached
+ See comment in pf_create_map() about the usage of
+ get_moves_left_initially().
********************************************************************/
-static int get_moves_left(const struct pf_map *pf_map, int cost)
+static int get_moves_left(const struct pf_parameter *param, int cost)
{
+ int move_rate = get_move_rate(param);
+
+ if (move_rate <= 0) {
+ /* This unit never have moves left. */
+ return 0;
+ }
+
/* Cost may be negative; see get_turn(). */
- return (cost < 0 ? get_move_rate(pf_map->params) - cost
- : (get_move_rate(pf_map->params)
- - (cost % get_move_rate(pf_map->params))));
+ return (cost < 0 ? move_rate - cost
+ : (move_rate - (cost % move_rate)));
}
-/********************************************************************
- Adjust MC to reflect the turn mode and the move_rate.
-********************************************************************/
-static int adjust_cost(const struct pf_map *pf_map, int cost)
+/***************************************************************************
+ Obtain cost-of-path from pure cost and extra cost
+***************************************************************************/
+static int get_total_CC(const struct pf_parameter *param, int cost,
+ int extra)
{
- assert(cost >= 0);
+ return PF_TURN_FACTOR * cost + extra * get_move_rate(param);
+}
- switch (pf_map->params->turn_mode) {
- case TM_NONE:
- break;
- case TM_CAPPED:
- cost = MIN(cost, get_move_rate(pf_map->params));
- break;
- case TM_WORST_TIME:
- cost = MIN(cost, get_move_rate(pf_map->params));
- {
- int moves_left
- = get_moves_left(pf_map, pf_map->lattice[pf_map->tile->index].cost);
+/***************************************************************************
+ Take a position previously filled out (as by fill_position) and
+ "finalize" it by reversing all fuel multipliers.
- if (cost > moves_left) {
- cost += moves_left;
- }
- break;
- }
- case TM_BEST_TIME:
- {
- int moves_left
- = get_moves_left(pf_map, pf_map->lattice[pf_map->tile->index].cost);
+ See get_moves_left_initially and get_move_rate.
+***************************************************************************/
+static void finalize_position(const struct pf_parameter *param,
+ struct pf_position *pos)
+{
+ int move_rate;
- if (cost > moves_left) {
- cost = moves_left;
- }
- break;
+ if (param->turn_mode == TM_BEST_TIME
+ || param->turn_mode == TM_WORST_TIME) {
+ pos->turn *= param->fuel;
+ move_rate = get_move_rate(param);
+ if (move_rate > 0) {
+ pos->turn += ((get_move_rate(param) - pos->moves_left)
+ / param->move_rate);
+
+ /* We add 1 because a fuel of 1 means "no" fuel left; e.g. fuel
+ * ranges from [1,ut->fuel] not from [0,ut->fuel) as one may think. */
+ pos->fuel_left = pos->moves_left / param->move_rate + 1;
+
+ pos->moves_left %= param->move_rate;
+ } else {
+ /* This unit cannot move by itself. */
+ pos->turn = same_pos(pos->tile, param->start_tile) ? 0 : FC_INFINITY;
+ pos->fuel_left = 0;
}
- default:
- die("unknown TM");
}
- return cost;
}
-/* ===================== Path-finding proper =================== */
+
+/* ============ Specific pf_normal_* mode structures ============= */
+
+/* Some comments on implementation:
+ * 1. cost (aka total_MC) is sum of MCs altered to fit to the turn_mode
+ * see adjust_cost
+ * 2. dir_to_here is for backtracking along the tree of shortest paths
+ * 3. node_known_type, behavior, zoc_number and extra_tile are all cached
+ * values.
+ * It is possible to shove them into a separate array which is allocated
+ * only if a corresponding option in the parameter is set. A less drastic
+ * measure would be to pack the first three into one byte. All of there are
+ * time-saving measures and should be tested once we get an established
+ * user-base. */
+struct pf_normal_node {
+ int cost; /* total_MC */
+ int extra_cost; /* total_EC */
+ utiny_t dir_to_here; /* direction from which we came */
+
+ /* Cached values */
+ utiny_t status; /* (enum pf_node_status really) */
+ int extra_tile; /* EC */
+ utiny_t node_known_type;
+ utiny_t behavior;
+ utiny_t zoc_number; /* (enum pf_zoc_type really) */
+ bool can_invade;
+};
+
+/* Derived structure of struct pf_map. */
+struct pf_normal_map {
+ struct pf_map base_map; /* Base structure, must be the first! */
+
+ struct pqueue *queue; /* Queue of nodes we have reached but not
+ * processed yet (NS_NEW), sorted by their
+ * total_CC. */
+ struct pf_normal_node *lattice; /* Lattice of nodes. */
+};
+
+/* Up-cast macro. */
+#ifdef PF_DEBUG
+static inline struct pf_normal_map *
+pf_normal_map_check(struct pf_map *pfm, const char *file, int line)
+{
+ if (!pfm || pfm->mode != PF_NORMAL) {
+ real_die(file, line, "Wrong pf_map to pf_normal_map conversion");
+ }
+ return (struct pf_normal_map *) pfm;
+}
+#define PF_NORMAL_MAP(pfm) pf_normal_map_check(pfm, __FILE__, __LINE__)
+#else
+#define PF_NORMAL_MAP(pfm) ((struct pf_normal_map *) (pfm))
+#endif /* PF_DEBUG */
+
+/* ============= Specific pf_normal_* mode functions =============== */
/******************************************************************
Calculates cached values of the target node:
node_known_type and zoc
******************************************************************/
-static void init_node(struct pf_map *pf_map, struct pf_node * node,
- struct tile *ptile)
+static void pf_normal_node_init(struct pf_normal_map *pfnm,
+ struct pf_normal_node *node,
+ struct tile *ptile)
{
- struct pf_parameter *params = pf_map->params;
-
- /* We will change the status of the tile once we have put
- * sensible values into node->cost */
+ const struct pf_parameter *params = pf_get_parameter(PF_MAP(pfnm));
/* Establish the "known" status of node */
if (params->omniscience) {
@@ -235,36 +282,192 @@ static void init_node(struct pf_map *pf_map, struct pf_node * node,
}
if (params->get_zoc) {
- bool my_zoc = (ptile->city
- || ptile->terrain == T_UNKNOWN
- || is_ocean(ptile->terrain)
- || params->get_zoc(params->owner, ptile));
+ struct city *pcity = tile_get_city(ptile);
+ struct terrain *pterrain = tile_get_terrain(ptile);
+ bool my_zoc = (NULL != pcity || pterrain == T_UNKNOWN
+ || terrain_has_flag(pterrain, TER_OCEANIC)
+ || params->get_zoc(params->owner, ptile));
/* ZoC rules cannot prevent us from moving into/attacking an occupied
* tile. Other rules can, but we don't care about them here. */
- bool occupied = (unit_list_size(ptile->units) > 0
- || ptile->city);
-
- /* 2 means can move unrestricted from/into it,
- * 1 means can move unrestricted into it, but not necessarily from it */
- node->zoc_number = (my_zoc ? 2 : (occupied ? 1 : 0));
+ bool occupied = (unit_list_size(ptile->units) > 0 || NULL != pcity);
+
+ /* ZOC_MINE means can move unrestricted from/into it,
+ * ZOC_ALLIED means can move unrestricted into it,
+ * but not necessarily from it */
+ node->zoc_number = (my_zoc ? ZOC_MINE
+ : (occupied ? ZOC_ALLIED : ZOC_NO));
+#ifdef ZERO_VARIABLES_FOR_SEARCHING
} else {
+ /* Nodes are allocated by fc_calloc(), so should be already set to 0. */
node->zoc_number = 0;
+#endif
}
/* Evaluate the extra cost of the destination */
if (params->get_EC) {
node->extra_tile = params->get_EC(ptile, node->node_known_type, params);
+#ifdef ZERO_VARIABLES_FOR_SEARCHING
} else {
+ /* Nodes are allocated by fc_calloc(), so should be already set to 0. */
node->extra_tile = 0;
+#endif
}
+
+ if (params->can_invade_tile) {
+ node->can_invade = params->can_invade_tile(params->owner, ptile);
+ } else {
+ node->can_invade = TRUE;
+ }
+
+ node->status = NS_INIT;
}
-/*****************************************************************
- Obtain cost-of-path from pure cost and extra cost
-*****************************************************************/
-static int get_total_CC(struct pf_map *pf_map, int cost, int extra)
+/****************************************************************************
+ Fill in the position which must be discovered already. A helper
+ for *_get_position functions. This also "finalizes" the position.
+****************************************************************************/
+static void pf_normal_map_fill_position(const struct pf_normal_map *pfnm,
+ struct tile *ptile,
+ struct pf_position *pos)
{
- return PF_TURN_FACTOR * cost + extra * get_move_rate(pf_map->params);
+ mapindex_t index = ptile->index;
+ struct pf_normal_node *node = &pfnm->lattice[index];
+ const struct pf_parameter *params = pf_get_parameter(PF_MAP(pfnm));
+
+#ifdef PF_DEBUG
+ if (node->status != NS_PROCESSED
+ && !same_pos(ptile, PF_MAP(pfnm)->tile)) {
+ die("pf_normal_map_fill_position to an unreached destination");
+ return;
+ }
+#endif /* PF_DEBUG */
+
+ pos->tile = ptile;
+ pos->total_EC = node->extra_cost;
+ pos->total_MC = (node->cost - get_move_rate(params)
+ + get_moves_left_initially(params));
+ if (params->turn_mode == TM_BEST_TIME
+ || params->turn_mode == TM_WORST_TIME) {
+ pos->turn = get_turn(params, node->cost);
+ pos->moves_left = get_moves_left(params, node->cost);
+ } else if (params->turn_mode == TM_NONE
+ || params->turn_mode == TM_CAPPED) {
+ pos->turn = -1;
+ pos->moves_left = -1;
+ pos->fuel_left = -1;
+ } else {
+ die("unknown TC");
+ }
+
+ pos->dir_to_here = node->dir_to_here;
+ /* This field does not apply */
+ pos->dir_to_next_pos = -1;
+
+ finalize_position(params, pos);
+}
+
+/*******************************************************************
+ Read off the path to the node dest_tile, which must already be
+ discovered. A helper for *_get_path functions.
+*******************************************************************/
+static struct pf_path *
+pf_normal_map_construct_path(const struct pf_normal_map *pfnm,
+ struct tile *dest_tile)
+{
+ struct pf_normal_node *node = &pfnm->lattice[dest_tile->index];
+ const struct pf_parameter *params = pf_get_parameter(PF_MAP(pfnm));
+ enum direction8 dir_next = -1;
+ struct pf_path *path;
+ struct tile *ptile;
+ int i;
+
+#ifdef PF_DEBUG
+ if (node->status != NS_PROCESSED
+ && !same_pos(dest_tile, PF_MAP(pfnm)->tile)) {
+ die("construct_path to an unreached destination");
+ return NULL;
+ }
+#endif /* PF_DEBUG */
+
+ ptile = dest_tile;
+ path = fc_malloc(sizeof(*path));
+
+ /* 1: Count the number of steps to get here.
+ * To do it, backtrack until we hit the starting point */
+ for (i = 0; ; i++) {
+ if (same_pos(ptile, params->start_tile)) {
+ /* Ah-ha, reached the starting point! */
+ break;
+ }
+
+ ptile = mapstep(ptile, DIR_REVERSE(node->dir_to_here));
+ node = &pfnm->lattice[ptile->index];
+ }
+
+ /* 2: Allocate the memory */
+ path->length = i + 1;
+ path->positions = fc_malloc((i + 1) * sizeof(*(path->positions)));
+
+ /* 3: Backtrack again and fill the positions this time */
+ ptile = dest_tile;
+ node = &pfnm->lattice[ptile->index];
+
+ for (; i >= 0; i--) {
+ pf_normal_map_fill_position(pfnm, ptile, &path->positions[i]);
+ /* fill_position doesn't set direction */
+ path->positions[i].dir_to_next_pos = dir_next;
+
+ dir_next = node->dir_to_here;
+
+ if (i > 0) {
+ /* Step further back, if we haven't finished yet */
+ ptile = mapstep(ptile, DIR_REVERSE(dir_next));
+ node = &pfnm->lattice[ptile->index];
+ }
+ }
+
+ return path;
+}
+
+/*********************************************************************
+ Adjust MC to reflect the turn mode and the move_rate.
+*********************************************************************/
+static int pf_normal_map_adjust_cost(const struct pf_normal_map *pfnm,
+ int cost)
+{
+ const struct pf_parameter *params;
+ const struct pf_normal_node *node;
+ int moves_left;
+
+ assert(cost >= 0);
+
+ params = pf_get_parameter(PF_MAP(pfnm));
+ node = &pfnm->lattice[PF_MAP(pfnm)->tile->index];
+
+ switch (params->turn_mode) {
+ case TM_NONE:
+ break;
+ case TM_CAPPED:
+ cost = MIN(cost, get_move_rate(params));
+ break;
+ case TM_WORST_TIME:
+ cost = MIN(cost, get_move_rate(params));
+ moves_left = get_moves_left(params, node->cost);
+ if (cost > moves_left) {
+ cost += moves_left;
+ }
+ break;
+ case TM_BEST_TIME:
+ moves_left = get_moves_left(params, node->cost);
+ if (cost > moves_left) {
+ cost = moves_left;
+ }
+ break;
+ default:
+ die("unknown TM");
+ break;
+ }
+ return cost;
}
/**************************************************************************
@@ -273,61 +476,61 @@ static int get_total_CC(struct pf_map *pf_map, int cost, int extra)
Plan: 1. Process previous position
2. Get new nearest position and return it
**************************************************************************/
-static bool jumbo_iterate_map(struct pf_map *pf_map)
+static bool pf_jumbo_map_iterate(struct pf_map *pfm)
{
- struct pf_node *node = &pf_map->lattice[pf_map->tile->index];
- mapindex_t index;
+ struct pf_normal_map *pfnm = PF_NORMAL_MAP(pfm);
+ struct tile *tile = pfm->tile;
+ mapindex_t index = tile->index;
+ struct pf_normal_node *node = &pfnm->lattice[index];
+ const struct pf_parameter *params = pf_get_parameter(pfm);
- pf_map->status[pf_map->tile->index] = NS_PROCESSED;
+ node->status = NS_PROCESSED;
/* Processing Stage */
/* The previous position is contained in {x,y} fields of map */
- adjc_dir_iterate(pf_map->tile, tile1, dir) {
- struct pf_node *node1 = &pf_map->lattice[tile1->index];
- utiny_t *status = &pf_map->status[tile1->index];
- int priority;
+ adjc_dir_iterate(tile, tile1, dir) {
+ mapindex_t index1 = tile1->index;
+ struct pf_normal_node *node1 = &pfnm->lattice[index1];
+ int priority;
-
- if (*status == NS_PROCESSED) {
+ if (node1->status == NS_PROCESSED) {
/* This gives 15% speedup */
continue;
}
- if (*status == NS_UNINIT) {
- node1->cost = -1;
+ if (node1->status <= NS_INIT) {
+ node1->cost = PF_IMPOSSIBLE_MC;
}
/* User-supplied callback get_costs takes care of everything (ZOC,
* known, costs etc). See explanations in path_finding.h */
- priority = pf_map->params->get_costs(pf_map->tile, dir, tile1,
- node->cost, node->extra_cost,
- &node1->cost, &node1->extra_cost,
- pf_map->params);
+ priority = params->get_costs(tile, dir, tile1, node->cost,
+ node->extra_cost, &node1->cost,
+ &node1->extra_cost, params);
if (priority >= 0) {
/* We found a better route to xy1, record it
* (the costs are recorded already) */
- *status = NS_NEW;
+ node1->status = NS_NEW;
node1->dir_to_here = dir;
- pq_insert(pf_map->queue, tile1->index, -priority);
+ pq_insert(pfnm->queue, index1, -priority);
}
-
} adjc_dir_iterate_end;
/* Get the next nearest node */
for (;;) {
- bool removed = pq_remove(pf_map->queue, &index);
+ bool removed = pq_remove(pfnm->queue, &index);
if (!removed) {
return FALSE;
}
- if (pf_map->status[index] == NS_NEW) {
+ if (pfnm->lattice[index].status == NS_NEW) {
break;
}
/* If the node has already been processed, get the next one. */
}
- pf_map->tile = index_to_tile(index);
+ pfm->tile = index_to_tile(index);
return TRUE;
}
@@ -337,22 +540,16 @@ static bool jumbo_iterate_map(struct pf_map *pf_map)
Plan: 1. Process previous position
2. Get new nearest position and return it
*****************************************************************/
-bool pf_next(struct pf_map *pf_map)
+static bool pf_normal_map_iterate(struct pf_map *pfm)
{
- mapindex_t index;
- struct pf_node *node = &pf_map->lattice[pf_map->tile->index];
+ struct pf_normal_map *pfnm = PF_NORMAL_MAP(pfm);
+ struct tile *tile = pfm->tile;
+ mapindex_t index = tile->index;
+ struct pf_normal_node *node = &pfnm->lattice[index];
+ const struct pf_parameter *params = pf_get_parameter(pfm);
+ int cost_of_path;
- if (pf_map->params->is_pos_dangerous) {
- /* It's a lot different if is_pos_dangerous is defined */
- return danger_iterate_map(pf_map);
- }
-
- if (pf_map->params->get_costs) {
- /* It is somewhat different when we have the jumbo callback */
- return jumbo_iterate_map(pf_map);
- }
-
- pf_map->status[pf_map->tile->index] = NS_PROCESSED;
+ node->status = NS_PROCESSED;
/* There is no exit from DONT_LEAVE tiles! */
if (node->behavior != TB_DONT_LEAVE) {
@@ -360,234 +557,379 @@ bool pf_next(struct pf_map *pf_map)
/* Processing Stage */
/* The previous position is contained in {x,y} fields of map */
- adjc_dir_iterate(pf_map->tile, tile1, dir) {
+ adjc_dir_iterate(tile, tile1, dir) {
mapindex_t index1 = tile1->index;
- struct pf_node *node1 = &pf_map->lattice[index1];
- utiny_t *status = &pf_map->status[index1];
+ struct pf_normal_node *node1 = &pfnm->lattice[index1];
int cost;
int extra = 0;
- if (*status == NS_PROCESSED) {
- /* This gives 15% speedup */
- continue;
+ if (node1->status == NS_PROCESSED) {
+ /* This gives 15% speedup */
+ continue;
}
- if (*status == NS_UNINIT) {
- init_node(pf_map, node1, tile1);
+ if (node1->status == NS_UNINIT) {
+ pf_normal_node_init(pfnm, node1, tile1);
}
/* Can we enter this tile at all? */
- if (node1->behavior == TB_IGNORE) {
- continue;
+ if (!node1->can_invade || node1->behavior == TB_IGNORE) {
+ continue;
}
/* Is the move ZOC-ok? */
- if (pf_map->params->get_zoc
- && !(node->zoc_number > 1 || node1->zoc_number > 0)) {
- continue;
+ if (params->get_zoc
+ && !(node->zoc_number == ZOC_MINE
+ || node1->zoc_number != ZOC_NO)) {
+ continue;
}
/* Evaluate the cost of the move */
if (node1->node_known_type == TILE_UNKNOWN) {
- cost = pf_map->params->unknown_MC;
+ cost = params->unknown_MC;
} else {
- cost = pf_map->params->get_MC(pf_map->tile, dir, tile1,
- pf_map->params);
+ cost = params->get_MC(tile, dir, tile1, params);
}
if (cost == PF_IMPOSSIBLE_MC) {
- continue;
+ continue;
}
- cost = adjust_cost(pf_map, cost);
+ cost = pf_normal_map_adjust_cost(pfnm, cost);
if (cost == PF_IMPOSSIBLE_MC) {
- continue;
+ continue;
}
- /* Total cost at xy1. Cost may be negative; see get_turn(). */
+ /* Total cost at tile1. Cost may be negative; see get_turn(). */
cost += node->cost;
/* Evaluate the extra cost if it's relevant */
- if (pf_map->params->get_EC) {
+ if (params->get_EC) {
extra = node->extra_cost;
- /* Add the cached value */
- extra += node1->extra_tile;
+ /* Add the cached value */
+ extra += node1->extra_tile;
}
/* Update costs and add to queue, if we found a better route to xy1. */
- {
- int cost_of_path = get_total_CC(pf_map, cost, extra);
-
- if (*status == NS_UNINIT
- || cost_of_path < get_total_CC(pf_map, node1->cost,
- node1->extra_cost)) {
- *status = NS_NEW;
- node1->extra_cost = extra;
- node1->cost = cost;
- node1->dir_to_here = dir;
- pq_insert(pf_map->queue, index1, -cost_of_path);
- }
+ cost_of_path = get_total_CC(params, cost, extra);
+
+ if (node1->status == NS_INIT
+ || cost_of_path < get_total_CC(params, node1->cost,
+ node1->extra_cost)) {
+ node1->status = NS_NEW;
+ node1->extra_cost = extra;
+ node1->cost = cost;
+ node1->dir_to_here = dir;
+ pq_insert(pfnm->queue, index1, -cost_of_path);
}
-
} adjc_dir_iterate_end;
}
/* Get the next nearest node */
for (;;) {
- bool removed = pq_remove(pf_map->queue, &index);
+ bool removed = pq_remove(pfnm->queue, &index);
if (!removed) {
return FALSE;
}
- if (pf_map->status[index] == NS_NEW) {
+ if (pfnm->lattice[index].status == NS_NEW) {
/* Discard if this node has already been processed */
break;
}
}
- pf_map->tile = index_to_tile(index);
+ pfm->tile = index_to_tile(index);
return TRUE;
}
-/******************************************************************
- Allocates the memory for the map. No initialization.
-******************************************************************/
-static struct pf_map *create_map(bool with_danger)
+/************************************************************************
+ Get the path to ptile, put it in "path". If ptile has not been reached
+ yet, iterate the map until we reach it or run out of map.
+************************************************************************/
+static struct pf_path *pf_normal_map_get_path(struct pf_map *pfm,
+ struct tile *ptile)
+{
+ struct pf_normal_map *pfnm = PF_NORMAL_MAP(pfm);
+
+ if (pfnm->lattice[ptile->index].status == NS_PROCESSED
+ || same_pos(ptile, pfm->tile)) {
+ /* We already reached this tile */
+ return pf_normal_map_construct_path(pfnm, ptile);
+ }
+
+ while (pf_next(pfm)) {
+ if (same_pos(ptile, pfm->tile)) {
+ /* That's the one */
+ return pf_normal_map_construct_path(pfnm, ptile);
+ }
+ }
+
+ return NULL;
+}
+
+/*******************************************************************
+ Get info about position at ptile and put it in pos. If ptile
+ has not been reached yet, iterate the map until we reach it.
+ Should _always_ check the return value, forthe position might be
+ unreachable.
+*******************************************************************/
+static bool pf_normal_map_get_position(struct pf_map *pfm,
+ struct tile *ptile,
+ struct pf_position *pos)
{
- struct pf_map *pf_map = fc_calloc(1, sizeof(struct pf_map));
+ struct pf_normal_map *pfnm = PF_NORMAL_MAP(pfm);
- pf_map->lattice = fc_malloc(MAP_INDEX_SIZE * sizeof(struct pf_node));
- pf_map->queue = pq_create(INITIAL_QUEUE_SIZE);
- pf_map->status = fc_calloc(MAP_INDEX_SIZE, sizeof(*(pf_map->status)));
+ if (pfnm->lattice[ptile->index].status == NS_PROCESSED
+ || same_pos(ptile, pfm->tile)) {
+ /* We already reached this tile */
+ pf_normal_map_fill_position(pfnm, ptile, pos);
+ return TRUE;
+ }
- if (with_danger) {
- /* Initialize stuff for dangerous positions.
- * Otherwise they stay NULL */
- pf_map->d_lattice = fc_calloc(MAP_INDEX_SIZE, sizeof(struct danger_node));
- pf_map->danger_queue = pq_create(INITIAL_QUEUE_SIZE);
+ while (pf_next(pfm)) {
+ if (same_pos(ptile, pfm->tile)) {
+ /* That's the one */
+ pf_normal_map_fill_position(pfnm, ptile, pos);
+ return TRUE;
+ }
}
- return pf_map;
+ return FALSE;
}
-/***************************************************************
- Sets up the map according to the parameters
- Does not do any iterations
-***************************************************************/
-struct pf_map *pf_create_map(const struct pf_parameter *const parameter)
+/*********************************************************************
+ After usage the map must be destroyed.
+*********************************************************************/
+static void pf_normal_map_destroy(struct pf_map *pfm)
{
- struct pf_map *pf_map = create_map((parameter->is_pos_dangerous != NULL));
+ struct pf_normal_map *pfnm = PF_NORMAL_MAP(pfm);
+
+ free(pfnm->lattice);
+ pq_destroy(pfnm->queue);
+ free(pfnm);
+}
+
+/***************************************************************************
+ Create a pf_normal_map. NB: The "constructor" returns a pf_map.
+***************************************************************************/
+static struct pf_map *pf_normal_map_create(const struct pf_parameter *parameter)
+{
+ struct pf_normal_map *pfnm;
+ struct pf_map *base_map;
+ struct pf_parameter *params;
+ struct pf_normal_node *node;
+
+ pfnm = fc_calloc(1, sizeof(struct pf_normal_map));
+ base_map = &pfnm->base_map;
+ params = &base_map->params;
+#ifdef PF_DEBUG
+ /* Set the mode, used for cast check */
+ base_map->mode = PF_NORMAL;
+#endif /* PF_DEBUG */
+
+ /* Alloc the map */
+ pfnm->lattice = fc_calloc(MAP_INDEX_SIZE, sizeof(struct pf_normal_node));
+ pfnm->queue = pq_create(INITIAL_QUEUE_SIZE);
/* MC callback must be set */
assert(parameter->get_MC != NULL);
/* Copy parameters */
- pf_map->params = fc_malloc(sizeof(struct pf_parameter));
- *pf_map->params = *parameter;
+ *params = *parameter;
+
+ /* Initialize virtual function table. */
+ base_map->destroy = pf_normal_map_destroy;
+ base_map->get_path = pf_normal_map_get_path;
+ base_map->get_position = pf_normal_map_get_position;
+ if (params->get_costs) {
+ base_map->iterate = pf_jumbo_map_iterate;
+ } else {
+ base_map->iterate = pf_normal_map_iterate;
+ }
/* Initialise starting coordinates */
- pf_map->tile = pf_map->params->start_tile;
+ base_map->tile = params->start_tile;
/* Initialise starting node */
- init_node(pf_map, &pf_map->lattice[pf_map->tile->index], pf_map->tile);
+ node = &pfnm->lattice[params->start_tile->index];
+ pf_normal_node_init(pfnm, node, params->start_tile);
/* This makes calculations of turn/moves_left more convenient, but we
* need to subtract this value before we return cost to the user. Note
* that cost may be negative if moves_left_initially > move_rate
* (see get_turn()). */
- pf_map->lattice[pf_map->tile->index].cost = get_move_rate(pf_map->params)
- - get_moves_left_initially(pf_map->params);
- pf_map->lattice[pf_map->tile->index].extra_cost = 0;
- pf_map->lattice[pf_map->tile->index].dir_to_here = -1;
- if (pf_map->params->is_pos_dangerous) {
- /* The starting point is safe */
- pf_map->d_lattice[pf_map->tile->index].is_dangerous = FALSE;
- }
+ node->cost = get_move_rate(params) - get_moves_left_initially(params);
+ node->extra_cost = 0;
+ node->dir_to_here = -1;
- return pf_map;
+ return PF_MAP(pfnm);
}
-/*********************************************************************
- After usage the map must be destroyed.
-*********************************************************************/
-void pf_destroy_map(struct pf_map *pf_map)
-{
- free(pf_map->lattice);
- pq_destroy(pf_map->queue);
- free(pf_map->status);
- free(pf_map->params);
- /* Danger-related structs */
- if (pf_map->d_lattice) {
- int i;
+/* ============ Specific pf_danger_* mode structures ============= */
- /* Need to clean up the dangling danger_sements */
- for (i = 0; i < MAP_INDEX_SIZE; i++) {
- if (pf_map->d_lattice[i].danger_segment) {
- free(pf_map->d_lattice[i].danger_segment);
- }
- }
- free(pf_map->d_lattice);
- }
- if (pf_map->danger_queue) {
- pq_destroy(pf_map->danger_queue);
- }
+/* Some comments on implementation:
+ * 1. cost (aka total_MC) is sum of MCs altered to fit to the turn_mode
+ * see adjust_cost
+ * 2. dir_to_here is for backtracking along the tree of shortest paths
+ * 3. node_known_type, behavior, zoc_number, extra_tile and waited
+ * are all cached values.
+ * It is possible to shove them into a separate array which is allocated
+ * only if a corresponding option in the parameter is set. A less drastic
+ * measure would be to pack the first three into one byte. All of there
+ * are time-saving measures and should be tested once we get an established
+ * user-base. */
+struct pf_danger_node {
+ int cost; /* total_MC */
+ int extra_cost; /* total_EC */
+ utiny_t dir_to_here; /* direction from which we came */
- free(pf_map);
-}
+ /* Cached values */
+ utiny_t status; /* (enum pf_node_status really) */
+ int extra_tile; /* EC */
+ utiny_t node_known_type;
+ utiny_t behavior;
+ utiny_t zoc_number; /* (enum pf_zoc_type really) */
+ bool can_invade;
+ bool is_dangerous;
+ bool waited; /* TRUE if waited to get here */
+ struct pf_danger_pos {
+ enum direction8 dir;
+ int cost;
+ int extra_cost;
+ } *danger_segment; /* Segment leading across the danger area
+ * back to the nearest safe node:
+ * need to remeber costs and stuff */
+};
-/* =================== Lifting info from the map ================ */
+/* Derived structure of struct pf_map. */
+struct pf_danger_map {
+ struct pf_map base_map; /* Base structure, must be the first! */
-/****************************************************************************
- Take a position previously filled out (as by fill_position) and
- "finalize" it by reversing all fuel multipliers.
+ struct pqueue *queue; /* Queue of nodes we have reached but not
+ * processed yet (NS_NEW), sorted by their
+ * total_CC */
+ struct pqueue *danger_queue; /* Dangerous positions go there */
+ struct pf_danger_node *lattice; /* Lattice of nodes */
+};
- See get_moves_left_initially and get_move_rate.
-****************************************************************************/
-static void finalize_position(const struct pf_map *pf_map,
- struct pf_position *pos)
+/* Up-cast macro. */
+#ifdef PF_DEBUG
+static inline struct pf_danger_map *
+pf_danger_map_check(struct pf_map *pfm, const char *file, int line)
{
- if (pf_map->params->turn_mode == TM_BEST_TIME
- || pf_map->params->turn_mode == TM_WORST_TIME) {
- pos->turn *= pf_map->params->fuel;
- pos->turn += ((get_move_rate(pf_map->params) - pos->moves_left)
- / pf_map->params->move_rate);
+ if (!pfm || pfm->mode != PF_DANGER) {
+ real_die(file, line, "Wrong pf_map to pf_danger_map conversion");
+ }
+ return (struct pf_danger_map *) pfm;
+}
+#define PF_DANGER_MAP(pfm) pf_danger_map_check(pfm, __FILE__, __LINE__)
+#else
+#define PF_DANGER_MAP(pfm) ((struct pf_danger_map *) (pfm))
+#endif /* PF_DEBUG */
- /* We add 1 because a fuel of 1 means "no" fuel left; e.g. fuel
- * ranges from [1,ut->fuel] not from [0,ut->fuel) as one may think. */
- pos->fuel_left = pos->moves_left / pf_map->params->move_rate + 1;
+/* ============ Specific pf_danger_* mode functions ============== */
- pos->moves_left %= pf_map->params->move_rate;
+/**********************************************************************
+ Calculates cached values of the target node: node_known_type and zoc.
+**********************************************************************/
+static void pf_danger_node_init(struct pf_danger_map *pfdm,
+ struct pf_danger_node *node,
+ struct tile *ptile)
+{
+ const struct pf_parameter *params = pf_get_parameter(PF_MAP(pfdm));
+
+ /* Establish the "known" status of node */
+ if (params->omniscience) {
+ node->node_known_type = TILE_KNOWN;
+ } else {
+ node->node_known_type = tile_get_known(ptile, params->owner);
}
+
+ /* Establish the tile behavior */
+ if (params->get_TB) {
+ node->behavior = params->get_TB(ptile, node->node_known_type, params);
+ } else {
+ /* The default */
+ node->behavior = TB_NORMAL;
+ }
+
+ if (params->get_zoc) {
+ struct city *pcity = tile_get_city(ptile);
+ struct terrain *pterrain = tile_get_terrain(ptile);
+ bool my_zoc = (NULL != pcity || pterrain == T_UNKNOWN
+ || terrain_has_flag(pterrain, TER_OCEANIC)
+ || params->get_zoc(params->owner, ptile));
+ /* ZoC rules cannot prevent us from moving into/attacking an occupied
+ * tile. Other rules can, but we don't care about them here. */
+ bool occupied = (unit_list_size(ptile->units) > 0 || NULL != pcity);
+
+ /* ZOC_MINE means can move unrestricted from/into it,
+ * ZOC_ALLIED means can move unrestricted into it,
+ * but not necessarily from it */
+ node->zoc_number = (my_zoc ? ZOC_MINE
+ : (occupied ? ZOC_ALLIED : ZOC_NO));
+#ifdef ZERO_VARIABLES_FOR_SEARCHING
+ } else {
+ /* Nodes are allocated by fc_calloc(), so should be already set to 0. */
+ node->zoc_number = 0;
+#endif
+ }
+
+ /* Evaluate the extra cost of the destination */
+ if (params->get_EC) {
+ node->extra_tile = params->get_EC(ptile, node->node_known_type, params);
+#ifdef ZERO_VARIABLES_FOR_SEARCHING
+ } else {
+ /* Nodes are allocated by fc_calloc(), so should be already set to 0. */
+ node->extra_tile = 0;
+#endif
+ }
+
+ if (params->can_invade_tile) {
+ node->can_invade = params->can_invade_tile(params->owner, ptile);
+ } else {
+ node->can_invade = TRUE;
+ }
+
+ node->is_dangerous =
+ params->is_pos_dangerous(ptile, node->node_known_type, params);
+
+ /* waited is set to zero by fc_calloc. */
+
+ node->status = NS_INIT;
}
/****************************************************************************
Fill in the position which must be discovered already. A helper
for *_get_position functions. This also "finalizes" the position.
****************************************************************************/
-static void fill_position(const struct pf_map *pf_map, struct tile *ptile,
- struct pf_position *pos)
+static void pf_danger_map_fill_position(const struct pf_danger_map *pfdm,
+ struct tile *ptile,
+ struct pf_position *pos)
{
mapindex_t index = ptile->index;
- struct pf_node *node = &pf_map->lattice[index];
+ struct pf_danger_node *node = &pfdm->lattice[index];
+ const struct pf_parameter *params = pf_get_parameter(PF_MAP(pfdm));
- /* Debug period only! Please remove after PF is settled */
- if (pf_map->status[index] != NS_PROCESSED
- && !same_pos(ptile, pf_map->tile)) {
- die("pf_construct_path to an unreached destination");
+#ifdef PF_DEBUG
+ if (node->status != NS_PROCESSED
+ && !same_pos(ptile, PF_MAP(pfdm)->tile)) {
+ die("pf_normal_map_fill_position to an unreached destination");
return;
}
+#endif /* PF_DEBUG */
pos->tile = ptile;
pos->total_EC = node->extra_cost;
- pos->total_MC = node->cost - get_move_rate(pf_map->params)
- + get_moves_left_initially(pf_map->params);
- if (pf_map->params->turn_mode == TM_BEST_TIME ||
- pf_map->params->turn_mode == TM_WORST_TIME) {
- pos->turn = get_turn(pf_map, node->cost);
- pos->moves_left = get_moves_left(pf_map, node->cost);
- } else if (pf_map->params->turn_mode == TM_NONE ||
- pf_map->params->turn_mode == TM_CAPPED) {
+ pos->total_MC = (node->cost - get_move_rate(params)
+ + get_moves_left_initially(params));
+ if (params->turn_mode == TM_BEST_TIME
+ || params->turn_mode == TM_WORST_TIME) {
+ pos->turn = get_turn(params, node->cost);
+ pos->moves_left = get_moves_left(params, node->cost);
+ } else if (params->turn_mode == TM_NONE
+ || params->turn_mode == TM_CAPPED) {
pos->turn = -1;
pos->moves_left = -1;
pos->fuel_left = -1;
@@ -599,288 +941,213 @@ static void fill_position(const struct pf_map *pf_map, struct tile *ptile,
/* This field does not apply */
pos->dir_to_next_pos = -1;
- finalize_position(pf_map, pos);
+ finalize_position(params, pos);
}
/*******************************************************************
- Read all info about the current position into pos
-*******************************************************************/
-void pf_next_get_position(const struct pf_map *pf_map,
- struct pf_position *pos)
-{
- fill_position(pf_map, pf_map->tile, pos);
-}
-
-/*******************************************************************
- Get info about position at (x, y) and put it in pos. If (x, y)
- has not been reached yet, iterate the map until we reach it.
- Should _always_ check the return value, forthe position might be
- unreachable.
-*******************************************************************/
-bool pf_get_position(struct pf_map *pf_map, struct tile *ptile,
- struct pf_position *pos)
-{
- mapindex_t index = ptile->index;
- utiny_t status = pf_map->status[index];
-
- if (status == NS_PROCESSED || same_pos(ptile, pf_map->tile)) {
- /* We already reached (x,y) */
- fill_position(pf_map, ptile, pos);
- return TRUE;
- }
-
- while (pf_next(pf_map)) {
- if (same_pos(ptile, pf_map->tile)) {
- /* That's the one */
- fill_position(pf_map, ptile, pos);
- return TRUE;
- }
- }
-
- return FALSE;
-}
-
-/*******************************************************************
- Read off the path to the node (x,y), which must already be
- discovered. A helper for *get_path functions.
+ Read off the path to the node ptile, but with danger
+ NB: will only find paths to safe tiles!
*******************************************************************/
-static struct pf_path* construct_path(const struct pf_map *pf_map,
- struct tile *dest_tile)
+static struct pf_path *
+pf_danger_map_construct_path(const struct pf_danger_map *pfdm,
+ struct tile *ptile)
{
+ struct pf_path *path = fc_malloc(sizeof(*path));
+ enum direction8 dir_next = -1;
+ struct pf_danger_pos *danger_seg = NULL;
+ bool waited = FALSE;
+ struct pf_danger_node *node = &pfdm->lattice[ptile->index];
+ int length = 1;
+ struct tile *iter_tile = ptile;
+ const struct pf_parameter *params = pf_get_parameter(PF_MAP(pfdm));
+ struct pf_position *pos;
int i;
- int index = dest_tile->index;
- enum direction8 dir_next;
- struct pf_path *path;
- struct tile *ptile;
- /* Debug period only! Please remove after PF is settled */
- assert(!pf_map->params->is_pos_dangerous);
- if (pf_map->status[index] != NS_PROCESSED
- && !same_pos(dest_tile, pf_map->tile)) {
- die("construct_path to an unreached destination");
+ if (params->turn_mode != TM_BEST_TIME
+ && params->turn_mode != TM_WORST_TIME) {
+ die("illegal TM in path-finding with danger");
return NULL;
}
- ptile = dest_tile;
- path = fc_malloc(sizeof(*path));
-
- /* 1: Count the number of steps to get here.
- * To do it, backtrack until we hit the starting point */
- for (i = 0; ; i++) {
- struct pf_node *node = &pf_map->lattice[ptile->index];
+ /* First iterate to find path length */
+ while (!same_pos(iter_tile, params->start_tile)) {
- if (same_pos(ptile, pf_map->params->start_tile)) {
- /* Ah-ha, reached the starting point! */
- break;
+ if (!node->is_dangerous && node->waited) {
+ length += 2;
+ } else {
+ length++;
}
- dir_next = node->dir_to_here;
-
- ptile = mapstep(ptile, DIR_REVERSE(dir_next));
- }
-
- /* 2: Allocate the memory */
- path->length = i + 1;
- path->positions = fc_malloc((i+1) * sizeof(*(path->positions)));
-
- /* 3: Backtrack again and fill the positions this time */
- ptile = dest_tile;
- dir_next = -1;
- for (; i >=0; i--) {
- struct pf_node *node = &pf_map->lattice[ptile->index];
-
- fill_position(pf_map, ptile, &path->positions[i]);
- /* fill_position doesn't set direction */
- path->positions[i].dir_to_next_pos = dir_next;
-
- dir_next = node->dir_to_here;
-
- if (i > 0) {
- /* Step further back, if we haven't finished yet */
- ptile = mapstep(ptile, DIR_REVERSE(dir_next));
+ if (!node->is_dangerous || !danger_seg) {
+ /* We are in the normal node and dir_to_here field is valid */
+ dir_next = node->dir_to_here;
+ /* d_node->danger_segment is the indicator of what lies ahead
+ * if it's non-NULL, we are entering a danger segment,
+ * if it's NULL, we are not on one so danger_seg should be NULL */
+ danger_seg = node->danger_segment;
+ } else {
+ /* We are in a danger segment */
+ dir_next = danger_seg->dir;
+ danger_seg++;
}
- }
-
- return path;
-}
-/************************************************************************
- Get the path to our current position
-************************************************************************/
-struct pf_path *pf_next_get_path(const struct pf_map *pf_map)
-{
- if (!pf_map->params->is_pos_dangerous) {
- return construct_path(pf_map, pf_map->tile);
- } else {
- /* It's very different in the presence of danger */
- return danger_construct_path(pf_map, pf_map->tile);
+ /* Step backward */
+ iter_tile = mapstep(iter_tile, DIR_REVERSE(dir_next));
+ node = &pfdm->lattice[iter_tile->index];
}
-}
-/************************************************************************
- Get the path to x, y, put it in "path". If (x, y) has not been reached
- yet, iterate the map until we reach it or run out of map.
-************************************************************************/
-struct pf_path *pf_get_path(struct pf_map *pf_map, struct tile *ptile)
-{
- mapindex_t index = ptile->index;
- utiny_t status = pf_map->status[index];
+ /* Allocate memory for path */
+ path->positions = fc_malloc(length * sizeof(struct pf_position));
+ path->length = length;
- if (pf_map->params->is_pos_dangerous) {
- /* It's very different in the presence of danger */
- return danger_get_path(pf_map, ptile);
- }
+ /* Reset variables for main iteration */
+ iter_tile = ptile;
+ node = &pfdm->lattice[ptile->index];
+ danger_seg = NULL;
+ waited = FALSE;
- if (status == NS_PROCESSED || same_pos(ptile, pf_map->tile)) {
- /* We already reached (x,y) */
- return construct_path(pf_map, ptile);
- }
+ for (i = length - 1; i >= 0; i--) {
+ bool old_waited = FALSE;
- while (pf_next(pf_map)) {
- if (same_pos(ptile, pf_map->tile)) {
- /* That's the one */
- return construct_path(pf_map, ptile);
+ /* 1: Deal with waiting */
+ if (!node->is_dangerous) {
+ if (waited) {
+ /* Waited at _this_ tile, need to record it twice in the
+ * path. Here we record our state _after_ waiting (e.g.
+ * full move points). */
+ pos = &path->positions[i];
+ pos->tile = iter_tile;
+ pos->total_EC = node->extra_cost;
+ pos->turn = get_turn(params, node->cost) + 1;
+ pos->moves_left = get_move_rate(params);
+ pos->total_MC = ((path->positions[i].turn - 1) * params->move_rate
+ + params->moves_left_initially);
+ pos->dir_to_next_pos = dir_next;
+ finalize_position(params, pos);
+ /* Set old_waited so that we record -1 as a direction at
+ * the step we were going to wait. */
+ old_waited = TRUE;
+ i--;
+ }
+ /* Update "waited" (d_node->waited means "waited to get here"). */
+ waited = node->waited;
}
- }
-
- return NULL;
-}
-
-/******************************************************************
- Get the last position of "path"
-******************************************************************/
-struct pf_position *pf_last_position(struct pf_path *path)
-{
- return &path->positions[path->length - 1];
-}
-
-/************************************************************************
- Printing a path
-************************************************************************/
-void pf_print_path(int log_level, const struct pf_path *path)
-{
- int i;
-
- if (path) {
- freelog(log_level, "PF: path (at %p) consists of %d positions:",
- (void *)path, path->length);
- } else {
- freelog(log_level, "PF: path is NULL");
- return;
- }
-
- for (i = 0; i < path->length; i++) {
- freelog(log_level,
- "PF: %2d/%2d: (%2d,%2d) dir=%-2s cost=%2d (%2d, %d) EC=%d",
- i + 1, path->length,
- path->positions[i].tile->x,
- path->positions[i].tile->y,
- dir_get_name(path->positions[i].dir_to_next_pos),
- path->positions[i].total_MC, path->positions[i].turn,
- path->positions[i].moves_left, path->positions[i].total_EC);
- }
-}
-
-/************************************************************************
- After use, a path must be destroyed.
-************************************************************************/
-void pf_destroy_path(struct pf_path *path)
-{
- if (path) {
- free(path->positions);
- free(path);
- }
-}
+ /* 2: Fill the current position */
+ pos = &path->positions[i];
+ pos->tile = iter_tile;
+ if (!node->is_dangerous || !danger_seg) {
+ pos->total_MC = node->cost;
+ pos->total_EC = node->extra_cost;
+ } else {
+ /* When on dangerous tiles, must have a valid danger segment. */
+ assert(danger_seg != NULL);
+ pos->total_MC = danger_seg->cost;
+ pos->total_EC = danger_seg->extra_cost;
+ }
+ pos->turn = get_turn(params, pos->total_MC);
+ pos->moves_left = get_moves_left(params, pos->total_MC);
+ pos->total_MC -= (get_move_rate(params)
+ - get_moves_left_initially(params));
+ pos->dir_to_next_pos = (old_waited ? -1 : dir_next);
+ finalize_position(params, pos);
-/* ================ Danger-related stuff ======================= */
+ /* 3: Check if we finished */
+ if (i == 0) {
+ /* We should be back at the start now! */
+ assert(same_pos(iter_tile, params->start_tile));
+ return path;
+ }
-/************************************************************************
- Calculates cached danger-related values of the target node
-************************************************************************/
-static void init_danger_node(struct pf_map *pf_map,
- struct danger_node *d_node,
- struct pf_node *node, struct tile *ptile)
-{
- struct pf_parameter *params = pf_map->params;
+ /* 4: Calculate the next direction */
+ if (!node->is_dangerous || !danger_seg) {
+ /* We are in the normal node and dir_to_here field is valid. */
+ dir_next = node->dir_to_here;
+ /* d_node->danger_segment is the indicator of what lies ahead.
+ * If it's non-NULL, we are entering a danger segment,
+ * If it's NULL, we are not on one so danger_seg should be NULL. */
+ danger_seg = node->danger_segment;
+ } else {
+ /* We are in a danger segment */
+ dir_next = danger_seg->dir;
+ danger_seg++;
+ }
- /* Is the tile dangerous (i.e. no ending turn there) */
- if (params->is_pos_dangerous) {
- d_node->is_dangerous =
- params->is_pos_dangerous(ptile, node->node_known_type, params);
- } else {
- freelog(LOG_ERROR, "PF: init_danger_node called without"
- "is_pos_dangerous callback");
+ /* 5: Step further back */
+ iter_tile = mapstep(iter_tile, DIR_REVERSE(dir_next));
+ node = &pfdm->lattice[iter_tile->index];
}
+ die("pf_danger_map_construct_path: cannot get to the starting point!");
+ return NULL;
}
/***********************************************************************
Creating path segment going back from d_node1 to a safe tile.
***********************************************************************/
-static void create_danger_segment(struct pf_map *pf_map,
- struct danger_node *d_node1)
+static void pf_danger_map_create_segment(struct pf_danger_map *pfdm,
+ struct pf_danger_node *node1)
{
int i;
- struct tile *ptile = pf_map->tile;
- struct pf_node *node = &pf_map->lattice[ptile->index];
- struct danger_node *d_node = &pf_map->d_lattice[ptile->index];
+ struct tile *ptile = PF_MAP(pfdm)->tile;
+ struct pf_danger_node *node = &pfdm->lattice[ptile->index];
+ struct pf_danger_pos *pos;
int length = 0;
/* Allocating memory */
- if (d_node1->danger_segment) {
- freelog(LOG_ERROR, "Possible memory leak in create_danger_segment");
+ if (node1->danger_segment) {
+ freelog(LOG_ERROR, "Possible memory leak in "
+ "pf_danger_map_create_segment().");
}
/* First iteration for determining segment length */
- while(d_node->is_dangerous) {
+ while (node->is_dangerous && is_valid_dir(node->dir_to_here)) {
length++;
ptile = mapstep(ptile, DIR_REVERSE(node->dir_to_here));
- node = &pf_map->lattice[ptile->index];
- d_node = &pf_map->d_lattice[ptile->index];
+ node = &pfdm->lattice[ptile->index];
}
/* Allocate memory for segment */
- d_node1->danger_segment = fc_malloc(length * sizeof(struct pf_danger_pos));
+ node1->danger_segment = fc_malloc(length * sizeof(struct pf_danger_pos));
/* Reset tile and node pointers for main iteration */
- ptile = pf_map->tile;
- node = &pf_map->lattice[ptile->index];
+ ptile = PF_MAP(pfdm)->tile;
+ node = &pfdm->lattice[ptile->index];
/* Now fill the positions */
- for (i = 0; i < length; i++) {
+ for (i = 0, pos = node1->danger_segment; i < length; i++, pos++) {
/* Record the direction */
- d_node1->danger_segment[i].dir = node->dir_to_here;
- d_node1->danger_segment[i].cost = node->cost;
- d_node1->danger_segment[i].extra_cost = node->extra_cost;
+ pos->dir = node->dir_to_here;
+ pos->cost = node->cost;
+ pos->extra_cost = node->extra_cost;
if (i == length - 1) {
/* The last dangerous node contains "waiting" info */
- d_node1->waited = pf_map->d_lattice[ptile->index].waited;
+ node1->waited = node->waited;
}
/* Step further down the tree */
ptile = mapstep(ptile, DIR_REVERSE(node->dir_to_here));
- node = &pf_map->lattice[ptile->index];
+ node = &pfdm->lattice[ptile->index];
}
- /* Make sure we reached a safe node */
- assert(!pf_map->d_lattice[ptile->index].is_dangerous);
+ /* Make sure we reached a safe node or the start point */
+ assert(!node->is_dangerous || !is_valid_dir(node->dir_to_here));
}
/**********************************************************************
- Adjust cost taking into account possibility of making the move
+ Adjust cost taking into account possibility of making the move.
**********************************************************************/
-static int danger_adjust_cost(const struct pf_map *pf_map, int cost,
- bool to_danger, int moves_left)
+static int pf_danger_map_adjust_cost(const struct pf_parameter *params,
+ int cost, bool to_danger,
+ int moves_left)
{
-
if (cost == PF_IMPOSSIBLE_MC) {
return PF_IMPOSSIBLE_MC;
}
- cost = MIN(cost, get_move_rate(pf_map->params));
+ cost = MIN(cost, get_move_rate(params));
- if (pf_map->params->turn_mode == TM_BEST_TIME) {
+ if (params->turn_mode == TM_BEST_TIME) {
if (to_danger && cost >= moves_left) {
/* We would have to end the turn on a dangerous tile! */
return PF_IMPOSSIBLE_MC;
@@ -900,6 +1167,24 @@ static int danger_adjust_cost(const struct pf_map *pf_map, int cost,
}
/*****************************************************************************
+ This function returns the fills the cost needed for a position, to get full
+ moves at the next turn. This would be called only when the status is
+ NS_WAITING.
+*****************************************************************************/
+static int
+pf_danger_map_fill_cost_for_full_moves(const struct pf_parameter *param,
+ int cost)
+{
+ int moves_left = get_moves_left(param, cost);
+
+ if (moves_left < get_move_rate(param)) {
+ return cost + moves_left;
+ } else {
+ return cost;
+ }
+}
+
+/*****************************************************************************
Primary method for iterative path-finding in presence of danger
Notes:
1. Whenever the path-finding stumbles upon a dangerous
@@ -927,354 +1212,1342 @@ static int danger_adjust_cost(const struct pf_map *pf_map, int cost,
across danger, supply get_EC which returns small extra on
dangerous tiles.
*****************************************************************************/
-static bool danger_iterate_map(struct pf_map *pf_map)
+static bool pf_danger_map_iterate(struct pf_map *pfm)
{
- mapindex_t index;
- struct pf_node *node = &pf_map->lattice[pf_map->tile->index];
- struct danger_node *d_node = &pf_map->d_lattice[pf_map->tile->index];
+ struct pf_danger_map *pfdm = PF_DANGER_MAP(pfm);
+ struct tile *tile = pfm->tile;
+ mapindex_t index = tile->index;
+ struct pf_danger_node *node = &pfdm->lattice[index];
+ const struct pf_parameter *params = pf_get_parameter(pfm);
/* There is no exit from DONT_LEAVE tiles! */
if (node->behavior != TB_DONT_LEAVE) {
- /* Cost at xy but taking into account waiting */
- int loc_cost
- = (pf_map->status[pf_map->tile->index] != NS_WAITING ? node->cost
- : node->cost + get_moves_left(pf_map, node->cost));
+ /* Cost at tile but taking into account waiting */
+ int loc_cost;
+ if (node->status != NS_WAITING) {
+ loc_cost = node->cost;
+ } else {
+ loc_cost = pf_danger_map_fill_cost_for_full_moves(params,
+ node->cost);
+ }
/* The previous position is contained in {x,y} fields of map */
- adjc_dir_iterate(pf_map->tile, tile1, dir) {
+ adjc_dir_iterate(tile, tile1, dir) {
mapindex_t index1 = tile1->index;
- struct pf_node *node1 = &pf_map->lattice[index1];
- struct danger_node *d_node1 = &pf_map->d_lattice[index1];
+ struct pf_danger_node *node1 = &pfdm->lattice[index1];
int cost;
int extra = 0;
/* Dangerous tiles can be updated even after being processed */
- if ((pf_map->status[index1] == NS_PROCESSED
- || pf_map->status[index1] == NS_WAITING)
- && !d_node1->is_dangerous) {
- continue;
+ if ((node1->status == NS_PROCESSED || node1->status == NS_WAITING)
+ && !node1->is_dangerous) {
+ continue;
}
/* Initialise target tile if necessary */
- if (pf_map->status[index1] == NS_UNINIT) {
- init_node(pf_map, node1, tile1);
- init_danger_node(pf_map, d_node1, node1, tile1);
+ if (node1->status == NS_UNINIT) {
+ pf_danger_node_init(pfdm, node1, tile1);
}
/* Can we enter this tile at all? */
- if (node1->behavior == TB_IGNORE) {
- continue;
+ if (!node1->can_invade || node1->behavior == TB_IGNORE) {
+ continue;
}
/* Is the move ZOC-ok? */
- if (pf_map->params->get_zoc
- && !(node->zoc_number > 1 || node1->zoc_number > 0)) {
- continue;
+ if (params->get_zoc && !(node->zoc_number == ZOC_MINE
+ || node1->zoc_number != ZOC_NO)) {
+ continue;
}
/* Evaluate the cost of the move */
if (node1->node_known_type == TILE_UNKNOWN) {
- cost = pf_map->params->unknown_MC;
+ cost = params->unknown_MC;
} else {
- cost = pf_map->params->get_MC(pf_map->tile, dir, tile1,
- pf_map->params);
+ cost = params->get_MC(tile, dir, tile1, params);
}
if (cost == PF_IMPOSSIBLE_MC) {
- continue;
+ continue;
}
- cost = danger_adjust_cost(pf_map, cost, d_node1->is_dangerous,
- get_moves_left(pf_map, loc_cost));
+ cost = pf_danger_map_adjust_cost(params, cost, node1->is_dangerous,
+ get_moves_left(params, loc_cost));
if (cost == PF_IMPOSSIBLE_MC) {
- /* This move is deemed impossible */
- continue;
+ /* This move is deemed impossible */
+ continue;
}
/* Total cost at xy1 */
cost += loc_cost;
/* Evaluate the extra cost of the destination, if it's relevant */
- if (pf_map->params->get_EC) {
- extra = node1->extra_tile + node->extra_cost;
+ if (params->get_EC) {
+ extra = node1->extra_tile + node->extra_cost;
}
- /* Update costs and add to queue, if this is a better route to xy1 */
- if (!d_node1->is_dangerous) {
- int cost_of_path = get_total_CC(pf_map, cost, extra);
+ /* Update costs and add to queue, if this is a better route to tile1 */
+ if (!node1->is_dangerous) {
+ int cost_of_path = get_total_CC(params, cost, extra);
- if (pf_map->status[index1] == NS_UNINIT
- || (cost_of_path
- < get_total_CC(pf_map, node1->cost, node1->extra_cost))) {
- node1->extra_cost = extra;
- node1->cost = cost;
- node1->dir_to_here = dir;
+ if (node1->status == NS_INIT
+ || (cost_of_path < get_total_CC(params, node1->cost,
+ node1->extra_cost))) {
+ node1->extra_cost = extra;
+ node1->cost = cost;
+ node1->dir_to_here = dir;
/* Clear the previously recorded path back */
- if (d_node1->danger_segment) {
- free(d_node1->danger_segment);
- d_node1->danger_segment = NULL;
+ if (node1->danger_segment) {
+ free(node1->danger_segment);
+ node1->danger_segment = NULL;
}
- if (d_node->is_dangerous) {
- /* Transition from red to blue, need to record the path back */
- create_danger_segment(pf_map, d_node1);
- } else {
+ if (node->is_dangerous) {
+ /* Transition from red to blue, need to record the path back */
+ pf_danger_map_create_segment(pfdm, node1);
+ } else {
/* We don't consider waiting to get to a safe tile as
* "real" waiting */
- d_node1->waited = FALSE;
- }
- pf_map->status[index1] = NS_NEW;
- pq_insert(pf_map->queue, index1, -cost_of_path);
- }
+ node1->waited = FALSE;
+ }
+ node1->status = NS_NEW;
+ pq_insert(pfdm->queue, index1, -cost_of_path);
+ }
} else {
- /* The procedure is slightly different for dangerous nodes */
- /* We will update costs if:
- * 1: we are here for the first time
- * 2: we can possibly go further across dangerous area or
- * 3: we can have lower extra and will not
- * overwrite anything useful */
- if (pf_map->status[index1] == NS_UNINIT
- || (get_moves_left(pf_map, cost)
- > get_moves_left(pf_map, node1->cost))
- || (get_total_CC(pf_map, cost, extra)
- < get_total_CC(pf_map, node1->cost, node1->extra_cost)
- && pf_map->status[index1] == NS_PROCESSED)) {
- node1->extra_cost = extra;
- node1->cost = cost;
- node1->dir_to_here = dir;
- pf_map->status[index1] = NS_NEW;
- d_node1->waited = (pf_map->status[pf_map->tile->index]
- == NS_WAITING);
- /* Extra costs of all nodes in danger_queue are equal! */
- pq_insert(pf_map->danger_queue, index1, -cost);
- }
+ /* The procedure is slightly different for dangerous nodes */
+ /* We will update costs if:
+ * 1: we are here for the first time
+ * 2: we can possibly go further across dangerous area or
+ * 3: we can have lower extra and will not
+ * overwrite anything useful */
+ if (node1->status == NS_INIT
+ || (get_moves_left(params, cost)
+ > get_moves_left(params, node1->cost))
+ || ((get_total_CC(params, cost, extra)
+ < get_total_CC(params, node1->cost, node1->extra_cost))
+ && node1->status == NS_PROCESSED)) {
+ node1->extra_cost = extra;
+ node1->cost = cost;
+ node1->dir_to_here = dir;
+ node1->status = NS_NEW;
+ node1->waited = (node->status == NS_WAITING);
+ /* Extra costs of all nodes in danger_queue are equal! */
+ pq_insert(pfdm->danger_queue, index1, -cost);
+ }
}
- }
- adjc_dir_iterate_end;
+ } adjc_dir_iterate_end;
}
- if (!d_node->is_dangerous
- && pf_map->status[pf_map->tile->index] != NS_WAITING
- && (get_moves_left(pf_map, node->cost)
- < get_move_rate(pf_map->params))) {
+ if (!node->is_dangerous && node->status != NS_WAITING
+ && get_moves_left(params, node->cost) < get_move_rate(params)) {
+ int fc, cc;
/* Consider waiting at this node.
* To do it, put it back into queue. */
- pf_map->status[pf_map->tile->index] = NS_WAITING;
- pq_insert(pf_map->queue, pf_map->tile->index,
- -get_total_CC(pf_map, get_moves_left(pf_map, node->cost)
- + node->cost, node->extra_cost));
+ fc = pf_danger_map_fill_cost_for_full_moves(params, node->cost);
+ cc = get_total_CC(params, fc, node->extra_cost);
+ node->status = NS_WAITING;
+ pq_insert(pfdm->queue, index, -cc);
} else {
- pf_map->status[pf_map->tile->index] = NS_PROCESSED;
+ node->status = NS_PROCESSED;
}
/* Get the next nearest node */
/* First try to get it from danger_queue */
- if (!pq_remove(pf_map->danger_queue, &index)) {
+ if (!pq_remove(pfdm->danger_queue, &index)) {
/* No dangerous nodes to process, go for a safe one */
do {
- if (!pq_remove(pf_map->queue, &index)) {
- return FALSE;
+ if (!pq_remove(pfdm->queue, &index)) {
+ return FALSE;
}
- } while (pf_map->status[index] == NS_PROCESSED);
+ } while (pfdm->lattice[index].status == NS_PROCESSED);
}
- assert(pf_map->status[pf_map->tile->index] != NS_UNINIT);
+ tile = index_to_tile(index);
+ pfm->tile = tile;
+ node = &pfdm->lattice[index];
- pf_map->tile = index_to_tile(index);
+ assert(node->status > NS_INIT);
- if (pf_map->status[pf_map->tile->index] == NS_WAITING) {
+ if (node->status == NS_WAITING) {
/* We've already returned this node once, skip it */
- freelog(LOG_DEBUG, "Considering waiting at (%d, %d)",
- pf_map->tile->x, pf_map->tile->y);
- return danger_iterate_map(pf_map);
- } else if (pf_map->d_lattice[index].is_dangerous) {
+ freelog(LOG_DEBUG, "Considering waiting at (%d, %d)", TILE_XY(tile));
+ return pf_next(pfm);
+ } else if (node->is_dangerous) {
/* We don't return dangerous tiles */
- freelog(LOG_DEBUG, "Reached dangerous tile (%d, %d)",
- pf_map->tile->x, pf_map->tile->y);
- return danger_iterate_map(pf_map);
- } else {
- /* Just return it */
+ freelog(LOG_DEBUG, "Reached dangerous tile (%d, %d)", TILE_XY(tile));
+ return pf_next(pfm);
+ }
+
+ /* Just return it */
+ return TRUE;
+}
+
+/*************************************************************************
+ Get the path to ptile, put it in "path". If ptile has not been reached
+ yet, iterate the map until we reach it or run out of map.
+*************************************************************************/
+static struct pf_path *pf_danger_map_get_path(struct pf_map *pfm,
+ struct tile *ptile)
+{
+ struct pf_danger_map *pfdm = PF_DANGER_MAP(pfm);
+ struct pf_danger_node *node = &pfdm->lattice[ptile->index];
+
+ if (node->status != NS_UNINIT
+ && node->is_dangerous
+ && !same_pos(ptile, pfm->params.start_tile)) {
+ /* "Best" path to a dangerous tile is undefined */
+ /* TODO: return the "safest" path */
+ return NULL;
+ }
+
+ if (node->status == NS_PROCESSED || node->status == NS_WAITING
+ || same_pos(ptile, pfm->tile)) {
+ /* We already reached this tile */
+ return pf_danger_map_construct_path(pfdm, ptile);
+ }
+
+ while (pf_next(pfm)) {
+ if (same_pos(ptile, pfm->tile)) {
+ /* That's the one */
+ return pf_danger_map_construct_path(pfdm, ptile);
+ }
+ }
+
+ return NULL;
+}
+
+/***************************************************************************
+ Get info about position at ptile and put it in pos. If ptile has not been
+ reached yet, iterate the map until we reach it. Should _always_ check the
+ return value, for the position might be unreachable.
+***************************************************************************/
+static bool pf_danger_map_get_position(struct pf_map *pfm,
+ struct tile *ptile,
+ struct pf_position *pos)
+{
+ struct pf_danger_map *pfdm = PF_DANGER_MAP(pfm);
+
+ if (pfdm->lattice[ptile->index].status == NS_PROCESSED
+ || same_pos(ptile, pfm->tile)) {
+ /* We already reached this tile */
+ pf_danger_map_fill_position(pfdm, ptile, pos);
return TRUE;
}
+
+ while (pf_next(pfm)) {
+ if (same_pos(ptile, pfm->tile)) {
+ /* That's the one */
+ pf_danger_map_fill_position(pfdm, ptile, pos);
+ return TRUE;
+ }
+ }
+
+ return FALSE;
+}
+
+/*********************************************************************
+ After usage the map must be destroyed.
+*********************************************************************/
+static void pf_danger_map_destroy(struct pf_map *pfm)
+{
+ struct pf_danger_map *pfdm = PF_DANGER_MAP(pfm);
+ struct pf_danger_node *node;
+ mapindex_t i;
+
+ /* Need to clean up the dangling danger_sements */
+ for (i = 0, node = pfdm->lattice; i < MAP_INDEX_SIZE; i++, node++) {
+ if (node->danger_segment) {
+ free(node->danger_segment);
+ }
+ }
+ free(pfdm->lattice);
+ pq_destroy(pfdm->queue);
+ pq_destroy(pfdm->danger_queue);
+ free(pfdm);
+}
+
+/**************************************************************************
+ Create a pf_danger_map. NB: The "constructor" returns a pf_map.
+**************************************************************************/
+static struct pf_map *pf_danger_map_create(const struct pf_parameter *parameter)
+{
+ struct pf_danger_map *pfdm;
+ struct pf_map *base_map;
+ struct pf_parameter *params;
+ struct pf_danger_node *node;
+
+ pfdm = fc_calloc(1, sizeof(*pfdm));
+ base_map = &pfdm->base_map;
+ params = &base_map->params;
+#ifdef PF_DEBUG
+ /* Set the mode, used for cast check */
+ base_map->mode = PF_DANGER;
+#endif /* PF_DEBUG */
+
+ /* Alloc the map */
+ pfdm->lattice = fc_calloc(MAP_INDEX_SIZE, sizeof(struct pf_danger_node));
+ pfdm->queue = pq_create(INITIAL_QUEUE_SIZE);
+ pfdm->danger_queue = pq_create(INITIAL_QUEUE_SIZE);
+
+ /* MC callback must be set */
+ assert(parameter->get_MC != NULL);
+
+ /* is_pos_dangerous callback must be set */
+ assert(parameter->is_pos_dangerous != NULL);
+
+ /* Copy parameters */
+ *params = *parameter;
+
+ /* Initialize virtual function table. */
+ base_map->destroy = pf_danger_map_destroy;
+ base_map->get_path = pf_danger_map_get_path;
+ base_map->get_position = pf_danger_map_get_position;
+ base_map->iterate = pf_danger_map_iterate;
+
+ /* Initialise starting coordinates */
+ base_map->tile = params->start_tile;
+
+ /* Initialise starting node */
+ node = &pfdm->lattice[params->start_tile->index];
+ pf_danger_node_init(pfdm, node, params->start_tile);
+ /* This makes calculations of turn/moves_left more convenient, but we
+ * need to subtract this value before we return cost to the user. Note
+ * that cost may be negative if moves_left_initially > move_rate
+ * (see get_turn()). */
+ node->cost = get_move_rate(params) - get_moves_left_initially(params);
+ node->extra_cost = 0;
+ node->dir_to_here = -1;
+
+ return PF_MAP(pfdm);
+}
+
+
+
+/* ================ Specific pf_fuel_* mode structures ================= */
+
+/* Some comments on implementation:
+ * 1. cost (aka total_MC) is sum of MCs altered to fit to the turn_mode
+ * see adjust_cost.
+ * 2. dir_to_here is for backtracking along the tree of shortest paths.
+ * 3. node_known_type, behavior, zoc_number, extra_tile, is_enemy_tile,
+ * moves_left_req and waited are all cached values.
+ * It is possible to shove them into a separate array which is allocated
+ * only if a corresponding option in the parameter is set. A less drastic
+ * measure would be to pack the first three into one byte. All of there are
+ * time-saving measures and should be tested once we get an established
+ * user-base. */
+struct pf_fuel_node {
+ int cost; /* total_MC */
+ int extra_cost; /* total_EC */
+ int moves_left; /* Moves left at this position */
+ utiny_t dir_to_here; /* direction from which we came */
+
+ /* Cached values */
+ utiny_t status; /* (enum pf_node_status really) */
+ int extra_tile; /* EC */
+ utiny_t node_known_type;
+ utiny_t behavior;
+ utiny_t zoc_number; /* (enum pf_zoc_type really) */
+ bool can_invade;
+ bool is_enemy_tile;
+ int moves_left_req; /* The minimum required moves left */
+ bool waited; /* TRUE if waited to get here */
+
+ struct pf_fuel_pos {
+ enum direction8 dir;
+ int cost;
+ int extra_cost;
+ int moves_left;
+ } *fuel_segment; /* Segment leading across the danger area
+ * back to the nearest safe node:
+ * need to remeber costs and stuff */
+};
+
+/* Derived structure of struct pf_map. */
+struct pf_fuel_map {
+ struct pf_map base_map; /* Base structure, must be the first! */
+
+ struct pqueue *queue; /* Queue of nodes we have reached but not
+ * processed yet (NS_NEW), sorted by their
+ * total_CC */
+ struct pqueue *out_of_fuel_queue; /* Dangerous positions go there */
+ struct pf_fuel_node *lattice; /* Lattice of nodes */
+};
+
+/* Up-cast macro. */
+#ifdef PF_DEBUG
+static inline struct pf_fuel_map *
+pf_fuel_map_check(struct pf_map *pfm, const char *file, int line)
+{
+ if (!pfm || pfm->mode != PF_FUEL) {
+ real_die(file, line, "Wrong pf_map to pf_fuel_map conversion");
+ }
+ return (struct pf_fuel_map *) pfm;
+}
+#define PF_FUEL_MAP(pfm) pf_fuel_map_check(pfm, __FILE__, __LINE__)
+#else
+#define PF_FUEL_MAP(pfm) ((struct pf_fuel_map *) (pfm))
+#endif /* PF_DEBUG */
+
+/* ============== Specific pf_fuel_* mode functions =============== */
+
+/**********************************************************************
+ Calculates cached values of the target node: node_known_type and zoc
+**********************************************************************/
+static void pf_fuel_node_init(struct pf_fuel_map *pffm,
+ struct pf_fuel_node *node,
+ struct tile *ptile)
+{
+ const struct pf_parameter *params = pf_get_parameter(PF_MAP(pffm));
+
+ /* Establish the "known" status of node */
+ if (params->omniscience) {
+ node->node_known_type = TILE_KNOWN;
+ } else {
+ node->node_known_type = tile_get_known(ptile, params->owner);
+ }
+
+ /* Establish the tile behavior */
+ if (params->get_TB) {
+ node->behavior = params->get_TB(ptile, node->node_known_type, params);
+ } else {
+ /* The default */
+ node->behavior = TB_NORMAL;
+ }
+
+ if (params->get_zoc) {
+ struct city *pcity = tile_get_city(ptile);
+ struct terrain *pterrain = tile_get_terrain(ptile);
+ bool my_zoc = (NULL != pcity || pterrain == T_UNKNOWN
+ || terrain_has_flag(pterrain, TER_OCEANIC)
+ || params->get_zoc(params->owner, ptile));
+ /* ZoC rules cannot prevent us from moving into/attacking an occupied
+ * tile. Other rules can, but we don't care about them here. */
+ bool occupied = (unit_list_size(ptile->units) > 0 || NULL != pcity);
+
+ /* ZOC_MINE means can move unrestricted from/into it,
+ * ZOC_ALLIED means can move unrestricted into it,
+ * but not necessarily from it */
+ node->zoc_number = (my_zoc ? ZOC_MINE
+ : (occupied ? ZOC_ALLIED : ZOC_NO));
+#ifdef ZERO_VARIABLES_FOR_SEARCHING
+ } else {
+ /* Nodes are allocated by fc_calloc(), so should be already set to 0. */
+ node->zoc_number = 0;
+#endif
+ }
+
+ /* Evaluate the extra cost of the destination */
+ if (params->get_EC) {
+ node->extra_tile = params->get_EC(ptile, node->node_known_type,
+ params);
+#ifdef ZERO_VARIABLES_FOR_SEARCHING
+ } else {
+ /* Nodes are allocated by fc_calloc(), so should be already set to 0. */
+ node->extra_tile = 0;
+#endif
+ }
+
+ if (params->can_invade_tile) {
+ node->can_invade = params->can_invade_tile(params->owner, ptile);
+ } else {
+ node->can_invade = TRUE;
+ }
+
+ if (is_enemy_unit_tile(ptile, params->owner)
+ || (is_enemy_city_tile(ptile, params->owner))) {
+ node->is_enemy_tile = TRUE;
+#ifdef ZERO_VARIABLES_FOR_SEARCHING
+ /* Nodes are allocated by fc_calloc(), so should be already set to 0. */
+ node->moves_left_req = 0; /* Attack is always possible theorically. */
+#endif
+ } else {
+#ifdef ZERO_VARIABLES_FOR_SEARCHING
+ /* Nodes are allocated by fc_calloc(), so should be already set to 0. */
+ node->is_enemy_tile = FALSE;
+#endif
+ node->moves_left_req =
+ params->get_moves_left_req(ptile, node->node_known_type, params);
+ }
+
+ /* waited is set to zero by fc_calloc. */
+
+ node->status = NS_INIT;
+}
+
+/****************************************************************************
+ Finalize the fuel position.
+****************************************************************************/
+static void pf_fuel_base_finalize_position(const struct pf_parameter *param,
+ struct pf_position *pos,
+ int cost, int moves_left)
+{
+ int move_rate = get_move_rate(param);
+
+ if (move_rate > 0) {
+ /* Cost may be negative; see get_turn(). */
+ pos->turn = cost < 0 ? 0 : cost / move_rate;
+ pos->fuel_left = (moves_left - 1) / move_rate + 1;
+ pos->moves_left = moves_left % move_rate;
+ } else {
+ /* This unit cannot move by itself. */
+ pos->turn = same_pos(pos->tile, param->start_tile) ? 0 : FC_INFINITY;
+ pos->fuel_left = 0;
+ pos->moves_left = 0;
+ }
+}
+
+/****************************************************************************
+ Finalize the fuel position.
+****************************************************************************/
+static void pf_fuel_finalize_position(struct pf_position *pos,
+ const struct pf_parameter *params,
+ const struct pf_fuel_node *node,
+ const struct pf_fuel_pos *head)
+{
+ if (head) {
+ pf_fuel_base_finalize_position(params, pos,
+ head->cost, head->moves_left);
+ } else {
+ pf_fuel_base_finalize_position(params, pos,
+ node->cost, node->moves_left);
+ }
+}
+
+/****************************************************************************
+ Fill in the position which must be discovered already. A helper
+ for *_get_position functions. This also "finalizes" the position.
+****************************************************************************/
+static void pf_fuel_map_fill_position(const struct pf_fuel_map *pffm,
+ struct tile *ptile,
+ struct pf_position *pos)
+{
+ mapindex_t index = ptile->index;
+ struct pf_fuel_node *node = &pffm->lattice[index];
+ struct pf_fuel_pos *head = node->fuel_segment;
+ const struct pf_parameter *params = pf_get_parameter(PF_MAP(pffm));
+
+#ifdef PF_DEBUG
+ if ((node->status != NS_PROCESSED
+ && !same_pos(ptile, PF_MAP(pffm)->tile)) || !head) {
+ die("pf_normal_map_fill_position to an unreached destination");
+ return;
+ }
+#endif /* PF_DEBUG */
+
+ pos->tile = ptile;
+ pos->total_EC = head->extra_cost;
+ pos->total_MC = (head->cost - get_move_rate(params)
+ + get_moves_left_initially(params));
+ if (params->turn_mode == TM_BEST_TIME
+ || params->turn_mode == TM_WORST_TIME) {
+ pf_fuel_finalize_position(pos, params, node, head);
+ } else if (params->turn_mode == TM_NONE
+ || params->turn_mode == TM_CAPPED) {
+ pos->turn = -1;
+ pos->moves_left = -1;
+ pos->fuel_left = -1;
+ } else {
+ die("unknown TC");
+ }
+
+ pos->dir_to_here = head->dir;
+ /* This field does not apply */
+ pos->dir_to_next_pos = -1;
}
/*******************************************************************
Read off the path to the node (x, y), but with danger
NB: will only find paths to safe tiles!
*******************************************************************/
-static struct pf_path *danger_construct_path(const struct pf_map *pf_map,
- struct tile *ptile)
+static struct pf_path *
+pf_fuel_map_construct_path(const struct pf_fuel_map *pffm,
+ struct tile *ptile)
{
struct pf_path *path = fc_malloc(sizeof(*path));
- int i;
enum direction8 dir_next = -1;
- struct pf_danger_pos *danger_seg = NULL; /* For danger segments */
- int segment_index = -1; /* For danger segments */
- bool waited = FALSE;
- struct pf_node *node = &pf_map->lattice[ptile->index];
- struct danger_node *d_node = &pf_map->d_lattice[ptile->index];
+ struct pf_fuel_pos *segment = NULL;
+ struct pf_fuel_node *node = &pffm->lattice[ptile->index];
+ bool waited = node->waited;
int length = 1;
struct tile *iter_tile = ptile;
+ const struct pf_parameter *params = pf_get_parameter(PF_MAP(pffm));
+ struct pf_position *pos;
+ int i;
- if (pf_map->params->turn_mode != TM_BEST_TIME &&
- pf_map->params->turn_mode != TM_WORST_TIME) {
+ if (params->turn_mode != TM_BEST_TIME
+ && params->turn_mode != TM_WORST_TIME) {
die("illegal TM in path-finding with danger");
return NULL;
}
/* First iterate to find path length */
- while(!same_pos(iter_tile, pf_map->params->start_tile)) {
+ /* Note: the start point could be reached in the middle of a segment. */
+ while (!same_pos(iter_tile, params->start_tile)
+ || (segment && is_valid_dir(segment->dir))) {
- if (!d_node->is_dangerous && d_node->waited) {
- length += 2;
+ if (node->moves_left_req == 0) {
+ if (waited) {
+ length += 2;
+ } else {
+ length++;
+ }
+ waited = node->waited;
} else {
length++;
}
- if (!d_node->is_dangerous) {
- /* We are in the normal node and dir_to_here field is valid */
- dir_next = node->dir_to_here;
- /* d_node->danger_segment is the indicator of what lies ahead
- * if it's non-NULL, we are entering a danger segment,
- * if it's NULL, we are not on one so danger_seg should be NULL */
- danger_seg = d_node->danger_segment;
- segment_index = 0;
- } else {
+ if (node->moves_left_req == 0 || !segment) {
+ segment = node->fuel_segment;
+ }
+
+ if (segment) {
/* We are in a danger segment */
- dir_next = danger_seg[segment_index].dir;
- segment_index++;
+ dir_next = segment->dir;
+ segment++;
+ } else {
+ /* Classical node */
+ dir_next = node->dir_to_here;
}
/* Step backward */
iter_tile = mapstep(iter_tile, DIR_REVERSE(dir_next));
- node = &pf_map->lattice[iter_tile->index];
- d_node = &pf_map->d_lattice[iter_tile->index];
+ node = &pffm->lattice[iter_tile->index];
+ }
+ if (node->moves_left_req == 0 && waited) {
+ /* We wait at the start point */
+ length++;
}
/* Allocate memory for path */
- path->positions
- = fc_malloc(length * sizeof(struct pf_position));
+ path->positions = fc_malloc(length * sizeof(struct pf_position));
path->length = length;
/* Reset variables for main iteration */
iter_tile = ptile;
- node = &pf_map->lattice[ptile->index];
- d_node = &pf_map->d_lattice[ptile->index];
- waited = FALSE;
+ node = &pffm->lattice[ptile->index];
+ segment = NULL;
+ waited = node->waited;
+ dir_next = -1;
for (i = length - 1; i >= 0; i--) {
bool old_waited = FALSE;
+ if (node->moves_left_req == 0 || !segment) {
+ segment = node->fuel_segment;
+ }
+
/* 1: Deal with waiting */
- if (!d_node->is_dangerous) {
+ if (node->moves_left_req == 0) {
if (waited) {
- /* Waited at _this_ tile, need to record it twice in the path.
- * Here we record our state _after_ waiting (e.g. full move points) */
- path->positions[i].tile = iter_tile;
- path->positions[i].total_EC = node->extra_cost;
- path->positions[i].turn = get_turn(pf_map, node->cost) + 1;
- path->positions[i].moves_left = get_move_rate(pf_map->params);
- path->positions[i].total_MC
- = ((path->positions[i].turn - 1) * pf_map->params->move_rate
- + pf_map->params->moves_left_initially);
- path->positions[i].dir_to_next_pos = dir_next;
- finalize_position(pf_map, &path->positions[i]);
- /* Set old_waited so that we record -1 as a direction at the step
- * we were going to wait */
+ /* Waited at _this_ tile, need to record it twice in the
+ * path. Here we record our state _after_ waiting (e.g.
+ * full move points). */
+ pos = &path->positions[i];
+ pos->tile = iter_tile;
+ pos->total_EC = segment ? segment->extra_cost : node->extra_cost;
+ pf_fuel_finalize_position(pos, params, node, segment);
+ pos->total_MC = ((pos->turn - 1) * params->move_rate
+ + params->moves_left_initially);
+ pos->dir_to_next_pos = dir_next;
+ /* Set old_waited so that we record -1 as a direction at
+ * the step we were going to wait. */
old_waited = TRUE;
i--;
}
- /* Update "waited" (d_node->waited means "waited to get here") */
- waited = d_node->waited;
+ /* Update "waited" (node->waited means "waited to get here") */
+ waited = node->waited;
}
/* 2: Fill the current position */
- path->positions[i].tile = iter_tile;
- if (!d_node->is_dangerous) {
- path->positions[i].total_MC = node->cost;
- path->positions[i].total_EC = node->extra_cost;
+ pos = &path->positions[i];
+ pos->tile = iter_tile;
+ if (segment) {
+ pos->total_MC = segment->cost;
+ pos->total_EC = segment->extra_cost;
} else {
- /* When on dangerous tiles, must have a valid danger segment */
- assert(danger_seg != NULL);
- path->positions[i].total_MC = danger_seg[segment_index].cost;
- path->positions[i].total_EC = danger_seg[segment_index].extra_cost;
- }
- path->positions[i].turn = get_turn(pf_map, path->positions[i].total_MC);
- path->positions[i].moves_left
- = get_moves_left(pf_map, path->positions[i].total_MC);
- path->positions[i].total_MC -= get_move_rate(pf_map->params)
- - get_moves_left_initially(pf_map->params);
- path->positions[i].dir_to_next_pos = (old_waited ? -1 : dir_next);
- finalize_position(pf_map, &path->positions[i]);
+ pos->total_MC = node->cost;
+ pos->total_EC = node->extra_cost;
+ }
+ pf_fuel_finalize_position(pos, params, node, segment);
+ pos->total_MC -= (get_move_rate(params)
+ - get_moves_left_initially(params));
+ pos->dir_to_next_pos = (old_waited ? -1 : dir_next);
/* 3: Check if we finished */
if (i == 0) {
/* We should be back at the start now! */
- assert(same_pos(iter_tile, pf_map->params->start_tile));
+ assert(same_pos(iter_tile, params->start_tile));
return path;
}
/* 4: Calculate the next direction */
- if (!d_node->is_dangerous) {
- /* We are in the normal node and dir_to_here field is valid */
- dir_next = node->dir_to_here;
- /* d_node->danger_segment is the indicator of what lies ahead
- * if it's non-NULL, we are entering a danger segment,
- * if it's NULL, we are not on one so danger_seg should be NULL */
- danger_seg = d_node->danger_segment;
- segment_index = 0;
- } else {
+ if (segment) {
/* We are in a danger segment */
- dir_next = danger_seg[segment_index].dir;
- segment_index++;
+ dir_next = segment->dir;
+ segment++;
+ } else {
+ /* Classical node */
+ dir_next = node->dir_to_here;
}
/* 5: Step further back */
iter_tile = mapstep(iter_tile, DIR_REVERSE(dir_next));
- node = &pf_map->lattice[iter_tile->index];
- d_node = &pf_map->d_lattice[iter_tile->index];
-
+ node = &pffm->lattice[iter_tile->index];
}
- die("danger_get_path: cannot get to the starting point!");
+ die("pf_fuel_map_construct_path: cannot get to the starting point!");
return NULL;
}
+/***********************************************************************
+ Creating path segment going back from d_node1 to a safe tile,
+ or the start tile by default (!is_valid_dir(node->dir_to_here)).
+***********************************************************************/
+static void pf_fuel_map_create_segment(struct pf_fuel_map *pffm,
+ struct tile *tile1,
+ struct pf_fuel_node *node1)
+{
+ struct tile *ptile = tile1;
+ struct pf_fuel_node *node = node1;
+ struct pf_fuel_pos *pos;
+ int length = 1;
+ int i;
+
+ /* Clear the previously recorded path back */
+ if (node1->fuel_segment) {
+ free(node1->fuel_segment);
+ }
+
+ /* First iteration for determining segment length */
+ do {
+ length++;
+ ptile = mapstep(ptile, DIR_REVERSE(node->dir_to_here));
+ node = &pffm->lattice[ptile->index];
+ } while (node->moves_left_req != 0 && is_valid_dir(node->dir_to_here));
+
+ /* Allocate memory for segment */
+ node1->fuel_segment = fc_malloc(length * sizeof(struct pf_fuel_pos));
+
+ /* Reset tile and node pointers for main iteration */
+ ptile = tile1;
+ node = node1;
+
+ /* Now fill the positions */
+ for (i = 0, pos = node1->fuel_segment; i < length; i++, pos++) {
+ /* Record the direction */
+ pos->dir = node->dir_to_here;
+ pos->cost = node->cost;
+ pos->extra_cost = node->extra_cost;
+ pos->moves_left = node->moves_left;
+ if (i == length - 2) {
+ /* The node before the last contains "waiting" info */
+ node1->waited = node->waited;
+ } else if (i == length - 1) {
+ break;
+ }
+
+ /* Step further down the tree */
+ ptile = mapstep(ptile, DIR_REVERSE(node->dir_to_here));
+ node = &pffm->lattice[ptile->index];
+ }
+
+ /* Make sure we reached a safe node, or the start tile */
+ assert(node->moves_left_req == 0 || !is_valid_dir(node->dir_to_here));
+}
+
+/***************************************************************************
+ This function returns whether a unit with or without fuel can attack.
+
+ moves_left: moves left before the attack.
+ moves_left_req: required moves left to hold on the tile after attacking.
+***************************************************************************/
+static bool pf_fuel_map_attack_is_possible(const struct pf_parameter *param,
+ int moves_left,
+ int moves_left_req)
+{
+ if (BV_ISSET(param->unit_flags, F_ONEATTACK)) {
+ if (param->fuel == 1) {
+ /* Case missile */
+ return TRUE;
+ } else {
+ /* Case Bombers */
+ if (moves_left <= param->move_rate) {
+ /* We are in the last turn of fuel, don't attack */
+ return FALSE;
+ } else {
+ return TRUE;
+ }
+ }
+ } else {
+ /* Case fighters */
+ if (moves_left - SINGLE_MOVE < moves_left_req) {
+ return FALSE;
+ } else {
+ return TRUE;
+ }
+ }
+}
+
+/*****************************************************************************
+ This function returns the fill cost needed for a position, to get full
+ moves at the next turn. This would be called only when the status is
+ NS_WAITING.
+*****************************************************************************/
+static int
+pf_fuel_map_fill_cost_for_full_moves(const struct pf_parameter *param,
+ int cost, int moves_left)
+{
+ return cost + moves_left % param->move_rate;
+}
+
+/***************************************************************************
+ Primary method for iterative path-finding in presence of danger
+
+ Notes:
+ 1. Whenever the path-finding stumbles upon a dangerous location, it goes
+ into a sub-Dijkstra which processes _only_ dangerous locations, by means
+ of a separate queue. When this sub-Dijkstra reaches a safe location, it
+ records the segment of the path going across the dangerous terrain. Hence
+ segment is an extended (and reversed) version of the dir_to_here field.
+ It can be re-recorded multiple times as we find shorter and shorter
+ routes.
+
+ 2. Waiting is realised by inserting the (safe) tile back into the queue
+ with a lower priority P. This tile might pop back sooner than P, because
+ there might be several copies of it in the queue already. But that does
+ not seem to present any problems.
+
+ 3. For some purposes, NS_WAITING is just another flavour of NS_PROCESSED,
+ since the path to a NS_WAITING tile has already been found.
+
+ 4. The code is arranged so that if the turn-mode is TM_WORST_TIME, a
+ cavalry with non-full MP will get to a safe mountain tile only after
+ waiting. This waiting, although realised through NS_WAITING, is different
+ from waiting before going into the danger area, so it will not be marked
+ as "waiting" on the resulting paths.
+
+ 5. This algorithm cannot guarantee the best safe segments across dangerous
+ region. However it will find a safe segment if there is one. To gurantee
+ the best (in terms of total_CC) safe segments across danger, supply get_EC
+ which returns small extra on dangerous tiles.
+***************************************************************************/
+static bool pf_fuel_map_iterate(struct pf_map *pfm)
+{
+ struct pf_fuel_map *pffm = PF_FUEL_MAP(pfm);
+ struct tile *tile = pfm->tile;
+ mapindex_t index = tile->index;
+ struct pf_fuel_node *node = &pffm->lattice[index];
+ const struct pf_parameter *params = pf_get_parameter(pfm);
+
+ /* There is no exit from DONT_LEAVE tiles! */
+ if (node->behavior != TB_DONT_LEAVE) {
+ int loc_cost, loc_moves_left;
+
+ if (node->status != NS_WAITING) {
+ loc_cost = node->cost;
+ loc_moves_left = node->moves_left;
+ } else {
+ /* Cost and moves left at tile but taking into account waiting */
+ loc_cost = pf_fuel_map_fill_cost_for_full_moves(params, node->cost,
+ node->moves_left);
+ loc_moves_left = get_move_rate(params);
+ }
+
+ /* The previous position is contained in {x,y} fields of map */
+ adjc_dir_iterate(tile, tile1, dir) {
+ mapindex_t index1 = tile1->index;
+ struct pf_fuel_node *node1 = &pffm->lattice[index1];
+ int cost, extra = 0;
+ int moves_left, mlr = 0;
+ int cost_of_path, old_cost_of_path;
+ struct tile *prev_tile;
+ struct pf_fuel_pos *pos;
+
+ /* Non-full fuel tiles can be updated even after being processed */
+ if ((node1->status == NS_PROCESSED || node1->status == NS_WAITING)
+ && node1->moves_left_req == 0) {
+ continue;
+ }
+
+ /* Initialise target tile if necessary */
+ if (node1->status == NS_UNINIT) {
+ pf_fuel_node_init(pffm, node1, tile1);
+ }
+
+ /* Cannot use this unreachable tile */
+ if (node1->moves_left_req == PF_IMPOSSIBLE_MC) {
+ continue;
+ }
+
+ /* Can we enter this tile at all? */
+ if (!node1->can_invade || node1->behavior == TB_IGNORE) {
+ continue;
+ }
+
+ /* Is the move ZOC-ok? */
+ if (params->get_zoc && !(node->zoc_number == ZOC_MINE
+ || node1->zoc_number != ZOC_NO)) {
+ continue;
+ }
+
+ /* Evaluate the cost of the move */
+ if (node1->node_known_type == TILE_UNKNOWN) {
+ cost = params->unknown_MC;
+ } else {
+ cost = params->get_MC(tile, dir, tile1, params);
+ }
+ if (cost == PF_IMPOSSIBLE_MC) {
+ continue;
+ }
+
+ moves_left = loc_moves_left - cost;
+ if (moves_left < node1->moves_left_req) {
+ /* We don't have enough moves left */
+ continue;
+ }
+
+ if (node1->is_enemy_tile
+ && !pf_fuel_map_attack_is_possible(params, loc_moves_left,
+ node->moves_left_req)) {
+ /* We wouldn't have enough moves left after attacking */
+ continue;
+ }
+
+ /* Total cost at xy1 */
+ cost += loc_cost;
+
+ /* Evaluate the extra cost of the destination, if it's relevant */
+ if (params->get_EC) {
+ extra = node1->extra_tile + node->extra_cost;
+ }
+
+ /*
+ * Update costs and add to queue, if this is a better route to xy1.
+ *
+ * case safe tiles or reached directly without waiting...
+ */
+ pos = node1->fuel_segment;
+ cost_of_path = get_total_CC(params, cost, extra);
+ if (node1->status == NS_INIT) {
+ /* Not calculated yet */
+ old_cost_of_path = 0;
+ } else if (pos) {
+ /*
+ * We have a path to this tile. The default values could have been
+ * overwritten if we had more moves left to deal with waiting. Then,
+ * we have to get back the value of this node to calculate the cost.
+ */
+ old_cost_of_path = get_total_CC(params, pos->cost, pos->extra_cost);
+ } else {
+ /* Default cost */
+ old_cost_of_path = get_total_CC(params, node1->cost,
+ node1->extra_cost);
+ }
+
+ /* We would prefer to be the nearest possible of a refuel point,
+ * especially in the attack case. */
+ if (cost_of_path == old_cost_of_path) {
+ prev_tile = mapstep(tile1, DIR_REVERSE(pos ? pos->dir
+ : node1->dir_to_here));
+ mlr = pffm->lattice[prev_tile->index].moves_left_req;
+ } else {
+ prev_tile = NULL;
+ }
+
+ if (node1->status == NS_INIT || cost_of_path < old_cost_of_path
+ || (prev_tile && mlr > node->moves_left_req)) {
+ node1->extra_cost = extra;
+ node1->cost = cost;
+ node1->moves_left = moves_left;
+ node1->dir_to_here = dir;
+ /* Always record the segment, including when it is not dangerous. */
+ pf_fuel_map_create_segment(pffm, tile1, node1);
+ if (node->status == NS_WAITING) {
+ /* It is the first part of a fuel segment */
+ node1->waited = TRUE;
+ }
+ node1->status = NS_NEW;
+ if (node1->moves_left_req == 0) {
+ pq_insert(pffm->queue, index1, -cost_of_path);
+ } else {
+ /* Extra costs of all nodes in out_of_fuel_queue are equal! */
+ pq_insert(pffm->out_of_fuel_queue, index1, -cost);
+ }
+ continue;
+ }
+
+ if (node1->moves_left_req == 0) {
+ /* Waiting to cross over a refuel is senseless. */
+ continue;
+ }
+
+ if (pos) {
+ /*
+ * We had a path to this tile. Here, we have to use back the
+ * default values because we could have more moves left if we
+ * waited somewhere.
+ */
+ old_cost_of_path = get_total_CC(params, node1->cost,
+ node1->extra_cost);
+ }
+
+ if (moves_left > node1->moves_left
+ || cost_of_path < old_cost_of_path) {
+ /* The procedure is slightly different for out of fuel nodes */
+ /* We will update costs if:
+ * 1: we are here for the first time
+ * 2: we can possibly go further across dangerous area or
+ * 3: we can have lower extra and will not overwrite anything
+ * useful */
+ node1->extra_cost = extra;
+ node1->cost = cost;
+ node1->moves_left = moves_left;
+ node1->dir_to_here = dir;
+ node1->status = NS_NEW;
+ node1->waited = (node->status == NS_WAITING);
+ /* Extra costs of all nodes in out_of_fuel_queue are equal! */
+ pq_insert(pffm->out_of_fuel_queue, index1, -cost);
+ }
+ } adjc_dir_iterate_end;
+ }
+
+ if (node->moves_left_req == 0
+ && !node->is_enemy_tile
+ && node->status != NS_WAITING
+ && node->moves_left < get_move_rate(params)) {
+ int fc, cc;
+ /* Consider waiting at this node.
+ * To do it, put it back into queue. */
+ node->status = NS_WAITING;
+ fc = pf_fuel_map_fill_cost_for_full_moves(params, node->cost,
+ node->moves_left);
+ cc = get_total_CC(params, fc, node->extra_cost);
+ pq_insert(pffm->queue, index, -cc);
+ } else {
+ node->status = NS_PROCESSED;
+ }
+
+ /* Get the next nearest node */
+
+ /* First try to get it from out_of_fuel_queue */
+ if (!pq_remove(pffm->out_of_fuel_queue, &index)) {
+ /* No dangerous nodes to process, go for a safe one */
+ do {
+ if (!pq_remove(pffm->queue, &index)) {
+ return FALSE;
+ }
+ } while (pffm->lattice[index].status == NS_PROCESSED);
+ }
+
+ tile = index_to_tile(index);
+ pfm->tile = tile;
+ node = &pffm->lattice[index];
+
+ assert(node->status > NS_INIT);
+
+ if (node->status == NS_WAITING) {
+ /* We've already returned this node once, skip it */
+ freelog(LOG_DEBUG, "Considering waiting at (%d, %d)", TILE_XY(tile));
+ return pf_next(pfm);
+ } else if (!node->fuel_segment) {
+ /* We don't return dangerous tiles */
+ freelog(LOG_DEBUG, "Reached dangerous tile (%d, %d)", TILE_XY(tile));
+ return pf_next(pfm);
+ } else {
+ /* Just return it */
+ return TRUE;
+ }
+}
+
/************************************************************************
- Danger version of pf_get_path.
+ Get the path to ptile, put it in "path". If ptile has not been reached
+ yet, iterate the map until we reach it or run out of map.
************************************************************************/
-static struct pf_path *danger_get_path(struct pf_map *pf_map,
- struct tile *ptile)
+static struct pf_path *pf_fuel_map_get_path(struct pf_map *pfm,
+ struct tile *ptile)
{
- mapindex_t index = ptile->index;
- utiny_t status = pf_map->status[index];
- struct danger_node *d_node = &pf_map->d_lattice[index];
-
- if (d_node->is_dangerous) {
- /* "Best" path to a dangerous tile is undefined */
- /* TODO: return the "safest" path */
+ struct pf_fuel_map *pffm = PF_FUEL_MAP(pfm);
+ struct pf_fuel_node *node = &pffm->lattice[ptile->index];
+ const struct pf_parameter *params = pf_get_parameter(pfm);
+
+ if (node->status != NS_UNINIT
+ && node->moves_left_req == PF_IMPOSSIBLE_MC
+ && !same_pos(ptile, pfm->params.start_tile)) {
+ /* Cannot reach it in any case. */
return NULL;
}
- if (status == NS_PROCESSED || status == NS_WAITING
- || same_pos(ptile, pf_map->tile)) {
- /* We already reached (x,y) */
- return danger_construct_path(pf_map, ptile);
+ if (node->status == NS_PROCESSED || node->status == NS_WAITING
+ || same_pos(ptile, pfm->tile)) {
+ /* We already reached this tile */
+ if (node->fuel_segment || same_pos(ptile, params->start_tile)) {
+ /* We found a path */
+ return pf_fuel_map_construct_path(pffm, ptile);
+ } else {
+ /* No way to get there! */
+ return NULL;
+ }
}
- while (pf_next(pf_map)) {
- if (same_pos(ptile, pf_map->tile)) {
+ while (pf_next(pfm)) {
+ if (same_pos(ptile, pfm->tile)) {
/* That's the one */
- return danger_construct_path(pf_map, ptile);
+ return pf_fuel_map_construct_path(pffm, ptile);
}
}
return NULL;
}
+/*******************************************************************
+ Get info about position at ptile and put it in pos. If ptile
+ has not been reached yet, iterate the map until we reach it.
+ Should _always_ check the return value, forthe position might be
+ unreachable.
+*******************************************************************/
+static bool pf_fuel_map_get_position(struct pf_map *pfm,
+ struct tile *ptile,
+ struct pf_position *pos)
+{
+ struct pf_fuel_map *pffm = PF_FUEL_MAP(pfm);
+
+ if (pffm->lattice[ptile->index].status == NS_PROCESSED
+ || same_pos(ptile, pfm->tile)) {
+ /* We already reached this tile */
+ pf_fuel_map_fill_position(pffm, ptile, pos);
+ return TRUE;
+ }
+
+ while (pf_next(pfm)) {
+ if (same_pos(ptile, pfm->tile)) {
+ /* That's the one */
+ pf_fuel_map_fill_position(pffm, ptile, pos);
+ return TRUE;
+ }
+ }
+
+ return FALSE;
+}
+
+/*********************************************************************
+ After usage the map must be destroyed.
+*********************************************************************/
+static void pf_fuel_map_destroy(struct pf_map *pfm)
+{
+ struct pf_fuel_map *pffm = PF_FUEL_MAP(pfm);
+ struct pf_fuel_node *node;
+ mapindex_t i;
+
+ /* Need to clean up the dangling fuel segments */
+ for (i = 0, node = pffm->lattice; i < MAP_INDEX_SIZE; i++, node++) {
+ if (node->fuel_segment) {
+ free(node->fuel_segment);
+ }
+ }
+ free(pffm->lattice);
+ pq_destroy(pffm->queue);
+ pq_destroy(pffm->out_of_fuel_queue);
+ free(pffm);
+}
+
+/******************************************************************
+ Create a pf_fuel_map. NB: The "constructor" returns a pf_map.
+******************************************************************/
+static struct pf_map *pf_fuel_map_create(const struct pf_parameter *parameter)
+{
+ struct pf_fuel_map *pffm;
+ struct pf_map *base_map;
+ struct pf_parameter *params;
+ struct pf_fuel_node *node;
+
+ pffm = fc_calloc(1, sizeof(*pffm));
+ base_map = &pffm->base_map;
+ params = &base_map->params;
+#ifdef PF_DEBUG
+ /* Set the mode, used for cast check */
+ base_map->mode = PF_FUEL;
+#endif /* PF_DEBUG */
+
+ /* Alloc the map */
+ pffm->lattice = fc_calloc(MAP_INDEX_SIZE, sizeof(struct pf_fuel_node));
+ pffm->queue = pq_create(INITIAL_QUEUE_SIZE);
+ pffm->out_of_fuel_queue = pq_create(INITIAL_QUEUE_SIZE);
+
+ /* MC callback must be set */
+ assert(parameter->get_MC != NULL);
+
+ /* get_moves_left_req callback must be set */
+ assert(parameter->get_moves_left_req != NULL);
+
+ /* Copy parameters */
+ *params = *parameter;
+
+ /* Initialize virtual function table. */
+ base_map->destroy = pf_fuel_map_destroy;
+ base_map->get_path = pf_fuel_map_get_path;
+ base_map->get_position = pf_fuel_map_get_position;
+ base_map->iterate = pf_fuel_map_iterate;
+
+ /* Initialise starting coordinates */
+ base_map->tile = params->start_tile;
+
+ /* Initialise starting node */
+ node = &pffm->lattice[params->start_tile->index];
+ pf_fuel_node_init(pffm, node, params->start_tile);
+ /* This makes calculations of turn/moves_left more convenient, but we
+ * need to subtract this value before we return cost to the user. Note
+ * that cost may be negative if moves_left_initially > move_rate
+ * (see get_turn()). */
+ node->moves_left = get_moves_left_initially(params);
+ node->cost = get_move_rate(params) - node->moves_left;
+ node->extra_cost = 0;
+ node->dir_to_here = -1;
+
+ return PF_MAP(pffm);
+}
+
+
+
+/* ====================== pf_map public functions ======================= */
+
+/***************************************************************************
+ Factory function to create a new map according to the parameter.
+ Does not do any iterations.
+***************************************************************************/
+struct pf_map *pf_create_map(const struct pf_parameter *parameter)
+{
+ if (parameter->is_pos_dangerous) {
+ if (parameter->get_moves_left_req) {
+ freelog(LOG_ERROR, "path finding code cannot deal with dangers "
+ "and fuel together.");
+ }
+ if (parameter->get_costs) {
+ freelog(LOG_ERROR, "jumbo callbacks for danger maps are not yet "
+ "implemented.");
+ }
+ return pf_danger_map_create(parameter);
+ } else if (parameter->get_moves_left_req) {
+ if (parameter->get_costs) {
+ freelog(LOG_ERROR, "jumbo callbacks for fuel maps are not yet "
+ "implemented.");
+ }
+ return pf_fuel_map_create(parameter);
+ }
+
+ return pf_normal_map_create(parameter);
+}
+
+/*********************************************************************
+ After usage the map must be destroyed.
+*********************************************************************/
+void pf_destroy_map(struct pf_map *pfm)
+{
+ pfm->destroy(pfm);
+}
+
+/************************************************************************
+ Get the path to ptile, put it in "path". If ptile has not been reached
+ yet, iterate the map until we reach it or run out of map.
+************************************************************************/
+struct pf_path *pf_get_path(struct pf_map *pfm, struct tile *ptile)
+{
+ return pfm->get_path(pfm, ptile);
+}
+
+/*******************************************************************
+ Get info about position at ptile and put it in pos. If ptile
+ has not been reached yet, iterate the map until we reach it.
+ Should _always_ check the return value, forthe position might be
+ unreachable.
+*******************************************************************/
+bool pf_get_position(struct pf_map *pfm, struct tile *ptile,
+ struct pf_position *pos)
+{
+ return pfm->get_position(pfm, ptile, pos);
+}
+
+/*****************************************************************
+ Primary method for iterative path-finding.
+ Plan: 1. Process previous position.
+ 2. Get new nearest position and return it.
+*****************************************************************/
+bool pf_next(struct pf_map *pfm)
+{
+ if (get_move_rate(pf_get_parameter(pfm)) <= 0) {
+ /* This unit cannot move by itself. */
+ return FALSE;
+ } else {
+ return pfm->iterate(pfm);
+ }
+}
+
+/*******************************************************************
+ Read all info about the current position into pos.
+*******************************************************************/
+void pf_next_get_position(struct pf_map *pfm, struct pf_position *pos)
+{
+ pfm->get_position(pfm, pfm->tile, pos);
+}
+
+/************************************************************************
+ Get the path to our current position.
+************************************************************************/
+struct pf_path *pf_next_get_path(struct pf_map *pfm)
+{
+ return pfm->get_path(pfm, pfm->tile);
+}
+
/************************************************************************
Return current pf_parameter for given pf_map.
************************************************************************/
-struct pf_parameter *pf_get_parameter(struct pf_map *map)
+const struct pf_parameter *pf_get_parameter(const struct pf_map *pfm)
+{
+ return &pfm->params;
+}
+
+
+/* ===================== pf_path public functions ====================== */
+
+/************************************************************************
+ Printing a path.
+************************************************************************/
+void pf_print_path(int log_level, const struct pf_path *path)
{
- return map->params;
+ struct pf_position *pos;
+ int i;
+
+ if (path) {
+ freelog(log_level, "PF: path (at %p) consists of %d positions:",
+ (void *)path, path->length);
+ } else {
+ freelog(log_level, "PF: path is NULL");
+ return;
+ }
+
+ for (i = 0, pos = path->positions; i < path->length; i++, pos++) {
+ freelog(log_level,
+ "PF: %2d/%2d: (%2d,%2d) dir=%-2s cost=%2d (%2d, %d) EC=%d",
+ i + 1, path->length, TILE_XY(pos->tile),
+ dir_get_name(pos->dir_to_next_pos), pos->total_MC,
+ pos->turn, pos->moves_left, pos->total_EC);
+ }
+}
+
+/************************************************************************
+ After use, a path must be destroyed.
+************************************************************************/
+void pf_destroy_path(struct pf_path *path)
+{
+ if (path) {
+ free(path->positions);
+ free(path);
+ }
+}
+
+/******************************************************************
+ Get the last position of "path".
+******************************************************************/
+const struct pf_position *pf_last_position(const struct pf_path *path)
+{
+ return &path->positions[path->length - 1];
}
diff --git a/common/aicore/path_finding.h b/common/aicore/path_finding.h
index ca21de9..f82cd71 100644
--- a/common/aicore/path_finding.h
+++ b/common/aicore/path_finding.h
@@ -309,7 +309,8 @@ struct pf_path {
* All callbacks get the parameter passed to pf_create_map as the last
* argument.
*
- * Examples of callbacks can be found in pf_tools.c*/
+ * Examples of callbacks can be found in pf_tools.c
+ * NB: It should be safe to struct copy pf_parameter. */
struct pf_parameter {
struct tile *start_tile; /* Initial position */
@@ -332,21 +333,27 @@ struct pf_parameter {
* dir. Excessive information (to_x, to_y) is provided to ease the
* implementation of the callback. */
int (*get_MC) (const struct tile *from_tile, enum direction8 dir,
- const struct tile *to_tile, struct pf_parameter * param);
+ const struct tile *to_tile,
+ const struct pf_parameter *param);
int unknown_MC; /* Move cost into unknown - very large by default */
/* Callback which determines the behavior of a tile. If NULL
* TB_NORMAL is assumed. It can be assumed that the implementation
* of path_finding.h will cache this value. */
enum tile_behavior (*get_TB) (const struct tile *ptile,
- enum known_type known,
- struct pf_parameter * param);
+ enum known_type known,
+ const struct pf_parameter *param);
/* Callback which can be used to provide extra costs depending on
* the tile. Can be NULL. It can be assumed that the implementation
* of path_finding.h will cache this value. */
int (*get_EC) (const struct tile *ptile, enum known_type known,
- struct pf_parameter * param);
+ const struct pf_parameter *param);
+
+ /* Callback to determines if we could invade the tile. Returns TRUE
+ * if we can enter in the territory of the tile owner. */
+ bool (*can_invade_tile) (const struct player *pplayer,
+ const struct tile *ptile);
/* Although the rules governing ZoC are universal, the amount of
* information available at server and client is different. To
@@ -361,7 +368,12 @@ struct pf_parameter {
* dangerous. The unit will never end a turn at a dangerous
* position. Can be NULL. */
bool (*is_pos_dangerous) (const struct tile *ptile, enum known_type,
- struct pf_parameter * param);
+ const struct pf_parameter *param);
+
+ /* If this callback is non-NULL and returns the required moves left to
+ * move to this tile and to leave the position safely. Can be NULL. */
+ int (*get_moves_left_req) (const struct tile *ptile, enum known_type,
+ const struct pf_parameter *param);
/* This is a jumbo callback which overrides all previous ones. It takes
* care of everything (ZOC, known, costs etc).
@@ -383,11 +395,11 @@ struct pf_parameter {
* the cost-of-the-path which is the overall measure of goodness of the
* path (less is better) and used to order newly discovered locations. */
int (*get_costs) (const struct tile *from_tile,
- enum direction8 dir,
- const struct tile *to_tile,
- int from_cost, int from_extra,
- int *to_cost, int *to_extra,
- struct pf_parameter *param);
+ enum direction8 dir,
+ const struct tile *to_tile,
+ int from_cost, int from_extra,
+ int *to_cost, int *to_extra,
+ const struct pf_parameter *param);
/* User provided data. Can be used to attach arbitrary information
* to the map. */
@@ -397,60 +409,58 @@ struct pf_parameter {
/* The map itself. Opaque type. */
struct pf_map;
-/* ==================== Map/Path Functions ========================== */
+/* ======================== Public Interface =========================== */
/* Returns a map which can be used to query for paths or to iterate
* over all paths. Does not perform any computations itself, just sets
* everything up. */
struct pf_map *pf_create_map(const struct pf_parameter *const parameter);
-/* Tries to find the best path in the given map to the position (x, y).
+/* After usage the map should be destroyed. */
+void pf_destroy_map(struct pf_map *pfm);
+
+/* Tries to find the best path in the given map to the position ptile.
* If NULL is returned no path could be found. The pf_last_position of such
* path would be the same (almost) as the result of the call to
- * pf_get_position(pf_map, x, y, &pos) */
-struct pf_path *pf_get_path(struct pf_map *pf_map, struct tile *ptile);
+ * pf_get_position(pf_map, ptile, &pos) */
+struct pf_path *pf_get_path(struct pf_map *pfm, struct tile *ptile);
-/* Iterates the map until it reaches (x, y). Then fills the info
+/* Iterates the map until it reaches ptile. Then fills the info
* about it into pos. Returns FALSE if position is unreachable.
* Contents of pos in this case is not defined. */
-bool pf_get_position(struct pf_map *pf_map, struct tile *ptile,
- struct pf_position *pos);
+bool pf_get_position(struct pf_map *pfm, struct tile *ptile,
+ struct pf_position *pos);
/* Iterates the path-finding algorithm one step further, to the next
* nearest position. This full info on this position and the best path to
* it can be obtained using pf_next_get_position and pf_next_get_path,
* correspondingly. Returns FALSE if no further positions are available in
- * this map. If pf_get_path/position(pf_map, x, y, .) has been called
- * before the call to pf_next, the iteration will resume from (x, y) */
-bool pf_next(struct pf_map *pf_map);
+ * this map. If pf_get_path/position(pf_map, ptile, .) has been called
+ * before the call to pf_next, the iteration will resume from ptile */
+bool pf_next(struct pf_map *pfm);
/* Return the full info on the position reached in the last call to
* pf_next. */
-void pf_next_get_position(const struct pf_map *pf_map,
- struct pf_position *pos);
+void pf_next_get_position(struct pf_map *pfm, struct pf_position *pos);
/* Return the path to the position reached in the last call to pf_next. */
-struct pf_path * pf_next_get_path(const struct pf_map *pf_map);
+struct pf_path *pf_next_get_path(struct pf_map *pfm);
+
+/* Return the current parameters for the given map. */
+const struct pf_parameter *pf_get_parameter(const struct pf_map *pfm);
+
-/* Print the path via freelog and the given log-level. For debugging
- * purposes. Make sure the path is valid (if you got it from pf_get_path). */
+
+/* Print the path via freelog and the given log-level. For
+ * debugging purposes. Make sure the path is valid (if you
+ * got it from pf_get_path). */
void pf_print_path(int log_level, const struct pf_path *path);
/* After use, a path must be destroyed. pf_destroy_path will also
* accept NULL (which is returned by pf_get_path in error case). */
void pf_destroy_path(struct pf_path *path);
-/* After usage the map should be destroyed. */
-void pf_destroy_map(struct pf_map *pf_map);
-
/* Returns the last position of the given path. */
-struct pf_position *pf_last_position(struct pf_path *path);
-
-/* Return the current parameters for the given map. */
-struct pf_parameter *pf_get_parameter(struct pf_map *map);
-
-/* ==================== Parameter Functions ========================= */
-
-int get_moves_left_initially(const struct pf_parameter *param);
+const struct pf_position *pf_last_position(const struct pf_path *path);
#endif
diff --git a/common/aicore/pf_tools.c b/common/aicore/pf_tools.c
index 17a095c..51609ba 100644
--- a/common/aicore/pf_tools.c
+++ b/common/aicore/pf_tools.c
@@ -23,6 +23,7 @@
#include "game.h"
#include "movement.h"
+#include "tile.h"
#include "pf_tools.h"
@@ -38,7 +39,7 @@ static void pft_fill_unit_default_parameter(struct pf_parameter *parameter,
prohibits going through an enemy city/tile.
*************************************************************/
static int seamove(const struct tile *ptile, enum direction8 dir,
- const struct tile *ptile1, struct pf_parameter *param)
+ const struct tile *ptile1, const struct pf_parameter *param)
{
if (is_ocean(ptile1->terrain) || ptile1->city
|| is_non_allied_unit_tile(ptile1, param->owner)) {
@@ -53,18 +54,17 @@ static int seamove(const struct tile *ptile, enum direction8 dir,
*************************************************************/
static int single_airmove(const struct tile *ptile, enum direction8 dir,
const struct tile *ptile1,
- struct pf_parameter *param)
+ const struct pf_parameter *param)
{
return SINGLE_MOVE; /* simple, eh? */
}
-/*************************************************************
- A cost function for SEA_MOVING. Does not allow shore
- bombardment.
-*************************************************************/
+/**************************************************************************
+ A cost function for SEA_MOVING. Does not allow shore bombardment.
+***************************************************************************/
static int seamove_no_bombard(const struct tile *ptile, enum direction8 dir,
- const struct tile *ptile1,
- struct pf_parameter *param)
+ const struct tile *ptile1,
+ const struct pf_parameter *param)
{
/* MOVE_COST_FOR_VALID_SEA_STEP means ships can move between */
if (map_move_cost_ai(ptile, ptile1) == MOVE_COST_FOR_VALID_SEA_STEP
@@ -75,16 +75,15 @@ static int seamove_no_bombard(const struct tile *ptile, enum direction8 dir,
}
}
-/************************************************************
- A cost function for a sea unit which allows going one step
- into the land (for shore bombardment and ferries).
- Things to remember: we should prevent going from land to
- anywhere, unless we are leaving a friendly city, in which
- case we can move into the ocean but not into the land.
-************************************************************/
+/***************************************************************************
+ A cost function for a sea unit which allows going one step into the land
+ (for shore bombardment and ferries). Things to remember: we should prevent
+ going from land to anywhere, unless we are leaving a friendly city, in
+ which case we can move into the ocean but not into the land.
+***************************************************************************/
static int sea_overlap_move(const struct tile *ptile, enum direction8 dir,
- const struct tile *ptile1,
- struct pf_parameter *param)
+ const struct tile *ptile1,
+ const struct pf_parameter *param)
{
if (is_ocean(ptile->terrain)) {
return SINGLE_MOVE;
@@ -96,13 +95,13 @@ static int sea_overlap_move(const struct tile *ptile, enum direction8 dir,
return PF_IMPOSSIBLE_MC;
}
-/**********************************************************************
- Sea attack is the same as overlap (consider bombardment) but we don't
- want to pass through enemy tiles.
-**********************************************************************/
+/***************************************************************************
+ Sea attack is the same as overlap (consider bombardment) but we don't want
+ to pass through enemy tiles.
+***************************************************************************/
static int sea_attack_move(const struct tile *src_tile, enum direction8 dir,
- const struct tile *dest_tile,
- struct pf_parameter *param)
+ const struct tile *dest_tile,
+ const struct pf_parameter *param)
{
if (is_ocean(src_tile->terrain)) {
if (is_non_allied_unit_tile(src_tile, param->owner)) {
@@ -117,12 +116,12 @@ static int sea_attack_move(const struct tile *src_tile, enum direction8 dir,
return PF_IMPOSSIBLE_MC;
}
-/************************************************************
+/***************************************************************************
LAND_MOVE cost function for a unit
-************************************************************/
+***************************************************************************/
static int normal_move_unit(const struct tile *ptile, enum direction8 dir,
- const struct tile *ptile1,
- struct pf_parameter *param)
+ const struct tile *ptile1,
+ const struct pf_parameter *param)
{
struct terrain *terrain1 = ptile1->terrain;
int move_cost;
@@ -154,7 +153,7 @@ static int normal_move_unit(const struct tile *ptile, enum direction8 dir,
*******************************************************************/
static int land_attack_move(const struct tile *src_tile, enum direction8 dir,
const struct tile *tgt_tile,
- struct pf_parameter *param)
+ const struct pf_parameter *param)
{
int move_cost;
@@ -214,9 +213,10 @@ static int land_attack_move(const struct tile *src_tile, enum direction8 dir,
}
which will achieve the same without call-back.
************************************************************/
-static int land_overlap_move(const struct tile *ptile, enum direction8 dir,
- const struct tile *ptile1,
- struct pf_parameter *param)
+static int land_overlap_move(const struct tile *ptile,
+ enum direction8 dir,
+ const struct tile *ptile1,
+ const struct pf_parameter *param)
{
struct terrain *terrain1 = ptile1->terrain;
int move_cost;
@@ -239,7 +239,7 @@ static int land_overlap_move(const struct tile *ptile, enum direction8 dir,
#ifdef UNUSED
static int reverse_move_unit(const struct tile *tile0, enum direction8 dir,
const struct tile *ptile,
- struct pf_parameter *param)
+ const struct pf_parameter *param)
{
struct terrain *terrain0 = tile0->terrain;
struct terrain *terrain1 = ptile->terrain;
@@ -269,7 +269,7 @@ static int reverse_move_unit(const struct tile *tile0, enum direction8 dir,
************************************************************/
static int igter_move_unit(const struct tile *ptile, enum direction8 dir,
const struct tile *ptile1,
- struct pf_parameter *param)
+ const struct pf_parameter *param)
{
int move_cost;
@@ -302,7 +302,7 @@ static int igter_move_unit(const struct tile *ptile, enum direction8 dir,
static int reverse_igter_move_unit(const struct tile *tile0,
enum direction8 dir,
const struct tile *ptile,
- struct pf_parameter *param)
+ const struct pf_parameter *param)
{
int move_cost;
@@ -329,8 +329,8 @@ static int reverse_igter_move_unit(const struct tile *tile0,
A cost function for amphibious movement.
****************************************************************************/
static int amphibious_move(const struct tile *ptile, enum direction8 dir,
- const struct tile *ptile1,
- struct pf_parameter *param)
+ const struct tile *ptile1,
+ const struct pf_parameter *param)
{
const bool ocean = is_ocean(ptile->terrain);
const bool ocean1 = is_ocean(ptile1->terrain);
@@ -376,8 +376,8 @@ static int amphibious_move(const struct tile *ptile, enum direction8 dir,
*********************************************************************/
#ifdef UNUSED
static int afraid_of_dark_forest(const struct tile *ptile,
- enum known_type known,
- struct pf_parameter *param)
+ enum known_type known,
+ const struct pf_parameter *param)
{
if (ptile->terrain->index == T_FOREST) {
/* Willing to spend extra 2 turns to go around a forest tile */
@@ -392,8 +392,8 @@ static int afraid_of_dark_forest(const struct tile *ptile,
Extra cost call back for amphibious movement
****************************************************************************/
static int amphibious_extra_cost(const struct tile *ptile,
- enum known_type known,
- struct pf_parameter *param)
+ enum known_type known,
+ const struct pf_parameter *param)
{
struct pft_amphibious *amphibious = param->data;
const bool ocean = is_ocean(ptile->terrain);
@@ -430,8 +430,8 @@ static int amphibious_extra_cost(const struct tile *ptile,
that we don't continue walking over ocean.
*********************************************************************/
static enum tile_behavior dont_cross_ocean(const struct tile *ptile,
- enum known_type known,
- struct pf_parameter *param)
+ enum known_type known,
+ const struct pf_parameter *param)
{
if (is_ocean(ptile->terrain)) {
return TB_DONT_LEAVE;
@@ -445,7 +445,7 @@ static enum tile_behavior dont_cross_ocean(const struct tile *ptile,
***********************************************************************/
enum tile_behavior no_fights_or_unknown(const struct tile *ptile,
enum known_type known,
- struct pf_parameter *param)
+ const struct pf_parameter *param)
{
if (known == TILE_UNKNOWN
|| is_non_allied_unit_tile(ptile, param->owner)
@@ -459,8 +459,9 @@ enum tile_behavior no_fights_or_unknown(const struct tile *ptile,
/**********************************************************************
PF callback to prohibit attacking anyone.
***********************************************************************/
-enum tile_behavior no_fights(const struct tile *ptile, enum known_type known,
- struct pf_parameter *param)
+enum tile_behavior no_fights(const struct tile *ptile,
+ enum known_type known,
+ const struct pf_parameter *param)
{
if (is_non_allied_unit_tile(ptile, param->owner)
|| is_non_allied_city_tile(ptile, param->owner)) {
@@ -474,8 +475,8 @@ enum tile_behavior no_fights(const struct tile *ptile, enum known_type known,
PF callback to prohibit attacking anyone, except at the destination.
****************************************************************************/
enum tile_behavior no_intermediate_fights(const struct tile *ptile,
- enum known_type known,
- struct pf_parameter *param)
+ enum known_type known,
+ const struct pf_parameter *param)
{
if (is_non_allied_unit_tile(ptile, param->owner)
|| is_non_allied_city_tile(ptile, param->owner)) {
@@ -487,9 +488,9 @@ enum tile_behavior no_intermediate_fights(const struct tile *ptile,
/*********************************************************************
A callback for amphibious movement
*********************************************************************/
-static enum tile_behavior amphibious_behaviour(const struct tile *ptile,
- enum known_type known,
- struct pf_parameter *param)
+static enum tile_behavior
+amphibious_behaviour(const struct tile *ptile, enum known_type known,
+ const struct pf_parameter *param)
{
struct pft_amphibious *amphibious = param->data;
const bool ocean = is_ocean(ptile->terrain);
@@ -503,7 +504,7 @@ static enum tile_behavior amphibious_behaviour(const struct tile *ptile,
return TB_NORMAL;
}
-/* ===================== Postion Dangerous Callbacks ================ */
+/* ===================== Postion Fuel Callbacks ================ */
/**********************************************************************
An example of position-dangerous callback. For triremes.
@@ -513,7 +514,7 @@ static enum tile_behavior amphibious_behaviour(const struct tile *ptile,
***********************************************************************/
static bool trireme_is_pos_dangerous(const struct tile *ptile,
enum known_type known,
- struct pf_parameter *param)
+ const struct pf_parameter *param)
{
/* Assume that unknown tiles are unsafe. */
if (known == TILE_UNKNOWN) {
@@ -534,61 +535,85 @@ static bool trireme_is_pos_dangerous(const struct tile *ptile,
Refueling base for air units.
****************************************************************************/
static bool is_possible_base_fuel(const struct tile *ptile,
- struct pf_parameter *param)
+ const struct pf_parameter *param)
{
- /* All airbases are considered possible, simply attack enemies. */
- return (is_allied_city_tile(ptile, param->owner)
- || tile_has_special(ptile, S_AIRBASE));
-}
+ enum known_type tile_known;
+ tile_known = (param->omniscience ? TILE_KNOWN
+ : tile_get_known(ptile, param->owner));
-/****************************************************************************
- Position-dangerous callback for air units.
-****************************************************************************/
-static bool is_pos_dangerous_fuel(const struct tile *ptile,
- enum known_type known,
- struct pf_parameter *param)
-{
- int moves = SINGLE_MOVE * real_map_distance(param->start_tile, ptile);
- int have = get_moves_left_initially(param);
- int left = have - moves;
-
- if (left < 0) {
- /* not enough fuel. */
+ /* Check airbase or allied city. */
+ if (is_allied_city_tile(ptile, param->owner)
+ || tile_has_special(ptile, S_AIRBASE)) {
return TRUE;
}
- if (have >= moves * 2
- && (is_possible_base_fuel(param->start_tile, param)
- || !param->owner->ai.control)) {
- /* has enough fuel for round trip. */
+ if (tile_known == TILE_UNKNOWN) {
+ /* Cannot guess if it is */
return FALSE;
}
- if (TILE_UNKNOWN != known
- && (is_possible_base_fuel(ptile, param)
- || is_enemy_city_tile(ptile, param->owner))) {
- /* allow attacks, even suicidal ones */
- return FALSE;
- }
+ /* Check for carriers */
+ unit_list_iterate(ptile->units, carrier) {
+ if ((unit_has_type_flag(carrier, F_CARRIER)
+ || (BV_ISSET(param->unit_flags, F_MISSILE)
+ && unit_has_type_flag(carrier, F_MISSILE_CARRIER)))
+ && get_transporter_capacity(carrier) >
+ get_transporter_occupancy(carrier)) {
+ return TRUE;
+ }
+ } unit_list_iterate_end;
- if (TILE_KNOWN == known
- && is_enemy_unit_tile(ptile, param->owner)) {
- /* don't reveal unknown units */
- return FALSE;
- }
+ return FALSE;
+}
- /* similar to find_nearest_airbase() */
- iterate_outward(ptile, left / SINGLE_MOVE, atile) {
- if (TILE_UNKNOWN != tile_get_known(atile, param->owner)
- && is_possible_base_fuel(atile, param)) {
- return FALSE;
+/****************************************************************************
+ Check if there is a safe position to move.
+****************************************************************************/
+static int get_closest_safe_tile_distance(const struct tile *src_tile,
+ const struct pf_parameter *param,
+ int max_distance)
+{
+ /* This iteration should, according to the documentation in map.h iterate
+ * tiles from the center tile, so we stop the iteration to the first found
+ * refuel point (as it should be the closest). */
+ iterate_outward_dxy(src_tile, max_distance, ptile, x, y) {
+ if (tile_get_known(ptile, param->owner) == TILE_UNKNOWN) {
+ /* Cannot guess if the tile is safe */
+ continue;
}
- } iterate_outward_end;
-
- /* Carriers are ignored since they are likely to move. */
- return TRUE;
+ if (is_possible_base_fuel(ptile, param)) {
+ return map_vector_to_real_distance(x, y);
+ }
+ } iterate_outward_dxy_end;
+
+ return -1;
+}
+
+/****************************************************************************
+ Position-dangerous callback for air units.
+****************************************************************************/
+static int get_fuel_moves_left_req(const struct tile *ptile,
+ enum known_type known,
+ const struct pf_parameter *param)
+{
+ int dist, max, mli;
+
+ if (is_possible_base_fuel(ptile, param)) {
+ return 0;
+ }
+
+ mli = param->moves_left_initially;
+ max = MAX(mli + ((mli - 1) * param->move_rate),
+ param->move_rate * param->fuel);
+ /* Sometimes, unit can have bigger moves left than its own move rate,
+ * due to wonder transfer. See comment for get_turn() in path_finding.c. */
+ dist = get_closest_safe_tile_distance(ptile, param, max / SINGLE_MOVE);
+
+ return dist != -1 ? dist * SINGLE_MOVE : PF_IMPOSSIBLE_MC;
}
+/* ===================== Postion Dangerous Callbacks ================ */
+
/**********************************************************************
Position-dangerous callback for sea units other than triremes.
Allow one move onto land (for use for ferries and land
@@ -596,7 +621,7 @@ static bool is_pos_dangerous_fuel(const struct tile *ptile,
***********************************************************************/
static bool is_overlap_pos_dangerous(const struct tile *ptile,
enum known_type known,
- struct pf_parameter *param)
+ const struct pf_parameter *param)
{
/* Unsafe tiles without cities are dangerous. */
/* Pretend all land tiles are safe. */
@@ -609,7 +634,7 @@ static bool is_overlap_pos_dangerous(const struct tile *ptile,
Position-dangerous callback for typical units.
***********************************************************************/
static bool is_pos_dangerous(const struct tile *ptile, enum known_type known,
- struct pf_parameter *param)
+ const struct pf_parameter *param)
{
/* Unsafe tiles without cities are dangerous. */
return (ptile->terrain != T_UNKNOWN
@@ -622,7 +647,7 @@ static bool is_pos_dangerous(const struct tile *ptile, enum known_type known,
****************************************************************************/
static bool amphibious_is_pos_dangerous(const struct tile *ptile,
enum known_type known,
- struct pf_parameter *param)
+ const struct pf_parameter *param)
{
struct pft_amphibious *amphibious = param->data;
const bool ocean = is_ocean(ptile->terrain);
@@ -663,12 +688,6 @@ void pft_fill_unit_parameter(struct pf_parameter *parameter,
break;
case AIR_MOVING:
parameter->get_MC = single_airmove;
- if (unit_type(punit)->fuel > 0) {
- parameter->is_pos_dangerous = is_pos_dangerous_fuel;
- } else {
- parameter->is_pos_dangerous = NULL;
- }
- parameter->turn_mode = TM_WORST_TIME;
break;
case HELI_MOVING:
/* Helicoptors are treated similarly to airplanes. */
@@ -678,8 +697,6 @@ void pft_fill_unit_parameter(struct pf_parameter *parameter,
/* United nations cancels out helicoptor fuel loss. */
parameter->is_pos_dangerous = NULL;
} else {
- /* Otherwise, don't risk fuel loss. */
- parameter->is_pos_dangerous = is_pos_dangerous_fuel;
parameter->turn_mode = TM_WORST_TIME;
}
break;
@@ -688,6 +705,12 @@ void pft_fill_unit_parameter(struct pf_parameter *parameter,
break;
}
+ if (!parameter->get_moves_left_req && unit_type(punit)->fuel > 0) {
+ /* Unit needs fuel */
+ parameter->get_moves_left_req = get_fuel_moves_left_req;
+ parameter->turn_mode = TM_WORST_TIME;
+ }
+
if (unit_type(punit)->move_type == LAND_MOVING
&& !unit_has_type_flag(punit, F_IGZOC)) {
parameter->get_zoc = is_my_zoc;
@@ -784,6 +807,7 @@ void pft_fill_unit_attack_param(struct pf_parameter *parameter,
/* It is too complicated to work with danger here */
parameter->is_pos_dangerous = NULL;
+ parameter->get_moves_left_req = NULL;
}
/****************************************************************************
@@ -813,6 +837,7 @@ void pft_fill_amphibious_parameter(struct pft_amphibious *parameter)
parameter->combined.get_TB = amphibious_behaviour;
parameter->combined.get_EC = amphibious_extra_cost;
parameter->combined.is_pos_dangerous = amphibious_is_pos_dangerous;
+ parameter->combined.get_moves_left_req = NULL;
BV_CLR_ALL(parameter->combined.unit_flags);
parameter->combined.data = parameter;
@@ -851,6 +876,7 @@ static void pft_fill_unit_default_parameter(struct pf_parameter *parameter,
parameter->get_TB = NULL;
parameter->get_EC = NULL;
parameter->is_pos_dangerous = NULL;
+ parameter->get_moves_left_req = NULL;
parameter->get_costs = NULL;
parameter->get_zoc = NULL;
BV_CLR_ALL(parameter->unit_flags);
@@ -868,6 +894,12 @@ static void pft_fill_unit_default_parameter(struct pf_parameter *parameter,
parameter->owner = unit_owner(punit);
parameter->unit_flags = unit_type(punit)->flags;
+ if (!BV_ISSET(parameter->unit_flags, F_NONMIL)) {
+ parameter->can_invade_tile = player_can_invade_tile;
+ } else {
+ parameter->can_invade_tile = NULL;
+ }
+
parameter->omniscience = !ai_handicap(unit_owner(punit), H_MAP);
}
diff --git a/common/aicore/pf_tools.h b/common/aicore/pf_tools.h
index 244575b..6431587 100644
--- a/common/aicore/pf_tools.h
+++ b/common/aicore/pf_tools.h
@@ -48,15 +48,16 @@ void pft_fill_unit_overlap_param(struct pf_parameter *parameter,
struct unit *punit);
void pft_fill_unit_attack_param(struct pf_parameter *parameter,
struct unit *punit);
+
void pft_fill_amphibious_parameter(struct pft_amphibious *parameter);
enum tile_behavior no_fights_or_unknown(const struct tile *ptile,
enum known_type known,
- struct pf_parameter *param);
+ const struct pf_parameter *param);
enum tile_behavior no_fights(const struct tile *ptile, enum known_type known,
- struct pf_parameter *param);
+ const struct pf_parameter *param);
enum tile_behavior no_intermediate_fights(const struct tile *ptile,
- enum known_type known,
- struct pf_parameter *param);
+ enum known_type known,
+ const struct pf_parameter *param);
#define pf_iterator(map, position) { \
struct pf_position position; \
diff --git a/common/city.c b/common/city.c
index 9ced19c..cfc65a5 100644
--- a/common/city.c
+++ b/common/city.c
@@ -541,7 +541,8 @@ bool city_can_change_build(const struct city *pcity)
**************************************************************************/
const char *city_name(const struct city *pcity)
{
- assert(NULL != pcity && NULL != pcity->name);
+ assert(NULL != pcity);
+ assert(NULL != pcity->name);
return pcity->name;
}
@@ -550,7 +551,8 @@ const char *city_name(const struct city *pcity)
**************************************************************************/
struct player *city_owner(const struct city *pcity)
{
- assert(NULL != pcity && NULL != pcity->owner);
+ assert(NULL != pcity);
+ assert(NULL != pcity->owner);
return pcity->owner;
}
@@ -2432,7 +2434,7 @@ struct city *create_city_virtual(struct player *pplayer,
}
/* Set up the worklist */
- init_worklist(&pcity->worklist);
+ worklist_init(&pcity->worklist);
{
struct unit_type *u = best_role_unit(pcity, L_FIRSTBUILD);
diff --git a/common/connection.c b/common/connection.c
index 48fc429..8304611 100644
--- a/common/connection.c
+++ b/common/connection.c
@@ -61,11 +61,14 @@ struct connection *current_connection;
/**************************************************************************
Command access levels for client-side use; at present, they are only
used to control access to server commands typed at the client chatline.
+ NB: These must match enum cmdlevel_id in common/connection.h.
**************************************************************************/
static const char *levelnames[] = {
"none",
"info",
+ "basic",
"ctrl",
+ "admin",
"hack"
};
@@ -689,3 +692,45 @@ void conn_clear_packet_cache(struct connection *pc)
}
}
}
+
+/**************************************************************************
+ Returns TRUE if the given connection is attached to a player which it
+ also controls (i.e. not a player observer).
+**************************************************************************/
+bool conn_controls_player(const struct connection *pconn)
+{
+ return pconn && pconn->player && !pconn->observer;
+}
+
+/**************************************************************************
+ Returns TRUE if the given connection is a global observer.
+**************************************************************************/
+bool conn_is_global_observer(const struct connection *pconn)
+{
+ return pconn && !pconn->player && pconn->observer;
+}
+
+/**************************************************************************
+ Returns the player that this connection is attached to, or NULL. Note
+ that this will return the observed player for connections that are
+ observing players.
+**************************************************************************/
+struct player *conn_get_player(const struct connection *pconn)
+{
+ if (!pconn) {
+ return NULL;
+ }
+ return pconn->player;
+}
+
+/**************************************************************************
+ Returns the current access level of the given connection.
+ NB: If 'pconn' is NULL, this function will return ALLOW_NONE.
+**************************************************************************/
+enum cmdlevel_id conn_get_access(const struct connection *pconn)
+{
+ if (!pconn) {
+ return ALLOW_NONE; /* Would not want to give hack on error... */
+ }
+ return pconn->access_level;
+}
diff --git a/common/connection.h b/common/connection.h
index 63a71b5..40f8851 100644
--- a/common/connection.h
+++ b/common/connection.h
@@ -49,8 +49,11 @@ struct timer_list;
***************************************************************************/
enum cmdlevel_id { /* access levels for users to issue commands */
ALLOW_NONE = 0, /* user may issue no commands at all */
- ALLOW_INFO, /* user may issue informational commands */
+ ALLOW_INFO, /* informational or observer commands only */
+ ALLOW_BASIC, /* user may issue basic player commands */
ALLOW_CTRL, /* user may issue commands that affect game & users */
+ /* (starts a vote if the user's level is 'basic') */
+ ALLOW_ADMIN, /* user may issue commands that affect the server */
ALLOW_HACK, /* user may issue *all* commands - dangerous! */
ALLOW_NUM, /* the number of levels */
@@ -58,7 +61,7 @@ enum cmdlevel_id { /* access levels for users to issue commands */
};
/* the set command is a special case: */
/* - ALLOW_CTRL is required for SSET_TO_CLIENT options */
-/* - ALLOW_HACK is required for SSET_TO_SERVER options */
+/* - ALLOW_HACK is required for SSET_SERVER_ONLY options */
/***************************************************************************
On the distinction between nations(formerly races), players, and users,
@@ -134,7 +137,7 @@ struct connection {
char capability[MAX_LEN_CAPSTR];
/*
- * "access_level" stores the access granted to the client
+ * "access_level" stores the current access level of the client
* corresponding to this connection.
*/
enum cmdlevel_id access_level;
@@ -200,6 +203,9 @@ struct connection {
/* for reverse lookup and blacklisting in db */
char ipaddr[MAX_LEN_ADDR];
+
+ /* The access level initially given to the client upon connection. */
+ enum cmdlevel_id granted_access_level;
} server;
/*
@@ -268,6 +274,12 @@ void free_compression_queue(struct connection *pconn);
void conn_clear_packet_cache(struct connection *pconn);
const char *conn_description(const struct connection *pconn);
+bool conn_controls_player(const struct connection *pconn);
+bool conn_is_global_observer(const struct connection *pconn);
+enum cmdlevel_id conn_get_access(const struct connection *pconn);
+
+struct player;
+struct player *conn_get_player(const struct connection *pconn);
int get_next_request_id(int old_request_id);
diff --git a/common/dataio.c b/common/dataio.c
index 7752e59..4295b61 100644
--- a/common/dataio.c
+++ b/common/dataio.c
@@ -655,7 +655,7 @@ void dio_get_worklist(struct data_in *din, struct worklist *pwl)
if (pwl->is_valid) {
int i, length;
- init_worklist(pwl);
+ worklist_init(pwl);
dio_get_uint8(din, &length);
for (i = 0; i < length; i++) {
diff --git a/common/diptreaty.c b/common/diptreaty.c
index f86845b..b470b3d 100644
--- a/common/diptreaty.c
+++ b/common/diptreaty.c
@@ -124,6 +124,8 @@ bool remove_clause(struct Treaty *ptreaty, struct player *pfrom,
bool add_clause(struct Treaty *ptreaty, struct player *pfrom,
enum clause_type type, int val)
{
+ struct player *pto = (pfrom == ptreaty->plr0
+ ? ptreaty->plr1 : ptreaty->plr0);
struct Clause *pclause;
enum diplstate_type ds =
pplayer_get_diplstate(ptreaty->plr0, ptreaty->plr1)->type;
@@ -151,6 +153,18 @@ bool add_clause(struct Treaty *ptreaty, struct player *pfrom,
return FALSE;
}
+ /* Don't use player_has_embassy() here, because it also checks for the
+ * embassy effect, and we should always be able to make an embassy. */
+ if (type == CLAUSE_EMBASSY
+ && BV_ISSET(pto->embassy, player_index(pfrom))) {
+ /* we already have embassy */
+ freelog(LOG_ERROR,
+ "Illegal embassy clause: %s already have embassy with %s.",
+ nation_rule_name(nation_of_player(pto)),
+ nation_rule_name(nation_of_player(pfrom)));
+ return FALSE;
+ }
+
clause_list_iterate(ptreaty->clauses, pclause) {
if(pclause->type==type
&& pclause->from==pfrom
diff --git a/common/generate_packets.py b/common/generate_packets.py
index 4d6e374..e52c204 100755
--- a/common/generate_packets.py
+++ b/common/generate_packets.py
@@ -242,7 +242,7 @@ class Field:
# functions in the packet struct.
def get_fill(self):
if self.dataio_type=="worklist":
- return " copy_worklist(&real_packet->%(name)s, %(name)s);"%self.__dict__
+ return " worklist_copy(&real_packet->%(name)s, %(name)s);"%self.__dict__
if self.is_array==0:
return " real_packet->%(name)s = %(name)s;"%self.__dict__
if self.dataio_type=="string":
diff --git a/common/improvement.c b/common/improvement.c
index 62f9159..2d2f56c 100644
--- a/common/improvement.c
+++ b/common/improvement.c
@@ -473,6 +473,20 @@ struct city *find_city_from_great_wonder(Impr_type_id id)
}
/**************************************************************************
+ Get the player owning this small wonder.
+**************************************************************************/
+struct player *great_wonder_owner(Impr_type_id id)
+{
+ struct city *pcity = find_city_from_great_wonder(id);
+
+ if (!pcity) {
+ return NULL;
+ }
+
+ return city_owner(pcity);
+}
+
+/**************************************************************************
Get the player city with this small wonder.
**************************************************************************/
struct city *find_city_from_small_wonder(const struct player *pplayer,
diff --git a/common/improvement.h b/common/improvement.h
index d0cf292..56b3427 100644
--- a/common/improvement.h
+++ b/common/improvement.h
@@ -132,6 +132,7 @@ bool is_improvement(Impr_type_id id);
struct city *find_city_from_great_wonder(Impr_type_id id);
struct city *find_city_from_small_wonder(const struct player *pplayer,
Impr_type_id id);
+struct player *great_wonder_owner(Impr_type_id id);
bool great_wonder_was_built(Impr_type_id id);
diff --git a/common/movement.c b/common/movement.c
index 7a54278..d2a238e 100644
--- a/common/movement.c
+++ b/common/movement.c
@@ -416,9 +416,7 @@ enum unit_move_result test_unit_move_to_tile(const struct unit_type *punittype,
/* 9) */
if (!utype_has_flag(punittype, F_NONMIL)
- && tile_owner(dst_tile)
- && tile_owner(dst_tile) != unit_owner
- && players_non_invade(unit_owner, tile_owner(dst_tile))) {
+ && !player_can_invade_tile(unit_owner, dst_tile)) {
return MR_PEACE;
}
diff --git a/common/packets.def b/common/packets.def
index 13921db..791870f 100644
--- a/common/packets.def
+++ b/common/packets.def
@@ -1341,6 +1341,8 @@ PACKET_OPTIONS_SETTABLE=113;sc,lsend
STRING default_strval[MAX_LEN_PACKET]; /* space for string */
UINT8 scategory;
+
+ BOOL initial_setting; add-cap(KeepSavedSetting)
end
/************** Effects hash packets **********************/
@@ -1370,3 +1372,41 @@ PACKET_RULESET_RESOURCE=124;sc,lsend
STRING graphic_str[MAX_LEN_NAME];
STRING graphic_alt[MAX_LEN_NAME];
end
+
+/*************** "voteinfo" capability packets ***************/
+
+PACKET_VOTE_NEW=145;sc,handle-via-packet,no-delta
+ UINT32 vote_no;
+ STRING user[MAX_LEN_NAME];
+ STRING desc[512];
+ UINT8 percent_required;
+ UINT32 flags;
+end
+
+/* Sent to the client to give the new vote totals. */
+PACKET_VOTE_UPDATE=146;sc,no-delta
+ UINT32 vote_no; key
+ UINT8 yes;
+ UINT8 no;
+ UINT8 abstain;
+ UINT8 num_voters;
+end
+
+PACKET_VOTE_REMOVE=147;sc,no-delta
+ UINT32 vote_no;
+end
+
+PACKET_VOTE_RESOLVE=148;sc,no-delta
+ UINT32 vote_no;
+ BOOL passed;
+end
+
+/* Sent to the server by the client when the client
+ * votes:
+ * - yes (value = +1)
+ * - no (value = -1)
+ * - abstain (value = 0) */
+PACKET_VOTE_SUBMIT=149;cs,handle-per-conn,no-delta
+ UINT32 vote_no;
+ SINT8 value;
+end
diff --git a/common/packets_gen.c b/common/packets_gen.c
index 055841e..bc97ae9 100644
--- a/common/packets_gen.c
+++ b/common/packets_gen.c
@@ -395,6 +395,21 @@ void *get_packet_from_connection_helper(struct connection *pc,
case PACKET_RULESET_RESOURCE:
return receive_packet_ruleset_resource(pc, type);
+ case PACKET_VOTE_NEW:
+ return receive_packet_vote_new(pc, type);
+
+ case PACKET_VOTE_UPDATE:
+ return receive_packet_vote_update(pc, type);
+
+ case PACKET_VOTE_REMOVE:
+ return receive_packet_vote_remove(pc, type);
+
+ case PACKET_VOTE_RESOLVE:
+ return receive_packet_vote_resolve(pc, type);
+
+ case PACKET_VOTE_SUBMIT:
+ return receive_packet_vote_submit(pc, type);
+
default:
freelog(LOG_ERROR, "unknown packet type %d received from %s",
type, conn_description(pc));
@@ -758,6 +773,21 @@ const char *get_packet_name(enum packet_type type)
case PACKET_RULESET_RESOURCE:
return "PACKET_RULESET_RESOURCE";
+ case PACKET_VOTE_NEW:
+ return "PACKET_VOTE_NEW";
+
+ case PACKET_VOTE_UPDATE:
+ return "PACKET_VOTE_UPDATE";
+
+ case PACKET_VOTE_REMOVE:
+ return "PACKET_VOTE_REMOVE";
+
+ case PACKET_VOTE_RESOLVE:
+ return "PACKET_VOTE_RESOLVE";
+
+ case PACKET_VOTE_SUBMIT:
+ return "PACKET_VOTE_SUBMIT";
+
default:
return "unknown";
}
@@ -8094,7 +8124,7 @@ int dsend_packet_city_worklist(struct connection *pc, int city_id, struct workli
struct packet_city_worklist packet, *real_packet = &packet;
real_packet->city_id = city_id;
- copy_worklist(&real_packet->worklist, worklist);
+ worklist_copy(&real_packet->worklist, worklist);
return send_packet_city_worklist(pc, real_packet);
}
@@ -27978,7 +28008,7 @@ void lsend_packet_options_settable_control(struct conn_list *dest, const struct
#define cmp_packet_options_settable_100 cmp_const
-BV_DEFINE(packet_options_settable_100_fields, 14);
+BV_DEFINE(packet_options_settable_100_fields, 15);
static struct packet_options_settable *receive_packet_options_settable_100(struct connection *pc, enum packet_type type)
{
@@ -28082,6 +28112,7 @@ static struct packet_options_settable *receive_packet_options_settable_100(struc
real_packet->scategory = readin;
}
}
+ real_packet->initial_setting = BV_ISSET(fields, 14);
clone = fc_malloc(sizeof(*clone));
*clone = *real_packet;
@@ -28172,6 +28203,268 @@ static int send_packet_options_settable_100(struct connection *pc, const struct
if(differ) {different++;}
if(differ) {BV_SET(fields, 13);}
+ differ = (old->initial_setting != real_packet->initial_setting);
+ if(differ) {different++;}
+ if(packet->initial_setting) {BV_SET(fields, 14);}
+
+ if (different == 0 && !force_send_of_unchanged) {
+ return 0;
+ }
+
+ DIO_BV_PUT(&dout, fields);
+
+ if (BV_ISSET(fields, 0)) {
+ dio_put_uint16(&dout, real_packet->id);
+ }
+ if (BV_ISSET(fields, 1)) {
+ dio_put_string(&dout, real_packet->name);
+ }
+ if (BV_ISSET(fields, 2)) {
+ dio_put_string(&dout, real_packet->short_help);
+ }
+ if (BV_ISSET(fields, 3)) {
+ dio_put_string(&dout, real_packet->extra_help);
+ }
+ if (BV_ISSET(fields, 4)) {
+ dio_put_uint8(&dout, real_packet->stype);
+ }
+ if (BV_ISSET(fields, 5)) {
+ dio_put_uint8(&dout, real_packet->sclass);
+ }
+ /* field 6 is folded into the header */
+ if (BV_ISSET(fields, 7)) {
+ dio_put_sint32(&dout, real_packet->val);
+ }
+ if (BV_ISSET(fields, 8)) {
+ dio_put_sint32(&dout, real_packet->default_val);
+ }
+ if (BV_ISSET(fields, 9)) {
+ dio_put_sint32(&dout, real_packet->min);
+ }
+ if (BV_ISSET(fields, 10)) {
+ dio_put_sint32(&dout, real_packet->max);
+ }
+ if (BV_ISSET(fields, 11)) {
+ dio_put_string(&dout, real_packet->strval);
+ }
+ if (BV_ISSET(fields, 12)) {
+ dio_put_string(&dout, real_packet->default_strval);
+ }
+ if (BV_ISSET(fields, 13)) {
+ dio_put_uint8(&dout, real_packet->scategory);
+ }
+ /* field 14 is folded into the header */
+
+
+ if (old_from_hash) {
+ hash_delete_entry(*hash, old);
+ }
+
+ clone = old;
+
+ *clone = *real_packet;
+ hash_insert(*hash, clone, clone);
+ SEND_PACKET_END;
+}
+
+#define hash_packet_options_settable_101 hash_const
+
+#define cmp_packet_options_settable_101 cmp_const
+
+BV_DEFINE(packet_options_settable_101_fields, 14);
+
+static struct packet_options_settable *receive_packet_options_settable_101(struct connection *pc, enum packet_type type)
+{
+ packet_options_settable_101_fields fields;
+ struct packet_options_settable *old;
+ struct hash_table **hash = &pc->phs.received[type];
+ struct packet_options_settable *clone;
+ RECEIVE_PACKET_START(packet_options_settable, real_packet);
+
+ DIO_BV_GET(&din, fields);
+
+
+ if (!*hash) {
+ *hash = hash_new(hash_packet_options_settable_101, cmp_packet_options_settable_101);
+ }
+ old = hash_delete_entry(*hash, real_packet);
+
+ if (old) {
+ *real_packet = *old;
+ } else {
+ memset(real_packet, 0, sizeof(*real_packet));
+ }
+
+ if (BV_ISSET(fields, 0)) {
+ {
+ int readin;
+
+ dio_get_uint16(&din, &readin);
+ real_packet->id = readin;
+ }
+ }
+ if (BV_ISSET(fields, 1)) {
+ dio_get_string(&din, real_packet->name, sizeof(real_packet->name));
+ }
+ if (BV_ISSET(fields, 2)) {
+ dio_get_string(&din, real_packet->short_help, sizeof(real_packet->short_help));
+ }
+ if (BV_ISSET(fields, 3)) {
+ dio_get_string(&din, real_packet->extra_help, sizeof(real_packet->extra_help));
+ }
+ if (BV_ISSET(fields, 4)) {
+ {
+ int readin;
+
+ dio_get_uint8(&din, &readin);
+ real_packet->stype = readin;
+ }
+ }
+ if (BV_ISSET(fields, 5)) {
+ {
+ int readin;
+
+ dio_get_uint8(&din, &readin);
+ real_packet->sclass = readin;
+ }
+ }
+ real_packet->is_visible = BV_ISSET(fields, 6);
+ if (BV_ISSET(fields, 7)) {
+ {
+ int readin;
+
+ dio_get_sint32(&din, &readin);
+ real_packet->val = readin;
+ }
+ }
+ if (BV_ISSET(fields, 8)) {
+ {
+ int readin;
+
+ dio_get_sint32(&din, &readin);
+ real_packet->default_val = readin;
+ }
+ }
+ if (BV_ISSET(fields, 9)) {
+ {
+ int readin;
+
+ dio_get_sint32(&din, &readin);
+ real_packet->min = readin;
+ }
+ }
+ if (BV_ISSET(fields, 10)) {
+ {
+ int readin;
+
+ dio_get_sint32(&din, &readin);
+ real_packet->max = readin;
+ }
+ }
+ if (BV_ISSET(fields, 11)) {
+ dio_get_string(&din, real_packet->strval, sizeof(real_packet->strval));
+ }
+ if (BV_ISSET(fields, 12)) {
+ dio_get_string(&din, real_packet->default_strval, sizeof(real_packet->default_strval));
+ }
+ if (BV_ISSET(fields, 13)) {
+ {
+ int readin;
+
+ dio_get_uint8(&din, &readin);
+ real_packet->scategory = readin;
+ }
+ }
+
+ clone = fc_malloc(sizeof(*clone));
+ *clone = *real_packet;
+ if (old) {
+ free(old);
+ }
+ hash_insert(*hash, clone, clone);
+
+ RECEIVE_PACKET_END(real_packet);
+}
+
+static int send_packet_options_settable_101(struct connection *pc, const struct packet_options_settable *packet)
+{
+ const struct packet_options_settable *real_packet = packet;
+ packet_options_settable_101_fields fields;
+ struct packet_options_settable *old, *clone;
+ bool differ, old_from_hash, force_send_of_unchanged = TRUE;
+ struct hash_table **hash = &pc->phs.sent[PACKET_OPTIONS_SETTABLE];
+ int different = 0;
+ SEND_PACKET_START(PACKET_OPTIONS_SETTABLE);
+
+ if (!*hash) {
+ *hash = hash_new(hash_packet_options_settable_101, cmp_packet_options_settable_101);
+ }
+ BV_CLR_ALL(fields);
+
+ old = hash_lookup_data(*hash, real_packet);
+ old_from_hash = (old != NULL);
+ if (!old) {
+ old = fc_malloc(sizeof(*old));
+ memset(old, 0, sizeof(*old));
+ force_send_of_unchanged = TRUE;
+ }
+
+ differ = (old->id != real_packet->id);
+ if(differ) {different++;}
+ if(differ) {BV_SET(fields, 0);}
+
+ differ = (strcmp(old->name, real_packet->name) != 0);
+ if(differ) {different++;}
+ if(differ) {BV_SET(fields, 1);}
+
+ differ = (strcmp(old->short_help, real_packet->short_help) != 0);
+ if(differ) {different++;}
+ if(differ) {BV_SET(fields, 2);}
+
+ differ = (strcmp(old->extra_help, real_packet->extra_help) != 0);
+ if(differ) {different++;}
+ if(differ) {BV_SET(fields, 3);}
+
+ differ = (old->stype != real_packet->stype);
+ if(differ) {different++;}
+ if(differ) {BV_SET(fields, 4);}
+
+ differ = (old->sclass != real_packet->sclass);
+ if(differ) {different++;}
+ if(differ) {BV_SET(fields, 5);}
+
+ differ = (old->is_visible != real_packet->is_visible);
+ if(differ) {different++;}
+ if(packet->is_visible) {BV_SET(fields, 6);}
+
+ differ = (old->val != real_packet->val);
+ if(differ) {different++;}
+ if(differ) {BV_SET(fields, 7);}
+
+ differ = (old->default_val != real_packet->default_val);
+ if(differ) {different++;}
+ if(differ) {BV_SET(fields, 8);}
+
+ differ = (old->min != real_packet->min);
+ if(differ) {different++;}
+ if(differ) {BV_SET(fields, 9);}
+
+ differ = (old->max != real_packet->max);
+ if(differ) {different++;}
+ if(differ) {BV_SET(fields, 10);}
+
+ differ = (strcmp(old->strval, real_packet->strval) != 0);
+ if(differ) {different++;}
+ if(differ) {BV_SET(fields, 11);}
+
+ differ = (strcmp(old->default_strval, real_packet->default_strval) != 0);
+ if(differ) {different++;}
+ if(differ) {BV_SET(fields, 12);}
+
+ differ = (old->scategory != real_packet->scategory);
+ if(differ) {different++;}
+ if(differ) {BV_SET(fields, 13);}
+
if (different == 0 && !force_send_of_unchanged) {
return 0;
}
@@ -28240,8 +28533,10 @@ static void ensure_valid_variant_packet_options_settable(struct connection *pc)
}
if(FALSE) {
- } else if(TRUE) {
+ } else if((has_capability("KeepSavedSetting", pc->capability) && has_capability("KeepSavedSetting", our_capability))) {
variant = 100;
+ } else if(!(has_capability("KeepSavedSetting", pc->capability) && has_capability("KeepSavedSetting", our_capability))) {
+ variant = 101;
} else {
die("unknown variant");
}
@@ -28264,6 +28559,7 @@ struct packet_options_settable *receive_packet_options_settable(struct connectio
switch(pc->phs.variant[PACKET_OPTIONS_SETTABLE]) {
case 100: return receive_packet_options_settable_100(pc, type);
+ case 101: return receive_packet_options_settable_101(pc, type);
default: die("unknown variant"); return NULL;
}
}
@@ -28284,6 +28580,7 @@ int send_packet_options_settable(struct connection *pc, const struct packet_opti
switch(pc->phs.variant[PACKET_OPTIONS_SETTABLE]) {
case 100: return send_packet_options_settable_100(pc, packet);
+ case 101: return send_packet_options_settable_101(pc, packet);
default: die("unknown variant"); return -1;
}
}
@@ -28924,3 +29221,458 @@ void lsend_packet_ruleset_resource(struct conn_list *dest, const struct packet_r
} conn_list_iterate_end;
}
+static struct packet_vote_new *receive_packet_vote_new_100(struct connection *pc, enum packet_type type)
+{
+ RECEIVE_PACKET_START(packet_vote_new, real_packet);
+ {
+ int readin;
+
+ dio_get_uint32(&din, &readin);
+ real_packet->vote_no = readin;
+ }
+ dio_get_string(&din, real_packet->user, sizeof(real_packet->user));
+ dio_get_string(&din, real_packet->desc, sizeof(real_packet->desc));
+ {
+ int readin;
+
+ dio_get_uint8(&din, &readin);
+ real_packet->percent_required = readin;
+ }
+ {
+ int readin;
+
+ dio_get_uint32(&din, &readin);
+ real_packet->flags = readin;
+ }
+
+ RECEIVE_PACKET_END(real_packet);
+}
+
+static int send_packet_vote_new_100(struct connection *pc, const struct packet_vote_new *packet)
+{
+ const struct packet_vote_new *real_packet = packet;
+ SEND_PACKET_START(PACKET_VOTE_NEW);
+
+ dio_put_uint32(&dout, real_packet->vote_no);
+ dio_put_string(&dout, real_packet->user);
+ dio_put_string(&dout, real_packet->desc);
+ dio_put_uint8(&dout, real_packet->percent_required);
+ dio_put_uint32(&dout, real_packet->flags);
+
+ SEND_PACKET_END;
+}
+
+static void ensure_valid_variant_packet_vote_new(struct connection *pc)
+{
+ int variant = -1;
+
+ if(pc->phs.variant[PACKET_VOTE_NEW] != -1) {
+ return;
+ }
+
+ if(FALSE) {
+ } else if(TRUE) {
+ variant = 100;
+ } else {
+ die("unknown variant");
+ }
+ pc->phs.variant[PACKET_VOTE_NEW] = variant;
+}
+
+struct packet_vote_new *receive_packet_vote_new(struct connection *pc, enum packet_type type)
+{
+ if(!pc->used) {
+ freelog(LOG_ERROR,
+ "WARNING: trying to read data from the closed connection %s",
+ conn_description(pc));
+ return NULL;
+ }
+ assert(pc->phs.variant != NULL);
+ if (pc->is_server) {
+ freelog(LOG_ERROR, "Receiving packet_vote_new at the server.");
+ }
+ ensure_valid_variant_packet_vote_new(pc);
+
+ switch(pc->phs.variant[PACKET_VOTE_NEW]) {
+ case 100: return receive_packet_vote_new_100(pc, type);
+ default: die("unknown variant"); return NULL;
+ }
+}
+
+int send_packet_vote_new(struct connection *pc, const struct packet_vote_new *packet)
+{
+ if(!pc->used) {
+ freelog(LOG_ERROR,
+ "WARNING: trying to send data to the closed connection %s",
+ conn_description(pc));
+ return -1;
+ }
+ assert(pc->phs.variant != NULL);
+ if (!pc->is_server) {
+ freelog(LOG_ERROR, "Sending packet_vote_new from the client.");
+ }
+ ensure_valid_variant_packet_vote_new(pc);
+
+ switch(pc->phs.variant[PACKET_VOTE_NEW]) {
+ case 100: return send_packet_vote_new_100(pc, packet);
+ default: die("unknown variant"); return -1;
+ }
+}
+
+static struct packet_vote_update *receive_packet_vote_update_100(struct connection *pc, enum packet_type type)
+{
+ RECEIVE_PACKET_START(packet_vote_update, real_packet);
+ {
+ int readin;
+
+ dio_get_uint32(&din, &readin);
+ real_packet->vote_no = readin;
+ }
+ {
+ int readin;
+
+ dio_get_uint8(&din, &readin);
+ real_packet->yes = readin;
+ }
+ {
+ int readin;
+
+ dio_get_uint8(&din, &readin);
+ real_packet->no = readin;
+ }
+ {
+ int readin;
+
+ dio_get_uint8(&din, &readin);
+ real_packet->abstain = readin;
+ }
+ {
+ int readin;
+
+ dio_get_uint8(&din, &readin);
+ real_packet->num_voters = readin;
+ }
+
+ RECEIVE_PACKET_END(real_packet);
+}
+
+static int send_packet_vote_update_100(struct connection *pc, const struct packet_vote_update *packet)
+{
+ const struct packet_vote_update *real_packet = packet;
+ SEND_PACKET_START(PACKET_VOTE_UPDATE);
+
+ dio_put_uint32(&dout, real_packet->vote_no);
+ dio_put_uint8(&dout, real_packet->yes);
+ dio_put_uint8(&dout, real_packet->no);
+ dio_put_uint8(&dout, real_packet->abstain);
+ dio_put_uint8(&dout, real_packet->num_voters);
+
+ SEND_PACKET_END;
+}
+
+static void ensure_valid_variant_packet_vote_update(struct connection *pc)
+{
+ int variant = -1;
+
+ if(pc->phs.variant[PACKET_VOTE_UPDATE] != -1) {
+ return;
+ }
+
+ if(FALSE) {
+ } else if(TRUE) {
+ variant = 100;
+ } else {
+ die("unknown variant");
+ }
+ pc->phs.variant[PACKET_VOTE_UPDATE] = variant;
+}
+
+struct packet_vote_update *receive_packet_vote_update(struct connection *pc, enum packet_type type)
+{
+ if(!pc->used) {
+ freelog(LOG_ERROR,
+ "WARNING: trying to read data from the closed connection %s",
+ conn_description(pc));
+ return NULL;
+ }
+ assert(pc->phs.variant != NULL);
+ if (pc->is_server) {
+ freelog(LOG_ERROR, "Receiving packet_vote_update at the server.");
+ }
+ ensure_valid_variant_packet_vote_update(pc);
+
+ switch(pc->phs.variant[PACKET_VOTE_UPDATE]) {
+ case 100: return receive_packet_vote_update_100(pc, type);
+ default: die("unknown variant"); return NULL;
+ }
+}
+
+int send_packet_vote_update(struct connection *pc, const struct packet_vote_update *packet)
+{
+ if(!pc->used) {
+ freelog(LOG_ERROR,
+ "WARNING: trying to send data to the closed connection %s",
+ conn_description(pc));
+ return -1;
+ }
+ assert(pc->phs.variant != NULL);
+ if (!pc->is_server) {
+ freelog(LOG_ERROR, "Sending packet_vote_update from the client.");
+ }
+ ensure_valid_variant_packet_vote_update(pc);
+
+ switch(pc->phs.variant[PACKET_VOTE_UPDATE]) {
+ case 100: return send_packet_vote_update_100(pc, packet);
+ default: die("unknown variant"); return -1;
+ }
+}
+
+static struct packet_vote_remove *receive_packet_vote_remove_100(struct connection *pc, enum packet_type type)
+{
+ RECEIVE_PACKET_START(packet_vote_remove, real_packet);
+ {
+ int readin;
+
+ dio_get_uint32(&din, &readin);
+ real_packet->vote_no = readin;
+ }
+
+ RECEIVE_PACKET_END(real_packet);
+}
+
+static int send_packet_vote_remove_100(struct connection *pc, const struct packet_vote_remove *packet)
+{
+ const struct packet_vote_remove *real_packet = packet;
+ SEND_PACKET_START(PACKET_VOTE_REMOVE);
+
+ dio_put_uint32(&dout, real_packet->vote_no);
+
+ SEND_PACKET_END;
+}
+
+static void ensure_valid_variant_packet_vote_remove(struct connection *pc)
+{
+ int variant = -1;
+
+ if(pc->phs.variant[PACKET_VOTE_REMOVE] != -1) {
+ return;
+ }
+
+ if(FALSE) {
+ } else if(TRUE) {
+ variant = 100;
+ } else {
+ die("unknown variant");
+ }
+ pc->phs.variant[PACKET_VOTE_REMOVE] = variant;
+}
+
+struct packet_vote_remove *receive_packet_vote_remove(struct connection *pc, enum packet_type type)
+{
+ if(!pc->used) {
+ freelog(LOG_ERROR,
+ "WARNING: trying to read data from the closed connection %s",
+ conn_description(pc));
+ return NULL;
+ }
+ assert(pc->phs.variant != NULL);
+ if (pc->is_server) {
+ freelog(LOG_ERROR, "Receiving packet_vote_remove at the server.");
+ }
+ ensure_valid_variant_packet_vote_remove(pc);
+
+ switch(pc->phs.variant[PACKET_VOTE_REMOVE]) {
+ case 100: return receive_packet_vote_remove_100(pc, type);
+ default: die("unknown variant"); return NULL;
+ }
+}
+
+int send_packet_vote_remove(struct connection *pc, const struct packet_vote_remove *packet)
+{
+ if(!pc->used) {
+ freelog(LOG_ERROR,
+ "WARNING: trying to send data to the closed connection %s",
+ conn_description(pc));
+ return -1;
+ }
+ assert(pc->phs.variant != NULL);
+ if (!pc->is_server) {
+ freelog(LOG_ERROR, "Sending packet_vote_remove from the client.");
+ }
+ ensure_valid_variant_packet_vote_remove(pc);
+
+ switch(pc->phs.variant[PACKET_VOTE_REMOVE]) {
+ case 100: return send_packet_vote_remove_100(pc, packet);
+ default: die("unknown variant"); return -1;
+ }
+}
+
+static struct packet_vote_resolve *receive_packet_vote_resolve_100(struct connection *pc, enum packet_type type)
+{
+ RECEIVE_PACKET_START(packet_vote_resolve, real_packet);
+ {
+ int readin;
+
+ dio_get_uint32(&din, &readin);
+ real_packet->vote_no = readin;
+ }
+ dio_get_bool8(&din, &real_packet->passed);
+
+ RECEIVE_PACKET_END(real_packet);
+}
+
+static int send_packet_vote_resolve_100(struct connection *pc, const struct packet_vote_resolve *packet)
+{
+ const struct packet_vote_resolve *real_packet = packet;
+ SEND_PACKET_START(PACKET_VOTE_RESOLVE);
+
+ dio_put_uint32(&dout, real_packet->vote_no);
+ dio_put_bool8(&dout, real_packet->passed);
+
+ SEND_PACKET_END;
+}
+
+static void ensure_valid_variant_packet_vote_resolve(struct connection *pc)
+{
+ int variant = -1;
+
+ if(pc->phs.variant[PACKET_VOTE_RESOLVE] != -1) {
+ return;
+ }
+
+ if(FALSE) {
+ } else if(TRUE) {
+ variant = 100;
+ } else {
+ die("unknown variant");
+ }
+ pc->phs.variant[PACKET_VOTE_RESOLVE] = variant;
+}
+
+struct packet_vote_resolve *receive_packet_vote_resolve(struct connection *pc, enum packet_type type)
+{
+ if(!pc->used) {
+ freelog(LOG_ERROR,
+ "WARNING: trying to read data from the closed connection %s",
+ conn_description(pc));
+ return NULL;
+ }
+ assert(pc->phs.variant != NULL);
+ if (pc->is_server) {
+ freelog(LOG_ERROR, "Receiving packet_vote_resolve at the server.");
+ }
+ ensure_valid_variant_packet_vote_resolve(pc);
+
+ switch(pc->phs.variant[PACKET_VOTE_RESOLVE]) {
+ case 100: return receive_packet_vote_resolve_100(pc, type);
+ default: die("unknown variant"); return NULL;
+ }
+}
+
+int send_packet_vote_resolve(struct connection *pc, const struct packet_vote_resolve *packet)
+{
+ if(!pc->used) {
+ freelog(LOG_ERROR,
+ "WARNING: trying to send data to the closed connection %s",
+ conn_description(pc));
+ return -1;
+ }
+ assert(pc->phs.variant != NULL);
+ if (!pc->is_server) {
+ freelog(LOG_ERROR, "Sending packet_vote_resolve from the client.");
+ }
+ ensure_valid_variant_packet_vote_resolve(pc);
+
+ switch(pc->phs.variant[PACKET_VOTE_RESOLVE]) {
+ case 100: return send_packet_vote_resolve_100(pc, packet);
+ default: die("unknown variant"); return -1;
+ }
+}
+
+static struct packet_vote_submit *receive_packet_vote_submit_100(struct connection *pc, enum packet_type type)
+{
+ RECEIVE_PACKET_START(packet_vote_submit, real_packet);
+ {
+ int readin;
+
+ dio_get_uint32(&din, &readin);
+ real_packet->vote_no = readin;
+ }
+ {
+ int readin;
+
+ dio_get_sint8(&din, &readin);
+ real_packet->value = readin;
+ }
+
+ RECEIVE_PACKET_END(real_packet);
+}
+
+static int send_packet_vote_submit_100(struct connection *pc, const struct packet_vote_submit *packet)
+{
+ const struct packet_vote_submit *real_packet = packet;
+ SEND_PACKET_START(PACKET_VOTE_SUBMIT);
+
+ dio_put_uint32(&dout, real_packet->vote_no);
+ dio_put_sint8(&dout, real_packet->value);
+
+ SEND_PACKET_END;
+}
+
+static void ensure_valid_variant_packet_vote_submit(struct connection *pc)
+{
+ int variant = -1;
+
+ if(pc->phs.variant[PACKET_VOTE_SUBMIT] != -1) {
+ return;
+ }
+
+ if(FALSE) {
+ } else if(TRUE) {
+ variant = 100;
+ } else {
+ die("unknown variant");
+ }
+ pc->phs.variant[PACKET_VOTE_SUBMIT] = variant;
+}
+
+struct packet_vote_submit *receive_packet_vote_submit(struct connection *pc, enum packet_type type)
+{
+ if(!pc->used) {
+ freelog(LOG_ERROR,
+ "WARNING: trying to read data from the closed connection %s",
+ conn_description(pc));
+ return NULL;
+ }
+ assert(pc->phs.variant != NULL);
+ if (!pc->is_server) {
+ freelog(LOG_ERROR, "Receiving packet_vote_submit at the client.");
+ }
+ ensure_valid_variant_packet_vote_submit(pc);
+
+ switch(pc->phs.variant[PACKET_VOTE_SUBMIT]) {
+ case 100: return receive_packet_vote_submit_100(pc, type);
+ default: die("unknown variant"); return NULL;
+ }
+}
+
+int send_packet_vote_submit(struct connection *pc, const struct packet_vote_submit *packet)
+{
+ if(!pc->used) {
+ freelog(LOG_ERROR,
+ "WARNING: trying to send data to the closed connection %s",
+ conn_description(pc));
+ return -1;
+ }
+ assert(pc->phs.variant != NULL);
+ if (pc->is_server) {
+ freelog(LOG_ERROR, "Sending packet_vote_submit from the server.");
+ }
+ ensure_valid_variant_packet_vote_submit(pc);
+
+ switch(pc->phs.variant[PACKET_VOTE_SUBMIT]) {
+ case 100: return send_packet_vote_submit_100(pc, packet);
+ default: die("unknown variant"); return -1;
+ }
+}
+
diff --git a/common/packets_gen.h b/common/packets_gen.h
index ba349ef..b5d3473 100644
--- a/common/packets_gen.h
+++ b/common/packets_gen.h
@@ -1021,6 +1021,7 @@ struct packet_options_settable {
char strval[MAX_LEN_PACKET];
char default_strval[MAX_LEN_PACKET];
int scategory;
+ bool initial_setting;
};
struct packet_ruleset_effect {
@@ -1046,6 +1047,36 @@ struct packet_ruleset_resource {
char graphic_alt[MAX_LEN_NAME];
};
+struct packet_vote_new {
+ int vote_no;
+ char user[MAX_LEN_NAME];
+ char desc[512];
+ int percent_required;
+ int flags;
+};
+
+struct packet_vote_update {
+ int vote_no;
+ int yes;
+ int no;
+ int abstain;
+ int num_voters;
+};
+
+struct packet_vote_remove {
+ int vote_no;
+};
+
+struct packet_vote_resolve {
+ int vote_no;
+ bool passed;
+};
+
+struct packet_vote_submit {
+ int vote_no;
+ int value;
+};
+
enum packet_type {
PACKET_PROCESSING_STARTED, /* 0 */
PACKET_PROCESSING_FINISHED,
@@ -1164,6 +1195,11 @@ enum packet_type {
PACKET_THAW_CLIENT,
PACKET_BEGIN_TURN,
PACKET_END_TURN,
+ PACKET_VOTE_NEW = 145,
+ PACKET_VOTE_UPDATE,
+ PACKET_VOTE_REMOVE,
+ PACKET_VOTE_RESOLVE,
+ PACKET_VOTE_SUBMIT,
PACKET_LAST /* leave this last */
};
@@ -1650,6 +1686,21 @@ struct packet_ruleset_resource *receive_packet_ruleset_resource(struct connectio
int send_packet_ruleset_resource(struct connection *pc, const struct packet_ruleset_resource *packet);
void lsend_packet_ruleset_resource(struct conn_list *dest, const struct packet_ruleset_resource *packet);
+struct packet_vote_new *receive_packet_vote_new(struct connection *pc, enum packet_type type);
+int send_packet_vote_new(struct connection *pc, const struct packet_vote_new *packet);
+
+struct packet_vote_update *receive_packet_vote_update(struct connection *pc, enum packet_type type);
+int send_packet_vote_update(struct connection *pc, const struct packet_vote_update *packet);
+
+struct packet_vote_remove *receive_packet_vote_remove(struct connection *pc, enum packet_type type);
+int send_packet_vote_remove(struct connection *pc, const struct packet_vote_remove *packet);
+
+struct packet_vote_resolve *receive_packet_vote_resolve(struct connection *pc, enum packet_type type);
+int send_packet_vote_resolve(struct connection *pc, const struct packet_vote_resolve *packet);
+
+struct packet_vote_submit *receive_packet_vote_submit(struct connection *pc, enum packet_type type);
+int send_packet_vote_submit(struct connection *pc, const struct packet_vote_submit *packet);
+
void delta_stats_report(void);
void delta_stats_reset(void);
diff --git a/common/player.c b/common/player.c
index dc6d6a7..37209d0 100644
--- a/common/player.c
+++ b/common/player.c
@@ -158,6 +158,20 @@ bool player_owns_city(const struct player *pplayer, const struct city *pcity)
return (pcity && pplayer && city_owner(pcity) == pplayer);
}
+/****************************************************************************
+ Return TRUE iff the player can invade a particular tile (linked with
+ borders and diplomatic states).
+****************************************************************************/
+bool player_can_invade_tile(const struct player *pplayer,
+ const struct tile *ptile)
+{
+ const struct player *ptile_owner = tile_owner(ptile);
+
+ return (!ptile_owner
+ || ptile_owner == pplayer
+ || !players_non_invade(pplayer, ptile_owner));
+}
+
/***************************************************************
In the server you must use server_player_init. Note that
this function is matched by game_remove_player() in game.c,
diff --git a/common/player.h b/common/player.h
index 3b11987..ea3cab6 100644
--- a/common/player.h
+++ b/common/player.h
@@ -245,6 +245,8 @@ bool can_player_see_city_internals(const struct player *pplayer,
bool player_owns_city(const struct player *pplayer,
const struct city *pcity);
+bool player_can_invade_tile(const struct player *pplayer,
+ const struct tile *ptile);
struct city *player_find_city_by_id(const struct player *pplayer,
int city_id);
diff --git a/common/unit.c b/common/unit.c
index 100af79..54a3184 100644
--- a/common/unit.c
+++ b/common/unit.c
@@ -92,8 +92,11 @@ bool is_diplomat_action_available(const struct unit *pdiplomat,
return pplayers_allied(unit_owner(pdiplomat), city_owner(pcity));
if (action == DIPLOMAT_EMBASSY
&& !get_player_bonus(city_owner(pcity), EFT_NO_DIPLOMACY)
- && !player_has_embassy(unit_owner(pdiplomat), city_owner(pcity))) {
- return TRUE;
+ /* Always allow embassy, even if a such effect is already
+ * in range. */
+ && !BV_ISSET(unit_owner(pdiplomat)->embassy,
+ player_index(city_owner(pcity)))) {
+ return TRUE;
}
if(action==SPY_POISON &&
pcity->size>1 &&
diff --git a/common/unittype.c b/common/unittype.c
index 5be07dc..7e7dc5c 100644
--- a/common/unittype.c
+++ b/common/unittype.c
@@ -535,9 +535,20 @@ bool can_player_build_unit_direct(const struct player *p,
* can build that building. Note that individual cities may not have
* that building, so they still may not be able to build the unit. */
impr_req = punittype->impr_requirement;
- if (impr_req != B_LAST
- && !can_player_build_improvement_direct(p, impr_req)) {
- return FALSE;
+ if (impr_req != B_LAST) {
+ if (is_great_wonder(impr_req) &&
+ great_wonder_was_built(impr_req)) {
+ /* It's already built great wonder */
+ if (great_wonder_owner(impr_req) != p) {
+ /* Not owned by this player. Either destroyed or owned by somebody
+ * else. */
+ return FALSE;
+ }
+ } else {
+ if (!can_player_build_improvement_direct(p, impr_req)) {
+ return FALSE;
+ }
+ }
}
return TRUE;
diff --git a/common/worklist.c b/common/worklist.c
index 9d48002..188c4ff 100644
--- a/common/worklist.c
+++ b/common/worklist.c
@@ -30,7 +30,7 @@
For elements, only really need to set [0], but initialize the
rest to avoid junk values in savefile.
****************************************************************/
-void init_worklist(struct worklist *pwl)
+void worklist_init(struct worklist *pwl)
{
int i;
@@ -104,7 +104,7 @@ void worklist_advance(struct worklist *pwl)
/****************************************************************
...
****************************************************************/
-void copy_worklist(struct worklist *dst, const struct worklist *src)
+void worklist_copy(struct worklist *dst, const struct worklist *src)
{
assert(sizeof(*dst) == sizeof(*src));
memcpy(dst, src, sizeof(*dst));
@@ -225,7 +225,7 @@ void worklist_load(struct section_file *file, struct worklist *pwl,
vsnprintf(path_str, sizeof(path_str), path, ap);
va_end(ap);
- init_worklist(pwl);
+ worklist_init(pwl);
pwl->length = secfile_lookup_int_default(file, 0,
"%s.wl_length", path_str);
name = secfile_lookup_str_default(file, "a worklist",
diff --git a/common/worklist.h b/common/worklist.h
index ba965d6..48d77cb 100644
--- a/common/worklist.h
+++ b/common/worklist.h
@@ -29,7 +29,7 @@ struct worklist {
struct city_production entries[MAX_LEN_WORKLIST];
};
-void init_worklist(struct worklist *pwl);
+void worklist_init(struct worklist *pwl);
int worklist_length(const struct worklist *pwl);
bool worklist_is_empty(const struct worklist *pwl);
@@ -38,7 +38,7 @@ bool worklist_peek_ith(const struct worklist *pwl,
struct city_production *prod, int idx);
void worklist_advance(struct worklist *pwl);
-void copy_worklist(struct worklist *dst, const struct worklist *src);
+void worklist_copy(struct worklist *dst, const struct worklist *src);
void worklist_remove(struct worklist *pwl, int idx);
bool worklist_append(struct worklist *pwl, struct city_production prod);
bool worklist_insert(struct worklist *pwl, struct city_production prod,
diff --git a/config.h.in b/config.h.in
index 6f7decb..8939353 100644
--- a/config.h.in
+++ b/config.h.in
@@ -477,6 +477,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
/* Define to the version of this package. */
#undef PACKAGE_VERSION
@@ -497,10 +500,10 @@
/* If using the C implementation of alloca, define if you know the
direction of stack growth for your system; otherwise it will be
- automatically deduced at run-time.
- STACK_DIRECTION > 0 => grows toward higher addresses
- STACK_DIRECTION < 0 => grows toward lower addresses
- STACK_DIRECTION = 0 => direction of growth unknown */
+ automatically deduced at runtime.
+ STACK_DIRECTION > 0 => grows toward higher addresses
+ STACK_DIRECTION < 0 => grows toward lower addresses
+ STACK_DIRECTION = 0 => direction of growth unknown */
#undef STACK_DIRECTION
/* Define to 1 if you have the ANSI C header files. */
@@ -512,6 +515,28 @@
/* Define to 1 if your <sys/time.h> declares `struct tm'. */
#undef TM_IN_SYS_TIME
+/* Enable extensions on AIX 3, Interix. */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+/* Enable GNU extensions on systems that have them. */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+/* Enable threading extensions on Solaris. */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop. */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris. */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+
/* Version number of package */
#undef VERSION
@@ -530,25 +555,32 @@
/* Define to 1 if the X Window System is missing or not being used. */
#undef X_DISPLAY_MISSING
-/* Enable GNU extensions on systems that have them. */
-#ifndef _GNU_SOURCE
-# undef _GNU_SOURCE
-#endif
+/* Define to 1 if on MINIX. */
+#undef _MINIX
+
+/* Define to 2 if the system does not provide POSIX.1 features except with
+ this defined. */
+#undef _POSIX_1_SOURCE
+
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+#undef _POSIX_SOURCE
/* Define to empty if `const' does not conform to ANSI C. */
#undef const
-/* Define as `__inline' if that's what the C compiler calls it, or to nothing
- if it is not supported. */
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+ calls it, or to nothing if 'inline' is not supported under any name. */
+#ifndef __cplusplus
#undef inline
+#endif
-/* Define to `long' if <sys/types.h> does not define. */
+/* Define to `long int' if <sys/types.h> does not define. */
#undef off_t
/* Define to `int' if <sys/types.h> does not define. */
#undef pid_t
-/* Define to `unsigned' if <sys/types.h> does not define. */
+/* Define to `unsigned int' if <sys/types.h> does not define. */
#undef size_t
/* Define as `fork' if `vfork' does not work. */
diff --git a/configure b/configure
index f81a69a..c301d7b 100755
--- a/configure
+++ b/configure
@@ -1,81 +1,413 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.57.
+# Generated by GNU Autoconf 2.64.
+#
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+# Foundation, Inc.
#
-# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization. ##
-## --------------------- ##
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
emulate sh
NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
- set -o posix
+ setopt NO_GLOB_SUBST
+else
+ case `(set -o) 2>/dev/null` in #(
+ *posix*) :
+ set -o posix ;; #(
+ *) :
+ ;;
+esac
fi
-# Support unset when possible.
-if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
- as_unset=unset
-else
- as_unset=false
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='print -r --'
+ as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='printf %s\n'
+ as_echo_n='printf %s'
+else
+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+ as_echo_n='/usr/ucb/echo -n'
+ else
+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+ as_echo_n_body='eval
+ arg=$1;
+ case $arg in #(
+ *"$as_nl"*)
+ expr "X$arg" : "X\\(.*\\)$as_nl";
+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+ esac;
+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+ '
+ export as_echo_n_body
+ as_echo_n='sh -c $as_echo_n_body as_echo'
+ fi
+ export as_echo_body
+ as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ PATH_SEPARATOR=:
+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+ PATH_SEPARATOR=';'
+ }
fi
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
+# IFS
+# We need space, tab and new line, in precisely that order. Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" "" $as_nl"
+
+# Find who we are. Look in the path if we contain no directory separator.
+case $0 in #((
+ *[\\/]* ) as_myself=$0 ;;
+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+ as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there. '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
PS1='$ '
PS2='> '
PS4='+ '
# NLS nuisances.
-for as_var in \
- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
- LC_TELEPHONE LC_TIME
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+if test "x$CONFIG_SHELL" = x; then
+ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+ emulate sh
+ NULLCMD=:
+ # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '\${1+\"\$@\"}'='\"\$@\"'
+ setopt NO_GLOB_SUBST
+else
+ case \`(set -o) 2>/dev/null\` in #(
+ *posix*) :
+ set -o posix ;; #(
+ *) :
+ ;;
+esac
+fi
+"
+ as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
+
+exitcode=0
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+
+else
+ exitcode=1; echo positional parameters were not saved.
+fi
+test x\$exitcode = x0 || exit 1"
+ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1"
+ if (eval "$as_required") 2>/dev/null; then :
+ as_have_required=yes
+else
+ as_have_required=no
+fi
+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
+
+else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
do
- if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
- eval $as_var=C; export $as_var
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ as_found=:
+ case $as_dir in #(
+ /*)
+ for as_base in sh bash ksh sh5; do
+ # Try only shells that exist, to save several forks.
+ as_shell=$as_dir/$as_base
+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+ CONFIG_SHELL=$as_shell as_have_required=yes
+ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+ break 2
+fi
+fi
+ done;;
+ esac
+ as_found=false
+done
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+ CONFIG_SHELL=$SHELL as_have_required=yes
+fi; }
+IFS=$as_save_IFS
+
+
+ if test "x$CONFIG_SHELL" != x; then :
+ # We cannot yet assume a decent shell, so we have to provide a
+ # neutralization value for shells without unset; and this also
+ # works around shells that cannot unset nonexistent variables.
+ BASH_ENV=/dev/null
+ ENV=/dev/null
+ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+ export CONFIG_SHELL
+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+fi
+
+ if test x$as_have_required = xno; then :
+ $as_echo "$0: This script requires a shell more modern than all"
+ $as_echo "$0: the shells that I found on your system."
+ if test x${ZSH_VERSION+set} = xset ; then
+ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+ $as_echo "$0: be upgraded to zsh 4.3.4 or later."
else
- $as_unset $as_var
+ $as_echo "$0: Please tell bug-autoconf at gnu.org about your system,
+$0: including any error possibly output before this
+$0: message. Then install a modern shell, or manually run
+$0: the script under such a shell if you do have one."
fi
-done
+ exit 1
+fi
+fi
+fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
+
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+ { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+ return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+ set +e
+ as_fn_set_status $1
+ exit $1
+} # as_fn_exit
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
+ test -d "$as_dir" || eval $as_mkdir_p || {
+ as_dirs=
+ while :; do
+ case $as_dir in #(
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+ *) as_qdir=$as_dir;;
+ esac
+ as_dirs="'$as_qdir' $as_dirs"
+ as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+ eval 'as_fn_append ()
+ {
+ eval $1+=\$2
+ }'
+else
+ as_fn_append ()
+ {
+ eval $1=\$$1\$2
+ }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+ eval 'as_fn_arith ()
+ {
+ as_val=$(( $* ))
+ }'
+else
+ as_fn_arith ()
+ {
+ as_val=`expr "$@" || test $? -eq 1`
+ }
+fi # as_fn_arith
+
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with status $?, using 1 if that was 0.
+as_fn_error ()
+{
+ as_status=$?; test $as_status -eq 0 && as_status=1
+ if test "$3"; then
+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+ fi
+ $as_echo "$as_me: error: $1" >&2
+ as_fn_exit $as_status
+} # as_fn_error
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
else
as_expr=false
fi
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
as_basename=basename
else
as_basename=false
fi
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+ as_dirname=dirname
+else
+ as_dirname=false
+fi
-# Name of the executable.
-as_me=`$as_basename "$0" ||
+as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)$' \| \
- . : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
- /^X\/\(\/\/\)$/{ s//\1/; q; }
- /^X\/\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
-
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
-# PATH needs CR, and LINENO needs CR and PATH.
# Avoid depending upon Character Ranges.
as_cr_letters='abcdefghijklmnopqrstuvwxyz'
as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
@@ -83,185 +415,133 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
as_cr_digits='0123456789'
as_cr_alnum=$as_cr_Letters$as_cr_digits
-# 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
-
-
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x$as_lineno_3" = "x$as_lineno_2" || {
- # Find who we are. Look in the path if we contain no path at all
- # relative or not.
- case $0 in
- *[\\/]* ) as_myself=$0 ;;
- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
- ;;
- esac
- # We did not find ourselves, most probably we were run as `sh COMMAND'
- # in which case we are not to be found in the path.
- if test "x$as_myself" = x; then
- as_myself=$0
- fi
- if test ! -f "$as_myself"; then
- { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
- { (exit 1); exit 1; }; }
- fi
- case $CONFIG_SHELL in
- '')
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for as_base in sh bash ksh sh5; do
- case $as_dir in
- /*)
- if ("$as_dir/$as_base" -c '
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
- CONFIG_SHELL=$as_dir/$as_base
- export CONFIG_SHELL
- exec "$CONFIG_SHELL" "$0" ${1+"$@"}
- fi;;
- esac
- done
-done
-;;
- esac
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
- # uniformly replaced by the line number. The first 'sed' inserts a
- # line-number line before each line; the second 'sed' does the real
- # work. The second script uses 'N' to pair each line-number line
- # with the numbered line, and appends trailing '-' during
- # substitution so that $LINENO is not a special case at line end.
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
- sed '=' <$as_myself |
+ as_lineno_1=$LINENO as_lineno_1a=$LINENO
+ as_lineno_2=$LINENO as_lineno_2a=$LINENO
+ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-)
+ sed -n '
+ p
+ /[$]LINENO/=
+ ' <$as_myself |
sed '
+ s/[$]LINENO.*/&-/
+ t lineno
+ b
+ :lineno
N
- s,$,-,
- : loop
- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
+ :loop
+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
t loop
- s,-$,,
- s,^['$as_cr_digits']*\n,,
+ s/-\n.*//
' >$as_me.lineno &&
- chmod +x $as_me.lineno ||
- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
- { (exit 1); exit 1; }; }
+ chmod +x "$as_me.lineno" ||
+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
- # original and so on. Autoconf is especially sensible to this).
- . ./$as_me.lineno
+ # original and so on. Autoconf is especially sensitive to this).
+ . "./$as_me.lineno"
# Exit status is that of the last command.
exit
}
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
- *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T=' ' ;;
- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
- *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+ case `echo 'xy\c'` in
+ *c*) ECHO_T=' ';; # ECHO_T is single tab character.
+ xy) ECHO_C='\c';;
+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
+ ECHO_T=' ';;
+ esac;;
+*)
+ ECHO_N='-n';;
esac
-if expr a : '\(a\)' >/dev/null 2>&1; then
- as_expr=expr
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+ rm -f conf$$.dir/conf$$.file
else
- as_expr=false
+ rm -f conf$$.dir
+ mkdir conf$$.dir 2>/dev/null
fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
- # We could just check for DJGPP; but this test a) works b) is more generic
- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
- if test -f conf$$.exe; then
- # Don't use ln at all; we don't have any links
- as_ln_s='cp -p'
- else
+if (echo >conf$$.file) 2>/dev/null; then
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
as_ln_s='ln -s'
+ # ... but there are two gotchas:
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+ # In both cases, we have to default to `cp -p'.
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+ as_ln_s='cp -p'
+ elif ln conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s=ln
+ else
+ as_ln_s='cp -p'
fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
else
as_ln_s='cp -p'
fi
-rm -f conf$$ conf$$.exe conf$$.file
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
if mkdir -p . 2>/dev/null; then
- as_mkdir_p=:
+ as_mkdir_p='mkdir -p "$as_dir"'
else
+ test -d ./-p && rmdir ./-p
as_mkdir_p=false
fi
-as_executable_p="test -f"
+if test -x / >/dev/null 2>&1; then
+ as_test_x='test -x'
+else
+ if ls -dL / >/dev/null 2>&1; then
+ as_ls_L_option=L
+ else
+ as_ls_L_option=
+ fi
+ as_test_x='
+ eval sh -c '\''
+ if test -d "$1"; then
+ test -d "$1/.";
+ else
+ case $1 in #(
+ -*)set "./$1";;
+ esac;
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+ ???[sx]*):;;*)false;;esac;fi
+ '\'' sh
+ '
+fi
+as_executable_p=$as_test_x
# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
# Sed expression to map a string onto a valid variable name.
-as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
-
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" $as_nl"
-
-# CDPATH.
-$as_unset CDPATH
+exec 7<&0 </dev/null 6>&1
# Name of the host.
# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
# so uname gets run too.
ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-exec 6>&1
-
#
# Initializations.
#
ac_default_prefix=/usr/local
+ac_clean_files=
ac_config_libobj_dir=.
+LIBOBJS=
cross_compiling=no
subdirs=
MFLAGS=
MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Maximum number of lines to put in a shell here document.
-# This variable seems obsolete. It should probably be removed, and
-# only ac_max_sed_lines should be used.
-: ${ac_max_here_lines=38}
# Identity of this package.
PACKAGE_NAME=
@@ -269,51 +549,358 @@ PACKAGE_TARNAME=
PACKAGE_VERSION=
PACKAGE_STRING=
PACKAGE_BUGREPORT=
+PACKAGE_URL=
ac_unique_file="common/game.c"
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
-#if HAVE_SYS_TYPES_H
+#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
-#if HAVE_SYS_STAT_H
+#ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
#endif
-#if STDC_HEADERS
+#ifdef STDC_HEADERS
# include <stdlib.h>
# include <stddef.h>
#else
-# if HAVE_STDLIB_H
+# ifdef HAVE_STDLIB_H
# include <stdlib.h>
# endif
#endif
-#if HAVE_STRING_H
-# if !STDC_HEADERS && HAVE_MEMORY_H
+#ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
# include <memory.h>
# endif
# include <string.h>
#endif
-#if HAVE_STRINGS_H
+#ifdef HAVE_STRINGS_H
# include <strings.h>
#endif
-#if HAVE_INTTYPES_H
+#ifdef HAVE_INTTYPES_H
# include <inttypes.h>
-#else
-# if HAVE_STDINT_H
-# include <stdint.h>
-# endif
#endif
-#if HAVE_UNISTD_H
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+#ifdef HAVE_UNISTD_H
# 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_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_vars='am__EXEEXT_FALSE
+am__EXEEXT_TRUE
+LTLIBOBJS
+LIBOBJS
+CONFIGURE_DEPENDENCIES
+SERVER_LIBS
+MINGW32_FALSE
+MINGW32_TRUE
+FTWL_OPENGL_FALSE
+FTWL_OPENGL_TRUE
+FTWL_SDL_FALSE
+FTWL_SDL_TRUE
+FTWL_X11_FALSE
+FTWL_X11_TRUE
+CLIENT_GUI_FTWL_FALSE
+CLIENT_GUI_FTWL_TRUE
+CLIENT_GUI_WIN32_FALSE
+CLIENT_GUI_WIN32_TRUE
+CLIENT_GUI_STUB_FALSE
+CLIENT_GUI_STUB_TRUE
+CLIENT_GUI_BEOS_FALSE
+CLIENT_GUI_BEOS_TRUE
+CLIENT_GUI_XAW_FALSE
+CLIENT_GUI_XAW_TRUE
+CLIENT_GUI_GTK_2_0_FALSE
+CLIENT_GUI_GTK_2_0_TRUE
+CLIENT_GUI_SDL_FALSE
+CLIENT_GUI_SDL_TRUE
+AUDIO_SDL_FALSE
+AUDIO_SDL_TRUE
+VERSION_LABEL
+VERSION_WITHOUT_LABEL
+FTWL_CFLAGS
+SOUND_LIBS
+SOUND_CFLAGS
+CLIENT_LDFLAGS
+CLIENT_LIBS
+CLIENT_CXXFLAGS
+CLIENT_CFLAGS
+gui_sources
+GGZ_SERVER_FALSE
+GGZ_SERVER_TRUE
+ggzdexecmodpath
+ggzdexecmoddir
+ggzddatadir
+ggzdconfdir
+LIB_GGZDMOD
+GGZDMOD_LDFLAGS
+GGZDMOD_INCLUDES
+ggzdmod_includes
+ggzdmod_libraries
+GGZ_GTK_FALSE
+GGZ_GTK_TRUE
+GGZ_CLIENT_FALSE
+GGZ_CLIENT_TRUE
+LIB_GGZ_GTK
+GGZ_GTK_LDFLAGS
+GGZ_GTK_INCLUDES
+ggz_gtk_includes
+ggz_gtk_libraries
+packagesrcdir
+ggzmoduleconfdir
+ggz_config
+ggzdatadir
+ggzexecmoddir
+GGZ_CONFIG
+LIB_GGZMOD
+GGZMOD_LDFLAGS
+GGZMOD_INCLUDES
+ggzmod_includes
+ggzmod_libraries
+LIB_GGZ
+LIBGGZ_LDFLAGS
+LIBGGZ_INCLUDES
+libggz_includes
+libggz_libraries
+PNG_LIBS
+PNG_CFLAGS
+X_EXTRA_LIBS
+X_LIBS
+X_PRE_LIBS
+X_CFLAGS
+XMKMF
+FT2_LIBS
+FT2_CFLAGS
+FT2_CONFIG
+SDL_LIBS
+SDL_CFLAGS
+SDL_CONFIG
+GTK_LIBS
+GTK_CFLAGS
+PKG_CONFIG
+GZIP
+WINDRES
+AUTO_DEPS
+INTL_LIBTOOL_SUFFIX_PREFIX
+MKINSTALLDIRS
+GENCAT
+INSTOBJEXT
+DATADIRNAME
+POSUB
+POFILES
+INTLOBJS
+INTLLIBS
+GMOFILES
+CATOBJEXT
+CATALOGS
+USE_INCLUDED_LIBINTL
+BUILD_INCLUDED_LIBINTL
+INTLBISON
+XGETTEXT
+GMSGFMT
+MSGFMT
+USE_NLS
+GLIBC21
+ALLOCA
+LTLIBICONV
+LIBICONV
+UNAME
+AR
+RANLIB
+LN_S
+am__fastdepCXX_FALSE
+am__fastdepCXX_TRUE
+CXXDEPMODE
+ac_ct_CXX
+CXXFLAGS
+CXX
+MAKE_CLIENT_INCLUDE_FALSE
+MAKE_CLIENT_INCLUDE_TRUE
+MAKE_DATA_FALSE
+MAKE_DATA_TRUE
+FTWL_FALSE
+FTWL_TRUE
+CLIENT_FALSE
+CLIENT_TRUE
+SERVER_FALSE
+SERVER_TRUE
+AUTH_LIBS
+AUTH_CFLAGS
+MAINT
+MAINTAINER_MODE_FALSE
+MAINTAINER_MODE_TRUE
+am__fastdepCC_FALSE
+am__fastdepCC_TRUE
+CCDEPMODE
+AMDEPBACKSLASH
+AMDEP_FALSE
+AMDEP_TRUE
+am__quote
+am__include
+DEPDIR
+am__untar
+am__tar
+AMTAR
+am__leading_dot
+SET_MAKE
+AWK
+mkdir_p
+MKDIR_P
+INSTALL_STRIP_PROGRAM
+STRIP
+install_sh
+MAKEINFO
+AUTOHEADER
+AUTOMAKE
+AUTOCONF
+ACLOCAL
+VERSION
+PACKAGE
+CYGPATH_W
+am__isrc
+INSTALL_DATA
+INSTALL_SCRIPT
+INSTALL_PROGRAM
+NETWORK_CAPSTRING_OPTIONAL
+NETWORK_CAPSTRING_MANDATORY
+MINOR_VERSION
+MAJOR_VERSION
+EGREP
+GREP
+CPP
+OBJEXT
+EXEEXT
+ac_ct_CC
+CPPFLAGS
+LDFLAGS
+CFLAGS
+CC
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_URL
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL'
ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+enable_dependency_tracking
+enable_maintainer_mode
+enable_auth
+with_mysql_prefix
+enable_server
+with_readline
+enable_client
+enable_ftwl
+with_xaw
+with_xaw3d
+enable_make_data
+enable_make_include
+enable_auto_deps
+with_efence
+with_gnu_ld
+enable_rpath
+with_libiconv_prefix
+enable_nls
+with_included_gettext
+enable_debug
+enable_gtktest
+with_sdl_prefix
+with_sdl_exec_prefix
+enable_sdltest
+with_ft_prefix
+with_ft_exec_prefix
+enable_freetypetest
+with_x
+with_x_funcproto
+with_xpm_prefix
+with_xpm_lib
+with_xpm_include
+enable_sdl_mixer
+with_ggz_dir
+with_libggz_dir
+with_libggz_includes
+with_libggz_libraries
+with_ggz_client
+with_ggzmod_dir
+with_ggzmod_includes
+with_ggzmod_libraries
+with_ggzconfig
+enable_noregistry
+with_ggz_gtk_dir
+with_ggz_gtk_includes
+with_ggz_gtk_libraries
+with_ggz_server
+with_ggzdmod_dir
+with_ggzdmod_includes
+with_ggzdmod_libraries
+with_ggzd_confdir
+'
+ ac_precious_vars='build_alias
+host_alias
+target_alias
+CC
+CFLAGS
+LDFLAGS
+LIBS
+CPPFLAGS
+CPP
+CXX
+CXXFLAGS
+CCC
+XMKMF
+PKG_CONFIG
+PNG_CFLAGS
+PNG_LIBS'
+
# Initialize some variables set by options.
ac_init_help=
ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
# The variables have the same names as the options, with
# dashes changed to underlines.
cache_file=/dev/null
@@ -336,34 +923,48 @@ x_libraries=NONE
# and all the variables that are supposed to be based on exec_prefix
# by default will actually change.
# Use braces instead of parens because sh, perl, etc. also accept them.
+# (The list follows the same order as the GNU Coding Standards.)
bindir='${exec_prefix}/bin'
sbindir='${exec_prefix}/sbin'
libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
+datarootdir='${prefix}/share'
+datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
includedir='${prefix}/include'
oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
+docdir='${datarootdir}/doc/${PACKAGE}'
+infodir='${datarootdir}/info'
+htmldir='${docdir}'
+dvidir='${docdir}'
+pdfdir='${docdir}'
+psdir='${docdir}'
+libdir='${exec_prefix}/lib'
+localedir='${datarootdir}/locale'
+mandir='${datarootdir}/man'
ac_prev=
+ac_dashdash=
for ac_option
do
# If the previous option needs an argument, assign it.
if test -n "$ac_prev"; then
- eval "$ac_prev=\$ac_option"
+ eval $ac_prev=\$ac_option
ac_prev=
continue
fi
- ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
+ case $ac_option in
+ *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+ *) ac_optarg=yes ;;
+ esac
# Accept the important Cygnus configure options, so we can diagnose typos.
- case $ac_option in
+ case $ac_dashdash$ac_option in
+ --)
+ ac_dashdash=yes ;;
-bindir | --bindir | --bindi | --bind | --bin | --bi)
ac_prev=bindir ;;
@@ -385,33 +986,59 @@ do
--config-cache | -C)
cache_file=config.cache ;;
- -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
+ -datadir | --datadir | --datadi | --datad)
ac_prev=datadir ;;
- -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
- | --da=*)
+ -datadir=* | --datadir=* | --datadi=* | --datad=*)
datadir=$ac_optarg ;;
+ -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
+ | --dataroo | --dataro | --datar)
+ ac_prev=datarootdir ;;
+ -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
+ | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
+ datarootdir=$ac_optarg ;;
+
-disable-* | --disable-*)
- ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
- { (exit 1); exit 1; }; }
- ac_feature=`echo $ac_feature | sed 's/-/_/g'`
- eval "enable_$ac_feature=no" ;;
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+ as_fn_error "invalid feature name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+ *"
+"enable_$ac_useropt"
+"*) ;;
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+ ac_unrecognized_sep=', ';;
+ esac
+ eval enable_$ac_useropt=no ;;
+
+ -docdir | --docdir | --docdi | --doc | --do)
+ ac_prev=docdir ;;
+ -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
+ docdir=$ac_optarg ;;
+
+ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+ ac_prev=dvidir ;;
+ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
+ dvidir=$ac_optarg ;;
-enable-* | --enable-*)
- ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
- { (exit 1); exit 1; }; }
- ac_feature=`echo $ac_feature | sed 's/-/_/g'`
- case $ac_option in
- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
- *) ac_optarg=yes ;;
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+ as_fn_error "invalid feature name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+ *"
+"enable_$ac_useropt"
+"*) ;;
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+ ac_unrecognized_sep=', ';;
esac
- eval "enable_$ac_feature='$ac_optarg'" ;;
+ eval enable_$ac_useropt=\$ac_optarg ;;
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
| --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -438,6 +1065,12 @@ do
-host=* | --host=* | --hos=* | --ho=*)
host_alias=$ac_optarg ;;
+ -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
+ ac_prev=htmldir ;;
+ -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
+ | --ht=*)
+ htmldir=$ac_optarg ;;
+
-includedir | --includedir | --includedi | --included | --include \
| --includ | --inclu | --incl | --inc)
ac_prev=includedir ;;
@@ -462,13 +1095,16 @@ do
| --libexe=* | --libex=* | --libe=*)
libexecdir=$ac_optarg ;;
+ -localedir | --localedir | --localedi | --localed | --locale)
+ ac_prev=localedir ;;
+ -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
+ localedir=$ac_optarg ;;
+
-localstatedir | --localstatedir | --localstatedi | --localstated \
- | --localstate | --localstat | --localsta | --localst \
- | --locals | --local | --loca | --loc | --lo)
+ | --localstate | --localstat | --localsta | --localst | --locals)
ac_prev=localstatedir ;;
-localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
- | --localstate=* | --localstat=* | --localsta=* | --localst=* \
- | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
+ | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
localstatedir=$ac_optarg ;;
-mandir | --mandir | --mandi | --mand | --man | --ma | --m)
@@ -533,6 +1169,16 @@ do
| --progr-tra=* | --program-tr=* | --program-t=*)
program_transform_name=$ac_optarg ;;
+ -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
+ ac_prev=pdfdir ;;
+ -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
+ pdfdir=$ac_optarg ;;
+
+ -psdir | --psdir | --psdi | --psd | --ps)
+ ac_prev=psdir ;;
+ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
+ psdir=$ac_optarg ;;
+
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
@@ -583,26 +1229,36 @@ do
ac_init_version=: ;;
-with-* | --with-*)
- ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid package name: $ac_package" >&2
- { (exit 1); exit 1; }; }
- ac_package=`echo $ac_package| sed 's/-/_/g'`
- case $ac_option in
- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
- *) ac_optarg=yes ;;
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+ as_fn_error "invalid package name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+ *"
+"with_$ac_useropt"
+"*) ;;
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+ ac_unrecognized_sep=', ';;
esac
- eval "with_$ac_package='$ac_optarg'" ;;
+ eval with_$ac_useropt=\$ac_optarg ;;
-without-* | --without-*)
- ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid package name: $ac_package" >&2
- { (exit 1); exit 1; }; }
- ac_package=`echo $ac_package | sed 's/-/_/g'`
- eval "with_$ac_package=no" ;;
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+ as_fn_error "invalid package name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+ *"
+"with_$ac_useropt"
+"*) ;;
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+ ac_unrecognized_sep=', ';;
+ esac
+ eval with_$ac_useropt=no ;;
--x)
# Obsolete; use --with-x.
@@ -622,26 +1278,25 @@ do
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
- -*) { echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
- { (exit 1); exit 1; }; }
+ -*) as_fn_error "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information."
;;
*=*)
ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
# Reject names that are not valid shell variable names.
- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
- { (exit 1); exit 1; }; }
- ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
- eval "$ac_envvar='$ac_optarg'"
+ case $ac_envvar in #(
+ '' | [0-9]* | *[!_$as_cr_alnum]* )
+ as_fn_error "invalid variable name: \`$ac_envvar'" ;;
+ esac
+ eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
*)
# FIXME: should be removed in autoconf 3.0.
- echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
: ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
;;
@@ -650,31 +1305,36 @@ done
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
- { echo "$as_me: error: missing argument to $ac_option" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error "missing argument to $ac_option"
fi
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
-do
- eval ac_val=$`echo $ac_var`
- case $ac_val in
- [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
- { (exit 1); exit 1; }; };;
+if test -n "$ac_unrecognized_opts"; then
+ case $enable_option_checking in
+ no) ;;
+ fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
+ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
-done
+fi
-# Be sure to have absolute paths.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
- localstatedir libdir includedir oldincludedir infodir mandir
+# Check all directory arguments for consistency.
+for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
+ datadir sysconfdir sharedstatedir localstatedir includedir \
+ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+ libdir localedir mandir
do
- eval ac_val=$`echo $ac_var`
+ eval ac_val=\$$ac_var
+ # Remove trailing slashes.
+ case $ac_val in
+ */ )
+ ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+ eval $ac_var=\$ac_val;;
+ esac
+ # Be sure to have absolute directory names.
case $ac_val in
- [\\/$]* | ?:[\\/]* ) ;;
- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
- { (exit 1); exit 1; }; };;
+ [\\/$]* | ?:[\\/]* ) continue;;
+ NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
+ as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
done
# There might be people who depend on the old broken behavior: `$host'
@@ -688,7 +1348,7 @@ target=$target_alias
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
- echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+ $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
If a cross compiler is detected then cross compile mode will be used." >&2
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
@@ -701,94 +1361,72 @@ test -n "$host_alias" && ac_tool_prefix=$host_alias-
test "$silent" = yes && exec 6>/dev/null
+ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ac_ls_di=`ls -di .` &&
+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+ as_fn_error "working directory cannot be determined"
+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+ as_fn_error "pwd does not report name of working directory"
+
+
# Find the source files, if location was not specified.
if test -z "$srcdir"; then
ac_srcdir_defaulted=yes
- # Try the directory containing this script, then its parent.
- ac_confdir=`(dirname "$0") 2>/dev/null ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$0" : 'X\(//\)[^/]' \| \
- X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
-echo X"$0" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
+ # Try the directory containing this script, then the parent directory.
+ ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_myself" : 'X\(//\)[^/]' \| \
+ X"$as_myself" : 'X\(//\)$' \| \
+ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
srcdir=$ac_confdir
- if test ! -r $srcdir/$ac_unique_file; then
+ if test ! -r "$srcdir/$ac_unique_file"; then
srcdir=..
fi
else
ac_srcdir_defaulted=no
fi
-if test ! -r $srcdir/$ac_unique_file; then
- if test "$ac_srcdir_defaulted" = yes; then
- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
- { (exit 1); exit 1; }; }
- else
- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
- { (exit 1); exit 1; }; }
- fi
-fi
-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
- { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
- { (exit 1); exit 1; }; }
-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
-ac_env_build_alias_set=${build_alias+set}
-ac_env_build_alias_value=$build_alias
-ac_cv_env_build_alias_set=${build_alias+set}
-ac_cv_env_build_alias_value=$build_alias
-ac_env_host_alias_set=${host_alias+set}
-ac_env_host_alias_value=$host_alias
-ac_cv_env_host_alias_set=${host_alias+set}
-ac_cv_env_host_alias_value=$host_alias
-ac_env_target_alias_set=${target_alias+set}
-ac_env_target_alias_value=$target_alias
-ac_cv_env_target_alias_set=${target_alias+set}
-ac_cv_env_target_alias_value=$target_alias
-ac_env_CC_set=${CC+set}
-ac_env_CC_value=$CC
-ac_cv_env_CC_set=${CC+set}
-ac_cv_env_CC_value=$CC
-ac_env_CFLAGS_set=${CFLAGS+set}
-ac_env_CFLAGS_value=$CFLAGS
-ac_cv_env_CFLAGS_set=${CFLAGS+set}
-ac_cv_env_CFLAGS_value=$CFLAGS
-ac_env_LDFLAGS_set=${LDFLAGS+set}
-ac_env_LDFLAGS_value=$LDFLAGS
-ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
-ac_cv_env_LDFLAGS_value=$LDFLAGS
-ac_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_env_CPPFLAGS_value=$CPPFLAGS
-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_cv_env_CPPFLAGS_value=$CPPFLAGS
-ac_env_CPP_set=${CPP+set}
-ac_env_CPP_value=$CPP
-ac_cv_env_CPP_set=${CPP+set}
-ac_cv_env_CPP_value=$CPP
-ac_env_CXX_set=${CXX+set}
-ac_env_CXX_value=$CXX
-ac_cv_env_CXX_set=${CXX+set}
-ac_cv_env_CXX_value=$CXX
-ac_env_CXXFLAGS_set=${CXXFLAGS+set}
-ac_env_CXXFLAGS_value=$CXXFLAGS
-ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
-ac_cv_env_CXXFLAGS_value=$CXXFLAGS
-ac_env_PKG_CONFIG_set=${PKG_CONFIG+set}
-ac_env_PKG_CONFIG_value=$PKG_CONFIG
-ac_cv_env_PKG_CONFIG_set=${PKG_CONFIG+set}
-ac_cv_env_PKG_CONFIG_value=$PKG_CONFIG
-ac_env_PNG_CFLAGS_set=${PNG_CFLAGS+set}
-ac_env_PNG_CFLAGS_value=$PNG_CFLAGS
-ac_cv_env_PNG_CFLAGS_set=${PNG_CFLAGS+set}
-ac_cv_env_PNG_CFLAGS_value=$PNG_CFLAGS
-ac_env_PNG_LIBS_set=${PNG_LIBS+set}
-ac_env_PNG_LIBS_value=$PNG_LIBS
-ac_cv_env_PNG_LIBS_set=${PNG_LIBS+set}
-ac_cv_env_PNG_LIBS_value=$PNG_LIBS
+if test ! -r "$srcdir/$ac_unique_file"; then
+ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+ as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
+fi
+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ac_abs_confdir=`(
+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
+ pwd)`
+# When building in place, set srcdir=.
+if test "$ac_abs_confdir" = "$ac_pwd"; then
+ srcdir=.
+fi
+# Remove unnecessary trailing slashes from srcdir.
+# Double slashes in file names in object file debugging info
+# mess up M-x gdb in Emacs.
+case $srcdir in
+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
+esac
+for ac_var in $ac_precious_vars; do
+ eval ac_env_${ac_var}_set=\${${ac_var}+set}
+ eval ac_env_${ac_var}_value=\$${ac_var}
+ eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
+ eval ac_cv_env_${ac_var}_value=\$${ac_var}
+done
#
# Report the --help message.
@@ -817,9 +1455,6 @@ Configuration:
-n, --no-create do not create output files
--srcdir=DIR find the sources in DIR [configure dir or \`..']
-_ACEOF
-
- cat <<_ACEOF
Installation directories:
--prefix=PREFIX install architecture-independent files in PREFIX
[$ac_default_prefix]
@@ -834,18 +1469,25 @@ for instance \`--prefix=\$HOME'.
For better control, use the options below.
Fine tuning of the installation directories:
- --bindir=DIR user executables [EPREFIX/bin]
- --sbindir=DIR system admin executables [EPREFIX/sbin]
- --libexecdir=DIR program executables [EPREFIX/libexec]
- --datadir=DIR read-only architecture-independent data [PREFIX/share]
- --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
- --localstatedir=DIR modifiable single-machine data [PREFIX/var]
- --libdir=DIR object code libraries [EPREFIX/lib]
- --includedir=DIR C header files [PREFIX/include]
- --oldincludedir=DIR C header files for non-gcc [/usr/include]
- --infodir=DIR info documentation [PREFIX/info]
- --mandir=DIR man documentation [PREFIX/man]
+ --bindir=DIR user executables [EPREFIX/bin]
+ --sbindir=DIR system admin executables [EPREFIX/sbin]
+ --libexecdir=DIR program executables [EPREFIX/libexec]
+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
+ --localstatedir=DIR modifiable single-machine data [PREFIX/var]
+ --libdir=DIR object code libraries [EPREFIX/lib]
+ --includedir=DIR C header files [PREFIX/include]
+ --oldincludedir=DIR C header files for non-gcc [/usr/include]
+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
+ --infodir=DIR info documentation [DATAROOTDIR/info]
+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
+ --mandir=DIR man documentation [DATAROOTDIR/man]
+ --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE]
+ --htmldir=DIR html documentation [DOCDIR]
+ --dvidir=DIR dvi documentation [DOCDIR]
+ --pdfdir=DIR pdf documentation [DOCDIR]
+ --psdir=DIR ps documentation [DOCDIR]
_ACEOF
cat <<\_ACEOF
@@ -870,13 +1512,14 @@ if test -n "$ac_init_help"; then
cat <<\_ACEOF
Optional Features:
+ --disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --enable-maintainer-mode enable make rules and dependencies not useful
- (and sometimes confusing) to the casual installer
+ --disable-dependency-tracking speeds up one-time build
+ --enable-dependency-tracking do not reject slow dependency extractors
+ --enable-maintainer-mode enable make rules and dependencies not useful
+ (and sometimes confusing) to the casual installer
--enable-auth[=no/yes/try] compile in authentication [default=no]
- --disable-dependency-tracking Speeds up one-time builds
- --enable-dependency-tracking Do not reject slow dependency extractors
--disable-server do not compile the server
--enable-client=no/yes/xaw3d/xaw/gtk/win32/sdl/ftwl
compile a client default=yes (if yes, guess type)
@@ -894,7 +1537,7 @@ Optional Features:
--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-sdl-mixer Do not try to use the SDL mixer
+ --disable-sdl-mixer do not try to use the SDL mixer
--enable-noregistry Do not register game modules.
Optional Packages:
@@ -952,11 +1595,13 @@ Some influential environment variables:
CFLAGS C compiler flags
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
- CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have
- headers in a nonstandard directory <include dir>
+ LIBS libraries to pass to the linker, e.g. -l<library>
+ CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+ you have headers in a nonstandard directory <include dir>
CPP C preprocessor
CXX C++ compiler command
CXXFLAGS C++ compiler flags
+ XMKMF Path to xmkmf, Makefile generator for X Window System
PKG_CONFIG path to pkg-config utility
PNG_CFLAGS C compiler flags for PNG, overriding pkg-config
PNG_LIBS linker flags for PNG, overriding pkg-config
@@ -964,87 +1609,533 @@ Some influential environment variables:
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
+Report bugs to the package provider.
_ACEOF
+ac_status=$?
fi
if test "$ac_init_help" = "recursive"; then
# If there are subdirs, report their specific --help.
- ac_popdir=`pwd`
for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
- test -d $ac_dir || continue
+ test -d "$ac_dir" ||
+ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+ continue
ac_builddir=.
-if test "$ac_dir" != .; then
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
- # A "../" for each directory in $ac_dir_suffix.
- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
- ac_dir_suffix= ac_top_builddir=
-fi
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+ # A ".." for each directory in $ac_dir_suffix.
+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+ case $ac_top_builddir_sub in
+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+ esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
case $srcdir in
- .) # No --srcdir option. We are building in place.
+ .) # We are building in place.
ac_srcdir=.
- if test -z "$ac_top_builddir"; then
- ac_top_srcdir=.
- else
- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
- fi ;;
- [\\/]* | ?:[\\/]* ) # Absolute path.
+ ac_top_srcdir=$ac_top_builddir_sub
+ ac_abs_top_srcdir=$ac_pwd ;;
+ [\\/]* | ?:[\\/]* ) # Absolute name.
ac_srcdir=$srcdir$ac_dir_suffix;
- ac_top_srcdir=$srcdir ;;
- *) # Relative path.
- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
- ac_top_srcdir=$ac_top_builddir$srcdir ;;
+ ac_top_srcdir=$srcdir
+ ac_abs_top_srcdir=$srcdir ;;
+ *) # Relative name.
+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+ ac_top_srcdir=$ac_top_build_prefix$srcdir
+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
esac
-# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
-# absolute.
-ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
-ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
-ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
-ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
-
- cd $ac_dir
- # Check for guested configure; otherwise get Cygnus style configure.
- if test -f $ac_srcdir/configure.gnu; then
- echo
- $SHELL $ac_srcdir/configure.gnu --help=recursive
- elif test -f $ac_srcdir/configure; then
- echo
- $SHELL $ac_srcdir/configure --help=recursive
- elif test -f $ac_srcdir/configure.ac ||
- test -f $ac_srcdir/configure.in; then
- echo
- $ac_configure --help
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+ cd "$ac_dir" || { ac_status=$?; continue; }
+ # Check for guested configure.
+ if test -f "$ac_srcdir/configure.gnu"; then
+ echo &&
+ $SHELL "$ac_srcdir/configure.gnu" --help=recursive
+ elif test -f "$ac_srcdir/configure"; then
+ echo &&
+ $SHELL "$ac_srcdir/configure" --help=recursive
else
- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
- fi
- cd $ac_popdir
+ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+ fi || ac_status=$?
+ cd "$ac_pwd" || { ac_status=$?; break; }
done
fi
-test -n "$ac_init_help" && exit 0
+test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
+configure
+generated by GNU Autoconf 2.64
-Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
-Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
- exit 0
+ exit
fi
-exec 5>config.log
-cat >&5 <<_ACEOF
+
+## ------------------------ ##
+## Autoconf initialization. ##
+## ------------------------ ##
+
+# ac_fn_c_try_compile LINENO
+# --------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_compile ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ rm -f conftest.$ac_objext
+ if { { ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compile") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
+fi
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ return $ac_retval
+
+} # ac_fn_c_try_compile
+
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
+fi
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ return $ac_retval
+
+} # ac_fn_c_try_cpp
+
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
+# the include files in INCLUDES and setting the cache variable VAR
+# accordingly.
+ac_fn_c_check_header_mongrel ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+$as_echo_n "checking $2 usability... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_header_compiler=yes
+else
+ ac_header_compiler=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <$2>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+ ac_header_preproc=yes
+else
+ ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+ yes:no: )
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+ ;;
+esac
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+else
+ eval "$3=\$ac_header_compiler"
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+fi
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_header_mongrel
+
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_c_try_run ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if { { ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+ { { case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=$ac_status
+fi
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ return $ac_retval
+
+} # ac_fn_c_try_run
+
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ eval "$3=yes"
+else
+ eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_header_compile
+
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { { ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
+fi
+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+ # interfere with the next link command; also delete a directory that is
+ # left behind by Apple's compiler. We do this before executing the actions.
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ return $ac_retval
+
+} # ac_fn_c_try_link
+
+# ac_fn_cxx_try_compile LINENO
+# ----------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_compile ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ rm -f conftest.$ac_objext
+ if { { ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compile") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
+fi
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ return $ac_retval
+
+} # ac_fn_cxx_try_compile
+
+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
+# -------------------------------------------
+# Tests whether TYPE exists after having included INCLUDES, setting cache
+# variable VAR accordingly.
+ac_fn_c_check_type ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+else
+ eval "$3=no"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+if (sizeof ($2))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+if (sizeof (($2)))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+ eval "$3=yes"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_type
+
+# ac_fn_c_check_func LINENO FUNC VAR
+# ----------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_c_check_func ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $2 innocuous_$2
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $2 (); 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
+
+#undef $2
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $2 ();
+/* 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_$2 || defined __stub___$2
+choke me
+#endif
+
+int
+main ()
+{
+return $2 ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ eval "$3=yes"
+else
+ eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_func
+cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by $as_me, which was
-generated by GNU Autoconf 2.57. Invocation command line was
+generated by GNU Autoconf 2.64. Invocation command line was
$ $0 $@
_ACEOF
+exec 5>>config.log
{
cat <<_ASUNAME
## --------- ##
@@ -1063,7 +2154,7 @@ uname -v = `(uname -v) 2>/dev/null || echo unknown`
/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-hostinfo = `(hostinfo) 2>/dev/null || echo unknown`
+/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown`
/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
@@ -1075,8 +2166,9 @@ for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- echo "PATH: $as_dir"
-done
+ $as_echo "PATH: $as_dir"
+ done
+IFS=$as_save_IFS
} >&5
@@ -1098,7 +2190,6 @@ _ACEOF
ac_configure_args=
ac_configure_args0=
ac_configure_args1=
-ac_sep=
ac_must_keep_next=false
for ac_pass in 1 2
do
@@ -1109,43 +2200,41 @@ do
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil)
continue ;;
- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ *\'*)
+ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
+ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
2)
- ac_configure_args1="$ac_configure_args1 '$ac_arg'"
+ as_fn_append ac_configure_args1 " '$ac_arg'"
if test $ac_must_keep_next = true; then
- ac_must_keep_next=false # Got value, back to normal.
+ ac_must_keep_next=false # Got value, back to normal.
else
- case $ac_arg in
- *=* | --config-cache | -C | -disable-* | --disable-* \
- | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
- | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
- | -with-* | --with-* | -without-* | --without-* | --x)
- case "$ac_configure_args0 " in
- "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
- esac
- ;;
- -* ) ac_must_keep_next=true ;;
- esac
+ case $ac_arg in
+ *=* | --config-cache | -C | -disable-* | --disable-* \
+ | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+ | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+ | -with-* | --with-* | -without-* | --without-* | --x)
+ case "$ac_configure_args0 " in
+ "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+ esac
+ ;;
+ -* ) ac_must_keep_next=true ;;
+ esac
fi
- ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
- # Get rid of the leading space.
- ac_sep=" "
+ as_fn_append ac_configure_args " '$ac_arg'"
;;
esac
done
done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
+{ ac_configure_args0=; unset ac_configure_args0;}
+{ ac_configure_args1=; unset ac_configure_args1;}
# When interrupted or exit'd, cleanup temporary files, and complete
# config.log. We remove comments because anyway the quotes in there
# would cause problems or look ugly.
-# WARNING: Be sure not to use single quotes in there, as some shells,
-# such as our DU 5.0 friend, will then `close' the trap.
+# WARNING: Use '\'' to represent an apostrophe within the trap.
+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
trap 'exit_status=$?
# Save into config.log some information that might help in debugging.
{
@@ -1158,20 +2247,35 @@ trap 'exit_status=$?
_ASBOX
echo
# The following way of writing the cache mishandles newlines in values,
-{
+(
+ for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+ eval ac_val=\$$ac_var
+ case $ac_val in #(
+ *${as_nl}*)
+ case $ac_var in #(
+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+ esac
+ case $ac_var in #(
+ _ | IFS | as_nl) ;; #(
+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+ *) { eval $ac_var=; unset $ac_var;} ;;
+ esac ;;
+ esac
+ done
(set) 2>&1 |
- case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
- *ac_space=\ *)
+ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+ *${as_nl}ac_space=\ *)
sed -n \
- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
- ;;
+ "s/'\''/'\''\\\\'\'''\''/g;
+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+ ;; #(
*)
- sed -n \
- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
;;
- esac;
-}
+ esac |
+ sort
+)
echo
cat <<\_ASBOX
@@ -1182,22 +2286,28 @@ _ASBOX
echo
for ac_var in $ac_subst_vars
do
- eval ac_val=$`echo $ac_var`
- echo "$ac_var='"'"'$ac_val'"'"'"
+ eval ac_val=\$$ac_var
+ case $ac_val in
+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ esac
+ $as_echo "$ac_var='\''$ac_val'\''"
done | sort
echo
if test -n "$ac_subst_files"; then
cat <<\_ASBOX
-## ------------- ##
-## Output files. ##
-## ------------- ##
+## ------------------- ##
+## File substitutions. ##
+## ------------------- ##
_ASBOX
echo
for ac_var in $ac_subst_files
do
- eval ac_val=$`echo $ac_var`
- echo "$ac_var='"'"'$ac_val'"'"'"
+ eval ac_val=\$$ac_var
+ case $ac_val in
+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ esac
+ $as_echo "$ac_var='\''$ac_val'\''"
done | sort
echo
fi
@@ -1209,26 +2319,26 @@ _ASBOX
## ----------- ##
_ASBOX
echo
- sed "/^$/d" confdefs.h | sort
+ cat confdefs.h
echo
fi
test "$ac_signal" != 0 &&
- echo "$as_me: caught signal $ac_signal"
- echo "$as_me: exit $exit_status"
+ $as_echo "$as_me: caught signal $ac_signal"
+ $as_echo "$as_me: exit $exit_status"
} >&5
- rm -f core core.* *.core &&
- rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
+ rm -f core *.core core.conftest.* &&
+ rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
exit $exit_status
- ' 0
+' 0
for ac_signal in 1 2 13 15; do
- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
done
ac_signal=0
# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo >confdefs.h
+rm -f -r conftest* confdefs.h
+
+$as_echo "/* confdefs.h */" > confdefs.h
# Predefined preprocessor variables.
@@ -1236,40 +2346,46 @@ cat >>confdefs.h <<_ACEOF
#define PACKAGE_NAME "$PACKAGE_NAME"
_ACEOF
-
cat >>confdefs.h <<_ACEOF
#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
_ACEOF
-
cat >>confdefs.h <<_ACEOF
#define PACKAGE_VERSION "$PACKAGE_VERSION"
_ACEOF
-
cat >>confdefs.h <<_ACEOF
#define PACKAGE_STRING "$PACKAGE_STRING"
_ACEOF
-
cat >>confdefs.h <<_ACEOF
#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
_ACEOF
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
+
# Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
- if test "x$prefix" != xNONE; then
- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
- else
- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
- fi
-fi
-for ac_site_file in $CONFIG_SITE; do
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
+if test -n "$CONFIG_SITE"; then
+ ac_site_file1=$CONFIG_SITE
+elif test "x$prefix" != xNONE; then
+ ac_site_file1=$prefix/share/config.site
+ ac_site_file2=$prefix/etc/config.site
+else
+ ac_site_file1=$ac_default_prefix/share/config.site
+ ac_site_file2=$ac_default_prefix/etc/config.site
+fi
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+do
+ test "x$ac_site_file" = xNONE && continue
if test -r "$ac_site_file"; then
- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
. "$ac_site_file"
fi
@@ -1279,69 +2395,79 @@ if test -r "$cache_file"; then
# Some versions of bash will fail to source /dev/null (special
# files actually), so we avoid doing that.
if test -f "$cache_file"; then
- { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
- [\\/]* | ?:[\\/]* ) . $cache_file;;
- *) . ./$cache_file;;
+ [\\/]* | ?:[\\/]* ) . "$cache_file";;
+ *) . "./$cache_file";;
esac
fi
else
- { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
# Check that the precious variables saved in the cache have kept the same
# value.
ac_cache_corrupted=false
-for ac_var in `(set) 2>&1 |
- sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
+for ac_var in $ac_precious_vars; do
eval ac_old_set=\$ac_cv_env_${ac_var}_set
eval ac_new_set=\$ac_env_${ac_var}_set
- eval ac_old_val="\$ac_cv_env_${ac_var}_value"
- eval ac_new_val="\$ac_env_${ac_var}_value"
+ eval ac_old_val=\$ac_cv_env_${ac_var}_value
+ eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
- { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
ac_cache_corrupted=: ;;
,set)
- { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
*)
if test "x$ac_old_val" != "x$ac_new_val"; then
- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
-echo "$as_me: former value: $ac_old_val" >&2;}
- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
-echo "$as_me: current value: $ac_new_val" >&2;}
- ac_cache_corrupted=:
+ # differences in whitespace do not lead to failure.
+ ac_old_val_w=`echo x $ac_old_val`
+ ac_new_val_w=`echo x $ac_new_val`
+ if test "$ac_old_val_w" != "$ac_new_val_w"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+ ac_cache_corrupted=:
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+ eval $ac_var=\$ac_old_val
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5
+$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5
+$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
# Pass precious variables to config.status.
if test "$ac_new_set" = set; then
case $ac_new_val in
- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
- ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+ *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
*) ac_arg=$ac_var=$ac_new_val ;;
esac
case " $ac_configure_args " in
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+ *) as_fn_append ac_configure_args " '$ac_arg'" ;;
esac
fi
done
if $ac_cache_corrupted; then
- { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
- { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
- { (exit 1); exit 1; }; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+ as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
fi
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -1352,698 +2478,100 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
ac_aux_dir=
-for ac_dir in bootstrap $srcdir/bootstrap; do
- if test -f $ac_dir/install-sh; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install-sh -c"
- break
- elif test -f $ac_dir/install.sh; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install.sh -c"
- break
- elif test -f $ac_dir/shtool; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/shtool install -c"
- break
- fi
+for ac_dir in bootstrap "$srcdir"/bootstrap; do
+ for ac_t in install-sh install.sh shtool; do
+ if test -f "$ac_dir/$ac_t"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/$ac_t -c"
+ break 2
+ fi
+ done
done
if test -z "$ac_aux_dir"; then
- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in bootstrap $srcdir/bootstrap" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in bootstrap $srcdir/bootstrap" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "cannot find install-sh, install.sh, or shtool in bootstrap \"$srcdir\"/bootstrap" "$LINENO" 5
fi
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
- # This can't be quoted or automake will fail
-# Add the stamp file to the list of files AC keeps track of,
-# along with our hook.
- ac_config_headers="$ac_config_headers config.h"
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
+ # This can't be quoted or automake will fail
+ac_config_headers="$ac_config_headers config.h"
# Make sure we can run config.sub.
-$ac_config_sub sun4 >/dev/null 2>&1 ||
- { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
- { (exit 1); exit 1; }; }
-
-echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6
-if test "${ac_cv_build+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_build_alias=$build_alias
-test -z "$ac_cv_build_alias" &&
- ac_cv_build_alias=`$ac_config_guess`
-test -z "$ac_cv_build_alias" &&
- { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
- { (exit 1); exit 1; }; }
-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
- { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6
-build=$ac_cv_build
-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6
-if test "${ac_cv_host+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_host_alias=$host_alias
-test -z "$ac_cv_host_alias" &&
- ac_cv_host_alias=$ac_cv_build_alias
-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
- { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6
-host=$ac_cv_host
-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-
-cat >>confdefs.h <<\_ACEOF
-#define _GNU_SOURCE 1
-_ACEOF
-
-
-
-PACKAGE=freeciv
-
-
-cat >>confdefs.h <<\_ACEOF
-#define FC_CONFIG_H 1
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define BUG_URL "http://bugs.freeciv.org/"
-_ACEOF
-
-
-#
-# These macros are used in version.in and they just set
-# version information to form understandable for configure.ac and
-# configure.in. Other systems define these macros differently
-# before reading version.in and thus get version information
-# in different form.
-#
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- MAJOR_VERSION="2"
- MINOR_VERSION="1"
- PATCH_VERSION="9"
- VERSION_LABEL=""""
-
-
-IS_DEVEL_VERSION=0
-IS_BETA_VERSION=0
-
-NEXT_STABLE_VERSION="2.1.10"
-RELEASE_MONTH=5
-
-# Freeciv network capstring: see documentation in common/capstr.c
-#
-# "+2.1g" is the base capability string.
-#
-# - No new manditory capabilities can be added to the release branch; doing
-# so would break network capability of supposedly "compatible" releases.
-#
-# - 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_MANDATORY="+2.1g"
- NETWORK_CAPSTRING_OPTIONAL="CreatedName"
-
-
-
-VERSION_WITHOUT_LABEL=${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}
-VERSION=${VERSION_WITHOUT_LABEL}${VERSION_LABEL}
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define MAJOR_VERSION $MAJOR_VERSION
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define MINOR_VERSION $MINOR_VERSION
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PATCH_VERSION $PATCH_VERSION
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define VERSION_LABEL "${VERSION_LABEL}"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define VERSION_STRING "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}${VERSION_LABEL}"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define IS_DEVEL_VERSION $IS_DEVEL_VERSION
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define IS_BETA_VERSION $IS_BETA_VERSION
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define NEXT_STABLE_VERSION "$NEXT_STABLE_VERSION"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define RELEASE_MONTH $RELEASE_MONTH
-_ACEOF
-
-
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define NETWORK_CAPSTRING_MANDATORY "$NETWORK_CAPSTRING_MANDATORY"
-_ACEOF
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define NETWORK_CAPSTRING_OPTIONAL "$NETWORK_CAPSTRING_OPTIONAL"
-_ACEOF
-
-
-
-am__api_version="1.6"
-# Find a good install program. We prefer a C program (faster),
-# so one script is as good as another. But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
- ./ | .// | /cC/* | \
- /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
- /usr/ucb/* ) ;;
- *)
- # OSF1 and SCO ODT 3.0 have their own names for install.
- # Don't use installbsd from OSF since it installs stuff as root
- # by default.
- for ac_prog in ginstall scoinst install; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
- if test $ac_prog = install &&
- grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
- # AIX install. It has an incompatible calling convention.
- :
- elif test $ac_prog = install &&
- grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
- # program-specific install script used by HP pwplus--don't use.
- :
- else
- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
- break 3
- fi
- fi
- done
- done
- ;;
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+ as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if test "${ac_cv_build+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+ as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+ as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
esac
-done
-
-
-fi
- if test "${ac_cv_path_install+set}" = set; then
- INSTALL=$ac_cv_path_install
- else
- # As a last resort, use the slow shell script. We don't cache a
- # path for INSTALL within a source directory, because that will
- # break other packages using the cache if that directory is
- # removed, or if the path is relative.
- INSTALL=$ac_install_sh
- fi
-fi
-echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments. Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
- if test "$*" = "X"; then
- # -L didn't work.
- set X `ls -t $srcdir/configure conftest.file`
- fi
- rm -f conftest.file
- if test "$*" != "X $srcdir/configure conftest.file" \
- && test "$*" != "X conftest.file $srcdir/configure"; then
-
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
-alias in your environment" >&5
-echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
-alias in your environment" >&2;}
- { (exit 1); exit 1; }; }
- fi
-
- test "$2" = conftest.file
- )
-then
- # Ok.
- :
-else
- { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
-Check your system clock" >&5
-echo "$as_me: error: newly created file is older than distributed files!
-Check your system clock" >&2;}
- { (exit 1); exit 1; }; }
-fi
-echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-test "$program_prefix" != NONE &&
- program_transform_name="s,^,$program_prefix,;$program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
- program_transform_name="s,\$,$program_suffix,;$program_transform_name"
-# Double any \ or $. echo might interpret backslashes.
-# By default was `s,x,x', remove it if useless.
-cat <<\_ACEOF >conftest.sed
-s/[\\$]/&&/g;s/;s,x,x,$//
-_ACEOF
-program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
-rm conftest.sed
-
-
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
- am_missing_run="$MISSING --run "
-else
- am_missing_run=
- { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
-echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
-fi
-
-for ac_prog in gawk mawk nawk awk
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; 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_prog_AWK+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$AWK"; then
- ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-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_prog_AWK="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
- echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
- test -n "$AWK" && break
-done
-
-echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.make <<\_ACEOF
-all:
- @echo 'ac_maketemp="$(MAKE)"'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
- eval ac_cv_prog_make_${ac_make}_set=yes
-else
- eval ac_cv_prog_make_${ac_make}_set=no
-fi
-rm -f conftest.make
-fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- SET_MAKE=
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- SET_MAKE="MAKE=${MAKE-make}"
-fi
-
- # test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
- test -f $srcdir/config.status; then
- { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
- { (exit 1); exit 1; }; }
-fi
-
-# Define the identity of the package.
- PACKAGE=$PACKAGE
- VERSION=$VERSION
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE "$PACKAGE"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define VERSION "$VERSION"
-_ACEOF
-
-# Some tools Automake needs.
-
-ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
-
-
-AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-
-
-AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
-
-
-AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-
-
-MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-
-
-AMTAR=${AMTAR-"${am_missing_run}tar"}
-
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
-
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'. However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-if test "$cross_compiling" != no; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; 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_prog_STRIP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$STRIP"; then
- ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-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_prog_STRIP="${ac_tool_prefix}strip"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
- echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
- ac_ct_STRIP=$STRIP
- # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; 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_prog_ac_ct_STRIP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$ac_ct_STRIP"; then
- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-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_prog_ac_ct_STRIP="strip"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-
- test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
- echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
- STRIP=$ac_ct_STRIP
-else
- STRIP="$ac_cv_prog_STRIP"
-fi
-
-fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
-
-
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
-echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
- # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then
- enableval="$enable_maintainer_mode"
- USE_MAINTAINER_MODE=$enableval
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if test "${ac_cv_host+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- USE_MAINTAINER_MODE=no
-fi;
- echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6
-
-
-if test $USE_MAINTAINER_MODE = yes; then
- MAINTAINER_MODE_TRUE=
- MAINTAINER_MODE_FALSE='#'
+ if test "x$host_alias" = x; then
+ ac_cv_host=$ac_cv_build
else
- MAINTAINER_MODE_TRUE='#'
- MAINTAINER_MODE_FALSE=
+ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+ as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
fi
- MAINT=$MAINTAINER_MODE_TRUE
-
-
-
-rm -f .deps 2>/dev/null
-mkdir .deps 2>/dev/null
-if test -d .deps; then
- DEPDIR=.deps
-else
- # MS-DOS does not allow filenames that begin with a dot.
- DEPDIR=_deps
fi
-rmdir .deps 2>/dev/null
-
-
- ac_config_commands="$ac_config_commands depfiles"
-
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
-doit:
- @echo done
-END
-# If we don't find an include directive, just comment out the code.
-echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then
- am__include=include
- am__quote=
- _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
- am__include=.include
- am__quote="\""
- _am_result=BSD
- fi
-fi
-
-
-echo "$as_me:$LINENO: result: $_am_result" >&5
-echo "${ECHO_T}$_am_result" >&6
-rm -f confinc confmf
-
-# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then
- enableval="$enable_dependency_tracking"
-
-fi;
-if test "x$enable_dependency_tracking" != xno; then
- am_depcomp="$ac_aux_dir/depcomp"
- AMDEPBACKSLASH='\'
-fi
-
-
-if test "x$enable_dependency_tracking" != xno; then
- AMDEP_TRUE=
- AMDEP_FALSE='#'
-else
- AMDEP_TRUE='#'
- AMDEP_FALSE=
-fi
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
ac_ext=c
@@ -2054,10 +2582,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; 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_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2067,35 +2595,37 @@ 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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
+IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
+
fi
if test -z "$ac_cv_prog_CC"; then
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; 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_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -2105,39 +2635,50 @@ 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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="gcc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
+IFS=$as_save_IFS
fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
- CC=$ac_ct_CC
+ if test "x$ac_ct_CC" = x; then
+ CC=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ CC=$ac_ct_CC
+ fi
else
CC="$ac_cv_prog_CC"
fi
if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; 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_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2147,77 +2688,37 @@ 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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
+IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
-fi
-if test -z "$ac_cv_prog_CC"; then
- ac_ct_CC=$CC
- # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; 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_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-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_prog_ac_ct_CC="cc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
- CC=$ac_ct_CC
-else
- CC="$ac_cv_prog_CC"
-fi
+ fi
fi
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; 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_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2228,18 +2729,19 @@ 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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
fi
ac_cv_prog_CC="cc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
+IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
# We found a bogon in the path, so make sure we never use it.
@@ -2257,24 +2759,25 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
+
fi
if test -z "$CC"; then
if test -n "$ac_tool_prefix"; then
- for ac_prog in cl
+ for ac_prog in cl.exe
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; 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_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2284,39 +2787,41 @@ 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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
+IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
+
test -n "$CC" && break
done
fi
if test -z "$CC"; then
ac_ct_CC=$CC
- for ac_prog in cl
+ for ac_prog in cl.exe
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; 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_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -2326,184 +2831,227 @@ 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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
+IFS=$as_save_IFS
fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
+
test -n "$ac_ct_CC" && break
done
- CC=$ac_ct_CC
+ if test "x$ac_ct_CC" = x; then
+ CC=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ CC=$ac_ct_CC
+ fi
fi
fi
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "no acceptable C compiler found in \$PATH
+See \`config.log' for more details." "$LINENO" 5; }
# Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
- "checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
- (eval $ac_compiler --version </dev/null >&5) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
- (eval $ac_compiler -v </dev/null >&5) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
- (eval $ac_compiler -V </dev/null >&5) 2>&5
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+ { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
+ if test -s conftest.err; then
+ sed '10a\
+... rest of stderr output deleted ...
+ 10q' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ rm -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+done
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
+#include <stdio.h>
int
main ()
{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
;
return 0;
}
_ACEOF
ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
-echo "$as_me:$LINENO: checking for C compiler default output" >&5
-echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
- (eval $ac_link_default) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- # Find the output, starting from the most likely. This scheme is
-# not robust to junk in `.', hence go to wildcards (a.*) only as a last
-# resort.
-
-# Be careful to initialize this variable, since it used to be cached.
-# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
-ac_cv_exeext=
-# b.out is created by i960 compilers.
-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
+ac_rmfiles=
+for ac_file in $ac_files
+do
+ case $ac_file in
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+ * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+ esac
+done
+rm -f $ac_rmfiles
+
+if { { ac_try="$ac_link_default"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link_default") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then :
+ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+# in a Makefile. We should not override ac_cv_exeext if it was cached,
+# so that the user can short-circuit this test for compilers unknown to
+# Autoconf.
+for ac_file in $ac_files ''
do
test -f "$ac_file" || continue
case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
- ;;
- conftest.$ac_ext )
- # This is the source file.
- ;;
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
+ ;;
[ab].out )
- # We found the default executable, but exeext='' is most
- # certainly right.
- break;;
+ # We found the default executable, but exeext='' is most
+ # certainly right.
+ break;;
*.* )
- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
- # FIXME: I believe we export ac_cv_exeext for Libtool,
- # but it would be cool to find out if it's true. Does anybody
- # maintain Libtool? --akim.
- export ac_cv_exeext
- break;;
+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+ then :; else
+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+ fi
+ # We set ac_cv_exeext here because the later test for it is not
+ # safe: cross compilers may not add the suffix if given an `-o'
+ # argument, so we may need to know it at that point already.
+ # Even if this section looks crufty: it has the advantage of
+ # actually working.
+ break;;
* )
- break;;
+ break;;
esac
done
+test "$ac_cv_exeext" = no && ac_cv_exeext=
+
else
- echo "$as_me: failed program was:" >&5
+ ac_file=''
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
+if test -z "$ac_file"; then :
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ as_fn_set_status 77
+as_fn_error "C compiler cannot create executables
+See \`config.log' for more details." "$LINENO" 5; }; }
fi
-
ac_exeext=$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6
-# Check the compiler produces executables we can run. If not, either
+# Check that the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
# If not cross compiling, check that we can run a simple program.
if test "$cross_compiling" != yes; then
if { ac_try='./$ac_file'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
+ { { case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_try") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; }; then
cross_compiling=no
else
if test "$cross_compiling" = maybe; then
cross_compiling=yes
else
- { { echo "$as_me:$LINENO: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "cannot run C compiled programs.
If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+See \`config.log' for more details." "$LINENO" 5; }
fi
fi
fi
-echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
ac_clean_files=$ac_clean_files_save
-# Check the compiler produces executables we can run. If not, either
+# Check that the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6
-
-echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
+if { { ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then :
# If both `conftest.exe' and `conftest' are `present' (well, observable)
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
# work properly (i.e., refer to `conftest.exe'), while it won't with
@@ -2511,39 +3059,31 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
for ac_file in conftest.exe conftest conftest.*; do
test -f "$ac_file" || continue
case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
*.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
- export ac_cv_exeext
- break;;
+ break;;
* ) break;;
esac
done
else
- { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." "$LINENO" 5; }
fi
-
rm -f conftest$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
rm -f conftest.$ac_ext
EXEEXT=$ac_cv_exeext
ac_exeext=$EXEEXT
-echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
-if test "${ac_cv_objext+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
+if test "${ac_cv_objext+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -2555,46 +3095,46 @@ main ()
}
_ACEOF
rm -f conftest.o conftest.obj
-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); }; then
- for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
+if { { ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compile") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then :
+ for ac_file in conftest.o conftest.obj conftest.*; do
+ test -f "$ac_file" || continue;
case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
*) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
break;;
esac
done
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." "$LINENO" 5; }
fi
-
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
OBJEXT=$ac_cv_objext
ac_objext=$OBJEXT
-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -2608,46 +3148,34 @@ main ()
return 0;
}
_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
+if ac_fn_c_try_compile "$LINENO"; then :
ac_compiler_gnu=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_compiler_gnu=no
+ ac_compiler_gnu=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
-GCC=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+ GCC=yes
+else
+ GCC=
+fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
-CFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_g+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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if test "${ac_cv_prog_cc_g+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_save_c_werror_flag=$ac_c_werror_flag
+ ac_c_werror_flag=yes
+ ac_cv_prog_cc_g=no
+ CFLAGS="-g"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -2658,29 +3186,49 @@ main ()
return 0;
}
_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
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_prog_cc_g=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ CFLAGS=""
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
-ac_cv_prog_cc_g=no
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+ ac_c_werror_flag=$ac_save_c_werror_flag
+ CFLAGS="-g"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_prog_cc_g=yes
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
elif test $ac_cv_prog_cc_g = yes; then
@@ -2696,19 +3244,14 @@ else
CFLAGS=
fi
fi
-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_stdc+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- ac_cv_prog_cc_stdc=no
+ ac_cv_prog_cc_c89=no
ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
@@ -2732,6 +3275,21 @@ static char *f (char * (*g) (char **, int), char **p, ...)
va_end (v);
return s;
}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
+ function prototypes and stuff, but not '\xHH' hex character constants.
+ These don't provoke an error unfortunately, instead are silently treated
+ as 'x'. The following induces an error, until -std is added to get
+ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
+ array size at least. It's necessary to write '\x00'==0 to get something
+ that's true only with -std. */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+ inside strings and character constants. */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
int test (int i, double x);
struct s1 {int (*f) (int a);};
struct s2 {int (*f) (double a);};
@@ -2746,258 +3304,58 @@ return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
return 0;
}
_ACEOF
-# Don't try gcc -ansi; that turns off useful extensions and
-# breaks some systems' header files.
-# AIX -qlanglvl=ansi
-# Ultrix and OSF/1 -std1
-# HP-UX 10.20 and later -Ae
-# HP-UX older versions -Aa -D_HPUX_SOURCE
-# SVR4 -Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
- 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
- ac_cv_prog_cc_stdc=$ac_arg
-break
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+ if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_prog_cc_c89=$ac_arg
fi
-rm -f conftest.$ac_objext
+rm -f core conftest.err conftest.$ac_objext
+ test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-rm -f conftest.$ac_ext conftest.$ac_objext
+rm -f conftest.$ac_ext
CC=$ac_save_CC
fi
-
-case "x$ac_cv_prog_cc_stdc" in
- x|xno)
- echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6 ;;
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+ x)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+ xno)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
*)
- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
- CC="$CC $ac_cv_prog_cc_stdc" ;;
+ CC="$CC $ac_cv_prog_cc_c89"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
-# Some people use a C++ compiler to compile C. Since we use `exit',
-# in C++ we need to declare it. In case someone uses the same compiler
-# for both compiling C and C++ we need to have the C++ compiler decide
-# the declaration of exit, since it's the most demanding environment.
-cat >conftest.$ac_ext <<_ACEOF
-#ifndef __cplusplus
- choke me
-#endif
-_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
- for ac_declaration in \
- ''\
- '#include <stdlib.h>' \
- 'extern "C" void std::exit (int) throw (); using std::exit;' \
- 'extern "C" void std::exit (int); using std::exit;' \
- 'extern "C" void exit (int) throw ();' \
- 'extern "C" void exit (int);' \
- 'void exit (int);'
-do
- 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 <stdlib.h>
-$ac_declaration
-int
-main ()
-{
-exit (42);
- ;
- return 0;
-}
-_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
- :
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-continue
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
- 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. */
-$ac_declaration
-int
-main ()
-{
-exit (42);
- ;
- return 0;
-}
-_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
- break
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
- echo '#ifdef __cplusplus' >>confdefs.h
- echo $ac_declaration >>confdefs.h
- echo '#endif' >>confdefs.h
fi
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
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
-depcc="$CC" am_compiler_list=
-
-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
- # We make a subdir and do the tests there. Otherwise we can end up
- # making bogus files that we don't know about and never remove. For
- # instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
- mkdir conftest.dir
- # Copy depcomp to subdir because otherwise we won't find it if we're
- # using a relative directory.
- cp "$am_depcomp" conftest.dir
- cd conftest.dir
-
- am_cv_CC_dependencies_compiler_type=none
- if test "$am_compiler_list" = ""; then
- am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
- fi
- for depmode in $am_compiler_list; do
- # We need to recreate these files for each test, as the compiler may
- # overwrite some of them when testing with obscure command lines.
- # This happens at least with the AIX C compiler.
- echo '#include "conftest.h"' > conftest.c
- echo 'int i;' > conftest.h
- echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
-
- case $depmode in
- nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
- if test "x$enable_dependency_tracking" = xyes; then
- continue
- else
- break
- fi
- ;;
- none) break ;;
- esac
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this.
- if depmode=$depmode \
- source=conftest.c object=conftest.o \
- depfile=conftest.Po tmpdepfile=conftest.TPo \
- $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
- grep conftest.h conftest.Po > /dev/null 2>&1 &&
- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
- am_cv_CC_dependencies_compiler_type=$depmode
- break
- fi
- done
-
- cd ..
- rm -rf conftest.dir
-else
- am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
-
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
-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
fi
if test -z "$CPP"; then
- if test "${ac_cv_prog_CPP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ if test "${ac_cv_prog_CPP+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
@@ -3011,81 +3369,33 @@ do
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
#else
# include <assert.h>
#endif
- Syntax error
+ Syntax error
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- :
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
+else
# Broken: fails on valid input.
continue
fi
rm -f conftest.err conftest.$ac_ext
- # OK, works on sane cases. Now check whether non-existent headers
+ # OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+if ac_fn_c_try_cpp "$LINENO"; then :
# Broken: success on invalid input.
continue
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
# Passes both tests.
ac_preproc_ok=:
break
@@ -3095,7 +3405,7 @@ rm -f conftest.err conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
+if $ac_preproc_ok; then :
break
fi
@@ -3107,8 +3417,8 @@ fi
else
ac_cv_prog_CPP=$CPP
fi
-echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
do
@@ -3118,81 +3428,33 @@ do
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
#else
# include <assert.h>
#endif
- Syntax error
+ Syntax error
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- :
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
+else
# Broken: fails on valid input.
continue
fi
rm -f conftest.err conftest.$ac_ext
- # OK, works on sane cases. Now check whether non-existent headers
+ # OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+if ac_fn_c_try_cpp "$LINENO"; then :
# Broken: success on invalid input.
continue
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
# Passes both tests.
ac_preproc_ok=:
break
@@ -3202,14 +3464,13 @@ rm -f conftest.err conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
- :
+if $ac_preproc_ok; then :
+
else
- { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." "$LINENO" 5; }
fi
ac_ext=c
@@ -3219,32 +3480,142 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
-if test "${ac_cv_prog_egrep+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+if test "${ac_cv_path_GREP+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- if echo a | (grep -E '(a|b)') >/dev/null 2>&1
- then ac_cv_prog_egrep='grep -E'
- else ac_cv_prog_egrep='egrep'
+ if test -z "$GREP"; then
+ ac_path_GREP_found=false
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in grep ggrep; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+# Check for GNU ac_path_GREP and select it if it is found.
+ # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in
+*GNU*)
+ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+*)
+ ac_count=0
+ $as_echo_n 0123456789 >"conftest.in"
+ while :
+ do
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
+ mv "conftest.tmp" "conftest.in"
+ cp "conftest.in" "conftest.nl"
+ $as_echo 'GREP' >> "conftest.nl"
+ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
+ if test $ac_count -gt ${ac_path_GREP_max-0}; then
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_GREP="$ac_path_GREP"
+ ac_path_GREP_max=$ac_count
fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+ $ac_path_GREP_found && break 3
+ done
+ done
+ done
+IFS=$as_save_IFS
+ if test -z "$ac_cv_path_GREP"; then
+ as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ fi
+else
+ ac_cv_path_GREP=$GREP
fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
- EGREP=$ac_cv_prog_egrep
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
-if test "${ac_cv_header_stdc+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
+if test "${ac_cv_path_EGREP+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+ then ac_cv_path_EGREP="$GREP -E"
+ else
+ if test -z "$EGREP"; then
+ ac_path_EGREP_found=false
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in egrep; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
+ # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+ ac_count=0
+ $as_echo_n 0123456789 >"conftest.in"
+ while :
+ do
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
+ mv "conftest.tmp" "conftest.in"
+ cp "conftest.in" "conftest.nl"
+ $as_echo 'EGREP' >> "conftest.nl"
+ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
+ if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_EGREP="$ac_path_EGREP"
+ ac_path_EGREP_max=$ac_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+ $ac_path_EGREP_found && break 3
+ done
+ done
+ done
+IFS=$as_save_IFS
+ if test -z "$ac_cv_path_EGREP"; then
+ as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ fi
+else
+ ac_cv_path_EGREP=$EGREP
+fi
+
+ fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if test "${ac_cv_header_stdc+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
@@ -3259,42 +3630,23 @@ main ()
return 0;
}
_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
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_header_stdc=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_header_stdc=no
+ ac_cv_header_stdc=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <string.h>
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "memchr" >/dev/null 2>&1; then
- :
+ $EGREP "memchr" >/dev/null 2>&1; then :
+
else
ac_cv_header_stdc=no
fi
@@ -3304,19 +3656,14 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdlib.h>
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "free" >/dev/null 2>&1; then
- :
+ $EGREP "free" >/dev/null 2>&1; then :
+
else
ac_cv_header_stdc=no
fi
@@ -3326,25 +3673,21 @@ fi
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
:
else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <ctype.h>
+#include <stdlib.h>
#if ((' ' & 0x0FF) == 0x020)
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
#else
# define ISLOWER(c) \
- (('a' <= (c) && (c) <= 'i') \
- || ('j' <= (c) && (c) <= 'r') \
- || ('s' <= (c) && (c) <= 'z'))
+ (('a' <= (c) && (c) <= 'i') \
+ || ('j' <= (c) && (c) <= 'r') \
+ || ('s' <= (c) && (c) <= 'z'))
# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
#endif
@@ -3355,336 +3698,1010 @@ main ()
int i;
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
- || toupper (i) != TOUPPER (i))
- exit(2);
- exit (0);
+ || toupper (i) != TOUPPER (i))
+ return 2;
+ 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
- :
-else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_run "$LINENO"; then :
-( exit $ac_status )
-ac_cv_header_stdc=no
+else
+ ac_cv_header_stdc=no
fi
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
+
fi
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
if test $ac_cv_header_stdc = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
fi
# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+ inttypes.h stdint.h unistd.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+ ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
+if test "x$ac_cv_header_minix_config_h" = x""yes; then :
+ MINIX=yes
+else
+ MINIX=
+fi
+ if test "$MINIX" = yes; then
+$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
- inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+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
+$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h
+
+
+$as_echo "#define _MINIX 1" >>confdefs.h
+
+ fi
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
+$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
+if test "${ac_cv_safe_to_define___extensions__+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
+# define __EXTENSIONS__ 1
+ $ac_includes_default
+int
+main ()
+{
+
+ ;
+ return 0;
+}
_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
- eval "$as_ac_Header=yes"
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_safe_to_define___extensions__=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_Header=no"
+ ac_cv_safe_to_define___extensions__=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
+$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
+ test $ac_cv_safe_to_define___extensions__ = yes &&
+ $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
+
+ $as_echo "#define _ALL_SOURCE 1" >>confdefs.h
+
+ $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
+
+ $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
+
+ $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
+
+
+
+
+PACKAGE=freeciv
+
+
+$as_echo "#define FC_CONFIG_H 1" >>confdefs.h
+
+
+$as_echo "#define BUG_URL \"https://gna.org/projects/freeciv/\"" >>confdefs.h
+
+
+#
+# These macros are used in version.in and they just set
+# version information to form understandable for configure.ac and
+# configure.in. Other systems define these macros differently
+# before reading version.in and thus get version information
+# in different form.
+#
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ MAJOR_VERSION="2"
+ MINOR_VERSION="1"
+ PATCH_VERSION="10"
+ VERSION_LABEL=""""
+
+
+IS_DEVEL_VERSION=0
+IS_BETA_VERSION=0
+
+NEXT_STABLE_VERSION="2.1.11"
+RELEASE_MONTH=5
+
+# Freeciv network capstring: see documentation in common/capstr.c
+#
+# "+2.1g" is the base capability string.
+#
+# - No new manditory capabilities can be added to the release branch; doing
+# so would break network capability of supposedly "compatible" releases.
+#
+# - 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_MANDATORY="+2.1g"
+ NETWORK_CAPSTRING_OPTIONAL="CreatedName voteinfo KeepSavedSetting"
+
+
+
+VERSION_WITHOUT_LABEL=${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}
+VERSION=${VERSION_WITHOUT_LABEL}${VERSION_LABEL}
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define MAJOR_VERSION $MAJOR_VERSION
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define MINOR_VERSION $MINOR_VERSION
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PATCH_VERSION $PATCH_VERSION
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define VERSION_LABEL "${VERSION_LABEL}"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define VERSION_STRING "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}${VERSION_LABEL}"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define IS_DEVEL_VERSION $IS_DEVEL_VERSION
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define IS_BETA_VERSION $IS_BETA_VERSION
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define NEXT_STABLE_VERSION "$NEXT_STABLE_VERSION"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define RELEASE_MONTH $RELEASE_MONTH
+_ACEOF
+
+
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define NETWORK_CAPSTRING_MANDATORY "$NETWORK_CAPSTRING_MANDATORY"
+_ACEOF
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define NETWORK_CAPSTRING_OPTIONAL "$NETWORK_CAPSTRING_OPTIONAL"
_ACEOF
+
+
+am__api_version='1.11'
+
+# Find a good install program. We prefer a C program (faster),
+# so one script is as good as another. But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
+# ./install, which can be erroneously created by make from ./install.sh.
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
+if test -z "$INSTALL"; then
+if test "${ac_cv_path_install+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in #((
+ ./ | .// | /[cC]/* | \
+ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
+ /usr/ucb/* ) ;;
+ *)
+ # OSF1 and SCO ODT 3.0 have their own names for install.
+ # Don't use installbsd from OSF since it installs stuff as root
+ # by default.
+ for ac_prog in ginstall scoinst install; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+ if test $ac_prog = install &&
+ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ # AIX install. It has an incompatible calling convention.
+ :
+ elif test $ac_prog = install &&
+ grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ # program-specific install script used by HP pwplus--don't use.
+ :
+ else
+ rm -rf conftest.one conftest.two conftest.dir
+ echo one > conftest.one
+ echo two > conftest.two
+ mkdir conftest.dir
+ if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+ test -s conftest.one && test -s conftest.two &&
+ test -s conftest.dir/conftest.one &&
+ test -s conftest.dir/conftest.two
+ then
+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+ break 3
+ fi
+ fi
+ fi
+ done
+ done
+ ;;
+esac
+
+ done
+IFS=$as_save_IFS
+
+rm -rf conftest.one conftest.two conftest.dir
+
fi
+ if test "${ac_cv_path_install+set}" = set; then
+ INSTALL=$ac_cv_path_install
+ else
+ # As a last resort, use the slow shell script. Don't cache a
+ # value for INSTALL within a source directory, because that will
+ # break other packages using the cache if that directory is
+ # removed, or if the value is a relative name.
+ INSTALL=$ac_install_sh
+ fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
+$as_echo_n "checking whether build environment is sane... " >&6; }
+# Just in case
+sleep 1
+echo timestamp > conftest.file
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name. Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+ *[\\\"\#\$\&\'\`$am_lf]*)
+ as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
+esac
+case $srcdir in
+ *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
+ as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+esac
+
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments. Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$*" = "X"; then
+ # -L didn't work.
+ set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ rm -f conftest.file
+ if test "$*" != "X $srcdir/configure conftest.file" \
+ && test "$*" != "X conftest.file $srcdir/configure"; then
+
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ as_fn_error "ls -t appears to fail. Make sure there is not a broken
+alias in your environment" "$LINENO" 5
+ fi
+
+ test "$2" = conftest.file
+ )
+then
+ # Ok.
+ :
+else
+ as_fn_error "newly created file is older than distributed files!
+Check your system clock" "$LINENO" 5
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+test "$program_prefix" != NONE &&
+ program_transform_name="s&^&$program_prefix&;$program_transform_name"
+# Use a double $ so make ignores it.
+test "$program_suffix" != NONE &&
+ program_transform_name="s&\$&$program_suffix&;$program_transform_name"
+# Double any \ or $.
+# By default was `s,x,x', remove it if useless.
+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
+
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+
+if test x"${MISSING+set}" != xset; then
+ case $am_aux_dir in
+ *\ * | *\ *)
+ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+ *)
+ MISSING="\${SHELL} $am_aux_dir/missing" ;;
+ esac
+fi
+# Use eval to expand $SHELL
+if eval "$MISSING --run true"; then
+ am_missing_run="$MISSING --run "
+else
+ am_missing_run=
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+fi
+
+if test x"${install_sh}" != xset; then
+ case $am_aux_dir in
+ *\ * | *\ *)
+ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+ *)
+ install_sh="\${SHELL} $am_aux_dir/install-sh"
+ esac
+fi
+
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'. However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+if test "$cross_compiling" != no; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_STRIP+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$STRIP"; then
+ ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
done
+ done
+IFS=$as_save_IFS
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
- # Check whether --enable-auth or --disable-auth was given.
-if test "${enable_auth+set}" = set; then
- enableval="$enable_auth"
- case "${enableval}" in
- yes) auth=true
- must_auth=true ;;
- no) auth=false ;;
- try) auth=true ;;
- *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-auth" >&5
-echo "$as_me: error: bad value ${enableval} for --enable-auth" >&2;}
- { (exit 1); exit 1; }; } ;;
- esac
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+ ac_ct_STRIP=$STRIP
+ # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- auth=false
-fi;
+ if test -n "$ac_ct_STRIP"; then
+ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_STRIP="strip"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
-# Check whether --with-mysql-prefix or --without-mysql-prefix was given.
-if test "${with_mysql_prefix+set}" = set; then
- withval="$with_mysql_prefix"
- mysql_prefix="$withval"
+ if test "x$ac_ct_STRIP" = x; then
+ STRIP=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ STRIP=$ac_ct_STRIP
+ fi
else
- mysql_prefix=""
-fi;
+ STRIP="$ac_cv_prog_STRIP"
+fi
- if test x$auth = xtrue; then
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+if test -z "$MKDIR_P"; then
+ if test "${ac_cv_path_mkdir+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in mkdir gmkdir; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+ case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+ 'mkdir (GNU coreutils) '* | \
+ 'mkdir (coreutils) '* | \
+ 'mkdir (fileutils) '4.1*)
+ ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+ break 3;;
+ esac
+ done
+ done
+ done
+IFS=$as_save_IFS
- if test x$mysql_prefix = x; then
- if test "${ac_cv_header_mysql_mysql_h+set}" = set; then
- echo "$as_me:$LINENO: checking for mysql/mysql.h" >&5
-echo $ECHO_N "checking for mysql/mysql.h... $ECHO_C" >&6
-if test "${ac_cv_header_mysql_mysql_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_mysql_mysql_h" >&5
-echo "${ECHO_T}$ac_cv_header_mysql_mysql_h" >&6
+
+ if test "${ac_cv_path_mkdir+set}" = set; then
+ MKDIR_P="$ac_cv_path_mkdir -p"
+ else
+ # As a last resort, use the slow shell script. Don't cache a
+ # value for MKDIR_P within a source directory, because that will
+ # break other packages using the cache if that directory is
+ # removed, or if the value is a relative name.
+ test -d ./--version && rmdir ./--version
+ MKDIR_P="$ac_install_sh -d"
+ fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+$as_echo "$MKDIR_P" >&6; }
+
+mkdir_p="$MKDIR_P"
+case $mkdir_p in
+ [\\/$]* | ?:[\\/]*) ;;
+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+
+for ac_prog in gawk mawk nawk awk
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AWK+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- # Is the header compilable?
-echo "$as_me:$LINENO: checking mysql/mysql.h usability" >&5
-echo $ECHO_N "checking mysql/mysql.h usability... $ECHO_C" >&6
-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. */
-$ac_includes_default
-#include <mysql/mysql.h>
-_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
- ac_header_compiler=yes
+ if test -n "$AWK"; then
+ ac_cv_prog_AWK="$AWK" # Let the user override the test.
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_AWK="$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
-ac_header_compiler=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+fi
+AWK=$ac_cv_prog_AWK
+if test -n "$AWK"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
-# Is the header present?
-echo "$as_me:$LINENO: checking mysql/mysql.h presence" >&5
-echo $ECHO_N "checking mysql/mysql.h presence... $ECHO_C" >&6
-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 <mysql/mysql.h>
+
+ test -n "$AWK" && break
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
+all:
+ @echo '@@@%%%=$(MAKE)=@@@%%%'
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+ *@@@%%%=?*=@@@%%%*)
+ eval ac_cv_prog_make_${ac_make}_set=yes;;
+ *)
+ eval ac_cv_prog_make_${ac_make}_set=no;;
+esac
+rm -f conftest.make
+fi
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ SET_MAKE=
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+ am__leading_dot=.
+else
+ am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+
+DEPDIR="${am__leading_dot}deps"
+
+ac_config_commands="$ac_config_commands depfiles"
+
+
+am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+ @echo this is the am__doit target
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
+$as_echo_n "checking for style of include used by $am_make... " >&6; }
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# Ignore all kinds of additional output from `make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+ am__include=include
+ am__quote=
+ _am_result=GNU
+ ;;
+esac
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+ echo '.include "confinc"' > confmf
+ case `$am_make -s -f confmf 2> /dev/null` in #(
+ *the\ am__doit\ target*)
+ am__include=.include
+ am__quote="\""
+ _am_result=BSD
+ ;;
+ esac
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
+$as_echo "$_am_result" >&6; }
+rm -f confinc confmf
+
+# Check whether --enable-dependency-tracking was given.
+if test "${enable_dependency_tracking+set}" = set; then :
+ enableval=$enable_dependency_tracking;
+fi
+
+if test "x$enable_dependency_tracking" != xno; then
+ am_depcomp="$ac_aux_dir/depcomp"
+ AMDEPBACKSLASH='\'
+fi
+ if test "x$enable_dependency_tracking" != xno; then
+ AMDEP_TRUE=
+ AMDEP_FALSE='#'
+else
+ AMDEP_TRUE='#'
+ AMDEP_FALSE=
+fi
+
+
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+ # is not polluted with repeated "-I."
+ am__isrc=' -I$(srcdir)'
+ # test to see if srcdir already configured
+ if test -f $srcdir/config.status; then
+ as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+ fi
+fi
+
+# test whether we have cygpath
+if test -z "$CYGPATH_W"; then
+ if (cygpath --version) >/dev/null 2>/dev/null; then
+ CYGPATH_W='cygpath -w'
else
- ac_cpp_err=
+ CYGPATH_W=echo
fi
+fi
+
+
+# Define the identity of the package.
+ PACKAGE=$PACKAGE
+ VERSION=$VERSION
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define VERSION "$VERSION"
+_ACEOF
+
+# Some tools Automake needs.
+
+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
+
+
+AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
+
+
+AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
+
+
+AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
+
+
+MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+
+# We need awk for the "check" target. The system "awk" is bad on
+# some platforms.
+# Always define AMTAR for backward compatibility.
+
+AMTAR=${AMTAR-"${am_missing_run}tar"}
+
+am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
+
+
+
+
+depcc="$CC" am_compiler_list=
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- ac_cpp_err=yes
+ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+ # We make a subdir and do the tests there. Otherwise we can end up
+ # making bogus files that we don't know about and never remove. For
+ # instance it was reported that on HP-UX the gcc test will end up
+ # making a dummy file named `D' -- because `-MD' means `put the output
+ # in D'.
+ mkdir conftest.dir
+ # Copy depcomp to subdir because otherwise we won't find it if we're
+ # using a relative directory.
+ cp "$am_depcomp" conftest.dir
+ cd conftest.dir
+ # We will build objects and dependencies in a subdirectory because
+ # it helps to detect inapplicable dependency modes. For instance
+ # both Tru64's cc and ICC support -MD to output dependencies as a
+ # side effect of compilation, but ICC will put the dependencies in
+ # the current directory while Tru64 will put them in the object
+ # directory.
+ mkdir sub
+
+ am_cv_CC_dependencies_compiler_type=none
+ if test "$am_compiler_list" = ""; then
+ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+ fi
+ am__universal=false
+ case " $depcc " in #(
+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
+ esac
+
+ for depmode in $am_compiler_list; do
+ # Setup a source with many dependencies, because some compilers
+ # like to wrap large dependency lists on column 80 (with \), and
+ # we should not choose a depcomp mode which is confused by this.
+ #
+ # We need to recreate these files for each test, as the compiler may
+ # overwrite some of them when testing with obscure command lines.
+ # This happens at least with the AIX C compiler.
+ : > sub/conftest.c
+ for i in 1 2 3 4 5 6; do
+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+ # Solaris 8's {/usr,}/bin/sh.
+ touch sub/conftst$i.h
+ done
+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # mode. It turns out that the SunPro C++ compiler does not properly
+ # handle `-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs
+ am__obj=sub/conftest.${OBJEXT-o}
+ am__minus_obj="-o $am__obj"
+ case $depmode in
+ gcc)
+ # This depmode causes a compiler race in universal mode.
+ test "$am__universal" = false || continue
+ ;;
+ nosideeffect)
+ # after this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested
+ if test "x$enable_dependency_tracking" = xyes; then
+ continue
+ else
+ break
+ fi
+ ;;
+ msvisualcpp | msvcmsys)
+ # This compiler won't grok `-c -o', but also, the minuso test has
+ # not run yet. These depmodes are late enough in the game, and
+ # so weak that their functioning should not be impacted.
+ am__obj=conftest.${OBJEXT-o}
+ am__minus_obj=
+ ;;
+ none) break ;;
+ esac
+ if depmode=$depmode \
+ source=sub/conftest.c object=$am__obj \
+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+ >/dev/null 2>conftest.err &&
+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+ # icc doesn't choke on unknown options, it will just issue warnings
+ # or remarks (even with -Werror). So we grep stderr for any message
+ # that says an option was ignored or not supported.
+ # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # icc: Command line warning: ignoring option '-M'; no argument required
+ # The diagnosis changed in icc 8.0:
+ # icc: Command line remark: option '-MP' not supported
+ if (grep 'ignoring option' conftest.err ||
+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+ am_cv_CC_dependencies_compiler_type=$depmode
+ break
+ fi
+ fi
+ done
+
+ cd ..
+ rm -rf conftest.dir
+else
+ am_cv_CC_dependencies_compiler_type=none
fi
-if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+
+ if
+ test "x$enable_dependency_tracking" != xno \
+ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+ am__fastdepCC_TRUE=
+ am__fastdepCC_FALSE='#'
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ am__fastdepCC_TRUE='#'
+ am__fastdepCC_FALSE=
+fi
- ac_header_preproc=no
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
+$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
+ # Check whether --enable-maintainer-mode was given.
+if test "${enable_maintainer_mode+set}" = set; then :
+ enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
+else
+ USE_MAINTAINER_MODE=no
fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc in
- yes:no )
- { echo "$as_me:$LINENO: WARNING: mysql/mysql.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: mysql/mysql.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: mysql/mysql.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: mysql/mysql.h: proceeding with the preprocessor's result" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf at gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
- no:yes )
- { echo "$as_me:$LINENO: WARNING: mysql/mysql.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: mysql/mysql.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: mysql/mysql.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: mysql/mysql.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: mysql/mysql.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: mysql/mysql.h: proceeding with the preprocessor's result" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf at gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-echo "$as_me:$LINENO: checking for mysql/mysql.h" >&5
-echo $ECHO_N "checking for mysql/mysql.h... $ECHO_C" >&6
-if test "${ac_cv_header_mysql_mysql_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
+$as_echo "$USE_MAINTAINER_MODE" >&6; }
+ if test $USE_MAINTAINER_MODE = yes; then
+ MAINTAINER_MODE_TRUE=
+ MAINTAINER_MODE_FALSE='#'
+else
+ MAINTAINER_MODE_TRUE='#'
+ MAINTAINER_MODE_FALSE=
+fi
+
+ MAINT=$MAINTAINER_MODE_TRUE
+
+
+
+
+ # Check whether --enable-auth was given.
+if test "${enable_auth+set}" = set; then :
+ enableval=$enable_auth; case "${enableval}" in
+ yes) auth=true
+ must_auth=true ;;
+ no) auth=false ;;
+ try) auth=true ;;
+ *) as_fn_error "bad value ${enableval} for --enable-auth" "$LINENO" 5 ;;
+ esac
else
- ac_cv_header_mysql_mysql_h=$ac_header_preproc
+ auth=false
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_mysql_mysql_h" >&5
-echo "${ECHO_T}$ac_cv_header_mysql_mysql_h" >&6
+
+
+# Check whether --with-mysql-prefix was given.
+if test "${with_mysql_prefix+set}" = set; then :
+ withval=$with_mysql_prefix; mysql_prefix="$withval"
+else
+ mysql_prefix=""
fi
-if test $ac_cv_header_mysql_mysql_h = yes; then
- :
+
+
+ if test x$auth = xtrue; then
+
+ if test x$mysql_prefix = x; then
+ ac_fn_c_check_header_mongrel "$LINENO" "mysql/mysql.h" "ac_cv_header_mysql_mysql_h" "$ac_includes_default"
+if test "x$ac_cv_header_mysql_mysql_h" = x""yes; then :
+
else
- { echo "$as_me:$LINENO: WARNING: couldn't find mysql header: disabling auth" >&5
-echo "$as_me: WARNING: couldn't find mysql header: disabling auth" >&2;};
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: couldn't find mysql header: disabling auth" >&5
+$as_echo "$as_me: WARNING: couldn't find mysql header: disabling auth" >&2;};
auth=false
fi
- echo "$as_me:$LINENO: checking for mysql_query in -lmysqlclient" >&5
-echo $ECHO_N "checking for mysql_query in -lmysqlclient... $ECHO_C" >&6
-if test "${ac_cv_lib_mysqlclient_mysql_query+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_query in -lmysqlclient" >&5
+$as_echo_n "checking for mysql_query in -lmysqlclient... " >&6; }
+if test "${ac_cv_lib_mysqlclient_mysql_query+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lmysqlclient $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 mysql_query ();
int
main ()
{
-mysql_query ();
+return mysql_query ();
;
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
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_mysqlclient_mysql_query=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_mysqlclient_mysql_query=no
+ ac_cv_lib_mysqlclient_mysql_query=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_mysqlclient_mysql_query" >&5
-echo "${ECHO_T}$ac_cv_lib_mysqlclient_mysql_query" >&6
-if test $ac_cv_lib_mysqlclient_mysql_query = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mysqlclient_mysql_query" >&5
+$as_echo "$ac_cv_lib_mysqlclient_mysql_query" >&6; }
+if test "x$ac_cv_lib_mysqlclient_mysql_query" = x""yes; then :
AUTH_LIBS="-lmysqlclient $AUTH_LIBS"
else
- { echo "$as_me:$LINENO: WARNING: couldn't find mysql libs in normal locations" >&5
-echo "$as_me: WARNING: couldn't find mysql libs in normal locations" >&2;};
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: couldn't find mysql libs in normal locations" >&5
+$as_echo "$as_me: WARNING: couldn't find mysql libs in normal locations" >&2;};
auth=false
fi
@@ -3697,68 +4714,50 @@ fi
unset ac_cv_lib_mysqlclient_mysql_query
LDFLAGS="$LDFLAGS $__ldpath"
- echo "$as_me:$LINENO: checking for mysql_query in -lmysqlclient" >&5
-echo $ECHO_N "checking for mysql_query in -lmysqlclient... $ECHO_C" >&6
-if test "${ac_cv_lib_mysqlclient_mysql_query+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_query in -lmysqlclient" >&5
+$as_echo_n "checking for mysql_query in -lmysqlclient... " >&6; }
+if test "${ac_cv_lib_mysqlclient_mysql_query+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lmysqlclient $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 mysql_query ();
int
main ()
{
-mysql_query ();
+return mysql_query ();
;
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
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_mysqlclient_mysql_query=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_mysqlclient_mysql_query=no
+ ac_cv_lib_mysqlclient_mysql_query=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_mysqlclient_mysql_query" >&5
-echo "${ECHO_T}$ac_cv_lib_mysqlclient_mysql_query" >&6
-if test $ac_cv_lib_mysqlclient_mysql_query = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mysqlclient_mysql_query" >&5
+$as_echo "$ac_cv_lib_mysqlclient_mysql_query" >&6; }
+if test "x$ac_cv_lib_mysqlclient_mysql_query" = x""yes; then :
AUTH_LIBS="-lmysqlclient $AUTH_LIBS";
- { echo "$as_me:$LINENO: WARNING: had to add $__ldpath to LDFLAGS" >&5
-echo "$as_me: WARNING: had to add $__ldpath to LDFLAGS" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: had to add $__ldpath to LDFLAGS" >&5
+$as_echo "$as_me: WARNING: had to add $__ldpath to LDFLAGS" >&2;}
auth=true
else
- { echo "$as_me:$LINENO: WARNING: couldn't find mysql libs in $__ldpath" >&5
-echo "$as_me: WARNING: couldn't find mysql libs in $__ldpath" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: couldn't find mysql libs in $__ldpath" >&5
+$as_echo "$as_me: WARNING: couldn't find mysql libs in $__ldpath" >&2;}
fi
@@ -3770,9 +4769,7 @@ fi
done
if test x$auth = xfalse ; then
- { { echo "$as_me:$LINENO: error: couldn't find mysql libs at all" >&5
-echo "$as_me: error: couldn't find mysql libs at all" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "couldn't find mysql libs at all" "$LINENO" 5
fi
fi
else
@@ -3784,201 +4781,54 @@ echo "$as_me: error: couldn't find mysql libs at all" >&2;}
CFLAGS="$CFLAGS $AUTH_CFLAGS"
CPPFLAGS="$CPPFLAGS $AUTH_CFLAGS"
LIBS="$LIBS $AUTH_LIBS"
- if test "${ac_cv_header_mysql_mysql_h+set}" = set; then
- echo "$as_me:$LINENO: checking for mysql/mysql.h" >&5
-echo $ECHO_N "checking for mysql/mysql.h... $ECHO_C" >&6
-if test "${ac_cv_header_mysql_mysql_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_mysql_mysql_h" >&5
-echo "${ECHO_T}$ac_cv_header_mysql_mysql_h" >&6
-else
- # Is the header compilable?
-echo "$as_me:$LINENO: checking mysql/mysql.h usability" >&5
-echo $ECHO_N "checking mysql/mysql.h usability... $ECHO_C" >&6
-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. */
-$ac_includes_default
-#include <mysql/mysql.h>
-_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
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking mysql/mysql.h presence" >&5
-echo $ECHO_N "checking mysql/mysql.h presence... $ECHO_C" >&6
-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 <mysql/mysql.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc in
- yes:no )
- { echo "$as_me:$LINENO: WARNING: mysql/mysql.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: mysql/mysql.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: mysql/mysql.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: mysql/mysql.h: proceeding with the preprocessor's result" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf at gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
- no:yes )
- { echo "$as_me:$LINENO: WARNING: mysql/mysql.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: mysql/mysql.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: mysql/mysql.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: mysql/mysql.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: mysql/mysql.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: mysql/mysql.h: proceeding with the preprocessor's result" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf at gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-echo "$as_me:$LINENO: checking for mysql/mysql.h" >&5
-echo $ECHO_N "checking for mysql/mysql.h... $ECHO_C" >&6
-if test "${ac_cv_header_mysql_mysql_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_mysql_mysql_h=$ac_header_preproc
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_mysql_mysql_h" >&5
-echo "${ECHO_T}$ac_cv_header_mysql_mysql_h" >&6
+ ac_fn_c_check_header_mongrel "$LINENO" "mysql/mysql.h" "ac_cv_header_mysql_mysql_h" "$ac_includes_default"
+if test "x$ac_cv_header_mysql_mysql_h" = x""yes; then :
-fi
-if test $ac_cv_header_mysql_mysql_h = yes; then
- :
else
- { echo "$as_me:$LINENO: WARNING: couldn't find mysql header in $mysql_prefix/include" >&5
-echo "$as_me: WARNING: couldn't find mysql header in $mysql_prefix/include" >&2;};
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: couldn't find mysql header in $mysql_prefix/include" >&5
+$as_echo "$as_me: WARNING: couldn't find mysql header in $mysql_prefix/include" >&2;};
auth=false
fi
if test x$auth = xtrue; then
-
-echo "$as_me:$LINENO: checking for mysql_query in -lmysqlclient" >&5
-echo $ECHO_N "checking for mysql_query in -lmysqlclient... $ECHO_C" >&6
-if test "${ac_cv_lib_mysqlclient_mysql_query+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_query in -lmysqlclient" >&5
+$as_echo_n "checking for mysql_query in -lmysqlclient... " >&6; }
+if test "${ac_cv_lib_mysqlclient_mysql_query+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lmysqlclient $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 mysql_query ();
int
main ()
{
-mysql_query ();
+return mysql_query ();
;
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
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_mysqlclient_mysql_query=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_mysqlclient_mysql_query=no
+ ac_cv_lib_mysqlclient_mysql_query=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_mysqlclient_mysql_query" >&5
-echo "${ECHO_T}$ac_cv_lib_mysqlclient_mysql_query" >&6
-if test $ac_cv_lib_mysqlclient_mysql_query = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mysqlclient_mysql_query" >&5
+$as_echo "$ac_cv_lib_mysqlclient_mysql_query" >&6; }
+if test "x$ac_cv_lib_mysqlclient_mysql_query" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBMYSQLCLIENT 1
_ACEOF
@@ -3986,8 +4836,8 @@ _ACEOF
LIBS="-lmysqlclient $LIBS"
else
- { echo "$as_me:$LINENO: WARNING: couldn't find mysql libs in $mysql_prefix/lib/mysql" >&5
-echo "$as_me: WARNING: couldn't find mysql libs in $mysql_prefix/lib/mysql" >&2;};
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: couldn't find mysql libs in $mysql_prefix/lib/mysql" >&5
+$as_echo "$as_me: WARNING: couldn't find mysql libs in $mysql_prefix/lib/mysql" >&2;};
auth=false
fi
@@ -3999,12 +4849,10 @@ fi
if test x$auth = xfalse; then
if test x$must_auth = xtrue; then
- { { echo "$as_me:$LINENO: error: can't find mysql: cannot build authentication support" >&5
-echo "$as_me: error: can't find mysql: cannot build authentication support" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "can't find mysql: cannot build authentication support" "$LINENO" 5
else
- { echo "$as_me:$LINENO: WARNING: can't find mysql -- disabling authentication" >&5
-echo "$as_me: WARNING: can't find mysql -- disabling authentication" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: can't find mysql -- disabling authentication" >&5
+$as_echo "$as_me: WARNING: can't find mysql -- disabling authentication" >&2;}
fi
fi
@@ -4016,30 +4864,24 @@ echo "$as_me: WARNING: can't find mysql -- disabling authentication" >&2;}
if test x$auth = xtrue; then
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_AUTH 1
-_ACEOF
+$as_echo "#define HAVE_AUTH 1" >>confdefs.h
fi
-# Check whether --enable-server or --disable-server was given.
-if test "${enable_server+set}" = set; then
- enableval="$enable_server"
- case "${enableval}" in
+# Check whether --enable-server was given.
+if test "${enable_server+set}" = set; then :
+ enableval=$enable_server; case "${enableval}" in
yes) server=true ;;
no) server=false ;;
- *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --disable-server" >&5
-echo "$as_me: error: bad value ${enableval} for --disable-server" >&2;}
- { (exit 1); exit 1; }; } ;;
+ *) as_fn_error "bad value ${enableval} for --disable-server" "$LINENO" 5 ;;
esac
else
server=true
-fi;
-
+fi
-if test x$server = xtrue; then
+ if test x$server = xtrue; then
SERVER_TRUE=
SERVER_FALSE='#'
else
@@ -4049,18 +4891,17 @@ fi
-# Check whether --with-readline or --without-readline was given.
-if test "${with_readline+set}" = set; then
- withval="$with_readline"
- WITH_READLINE=$withval
+# Check whether --with-readline was given.
+if test "${with_readline+set}" = set; then :
+ withval=$with_readline; WITH_READLINE=$withval
else
WITH_READLINE="maybe"
-fi;
+fi
+
-# Check whether --enable-client or --disable-client was given.
-if test "${enable_client+set}" = set; then
- enableval="$enable_client"
- case "${enableval}" in
+# Check whether --enable-client was given.
+if test "${enable_client+set}" = set; then :
+ enableval=$enable_client; case "${enableval}" in
yes) client=yes ;;
no) client=no ;;
xaw3d) client=xaw
@@ -4072,17 +4913,14 @@ if test "${enable_client+set}" = set; then
gtk20) client=gtk-2.0 ;;
*) client="${enableval}"
if test ! -d "${srcdir}/client/gui-$client" ; then
- { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-client" >&5
-echo "$as_me: error: bad value ${enableval} for --enable-client" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "bad value ${enableval} for --enable-client" "$LINENO" 5
fi ;;
esac
else
client=yes
-fi;
-
+fi
-if test x$client != xno; then
+ if test x$client != xno; then
CLIENT_TRUE=
CLIENT_FALSE='#'
else
@@ -4091,23 +4929,19 @@ else
fi
-# Check whether --enable-ftwl or --disable-ftwl was given.
-if test "${enable_ftwl+set}" = set; then
- enableval="$enable_ftwl"
- case "${enableval}" in
+# Check whether --enable-ftwl was given.
+if test "${enable_ftwl+set}" = set; then :
+ enableval=$enable_ftwl; case "${enableval}" in
x11) ftwl=x11 ;;
sdl) ftwl=sdl ;;
opengl) ftwl=opengl ;;
- *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-ftwl" >&5
-echo "$as_me: error: bad value ${enableval} for --enable-ftwl" >&2;}
- { (exit 1); exit 1; }; } ;;
+ *) as_fn_error "bad value ${enableval} for --enable-ftwl" "$LINENO" 5 ;;
esac
else
ftwl=no
-fi;
-
+fi
-if test x$ftwl != xno; then
+ if test x$ftwl != xno; then
FTWL_TRUE=
FTWL_FALSE='#'
else
@@ -4116,43 +4950,37 @@ else
fi
if test "$ftwl" = no && test "$client" = ftwl ; then
- { { echo "$as_me:$LINENO: error: You must use --enable-ftwl to use the ftwl client" >&5
-echo "$as_me: error: You must use --enable-ftwl to use the ftwl client" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "You must use --enable-ftwl to use the ftwl client" "$LINENO" 5
fi
-# Check whether --with-xaw or --without-xaw was given.
-if test "${with_xaw+set}" = set; then
- withval="$with_xaw"
- WITH_XAW=1
+# Check whether --with-xaw was given.
+if test "${with_xaw+set}" = set; then :
+ withval=$with_xaw; WITH_XAW=1
-fi;
+fi
-# Check whether --with-xaw3d or --without-xaw3d was given.
-if test "${with_xaw3d+set}" = set; then
- withval="$with_xaw3d"
- WITH_XAW3D=1
-fi;
+# Check whether --with-xaw3d was given.
+if test "${with_xaw3d+set}" = set; then :
+ withval=$with_xaw3d; WITH_XAW3D=1
+
+fi
-# Check whether --enable-make_data or --disable-make_data was given.
-if test "${enable_make_data+set}" = set; then
- enableval="$enable_make_data"
- case "${enableval}" in
+
+# Check whether --enable-make_data was given.
+if test "${enable_make_data+set}" = set; then :
+ enableval=$enable_make_data; case "${enableval}" in
yes) make_data=true ;;
no) make_data=false ;;
- *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --disable-make-data" >&5
-echo "$as_me: error: bad value ${enableval} for --disable-make-data" >&2;}
- { (exit 1); exit 1; }; } ;;
+ *) as_fn_error "bad value ${enableval} for --disable-make-data" "$LINENO" 5 ;;
esac
else
make_data=true
-fi;
-
+fi
-if test x$make_data = xtrue; then
+ if test x$make_data = xtrue; then
MAKE_DATA_TRUE=
MAKE_DATA_FALSE='#'
else
@@ -4161,22 +4989,18 @@ else
fi
-# Check whether --enable-make_include or --disable-make_include was given.
-if test "${enable_make_include+set}" = set; then
- enableval="$enable_make_include"
- case "${enableval}" in
+# Check whether --enable-make_include was given.
+if test "${enable_make_include+set}" = set; then :
+ enableval=$enable_make_include; case "${enableval}" in
yes) make_include=true ;;
no) make_include=false ;;
- *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-make-include" >&5
-echo "$as_me: error: bad value ${enableval} for --enable-make-include" >&2;}
- { (exit 1); exit 1; }; } ;;
+ *) as_fn_error "bad value ${enableval} for --enable-make-include" "$LINENO" 5 ;;
esac
else
make_include=false
-fi;
-
+fi
-if test "$make_include" = "true"; then
+ if test "$make_include" = "true"; then
MAKE_CLIENT_INCLUDE_TRUE=
MAKE_CLIENT_INCLUDE_FALSE='#'
else
@@ -4185,37 +5009,35 @@ else
fi
-# Check whether --enable-auto_deps or --disable-auto_deps was given.
-if test "${enable_auto_deps+set}" = set; then
- enableval="$enable_auto_deps"
- case "${enableval}" in
+# Check whether --enable-auto_deps was given.
+if test "${enable_auto_deps+set}" = set; then :
+ enableval=$enable_auto_deps; case "${enableval}" in
yes) enable_auto_deps=true ;;
no) enable_auto_deps=false;;
- *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-auto-deps" >&5
-echo "$as_me: error: bad value ${enableval} for --enable-auto-deps" >&2;}
- { (exit 1); exit 1; }; } ;;
+ *) as_fn_error "bad value ${enableval} for --enable-auto-deps" "$LINENO" 5 ;;
esac
else
enable_auto_deps="maybe"
-fi;
+fi
+
AUTO_DEPS=$enable_auto_deps
-# Check whether --with-efence or --without-efence was given.
-if test "${with_efence+set}" = set; then
- withval="$with_efence"
- WITH_EFENCE=1
+# Check whether --with-efence was given.
+if test "${with_efence+set}" = set; then :
+ withval=$with_efence; WITH_EFENCE=1
+
+fi
-fi;
for ac_prog in gawk mawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; 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_prog_AWK+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AWK+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
ac_cv_prog_AWK="$AWK" # Let the user override the test.
@@ -4225,26 +5047,28 @@ 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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_AWK="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
+IFS=$as_save_IFS
fi
fi
AWK=$ac_cv_prog_AWK
if test -n "$AWK"; then
- echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
+
test -n "$AWK" && break
done
@@ -4256,10 +5080,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; 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_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -4269,35 +5093,37 @@ 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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
+IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
+
fi
if test -z "$ac_cv_prog_CC"; then
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; 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_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -4307,39 +5133,50 @@ 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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="gcc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
+IFS=$as_save_IFS
fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
- CC=$ac_ct_CC
+ if test "x$ac_ct_CC" = x; then
+ CC=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ CC=$ac_ct_CC
+ fi
else
CC="$ac_cv_prog_CC"
fi
if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; 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_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -4349,77 +5186,37 @@ 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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
+IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
-fi
-if test -z "$ac_cv_prog_CC"; then
- ac_ct_CC=$CC
- # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; 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_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-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_prog_ac_ct_CC="cc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
- CC=$ac_ct_CC
-else
- CC="$ac_cv_prog_CC"
-fi
+ fi
fi
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; 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_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -4430,18 +5227,19 @@ 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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
fi
ac_cv_prog_CC="cc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
+IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
# We found a bogon in the path, so make sure we never use it.
@@ -4459,24 +5257,25 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
+
fi
if test -z "$CC"; then
if test -n "$ac_tool_prefix"; then
- for ac_prog in cl
+ for ac_prog in cl.exe
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; 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_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -4486,39 +5285,41 @@ 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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
+IFS=$as_save_IFS
fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
+
test -n "$CC" && break
done
fi
if test -z "$CC"; then
ac_ct_CC=$CC
- for ac_prog in cl
+ for ac_prog in cl.exe
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; 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_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -4528,72 +5329,83 @@ 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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
+IFS=$as_save_IFS
fi
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
+
test -n "$ac_ct_CC" && break
done
- CC=$ac_ct_CC
+ if test "x$ac_ct_CC" = x; then
+ CC=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ CC=$ac_ct_CC
+ fi
fi
fi
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "no acceptable C compiler found in \$PATH
+See \`config.log' for more details." "$LINENO" 5; }
# Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
- "checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
- (eval $ac_compiler --version </dev/null >&5) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
- (eval $ac_compiler -v </dev/null >&5) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
- (eval $ac_compiler -V </dev/null >&5) 2>&5
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+ { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
+ if test -s conftest.err; then
+ sed '10a\
+... rest of stderr output deleted ...
+ 10q' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ rm -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+done
-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -4607,46 +5419,34 @@ main ()
return 0;
}
_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
+if ac_fn_c_try_compile "$LINENO"; then :
ac_compiler_gnu=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_compiler_gnu=no
+ ac_compiler_gnu=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
-GCC=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+ GCC=yes
+else
+ GCC=
+fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
-CFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_g+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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if test "${ac_cv_prog_cc_g+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_save_c_werror_flag=$ac_c_werror_flag
+ ac_c_werror_flag=yes
+ ac_cv_prog_cc_g=no
+ CFLAGS="-g"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -4657,29 +5457,49 @@ main ()
return 0;
}
_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
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_prog_cc_g=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ CFLAGS=""
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
-ac_cv_prog_cc_g=no
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+ ac_c_werror_flag=$ac_save_c_werror_flag
+ CFLAGS="-g"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_prog_cc_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
elif test $ac_cv_prog_cc_g = yes; then
@@ -4695,19 +5515,14 @@ else
CFLAGS=
fi
fi
-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_stdc+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- ac_cv_prog_cc_stdc=no
+ ac_cv_prog_cc_c89=no
ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
@@ -4731,6 +5546,21 @@ static char *f (char * (*g) (char **, int), char **p, ...)
va_end (v);
return s;
}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
+ function prototypes and stuff, but not '\xHH' hex character constants.
+ These don't provoke an error unfortunately, instead are silently treated
+ as 'x'. The following induces an error, until -std is added to get
+ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
+ array size at least. It's necessary to write '\x00'==0 to get something
+ that's true only with -std. */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+ inside strings and character constants. */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
int test (int i, double x);
struct s1 {int (*f) (int a);};
struct s2 {int (*f) (double a);};
@@ -4745,257 +5575,57 @@ return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
return 0;
}
_ACEOF
-# Don't try gcc -ansi; that turns off useful extensions and
-# breaks some systems' header files.
-# AIX -qlanglvl=ansi
-# Ultrix and OSF/1 -std1
-# HP-UX 10.20 and later -Ae
-# HP-UX older versions -Aa -D_HPUX_SOURCE
-# SVR4 -Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
- 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
- ac_cv_prog_cc_stdc=$ac_arg
-break
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+ if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_prog_cc_c89=$ac_arg
fi
-rm -f conftest.$ac_objext
+rm -f core conftest.err conftest.$ac_objext
+ test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-rm -f conftest.$ac_ext conftest.$ac_objext
+rm -f conftest.$ac_ext
CC=$ac_save_CC
fi
-
-case "x$ac_cv_prog_cc_stdc" in
- x|xno)
- echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6 ;;
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+ x)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+ xno)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
*)
- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
- CC="$CC $ac_cv_prog_cc_stdc" ;;
+ CC="$CC $ac_cv_prog_cc_c89"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
esac
-
-# Some people use a C++ compiler to compile C. Since we use `exit',
-# in C++ we need to declare it. In case someone uses the same compiler
-# for both compiling C and C++ we need to have the C++ compiler decide
-# the declaration of exit, since it's the most demanding environment.
-cat >conftest.$ac_ext <<_ACEOF
-#ifndef __cplusplus
- choke me
-#endif
-_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
- for ac_declaration in \
- ''\
- '#include <stdlib.h>' \
- 'extern "C" void std::exit (int) throw (); using std::exit;' \
- 'extern "C" void std::exit (int); using std::exit;' \
- 'extern "C" void exit (int) throw ();' \
- 'extern "C" void exit (int);' \
- 'void exit (int);'
-do
- 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 <stdlib.h>
-$ac_declaration
-int
-main ()
-{
-exit (42);
- ;
- return 0;
-}
-_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
- :
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-continue
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
- 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. */
-$ac_declaration
-int
-main ()
-{
-exit (42);
- ;
- return 0;
-}
-_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
- break
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if test "x$ac_cv_prog_cc_c89" != xno; then :
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
- echo '#ifdef __cplusplus' >>confdefs.h
- echo $ac_declaration >>confdefs.h
- echo '#endif' >>confdefs.h
-fi
-
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
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
-depcc="$CC" am_compiler_list=
-
-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
- # We make a subdir and do the tests there. Otherwise we can end up
- # making bogus files that we don't know about and never remove. For
- # instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
- mkdir conftest.dir
- # Copy depcomp to subdir because otherwise we won't find it if we're
- # using a relative directory.
- cp "$am_depcomp" conftest.dir
- cd conftest.dir
-
- am_cv_CC_dependencies_compiler_type=none
- if test "$am_compiler_list" = ""; then
- am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
- fi
- for depmode in $am_compiler_list; do
- # We need to recreate these files for each test, as the compiler may
- # overwrite some of them when testing with obscure command lines.
- # This happens at least with the AIX C compiler.
- echo '#include "conftest.h"' > conftest.c
- echo 'int i;' > conftest.h
- echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
-
- case $depmode in
- nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
- if test "x$enable_dependency_tracking" = xyes; then
- continue
- else
- break
- fi
- ;;
- none) break ;;
- esac
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this.
- if depmode=$depmode \
- source=conftest.c object=conftest.o \
- depfile=conftest.Po tmpdepfile=conftest.TPo \
- $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
- grep conftest.h conftest.Po > /dev/null 2>&1 &&
- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
- am_cv_CC_dependencies_compiler_type=$depmode
- break
- fi
- done
-
- cd ..
- rm -rf conftest.dir
-else
- am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
-
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
-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
fi
if test -z "$CPP"; then
- if test "${ac_cv_prog_CPP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ if test "${ac_cv_prog_CPP+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
@@ -5009,81 +5639,33 @@ do
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
#else
# include <assert.h>
#endif
- Syntax error
+ Syntax error
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- :
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
+else
# Broken: fails on valid input.
continue
fi
rm -f conftest.err conftest.$ac_ext
- # OK, works on sane cases. Now check whether non-existent headers
+ # OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+if ac_fn_c_try_cpp "$LINENO"; then :
# Broken: success on invalid input.
continue
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
# Passes both tests.
ac_preproc_ok=:
break
@@ -5093,7 +5675,7 @@ rm -f conftest.err conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
+if $ac_preproc_ok; then :
break
fi
@@ -5105,8 +5687,8 @@ fi
else
ac_cv_prog_CPP=$CPP
fi
-echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
do
@@ -5116,81 +5698,33 @@ do
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
#else
# include <assert.h>
#endif
- Syntax error
+ Syntax error
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- :
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
+else
# Broken: fails on valid input.
continue
fi
rm -f conftest.err conftest.$ac_ext
- # OK, works on sane cases. Now check whether non-existent headers
+ # OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+if ac_fn_c_try_cpp "$LINENO"; then :
# Broken: success on invalid input.
continue
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
# Passes both tests.
ac_preproc_ok=:
break
@@ -5200,14 +5734,13 @@ rm -f conftest.err conftest.$ac_ext
done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
- :
+if $ac_preproc_ok; then :
+
else
- { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." "$LINENO" 5; }
fi
ac_ext=c
@@ -5216,20 +5749,24 @@ 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_ext=cpp
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
-if test -n "$ac_tool_prefix"; then
- for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
+if test -z "$CXX"; then
+ if test -n "$CCC"; then
+ CXX=$CCC
+ else
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; 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_prog_CXX+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CXX+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$CXX"; then
ac_cv_prog_CXX="$CXX" # Let the user override the test.
@@ -5239,39 +5776,41 @@ 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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
+IFS=$as_save_IFS
fi
fi
CXX=$ac_cv_prog_CXX
if test -n "$CXX"; then
- echo "$as_me:$LINENO: result: $CXX" >&5
-echo "${ECHO_T}$CXX" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
+
test -n "$CXX" && break
done
fi
if test -z "$CXX"; then
ac_ct_CXX=$CXX
- for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; 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_prog_ac_ct_CXX+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CXX"; then
ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
@@ -5281,65 +5820,77 @@ 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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CXX="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
+IFS=$as_save_IFS
fi
fi
ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
if test -n "$ac_ct_CXX"; then
- echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-echo "${ECHO_T}$ac_ct_CXX" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
+
test -n "$ac_ct_CXX" && break
done
-test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
- CXX=$ac_ct_CXX
+ if test "x$ac_ct_CXX" = x; then
+ CXX="g++"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ CXX=$ac_ct_CXX
+ fi
fi
-
+ fi
+fi
# Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
- "checking for C++ compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
- (eval $ac_compiler --version </dev/null >&5) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
- (eval $ac_compiler -v </dev/null >&5) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
- (eval $ac_compiler -V </dev/null >&5) 2>&5
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+ { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
+ if test -s conftest.err; then
+ sed '10a\
+... rest of stderr output deleted ...
+ 10q' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ rm -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+done
-echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -5353,46 +5904,34 @@ main ()
return 0;
}
_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
+if ac_fn_cxx_try_compile "$LINENO"; then :
ac_compiler_gnu=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_compiler_gnu=no
+ ac_compiler_gnu=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
fi
-echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
-GXX=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+ GXX=yes
+else
+ GXX=
+fi
ac_test_CXXFLAGS=${CXXFLAGS+set}
ac_save_CXXFLAGS=$CXXFLAGS
-CXXFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
-if test "${ac_cv_prog_cxx_g+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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
+if test "${ac_cv_prog_cxx_g+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+ ac_cxx_werror_flag=yes
+ ac_cv_prog_cxx_g=no
+ CXXFLAGS="-g"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -5403,133 +5942,64 @@ main ()
return 0;
}
_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
+if ac_fn_cxx_try_compile "$LINENO"; then :
ac_cv_prog_cxx_g=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_prog_cxx_g=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
-if test "$ac_test_CXXFLAGS" = set; then
- CXXFLAGS=$ac_save_CXXFLAGS
-elif test $ac_cv_prog_cxx_g = yes; then
- if test "$GXX" = yes; then
- CXXFLAGS="-g -O2"
- else
- CXXFLAGS="-g"
- fi
-else
- if test "$GXX" = yes; then
- CXXFLAGS="-O2"
- else
- CXXFLAGS=
- fi
-fi
-for ac_declaration in \
- ''\
- '#include <stdlib.h>' \
- 'extern "C" void std::exit (int) throw (); using std::exit;' \
- 'extern "C" void std::exit (int); using std::exit;' \
- 'extern "C" void exit (int) throw ();' \
- 'extern "C" void exit (int);' \
- 'void exit (int);'
-do
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ CXXFLAGS=""
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#include <stdlib.h>
-$ac_declaration
+
int
main ()
{
-exit (42);
+
;
return 0;
}
_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
- :
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_cxx_try_compile "$LINENO"; then :
-continue
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+else
+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+ CXXFLAGS="-g"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-$ac_declaration
+
int
main ()
{
-exit (42);
+
;
return 0;
}
_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
- break
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+if ac_fn_cxx_try_compile "$LINENO"; then :
+ ac_cv_prog_cxx_g=yes
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
- echo '#ifdef __cplusplus' >>confdefs.h
- echo $ac_declaration >>confdefs.h
- echo '#endif' >>confdefs.h
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
+$as_echo "$ac_cv_prog_cxx_g" >&6; }
+if test "$ac_test_CXXFLAGS" = set; then
+ CXXFLAGS=$ac_save_CXXFLAGS
+elif test $ac_cv_prog_cxx_g = yes; then
+ if test "$GXX" = yes; then
+ CXXFLAGS="-g -O2"
+ else
+ CXXFLAGS="-g"
+ fi
+else
+ if test "$GXX" = yes; then
+ CXXFLAGS="-O2"
+ else
+ CXXFLAGS=
+ fi
fi
-
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5538,10 +6008,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
depcc="$CXX" am_compiler_list=
-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
# We make a subdir and do the tests there. Otherwise we can end up
@@ -5554,20 +6024,51 @@ else
# using a relative directory.
cp "$am_depcomp" conftest.dir
cd conftest.dir
+ # We will build objects and dependencies in a subdirectory because
+ # it helps to detect inapplicable dependency modes. For instance
+ # both Tru64's cc and ICC support -MD to output dependencies as a
+ # side effect of compilation, but ICC will put the dependencies in
+ # the current directory while Tru64 will put them in the object
+ # directory.
+ mkdir sub
am_cv_CXX_dependencies_compiler_type=none
if test "$am_compiler_list" = ""; then
am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
fi
+ am__universal=false
+ case " $depcc " in #(
+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
+ esac
+
for depmode in $am_compiler_list; do
+ # Setup a source with many dependencies, because some compilers
+ # like to wrap large dependency lists on column 80 (with \), and
+ # we should not choose a depcomp mode which is confused by this.
+ #
# We need to recreate these files for each test, as the compiler may
# overwrite some of them when testing with obscure command lines.
# This happens at least with the AIX C compiler.
- echo '#include "conftest.h"' > conftest.c
- echo 'int i;' > conftest.h
- echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
+ : > sub/conftest.c
+ for i in 1 2 3 4 5 6; do
+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+ # Solaris 8's {/usr,}/bin/sh.
+ touch sub/conftst$i.h
+ done
+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # mode. It turns out that the SunPro C++ compiler does not properly
+ # handle `-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs
+ am__obj=sub/conftest.${OBJEXT-o}
+ am__minus_obj="-o $am__obj"
case $depmode in
+ gcc)
+ # This depmode causes a compiler race in universal mode.
+ test "$am__universal" = false || continue
+ ;;
nosideeffect)
# after this tag, mechanisms are not by side-effect, so they'll
# only be used when explicitly requested
@@ -5577,19 +6078,36 @@ else
break
fi
;;
+ msvisualcpp | msvcmsys)
+ # This compiler won't grok `-c -o', but also, the minuso test has
+ # not run yet. These depmodes are late enough in the game, and
+ # so weak that their functioning should not be impacted.
+ am__obj=conftest.${OBJEXT-o}
+ am__minus_obj=
+ ;;
none) break ;;
esac
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this.
if depmode=$depmode \
- source=conftest.c object=conftest.o \
- depfile=conftest.Po tmpdepfile=conftest.TPo \
- $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
- grep conftest.h conftest.Po > /dev/null 2>&1 &&
+ source=sub/conftest.c object=$am__obj \
+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+ >/dev/null 2>conftest.err &&
+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
- am_cv_CXX_dependencies_compiler_type=$depmode
- break
+ # icc doesn't choke on unknown options, it will just issue warnings
+ # or remarks (even with -Werror). So we grep stderr for any message
+ # that says an option was ignored or not supported.
+ # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # icc: Command line warning: ignoring option '-M'; no argument required
+ # The diagnosis changed in icc 8.0:
+ # icc: Command line remark: option '-MP' not supported
+ if (grep 'ignoring option' conftest.err ||
+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+ am_cv_CXX_dependencies_compiler_type=$depmode
+ break
+ fi
fi
done
@@ -5600,29 +6118,39 @@ else
fi
fi
-echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
+ if
+ test "x$enable_dependency_tracking" != xno \
+ && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
+ am__fastdepCXX_TRUE=
+ am__fastdepCXX_FALSE='#'
+else
+ am__fastdepCXX_TRUE='#'
+ am__fastdepCXX_FALSE=
+fi
+
-echo "$as_me:$LINENO: checking whether ln -s works" >&5
-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
LN_S=$as_ln_s
if test "$LN_S" = "ln -s"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
else
- echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-echo "${ECHO_T}no, using $LN_S" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; 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_prog_RANLIB+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_RANLIB+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -5632,35 +6160,37 @@ 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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
+IFS=$as_save_IFS
fi
fi
RANLIB=$ac_cv_prog_RANLIB
if test -n "$RANLIB"; then
- echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
+
fi
if test -z "$ac_cv_prog_RANLIB"; then
ac_ct_RANLIB=$RANLIB
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; 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_prog_ac_ct_RANLIB+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
@@ -5670,28 +6200,38 @@ 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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_RANLIB="ranlib"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
+IFS=$as_save_IFS
- test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
fi
fi
ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
if test -n "$ac_ct_RANLIB"; then
- echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
- RANLIB=$ac_ct_RANLIB
+ if test "x$ac_ct_RANLIB" = x; then
+ RANLIB=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ RANLIB=$ac_ct_RANLIB
+ fi
else
RANLIB="$ac_cv_prog_RANLIB"
fi
@@ -5699,10 +6239,10 @@ fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
set dummy ${ac_tool_prefix}ar; 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_prog_AR+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AR+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$AR"; then
ac_cv_prog_AR="$AR" # Let the user override the test.
@@ -5712,35 +6252,37 @@ 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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_AR="${ac_tool_prefix}ar"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
+IFS=$as_save_IFS
fi
fi
AR=$ac_cv_prog_AR
if test -n "$AR"; then
- echo "$as_me:$LINENO: result: $AR" >&5
-echo "${ECHO_T}$AR" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
+
fi
if test -z "$ac_cv_prog_AR"; then
ac_ct_AR=$AR
# Extract the first word of "ar", so it can be a program name with args.
set dummy ar; 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_prog_ac_ct_AR+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AR"; then
ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
@@ -5750,43 +6292,52 @@ 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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_AR="ar"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
+IFS=$as_save_IFS
fi
fi
ac_ct_AR=$ac_cv_prog_ac_ct_AR
if test -n "$ac_ct_AR"; then
- echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-echo "${ECHO_T}$ac_ct_AR" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
- AR=$ac_ct_AR
+ if test "x$ac_ct_AR" = x; then
+ AR=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ AR=$ac_ct_AR
+ fi
else
AR="$ac_cv_prog_AR"
fi
if test -z $AR; then
- { { echo "$as_me:$LINENO: error: *** 'ar' missing. Install binutils, fix your \$PATH, or set \$AR manually. ***" >&5
-echo "$as_me: error: *** 'ar' missing. Install binutils, fix your \$PATH, or set \$AR manually. ***" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "*** 'ar' missing. Install binutils, fix your \$PATH, or set \$AR manually. ***" "$LINENO" 5
fi
# Extract the first word of "uname", so it can be a program name with args.
set dummy uname; 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_prog_UNAME+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_UNAME+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$UNAME"; then
ac_cv_prog_UNAME="$UNAME" # Let the user override the test.
@@ -5796,30 +6347,32 @@ 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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_UNAME="uname"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
+IFS=$as_save_IFS
test -z "$ac_cv_prog_UNAME" && ac_cv_prog_UNAME=":"
fi
fi
UNAME=$ac_cv_prog_UNAME
if test -n "$UNAME"; then
- echo "$as_me:$LINENO: result: $UNAME" >&5
-echo "${ECHO_T}$UNAME" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UNAME" >&5
+$as_echo "$UNAME" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
+
if test "X$prefix" = "XNONE"; then
acl_final_prefix="$ac_default_prefix"
else
@@ -5836,13 +6389,13 @@ fi
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
+# Check whether --with-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;
+fi
+
# Prepare PATH_SEPARATOR.
# The user is always right.
if test "${PATH_SEPARATOR+set}" != set; then
@@ -5859,8 +6412,8 @@ 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
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by GCC" >&5
+$as_echo_n "checking for ld used by GCC... " >&6; }
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
@@ -5889,14 +6442,14 @@ echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6
;;
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
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
else
- echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
fi
-if test "${acl_cv_path_LD+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+if test "${acl_cv_path_LD+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
@@ -5923,19 +6476,17 @@ fi
LD="$acl_cv_path_LD"
if test -n "$LD"; then
- echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+$as_echo "$LD" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "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
+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+if test "${acl_cv_prog_gnu_ld+set}" = set; then :
+ $as_echo_n "(cached) " >&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
@@ -5945,17 +6496,17 @@ case `$LD -v 2>&1 </dev/null` in
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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
+$as_echo "$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
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
+$as_echo_n "checking for shared library run path origin... " >&6; }
+if test "${acl_cv_rpath+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
@@ -5965,8 +6516,8 @@ else
acl_cv_rpath=done
fi
-echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5
-echo "${ECHO_T}$acl_cv_rpath" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5
+$as_echo "$acl_cv_rpath" >&6; }
wl="$acl_cv_wl"
acl_libext="$acl_cv_libext"
acl_shlibext="$acl_cv_shlibext"
@@ -5976,13 +6527,13 @@ echo "${ECHO_T}$acl_cv_rpath" >&6
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"
- :
+ # Check whether --enable-rpath was given.
+if test "${enable_rpath+set}" = set; then :
+ enableval=$enable_rpath; :
else
enable_rpath=yes
-fi;
+fi
+
acl_libdirstem=lib
@@ -6025,10 +6576,9 @@ fi;
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"
-
+# Check whether --with-libiconv-prefix was given.
+if test "${with_libiconv_prefix+set}" = set; then :
+ withval=$with_libiconv_prefix;
if test "X$withval" = "Xno"; then
use_additional=no
else
@@ -6051,7 +6601,8 @@ if test "${with_libiconv_prefix+set}" = set; then
fi
fi
-fi;
+fi
+
LIBICONV=
LTLIBICONV=
INCICONV=
@@ -6473,20 +7024,15 @@ fi;
done
- echo "$as_me:$LINENO: checking for iconv" >&5
-echo $ECHO_N "checking for iconv... $ECHO_C" >&6
-if test "${am_cv_func_iconv+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
+$as_echo_n "checking for iconv... " >&6; }
+if test "${am_cv_func_iconv+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
am_cv_func_iconv="no, consider installing GNU libiconv"
am_cv_lib_iconv=no
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdlib.h>
#include <iconv.h>
@@ -6500,34 +7046,15 @@ iconv_t cd = iconv_open("","");
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
+if ac_fn_c_try_link "$LINENO"; then :
am_cv_func_iconv=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
if test "$am_cv_func_iconv" != yes; then
am_save_LIBS="$LIBS"
LIBS="$LIBS $LIBICONV"
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdlib.h>
#include <iconv.h>
@@ -6541,55 +7068,36 @@ iconv_t cd = iconv_open("","");
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
+if ac_fn_c_try_link "$LINENO"; then :
am_cv_lib_iconv=yes
am_cv_func_iconv=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS="$am_save_LIBS"
fi
fi
-echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
-echo "${ECHO_T}$am_cv_func_iconv" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
+$as_echo "$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
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
+$as_echo_n "checking for working iconv... " >&6; }
+if test "${am_cv_func_iconv_works+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
am_save_LIBS="$LIBS"
if test $am_cv_lib_iconv = yes; then
LIBS="$LIBS $LIBICONV"
fi
- if test "$cross_compiling" = yes; then
+ 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
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <iconv.h>
@@ -6649,33 +7157,20 @@ int main ()
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
+if ac_fn_c_try_run "$LINENO"; 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
+ 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
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam 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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
+$as_echo "$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 ;;
@@ -6685,16 +7180,14 @@ echo "${ECHO_T}$am_cv_func_iconv_works" >&6
fi
if test "$am_func_iconv" = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ICONV 1
-_ACEOF
+$as_echo "#define HAVE_ICONV 1" >>confdefs.h
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
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
+$as_echo_n "checking how to link with libiconv... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
+$as_echo "$LIBICONV" >&6; }
else
CPPFLAGS="$am_save_CPPFLAGS"
LIBICONV=
@@ -6704,18 +7197,13 @@ echo "${ECHO_T}$LIBICONV" >&6
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
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv declaration" >&5
+$as_echo_n "checking for iconv declaration... " >&6; }
+ if test "${am_cv_proto_iconv+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdlib.h>
@@ -6738,34 +7226,20 @@ main ()
return 0;
}
_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
+if ac_fn_c_try_compile "$LINENO"; then :
am_cv_proto_iconv_arg1=""
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-am_cv_proto_iconv_arg1="const"
+ am_cv_proto_iconv_arg1="const"
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"
fi
am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
- echo "$as_me:$LINENO: result: ${ac_t:-
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_t:-
}$am_cv_proto_iconv" >&5
-echo "${ECHO_T}${ac_t:-
- }$am_cv_proto_iconv" >&6
+$as_echo "${ac_t:-
+ }$am_cv_proto_iconv" >&6; }
cat >>confdefs.h <<_ACEOF
#define ICONV_CONST $am_cv_proto_iconv_arg1
@@ -6774,19 +7248,14 @@ _ACEOF
fi
- echo "$as_me:$LINENO: checking for libcharset" >&5
-echo $ECHO_N "checking for libcharset... $ECHO_C" >&6
-if test "${am_cv_libcharset+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libcharset" >&5
+$as_echo_n "checking for libcharset... " >&6; }
+if test "${am_cv_libcharset+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
lc_save_LIBS="$LIBS"
LIBS="$LIBS $LIBICONV"
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <libcharset.h>
int
@@ -6797,51 +7266,31 @@ locale_charset()
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
+if ac_fn_c_try_link "$LINENO"; then :
am_cv_libcharset=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-am_cv_libcharset=no
+ am_cv_libcharset=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS="$lc_save_LIBS"
fi
-echo "$as_me:$LINENO: result: $am_cv_libcharset" >&5
-echo "${ECHO_T}$am_cv_libcharset" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_libcharset" >&5
+$as_echo "$am_cv_libcharset" >&6; }
if test $am_cv_libcharset = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBCHARSET 1
-_ACEOF
+$as_echo "#define HAVE_LIBCHARSET 1" >>confdefs.h
fi
- echo "$as_me:$LINENO: checking for nl_langinfo and CODESET" >&5
-echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
-if test "${am_cv_langinfo_codeset+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5
+$as_echo_n "checking for nl_langinfo and CODESET... " >&6; }
+if test "${am_cv_langinfo_codeset+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <langinfo.h>
int
@@ -6852,44 +7301,26 @@ char* cs = nl_langinfo(CODESET); return !cs;
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
+if ac_fn_c_try_link "$LINENO"; then :
am_cv_langinfo_codeset=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-am_cv_langinfo_codeset=no
+ am_cv_langinfo_codeset=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $am_cv_langinfo_codeset" >&5
-echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_langinfo_codeset" >&5
+$as_echo "$am_cv_langinfo_codeset" >&6; }
if test $am_cv_langinfo_codeset = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LANGINFO_CODESET 1
-_ACEOF
+$as_echo "#define HAVE_LANGINFO_CODESET 1" >>confdefs.h
fi
if test "$am_cv_func_iconv" != yes; then
- { { echo "$as_me:$LINENO: error: Iconv is missing. You can get libiconv from http://gnu.org/, \
-or try using --with-libiconv-prefix." >&5
-echo "$as_me: error: Iconv is missing. You can get libiconv from http://gnu.org/, \
-or try using --with-libiconv-prefix." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "Iconv is missing. You can get libiconv from http://gnu.org/, \
+or try using --with-libiconv-prefix." "$LINENO" 5
fi
LIBS="$LIBS $LIBICONV"
@@ -6901,77 +7332,54 @@ fi
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
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strerror in -lcposix" >&5
+$as_echo_n "checking for strerror in -lcposix... " >&6; }
+if test "${ac_cv_lib_cposix_strerror+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lcposix $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 strerror ();
int
main ()
{
-strerror ();
+return strerror ();
;
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
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_cposix_strerror=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_cposix_strerror=no
+ ac_cv_lib_cposix_strerror=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_cposix_strerror" >&5
-echo "${ECHO_T}$ac_cv_lib_cposix_strerror" >&6
-if test $ac_cv_lib_cposix_strerror = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cposix_strerror" >&5
+$as_echo "$ac_cv_lib_cposix_strerror" >&6; }
+if test "x$ac_cv_lib_cposix_strerror" = x""yes; then :
LIBS="$LIBS -lcposix"
fi
-echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
-if test "${ac_cv_c_const+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
+$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
+if test "${ac_cv_c_const+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -6981,10 +7389,10 @@ main ()
#ifndef __cplusplus
/* Ultrix mips cc rejects this. */
typedef int charset[2];
- const charset x;
+ const charset cs;
/* SunOS 4.1.1 cc rejects this. */
- char const *const *ccp;
- char **p;
+ char const *const *pcpcc;
+ char **ppc;
/* NEC SVR4.0.2 mips cc rejects this. */
struct point {int x, y;};
static struct point const zero = {0,0};
@@ -6993,16 +7401,17 @@ main ()
an arm of an if-expression whose if-part is not a constant
expression */
const char *g = "string";
- ccp = &g + (g ? g-g : 0);
+ pcpcc = &g + (g ? g-g : 0);
/* HPUX 7.0 cc rejects these. */
- ++ccp;
- p = (char**) ccp;
- ccp = (char const *const *) p;
+ ++pcpcc;
+ ppc = (char**) pcpcc;
+ pcpcc = (char const *const *) ppc;
{ /* SCO 3.2v4 cc rejects this. */
char *t;
char const *s = 0 ? (char *) 0 : (char const *) 0;
*t++ = 0;
+ if (s) return 0;
}
{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
int x[] = {25, 17};
@@ -7021,57 +7430,38 @@ main ()
}
{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
const int foo = 10;
+ if (!foo) return 0;
}
+ return !cs[0] && !zero.x;
#endif
;
return 0;
}
_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
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_c_const=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_c_const=no
+ ac_cv_c_const=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-echo "${ECHO_T}$ac_cv_c_const" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
+$as_echo "$ac_cv_c_const" >&6; }
if test $ac_cv_c_const = no; then
-cat >>confdefs.h <<\_ACEOF
-#define const
-_ACEOF
+$as_echo "#define const /**/" >>confdefs.h
fi
-echo "$as_me:$LINENO: checking for inline" >&5
-echo $ECHO_N "checking for inline... $ECHO_C" >&6
-if test "${ac_cv_c_inline+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
+$as_echo_n "checking for inline... " >&6; }
+if test "${ac_cv_c_inline+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_cv_c_inline=no
for ac_kw in inline __inline__ __inline; do
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifndef __cplusplus
typedef int foo_t;
@@ -7080,222 +7470,95 @@ $ac_kw foo_t foo () {return 0; }
#endif
_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
- ac_cv_c_inline=$ac_kw; break
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_c_inline=$ac_kw
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ test "$ac_cv_c_inline" != no && break
done
fi
-echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
-echo "${ECHO_T}$ac_cv_c_inline" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
+$as_echo "$ac_cv_c_inline" >&6; }
+
case $ac_cv_c_inline in
inline | yes) ;;
- no)
-cat >>confdefs.h <<\_ACEOF
-#define inline
-_ACEOF
- ;;
- *) cat >>confdefs.h <<_ACEOF
-#define inline $ac_cv_c_inline
+ *)
+ case $ac_cv_c_inline in
+ no) ac_val=;;
+ *) ac_val=$ac_cv_c_inline;;
+ esac
+ cat >>confdefs.h <<_ACEOF
+#ifndef __cplusplus
+#define inline $ac_val
+#endif
_ACEOF
- ;;
+ ;;
esac
-echo "$as_me:$LINENO: checking for off_t" >&5
-echo $ECHO_N "checking for off_t... $ECHO_C" >&6
-if test "${ac_cv_type_off_t+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. */
-$ac_includes_default
-int
-main ()
-{
-if ((off_t *) 0)
- return 0;
-if (sizeof (off_t))
- return 0;
- ;
- return 0;
-}
-_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
- ac_cv_type_off_t=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"
+if test "x$ac_cv_type_off_t" = x""yes; then :
-ac_cv_type_off_t=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
-echo "${ECHO_T}$ac_cv_type_off_t" >&6
-if test $ac_cv_type_off_t = yes; then
- :
else
cat >>confdefs.h <<_ACEOF
-#define off_t long
+#define off_t long int
_ACEOF
fi
-echo "$as_me:$LINENO: checking for size_t" >&5
-echo $ECHO_N "checking for size_t... $ECHO_C" >&6
-if test "${ac_cv_type_size_t+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. */
-$ac_includes_default
-int
-main ()
-{
-if ((size_t *) 0)
- return 0;
-if (sizeof (size_t))
- return 0;
- ;
- return 0;
-}
-_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
- ac_cv_type_size_t=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
+if test "x$ac_cv_type_size_t" = x""yes; then :
-ac_cv_type_size_t=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-echo "${ECHO_T}$ac_cv_type_size_t" >&6
-if test $ac_cv_type_size_t = yes; then
- :
else
cat >>confdefs.h <<_ACEOF
-#define size_t unsigned
+#define size_t unsigned int
_ACEOF
fi
# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
# for constant arguments. Useless!
-echo "$as_me:$LINENO: checking for working alloca.h" >&5
-echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6
-if test "${ac_cv_working_alloca_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
+$as_echo_n "checking for working alloca.h... " >&6; }
+if test "${ac_cv_working_alloca_h+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <alloca.h>
int
main ()
{
char *p = (char *) alloca (2 * sizeof (int));
+ if (p) return 0;
;
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
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_working_alloca_h=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_working_alloca_h=no
+ ac_cv_working_alloca_h=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
-echo "${ECHO_T}$ac_cv_working_alloca_h" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
+$as_echo "$ac_cv_working_alloca_h" >&6; }
if test $ac_cv_working_alloca_h = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ALLOCA_H 1
-_ACEOF
+$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h
fi
-echo "$as_me:$LINENO: checking for alloca" >&5
-echo $ECHO_N "checking for alloca... $ECHO_C" >&6
-if test "${ac_cv_func_alloca_works+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
+$as_echo_n "checking for alloca... " >&6; }
+if test "${ac_cv_func_alloca_works+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifdef __GNUC__
# define alloca __builtin_alloca
@@ -7304,7 +7567,7 @@ cat >>conftest.$ac_ext <<_ACEOF
# include <malloc.h>
# define alloca _alloca
# else
-# if HAVE_ALLOCA_H
+# ifdef HAVE_ALLOCA_H
# include <alloca.h>
# else
# ifdef _AIX
@@ -7322,39 +7585,25 @@ int
main ()
{
char *p = (char *) alloca (1);
+ if (p) return 0;
;
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
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_func_alloca_works=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_alloca_works=no
+ ac_cv_func_alloca_works=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
-echo "${ECHO_T}$ac_cv_func_alloca_works" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
+$as_echo "$ac_cv_func_alloca_works" >&6; }
if test $ac_cv_func_alloca_works = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ALLOCA 1
-_ACEOF
+$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h
else
# The SVR3 libPW and SVR4 libucb both contain incompatible functions
@@ -7362,26 +7611,19 @@ else
# contain a buggy version. If you still want to use their alloca,
# use ar to extract alloca.o from them instead of compiling alloca.c.
-ALLOCA=alloca.$ac_objext
+ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
-cat >>confdefs.h <<\_ACEOF
-#define C_ALLOCA 1
-_ACEOF
+$as_echo "#define C_ALLOCA 1" >>confdefs.h
-echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
-echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6
-if test "${ac_cv_os_cray+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
+$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
+if test "${ac_cv_os_cray+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#if defined(CRAY) && ! defined(CRAY2)
+#if defined CRAY && ! defined CRAY2
webecray
#else
wenotbecray
@@ -7389,7 +7631,7 @@ wenotbecray
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "webecray" >/dev/null 2>&1; then
+ $EGREP "webecray" >/dev/null 2>&1; then :
ac_cv_os_cray=yes
else
ac_cv_os_cray=no
@@ -7397,84 +7639,14 @@ fi
rm -f conftest*
fi
-echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
-echo "${ECHO_T}$ac_cv_os_cray" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5
+$as_echo "$ac_cv_os_cray" >&6; }
if test $ac_cv_os_cray = yes; then
for ac_func in _getb67 GETB67 getb67; 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
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define CRAY_STACKSEG_END $ac_func
@@ -7486,21 +7658,17 @@ fi
done
fi
-echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
-echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6
-if test "${ac_cv_c_stack_direction+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
+$as_echo_n "checking stack direction for C alloca... " >&6; }
+if test "${ac_cv_c_stack_direction+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
ac_cv_c_stack_direction=0
else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
+$ac_includes_default
int
find_stack_direction ()
{
@@ -7518,35 +7686,21 @@ find_stack_direction ()
int
main ()
{
- exit (find_stack_direction () < 0);
+ return find_stack_direction () < 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
+if ac_fn_c_try_run "$LINENO"; then :
ac_cv_c_stack_direction=1
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 )
-ac_cv_c_stack_direction=-1
+ ac_cv_c_stack_direction=-1
fi
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
-echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
+$as_echo "$ac_cv_c_stack_direction" >&6; }
cat >>confdefs.h <<_ACEOF
#define STACK_DIRECTION $ac_cv_c_stack_direction
_ACEOF
@@ -7554,247 +7708,40 @@ _ACEOF
fi
-
-
for ac_header in stdlib.h unistd.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
- # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-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. */
-$ac_includes_default
-#include <$ac_header>
-_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
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-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 <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc in
- yes:no )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf at gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
- no:yes )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf at gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
fi
done
-
for ac_func in getpagesize
-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
+do :
+ ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize"
+if test "x$ac_cv_func_getpagesize" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_GETPAGESIZE 1
_ACEOF
fi
done
-echo "$as_me:$LINENO: checking for working mmap" >&5
-echo $ECHO_N "checking for working mmap... $ECHO_C" >&6
-if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5
+$as_echo_n "checking for working mmap... " >&6; }
+if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
ac_cv_func_mmap_fixed_mapped=no
else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
$ac_includes_default
/* malloc might have been renamed as rpl_malloc. */
@@ -7825,21 +7772,21 @@ $ac_includes_default
#include <fcntl.h>
#include <sys/mman.h>
-#if !STDC_HEADERS && !HAVE_STDLIB_H
+#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H
char *malloc ();
#endif
/* This mess was copied from the GNU getpagesize.h. */
-#if !HAVE_GETPAGESIZE
+#ifndef HAVE_GETPAGESIZE
/* Assume that all systems that can run configure have sys/param.h. */
-# if !HAVE_SYS_PARAM_H
+# ifndef HAVE_SYS_PARAM_H
# define HAVE_SYS_PARAM_H 1
# endif
# ifdef _SC_PAGESIZE
# define getpagesize() sysconf(_SC_PAGESIZE)
# else /* no _SC_PAGESIZE */
-# if HAVE_SYS_PARAM_H
+# ifdef HAVE_SYS_PARAM_H
# include <sys/param.h>
# ifdef EXEC_PAGESIZE
# define getpagesize() EXEC_PAGESIZE
@@ -7878,15 +7825,15 @@ main ()
/* First, make a file with some known garbage in it. */
data = (char *) malloc (pagesize);
if (!data)
- exit (1);
+ return 1;
for (i = 0; i < pagesize; ++i)
*(data + i) = rand ();
umask (0);
fd = creat ("conftest.mmap", 0600);
if (fd < 0)
- exit (1);
+ return 1;
if (write (fd, data, pagesize) != pagesize)
- exit (1);
+ return 1;
close (fd);
/* Next, try to mmap the file at a fixed address which already has
@@ -7894,17 +7841,17 @@ main ()
we see the same garbage. */
fd = open ("conftest.mmap", O_RDWR);
if (fd < 0)
- exit (1);
+ return 1;
data2 = (char *) malloc (2 * pagesize);
if (!data2)
- exit (1);
- data2 += (pagesize - ((int) data2 & (pagesize - 1))) & (pagesize - 1);
+ return 1;
+ data2 += (pagesize - ((long int) data2 & (pagesize - 1))) & (pagesize - 1);
if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,
- MAP_PRIVATE | MAP_FIXED, fd, 0L))
- exit (1);
+ MAP_PRIVATE | MAP_FIXED, fd, 0L))
+ return 1;
for (i = 0; i < pagesize; ++i)
if (*(data + i) != *(data2 + i))
- exit (1);
+ return 1;
/* Finally, make sure that changes to the mapped area do not
percolate back to the file as seen by read(). (This is a bug on
@@ -7913,62 +7860,42 @@ main ()
*(data2 + i) = *(data2 + i) + 1;
data3 = (char *) malloc (pagesize);
if (!data3)
- exit (1);
+ return 1;
if (read (fd, data3, pagesize) != pagesize)
- exit (1);
+ return 1;
for (i = 0; i < pagesize; ++i)
if (*(data + i) != *(data3 + i))
- exit (1);
+ return 1;
close (fd);
- exit (0);
+ 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
+if ac_fn_c_try_run "$LINENO"; then :
ac_cv_func_mmap_fixed_mapped=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 )
-ac_cv_func_mmap_fixed_mapped=no
+ ac_cv_func_mmap_fixed_mapped=no
fi
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
+
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5
-echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_fixed_mapped" >&5
+$as_echo "$ac_cv_func_mmap_fixed_mapped" >&6; }
if test $ac_cv_func_mmap_fixed_mapped = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_MMAP 1
-_ACEOF
+$as_echo "#define HAVE_MMAP 1" >>confdefs.h
fi
rm -f conftest.mmap
- echo "$as_me:$LINENO: checking whether we are using the GNU C Library 2.1 or newer" >&5
-echo $ECHO_N "checking whether we are using the GNU C Library 2.1 or newer... $ECHO_C" >&6
-if test "${ac_cv_gnu_library_2_1+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C Library 2.1 or newer" >&5
+$as_echo_n "checking whether we are using the GNU C Library 2.1 or newer... " >&6; }
+if test "${ac_cv_gnu_library_2_1+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <features.h>
@@ -7980,7 +7907,7 @@ cat >>conftest.$ac_ext <<_ACEOF
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "Lucky GNU user" >/dev/null 2>&1; then
+ $EGREP "Lucky GNU user" >/dev/null 2>&1; then :
ac_cv_gnu_library_2_1=yes
else
ac_cv_gnu_library_2_1=no
@@ -7990,266 +7917,38 @@ rm -f conftest*
fi
-echo "$as_me:$LINENO: result: $ac_cv_gnu_library_2_1" >&5
-echo "${ECHO_T}$ac_cv_gnu_library_2_1" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gnu_library_2_1" >&5
+$as_echo "$ac_cv_gnu_library_2_1" >&6; }
GLIBC21="$ac_cv_gnu_library_2_1"
-
-
-
-
-
-
-
-
-
-
-for ac_header in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
+ for ac_header in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
stdlib.h string.h unistd.h sys/param.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
- # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-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. */
-$ac_includes_default
-#include <$ac_header>
-_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
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-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 <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc in
- yes:no )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf at gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
- no:yes )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf at gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
fi
done
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-for ac_func in feof_unlocked fgets_unlocked getcwd getegid geteuid \
+ for ac_func in feof_unlocked fgets_unlocked getcwd getegid geteuid \
getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \
strdup strtoul tsearch __argz_count __argz_stringify __argz_next
-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
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
fi
@@ -8286,20 +7985,15 @@ done
done
- echo "$as_me:$LINENO: checking for iconv" >&5
-echo $ECHO_N "checking for iconv... $ECHO_C" >&6
-if test "${am_cv_func_iconv+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
+$as_echo_n "checking for iconv... " >&6; }
+if test "${am_cv_func_iconv+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
am_cv_func_iconv="no, consider installing GNU libiconv"
am_cv_lib_iconv=no
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdlib.h>
#include <iconv.h>
@@ -8313,34 +8007,15 @@ iconv_t cd = iconv_open("","");
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
+if ac_fn_c_try_link "$LINENO"; then :
am_cv_func_iconv=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
if test "$am_cv_func_iconv" != yes; then
am_save_LIBS="$LIBS"
LIBS="$LIBS $LIBICONV"
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdlib.h>
#include <iconv.h>
@@ -8354,55 +8029,36 @@ iconv_t cd = iconv_open("","");
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
+if ac_fn_c_try_link "$LINENO"; then :
am_cv_lib_iconv=yes
am_cv_func_iconv=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS="$am_save_LIBS"
fi
fi
-echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
-echo "${ECHO_T}$am_cv_func_iconv" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
+$as_echo "$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
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
+$as_echo_n "checking for working iconv... " >&6; }
+if test "${am_cv_func_iconv_works+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
am_save_LIBS="$LIBS"
if test $am_cv_lib_iconv = yes; then
LIBS="$LIBS $LIBICONV"
fi
- if test "$cross_compiling" = yes; then
+ 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
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <iconv.h>
@@ -8462,33 +8118,20 @@ int main ()
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
+if ac_fn_c_try_run "$LINENO"; 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
+ 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
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam 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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
+$as_echo "$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 ;;
@@ -8498,16 +8141,14 @@ echo "${ECHO_T}$am_cv_func_iconv_works" >&6
fi
if test "$am_func_iconv" = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ICONV 1
-_ACEOF
+$as_echo "#define HAVE_ICONV 1" >>confdefs.h
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
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
+$as_echo_n "checking how to link with libiconv... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
+$as_echo "$LIBICONV" >&6; }
else
CPPFLAGS="$am_save_CPPFLAGS"
LIBICONV=
@@ -8517,18 +8158,13 @@ echo "${ECHO_T}$LIBICONV" >&6
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
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv declaration" >&5
+$as_echo_n "checking for iconv declaration... " >&6; }
+ if test "${am_cv_proto_iconv+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdlib.h>
@@ -8551,34 +8187,20 @@ main ()
return 0;
}
_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
+if ac_fn_c_try_compile "$LINENO"; then :
am_cv_proto_iconv_arg1=""
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-am_cv_proto_iconv_arg1="const"
+ am_cv_proto_iconv_arg1="const"
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"
fi
am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
- echo "$as_me:$LINENO: result: ${ac_t:-
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_t:-
}$am_cv_proto_iconv" >&5
-echo "${ECHO_T}${ac_t:-
- }$am_cv_proto_iconv" >&6
+$as_echo "${ac_t:-
+ }$am_cv_proto_iconv" >&6; }
cat >>confdefs.h <<_ACEOF
#define ICONV_CONST $am_cv_proto_iconv_arg1
@@ -8587,17 +8209,12 @@ _ACEOF
fi
- echo "$as_me:$LINENO: checking for nl_langinfo and CODESET" >&5
-echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
-if test "${am_cv_langinfo_codeset+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5
+$as_echo_n "checking for nl_langinfo and CODESET... " >&6; }
+if test "${am_cv_langinfo_codeset+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <langinfo.h>
int
@@ -8608,50 +8225,30 @@ char* cs = nl_langinfo(CODESET); return !cs;
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
+if ac_fn_c_try_link "$LINENO"; then :
am_cv_langinfo_codeset=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-am_cv_langinfo_codeset=no
+ am_cv_langinfo_codeset=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $am_cv_langinfo_codeset" >&5
-echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_langinfo_codeset" >&5
+$as_echo "$am_cv_langinfo_codeset" >&6; }
if test $am_cv_langinfo_codeset = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LANGINFO_CODESET 1
-_ACEOF
+$as_echo "#define HAVE_LANGINFO_CODESET 1" >>confdefs.h
fi
if test $ac_cv_header_locale_h = yes; then
- echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
-echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6
-if test "${am_cv_val_LC_MESSAGES+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5
+$as_echo_n "checking for LC_MESSAGES... " >&6; }
+if test "${am_cv_val_LC_MESSAGES+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <locale.h>
int
@@ -8662,48 +8259,33 @@ return LC_MESSAGES
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
+if ac_fn_c_try_link "$LINENO"; then :
am_cv_val_LC_MESSAGES=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-am_cv_val_LC_MESSAGES=no
+ am_cv_val_LC_MESSAGES=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
-echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5
+$as_echo "$am_cv_val_LC_MESSAGES" >&6; }
if test $am_cv_val_LC_MESSAGES = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LC_MESSAGES 1
-_ACEOF
+$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h
fi
fi
- echo "$as_me:$LINENO: checking whether NLS is requested" >&5
-echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6
- # Check whether --enable-nls or --disable-nls was given.
-if test "${enable_nls+set}" = set; then
- enableval="$enable_nls"
- USE_NLS=$enableval
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
+$as_echo_n "checking whether NLS is requested... " >&6; }
+ # Check whether --enable-nls was given.
+if test "${enable_nls+set}" = set; then :
+ enableval=$enable_nls; USE_NLS=$enableval
else
USE_NLS=yes
-fi;
- echo "$as_me:$LINENO: result: $USE_NLS" >&5
-echo "${ECHO_T}$USE_NLS" >&6
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
+$as_echo "$USE_NLS" >&6; }
BUILD_INCLUDED_LIBINTL=no
@@ -8712,22 +8294,20 @@ echo "${ECHO_T}$USE_NLS" >&6
if test "$USE_NLS" = "yes"; then
-cat >>confdefs.h <<\_ACEOF
-#define ENABLE_NLS 1
-_ACEOF
+$as_echo "#define ENABLE_NLS 1" >>confdefs.h
- echo "$as_me:$LINENO: checking whether included gettext is requested" >&5
-echo $ECHO_N "checking whether included gettext is requested... $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether included gettext is requested" >&5
+$as_echo_n "checking whether included gettext is requested... " >&6; }
-# Check whether --with-included-gettext or --without-included-gettext was given.
-if test "${with_included_gettext+set}" = set; then
- withval="$with_included_gettext"
- nls_cv_force_use_gnu_gettext=$withval
+# Check whether --with-included-gettext was given.
+if test "${with_included_gettext+set}" = set; then :
+ withval=$with_included_gettext; nls_cv_force_use_gnu_gettext=$withval
else
nls_cv_force_use_gnu_gettext=no
-fi;
- echo "$as_me:$LINENO: result: $nls_cv_force_use_gnu_gettext" >&5
-echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $nls_cv_force_use_gnu_gettext" >&5
+$as_echo "$nls_cv_force_use_gnu_gettext" >&6; }
nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
@@ -8736,147 +8316,14 @@ echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6
- if test "${ac_cv_header_libintl_h+set}" = set; then
- echo "$as_me:$LINENO: checking for libintl.h" >&5
-echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6
-if test "${ac_cv_header_libintl_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
-echo "${ECHO_T}$ac_cv_header_libintl_h" >&6
+ ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
+if test "x$ac_cv_header_libintl_h" = x""yes; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5
+$as_echo_n "checking for GNU gettext in libc... " >&6; }
+if test "${gt_cv_func_gnugettext2_libc+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- # Is the header compilable?
-echo "$as_me:$LINENO: checking libintl.h usability" >&5
-echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6
-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. */
-$ac_includes_default
-#include <libintl.h>
-_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
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking libintl.h presence" >&5
-echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6
-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 <libintl.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc in
- yes:no )
- { echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf at gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
- no:yes )
- { echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf at gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-echo "$as_me:$LINENO: checking for libintl.h" >&5
-echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6
-if test "${ac_cv_header_libintl_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_libintl_h=$ac_header_preproc
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
-echo "${ECHO_T}$ac_cv_header_libintl_h" >&6
-
-fi
-if test $ac_cv_header_libintl_h = yes; then
- echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5
-echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6
-if test "${gt_cv_func_gnugettext2_libc+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
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <libintl.h>
extern int _nl_msg_cat_cntr;
@@ -8889,44 +8336,26 @@ return (int) gettext ("") + (int) ngettext ("", "", 0) + _nl_msg_cat_cntr
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
+if ac_fn_c_try_link "$LINENO"; then :
gt_cv_func_gnugettext2_libc=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-gt_cv_func_gnugettext2_libc=no
+ gt_cv_func_gnugettext2_libc=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext2_libc" >&5
-echo "${ECHO_T}$gt_cv_func_gnugettext2_libc" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_gnugettext2_libc" >&5
+$as_echo "$gt_cv_func_gnugettext2_libc" >&6; }
if test "$gt_cv_func_gnugettext2_libc" != "yes"; then
- echo "$as_me:$LINENO: checking for GNU gettext in libintl" >&5
-echo $ECHO_N "checking for GNU gettext in libintl... $ECHO_C" >&6
-if test "${gt_cv_func_gnugettext2_libintl+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
+$as_echo_n "checking for GNU gettext in libintl... " >&6; }
+if test "${gt_cv_func_gnugettext2_libintl+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
gt_save_LIBS="$LIBS"
LIBS="$LIBS -lintl $LIBICONV"
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <libintl.h>
extern int _nl_msg_cat_cntr;
@@ -8939,39 +8368,24 @@ return (int) gettext ("") + (int) ngettext ("", "", 0) + _nl_msg_cat_cntr
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
+if ac_fn_c_try_link "$LINENO"; then :
gt_cv_func_gnugettext2_libintl=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-gt_cv_func_gnugettext2_libintl=no
+ gt_cv_func_gnugettext2_libintl=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS="$gt_save_LIBS"
fi
-echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext2_libintl" >&5
-echo "${ECHO_T}$gt_cv_func_gnugettext2_libintl" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_gnugettext2_libintl" >&5
+$as_echo "$gt_cv_func_gnugettext2_libintl" >&6; }
fi
if test "$gt_cv_func_gnugettext2_libc" = "yes" \
|| { test "$gt_cv_func_gnugettext2_libintl" = "yes" \
&& test "$PACKAGE" != gettext; }; then
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GETTEXT 1
-_ACEOF
+$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
if test "$gt_cv_func_gnugettext2_libintl" = "yes"; then
@@ -8980,85 +8394,12 @@ _ACEOF
gt_save_LIBS="$LIBS"
LIBS="$LIBS $INTLLIBS"
-
-for ac_func in dcgettext
-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
+ for ac_func in dcgettext
+do :
+ ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext"
+if test "x$ac_cv_func_dcgettext" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_DCGETTEXT 1
_ACEOF
fi
@@ -9068,10 +8409,10 @@ done
# Extract the first word of "msgfmt", so it can be a program name with args.
set dummy msgfmt; 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_MSGFMT+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_MSGFMT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
case "$MSGFMT" in
/*)
@@ -9095,19 +8436,19 @@ esac
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test "$MSGFMT" != ":"; then
- echo "$as_me:$LINENO: result: $MSGFMT" >&5
-echo "${ECHO_T}$MSGFMT" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
+$as_echo "$MSGFMT" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
# Extract the first word of "gmsgfmt", so it can be a program name with args.
set dummy gmsgfmt; 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_GMSGFMT+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_GMSGFMT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
case $GMSGFMT in
[\\/]* | ?:[\\/]*)
@@ -9119,36 +8460,37 @@ 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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
+IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
;;
esac
fi
GMSGFMT=$ac_cv_path_GMSGFMT
-
if test -n "$GMSGFMT"; then
- echo "$as_me:$LINENO: result: $GMSGFMT" >&5
-echo "${ECHO_T}$GMSGFMT" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
+$as_echo "$GMSGFMT" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
+
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; 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_XGETTEXT+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_XGETTEXT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
case "$XGETTEXT" in
/*)
@@ -9172,11 +8514,11 @@ esac
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test "$XGETTEXT" != ":"; then
- echo "$as_me:$LINENO: result: $XGETTEXT" >&5
-echo "${ECHO_T}$XGETTEXT" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
+$as_echo "$XGETTEXT" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -9196,10 +8538,10 @@ fi
INTLOBJS="\$(GETTOBJS)"
# Extract the first word of "msgfmt", so it can be a program name with args.
set dummy msgfmt; 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_MSGFMT+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_MSGFMT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
case "$MSGFMT" in
/*)
@@ -9223,19 +8565,19 @@ esac
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test "$MSGFMT" != ":"; then
- echo "$as_me:$LINENO: result: $MSGFMT" >&5
-echo "${ECHO_T}$MSGFMT" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
+$as_echo "$MSGFMT" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
# Extract the first word of "gmsgfmt", so it can be a program name with args.
set dummy gmsgfmt; 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_GMSGFMT+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_GMSGFMT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
case $GMSGFMT in
[\\/]* | ?:[\\/]*)
@@ -9247,35 +8589,36 @@ 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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
+IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
;;
esac
fi
GMSGFMT=$ac_cv_path_GMSGFMT
-
if test -n "$GMSGFMT"; then
- echo "$as_me:$LINENO: result: $GMSGFMT" >&5
-echo "${ECHO_T}$GMSGFMT" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
+$as_echo "$GMSGFMT" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
+
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; 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_XGETTEXT+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_XGETTEXT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
case "$XGETTEXT" in
/*)
@@ -9299,11 +8642,11 @@ esac
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test "$XGETTEXT" != ":"; then
- echo "$as_me:$LINENO: result: $XGETTEXT" >&5
-echo "${ECHO_T}$XGETTEXT" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
+$as_echo "$XGETTEXT" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -9318,8 +8661,8 @@ fi
if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then
: ;
else
- echo "$as_me:$LINENO: result: found msgfmt program is not GNU msgfmt; ignore it" >&5
-echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found msgfmt program is not GNU msgfmt; ignore it" >&5
+$as_echo "found msgfmt program is not GNU msgfmt; ignore it" >&6; }
GMSGFMT=":"
fi
fi
@@ -9328,15 +8671,15 @@ echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6
if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then
: ;
else
- echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
-echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5
+$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
XGETTEXT=":"
fi
fi
POSUB=po
fi
- ac_config_commands="$ac_config_commands default-1"
+ ac_config_commands="$ac_config_commands default-1"
@@ -9348,10 +8691,10 @@ echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; 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_prog_INTLBISON+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_INTLBISON+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$INTLBISON"; then
ac_cv_prog_INTLBISON="$INTLBISON" # Let the user override the test.
@@ -9361,34 +8704,36 @@ 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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_INTLBISON="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
+IFS=$as_save_IFS
fi
fi
INTLBISON=$ac_cv_prog_INTLBISON
if test -n "$INTLBISON"; then
- echo "$as_me:$LINENO: result: $INTLBISON" >&5
-echo "${ECHO_T}$INTLBISON" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLBISON" >&5
+$as_echo "$INTLBISON" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
+
test -n "$INTLBISON" && break
done
if test -z "$INTLBISON"; then
ac_verc_fail=yes
else
- echo "$as_me:$LINENO: checking version of bison" >&5
-echo $ECHO_N "checking version of bison... $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of bison" >&5
+$as_echo_n "checking version of bison... " >&6; }
ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
case $ac_prog_version in
'') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
@@ -9396,8 +8741,8 @@ echo $ECHO_N "checking version of bison... $ECHO_C" >&6
ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
*) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
esac
- echo "$as_me:$LINENO: result: $ac_prog_version" >&5
-echo "${ECHO_T}$ac_prog_version" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_prog_version" >&5
+$as_echo "$ac_prog_version" >&6; }
fi
if test $ac_verc_fail = yes; then
INTLBISON=:
@@ -9435,8 +8780,8 @@ echo "${ECHO_T}$ac_prog_version" >&6
if test "x$ALL_LINGUAS" = "x"; then
LINGUAS=
else
- echo "$as_me:$LINENO: checking for catalogs to be installed" >&5
-echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5
+$as_echo_n "checking for catalogs to be installed... " >&6; }
NEW_LINGUAS=
for presentlang in $ALL_LINGUAS; do
useit=no
@@ -9455,8 +8800,8 @@ echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6
fi
done
LINGUAS=$NEW_LINGUAS
- echo "$as_me:$LINENO: result: $LINGUAS" >&5
-echo "${ECHO_T}$LINGUAS" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5
+$as_echo "$LINGUAS" >&6; }
fi
if test -n "$LINGUAS"; then
@@ -9482,79 +8827,56 @@ if test "$USE_NLS" = "yes"; then
if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
have_working_ngettext=0
- echo "$as_me:$LINENO: checking for ngettext in -lc" >&5
-echo $ECHO_N "checking for ngettext in -lc... $ECHO_C" >&6
-if test "${ac_cv_lib_c_ngettext+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lc" >&5
+$as_echo_n "checking for ngettext in -lc... " >&6; }
+if test "${ac_cv_lib_c_ngettext+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lc $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 ngettext ();
int
main ()
{
-ngettext ();
+return ngettext ();
;
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
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_c_ngettext=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_c_ngettext=no
+ ac_cv_lib_c_ngettext=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_c_ngettext" >&5
-echo "${ECHO_T}$ac_cv_lib_c_ngettext" >&6
-if test $ac_cv_lib_c_ngettext = yes; then
- echo "$as_me:$LINENO: checking whether libc's ngettext works at runtime" >&5
-echo $ECHO_N "checking whether libc's ngettext works at runtime... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_ngettext" >&5
+$as_echo "$ac_cv_lib_c_ngettext" >&6; }
+if test "x$ac_cv_lib_c_ngettext" = x""yes; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether libc's ngettext works at runtime" >&5
+$as_echo_n "checking whether libc's ngettext works at runtime... " >&6; }
templibs="$LIBS"
LIBS=" $LIBS"
templang="$LANG"
LANG="de_DE"
-if test "$cross_compiling" = yes; then
- echo "$as_me:$LINENO: result: unknown: cross-compiling" >&5
-echo "${ECHO_T}unknown: cross-compiling" >&6
+if test "$cross_compiling" = yes; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown: cross-compiling" >&5
+$as_echo "unknown: cross-compiling" >&6; }
have_working_ngettext=1
else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/*
@@ -9580,32 +8902,19 @@ int main(int argc, char *argv[])
}
_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
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+if ac_fn_c_try_run "$LINENO"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
have_working_ngettext=1
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 )
-echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
+
LIBS="$templibs"
LANG="$templang"
@@ -9613,79 +8922,56 @@ fi
if test "$have_working_ngettext" = "0"; then
- echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
-echo $ECHO_N "checking for ngettext in -lintl... $ECHO_C" >&6
-if test "${ac_cv_lib_intl_ngettext+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
+$as_echo_n "checking for ngettext in -lintl... " >&6; }
+if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lintl $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 ngettext ();
int
main ()
{
-ngettext ();
+return ngettext ();
;
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
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_intl_ngettext=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_intl_ngettext=no
+ ac_cv_lib_intl_ngettext=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
-echo "${ECHO_T}$ac_cv_lib_intl_ngettext" >&6
-if test $ac_cv_lib_intl_ngettext = yes; then
- echo "$as_me:$LINENO: checking whether libintl's ngettext works at runtime" >&5
-echo $ECHO_N "checking whether libintl's ngettext works at runtime... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
+$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
+if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether libintl's ngettext works at runtime" >&5
+$as_echo_n "checking whether libintl's ngettext works at runtime... " >&6; }
templibs="$LIBS"
LIBS=""-lintl" $LIBS"
templang="$LANG"
LANG="de_DE"
-if test "$cross_compiling" = yes; then
- echo "$as_me:$LINENO: result: unknown: cross-compiling" >&5
-echo "${ECHO_T}unknown: cross-compiling" >&6
+if test "$cross_compiling" = yes; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown: cross-compiling" >&5
+$as_echo "unknown: cross-compiling" >&6; }
have_working_ngettext=1
else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/*
@@ -9711,32 +8997,19 @@ int main(int argc, char *argv[])
}
_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
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+if ac_fn_c_try_run "$LINENO"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
have_working_ngettext=1
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 )
-echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
+
LIBS="$templibs"
LANG="$templang"
@@ -9745,28 +9018,20 @@ fi
fi
if test "$have_working_ngettext" = "0"; then
- { { echo "$as_me:$LINENO: error: I haven't found a working ngettext function in your system.
-Try --with-included-gettext or --disable-nls. Read ABOUT-NLS." >&5
-echo "$as_me: error: I haven't found a working ngettext function in your system.
-Try --with-included-gettext or --disable-nls. Read ABOUT-NLS." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "I haven't found a working ngettext function in your system.
+Try --with-included-gettext or --disable-nls. Read ABOUT-NLS." "$LINENO" 5
fi
fi
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
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU xgettext version >= 0.10.36" >&5
+$as_echo_n "checking for GNU xgettext version >= 0.10.36... " >&6; }
xgettext_version=`$XGETTEXT --version 2>&1 | grep GNU | head -n 1 | sed 's/"/ /g'`
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
echo error
else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdio.h>
@@ -9791,52 +9056,34 @@ int main()
}
_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
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+if ac_fn_c_try_run "$LINENO"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
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 )
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- { echo "$as_me:$LINENO: WARNING: You may have problems with creating pox files. \
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You may have problems with creating pox files. \
Please update your gettext package." >&5
-echo "$as_me: WARNING: You may have problems with creating pox files. \
+$as_echo "$as_me: WARNING: You may have problems with creating pox files. \
Please update your gettext package." >&2;}
fi
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
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
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU msgfmt version >= 0.10.35" >&5
+$as_echo_n "checking for GNU msgfmt version >= 0.10.35... " >&6; }
msgfmt_version=`$MSGFMT --version 2>&1 | grep GNU | head -n 1 | sed 's/"/ /g'`
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
echo error
else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdio.h>
@@ -9862,43 +9109,25 @@ int main()
}
_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
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+if ac_fn_c_try_run "$LINENO"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
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 )
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- { { echo "$as_me:$LINENO: error: You are unable to create *.gmo files.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ as_fn_error "You are unable to create *.gmo files.
This is development version which doesn't include them. Please update your
gettext package. We recommend you versions >= 0.10.38. Or use
---disable-nls instead." >&5
-echo "$as_me: error: You are unable to create *.gmo files.
-This is development version which doesn't include them. Please update your
-gettext package. We recommend you versions >= 0.10.38. Or use
---disable-nls instead." >&2;}
- { (exit 1); exit 1; }; }
+--disable-nls instead." "$LINENO" 5
fi
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
+
fi
fi
@@ -9919,21 +9148,11 @@ 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
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
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
+if ac_fn_c_try_compile "$LINENO"; then :
old_value="`eval echo '$'accepted_flags`"
if test "x$old_value" = "x" ; then
@@ -9942,12 +9161,8 @@ 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
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
old_value="`eval echo '$'EXTRA_DEBUG_CFLAGS`"
@@ -9971,7 +9186,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-ac_ext=cc
+ac_ext=cpp
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'
@@ -9984,21 +9199,11 @@ accepted_flags=""
for flag in -Wall -Wpointer-arith -Wcast-align
do
CXXFLAGS="$flags_save $accepted_flags $flag "
- cat >conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
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
+if ac_fn_cxx_try_compile "$LINENO"; then :
old_value="`eval echo '$'accepted_flags`"
if test "x$old_value" = "x" ; then
@@ -10007,12 +9212,8 @@ 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
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
old_value="`eval echo '$'EXTRA_DEBUG_CXXFLAGS`"
@@ -10035,26 +9236,22 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-# Check whether --enable-debug or --disable-debug was given.
-if test "${enable_debug+set}" = set; then
- enableval="$enable_debug"
- case "${enableval}" in
+# Check whether --enable-debug was given.
+if test "${enable_debug+set}" = set; then :
+ enableval=$enable_debug; case "${enableval}" in
yes) enable_debug=yes ;;
some) enable_debug=some ;;
no) enable_debug=no ;;
- *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-debug" >&5
-echo "$as_me: error: bad value ${enableval} for --enable-debug" >&2;}
- { (exit 1); exit 1; }; } ;;
+ *) as_fn_error "bad value ${enableval} for --enable-debug" "$LINENO" 5 ;;
esac
else
enable_debug=some
-fi;
+fi
+
if test "x$enable_debug" = "xyes"; then
-cat >>confdefs.h <<\_ACEOF
-#define DEBUG 1
-_ACEOF
+$as_echo "#define DEBUG 1" >>confdefs.h
@@ -10071,21 +9268,11 @@ accepted_flags=""
for flag in -Werror
do
CFLAGS="$flags_save $accepted_flags $flag "
- cat >conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
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
+if ac_fn_c_try_compile "$LINENO"; then :
old_value="`eval echo '$'accepted_flags`"
if test "x$old_value" = "x" ; then
@@ -10094,12 +9281,8 @@ 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
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
old_value="`eval echo '$'EXTRA_DEBUG_CFLAGS`"
@@ -10122,7 +9305,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-ac_ext=cc
+ac_ext=cpp
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'
@@ -10135,21 +9318,11 @@ accepted_flags=""
for flag in -Werror
do
CXXFLAGS="$flags_save $accepted_flags $flag "
- cat >conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
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
+if ac_fn_cxx_try_compile "$LINENO"; then :
old_value="`eval echo '$'accepted_flags`"
if test "x$old_value" = "x" ; then
@@ -10158,12 +9331,8 @@ 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
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
old_value="`eval echo '$'EXTRA_DEBUG_CXXFLAGS`"
@@ -10187,9 +9356,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
else
if test "x$enable_debug" = "xno"; then
-cat >>confdefs.h <<\_ACEOF
-#define NDEBUG 1
-_ACEOF
+$as_echo "#define NDEBUG 1" >>confdefs.h
@@ -10206,21 +9373,11 @@ accepted_flags=""
for flag in -O3 -fomit-frame-pointer
do
CFLAGS="$flags_save $accepted_flags $flag "
- cat >conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
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
+if ac_fn_c_try_compile "$LINENO"; then :
old_value="`eval echo '$'accepted_flags`"
if test "x$old_value" = "x" ; then
@@ -10229,12 +9386,8 @@ 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
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
old_value="`eval echo '$'EXTRA_DEBUG_CFLAGS`"
@@ -10257,7 +9410,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-ac_ext=cc
+ac_ext=cpp
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'
@@ -10270,21 +9423,11 @@ accepted_flags=""
for flag in -O3 -fomit-frame-pointer
do
CXXFLAGS="$flags_save $accepted_flags $flag "
- cat >conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
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
+if ac_fn_cxx_try_compile "$LINENO"; then :
old_value="`eval echo '$'accepted_flags`"
if test "x$old_value" = "x" ; then
@@ -10293,12 +9436,8 @@ 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
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
done
old_value="`eval echo '$'EXTRA_DEBUG_CXXFLAGS`"
@@ -10323,17 +9462,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
- echo "$as_me:$LINENO: checking for C99 variadic macros" >&5
-echo $ECHO_N "checking for C99 variadic macros... $ECHO_C" >&6
-if test "${ac_cv_c99_variadic_macros+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C99 variadic macros" >&5
+$as_echo_n "checking for C99 variadic macros... " >&6; }
+if test "${ac_cv_c99_variadic_macros+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdio.h>
#define MSG(...) fprintf(stderr, __VA_ARGS__)
@@ -10348,47 +9482,26 @@ MSG("foo");
return 0;
}
_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
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_c99_variadic_macros=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_c99_variadic_macros=no
+ ac_cv_c99_variadic_macros=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_c99_variadic_macros" >&5
-echo "${ECHO_T}$ac_cv_c99_variadic_macros" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c99_variadic_macros" >&5
+$as_echo "$ac_cv_c99_variadic_macros" >&6; }
if test "x${ac_cv_c99_variadic_macros}" != "xyes"; then
- { { echo "$as_me:$LINENO: error: A compiler supporting C99 variadic macros is required" >&5
-echo "$as_me: error: A compiler supporting C99 variadic macros is required" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "A compiler supporting C99 variadic macros is required" "$LINENO" 5
fi
- echo "$as_me:$LINENO: checking for C99 variable arrays" >&5
-echo $ECHO_N "checking for C99 variable arrays... $ECHO_C" >&6
-if test "${ac_cv_c99_variable_arrays+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C99 variable arrays" >&5
+$as_echo_n "checking for C99 variable arrays... " >&6; }
+if test "${ac_cv_c99_variable_arrays+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -10401,47 +9514,26 @@ char *s1 = "foo", *s2 = "bar";
return 0;
}
_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
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_c99_variable_arrays=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_c99_variable_arrays=no
+ ac_cv_c99_variable_arrays=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_c99_variable_arrays" >&5
-echo "${ECHO_T}$ac_cv_c99_variable_arrays" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c99_variable_arrays" >&5
+$as_echo "$ac_cv_c99_variable_arrays" >&6; }
if test "x${ac_cv_c99_variable_arrays}" != "xyes"; then
- { { echo "$as_me:$LINENO: error: A compiler supporting C99 variable arrays is required" >&5
-echo "$as_me: error: A compiler supporting C99 variable arrays is required" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "A compiler supporting C99 variable arrays is required" "$LINENO" 5
fi
- echo "$as_me:$LINENO: checking for C99 initializers" >&5
-echo $ECHO_N "checking for C99 initializers... $ECHO_C" >&6
-if test "${ac_cv_c99_initializers+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C99 initializers" >&5
+$as_echo_n "checking for C99 initializers... " >&6; }
+if test "${ac_cv_c99_initializers+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
struct foo {
int an_integer;
@@ -10461,191 +9553,43 @@ struct foo bar = {.an_array = {0, [3] = 2, [2] = 1, [4] = 3},
return 0;
}
_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
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_c99_initializers=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_c99_initializers=no
+ ac_cv_c99_initializers=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_c99_initializers" >&5
-echo "${ECHO_T}$ac_cv_c99_initializers" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c99_initializers" >&5
+$as_echo "$ac_cv_c99_initializers" >&6; }
if test "${ac_cv_c99_initializers}" != "yes"; then
- { { echo "$as_me:$LINENO: error: A compiler supporting C99 initializers is required" >&5
-echo "$as_me: error: A compiler supporting C99 initializers is required" >&2;}
- { (exit 1); exit 1; }; }
- fi
-
-
-
-for ac_header in stdint.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
- # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-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. */
-$ac_includes_default
-#include <$ac_header>
-_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
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-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 <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- else
- ac_cpp_err=
+ as_fn_error "A compiler supporting C99 initializers is required" "$LINENO" 5
fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc in
- yes:no )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf at gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
- no:yes )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf at gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ for ac_header in stdint.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default"
+if test "x$ac_cv_header_stdint_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_STDINT_H 1
_ACEOF
fi
done
- echo "$as_me:$LINENO: checking for C99 stdint.h" >&5
-echo $ECHO_N "checking for C99 stdint.h... $ECHO_C" >&6
-if test "${ac_cv_c99_stdint_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C99 stdint.h" >&5
+$as_echo_n "checking for C99 stdint.h... " >&6; }
+if test "${ac_cv_c99_stdint_h+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_cv_c99_stdint_h=$ac_cv_header_stdint_h
fi
-echo "$as_me:$LINENO: result: $ac_cv_c99_stdint_h" >&5
-echo "${ECHO_T}$ac_cv_c99_stdint_h" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c99_stdint_h" >&5
+$as_echo "$ac_cv_c99_stdint_h" >&6; }
if test "${ac_cv_c99_stdint_h}" != "yes"; then
- { { echo "$as_me:$LINENO: error: A compiler supporting C99's stdint.h is required" >&5
-echo "$as_me: error: A compiler supporting C99's stdint.h is required" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "A compiler supporting C99's stdint.h is required" "$LINENO" 5
fi
@@ -10660,9 +9604,7 @@ fi
if test x`$UNAME -s` = xBeOS ; then
-cat >>confdefs.h <<\_ACEOF
-#define SOCKET_ZERO_ISNT_STDIN 1
-_ACEOF
+$as_echo "#define SOCKET_ZERO_ISNT_STDIN 1" >>confdefs.h
CFLAGS="$CFLAGS -Wno-multichar"
LDFLAGS="$LDFLAGS -x none"
@@ -10685,10 +9627,10 @@ case "$host_os" in
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
set dummy ${ac_tool_prefix}windres; 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_prog_WINDRES+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_WINDRES+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$WINDRES"; then
ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test.
@@ -10698,35 +9640,37 @@ 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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_WINDRES="${ac_tool_prefix}windres"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
+IFS=$as_save_IFS
fi
fi
WINDRES=$ac_cv_prog_WINDRES
if test -n "$WINDRES"; then
- echo "$as_me:$LINENO: result: $WINDRES" >&5
-echo "${ECHO_T}$WINDRES" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WINDRES" >&5
+$as_echo "$WINDRES" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
+
fi
if test -z "$ac_cv_prog_WINDRES"; then
ac_ct_WINDRES=$WINDRES
# Extract the first word of "windres", so it can be a program name with args.
set dummy windres; 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_prog_ac_ct_WINDRES+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_WINDRES"; then
ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # Let the user override the test.
@@ -10736,79 +9680,81 @@ 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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_WINDRES="windres"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
+IFS=$as_save_IFS
fi
fi
ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES
if test -n "$ac_ct_WINDRES"; then
- echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5
-echo "${ECHO_T}$ac_ct_WINDRES" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_WINDRES" >&5
+$as_echo "$ac_ct_WINDRES" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
- WINDRES=$ac_ct_WINDRES
+ if test "x$ac_ct_WINDRES" = x; then
+ WINDRES=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ WINDRES=$ac_ct_WINDRES
+ fi
else
WINDRES="$ac_cv_prog_WINDRES"
fi
if test -z $WINDRES; then
- { { echo "$as_me:$LINENO: error: *** 'windres' missing. Install binutils, fix your \$PATH, or set \$WINDRES manually. ***" >&5
-echo "$as_me: error: *** 'windres' missing. Install binutils, fix your \$PATH, or set \$WINDRES manually. ***" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "*** 'windres' missing. Install binutils, fix your \$PATH, or set \$WINDRES manually. ***" "$LINENO" 5
fi
-cat >>confdefs.h <<\_ACEOF
-#define SOCKET_ZERO_ISNT_STDIN 1
-_ACEOF
+$as_echo "#define SOCKET_ZERO_ISNT_STDIN 1" >>confdefs.h
-cat >>confdefs.h <<\_ACEOF
-#define ALWAYS_ROOT 1
-_ACEOF
+$as_echo "#define ALWAYS_ROOT 1" >>confdefs.h
-cat >>confdefs.h <<\_ACEOF
-#define WIN32_NATIVE 1
-_ACEOF
+$as_echo "#define WIN32_NATIVE 1" >>confdefs.h
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_WINSOCK 1
-_ACEOF
+$as_echo "#define HAVE_WINSOCK 1" >>confdefs.h
-cat >>confdefs.h <<\_ACEOF
-#define NONBLOCKING_SOCKETS 1
-_ACEOF
+$as_echo "#define NONBLOCKING_SOCKETS 1" >>confdefs.h
LIBS="$LIBS -lwsock32"
;;
*skyos*)
-cat >>confdefs.h <<\_ACEOF
-#define ALWAYS_ROOT 1
-_ACEOF
+$as_echo "#define ALWAYS_ROOT 1" >>confdefs.h
+
+ ;;
+ *haiku*)
+
+$as_echo "#define ALWAYS_ROOT 1" >>confdefs.h
+
+ LIBS="$LIBS -lnetwork"
;;
*amigaos*)
AMIGA=yes
-cat >>confdefs.h <<\_ACEOF
-#define ALWAYS_ROOT 1
-_ACEOF
+$as_echo "#define ALWAYS_ROOT 1" >>confdefs.h
;;
@@ -10824,62 +9770,43 @@ _ACEOF
fi
-
-echo "$as_me:$LINENO: checking for gzgets in -lz" >&5
-echo $ECHO_N "checking for gzgets in -lz... $ECHO_C" >&6
-if test "${ac_cv_lib_z_gzgets+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gzgets in -lz" >&5
+$as_echo_n "checking for gzgets in -lz... " >&6; }
+if test "${ac_cv_lib_z_gzgets+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lz $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 gzgets ();
int
main ()
{
-gzgets ();
+return gzgets ();
;
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
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_z_gzgets=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_z_gzgets=no
+ ac_cv_lib_z_gzgets=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_z_gzgets" >&5
-echo "${ECHO_T}$ac_cv_lib_z_gzgets" >&6
-if test $ac_cv_lib_z_gzgets = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_gzgets" >&5
+$as_echo "$ac_cv_lib_z_gzgets" >&6; }
+if test "x$ac_cv_lib_z_gzgets" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBZ 1
_ACEOF
@@ -10887,157 +9814,24 @@ _ACEOF
LIBS="-lz $LIBS"
else
- { { echo "$as_me:$LINENO: error: Could not find zlib library." >&5
-echo "$as_me: error: Could not find zlib library." >&2;}
- { (exit 1); exit 1; }; }
-fi
-
-if test "${ac_cv_header_zlib_h+set}" = set; then
- echo "$as_me:$LINENO: checking for zlib.h" >&5
-echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6
-if test "${ac_cv_header_zlib_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
-echo "${ECHO_T}$ac_cv_header_zlib_h" >&6
-else
- # Is the header compilable?
-echo "$as_me:$LINENO: checking zlib.h usability" >&5
-echo $ECHO_N "checking zlib.h usability... $ECHO_C" >&6
-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. */
-$ac_includes_default
-#include <zlib.h>
-_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
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking zlib.h presence" >&5
-echo $ECHO_N "checking zlib.h presence... $ECHO_C" >&6
-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 <zlib.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
+ as_fn_error "Could not find zlib library." "$LINENO" 5
fi
-if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
+if test "x$ac_cv_header_zlib_h" = x""yes; then :
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc in
- yes:no )
- { echo "$as_me:$LINENO: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf at gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
- no:yes )
- { echo "$as_me:$LINENO: WARNING: zlib.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: zlib.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: zlib.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: zlib.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf at gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-echo "$as_me:$LINENO: checking for zlib.h" >&5
-echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6
-if test "${ac_cv_header_zlib_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_zlib_h=$ac_header_preproc
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
-echo "${ECHO_T}$ac_cv_header_zlib_h" >&6
-
-fi
-if test $ac_cv_header_zlib_h = yes; then
- :
else
- { { echo "$as_me:$LINENO: error: zlib found but not zlib.h.
-You may need to install a zlib \"development\" package." >&5
-echo "$as_me: error: zlib found but not zlib.h.
-You may need to install a zlib \"development\" package." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "zlib found but not zlib.h.
+You may need to install a zlib \"development\" package." "$LINENO" 5
fi
# Extract the first word of "gzip", so it can be a program name with args.
set dummy gzip; 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_GZIP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_GZIP+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
case $GZIP in
[\\/]* | ?:[\\/]*)
@@ -11049,33 +9843,32 @@ 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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_GZIP="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
+IFS=$as_save_IFS
test -z "$ac_cv_path_GZIP" && ac_cv_path_GZIP=""no""
;;
esac
fi
GZIP=$ac_cv_path_GZIP
-
if test -n "$GZIP"; then
- echo "$as_me:$LINENO: result: $GZIP" >&5
-echo "${ECHO_T}$GZIP" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GZIP" >&5
+$as_echo "$GZIP" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
+
if test "$GZIP" = "no"; then
- { { echo "$as_me:$LINENO: error: You need the gzip program for compilation." >&5
-echo "$as_me: error: You need the gzip program for compilation." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "You need the gzip program for compilation." "$LINENO" 5
fi
if test "$ftwl" = x11 ; then
@@ -11087,9 +9880,7 @@ if test "$ftwl" = sdl ; then
FTWL_CFLAGS=`sdl-config --cflags`" "`freetype-config --cflags`
FTWL_LIBS=`sdl-config --libs`" -lpng "`freetype-config --libs`
-cat >>confdefs.h <<\_ACEOF
-#define SDL 1
-_ACEOF
+$as_echo "#define SDL 1" >>confdefs.h
fi
@@ -11107,19 +9898,19 @@ if test x$client != xno; then
fi
if test x$client = xyes; then
- { echo "$as_me:$LINENO: checking for which client to compile:..." >&5
-echo "$as_me: checking for which client to compile:..." >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for which client to compile:..." >&5
+$as_echo "$as_me: checking for which client to compile:..." >&6;}
fi
if test "$client" = "gtk-2.0" || test "$client" = yes ; then
- # Check whether --enable-gtktest or --disable-gtktest was given.
-if test "${enable_gtktest+set}" = set; then
- enableval="$enable_gtktest"
-
+ # Check whether --enable-gtktest was given.
+if test "${enable_gtktest+set}" = set; then :
+ enableval=$enable_gtktest;
else
enable_gtktest=yes
-fi;
+fi
+
pkg_config_args=gtk+-2.0
for module in .
@@ -11135,10 +9926,10 @@ fi;
# 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_PKG_CONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
[\\/]* | ?:[\\/]*)
@@ -11150,30 +9941,31 @@ 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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
+IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
;;
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
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
+
if test x$PKG_CONFIG != xno ; then
if pkg-config --atleast-pkgconfig-version 0.7 ; then
:
@@ -11187,8 +9979,8 @@ fi
fi
min_gtk_version=2.4.0
- echo "$as_me:$LINENO: checking for GTK+ - version >= $min_gtk_version" >&5
-echo $ECHO_N "checking for GTK+ - version >= $min_gtk_version... $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK+ - version >= $min_gtk_version" >&5
+$as_echo_n "checking for GTK+ - version >= $min_gtk_version... " >&6; }
if test x$PKG_CONFIG != xno ; then
## don't try to run the test against uninstalled libtool libs
@@ -11219,15 +10011,10 @@ echo $ECHO_N "checking for GTK+ - version >= $min_gtk_version... $ECHO_C" >&6
CFLAGS="$CFLAGS $GTK_CFLAGS"
LIBS="$GTK_LIBS $LIBS"
rm -f conf.gtktest
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <gtk/gtk.h>
@@ -11302,35 +10089,22 @@ main ()
}
_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
- :
-else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_run "$LINENO"; then :
-( exit $ac_status )
-no_gtk=yes
+else
+ no_gtk=yes
fi
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
+
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi
fi
if test "x$no_gtk" = x ; then
- echo "$as_me:$LINENO: result: yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&5
-echo "${ECHO_T}yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&5
+$as_echo "yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&6; }
client="gtk-2.0"
CLIENT_CFLAGS="$GTK_CFLAGS"
@@ -11341,8 +10115,8 @@ echo "${ECHO_T}yes (version $gtk_config_major_version.$gtk_config_minor_version.
fi
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if test "$PKG_CONFIG" = "no" ; then
echo "*** A new enough version of pkg-config was not found."
echo "*** See http://pkgconfig.sourceforge.net"
@@ -11355,12 +10129,7 @@ echo "${ECHO_T}no" >&6
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $GTK_CFLAGS"
LIBS="$LIBS $GTK_LIBS"
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <gtk/gtk.h>
@@ -11374,18 +10143,7 @@ main ()
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
+if ac_fn_c_try_link "$LINENO"; then :
echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your"
@@ -11396,13 +10154,11 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
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"
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- echo "*** The test program failed to compile or link. See the file config.log for the"
+ echo "*** The test program failed to compile or link. See the file config.log for the"
echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi
@@ -11412,9 +10168,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
if test "$client" = "gtk-2.0"; then
- { { echo "$as_me:$LINENO: error: specified client 'gtk-2.0' not configurable (GTK+-2.0 libraries not found)" >&5
-echo "$as_me: error: specified client 'gtk-2.0' not configurable (GTK+-2.0 libraries not found)" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "specified client 'gtk-2.0' not configurable (GTK+-2.0 libraries not found)" "$LINENO" 5
fi
@@ -11428,32 +10182,32 @@ echo "$as_me: error: specified client 'gtk-2.0' not configurable (GTK+-2.0 libra
if test "$client" = yes; then
- { echo "$as_me:$LINENO: WARNING: Not checking for SDL; use --enable-client=sdl to enable" >&5
-echo "$as_me: WARNING: Not checking for SDL; use --enable-client=sdl to enable" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Not checking for SDL; use --enable-client=sdl to enable" >&5
+$as_echo "$as_me: WARNING: Not checking for SDL; use --enable-client=sdl to enable" >&2;}
elif test "$client" = sdl ; then
-# Check whether --with-sdl-prefix or --without-sdl-prefix was given.
-if test "${with_sdl_prefix+set}" = set; then
- withval="$with_sdl_prefix"
- sdl_prefix="$withval"
+# Check whether --with-sdl-prefix was given.
+if test "${with_sdl_prefix+set}" = set; then :
+ withval=$with_sdl_prefix; sdl_prefix="$withval"
else
sdl_prefix=""
-fi;
+fi
+
-# Check whether --with-sdl-exec-prefix or --without-sdl-exec-prefix was given.
-if test "${with_sdl_exec_prefix+set}" = set; then
- withval="$with_sdl_exec_prefix"
- sdl_exec_prefix="$withval"
+# Check whether --with-sdl-exec-prefix was given.
+if test "${with_sdl_exec_prefix+set}" = set; then :
+ withval=$with_sdl_exec_prefix; sdl_exec_prefix="$withval"
else
sdl_exec_prefix=""
-fi;
-# Check whether --enable-sdltest or --disable-sdltest was given.
-if test "${enable_sdltest+set}" = set; then
- enableval="$enable_sdltest"
+fi
+# Check whether --enable-sdltest was given.
+if test "${enable_sdltest+set}" = set; then :
+ enableval=$enable_sdltest;
else
enable_sdltest=yes
-fi;
+fi
+
if test x$sdl_exec_prefix != x ; then
sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
@@ -11473,10 +10227,10 @@ fi;
fi
# Extract the first word of "sdl-config", so it can be a program name with args.
set dummy sdl-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_SDL_CONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_SDL_CONFIG+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
case $SDL_CONFIG in
[\\/]* | ?:[\\/]*)
@@ -11488,32 +10242,33 @@ 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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_SDL_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
+IFS=$as_save_IFS
test -z "$ac_cv_path_SDL_CONFIG" && ac_cv_path_SDL_CONFIG="no"
;;
esac
fi
SDL_CONFIG=$ac_cv_path_SDL_CONFIG
-
if test -n "$SDL_CONFIG"; then
- echo "$as_me:$LINENO: result: $SDL_CONFIG" >&5
-echo "${ECHO_T}$SDL_CONFIG" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SDL_CONFIG" >&5
+$as_echo "$SDL_CONFIG" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
+
min_sdl_version=1.1.4
- echo "$as_me:$LINENO: checking for SDL - version >= $min_sdl_version" >&5
-echo $ECHO_N "checking for SDL - version >= $min_sdl_version... $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDL - version >= $min_sdl_version" >&5
+$as_echo_n "checking for SDL - version >= $min_sdl_version... " >&6; }
no_sdl=""
if test "$SDL_CONFIG" = "no" ; then
no_sdl=yes
@@ -11535,15 +10290,10 @@ echo $ECHO_N "checking for SDL - version >= $min_sdl_version... $ECHO_C" >&6
CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
LIBS="$LIBS $SDL_LIBS"
rm -f conf.sdltest
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdio.h>
@@ -11604,40 +10354,27 @@ int main (int argc, char *argv[])
_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
- :
-else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_run "$LINENO"; then :
-( exit $ac_status )
-no_sdl=yes
+else
+ no_sdl=yes
fi
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
+
CFLAGS="$ac_save_CFLAGS"
CXXFLAGS="$ac_save_CXXFLAGS"
LIBS="$ac_save_LIBS"
fi
fi
if test "x$no_sdl" = x ; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
sdl_found="yes"
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if test "$SDL_CONFIG" = "no" ; then
echo "*** The sdl-config script installed by SDL could not be found"
echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
@@ -11651,12 +10388,7 @@ echo "${ECHO_T}no" >&6
CFLAGS="$CFLAGS $SDL_CFLAGS"
CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
LIBS="$LIBS $SDL_LIBS"
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdio.h>
@@ -11675,18 +10407,7 @@ main ()
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
+if ac_fn_c_try_link "$LINENO"; then :
echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding SDL or finding the wrong"
echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
@@ -11697,15 +10418,13 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
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"
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- echo "*** The test program failed to compile or link. See the file config.log for the"
+ echo "*** The test program failed to compile or link. See the file config.log for the"
echo "*** exact error that occured. This usually means SDL was incorrectly installed"
echo "*** or that you have moved SDL since it was installed. In the latter case, you"
echo "*** may want to edit the sdl-config script: $SDL_CONFIG"
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
CFLAGS="$ac_save_CFLAGS"
CXXFLAGS="$ac_save_CXXFLAGS"
LIBS="$ac_save_LIBS"
@@ -11726,197 +10445,51 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
CPPFLAGS="$CPPFLAGS $SDL_CFLAGS"
CFLAGS="$CFLAGS $SDL_CFLAGS"
LIBS="$LIBS $SDL_LIBS"
- echo "$as_me:$LINENO: checking for IMG_Load in -lSDL_image" >&5
-echo $ECHO_N "checking for IMG_Load in -lSDL_image... $ECHO_C" >&6
-if test "${ac_cv_lib_SDL_image_IMG_Load+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IMG_Load in -lSDL_image" >&5
+$as_echo_n "checking for IMG_Load in -lSDL_image... " >&6; }
+if test "${ac_cv_lib_SDL_image_IMG_Load+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lSDL_image $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 IMG_Load ();
int
main ()
{
-IMG_Load ();
+return IMG_Load ();
;
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
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_SDL_image_IMG_Load=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_SDL_image_IMG_Load=no
+ ac_cv_lib_SDL_image_IMG_Load=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_SDL_image_IMG_Load" >&5
-echo "${ECHO_T}$ac_cv_lib_SDL_image_IMG_Load" >&6
-if test $ac_cv_lib_SDL_image_IMG_Load = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_SDL_image_IMG_Load" >&5
+$as_echo "$ac_cv_lib_SDL_image_IMG_Load" >&6; }
+if test "x$ac_cv_lib_SDL_image_IMG_Load" = x""yes; then :
sdl_image_found="yes"
else
sdl_image_found="no"
fi
if test "$sdl_image_found" = "yes"; then
- if test "${ac_cv_header_SDL_SDL_image_h+set}" = set; then
- echo "$as_me:$LINENO: checking for SDL/SDL_image.h" >&5
-echo $ECHO_N "checking for SDL/SDL_image.h... $ECHO_C" >&6
-if test "${ac_cv_header_SDL_SDL_image_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_SDL_SDL_image_h" >&5
-echo "${ECHO_T}$ac_cv_header_SDL_SDL_image_h" >&6
-else
- # Is the header compilable?
-echo "$as_me:$LINENO: checking SDL/SDL_image.h usability" >&5
-echo $ECHO_N "checking SDL/SDL_image.h usability... $ECHO_C" >&6
-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. */
-$ac_includes_default
-#include <SDL/SDL_image.h>
-_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
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking SDL/SDL_image.h presence" >&5
-echo $ECHO_N "checking SDL/SDL_image.h presence... $ECHO_C" >&6
-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 <SDL/SDL_image.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc in
- yes:no )
- { echo "$as_me:$LINENO: WARNING: SDL/SDL_image.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: SDL/SDL_image.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: SDL/SDL_image.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: SDL/SDL_image.h: proceeding with the preprocessor's result" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf at gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
- no:yes )
- { echo "$as_me:$LINENO: WARNING: SDL/SDL_image.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: SDL/SDL_image.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: SDL/SDL_image.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: SDL/SDL_image.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: SDL/SDL_image.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: SDL/SDL_image.h: proceeding with the preprocessor's result" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf at gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-echo "$as_me:$LINENO: checking for SDL/SDL_image.h" >&5
-echo $ECHO_N "checking for SDL/SDL_image.h... $ECHO_C" >&6
-if test "${ac_cv_header_SDL_SDL_image_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_SDL_SDL_image_h=$ac_header_preproc
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_SDL_SDL_image_h" >&5
-echo "${ECHO_T}$ac_cv_header_SDL_SDL_image_h" >&6
-
-fi
-if test $ac_cv_header_SDL_SDL_image_h = yes; then
+ ac_fn_c_check_header_mongrel "$LINENO" "SDL/SDL_image.h" "ac_cv_header_SDL_SDL_image_h" "$ac_includes_default"
+if test "x$ac_cv_header_SDL_SDL_image_h" = x""yes; then :
sdl_image_h_found="yes"
else
sdl_image_h_found="no"
@@ -11930,30 +10503,30 @@ fi
# 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
- withval="$with_ft_prefix"
- ft_config_prefix="$withval"
+# Check whether --with-ft-prefix was given.
+if test "${with_ft_prefix+set}" = set; then :
+ withval=$with_ft_prefix; ft_config_prefix="$withval"
else
ft_config_prefix=""
-fi;
+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"
- ft_config_exec_prefix="$withval"
+
+# Check whether --with-ft-exec-prefix was given.
+if test "${with_ft_exec_prefix+set}" = set; then :
+ withval=$with_ft_exec_prefix; ft_config_exec_prefix="$withval"
else
ft_config_exec_prefix=""
-fi;
+fi
- # Check whether --enable-freetypetest or --disable-freetypetest was given.
-if test "${enable_freetypetest+set}" = set; then
- enableval="$enable_freetypetest"
+ # Check whether --enable-freetypetest was given.
+if test "${enable_freetypetest+set}" = set; then :
+ enableval=$enable_freetypetest;
else
enable_fttest=yes
-fi;
+fi
+
if test x$ft_config_exec_prefix != x ; then
ft_config_args="$ft_config_args --exec-prefix=$ft_config_exec_prefix"
@@ -11971,10 +10544,10 @@ 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
-if test "${ac_cv_path_FT2_CONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_FT2_CONFIG+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
case $FT2_CONFIG in
[\\/]* | ?:[\\/]*)
@@ -11986,33 +10559,34 @@ 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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_FT2_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
+IFS=$as_save_IFS
test -z "$ac_cv_path_FT2_CONFIG" && ac_cv_path_FT2_CONFIG="no"
;;
esac
fi
FT2_CONFIG=$ac_cv_path_FT2_CONFIG
-
if test -n "$FT2_CONFIG"; then
- echo "$as_me:$LINENO: result: $FT2_CONFIG" >&5
-echo "${ECHO_T}$FT2_CONFIG" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FT2_CONFIG" >&5
+$as_echo "$FT2_CONFIG" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "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
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FreeType -- version >= $min_ft_version" >&5
+$as_echo_n "checking for FreeType -- version >= $min_ft_version... " >&6; }
no_ft=""
if test "$FT2_CONFIG" = "no" ; then
no_ft=yes
@@ -12059,19 +10633,14 @@ echo $ECHO_N "checking for FreeType -- version >= $min_ft_version... $ECHO_C" >&
#
# Sanity checks for the results of freetype-config to some extent.
#
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
echo $ECHO_N "cross compiling; assuming OK... $ECHO_C"
else
- cat >conftest.$ac_ext <<_ACEOF
-
- #line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
+
#include <ft2build.h>
#include FT_FREETYPE_H
#include <stdio.h>
@@ -12097,29 +10666,16 @@ main()
_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
- :
-else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_run "$LINENO"; then :
-( exit $ac_status )
-no_ft=yes
+else
+ no_ft=yes
fi
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
+
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi # test $ft_config_version -lt $ft_min_version
@@ -12127,21 +10683,21 @@ fi
fi # test "$FT2_CONFIG" = "no"
if test x$no_ft = x ; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
freetype_found="yes"
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if test "$FT2_CONFIG" = "no" ; then
- { echo "$as_me:$LINENO: WARNING:
+ { $as_echo "$as_me:${as_lineno-$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:
+$as_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
@@ -12150,7 +10706,7 @@ echo "$as_me: WARNING:
" >&2;}
else
if test x$ft_config_is_lt = xyes ; then
- { echo "$as_me:$LINENO: WARNING:
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
Your installed version of the FreeType 2 library is too old.
If you have different versions of FreeType 2, make sure that
@@ -12158,7 +10714,7 @@ echo "$as_me: WARNING:
are used, or set the FT2_CONFIG environment variable to the
full path to freetype-config.
" >&5
-echo "$as_me: WARNING:
+$as_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
@@ -12167,14 +10723,14 @@ echo "$as_me: WARNING:
full path to freetype-config.
" >&2;}
else
- { echo "$as_me:$LINENO: WARNING:
+ { $as_echo "$as_me:${as_lineno-$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:
+$as_echo "$as_me: WARNING:
The FreeType test program failed to run. If your system uses
shared libraries and they are installed outside the normal
@@ -12195,25 +10751,17 @@ echo "$as_me: WARNING:
CLIENT_CFLAGS="$SDL_CFLAGS $FT2_CFLAGS"
CLIENT_LIBS="-lSDL_image $SDL_LIBS $FT2_LIBS"
-cat >>confdefs.h <<\_ACEOF
-#define SDL 1
-_ACEOF
+$as_echo "#define SDL 1" >>confdefs.h
found_client=yes
elif test "$client" = "sdl"; then
- { { echo "$as_me:$LINENO: error: specified client 'sdl' not configurable (FreeType2 >= 2.1.3 is needed (www.freetype.org))" >&5
-echo "$as_me: error: specified client 'sdl' not configurable (FreeType2 >= 2.1.3 is needed (www.freetype.org))" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "specified client 'sdl' not configurable (FreeType2 >= 2.1.3 is needed (www.freetype.org))" "$LINENO" 5
fi
elif test "$client" = "sdl"; then
- { { echo "$as_me:$LINENO: error: specified client 'sdl' not configurable (SDL_image-devel is needed (www.libsdl.org))" >&5
-echo "$as_me: error: specified client 'sdl' not configurable (SDL_image-devel is needed (www.libsdl.org))" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "specified client 'sdl' not configurable (SDL_image-devel is needed (www.libsdl.org))" "$LINENO" 5
fi
elif test "$client" = "sdl"; then
- { { echo "$as_me:$LINENO: error: specified client 'sdl' not configurable (SDL_image is needed (www.libsdl.org))" >&5
-echo "$as_me: error: specified client 'sdl' not configurable (SDL_image is needed (www.libsdl.org))" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "specified client 'sdl' not configurable (SDL_image is needed (www.libsdl.org))" "$LINENO" 5
fi
fi
@@ -12250,20 +10798,15 @@ echo "$as_me: error: specified client 'sdl' not configurable (SDL_image is neede
done
- echo "$as_me:$LINENO: checking for iconv" >&5
-echo $ECHO_N "checking for iconv... $ECHO_C" >&6
-if test "${am_cv_func_iconv+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
+$as_echo_n "checking for iconv... " >&6; }
+if test "${am_cv_func_iconv+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
am_cv_func_iconv="no, consider installing GNU libiconv"
am_cv_lib_iconv=no
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdlib.h>
#include <iconv.h>
@@ -12277,34 +10820,15 @@ iconv_t cd = iconv_open("","");
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
+if ac_fn_c_try_link "$LINENO"; then :
am_cv_func_iconv=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
if test "$am_cv_func_iconv" != yes; then
am_save_LIBS="$LIBS"
LIBS="$LIBS $LIBICONV"
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdlib.h>
#include <iconv.h>
@@ -12318,55 +10842,36 @@ iconv_t cd = iconv_open("","");
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
+if ac_fn_c_try_link "$LINENO"; then :
am_cv_lib_iconv=yes
am_cv_func_iconv=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS="$am_save_LIBS"
fi
fi
-echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
-echo "${ECHO_T}$am_cv_func_iconv" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
+$as_echo "$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
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
+$as_echo_n "checking for working iconv... " >&6; }
+if test "${am_cv_func_iconv_works+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
am_save_LIBS="$LIBS"
if test $am_cv_lib_iconv = yes; then
LIBS="$LIBS $LIBICONV"
fi
- if test "$cross_compiling" = yes; then
+ 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
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <iconv.h>
@@ -12426,33 +10931,20 @@ int main ()
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
+if ac_fn_c_try_run "$LINENO"; 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
+ 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
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam 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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
+$as_echo "$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 ;;
@@ -12462,16 +10954,14 @@ echo "${ECHO_T}$am_cv_func_iconv_works" >&6
fi
if test "$am_func_iconv" = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ICONV 1
-_ACEOF
+$as_echo "#define HAVE_ICONV 1" >>confdefs.h
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
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
+$as_echo_n "checking how to link with libiconv... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
+$as_echo "$LIBICONV" >&6; }
else
CPPFLAGS="$am_save_CPPFLAGS"
LIBICONV=
@@ -12481,18 +10971,13 @@ echo "${ECHO_T}$LIBICONV" >&6
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
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv declaration" >&5
+$as_echo_n "checking for iconv declaration... " >&6; }
+ if test "${am_cv_proto_iconv+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdlib.h>
@@ -12515,34 +11000,20 @@ main ()
return 0;
}
_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
+if ac_fn_c_try_compile "$LINENO"; then :
am_cv_proto_iconv_arg1=""
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-am_cv_proto_iconv_arg1="const"
+ am_cv_proto_iconv_arg1="const"
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"
fi
am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
- echo "$as_me:$LINENO: result: ${ac_t:-
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_t:-
}$am_cv_proto_iconv" >&5
-echo "${ECHO_T}${ac_t:-
- }$am_cv_proto_iconv" >&6
+$as_echo "${ac_t:-
+ }$am_cv_proto_iconv" >&6; }
cat >>confdefs.h <<_ACEOF
#define ICONV_CONST $am_cv_proto_iconv_arg1
@@ -12551,19 +11022,14 @@ _ACEOF
fi
- echo "$as_me:$LINENO: checking for libcharset" >&5
-echo $ECHO_N "checking for libcharset... $ECHO_C" >&6
-if test "${am_cv_libcharset+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libcharset" >&5
+$as_echo_n "checking for libcharset... " >&6; }
+if test "${am_cv_libcharset+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
lc_save_LIBS="$LIBS"
LIBS="$LIBS $LIBICONV"
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <libcharset.h>
int
@@ -12574,51 +11040,31 @@ locale_charset()
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
+if ac_fn_c_try_link "$LINENO"; then :
am_cv_libcharset=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-am_cv_libcharset=no
+ am_cv_libcharset=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS="$lc_save_LIBS"
fi
-echo "$as_me:$LINENO: result: $am_cv_libcharset" >&5
-echo "${ECHO_T}$am_cv_libcharset" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_libcharset" >&5
+$as_echo "$am_cv_libcharset" >&6; }
if test $am_cv_libcharset = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBCHARSET 1
-_ACEOF
+$as_echo "#define HAVE_LIBCHARSET 1" >>confdefs.h
fi
- echo "$as_me:$LINENO: checking for nl_langinfo and CODESET" >&5
-echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
-if test "${am_cv_langinfo_codeset+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5
+$as_echo_n "checking for nl_langinfo and CODESET... " >&6; }
+if test "${am_cv_langinfo_codeset+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <langinfo.h>
int
@@ -12629,241 +11075,195 @@ char* cs = nl_langinfo(CODESET); return !cs;
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
+if ac_fn_c_try_link "$LINENO"; then :
am_cv_langinfo_codeset=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-am_cv_langinfo_codeset=no
+ am_cv_langinfo_codeset=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $am_cv_langinfo_codeset" >&5
-echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_langinfo_codeset" >&5
+$as_echo "$am_cv_langinfo_codeset" >&6; }
if test $am_cv_langinfo_codeset = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LANGINFO_CODESET 1
-_ACEOF
+$as_echo "#define HAVE_LANGINFO_CODESET 1" >>confdefs.h
fi
CLIENT_LIBS="$LIBICONV $CLIENT_LIBS"
- echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
-echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
-if test "${ac_cv_lib_socket_connect+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
+$as_echo_n "checking for connect in -lsocket... " >&6; }
+if test "${ac_cv_lib_socket_connect+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lsocket $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 connect ();
int
main ()
{
-connect ();
+return connect ();
;
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
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_socket_connect=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_socket_connect=no
+ ac_cv_lib_socket_connect=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
-echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
-if test $ac_cv_lib_socket_connect = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
+$as_echo "$ac_cv_lib_socket_connect" >&6; }
+if test "x$ac_cv_lib_socket_connect" = x""yes; then :
CLIENT_LIBS="-lsocket $CLIENT_LIBS"
fi
- echo "$as_me:$LINENO: checking for gethostbyaddr in -lbind" >&5
-echo $ECHO_N "checking for gethostbyaddr in -lbind... $ECHO_C" >&6
-if test "${ac_cv_lib_bind_gethostbyaddr+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyaddr in -lbind" >&5
+$as_echo_n "checking for gethostbyaddr in -lbind... " >&6; }
+if test "${ac_cv_lib_bind_gethostbyaddr+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lbind $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 gethostbyaddr ();
int
main ()
{
-gethostbyaddr ();
+return gethostbyaddr ();
;
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
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_bind_gethostbyaddr=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_bind_gethostbyaddr=no
+ ac_cv_lib_bind_gethostbyaddr=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_bind_gethostbyaddr" >&5
-echo "${ECHO_T}$ac_cv_lib_bind_gethostbyaddr" >&6
-if test $ac_cv_lib_bind_gethostbyaddr = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_gethostbyaddr" >&5
+$as_echo "$ac_cv_lib_bind_gethostbyaddr" >&6; }
+if test "x$ac_cv_lib_bind_gethostbyaddr" = x""yes; then :
CLIENT_LIBS="-lbind $CLIENT_LIBS"
fi
elif test "$client" = "sdl"; then
- { { echo "$as_me:$LINENO: error: specified client 'sdl' not configurable (SDL >= 1.1.4 is needed (www.libsdl.org))" >&5
-echo "$as_me: error: specified client 'sdl' not configurable (SDL >= 1.1.4 is needed (www.libsdl.org))" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "specified client 'sdl' not configurable (SDL >= 1.1.4 is needed (www.libsdl.org))" "$LINENO" 5
fi
fi
- echo "$as_me:$LINENO: checking for X" >&5
-echo $ECHO_N "checking for X... $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5
+$as_echo_n "checking for X... " >&6; }
-# Check whether --with-x or --without-x was given.
-if test "${with_x+set}" = set; then
- withval="$with_x"
+# Check whether --with-x was given.
+if test "${with_x+set}" = set; then :
+ withval=$with_x;
+fi
-fi;
# $have_x is `yes', `no', `disabled', or empty when we do not yet know.
if test "x$with_x" = xno; then
# The user explicitly disabled X.
have_x=disabled
else
- if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then
- # Both variables are already set.
- have_x=yes
- else
- if test "${ac_cv_have_x+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ case $x_includes,$x_libraries in #(
+ *\'*) as_fn_error "cannot use X directory names containing '" "$LINENO" 5;; #(
+ *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
# One or both of the vars are not set, and there is no cached value.
ac_x_includes=no ac_x_libraries=no
-rm -fr conftest.dir
+rm -f -r conftest.dir
if mkdir conftest.dir; then
cd conftest.dir
- # Make sure to not put "make" in the Imakefile rules, since we grep it out.
cat >Imakefile <<'_ACEOF'
-acfindx:
- @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
-_ACEOF
- if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
+incroot:
+ @echo incroot='${INCROOT}'
+usrlibdir:
+ @echo usrlibdir='${USRLIBDIR}'
+libdir:
+ @echo libdir='${LIBDIR}'
+_ACEOF
+ if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
- eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
+ for ac_var in incroot usrlibdir libdir; do
+ eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
+ done
# Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
- for ac_extension in a so sl; do
- if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
- test -f $ac_im_libdir/libX11.$ac_extension; then
- ac_im_usrlibdir=$ac_im_libdir; break
+ for ac_extension in a so sl dylib la dll; do
+ if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
+ test -f "$ac_im_libdir/libX11.$ac_extension"; then
+ ac_im_usrlibdir=$ac_im_libdir; break
fi
done
# Screen out bogus values from the imake configuration. They are
# bogus both because they are the default anyway, and because
# using them would break gcc on systems where it needs fixed includes.
case $ac_im_incroot in
- /usr/include) ;;
+ /usr/include) ac_x_includes= ;;
*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
esac
case $ac_im_usrlibdir in
- /usr/lib | /lib) ;;
+ /usr/lib | /usr/lib64 | /lib | /lib64) ;;
*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
esac
fi
cd ..
- rm -fr conftest.dir
+ rm -f -r conftest.dir
fi
# Standard set of common directories for X headers.
# Check X11 before X11Rn because it is often a symlink to the current release.
ac_x_header_dirs='
/usr/X11/include
+/usr/X11R7/include
/usr/X11R6/include
/usr/X11R5/include
/usr/X11R4/include
/usr/include/X11
+/usr/include/X11R7
/usr/include/X11R6
/usr/include/X11R5
/usr/include/X11R4
/usr/local/X11/include
+/usr/local/X11R7/include
/usr/local/X11R6/include
/usr/local/X11R5/include
/usr/local/X11R4/include
/usr/local/include/X11
+/usr/local/include/X11R7
/usr/local/include/X11R6
/usr/local/include/X11R5
/usr/local/include/X11R4
@@ -12883,42 +11283,18 @@ ac_x_header_dirs='
/usr/openwin/share/include'
if test "$ac_x_includes" = no; then
- # Guess where to find include files, by looking for Intrinsic.h.
+ # Guess where to find include files, by looking for Xlib.h.
# First, try using that file with no special directory specified.
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#include <X11/Intrinsic.h>
+#include <X11/Xlib.h>
_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+if ac_fn_c_try_cpp "$LINENO"; then :
# We can compile using X headers with no special include directory.
ac_x_includes=
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
for ac_dir in $ac_x_header_dirs; do
- if test -r "$ac_dir/X11/Intrinsic.h"; then
+ if test -r "$ac_dir/X11/Xlib.h"; then
ac_x_includes=$ac_dir
break
fi
@@ -12932,94 +11308,570 @@ if test "$ac_x_libraries" = no; then
# See if we find them without any special options.
# Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS
- LIBS="-lXt $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ LIBS="-lX11 $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#include <X11/Intrinsic.h>
+#include <X11/Xlib.h>
int
main ()
{
-XtMalloc (0)
+XrmInitialize ()
;
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
+if ac_fn_c_try_link "$LINENO"; then :
LIBS=$ac_save_LIBS
# We can link X programs with no special library path.
ac_x_libraries=
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-LIBS=$ac_save_LIBS
-for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
+ LIBS=$ac_save_LIBS
+for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
do
# Don't even attempt the hair of trying to link an X program!
- for ac_extension in a so sl; do
- if test -r $ac_dir/libXt.$ac_extension; then
+ for ac_extension in a so sl dylib la dll; do
+ if test -r "$ac_dir/libX11.$ac_extension"; then
ac_x_libraries=$ac_dir
break 2
fi
done
done
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi # $ac_x_libraries = no
-if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then
- # Didn't find X anywhere. Cache the known absence of X.
- ac_cv_have_x="have_x=no"
-else
- # Record where we found X for the cache.
- ac_cv_have_x="have_x=yes \
- ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
-fi
+case $ac_x_includes,$ac_x_libraries in #(
+ no,* | *,no | *\'*)
+ # Didn't find X, or a directory has "'" in its name.
+ ac_cv_have_x="have_x=no";; #(
+ *)
+ # Record where we found X for the cache.
+ ac_cv_have_x="have_x=yes\
+ ac_x_includes='$ac_x_includes'\
+ ac_x_libraries='$ac_x_libraries'"
+esac
fi
-
- fi
+;; #(
+ *) have_x=yes;;
+ esac
eval "$ac_cv_have_x"
fi # $with_x != no
if test "$have_x" != yes; then
- echo "$as_me:$LINENO: result: $have_x" >&5
-echo "${ECHO_T}$have_x" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5
+$as_echo "$have_x" >&6; }
no_x=yes
else
# If each of the values was on the command line, it overrides each guess.
test "x$x_includes" = xNONE && x_includes=$ac_x_includes
test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
# Update the cache value to reflect the command line values.
- ac_cv_have_x="have_x=yes \
- ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
- echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
-echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
+ ac_cv_have_x="have_x=yes\
+ ac_x_includes='$x_includes'\
+ ac_x_libraries='$x_libraries'"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5
+$as_echo "libraries $x_libraries, headers $x_includes" >&6; }
fi
-echo "$as_me:$LINENO: checking whether Xfuncproto was supplied" >&5
-echo $ECHO_N "checking whether Xfuncproto was supplied... $ECHO_C" >&6
+if test "$no_x" = yes; then
+ # Not all programs may use this symbol, but it does not hurt to define it.
-# Check whether --with-x-funcproto or --without-x-funcproto was given.
-if test "${with_x_funcproto+set}" = set; then
- withval="$with_x_funcproto"
+$as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h
+
+ X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
+else
+ if test -n "$x_includes"; then
+ X_CFLAGS="$X_CFLAGS -I$x_includes"
+ fi
+
+ # It would also be nice to do this for all -L options, not just this one.
+ if test -n "$x_libraries"; then
+ X_LIBS="$X_LIBS -L$x_libraries"
+ # For Solaris; some versions of Sun CC require a space after -R and
+ # others require no space. Words are not sufficient . . . .
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5
+$as_echo_n "checking whether -R must be followed by a space... " >&6; }
+ ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
+ ac_xsave_c_werror_flag=$ac_c_werror_flag
+ ac_c_werror_flag=yes
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ X_LIBS="$X_LIBS -R$x_libraries"
+else
+ LIBS="$ac_xsave_LIBS -R $x_libraries"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ X_LIBS="$X_LIBS -R $x_libraries"
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: neither works" >&5
+$as_echo "neither works" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ ac_c_werror_flag=$ac_xsave_c_werror_flag
+ LIBS=$ac_xsave_LIBS
+ fi
+
+ # Check for system-dependent libraries X programs must link with.
+ # Do this before checking for the system-independent R6 libraries
+ # (-lICE), since we may need -lsocket or whatever for X linking.
+
+ if test "$ISC" = yes; then
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet"
+ else
+ # Martyn Johnson says this is needed for Ultrix, if the X
+ # libraries were built with DECnet support. And Karl Berry says
+ # the Alpha needs dnet_stub (dnet does not exist).
+ ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char XOpenDisplay ();
+int
+main ()
+{
+return XOpenDisplay ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5
+$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
+if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldnet $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dnet_ntoa ();
+int
+main ()
+{
+return dnet_ntoa ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_dnet_dnet_ntoa=yes
+else
+ ac_cv_lib_dnet_dnet_ntoa=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
+if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then :
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+fi
+
+ if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5
+$as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }
+if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldnet_stub $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dnet_ntoa ();
+int
+main ()
+{
+return dnet_ntoa ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_dnet_stub_dnet_ntoa=yes
+else
+ ac_cv_lib_dnet_stub_dnet_ntoa=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+$as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
+if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then :
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
+fi
+
+ fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS="$ac_xsave_LIBS"
+
+ # msh at cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
+ # to get the SysV transport functions.
+ # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4)
+ # needs -lnsl.
+ # The nsl library prevents programs from opening the X display
+ # on Irix 5.2, according to T.E. Dickey.
+ # The functions gethostbyname, getservbyname, and inet_addr are
+ # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
+ ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
+if test "x$ac_cv_func_gethostbyname" = x""yes; then :
+
+fi
+
+ if test $ac_cv_func_gethostbyname = no; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
+$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
+if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lnsl $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char gethostbyname ();
+int
+main ()
+{
+return gethostbyname ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_nsl_gethostbyname=yes
+else
+ ac_cv_lib_nsl_gethostbyname=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
+$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
+if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+fi
+
+ if test $ac_cv_lib_nsl_gethostbyname = no; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5
+$as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
+if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lbsd $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char gethostbyname ();
+int
+main ()
+{
+return gethostbyname ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_bsd_gethostbyname=yes
+else
+ ac_cv_lib_bsd_gethostbyname=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5
+$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
+if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then :
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
+fi
+
+ fi
+ fi
+
+ # lieder at skyler.mavd.honeywell.com says without -lsocket,
+ # socket/setsockopt and other routines are undefined under SCO ODT
+ # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary
+ # on later versions), says Simon Leinen: it contains gethostby*
+ # variants that don't use the name server (or something). -lsocket
+ # must be given before -lnsl if both are needed. We assume that
+ # if connect needs -lnsl, so does gethostbyname.
+ ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
+if test "x$ac_cv_func_connect" = x""yes; then :
+
+fi
+
+ if test $ac_cv_func_connect = no; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
+$as_echo_n "checking for connect in -lsocket... " >&6; }
+if test "${ac_cv_lib_socket_connect+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char connect ();
+int
+main ()
+{
+return connect ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_socket_connect=yes
+else
+ ac_cv_lib_socket_connect=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
+$as_echo "$ac_cv_lib_socket_connect" >&6; }
+if test "x$ac_cv_lib_socket_connect" = x""yes; then :
+ X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+fi
+
+ fi
+
+ # Guillermo Gomez says -lposix is necessary on A/UX.
+ ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove"
+if test "x$ac_cv_func_remove" = x""yes; then :
+
+fi
+
+ if test $ac_cv_func_remove = no; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5
+$as_echo_n "checking for remove in -lposix... " >&6; }
+if test "${ac_cv_lib_posix_remove+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lposix $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char remove ();
+int
+main ()
+{
+return remove ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_posix_remove=yes
+else
+ ac_cv_lib_posix_remove=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5
+$as_echo "$ac_cv_lib_posix_remove" >&6; }
+if test "x$ac_cv_lib_posix_remove" = x""yes; then :
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+fi
+
+ fi
+
+ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+ ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
+if test "x$ac_cv_func_shmat" = x""yes; then :
+
+fi
+
+ if test $ac_cv_func_shmat = no; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5
+$as_echo_n "checking for shmat in -lipc... " >&6; }
+if test "${ac_cv_lib_ipc_shmat+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lipc $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char shmat ();
+int
+main ()
+{
+return shmat ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_ipc_shmat=yes
+else
+ ac_cv_lib_ipc_shmat=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5
+$as_echo "$ac_cv_lib_ipc_shmat" >&6; }
+if test "x$ac_cv_lib_ipc_shmat" = x""yes; then :
+ X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+fi
+
+ fi
+ fi
+
+ # Check for libraries that X11R6 Xt/Xaw programs need.
+ ac_save_LDFLAGS=$LDFLAGS
+ test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
+ # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
+ # check for ICE first), but we must link in the order -lSM -lICE or
+ # we get undefined symbols. So assume we have SM if we have ICE.
+ # These have to be linked with before -lX11, unlike the other
+ # libraries we check for below, so use a different variable.
+ # John Interrante, Karl Berry
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5
+$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
+if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char IceConnectionNumber ();
+int
+main ()
+{
+return IceConnectionNumber ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_ICE_IceConnectionNumber=yes
+else
+ ac_cv_lib_ICE_IceConnectionNumber=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+$as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
+if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then :
+ X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
+fi
+
+ LDFLAGS=$ac_save_LDFLAGS
+
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Xfuncproto was supplied" >&5
+$as_echo_n "checking whether Xfuncproto was supplied... " >&6; }
+
+# Check whether --with-x-funcproto was given.
+if test "${with_x_funcproto+set}" = set; then :
+ withval=$with_x_funcproto;
+fi
-fi;
if test "x$with_x_funcproto" = "x"; then
fc_x_proto_defines=
rm -fr conftestdir
@@ -13033,20 +11885,19 @@ EOF
if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
eval `${MAKE-make} fcfindpd 2>/dev/null | grep -v make | sed -e 's/ -D/ /g'`
- echo "$as_me:$LINENO: result: no, found: $fc_x_proto_defines" >&5
-echo "${ECHO_T}no, found: $fc_x_proto_defines" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, found: $fc_x_proto_defines" >&5
+$as_echo "no, found: $fc_x_proto_defines" >&6; }
cd ..
rm -fr conftestdir
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
cd ..
rm -fr conftestdir
- echo "$as_me:$LINENO: checking for compilable FUNCPROTO definition" >&5
-echo $ECHO_N "checking for compilable FUNCPROTO definition... $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compilable FUNCPROTO definition" >&5
+$as_echo_n "checking for compilable FUNCPROTO definition... " >&6; }
for fc_x_value in 15 11 3 1 ""; do
-
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -13061,12 +11912,7 @@ else
fi
fc_x_save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $X_CFLAGS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
$fc_x_compile
@@ -13082,25 +11928,10 @@ exit (0)
return 0;
}
_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
+if ac_fn_c_try_compile "$LINENO"; then :
fc_x_proto_FUNCPROTO=$fc_x_value
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CFLAGS="$fc_x_save_CFLAGS"
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -13115,17 +11946,16 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
done
if test "x$fc_x_proto_FUNCPROTO" != "xno"; then
fc_x_proto_defines="$fc_x_proto_defines FUNCPROTO=$fc_x_proto_FUNCPROTO"
- echo "$as_me:$LINENO: result: yes, determined: $fc_x_proto_FUNCPROTO" >&5
-echo "${ECHO_T}yes, determined: $fc_x_proto_FUNCPROTO" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, determined: $fc_x_proto_FUNCPROTO" >&5
+$as_echo "yes, determined: $fc_x_proto_FUNCPROTO" >&6; }
else
- echo "$as_me:$LINENO: result: no, cannot determine" >&5
-echo "${ECHO_T}no, cannot determine" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, cannot determine" >&5
+$as_echo "no, cannot determine" >&6; }
fi
- echo "$as_me:$LINENO: checking for workable NARROWPROTO definition" >&5
-echo $ECHO_N "checking for workable NARROWPROTO definition... $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for workable NARROWPROTO definition" >&5
+$as_echo_n "checking for workable NARROWPROTO definition... " >&6; }
for fc_x_value in 1 ""; do
-
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -13145,15 +11975,10 @@ else
fi
fc_x_save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $X_CFLAGS $X_LIBS $X_PRE_LIBS -lXaw -lXt -lX11 $X_EXTRA_LIBS"
-if test "$cross_compiling" = yes; then
+if test "$cross_compiling" = yes; then :
:
else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
$fc_x_works
@@ -13211,26 +12036,13 @@ int main (int argc, char ** argv)
}
_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
+if ac_fn_c_try_run "$LINENO"; then :
fc_x_proto_NARROWPROTO=$fc_x_value
-else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
fi
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
+
CFLAGS="$fc_x_save_CFLAGS"
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -13245,43 +12057,42 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
done
if test "x$fc_x_proto_NARROWPROTO" != "xno"; then
fc_x_proto_defines="$fc_x_proto_defines NARROWPROTO=$fc_x_proto_NARROWPROTO"
- echo "$as_me:$LINENO: result: yes, determined: $fc_x_proto_NARROWPROTO" >&5
-echo "${ECHO_T}yes, determined: $fc_x_proto_NARROWPROTO" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, determined: $fc_x_proto_NARROWPROTO" >&5
+$as_echo "yes, determined: $fc_x_proto_NARROWPROTO" >&6; }
else
- echo "$as_me:$LINENO: result: no, cannot determine" >&5
-echo "${ECHO_T}no, cannot determine" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, cannot determine" >&5
+$as_echo "no, cannot determine" >&6; }
fi
- echo "$as_me:$LINENO: checking whether Xfuncproto was determined" >&5
-echo $ECHO_N "checking whether Xfuncproto was determined... $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Xfuncproto was determined" >&5
+$as_echo_n "checking whether Xfuncproto was determined... " >&6; }
if test -n "$fc_x_proto_defines"; then
- echo "$as_me:$LINENO: result: yes: $fc_x_proto_defines" >&5
-echo "${ECHO_T}yes: $fc_x_proto_defines" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes: $fc_x_proto_defines" >&5
+$as_echo "yes: $fc_x_proto_defines" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
fi
else
- echo "$as_me:$LINENO: result: no, examination failed" >&5
-echo "${ECHO_T}no, examination failed" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, examination failed" >&5
+$as_echo "no, examination failed" >&6; }
fi
else
fc_x_proto_defines=$with_x_funcproto
- echo "$as_me:$LINENO: result: yes, given: $fc_x_proto_defines" >&5
-echo "${ECHO_T}yes, given: $fc_x_proto_defines" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, given: $fc_x_proto_defines" >&5
+$as_echo "yes, given: $fc_x_proto_defines" >&6; }
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;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Not checking for XAW; use --enable-client=xaw to enable" >&5
+$as_echo "$as_me: WARNING: Not checking for XAW; use --enable-client=xaw to enable" >&2;}
elif test "$client" = xaw ; then
if test "$no_x" = yes; then
# Not all programs may use this symbol, but it does not hurt to define it.
-cat >>confdefs.h <<\_ACEOF
-#define X_DISPLAY_MISSING 1
-_ACEOF
+$as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h
X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
else
@@ -13294,17 +12105,12 @@ else
X_LIBS="$X_LIBS -L$x_libraries"
# For Solaris; some versions of Sun CC require a space after -R and
# others require no space. Words are not sufficient . . . .
- case `(uname -sr) 2>/dev/null` in
- "SunOS 5"*)
- echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
-echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
- ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5
+$as_echo_n "checking whether -R must be followed by a space... " >&6; }
+ ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
+ ac_xsave_c_werror_flag=$ac_c_werror_flag
+ ac_c_werror_flag=yes
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -13315,38 +12121,13 @@ main ()
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
- ac_R_nospace=yes
+if ac_fn_c_try_link "$LINENO"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ X_LIBS="$X_LIBS -R$x_libraries"
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_R_nospace=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- if test $ac_R_nospace = yes; then
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- X_LIBS="$X_LIBS -R$x_libraries"
- else
- LIBS="$ac_xsave_LIBS -R $x_libraries"
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ LIBS="$ac_xsave_LIBS -R $x_libraries"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -13357,37 +12138,21 @@ main ()
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
- ac_R_space=yes
+if ac_fn_c_try_link "$LINENO"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ X_LIBS="$X_LIBS -R $x_libraries"
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_R_space=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: neither works" >&5
+$as_echo "neither works" >&6; }
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- if test $ac_R_space = yes; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- X_LIBS="$X_LIBS -R $x_libraries"
- else
- echo "$as_me:$LINENO: result: neither works" >&5
-echo "${ECHO_T}neither works" >&6
- fi
- fi
- LIBS=$ac_xsave_LIBS
- esac
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ ac_c_werror_flag=$ac_xsave_c_werror_flag
+ LIBS=$ac_xsave_LIBS
fi
# Check for system-dependent libraries X programs must link with.
@@ -13401,166 +12166,112 @@ echo "${ECHO_T}neither works" >&6
# libraries were built with DECnet support. And Karl Berry says
# the Alpha needs dnet_stub (dnet does not exist).
ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 XOpenDisplay ();
int
main ()
{
-XOpenDisplay ();
+return XOpenDisplay ();
;
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
- :
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_link "$LINENO"; then :
-echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
-echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
-if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5
+$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
+if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldnet $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 dnet_ntoa ();
int
main ()
{
-dnet_ntoa ();
+return dnet_ntoa ();
;
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
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_dnet_dnet_ntoa=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dnet_dnet_ntoa=no
+ ac_cv_lib_dnet_dnet_ntoa=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
-echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
-if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
+if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then :
X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
fi
if test $ac_cv_lib_dnet_dnet_ntoa = no; then
- echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
-echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
-if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5
+$as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }
+if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldnet_stub $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 dnet_ntoa ();
int
main ()
{
-dnet_ntoa ();
+return dnet_ntoa ();
;
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
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_dnet_stub_dnet_ntoa=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dnet_stub_dnet_ntoa=no
+ ac_cv_lib_dnet_stub_dnet_ntoa=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
-echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
-if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+$as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
+if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then :
X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
fi
fi
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_xsave_LIBS"
# msh at cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
@@ -13571,194 +12282,90 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
# on Irix 5.2, according to T.E. Dickey.
# The functions gethostbyname, getservbyname, and inet_addr are
# in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
- echo "$as_me:$LINENO: checking for gethostbyname" >&5
-echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
-if test "${ac_cv_func_gethostbyname+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 gethostbyname (); 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 gethostbyname ();
-/* 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_gethostbyname) || defined (__stub___gethostbyname)
-choke me
-#else
-char (*f) () = gethostbyname;
-#endif
-#ifdef __cplusplus
-}
-#endif
+ ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
+if test "x$ac_cv_func_gethostbyname" = x""yes; then :
-int
-main ()
-{
-return f != gethostbyname;
- ;
- 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
- ac_cv_func_gethostbyname=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_gethostbyname=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
-echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
if test $ac_cv_func_gethostbyname = no; then
- echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
-echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
-if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
+$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
+if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lnsl $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 gethostbyname ();
int
main ()
{
-gethostbyname ();
+return gethostbyname ();
;
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
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_nsl_gethostbyname=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_nsl_gethostbyname=no
+ ac_cv_lib_nsl_gethostbyname=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
-echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
-if test $ac_cv_lib_nsl_gethostbyname = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
+$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
+if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
fi
if test $ac_cv_lib_nsl_gethostbyname = no; then
- echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
-echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
-if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5
+$as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
+if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lbsd $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 gethostbyname ();
int
main ()
{
-gethostbyname ();
+return gethostbyname ();
;
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
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_bsd_gethostbyname=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_bsd_gethostbyname=no
+ ac_cv_lib_bsd_gethostbyname=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
-echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
-if test $ac_cv_lib_bsd_gethostbyname = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5
+$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
+if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then :
X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
fi
@@ -13772,405 +12379,147 @@ fi
# variants that don't use the name server (or something). -lsocket
# must be given before -lnsl if both are needed. We assume that
# if connect needs -lnsl, so does gethostbyname.
- echo "$as_me:$LINENO: checking for connect" >&5
-echo $ECHO_N "checking for connect... $ECHO_C" >&6
-if test "${ac_cv_func_connect+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 connect (); 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 connect ();
-/* 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_connect) || defined (__stub___connect)
-choke me
-#else
-char (*f) () = connect;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != connect;
- ;
- 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
- ac_cv_func_connect=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
+if test "x$ac_cv_func_connect" = x""yes; then :
-ac_cv_func_connect=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
-echo "${ECHO_T}$ac_cv_func_connect" >&6
if test $ac_cv_func_connect = no; then
- echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
-echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
-if test "${ac_cv_lib_socket_connect+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
+$as_echo_n "checking for connect in -lsocket... " >&6; }
+if test "${ac_cv_lib_socket_connect+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 connect ();
int
main ()
{
-connect ();
+return connect ();
;
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
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_socket_connect=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_socket_connect=no
+ ac_cv_lib_socket_connect=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
-echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
-if test $ac_cv_lib_socket_connect = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
+$as_echo "$ac_cv_lib_socket_connect" >&6; }
+if test "x$ac_cv_lib_socket_connect" = x""yes; then :
X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
fi
fi
# Guillermo Gomez says -lposix is necessary on A/UX.
- echo "$as_me:$LINENO: checking for remove" >&5
-echo $ECHO_N "checking for remove... $ECHO_C" >&6
-if test "${ac_cv_func_remove+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 remove (); 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 remove ();
-/* 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_remove) || defined (__stub___remove)
-choke me
-#else
-char (*f) () = remove;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != remove;
- ;
- 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
- ac_cv_func_remove=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove"
+if test "x$ac_cv_func_remove" = x""yes; then :
-ac_cv_func_remove=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
-echo "${ECHO_T}$ac_cv_func_remove" >&6
if test $ac_cv_func_remove = no; then
- echo "$as_me:$LINENO: checking for remove in -lposix" >&5
-echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
-if test "${ac_cv_lib_posix_remove+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5
+$as_echo_n "checking for remove in -lposix... " >&6; }
+if test "${ac_cv_lib_posix_remove+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lposix $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 remove ();
int
main ()
{
-remove ();
+return remove ();
;
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
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_posix_remove=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_posix_remove=no
+ ac_cv_lib_posix_remove=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
-echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
-if test $ac_cv_lib_posix_remove = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5
+$as_echo "$ac_cv_lib_posix_remove" >&6; }
+if test "x$ac_cv_lib_posix_remove" = x""yes; then :
X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
fi
fi
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
- echo "$as_me:$LINENO: checking for shmat" >&5
-echo $ECHO_N "checking for shmat... $ECHO_C" >&6
-if test "${ac_cv_func_shmat+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 shmat (); 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 shmat ();
-/* 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_shmat) || defined (__stub___shmat)
-choke me
-#else
-char (*f) () = shmat;
-#endif
-#ifdef __cplusplus
-}
-#endif
+ ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
+if test "x$ac_cv_func_shmat" = x""yes; then :
-int
-main ()
-{
-return f != shmat;
- ;
- 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
- ac_cv_func_shmat=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_shmat=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
-echo "${ECHO_T}$ac_cv_func_shmat" >&6
if test $ac_cv_func_shmat = no; then
- echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
-echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
-if test "${ac_cv_lib_ipc_shmat+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5
+$as_echo_n "checking for shmat in -lipc... " >&6; }
+if test "${ac_cv_lib_ipc_shmat+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lipc $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 shmat ();
int
main ()
{
-shmat ();
+return shmat ();
;
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
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_ipc_shmat=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_ipc_shmat=no
+ ac_cv_lib_ipc_shmat=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
-echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
-if test $ac_cv_lib_ipc_shmat = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5
+$as_echo "$ac_cv_lib_ipc_shmat" >&6; }
+if test "x$ac_cv_lib_ipc_shmat" = x""yes; then :
X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
fi
@@ -14186,61 +12535,43 @@ fi
# These have to be linked with before -lX11, unlike the other
# libraries we check for below, so use a different variable.
# John Interrante, Karl Berry
- echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
-echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
-if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5
+$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
+if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lICE $X_EXTRA_LIBS $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 IceConnectionNumber ();
int
main ()
{
-IceConnectionNumber ();
+return IceConnectionNumber ();
;
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
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_ICE_IceConnectionNumber=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_ICE_IceConnectionNumber=no
+ ac_cv_lib_ICE_IceConnectionNumber=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
-echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
-if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+$as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
+if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then :
X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
fi
@@ -14249,8 +12580,8 @@ fi
fi
- echo "$as_me:$LINENO: checking for Xfuncproto control definition FUNCPROTO" >&5
-echo $ECHO_N "checking for Xfuncproto control definition FUNCPROTO... $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Xfuncproto control definition FUNCPROTO" >&5
+$as_echo_n "checking for Xfuncproto control definition FUNCPROTO... " >&6; }
# Search for the requested defined variable; return it's value:
fc_x_proto_value=
for fc_x_define in $fc_x_proto_defines; do
@@ -14262,11 +12593,11 @@ for fc_x_define in $fc_x_proto_defines; do
fi
done
if test -n "$fc_x_proto_value"; then
- echo "$as_me:$LINENO: result: yes: $fc_x_proto_value" >&5
-echo "${ECHO_T}yes: $fc_x_proto_value" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes: $fc_x_proto_value" >&5
+$as_echo "yes: $fc_x_proto_value" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
if test -n "$fc_x_proto_value"; then
@@ -14276,8 +12607,8 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
fi
- echo "$as_me:$LINENO: checking for Xfuncproto control definition NARROWPROTO" >&5
-echo $ECHO_N "checking for Xfuncproto control definition NARROWPROTO... $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Xfuncproto control definition NARROWPROTO" >&5
+$as_echo_n "checking for Xfuncproto control definition NARROWPROTO... " >&6; }
# Search for the requested defined variable; return it's value:
fc_x_proto_value=
for fc_x_define in $fc_x_proto_defines; do
@@ -14289,11 +12620,11 @@ for fc_x_define in $fc_x_proto_defines; do
fi
done
if test -n "$fc_x_proto_value"; then
- echo "$as_me:$LINENO: result: yes: $fc_x_proto_value" >&5
-echo "${ECHO_T}yes: $fc_x_proto_value" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes: $fc_x_proto_value" >&5
+$as_echo "yes: $fc_x_proto_value" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
if test -n "$fc_x_proto_value"; then
@@ -14310,10 +12641,10 @@ 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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
[\\/]* | ?:[\\/]*)
@@ -14325,37 +12656,38 @@ 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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
+IFS=$as_save_IFS
;;
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
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
case $ac_pt_PKG_CONFIG in
[\\/]* | ?:[\\/]*)
@@ -14367,29 +12699,39 @@ 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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
+IFS=$as_save_IFS
;;
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
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
- PKG_CONFIG=$ac_pt_PKG_CONFIG
+ if test "x$ac_pt_PKG_CONFIG" = x; then
+ PKG_CONFIG=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ PKG_CONFIG=$ac_pt_PKG_CONFIG
+ fi
else
PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
fi
@@ -14397,14 +12739,14 @@ 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
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
PKG_CONFIG=""
fi
@@ -14412,19 +12754,19 @@ fi
pkg_failed=no
-echo "$as_me:$LINENO: checking for PNG" >&5
-echo $ECHO_N "checking for PNG... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PNG" >&5
+$as_echo_n "checking for PNG... " >&6; }
if test -n "$PKG_CONFIG"; then
if test -n "$PNG_CFLAGS"; then
pkg_cv_PNG_CFLAGS="$PNG_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpng\"") >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpng\""; } >&5
($PKG_CONFIG --exists --print-errors "libpng") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
pkg_cv_PNG_CFLAGS=`$PKG_CONFIG --cflags "libpng" 2>/dev/null`
else
pkg_failed=yes
@@ -14438,11 +12780,11 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_PNG_LIBS="$PNG_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpng\"") >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpng\""; } >&5
($PKG_CONFIG --exists --print-errors "libpng") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
pkg_cv_PNG_LIBS=`$PKG_CONFIG --libs "libpng" 2>/dev/null`
else
pkg_failed=yes
@@ -14469,272 +12811,103 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$PNG_PKG_ERRORS" >&5
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
- echo "$as_me:$LINENO: checking for png_read_image in -lpng12" >&5
-echo $ECHO_N "checking for png_read_image in -lpng12... $ECHO_C" >&6
-if test "${ac_cv_lib_png12_png_read_image+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_read_image in -lpng12" >&5
+$as_echo_n "checking for png_read_image in -lpng12... " >&6; }
+if test "${ac_cv_lib_png12_png_read_image+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lpng12 $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 png_read_image ();
int
main ()
{
-png_read_image ();
+return png_read_image ();
;
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
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_png12_png_read_image=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_png12_png_read_image=no
+ ac_cv_lib_png12_png_read_image=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_png12_png_read_image" >&5
-echo "${ECHO_T}$ac_cv_lib_png12_png_read_image" >&6
-if test $ac_cv_lib_png12_png_read_image = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png12_png_read_image" >&5
+$as_echo "$ac_cv_lib_png12_png_read_image" >&6; }
+if test "x$ac_cv_lib_png12_png_read_image" = x""yes; then :
X_LIBS="$X_LIBS -lpng12 -lm"
else
- echo "$as_me:$LINENO: checking for png_read_image in -lpng" >&5
-echo $ECHO_N "checking for png_read_image in -lpng... $ECHO_C" >&6
-if test "${ac_cv_lib_png_png_read_image+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_read_image in -lpng" >&5
+$as_echo_n "checking for png_read_image in -lpng... " >&6; }
+if test "${ac_cv_lib_png_png_read_image+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lpng $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 png_read_image ();
int
main ()
{
-png_read_image ();
+return png_read_image ();
;
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
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_png_png_read_image=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_png_png_read_image=no
+ ac_cv_lib_png_png_read_image=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_read_image" >&5
-echo "${ECHO_T}$ac_cv_lib_png_png_read_image" >&6
-if test $ac_cv_lib_png_png_read_image = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_read_image" >&5
+$as_echo "$ac_cv_lib_png_png_read_image" >&6; }
+if test "x$ac_cv_lib_png_png_read_image" = x""yes; then :
X_LIBS="$X_LIBS -lpng -lm"
else
- { { echo "$as_me:$LINENO: error: Could not find PNG library." >&5
-echo "$as_me: error: Could not find PNG library." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "Could not find PNG library." "$LINENO" 5
fi
fi
- if test "${ac_cv_header_png_h+set}" = set; then
- echo "$as_me:$LINENO: checking for png.h" >&5
-echo $ECHO_N "checking for png.h... $ECHO_C" >&6
-if test "${ac_cv_header_png_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5
-echo "${ECHO_T}$ac_cv_header_png_h" >&6
-else
- # Is the header compilable?
-echo "$as_me:$LINENO: checking png.h usability" >&5
-echo $ECHO_N "checking png.h usability... $ECHO_C" >&6
-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. */
-$ac_includes_default
-#include <png.h>
-_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
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+ ac_fn_c_check_header_mongrel "$LINENO" "png.h" "ac_cv_header_png_h" "$ac_includes_default"
+if test "x$ac_cv_header_png_h" = x""yes; then :
-# Is the header present?
-echo "$as_me:$LINENO: checking png.h presence" >&5
-echo $ECHO_N "checking png.h presence... $ECHO_C" >&6
-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 <png.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- else
- ac_cpp_err=
- fi
else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc in
- yes:no )
- { echo "$as_me:$LINENO: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: png.h: proceeding with the preprocessor's result" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf at gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
- no:yes )
- { echo "$as_me:$LINENO: WARNING: png.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: png.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: png.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: png.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: png.h: proceeding with the preprocessor's result" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf at gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-echo "$as_me:$LINENO: checking for png.h" >&5
-echo $ECHO_N "checking for png.h... $ECHO_C" >&6
-if test "${ac_cv_header_png_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_png_h=$ac_header_preproc
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5
-echo "${ECHO_T}$ac_cv_header_png_h" >&6
-
-fi
-if test $ac_cv_header_png_h = yes; then
- :
-else
-
- { { echo "$as_me:$LINENO: error: libpng found but not png.h.
-You may need to install a libpng \"development\" package." >&5
-echo "$as_me: error: libpng found but not png.h.
-You may need to install a libpng \"development\" package." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "libpng found but not png.h.
+You may need to install a libpng \"development\" package." "$LINENO" 5
fi
@@ -14742,269 +12915,100 @@ fi
elif test $pkg_failed = untried; then
- echo "$as_me:$LINENO: checking for png_read_image in -lpng12" >&5
-echo $ECHO_N "checking for png_read_image in -lpng12... $ECHO_C" >&6
-if test "${ac_cv_lib_png12_png_read_image+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_read_image in -lpng12" >&5
+$as_echo_n "checking for png_read_image in -lpng12... " >&6; }
+if test "${ac_cv_lib_png12_png_read_image+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lpng12 $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 png_read_image ();
int
main ()
{
-png_read_image ();
+return png_read_image ();
;
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
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_png12_png_read_image=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_png12_png_read_image=no
+ ac_cv_lib_png12_png_read_image=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_png12_png_read_image" >&5
-echo "${ECHO_T}$ac_cv_lib_png12_png_read_image" >&6
-if test $ac_cv_lib_png12_png_read_image = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png12_png_read_image" >&5
+$as_echo "$ac_cv_lib_png12_png_read_image" >&6; }
+if test "x$ac_cv_lib_png12_png_read_image" = x""yes; then :
X_LIBS="$X_LIBS -lpng12 -lm"
else
- echo "$as_me:$LINENO: checking for png_read_image in -lpng" >&5
-echo $ECHO_N "checking for png_read_image in -lpng... $ECHO_C" >&6
-if test "${ac_cv_lib_png_png_read_image+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_read_image in -lpng" >&5
+$as_echo_n "checking for png_read_image in -lpng... " >&6; }
+if test "${ac_cv_lib_png_png_read_image+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lpng $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 png_read_image ();
int
main ()
{
-png_read_image ();
+return png_read_image ();
;
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
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_png_png_read_image=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_png_png_read_image=no
+ ac_cv_lib_png_png_read_image=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_read_image" >&5
-echo "${ECHO_T}$ac_cv_lib_png_png_read_image" >&6
-if test $ac_cv_lib_png_png_read_image = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_read_image" >&5
+$as_echo "$ac_cv_lib_png_png_read_image" >&6; }
+if test "x$ac_cv_lib_png_png_read_image" = x""yes; then :
X_LIBS="$X_LIBS -lpng -lm"
else
- { { echo "$as_me:$LINENO: error: Could not find PNG library." >&5
-echo "$as_me: error: Could not find PNG library." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "Could not find PNG library." "$LINENO" 5
fi
fi
- if test "${ac_cv_header_png_h+set}" = set; then
- echo "$as_me:$LINENO: checking for png.h" >&5
-echo $ECHO_N "checking for png.h... $ECHO_C" >&6
-if test "${ac_cv_header_png_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5
-echo "${ECHO_T}$ac_cv_header_png_h" >&6
-else
- # Is the header compilable?
-echo "$as_me:$LINENO: checking png.h usability" >&5
-echo $ECHO_N "checking png.h usability... $ECHO_C" >&6
-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. */
-$ac_includes_default
-#include <png.h>
-_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
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ ac_fn_c_check_header_mongrel "$LINENO" "png.h" "ac_cv_header_png_h" "$ac_includes_default"
+if test "x$ac_cv_header_png_h" = x""yes; then :
-ac_header_compiler=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking png.h presence" >&5
-echo $ECHO_N "checking png.h presence... $ECHO_C" >&6
-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 <png.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc in
- yes:no )
- { echo "$as_me:$LINENO: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: png.h: proceeding with the preprocessor's result" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf at gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
- no:yes )
- { echo "$as_me:$LINENO: WARNING: png.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: png.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: png.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: png.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: png.h: proceeding with the preprocessor's result" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf at gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-echo "$as_me:$LINENO: checking for png.h" >&5
-echo $ECHO_N "checking for png.h... $ECHO_C" >&6
-if test "${ac_cv_header_png_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_png_h=$ac_header_preproc
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5
-echo "${ECHO_T}$ac_cv_header_png_h" >&6
-
-fi
-if test $ac_cv_header_png_h = yes; then
- :
-else
-
- { { echo "$as_me:$LINENO: error: libpng found but not png.h.
-You may need to install a libpng \"development\" package." >&5
-echo "$as_me: error: libpng found but not png.h.
-You may need to install a libpng \"development\" package." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "libpng found but not png.h.
+You may need to install a libpng \"development\" package." "$LINENO" 5
fi
@@ -15013,25 +13017,25 @@ fi
else
PNG_CFLAGS=$pkg_cv_PNG_CFLAGS
PNG_LIBS=$pkg_cv_PNG_LIBS
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
X_LIBS="$X_LIBS $PNG_LIBS"
X_CFLAGS="$X_CFLAGS $PNG_CFLAGS"
fi
- echo "$as_me:$LINENO: checking extra paths for Xpm" >&5
-echo $ECHO_N "checking extra paths for Xpm... $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking extra paths for Xpm" >&5
+$as_echo_n "checking extra paths for Xpm... " >&6; }
-# Check whether --with-xpm-prefix or --without-xpm-prefix was given.
-if test "${with_xpm_prefix+set}" = set; then
- withval="$with_xpm_prefix"
- xpm_prefix="$withval"
+# Check whether --with-xpm-prefix was given.
+if test "${with_xpm_prefix+set}" = set; then :
+ withval=$with_xpm_prefix; xpm_prefix="$withval"
else
xpm_prefix="yes"
-fi;
+fi
+
if test "$xpm_prefix" = "yes" || test "$xpm_prefix" = "no"; then
xpm_libdir="$xpm_prefix"
xpm_incdir="$xpm_prefix"
@@ -15040,19 +13044,19 @@ else
xpm_incdir="$xpm_prefix/include"
fi
-# Check whether --with-xpm-lib or --without-xpm-lib was given.
-if test "${with_xpm_lib+set}" = set; then
- withval="$with_xpm_lib"
- xpm_libdir="$withval"
+# Check whether --with-xpm-lib was given.
+if test "${with_xpm_lib+set}" = set; then :
+ withval=$with_xpm_lib; xpm_libdir="$withval"
-fi;
+fi
-# Check whether --with-xpm-include or --without-xpm-include was given.
-if test "${with_xpm_include+set}" = set; then
- withval="$with_xpm_include"
- xpm_incdir="$withval"
-fi;
+# Check whether --with-xpm-include was given.
+if test "${with_xpm_include+set}" = set; then :
+ withval=$with_xpm_include; xpm_incdir="$withval"
+
+fi
+
fc_xpm_default=/usr/local
if test "$xpm_libdir" = "yes"; then
xpm_libdir="no"
@@ -15074,8 +13078,8 @@ if test "$xpm_incdir" = "yes"; then
xpm_h_no_x11=yes
fi
fi
-echo "$as_me:$LINENO: result: library $xpm_libdir, include $xpm_incdir" >&5
-echo "${ECHO_T}library $xpm_libdir, include $xpm_incdir" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: library $xpm_libdir, include $xpm_incdir" >&5
+$as_echo "library $xpm_libdir, include $xpm_incdir" >&6; }
if test "$xpm_incdir" != "no"; then
@@ -15090,9 +13094,7 @@ echo "${ECHO_T}library $xpm_libdir, include $xpm_incdir" >&6
fi
if test "x$xpm_h_no_x11" = "xyes"; then
-cat >>confdefs.h <<\_ACEOF
-#define XPM_H_NO_X11 1
-_ACEOF
+$as_echo "#define XPM_H_NO_X11 1" >>confdefs.h
fi
fi
@@ -15100,22 +13102,17 @@ _ACEOF
fc_save_X_LIBS="$X_LIBS"
X_LIBS="$X_LIBS $X_PRE_LIBS"
- echo "$as_me:$LINENO: checking for XOpenDisplay in X library -lX11" >&5
-echo $ECHO_N "checking for XOpenDisplay in X library -lX11... $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XOpenDisplay in X library -lX11" >&5
+$as_echo_n "checking for XOpenDisplay in X library -lX11... " >&6; }
ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'`
- if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ if { as_var=ac_cv_lib_$ac_lib_var; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
else
ac_save_LIBS="$LIBS"
LIBS="$X_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifdef __cplusplus
extern "C"
@@ -15133,32 +13130,19 @@ XOpenDisplay()
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
+if ac_fn_c_try_link "$LINENO"; then :
eval "ac_cv_lib_$ac_lib_var=yes"
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "ac_cv_lib_$ac_lib_var=no"
+ eval "ac_cv_lib_$ac_lib_var=no"
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_save_LIBS"
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
ac_tr_lib=HAVE_LIB`echo X11 | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
@@ -15171,13 +13155,6 @@ echo "${ECHO_T}yes" >&6
-
-
-
-
-
-
-
if (test $ac_tr_lib == HAVE_LIBX11 \
|| test $ac_tr_lib == HAVE_LIBXEXT \
|| test $ac_tr_lib == HAVE_LIBXT \
@@ -15191,35 +13168,28 @@ _ACEOF
X_EXTRA_LIBS="-lX11 $X_EXTRA_LIBS"
else
- { { echo "$as_me:$LINENO: error: Invalid define of $ac_tr_lib in X11" >&5
-echo "$as_me: error: Invalid define of $ac_tr_lib in X11" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "Invalid define of $ac_tr_lib in X11" "$LINENO" 5
fi
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
haveX11=no
fi
if test "x$haveX11" != "xno"; then
- echo "$as_me:$LINENO: checking for XShapeCombineMask in X library -lXext" >&5
-echo $ECHO_N "checking for XShapeCombineMask in X library -lXext... $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XShapeCombineMask in X library -lXext" >&5
+$as_echo_n "checking for XShapeCombineMask in X library -lXext... " >&6; }
ac_lib_var=`echo Xext'_'XShapeCombineMask | sed 'y%./+-%__p_%'`
- if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ if { as_var=ac_cv_lib_$ac_lib_var; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
else
ac_save_LIBS="$LIBS"
LIBS="$X_LIBS -lXext $X_EXTRA_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifdef __cplusplus
extern "C"
@@ -15237,32 +13207,19 @@ XShapeCombineMask()
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
+if ac_fn_c_try_link "$LINENO"; then :
eval "ac_cv_lib_$ac_lib_var=yes"
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "ac_cv_lib_$ac_lib_var=no"
+ eval "ac_cv_lib_$ac_lib_var=no"
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_save_LIBS"
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
ac_tr_lib=HAVE_LIB`echo Xext | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
@@ -15275,13 +13232,6 @@ echo "${ECHO_T}yes" >&6
-
-
-
-
-
-
-
if (test $ac_tr_lib == HAVE_LIBX11 \
|| test $ac_tr_lib == HAVE_LIBXEXT \
|| test $ac_tr_lib == HAVE_LIBXT \
@@ -15295,14 +13245,12 @@ _ACEOF
X_EXTRA_LIBS="-lXext $X_EXTRA_LIBS"
else
- { { echo "$as_me:$LINENO: error: Invalid define of $ac_tr_lib in Xext" >&5
-echo "$as_me: error: Invalid define of $ac_tr_lib in Xext" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "Invalid define of $ac_tr_lib in Xext" "$LINENO" 5
fi
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -15310,22 +13258,17 @@ echo "${ECHO_T}no" >&6
X_LIBS="$fc_save_X_LIBS"
- echo "$as_me:$LINENO: checking for main in X library -lXt" >&5
-echo $ECHO_N "checking for main in X library -lXt... $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in X library -lXt" >&5
+$as_echo_n "checking for main in X library -lXt... " >&6; }
ac_lib_var=`echo Xt'_'main | sed 'y%./+-%__p_%'`
- if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ if { as_var=ac_cv_lib_$ac_lib_var; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
else
ac_save_LIBS="$LIBS"
LIBS="$X_LIBS -lXt $X_EXTRA_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -15337,32 +13280,19 @@ main()
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
+if ac_fn_c_try_link "$LINENO"; then :
eval "ac_cv_lib_$ac_lib_var=yes"
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "ac_cv_lib_$ac_lib_var=no"
+ eval "ac_cv_lib_$ac_lib_var=no"
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_save_LIBS"
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
ac_tr_lib=HAVE_LIB`echo Xt | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
@@ -15375,13 +13305,6 @@ echo "${ECHO_T}yes" >&6
-
-
-
-
-
-
-
if (test $ac_tr_lib == HAVE_LIBX11 \
|| test $ac_tr_lib == HAVE_LIBXEXT \
|| test $ac_tr_lib == HAVE_LIBXT \
@@ -15395,33 +13318,26 @@ _ACEOF
X_EXTRA_LIBS="-lXt $X_EXTRA_LIBS"
else
- { { echo "$as_me:$LINENO: error: Invalid define of $ac_tr_lib in Xt" >&5
-echo "$as_me: error: Invalid define of $ac_tr_lib in Xt" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "Invalid define of $ac_tr_lib in Xt" "$LINENO" 5
fi
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
- echo "$as_me:$LINENO: checking for main in X library -lXmu" >&5
-echo $ECHO_N "checking for main in X library -lXmu... $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in X library -lXmu" >&5
+$as_echo_n "checking for main in X library -lXmu... " >&6; }
ac_lib_var=`echo Xmu'_'main | sed 'y%./+-%__p_%'`
- if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ if { as_var=ac_cv_lib_$ac_lib_var; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
else
ac_save_LIBS="$LIBS"
LIBS="$X_LIBS -lXmu $X_EXTRA_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -15433,32 +13349,19 @@ main()
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
+if ac_fn_c_try_link "$LINENO"; then :
eval "ac_cv_lib_$ac_lib_var=yes"
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "ac_cv_lib_$ac_lib_var=no"
+ eval "ac_cv_lib_$ac_lib_var=no"
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_save_LIBS"
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
ac_tr_lib=HAVE_LIB`echo Xmu | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
@@ -15471,13 +13374,6 @@ echo "${ECHO_T}yes" >&6
-
-
-
-
-
-
-
if (test $ac_tr_lib == HAVE_LIBX11 \
|| test $ac_tr_lib == HAVE_LIBXEXT \
|| test $ac_tr_lib == HAVE_LIBXT \
@@ -15491,33 +13387,26 @@ _ACEOF
X_EXTRA_LIBS="-lXmu $X_EXTRA_LIBS"
else
- { { echo "$as_me:$LINENO: error: Invalid define of $ac_tr_lib in Xmu" >&5
-echo "$as_me: error: Invalid define of $ac_tr_lib in Xmu" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "Invalid define of $ac_tr_lib in Xmu" "$LINENO" 5
fi
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
- echo "$as_me:$LINENO: checking for XpmReadFileToPixmap in X library -lXpm" >&5
-echo $ECHO_N "checking for XpmReadFileToPixmap in X library -lXpm... $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XpmReadFileToPixmap in X library -lXpm" >&5
+$as_echo_n "checking for XpmReadFileToPixmap in X library -lXpm... " >&6; }
ac_lib_var=`echo Xpm'_'XpmReadFileToPixmap | sed 'y%./+-%__p_%'`
- if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ if { as_var=ac_cv_lib_$ac_lib_var; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
else
ac_save_LIBS="$LIBS"
LIBS="$X_LIBS -lXpm $X_EXTRA_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifdef __cplusplus
extern "C"
@@ -15535,32 +13424,19 @@ XpmReadFileToPixmap()
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
+if ac_fn_c_try_link "$LINENO"; then :
eval "ac_cv_lib_$ac_lib_var=yes"
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "ac_cv_lib_$ac_lib_var=no"
+ eval "ac_cv_lib_$ac_lib_var=no"
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_save_LIBS"
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
ac_tr_lib=HAVE_LIB`echo Xpm | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
@@ -15573,13 +13449,6 @@ echo "${ECHO_T}yes" >&6
-
-
-
-
-
-
-
if (test $ac_tr_lib == HAVE_LIBX11 \
|| test $ac_tr_lib == HAVE_LIBXEXT \
|| test $ac_tr_lib == HAVE_LIBXT \
@@ -15593,36 +13462,29 @@ _ACEOF
X_EXTRA_LIBS="-lXpm $X_EXTRA_LIBS"
else
- { { echo "$as_me:$LINENO: error: Invalid define of $ac_tr_lib in Xpm" >&5
-echo "$as_me: error: Invalid define of $ac_tr_lib in Xpm" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "Invalid define of $ac_tr_lib in Xpm" "$LINENO" 5
fi
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
haveXpm=no
fi
if test "x$haveXpm" != "xno"; then
if test -n "$WITH_XAW3D"; then
- echo "$as_me:$LINENO: checking for main in X library -lXaw3d" >&5
-echo $ECHO_N "checking for main in X library -lXaw3d... $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in X library -lXaw3d" >&5
+$as_echo_n "checking for main in X library -lXaw3d... " >&6; }
ac_lib_var=`echo Xaw3d'_'main | sed 'y%./+-%__p_%'`
- if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ if { as_var=ac_cv_lib_$ac_lib_var; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
else
ac_save_LIBS="$LIBS"
LIBS="$X_LIBS -lXaw3d $X_EXTRA_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -15634,32 +13496,19 @@ main()
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
+if ac_fn_c_try_link "$LINENO"; then :
eval "ac_cv_lib_$ac_lib_var=yes"
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "ac_cv_lib_$ac_lib_var=no"
+ eval "ac_cv_lib_$ac_lib_var=no"
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_save_LIBS"
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
ac_tr_lib=HAVE_LIB`echo Xaw3d | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
@@ -15672,13 +13521,6 @@ echo "${ECHO_T}yes" >&6
-
-
-
-
-
-
-
if (test $ac_tr_lib == HAVE_LIBX11 \
|| test $ac_tr_lib == HAVE_LIBXEXT \
|| test $ac_tr_lib == HAVE_LIBXT \
@@ -15692,37 +13534,28 @@ _ACEOF
X_EXTRA_LIBS="-lXaw3d $X_EXTRA_LIBS"
else
- { { echo "$as_me:$LINENO: error: Invalid define of $ac_tr_lib in Xaw3d" >&5
-echo "$as_me: error: Invalid define of $ac_tr_lib in Xaw3d" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "Invalid define of $ac_tr_lib in Xaw3d" "$LINENO" 5
fi
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- { { echo "$as_me:$LINENO: error: did not find Xaw3d library" >&5
-echo "$as_me: error: did not find Xaw3d library" >&2;}
- { (exit 1); exit 1; }; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ as_fn_error "did not find Xaw3d library" "$LINENO" 5
fi
elif test "$client" = "xaw"; then
- echo "$as_me:$LINENO: checking for main in X library -lXaw" >&5
-echo $ECHO_N "checking for main in X library -lXaw... $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in X library -lXaw" >&5
+$as_echo_n "checking for main in X library -lXaw... " >&6; }
ac_lib_var=`echo Xaw'_'main | sed 'y%./+-%__p_%'`
- if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ if { as_var=ac_cv_lib_$ac_lib_var; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
else
ac_save_LIBS="$LIBS"
LIBS="$X_LIBS -lXaw $X_EXTRA_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -15734,32 +13567,19 @@ main()
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
+if ac_fn_c_try_link "$LINENO"; then :
eval "ac_cv_lib_$ac_lib_var=yes"
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "ac_cv_lib_$ac_lib_var=no"
+ eval "ac_cv_lib_$ac_lib_var=no"
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_save_LIBS"
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
ac_tr_lib=HAVE_LIB`echo Xaw | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
@@ -15772,13 +13592,6 @@ echo "${ECHO_T}yes" >&6
-
-
-
-
-
-
-
if (test $ac_tr_lib == HAVE_LIBX11 \
|| test $ac_tr_lib == HAVE_LIBXEXT \
|| test $ac_tr_lib == HAVE_LIBXT \
@@ -15792,37 +13605,28 @@ _ACEOF
X_EXTRA_LIBS="-lXaw $X_EXTRA_LIBS"
else
- { { echo "$as_me:$LINENO: error: Invalid define of $ac_tr_lib in Xaw" >&5
-echo "$as_me: error: Invalid define of $ac_tr_lib in Xaw" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "Invalid define of $ac_tr_lib in Xaw" "$LINENO" 5
fi
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- { { echo "$as_me:$LINENO: error: did not find Xaw library" >&5
-echo "$as_me: error: did not find Xaw library" >&2;}
- { (exit 1); exit 1; }; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ as_fn_error "did not find Xaw library" "$LINENO" 5
fi
else
- echo "$as_me:$LINENO: checking for main in X library -lXaw3d" >&5
-echo $ECHO_N "checking for main in X library -lXaw3d... $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in X library -lXaw3d" >&5
+$as_echo_n "checking for main in X library -lXaw3d... " >&6; }
ac_lib_var=`echo Xaw3d'_'main | sed 'y%./+-%__p_%'`
- if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ if { as_var=ac_cv_lib_$ac_lib_var; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
else
ac_save_LIBS="$LIBS"
LIBS="$X_LIBS -lXaw3d $X_EXTRA_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -15834,32 +13638,19 @@ main()
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
+if ac_fn_c_try_link "$LINENO"; then :
eval "ac_cv_lib_$ac_lib_var=yes"
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "ac_cv_lib_$ac_lib_var=no"
+ eval "ac_cv_lib_$ac_lib_var=no"
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_save_LIBS"
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
ac_tr_lib=HAVE_LIB`echo Xaw3d | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
@@ -15872,13 +13663,6 @@ echo "${ECHO_T}yes" >&6
-
-
-
-
-
-
-
if (test $ac_tr_lib == HAVE_LIBX11 \
|| test $ac_tr_lib == HAVE_LIBXEXT \
|| test $ac_tr_lib == HAVE_LIBXT \
@@ -15892,35 +13676,28 @@ _ACEOF
X_EXTRA_LIBS="-lXaw3d $X_EXTRA_LIBS"
else
- { { echo "$as_me:$LINENO: error: Invalid define of $ac_tr_lib in Xaw3d" >&5
-echo "$as_me: error: Invalid define of $ac_tr_lib in Xaw3d" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "Invalid define of $ac_tr_lib in Xaw3d" "$LINENO" 5
fi
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
noXaw3d=1
fi
if test -n "$noXaw3d"; then
- echo "$as_me:$LINENO: checking for main in X library -lXaw" >&5
-echo $ECHO_N "checking for main in X library -lXaw... $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in X library -lXaw" >&5
+$as_echo_n "checking for main in X library -lXaw... " >&6; }
ac_lib_var=`echo Xaw'_'main | sed 'y%./+-%__p_%'`
- if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ if { as_var=ac_cv_lib_$ac_lib_var; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
else
ac_save_LIBS="$LIBS"
LIBS="$X_LIBS -lXaw $X_EXTRA_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -15932,32 +13709,19 @@ main()
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
+if ac_fn_c_try_link "$LINENO"; then :
eval "ac_cv_lib_$ac_lib_var=yes"
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "ac_cv_lib_$ac_lib_var=no"
+ eval "ac_cv_lib_$ac_lib_var=no"
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_save_LIBS"
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
ac_tr_lib=HAVE_LIB`echo Xaw | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
@@ -15970,13 +13734,6 @@ echo "${ECHO_T}yes" >&6
-
-
-
-
-
-
-
if (test $ac_tr_lib == HAVE_LIBX11 \
|| test $ac_tr_lib == HAVE_LIBXEXT \
|| test $ac_tr_lib == HAVE_LIBXT \
@@ -15990,17 +13747,13 @@ _ACEOF
X_EXTRA_LIBS="-lXaw $X_EXTRA_LIBS"
else
- { { echo "$as_me:$LINENO: error: Invalid define of $ac_tr_lib in Xaw" >&5
-echo "$as_me: error: Invalid define of $ac_tr_lib in Xaw" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "Invalid define of $ac_tr_lib in Xaw" "$LINENO" 5
fi
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- { { echo "$as_me:$LINENO: error: did not find either Xaw or Xaw3d library" >&5
-echo "$as_me: error: did not find either Xaw or Xaw3d library" >&2;}
- { (exit 1); exit 1; }; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ as_fn_error "did not find either Xaw or Xaw3d library" "$LINENO" 5
fi
fi
@@ -16017,23 +13770,19 @@ echo "$as_me: error: did not find either Xaw or Xaw3d library" >&2;}
client=xaw
elif test "$client" = "xaw"; then
if test "x$haveXpm" = "xno"; then
- { { echo "$as_me:$LINENO: error: specified client 'xaw' not configurable -- need Xpm library and development headers; perhaps try/adjust --with-xpm-lib" >&5
-echo "$as_me: error: specified client 'xaw' not configurable -- need Xpm library and development headers; perhaps try/adjust --with-xpm-lib" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "specified client 'xaw' not configurable -- need Xpm library and development headers; perhaps try/adjust --with-xpm-lib" "$LINENO" 5
else
- { { echo "$as_me:$LINENO: error: specified client 'xaw' not configurable -- need X11 libraries and development headers; perhaps try/adjust --x-libraries" >&5
-echo "$as_me: error: specified client 'xaw' not configurable -- need X11 libraries and development headers; perhaps try/adjust --x-libraries" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "specified client 'xaw' not configurable -- need X11 libraries and development headers; perhaps try/adjust --x-libraries" "$LINENO" 5
fi
fi
fi
if test "$client" = ftwl ; then
- echo "$as_me:$LINENO: checking will compile gui-ftwl" >&5
-echo $ECHO_N "checking will compile gui-ftwl... $ECHO_C" >&6
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking will compile gui-ftwl" >&5
+$as_echo_n "checking will compile gui-ftwl... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
CLIENT_CFLAGS="$CLIENT_CFLAGS $FTWL_CFLAGS"
CLIENT_LIBS="$CLIENT_LIBS $FTWL_LIBS"
fi
@@ -16048,9 +13797,7 @@ echo "${ECHO_T}yes" >&6
if test "x$found_client" = "xyes"; then
client=beos
elif test "$client" = "beos"; then
- { { echo "$as_me:$LINENO: error: specified client 'beos' not configurable" >&5
-echo "$as_me: error: specified client 'beos' not configurable" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "specified client 'beos' not configurable" "$LINENO" 5
fi
fi
@@ -16064,10 +13811,10 @@ 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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
[\\/]* | ?:[\\/]*)
@@ -16079,37 +13826,38 @@ 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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
+IFS=$as_save_IFS
;;
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
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
case $ac_pt_PKG_CONFIG in
[\\/]* | ?:[\\/]*)
@@ -16121,29 +13869,39 @@ 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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
+IFS=$as_save_IFS
;;
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
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
- PKG_CONFIG=$ac_pt_PKG_CONFIG
+ if test "x$ac_pt_PKG_CONFIG" = x; then
+ PKG_CONFIG=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ PKG_CONFIG=$ac_pt_PKG_CONFIG
+ fi
else
PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
fi
@@ -16151,14 +13909,14 @@ 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
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
PKG_CONFIG=""
fi
@@ -16166,19 +13924,19 @@ fi
pkg_failed=no
-echo "$as_me:$LINENO: checking for PNG" >&5
-echo $ECHO_N "checking for PNG... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PNG" >&5
+$as_echo_n "checking for PNG... " >&6; }
if test -n "$PKG_CONFIG"; then
if test -n "$PNG_CFLAGS"; then
pkg_cv_PNG_CFLAGS="$PNG_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpng\"") >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpng\""; } >&5
($PKG_CONFIG --exists --print-errors "libpng") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
pkg_cv_PNG_CFLAGS=`$PKG_CONFIG --cflags "libpng" 2>/dev/null`
else
pkg_failed=yes
@@ -16192,11 +13950,11 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_PNG_LIBS="$PNG_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpng\"") >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpng\""; } >&5
($PKG_CONFIG --exists --print-errors "libpng") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
pkg_cv_PNG_LIBS=`$PKG_CONFIG --libs "libpng" 2>/dev/null`
else
pkg_failed=yes
@@ -16223,252 +13981,87 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$PNG_PKG_ERRORS" >&5
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
- echo "$as_me:$LINENO: checking for gzgets in -lz" >&5
-echo $ECHO_N "checking for gzgets in -lz... $ECHO_C" >&6
-if test "${ac_cv_lib_z_gzgets+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gzgets in -lz" >&5
+$as_echo_n "checking for gzgets in -lz... " >&6; }
+if test "${ac_cv_lib_z_gzgets+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lz $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 gzgets ();
int
main ()
{
-gzgets ();
+return gzgets ();
;
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
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_z_gzgets=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_z_gzgets=no
+ ac_cv_lib_z_gzgets=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_z_gzgets" >&5
-echo "${ECHO_T}$ac_cv_lib_z_gzgets" >&6
-if test $ac_cv_lib_z_gzgets = yes; then
-
- if test "${ac_cv_header_zlib_h+set}" = set; then
- echo "$as_me:$LINENO: checking for zlib.h" >&5
-echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6
-if test "${ac_cv_header_zlib_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
-echo "${ECHO_T}$ac_cv_header_zlib_h" >&6
-else
- # Is the header compilable?
-echo "$as_me:$LINENO: checking zlib.h usability" >&5
-echo $ECHO_N "checking zlib.h usability... $ECHO_C" >&6
-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. */
-$ac_includes_default
-#include <zlib.h>
-_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
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_gzgets" >&5
+$as_echo "$ac_cv_lib_z_gzgets" >&6; }
+if test "x$ac_cv_lib_z_gzgets" = x""yes; then :
-ac_header_compiler=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+ ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
+if test "x$ac_cv_header_zlib_h" = x""yes; then :
-# Is the header present?
-echo "$as_me:$LINENO: checking zlib.h presence" >&5
-echo $ECHO_N "checking zlib.h presence... $ECHO_C" >&6
-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 <zlib.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc in
- yes:no )
- { echo "$as_me:$LINENO: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf at gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
- no:yes )
- { echo "$as_me:$LINENO: WARNING: zlib.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: zlib.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: zlib.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: zlib.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf at gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-echo "$as_me:$LINENO: checking for zlib.h" >&5
-echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6
-if test "${ac_cv_header_zlib_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_zlib_h=$ac_header_preproc
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
-echo "${ECHO_T}$ac_cv_header_zlib_h" >&6
-
-fi
-if test $ac_cv_header_zlib_h = yes; then
-
-
-echo "$as_me:$LINENO: checking for png_read_image in -lpng12" >&5
-echo $ECHO_N "checking for png_read_image in -lpng12... $ECHO_C" >&6
-if test "${ac_cv_lib_png12_png_read_image+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_read_image in -lpng12" >&5
+$as_echo_n "checking for png_read_image in -lpng12... " >&6; }
+if test "${ac_cv_lib_png12_png_read_image+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lpng12 $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 png_read_image ();
int
main ()
{
-png_read_image ();
+return png_read_image ();
;
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
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_png12_png_read_image=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_png12_png_read_image=no
+ ac_cv_lib_png12_png_read_image=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_png12_png_read_image" >&5
-echo "${ECHO_T}$ac_cv_lib_png12_png_read_image" >&6
-if test $ac_cv_lib_png12_png_read_image = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png12_png_read_image" >&5
+$as_echo "$ac_cv_lib_png12_png_read_image" >&6; }
+if test "x$ac_cv_lib_png12_png_read_image" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBPNG12 1
_ACEOF
@@ -16477,62 +14070,43 @@ _ACEOF
else
-
-echo "$as_me:$LINENO: checking for png_read_image in -lpng" >&5
-echo $ECHO_N "checking for png_read_image in -lpng... $ECHO_C" >&6
-if test "${ac_cv_lib_png_png_read_image+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_read_image in -lpng" >&5
+$as_echo_n "checking for png_read_image in -lpng... " >&6; }
+if test "${ac_cv_lib_png_png_read_image+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lpng $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 png_read_image ();
int
main ()
{
-png_read_image ();
+return png_read_image ();
;
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
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_png_png_read_image=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_png_png_read_image=no
+ ac_cv_lib_png_png_read_image=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_read_image" >&5
-echo "${ECHO_T}$ac_cv_lib_png_png_read_image" >&6
-if test $ac_cv_lib_png_png_read_image = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_read_image" >&5
+$as_echo "$ac_cv_lib_png_png_read_image" >&6; }
+if test "x$ac_cv_lib_png_png_read_image" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBPNG 1
_ACEOF
@@ -16543,9 +14117,7 @@ else
if test "$client" = "win32"; then
- { { echo "$as_me:$LINENO: error: specified client 'win32' not configurable (libpng is needed)" >&5
-echo "$as_me: error: specified client 'win32' not configurable (libpng is needed)" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "specified client 'win32' not configurable (libpng is needed)" "$LINENO" 5
fi
@@ -16555,136 +14127,8 @@ fi
fi
- if test "${ac_cv_header_png_h+set}" = set; then
- echo "$as_me:$LINENO: checking for png.h" >&5
-echo $ECHO_N "checking for png.h... $ECHO_C" >&6
-if test "${ac_cv_header_png_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5
-echo "${ECHO_T}$ac_cv_header_png_h" >&6
-else
- # Is the header compilable?
-echo "$as_me:$LINENO: checking png.h usability" >&5
-echo $ECHO_N "checking png.h usability... $ECHO_C" >&6
-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. */
-$ac_includes_default
-#include <png.h>
-_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
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking png.h presence" >&5
-echo $ECHO_N "checking png.h presence... $ECHO_C" >&6
-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 <png.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc in
- yes:no )
- { echo "$as_me:$LINENO: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: png.h: proceeding with the preprocessor's result" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf at gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
- no:yes )
- { echo "$as_me:$LINENO: WARNING: png.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: png.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: png.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: png.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: png.h: proceeding with the preprocessor's result" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf at gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-echo "$as_me:$LINENO: checking for png.h" >&5
-echo $ECHO_N "checking for png.h... $ECHO_C" >&6
-if test "${ac_cv_header_png_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_png_h=$ac_header_preproc
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5
-echo "${ECHO_T}$ac_cv_header_png_h" >&6
-
-fi
-if test $ac_cv_header_png_h = yes; then
+ ac_fn_c_check_header_mongrel "$LINENO" "png.h" "ac_cv_header_png_h" "$ac_includes_default"
+if test "x$ac_cv_header_png_h" = x""yes; then :
found_client=yes
client=win32
@@ -16694,9 +14138,7 @@ else
if test "$client" = "win32"; then
- { { echo "$as_me:$LINENO: error: specified client 'win32' not configurable (libpng-dev is needed)" >&5
-echo "$as_me: error: specified client 'win32' not configurable (libpng-dev is needed)" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "specified client 'win32' not configurable (libpng-dev is needed)" "$LINENO" 5
fi
@@ -16708,9 +14150,7 @@ else
if test "$client" = "win32"; then
- { { echo "$as_me:$LINENO: error: specified client 'win32' not configurable (zlib-dev is needed)" >&5
-echo "$as_me: error: specified client 'win32' not configurable (zlib-dev is needed)" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "specified client 'win32' not configurable (zlib-dev is needed)" "$LINENO" 5
fi
@@ -16722,9 +14162,7 @@ else
if test "$client" = "win32"; then
- { { echo "$as_me:$LINENO: error: specified client 'win32' not configurable (zlib is needed)" >&5
-echo "$as_me: error: specified client 'win32' not configurable (zlib is needed)" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "specified client 'win32' not configurable (zlib is needed)" "$LINENO" 5
fi
@@ -16733,249 +14171,84 @@ fi
elif test $pkg_failed = untried; then
- echo "$as_me:$LINENO: checking for gzgets in -lz" >&5
-echo $ECHO_N "checking for gzgets in -lz... $ECHO_C" >&6
-if test "${ac_cv_lib_z_gzgets+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gzgets in -lz" >&5
+$as_echo_n "checking for gzgets in -lz... " >&6; }
+if test "${ac_cv_lib_z_gzgets+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lz $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 gzgets ();
int
main ()
{
-gzgets ();
+return gzgets ();
;
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
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_z_gzgets=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_z_gzgets=no
+ ac_cv_lib_z_gzgets=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_z_gzgets" >&5
-echo "${ECHO_T}$ac_cv_lib_z_gzgets" >&6
-if test $ac_cv_lib_z_gzgets = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_gzgets" >&5
+$as_echo "$ac_cv_lib_z_gzgets" >&6; }
+if test "x$ac_cv_lib_z_gzgets" = x""yes; then :
- if test "${ac_cv_header_zlib_h+set}" = set; then
- echo "$as_me:$LINENO: checking for zlib.h" >&5
-echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6
-if test "${ac_cv_header_zlib_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
-echo "${ECHO_T}$ac_cv_header_zlib_h" >&6
-else
- # Is the header compilable?
-echo "$as_me:$LINENO: checking zlib.h usability" >&5
-echo $ECHO_N "checking zlib.h usability... $ECHO_C" >&6
-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. */
-$ac_includes_default
-#include <zlib.h>
-_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
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking zlib.h presence" >&5
-echo $ECHO_N "checking zlib.h presence... $ECHO_C" >&6
-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 <zlib.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
+ ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
+if test "x$ac_cv_header_zlib_h" = x""yes; then :
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc in
- yes:no )
- { echo "$as_me:$LINENO: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf at gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
- no:yes )
- { echo "$as_me:$LINENO: WARNING: zlib.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: zlib.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: zlib.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: zlib.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf at gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-echo "$as_me:$LINENO: checking for zlib.h" >&5
-echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6
-if test "${ac_cv_header_zlib_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_zlib_h=$ac_header_preproc
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
-echo "${ECHO_T}$ac_cv_header_zlib_h" >&6
-
-fi
-if test $ac_cv_header_zlib_h = yes; then
-
-
-echo "$as_me:$LINENO: checking for png_read_image in -lpng12" >&5
-echo $ECHO_N "checking for png_read_image in -lpng12... $ECHO_C" >&6
-if test "${ac_cv_lib_png12_png_read_image+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_read_image in -lpng12" >&5
+$as_echo_n "checking for png_read_image in -lpng12... " >&6; }
+if test "${ac_cv_lib_png12_png_read_image+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lpng12 $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 png_read_image ();
int
main ()
{
-png_read_image ();
+return png_read_image ();
;
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
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_png12_png_read_image=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_png12_png_read_image=no
+ ac_cv_lib_png12_png_read_image=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_png12_png_read_image" >&5
-echo "${ECHO_T}$ac_cv_lib_png12_png_read_image" >&6
-if test $ac_cv_lib_png12_png_read_image = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png12_png_read_image" >&5
+$as_echo "$ac_cv_lib_png12_png_read_image" >&6; }
+if test "x$ac_cv_lib_png12_png_read_image" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBPNG12 1
_ACEOF
@@ -16984,62 +14257,43 @@ _ACEOF
else
-
-echo "$as_me:$LINENO: checking for png_read_image in -lpng" >&5
-echo $ECHO_N "checking for png_read_image in -lpng... $ECHO_C" >&6
-if test "${ac_cv_lib_png_png_read_image+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_read_image in -lpng" >&5
+$as_echo_n "checking for png_read_image in -lpng... " >&6; }
+if test "${ac_cv_lib_png_png_read_image+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lpng $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 png_read_image ();
int
main ()
{
-png_read_image ();
+return png_read_image ();
;
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
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_png_png_read_image=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_png_png_read_image=no
+ ac_cv_lib_png_png_read_image=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_read_image" >&5
-echo "${ECHO_T}$ac_cv_lib_png_png_read_image" >&6
-if test $ac_cv_lib_png_png_read_image = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_read_image" >&5
+$as_echo "$ac_cv_lib_png_png_read_image" >&6; }
+if test "x$ac_cv_lib_png_png_read_image" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBPNG 1
_ACEOF
@@ -17050,9 +14304,7 @@ else
if test "$client" = "win32"; then
- { { echo "$as_me:$LINENO: error: specified client 'win32' not configurable (libpng is needed)" >&5
-echo "$as_me: error: specified client 'win32' not configurable (libpng is needed)" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "specified client 'win32' not configurable (libpng is needed)" "$LINENO" 5
fi
@@ -17062,136 +14314,8 @@ fi
fi
- if test "${ac_cv_header_png_h+set}" = set; then
- echo "$as_me:$LINENO: checking for png.h" >&5
-echo $ECHO_N "checking for png.h... $ECHO_C" >&6
-if test "${ac_cv_header_png_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5
-echo "${ECHO_T}$ac_cv_header_png_h" >&6
-else
- # Is the header compilable?
-echo "$as_me:$LINENO: checking png.h usability" >&5
-echo $ECHO_N "checking png.h usability... $ECHO_C" >&6
-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. */
-$ac_includes_default
-#include <png.h>
-_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
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking png.h presence" >&5
-echo $ECHO_N "checking png.h presence... $ECHO_C" >&6
-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 <png.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc in
- yes:no )
- { echo "$as_me:$LINENO: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: png.h: proceeding with the preprocessor's result" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf at gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
- no:yes )
- { echo "$as_me:$LINENO: WARNING: png.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: png.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: png.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: png.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: png.h: proceeding with the preprocessor's result" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf at gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-echo "$as_me:$LINENO: checking for png.h" >&5
-echo $ECHO_N "checking for png.h... $ECHO_C" >&6
-if test "${ac_cv_header_png_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_png_h=$ac_header_preproc
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5
-echo "${ECHO_T}$ac_cv_header_png_h" >&6
-
-fi
-if test $ac_cv_header_png_h = yes; then
+ ac_fn_c_check_header_mongrel "$LINENO" "png.h" "ac_cv_header_png_h" "$ac_includes_default"
+if test "x$ac_cv_header_png_h" = x""yes; then :
found_client=yes
client=win32
@@ -17201,9 +14325,7 @@ else
if test "$client" = "win32"; then
- { { echo "$as_me:$LINENO: error: specified client 'win32' not configurable (libpng-dev is needed)" >&5
-echo "$as_me: error: specified client 'win32' not configurable (libpng-dev is needed)" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "specified client 'win32' not configurable (libpng-dev is needed)" "$LINENO" 5
fi
@@ -17215,9 +14337,7 @@ else
if test "$client" = "win32"; then
- { { echo "$as_me:$LINENO: error: specified client 'win32' not configurable (zlib-dev is needed)" >&5
-echo "$as_me: error: specified client 'win32' not configurable (zlib-dev is needed)" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "specified client 'win32' not configurable (zlib-dev is needed)" "$LINENO" 5
fi
@@ -17229,9 +14349,7 @@ else
if test "$client" = "win32"; then
- { { echo "$as_me:$LINENO: error: specified client 'win32' not configurable (zlib is needed)" >&5
-echo "$as_me: error: specified client 'win32' not configurable (zlib is needed)" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "specified client 'win32' not configurable (zlib is needed)" "$LINENO" 5
fi
@@ -17241,8 +14359,8 @@ fi
else
PNG_CFLAGS=$pkg_cv_PNG_CFLAGS
PNG_LIBS=$pkg_cv_PNG_LIBS
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
CLIENT_LIBS="-lwsock32 -lcomctl32 -mwindows $PNG_LIBS"
CLIENT_CFLAGS="$PNG_CFLAGS"
@@ -17251,9 +14369,7 @@ fi
else
if test "$client" = "win32"; then
- { { echo "$as_me:$LINENO: error: specified client 'win32' not configurable (mingw32 is needed)" >&5
-echo "$as_me: error: specified client 'win32' not configurable (mingw32 is needed)" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "specified client 'win32' not configurable (mingw32 is needed)" "$LINENO" 5
fi
fi
@@ -17267,52 +14383,52 @@ echo "$as_me: error: specified client 'win32' not configurable (mingw32 is neede
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;}
- { (exit 1); exit 1; }; }
+ as_fn_error "specified client 'stub' not configurable" "$LINENO" 5
fi
fi
if test "$client" = yes ; then
- { { echo "$as_me:$LINENO: error: could not guess which client to compile" >&5
-echo "$as_me: error: could not guess which client to compile" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "could not guess which client to compile" "$LINENO" 5
fi
- # Check whether --enable-sdl-mixer or --disable-sdl-mixer was given.
-if test "${enable_sdl_mixer+set}" = set; then
- enableval="$enable_sdl_mixer"
- USE_SOUND=no
+ # Check whether --enable-sdl-mixer was given.
+if test "${enable_sdl_mixer+set}" = set; then :
+ enableval=$enable_sdl_mixer; case "${enableval}" in
+ yes) USE_SOUND_SDL=yes ;;
+ no) USE_SOUND_SDL=no ;;
+ *) as_fn_error "bad value ${enableval} for --enable-sdl-mixer" "$LINENO" 5 ;;
+ esac
else
- USE_SOUND_SDL=yes
-fi;
+ USE_SOUND_SDL=maybe
+fi
+
- if test "x$USE_SOUND_SDL" = "xyes"; then
+ if test "x$USE_SOUND_SDL" != "xno" ; then
SDL_VERSION=1.0.0
-# Check whether --with-sdl-prefix or --without-sdl-prefix was given.
-if test "${with_sdl_prefix+set}" = set; then
- withval="$with_sdl_prefix"
- sdl_prefix="$withval"
+# Check whether --with-sdl-prefix was given.
+if test "${with_sdl_prefix+set}" = set; then :
+ withval=$with_sdl_prefix; sdl_prefix="$withval"
else
sdl_prefix=""
-fi;
+fi
+
-# Check whether --with-sdl-exec-prefix or --without-sdl-exec-prefix was given.
-if test "${with_sdl_exec_prefix+set}" = set; then
- withval="$with_sdl_exec_prefix"
- sdl_exec_prefix="$withval"
+# Check whether --with-sdl-exec-prefix was given.
+if test "${with_sdl_exec_prefix+set}" = set; then :
+ withval=$with_sdl_exec_prefix; sdl_exec_prefix="$withval"
else
sdl_exec_prefix=""
-fi;
-# Check whether --enable-sdltest or --disable-sdltest was given.
-if test "${enable_sdltest+set}" = set; then
- enableval="$enable_sdltest"
+fi
+# Check whether --enable-sdltest was given.
+if test "${enable_sdltest+set}" = set; then :
+ enableval=$enable_sdltest;
else
enable_sdltest=yes
-fi;
+fi
+
if test x$sdl_exec_prefix != x ; then
sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
@@ -17332,10 +14448,10 @@ fi;
fi
# Extract the first word of "sdl-config", so it can be a program name with args.
set dummy sdl-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_SDL_CONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_SDL_CONFIG+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
case $SDL_CONFIG in
[\\/]* | ?:[\\/]*)
@@ -17347,32 +14463,33 @@ 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
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_SDL_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
-done
+ done
+IFS=$as_save_IFS
test -z "$ac_cv_path_SDL_CONFIG" && ac_cv_path_SDL_CONFIG="no"
;;
esac
fi
SDL_CONFIG=$ac_cv_path_SDL_CONFIG
-
if test -n "$SDL_CONFIG"; then
- echo "$as_me:$LINENO: result: $SDL_CONFIG" >&5
-echo "${ECHO_T}$SDL_CONFIG" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SDL_CONFIG" >&5
+$as_echo "$SDL_CONFIG" >&6; }
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
+
min_sdl_version=$SDL_VERSION
- echo "$as_me:$LINENO: checking for SDL - version >= $min_sdl_version" >&5
-echo $ECHO_N "checking for SDL - version >= $min_sdl_version... $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDL - version >= $min_sdl_version" >&5
+$as_echo_n "checking for SDL - version >= $min_sdl_version... " >&6; }
no_sdl=""
if test "$SDL_CONFIG" = "no" ; then
no_sdl=yes
@@ -17394,15 +14511,10 @@ echo $ECHO_N "checking for SDL - version >= $min_sdl_version... $ECHO_C" >&6
CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
LIBS="$LIBS $SDL_LIBS"
rm -f conf.sdltest
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdio.h>
@@ -17463,40 +14575,27 @@ int main (int argc, char *argv[])
_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
- :
-else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_run "$LINENO"; then :
-( exit $ac_status )
-no_sdl=yes
+else
+ no_sdl=yes
fi
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
+
CFLAGS="$ac_save_CFLAGS"
CXXFLAGS="$ac_save_CXXFLAGS"
LIBS="$ac_save_LIBS"
fi
fi
if test "x$no_sdl" = x ; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
SDL=yes
else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if test "$SDL_CONFIG" = "no" ; then
echo "*** The sdl-config script installed by SDL could not be found"
echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
@@ -17510,12 +14609,7 @@ echo "${ECHO_T}no" >&6
CFLAGS="$CFLAGS $SDL_CFLAGS"
CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
LIBS="$LIBS $SDL_LIBS"
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdio.h>
@@ -17534,18 +14628,7 @@ main ()
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
+if ac_fn_c_try_link "$LINENO"; then :
echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding SDL or finding the wrong"
echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
@@ -17556,15 +14639,13 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
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"
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- echo "*** The test program failed to compile or link. See the file config.log for the"
+ echo "*** The test program failed to compile or link. See the file config.log for the"
echo "*** exact error that occured. This usually means SDL was incorrectly installed"
echo "*** or that you have moved SDL since it was installed. In the latter case, you"
echo "*** may want to edit the sdl-config script: $SDL_CONFIG"
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
CFLAGS="$ac_save_CFLAGS"
CXXFLAGS="$ac_save_CXXFLAGS"
LIBS="$ac_save_LIBS"
@@ -17579,228 +14660,93 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
rm -f conf.sdltest
if test "x$SDL" != "xno"; then
- if test "${ac_cv_header_SDL_SDL_mixer_h+set}" = set; then
- echo "$as_me:$LINENO: checking for SDL/SDL_mixer.h" >&5
-echo $ECHO_N "checking for SDL/SDL_mixer.h... $ECHO_C" >&6
-if test "${ac_cv_header_SDL_SDL_mixer_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_SDL_SDL_mixer_h" >&5
-echo "${ECHO_T}$ac_cv_header_SDL_SDL_mixer_h" >&6
-else
- # Is the header compilable?
-echo "$as_me:$LINENO: checking SDL/SDL_mixer.h usability" >&5
-echo $ECHO_N "checking SDL/SDL_mixer.h usability... $ECHO_C" >&6
-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. */
-$ac_includes_default
-#include <SDL/SDL_mixer.h>
-_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
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking SDL/SDL_mixer.h presence" >&5
-echo $ECHO_N "checking SDL/SDL_mixer.h presence... $ECHO_C" >&6
-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 <SDL/SDL_mixer.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc in
- yes:no )
- { echo "$as_me:$LINENO: WARNING: SDL/SDL_mixer.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: SDL/SDL_mixer.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: SDL/SDL_mixer.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: SDL/SDL_mixer.h: proceeding with the preprocessor's result" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf at gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
- no:yes )
- { echo "$as_me:$LINENO: WARNING: SDL/SDL_mixer.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: SDL/SDL_mixer.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: SDL/SDL_mixer.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: SDL/SDL_mixer.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: SDL/SDL_mixer.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: SDL/SDL_mixer.h: proceeding with the preprocessor's result" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf at gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-echo "$as_me:$LINENO: checking for SDL/SDL_mixer.h" >&5
-echo $ECHO_N "checking for SDL/SDL_mixer.h... $ECHO_C" >&6
-if test "${ac_cv_header_SDL_SDL_mixer_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_SDL_SDL_mixer_h=$ac_header_preproc
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_SDL_SDL_mixer_h" >&5
-echo "${ECHO_T}$ac_cv_header_SDL_SDL_mixer_h" >&6
-fi
-if test $ac_cv_header_SDL_SDL_mixer_h = yes; then
+ ac_save_CPPFLAGS="$CPPFLAGS"
+ ac_save_CFLAGS="$CFLAGS"
+ ac_save_LIBS="$LIBS"
+ CPPFLAGS="$CFLAGS $SDL_CFLAGS"
+ CFLAGS="$CFLAGS $SDL_CFLAGS"
+ LIBS="$LIBS $SDL_LIBS"
+ ac_fn_c_check_header_mongrel "$LINENO" "SDL_mixer.h" "ac_cv_header_SDL_mixer_h" "$ac_includes_default"
+if test "x$ac_cv_header_SDL_mixer_h" = x""yes; then :
SDL_mixer_h=1
else
SDL_mixer_h=0
fi
- echo "$as_me:$LINENO: checking for Mix_OpenAudio in -lSDL_mixer" >&5
-echo $ECHO_N "checking for Mix_OpenAudio in -lSDL_mixer... $ECHO_C" >&6
-if test "${ac_cv_lib_SDL_mixer_Mix_OpenAudio+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Mix_OpenAudio in -lSDL_mixer" >&5
+$as_echo_n "checking for Mix_OpenAudio in -lSDL_mixer... " >&6; }
+if test "${ac_cv_lib_SDL_mixer_Mix_OpenAudio+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lSDL_mixer $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 Mix_OpenAudio ();
int
main ()
{
-Mix_OpenAudio ();
+return Mix_OpenAudio ();
;
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
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_SDL_mixer_Mix_OpenAudio=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_SDL_mixer_Mix_OpenAudio=no
+ ac_cv_lib_SDL_mixer_Mix_OpenAudio=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_SDL_mixer_Mix_OpenAudio" >&5
-echo "${ECHO_T}$ac_cv_lib_SDL_mixer_Mix_OpenAudio" >&6
-if test $ac_cv_lib_SDL_mixer_Mix_OpenAudio = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_SDL_mixer_Mix_OpenAudio" >&5
+$as_echo "$ac_cv_lib_SDL_mixer_Mix_OpenAudio" >&6; }
+if test "x$ac_cv_lib_SDL_mixer_Mix_OpenAudio" = x""yes; then :
SDL_mixer=yes
fi
- echo "$as_me:$LINENO: checking building SDL_mixer support" >&5
-echo $ECHO_N "checking building SDL_mixer support... $ECHO_C" >&6
+ CPPFLAGS="$ac_save_CPPFLAGS"
+ CFLAGS="$ac_save_CFLAGS"
+ LIBS="$ac_save_LIBS"
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking building SDL_mixer support" >&5
+$as_echo_n "checking building SDL_mixer support... " >&6; }
if test "x$SDL_mixer_h" = "x1"; then
if test "x$SDL_mixer" = "xyes"; then
SOUND_CFLAGS="$SOUND_CFLAGS $SDL_CFLAGS"
- SOUND_LIBS="$SOUND_LIBS $SDL_LIBS -lSDL_mixer"
+ SOUND_LIBS="$SOUND_LIBS -lSDL_mixer $SDL_LIBS"
-cat >>confdefs.h <<\_ACEOF
-#define AUDIO_SDL 1
-_ACEOF
+$as_echo "#define AUDIO_SDL 1" >>confdefs.h
-cat >>confdefs.h <<\_ACEOF
-#define SDL 1
-_ACEOF
+$as_echo "#define SDL 1" >>confdefs.h
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ SOUND_SDL_OK=true
else
- echo "$as_me:$LINENO: result: no, found header but not library!" >&5
-echo "${ECHO_T}no, found header but not library!" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, found header but not library!" >&5
+$as_echo "no, found header but not library!" >&6; }
fi
else
- echo "$as_me:$LINENO: result: no, install SDL_mixer first: http://www.libsdl.org/projects/SDL_mixer/index.html" >&5
-echo "${ECHO_T}no, install SDL_mixer first: http://www.libsdl.org/projects/SDL_mixer/index.html" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, install SDL_mixer first: http://www.libsdl.org/projects/SDL_mixer/index.html" >&5
+$as_echo "no, install SDL_mixer first: http://www.libsdl.org/projects/SDL_mixer/index.html" >&6; }
SDL_mixer="xno"
fi
fi
+ if test "x$USE_SOUND_SDL" = "xyes" && test "x$SOUND_SDL_OK" != "xtrue" ; then
+ as_fn_error "SDL mixer support requested, but cannot be compiled in" "$LINENO" 5
+ fi
fi
@@ -17819,12 +14765,12 @@ fi
ac_ggz_prefix=""
-# Check whether --with-ggz-dir or --without-ggz-dir was given.
-if test "${with_ggz_dir+set}" = set; then
- withval="$with_ggz_dir"
- ac_ggz_prefix="$withval"
+# Check whether --with-ggz-dir was given.
+if test "${with_ggz_dir+set}" = set; then :
+ withval=$with_ggz_dir; ac_ggz_prefix="$withval"
+
+fi
-fi;
if test "x$ac_ggz_prefix" != "xno" ; then
if test "x${prefix}" = "xNONE"; then
@@ -17877,12 +14823,7 @@ if test "x$ac_ggz_prefix" != "xno" ; then
save_cxxflags=$CXXFLAGS
if test "x$GCC" = xyes; then
CFLAGS="-Wall -Werror"
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
void signedness(void){char c;if(c==-1)c=0;}
int
@@ -17893,34 +14834,15 @@ main ()
return 0;
}
_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
- :
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_compile "$LINENO"; then :
-save_cflags="$save_cflags -fsigned-char"
+else
+ save_cflags="$save_cflags -fsigned-char"
save_cxxflags="$save_cxxflags -fsigned-char"
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#if defined(__SUNPRO_C) || (__SUNPRO_C >= 0x550)
#else
@@ -17934,26 +14856,11 @@ main ()
return 0;
}
_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
+if ac_fn_c_try_compile "$LINENO"; then :
save_cflags="$save_cflags -xchar=signed"
save_cxxflags="$save_cxxflags -xchar=signed"
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
CFLAGS=$save_cflags
@@ -17963,38 +14870,38 @@ fi
if test x$ac_ggz_prefix != xno ; then
-echo "$as_me:$LINENO: checking for GGZ library: libggz" >&5
-echo $ECHO_N "checking for GGZ library: libggz... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GGZ library: libggz" >&5
+$as_echo_n "checking for GGZ library: libggz... " >&6; }
ac_libggz_includes=NO ac_libggz_libraries=NO
libggz_libraries=""
libggz_includes=""
-# Check whether --with-libggz-dir or --without-libggz-dir was given.
-if test "${with_libggz_dir+set}" = set; then
- withval="$with_libggz_dir"
- ac_libggz_includes="$withval"/include
+# Check whether --with-libggz-dir was given.
+if test "${with_libggz_dir+set}" = set; then :
+ withval=$with_libggz_dir; ac_libggz_includes="$withval"/include
ac_libggz_libraries="$withval"/lib
-fi;
+fi
-# Check whether --with-libggz-includes or --without-libggz-includes was given.
-if test "${with_libggz_includes+set}" = set; then
- withval="$with_libggz_includes"
- ac_libggz_includes="$withval"
-fi;
+# Check whether --with-libggz-includes was given.
+if test "${with_libggz_includes+set}" = set; then :
+ withval=$with_libggz_includes; ac_libggz_includes="$withval"
-# Check whether --with-libggz-libraries or --without-libggz-libraries was given.
-if test "${with_libggz_libraries+set}" = set; then
- withval="$with_libggz_libraries"
- ac_libggz_libraries="$withval"
+fi
-fi;
-if test "${ac_cv_have_libggz+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+# Check whether --with-libggz-libraries was given.
+if test "${with_libggz_libraries+set}" = set; then :
+ withval=$with_libggz_libraries; ac_libggz_libraries="$withval"
+
+fi
+
+
+if test "${ac_cv_have_libggz+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
libggz_incdirs="$ac_libggz_includes $ac_ggz_stdinc"
@@ -18024,7 +14931,7 @@ for i in $libggz_incdirs;
do
for j in $libggz_header;
do
- echo "configure: 18027: $i/$j" >&5
+ echo "configure: 14934: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
libggz_incdir=$i
@@ -18077,20 +14984,20 @@ eval "$ac_cv_have_libggz"
if test "$have_libggz" != yes; then
if test "xtry_ggz="no"" = "xignore"; then
- echo "$as_me:$LINENO: result: $have_libggz (ignored)" >&5
-echo "${ECHO_T}$have_libggz (ignored)" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_libggz (ignored)" >&5
+$as_echo "$have_libggz (ignored)" >&6; }
else
- echo "$as_me:$LINENO: result: $have_libggz" >&5
-echo "${ECHO_T}$have_libggz" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_libggz" >&5
+$as_echo "$have_libggz" >&6; }
if test "xtry_ggz="no"" = "x"; then
- { echo "$as_me:$LINENO: WARNING: no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no
The library 'libggz' does not seem to be installed correctly.
Headers searched in: $libggz_incdirs
Libraries searched in: $libggz_libdirs
Please read QuickStart.GGZ in order to fix this.
" >&5
-echo "$as_me: WARNING: no
+$as_echo "$as_me: WARNING: no
The library 'libggz' does not seem to be installed correctly.
Headers searched in: $libggz_incdirs
Libraries searched in: $libggz_libdirs
@@ -18106,8 +15013,8 @@ echo "$as_me: WARNING: no
else
ac_cv_have_libggz="have_libggz=yes \
ac_libggz_includes=$ac_libggz_includes ac_libggz_libraries=$ac_libggz_libraries"
- echo "$as_me:$LINENO: result: $have_libggz (libraries $ac_libggz_libraries, headers $ac_libggz_includes)" >&5
-echo "${ECHO_T}$have_libggz (libraries $ac_libggz_libraries, headers $ac_libggz_includes)" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_libggz (libraries $ac_libggz_libraries, headers $ac_libggz_includes)" >&5
+$as_echo "$have_libggz (libraries $ac_libggz_libraries, headers $ac_libggz_includes)" >&6; }
libggz_libraries="$ac_libggz_libraries"
libggz_includes="$ac_libggz_includes"
@@ -18161,18 +15068,13 @@ fi
LD_LIBRARY_PATH=$save_ldlibrary_path:$libggz_libraries
export LD_LIBRARY_PATH
- echo "$as_me:$LINENO: checking for GGZ library version: $major.$minor.$micro" >&5
-echo $ECHO_N "checking for GGZ library version: $major.$minor.$micro... $ECHO_C" >&6
- if test "$cross_compiling" = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GGZ library version: $major.$minor.$micro" >&5
+$as_echo_n "checking for GGZ library version: $major.$minor.$micro... " >&6; }
+ if test "$cross_compiling" = yes; then :
ac_ggz_version_check="skipped due to cross-compiling"
else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
$testprologue
int
@@ -18183,40 +15085,25 @@ $testbody
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
+if ac_fn_c_try_run "$LINENO"; then :
ac_ggz_version_check=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 )
-ac_ggz_version_check=no
+ ac_ggz_version_check=no
fi
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
+
if test "$ac_ggz_version_check" = "no"; then
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if test "xtry_ggz=no" = "x"; then
- { { echo "$as_me:$LINENO: error: The GGZ version is too old. Version $major.$minor.$micro is required." >&5
-echo "$as_me: error: The GGZ version is too old. Version $major.$minor.$micro is required." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "The GGZ version is too old. Version $major.$minor.$micro is required." "$LINENO" 5
fi
try_ggz=no
else
- echo "$as_me:$LINENO: result: $ac_ggz_version_check" >&5
-echo "${ECHO_T}$ac_ggz_version_check" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ggz_version_check" >&5
+$as_echo "$ac_ggz_version_check" >&6; }
fi
@@ -18229,48 +15116,48 @@ echo "${ECHO_T}$ac_ggz_version_check" >&6
ggz_client="no"
-# Check whether --with-ggz-client or --without-ggz-client was given.
-if test "${with_ggz_client+set}" = set; then
- withval="$with_ggz_client"
- try_ggz_client=$withval
-fi;
+# Check whether --with-ggz-client was given.
+if test "${with_ggz_client+set}" = set; then :
+ withval=$with_ggz_client; try_ggz_client=$withval
+fi
+
if test "x$try_ggz_client" != "xno"; then
if test "$try_ggz" = "yes"; then
# Must pass something as the action-if-failed, or the macro will exit
-echo "$as_me:$LINENO: checking for GGZ library: ggzmod" >&5
-echo $ECHO_N "checking for GGZ library: ggzmod... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GGZ library: ggzmod" >&5
+$as_echo_n "checking for GGZ library: ggzmod... " >&6; }
ac_ggzmod_includes=NO ac_ggzmod_libraries=NO
ggzmod_libraries=""
ggzmod_includes=""
-# Check whether --with-ggzmod-dir or --without-ggzmod-dir was given.
-if test "${with_ggzmod_dir+set}" = set; then
- withval="$with_ggzmod_dir"
- ac_ggzmod_includes="$withval"/include
+# Check whether --with-ggzmod-dir was given.
+if test "${with_ggzmod_dir+set}" = set; then :
+ withval=$with_ggzmod_dir; ac_ggzmod_includes="$withval"/include
ac_ggzmod_libraries="$withval"/lib
-fi;
+fi
-# Check whether --with-ggzmod-includes or --without-ggzmod-includes was given.
-if test "${with_ggzmod_includes+set}" = set; then
- withval="$with_ggzmod_includes"
- ac_ggzmod_includes="$withval"
-fi;
+# Check whether --with-ggzmod-includes was given.
+if test "${with_ggzmod_includes+set}" = set; then :
+ withval=$with_ggzmod_includes; ac_ggzmod_includes="$withval"
-# Check whether --with-ggzmod-libraries or --without-ggzmod-libraries was given.
-if test "${with_ggzmod_libraries+set}" = set; then
- withval="$with_ggzmod_libraries"
- ac_ggzmod_libraries="$withval"
+fi
-fi;
-if test "${ac_cv_have_ggzmod+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+# Check whether --with-ggzmod-libraries was given.
+if test "${with_ggzmod_libraries+set}" = set; then :
+ withval=$with_ggzmod_libraries; ac_ggzmod_libraries="$withval"
+
+fi
+
+
+if test "${ac_cv_have_ggzmod+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ggzmod_incdirs="$ac_ggzmod_includes $ac_ggz_stdinc"
@@ -18300,7 +15187,7 @@ for i in $ggzmod_incdirs;
do
for j in $ggzmod_header;
do
- echo "configure: 18303: $i/$j" >&5
+ echo "configure: 15190: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ggzmod_incdir=$i
@@ -18353,20 +15240,20 @@ eval "$ac_cv_have_ggzmod"
if test "$have_ggzmod" != yes; then
if test "xggz_client="no"" = "xignore"; then
- echo "$as_me:$LINENO: result: $have_ggzmod (intentionally ignored)" >&5
-echo "${ECHO_T}$have_ggzmod (intentionally ignored)" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_ggzmod (intentionally ignored)" >&5
+$as_echo "$have_ggzmod (intentionally ignored)" >&6; }
else
- echo "$as_me:$LINENO: result: $have_ggzmod" >&5
-echo "${ECHO_T}$have_ggzmod" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_ggzmod" >&5
+$as_echo "$have_ggzmod" >&6; }
if test "xggz_client="no"" = "x"; then
- { echo "$as_me:$LINENO: WARNING: no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no
The library 'ggzmod' does not seem to be installed correctly.
Headers searched in: $ggzmod_incdirs
Libraries searched in: $ggzmod_libdirs
Please read QuickStart.GGZ in order to fix this.
" >&5
-echo "$as_me: WARNING: no
+$as_echo "$as_me: WARNING: no
The library 'ggzmod' does not seem to be installed correctly.
Headers searched in: $ggzmod_incdirs
Libraries searched in: $ggzmod_libdirs
@@ -18382,8 +15269,8 @@ echo "$as_me: WARNING: no
else
ac_cv_have_ggzmod="have_ggzmod=yes \
ac_ggzmod_includes=$ac_ggzmod_includes ac_ggzmod_libraries=$ac_ggzmod_libraries"
- echo "$as_me:$LINENO: result: $have_ggzmod (libraries $ac_ggzmod_libraries, headers $ac_ggzmod_includes)" >&5
-echo "${ECHO_T}$have_ggzmod (libraries $ac_ggzmod_libraries, headers $ac_ggzmod_includes)" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_ggzmod (libraries $ac_ggzmod_libraries, headers $ac_ggzmod_includes)" >&5
+$as_echo "$have_ggzmod (libraries $ac_ggzmod_libraries, headers $ac_ggzmod_includes)" >&6; }
ggzmod_libraries="$ac_ggzmod_libraries"
ggzmod_includes="$ac_ggzmod_includes"
@@ -18402,24 +15289,24 @@ echo "${ECHO_T}$have_ggzmod (libraries $ac_ggzmod_libraries, headers $ac_ggzmod_
# Perform actions given by argument 1.
-echo "$as_me:$LINENO: checking for GGZ configuration tool: ggz-config" >&5
-echo $ECHO_N "checking for GGZ configuration tool: ggz-config... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GGZ configuration tool: ggz-config" >&5
+$as_echo_n "checking for GGZ configuration tool: ggz-config... " >&6; }
ac_ggz_config=NO
ggz_config=""
-# Check whether --with-ggzconfig or --without-ggzconfig was given.
-if test "${with_ggzconfig+set}" = set; then
- withval="$with_ggzconfig"
- ac_ggz_config="$withval"
+# Check whether --with-ggzconfig was given.
+if test "${with_ggzconfig+set}" = set; then :
+ withval=$with_ggzconfig; ac_ggz_config="$withval"
+
+fi
-fi;
ac_ggz_config_orig=$ac_ggz_config
-if test "${ac_cv_have_ggzconfig+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+if test "${ac_cv_have_ggzconfig+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ggz_config_dirs="$ac_ggz_config $ac_ggz_stdbin"
@@ -18430,7 +15317,7 @@ for i in $ggz_config_dirs;
do
for j in ggz-config;
do
- echo "configure: 18433: $i/$j" >&5
+ echo "configure: 15320: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ggz_config_dir=$i
@@ -18456,8 +15343,8 @@ eval "$ac_cv_have_ggz_config"
if test "$have_ggz_config" != yes; then
if test "xggz_client="no"" = "xignore"; then
- echo "$as_me:$LINENO: result: $have_ggz_config (intentionally ignored)" >&5
-echo "${ECHO_T}$have_ggz_config (intentionally ignored)" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_ggz_config (intentionally ignored)" >&5
+$as_echo "$have_ggz_config (intentionally ignored)" >&6; }
GGZ_CONFIG="true"
ggzexecmoddir="\${libdir}/ggz"
ggzdatadir="\${datadir}/ggz"
@@ -18475,12 +15362,10 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
else
- echo "$as_me:$LINENO: result: $have_ggz_config" >&5
-echo "${ECHO_T}$have_ggz_config" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_ggz_config" >&5
+$as_echo "$have_ggz_config" >&6; }
if test "xggz_client="no"" = "x"; then
- { { echo "$as_me:$LINENO: error: ggz-config not found. Please check your installation! " >&5
-echo "$as_me: error: ggz-config not found. Please check your installation! " >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "ggz-config not found. Please check your installation! " "$LINENO" 5
fi
# Perform actions given by argument 2.
@@ -18495,8 +15380,8 @@ else
fi
if test "x$pathto_app" != "x$pathto_ggz"; then
- echo "$as_me:$LINENO: result: $have_ggz_config (dismissed due to different prefix)" >&5
-echo "${ECHO_T}$have_ggz_config (dismissed due to different prefix)" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_ggz_config (dismissed due to different prefix)" >&5
+$as_echo "$have_ggz_config (dismissed due to different prefix)" >&6; }
GGZ_CONFIG="true"
ggzexecmoddir="\${libdir}/ggz"
ggzdatadir="\${datadir}/ggz"
@@ -18521,19 +15406,19 @@ _ACEOF
else
ac_cv_have_ggz_config="have_ggz_config=yes \
ac_ggz_config=$ac_ggz_config"
- echo "$as_me:$LINENO: result: $ac_ggz_config/ggz-config" >&5
-echo "${ECHO_T}$ac_ggz_config/ggz-config" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ggz_config/ggz-config" >&5
+$as_echo "$ac_ggz_config/ggz-config" >&6; }
ggz_config="$ac_ggz_config"
- # Check whether --enable-noregistry or --disable-noregistry was given.
-if test "${enable_noregistry+set}" = set; then
- enableval="$enable_noregistry"
- enable_noregistry=yes
+ # Check whether --enable-noregistry was given.
+if test "${enable_noregistry+set}" = set; then :
+ enableval=$enable_noregistry; enable_noregistry=yes
else
enable_noregistry=no
-fi;
+fi
+
GGZ_CONFIG="${ggz_config}/ggz-config"
if test "$enable_noregistry" = yes; then
@@ -18567,9 +15452,7 @@ _ACEOF
if test "$ggzmoduleconfdir" = ""; then
- { { echo "$as_me:$LINENO: error: ggz-config is unusable. Maybe LD_LIBRARY_PATH needs to be set." >&5
-echo "$as_me: error: ggz-config is unusable. Maybe LD_LIBRARY_PATH needs to be set." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "ggz-config is unusable. Maybe LD_LIBRARY_PATH needs to be set." "$LINENO" 5
fi
@@ -18589,15 +15472,11 @@ fi
fi
if test "$ggz_client" = "yes"; then
-cat >>confdefs.h <<\_ACEOF
-#define GGZ_CLIENT 1
-_ACEOF
+$as_echo "#define GGZ_CLIENT 1" >>confdefs.h
else
if test "$try_ggz_client" = "yes"; then
- { { echo "$as_me:$LINENO: error: Could not configure GGZ client support. See above messages." >&5
-echo "$as_me: error: Could not configure GGZ client support. See above messages." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "Could not configure GGZ client support. See above messages." "$LINENO" 5
fi
fi
fi
@@ -18606,38 +15485,38 @@ echo "$as_me: error: Could not configure GGZ client support. See above messages.
if test "$ggz_client" = "yes"; then
if test "x"gtk"" = "xgtk"; then
-echo "$as_me:$LINENO: checking for GGZ library: ggz-gtk" >&5
-echo $ECHO_N "checking for GGZ library: ggz-gtk... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GGZ library: ggz-gtk" >&5
+$as_echo_n "checking for GGZ library: ggz-gtk... " >&6; }
ac_ggz_gtk_includes=NO ac_ggz_gtk_libraries=NO
ggz_gtk_libraries=""
ggz_gtk_includes=""
-# Check whether --with-ggz-gtk-dir or --without-ggz-gtk-dir was given.
-if test "${with_ggz_gtk_dir+set}" = set; then
- withval="$with_ggz_gtk_dir"
- ac_ggz_gtk_includes="$withval"/include
+# Check whether --with-ggz-gtk-dir was given.
+if test "${with_ggz_gtk_dir+set}" = set; then :
+ withval=$with_ggz_gtk_dir; ac_ggz_gtk_includes="$withval"/include
ac_ggz_gtk_libraries="$withval"/lib
-fi;
+fi
-# Check whether --with-ggz-gtk-includes or --without-ggz-gtk-includes was given.
-if test "${with_ggz_gtk_includes+set}" = set; then
- withval="$with_ggz_gtk_includes"
- ac_ggz_gtk_includes="$withval"
-fi;
+# Check whether --with-ggz-gtk-includes was given.
+if test "${with_ggz_gtk_includes+set}" = set; then :
+ withval=$with_ggz_gtk_includes; ac_ggz_gtk_includes="$withval"
+
+fi
-# Check whether --with-ggz-gtk-libraries or --without-ggz-gtk-libraries was given.
-if test "${with_ggz_gtk_libraries+set}" = set; then
- withval="$with_ggz_gtk_libraries"
- ac_ggz_gtk_libraries="$withval"
-fi;
+# Check whether --with-ggz-gtk-libraries was given.
+if test "${with_ggz_gtk_libraries+set}" = set; then :
+ withval=$with_ggz_gtk_libraries; ac_ggz_gtk_libraries="$withval"
-if test "${ac_cv_have_ggz_gtk+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+
+
+if test "${ac_cv_have_ggz_gtk+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ggz_gtk_incdirs="$ac_ggz_gtk_includes $ac_ggz_stdinc"
@@ -18667,7 +15546,7 @@ for i in $ggz_gtk_incdirs;
do
for j in $ggz_gtk_header;
do
- echo "configure: 18670: $i/$j" >&5
+ echo "configure: 15549: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ggz_gtk_incdir=$i
@@ -18720,20 +15599,20 @@ eval "$ac_cv_have_ggz_gtk"
if test "$have_ggz_gtk" != yes; then
if test "x" = "xignore"; then
- echo "$as_me:$LINENO: result: $have_ggz_gtk (intentionally ignored)" >&5
-echo "${ECHO_T}$have_ggz_gtk (intentionally ignored)" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_ggz_gtk (intentionally ignored)" >&5
+$as_echo "$have_ggz_gtk (intentionally ignored)" >&6; }
else
- echo "$as_me:$LINENO: result: $have_ggz_gtk" >&5
-echo "${ECHO_T}$have_ggz_gtk" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_ggz_gtk" >&5
+$as_echo "$have_ggz_gtk" >&6; }
if test "x" = "x"; then
- { echo "$as_me:$LINENO: WARNING: no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no
The library 'ggz-gtk' does not seem to be installed correctly.
Headers searched in: $ggz_gtk_incdirs
Libraries searched in: $ggz_gtk_libdirs
Please read QuickStart.GGZ in order to fix this.
" >&5
-echo "$as_me: WARNING: no
+$as_echo "$as_me: WARNING: no
The library 'ggz-gtk' does not seem to be installed correctly.
Headers searched in: $ggz_gtk_incdirs
Libraries searched in: $ggz_gtk_libdirs
@@ -18749,8 +15628,8 @@ echo "$as_me: WARNING: no
else
ac_cv_have_ggz_gtk="have_ggz_gtk=yes \
ac_ggz_gtk_includes=$ac_ggz_gtk_includes ac_ggz_gtk_libraries=$ac_ggz_gtk_libraries"
- echo "$as_me:$LINENO: result: $have_ggz_gtk (libraries $ac_ggz_gtk_libraries, headers $ac_ggz_gtk_includes)" >&5
-echo "${ECHO_T}$have_ggz_gtk (libraries $ac_ggz_gtk_libraries, headers $ac_ggz_gtk_includes)" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_ggz_gtk (libraries $ac_ggz_gtk_libraries, headers $ac_ggz_gtk_includes)" >&5
+$as_echo "$have_ggz_gtk (libraries $ac_ggz_gtk_libraries, headers $ac_ggz_gtk_includes)" >&6; }
ggz_gtk_libraries="$ac_ggz_gtk_libraries"
ggz_gtk_includes="$ac_ggz_gtk_includes"
@@ -18773,17 +15652,13 @@ fi
if test $ggz_gtk = "yes"; then
-cat >>confdefs.h <<\_ACEOF
-#define GGZ_GTK 1
-_ACEOF
+$as_echo "#define GGZ_GTK 1" >>confdefs.h
fi
fi
fi
-
-
-if test "$ggz_client" = "yes"; then
+ if test "$ggz_client" = "yes"; then
GGZ_CLIENT_TRUE=
GGZ_CLIENT_FALSE='#'
else
@@ -18791,9 +15666,7 @@ else
GGZ_CLIENT_FALSE=
fi
-
-
-if test "$ggz_gtk" = "yes"; then
+ if test "$ggz_gtk" = "yes"; then
GGZ_GTK_TRUE=
GGZ_GTK_FALSE='#'
else
@@ -18804,38 +15677,38 @@ fi
-echo "$as_me:$LINENO: checking for GGZ library: libggz" >&5
-echo $ECHO_N "checking for GGZ library: libggz... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GGZ library: libggz" >&5
+$as_echo_n "checking for GGZ library: libggz... " >&6; }
ac_libggz_includes=NO ac_libggz_libraries=NO
libggz_libraries=""
libggz_includes=""
-# Check whether --with-libggz-dir or --without-libggz-dir was given.
-if test "${with_libggz_dir+set}" = set; then
- withval="$with_libggz_dir"
- ac_libggz_includes="$withval"/include
+# Check whether --with-libggz-dir was given.
+if test "${with_libggz_dir+set}" = set; then :
+ withval=$with_libggz_dir; ac_libggz_includes="$withval"/include
ac_libggz_libraries="$withval"/lib
-fi;
+fi
-# Check whether --with-libggz-includes or --without-libggz-includes was given.
-if test "${with_libggz_includes+set}" = set; then
- withval="$with_libggz_includes"
- ac_libggz_includes="$withval"
-fi;
+# Check whether --with-libggz-includes was given.
+if test "${with_libggz_includes+set}" = set; then :
+ withval=$with_libggz_includes; ac_libggz_includes="$withval"
+
+fi
-# Check whether --with-libggz-libraries or --without-libggz-libraries was given.
-if test "${with_libggz_libraries+set}" = set; then
- withval="$with_libggz_libraries"
- ac_libggz_libraries="$withval"
-fi;
+# Check whether --with-libggz-libraries was given.
+if test "${with_libggz_libraries+set}" = set; then :
+ withval=$with_libggz_libraries; ac_libggz_libraries="$withval"
+
+fi
+
-if test "${ac_cv_have_libggz+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+if test "${ac_cv_have_libggz+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
libggz_incdirs="$ac_libggz_includes $ac_ggz_stdinc"
@@ -18865,7 +15738,7 @@ for i in $libggz_incdirs;
do
for j in $libggz_header;
do
- echo "configure: 18868: $i/$j" >&5
+ echo "configure: 15741: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
libggz_incdir=$i
@@ -18918,20 +15791,20 @@ eval "$ac_cv_have_libggz"
if test "$have_libggz" != yes; then
if test "xtry_ggz="no"" = "xignore"; then
- echo "$as_me:$LINENO: result: $have_libggz (ignored)" >&5
-echo "${ECHO_T}$have_libggz (ignored)" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_libggz (ignored)" >&5
+$as_echo "$have_libggz (ignored)" >&6; }
else
- echo "$as_me:$LINENO: result: $have_libggz" >&5
-echo "${ECHO_T}$have_libggz" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_libggz" >&5
+$as_echo "$have_libggz" >&6; }
if test "xtry_ggz="no"" = "x"; then
- { echo "$as_me:$LINENO: WARNING: no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no
The library 'libggz' does not seem to be installed correctly.
Headers searched in: $libggz_incdirs
Libraries searched in: $libggz_libdirs
Please read QuickStart.GGZ in order to fix this.
" >&5
-echo "$as_me: WARNING: no
+$as_echo "$as_me: WARNING: no
The library 'libggz' does not seem to be installed correctly.
Headers searched in: $libggz_incdirs
Libraries searched in: $libggz_libdirs
@@ -18947,8 +15820,8 @@ echo "$as_me: WARNING: no
else
ac_cv_have_libggz="have_libggz=yes \
ac_libggz_includes=$ac_libggz_includes ac_libggz_libraries=$ac_libggz_libraries"
- echo "$as_me:$LINENO: result: $have_libggz (libraries $ac_libggz_libraries, headers $ac_libggz_includes)" >&5
-echo "${ECHO_T}$have_libggz (libraries $ac_libggz_libraries, headers $ac_libggz_includes)" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_libggz (libraries $ac_libggz_libraries, headers $ac_libggz_includes)" >&5
+$as_echo "$have_libggz (libraries $ac_libggz_libraries, headers $ac_libggz_includes)" >&6; }
libggz_libraries="$ac_libggz_libraries"
libggz_includes="$ac_libggz_includes"
@@ -18998,18 +15871,13 @@ fi
LD_LIBRARY_PATH=$save_ldlibrary_path:$libggz_libraries
export LD_LIBRARY_PATH
- echo "$as_me:$LINENO: checking for GGZ library version: $major.$minor.$micro" >&5
-echo $ECHO_N "checking for GGZ library version: $major.$minor.$micro... $ECHO_C" >&6
- if test "$cross_compiling" = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GGZ library version: $major.$minor.$micro" >&5
+$as_echo_n "checking for GGZ library version: $major.$minor.$micro... " >&6; }
+ if test "$cross_compiling" = yes; then :
ac_ggz_version_check="skipped due to cross-compiling"
else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
$testprologue
int
@@ -19020,40 +15888,25 @@ $testbody
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
+if ac_fn_c_try_run "$LINENO"; then :
ac_ggz_version_check=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 )
-ac_ggz_version_check=no
+ ac_ggz_version_check=no
fi
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
+
if test "$ac_ggz_version_check" = "no"; then
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if test "xtry_ggz=no" = "x"; then
- { { echo "$as_me:$LINENO: error: The GGZ version is too old. Version $major.$minor.$micro is required." >&5
-echo "$as_me: error: The GGZ version is too old. Version $major.$minor.$micro is required." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "The GGZ version is too old. Version $major.$minor.$micro is required." "$LINENO" 5
fi
try_ggz=no
else
- echo "$as_me:$LINENO: result: $ac_ggz_version_check" >&5
-echo "${ECHO_T}$ac_ggz_version_check" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ggz_version_check" >&5
+$as_echo "$ac_ggz_version_check" >&6; }
fi
@@ -19066,48 +15919,48 @@ echo "${ECHO_T}$ac_ggz_version_check" >&6
ggz_server="no"
-# Check whether --with-ggz-server or --without-ggz-server was given.
-if test "${with_ggz_server+set}" = set; then
- withval="$with_ggz_server"
- try_ggz_server=$withval
-fi;
+# Check whether --with-ggz-server was given.
+if test "${with_ggz_server+set}" = set; then :
+ withval=$with_ggz_server; try_ggz_server=$withval
+fi
+
if test "x$try_ggz_server" != "xno"; then
if test "$try_ggz" = "yes"; then
# Must pass something as the action-if-failed, or the macro will exit
-echo "$as_me:$LINENO: checking for GGZ library: ggzdmod" >&5
-echo $ECHO_N "checking for GGZ library: ggzdmod... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GGZ library: ggzdmod" >&5
+$as_echo_n "checking for GGZ library: ggzdmod... " >&6; }
ac_ggzdmod_includes=NO ac_ggzdmod_libraries=NO
ggzdmod_libraries=""
ggzdmod_includes=""
-# Check whether --with-ggzdmod-dir or --without-ggzdmod-dir was given.
-if test "${with_ggzdmod_dir+set}" = set; then
- withval="$with_ggzdmod_dir"
- ac_ggzdmod_includes="$withval"/include
+# Check whether --with-ggzdmod-dir was given.
+if test "${with_ggzdmod_dir+set}" = set; then :
+ withval=$with_ggzdmod_dir; ac_ggzdmod_includes="$withval"/include
ac_ggzdmod_libraries="$withval"/lib
-fi;
+fi
-# Check whether --with-ggzdmod-includes or --without-ggzdmod-includes was given.
-if test "${with_ggzdmod_includes+set}" = set; then
- withval="$with_ggzdmod_includes"
- ac_ggzdmod_includes="$withval"
-fi;
+# Check whether --with-ggzdmod-includes was given.
+if test "${with_ggzdmod_includes+set}" = set; then :
+ withval=$with_ggzdmod_includes; ac_ggzdmod_includes="$withval"
-# Check whether --with-ggzdmod-libraries or --without-ggzdmod-libraries was given.
-if test "${with_ggzdmod_libraries+set}" = set; then
- withval="$with_ggzdmod_libraries"
- ac_ggzdmod_libraries="$withval"
+fi
+
+
+# Check whether --with-ggzdmod-libraries was given.
+if test "${with_ggzdmod_libraries+set}" = set; then :
+ withval=$with_ggzdmod_libraries; ac_ggzdmod_libraries="$withval"
+
+fi
-fi;
-if test "${ac_cv_have_ggzdmod+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+if test "${ac_cv_have_ggzdmod+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ggzdmod_incdirs="$ac_ggzdmod_includes $ac_ggz_stdinc"
@@ -19137,7 +15990,7 @@ for i in $ggzdmod_incdirs;
do
for j in $ggzdmod_header;
do
- echo "configure: 19140: $i/$j" >&5
+ echo "configure: 15993: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ggzdmod_incdir=$i
@@ -19190,20 +16043,20 @@ eval "$ac_cv_have_ggzdmod"
if test "$have_ggzdmod" != yes; then
if test "xggz_server="no"" = "xignore"; then
- echo "$as_me:$LINENO: result: $have_ggzdmod (intentionally ignored)" >&5
-echo "${ECHO_T}$have_ggzdmod (intentionally ignored)" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_ggzdmod (intentionally ignored)" >&5
+$as_echo "$have_ggzdmod (intentionally ignored)" >&6; }
else
- echo "$as_me:$LINENO: result: $have_ggzdmod" >&5
-echo "${ECHO_T}$have_ggzdmod" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_ggzdmod" >&5
+$as_echo "$have_ggzdmod" >&6; }
if test "xggz_server="no"" = "x"; then
- { echo "$as_me:$LINENO: WARNING: no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no
The library 'ggzdmod' does not seem to be installed correctly.
Headers searched in: $ggzdmod_incdirs
Libraries searched in: $ggzdmod_libdirs
Please read QuickStart.GGZ in order to fix this.
" >&5
-echo "$as_me: WARNING: no
+$as_echo "$as_me: WARNING: no
The library 'ggzdmod' does not seem to be installed correctly.
Headers searched in: $ggzdmod_incdirs
Libraries searched in: $ggzdmod_libdirs
@@ -19219,8 +16072,8 @@ echo "$as_me: WARNING: no
else
ac_cv_have_ggzdmod="have_ggzdmod=yes \
ac_ggzdmod_includes=$ac_ggzdmod_includes ac_ggzdmod_libraries=$ac_ggzdmod_libraries"
- echo "$as_me:$LINENO: result: $have_ggzdmod (libraries $ac_ggzdmod_libraries, headers $ac_ggzdmod_includes)" >&5
-echo "${ECHO_T}$have_ggzdmod (libraries $ac_ggzdmod_libraries, headers $ac_ggzdmod_includes)" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_ggzdmod (libraries $ac_ggzdmod_libraries, headers $ac_ggzdmod_includes)" >&5
+$as_echo "$have_ggzdmod (libraries $ac_ggzdmod_libraries, headers $ac_ggzdmod_includes)" >&6; }
ggzdmod_libraries="$ac_ggzdmod_libraries"
ggzdmod_includes="$ac_ggzdmod_includes"
@@ -19245,18 +16098,18 @@ fi
fi
if test "$ggz_server" = "yes"; then
-echo "$as_me:$LINENO: checking for GGZ server: ggzd" >&5
-echo $ECHO_N "checking for GGZ server: ggzd... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GGZ server: ggzd" >&5
+$as_echo_n "checking for GGZ server: ggzd... " >&6; }
-# Check whether --with-ggzd-confdir or --without-ggzd-confdir was given.
-if test "${with_ggzd_confdir+set}" = set; then
- withval="$with_ggzd_confdir"
- ac_ggzd_confdir="$withval"
+# Check whether --with-ggzd-confdir was given.
+if test "${with_ggzd_confdir+set}" = set; then :
+ withval=$with_ggzd_confdir; ac_ggzd_confdir="$withval"
+
+fi
-fi;
-if test "${ac_cv_have_ggzdconf+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+if test "${ac_cv_have_ggzdconf+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test "x" = "xforce"; then
@@ -19295,23 +16148,21 @@ eval "$ac_cv_have_ggzdconf"
if test "$have_ggzdconf" != yes; then
if test "x" = "xignore"; then
- echo "$as_me:$LINENO: result: $have_ggzdconf (intentionally ignored)" >&5
-echo "${ECHO_T}$have_ggzdconf (intentionally ignored)" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_ggzdconf (intentionally ignored)" >&5
+$as_echo "$have_ggzdconf (intentionally ignored)" >&6; }
elif test "x" = "xforce"; then
if test "x$ac_ggzd_confdir" = "x"; then
ggzdconfdir="\${prefix}/etc/ggzd"
else
ggzdconfdir=$ac_ggzd_confdir
fi
- echo "$as_me:$LINENO: result: $have_ggzdconf (but forced to ${ggzdconfdir})" >&5
-echo "${ECHO_T}$have_ggzdconf (but forced to ${ggzdconfdir})" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_ggzdconf (but forced to ${ggzdconfdir})" >&5
+$as_echo "$have_ggzdconf (but forced to ${ggzdconfdir})" >&6; }
else
- echo "$as_me:$LINENO: result: $have_ggzdconf" >&5
-echo "${ECHO_T}$have_ggzdconf" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_ggzdconf" >&5
+$as_echo "$have_ggzdconf" >&6; }
if test "x" = "x"; then
- { { echo "$as_me:$LINENO: error: GGZ server configuration not found. Please check your installation! " >&5
-echo "$as_me: error: GGZ server configuration not found. Please check your installation! " >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "GGZ server configuration not found. Please check your installation! " "$LINENO" 5
fi
# Perform actions given by argument 2.
@@ -19325,12 +16176,12 @@ else
fi
fi
if test "x$ggzdconfdir" != "x${prefix}/etc/ggzd" && test "x$prefixed" = "x1"; then
- echo "$as_me:$LINENO: result: $have_ggzdconf ($ggzdconfdir, but using ${prefix}/etc/ggzd nevertheless)" >&5
-echo "${ECHO_T}$have_ggzdconf ($ggzdconfdir, but using ${prefix}/etc/ggzd nevertheless)" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_ggzdconf ($ggzdconfdir, but using ${prefix}/etc/ggzd nevertheless)" >&5
+$as_echo "$have_ggzdconf ($ggzdconfdir, but using ${prefix}/etc/ggzd nevertheless)" >&6; }
ggzdconfdir="\${prefix}/etc/ggzd"
else
- echo "$as_me:$LINENO: result: $have_ggzdconf ($ggzdconfdir)" >&5
-echo "${ECHO_T}$have_ggzdconf ($ggzdconfdir)" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_ggzdconf ($ggzdconfdir)" >&5
+$as_echo "$have_ggzdconf ($ggzdconfdir)" >&6; }
fi
fi
@@ -19371,22 +16222,16 @@ fi
-cat >>confdefs.h <<\_ACEOF
-#define GGZ_SERVER 1
-_ACEOF
+$as_echo "#define GGZ_SERVER 1" >>confdefs.h
else
if test "$try_ggz_server" = "yes"; then
- { { echo "$as_me:$LINENO: error: Could not configure GGZ server support. See above messages." >&5
-echo "$as_me: error: Could not configure GGZ server support. See above messages." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "Could not configure GGZ server support. See above messages." "$LINENO" 5
fi
fi
fi
-
-
-if test "$ggz_server" = "yes"; then
+ if test "$ggz_server" = "yes"; then
GGZ_SERVER_TRUE=
GGZ_SERVER_FALSE='#'
else
@@ -19409,12 +16254,12 @@ fi
ac_ggz_prefix=""
-# Check whether --with-ggz-dir or --without-ggz-dir was given.
-if test "${with_ggz_dir+set}" = set; then
- withval="$with_ggz_dir"
- ac_ggz_prefix="$withval"
+# Check whether --with-ggz-dir was given.
+if test "${with_ggz_dir+set}" = set; then :
+ withval=$with_ggz_dir; ac_ggz_prefix="$withval"
+
+fi
-fi;
if test "x$ac_ggz_prefix" != "xno" ; then
if test "x${prefix}" = "xNONE"; then
@@ -19467,12 +16312,7 @@ if test "x$ac_ggz_prefix" != "xno" ; then
save_cxxflags=$CXXFLAGS
if test "x$GCC" = xyes; then
CFLAGS="-Wall -Werror"
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
void signedness(void){char c;if(c==-1)c=0;}
int
@@ -19483,34 +16323,15 @@ main ()
return 0;
}
_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
- :
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_compile "$LINENO"; then :
-save_cflags="$save_cflags -fsigned-char"
+else
+ save_cflags="$save_cflags -fsigned-char"
save_cxxflags="$save_cxxflags -fsigned-char"
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#if defined(__SUNPRO_C) || (__SUNPRO_C >= 0x550)
#else
@@ -19524,26 +16345,11 @@ main ()
return 0;
}
_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
+if ac_fn_c_try_compile "$LINENO"; then :
save_cflags="$save_cflags -xchar=signed"
save_cxxflags="$save_cxxflags -xchar=signed"
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
CFLAGS=$save_cflags
@@ -19553,38 +16359,38 @@ fi
if test x$ac_ggz_prefix != xno ; then
-echo "$as_me:$LINENO: checking for GGZ library: libggz" >&5
-echo $ECHO_N "checking for GGZ library: libggz... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GGZ library: libggz" >&5
+$as_echo_n "checking for GGZ library: libggz... " >&6; }
ac_libggz_includes=NO ac_libggz_libraries=NO
libggz_libraries=""
libggz_includes=""
-# Check whether --with-libggz-dir or --without-libggz-dir was given.
-if test "${with_libggz_dir+set}" = set; then
- withval="$with_libggz_dir"
- ac_libggz_includes="$withval"/include
+# Check whether --with-libggz-dir was given.
+if test "${with_libggz_dir+set}" = set; then :
+ withval=$with_libggz_dir; ac_libggz_includes="$withval"/include
ac_libggz_libraries="$withval"/lib
-fi;
+fi
-# Check whether --with-libggz-includes or --without-libggz-includes was given.
-if test "${with_libggz_includes+set}" = set; then
- withval="$with_libggz_includes"
- ac_libggz_includes="$withval"
-fi;
+# Check whether --with-libggz-includes was given.
+if test "${with_libggz_includes+set}" = set; then :
+ withval=$with_libggz_includes; ac_libggz_includes="$withval"
-# Check whether --with-libggz-libraries or --without-libggz-libraries was given.
-if test "${with_libggz_libraries+set}" = set; then
- withval="$with_libggz_libraries"
- ac_libggz_libraries="$withval"
+fi
-fi;
-if test "${ac_cv_have_libggz+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+# Check whether --with-libggz-libraries was given.
+if test "${with_libggz_libraries+set}" = set; then :
+ withval=$with_libggz_libraries; ac_libggz_libraries="$withval"
+
+fi
+
+
+if test "${ac_cv_have_libggz+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
libggz_incdirs="$ac_libggz_includes $ac_ggz_stdinc"
@@ -19614,7 +16420,7 @@ for i in $libggz_incdirs;
do
for j in $libggz_header;
do
- echo "configure: 19617: $i/$j" >&5
+ echo "configure: 16423: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
libggz_incdir=$i
@@ -19667,20 +16473,20 @@ eval "$ac_cv_have_libggz"
if test "$have_libggz" != yes; then
if test "xtry_ggz="no"" = "xignore"; then
- echo "$as_me:$LINENO: result: $have_libggz (ignored)" >&5
-echo "${ECHO_T}$have_libggz (ignored)" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_libggz (ignored)" >&5
+$as_echo "$have_libggz (ignored)" >&6; }
else
- echo "$as_me:$LINENO: result: $have_libggz" >&5
-echo "${ECHO_T}$have_libggz" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_libggz" >&5
+$as_echo "$have_libggz" >&6; }
if test "xtry_ggz="no"" = "x"; then
- { echo "$as_me:$LINENO: WARNING: no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no
The library 'libggz' does not seem to be installed correctly.
Headers searched in: $libggz_incdirs
Libraries searched in: $libggz_libdirs
Please read QuickStart.GGZ in order to fix this.
" >&5
-echo "$as_me: WARNING: no
+$as_echo "$as_me: WARNING: no
The library 'libggz' does not seem to be installed correctly.
Headers searched in: $libggz_incdirs
Libraries searched in: $libggz_libdirs
@@ -19696,8 +16502,8 @@ echo "$as_me: WARNING: no
else
ac_cv_have_libggz="have_libggz=yes \
ac_libggz_includes=$ac_libggz_includes ac_libggz_libraries=$ac_libggz_libraries"
- echo "$as_me:$LINENO: result: $have_libggz (libraries $ac_libggz_libraries, headers $ac_libggz_includes)" >&5
-echo "${ECHO_T}$have_libggz (libraries $ac_libggz_libraries, headers $ac_libggz_includes)" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_libggz (libraries $ac_libggz_libraries, headers $ac_libggz_includes)" >&5
+$as_echo "$have_libggz (libraries $ac_libggz_libraries, headers $ac_libggz_includes)" >&6; }
libggz_libraries="$ac_libggz_libraries"
libggz_includes="$ac_libggz_includes"
@@ -19751,18 +16557,13 @@ fi
LD_LIBRARY_PATH=$save_ldlibrary_path:$libggz_libraries
export LD_LIBRARY_PATH
- echo "$as_me:$LINENO: checking for GGZ library version: $major.$minor.$micro" >&5
-echo $ECHO_N "checking for GGZ library version: $major.$minor.$micro... $ECHO_C" >&6
- if test "$cross_compiling" = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GGZ library version: $major.$minor.$micro" >&5
+$as_echo_n "checking for GGZ library version: $major.$minor.$micro... " >&6; }
+ if test "$cross_compiling" = yes; then :
ac_ggz_version_check="skipped due to cross-compiling"
else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
$testprologue
int
@@ -19773,40 +16574,25 @@ $testbody
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
+if ac_fn_c_try_run "$LINENO"; then :
ac_ggz_version_check=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 )
-ac_ggz_version_check=no
+ ac_ggz_version_check=no
fi
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
+
if test "$ac_ggz_version_check" = "no"; then
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if test "xtry_ggz=no" = "x"; then
- { { echo "$as_me:$LINENO: error: The GGZ version is too old. Version $major.$minor.$micro is required." >&5
-echo "$as_me: error: The GGZ version is too old. Version $major.$minor.$micro is required." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "The GGZ version is too old. Version $major.$minor.$micro is required." "$LINENO" 5
fi
try_ggz=no
else
- echo "$as_me:$LINENO: result: $ac_ggz_version_check" >&5
-echo "${ECHO_T}$ac_ggz_version_check" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ggz_version_check" >&5
+$as_echo "$ac_ggz_version_check" >&6; }
fi
@@ -19819,48 +16605,48 @@ echo "${ECHO_T}$ac_ggz_version_check" >&6
ggz_client="no"
-# Check whether --with-ggz-client or --without-ggz-client was given.
-if test "${with_ggz_client+set}" = set; then
- withval="$with_ggz_client"
- try_ggz_client=$withval
-fi;
+# Check whether --with-ggz-client was given.
+if test "${with_ggz_client+set}" = set; then :
+ withval=$with_ggz_client; try_ggz_client=$withval
+fi
+
if test "x$try_ggz_client" != "xno"; then
if test "$try_ggz" = "yes"; then
# Must pass something as the action-if-failed, or the macro will exit
-echo "$as_me:$LINENO: checking for GGZ library: ggzmod" >&5
-echo $ECHO_N "checking for GGZ library: ggzmod... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GGZ library: ggzmod" >&5
+$as_echo_n "checking for GGZ library: ggzmod... " >&6; }
ac_ggzmod_includes=NO ac_ggzmod_libraries=NO
ggzmod_libraries=""
ggzmod_includes=""
-# Check whether --with-ggzmod-dir or --without-ggzmod-dir was given.
-if test "${with_ggzmod_dir+set}" = set; then
- withval="$with_ggzmod_dir"
- ac_ggzmod_includes="$withval"/include
+# Check whether --with-ggzmod-dir was given.
+if test "${with_ggzmod_dir+set}" = set; then :
+ withval=$with_ggzmod_dir; ac_ggzmod_includes="$withval"/include
ac_ggzmod_libraries="$withval"/lib
-fi;
+fi
-# Check whether --with-ggzmod-includes or --without-ggzmod-includes was given.
-if test "${with_ggzmod_includes+set}" = set; then
- withval="$with_ggzmod_includes"
- ac_ggzmod_includes="$withval"
-fi;
+# Check whether --with-ggzmod-includes was given.
+if test "${with_ggzmod_includes+set}" = set; then :
+ withval=$with_ggzmod_includes; ac_ggzmod_includes="$withval"
-# Check whether --with-ggzmod-libraries or --without-ggzmod-libraries was given.
-if test "${with_ggzmod_libraries+set}" = set; then
- withval="$with_ggzmod_libraries"
- ac_ggzmod_libraries="$withval"
+fi
-fi;
-if test "${ac_cv_have_ggzmod+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+# Check whether --with-ggzmod-libraries was given.
+if test "${with_ggzmod_libraries+set}" = set; then :
+ withval=$with_ggzmod_libraries; ac_ggzmod_libraries="$withval"
+
+fi
+
+
+if test "${ac_cv_have_ggzmod+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ggzmod_incdirs="$ac_ggzmod_includes $ac_ggz_stdinc"
@@ -19890,7 +16676,7 @@ for i in $ggzmod_incdirs;
do
for j in $ggzmod_header;
do
- echo "configure: 19893: $i/$j" >&5
+ echo "configure: 16679: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ggzmod_incdir=$i
@@ -19943,20 +16729,20 @@ eval "$ac_cv_have_ggzmod"
if test "$have_ggzmod" != yes; then
if test "xggz_client="no"" = "xignore"; then
- echo "$as_me:$LINENO: result: $have_ggzmod (intentionally ignored)" >&5
-echo "${ECHO_T}$have_ggzmod (intentionally ignored)" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_ggzmod (intentionally ignored)" >&5
+$as_echo "$have_ggzmod (intentionally ignored)" >&6; }
else
- echo "$as_me:$LINENO: result: $have_ggzmod" >&5
-echo "${ECHO_T}$have_ggzmod" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_ggzmod" >&5
+$as_echo "$have_ggzmod" >&6; }
if test "xggz_client="no"" = "x"; then
- { echo "$as_me:$LINENO: WARNING: no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no
The library 'ggzmod' does not seem to be installed correctly.
Headers searched in: $ggzmod_incdirs
Libraries searched in: $ggzmod_libdirs
Please read QuickStart.GGZ in order to fix this.
" >&5
-echo "$as_me: WARNING: no
+$as_echo "$as_me: WARNING: no
The library 'ggzmod' does not seem to be installed correctly.
Headers searched in: $ggzmod_incdirs
Libraries searched in: $ggzmod_libdirs
@@ -19972,8 +16758,8 @@ echo "$as_me: WARNING: no
else
ac_cv_have_ggzmod="have_ggzmod=yes \
ac_ggzmod_includes=$ac_ggzmod_includes ac_ggzmod_libraries=$ac_ggzmod_libraries"
- echo "$as_me:$LINENO: result: $have_ggzmod (libraries $ac_ggzmod_libraries, headers $ac_ggzmod_includes)" >&5
-echo "${ECHO_T}$have_ggzmod (libraries $ac_ggzmod_libraries, headers $ac_ggzmod_includes)" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_ggzmod (libraries $ac_ggzmod_libraries, headers $ac_ggzmod_includes)" >&5
+$as_echo "$have_ggzmod (libraries $ac_ggzmod_libraries, headers $ac_ggzmod_includes)" >&6; }
ggzmod_libraries="$ac_ggzmod_libraries"
ggzmod_includes="$ac_ggzmod_includes"
@@ -19992,24 +16778,24 @@ echo "${ECHO_T}$have_ggzmod (libraries $ac_ggzmod_libraries, headers $ac_ggzmod_
# Perform actions given by argument 1.
-echo "$as_me:$LINENO: checking for GGZ configuration tool: ggz-config" >&5
-echo $ECHO_N "checking for GGZ configuration tool: ggz-config... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GGZ configuration tool: ggz-config" >&5
+$as_echo_n "checking for GGZ configuration tool: ggz-config... " >&6; }
ac_ggz_config=NO
ggz_config=""
-# Check whether --with-ggzconfig or --without-ggzconfig was given.
-if test "${with_ggzconfig+set}" = set; then
- withval="$with_ggzconfig"
- ac_ggz_config="$withval"
+# Check whether --with-ggzconfig was given.
+if test "${with_ggzconfig+set}" = set; then :
+ withval=$with_ggzconfig; ac_ggz_config="$withval"
+
+fi
-fi;
ac_ggz_config_orig=$ac_ggz_config
-if test "${ac_cv_have_ggzconfig+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+if test "${ac_cv_have_ggzconfig+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ggz_config_dirs="$ac_ggz_config $ac_ggz_stdbin"
@@ -20020,7 +16806,7 @@ for i in $ggz_config_dirs;
do
for j in ggz-config;
do
- echo "configure: 20023: $i/$j" >&5
+ echo "configure: 16809: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ggz_config_dir=$i
@@ -20046,8 +16832,8 @@ eval "$ac_cv_have_ggz_config"
if test "$have_ggz_config" != yes; then
if test "xggz_client="no"" = "xignore"; then
- echo "$as_me:$LINENO: result: $have_ggz_config (intentionally ignored)" >&5
-echo "${ECHO_T}$have_ggz_config (intentionally ignored)" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_ggz_config (intentionally ignored)" >&5
+$as_echo "$have_ggz_config (intentionally ignored)" >&6; }
GGZ_CONFIG="true"
ggzexecmoddir="\${libdir}/ggz"
ggzdatadir="\${datadir}/ggz"
@@ -20065,12 +16851,10 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
else
- echo "$as_me:$LINENO: result: $have_ggz_config" >&5
-echo "${ECHO_T}$have_ggz_config" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_ggz_config" >&5
+$as_echo "$have_ggz_config" >&6; }
if test "xggz_client="no"" = "x"; then
- { { echo "$as_me:$LINENO: error: ggz-config not found. Please check your installation! " >&5
-echo "$as_me: error: ggz-config not found. Please check your installation! " >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "ggz-config not found. Please check your installation! " "$LINENO" 5
fi
# Perform actions given by argument 2.
@@ -20085,8 +16869,8 @@ else
fi
if test "x$pathto_app" != "x$pathto_ggz"; then
- echo "$as_me:$LINENO: result: $have_ggz_config (dismissed due to different prefix)" >&5
-echo "${ECHO_T}$have_ggz_config (dismissed due to different prefix)" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_ggz_config (dismissed due to different prefix)" >&5
+$as_echo "$have_ggz_config (dismissed due to different prefix)" >&6; }
GGZ_CONFIG="true"
ggzexecmoddir="\${libdir}/ggz"
ggzdatadir="\${datadir}/ggz"
@@ -20111,19 +16895,19 @@ _ACEOF
else
ac_cv_have_ggz_config="have_ggz_config=yes \
ac_ggz_config=$ac_ggz_config"
- echo "$as_me:$LINENO: result: $ac_ggz_config/ggz-config" >&5
-echo "${ECHO_T}$ac_ggz_config/ggz-config" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ggz_config/ggz-config" >&5
+$as_echo "$ac_ggz_config/ggz-config" >&6; }
ggz_config="$ac_ggz_config"
- # Check whether --enable-noregistry or --disable-noregistry was given.
-if test "${enable_noregistry+set}" = set; then
- enableval="$enable_noregistry"
- enable_noregistry=yes
+ # Check whether --enable-noregistry was given.
+if test "${enable_noregistry+set}" = set; then :
+ enableval=$enable_noregistry; enable_noregistry=yes
else
enable_noregistry=no
-fi;
+fi
+
GGZ_CONFIG="${ggz_config}/ggz-config"
if test "$enable_noregistry" = yes; then
@@ -20157,9 +16941,7 @@ _ACEOF
if test "$ggzmoduleconfdir" = ""; then
- { { echo "$as_me:$LINENO: error: ggz-config is unusable. Maybe LD_LIBRARY_PATH needs to be set." >&5
-echo "$as_me: error: ggz-config is unusable. Maybe LD_LIBRARY_PATH needs to be set." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "ggz-config is unusable. Maybe LD_LIBRARY_PATH needs to be set." "$LINENO" 5
fi
@@ -20179,15 +16961,11 @@ fi
fi
if test "$ggz_client" = "yes"; then
-cat >>confdefs.h <<\_ACEOF
-#define GGZ_CLIENT 1
-_ACEOF
+$as_echo "#define GGZ_CLIENT 1" >>confdefs.h
else
if test "$try_ggz_client" = "yes"; then
- { { echo "$as_me:$LINENO: error: Could not configure GGZ client support. See above messages." >&5
-echo "$as_me: error: Could not configure GGZ client support. See above messages." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "Could not configure GGZ client support. See above messages." "$LINENO" 5
fi
fi
fi
@@ -20196,38 +16974,38 @@ echo "$as_me: error: Could not configure GGZ client support. See above messages.
if test "$ggz_client" = "yes"; then
if test "x" = "xgtk"; then
-echo "$as_me:$LINENO: checking for GGZ library: ggz-gtk" >&5
-echo $ECHO_N "checking for GGZ library: ggz-gtk... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GGZ library: ggz-gtk" >&5
+$as_echo_n "checking for GGZ library: ggz-gtk... " >&6; }
ac_ggz_gtk_includes=NO ac_ggz_gtk_libraries=NO
ggz_gtk_libraries=""
ggz_gtk_includes=""
-# Check whether --with-ggz-gtk-dir or --without-ggz-gtk-dir was given.
-if test "${with_ggz_gtk_dir+set}" = set; then
- withval="$with_ggz_gtk_dir"
- ac_ggz_gtk_includes="$withval"/include
+# Check whether --with-ggz-gtk-dir was given.
+if test "${with_ggz_gtk_dir+set}" = set; then :
+ withval=$with_ggz_gtk_dir; ac_ggz_gtk_includes="$withval"/include
ac_ggz_gtk_libraries="$withval"/lib
-fi;
+fi
-# Check whether --with-ggz-gtk-includes or --without-ggz-gtk-includes was given.
-if test "${with_ggz_gtk_includes+set}" = set; then
- withval="$with_ggz_gtk_includes"
- ac_ggz_gtk_includes="$withval"
-fi;
+# Check whether --with-ggz-gtk-includes was given.
+if test "${with_ggz_gtk_includes+set}" = set; then :
+ withval=$with_ggz_gtk_includes; ac_ggz_gtk_includes="$withval"
-# Check whether --with-ggz-gtk-libraries or --without-ggz-gtk-libraries was given.
-if test "${with_ggz_gtk_libraries+set}" = set; then
- withval="$with_ggz_gtk_libraries"
- ac_ggz_gtk_libraries="$withval"
+fi
+
+
+# Check whether --with-ggz-gtk-libraries was given.
+if test "${with_ggz_gtk_libraries+set}" = set; then :
+ withval=$with_ggz_gtk_libraries; ac_ggz_gtk_libraries="$withval"
+
+fi
-fi;
-if test "${ac_cv_have_ggz_gtk+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+if test "${ac_cv_have_ggz_gtk+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ggz_gtk_incdirs="$ac_ggz_gtk_includes $ac_ggz_stdinc"
@@ -20257,7 +17035,7 @@ for i in $ggz_gtk_incdirs;
do
for j in $ggz_gtk_header;
do
- echo "configure: 20260: $i/$j" >&5
+ echo "configure: 17038: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ggz_gtk_incdir=$i
@@ -20310,20 +17088,20 @@ eval "$ac_cv_have_ggz_gtk"
if test "$have_ggz_gtk" != yes; then
if test "x" = "xignore"; then
- echo "$as_me:$LINENO: result: $have_ggz_gtk (intentionally ignored)" >&5
-echo "${ECHO_T}$have_ggz_gtk (intentionally ignored)" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_ggz_gtk (intentionally ignored)" >&5
+$as_echo "$have_ggz_gtk (intentionally ignored)" >&6; }
else
- echo "$as_me:$LINENO: result: $have_ggz_gtk" >&5
-echo "${ECHO_T}$have_ggz_gtk" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_ggz_gtk" >&5
+$as_echo "$have_ggz_gtk" >&6; }
if test "x" = "x"; then
- { echo "$as_me:$LINENO: WARNING: no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no
The library 'ggz-gtk' does not seem to be installed correctly.
Headers searched in: $ggz_gtk_incdirs
Libraries searched in: $ggz_gtk_libdirs
Please read QuickStart.GGZ in order to fix this.
" >&5
-echo "$as_me: WARNING: no
+$as_echo "$as_me: WARNING: no
The library 'ggz-gtk' does not seem to be installed correctly.
Headers searched in: $ggz_gtk_incdirs
Libraries searched in: $ggz_gtk_libdirs
@@ -20339,8 +17117,8 @@ echo "$as_me: WARNING: no
else
ac_cv_have_ggz_gtk="have_ggz_gtk=yes \
ac_ggz_gtk_includes=$ac_ggz_gtk_includes ac_ggz_gtk_libraries=$ac_ggz_gtk_libraries"
- echo "$as_me:$LINENO: result: $have_ggz_gtk (libraries $ac_ggz_gtk_libraries, headers $ac_ggz_gtk_includes)" >&5
-echo "${ECHO_T}$have_ggz_gtk (libraries $ac_ggz_gtk_libraries, headers $ac_ggz_gtk_includes)" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_ggz_gtk (libraries $ac_ggz_gtk_libraries, headers $ac_ggz_gtk_includes)" >&5
+$as_echo "$have_ggz_gtk (libraries $ac_ggz_gtk_libraries, headers $ac_ggz_gtk_includes)" >&6; }
ggz_gtk_libraries="$ac_ggz_gtk_libraries"
ggz_gtk_includes="$ac_ggz_gtk_includes"
@@ -20363,17 +17141,13 @@ fi
if test $ggz_gtk = "yes"; then
-cat >>confdefs.h <<\_ACEOF
-#define GGZ_GTK 1
-_ACEOF
+$as_echo "#define GGZ_GTK 1" >>confdefs.h
fi
fi
fi
-
-
-if test "$ggz_client" = "yes"; then
+ if test "$ggz_client" = "yes"; then
GGZ_CLIENT_TRUE=
GGZ_CLIENT_FALSE='#'
else
@@ -20381,9 +17155,7 @@ else
GGZ_CLIENT_FALSE=
fi
-
-
-if test "$ggz_gtk" = "yes"; then
+ if test "$ggz_gtk" = "yes"; then
GGZ_GTK_TRUE=
GGZ_GTK_FALSE='#'
else
@@ -20394,38 +17166,38 @@ fi
-echo "$as_me:$LINENO: checking for GGZ library: libggz" >&5
-echo $ECHO_N "checking for GGZ library: libggz... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GGZ library: libggz" >&5
+$as_echo_n "checking for GGZ library: libggz... " >&6; }
ac_libggz_includes=NO ac_libggz_libraries=NO
libggz_libraries=""
libggz_includes=""
-# Check whether --with-libggz-dir or --without-libggz-dir was given.
-if test "${with_libggz_dir+set}" = set; then
- withval="$with_libggz_dir"
- ac_libggz_includes="$withval"/include
+# Check whether --with-libggz-dir was given.
+if test "${with_libggz_dir+set}" = set; then :
+ withval=$with_libggz_dir; ac_libggz_includes="$withval"/include
ac_libggz_libraries="$withval"/lib
-fi;
+fi
-# Check whether --with-libggz-includes or --without-libggz-includes was given.
-if test "${with_libggz_includes+set}" = set; then
- withval="$with_libggz_includes"
- ac_libggz_includes="$withval"
-fi;
+# Check whether --with-libggz-includes was given.
+if test "${with_libggz_includes+set}" = set; then :
+ withval=$with_libggz_includes; ac_libggz_includes="$withval"
-# Check whether --with-libggz-libraries or --without-libggz-libraries was given.
-if test "${with_libggz_libraries+set}" = set; then
- withval="$with_libggz_libraries"
- ac_libggz_libraries="$withval"
+fi
-fi;
-if test "${ac_cv_have_libggz+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+# Check whether --with-libggz-libraries was given.
+if test "${with_libggz_libraries+set}" = set; then :
+ withval=$with_libggz_libraries; ac_libggz_libraries="$withval"
+
+fi
+
+
+if test "${ac_cv_have_libggz+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
libggz_incdirs="$ac_libggz_includes $ac_ggz_stdinc"
@@ -20455,7 +17227,7 @@ for i in $libggz_incdirs;
do
for j in $libggz_header;
do
- echo "configure: 20458: $i/$j" >&5
+ echo "configure: 17230: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
libggz_incdir=$i
@@ -20508,20 +17280,20 @@ eval "$ac_cv_have_libggz"
if test "$have_libggz" != yes; then
if test "xtry_ggz="no"" = "xignore"; then
- echo "$as_me:$LINENO: result: $have_libggz (ignored)" >&5
-echo "${ECHO_T}$have_libggz (ignored)" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_libggz (ignored)" >&5
+$as_echo "$have_libggz (ignored)" >&6; }
else
- echo "$as_me:$LINENO: result: $have_libggz" >&5
-echo "${ECHO_T}$have_libggz" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_libggz" >&5
+$as_echo "$have_libggz" >&6; }
if test "xtry_ggz="no"" = "x"; then
- { echo "$as_me:$LINENO: WARNING: no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no
The library 'libggz' does not seem to be installed correctly.
Headers searched in: $libggz_incdirs
Libraries searched in: $libggz_libdirs
Please read QuickStart.GGZ in order to fix this.
" >&5
-echo "$as_me: WARNING: no
+$as_echo "$as_me: WARNING: no
The library 'libggz' does not seem to be installed correctly.
Headers searched in: $libggz_incdirs
Libraries searched in: $libggz_libdirs
@@ -20537,8 +17309,8 @@ echo "$as_me: WARNING: no
else
ac_cv_have_libggz="have_libggz=yes \
ac_libggz_includes=$ac_libggz_includes ac_libggz_libraries=$ac_libggz_libraries"
- echo "$as_me:$LINENO: result: $have_libggz (libraries $ac_libggz_libraries, headers $ac_libggz_includes)" >&5
-echo "${ECHO_T}$have_libggz (libraries $ac_libggz_libraries, headers $ac_libggz_includes)" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_libggz (libraries $ac_libggz_libraries, headers $ac_libggz_includes)" >&5
+$as_echo "$have_libggz (libraries $ac_libggz_libraries, headers $ac_libggz_includes)" >&6; }
libggz_libraries="$ac_libggz_libraries"
libggz_includes="$ac_libggz_includes"
@@ -20588,18 +17360,13 @@ fi
LD_LIBRARY_PATH=$save_ldlibrary_path:$libggz_libraries
export LD_LIBRARY_PATH
- echo "$as_me:$LINENO: checking for GGZ library version: $major.$minor.$micro" >&5
-echo $ECHO_N "checking for GGZ library version: $major.$minor.$micro... $ECHO_C" >&6
- if test "$cross_compiling" = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GGZ library version: $major.$minor.$micro" >&5
+$as_echo_n "checking for GGZ library version: $major.$minor.$micro... " >&6; }
+ if test "$cross_compiling" = yes; then :
ac_ggz_version_check="skipped due to cross-compiling"
else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
$testprologue
int
@@ -20610,40 +17377,25 @@ $testbody
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
+if ac_fn_c_try_run "$LINENO"; then :
ac_ggz_version_check=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 )
-ac_ggz_version_check=no
+ ac_ggz_version_check=no
fi
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
+
if test "$ac_ggz_version_check" = "no"; then
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if test "xtry_ggz=no" = "x"; then
- { { echo "$as_me:$LINENO: error: The GGZ version is too old. Version $major.$minor.$micro is required." >&5
-echo "$as_me: error: The GGZ version is too old. Version $major.$minor.$micro is required." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "The GGZ version is too old. Version $major.$minor.$micro is required." "$LINENO" 5
fi
try_ggz=no
else
- echo "$as_me:$LINENO: result: $ac_ggz_version_check" >&5
-echo "${ECHO_T}$ac_ggz_version_check" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ggz_version_check" >&5
+$as_echo "$ac_ggz_version_check" >&6; }
fi
@@ -20656,48 +17408,48 @@ echo "${ECHO_T}$ac_ggz_version_check" >&6
ggz_server="no"
-# Check whether --with-ggz-server or --without-ggz-server was given.
-if test "${with_ggz_server+set}" = set; then
- withval="$with_ggz_server"
- try_ggz_server=$withval
-fi;
+# Check whether --with-ggz-server was given.
+if test "${with_ggz_server+set}" = set; then :
+ withval=$with_ggz_server; try_ggz_server=$withval
+fi
+
if test "x$try_ggz_server" != "xno"; then
if test "$try_ggz" = "yes"; then
# Must pass something as the action-if-failed, or the macro will exit
-echo "$as_me:$LINENO: checking for GGZ library: ggzdmod" >&5
-echo $ECHO_N "checking for GGZ library: ggzdmod... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GGZ library: ggzdmod" >&5
+$as_echo_n "checking for GGZ library: ggzdmod... " >&6; }
ac_ggzdmod_includes=NO ac_ggzdmod_libraries=NO
ggzdmod_libraries=""
ggzdmod_includes=""
-# Check whether --with-ggzdmod-dir or --without-ggzdmod-dir was given.
-if test "${with_ggzdmod_dir+set}" = set; then
- withval="$with_ggzdmod_dir"
- ac_ggzdmod_includes="$withval"/include
+# Check whether --with-ggzdmod-dir was given.
+if test "${with_ggzdmod_dir+set}" = set; then :
+ withval=$with_ggzdmod_dir; ac_ggzdmod_includes="$withval"/include
ac_ggzdmod_libraries="$withval"/lib
-fi;
+fi
-# Check whether --with-ggzdmod-includes or --without-ggzdmod-includes was given.
-if test "${with_ggzdmod_includes+set}" = set; then
- withval="$with_ggzdmod_includes"
- ac_ggzdmod_includes="$withval"
-fi;
+# Check whether --with-ggzdmod-includes was given.
+if test "${with_ggzdmod_includes+set}" = set; then :
+ withval=$with_ggzdmod_includes; ac_ggzdmod_includes="$withval"
-# Check whether --with-ggzdmod-libraries or --without-ggzdmod-libraries was given.
-if test "${with_ggzdmod_libraries+set}" = set; then
- withval="$with_ggzdmod_libraries"
- ac_ggzdmod_libraries="$withval"
+fi
-fi;
-if test "${ac_cv_have_ggzdmod+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+# Check whether --with-ggzdmod-libraries was given.
+if test "${with_ggzdmod_libraries+set}" = set; then :
+ withval=$with_ggzdmod_libraries; ac_ggzdmod_libraries="$withval"
+
+fi
+
+
+if test "${ac_cv_have_ggzdmod+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ggzdmod_incdirs="$ac_ggzdmod_includes $ac_ggz_stdinc"
@@ -20727,7 +17479,7 @@ for i in $ggzdmod_incdirs;
do
for j in $ggzdmod_header;
do
- echo "configure: 20730: $i/$j" >&5
+ echo "configure: 17482: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ggzdmod_incdir=$i
@@ -20780,20 +17532,20 @@ eval "$ac_cv_have_ggzdmod"
if test "$have_ggzdmod" != yes; then
if test "xggz_server="no"" = "xignore"; then
- echo "$as_me:$LINENO: result: $have_ggzdmod (intentionally ignored)" >&5
-echo "${ECHO_T}$have_ggzdmod (intentionally ignored)" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_ggzdmod (intentionally ignored)" >&5
+$as_echo "$have_ggzdmod (intentionally ignored)" >&6; }
else
- echo "$as_me:$LINENO: result: $have_ggzdmod" >&5
-echo "${ECHO_T}$have_ggzdmod" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_ggzdmod" >&5
+$as_echo "$have_ggzdmod" >&6; }
if test "xggz_server="no"" = "x"; then
- { echo "$as_me:$LINENO: WARNING: no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no
The library 'ggzdmod' does not seem to be installed correctly.
Headers searched in: $ggzdmod_incdirs
Libraries searched in: $ggzdmod_libdirs
Please read QuickStart.GGZ in order to fix this.
" >&5
-echo "$as_me: WARNING: no
+$as_echo "$as_me: WARNING: no
The library 'ggzdmod' does not seem to be installed correctly.
Headers searched in: $ggzdmod_incdirs
Libraries searched in: $ggzdmod_libdirs
@@ -20809,8 +17561,8 @@ echo "$as_me: WARNING: no
else
ac_cv_have_ggzdmod="have_ggzdmod=yes \
ac_ggzdmod_includes=$ac_ggzdmod_includes ac_ggzdmod_libraries=$ac_ggzdmod_libraries"
- echo "$as_me:$LINENO: result: $have_ggzdmod (libraries $ac_ggzdmod_libraries, headers $ac_ggzdmod_includes)" >&5
-echo "${ECHO_T}$have_ggzdmod (libraries $ac_ggzdmod_libraries, headers $ac_ggzdmod_includes)" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_ggzdmod (libraries $ac_ggzdmod_libraries, headers $ac_ggzdmod_includes)" >&5
+$as_echo "$have_ggzdmod (libraries $ac_ggzdmod_libraries, headers $ac_ggzdmod_includes)" >&6; }
ggzdmod_libraries="$ac_ggzdmod_libraries"
ggzdmod_includes="$ac_ggzdmod_includes"
@@ -20835,18 +17587,18 @@ fi
fi
if test "$ggz_server" = "yes"; then
-echo "$as_me:$LINENO: checking for GGZ server: ggzd" >&5
-echo $ECHO_N "checking for GGZ server: ggzd... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GGZ server: ggzd" >&5
+$as_echo_n "checking for GGZ server: ggzd... " >&6; }
-# Check whether --with-ggzd-confdir or --without-ggzd-confdir was given.
-if test "${with_ggzd_confdir+set}" = set; then
- withval="$with_ggzd_confdir"
- ac_ggzd_confdir="$withval"
+# Check whether --with-ggzd-confdir was given.
+if test "${with_ggzd_confdir+set}" = set; then :
+ withval=$with_ggzd_confdir; ac_ggzd_confdir="$withval"
-fi;
+fi
-if test "${ac_cv_have_ggzdconf+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+
+if test "${ac_cv_have_ggzdconf+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
if test "x" = "xforce"; then
@@ -20885,23 +17637,21 @@ eval "$ac_cv_have_ggzdconf"
if test "$have_ggzdconf" != yes; then
if test "x" = "xignore"; then
- echo "$as_me:$LINENO: result: $have_ggzdconf (intentionally ignored)" >&5
-echo "${ECHO_T}$have_ggzdconf (intentionally ignored)" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_ggzdconf (intentionally ignored)" >&5
+$as_echo "$have_ggzdconf (intentionally ignored)" >&6; }
elif test "x" = "xforce"; then
if test "x$ac_ggzd_confdir" = "x"; then
ggzdconfdir="\${prefix}/etc/ggzd"
else
ggzdconfdir=$ac_ggzd_confdir
fi
- echo "$as_me:$LINENO: result: $have_ggzdconf (but forced to ${ggzdconfdir})" >&5
-echo "${ECHO_T}$have_ggzdconf (but forced to ${ggzdconfdir})" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_ggzdconf (but forced to ${ggzdconfdir})" >&5
+$as_echo "$have_ggzdconf (but forced to ${ggzdconfdir})" >&6; }
else
- echo "$as_me:$LINENO: result: $have_ggzdconf" >&5
-echo "${ECHO_T}$have_ggzdconf" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_ggzdconf" >&5
+$as_echo "$have_ggzdconf" >&6; }
if test "x" = "x"; then
- { { echo "$as_me:$LINENO: error: GGZ server configuration not found. Please check your installation! " >&5
-echo "$as_me: error: GGZ server configuration not found. Please check your installation! " >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "GGZ server configuration not found. Please check your installation! " "$LINENO" 5
fi
# Perform actions given by argument 2.
@@ -20915,12 +17665,12 @@ else
fi
fi
if test "x$ggzdconfdir" != "x${prefix}/etc/ggzd" && test "x$prefixed" = "x1"; then
- echo "$as_me:$LINENO: result: $have_ggzdconf ($ggzdconfdir, but using ${prefix}/etc/ggzd nevertheless)" >&5
-echo "${ECHO_T}$have_ggzdconf ($ggzdconfdir, but using ${prefix}/etc/ggzd nevertheless)" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_ggzdconf ($ggzdconfdir, but using ${prefix}/etc/ggzd nevertheless)" >&5
+$as_echo "$have_ggzdconf ($ggzdconfdir, but using ${prefix}/etc/ggzd nevertheless)" >&6; }
ggzdconfdir="\${prefix}/etc/ggzd"
else
- echo "$as_me:$LINENO: result: $have_ggzdconf ($ggzdconfdir)" >&5
-echo "${ECHO_T}$have_ggzdconf ($ggzdconfdir)" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_ggzdconf ($ggzdconfdir)" >&5
+$as_echo "$have_ggzdconf ($ggzdconfdir)" >&6; }
fi
fi
@@ -20961,22 +17711,16 @@ fi
-cat >>confdefs.h <<\_ACEOF
-#define GGZ_SERVER 1
-_ACEOF
+$as_echo "#define GGZ_SERVER 1" >>confdefs.h
else
if test "$try_ggz_server" = "yes"; then
- { { echo "$as_me:$LINENO: error: Could not configure GGZ server support. See above messages." >&5
-echo "$as_me: error: Could not configure GGZ server support. See above messages." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "Could not configure GGZ server support. See above messages." "$LINENO" 5
fi
fi
fi
-
-
-if test "$ggz_server" = "yes"; then
+ if test "$ggz_server" = "yes"; then
GGZ_SERVER_TRUE=
GGZ_SERVER_FALSE='#'
else
@@ -20988,86 +17732,14 @@ 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
+ for ac_func in chdir mkdtemp
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
fi
@@ -21085,9 +17757,7 @@ fi
-
-
-if test "x$SDL_mixer" = "xyes"; then
+ if test "x$SDL_mixer" = "xyes"; then
AUDIO_SDL_TRUE=
AUDIO_SDL_FALSE='#'
else
@@ -21095,9 +17765,7 @@ else
AUDIO_SDL_FALSE=
fi
-
-
-if test "$gui_sources" = "gui-sdl"; then
+ if test "$gui_sources" = "gui-sdl"; then
CLIENT_GUI_SDL_TRUE=
CLIENT_GUI_SDL_FALSE='#'
else
@@ -21105,9 +17773,7 @@ else
CLIENT_GUI_SDL_FALSE=
fi
-
-
-if test "$gui_sources" = "gui-gtk-2.0"; then
+ if test "$gui_sources" = "gui-gtk-2.0"; then
CLIENT_GUI_GTK_2_0_TRUE=
CLIENT_GUI_GTK_2_0_FALSE='#'
else
@@ -21115,9 +17781,7 @@ else
CLIENT_GUI_GTK_2_0_FALSE=
fi
-
-
-if test "$gui_sources" = "gui-xaw"; then
+ if test "$gui_sources" = "gui-xaw"; then
CLIENT_GUI_XAW_TRUE=
CLIENT_GUI_XAW_FALSE='#'
else
@@ -21125,9 +17789,7 @@ else
CLIENT_GUI_XAW_FALSE=
fi
-
-
-if test "$gui_sources" = "gui-beos"; then
+ if test "$gui_sources" = "gui-beos"; then
CLIENT_GUI_BEOS_TRUE=
CLIENT_GUI_BEOS_FALSE='#'
else
@@ -21135,9 +17797,7 @@ else
CLIENT_GUI_BEOS_FALSE=
fi
-
-
-if test "$gui_sources" = "gui-stub"; then
+ if test "$gui_sources" = "gui-stub"; then
CLIENT_GUI_STUB_TRUE=
CLIENT_GUI_STUB_FALSE='#'
else
@@ -21145,9 +17805,7 @@ else
CLIENT_GUI_STUB_FALSE=
fi
-
-
-if test "$gui_sources" = "gui-win32"; then
+ if test "$gui_sources" = "gui-win32"; then
CLIENT_GUI_WIN32_TRUE=
CLIENT_GUI_WIN32_FALSE='#'
else
@@ -21155,9 +17813,7 @@ else
CLIENT_GUI_WIN32_FALSE=
fi
-
-
-if test "$gui_sources" = "gui-ftwl"; then
+ if test "$gui_sources" = "gui-ftwl"; then
CLIENT_GUI_FTWL_TRUE=
CLIENT_GUI_FTWL_FALSE='#'
else
@@ -21165,9 +17821,7 @@ else
CLIENT_GUI_FTWL_FALSE=
fi
-
-
-if test "$ftwl" != "no"; then
+ if test "$ftwl" != "no"; then
FTWL_TRUE=
FTWL_FALSE='#'
else
@@ -21175,9 +17829,7 @@ else
FTWL_FALSE=
fi
-
-
-if test "$ftwl" = "x11"; then
+ if test "$ftwl" = "x11"; then
FTWL_X11_TRUE=
FTWL_X11_FALSE='#'
else
@@ -21185,9 +17837,7 @@ else
FTWL_X11_FALSE=
fi
-
-
-if test "$ftwl" = "sdl"; then
+ if test "$ftwl" = "sdl"; then
FTWL_SDL_TRUE=
FTWL_SDL_FALSE='#'
else
@@ -21195,9 +17845,7 @@ else
FTWL_SDL_FALSE=
fi
-
-
-if test "$ftwl" = "opengl"; then
+ if test "$ftwl" = "opengl"; then
FTWL_OPENGL_TRUE=
FTWL_OPENGL_FALSE='#'
else
@@ -21205,9 +17853,7 @@ else
FTWL_OPENGL_FALSE=
fi
-
-
-if test x"$MINGW32" = "xyes"; then
+ if test x"$MINGW32" = "xyes"; then
MINGW32_TRUE=
MINGW32_FALSE='#'
else
@@ -21217,61 +17863,43 @@ fi
if test x$server = xtrue; then
- echo "$as_me:$LINENO: checking for gethostbyaddr in -lbind" >&5
-echo $ECHO_N "checking for gethostbyaddr in -lbind... $ECHO_C" >&6
-if test "${ac_cv_lib_bind_gethostbyaddr+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyaddr in -lbind" >&5
+$as_echo_n "checking for gethostbyaddr in -lbind... " >&6; }
+if test "${ac_cv_lib_bind_gethostbyaddr+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lbind $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 gethostbyaddr ();
int
main ()
{
-gethostbyaddr ();
+return gethostbyaddr ();
;
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
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_bind_gethostbyaddr=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_bind_gethostbyaddr=no
+ ac_cv_lib_bind_gethostbyaddr=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_bind_gethostbyaddr" >&5
-echo "${ECHO_T}$ac_cv_lib_bind_gethostbyaddr" >&6
-if test $ac_cv_lib_bind_gethostbyaddr = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_gethostbyaddr" >&5
+$as_echo "$ac_cv_lib_bind_gethostbyaddr" >&6; }
+if test "x$ac_cv_lib_bind_gethostbyaddr" = x""yes; then :
SERVER_LIBS="-lbind $SERVER_LIBS"
fi
@@ -21279,136 +17907,8 @@ fi
if test "$WITH_READLINE" = "yes" || test "$WITH_READLINE" = "maybe"; then
HAVE_TERMCAP="";
- if test "${ac_cv_header_readline_readline_h+set}" = set; then
- echo "$as_me:$LINENO: checking for readline/readline.h" >&5
-echo $ECHO_N "checking for readline/readline.h... $ECHO_C" >&6
-if test "${ac_cv_header_readline_readline_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_readline_readline_h" >&5
-echo "${ECHO_T}$ac_cv_header_readline_readline_h" >&6
-else
- # Is the header compilable?
-echo "$as_me:$LINENO: checking readline/readline.h usability" >&5
-echo $ECHO_N "checking readline/readline.h usability... $ECHO_C" >&6
-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. */
-$ac_includes_default
-#include <readline/readline.h>
-_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
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking readline/readline.h presence" >&5
-echo $ECHO_N "checking readline/readline.h presence... $ECHO_C" >&6
-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 <readline/readline.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc in
- yes:no )
- { echo "$as_me:$LINENO: WARNING: readline/readline.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: readline/readline.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: readline/readline.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: readline/readline.h: proceeding with the preprocessor's result" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf at gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
- no:yes )
- { echo "$as_me:$LINENO: WARNING: readline/readline.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: readline/readline.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: readline/readline.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: readline/readline.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: readline/readline.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: readline/readline.h: proceeding with the preprocessor's result" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf at gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-echo "$as_me:$LINENO: checking for readline/readline.h" >&5
-echo $ECHO_N "checking for readline/readline.h... $ECHO_C" >&6
-if test "${ac_cv_header_readline_readline_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_readline_readline_h=$ac_header_preproc
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_readline_readline_h" >&5
-echo "${ECHO_T}$ac_cv_header_readline_readline_h" >&6
-
-fi
-if test $ac_cv_header_readline_readline_h = yes; then
+ ac_fn_c_check_header_mongrel "$LINENO" "readline/readline.h" "ac_cv_header_readline_readline_h" "$ac_includes_default"
+if test "x$ac_cv_header_readline_readline_h" = x""yes; then :
have_readline_header=1
else
have_readline_header=0
@@ -21417,422 +17917,293 @@ fi
if test "$have_readline_header" = "0"; then
if test "$WITH_READLINE" = "yes"; then
- { { echo "$as_me:$LINENO: error: Did not find readline header file.
-You may need to install a readline \"development\" package." >&5
-echo "$as_me: error: Did not find readline header file.
-You may need to install a readline \"development\" package." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "Did not find readline header file.
+You may need to install a readline \"development\" package." "$LINENO" 5
else
- { echo "$as_me:$LINENO: WARNING: Did not find readline header file.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Did not find readline header file.
Configuring server without readline support." >&5
-echo "$as_me: WARNING: Did not find readline header file.
+$as_echo "$as_me: WARNING: Did not find readline header file.
Configuring server without readline support." >&2;}
fi
else
- echo "$as_me:$LINENO: checking for completion_matches in -lreadline" >&5
-echo $ECHO_N "checking for completion_matches in -lreadline... $ECHO_C" >&6
-if test "${ac_cv_lib_readline_completion_matches+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for completion_matches in -lreadline" >&5
+$as_echo_n "checking for completion_matches in -lreadline... " >&6; }
+if test "${ac_cv_lib_readline_completion_matches+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lreadline $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 completion_matches ();
int
main ()
{
-completion_matches ();
+return completion_matches ();
;
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
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_readline_completion_matches=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_readline_completion_matches=no
+ ac_cv_lib_readline_completion_matches=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_readline_completion_matches" >&5
-echo "${ECHO_T}$ac_cv_lib_readline_completion_matches" >&6
-if test $ac_cv_lib_readline_completion_matches = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_completion_matches" >&5
+$as_echo "$ac_cv_lib_readline_completion_matches" >&6; }
+if test "x$ac_cv_lib_readline_completion_matches" = x""yes; then :
have_readline_lib=1
else
have_readline_lib=0
fi
- echo "$as_me:$LINENO: checking for rl_completion_matches in -lreadline" >&5
-echo $ECHO_N "checking for rl_completion_matches in -lreadline... $ECHO_C" >&6
-if test "${ac_cv_lib_readline_rl_completion_matches+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_completion_matches in -lreadline" >&5
+$as_echo_n "checking for rl_completion_matches in -lreadline... " >&6; }
+if test "${ac_cv_lib_readline_rl_completion_matches+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lreadline $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 rl_completion_matches ();
int
main ()
{
-rl_completion_matches ();
+return rl_completion_matches ();
;
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
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_readline_rl_completion_matches=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_readline_rl_completion_matches=no
+ ac_cv_lib_readline_rl_completion_matches=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_readline_rl_completion_matches" >&5
-echo "${ECHO_T}$ac_cv_lib_readline_rl_completion_matches" >&6
-if test $ac_cv_lib_readline_rl_completion_matches = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_completion_matches" >&5
+$as_echo "$ac_cv_lib_readline_rl_completion_matches" >&6; }
+if test "x$ac_cv_lib_readline_rl_completion_matches" = x""yes; then :
have_new_readline_lib=1
else
have_new_readline_lib=0
fi
if test "$have_readline_lib" != "1" && test "$have_new_readline_lib" != "1"; then
- echo "$as_me:$LINENO: checking for tgetent in -ltinfo" >&5
-echo $ECHO_N "checking for tgetent in -ltinfo... $ECHO_C" >&6
-if test "${ac_cv_lib_tinfo_tgetent+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltinfo" >&5
+$as_echo_n "checking for tgetent in -ltinfo... " >&6; }
+if test "${ac_cv_lib_tinfo_tgetent+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ltinfo $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 tgetent ();
int
main ()
{
-tgetent ();
+return tgetent ();
;
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
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_tinfo_tgetent=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_tinfo_tgetent=no
+ ac_cv_lib_tinfo_tgetent=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_tinfo_tgetent" >&5
-echo "${ECHO_T}$ac_cv_lib_tinfo_tgetent" >&6
-if test $ac_cv_lib_tinfo_tgetent = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfo_tgetent" >&5
+$as_echo "$ac_cv_lib_tinfo_tgetent" >&6; }
+if test "x$ac_cv_lib_tinfo_tgetent" = x""yes; then :
HAVE_TERMCAP="-ltinfo"
else
- echo "$as_me:$LINENO: checking for tgetent in -lncurses" >&5
-echo $ECHO_N "checking for tgetent in -lncurses... $ECHO_C" >&6
-if test "${ac_cv_lib_ncurses_tgetent+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lncurses" >&5
+$as_echo_n "checking for tgetent in -lncurses... " >&6; }
+if test "${ac_cv_lib_ncurses_tgetent+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lncurses $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 tgetent ();
int
main ()
{
-tgetent ();
+return tgetent ();
;
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
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_ncurses_tgetent=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_ncurses_tgetent=no
+ ac_cv_lib_ncurses_tgetent=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_tgetent" >&5
-echo "${ECHO_T}$ac_cv_lib_ncurses_tgetent" >&6
-if test $ac_cv_lib_ncurses_tgetent = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_tgetent" >&5
+$as_echo "$ac_cv_lib_ncurses_tgetent" >&6; }
+if test "x$ac_cv_lib_ncurses_tgetent" = x""yes; then :
HAVE_TERMCAP="-lncurses"
else
- echo "$as_me:$LINENO: checking for tgetent in -lcurses" >&5
-echo $ECHO_N "checking for tgetent in -lcurses... $ECHO_C" >&6
-if test "${ac_cv_lib_curses_tgetent+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lcurses" >&5
+$as_echo_n "checking for tgetent in -lcurses... " >&6; }
+if test "${ac_cv_lib_curses_tgetent+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lcurses $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 tgetent ();
int
main ()
{
-tgetent ();
+return tgetent ();
;
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
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_curses_tgetent=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_curses_tgetent=no
+ ac_cv_lib_curses_tgetent=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_curses_tgetent" >&5
-echo "${ECHO_T}$ac_cv_lib_curses_tgetent" >&6
-if test $ac_cv_lib_curses_tgetent = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curses_tgetent" >&5
+$as_echo "$ac_cv_lib_curses_tgetent" >&6; }
+if test "x$ac_cv_lib_curses_tgetent" = x""yes; then :
HAVE_TERMCAP="-lcurses"
else
- echo "$as_me:$LINENO: checking for tgetent in -ltermcap" >&5
-echo $ECHO_N "checking for tgetent in -ltermcap... $ECHO_C" >&6
-if test "${ac_cv_lib_termcap_tgetent+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermcap" >&5
+$as_echo_n "checking for tgetent in -ltermcap... " >&6; }
+if test "${ac_cv_lib_termcap_tgetent+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ltermcap $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 tgetent ();
int
main ()
{
-tgetent ();
+return tgetent ();
;
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
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_termcap_tgetent=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_termcap_tgetent=no
+ ac_cv_lib_termcap_tgetent=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_tgetent" >&5
-echo "${ECHO_T}$ac_cv_lib_termcap_tgetent" >&6
-if test $ac_cv_lib_termcap_tgetent = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termcap_tgetent" >&5
+$as_echo "$ac_cv_lib_termcap_tgetent" >&6; }
+if test "x$ac_cv_lib_termcap_tgetent" = x""yes; then :
HAVE_TERMCAP="-ltermcap"
else
- echo "$as_me:$LINENO: checking for tgetent in -ltermlib" >&5
-echo $ECHO_N "checking for tgetent in -ltermlib... $ECHO_C" >&6
-if test "${ac_cv_lib_termlib_tgetent+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermlib" >&5
+$as_echo_n "checking for tgetent in -ltermlib... " >&6; }
+if test "${ac_cv_lib_termlib_tgetent+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ltermlib $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 tgetent ();
int
main ()
{
-tgetent ();
+return tgetent ();
;
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
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_termlib_tgetent=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_termlib_tgetent=no
+ ac_cv_lib_termlib_tgetent=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_termlib_tgetent" >&5
-echo "${ECHO_T}$ac_cv_lib_termlib_tgetent" >&6
-if test $ac_cv_lib_termlib_tgetent = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termlib_tgetent" >&5
+$as_echo "$ac_cv_lib_termlib_tgetent" >&6; }
+if test "x$ac_cv_lib_termlib_tgetent" = x""yes; then :
HAVE_TERMCAP="-ltermlib"
fi
@@ -21850,157 +18221,116 @@ fi
if test x"$HAVE_TERMCAP" != "x"; then
- echo "$as_me:$LINENO: checking for filename_completion_function in -lreadline" >&5
-echo $ECHO_N "checking for filename_completion_function in -lreadline... $ECHO_C" >&6
-if test "${ac_cv_lib_readline_filename_completion_function+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for filename_completion_function in -lreadline" >&5
+$as_echo_n "checking for filename_completion_function in -lreadline... " >&6; }
+if test "${ac_cv_lib_readline_filename_completion_function+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lreadline "$HAVE_TERMCAP" $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 filename_completion_function ();
int
main ()
{
-filename_completion_function ();
+return filename_completion_function ();
;
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
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_readline_filename_completion_function=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_readline_filename_completion_function=no
+ ac_cv_lib_readline_filename_completion_function=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_readline_filename_completion_function" >&5
-echo "${ECHO_T}$ac_cv_lib_readline_filename_completion_function" >&6
-if test $ac_cv_lib_readline_filename_completion_function = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_filename_completion_function" >&5
+$as_echo "$ac_cv_lib_readline_filename_completion_function" >&6; }
+if test "x$ac_cv_lib_readline_filename_completion_function" = x""yes; then :
have_readline_lib=1
else
have_readline_lib=0
fi
if test "$have_readline_lib" = "1"; then
- { echo "$as_me:$LINENO: WARNING: I had to manually add $HAVE_TERMCAP dependency to
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: I had to manually add $HAVE_TERMCAP dependency to
make readline library pass the test." >&5
-echo "$as_me: WARNING: I had to manually add $HAVE_TERMCAP dependency to
+$as_echo "$as_me: WARNING: I had to manually add $HAVE_TERMCAP dependency to
make readline library pass the test." >&2;}
fi
- echo "$as_me:$LINENO: checking for rl_filename_completion_function in -lreadline" >&5
-echo $ECHO_N "checking for rl_filename_completion_function in -lreadline... $ECHO_C" >&6
-if test "${ac_cv_lib_readline_rl_filename_completion_function+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_filename_completion_function in -lreadline" >&5
+$as_echo_n "checking for rl_filename_completion_function in -lreadline... " >&6; }
+if test "${ac_cv_lib_readline_rl_filename_completion_function+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lreadline "$HAVE_TERMCAP" $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 rl_filename_completion_function ();
int
main ()
{
-rl_filename_completion_function ();
+return rl_filename_completion_function ();
;
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
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_readline_rl_filename_completion_function=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_readline_rl_filename_completion_function=no
+ ac_cv_lib_readline_rl_filename_completion_function=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_readline_rl_filename_completion_function" >&5
-echo "${ECHO_T}$ac_cv_lib_readline_rl_filename_completion_function" >&6
-if test $ac_cv_lib_readline_rl_filename_completion_function = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_filename_completion_function" >&5
+$as_echo "$ac_cv_lib_readline_rl_filename_completion_function" >&6; }
+if test "x$ac_cv_lib_readline_rl_filename_completion_function" = x""yes; then :
have_new_readline_lib=1
else
have_new_readline_lib=0
fi
if test "$have_new_readline_lib" = "1"; then
- { echo "$as_me:$LINENO: WARNING: I had to manually add $HAVE_TERMCAP dependency to
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: I had to manually add $HAVE_TERMCAP dependency to
make readline library pass the test." >&5
-echo "$as_me: WARNING: I had to manually add $HAVE_TERMCAP dependency to
+$as_echo "$as_me: WARNING: I had to manually add $HAVE_TERMCAP dependency to
make readline library pass the test." >&2;}
fi
fi
fi
if test "$have_new_readline_lib" = "1"; then
- echo "$as_me:$LINENO: checking whether readline works at runtime" >&5
-echo $ECHO_N "checking whether readline works at runtime... $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether readline works at runtime" >&5
+$as_echo_n "checking whether readline works at runtime... " >&6; }
templibs="$LIBS"
LIBS="-lreadline $HAVE_TERMCAP $LIBS"
-if test "$cross_compiling" = yes; then
- echo "$as_me:$LINENO: result: unknown: cross-compiling" >&5
-echo "${ECHO_T}unknown: cross-compiling" >&6
+if test "$cross_compiling" = yes; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown: cross-compiling" >&5
+$as_echo "unknown: cross-compiling" >&6; }
have_new_readline_lib=1
else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/*
@@ -22040,32 +18370,19 @@ int main(void) {
}
_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
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+if ac_fn_c_try_run "$LINENO"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
have_new_readline_lib=1
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 )
-echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
have_new_readline_lib=0
fi
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
+
LIBS="$templibs"
if test "$have_new_readline_lib" = "1"; then
@@ -22082,35 +18399,27 @@ _ACEOF
else
if test "$WITH_READLINE" = "yes"; then
- { { echo "$as_me:$LINENO: error: Specified --with-readline but the
-runtime test of readline failed." >&5
-echo "$as_me: error: Specified --with-readline but the
-runtime test of readline failed." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "Specified --with-readline but the
+runtime test of readline failed." "$LINENO" 5
else
- { echo "$as_me:$LINENO: WARNING: Runtime test of readline failed.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Runtime test of readline failed.
Configuring server without readline support." >&5
-echo "$as_me: WARNING: Runtime test of readline failed.
+$as_echo "$as_me: WARNING: Runtime test of readline failed.
Configuring server without readline support." >&2;}
fi
fi
else
if test "$have_readline_lib" = "1"; then
- echo "$as_me:$LINENO: checking whether readline works at runtime" >&5
-echo $ECHO_N "checking whether readline works at runtime... $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether readline works at runtime" >&5
+$as_echo_n "checking whether readline works at runtime... " >&6; }
templibs="$LIBS"
LIBS="-lreadline $HAVE_TERMCAP $LIBS"
-if test "$cross_compiling" = yes; then
- echo "$as_me:$LINENO: result: unknown: cross-compiling" >&5
-echo "${ECHO_T}unknown: cross-compiling" >&6
+if test "$cross_compiling" = yes; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown: cross-compiling" >&5
+$as_echo "unknown: cross-compiling" >&6; }
have_readline_lib=1
else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/*
@@ -22150,32 +18459,19 @@ int main(void) {
}
_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
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+if ac_fn_c_try_run "$LINENO"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
have_readline_lib=1
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 )
-echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
have_readline_lib=0
fi
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
+
LIBS="$templibs"
if test "$have_readline_lib" = "1"; then
@@ -22187,29 +18483,23 @@ _ACEOF
else
if test "$WITH_READLINE" = "yes"; then
- { { echo "$as_me:$LINENO: error: Specified --with-readline but the
-runtime test of readline failed." >&5
-echo "$as_me: error: Specified --with-readline but the
-runtime test of readline failed." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "Specified --with-readline but the
+runtime test of readline failed." "$LINENO" 5
else
- { echo "$as_me:$LINENO: WARNING: Runtime test of readline failed.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Runtime test of readline failed.
Configuring server without readline support." >&5
-echo "$as_me: WARNING: Runtime test of readline failed.
+$as_echo "$as_me: WARNING: Runtime test of readline failed.
Configuring server without readline support." >&2;}
fi
fi
else
if test "$WITH_READLINE" = "yes"; then
- { { echo "$as_me:$LINENO: error: Specified --with-readline but the
-test to link against the library failed." >&5
-echo "$as_me: error: Specified --with-readline but the
-test to link against the library failed." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "Specified --with-readline but the
+test to link against the library failed." "$LINENO" 5
else
- { echo "$as_me:$LINENO: WARNING: Test to link against readline library failed.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Test to link against readline library failed.
Configuring server without readline support." >&5
-echo "$as_me: WARNING: Test to link against readline library failed.
+$as_echo "$as_me: WARNING: Test to link against readline library failed.
Configuring server without readline support." >&2;}
fi
fi
@@ -22218,196 +18508,89 @@ Configuring server without readline support." >&2;}
fi
- echo "$as_me:$LINENO: checking for pow" >&5
-echo $ECHO_N "checking for pow... $ECHO_C" >&6
-if test "${ac_cv_func_pow+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 pow (); 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 pow ();
-/* 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_pow) || defined (__stub___pow)
-choke me
-#else
-char (*f) () = pow;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != pow;
- ;
- 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
- ac_cv_func_pow=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ ac_fn_c_check_func "$LINENO" "pow" "ac_cv_func_pow"
+if test "x$ac_cv_func_pow" = x""yes; then :
-ac_cv_func_pow=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_pow" >&5
-echo "${ECHO_T}$ac_cv_func_pow" >&6
if test $ac_cv_func_pow = no; then
- echo "$as_me:$LINENO: checking for pow in -lm" >&5
-echo $ECHO_N "checking for pow in -lm... $ECHO_C" >&6
-if test "${ac_cv_lib_m_pow+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pow in -lm" >&5
+$as_echo_n "checking for pow in -lm... " >&6; }
+if test "${ac_cv_lib_m_pow+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lm $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 pow ();
int
main ()
{
-pow ();
+return pow ();
;
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
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_m_pow=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_m_pow=no
+ ac_cv_lib_m_pow=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_m_pow" >&5
-echo "${ECHO_T}$ac_cv_lib_m_pow" >&6
-if test $ac_cv_lib_m_pow = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_pow" >&5
+$as_echo "$ac_cv_lib_m_pow" >&6; }
+if test "x$ac_cv_lib_m_pow" = x""yes; then :
SERVER_LIBS="$SERVER_LIBS -lm"
else
- { { echo "$as_me:$LINENO: error: Did not find math lib!" >&5
-echo "$as_me: error: Did not find math lib!" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "Did not find math lib!" "$LINENO" 5
fi
fi
fi
-
-echo "$as_me:$LINENO: checking for main in -lnls" >&5
-echo $ECHO_N "checking for main in -lnls... $ECHO_C" >&6
-if test "${ac_cv_lib_nls_main+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lnls" >&5
+$as_echo_n "checking for main in -lnls... " >&6; }
+if test "${ac_cv_lib_nls_main+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lnls $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
main ()
{
-main ();
+return main ();
;
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
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_nls_main=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_nls_main=no
+ ac_cv_lib_nls_main=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_nls_main" >&5
-echo "${ECHO_T}$ac_cv_lib_nls_main" >&6
-if test $ac_cv_lib_nls_main = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nls_main" >&5
+$as_echo "$ac_cv_lib_nls_main" >&6; }
+if test "x$ac_cv_lib_nls_main" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBNLS 1
_ACEOF
@@ -22417,17 +18600,12 @@ _ACEOF
fi
-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
-if test "${ac_cv_header_stdc+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if test "${ac_cv_header_stdc+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
@@ -22442,42 +18620,23 @@ main ()
return 0;
}
_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
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_header_stdc=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_header_stdc=no
+ ac_cv_header_stdc=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <string.h>
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "memchr" >/dev/null 2>&1; then
- :
+ $EGREP "memchr" >/dev/null 2>&1; then :
+
else
ac_cv_header_stdc=no
fi
@@ -22487,19 +18646,14 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdlib.h>
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "free" >/dev/null 2>&1; then
- :
+ $EGREP "free" >/dev/null 2>&1; then :
+
else
ac_cv_header_stdc=no
fi
@@ -22509,25 +18663,21 @@ fi
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
:
else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <ctype.h>
+#include <stdlib.h>
#if ((' ' & 0x0FF) == 0x020)
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
#else
# define ISLOWER(c) \
- (('a' <= (c) && (c) <= 'i') \
- || ('j' <= (c) && (c) <= 'r') \
- || ('s' <= (c) && (c) <= 'z'))
+ (('a' <= (c) && (c) <= 'i') \
+ || ('j' <= (c) && (c) <= 'r') \
+ || ('s' <= (c) && (c) <= 'z'))
# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
#endif
@@ -22538,61 +18688,41 @@ main ()
int i;
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
- || toupper (i) != TOUPPER (i))
- exit(2);
- exit (0);
+ || toupper (i) != TOUPPER (i))
+ return 2;
+ 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
- :
-else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_run "$LINENO"; then :
-( exit $ac_status )
-ac_cv_header_stdc=no
+else
+ ac_cv_header_stdc=no
fi
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
+
fi
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
if test $ac_cv_header_stdc = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
fi
-echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5
-echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6
-if test "${ac_cv_header_sys_wait_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5
+$as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; }
+if test "${ac_cv_header_sys_wait_h+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/wait.h>
#ifndef WEXITSTATUS
-# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
+# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8)
#endif
#ifndef WIFEXITED
# define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
@@ -22608,312 +18738,132 @@ main ()
return 0;
}
_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
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_header_sys_wait_h=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_header_sys_wait_h=no
+ ac_cv_header_sys_wait_h=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5
-echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_wait_h" >&5
+$as_echo "$ac_cv_header_sys_wait_h" >&6; }
if test $ac_cv_header_sys_wait_h = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SYS_WAIT_H 1
-_ACEOF
+$as_echo "#define HAVE_SYS_WAIT_H 1" >>confdefs.h
fi
-
-
-
-
-
-
-
-
-
for ac_header in fcntl.h sys/time.h sys/types.h unistd.h sys/utsname.h \
sys/file.h libintl.h signal.h strings.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
- # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-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. */
-$ac_includes_default
-#include <$ac_header>
-_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
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-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 <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc in
- yes:no )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf at gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
- no:yes )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf at gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
fi
done
-echo "$as_me:$LINENO: checking for stdbool.h that conforms to C99" >&5
-echo $ECHO_N "checking for stdbool.h that conforms to C99... $ECHO_C" >&6
-if test "${ac_cv_header_stdbool_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5
+$as_echo_n "checking for stdbool.h that conforms to C99... " >&6; }
+if test "${ac_cv_header_stdbool_h+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdbool.h>
#ifndef bool
-# error bool is not defined
+ "error: bool is not defined"
#endif
#ifndef false
-# error false is not defined
+ "error: false is not defined"
#endif
#if false
-# error false is not 0
+ "error: false is not 0"
#endif
#ifndef true
-# error true is not defined
+ "error: true is not defined"
#endif
#if true != 1
-# error true is not 1
+ "error: true is not 1"
#endif
#ifndef __bool_true_false_are_defined
-# error __bool_true_false_are_defined is not defined
+ "error: __bool_true_false_are_defined is not defined"
#endif
- struct s { _Bool s: 1; _Bool t; } s;
-
- char a[true == 1 ? 1 : -1];
- char b[false == 0 ? 1 : -1];
- char c[__bool_true_false_are_defined == 1 ? 1 : -1];
- char d[(bool) -0.5 == true ? 1 : -1];
- bool e = &s;
- char f[(_Bool) -0.0 == false ? 1 : -1];
- char g[true];
- char h[sizeof (_Bool)];
- char i[sizeof s.t];
+ struct s { _Bool s: 1; _Bool t; } s;
+
+ char a[true == 1 ? 1 : -1];
+ char b[false == 0 ? 1 : -1];
+ char c[__bool_true_false_are_defined == 1 ? 1 : -1];
+ char d[(bool) 0.5 == true ? 1 : -1];
+ bool e = &s;
+ char f[(_Bool) 0.0 == false ? 1 : -1];
+ char g[true];
+ char h[sizeof (_Bool)];
+ char i[sizeof s.t];
+ enum { j = false, k = true, l = false * true, m = true * 256 };
+ /* The following fails for
+ HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */
+ _Bool n[m];
+ char o[sizeof n == m * sizeof n[0] ? 1 : -1];
+ char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
+# if defined __xlc__ || defined __GNUC__
+ /* Catch a bug in IBM AIX xlc compiler version 6.0.0.0
+ reported by James Lemley on 2005-10-05; see
+ http://lists.gnu.org/archive/html/bug-coreutils/2005-10/msg00086.html
+ This test is not quite right, since xlc is allowed to
+ reject this program, as the initializer for xlcbug is
+ not one of the forms that C requires support for.
+ However, doing the test right would require a runtime
+ test, and that would make cross-compilation harder.
+ Let us hope that IBM fixes the xlc bug, and also adds
+ support for this kind of constant expression. In the
+ meantime, this test will reject xlc, which is OK, since
+ our stdbool.h substitute should suffice. We also test
+ this with GCC, where it should work, to detect more
+ quickly whether someone messes up the test in the
+ future. */
+ char digs[] = "0123456789";
+ int xlcbug = 1 / (&(digs + 5)[-2 + (bool) 1] == &digs[4] ? 1 : -1);
+# endif
+ /* Catch a bug in an HP-UX C compiler. See
+ http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
+ http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
+ */
+ _Bool q = true;
+ _Bool *pq = &q;
int
main ()
{
- return !a + !b + !c + !d + !e + !f + !g + !h + !i;
- ;
- return 0;
-}
-_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
- ac_cv_header_stdbool_h=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_header_stdbool_h=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_stdbool_h" >&5
-echo "${ECHO_T}$ac_cv_header_stdbool_h" >&6
-echo "$as_me:$LINENO: checking for _Bool" >&5
-echo $ECHO_N "checking for _Bool... $ECHO_C" >&6
-if test "${ac_cv_type__Bool+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. */
-$ac_includes_default
-int
-main ()
-{
-if ((_Bool *) 0)
- return 0;
-if (sizeof (_Bool))
- return 0;
+ *pq |= q;
+ *pq |= ! q;
+ /* Refer to every declared value, to avoid compiler optimizations. */
+ return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
+ + !m + !n + !o + !p + !q + !pq);
+
;
return 0;
}
_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
- ac_cv_type__Bool=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_header_stdbool_h=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type__Bool=no
+ ac_cv_header_stdbool_h=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_type__Bool" >&5
-echo "${ECHO_T}$ac_cv_type__Bool" >&6
-if test $ac_cv_type__Bool = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5
+$as_echo "$ac_cv_header_stdbool_h" >&6; }
+ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default"
+if test "x$ac_cv_type__Bool" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE__BOOL 1
@@ -22924,161 +18874,21 @@ fi
if test $ac_cv_header_stdbool_h = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_STDBOOL_H 1
-_ACEOF
+$as_echo "#define HAVE_STDBOOL_H 1" >>confdefs.h
fi
if test "x$MINGW32" != "xyes"; then
-
-
-
-
-
-
-
-
-
-
-
-for ac_header in arpa/inet.h netdb.h netinet/in.h pwd.h sys/ioctl.h \
+ for ac_header in arpa/inet.h netdb.h netinet/in.h pwd.h sys/ioctl.h \
sys/select.h sys/signal.h sys/socket.h sys/termio.h \
sys/uio.h termios.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
- # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-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. */
-$ac_includes_default
-#include <$ac_header>
-_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
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-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 <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc in
- yes:no )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf at gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
- no:yes )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf at gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+eval as_val=\$$as_ac_Header
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
fi
@@ -23089,158 +18899,23 @@ fi
if test x$client = xxaw; then
fc_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $CLIENT_CFLAGS"
- if test "${ac_cv_header_X11_xpm_h+set}" = set; then
- echo "$as_me:$LINENO: checking for X11/xpm.h" >&5
-echo $ECHO_N "checking for X11/xpm.h... $ECHO_C" >&6
-if test "${ac_cv_header_X11_xpm_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_X11_xpm_h" >&5
-echo "${ECHO_T}$ac_cv_header_X11_xpm_h" >&6
-else
- # Is the header compilable?
-echo "$as_me:$LINENO: checking X11/xpm.h usability" >&5
-echo $ECHO_N "checking X11/xpm.h usability... $ECHO_C" >&6
-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. */
-$ac_includes_default
-#include <X11/xpm.h>
-_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
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking X11/xpm.h presence" >&5
-echo $ECHO_N "checking X11/xpm.h presence... $ECHO_C" >&6
-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 <X11/xpm.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc in
- yes:no )
- { echo "$as_me:$LINENO: WARNING: X11/xpm.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: X11/xpm.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: X11/xpm.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: X11/xpm.h: proceeding with the preprocessor's result" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf at gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
- no:yes )
- { echo "$as_me:$LINENO: WARNING: X11/xpm.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: X11/xpm.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: X11/xpm.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: X11/xpm.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: X11/xpm.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: X11/xpm.h: proceeding with the preprocessor's result" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf at gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-echo "$as_me:$LINENO: checking for X11/xpm.h" >&5
-echo $ECHO_N "checking for X11/xpm.h... $ECHO_C" >&6
-if test "${ac_cv_header_X11_xpm_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_cv_header_X11_xpm_h=$ac_header_preproc
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_X11_xpm_h" >&5
-echo "${ECHO_T}$ac_cv_header_X11_xpm_h" >&6
+ ac_fn_c_check_header_mongrel "$LINENO" "X11/xpm.h" "ac_cv_header_X11_xpm_h" "$ac_includes_default"
+if test "x$ac_cv_header_X11_xpm_h" = x""yes; then :
-fi
-if test $ac_cv_header_X11_xpm_h = yes; then
- :
else
- { { echo "$as_me:$LINENO: error: need X11/xpm.h header; perhaps try/adjust --with-xpm-include" >&5
-echo "$as_me: error: need X11/xpm.h header; perhaps try/adjust --with-xpm-include" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "need X11/xpm.h header; perhaps try/adjust --with-xpm-include" "$LINENO" 5
fi
CPPFLAGS="$fc_save_CPPFLAGS"
fi
-echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
-if test "${ac_cv_c_const+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
+$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
+if test "${ac_cv_c_const+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -23250,10 +18925,10 @@ main ()
#ifndef __cplusplus
/* Ultrix mips cc rejects this. */
typedef int charset[2];
- const charset x;
+ const charset cs;
/* SunOS 4.1.1 cc rejects this. */
- char const *const *ccp;
- char **p;
+ char const *const *pcpcc;
+ char **ppc;
/* NEC SVR4.0.2 mips cc rejects this. */
struct point {int x, y;};
static struct point const zero = {0,0};
@@ -23262,16 +18937,17 @@ main ()
an arm of an if-expression whose if-part is not a constant
expression */
const char *g = "string";
- ccp = &g + (g ? g-g : 0);
+ pcpcc = &g + (g ? g-g : 0);
/* HPUX 7.0 cc rejects these. */
- ++ccp;
- p = (char**) ccp;
- ccp = (char const *const *) p;
+ ++pcpcc;
+ ppc = (char**) pcpcc;
+ pcpcc = (char const *const *) ppc;
{ /* SCO 3.2v4 cc rejects this. */
char *t;
char const *s = 0 ? (char *) 0 : (char const *) 0;
*t++ = 0;
+ if (s) return 0;
}
{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
int x[] = {25, 17};
@@ -23290,55 +18966,36 @@ main ()
}
{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
const int foo = 10;
+ if (!foo) return 0;
}
+ return !cs[0] && !zero.x;
#endif
;
return 0;
}
_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
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_c_const=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_c_const=no
+ ac_cv_c_const=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-echo "${ECHO_T}$ac_cv_c_const" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
+$as_echo "$ac_cv_c_const" >&6; }
if test $ac_cv_c_const = no; then
-cat >>confdefs.h <<\_ACEOF
-#define const
-_ACEOF
+$as_echo "#define const /**/" >>confdefs.h
fi
-echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
-echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
-if test "${ac_cv_header_time+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
+$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
+if test "${ac_cv_header_time+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/time.h>
@@ -23353,48 +19010,27 @@ return 0;
return 0;
}
_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
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_header_time=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_header_time=no
+ ac_cv_header_time=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
-echo "${ECHO_T}$ac_cv_header_time" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5
+$as_echo "$ac_cv_header_time" >&6; }
if test $ac_cv_header_time = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define TIME_WITH_SYS_TIME 1
-_ACEOF
+$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
fi
-echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5
-echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6
-if test "${ac_cv_struct_tm+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
+$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
+if test "${ac_cv_struct_tm+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <sys/types.h>
#include <time.h>
@@ -23402,93 +19038,33 @@ cat >>conftest.$ac_ext <<_ACEOF
int
main ()
{
-struct tm *tp; tp->tm_sec;
+struct tm tm;
+ int *p = &tm.tm_sec;
+ return !p;
;
return 0;
}
_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
+if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_struct_tm=time.h
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_struct_tm=sys/time.h
+ ac_cv_struct_tm=sys/time.h
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
-echo "${ECHO_T}$ac_cv_struct_tm" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5
+$as_echo "$ac_cv_struct_tm" >&6; }
if test $ac_cv_struct_tm = sys/time.h; then
-cat >>confdefs.h <<\_ACEOF
-#define TM_IN_SYS_TIME 1
-_ACEOF
+$as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h
fi
-echo "$as_me:$LINENO: checking for socklen_t" >&5
-echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6
-if test "${ac_cv_type_socklen_t+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. */
-#include <sys/types.h>
+ac_fn_c_check_type "$LINENO" "socklen_t" "ac_cv_type_socklen_t" "#include <sys/types.h>
#include <sys/socket.h>
-
-int
-main ()
-{
-if ((socklen_t *) 0)
- return 0;
-if (sizeof (socklen_t))
- return 0;
- ;
- return 0;
-}
-_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
- ac_cv_type_socklen_t=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_socklen_t=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_socklen_t" >&5
-echo "${ECHO_T}$ac_cv_type_socklen_t" >&6
-if test $ac_cv_type_socklen_t = yes; then
+"
+if test "x$ac_cv_type_socklen_t" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_SOCKLEN_T 1
@@ -23498,115 +19074,42 @@ _ACEOF
fi
-echo "$as_me:$LINENO: checking return type of signal handlers" >&5
-echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
-if test "${ac_cv_type_signal+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
+$as_echo_n "checking return type of signal handlers... " >&6; }
+if test "${ac_cv_type_signal+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <sys/types.h>
#include <signal.h>
-#ifdef signal
-# undef signal
-#endif
-#ifdef __cplusplus
-extern "C" void (*signal (int, void (*)(int)))(int);
-#else
-void (*signal ()) ();
-#endif
int
main ()
{
-int i;
+return *(signal (0, 0)) (0) == 1;
;
return 0;
}
_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
- ac_cv_type_signal=void
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_type_signal=int
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_signal=int
+ ac_cv_type_signal=void
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
-echo "${ECHO_T}$ac_cv_type_signal" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5
+$as_echo "$ac_cv_type_signal" >&6; }
cat >>confdefs.h <<_ACEOF
#define RETSIGTYPE $ac_cv_type_signal
_ACEOF
-echo "$as_me:$LINENO: checking for pid_t" >&5
-echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
-if test "${ac_cv_type_pid_t+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. */
-$ac_includes_default
-int
-main ()
-{
-if ((pid_t *) 0)
- return 0;
-if (sizeof (pid_t))
- return 0;
- ;
- return 0;
-}
-_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
- ac_cv_type_pid_t=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
+if test "x$ac_cv_type_pid_t" = x""yes; then :
-ac_cv_type_pid_t=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
-echo "${ECHO_T}$ac_cv_type_pid_t" >&6
-if test $ac_cv_type_pid_t = yes; then
- :
else
cat >>confdefs.h <<_ACEOF
@@ -23615,282 +19118,66 @@ _ACEOF
fi
-
-
-for ac_header in unistd.h vfork.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
- # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-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. */
-$ac_includes_default
-#include <$ac_header>
-_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
- ac_header_compiler=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-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 <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
- ac_header_preproc=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc in
- yes:no )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf at gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
- no:yes )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf at gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- eval "$as_ac_Header=$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+for ac_header in vfork.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "vfork.h" "ac_cv_header_vfork_h" "$ac_includes_default"
+if test "x$ac_cv_header_vfork_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_VFORK_H 1
_ACEOF
fi
done
-
-
for ac_func in fork vfork
-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
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
fi
done
if test "x$ac_cv_func_fork" = xyes; then
- echo "$as_me:$LINENO: checking for working fork" >&5
-echo $ECHO_N "checking for working fork... $ECHO_C" >&6
-if test "${ac_cv_func_fork_works+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working fork" >&5
+$as_echo_n "checking for working fork... " >&6; }
+if test "${ac_cv_func_fork_works+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
ac_cv_func_fork_works=cross
else
- cat >conftest.$ac_ext <<_ACEOF
-/* By Ruediger Kuhlmann. */
- #include <sys/types.h>
- #if HAVE_UNISTD_H
- # include <unistd.h>
- #endif
- /* Some systems only have a dummy stub for fork() */
- int main ()
- {
- if (fork() < 0)
- exit (1);
- exit (0);
- }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+
+ /* By Ruediger Kuhlmann. */
+ return fork () < 0;
+
+ ;
+ 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
+if ac_fn_c_try_run "$LINENO"; then :
ac_cv_func_fork_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 )
-ac_cv_func_fork_works=no
+ ac_cv_func_fork_works=no
fi
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
+
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_fork_works" >&5
-echo "${ECHO_T}$ac_cv_func_fork_works" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_fork_works" >&5
+$as_echo "$ac_cv_func_fork_works" >&6; }
else
ac_cv_func_fork_works=$ac_cv_func_fork
@@ -23905,36 +19192,25 @@ if test "x$ac_cv_func_fork_works" = xcross; then
ac_cv_func_fork_works=yes
;;
esac
- { echo "$as_me:$LINENO: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&5
-echo "$as_me: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&5
+$as_echo "$as_me: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&2;}
fi
ac_cv_func_vfork_works=$ac_cv_func_vfork
if test "x$ac_cv_func_vfork" = xyes; then
- echo "$as_me:$LINENO: checking for working vfork" >&5
-echo $ECHO_N "checking for working vfork... $ECHO_C" >&6
-if test "${ac_cv_func_vfork_works+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working vfork" >&5
+$as_echo_n "checking for working vfork... " >&6; }
+if test "${ac_cv_func_vfork_works+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
ac_cv_func_vfork_works=cross
else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Thanks to Paul Eggert for this test. */
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+$ac_includes_default
#include <sys/wait.h>
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-#if HAVE_VFORK_H
+#ifdef HAVE_VFORK_H
# include <vfork.h>
#endif
/* On some sparc systems, changes by the child to local and incoming
@@ -24005,7 +19281,7 @@ main ()
while (wait(&status) != child)
;
- exit(
+ return (
/* Was there some problem with vforking? */
child < 0
@@ -24021,277 +19297,92 @@ main ()
}
}
_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
+if ac_fn_c_try_run "$LINENO"; then :
ac_cv_func_vfork_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 )
-ac_cv_func_vfork_works=no
+ ac_cv_func_vfork_works=no
fi
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
+
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_vfork_works" >&5
-echo "${ECHO_T}$ac_cv_func_vfork_works" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_vfork_works" >&5
+$as_echo "$ac_cv_func_vfork_works" >&6; }
fi;
if test "x$ac_cv_func_fork_works" = xcross; then
- ac_cv_func_vfork_works=ac_cv_func_vfork
- { echo "$as_me:$LINENO: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&5
-echo "$as_me: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&2;}
+ ac_cv_func_vfork_works=$ac_cv_func_vfork
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&5
+$as_echo "$as_me: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&2;}
fi
if test "x$ac_cv_func_vfork_works" = xyes; then
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_WORKING_VFORK 1
-_ACEOF
+$as_echo "#define HAVE_WORKING_VFORK 1" >>confdefs.h
else
-cat >>confdefs.h <<\_ACEOF
-#define vfork fork
-_ACEOF
+$as_echo "#define vfork fork" >>confdefs.h
fi
if test "x$ac_cv_func_fork_works" = xyes; then
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_WORKING_FORK 1
-_ACEOF
+$as_echo "#define HAVE_WORKING_FORK 1" >>confdefs.h
fi
-echo "$as_me:$LINENO: checking for working strcoll" >&5
-echo $ECHO_N "checking for working strcoll... $ECHO_C" >&6
-if test "${ac_cv_func_strcoll_works+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strcoll" >&5
+$as_echo_n "checking for working strcoll... " >&6; }
+if test "${ac_cv_func_strcoll_works+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
ac_cv_func_strcoll_works=no
else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
$ac_includes_default
int
main ()
{
-exit (strcoll ("abc", "def") >= 0 ||
+return (strcoll ("abc", "def") >= 0 ||
strcoll ("ABC", "DEF") >= 0 ||
strcoll ("123", "456") >= 0)
;
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
+if ac_fn_c_try_run "$LINENO"; then :
ac_cv_func_strcoll_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 )
-ac_cv_func_strcoll_works=no
+ ac_cv_func_strcoll_works=no
fi
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
+
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_strcoll_works" >&5
-echo "${ECHO_T}$ac_cv_func_strcoll_works" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strcoll_works" >&5
+$as_echo "$ac_cv_func_strcoll_works" >&6; }
if test $ac_cv_func_strcoll_works = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRCOLL 1
-_ACEOF
+$as_echo "#define HAVE_STRCOLL 1" >>confdefs.h
fi
-
for ac_func in vprintf
-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
+do :
+ ac_fn_c_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf"
+if test "x$ac_cv_func_vprintf" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-echo "$as_me:$LINENO: checking for _doprnt" >&5
-echo $ECHO_N "checking for _doprnt... $ECHO_C" >&6
-if test "${ac_cv_func__doprnt+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 _doprnt (); 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 _doprnt ();
-/* 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__doprnt) || defined (__stub____doprnt)
-choke me
-#else
-char (*f) () = _doprnt;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != _doprnt;
- ;
- return 0;
-}
+#define HAVE_VPRINTF 1
_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
- ac_cv_func__doprnt=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_func__doprnt=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5
-echo "${ECHO_T}$ac_cv_func__doprnt" >&6
-if test $ac_cv_func__doprnt = yes; then
+ac_fn_c_check_func "$LINENO" "_doprnt" "ac_cv_func__doprnt"
+if test "x$ac_cv_func__doprnt" = x""yes; then :
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DOPRNT 1
-_ACEOF
+$as_echo "#define HAVE_DOPRNT 1" >>confdefs.h
fi
@@ -24301,20 +19392,15 @@ done
if test "x$MINGW32" != "xyes"; then
-echo "$as_me:$LINENO: checking for working vsnprintf" >&5
-echo $ECHO_N "checking for working vsnprintf... $ECHO_C" >&6
-if test "${ac_cv_func_working_vsnprintf+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working vsnprintf" >&5
+$as_echo_n "checking for working vsnprintf... " >&6; }
+if test "${ac_cv_func_working_vsnprintf+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then :
ac_cv_func_working_vsnprintf=no
else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdio.h>
#include <stdarg.h>
@@ -24360,118 +19446,30 @@ main(void)
exit(1);
}
_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
+if ac_fn_c_try_run "$LINENO"; then :
ac_cv_func_working_vsnprintf=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 )
-ac_cv_func_working_vsnprintf=no
+ ac_cv_func_working_vsnprintf=no
fi
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
+
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_working_vsnprintf" >&5
-echo "${ECHO_T}$ac_cv_func_working_vsnprintf" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_working_vsnprintf" >&5
+$as_echo "$ac_cv_func_working_vsnprintf" >&6; }
if test $ac_cv_func_working_vsnprintf = yes; then
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_WORKING_VSNPRINTF 1
-_ACEOF
+$as_echo "#define HAVE_WORKING_VSNPRINTF 1" >>confdefs.h
fi
-
for ac_func in vsnprintf
-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
+do :
+ ac_fn_c_check_func "$LINENO" "vsnprintf" "ac_cv_func_vsnprintf"
+if test "x$ac_cv_func_vsnprintf" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_VSNPRINTF 1
_ACEOF
fi
@@ -24479,129 +19477,34 @@ done
fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
for ac_func in fileno ftime gethostname getpwuid inet_aton \
select snooze strerror strcasecmp strncasecmp \
strlcat strlcpy strstr usleep uname flock \
gethostbyname connect bind getline
-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
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+ if test "x$as_val" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
fi
done
-echo "$as_me:$LINENO: checking for working gettimeofday" >&5
-echo $ECHO_N "checking for working gettimeofday... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working gettimeofday" >&5
+$as_echo_n "checking for working gettimeofday... " >&6; }
templibs="$LIBS"
LIBS=" $LIBS"
-if test "$cross_compiling" = yes; then
- echo "$as_me:$LINENO: result: unknown: cross-compiling" >&5
-echo "${ECHO_T}unknown: cross-compiling" >&6
+if test "$cross_compiling" = yes; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown: cross-compiling" >&5
+$as_echo "unknown: cross-compiling" >&6; }
else
- cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <sys/time.h>
@@ -24698,215 +19601,146 @@ int main(int argc, char **argv)
}
_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
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+if ac_fn_c_try_run "$LINENO"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GETTIMEOFDAY 1
-_ACEOF
+$as_echo "#define HAVE_GETTIMEOFDAY 1" >>confdefs.h
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 )
-echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
+
LIBS="$templibs"
if test $ac_cv_func_gethostbyname = no; then
- echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
-echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
-if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
+$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
+if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lnsl $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 gethostbyname ();
int
main ()
{
-gethostbyname ();
+return gethostbyname ();
;
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
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_nsl_gethostbyname=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_nsl_gethostbyname=no
+ ac_cv_lib_nsl_gethostbyname=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
-echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
-if test $ac_cv_lib_nsl_gethostbyname = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
+$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
+if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
LIBS="-lnsl $LIBS"
fi
fi
if test $ac_cv_func_connect = no; then
- echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
-echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
-if test "${ac_cv_lib_socket_connect+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
+$as_echo_n "checking for connect in -lsocket... " >&6; }
+if test "${ac_cv_lib_socket_connect+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lsocket $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 connect ();
int
main ()
{
-connect ();
+return connect ();
;
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
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_socket_connect=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_socket_connect=no
+ ac_cv_lib_socket_connect=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
-echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
-if test $ac_cv_lib_socket_connect = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
+$as_echo "$ac_cv_lib_socket_connect" >&6; }
+if test "x$ac_cv_lib_socket_connect" = x""yes; then :
LIBS="-lsocket $LIBS"
fi
fi
if test $ac_cv_func_bind = no; then
- echo "$as_me:$LINENO: checking for gethostbyaddr in -lbind" >&5
-echo $ECHO_N "checking for gethostbyaddr in -lbind... $ECHO_C" >&6
-if test "${ac_cv_lib_bind_gethostbyaddr+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyaddr in -lbind" >&5
+$as_echo_n "checking for gethostbyaddr in -lbind... " >&6; }
+if test "${ac_cv_lib_bind_gethostbyaddr+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lbind $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 gethostbyaddr ();
int
main ()
{
-gethostbyaddr ();
+return gethostbyaddr ();
;
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
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_bind_gethostbyaddr=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_bind_gethostbyaddr=no
+ ac_cv_lib_bind_gethostbyaddr=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_bind_gethostbyaddr" >&5
-echo "${ECHO_T}$ac_cv_lib_bind_gethostbyaddr" >&6
-if test $ac_cv_lib_bind_gethostbyaddr = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_gethostbyaddr" >&5
+$as_echo "$ac_cv_lib_bind_gethostbyaddr" >&6; }
+if test "x$ac_cv_lib_bind_gethostbyaddr" = x""yes; then :
LIBS="-lbind $LIBS"
fi
@@ -24914,85 +19748,12 @@ fi
if test "x$MINGW32" != "xyes"; then
-
-for ac_func in fdopen
-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
+ for ac_func in fdopen
+do :
+ ac_fn_c_check_func "$LINENO" "fdopen" "ac_cv_func_fdopen"
+if test "x$ac_cv_func_fdopen" = x""yes; then :
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_FDOPEN 1
_ACEOF
fi
@@ -25002,186 +19763,31 @@ fi
-echo "$as_me:$LINENO: checking for fcntl" >&5
-echo $ECHO_N "checking for fcntl... $ECHO_C" >&6
-if test "${ac_cv_func_fcntl+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 fcntl (); 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 fcntl ();
-/* 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_fcntl) || defined (__stub___fcntl)
-choke me
-#else
-char (*f) () = fcntl;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != fcntl;
- ;
- 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
- ac_cv_func_fcntl=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_fcntl=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_fcntl" >&5
-echo "${ECHO_T}$ac_cv_func_fcntl" >&6
-if test $ac_cv_func_fcntl = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_FCNTL 1
-_ACEOF
+ac_fn_c_check_func "$LINENO" "fcntl" "ac_cv_func_fcntl"
+if test "x$ac_cv_func_fcntl" = x""yes; then :
+$as_echo "#define HAVE_FCNTL 1" >>confdefs.h
-cat >>confdefs.h <<\_ACEOF
-#define NONBLOCKING_SOCKETS 1
-_ACEOF
-else
- echo "$as_me:$LINENO: checking for ioctl" >&5
-echo $ECHO_N "checking for ioctl... $ECHO_C" >&6
-if test "${ac_cv_func_ioctl+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 ioctl (); 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 ioctl ();
-/* 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_ioctl) || defined (__stub___ioctl)
-choke me
-#else
-char (*f) () = ioctl;
-#endif
-#ifdef __cplusplus
-}
-#endif
+$as_echo "#define NONBLOCKING_SOCKETS 1" >>confdefs.h
-int
-main ()
-{
-return f != ioctl;
- ;
- 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
- ac_cv_func_ioctl=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ ac_fn_c_check_func "$LINENO" "ioctl" "ac_cv_func_ioctl"
+if test "x$ac_cv_func_ioctl" = x""yes; then :
-ac_cv_func_ioctl=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_ioctl" >&5
-echo "${ECHO_T}$ac_cv_func_ioctl" >&6
-if test $ac_cv_func_ioctl = yes; then
+$as_echo "#define HAVE_IOCTL 1" >>confdefs.h
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_IOCTL 1
-_ACEOF
-
-cat >>confdefs.h <<\_ACEOF
-#define NONBLOCKING_SOCKETS 1
-_ACEOF
+$as_echo "#define NONBLOCKING_SOCKETS 1" >>confdefs.h
fi
fi
-echo "$as_me:$LINENO: checking for SIGPIPE" >&5
-echo $ECHO_N "checking for SIGPIPE... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SIGPIPE" >&5
+$as_echo_n "checking for SIGPIPE... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <signal.h>
int
@@ -25192,33 +19798,17 @@ signal (SIGPIPE, SIG_IGN)
return 0;
}
_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
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+if ac_fn_c_try_compile "$LINENO"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SIGPIPE 1
-_ACEOF
+$as_echo "#define HAVE_SIGPIPE 1" >>confdefs.h
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
FREECIV_DATADIR="$datadir/freeciv"
@@ -25237,61 +19827,43 @@ fi
CPPFLAGS="$CPPFLAGS -DDEFAULT_DATA_PATH=\"\\\"$DEFAULT_DATA_PATH\\\"\""
if test -n "$WITH_EFENCE"; then
- echo "$as_me:$LINENO: checking for malloc in -lefence" >&5
-echo $ECHO_N "checking for malloc in -lefence... $ECHO_C" >&6
-if test "${ac_cv_lib_efence_malloc+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for malloc in -lefence" >&5
+$as_echo_n "checking for malloc in -lefence... " >&6; }
+if test "${ac_cv_lib_efence_malloc+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lefence $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-/* Override any gcc2 internal prototype to avoid an error. */
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
#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 malloc ();
int
main ()
{
-malloc ();
+return malloc ();
;
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
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_efence_malloc=yes
else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_efence_malloc=no
+ ac_cv_lib_efence_malloc=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_efence_malloc" >&5
-echo "${ECHO_T}$ac_cv_lib_efence_malloc" >&6
-if test $ac_cv_lib_efence_malloc = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_efence_malloc" >&5
+$as_echo "$ac_cv_lib_efence_malloc" >&6; }
+if test "x$ac_cv_lib_efence_malloc" = x""yes; then :
if test "x$LIBS" = "x"; then
LIBS = -lefence
@@ -25302,16 +19874,16 @@ fi
fi
- ac_config_commands="$ac_config_commands fc_default-1"
+ac_config_commands="$ac_config_commands fc_default-1"
- ac_config_commands="$ac_config_commands fc_default-2"
+ac_config_commands="$ac_config_commands fc_default-2"
- ac_config_commands="$ac_config_commands fc_default-4"
+ac_config_commands="$ac_config_commands fc_default-4"
- ac_config_commands="$ac_config_commands fc_default-5"
+ac_config_commands="$ac_config_commands fc_default-5"
CFLAGS="$EXTRA_DEBUG_CFLAGS $CFLAGS"
@@ -25336,13 +19908,13 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
- ac_config_files="$ac_config_files Makefile data/Makefile data/civclient.dsc data/civserver.dsc data/civserver.room data/hex2t/Makefile data/amplio/Makefile data/buildings/Makefile data/flags/Makefile data/misc/Makefile data/trident/Makefile data/isophex/Makefile data/isotrident/Makefile data/stdsounds/Makefile data/default/Makefile data/civ1/Makefile data/civ2/Makefile data/scenario/Makefile data/nation/Makefile data/themes/Makefile data/themes/gui-gtk-2.0/Makefile data/themes/gui-gtk-2.0/Freeciv/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Arrows/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Buttons/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Combo/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Frame-Gap/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Handles/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Lines/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ListHeaders/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Menu-Menubar/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Others/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Panel/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ProgressBar/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Toolbar/Makefile data/themes/gui-sdl/Makefile data/themes/gui-sdl/human/Makefile data/wonders/Makefile data/icons/Makefile utility/Makefile utility/ftwl/Makefile dependencies/Makefile dependencies/lua/Makefile dependencies/tolua/Makefile dependencies/lua/src/Makefile dependencies/lua/src/lib/Makefile common/Makefile common/aicore/Makefile ai/Makefile tests/Makefile win32/Makefile client/Makefile client/agents/Makefile client/include/Makefile client/gui-sdl/Makefile client/gui-gtk-2.0/Makefile client/gui-xaw/Makefile client/gui-win32/Makefile client/gui-ftwl/Makefile client/gui-stub/Makefile server/Makefile server/generator/Makefile server/scripting/Makefile manual/Makefile intl/Makefile po/Makefile.in doc/Makefile doc/man/Makefile doc/ca/Makefile doc/de/Makefile doc/fr/Makefile doc/it/Makefile doc/ja/Makefile doc/nl/Makefile doc/sv/Makefile freeciv.spec:bootstrap/freeciv.spec.in bootstrap/undep.sh data/Freeciv client/freeciv.desktop:bootstrap/freeciv.desktop.in server/freeciv-server.desktop:bootstrap/freeciv-server.desktop.in"
+ac_config_files="$ac_config_files Makefile data/Makefile data/civclient.dsc data/civserver.dsc data/civserver.room data/hex2t/Makefile data/amplio/Makefile data/buildings/Makefile data/flags/Makefile data/misc/Makefile data/trident/Makefile data/isophex/Makefile data/isotrident/Makefile data/stdsounds/Makefile data/default/Makefile data/civ1/Makefile data/civ2/Makefile data/scenario/Makefile data/nation/Makefile data/themes/Makefile data/themes/gui-gtk-2.0/Makefile data/themes/gui-gtk-2.0/Freeciv/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Arrows/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Buttons/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Combo/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Frame-Gap/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Handles/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Lines/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ListHeaders/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Menu-Menubar/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Others/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Panel/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ProgressBar/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/Makefile data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Toolbar/Makefile data/themes/gui-sdl/Makefile data/themes/gui-sdl/human/Makefile data/wonders/Makefile data/icons/Makefile utility/Makefile utility/ftwl/Makefile dependencies/Makefile dependencies/lua/Makefile dependencies/tolua/Makefile dependencies/lua/src/Makefile dependencies/lua/src/lib/Makefile common/Makefile common/aicore/Makefile ai/Makefile tests/Makefile win32/Makefile client/Makefile client/agents/Makefile client/include/Makefile client/gui-sdl/Makefile client/gui-gtk-2.0/Makefile client/gui-xaw/Makefile client/gui-win32/Makefile client/gui-ftwl/Makefile client/gui-stub/Makefile server/Makefile server/generator/Makefile server/scripting/Makefile manual/Makefile intl/Makefile po/Makefile.in doc/Makefile doc/man/Makefile doc/ca/Makefile doc/de/Makefile doc/fr/Makefile doc/it/Makefile doc/ja/Makefile doc/nl/Makefile doc/sv/Makefile freeciv.spec:bootstrap/freeciv.spec.in bootstrap/undep.sh data/Freeciv client/freeciv.desktop:bootstrap/freeciv.desktop.in server/freeciv-server.desktop:bootstrap/freeciv-server.desktop.in"
- ac_config_files="$ac_config_files civ:bootstrap/civ.in"
+ac_config_files="$ac_config_files civ:bootstrap/civ.in"
- ac_config_files="$ac_config_files ser:bootstrap/ser.in"
+ac_config_files="$ac_config_files ser:bootstrap/ser.in"
- ac_config_commands="$ac_config_commands default"
+ac_config_commands="$ac_config_commands default"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -25362,39 +19934,59 @@ _ACEOF
# The following way of writing the cache mishandles newlines in values,
# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
+# So, we kill variables containing newlines.
# Ultrix sh set writes to stderr and can't be redirected directly,
# and sets the high bit in the cache file unless we assign to the vars.
-{
+(
+ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
+ eval ac_val=\$$ac_var
+ case $ac_val in #(
+ *${as_nl}*)
+ case $ac_var in #(
+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+ esac
+ case $ac_var in #(
+ _ | IFS | as_nl) ;; #(
+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+ *) { eval $ac_var=; unset $ac_var;} ;;
+ esac ;;
+ esac
+ done
+
(set) 2>&1 |
- case `(ac_space=' '; set | grep ac_space) 2>&1` in
- *ac_space=\ *)
- # `set' does not quote correctly, so add quotes (double-quote
- # substitution turns \\\\ into \\, and sed turns \\ into \).
+ case $as_nl`(ac_space=' '; set) 2>&1` in #(
+ *${as_nl}ac_space=\ *)
+ # `set' does not quote correctly, so add quotes: double-quote
+ # substitution turns \\\\ into \\, and sed turns \\ into \.
sed -n \
- "s/'/'\\\\''/g;
- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
- ;;
+ "s/'/'\\\\''/g;
+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+ ;; #(
*)
# `set' quotes correctly as required by POSIX, so do not add quotes.
- sed -n \
- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
;;
- esac;
-} |
+ esac |
+ sort
+) |
sed '
+ /^ac_cv_env_/b end
t clear
- : clear
+ :clear
s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
t end
- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
- : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
- if test -w $cache_file; then
- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+ :end' >>confcache
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+ if test -w "$cache_file"; then
+ test "x$cache_file" != "x/dev/null" &&
+ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
cat confcache >$cache_file
else
- echo "not updating unwritable cache $cache_file"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
rm -f confcache
@@ -25403,227 +19995,153 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix
# Let make expand exec_prefix.
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
- ac_vpsub='/^[ ]*VPATH[ ]*=/{
-s/:*\$(srcdir):*/:/;
-s/:*\${srcdir}:*/:/;
-s/:*@srcdir@:*/:/;
-s/^\([^=]*=[ ]*\):*/\1/;
-s/:*$//;
-s/^[^=]*=[ ]*$//;
-}'
-fi
-
DEFS=-DHAVE_CONFIG_H
ac_libobjs=
ac_ltlibobjs=
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
- ac_i=`echo "$ac_i" |
- sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
- # 2. Add them.
- ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
- ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
+ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+ ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
+ # will be set to the directory where LIBOBJS objects are built.
+ as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+ as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
done
LIBOBJS=$ac_libobjs
LTLIBOBJS=$ac_ltlibobjs
-if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
-fi
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+ as_fn_error "conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+ if test -n "$EXEEXT"; then
+ am__EXEEXT_TRUE=
+ am__EXEEXT_FALSE='#'
+else
+ am__EXEEXT_TRUE='#'
+ am__EXEEXT_FALSE=
+fi
+
+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
+ as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${SERVER_TRUE}" && test -z "${SERVER_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"SERVER\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"SERVER\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "conditional \"SERVER\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${CLIENT_TRUE}" && test -z "${CLIENT_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"CLIENT\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"CLIENT\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "conditional \"CLIENT\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${FTWL_TRUE}" && test -z "${FTWL_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"FTWL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"FTWL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "conditional \"FTWL\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${MAKE_DATA_TRUE}" && test -z "${MAKE_DATA_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"MAKE_DATA\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"MAKE_DATA\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "conditional \"MAKE_DATA\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${MAKE_CLIENT_INCLUDE_TRUE}" && test -z "${MAKE_CLIENT_INCLUDE_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"MAKE_CLIENT_INCLUDE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"MAKE_CLIENT_INCLUDE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "conditional \"MAKE_CLIENT_INCLUDE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
+ as_fn_error "conditional \"am__fastdepCXX\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${GGZ_CLIENT_TRUE}" && test -z "${GGZ_CLIENT_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"GGZ_CLIENT\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"GGZ_CLIENT\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "conditional \"GGZ_CLIENT\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${GGZ_GTK_TRUE}" && test -z "${GGZ_GTK_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"GGZ_GTK\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"GGZ_GTK\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "conditional \"GGZ_GTK\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${GGZ_SERVER_TRUE}" && test -z "${GGZ_SERVER_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"GGZ_SERVER\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"GGZ_SERVER\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "conditional \"GGZ_SERVER\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${GGZ_CLIENT_TRUE}" && test -z "${GGZ_CLIENT_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"GGZ_CLIENT\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"GGZ_CLIENT\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "conditional \"GGZ_CLIENT\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${GGZ_GTK_TRUE}" && test -z "${GGZ_GTK_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"GGZ_GTK\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"GGZ_GTK\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "conditional \"GGZ_GTK\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${GGZ_SERVER_TRUE}" && test -z "${GGZ_SERVER_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"GGZ_SERVER\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"GGZ_SERVER\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "conditional \"GGZ_SERVER\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${AUDIO_SDL_TRUE}" && test -z "${AUDIO_SDL_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"AUDIO_SDL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"AUDIO_SDL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "conditional \"AUDIO_SDL\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${CLIENT_GUI_SDL_TRUE}" && test -z "${CLIENT_GUI_SDL_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"CLIENT_GUI_SDL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"CLIENT_GUI_SDL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "conditional \"CLIENT_GUI_SDL\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${CLIENT_GUI_GTK_2_0_TRUE}" && test -z "${CLIENT_GUI_GTK_2_0_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"CLIENT_GUI_GTK_2_0\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"CLIENT_GUI_GTK_2_0\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "conditional \"CLIENT_GUI_GTK_2_0\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${CLIENT_GUI_XAW_TRUE}" && test -z "${CLIENT_GUI_XAW_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"CLIENT_GUI_XAW\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"CLIENT_GUI_XAW\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "conditional \"CLIENT_GUI_XAW\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${CLIENT_GUI_BEOS_TRUE}" && test -z "${CLIENT_GUI_BEOS_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"CLIENT_GUI_BEOS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"CLIENT_GUI_BEOS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "conditional \"CLIENT_GUI_BEOS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${CLIENT_GUI_STUB_TRUE}" && test -z "${CLIENT_GUI_STUB_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"CLIENT_GUI_STUB\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"CLIENT_GUI_STUB\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "conditional \"CLIENT_GUI_STUB\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${CLIENT_GUI_WIN32_TRUE}" && test -z "${CLIENT_GUI_WIN32_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"CLIENT_GUI_WIN32\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"CLIENT_GUI_WIN32\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "conditional \"CLIENT_GUI_WIN32\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${CLIENT_GUI_FTWL_TRUE}" && test -z "${CLIENT_GUI_FTWL_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"CLIENT_GUI_FTWL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"CLIENT_GUI_FTWL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "conditional \"CLIENT_GUI_FTWL\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${FTWL_TRUE}" && test -z "${FTWL_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"FTWL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"FTWL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "conditional \"FTWL\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${FTWL_X11_TRUE}" && test -z "${FTWL_X11_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"FTWL_X11\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"FTWL_X11\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "conditional \"FTWL_X11\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${FTWL_SDL_TRUE}" && test -z "${FTWL_SDL_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"FTWL_SDL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"FTWL_SDL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "conditional \"FTWL_SDL\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${FTWL_OPENGL_TRUE}" && test -z "${FTWL_OPENGL_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"FTWL_OPENGL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"FTWL_OPENGL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "conditional \"FTWL_OPENGL\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${MINGW32_TRUE}" && test -z "${MINGW32_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"MINGW32\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"MINGW32\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "conditional \"MINGW32\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
: ${CONFIG_STATUS=./config.status}
+ac_write_fail=0
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+as_write_fail=0
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
@@ -25633,80 +20151,252 @@ cat >$CONFIG_STATUS <<_ACEOF
debug=false
ac_cs_recheck=false
ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization. ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
emulate sh
NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
- set -o posix
+ setopt NO_GLOB_SUBST
+else
+ case `(set -o) 2>/dev/null` in #(
+ *posix*) :
+ set -o posix ;; #(
+ *) :
+ ;;
+esac
fi
-# Support unset when possible.
-if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
- as_unset=unset
-else
- as_unset=false
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='print -r --'
+ as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='printf %s\n'
+ as_echo_n='printf %s'
+else
+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+ as_echo_n='/usr/ucb/echo -n'
+ else
+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+ as_echo_n_body='eval
+ arg=$1;
+ case $arg in #(
+ *"$as_nl"*)
+ expr "X$arg" : "X\\(.*\\)$as_nl";
+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+ esac;
+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+ '
+ export as_echo_n_body
+ as_echo_n='sh -c $as_echo_n_body as_echo'
+ fi
+ export as_echo_body
+ as_echo='sh -c $as_echo_body as_echo'
fi
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ PATH_SEPARATOR=:
+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+ PATH_SEPARATOR=';'
+ }
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order. Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" "" $as_nl"
+
+# Find who we are. Look in the path if we contain no directory separator.
+case $0 in #((
+ *[\\/]* ) as_myself=$0 ;;
+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+ done
+IFS=$as_save_IFS
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
+ ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+ as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there. '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
PS1='$ '
PS2='> '
PS4='+ '
# NLS nuisances.
-for as_var in \
- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
- LC_TELEPHONE LC_TIME
-do
- if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
- eval $as_var=C; export $as_var
- else
- $as_unset $as_var
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with status $?, using 1 if that was 0.
+as_fn_error ()
+{
+ as_status=$?; test $as_status -eq 0 && as_status=1
+ if test "$3"; then
+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
fi
-done
+ $as_echo "$as_me: error: $1" >&2
+ as_fn_exit $as_status
+} # as_fn_error
+
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+ return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+ set +e
+ as_fn_set_status $1
+ exit $1
+} # as_fn_exit
+
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+ { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+ eval 'as_fn_append ()
+ {
+ eval $1+=\$2
+ }'
+else
+ as_fn_append ()
+ {
+ eval $1=\$$1\$2
+ }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+ eval 'as_fn_arith ()
+ {
+ as_val=$(( $* ))
+ }'
+else
+ as_fn_arith ()
+ {
+ as_val=`expr "$@" || test $? -eq 1`
+ }
+fi # as_fn_arith
+
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
else
as_expr=false
fi
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
as_basename=basename
else
as_basename=false
fi
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+ as_dirname=dirname
+else
+ as_dirname=false
+fi
-# Name of the executable.
-as_me=`$as_basename "$0" ||
+as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)$' \| \
- . : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
- /^X\/\(\/\/\)$/{ s//\1/; q; }
- /^X\/\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
-
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
-# PATH needs CR, and LINENO needs CR and PATH.
# Avoid depending upon Character Ranges.
as_cr_letters='abcdefghijklmnopqrstuvwxyz'
as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
@@ -25714,180 +20404,145 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
as_cr_digits='0123456789'
as_cr_alnum=$as_cr_Letters$as_cr_digits
-# 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
-
-
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x$as_lineno_3" = "x$as_lineno_2" || {
- # Find who we are. Look in the path if we contain no path at all
- # relative or not.
- case $0 in
- *[\\/]* ) as_myself=$0 ;;
- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
- ;;
- esac
- # We did not find ourselves, most probably we were run as `sh COMMAND'
- # in which case we are not to be found in the path.
- if test "x$as_myself" = x; then
- as_myself=$0
- fi
- if test ! -f "$as_myself"; then
- { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
- { (exit 1); exit 1; }; }
- fi
- case $CONFIG_SHELL in
- '')
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for as_base in sh bash ksh sh5; do
- case $as_dir in
- /*)
- if ("$as_dir/$as_base" -c '
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
- CONFIG_SHELL=$as_dir/$as_base
- export CONFIG_SHELL
- exec "$CONFIG_SHELL" "$0" ${1+"$@"}
- fi;;
- esac
- done
-done
-;;
- esac
-
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
- # uniformly replaced by the line number. The first 'sed' inserts a
- # line-number line before each line; the second 'sed' does the real
- # work. The second script uses 'N' to pair each line-number line
- # with the numbered line, and appends trailing '-' during
- # substitution so that $LINENO is not a special case at line end.
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
- sed '=' <$as_myself |
- sed '
- N
- s,$,-,
- : loop
- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
- t loop
- s,-$,,
- s,^['$as_cr_digits']*\n,,
- ' >$as_me.lineno &&
- chmod +x $as_me.lineno ||
- { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
- { (exit 1); exit 1; }; }
-
- # Don't try to exec as it changes $[0], causing all sort of problems
- # (the dirname of $[0] is not the place where we might find the
- # original and so on. Autoconf is especially sensible to this).
- . ./$as_me.lineno
- # Exit status is that of the last command.
- exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
- *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T=' ' ;;
- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
- *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+ case `echo 'xy\c'` in
+ *c*) ECHO_T=' ';; # ECHO_T is single tab character.
+ xy) ECHO_C='\c';;
+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
+ ECHO_T=' ';;
+ esac;;
+*)
+ ECHO_N='-n';;
esac
-if expr a : '\(a\)' >/dev/null 2>&1; then
- as_expr=expr
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+ rm -f conf$$.dir/conf$$.file
else
- as_expr=false
+ rm -f conf$$.dir
+ mkdir conf$$.dir 2>/dev/null
fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
- # We could just check for DJGPP; but this test a) works b) is more generic
- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
- if test -f conf$$.exe; then
- # Don't use ln at all; we don't have any links
- as_ln_s='cp -p'
- else
+if (echo >conf$$.file) 2>/dev/null; then
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
as_ln_s='ln -s'
+ # ... but there are two gotchas:
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+ # In both cases, we have to default to `cp -p'.
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+ as_ln_s='cp -p'
+ elif ln conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s=ln
+ else
+ as_ln_s='cp -p'
fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
else
as_ln_s='cp -p'
fi
-rm -f conf$$ conf$$.exe conf$$.file
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
+ test -d "$as_dir" || eval $as_mkdir_p || {
+ as_dirs=
+ while :; do
+ case $as_dir in #(
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+ *) as_qdir=$as_dir;;
+ esac
+ as_dirs="'$as_qdir' $as_dirs"
+ as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
if mkdir -p . 2>/dev/null; then
- as_mkdir_p=:
+ as_mkdir_p='mkdir -p "$as_dir"'
else
+ test -d ./-p && rmdir ./-p
as_mkdir_p=false
fi
-as_executable_p="test -f"
+if test -x / >/dev/null 2>&1; then
+ as_test_x='test -x'
+else
+ if ls -dL / >/dev/null 2>&1; then
+ as_ls_L_option=L
+ else
+ as_ls_L_option=
+ fi
+ as_test_x='
+ eval sh -c '\''
+ if test -d "$1"; then
+ test -d "$1/.";
+ else
+ case $1 in #(
+ -*)set "./$1";;
+ esac;
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+ ???[sx]*):;;*)false;;esac;fi
+ '\'' sh
+ '
+fi
+as_executable_p=$as_test_x
# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
# Sed expression to map a string onto a valid variable name.
-as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" $as_nl"
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-# CDPATH.
-$as_unset CDPATH
exec 6>&1
-
-# Open the log real soon, to keep \$[0] and so on meaningful, and to
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# Save the log message, to keep $0 and so on meaningful, and to
# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling. Logging --version etc. is OK.
-exec 5>>config.log
-{
- echo
- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-} >&5
-cat >&5 <<_CSEOF
-
+# values after options handling.
+ac_log="
This file was extended by $as_me, which was
-generated by GNU Autoconf 2.57. Invocation command line was
+generated by GNU Autoconf 2.64. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -25895,44 +20550,45 @@ generated by GNU Autoconf 2.57. Invocation command line was
CONFIG_COMMANDS = $CONFIG_COMMANDS
$ $0 $@
-_CSEOF
-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-echo >&5
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
+
_ACEOF
-# Files that config.status was made for.
-if test -n "$ac_config_files"; then
- echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
-fi
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
-if test -n "$ac_config_headers"; then
- echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
-fi
+case $ac_config_headers in *"
+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
+esac
-if test -n "$ac_config_links"; then
- echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
-fi
-if test -n "$ac_config_commands"; then
- echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
-fi
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+# Files that config.status was made for.
+config_files="$ac_config_files"
+config_headers="$ac_config_headers"
+config_commands="$ac_config_commands"
-cat >>$CONFIG_STATUS <<\_ACEOF
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration. Unless the files
+and actions are specified as TAGs, all are instantiated by default.
-Usage: $0 [OPTIONS] [FILE]...
+Usage: $0 [OPTION]... [TAG]...
-h, --help print this help, then exit
- -V, --version print version number, then exit
- -q, --quiet do not print progress messages
+ -V, --version print version number and configuration settings, then exit
+ -q, --quiet, --silent
+ do not print progress messages
-d, --debug don't remove temporary files
--recheck update $as_me by reconfiguring in the same conditions
- --file=FILE[:TEMPLATE]
+ --file=FILE[:TEMPLATE]
instantiate the configuration file FILE
- --header=FILE[:TEMPLATE]
+ --header=FILE[:TEMPLATE]
instantiate the configuration header FILE
Configuration files:
@@ -25944,85 +20600,83 @@ $config_headers
Configuration commands:
$config_commands
-Report bugs to <bug-autoconf at gnu.org>."
-_ACEOF
+Report bugs to the package provider."
-cat >>$CONFIG_STATUS <<_ACEOF
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
config.status
-configured by $0, generated by GNU Autoconf 2.57,
- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.64,
+ with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-srcdir=$srcdir
-INSTALL="$INSTALL"
+
+ac_pwd='$ac_pwd'
+srcdir='$srcdir'
+INSTALL='$INSTALL'
+MKDIR_P='$MKDIR_P'
+AWK='$AWK'
+test -n "\$AWK" || AWK=awk
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value. By we need to know if files were specified by the user.
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
ac_need_defaults=:
while test $# != 0
do
case $1 in
--*=*)
- ac_option=`expr "x$1" : 'x\([^=]*\)='`
- ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
+ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
ac_shift=:
;;
- -*)
+ *)
ac_option=$1
ac_optarg=$2
ac_shift=shift
;;
- *) # This is not an option, so the user has probably given explicit
- # arguments.
- ac_option=$1
- ac_need_defaults=false;;
esac
case $ac_option in
# Handling of the options.
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
ac_cs_recheck=: ;;
- --version | --vers* | -V )
- echo "$ac_cs_version"; exit 0 ;;
- --he | --h)
- # Conflict between --help and --header
- { { echo "$as_me:$LINENO: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2;}
- { (exit 1); exit 1; }; };;
- --help | --hel | -h )
- echo "$ac_cs_usage"; exit 0 ;;
- --debug | --d* | -d )
+ --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+ $as_echo "$ac_cs_version"; exit ;;
+ --debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
$ac_shift
- CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+ case $ac_optarg in
+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ esac
+ as_fn_append CONFIG_FILES " '$ac_optarg'"
ac_need_defaults=false;;
--header | --heade | --head | --hea )
$ac_shift
- CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+ case $ac_optarg in
+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ esac
+ as_fn_append CONFIG_HEADERS " '$ac_optarg'"
ac_need_defaults=false;;
+ --he | --h)
+ # Conflict between --help and --header
+ as_fn_error "ambiguous option: \`$1'
+Try \`$0 --help' for more information.";;
+ --help | --hel | -h )
+ $as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil | --si | --s)
ac_cs_silent=: ;;
# This is an error.
- -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2;}
- { (exit 1); exit 1; }; } ;;
+ -*) as_fn_error "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
- *) ac_config_targets="$ac_config_targets $1" ;;
+ *) as_fn_append ac_config_targets " $1"
+ ac_need_defaults=false ;;
esac
shift
@@ -26036,19 +20690,32 @@ if $ac_cs_silent; then
fi
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
if \$ac_cs_recheck; then
- echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
- exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ shift
+ \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+ CONFIG_SHELL='$SHELL'
+ export CONFIG_SHELL
+ exec "\$@"
fi
_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+exec 5>>config.log
+{
+ echo
+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+ $as_echo "$ac_log"
+} >&5
-cat >>$CONFIG_STATUS <<_ACEOF
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
#
-# INIT-COMMANDS section.
+# INIT-COMMANDS
#
-
AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
@@ -26059,115 +20726,114 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<\_ACEOF
+# Handling of arguments.
for ac_config_target in $ac_config_targets
do
- case "$ac_config_target" in
- # Handling of arguments.
- "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
- "data/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
- "data/civclient.dsc" ) CONFIG_FILES="$CONFIG_FILES data/civclient.dsc" ;;
- "data/civserver.dsc" ) CONFIG_FILES="$CONFIG_FILES data/civserver.dsc" ;;
- "data/civserver.room" ) CONFIG_FILES="$CONFIG_FILES data/civserver.room" ;;
- "data/hex2t/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/hex2t/Makefile" ;;
- "data/amplio/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/amplio/Makefile" ;;
- "data/buildings/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/buildings/Makefile" ;;
- "data/flags/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/flags/Makefile" ;;
- "data/misc/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/misc/Makefile" ;;
- "data/trident/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/trident/Makefile" ;;
- "data/isophex/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/isophex/Makefile" ;;
- "data/isotrident/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/isotrident/Makefile" ;;
- "data/stdsounds/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/stdsounds/Makefile" ;;
- "data/default/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/default/Makefile" ;;
- "data/civ1/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/civ1/Makefile" ;;
- "data/civ2/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/civ2/Makefile" ;;
- "data/scenario/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/scenario/Makefile" ;;
- "data/nation/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/nation/Makefile" ;;
- "data/themes/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/themes/Makefile" ;;
- "data/themes/gui-gtk-2.0/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Makefile" ;;
- "data/themes/gui-gtk-2.0/Freeciv/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/Makefile" ;;
- "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Makefile" ;;
- "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Arrows/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Arrows/Makefile" ;;
- "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Buttons/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Buttons/Makefile" ;;
- "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/Makefile" ;;
- "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Combo/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Combo/Makefile" ;;
- "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Frame-Gap/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Frame-Gap/Makefile" ;;
- "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Handles/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Handles/Makefile" ;;
- "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Lines/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Lines/Makefile" ;;
- "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ListHeaders/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ListHeaders/Makefile" ;;
- "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Menu-Menubar/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Menu-Menubar/Makefile" ;;
- "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Others/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Others/Makefile" ;;
- "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Panel/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Panel/Makefile" ;;
- "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ProgressBar/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ProgressBar/Makefile" ;;
- "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range/Makefile" ;;
- "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/Makefile" ;;
- "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows/Makefile" ;;
- "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin/Makefile" ;;
- "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/Makefile" ;;
- "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Toolbar/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Toolbar/Makefile" ;;
- "data/themes/gui-sdl/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/themes/gui-sdl/Makefile" ;;
- "data/themes/gui-sdl/human/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/themes/gui-sdl/human/Makefile" ;;
- "data/wonders/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/wonders/Makefile" ;;
- "data/icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/icons/Makefile" ;;
- "utility/Makefile" ) CONFIG_FILES="$CONFIG_FILES utility/Makefile" ;;
- "utility/ftwl/Makefile" ) CONFIG_FILES="$CONFIG_FILES utility/ftwl/Makefile" ;;
- "dependencies/Makefile" ) CONFIG_FILES="$CONFIG_FILES dependencies/Makefile" ;;
- "dependencies/lua/Makefile" ) CONFIG_FILES="$CONFIG_FILES dependencies/lua/Makefile" ;;
- "dependencies/tolua/Makefile" ) CONFIG_FILES="$CONFIG_FILES dependencies/tolua/Makefile" ;;
- "dependencies/lua/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES dependencies/lua/src/Makefile" ;;
- "dependencies/lua/src/lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES dependencies/lua/src/lib/Makefile" ;;
- "common/Makefile" ) CONFIG_FILES="$CONFIG_FILES common/Makefile" ;;
- "common/aicore/Makefile" ) CONFIG_FILES="$CONFIG_FILES common/aicore/Makefile" ;;
- "ai/Makefile" ) CONFIG_FILES="$CONFIG_FILES ai/Makefile" ;;
- "tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
- "win32/Makefile" ) CONFIG_FILES="$CONFIG_FILES win32/Makefile" ;;
- "client/Makefile" ) CONFIG_FILES="$CONFIG_FILES client/Makefile" ;;
- "client/agents/Makefile" ) CONFIG_FILES="$CONFIG_FILES client/agents/Makefile" ;;
- "client/include/Makefile" ) CONFIG_FILES="$CONFIG_FILES client/include/Makefile" ;;
- "client/gui-sdl/Makefile" ) CONFIG_FILES="$CONFIG_FILES client/gui-sdl/Makefile" ;;
- "client/gui-gtk-2.0/Makefile" ) CONFIG_FILES="$CONFIG_FILES client/gui-gtk-2.0/Makefile" ;;
- "client/gui-xaw/Makefile" ) CONFIG_FILES="$CONFIG_FILES client/gui-xaw/Makefile" ;;
- "client/gui-win32/Makefile" ) CONFIG_FILES="$CONFIG_FILES client/gui-win32/Makefile" ;;
- "client/gui-ftwl/Makefile" ) CONFIG_FILES="$CONFIG_FILES client/gui-ftwl/Makefile" ;;
- "client/gui-stub/Makefile" ) CONFIG_FILES="$CONFIG_FILES client/gui-stub/Makefile" ;;
- "server/Makefile" ) CONFIG_FILES="$CONFIG_FILES server/Makefile" ;;
- "server/generator/Makefile" ) CONFIG_FILES="$CONFIG_FILES server/generator/Makefile" ;;
- "server/scripting/Makefile" ) CONFIG_FILES="$CONFIG_FILES server/scripting/Makefile" ;;
- "manual/Makefile" ) CONFIG_FILES="$CONFIG_FILES manual/Makefile" ;;
- "intl/Makefile" ) CONFIG_FILES="$CONFIG_FILES intl/Makefile" ;;
- "po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
- "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
- "doc/man/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/man/Makefile" ;;
- "doc/ca/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/ca/Makefile" ;;
- "doc/de/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/de/Makefile" ;;
- "doc/fr/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/fr/Makefile" ;;
- "doc/it/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/it/Makefile" ;;
- "doc/ja/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/ja/Makefile" ;;
- "doc/nl/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/nl/Makefile" ;;
- "doc/sv/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/sv/Makefile" ;;
- "freeciv.spec" ) CONFIG_FILES="$CONFIG_FILES freeciv.spec:bootstrap/freeciv.spec.in" ;;
- "bootstrap/undep.sh" ) CONFIG_FILES="$CONFIG_FILES bootstrap/undep.sh" ;;
- "data/Freeciv" ) CONFIG_FILES="$CONFIG_FILES data/Freeciv" ;;
- "client/freeciv.desktop" ) CONFIG_FILES="$CONFIG_FILES client/freeciv.desktop:bootstrap/freeciv.desktop.in" ;;
- "server/freeciv-server.desktop" ) CONFIG_FILES="$CONFIG_FILES server/freeciv-server.desktop:bootstrap/freeciv-server.desktop.in" ;;
- "civ" ) CONFIG_FILES="$CONFIG_FILES civ:bootstrap/civ.in" ;;
- "ser" ) CONFIG_FILES="$CONFIG_FILES ser:bootstrap/ser.in" ;;
- "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
- "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
- "fc_default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS fc_default-1" ;;
- "fc_default-2" ) CONFIG_COMMANDS="$CONFIG_COMMANDS fc_default-2" ;;
- "fc_default-4" ) CONFIG_COMMANDS="$CONFIG_COMMANDS fc_default-4" ;;
- "fc_default-5" ) CONFIG_COMMANDS="$CONFIG_COMMANDS fc_default-5" ;;
- "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
- "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
- *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
- { (exit 1); exit 1; }; };;
+ case $ac_config_target in
+ "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+ "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+ "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
+ "fc_default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS fc_default-1" ;;
+ "fc_default-2") CONFIG_COMMANDS="$CONFIG_COMMANDS fc_default-2" ;;
+ "fc_default-4") CONFIG_COMMANDS="$CONFIG_COMMANDS fc_default-4" ;;
+ "fc_default-5") CONFIG_COMMANDS="$CONFIG_COMMANDS fc_default-5" ;;
+ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+ "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
+ "data/civclient.dsc") CONFIG_FILES="$CONFIG_FILES data/civclient.dsc" ;;
+ "data/civserver.dsc") CONFIG_FILES="$CONFIG_FILES data/civserver.dsc" ;;
+ "data/civserver.room") CONFIG_FILES="$CONFIG_FILES data/civserver.room" ;;
+ "data/hex2t/Makefile") CONFIG_FILES="$CONFIG_FILES data/hex2t/Makefile" ;;
+ "data/amplio/Makefile") CONFIG_FILES="$CONFIG_FILES data/amplio/Makefile" ;;
+ "data/buildings/Makefile") CONFIG_FILES="$CONFIG_FILES data/buildings/Makefile" ;;
+ "data/flags/Makefile") CONFIG_FILES="$CONFIG_FILES data/flags/Makefile" ;;
+ "data/misc/Makefile") CONFIG_FILES="$CONFIG_FILES data/misc/Makefile" ;;
+ "data/trident/Makefile") CONFIG_FILES="$CONFIG_FILES data/trident/Makefile" ;;
+ "data/isophex/Makefile") CONFIG_FILES="$CONFIG_FILES data/isophex/Makefile" ;;
+ "data/isotrident/Makefile") CONFIG_FILES="$CONFIG_FILES data/isotrident/Makefile" ;;
+ "data/stdsounds/Makefile") CONFIG_FILES="$CONFIG_FILES data/stdsounds/Makefile" ;;
+ "data/default/Makefile") CONFIG_FILES="$CONFIG_FILES data/default/Makefile" ;;
+ "data/civ1/Makefile") CONFIG_FILES="$CONFIG_FILES data/civ1/Makefile" ;;
+ "data/civ2/Makefile") CONFIG_FILES="$CONFIG_FILES data/civ2/Makefile" ;;
+ "data/scenario/Makefile") CONFIG_FILES="$CONFIG_FILES data/scenario/Makefile" ;;
+ "data/nation/Makefile") CONFIG_FILES="$CONFIG_FILES data/nation/Makefile" ;;
+ "data/themes/Makefile") CONFIG_FILES="$CONFIG_FILES data/themes/Makefile" ;;
+ "data/themes/gui-gtk-2.0/Makefile") CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Makefile" ;;
+ "data/themes/gui-gtk-2.0/Freeciv/Makefile") CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/Makefile" ;;
+ "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Makefile") CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Makefile" ;;
+ "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Arrows/Makefile") CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Arrows/Makefile" ;;
+ "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Buttons/Makefile") CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Buttons/Makefile" ;;
+ "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/Makefile") CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/Makefile" ;;
+ "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Combo/Makefile") CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Combo/Makefile" ;;
+ "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Frame-Gap/Makefile") CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Frame-Gap/Makefile" ;;
+ "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Handles/Makefile") CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Handles/Makefile" ;;
+ "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Lines/Makefile") CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Lines/Makefile" ;;
+ "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ListHeaders/Makefile") CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ListHeaders/Makefile" ;;
+ "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Menu-Menubar/Makefile") CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Menu-Menubar/Makefile" ;;
+ "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Others/Makefile") CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Others/Makefile" ;;
+ "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Panel/Makefile") CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Panel/Makefile" ;;
+ "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ProgressBar/Makefile") CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ProgressBar/Makefile" ;;
+ "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range/Makefile") CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range/Makefile" ;;
+ "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/Makefile") CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/Makefile" ;;
+ "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows/Makefile") CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows/Makefile" ;;
+ "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin/Makefile") CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin/Makefile" ;;
+ "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/Makefile") CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/Makefile" ;;
+ "data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Toolbar/Makefile") CONFIG_FILES="$CONFIG_FILES data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Toolbar/Makefile" ;;
+ "data/themes/gui-sdl/Makefile") CONFIG_FILES="$CONFIG_FILES data/themes/gui-sdl/Makefile" ;;
+ "data/themes/gui-sdl/human/Makefile") CONFIG_FILES="$CONFIG_FILES data/themes/gui-sdl/human/Makefile" ;;
+ "data/wonders/Makefile") CONFIG_FILES="$CONFIG_FILES data/wonders/Makefile" ;;
+ "data/icons/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/Makefile" ;;
+ "utility/Makefile") CONFIG_FILES="$CONFIG_FILES utility/Makefile" ;;
+ "utility/ftwl/Makefile") CONFIG_FILES="$CONFIG_FILES utility/ftwl/Makefile" ;;
+ "dependencies/Makefile") CONFIG_FILES="$CONFIG_FILES dependencies/Makefile" ;;
+ "dependencies/lua/Makefile") CONFIG_FILES="$CONFIG_FILES dependencies/lua/Makefile" ;;
+ "dependencies/tolua/Makefile") CONFIG_FILES="$CONFIG_FILES dependencies/tolua/Makefile" ;;
+ "dependencies/lua/src/Makefile") CONFIG_FILES="$CONFIG_FILES dependencies/lua/src/Makefile" ;;
+ "dependencies/lua/src/lib/Makefile") CONFIG_FILES="$CONFIG_FILES dependencies/lua/src/lib/Makefile" ;;
+ "common/Makefile") CONFIG_FILES="$CONFIG_FILES common/Makefile" ;;
+ "common/aicore/Makefile") CONFIG_FILES="$CONFIG_FILES common/aicore/Makefile" ;;
+ "ai/Makefile") CONFIG_FILES="$CONFIG_FILES ai/Makefile" ;;
+ "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
+ "win32/Makefile") CONFIG_FILES="$CONFIG_FILES win32/Makefile" ;;
+ "client/Makefile") CONFIG_FILES="$CONFIG_FILES client/Makefile" ;;
+ "client/agents/Makefile") CONFIG_FILES="$CONFIG_FILES client/agents/Makefile" ;;
+ "client/include/Makefile") CONFIG_FILES="$CONFIG_FILES client/include/Makefile" ;;
+ "client/gui-sdl/Makefile") CONFIG_FILES="$CONFIG_FILES client/gui-sdl/Makefile" ;;
+ "client/gui-gtk-2.0/Makefile") CONFIG_FILES="$CONFIG_FILES client/gui-gtk-2.0/Makefile" ;;
+ "client/gui-xaw/Makefile") CONFIG_FILES="$CONFIG_FILES client/gui-xaw/Makefile" ;;
+ "client/gui-win32/Makefile") CONFIG_FILES="$CONFIG_FILES client/gui-win32/Makefile" ;;
+ "client/gui-ftwl/Makefile") CONFIG_FILES="$CONFIG_FILES client/gui-ftwl/Makefile" ;;
+ "client/gui-stub/Makefile") CONFIG_FILES="$CONFIG_FILES client/gui-stub/Makefile" ;;
+ "server/Makefile") CONFIG_FILES="$CONFIG_FILES server/Makefile" ;;
+ "server/generator/Makefile") CONFIG_FILES="$CONFIG_FILES server/generator/Makefile" ;;
+ "server/scripting/Makefile") CONFIG_FILES="$CONFIG_FILES server/scripting/Makefile" ;;
+ "manual/Makefile") CONFIG_FILES="$CONFIG_FILES manual/Makefile" ;;
+ "intl/Makefile") CONFIG_FILES="$CONFIG_FILES intl/Makefile" ;;
+ "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
+ "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
+ "doc/man/Makefile") CONFIG_FILES="$CONFIG_FILES doc/man/Makefile" ;;
+ "doc/ca/Makefile") CONFIG_FILES="$CONFIG_FILES doc/ca/Makefile" ;;
+ "doc/de/Makefile") CONFIG_FILES="$CONFIG_FILES doc/de/Makefile" ;;
+ "doc/fr/Makefile") CONFIG_FILES="$CONFIG_FILES doc/fr/Makefile" ;;
+ "doc/it/Makefile") CONFIG_FILES="$CONFIG_FILES doc/it/Makefile" ;;
+ "doc/ja/Makefile") CONFIG_FILES="$CONFIG_FILES doc/ja/Makefile" ;;
+ "doc/nl/Makefile") CONFIG_FILES="$CONFIG_FILES doc/nl/Makefile" ;;
+ "doc/sv/Makefile") CONFIG_FILES="$CONFIG_FILES doc/sv/Makefile" ;;
+ "freeciv.spec") CONFIG_FILES="$CONFIG_FILES freeciv.spec:bootstrap/freeciv.spec.in" ;;
+ "bootstrap/undep.sh") CONFIG_FILES="$CONFIG_FILES bootstrap/undep.sh" ;;
+ "data/Freeciv") CONFIG_FILES="$CONFIG_FILES data/Freeciv" ;;
+ "client/freeciv.desktop") CONFIG_FILES="$CONFIG_FILES client/freeciv.desktop:bootstrap/freeciv.desktop.in" ;;
+ "server/freeciv-server.desktop") CONFIG_FILES="$CONFIG_FILES server/freeciv-server.desktop:bootstrap/freeciv-server.desktop.in" ;;
+ "civ") CONFIG_FILES="$CONFIG_FILES civ:bootstrap/civ.in" ;;
+ "ser") CONFIG_FILES="$CONFIG_FILES ser:bootstrap/ser.in" ;;
+ "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
+
+ *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
done
+
# If the user did not use the arguments to specify the items to instantiate,
# then the envvar interface is used. Set only those that are not.
# We use the long form for the default assignment because of an extremely
@@ -26179,848 +20845,669 @@ if $ac_need_defaults; then
fi
# Have a temporary directory for convenience. Make it in the build tree
-# simply because there is no reason to put it here, and in addition,
+# simply because there is no reason against having it here, and in addition,
# creating and moving files from /tmp can sometimes cause problems.
-# Create a temporary directory, and hook for its removal unless debugging.
+# Hook for its removal unless debugging.
+# Note that there is a small window in which the directory will not be cleaned:
+# after its creation but before its name has been assigned to `$tmp'.
$debug ||
{
- trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
- trap '{ (exit 1); exit 1; }' 1 2 13 15
+ tmp=
+ trap 'exit_status=$?
+ { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+' 0
+ trap 'as_fn_exit 1' 1 2 13 15
}
-
# Create a (secure) tmp directory for tmp files.
{
- tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
+ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
test -n "$tmp" && test -d "$tmp"
} ||
{
- tmp=./confstat$$-$RANDOM
- (umask 077 && mkdir $tmp)
-} ||
+ tmp=./conf$$-$RANDOM
+ (umask 077 && mkdir "$tmp")
+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
+
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
+if test -n "$CONFIG_FILES"; then
+
+
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+ eval ac_cr=\$\'\\r\'
+fi
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+ ac_cs_awk_cr='\r'
+else
+ ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
+_ACEOF
+
+
{
- echo "$me: cannot create a temporary directory in ." >&2
- { (exit 1); exit 1; }
+ echo "cat >conf$$subs.awk <<_ACEOF" &&
+ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+ echo "_ACEOF"
+} >conf$$subs.sh ||
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+ . ./conf$$subs.sh ||
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+
+ ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+ if test $ac_delim_n = $ac_delim_num; then
+ break
+ elif $ac_last_try; then
+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+ else
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+ fi
+done
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\).*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\).*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+ N
+ s/\n//
}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+ for (key in S) S_is_set[key] = 1
+ FS = ""
+}
+{
+ line = $ 0
+ nfields = split(line, field, "@")
+ substed = 0
+ len = length(field[1])
+ for (i = 2; i < nfields; i++) {
+ key = field[i]
+ keylen = length(key)
+ if (S_is_set[key]) {
+ value = S[key]
+ line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+ len += length(value) + length(field[++i])
+ substed = 1
+ } else
+ len += 1 + keylen
+ }
+
+ print line
+}
+
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+ cat
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+ || as_fn_error "could not setup config files machinery" "$LINENO" 5
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
+if test "x$srcdir" = x.; then
+ ac_vpsub='/^[ ]*VPATH[ ]*=/{
+s/:*\$(srcdir):*/:/
+s/:*\${srcdir}:*/:/
+s/:*@srcdir@:*/:/
+s/^\([^=]*=[ ]*\):*/\1/
+s/:*$//
+s/^[^=]*=[ ]*$//
+}'
+fi
-#
-# CONFIG_FILES section.
-#
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+fi # test -n "$CONFIG_FILES"
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "\$CONFIG_FILES"; then
- # Protect against being on the right side of a sed subst in config.status.
- sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
- s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
-s, at SHELL@,$SHELL,;t t
-s, at PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
-s, at PACKAGE_NAME@,$PACKAGE_NAME,;t t
-s, at PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
-s, at PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
-s, at PACKAGE_STRING@,$PACKAGE_STRING,;t t
-s, at PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
-s, at exec_prefix@,$exec_prefix,;t t
-s, at prefix@,$prefix,;t t
-s, at program_transform_name@,$program_transform_name,;t t
-s, at bindir@,$bindir,;t t
-s, at sbindir@,$sbindir,;t t
-s, at libexecdir@,$libexecdir,;t t
-s, at datadir@,$datadir,;t t
-s, at sysconfdir@,$sysconfdir,;t t
-s, at sharedstatedir@,$sharedstatedir,;t t
-s, at localstatedir@,$localstatedir,;t t
-s, at libdir@,$libdir,;t t
-s, at includedir@,$includedir,;t t
-s, at oldincludedir@,$oldincludedir,;t t
-s, at infodir@,$infodir,;t t
-s, at mandir@,$mandir,;t t
-s, at build_alias@,$build_alias,;t t
-s, at host_alias@,$host_alias,;t t
-s, at target_alias@,$target_alias,;t t
-s, at DEFS@,$DEFS,;t t
-s, at ECHO_C@,$ECHO_C,;t t
-s, at ECHO_N@,$ECHO_N,;t t
-s, at ECHO_T@,$ECHO_T,;t t
-s, at LIBS@,$LIBS,;t t
-s, at build@,$build,;t t
-s, at build_cpu@,$build_cpu,;t t
-s, at build_vendor@,$build_vendor,;t t
-s, at build_os@,$build_os,;t t
-s, at host@,$host,;t t
-s, at host_cpu@,$host_cpu,;t t
-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_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
-s, at PACKAGE@,$PACKAGE,;t t
-s, at VERSION@,$VERSION,;t t
-s, at ACLOCAL@,$ACLOCAL,;t t
-s, at AUTOCONF@,$AUTOCONF,;t t
-s, at AUTOMAKE@,$AUTOMAKE,;t t
-s, at AUTOHEADER@,$AUTOHEADER,;t t
-s, at MAKEINFO@,$MAKEINFO,;t t
-s, at AMTAR@,$AMTAR,;t t
-s, at install_sh@,$install_sh,;t t
-s, at STRIP@,$STRIP,;t t
-s, at ac_ct_STRIP@,$ac_ct_STRIP,;t t
-s, at INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
-s, at AWK@,$AWK,;t t
-s, at SET_MAKE@,$SET_MAKE,;t t
-s, at MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
-s, at MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
-s, at MAINT@,$MAINT,;t t
-s, at CC@,$CC,;t t
-s, at CFLAGS@,$CFLAGS,;t t
-s, at LDFLAGS@,$LDFLAGS,;t t
-s, at CPPFLAGS@,$CPPFLAGS,;t t
-s, at ac_ct_CC@,$ac_ct_CC,;t t
-s, at EXEEXT@,$EXEEXT,;t t
-s, at OBJEXT@,$OBJEXT,;t t
-s, at DEPDIR@,$DEPDIR,;t t
-s, at am__include@,$am__include,;t t
-s, at am__quote@,$am__quote,;t t
-s, at AMDEP_TRUE@,$AMDEP_TRUE,;t t
-s, at AMDEP_FALSE@,$AMDEP_FALSE,;t t
-s, at AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
-s, at CCDEPMODE@,$CCDEPMODE,;t t
-s, at CPP@,$CPP,;t t
-s, at EGREP@,$EGREP,;t t
-s, at AUTH_CFLAGS@,$AUTH_CFLAGS,;t t
-s, at AUTH_LIBS@,$AUTH_LIBS,;t t
-s, at SERVER_TRUE@,$SERVER_TRUE,;t t
-s, at SERVER_FALSE@,$SERVER_FALSE,;t t
-s, at CLIENT_TRUE@,$CLIENT_TRUE,;t t
-s, at CLIENT_FALSE@,$CLIENT_FALSE,;t t
-s, at FTWL_TRUE@,$FTWL_TRUE,;t t
-s, at FTWL_FALSE@,$FTWL_FALSE,;t t
-s, at MAKE_DATA_TRUE@,$MAKE_DATA_TRUE,;t t
-s, at MAKE_DATA_FALSE@,$MAKE_DATA_FALSE,;t t
-s, at MAKE_CLIENT_INCLUDE_TRUE@,$MAKE_CLIENT_INCLUDE_TRUE,;t t
-s, at MAKE_CLIENT_INCLUDE_FALSE@,$MAKE_CLIENT_INCLUDE_FALSE,;t t
-s, at CXX@,$CXX,;t t
-s, at CXXFLAGS@,$CXXFLAGS,;t t
-s, at ac_ct_CXX@,$ac_ct_CXX,;t t
-s, at CXXDEPMODE@,$CXXDEPMODE,;t t
-s, at LN_S@,$LN_S,;t t
-s, at RANLIB@,$RANLIB,;t t
-s, at ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
-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
-s, at USE_NLS@,$USE_NLS,;t t
-s, at MSGFMT@,$MSGFMT,;t t
-s, at GMSGFMT@,$GMSGFMT,;t t
-s, at XGETTEXT@,$XGETTEXT,;t t
-s, at INTLBISON@,$INTLBISON,;t t
-s, at BUILD_INCLUDED_LIBINTL@,$BUILD_INCLUDED_LIBINTL,;t t
-s, at USE_INCLUDED_LIBINTL@,$USE_INCLUDED_LIBINTL,;t t
-s, at CATALOGS@,$CATALOGS,;t t
-s, at CATOBJEXT@,$CATOBJEXT,;t t
-s, at GMOFILES@,$GMOFILES,;t t
-s, at INTLLIBS@,$INTLLIBS,;t t
-s, at INTLOBJS@,$INTLOBJS,;t t
-s, at POFILES@,$POFILES,;t t
-s, at POSUB@,$POSUB,;t t
-s, at DATADIRNAME@,$DATADIRNAME,;t t
-s, at INSTOBJEXT@,$INSTOBJEXT,;t t
-s, at GENCAT@,$GENCAT,;t t
-s, at MKINSTALLDIRS@,$MKINSTALLDIRS,;t t
-s, at INTL_LIBTOOL_SUFFIX_PREFIX@,$INTL_LIBTOOL_SUFFIX_PREFIX,;t t
-s, at AUTO_DEPS@,$AUTO_DEPS,;t t
-s, at WINDRES@,$WINDRES,;t t
-s, at ac_ct_WINDRES@,$ac_ct_WINDRES,;t t
-s, at GZIP@,$GZIP,;t t
-s, at PKG_CONFIG@,$PKG_CONFIG,;t t
-s, at GTK_CFLAGS@,$GTK_CFLAGS,;t t
-s, at GTK_LIBS@,$GTK_LIBS,;t t
-s, at SDL_CONFIG@,$SDL_CONFIG,;t t
-s, at SDL_CFLAGS@,$SDL_CFLAGS,;t t
-s, at SDL_LIBS@,$SDL_LIBS,;t t
-s, at FT2_CONFIG@,$FT2_CONFIG,;t t
-s, at FT2_CFLAGS@,$FT2_CFLAGS,;t t
-s, at FT2_LIBS@,$FT2_LIBS,;t t
-s, at X_CFLAGS@,$X_CFLAGS,;t t
-s, at X_PRE_LIBS@,$X_PRE_LIBS,;t t
-s, at X_LIBS@,$X_LIBS,;t t
-s, at X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
-s, at ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
-s, at PNG_CFLAGS@,$PNG_CFLAGS,;t t
-s, at PNG_LIBS@,$PNG_LIBS,;t t
-s, at libggz_libraries@,$libggz_libraries,;t t
-s, at libggz_includes@,$libggz_includes,;t t
-s, at LIBGGZ_INCLUDES@,$LIBGGZ_INCLUDES,;t t
-s, at LIBGGZ_LDFLAGS@,$LIBGGZ_LDFLAGS,;t t
-s, at LIB_GGZ@,$LIB_GGZ,;t t
-s, at ggzmod_libraries@,$ggzmod_libraries,;t t
-s, at ggzmod_includes@,$ggzmod_includes,;t t
-s, at GGZMOD_INCLUDES@,$GGZMOD_INCLUDES,;t t
-s, at GGZMOD_LDFLAGS@,$GGZMOD_LDFLAGS,;t t
-s, at LIB_GGZMOD@,$LIB_GGZMOD,;t t
-s, at GGZ_CONFIG@,$GGZ_CONFIG,;t t
-s, at ggzexecmoddir@,$ggzexecmoddir,;t t
-s, at ggzdatadir@,$ggzdatadir,;t t
-s, at ggz_config@,$ggz_config,;t t
-s, at ggzmoduleconfdir@,$ggzmoduleconfdir,;t t
-s, at packagesrcdir@,$packagesrcdir,;t t
-s, at ggz_gtk_libraries@,$ggz_gtk_libraries,;t t
-s, at ggz_gtk_includes@,$ggz_gtk_includes,;t t
-s, at GGZ_GTK_INCLUDES@,$GGZ_GTK_INCLUDES,;t t
-s, at GGZ_GTK_LDFLAGS@,$GGZ_GTK_LDFLAGS,;t t
-s, at LIB_GGZ_GTK@,$LIB_GGZ_GTK,;t t
-s, at GGZ_CLIENT_TRUE@,$GGZ_CLIENT_TRUE,;t t
-s, at GGZ_CLIENT_FALSE@,$GGZ_CLIENT_FALSE,;t t
-s, at GGZ_GTK_TRUE@,$GGZ_GTK_TRUE,;t t
-s, at GGZ_GTK_FALSE@,$GGZ_GTK_FALSE,;t t
-s, at ggzdmod_libraries@,$ggzdmod_libraries,;t t
-s, at ggzdmod_includes@,$ggzdmod_includes,;t t
-s, at GGZDMOD_INCLUDES@,$GGZDMOD_INCLUDES,;t t
-s, at GGZDMOD_LDFLAGS@,$GGZDMOD_LDFLAGS,;t t
-s, at LIB_GGZDMOD@,$LIB_GGZDMOD,;t t
-s, at ggzdconfdir@,$ggzdconfdir,;t t
-s, at ggzddatadir@,$ggzddatadir,;t t
-s, at ggzdexecmoddir@,$ggzdexecmoddir,;t t
-s, at ggzdexecmodpath@,$ggzdexecmodpath,;t t
-s, at GGZ_SERVER_TRUE@,$GGZ_SERVER_TRUE,;t t
-s, at GGZ_SERVER_FALSE@,$GGZ_SERVER_FALSE,;t t
-s, at gui_sources@,$gui_sources,;t t
-s, at CLIENT_CFLAGS@,$CLIENT_CFLAGS,;t t
-s, at CLIENT_CXXFLAGS@,$CLIENT_CXXFLAGS,;t t
-s, at CLIENT_LIBS@,$CLIENT_LIBS,;t t
-s, at CLIENT_LDFLAGS@,$CLIENT_LDFLAGS,;t t
-s, at SOUND_CFLAGS@,$SOUND_CFLAGS,;t t
-s, at SOUND_LIBS@,$SOUND_LIBS,;t t
-s, at FTWL_CFLAGS@,$FTWL_CFLAGS,;t t
-s, at VERSION_WITHOUT_LABEL@,$VERSION_WITHOUT_LABEL,;t t
-s, at VERSION_LABEL@,$VERSION_LABEL,;t t
-s, at AUDIO_SDL_TRUE@,$AUDIO_SDL_TRUE,;t t
-s, at AUDIO_SDL_FALSE@,$AUDIO_SDL_FALSE,;t t
-s, at CLIENT_GUI_SDL_TRUE@,$CLIENT_GUI_SDL_TRUE,;t t
-s, at CLIENT_GUI_SDL_FALSE@,$CLIENT_GUI_SDL_FALSE,;t t
-s, at CLIENT_GUI_GTK_2_0_TRUE@,$CLIENT_GUI_GTK_2_0_TRUE,;t t
-s, at CLIENT_GUI_GTK_2_0_FALSE@,$CLIENT_GUI_GTK_2_0_FALSE,;t t
-s, at CLIENT_GUI_XAW_TRUE@,$CLIENT_GUI_XAW_TRUE,;t t
-s, at CLIENT_GUI_XAW_FALSE@,$CLIENT_GUI_XAW_FALSE,;t t
-s, at CLIENT_GUI_BEOS_TRUE@,$CLIENT_GUI_BEOS_TRUE,;t t
-s, at CLIENT_GUI_BEOS_FALSE@,$CLIENT_GUI_BEOS_FALSE,;t t
-s, at CLIENT_GUI_STUB_TRUE@,$CLIENT_GUI_STUB_TRUE,;t t
-s, at CLIENT_GUI_STUB_FALSE@,$CLIENT_GUI_STUB_FALSE,;t t
-s, at CLIENT_GUI_WIN32_TRUE@,$CLIENT_GUI_WIN32_TRUE,;t t
-s, at CLIENT_GUI_WIN32_FALSE@,$CLIENT_GUI_WIN32_FALSE,;t t
-s, at CLIENT_GUI_FTWL_TRUE@,$CLIENT_GUI_FTWL_TRUE,;t t
-s, at CLIENT_GUI_FTWL_FALSE@,$CLIENT_GUI_FTWL_FALSE,;t t
-s, at FTWL_X11_TRUE@,$FTWL_X11_TRUE,;t t
-s, at FTWL_X11_FALSE@,$FTWL_X11_FALSE,;t t
-s, at FTWL_SDL_TRUE@,$FTWL_SDL_TRUE,;t t
-s, at FTWL_SDL_FALSE@,$FTWL_SDL_FALSE,;t t
-s, at FTWL_OPENGL_TRUE@,$FTWL_OPENGL_TRUE,;t t
-s, at FTWL_OPENGL_FALSE@,$FTWL_OPENGL_FALSE,;t t
-s, at MINGW32_TRUE@,$MINGW32_TRUE,;t t
-s, at MINGW32_FALSE@,$MINGW32_FALSE,;t t
-s, at SERVER_LIBS@,$SERVER_LIBS,;t t
-s, at CONFIGURE_DEPENDENCIES@,$CONFIGURE_DEPENDENCIES,;t t
-s, at LIBOBJS@,$LIBOBJS,;t t
-s, at LTLIBOBJS@,$LTLIBOBJS,;t t
-CEOF
-
-_ACEOF
-
- cat >>$CONFIG_STATUS <<\_ACEOF
- # Split the substitutions into bite-sized pieces for seds with
- # small command number limits, like on Digital OSF/1 and HP-UX.
- ac_max_sed_lines=48
- ac_sed_frag=1 # Number of current file.
- ac_beg=1 # First line for current file.
- ac_end=$ac_max_sed_lines # Line after last line for current file.
- ac_more_lines=:
- ac_sed_cmds=
- while $ac_more_lines; do
- if test $ac_beg -gt 1; then
- sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
- else
- sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
- fi
- if test ! -s $tmp/subs.frag; then
- ac_more_lines=false
- else
- # The purpose of the label and of the branching condition is to
- # speed up the sed processing (if there are no `@' at all, there
- # is no need to browse any of the substitutions).
- # These are the two extra sed commands mentioned above.
- (echo ':t
- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
- if test -z "$ac_sed_cmds"; then
- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
- else
- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
- fi
- ac_sed_frag=`expr $ac_sed_frag + 1`
- ac_beg=$ac_end
- ac_end=`expr $ac_end + $ac_max_sed_lines`
- fi
- done
- if test -z "$ac_sed_cmds"; then
- ac_sed_cmds=cat
+# Set up the scripts for CONFIG_HEADERS section.
+# No need to generate them if there are no CONFIG_HEADERS.
+# This happens for instance with `./config.status Makefile'.
+if test -n "$CONFIG_HEADERS"; then
+cat >"$tmp/defines.awk" <<\_ACAWK ||
+BEGIN {
+_ACEOF
+
+# Transform confdefs.h into an awk script `defines.awk', embedded as
+# here-document in config.status, that substitutes the proper values into
+# config.h.in to produce config.h.
+
+# Create a delimiter string that does not exist in confdefs.h, to ease
+# handling of long lines.
+ac_delim='%!_!# '
+for ac_last_try in false false :; do
+ ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+ if test -z "$ac_t"; then
+ break
+ elif $ac_last_try; then
+ as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
+ else
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-fi # test -n "$CONFIG_FILES"
+done
+# For the awk script, D is an array of macro values keyed by name,
+# likewise P contains macro parameters if any. Preserve backslash
+# newline sequences.
+
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+sed -n '
+s/.\{148\}/&'"$ac_delim"'/g
+t rset
+:rset
+s/^[ ]*#[ ]*define[ ][ ]*/ /
+t def
+d
+:def
+s/\\$//
+t bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3"/p
+s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p
+d
+:bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3\\\\\\n"\\/p
+t cont
+s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
+t cont
+d
+:cont
+n
+s/.\{148\}/&'"$ac_delim"'/g
+t clear
+:clear
+s/\\$//
+t bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/"/p
+d
+:bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+b cont
+' <confdefs.h | sed '
+s/'"$ac_delim"'/"\\\
+"/g' >>$CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ for (key in D) D_is_set[key] = 1
+ FS = ""
+}
+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+ line = \$ 0
+ split(line, arg, " ")
+ if (arg[1] == "#") {
+ defundef = arg[2]
+ mac1 = arg[3]
+ } else {
+ defundef = substr(arg[1], 2)
+ mac1 = arg[2]
+ }
+ split(mac1, mac2, "(") #)
+ macro = mac2[1]
+ prefix = substr(line, 1, index(line, defundef) - 1)
+ if (D_is_set[macro]) {
+ # Preserve the white space surrounding the "#".
+ print prefix "define", macro P[macro] D[macro]
+ next
+ } else {
+ # Replace #undef with comments. This is necessary, for example,
+ # in the case of _POSIX_SOURCE, which is predefined and required
+ # on some systems where configure will not decide to define it.
+ if (defundef == "undef") {
+ print "/*", prefix defundef, macro, "*/"
+ next
+ }
+ }
+}
+{ print }
+_ACAWK
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
- case $ac_file in
- - | *:- | *:-:* ) # input from stdin
- cat >$tmp/stdin
- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
- * ) ac_file_in=$ac_file.in ;;
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ as_fn_error "could not setup config headers machinery" "$LINENO" 5
+fi # test -n "$CONFIG_HEADERS"
+
+
+eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS"
+shift
+for ac_tag
+do
+ case $ac_tag in
+ :[FHLC]) ac_mode=$ac_tag; continue;;
+ esac
+ case $ac_mode$ac_tag in
+ :[FHL]*:*);;
+ :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
+ :[FH]-) ac_tag=-:-;;
+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
+ ac_save_IFS=$IFS
+ IFS=:
+ set x $ac_tag
+ IFS=$ac_save_IFS
+ shift
+ ac_file=$1
+ shift
- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
- ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$ac_file" : 'X\(//\)[^/]' \| \
- X"$ac_file" : 'X\(//\)$' \| \
- X"$ac_file" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
- { if $as_mkdir_p; then
- mkdir -p "$ac_dir"
- else
- as_dir="$ac_dir"
- as_dirs=
- while test ! -d "$as_dir"; do
- as_dirs="$as_dir $as_dirs"
- as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
+ case $ac_mode in
+ :L) ac_source=$1;;
+ :[FH])
+ ac_file_inputs=
+ for ac_f
+ do
+ case $ac_f in
+ -) ac_f="$tmp/stdin";;
+ *) # Look for the file first in the build tree, then in the source tree
+ # (if the path is not absolute). The absolute path cannot be DOS-style,
+ # because $ac_f cannot contain `:'.
+ test -f "$ac_f" ||
+ case $ac_f in
+ [\\/$]*) false;;
+ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+ esac ||
+ as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+ esac
+ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+ as_fn_append ac_file_inputs " '$ac_f'"
done
- test ! -n "$as_dirs" || mkdir $as_dirs
- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
- { (exit 1); exit 1; }; }; }
+ # Let's still pretend it is `configure' which instantiates (i.e., don't
+ # use $as_me), people would be surprised to read:
+ # /* config.h. Generated by config.status. */
+ configure_input='Generated from '`
+ $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+ `' by configure.'
+ if test x"$ac_file" != x-; then
+ configure_input="$ac_file. $configure_input"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
+ fi
+ # Neutralize special characters interpreted by sed in replacement strings.
+ case $configure_input in #(
+ *\&* | *\|* | *\\* )
+ ac_sed_conf_input=`$as_echo "$configure_input" |
+ sed 's/[\\\\&|]/\\\\&/g'`;; #(
+ *) ac_sed_conf_input=$configure_input;;
+ esac
+
+ case $ac_tag in
+ *:-:* | *:-) cat >"$tmp/stdin" \
+ || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
+ esac
+ ;;
+ esac
+
+ ac_dir=`$as_dirname -- "$ac_file" ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$ac_file" : 'X\(//\)[^/]' \| \
+ X"$ac_file" : 'X\(//\)$' \| \
+ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$ac_file" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ as_dir="$ac_dir"; as_fn_mkdir_p
ac_builddir=.
-if test "$ac_dir" != .; then
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
- # A "../" for each directory in $ac_dir_suffix.
- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
- ac_dir_suffix= ac_top_builddir=
-fi
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+ # A ".." for each directory in $ac_dir_suffix.
+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+ case $ac_top_builddir_sub in
+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+ esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
case $srcdir in
- .) # No --srcdir option. We are building in place.
+ .) # We are building in place.
ac_srcdir=.
- if test -z "$ac_top_builddir"; then
- ac_top_srcdir=.
- else
- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
- fi ;;
- [\\/]* | ?:[\\/]* ) # Absolute path.
+ ac_top_srcdir=$ac_top_builddir_sub
+ ac_abs_top_srcdir=$ac_pwd ;;
+ [\\/]* | ?:[\\/]* ) # Absolute name.
ac_srcdir=$srcdir$ac_dir_suffix;
- ac_top_srcdir=$srcdir ;;
- *) # Relative path.
- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
- ac_top_srcdir=$ac_top_builddir$srcdir ;;
+ ac_top_srcdir=$srcdir
+ ac_abs_top_srcdir=$srcdir ;;
+ *) # Relative name.
+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+ ac_top_srcdir=$ac_top_build_prefix$srcdir
+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
esac
-# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
-# absolute.
-ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
-ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
-ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
-ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+ case $ac_mode in
+ :F)
+ #
+ # CONFIG_FILE
+ #
+
case $INSTALL in
[\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
- *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
+ *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
+ esac
+ ac_MKDIR_P=$MKDIR_P
+ case $MKDIR_P in
+ [\\/$]* | ?:[\\/]* ) ;;
+ */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
esac
+_ACEOF
- if test x"$ac_file" != x-; then
- { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
- rm -f "$ac_file"
- fi
- # Let's still pretend it is `configure' which instantiates (i.e., don't
- # use $as_me), people would be surprised to read:
- # /* config.h. Generated by config.status. */
- if test x"$ac_file" = x-; then
- configure_input=
- else
- configure_input="$ac_file. "
- fi
- configure_input=$configure_input"Generated from `echo $ac_file_in |
- sed 's,.*/,,'` by configure."
-
- # First look for the input files in the build tree, otherwise in the
- # src tree.
- ac_file_inputs=`IFS=:
- for f in $ac_file_in; do
- case $f in
- -) echo $tmp/stdin ;;
- [\\/$]*)
- # Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
- { (exit 1); exit 1; }; }
- echo $f;;
- *) # Relative
- if test -f "$f"; then
- # Build tree
- echo $f
- elif test -f "$srcdir/$f"; then
- # Source tree
- echo $srcdir/$f
- else
- # /dev/null tree
- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
- { (exit 1); exit 1; }; }
- fi;;
- esac
- done` || { (exit 1); exit 1; }
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# If the template does not know about datarootdir, expand it.
+# FIXME: This hack should be removed a few years after 2.60.
+ac_datarootdir_hack=; ac_datarootdir_seen=
+ac_sed_dataroot='
+/datarootdir/ {
+ p
+ q
+}
+/@datadir@/p
+/@docdir@/p
+/@infodir@/p
+/@localedir@/p
+/@mandir@/p'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
+*datarootdir*) ac_datarootdir_seen=yes;;
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ ac_datarootdir_hack='
+ s&@datadir@&$datadir&g
+ s&@docdir@&$docdir&g
+ s&@infodir@&$infodir&g
+ s&@localedir@&$localedir&g
+ s&@mandir@&$mandir&g
+ s&\\\${datarootdir}&$datarootdir&g' ;;
+esac
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
- sed "$ac_vpsub
+
+# Neutralize VPATH when `$srcdir' = `.'.
+# Shell code in configure.ac might set extrasub.
+# FIXME: do we really want to maintain this feature?
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
$extrasub
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
:t
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s, at configure_input@,$configure_input,;t t
-s, at srcdir@,$ac_srcdir,;t t
-s, at abs_srcdir@,$ac_abs_srcdir,;t t
-s, at top_srcdir@,$ac_top_srcdir,;t t
-s, at abs_top_srcdir@,$ac_abs_top_srcdir,;t t
-s, at builddir@,$ac_builddir,;t t
-s, at abs_builddir@,$ac_abs_builddir,;t t
-s, at top_builddir@,$ac_top_builddir,;t t
-s, at abs_top_builddir@,$ac_abs_top_builddir,;t t
-s, at INSTALL@,$ac_INSTALL,;t t
-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
- rm -f $tmp/stdin
- if test x"$ac_file" != x-; then
- mv $tmp/out $ac_file
- else
- cat $tmp/out
- rm -f $tmp/out
- fi
-
- # Run the commands associated with the file.
- case $ac_file in
- civ ) chmod +x civ ;;
- ser ) chmod +x ser ;;
- esac
-done
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-#
-# CONFIG_HEADER section.
-#
-
-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
-# NAME is the cpp macro being defined and VALUE is the value it is being given.
-#
-# ac_d sets the value in "#define NAME VALUE" lines.
-ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)'
-ac_dB='[ ].*$,\1#\2'
-ac_dC=' '
-ac_dD=',;t'
-# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
-ac_uB='$,\1#\2define\3'
-ac_uC=' '
-ac_uD=',;t'
-
-for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+s|@configure_input@|$ac_sed_conf_input|;t t
+s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
+s&@srcdir@&$ac_srcdir&;t t
+s&@abs_srcdir@&$ac_abs_srcdir&;t t
+s&@top_srcdir@&$ac_top_srcdir&;t t
+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
+s&@builddir@&$ac_builddir&;t t
+s&@abs_builddir@&$ac_abs_builddir&;t t
+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+s&@INSTALL@&$ac_INSTALL&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
+$ac_datarootdir_hack
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
+
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined. Please make sure it is defined." >&5
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined. Please make sure it is defined." >&2;}
+
+ rm -f "$tmp/stdin"
case $ac_file in
- - | *:- | *:-:* ) # input from stdin
- cat >$tmp/stdin
- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
- * ) ac_file_in=$ac_file.in ;;
- esac
-
- test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-
- # First look for the input files in the build tree, otherwise in the
- # src tree.
- ac_file_inputs=`IFS=:
- for f in $ac_file_in; do
- case $f in
- -) echo $tmp/stdin ;;
- [\\/$]*)
- # Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
- { (exit 1); exit 1; }; }
- echo $f;;
- *) # Relative
- if test -f "$f"; then
- # Build tree
- echo $f
- elif test -f "$srcdir/$f"; then
- # Source tree
- echo $srcdir/$f
- else
- # /dev/null tree
- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
- { (exit 1); exit 1; }; }
- fi;;
- esac
- done` || { (exit 1); exit 1; }
- # Remove the trailing spaces.
- sed 's/[ ]*$//' $ac_file_inputs >$tmp/in
-
-_ACEOF
-
-# Transform confdefs.h into two sed scripts, `conftest.defines' and
-# `conftest.undefs', that substitutes the proper values into
-# config.h.in to produce config.h. The first handles `#define'
-# templates, and the second `#undef' templates.
-# And first: Protect against being on the right side of a sed subst in
-# config.status. Protect against being in an unquoted here document
-# in config.status.
-rm -f conftest.defines conftest.undefs
-# Using a here document instead of a string reduces the quoting nightmare.
-# Putting comments in sed scripts is not portable.
-#
-# `end' is used to avoid that the second main sed command (meant for
-# 0-ary CPP macros) applies to n-ary macro definitions.
-# See the Autoconf documentation for `clear'.
-cat >confdef2sed.sed <<\_ACEOF
-s/[\\&,]/\\&/g
-s,[\\$`],\\&,g
-t clear
-: clear
-s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
-t end
-s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
-: end
-_ACEOF
-# If some macros were called several times there might be several times
-# the same #defines, which is useless. Nevertheless, we may not want to
-# sort them, since we want the *last* AC-DEFINE to be honored.
-uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
-sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
-rm -f confdef2sed.sed
-
-# This sed command replaces #undef with comments. This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-cat >>conftest.undefs <<\_ACEOF
-s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
-_ACEOF
-
-# Break up conftest.defines because some shells have a limit on the size
-# of here documents, and old seds have small limits too (100 cmds).
-echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
-echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
-echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
-echo ' :' >>$CONFIG_STATUS
-rm -f conftest.tail
-while grep . conftest.defines >/dev/null
-do
- # Write a limited-size here document to $tmp/defines.sed.
- echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
- # Speed up: don't consider the non `#define' lines.
- echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS
- # Work around the forget-to-reset-the-flag bug.
- echo 't clr' >>$CONFIG_STATUS
- echo ': clr' >>$CONFIG_STATUS
- sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
- echo 'CEOF
- sed -f $tmp/defines.sed $tmp/in >$tmp/out
- rm -f $tmp/in
- mv $tmp/out $tmp/in
-' >>$CONFIG_STATUS
- sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
- rm -f conftest.defines
- mv conftest.tail conftest.defines
-done
-rm -f conftest.defines
-echo ' fi # grep' >>$CONFIG_STATUS
-echo >>$CONFIG_STATUS
-
-# Break up conftest.undefs because some shells have a limit on the size
-# of here documents, and old seds have small limits too (100 cmds).
-echo ' # Handle all the #undef templates' >>$CONFIG_STATUS
-rm -f conftest.tail
-while grep . conftest.undefs >/dev/null
-do
- # Write a limited-size here document to $tmp/undefs.sed.
- echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
- # Speed up: don't consider the non `#undef'
- echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS
- # Work around the forget-to-reset-the-flag bug.
- echo 't clr' >>$CONFIG_STATUS
- echo ': clr' >>$CONFIG_STATUS
- sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
- echo 'CEOF
- sed -f $tmp/undefs.sed $tmp/in >$tmp/out
- rm -f $tmp/in
- mv $tmp/out $tmp/in
-' >>$CONFIG_STATUS
- sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
- rm -f conftest.undefs
- mv conftest.tail conftest.undefs
-done
-rm -f conftest.undefs
-
-cat >>$CONFIG_STATUS <<\_ACEOF
- # Let's still pretend it is `configure' which instantiates (i.e., don't
- # use $as_me), people would be surprised to read:
- # /* config.h. Generated by config.status. */
- if test x"$ac_file" = x-; then
- echo "/* Generated by configure. */" >$tmp/config.h
- else
- echo "/* $ac_file. Generated by configure. */" >$tmp/config.h
- fi
- cat $tmp/in >>$tmp/config.h
- rm -f $tmp/in
+ -) cat "$tmp/out" && rm -f "$tmp/out";;
+ *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+ esac \
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
+ ;;
+ :H)
+ #
+ # CONFIG_HEADER
+ #
if test x"$ac_file" != x-; then
- if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
- { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-echo "$as_me: $ac_file is unchanged" >&6;}
+ {
+ $as_echo "/* $configure_input */" \
+ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+ } >"$tmp/config.h" \
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
+ if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+$as_echo "$as_me: $ac_file is unchanged" >&6;}
else
- ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$ac_file" : 'X\(//\)[^/]' \| \
- X"$ac_file" : 'X\(//\)$' \| \
- X"$ac_file" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
- { if $as_mkdir_p; then
- mkdir -p "$ac_dir"
- else
- as_dir="$ac_dir"
- as_dirs=
- while test ! -d "$as_dir"; do
- as_dirs="$as_dir $as_dirs"
- as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
- done
- test ! -n "$as_dirs" || mkdir $as_dirs
- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
- { (exit 1); exit 1; }; }; }
-
- rm -f $ac_file
- mv $tmp/config.h $ac_file
+ rm -f "$ac_file"
+ mv "$tmp/config.h" "$ac_file" \
+ || as_fn_error "could not create $ac_file" "$LINENO" 5
fi
else
- cat $tmp/config.h
- rm -f $tmp/config.h
- fi
- # Run the commands associated with the file.
- case $ac_file in
- config.h ) # update the timestamp
-echo 'timestamp for config.h' >"./stamp-h1"
- ;;
+ $as_echo "/* $configure_input */" \
+ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+ || as_fn_error "could not create -" "$LINENO" 5
+ fi
+# Compute "$ac_file"'s index in $config_headers.
+_am_arg="$ac_file"
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+ case $_am_header in
+ $_am_arg | $_am_arg:* )
+ break ;;
+ * )
+ _am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$_am_arg" : 'X\(//\)[^/]' \| \
+ X"$_am_arg" : 'X\(//\)$' \| \
+ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$_am_arg" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`/stamp-h$_am_stamp_count
+ ;;
-#
-# CONFIG_COMMANDS section.
-#
-for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
- ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
- ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
- ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
-$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$ac_dest" : 'X\(//\)[^/]' \| \
- X"$ac_dest" : 'X\(//\)$' \| \
- X"$ac_dest" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
-echo X"$ac_dest" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
- ac_builddir=.
+ :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
+ ;;
+ esac
-if test "$ac_dir" != .; then
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
- # A "../" for each directory in $ac_dir_suffix.
- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
- ac_dir_suffix= ac_top_builddir=
-fi
-case $srcdir in
- .) # No --srcdir option. We are building in place.
- ac_srcdir=.
- if test -z "$ac_top_builddir"; then
- ac_top_srcdir=.
- else
- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
- fi ;;
- [\\/]* | ?:[\\/]* ) # Absolute path.
- ac_srcdir=$srcdir$ac_dir_suffix;
- ac_top_srcdir=$srcdir ;;
- *) # Relative path.
- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
- ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
-# absolute.
-ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
-ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
-ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
-ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
-
-
- { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
-echo "$as_me: executing $ac_dest commands" >&6;}
- case $ac_dest in
- depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
- # Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # So let's grep whole file.
- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
- dirpart=`(dirname "$mf") 2>/dev/null ||
+ case $ac_file$ac_mode in
+ "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
+ # Autoconf 2.62 quotes --file arguments for eval, but not when files
+ # are listed without --file. Let's play safe and only enable the eval
+ # if we detect the quoting.
+ case $CONFIG_FILES in
+ *\'*) eval set x "$CONFIG_FILES" ;;
+ *) set x $CONFIG_FILES ;;
+ esac
+ shift
+ for mf
+ do
+ # Strip MF so we end up with the name of the file.
+ mf=`echo "$mf" | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile or not.
+ # We used to match only the files named `Makefile.in', but
+ # some people rename them; so instead we look at the file content.
+ # Grep'ing the first line is not enough: some people post-process
+ # each Makefile.in and add a new line on top of each file to say so.
+ # Grep'ing the whole file is not good either: AIX grep has a line
+ # limit of 2048, but all sed's we know have understand at least 4000.
+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+ dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$mf" : 'X\(//\)[^/]' \| \
- X"$mf" : 'X\(//\)$' \| \
- X"$mf" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
-echo X"$mf" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
- else
- continue
- fi
- grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
- # Extract the definition of DEP_FILES from the Makefile without
- # running `make'.
- DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
- test -z "$DEPDIR" && continue
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n -e '/^U = / s///p' < "$mf"`
- test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
- # We invoke sed twice because it is the simplest approach to
- # changing $(DEPDIR) to its actual value in the expansion.
- for file in `sed -n -e '
- /^DEP_FILES = .*\\\\$/ {
- s/^DEP_FILES = //
- :loop
- s/\\\\$//
- p
- n
- /\\\\$/ b loop
- p
- }
- /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`(dirname "$file") 2>/dev/null ||
+ X"$mf" : 'X\(//\)[^/]' \| \
+ X"$mf" : 'X\(//\)$' \| \
+ X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$mf" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ else
+ continue
+ fi
+ # Extract the definition of DEPDIR, am__include, and am__quote
+ # from the Makefile without running `make'.
+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+ test -z "$DEPDIR" && continue
+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
+ test -z "am__include" && continue
+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+ # When using ansi2knr, U may be empty or an underscore; expand it
+ U=`sed -n 's/^U = //p' < "$mf"`
+ # Find all dependency output files, they are included files with
+ # $(DEPDIR) in their names. We invoke sed twice because it is the
+ # simplest approach to changing $(DEPDIR) to its actual value in the
+ # expansion.
+ for file in `sed -n "
+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+ # Make sure the directory exists.
+ test -f "$dirpart/$file" && continue
+ fdir=`$as_dirname -- "$file" ||
$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$file" : 'X\(//\)[^/]' \| \
- X"$file" : 'X\(//\)$' \| \
- X"$file" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
-echo X"$file" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
- { if $as_mkdir_p; then
- mkdir -p $dirpart/$fdir
- else
- as_dir=$dirpart/$fdir
- as_dirs=
- while test ! -d "$as_dir"; do
- as_dirs="$as_dir $as_dirs"
- as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
+ X"$file" : 'X\(//\)[^/]' \| \
+ X"$file" : 'X\(//\)$' \| \
+ X"$file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$file" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ as_dir=$dirpart/$fdir; as_fn_mkdir_p
+ # echo "creating $dirpart/$file"
+ echo '# dummy' > "$dirpart/$file"
done
- test ! -n "$as_dirs" || mkdir $as_dirs
- fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
-echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
- { (exit 1); exit 1; }; }; }
-
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
done
-done
+}
;;
- default-1 ) for ac_file in $CONFIG_FILES; do
+ "default-1":C) for ac_file in $CONFIG_FILES; do
# Support "outfile[:infile[:infile...]]"
case "$ac_file" in
*:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
@@ -27049,7 +21536,7 @@ done
;;
esac
done ;;
- fc_default-1 ) if test -f po/Makefile ; then
+ "fc_default-1":C) if test -f po/Makefile ; then
if grep 'keyword=N_ --keyword=Q_ --keyword=PL_:1,2' po/Makefile >/dev/null 2>&1 ; then
# has already been extended
:
@@ -27060,7 +21547,7 @@ done
rm po/Makefile.tmp
fi
fi ;;
- fc_default-2 ) if test -f po/Makefile ; then
+ "fc_default-2":C) if test -f po/Makefile ; then
if grep 'language=C --files-from=\$(srcdir)/POTFILES.in' po/Makefile >/dev/null 2>&1 ; then
# has already been silenced
:
@@ -27071,7 +21558,7 @@ done
rm po/Makefile.tmp
fi
fi ;;
- fc_default-4 ) if test -f po/Makefile ; then
+ "fc_default-4":C) if test -f po/Makefile ; then
if grep 'add-comments="TRANS:" --escape' po/Makefile >/dev/null 2>&1 ; then
# has already been modified
:
@@ -27082,7 +21569,7 @@ done
rm po/Makefile.tmp
fi
fi ;;
- fc_default-5 ) if test x`uname -s` = xBeOS ; then
+ "fc_default-5":C) if test x`uname -s` = xBeOS ; then
if grep '#define HAVE_SYS_UIO_H 1' config.h >/dev/null 2>&1 ; then
echo kluging config.h
mv -f config.h config.h.tmp
@@ -27090,18 +21577,21 @@ done
rm config.h.tmp
fi
fi ;;
- default ) chmod +x bootstrap/undep.sh ; bootstrap/undep.sh ;;
+ "civ":F) chmod +x civ ;;
+ "ser":F) chmod +x ser ;;
+ "default":C) chmod +x bootstrap/undep.sh ; bootstrap/undep.sh ;;
+
esac
-done
-_ACEOF
+done # for ac_tag
-cat >>$CONFIG_STATUS <<\_ACEOF
-{ (exit 0); exit 0; }
+as_fn_exit 0
_ACEOF
-chmod +x $CONFIG_STATUS
ac_clean_files=$ac_clean_files_save
+test $ac_write_fail = 0 ||
+ as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
+
# configure is writing to config.log, and then calls config.status.
# config.status does its own redirection, appending to config.log.
@@ -27121,6 +21611,10 @@ if test "$no_create" != yes; then
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
- $ac_cs_success || { (exit 1); exit 1; }
+ $ac_cs_success || as_fn_exit $?
+fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
diff --git a/configure.ac b/configure.ac
index 06b9fb1..f3d46ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ AC_GNU_SOURCE
PACKAGE=freeciv
AC_DEFINE(FC_CONFIG_H, 1, [Configuration autogenerated])
-AC_DEFINE(BUG_URL, "http://bugs.freeciv.org/", [Bug reporting URL])
+AC_DEFINE(BUG_URL, "https://gna.org/projects/freeciv/", [Bug reporting URL])
m4_include([m4/version.m4])
dnl client/server should always have the same major and minor versions
@@ -365,6 +365,12 @@ case "$host_os" in
AC_DEFINE([ALWAYS_ROOT], [1], [Can execute program as root - SkyOS])
;;
+ *haiku*)
+ dnl Haiku specific settings
+ AC_DEFINE([ALWAYS_ROOT], [1], [Can execute program as root - Haiku])
+ LIBS="$LIBS -lnetwork"
+ ;;
+
*amigaos*)
AMIGA=yes
AC_DEFINE([ALWAYS_ROOT], [1], [Can execute program as root - Amiga])
diff --git a/data/Freeciv b/data/Freeciv
index cdbd361..62dfa78 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.9
+Freeciv*version: 2.1.10
Freeciv.title: Freeciv
Freeciv.iconName: Freeciv
Freeciv*borderColor: black
diff --git a/data/Makefile.in b/data/Makefile.in
index dc3d348..9c2fd77 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,84 +14,165 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = data
+DIST_COMMON = $(srcdir)/Freeciv.in $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in $(srcdir)/civclient.dsc.in \
+ $(srcdir)/civserver.dsc.in $(srcdir)/civserver.room.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES = civclient.dsc civserver.dsc civserver.room \
+ Freeciv
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(ggzgamedir)" "$(DESTDIR)$(ggzroomdir)" \
+ "$(DESTDIR)$(icondir)" "$(DESTDIR)$(pkgdatadir)"
+DATA = $(ggzgame_DATA) $(ggzroom_DATA) $(icon_DATA) $(pkgdata_DATA)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+ distdir
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = icons amplio misc flags buildings isotrident trident \
+ isophex hex2t stdsounds themes wonders default civ1 civ2 \
+ scenario nation
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+ dir0=`pwd`; \
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+ sed_rest='s,^[^/]*/*,,'; \
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+ sed_butlast='s,/*[^/]*$$,,'; \
+ while test -n "$$dir1"; do \
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+ if test "$$first" != "."; then \
+ if test "$$first" = ".."; then \
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+ else \
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+ if test "$$first2" = "$$first"; then \
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+ else \
+ dir2="../$$dir2"; \
+ fi; \
+ dir0="$$dir0"/"$$first"; \
+ fi; \
+ fi; \
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+ done; \
+ reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -101,10 +183,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -112,27 +198,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -140,6 +238,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -150,17 +250,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -173,12 +294,37 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
@CLIENT_TRUE at COMMON_CLIENT_FILES = \
@CLIENT_TRUE@ hex2t.tilespec \
@CLIENT_TRUE@ amplio.tilespec \
@@ -190,16 +336,14 @@ packagesrcdir = @packagesrcdir@
@CLIENT_GUI_GTK_2_0_TRUE@@CLIENT_TRUE at CLIENT_EXTRA_FILES = freeciv.rc-2.0
@CLIENT_GUI_XAW_TRUE@@CLIENT_TRUE at CLIENT_EXTRA_FILES = Freeciv
- at CLIENT_TRUE@CLIENT_FILES = $(COMMON_CLIENT_FILES) $(CLIENT_EXTRA_FILES)
@CLIENT_FALSE at CLIENT_FILES =
-
+ at CLIENT_TRUE@CLIENT_FILES = $(COMMON_CLIENT_FILES) $(CLIENT_EXTRA_FILES)
+ at SERVER_FALSE@SERVER_FILES =
@SERVER_TRUE at SERVER_FILES = \
@SERVER_TRUE@ civ1.serv \
@SERVER_TRUE@ civ2.serv \
@SERVER_TRUE@ default.serv
- at SERVER_FALSE@SERVER_FILES =
-
pkgdata_DATA = $(SERVER_FILES) $(CLIENT_FILES)
# Freeciv.rc was originally for gui-gtk but is also used by gui-sdl
@@ -222,134 +366,142 @@ EXTRA_DIST = \
civ2.serv \
default.serv
-
+ at CLIENT_FALSE@CLIENTDATADIRS =
@CLIENT_TRUE at CLIENTDATADIRS = amplio misc flags buildings isotrident trident isophex \
@CLIENT_TRUE@ hex2t stdsounds themes wonders
- at CLIENT_FALSE@CLIENTDATADIRS =
-
- at SERVER_TRUE@SERVERDATADIRS = default civ1 civ2 scenario nation
@SERVER_FALSE at SERVERDATADIRS =
-
- at CLIENT_TRUE@ICONS = freeciv-client.png
+ at SERVER_TRUE@SERVERDATADIRS = default civ1 civ2 scenario nation
@CLIENT_FALSE at ICONS =
-
+ at CLIENT_TRUE@ICONS = freeciv-client.png
icondir = $(prefix)/share/pixmaps
icon_DATA = $(ICONS)
-
SUBDIRS = icons $(CLIENTDATADIRS) $(SERVERDATADIRS)
-
@GGZ_SERVER_TRUE at ggzroom_DATA = civserver.room
@GGZ_SERVER_TRUE at ggzroomdir = $(ggzdconfdir)/rooms/
-
@GGZ_SERVER_TRUE at ggzgame_DATA = civserver.dsc
@GGZ_SERVER_TRUE at ggzgamedir = $(ggzdconfdir)/games/
-subdir = data
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = civclient.dsc civserver.dsc civserver.room Freeciv
-DIST_SOURCES =
-DATA = $(ggzgame_DATA) $(ggzroom_DATA) $(icon_DATA) $(pkgdata_DATA)
-
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
- uninstall-info-recursive all-recursive install-data-recursive \
- install-exec-recursive installdirs-recursive install-recursive \
- uninstall-recursive check-recursive installcheck-recursive
-DIST_COMMON = Freeciv.in Makefile.am Makefile.in civclient.dsc.in \
- civserver.dsc.in civserver.room.in
-DIST_SUBDIRS = icons amplio misc flags buildings isotrident trident \
- isophex hex2t stdsounds themes wonders default civ1 civ2 \
- scenario nation
all: all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu data/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-civclient.dsc: $(top_builddir)/config.status civclient.dsc.in
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu data/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+civclient.dsc: $(top_builddir)/config.status $(srcdir)/civclient.dsc.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-civserver.dsc: $(top_builddir)/config.status civserver.dsc.in
+civserver.dsc: $(top_builddir)/config.status $(srcdir)/civserver.dsc.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-civserver.room: $(top_builddir)/config.status civserver.room.in
+civserver.room: $(top_builddir)/config.status $(srcdir)/civserver.room.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-Freeciv: $(top_builddir)/config.status Freeciv.in
+Freeciv: $(top_builddir)/config.status $(srcdir)/Freeciv.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-uninstall-info-am:
-ggzgameDATA_INSTALL = $(INSTALL_DATA)
install-ggzgameDATA: $(ggzgame_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(ggzgamedir)
- @list='$(ggzgame_DATA)'; for p in $$list; do \
+ test -z "$(ggzgamedir)" || $(MKDIR_P) "$(DESTDIR)$(ggzgamedir)"
+ @list='$(ggzgame_DATA)'; test -n "$(ggzgamedir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(ggzgameDATA_INSTALL) $$d$$p $(DESTDIR)$(ggzgamedir)/$$f"; \
- $(ggzgameDATA_INSTALL) $$d$$p $(DESTDIR)$(ggzgamedir)/$$f; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(ggzgamedir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(ggzgamedir)" || exit $$?; \
done
uninstall-ggzgameDATA:
@$(NORMAL_UNINSTALL)
- @list='$(ggzgame_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(ggzgamedir)/$$f"; \
- rm -f $(DESTDIR)$(ggzgamedir)/$$f; \
- done
-ggzroomDATA_INSTALL = $(INSTALL_DATA)
+ @list='$(ggzgame_DATA)'; test -n "$(ggzgamedir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(ggzgamedir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(ggzgamedir)" && rm -f $$files
install-ggzroomDATA: $(ggzroom_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(ggzroomdir)
- @list='$(ggzroom_DATA)'; for p in $$list; do \
+ test -z "$(ggzroomdir)" || $(MKDIR_P) "$(DESTDIR)$(ggzroomdir)"
+ @list='$(ggzroom_DATA)'; test -n "$(ggzroomdir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(ggzroomDATA_INSTALL) $$d$$p $(DESTDIR)$(ggzroomdir)/$$f"; \
- $(ggzroomDATA_INSTALL) $$d$$p $(DESTDIR)$(ggzroomdir)/$$f; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(ggzroomdir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(ggzroomdir)" || exit $$?; \
done
uninstall-ggzroomDATA:
@$(NORMAL_UNINSTALL)
- @list='$(ggzroom_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(ggzroomdir)/$$f"; \
- rm -f $(DESTDIR)$(ggzroomdir)/$$f; \
- done
-iconDATA_INSTALL = $(INSTALL_DATA)
+ @list='$(ggzroom_DATA)'; test -n "$(ggzroomdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(ggzroomdir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(ggzroomdir)" && rm -f $$files
install-iconDATA: $(icon_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(icondir)
- @list='$(icon_DATA)'; for p in $$list; do \
+ test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(iconDATA_INSTALL) $$d$$p $(DESTDIR)$(icondir)/$$f"; \
- $(iconDATA_INSTALL) $$d$$p $(DESTDIR)$(icondir)/$$f; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icondir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \
done
uninstall-iconDATA:
@$(NORMAL_UNINSTALL)
- @list='$(icon_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(icondir)/$$f"; \
- rm -f $(DESTDIR)$(icondir)/$$f; \
- done
-pkgdataDATA_INSTALL = $(INSTALL_DATA)
+ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(icondir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(icondir)" && rm -f $$files
install-pkgdataDATA: $(pkgdata_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
+ test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \
- $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
done
uninstall-pkgdataDATA:
@$(NORMAL_UNINSTALL)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \
- rm -f $(DESTDIR)$(pkgdatadir)/$$f; \
- done
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
@@ -358,7 +510,13 @@ uninstall-pkgdataDATA:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @set fnord $$MAKEFLAGS; amf=$$2; \
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -369,16 +527,21 @@ $(RECURSIVE_TARGETS):
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
- @set fnord $$MAKEFLAGS; amf=$$2; \
+$(RECURSIVE_CLEAN_TARGETS):
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -398,89 +561,137 @@ maintainer-clean-recursive:
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+ctags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
-
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ empty_fix=.; \
+ else \
+ include_option=--include; \
+ empty_fix=; \
+ fi; \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+ test ! -f $$subdir/TAGS || \
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d $(distdir)/$$subdir \
- || mkdir $(distdir)/$$subdir \
+ test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
- (cd $$subdir && \
+ fi; \
+ done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+ dir1=$$subdir; dir2="$(top_distdir)"; \
+ $(am__relativize); \
+ new_top_distdir=$$reldir; \
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+ ($(am__cd) $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$(top_distdir)" \
- distdir=../$(distdir)/$$subdir \
+ top_distdir="$$new_top_distdir" \
+ distdir="$$new_distdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
+ am__skip_mode_fix=: \
distdir) \
|| exit 1; \
fi; \
@@ -490,8 +701,9 @@ check: check-recursive
all-am: Makefile $(DATA)
installdirs: installdirs-recursive
installdirs-am:
- $(mkinstalldirs) $(DESTDIR)$(ggzgamedir) $(DESTDIR)$(ggzroomdir) $(DESTDIR)$(icondir) $(DESTDIR)$(pkgdatadir)
-
+ for dir in "$(DESTDIR)$(ggzgamedir)" "$(DESTDIR)$(ggzroomdir)" "$(DESTDIR)$(icondir)" "$(DESTDIR)$(pkgdatadir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
@@ -503,7 +715,7 @@ install-am: all-am
installcheck: installcheck-recursive
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -511,23 +723,30 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
+ at GGZ_CLIENT_FALSE@uninstall-local:
+ at GGZ_CLIENT_FALSE@install-data-local:
clean: clean-recursive
clean-am: clean-generic mostlyclean-am
distclean: distclean-recursive
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic distclean-tags
dvi: dvi-recursive
dvi-am:
+html: html-recursive
+
+html-am:
+
info: info-recursive
info-am:
@@ -535,45 +754,69 @@ info-am:
install-data-am: install-data-local install-ggzgameDATA \
install-ggzroomDATA install-iconDATA install-pkgdataDATA
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-recursive
+
+install-html-am:
+
install-info: install-info-recursive
+install-info-am:
+
install-man:
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-recursive
mostlyclean-am: mostlyclean-generic
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
uninstall-am: uninstall-ggzgameDATA uninstall-ggzroomDATA \
- uninstall-iconDATA uninstall-info-am uninstall-local \
- uninstall-pkgdataDATA
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
- clean-generic clean-recursive distclean distclean-generic \
- distclean-recursive distclean-tags distdir dvi dvi-am \
- dvi-recursive info info-am info-recursive install install-am \
- install-data install-data-am install-data-local \
- install-data-recursive install-exec install-exec-am \
- install-exec-recursive install-ggzgameDATA install-ggzroomDATA \
- install-iconDATA install-info install-info-am \
- install-info-recursive install-man install-pkgdataDATA \
- install-recursive install-strip installcheck installcheck-am \
- installdirs installdirs-am installdirs-recursive \
- maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-generic \
- mostlyclean-recursive tags tags-recursive uninstall \
- uninstall-am uninstall-ggzgameDATA uninstall-ggzroomDATA \
- uninstall-iconDATA uninstall-info-am uninstall-info-recursive \
- uninstall-local uninstall-pkgdataDATA uninstall-recursive
+ uninstall-iconDATA uninstall-local uninstall-pkgdataDATA
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+ install-am install-strip tags-recursive
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am check check-am clean clean-generic ctags \
+ ctags-recursive distclean distclean-generic distclean-tags \
+ distdir dvi dvi-am html html-am info info-am install \
+ install-am install-data install-data-am install-data-local \
+ install-dvi install-dvi-am install-exec install-exec-am \
+ install-ggzgameDATA install-ggzroomDATA install-html \
+ install-html-am install-iconDATA install-info install-info-am \
+ install-man install-pdf install-pdf-am install-pkgdataDATA \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+ uninstall-ggzgameDATA uninstall-ggzroomDATA uninstall-iconDATA \
+ uninstall-local uninstall-pkgdataDATA
@GGZ_CLIENT_TRUE at install-data-local:
@@ -581,6 +824,7 @@ uninstall-info: uninstall-info-recursive
@GGZ_CLIENT_TRUE at uninstall-local:
@GGZ_CLIENT_TRUE@ $(GGZ_CONFIG) -D --remove --modfile=civclient.dsc
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/data/amplio/Makefile.in b/data/amplio/Makefile.in
index c4958af..4e790de 100644
--- a/data/amplio/Makefile.in
+++ b/data/amplio/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,85 +14,119 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-
+subdir = data/amplio
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(pkgdatadir)"
+DATA = $(pkgdata_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
pkgdatadir = $(datadir)/$(PACKAGE)/amplio
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -102,10 +137,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -113,27 +152,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -141,6 +192,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -151,17 +204,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -174,12 +248,37 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
pkgdata_DATA = \
ancientcities.png \
ancientcities.spec \
@@ -212,79 +311,104 @@ pkgdata_DATA = \
units.spec \
wonders.spec
-
EXTRA_DIST = $(pkgdata_DATA)
-subdir = data/amplio
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(pkgdata_DATA)
-
-DIST_COMMON = Makefile.am Makefile.in
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu data/amplio/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
-pkgdataDATA_INSTALL = $(INSTALL_DATA)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/amplio/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu data/amplio/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
install-pkgdataDATA: $(pkgdata_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
+ test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \
- $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
done
uninstall-pkgdataDATA:
@$(NORMAL_UNINSTALL)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \
- rm -f $(DESTDIR)$(pkgdatadir)/$$f; \
- done
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
tags: TAGS
TAGS:
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ctags: CTAGS
+CTAGS:
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(DATA)
-
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
-
+ for dir in "$(DESTDIR)$(pkgdatadir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -296,7 +420,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -304,7 +428,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -314,45 +439,80 @@ clean: clean-am
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am: install-pkgdataDATA
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic
-uninstall-am: uninstall-info-am uninstall-pkgdataDATA
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkgdataDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
- install-pkgdataDATA install-strip installcheck installcheck-am \
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-pkgdataDATA install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic uninstall uninstall-am \
- uninstall-info-am uninstall-pkgdataDATA
+ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+ uninstall-am uninstall-pkgdataDATA
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/data/buildings/Makefile.in b/data/buildings/Makefile.in
index 5b13ee6..4b1bad6 100644
--- a/data/buildings/Makefile.in
+++ b/data/buildings/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,85 +14,119 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-
+subdir = data/buildings
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(pkgdatadir)"
+DATA = $(pkgdata_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
pkgdatadir = $(datadir)/$(PACKAGE)/buildings
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -102,10 +137,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -113,27 +152,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -141,6 +192,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -151,17 +204,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -174,12 +248,37 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
pkgdata_DATA = \
airport.png \
aqueduct.png \
@@ -222,79 +321,104 @@ pkgdata_DATA = \
temple.png \
university.png
-
EXTRA_DIST = $(pkgdata_DATA)
-subdir = data/buildings
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(pkgdata_DATA)
-
-DIST_COMMON = Makefile.am Makefile.in
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu data/buildings/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
-pkgdataDATA_INSTALL = $(INSTALL_DATA)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/buildings/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu data/buildings/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
install-pkgdataDATA: $(pkgdata_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
+ test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \
- $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
done
uninstall-pkgdataDATA:
@$(NORMAL_UNINSTALL)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \
- rm -f $(DESTDIR)$(pkgdatadir)/$$f; \
- done
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
tags: TAGS
TAGS:
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ctags: CTAGS
+CTAGS:
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(DATA)
-
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
-
+ for dir in "$(DESTDIR)$(pkgdatadir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -306,7 +430,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -314,7 +438,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -324,45 +449,80 @@ clean: clean-am
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am: install-pkgdataDATA
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic
-uninstall-am: uninstall-info-am uninstall-pkgdataDATA
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkgdataDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
- install-pkgdataDATA install-strip installcheck installcheck-am \
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-pkgdataDATA install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic uninstall uninstall-am \
- uninstall-info-am uninstall-pkgdataDATA
+ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+ uninstall-am uninstall-pkgdataDATA
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/data/civ1/Makefile.in b/data/civ1/Makefile.in
index bac792c..fa77b59 100644
--- a/data/civ1/Makefile.in
+++ b/data/civ1/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,85 +14,119 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-
+subdir = data/civ1
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(pkgdatadir)"
+DATA = $(pkgdata_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
pkgdatadir = $(datadir)/$(PACKAGE)/civ1
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -102,10 +137,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -113,27 +152,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -141,6 +192,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -151,17 +204,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -174,12 +248,37 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
pkgdata_DATA = \
buildings.ruleset \
effects.ruleset \
@@ -190,79 +289,104 @@ pkgdata_DATA = \
terrain.ruleset \
units.ruleset
-
EXTRA_DIST = $(pkgdata_DATA)
-subdir = data/civ1
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(pkgdata_DATA)
-
-DIST_COMMON = Makefile.am Makefile.in
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu data/civ1/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
-pkgdataDATA_INSTALL = $(INSTALL_DATA)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/civ1/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu data/civ1/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
install-pkgdataDATA: $(pkgdata_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
+ test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \
- $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
done
uninstall-pkgdataDATA:
@$(NORMAL_UNINSTALL)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \
- rm -f $(DESTDIR)$(pkgdatadir)/$$f; \
- done
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
tags: TAGS
TAGS:
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ctags: CTAGS
+CTAGS:
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(DATA)
-
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
-
+ for dir in "$(DESTDIR)$(pkgdatadir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -274,7 +398,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -282,7 +406,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -292,45 +417,80 @@ clean: clean-am
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am: install-pkgdataDATA
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic
-uninstall-am: uninstall-info-am uninstall-pkgdataDATA
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkgdataDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
- install-pkgdataDATA install-strip installcheck installcheck-am \
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-pkgdataDATA install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic uninstall uninstall-am \
- uninstall-info-am uninstall-pkgdataDATA
+ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+ uninstall-am uninstall-pkgdataDATA
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/data/civ2/Makefile.in b/data/civ2/Makefile.in
index c3fe351..2f9b46c 100644
--- a/data/civ2/Makefile.in
+++ b/data/civ2/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,85 +14,119 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-
+subdir = data/civ2
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(pkgdatadir)"
+DATA = $(pkgdata_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
pkgdatadir = $(datadir)/$(PACKAGE)/civ2
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -102,10 +137,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -113,27 +152,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -141,6 +192,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -151,17 +204,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -174,12 +248,37 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
pkgdata_DATA = \
buildings.ruleset \
cities.ruleset \
@@ -190,79 +289,104 @@ pkgdata_DATA = \
terrain.ruleset \
units.ruleset
-
EXTRA_DIST = $(pkgdata_DATA)
-subdir = data/civ2
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(pkgdata_DATA)
-
-DIST_COMMON = Makefile.am Makefile.in
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu data/civ2/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
-pkgdataDATA_INSTALL = $(INSTALL_DATA)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/civ2/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu data/civ2/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
install-pkgdataDATA: $(pkgdata_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
+ test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \
- $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
done
uninstall-pkgdataDATA:
@$(NORMAL_UNINSTALL)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \
- rm -f $(DESTDIR)$(pkgdatadir)/$$f; \
- done
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
tags: TAGS
TAGS:
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ctags: CTAGS
+CTAGS:
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(DATA)
-
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
-
+ for dir in "$(DESTDIR)$(pkgdatadir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -274,7 +398,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -282,7 +406,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -292,45 +417,80 @@ clean: clean-am
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am: install-pkgdataDATA
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic
-uninstall-am: uninstall-info-am uninstall-pkgdataDATA
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkgdataDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
- install-pkgdataDATA install-strip installcheck installcheck-am \
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-pkgdataDATA install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic uninstall uninstall-am \
- uninstall-info-am uninstall-pkgdataDATA
+ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+ uninstall-am uninstall-pkgdataDATA
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/data/civ2/effects.ruleset b/data/civ2/effects.ruleset
index ff0fbdb..2a1e2de 100644
--- a/data/civ2/effects.ruleset
+++ b/data/civ2/effects.ruleset
@@ -751,6 +751,7 @@ reqs =
"Gov", "Communism", "Player"
"Tech", "Communism", "Player"
"Tech", "Gunpowder", "Player"
+ "Tech", "Guerilla Warfare", "World"
}
[effect_partisan_1]
@@ -761,6 +762,7 @@ reqs =
"Gov", "Democracy", "Player"
"Tech", "Communism", "Player"
"Tech", "Gunpowder", "Player"
+ "Tech", "Guerilla Warfare", "World"
}
[effect_fundamentalism]
diff --git a/data/default/Makefile.in b/data/default/Makefile.in
index 032d943..3a5685d 100644
--- a/data/default/Makefile.in
+++ b/data/default/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,85 +14,119 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-
+subdir = data/default
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(pkgdatadir)"
+DATA = $(pkgdata_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
pkgdatadir = $(datadir)/$(PACKAGE)/default
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -102,10 +137,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -113,27 +152,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -141,6 +192,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -151,17 +204,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -174,12 +248,37 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
pkgdata_DATA = \
buildings.ruleset \
cities.ruleset \
@@ -192,79 +291,104 @@ pkgdata_DATA = \
terrain.ruleset \
units.ruleset
-
EXTRA_DIST = $(pkgdata_DATA)
-subdir = data/default
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(pkgdata_DATA)
-
-DIST_COMMON = Makefile.am Makefile.in
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu data/default/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
-pkgdataDATA_INSTALL = $(INSTALL_DATA)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/default/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu data/default/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
install-pkgdataDATA: $(pkgdata_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
+ test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \
- $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
done
uninstall-pkgdataDATA:
@$(NORMAL_UNINSTALL)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \
- rm -f $(DESTDIR)$(pkgdatadir)/$$f; \
- done
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
tags: TAGS
TAGS:
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ctags: CTAGS
+CTAGS:
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(DATA)
-
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
-
+ for dir in "$(DESTDIR)$(pkgdatadir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -276,7 +400,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -284,7 +408,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -294,45 +419,80 @@ clean: clean-am
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am: install-pkgdataDATA
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic
-uninstall-am: uninstall-info-am uninstall-pkgdataDATA
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkgdataDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
- install-pkgdataDATA install-strip installcheck installcheck-am \
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-pkgdataDATA install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic uninstall uninstall-am \
- uninstall-info-am uninstall-pkgdataDATA
+ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+ uninstall-am uninstall-pkgdataDATA
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/data/default/buildings.ruleset b/data/default/buildings.ruleset
index 4a0648d..0672012 100644
--- a/data/default/buildings.ruleset
+++ b/data/default/buildings.ruleset
@@ -384,8 +384,7 @@ Reduces the amount of pollution generated by production in a city\
a 150% production bonus.\
\n\n\
A city can only have one Hydro Plant, Power Plant, or\
- Nuclear Plant. A city can only build a Hydro Plant if it is next\
- to (or on) a Mountain or River tile.\
+ Nuclear Plant.\
")
; FIXME: add Solar Plant to "can have only one" helptext when Solar
; Plant added.
diff --git a/data/default/cities.ruleset b/data/default/cities.ruleset
index 42414fc..53d9e24 100644
--- a/data/default/cities.ruleset
+++ b/data/default/cities.ruleset
@@ -133,6 +133,17 @@ citizens_graphic_alt = "generic"
reqs = { "type", "name", "range"
"tech", "Railroad", "Player"
}
+replaced_by = "ElectricAge"
+
+[citystyle_electric]
+name = _("?citystyle:ElectricAge")
+graphic = "city.electricage"
+graphic_alt = "city.modern"
+citizens_graphic = "electricage"
+citizens_graphic_alt = "generic"
+reqs = { "type", "name", "range"
+ "tech", "Automobile", "Player"
+ }
replaced_by = "Modern"
[citystyle_modern]
@@ -142,7 +153,7 @@ graphic_alt = "-"
citizens_graphic = "modern"
citizens_graphic_alt = "generic"
reqs = { "type", "name", "range"
- "tech", "Automobile", "Player"
+ "tech", "Rocketry", "Player"
}
replaced_by = "PostModern"
diff --git a/data/default/effects.ruleset b/data/default/effects.ruleset
index 0367c47..eefcc01 100644
--- a/data/default/effects.ruleset
+++ b/data/default/effects.ruleset
@@ -622,6 +622,7 @@ reqs =
"Gov", "Communism", "Player"
"Tech", "Communism", "Player"
"Tech", "Gunpowder", "Player"
+ "Tech", "Guerilla Warfare", "World"
}
[effect_partisan_1]
@@ -632,6 +633,7 @@ reqs =
"Gov", "Democracy", "Player"
"Tech", "Communism", "Player"
"Tech", "Gunpowder", "Player"
+ "Tech", "Guerilla Warfare", "World"
}
[effect_airport]
diff --git a/data/flags/Makefile.in b/data/flags/Makefile.in
index 480604f..2432a7e 100644
--- a/data/flags/Makefile.in
+++ b/data/flags/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,85 +14,119 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-
+subdir = data/flags
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(pkgdatadir)"
+DATA = $(pkgdata_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
pkgdatadir = $(datadir)/$(PACKAGE)/flags
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -102,10 +137,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -113,27 +152,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -141,6 +192,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -151,17 +204,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -174,12 +248,37 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
flag_files = \
aborigines.png \
afghanistan.png \
@@ -325,7 +424,6 @@ flag_files = \
westphalia.png \
zulu.png
-
shield_files = \
aborigines-shield.png \
afghanistan-shield.png \
@@ -471,7 +569,6 @@ shield_files = \
westphalia-shield.png \
zulu-shield.png
-
svg_files = \
aborigines.svg \
afghanistan.svg \
@@ -617,81 +714,105 @@ svg_files = \
westphalia.svg \
zulu.svg
-
pkgdata_DATA = $(flag_files) $(shield_files)
-
EXTRA_DIST = $(pkgdata_DATA) $(svg_files) credits convert_png mask.png
-subdir = data/flags
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(pkgdata_DATA)
-
-DIST_COMMON = Makefile.am Makefile.in
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu data/flags/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
-pkgdataDATA_INSTALL = $(INSTALL_DATA)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/flags/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu data/flags/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
install-pkgdataDATA: $(pkgdata_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
+ test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \
- $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
done
uninstall-pkgdataDATA:
@$(NORMAL_UNINSTALL)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \
- rm -f $(DESTDIR)$(pkgdatadir)/$$f; \
- done
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
tags: TAGS
TAGS:
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ctags: CTAGS
+CTAGS:
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(DATA)
-
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
-
+ for dir in "$(DESTDIR)$(pkgdatadir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -703,7 +824,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -711,7 +832,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -721,45 +843,80 @@ clean: clean-am
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am: install-pkgdataDATA
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic
-uninstall-am: uninstall-info-am uninstall-pkgdataDATA
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkgdataDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
- install-pkgdataDATA install-strip installcheck installcheck-am \
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-pkgdataDATA install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic uninstall uninstall-am \
- uninstall-info-am uninstall-pkgdataDATA
+ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+ uninstall-am uninstall-pkgdataDATA
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/data/helpdata.txt b/data/helpdata.txt
index 075f269..a1d0a3f 100644
--- a/data/helpdata.txt
+++ b/data/helpdata.txt
@@ -56,7 +56,7 @@ the extinction of all other civilizations.\
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/\
+ https://gna.org/projects/freeciv/\
"), _("\
For more information about submitting bug reports see the file BUGS \
in the Freeciv distribution. For more information in general, \
diff --git a/data/hex2t/Makefile.in b/data/hex2t/Makefile.in
index f525f85..d636f8c 100644
--- a/data/hex2t/Makefile.in
+++ b/data/hex2t/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,85 +14,119 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-
+subdir = data/hex2t
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(pkgdatadir)"
+DATA = $(pkgdata_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
pkgdatadir = $(datadir)/$(PACKAGE)/hex2t
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -102,10 +137,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -113,27 +152,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -141,6 +192,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -151,17 +204,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -174,12 +248,37 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
pkgdata_DATA = \
grid.png \
grid.spec \
@@ -192,79 +291,104 @@ pkgdata_DATA = \
tiles.png \
tiles.spec
-
EXTRA_DIST = $(pkgdata_DATA)
-subdir = data/hex2t
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(pkgdata_DATA)
-
-DIST_COMMON = Makefile.am Makefile.in
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu data/hex2t/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
-pkgdataDATA_INSTALL = $(INSTALL_DATA)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/hex2t/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu data/hex2t/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
install-pkgdataDATA: $(pkgdata_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
+ test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \
- $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
done
uninstall-pkgdataDATA:
@$(NORMAL_UNINSTALL)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \
- rm -f $(DESTDIR)$(pkgdatadir)/$$f; \
- done
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
tags: TAGS
TAGS:
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ctags: CTAGS
+CTAGS:
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(DATA)
-
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
-
+ for dir in "$(DESTDIR)$(pkgdatadir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -276,7 +400,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -284,7 +408,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -294,45 +419,80 @@ clean: clean-am
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am: install-pkgdataDATA
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic
-uninstall-am: uninstall-info-am uninstall-pkgdataDATA
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkgdataDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
- install-pkgdataDATA install-strip installcheck installcheck-am \
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-pkgdataDATA install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic uninstall uninstall-am \
- uninstall-info-am uninstall-pkgdataDATA
+ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+ uninstall-am uninstall-pkgdataDATA
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/data/icons/Makefile.in b/data/icons/Makefile.in
index 42b4bdf..94ae94a 100644
--- a/data/icons/Makefile.in
+++ b/data/icons/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,84 +14,122 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = data/icons
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(icon128dir)" "$(DESTDIR)$(icon16dir)" \
+ "$(DESTDIR)$(icon32dir)" "$(DESTDIR)$(icon48dir)" \
+ "$(DESTDIR)$(icon64dir)"
+DATA = $(icon128_DATA) $(icon16_DATA) $(icon32_DATA) $(icon48_DATA) \
+ $(icon64_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -101,10 +140,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -112,27 +155,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -140,6 +195,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -150,17 +207,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -173,54 +251,77 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+ at CLIENT_FALSE@icons_16_c =
@CLIENT_TRUE at icons_16_c = \
@CLIENT_TRUE@ 16x16/freeciv-client.png
- at CLIENT_FALSE@icons_16_c =
+ at CLIENT_FALSE@icons_32_c =
@CLIENT_TRUE at icons_32_c = \
@CLIENT_TRUE@ 32x32/freeciv-client.png
- at CLIENT_FALSE@icons_32_c =
+ at CLIENT_FALSE@icons_48_c =
@CLIENT_TRUE at icons_48_c = \
@CLIENT_TRUE@ 48x48/freeciv-client.png
- at CLIENT_FALSE@icons_48_c =
+ at CLIENT_FALSE@icons_64_c =
@CLIENT_TRUE at icons_64_c = \
@CLIENT_TRUE@ 64x64/freeciv-client.png
- at CLIENT_FALSE@icons_64_c =
+ at CLIENT_FALSE@icons_128_c =
@CLIENT_TRUE at icons_128_c = \
@CLIENT_TRUE@ 128x128/freeciv-client.png
- at CLIENT_FALSE@icons_128_c =
-
+ at SERVER_FALSE@icons_16_s =
@SERVER_TRUE at icons_16_s = \
@SERVER_TRUE@ 16x16/freeciv-server.png
- at SERVER_FALSE@icons_16_s =
+ at SERVER_FALSE@icons_32_s =
@SERVER_TRUE at icons_32_s = \
@SERVER_TRUE@ 32x32/freeciv-server.png
- at SERVER_FALSE@icons_32_s =
+ at SERVER_FALSE@icons_48_s =
@SERVER_TRUE at icons_48_s = \
@SERVER_TRUE@ 48x48/freeciv-server.png
- at SERVER_FALSE@icons_48_s =
+ at SERVER_FALSE@icons_64_s =
@SERVER_TRUE at icons_64_s = \
@SERVER_TRUE@ 64x64/freeciv-server.png
- at SERVER_FALSE@icons_64_s =
+ at SERVER_FALSE@icons_128_s =
@SERVER_TRUE at icons_128_s = \
@SERVER_TRUE@ 128x128/freeciv-server.png
- at SERVER_FALSE@icons_128_s =
-
#icons_svg = \
# scalable/freeciv-client.svg \
@@ -230,14 +331,12 @@ icon32dir = $(datadir)/icons/hicolor/32x32/apps
icon48dir = $(datadir)/icons/hicolor/48x48/apps
icon64dir = $(datadir)/icons/hicolor/64x64/apps
icon128dir = $(datadir)/icons/hicolor/128x128/apps
-
#iconscalabledir = $(datadir)/icons/hicolor/scalable/apps
icon16_DATA = $(icons_16_c) $(icons_16_s)
icon32_DATA = $(icons_32_c) $(icons_32_s)
icon48_DATA = $(icons_48_c) $(icons_48_s)
icon64_DATA = $(icons_64_c) $(icons_64_s)
icon128_DATA = $(icons_128_c) $(icons_128_s)
-
#iconscalable_DATA = $(icons_svg)
EXTRA_DIST = \
$(icons_16_c) \
@@ -251,150 +350,183 @@ EXTRA_DIST = \
$(icons_128_c) \
$(icons_128_s)
-subdir = data/icons
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(icon128_DATA) $(icon16_DATA) $(icon32_DATA) $(icon48_DATA) \
- $(icon64_DATA)
-
-DIST_COMMON = Makefile.am Makefile.in
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu data/icons/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
-icon128DATA_INSTALL = $(INSTALL_DATA)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/icons/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu data/icons/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
install-icon128DATA: $(icon128_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(icon128dir)
- @list='$(icon128_DATA)'; for p in $$list; do \
+ test -z "$(icon128dir)" || $(MKDIR_P) "$(DESTDIR)$(icon128dir)"
+ @list='$(icon128_DATA)'; test -n "$(icon128dir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(icon128DATA_INSTALL) $$d$$p $(DESTDIR)$(icon128dir)/$$f"; \
- $(icon128DATA_INSTALL) $$d$$p $(DESTDIR)$(icon128dir)/$$f; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icon128dir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(icon128dir)" || exit $$?; \
done
uninstall-icon128DATA:
@$(NORMAL_UNINSTALL)
- @list='$(icon128_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(icon128dir)/$$f"; \
- rm -f $(DESTDIR)$(icon128dir)/$$f; \
- done
-icon16DATA_INSTALL = $(INSTALL_DATA)
+ @list='$(icon128_DATA)'; test -n "$(icon128dir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(icon128dir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(icon128dir)" && rm -f $$files
install-icon16DATA: $(icon16_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(icon16dir)
- @list='$(icon16_DATA)'; for p in $$list; do \
+ test -z "$(icon16dir)" || $(MKDIR_P) "$(DESTDIR)$(icon16dir)"
+ @list='$(icon16_DATA)'; test -n "$(icon16dir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(icon16DATA_INSTALL) $$d$$p $(DESTDIR)$(icon16dir)/$$f"; \
- $(icon16DATA_INSTALL) $$d$$p $(DESTDIR)$(icon16dir)/$$f; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icon16dir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(icon16dir)" || exit $$?; \
done
uninstall-icon16DATA:
@$(NORMAL_UNINSTALL)
- @list='$(icon16_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(icon16dir)/$$f"; \
- rm -f $(DESTDIR)$(icon16dir)/$$f; \
- done
-icon32DATA_INSTALL = $(INSTALL_DATA)
+ @list='$(icon16_DATA)'; test -n "$(icon16dir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(icon16dir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(icon16dir)" && rm -f $$files
install-icon32DATA: $(icon32_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(icon32dir)
- @list='$(icon32_DATA)'; for p in $$list; do \
+ test -z "$(icon32dir)" || $(MKDIR_P) "$(DESTDIR)$(icon32dir)"
+ @list='$(icon32_DATA)'; test -n "$(icon32dir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(icon32DATA_INSTALL) $$d$$p $(DESTDIR)$(icon32dir)/$$f"; \
- $(icon32DATA_INSTALL) $$d$$p $(DESTDIR)$(icon32dir)/$$f; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icon32dir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(icon32dir)" || exit $$?; \
done
uninstall-icon32DATA:
@$(NORMAL_UNINSTALL)
- @list='$(icon32_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(icon32dir)/$$f"; \
- rm -f $(DESTDIR)$(icon32dir)/$$f; \
- done
-icon48DATA_INSTALL = $(INSTALL_DATA)
+ @list='$(icon32_DATA)'; test -n "$(icon32dir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(icon32dir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(icon32dir)" && rm -f $$files
install-icon48DATA: $(icon48_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(icon48dir)
- @list='$(icon48_DATA)'; for p in $$list; do \
+ test -z "$(icon48dir)" || $(MKDIR_P) "$(DESTDIR)$(icon48dir)"
+ @list='$(icon48_DATA)'; test -n "$(icon48dir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(icon48DATA_INSTALL) $$d$$p $(DESTDIR)$(icon48dir)/$$f"; \
- $(icon48DATA_INSTALL) $$d$$p $(DESTDIR)$(icon48dir)/$$f; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icon48dir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(icon48dir)" || exit $$?; \
done
uninstall-icon48DATA:
@$(NORMAL_UNINSTALL)
- @list='$(icon48_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(icon48dir)/$$f"; \
- rm -f $(DESTDIR)$(icon48dir)/$$f; \
- done
-icon64DATA_INSTALL = $(INSTALL_DATA)
+ @list='$(icon48_DATA)'; test -n "$(icon48dir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(icon48dir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(icon48dir)" && rm -f $$files
install-icon64DATA: $(icon64_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(icon64dir)
- @list='$(icon64_DATA)'; for p in $$list; do \
+ test -z "$(icon64dir)" || $(MKDIR_P) "$(DESTDIR)$(icon64dir)"
+ @list='$(icon64_DATA)'; test -n "$(icon64dir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(icon64DATA_INSTALL) $$d$$p $(DESTDIR)$(icon64dir)/$$f"; \
- $(icon64DATA_INSTALL) $$d$$p $(DESTDIR)$(icon64dir)/$$f; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icon64dir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(icon64dir)" || exit $$?; \
done
uninstall-icon64DATA:
@$(NORMAL_UNINSTALL)
- @list='$(icon64_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(icon64dir)/$$f"; \
- rm -f $(DESTDIR)$(icon64dir)/$$f; \
- done
+ @list='$(icon64_DATA)'; test -n "$(icon64dir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(icon64dir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(icon64dir)" && rm -f $$files
tags: TAGS
TAGS:
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ctags: CTAGS
+CTAGS:
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(DATA)
-
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(icon128dir) $(DESTDIR)$(icon16dir) $(DESTDIR)$(icon32dir) $(DESTDIR)$(icon48dir) $(DESTDIR)$(icon64dir)
-
+ for dir in "$(DESTDIR)$(icon128dir)" "$(DESTDIR)$(icon16dir)" "$(DESTDIR)$(icon32dir)" "$(DESTDIR)$(icon48dir)" "$(DESTDIR)$(icon64dir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -406,7 +538,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -414,7 +546,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -424,13 +557,17 @@ clean: clean-am
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
@@ -438,37 +575,67 @@ info-am:
install-data-am: install-icon128DATA install-icon16DATA \
install-icon32DATA install-icon48DATA install-icon64DATA
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
uninstall-am: uninstall-icon128DATA uninstall-icon16DATA \
- uninstall-icon32DATA uninstall-icon48DATA uninstall-icon64DATA \
- uninstall-info-am
+ uninstall-icon32DATA uninstall-icon48DATA uninstall-icon64DATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-exec \
- install-exec-am install-icon128DATA install-icon16DATA \
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-icon128DATA install-icon16DATA \
install-icon32DATA install-icon48DATA install-icon64DATA \
- install-info install-info-am install-man install-strip \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- uninstall uninstall-am uninstall-icon128DATA \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am uninstall uninstall-am uninstall-icon128DATA \
uninstall-icon16DATA uninstall-icon32DATA uninstall-icon48DATA \
- uninstall-icon64DATA uninstall-info-am
+ uninstall-icon64DATA
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/data/isophex/Makefile.in b/data/isophex/Makefile.in
index 2eae861..7655fa4 100644
--- a/data/isophex/Makefile.in
+++ b/data/isophex/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,85 +14,119 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-
+subdir = data/isophex
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(pkgdatadir)"
+DATA = $(pkgdata_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
pkgdatadir = $(datadir)/$(PACKAGE)/isophex
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -102,10 +137,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -113,27 +152,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -141,6 +192,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -151,17 +204,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -174,12 +248,37 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
pkgdata_DATA = \
darkness.png \
darkness.spec \
@@ -195,79 +294,104 @@ pkgdata_DATA = \
tiles.png \
tiles.spec
-
EXTRA_DIST = $(pkgdata_DATA)
-subdir = data/isophex
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(pkgdata_DATA)
-
-DIST_COMMON = Makefile.am Makefile.in
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu data/isophex/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
-pkgdataDATA_INSTALL = $(INSTALL_DATA)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/isophex/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu data/isophex/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
install-pkgdataDATA: $(pkgdata_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
+ test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \
- $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
done
uninstall-pkgdataDATA:
@$(NORMAL_UNINSTALL)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \
- rm -f $(DESTDIR)$(pkgdatadir)/$$f; \
- done
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
tags: TAGS
TAGS:
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ctags: CTAGS
+CTAGS:
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(DATA)
-
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
-
+ for dir in "$(DESTDIR)$(pkgdatadir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -279,7 +403,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -287,7 +411,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -297,45 +422,80 @@ clean: clean-am
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am: install-pkgdataDATA
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic
-uninstall-am: uninstall-info-am uninstall-pkgdataDATA
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkgdataDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
- install-pkgdataDATA install-strip installcheck installcheck-am \
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-pkgdataDATA install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic uninstall uninstall-am \
- uninstall-info-am uninstall-pkgdataDATA
+ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+ uninstall-am uninstall-pkgdataDATA
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/data/isotrident/Makefile.in b/data/isotrident/Makefile.in
index 7b7c322..1f9733b 100644
--- a/data/isotrident/Makefile.in
+++ b/data/isotrident/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,85 +14,119 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-
+subdir = data/isotrident
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(pkgdatadir)"
+DATA = $(pkgdata_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
pkgdatadir = $(datadir)/$(PACKAGE)/isotrident
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -102,10 +137,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -113,27 +152,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -141,6 +192,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -151,17 +204,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -174,12 +248,37 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
pkgdata_DATA = \
cities.png \
cities.spec \
@@ -202,79 +301,104 @@ pkgdata_DATA = \
unitextras.png \
unitextras.spec
-
EXTRA_DIST = $(pkgdata_DATA)
-subdir = data/isotrident
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(pkgdata_DATA)
-
-DIST_COMMON = Makefile.am Makefile.in
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu data/isotrident/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
-pkgdataDATA_INSTALL = $(INSTALL_DATA)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/isotrident/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu data/isotrident/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
install-pkgdataDATA: $(pkgdata_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
+ test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \
- $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
done
uninstall-pkgdataDATA:
@$(NORMAL_UNINSTALL)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \
- rm -f $(DESTDIR)$(pkgdatadir)/$$f; \
- done
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
tags: TAGS
TAGS:
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ctags: CTAGS
+CTAGS:
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(DATA)
-
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
-
+ for dir in "$(DESTDIR)$(pkgdatadir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -286,7 +410,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -294,7 +418,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -304,45 +429,80 @@ clean: clean-am
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am: install-pkgdataDATA
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic
-uninstall-am: uninstall-info-am uninstall-pkgdataDATA
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkgdataDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
- install-pkgdataDATA install-strip installcheck installcheck-am \
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-pkgdataDATA install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic uninstall uninstall-am \
- uninstall-info-am uninstall-pkgdataDATA
+ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+ uninstall-am uninstall-pkgdataDATA
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/data/misc/Makefile.in b/data/misc/Makefile.in
index e4cf1d4..598bc74 100644
--- a/data/misc/Makefile.in
+++ b/data/misc/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,85 +14,119 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-
+subdir = data/misc
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(pkgdatadir)"
+DATA = $(pkgdata_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
pkgdatadir = $(datadir)/$(PACKAGE)/misc
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -102,10 +137,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -113,27 +152,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -141,6 +192,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -151,17 +204,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -174,12 +248,37 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
pkgdata_DATA = \
buildings.png \
buildings.spec \
@@ -210,79 +309,104 @@ pkgdata_DATA = \
treaty.png \
treaty.spec
-
EXTRA_DIST = $(pkgdata_DATA)
-subdir = data/misc
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(pkgdata_DATA)
-
-DIST_COMMON = Makefile.am Makefile.in
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu data/misc/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
-pkgdataDATA_INSTALL = $(INSTALL_DATA)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/misc/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu data/misc/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
install-pkgdataDATA: $(pkgdata_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
+ test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \
- $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
done
uninstall-pkgdataDATA:
@$(NORMAL_UNINSTALL)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \
- rm -f $(DESTDIR)$(pkgdatadir)/$$f; \
- done
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
tags: TAGS
TAGS:
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ctags: CTAGS
+CTAGS:
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(DATA)
-
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
-
+ for dir in "$(DESTDIR)$(pkgdatadir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -294,7 +418,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -302,7 +426,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -312,45 +437,80 @@ clean: clean-am
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am: install-pkgdataDATA
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic
-uninstall-am: uninstall-info-am uninstall-pkgdataDATA
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkgdataDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
- install-pkgdataDATA install-strip installcheck installcheck-am \
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-pkgdataDATA install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic uninstall uninstall-am \
- uninstall-info-am uninstall-pkgdataDATA
+ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+ uninstall-am uninstall-pkgdataDATA
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/data/nation/Makefile.in b/data/nation/Makefile.in
index ea0aebf..64f5ef4 100644
--- a/data/nation/Makefile.in
+++ b/data/nation/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -15,85 +16,119 @@
@SET_MAKE@
# Note: After adding a new nation file, 'make Makefile.am'
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-
+subdir = data/nation
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(pkgdatadir)"
+DATA = $(pkgdata_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
pkgdatadir = $(datadir)/$(PACKAGE)/nation
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -104,10 +139,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -115,27 +154,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -143,6 +194,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -153,17 +206,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -176,12 +250,37 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
pkgdata_DATA = \
aborigines.ruleset \
afghani.ruleset \
@@ -309,79 +408,104 @@ pkgdata_DATA = \
westphalian.ruleset \
zulu.ruleset
-
EXTRA_DIST = $(pkgdata_DATA) Makefile.am.sh
-subdir = data/nation
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(pkgdata_DATA)
-
-DIST_COMMON = Makefile.am Makefile.in
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu data/nation/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
-pkgdataDATA_INSTALL = $(INSTALL_DATA)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/nation/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu data/nation/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
install-pkgdataDATA: $(pkgdata_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
+ test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \
- $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
done
uninstall-pkgdataDATA:
@$(NORMAL_UNINSTALL)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \
- rm -f $(DESTDIR)$(pkgdatadir)/$$f; \
- done
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
tags: TAGS
TAGS:
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ctags: CTAGS
+CTAGS:
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(DATA)
-
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
-
+ for dir in "$(DESTDIR)$(pkgdatadir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -393,7 +517,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -401,7 +525,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -411,45 +536,80 @@ clean: clean-am
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am: install-pkgdataDATA
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic
-uninstall-am: uninstall-info-am uninstall-pkgdataDATA
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkgdataDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
- install-pkgdataDATA install-strip installcheck installcheck-am \
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-pkgdataDATA install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic uninstall uninstall-am \
- uninstall-info-am uninstall-pkgdataDATA
+ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+ uninstall-am uninstall-pkgdataDATA
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/data/scenario/Makefile.in b/data/scenario/Makefile.in
index 9adc9e5..e0f5ae2 100644
--- a/data/scenario/Makefile.in
+++ b/data/scenario/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,85 +14,119 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-
+subdir = data/scenario
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(pkgdatadir)"
+DATA = $(pkgdata_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
pkgdatadir = $(datadir)/$(PACKAGE)/scenario
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -102,10 +137,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -113,27 +152,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -141,6 +192,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -151,17 +204,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -174,12 +248,37 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
zipped_files = \
british-isles-85x80-v2.80.sav.gz \
earth-160x90-v2.sav.gz \
@@ -189,7 +288,6 @@ zipped_files = \
iberian-peninsula-136x100-v1.0.sav.gz \
tutorial.sav.gz
-
unzipped_files = \
british-isles-85x80-v2.80.sav \
earth-160x90-v2.sav \
@@ -200,81 +298,105 @@ unzipped_files = \
tutorial.sav
pkgdata_DATA = $(zipped_files)
-
MOSTLYCLEANFILES = $(zipped_files)
-
EXTRA_DIST = $(unzipped_files)
-subdir = data/scenario
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(pkgdata_DATA)
-
-DIST_COMMON = Makefile.am Makefile.in
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu data/scenario/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
-pkgdataDATA_INSTALL = $(INSTALL_DATA)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/scenario/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu data/scenario/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
install-pkgdataDATA: $(pkgdata_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
+ test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \
- $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
done
uninstall-pkgdataDATA:
@$(NORMAL_UNINSTALL)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \
- rm -f $(DESTDIR)$(pkgdatadir)/$$f; \
- done
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
tags: TAGS
TAGS:
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ctags: CTAGS
+CTAGS:
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(DATA)
-
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
-
+ for dir in "$(DESTDIR)$(pkgdatadir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -286,7 +408,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -295,7 +417,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -305,49 +428,84 @@ clean: clean-am
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am: install-pkgdataDATA
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic
-uninstall-am: uninstall-info-am uninstall-pkgdataDATA
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkgdataDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
- install-pkgdataDATA install-strip installcheck installcheck-am \
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-pkgdataDATA install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic uninstall uninstall-am \
- uninstall-info-am uninstall-pkgdataDATA
+ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+ uninstall-am uninstall-pkgdataDATA
$(zipped_files): %.sav.gz: %.sav
$(GZIP) --best -c $< > $@
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/data/stdsounds/Makefile.in b/data/stdsounds/Makefile.in
index cd8b711..852a10f 100644
--- a/data/stdsounds/Makefile.in
+++ b/data/stdsounds/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,85 +14,119 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-
+subdir = data/stdsounds
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(pkgdatadir)"
+DATA = $(pkgdata_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
pkgdatadir = $(datadir)/$(PACKAGE)/stdsounds
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -102,10 +137,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -113,27 +152,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -141,6 +192,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -151,17 +204,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -174,12 +248,37 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
pkgdata_DATA = \
foot3.ogg \
inh2o.ogg \
@@ -198,79 +297,104 @@ pkgdata_DATA = \
wall01.ogg \
woodbrk.ogg
-
EXTRA_DIST = $(pkgdata_DATA)
-subdir = data/stdsounds
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(pkgdata_DATA)
-
-DIST_COMMON = Makefile.am Makefile.in
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu data/stdsounds/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
-pkgdataDATA_INSTALL = $(INSTALL_DATA)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/stdsounds/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu data/stdsounds/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
install-pkgdataDATA: $(pkgdata_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
+ test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \
- $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
done
uninstall-pkgdataDATA:
@$(NORMAL_UNINSTALL)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \
- rm -f $(DESTDIR)$(pkgdatadir)/$$f; \
- done
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
tags: TAGS
TAGS:
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ctags: CTAGS
+CTAGS:
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(DATA)
-
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
-
+ for dir in "$(DESTDIR)$(pkgdatadir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -282,7 +406,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -290,7 +414,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -300,45 +425,80 @@ clean: clean-am
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am: install-pkgdataDATA
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic
-uninstall-am: uninstall-info-am uninstall-pkgdataDATA
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkgdataDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
- install-pkgdataDATA install-strip installcheck installcheck-am \
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-pkgdataDATA install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic uninstall uninstall-am \
- uninstall-info-am uninstall-pkgdataDATA
+ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+ uninstall-am uninstall-pkgdataDATA
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/data/themes/Makefile.in b/data/themes/Makefile.in
index 15c4fb2..7a838a2 100644
--- a/data/themes/Makefile.in
+++ b/data/themes/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,84 +14,135 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = data/themes
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+ distdir
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = gui-gtk-2.0 gui-sdl
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+ dir0=`pwd`; \
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+ sed_rest='s,^[^/]*/*,,'; \
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+ sed_butlast='s,/*[^/]*$$,,'; \
+ while test -n "$$dir1"; do \
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+ if test "$$first" != "."; then \
+ if test "$$first" = ".."; then \
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+ else \
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+ if test "$$first2" = "$$first"; then \
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+ else \
+ dir2="../$$dir2"; \
+ fi; \
+ dir0="$$dir0"/"$$first"; \
+ fi; \
+ fi; \
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+ done; \
+ reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -101,10 +153,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -112,27 +168,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -140,6 +208,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -150,17 +220,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -173,35 +264,72 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
@CLIENT_GUI_GTK_2_0_TRUE at SUBDIRS = gui-gtk-2.0
@CLIENT_GUI_SDL_TRUE at SUBDIRS = gui-sdl
-subdir = data/themes
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
- uninstall-info-recursive all-recursive install-data-recursive \
- install-exec-recursive installdirs-recursive install-recursive \
- uninstall-recursive check-recursive installcheck-recursive
-DIST_COMMON = Makefile.am Makefile.in
-DIST_SUBDIRS = gui-gtk-2.0 gui-sdl
all: all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu data/themes/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/themes/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu data/themes/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
@@ -210,7 +338,13 @@ uninstall-info-am:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @set fnord $$MAKEFLAGS; amf=$$2; \
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -221,16 +355,21 @@ $(RECURSIVE_TARGETS):
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
- @set fnord $$MAKEFLAGS; amf=$$2; \
+$(RECURSIVE_CLEAN_TARGETS):
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -250,89 +389,137 @@ maintainer-clean-recursive:
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+ctags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
-
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ empty_fix=.; \
+ else \
+ include_option=--include; \
+ empty_fix=; \
+ fi; \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+ test ! -f $$subdir/TAGS || \
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d $(distdir)/$$subdir \
- || mkdir $(distdir)/$$subdir \
+ test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
- (cd $$subdir && \
+ fi; \
+ done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+ dir1=$$subdir; dir2="$(top_distdir)"; \
+ $(am__relativize); \
+ new_top_distdir=$$reldir; \
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+ ($(am__cd) $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$(top_distdir)" \
- distdir=../$(distdir)/$$subdir \
+ top_distdir="$$new_top_distdir" \
+ distdir="$$new_distdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
+ am__skip_mode_fix=: \
distdir) \
|| exit 1; \
fi; \
@@ -342,7 +529,6 @@ check: check-recursive
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
-
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
@@ -354,7 +540,7 @@ install-am: all-am
installcheck: installcheck-recursive
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -362,7 +548,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -372,53 +559,83 @@ clean: clean-recursive
clean-am: clean-generic mostlyclean-am
distclean: distclean-recursive
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic distclean-tags
dvi: dvi-recursive
dvi-am:
+html: html-recursive
+
+html-am:
+
info: info-recursive
info-am:
install-data-am:
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-recursive
+
+install-html-am:
+
install-info: install-info-recursive
+install-info-am:
+
install-man:
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-recursive
mostlyclean-am: mostlyclean-generic
-uninstall-am: uninstall-info-am
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
- clean-generic clean-recursive distclean distclean-generic \
- distclean-recursive distclean-tags distdir dvi dvi-am \
- dvi-recursive info info-am info-recursive install install-am \
- install-data install-data-am install-data-recursive \
- install-exec install-exec-am install-exec-recursive \
- install-info install-info-am install-info-recursive install-man \
- install-recursive install-strip installcheck installcheck-am \
- installdirs installdirs-am installdirs-recursive \
- maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-generic \
- mostlyclean-recursive tags tags-recursive uninstall \
- uninstall-am uninstall-info-am uninstall-info-recursive \
- uninstall-recursive
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+ install-am install-strip tags-recursive
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am check check-am clean clean-generic ctags \
+ ctags-recursive distclean distclean-generic distclean-tags \
+ distdir dvi dvi-am html html-am info info-am install \
+ install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ installdirs-am maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
+ tags-recursive uninstall uninstall-am
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/data/themes/gui-gtk-2.0/Freeciv/Makefile.in b/data/themes/gui-gtk-2.0/Freeciv/Makefile.in
index e4af2ca..327dacf 100644
--- a/data/themes/gui-gtk-2.0/Freeciv/Makefile.in
+++ b/data/themes/gui-gtk-2.0/Freeciv/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,84 +14,135 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = data/themes/gui-gtk-2.0/Freeciv
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+ distdir
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+ dir0=`pwd`; \
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+ sed_rest='s,^[^/]*/*,,'; \
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+ sed_butlast='s,/*[^/]*$$,,'; \
+ while test -n "$$dir1"; do \
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+ if test "$$first" != "."; then \
+ if test "$$first" = ".."; then \
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+ else \
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+ if test "$$first2" = "$$first"; then \
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+ else \
+ dir2="../$$dir2"; \
+ fi; \
+ dir0="$$dir0"/"$$first"; \
+ fi; \
+ fi; \
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+ done; \
+ reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -101,10 +153,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -112,27 +168,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -140,6 +208,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -150,17 +220,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -173,34 +264,71 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
SUBDIRS = gtk-2.0
-subdir = data/themes/gui-gtk-2.0/Freeciv
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
- uninstall-info-recursive all-recursive install-data-recursive \
- install-exec-recursive installdirs-recursive install-recursive \
- uninstall-recursive check-recursive installcheck-recursive
-DIST_COMMON = Makefile.am Makefile.in
-DIST_SUBDIRS = $(SUBDIRS)
all: all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
@@ -209,7 +337,13 @@ uninstall-info-am:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @set fnord $$MAKEFLAGS; amf=$$2; \
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -220,16 +354,21 @@ $(RECURSIVE_TARGETS):
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
- @set fnord $$MAKEFLAGS; amf=$$2; \
+$(RECURSIVE_CLEAN_TARGETS):
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -249,89 +388,137 @@ maintainer-clean-recursive:
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+ctags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
-
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ empty_fix=.; \
+ else \
+ include_option=--include; \
+ empty_fix=; \
+ fi; \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+ test ! -f $$subdir/TAGS || \
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
- list='$(SUBDIRS)'; for subdir in $$list; do \
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d $(distdir)/$$subdir \
- || mkdir $(distdir)/$$subdir \
+ test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
- (cd $$subdir && \
+ fi; \
+ done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+ dir1=$$subdir; dir2="$(top_distdir)"; \
+ $(am__relativize); \
+ new_top_distdir=$$reldir; \
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+ ($(am__cd) $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$(top_distdir)" \
- distdir=../$(distdir)/$$subdir \
+ top_distdir="$$new_top_distdir" \
+ distdir="$$new_distdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
+ am__skip_mode_fix=: \
distdir) \
|| exit 1; \
fi; \
@@ -341,7 +528,6 @@ check: check-recursive
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
-
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
@@ -353,7 +539,7 @@ install-am: all-am
installcheck: installcheck-recursive
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -361,7 +547,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -371,53 +558,83 @@ clean: clean-recursive
clean-am: clean-generic mostlyclean-am
distclean: distclean-recursive
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic distclean-tags
dvi: dvi-recursive
dvi-am:
+html: html-recursive
+
+html-am:
+
info: info-recursive
info-am:
install-data-am:
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-recursive
+
+install-html-am:
+
install-info: install-info-recursive
+install-info-am:
+
install-man:
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-recursive
mostlyclean-am: mostlyclean-generic
-uninstall-am: uninstall-info-am
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
- clean-generic clean-recursive distclean distclean-generic \
- distclean-recursive distclean-tags distdir dvi dvi-am \
- dvi-recursive info info-am info-recursive install install-am \
- install-data install-data-am install-data-recursive \
- install-exec install-exec-am install-exec-recursive \
- install-info install-info-am install-info-recursive install-man \
- install-recursive install-strip installcheck installcheck-am \
- installdirs installdirs-am installdirs-recursive \
- maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-generic \
- mostlyclean-recursive tags tags-recursive uninstall \
- uninstall-am uninstall-info-am uninstall-info-recursive \
- uninstall-recursive
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+ install-am install-strip tags-recursive
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am check check-am clean clean-generic ctags \
+ ctags-recursive distclean distclean-generic distclean-tags \
+ distdir dvi dvi-am html html-am info info-am install \
+ install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ installdirs-am maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
+ tags-recursive uninstall uninstall-am
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
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 7283d7d..58ec023 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
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,85 +14,119 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-
+subdir = data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Arrows
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(pkgdatadir)"
+DATA = $(pkgdata_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
pkgdatadir = $(datadir)/$(PACKAGE)/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Arrows
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -102,10 +137,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -113,27 +152,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -141,6 +192,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -151,17 +204,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -174,12 +248,37 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
pkgdata_DATA = \
arrow-down.png \
arrow-left.png \
@@ -188,79 +287,104 @@ pkgdata_DATA = \
arrow-right-prelight.png \
arrow-up.png
-
EXTRA_DIST = $(pkgdata_DATA)
-subdir = data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Arrows
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(pkgdata_DATA)
-
-DIST_COMMON = Makefile.am Makefile.in
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Arrows/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
-pkgdataDATA_INSTALL = $(INSTALL_DATA)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Arrows/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Arrows/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
install-pkgdataDATA: $(pkgdata_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
+ test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \
- $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
done
uninstall-pkgdataDATA:
@$(NORMAL_UNINSTALL)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \
- rm -f $(DESTDIR)$(pkgdatadir)/$$f; \
- done
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
tags: TAGS
TAGS:
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ctags: CTAGS
+CTAGS:
-top_distdir = ../../../../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(DATA)
-
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
-
+ for dir in "$(DESTDIR)$(pkgdatadir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -272,7 +396,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -280,7 +404,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -290,45 +415,80 @@ clean: clean-am
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am: install-pkgdataDATA
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic
-uninstall-am: uninstall-info-am uninstall-pkgdataDATA
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkgdataDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
- install-pkgdataDATA install-strip installcheck installcheck-am \
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-pkgdataDATA install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic uninstall uninstall-am \
- uninstall-info-am uninstall-pkgdataDATA
+ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+ uninstall-am uninstall-pkgdataDATA
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
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 18fbdd7..9f92ae7 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
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,85 +14,119 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-
+subdir = data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Buttons
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(pkgdatadir)"
+DATA = $(pkgdata_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
pkgdatadir = $(datadir)/$(PACKAGE)/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Buttons
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -102,10 +137,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -113,27 +152,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -141,6 +192,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -151,17 +204,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -174,12 +248,37 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
pkgdata_DATA = \
button-default.png \
button-insensitive.png \
@@ -187,79 +286,104 @@ pkgdata_DATA = \
button-prelight.png \
button-pressed.png
-
EXTRA_DIST = $(pkgdata_DATA)
-subdir = data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Buttons
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(pkgdata_DATA)
-
-DIST_COMMON = Makefile.am Makefile.in
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Buttons/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
-pkgdataDATA_INSTALL = $(INSTALL_DATA)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Buttons/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Buttons/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
install-pkgdataDATA: $(pkgdata_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
+ test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \
- $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
done
uninstall-pkgdataDATA:
@$(NORMAL_UNINSTALL)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \
- rm -f $(DESTDIR)$(pkgdatadir)/$$f; \
- done
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
tags: TAGS
TAGS:
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ctags: CTAGS
+CTAGS:
-top_distdir = ../../../../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(DATA)
-
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
-
+ for dir in "$(DESTDIR)$(pkgdatadir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -271,7 +395,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -279,7 +403,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -289,45 +414,80 @@ clean: clean-am
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am: install-pkgdataDATA
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic
-uninstall-am: uninstall-info-am uninstall-pkgdataDATA
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkgdataDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
- install-pkgdataDATA install-strip installcheck installcheck-am \
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-pkgdataDATA install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic uninstall uninstall-am \
- uninstall-info-am uninstall-pkgdataDATA
+ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+ uninstall-am uninstall-pkgdataDATA
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
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 b2462a7..138f520 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
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,85 +14,119 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-
+subdir = data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(pkgdatadir)"
+DATA = $(pkgdata_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
pkgdatadir = $(datadir)/$(PACKAGE)/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -102,10 +137,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -113,27 +152,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -141,6 +192,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -151,17 +204,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -174,12 +248,37 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
pkgdata_DATA = \
check1.png \
check2.png \
@@ -192,79 +291,104 @@ pkgdata_DATA = \
option3.png \
option4.png
-
EXTRA_DIST = $(pkgdata_DATA)
-subdir = data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(pkgdata_DATA)
-
-DIST_COMMON = Makefile.am Makefile.in
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
-pkgdataDATA_INSTALL = $(INSTALL_DATA)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
install-pkgdataDATA: $(pkgdata_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
+ test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \
- $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
done
uninstall-pkgdataDATA:
@$(NORMAL_UNINSTALL)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \
- rm -f $(DESTDIR)$(pkgdatadir)/$$f; \
- done
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
tags: TAGS
TAGS:
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ctags: CTAGS
+CTAGS:
-top_distdir = ../../../../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(DATA)
-
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
-
+ for dir in "$(DESTDIR)$(pkgdatadir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -276,7 +400,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -284,7 +408,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -294,45 +419,80 @@ clean: clean-am
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am: install-pkgdataDATA
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic
-uninstall-am: uninstall-info-am uninstall-pkgdataDATA
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkgdataDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
- install-pkgdataDATA install-strip installcheck installcheck-am \
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-pkgdataDATA install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic uninstall uninstall-am \
- uninstall-info-am uninstall-pkgdataDATA
+ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+ uninstall-am uninstall-pkgdataDATA
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
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 502c03e..1c1bfcc 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
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,85 +14,119 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-
+subdir = data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Combo
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(pkgdatadir)"
+DATA = $(pkgdata_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
pkgdatadir = $(datadir)/$(PACKAGE)/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Combo
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -102,10 +137,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -113,27 +152,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -141,6 +192,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -151,17 +204,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -174,12 +248,37 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
pkgdata_DATA = \
combo-arrow-insens.png \
combo-arrow.png \
@@ -188,79 +287,104 @@ pkgdata_DATA = \
combo-normal.png \
combo-prelight.png
-
EXTRA_DIST = $(pkgdata_DATA)
-subdir = data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Combo
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(pkgdata_DATA)
-
-DIST_COMMON = Makefile.am Makefile.in
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Combo/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
-pkgdataDATA_INSTALL = $(INSTALL_DATA)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Combo/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Combo/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
install-pkgdataDATA: $(pkgdata_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
+ test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \
- $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
done
uninstall-pkgdataDATA:
@$(NORMAL_UNINSTALL)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \
- rm -f $(DESTDIR)$(pkgdatadir)/$$f; \
- done
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
tags: TAGS
TAGS:
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ctags: CTAGS
+CTAGS:
-top_distdir = ../../../../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(DATA)
-
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
-
+ for dir in "$(DESTDIR)$(pkgdatadir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -272,7 +396,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -280,7 +404,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -290,45 +415,80 @@ clean: clean-am
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am: install-pkgdataDATA
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic
-uninstall-am: uninstall-info-am uninstall-pkgdataDATA
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkgdataDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
- install-pkgdataDATA install-strip installcheck installcheck-am \
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-pkgdataDATA install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic uninstall uninstall-am \
- uninstall-info-am uninstall-pkgdataDATA
+ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+ uninstall-am uninstall-pkgdataDATA
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
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 3c87ff3..89a9d55 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
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,85 +14,119 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-
+subdir = data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Frame-Gap
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(pkgdatadir)"
+DATA = $(pkgdata_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
pkgdatadir = $(datadir)/$(PACKAGE)/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Frame-Gap
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -102,10 +137,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -113,27 +152,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -141,6 +192,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -151,17 +204,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -174,91 +248,141 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
pkgdata_DATA = \
frame1.png \
frame2.png \
frame-gap-end.png \
frame-gap-start.png
-
EXTRA_DIST = $(pkgdata_DATA)
-subdir = data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Frame-Gap
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(pkgdata_DATA)
-
-DIST_COMMON = Makefile.am Makefile.in
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Frame-Gap/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
-pkgdataDATA_INSTALL = $(INSTALL_DATA)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Frame-Gap/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Frame-Gap/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
install-pkgdataDATA: $(pkgdata_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
+ test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \
- $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
done
uninstall-pkgdataDATA:
@$(NORMAL_UNINSTALL)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \
- rm -f $(DESTDIR)$(pkgdatadir)/$$f; \
- done
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
tags: TAGS
TAGS:
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ctags: CTAGS
+CTAGS:
-top_distdir = ../../../../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(DATA)
-
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
-
+ for dir in "$(DESTDIR)$(pkgdatadir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -270,7 +394,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -278,7 +402,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -288,45 +413,80 @@ clean: clean-am
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am: install-pkgdataDATA
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic
-uninstall-am: uninstall-info-am uninstall-pkgdataDATA
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkgdataDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
- install-pkgdataDATA install-strip installcheck installcheck-am \
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-pkgdataDATA install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic uninstall uninstall-am \
- uninstall-info-am uninstall-pkgdataDATA
+ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+ uninstall-am uninstall-pkgdataDATA
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
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 d5dee9b..79ade68 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
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,85 +14,119 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-
+subdir = data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Handles
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(pkgdatadir)"
+DATA = $(pkgdata_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
pkgdatadir = $(datadir)/$(PACKAGE)/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Handles
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -102,10 +137,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -113,27 +152,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -141,6 +192,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -151,17 +204,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -174,89 +248,139 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
pkgdata_DATA = \
handle-h.png \
handle-v.png
-
EXTRA_DIST = $(pkgdata_DATA)
-subdir = data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Handles
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(pkgdata_DATA)
-
-DIST_COMMON = Makefile.am Makefile.in
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Handles/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
-pkgdataDATA_INSTALL = $(INSTALL_DATA)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Handles/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Handles/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
install-pkgdataDATA: $(pkgdata_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
+ test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \
- $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
done
uninstall-pkgdataDATA:
@$(NORMAL_UNINSTALL)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \
- rm -f $(DESTDIR)$(pkgdatadir)/$$f; \
- done
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
tags: TAGS
TAGS:
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ctags: CTAGS
+CTAGS:
-top_distdir = ../../../../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(DATA)
-
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
-
+ for dir in "$(DESTDIR)$(pkgdatadir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -268,7 +392,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -276,7 +400,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -286,45 +411,80 @@ clean: clean-am
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am: install-pkgdataDATA
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic
-uninstall-am: uninstall-info-am uninstall-pkgdataDATA
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkgdataDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
- install-pkgdataDATA install-strip installcheck installcheck-am \
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-pkgdataDATA install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic uninstall uninstall-am \
- uninstall-info-am uninstall-pkgdataDATA
+ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+ uninstall-am uninstall-pkgdataDATA
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
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 013d38a..59190f0 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
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,85 +14,119 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-
+subdir = data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Lines
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(pkgdatadir)"
+DATA = $(pkgdata_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
pkgdatadir = $(datadir)/$(PACKAGE)/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Lines
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -102,10 +137,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -113,27 +152,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -141,6 +192,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -151,17 +204,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -174,89 +248,139 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
pkgdata_DATA = \
line-h.png \
line-v.png
-
EXTRA_DIST = $(pkgdata_DATA)
-subdir = data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Lines
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(pkgdata_DATA)
-
-DIST_COMMON = Makefile.am Makefile.in
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Lines/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
-pkgdataDATA_INSTALL = $(INSTALL_DATA)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Lines/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Lines/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
install-pkgdataDATA: $(pkgdata_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
+ test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \
- $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
done
uninstall-pkgdataDATA:
@$(NORMAL_UNINSTALL)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \
- rm -f $(DESTDIR)$(pkgdatadir)/$$f; \
- done
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
tags: TAGS
TAGS:
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ctags: CTAGS
+CTAGS:
-top_distdir = ../../../../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(DATA)
-
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
-
+ for dir in "$(DESTDIR)$(pkgdatadir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -268,7 +392,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -276,7 +400,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -286,45 +411,80 @@ clean: clean-am
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am: install-pkgdataDATA
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic
-uninstall-am: uninstall-info-am uninstall-pkgdataDATA
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkgdataDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
- install-pkgdataDATA install-strip installcheck installcheck-am \
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-pkgdataDATA install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic uninstall uninstall-am \
- uninstall-info-am uninstall-pkgdataDATA
+ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+ uninstall-am uninstall-pkgdataDATA
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
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 c3c8a0c..95a5507 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
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,85 +14,119 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-
+subdir = data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ListHeaders
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(pkgdatadir)"
+DATA = $(pkgdata_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
pkgdatadir = $(datadir)/$(PACKAGE)/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ListHeaders
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -102,10 +137,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -113,27 +152,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -141,6 +192,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -151,17 +204,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -174,91 +248,141 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
pkgdata_DATA = \
list_header-insens.png \
list_header.png \
list_header-prelight.png \
list_header-pressed.png
-
EXTRA_DIST = $(pkgdata_DATA)
-subdir = data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ListHeaders
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(pkgdata_DATA)
-
-DIST_COMMON = Makefile.am Makefile.in
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ListHeaders/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
-pkgdataDATA_INSTALL = $(INSTALL_DATA)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ListHeaders/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ListHeaders/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
install-pkgdataDATA: $(pkgdata_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
+ test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \
- $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
done
uninstall-pkgdataDATA:
@$(NORMAL_UNINSTALL)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \
- rm -f $(DESTDIR)$(pkgdatadir)/$$f; \
- done
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
tags: TAGS
TAGS:
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ctags: CTAGS
+CTAGS:
-top_distdir = ../../../../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(DATA)
-
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
-
+ for dir in "$(DESTDIR)$(pkgdatadir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -270,7 +394,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -278,7 +402,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -288,45 +413,80 @@ clean: clean-am
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am: install-pkgdataDATA
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic
-uninstall-am: uninstall-info-am uninstall-pkgdataDATA
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkgdataDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
- install-pkgdataDATA install-strip installcheck installcheck-am \
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-pkgdataDATA install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic uninstall uninstall-am \
- uninstall-info-am uninstall-pkgdataDATA
+ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+ uninstall-am uninstall-pkgdataDATA
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
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 b8d05d9..02ffc7c 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
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,85 +14,159 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-
+subdir = data/themes/gui-gtk-2.0/Freeciv/gtk-2.0
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(pkgdatadir)"
+DATA = $(pkgdata_DATA)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+ distdir
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+ dir0=`pwd`; \
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+ sed_rest='s,^[^/]*/*,,'; \
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+ sed_butlast='s,/*[^/]*$$,,'; \
+ while test -n "$$dir1"; do \
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+ if test "$$first" != "."; then \
+ if test "$$first" = ".."; then \
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+ else \
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+ if test "$$first2" = "$$first"; then \
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+ else \
+ dir2="../$$dir2"; \
+ fi; \
+ dir0="$$dir0"/"$$first"; \
+ fi; \
+ fi; \
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+ done; \
+ reldir="$$dir2"
pkgdatadir = $(datadir)/$(PACKAGE)/themes/gui-gtk-2.0/Freeciv/gtk-2.0
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -102,10 +177,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -113,27 +192,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -141,6 +232,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -151,17 +244,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -174,66 +288,101 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
SUBDIRS = Arrows Buttons Check-Radio Combo Frame-Gap Handles Lines \
ListHeaders Menu-Menubar Others Panel ProgressBar Range \
Scrollbars Shadows Spin Tabs Toolbar
-
pkgdata_DATA = \
bg.png \
gtkrc \
menubar.rc \
panel.rc
-
EXTRA_DIST = $(pkgdata_DATA)
-subdir = data/themes/gui-gtk-2.0/Freeciv/gtk-2.0
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(pkgdata_DATA)
-
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
- uninstall-info-recursive all-recursive install-data-recursive \
- install-exec-recursive installdirs-recursive install-recursive \
- uninstall-recursive check-recursive installcheck-recursive
-DIST_COMMON = Makefile.am Makefile.in
-DIST_SUBDIRS = $(SUBDIRS)
all: all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
-pkgdataDATA_INSTALL = $(INSTALL_DATA)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
install-pkgdataDATA: $(pkgdata_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
+ test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \
- $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
done
uninstall-pkgdataDATA:
@$(NORMAL_UNINSTALL)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \
- rm -f $(DESTDIR)$(pkgdatadir)/$$f; \
- done
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
@@ -242,7 +391,13 @@ uninstall-pkgdataDATA:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @set fnord $$MAKEFLAGS; amf=$$2; \
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -253,16 +408,21 @@ $(RECURSIVE_TARGETS):
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
- @set fnord $$MAKEFLAGS; amf=$$2; \
+$(RECURSIVE_CLEAN_TARGETS):
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -282,89 +442,137 @@ maintainer-clean-recursive:
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+ctags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
-
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ empty_fix=.; \
+ else \
+ include_option=--include; \
+ empty_fix=; \
+ fi; \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+ test ! -f $$subdir/TAGS || \
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../../../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
- list='$(SUBDIRS)'; for subdir in $$list; do \
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d $(distdir)/$$subdir \
- || mkdir $(distdir)/$$subdir \
+ test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
- (cd $$subdir && \
+ fi; \
+ done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+ dir1=$$subdir; dir2="$(top_distdir)"; \
+ $(am__relativize); \
+ new_top_distdir=$$reldir; \
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+ ($(am__cd) $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$(top_distdir)" \
- distdir=../$(distdir)/$$subdir \
+ top_distdir="$$new_top_distdir" \
+ distdir="$$new_distdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
+ am__skip_mode_fix=: \
distdir) \
|| exit 1; \
fi; \
@@ -374,8 +582,9 @@ check: check-recursive
all-am: Makefile $(DATA)
installdirs: installdirs-recursive
installdirs-am:
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
-
+ for dir in "$(DESTDIR)$(pkgdatadir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
@@ -387,7 +596,7 @@ install-am: all-am
installcheck: installcheck-recursive
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -395,7 +604,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -405,53 +615,84 @@ clean: clean-recursive
clean-am: clean-generic mostlyclean-am
distclean: distclean-recursive
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic distclean-tags
dvi: dvi-recursive
dvi-am:
+html: html-recursive
+
+html-am:
+
info: info-recursive
info-am:
install-data-am: install-pkgdataDATA
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-recursive
+
+install-html-am:
+
install-info: install-info-recursive
+install-info-am:
+
install-man:
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-recursive
mostlyclean-am: mostlyclean-generic
-uninstall-am: uninstall-info-am uninstall-pkgdataDATA
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
- clean-generic clean-recursive distclean distclean-generic \
- distclean-recursive distclean-tags distdir dvi dvi-am \
- dvi-recursive info info-am info-recursive install install-am \
- install-data install-data-am install-data-recursive \
- install-exec install-exec-am install-exec-recursive \
- install-info install-info-am install-info-recursive install-man \
- install-pkgdataDATA install-recursive install-strip \
- installcheck installcheck-am installdirs installdirs-am \
- installdirs-recursive maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-generic \
- mostlyclean-recursive tags tags-recursive uninstall \
- uninstall-am uninstall-info-am uninstall-info-recursive \
- uninstall-pkgdataDATA uninstall-recursive
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-pkgdataDATA
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+ install-am install-strip tags-recursive
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am check check-am clean clean-generic ctags \
+ ctags-recursive distclean distclean-generic distclean-tags \
+ distdir dvi dvi-am html html-am info info-am install \
+ install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-pkgdataDATA install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
+ installdirs installdirs-am maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+ uninstall-pkgdataDATA
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
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 7e3f564..8008aad 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
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,85 +14,119 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-
+subdir = data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Menu-Menubar
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(pkgdatadir)"
+DATA = $(pkgdata_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
pkgdatadir = $(datadir)/$(PACKAGE)/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Menu-Menubar
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -102,10 +137,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -113,27 +152,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -141,6 +192,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -151,17 +204,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -174,12 +248,37 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
pkgdata_DATA = \
menubar-item.png \
menubar.png \
@@ -188,79 +287,104 @@ pkgdata_DATA = \
menu-overlay.png \
menu.png
-
EXTRA_DIST = $(pkgdata_DATA)
-subdir = data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Menu-Menubar
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(pkgdata_DATA)
-
-DIST_COMMON = Makefile.am Makefile.in
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Menu-Menubar/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
-pkgdataDATA_INSTALL = $(INSTALL_DATA)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Menu-Menubar/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Menu-Menubar/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
install-pkgdataDATA: $(pkgdata_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
+ test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \
- $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
done
uninstall-pkgdataDATA:
@$(NORMAL_UNINSTALL)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \
- rm -f $(DESTDIR)$(pkgdatadir)/$$f; \
- done
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
tags: TAGS
TAGS:
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ctags: CTAGS
+CTAGS:
-top_distdir = ../../../../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(DATA)
-
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
-
+ for dir in "$(DESTDIR)$(pkgdatadir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -272,7 +396,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -280,7 +404,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -290,45 +415,80 @@ clean: clean-am
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am: install-pkgdataDATA
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic
-uninstall-am: uninstall-info-am uninstall-pkgdataDATA
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkgdataDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
- install-pkgdataDATA install-strip installcheck installcheck-am \
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-pkgdataDATA install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic uninstall uninstall-am \
- uninstall-info-am uninstall-pkgdataDATA
+ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+ uninstall-am uninstall-pkgdataDATA
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
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 e46a324..7f0a187 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
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,85 +14,119 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-
+subdir = data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Others
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(pkgdatadir)"
+DATA = $(pkgdata_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
pkgdatadir = $(datadir)/$(PACKAGE)/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Others
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -102,10 +137,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -113,27 +152,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -141,6 +192,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -151,17 +204,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -174,90 +248,140 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
pkgdata_DATA = \
focus.png \
null.png \
ruler.png
-
EXTRA_DIST = $(pkgdata_DATA)
-subdir = data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Others
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(pkgdata_DATA)
-
-DIST_COMMON = Makefile.am Makefile.in
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Others/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
-pkgdataDATA_INSTALL = $(INSTALL_DATA)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Others/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Others/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
install-pkgdataDATA: $(pkgdata_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
+ test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \
- $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
done
uninstall-pkgdataDATA:
@$(NORMAL_UNINSTALL)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \
- rm -f $(DESTDIR)$(pkgdatadir)/$$f; \
- done
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
tags: TAGS
TAGS:
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ctags: CTAGS
+CTAGS:
-top_distdir = ../../../../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(DATA)
-
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
-
+ for dir in "$(DESTDIR)$(pkgdatadir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -269,7 +393,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -277,7 +401,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -287,45 +412,80 @@ clean: clean-am
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am: install-pkgdataDATA
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic
-uninstall-am: uninstall-info-am uninstall-pkgdataDATA
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkgdataDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
- install-pkgdataDATA install-strip installcheck installcheck-am \
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-pkgdataDATA install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic uninstall uninstall-am \
- uninstall-info-am uninstall-pkgdataDATA
+ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+ uninstall-am uninstall-pkgdataDATA
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
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 3099f45..6dadb1c 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
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,85 +14,119 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-
+subdir = data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Panel
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(pkgdatadir)"
+DATA = $(pkgdata_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
pkgdatadir = $(datadir)/$(PACKAGE)/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Panel
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -102,10 +137,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -113,27 +152,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -141,6 +192,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -151,17 +204,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -174,12 +248,37 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
pkgdata_DATA = \
panel-bg.png \
panelbutton1.png \
@@ -187,79 +286,104 @@ pkgdata_DATA = \
panelbutton3.png \
panelbutton4.png
-
EXTRA_DIST = $(pkgdata_DATA)
-subdir = data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Panel
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(pkgdata_DATA)
-
-DIST_COMMON = Makefile.am Makefile.in
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Panel/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
-pkgdataDATA_INSTALL = $(INSTALL_DATA)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Panel/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Panel/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
install-pkgdataDATA: $(pkgdata_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
+ test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \
- $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
done
uninstall-pkgdataDATA:
@$(NORMAL_UNINSTALL)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \
- rm -f $(DESTDIR)$(pkgdatadir)/$$f; \
- done
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
tags: TAGS
TAGS:
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ctags: CTAGS
+CTAGS:
-top_distdir = ../../../../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(DATA)
-
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
-
+ for dir in "$(DESTDIR)$(pkgdatadir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -271,7 +395,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -279,7 +403,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -289,45 +414,80 @@ clean: clean-am
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am: install-pkgdataDATA
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic
-uninstall-am: uninstall-info-am uninstall-pkgdataDATA
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkgdataDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
- install-pkgdataDATA install-strip installcheck installcheck-am \
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-pkgdataDATA install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic uninstall uninstall-am \
- uninstall-info-am uninstall-pkgdataDATA
+ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+ uninstall-am uninstall-pkgdataDATA
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
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 7790025..c07df1a 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
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,85 +14,119 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-
+subdir = data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ProgressBar
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(pkgdatadir)"
+DATA = $(pkgdata_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
pkgdatadir = $(datadir)/$(PACKAGE)/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ProgressBar
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -102,10 +137,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -113,27 +152,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -141,6 +192,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -151,17 +204,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -174,12 +248,37 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
pkgdata_DATA = \
progressbar-horiz-1.png \
progressbar-horiz-2.png \
@@ -188,79 +287,104 @@ pkgdata_DATA = \
t-progressbar-horiz.png \
t-progressbar-vert.png
-
EXTRA_DIST = $(pkgdata_DATA)
-subdir = data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ProgressBar
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(pkgdata_DATA)
-
-DIST_COMMON = Makefile.am Makefile.in
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ProgressBar/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
-pkgdataDATA_INSTALL = $(INSTALL_DATA)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ProgressBar/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ProgressBar/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
install-pkgdataDATA: $(pkgdata_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
+ test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \
- $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
done
uninstall-pkgdataDATA:
@$(NORMAL_UNINSTALL)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \
- rm -f $(DESTDIR)$(pkgdatadir)/$$f; \
- done
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
tags: TAGS
TAGS:
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ctags: CTAGS
+CTAGS:
-top_distdir = ../../../../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(DATA)
-
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
-
+ for dir in "$(DESTDIR)$(pkgdatadir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -272,7 +396,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -280,7 +404,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -290,45 +415,80 @@ clean: clean-am
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am: install-pkgdataDATA
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic
-uninstall-am: uninstall-info-am uninstall-pkgdataDATA
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkgdataDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
- install-pkgdataDATA install-strip installcheck installcheck-am \
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-pkgdataDATA install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic uninstall uninstall-am \
- uninstall-info-am uninstall-pkgdataDATA
+ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+ uninstall-am uninstall-pkgdataDATA
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
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 57f73ab..a15a925 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
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,85 +14,119 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-
+subdir = data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(pkgdatadir)"
+DATA = $(pkgdata_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
pkgdatadir = $(datadir)/$(PACKAGE)/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -102,10 +137,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -113,27 +152,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -141,6 +192,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -151,17 +204,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -174,12 +248,37 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
pkgdata_DATA = \
null.png \
slider-horiz.png \
@@ -189,79 +288,104 @@ pkgdata_DATA = \
trough-horizontal.png \
trough-vertical.png
-
EXTRA_DIST = $(pkgdata_DATA)
-subdir = data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(pkgdata_DATA)
-
-DIST_COMMON = Makefile.am Makefile.in
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
-pkgdataDATA_INSTALL = $(INSTALL_DATA)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
install-pkgdataDATA: $(pkgdata_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
+ test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \
- $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
done
uninstall-pkgdataDATA:
@$(NORMAL_UNINSTALL)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \
- rm -f $(DESTDIR)$(pkgdatadir)/$$f; \
- done
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
tags: TAGS
TAGS:
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ctags: CTAGS
+CTAGS:
-top_distdir = ../../../../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(DATA)
-
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
-
+ for dir in "$(DESTDIR)$(pkgdatadir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -273,7 +397,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -281,7 +405,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -291,45 +416,80 @@ clean: clean-am
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am: install-pkgdataDATA
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic
-uninstall-am: uninstall-info-am uninstall-pkgdataDATA
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkgdataDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
- install-pkgdataDATA install-strip installcheck installcheck-am \
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-pkgdataDATA install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic uninstall uninstall-am \
- uninstall-info-am uninstall-pkgdataDATA
+ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+ uninstall-am uninstall-pkgdataDATA
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
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 8b27d37..1561c91 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
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,85 +14,119 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-
+subdir = data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(pkgdatadir)"
+DATA = $(pkgdata_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
pkgdatadir = $(datadir)/$(PACKAGE)/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -102,10 +137,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -113,27 +152,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -141,6 +192,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -151,17 +204,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -174,12 +248,37 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
pkgdata_DATA = \
scroll-thumb-horiz.png \
scroll-thumb-vert.png \
@@ -205,79 +304,104 @@ pkgdata_DATA = \
trough-scrollbar-horiz.png \
trough-scrollbar-vert.png
-
EXTRA_DIST = $(pkgdata_DATA)
-subdir = data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(pkgdata_DATA)
-
-DIST_COMMON = Makefile.am Makefile.in
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
-pkgdataDATA_INSTALL = $(INSTALL_DATA)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
install-pkgdataDATA: $(pkgdata_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
+ test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \
- $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
done
uninstall-pkgdataDATA:
@$(NORMAL_UNINSTALL)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \
- rm -f $(DESTDIR)$(pkgdatadir)/$$f; \
- done
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
tags: TAGS
TAGS:
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ctags: CTAGS
+CTAGS:
-top_distdir = ../../../../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(DATA)
-
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
-
+ for dir in "$(DESTDIR)$(pkgdatadir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -289,7 +413,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -297,7 +421,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -307,45 +432,80 @@ clean: clean-am
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am: install-pkgdataDATA
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic
-uninstall-am: uninstall-info-am uninstall-pkgdataDATA
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkgdataDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
- install-pkgdataDATA install-strip installcheck installcheck-am \
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-pkgdataDATA install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic uninstall uninstall-am \
- uninstall-info-am uninstall-pkgdataDATA
+ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+ uninstall-am uninstall-pkgdataDATA
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
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 9c4a7ee..c2a5d91 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
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,85 +14,119 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-
+subdir = data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(pkgdatadir)"
+DATA = $(pkgdata_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
pkgdatadir = $(datadir)/$(PACKAGE)/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -102,10 +137,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -113,27 +152,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -141,6 +192,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -151,17 +204,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -174,12 +248,37 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
pkgdata_DATA = \
entry-shadow-in.png \
shadow-etched-out.png \
@@ -189,79 +288,104 @@ pkgdata_DATA = \
text-entry.png \
text.png
-
EXTRA_DIST = $(pkgdata_DATA)
-subdir = data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(pkgdata_DATA)
-
-DIST_COMMON = Makefile.am Makefile.in
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
-pkgdataDATA_INSTALL = $(INSTALL_DATA)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
install-pkgdataDATA: $(pkgdata_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
+ test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \
- $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
done
uninstall-pkgdataDATA:
@$(NORMAL_UNINSTALL)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \
- rm -f $(DESTDIR)$(pkgdatadir)/$$f; \
- done
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
tags: TAGS
TAGS:
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ctags: CTAGS
+CTAGS:
-top_distdir = ../../../../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(DATA)
-
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
-
+ for dir in "$(DESTDIR)$(pkgdatadir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -273,7 +397,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -281,7 +405,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -291,45 +416,80 @@ clean: clean-am
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am: install-pkgdataDATA
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic
-uninstall-am: uninstall-info-am uninstall-pkgdataDATA
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkgdataDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
- install-pkgdataDATA install-strip installcheck installcheck-am \
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-pkgdataDATA install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic uninstall uninstall-am \
- uninstall-info-am uninstall-pkgdataDATA
+ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+ uninstall-am uninstall-pkgdataDATA
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
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 8194bf6..b318985 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
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,85 +14,119 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-
+subdir = data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(pkgdatadir)"
+DATA = $(pkgdata_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
pkgdatadir = $(datadir)/$(PACKAGE)/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -102,10 +137,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -113,27 +152,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -141,6 +192,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -151,17 +204,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -174,12 +248,37 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
pkgdata_DATA = \
spin-down-disable.png \
spin-down.png \
@@ -189,79 +288,104 @@ pkgdata_DATA = \
spin-up.png \
spin-up-prelight.png
-
EXTRA_DIST = $(pkgdata_DATA)
-subdir = data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(pkgdata_DATA)
-
-DIST_COMMON = Makefile.am Makefile.in
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
-pkgdataDATA_INSTALL = $(INSTALL_DATA)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
install-pkgdataDATA: $(pkgdata_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
+ test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \
- $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
done
uninstall-pkgdataDATA:
@$(NORMAL_UNINSTALL)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \
- rm -f $(DESTDIR)$(pkgdatadir)/$$f; \
- done
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
tags: TAGS
TAGS:
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ctags: CTAGS
+CTAGS:
-top_distdir = ../../../../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(DATA)
-
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
-
+ for dir in "$(DESTDIR)$(pkgdatadir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -273,7 +397,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -281,7 +405,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -291,45 +416,80 @@ clean: clean-am
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am: install-pkgdataDATA
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic
-uninstall-am: uninstall-info-am uninstall-pkgdataDATA
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkgdataDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
- install-pkgdataDATA install-strip installcheck installcheck-am \
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-pkgdataDATA install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic uninstall uninstall-am \
- uninstall-info-am uninstall-pkgdataDATA
+ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+ uninstall-am uninstall-pkgdataDATA
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
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 795ce77..a23bc49 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
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,85 +14,119 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-
+subdir = data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(pkgdatadir)"
+DATA = $(pkgdata_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
pkgdatadir = $(datadir)/$(PACKAGE)/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -102,10 +137,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -113,27 +152,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -141,6 +192,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -151,17 +204,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -174,12 +248,37 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
pkgdata_DATA = \
notebook.png \
null.png \
@@ -192,79 +291,104 @@ pkgdata_DATA = \
tab-top-active.png \
tab-top.png
-
EXTRA_DIST = $(pkgdata_DATA)
-subdir = data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(pkgdata_DATA)
-
-DIST_COMMON = Makefile.am Makefile.in
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
-pkgdataDATA_INSTALL = $(INSTALL_DATA)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
install-pkgdataDATA: $(pkgdata_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
+ test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \
- $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
done
uninstall-pkgdataDATA:
@$(NORMAL_UNINSTALL)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \
- rm -f $(DESTDIR)$(pkgdatadir)/$$f; \
- done
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
tags: TAGS
TAGS:
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ctags: CTAGS
+CTAGS:
-top_distdir = ../../../../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(DATA)
-
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
-
+ for dir in "$(DESTDIR)$(pkgdatadir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -276,7 +400,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -284,7 +408,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -294,45 +419,80 @@ clean: clean-am
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am: install-pkgdataDATA
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic
-uninstall-am: uninstall-info-am uninstall-pkgdataDATA
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkgdataDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
- install-pkgdataDATA install-strip installcheck installcheck-am \
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-pkgdataDATA install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic uninstall uninstall-am \
- uninstall-info-am uninstall-pkgdataDATA
+ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+ uninstall-am uninstall-pkgdataDATA
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
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 d50fcf0..6110f4b 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
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,85 +14,119 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-
+subdir = data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Toolbar
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(pkgdatadir)"
+DATA = $(pkgdata_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
pkgdatadir = $(datadir)/$(PACKAGE)/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Toolbar
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -102,10 +137,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -113,27 +152,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -141,6 +192,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -151,17 +204,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -174,12 +248,37 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
pkgdata_DATA = \
toolbar.png \
toolbutton-normal.png \
@@ -187,79 +286,104 @@ pkgdata_DATA = \
toolbutton-pressed.png \
toolbutton-toggled.png
-
EXTRA_DIST = $(pkgdata_DATA)
-subdir = data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Toolbar
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(pkgdata_DATA)
-
-DIST_COMMON = Makefile.am Makefile.in
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Toolbar/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
-pkgdataDATA_INSTALL = $(INSTALL_DATA)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Toolbar/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Toolbar/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
install-pkgdataDATA: $(pkgdata_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
+ test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \
- $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
done
uninstall-pkgdataDATA:
@$(NORMAL_UNINSTALL)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \
- rm -f $(DESTDIR)$(pkgdatadir)/$$f; \
- done
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
tags: TAGS
TAGS:
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ctags: CTAGS
+CTAGS:
-top_distdir = ../../../../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(DATA)
-
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
-
+ for dir in "$(DESTDIR)$(pkgdatadir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -271,7 +395,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -279,7 +403,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -289,45 +414,80 @@ clean: clean-am
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am: install-pkgdataDATA
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic
-uninstall-am: uninstall-info-am uninstall-pkgdataDATA
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkgdataDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
- install-pkgdataDATA install-strip installcheck installcheck-am \
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-pkgdataDATA install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic uninstall uninstall-am \
- uninstall-info-am uninstall-pkgdataDATA
+ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+ uninstall-am uninstall-pkgdataDATA
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/data/themes/gui-gtk-2.0/Makefile.in b/data/themes/gui-gtk-2.0/Makefile.in
index 5b9b431..4e7bc60 100644
--- a/data/themes/gui-gtk-2.0/Makefile.in
+++ b/data/themes/gui-gtk-2.0/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,84 +14,135 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = data/themes/gui-gtk-2.0
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+ distdir
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+ dir0=`pwd`; \
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+ sed_rest='s,^[^/]*/*,,'; \
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+ sed_butlast='s,/*[^/]*$$,,'; \
+ while test -n "$$dir1"; do \
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+ if test "$$first" != "."; then \
+ if test "$$first" = ".."; then \
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+ else \
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+ if test "$$first2" = "$$first"; then \
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+ else \
+ dir2="../$$dir2"; \
+ fi; \
+ dir0="$$dir0"/"$$first"; \
+ fi; \
+ fi; \
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+ done; \
+ reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -101,10 +153,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -112,27 +168,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -140,6 +208,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -150,17 +220,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -173,34 +264,71 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
SUBDIRS = Freeciv
-subdir = data/themes/gui-gtk-2.0
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
- uninstall-info-recursive all-recursive install-data-recursive \
- install-exec-recursive installdirs-recursive install-recursive \
- uninstall-recursive check-recursive installcheck-recursive
-DIST_COMMON = Makefile.am Makefile.in
-DIST_SUBDIRS = $(SUBDIRS)
all: all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu data/themes/gui-gtk-2.0/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
@@ -209,7 +337,13 @@ uninstall-info-am:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @set fnord $$MAKEFLAGS; amf=$$2; \
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -220,16 +354,21 @@ $(RECURSIVE_TARGETS):
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
- @set fnord $$MAKEFLAGS; amf=$$2; \
+$(RECURSIVE_CLEAN_TARGETS):
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -249,89 +388,137 @@ maintainer-clean-recursive:
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+ctags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
-
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ empty_fix=.; \
+ else \
+ include_option=--include; \
+ empty_fix=; \
+ fi; \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+ test ! -f $$subdir/TAGS || \
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
- list='$(SUBDIRS)'; for subdir in $$list; do \
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d $(distdir)/$$subdir \
- || mkdir $(distdir)/$$subdir \
+ test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
- (cd $$subdir && \
+ fi; \
+ done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+ dir1=$$subdir; dir2="$(top_distdir)"; \
+ $(am__relativize); \
+ new_top_distdir=$$reldir; \
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+ ($(am__cd) $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$(top_distdir)" \
- distdir=../$(distdir)/$$subdir \
+ top_distdir="$$new_top_distdir" \
+ distdir="$$new_distdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
+ am__skip_mode_fix=: \
distdir) \
|| exit 1; \
fi; \
@@ -341,7 +528,6 @@ check: check-recursive
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
-
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
@@ -353,7 +539,7 @@ install-am: all-am
installcheck: installcheck-recursive
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -361,7 +547,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -371,53 +558,83 @@ clean: clean-recursive
clean-am: clean-generic mostlyclean-am
distclean: distclean-recursive
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic distclean-tags
dvi: dvi-recursive
dvi-am:
+html: html-recursive
+
+html-am:
+
info: info-recursive
info-am:
install-data-am:
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-recursive
+
+install-html-am:
+
install-info: install-info-recursive
+install-info-am:
+
install-man:
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-recursive
mostlyclean-am: mostlyclean-generic
-uninstall-am: uninstall-info-am
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
- clean-generic clean-recursive distclean distclean-generic \
- distclean-recursive distclean-tags distdir dvi dvi-am \
- dvi-recursive info info-am info-recursive install install-am \
- install-data install-data-am install-data-recursive \
- install-exec install-exec-am install-exec-recursive \
- install-info install-info-am install-info-recursive install-man \
- install-recursive install-strip installcheck installcheck-am \
- installdirs installdirs-am installdirs-recursive \
- maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-generic \
- mostlyclean-recursive tags tags-recursive uninstall \
- uninstall-am uninstall-info-am uninstall-info-recursive \
- uninstall-recursive
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+ install-am install-strip tags-recursive
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am check check-am clean clean-generic ctags \
+ ctags-recursive distclean distclean-generic distclean-tags \
+ distdir dvi dvi-am html html-am info info-am install \
+ install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ installdirs-am maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
+ tags-recursive uninstall uninstall-am
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/data/themes/gui-sdl/Makefile.in b/data/themes/gui-sdl/Makefile.in
index f33da7a..685ab36 100644
--- a/data/themes/gui-sdl/Makefile.in
+++ b/data/themes/gui-sdl/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,84 +14,135 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = data/themes/gui-sdl
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+ distdir
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+ dir0=`pwd`; \
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+ sed_rest='s,^[^/]*/*,,'; \
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+ sed_butlast='s,/*[^/]*$$,,'; \
+ while test -n "$$dir1"; do \
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+ if test "$$first" != "."; then \
+ if test "$$first" = ".."; then \
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+ else \
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+ if test "$$first2" = "$$first"; then \
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+ else \
+ dir2="../$$dir2"; \
+ fi; \
+ dir0="$$dir0"/"$$first"; \
+ fi; \
+ fi; \
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+ done; \
+ reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -101,10 +153,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -112,27 +168,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -140,6 +208,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -150,17 +220,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -173,34 +264,71 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
SUBDIRS = human
-subdir = data/themes/gui-sdl
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
- uninstall-info-recursive all-recursive install-data-recursive \
- install-exec-recursive installdirs-recursive install-recursive \
- uninstall-recursive check-recursive installcheck-recursive
-DIST_COMMON = Makefile.am Makefile.in
-DIST_SUBDIRS = $(SUBDIRS)
all: all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu data/themes/gui-sdl/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/themes/gui-sdl/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu data/themes/gui-sdl/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
@@ -209,7 +337,13 @@ uninstall-info-am:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @set fnord $$MAKEFLAGS; amf=$$2; \
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -220,16 +354,21 @@ $(RECURSIVE_TARGETS):
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
- @set fnord $$MAKEFLAGS; amf=$$2; \
+$(RECURSIVE_CLEAN_TARGETS):
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -249,89 +388,137 @@ maintainer-clean-recursive:
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+ctags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
-
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ empty_fix=.; \
+ else \
+ include_option=--include; \
+ empty_fix=; \
+ fi; \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+ test ! -f $$subdir/TAGS || \
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
- list='$(SUBDIRS)'; for subdir in $$list; do \
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d $(distdir)/$$subdir \
- || mkdir $(distdir)/$$subdir \
+ test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
- (cd $$subdir && \
+ fi; \
+ done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+ dir1=$$subdir; dir2="$(top_distdir)"; \
+ $(am__relativize); \
+ new_top_distdir=$$reldir; \
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+ ($(am__cd) $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$(top_distdir)" \
- distdir=../$(distdir)/$$subdir \
+ top_distdir="$$new_top_distdir" \
+ distdir="$$new_distdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
+ am__skip_mode_fix=: \
distdir) \
|| exit 1; \
fi; \
@@ -341,7 +528,6 @@ check: check-recursive
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
-
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
@@ -353,7 +539,7 @@ install-am: all-am
installcheck: installcheck-recursive
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -361,7 +547,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -371,53 +558,83 @@ clean: clean-recursive
clean-am: clean-generic mostlyclean-am
distclean: distclean-recursive
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic distclean-tags
dvi: dvi-recursive
dvi-am:
+html: html-recursive
+
+html-am:
+
info: info-recursive
info-am:
install-data-am:
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-recursive
+
+install-html-am:
+
install-info: install-info-recursive
+install-info-am:
+
install-man:
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-recursive
mostlyclean-am: mostlyclean-generic
-uninstall-am: uninstall-info-am
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
- clean-generic clean-recursive distclean distclean-generic \
- distclean-recursive distclean-tags distdir dvi dvi-am \
- dvi-recursive info info-am info-recursive install install-am \
- install-data install-data-am install-data-recursive \
- install-exec install-exec-am install-exec-recursive \
- install-info install-info-am install-info-recursive install-man \
- install-recursive install-strip installcheck installcheck-am \
- installdirs installdirs-am installdirs-recursive \
- maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-generic \
- mostlyclean-recursive tags tags-recursive uninstall \
- uninstall-am uninstall-info-am uninstall-info-recursive \
- uninstall-recursive
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+ install-am install-strip tags-recursive
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am check check-am clean clean-generic ctags \
+ ctags-recursive distclean distclean-generic distclean-tags \
+ distdir dvi dvi-am html html-am info info-am install \
+ install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ installdirs-am maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
+ tags-recursive uninstall uninstall-am
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/data/themes/gui-sdl/human/Makefile.in b/data/themes/gui-sdl/human/Makefile.in
index 508047c..1f6114b 100644
--- a/data/themes/gui-sdl/human/Makefile.in
+++ b/data/themes/gui-sdl/human/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,85 +14,119 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-
+subdir = data/themes/gui-sdl/human
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(pkgdatadir)"
+DATA = $(pkgdata_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
pkgdatadir = $(datadir)/$(PACKAGE)/themes/gui-sdl/human
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -102,10 +137,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -113,27 +152,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -141,6 +192,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -151,17 +204,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -174,12 +248,37 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
pkgdata_DATA = \
COPYING.DejaVu \
COPYING.UnDotum \
@@ -217,79 +316,104 @@ pkgdata_DATA = \
theme_scrolls.spec \
world.png
-
EXTRA_DIST = $(pkgdata_DATA)
-subdir = data/themes/gui-sdl/human
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(pkgdata_DATA)
-
-DIST_COMMON = Makefile.am Makefile.in
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu data/themes/gui-sdl/human/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
-pkgdataDATA_INSTALL = $(INSTALL_DATA)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/themes/gui-sdl/human/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu data/themes/gui-sdl/human/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
install-pkgdataDATA: $(pkgdata_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
+ test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \
- $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
done
uninstall-pkgdataDATA:
@$(NORMAL_UNINSTALL)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \
- rm -f $(DESTDIR)$(pkgdatadir)/$$f; \
- done
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
tags: TAGS
TAGS:
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ctags: CTAGS
+CTAGS:
-top_distdir = ../../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(DATA)
-
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
-
+ for dir in "$(DESTDIR)$(pkgdatadir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -301,7 +425,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -309,7 +433,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -319,45 +444,80 @@ clean: clean-am
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am: install-pkgdataDATA
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic
-uninstall-am: uninstall-info-am uninstall-pkgdataDATA
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkgdataDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
- install-pkgdataDATA install-strip installcheck installcheck-am \
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-pkgdataDATA install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic uninstall uninstall-am \
- uninstall-info-am uninstall-pkgdataDATA
+ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+ uninstall-am uninstall-pkgdataDATA
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/data/trident/Makefile.in b/data/trident/Makefile.in
index afb727d..80ac3ab 100644
--- a/data/trident/Makefile.in
+++ b/data/trident/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,85 +14,119 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-
+subdir = data/trident
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(pkgdatadir)"
+DATA = $(pkgdata_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
pkgdatadir = $(datadir)/$(PACKAGE)/trident
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -102,10 +137,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -113,27 +152,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -141,6 +192,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -151,17 +204,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -174,12 +248,37 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
pkgdata_DATA = \
auto_ll.spec \
cities.png \
@@ -199,79 +298,104 @@ pkgdata_DATA = \
units.png \
units.spec
-
EXTRA_DIST = $(pkgdata_DATA)
-subdir = data/trident
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(pkgdata_DATA)
-
-DIST_COMMON = Makefile.am Makefile.in
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu data/trident/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
-pkgdataDATA_INSTALL = $(INSTALL_DATA)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/trident/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu data/trident/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
install-pkgdataDATA: $(pkgdata_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
+ test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \
- $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
done
uninstall-pkgdataDATA:
@$(NORMAL_UNINSTALL)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \
- rm -f $(DESTDIR)$(pkgdatadir)/$$f; \
- done
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
tags: TAGS
TAGS:
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ctags: CTAGS
+CTAGS:
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(DATA)
-
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
-
+ for dir in "$(DESTDIR)$(pkgdatadir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -283,7 +407,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -291,7 +415,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -301,45 +426,80 @@ clean: clean-am
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am: install-pkgdataDATA
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic
-uninstall-am: uninstall-info-am uninstall-pkgdataDATA
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkgdataDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
- install-pkgdataDATA install-strip installcheck installcheck-am \
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-pkgdataDATA install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic uninstall uninstall-am \
- uninstall-info-am uninstall-pkgdataDATA
+ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+ uninstall-am uninstall-pkgdataDATA
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/data/wonders/Makefile.in b/data/wonders/Makefile.in
index c61ba56..ede84f4 100644
--- a/data/wonders/Makefile.in
+++ b/data/wonders/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,85 +14,119 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-
+subdir = data/wonders
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(pkgdatadir)"
+DATA = $(pkgdata_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
pkgdatadir = $(datadir)/$(PACKAGE)/wonders
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -102,10 +137,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -113,27 +152,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -141,6 +192,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -151,17 +204,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -174,12 +248,37 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
pkgdata_DATA = \
asmiths_trading_co.png \
apollo_program.png \
@@ -210,79 +309,104 @@ pkgdata_DATA = \
united_nations.png \
womens_suffrage.png
-
EXTRA_DIST = $(pkgdata_DATA)
-subdir = data/wonders
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(pkgdata_DATA)
-
-DIST_COMMON = Makefile.am Makefile.in
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu data/wonders/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
-pkgdataDATA_INSTALL = $(INSTALL_DATA)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/wonders/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu data/wonders/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
install-pkgdataDATA: $(pkgdata_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
+ test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \
- $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
done
uninstall-pkgdataDATA:
@$(NORMAL_UNINSTALL)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \
- rm -f $(DESTDIR)$(pkgdatadir)/$$f; \
- done
+ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
tags: TAGS
TAGS:
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ctags: CTAGS
+CTAGS:
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(DATA)
-
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
-
+ for dir in "$(DESTDIR)$(pkgdatadir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -294,7 +418,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -302,7 +426,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -312,45 +437,80 @@ clean: clean-am
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am: install-pkgdataDATA
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic
-uninstall-am: uninstall-info-am uninstall-pkgdataDATA
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkgdataDATA
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
- install-pkgdataDATA install-strip installcheck installcheck-am \
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-pkgdataDATA install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic uninstall uninstall-am \
- uninstall-info-am uninstall-pkgdataDATA
+ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+ uninstall-am uninstall-pkgdataDATA
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/dependencies/Makefile.in b/dependencies/Makefile.in
index b0c7792..e8efaeb 100644
--- a/dependencies/Makefile.in
+++ b/dependencies/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,84 +14,135 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = dependencies
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+ distdir
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+ dir0=`pwd`; \
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+ sed_rest='s,^[^/]*/*,,'; \
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+ sed_butlast='s,/*[^/]*$$,,'; \
+ while test -n "$$dir1"; do \
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+ if test "$$first" != "."; then \
+ if test "$$first" = ".."; then \
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+ else \
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+ if test "$$first2" = "$$first"; then \
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+ else \
+ dir2="../$$dir2"; \
+ fi; \
+ dir0="$$dir0"/"$$first"; \
+ fi; \
+ fi; \
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+ done; \
+ reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -101,10 +153,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -112,27 +168,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -140,6 +208,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -150,17 +220,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -173,34 +264,71 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
SUBDIRS = lua tolua
-subdir = dependencies
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
- uninstall-info-recursive all-recursive install-data-recursive \
- install-exec-recursive installdirs-recursive install-recursive \
- uninstall-recursive check-recursive installcheck-recursive
-DIST_COMMON = Makefile.am Makefile.in
-DIST_SUBDIRS = $(SUBDIRS)
all: all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu dependencies/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu dependencies/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu dependencies/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
@@ -209,7 +337,13 @@ uninstall-info-am:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @set fnord $$MAKEFLAGS; amf=$$2; \
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -220,16 +354,21 @@ $(RECURSIVE_TARGETS):
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
- @set fnord $$MAKEFLAGS; amf=$$2; \
+$(RECURSIVE_CLEAN_TARGETS):
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -249,89 +388,137 @@ maintainer-clean-recursive:
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+ctags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
-
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ empty_fix=.; \
+ else \
+ include_option=--include; \
+ empty_fix=; \
+ fi; \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+ test ! -f $$subdir/TAGS || \
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
- list='$(SUBDIRS)'; for subdir in $$list; do \
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d $(distdir)/$$subdir \
- || mkdir $(distdir)/$$subdir \
+ test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
- (cd $$subdir && \
+ fi; \
+ done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+ dir1=$$subdir; dir2="$(top_distdir)"; \
+ $(am__relativize); \
+ new_top_distdir=$$reldir; \
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+ ($(am__cd) $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$(top_distdir)" \
- distdir=../$(distdir)/$$subdir \
+ top_distdir="$$new_top_distdir" \
+ distdir="$$new_distdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
+ am__skip_mode_fix=: \
distdir) \
|| exit 1; \
fi; \
@@ -341,7 +528,6 @@ check: check-recursive
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
-
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
@@ -353,7 +539,7 @@ install-am: all-am
installcheck: installcheck-recursive
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -361,7 +547,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -371,53 +558,83 @@ clean: clean-recursive
clean-am: clean-generic mostlyclean-am
distclean: distclean-recursive
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic distclean-tags
dvi: dvi-recursive
dvi-am:
+html: html-recursive
+
+html-am:
+
info: info-recursive
info-am:
install-data-am:
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-recursive
+
+install-html-am:
+
install-info: install-info-recursive
+install-info-am:
+
install-man:
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-recursive
mostlyclean-am: mostlyclean-generic
-uninstall-am: uninstall-info-am
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
- clean-generic clean-recursive distclean distclean-generic \
- distclean-recursive distclean-tags distdir dvi dvi-am \
- dvi-recursive info info-am info-recursive install install-am \
- install-data install-data-am install-data-recursive \
- install-exec install-exec-am install-exec-recursive \
- install-info install-info-am install-info-recursive install-man \
- install-recursive install-strip installcheck installcheck-am \
- installdirs installdirs-am installdirs-recursive \
- maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-generic \
- mostlyclean-recursive tags tags-recursive uninstall \
- uninstall-am uninstall-info-am uninstall-info-recursive \
- uninstall-recursive
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+ install-am install-strip tags-recursive
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am check check-am clean clean-generic ctags \
+ ctags-recursive distclean distclean-generic distclean-tags \
+ distdir dvi dvi-am html html-am info info-am install \
+ install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ installdirs-am maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
+ tags-recursive uninstall uninstall-am
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/dependencies/lua/Makefile.in b/dependencies/lua/Makefile.in
index 76c36dc..ddc4d5b 100644
--- a/dependencies/lua/Makefile.in
+++ b/dependencies/lua/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,84 +14,135 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = dependencies/lua
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+ distdir
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+ dir0=`pwd`; \
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+ sed_rest='s,^[^/]*/*,,'; \
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+ sed_butlast='s,/*[^/]*$$,,'; \
+ while test -n "$$dir1"; do \
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+ if test "$$first" != "."; then \
+ if test "$$first" = ".."; then \
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+ else \
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+ if test "$$first2" = "$$first"; then \
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+ else \
+ dir2="../$$dir2"; \
+ fi; \
+ dir0="$$dir0"/"$$first"; \
+ fi; \
+ fi; \
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+ done; \
+ reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -101,10 +153,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -112,27 +168,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -140,6 +208,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -150,17 +220,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -173,34 +264,72 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
SUBDIRS = src
EXTRA_DIST = COPYRIGHT.lua
-subdir = dependencies/lua
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
- uninstall-info-recursive all-recursive install-data-recursive \
- install-exec-recursive installdirs-recursive install-recursive \
- uninstall-recursive check-recursive installcheck-recursive
-DIST_COMMON = Makefile.am Makefile.in
-DIST_SUBDIRS = $(SUBDIRS)
all: all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu dependencies/lua/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu dependencies/lua/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu dependencies/lua/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
@@ -209,7 +338,13 @@ uninstall-info-am:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @set fnord $$MAKEFLAGS; amf=$$2; \
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -220,16 +355,21 @@ $(RECURSIVE_TARGETS):
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
- @set fnord $$MAKEFLAGS; amf=$$2; \
+$(RECURSIVE_CLEAN_TARGETS):
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -249,89 +389,137 @@ maintainer-clean-recursive:
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+ctags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
-
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ empty_fix=.; \
+ else \
+ include_option=--include; \
+ empty_fix=; \
+ fi; \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+ test ! -f $$subdir/TAGS || \
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
- list='$(SUBDIRS)'; for subdir in $$list; do \
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d $(distdir)/$$subdir \
- || mkdir $(distdir)/$$subdir \
+ test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
- (cd $$subdir && \
+ fi; \
+ done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+ dir1=$$subdir; dir2="$(top_distdir)"; \
+ $(am__relativize); \
+ new_top_distdir=$$reldir; \
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+ ($(am__cd) $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$(top_distdir)" \
- distdir=../$(distdir)/$$subdir \
+ top_distdir="$$new_top_distdir" \
+ distdir="$$new_distdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
+ am__skip_mode_fix=: \
distdir) \
|| exit 1; \
fi; \
@@ -341,7 +529,6 @@ check: check-recursive
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
-
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
@@ -353,7 +540,7 @@ install-am: all-am
installcheck: installcheck-recursive
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -361,7 +548,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -371,53 +559,83 @@ clean: clean-recursive
clean-am: clean-generic mostlyclean-am
distclean: distclean-recursive
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic distclean-tags
dvi: dvi-recursive
dvi-am:
+html: html-recursive
+
+html-am:
+
info: info-recursive
info-am:
install-data-am:
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-recursive
+
+install-html-am:
+
install-info: install-info-recursive
+install-info-am:
+
install-man:
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-recursive
mostlyclean-am: mostlyclean-generic
-uninstall-am: uninstall-info-am
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
- clean-generic clean-recursive distclean distclean-generic \
- distclean-recursive distclean-tags distdir dvi dvi-am \
- dvi-recursive info info-am info-recursive install install-am \
- install-data install-data-am install-data-recursive \
- install-exec install-exec-am install-exec-recursive \
- install-info install-info-am install-info-recursive install-man \
- install-recursive install-strip installcheck installcheck-am \
- installdirs installdirs-am installdirs-recursive \
- maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-generic \
- mostlyclean-recursive tags tags-recursive uninstall \
- uninstall-am uninstall-info-am uninstall-info-recursive \
- uninstall-recursive
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+ install-am install-strip tags-recursive
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am check check-am clean clean-generic ctags \
+ ctags-recursive distclean distclean-generic distclean-tags \
+ distdir dvi dvi-am html html-am info info-am install \
+ install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ installdirs-am maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
+ tags-recursive uninstall uninstall-am
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/dependencies/lua/src/Makefile.in b/dependencies/lua/src/Makefile.in
index fea8384..d6f46c1 100644
--- a/dependencies/lua/src/Makefile.in
+++ b/dependencies/lua/src/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,84 +14,155 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = dependencies/lua/src
+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+liblua_a_AR = $(AR) $(ARFLAGS)
+liblua_a_LIBADD =
+am_liblua_a_OBJECTS = lapi.$(OBJEXT) lcode.$(OBJEXT) ldebug.$(OBJEXT) \
+ ldo.$(OBJEXT) ldump.$(OBJEXT) lfunc.$(OBJEXT) lgc.$(OBJEXT) \
+ llex.$(OBJEXT) lmem.$(OBJEXT) lobject.$(OBJEXT) \
+ lopcodes.$(OBJEXT) lparser.$(OBJEXT) lstate.$(OBJEXT) \
+ lstring.$(OBJEXT) ltable.$(OBJEXT) ltests.$(OBJEXT) \
+ ltm.$(OBJEXT) lundump.$(OBJEXT) lvm.$(OBJEXT) lzio.$(OBJEXT)
+liblua_a_OBJECTS = $(am_liblua_a_OBJECTS)
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/bootstrap/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(liblua_a_SOURCES)
+DIST_SOURCES = $(liblua_a_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+ distdir
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+ dir0=`pwd`; \
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+ sed_rest='s,^[^/]*/*,,'; \
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+ sed_butlast='s,/*[^/]*$$,,'; \
+ while test -n "$$dir1"; do \
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+ if test "$$first" != "."; then \
+ if test "$$first" = ".."; then \
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+ else \
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+ if test "$$first2" = "$$first"; then \
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+ else \
+ dir2="../$$dir2"; \
+ fi; \
+ dir0="$$dir0"/"$$first"; \
+ fi; \
+ fi; \
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+ done; \
+ reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -101,10 +173,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -112,27 +188,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -140,6 +228,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -150,17 +240,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -173,11 +284,37 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
SUBDIRS = lib
noinst_LIBRARIES = liblua.a
AM_CPPFLAGS = -I$(srcdir)/../include -I.
@@ -226,62 +363,40 @@ liblua_a_SOURCES = \
lzio.c \
lzio.h
-subdir = dependencies/lua/src
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-liblua_a_AR = $(AR) cru
-liblua_a_LIBADD =
-am_liblua_a_OBJECTS = lapi.$(OBJEXT) lcode.$(OBJEXT) ldebug.$(OBJEXT) \
- ldo.$(OBJEXT) ldump.$(OBJEXT) lfunc.$(OBJEXT) lgc.$(OBJEXT) \
- llex.$(OBJEXT) lmem.$(OBJEXT) lobject.$(OBJEXT) \
- lopcodes.$(OBJEXT) lparser.$(OBJEXT) lstate.$(OBJEXT) \
- lstring.$(OBJEXT) ltable.$(OBJEXT) ltests.$(OBJEXT) \
- ltm.$(OBJEXT) lundump.$(OBJEXT) lvm.$(OBJEXT) lzio.$(OBJEXT)
-liblua_a_OBJECTS = $(am_liblua_a_OBJECTS)
-
-DEFS = @DEFS@
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-depcomp = $(SHELL) $(top_srcdir)/bootstrap/depcomp
-am__depfiles_maybe = depfiles
- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/lapi.Po ./$(DEPDIR)/lcode.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/ldebug.Po ./$(DEPDIR)/ldo.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/ldump.Po ./$(DEPDIR)/lfunc.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/lgc.Po ./$(DEPDIR)/llex.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/lmem.Po ./$(DEPDIR)/lobject.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/lopcodes.Po ./$(DEPDIR)/lparser.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/lstate.Po ./$(DEPDIR)/lstring.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/ltable.Po ./$(DEPDIR)/ltests.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/ltm.Po ./$(DEPDIR)/lundump.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/lvm.Po ./$(DEPDIR)/lzio.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-CFLAGS = @CFLAGS@
-DIST_SOURCES = $(liblua_a_SOURCES)
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
- uninstall-info-recursive all-recursive install-data-recursive \
- install-exec-recursive installdirs-recursive install-recursive \
- uninstall-recursive check-recursive installcheck-recursive
-DIST_COMMON = README Makefile.am Makefile.in
-DIST_SUBDIRS = $(SUBDIRS)
-SOURCES = $(liblua_a_SOURCES)
-
all: all-recursive
.SUFFIXES:
.SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu dependencies/lua/src/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu dependencies/lua/src/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu dependencies/lua/src/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
clean-noinstLIBRARIES:
-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
@@ -291,7 +406,7 @@ liblua.a: $(liblua_a_OBJECTS) $(liblua_a_DEPENDENCIES)
$(RANLIB) liblua.a
mostlyclean-compile:
- -rm -f *.$(OBJEXT) core *.core
+ -rm -f *.$(OBJEXT)
distclean-compile:
-rm -f *.tab.c
@@ -317,22 +432,19 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/lvm.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/lzio.Po at am__quote@
-distclean-depend:
- -rm -rf ./$(DEPDIR)
-
.c.o:
- at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
- at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- $(COMPILE) -c `cygpath -w $<`
-CCDEPMODE = @CCDEPMODE@
-uninstall-info-am:
+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
@@ -341,7 +453,13 @@ uninstall-info-am:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @set fnord $$MAKEFLAGS; amf=$$2; \
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -352,16 +470,21 @@ $(RECURSIVE_TARGETS):
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
- @set fnord $$MAKEFLAGS; amf=$$2; \
+$(RECURSIVE_CLEAN_TARGETS):
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -381,89 +504,137 @@ maintainer-clean-recursive:
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+ctags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
-
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ empty_fix=.; \
+ else \
+ include_option=--include; \
+ empty_fix=; \
+ fi; \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+ test ! -f $$subdir/TAGS || \
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
- list='$(SUBDIRS)'; for subdir in $$list; do \
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d $(distdir)/$$subdir \
- || mkdir $(distdir)/$$subdir \
+ test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
- (cd $$subdir && \
+ fi; \
+ done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+ dir1=$$subdir; dir2="$(top_distdir)"; \
+ $(am__relativize); \
+ new_top_distdir=$$reldir; \
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+ ($(am__cd) $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$(top_distdir)" \
- distdir=../$(distdir)/$$subdir \
+ top_distdir="$$new_top_distdir" \
+ distdir="$$new_distdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
+ am__skip_mode_fix=: \
distdir) \
|| exit 1; \
fi; \
@@ -473,7 +644,6 @@ check: check-recursive
all-am: Makefile $(LIBRARIES)
installdirs: installdirs-recursive
installdirs-am:
-
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
@@ -485,7 +655,7 @@ install-am: all-am
installcheck: installcheck-recursive
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -493,7 +663,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -503,55 +674,87 @@ clean: clean-recursive
clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
distclean: distclean-recursive
-
-distclean-am: clean-am distclean-compile distclean-depend \
- distclean-generic distclean-tags
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-tags
dvi: dvi-recursive
dvi-am:
+html: html-recursive
+
+html-am:
+
info: info-recursive
info-am:
install-data-am:
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-recursive
+
+install-html-am:
+
install-info: install-info-recursive
+install-info-am:
+
install-man:
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-recursive
mostlyclean-am: mostlyclean-compile mostlyclean-generic
-uninstall-am: uninstall-info-am
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
- clean-generic clean-noinstLIBRARIES clean-recursive distclean \
- distclean-compile distclean-depend distclean-generic \
- distclean-recursive distclean-tags distdir dvi dvi-am \
- dvi-recursive info info-am info-recursive install install-am \
- install-data install-data-am install-data-recursive \
- install-exec install-exec-am install-exec-recursive \
- install-info install-info-am install-info-recursive install-man \
- install-recursive install-strip installcheck installcheck-am \
- installdirs installdirs-am installdirs-recursive \
- maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-recursive tags tags-recursive \
- uninstall uninstall-am uninstall-info-am \
- uninstall-info-recursive uninstall-recursive
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+ install-am install-strip tags-recursive
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am check check-am clean clean-generic \
+ clean-noinstLIBRARIES ctags ctags-recursive distclean \
+ distclean-compile distclean-generic distclean-tags distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs installdirs-am \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
+ tags tags-recursive uninstall uninstall-am
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/dependencies/lua/src/lib/Makefile.in b/dependencies/lua/src/lib/Makefile.in
index 601c741..d289466 100644
--- a/dependencies/lua/src/lib/Makefile.in
+++ b/dependencies/lua/src/lib/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,84 +14,114 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = dependencies/lua/src/lib
+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+liblualib_a_AR = $(AR) $(ARFLAGS)
+liblualib_a_LIBADD =
+am_liblualib_a_OBJECTS = lauxlib.$(OBJEXT) lbaselib.$(OBJEXT) \
+ ldblib.$(OBJEXT) liolib.$(OBJEXT) lmathlib.$(OBJEXT) \
+ ltablib.$(OBJEXT) lstrlib.$(OBJEXT) loadlib.$(OBJEXT)
+liblualib_a_OBJECTS = $(am_liblualib_a_OBJECTS)
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/bootstrap/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(liblualib_a_SOURCES)
+DIST_SOURCES = $(liblualib_a_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -101,10 +132,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -112,27 +147,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -140,6 +187,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -150,17 +199,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -173,11 +243,37 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
EXTRA_DIST = README
liblualib_a_SOURCES = \
lauxlib.c lbaselib.c ldblib.c liolib.c \
@@ -185,47 +281,40 @@ liblualib_a_SOURCES = \
noinst_LIBRARIES = liblualib.a
AM_CPPFLAGS = -I$(srcdir)/../../include -I..
-subdir = dependencies/lua/src/lib
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-liblualib_a_AR = $(AR) cru
-liblualib_a_LIBADD =
-am_liblualib_a_OBJECTS = lauxlib.$(OBJEXT) lbaselib.$(OBJEXT) \
- ldblib.$(OBJEXT) liolib.$(OBJEXT) lmathlib.$(OBJEXT) \
- ltablib.$(OBJEXT) lstrlib.$(OBJEXT) loadlib.$(OBJEXT)
-liblualib_a_OBJECTS = $(am_liblualib_a_OBJECTS)
-
-DEFS = @DEFS@
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-depcomp = $(SHELL) $(top_srcdir)/bootstrap/depcomp
-am__depfiles_maybe = depfiles
- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/lauxlib.Po ./$(DEPDIR)/lbaselib.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/ldblib.Po ./$(DEPDIR)/liolib.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/lmathlib.Po ./$(DEPDIR)/loadlib.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/lstrlib.Po ./$(DEPDIR)/ltablib.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-CFLAGS = @CFLAGS@
-DIST_SOURCES = $(liblualib_a_SOURCES)
-DIST_COMMON = README Makefile.am Makefile.in
-SOURCES = $(liblualib_a_SOURCES)
-
all: all-am
.SUFFIXES:
.SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu dependencies/lua/src/lib/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu dependencies/lua/src/lib/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu dependencies/lua/src/lib/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
clean-noinstLIBRARIES:
-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
@@ -235,7 +324,7 @@ liblualib.a: $(liblualib_a_OBJECTS) $(liblualib_a_DEPENDENCIES)
$(RANLIB) liblualib.a
mostlyclean-compile:
- -rm -f *.$(OBJEXT) core *.core
+ -rm -f *.$(OBJEXT)
distclean-compile:
-rm -f *.tab.c
@@ -249,90 +338,106 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/lstrlib.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ltablib.Po at am__quote@
-distclean-depend:
- -rm -rf ./$(DEPDIR)
-
.c.o:
- at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
- at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- $(COMPILE) -c `cygpath -w $<`
-CCDEPMODE = @CCDEPMODE@
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: CTAGS
+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(LIBRARIES)
-
installdirs:
-
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -344,7 +449,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -352,7 +457,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -362,48 +468,85 @@ clean: clean-am
clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
distclean: distclean-am
-
-distclean-am: clean-am distclean-compile distclean-depend \
- distclean-generic distclean-tags
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-tags
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am:
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-compile mostlyclean-generic
-uninstall-am: uninstall-info-am
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
-.PHONY: GTAGS all all-am check check-am clean clean-generic \
- clean-noinstLIBRARIES distclean distclean-compile \
- distclean-depend distclean-generic distclean-tags distdir dvi \
- dvi-am info info-am install install-am install-data \
- install-data-am install-exec install-exec-am install-info \
- install-info-am install-man install-strip installcheck \
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ clean-noinstLIBRARIES ctags distclean distclean-compile \
+ distclean-generic distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic tags uninstall uninstall-am \
- uninstall-info-am
+ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+ uninstall-am
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/dependencies/tolua/Makefile.in b/dependencies/tolua/Makefile.in
index b7df1b7..73e4b3c 100644
--- a/dependencies/tolua/Makefile.in
+++ b/dependencies/tolua/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -15,84 +16,120 @@
@SET_MAKE@
# SUBDIRS = lib
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
+VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+noinst_PROGRAMS = tolua$(EXEEXT)
+subdir = dependencies/tolua
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+libtolua_a_AR = $(AR) $(ARFLAGS)
+libtolua_a_LIBADD =
+am_libtolua_a_OBJECTS = tolua_event.$(OBJEXT) tolua_is.$(OBJEXT) \
+ tolua_map.$(OBJEXT) tolua_push.$(OBJEXT) tolua_to.$(OBJEXT)
+libtolua_a_OBJECTS = $(am_libtolua_a_OBJECTS)
+PROGRAMS = $(noinst_PROGRAMS)
+am_tolua_OBJECTS = tolua.$(OBJEXT) toluabind.$(OBJEXT)
+tolua_OBJECTS = $(am_tolua_OBJECTS)
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/bootstrap/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libtolua_a_SOURCES) $(tolua_SOURCES) \
+ $(EXTRA_tolua_SOURCES)
+DIST_SOURCES = $(libtolua_a_SOURCES) $(tolua_SOURCES) \
+ $(EXTRA_tolua_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -103,10 +140,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -114,27 +155,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -142,6 +195,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -152,17 +207,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -175,30 +251,50 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
EXTRA_DIST = \
COPYRIGHT.tolua
-
-noinst_PROGRAMS = tolua
noinst_LIBRARIES = libtolua.a
-
AM_CPPFLAGS = -I$(top_srcdir)/dependencies/lua/src \
-I$(top_srcdir)/dependencies/lua/include \
-I$(top_srcdir)/dependencies/lua/src/lib
-
tolua_SOURCES = \
tolua.c \
tolua.h \
toluabind.c
-
EXTRA_tolua_SOURCES = \
array.lua \
basic.lua \
@@ -221,10 +317,8 @@ EXTRA_tolua_SOURCES = \
variable.lua \
verbatim.lua
-
tolua_DEPENDENCIES = ../lua/src/liblua.a ../lua/src/lib/liblualib.a ./libtolua.a
tolua_LDADD = ../lua/src/liblua.a ../lua/src/lib/liblualib.a ./libtolua.a -lm
-
libtolua_a_SOURCES = \
tolua.h \
tolua_event.c \
@@ -234,53 +328,40 @@ libtolua_a_SOURCES = \
tolua_push.c \
tolua_to.c
-subdir = dependencies/tolua
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-libtolua_a_AR = $(AR) cru
-libtolua_a_LIBADD =
-am_libtolua_a_OBJECTS = tolua_event.$(OBJEXT) tolua_is.$(OBJEXT) \
- tolua_map.$(OBJEXT) tolua_push.$(OBJEXT) tolua_to.$(OBJEXT)
-libtolua_a_OBJECTS = $(am_libtolua_a_OBJECTS)
-noinst_PROGRAMS = tolua$(EXEEXT)
-PROGRAMS = $(noinst_PROGRAMS)
-
-am_tolua_OBJECTS = tolua.$(OBJEXT) toluabind.$(OBJEXT)
-tolua_OBJECTS = $(am_tolua_OBJECTS)
-tolua_LDFLAGS =
-
-DEFS = @DEFS@
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-depcomp = $(SHELL) $(top_srcdir)/bootstrap/depcomp
-am__depfiles_maybe = depfiles
- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/tolua.Po ./$(DEPDIR)/tolua_event.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/tolua_is.Po ./$(DEPDIR)/tolua_map.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/tolua_push.Po ./$(DEPDIR)/tolua_to.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/toluabind.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-CFLAGS = @CFLAGS@
-DIST_SOURCES = $(libtolua_a_SOURCES) $(tolua_SOURCES) \
- $(EXTRA_tolua_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(libtolua_a_SOURCES) $(tolua_SOURCES) $(EXTRA_tolua_SOURCES)
-
all: all-am
.SUFFIXES:
.SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu dependencies/tolua/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu dependencies/tolua/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu dependencies/tolua/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
clean-noinstLIBRARIES:
-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
@@ -293,10 +374,10 @@ clean-noinstPROGRAMS:
-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
tolua$(EXEEXT): $(tolua_OBJECTS) $(tolua_DEPENDENCIES)
@rm -f tolua$(EXEEXT)
- $(LINK) $(tolua_LDFLAGS) $(tolua_OBJECTS) $(tolua_LDADD) $(LIBS)
+ $(LINK) $(tolua_OBJECTS) $(tolua_LDADD) $(LIBS)
mostlyclean-compile:
- -rm -f *.$(OBJEXT) core *.core
+ -rm -f *.$(OBJEXT)
distclean-compile:
-rm -f *.tab.c
@@ -309,90 +390,106 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tolua_to.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/toluabind.Po at am__quote@
-distclean-depend:
- -rm -rf ./$(DEPDIR)
-
.c.o:
- at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
- at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- $(COMPILE) -c `cygpath -w $<`
-CCDEPMODE = @CCDEPMODE@
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: CTAGS
+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(LIBRARIES) $(PROGRAMS)
-
installdirs:
-
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -404,7 +501,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -412,7 +509,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -423,48 +521,85 @@ clean-am: clean-generic clean-noinstLIBRARIES clean-noinstPROGRAMS \
mostlyclean-am
distclean: distclean-am
-
-distclean-am: clean-am distclean-compile distclean-depend \
- distclean-generic distclean-tags
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-tags
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am:
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-compile mostlyclean-generic
-uninstall-am: uninstall-info-am
-
-.PHONY: GTAGS all all-am check check-am clean clean-generic \
- clean-noinstLIBRARIES clean-noinstPROGRAMS distclean \
- distclean-compile distclean-depend distclean-generic \
- distclean-tags distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic tags uninstall \
- uninstall-am uninstall-info-am
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ clean-noinstLIBRARIES clean-noinstPROGRAMS ctags distclean \
+ distclean-compile distclean-generic distclean-tags distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+ uninstall-am
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/doc/CodingStyle b/doc/CodingStyle
index 87a6fef..85bc05d 100644
--- a/doc/CodingStyle
+++ b/doc/CodingStyle
@@ -203,8 +203,7 @@ int foo(struct city *pcity)
- If you use a system specific feature, don't add #ifdef __CRAY__ or
something like that. Rather write a check for that feature for
- both configure.in and configure.ac, and use a meaningful macro name
- in the source.
+ configure.ac, and use a meaningful macro name in the source.
- Always prototype global functions in the appropriate header file.
Local functions should always be declared as static. To catch these
diff --git a/doc/Makefile.in b/doc/Makefile.in
index f359d32..4550b1e 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,84 +14,135 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = doc
+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in TODO
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+ distdir
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+ dir0=`pwd`; \
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+ sed_rest='s,^[^/]*/*,,'; \
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+ sed_butlast='s,/*[^/]*$$,,'; \
+ while test -n "$$dir1"; do \
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+ if test "$$first" != "."; then \
+ if test "$$first" = ".."; then \
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+ else \
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+ if test "$$first2" = "$$first"; then \
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+ else \
+ dir2="../$$dir2"; \
+ fi; \
+ dir0="$$dir0"/"$$first"; \
+ fi; \
+ fi; \
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+ done; \
+ reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -101,10 +153,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -112,27 +168,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -140,6 +208,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -150,17 +220,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -173,14 +264,38 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
SUBDIRS = man ca de fr it ja nl sv
-
EXTRA_DIST = \
BUGS \
CodingStyle \
@@ -203,27 +318,39 @@ EXTRA_DIST = \
README.sound \
TODO
-subdir = doc
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
- uninstall-info-recursive all-recursive install-data-recursive \
- install-exec-recursive installdirs-recursive install-recursive \
- uninstall-recursive check-recursive installcheck-recursive
-DIST_COMMON = README Makefile.am Makefile.in TODO
-DIST_SUBDIRS = $(SUBDIRS)
all: all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu doc/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu doc/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
@@ -232,7 +359,13 @@ uninstall-info-am:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @set fnord $$MAKEFLAGS; amf=$$2; \
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -243,16 +376,21 @@ $(RECURSIVE_TARGETS):
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
- @set fnord $$MAKEFLAGS; amf=$$2; \
+$(RECURSIVE_CLEAN_TARGETS):
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -272,89 +410,137 @@ maintainer-clean-recursive:
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+ctags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
-
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ empty_fix=.; \
+ else \
+ include_option=--include; \
+ empty_fix=; \
+ fi; \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+ test ! -f $$subdir/TAGS || \
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
- list='$(SUBDIRS)'; for subdir in $$list; do \
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d $(distdir)/$$subdir \
- || mkdir $(distdir)/$$subdir \
+ test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
- (cd $$subdir && \
+ fi; \
+ done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+ dir1=$$subdir; dir2="$(top_distdir)"; \
+ $(am__relativize); \
+ new_top_distdir=$$reldir; \
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+ ($(am__cd) $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$(top_distdir)" \
- distdir=../$(distdir)/$$subdir \
+ top_distdir="$$new_top_distdir" \
+ distdir="$$new_distdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
+ am__skip_mode_fix=: \
distdir) \
|| exit 1; \
fi; \
@@ -364,7 +550,6 @@ check: check-recursive
all-am: Makefile
installdirs: installdirs-recursive
installdirs-am:
-
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
@@ -376,7 +561,7 @@ install-am: all-am
installcheck: installcheck-recursive
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -384,7 +569,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -394,53 +580,83 @@ clean: clean-recursive
clean-am: clean-generic mostlyclean-am
distclean: distclean-recursive
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic distclean-tags
dvi: dvi-recursive
dvi-am:
+html: html-recursive
+
+html-am:
+
info: info-recursive
info-am:
install-data-am:
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-recursive
+
+install-html-am:
+
install-info: install-info-recursive
+install-info-am:
+
install-man:
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-recursive
mostlyclean-am: mostlyclean-generic
-uninstall-am: uninstall-info-am
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
- clean-generic clean-recursive distclean distclean-generic \
- distclean-recursive distclean-tags distdir dvi dvi-am \
- dvi-recursive info info-am info-recursive install install-am \
- install-data install-data-am install-data-recursive \
- install-exec install-exec-am install-exec-recursive \
- install-info install-info-am install-info-recursive install-man \
- install-recursive install-strip installcheck installcheck-am \
- installdirs installdirs-am installdirs-recursive \
- maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-generic \
- mostlyclean-recursive tags tags-recursive uninstall \
- uninstall-am uninstall-info-am uninstall-info-recursive \
- uninstall-recursive
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+ install-am install-strip tags-recursive
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am check check-am clean clean-generic ctags \
+ ctags-recursive distclean distclean-generic distclean-tags \
+ distdir dvi dvi-am html html-am info info-am install \
+ install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ installdirs-am maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
+ tags-recursive uninstall uninstall-am
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/doc/README.graphics b/doc/README.graphics
index 9a27b18..0812a0c 100644
--- a/doc/README.graphics
+++ b/doc/README.graphics
@@ -88,6 +88,10 @@ options include:
with highest priority.
normal_tile_width : the width of terrain tiles
normal_tile_height : the height of terrain tiles
+ unit_width : unit sprite width. Default is always ok, setting is
+ provided just for symmetry with unit_height
+ unit_height : unit sprite height if more than 1.5x terrain tile
+ height in isometric tileset
small_tile_width : the width of icon sprites
small_tile_height : the height of icon sprites
roadstyle : Specifies how roads and rail are drawn.
diff --git a/doc/TODO b/doc/TODO
index 2738572..14332f7 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -4,5 +4,5 @@ THINGS TO DO
Freeciv is quite mature, and we think its already a great game, but
there are always things to add or improve. Check out the TODO page on
-http://www.freeciv.org or wish list items on http://bugs.freeciv.org
-for things that need to be done.
+http://www.freeciv.org or wish list items on
+https://gna.org/projects/freeciv/ for things that need to be done.
diff --git a/doc/ca/Makefile.in b/doc/ca/Makefile.in
index 1f20776..c1c9fa2 100644
--- a/doc/ca/Makefile.in
+++ b/doc/ca/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,84 +14,95 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = doc/ca
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -101,10 +113,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -112,27 +128,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -140,6 +168,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -150,17 +180,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -173,67 +224,116 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
EXTRA_DIST = \
BUGS.ca \
HOWTOPLAY.ca \
README.ca
-subdir = doc/ca
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DIST_COMMON = Makefile.am Makefile.in
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu doc/ca/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/ca/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu doc/ca/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
tags: TAGS
TAGS:
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ctags: CTAGS
+CTAGS:
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile
-
installdirs:
-
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -245,7 +345,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -253,7 +353,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -263,44 +364,79 @@ clean: clean-am
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am:
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic
-uninstall-am: uninstall-info-am
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic uninstall uninstall-am uninstall-info-am
+ mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/doc/de/Makefile.in b/doc/de/Makefile.in
index 2d978fe..5f7e8a4 100644
--- a/doc/de/Makefile.in
+++ b/doc/de/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,84 +14,95 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = doc/de
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -101,10 +113,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -112,27 +128,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -140,6 +168,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -150,17 +180,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -173,68 +224,117 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
EXTRA_DIST = \
BUGS.de \
HOWTOPLAY.de \
INSTALL.de \
README.de
-subdir = doc/de
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DIST_COMMON = Makefile.am Makefile.in
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu doc/de/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/de/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu doc/de/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
tags: TAGS
TAGS:
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ctags: CTAGS
+CTAGS:
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile
-
installdirs:
-
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -246,7 +346,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -254,7 +354,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -264,44 +365,79 @@ clean: clean-am
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am:
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic
-uninstall-am: uninstall-info-am
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic uninstall uninstall-am uninstall-info-am
+ mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/doc/fr/Makefile.in b/doc/fr/Makefile.in
index 9b43136..cd02604 100644
--- a/doc/fr/Makefile.in
+++ b/doc/fr/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,84 +14,95 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = doc/fr
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -101,10 +113,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -112,27 +128,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -140,6 +168,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -150,17 +180,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -173,68 +224,117 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
EXTRA_DIST = \
BUGS.fr \
HOWTOPLAY.fr \
INSTALL.fr \
README.fr
-subdir = doc/fr
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DIST_COMMON = Makefile.am Makefile.in
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu doc/fr/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/fr/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu doc/fr/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
tags: TAGS
TAGS:
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ctags: CTAGS
+CTAGS:
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile
-
installdirs:
-
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -246,7 +346,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -254,7 +354,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -264,44 +365,79 @@ clean: clean-am
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am:
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic
-uninstall-am: uninstall-info-am
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic uninstall uninstall-am uninstall-info-am
+ mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/doc/it/Makefile.in b/doc/it/Makefile.in
index 363b559..1d82914 100644
--- a/doc/it/Makefile.in
+++ b/doc/it/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,84 +14,95 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = doc/it
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -101,10 +113,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -112,27 +128,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -140,6 +168,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -150,17 +180,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -173,67 +224,116 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
EXTRA_DIST = \
HOWTOPLAY.it \
INSTALL.it \
README.it
-subdir = doc/it
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DIST_COMMON = Makefile.am Makefile.in
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu doc/it/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/it/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu doc/it/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
tags: TAGS
TAGS:
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ctags: CTAGS
+CTAGS:
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile
-
installdirs:
-
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -245,7 +345,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -253,7 +353,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -263,44 +364,79 @@ clean: clean-am
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am:
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic
-uninstall-am: uninstall-info-am
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic uninstall uninstall-am uninstall-info-am
+ mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/doc/ja/Makefile.in b/doc/ja/Makefile.in
index d415eba..c12c971 100644
--- a/doc/ja/Makefile.in
+++ b/doc/ja/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,84 +14,95 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = doc/ja
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -101,10 +113,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -112,27 +128,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -140,6 +168,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -150,17 +180,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -173,67 +224,116 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
EXTRA_DIST = \
BUGS.ja \
HOWTOPLAY.ja \
README.ja
-subdir = doc/ja
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DIST_COMMON = Makefile.am Makefile.in
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu doc/ja/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/ja/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu doc/ja/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
tags: TAGS
TAGS:
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ctags: CTAGS
+CTAGS:
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile
-
installdirs:
-
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -245,7 +345,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -253,7 +353,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -263,44 +364,79 @@ clean: clean-am
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am:
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic
-uninstall-am: uninstall-info-am
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic uninstall uninstall-am uninstall-info-am
+ mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/doc/man/Makefile.in b/doc/man/Makefile.in
index a41b345..c34f107 100644
--- a/doc/man/Makefile.in
+++ b/doc/man/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,84 +14,120 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = doc/man
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+man6dir = $(mandir)/man6
+am__installdirs = "$(DESTDIR)$(man6dir)"
+NROFF = nroff
+MANS = $(man_MANS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -101,10 +138,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -112,27 +153,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -140,6 +193,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -150,17 +205,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -173,112 +249,167 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
man_MANS = civserver.6 civclient.6
-
EXTRA_DIST = $(man_MANS)
-subdir = doc/man
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-
-NROFF = nroff
-MANS = $(man_MANS)
-DIST_COMMON = Makefile.am Makefile.in
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu doc/man/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
-
-man6dir = $(mandir)/man6
-install-man6: $(man6_MANS) $(man_MANS)
- @$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(man6dir)
- @list='$(man6_MANS) $(dist_man6_MANS) $(nodist_man6_MANS)'; \
- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- for i in $$l2; do \
- case "$$i" in \
- *.6*) list="$$list $$i" ;; \
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
esac; \
done; \
- for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
- case "$$ext" in \
- 6*) ;; \
- *) ext='6' ;; \
- esac; \
- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
- inst=`echo $$inst | sed -e 's/^.*\///'`; \
- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
- echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man6dir)/$$inst"; \
- $(INSTALL_DATA) $$file $(DESTDIR)$(man6dir)/$$inst; \
- done
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/man/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu doc/man/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-man6: $(man_MANS)
+ @$(NORMAL_INSTALL)
+ test -z "$(man6dir)" || $(MKDIR_P) "$(DESTDIR)$(man6dir)"
+ @list=''; test -n "$(man6dir)" || exit 0; \
+ { for i in $$list; do echo "$$i"; done; \
+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+ sed -n '/\.6[a-z]*$$/p'; \
+ } | while read p; do \
+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; echo "$$p"; \
+ done | \
+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^6][0-9a-z]*$$,6,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
+ sed 'N;N;s,\n, ,g' | { \
+ list=; while read file base inst; do \
+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man6dir)/$$inst'"; \
+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man6dir)/$$inst" || exit $$?; \
+ fi; \
+ done; \
+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+ while read files; do \
+ test -z "$$files" || { \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man6dir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man6dir)" || exit $$?; }; \
+ done; }
+
uninstall-man6:
@$(NORMAL_UNINSTALL)
- @list='$(man6_MANS) $(dist_man6_MANS) $(nodist_man6_MANS)'; \
- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- for i in $$l2; do \
- case "$$i" in \
- *.6*) list="$$list $$i" ;; \
- esac; \
- done; \
- for i in $$list; do \
- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
- inst=`echo $$inst | sed -e 's/^.*\///'`; \
- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
- echo " rm -f $(DESTDIR)$(man6dir)/$$inst"; \
- rm -f $(DESTDIR)$(man6dir)/$$inst; \
- done
+ @list=''; test -n "$(man6dir)" || exit 0; \
+ files=`{ for i in $$list; do echo "$$i"; done; \
+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+ sed -n '/\.6[a-z]*$$/p'; \
+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^6][0-9a-z]*$$,6,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+ test -z "$$files" || { \
+ echo " ( cd '$(DESTDIR)$(man6dir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(man6dir)" && rm -f $$files; }
tags: TAGS
TAGS:
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ctags: CTAGS
+CTAGS:
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @list='$(MANS)'; if test -n "$$list"; then \
+ list=`for p in $$list; do \
+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
+ if test -n "$$list" && \
+ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
+ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
+ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \
+ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \
+ echo " typically \`make maintainer-clean' will remove them" >&2; \
+ exit 1; \
+ else :; fi; \
+ else :; fi
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(MANS)
-
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(man6dir)
-
+ for dir in "$(DESTDIR)$(man6dir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -290,7 +421,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -298,7 +429,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -308,47 +440,82 @@ clean: clean-am
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am: install-man
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man: install-man6
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic
-uninstall-am: uninstall-info-am uninstall-man
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-man
uninstall-man: uninstall-man6
+.MAKE: install-am install-strip
+
.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
- install-man6 install-strip installcheck installcheck-am \
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-man6 install-pdf install-pdf-am install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic uninstall uninstall-am \
- uninstall-info-am uninstall-man uninstall-man6
+ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+ uninstall-am uninstall-man uninstall-man6
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/doc/man/civserver.6 b/doc/man/civserver.6
index 5d9dc89..ec04b12 100644
--- a/doc/man/civserver.6
+++ b/doc/man/civserver.6
@@ -19,6 +19,7 @@ civserver \- The server for the Freeciv game
[ \-e|\-\-exit\-on\-end ] \
[ \-f|\-\-file \fIfilename\fP ] \
[ \-h|\-\-help ] \
+[ \-i|\-\-identity \fIaddress\fP ] \
[ \-l|\-\-log \fIfilename\fP ] \
[ \-M|\-\-Metaserver \fIaddress\fP ] \
[ \-m|\-\-meta ] \
@@ -121,6 +122,10 @@ Allow guests to login as 'guest' when authentication is enabled.
.BI "\-h, \-\-help"
Prints out a description of the command line options and exits.
.TP
+.BI "\-i \fIaddress\fP, \-\-identity \fIaddress\fP"
+Reports the \fIaddress\fP to the metaserver. Then, the metaserver will use
+this address to redirect the users.
+.TP
.BI "\-l \fIfilename\fP, \-\-log \fIfilename\fP"
Defines a log file, \fIfilename\fP, to be produced during processing. Use the
.I \-d
diff --git a/doc/nl/Makefile.in b/doc/nl/Makefile.in
index a739e3d..e16de0a 100644
--- a/doc/nl/Makefile.in
+++ b/doc/nl/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,84 +14,95 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = doc/nl
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -101,10 +113,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -112,27 +128,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -140,6 +168,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -150,17 +180,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -173,67 +224,116 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
EXTRA_DIST = \
BUGS.nl \
HOWTOPLAY.nl \
README.nl
-subdir = doc/nl
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DIST_COMMON = Makefile.am Makefile.in
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu doc/nl/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/nl/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu doc/nl/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
tags: TAGS
TAGS:
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ctags: CTAGS
+CTAGS:
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile
-
installdirs:
-
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -245,7 +345,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -253,7 +353,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -263,44 +364,79 @@ clean: clean-am
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am:
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic
-uninstall-am: uninstall-info-am
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic uninstall uninstall-am uninstall-info-am
+ mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/doc/sv/Makefile.in b/doc/sv/Makefile.in
index 3b336e9..db28483 100644
--- a/doc/sv/Makefile.in
+++ b/doc/sv/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,84 +14,95 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = doc/sv
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -101,10 +113,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -112,27 +128,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -140,6 +168,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -150,17 +180,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -173,67 +224,116 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
EXTRA_DIST = \
BUGS.sv \
HOWTOPLAY.sv \
README.sv
-subdir = doc/sv
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DIST_COMMON = Makefile.am Makefile.in
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu doc/sv/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/sv/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu doc/sv/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
tags: TAGS
TAGS:
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ctags: CTAGS
+CTAGS:
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile
-
installdirs:
-
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -245,7 +345,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -253,7 +353,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -263,44 +364,79 @@ clean: clean-am
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am:
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic
-uninstall-am: uninstall-info-am
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic uninstall uninstall-am uninstall-info-am
+ mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/m4/sound.m4 b/m4/sound.m4
index b967b82..c845e9e 100644
--- a/m4/sound.m4
+++ b/m4/sound.m4
@@ -1,23 +1,39 @@
AC_DEFUN([FC_CHECK_SOUND],[
AC_ARG_ENABLE(sdl-mixer,
- [ --disable-sdl-mixer Do not try to use the SDL mixer],
- USE_SOUND=no, USE_SOUND_SDL=yes)
+ [ --disable-sdl-mixer do not try to use the SDL mixer],
+ [case "${enableval}" in
+ yes) USE_SOUND_SDL=yes ;;
+ no) USE_SOUND_SDL=no ;;
+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-sdl-mixer]) ;;
+ esac], [USE_SOUND_SDL=maybe])
- if test "x$USE_SOUND_SDL" = "xyes"; then
+ if test "x$USE_SOUND_SDL" != "xno" ; then
dnl Add SDL support to client
SDL_VERSION=1.0.0
AM_PATH_SDL($SDL_VERSION, SDL=yes, SDL=no)
if test "x$SDL" != "xno"; then
- AC_CHECK_HEADER(SDL/SDL_mixer.h, SDL_mixer_h=1, SDL_mixer_h=0)
+
+ ac_save_CPPFLAGS="$CPPFLAGS"
+ ac_save_CFLAGS="$CFLAGS"
+ ac_save_LIBS="$LIBS"
+ CPPFLAGS="$CFLAGS $SDL_CFLAGS"
+ CFLAGS="$CFLAGS $SDL_CFLAGS"
+ LIBS="$LIBS $SDL_LIBS"
+ AC_CHECK_HEADER(SDL_mixer.h, SDL_mixer_h=1, SDL_mixer_h=0)
AC_CHECK_LIB(SDL_mixer, Mix_OpenAudio, SDL_mixer=yes)
+ CPPFLAGS="$ac_save_CPPFLAGS"
+ CFLAGS="$ac_save_CFLAGS"
+ LIBS="$ac_save_LIBS"
+
AC_MSG_CHECKING(building SDL_mixer support)
if test "x$SDL_mixer_h" = "x1"; then
if test "x$SDL_mixer" = "xyes"; then
SOUND_CFLAGS="$SOUND_CFLAGS $SDL_CFLAGS"
- SOUND_LIBS="$SOUND_LIBS $SDL_LIBS -lSDL_mixer"
+ SOUND_LIBS="$SOUND_LIBS -lSDL_mixer $SDL_LIBS"
AC_DEFINE(AUDIO_SDL, 1, [SDL_Mixer support])
AC_DEFINE(SDL, 1, [SDL is used])
AC_MSG_RESULT(yes)
+ SOUND_SDL_OK=true
else
AC_MSG_RESULT([no, found header but not library!])
fi
@@ -26,5 +42,8 @@ AC_DEFUN([FC_CHECK_SOUND],[
SDL_mixer="xno"
fi
fi
+ if test "x$USE_SOUND_SDL" = "xyes" && test "x$SOUND_SDL_OK" != "xtrue" ; then
+ AC_MSG_ERROR([SDL mixer support requested, but cannot be compiled in])
+ fi
fi
])
diff --git a/m4/xaw-client.m4 b/m4/xaw-client.m4
index 636ac70..89b4c74 100644
--- a/m4/xaw-client.m4
+++ b/m4/xaw-client.m4
@@ -5,6 +5,7 @@
AC_DEFUN([FC_XAW_CLIENT],
[
+ AC_REQUIRE([AC_PATH_XTRA])
if test "$client" = yes ; then
AC_MSG_WARN([Not checking for XAW; use --enable-client=xaw to enable])
elif test "$client" = xaw ; then
diff --git a/manual/Makefile.in b/manual/Makefile.in
index 38c8775..e9fdf7b 100644
--- a/manual/Makefile.in
+++ b/manual/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,84 +14,114 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+bin_PROGRAMS = civmanual$(EXEEXT)
+subdir = manual
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__installdirs = "$(DESTDIR)$(bindir)"
+PROGRAMS = $(bin_PROGRAMS)
+am_civmanual_OBJECTS = civmanual.$(OBJEXT)
+civmanual_OBJECTS = $(am_civmanual_OBJECTS)
+am__DEPENDENCIES_1 =
+civmanual_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(civmanual_LDFLAGS) \
+ $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/bootstrap/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(civmanual_SOURCES)
+DIST_SOURCES = $(civmanual_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -101,10 +132,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -112,27 +147,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -140,6 +187,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -150,17 +199,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -173,15 +243,38 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
-bin_PROGRAMS = civmanual
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
AM_CPPFLAGS = -I$(top_srcdir)/server -I$(top_srcdir)/utility -I$(top_srcdir)/common -I$(top_srcdir)/ai -I../intl -I$(top_srcdir)/common/aicore -I$(top_srcdir)/server/generator -I$(top_srcdir)/client -I$(top_srcdir)/client/include
-
civmanual_SOURCES = \
civmanual.c
@@ -212,162 +305,192 @@ civmanual_LDADD = ../utility/libcivutility.a ../common/libcivcommon.a \
../server/generator/libgenerator.a \
$(SERVER_LIBS) $(AUTH_LIBS) $(LIB_GGZDMOD)
-subdir = manual
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-bin_PROGRAMS = civmanual$(EXEEXT)
-PROGRAMS = $(bin_PROGRAMS)
-
-am_civmanual_OBJECTS = civmanual.$(OBJEXT)
-civmanual_OBJECTS = $(am_civmanual_OBJECTS)
-
-DEFS = @DEFS@
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-depcomp = $(SHELL) $(top_srcdir)/bootstrap/depcomp
-am__depfiles_maybe = depfiles
- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/civmanual.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-CFLAGS = @CFLAGS@
-DIST_SOURCES = $(civmanual_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(civmanual_SOURCES)
-
all: all-am
.SUFFIXES:
.SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu manual/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu manual/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu manual/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(bindir)
- @list='$(bin_PROGRAMS)'; for p in $$list; do \
- p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
- if test -f $$p \
- ; then \
- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
- $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \
- else :; fi; \
- done
+ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p; \
+ then echo "$$p"; echo "$$p"; else :; fi; \
+ done | \
+ sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+ sed 'N;N;N;s,\n, ,g' | \
+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+ if ($$2 == $$4) files[d] = files[d] " " $$1; \
+ else { print "f", $$3 "/" $$4, $$1; } } \
+ END { for (d in files) print "f", d, files[d] }' | \
+ while read type dir files; do \
+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+ test -z "$$files" || { \
+ echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+ $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+ } \
+ ; done
uninstall-binPROGRAMS:
@$(NORMAL_UNINSTALL)
- @list='$(bin_PROGRAMS)'; for p in $$list; do \
- f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
- rm -f $(DESTDIR)$(bindir)/$$f; \
- done
+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ files=`for p in $$list; do echo "$$p"; done | \
+ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+ -e 's/$$/$(EXEEXT)/' `; \
+ test -n "$$list" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(bindir)" && rm -f $$files
clean-binPROGRAMS:
-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
civmanual$(EXEEXT): $(civmanual_OBJECTS) $(civmanual_DEPENDENCIES)
@rm -f civmanual$(EXEEXT)
- $(LINK) $(civmanual_LDFLAGS) $(civmanual_OBJECTS) $(civmanual_LDADD) $(LIBS)
+ $(civmanual_LINK) $(civmanual_OBJECTS) $(civmanual_LDADD) $(LIBS)
mostlyclean-compile:
- -rm -f *.$(OBJEXT) core *.core
+ -rm -f *.$(OBJEXT)
distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/civmanual.Po at am__quote@
-distclean-depend:
- -rm -rf ./$(DEPDIR)
-
.c.o:
- at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
- at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- $(COMPILE) -c `cygpath -w $<`
-CCDEPMODE = @CCDEPMODE@
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: CTAGS
+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(PROGRAMS)
-
installdirs:
- $(mkinstalldirs) $(DESTDIR)$(bindir)
-
+ for dir in "$(DESTDIR)$(bindir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -379,7 +502,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -387,7 +510,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -397,48 +521,85 @@ clean: clean-am
clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
distclean: distclean-am
-
-distclean-am: clean-am distclean-compile distclean-depend \
- distclean-generic distclean-tags
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-tags
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am:
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am: install-binPROGRAMS
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-compile mostlyclean-generic
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
-.PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \
- clean-generic distclean distclean-compile distclean-depend \
- distclean-generic distclean-tags distdir dvi dvi-am info \
- info-am install install-am install-binPROGRAMS install-data \
- install-data-am install-exec install-exec-am install-info \
- install-info-am install-man install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
+ps-am:
+
+uninstall-am: uninstall-binPROGRAMS
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+ clean-generic ctags distclean distclean-compile \
+ distclean-generic distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-binPROGRAMS \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic tags uninstall uninstall-am \
- uninstall-binPROGRAMS uninstall-info-am
+ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+ uninstall-am uninstall-binPROGRAMS
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index fd36d32..f2a17d3 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -52,6 +52,7 @@ server/stdinhand.c
server/techtools.c
server/unithand.c
server/unittools.c
+server/voting.c
server/generator/mapgen.c
server/generator/startpos.c
client/attribute.c
diff --git a/po/ar.gmo b/po/ar.gmo
index c4556ee..dd0e7b0 100644
Binary files a/po/ar.gmo and b/po/ar.gmo differ
diff --git a/po/ar.po b/po/ar.po
index 04cb55f..6e26dca 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: 2009-03-29 21:13+0900\n"
+"POT-Creation-Date: 2009-11-22 21:37+0100\n"
"PO-Revision-Date: 2007-08-10 18:00+0300\n"
"Last-Translator: Ahmad M. Zawawi <zeus_go64 at yahoo.com>\n"
"Language-Team: Arabic <freeciv-i18n at freeciv.org>\n"
@@ -64,21 +64,21 @@ msgstr "?obsolete:Ù‚"
msgid "?redundant:*"
msgstr "?redundant:Ù…"
-#: common/connection.c:515
+#: common/connection.c:518
#, c-format
msgid "%s from %s"
msgstr "%s من %s"
-#: common/connection.c:521
+#: common/connection.c:524
msgid " (connection incomplete)"
msgstr " (اتصال غير مكتمل)"
-#: common/connection.c:525
+#: common/connection.c:528
#, c-format
msgid " (player %s)"
msgstr " (اللاعب %s)"
-#: common/connection.c:529
+#: common/connection.c:532
msgid " (observer)"
msgstr " (مراقب)"
@@ -483,81 +483,81 @@ msgstr "رسائل الاتصال أو قطع الاتصال"
msgid "AI Debug messages"
msgstr "رسائل ØÙ„ مشاكل DEBUG Ù„ Ø°.ا"
-#: common/player.c:732
+#: common/player.c:746
msgid "?attitude:Genocidal"
msgstr "?attitude:ابادة جماعية"
-#: common/player.c:734
+#: common/player.c:748
msgid "?attitude:Belligerent"
msgstr "?attitude:مولع بالقتال"
-#: common/player.c:736
+#: common/player.c:750
msgid "?attitude:Hostile"
msgstr "?attitude:معادي"
-#: common/player.c:738
+#: common/player.c:752
msgid "?attitude:Uncooperative"
msgstr "?attitude:غير متعاون"
-#: common/player.c:740
+#: common/player.c:754
msgid "?attitude:Uneasy"
msgstr "?attitude:صعب"
-#: common/player.c:742
+#: common/player.c:756
msgid "?attitude:Neutral"
msgstr "?attitude:Ù…Øايد"
-#: common/player.c:744
+#: common/player.c:758
msgid "?attitude:Respectful"
msgstr "?attitude:Ù…Øترم"
-#: common/player.c:746
+#: common/player.c:760
msgid "?attitude:Helpful"
msgstr "?attitude:متعاون"
-#: common/player.c:748
+#: common/player.c:762
msgid "?attitude:Enthusiastic"
msgstr "?attitude:متØمس"
-#: common/player.c:750
+#: common/player.c:764
msgid "?attitude:Admiring"
msgstr "?attitude:معجب"
-#: common/player.c:753
+#: common/player.c:767
msgid "?attitude:Worshipful"
msgstr "?attitude:مبجل"
-#: common/player.c:764
+#: common/player.c:778
msgid "?diplomatic_state:Armistice"
msgstr "?diplomatic_state:هدنة"
-#: common/player.c:765
+#: common/player.c:779
msgid "?diplomatic_state:War"
msgstr "?diplomatic_state:Øرب"
-#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:780 client/gui-gtk-2.0/diplodlg.c:353
#: 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:767 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:781 client/gui-gtk-2.0/diplodlg.c:358
#: 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:768 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:782 client/gui-gtk-2.0/diplodlg.c:363
#: 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:769
+#: common/player.c:783
msgid "?diplomatic_state:Never met"
msgstr "?diplomatic_state:لم يقابل أبدا"
-#: common/player.c:770
+#: common/player.c:784
msgid "?diplomatic_state:Team"
msgstr "?diplomatic_state:Ùريق"
@@ -588,7 +588,7 @@ msgstr "شروط البقاء مدعومة Ùقط عند مدى العالم."
#. TRANS: "Resources: (none)".
#: common/requirements.c:1014 common/team.c:132
#: client/gui-gtk-2.0/helpdlg.c:1055 client/gui-gtk-2.0/inteldlg.c:390
-#: client/gui-win32/helpdlg.c:586 client/gui-xaw/helpdlg.c:991
+#: client/gui-win32/helpdlg.c:592 client/gui-xaw/helpdlg.c:991
#, c-format
msgid "(none)"
msgstr "(لا يوجد)"
@@ -614,10 +614,11 @@ msgstr "تكنولوجيا المستقبل. %d"
#: 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
#: client/gui-sdl/helpdlg.c:817 client/gui-sdl/mapview.c:962
-#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:545
-#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:735
-#: 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
+#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:544
+#: client/gui-win32/helpdlg.c:551 client/gui-win32/helpdlg.c:721
+#: client/gui-win32/helpdlg.c:741 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 "لا يوجد"
@@ -630,29 +631,29 @@ msgstr "تكنولوجيا المستقبل."
msgid "(Unknown)"
msgstr "(مجهول)"
-#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:553
#: manual/civmanual.c:224
msgid "Road"
msgstr "طريق"
-#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:557
#: client/gui-gtk-2.0/menu.c:829 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:394 common/terrain.c:572 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:567
#: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
#: data/civ1/techs.ruleset:563
msgid "Railroad"
msgstr "سكة Øديد"
-#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:555
msgid "Mine"
msgstr "منجم"
-#: common/terrain.c:396 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:551 server/report.c:124
#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "تلوث"
@@ -661,7 +662,7 @@ msgstr "تلوث"
msgid "Hut"
msgstr "كوخ"
-#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:563
#: manual/civmanual.c:226
msgid "Fortress"
msgstr "Øصن"
@@ -674,58 +675,58 @@ msgstr "النهر"
msgid "Farmland"
msgstr "أرض زراعية"
-#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:577
#: manual/civmanual.c:226
msgid "Airbase"
msgstr "قاعدة جوية"
-#: common/terrain.c:402 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:579
msgid "Fallout"
msgstr "غبار ذري"
-#: common/unit.c:546 client/gui-win32/plrdlg.c:337
+#: common/unit.c:549 client/gui-win32/plrdlg.c:337
msgid "Idle"
msgstr "عاطل"
-#: common/unit.c:556
+#: common/unit.c:559
msgid "Fortifying"
msgstr "جاري التØصن"
-#: common/unit.c:558
+#: common/unit.c:561
msgid "Fortified"
msgstr "متØصن"
-#: common/unit.c:562 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
+#: common/unit.c:565 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
msgid "Sentry"
msgstr "Øرس"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
+#: common/unit.c:569 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
#: client/gui-win32/menu.c:370 client/gui-xaw/menu.c:185
msgid "Pillage"
msgstr "اسرق"
-#: common/unit.c:568 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
+#: common/unit.c:571 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
msgid "Goto"
msgstr "اذهب"
-#: common/unit.c:570
+#: common/unit.c:573
msgid "Explore"
msgstr "استكشÙ"
-#: common/unit.c:572 manual/civmanual.c:224
+#: common/unit.c:575 manual/civmanual.c:224
msgid "Transform"
msgstr "تØول"
-#: common/unit.c:584 client/text.c:157 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:587 client/text.c:157 client/gui-sdl/citydlg.c:1972
#: client/gui-win32/citydlg.c:1257 client/gui-xaw/citydlg.c:1423
msgid "Unknown"
msgstr "مجهول"
-#: common/unit.c:1022
+#: common/unit.c:1025
msgid "Moves"
msgstr "يتØرك"
-#: common/unit.c:1571
+#: common/unit.c:1574
#, c-format
msgid ""
"Upgrade %s to %s for %d gold?\n"
@@ -734,12 +735,12 @@ msgstr ""
"تطوير %s إلى %s ب %d ذهب?\n"
"تØتوي الخزينة %d ذهب."
-#: common/unit.c:1579
+#: common/unit.c:1582
#, c-format
msgid "Sorry, cannot upgrade %s (yet)."
msgstr "آسÙ, لا يمكن تطوير %s (Øتى اﻵن)."
-#: common/unit.c:1585
+#: common/unit.c:1588
#, c-format
msgid ""
"Upgrading %s to %s costs %d gold.\n"
@@ -748,11 +749,11 @@ msgstr ""
"تطوير %s إلى %s يكل٠%d ذهب?\n"
"تØتوي الخزينة %d ذهب."
-#: common/unit.c:1594
+#: common/unit.c:1597
msgid "You can only upgrade units in your cities."
msgstr "تستطيع Ùقط تطوير الوØدات ÙÙŠ مدنك."
-#: common/unit.c:1598
+#: common/unit.c:1601
#, c-format
msgid "Upgrading this %s would strand units it transports."
msgstr "تطوير %s سيقطع سبل الوØدات التي تØملها."
@@ -789,11 +790,11 @@ msgstr "نووي"
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1404
+#: common/unittype.c:349 client/helpdata.c:1412
msgid " and "
msgstr "Ùˆ"
-#: common/unittype.c:355 client/helpdata.c:1390
+#: common/unittype.c:355 client/helpdata.c:1398
msgid "?and:, "
msgstr "?مع:, "
@@ -964,71 +965,71 @@ msgstr "باراميتر Ùارغ Ù„ \"%s\".\n"
msgid "Missing argument for \"%s\".\n"
msgstr "باراميتر Ù…Ùقود Ù„ \"%s\".\n"
-#: utility/shared.c:501
+#: utility/shared.c:514
#, c-format
msgid "%d BC"
msgstr "%d قبل الميلاد"
-#: utility/shared.c:503
+#: utility/shared.c:516
#, c-format
msgid "%d AD"
msgstr "%d بعد الميلاد"
-#: utility/shared.c:924
+#: utility/shared.c:937
msgid "FREECIV_PATH is set but empty; using default path instead."
msgstr ""
"المتغير FREECIV_PATH Ù…Øدد ولكنه Ùارغ; جاري استعمال الدليل الاÙتراضي بدلا عنه."
-#: utility/shared.c:1028
+#: utility/shared.c:1041
#, c-format
msgid "Could not read data directory %s: %s."
msgstr "لا يمكن قراءة مجلد البيانات %s: %s."
-#: utility/shared.c:1279
+#: utility/shared.c:1292
msgid "The data path may be set via the environment variable FREECIV_PATH."
msgstr "دليل البيانات يمكن تØديده بواسطة متغير البيئة FREECIV_PATH."
-#: utility/shared.c:1281
+#: utility/shared.c:1294
#, c-format
msgid "Current data path is: \"%s\""
msgstr "دليل البيانات الØالي هو: \"%s\""
-#: utility/shared.c:1283
+#: utility/shared.c:1296
#, c-format
msgid "The \"%s\" file is required ... aborting!"
msgstr "المل٠\"%s\" مطلوب ... جاري الغاء العملية!"
-#: utility/shared.c:1460
+#: utility/shared.c:1485
#, c-format
msgid "%s: Fatal error: you're trying to run me as superuser!\n"
msgstr ""
"ال %s: خطأ قاتل: أنت تØاول تشغيلي كمستخدم الكومبيوتر ذو الصلاØيات العليا !\n"
-#: utility/shared.c:1462
+#: utility/shared.c:1487
msgid "Use a non-privileged account instead.\n"
msgstr "استعمل Øساب بلا صلاØيات بدلا من ذلك.\n"
-#: utility/shared.c:1478
+#: utility/shared.c:1503
msgid "exact match"
msgstr "مطابق تماما"
-#: utility/shared.c:1479
+#: utility/shared.c:1504
msgid "only match"
msgstr "Ùقط مطابق"
-#: utility/shared.c:1480
+#: utility/shared.c:1505
msgid "ambiguous"
msgstr "مبهم"
-#: utility/shared.c:1481
+#: utility/shared.c:1506
msgid "empty"
msgstr "Ùارغ"
-#: utility/shared.c:1482
+#: utility/shared.c:1507
msgid "too long"
msgstr "طويل جدا"
-#: utility/shared.c:1483
+#: utility/shared.c:1508
msgid "non-match"
msgstr "غير مطابق"
@@ -1057,22 +1058,22 @@ msgstr "ال %s قد بدء بناء ال %s ÙÙŠ %s."
msgid "%s is selling %s (not needed) for %d."
msgstr "%s يبيع %s (غير Ù…Øتاج) ب %d."
-#: ai/advdiplomacy.c:280
+#: ai/advdiplomacy.c:300
#, c-format
msgid "*%s (AI)* In away mode AI can't sign such a treaty."
msgstr "ال *%s (Ø°.ا)* ÙÙŠ نمط awayØŒ لا يستطيع Ø°.ا أن يوقع هكذا معاهدة."
-#: ai/advdiplomacy.c:290
+#: ai/advdiplomacy.c:310
#, c-format
msgid "*%s (AI)* First break alliance with %s, %s."
msgstr "ال *%s (Ø°.ا)* أول نقض للتØال٠مع %s, %s."
-#: ai/advdiplomacy.c:303
+#: ai/advdiplomacy.c:322
#, c-format
msgid "*%s (AI)* Let us first cease hostilies, %s."
msgstr "ال *%s (AI)* دعنا نوق٠العداوات أولا، %s."
-#: ai/advdiplomacy.c:308
+#: ai/advdiplomacy.c:327
#, c-format
msgid ""
"*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
@@ -1080,47 +1081,47 @@ msgid ""
msgstr ""
"ال *%s (Ø°.ا)* أرغب أولا ابقاء وق٠اطلاق النار الØالي لمدة أطول قليلا ØŒ %s."
-#: ai/advdiplomacy.c:331
+#: ai/advdiplomacy.c:350
#, c-format
msgid "*%s (AI)* I simply do not trust you with an alliance yet, %s."
msgstr "ال *%s (Ø°.ا)* أنا لا أثق بك للتØال٠Øتى اﻵن, %s."
-#: ai/advdiplomacy.c:424
+#: ai/advdiplomacy.c:443
#, c-format
msgid "*%s (AI)* I do not know the city you mention."
msgstr "ال *%s (ذ.ا)* أنا لا أعر٠المدينة التي ذكرتها."
-#: ai/advdiplomacy.c:454
+#: ai/advdiplomacy.c:473
#, c-format
msgid "*%s (AI)* Sorry, sharing vision with you is not safe."
msgstr "ال *%s (Ø°.ا)* متأسÙØŒ الرؤية المشتركة معاك ليست آمنة."
-#: ai/advdiplomacy.c:560
+#: ai/advdiplomacy.c:579
#, c-format
msgid "*%s (AI)* This deal was not very good for us, %s!"
msgstr "ال *%s (Ø°.ا)* هذه الصÙقة ليست جيدة جدا لنا، %s!"
-#: ai/advdiplomacy.c:582
+#: ai/advdiplomacy.c:601
#, c-format
msgid "*%s (AI)* Welcome into our alliance %s!"
msgstr "ال *%s (Ø°.ا)* مرØبا بك بÙØÙÙ„Ùنا %s!"
-#: ai/advdiplomacy.c:586
+#: ai/advdiplomacy.c:605
#, c-format
msgid "*%s (AI)* Yes, may we forever stand united, %s."
msgstr "ال *%s (Ø°.ا)* نعم، يمكننا البقاء متØدين للأبد، %s."
-#: ai/advdiplomacy.c:593
+#: ai/advdiplomacy.c:612
#, c-format
msgid "*%s (AI)* Yes, peace in our time!"
msgstr "ال *%s (Ø°.ا)* نعم، السلام ÙÙŠ وقتنا!"
-#: ai/advdiplomacy.c:598
+#: ai/advdiplomacy.c:617
#, c-format
msgid "*%s (AI)* Agreed. No more hostilities, %s."
msgstr "ال *%s (Ø°.ا)* مواÙÙ‚. لا مزيد من العداوات، %s."
-#: ai/advdiplomacy.c:813
+#: ai/advdiplomacy.c:832
#, c-format
msgid ""
"*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
@@ -1129,40 +1130,40 @@ msgstr ""
"ال *%s (Ø°.ا)* تØياتي يا %s! هل من الممكن Ø§Ù‚ØªØ±Ø§Ø ÙˆÙ‚Ù Ø§Ø·Ù„Ø§Ù‚ نار بينما نتعار٠"
"أكثر?"
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1116
#, c-format
msgid "*%s (AI)* Space will never be yours. "
msgstr "ال *%s (Ø°.ا)* لن يكون الÙضاء ملكك أبدا. "
-#: ai/advdiplomacy.c:1102
+#: ai/advdiplomacy.c:1121
#, c-format
msgid "*%s (AI)* I have tolerated your vicious antics long enough! To war!"
msgstr ""
"ال *%s (Ø°.ا)* لقد تØملت أعمالك الشريرة لوقت طويل بما Ùيه الكÙاية! إلى الØرب!"
-#: ai/advdiplomacy.c:1108
+#: ai/advdiplomacy.c:1127
#, c-format
msgid "*%s (AI)* Peace in ... some other time."
msgstr "ال *%s (Ø°.ا)* السلام ÙÙŠ ... وقت آخر."
-#: ai/advdiplomacy.c:1113
+#: ai/advdiplomacy.c:1132
#, 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:1119
+#: ai/advdiplomacy.c:1138
#, c-format
msgid "*%s (AI)* Your covert hostilities brought this war upon you!"
msgstr "ال *%s (Ø°.ا)* عداواتك الخÙية جلبت هذه الØرب عليك!"
-#: ai/advdiplomacy.c:1126
+#: ai/advdiplomacy.c:1145
#, c-format
msgid "*%s (AI)* Your aggression against %s was your last mistake!"
msgstr "ال *%s (Ø°.ا)* عنÙÙƒ ضد %s كان آخر خطأ لك!"
-#: ai/advdiplomacy.c:1209
+#: ai/advdiplomacy.c:1229
#, c-format
msgid ""
"*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1180,7 +1181,7 @@ msgstr[2] ""
"ال *%s (Ø°.ا)* سنقوم بشن Øرب كاملة ضد %s ÙÙŠ %d أدوار لايقا٠إطلاق السÙينة "
"الÙضائية."
-#: ai/advdiplomacy.c:1219
+#: ai/advdiplomacy.c:1239
#, c-format
msgid ""
"*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
@@ -1188,7 +1189,7 @@ msgid ""
msgstr ""
"ال *%s (Ø°.ا)* إن مساعدتك ÙÙŠ هذا الأمر متوقعة. ليعش تØالÙنا المجيد طويلا!"
-#: ai/advdiplomacy.c:1225
+#: ai/advdiplomacy.c:1245
#, c-format
msgid ""
"*%s (AI)* %s has grossly violated his treaties with us for own gain. We "
@@ -1208,7 +1209,7 @@ msgstr[2] ""
"ال *%s (Ø°.ا)* لقد انتهك %s معاهداته معنا بشكل Ùظيع لمصلØته الشخصية. سنرد "
"عليه بالقوة ÙÙŠ %d أدوار ونتوقع منك الايÙاء بتØالÙÙƒ معنا والعمل مثلنا!"
-#: ai/advdiplomacy.c:1238
+#: ai/advdiplomacy.c:1258
#, c-format
msgid ""
"*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1222,13 +1223,13 @@ msgstr[1] ""
msgstr[2] ""
"ال *%s (Ø°.ا)* نود نهب وسلب Øضارة %s الغنية. سنعلن الØرب ÙÙŠ %d أدوار."
-#: ai/advdiplomacy.c:1246
+#: ai/advdiplomacy.c:1266
#, 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:1251
+#: ai/advdiplomacy.c:1271
#, c-format
msgid ""
"*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1246,12 +1247,12 @@ msgstr[2] ""
"ال *%s (Ø°.ا)* لقد أخذنا بما Ùيه الكÙاية من %s. دعنا نمزق هذه الØضارة المثيرة "
"للشÙقة. سنعلن الØرب ÙÙŠ %d أدوار."
-#: ai/advdiplomacy.c:1261
+#: ai/advdiplomacy.c:1281
#, c-format
msgid "*%s (AI)* As our glorious allies, we expect your help in this war."
msgstr "ال *%s (Ø°.ا)* ÙƒØÙ„Ùائك المجيدين، نتوقع مساعدتك ÙÙŠ هذه الØرب."
-#: ai/advdiplomacy.c:1267
+#: ai/advdiplomacy.c:1287
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance and declare war on %s in %d turn. "
@@ -1269,7 +1270,7 @@ msgstr[2] ""
"ال *%s (Ø°.ا)* سنوÙÙŠ بتØالÙنا وسنعلن الØرب على %s ÙÙŠ %d أدوار. اصمد - Ù†ØÙ† "
"قادمون!"
-#: ai/advdiplomacy.c:1276
+#: ai/advdiplomacy.c:1296
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1287,7 +1288,7 @@ msgstr[2] ""
"ال *%s (Ø°.ا)* سنوÙÙŠ بتØالÙنا مع %s وسنعلن الØرب على %s ÙÙŠ %d أدوار. نتوقع "
"منك العمل مثلنا."
-#: ai/advdiplomacy.c:1344
+#: ai/advdiplomacy.c:1364
#, c-format
msgid ""
"*%s (AI)* Your attempt to conquer space for yourself alone betray your true "
@@ -1296,7 +1297,7 @@ msgstr ""
"ال *%s (Ø°.ا)* Ù…Øاولتك لاØتلال الÙضاء لنÙسك تخون بها نواياك الØقيقية، ولن "
"أكون بهذا التØال٠بعد اﻵن!"
-#: ai/advdiplomacy.c:1359
+#: ai/advdiplomacy.c:1379
#, c-format
msgid ""
"*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
@@ -1304,19 +1305,19 @@ msgid ""
msgstr ""
"ال *%s (Ø°.ا)* تعبر Ù…Øاولتك للسيطرة الÙردية على الÙضاء الخارجي مهينة جدا."
-#: ai/advdiplomacy.c:1362
+#: ai/advdiplomacy.c:1382
#, 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:1474
+#: ai/advdiplomacy.c:1494
#, c-format
msgid "*%s (AI)* Sorry, sharing vision with you is no longer safe."
msgstr "ال *%s (Ø°.ا)* آسÙØŒ الرؤية المشتركة معاك ليست آمنة بعد اﻵن."
-#: ai/advdiplomacy.c:1549
+#: ai/advdiplomacy.c:1569
#, c-format
msgid ""
"*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
@@ -1324,7 +1325,7 @@ msgid ""
msgstr ""
"ال *%s (Ø°.ا)* تØياتي يا أكثر Øلي٠جدير بالثقة. نطلب منك تدمير عدونا، %s."
-#: ai/advdiplomacy.c:1555
+#: ai/advdiplomacy.c:1575
#, c-format
msgid ""
"*%s (AI)* Greetings ally, I see you have not yet made war with our enemy, %"
@@ -1333,7 +1334,7 @@ msgstr ""
"ال *%s (Ø°.ا)* تØياتي أيها الØليÙØŒ أرى أنك لم تعلن الØرب على عدونا، %s. لماذا "
"يجب علي أن أذكرك بوعودك?"
-#: ai/advdiplomacy.c:1562
+#: ai/advdiplomacy.c:1582
#, c-format
msgid ""
"*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1343,7 +1344,7 @@ msgstr ""
"ال *%s (Ø°.ا)* يا خائن الشرÙØŒ لقد دخلنا ÙÙŠ تØالÙØŒ ولكنك Øتى اﻵن ÙÙŠ Øالة سلام "
"مع عدونا اللدود، %s! هذا غير مقبول، لا تØال٠بيننا بعد اﻵن!"
-#: ai/advdiplomacy.c:1592
+#: ai/advdiplomacy.c:1612
#, c-format
msgid ""
"*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
@@ -1352,13 +1353,13 @@ msgstr ""
"ال *%s (Ø°.ا)* تØياتي أيها الصديق، هل من الممكن أن Ù†Ù‚ØªØ±Ø Ù‡Ø¯Ùا موØدا وانضماما "
"لتØالÙ?"
-#: ai/advdiplomacy.c:1607
+#: ai/advdiplomacy.c:1627
#, c-format
msgid "*%s (AI)* Greetings neighbour, may we suggest more peaceful relations?"
msgstr ""
"ال *%s (Ø°.ا)* تØياتي أيها الجار، هل من الممكن أن Ù†Ù‚ØªØ±Ø Ø¹Ù„Ø§Ù‚Ø§Øª سلمية أكثر?"
-#: ai/advdiplomacy.c:1622
+#: ai/advdiplomacy.c:1642
#, c-format
msgid ""
"*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
@@ -1367,7 +1368,7 @@ msgstr ""
"ال *%s (Ø°.ا)* لقد أرهقنا اراقة الدماء المستمر. هل من الممكن أن Ù†Ù‚ØªØ±Ø Ø§Ù„ØªÙˆÙ‚Ù "
"عن العداوات?"
-#: ai/advdiplomacy.c:1742
+#: ai/advdiplomacy.c:1762
#, c-format
msgid ""
"*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1512,18 +1513,18 @@ msgstr ""
"يجب أن تØتوي كلمة السر على الأقل %d Ø£Øر٠capital, %d أرقام, وتكون على الأقل "
"ذو Øد أدنى %d من عدد الأØر٠المطبوعة. Øاول مرة أخرى."
-#: server/barbarian.c:183
+#: server/barbarian.c:184
#, fuzzy, c-format
msgid "%s gain a leader by the name %s. Dangerous times may lie ahead."
msgstr ""
"Øصل البرابرة على قائد اسمه %s. يمكن أن تكون هناك أوقات صعبة ÙÙŠ المستقبل."
-#: server/barbarian.c:479
+#: server/barbarian.c:480
#, c-format
msgid "Native unrest near %s led by %s."
msgstr "إضطراب Ù…Øلي قرب %s بقيادة %s."
-#: server/barbarian.c:484
+#: server/barbarian.c:485
#, c-format
msgid "Sea raiders seen near %s!"
msgstr "شوهد مهاجمين من البØر قرب %s!"
@@ -1911,7 +1912,7 @@ msgstr[0] "يدÙع %s بعجلة التطور إلى الأمام; لقد Øص
msgstr[1] "يدÙع %s بعجلة التطور إلى الأمام; لقد Øصلت على %d تقدمان Ùوريان."
msgstr[2] "يدÙع %s بعجلة التطور إلى الأمام; لقد Øصلت على %d تقدمات Ùورية."
-#: server/cityturn.c:1158 server/techtools.c:176
+#: server/cityturn.c:1158 server/techtools.c:172
#, c-format
msgid "The %s have acquired %s from %s."
msgstr "استØوذ %s على %s من %s."
@@ -1992,22 +1993,22 @@ msgstr "يجب عليك مقاطعة برنامج Freeciv مرتين خلال
msgid "Warning: the %s option is obsolete. Use -m to enable the metaserver.\n"
msgstr "تØذير: الخيار %s قديم وملغي. استعمل -m لتÙعيل ال metaserver.\n"
-#: server/civserver.c:189
+#: server/civserver.c:193
#, c-format
msgid "Error: unknown option '%s'\n"
msgstr "خطأ: خيار مجهول '%s'\n"
-#: server/civserver.c:200
+#: server/civserver.c:204
#, c-format
msgid "This is the server for %s"
msgstr "هذا هو الخادم ل %s"
-#: server/civserver.c:201
+#: server/civserver.c:205
#, c-format
msgid "You can learn a lot about Freeciv at %s"
msgstr "يمكنك تعلم الكثير عن برنامج Freeciv على %s"
-#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
+#: server/civserver.c:210 client/civclient.c:239 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -2016,105 +2017,110 @@ msgstr ""
"الاستعمال: %s [الخيار ...]\n"
"الخيارات المقبولة:\n"
-#: server/civserver.c:208
+#: server/civserver.c:212
#, fuzzy
msgid ""
" -a --auth FILE\tEnable server authentication with configuration from "
"FILE.\n"
msgstr " -a --auth\t\tتÙعيل التØقق من هوية عند الخادم.\n"
-#: server/civserver.c:210
+#: server/civserver.c:214
msgid " -G --Guests\t\tAllow guests to login if auth is enabled.\n"
msgstr " -G --Guests\t\tØ§Ù„Ø³Ù…Ø§Ø Ù„Ù„Ø¶ÙŠÙˆÙ Ø¨Ø§Ù„Ø¯Ø®ÙˆÙ„ إذا كانت auth Ù…Ùعلة.\n"
-#: server/civserver.c:212
+#: server/civserver.c:216
msgid " -N --Newusers\tAllow new users to login if auth is enabled.\n"
msgstr " -N --Newusers\tØ§Ù„Ø³Ù…Ø§Ø Ù„Ù…ØªØ³Ø®Ø¯Ù…ÙŠÙ† جدد بالدخول إذا كانت auth Ù…Ùعلة.\n"
-#: server/civserver.c:215
+#: server/civserver.c:219
msgid " -b --bind ADDR\tListen for clients on ADDR\n"
msgstr " -b --bind ADDR\tانتظار العملاء على العنوان ADDR\n"
-#: server/civserver.c:217 client/civclient.c:242
+#: server/civserver.c:221 client/civclient.c:243
msgid ""
" -d, --debug NUM\tSet debug log level (0 to 4, or 4:file1,min,max:...)\n"
msgstr ""
" -d, --debug NUM\tتØديد مستوى سجل Ø§Ù„ØªÙ†Ù‚ÙŠØ (0 إلى 4, أو 4:file1,min,"
"max:...)\n"
-#: server/civserver.c:221 client/civclient.c:246
+#: server/civserver.c:225 client/civclient.c:247
msgid " -d, --debug NUM\tSet debug log level (0 to 3)\n"
msgstr " -d, --debug NUM\tتØديد مستوى سجل Ø§Ù„ØªÙ†Ù‚ÙŠØ (0 إلى 3)\n"
-#: server/civserver.c:223
+#: server/civserver.c:227
msgid " -f, --file FILE\tLoad saved game FILE\n"
msgstr " -f, --file FILE\tتØميل اللعبة المØÙوظة ÙÙŠ FILE\n"
-#: server/civserver.c:225 client/civclient.c:249 manual/civmanual.c:382
+#: server/civserver.c:229 client/civclient.c:250 manual/civmanual.c:382
msgid " -h, --help\t\tPrint a summary of the options\n"
msgstr " -h, --help\t\tطباعة ملخص عن الخيارات\n"
-#: server/civserver.c:226
+#: server/civserver.c:230
+#, fuzzy
+msgid " -i, --identity ADDR\tBe known as ADDR at metaserver\n"
+msgstr " -M, --Metaserver ADDR\tتØديد ADDR كعنوان metaserver\n"
+
+#: server/civserver.c:231
msgid " -l, --log FILE\tUse FILE as logfile\n"
msgstr " -l, --log FILE\tاستعمال مل٠FILE كمل٠السجل\n"
-#: server/civserver.c:227
+#: server/civserver.c:232
msgid " -m, --meta\t\tNotify metaserver and send server's info\n"
msgstr " -m, --meta\t\tإعلام metaserver وارسال معلومات الخادم\n"
-#: server/civserver.c:229
+#: server/civserver.c:234
msgid " -M, --Metaserver ADDR\tSet ADDR as metaserver address\n"
msgstr " -M, --Metaserver ADDR\tتØديد ADDR كعنوان metaserver\n"
-#: server/civserver.c:232
+#: server/civserver.c:237
msgid " -p, --port PORT\tListen for clients on port PORT\n"
msgstr " -p, --port PORT\tالسماع للعملاء على المنÙØ° PORT\n"
-#: server/civserver.c:234
+#: server/civserver.c:239
msgid " -q, --quitidle TIME\tQuit if no players for TIME seconds\n"
msgstr " -q, --quitidle TIME\tقم الخروج إذا يوجد لاعبين خلال TIME ثواني\n"
-#: server/civserver.c:236
+#: server/civserver.c:241
msgid " -e, --exit-on-end\tWhen a game ends, exit instead of restarting\n"
msgstr ""
" -e, --exit-on-end\tعند انتهاء اللعبة، قم بالخروج بدلا من اعادة التشغيل\n"
-#: server/civserver.c:239
+#: server/civserver.c:244
msgid " -s, --saves DIR\tSave games to directory DIR\n"
msgstr " -s, --saves DIR\tقم بØÙظ اللعب على الدليل DIR\n"
-#: server/civserver.c:241
+#: server/civserver.c:246
msgid " -S, --Serverid ID\tSets the server id to ID\n"
msgstr " -S, --Serverid ID\tتØديد رقم تعري٠الخادم ب ID\n"
-#: server/civserver.c:243
+#: server/civserver.c:248
msgid " -P, --Ppm\t\tSave ppms of the map when saving the game.\n"
msgstr " -P, --Ppm\t\tØÙظ ppms الخريطة عند ØÙظ اللعبة.\n"
-#: server/civserver.c:244
+#: server/civserver.c:249
msgid " -r, --read FILE\tRead startup script FILE\n"
msgstr " -r, --read FILE\tقراءة سكربت البداية FILE\n"
-#: server/civserver.c:246
+#: server/civserver.c:251
msgid " -R, --Ranklog FILE\tUse FILE as ranking logfile\n"
msgstr " -R, --Ranklog FILE\tاستعمال FILE كمل٠سجل تصني٠الرتب\n"
-#: server/civserver.c:247 client/civclient.c:268 manual/civmanual.c:383
+#: server/civserver.c:252 client/civclient.c:269 manual/civmanual.c:383
msgid " -v, --version\t\tPrint the version number\n"
msgstr " -v, --version\t\tطباعة رقم اصدارة البرنامج\n"
-#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
+#: server/civserver.c:253 client/gui-gtk-2.0/gui_main.c:354
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, fuzzy, c-format
msgid "Report bugs at %s.\n"
msgstr "ارسل تقارير المشاكل إلى <%s>.\n"
-#: server/commands.c:28
+#: server/commands.c:29
msgid "Start the game, or restart after loading a savegame."
msgstr "بدء اللعبة، أو اعادة التشغيل بعد تØميل لعبة Ù…ØÙوظة."
-#: server/commands.c:29
+#: server/commands.c:30
#, fuzzy
msgid ""
"This command starts the game. When starting a new game, it should be used "
@@ -2127,7 +2133,7 @@ msgid ""
msgstr "هذا متى جديد ذكاء اصطناعي Ùيما بعد هذا عندما."
#. TRANS: translate text between <> only
-#: server/commands.c:42
+#: server/commands.c:44
msgid ""
"help\n"
"help commands\n"
@@ -2141,11 +2147,11 @@ msgstr ""
"help <اسم الأمر>\n"
"help <اسم الخيار>"
-#: server/commands.c:47
+#: server/commands.c:49
msgid "Show help about server commands and server options."
msgstr "عرض المساعدة عن أوامر وخيارات الخادم."
-#: server/commands.c:48
+#: server/commands.c:50
#, fuzzy
msgid ""
"With no arguments gives some introductory help. With argument \"commands\" "
@@ -2156,11 +2162,11 @@ msgid ""
"be abbreviated where unambiguous."
msgstr "مع مع ما عدا ذلك لـ الـ."
-#: server/commands.c:63
+#: server/commands.c:66
msgid "Show a list of players, teams, connections, or scenarios."
msgstr "إظهار قائمة اللاعبيين، الÙرق، الاتصالات، أو السيناريوهات."
-#: server/commands.c:64
+#: server/commands.c:67
#, fuzzy
msgid ""
"Show a list of players in the game, teams of players, connections to the "
@@ -2168,20 +2174,20 @@ msgid ""
"defaults to 'players' if absent."
msgstr "المعرض الـ."
-#: server/commands.c:70
+#: server/commands.c:74
msgid "Quit the game and shutdown the server."
msgstr "الخروج من اللعبة وإغلاق الخادم."
#. TRANS: translate text between <> only
-#: server/commands.c:74
+#: server/commands.c:79
msgid "cut <connection-name>"
msgstr "cut <اسم الاتصال>"
-#: server/commands.c:75
+#: server/commands.c:80
msgid "Cut a client's connection to server."
msgstr "Ùصل اتصال عميل من الخادم."
-#: server/commands.c:76
+#: server/commands.c:81
#, fuzzy
msgid ""
"Cut specified client's connection to the server, removing that client from "
@@ -2191,7 +2197,7 @@ msgid ""
msgstr "القطع إذا الملاØظة."
#. TRANS: translate text between <> only
-#: server/commands.c:83
+#: server/commands.c:89
msgid ""
"explain\n"
"explain <option-name>"
@@ -2199,11 +2205,11 @@ msgstr ""
"explain\n"
"explain <اسم الخيار>"
-#: server/commands.c:85
+#: server/commands.c:91
msgid "Explain server options."
msgstr "ØªÙˆØ¶ÙŠØ Ø®ÙŠØ§Ø±Ø§Øª الخادم."
-#: server/commands.c:86
+#: server/commands.c:92
#, fuzzy
msgid ""
"The 'explain' command gives a subset of the functionality of 'help', and is "
@@ -2213,7 +2219,7 @@ msgid ""
msgstr "الـ مع مع<option-name>."
#. TRANS: translate text between <> only
-#: server/commands.c:93
+#: server/commands.c:100
msgid ""
"show\n"
"show <option-name>\n"
@@ -2223,11 +2229,11 @@ msgstr ""
"show <اسم الخيار>\n"
"show <بادئة الخيار>"
-#: server/commands.c:96
+#: server/commands.c:103
msgid "Show server options."
msgstr "إظهار خيارات الخادم."
-#: server/commands.c:97
+#: server/commands.c:104
#, fuzzy
msgid ""
"With no arguments, shows all server options (or available options, when used "
@@ -2235,40 +2241,41 @@ msgid ""
"that prefix."
msgstr "مع مع مع."
-#: server/commands.c:102
+#: server/commands.c:110
msgid "wall <message>"
msgstr "wall <رسالة>"
-#: server/commands.c:103
+#: server/commands.c:111
msgid "Send message to all connections."
msgstr "بعث رسالة إلى كل الاتصالات."
-#: server/commands.c:104
+#: server/commands.c:112
msgid ""
"For each connected client, pops up a window showing the message entered."
msgstr "يظهر لكل عميل متصل ناÙذة تعرض الرسالة المدخلة."
-#: server/commands.c:108
+#: server/commands.c:117
msgid "vote yes|no [vote number]"
msgstr "vote yes|no [رقم التصويت]"
-#: server/commands.c:109
+#: server/commands.c:118
msgid "Cast a vote."
msgstr "ادلي بصوت."
-#: server/commands.c:111
+#: server/commands.c:120
#, 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."
+"A player with basic 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."
msgstr ""
"أي - الØر٠الأوّل ÙÙŠ الأبجديّة اللّاتينيّة مع جديد الـ إذا أنت الـ إذا دوران."
-#: server/commands.c:121
+#: server/commands.c:131
msgid ""
"debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
"<player> | timing | info]"
@@ -2276,33 +2283,33 @@ msgstr ""
"debug [ player <اللاعب> | city <س> <ص> | units <س> <ص> | unit <رقم التعريÙ> "
"| tech <اللاعب> | timing | info]"
-#: server/commands.c:123
+#: server/commands.c:133
msgid "Turn on or off AI debugging of given entity."
msgstr "ÙŠÙعل أو يعطل ØªÙ†Ù‚ÙŠØ Ø§Ù„Ø°ÙƒØ§Ø¡ الاصطناعي (Ø°.ا) لكيان معطى."
-#: server/commands.c:124
+#: server/commands.c:134
msgid ""
"Print AI debug information about given entity and turn continous debugging "
"output for this entity on or off."
msgstr "إظهار أو اخÙاء معلومات ØªÙ†Ù‚ÙŠØ Ø§Ù„ Ø°.ا ومخرجات Ø§Ù„ØªÙ†Ù‚ÙŠØ Ø¹Ù† كيان معطى."
-#: server/commands.c:128
+#: server/commands.c:139
msgid "set <option-name> <value>"
msgstr "set <اسم الخيار> <قيمة>"
-#: server/commands.c:129
+#: server/commands.c:140
msgid "Set server option."
msgstr "تØديد خيار الخادم."
-#: server/commands.c:132
+#: server/commands.c:144
msgid "team <player> [team]"
msgstr "team <اللاعب> [team]"
-#: server/commands.c:133
+#: server/commands.c:145
msgid "Change, add or remove a player's team affiliation."
msgstr "تغيير، إضاÙØ© أو إزالة عضوية لاعب Ù„Ùريق."
-#: server/commands.c:134
+#: server/commands.c:146
#, fuzzy
msgid ""
"Sets a player as member of a team. If no team specified, the player is set "
@@ -2311,15 +2318,15 @@ msgid ""
"to achieve team victory with averaged individual scores."
msgstr "المجموعات إذا الإستعمال أي - الØر٠الأوّل ÙÙŠ الأبجديّة اللّاتينيّة مع مع."
-#: server/commands.c:141
+#: server/commands.c:154
msgid "rulesetdir <directory>"
msgstr "rulesetdir <الدليل>"
-#: server/commands.c:142
+#: server/commands.c:155
msgid "Choose new ruleset directory or modpack."
msgstr "اختيار دليل مجموعة القواعد أو رزمة التغيير modpack الجديدة."
-#: server/commands.c:143
+#: server/commands.c:156
#, fuzzy
msgid ""
"Choose new ruleset directory or modpack. Calling this\n"
@@ -2329,15 +2336,15 @@ msgstr ""
"."
#. TRANS: translate text between <> only
-#: server/commands.c:149
+#: server/commands.c:163
msgid "metainfo <meta-line>"
msgstr "metainfo <نص>"
-#: server/commands.c:150
+#: server/commands.c:164
msgid "Set metaserver info line."
msgstr "تØديد سطر معلومات metaserver."
-#: server/commands.c:151
+#: server/commands.c:165
msgid ""
"Set user defined metaserver info line. If parameter is omitted,\n"
"previously set metamessage will be removed. For most of the time\n"
@@ -2346,19 +2353,19 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:158
+#: server/commands.c:173
msgid "metapatch <meta-line>"
msgstr "metapatch <رقعة المعلومات>"
-#: server/commands.c:159
+#: server/commands.c:174
msgid "Set metaserver patches line."
msgstr "تØديد سطر رقع معلومات metaserver."
-#: server/commands.c:165
+#: server/commands.c:181
msgid "Control metaserver connection."
msgstr "السيطرة على اتصال metaserver."
-#: server/commands.c:166
+#: server/commands.c:182
msgid ""
"'metaconnection ?' reports on the status of the connection to metaserver.\n"
"'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2366,33 +2373,33 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:172
+#: server/commands.c:189
msgid "metaserver <address>"
msgstr "metaserver <عنوان انترنت>"
-#: server/commands.c:173
+#: server/commands.c:190
msgid "Set address (URL) for metaserver to report to."
msgstr "اختيار عنوان موقع الانترنت لارسال التقارير له من metaserver."
#. TRANS: translate text between <> only
-#: server/commands.c:177
+#: server/commands.c:195
msgid "aitoggle <player-name>"
msgstr "aitoggle <اسم اللاعب>"
-#: server/commands.c:178
+#: server/commands.c:196
msgid "Toggle AI status of player."
msgstr "تÙعييل أو تعطيل Øالة الذّكاء الاصطناعيّ للاعب."
#. TRANS: translate text between [] and <> only
-#: server/commands.c:182
+#: server/commands.c:201
msgid "take [connection-name] <player-name>"
msgstr "take [connection-name] <اسم اللاعب>"
-#: server/commands.c:183
+#: server/commands.c:202
msgid "Take over a player's place in the game."
msgstr "الاستيلاء على مكان لاعب ÙÙŠ اللعبة."
-#: server/commands.c:184
+#: server/commands.c:203
#, fuzzy
msgid ""
"Only the console and connections with cmdlevel 'hack' can force other "
@@ -2403,15 +2410,15 @@ msgid ""
msgstr "Ùقط مع إذا<player-name> إذا."
#. TRANS: translate text between [] only
-#: server/commands.c:192
+#: server/commands.c:212
msgid "observe [connection-name] [player-name]"
msgstr "observe [اسم الاتصال] [اسم اللاعب]"
-#: server/commands.c:193
+#: server/commands.c:213
msgid "Observe a player or the whole game."
msgstr "مراقبة لاعب أو كل اللعية."
-#: server/commands.c:194
+#: server/commands.c:214
#, fuzzy
msgid ""
"Only the console and connections with cmdlevel 'hack' can force other "
@@ -2422,15 +2429,15 @@ msgid ""
msgstr "Ùقط مع إذا إذا."
#. TRANS: translate text between <> only
-#: server/commands.c:202
+#: server/commands.c:223
msgid "detach <connection-name>"
msgstr "detach <اسم الاتصال>"
-#: server/commands.c:203
+#: server/commands.c:224
msgid "detach from a player."
msgstr "الانÙصال عن لاعب."
-#: server/commands.c:204
+#: server/commands.c:225
#, fuzzy
msgid ""
"Only the console and connections with cmdlevel 'hack' can force other "
@@ -2438,20 +2445,20 @@ msgid ""
msgstr "Ùقط مع."
#. TRANS: translate text between <> only
-#: server/commands.c:209
+#: server/commands.c:231
msgid "create <player-name>"
msgstr "create <اسم اللاعب>"
-#: server/commands.c:210
+#: server/commands.c:232
msgid "Create an AI player with a given name."
msgstr "انشاء لاعب ذ.ا باسم معطى."
-#: server/commands.c:211
+#: server/commands.c:233
msgid ""
"The 'create' command is only available before the game has been started."
msgstr "يتوÙر الأمر 'create' Ùقط قبل بداية اللعبة."
-#: server/commands.c:215
+#: server/commands.c:238
msgid ""
"away\n"
"away"
@@ -2459,16 +2466,16 @@ msgstr ""
"away\n"
"away"
-#: server/commands.c:217
+#: server/commands.c:240
msgid "Set yourself in away mode. The AI will watch your back."
msgstr "وضع Ù†Ùسك ÙÙŠ نمط away. سيØمي الذكاء الاصطناعي ظهرك."
-#: server/commands.c:218
+#: server/commands.c:241
msgid "The AI will govern your nation but do minimal changes."
msgstr "سيØكم ال Ø°.ا أمتك ولكنه سيÙعل تغييرات بسيطة."
#. TRANS: translate text between <> only
-#: server/commands.c:222
+#: server/commands.c:246
msgid ""
"novice\n"
"novice <player-name>"
@@ -2476,11 +2483,11 @@ msgstr ""
"novice\n"
"novice <اسم اللاعب>"
-#: server/commands.c:224
+#: server/commands.c:248
msgid "Set one or all AI players to 'novice'."
msgstr "وضع لاعب أو كل لاعبي ذ.ا إلى مستوى 'مبتدئ'."
-#: server/commands.c:225
+#: server/commands.c:249
#, fuzzy
msgid ""
"With no arguments, sets all AI players to skill level 'novice', and sets the "
@@ -2489,7 +2496,7 @@ msgid ""
msgstr "مع ذكاء اصطناعي مبتدئ جديد ذكاء اصطناعي مبتدئ مع."
#. TRANS: translate text between <> only
-#: server/commands.c:231
+#: server/commands.c:256
msgid ""
"easy\n"
"easy <player-name>"
@@ -2497,11 +2504,11 @@ msgstr ""
"easy\n"
"easy <اسم اللاعب>"
-#: server/commands.c:233
+#: server/commands.c:258
msgid "Set one or all AI players to 'easy'."
msgstr "وضع لاعب أو كل لاعبي ذ.ا إلى مستوى 'سهل'."
-#: server/commands.c:234
+#: server/commands.c:259
#, fuzzy
msgid ""
"With no arguments, sets all AI players to skill level 'easy', and sets the "
@@ -2510,7 +2517,7 @@ msgid ""
msgstr "مع ذكاء اصطناعي سهل جديد ذكاء اصطناعي سهل مع."
#. TRANS: translate text between <> only
-#: server/commands.c:240
+#: server/commands.c:266
msgid ""
"normal\n"
"normal <player-name>"
@@ -2518,11 +2525,11 @@ msgstr ""
"normal\n"
"normal <اسم اللاعب>"
-#: server/commands.c:242
+#: server/commands.c:268
msgid "Set one or all AI players to 'normal'."
msgstr "وضع لاعب أو كل لاعبي ذ.ا إلى مستوى 'عادي'."
-#: server/commands.c:243
+#: server/commands.c:269
#, fuzzy
msgid ""
"With no arguments, sets all AI players to skill level 'normal', and sets the "
@@ -2531,7 +2538,7 @@ msgid ""
msgstr "مع ذكاء اصطناعي عادي جديد ذكاء اصطناعي عادي مع."
#. TRANS: translate text between <> only
-#: server/commands.c:249
+#: server/commands.c:276
msgid ""
"hard\n"
"hard <player-name>"
@@ -2539,11 +2546,11 @@ msgstr ""
"hard\n"
"hard <اسم اللاعب>"
-#: server/commands.c:251
+#: server/commands.c:278
msgid "Set one or all AI players to 'hard'."
msgstr "وضع لاعب أو كل لاعبي ذ.ا إلى مستوى 'صعب'."
-#: server/commands.c:252
+#: server/commands.c:279
#, fuzzy
msgid ""
"With no arguments, sets all AI players to skill level 'hard', and sets the "
@@ -2552,7 +2559,7 @@ msgid ""
msgstr "مع ذكاء اصطناعي صعب جديد ذكاء اصطناعي صعب مع."
#. TRANS: translate text between <> only
-#: server/commands.c:258
+#: server/commands.c:286
msgid ""
"experimental\n"
"experimental <player-name>"
@@ -2560,11 +2567,11 @@ msgstr ""
"experimental\n"
"experimental <اسم اللاعب>"
-#: server/commands.c:260
+#: server/commands.c:288
msgid "Set one or all AI players to 'experimental'."
msgstr "وضع لاعب أو كل لاعبي ذ.ا إلى مستوى 'تجريبي'."
-#: server/commands.c:261
+#: server/commands.c:289
#, fuzzy
msgid ""
"With no arguments, sets all AI players to skill 'experimental', and sets the "
@@ -2574,7 +2581,7 @@ msgid ""
msgstr "مع ذكاء اصطناعي تجريبي جديد ذكاء اصطناعي مع ذكاء اصطناعي لـ."
#. TRANS: translate text between <> only
-#: server/commands.c:269
+#: server/commands.c:298
msgid ""
"cmdlevel\n"
"cmdlevel <level>\n"
@@ -2588,18 +2595,20 @@ msgstr ""
"cmdlevel <المستوى> first\n"
"cmdlevel <المستوى> <اسم الاتصال>"
-#: server/commands.c:274
+#: server/commands.c:303
msgid "Query or set command access level access."
msgstr "الإستÙسار أو تØديد مستوى صلاØية الأوامر."
-#: server/commands.c:275
+#: server/commands.c:304
#, fuzzy
msgid ""
"The command access level controls which server commands are available\n"
"to users via the client chatline. The available levels are:\n"
" none - no commands\n"
-" info - informational commands only\n"
+" info - informational or observer commands only\n"
+" basic - commands available to players in the game\n"
" ctrl - commands that affect the game and users\n"
+" admin - commands that affect server operation\n"
" hack - *all* commands - dangerous!\n"
"With no arguments, the current command access levels are reported.\n"
"With a single argument, the level is set for all existing connections,\n"
@@ -2620,20 +2629,20 @@ msgstr ""
"\n"
" جديد مع الملاØظة."
-#: server/commands.c:296
+#: server/commands.c:328
msgid "If there is none, become the game organizer with increased permissions."
msgstr "إذا لم يكن هناك Ø£Øد ØŒ Ø³ØªØµØ¨Ø Ù…Ù†Ø¸Ù… اللعبة مع صلاØيات أكثر."
#. TRANS: translate text between <> only
-#: server/commands.c:301
+#: server/commands.c:334
msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
msgstr "timeoutincrease <الدور> <زيادة الدور> <القيمة> <مضاع٠القيمة>"
-#: server/commands.c:302
+#: server/commands.c:335
msgid "See \"help timeoutincrease\"."
msgstr "انظر \"help timeoutincrease\"."
-#: server/commands.c:303
+#: server/commands.c:336
#, fuzzy
msgid ""
"Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
@@ -2643,24 +2652,43 @@ msgstr ""
"كلّ<turn> أدوار<value><turninc><turn><value><valuemult> الإستعمال مع التقصيرات"
#. TRANS: translate text between <> only
-#: server/commands.c:309
+#: server/commands.c:343
+msgid ""
+"cancelvote\n"
+"cancelvote <vote number>\n"
+"cancelvote all\n"
+msgstr ""
+
+#: server/commands.c:346
+msgid "Cancel a running vote.\n"
+msgstr ""
+
+#: server/commands.c:347
+msgid ""
+"With no arguments this command removes your own vote. If you have an admin "
+"access level, you can cancel any vote by vote number, or all votes with the "
+"'all' argument."
+msgstr ""
+
+#. TRANS: translate text between <> only
+#: server/commands.c:354
msgid "endgame"
msgstr "endgame"
-#: server/commands.c:310
+#: server/commands.c:355
msgid "End the game immediately in a draw."
msgstr "الخروج من اللعبة Ùورا بتعادل."
#. TRANS: translate text between <> only
-#: server/commands.c:314
+#: server/commands.c:360
msgid "surrender"
msgstr "surrender"
-#: server/commands.c:315
+#: server/commands.c:361
msgid "Concede the game."
msgstr "خسارة اللعبة."
-#: server/commands.c:316
+#: server/commands.c:362
#, fuzzy
msgid ""
"This tells everyone else that you concede the game, and if all but one "
@@ -2668,15 +2696,15 @@ msgid ""
msgstr "هذا."
#. TRANS: translate text between <> only
-#: server/commands.c:322
+#: server/commands.c:369
msgid "remove <player-name>"
msgstr "remove <اسم اللاعب>"
-#: server/commands.c:323
+#: server/commands.c:370
msgid "Fully remove player from game."
msgstr "إزالة اللاعب من اللعبة بشكل كامل."
-#: server/commands.c:324
+#: server/commands.c:371
#, fuzzy
msgid ""
"This *completely* removes a player from the game, including all cities and "
@@ -2684,7 +2712,7 @@ msgid ""
msgstr "هذا الإستعمال مع!"
#. TRANS: translate text between <> only
-#: server/commands.c:329
+#: server/commands.c:377
msgid ""
"save\n"
"save <file-name>"
@@ -2692,11 +2720,11 @@ msgstr ""
"save\n"
"save <اسم الملÙ>"
-#: server/commands.c:331
+#: server/commands.c:379
msgid "Save game to file."
msgstr "ØÙظ اللعية على ملÙ."
-#: server/commands.c:332
+#: server/commands.c:380
#, fuzzy
msgid ""
"Save the current game to file <file-name>. If no file-name argument is "
@@ -2710,7 +2738,7 @@ msgstr ""
"<filename>."
#. TRANS: translate text between <> only
-#: server/commands.c:341
+#: server/commands.c:390
msgid ""
"load\n"
"load <file-name>"
@@ -2718,11 +2746,11 @@ msgstr ""
"load\n"
"load <اسم الملÙ>"
-#: server/commands.c:343
+#: server/commands.c:392
msgid "Load game from file."
msgstr "تØميل اللعبة من ملÙ."
-#: server/commands.c:344
+#: server/commands.c:393
msgid ""
"Load a game from <file-name>. Any current data including players, rulesets "
"and server options are lost.\n"
@@ -2731,120 +2759,120 @@ msgstr ""
"مجموعات القواعد وخيارات الخادم.\n"
#. TRANS: translate text between <> only
-#: server/commands.c:349
+#: server/commands.c:399
msgid "read <file-name>"
msgstr "read <اسم الملÙ>"
-#: server/commands.c:350
+#: server/commands.c:400
msgid "Process server commands from file."
msgstr "قراءة Ùˆ تنÙيد أوامر الخادم من ملÙ."
#. TRANS: translate text between <> only
-#: server/commands.c:354
+#: server/commands.c:405
msgid "write <file-name>"
msgstr "write <اسم الملÙ>"
-#: server/commands.c:355
+#: server/commands.c:406
msgid "Write current settings as server commands to file."
msgstr "كتابة الاعدادات الØالية كأوامر للخادم على ملÙ."
-#: server/commands.c:359
+#: server/commands.c:411
msgid "Switch server output between 'RFC-style' and normal style."
msgstr "تØويل مخرجات الخادم بين 'أسلوب RFC' والأسلوب العادي."
-#: server/commands.c:363
+#: server/commands.c:416
msgid "Simply returns the id of the server."
msgstr "ببساطة يعيد رقم تعري٠الخادم."
-#: server/connecthand.c:85
+#: server/connecthand.c:109
#, c-format
msgid "Welcome to the %s Server running at %s port %d."
msgstr "مرØبا بك على الخادم %s الذي يعمل على %s والمنÙØ° %d."
-#: server/connecthand.c:89
+#: server/connecthand.c:113
#, c-format
msgid "Welcome to the %s Server at port %d."
msgstr "مرØبا بك على الخادم %s الذي يعمل على المنÙØ° %d."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:97
+#: server/connecthand.c:121
#, fuzzy, c-format
msgid "(%d) %s: connected [%s]"
msgstr "(%d) تم اتصال %s من %s."
-#: server/connecthand.c:104
+#: server/connecthand.c:128
#, c-format
msgid "Server: %s has connected from %s."
msgstr "الخادم: تم اتصال %s من %s."
-#: server/connecthand.c:145
+#: server/connecthand.c:175
msgid "Couldn't attach your connection to new player."
msgstr "Ùشل Ùصل اتصالك بلاعب جديد."
-#: server/connecthand.c:165
+#: server/connecthand.c:199
#, c-format
msgid "You are logged in as '%s' connected to no player."
msgstr "أنت متصل ك '%s' وغير موصول إلى أي لاعب."
-#: server/connecthand.c:169
+#: server/connecthand.c:203
#, c-format
msgid "You are logged in as '%s' connected to an anonymous player."
msgstr "أنت متصل ك '%s' و موصول إلى لاعب مجهول الهوية."
-#: server/connecthand.c:174
+#: server/connecthand.c:208
#, c-format
msgid "You are logged in as '%s' connected to %s."
msgstr "أنت متصل ك '%s' و موصول إلى %s."
-#: server/connecthand.c:187
+#: server/connecthand.c:221
#, fuzzy, c-format
msgid "Turn-blocking game play: waiting on %s to finish turn..."
msgstr "الدور جاري الانتظار دوران."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:240
+#: server/connecthand.c:274
#, fuzzy, c-format
msgid "(%d) %s: connection request [%s]"
msgstr "(%d) طلب الاتصال من %s من %s"
-#: server/connecthand.c:266
+#: server/connecthand.c:300
#, fuzzy
msgid "The client is missing a capability that this server needs."
msgstr "ينقص العميل امكانية ÙŠØتاجها هذا الخادم."
-#: server/connecthand.c:268 server/connecthand.c:279
+#: server/connecthand.c:302 server/connecthand.c:313
#, fuzzy, c-format
msgid "(%d) %s rejected: mismatched capabilities!"
msgstr "(%d) تم رÙض %s: الامكانيات غير مطابقة."
-#: server/connecthand.c:277
+#: server/connecthand.c:311
#, fuzzy
msgid "This server is missing a capability that the client needs."
msgstr "ينقص الخادم امكانية ÙŠØتاجها العميل."
-#: server/connecthand.c:290
+#: server/connecthand.c:324
#, fuzzy
msgid "The username is invalid!"
msgstr "اسم المستخدم غير صØÙŠØ"
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:292
+#: server/connecthand.c:326
#, fuzzy, c-format
msgid "(%d) %s rejected: invalid username [%s]"
msgstr "(%d) تم رÙض%s: الاسم غير صØÙŠØ [%s]."
-#: server/connecthand.c:303
+#: server/connecthand.c:337
#, fuzzy
msgid "Your username is already connected!"
msgstr "أصلا متصل."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:305
+#: server/connecthand.c:339
#, fuzzy, c-format
msgid "(%d) %s rejected: duplicate username [%s]"
msgstr "(%d) تم رÙض %s: اسم المستخدم مكرر [%s]."
-#: server/connecthand.c:335 server/connecthand.c:344
+#: server/connecthand.c:369 server/connecthand.c:378
#, c-format
msgid "Lost connection: %s."
msgstr "تم Ùقد الاتصال: %s."
@@ -2861,36 +2889,36 @@ msgstr "مواÙÙ‚. تم تØديد الأسلوب المعياري."
msgid "For introductory help, type 'help'."
msgstr "لمساعدة مساعدة تمهيدية, اطبع 'help'."
-#: server/diplhand.c:164
+#: server/diplhand.c:167
#, c-format
msgid "The %s can't accept %s."
msgstr "لا يستطيع %s قبول %s."
-#: server/diplhand.c:176
+#: server/diplhand.c:179
#, c-format
msgid "You don't have tech %s, you can't accept treaty."
msgstr "ليس لديك تكنولوجيا %s ، لا يمكنك قبول المعاهدة."
-#: server/diplhand.c:185
+#: server/diplhand.c:188
msgid "City you are trying to give no longer exists, you can't accept treaty."
msgstr ""
"المدينة التي تØاول إعطائها غير موجودة بعد اﻵن ØŒ لا يمكنك قبول المعاهدة."
-#: server/diplhand.c:191
+#: server/diplhand.c:194
#, c-format
msgid "You are not owner of %s, you can't accept treaty."
msgstr "أنت لست مالك %s، لا تستطيع قبول المعاهدة."
-#: server/diplhand.c:197 server/diplhand.c:301
+#: server/diplhand.c:200 server/diplhand.c:304
#, c-format
msgid "Your capital (%s) is requested, you can't accept treaty."
msgstr "تم طلب عاصمتك (%s) ، لا يمكنك قبول المعاهدة."
-#: server/diplhand.c:224
+#: server/diplhand.c:227
msgid "You don't have enough gold, you can't accept treaty."
msgstr "ليس لديك ما يكÙÙŠ من الذهب، لذا لا يمكنك قبول المعاهدة."
-#: server/diplhand.c:256 server/diplhand.c:261
+#: server/diplhand.c:259 server/diplhand.c:264
#, c-format
msgid "A treaty containing %d clause was agreed upon."
msgid_plural "A treaty containing %d clauses was agreed upon."
@@ -2898,75 +2926,75 @@ msgstr[0] "تم الاتÙاق على معاهدة من %d بند."
msgstr[1] "تم الاتÙاق على معاهدة من %d بندان."
msgstr[2] "تم الاتÙاق على معاهدة من %d بنود."
-#: server/diplhand.c:277 server/diplhand.c:281
+#: server/diplhand.c:280 server/diplhand.c:284
#, fuzzy, c-format
msgid "One of the cities the %s are giving away is destroyed! Treaty canceled!"
msgstr "لقد دمرت اØدى المدن التي اعطاها لنا %s ! تم الغاء المعاهدة!"
-#: server/diplhand.c:288 server/diplhand.c:293
+#: server/diplhand.c:291 server/diplhand.c:296
#, c-format
msgid "The %s no longer control %s! Treaty canceled!"
msgstr "لا يسيطر %s على %s بعد اﻵن! تم الغاء المعاهدة!"
-#: server/diplhand.c:331 server/diplhand.c:335
+#: server/diplhand.c:334 server/diplhand.c:338
#, c-format
msgid "The %s don't have the promised amount of gold! Treaty canceled!"
msgstr "ليس لدى %s الكمية الموعودة من الذهب! تم الغاء المعاهدة!"
-#: server/diplhand.c:364
+#: server/diplhand.c:367
#, c-format
msgid "You gave an embassy to %s."
msgstr "لقد اعطيت سÙارة Ù„ %s."
-#: server/diplhand.c:367
+#: server/diplhand.c:370
#, c-format
msgid "%s allowed you to create an embassy!"
msgstr "Ø³Ù…Ø %s لك ببناء سÙارة!"
-#: server/diplhand.c:383
+#: server/diplhand.c:386
#, c-format
msgid "You are taught the knowledge of %s."
msgstr "لقد عÙلّمت معرÙØ© ال %s."
-#: server/diplhand.c:387
+#: server/diplhand.c:390
#, c-format
msgid "The %s have acquired %s from the %s."
msgstr "استØوذ %s على %s من %s."
-#: server/diplhand.c:402
+#: server/diplhand.c:405
#, c-format
msgid "You get %d gold."
msgstr "لقد Øصلت على %d ذهب."
#. TRANS: ... Polish worldmap.
-#: server/diplhand.c:410
+#: server/diplhand.c:413
#, fuzzy, c-format
msgid "You receive the %s worldmap."
msgstr "لقد Øصلت على خريطة العالم الخاصة ب %s."
#. TRANS: ... Polish seamap.
-#: server/diplhand.c:419
+#: server/diplhand.c:422
#, fuzzy, c-format
msgid "You receive the %s seamap."
msgstr "لقد Øصلت على الخريطة البØرية الخاصة ب %s."
-#: server/diplhand.c:436
+#: server/diplhand.c:439
#, c-format
msgid "You receive city of %s from %s."
msgstr "لقد Øصلت علة مدينة ال %s من %s."
-#: server/diplhand.c:441
+#: server/diplhand.c:444
#, c-format
msgid "You give city of %s to %s."
msgstr "لقد أعطيت مدينة ال %s إلى %s."
-#: server/diplhand.c:454 server/diplhand.c:457
+#: server/diplhand.c:457 server/diplhand.c:460
#, c-format
msgid "You agree on a cease-fire with %s."
msgstr "لقد واÙقت على وق٠اطلاق نار مع %s."
#. TRANS: ... the Poles ... Polish territory.
-#: server/diplhand.c:476 server/diplhand.c:488
+#: server/diplhand.c:479 server/diplhand.c:491
#, fuzzy, c-format
msgid ""
"You agree on an armistice with the %s. In %d turn, it will become a peace "
@@ -2984,32 +3012,32 @@ msgstr[2] ""
"لقد واÙقت على هدنة مع %s. ستتØول الهدنة ÙÙŠ خلال %d أدوار إلى معاهدة سلام. قم "
"بتØريك ÙˆØداتك خارج أراضي %s."
-#: server/diplhand.c:512 server/diplhand.c:515
+#: server/diplhand.c:515 server/diplhand.c:518
#, c-format
msgid "You agree on an alliance with %s."
msgstr "لقد واÙقت على تØال٠مع %s."
-#: server/diplhand.c:524
+#: server/diplhand.c:527
#, c-format
msgid "You give shared vision to %s."
msgstr "لقد اعطيت رؤية مشتركة ل %s."
-#: server/diplhand.c:527
+#: server/diplhand.c:530
#, c-format
msgid "%s gives you shared vision."
msgstr "اعطى %s رؤية مشتركة لك."
-#: server/diplhand.c:663
+#: server/diplhand.c:666
#, c-format
msgid "%s canceled the meeting!"
msgstr "ألغى %s الاجتماع!"
-#: server/diplhand.c:670
+#: server/diplhand.c:673
#, c-format
msgid "Meeting with %s canceled."
msgstr "تم الغاء الاجتماع مع %s."
-#: server/diplhand.c:712
+#: server/diplhand.c:715
msgid "Your diplomatic envoy was decapitated!"
msgstr "تم قطع رأس سÙيرك الدبلوماسي!"
@@ -3192,80 +3220,80 @@ msgid "The %s destroyed the %s in %s."
msgstr "دمر %s ال %s ÙÙŠ %s."
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1091
+#: server/diplomats.c:1097
#, fuzzy, c-format
msgid "An enemy %s has been eliminated by your %s."
msgstr "تم تدمير ÙˆØدة العدو %s عند الدÙاع عن %s."
#. TRANS: <unit> ... <city> ... <diplomat>
-#: server/diplomats.c:1098
+#: server/diplomats.c:1104
#, c-format
msgid "Your %s has been eliminated defending %s against a %s."
msgstr "تم تدمير ÙˆØدتك %s عند الدÙاع عن %s ضد %s."
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1106
+#: server/diplomats.c:1112
#, fuzzy, c-format
msgid "Your %s has been eliminated defending against a %s."
msgstr "تم تدمير ÙˆØدتك %s عند الدÙاع عن ضد %s."
-#: server/diplomats.c:1119
+#: server/diplomats.c:1125
#, c-format
msgid "Your %s was eliminated by a defending %s."
msgstr "تم تدمير ÙˆØدتك %s عند الدÙاع عن %s."
-#: server/diplomats.c:1127
+#: server/diplomats.c:1133
#, c-format
msgid "Eliminated %s %s while infiltrating %s."
msgstr "تم تدمير ÙˆØدة %s %s عند Ù…Øاولة اختراق %s."
-#: server/diplomats.c:1134
+#: server/diplomats.c:1140
#, c-format
msgid "Eliminated %s %s while infiltrating our troops."
msgstr "تم تدمير ÙˆØدة %s %s عند Ù…Øاولة اختراق قواتنا."
-#: server/diplomats.c:1185
+#: server/diplomats.c:1191
#, fuzzy, c-format
msgid ""
"Your %s has successfully completed the mission and returned unharmed to %s."
msgstr "أتمت ÙˆØدتك %s مهمتها Ø¨Ù†Ø¬Ø§Ø ÙˆØ±Ø¬Ø¹Øª سالمة إلى %s."
-#: server/diplomats.c:1204
+#: server/diplomats.c:1210
#, fuzzy, c-format
msgid "Your %s was captured after completing the mission in %s."
msgstr "تم القبض على ÙˆØدتك %s بعد اتمام مهمتها ÙÙŠ %s."
-#: server/diplomats.c:1210
+#: server/diplomats.c:1216
#, fuzzy, c-format
msgid "Your %s was captured after completing the mission."
msgstr "تم القبض على ÙˆØدتك %s بعد اتمام مهمتها."
-#: server/diplomats.c:1242
+#: server/diplomats.c:1248
#, fuzzy, c-format
msgid "You have caused an incident while bribing the %s %s."
msgstr "لقد سببت Øادثا عند رشوة ÙˆØدة %s%s."
-#: server/diplomats.c:1247
+#: server/diplomats.c:1253
#, c-format
msgid "%s has caused an incident while bribing your %s."
msgstr "لقد سبب %s Øادثا عند رشوة ÙˆØدتك %s."
-#: server/diplomats.c:1254
+#: server/diplomats.c:1260
#, c-format
msgid "You have caused an incident while attempting to steal tech from %s."
msgstr "لقد سببت Øادثا عند Ù…Øاولة سرقة تكنولوجيا من %s."
-#: server/diplomats.c:1258
+#: server/diplomats.c:1264
#, c-format
msgid "%s has caused an incident while attempting to steal tech from you."
msgstr "لقد سبب %s Øادثا عند Ù…Øاولة سرقة تكنولوجيا منك."
-#: server/diplomats.c:1264
+#: server/diplomats.c:1270
#, c-format
msgid "You have caused an incident while inciting a revolt in %s."
msgstr "لقد سببت Øادثا عند Ù…Øاولة التØريض على ثورة ÙÙŠ %s."
-#: server/diplomats.c:1268
+#: server/diplomats.c:1274
#, c-format
msgid "%s have caused an incident while inciting a revolt in %s."
msgstr "لقد سبب %s Øادثا عند Ù…Øاولة التØريض على ثورة ÙÙŠ %s."
@@ -3377,12 +3405,12 @@ msgstr ""
"ÙŠÙØ±Ø Ø§Ù„Ù†Ø§Ø³ عند سماع معرÙØ© علمائك عن سكك الØديد.\n"
" يجتمع العمال بعÙوية ويطورون كل مدنك إلى سكك الØديد."
-#: server/maphand.c:1418
+#: server/maphand.c:1425
#, c-format
msgid "Moved your %s due to changing terrain."
msgstr "تم تØريك ÙˆØدتك %s لتغير التضاريص."
-#: server/maphand.c:1436
+#: server/maphand.c:1443
#, c-format
msgid "Disbanded your %s due to changing terrain."
msgstr "تم ØªØ³Ø±ÙŠØ ÙˆØدتك %s لتغير التضاريص."
@@ -3391,7 +3419,7 @@ msgstr "تم ØªØ³Ø±ÙŠØ ÙˆØدتك %s لتغير التضاريص."
msgid "Not reporting to the metaserver in this game."
msgstr "بدون اصدار أي تقارير Ù„ metaserver ÙÙŠ هذه اللعبة."
-#: server/meta.c:430
+#: server/meta.c:432
#, c-format
msgid "Metaserver: bad address: [%s:%d]."
msgstr "Metaserver: عنوان خاطئ: [%s:%d]."
@@ -3515,54 +3543,54 @@ msgid ""
"with %s."
msgstr "أعلن زميلك ÙÙŠ الÙريق %s الØرب على %s. أنت مجبر أن تلغي تØالÙÙƒ مع %s."
-#: server/plrhand.c:1103
+#: server/plrhand.c:1115
#, c-format
msgid "Removing player %s."
msgstr "إزالة اللاعب %s."
-#: server/plrhand.c:1105
+#: server/plrhand.c:1117
msgid "You've been removed from the game!"
msgstr "لقد تم إزالتك من اللعبة!"
-#: server/plrhand.c:1108
+#: server/plrhand.c:1120
#, c-format
msgid "%s has been removed from the game."
msgstr "لقد تم إزالة %s من اللعبة."
-#: server/plrhand.c:1153 server/plrhand.c:1158
+#: server/plrhand.c:1167 server/plrhand.c:1172
#, c-format
msgid "You have made contact with the %s, ruled by %s."
msgstr "لقد اتصلت لأول مرة مع %s, المØكوم من %s."
-#: server/plrhand.c:1178
+#: server/plrhand.c:1192
#, 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:1656
+#: server/plrhand.c:1670
#, c-format
msgid "Could not throw %s into civil war - too many players"
msgstr "لا يمكن اشعال الØرب الأهلية ÙÙŠ %s - لوجود لاعبيين كثر"
-#: server/plrhand.c:1663
+#: server/plrhand.c:1677
#, fuzzy, c-format
msgid "Could not throw %s into civil war - no available nations"
msgstr "لا يمكن اشعال الØرب الأهلية ÙÙŠ %s - لوجود لاعبيين كثر"
-#: server/plrhand.c:1686
+#: server/plrhand.c:1700
#, fuzzy, c-format
msgid ""
"Your nation is thrust into civil war! %s is declared the leader of the rebel "
"states."
msgstr "أمتك ÙÙŠ Øرب أهلية تØت قيادة %s للولايات الثائرة."
-#: server/plrhand.c:1707
+#: server/plrhand.c:1721
#, c-format
msgid "%s declares allegiance to %s."
msgstr "يعلن %s الولاء إلى %s."
-#: server/plrhand.c:1722
+#: server/plrhand.c:1736
#, fuzzy, c-format
msgid ""
"Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3755,69 +3783,69 @@ msgstr "(جاري بناء %s ÙÙŠ %s (%s))\n"
msgid "Wonders of the World"
msgstr "عجائب الدنيا"
-#: server/report.c:547
+#: server/report.c:552
msgid " sq. mi."
msgstr "ميل مربع."
-#: server/report.c:557
+#: server/report.c:562
msgid " M tons"
msgstr "مليون طن"
-#: server/report.c:562
+#: server/report.c:567
msgid " M goods"
msgstr "مليون بضاعة"
-#: server/report.c:567
+#: server/report.c:572
msgid " bulbs"
msgstr " شمعات"
-#: server/report.c:572
+#: server/report.c:577
msgid " month"
msgid_plural " months"
msgstr[0] "شهر"
msgstr[1] "شهران"
msgstr[2] "أشهر"
-#: server/report.c:577
+#: server/report.c:582
msgid " ton"
msgid_plural " tons"
msgstr[0] "طن"
msgstr[1] "طنان"
msgstr[2] "أطنان"
-#: server/report.c:591
+#: server/report.c:596
msgid "st"
msgstr " "
-#: server/report.c:593
+#: server/report.c:598
msgid "nd"
msgstr " "
-#: server/report.c:595
+#: server/report.c:600
msgid "rd"
msgstr " "
-#: server/report.c:597
+#: server/report.c:602
msgid "th"
msgstr " "
-#: server/report.c:700
+#: server/report.c:705
msgid "Demography string contains invalid characters. Try \"help demography\"."
msgstr ""
"تØتوي السلسلة الØرÙية للديمغراÙيا على Ø£Øر٠غير صØÙŠØØ©. جرّب \"help demography"
"\"."
-#: server/report.c:743 server/report.c:768
+#: server/report.c:748 server/report.c:773
msgid "Demographics Report:"
msgstr "تقرير الديمغراÙية:"
-#: server/report.c:744
+#: server/report.c:749
msgid "Sorry, the Demographics report is unavailable."
msgstr "آسÙØŒ تقرير الديمغراÙية غير متوÙر."
#. TRANS: <nation adjective> <government name> (<year>).
#. * E.g. "Polish Despotism (200 AD)".
-#: server/report.c:750
+#: server/report.c:755
#, fuzzy, c-format
msgid "%s %s (%s)"
msgstr "%s ÙÙŠ %s (%s)\n"
@@ -3828,11 +3856,11 @@ msgstr "%s ÙÙŠ %s (%s)\n"
msgid "Could not find a readable \"%s.%s\" ruleset file."
msgstr "Ùشل العثور على مل٠مجموعة القواعد قابل للقراءة \"%s.%s\"."
-#: server/ruleset.c:2356
+#: server/ruleset.c:2366
msgid "No barbarian nation in rulesets, at least one required!"
msgstr ""
-#: server/ruleset.c:3166
+#: server/ruleset.c:3178
msgid "Loading rulesets"
msgstr "جاري تØميل مجموعات القواعد"
@@ -3847,13 +3875,13 @@ msgstr ""
"ÙŠØتوي المل٠المØÙوظ على بيانات خريطة غير كاملة. يمكن أن ÙŠØدث هذا مع اللعب "
"المØÙوظة القديمة، أو يمكن أن يعني ملÙا Ù…ØÙوظا خاطئ. استمر على مسئوليتك."
-#: server/savegame.c:3588
+#: server/savegame.c:3587
#, fuzzy
msgid "Saved game is too old, at least version 1.9.0 required."
msgstr "مل٠اللعبة المØÙوظة قديم جدا، يشترط على الأقل 1.9.0."
#. TRANS: Fatal error message.
-#: server/savegame.c:3815
+#: server/savegame.c:3817
#, fuzzy
msgid ""
"Saved game uses the \"classic\" terrain ruleset, and is no longer supported."
@@ -3861,7 +3889,7 @@ msgstr ""
"تستخدم اللعبة المØÙوظة مجموعة قواعد التضاريص الكلاسيكية وهذا غير مدعوم بعد "
"اﻵن."
-#: server/savegame.c:3824
+#: server/savegame.c:3826
#, c-format
msgid ""
"Warning: Different rulesetdirs ('%s' and '%s') are no longer supported. "
@@ -3871,7 +3899,7 @@ msgstr ""
"استعمال '%s'."
#. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4051
+#: server/savegame.c:4055
#, c-format
msgid "%s had invalid nation; changing to %s."
msgstr ""
@@ -3904,7 +3932,7 @@ msgstr "داخلي"
msgid "Networking"
msgstr "شبكي"
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:734
#: client/gui-win32/dialogs.c:532
msgid "All"
msgstr "الكل"
@@ -4995,11 +5023,11 @@ msgid ""
"the game."
msgstr "إذا دوران هذه."
-#: server/sernet.c:150
+#: server/sernet.c:151
msgid "Server cannot read standard input. Ignoring input."
msgstr "Ùشل قراءة الخادم للادخال القياسي.جاري إهمال الادخال."
-#: server/sernet.c:929
+#: server/sernet.c:933
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr "الخادم: العنوان سيء: [%s:%d]."
@@ -5072,620 +5100,605 @@ msgstr "تØتوي سÙينتك الÙضائية على أعلى عدد من Ùˆ
msgid "Without guidance from the capital, the %s spaceship is lost!"
msgstr "بدون توجيه من العاصمة، ستÙقد سÙينة %s الÙضائية!"
-#: server/srv_main.c:240
+#: server/srv_main.c:242
msgid "Game ended in a draw as end year exceeded"
msgstr "تم انهاء اللعبة بتعادل عندما تجاوزت نهاية المدة"
-#: server/srv_main.c:274
+#: server/srv_main.c:276
#, c-format
msgid "The %s spaceship has arrived at Alpha Centauri."
msgstr "وصلت سÙينة الÙضاء الخاصة ب %s إلى ألÙا سنتوري."
-#: server/srv_main.c:287 server/srv_main.c:322
+#: server/srv_main.c:289 server/srv_main.c:324
#, c-format
msgid "Team victory to %s"
msgstr "Ùوز الÙريق Ù„ %s"
-#: server/srv_main.c:297 server/srv_main.c:338
+#: server/srv_main.c:299 server/srv_main.c:340
#, c-format
msgid "Game ended in victory for %s"
msgstr "تم انهاء اللعبة بÙوز %s"
-#: server/srv_main.c:345
+#: server/srv_main.c:347
msgid "Game ended in a draw"
msgstr "تم انهاء اللعبة بتعادل"
-#: server/srv_main.c:461 server/srv_main.c:472
+#: server/srv_main.c:465 server/srv_main.c:476
#, fuzzy, c-format
msgid "Your %s was disbanded in accordance with your peace treaty with the %s."
msgstr "ملكك ÙˆØدات مع مع."
-#: server/srv_main.c:512 server/srv_main.c:516
+#: server/srv_main.c:516 server/srv_main.c:520
#, c-format
msgid ""
"Concerned citizens point out that the cease-fire with %s will run out soon."
msgstr "ÙŠÙˆØ¶Ø Ø§Ù„Ù…ÙˆØ§Ø·Ù†ÙˆÙ† القلقون أن وق٠اطلاق النار مع %s سينتهي قريبا."
-#: server/srv_main.c:521 server/srv_main.c:525
+#: server/srv_main.c:525 server/srv_main.c:529
#, c-format
msgid "The cease-fire with %s has run out. You are now at war with the %s."
msgstr "انتهى وق٠إطلاق النار مع %s. أنت اﻵن ÙÙŠ Øرب مع %s."
-#: server/srv_main.c:542
+#: server/srv_main.c:546
#, fuzzy, c-format
msgid ""
"Ceasefire between %s and %s has run out. They are at war. You cancel your "
"alliance with both."
msgstr "أعلن زميلك ÙÙŠ الÙريق %s الØرب على %s. أنت مجبر أن تلغي تØالÙÙƒ مع %s."
-#: server/srv_main.c:961
+#: server/srv_main.c:997
#, c-format
msgid "Failed saving game as %s"
msgstr "Ùشل ØÙظ اللعبة Ùƒ %s"
-#: server/srv_main.c:963
+#: server/srv_main.c:999
#, c-format
msgid "Game saved as %s"
msgstr "تم ØÙظ اللعبة Ùƒ %s"
-#: server/srv_main.c:994
+#: server/srv_main.c:1030
msgid "The game is already running."
msgstr "اللعبة أصلا شغالة."
-#: server/srv_main.c:1002
+#: server/srv_main.c:1038
#, c-format
msgid "%s lost control cmdlevel on game start. Use voting from now on."
msgstr "Ùقد %s سيطرة cmdlevel عند بداية اللعبة. استخدم التصويت من اﻵن Ùصاعدا."
-#: server/srv_main.c:1009
+#: server/srv_main.c:1045
msgid "Starting game."
msgstr "جاري بدء اللعبة."
-#: server/srv_main.c:1071
+#: server/srv_main.c:1112
#, c-format
msgid "request for unknown report (type %d)"
msgstr "طلب لتقرير مجهول (نوع %d)"
-#: server/srv_main.c:1136
+#: server/srv_main.c:1177
#, c-format
msgid "Warning: rejecting old client %s"
msgstr "تØذير: جاري رÙض عميل قديم %s"
-#: server/srv_main.c:1238
+#: server/srv_main.c:1279
#, c-format
msgid "Got a packet of type %d from a dead or observer player"
msgstr "Øصلت على Øزمة من النوع %d من لاعب ميت أو مراقب"
-#: server/srv_main.c:1338
+#: server/srv_main.c:1381
msgid "Please choose a non-blank name."
msgstr "الرجاء إختيار اسم بدون Ùراغات."
-#: server/srv_main.c:1354
+#: server/srv_main.c:1397
msgid "That nation is already in use."
msgstr "هذه الأمة أصلا مستعملة."
-#: server/srv_main.c:1370
+#: server/srv_main.c:1413
#, c-format
msgid "Another player already has the name '%s'. Please choose another name."
msgstr "عند لاعب آخر أصلا هذا الاسم '%s'. الرجاء اختيار اسم آخر."
-#: server/srv_main.c:1391
+#: server/srv_main.c:1434
msgid "Please choose a name containing only ASCII characters."
msgstr "الرجاء اختيار اسم ÙŠØتوي على Ø£Øر٠ASCII Ùقط."
-#: server/srv_main.c:1490
+#: server/srv_main.c:1533
#, c-format
msgid "%s nation is not available in this scenario."
msgstr "الأمة %s غير متوÙرة ÙÙŠ هذا السيناريو."
-#: server/srv_main.c:1496
+#: server/srv_main.c:1539
#, c-format
msgid "%s nation is already in use."
msgstr "الأمة %s أصلا مستعملة."
-#: server/srv_main.c:1514
+#: server/srv_main.c:1557
#, c-format
msgid "%s is the %s ruler %s."
msgstr "%s Øاكم %s على %s."
-#: server/srv_main.c:1570
+#: server/srv_main.c:1613
#, c-format
msgid "Waiting to start game: %d out of %d players are ready to start."
msgstr "جاري الانتظار لبدء اللعبة، %d من %d لاعب جاهز لبدء اللعب."
-#: server/srv_main.c:1614 server/srv_main.c:1618
+#: server/srv_main.c:1657 server/srv_main.c:1661
#, c-format
msgid "%s has been added as %s level AI-controlled player."
msgstr "تم إضاÙØ© %s كلاعب ذكاء اصتناعي من مستوى %s."
-#: server/srv_main.c:1760
+#: server/srv_main.c:1803
#, c-format
msgid "Player %d"
msgstr "اللاعب %d"
-#: server/srv_main.c:1771 server/srv_main.c:1777
+#: server/srv_main.c:1814 server/srv_main.c:1820
#, c-format
msgid "%s rules the %s."
msgstr "%s ÙŠØكم %s."
-#: server/srv_main.c:1942
+#: server/srv_main.c:1985
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
msgstr ""
-#: server/srv_main.c:1993
+#: server/srv_main.c:2037
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr "جاري إرسال المعلومات إلى metaserver [%s]"
-#: server/srv_main.c:2024
+#: server/srv_main.c:2069
msgid "The game is over..."
msgstr "انتهت اللعبة..."
-#: server/srv_main.c:2237
+#: server/srv_main.c:2286
msgid "Now accepting new client connections."
msgstr "جاري اﻵن استقبال اتصالات عملاء جدد."
-#: server/stdinhand.c:246
-#, c-format
-msgid "Vote \"%s\" is passed %d to %d with %d abstentions."
-msgstr "Ù†Ø¬Ø Ø§Ù„ØªØµÙˆÙŠØª \"%s\" ب %d إلى %d ØŒ مع %d ممتنع."
-
-#: server/stdinhand.c:253
-#, c-format
-msgid "Vote \"%s\" failed with %d against, %d for and %d abstentions."
-msgstr "Ùشل التصويت \"%s\" ب %d ضد, %d مع ØŒ Ùˆ %d ممتنع."
-
#. TRANS: ambiguous command
-#: server/stdinhand.c:365
+#: server/stdinhand.c:284
msgid "(ambiguous)"
msgstr "(مبهم)"
#. TRANS: unrecognized command
#. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:416
+#: server/stdinhand.c:287 client/citydlg_common.c:419
#: 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 "(مجهول)"
-#: server/stdinhand.c:458
+#: server/stdinhand.c:377
msgid "Name is empty, so cannot be a player."
msgstr "الاسم Ùارغ، لذا لا يمكن أن يكون لاعب."
-#: server/stdinhand.c:462
+#: server/stdinhand.c:381
msgid "Name is too long, so cannot be a player."
msgstr "الاسم طويل جدا، لذا لا يمكن أن يكون لاعب."
-#: server/stdinhand.c:466
+#: server/stdinhand.c:385
#, c-format
msgid "Player name prefix '%s' is ambiguous."
msgstr "بادئة اسم اللاعب '%s' مبهمة."
-#: server/stdinhand.c:470
+#: server/stdinhand.c:389
#, c-format
msgid "No player by the name of '%s'."
msgstr "لا وجود للاعب بهذا الاسم '%s'."
-#: server/stdinhand.c:474 server/stdinhand.c:509
+#: server/stdinhand.c:393 server/stdinhand.c:428
#, c-format
msgid "Unexpected match_result %d (%s) for '%s'."
msgstr "نتيجة Ù…Ùطابقة غير متوقعة %d (%s) Ù„ '%s'."
-#: server/stdinhand.c:493
+#: server/stdinhand.c:412
msgid "Name is empty, so cannot be a connection."
msgstr "الاسم Ùارغ، لذا لا يمكن أن يكون اتصال."
-#: server/stdinhand.c:497
+#: server/stdinhand.c:416
msgid "Name is too long, so cannot be a connection."
msgstr "الاسم طويل جدا، لذا لا يمكن أن يكون اتصال."
-#: server/stdinhand.c:501
+#: server/stdinhand.c:420
#, c-format
msgid "Connection name prefix '%s' is ambiguous."
msgstr "بادئة اسم الاتصال '%s' مبهمة."
-#: server/stdinhand.c:505
+#: server/stdinhand.c:424
#, c-format
msgid "No connection by the name of '%s'."
msgstr "لا يوجد اتصال بالاسم '%s'."
-#: server/stdinhand.c:525
+#: server/stdinhand.c:444
#, c-format
msgid "Open metaserver connection to [%s]."
msgstr "انصال metaserver Ù…ÙØªÙˆØ Ø¥Ù„Ù‰ [%s]."
-#: server/stdinhand.c:538
+#: server/stdinhand.c:457
#, c-format
msgid "Close metaserver connection to [%s]."
msgstr "انصال metaserver مغلق إلى [%s]."
-#: server/stdinhand.c:553
+#: server/stdinhand.c:472
msgid "Metaserver connection is open."
msgstr "انصال metaserver Ù…ÙتوØ."
-#: server/stdinhand.c:556
+#: server/stdinhand.c:475
msgid "Metaserver connection is closed."
msgstr "انصال metaserver مغلق."
-#: server/stdinhand.c:566
+#: server/stdinhand.c:485
msgid "Metaserver connection is already open."
msgstr "انصال metaserver أصلا Ù…ÙتوØ."
-#: server/stdinhand.c:577
+#: server/stdinhand.c:496
msgid "Metaserver connection is already closed."
msgstr "انصال metaserver أصلا مغلق."
-#: server/stdinhand.c:582
+#: server/stdinhand.c:501
msgid "Argument must be 'u', 'up', 'd', 'down', or '?'."
msgstr "يجب أن يكون الباراميتر 'u', 'up', 'd', 'down', أو '?'."
-#: server/stdinhand.c:603
+#: server/stdinhand.c:522
#, fuzzy, c-format
msgid "Metaserver patches string set to '%s'."
msgstr "Metaserver."
-#: server/stdinhand.c:606
+#: server/stdinhand.c:525
#, fuzzy, c-format
msgid "Metaserver patches string set to '%s', not reporting to metaserver."
msgstr "Metaserver."
-#: server/stdinhand.c:627
+#: server/stdinhand.c:546
#, c-format
msgid "Metaserver message string set to '%s'."
msgstr "Øددت السلسلة Ù„ØرÙية لرسالة Metaserver ب '%s'."
-#: server/stdinhand.c:630
+#: server/stdinhand.c:549
#, fuzzy, c-format
msgid "Metaserver message string set to '%s', not reporting to metaserver."
msgstr "Metaserver."
-#: server/stdinhand.c:650
+#: server/stdinhand.c:569
#, c-format
msgid "Metaserver is now [%s]."
msgstr "الآن Metaserver هو [%s]."
-#: server/stdinhand.c:660
+#: server/stdinhand.c:579
#, c-format
msgid "Server id: %s"
msgstr "رقم تعري٠الخادم: %s"
-#: server/stdinhand.c:757
+#: server/stdinhand.c:676
msgid "You cannot save games manually on this server."
msgstr "لا تستطيع ØÙظ اللعب يدويا على هذا الخادم."
-#: server/stdinhand.c:774
+#: server/stdinhand.c:693
msgid "Cannot toggle a barbarian player."
msgstr "لا يمكن تÙعيل أو تعطيل لاعب بربري."
-#: server/stdinhand.c:781
+#: server/stdinhand.c:700
#, c-format
msgid "%s is now under AI control."
msgstr "ال %s هو تØت سيطرة Ø°.ا."
-#: server/stdinhand.c:802
+#: server/stdinhand.c:721
#, c-format
msgid "%s is now under human control."
msgstr "ال %s هو تØت السيطرة البشرية."
-#: server/stdinhand.c:847
+#: server/stdinhand.c:766
msgid "Can't add AI players once the game has begun."
msgstr "لا يمكن اضاÙØ© لاعبي Ø°.ا متى بدأت اللعبة."
-#: server/stdinhand.c:867
+#: server/stdinhand.c:786
msgid "Can't add more players, server is full."
msgstr "لا يمكن إضاÙØ© لاعبيين جدد، الخادم مشغول."
-#: server/stdinhand.c:874
+#: server/stdinhand.c:793
msgid "Can't use an empty name."
msgstr "لا يمكن استعمال اسم Ùارغ."
-#: server/stdinhand.c:881
+#: server/stdinhand.c:800
#, c-format
msgid "That name exceeds the maximum of %d chars."
msgstr "يزيد ذلك الاسم على الØد الأعلى من عدد الأØر٠%d."
-#: server/stdinhand.c:887
+#: server/stdinhand.c:806
msgid "That name is not allowed."
msgstr "ذلك الاسم غير مسموØ."
-#: server/stdinhand.c:893
+#: server/stdinhand.c:812
msgid "A player already exists by that name."
msgstr "هناك لاعب موجود أصلا بهذا الاسم."
-#: server/stdinhand.c:899
+#: server/stdinhand.c:818
msgid "A user already exists by that name."
msgstr "هناك مستخدم موجود أصلا بهذا الاسم."
-#: server/stdinhand.c:925
+#: server/stdinhand.c:844
#, c-format
msgid "%s has been added as an AI-controlled player."
msgstr "تم إضاÙØ© %s كلاعب مسيطر من ال Ø°.ا."
-#: server/stdinhand.c:932
+#: server/stdinhand.c:851
#, c-format
msgid "Error creating new AI player: %s."
msgstr "خطأ انشاء لاعب ذ.ا جديد: %s."
-#: server/stdinhand.c:966
+#: server/stdinhand.c:885
msgid "Players cannot be removed once the game has started."
msgstr "لا يمكن إزالة اللاعبيين متى بدأت اللعبة."
-#: server/stdinhand.c:977
+#: server/stdinhand.c:896
#, c-format
msgid "Removed player %s from the game."
msgstr "إزالة اللاعب %s من اللعبة."
-#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
+#: server/stdinhand.c:935 server/stdinhand.c:3372 server/stdinhand.c:3507
#, c-format
msgid "Name \"%s\" disallowed for security reasons."
msgstr "الاسم \"%s\" ممنوع لأسباب أمنية."
-#: server/stdinhand.c:1029
+#: server/stdinhand.c:948
#, c-format
msgid "No command script found by the name \"%s\"."
msgstr "لا يوجد سكربت أوامر بهذا الاسم \"%s\"."
-#: server/stdinhand.c:1037
+#: server/stdinhand.c:956
#, c-format
msgid "Loading script file: %s"
msgstr "جاري تØميل مل٠السكربت: %s"
-#: server/stdinhand.c:1052
+#: server/stdinhand.c:971
#, c-format
msgid "Cannot read command line scriptfile '%s'."
msgstr "لا يمكن قراءة مل٠السكربت لسطر الأوامر '%s'."
-#: server/stdinhand.c:1054
+#: server/stdinhand.c:973
#, c-format
msgid "Could not read script file '%s'."
msgstr "لا يمكن قراءة مل٠السكربت '%s'."
-#: server/stdinhand.c:1146
+#: server/stdinhand.c:1065
#, c-format
msgid "Could not write script file '%s'."
msgstr "لا يمكن كتابة مل٠السكربت '%s'."
-#: server/stdinhand.c:1158
+#: server/stdinhand.c:1077
msgid "You cannot use the write command on this server for security reasons."
msgstr "أنت لا تستطيع استخدام أمر الكتابة على هذا الخادم لأسباب أمنية."
-#: server/stdinhand.c:1186
+#: server/stdinhand.c:1105
#, c-format
msgid ""
"Cannot decrease command access level '%s' for connection '%s'; you only have "
"'%s'."
msgstr "Ùشل تخÙيض مستوى صلاØيات الأوامر '%s' للاتصال '%s'; لديك Ùقط '%s'."
-#: server/stdinhand.c:1241
+#: server/stdinhand.c:1114
+#, c-format
+msgid "Command access level set to '%s' for connection %s."
+msgstr "تم تØديد مستوى صلاØيات الأوامر ب '%s' للاتصال %s."
+
+#: server/stdinhand.c:1163
#, c-format
msgid ""
"Anyone can now become game organizer '%s' by issuing the 'first' command."
msgstr "يستطيع أي شخص أن ÙŠØµØ¨Ø Ù…Ù†Ø¸Ù… اللعبة '%s' باستخدام أمر 'first'."
-#: server/stdinhand.c:1274
+#: server/stdinhand.c:1187
msgid "Command access levels in effect:"
msgstr "مستويات صلاØيات الأوامر المستخدمة:"
-#: server/stdinhand.c:1282
+#: server/stdinhand.c:1194
#, c-format
msgid "Command access level for new connections: %s"
msgstr "مستوى صلاØيات الأوامر للاتصالات الجديدة: %s"
-#: server/stdinhand.c:1285
+#: server/stdinhand.c:1197
#, c-format
msgid "Command access level for first player to take it: %s"
msgstr "مستوى صلاØيات الأوامر لأول لاعب يأخذها: %s"
-#: server/stdinhand.c:1294
+#: server/stdinhand.c:1206
msgid ""
"Error: command access level must be one of 'none', 'info', 'ctrl', or 'hack'."
msgstr ""
"خطأ: يجب أن يكون مستوى صلاØيات الأوامر 'none'أو 'info' أو 'ctrl', أو 'hack'."
-#: server/stdinhand.c:1299
+#: server/stdinhand.c:1211
#, c-format
msgid ""
"Cannot increase command access level to '%s'; you only have '%s' yourself."
msgstr "لا يمكن زيادة مستوى صلاØيات الأوامر إلى '%s'; لديك Ùقط '%s' لنÙسك."
-#: 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: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:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
+#: server/stdinhand.c:1238 server/stdinhand.c:1252 server/stdinhand.c:1273
#, c-format
msgid "Command access level set to '%s' for new players."
msgstr "تم تØديد مستوي صلاØيات الأوامر ب '%s' للاعبين الجدد."
-#: server/stdinhand.c:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
+#: server/stdinhand.c:1243 server/stdinhand.c:1257 server/stdinhand.c:1267
#, c-format
msgid "Command access level set to '%s' for first player to grab it."
msgstr "تم تØديد مستوي صلاØيات الأوامر ب '%s' لأول لاعب يأخذها."
-#: server/stdinhand.c:1402
+#: server/stdinhand.c:1302
msgid "The 'first' command makes no sense from the server command line."
msgstr "لا يعني الأمر 'first' شيئا عند سطر أوامر الخادم."
-#: server/stdinhand.c:1406
+#: server/stdinhand.c:1306
#, c-format
msgid "You already have command access level '%s' or better."
msgstr "لديك أصلا مستوى صلاØيات الأوامر '%s' أو Ø£Ùضل."
-#: server/stdinhand.c:1411
+#: server/stdinhand.c:1311
msgid "Someone else already is game organizer."
msgstr "شخص ما هو أصلا منظم اللعبة."
-#: server/stdinhand.c:1416
+#: server/stdinhand.c:1316
#, c-format
msgid "Connection %s has opted to become the game organizer."
msgstr "اختار الإتّصال %s أن يصير منظم اللعبة."
-#: server/stdinhand.c:1467
+#: server/stdinhand.c:1367
#, c-format
msgid "Invalid argument %d."
msgstr "باراميتر خاطئ %d."
-#: server/stdinhand.c:1474
+#: server/stdinhand.c:1374
msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
msgstr ""
"Usage: timeoutincrease <الدور> <إضاÙØ© إلى الدور> <القيمة> <مضاع٠القيمة>."
-#: server/stdinhand.c:1482
+#: server/stdinhand.c:1382
#, c-format
msgid "Dynamic timeout set to %d %d %d %d"
msgstr "تم تØديد وقت الخروج الديناميكي ب %d %d %d %d"
-#: server/stdinhand.c:1542 server/stdinhand.c:1545
+#: server/stdinhand.c:1442 server/stdinhand.c:1445
msgid "Option:"
msgstr "الخيار:"
-#: server/stdinhand.c:1555 server/stdinhand.c:4031
+#: server/stdinhand.c:1455 server/stdinhand.c:4079
msgid "Description:"
msgstr "الوصÙ:"
-#: server/stdinhand.c:1560
+#: server/stdinhand.c:1460
#, c-format
msgid "Status: %s"
msgstr "الØالة: %s"
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "changeable"
msgstr "قابل للتغيير"
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "fixed"
msgstr "غير قابل للتغيير"
-#: server/stdinhand.c:1567
+#: server/stdinhand.c:1467
#, c-format
msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
msgstr "القيمة: %d, الØد الأدنى: 0, الاÙتراضي: %d, الØد الأعلى: 1"
-#: server/stdinhand.c:1572
+#: server/stdinhand.c:1472
#, c-format
msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
msgstr "القيمة: %d, الØد الأدنى: %d, الاÙتراضي: %d, الØد الأعلى: %d"
-#: server/stdinhand.c:1578
+#: server/stdinhand.c:1478
#, c-format
msgid "Value: \"%s\", Default: \"%s\""
msgstr "القيمة: \"%s\", الاÙتراضي: \"%s\""
-#: server/stdinhand.c:1597
+#: server/stdinhand.c:1497
msgid "Explanations are available for the following server options:"
msgstr "تتوÙر التÙسيرات لخيارات الخادم التالية:"
-#: server/stdinhand.c:1643
+#: server/stdinhand.c:1537
msgid "No explanation for that yet."
msgstr "لا يوجد تÙسير لهذا Øتى اﻵن."
-#: server/stdinhand.c:1646 server/stdinhand.c:2480
+#: server/stdinhand.c:1540 server/stdinhand.c:2468
msgid "Ambiguous option name."
msgstr "اسم خيار مبهم."
-#: server/stdinhand.c:1666
+#: server/stdinhand.c:1560
#, c-format
msgid "Server Operator: %s"
msgstr "مشغل الخادم: %s"
-#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
+#: server/stdinhand.c:1686 server/stdinhand.c:1713 server/stdinhand.c:1731
#, c-format
msgid "Player '%s' now has AI skill level '%s'."
msgstr "لدى اللاعب '%s' اﻵن مستوى ذ.ا '%s'."
-#: server/stdinhand.c:1822
+#: server/stdinhand.c:1718
#, c-format
msgid "%s is not controlled by the AI."
msgstr "يسيطر ال ذ.ا على %s."
-#: server/stdinhand.c:1842
+#: server/stdinhand.c:1738
#, c-format
msgid "Default AI skill level set to '%s'."
msgstr "تØديد مستوى لعب ال Ø°.ا الاقتراضي ب '%s'."
-#: server/stdinhand.c:1857 server/stdinhand.c:2162
+#: server/stdinhand.c:1753
msgid "This command is client only."
msgstr "هذا الأمر هو للعميل Ùقط."
-#: server/stdinhand.c:1860
+#: server/stdinhand.c:1756
msgid "Usage: away"
msgstr "الاستعمال: away"
-#: server/stdinhand.c:1865
+#: server/stdinhand.c:1761
msgid "Only players may use the away command."
msgstr "ÙŠØ³Ù…Ø Ù„Ù„Ø§Ø¹Ø¨ÙŠÙŠÙ† Ùقط استخدام أمر away."
-#: server/stdinhand.c:1869
+#: server/stdinhand.c:1765
#, c-format
msgid "%s set to away mode."
msgstr "وضع %s ÙÙŠ نمط away."
-#: server/stdinhand.c:1877
+#: server/stdinhand.c:1772
#, c-format
msgid "%s returned to game."
msgstr "رجع %s إلى اللعبة."
-#: server/stdinhand.c:1919
+#: server/stdinhand.c:1817
#, c-format
msgid "Sorry, you do not have access to view option '%s'."
msgstr "آسÙØŒ ليس عندك الصلاØية لعرض خيار '%s'."
-#: server/stdinhand.c:1925
+#: server/stdinhand.c:1823
#, c-format
msgid "Unknown option '%s'."
msgstr "الخيار مجهول '%s'."
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1848
msgid "All options with non-default values"
msgstr "كل الخيارات مع قيم غير اÙتراضية"
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1851
msgid "All options"
msgstr "كل الخيارات"
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1854
msgid "Vital options"
msgstr "الخيارات الØيوية"
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1857
msgid "Situational options"
msgstr "الخيارات الموقعية"
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1860
msgid "Rarely used options"
msgstr "الخيارات النادر استعمالها"
-#: server/stdinhand.c:1965
+#: server/stdinhand.c:1863
msgid "+ means you may change the option"
msgstr "+ يعني أنك تستطيع تغيير الخيار"
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1864
msgid "= means the option is on its default value"
msgstr "= يعني أن الخيار موضوع على القيمة الاÙتراضية"
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
#, c-format
msgid "%-*s value (min,max) "
msgstr "%-*s القيمة (الØد الأدنى,الØد الأعلى) "
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
msgid "Option"
msgstr "الخيار"
-#: server/stdinhand.c:1973
+#: server/stdinhand.c:1871
msgid "description"
msgstr "الوصÙ"
-#: server/stdinhand.c:2042
+#: server/stdinhand.c:1940
msgid ""
"Try 'show situational' or 'show rare' to show more options.\n"
"Try 'show changed' to show settings with non-default values."
@@ -5693,77 +5706,150 @@ msgstr ""
"جرب 'show situational' أو 'show rare' لعرض خيارات أخرى.\n"
"جرب 'show changed' لعرض اعدادات مع قيم غير اÙتراضية."
-#: server/stdinhand.c:2092
+#: server/stdinhand.c:1966
msgid "Cannot change teams once game has begun."
msgstr "لا تستطيع تغيير الÙرق متى بدأت اللعبة."
-#: server/stdinhand.c:2102
+#: server/stdinhand.c:1976
msgid "Undefined argument. Usage: team <player> <team>."
msgstr "باراميتر غير معرÙ. الاستعمال: team <اسم اللاعب> <الÙريق>."
-#: server/stdinhand.c:2122
+#: server/stdinhand.c:1996
#, c-format
msgid "No such team %s. Please give a valid team name or number."
msgstr "الÙريق %s غير موجود. الرجاء إعطاء اسم أو رقم Ùريق صالØ."
-#: server/stdinhand.c:2129
+#: server/stdinhand.c:2003
msgid "Cannot team a barbarian."
msgstr "لا تستطيع أن تكون Ùريق مع بربري."
-#: server/stdinhand.c:2135
+#: server/stdinhand.c:2009
#, c-format
msgid "Player %s set to team %s."
msgstr "اللاعب %s مع Ùريق %s."
-#: server/stdinhand.c:2157
-msgid "Undefined arguments. Usage: vote yes|no [vote number]."
-msgstr "باريمترات غير معرÙØ©. الاستعمال: vote yes|no [رقم التصويت]."
+#: server/stdinhand.c:2035 server/voting.c:512
+#, fuzzy
+msgid "Teamvote"
+msgstr "Ùريق"
-#: server/stdinhand.c:2165
-msgid "Observers cannot vote."
-msgstr "لا يستطيع المراقبون التصويت."
+#: server/stdinhand.c:2035 server/voting.c:516
+msgid "Vote"
+msgstr ""
-#: server/stdinhand.c:2168
+#: server/stdinhand.c:2037
+#, c-format
msgid ""
-"You can only vote in a running game. Use 'first' to become the game "
-"organizer if there currently is none."
+"%s %d \"%s\" (needs %0.0f%%%s): %d for, %d against, and %d abstained out of %"
+"d players."
msgstr ""
-"تستطيع التصويت Ùقط ÙÙŠ لعبة شغالة. استعمل 'first' Ù„ØªØµØ¨Ø Ù…Ù†Ø¸Ù… اللعبة إذا لم "
-"يكن هناك Øاليا Ø£Øد."
-#: server/stdinhand.c:2181
-#, c-format
-msgid "Vote %d \"%s\": %d for, %d against"
-msgstr "التصويت %d \"%s\": %d مع, %d ضد"
+#: server/stdinhand.c:2041
+msgid " no dissent"
+msgstr ""
-#: server/stdinhand.c:2188
+#: server/stdinhand.c:2049
msgid "There are no votes going on."
msgstr "لا يوجد أي تصويت جاري."
-#: server/stdinhand.c:2208
-msgid "No legal last vote."
+#: server/stdinhand.c:2077
+#, fuzzy
+msgid "Invalid arguments. Usage: vote yes|no|abstain [vote number]."
+msgstr "باريمترات غير معرÙØ©. الاستعمال: vote yes|no [رقم التصويت]."
+
+#: server/stdinhand.c:2095 server/stdinhand.c:2213 server/stdinhand.c:3714
+msgid "You are not allowed to use this command."
+msgstr "لا ÙŠÙØ³Ù’Ù…Ø Ù„Ùƒ استخدام هذا الأمر."
+
+#: server/stdinhand.c:2104
+#, fuzzy, c-format
+msgid "The argument \"%s\" is ambigious."
+msgstr "باريمتر المساعدة '%s' مبهم."
+
+#: server/stdinhand.c:2119
+#, fuzzy
+msgid "There are no votes running."
+msgstr "لا يوجد أي تصويت جاري."
+
+#: server/stdinhand.c:2121
+#, fuzzy, c-format
+msgid "No legal last vote (%d %s)."
msgstr "بلا تصويت أخير شرعي."
-#: server/stdinhand.c:2213
-msgid "Value must be integer."
-msgstr "يجب أن تكون القيمة رقم صØÙŠØ."
+#: server/stdinhand.c:2122
+msgid "other vote running"
+msgid_plural "other votes running"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2129 server/stdinhand.c:2491 server/stdinhand.c:2532
+msgid "Value must be an integer."
+msgstr "يجب أن تكون القيمة رقما صØÙŠØا."
+
+#: server/stdinhand.c:2135 server/stdinhand.c:2221
#, c-format
msgid "No such vote (%d)."
msgstr "التصويت غير موجود (%d)."
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2141
+#, fuzzy
+msgid "You are not allowed to vote on that."
+msgstr "لا ÙŠÙØ³Ù’Ù…ÙŽØ Ù„Ùƒ تغيير هذا الخيار."
+
+#: server/stdinhand.c:2146
#, c-format
msgid "You voted for \"%s\""
msgstr "لقد صَوّت ل \"%s\""
-#: server/stdinhand.c:2232
+#: server/stdinhand.c:2150
#, c-format
msgid "You voted against \"%s\""
msgstr "لقد صَوّت ضد \"%s\""
-#: server/stdinhand.c:2259
+#: server/stdinhand.c:2155
+#, c-format
+msgid "You abstained from voting on \"%s\""
+msgstr ""
+
+#: server/stdinhand.c:2190
+msgid "Missing argument <vote number> or the string \"all\"."
+msgstr ""
+
+#: server/stdinhand.c:2197
+#, fuzzy
+msgid "You don't have any vote going on."
+msgstr "ليس عندك عامل هنا."
+
+#: server/stdinhand.c:2204
+#, fuzzy
+msgid "There isn't any vote going on."
+msgstr "لا يوجد أي تصويت جاري."
+
+#: server/stdinhand.c:2209
+msgid "Server: All votes have been removed."
+msgstr ""
+
+#: server/stdinhand.c:2226
+#, fuzzy, c-format
+msgid "You are not allowed to cancel this vote (%d)."
+msgstr "لا ÙŠÙØ³Ù’Ù…ÙŽØ Ù„Ùƒ تغيير هذا الخيار."
+
+#: server/stdinhand.c:2232
+msgid "Usage: /cancelvote [<vote number>|all]"
+msgstr ""
+
+#: server/stdinhand.c:2241
+#, c-format
+msgid "Server: %s cancelled the vote \"%s\" (number %d)."
+msgstr ""
+
+#: server/stdinhand.c:2247
+#, c-format
+msgid "Server: The vote \"%s\" (number %d) has been cancelled."
+msgstr ""
+
+#: server/stdinhand.c:2265
msgid ""
"Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
"<x> <y> | unit <id> | tech <player> | timing | info>."
@@ -5771,130 +5857,126 @@ msgstr ""
"باريمترات غير معرÙØ©. الاستعمال: debug <diplomacy <اللاعب> | city <س> <ص> | "
"units <س> <ص> | unit <رقم التعريÙ> | tech <اللاعب> | timing | info>."
-#: server/stdinhand.c:2265
+#: server/stdinhand.c:2271
msgid "Can only use this command once game has begun."
msgstr "تستطيع Ùقط استخدام هذا الأمر متى بدأت اللعبة."
-#: server/stdinhand.c:2294
+#: server/stdinhand.c:2300
#, c-format
msgid "%s diplomacy no longer debugged"
msgstr "لا يتم ØªÙ†Ù‚ÙŠÙŠØ Ø¯Ø¨Ù„ÙˆÙ…Ø§Ø³ÙŠØ© %s بعد اﻵن "
-#: server/stdinhand.c:2298
+#: server/stdinhand.c:2304
#, c-format
msgid "%s diplomacy debugged"
msgstr "يتم ØªÙ†Ù‚ÙŠÙŠØ Ø¯Ø¨Ù„ÙˆÙ…Ø§Ø³ÙŠØ© %s"
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2323
#, c-format
msgid "%s tech no longer debugged"
msgstr "لا يتم ØªÙ†Ù‚ÙŠÙŠØ ØªÙƒÙ†ÙˆÙ„ÙˆØ¬ÙŠØ§ %s بعد اﻵن "
-#: server/stdinhand.c:2321
+#: server/stdinhand.c:2327
#, c-format
msgid "%s tech debugged"
msgstr "يتم ØªÙ†Ù‚ÙŠÙŠØ ØªÙƒÙ†ÙˆÙ„ÙˆØ¬ÙŠØ§ %s"
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2358 server/stdinhand.c:2388
msgid "Value 2 & 3 must be integer."
msgstr "يجب أن تكون القيمة 2 & 3 رقم صØÙŠØ."
-#: server/stdinhand.c:2356 server/stdinhand.c:2386
+#: server/stdinhand.c:2362 server/stdinhand.c:2392
msgid "Bad map coordinates."
msgstr "اØداثيات خريطة خاطئة."
-#: server/stdinhand.c:2361
+#: server/stdinhand.c:2367
msgid "No city at this coordinate."
msgstr "لا توجد مدينة ÙÙŠ هذه الاØداثيات."
-#: server/stdinhand.c:2366
+#: server/stdinhand.c:2372
#, c-format
msgid "%s no longer debugged"
msgstr "لا يتم ØªÙ†Ù‚ÙŠÙŠØ %s بعد اﻵن "
-#: server/stdinhand.c:2392 server/stdinhand.c:2422
+#: server/stdinhand.c:2398 server/stdinhand.c:2428
#, fuzzy, c-format
msgid "%s %s no longer debugged."
msgstr "لا يتم ØªÙ†Ù‚ÙŠÙŠØ %s %s بعد اﻵن."
-#: server/stdinhand.c:2397 server/stdinhand.c:2427
+#: server/stdinhand.c:2403 server/stdinhand.c:2433
#, fuzzy, c-format
msgid "%s %s debugged."
msgstr "يتم ØªÙ†Ù‚ÙŠÙŠØ %s %s بعد اﻵن."
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2419
msgid "Value 2 must be integer."
msgstr "يجب أن تكون القيمة 2 رقم صØÙŠØ."
-#: server/stdinhand.c:2417
+#: server/stdinhand.c:2423
#, c-format
msgid "Unit %d does not exist."
msgstr "لا وجود للوØدة %d."
-#: server/stdinhand.c:2475
+#: server/stdinhand.c:2464
msgid "Undefined argument. Usage: set <option> <value>."
msgstr "باريمتر غير معرÙ. الاستعمال: set <الخيار> <القيمة>."
-#: server/stdinhand.c:2485
+#: server/stdinhand.c:2473
msgid "You are not allowed to set this option."
msgstr "لا ÙŠÙØ³Ù’Ù…ÙŽØ Ù„Ùƒ تغيير هذا الخيار."
-#: server/stdinhand.c:2490 server/stdinhand.c:3463
+#: server/stdinhand.c:2478 server/stdinhand.c:3501
msgid "This setting can't be modified after the game has started."
msgstr "لا يمكن تغيير هذا الاعداد بعد بدء اللعبة."
-#: server/stdinhand.c:2502 server/stdinhand.c:2543
-msgid "Value must be an integer."
-msgstr "يجب أن تكون القيمة رقما صØÙŠØا."
-
-#: server/stdinhand.c:2512
+#: server/stdinhand.c:2501
#, c-format
msgid "The parameter %s should only contain digits 0-1."
msgstr ""
-#: server/stdinhand.c:2519
+#: server/stdinhand.c:2508
msgid "Value out of range (minimum: 0, maximum: 1)."
msgstr "القيمة خارج المدى (الØد الأدنى: 0, الØد الأعلى: 1)."
-#: server/stdinhand.c:2534 server/stdinhand.c:2576
+#: server/stdinhand.c:2523 server/stdinhand.c:2565
#, c-format
msgid "Option: %s has been set to %d."
msgstr "الخيار: %s تم تغييره إلى %d."
-#: server/stdinhand.c:2554
+#: server/stdinhand.c:2543
#, c-format
msgid "The parameter %s should only contain +- and 0-9."
msgstr ""
-#: server/stdinhand.c:2561
+#: server/stdinhand.c:2550
#, c-format
msgid "Value out of range (minimum: %d, maximum: %d)."
msgstr "القيمة خارج المدى (الØد الأدنى: %d, الØد الأعلى: %d)."
-#: server/stdinhand.c:2586
+#: server/stdinhand.c:2575
msgid "String value too long. Usage: set <option> <value>."
msgstr "القيمة النصية طويلة جدا. طريقة الاستعمال: set <الخيار> <القيمة>."
-#: server/stdinhand.c:2600
+#: server/stdinhand.c:2589
#, c-format
msgid "Option: %s has been set to \"%s\"."
msgstr "الخيار: %s تم تغييره إلى \"%s\"."
-#: server/stdinhand.c:2658
+#: server/stdinhand.c:2652
msgid "Sorry, one can't observe globally in this game."
msgstr "آسÙØŒ لا يمكن المراقبة عالميا ÙÙŠ هذا اللعبة."
-#: server/stdinhand.c:2661
+#: server/stdinhand.c:2655
msgid "Sorry, you can't take a global observer. Observe it instead."
msgstr "آسÙØŒ لا يمكن أخد مراقب عالمي. راقبه بدلا من ذلك."
-#: server/stdinhand.c:2671
+#: server/stdinhand.c:2665
#, fuzzy
msgid "You cannot take a new player at this time."
msgstr "آسÙØŒ لا يمكن أخذ لاعبيين اتسانيين ÙÙŠ هذه اللعبة."
#. TRANS: Do not translate "maxplayers".
-#: server/stdinhand.c:2679
+#: server/stdinhand.c:2673
#, c-format
msgid ""
"You cannot take a new player because the maximum of %d player has already "
@@ -5906,73 +5988,73 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: server/stdinhand.c:2691
+#: server/stdinhand.c:2685
msgid "You cannot take a new player because there are no free player slots."
msgstr ""
-#: server/stdinhand.c:2702
+#: server/stdinhand.c:2696
msgid "Sorry, one can't observe barbarians in this game."
msgstr "آسÙØŒ لا يمكن مراقبة البرابرة ÙÙŠ هذه اللعبة."
-#: server/stdinhand.c:2705
+#: server/stdinhand.c:2699
msgid "Sorry, one can't take barbarians in this game."
msgstr "آسÙØŒ لا يمكن أخد البرابرة ÙÙŠ هذه اللعبة."
-#: server/stdinhand.c:2713
+#: server/stdinhand.c:2707
msgid "Sorry, one can't observe dead players in this game."
msgstr "آسÙØŒ لا يمكن مراقبة اللاعبيين الأموات ÙÙŠ هذا اللعبة."
-#: server/stdinhand.c:2716
+#: server/stdinhand.c:2710
msgid "Sorry, one can't take dead players in this game."
msgstr "آسÙØŒ لا يمكن أخد لاعبيين أموات ÙÙŠ هذه اللعبة."
-#: server/stdinhand.c:2724
+#: server/stdinhand.c:2718
msgid "Sorry, one can't observe AI players in this game."
msgstr "آسÙØŒ لا يمكن مراقبة لاعبي الذكاء الاصطناعي ÙÙŠ هذه اللعبة."
-#: server/stdinhand.c:2727
+#: server/stdinhand.c:2721
msgid "Sorry, one can't take AI players in this game."
msgstr "آسÙØŒ لا يمكن أخذ لاعبي الذكاء الاصطناعي ÙÙŠ هذه اللعبة."
-#: server/stdinhand.c:2736
+#: server/stdinhand.c:2730
msgid "Sorry, one can't observe human players in this game."
msgstr "آسÙØŒ لا يمكن مراقبة لاعبيين اتاس ÙÙŠ هذه اللعبة."
-#: server/stdinhand.c:2739
+#: server/stdinhand.c:2733
msgid "Sorry, one can't take human players in this game."
msgstr "آسÙØŒ لا يمكن أخذ لاعبيين اتسانيين ÙÙŠ هذه اللعبة."
-#: server/stdinhand.c:2749
+#: server/stdinhand.c:2743
msgid "Sorry, one can't observe in this game."
msgstr "آسÙØŒ لا يمكن المراقبة ÙÙŠ هذه اللعبة."
-#: server/stdinhand.c:2754
+#: server/stdinhand.c:2748
msgid "Sorry, one can't take players in this game."
msgstr "آسÙØŒ لا يمكن أخذ لاعبيين ÙÙŠ هذه اللعبة."
-#: server/stdinhand.c:2760
+#: server/stdinhand.c:2754
msgid "Sorry, one can't take players already connected in this game."
msgstr "آسÙØŒ لا يمكن أخد لاعبيين متصليين أصلا ÙÙŠ هذه اللعبة."
-#: server/stdinhand.c:2791
+#: server/stdinhand.c:2785
msgid "Usage: observe [connection-name [player-name]]"
msgstr "الاستعمال: observe [اسم الاتصال [اسم اللاعب]]"
-#: server/stdinhand.c:2797
+#: server/stdinhand.c:2791
msgid "Usage: observe [player-name]"
msgstr "الاستعمال: observe [اسم اللاعب]"
-#: server/stdinhand.c:2847
+#: server/stdinhand.c:2841
#, c-format
msgid "%s already controls %s. Using 'observe' would remove %s"
msgstr "يسيطر %s أصلا على %s. استعمال 'observe' سيزيل %s"
-#: server/stdinhand.c:2858
+#: server/stdinhand.c:2852
#, c-format
msgid "%s is already observing %s."
msgstr "يراقب %s أصلا %s."
-#: server/stdinhand.c:2863
+#: server/stdinhand.c:2857
#, c-format
msgid "%s is already observing."
msgstr "يقوم %s بالمراقبة أصلا."
@@ -5987,233 +6069,238 @@ msgstr "يراقب %s اﻵن %s"
msgid "%s now observes"
msgstr "يراقب %s اﻵن"
-#: server/stdinhand.c:2969
+#: server/stdinhand.c:2971
msgid "Usage: take <connection-name> <player-name>"
msgstr "الاستعمال: take <اسم الاتصال> <اسم اللاعب>"
-#: server/stdinhand.c:2974
+#: server/stdinhand.c:2976
msgid "Usage: take <player-name>"
msgstr "الاستعمال: take <اسم اللاعب>"
-#: server/stdinhand.c:2980
+#: server/stdinhand.c:2982
msgid "Usage: take [connection-name] <player-name>"
msgstr "الاستعمال: take [اسم الاتصال] <اسم اللاعب>"
-#: server/stdinhand.c:3010
+#: server/stdinhand.c:3012
#, fuzzy, c-format
msgid "%s already controls %s."
msgstr "يسيطر %s أصلا على %s"
-#: server/stdinhand.c:3024
+#: server/stdinhand.c:3026
#, fuzzy, c-format
msgid "There is no free player slot for %s."
msgstr "لا يوجد هناك لاعب أو اتصال باسم %s."
-#: server/stdinhand.c:3059
+#: server/stdinhand.c:3061
#, c-format
msgid "being detached from %s."
msgstr "تم الÙصل عن %s."
-#: server/stdinhand.c:3135
+#: server/stdinhand.c:3146
#, fuzzy, c-format
msgid "%s now controls %s (%s, %s)."
msgstr "يملك %s اﻵن %s (%s, %s)"
-#: server/stdinhand.c:3139 server/stdinhand.c:4260
+#: server/stdinhand.c:3150 server/stdinhand.c:4308
#: data/nation/barbarian.ruleset:3
msgid "Barbarian"
msgstr "بربري"
-#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
+#: server/stdinhand.c:3152 server/stdinhand.c:4310 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-sdl/plrdlg.c:645
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr "ذكاء اصطناعي"
-#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-gtk-2.0/pages.c:2125
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
+#: server/stdinhand.c:3153 server/stdinhand.c:4312
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-gtk-2.0/pages.c:2127
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/connectdlg.c:215
msgid "Human"
msgstr "انساني"
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-gtk-2.0/pages.c:2124 client/gui-win32/connectdlg.c:200
-#: client/gui-win32/connectdlg.c:212
+#: server/stdinhand.c:3155 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-gtk-2.0/pages.c:2126 client/gui-win32/connectdlg.c:202
+#: client/gui-win32/connectdlg.c:214
msgid "Alive"
msgstr "ØÙŠ"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3156 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-win32/connectdlg.c:202
msgid "Dead"
msgstr "ميت"
-#: server/stdinhand.c:3147
+#: server/stdinhand.c:3159
#, fuzzy, c-format
msgid "%s failed to attach to any player."
msgstr "ال %s هو غير متصل إلى أي لاعب."
-#: server/stdinhand.c:3182
+#: server/stdinhand.c:3194
msgid "Usage: detach <connection-name>"
msgstr "الاستعمال: detach <اسم الاتصال>"
-#: server/stdinhand.c:3202
+#: server/stdinhand.c:3214
msgid "You can not detach other users."
msgstr "لا تستطيع Ùصل اللاعبين اﻵخرين."
-#: server/stdinhand.c:3211
+#: server/stdinhand.c:3223
#, c-format
msgid "%s is not attached to any player."
msgstr "ال %s هو غير متصل إلى أي لاعب."
-#: server/stdinhand.c:3234
+#: server/stdinhand.c:3246
#, c-format
msgid "%s detaching from %s"
msgstr "ÙŠÙصل %s عن %s"
-#: server/stdinhand.c:3240
+#: server/stdinhand.c:3252
#, c-format
msgid "%s no longer observing."
msgstr "لا يقوم %s بالمراقبة بعد اﻵن."
-#: server/stdinhand.c:3259
+#: server/stdinhand.c:3271
#, c-format
msgid "detaching from %s."
msgstr "جاري الÙصل عن %s."
-#: server/stdinhand.c:3345
+#: server/stdinhand.c:3361
msgid "Usage: load <game name>"
msgstr "الاستعمال: load <اسم اللعبة>"
-#: server/stdinhand.c:3350
+#: server/stdinhand.c:3366
msgid "Cannot load a game while another is running."
msgstr "لا يمكن تØميل لعبة عند وجود لعبة أخرى جارية."
-#: server/stdinhand.c:3372
+#: server/stdinhand.c:3388
#, c-format
msgid "Cannot find savegame or scenario with the name \"%s\"."
msgstr "Ùشل العثور على لعبة Ù…ØÙوظة أو سيناريو بهذا الاسم \"%s\"."
-#: server/stdinhand.c:3389
+#: server/stdinhand.c:3405
#, c-format
msgid "Could not load savefile: %s"
msgstr "Ùشل تØميل مل٠مØÙوظ: %s"
-#: server/stdinhand.c:3458
+#: server/stdinhand.c:3496
#, c-format
msgid "Current ruleset directory is \"%s\""
msgstr "دليل مجموعة القواعد الØالي هو \"%s\""
-#: server/stdinhand.c:3478
+#: server/stdinhand.c:3516
#, c-format
msgid "Ruleset directory \"%s\" not found"
msgstr "دليل مجموعة القواعد \"%s\" غير موجود"
-#: server/stdinhand.c:3484
+#: server/stdinhand.c:3522
#, c-format
msgid "Ruleset directory is already \"%s\""
msgstr "دليل مجموعة القواعد هو أصلا \"%s\""
-#: server/stdinhand.c:3488
+#: server/stdinhand.c:3526
#, c-format
msgid "Ruleset directory set to \"%s\""
msgstr "تم تØديد دليل مجموعة القواعد ب \"%s\""
-#: server/stdinhand.c:3536
+#: server/stdinhand.c:3574
msgid "Goodbye."
msgstr "مع السّلامة."
-#: server/stdinhand.c:3567
+#: server/stdinhand.c:3606
msgid "Sorry, you are not allowed to use server commands."
msgstr "آسÙØŒ لا ÙŠÙØ³Ù’Ù…Ø Ù„Ùƒ استخدام أوامر الخادم."
-#: server/stdinhand.c:3603
+#: server/stdinhand.c:3656
#, c-format
msgid "Warning: '%s' interpreted as '%s', but it is ambiguous. Try '%shelp'."
msgstr "تØذير: تم تÙسير '%s' Ùƒ '%s', ولكنه مبهم. Øاول '%shelp'."
-#: server/stdinhand.c:3608
+#: server/stdinhand.c:3661
#, c-format
msgid "Unknown command. Try '%shelp'."
msgstr "الأمر مجهول. Øاول '%shelp'."
-#: server/stdinhand.c:3625
-msgid "Your new vote canceled your previous vote."
+#: server/stdinhand.c:3675
+#, fuzzy
+msgid "Your new vote cancelled your previous vote."
msgstr "الغى تصويتك القديم تصويتك السابق."
-#: server/stdinhand.c:3633
-#, c-format
-msgid "New vote (number %d) by %s: %s."
+#: server/stdinhand.c:3688
+msgid "New teamvote"
+msgstr ""
+
+#: server/stdinhand.c:3691
+msgid "New vote"
+msgstr ""
+
+#: server/stdinhand.c:3695
+#, fuzzy, c-format
+msgid "%s (number %d) by %s: %s"
msgstr "تصويت جديد (رقم %d) من قبل %s: %s."
-#: server/stdinhand.c:3645
+#: server/stdinhand.c:3704
#, c-format
msgid "Your new vote (\"%s\") was not legal or was not recognized."
msgstr ""
-#: server/stdinhand.c:3655
-msgid "You are not allowed to use this command."
-msgstr "لا ÙŠÙØ³Ù’Ù…Ø Ù„Ùƒ استخدام هذا الأمر."
-
-#: server/stdinhand.c:3680
+#: server/stdinhand.c:3726
msgid "(server prompt)"
msgstr ""
-#: server/stdinhand.c:3787
+#: server/stdinhand.c:3835
msgid "Game ended in a draw."
msgstr "انتهت اللعبة بتعادل."
-#: server/stdinhand.c:3791
+#: server/stdinhand.c:3839
msgid ""
"Ending the game. The server will restart once all clients have disconnected."
msgstr "جاري انهاء اللعبة. سيعاد تشغيل الخادم بعد انÙصال كل العملاء."
-#: server/stdinhand.c:3796
+#: server/stdinhand.c:3844
msgid "Cannot end the game: no game running."
msgstr "لا يمكن انهاء اللعبة: لا وجود للعبة جارية."
-#: server/stdinhand.c:3812
+#: server/stdinhand.c:3860
#, c-format
msgid "%s has conceded the game and can no longer win."
msgstr "استسلم %s وهكذا لا يستطيع الÙوز بعد اﻵن."
-#: server/stdinhand.c:3817
+#: server/stdinhand.c:3865
msgid "You cannot surrender now."
msgstr "لا تستطيع الاستسلام اﻵن."
-#: server/stdinhand.c:3883
+#: server/stdinhand.c:3931
#, fuzzy
msgid "Not enough human players, game will not start."
msgstr "لا يوجد لاعبيين ÙƒÙاية, لن تبدأ اللعبة ."
-#: server/stdinhand.c:3888
+#: server/stdinhand.c:3936
#, fuzzy
msgid "No players, game will not start."
msgstr "لا يوجد لاعبيين ÙƒÙاية, لن تبدأ اللعبة ."
-#: server/stdinhand.c:3892
+#: server/stdinhand.c:3940
#, fuzzy
msgid "Not enough nations for all players, game will not start."
msgstr "لا يوجد لاعبيين ÙƒÙاية, لن تبدأ اللعبة ."
-#: server/stdinhand.c:3901
+#: server/stdinhand.c:3949
msgid "All players are ready; starting game."
msgstr "كل اللاعبيين جاهزين، جاري بدء اللعبة."
-#: server/stdinhand.c:3915
+#: server/stdinhand.c:3963
msgid ""
"Cannot start the game: the game is waiting for all clients to disconnect."
msgstr "لا يمكن بدء اللعبة: تنتظر اللعبة كل العملاء أن ينÙصلوا."
-#: server/stdinhand.c:3922
+#: server/stdinhand.c:3970
msgid "Cannot start the game: it is already running."
msgstr "لا يمكن بدء اللعبة: لقد بدأت أصلا."
-#: server/stdinhand.c:3953
+#: server/stdinhand.c:4001
#, c-format
msgid "Cutting connection %s."
msgstr "جاري قطع الاتصال %s."
-#: server/stdinhand.c:3972
+#: server/stdinhand.c:4020
#, fuzzy
msgid ""
"Welcome - this is the introductory help text for the Freeciv server.\n"
@@ -6240,77 +6327,77 @@ msgstr ""
"\n"
"\n"
-#: server/stdinhand.c:4007 server/stdinhand.c:4010
+#: server/stdinhand.c:4055 server/stdinhand.c:4058
msgid "Command:"
msgstr "الأمر:"
-#: server/stdinhand.c:4014
+#: server/stdinhand.c:4062
msgid "Synopsis: "
msgstr "الخلاصة: "
-#: server/stdinhand.c:4023
+#: server/stdinhand.c:4071
#, c-format
msgid "Level: %s"
msgstr "المستوى: %s"
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4096
msgid "The following server commands are available:"
msgstr "أوامر الخادم التالية متوÙرة:"
-#: server/stdinhand.c:4123
+#: server/stdinhand.c:4171
#, c-format
msgid "Help argument '%s' is ambiguous."
msgstr "باريمتر المساعدة '%s' مبهم."
-#: server/stdinhand.c:4128
+#: server/stdinhand.c:4176
#, c-format
msgid "No match for help argument '%s'."
msgstr "بلا مطابقة لبراميتر المساعدة '%s'."
-#: server/stdinhand.c:4194
+#: server/stdinhand.c:4242
#, c-format
msgid "Bad list argument: '%s'. Try '%shelp list'."
msgstr "خطأ باريمتر القائمة: '%s'. جرب '%shelp القائمة'."
-#: server/stdinhand.c:4234
+#: server/stdinhand.c:4282
msgid "List of players:"
msgstr "قائمة اللاعبيين:"
-#: server/stdinhand.c:4239
+#: server/stdinhand.c:4287
msgid "<no players>"
msgstr "<بلا لاعبيين>"
-#: server/stdinhand.c:4256
+#: server/stdinhand.c:4304
#, c-format
msgid "user %s, "
msgstr "المستخدم %s, "
-#: server/stdinhand.c:4267
+#: server/stdinhand.c:4315
msgid ", Dead"
msgstr ", ميت"
-#: server/stdinhand.c:4270
+#: server/stdinhand.c:4318
#, c-format
msgid ", difficulty level %s"
msgstr ", مستوى الصعوبة %s"
#. TRANS: continue list, in case comma is not the separator of choice.
-#: server/stdinhand.c:4275 server/stdinhand.c:4279 client/helpdata.c:257
-#: client/helpdata.c:752 client/text.c:241 client/text.c:1224
-#: client/text.c:1262
+#: server/stdinhand.c:4323 server/stdinhand.c:4327 client/helpdata.c:257
+#: client/helpdata.c:752 client/text.c:241 client/text.c:1229
+#: client/text.c:1267
#, c-format
msgid "?clistmore:, %s"
msgstr ", %s"
-#: server/stdinhand.c:4283
+#: server/stdinhand.c:4331
msgid ", ready"
msgstr ", جاهز"
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4333
msgid ", not ready"
msgstr ", غير جاهز"
-#: server/stdinhand.c:4293
+#: server/stdinhand.c:4341
#, c-format
msgid " %d connection:"
msgid_plural " %d connections:"
@@ -6318,21 +6405,21 @@ msgstr[0] " %d اتصال:"
msgstr[1] "%d اتصالان:"
msgstr[2] "%d اتصالات:"
-#: server/stdinhand.c:4299
+#: server/stdinhand.c:4347
#, c-format
msgid " %s from %s (command access level %s), bufsize=%dkb"
msgstr " %s من %s (مستوى صلاØية الأمر %s), bufsize=%d Ùƒ.ب"
-#: server/stdinhand.c:4304
+#: server/stdinhand.c:4352
msgid " (observer mode)"
msgstr " (نمط المراقبة)"
-#: server/stdinhand.c:4322
+#: server/stdinhand.c:4370
msgid "List of teams:"
msgstr "قائمة الÙرق:"
#. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4332
+#: server/stdinhand.c:4380
#, c-format
msgid "%2d : '%s' : %d player"
msgid_plural "%2d : '%s' : %d players"
@@ -6340,25 +6427,25 @@ msgstr[0] "%2d : '%s' : %d لاعب"
msgstr[1] "%2d : '%s' : %d لاعبان"
msgstr[2] "%2d : '%s' : %d لاعبيين"
-#: server/stdinhand.c:4352
+#: server/stdinhand.c:4400
#, c-format
msgid "%2d : '%s' : 1 player : %s"
msgstr "%2d : '%s' : 1 لاعب : %s"
-#: server/stdinhand.c:4360
+#: server/stdinhand.c:4408
#, c-format
msgid "Empty team: %s"
msgstr "Ùريق Ùارغ: %s"
-#: server/stdinhand.c:4371
+#: server/stdinhand.c:4419
msgid "List of connections to server:"
msgstr "قائمة الاتصالات إلى الخادم:"
-#: server/stdinhand.c:4375
+#: server/stdinhand.c:4423
msgid "<no connections>"
msgstr "<بلا اتصال>"
-#: server/stdinhand.c:4399
+#: server/stdinhand.c:4447
msgid "List of scenarios available:"
msgstr "قائمة السيناريوهات المتوÙرة:"
@@ -6377,65 +6464,65 @@ msgstr "تم العثور على تكنولوجيا مستقبلية من قبل
msgid "%s acquired from %s!"
msgstr "تم الØصول على %s من %s!"
-#: server/techtools.c:220
+#: server/techtools.c:221
#, c-format
msgid ""
"Discovery of %s makes the government form %s available. You may want to "
"start a revolution."
msgstr "سيجعل اكتشا٠%s شكل الØكومة %s متوÙرا. تستطيع بدء ثورة."
-#: server/techtools.c:301
+#: server/techtools.c:302
#, c-format
msgid "Discovery of %s OBSOLETES %s in %s!"
msgstr "اكتشا٠%s يلغي %s ÙÙŠ %s!"
-#: server/techtools.c:351
+#: server/techtools.c:352
#, c-format
msgid "Learned %s. Our scientists focus on %s; goal is %s."
msgstr "تم تعلم %s. يركز علمائنا على %s; الهد٠هو %s."
-#: server/techtools.c:369
+#: server/techtools.c:370
#, c-format
msgid "Learned %s. Scientists choose to research %s."
msgstr "تم تعلم %s. يختار علمائنا بØØ« %s."
-#: server/techtools.c:376
+#: server/techtools.c:377
#, c-format
msgid "Learned %s. "
msgstr "تم تعلم %s. "
-#: server/techtools.c:379
+#: server/techtools.c:380
#, c-format
msgid "Researching %s."
msgstr "جاري البØØ« العلمي %s."
-#: server/techtools.c:385
+#: server/techtools.c:386
#, c-format
msgid "Learned %s. Scientists do not know what to research next."
msgstr "تم تعلم %s. لا يدري العلماء ما هو البØØ« التالي."
-#: server/techtools.c:402
+#: server/techtools.c:403
msgid ""
"Great scientists from all the world join your civilization: you get an "
"immediate advance."
msgstr "ينضم علماء عظماء من كل العالم إلى Øضارتك: ستØصل على تطور Ùورا."
-#: server/techtools.c:570
+#: server/techtools.c:571
#, c-format
msgid "Technology goal is %s."
msgstr "الهد٠التكنولوجي هو %s."
-#: server/techtools.c:700
+#: server/techtools.c:708
#, c-format
msgid "You steal %s from the %s."
msgstr "لقد سرقت %s من ال %s."
-#: server/techtools.c:705
+#: server/techtools.c:713
#, c-format
msgid "The %s stole %s from you!"
msgstr "سرق %s ال %s منك!"
-#: server/techtools.c:710
+#: server/techtools.c:718
#, c-format
msgid "The %s have stolen %s from the %s."
msgstr "سرق %s %s من ال %s."
@@ -6459,179 +6546,185 @@ msgstr "لا توجد أي ÙˆØدات قابلة للتطوير."
msgid "%s upgraded to %s for %d gold."
msgstr "تطوير %s إلى %s ب %d ذهب."
-#: server/unithand.c:396
+#: server/unithand.c:402
#, c-format
msgid "%s refuses to disband!"
msgstr "يرÙض %s التسريØ!"
-#: server/unithand.c:449
+#: server/unithand.c:455
msgid "Can't place city here."
msgstr "لا يمكن إقامة المدينة هنا."
-#: server/unithand.c:456
+#: server/unithand.c:462
#, c-format
msgid "Only %s can build a city."
msgstr "يستطيع %s Ùقط بناء مدينة."
-#: server/unithand.c:461
+#: server/unithand.c:467
msgid "Can't build a city."
msgstr "لا يمكن بناء مدينة."
-#: server/unithand.c:470
+#: server/unithand.c:476
#, c-format
msgid "Only %s can add to a city."
msgstr "يستطيع %s Ùقط الأضاÙØ© إلى مدينة."
-#: server/unithand.c:475
+#: server/unithand.c:481
msgid "Can't add to a city."
msgstr "لا يمكن الاضاÙØ© إلى مدينة."
-#: server/unithand.c:481
+#: server/unithand.c:487
#, c-format
msgid "%s unit has no moves left to add to %s."
msgstr "لم يبق للوØدة %s أي Øركات للاضاÙØ© إلى %s."
-#: server/unithand.c:487
+#: server/unithand.c:493
#, c-format
msgid "%s unit has no moves left to build city."
msgstr "لم يبق للوØدة %s أي Øركات لبناء مدينة."
-#: server/unithand.c:492
+#. TRANS: <city> is owned by <nation>, cannot add <unit>.
+#: server/unithand.c:499
+#, fuzzy, c-format
+msgid "%s is owned by %s, cannot add %s."
+msgstr "الوØدة %s كبيرة جدا لتضا٠إلى %s."
+
+#: server/unithand.c:506
#, c-format
msgid "%s is too big to add %s."
msgstr "الوØدة %s كبيرة جدا لتضا٠إلى %s."
-#: server/unithand.c:498
+#: server/unithand.c:512
#, c-format
msgid "%s needs an improvement to grow, so you cannot add %s."
msgstr "ÙŠØتاج %s إلى تØسين للتوسع, Ùلهذا لا تستطيع إضاÙØ© %s."
-#: server/unithand.c:509
+#: server/unithand.c:523
#, c-format
msgid "Can't add %s to %s."
msgstr "لا يمكن إضاÙØ© %s إلى %s."
-#: server/unithand.c:531
+#: server/unithand.c:545
#, c-format
msgid "%s added to aid %s in growing."
msgstr "تم إضاÙØ© %s لمساعدة %s ÙÙŠ التوسع."
-#: server/unithand.c:828
+#: server/unithand.c:842
msgid "Your Nuclear missile was shot down by SDI defences, what a waste."
msgstr "تم اسقاط صاروخك النووي من دÙاع SDIØŒ يا لا الخسارة."
-#: server/unithand.c:831
+#: server/unithand.c:845
#, c-format
msgid "The nuclear attack on %s was avoided by your SDI defense."
msgstr "تم تجنب الهجوم النووي على %s بواسطة دÙاع SDI الخاص بك."
#. TRANS: "Your Cannon ... the Polish Destroyer."
-#: server/unithand.c:901
+#: server/unithand.c:915
#, fuzzy, c-format
msgid "Your %s survived the pathetic attack from the %s %s."
msgstr "نجت ÙˆØدتك %s من الهجوم المثير للشÙقة من %s %s."
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unithand.c:910
+#: server/unithand.c:924
#, fuzzy, c-format
msgid "Your attacking %s failed against the %s %s!"
msgstr "Ùشلت ÙˆØدتك %s المهاجمة أمام %s %s!"
-#: server/unithand.c:983
+#: server/unithand.c:997
#, c-format
msgid "Only %s can attack from sea."
msgstr "يستطيع %s Ùقط الهجوم من البØر."
-#: server/unithand.c:988
+#: server/unithand.c:1002
msgid "Cannot attack from sea."
msgstr "لا تستطيع الهجوم من البØر."
-#: server/unithand.c:996 server/unittools.c:2137
+#: server/unithand.c:1010 server/unittools.c:2142
msgid "Cannot attack unless you declare war first."
msgstr "لا تستطيع الهجوم إلا بعد إعلانك الØرب أولا."
-#: server/unithand.c:1001
+#: server/unithand.c:1015
#, c-format
msgid "%s can only move into your own zone of control."
msgstr "يستطيع %s التØرك Ùقط إلى منطقة سيطرتك."
-#: server/unithand.c:1007
+#: server/unithand.c:1021
#, fuzzy, c-format
msgid "Cannot invade unless you break peace with %s first."
msgstr "لا تستطيع الهجوم إلا بعد إعلانك الØرب أولا."
-#: server/unithand.c:1052
+#: server/unithand.c:1066
msgid "This unit has no moves left."
msgstr "لم يبق لهذه الوØدة أي Øركات."
-#: server/unithand.c:1107
+#: server/unithand.c:1121
msgid "Unit must be on land to perform diplomatic action."
msgstr "يجب أن تكون الوØدة على الأرض لتنÙيذ الأمر الدبلوماسي."
-#: server/unithand.c:1109
+#: server/unithand.c:1123
msgid "No diplomat action possible."
msgstr "لا امكانية لأي أمر دبلوموسي."
-#: server/unithand.c:1125
+#: server/unithand.c:1139
#, c-format
msgid "You must declare war on %s first. Try using players dialog (F3)."
msgstr ""
"يجب عليك إعلان الØرب على %s أولا. جرب استعمال مربع Øوار اللاعبين (F3)."
-#: server/unithand.c:1143
+#: server/unithand.c:1157
msgid "This unit is being transported, and so cannot bombard."
msgstr "يتم نقل هذه الوØدة، ولهذا لا تستطيع القصÙ."
-#: server/unithand.c:1158
+#: server/unithand.c:1172
msgid "You can't attack there."
msgstr "لا تستطيع الهجوم هناك."
-#: server/unithand.c:1180
+#: server/unithand.c:1194
msgid "This type of troops cannot take over a city."
msgstr "لا يستطيع هذا النوع من القوات الاستيلاء على مدينة."
-#: server/unithand.c:1198
+#: server/unithand.c:1212
msgid "A transported unit is not allied to all units or city on target tile."
msgstr ""
"الوØدة المنقولة غير متØالÙØ© مع كل الوØدات أو المدينة على البلاطة المستهدÙØ©."
-#: server/unithand.c:1240
+#: server/unithand.c:1254
#, c-format
msgid "Your %s helps build the %s in %s (%d remaining)."
msgstr "تساعد ÙˆØدتك %s ÙÙŠ بناء ال %s ÙÙŠ %s (%d باقي)."
-#: server/unithand.c:1242
+#: server/unithand.c:1256
#, c-format
msgid "Your %s helps build the %s in %s (%d surplus)."
msgstr "تساعد ÙˆØدتك %s ÙÙŠ بناء ال %s ÙÙŠ %s (%d Ùائض)."
-#: server/unithand.c:1286
+#: server/unithand.c:1300
#, c-format
msgid ""
"Sorry, your %s cannot establish a trade route because it has no home city"
msgstr "آسÙØŒ لا تستطيع ÙˆØدتك %s انشاء طريق للتجارة لعدم وجود مدينة أصل لها"
-#: server/unithand.c:1296
+#: server/unithand.c:1310
#, c-format
msgid "Sorry, your %s cannot establish a trade route between %s and %s"
msgstr "آسÙØŒ لا تستطيع ÙˆØدتك %s انشاء طريق للتجارة بين %s Ùˆ %s"
-#: server/unithand.c:1325 server/unithand.c:1344
+#: server/unithand.c:1339 server/unithand.c:1358
#, c-format
msgid "Sorry, your %s cannot establish a trade route here!"
msgstr "آسÙØŒ لا تستطيع ÙˆØدتك %s انشاء طريق للتجارة هنا!"
-#: server/unithand.c:1329 server/unithand.c:1348
+#: server/unithand.c:1343 server/unithand.c:1362
#, c-format
msgid " The city of %s already has %d better trade routes!"
msgstr " لدى مدينة ال %s أصلا %d طرق تجارة Ø£Ùضل!"
-#: server/unithand.c:1361 server/unithand.c:1373
+#: server/unithand.c:1375 server/unithand.c:1387
#, c-format
msgid "Sorry, %s has canceled the trade route from %s to your city %s."
msgstr "آسÙ, الغى %s طريق التجارة من %s إلى مدينتك %s."
-#: server/unithand.c:1406
+#: server/unithand.c:1420
#, c-format
msgid ""
"Your %s from %s has arrived in %s, and revenues amount to %d in gold and "
@@ -6691,55 +6784,55 @@ msgid "Teleported your %s to %s."
msgstr "تم نقل %s إلى %s."
#. TRANS: A unit is moved to resolve stack conflicts.
-#: server/unittools.c:1065
+#: server/unittools.c:1070
#, fuzzy, c-format
msgid "Moved your %s."
msgstr "تم ØªØ³Ø±ÙŠØ ÙˆØدتك %s."
-#: server/unittools.c:1076
+#: server/unittools.c:1081
#, c-format
msgid "Disbanded your %s."
msgstr "تم ØªØ³Ø±ÙŠØ ÙˆØدتك %s."
-#: server/unittools.c:1397
+#: server/unittools.c:1402
#, c-format
msgid "Unable to defend %s, %s has lost the game."
msgstr "لا يمكن الدÙاع عن %sØŒ خسر %s اللعبة."
-#: server/unittools.c:1401
+#: server/unittools.c:1406
#, c-format
msgid "Losing %s meant losing the game! Be more careful next time!"
msgstr "تعني خسارة %s خسارة اللعبة! كل Øذرا ÙÙŠ المرة القادمة!"
-#: server/unittools.c:1503
+#: server/unittools.c:1508
#, c-format
msgid "%s escaped the destruction of %s, and fled to %s."
msgstr "هرب %s من دمار %s إلى %s."
-#: server/unittools.c:1512
+#: server/unittools.c:1517
#, c-format
msgid "%s lost when %s was lost."
msgstr "خسر %s عند خسارة %s."
-#: server/unittools.c:1561
+#: server/unittools.c:1566
#, c-format
msgid "Barbarian leader captured, %d gold ransom paid."
msgstr "تم القبض على القائد البربري، ودÙع Ùدية ذهب بقيمة %d."
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unittools.c:1579
+#: server/unittools.c:1584
#, fuzzy, c-format
msgid "Your attacking %s succeeded against the %s %s!"
msgstr "نجØت ÙˆØدتك المهاجمة %s ضد %s %s!"
#. TRANS: "Cannon ... the Polish Destroyer."
-#: server/unittools.c:1588 server/unittools.c:1646
+#: server/unittools.c:1593 server/unittools.c:1651
#, fuzzy, c-format
msgid "%s lost to an attack by the %s %s."
msgstr "خسارة %s بسبب الهجوم من %s %s."
#. TRANS: "... Cannon ... the Polish Destroyer ...."
-#: server/unittools.c:1622
+#: server/unittools.c:1627
#, fuzzy, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -6750,14 +6843,14 @@ msgstr[2] "نجØت ÙˆØدتك المهاجمة %s ضد %s %s (Ùˆ %d ÙˆØدات
#. TRANS: "Cannon lost when the Polish Destroyer
#. * attacked the German Musketeers."
-#: server/unittools.c:1655
+#: server/unittools.c:1660
#, fuzzy, c-format
msgid "%s lost when the %s %s attacked the %s %s."
msgstr "تم Ùقد %s عند هجوم %s %s Ù„ %s %s."
#. TRANS: "Musketeers (and Cannon) lost to an
#. * attack from the Polish Destroyer."
-#: server/unittools.c:1670
+#: server/unittools.c:1675
#, fuzzy, c-format
msgid "%s (and %s) lost to an attack from the %s %s."
msgstr "تم Ùقد %s (Ùˆ %s) عند هجوم من %s %s."
@@ -6765,7 +6858,7 @@ msgstr "تم Ùقد %s (Ùˆ %s) عند هجوم من %s %s."
#. TRANS: "Musketeers and 3 other units lost to
#. * an attack from the Polish Destroyer."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1680
+#: server/unittools.c:1685
#, fuzzy, 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."
@@ -6776,7 +6869,7 @@ msgstr[2] "خسارة %s Ùˆ %d ÙˆØدات أخرى لهجوم من %s %s."
#. TRANS: "2 units lost when the Polish Destroyer
#. * attacked the German Musketeers."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1694
+#: server/unittools.c:1699
#, fuzzy, 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."
@@ -6784,173 +6877,215 @@ msgstr[0] "خسارة %d ÙˆØدة عندما هاجم %s %s ال %s %s."
msgstr[1] "خسارة %d ÙˆØدتان عندما هاجم %s %s ال %s %s."
msgstr[2] "خسارة %d ÙˆØدات عندما هاجم %s %s ال %s %s."
-#: server/unittools.c:1962
+#: server/unittools.c:1967
#, c-format
msgid "Your %s was nuked by %s."
msgstr "تم قص٠وØدتك %s Ø¨Ø§Ù„Ø³Ù„Ø§Ø Ø§Ù„Ù†ÙˆÙˆÙŠ من قبل %s."
-#: server/unittools.c:1965 server/unittools.c:1981
+#: server/unittools.c:1970 server/unittools.c:1986
msgid "yourself"
msgstr "Ù†Ùسك"
-#: server/unittools.c:1969
+#: server/unittools.c:1974
#, fuzzy, c-format
msgid "The %s %s was nuked."
msgstr "تم قص٠وØدة %s %s Ø¨Ø§Ù„Ø³Ù„Ø§Ø Ø§Ù„Ù†ÙˆÙˆÙŠ."
-#: server/unittools.c:1978
+#: server/unittools.c:1983
#, c-format
msgid "%s was nuked by %s."
msgstr "تم قص٠%s Ø¨Ø§Ù„Ø³Ù„Ø§Ø Ø§Ù„Ù†ÙˆÙˆÙŠ من قبل %s."
-#: server/unittools.c:1986
+#: server/unittools.c:1991
#, c-format
msgid "You nuked %s."
msgstr "لقد قصÙت %s Ø¨Ø§Ù„Ø³Ù„Ø§Ø Ø§Ù„Ù†ÙˆÙˆÙŠ."
-#: server/unittools.c:2027
+#: server/unittools.c:2032
#, fuzzy, c-format
msgid "The %s detonated a nuke!"
msgstr "Ùجر %s سلاØا نوويا!"
-#: server/unittools.c:2051
+#: server/unittools.c:2056
#, c-format
msgid "%s transported successfully."
msgstr "تم نقل %s بنجاØ."
-#: server/unittools.c:2103
+#: server/unittools.c:2108
msgid "This unit type can not be paradropped."
msgstr "لا يمكن اسقاط نوع هذه الوØدة بالمظلة."
-#: server/unittools.c:2113
+#: server/unittools.c:2118
#, fuzzy
msgid "You cannot paradrop a unit that is transporting other units."
msgstr "لا تستطيع اسقاط ÙˆØدة منقولة بالمظلة."
-#: server/unittools.c:2119
+#: server/unittools.c:2124
msgid "The destination location is not known."
msgstr "موقع الاتجاه مجهول."
-#: server/unittools.c:2126
+#: server/unittools.c:2131
#, c-format
msgid "This unit cannot paradrop into %s."
msgstr "لا تستطيع اسقاط هذه الوØدة بالمظلة على %s."
-#: server/unittools.c:2146
+#: server/unittools.c:2151
#, c-format
msgid "The distance to the target (%i) is greater than the unit's range (%i)."
msgstr "المساÙØ© إلى الهد٠(%i) أكبر من مدى تØرك الوØدة (%i)."
-#: server/unittools.c:2157
+#: server/unittools.c:2162
#, c-format
msgid "Your %s paradropped into the %s and was lost."
msgstr "تم اسقاط ÙˆØدتك %s بالمظلة على %sØŒ ÙˆÙقدانها."
-#: server/unittools.c:2170
+#: server/unittools.c:2175
#, c-format
msgid "Your %s was killed by enemy units at the paradrop destination."
msgstr "تم قتل ÙˆØدتك %s من قبل ÙˆØدات العدو عند موقع اسقاط المظليين."
-#: server/unittools.c:2192
+#: server/unittools.c:2197
#, c-format
msgid "You found %d gold."
msgstr "لقد عثرت على %d من الذهب."
-#: server/unittools.c:2209
+#: server/unittools.c:2214
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr "لقد عثرت على %s ÙÙŠ مخطوطات قديمة للØكمة."
-#: server/unittools.c:2216
+#: server/unittools.c:2221
#, c-format
msgid "The %s have acquired %s from ancient scrolls of wisdom."
msgstr "Øصل %s على %s من مخطوطات Øكمة قديمة."
-#: server/unittools.c:2230
+#: server/unittools.c:2235
msgid "A band of friendly mercenaries joins your cause."
msgstr "تنضم زمرة من المرتزقة إلى قضيتك."
-#: server/unittools.c:2248
+#: server/unittools.c:2253
msgid "An abandoned village is here."
msgstr "توجد قرية مهجورة هنا."
-#: server/unittools.c:2258
+#: server/unittools.c:2263
msgid "You have unleashed a horde of barbarians!"
msgstr "لقد أطلقت العنان Ù„Øشود من البرابرة!"
-#: server/unittools.c:2261
+#: server/unittools.c:2266
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr "تم قتل ÙˆØدتك %s من قبل البرابرة!"
-#: server/unittools.c:2277
+#: server/unittools.c:2282
msgid "You found a friendly city."
msgstr "لقد عثرت على مدينة صديقة."
-#: server/unittools.c:2291
+#: server/unittools.c:2296
msgid "Friendly nomads are impressed by you, and join you."
msgstr "أعجب بدو وديون بك، وانضموا إليك."
-#: server/unittools.c:2316
+#: server/unittools.c:2321
#, fuzzy
msgid "Your overflight frightens the tribe; they scatter in terror."
msgstr "ملكك."
-#: server/unittools.c:2574
+#: server/unittools.c:2579
#, c-format
msgid "Orders for %s aborted after enemy movement was spotted."
msgstr "تم الغاء الأوامر Ù„ %s بعد اكتشا٠تØرك للعدو."
-#: server/unittools.c:3023
+#: server/unittools.c:3028
#, c-format
msgid "Orders for %s aborted as there are units nearby."
msgstr "تم الغاء الأوامر Ù„ %s عن العمل لوجود ÙˆØدات قريبة."
-#: server/unittools.c:3075
+#: server/unittools.c:3080
#, c-format
msgid "Orders for %s aborted because building of city failed."
msgstr "تم الغاء الأوامر Ù„ %s عن العمل Ù„Ùشل بناء مدينة."
-#: server/unittools.c:3088
+#: server/unittools.c:3093
#, c-format
msgid "Orders for %s aborted since they give an invalid activity."
msgstr "تم الغاء الأوامر ل %s عن العمل لاعطائهم نشاط خاطئ."
-#: server/unittools.c:3102
+#: server/unittools.c:3107
#, c-format
msgid "Orders for %s aborted since they give an invalid location."
msgstr "تم الغاء الأوامر ل %s عن العمل لاعطائهم موقع خاطئ."
-#: server/unittools.c:3112
+#: server/unittools.c:3117
#, c-format
msgid "Orders for %s aborted as there are units in the way."
msgstr "تم الغاء الأوامر Ù„ %s عن العمل لوجود ÙˆØدات على الطريق."
-#: server/unittools.c:3138
+#: server/unittools.c:3143
#, c-format
msgid "Orders for %s aborted because of failed move."
msgstr "تم الغاء الأوامر Ù„ %s عن العمل Ù„Øركة Ùاشلة."
-#: server/unittools.c:3179
+#: server/unittools.c:3184
#, c-format
msgid "Attempt to change homecity for %s failed."
msgstr "Ùشل Ù…Øاولة تغيير مدينة المنشأ Ù„ %s."
-#: server/unittools.c:3190
+#: server/unittools.c:3195
#, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr "Ùشل Ù…Øاولة انشاء طريق للتجارة Ù„ %s."
-#: server/unittools.c:3202
+#: server/unittools.c:3207
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr "Ùشل Ù…Øاولة بناء أعجوبة Ù„ %s."
-#: server/unittools.c:3211
+#: server/unittools.c:3216
#, c-format
msgid "Your %s has invalid orders."
msgstr "لدى ÙˆØدتك %s أوامر خاطئة."
+#: server/voting.c:522
+#, fuzzy, c-format
+msgid ""
+"%s %d \"%s\" is passed %d to %d with %d abstentions and %d who did not vote."
+msgstr "Ù†Ø¬Ø Ø§Ù„ØªØµÙˆÙŠØª \"%s\" ب %d إلى %d ØŒ مع %d ممتنع."
+
+#: server/voting.c:528
+#, fuzzy, c-format
+msgid ""
+"%s %d \"%s\" failed with %d against, %d for, %d abstentions and %d who did "
+"not vote."
+msgstr "Ùشل التصويت \"%s\" ب %d ضد, %d مع ØŒ Ùˆ %d ممتنع."
+
+#: server/voting.c:548
+#, c-format
+msgid "%s %d: %s voted yes."
+msgstr ""
+
+#: server/voting.c:553
+#, c-format
+msgid "%s %d: %s voted no."
+msgstr ""
+
+#: server/voting.c:558
+#, c-format
+msgid "%s %d: %s chose to abstain."
+msgstr ""
+
+#. TRANS: Describing a new vote that can only pass
+#. * if there are no dissenting votes.
+#: server/voting.c:726
+#, c-format
+msgid "%s (needs %0.0f%% and no dissent)."
+msgstr ""
+
+#. TRANS: Describing a new vote that can pass only if the
+#. * given percentage of players votes 'yes'.
+#: server/voting.c:732
+#, c-format
+msgid "%s (needs %0.0f%% in favor)."
+msgstr ""
+
#: server/generator/mapgen.c:1771
msgid "High landmass - this may take a few seconds."
msgstr "كتلة أرض عالية - هذا سيأخد بعض الثواني."
@@ -6978,12 +7113,12 @@ msgid ""
"Please report this bug at %s."
msgstr "الـ."
-#: client/attribute.c:363
+#: client/attribute.c:368
msgid ""
"There has been a CMA error. Your citizen governor settings may be broken."
msgstr "خطأ CMA. يمكن أن تكون اعدادات Øاكم المواطنيين غير صالØØ©."
-#: client/attribute.c:367
+#: client/attribute.c:372
msgid "Old attributes detected and removed."
msgstr "تم الكش٠عن صÙات قديمة وازالتها."
@@ -7132,41 +7267,41 @@ msgstr "%+4d : المواطنيين\n"
msgid "%+4d : Taxed from trade\n"
msgstr "%+4d : Ù…Ùروض عليه ضريبة من التجارة\n"
-#: client/citydlg_common.c:418
+#: client/citydlg_common.c:421
#, c-format
msgid "%+4d : Trade route with %s\n"
msgstr "%+4d : طريق تجارة مع %s\n"
-#: client/citydlg_common.c:427
+#: client/citydlg_common.c:430
#, c-format
msgid "%+4d : Building tithes\n"
msgstr "%+4d : جاري بناء الأعشار\n"
-#: client/citydlg_common.c:450
+#: client/citydlg_common.c:453
#, c-format
msgid "%+4d : Bonus from %s (%+d%%)\n"
msgstr "%+4d : مكاÙأة من %s (%+d%%)\n"
-#: client/citydlg_common.c:462
+#: client/citydlg_common.c:465
#, c-format
msgid "%+4d : Waste\n"
msgstr "%+4d : النÙاية\n"
-#: client/citydlg_common.c:468
+#: client/citydlg_common.c:471
#, c-format
msgid "%+4d : Disorder\n"
msgstr "%+4d : الÙوضى\n"
-#: client/citydlg_common.c:474
+#: client/citydlg_common.c:477
#, c-format
msgid "%+4d : Used\n"
msgstr "%+4d : مستعمل\n"
-#: client/citydlg_common.c:479
+#: client/citydlg_common.c:482
msgid "==== : Adds up to\n"
msgstr "==== : يضي٠إلى\n"
-#: client/citydlg_common.c:481
+#: client/citydlg_common.c:484
#, c-format
msgid "%4d : Total surplus"
msgstr "%4d : مجموع الÙائض"
@@ -7485,52 +7620,52 @@ msgstr "?specialist:Ø®"
msgid "Specialists"
msgstr "الإختصاصيون"
-#: client/civclient.c:240
+#: client/civclient.c:241
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr " -a, --autoconnect\tتخطي مربع Øوار الاتصال\n"
-#: client/civclient.c:250
+#: client/civclient.c:251
msgid " -l, --log FILE\tUse FILE as logfile (spawned server also uses this)\n"
msgstr ""
" -l, --log FILE\tستعمل FILE كمل٠السجل (يمكن أن يستعمله الخادم أيضا)\n"
-#: client/civclient.c:252
+#: client/civclient.c:253
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr " -m, --meta HOST\tاتصال إلى metaserver على عنوان HOST\n"
-#: client/civclient.c:254
+#: client/civclient.c:255
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr " -n, --name NAME\tاستعمال NAME كاسم\n"
-#: client/civclient.c:256
+#: client/civclient.c:257
#, fuzzy
msgid " -p, --port PORT\tConnect to server port PORT (usually with -a)\n"
msgstr " -p, --port PORT\tالاتصال بالخادم على منÙد PORT\n"
-#: client/civclient.c:258
+#: client/civclient.c:259
#, c-format
msgid " -P, --Plugin PLUGIN\tUse PLUGIN for sound output %s\n"
msgstr " -P, --Plugin PLUGIN\tستعمال PLUGIN لمخرج الصوت %s\n"
-#: client/civclient.c:260
+#: client/civclient.c:261
msgid " -r, --read FILE\tRead startup script FILE (for spawned server only)\n"
msgstr ""
-#: client/civclient.c:263
+#: client/civclient.c:264
#, fuzzy
msgid " -s, --server HOST\tConnect to the server at HOST (usually with -a)\n"
msgstr " -s, --server HOST\tالاتصال بالخادم على العنوان HOST\n"
-#: client/civclient.c:265
+#: client/civclient.c:266
#, fuzzy
msgid " -S, --Sound FILE\tRead sound tags from FILE\n"
msgstr "أس - الØر٠التاسع عشر ÙÙŠ اللغة الإنجليزية الصوت"
-#: client/civclient.c:266
+#: client/civclient.c:267
msgid " -t, --tiles FILE\tUse data file FILE.tilespec for tiles\n"
msgstr ""
-#: client/civclient.c:269
+#: client/civclient.c:270
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7538,45 +7673,45 @@ msgid ""
msgstr ""
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:274
+#: client/civclient.c:275
#, fuzzy, c-format
msgid "Report bugs at %s\n"
msgstr "ارسل تقارير المشاكل إلى <%s>.\n"
-#: client/civclient.c:298
+#: client/civclient.c:299
#, fuzzy, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr "العاجز مع"
-#: client/civclient.c:300 client/civclient.c:315
+#: client/civclient.c:301 client/civclient.c:316
msgid "Try using --help.\n"
msgstr "Øاول استعمال --help.\n"
-#: client/civclient.c:313
+#: client/civclient.c:314
#, fuzzy, c-format
msgid "Invalid debug level \"%s\" specified with --debug option.\n"
msgstr "العاجز مع"
-#: client/civclient.c:326
+#: client/civclient.c:327
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr "الخيار غير معتر٠به: \"%s\"\n"
-#: client/civclient.c:391
+#: client/civclient.c:393
#, fuzzy, c-format
msgid "Updating old metaserver address \"%s\"."
msgstr "metaserver <عنوان انترنت>"
-#: client/civclient.c:394
+#: client/civclient.c:396
#, fuzzy, c-format
msgid "Default metaserver has been set to \"%s\"."
msgstr "الخيار: %s تم تغييره إلى \"%s\"."
-#: client/civclient.c:550
+#: client/civclient.c:540
msgid "Game started."
msgstr "تم بدء اللعبة."
-#: client/civclient.c:588
+#: client/civclient.c:606
msgid "There was an error while auto connecting; aborting."
msgstr "Øصل خطأ عند إعادة الاتصال التلقائي، سيتم الالغاء."
@@ -7707,76 +7842,76 @@ msgstr "جاري الإتّصال."
msgid "Disconnected from server."
msgstr "تم الانÙصال عن الخادم."
-#: client/clinet.c:469
+#: client/clinet.c:473
#, fuzzy, c-format
msgid "Failed to contact server \"%s\" at port %d as \"%s\" after %d attempts"
msgstr "Ùاشل"
-#: client/clinet.c:484 client/clinet.c:486
+#: client/clinet.c:488 client/clinet.c:490
msgid "Connection to server refused. Please start the server."
msgstr "الإتّصال بالخادم مرÙوض. رجاء شغّل الخادم."
-#: client/clinet.c:495 client/clinet.c:523
+#: client/clinet.c:499 client/clinet.c:527
#, fuzzy, c-format
msgid ""
"Error contacting server \"%s\" at port %d as \"%s\":\n"
" %s\n"
msgstr "الخطأ\n"
-#: client/clinet.c:514
+#: client/clinet.c:518
#, fuzzy, c-format
msgid ""
"Auto-connecting to server \"%s\" at port %d as \"%s\" every %f second(s) for "
"%d times"
msgstr "السّيّارة"
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
+#: client/connectdlg_common.c:78 client/gui-gtk-2.0/pages.c:1358
msgid "novice"
msgstr "مبتدئ"
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1358
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
msgid "easy"
msgstr "سهل"
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1359
msgid "normal"
msgstr "عادي"
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr "صعب"
-#: client/connectdlg_common.c:83
+#: client/connectdlg_common.c:82
msgid "experimental"
msgstr "تجريبي"
-#: client/connectdlg_common.c:213
+#: client/connectdlg_common.c:212
msgid "Starting server..."
msgstr "جاري تشغيل الخادم..."
-#: client/connectdlg_common.c:332
+#: client/connectdlg_common.c:331
msgid "Couldn't start the server."
msgstr "Ùشل بدء الخادم."
-#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
+#: client/connectdlg_common.c:332 client/connectdlg_common.c:365
msgid "You'll have to start one manually. Sorry..."
msgstr "يجب عليك بدء هذا يدويا. متأسÙ..."
-#: client/connectdlg_common.c:364
+#: client/connectdlg_common.c:363
msgid "Couldn't connect to the server."
msgstr "لا يمكن الاتصال بالخادم."
-#: client/connectdlg_common.c:365
+#: client/connectdlg_common.c:364
msgid "We probably couldn't start it from here."
msgstr "لن نستطيع غالبا تشغيلها من هنا."
-#: client/connectdlg_common.c:470
+#: client/connectdlg_common.c:469
#, fuzzy
msgid ""
"Established control over the server. You have command access level 'hack'."
msgstr "Ù†ØÙ†"
-#: client/connectdlg_common.c:475
+#: client/connectdlg_common.c:474
msgid ""
"Failed to obtain the required access level to take control of the server. "
"The server will now be shutdown."
@@ -7786,27 +7921,27 @@ msgstr ""
msgid "Only transporter units can be unloaded."
msgstr "يمكن Ùقط تنزيل الوØدات المنقولة."
-#: client/control.c:1425
+#: client/control.c:1417
msgid "Only settler units can be put into auto mode."
msgstr "يمكن Ùقط وضع الوØدات المستعمرة ÙÙŠ النمط التلقائي."
-#: client/control.c:1516
+#: client/control.c:1511
msgid "Only nuclear units can do this."
msgstr "تستطيع Ùقط الوØدات النووية Ùعل هذا."
-#: client/control.c:1545
+#: client/control.c:1540
msgid "Only paratrooper units can do this."
msgstr "تستطيع Ùقط الوØدات المظلية Ùعل هذا."
-#: client/control.c:2020
+#: client/control.c:2015
msgid "Too far for this unit."
msgstr "بعيد جدا لهذه الوØدة."
-#: client/control.c:2230 client/control.c:2260 client/control.c:2276
+#: client/control.c:2225 client/control.c:2255 client/control.c:2271
msgid "Didn't find a route to the destination!"
msgstr "Ùشل العثور على طريق إلى الاتجاه المقصود!"
-#: client/control.c:2320
+#: client/control.c:2315
msgid "Oh my! You seem to have no capital!"
msgstr "أوه يا! يبدو أنك بدون عاصمة!"
@@ -8228,116 +8363,124 @@ msgstr "* يخÙض %s المخاطرة إلى 12%%.\n"
#. * last two elements
#. TRANS: List of possible output types has this between
#. * last two elements
-#: client/helpdata.c:1066 client/helpdata.c:1400
+#: client/helpdata.c:1066 client/helpdata.c:1408
msgid " or "
msgstr " أو "
-#: client/helpdata.c:1068 client/helpdata.c:1388
+#: client/helpdata.c:1068 client/helpdata.c:1396
msgid "?or:, "
msgstr "?or:، "
-#: client/helpdata.c:1080
+#: client/helpdata.c:1079
+#, fuzzy, c-format
+msgid "* Unit has to be in a city, or a base after %d turn.\n"
+msgid_plural "* Unit has to be in a city, or a base after %d turns.\n"
+msgstr[0] "الوØدة دوران"
+msgstr[1] "الوØدة دوران"
+msgstr[2] "الوØدة دوران"
+
+#: client/helpdata.c:1087
#, 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"
+msgid "* Unit has to be in a city, a base, or on a %s after %d turn.\n"
+msgid_plural "* Unit has to be in a city, a base, or on a %s after %d turns.\n"
msgstr[0] "الوØدة دوران"
msgstr[1] "الوØدة دوران"
msgstr[2] "الوØدة دوران"
-#: client/helpdata.c:1122
+#: client/helpdata.c:1130
#, fuzzy, c-format
msgid "If we would now start with %s we would need %d bulbs."
msgstr "إذا مع."
-#: client/helpdata.c:1127
+#: client/helpdata.c:1135
#, 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:1135
+#: client/helpdata.c:1143
msgid "You cannot research this technology."
msgstr "لا تستطيع بØØ« هذه التكنولوجيا."
-#: client/helpdata.c:1139
+#: client/helpdata.c:1147
msgid " This number may vary depending on what other players will research.\n"
msgstr "هذا الرقم متغيير Øسب أبØاث اللاعبيين اﻵخرين.\n"
-#: client/helpdata.c:1151
+#: client/helpdata.c:1159
#, fuzzy, c-format
msgid "* The first player to research %s gets an immediate advance.\n"
msgstr "الـ"
-#: client/helpdata.c:1156
+#: client/helpdata.c:1164
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
msgstr "* يخÙض من Ùرصة خسارة مراكب ÙÙŠ الأمواج العارمة إلى 25%%.\n"
-#: client/helpdata.c:1159
+#: client/helpdata.c:1167
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
msgstr "* يخÙض من Ùرصة خسارة مراكب ÙÙŠ الأمواج العارمة إلى 12%%.\n"
-#: client/helpdata.c:1163
+#: client/helpdata.c:1171
msgid "* Increases the pollution generated by the population.\n"
msgstr "* يزيد من التلوث الصادر من عدد السكان.\n"
-#: client/helpdata.c:1168
+#: client/helpdata.c:1176
#, c-format
msgid "* Allows %s to build roads on river squares.\n"
msgstr "* ÙŠØ³Ù…Ø %s ببناء طرق على مربعات الأنهار.\n"
-#: client/helpdata.c:1175
+#: client/helpdata.c:1183
#, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr "* ÙŠØ³Ù…Ø %s ببناء القلاع.\n"
-#: client/helpdata.c:1183
+#: client/helpdata.c:1191
#, c-format
msgid "* Allows %s to build airbases.\n"
msgstr "* ÙŠØ³Ù…Ø %s ببناء القواعد الجوية.\n"
-#: client/helpdata.c:1192
+#: client/helpdata.c:1200
#, c-format
msgid "* Allows %s to upgrade roads to railroads.\n"
msgstr "* ÙŠØ³Ù…Ø %s بتطوير الطرق إلى سكك Øديدية.\n"
-#: client/helpdata.c:1200
+#: client/helpdata.c:1208
#, c-format
msgid "* Allows %s to upgrade irrigation to farmland.\n"
msgstr "* ÙŠØ³Ù…Ø %s بتطوير قنوات الري إلى أرض زراعية.\n"
-#: client/helpdata.c:1234
+#: client/helpdata.c:1242
msgid "* Pollution cannot be generated on this terrain."
msgstr "* لا تستطيع توليد التلوث على هذه التضاريص."
-#: client/helpdata.c:1239
+#: client/helpdata.c:1247
msgid "* You cannot build cities on this terrain."
msgstr "* لا تستطيع بناء المدن على هذه التضاريص."
-#: client/helpdata.c:1245
+#: client/helpdata.c:1253
msgid "* The coastline of this terrain is unsafe."
msgstr "* الشريط الساØلي لهذه التضاريص خطر."
-#: client/helpdata.c:1250
+#: client/helpdata.c:1258
msgid "* This terrain is unsafe for units to travel on."
msgstr "* هذه التضاريص خطرة لترØال الوØدات عليها."
-#: client/helpdata.c:1255
+#: client/helpdata.c:1263
msgid "* Land units cannot travel on oceanic terrains."
msgstr "* لا تستطيع الوØدات الأرضية الترØال على تضاريص Ù…Øيطية."
-#: client/helpdata.c:1305
+#: client/helpdata.c:1313
msgid "Features:\n"
msgstr "الميزّات:\n"
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1411 client/helpdata.c:1412
+#: client/helpdata.c:1419 client/helpdata.c:1420
msgid "?outputlist: Nothing "
msgstr ""
-#: client/helpdata.c:1419
+#: client/helpdata.c:1427
#, fuzzy, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -8349,7 +8492,7 @@ msgstr[0] "عسكري"
msgstr[1] "عسكري"
msgstr[2] "عسكري"
-#: client/helpdata.c:1429
+#: client/helpdata.c:1437
#, fuzzy, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8357,23 +8500,23 @@ msgid ""
msgstr "كلّ :: كلّ امرئ :: لكل قطعة :: لكل واØد"
#. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1437
+#: client/helpdata.c:1445
#, fuzzy, c-format
msgid "* You pay %d times normal %s upkeep for your units.\n"
msgstr "أنت عادي"
-#: client/helpdata.c:1442
+#: client/helpdata.c:1450
#, 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:1447
+#: client/helpdata.c:1455
#, fuzzy, c-format
msgid "* You pay no %s upkeep for your units.\n"
msgstr "أنت عادي"
-#: client/helpdata.c:1451
+#: client/helpdata.c:1459
#, fuzzy
msgid "* You pay no upkeep for your units.\n"
msgstr "أنت عادي"
@@ -8381,25 +8524,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:1460
+#: client/helpdata.c:1468
#, 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:1468
+#: client/helpdata.c:1476
#, fuzzy, c-format
msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
msgstr "كلّ :: كلّ امرئ :: لكل قطعة :: لكل واØد ÙˆØدات"
-#: client/helpdata.c:1475
+#: client/helpdata.c:1483
#, 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:1482
+#: client/helpdata.c:1490
#, fuzzy, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -8407,24 +8550,24 @@ msgid ""
msgstr "الـ مواطنيين الØجم"
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1489
+#: client/helpdata.c:1497
#, 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:1497
+#: client/helpdata.c:1505
#, fuzzy, c-format
msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
msgstr "الـ الذهب"
-#: client/helpdata.c:1502
+#: client/helpdata.c:1510
#, fuzzy
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr "له الذهب"
-#: client/helpdata.c:1507
+#: client/helpdata.c:1515
#, fuzzy, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -8436,7 +8579,7 @@ msgstr[0] "ملكك كلّ :: كلّ امرئ :: لكل قطعة :: لكل وا
msgstr[1] "ملكك كلّ :: كلّ امرئ :: لكل قطعة :: لكل واØد ÙˆØدات"
msgstr[2] "ملكك كلّ :: كلّ امرئ :: لكل قطعة :: لكل واØد ÙˆØدات"
-#: client/helpdata.c:1519
+#: client/helpdata.c:1527
#, 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"
@@ -8445,69 +8588,69 @@ msgstr[1] "أي - الØر٠الأوّل ÙÙŠ الأبجديّة اللّاتي
msgstr[2] "أي - الØر٠الأوّل ÙÙŠ الأبجديّة اللّاتينيّة"
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1530
+#: client/helpdata.c:1538
#, 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:1536
+#: client/helpdata.c:1544
#, fuzzy
msgid "* Your units cannot be bribed.\n"
msgstr "ملكك"
-#: client/helpdata.c:1539
+#: client/helpdata.c:1547
#, fuzzy
msgid "* Your cities cannot be incited.\n"
msgstr "ملكك"
-#: client/helpdata.c:1543
+#: client/helpdata.c:1551
#, 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:1549
+#: client/helpdata.c:1557
#, fuzzy
msgid "* Has a senate that may prevent declaration of war.\n"
msgstr "له"
-#: client/helpdata.c:1553
+#: client/helpdata.c:1561
#, fuzzy
msgid "* Allows partisans when cities are taken by the enemy.\n"
msgstr "يسمØ"
-#: client/helpdata.c:1557
+#: client/helpdata.c:1565
#, fuzzy
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
msgstr "المباني :: العمارات الذهب"
-#: client/helpdata.c:1561
+#: client/helpdata.c:1569
#, fuzzy
msgid "* Pays no upkeep for fanatics.\n"
msgstr "الدÙعات"
-#: client/helpdata.c:1564
+#: client/helpdata.c:1572
#, fuzzy
msgid "* Has no unhappy citizens.\n"
msgstr "له"
-#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
+#: client/helpdata.c:1582 client/helpdata.c:1586 client/helpdata.c:1590
#, fuzzy, c-format
msgid "* Veteran %s units.\n"
msgstr "الخبير"
-#: client/helpdata.c:1585
+#: client/helpdata.c:1593
#, fuzzy
msgid "* Veteran units.\n"
msgstr "الخبير"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1591
+#: client/helpdata.c:1599
#, fuzzy, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8515,7 +8658,7 @@ msgid ""
msgstr "كلّ :: كلّ امرئ :: لكل قطعة :: لكل واØد"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1600
+#: client/helpdata.c:1608
#, fuzzy, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8523,71 +8666,71 @@ msgid ""
msgstr "كلّ :: كلّ امرئ :: لكل قطعة :: لكل واØد مع"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1608
+#: client/helpdata.c:1616
#, 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:1617
+#: client/helpdata.c:1625
#, 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:1625
+#: client/helpdata.c:1633
#, 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:1630
+#: client/helpdata.c:1638
#, 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:1635
+#: client/helpdata.c:1643
#, 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:1643
+#: client/helpdata.c:1651
#, 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:1649
+#: client/helpdata.c:1657
#, 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:1655
+#: client/helpdata.c:1663
#, fuzzy, c-format
msgid "* %s waste will increase slowly with distance from capital.\n"
msgstr "مع"
-#: client/helpdata.c:1672
+#: client/helpdata.c:1680
#, c-format
msgid "* Allows you to build %s.\n"
msgstr "* ÙŠØ³Ù…Ø Ù„Ùƒ ببناء %s.\n"
#. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1699
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d %s"
msgstr "%s%d %s"
-#: client/helpdata.c:1700 client/helpdata.c:1708 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1708 client/helpdata.c:1716 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:1707
+#: client/helpdata.c:1715
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d تعساء"
@@ -8659,7 +8802,7 @@ msgid ""
"or with the -a command-line parameter."
msgstr "هذا مع."
-#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:916 data/Freeciv.in:107
msgid "Metaserver"
msgstr "Metaserver"
@@ -9077,36 +9220,36 @@ msgstr "Ùشل الØÙظ، لا يمكن الكتابة على مل٠%s"
msgid "Saved settings to file %s"
msgstr "تم ØÙظ الاعدادات على المل٠%s"
-#: client/packhand.c:211 client/packhand.c:217
+#: client/packhand.c:212 client/packhand.c:218
#, fuzzy
msgid "You were rejected from the game...."
msgstr "تم رÙضك من اللعبة:"
-#: client/packhand.c:229
+#: client/packhand.c:230
#, fuzzy, c-format
msgid "Client capability string: %s"
msgstr "الزبون"
-#: client/packhand.c:232
+#: client/packhand.c:233
#, fuzzy, c-format
msgid "Server capability string: %s"
msgstr "الخادم"
-#: client/packhand.c:850
+#: client/packhand.c:864
#, c-format
msgid "Start of turn %d"
msgstr "بداية الدور %d"
-#: client/packhand.c:1591
+#: client/packhand.c:1621
#, c-format
msgid "AI Mode is now %s."
msgstr "نمط ذ.ا هو اﻵن %s."
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "ON"
msgstr "شغال"
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "OFF"
msgstr "مطÙئ"
@@ -9137,15 +9280,15 @@ msgstr "?Player:الاسم"
msgid "Username"
msgstr "اسم المستخدم"
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
-#: client/gui-gtk-2.0/pages.c:2157
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:653
+#: client/gui-gtk-2.0/pages.c:1604 client/gui-gtk-2.0/pages.c:2159
msgid "Flag"
msgstr "علم"
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1605
-#: client/gui-gtk-2.0/pages.c:2159 client/gui-sdl/repodlgs.c:2063
-#: client/gui-win32/connectdlg.c:990 client/gui-win32/dialogs.c:542
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:657
+#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1609
+#: client/gui-gtk-2.0/pages.c:2161 client/gui-sdl/repodlgs.c:2063
+#: client/gui-win32/connectdlg.c:992 client/gui-win32/dialogs.c:542
#: client/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "أمة"
@@ -9158,7 +9301,7 @@ msgstr "Øدود"
msgid "Score"
msgstr "نتيجة"
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1614
msgid "Team"
msgstr "Ùريق"
@@ -9191,36 +9334,36 @@ msgstr "?Player_dlg:عاطل"
msgid "Ping"
msgstr "بينج"
-#: client/repodlgs_common.c:375
+#: client/repodlgs_common.c:378
msgid "You cannot sell improvements."
msgstr "لا تستطيع بيع التØسينات."
-#: client/repodlgs_common.c:391
+#: client/repodlgs_common.c:394
#, c-format
msgid "Sold %d %s for %d gold."
msgstr "تم بيع %d %s ب %d ذهب."
-#: client/repodlgs_common.c:396
+#: client/repodlgs_common.c:399
#, c-format
msgid "No %s could be sold."
msgstr "لا يمكن بيع %s."
#. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:415
+#: client/repodlgs_common.c:418
msgid "You cannot disband units."
msgstr "لا تستطيع ØªØ³Ø±ÙŠØ Ø§Ù„ÙˆØدات."
-#: client/repodlgs_common.c:420
+#: client/repodlgs_common.c:423
#, c-format
msgid "%s cannot be disbanded."
msgstr "لا يمكن ØªØ³Ø±ÙŠØ %s."
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:444
#, c-format
msgid "Disbanded %d %s."
msgstr "تم ØªØ³Ø±ÙŠØ %d %s."
-#: client/repodlgs_common.c:445
+#: client/repodlgs_common.c:448
#, c-format
msgid "No %s could be disbanded."
msgstr "لا يمكن ØªØ³Ø±ÙŠØ %s."
@@ -9827,47 +9970,47 @@ msgstr ""
msgid "?duration:overflow"
msgstr "?duration:Ùائض"
-#: client/text.c:1143
+#: client/text.c:1145
#, c-format
msgid "%6d.%02d ms"
msgstr "%6d.%02d ملي ثانية"
#. TRANS: <nation adjective> <government name>.
#. * E.g. "Polish Republic".
-#: client/text.c:1188
+#: client/text.c:1193
#, fuzzy, c-format
msgid "?nationgovernment:%s %s"
msgstr "الØكومة: %s"
#. TRANS: "Observer: 1985"
-#: client/text.c:1198
+#: client/text.c:1203
#, c-format
msgid "Observer: %s"
msgstr "المراقب : %s"
-#: client/text.c:1216
+#: client/text.c:1221
msgid "Buildings: "
msgstr "المباني : "
-#: client/text.c:1233 client/text.c:1272
+#: client/text.c:1238 client/text.c:1277
msgid "None. "
msgstr "لا شيئ. "
-#: client/text.c:1235 client/text.c:1274
+#: client/text.c:1240 client/text.c:1279
msgid "?clistend:."
msgstr "."
-#: client/text.c:1253
+#: client/text.c:1258
msgid "Wonders: "
msgstr "العجائب: "
-#: client/text.c:1308
+#: client/text.c:1313
#, 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:1312
+#: client/text.c:1317
#, fuzzy, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
@@ -9876,7 +10019,7 @@ msgstr[1] "%d السعادة قبل العقوبة مع"
msgstr[2] "%d السعادة قبل العقوبة مع"
#. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1318
+#: client/text.c:1323
#, fuzzy, c-format
msgid "%d additional unhappy citizen."
msgid_plural "%d additional unhappy citizens."
@@ -9884,12 +10027,12 @@ msgstr[0] "%d مواطنين تعيسيين إضاÙيين."
msgstr[1] "%d مواطنين تعيسيين إضاÙيين."
msgstr[2] "%d مواطنين تعيسيين إضاÙيين."
-#: client/text.c:1339
+#: client/text.c:1344
#, fuzzy
msgid "Unlimited martial law in effect."
msgstr "الØكم العرÙÙŠ موجود ("
-#: client/text.c:1341
+#: client/text.c:1346
#, fuzzy, c-format
msgid "%d military unit may impose martial law."
msgid_plural "Up to %d military units may impose martial law."
@@ -9897,7 +10040,7 @@ msgstr[0] "أي - الØر٠الأوّل ÙÙŠ الأبجديّة اللّاتي
msgstr[1] "أي - الØر٠الأوّل ÙÙŠ الأبجديّة اللّاتينيّة ÙˆØدات الهجوم"
msgstr[2] "أي - الØر٠الأوّل ÙÙŠ الأبجديّة اللّاتينيّة ÙˆØدات الهجوم"
-#: client/text.c:1345
+#: client/text.c:1350
#, fuzzy, c-format
msgid "Each military unit makes %d unhappy citizen content."
msgid_plural "Each military unit makes %d unhappy citizens content."
@@ -9905,38 +10048,38 @@ msgstr[0] "يسلّي."
msgstr[1] "يسلّي."
msgstr[2] "يسلّي."
-#: client/text.c:1352
+#: client/text.c:1357
msgid "Military units in the field may cause unhappiness. "
msgstr "يمكن للوØدات العسكرية ÙÙŠ الميدان أن تسبب التعاسة. "
-#: client/text.c:1355
+#: client/text.c:1360
msgid "Military units have no happiness effect. "
msgstr "لا يوجد للوØدات العسكرية تأثير على السعادة. "
-#: client/text.c:1370
+#: client/text.c:1375
#, c-format
msgid "Luxury: %d total."
msgstr "الرÙاهية: %d المجموع."
-#: client/tilespec.c:865
+#: client/tilespec.c:882
#, fuzzy
msgid "No usable default tileset found, aborting!"
msgstr "لا!"
-#: client/tilespec.c:1338
+#: client/tilespec.c:1355
#, fuzzy
msgid ""
"Client does not support isometric tilesets. Using default tileset instead."
msgstr "الزبون الإستعمال."
-#: client/tilespec.c:1347
+#: client/tilespec.c:1364
#, fuzzy
msgid ""
"Client does not support overhead view tilesets. Using default tileset "
"instead."
msgstr "الزبون الإستعمال."
-#: client/tilespec.c:3966
+#: client/tilespec.c:3987
#, fuzzy, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -10618,7 +10761,7 @@ msgid "_Display"
msgstr "ا_ظهار"
#: client/gui-gtk-2.0/cityrep.c:1006 client/gui-gtk-2.0/menu.c:839
-#: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
+#: client/gui-sdl/diplodlg.c:692 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
#: client/gui-xaw/cityrep.c:533 client/gui-xaw/menu.c:156
@@ -10788,197 +10931,197 @@ msgstr "ماذا تريدنا أن نسمي التجهيز المسبق?"
msgid "Remove this preset?"
msgstr "هل تريد إزالة هذا التجهيز المسبق?"
-#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:222
+#: client/gui-gtk-2.0/dialogs.c:197 client/gui-gtk-2.0/messagewin.c:222
msgid "Goto _Location"
msgstr "الذهاب إلى ال_موقع"
-#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
+#: client/gui-gtk-2.0/dialogs.c:202 client/gui-gtk-2.0/messagewin.c:226
#, fuzzy
msgid "Inspect _City"
msgstr "قاÙزة المدينة"
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:258 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:258 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:259 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:311 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:312 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:312 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:313 client/gui-win32/dialogs.c:1755
#: data/Freeciv.in:2502
msgid "Select what to pillage:"
msgstr "اختيار ماذا تريد أن تنهب:"
-#: client/gui-gtk-2.0/dialogs.c:506
+#: client/gui-gtk-2.0/dialogs.c:507
msgid "Unit"
msgstr "الوØدة"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:950
-#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2155
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:985
+#: client/gui-gtk-2.0/dialogs.c:508 client/gui-gtk-2.0/pages.c:950
+#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2157
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:987
#: client/gui-win32/plrdlg.c:335 manual/civmanual.c:302 data/Freeciv.in:80
msgid "Name"
msgstr "الاسم"
-#: client/gui-gtk-2.0/dialogs.c:519 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:520 client/gui-sdl/dialogs.c:627
msgid "Unit selection"
msgstr "اختيار الوØدة"
-#: client/gui-gtk-2.0/dialogs.c:582
+#: client/gui-gtk-2.0/dialogs.c:583
msgid "_Ready all"
msgstr "تجهيز ال_كل"
-#: client/gui-gtk-2.0/dialogs.c:590
+#: client/gui-gtk-2.0/dialogs.c:591
msgid "_Sentry idle"
msgstr "تعطيل ال_Øراسة"
-#: client/gui-gtk-2.0/dialogs.c:719
+#: client/gui-gtk-2.0/dialogs.c:721
#, fuzzy
msgid "Nation _Groups:"
msgstr "الأ_مم:"
-#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:766 data/Freeciv.in:3128
msgid "What Nation Will You Be?"
msgstr "أية أمة تريد أن تكون?"
-#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
-#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
+#: client/gui-gtk-2.0/dialogs.c:768 client/gui-sdl/chatline.c:842
+#: client/gui-win32/connectdlg.c:1040 data/Freeciv.in:3371
msgid "Pick Nation"
msgstr "اختيار الأمة"
-#: client/gui-gtk-2.0/dialogs.c:774
+#: client/gui-gtk-2.0/dialogs.c:776
#, fuzzy
msgid "_Random Nation"
msgstr "أمة عشوائية"
-#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:792 client/gui-win32/dialogs.c:517
msgid "Select a nation"
msgstr "اختر أمة"
-#: client/gui-gtk-2.0/dialogs.c:804
+#: client/gui-gtk-2.0/dialogs.c:810
msgid "_Properties"
msgstr "_خصائص"
-#: client/gui-gtk-2.0/dialogs.c:824
+#: client/gui-gtk-2.0/dialogs.c:830
msgid "_Leader:"
msgstr "ال_قائد:"
-#: client/gui-gtk-2.0/dialogs.c:831
+#: client/gui-gtk-2.0/dialogs.c:837
msgid "_Female"
msgstr "أ_نثى"
-#: client/gui-gtk-2.0/dialogs.c:836
+#: client/gui-gtk-2.0/dialogs.c:842
msgid "_Male"
msgstr "_ذكر"
-#: client/gui-gtk-2.0/dialogs.c:863
+#: client/gui-gtk-2.0/dialogs.c:869
#, fuzzy
msgid "City _Styles:"
msgstr "أساليب ال_مدينة:"
-#: client/gui-gtk-2.0/dialogs.c:902
+#: client/gui-gtk-2.0/dialogs.c:908
#, fuzzy
msgid "_Description"
msgstr "ال_Ù…ÙتاØ"
-#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1263 client/gui-xaw/dialogs.c:1480
msgid "You must select your sex."
msgstr "يجب أن تختار جنسك."
-#: client/gui-gtk-2.0/dialogs.c:1253 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1268 client/gui-xaw/dialogs.c:1485
msgid "You must select your city style."
msgstr "يجب أن تختار أسلوب مدينتك."
-#: client/gui-gtk-2.0/dialogs.c:1262 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1277 client/gui-sdl/dialogs.c:2204
#: 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:1306 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1318 client/gui-win32/citydlg.c:1454
#: data/Freeciv.in:2484
msgid "Upgrade Unit!"
msgstr "تطوير الوØدة!"
-#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1327 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 "تطوير الوØدات القديمة"
-#: client/gui-gtk-2.0/diplodlg.c:231 client/gui-win32/diplodlg.c:151
+#: client/gui-gtk-2.0/diplodlg.c:222 client/gui-win32/diplodlg.c:151
#: client/gui-xaw/diplodlg.c:383 client/gui-xaw/diplodlg.c:401
msgid "World-map"
msgstr "خريطة-العالم"
-#: client/gui-gtk-2.0/diplodlg.c:237 client/gui-win32/diplodlg.c:146
+#: client/gui-gtk-2.0/diplodlg.c:228 client/gui-win32/diplodlg.c:146
#: client/gui-xaw/diplodlg.c:387 client/gui-xaw/diplodlg.c:405
msgid "Sea-map"
msgstr "خريطة-البØر"
-#: client/gui-gtk-2.0/diplodlg.c:243
+#: client/gui-gtk-2.0/diplodlg.c:234
msgid "_Maps"
msgstr "_خرائط"
-#: client/gui-gtk-2.0/diplodlg.c:274
+#: client/gui-gtk-2.0/diplodlg.c:265
msgid "_Advances"
msgstr "الت_قدم"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/diplodlg.c:315 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "_مدن"
-#: client/gui-gtk-2.0/diplodlg.c:333
+#: client/gui-gtk-2.0/diplodlg.c:324
msgid "_Give shared vision"
msgstr "ا_عطاء رؤية مشتركة"
-#: client/gui-gtk-2.0/diplodlg.c:346
+#: client/gui-gtk-2.0/diplodlg.c:337
msgid "Give _embassy"
msgstr "اعطاء _سÙارة"
-#: client/gui-gtk-2.0/diplodlg.c:376
+#: client/gui-gtk-2.0/diplodlg.c:368
msgid "_Pacts"
msgstr "ال_تØالÙات"
-#: client/gui-gtk-2.0/diplodlg.c:466
+#: client/gui-gtk-2.0/diplodlg.c:458
#, c-format
msgid "Diplomacy: %s"
msgstr "الدبلوماسية: %s"
-#: client/gui-gtk-2.0/diplodlg.c:473
+#: client/gui-gtk-2.0/diplodlg.c:465
msgid "_Cancel meeting"
msgstr "ا_لغاء الاجتماع"
-#: client/gui-gtk-2.0/diplodlg.c:475
+#: client/gui-gtk-2.0/diplodlg.c:467
msgid "Accept _treaty"
msgstr "قبول ال_معاهدة"
-#: client/gui-gtk-2.0/diplodlg.c:503
+#: client/gui-gtk-2.0/diplodlg.c:495
msgid "C_lauses:"
msgstr "ال_Ùقرات:"
-#: client/gui-gtk-2.0/diplodlg.c:568 client/gui-gtk-2.0/diplodlg.c:642
+#: client/gui-gtk-2.0/diplodlg.c:560 client/gui-gtk-2.0/diplodlg.c:634
msgid "_Gold:"
msgstr "_ذهب:"
-#: client/gui-gtk-2.0/diplodlg.c:580 client/gui-gtk-2.0/diplodlg.c:654
+#: client/gui-gtk-2.0/diplodlg.c:572 client/gui-gtk-2.0/diplodlg.c:646
msgid "_Add Clause..."
msgstr "_إضاÙØ© بند..."
-#: client/gui-gtk-2.0/diplodlg.c:699
+#: client/gui-gtk-2.0/diplodlg.c:691
msgid "--- This treaty is blank. Please add some clauses. ---"
msgstr "--- هذه المعاهدة Ùارغة. الرجاء إضاÙØ© بعض البنود. ---"
-#: client/gui-gtk-2.0/diplodlg.c:905 client/gui-sdl/diplodlg.c:375
+#: client/gui-gtk-2.0/diplodlg.c:897 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 "خطأ ÙÙŠ كمية الذهب."
@@ -11038,109 +11181,109 @@ msgstr "اختيار الإتجاه"
msgid "Show _All Cities"
msgstr "إظهار _كل المدن"
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:164
#, fuzzy
msgid "Show Map Scrollbars"
msgstr ""
"المعرض الخريطة شرائط ØªØªÙŠØ Ø±Ø¤ÙŠØ© الكلام والصّور من الوثيقة الكبيرة عن طريق "
"التمرير"
-#: client/gui-gtk-2.0/gui_main.c:163
+#: client/gui-gtk-2.0/gui_main.c:165
#, fuzzy
msgid "Disable this option to hide the scrollbars on the map view."
msgstr "يضعÙØŒ يعجز، ÙŠÙقد الأهلية."
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:169
msgid "Keyboardless goto"
msgstr "الذهاب بدون لوØØ© المÙاتيØ"
-#: client/gui-gtk-2.0/gui_main.c:168
+#: client/gui-gtk-2.0/gui_main.c:170
#, fuzzy
msgid ""
"If this option is set then a goto may be initiated by left-clicking and then "
"holding down the mouse button while dragging the mouse onto a different tile."
msgstr "إذا."
-#: client/gui-gtk-2.0/gui_main.c:173
+#: client/gui-gtk-2.0/gui_main.c:175
msgid "Keep dialogs on top"
msgstr "ابقاء مربعات الØوار ÙÙŠ المقدمة"
-#: client/gui-gtk-2.0/gui_main.c:174
+#: client/gui-gtk-2.0/gui_main.c:176
#, fuzzy
msgid ""
"If this option is set then dialog windows will always remain in front of the "
"main Freeciv window. Disabling this has no effect in fullscreen mode."
msgstr "إذا برنامج Freeciv التعطيل."
-#: client/gui-gtk-2.0/gui_main.c:178
+#: client/gui-gtk-2.0/gui_main.c:180
msgid "Show worklist task icons"
msgstr "اعرض أيقونات مهام قائمة العمل"
-#: client/gui-gtk-2.0/gui_main.c:179
+#: client/gui-gtk-2.0/gui_main.c:181
#, fuzzy
msgid ""
"Disabling this will turn off the unit and building icons in the worklist "
"dialog and the production tab of the city dialog."
msgstr "التعطيل دوران ÙˆØدات قائمة العمل."
-#: client/gui-gtk-2.0/gui_main.c:183
+#: client/gui-gtk-2.0/gui_main.c:185
#, fuzzy
msgid "Enable status report tabs"
msgstr "يؤهّل‎، يخول، يمكن"
-#: client/gui-gtk-2.0/gui_main.c:184
+#: client/gui-gtk-2.0/gui_main.c:186
#, fuzzy
msgid ""
"If this option is enabled then report dialogs will be shown as separate tabs "
"rather than in popup dialogs."
msgstr "إذا."
-#: client/gui-gtk-2.0/gui_main.c:189 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:191 client/gui-win32/gui_main.c:110
msgid "Better fog-of-war drawing"
msgstr "رسم ضباب الØرب بشكل Ø£Ùضل"
-#: client/gui-gtk-2.0/gui_main.c:190 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:192 client/gui-win32/gui_main.c:111
#, fuzzy
msgid ""
"If this is enabled then a better method is used for drawing fog-of-war. It "
"is not any slower but will consume about twice as much memory."
msgstr "إذا هو."
-#: client/gui-gtk-2.0/gui_main.c:195
+#: client/gui-gtk-2.0/gui_main.c:197
msgid "Show time for each chat message"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:196
+#: client/gui-gtk-2.0/gui_main.c:198
msgid ""
"If this option is enabled then all chat messages will be prefixed by a time "
"string of the form [hour:minute:second]."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:201
+#: client/gui-gtk-2.0/gui_main.c:203
msgid "Split bottom notebook area"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:202
+#: client/gui-gtk-2.0/gui_main.c:204
msgid ""
"Enabling this option will split the bottom notebook into a left and right "
"notebook so that two tabs may be viewed at once."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:207
+#: client/gui-gtk-2.0/gui_main.c:209
msgid "New message events go to top of list"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:208
+#: client/gui-gtk-2.0/gui_main.c:210
msgid ""
"If this option is enabled, new events in the message window will appear at "
"the top of the list, rather than being appended at the bottom."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:213
+#: client/gui-gtk-2.0/gui_main.c:215
msgid "Show extra message window buttons"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:214
+#: client/gui-gtk-2.0/gui_main.c:216
msgid ""
"If this option is enabled, there will be two buttons displayed in the "
"message window for inspecting a city and going to a location. If this option "
@@ -11150,21 +11293,21 @@ msgid ""
"closed and reopened."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:224
+#: client/gui-gtk-2.0/gui_main.c:226
msgid "Metaserver tab first in network page"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:225
+#: client/gui-gtk-2.0/gui_main.c:227
msgid ""
"If this option is enabled, the metaserver tab will be the first notebook tab "
"in the network page. This option requires a restart in order to take effect."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:230
+#: client/gui-gtk-2.0/gui_main.c:232
msgid "Plain chat messages are sent to allies only"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:231
+#: client/gui-gtk-2.0/gui_main.c:233
msgid ""
"If this option is enabled, then plain messages typed into the chat entry "
"while the game is running will only be sent to your allies. Otherwise plain "
@@ -11174,28 +11317,41 @@ msgid ""
"visible in multiplayer games)."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:340 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:245
+msgid "Arrange widgets for small displays"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:246
+msgid ""
+"If this option is enabled, widgets in the main window will be arrange so "
+"that they take up the least amount of total screen space. Specifically, the "
+"left panel containing the overview, player status, and the unit information "
+"box will be extended over the entire left side of the window. This option "
+"requires a restart in order to take effect."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:352 client/gui-xaw/gui_main.c:245
msgid ""
"This client has no special command line options\n"
"\n"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
+#: client/gui-gtk-2.0/gui_main.c:847 client/gui-gtk-2.0/gui_main.c:1542
msgid "Freeciv"
msgstr "برنامج Freeciv"
-#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
+#: client/gui-gtk-2.0/gui_main.c:1251 client/gui-gtk-2.0/gui_main.c:1258
#: client/gui-sdl/mapctrl.c:1566 client/gui-win32/gui_main.c:482
#: data/Freeciv.in:2618
msgid "Turn Done"
msgstr "انتهي الدور"
-#: client/gui-gtk-2.0/gui_main.c:1232 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1258 client/gui-sdl/mapctrl.c:1566
#: client/gui-sdl/mapview.c:1082
msgid "Shift+Return"
msgstr "كبسة Shift+Return"
-#: client/gui-gtk-2.0/gui_main.c:1266 client/gui-gtk-2.0/menu.c:797
+#: client/gui-gtk-2.0/gui_main.c:1299 client/gui-gtk-2.0/menu.c:797
#: client/gui-gtk-2.0/menu.c:799 client/gui-gtk-2.0/menu.c:801
#: client/gui-gtk-2.0/menu.c:803 client/gui-gtk-2.0/menu.c:805
#: client/gui-gtk-2.0/menu.c:807 client/gui-gtk-2.0/menu.c:809
@@ -11214,11 +11370,11 @@ msgstr "كبسة Shift+Return"
msgid "View"
msgstr "العرض"
-#: client/gui-gtk-2.0/gui_main.c:1359
+#: client/gui-gtk-2.0/gui_main.c:1393
msgid "Chat"
msgstr "دردشة"
-#: client/gui-gtk-2.0/gui_main.c:1377 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1411 client/gui-win32/gui_main.c:538
#: data/Freeciv.in:2809
msgid ""
"Freeciv is free software and you are welcome to distribute copies of it\n"
@@ -11229,79 +11385,79 @@ msgstr ""
"ضمن بعض الشروط، انظر إلى عنصر \"النسخ\" على قائمة المساعدة.\n"
"اﻵن.. اذقهم الجØيم!"
-#: client/gui-gtk-2.0/gui_main.c:1392
+#: client/gui-gtk-2.0/gui_main.c:1426
msgid "Allies Only"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1657
+#: client/gui-gtk-2.0/gui_main.c:1691
msgid "Not _ready"
msgstr "غير _جاهز"
-#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
+#: client/gui-gtk-2.0/gui_main.c:1702 client/gui-gtk-2.0/pages.c:1679
msgid "_Ready"
msgstr "_جاهز"
-#: client/gui-gtk-2.0/gui_main.c:1672 client/gui-gtk-2.0/gui_main.c:1678
-#: client/gui-gtk-2.0/pages.c:2204
+#: client/gui-gtk-2.0/gui_main.c:1706 client/gui-gtk-2.0/gui_main.c:1712
+#: client/gui-gtk-2.0/pages.c:2206
msgid "_Start"
msgstr "_بدء"
-#: client/gui-gtk-2.0/gui_main.c:1686
+#: client/gui-gtk-2.0/gui_main.c:1720
#, fuzzy
msgid "_Take Player"
msgstr "أخذ مكان هذا اللاعب"
-#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
+#: client/gui-gtk-2.0/gui_main.c:1723 client/gui-gtk-2.0/pages.c:1669
msgid "Pick _Nation"
msgstr "اختيار الأ_مة"
-#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
+#: client/gui-gtk-2.0/gui_main.c:1730 client/gui-gtk-2.0/pages.c:1674
msgid "_Observe"
msgstr "_مراقبة"
-#: client/gui-gtk-2.0/gui_main.c:1698
+#: client/gui-gtk-2.0/gui_main.c:1732
#, fuzzy
msgid "Do not _observe"
msgstr "_لا تراقب"
-#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1755 client/gui-xaw/pages.c:211
msgid "<AI>"
msgstr "<ذ.ا>"
-#: client/gui-gtk-2.0/gui_main.c:1723
+#: client/gui-gtk-2.0/gui_main.c:1758
msgid "<Novice AI>"
msgstr "<ذ.ا مبتدئ>"
-#: client/gui-gtk-2.0/gui_main.c:1726
+#: client/gui-gtk-2.0/gui_main.c:1761
msgid "<Easy AI>"
msgstr "<ذ.ا سهل>"
-#: client/gui-gtk-2.0/gui_main.c:1729
+#: client/gui-gtk-2.0/gui_main.c:1764
msgid "<Normal AI>"
msgstr "<ذ.ا عادي>"
-#: client/gui-gtk-2.0/gui_main.c:1732
+#: client/gui-gtk-2.0/gui_main.c:1767
msgid "<Hard AI>"
msgstr "<ذ.ا صعب>"
-#: client/gui-gtk-2.0/gui_main.c:1742 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1777 client/gui-win32/dialogs.c:594
#: client/gui-xaw/pages.c:217
msgid "Random"
msgstr "عشوائي"
-#: client/gui-gtk-2.0/gui_main.c:1808
+#: client/gui-gtk-2.0/gui_main.c:1844 client/gui-gtk-2.0/gui_main.c:1858
msgid "Observer"
msgstr "متÙرج"
-#: client/gui-gtk-2.0/gui_main.c:1808
+#: client/gui-gtk-2.0/gui_main.c:1858
msgid "Detached"
msgstr "منÙصل"
-#: client/gui-gtk-2.0/gui_main.c:2073
+#: client/gui-gtk-2.0/gui_main.c:2117
msgid "Are you sure you want to quit?"
msgstr "هل تريد الخروج?"
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
#, c-format
msgid ""
"Close Tab:\n"
@@ -11310,7 +11466,7 @@ msgstr ""
"اغلاق اللسان:\n"
"%s"
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
msgid "Ctrl+W"
msgstr "الكبسة Ctrl+W"
@@ -11419,8 +11575,8 @@ msgid "Trans. Rslt/Time:"
msgstr "الوقت:"
#: 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
-#: client/gui-win32/helpdlg.c:709 client/gui-win32/helpdlg.c:733
+#: client/gui-win32/helpdlg.c:502 client/gui-win32/helpdlg.c:550
+#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:739
#: client/gui-xaw/helpdlg.c:759 client/gui-xaw/helpdlg.c:808
#: client/gui-xaw/helpdlg.c:816 client/gui-xaw/helpdlg.c:853
#: client/gui-xaw/helpdlg.c:878
@@ -11467,34 +11623,34 @@ msgstr "مع"
msgid "?techhelp:"
msgstr "?techhelp:"
-#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:591
+#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:597
#: client/gui-xaw/helpdlg.c:996
#, c-format
msgid "+%d Trade / %d"
msgstr "+%d التجارة / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:595
+#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:601
#: client/gui-xaw/helpdlg.c:1000
#, c-format
msgid "no extra / %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
-#: client/gui-win32/helpdlg.c:602 client/gui-win32/helpdlg.c:616
-#: client/gui-win32/helpdlg.c:635 client/gui-xaw/helpdlg.c:1002
+#: client/gui-gtk-2.0/helpdlg.c:1085 client/gui-win32/helpdlg.c:604
+#: client/gui-win32/helpdlg.c:608 client/gui-win32/helpdlg.c:622
+#: client/gui-win32/helpdlg.c:641 client/gui-xaw/helpdlg.c:1002
#: client/gui-xaw/helpdlg.c:1006 client/gui-xaw/helpdlg.c:1020
#: client/gui-xaw/helpdlg.c:1039
msgid "n/a"
msgstr "غير متوÙر"
-#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:605
+#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:611
#: client/gui-xaw/helpdlg.c:1009
#, c-format
msgid "+%d Food / %d"
msgstr "+%d الطعام / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:619
+#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:625
#: client/gui-xaw/helpdlg.c:1023
#, c-format
msgid "+%d Res. / %d"
@@ -12264,41 +12420,41 @@ msgstr "الا_تصال بلعبة على الشبكة"
msgid "Connect to Gaming _Zone"
msgstr "الاتصال ب_منطقة اللعب"
-#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:302
#: client/gui-xaw/connectdlg.c:326
msgid "Passwords don't match, enter password."
msgstr "كلمات السر غير مطابقة، إدخل كلمة السر."
#: client/gui-gtk-2.0/pages.c:779 client/gui-gtk-2.0/pages.c:820
-#: client/gui-win32/connectdlg.c:916
+#: client/gui-win32/connectdlg.c:918
msgid "Server Name"
msgstr "اسم الخادم"
#: client/gui-gtk-2.0/pages.c:780 client/gui-gtk-2.0/pages.c:821
-#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:916
+#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:918
#: data/Freeciv.in:96
msgid "Port"
msgstr "المنÙØ°"
#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Version"
msgstr "اصدار"
#: client/gui-gtk-2.0/pages.c:782 client/gui-gtk-2.0/pages.c:823
-#: client/gui-gtk-2.0/pages.c:2161 client/gui-win32/connectdlg.c:917
-#: client/gui-win32/connectdlg.c:995
+#: client/gui-gtk-2.0/pages.c:2163 client/gui-win32/connectdlg.c:919
+#: client/gui-win32/connectdlg.c:997
msgid "Status"
msgstr "الØالة"
#: client/gui-gtk-2.0/pages.c:783 client/gui-gtk-2.0/pages.c:824
#: client/gui-sdl/connectdlg.c:318 client/gui-sdl/plrdlg.c:330
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Players"
msgstr "اللاعبين"
#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
-#: client/gui-win32/connectdlg.c:918
+#: client/gui-win32/connectdlg.c:920
msgid "Comment"
msgstr "ملاØظة"
@@ -12330,9 +12486,9 @@ msgstr "كلمة ال_سر:"
msgid "Conf_irm Password:"
msgstr "_تأكيد كلمة السر:"
-#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2165
#: 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:1000
+#: client/gui-win32/citydlg.c:1083 client/gui-win32/connectdlg.c:1002
#: client/gui-win32/wldlg.c:800 client/gui-win32/wldlg.c:806
msgid "Type"
msgstr "النوع"
@@ -12427,7 +12583,7 @@ msgstr "مستوى مهارة ال _ذ.ا:"
msgid "Ruleset _Version:"
msgstr "مجموعة ال_قواعد:"
-#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2195
msgid "_More Game Options..."
msgstr "خيارات اللعبة أكثر..."
@@ -12443,49 +12599,49 @@ msgstr "التقدير"
msgid "Ready"
msgstr "جاهز"
-#: client/gui-gtk-2.0/pages.c:1601
+#: client/gui-gtk-2.0/pages.c:1600
#, fuzzy
msgid "?player:Leader"
msgstr "?Player:الاسم"
-#: client/gui-gtk-2.0/pages.c:1732 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1734 client/gui-sdl/chatline.c:185
msgid "Choose Saved Game to Load"
msgstr "اختيار اللعبة المØÙوظة للتØميل"
-#: client/gui-gtk-2.0/pages.c:1824
+#: client/gui-gtk-2.0/pages.c:1826
msgid "Choose Saved Game to _Load:"
msgstr "اختيار اللعبة المØÙوظة لل_تØميل:"
-#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
-#: client/gui-gtk-2.0/pages.c:2451
+#: client/gui-gtk-2.0/pages.c:1846 client/gui-gtk-2.0/pages.c:2039
+#: client/gui-gtk-2.0/pages.c:2455
msgid "_Browse..."
msgstr "ال_تصÙÙ‘Ø..."
-#: client/gui-gtk-2.0/pages.c:1911
+#: client/gui-gtk-2.0/pages.c:1913
msgid "Choose a Scenario"
msgstr "إختيار سيناريو"
-#: client/gui-gtk-2.0/pages.c:1998
+#: client/gui-gtk-2.0/pages.c:2000
msgid "Choose a _Scenario:"
msgstr "إختيار _سيناريو:"
-#: client/gui-gtk-2.0/pages.c:2173
+#: client/gui-gtk-2.0/pages.c:2175
msgid "Choose a _nation to play:"
msgstr "اختيار الأمة للعب بها:"
-#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2367 client/gui-win32/menu.c:581
msgid "Select Location to Save"
msgstr "اختيار موقع الØÙظ"
-#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2452 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "ØÙظ اللعبة"
-#: client/gui-gtk-2.0/pages.c:2489
+#: client/gui-gtk-2.0/pages.c:2493
msgid "Saved _Games:"
msgstr "ال_لعب المØÙوظة:"
-#: client/gui-gtk-2.0/pages.c:2516
+#: client/gui-gtk-2.0/pages.c:2520
msgid "Save _Filename:"
msgstr "اسم مل٠الØÙظ:"
@@ -12840,7 +12996,7 @@ msgstr ""
msgid "Total users logged in : %d"
msgstr "مجموع المستخدمين المتصلين : %d"
-#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1098
msgid "Back"
msgstr "رجوع"
@@ -12849,7 +13005,7 @@ msgid "Start"
msgstr "بدء"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:777
+#: client/gui-win32/connectdlg.c:779
msgid "Load Game"
msgstr "تØميل لعبة"
@@ -12893,9 +13049,9 @@ msgstr "مدينة المنشأ الجديدة"
#: client/gui-sdl/connectdlg.c:308 client/gui-sdl/connectdlg.c:617
#: client/gui-sdl/connectdlg.c:803 client/gui-sdl/connectdlg.c:985
#: client/gui-sdl/dialogs.c:452 client/gui-sdl/dialogs.c:2095
-#: client/gui-sdl/dialogs.c:2893 client/gui-sdl/diplomat_dialog.c:731
+#: client/gui-sdl/dialogs.c:2902 client/gui-sdl/diplomat_dialog.c:731
#: client/gui-sdl/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1043
#: client/gui-win32/dialogs.c:1772 client/gui-win32/finddlg.c:127
#: client/gui-win32/gotodlg.c:171 client/gui-win32/inputdlg.c:146
#: client/gui-win32/messagedlg.c:216 client/gui-win32/ratesdlg.c:328
@@ -12942,7 +13098,7 @@ msgid "Buy it?"
msgstr "هل تريد شرائها?"
#: 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
+#: client/gui-sdl/diplodlg.c:1336 client/gui-sdl/diplomat_dialog.c:1211
#: client/gui-sdl/diplomat_dialog.c:1417 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:221 client/gui-sdl/repodlgs.c:1559
#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
@@ -12958,7 +13114,7 @@ msgid "No"
msgstr "لا"
#: client/gui-sdl/citydlg.c:1215 client/gui-sdl/cma_fe.c:318
-#: client/gui-sdl/diplodlg.c:1345 client/gui-sdl/diplomat_dialog.c:1200
+#: client/gui-sdl/diplodlg.c:1346 client/gui-sdl/diplomat_dialog.c:1200
#: client/gui-sdl/diplomat_dialog.c:1407 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:232 client/gui-win32/repodlgs.c:578
#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
@@ -13274,7 +13430,7 @@ msgstr "خادم Freeciv:"
msgid "Port :"
msgstr "المنÙØ°:"
-#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1100
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr "توصيل"
@@ -13388,23 +13544,23 @@ msgstr "اختيار Øكومتك الجديدة"
msgid "REVOLUTION!"
msgstr "ثورة!"
-#: client/gui-sdl/dialogs.c:2232 client/gui-sdl/dialogs.c:2620
+#: client/gui-sdl/dialogs.c:2237 client/gui-sdl/dialogs.c:2625
#: client/gui-win32/dialogs.c:567 data/Freeciv.in:3159
msgid "Female"
msgstr "أنثى"
-#: client/gui-sdl/dialogs.c:2234 client/gui-sdl/dialogs.c:2618
-#: client/gui-sdl/dialogs.c:2830 client/gui-win32/dialogs.c:565
+#: client/gui-sdl/dialogs.c:2239 client/gui-sdl/dialogs.c:2623
+#: client/gui-sdl/dialogs.c:2839 client/gui-win32/dialogs.c:565
msgid "Male"
msgstr "ذكر"
-#: client/gui-sdl/dialogs.c:2478 client/gui-sdl/dialogs.c:2902
+#: client/gui-sdl/dialogs.c:2483 client/gui-sdl/dialogs.c:2911
#: 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 "مواÙÙ‚"
-#: client/gui-sdl/dialogs.c:2685 client/gui-win32/dialogs.c:505
+#: client/gui-sdl/dialogs.c:2694 client/gui-win32/dialogs.c:505
msgid "What nation will you be?"
msgstr "أي أمة تريد أن تكون?"
@@ -13431,53 +13587,53 @@ msgstr "خريطة العالم"
msgid "Sea map"
msgstr "خريطة البØر"
-#: client/gui-sdl/diplodlg.c:563
+#: client/gui-sdl/diplodlg.c:564
msgid "Give embassy"
msgstr "اعطاء سÙارة"
-#: client/gui-sdl/diplodlg.c:579 client/gui-win32/diplodlg.c:614
+#: client/gui-sdl/diplodlg.c:580 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 "الذهب(أعلى Øد %d)"
-#: client/gui-sdl/diplodlg.c:613 client/gui-sdl/helpdlg.c:1956
+#: client/gui-sdl/diplodlg.c:614 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 "يتّقدّم"
-#: client/gui-sdl/diplodlg.c:831 client/gui-win32/diplodlg.c:598
+#: client/gui-sdl/diplodlg.c:832 client/gui-win32/diplodlg.c:598
#: data/Freeciv.in:269
msgid "Diplomacy meeting"
msgstr "اجتماع دبلوماسي"
-#: client/gui-sdl/diplodlg.c:883 client/gui-win32/diplodlg.c:680
+#: client/gui-sdl/diplodlg.c:884 client/gui-win32/diplodlg.c:680
#: data/Freeciv.in:510
msgid "Cancel meeting"
msgstr "إلغاء الاجتماع"
-#: client/gui-sdl/diplodlg.c:895 client/gui-win32/diplodlg.c:679
+#: client/gui-sdl/diplodlg.c:896 client/gui-win32/diplodlg.c:679
#: data/Freeciv.in:501
msgid "Accept treaty"
msgstr "قبول المعاهدة"
#. TRANS: "Polish incident !" FIXME!!!
-#: client/gui-sdl/diplodlg.c:1304
+#: client/gui-sdl/diplodlg.c:1305
#, c-format
msgid "%s incident !"
msgstr "%s Øادث !"
-#: client/gui-sdl/diplodlg.c:1322
+#: client/gui-sdl/diplodlg.c:1323
msgid "Shall we declare WAR on them?"
msgstr "هل تريدنا أن نعلن الØرب عليهم?"
-#: client/gui-sdl/diplodlg.c:1433
+#: client/gui-sdl/diplodlg.c:1434
msgid "Foreign Minister"
msgstr "وزير الخارجية"
-#: client/gui-sdl/diplodlg.c:1449
+#: client/gui-sdl/diplodlg.c:1450
#, fuzzy, c-format
msgid ""
"Sir!, the %s ambassador has arrived\n"
@@ -13486,24 +13642,24 @@ msgstr ""
"سيدي!ØŒ لقد وصل السÙير %s \n"
"ما هي أوامرك?"
-#: client/gui-sdl/diplodlg.c:1465
+#: client/gui-sdl/diplodlg.c:1466
msgid "Declare WAR"
msgstr "إعلان الØرب"
-#: client/gui-sdl/diplodlg.c:1467 client/gui-win32/plrdlg.c:357
+#: client/gui-sdl/diplodlg.c:1468 client/gui-win32/plrdlg.c:357
msgid "Cancel Treaty"
msgstr "إلغاء المعاهدة"
-#: client/gui-sdl/diplodlg.c:1490 client/gui-win32/plrdlg.c:358
+#: client/gui-sdl/diplodlg.c:1491 client/gui-win32/plrdlg.c:358
#: data/Freeciv.in:3254
msgid "Withdraw vision"
msgstr "سØب الرؤية"
-#: client/gui-sdl/diplodlg.c:1507
+#: client/gui-sdl/diplodlg.c:1508
msgid "Call Diplomatic Meeting"
msgstr "طلب اجتماع دبلوماسي"
-#: client/gui-sdl/diplodlg.c:1521
+#: client/gui-sdl/diplodlg.c:1522
msgid "Send him back"
msgstr "اطلب منه الرجوع"
@@ -14263,12 +14419,12 @@ msgid "Leave Game"
msgstr "ØÙظ اللعبة"
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1100 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1102 client/gui-xaw/menu.c:121
#: data/Freeciv.in:115 data/Freeciv.in:3180
msgid "Quit"
msgstr "خروج"
-#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:967
msgid "Start New Game"
msgstr "بدء لعبة جديدة"
@@ -14381,8 +14537,8 @@ msgstr "الدخل الصاÙÙŠ: "
msgid "%s max rate : %d%%"
msgstr "%s النسبة الأعلى: %d%%"
-#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
-#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1085
+#: client/gui-win32/connectdlg.c:1093 data/Freeciv.in:155
msgid "Update"
msgstr "تØديث"
@@ -14871,67 +15027,67 @@ msgstr "جديد"
msgid "Delete"
msgstr "Ù…ØÙˆ"
-#: client/gui-win32/connectdlg.c:147
+#: client/gui-win32/connectdlg.c:149
msgid "Password:"
msgstr "كلمة السر:"
-#: client/gui-win32/connectdlg.c:169
+#: client/gui-win32/connectdlg.c:171
msgid "Couldn't load the savegame"
msgstr "Ùشل تØميل اللعبة المØÙوظة"
-#: client/gui-win32/connectdlg.c:284 client/gui-xaw/connectdlg.c:311
+#: client/gui-win32/connectdlg.c:286 client/gui-xaw/connectdlg.c:311
msgid "Verify Password"
msgstr "تأكيد كلمة السر"
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:916 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr "اختيار خادم Freeciv"
-#: client/gui-win32/connectdlg.c:915
+#: client/gui-win32/connectdlg.c:917
msgid "Local Area Network"
msgstr "شبكة داخلية"
-#: client/gui-win32/connectdlg.c:949
+#: client/gui-win32/connectdlg.c:951
msgid "Welcome to Freeciv"
msgstr "مرØبا بكم ÙÙŠ برنامج Freeciv"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Load Saved Game"
msgstr "تØميل لعبة Ù…ØÙوظة"
-#: client/gui-win32/connectdlg.c:969
+#: client/gui-win32/connectdlg.c:971
msgid "Connect To Network Game"
msgstr "الوصول إلى لعبة على الشبكة"
-#: client/gui-win32/connectdlg.c:979
+#: client/gui-win32/connectdlg.c:981
msgid "Choose a nation to play"
msgstr "اختيار الأمة للعب"
-#: client/gui-win32/connectdlg.c:1014
+#: client/gui-win32/connectdlg.c:1016
msgid "Number of players (Including AI):"
msgstr "عدد اللاعبيين (مع ذ.ا):"
-#: client/gui-win32/connectdlg.c:1022
+#: client/gui-win32/connectdlg.c:1024
msgid "AI skill level:"
msgstr "مستوى الذكاء الاصطناعي ذ.ا:"
-#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1038 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr "خيارات اللعبة"
-#: client/gui-win32/connectdlg.c:1040
+#: client/gui-win32/connectdlg.c:1042
msgid "Start Game"
msgstr "بدء لعبة"
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Login:"
msgstr "اسم الدخول:"
-#: client/gui-win32/connectdlg.c:1061
+#: client/gui-win32/connectdlg.c:1063
msgid "Host:"
msgstr "الخادم:"
-#: client/gui-win32/connectdlg.c:1062
+#: client/gui-win32/connectdlg.c:1064
msgid "Port:"
msgstr "المنÙØ°:"
@@ -15005,21 +15161,21 @@ msgid ""
"this is much slower."
msgstr "إذا إذا."
-#: client/gui-win32/helpdlg.c:769 client/gui-win32/helpdlg.c:792
-#: client/gui-win32/helpdlg.c:803 client/gui-win32/helpdlg.c:809
-#: client/gui-win32/helpdlg.c:822
+#: client/gui-win32/helpdlg.c:775 client/gui-win32/helpdlg.c:798
+#: client/gui-win32/helpdlg.c:809 client/gui-win32/helpdlg.c:815
+#: client/gui-win32/helpdlg.c:828
msgid "Allows "
msgstr "ÙŠØ³Ù…Ø "
-#: client/gui-win32/helpdlg.c:780
+#: client/gui-win32/helpdlg.c:786
msgid "Obsoletes "
msgstr "الأشياء القديمة"
-#: client/gui-win32/helpdlg.c:812 client/gui-win32/helpdlg.c:825
+#: client/gui-win32/helpdlg.c:818 client/gui-win32/helpdlg.c:831
msgid " (with "
msgstr " (مع "
-#: client/gui-win32/helpdlg.c:815 client/gui-win32/helpdlg.c:828
+#: client/gui-win32/helpdlg.c:821 client/gui-win32/helpdlg.c:834
msgid "?techhelp:)."
msgstr "?techhelp:)."
@@ -16139,7 +16295,7 @@ 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/"
+" https://gna.org/projects/freeciv/"
msgstr ""
"إذا هذا منتهي برنامج Freeciv البقّة :: علّة :: جرثوم :: شخص مخبول :: Ùكرة "
"Øمقاء :: شخص متØمس :: جهاز تنصّت Ø®ÙÙŠ التتبع النظام\n"
@@ -18054,41 +18210,38 @@ msgid ""
"a Factory, Mfg. Plant and Hydro Plant together give a 150% production "
"bonus.\n"
"\n"
-"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant. A city "
-"can only build a Hydro Plant if it is next to (or on) a Mountain or River "
-"tile."
+"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant."
msgstr ""
-"يخÙّض هو درع مصنع النبات مصنع المصØØ© المائية النبات مصنع النبات المصØØ© "
-"المائية النبات المصØØ© المائية النبات القوّة النبات نووي النبات أي - الØر٠"
-"الأوّل ÙÙŠ الأبجديّة اللّاتينيّة المصØØ© المائية النبات الجبل النهر."
+"يخÙّض هو درع مصنع النبات مصنع نووي النبات مصنع النبات نووي النبات المصØØ© "
+"المائية النبات القوّة النبات نووي النبات."
-#: data/default/buildings.ruleset:397 data/civ2/buildings.ruleset:373
+#: data/default/buildings.ruleset:396 data/civ2/buildings.ruleset:373
#: data/civ1/buildings.ruleset:297
msgid "Library"
msgstr "مكتبة"
-#: data/default/buildings.ruleset:412
+#: data/default/buildings.ruleset:411
#, no-c-format
msgid "Increases the science output in a city by 100%."
msgstr "زيادة انتاج العلوم ÙÙŠ مدينة ب100%."
-#: data/default/buildings.ruleset:417 data/civ2/buildings.ruleset:393
+#: data/default/buildings.ruleset:416 data/civ2/buildings.ruleset:393
#: data/civ1/buildings.ruleset:317
msgid "Marketplace"
msgstr " السوق"
-#: data/default/buildings.ruleset:432 data/civ2/buildings.ruleset:408
+#: data/default/buildings.ruleset:431 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 "زيادة انتاج الرÙاهية والضريبة ÙÙŠ مدينة ب50%."
-#: data/default/buildings.ruleset:437 data/civ2/buildings.ruleset:413
+#: data/default/buildings.ruleset:436 data/civ2/buildings.ruleset:413
#: data/civ1/buildings.ruleset:337
msgid "Mass Transit"
msgstr "النقل العام"
-#: data/default/buildings.ruleset:451 data/civ2/buildings.ruleset:427
+#: data/default/buildings.ruleset:450 data/civ2/buildings.ruleset:427
#: data/civ1/buildings.ruleset:351
#, fuzzy
msgid ""
@@ -18096,12 +18249,12 @@ msgid ""
"simply has no effect on the pollution generated in the city."
msgstr "ÙŠØيّد الـ."
-#: data/default/buildings.ruleset:458 data/civ2/buildings.ruleset:434
+#: data/default/buildings.ruleset:457 data/civ2/buildings.ruleset:434
#: data/civ1/buildings.ruleset:358
msgid "Mfg. Plant"
msgstr "Ù…Øطة التصنيع"
-#: data/default/buildings.ruleset:474 data/civ2/buildings.ruleset:450
+#: data/default/buildings.ruleset:473 data/civ2/buildings.ruleset:450
#: data/civ1/buildings.ruleset:374
#, fuzzy, no-c-format
msgid ""
@@ -18109,12 +18262,12 @@ msgid ""
"production in a city by 100%."
msgstr "سوية مع مصنع التصنيع النبات درع."
-#: data/default/buildings.ruleset:480 data/civ2/buildings.ruleset:456
+#: data/default/buildings.ruleset:479 data/civ2/buildings.ruleset:456
#: data/civ1/buildings.ruleset:380
msgid "Nuclear Plant"
msgstr "Ù…Øطة نووية"
-#: data/default/buildings.ruleset:495
+#: data/default/buildings.ruleset:494
#, fuzzy
msgid ""
"Reduces the amount of pollution generated by production in a city by 50%. "
@@ -18128,24 +18281,24 @@ msgstr ""
"يخÙّض هو درع مصنع النبات مصنع نووي النبات مصنع النبات نووي النبات المصØØ© "
"المائية النبات القوّة النبات نووي النبات."
-#: data/default/buildings.ruleset:515 data/civ2/buildings.ruleset:489
+#: data/default/buildings.ruleset:514 data/civ2/buildings.ruleset:489
#, fuzzy
msgid "Offshore Platform"
msgstr "بعيدا عن الشاطئ الرصيÙ"
-#: data/default/buildings.ruleset:530 data/civ2/buildings.ruleset:504
+#: data/default/buildings.ruleset:529 data/civ2/buildings.ruleset:504
#, fuzzy
msgid ""
"Adds 1 extra shield resource on all Ocean squares in a city. The city needs "
"to be coastal to build this improvement."
msgstr "يضي٠درع المØيط الـ."
-#: data/default/buildings.ruleset:536 data/civ2/buildings.ruleset:510
+#: data/default/buildings.ruleset:535 data/civ2/buildings.ruleset:510
#: data/civ1/buildings.ruleset:411
msgid "Palace"
msgstr "القصر"
-#: data/default/buildings.ruleset:552
+#: data/default/buildings.ruleset:551
#, fuzzy, no-c-format
msgid ""
"Makes a city the capital and the center of your government. Corruption in "
@@ -18163,11 +18316,11 @@ msgid ""
msgstr ""
"الطرازات الÙساد الØكم الديقراطي الشيوعية الـ الخسران الإستبداد الØÙƒ الملكي."
-#: data/default/buildings.ruleset:569 data/civ2/buildings.ruleset:539
+#: data/default/buildings.ruleset:568 data/civ2/buildings.ruleset:539
msgid "Police Station"
msgstr "مركز البوليس"
-#: data/default/buildings.ruleset:583 data/civ2/buildings.ruleset:553
+#: data/default/buildings.ruleset:582 data/civ2/buildings.ruleset:553
#, fuzzy
msgid ""
"Reduces the unhappiness caused by military units outside the city by 2 under "
@@ -18175,24 +18328,24 @@ msgid ""
"governments."
msgstr "يخÙّض الØكم الديقراطي الØكم الجمهوري هذا."
-#: data/default/buildings.ruleset:593 data/civ2/buildings.ruleset:560
+#: data/default/buildings.ruleset:592 data/civ2/buildings.ruleset:560
#, fuzzy
msgid "Port Facility"
msgstr "المنÙØ° الوسيلة"
-#: data/default/buildings.ruleset:608 data/civ2/buildings.ruleset:575
+#: data/default/buildings.ruleset:607 data/civ2/buildings.ruleset:575
#, fuzzy
msgid ""
"Allows a city to build veteran sea units. Also, damaged sea units which "
"stay in town for one full turn without moving are completely restored."
msgstr "ÙŠØ³Ù…Ø Ø®ÙŠÙŠØ± أيضًا دوران متØرك."
-#: data/default/buildings.ruleset:615 data/civ2/buildings.ruleset:582
+#: data/default/buildings.ruleset:614 data/civ2/buildings.ruleset:582
#: data/civ1/buildings.ruleset:440
msgid "Power Plant"
msgstr "Ù…Øطة الطاقة"
-#: data/default/buildings.ruleset:631
+#: data/default/buildings.ruleset:630
#, fuzzy, no-c-format
msgid ""
"Increases the shield production of a Factory or Mfg. Plant in a city: a "
@@ -18205,12 +18358,12 @@ msgstr ""
"الزيادات درع مصنع النبات مصنع القوّة النبات مصنع النبات القوّة النبات الـ "
"المصØØ© المائية النبات القوّة النبات نووي النبات."
-#: data/default/buildings.ruleset:646 data/civ2/buildings.ruleset:610
+#: data/default/buildings.ruleset:645 data/civ2/buildings.ruleset:610
#: data/civ1/buildings.ruleset:468
msgid "Recycling Center"
msgstr "مركز إعادة التصنيع"
-#: data/default/buildings.ruleset:661 data/civ2/buildings.ruleset:625
+#: data/default/buildings.ruleset:660 data/civ2/buildings.ruleset:625
#: data/civ1/buildings.ruleset:483
#, fuzzy, no-c-format
msgid ""
@@ -18218,11 +18371,11 @@ msgid ""
"production in a city by 66%."
msgstr "المبنى :: صناعة البناء اعادة التصنيع توسيط."
-#: data/default/buildings.ruleset:667 data/civ2/buildings.ruleset:631
+#: data/default/buildings.ruleset:666 data/civ2/buildings.ruleset:631
msgid "Research Lab"
msgstr "مختبر أبØاث علمية"
-#: data/default/buildings.ruleset:682
+#: data/default/buildings.ruleset:681
#, fuzzy
msgid ""
"Together with a Library, a Research Lab increases the science production of "
@@ -18230,23 +18383,23 @@ msgid ""
"increases the science production of a city by 450%."
msgstr "سوية مع مكتبة البØØ« المختبر سوية مع مكتبة الجامعة البØØ« المختبر."
-#: data/default/buildings.ruleset:690 data/civ2/buildings.ruleset:654
+#: data/default/buildings.ruleset:689 data/civ2/buildings.ruleset:654
msgid "SAM Battery"
msgstr "بطارية سام الدÙاعية"
-#: data/default/buildings.ruleset:704 data/civ2/buildings.ruleset:668
+#: data/default/buildings.ruleset:703 data/civ2/buildings.ruleset:668
#, fuzzy
msgid ""
"Doubles the defense of all units inside the city when attacked by non-"
"nuclear air units."
msgstr "الأضعا٠الدÙاع."
-#: data/default/buildings.ruleset:710 data/civ2/buildings.ruleset:674
+#: data/default/buildings.ruleset:709 data/civ2/buildings.ruleset:674
#: data/civ1/buildings.ruleset:489
msgid "SDI Defense"
msgstr "دÙاع SDI"
-#: data/default/buildings.ruleset:724 data/civ2/buildings.ruleset:688
+#: data/default/buildings.ruleset:723 data/civ2/buildings.ruleset:688
#: data/civ1/buildings.ruleset:503
#, fuzzy
msgid ""
@@ -18255,23 +18408,23 @@ msgid ""
"missiles."
msgstr "ÙŠØمي نووي نووي أيضًا."
-#: data/default/buildings.ruleset:733 data/civ2/buildings.ruleset:697
+#: data/default/buildings.ruleset:732 data/civ2/buildings.ruleset:697
msgid "Sewer System"
msgstr "نظام المجاري"
-#: data/default/buildings.ruleset:748 data/civ2/buildings.ruleset:712
+#: data/default/buildings.ruleset:747 data/civ2/buildings.ruleset:712
#, fuzzy
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 "ÙŠØ³Ù…Ø Ø§Ù„Øجم أداة تعري٠قناة مائية الØجم."
-#: data/default/buildings.ruleset:754 data/civ2/buildings.ruleset:749
+#: data/default/buildings.ruleset:753 data/civ2/buildings.ruleset:749
#: data/civ1/buildings.ruleset:512
msgid "Space Component"
msgstr "مكوّن الÙضاء"
-#: data/default/buildings.ruleset:769 data/civ2/buildings.ruleset:763
+#: data/default/buildings.ruleset:768 data/civ2/buildings.ruleset:763
#: data/civ1/buildings.ruleset:526
#, fuzzy
msgid ""
@@ -18285,12 +18438,12 @@ msgstr ""
"الÙضاء المكوّنات الدÙع الوقود المكوّنات كلّ :: كلّ امرئ :: لكل قطعة :: لكل واØد "
"أنت أبولّو البرنامج."
-#: data/default/buildings.ruleset:779 data/civ2/buildings.ruleset:773
+#: data/default/buildings.ruleset:778 data/civ2/buildings.ruleset:773
#: data/civ1/buildings.ruleset:536
msgid "Space Module"
msgstr "ÙˆØدة الÙضاء"
-#: data/default/buildings.ruleset:794 data/civ2/buildings.ruleset:787
+#: data/default/buildings.ruleset:793 data/civ2/buildings.ruleset:787
#: data/civ1/buildings.ruleset:550
#, fuzzy
msgid ""
@@ -18313,12 +18466,12 @@ msgstr ""
"الÙضاء الوØدات هناك الÙضاء الوØدة السكن الوØدة الØياة الدعم الوØدة الطعام "
"السكن الوØدة شمسي اللجان الوØدات الÙضاء الوØدات أبولّو البرنامج."
-#: data/default/buildings.ruleset:813 data/civ2/buildings.ruleset:806
+#: data/default/buildings.ruleset:812 data/civ2/buildings.ruleset:806
#: data/civ1/buildings.ruleset:569
msgid "Space Structural"
msgstr "هيكلي الÙضاء"
-#: data/default/buildings.ruleset:828 data/civ2/buildings.ruleset:820
+#: data/default/buildings.ruleset:827 data/civ2/buildings.ruleset:820
#: data/civ1/buildings.ruleset:583
#, fuzzy
msgid ""
@@ -18330,33 +18483,33 @@ msgid ""
"have been built by any player."
msgstr "الÙضاء الكل أنت الÙضاء أبولّو البرنامج."
-#: data/default/buildings.ruleset:838 data/civ2/buildings.ruleset:830
+#: data/default/buildings.ruleset:837 data/civ2/buildings.ruleset:830
msgid "Stock Exchange"
msgstr "بورصة الأوراق المالية"
-#: data/default/buildings.ruleset:854 data/civ2/buildings.ruleset:846
+#: data/default/buildings.ruleset:853 data/civ2/buildings.ruleset:846
#, fuzzy, no-c-format
msgid ""
"Together with a Marketplace and a Bank, a Stock Exchange boosts tax and "
"luxury production in a city by 150%."
msgstr "سوية مع السوق بنك المخزون التبادل."
-#: data/default/buildings.ruleset:860 data/civ2/buildings.ruleset:852
+#: data/default/buildings.ruleset:859 data/civ2/buildings.ruleset:852
msgid "Super Highways"
msgstr "الطرق السريعة"
-#: data/default/buildings.ruleset:875 data/civ2/buildings.ruleset:867
+#: data/default/buildings.ruleset:874 data/civ2/buildings.ruleset:867
#, no-c-format
msgid ""
"Increases trade resources by 50% on all squares with roads or railroads."
msgstr ""
"زيادة مصادر التجارة ب50% على كل المربعات التي تØتوي على طرق أو سكك Øديدية."
-#: data/default/buildings.ruleset:883 data/civ2/buildings.ruleset:873
+#: data/default/buildings.ruleset:882 data/civ2/buildings.ruleset:873
msgid "Supermarket"
msgstr "السوبرماركت"
-#: data/default/buildings.ruleset:898 data/civ2/buildings.ruleset:888
+#: data/default/buildings.ruleset:897 data/civ2/buildings.ruleset:888
#, fuzzy, no-c-format
msgid ""
"Increases the food resources by 50% on each farmland square which is being "
@@ -18364,12 +18517,12 @@ msgid ""
"a second time."
msgstr "الزيادات الطعام أرض زراعية."
-#: data/default/buildings.ruleset:905 data/civ2/buildings.ruleset:895
+#: data/default/buildings.ruleset:904 data/civ2/buildings.ruleset:895
#: data/civ1/buildings.ruleset:593
msgid "Temple"
msgstr "المعبد"
-#: data/default/buildings.ruleset:919 data/civ2/buildings.ruleset:909
+#: data/default/buildings.ruleset:918 data/civ2/buildings.ruleset:909
#: data/civ1/buildings.ruleset:607
#, fuzzy
msgid ""
@@ -18378,25 +18531,25 @@ msgid ""
"citizens are made content."
msgstr "الطرازات مواطنيين كلاهما التصو٠العرا٠مع التصو٠العراÙ."
-#: data/default/buildings.ruleset:926 data/civ2/buildings.ruleset:916
+#: data/default/buildings.ruleset:925 data/civ2/buildings.ruleset:916
#: data/civ1/buildings.ruleset:614 data/default/techs.ruleset:742
#: data/civ2/techs.ruleset:727 data/civ1/techs.ruleset:723
msgid "University"
msgstr "الجامعة"
-#: data/default/buildings.ruleset:942
+#: data/default/buildings.ruleset:941
#, no-c-format
msgid ""
"Together with a Library, a University increases the science production of a "
"city by 250%."
msgstr "سوية مع المكتبة، تزيد الجامعة انتاج العلوم ÙÙŠ مدينة ب250%."
-#: data/default/buildings.ruleset:948 data/civ2/buildings.ruleset:938
+#: data/default/buildings.ruleset:947 data/civ2/buildings.ruleset:938
#: data/civ1/buildings.ruleset:636
msgid "Apollo Program"
msgstr "يرنامج أبولو للÙضاء"
-#: data/default/buildings.ruleset:962 data/civ2/buildings.ruleset:952
+#: data/default/buildings.ruleset:961 data/civ2/buildings.ruleset:952
#, fuzzy
msgid ""
"Entire map becomes visible for the player who owns it. It allows all "
@@ -18404,23 +18557,23 @@ msgid ""
"necessary technologies)."
msgstr "كامل هو."
-#: data/default/buildings.ruleset:969 data/civ2/buildings.ruleset:959
+#: data/default/buildings.ruleset:968 data/civ2/buildings.ruleset:959
msgid "A.Smith's Trading Co."
msgstr "شركة أ. سميث للتجارة."
-#: data/default/buildings.ruleset:983
+#: data/default/buildings.ruleset:982
#, fuzzy
msgid ""
"City improvements which would normally have an upkeep of 1 are free of "
"upkeep, for all your cities."
msgstr "المدينة."
-#: data/default/buildings.ruleset:989 data/civ2/buildings.ruleset:979
+#: data/default/buildings.ruleset:988 data/civ2/buildings.ruleset:979
#: data/civ1/buildings.ruleset:655
msgid "Colossus"
msgstr "العملاق"
-#: data/default/buildings.ruleset:1003 data/civ2/buildings.ruleset:993
+#: data/default/buildings.ruleset:1002 data/civ2/buildings.ruleset:993
#: data/civ1/buildings.ruleset:669
#, fuzzy
msgid ""
@@ -18428,34 +18581,34 @@ msgid ""
"generating some trade produces one extra trade resource."
msgstr "كلّ :: كلّ امرئ :: لكل قطعة :: لكل واØد."
-#: data/default/buildings.ruleset:1009 data/civ2/buildings.ruleset:999
+#: data/default/buildings.ruleset:1008 data/civ2/buildings.ruleset:999
#: data/civ1/buildings.ruleset:675
msgid "Copernicus' Observatory"
msgstr "مرصد كوبرنيكوس"
-#: data/default/buildings.ruleset:1024 data/civ2/buildings.ruleset:1180
+#: data/default/buildings.ruleset:1023 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 "دÙع انتاج العلوم ب100% ÙÙŠ أي مدينة يبنى Ùيها."
-#: data/default/buildings.ruleset:1029 data/civ2/buildings.ruleset:1019
+#: data/default/buildings.ruleset:1028 data/civ2/buildings.ruleset:1019
#: data/civ1/buildings.ruleset:695
msgid "Cure For Cancer"
msgstr "علاج للسرطان"
-#: data/default/buildings.ruleset:1043
+#: data/default/buildings.ruleset:1042
msgid ""
"This stunning technological achievement makes one unhappy citizen content in "
"all your cities."
msgstr "هذا التطور التكنولوجي المدهش يجعل المواطنيين التعساء سعداء ÙÙŠ كل مدنك."
-#: data/default/buildings.ruleset:1051 data/civ2/buildings.ruleset:1039
+#: data/default/buildings.ruleset:1050 data/civ2/buildings.ruleset:1039
#: data/civ1/buildings.ruleset:715
msgid "Darwin's Voyage"
msgstr "رØلة داروين"
-#: data/default/buildings.ruleset:1065 data/civ2/buildings.ruleset:1053
+#: data/default/buildings.ruleset:1064 data/civ2/buildings.ruleset:1053
#: data/civ1/buildings.ruleset:729
#, fuzzy
msgid ""
@@ -18464,22 +18617,22 @@ msgid ""
"technology advances."
msgstr "تشارلز داروين يعطي."
-#: data/default/buildings.ruleset:1072 data/civ2/buildings.ruleset:1060
+#: data/default/buildings.ruleset:1071 data/civ2/buildings.ruleset:1060
msgid "Eiffel Tower"
msgstr "برج ايÙÙ„"
-#: data/default/buildings.ruleset:1087
+#: data/default/buildings.ruleset:1086
#, fuzzy, no-c-format
msgid ""
"Your reputation and goodwill among other nations is recovered twice as fast."
msgstr "ملكك السمعة."
-#: data/default/buildings.ruleset:1093 data/civ2/buildings.ruleset:1081
+#: data/default/buildings.ruleset:1092 data/civ2/buildings.ruleset:1081
#: data/civ1/buildings.ruleset:736
msgid "Great Library"
msgstr "المكتبة العظمى"
-#: data/default/buildings.ruleset:1107 data/civ2/buildings.ruleset:1095
+#: data/default/buildings.ruleset:1106 data/civ2/buildings.ruleset:1095
#: data/civ1/buildings.ruleset:750
#, fuzzy
msgid ""
@@ -18487,21 +18640,21 @@ msgid ""
"least two other civilizations have achieved."
msgstr "الـ رائع مكتبة."
-#: data/default/buildings.ruleset:1113 data/civ2/buildings.ruleset:1101
+#: data/default/buildings.ruleset:1112 data/civ2/buildings.ruleset:1101
#: data/civ1/buildings.ruleset:756
msgid "Great Wall"
msgstr "سور الصين العظيم"
-#: data/default/buildings.ruleset:1127
+#: data/default/buildings.ruleset:1126
msgid "Works as a City Wall in all your cities."
msgstr "يعمل ÙƒØائط مدينة ÙÙŠ كل مدنك."
-#: data/default/buildings.ruleset:1135 data/civ2/buildings.ruleset:1122
+#: data/default/buildings.ruleset:1134 data/civ2/buildings.ruleset:1122
#: data/civ1/buildings.ruleset:777
msgid "Hanging Gardens"
msgstr "الØدائق المعلقة"
-#: data/default/buildings.ruleset:1149 data/civ2/buildings.ruleset:1136
+#: data/default/buildings.ruleset:1148 data/civ2/buildings.ruleset:1136
#: data/civ1/buildings.ruleset:791
#, fuzzy
msgid ""
@@ -18512,63 +18665,63 @@ msgid ""
"them content instead)."
msgstr "الطرازات مواطنيين الطرازات الشنق الØدائق ÙÙŠ الشنق الØدائق."
-#: data/default/buildings.ruleset:1158 data/civ2/buildings.ruleset:1145
+#: data/default/buildings.ruleset:1157 data/civ2/buildings.ruleset:1145
#: data/civ1/buildings.ruleset:800
msgid "Hoover Dam"
msgstr "سد هوڤر"
-#: data/default/buildings.ruleset:1173 data/civ2/buildings.ruleset:1159
+#: data/default/buildings.ruleset:1172 data/civ2/buildings.ruleset:1159
#, fuzzy
msgid ""
"Works as if you had a Hydro Plant in every city. (This reduces pollution "
"and increases the effects of Factories and Mfg. Plants.)"
msgstr "يعمل المصØØ© المائية النبات هذا المصانع النباتات"
-#: data/default/buildings.ruleset:1179 data/civ2/buildings.ruleset:1165
+#: data/default/buildings.ruleset:1178 data/civ2/buildings.ruleset:1165
#: data/civ1/buildings.ruleset:822
msgid "Isaac Newton's College"
msgstr "جامعة اسØاق نيوتن"
-#: data/default/buildings.ruleset:1194
+#: data/default/buildings.ruleset:1193
#, no-c-format
msgid ""
"Boosts science production by 100% in every city you control that has a "
"University."
msgstr "زيادة انتاج العلوم ب100% ÙÙŠ كل مدينة تسيطر عليها وتØتوي على جامعة."
-#: data/default/buildings.ruleset:1200 data/civ2/buildings.ruleset:1185
+#: data/default/buildings.ruleset:1199 data/civ2/buildings.ruleset:1185
#: data/civ1/buildings.ruleset:842
msgid "J.S. Bach's Cathedral"
msgstr "كاثدرائية ج. س. باخ"
-#: data/default/buildings.ruleset:1214 data/civ2/buildings.ruleset:1199
+#: data/default/buildings.ruleset:1213 data/civ2/buildings.ruleset:1199
msgid "Makes two unhappy citizens content in every city."
msgstr "اسعاد مواطنان تعساء ÙÙŠ كل مدينة."
-#: data/default/buildings.ruleset:1219 data/civ2/buildings.ruleset:1204
+#: data/default/buildings.ruleset:1218 data/civ2/buildings.ruleset:1204
msgid "King Richard's Crusade"
msgstr "Øملة الملك ريتشارد الصليبية"
-#: data/default/buildings.ruleset:1233 data/civ2/buildings.ruleset:1218
+#: data/default/buildings.ruleset:1232 data/civ2/buildings.ruleset:1218
msgid ""
"Adds one extra shield resource on every square around the city where it is "
"built."
msgstr "إضاÙØ© مصدر درع إضاÙÙŠ ÙÙŠ كل مربع Øول المدينة Øيث تم البناء."
-#: data/default/buildings.ruleset:1239 data/civ2/buildings.ruleset:1224
+#: data/default/buildings.ruleset:1238 data/civ2/buildings.ruleset:1224
msgid "Leonardo's Workshop"
msgstr "ورشة ليوناردو"
-#: data/default/buildings.ruleset:1253 data/civ2/buildings.ruleset:1238
+#: data/default/buildings.ruleset:1252 data/civ2/buildings.ruleset:1238
msgid "Upgrades one obsolete unit per game turn."
msgstr "تطوير ÙˆØدة قديمة واØدة ÙÙŠ كل دور لعبة."
-#: data/default/buildings.ruleset:1258 data/civ2/buildings.ruleset:1243
+#: data/default/buildings.ruleset:1257 data/civ2/buildings.ruleset:1243
#: data/civ1/buildings.ruleset:862
msgid "Lighthouse"
msgstr "المنارة"
-#: data/default/buildings.ruleset:1273
+#: data/default/buildings.ruleset:1272
#, fuzzy
msgid ""
"Gives all your sea units 1 additional movement point and eliminates the risk "
@@ -18576,34 +18729,34 @@ msgid ""
"(for all your cities)."
msgstr "يعطي السّÙÙ† الطرازات جديد."
-#: data/default/buildings.ruleset:1280 data/civ2/buildings.ruleset:1264
+#: data/default/buildings.ruleset:1279 data/civ2/buildings.ruleset:1264
#: data/civ1/buildings.ruleset:885
msgid "Magellan's Expedition"
msgstr "رØلة ماجلان الاستكشاÙية"
-#: data/default/buildings.ruleset:1295
+#: data/default/buildings.ruleset:1294
msgid "Gives all your sea units 2 additional movement points."
msgstr "إعطاء كل ÙˆØداتك البØرية نقاط تØرك إضاÙية."
-#: data/default/buildings.ruleset:1300 data/civ2/buildings.ruleset:1283
+#: data/default/buildings.ruleset:1299 data/civ2/buildings.ruleset:1283
#: data/civ1/buildings.ruleset:904
msgid "Manhattan Project"
msgstr "مشروع مانهاتن"
-#: data/default/buildings.ruleset:1318 data/civ2/buildings.ruleset:1301
+#: data/default/buildings.ruleset:1317 data/civ2/buildings.ruleset:1301
msgid "Marco Polo's Embassy"
msgstr "سÙارة ماركو بولو"
-#: data/default/buildings.ruleset:1332 data/civ2/buildings.ruleset:1315
+#: data/default/buildings.ruleset:1331 data/civ2/buildings.ruleset:1315
msgid "The player who owns it gets an embassy with all players."
msgstr "اللاعب الذي يملكها ÙŠØصل على سÙارة مع كل اللاعبيين."
-#: data/default/buildings.ruleset:1337 data/civ2/buildings.ruleset:1320
+#: data/default/buildings.ruleset:1336 data/civ2/buildings.ruleset:1320
#: data/civ1/buildings.ruleset:922
msgid "Michelangelo's Chapel"
msgstr "كنيسة مايكل أنجلو"
-#: data/default/buildings.ruleset:1351 data/civ2/buildings.ruleset:1334
+#: data/default/buildings.ruleset:1350 data/civ2/buildings.ruleset:1334
#, fuzzy
msgid ""
"Counts as having a Cathedral in each of your cities. This makes 3 unhappy "
@@ -18614,21 +18767,21 @@ msgid ""
msgstr ""
"التهم كاثدرائية هذا الـ اللاهوت كاثدرائية مواطنيين الـ الشيوعية كاثدرائية."
-#: data/default/buildings.ruleset:1361 data/civ2/buildings.ruleset:1344
+#: data/default/buildings.ruleset:1360 data/civ2/buildings.ruleset:1344
#: data/civ1/buildings.ruleset:941
msgid "Oracle"
msgstr "العراÙ"
-#: data/default/buildings.ruleset:1375
+#: data/default/buildings.ruleset:1374
msgid "Makes two of your unhappy citizens content in every city with a temple."
msgstr "اسعاد مواطنان تعساء ÙÙŠ كل مدينة مع معبد."
-#: data/default/buildings.ruleset:1380 data/civ2/buildings.ruleset:1363
+#: data/default/buildings.ruleset:1379 data/civ2/buildings.ruleset:1363
#: data/civ1/buildings.ruleset:960
msgid "Pyramids"
msgstr "الأهرام"
-#: data/default/buildings.ruleset:1394
+#: data/default/buildings.ruleset:1393
#, fuzzy
msgid ""
"The amount of stored food lost when one of your cities grows or shrinks is "
@@ -18636,30 +18789,30 @@ msgid ""
"famine. Cumulative with Granary."
msgstr "الـ الطعام هذا متراكم مع مخزن الØبوب."
-#: data/default/buildings.ruleset:1401 data/civ2/buildings.ruleset:1382
+#: data/default/buildings.ruleset:1400 data/civ2/buildings.ruleset:1382
#: data/civ1/buildings.ruleset:981
msgid "SETI Program"
msgstr "برنامج سيتي"
-#: data/default/buildings.ruleset:1415
+#: data/default/buildings.ruleset:1414
msgid "Boosts science production in each city with a Research Lab by 100%. "
msgstr "دÙع انتاج العلوم ÙÙŠ كل مدينة مع مختبر أبØاث ب 100%. "
-#: data/default/buildings.ruleset:1420 data/civ2/buildings.ruleset:1402
+#: data/default/buildings.ruleset:1419 data/civ2/buildings.ruleset:1402
#: data/civ1/buildings.ruleset:1001
msgid "Shakespeare's Theatre"
msgstr "Ù…Ø³Ø±Ø Ø´ÙƒØ³Ø¨ÙŠØ±"
-#: data/default/buildings.ruleset:1434 data/civ2/buildings.ruleset:1416
+#: data/default/buildings.ruleset:1433 data/civ2/buildings.ruleset:1416
#: data/civ1/buildings.ruleset:1015
msgid "Makes all unhappy citizens content, in the city where it is located."
msgstr "اسعاد كل المواطنيين التعساء ÙÙŠ المدينة Øيث تم البناء."
-#: data/default/buildings.ruleset:1439 data/civ2/buildings.ruleset:1421
+#: data/default/buildings.ruleset:1438 data/civ2/buildings.ruleset:1421
msgid "Statue of Liberty"
msgstr "تمثال الØرية"
-#: data/default/buildings.ruleset:1453 data/civ2/buildings.ruleset:1435
+#: data/default/buildings.ruleset:1452 data/civ2/buildings.ruleset:1435
#: data/civ1/buildings.ruleset:974 data/civ1/buildings.ruleset:1034
#, fuzzy
msgid ""
@@ -18668,32 +18821,32 @@ msgid ""
"Anarchy."
msgstr "ÙŠØ³Ù…Ø Ø§Ù„Ùوضوية."
-#: data/default/buildings.ruleset:1460 data/civ2/buildings.ruleset:1442
+#: data/default/buildings.ruleset:1459 data/civ2/buildings.ruleset:1442
msgid "Sun Tzu's War Academy"
msgstr "اكاديمية سن تزو الØربية"
-#: data/default/buildings.ruleset:1474
+#: data/default/buildings.ruleset:1473
#, fuzzy
msgid ""
"All your new ground units start at the first veteran level. The chance of a "
"unit getting the next veteran level after a battle increases by half."
msgstr "الكل جديد خيير الـ ÙˆØدات خيير."
-#: data/default/buildings.ruleset:1481 data/civ2/buildings.ruleset:1463
+#: data/default/buildings.ruleset:1480 data/civ2/buildings.ruleset:1463
#: data/civ1/buildings.ruleset:1020
msgid "United Nations"
msgstr "الأمم المتØدة"
-#: data/default/buildings.ruleset:1495
+#: data/default/buildings.ruleset:1494
msgid "All your units regain two extra hitpoints per turn."
msgstr "كل ÙˆØداتك تستعيد نقطتا تØمل كل دور."
-#: data/default/buildings.ruleset:1508 data/civ2/buildings.ruleset:1490
+#: data/default/buildings.ruleset:1507 data/civ2/buildings.ruleset:1490
#: data/civ1/buildings.ruleset:1046
msgid "Women's Suffrage"
msgstr "تصويت النساء"
-#: data/default/buildings.ruleset:1522 data/civ2/buildings.ruleset:1504
+#: data/default/buildings.ruleset:1521 data/civ2/buildings.ruleset:1504
#, fuzzy
msgid ""
"Counts as a Police Station in every city. (That is, for each city, reduces "
@@ -18701,11 +18854,11 @@ msgid ""
"under Republic. This wonder has no effect under other governments.)"
msgstr "التهم الشرطة المØطة ذلك الØكم الديقراطي الØكم الجمهوري هذا"
-#: data/default/buildings.ruleset:1533
+#: data/default/buildings.ruleset:1532
msgid "Coinage"
msgstr "العملة"
-#: data/default/buildings.ruleset:1554
+#: data/default/buildings.ruleset:1553
#, fuzzy
msgid ""
"This is not a normal improvement. Instead, setting a city's production to "
@@ -19089,11 +19242,16 @@ msgstr "?citystyle:الكيلتي"
msgid "?citystyle:Industrial"
msgstr "?citystyle:صناعي"
-#: data/default/cities.ruleset:139 data/civ2/cities.ruleset:150
+#: data/default/cities.ruleset:139
+#, fuzzy
+msgid "?citystyle:ElectricAge"
+msgstr "?citystyle:الكيلتي"
+
+#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:150
msgid "?citystyle:Modern"
msgstr "?citystyle:Øديث"
-#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:161
+#: data/default/cities.ruleset:161 data/civ2/cities.ruleset:161
msgid "?citystyle:PostModern"
msgstr "?citystyle:بعد الØديث"
@@ -24163,6 +24321,41 @@ msgstr "الÙريق 30"
msgid "Team 31"
msgstr "الÙريق 31"
+#~ msgid "Command access level could not be set to '%s' for connection %s."
+#~ msgstr "Ùشل تØديد مستوي صلاØيات الأوامر ب '%s' للاتصال %s."
+
+#~ msgid "Observers cannot vote."
+#~ msgstr "لا يستطيع المراقبون التصويت."
+
+#~ msgid ""
+#~ "You can only vote in a running game. Use 'first' to become the game "
+#~ "organizer if there currently is none."
+#~ msgstr ""
+#~ "تستطيع التصويت Ùقط ÙÙŠ لعبة شغالة. استعمل 'first' Ù„ØªØµØ¨Ø Ù…Ù†Ø¸Ù… اللعبة إذا "
+#~ "لم يكن هناك Øاليا Ø£Øد."
+
+#~ msgid "Vote %d \"%s\": %d for, %d against"
+#~ msgstr "التصويت %d \"%s\": %d مع, %d ضد"
+
+#~ msgid "Value must be integer."
+#~ msgstr "يجب أن تكون القيمة رقم صØÙŠØ."
+
+#, fuzzy
+#~ 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 Hydro Plant, Power Plant, or Nuclear Plant. A "
+#~ "city can only build a Hydro Plant if it is next to (or on) a Mountain or "
+#~ "River tile."
+#~ msgstr ""
+#~ "يخÙّض هو درع مصنع النبات مصنع المصØØ© المائية النبات مصنع النبات المصØØ© "
+#~ "المائية النبات المصØØ© المائية النبات القوّة النبات نووي النبات أي - الØر٠"
+#~ "الأوّل ÙÙŠ الأبجديّة اللّاتينيّة المصØØ© المائية النبات الجبل النهر."
+
#, fuzzy
#~ msgid "Auth config filename \"%s\" not allowed!"
#~ msgstr "ذلك الاسم غير مسموØ."
diff --git a/po/ca.gmo b/po/ca.gmo
index 1128729..ce09e4b 100644
Binary files a/po/ca.gmo and b/po/ca.gmo differ
diff --git a/po/ca.po b/po/ca.po
index 141889f..a49e04a 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -10,10 +10,10 @@ msgid ""
msgstr ""
"Project-Id-Version: ca\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-29 21:13+0900\n"
-"PO-Revision-Date: 2009-03-23 23:46+0100\n"
+"POT-Creation-Date: 2009-11-22 21:37+0100\n"
+"PO-Revision-Date: 2009-11-20 23:40+0100\n"
"Last-Translator: Joan Creus <joan.creus at gmail dot com>\n"
-"Language-Team: Català <ca at li.org>\n"
+"Language-Team: Català <en at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -67,21 +67,21 @@ msgstr "?obsolet:O"
msgid "?redundant:*"
msgstr "?redundant:*"
-#: common/connection.c:515
+#: common/connection.c:518
#, c-format
msgid "%s from %s"
msgstr "%s de %s"
-#: common/connection.c:521
+#: common/connection.c:524
msgid " (connection incomplete)"
msgstr " (connexió incompleta)"
-#: common/connection.c:525
+#: common/connection.c:528
#, c-format
msgid " (player %s)"
msgstr " (jugador %s)"
-#: common/connection.c:529
+#: common/connection.c:532
msgid " (observer)"
msgstr " (observador)"
@@ -485,81 +485,81 @@ msgstr "Missatges de connexió/desconnexió"
msgid "AI Debug messages"
msgstr "Missatges de depuració d'IA"
-#: common/player.c:732
+#: common/player.c:746
msgid "?attitude:Genocidal"
msgstr "Genocida"
-#: common/player.c:734
+#: common/player.c:748
msgid "?attitude:Belligerent"
msgstr "Bel·ligerant"
-#: common/player.c:736
+#: common/player.c:750
msgid "?attitude:Hostile"
msgstr "Hostil"
-#: common/player.c:738
+#: common/player.c:752
msgid "?attitude:Uncooperative"
msgstr "No cooperativa"
-#: common/player.c:740
+#: common/player.c:754
msgid "?attitude:Uneasy"
msgstr "Intranquil·la"
-#: common/player.c:742
+#: common/player.c:756
msgid "?attitude:Neutral"
msgstr "Neutral"
-#: common/player.c:744
+#: common/player.c:758
msgid "?attitude:Respectful"
msgstr "Respectuosa"
-#: common/player.c:746
+#: common/player.c:760
msgid "?attitude:Helpful"
msgstr "Col·laboració"
-#: common/player.c:748
+#: common/player.c:762
msgid "?attitude:Enthusiastic"
msgstr "Entusiasta"
-#: common/player.c:750
+#: common/player.c:764
msgid "?attitude:Admiring"
msgstr "Admiració"
-#: common/player.c:753
+#: common/player.c:767
msgid "?attitude:Worshipful"
msgstr "Veneració"
-#: common/player.c:764
+#: common/player.c:778
msgid "?diplomatic_state:Armistice"
msgstr "Armistici"
-#: common/player.c:765
+#: common/player.c:779
msgid "?diplomatic_state:War"
msgstr "Guerra"
-#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:780 client/gui-gtk-2.0/diplodlg.c:353
#: 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:767 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:781 client/gui-gtk-2.0/diplodlg.c:358
#: 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:768 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:782 client/gui-gtk-2.0/diplodlg.c:363
#: 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:769
+#: common/player.c:783
msgid "?diplomatic_state:Never met"
msgstr "Sense contacte"
-#: common/player.c:770
+#: common/player.c:784
msgid "?diplomatic_state:Team"
msgstr "Equip"
@@ -590,7 +590,7 @@ msgstr "Requeriments de supervivència només se suporten a nivell mundial."
#. TRANS: "Resources: (none)".
#: common/requirements.c:1014 common/team.c:132
#: client/gui-gtk-2.0/helpdlg.c:1055 client/gui-gtk-2.0/inteldlg.c:390
-#: client/gui-win32/helpdlg.c:586 client/gui-xaw/helpdlg.c:991
+#: client/gui-win32/helpdlg.c:592 client/gui-xaw/helpdlg.c:991
#, c-format
msgid "(none)"
msgstr "(cap)"
@@ -616,10 +616,11 @@ msgstr "Tecnologia del futur %d"
#: 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
#: client/gui-sdl/helpdlg.c:817 client/gui-sdl/mapview.c:962
-#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:545
-#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:735
-#: 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
+#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:544
+#: client/gui-win32/helpdlg.c:551 client/gui-win32/helpdlg.c:721
+#: client/gui-win32/helpdlg.c:741 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 "Cap"
@@ -632,29 +633,29 @@ msgstr "Tecnologia del futur"
msgid "(Unknown)"
msgstr "(Desconegut)"
-#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:553
#: manual/civmanual.c:224
msgid "Road"
msgstr "CamÃ"
-#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:557
#: client/gui-gtk-2.0/menu.c:829 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ó"
+msgstr "Regadiu"
-#: common/terrain.c:394 common/terrain.c:572 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:567
#: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
#: data/civ1/techs.ruleset:563
msgid "Railroad"
msgstr "Ferrocarril"
-#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:555
msgid "Mine"
msgstr "Mina"
-#: common/terrain.c:396 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:551 server/report.c:124
#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "Contaminació"
@@ -663,7 +664,7 @@ msgstr "Contaminació"
msgid "Hut"
msgstr "Cabana"
-#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:563
#: manual/civmanual.c:226
msgid "Fortress"
msgstr "Fortificació"
@@ -676,58 +677,58 @@ msgstr "Riu"
msgid "Farmland"
msgstr "Horta"
-#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:577
#: manual/civmanual.c:226
msgid "Airbase"
msgstr "Base aèria"
-#: common/terrain.c:402 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:579
msgid "Fallout"
msgstr "Radioactivitat"
-#: common/unit.c:546 client/gui-win32/plrdlg.c:337
+#: common/unit.c:549 client/gui-win32/plrdlg.c:337
msgid "Idle"
msgstr "Inactiu"
-#: common/unit.c:556
+#: common/unit.c:559
msgid "Fortifying"
msgstr "S'està fortificant"
-#: common/unit.c:558
+#: common/unit.c:561
msgid "Fortified"
msgstr "Fortificat"
-#: common/unit.c:562 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
+#: common/unit.c:565 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
msgid "Sentry"
msgstr "Sentinella"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
+#: common/unit.c:569 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
#: client/gui-win32/menu.c:370 client/gui-xaw/menu.c:185
msgid "Pillage"
msgstr "Saquejar"
-#: common/unit.c:568 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
+#: common/unit.c:571 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
msgid "Goto"
msgstr "Anar a"
-#: common/unit.c:570
+#: common/unit.c:573
msgid "Explore"
msgstr "Explorar"
-#: common/unit.c:572 manual/civmanual.c:224
+#: common/unit.c:575 manual/civmanual.c:224
msgid "Transform"
msgstr "Transformar"
-#: common/unit.c:584 client/text.c:157 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:587 client/text.c:157 client/gui-sdl/citydlg.c:1972
#: client/gui-win32/citydlg.c:1257 client/gui-xaw/citydlg.c:1423
msgid "Unknown"
msgstr "Desconegut"
-#: common/unit.c:1022
+#: common/unit.c:1025
msgid "Moves"
msgstr "Moviments"
-#: common/unit.c:1571
+#: common/unit.c:1574
#, c-format
msgid ""
"Upgrade %s to %s for %d gold?\n"
@@ -736,12 +737,12 @@ msgstr ""
"Millorar %s a %s per %d peces d'or?\n"
"El Tresor conté %d peces d'or."
-#: common/unit.c:1579
+#: common/unit.c:1582
#, c-format
msgid "Sorry, cannot upgrade %s (yet)."
msgstr "Ho sento: no es pot millorar %s (encara)."
-#: common/unit.c:1585
+#: common/unit.c:1588
#, c-format
msgid ""
"Upgrading %s to %s costs %d gold.\n"
@@ -750,11 +751,11 @@ msgstr ""
"Actualitzant %s a %s per %d peces d'or.\n"
"El Tresor conté %d peces d'or."
-#: common/unit.c:1594
+#: common/unit.c:1597
msgid "You can only upgrade units in your cities."
msgstr "Només es poden millorar unitats dins de les teves ciutats."
-#: common/unit.c:1598
+#: common/unit.c:1601
#, c-format
msgid "Upgrading this %s would strand units it transports."
msgstr "Millorar aquest %s deixaria penjades unitats que està transportant."
@@ -787,11 +788,11 @@ msgstr "MÃssil nuclear"
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1404
+#: common/unittype.c:349 client/helpdata.c:1412
msgid " and "
msgstr " i "
-#: common/unittype.c:355 client/helpdata.c:1390
+#: common/unittype.c:355 client/helpdata.c:1398
msgid "?and:, "
msgstr ", "
@@ -962,71 +963,71 @@ msgstr "Argument buit per a \"%s\".\n"
msgid "Missing argument for \"%s\".\n"
msgstr "Falten arguments per a \"%s\".\n"
-#: utility/shared.c:501
+#: utility/shared.c:514
#, c-format
msgid "%d BC"
msgstr "%d a.C."
-#: utility/shared.c:503
+#: utility/shared.c:516
#, c-format
msgid "%d AD"
msgstr "%d d.C."
-#: utility/shared.c:924
+#: utility/shared.c:937
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:1028
+#: utility/shared.c:1041
#, 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:1279
+#: utility/shared.c:1292
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:1281
+#: utility/shared.c:1294
#, c-format
msgid "Current data path is: \"%s\""
msgstr "La ruta de dades actual és: \"%s\""
-#: utility/shared.c:1283
+#: utility/shared.c:1296
#, c-format
msgid "The \"%s\" file is required ... aborting!"
msgstr "El fitxer \"%s\" és necessari ... s'està avortant!"
-#: utility/shared.c:1460
+#: utility/shared.c:1485
#, 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:1462
+#: utility/shared.c:1487
msgid "Use a non-privileged account instead.\n"
msgstr "Utilitza un compte no privilegiat.\n"
-#: utility/shared.c:1478
+#: utility/shared.c:1503
msgid "exact match"
msgstr "coincidència exacta"
-#: utility/shared.c:1479
+#: utility/shared.c:1504
msgid "only match"
msgstr "única coincidència"
-#: utility/shared.c:1480
+#: utility/shared.c:1505
msgid "ambiguous"
msgstr "ambigu"
-#: utility/shared.c:1481
+#: utility/shared.c:1506
msgid "empty"
msgstr "buit"
-#: utility/shared.c:1482
+#: utility/shared.c:1507
msgid "too long"
msgstr "massa llarg"
-#: utility/shared.c:1483
+#: utility/shared.c:1508
msgid "non-match"
msgstr "no hi ha coincidència"
@@ -1055,22 +1056,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:280
+#: ai/advdiplomacy.c:300
#, 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:290
+#: ai/advdiplomacy.c:310
#, 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:303
+#: ai/advdiplomacy.c:322
#, c-format
msgid "*%s (AI)* Let us first cease hostilies, %s."
msgstr "*%s (IA)* Primer aturem les hostilitats, %s."
-#: ai/advdiplomacy.c:308
+#: ai/advdiplomacy.c:327
#, c-format
msgid ""
"*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
@@ -1078,49 +1079,49 @@ msgid ""
msgstr ""
"*%s (IA)* Abans, vull que mantinguis l'alto el foc actual una mica més, %s."
-#: ai/advdiplomacy.c:331
+#: ai/advdiplomacy.c:350
#, 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:424
+#: ai/advdiplomacy.c:443
#, 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:454
+#: ai/advdiplomacy.c:473
#, 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:560
+#: ai/advdiplomacy.c:579
#, 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:582
+#: ai/advdiplomacy.c:601
#, c-format
msgid "*%s (AI)* Welcome into our alliance %s!"
msgstr "*%s (IA)* Benvingut a la nostra aliança %s!"
-#: ai/advdiplomacy.c:586
+#: ai/advdiplomacy.c:605
#, 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:593
+#: ai/advdiplomacy.c:612
#, c-format
msgid "*%s (AI)* Yes, peace in our time!"
msgstr "*%s (IA)* SÃ, pau en aquest moment!"
-#: ai/advdiplomacy.c:598
+#: ai/advdiplomacy.c:617
#, c-format
msgid "*%s (AI)* Agreed. No more hostilities, %s."
msgstr "*%s (IA)* D'acord. Prou d'hostilitats, %s."
-#: ai/advdiplomacy.c:813
+#: ai/advdiplomacy.c:832
#, c-format
msgid ""
"*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
@@ -1129,23 +1130,23 @@ msgstr ""
"*%s (AI)* Salut, %s! Podem suggerir un alto el foc mentre ens coneixem una "
"mica millor?"
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1116
#, c-format
msgid "*%s (AI)* Space will never be yours. "
msgstr "*%s (IA)* L'espai no serà mai teu. "
-#: ai/advdiplomacy.c:1102
+#: ai/advdiplomacy.c:1121
#, 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:1108
+#: ai/advdiplomacy.c:1127
#, c-format
msgid "*%s (AI)* Peace in ... some other time."
-msgstr "*%s (IA)* Pau ... en un altre moment."
+msgstr "*%s (IA)* Pau ... en algun altre moment."
-#: ai/advdiplomacy.c:1113
+#: ai/advdiplomacy.c:1132
#, c-format
msgid ""
"*%s (AI)* Finally I get around to you! Did you really think you could get "
@@ -1154,19 +1155,19 @@ msgstr ""
"*%s (IA)* Finalment t'he trobat! Et pensaves que podries sortir impune de "
"tots els teus crims?"
-#: ai/advdiplomacy.c:1119
+#: ai/advdiplomacy.c:1138
#, 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:1126
+#: ai/advdiplomacy.c:1145
#, 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:1209
+#: ai/advdiplomacy.c:1229
#, c-format
msgid ""
"*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1181,7 +1182,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:1219
+#: ai/advdiplomacy.c:1239
#, c-format
msgid ""
"*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
@@ -1190,7 +1191,7 @@ msgstr ""
"*%s (AI)* Esperarem la vostra ajuda en aquest assumpte. Llarga vida a la "
"nostra gloriosa aliança!"
-#: ai/advdiplomacy.c:1225
+#: ai/advdiplomacy.c:1245
#, c-format
msgid ""
"*%s (AI)* %s has grossly violated his treaties with us for own gain. We "
@@ -1209,7 +1210,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:1238
+#: ai/advdiplomacy.c:1258
#, c-format
msgid ""
"*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1224,13 +1225,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:1246
+#: ai/advdiplomacy.c:1266
#, 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:1251
+#: ai/advdiplomacy.c:1271
#, c-format
msgid ""
"*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1245,14 +1246,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:1261
+#: ai/advdiplomacy.c:1281
#, 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:1267
+#: ai/advdiplomacy.c:1287
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance and declare war on %s in %d turn. "
@@ -1267,7 +1268,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:1276
+#: ai/advdiplomacy.c:1296
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1282,7 +1283,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:1344
+#: ai/advdiplomacy.c:1364
#, c-format
msgid ""
"*%s (AI)* Your attempt to conquer space for yourself alone betray your true "
@@ -1291,7 +1292,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:1359
+#: ai/advdiplomacy.c:1379
#, c-format
msgid ""
"*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
@@ -1300,7 +1301,7 @@ msgstr ""
"*%s (IA)* El teu intent de dominar unilateralment l'espai exterior és del "
"tot ofensiu."
-#: ai/advdiplomacy.c:1362
+#: ai/advdiplomacy.c:1382
#, c-format
msgid ""
"*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
@@ -1309,12 +1310,12 @@ msgstr ""
"*%s (IA)* Si no deixes de construir la nau espacial, hauré de prendre "
"mesures!"
-#: ai/advdiplomacy.c:1474
+#: ai/advdiplomacy.c:1494
#, 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:1549
+#: ai/advdiplomacy.c:1569
#, c-format
msgid ""
"*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
@@ -1323,7 +1324,7 @@ msgstr ""
"*%s (IA)* Salutacions al nostre indiscutible aliat, apel·lem a tu per a "
"destruir el nostre enemic, %s."
-#: ai/advdiplomacy.c:1555
+#: ai/advdiplomacy.c:1575
#, c-format
msgid ""
"*%s (AI)* Greetings ally, I see you have not yet made war with our enemy, %"
@@ -1332,7 +1333,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:1562
+#: ai/advdiplomacy.c:1582
#, c-format
msgid ""
"*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1343,7 +1344,7 @@ msgstr ""
"amb el nostre enemic mortal, %s! Això és inacceptable; la nostra aliança "
"s'ha acabat!"
-#: ai/advdiplomacy.c:1592
+#: ai/advdiplomacy.c:1612
#, c-format
msgid ""
"*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
@@ -1352,13 +1353,13 @@ msgstr ""
"*%s (IA)* Salutacions amic, ens permets suggerir de fer causa comuna i unir-"
"nos en aliança?"
-#: ai/advdiplomacy.c:1607
+#: ai/advdiplomacy.c:1627
#, 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:1622
+#: ai/advdiplomacy.c:1642
#, c-format
msgid ""
"*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
@@ -1367,7 +1368,7 @@ msgstr ""
"*%s (IA)* Ens estem cansant de tant vessament de sang. Ens permets suggerir "
"un atur de les hostilitats?"
-#: ai/advdiplomacy.c:1742
+#: ai/advdiplomacy.c:1762
#, c-format
msgid ""
"*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1386,12 +1387,12 @@ msgstr "Opció autent. \"%s\":"
#. may have been inserted between these.
#: server/auth.c:183
msgid " missing from config file (using default)"
-msgstr "no és al fitxer de configuració (usant el defecte)"
+msgstr "no és al fitxer de configuració (usant el predeterminat)"
#. TRANS: auth option originates from internal default
#: server/auth.c:186
msgid " (default)"
-msgstr " (defecte)"
+msgstr " (predeterminat)"
#. TRANS: auth option originates from config file
#: server/auth.c:191
@@ -1523,17 +1524,17 @@ msgstr ""
"La contrasenya ha de tenir com a mÃnim %d lletres majúscules, %d nombres, i "
"tenir com a mÃnim %d carà cters de longitud (imprimibles). Torna a provar-ho."
-#: server/barbarian.c:183
+#: server/barbarian.c:184
#, c-format
msgid "%s gain a leader by the name %s. Dangerous times may lie ahead."
msgstr "%s nomenen un lÃder anomenat %s. S'acosten temps perillosos."
-#: server/barbarian.c:479
+#: server/barbarian.c:480
#, c-format
msgid "Native unrest near %s led by %s."
msgstr "Descontent dels nadius prop de %s dirigit per %s."
-#: server/barbarian.c:484
+#: server/barbarian.c:485
#, c-format
msgid "Sea raiders seen near %s!"
msgstr "S'han vist pirates prop de %s!"
@@ -1813,7 +1814,7 @@ msgid ""
"%s can't build %s from the worklist; tech not yet available. Postponing..."
msgstr ""
"%s no pot construir %s de la llista de treball, la tecnologia encara no està "
-"disponible. Es posposa..."
+"disponible. S'ajorna..."
#: server/cityturn.c:662 server/cityturn.c:698
#, c-format
@@ -1833,38 +1834,38 @@ msgid ""
"Postponing..."
msgstr ""
"%s no pot construir %s de la llista de treball, la tecnologia %s encara no "
-"està disponible. Es posposa..."
+"està disponible. S'ajorna..."
#: server/cityturn.c:743
#, c-format
msgid ""
"%s can't build %s from the worklist; need to have %s first. Postponing..."
msgstr ""
-"%s no pot construir %s de la llista de treball, cal tenir %s. Es posposa..."
+"%s no pot construir %s de la llista de treball, cal tenir %s. S'ajorna..."
#: server/cityturn.c:756
#, c-format
msgid ""
"%s can't build %s from the worklist; it needs %s government. Postponing..."
msgstr ""
-"%s no pot construir %s de la llista de treball, necessita govern %s. Es "
-"posposa..."
+"%s no pot construir %s de la llista de treball, necessita govern %s. "
+"S'ajorna..."
#: server/cityturn.c:768
#, c-format
msgid ""
"%s can't build %s from the worklist; %s special is required. Postponing..."
msgstr ""
-"%s no pot construir %s de la llista de treball, cal una casella amb %s. Es "
-"posposa..."
+"%s no pot construir %s de la llista de treball, cal una casella amb %s. "
+"S'ajorna..."
#: server/cityturn.c:780
#, c-format
msgid ""
"%s can't build %s from the worklist; %s terrain is required. Postponing..."
msgstr ""
-"%s no pot construir %s de la llista de treball, cal terreny de %s. Es "
-"posposa..."
+"%s no pot construir %s de la llista de treball, cal terreny de %s. "
+"S'ajorna..."
#: server/cityturn.c:794
#, c-format
@@ -1872,7 +1873,7 @@ msgid ""
"%s can't build %s from the worklist; only %s may build this. Postponing..."
msgstr ""
"%s no pot construir %s de la llista de treball; només %s pot construir-ho. "
-"Es posposa..."
+"S'ajorna..."
#: server/cityturn.c:813
#, c-format
@@ -1880,14 +1881,14 @@ msgid ""
"%s can't build %s from the worklist; city must be of size %d. Postponing..."
msgstr ""
"%s no pot construir %s de la llista de treball, la ciutat ha de ser de mida %"
-"d. Es posposa..."
+"d. S'ajorna..."
#: server/cityturn.c:835
#, c-format
msgid "%s can't build %s from the worklist; Reason unknown! Postponing..."
msgstr ""
-"%s no pot construir %s de la llista de treball, raó desconeguda!!!. Es "
-"posposa..."
+"%s no pot construir %s de la llista de treball, raó desconeguda!!!. "
+"S'ajorna..."
#. TRANS: The <city> worklist ....
#: server/cityturn.c:870
@@ -1927,7 +1928,7 @@ msgid_plural "%s boosts research; you gain %d immediate advances."
msgstr[0] "%s dispara la recerca; obtens %d avenç immediat."
msgstr[1] "%s dispara la recerca, obtens %d avenços immediats."
-#: server/cityturn.c:1158 server/techtools.c:176
+#: server/cityturn.c:1158 server/techtools.c:172
#, c-format
msgid "The %s have acquired %s from %s."
msgstr "Els %s han adquirit %s dels %s."
@@ -1986,7 +1987,7 @@ msgstr "S'ha restablert l'ordre a %s."
#: server/cityturn.c:1539
#, c-format
msgid "The people have overthrown your %s, your country is in turmoil."
-msgstr "La gent ha destronat el teu %s, el paÃs està en aixecament."
+msgstr "La gent ha destronat el teu %s, hi ha desordres al teu paÃs."
#: server/cityturn.c:1564
#, c-format
@@ -2011,22 +2012,22 @@ msgid "Warning: the %s option is obsolete. Use -m to enable the metaserver.\n"
msgstr ""
"Atenció: l'opció %s és obsoleta. Usa -m per activar el metaservidor.\n"
-#: server/civserver.c:189
+#: server/civserver.c:193
#, c-format
msgid "Error: unknown option '%s'\n"
msgstr "Error: opció desconeguda '%s'\n"
-#: server/civserver.c:200
+#: server/civserver.c:204
#, c-format
msgid "This is the server for %s"
msgstr "Aquest és el servidor de %s"
-#: server/civserver.c:201
+#: server/civserver.c:205
#, c-format
msgid "You can learn a lot about Freeciv at %s"
msgstr "Pots aprendre molt sobre a Freeciv a %s"
-#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
+#: server/civserver.c:210 client/civclient.c:239 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -2035,7 +2036,7 @@ msgstr ""
"Ús: %s [opció ...]\n"
"Les opcions và lides són:\n"
-#: server/civserver.c:208
+#: server/civserver.c:212
msgid ""
" -a --auth FILE\tEnable server authentication with configuration from "
"FILE.\n"
@@ -2043,103 +2044,107 @@ msgstr ""
" -a --auth FITXER\tPermetre autenticació de servidor amb la configuració "
"del FITXER.\n"
-#: server/civserver.c:210
+#: server/civserver.c:214
msgid " -G --Guests\t\tAllow guests to login if auth is enabled.\n"
msgstr ""
" -G --Guests\t\tPermetre que els convidats entrin si auth està permès.\n"
-#: server/civserver.c:212
+#: server/civserver.c:216
msgid " -N --Newusers\tAllow new users to login if auth is enabled.\n"
msgstr ""
" -N -Newusers\tPermet als nous usuaris d'entrar si auth està permès \n"
-#: server/civserver.c:215
+#: server/civserver.c:219
msgid " -b --bind ADDR\tListen for clients on ADDR\n"
msgstr " -b, --bind ADDR\tEscolta els clients a ADDR\n"
-#: server/civserver.c:217 client/civclient.c:242
+#: server/civserver.c:221 client/civclient.c:243
msgid ""
" -d, --debug NUM\tSet debug log level (0 to 4, or 4:file1,min,max:...)\n"
msgstr ""
" -d, --debug NÚM\tFixa nivell de registre de depuració (0 a 4, ó 4:fitx1,"
"mÃn,mà x:...)\n"
-#: server/civserver.c:221 client/civclient.c:246
+#: server/civserver.c:225 client/civclient.c:247
msgid " -d, --debug NUM\tSet debug log level (0 to 3)\n"
msgstr " -d, --debug NÚM\tFixa nivell de registre de depuració (0 a 3)\n"
-#: server/civserver.c:223
+#: server/civserver.c:227
msgid " -f, --file FILE\tLoad saved game FILE\n"
msgstr " -f, --file FITXER\tCarrega una partida desada del FITXER\n"
-#: server/civserver.c:225 client/civclient.c:249 manual/civmanual.c:382
+#: server/civserver.c:229 client/civclient.c:250 manual/civmanual.c:382
msgid " -h, --help\t\tPrint a summary of the options\n"
msgstr " -h, --help\t\tMostra un resum de les opcions\n"
-#: server/civserver.c:226
+#: server/civserver.c:230
+msgid " -i, --identity ADDR\tBe known as ADDR at metaserver\n"
+msgstr " -i, --identity ADDR\tSer conegut com a ADDR al metaservidor\n"
+
+#: server/civserver.c:231
msgid " -l, --log FILE\tUse FILE as logfile\n"
msgstr " -l, --log FITXER\tUsa FITXER com a fitxer de registre\n"
-#: server/civserver.c:227
+#: server/civserver.c:232
msgid " -m, --meta\t\tNotify metaserver and send server's info\n"
msgstr ""
" -m, --meta\t\tNotificar el metaservidor i enviar-hi la informació del "
"servidor\n"
-#: server/civserver.c:229
+#: server/civserver.c:234
msgid " -M, --Metaserver ADDR\tSet ADDR as metaserver address\n"
msgstr " -M, --Metaserver ADDR\tEstableix ADDR com adreça del metaservidor\n"
-#: server/civserver.c:232
+#: server/civserver.c:237
msgid " -p, --port PORT\tListen for clients on port PORT\n"
msgstr " -p, --port PORT\tEscolta els clients al port PORT\n"
-#: server/civserver.c:234
+#: server/civserver.c:239
msgid " -q, --quitidle TIME\tQuit if no players for TIME seconds\n"
msgstr " -q, --quitidle TEMPS\tSurt si no hi ha jugadors en TEMPS segons\n"
-#: server/civserver.c:236
+#: server/civserver.c:241
msgid " -e, --exit-on-end\tWhen a game ends, exit instead of restarting\n"
msgstr ""
" -e, --exit-on-end\tQuan una partida acaba, sortir en comptes de reiniciar\n"
-#: server/civserver.c:239
+#: server/civserver.c:244
msgid " -s, --saves DIR\tSave games to directory DIR\n"
msgstr " -s, --saves DIR\tDesar les partides al directori DIR\n"
-#: server/civserver.c:241
+#: server/civserver.c:246
msgid " -S, --Serverid ID\tSets the server id to ID\n"
msgstr " -s, --Serverid ID\tCanvia l'identificador de servidor a ID\n"
-#: server/civserver.c:243
+#: server/civserver.c:248
msgid " -P, --Ppm\t\tSave ppms of the map when saving the game.\n"
msgstr " -P, --Ppm\t\tSalvar ppms del mapa quan es desi la partida.\n"
-#: server/civserver.c:244
+#: server/civserver.c:249
msgid " -r, --read FILE\tRead startup script FILE\n"
msgstr " -r, --read FITXER\tLlegeix script d'inici FITXER\n"
-#: server/civserver.c:246
+#: server/civserver.c:251
msgid " -R, --Ranklog FILE\tUse FILE as ranking logfile\n"
msgstr ""
" -R, --Ranklog FITXER\tUsa FITXER com a fitxer de registre de rà nquings\n"
-#: server/civserver.c:247 client/civclient.c:268 manual/civmanual.c:383
+#: server/civserver.c:252 client/civclient.c:269 manual/civmanual.c:383
msgid " -v, --version\t\tPrint the version number\n"
msgstr " -v, --version\t\tMostra la versió\n"
-#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
+#: server/civserver.c:253 client/gui-gtk-2.0/gui_main.c:354
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, c-format
msgid "Report bugs at %s.\n"
msgstr "Informa dels errors a <%s>.\n"
-#: server/commands.c:28
+#: server/commands.c:29
msgid "Start the game, or restart after loading a savegame."
msgstr "Iniciar el joc, o reiniciar després de carregar una partida desada."
-#: server/commands.c:29
+#: server/commands.c:30
msgid ""
"This command starts the game. When starting a new game, it should be used "
"after all human players have connected, and AI players have been created (if "
@@ -2159,7 +2164,7 @@ msgstr ""
"comanda ja no està disponible perquè no tindria cap efecte."
#. TRANS: translate text between <> only
-#: server/commands.c:42
+#: server/commands.c:44
msgid ""
"help\n"
"help commands\n"
@@ -2173,11 +2178,11 @@ msgstr ""
"help <nom comanda>\n"
"help <nom opció>"
-#: server/commands.c:47
+#: server/commands.c:49
msgid "Show help about server commands and server options."
msgstr "Mostrar ajuda sobre les opcions i comandes del servidor."
-#: server/commands.c:48
+#: server/commands.c:50
msgid ""
"With no arguments gives some introductory help. With argument \"commands\" "
"or \"options\" gives respectively a list of all commands or all options. "
@@ -2193,11 +2198,11 @@ msgstr ""
"informació de l'ajuda inclou els valors actuals i predeterminats per a "
"aquesta opció. L'argument es pot abreujar si no és ambigu."
-#: server/commands.c:63
+#: server/commands.c:66
msgid "Show a list of players, teams, connections, or scenarios."
msgstr "Mostrar una llista de jugadors, equips, connexions o escenaris."
-#: server/commands.c:64
+#: server/commands.c:67
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 "
@@ -2207,20 +2212,20 @@ msgstr ""
"al servidor, o escenaris disponibles. L'argument pot ser abreujat, i el "
"predeterminat és 'players' (jugadors)."
-#: server/commands.c:70
+#: server/commands.c:74
msgid "Quit the game and shutdown the server."
msgstr "Sortir de la partida i apagar el servidor."
#. TRANS: translate text between <> only
-#: server/commands.c:74
+#: server/commands.c:79
msgid "cut <connection-name>"
msgstr "cut <nom-connexió>"
-#: server/commands.c:75
+#: server/commands.c:80
msgid "Cut a client's connection to server."
msgstr "Talla una connexió del client al servidor."
-#: server/commands.c:76
+#: server/commands.c:81
msgid ""
"Cut specified client's connection to the server, removing that client from "
"the game. If the game has not yet started that client's player is removed "
@@ -2234,7 +2239,7 @@ msgstr ""
"connexions, no el nom dels jugadors."
#. TRANS: translate text between <> only
-#: server/commands.c:83
+#: server/commands.c:89
msgid ""
"explain\n"
"explain <option-name>"
@@ -2242,11 +2247,11 @@ msgstr ""
"explain\n"
"explain <nom-opció>"
-#: server/commands.c:85
+#: server/commands.c:91
msgid "Explain server options."
msgstr "Explica les opcions del servidor."
-#: server/commands.c:86
+#: server/commands.c:92
msgid ""
"The 'explain' command gives a subset of the functionality of 'help', and is "
"included for backward compatibility. With no arguments it gives a list of "
@@ -2259,7 +2264,7 @@ msgstr ""
"per una opció en particular (com 'help <nom-opció>)."
#. TRANS: translate text between <> only
-#: server/commands.c:93
+#: server/commands.c:100
msgid ""
"show\n"
"show <option-name>\n"
@@ -2269,11 +2274,11 @@ msgstr ""
"show <nom-opció>\n"
"show <prefix-opció>"
-#: server/commands.c:96
+#: server/commands.c:103
msgid "Show server options."
msgstr "Mostra les opcions del servidor."
-#: server/commands.c:97
+#: server/commands.c:104
msgid ""
"With no arguments, shows all server options (or available options, when used "
"by clients). With an argument, show only the named option, or options with "
@@ -2283,39 +2288,40 @@ msgstr ""
"si s'usa en un client). Amb un argument, només mostra l'opció anomenada, o "
"les opcions amb aquest prefix."
-#: server/commands.c:102
+#: server/commands.c:110
msgid "wall <message>"
msgstr "wall <missatge>"
-#: server/commands.c:103
+#: server/commands.c:111
msgid "Send message to all connections."
msgstr "Envia un missatge a totes les connexions."
-#: server/commands.c:104
+#: server/commands.c:112
msgid ""
"For each connected client, pops up a window showing the message entered."
msgstr ""
"Per cada client connectat, mostra una finestra emergent amb el missatge."
-#: server/commands.c:108
+#: server/commands.c:117
msgid "vote yes|no [vote number]"
msgstr "vote yes|no [número de votació]"
-#: server/commands.c:109
+#: server/commands.c:118
msgid "Cast a vote."
msgstr "Emetre un vot."
-#: server/commands.c:111
+#: server/commands.c:120
#, 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."
+"A player with basic 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."
msgstr ""
-"Un jugador amb nivell d'accés info que emeti una comanda de nivell de "
+"Un jugador amb nivell d'accés bà sic que emeti una comanda de nivell de "
"control engega una nova votació per la comanda. La comanda '/vote' seguida "
"per \"yes\" o \"no\" i opcionalment un número de votació, emet el vot. Si no "
"afegeixes un número de votació, el vot se suposa que és per l'última "
@@ -2324,7 +2330,7 @@ msgstr ""
"rebutjarà immediatament si almenys la meitat dels jugadors hi voten en "
"contra."
-#: server/commands.c:121
+#: server/commands.c:131
msgid ""
"debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
"<player> | timing | info]"
@@ -2332,11 +2338,11 @@ msgstr ""
"debug [ player <jugador> | city <x> <y> | units <x> <y> | unit <id> | tech "
"<jugador> | timing | info]"
-#: server/commands.c:123
+#: server/commands.c:133
msgid "Turn on or off AI debugging of given entity."
msgstr "Activar o desactivar depuració d'IA de l'entitat donada."
-#: server/commands.c:124
+#: server/commands.c:134
msgid ""
"Print AI debug information about given entity and turn continous debugging "
"output for this entity on or off."
@@ -2344,23 +2350,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:128
+#: server/commands.c:139
msgid "set <option-name> <value>"
msgstr "set <nom-opció> <valor>"
-#: server/commands.c:129
+#: server/commands.c:140
msgid "Set server option."
msgstr "Estableix una opció del servidor."
-#: server/commands.c:132
+#: server/commands.c:144
msgid "team <player> [team]"
msgstr "team <jugador> [equip]"
-#: server/commands.c:133
+#: server/commands.c:145
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:134
+#: server/commands.c:146
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 "
@@ -2373,15 +2379,15 @@ msgstr ""
"compartida i ambaixades, i que lluiten plegats per a aconseguir una victòria "
"d'equip amb puntuacions individuals promitjades."
-#: server/commands.c:141
+#: server/commands.c:154
msgid "rulesetdir <directory>"
msgstr "rulesetdir <directori>"
-#: server/commands.c:142
+#: server/commands.c:155
msgid "Choose new ruleset directory or modpack."
msgstr "Escollir un nou directori de jocs de regles o modificacions (modpack)."
-#: server/commands.c:143
+#: server/commands.c:156
msgid ""
"Choose new ruleset directory or modpack. Calling this\n"
" without any arguments will show you the currently selected ruleset."
@@ -2390,15 +2396,15 @@ msgstr ""
"sense cap argument mostra el conjunt de regles seleccionat actualment."
#. TRANS: translate text between <> only
-#: server/commands.c:149
+#: server/commands.c:163
msgid "metainfo <meta-line>"
msgstr "metainfo <meta-lÃnia>"
-#: server/commands.c:150
+#: server/commands.c:164
msgid "Set metaserver info line."
msgstr "Estableix la lÃnia d'informació al metaservidor."
-#: server/commands.c:151
+#: server/commands.c:165
msgid ""
"Set user defined metaserver info line. If parameter is omitted,\n"
"previously set metamessage will be removed. For most of the time\n"
@@ -2411,19 +2417,19 @@ msgstr ""
"de missatges generats automà ticament, si és que està disponible."
#. TRANS: translate text between <> only
-#: server/commands.c:158
+#: server/commands.c:173
msgid "metapatch <meta-line>"
msgstr "metapatch <meta-lÃnia>"
-#: server/commands.c:159
+#: server/commands.c:174
msgid "Set metaserver patches line."
msgstr "Estableix la lÃnia de pegats al metaservidor."
-#: server/commands.c:165
+#: server/commands.c:181
msgid "Control metaserver connection."
msgstr "Controla la connexió amb el metaservidor."
-#: server/commands.c:166
+#: server/commands.c:182
msgid ""
"'metaconnection ?' reports on the status of the connection to metaserver.\n"
"'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2434,33 +2440,33 @@ msgstr ""
"'metaconnection up' o 'metac u' aixeca la connexió amb el metaservidor."
#. TRANS: translate text between <> only
-#: server/commands.c:172
+#: server/commands.c:189
msgid "metaserver <address>"
msgstr "metaserver <adreça>"
-#: server/commands.c:173
+#: server/commands.c:190
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:177
+#: server/commands.c:195
msgid "aitoggle <player-name>"
msgstr "aitoggle <nom-jugador>"
-#: server/commands.c:178
+#: server/commands.c:196
msgid "Toggle AI status of player."
msgstr "Activa / Desactiva la IA per a un jugador."
#. TRANS: translate text between [] and <> only
-#: server/commands.c:182
+#: server/commands.c:201
msgid "take [connection-name] <player-name>"
msgstr "take [nom-connexió] <nom-jugador>"
-#: server/commands.c:183
+#: server/commands.c:202
msgid "Take over a player's place in the game."
msgstr "Prendre el lloc d'un jugador a la partida."
-#: server/commands.c:184
+#: server/commands.c:203
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 "
@@ -2475,15 +2481,15 @@ msgstr ""
"i s'assigna a la connexió."
#. TRANS: translate text between [] only
-#: server/commands.c:192
+#: server/commands.c:212
msgid "observe [connection-name] [player-name]"
msgstr "observe [nom-connexió] [nom-jugador]"
-#: server/commands.c:193
+#: server/commands.c:213
msgid "Observe a player or the whole game."
msgstr "Observar un jugador o tota la partida."
-#: server/commands.c:194
+#: server/commands.c:214
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 "
@@ -2498,15 +2504,15 @@ msgstr ""
"associada a un observador global."
#. TRANS: translate text between <> only
-#: server/commands.c:202
+#: server/commands.c:223
msgid "detach <connection-name>"
msgstr "detach <nom-connexió>"
-#: server/commands.c:203
+#: server/commands.c:224
msgid "detach from a player."
msgstr "desconnectar d'un jugador."
-#: server/commands.c:204
+#: server/commands.c:225
msgid ""
"Only the console and connections with cmdlevel 'hack' can force other "
"connections to detach from a player."
@@ -2515,21 +2521,21 @@ msgstr ""
"d'altres connexions es desconnectin d'un jugador."
#. TRANS: translate text between <> only
-#: server/commands.c:209
+#: server/commands.c:231
msgid "create <player-name>"
msgstr "create <nom-jugador>"
-#: server/commands.c:210
+#: server/commands.c:232
msgid "Create an AI player with a given name."
msgstr "Crea un jugador IA amb el nom donat."
-#: server/commands.c:211
+#: server/commands.c:233
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:215
+#: server/commands.c:238
msgid ""
"away\n"
"away"
@@ -2537,16 +2543,16 @@ msgstr ""
"away\n"
"away"
-#: server/commands.c:217
+#: server/commands.c:240
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:218
+#: server/commands.c:241
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:222
+#: server/commands.c:246
msgid ""
"novice\n"
"novice <player-name>"
@@ -2554,11 +2560,11 @@ msgstr ""
"novice\n"
"novice <nom-jugador>"
-#: server/commands.c:224
+#: server/commands.c:248
msgid "Set one or all AI players to 'novice'."
msgstr "Estableix un o tots el jugadors d'IA a 'principiant'."
-#: server/commands.c:225
+#: server/commands.c:249
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 "
@@ -2570,7 +2576,7 @@ msgstr ""
"donat."
#. TRANS: translate text between <> only
-#: server/commands.c:231
+#: server/commands.c:256
msgid ""
"easy\n"
"easy <player-name>"
@@ -2578,11 +2584,11 @@ msgstr ""
"easy\n"
"easy <nom-jugador>"
-#: server/commands.c:233
+#: server/commands.c:258
msgid "Set one or all AI players to 'easy'."
msgstr "Estableix un o tots el jugadors a 'fà cil'."
-#: server/commands.c:234
+#: server/commands.c:259
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 "
@@ -2593,7 +2599,7 @@ msgstr ""
"un argument, només estableix la dificultat per al jugador donat."
#. TRANS: translate text between <> only
-#: server/commands.c:240
+#: server/commands.c:266
msgid ""
"normal\n"
"normal <player-name>"
@@ -2601,11 +2607,11 @@ msgstr ""
"normal\n"
"normal <nom-jugador>"
-#: server/commands.c:242
+#: server/commands.c:268
msgid "Set one or all AI players to 'normal'."
msgstr "Estableix un o tots el jugadors a 'normal'."
-#: server/commands.c:243
+#: server/commands.c:269
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 +2622,7 @@ msgstr ""
"un argument, només estableix la dificultat per al jugador donat."
#. TRANS: translate text between <> only
-#: server/commands.c:249
+#: server/commands.c:276
msgid ""
"hard\n"
"hard <player-name>"
@@ -2624,11 +2630,11 @@ msgstr ""
"hard\n"
"hard <nom-jugador>"
-#: server/commands.c:251
+#: server/commands.c:278
msgid "Set one or all AI players to 'hard'."
msgstr "Estableix un o tots el jugadors a 'difÃcil'."
-#: server/commands.c:252
+#: server/commands.c:279
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 "
@@ -2639,7 +2645,7 @@ msgstr ""
"Amb un argument, només estableix la dificultat per al jugador donat."
#. TRANS: translate text between <> only
-#: server/commands.c:258
+#: server/commands.c:286
msgid ""
"experimental\n"
"experimental <player-name>"
@@ -2647,11 +2653,11 @@ msgstr ""
"experimental\n"
"experimental <nom-jugador>"
-#: server/commands.c:260
+#: server/commands.c:288
msgid "Set one or all AI players to 'experimental'."
msgstr "Estableix un o tots el jugadors a 'experimental'."
-#: server/commands.c:261
+#: server/commands.c:289
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 +2671,7 @@ msgstr ""
"normals, aquesta opció no té efecte."
#. TRANS: translate text between <> only
-#: server/commands.c:269
+#: server/commands.c:298
msgid ""
"cmdlevel\n"
"cmdlevel <level>\n"
@@ -2679,17 +2685,19 @@ msgstr ""
"cmdlevel <nivell> first\n"
"cmdlevel <nivell> <nom-connexió>"
-#: server/commands.c:274
+#: server/commands.c:303
msgid "Query or set command access level access."
msgstr "Consultar o fixar el nivell d'accés a les comandes."
-#: server/commands.c:275
+#: server/commands.c:304
msgid ""
"The command access level controls which server commands are available\n"
"to users via the client chatline. The available levels are:\n"
" none - no commands\n"
-" info - informational commands only\n"
+" info - informational or observer commands only\n"
+" basic - commands available to players in the game\n"
" ctrl - commands that affect the game and users\n"
+" admin - commands that affect server operation\n"
" hack - *all* commands - dangerous!\n"
"With no arguments, the current command access levels are reported.\n"
"With a single argument, the level is set for all existing connections,\n"
@@ -2708,8 +2716,10 @@ msgstr ""
"servidor estan disponibles per als usuaris via el xat.\n"
"Els nivells disponibles són: \n"
" none - cap comanda\n"
-" info - només comandes informatives\n"
+" info - només comandes informatives o d'observador\n"
+" basic - comandes disponibles per als jugadors de la partida\n"
" ctrl - comandes que afecten al joc i als usuaris\n"
+" admin - comandes que afecten el funcionament del servidor\n"
" hack - *totes* les comandes - perillós ! \n"
"Sense arguments, s'informa dels nivells actuals d'accés a les comandes.\n"
"Amb un sol argument, es fixa el nivell per a totes les connexions,\n"
@@ -2725,22 +2735,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:296
+#: server/commands.c:328
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:301
+#: server/commands.c:334
msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
msgstr "timeoutincrease <torn> <inctorn> <valor> <valormult>"
-#: server/commands.c:302
+#: server/commands.c:335
msgid "See \"help timeoutincrease\"."
msgstr "Vegeu \"help timeoutincrease\"."
-#: server/commands.c:303
+#: server/commands.c:336
msgid ""
"Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
"<turn> and multiply <value> by <valuemult>. Use this command in concert "
@@ -2752,24 +2762,49 @@ msgstr ""
"predeterminats són 0 0 0 1"
#. TRANS: translate text between <> only
-#: server/commands.c:309
+#: server/commands.c:343
+msgid ""
+"cancelvote\n"
+"cancelvote <vote number>\n"
+"cancelvote all\n"
+msgstr ""
+"cancelvote\n"
+"cancelvote <número de vot>\n"
+"cancelvote all\n"
+
+#: server/commands.c:346
+msgid "Cancel a running vote.\n"
+msgstr "Cancel·lar un vot en curs.\n"
+
+#: server/commands.c:347
+msgid ""
+"With no arguments this command removes your own vote. If you have an admin "
+"access level, you can cancel any vote by vote number, or all votes with the "
+"'all' argument."
+msgstr ""
+"Sense arguments, aquesta comanda anul·la el propi vot. Si tens nivell "
+"d'accés admin, pots cancel·lar qualsevol vot donant-ne el número, o tots els "
+"vots amb l'argument 'all'."
+
+#. TRANS: translate text between <> only
+#: server/commands.c:354
msgid "endgame"
msgstr "endgame"
-#: server/commands.c:310
+#: server/commands.c:355
msgid "End the game immediately in a draw."
msgstr "Acabar la partida immediatament amb un empat."
#. TRANS: translate text between <> only
-#: server/commands.c:314
+#: server/commands.c:360
msgid "surrender"
msgstr "surrender"
-#: server/commands.c:315
+#: server/commands.c:361
msgid "Concede the game."
msgstr "Donar per perduda la partida."
-#: server/commands.c:316
+#: server/commands.c:362
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."
@@ -2779,15 +2814,15 @@ msgstr ""
"s'acaba."
#. TRANS: translate text between <> only
-#: server/commands.c:322
+#: server/commands.c:369
msgid "remove <player-name>"
msgstr "remove <nom-jugador>"
-#: server/commands.c:323
+#: server/commands.c:370
msgid "Fully remove player from game."
msgstr "Elimina completament el jugador de la partida."
-#: server/commands.c:324
+#: server/commands.c:371
msgid ""
"This *completely* removes a player from the game, including all cities and "
"units etc. Use with care!"
@@ -2796,7 +2831,7 @@ msgstr ""
"unitats, etc. Usa amb compte!"
#. TRANS: translate text between <> only
-#: server/commands.c:329
+#: server/commands.c:377
msgid ""
"save\n"
"save <file-name>"
@@ -2804,11 +2839,11 @@ msgstr ""
"save\n"
"save <nom-fitxer>"
-#: server/commands.c:331
+#: server/commands.c:379
msgid "Save game to file."
msgstr "Desa la partida en un fitxer."
-#: server/commands.c:332
+#: server/commands.c:380
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"
@@ -2826,7 +2861,7 @@ msgstr ""
"i usar la comanda 'start' un cop els jugadors s'hagin reconnectat."
#. TRANS: translate text between <> only
-#: server/commands.c:341
+#: server/commands.c:390
msgid ""
"load\n"
"load <file-name>"
@@ -2834,11 +2869,11 @@ msgstr ""
"load\n"
"load <nom-fitxer>"
-#: server/commands.c:343
+#: server/commands.c:392
msgid "Load game from file."
msgstr "Carrega la partida d'un fitxer."
-#: server/commands.c:344
+#: server/commands.c:393
msgid ""
"Load a game from <file-name>. Any current data including players, rulesets "
"and server options are lost.\n"
@@ -2847,116 +2882,116 @@ msgstr ""
"jugadors, conjunts de regles i opcions de servidor.\n"
#. TRANS: translate text between <> only
-#: server/commands.c:349
+#: server/commands.c:399
msgid "read <file-name>"
msgstr "read <nom-fitxer>"
-#: server/commands.c:350
+#: server/commands.c:400
msgid "Process server commands from file."
msgstr "Processa comandes del servidor des de fitxer."
#. TRANS: translate text between <> only
-#: server/commands.c:354
+#: server/commands.c:405
msgid "write <file-name>"
msgstr "write <nom-fitxer>"
-#: server/commands.c:355
+#: server/commands.c:406
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:359
+#: server/commands.c:411
msgid "Switch server output between 'RFC-style' and normal style."
-msgstr "Commutar sortida servidor entre estil RFC i estil normal."
+msgstr "Commutar sortida del servidor entre estil RFC i estil normal."
-#: server/commands.c:363
+#: server/commands.c:416
msgid "Simply returns the id of the server."
msgstr "Simplement retorna l'identificador del servidor"
-#: server/connecthand.c:85
+#: server/connecthand.c:109
#, c-format
msgid "Welcome to the %s Server running at %s port %d."
msgstr "Benvingut al servidor %s que s'executa a %s al port %d."
-#: server/connecthand.c:89
+#: server/connecthand.c:113
#, c-format
msgid "Welcome to the %s Server at port %d."
msgstr "Benvingut al servidor %s al port %d."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:97
+#: server/connecthand.c:121
#, c-format
msgid "(%d) %s: connected [%s]"
msgstr "(%d) %s: connectat [%s]"
-#: server/connecthand.c:104
+#: server/connecthand.c:128
#, c-format
msgid "Server: %s has connected from %s."
msgstr "Servidor: %s s'ha connectat des de %s."
-#: server/connecthand.c:145
+#: server/connecthand.c:175
msgid "Couldn't attach your connection to new player."
msgstr "No s'ha pogut unir la teva connexió a un nou jugador."
-#: server/connecthand.c:165
+#: server/connecthand.c:199
#, c-format
msgid "You are logged in as '%s' connected to no player."
msgstr "Has accedit com a '%s' no connectat a cap jugador."
-#: server/connecthand.c:169
+#: server/connecthand.c:203
#, c-format
msgid "You are logged in as '%s' connected to an anonymous player."
msgstr "Has accedit com a '%s' connectat a un jugador anònim."
-#: server/connecthand.c:174
+#: server/connecthand.c:208
#, c-format
msgid "You are logged in as '%s' connected to %s."
msgstr "Has accedit com a '%s' connectat a %s."
-#: server/connecthand.c:187
+#: server/connecthand.c:221
#, c-format
msgid "Turn-blocking game play: waiting on %s to finish turn..."
msgstr "Joc amb bloqueig: esperant que %s acabi el seu torn ..."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:240
+#: server/connecthand.c:274
#, c-format
msgid "(%d) %s: connection request [%s]"
msgstr "(%d) %s: petició de connexió [%s]"
-#: server/connecthand.c:266
+#: server/connecthand.c:300
msgid "The client is missing a capability that this server needs."
msgstr "Al client li manca una capacitat que necessita aquest servidor."
-#: server/connecthand.c:268 server/connecthand.c:279
+#: server/connecthand.c:302 server/connecthand.c:313
#, c-format
msgid "(%d) %s rejected: mismatched capabilities!"
msgstr "(%d) %s refusat: capacitats no coincidents!"
-#: server/connecthand.c:277
+#: server/connecthand.c:311
msgid "This server is missing a capability that the client needs."
msgstr "A aquest servidor li manca una capacitat que necessita el client."
-#: server/connecthand.c:290
+#: server/connecthand.c:324
msgid "The username is invalid!"
msgstr "El nom d'usuari no és và lid!"
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:292
+#: server/connecthand.c:326
#, c-format
msgid "(%d) %s rejected: invalid username [%s]"
msgstr "(%d) %s refusat: nom d'usuari no và lid [%s]"
-#: server/connecthand.c:303
+#: server/connecthand.c:337
msgid "Your username is already connected!"
msgstr "El teu nom d'usuari ja està connectat!"
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:305
+#: server/connecthand.c:339
#, c-format
msgid "(%d) %s rejected: duplicate username [%s]"
msgstr "(%d) %s refusat: nom d'usuari duplicat [%s]"
-#: server/connecthand.c:335 server/connecthand.c:344
+#: server/connecthand.c:369 server/connecthand.c:378
#, c-format
msgid "Lost connection: %s."
msgstr "Connexió perduda: %s."
@@ -2973,112 +3008,112 @@ msgstr "D'acord. Conjunt d'estil normal."
msgid "For introductory help, type 'help'."
msgstr "Per obtenir ajuda, escriu 'help'."
-#: server/diplhand.c:164
+#: server/diplhand.c:167
#, c-format
msgid "The %s can't accept %s."
msgstr "Els %s no poden acceptar %s."
-#: server/diplhand.c:176
+#: server/diplhand.c:179
#, c-format
msgid "You don't have tech %s, you can't accept treaty."
msgstr "No tens la tecnologia %s, no pots acceptar el tractat."
-#: server/diplhand.c:185
+#: server/diplhand.c:188
msgid "City you are trying to give no longer exists, you can't accept treaty."
msgstr ""
"La ciutat que intentes donar ja no existeix, no pots acceptar el tractat."
-#: server/diplhand.c:191
+#: server/diplhand.c:194
#, c-format
msgid "You are not owner of %s, you can't accept treaty."
msgstr "No ets el propietari de %s, no pots acceptar el tractat."
-#: server/diplhand.c:197 server/diplhand.c:301
+#: server/diplhand.c:200 server/diplhand.c:304
#, c-format
msgid "Your capital (%s) is requested, you can't accept treaty."
msgstr "Han demanat la teva capital (%s), no pots acceptar el tractat."
-#: server/diplhand.c:224
+#: server/diplhand.c:227
msgid "You don't have enough gold, you can't accept treaty."
msgstr "No tens prou or, no pots acceptar el tractat."
-#: server/diplhand.c:256 server/diplhand.c:261
+#: server/diplhand.c:259 server/diplhand.c:264
#, c-format
msgid "A treaty containing %d clause was agreed upon."
msgid_plural "A treaty containing %d clauses was agreed upon."
msgstr[0] "S'ha acordat un tractat que conté %d clà usula."
msgstr[1] "S'ha acordat un tractat que conté %d clà usules."
-#: server/diplhand.c:277 server/diplhand.c:281
+#: server/diplhand.c:280 server/diplhand.c:284
#, c-format
msgid "One of the cities the %s are giving away is destroyed! Treaty canceled!"
msgstr ""
"Una de les ciutats que %s està donant és destruïda! Tractat cancel·lat!"
-#: server/diplhand.c:288 server/diplhand.c:293
+#: server/diplhand.c:291 server/diplhand.c:296
#, c-format
msgid "The %s no longer control %s! Treaty canceled!"
msgstr "Els %s ja no controlen %s! Tractat cancel·lat!"
-#: server/diplhand.c:331 server/diplhand.c:335
+#: server/diplhand.c:334 server/diplhand.c:338
#, c-format
msgid "The %s don't have the promised amount of gold! Treaty canceled!"
msgstr "Els %s no tenen la quantitat d'or promesa! Tractat cancel·lat!"
-#: server/diplhand.c:364
+#: server/diplhand.c:367
#, c-format
msgid "You gave an embassy to %s."
msgstr "Has concedit una ambaixada a %s."
-#: server/diplhand.c:367
+#: server/diplhand.c:370
#, c-format
msgid "%s allowed you to create an embassy!"
msgstr "%s t'ha deixat crear una ambaixada!"
-#: server/diplhand.c:383
+#: server/diplhand.c:386
#, c-format
msgid "You are taught the knowledge of %s."
msgstr "T'ensenyen el coneixement de %s."
-#: server/diplhand.c:387
+#: server/diplhand.c:390
#, c-format
msgid "The %s have acquired %s from the %s."
msgstr "Els %s han adquirit %s dels %s."
-#: server/diplhand.c:402
+#: server/diplhand.c:405
#, c-format
msgid "You get %d gold."
msgstr "Obtens %d peces d'or."
#. TRANS: ... Polish worldmap.
-#: server/diplhand.c:410
+#: server/diplhand.c:413
#, c-format
msgid "You receive the %s worldmap."
msgstr "Reps el mapa mundial %s."
#. TRANS: ... Polish seamap.
-#: server/diplhand.c:419
+#: server/diplhand.c:422
#, c-format
msgid "You receive the %s seamap."
msgstr "Reps el mapa marÃtim %s."
-#: server/diplhand.c:436
+#: server/diplhand.c:439
#, c-format
msgid "You receive city of %s from %s."
msgstr "Reps la ciutat de %s de %s."
-#: server/diplhand.c:441
+#: server/diplhand.c:444
#, c-format
msgid "You give city of %s to %s."
msgstr "Dónes la ciutat de %s a %s."
-#: server/diplhand.c:454 server/diplhand.c:457
+#: server/diplhand.c:457 server/diplhand.c:460
#, c-format
msgid "You agree on a cease-fire with %s."
msgstr "Acordes un alto el foc amb %s."
#. TRANS: ... the Poles ... Polish territory.
-#: server/diplhand.c:476 server/diplhand.c:488
+#: server/diplhand.c:479 server/diplhand.c:491
#, c-format
msgid ""
"You agree on an armistice with the %s. In %d turn, it will become a peace "
@@ -3093,32 +3128,32 @@ msgstr[1] ""
"Acordes un armistici amb els %s. En %d torns es convertirà en un tractat de "
"pau. Mou les teves unitats fora del territori %s."
-#: server/diplhand.c:512 server/diplhand.c:515
+#: server/diplhand.c:515 server/diplhand.c:518
#, c-format
msgid "You agree on an alliance with %s."
msgstr "Signes una aliança amb %s."
-#: server/diplhand.c:524
+#: server/diplhand.c:527
#, c-format
msgid "You give shared vision to %s."
msgstr "Dónes visió compartida a %s."
-#: server/diplhand.c:527
+#: server/diplhand.c:530
#, c-format
msgid "%s gives you shared vision."
msgstr "%s et dóna la visió compartida"
-#: server/diplhand.c:663
+#: server/diplhand.c:666
#, c-format
msgid "%s canceled the meeting!"
msgstr "%s ha cancel·lat la cimera!"
-#: server/diplhand.c:670
+#: server/diplhand.c:673
#, c-format
msgid "Meeting with %s canceled."
msgstr "La cimera amb %s ha estat cancel·lada."
-#: server/diplhand.c:712
+#: server/diplhand.c:715
msgid "Your diplomatic envoy was decapitated!"
msgstr "El teu enviat diplomà tic ha estat decapitat!"
@@ -3303,81 +3338,81 @@ msgid "The %s destroyed the %s in %s."
msgstr "Els %s han destruït %s a %s."
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1091
+#: server/diplomats.c:1097
#, c-format
msgid "An enemy %s has been eliminated by your %s."
msgstr "El teu %2$s ha eliminat un %1$s enemic."
#. TRANS: <unit> ... <city> ... <diplomat>
-#: server/diplomats.c:1098
+#: server/diplomats.c:1104
#, c-format
msgid "Your %s has been eliminated defending %s against a %s."
msgstr "El teu %s ha estat eliminat defensant %s contra un %s."
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1106
+#: server/diplomats.c:1112
#, c-format
msgid "Your %s has been eliminated defending against a %s."
msgstr "El teu %s ha estat eliminat defensant-se d'un %s."
-#: server/diplomats.c:1119
+#: server/diplomats.c:1125
#, c-format
msgid "Your %s was eliminated by a defending %s."
msgstr "El teu %s ha estat eliminat per un %s defensiu."
-#: server/diplomats.c:1127
+#: server/diplomats.c:1133
#, c-format
msgid "Eliminated %s %s while infiltrating %s."
msgstr "Eliminat %s %s quan s'infiltrava a %s."
-#: server/diplomats.c:1134
+#: server/diplomats.c:1140
#, c-format
msgid "Eliminated %s %s while infiltrating our troops."
msgstr "Eliminat %s %s quan s'infiltrava en les nostres tropes."
-#: server/diplomats.c:1185
+#: server/diplomats.c:1191
#, c-format
msgid ""
"Your %s has successfully completed the mission and returned unharmed to %s."
msgstr ""
"El teu %s ha acomplert la seva missió amb èxit i ha tornat indemne a %s."
-#: server/diplomats.c:1204
+#: server/diplomats.c:1210
#, c-format
msgid "Your %s was captured after completing the mission in %s."
msgstr "El teu %s ha estat capturat després d'acomplir la seva missió a %s."
-#: server/diplomats.c:1210
+#: server/diplomats.c:1216
#, c-format
msgid "Your %s was captured after completing the mission."
msgstr "El teu %s ha estat capturat després d'acomplir la seva missió."
-#: server/diplomats.c:1242
+#: server/diplomats.c:1248
#, c-format
msgid "You have caused an incident while bribing the %s %s."
msgstr "Has provocat un incident en subornar el %2$s %1$s."
-#: server/diplomats.c:1247
+#: server/diplomats.c:1253
#, c-format
msgid "%s has caused an incident while bribing your %s."
msgstr "%s ha causat un incident en subornar els teus %s."
-#: server/diplomats.c:1254
+#: server/diplomats.c:1260
#, c-format
msgid "You have caused an incident while attempting to steal tech from %s."
msgstr "Has causat un incident en intentar robar tecnologia de %s."
-#: server/diplomats.c:1258
+#: server/diplomats.c:1264
#, c-format
msgid "%s has caused an incident while attempting to steal tech from you."
msgstr "%s ha causat un incident en intentar robar-te tecnologia."
-#: server/diplomats.c:1264
+#: server/diplomats.c:1270
#, c-format
msgid "You have caused an incident while inciting a revolt in %s."
msgstr "Has causat un incident en incitar una revolta a %s."
-#: server/diplomats.c:1268
+#: server/diplomats.c:1274
#, c-format
msgid "%s have caused an incident while inciting a revolt in %s."
msgstr "%s han causat un incident en incitar una revolta a %s."
@@ -3496,12 +3531,12 @@ msgstr ""
" Els treballadors s'apleguen espontà niament i instal·len ferrocarril en "
"totes les ciutats."
-#: server/maphand.c:1418
+#: server/maphand.c:1425
#, 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:1436
+#: server/maphand.c:1443
#, c-format
msgid "Disbanded your %s due to changing terrain."
msgstr "Desmantellat el teu %s degut a un canvi de terreny."
@@ -3510,7 +3545,7 @@ msgstr "Desmantellat el teu %s degut a un canvi de terreny."
msgid "Not reporting to the metaserver in this game."
msgstr "No s'informa al metaservidor d'aquesta partida."
-#: server/meta.c:430
+#: server/meta.c:432
#, c-format
msgid "Metaserver: bad address: [%s:%d]."
msgstr "Metaservidor: adreça incorrecta: [%s:%d]."
@@ -3639,26 +3674,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:1103
+#: server/plrhand.c:1115
#, c-format
msgid "Removing player %s."
msgstr "S'elimina el jugador %s."
-#: server/plrhand.c:1105
+#: server/plrhand.c:1117
msgid "You've been removed from the game!"
msgstr "Has estat eliminat de la partida!"
-#: server/plrhand.c:1108
+#: server/plrhand.c:1120
#, c-format
msgid "%s has been removed from the game."
msgstr "%s ha estat eliminat de la partida."
-#: server/plrhand.c:1153 server/plrhand.c:1158
+#: server/plrhand.c:1167 server/plrhand.c:1172
#, 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:1178
+#: server/plrhand.c:1192
#, c-format
msgid ""
"%s and %s meet and go to instant war. You cancel your alliance with both."
@@ -3666,17 +3701,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:1656
+#: server/plrhand.c:1670
#, 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:1663
+#: server/plrhand.c:1677
#, 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:1686
+#: server/plrhand.c:1700
#, c-format
msgid ""
"Your nation is thrust into civil war! %s is declared the leader of the rebel "
@@ -3685,12 +3720,12 @@ msgstr ""
"La teva nació es veu abocada a una guerra civil! %s és declarat el lÃder "
"dels estats rebels."
-#: server/plrhand.c:1707
+#: server/plrhand.c:1721
#, c-format
msgid "%s declares allegiance to %s."
msgstr "%s declara la seva lleialtat a %s."
-#: server/plrhand.c:1722
+#: server/plrhand.c:1736
#, c-format
msgid ""
"Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3884,67 +3919,67 @@ msgstr "(construint %s a %s (%s))\n"
msgid "Wonders of the World"
msgstr "Meravelles del món"
-#: server/report.c:547
+#: server/report.c:552
msgid " sq. mi."
msgstr " milles²."
-#: server/report.c:557
+#: server/report.c:562
msgid " M tons"
msgstr " M tones"
-#: server/report.c:562
+#: server/report.c:567
msgid " M goods"
msgstr " M béns"
-#: server/report.c:567
+#: server/report.c:572
msgid " bulbs"
msgstr " bombetes"
-#: server/report.c:572
+#: server/report.c:577
msgid " month"
msgid_plural " months"
msgstr[0] " mes"
msgstr[1] " mesos"
-#: server/report.c:577
+#: server/report.c:582
msgid " ton"
msgid_plural " tons"
msgstr[0] " tona"
msgstr[1] " tones"
-#: server/report.c:591
+#: server/report.c:596
msgid "st"
msgstr "er"
-#: server/report.c:593
+#: server/report.c:598
msgid "nd"
msgstr "on"
-#: server/report.c:595
+#: server/report.c:600
msgid "rd"
msgstr "er"
-#: server/report.c:597
+#: server/report.c:602
msgid "th"
msgstr "è"
-#: server/report.c:700
+#: server/report.c:705
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:743 server/report.c:768
+#: server/report.c:748 server/report.c:773
msgid "Demographics Report:"
msgstr "Informe demogrà fic:"
-#: server/report.c:744
+#: server/report.c:749
msgid "Sorry, the Demographics report is unavailable."
msgstr "Ho sento, l'informe demogrà fic no està disponible."
#. TRANS: <nation adjective> <government name> (<year>).
#. * E.g. "Polish Despotism (200 AD)".
-#: server/report.c:750
+#: server/report.c:755
#, c-format
msgid "%s %s (%s)"
msgstr "%2$s dels %1$s (%3$s)"
@@ -3955,12 +3990,12 @@ msgstr "%2$s dels %1$s (%3$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:2356
+#: server/ruleset.c:2366
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:3166
+#: server/ruleset.c:3178
msgid "Loading rulesets"
msgstr "S'està carregant el conjunt de regles"
@@ -3975,19 +4010,19 @@ msgstr ""
"partides desades antigues o pot indicar que el fitxer desat no és correcte. "
"Continua coneixent el risc."
-#: server/savegame.c:3588
+#: server/savegame.c:3587
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."
#. TRANS: Fatal error message.
-#: server/savegame.c:3815
+#: server/savegame.c:3817
msgid ""
"Saved game uses the \"classic\" terrain ruleset, and is no longer supported."
msgstr ""
"La partida desada fa servir el joc de regles de terreny \"clà ssic\", i ja no "
"està suportat."
-#: server/savegame.c:3824
+#: server/savegame.c:3826
#, c-format
msgid ""
"Warning: Different rulesetdirs ('%s' and '%s') are no longer supported. "
@@ -3997,7 +4032,7 @@ msgstr ""
"regles. Usant '%s'."
#. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4051
+#: server/savegame.c:4055
#, c-format
msgid "%s had invalid nation; changing to %s."
msgstr "%s tenia una nació no và lida; canviant a %s."
@@ -4030,7 +4065,7 @@ msgstr "Intern"
msgid "Networking"
msgstr "Xarxa"
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:734
#: client/gui-win32/dialogs.c:532
msgid "All"
msgstr "Tot"
@@ -4107,7 +4142,7 @@ msgid ""
" size = 20 is a huge map of 20,000 tiles"
msgstr ""
"Aquest valor es fa servir per determinar les dimensions del mapa.\n"
-" size = 4 és un mapa normal de 4.000 caselles (per defecte)\n"
+" size = 4 és un mapa normal de 4.000 caselles (predeterminat)\n"
" size = 20 és un mapa enorme de 20.000 caselles."
#: server/settings.c:234
@@ -4963,7 +4998,7 @@ msgid ""
"If enabled, the default city names will be determined based on the "
"surrounding terrain."
msgstr ""
-"Si està activada, els noms de les ciutats per defecte es basaran en el "
+"Si està activada, els noms de les ciutats predeterminades es basaran en el "
"terreny dels voltants."
#: server/settings.c:825
@@ -5269,11 +5304,11 @@ msgstr ""
"de l'arxiu \"civscore.log\". Aquestes estadÃstiques poden ser usades per a "
"crear grà fics de poder després de la partida."
-#: server/sernet.c:150
+#: server/sernet.c:151
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:929
+#: server/sernet.c:933
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr "Servidor: adreça incorrecta: [%s:%d]."
@@ -5350,47 +5385,47 @@ msgstr "La teva nau espacial ja té el nombre mà xim de plafons solars!"
msgid "Without guidance from the capital, the %s spaceship is lost!"
msgstr "Sense el guiament de la capital, la nau espacial %s s'ha perdut!"
-#: server/srv_main.c:240
+#: server/srv_main.c:242
msgid "Game ended in a draw as end year exceeded"
msgstr "La partida s'ha acabat empatat perque s'ha arribat a l'últim any."
-#: server/srv_main.c:274
+#: server/srv_main.c:276
#, c-format
msgid "The %s spaceship has arrived at Alpha Centauri."
msgstr "La nau espacial %s ha arribat a Alpha Centauri."
-#: server/srv_main.c:287 server/srv_main.c:322
+#: server/srv_main.c:289 server/srv_main.c:324
#, c-format
msgid "Team victory to %s"
msgstr "Victòria d'equip per a %s"
-#: server/srv_main.c:297 server/srv_main.c:338
+#: server/srv_main.c:299 server/srv_main.c:340
#, c-format
msgid "Game ended in victory for %s"
msgstr "La partida s'ha acabat amb victòria de %s"
-#: server/srv_main.c:345
+#: server/srv_main.c:347
msgid "Game ended in a draw"
msgstr "La partida ha acabat en un empat"
-#: server/srv_main.c:461 server/srv_main.c:472
+#: server/srv_main.c:465 server/srv_main.c:476
#, c-format
msgid "Your %s was disbanded in accordance with your peace treaty with the %s."
msgstr ""
"El teu %s s'ha desmantellat d'acord amb el teu tractat de pau amb els %s."
-#: server/srv_main.c:512 server/srv_main.c:516
+#: server/srv_main.c:516 server/srv_main.c:520
#, c-format
msgid ""
"Concerned citizens point out that the cease-fire with %s will run out soon."
msgstr "Ciutadans preocupats avisen que l'alto el foc amb %s s'acabarà aviat."
-#: server/srv_main.c:521 server/srv_main.c:525
+#: server/srv_main.c:525 server/srv_main.c:529
#, c-format
msgid "The cease-fire with %s has run out. You are now at war with the %s."
msgstr "L'alto el foc amb %s s'ha acabat. Ara estàs en guerra amb els %s."
-#: server/srv_main.c:542
+#: server/srv_main.c:546
#, c-format
msgid ""
"Ceasefire between %s and %s has run out. They are at war. You cancel your "
@@ -5399,101 +5434,101 @@ msgstr ""
"S'ha acabat l'alto el foc entre %s i %s. Estan en guerra. Cancel·les la teva "
"aliança amb tots dos."
-#: server/srv_main.c:961
+#: server/srv_main.c:997
#, c-format
msgid "Failed saving game as %s"
msgstr "No s'ha pogut desar la partida com a %s"
-#: server/srv_main.c:963
+#: server/srv_main.c:999
#, c-format
msgid "Game saved as %s"
msgstr "Partida desada com a %s"
-#: server/srv_main.c:994
+#: server/srv_main.c:1030
msgid "The game is already running."
msgstr "La partida ja s'està jugant."
-#: server/srv_main.c:1002
+#: server/srv_main.c:1038
#, 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:1009
+#: server/srv_main.c:1045
msgid "Starting game."
msgstr "S'està iniciant la partida."
-#: server/srv_main.c:1071
+#: server/srv_main.c:1112
#, c-format
msgid "request for unknown report (type %d)"
msgstr "sol·licitud d'informe desconegut (tipus %d)"
-#: server/srv_main.c:1136
+#: server/srv_main.c:1177
#, c-format
msgid "Warning: rejecting old client %s"
msgstr "AvÃs: rebutjant client antic %s"
-#: server/srv_main.c:1238
+#: server/srv_main.c:1279
#, 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:1338
+#: server/srv_main.c:1381
msgid "Please choose a non-blank name."
msgstr "Si us plau, escull un nom no buit."
-#: server/srv_main.c:1354
+#: server/srv_main.c:1397
msgid "That nation is already in use."
msgstr "Aquesta nació ja està agafada."
-#: server/srv_main.c:1370
+#: server/srv_main.c:1413
#, 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:1391
+#: server/srv_main.c:1434
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:1490
+#: server/srv_main.c:1533
#, 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:1496
+#: server/srv_main.c:1539
#, c-format
msgid "%s nation is already in use."
msgstr "La nació %s ja està agafada."
-#: server/srv_main.c:1514
+#: server/srv_main.c:1557
#, c-format
msgid "%s is the %s ruler %s."
msgstr "%s és el dirigent %s %s."
-#: server/srv_main.c:1570
+#: server/srv_main.c:1613
#, 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:1614 server/srv_main.c:1618
+#: server/srv_main.c:1657 server/srv_main.c:1661
#, 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:1760
+#: server/srv_main.c:1803
#, c-format
msgid "Player %d"
msgstr "Jugador %d"
-#: server/srv_main.c:1771 server/srv_main.c:1777
+#: server/srv_main.c:1814 server/srv_main.c:1820
#, c-format
msgid "%s rules the %s."
msgstr "%s governa els %s."
-#: server/srv_main.c:1942
+#: server/srv_main.c:1985
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
@@ -5501,251 +5536,240 @@ msgstr ""
"Aquest programa civserver té suport d'autenticació de jugadors, però ara "
"mateix no es fa servir."
-#: server/srv_main.c:1993
+#: server/srv_main.c:2037
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr "S'està enviant informació al metaservidor [%s]"
-#: server/srv_main.c:2024
+#: server/srv_main.c:2069
msgid "The game is over..."
msgstr "La partida ha acabat..."
-#: server/srv_main.c:2237
+#: server/srv_main.c:2286
msgid "Now accepting new client connections."
msgstr "S'estan acceptant noves connexions de clients."
-#: server/stdinhand.c:246
-#, c-format
-msgid "Vote \"%s\" is passed %d to %d with %d abstentions."
-msgstr "Votació \"%s\" s'aprova per %d a %d amb %d abstencions."
-
-#: server/stdinhand.c:253
-#, c-format
-msgid "Vote \"%s\" failed with %d against, %d for and %d abstentions."
-msgstr ""
-"Votació \"%s\" es denega amb %d en contra, %d a favor i %d abstencions."
-
#. TRANS: ambiguous command
-#: server/stdinhand.c:365
+#: server/stdinhand.c:284
msgid "(ambiguous)"
msgstr "(ambigu)"
#. TRANS: unrecognized command
#. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:416
+#: server/stdinhand.c:287 client/citydlg_common.c:419
#: 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 "(desconegut)"
-#: server/stdinhand.c:458
+#: server/stdinhand.c:377
msgid "Name is empty, so cannot be a player."
msgstr "El nom és buit, per tant no pot ser un jugador."
-#: server/stdinhand.c:462
+#: server/stdinhand.c:381
msgid "Name is too long, so cannot be a player."
msgstr "El nom és massa llarg, per tant no pot ser un jugador."
-#: server/stdinhand.c:466
+#: server/stdinhand.c:385
#, c-format
msgid "Player name prefix '%s' is ambiguous."
msgstr "Prefix de nom de jugador '%s' és ambigu."
-#: server/stdinhand.c:470
+#: server/stdinhand.c:389
#, c-format
msgid "No player by the name of '%s'."
msgstr "Cap jugador amb el nom de '%s'."
-#: server/stdinhand.c:474 server/stdinhand.c:509
+#: server/stdinhand.c:393 server/stdinhand.c:428
#, c-format
msgid "Unexpected match_result %d (%s) for '%s'."
msgstr "match_result no esperat %d (%s) per '%s'."
-#: server/stdinhand.c:493
+#: server/stdinhand.c:412
msgid "Name is empty, so cannot be a connection."
msgstr "El nom és buit, per tant no pot ser una connexió."
-#: server/stdinhand.c:497
+#: server/stdinhand.c:416
msgid "Name is too long, so cannot be a connection."
msgstr "El nom és massa llarg, per tant no pot ser una connexió."
-#: server/stdinhand.c:501
+#: server/stdinhand.c:420
#, c-format
msgid "Connection name prefix '%s' is ambiguous."
msgstr "Prefix de nom de connexió '%s' és ambigu."
-#: server/stdinhand.c:505
+#: server/stdinhand.c:424
#, c-format
msgid "No connection by the name of '%s'."
msgstr "No hi ha cap connexió amb el nom '%s'."
-#: server/stdinhand.c:525
+#: server/stdinhand.c:444
#, c-format
msgid "Open metaserver connection to [%s]."
msgstr "Obrir connexió de metaservidor amb [%s]"
-#: server/stdinhand.c:538
+#: server/stdinhand.c:457
#, c-format
msgid "Close metaserver connection to [%s]."
msgstr "Tancar connexió de metaservidor amb [%s]."
-#: server/stdinhand.c:553
+#: server/stdinhand.c:472
msgid "Metaserver connection is open."
msgstr "La connexió amb el metaservidor està oberta."
-#: server/stdinhand.c:556
+#: server/stdinhand.c:475
msgid "Metaserver connection is closed."
msgstr "La connexió amb el metaservidor està tancada."
-#: server/stdinhand.c:566
+#: server/stdinhand.c:485
msgid "Metaserver connection is already open."
msgstr "La connexió amb el metaservidor ja està oberta."
-#: server/stdinhand.c:577
+#: server/stdinhand.c:496
msgid "Metaserver connection is already closed."
msgstr "La connexió amb el metaservidor ja està tancada."
-#: server/stdinhand.c:582
+#: server/stdinhand.c:501
msgid "Argument must be 'u', 'up', 'd', 'down', or '?'."
msgstr "L'argument ha de ser 'u', 'up', 'd', 'down', o '?'."
-#: server/stdinhand.c:603
+#: server/stdinhand.c:522
#, c-format
msgid "Metaserver patches string set to '%s'."
msgstr "Cadena de pegats de metaserver fixada a '%s'."
-#: server/stdinhand.c:606
+#: server/stdinhand.c:525
#, c-format
msgid "Metaserver patches string set to '%s', not reporting to metaserver."
msgstr ""
"Cadena de pegats de metaserver fixada a '%s', sense reportar al metaserver."
-#: server/stdinhand.c:627
+#: server/stdinhand.c:546
#, c-format
msgid "Metaserver message string set to '%s'."
msgstr "Cadena de missatge de metaservidor fixada a '%s'."
-#: server/stdinhand.c:630
+#: server/stdinhand.c:549
#, c-format
msgid "Metaserver message string set to '%s', not reporting to metaserver."
msgstr ""
"Cadena de missatge del metaservidor fixada a '%s', no informant al "
"metaserver."
-#: server/stdinhand.c:650
+#: server/stdinhand.c:569
#, c-format
msgid "Metaserver is now [%s]."
msgstr "El metaservidor ara és [%s]."
-#: server/stdinhand.c:660
+#: server/stdinhand.c:579
#, c-format
msgid "Server id: %s"
msgstr "Identificador de servidor: %s"
-#: server/stdinhand.c:757
+#: server/stdinhand.c:676
msgid "You cannot save games manually on this server."
msgstr "No pots desar partides manualment en aquest servidor."
-#: server/stdinhand.c:774
+#: server/stdinhand.c:693
msgid "Cannot toggle a barbarian player."
msgstr "No es pot canviar un jugador bà rbar."
-#: server/stdinhand.c:781
+#: server/stdinhand.c:700
#, c-format
msgid "%s is now under AI control."
msgstr "%s està sota el control de la IA des d'ara."
-#: server/stdinhand.c:802
+#: server/stdinhand.c:721
#, c-format
msgid "%s is now under human control."
msgstr "%s està sota el control humà des d'ara."
-#: server/stdinhand.c:847
+#: server/stdinhand.c:766
msgid "Can't add AI players once the game has begun."
msgstr "No es pot afegir jugador d'IA un cop la partida ha començat."
-#: server/stdinhand.c:867
+#: server/stdinhand.c:786
msgid "Can't add more players, server is full."
msgstr "No es poden afegir més jugadors, el servidor està ple."
-#: server/stdinhand.c:874
+#: server/stdinhand.c:793
msgid "Can't use an empty name."
msgstr "No es pot usar un nom buit."
-#: server/stdinhand.c:881
+#: server/stdinhand.c:800
#, c-format
msgid "That name exceeds the maximum of %d chars."
msgstr "El nom excedeix el mà xim de %d carà cters."
-#: server/stdinhand.c:887
+#: server/stdinhand.c:806
msgid "That name is not allowed."
msgstr "Aquest nom no és permès."
-#: server/stdinhand.c:893
+#: server/stdinhand.c:812
msgid "A player already exists by that name."
msgstr "Ja existeix un jugador amb aquest nom."
-#: server/stdinhand.c:899
+#: server/stdinhand.c:818
msgid "A user already exists by that name."
msgstr "Ja existeix un usuari amb aquest nom."
-#: server/stdinhand.c:925
+#: server/stdinhand.c:844
#, c-format
msgid "%s has been added as an AI-controlled player."
msgstr "%s s'ha afegit com a jugador controlat per IA."
-#: server/stdinhand.c:932
+#: server/stdinhand.c:851
#, c-format
msgid "Error creating new AI player: %s."
msgstr "Error en crear el nou jugador d'IA: %s."
-#: server/stdinhand.c:966
+#: server/stdinhand.c:885
msgid "Players cannot be removed once the game has started."
msgstr "Els jugadors no es poden esborrar un cop la partida ha començat."
-#: server/stdinhand.c:977
+#: server/stdinhand.c:896
#, c-format
msgid "Removed player %s from the game."
msgstr "S'ha eliminat el jugador %s de la partida."
-#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
+#: server/stdinhand.c:935 server/stdinhand.c:3372 server/stdinhand.c:3507
#, c-format
msgid "Name \"%s\" disallowed for security reasons."
msgstr "Nom \"%s\" no permès per raons de seguretat."
-#: server/stdinhand.c:1029
+#: server/stdinhand.c:948
#, c-format
msgid "No command script found by the name \"%s\"."
msgstr "No hi ha cap fitxer de comandes amb el nom \"%s\"."
-#: server/stdinhand.c:1037
+#: server/stdinhand.c:956
#, c-format
msgid "Loading script file: %s"
msgstr "Carregant fitxer de script: %s"
-#: server/stdinhand.c:1052
+#: server/stdinhand.c:971
#, c-format
msgid "Cannot read command line scriptfile '%s'."
msgstr "No es pot llegir el fitxer d'script de lÃnia de comandes '%s'."
-#: server/stdinhand.c:1054
+#: server/stdinhand.c:973
#, c-format
msgid "Could not read script file '%s'."
msgstr "No s'ha pogut llegir el fitxer d'script '%s'."
-#: server/stdinhand.c:1146
+#: server/stdinhand.c:1065
#, c-format
msgid "Could not write script file '%s'."
msgstr "No s'ha pogut escriure el fitxer d'script '%s'."
-#: server/stdinhand.c:1158
+#: server/stdinhand.c:1077
msgid "You cannot use the write command on this server for security reasons."
msgstr ""
"No pots fer servir la comanda write en aquest servidor per raons de "
"seguretat."
-#: server/stdinhand.c:1186
+#: server/stdinhand.c:1105
#, c-format
msgid ""
"Cannot decrease command access level '%s' for connection '%s'; you only have "
@@ -5754,7 +5778,12 @@ msgstr ""
"No es pot disminuir el nivell d'accés de comanda '%s' per a la connexió '%"
"s'; només tens '%s'."
-#: server/stdinhand.c:1241
+#: server/stdinhand.c:1114
+#, 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:1163
#, c-format
msgid ""
"Anyone can now become game organizer '%s' by issuing the 'first' command."
@@ -5762,310 +5791,367 @@ msgstr ""
"Ara qualsevol pot convertir-se en organitzador de la partida '%s' llançant "
"la comanda 'first'."
-#: server/stdinhand.c:1274
+#: server/stdinhand.c:1187
msgid "Command access levels in effect:"
msgstr "Nivells d'accés de comanda efectius:"
-#: server/stdinhand.c:1282
+#: server/stdinhand.c:1194
#, c-format
msgid "Command access level for new connections: %s"
msgstr "Nivell d'accés de comanda per a noves connexions: %s"
-#: server/stdinhand.c:1285
+#: server/stdinhand.c:1197
#, c-format
msgid "Command access level for first player to take it: %s"
msgstr "Nivell d'accés de comanda per al primer jugador que el prengui: %s"
-#: server/stdinhand.c:1294
+#: server/stdinhand.c:1206
msgid ""
"Error: command access level must be one of 'none', 'info', 'ctrl', or 'hack'."
msgstr ""
"Error: el nivell d'accés de comanda ha de ser o bé 'none', 'info', 'ctrl' o "
"'hack'."
-#: server/stdinhand.c:1299
+#: server/stdinhand.c:1211
#, c-format
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: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: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:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
+#: server/stdinhand.c:1238 server/stdinhand.c:1252 server/stdinhand.c:1273
#, 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:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
+#: server/stdinhand.c:1243 server/stdinhand.c:1257 server/stdinhand.c:1267
#, 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:1402
+#: server/stdinhand.c:1302
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:1406
+#: server/stdinhand.c:1306
#, 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:1411
+#: server/stdinhand.c:1311
msgid "Someone else already is game organizer."
msgstr "Algú altre ja és organitzador de la partida."
-#: server/stdinhand.c:1416
+#: server/stdinhand.c:1316
#, 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:1467
+#: server/stdinhand.c:1367
#, c-format
msgid "Invalid argument %d."
msgstr "Argument invà lid %d."
-#: server/stdinhand.c:1474
+#: server/stdinhand.c:1374
msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
msgstr "Ús: timeoutincrease <torn> <tornafeg> <valor> <valormult>."
-#: server/stdinhand.c:1482
+#: server/stdinhand.c:1382
#, 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:1542 server/stdinhand.c:1545
+#: server/stdinhand.c:1442 server/stdinhand.c:1445
msgid "Option:"
msgstr "Opció:"
-#: server/stdinhand.c:1555 server/stdinhand.c:4031
+#: server/stdinhand.c:1455 server/stdinhand.c:4079
msgid "Description:"
msgstr "Descripció:"
-#: server/stdinhand.c:1560
+#: server/stdinhand.c:1460
#, c-format
msgid "Status: %s"
msgstr "Estat: %s"
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "changeable"
msgstr "canviable"
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "fixed"
msgstr "fix"
-#: server/stdinhand.c:1567
+#: server/stdinhand.c:1467
#, 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:1572
+#: server/stdinhand.c:1472
#, 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:1578
+#: server/stdinhand.c:1478
#, c-format
msgid "Value: \"%s\", Default: \"%s\""
msgstr "Valor: \"%s\", per Defecte: \"%s\""
-#: server/stdinhand.c:1597
+#: server/stdinhand.c:1497
msgid "Explanations are available for the following server options:"
msgstr "Hi ha explicacions disponibles per les següents opcions del servidor:"
-#: server/stdinhand.c:1643
+#: server/stdinhand.c:1537
msgid "No explanation for that yet."
msgstr "No hi ha explicació per això encara."
-#: server/stdinhand.c:1646 server/stdinhand.c:2480
+#: server/stdinhand.c:1540 server/stdinhand.c:2468
msgid "Ambiguous option name."
msgstr "Nom d'opció ambigu."
-#: server/stdinhand.c:1666
+#: server/stdinhand.c:1560
#, c-format
msgid "Server Operator: %s"
msgstr "Operador de servidor: %s"
-#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
+#: server/stdinhand.c:1686 server/stdinhand.c:1713 server/stdinhand.c:1731
#, 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:1822
+#: server/stdinhand.c:1718
#, c-format
msgid "%s is not controlled by the AI."
msgstr "%s no està control·lat per la IA."
-#: server/stdinhand.c:1842
+#: server/stdinhand.c:1738
#, c-format
msgid "Default AI skill level set to '%s'."
-msgstr "S'ha establert el nivell d'IA per defecte a '%s'."
+msgstr "S'ha establert el nivell d'IA predeterminat a '%s'."
-#: server/stdinhand.c:1857 server/stdinhand.c:2162
+#: server/stdinhand.c:1753
msgid "This command is client only."
msgstr "Aquesta comanda és només per al client."
-#: server/stdinhand.c:1860
+#: server/stdinhand.c:1756
msgid "Usage: away"
msgstr "Ús: away"
-#: server/stdinhand.c:1865
+#: server/stdinhand.c:1761
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:1869
+#: server/stdinhand.c:1765
#, c-format
msgid "%s set to away mode."
msgstr "%s fixat a mode away (no hi sóc)."
-#: server/stdinhand.c:1877
+#: server/stdinhand.c:1772
#, c-format
msgid "%s returned to game."
msgstr "%s ha tornat a la partida."
-#: server/stdinhand.c:1919
+#: server/stdinhand.c:1817
#, 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:1925
+#: server/stdinhand.c:1823
#, c-format
msgid "Unknown option '%s'."
msgstr "Opció desconeguda '%s'."
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1848
msgid "All options with non-default values"
-msgstr "Totes les opcions amb valors diferents del defecte"
+msgstr "Totes les opcions amb valors diferents dels predeterminats"
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1851
msgid "All options"
msgstr "Totes les opcions"
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1854
msgid "Vital options"
msgstr "Opcions vitals"
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1857
msgid "Situational options"
msgstr "Opcions de situació"
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1860
msgid "Rarely used options"
msgstr "Opcions poc utilitzades"
-#: server/stdinhand.c:1965
+#: server/stdinhand.c:1863
msgid "+ means you may change the option"
msgstr "+ significa que pots canviar l'opció"
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1864
msgid "= means the option is on its default value"
-msgstr "= significa que l'opció està al seu valor per defecte"
+msgstr "= significa que l'opció està al seu valor predeterminat"
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
#, c-format
msgid "%-*s value (min,max) "
msgstr "%-*s valor (mÃn,mà x) "
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
msgid "Option"
msgstr "Opció"
-#: server/stdinhand.c:1973
+#: server/stdinhand.c:1871
msgid "description"
msgstr "descripció"
-#: server/stdinhand.c:2042
+#: server/stdinhand.c:1940
msgid ""
"Try 'show situational' or 'show rare' to show more options.\n"
"Try 'show changed' to show settings with non-default values."
msgstr ""
"Intenta 'show situational' or 'show rare' per mostrar més opcions.\n"
"Intenta 'show changed' per mostrar les opcions amb valors diferents del "
-"defecte."
+"predeterminat."
-#: server/stdinhand.c:2092
+#: server/stdinhand.c:1966
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:2102
+#: server/stdinhand.c:1976
msgid "Undefined argument. Usage: team <player> <team>."
msgstr "Argument no definit. Ús: team <jugador> <equip>."
-#: server/stdinhand.c:2122
+#: server/stdinhand.c:1996
#, 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:2129
+#: server/stdinhand.c:2003
msgid "Cannot team a barbarian."
msgstr "Un bà rbar no es pot ajuntar a un equip."
-#: server/stdinhand.c:2135
+#: server/stdinhand.c:2009
#, c-format
msgid "Player %s set to team %s."
msgstr "El jugador %s s'ha unit a l'equip %s."
-#: 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:2035 server/voting.c:512
+msgid "Teamvote"
+msgstr "Votació d'equip"
-#: server/stdinhand.c:2165
-msgid "Observers cannot vote."
-msgstr "Els observadors no poden votar."
+#: server/stdinhand.c:2035 server/voting.c:516
+msgid "Vote"
+msgstr "Vot"
-#: server/stdinhand.c:2168
+#: server/stdinhand.c:2037
+#, c-format
msgid ""
-"You can only vote in a running game. Use 'first' to become the game "
-"organizer if there currently is none."
+"%s %d \"%s\" (needs %0.0f%%%s): %d for, %d against, and %d abstained out of %"
+"d players."
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."
+"%s %d \"%s\" (cal %0.0f%%%s): %d a favor, %d en contra, i %d abstencions "
+"sobre %d jugadors."
-#: 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:2041
+msgid " no dissent"
+msgstr " cap desacord"
-#: server/stdinhand.c:2188
+#: server/stdinhand.c:2049
msgid "There are no votes going on."
msgstr "No hi ha cap votació en marxa."
-#: server/stdinhand.c:2208
-msgid "No legal last vote."
-msgstr "Últim vot no legal"
+#: server/stdinhand.c:2077
+msgid "Invalid arguments. Usage: vote yes|no|abstain [vote number]."
+msgstr "Arguments no và lids. Ús: vote yes|no|abstain [número de votació]."
+
+#: server/stdinhand.c:2095 server/stdinhand.c:2213 server/stdinhand.c:3714
+msgid "You are not allowed to use this command."
+msgstr "No tens permÃs per usar aquesta comanda."
-#: server/stdinhand.c:2213
-msgid "Value must be integer."
+#: server/stdinhand.c:2104
+#, c-format
+msgid "The argument \"%s\" is ambigious."
+msgstr "L'argument \"%s\" és ambigu."
+
+#: server/stdinhand.c:2119
+msgid "There are no votes running."
+msgstr "No hi ha votacions en marxa."
+
+#: server/stdinhand.c:2121
+#, c-format
+msgid "No legal last vote (%d %s)."
+msgstr "Últim vot no legal (%d %s)."
+
+#: server/stdinhand.c:2122
+msgid "other vote running"
+msgid_plural "other votes running"
+msgstr[0] "un altre votació en marxa"
+msgstr[1] "d'altres votacions en marxa"
+
+#: server/stdinhand.c:2129 server/stdinhand.c:2491 server/stdinhand.c:2532
+msgid "Value must be an integer."
msgstr "El valor ha de ser un enter."
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2135 server/stdinhand.c:2221
#, c-format
msgid "No such vote (%d)."
msgstr "No existeix la votació (%d)"
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2141
+msgid "You are not allowed to vote on that."
+msgstr "No tens permÃs per votar sobre això."
+
+#: server/stdinhand.c:2146
#, c-format
msgid "You voted for \"%s\""
msgstr "Has votat a favor de \"%s\""
-#: server/stdinhand.c:2232
+#: server/stdinhand.c:2150
#, c-format
msgid "You voted against \"%s\""
msgstr "Has votat en contra de \"%s\""
-#: server/stdinhand.c:2259
+#: server/stdinhand.c:2155
+#, c-format
+msgid "You abstained from voting on \"%s\""
+msgstr "T'has abstingut de votar sobre \"%s\""
+
+#: server/stdinhand.c:2190
+msgid "Missing argument <vote number> or the string \"all\"."
+msgstr "Falta argument <número de vot> o la cadena \"all\"."
+
+#: server/stdinhand.c:2197
+msgid "You don't have any vote going on."
+msgstr "No tens cap votació en marxa."
+
+#: server/stdinhand.c:2204
+msgid "There isn't any vote going on."
+msgstr "No hi ha cap votació en marxa."
+
+#: server/stdinhand.c:2209
+msgid "Server: All votes have been removed."
+msgstr "Servidor: totes les votacions s'han tret."
+
+#: server/stdinhand.c:2226
+#, c-format
+msgid "You are not allowed to cancel this vote (%d)."
+msgstr "No tens permÃs per cancel·lar aquest vot (%d)."
+
+#: server/stdinhand.c:2232
+msgid "Usage: /cancelvote [<vote number>|all]"
+msgstr "Ús: /cancelvote [<número de vot>|all]"
+
+#: server/stdinhand.c:2241
+#, c-format
+msgid "Server: %s cancelled the vote \"%s\" (number %d)."
+msgstr "Servidor: %s ha cancel·lat el vot \"%s\" (número %d)."
+
+#: server/stdinhand.c:2247
+#, c-format
+msgid "Server: The vote \"%s\" (number %d) has been cancelled."
+msgstr "Servidor: el vot \"%s\" (número %d).s'ha cancel·lat."
+
+#: server/stdinhand.c:2265
msgid ""
"Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
"<x> <y> | unit <id> | tech <player> | timing | info>."
@@ -6073,129 +6159,125 @@ msgstr ""
"Arguments no definits. Ús: debug <diplomacy <jugador> | city <x> <y> | units "
"<x> <y> | unit <id> | tech <jugador> | timing | info>."
-#: server/stdinhand.c:2265
+#: server/stdinhand.c:2271
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:2294
+#: server/stdinhand.c:2300
#, c-format
msgid "%s diplomacy no longer debugged"
msgstr "La diplomà cia %s ja no es depura"
-#: server/stdinhand.c:2298
+#: server/stdinhand.c:2304
#, c-format
msgid "%s diplomacy debugged"
msgstr "La diplomà cia %s s'està depurant"
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2323
#, c-format
msgid "%s tech no longer debugged"
msgstr "Tecnologia %s ja no es depura"
-#: server/stdinhand.c:2321
+#: server/stdinhand.c:2327
#, c-format
msgid "%s tech debugged"
msgstr "La tecnologia %s s'està depurant"
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2358 server/stdinhand.c:2388
msgid "Value 2 & 3 must be integer."
msgstr "Els valors 2 i 3 han de ser enters."
-#: server/stdinhand.c:2356 server/stdinhand.c:2386
+#: server/stdinhand.c:2362 server/stdinhand.c:2392
msgid "Bad map coordinates."
msgstr "Coordenades de mapa dolentes."
-#: server/stdinhand.c:2361
+#: server/stdinhand.c:2367
msgid "No city at this coordinate."
msgstr "No hi ha cap ciutat en aquestes coordenades."
-#: server/stdinhand.c:2366
+#: server/stdinhand.c:2372
#, c-format
msgid "%s no longer debugged"
msgstr "Ja no es depura a %s"
-#: server/stdinhand.c:2392 server/stdinhand.c:2422
+#: server/stdinhand.c:2398 server/stdinhand.c:2428
#, c-format
msgid "%s %s no longer debugged."
msgstr "Ja no es depura el %2$s %1$s."
-#: server/stdinhand.c:2397 server/stdinhand.c:2427
+#: server/stdinhand.c:2403 server/stdinhand.c:2433
#, c-format
msgid "%s %s debugged."
msgstr "Depurant %2$s %1$s."
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2419
msgid "Value 2 must be integer."
msgstr "El valor 2 ha de ser un enter."
-#: server/stdinhand.c:2417
+#: server/stdinhand.c:2423
#, c-format
msgid "Unit %d does not exist."
msgstr "La unitat %d no existeix."
-#: server/stdinhand.c:2475
+#: server/stdinhand.c:2464
msgid "Undefined argument. Usage: set <option> <value>."
msgstr "Argument no definit. Ús: set <opció> <valor>."
-#: server/stdinhand.c:2485
+#: server/stdinhand.c:2473
msgid "You are not allowed to set this option."
msgstr "No tens permÃs per establir aquesta opció."
-#: server/stdinhand.c:2490 server/stdinhand.c:3463
+#: server/stdinhand.c:2478 server/stdinhand.c:3501
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:2502 server/stdinhand.c:2543
-msgid "Value must be an integer."
-msgstr "El valor ha de ser un enter."
-
-#: server/stdinhand.c:2512
+#: server/stdinhand.c:2501
#, 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:2519
+#: server/stdinhand.c:2508
msgid "Value out of range (minimum: 0, maximum: 1)."
msgstr "Valor fora de rang (mÃnim: 0, mà xim 1)."
-#: server/stdinhand.c:2534 server/stdinhand.c:2576
+#: server/stdinhand.c:2523 server/stdinhand.c:2565
#, c-format
msgid "Option: %s has been set to %d."
msgstr "Opció: S'ha establert %s a %d."
-#: server/stdinhand.c:2554
+#: server/stdinhand.c:2543
#, 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:2561
+#: server/stdinhand.c:2550
#, 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:2586
+#: server/stdinhand.c:2575
msgid "String value too long. Usage: set <option> <value>."
msgstr "Valor de cadena massa llarg. Ús: set <opció> <valor>."
-#: server/stdinhand.c:2600
+#: server/stdinhand.c:2589
#, c-format
msgid "Option: %s has been set to \"%s\"."
msgstr "Opció: %s s'ha establert a \"%s\"."
-#: server/stdinhand.c:2658
+#: server/stdinhand.c:2652
msgid "Sorry, one can't observe globally in this game."
msgstr "Ho sento, en aquesta partida no es pot observar globalment."
-#: server/stdinhand.c:2661
+#: server/stdinhand.c:2655
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:2671
+#: server/stdinhand.c:2665
msgid "You cannot take a new player at this time."
msgstr "No pots agafar un jugador nou en aquest moment."
#. TRANS: Do not translate "maxplayers".
-#: server/stdinhand.c:2679
+#: server/stdinhand.c:2673
#, c-format
msgid ""
"You cannot take a new player because the maximum of %d player has already "
@@ -6210,75 +6292,75 @@ msgstr[1] ""
"No pots agafar un nou jugador perquè s'ha arribat al mà xim de %d jugadors "
"(la preferència maxplayers)"
-#: server/stdinhand.c:2691
+#: server/stdinhand.c:2685
msgid "You cannot take a new player because there are no free player slots."
msgstr ""
"No pots agafar un nou jugador perquè no queden posicions de jugador lliures."
-#: server/stdinhand.c:2702
+#: server/stdinhand.c:2696
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:2705
+#: server/stdinhand.c:2699
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:2713
+#: server/stdinhand.c:2707
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:2716
+#: server/stdinhand.c:2710
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:2724
+#: server/stdinhand.c:2718
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:2727
+#: server/stdinhand.c:2721
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:2736
+#: server/stdinhand.c:2730
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:2739
+#: server/stdinhand.c:2733
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:2749
+#: server/stdinhand.c:2743
msgid "Sorry, one can't observe in this game."
msgstr "Ho sento, en aquesta partida no es pot observar."
-#: server/stdinhand.c:2754
+#: server/stdinhand.c:2748
msgid "Sorry, one can't take players in this game."
msgstr "Ho sento, en aquesta partida no es poden prendre jugadors."
-#: server/stdinhand.c:2760
+#: server/stdinhand.c:2754
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:2791
+#: server/stdinhand.c:2785
msgid "Usage: observe [connection-name [player-name]]"
msgstr "Ús: observe [nom-connexió [nom-jugador]]"
-#: server/stdinhand.c:2797
+#: server/stdinhand.c:2791
msgid "Usage: observe [player-name]"
msgstr "Ús: observe [nom-jugador]"
-#: server/stdinhand.c:2847
+#: server/stdinhand.c:2841
#, c-format
msgid "%s already controls %s. Using 'observe' would remove %s"
msgstr "%s ja controla %s. Usar 'observe' suprimiria %s"
-#: server/stdinhand.c:2858
+#: server/stdinhand.c:2852
#, c-format
msgid "%s is already observing %s."
msgstr "%s ja està observant %s"
-#: server/stdinhand.c:2863
+#: server/stdinhand.c:2857
#, c-format
msgid "%s is already observing."
msgstr "%s ja està observant."
@@ -6293,235 +6375,239 @@ msgstr "%s ara observa a %s"
msgid "%s now observes"
msgstr "%s ara observa"
-#: server/stdinhand.c:2969
+#: server/stdinhand.c:2971
msgid "Usage: take <connection-name> <player-name>"
msgstr "Ús: take [nom-connexió] <nom-jugador>"
-#: server/stdinhand.c:2974
+#: server/stdinhand.c:2976
msgid "Usage: take <player-name>"
msgstr "Ús: take <nom-jugador>"
-#: server/stdinhand.c:2980
+#: server/stdinhand.c:2982
msgid "Usage: take [connection-name] <player-name>"
msgstr "Ús: take [nom-connexió] <nom-jugador>"
-#: server/stdinhand.c:3010
+#: server/stdinhand.c:3012
#, c-format
msgid "%s already controls %s."
msgstr "%s ja controla %s."
-#: server/stdinhand.c:3024
+#: server/stdinhand.c:3026
#, 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:3059
+#: server/stdinhand.c:3061
#, c-format
msgid "being detached from %s."
msgstr "desconnectant-se de %s."
-#: server/stdinhand.c:3135
+#: server/stdinhand.c:3146
#, c-format
msgid "%s now controls %s (%s, %s)."
msgstr "%s ara controla %s (%s, %s)."
-#: server/stdinhand.c:3139 server/stdinhand.c:4260
+#: server/stdinhand.c:3150 server/stdinhand.c:4308
#: data/nation/barbarian.ruleset:3
msgid "Barbarian"
msgstr "BÃ rbar"
-#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
+#: server/stdinhand.c:3152 server/stdinhand.c:4310 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-sdl/plrdlg.c:645
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr "IA"
-#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-gtk-2.0/pages.c:2125
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
+#: server/stdinhand.c:3153 server/stdinhand.c:4312
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-gtk-2.0/pages.c:2127
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/connectdlg.c:215
msgid "Human"
msgstr "Humà "
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-gtk-2.0/pages.c:2124 client/gui-win32/connectdlg.c:200
-#: client/gui-win32/connectdlg.c:212
+#: server/stdinhand.c:3155 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-gtk-2.0/pages.c:2126 client/gui-win32/connectdlg.c:202
+#: client/gui-win32/connectdlg.c:214
msgid "Alive"
msgstr "Viu"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3156 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-win32/connectdlg.c:202
msgid "Dead"
msgstr "Mort"
-#: server/stdinhand.c:3147
+#: server/stdinhand.c:3159
#, c-format
msgid "%s failed to attach to any player."
msgstr "%s no s'ha pogut associar a cap jugador."
-#: server/stdinhand.c:3182
+#: server/stdinhand.c:3194
msgid "Usage: detach <connection-name>"
msgstr "Ús: detach <nom-connexió>"
-#: server/stdinhand.c:3202
+#: server/stdinhand.c:3214
msgid "You can not detach other users."
msgstr "No pots desconnectar altres jugadors."
-#: server/stdinhand.c:3211
+#: server/stdinhand.c:3223
#, c-format
msgid "%s is not attached to any player."
msgstr "%s no s'ha associat a cap jugador."
-#: server/stdinhand.c:3234
+#: server/stdinhand.c:3246
#, c-format
msgid "%s detaching from %s"
msgstr "desassociant %s de %s"
-#: server/stdinhand.c:3240
+#: server/stdinhand.c:3252
#, c-format
msgid "%s no longer observing."
msgstr "%s ja no està observant."
-#: server/stdinhand.c:3259
+#: server/stdinhand.c:3271
#, c-format
msgid "detaching from %s."
msgstr "s'està desassociant de %s."
-#: server/stdinhand.c:3345
+#: server/stdinhand.c:3361
msgid "Usage: load <game name>"
msgstr "Ús: load <nom-partida>"
-#: server/stdinhand.c:3350
+#: server/stdinhand.c:3366
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:3372
+#: server/stdinhand.c:3388
#, 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:3389
+#: server/stdinhand.c:3405
#, c-format
msgid "Could not load savefile: %s"
msgstr "No s'ha pogut carregar el fitxer desat: %s"
-#: server/stdinhand.c:3458
+#: server/stdinhand.c:3496
#, c-format
msgid "Current ruleset directory is \"%s\""
msgstr "El directori del conjunt de regles actuals és \"%s\""
-#: server/stdinhand.c:3478
+#: server/stdinhand.c:3516
#, c-format
msgid "Ruleset directory \"%s\" not found"
msgstr "No s'ha trobat el directori de regles \"%s\" "
-#: server/stdinhand.c:3484
+#: server/stdinhand.c:3522
#, c-format
msgid "Ruleset directory is already \"%s\""
msgstr "Directori de regles ja és \"%s\""
-#: server/stdinhand.c:3488
+#: server/stdinhand.c:3526
#, c-format
msgid "Ruleset directory set to \"%s\""
msgstr "Directori de regles fixat a \"%s\""
-#: server/stdinhand.c:3536
+#: server/stdinhand.c:3574
msgid "Goodbye."
msgstr "Adéu."
-#: server/stdinhand.c:3567
+#: server/stdinhand.c:3606
msgid "Sorry, you are not allowed to use server commands."
msgstr "Ho sento, no tens permès usar comandes de servidor."
-#: server/stdinhand.c:3603
+#: server/stdinhand.c:3656
#, 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:3608
+#: server/stdinhand.c:3661
#, c-format
msgid "Unknown command. Try '%shelp'."
msgstr "Comanda desconeguda. Prova '%shelp'."
-#: 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:3675
+msgid "Your new vote cancelled your previous vote."
+msgstr "El teu nou vot ha cancel·lat el vot anterior."
+
+#: server/stdinhand.c:3688
+msgid "New teamvote"
+msgstr "Nova votació d'equip"
-#: server/stdinhand.c:3633
+#: server/stdinhand.c:3691
+msgid "New vote"
+msgstr "Nova votació"
+
+#: server/stdinhand.c:3695
#, c-format
-msgid "New vote (number %d) by %s: %s."
-msgstr "Nou vot (número %d) per %s: %s."
+msgid "%s (number %d) by %s: %s"
+msgstr "%s (número %d) per %s: %s."
-#: server/stdinhand.c:3645
+#: server/stdinhand.c:3704
#, 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:3655
-msgid "You are not allowed to use this command."
-msgstr "No tens permÃs per usar aquesta comanda."
-
-#: server/stdinhand.c:3680
+#: server/stdinhand.c:3726
msgid "(server prompt)"
msgstr "(prompt del servidor)"
-#: server/stdinhand.c:3787
+#: server/stdinhand.c:3835
msgid "Game ended in a draw."
msgstr "La partida ha acabat en un empat"
-#: server/stdinhand.c:3791
+#: server/stdinhand.c:3839
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:3796
+#: server/stdinhand.c:3844
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:3812
+#: server/stdinhand.c:3860
#, 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:3817
+#: server/stdinhand.c:3865
msgid "You cannot surrender now."
msgstr "No pots rendir-te ara."
-#: server/stdinhand.c:3883
+#: server/stdinhand.c:3931
msgid "Not enough human players, game will not start."
msgstr "No hi ha prou jugadors humans, la partida no començarà ."
-#: server/stdinhand.c:3888
+#: server/stdinhand.c:3936
msgid "No players, game will not start."
msgstr "No hi ha jugadors, la partida no començarà ."
-#: server/stdinhand.c:3892
+#: server/stdinhand.c:3940
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:3901
+#: server/stdinhand.c:3949
msgid "All players are ready; starting game."
msgstr "Tots els jugadors estan a punt; començant la partida"
-#: server/stdinhand.c:3915
+#: server/stdinhand.c:3963
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:3922
+#: server/stdinhand.c:3970
msgid "Cannot start the game: it is already running."
msgstr "No es pot iniciar la partida: ja s'està jugant."
-#: server/stdinhand.c:3953
+#: server/stdinhand.c:4001
#, c-format
msgid "Cutting connection %s."
msgstr "Tallant connexió %s."
-#: server/stdinhand.c:3972
+#: server/stdinhand.c:4020
msgid ""
"Welcome - this is the introductory help text for the Freeciv server.\n"
"\n"
@@ -6559,123 +6645,123 @@ msgstr ""
" save - per desar la partida actual\n"
" quit - per sortir"
-#: server/stdinhand.c:4007 server/stdinhand.c:4010
+#: server/stdinhand.c:4055 server/stdinhand.c:4058
msgid "Command:"
msgstr "Comanda:"
-#: server/stdinhand.c:4014
+#: server/stdinhand.c:4062
msgid "Synopsis: "
msgstr "Sinopsi: "
-#: server/stdinhand.c:4023
+#: server/stdinhand.c:4071
#, c-format
msgid "Level: %s"
msgstr "Nivell: %s"
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4096
msgid "The following server commands are available:"
msgstr "Estan disponibles les següents comandes de servidor:"
-#: server/stdinhand.c:4123
+#: server/stdinhand.c:4171
#, c-format
msgid "Help argument '%s' is ambiguous."
msgstr "L'argument de l'ajuda '%s' és ambigu."
-#: server/stdinhand.c:4128
+#: server/stdinhand.c:4176
#, c-format
msgid "No match for help argument '%s'."
msgstr "Cap coincidència per l'argument d'ajuda '%s'."
-#: server/stdinhand.c:4194
+#: server/stdinhand.c:4242
#, c-format
msgid "Bad list argument: '%s'. Try '%shelp list'."
msgstr "Argument de llista incorrecte: '%s'. Prova '%shelp list'."
-#: server/stdinhand.c:4234
+#: server/stdinhand.c:4282
msgid "List of players:"
msgstr "Llista de jugadors:"
-#: server/stdinhand.c:4239
+#: server/stdinhand.c:4287
msgid "<no players>"
msgstr "<no hi ha cap jugador>"
-#: server/stdinhand.c:4256
+#: server/stdinhand.c:4304
#, c-format
msgid "user %s, "
msgstr "usuari %s, "
-#: server/stdinhand.c:4267
+#: server/stdinhand.c:4315
msgid ", Dead"
msgstr ", Mort"
-#: server/stdinhand.c:4270
+#: server/stdinhand.c:4318
#, 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:4275 server/stdinhand.c:4279 client/helpdata.c:257
-#: client/helpdata.c:752 client/text.c:241 client/text.c:1224
-#: client/text.c:1262
+#: server/stdinhand.c:4323 server/stdinhand.c:4327 client/helpdata.c:257
+#: client/helpdata.c:752 client/text.c:241 client/text.c:1229
+#: client/text.c:1267
#, c-format
msgid "?clistmore:, %s"
msgstr "?clistmore:, %s"
-#: server/stdinhand.c:4283
+#: server/stdinhand.c:4331
msgid ", ready"
msgstr ", preparat"
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4333
msgid ", not ready"
msgstr ", no preparat"
-#: server/stdinhand.c:4293
+#: server/stdinhand.c:4341
#, c-format
msgid " %d connection:"
msgid_plural " %d connections:"
msgstr[0] " %d connexió:"
msgstr[1] " %d connexions:"
-#: server/stdinhand.c:4299
+#: server/stdinhand.c:4347
#, 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:4304
+#: server/stdinhand.c:4352
msgid " (observer mode)"
msgstr "(mode observador)"
-#: server/stdinhand.c:4322
+#: server/stdinhand.c:4370
msgid "List of teams:"
msgstr "Llista d'equips:"
#. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4332
+#: server/stdinhand.c:4380
#, 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:4352
+#: server/stdinhand.c:4400
#, c-format
msgid "%2d : '%s' : 1 player : %s"
msgstr "%2d : '%s' : 1 jugador : %s"
-#: server/stdinhand.c:4360
+#: server/stdinhand.c:4408
#, c-format
msgid "Empty team: %s"
msgstr "Equip buit: %s"
-#: server/stdinhand.c:4371
+#: server/stdinhand.c:4419
msgid "List of connections to server:"
msgstr "Llista de connexions al servidor:"
-#: server/stdinhand.c:4375
+#: server/stdinhand.c:4423
msgid "<no connections>"
msgstr "<no hi ha cap connexió>"
-#: server/stdinhand.c:4399
+#: server/stdinhand.c:4447
msgid "List of scenarios available:"
msgstr "Llista d'escenaris disponibles:"
@@ -6694,7 +6780,7 @@ msgstr "Els %s descobreixen la tecnologia del futur %d."
msgid "%s acquired from %s!"
msgstr "S'ha adquirit %s dels %s!"
-#: server/techtools.c:220
+#: server/techtools.c:221
#, c-format
msgid ""
"Discovery of %s makes the government form %s available. You may want to "
@@ -6703,40 +6789,40 @@ msgstr ""
"El descobriment de %s et proporciona una nova forma de govern (%s). Potser "
"vols començar una revolució."
-#: server/techtools.c:301
+#: server/techtools.c:302
#, c-format
msgid "Discovery of %s OBSOLETES %s in %s!"
msgstr "El descobriment de %s DEIXA OBSOLET %s a %s!"
-#: server/techtools.c:351
+#: server/techtools.c:352
#, c-format
msgid "Learned %s. Our scientists focus on %s; goal is %s."
msgstr ""
"Un cop descobert %s, els nostres cientÃfics es dediquen a %s, l'objectiu és %"
"s."
-#: server/techtools.c:369
+#: server/techtools.c:370
#, c-format
msgid "Learned %s. Scientists choose to research %s."
msgstr "Un cop descobert %s, els nostres cientÃfics decideixen dedicar-se a %s"
-#: server/techtools.c:376
+#: server/techtools.c:377
#, c-format
msgid "Learned %s. "
msgstr "S'ha descobert %s. "
-#: server/techtools.c:379
+#: server/techtools.c:380
#, c-format
msgid "Researching %s."
msgstr "S'està investigant %s."
-#: server/techtools.c:385
+#: server/techtools.c:386
#, c-format
msgid "Learned %s. Scientists do not know what to research next."
msgstr ""
"S'ha descobert %s. Els cientÃfics no saben què investigar a partir d'ara."
-#: server/techtools.c:402
+#: server/techtools.c:403
msgid ""
"Great scientists from all the world join your civilization: you get an "
"immediate advance."
@@ -6744,22 +6830,22 @@ msgstr ""
"Grans cientÃfics de tot el món s'uneixen a la teva civilització, obtens un "
"avenç immediat."
-#: server/techtools.c:570
+#: server/techtools.c:571
#, c-format
msgid "Technology goal is %s."
msgstr "L'objectiu tecnològic és %s."
-#: server/techtools.c:700
+#: server/techtools.c:708
#, c-format
msgid "You steal %s from the %s."
msgstr "Robes %s dels %s."
-#: server/techtools.c:705
+#: server/techtools.c:713
#, c-format
msgid "The %s stole %s from you!"
msgstr "Els %s et roben %s!"
-#: server/techtools.c:710
+#: server/techtools.c:718
#, c-format
msgid "The %s have stolen %s from the %s."
msgstr "Els %s han robat %s dels %s."
@@ -6783,156 +6869,162 @@ msgstr "No s'ha pogut millorar cap unitat."
msgid "%s upgraded to %s for %d gold."
msgstr "%s millorat a %s per %d d'or."
-#: server/unithand.c:396
+#: server/unithand.c:402
#, c-format
msgid "%s refuses to disband!"
msgstr "%s es nega a ser desmantellat!"
-#: server/unithand.c:449
+#: server/unithand.c:455
msgid "Can't place city here."
msgstr "No es pot ubicar una ciutat en aquesta posició."
-#: server/unithand.c:456
+#: server/unithand.c:462
#, c-format
msgid "Only %s can build a city."
msgstr "Només %s pot construir una ciutat."
-#: server/unithand.c:461
+#: server/unithand.c:467
msgid "Can't build a city."
msgstr "No es pot construir una ciutat."
-#: server/unithand.c:470
+#: server/unithand.c:476
#, c-format
msgid "Only %s can add to a city."
msgstr "Només %s es poden afegir a una ciutat."
-#: server/unithand.c:475
+#: server/unithand.c:481
msgid "Can't add to a city."
msgstr "No es pot afegir a una ciutat."
-#: server/unithand.c:481
+#: server/unithand.c:487
#, c-format
msgid "%s unit has no moves left to add to %s."
msgstr "A la unitat %s no li queden moviments per a afegir-se a %s."
-#: server/unithand.c:487
+#: server/unithand.c:493
#, c-format
msgid "%s unit has no moves left to build city."
msgstr "A la unitat %s no li queden moviments per construir una ciutat."
-#: server/unithand.c:492
+#. TRANS: <city> is owned by <nation>, cannot add <unit>.
+#: server/unithand.c:499
+#, c-format
+msgid "%s is owned by %s, cannot add %s."
+msgstr "%s pertany als %s, no s'hi poden afegir %s."
+
+#: server/unithand.c:506
#, c-format
msgid "%s is too big to add %s."
msgstr "%s és massa gran per afegir %s."
-#: server/unithand.c:498
+#: server/unithand.c:512
#, c-format
msgid "%s needs an improvement to grow, so you cannot add %s."
msgstr "%s necessita alguna millora per créixer, no pots afegir %s."
-#: server/unithand.c:509
+#: server/unithand.c:523
#, c-format
msgid "Can't add %s to %s."
msgstr "No pots afegir %s a %s."
-#: server/unithand.c:531
+#: server/unithand.c:545
#, c-format
msgid "%s added to aid %s in growing."
msgstr "%s afegits per ajudar al creixement de %s."
-#: server/unithand.c:828
+#: server/unithand.c:842
msgid "Your Nuclear missile was shot down by SDI defences, what a waste."
msgstr ""
"El teu mÃssil nuclear ha estat destruït per la defensa SDI, quina pèrdua."
-#: server/unithand.c:831
+#: server/unithand.c:845
#, c-format
msgid "The nuclear attack on %s was avoided by your SDI defense."
msgstr "L'atac nuclear a %s ha estat evitat per la teva defensa SDI."
#. TRANS: "Your Cannon ... the Polish Destroyer."
-#: server/unithand.c:901
+#: server/unithand.c:915
#, c-format
msgid "Your %s survived the pathetic attack from the %s %s."
msgstr "El teu %1$s ha sobreviscut l'atac ridÃcul del %3$s %2$s."
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unithand.c:910
+#: server/unithand.c:924
#, c-format
msgid "Your attacking %s failed against the %s %s!"
msgstr "El teu %1$s ha fallat l'atac contra el %3$s %2$s!"
-#: server/unithand.c:983
+#: server/unithand.c:997
#, c-format
msgid "Only %s can attack from sea."
msgstr "Només els %s poden atacar des del mar."
-#: server/unithand.c:988
+#: server/unithand.c:1002
msgid "Cannot attack from sea."
msgstr "No pots atacar des del mar."
-#: server/unithand.c:996 server/unittools.c:2137
+#: server/unithand.c:1010 server/unittools.c:2142
msgid "Cannot attack unless you declare war first."
msgstr "No pots atacar a no ser que declaris la guerra abans."
-#: server/unithand.c:1001
+#: server/unithand.c:1015
#, c-format
msgid "%s can only move into your own zone of control."
msgstr "%s només es pot moure dins de la teva zona de control."
-#: server/unithand.c:1007
+#: server/unithand.c:1021
#, c-format
msgid "Cannot invade unless you break peace with %s first."
msgstr "No pots envair si no trenques primer la pau amb %s."
-#: server/unithand.c:1052
+#: server/unithand.c:1066
msgid "This unit has no moves left."
msgstr "A aquesta unitat no li queden moviments."
-#: server/unithand.c:1107
+#: server/unithand.c:1121
msgid "Unit must be on land to perform diplomatic action."
msgstr "La unitat ha d'estar a terra per a dur a terme accions diplomà tiques."
-#: server/unithand.c:1109
+#: server/unithand.c:1123
msgid "No diplomat action possible."
msgstr "No hi ha cap acció diplomà tica possible."
-#: server/unithand.c:1125
+#: server/unithand.c:1139
#, c-format
msgid "You must declare war on %s first. Try using players dialog (F3)."
msgstr ""
"Primer has de declarar la guerra a %s. Prova-ho amb el dià leg de jugadors "
"(F3)."
-#: server/unithand.c:1143
+#: server/unithand.c:1157
msgid "This unit is being transported, and so cannot bombard."
msgstr "Aquesta unitat està sent transportada, i per tant no pot bombardejar."
-#: server/unithand.c:1158
+#: server/unithand.c:1172
msgid "You can't attack there."
msgstr "No pots atacar aquÃ."
-#: server/unithand.c:1180
+#: server/unithand.c:1194
msgid "This type of troops cannot take over a city."
msgstr "Aquest tipus de tropes no poden conquerir una ciutat."
-#: server/unithand.c:1198
+#: server/unithand.c:1212
msgid "A transported unit is not allied to all units or city on target tile."
msgstr ""
"Una unitat transportada no està aliada a totes les unitats o ciutat de la "
"casella destÃ."
-#: server/unithand.c:1240
+#: server/unithand.c:1254
#, c-format
msgid "Your %s helps build the %s in %s (%d remaining)."
msgstr "La teva %s ajuda a construir %s a %s (en queden %d)."
-#: server/unithand.c:1242
+#: server/unithand.c:1256
#, c-format
msgid "Your %s helps build the %s in %s (%d surplus)."
msgstr "La teva %s ajuda a construir %s a %s (excedent %d)."
-#: server/unithand.c:1286
+#: server/unithand.c:1300
#, c-format
msgid ""
"Sorry, your %s cannot establish a trade route because it has no home city"
@@ -6940,28 +7032,28 @@ msgstr ""
"Ho sento, el teu %s no pot establir una ruta comercial perquè no té ciutat "
"d'origen"
-#: server/unithand.c:1296
+#: server/unithand.c:1310
#, c-format
msgid "Sorry, your %s cannot establish a trade route between %s and %s"
msgstr "Ho sento, el teu %s no pot establir una ruta comercial entre %s i %s"
-#: server/unithand.c:1325 server/unithand.c:1344
+#: server/unithand.c:1339 server/unithand.c:1358
#, c-format
msgid "Sorry, your %s cannot establish a trade route here!"
msgstr "Ho sento, el teu %s no pot establir una ruta comercial aquÃ!"
-#: server/unithand.c:1329 server/unithand.c:1348
+#: server/unithand.c:1343 server/unithand.c:1362
#, c-format
msgid " The city of %s already has %d better trade routes!"
msgstr " La ciutat de %s ja té %d rutes comercials millors!"
-#: server/unithand.c:1361 server/unithand.c:1373
+#: server/unithand.c:1375 server/unithand.c:1387
#, c-format
msgid "Sorry, %s has canceled the trade route from %s to your city %s."
msgstr ""
"Ho sento, %s ha cancel·lat la ruta comercial des de %s a la teva ciutat %s."
-#: server/unithand.c:1406
+#: server/unithand.c:1420
#, c-format
msgid ""
"Your %s from %s has arrived in %s, and revenues amount to %d in gold and "
@@ -7023,56 +7115,56 @@ msgid "Teleported your %s to %s."
msgstr "S'ha teleportat el teu %s a %s."
#. TRANS: A unit is moved to resolve stack conflicts.
-#: server/unittools.c:1065
+#: server/unittools.c:1070
#, c-format
msgid "Moved your %s."
msgstr "S'ha mogut el teu %s."
-#: server/unittools.c:1076
+#: server/unittools.c:1081
#, c-format
msgid "Disbanded your %s."
msgstr "S'ha desmantellat el teu %s."
-#: server/unittools.c:1397
+#: server/unittools.c:1402
#, c-format
msgid "Unable to defend %s, %s has lost the game."
msgstr "No es pot defensar %s, %s ha perdut la partida."
-#: server/unittools.c:1401
+#: server/unittools.c:1406
#, c-format
msgid "Losing %s meant losing the game! Be more careful next time!"
msgstr ""
"La pèrdua de %s significa perdre la partida! Vigila més la propera vegada!"
-#: server/unittools.c:1503
+#: server/unittools.c:1508
#, c-format
msgid "%s escaped the destruction of %s, and fled to %s."
msgstr "%s s'ha escapat de la destrucció de %s i s'ha refugiat a %s."
-#: server/unittools.c:1512
+#: server/unittools.c:1517
#, c-format
msgid "%s lost when %s was lost."
msgstr "%s perdut en perdre %s."
-#: server/unittools.c:1561
+#: server/unittools.c:1566
#, c-format
msgid "Barbarian leader captured, %d gold ransom paid."
msgstr "S'ha capturat el lÃder bà rbar, ens paguen un rescat de %d en or."
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unittools.c:1579
+#: server/unittools.c:1584
#, c-format
msgid "Your attacking %s succeeded against the %s %s!"
msgstr "El teu %1$s ha reeixit en l'atac contra el %3$s %2$s!"
#. TRANS: "Cannon ... the Polish Destroyer."
-#: server/unittools.c:1588 server/unittools.c:1646
+#: server/unittools.c:1593 server/unittools.c:1651
#, c-format
msgid "%s lost to an attack by the %s %s."
msgstr "%1$s perdut en un atac del %3$s %2$s."
#. TRANS: "... Cannon ... the Polish Destroyer ...."
-#: server/unittools.c:1622
+#: server/unittools.c:1627
#, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -7084,14 +7176,14 @@ msgstr[1] ""
#. TRANS: "Cannon lost when the Polish Destroyer
#. * attacked the German Musketeers."
-#: server/unittools.c:1655
+#: server/unittools.c:1660
#, c-format
msgid "%s lost when the %s %s attacked the %s %s."
msgstr "Has perdut un %1$s quan el %3$s %2$s ha atacat el %5$s %4$s."
#. TRANS: "Musketeers (and Cannon) lost to an
#. * attack from the Polish Destroyer."
-#: server/unittools.c:1670
+#: server/unittools.c:1675
#, c-format
msgid "%s (and %s) lost to an attack from the %s %s."
msgstr "%1$s (i %2$s) perduts en un atac del %4$s %3$s."
@@ -7099,7 +7191,7 @@ msgstr "%1$s (i %2$s) perduts en un atac del %4$s %3$s."
#. TRANS: "Musketeers and 3 other units lost to
#. * an attack from the Polish Destroyer."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1680
+#: server/unittools.c:1685
#, 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."
@@ -7109,183 +7201,228 @@ msgstr[1] "%1$s i %2$d unitats més perduts en un atac del %4$s %3$s."
#. TRANS: "2 units lost when the Polish Destroyer
#. * attacked the German Musketeers."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1694
+#: server/unittools.c:1699
#, 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] "%1$d unitat perduda quan el %3$s %2$s ha atacat el %5$s %4$s."
msgstr[1] "%1$d unitats perdudes quan el %3$s %2$s ha atacat el %5$s %4$s."
-#: server/unittools.c:1962
+#: server/unittools.c:1967
#, c-format
msgid "Your %s was nuked by %s."
msgstr "Els teus %s han estat atacats per %s amb una arma nuclear."
-#: server/unittools.c:1965 server/unittools.c:1981
+#: server/unittools.c:1970 server/unittools.c:1986
msgid "yourself"
msgstr "tu mateix"
-#: server/unittools.c:1969
+#: server/unittools.c:1974
#, c-format
msgid "The %s %s was nuked."
msgstr "%2$s %1$s atacat amb una arma nuclear."
-#: server/unittools.c:1978
+#: server/unittools.c:1983
#, c-format
msgid "%s was nuked by %s."
msgstr "%s atacada amb una arma nuclear per %s."
-#: server/unittools.c:1986
+#: server/unittools.c:1991
#, c-format
msgid "You nuked %s."
msgstr "Has atacat amb una arma nuclear %s."
-#: server/unittools.c:2027
+#: server/unittools.c:2032
#, c-format
msgid "The %s detonated a nuke!"
msgstr "Els %s han detonat una arma nuclear!"
-#: server/unittools.c:2051
+#: server/unittools.c:2056
#, c-format
msgid "%s transported successfully."
msgstr "%s s'ha transportat satisfactòriament."
-#: server/unittools.c:2103
+#: server/unittools.c:2108
msgid "This unit type can not be paradropped."
msgstr "Aquest tipus d'unitat no pot ser llançat amb paracaigudes."
-#: server/unittools.c:2113
+#: server/unittools.c:2118
msgid "You cannot paradrop a unit that is transporting other units."
msgstr ""
"No es pot llançar en paracaigudes una unitat que en transporta d'altres."
-#: server/unittools.c:2119
+#: server/unittools.c:2124
msgid "The destination location is not known."
msgstr "La ubicació de destà és desconeguda."
-#: server/unittools.c:2126
+#: server/unittools.c:2131
#, c-format
msgid "This unit cannot paradrop into %s."
msgstr "Aquesta unitat no es pot llançar en paracaigudes a %s."
-#: server/unittools.c:2146
+#: server/unittools.c:2151
#, c-format
msgid "The distance to the target (%i) is greater than the unit's range (%i)."
msgstr ""
"La distà ncia a l'objectiu (%i) és més gran que el rang de la unitat (%i)."
-#: server/unittools.c:2157
+#: server/unittools.c:2162
#, c-format
msgid "Your %s paradropped into the %s and was lost."
msgstr "El teu %s s'ha llançat en paracaigudes a %s i ha mort."
-#: server/unittools.c:2170
+#: server/unittools.c:2175
#, c-format
msgid "Your %s was killed by enemy units at the paradrop destination."
msgstr ""
"El teu %s ha estat mort per unitats enemigues a la destinació de llançament."
-#: server/unittools.c:2192
+#: server/unittools.c:2197
#, c-format
msgid "You found %d gold."
msgstr "Has trobat %d peces d'or."
-#: server/unittools.c:2209
+#: server/unittools.c:2214
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr "Has trobat uns antics pergamins sobre %s."
-#: server/unittools.c:2216
+#: server/unittools.c:2221
#, c-format
msgid "The %s have acquired %s from ancient scrolls of wisdom."
msgstr "Els %s han adquirit %s d'antics pergamins."
-#: server/unittools.c:2230
+#: server/unittools.c:2235
msgid "A band of friendly mercenaries joins your cause."
msgstr "Una banda de mercenaris s'uneix a la teva causa."
-#: server/unittools.c:2248
+#: server/unittools.c:2253
msgid "An abandoned village is here."
msgstr "Només hi ha un poble abandonat."
-#: server/unittools.c:2258
+#: server/unittools.c:2263
msgid "You have unleashed a horde of barbarians!"
msgstr "Has alliberat una horda de bà rbars!"
-#: server/unittools.c:2261
+#: server/unittools.c:2266
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr "El teu %s ha mort a mans de bà rbars!"
-#: server/unittools.c:2277
+#: server/unittools.c:2282
msgid "You found a friendly city."
msgstr "Has trobat una ciutat amistosa."
-#: server/unittools.c:2291
+#: server/unittools.c:2296
msgid "Friendly nomads are impressed by you, and join you."
msgstr "Impressiones a uns nòmades i s'uneixen a tu."
-#: server/unittools.c:2316
+#: server/unittools.c:2321
msgid "Your overflight frightens the tribe; they scatter in terror."
msgstr "La teva sobrevolada ha espantat a la tribu, s'escampen aterrits."
-#: server/unittools.c:2574
+#: server/unittools.c:2579
#, c-format
msgid "Orders for %s aborted after enemy movement was spotted."
msgstr "Les ordres per %s s'han avortat en veure moviment d'enemics."
-#: server/unittools.c:3023
+#: server/unittools.c:3028
#, c-format
msgid "Orders for %s aborted as there are units nearby."
msgstr "Les ordres per %s s'han avortat perquè hi ha unitats a la vora."
-#: server/unittools.c:3075
+#: server/unittools.c:3080
#, c-format
msgid "Orders for %s aborted because building of city failed."
msgstr ""
"Les ordres per %s s'han avortat perquè no s'ha pogut construir la ciutat."
-#: server/unittools.c:3088
+#: server/unittools.c:3093
#, c-format
msgid "Orders for %s aborted since they give an invalid activity."
msgstr ""
"Les ordres per %s s'han avortat perquè provoquen una activitat no và lida."
-#: server/unittools.c:3102
+#: server/unittools.c:3107
#, c-format
msgid "Orders for %s aborted since they give an invalid location."
msgstr "Les ordres per %s s'han avortat perquè donen una ubicació no và lida."
-#: server/unittools.c:3112
+#: server/unittools.c:3117
#, c-format
msgid "Orders for %s aborted as there are units in the way."
msgstr "Les ordres per %s s'han avortat perquè hi ha unitats al mig del pas."
-#: server/unittools.c:3138
+#: server/unittools.c:3143
#, c-format
msgid "Orders for %s aborted because of failed move."
msgstr "Les ordres per %s s'han avortat per moviment incorrecte."
-#: server/unittools.c:3179
+#: server/unittools.c:3184
#, c-format
msgid "Attempt to change homecity for %s failed."
msgstr "L'intent de canviar la ciutat d'origen per %s ha fallat."
-#: server/unittools.c:3190
+#: server/unittools.c:3195
#, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr "L'intent d'establir una ruta comercial per %s ha fallat."
-#: server/unittools.c:3202
+#: server/unittools.c:3207
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr "L'intent de construir meravella per %s ha fallat"
-#: server/unittools.c:3211
+#: server/unittools.c:3216
#, c-format
msgid "Your %s has invalid orders."
msgstr "El teu %s té ordres incorrectes"
+#: server/voting.c:522
+#, c-format
+msgid ""
+"%s %d \"%s\" is passed %d to %d with %d abstentions and %d who did not vote."
+msgstr ""
+"%s %d \"%s\" s'aprova per %d a %d amb %d abstencions i %d que no han votat."
+
+#: server/voting.c:528
+#, c-format
+msgid ""
+"%s %d \"%s\" failed with %d against, %d for, %d abstentions and %d who did "
+"not vote."
+msgstr ""
+"%s %d \"%s\" es denega amb %d en contra, %d a favor, %d abstencions i %d que "
+"no han votat."
+
+#: server/voting.c:548
+#, c-format
+msgid "%s %d: %s voted yes."
+msgstr "%s %d: %s hi ha votat a favor."
+
+#: server/voting.c:553
+#, c-format
+msgid "%s %d: %s voted no."
+msgstr "%s %d: %s hi ha votat en contra."
+
+#: server/voting.c:558
+#, c-format
+msgid "%s %d: %s chose to abstain."
+msgstr "%s %d: %s s'ha abstingut."
+
+#. TRANS: Describing a new vote that can only pass
+#. * if there are no dissenting votes.
+#: server/voting.c:726
+#, c-format
+msgid "%s (needs %0.0f%% and no dissent)."
+msgstr "%s (cal %0.0f%% i cap en desacord)."
+
+#. TRANS: Describing a new vote that can pass only if the
+#. * given percentage of players votes 'yes'.
+#: server/voting.c:732
+#, c-format
+msgid "%s (needs %0.0f%% in favor)."
+msgstr "%s (cal %0.0f%% a favor)."
+
#: server/generator/mapgen.c:1771
msgid "High landmass - this may take a few seconds."
msgstr "Massa de terra gran - pot trigar uns segons."
@@ -7317,14 +7454,14 @@ msgstr ""
"Potser hi ha massa jugadors per aquest mapa.\n"
"Si us plau, informa d'aquest error a %s."
-#: client/attribute.c:363
+#: client/attribute.c:368
msgid ""
"There has been a CMA error. Your citizen governor settings may be broken."
msgstr ""
"Hi ha hagut un error d'AGC. La teva configuració de gestor de ciutadans pot "
"estar espatllada."
-#: client/attribute.c:367
+#: client/attribute.c:372
msgid "Old attributes detected and removed."
msgstr "S'han detectat i suprimit atributs vells."
@@ -7441,7 +7578,7 @@ msgstr[1] "%s (%d) %d torns"
#: client/citydlg_common.c:334 client/citydlg_common.c:347
#: client/gui-sdl/wldlg.c:1328
msgid "Obsolete"
-msgstr "Obsolet"
+msgstr "Obsoleta"
#: client/citydlg_common.c:336 client/citydlg_common.c:344
#: client/gui-sdl/repodlgs.c:2031 client/gui-sdl/wldlg.c:1332
@@ -7471,41 +7608,41 @@ msgstr "%+4d : Ciutadans\n"
msgid "%+4d : Taxed from trade\n"
msgstr "%+4d : Impostos sobre el comerç\n"
-#: client/citydlg_common.c:418
+#: client/citydlg_common.c:421
#, c-format
msgid "%+4d : Trade route with %s\n"
msgstr "%+4d : Ruta comercial amb %s\n"
-#: client/citydlg_common.c:427
+#: client/citydlg_common.c:430
#, c-format
msgid "%+4d : Building tithes\n"
msgstr "%+4d : Almoines per edificis\n"
-#: client/citydlg_common.c:450
+#: client/citydlg_common.c:453
#, c-format
msgid "%+4d : Bonus from %s (%+d%%)\n"
msgstr "%+4d : Bonificació per %s (%+d%%)\n"
-#: client/citydlg_common.c:462
+#: client/citydlg_common.c:465
#, c-format
msgid "%+4d : Waste\n"
msgstr "%+4d : Malbaratament\n"
-#: client/citydlg_common.c:468
+#: client/citydlg_common.c:471
#, c-format
msgid "%+4d : Disorder\n"
msgstr "%+4d : Desordre\n"
-#: client/citydlg_common.c:474
+#: client/citydlg_common.c:477
#, c-format
msgid "%+4d : Used\n"
msgstr "%+4d : Usat\n"
-#: client/citydlg_common.c:479
+#: client/citydlg_common.c:482
msgid "==== : Adds up to\n"
msgstr "==== : Total de\n"
-#: client/citydlg_common.c:481
+#: client/citydlg_common.c:484
#, c-format
msgid "%4d : Total surplus"
msgstr "%4d : Excedent Total"
@@ -7810,54 +7947,54 @@ msgstr "E"
msgid "Specialists"
msgstr "Especialistes"
-#: client/civclient.c:240
+#: client/civclient.c:241
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr " -a, --autoconnect\tSaltar el dià leg de connexió\n"
-#: client/civclient.c:250
+#: client/civclient.c:251
msgid " -l, --log FILE\tUse FILE as logfile (spawned server also uses this)\n"
msgstr ""
" -l, --log FITXER\tUsa FITXER com a fitxer de registre (el servidor "
"llançat en paral·lel també el fa servir)\n"
-#: client/civclient.c:252
+#: client/civclient.c:253
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr " -m, --meta HOST\tConnectar amb el metaservidor a HOST\n"
-#: client/civclient.c:254
+#: client/civclient.c:255
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr " -n, --name NOM\tUsa NOM com a nom\n"
-#: client/civclient.c:256
+#: client/civclient.c:257
msgid " -p, --port PORT\tConnect to server port PORT (usually with -a)\n"
msgstr ""
" -p, --port PORT\tConnecta al port del servidor PORT (normalment amb -a)\n"
-#: client/civclient.c:258
+#: client/civclient.c:259
#, c-format
msgid " -P, --Plugin PLUGIN\tUse PLUGIN for sound output %s\n"
msgstr " -P, --Plugin PLUGIN\tUsar PLUGIN per sortida de so %s\n"
-#: client/civclient.c:260
+#: client/civclient.c:261
msgid " -r, --read FILE\tRead startup script FILE (for spawned server only)\n"
msgstr ""
" -r, --read FITXER\tLlegeix l'script d'inici FITXER (només per al servidor "
"en spawn)\n"
-#: client/civclient.c:263
+#: client/civclient.c:264
msgid " -s, --server HOST\tConnect to the server at HOST (usually with -a)\n"
msgstr " -s, --server HOST\tConnecta al servidor HOST (normalment amb -a)\n"
-#: client/civclient.c:265
+#: client/civclient.c:266
msgid " -S, --Sound FILE\tRead sound tags from FILE\n"
msgstr " -S, --Sound FITXER\tLlegir marcadors de so des de FITXER\n"
-#: client/civclient.c:266
+#: client/civclient.c:267
msgid " -t, --tiles FILE\tUse data file FILE.tilespec for tiles\n"
msgstr ""
" -t, --tiles FITXER\tUsar fitxer de dades FITXER.tilespec per caselles\n"
-#: client/civclient.c:269
+#: client/civclient.c:270
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7867,46 +8004,46 @@ msgstr ""
"\t\t\tProva \"%s -- --help\" per més ajuda.\n"
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:274
+#: client/civclient.c:275
#, c-format
msgid "Report bugs at %s\n"
msgstr "Informa dels errors a %s\n"
-#: client/civclient.c:298
+#: client/civclient.c:299
#, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr "Port no và lid \"%s\" especificat amb l'opció --port.\n"
-#: client/civclient.c:300 client/civclient.c:315
+#: client/civclient.c:301 client/civclient.c:316
msgid "Try using --help.\n"
msgstr "Prova de fer servir --help.\n"
-#: client/civclient.c:313
+#: client/civclient.c:314
#, c-format
msgid "Invalid debug level \"%s\" specified with --debug option.\n"
msgstr ""
"Nivell de depuració incorrecte \"%s\" especificat amb l'opció --debug.\n"
-#: client/civclient.c:326
+#: client/civclient.c:327
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr "Opció no reconeguda: \"%s\"\n"
-#: client/civclient.c:391
+#: client/civclient.c:393
#, c-format
msgid "Updating old metaserver address \"%s\"."
msgstr "Actualitzant l'adreça antiga del metaservidor \"%s\"."
-#: client/civclient.c:394
+#: client/civclient.c:396
#, c-format
msgid "Default metaserver has been set to \"%s\"."
msgstr "S'ha fixat el metaservidor per defecte a \"%s\"."
-#: client/civclient.c:550
+#: client/civclient.c:540
msgid "Game started."
msgstr "La partida ha començat."
-#: client/civclient.c:588
+#: client/civclient.c:606
msgid "There was an error while auto connecting; aborting."
msgstr ""
"Hi ha hagut un error mentre em connectava automà ticament; s'està avortant."
@@ -8037,18 +8174,18 @@ msgstr "Connexió en progrés."
msgid "Disconnected from server."
msgstr "Desconnectat del servidor."
-#: client/clinet.c:469
+#: client/clinet.c:473
#, c-format
msgid "Failed to contact server \"%s\" at port %d as \"%s\" after %d attempts"
msgstr ""
"No s'ha pogut contactar el servidor \"%s\" port %d com a \"%s\" després de %"
"d intents"
-#: client/clinet.c:484 client/clinet.c:486
+#: client/clinet.c:488 client/clinet.c:490
msgid "Connection to server refused. Please start the server."
msgstr "Connexió amb el servidor refusada. Inicia el servidor si us plau."
-#: client/clinet.c:495 client/clinet.c:523
+#: client/clinet.c:499 client/clinet.c:527
#, c-format
msgid ""
"Error contacting server \"%s\" at port %d as \"%s\":\n"
@@ -8057,7 +8194,7 @@ msgstr ""
"No s'ha pogut contactar el servidor \"%s\" port %d com a \"%s\":\n"
" %s\n"
-#: client/clinet.c:514
+#: client/clinet.c:518
#, c-format
msgid ""
"Auto-connecting to server \"%s\" at port %d as \"%s\" every %f second(s) for "
@@ -8066,52 +8203,52 @@ 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:1358
+#: client/connectdlg_common.c:78 client/gui-gtk-2.0/pages.c:1358
msgid "novice"
msgstr "principiant"
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1358
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
msgid "easy"
msgstr "fà cil"
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1359
msgid "normal"
msgstr "normal"
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr "difÃcil"
-#: client/connectdlg_common.c:83
+#: client/connectdlg_common.c:82
msgid "experimental"
msgstr "experimental"
-#: client/connectdlg_common.c:213
+#: client/connectdlg_common.c:212
msgid "Starting server..."
msgstr "S'està engegant el servidor..."
-#: client/connectdlg_common.c:332
+#: client/connectdlg_common.c:331
msgid "Couldn't start the server."
msgstr "No s'ha pogut engegar el servidor"
-#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
+#: client/connectdlg_common.c:332 client/connectdlg_common.c:365
msgid "You'll have to start one manually. Sorry..."
msgstr "N'hauràs d'engegar un manualment. Ho sento..."
-#: client/connectdlg_common.c:364
+#: client/connectdlg_common.c:363
msgid "Couldn't connect to the server."
msgstr "No ens hem pogut connectar al servidor."
-#: client/connectdlg_common.c:365
+#: client/connectdlg_common.c:364
msgid "We probably couldn't start it from here."
msgstr "Probablement no podrÃem engegar-lo des d'aquÃ."
-#: client/connectdlg_common.c:470
+#: client/connectdlg_common.c:469
msgid ""
"Established control over the server. You have command access level 'hack'."
msgstr "Tenim el control del servidor. Tens nivell d'accés a comandes 'hack'."
-#: client/connectdlg_common.c:475
+#: client/connectdlg_common.c:474
msgid ""
"Failed to obtain the required access level to take control of the server. "
"The server will now be shutdown."
@@ -8123,33 +8260,33 @@ msgstr ""
msgid "Only transporter units can be unloaded."
msgstr "Només es poden descarregar les unitats de transport."
-#: client/control.c:1425
+#: client/control.c:1417
msgid "Only settler units can be put into auto mode."
msgstr "Només les unitats de colons es poden posar en mode automà tic."
-#: client/control.c:1516
+#: client/control.c:1511
msgid "Only nuclear units can do this."
msgstr "Només les unitats nuclears poden fer això."
-#: client/control.c:1545
+#: client/control.c:1540
msgid "Only paratrooper units can do this."
msgstr "Només els paracaigudistes poden fer això."
-#: client/control.c:2020
+#: client/control.c:2015
msgid "Too far for this unit."
msgstr "Massa lluny per a aquesta unitat."
-#: client/control.c:2230 client/control.c:2260 client/control.c:2276
+#: client/control.c:2225 client/control.c:2255 client/control.c:2271
msgid "Didn't find a route to the destination!"
msgstr "No he trobat una ruta al destÃ."
-#: client/control.c:2320
+#: client/control.c:2315
msgid "Oh my! You seem to have no capital!"
msgstr "Bufa! Pel que sembla no tens capital!"
#: client/helpdata.c:125
msgid "Terrain Road Irrigation Mining Transform\n"
-msgstr "Terreny Camà Irrigació Mineria Transformar\n"
+msgstr "Terreny Camà Regadiu Mineria Transformar\n"
#: client/helpdata.c:150
msgid "(Railroads and fortresses require 3 turns, regardless of terrain.)"
@@ -8547,27 +8684,40 @@ 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:1066 client/helpdata.c:1400
+#: client/helpdata.c:1066 client/helpdata.c:1408
msgid " or "
msgstr " o "
-#: client/helpdata.c:1068 client/helpdata.c:1388
+#: client/helpdata.c:1068 client/helpdata.c:1396
msgid "?or:, "
msgstr ", "
-#: client/helpdata.c:1080
+#: client/helpdata.c:1079
+#, c-format
+msgid "* Unit has to be in a city, or a base after %d turn.\n"
+msgid_plural "* Unit has to be in a city, or a base after %d turns.\n"
+msgstr[0] ""
+"* La unitat ha de ser en una ciutat o en una base al cap d'%d torn.\n"
+msgstr[1] ""
+"* La unitat ha de ser en una ciutat o en una base al cap de %d torns.\n"
+
+#: client/helpdata.c:1087
#, 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"
+msgid "* Unit has to be in a city, a base, or on a %s after %d turn.\n"
+msgid_plural "* Unit has to be in a city, a base, or on a %s after %d turns.\n"
+msgstr[0] ""
+"* La unitat ha de ser en una ciutat, una base, o en una %s al cap d'%d "
+"torn.\n"
+msgstr[1] ""
+"* La unitat ha de ser en una ciutat, una base, o en una %s al cap de %d "
+"torns.\n"
-#: client/helpdata.c:1122
+#: client/helpdata.c:1130
#, 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:1127
+#: client/helpdata.c:1135
#, c-format
msgid ""
"To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8576,89 +8726,89 @@ msgstr ""
"Per assolir %s primer hem d'obtenir %d altres tecnologies. Per acabar tot el "
"projecte es necessitaran %d bombetes."
-#: client/helpdata.c:1135
+#: client/helpdata.c:1143
msgid "You cannot research this technology."
msgstr "No pots investigar aquesta tecnologia."
-#: client/helpdata.c:1139
+#: client/helpdata.c:1147
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:1151
+#: client/helpdata.c:1159
#, 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:1156
+#: client/helpdata.c:1164
#, 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:1159
+#: client/helpdata.c:1167
#, 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:1163
+#: client/helpdata.c:1171
msgid "* Increases the pollution generated by the population.\n"
msgstr "* Incrementa la contaminació generada per la població.\n"
-#: client/helpdata.c:1168
+#: client/helpdata.c:1176
#, 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:1175
+#: client/helpdata.c:1183
#, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr "* Permet als %s construir fortificacions.\n"
-#: client/helpdata.c:1183
+#: client/helpdata.c:1191
#, c-format
msgid "* Allows %s to build airbases.\n"
msgstr "* Permet als %s construir bases aèries.\n"
-#: client/helpdata.c:1192
+#: client/helpdata.c:1200
#, c-format
msgid "* Allows %s to upgrade roads to railroads.\n"
msgstr "* Permet als %s millorar camins a ferrocarrils.\n"
-#: client/helpdata.c:1200
+#: client/helpdata.c:1208
#, c-format
msgid "* Allows %s to upgrade irrigation to farmland.\n"
-msgstr "* Permet als %s millorar la irrigació a horta.\n"
+msgstr "* Permet als %s millorar el regadiu a horta.\n"
-#: client/helpdata.c:1234
+#: client/helpdata.c:1242
msgid "* Pollution cannot be generated on this terrain."
msgstr "* Aquest terreny no pot ser contaminat."
-#: client/helpdata.c:1239
+#: client/helpdata.c:1247
msgid "* You cannot build cities on this terrain."
msgstr "* No pots construir ciutats sobre aquest terreny."
-#: client/helpdata.c:1245
+#: client/helpdata.c:1253
msgid "* The coastline of this terrain is unsafe."
msgstr "* La lÃnia de costa d'aquest terreny és insegura."
-#: client/helpdata.c:1250
+#: client/helpdata.c:1258
msgid "* This terrain is unsafe for units to travel on."
msgstr "* Aquest terreny no és segur perquè hi viatgin unitats."
-#: client/helpdata.c:1255
+#: client/helpdata.c:1263
msgid "* Land units cannot travel on oceanic terrains."
msgstr "* Les unitats terrestres no poden viatjar per terrenys oceà nics."
-#: client/helpdata.c:1305
+#: client/helpdata.c:1313
msgid "Features:\n"
msgstr "CaracterÃstiques:\n"
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1411 client/helpdata.c:1412
+#: client/helpdata.c:1419 client/helpdata.c:1420
msgid "?outputlist: Nothing "
msgstr "Res"
-#: client/helpdata.c:1419
+#: client/helpdata.c:1427
#, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -8673,7 +8823,7 @@ msgstr[1] ""
"* Les unitats militars fora de casa i les unitats de batalla faran que %d "
"ciutadans estiguin descontents.\n"
-#: client/helpdata.c:1429
+#: client/helpdata.c:1437
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8683,31 +8833,31 @@ msgstr ""
"les unitats en cas contrari.\n"
#. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1437
+#: client/helpdata.c:1445
#, 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:1442
+#: client/helpdata.c:1450
#, 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:1447
+#: client/helpdata.c:1455
#, 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:1451
+#: client/helpdata.c:1459
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:1460
+#: client/helpdata.c:1468
#, c-format
msgid "* Each of your cities will avoid paying %d %s towards unit upkeep.\n"
msgstr ""
@@ -8716,21 +8866,21 @@ msgstr ""
#. TRANS: Amount is subtracted from upkeep cost
#. * for each upkeep type.
-#: client/helpdata.c:1468
+#: client/helpdata.c:1476
#, 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:1475
+#: client/helpdata.c:1483
#, 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:1482
+#: client/helpdata.c:1490
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -8740,7 +8890,7 @@ msgstr ""
"civilització apareixerà quan tinguis %d ciutats.\n"
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1489
+#: client/helpdata.c:1497
#, c-format
msgid ""
"* After the first unhappy citizen due to city size, for each %d additional "
@@ -8749,16 +8899,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:1497
+#: client/helpdata.c:1505
#, 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:1502
+#: client/helpdata.c:1510
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:1507
+#: client/helpdata.c:1515
#, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -8773,7 +8923,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:1519
+#: client/helpdata.c:1527
#, 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"
@@ -8783,7 +8933,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:1530
+#: client/helpdata.c:1538
#, c-format
msgid ""
"* You may grow your cities by means of celebrations. Your cities must be at "
@@ -8792,15 +8942,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:1536
+#: client/helpdata.c:1544
msgid "* Your units cannot be bribed.\n"
msgstr "* Les teves unitats no poden ser subornades.\n"
-#: client/helpdata.c:1539
+#: client/helpdata.c:1547
msgid "* Your cities cannot be incited.\n"
msgstr "* Les teves ciutats no poden ser incitades a la revolta.\n"
-#: client/helpdata.c:1543
+#: client/helpdata.c:1551
msgid ""
"* Government will fall into anarchy if any city is in disorder for more than "
"two turns in a row.\n"
@@ -8808,15 +8958,15 @@ msgstr ""
"* El govern caurà en l'anarquia si qualsevol ciutat roman en desordre durant "
"meÅ› de dos torns seguits.\n"
-#: client/helpdata.c:1549
+#: client/helpdata.c:1557
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:1553
+#: client/helpdata.c:1561
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:1557
+#: client/helpdata.c:1565
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
@@ -8824,25 +8974,25 @@ msgstr ""
"* Els edificis que normalment serveixen per mitigar la infelicitat generaran "
"or.\n"
-#: client/helpdata.c:1561
+#: client/helpdata.c:1569
msgid "* Pays no upkeep for fanatics.\n"
msgstr "* No paga manteniment pels fanà tics.\n"
-#: client/helpdata.c:1564
+#: client/helpdata.c:1572
msgid "* Has no unhappy citizens.\n"
msgstr "* No té ciutadans descontents.\n"
-#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
+#: client/helpdata.c:1582 client/helpdata.c:1586 client/helpdata.c:1590
#, c-format
msgid "* Veteran %s units.\n"
msgstr "* Unitats %s veteranes.\n"
-#: client/helpdata.c:1585
+#: client/helpdata.c:1593
msgid "* Veteran units.\n"
msgstr "* Unitats veteranes.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1591
+#: client/helpdata.c:1599
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8852,7 +9002,7 @@ msgstr ""
"penalització de -1 quan no s'estigui en festa.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1600
+#: client/helpdata.c:1608
#, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8862,7 +9012,7 @@ msgstr ""
"més quan s'estigui en festa.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1608
+#: client/helpdata.c:1616
#, c-format
msgid "* Each worked tile with at least 1 %s will yield %d more of it.\n"
msgstr ""
@@ -8870,31 +9020,31 @@ msgstr ""
"més.\n"
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1617
+#: client/helpdata.c:1625
#, 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:1625
+#: client/helpdata.c:1633
#, 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:1630
+#: client/helpdata.c:1638
#, 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:1635
+#: client/helpdata.c:1643
#, 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:1643
+#: client/helpdata.c:1651
#, c-format
msgid "* %s waste will increase quickly with distance from capital.\n"
msgstr ""
@@ -8902,38 +9052,38 @@ msgstr ""
"capital.\n"
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1649
+#: client/helpdata.c:1657
#, 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:1655
+#: client/helpdata.c:1663
#, 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:1672
+#: client/helpdata.c:1680
#, 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:1699
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d %s"
msgstr "%s%d %s"
-#: client/helpdata.c:1700 client/helpdata.c:1708 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1708 client/helpdata.c:1716 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:1707
+#: client/helpdata.c:1715
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d descontents"
@@ -8981,7 +9131,7 @@ msgid ""
"This is the default login username that will be used in the connection "
"dialogs or with the -a command-line parameter."
msgstr ""
-"Aquest és el nom d'usuari per defecte que es farà servir als dià legs de "
+"Aquest és el nom d'usuari predeterminat que es farà servir als dià legs de "
"connexió o amb el parà metre de lÃnia de comandes -a."
#: client/options.c:117
@@ -8993,7 +9143,7 @@ msgid ""
"This is the default server hostname that will be used in the connection "
"dialogs or with the -a command-line parameter."
msgstr ""
-"És el nom del host servidor per defecte que es farà servir als dià legs de "
+"És el nom del host servidor predeterminat que es farà servir als dià legs de "
"connexió o amb el parà metre de lÃnia de comandes -a."
#: client/options.c:123
@@ -9005,10 +9155,10 @@ msgid ""
"This is the default server port that will be used in the connection dialogs "
"or with the -a command-line parameter."
msgstr ""
-"És el port del servidor per defecte que es farà servir als dià legs de "
+"És el port del servidor predeterminat que es farà servir als dià legs de "
"connexió o amb el parà metre de lÃnia de comandes -a."
-#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:916 data/Freeciv.in:107
msgid "Metaserver"
msgstr "Metaservidor"
@@ -9019,7 +9169,7 @@ msgid ""
"you're doing."
msgstr ""
"El metaservidor és un host que el client contacta per esbrinar on hi ha "
-"partides en curs a Internet. No modifiquis el seu valor per defecte si no "
+"partides en curs a Internet. No modifiquis el seu valor predeterminat si no "
"saps el que estàs fent."
#: client/options.c:136
@@ -9426,35 +9576,35 @@ msgstr "Error en desar, no s'ha pogut escriure al fitxer %s"
msgid "Saved settings to file %s"
msgstr "S'ha desat la configuració al fitxer %s"
-#: client/packhand.c:211 client/packhand.c:217
+#: client/packhand.c:212 client/packhand.c:218
msgid "You were rejected from the game...."
msgstr "Has estat rebutjat de la partida...."
-#: client/packhand.c:229
+#: client/packhand.c:230
#, c-format
msgid "Client capability string: %s"
msgstr "Capacitats del client: %s"
-#: client/packhand.c:232
+#: client/packhand.c:233
#, c-format
msgid "Server capability string: %s"
msgstr "Capacitats del servidor: %s"
-#: client/packhand.c:850
+#: client/packhand.c:864
#, c-format
msgid "Start of turn %d"
msgstr "Inici del torn %d"
-#: client/packhand.c:1591
+#: client/packhand.c:1621
#, c-format
msgid "AI Mode is now %s."
msgstr "El mode IA és ara %s."
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "ON"
msgstr "ENCÈS"
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "OFF"
msgstr "APAGAT"
@@ -9485,15 +9635,15 @@ msgstr "Nom:"
msgid "Username"
msgstr "Usuari"
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
-#: client/gui-gtk-2.0/pages.c:2157
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:653
+#: client/gui-gtk-2.0/pages.c:1604 client/gui-gtk-2.0/pages.c:2159
msgid "Flag"
msgstr "Bandera"
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1605
-#: client/gui-gtk-2.0/pages.c:2159 client/gui-sdl/repodlgs.c:2063
-#: client/gui-win32/connectdlg.c:990 client/gui-win32/dialogs.c:542
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:657
+#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1609
+#: client/gui-gtk-2.0/pages.c:2161 client/gui-sdl/repodlgs.c:2063
+#: client/gui-win32/connectdlg.c:992 client/gui-win32/dialogs.c:542
#: client/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "Nació"
@@ -9506,7 +9656,7 @@ msgstr "Frontera"
msgid "Score"
msgstr "Puntuació"
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1614
msgid "Team"
msgstr "Equip"
@@ -9539,36 +9689,36 @@ msgstr "Inactiu"
msgid "Ping"
msgstr "Ping"
-#: client/repodlgs_common.c:375
+#: client/repodlgs_common.c:378
msgid "You cannot sell improvements."
msgstr "No pots vendre millores."
-#: client/repodlgs_common.c:391
+#: client/repodlgs_common.c:394
#, c-format
msgid "Sold %d %s for %d gold."
msgstr "Venut %d %s per %d d'or"
-#: client/repodlgs_common.c:396
+#: client/repodlgs_common.c:399
#, c-format
msgid "No %s could be sold."
msgstr "No s'ha pogut vendre cap %s"
#. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:415
+#: client/repodlgs_common.c:418
msgid "You cannot disband units."
msgstr "No pots desmantellar unitats."
-#: client/repodlgs_common.c:420
+#: client/repodlgs_common.c:423
#, c-format
msgid "%s cannot be disbanded."
msgstr "%s no es pot desmantellar."
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:444
#, c-format
msgid "Disbanded %d %s."
msgstr "Desmantellada %d %s."
-#: client/repodlgs_common.c:445
+#: client/repodlgs_common.c:448
#, c-format
msgid "No %s could be disbanded."
msgstr "No s'ha pogut desmantellar cap %s."
@@ -10153,47 +10303,47 @@ msgstr "?dys/hrs:%02dd %02dh"
msgid "?duration:overflow"
msgstr "desbordat"
-#: client/text.c:1143
+#: client/text.c:1145
#, c-format
msgid "%6d.%02d ms"
msgstr "%6d.%02d ms"
#. TRANS: <nation adjective> <government name>.
#. * E.g. "Polish Republic".
-#: client/text.c:1188
+#: client/text.c:1193
#, c-format
msgid "?nationgovernment:%s %s"
msgstr "%2$s dels %1$s"
#. TRANS: "Observer: 1985"
-#: client/text.c:1198
+#: client/text.c:1203
#, c-format
msgid "Observer: %s"
msgstr "Observador: %s"
-#: client/text.c:1216
+#: client/text.c:1221
msgid "Buildings: "
msgstr "Edificis: "
-#: client/text.c:1233 client/text.c:1272
+#: client/text.c:1238 client/text.c:1277
msgid "None. "
msgstr "Cap. "
-#: client/text.c:1235 client/text.c:1274
+#: client/text.c:1240 client/text.c:1279
msgid "?clistend:."
msgstr "?blistend:."
-#: client/text.c:1253
+#: client/text.c:1258
msgid "Wonders: "
msgstr "Meravelles: "
-#: client/text.c:1308
+#: client/text.c:1313
#, 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:1312
+#: client/text.c:1317
#, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
@@ -10201,56 +10351,56 @@ 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:1318
+#: client/text.c:1323
#, c-format
msgid "%d additional unhappy citizen."
msgid_plural "%d additional unhappy citizens."
msgstr[0] "%d ciutadà descontent addicional."
msgstr[1] "%d ciutadans descontents addicionals."
-#: client/text.c:1339
+#: client/text.c:1344
msgid "Unlimited martial law in effect."
msgstr "Llei marcial il·limitada vigent."
-#: client/text.c:1341
+#: client/text.c:1346
#, c-format
msgid "%d military unit may impose martial law."
msgid_plural "Up to %d military units may impose martial law."
msgstr[0] "%d unitat miliitar pot imposar la llei marcial."
msgstr[1] "%d unitats miliitars poden imposar la llei marcial."
-#: client/text.c:1345
+#: client/text.c:1350
#, c-format
msgid "Each military unit makes %d unhappy citizen content."
msgid_plural "Each military unit makes %d unhappy citizens content."
msgstr[0] "Cada unitat militar fa content %d ciutadà descontent."
msgstr[1] "Cada unitat militar fa contents %d ciutadans descontents."
-#: client/text.c:1352
+#: client/text.c:1357
msgid "Military units in the field may cause unhappiness. "
msgstr "Les unitats militars al camp poden causar descontents."
-#: client/text.c:1355
+#: client/text.c:1360
msgid "Military units have no happiness effect. "
msgstr "Les unitats militars no tenen cap efecte sobre la felicitat."
-#: client/text.c:1370
+#: client/text.c:1375
#, c-format
msgid "Luxury: %d total."
msgstr "Luxes: %d en total."
-#: client/tilespec.c:865
+#: client/tilespec.c:882
msgid "No usable default tileset found, aborting!"
msgstr "No s'ha trobat cap joc de caselles usable, s'avorta l'execució!"
-#: client/tilespec.c:1338
+#: client/tilespec.c:1355
msgid ""
"Client does not support isometric tilesets. Using default tileset instead."
msgstr ""
"EL client no suporta jocs de caselles isomètrics. Per tant s'usarà el joc de "
"caselles per defecte."
-#: client/tilespec.c:1347
+#: client/tilespec.c:1364
msgid ""
"Client does not support overhead view tilesets. Using default tileset "
"instead."
@@ -10258,7 +10408,7 @@ msgstr ""
"EL client no suporta jocs de caselles zenitals. Per tant s'usarà el joc de "
"caselles per defecte."
-#: client/tilespec.c:3966
+#: client/tilespec.c:3987
#, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -10590,7 +10740,7 @@ msgstr "La teva caravana ha arribat"
#: client/gui-gtk-2.0/caravan_dialog.c:116 client/gui-win32/dialogs.c:1051
msgid "Establish _Traderoute"
-msgstr "Establir una _Ruta de comerç"
+msgstr "Establir _Ruta Comercial"
#: client/gui-gtk-2.0/caravan_dialog.c:117 client/gui-win32/dialogs.c:1052
msgid "Enter Marketplace"
@@ -10938,7 +11088,7 @@ msgid "_Display"
msgstr "_Mostrar"
#: client/gui-gtk-2.0/cityrep.c:1006 client/gui-gtk-2.0/menu.c:839
-#: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
+#: client/gui-sdl/diplodlg.c:692 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
#: client/gui-xaw/cityrep.c:533 client/gui-xaw/menu.c:156
@@ -11110,192 +11260,192 @@ msgstr "Com hem d'anomenar el prefixat ?"
msgid "Remove this preset?"
msgstr "Eliminar aquest prefixat?"
-#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:222
+#: client/gui-gtk-2.0/dialogs.c:197 client/gui-gtk-2.0/messagewin.c:222
msgid "Goto _Location"
msgstr "Anar a _lloc"
-#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
+#: client/gui-gtk-2.0/dialogs.c:202 client/gui-gtk-2.0/messagewin.c:226
msgid "Inspect _City"
msgstr "Inspeccionar _Ciutat"
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:258 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:258 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:259 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:311 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:312 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:312 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:313 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:506
+#: client/gui-gtk-2.0/dialogs.c:507
msgid "Unit"
msgstr "Unitat"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:950
-#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2155
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:985
+#: client/gui-gtk-2.0/dialogs.c:508 client/gui-gtk-2.0/pages.c:950
+#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2157
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:987
#: 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:519 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:520 client/gui-sdl/dialogs.c:627
msgid "Unit selection"
msgstr "Selecció d'unitat"
-#: client/gui-gtk-2.0/dialogs.c:582
+#: client/gui-gtk-2.0/dialogs.c:583
msgid "_Ready all"
msgstr "_Preparar totes"
-#: client/gui-gtk-2.0/dialogs.c:590
+#: client/gui-gtk-2.0/dialogs.c:591
msgid "_Sentry idle"
msgstr "_Sentinella inactives"
-#: client/gui-gtk-2.0/dialogs.c:719
+#: client/gui-gtk-2.0/dialogs.c:721
msgid "Nation _Groups:"
msgstr "_Grups de Nacions:"
-#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:766 data/Freeciv.in:3128
msgid "What Nation Will You Be?"
msgstr "Quina nació serà s?"
-#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
-#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
+#: client/gui-gtk-2.0/dialogs.c:768 client/gui-sdl/chatline.c:842
+#: client/gui-win32/connectdlg.c:1040 data/Freeciv.in:3371
msgid "Pick Nation"
msgstr "Tria Nació"
-#: client/gui-gtk-2.0/dialogs.c:774
+#: client/gui-gtk-2.0/dialogs.c:776
msgid "_Random Nation"
msgstr "Nació _Aleatòria"
-#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:792 client/gui-win32/dialogs.c:517
msgid "Select a nation"
msgstr "Escull una nació"
-#: client/gui-gtk-2.0/dialogs.c:804
+#: client/gui-gtk-2.0/dialogs.c:810
msgid "_Properties"
msgstr "_Propietats"
-#: client/gui-gtk-2.0/dialogs.c:824
+#: client/gui-gtk-2.0/dialogs.c:830
msgid "_Leader:"
msgstr "_LÃder:"
-#: client/gui-gtk-2.0/dialogs.c:831
+#: client/gui-gtk-2.0/dialogs.c:837
msgid "_Female"
msgstr "_Dona"
-#: client/gui-gtk-2.0/dialogs.c:836
+#: client/gui-gtk-2.0/dialogs.c:842
msgid "_Male"
msgstr "_Home"
-#: client/gui-gtk-2.0/dialogs.c:863
+#: client/gui-gtk-2.0/dialogs.c:869
msgid "City _Styles:"
msgstr "_Estils de Ciutat:"
-#: client/gui-gtk-2.0/dialogs.c:902
+#: client/gui-gtk-2.0/dialogs.c:908
msgid "_Description"
msgstr "_Descripció"
-#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1263 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:1253 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1268 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:1262 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1277 client/gui-sdl/dialogs.c:2204
#: 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:1306 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1318 client/gui-win32/citydlg.c:1454
#: data/Freeciv.in:2484
msgid "Upgrade Unit!"
msgstr "Millorar unitat!"
-#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1327 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 "Millorar unitats obsoletes"
-#: client/gui-gtk-2.0/diplodlg.c:231 client/gui-win32/diplodlg.c:151
+#: client/gui-gtk-2.0/diplodlg.c:222 client/gui-win32/diplodlg.c:151
#: client/gui-xaw/diplodlg.c:383 client/gui-xaw/diplodlg.c:401
msgid "World-map"
msgstr "Mapa mundial"
-#: client/gui-gtk-2.0/diplodlg.c:237 client/gui-win32/diplodlg.c:146
+#: client/gui-gtk-2.0/diplodlg.c:228 client/gui-win32/diplodlg.c:146
#: client/gui-xaw/diplodlg.c:387 client/gui-xaw/diplodlg.c:405
msgid "Sea-map"
msgstr "Mapa marÃtim"
-#: client/gui-gtk-2.0/diplodlg.c:243
+#: client/gui-gtk-2.0/diplodlg.c:234
msgid "_Maps"
msgstr "_Mapes"
-#: client/gui-gtk-2.0/diplodlg.c:274
+#: client/gui-gtk-2.0/diplodlg.c:265
msgid "_Advances"
msgstr "_Avenços"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/diplodlg.c:315 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "_Ciutats"
-#: client/gui-gtk-2.0/diplodlg.c:333
+#: client/gui-gtk-2.0/diplodlg.c:324
msgid "_Give shared vision"
msgstr "_Donar visió compartida"
-#: client/gui-gtk-2.0/diplodlg.c:346
+#: client/gui-gtk-2.0/diplodlg.c:337
msgid "Give _embassy"
msgstr "Donar A_mbaixada"
-#: client/gui-gtk-2.0/diplodlg.c:376
+#: client/gui-gtk-2.0/diplodlg.c:368
msgid "_Pacts"
msgstr "_Pactes"
-#: client/gui-gtk-2.0/diplodlg.c:466
+#: client/gui-gtk-2.0/diplodlg.c:458
#, c-format
msgid "Diplomacy: %s"
msgstr "Diplomà cia: %s"
-#: client/gui-gtk-2.0/diplodlg.c:473
+#: client/gui-gtk-2.0/diplodlg.c:465
msgid "_Cancel meeting"
msgstr "_Cancel·lar la cimera"
-#: client/gui-gtk-2.0/diplodlg.c:475
+#: client/gui-gtk-2.0/diplodlg.c:467
msgid "Accept _treaty"
msgstr "Acceptar _tractat"
-#: client/gui-gtk-2.0/diplodlg.c:503
+#: client/gui-gtk-2.0/diplodlg.c:495
msgid "C_lauses:"
msgstr "C_là usules:"
-#: client/gui-gtk-2.0/diplodlg.c:568 client/gui-gtk-2.0/diplodlg.c:642
+#: client/gui-gtk-2.0/diplodlg.c:560 client/gui-gtk-2.0/diplodlg.c:634
msgid "_Gold:"
msgstr "_Or:"
-#: client/gui-gtk-2.0/diplodlg.c:580 client/gui-gtk-2.0/diplodlg.c:654
+#: client/gui-gtk-2.0/diplodlg.c:572 client/gui-gtk-2.0/diplodlg.c:646
msgid "_Add Clause..."
msgstr "_Afegir clà usula..."
-#: client/gui-gtk-2.0/diplodlg.c:699
+#: client/gui-gtk-2.0/diplodlg.c:691
msgid "--- This treaty is blank. Please add some clauses. ---"
msgstr "--- Tractat en blanc. Si us plau, afegeix clà usules. ---"
-#: client/gui-gtk-2.0/diplodlg.c:905 client/gui-sdl/diplodlg.c:375
+#: client/gui-gtk-2.0/diplodlg.c:897 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 "La quantitat d'or especificada no és và lida."
@@ -11354,21 +11504,21 @@ msgstr "Escull destÃ"
msgid "Show _All Cities"
msgstr "Mostrar _totes les ciutats"
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:164
msgid "Show Map Scrollbars"
msgstr "Mostrar les barres de desplaçament del mapa"
-#: client/gui-gtk-2.0/gui_main.c:163
+#: client/gui-gtk-2.0/gui_main.c:165
msgid "Disable this option to hide the scrollbars on the map view."
msgstr ""
"Inhabilita aquesta opció per amagar les barres de desplaçament a la vista de "
"mapa."
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:169
msgid "Keyboardless goto"
msgstr "\"Anar a\" sense teclat"
-#: client/gui-gtk-2.0/gui_main.c:168
+#: client/gui-gtk-2.0/gui_main.c:170
msgid ""
"If this option is set then a goto may be initiated by left-clicking and then "
"holding down the mouse button while dragging the mouse onto a different tile."
@@ -11377,11 +11527,11 @@ msgstr ""
"botó esquerre i aguantant-lo mentre arrossegues el ratolà cap a una altra "
"casella."
-#: client/gui-gtk-2.0/gui_main.c:173
+#: client/gui-gtk-2.0/gui_main.c:175
msgid "Keep dialogs on top"
msgstr "Mantenir dià legs al damunt"
-#: client/gui-gtk-2.0/gui_main.c:174
+#: client/gui-gtk-2.0/gui_main.c:176
msgid ""
"If this option is set then dialog windows will always remain in front of the "
"main Freeciv window. Disabling this has no effect in fullscreen mode."
@@ -11390,11 +11540,11 @@ msgstr ""
"davant de la finestra principal de Freeciv. Inhabilitar-ho no té cap efecte "
"en mode de pantalla complerta."
-#: client/gui-gtk-2.0/gui_main.c:178
+#: client/gui-gtk-2.0/gui_main.c:180
msgid "Show worklist task icons"
msgstr "Mostrar icones de tasca a la llista de treballs"
-#: client/gui-gtk-2.0/gui_main.c:179
+#: client/gui-gtk-2.0/gui_main.c:181
msgid ""
"Disabling this will turn off the unit and building icons in the worklist "
"dialog and the production tab of the city dialog."
@@ -11402,11 +11552,11 @@ msgstr ""
"Inhabilitar això amagarà les icones d'unitat i edifici al dià leg de llistes "
"de treball i a la pestanya de producció del dià leg de ciutat."
-#: client/gui-gtk-2.0/gui_main.c:183
+#: client/gui-gtk-2.0/gui_main.c:185
msgid "Enable status report tabs"
msgstr "Permetre pestanyes d'informe d'estat"
-#: client/gui-gtk-2.0/gui_main.c:184
+#: client/gui-gtk-2.0/gui_main.c:186
msgid ""
"If this option is enabled then report dialogs will be shown as separate tabs "
"rather than in popup dialogs."
@@ -11414,11 +11564,11 @@ msgstr ""
"Si aquesta opció és permesa, els dià legs d'informe es mostraran com a "
"pestanyes separades en comptes de finestres individuals."
-#: client/gui-gtk-2.0/gui_main.c:189 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:191 client/gui-win32/gui_main.c:110
msgid "Better fog-of-war drawing"
msgstr "Millor dibuix de la penombra de guerra"
-#: client/gui-gtk-2.0/gui_main.c:190 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:192 client/gui-win32/gui_main.c:111
msgid ""
"If this is enabled then a better method is used for drawing fog-of-war. It "
"is not any slower but will consume about twice as much memory."
@@ -11426,11 +11576,11 @@ msgstr ""
"Si això es permet, s'utilitza un mètode millor per dibuixar la penombra de "
"guerra. No és més lent però gasta aproximadament el doble de memòria."
-#: client/gui-gtk-2.0/gui_main.c:195
+#: client/gui-gtk-2.0/gui_main.c:197
msgid "Show time for each chat message"
msgstr "Mostrar l'hora per cada missatge de xat"
-#: client/gui-gtk-2.0/gui_main.c:196
+#: client/gui-gtk-2.0/gui_main.c:198
msgid ""
"If this option is enabled then all chat messages will be prefixed by a time "
"string of the form [hour:minute:second]."
@@ -11438,11 +11588,11 @@ msgstr ""
"Si s'activa aquesta opció, tots els missatges de xat vindran precedits per "
"una cadena de temps amb el format [hora:minut:segon]."
-#: client/gui-gtk-2.0/gui_main.c:201
+#: client/gui-gtk-2.0/gui_main.c:203
msgid "Split bottom notebook area"
msgstr "Partir à rea de llibreta de sota"
-#: client/gui-gtk-2.0/gui_main.c:202
+#: client/gui-gtk-2.0/gui_main.c:204
msgid ""
"Enabling this option will split the bottom notebook into a left and right "
"notebook so that two tabs may be viewed at once."
@@ -11450,11 +11600,11 @@ msgstr ""
"Activar aquesta opció partirà la llibreta de sota en dues, una a la dreta i "
"una a l'esquerra per poder veure dues pestanyes al mateix temps."
-#: client/gui-gtk-2.0/gui_main.c:207
+#: client/gui-gtk-2.0/gui_main.c:209
msgid "New message events go to top of list"
msgstr "Missatges d'esdeveniments nous van al capdamunt de la llista"
-#: client/gui-gtk-2.0/gui_main.c:208
+#: client/gui-gtk-2.0/gui_main.c:210
msgid ""
"If this option is enabled, new events in the message window will appear at "
"the top of the list, rather than being appended at the bottom."
@@ -11463,11 +11613,11 @@ msgstr ""
"missatges apareixeran al capdamunt de la llista, en comptes d'afegir-se al "
"final."
-#: client/gui-gtk-2.0/gui_main.c:213
+#: client/gui-gtk-2.0/gui_main.c:215
msgid "Show extra message window buttons"
msgstr "Mostrar botons de finestra de missatges addicionals"
-#: client/gui-gtk-2.0/gui_main.c:214
+#: client/gui-gtk-2.0/gui_main.c:216
msgid ""
"If this option is enabled, there will be two buttons displayed in the "
"message window for inspecting a city and going to a location. If this option "
@@ -11483,11 +11633,11 @@ msgstr ""
"respectivament). Aquesta opció només tindrà efecte un cop s'hagi tancat i "
"reobert la finestra de missatges."
-#: client/gui-gtk-2.0/gui_main.c:224
+#: client/gui-gtk-2.0/gui_main.c:226
msgid "Metaserver tab first in network page"
msgstr "Pestanya de metaservidor primera a la pà gina de xarxa"
-#: client/gui-gtk-2.0/gui_main.c:225
+#: client/gui-gtk-2.0/gui_main.c:227
msgid ""
"If this option is enabled, the metaserver tab will be the first notebook tab "
"in the network page. This option requires a restart in order to take effect."
@@ -11496,11 +11646,11 @@ msgstr ""
"pestanya de la llibreta a la pà gina de xarxa. Aquesta opció requereix un "
"rearranc per tenir efecte."
-#: client/gui-gtk-2.0/gui_main.c:230
+#: client/gui-gtk-2.0/gui_main.c:232
msgid "Plain chat messages are sent to allies only"
msgstr "Missatges de xat normals s'envien només als aliats"
-#: client/gui-gtk-2.0/gui_main.c:231
+#: client/gui-gtk-2.0/gui_main.c:233
msgid ""
"If this option is enabled, then plain messages typed into the chat entry "
"while the game is running will only be sent to your allies. Otherwise plain "
@@ -11516,7 +11666,25 @@ msgstr ""
"Aquesta opció també es pot activar amb un botó de commutació que hi ha al "
"costat de l'entrada de xat (només és visible en partides multijugador)."
-#: client/gui-gtk-2.0/gui_main.c:340 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:245
+msgid "Arrange widgets for small displays"
+msgstr "Adaptar icones per pantalles petites"
+
+#: client/gui-gtk-2.0/gui_main.c:246
+msgid ""
+"If this option is enabled, widgets in the main window will be arrange so "
+"that they take up the least amount of total screen space. Specifically, the "
+"left panel containing the overview, player status, and the unit information "
+"box will be extended over the entire left side of the window. This option "
+"requires a restart in order to take effect."
+msgstr ""
+"Amb aquesta opció, les icones de la finestra principal es col·locaran de "
+"manera que ocupin el mÃnim espai de pantalla possible. En concret, el panel "
+"de l'esquerra que conté el resum, l'estat del jugador i la caixa "
+"d'informació d'unitat s'estendrà per tota la part esquerra de la finestra. "
+"Aquesta opció requereix rearrencar perquè tingui efecte."
+
+#: client/gui-gtk-2.0/gui_main.c:352 client/gui-xaw/gui_main.c:245
msgid ""
"This client has no special command line options\n"
"\n"
@@ -11524,22 +11692,22 @@ msgstr ""
"Aquest client no té opcions de lÃnia de comandes especials\n"
"\n"
-#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
+#: client/gui-gtk-2.0/gui_main.c:847 client/gui-gtk-2.0/gui_main.c:1542
msgid "Freeciv"
msgstr "Freeciv"
-#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
+#: client/gui-gtk-2.0/gui_main.c:1251 client/gui-gtk-2.0/gui_main.c:1258
#: client/gui-sdl/mapctrl.c:1566 client/gui-win32/gui_main.c:482
#: data/Freeciv.in:2618
msgid "Turn Done"
msgstr "Acabar el torn"
-#: client/gui-gtk-2.0/gui_main.c:1232 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1258 client/gui-sdl/mapctrl.c:1566
#: client/gui-sdl/mapview.c:1082
msgid "Shift+Return"
msgstr "Maj.+Retorn"
-#: client/gui-gtk-2.0/gui_main.c:1266 client/gui-gtk-2.0/menu.c:797
+#: client/gui-gtk-2.0/gui_main.c:1299 client/gui-gtk-2.0/menu.c:797
#: client/gui-gtk-2.0/menu.c:799 client/gui-gtk-2.0/menu.c:801
#: client/gui-gtk-2.0/menu.c:803 client/gui-gtk-2.0/menu.c:805
#: client/gui-gtk-2.0/menu.c:807 client/gui-gtk-2.0/menu.c:809
@@ -11558,11 +11726,11 @@ msgstr "Maj.+Retorn"
msgid "View"
msgstr "Vista de mapa"
-#: client/gui-gtk-2.0/gui_main.c:1359
+#: client/gui-gtk-2.0/gui_main.c:1393
msgid "Chat"
msgstr "Xat"
-#: client/gui-gtk-2.0/gui_main.c:1377 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1411 client/gui-win32/gui_main.c:538
#: data/Freeciv.in:2809
msgid ""
"Freeciv is free software and you are welcome to distribute copies of it\n"
@@ -11573,77 +11741,77 @@ msgstr ""
"sota certes condicions; Consulta l'Ãtem \"Llicència\" en el menú d'ajuda.\n"
"Ara.. Desperta ferro!!!"
-#: client/gui-gtk-2.0/gui_main.c:1392
+#: client/gui-gtk-2.0/gui_main.c:1426
msgid "Allies Only"
msgstr "Només Aliats"
-#: client/gui-gtk-2.0/gui_main.c:1657
+#: client/gui-gtk-2.0/gui_main.c:1691
msgid "Not _ready"
msgstr "No _preparat"
-#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
+#: client/gui-gtk-2.0/gui_main.c:1702 client/gui-gtk-2.0/pages.c:1679
msgid "_Ready"
msgstr "_Totes Preparades"
-#: client/gui-gtk-2.0/gui_main.c:1672 client/gui-gtk-2.0/gui_main.c:1678
-#: client/gui-gtk-2.0/pages.c:2204
+#: client/gui-gtk-2.0/gui_main.c:1706 client/gui-gtk-2.0/gui_main.c:1712
+#: client/gui-gtk-2.0/pages.c:2206
msgid "_Start"
msgstr "_Iniciar"
-#: client/gui-gtk-2.0/gui_main.c:1686
+#: client/gui-gtk-2.0/gui_main.c:1720
msgid "_Take Player"
msgstr "_Agafar jugador"
-#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
+#: client/gui-gtk-2.0/gui_main.c:1723 client/gui-gtk-2.0/pages.c:1669
msgid "Pick _Nation"
msgstr "Tria _Nació"
-#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
+#: client/gui-gtk-2.0/gui_main.c:1730 client/gui-gtk-2.0/pages.c:1674
msgid "_Observe"
msgstr "_Observar"
-#: client/gui-gtk-2.0/gui_main.c:1698
+#: client/gui-gtk-2.0/gui_main.c:1732
msgid "Do not _observe"
msgstr "No O_bservar"
-#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1755 client/gui-xaw/pages.c:211
msgid "<AI>"
msgstr "<IA>"
-#: client/gui-gtk-2.0/gui_main.c:1723
+#: client/gui-gtk-2.0/gui_main.c:1758
msgid "<Novice AI>"
msgstr "<IA Principiant>"
-#: client/gui-gtk-2.0/gui_main.c:1726
+#: client/gui-gtk-2.0/gui_main.c:1761
msgid "<Easy AI>"
msgstr "<IA FÃ cil>"
-#: client/gui-gtk-2.0/gui_main.c:1729
+#: client/gui-gtk-2.0/gui_main.c:1764
msgid "<Normal AI>"
msgstr "<IA Normal>"
-#: client/gui-gtk-2.0/gui_main.c:1732
+#: client/gui-gtk-2.0/gui_main.c:1767
msgid "<Hard AI>"
msgstr "<IA DifÃcil>"
-#: client/gui-gtk-2.0/gui_main.c:1742 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1777 client/gui-win32/dialogs.c:594
#: client/gui-xaw/pages.c:217
msgid "Random"
msgstr "Aleatori"
-#: client/gui-gtk-2.0/gui_main.c:1808
+#: client/gui-gtk-2.0/gui_main.c:1844 client/gui-gtk-2.0/gui_main.c:1858
msgid "Observer"
msgstr "Observador"
-#: client/gui-gtk-2.0/gui_main.c:1808
+#: client/gui-gtk-2.0/gui_main.c:1858
msgid "Detached"
msgstr "Deslligat"
-#: client/gui-gtk-2.0/gui_main.c:2073
+#: client/gui-gtk-2.0/gui_main.c:2117
msgid "Are you sure you want to quit?"
msgstr "Segur que vols sortir?"
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
#, c-format
msgid ""
"Close Tab:\n"
@@ -11652,7 +11820,7 @@ msgstr ""
"Tancar pestanya:\n"
"%s"
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
msgid "Ctrl+W"
msgstr "Ctrl+W"
@@ -11757,8 +11925,8 @@ msgid "Trans. Rslt/Time:"
msgstr "Trans. Rstl/temps:"
#: 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
-#: client/gui-win32/helpdlg.c:709 client/gui-win32/helpdlg.c:733
+#: client/gui-win32/helpdlg.c:502 client/gui-win32/helpdlg.c:550
+#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:739
#: client/gui-xaw/helpdlg.c:759 client/gui-xaw/helpdlg.c:808
#: client/gui-xaw/helpdlg.c:816 client/gui-xaw/helpdlg.c:853
#: client/gui-xaw/helpdlg.c:878
@@ -11805,34 +11973,34 @@ msgstr "amb"
msgid "?techhelp:"
msgstr "?techhelp:"
-#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:591
+#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:597
#: client/gui-xaw/helpdlg.c:996
#, c-format
msgid "+%d Trade / %d"
msgstr "+%d comerç / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:595
+#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:601
#: client/gui-xaw/helpdlg.c:1000
#, c-format
msgid "no extra / %d"
msgstr "no extra / %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
-#: client/gui-win32/helpdlg.c:602 client/gui-win32/helpdlg.c:616
-#: client/gui-win32/helpdlg.c:635 client/gui-xaw/helpdlg.c:1002
+#: client/gui-gtk-2.0/helpdlg.c:1085 client/gui-win32/helpdlg.c:604
+#: client/gui-win32/helpdlg.c:608 client/gui-win32/helpdlg.c:622
+#: client/gui-win32/helpdlg.c:641 client/gui-xaw/helpdlg.c:1002
#: client/gui-xaw/helpdlg.c:1006 client/gui-xaw/helpdlg.c:1020
#: client/gui-xaw/helpdlg.c:1039
msgid "n/a"
msgstr "n/d"
-#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:605
+#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:611
#: client/gui-xaw/helpdlg.c:1009
#, c-format
msgid "+%d Food / %d"
msgstr "+%d Menjar / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:619
+#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:625
#: client/gui-xaw/helpdlg.c:1023
#, c-format
msgid "+%d Res. / %d"
@@ -12139,7 +12307,7 @@ msgstr "Const_ruir un camÃ"
#: client/gui-gtk-2.0/menu.c:864 client/gui-gtk-2.0/menu.c:1405
#: client/gui-win32/menu.c:361
msgid "Build _Irrigation"
-msgstr "_Irrigar"
+msgstr "Fer Regad_iu"
#: client/gui-gtk-2.0/menu.c:866 client/gui-gtk-2.0/menu.c:1406
#: client/gui-win32/menu.c:362
@@ -12375,7 +12543,7 @@ msgstr "Ajuda"
#: client/gui-gtk-2.0/menu.c:983 client/gui-win32/menu.c:416
msgid "Language_s"
-msgstr "_Idiomes"
+msgstr "Llengüe_s"
#: client/gui-gtk-2.0/menu.c:985 client/gui-win32/menu.c:417
msgid "Co_nnecting"
@@ -12592,41 +12760,41 @@ 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:624 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:302
#: 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:779 client/gui-gtk-2.0/pages.c:820
-#: client/gui-win32/connectdlg.c:916
+#: client/gui-win32/connectdlg.c:918
msgid "Server Name"
msgstr "Nom del servidor"
#: client/gui-gtk-2.0/pages.c:780 client/gui-gtk-2.0/pages.c:821
-#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:916
+#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:918
#: data/Freeciv.in:96
msgid "Port"
msgstr "Port"
#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Version"
msgstr "Versió"
#: client/gui-gtk-2.0/pages.c:782 client/gui-gtk-2.0/pages.c:823
-#: client/gui-gtk-2.0/pages.c:2161 client/gui-win32/connectdlg.c:917
-#: client/gui-win32/connectdlg.c:995
+#: client/gui-gtk-2.0/pages.c:2163 client/gui-win32/connectdlg.c:919
+#: client/gui-win32/connectdlg.c:997
msgid "Status"
msgstr "Estat"
#: client/gui-gtk-2.0/pages.c:783 client/gui-gtk-2.0/pages.c:824
#: client/gui-sdl/connectdlg.c:318 client/gui-sdl/plrdlg.c:330
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Players"
msgstr "Jugadors"
#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
-#: client/gui-win32/connectdlg.c:918
+#: client/gui-win32/connectdlg.c:920
msgid "Comment"
msgstr "Comentari"
@@ -12658,9 +12826,9 @@ msgstr "Contra_senya:"
msgid "Conf_irm Password:"
msgstr "Conf_irmar la Contrasenya:"
-#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2165
#: 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:1000
+#: client/gui-win32/citydlg.c:1083 client/gui-win32/connectdlg.c:1002
#: client/gui-win32/wldlg.c:800 client/gui-win32/wldlg.c:806
msgid "Type"
msgstr "Tipus"
@@ -12752,7 +12920,7 @@ msgstr "Nivell de _Dificultat dels IA:"
msgid "Ruleset _Version:"
msgstr "_Versió de Joc de Regles:"
-#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2195
msgid "_More Game Options..."
msgstr "Més _Opcions de Joc..."
@@ -12768,48 +12936,48 @@ msgstr "Valoració"
msgid "Ready"
msgstr "Preparat"
-#: client/gui-gtk-2.0/pages.c:1601
+#: client/gui-gtk-2.0/pages.c:1600
msgid "?player:Leader"
msgstr "LÃder"
-#: client/gui-gtk-2.0/pages.c:1732 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1734 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:1824
+#: client/gui-gtk-2.0/pages.c:1826
msgid "Choose Saved Game to _Load:"
msgstr "Tria Partida Desada per _Carregar:"
-#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
-#: client/gui-gtk-2.0/pages.c:2451
+#: client/gui-gtk-2.0/pages.c:1846 client/gui-gtk-2.0/pages.c:2039
+#: client/gui-gtk-2.0/pages.c:2455
msgid "_Browse..."
msgstr "_Fullejar..."
-#: client/gui-gtk-2.0/pages.c:1911
+#: client/gui-gtk-2.0/pages.c:1913
msgid "Choose a Scenario"
msgstr "Tria un Escenari"
-#: client/gui-gtk-2.0/pages.c:1998
+#: client/gui-gtk-2.0/pages.c:2000
msgid "Choose a _Scenario:"
msgstr "Tria un _Escenari:"
-#: client/gui-gtk-2.0/pages.c:2173
+#: client/gui-gtk-2.0/pages.c:2175
msgid "Choose a _nation to play:"
msgstr "Tria una _nació per jugar:"
-#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2367 client/gui-win32/menu.c:581
msgid "Select Location to Save"
msgstr "Tria el Lloc on Desar"
-#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2452 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "Desar la Partida"
-#: client/gui-gtk-2.0/pages.c:2489
+#: client/gui-gtk-2.0/pages.c:2493
msgid "Saved _Games:"
msgstr "Partides _Desades:"
-#: client/gui-gtk-2.0/pages.c:2516
+#: client/gui-gtk-2.0/pages.c:2520
msgid "Save _Filename:"
msgstr "Nom de _Fitxer a Desar:"
@@ -13161,7 +13329,7 @@ msgstr "Tancar Dià leg (Esc)"
msgid "Total users logged in : %d"
msgstr "Total d'usuaris connectats: %d"
-#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1098
msgid "Back"
msgstr "Enrere"
@@ -13170,7 +13338,7 @@ msgid "Start"
msgstr "Iniciar"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:777
+#: client/gui-win32/connectdlg.c:779
msgid "Load Game"
msgstr "Carregar una partida"
@@ -13210,9 +13378,9 @@ msgstr "Establir com nova llar"
#: client/gui-sdl/connectdlg.c:308 client/gui-sdl/connectdlg.c:617
#: client/gui-sdl/connectdlg.c:803 client/gui-sdl/connectdlg.c:985
#: client/gui-sdl/dialogs.c:452 client/gui-sdl/dialogs.c:2095
-#: client/gui-sdl/dialogs.c:2893 client/gui-sdl/diplomat_dialog.c:731
+#: client/gui-sdl/dialogs.c:2902 client/gui-sdl/diplomat_dialog.c:731
#: client/gui-sdl/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1043
#: client/gui-win32/dialogs.c:1772 client/gui-win32/finddlg.c:127
#: client/gui-win32/gotodlg.c:171 client/gui-win32/inputdlg.c:146
#: client/gui-win32/messagedlg.c:216 client/gui-win32/ratesdlg.c:328
@@ -13256,7 +13424,7 @@ msgid "Buy it?"
msgstr "Comprar?"
#: 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
+#: client/gui-sdl/diplodlg.c:1336 client/gui-sdl/diplomat_dialog.c:1211
#: client/gui-sdl/diplomat_dialog.c:1417 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:221 client/gui-sdl/repodlgs.c:1559
#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
@@ -13272,7 +13440,7 @@ msgid "No"
msgstr "No"
#: client/gui-sdl/citydlg.c:1215 client/gui-sdl/cma_fe.c:318
-#: client/gui-sdl/diplodlg.c:1345 client/gui-sdl/diplomat_dialog.c:1200
+#: client/gui-sdl/diplodlg.c:1346 client/gui-sdl/diplomat_dialog.c:1200
#: client/gui-sdl/diplomat_dialog.c:1407 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:232 client/gui-win32/repodlgs.c:578
#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
@@ -13576,7 +13744,7 @@ msgstr "Servidor de Freeciv:"
msgid "Port :"
msgstr "Port:"
-#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1100
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr "Connectar"
@@ -13683,23 +13851,23 @@ msgstr "Escull el teu nou govern"
msgid "REVOLUTION!"
msgstr "REVOLUCIÓ!"
-#: client/gui-sdl/dialogs.c:2232 client/gui-sdl/dialogs.c:2620
+#: client/gui-sdl/dialogs.c:2237 client/gui-sdl/dialogs.c:2625
#: client/gui-win32/dialogs.c:567 data/Freeciv.in:3159
msgid "Female"
msgstr "Dona"
-#: client/gui-sdl/dialogs.c:2234 client/gui-sdl/dialogs.c:2618
-#: client/gui-sdl/dialogs.c:2830 client/gui-win32/dialogs.c:565
+#: client/gui-sdl/dialogs.c:2239 client/gui-sdl/dialogs.c:2623
+#: client/gui-sdl/dialogs.c:2839 client/gui-win32/dialogs.c:565
msgid "Male"
msgstr "Home"
-#: client/gui-sdl/dialogs.c:2478 client/gui-sdl/dialogs.c:2902
+#: client/gui-sdl/dialogs.c:2483 client/gui-sdl/dialogs.c:2911
#: 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 "Bé"
-#: client/gui-sdl/dialogs.c:2685 client/gui-win32/dialogs.c:505
+#: client/gui-sdl/dialogs.c:2694 client/gui-win32/dialogs.c:505
msgid "What nation will you be?"
msgstr "Quina nació serà s?"
@@ -13726,53 +13894,53 @@ msgstr "Mapa mundial"
msgid "Sea map"
msgstr "Mapa marÃtim"
-#: client/gui-sdl/diplodlg.c:563
+#: client/gui-sdl/diplodlg.c:564
msgid "Give embassy"
msgstr "Donar ambaixada"
-#: client/gui-sdl/diplodlg.c:579 client/gui-win32/diplodlg.c:614
+#: client/gui-sdl/diplodlg.c:580 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 "Or (mà xim %d)"
-#: client/gui-sdl/diplodlg.c:613 client/gui-sdl/helpdlg.c:1956
+#: client/gui-sdl/diplodlg.c:614 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 "Avenços"
-#: client/gui-sdl/diplodlg.c:831 client/gui-win32/diplodlg.c:598
+#: client/gui-sdl/diplodlg.c:832 client/gui-win32/diplodlg.c:598
#: data/Freeciv.in:269
msgid "Diplomacy meeting"
msgstr "Cimera diplomà tica"
-#: client/gui-sdl/diplodlg.c:883 client/gui-win32/diplodlg.c:680
+#: client/gui-sdl/diplodlg.c:884 client/gui-win32/diplodlg.c:680
#: data/Freeciv.in:510
msgid "Cancel meeting"
msgstr "Cancel·lar cimera"
-#: client/gui-sdl/diplodlg.c:895 client/gui-win32/diplodlg.c:679
+#: client/gui-sdl/diplodlg.c:896 client/gui-win32/diplodlg.c:679
#: data/Freeciv.in:501
msgid "Accept treaty"
msgstr "Acceptar tractat"
#. TRANS: "Polish incident !" FIXME!!!
-#: client/gui-sdl/diplodlg.c:1304
+#: client/gui-sdl/diplodlg.c:1305
#, c-format
msgid "%s incident !"
msgstr "Incident %s !"
-#: client/gui-sdl/diplodlg.c:1322
+#: client/gui-sdl/diplodlg.c:1323
msgid "Shall we declare WAR on them?"
msgstr "Els declarem la GUERRA?"
-#: client/gui-sdl/diplodlg.c:1433
+#: client/gui-sdl/diplodlg.c:1434
msgid "Foreign Minister"
msgstr "Ministre d'Exteriors"
-#: client/gui-sdl/diplodlg.c:1449
+#: client/gui-sdl/diplodlg.c:1450
#, c-format
msgid ""
"Sir!, the %s ambassador has arrived\n"
@@ -13781,24 +13949,24 @@ msgstr ""
"Senyor, l'ambaixador %s ha arribat\n"
"Què desitja fer?"
-#: client/gui-sdl/diplodlg.c:1465
+#: client/gui-sdl/diplodlg.c:1466
msgid "Declare WAR"
msgstr "Declarar GUERRA"
-#: client/gui-sdl/diplodlg.c:1467 client/gui-win32/plrdlg.c:357
+#: client/gui-sdl/diplodlg.c:1468 client/gui-win32/plrdlg.c:357
msgid "Cancel Treaty"
msgstr "Cancel·lar el tractat"
-#: client/gui-sdl/diplodlg.c:1490 client/gui-win32/plrdlg.c:358
+#: client/gui-sdl/diplodlg.c:1491 client/gui-win32/plrdlg.c:358
#: data/Freeciv.in:3254
msgid "Withdraw vision"
msgstr "Retirar la visió"
-#: client/gui-sdl/diplodlg.c:1507
+#: client/gui-sdl/diplodlg.c:1508
msgid "Call Diplomatic Meeting"
msgstr "Convocar Cimera diplomà tica"
-#: client/gui-sdl/diplodlg.c:1521
+#: client/gui-sdl/diplodlg.c:1522
msgid "Send him back"
msgstr "Que torni a casa"
@@ -14084,11 +14252,11 @@ msgstr "Escalar Minimapa"
#: client/gui-sdl/mapctrl.c:684
msgid "Single Tile Width"
-msgstr "Amplada casella individual"
+msgstr "Amplada Casella Individual"
#: client/gui-sdl/mapctrl.c:688
msgid "Single Tile Height"
-msgstr "Alçada casella individual"
+msgstr "Alçada Casella Individual"
#: client/gui-sdl/mapctrl.c:733 client/gui-sdl/mapctrl.c:1077
msgid "Exit"
@@ -14378,7 +14546,7 @@ msgstr "Construir Mina"
#: 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 "Construir Irrigació"
+msgstr "Construir Regadiu"
#: client/gui-sdl/menu.c:786
msgid "Form Traderoute"
@@ -14544,12 +14712,12 @@ msgid "Leave Game"
msgstr "Deixar la Partida"
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1100 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1102 client/gui-xaw/menu.c:121
#: data/Freeciv.in:115 data/Freeciv.in:3180
msgid "Quit"
msgstr "Sortir"
-#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:967
msgid "Start New Game"
msgstr "Començar una partida nova"
@@ -14666,8 +14834,8 @@ msgstr "Ingressos nets: "
msgid "%s max rate : %d%%"
msgstr "Taxa mà xima en %s : %d%%"
-#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
-#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1085
+#: client/gui-win32/connectdlg.c:1093 data/Freeciv.in:155
msgid "Update"
msgstr "Actualitzar"
@@ -15162,67 +15330,67 @@ msgstr "Nova"
msgid "Delete"
msgstr "Esborrar"
-#: client/gui-win32/connectdlg.c:147
+#: client/gui-win32/connectdlg.c:149
msgid "Password:"
msgstr "Contrasenya:"
-#: client/gui-win32/connectdlg.c:169
+#: client/gui-win32/connectdlg.c:171
msgid "Couldn't load the savegame"
msgstr "No s'ha pogut carregar el fitxer desat"
-#: client/gui-win32/connectdlg.c:284 client/gui-xaw/connectdlg.c:311
+#: client/gui-win32/connectdlg.c:286 client/gui-xaw/connectdlg.c:311
msgid "Verify Password"
msgstr "Verificar contrasenya"
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:916 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr "Selecció del servidor de Freeciv"
-#: client/gui-win32/connectdlg.c:915
+#: client/gui-win32/connectdlg.c:917
msgid "Local Area Network"
msgstr "Xarxa d'Àrea Local"
-#: client/gui-win32/connectdlg.c:949
+#: client/gui-win32/connectdlg.c:951
msgid "Welcome to Freeciv"
msgstr "Benvingut a Freeciv"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Load Saved Game"
msgstr "Carregar Partida Desada"
-#: client/gui-win32/connectdlg.c:969
+#: client/gui-win32/connectdlg.c:971
msgid "Connect To Network Game"
msgstr "Connectar a Partida de Xarxa"
-#: client/gui-win32/connectdlg.c:979
+#: client/gui-win32/connectdlg.c:981
msgid "Choose a nation to play"
msgstr "Tria una nació per jugar "
-#: client/gui-win32/connectdlg.c:1014
+#: client/gui-win32/connectdlg.c:1016
msgid "Number of players (Including AI):"
msgstr "Nombre de jugadors (Inclosos IA):"
-#: client/gui-win32/connectdlg.c:1022
+#: client/gui-win32/connectdlg.c:1024
msgid "AI skill level:"
msgstr "nivell de l'IA:"
-#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1038 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr "Opcions de Partida"
-#: client/gui-win32/connectdlg.c:1040
+#: client/gui-win32/connectdlg.c:1042
msgid "Start Game"
msgstr "Iniciar la partida"
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Login:"
msgstr "Login:"
-#: client/gui-win32/connectdlg.c:1061
+#: client/gui-win32/connectdlg.c:1063
msgid "Host:"
msgstr "Host:"
-#: client/gui-win32/connectdlg.c:1062
+#: client/gui-win32/connectdlg.c:1064
msgid "Port:"
msgstr "Port:"
@@ -15303,21 +15471,21 @@ msgstr ""
"comptes d'un \"dither\" ordenat. Si el teu maquinari no suporta \"alpha "
"blending\", això és molt més lent."
-#: client/gui-win32/helpdlg.c:769 client/gui-win32/helpdlg.c:792
-#: client/gui-win32/helpdlg.c:803 client/gui-win32/helpdlg.c:809
-#: client/gui-win32/helpdlg.c:822
+#: client/gui-win32/helpdlg.c:775 client/gui-win32/helpdlg.c:798
+#: client/gui-win32/helpdlg.c:809 client/gui-win32/helpdlg.c:815
+#: client/gui-win32/helpdlg.c:828
msgid "Allows "
msgstr "Permet"
-#: client/gui-win32/helpdlg.c:780
+#: client/gui-win32/helpdlg.c:786
msgid "Obsoletes "
msgstr "Fa obsolet"
-#: client/gui-win32/helpdlg.c:812 client/gui-win32/helpdlg.c:825
+#: client/gui-win32/helpdlg.c:818 client/gui-win32/helpdlg.c:831
msgid " (with "
msgstr " (amb "
-#: client/gui-win32/helpdlg.c:815 client/gui-win32/helpdlg.c:828
+#: client/gui-win32/helpdlg.c:821 client/gui-win32/helpdlg.c:834
msgid "?techhelp:)."
msgstr "?techhelp:)."
@@ -16439,12 +16607,12 @@ 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/"
+" https://gna.org/projects/freeciv/"
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:\n"
"\n"
-" http://bugs.freeciv.org/"
+" https://gna.org/projects/freeciv/"
#: data/helpdata.txt:60
msgid ""
@@ -17039,7 +17207,7 @@ msgstr ""
" Cada ciutat té una à rea de terra conreable al voltant que s'utilitza per a "
"produir menjar, béns i per generar comerç. Aquesta producció pot augmentar-"
"se utilitzant Colons per millorar les terres de conreu. La terra es pot "
-"millorar amb camins, irrigació, mines i d'altres."
+"millorar amb camins, regadius, mines i d'altres."
#: data/helpdata.txt:666
msgid ""
@@ -17280,8 +17448,8 @@ msgid ""
"others can be achieved by signing diplomatic treaties."
msgstr ""
" Hi ha cinc estats diplomà tics entre jugadors: Guerra, Alto el Foc, "
-"Armistici, Pau, i Aliança. El primer és l'estat per defecte, mentre que als "
-"altres s'hi pot arribar mitjançant tractats diplomà tics."
+"Armistici, Pau, i Aliança. El primer és l'estat predeterminat, mentre que "
+"als altres s'hi pot arribar mitjançant tractats diplomà tics."
#: data/helpdata.txt:781
msgid ""
@@ -17649,7 +17817,7 @@ msgid ""
"Default Combat Rules\n"
"---------------------"
msgstr ""
-"Regles de Combat per Defecte\n"
+"Regles de Combat Predeterminades\n"
"------------------------------"
#: data/helpdata.txt:988
@@ -17864,8 +18032,8 @@ msgid ""
" - killstack. (default: 1) If set to 0, units in the same tile of a lost "
"defender are not destroyed. "
msgstr ""
-" - killstack. (defecte: 1) Si es posa a 0, les unitats de la mateixa casella "
-"d'un defensor que perdi no queden destruïdes."
+" - killstack. (predeterminat: 1) Si es posa a 0, les unitats de la mateixa "
+"casella d'un defensor que perdi no queden destruïdes."
#: data/helpdata.txt:1089
msgid " Combat example 1"
@@ -18261,10 +18429,10 @@ msgstr ""
"centre d'una ciutat es treballa de forma gratuïta a les regles per defecte. "
"Quan es construeix una ciutat, s'hi posa automà ticament un camÃ, i també "
"s'hi posarà un ferrocarril de seguida que sigui possible. Els centres de la "
-"ciutat s'irriguen automà ticament: obtenen els beneficis de la irrigació, "
-"encara que de fet no ho estiguin. Finalment, el centre de la ciutat, "
-"depenent del joc de regles, pot ser que tingui alguna producció mÃnima de "
-"menjar, escuts i comerç."
+"ciutat s'irriguen automà ticament: obtenen els beneficis del regadiu, encara "
+"que de fet no ho estiguin. Finalment, el centre de la ciutat, depenent del "
+"joc de regles, pot ser que tingui alguna producció mÃnima de menjar, escuts "
+"i comerç."
#: data/helpdata.txt:1294
msgid " Pillaging"
@@ -18293,7 +18461,7 @@ msgid ""
" - a road"
msgstr ""
" - horta\n"
-" - irrigació\n"
+" - regadiu\n"
" - mina\n"
" - una fortificació\n"
" - una base aèria\n"
@@ -18309,7 +18477,7 @@ msgid ""
"pillaging will not convert it back into a Forest -- to do so, you would have "
"to convert the tile again with a Settler or Engineer."
msgstr ""
-"Les caselles que no tenen alteracions de terreny (horta, irrigació, mina, "
+"Les caselles que no tenen alteracions de terreny (horta, regadiu, mina, "
"fortificació, base aèria, ferrocarril o camÃ) no es poden saquejar. A més, "
"les conversions i transformacions de terreny no es poden desfer saquejant. "
"Per exemple, si has irrigat una casella de Bosc per convertir-la en Planes, "
@@ -18853,48 +19021,43 @@ msgid ""
"a Factory, Mfg. Plant and Hydro Plant together give a 150% production "
"bonus.\n"
"\n"
-"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant. A city "
-"can only build a Hydro Plant if it is next to (or on) a Mountain or River "
-"tile."
+"A city can only have one Hydro Plant, Power Plant, or Nuclear 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ó que hi hagi a la ciutat: una Fà brica i una Central Hidrà ulica "
-"juntes donen un bonus de producció del 75%, i una Fà brica, Planta de "
-"Fabricació i Central Hidrà ulica juntes donen un bonus de producció del "
-"150%.\n"
+"Fabricació de la ciutat: una Fà brica i una Central Hidroelèctrica juntes "
+"donen un bonus de producció del 75%, i una Fà brica, una Planta de Fabricació "
+"i una Central Hidroelèctrica juntes donen un bonus de producció del 150%.\n"
"\n"
-"Una ciutat només pot tenir una Central: Hidrà ulica, Tèrmica o Nuclear. Una "
-"ciutat només pot construir una Central Hidrà ulica si està al costat de (o a "
-"sobre) d'una casella de Muntanya o Riu."
+"Una ciutat només pot tenir una Central: Hidrà ulica, Tèrmica o Nuclear."
-#: data/default/buildings.ruleset:397 data/civ2/buildings.ruleset:373
+#: data/default/buildings.ruleset:396 data/civ2/buildings.ruleset:373
#: data/civ1/buildings.ruleset:297
msgid "Library"
msgstr "Biblioteca"
-#: data/default/buildings.ruleset:412
+#: data/default/buildings.ruleset:411
#, no-c-format
msgid "Increases the science output in a city by 100%."
msgstr "Augmenta en un 100% l'aportació a ciència de la ciutat."
-#: data/default/buildings.ruleset:417 data/civ2/buildings.ruleset:393
+#: data/default/buildings.ruleset:416 data/civ2/buildings.ruleset:393
#: data/civ1/buildings.ruleset:317
msgid "Marketplace"
msgstr "Mercat"
-#: data/default/buildings.ruleset:432 data/civ2/buildings.ruleset:408
+#: data/default/buildings.ruleset:431 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 "Augmenta en un 50% la producció de luxes i impostos de la ciutat."
-#: data/default/buildings.ruleset:437 data/civ2/buildings.ruleset:413
+#: data/default/buildings.ruleset:436 data/civ2/buildings.ruleset:413
#: data/civ1/buildings.ruleset:337
msgid "Mass Transit"
msgstr "Transport Públic"
-#: data/default/buildings.ruleset:451 data/civ2/buildings.ruleset:427
+#: data/default/buildings.ruleset:450 data/civ2/buildings.ruleset:427
#: data/civ1/buildings.ruleset:351
msgid ""
"Neutralizes the pollution generated by the population. The population "
@@ -18903,12 +19066,12 @@ msgstr ""
"Neutralitza la contaminació generada per la població. La població deixa de "
"tenir influència sobre la contaminació generada per la ciutat."
-#: data/default/buildings.ruleset:458 data/civ2/buildings.ruleset:434
+#: data/default/buildings.ruleset:457 data/civ2/buildings.ruleset:434
#: data/civ1/buildings.ruleset:358
msgid "Mfg. Plant"
msgstr "Planta de Fab."
-#: data/default/buildings.ruleset:474 data/civ2/buildings.ruleset:450
+#: data/default/buildings.ruleset:473 data/civ2/buildings.ruleset:450
#: data/civ1/buildings.ruleset:374
#, no-c-format
msgid ""
@@ -18918,12 +19081,12 @@ msgstr ""
"Juntament amb una Fà brica, una Planta de Fabricació augmenta la producció "
"d'escuts d'una ciutat en un 100%."
-#: data/default/buildings.ruleset:480 data/civ2/buildings.ruleset:456
+#: data/default/buildings.ruleset:479 data/civ2/buildings.ruleset:456
#: data/civ1/buildings.ruleset:380
msgid "Nuclear Plant"
msgstr "Central Nuclear"
-#: data/default/buildings.ruleset:495
+#: data/default/buildings.ruleset:494
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 "
@@ -18941,11 +19104,11 @@ msgstr ""
"\n"
"Una ciutat només pot tenir una Central: Hidrà ulica, Tèrmica o Nuclear."
-#: data/default/buildings.ruleset:515 data/civ2/buildings.ruleset:489
+#: data/default/buildings.ruleset:514 data/civ2/buildings.ruleset:489
msgid "Offshore Platform"
msgstr "Plataforma PetrolÃfera"
-#: data/default/buildings.ruleset:530 data/civ2/buildings.ruleset:504
+#: data/default/buildings.ruleset:529 data/civ2/buildings.ruleset:504
msgid ""
"Adds 1 extra shield resource on all Ocean squares in a city. The city needs "
"to be coastal to build this improvement."
@@ -18953,12 +19116,12 @@ msgstr ""
"Afegeix un escut extra a totes les caselles d'oceà de la ciutat. La ciutat "
"ha d'estar a la costa per poder construir aquesta millora."
-#: data/default/buildings.ruleset:536 data/civ2/buildings.ruleset:510
+#: data/default/buildings.ruleset:535 data/civ2/buildings.ruleset:510
#: data/civ1/buildings.ruleset:411
msgid "Palace"
msgstr "Palau"
-#: data/default/buildings.ruleset:552
+#: data/default/buildings.ruleset:551
#, no-c-format
msgid ""
"Makes a city the capital and the center of your government. Corruption in "
@@ -18987,11 +19150,11 @@ msgstr ""
"Sota el Despotisme, el palau et dóna una bonificació de producció del +75%, "
"i sota la Monarquia, una bonificació del +50%"
-#: data/default/buildings.ruleset:569 data/civ2/buildings.ruleset:539
+#: data/default/buildings.ruleset:568 data/civ2/buildings.ruleset:539
msgid "Police Station"
msgstr "Comissaria"
-#: data/default/buildings.ruleset:583 data/civ2/buildings.ruleset:553
+#: data/default/buildings.ruleset:582 data/civ2/buildings.ruleset:553
msgid ""
"Reduces the unhappiness caused by military units outside the city by 2 under "
"Democracy and 1 under Republic. This improvement has no effect under other "
@@ -19001,11 +19164,11 @@ msgstr ""
"sota Democrà cia i en 1 sota República. Aquesta millora no té cap efecte sota "
"altres tipus de govern."
-#: data/default/buildings.ruleset:593 data/civ2/buildings.ruleset:560
+#: data/default/buildings.ruleset:592 data/civ2/buildings.ruleset:560
msgid "Port Facility"
msgstr "Instal·lació de Port"
-#: data/default/buildings.ruleset:608 data/civ2/buildings.ruleset:575
+#: data/default/buildings.ruleset:607 data/civ2/buildings.ruleset:575
msgid ""
"Allows a city to build veteran sea units. Also, damaged sea units which "
"stay in town for one full turn without moving are completely restored."
@@ -19014,12 +19177,12 @@ msgstr ""
"unitats marÃtimes malmeses que es quedin dins de la ciutat durant un torn "
"sencer sense moure's queden recuperades completament."
-#: data/default/buildings.ruleset:615 data/civ2/buildings.ruleset:582
+#: data/default/buildings.ruleset:614 data/civ2/buildings.ruleset:582
#: data/civ1/buildings.ruleset:440
msgid "Power Plant"
msgstr "Central Tèrmica"
-#: data/default/buildings.ruleset:631
+#: data/default/buildings.ruleset:630
#, no-c-format
msgid ""
"Increases the shield production of a Factory or Mfg. Plant in a city: a "
@@ -19037,12 +19200,12 @@ msgstr ""
"\n"
"Una ciutat només pot tenir una Central: Hidrà ulica, Tèrmica o Nuclear."
-#: data/default/buildings.ruleset:646 data/civ2/buildings.ruleset:610
+#: data/default/buildings.ruleset:645 data/civ2/buildings.ruleset:610
#: data/civ1/buildings.ruleset:468
msgid "Recycling Center"
msgstr "Centre de Reciclat"
-#: data/default/buildings.ruleset:661 data/civ2/buildings.ruleset:625
+#: data/default/buildings.ruleset:660 data/civ2/buildings.ruleset:625
#: data/civ1/buildings.ruleset:483
#, no-c-format
msgid ""
@@ -19052,11 +19215,11 @@ msgstr ""
"Construir un Centre de Reciclat redueix la quantitat de contaminació deguda "
"a la producció d'una ciutat en un 66%."
-#: data/default/buildings.ruleset:667 data/civ2/buildings.ruleset:631
+#: data/default/buildings.ruleset:666 data/civ2/buildings.ruleset:631
msgid "Research Lab"
msgstr "Laboratori de recerca"
-#: data/default/buildings.ruleset:682
+#: data/default/buildings.ruleset:681
msgid ""
"Together with a Library, a Research Lab increases the science production of "
"a city by 200%. Together with a Library and a University, a Research Lab "
@@ -19067,11 +19230,11 @@ msgstr ""
"Universitat, un Laboratori de Recerca augmenta la producció de ciència d'una "
"ciutat en un 450%."
-#: data/default/buildings.ruleset:690 data/civ2/buildings.ruleset:654
+#: data/default/buildings.ruleset:689 data/civ2/buildings.ruleset:654
msgid "SAM Battery"
msgstr "Bateria SAM"
-#: data/default/buildings.ruleset:704 data/civ2/buildings.ruleset:668
+#: data/default/buildings.ruleset:703 data/civ2/buildings.ruleset:668
msgid ""
"Doubles the defense of all units inside the city when attacked by non-"
"nuclear air units."
@@ -19079,12 +19242,12 @@ msgstr ""
"Duplica la defensa de totes les unitats de dins de la ciutat en ser atacades "
"per unitats aèries no nuclears."
-#: data/default/buildings.ruleset:710 data/civ2/buildings.ruleset:674
+#: data/default/buildings.ruleset:709 data/civ2/buildings.ruleset:674
#: data/civ1/buildings.ruleset:489
msgid "SDI Defense"
msgstr "Defensa SDI"
-#: data/default/buildings.ruleset:724 data/civ2/buildings.ruleset:688
+#: data/default/buildings.ruleset:723 data/civ2/buildings.ruleset:688
#: data/civ1/buildings.ruleset:503
msgid ""
"Protects a city from attacks from Nuclear units. Nuclear attacks simply "
@@ -19095,11 +19258,11 @@ msgstr ""
"cap efecte sobre la ciutat. També duplica la defensa contra mÃssils no "
"nuclears."
-#: data/default/buildings.ruleset:733 data/civ2/buildings.ruleset:697
+#: data/default/buildings.ruleset:732 data/civ2/buildings.ruleset:697
msgid "Sewer System"
msgstr "Clavegueram"
-#: data/default/buildings.ruleset:748 data/civ2/buildings.ruleset:712
+#: data/default/buildings.ruleset:747 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."
@@ -19107,12 +19270,12 @@ msgstr ""
"Permet que la ciutat creixi més enllà de 12. Un Aqüeducte és necessari abans "
"per poder passar de 8."
-#: data/default/buildings.ruleset:754 data/civ2/buildings.ruleset:749
+#: data/default/buildings.ruleset:753 data/civ2/buildings.ruleset:749
#: data/civ1/buildings.ruleset:512
msgid "Space Component"
msgstr "Component espacial"
-#: data/default/buildings.ruleset:769 data/civ2/buildings.ruleset:763
+#: data/default/buildings.ruleset:768 data/civ2/buildings.ruleset:763
#: data/civ1/buildings.ruleset:526
msgid ""
"Space Components can be differentiated into Propulsion and Fuel Components. "
@@ -19129,12 +19292,12 @@ msgstr ""
"Abans que puguis construir cap peça de nau espacial, s'ha d'haver construït "
"la meravella Programa Apollo per qualsevol jugador."
-#: data/default/buildings.ruleset:779 data/civ2/buildings.ruleset:773
+#: data/default/buildings.ruleset:778 data/civ2/buildings.ruleset:773
#: data/civ1/buildings.ruleset:536
msgid "Space Module"
msgstr "Mòdul espacial"
-#: data/default/buildings.ruleset:794 data/civ2/buildings.ruleset:787
+#: data/default/buildings.ruleset:793 data/civ2/buildings.ruleset:787
#: data/civ1/buildings.ruleset:550
msgid ""
"Space Modules are the most expensive parts of spaceships. There are three "
@@ -19169,12 +19332,12 @@ msgstr ""
"Abans que puguis construir cap peça de nau espacial, la meravella Programa "
"Apollo ha d'haver estat construïda per qualsevol jugador."
-#: data/default/buildings.ruleset:813 data/civ2/buildings.ruleset:806
+#: data/default/buildings.ruleset:812 data/civ2/buildings.ruleset:806
#: data/civ1/buildings.ruleset:569
msgid "Space Structural"
msgstr "Estructura espacial"
-#: data/default/buildings.ruleset:828 data/civ2/buildings.ruleset:820
+#: data/default/buildings.ruleset:827 data/civ2/buildings.ruleset:820
#: data/civ1/buildings.ruleset:583
msgid ""
"Space Structurals form the base of your spaceship. All other spaceship "
@@ -19191,11 +19354,11 @@ msgstr ""
"Abans que puguis construir cap peça de nau espacial, el Programa Apollo ha "
"d'haver estat construït per qualsevol jugador."
-#: data/default/buildings.ruleset:838 data/civ2/buildings.ruleset:830
+#: data/default/buildings.ruleset:837 data/civ2/buildings.ruleset:830
msgid "Stock Exchange"
msgstr "Borsa"
-#: data/default/buildings.ruleset:854 data/civ2/buildings.ruleset:846
+#: data/default/buildings.ruleset:853 data/civ2/buildings.ruleset:846
#, no-c-format
msgid ""
"Together with a Marketplace and a Bank, a Stock Exchange boosts tax and "
@@ -19204,11 +19367,11 @@ msgstr ""
"Juntament amb un Mercat i un Banc, la Borsa impulsa la producció d'impostos "
"i luxes de la ciutat en un 150%."
-#: data/default/buildings.ruleset:860 data/civ2/buildings.ruleset:852
+#: data/default/buildings.ruleset:859 data/civ2/buildings.ruleset:852
msgid "Super Highways"
msgstr "Autopistes"
-#: data/default/buildings.ruleset:875 data/civ2/buildings.ruleset:867
+#: data/default/buildings.ruleset:874 data/civ2/buildings.ruleset:867
#, no-c-format
msgid ""
"Increases trade resources by 50% on all squares with roads or railroads."
@@ -19216,11 +19379,11 @@ msgstr ""
"Incrementa el comerç en un 50% a totes les caselles que tinguin camins o "
"carreteres."
-#: data/default/buildings.ruleset:883 data/civ2/buildings.ruleset:873
+#: data/default/buildings.ruleset:882 data/civ2/buildings.ruleset:873
msgid "Supermarket"
msgstr "Supermercat"
-#: data/default/buildings.ruleset:898 data/civ2/buildings.ruleset:888
+#: data/default/buildings.ruleset:897 data/civ2/buildings.ruleset:888
#, no-c-format
msgid ""
"Increases the food resources by 50% on each farmland square which is being "
@@ -19231,12 +19394,12 @@ msgstr ""
"treballi per la ciutat. Les caselles d'Horta són les que s'han irrigat una "
"segona vegada."
-#: data/default/buildings.ruleset:905 data/civ2/buildings.ruleset:895
+#: data/default/buildings.ruleset:904 data/civ2/buildings.ruleset:895
#: data/civ1/buildings.ruleset:593
msgid "Temple"
msgstr "Temple"
-#: data/default/buildings.ruleset:919 data/civ2/buildings.ruleset:909
+#: data/default/buildings.ruleset:918 data/civ2/buildings.ruleset:909
#: data/civ1/buildings.ruleset:607
msgid ""
"Makes one unhappy citizen content. Both the Mysticism advance and the "
@@ -19247,13 +19410,13 @@ msgstr ""
"dupliquen aquest efecte. Tenint ambdues coses, es fan contents quatre "
"ciutadans."
-#: data/default/buildings.ruleset:926 data/civ2/buildings.ruleset:916
+#: data/default/buildings.ruleset:925 data/civ2/buildings.ruleset:916
#: data/civ1/buildings.ruleset:614 data/default/techs.ruleset:742
#: data/civ2/techs.ruleset:727 data/civ1/techs.ruleset:723
msgid "University"
msgstr "Universitat"
-#: data/default/buildings.ruleset:942
+#: data/default/buildings.ruleset:941
#, no-c-format
msgid ""
"Together with a Library, a University increases the science production of a "
@@ -19262,12 +19425,12 @@ msgstr ""
"Juntament amb una Biblioteca, una Universitat augmenta la producció "
"cientÃfica d'una ciutat en un 250%."
-#: data/default/buildings.ruleset:948 data/civ2/buildings.ruleset:938
+#: data/default/buildings.ruleset:947 data/civ2/buildings.ruleset:938
#: data/civ1/buildings.ruleset:636
msgid "Apollo Program"
msgstr "Programa Apollo"
-#: data/default/buildings.ruleset:962 data/civ2/buildings.ruleset:952
+#: data/default/buildings.ruleset:961 data/civ2/buildings.ruleset:952
msgid ""
"Entire map becomes visible for the player who owns it. It allows all "
"players to start building spaceship parts (assuming they have researched the "
@@ -19277,11 +19440,11 @@ msgstr ""
"jugadors començar a construir peces de la nau espacial (sempre que hagin "
"descobert les tecnologies necessà ries)."
-#: data/default/buildings.ruleset:969 data/civ2/buildings.ruleset:959
+#: data/default/buildings.ruleset:968 data/civ2/buildings.ruleset:959
msgid "A.Smith's Trading Co."
msgstr "Companyia Comercial A.Smith"
-#: data/default/buildings.ruleset:983
+#: data/default/buildings.ruleset:982
msgid ""
"City improvements which would normally have an upkeep of 1 are free of "
"upkeep, for all your cities."
@@ -19289,12 +19452,12 @@ msgstr ""
"Fa que les millores de les ciutats que normalment tenen un cost de "
"manteniment d'1 or, no requereixin cap manteniment, per a totes les ciutats."
-#: data/default/buildings.ruleset:989 data/civ2/buildings.ruleset:979
+#: data/default/buildings.ruleset:988 data/civ2/buildings.ruleset:979
#: data/civ1/buildings.ruleset:655
msgid "Colossus"
msgstr "Colós"
-#: data/default/buildings.ruleset:1003 data/civ2/buildings.ruleset:993
+#: data/default/buildings.ruleset:1002 data/civ2/buildings.ruleset:993
#: data/civ1/buildings.ruleset:669
msgid ""
"Each square around the city where this wonder is built that is already "
@@ -19303,24 +19466,24 @@ msgstr ""
"Cada casella al voltant de la ciutat on es construeix aquesta meravella que "
"estigui generant comerç, genera un punt de comerç addicional."
-#: data/default/buildings.ruleset:1009 data/civ2/buildings.ruleset:999
+#: data/default/buildings.ruleset:1008 data/civ2/buildings.ruleset:999
#: data/civ1/buildings.ruleset:675
msgid "Copernicus' Observatory"
msgstr "Observatori de Copèrnic"
-#: data/default/buildings.ruleset:1024 data/civ2/buildings.ruleset:1180
+#: data/default/buildings.ruleset:1023 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 ""
"Augmenta en un 100% la producció de ciència a la ciutat on es construeix."
-#: data/default/buildings.ruleset:1029 data/civ2/buildings.ruleset:1019
+#: data/default/buildings.ruleset:1028 data/civ2/buildings.ruleset:1019
#: data/civ1/buildings.ruleset:695
msgid "Cure For Cancer"
msgstr "Cura del cà ncer"
-#: data/default/buildings.ruleset:1043
+#: data/default/buildings.ruleset:1042
msgid ""
"This stunning technological achievement makes one unhappy citizen content in "
"all your cities."
@@ -19328,12 +19491,12 @@ msgstr ""
"Aquesta fantà stica fita tecnològica converteix un ciutadà descontent a "
"content en totes les teves ciutats."
-#: data/default/buildings.ruleset:1051 data/civ2/buildings.ruleset:1039
+#: data/default/buildings.ruleset:1050 data/civ2/buildings.ruleset:1039
#: data/civ1/buildings.ruleset:715
msgid "Darwin's Voyage"
msgstr "Viatge de Darwin"
-#: data/default/buildings.ruleset:1065 data/civ2/buildings.ruleset:1053
+#: data/default/buildings.ruleset:1064 data/civ2/buildings.ruleset:1053
#: data/civ1/buildings.ruleset:729
msgid ""
"Charles Darwin's voyage sparked the discovery of the evolution of the "
@@ -19344,11 +19507,11 @@ msgstr ""
"les espècies, cosa que va inspirar més confiança en la ciència. Dóna dos "
"avenços tecnològics immediats."
-#: data/default/buildings.ruleset:1072 data/civ2/buildings.ruleset:1060
+#: data/default/buildings.ruleset:1071 data/civ2/buildings.ruleset:1060
msgid "Eiffel Tower"
msgstr "Torre Eiffel"
-#: data/default/buildings.ruleset:1087
+#: data/default/buildings.ruleset:1086
#, no-c-format
msgid ""
"Your reputation and goodwill among other nations is recovered twice as fast."
@@ -19356,12 +19519,12 @@ msgstr ""
"La teva reputació i bona voluntat entre les altres nacions es recupera el "
"doble de rà pid que no ho faria normalment."
-#: data/default/buildings.ruleset:1093 data/civ2/buildings.ruleset:1081
+#: data/default/buildings.ruleset:1092 data/civ2/buildings.ruleset:1081
#: data/civ1/buildings.ruleset:736
msgid "Great Library"
msgstr "Gran Biblioteca"
-#: data/default/buildings.ruleset:1107 data/civ2/buildings.ruleset:1095
+#: data/default/buildings.ruleset:1106 data/civ2/buildings.ruleset:1095
#: data/civ1/buildings.ruleset:750
msgid ""
"The civilization which builds the Great Library gets every advance that at "
@@ -19370,21 +19533,21 @@ msgstr ""
"La civilització que construeix la Gran Biblioteca obté tots aquells avenços "
"que coneguin dues o més civilitzacions."
-#: data/default/buildings.ruleset:1113 data/civ2/buildings.ruleset:1101
+#: data/default/buildings.ruleset:1112 data/civ2/buildings.ruleset:1101
#: data/civ1/buildings.ruleset:756
msgid "Great Wall"
msgstr "Gran muralla"
-#: data/default/buildings.ruleset:1127
+#: data/default/buildings.ruleset:1126
msgid "Works as a City Wall in all your cities."
msgstr "Actua con a Muralla a totes les teves ciutats."
-#: data/default/buildings.ruleset:1135 data/civ2/buildings.ruleset:1122
+#: data/default/buildings.ruleset:1134 data/civ2/buildings.ruleset:1122
#: data/civ1/buildings.ruleset:777
msgid "Hanging Gardens"
msgstr "Jardins Penjants"
-#: data/default/buildings.ruleset:1149 data/civ2/buildings.ruleset:1136
+#: data/default/buildings.ruleset:1148 data/civ2/buildings.ruleset:1136
#: data/civ1/buildings.ruleset:791
msgid ""
"Makes one content citizen happy in every city. Makes two extra content "
@@ -19399,12 +19562,12 @@ msgstr ""
"rebin l'efecte dels Jardins Penjants, la meravella s'aplica als ciutadans "
"infeliços (fent-los contents, en aquest cas)."
-#: data/default/buildings.ruleset:1158 data/civ2/buildings.ruleset:1145
+#: data/default/buildings.ruleset:1157 data/civ2/buildings.ruleset:1145
#: data/civ1/buildings.ruleset:800
msgid "Hoover Dam"
msgstr "Presa de Hoover"
-#: data/default/buildings.ruleset:1173 data/civ2/buildings.ruleset:1159
+#: data/default/buildings.ruleset:1172 data/civ2/buildings.ruleset:1159
msgid ""
"Works as if you had a Hydro Plant in every city. (This reduces pollution "
"and increases the effects of Factories and Mfg. Plants.)"
@@ -19413,12 +19576,12 @@ msgstr ""
"fa reduir la contaminació i incrementa els efectes de Fà briques i Plantes de "
"Fabricació.)"
-#: data/default/buildings.ruleset:1179 data/civ2/buildings.ruleset:1165
+#: data/default/buildings.ruleset:1178 data/civ2/buildings.ruleset:1165
#: data/civ1/buildings.ruleset:822
msgid "Isaac Newton's College"
msgstr "Facultat d'Isaac Newton"
-#: data/default/buildings.ruleset:1194
+#: data/default/buildings.ruleset:1193
#, no-c-format
msgid ""
"Boosts science production by 100% in every city you control that has a "
@@ -19427,20 +19590,20 @@ msgstr ""
"Augmenta en un 100% la producció de ciència a cada ciutat que controles que "
"tingui una Universitat."
-#: data/default/buildings.ruleset:1200 data/civ2/buildings.ruleset:1185
+#: data/default/buildings.ruleset:1199 data/civ2/buildings.ruleset:1185
#: data/civ1/buildings.ruleset:842
msgid "J.S. Bach's Cathedral"
msgstr "Catedral de J.S. Bach"
-#: data/default/buildings.ruleset:1214 data/civ2/buildings.ruleset:1199
+#: data/default/buildings.ruleset:1213 data/civ2/buildings.ruleset:1199
msgid "Makes two unhappy citizens content in every city."
msgstr "Converteix dos ciutadans descontents a contents en cada ciutat."
-#: data/default/buildings.ruleset:1219 data/civ2/buildings.ruleset:1204
+#: data/default/buildings.ruleset:1218 data/civ2/buildings.ruleset:1204
msgid "King Richard's Crusade"
msgstr "Croada del Rei Ricard"
-#: data/default/buildings.ruleset:1233 data/civ2/buildings.ruleset:1218
+#: data/default/buildings.ruleset:1232 data/civ2/buildings.ruleset:1218
msgid ""
"Adds one extra shield resource on every square around the city where it is "
"built."
@@ -19448,20 +19611,20 @@ msgstr ""
"Afegeix un recurs de producció addicional a cada quadrat del voltant de la "
"ciutat on es construeix."
-#: data/default/buildings.ruleset:1239 data/civ2/buildings.ruleset:1224
+#: data/default/buildings.ruleset:1238 data/civ2/buildings.ruleset:1224
msgid "Leonardo's Workshop"
msgstr "Taller de Leonardo"
-#: data/default/buildings.ruleset:1253 data/civ2/buildings.ruleset:1238
+#: data/default/buildings.ruleset:1252 data/civ2/buildings.ruleset:1238
msgid "Upgrades one obsolete unit per game turn."
msgstr "Millora una unitat obsoleta cada torn."
-#: data/default/buildings.ruleset:1258 data/civ2/buildings.ruleset:1243
+#: data/default/buildings.ruleset:1257 data/civ2/buildings.ruleset:1243
#: data/civ1/buildings.ruleset:862
msgid "Lighthouse"
msgstr "Far"
-#: data/default/buildings.ruleset:1273
+#: data/default/buildings.ruleset:1272
msgid ""
"Gives all your sea units 1 additional movement point and eliminates the risk "
"of losing Triremes on the high seas. Makes all your new sea units veterans "
@@ -19471,36 +19634,36 @@ msgstr ""
"elimina el risc de perdre Trirrems en alta mar. Fa que totes les noves "
"unitats marÃtimes siguin veteranes (per totes les teves ciutats)."
-#: data/default/buildings.ruleset:1280 data/civ2/buildings.ruleset:1264
+#: data/default/buildings.ruleset:1279 data/civ2/buildings.ruleset:1264
#: data/civ1/buildings.ruleset:885
msgid "Magellan's Expedition"
msgstr "Expedició de Magallanes"
-#: data/default/buildings.ruleset:1295
+#: data/default/buildings.ruleset:1294
msgid "Gives all your sea units 2 additional movement points."
msgstr ""
"Dóna a totes les teves unitats marÃtimes 2 punts de moviment addicionals."
-#: data/default/buildings.ruleset:1300 data/civ2/buildings.ruleset:1283
+#: data/default/buildings.ruleset:1299 data/civ2/buildings.ruleset:1283
#: data/civ1/buildings.ruleset:904
msgid "Manhattan Project"
msgstr "Projecte Manhattan"
-#: data/default/buildings.ruleset:1318 data/civ2/buildings.ruleset:1301
+#: data/default/buildings.ruleset:1317 data/civ2/buildings.ruleset:1301
msgid "Marco Polo's Embassy"
msgstr "Ambaixada de Marco Polo"
-#: data/default/buildings.ruleset:1332 data/civ2/buildings.ruleset:1315
+#: data/default/buildings.ruleset:1331 data/civ2/buildings.ruleset:1315
msgid "The player who owns it gets an embassy with all players."
msgstr ""
"EL jugador que la té obté una ambaixada amb cadascun dels altres jugadors."
-#: data/default/buildings.ruleset:1337 data/civ2/buildings.ruleset:1320
+#: data/default/buildings.ruleset:1336 data/civ2/buildings.ruleset:1320
#: data/civ1/buildings.ruleset:922
msgid "Michelangelo's Chapel"
msgstr "Capella de Miquel Àngel"
-#: data/default/buildings.ruleset:1351 data/civ2/buildings.ruleset:1334
+#: data/default/buildings.ruleset:1350 data/civ2/buildings.ruleset:1334
msgid ""
"Counts as having a Cathedral in each of your cities. This makes 3 unhappy "
"citizens content in each city. The discovery of Theology increases the "
@@ -19514,23 +19677,23 @@ msgstr ""
"content. El descobriment del Comunisme redueix l'efecte d'una Catedral, "
"reduint en un el nombre de ciutadans infeliços acontentats."
-#: data/default/buildings.ruleset:1361 data/civ2/buildings.ruleset:1344
+#: data/default/buildings.ruleset:1360 data/civ2/buildings.ruleset:1344
#: data/civ1/buildings.ruleset:941
msgid "Oracle"
msgstr "Oracle"
-#: data/default/buildings.ruleset:1375
+#: data/default/buildings.ruleset:1374
msgid "Makes two of your unhappy citizens content in every city with a temple."
msgstr ""
"Converteix dos ciutadans descontents a contents en cada ciutat que tingui un "
"temple."
-#: data/default/buildings.ruleset:1380 data/civ2/buildings.ruleset:1363
+#: data/default/buildings.ruleset:1379 data/civ2/buildings.ruleset:1363
#: data/civ1/buildings.ruleset:960
msgid "Pyramids"
msgstr "Pirà mides"
-#: data/default/buildings.ruleset:1394
+#: data/default/buildings.ruleset:1393
msgid ""
"The amount of stored food lost when one of your cities grows or shrinks is "
"reduced by 25%. This helps a city to grow faster and more easily withstand "
@@ -19541,34 +19704,34 @@ msgstr ""
"créixer més rà pid i aguantar més fà cilment èpoques de fam. S'acumula amb "
"l'efecte del Graner."
-#: data/default/buildings.ruleset:1401 data/civ2/buildings.ruleset:1382
+#: data/default/buildings.ruleset:1400 data/civ2/buildings.ruleset:1382
#: data/civ1/buildings.ruleset:981
msgid "SETI Program"
msgstr "Programa SETI"
-#: data/default/buildings.ruleset:1415
+#: data/default/buildings.ruleset:1414
msgid "Boosts science production in each city with a Research Lab by 100%. "
msgstr ""
"Augmenta en un 100% la producció de ciència a cada ciutat que tingui un "
"Laboratori de Recerca."
-#: data/default/buildings.ruleset:1420 data/civ2/buildings.ruleset:1402
+#: data/default/buildings.ruleset:1419 data/civ2/buildings.ruleset:1402
#: data/civ1/buildings.ruleset:1001
msgid "Shakespeare's Theatre"
msgstr "Teatre de Shakespeare"
-#: data/default/buildings.ruleset:1434 data/civ2/buildings.ruleset:1416
+#: data/default/buildings.ruleset:1433 data/civ2/buildings.ruleset:1416
#: data/civ1/buildings.ruleset:1015
msgid "Makes all unhappy citizens content, in the city where it is located."
msgstr ""
"Converteix a contents tots els ciutadans descontents de la ciutat on es "
"construeix."
-#: data/default/buildings.ruleset:1439 data/civ2/buildings.ruleset:1421
+#: data/default/buildings.ruleset:1438 data/civ2/buildings.ruleset:1421
msgid "Statue of Liberty"
msgstr "Està tua de la Llibertat"
-#: data/default/buildings.ruleset:1453 data/civ2/buildings.ruleset:1435
+#: data/default/buildings.ruleset:1452 data/civ2/buildings.ruleset:1435
#: data/civ1/buildings.ruleset:974 data/civ1/buildings.ruleset:1034
msgid ""
"Allows you to choose any government, including those that have not yet been "
@@ -19579,11 +19742,11 @@ msgstr ""
"descoberts per la teva civilització, i sense el perÃode de transició "
"d'Anarquia."
-#: data/default/buildings.ruleset:1460 data/civ2/buildings.ruleset:1442
+#: data/default/buildings.ruleset:1459 data/civ2/buildings.ruleset:1442
msgid "Sun Tzu's War Academy"
msgstr "Acadèmia Militar de Sun Tzu"
-#: data/default/buildings.ruleset:1474
+#: data/default/buildings.ruleset:1473
msgid ""
"All your new ground units start at the first veteran level. The chance of a "
"unit getting the next veteran level after a battle increases by half."
@@ -19592,21 +19755,21 @@ msgstr ""
"veterania. La possibilitat que una unitat aconsegueixi el següent nivell de "
"veterania després d'una batalla augmenta en un 50%."
-#: data/default/buildings.ruleset:1481 data/civ2/buildings.ruleset:1463
+#: data/default/buildings.ruleset:1480 data/civ2/buildings.ruleset:1463
#: data/civ1/buildings.ruleset:1020
msgid "United Nations"
msgstr "Nacions Unides"
-#: data/default/buildings.ruleset:1495
+#: data/default/buildings.ruleset:1494
msgid "All your units regain two extra hitpoints per turn."
msgstr "Totes les teves unitats recuperen dos punts de vida extra per torn."
-#: data/default/buildings.ruleset:1508 data/civ2/buildings.ruleset:1490
+#: data/default/buildings.ruleset:1507 data/civ2/buildings.ruleset:1490
#: data/civ1/buildings.ruleset:1046
msgid "Women's Suffrage"
msgstr "Votació femenina"
-#: data/default/buildings.ruleset:1522 data/civ2/buildings.ruleset:1504
+#: data/default/buildings.ruleset:1521 data/civ2/buildings.ruleset:1504
msgid ""
"Counts as a Police Station in every city. (That is, for each city, reduces "
"unhappiness for military units outside the city by 2 under Democracy and 1 "
@@ -19617,11 +19780,11 @@ msgstr ""
"Democrà cia i 1 sota República. Aquesta meravella no té cap efecte sota "
"altres tipus de govern)."
-#: data/default/buildings.ruleset:1533
+#: data/default/buildings.ruleset:1532
msgid "Coinage"
msgstr "Encunyament"
-#: data/default/buildings.ruleset:1554
+#: data/default/buildings.ruleset:1553
msgid ""
"This is not a normal improvement. Instead, setting a city's production to "
"Coinage means its shield production is converted to tax output (money, "
@@ -20069,11 +20232,15 @@ msgstr "Cèltic"
msgid "?citystyle:Industrial"
msgstr "Industrial"
-#: data/default/cities.ruleset:139 data/civ2/cities.ruleset:150
+#: data/default/cities.ruleset:139
+msgid "?citystyle:ElectricAge"
+msgstr "EraElèctrica"
+
+#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:150
msgid "?citystyle:Modern"
msgstr "Modern"
-#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:161
+#: data/default/cities.ruleset:161 data/civ2/cities.ruleset:161
msgid "?citystyle:PostModern"
msgstr "Postmodern"
diff --git a/po/cs.gmo b/po/cs.gmo
index 254c99d..15de752 100644
Binary files a/po/cs.gmo and b/po/cs.gmo differ
diff --git a/po/cs.po b/po/cs.po
index dffb41c..96f3f14 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: 2009-03-29 21:13+0900\n"
+"POT-Creation-Date: 2009-11-22 21:37+0100\n"
"PO-Revision-Date: 2008-01-21 15:42+0100\n"
"Last-Translator: Dusan Hokuv <dusan at mirc.cz>\n"
"Language-Team: Czech <cs at li.org>\n"
@@ -69,21 +69,21 @@ msgstr "?obsolete:Z"
msgid "?redundant:*"
msgstr "?redundant:*"
-#: common/connection.c:515
+#: common/connection.c:518
#, c-format
msgid "%s from %s"
msgstr "%s z %s"
-#: common/connection.c:521
+#: common/connection.c:524
msgid " (connection incomplete)"
msgstr " (neúplné spojenÃ)"
-#: common/connection.c:525
+#: common/connection.c:528
#, c-format
msgid " (player %s)"
msgstr " (hrÃ¡Ä %s)"
-#: common/connection.c:529
+#: common/connection.c:532
msgid " (observer)"
msgstr " (pozorovatel)"
@@ -539,82 +539,82 @@ msgstr "ProbÃhá pÅ™ipojovánÃ."
msgid "AI Debug messages"
msgstr ""
-#: common/player.c:732
+#: common/player.c:746
msgid "?attitude:Genocidal"
msgstr "?attitude:GenocidnÃ"
-#: common/player.c:734
+#: common/player.c:748
msgid "?attitude:Belligerent"
msgstr "?attitude:ÚtoÄný"
-#: common/player.c:736
+#: common/player.c:750
msgid "?attitude:Hostile"
msgstr "?attitude:Nepřátelský"
-#: common/player.c:738
+#: common/player.c:752
msgid "?attitude:Uncooperative"
msgstr "?attitude:NespolupracujÃcÃ"
-#: common/player.c:740
+#: common/player.c:754
msgid "?attitude:Uneasy"
msgstr "?attitude:Nesnadný"
-#: common/player.c:742
+#: common/player.c:756
msgid "?attitude:Neutral"
msgstr "?attitude:NeutrálnÃ"
-#: common/player.c:744
+#: common/player.c:758
msgid "?attitude:Respectful"
msgstr "?attitude:Zdvořilý"
-#: common/player.c:746
+#: common/player.c:760
msgid "?attitude:Helpful"
msgstr "?attitude:Prospěšný"
-#: common/player.c:748
+#: common/player.c:762
msgid "?attitude:Enthusiastic"
msgstr "?attitude:Nadšený"
-#: common/player.c:750
+#: common/player.c:764
msgid "?attitude:Admiring"
msgstr "?attitude:ObdivujÃcÃ"
-#: common/player.c:753
+#: common/player.c:767
msgid "?attitude:Worshipful"
msgstr "?attitude:Ctihodný"
-#: common/player.c:764
+#: common/player.c:778
#, fuzzy
msgid "?diplomatic_state:Armistice"
msgstr "?diplomatic_state:Aliance"
-#: common/player.c:765
+#: common/player.c:779
msgid "?diplomatic_state:War"
msgstr "?diplomatic_state:Válka"
-#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:780 client/gui-gtk-2.0/diplodlg.c:353
#: 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:767 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:781 client/gui-gtk-2.0/diplodlg.c:358
#: 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:768 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:782 client/gui-gtk-2.0/diplodlg.c:363
#: 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:769
+#: common/player.c:783
msgid "?diplomatic_state:Never met"
msgstr "?diplomatic_state:Žádné setkánÃ"
-#: common/player.c:770
+#: common/player.c:784
msgid "?diplomatic_state:Team"
msgstr "?diplomatic_state:Tým"
@@ -645,7 +645,7 @@ msgstr "PÅ™ežÃvacà efekty jsou podporovány pouze v rozsahu svÄ›ta."
#. TRANS: "Resources: (none)".
#: common/requirements.c:1014 common/team.c:132
#: client/gui-gtk-2.0/helpdlg.c:1055 client/gui-gtk-2.0/inteldlg.c:390
-#: client/gui-win32/helpdlg.c:586 client/gui-xaw/helpdlg.c:991
+#: client/gui-win32/helpdlg.c:592 client/gui-xaw/helpdlg.c:991
#, c-format
msgid "(none)"
msgstr "(žádný)"
@@ -671,10 +671,11 @@ msgstr "Tech. budoucnosti %d"
#: 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
#: client/gui-sdl/helpdlg.c:817 client/gui-sdl/mapview.c:962
-#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:545
-#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:735
-#: 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
+#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:544
+#: client/gui-win32/helpdlg.c:551 client/gui-win32/helpdlg.c:721
+#: client/gui-win32/helpdlg.c:741 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 "Žádné"
@@ -687,29 +688,29 @@ msgstr "Tech. budoucnosti"
msgid "(Unknown)"
msgstr "(Neznámý)"
-#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:553
#: manual/civmanual.c:224
msgid "Road"
msgstr "Cesta"
-#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:557
#: client/gui-gtk-2.0/menu.c:829 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:394 common/terrain.c:572 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:567
#: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
#: data/civ1/techs.ruleset:563
msgid "Railroad"
msgstr "Železnice"
-#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:555
msgid "Mine"
msgstr "Důl"
-#: common/terrain.c:396 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:551 server/report.c:124
#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "ZneÄiÅ¡tÄ›nÃ"
@@ -718,7 +719,7 @@ msgstr "ZneÄiÅ¡tÄ›nÃ"
msgid "Hut"
msgstr "ChatrÄ"
-#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:563
#: manual/civmanual.c:226
msgid "Fortress"
msgstr "Pevnost"
@@ -731,58 +732,58 @@ msgstr "Řeka"
msgid "Farmland"
msgstr "Farma"
-#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:577
#: manual/civmanual.c:226
msgid "Airbase"
msgstr "Letiště"
-#: common/terrain.c:402 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:579
msgid "Fallout"
msgstr "Spad"
-#: common/unit.c:546 client/gui-win32/plrdlg.c:337
+#: common/unit.c:549 client/gui-win32/plrdlg.c:337
msgid "Idle"
msgstr "NeÄinný"
-#: common/unit.c:556
+#: common/unit.c:559
msgid "Fortifying"
msgstr "Opevňuje se"
-#: common/unit.c:558
+#: common/unit.c:561
msgid "Fortified"
msgstr "Opevněný"
-#: common/unit.c:562 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
+#: common/unit.c:565 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
msgid "Sentry"
msgstr "Stráž"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
+#: common/unit.c:569 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
#: client/gui-win32/menu.c:370 client/gui-xaw/menu.c:185
msgid "Pillage"
msgstr "Drancovat"
-#: common/unit.c:568 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
+#: common/unit.c:571 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
msgid "Goto"
msgstr "Přesun"
-#: common/unit.c:570
+#: common/unit.c:573
msgid "Explore"
msgstr "Prozkoumat"
-#: common/unit.c:572 manual/civmanual.c:224
+#: common/unit.c:575 manual/civmanual.c:224
msgid "Transform"
msgstr "Transformovat"
-#: common/unit.c:584 client/text.c:157 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:587 client/text.c:157 client/gui-sdl/citydlg.c:1972
#: client/gui-win32/citydlg.c:1257 client/gui-xaw/citydlg.c:1423
msgid "Unknown"
msgstr "Neznámý"
-#: common/unit.c:1022
+#: common/unit.c:1025
msgid "Moves"
msgstr "Tahů"
-#: common/unit.c:1571
+#: common/unit.c:1574
#, c-format
msgid ""
"Upgrade %s to %s for %d gold?\n"
@@ -791,12 +792,12 @@ msgstr ""
"Vylepšit %s na %s za %d zlatých?\n"
"V pokladně je %d zlatých."
-#: common/unit.c:1579
+#: common/unit.c:1582
#, c-format
msgid "Sorry, cannot upgrade %s (yet)."
msgstr "Lituji, nelze vylepÅ¡it %s (nynÃ)."
-#: common/unit.c:1585
+#: common/unit.c:1588
#, c-format
msgid ""
"Upgrading %s to %s costs %d gold.\n"
@@ -805,11 +806,11 @@ msgstr ""
"Vylepšenà %s na %s stojà %d zlatých.\n"
"V pokladně je %d zlatých."
-#: common/unit.c:1594
+#: common/unit.c:1597
msgid "You can only upgrade units in your cities."
msgstr "Můžete vylepšit pouze jednotky ve svých městech."
-#: common/unit.c:1598
+#: common/unit.c:1601
#, c-format
msgid "Upgrading this %s would strand units it transports."
msgstr "vylepšenà tohoto %s by vylodilo převážené jednotky"
@@ -842,11 +843,11 @@ msgstr "Jaderná střela"
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1404
+#: common/unittype.c:349 client/helpdata.c:1412
msgid " and "
msgstr " a "
-#: common/unittype.c:355 client/helpdata.c:1390
+#: common/unittype.c:355 client/helpdata.c:1398
msgid "?and:, "
msgstr "?and:, "
@@ -1014,70 +1015,70 @@ msgstr "Prázdný argument pro \"%s\".\n"
msgid "Missing argument for \"%s\".\n"
msgstr "ChybÄ›jÃcà argument pro \"%s\".\n"
-#: utility/shared.c:501
+#: utility/shared.c:514
#, c-format
msgid "%d BC"
msgstr "%d pÅ™.n.l."
-#: utility/shared.c:503
+#: utility/shared.c:516
#, c-format
msgid "%d AD"
msgstr "%d n.l."
-#: utility/shared.c:924
+#: utility/shared.c:937
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:1028
+#: utility/shared.c:1041
#, c-format
msgid "Could not read data directory %s: %s."
msgstr "Nelze pÅ™eÄÃst datový adresář %s: %s."
-#: utility/shared.c:1279
+#: utility/shared.c:1292
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:1281
+#: utility/shared.c:1294
#, c-format
msgid "Current data path is: \"%s\""
msgstr "SouÄasná datová cesta je: \"%s\""
-#: utility/shared.c:1283
+#: utility/shared.c:1296
#, c-format
msgid "The \"%s\" file is required ... aborting!"
msgstr "Je potÅ™eba soubor \"%s\" ... konÄÃm!"
-#: utility/shared.c:1460
+#: utility/shared.c:1485
#, 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:1462
+#: utility/shared.c:1487
msgid "Use a non-privileged account instead.\n"
msgstr "Použijte neprivilegovaný uživatelský úÄet.\n"
-#: utility/shared.c:1478
+#: utility/shared.c:1503
msgid "exact match"
msgstr "přesná shoda"
-#: utility/shared.c:1479
+#: utility/shared.c:1504
msgid "only match"
msgstr "jediná shoda"
-#: utility/shared.c:1480
+#: utility/shared.c:1505
msgid "ambiguous"
msgstr "nejednoznaÄné"
-#: utility/shared.c:1481
+#: utility/shared.c:1506
msgid "empty"
msgstr "prázdné"
-#: utility/shared.c:1482
+#: utility/shared.c:1507
msgid "too long"
msgstr "pÅ™ÃliÅ¡ dlouhé"
-#: utility/shared.c:1483
+#: utility/shared.c:1508
msgid "non-match"
msgstr "neshoda"
@@ -1106,92 +1107,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:280
+#: ai/advdiplomacy.c:300
#, 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:290
+#: ai/advdiplomacy.c:310
#, 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:303
+#: ai/advdiplomacy.c:322
#, 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:308
+#: ai/advdiplomacy.c:327
#, 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:331
+#: ai/advdiplomacy.c:350
#, 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:424
+#: ai/advdiplomacy.c:443
#, c-format
msgid "*%s (AI)* I do not know the city you mention."
msgstr ""
-#: ai/advdiplomacy.c:454
+#: ai/advdiplomacy.c:473
#, 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:560
+#: ai/advdiplomacy.c:579
#, c-format
msgid "*%s (AI)* This deal was not very good for us, %s!"
msgstr ""
-#: ai/advdiplomacy.c:582
+#: ai/advdiplomacy.c:601
#, c-format
msgid "*%s (AI)* Welcome into our alliance %s!"
msgstr "*%s (ŘÃzený poÄÃtaÄem)* VÃtej v alianci %s!"
-#: ai/advdiplomacy.c:586
+#: ai/advdiplomacy.c:605
#, 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:593
+#: ai/advdiplomacy.c:612
#, c-format
msgid "*%s (AI)* Yes, peace in our time!"
msgstr "*%s (ŘÃzený poÄÃtaÄem)* MÃr. Dobrý nápad!"
-#: ai/advdiplomacy.c:598
+#: ai/advdiplomacy.c:617
#, 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:813
+#: ai/advdiplomacy.c:832
#, c-format
msgid ""
"*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
"other better?"
msgstr ""
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1116
#, c-format
msgid "*%s (AI)* Space will never be yours. "
msgstr "*%s (PO)* VesmÃr nebude nikdy tvůj."
-#: ai/advdiplomacy.c:1102
+#: ai/advdiplomacy.c:1121
#, c-format
msgid "*%s (AI)* I have tolerated your vicious antics long enough! To war!"
msgstr ""
-#: ai/advdiplomacy.c:1108
+#: ai/advdiplomacy.c:1127
#, 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:1113
+#: ai/advdiplomacy.c:1132
#, c-format
msgid ""
"*%s (AI)* Finally I get around to you! Did you really think you could get "
@@ -1200,17 +1201,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:1119
+#: ai/advdiplomacy.c:1138
#, c-format
msgid "*%s (AI)* Your covert hostilities brought this war upon you!"
msgstr ""
-#: ai/advdiplomacy.c:1126
+#: ai/advdiplomacy.c:1145
#, 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:1209
+#: ai/advdiplomacy.c:1229
#, c-format
msgid ""
"*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1222,14 +1223,14 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ai/advdiplomacy.c:1219
+#: ai/advdiplomacy.c:1239
#, c-format
msgid ""
"*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
"alliance!"
msgstr ""
-#: ai/advdiplomacy.c:1225
+#: ai/advdiplomacy.c:1245
#, c-format
msgid ""
"*%s (AI)* %s has grossly violated his treaties with us for own gain. We "
@@ -1243,7 +1244,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ai/advdiplomacy.c:1238
+#: ai/advdiplomacy.c:1258
#, c-format
msgid ""
"*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1255,13 +1256,13 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ai/advdiplomacy.c:1246
+#: ai/advdiplomacy.c:1266
#, c-format
msgid ""
"*%s (AI)* If you want a piece of the loot, feel free to join in the action!"
msgstr ""
-#: ai/advdiplomacy.c:1251
+#: ai/advdiplomacy.c:1271
#, c-format
msgid ""
"*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1273,12 +1274,12 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ai/advdiplomacy.c:1261
+#: ai/advdiplomacy.c:1281
#, c-format
msgid "*%s (AI)* As our glorious allies, we expect your help in this war."
msgstr ""
-#: ai/advdiplomacy.c:1267
+#: ai/advdiplomacy.c:1287
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance and declare war on %s in %d turn. "
@@ -1290,7 +1291,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ai/advdiplomacy.c:1276
+#: ai/advdiplomacy.c:1296
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1302,7 +1303,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ai/advdiplomacy.c:1344
+#: ai/advdiplomacy.c:1364
#, c-format
msgid ""
"*%s (AI)* Your attempt to conquer space for yourself alone betray your true "
@@ -1311,14 +1312,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:1359
+#: ai/advdiplomacy.c:1379
#, 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:1362
+#: ai/advdiplomacy.c:1382
#, c-format
msgid ""
"*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
@@ -1327,13 +1328,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:1474
+#: ai/advdiplomacy.c:1494
#, 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:1549
+#: ai/advdiplomacy.c:1569
#, fuzzy, c-format
msgid ""
"*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
@@ -1342,7 +1343,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:1555
+#: ai/advdiplomacy.c:1575
#, c-format
msgid ""
"*%s (AI)* Greetings ally, I see you have not yet made war with our enemy, %"
@@ -1351,7 +1352,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:1562
+#: ai/advdiplomacy.c:1582
#, fuzzy, c-format
msgid ""
"*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1362,7 +1363,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:1592
+#: ai/advdiplomacy.c:1612
#, fuzzy, c-format
msgid ""
"*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
@@ -1371,12 +1372,12 @@ msgstr ""
"*%s (Å™Ãzen poÄÃtaÄem)* Nazdar pÅ™Ãteli, mohl bych navrhnout spojenà sil proti "
"%s?"
-#: ai/advdiplomacy.c:1607
+#: ai/advdiplomacy.c:1627
#, 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:1622
+#: ai/advdiplomacy.c:1642
#, fuzzy, c-format
msgid ""
"*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
@@ -1385,7 +1386,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:1742
+#: ai/advdiplomacy.c:1762
#, c-format
msgid ""
"*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1536,17 +1537,17 @@ msgstr ""
"Heslo musà mÃt nejménÄ› %d velkých pÃsmen, %d ÄÃslic a být minimálnÄ› %d "
"[tisknutelných] znaků dlouhé. Zkuste to znovu."
-#: server/barbarian.c:183
+#: server/barbarian.c:184
#, fuzzy, c-format
msgid "%s gain a leader by the name %s. Dangerous times may lie ahead."
msgstr "Barbaři majà nového vůdce jménem %s. Mohou nastat těžkosti."
-#: server/barbarian.c:479
+#: server/barbarian.c:480
#, c-format
msgid "Native unrest near %s led by %s."
msgstr "Nepokoje původnÃho obyvatelstva poblÞ mÄ›sta %s vedené %s."
-#: server/barbarian.c:484
+#: server/barbarian.c:485
#, c-format
msgid "Sea raiders seen near %s!"
msgstr "NájezdnÃci z moÅ™e byli vidÄ›ni poblÞ mÄ›sta %s!"
@@ -1944,7 +1945,7 @@ msgstr[0] "%s urychluje výzkum; okamžitÄ› zÃskáváte %d objev."
msgstr[1] "%s urychluje výzkum; okamžitÄ› zÃskáváte %d objevy."
msgstr[2] "%s urychluje výzkum; okamžitÄ› zÃskáváte %d objevů."
-#: server/cityturn.c:1158 server/techtools.c:176
+#: server/cityturn.c:1158 server/techtools.c:172
#, c-format
msgid "The %s have acquired %s from %s."
msgstr "%s zÃskali %s od %s."
@@ -2026,22 +2027,22 @@ msgstr ""
msgid "Warning: the %s option is obsolete. Use -m to enable the metaserver.\n"
msgstr "VarovánÃ: volba %s je zastaralá. Použijte -m pro metaserver.\n"
-#: server/civserver.c:189
+#: server/civserver.c:193
#, c-format
msgid "Error: unknown option '%s'\n"
msgstr "Chyba: neznámá volba '%s'\n"
-#: server/civserver.c:200
+#: server/civserver.c:204
#, c-format
msgid "This is the server for %s"
msgstr "Toto je server pro %s"
-#: server/civserver.c:201
+#: server/civserver.c:205
#, c-format
msgid "You can learn a lot about Freeciv at %s"
msgstr "O Freeciv se lze vÃce dozvÄ›dÄ›t na %s"
-#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
+#: server/civserver.c:210 client/civclient.c:239 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -2050,110 +2051,115 @@ msgstr ""
"PoužitÃ: %s [volba ...]\n"
"Možné volby jsou:\n"
-#: server/civserver.c:208
+#: server/civserver.c:212
#, fuzzy
msgid ""
" -a --auth FILE\tEnable server authentication with configuration from "
"FILE.\n"
msgstr " -a --auth\t\tZapne autentifikaci serveru.\n"
-#: server/civserver.c:210
+#: server/civserver.c:214
msgid " -G --Guests\t\tAllow guests to login if auth is enabled.\n"
msgstr ""
" -G --Guests\t\tPovolà přihlášenà hostům, když je zapnutá autentifikace.\n"
-#: server/civserver.c:212
+#: server/civserver.c:216
msgid " -N --Newusers\tAllow new users to login if auth is enabled.\n"
msgstr ""
" -N --Newusers\tPovolà pÅ™ihlášenà novým hráÄům, když je zapnutá "
"autentifikace.\n"
-#: server/civserver.c:215
+#: server/civserver.c:219
msgid " -b --bind ADDR\tListen for clients on ADDR\n"
msgstr " -b, --bind ADR\tOÄekává spojenà od klientů na adrese ADR\n"
-#: server/civserver.c:217 client/civclient.c:242
+#: server/civserver.c:221 client/civclient.c:243
msgid ""
" -d, --debug NUM\tSet debug log level (0 to 4, or 4:file1,min,max:...)\n"
msgstr ""
" -d, --debug ÄŒÃSLO\tNastavà logovacà úroveň debugovánà (od 0 do 4, nebo 4:"
"soubor1,min,max:...)\n"
-#: server/civserver.c:221 client/civclient.c:246
+#: server/civserver.c:225 client/civclient.c:247
msgid " -d, --debug NUM\tSet debug log level (0 to 3)\n"
msgstr " -d, --debug ÄŒÃSLO\tNastav úroveň logovánà (0 až 3)\n"
-#: server/civserver.c:223
+#: server/civserver.c:227
msgid " -f, --file FILE\tLoad saved game FILE\n"
msgstr " -f, --file SOUBOR\tNaÄte uloženou hru ze souboru SOUBOR\n"
-#: server/civserver.c:225 client/civclient.c:249 manual/civmanual.c:382
+#: server/civserver.c:229 client/civclient.c:250 manual/civmanual.c:382
msgid " -h, --help\t\tPrint a summary of the options\n"
msgstr " -h, --help\t\tVytiskne přehled voleb\n"
-#: server/civserver.c:226
+#: server/civserver.c:230
+#, fuzzy
+msgid " -i, --identity ADDR\tBe known as ADDR at metaserver\n"
+msgstr " -M, --Metaserver ADR\tNastavà ADR jako adresu metaserveru\n"
+
+#: server/civserver.c:231
msgid " -l, --log FILE\tUse FILE as logfile\n"
msgstr " -l, --log SOUBOR\tPoužije SOUBOR jako logovacÃ\n"
-#: server/civserver.c:227
+#: server/civserver.c:232
msgid " -m, --meta\t\tNotify metaserver and send server's info\n"
msgstr " -m, --meta\t\tOhlásà se metaserveru a pošle info o serveru\n"
-#: server/civserver.c:229
+#: server/civserver.c:234
msgid " -M, --Metaserver ADDR\tSet ADDR as metaserver address\n"
msgstr " -M, --Metaserver ADR\tNastavà ADR jako adresu metaserveru\n"
-#: server/civserver.c:232
+#: server/civserver.c:237
msgid " -p, --port PORT\tListen for clients on port PORT\n"
msgstr " -p, --port PORT\tOÄekává spojenà od klientů na portu PORT\n"
-#: server/civserver.c:234
+#: server/civserver.c:239
msgid " -q, --quitidle TIME\tQuit if no players for TIME seconds\n"
msgstr ""
" -q, --quitidle ÄŒAS\tUkonÄà se, pokud bÄ›hem doby ÄŒAS sekund nenà žádný "
"hráÄ\n"
-#: server/civserver.c:236
+#: server/civserver.c:241
msgid " -e, --exit-on-end\tWhen a game ends, exit instead of restarting\n"
msgstr " -e, --exit-on-end\tKdyž skonÄà hra, ukonÄenà mÃsto restartu\n"
-#: server/civserver.c:239
+#: server/civserver.c:244
msgid " -s, --saves DIR\tSave games to directory DIR\n"
msgstr " -s, --saves ADRESÃŘ\tUložà hry do adresáře ADRESÃŘ\n"
-#: server/civserver.c:241
+#: server/civserver.c:246
msgid " -S, --Serverid ID\tSets the server id to ID\n"
msgstr " -S, --Serverid ID\tNastavà server id na ID\n"
-#: server/civserver.c:243
+#: server/civserver.c:248
msgid " -P, --Ppm\t\tSave ppms of the map when saving the game.\n"
msgstr ""
-#: server/civserver.c:244
+#: server/civserver.c:249
msgid " -r, --read FILE\tRead startup script FILE\n"
msgstr " -r, --read SOUBOR\tPÅ™eÄte spouÅ¡tÄ›c skript ze souboru SOUBOR\n"
-#: server/civserver.c:246
+#: server/civserver.c:251
#, fuzzy
msgid " -R, --Ranklog FILE\tUse FILE as ranking logfile\n"
msgstr " -l, --log SOUBOR\tPoužije SOUBOR jako logovacÃ\n"
-#: server/civserver.c:247 client/civclient.c:268 manual/civmanual.c:383
+#: server/civserver.c:252 client/civclient.c:269 manual/civmanual.c:383
msgid " -v, --version\t\tPrint the version number\n"
msgstr " -v, --version\t\tVypiÅ¡ ÄÃslo verze\n"
-#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
+#: server/civserver.c:253 client/gui-gtk-2.0/gui_main.c:354
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, fuzzy, c-format
msgid "Report bugs at %s.\n"
msgstr "Chyby hlašte na <%s>.\n"
-#: server/commands.c:28
+#: server/commands.c:29
msgid "Start the game, or restart after loading a savegame."
msgstr "Zahájà hru, nebo ji restartuje po nahránÃ."
-#: server/commands.c:29
+#: server/commands.c:30
msgid ""
"This command starts the game. When starting a new game, it should be used "
"after all human players have connected, and AI players have been created (if "
@@ -2171,7 +2177,7 @@ msgstr ""
"rozbÄ›hne nemá již tento pÅ™Ãkaz smysl a nenà proto nadále dostupný."
#. TRANS: translate text between <> only
-#: server/commands.c:42
+#: server/commands.c:44
msgid ""
"help\n"
"help commands\n"
@@ -2185,11 +2191,11 @@ msgstr ""
"help <pÅ™Ãkaz>\n"
"help <volba>"
-#: server/commands.c:47
+#: server/commands.c:49
msgid "Show help about server commands and server options."
msgstr "Zobrazà nápovÄ›du k pÅ™Ãkazům a volbám serveru."
-#: server/commands.c:48
+#: server/commands.c:50
msgid ""
"With no arguments gives some introductory help. With argument \"commands\" "
"or \"options\" gives respectively a list of all commands or all options. "
@@ -2205,12 +2211,12 @@ msgstr ""
"o souÄasné a výchozà hodnotÄ› volby. V pÅ™Ãpadech kde nedocházà k "
"nejednoznaÄnostem může být argument zkrácen."
-#: server/commands.c:63
+#: server/commands.c:66
#, fuzzy
msgid "Show a list of players, teams, connections, or scenarios."
msgstr "Zobrazà seznam hráÄů nebo spojenÃ."
-#: server/commands.c:64
+#: server/commands.c:67
#, fuzzy
msgid ""
"Show a list of players in the game, teams of players, connections to the "
@@ -2220,20 +2226,20 @@ msgstr ""
"Zobrazà seznam hráÄů nebo seznam spojenà k serveru. Argument může být "
"zkrácen a pokud nenà uveden bude použita výchozà hodnota 'players'."
-#: server/commands.c:70
+#: server/commands.c:74
msgid "Quit the game and shutdown the server."
msgstr "PÅ™eruÅ¡Ã hru a ukonÄà Äinnost serveru."
#. TRANS: translate text between <> only
-#: server/commands.c:74
+#: server/commands.c:79
msgid "cut <connection-name>"
msgstr "cut <jméno-spojenÃ>"
-#: server/commands.c:75
+#: server/commands.c:80
msgid "Cut a client's connection to server."
msgstr "UkonÄà spojenà klienta se serverem."
-#: server/commands.c:76
+#: server/commands.c:81
msgid ""
"Cut specified client's connection to the server, removing that client from "
"the game. If the game has not yet started that client's player is removed "
@@ -2246,7 +2252,7 @@ msgstr ""
"jméno spojenà a nikoliv jméno hráÄe."
#. TRANS: translate text between <> only
-#: server/commands.c:83
+#: server/commands.c:89
msgid ""
"explain\n"
"explain <option-name>"
@@ -2254,11 +2260,11 @@ msgstr ""
"explain\n"
"explain <jméno-volby>"
-#: server/commands.c:85
+#: server/commands.c:91
msgid "Explain server options."
msgstr "Objasnà úÄel volby serveru."
-#: server/commands.c:86
+#: server/commands.c:92
msgid ""
"The 'explain' command gives a subset of the functionality of 'help', and is "
"included for backward compatibility. With no arguments it gives a list of "
@@ -2271,7 +2277,7 @@ msgstr ""
"specifikovanou volbu (jako 'help <jméno-volby>')."
#. TRANS: translate text between <> only
-#: server/commands.c:93
+#: server/commands.c:100
msgid ""
"show\n"
"show <option-name>\n"
@@ -2281,11 +2287,11 @@ msgstr ""
"show <jméno-volby>\n"
"show <prefix-volby>"
-#: server/commands.c:96
+#: server/commands.c:103
msgid "Show server options."
msgstr "Zobrazà volby serveru."
-#: server/commands.c:97
+#: server/commands.c:104
msgid ""
"With no arguments, shows all server options (or available options, when used "
"by clients). With an argument, show only the named option, or options with "
@@ -2295,37 +2301,38 @@ msgstr ""
"volánà z klienta). Při uvedenà argumentu zobrazà pouze jmenovanou volbu, "
"nebo všechny volby s daným prefixem."
-#: server/commands.c:102
+#: server/commands.c:110
msgid "wall <message>"
msgstr "wall <zpráva>"
-#: server/commands.c:103
+#: server/commands.c:111
msgid "Send message to all connections."
msgstr "OdeÅ¡le zprávu na vÅ¡echna spojenÃ."
-#: server/commands.c:104
+#: server/commands.c:112
msgid ""
"For each connected client, pops up a window showing the message entered."
msgstr ""
"Na vÅ¡ech pÅ™ipojených klientech zobrazà okno zobrazujÃcà uvedenou zprávu."
-#: server/commands.c:108
+#: server/commands.c:117
msgid "vote yes|no [vote number]"
msgstr "vote yes|no [vote ÄÃslo]"
-#: server/commands.c:109
+#: server/commands.c:118
msgid "Cast a vote."
msgstr "Hlasovat."
-#: server/commands.c:111
+#: server/commands.c:120
#, 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."
+"A player with basic 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."
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 "
@@ -2335,18 +2342,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:121
+#: server/commands.c:131
#, 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:123
+#: server/commands.c:133
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:124
+#: server/commands.c:134
msgid ""
"Print AI debug information about given entity and turn continous debugging "
"output for this entity on or off."
@@ -2354,23 +2361,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:128
+#: server/commands.c:139
msgid "set <option-name> <value>"
msgstr "set <jméno-volby> <hodnota>"
-#: server/commands.c:129
+#: server/commands.c:140
msgid "Set server option."
msgstr "Nastavena možnost serveru."
-#: server/commands.c:132
+#: server/commands.c:144
msgid "team <player> [team]"
msgstr "team <hráÄ> [tým]"
-#: server/commands.c:133
+#: server/commands.c:145
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:134
+#: server/commands.c:146
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 "
@@ -2383,15 +2390,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:141
+#: server/commands.c:154
msgid "rulesetdir <directory>"
msgstr "rulesetdir <adresář>"
-#: server/commands.c:142
+#: server/commands.c:155
msgid "Choose new ruleset directory or modpack."
msgstr "Vyberte nový adresář s pravidly nebo modpack."
-#: server/commands.c:143
+#: server/commands.c:156
msgid ""
"Choose new ruleset directory or modpack. Calling this\n"
" without any arguments will show you the currently selected ruleset."
@@ -2400,15 +2407,15 @@ msgstr ""
"zobrazà souÄasný adresář s pravidly."
#. TRANS: translate text between <> only
-#: server/commands.c:149
+#: server/commands.c:163
msgid "metainfo <meta-line>"
msgstr "metainfo <meta-řádek>"
-#: server/commands.c:150
+#: server/commands.c:164
msgid "Set metaserver info line."
msgstr "Nastavà text s infornacà pro metaserver."
-#: server/commands.c:151
+#: server/commands.c:165
msgid ""
"Set user defined metaserver info line. If parameter is omitted,\n"
"previously set metamessage will be removed. For most of the time\n"
@@ -2417,19 +2424,19 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:158
+#: server/commands.c:173
msgid "metapatch <meta-line>"
msgstr "metapatch <meta-řádek>"
-#: server/commands.c:159
+#: server/commands.c:174
msgid "Set metaserver patches line."
msgstr "Nastavà text s patchy pro metaserver."
-#: server/commands.c:165
+#: server/commands.c:181
msgid "Control metaserver connection."
msgstr "Ovládá spojenàs metaserverem."
-#: server/commands.c:166
+#: server/commands.c:182
msgid ""
"'metaconnection ?' reports on the status of the connection to metaserver.\n"
"'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2440,33 +2447,33 @@ msgstr ""
"'metaconnection up' or 'metac u' naváže spojenàs metaserverem."
#. TRANS: translate text between <> only
-#: server/commands.c:172
+#: server/commands.c:189
msgid "metaserver <address>"
msgstr "metaserver <adresa>"
-#: server/commands.c:173
+#: server/commands.c:190
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:177
+#: server/commands.c:195
msgid "aitoggle <player-name>"
msgstr "aitoggle <jméno-hráÄe>"
-#: server/commands.c:178
+#: server/commands.c:196
msgid "Toggle AI status of player."
msgstr "PÅ™epne druh hráÄe"
#. TRANS: translate text between [] and <> only
-#: server/commands.c:182
+#: server/commands.c:201
msgid "take [connection-name] <player-name>"
msgstr "take [název-spojenà ] <jméno-hráÄe>"
-#: server/commands.c:183
+#: server/commands.c:202
msgid "Take over a player's place in the game."
msgstr "PÅ™evzÃt hráÄovo mÃsto ve hÅ™e."
-#: server/commands.c:184
+#: server/commands.c:203
#, fuzzy
msgid ""
"Only the console and connections with cmdlevel 'hack' can force other "
@@ -2481,15 +2488,15 @@ msgstr ""
"nepoužije argumenty, pak je spojenà napojeno na globálnÃho pozorovatele."
#. TRANS: translate text between [] only
-#: server/commands.c:192
+#: server/commands.c:212
msgid "observe [connection-name] [player-name]"
msgstr "observe [název-spojenÃ] [jméno-hráÄe]"
-#: server/commands.c:193
+#: server/commands.c:213
msgid "Observe a player or the whole game."
msgstr "Pozorovat hráÄe nebo celou hru."
-#: server/commands.c:194
+#: server/commands.c:214
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 "
@@ -2503,15 +2510,15 @@ msgstr ""
"nepoužije argumenty, pak je spojenà napojeno na globálnÃho pozorovatele."
#. TRANS: translate text between <> only
-#: server/commands.c:202
+#: server/commands.c:223
msgid "detach <connection-name>"
msgstr "detach <jméno-spojenÃ>"
-#: server/commands.c:203
+#: server/commands.c:224
msgid "detach from a player."
msgstr "odpojit od hráÄe."
-#: server/commands.c:204
+#: server/commands.c:225
msgid ""
"Only the console and connections with cmdlevel 'hack' can force other "
"connections to detach from a player."
@@ -2520,20 +2527,20 @@ msgstr ""
"odpojit od hráÄe."
#. TRANS: translate text between <> only
-#: server/commands.c:209
+#: server/commands.c:231
msgid "create <player-name>"
msgstr "create <jméno-hráÄe>"
-#: server/commands.c:210
+#: server/commands.c:232
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:211
+#: server/commands.c:233
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:215
+#: server/commands.c:238
msgid ""
"away\n"
"away"
@@ -2541,16 +2548,16 @@ msgstr ""
"away\n"
"away"
-#: server/commands.c:217
+#: server/commands.c:240
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:218
+#: server/commands.c:241
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:222
+#: server/commands.c:246
msgid ""
"novice\n"
"novice <player-name>"
@@ -2558,11 +2565,11 @@ msgstr ""
"novice\n"
"novice <jméno-hráÄe>"
-#: server/commands.c:224
+#: server/commands.c:248
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:225
+#: server/commands.c:249
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 "
@@ -2573,7 +2580,7 @@ msgstr ""
"'nováÄek'. S argumentem nastavà úroveň pouze uvedeného hráÄe."
#. TRANS: translate text between <> only
-#: server/commands.c:231
+#: server/commands.c:256
msgid ""
"easy\n"
"easy <player-name>"
@@ -2581,11 +2588,11 @@ msgstr ""
"easy\n"
"easy <jméno-hráÄe>"
-#: server/commands.c:233
+#: server/commands.c:258
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:234
+#: server/commands.c:259
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 "
@@ -2596,7 +2603,7 @@ msgstr ""
"argumentem nastavà úroveň pouze uvedeného hráÄe."
#. TRANS: translate text between <> only
-#: server/commands.c:240
+#: server/commands.c:266
msgid ""
"normal\n"
"normal <player-name>"
@@ -2604,11 +2611,11 @@ msgstr ""
"normal\n"
"normal <jméno hráÄe>"
-#: server/commands.c:242
+#: server/commands.c:268
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:243
+#: server/commands.c:269
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 "
@@ -2619,7 +2626,7 @@ msgstr ""
"argumentem nastavà úroveň pouze uvedeného hráÄe."
#. TRANS: translate text between <> only
-#: server/commands.c:249
+#: server/commands.c:276
msgid ""
"hard\n"
"hard <player-name>"
@@ -2627,11 +2634,11 @@ msgstr ""
"hard\n"
"hard <jméno-hráÄe>"
-#: server/commands.c:251
+#: server/commands.c:278
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:252
+#: server/commands.c:279
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 "
@@ -2642,7 +2649,7 @@ msgstr ""
"argumentem nastavà úroveň pouze uvedeného hráÄe."
#. TRANS: translate text between <> only
-#: server/commands.c:258
+#: server/commands.c:286
msgid ""
"experimental\n"
"experimental <player-name>"
@@ -2650,11 +2657,11 @@ msgstr ""
"experimental\n"
"experimental <jméno-hráÄe>"
-#: server/commands.c:260
+#: server/commands.c:288
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:261
+#: server/commands.c:289
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 "
@@ -2667,7 +2674,7 @@ msgstr ""
"VLASTNOSTÃ! Na normálnà servery tato možnost nemá vliv."
#. TRANS: translate text between <> only
-#: server/commands.c:269
+#: server/commands.c:298
msgid ""
"cmdlevel\n"
"cmdlevel <level>\n"
@@ -2681,17 +2688,20 @@ msgstr ""
"cmdlevel <úroveň> first\n"
"cmdlevel <úroveň> <jméno-spojenÃ>"
-#: server/commands.c:274
+#: server/commands.c:303
msgid "Query or set command access level access."
msgstr "Zobrazà nebo nastavà oprávnÄ›nà k provádÄ›nà pÅ™Ãkazů."
-#: server/commands.c:275
+#: server/commands.c:304
+#, fuzzy
msgid ""
"The command access level controls which server commands are available\n"
"to users via the client chatline. The available levels are:\n"
" none - no commands\n"
-" info - informational commands only\n"
+" info - informational or observer commands only\n"
+" basic - commands available to players in the game\n"
" ctrl - commands that affect the game and users\n"
+" admin - commands that affect server operation\n"
" hack - *all* commands - dangerous!\n"
"With no arguments, the current command access levels are reported.\n"
"With a single argument, the level is set for all existing connections,\n"
@@ -2725,20 +2735,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:296
+#: server/commands.c:328
msgid "If there is none, become the game organizer with increased permissions."
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:301
+#: server/commands.c:334
msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
msgstr "timeoutincrease <tah> <turninc> <hodnota> <valuemult>"
-#: server/commands.c:302
+#: server/commands.c:335
msgid "See \"help timeoutincrease\"."
msgstr "Viz \"help timeoutincrease\"."
-#: server/commands.c:303
+#: server/commands.c:336
msgid ""
"Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
"<turn> and multiply <value> by <valuemult>. Use this command in concert "
@@ -2749,42 +2759,61 @@ 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:309
+#: server/commands.c:343
+msgid ""
+"cancelvote\n"
+"cancelvote <vote number>\n"
+"cancelvote all\n"
+msgstr ""
+
+#: server/commands.c:346
+msgid "Cancel a running vote.\n"
+msgstr ""
+
+#: server/commands.c:347
+msgid ""
+"With no arguments this command removes your own vote. If you have an admin "
+"access level, you can cancel any vote by vote number, or all votes with the "
+"'all' argument."
+msgstr ""
+
+#. TRANS: translate text between <> only
+#: server/commands.c:354
#, fuzzy
msgid "endgame"
msgstr "Přejmenovat"
-#: server/commands.c:310
+#: server/commands.c:355
#, fuzzy
msgid "End the game immediately in a draw."
msgstr "Hra skonÄila remÃzou"
#. TRANS: translate text between <> only
-#: server/commands.c:314
+#: server/commands.c:360
msgid "surrender"
msgstr "kapitulace"
-#: server/commands.c:315
+#: server/commands.c:361
#, fuzzy
msgid "Concede the game."
msgstr "Nelze nahrát uloženou hru"
-#: server/commands.c:316
+#: server/commands.c:362
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:322
+#: server/commands.c:369
msgid "remove <player-name>"
msgstr "remove <jméno-hráÄe>"
-#: server/commands.c:323
+#: server/commands.c:370
msgid "Fully remove player from game."
msgstr "Odstranà hráÄe ze hry."
-#: server/commands.c:324
+#: server/commands.c:371
msgid ""
"This *completely* removes a player from the game, including all cities and "
"units etc. Use with care!"
@@ -2793,7 +2822,7 @@ msgstr ""
"jednotek atd. PoužÃvejte opatrnÄ›!"
#. TRANS: translate text between <> only
-#: server/commands.c:329
+#: server/commands.c:377
msgid ""
"save\n"
"save <file-name>"
@@ -2801,11 +2830,11 @@ msgstr ""
"save\n"
"save <jméno-souboru>"
-#: server/commands.c:331
+#: server/commands.c:379
msgid "Save game to file."
msgstr "Uložà hru do souboru."
-#: server/commands.c:332
+#: server/commands.c:380
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"
@@ -2821,7 +2850,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:341
+#: server/commands.c:390
msgid ""
"load\n"
"load <file-name>"
@@ -2829,11 +2858,11 @@ msgstr ""
"load\n"
"load <název-souboru>"
-#: server/commands.c:343
+#: server/commands.c:392
msgid "Load game from file."
msgstr "Nahrát hru ze souboru."
-#: server/commands.c:344
+#: server/commands.c:393
msgid ""
"Load a game from <file-name>. Any current data including players, rulesets "
"and server options are lost.\n"
@@ -2842,120 +2871,120 @@ msgstr ""
"voleb serveru budou ztracena.\n"
#. TRANS: translate text between <> only
-#: server/commands.c:349
+#: server/commands.c:399
msgid "read <file-name>"
msgstr "read <jméno-souboru>"
-#: server/commands.c:350
+#: server/commands.c:400
msgid "Process server commands from file."
msgstr "Zpracovánà serverových pÅ™Ãkazů ze souboru."
#. TRANS: translate text between <> only
-#: server/commands.c:354
+#: server/commands.c:405
msgid "write <file-name>"
msgstr "write <jméno-souboru>"
-#: server/commands.c:355
+#: server/commands.c:406
msgid "Write current settings as server commands to file."
msgstr "Uložà souÄasná nastavenà jako serverové pÅ™Ãkazy do souboru."
-#: server/commands.c:359
+#: server/commands.c:411
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:363
+#: server/commands.c:416
msgid "Simply returns the id of the server."
msgstr "Jednoduše vrátà id serveru."
-#: server/connecthand.c:85
+#: server/connecthand.c:109
#, c-format
msgid "Welcome to the %s Server running at %s port %d."
msgstr "VÃtejte na %s Server běžà na %s port %d."
-#: server/connecthand.c:89
+#: server/connecthand.c:113
#, c-format
msgid "Welcome to the %s Server at port %d."
msgstr "VÃtejte na %s Server běžà na portu %d."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:97
+#: server/connecthand.c:121
#, fuzzy, c-format
msgid "(%d) %s: connected [%s]"
msgstr "(%d) %s se připojil z %s."
-#: server/connecthand.c:104
+#: server/connecthand.c:128
#, c-format
msgid "Server: %s has connected from %s."
msgstr "Server: %s byl(a) připojen(a) z %s."
-#: server/connecthand.c:145
+#: server/connecthand.c:175
msgid "Couldn't attach your connection to new player."
msgstr "Nelze pÅ™ipojit vaÅ¡e spojenà na nového hráÄe."
-#: server/connecthand.c:165
+#: server/connecthand.c:199
#, c-format
msgid "You are logged in as '%s' connected to no player."
msgstr "PÅ™ihlásili jste se jako '%s' a nepÅ™ipojili se k hráÄi."
-#: server/connecthand.c:169
+#: server/connecthand.c:203
#, c-format
msgid "You are logged in as '%s' connected to an anonymous player."
msgstr "PÅ™ihlásili jste se jako '%s' a pripojili k anonymnÃmu hráÄi."
-#: server/connecthand.c:174
+#: server/connecthand.c:208
#, c-format
msgid "You are logged in as '%s' connected to %s."
msgstr "Přihlásili jste se jako '%s' připojeni k %s."
-#: server/connecthand.c:187
+#: server/connecthand.c:221
#, c-format
msgid "Turn-blocking game play: waiting on %s to finish turn..."
msgstr "Hra s blokovánÃm tahu: Äeká se na %s pro dokonÄenà tahu..."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:240
+#: server/connecthand.c:274
#, fuzzy, c-format
msgid "(%d) %s: connection request [%s]"
msgstr "(%d) Požadavek připojenà od %s z %s"
-#: server/connecthand.c:266
+#: server/connecthand.c:300
#, fuzzy
msgid "The client is missing a capability that this server needs."
msgstr "Klientu chybà vlastnost, kterou vyžaduje tento server."
-#: server/connecthand.c:268 server/connecthand.c:279
+#: server/connecthand.c:302 server/connecthand.c:313
#, fuzzy, c-format
msgid "(%d) %s rejected: mismatched capabilities!"
msgstr "(%d) %s byl(a) odmÃtnut(a): NesouhlasÃcà vlastnosti."
-#: server/connecthand.c:277
+#: server/connecthand.c:311
#, fuzzy
msgid "This server is missing a capability that the client needs."
msgstr "Serveru chybà vlastnost, kterou klient vyžaduje."
-#: server/connecthand.c:290
+#: server/connecthand.c:324
#, fuzzy
msgid "The username is invalid!"
msgstr "Neplatné jméno"
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:292
+#: server/connecthand.c:326
#, fuzzy, c-format
msgid "(%d) %s rejected: invalid username [%s]"
msgstr "(%d) %s byl(a) odmÃtnut(a): NesouhlasÃcà vlastnosti [%s]"
-#: server/connecthand.c:303
+#: server/connecthand.c:337
#, fuzzy
msgid "Your username is already connected!"
msgstr "je již připojen(a)."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:305
+#: server/connecthand.c:339
#, fuzzy, c-format
msgid "(%d) %s rejected: duplicate username [%s]"
msgstr "(%d) %s byl(a) odmÃtnut(a): NesouhlasÃcà vlastnosti [%s]"
-#: server/connecthand.c:335 server/connecthand.c:344
+#: server/connecthand.c:369 server/connecthand.c:378
#, c-format
msgid "Lost connection: %s."
msgstr "Ztraceno spojenÃ: %s."
@@ -2972,36 +3001,36 @@ msgstr "Ok. Použit standardnà styl."
msgid "For introductory help, type 'help'."
msgstr "Pro úvodnà seznámenà napište 'help'."
-#: server/diplhand.c:164
+#: server/diplhand.c:167
#, c-format
msgid "The %s can't accept %s."
msgstr "%s nemohou přijmout %s."
-#: server/diplhand.c:176
+#: server/diplhand.c:179
#, c-format
msgid "You don't have tech %s, you can't accept treaty."
msgstr "Nemáte technologii %s - nemůžete přijmout dohodu."
-#: server/diplhand.c:185
+#: server/diplhand.c:188
msgid "City you are trying to give no longer exists, you can't accept treaty."
msgstr ""
"MÄ›sto, které se snažÃÅ¡ vÄ›novat již neexistuje. Dohoda nemůže být uzavÅ™ena."
-#: server/diplhand.c:191
+#: server/diplhand.c:194
#, c-format
msgid "You are not owner of %s, you can't accept treaty."
msgstr "Nejste vlastnÃkem mÄ›sta %s - nemůžete pÅ™ijmout dohodu."
-#: server/diplhand.c:197 server/diplhand.c:301
+#: server/diplhand.c:200 server/diplhand.c:304
#, c-format
msgid "Your capital (%s) is requested, you can't accept treaty."
msgstr "Je požadováno Vaše hlavnà město (%s) - nemůžete přijmout dohodu."
-#: server/diplhand.c:224
+#: server/diplhand.c:227
msgid "You don't have enough gold, you can't accept treaty."
msgstr "Nemáte dostatek zlata - nemůžete přijmout dohodu."
-#: server/diplhand.c:256 server/diplhand.c:261
+#: server/diplhand.c:259 server/diplhand.c:264
#, c-format
msgid "A treaty containing %d clause was agreed upon."
msgid_plural "A treaty containing %d clauses was agreed upon."
@@ -3009,75 +3038,75 @@ msgstr[0] "Dohoda obsahuje %d již potvrzenou klauzuli."
msgstr[1] "Dohoda obsahuje %d již potvrzené klauzule."
msgstr[2] "Dohoda obsahuje %d již potvrzených klauzulÃ."
-#: server/diplhand.c:277 server/diplhand.c:281
+#: server/diplhand.c:280 server/diplhand.c:284
#, fuzzy, c-format
msgid "One of the cities the %s are giving away is destroyed! Treaty canceled!"
msgstr "Jedno z mÄ›st, kterého se %s vzdávajà je zniÄeno! Dohoda zruÅ¡ena!"
-#: server/diplhand.c:288 server/diplhand.c:293
+#: server/diplhand.c:291 server/diplhand.c:296
#, c-format
msgid "The %s no longer control %s! Treaty canceled!"
msgstr "%s již neovládajà město %s! Dohoda zrušena!"
-#: server/diplhand.c:331 server/diplhand.c:335
+#: server/diplhand.c:334 server/diplhand.c:338
#, c-format
msgid "The %s don't have the promised amount of gold! Treaty canceled!"
msgstr "%s nemajà slÃbené množstvà zlata! Dohoda zruÅ¡ena!"
-#: server/diplhand.c:364
+#: server/diplhand.c:367
#, c-format
msgid "You gave an embassy to %s."
msgstr "Povolili jsme u nás zÅ™Ãdit vyslanectvà %s."
-#: server/diplhand.c:367
+#: server/diplhand.c:370
#, c-format
msgid "%s allowed you to create an embassy!"
msgstr "%s nám povolili zÅ™Ãzenà ambasády!"
-#: server/diplhand.c:383
+#: server/diplhand.c:386
#, c-format
msgid "You are taught the knowledge of %s."
msgstr "Je nám objasněna znalost technologie %s."
-#: server/diplhand.c:387
+#: server/diplhand.c:390
#, c-format
msgid "The %s have acquired %s from the %s."
msgstr "%s zÃskali %s od %s."
-#: server/diplhand.c:402
+#: server/diplhand.c:405
#, c-format
msgid "You get %d gold."
msgstr "Dostali jsme %d zlatých."
#. TRANS: ... Polish worldmap.
-#: server/diplhand.c:410
+#: server/diplhand.c:413
#, fuzzy, c-format
msgid "You receive the %s worldmap."
msgstr "ZÃskal(a) jste mapu kontinentů, které %s zná."
#. TRANS: ... Polish seamap.
-#: server/diplhand.c:419
+#: server/diplhand.c:422
#, fuzzy, c-format
msgid "You receive the %s seamap."
msgstr "ZÃskal(a) jste mapu moÅ™Ã, které %s zná."
-#: server/diplhand.c:436
+#: server/diplhand.c:439
#, c-format
msgid "You receive city of %s from %s."
msgstr "ZÃskala(a) jste mÄ›sto %s od %s."
-#: server/diplhand.c:441
+#: server/diplhand.c:444
#, c-format
msgid "You give city of %s to %s."
msgstr "HrÃ¡Ä %2$s od Vás dostal mÄ›sto %1$s."
-#: server/diplhand.c:454 server/diplhand.c:457
+#: server/diplhand.c:457 server/diplhand.c:460
#, c-format
msgid "You agree on a cease-fire with %s."
msgstr "Dohodl(a) jste se na pÅ™Ãměřà s hráÄem %s."
#. TRANS: ... the Poles ... Polish territory.
-#: server/diplhand.c:476 server/diplhand.c:488
+#: server/diplhand.c:479 server/diplhand.c:491
#, c-format
msgid ""
"You agree on an armistice with the %s. In %d turn, it will become a peace "
@@ -3089,32 +3118,32 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: server/diplhand.c:512 server/diplhand.c:515
+#: server/diplhand.c:515 server/diplhand.c:518
#, c-format
msgid "You agree on an alliance with %s."
msgstr "Dohodl(a) jste se na alianci s hráÄem %s."
-#: server/diplhand.c:524
+#: server/diplhand.c:527
#, c-format
msgid "You give shared vision to %s."
msgstr "Dovolil(a) jste hráÄi %s nahlÞet do vaÅ¡ich map."
-#: server/diplhand.c:527
+#: server/diplhand.c:530
#, c-format
msgid "%s gives you shared vision."
msgstr "HrÃ¡Ä %s vám dovolil nahlÞet do svých map."
-#: server/diplhand.c:663
+#: server/diplhand.c:666
#, c-format
msgid "%s canceled the meeting!"
msgstr "%s zrušil(a) schůzku!"
-#: server/diplhand.c:670
+#: server/diplhand.c:673
#, c-format
msgid "Meeting with %s canceled."
msgstr "Schůzka s hráÄem %s zruÅ¡ena."
-#: server/diplhand.c:712
+#: server/diplhand.c:715
msgid "Your diplomatic envoy was decapitated!"
msgstr "Vaši vyslanci byli popraveni!"
@@ -3297,80 +3326,80 @@ msgid "The %s destroyed the %s in %s."
msgstr "%s zniÄili %s ve mÄ›stÄ› %s."
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1091
+#: server/diplomats.c:1097
#, fuzzy, c-format
msgid "An enemy %s has been eliminated by your %s."
msgstr "Nepřátelský %s byl zlikvidován při obraně %s."
#. TRANS: <unit> ... <city> ... <diplomat>
-#: server/diplomats.c:1098
+#: server/diplomats.c:1104
#, c-format
msgid "Your %s has been eliminated defending %s against a %s."
msgstr "Váš %s byl zlikvidován při obraně města %s proti %s."
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1106
+#: server/diplomats.c:1112
#, fuzzy, c-format
msgid "Your %s has been eliminated defending against a %s."
msgstr "Váš %s byl zlikvidován při obraně města proti %s."
-#: server/diplomats.c:1119
+#: server/diplomats.c:1125
#, c-format
msgid "Your %s was eliminated by a defending %s."
msgstr "Váš %s byl zlikvidován při obraně %s."
-#: server/diplomats.c:1127
+#: server/diplomats.c:1133
#, c-format
msgid "Eliminated %s %s while infiltrating %s."
msgstr "Byl zlikvidován %2$s (%1$s) při pokusu o infiltrovánà města %3$s."
-#: server/diplomats.c:1134
+#: server/diplomats.c:1140
#, c-format
msgid "Eliminated %s %s while infiltrating our troops."
msgstr "Byl zlikvidován %s %s při pokusu o infiltrovánà našich jednotek."
-#: server/diplomats.c:1185
+#: server/diplomats.c:1191
#, fuzzy, c-format
msgid ""
"Your %s has successfully completed the mission and returned unharmed to %s."
msgstr "Váš %s úspěšně spnil misi a vrátil se nepozorovaně do města %s."
-#: server/diplomats.c:1204
+#: server/diplomats.c:1210
#, fuzzy, c-format
msgid "Your %s was captured after completing the mission in %s."
msgstr "Váš %s byl zajat poté, co dokonÄil svoji misi ve mÄ›stÄ› %s."
-#: server/diplomats.c:1210
+#: server/diplomats.c:1216
#, fuzzy, c-format
msgid "Your %s was captured after completing the mission."
msgstr "Váš %s byl zajat poté, co dokonÄil svoji misi."
-#: server/diplomats.c:1242
+#: server/diplomats.c:1248
#, fuzzy, c-format
msgid "You have caused an incident while bribing the %s %s."
msgstr "Váš pokus o uplacenà %2$s hráÄe %1$s vyvolal incident."
-#: server/diplomats.c:1247
+#: server/diplomats.c:1253
#, c-format
msgid "%s has caused an incident while bribing your %s."
msgstr "HrÃ¡Ä %s vyvolal incident svým pokusem o uplacenà VaÅ¡eho %s."
-#: server/diplomats.c:1254
+#: server/diplomats.c:1260
#, fuzzy, c-format
msgid "You have caused an incident while attempting to steal tech from %s."
msgstr "PÅ™i pokusu o krádež technologie hráÄi %s doÅ¡lo k incidentu."
-#: server/diplomats.c:1258
+#: server/diplomats.c:1264
#, fuzzy, c-format
msgid "%s has caused an incident while attempting to steal tech from you."
msgstr "HrÃ¡Ä %s vyvolal incident svým pokusem o krádež technologie."
-#: server/diplomats.c:1264
+#: server/diplomats.c:1270
#, c-format
msgid "You have caused an incident while inciting a revolt in %s."
msgstr "Způsobil jste incident při pokusu vyvolat povstánà ve městě %s."
-#: server/diplomats.c:1268
+#: server/diplomats.c:1274
#, c-format
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."
@@ -3485,12 +3514,12 @@ msgstr ""
"funguje.\n"
" PracovnÃci spontánnÄ› vybudovali železnici ve vÅ¡ech mÄ›stech."
-#: server/maphand.c:1418
+#: server/maphand.c:1425
#, 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:1436
+#: server/maphand.c:1443
#, 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žÃ."
@@ -3499,7 +3528,7 @@ msgstr "RozpuÅ¡tÄ›na naÅ¡e %s kvůli zmÄ›nÄ› moÅ™e na pobÅ™ežÃ."
msgid "Not reporting to the metaserver in this game."
msgstr "Nehlásit se metaserveru v této hře."
-#: server/meta.c:430
+#: server/meta.c:432
#, c-format
msgid "Metaserver: bad address: [%s:%d]."
msgstr "Metaserver: špatná adresa: [%s:%d]."
@@ -3622,54 +3651,54 @@ msgid ""
msgstr ""
"Váš týmový spoluhrÃ¡Ä %s vyhlásil válku %s. Jsme povinni zruÅ¡it alianci s %s."
-#: server/plrhand.c:1103
+#: server/plrhand.c:1115
#, c-format
msgid "Removing player %s."
msgstr "Odstraňuji hráÄe %s."
-#: server/plrhand.c:1105
+#: server/plrhand.c:1117
msgid "You've been removed from the game!"
msgstr "Byl jste odstraněn ze hry."
-#: server/plrhand.c:1108
+#: server/plrhand.c:1120
#, c-format
msgid "%s has been removed from the game."
msgstr "%s byl(a) odstraněn(a) ze hry."
-#: server/plrhand.c:1153 server/plrhand.c:1158
+#: server/plrhand.c:1167 server/plrhand.c:1172
#, 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:1178
+#: server/plrhand.c:1192
#, 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:1656
+#: server/plrhand.c:1670
#, 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:1663
+#: server/plrhand.c:1677
#, 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:1686
+#: server/plrhand.c:1700
#, fuzzy, 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:1707
+#: server/plrhand.c:1721
#, c-format
msgid "%s declares allegiance to %s."
msgstr "Město %s vyhlásilo věrnost %s."
-#: server/plrhand.c:1722
+#: server/plrhand.c:1736
#, fuzzy, c-format
msgid ""
"Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3862,68 +3891,68 @@ msgstr "(stavà %s ve městě %s (%s))\n"
msgid "Wonders of the World"
msgstr "Divy světa"
-#: server/report.c:547
+#: server/report.c:552
msgid " sq. mi."
msgstr "km Ät."
-#: server/report.c:557
+#: server/report.c:562
msgid " M tons"
msgstr " mil. tun"
-#: server/report.c:562
+#: server/report.c:567
msgid " M goods"
msgstr " mil. zbožÃ"
-#: server/report.c:567
+#: server/report.c:572
msgid " bulbs"
msgstr " žárovek"
-#: server/report.c:572
+#: server/report.c:577
msgid " month"
msgid_plural " months"
msgstr[0] " mÄ›sÃc"
msgstr[1] " mÄ›sÃce"
msgstr[2] " mÄ›sÃců"
-#: server/report.c:577
+#: server/report.c:582
msgid " ton"
msgid_plural " tons"
msgstr[0] " tuna"
msgstr[1] " tuny"
msgstr[2] " tun"
-#: server/report.c:591
+#: server/report.c:596
msgid "st"
msgstr "."
-#: server/report.c:593
+#: server/report.c:598
msgid "nd"
msgstr "."
-#: server/report.c:595
+#: server/report.c:600
msgid "rd"
msgstr "."
-#: server/report.c:597
+#: server/report.c:602
msgid "th"
msgstr "."
-#: server/report.c:700
+#: server/report.c:705
msgid "Demography string contains invalid characters. Try \"help demography\"."
msgstr ""
"Řetězec Demografie obsahuje neplatné znaky. Zkuste \"help demography\"."
-#: server/report.c:743 server/report.c:768
+#: server/report.c:748 server/report.c:773
msgid "Demographics Report:"
msgstr "Demografický přehled"
-#: server/report.c:744
+#: server/report.c:749
msgid "Sorry, the Demographics report is unavailable."
msgstr "Lituji, ale demografický přehled nenà k dispozici."
#. TRANS: <nation adjective> <government name> (<year>).
#. * E.g. "Polish Despotism (200 AD)".
-#: server/report.c:750
+#: server/report.c:755
#, fuzzy, c-format
msgid "%s %s (%s)"
msgstr "%s ve městě %s (%s)\n"
@@ -3934,11 +3963,11 @@ msgstr "%s ve městě %s (%s)\n"
msgid "Could not find a readable \"%s.%s\" ruleset file."
msgstr "Nemohu najÃt Äitelný soubor pravidel \"%s\"."
-#: server/ruleset.c:2356
+#: server/ruleset.c:2366
msgid "No barbarian nation in rulesets, at least one required!"
msgstr ""
-#: server/ruleset.c:3166
+#: server/ruleset.c:3178
msgid "Loading rulesets"
msgstr "Nahrávám pravidla"
@@ -3953,20 +3982,20 @@ 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:3588
+#: server/savegame.c:3587
#, 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."
#. TRANS: Fatal error message.
-#: server/savegame.c:3815
+#: server/savegame.c:3817
#, fuzzy
msgid ""
"Saved game uses the \"classic\" terrain ruleset, and is no longer supported."
msgstr ""
"Uložená hra použÃvá soubor pravidel pro terén, který již nenà podporován."
-#: server/savegame.c:3824
+#: server/savegame.c:3826
#, c-format
msgid ""
"Warning: Different rulesetdirs ('%s' and '%s') are no longer supported. "
@@ -3976,7 +4005,7 @@ msgstr ""
"podporovány. Použito '%s'."
#. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4051
+#: server/savegame.c:4055
#, c-format
msgid "%s had invalid nation; changing to %s."
msgstr ""
@@ -4009,7 +4038,7 @@ msgstr "InternÃ"
msgid "Networking"
msgstr "SÃÅ¥ové"
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:734
#: client/gui-win32/dialogs.c:532
msgid "All"
msgstr "VÅ¡echny"
@@ -5223,11 +5252,11 @@ msgstr ""
"souboru \"civscore.log\" na konci každého tahu. Tyto statistiky lze použÃt "
"pro konstrukci grafů na konci hry."
-#: server/sernet.c:150
+#: server/sernet.c:151
msgid "Server cannot read standard input. Ignoring input."
msgstr "Server nemůže ÄÃst ze standardnÃho vstupu. Ignorováno."
-#: server/sernet.c:929
+#: server/sernet.c:933
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr "Server: špatná adresa: [%s:%d]."
@@ -5302,46 +5331,46 @@ msgstr "VaÅ¡e kosmická loÄ má již plný poÄet sluneÄnÃch modulů!"
msgid "Without guidance from the capital, the %s spaceship is lost!"
msgstr "Bez navádÄ›nà z hlavnÃho mÄ›sta je %s kosmická loÄ ztracena!"
-#: server/srv_main.c:240
+#: server/srv_main.c:242
msgid "Game ended in a draw as end year exceeded"
msgstr "Hra skonÄila remÃzou jako na konci roku"
-#: server/srv_main.c:274
+#: server/srv_main.c:276
#, c-format
msgid "The %s spaceship has arrived at Alpha Centauri."
msgstr "Kosmická loÄ %s dorazila na Alfu Centauri."
-#: server/srv_main.c:287 server/srv_main.c:322
+#: server/srv_main.c:289 server/srv_main.c:324
#, c-format
msgid "Team victory to %s"
msgstr "Týmové vÃtÄ›zstvà pro %s"
-#: server/srv_main.c:297 server/srv_main.c:338
+#: server/srv_main.c:299 server/srv_main.c:340
#, c-format
msgid "Game ended in victory for %s"
msgstr "Hra skonÄila vÃtÄ›zstvÃm pro %s"
-#: server/srv_main.c:345
+#: server/srv_main.c:347
msgid "Game ended in a draw"
msgstr "Hra skonÄila remÃzou"
-#: server/srv_main.c:461 server/srv_main.c:472
+#: server/srv_main.c:465 server/srv_main.c:476
#, c-format
msgid "Your %s was disbanded in accordance with your peace treaty with the %s."
msgstr ""
-#: server/srv_main.c:512 server/srv_main.c:516
+#: server/srv_main.c:516 server/srv_main.c:520
#, c-format
msgid ""
"Concerned citizens point out that the cease-fire with %s will run out soon."
msgstr "obyvatelé upozorňujÃ, že pÅ™Ãměřà s %s brzy skonÄÃ."
-#: server/srv_main.c:521 server/srv_main.c:525
+#: server/srv_main.c:525 server/srv_main.c:529
#, fuzzy, c-format
msgid "The cease-fire with %s has run out. You are now at war with the %s."
msgstr "PÅ™Ãměřà s %s skonÄilo. K %s jste nynà neutrálnÃ."
-#: server/srv_main.c:542
+#: server/srv_main.c:546
#, fuzzy, c-format
msgid ""
"Ceasefire between %s and %s has run out. They are at war. You cancel your "
@@ -5349,344 +5378,334 @@ msgid ""
msgstr ""
"Váš týmový spoluhrÃ¡Ä %s vyhlásil válku %s. Jsme povinni zruÅ¡it alianci s %s."
-#: server/srv_main.c:961
+#: server/srv_main.c:997
#, c-format
msgid "Failed saving game as %s"
msgstr "Nepodařilo se uložit hru jako %s"
-#: server/srv_main.c:963
+#: server/srv_main.c:999
#, c-format
msgid "Game saved as %s"
msgstr "Hra uložena jako %s"
-#: server/srv_main.c:994
+#: server/srv_main.c:1030
msgid "The game is already running."
msgstr "Hra již probÃhá."
-#: server/srv_main.c:1002
+#: server/srv_main.c:1038
#, c-format
msgid "%s lost control cmdlevel on game start. Use voting from now on."
msgstr ""
-#: server/srv_main.c:1009
+#: server/srv_main.c:1045
msgid "Starting game."
msgstr "Zahajuji hru."
-#: server/srv_main.c:1071
+#: server/srv_main.c:1112
#, c-format
msgid "request for unknown report (type %d)"
msgstr "požadavek pro neznámé hlášenà (typ %d)"
-#: server/srv_main.c:1136
+#: server/srv_main.c:1177
#, c-format
msgid "Warning: rejecting old client %s"
msgstr "UpozornÄ›nÃ: odmÃtnut starý klient %s"
-#: server/srv_main.c:1238
+#: server/srv_main.c:1279
#, 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:1338
+#: server/srv_main.c:1381
msgid "Please choose a non-blank name."
msgstr "ProsÃm zvolte si neprázdné jméno."
-#: server/srv_main.c:1354
+#: server/srv_main.c:1397
msgid "That nation is already in use."
msgstr "Tento národ je již použit."
-#: server/srv_main.c:1370
+#: server/srv_main.c:1413
#, 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:1391
+#: server/srv_main.c:1434
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:1490
+#: server/srv_main.c:1533
#, c-format
msgid "%s nation is not available in this scenario."
msgstr ""
-#: server/srv_main.c:1496
+#: server/srv_main.c:1539
#, c-format
msgid "%s nation is already in use."
msgstr "%s národ je již použit."
-#: server/srv_main.c:1514
+#: server/srv_main.c:1557
#, c-format
msgid "%s is the %s ruler %s."
msgstr "%s je %s vládce %s."
-#: server/srv_main.c:1570
+#: server/srv_main.c:1613
#, 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:1614 server/srv_main.c:1618
+#: server/srv_main.c:1657 server/srv_main.c:1661
#, 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:1760
+#: server/srv_main.c:1803
#, c-format
msgid "Player %d"
msgstr "HrÃ¡Ä %d"
-#: server/srv_main.c:1771 server/srv_main.c:1777
+#: server/srv_main.c:1814 server/srv_main.c:1820
#, c-format
msgid "%s rules the %s."
msgstr "%s vládne %s."
-#: server/srv_main.c:1942
+#: server/srv_main.c:1985
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
msgstr ""
-#: server/srv_main.c:1993
+#: server/srv_main.c:2037
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr "PosÃlám info metaserveru [%s]"
-#: server/srv_main.c:2024
+#: server/srv_main.c:2069
msgid "The game is over..."
msgstr "Hra je u konce..."
-#: server/srv_main.c:2237
+#: server/srv_main.c:2286
msgid "Now accepting new client connections."
msgstr "Nynà pÅ™ijÃmám spojenà od klientů."
-#: server/stdinhand.c:246
-#, c-format
-msgid "Vote \"%s\" is passed %d to %d with %d abstentions."
-msgstr "Hlasovánà \"%s\" prošlo %d ku %d a %d se zdrželo."
-
-#: server/stdinhand.c:253
-#, c-format
-msgid "Vote \"%s\" failed with %d against, %d for and %d abstentions."
-msgstr "Hlasovánà \"%s\" neprošlo s %d proti, %d pro a %d se zdrželo."
-
#. TRANS: ambiguous command
-#: server/stdinhand.c:365
+#: server/stdinhand.c:284
msgid "(ambiguous)"
msgstr "(nejednoznaÄný)"
#. TRANS: unrecognized command
#. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:416
+#: server/stdinhand.c:287 client/citydlg_common.c:419
#: 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 "(neznámý)"
-#: server/stdinhand.c:458
+#: server/stdinhand.c:377
msgid "Name is empty, so cannot be a player."
msgstr "Jméno je prázdné, takže se nemůže jednat o hráÄe."
-#: server/stdinhand.c:462
+#: server/stdinhand.c:381
msgid "Name is too long, so cannot be a player."
msgstr "Jméno je pÅ™ÃliÅ¡ dlouhé, takže se nemůže jednat o hráÄe."
-#: server/stdinhand.c:466
+#: server/stdinhand.c:385
#, c-format
msgid "Player name prefix '%s' is ambiguous."
msgstr "ZaÄátek jména hráÄe '%s' je nejednoznaÄný."
-#: server/stdinhand.c:470
+#: server/stdinhand.c:389
#, c-format
msgid "No player by the name of '%s'."
msgstr "Neexistuje žádný hrÃ¡Ä se jménem '%s'."
-#: server/stdinhand.c:474 server/stdinhand.c:509
+#: server/stdinhand.c:393 server/stdinhand.c:428
#, c-format
msgid "Unexpected match_result %d (%s) for '%s'."
msgstr "NeoÄekávaná hodnota match_result %d (%s) pro '%s'."
-#: server/stdinhand.c:493
+#: server/stdinhand.c:412
msgid "Name is empty, so cannot be a connection."
msgstr "Jméno je prázdné, takže se nemůže jednat o spojenÃ."
-#: server/stdinhand.c:497
+#: server/stdinhand.c:416
msgid "Name is too long, so cannot be a connection."
msgstr "Jméno je pÅ™ÃliÅ¡ dlouhé, takže se nemůže jednat o spojenÃ."
-#: server/stdinhand.c:501
+#: server/stdinhand.c:420
#, c-format
msgid "Connection name prefix '%s' is ambiguous."
msgstr "ZaÄátek jména spojenà '%s' je nejednoznaÄný."
-#: server/stdinhand.c:505
+#: server/stdinhand.c:424
#, c-format
msgid "No connection by the name of '%s'."
msgstr "Neexistuje žádné spojenà se jménem '%s'."
-#: server/stdinhand.c:525
+#: server/stdinhand.c:444
#, c-format
msgid "Open metaserver connection to [%s]."
msgstr "OtevÅ™Ãt metaserver spojenà k [%s]."
-#: server/stdinhand.c:538
+#: server/stdinhand.c:457
#, c-format
msgid "Close metaserver connection to [%s]."
msgstr "ZavÅ™Ãt metaserver spojenà k [%s]."
-#: server/stdinhand.c:553
+#: server/stdinhand.c:472
msgid "Metaserver connection is open."
msgstr "Spojenàs metaserverem je navázáno."
-#: server/stdinhand.c:556
+#: server/stdinhand.c:475
msgid "Metaserver connection is closed."
msgstr "Spojenà s metaserverem je ukonÄeno."
-#: server/stdinhand.c:566
+#: server/stdinhand.c:485
msgid "Metaserver connection is already open."
msgstr "Spojenàs metaserverem je již navázáno."
-#: server/stdinhand.c:577
+#: server/stdinhand.c:496
msgid "Metaserver connection is already closed."
msgstr "Spojenà s metaserverem je již ukonÄeno."
-#: server/stdinhand.c:582
+#: server/stdinhand.c:501
msgid "Argument must be 'u', 'up', 'd', 'down', or '?'."
msgstr "Argument musà být 'u', 'up', 'd', 'down' nebo '?'."
-#: server/stdinhand.c:603
+#: server/stdinhand.c:522
#, c-format
msgid "Metaserver patches string set to '%s'."
msgstr "Patches string metaserveru nastaven na '%s'."
-#: server/stdinhand.c:606
+#: server/stdinhand.c:525
#, c-format
msgid "Metaserver patches string set to '%s', not reporting to metaserver."
msgstr ""
"Patches string metaserveru nastaven na '%s', nebude se posÃlat metaserveru."
-#: server/stdinhand.c:627
+#: server/stdinhand.c:546
#, c-format
msgid "Metaserver message string set to '%s'."
msgstr "Message string metaserveru nastaven na '%s'."
-#: server/stdinhand.c:630
+#: server/stdinhand.c:549
#, c-format
msgid "Metaserver message string set to '%s', not reporting to metaserver."
msgstr ""
"Zprávový string metaserveru nastaven na '%s', nebude se posÃlat metaserveru."
-#: server/stdinhand.c:650
+#: server/stdinhand.c:569
#, c-format
msgid "Metaserver is now [%s]."
msgstr "Metaserver je nynà [%s]."
-#: server/stdinhand.c:660
+#: server/stdinhand.c:579
#, c-format
msgid "Server id: %s"
msgstr "Server id: %s"
-#: server/stdinhand.c:757
+#: server/stdinhand.c:676
#, fuzzy
msgid "You cannot save games manually on this server."
msgstr "PÅ™eruÅ¡Ã hru a ukonÄà Äinnost serveru."
-#: server/stdinhand.c:774
+#: server/stdinhand.c:693
msgid "Cannot toggle a barbarian player."
msgstr "Nelze pÅ™epnout na hráÄe barbara."
-#: server/stdinhand.c:781
+#: server/stdinhand.c:700
#, c-format
msgid "%s is now under AI control."
msgstr "%s nynà ovládá poÄÃtaÄ."
-#: server/stdinhand.c:802
+#: server/stdinhand.c:721
#, c-format
msgid "%s is now under human control."
msgstr "%s je nynà ovládán ÄlovÄ›kem."
-#: server/stdinhand.c:847
+#: server/stdinhand.c:766
msgid "Can't add AI players once the game has begun."
msgstr "Po zaÄátku hry již nelze pÅ™idávat poÄÃtaÄové hráÄe."
-#: server/stdinhand.c:867
+#: server/stdinhand.c:786
msgid "Can't add more players, server is full."
msgstr "Server je plný, nelze pÅ™idávat dalÅ¡Ã hráÄe."
-#: server/stdinhand.c:874
+#: server/stdinhand.c:793
msgid "Can't use an empty name."
msgstr "Nelze použÃt prázdné jméno."
-#: server/stdinhand.c:881
+#: server/stdinhand.c:800
#, c-format
msgid "That name exceeds the maximum of %d chars."
msgstr "Jméno je delÅ¡Ã než maximálnà poÄet znaků %d."
-#: server/stdinhand.c:887
+#: server/stdinhand.c:806
msgid "That name is not allowed."
msgstr "Toto jméno nenà povoleno."
-#: server/stdinhand.c:893
+#: server/stdinhand.c:812
msgid "A player already exists by that name."
msgstr "HrÃ¡Ä s tÃmto jménem již existuje."
-#: server/stdinhand.c:899
+#: server/stdinhand.c:818
msgid "A user already exists by that name."
msgstr "HrÃ¡Ä s tÃmto jménem již existuje."
-#: server/stdinhand.c:925
+#: server/stdinhand.c:844
#, c-format
msgid "%s has been added as an AI-controlled player."
msgstr "%s byl pÅ™idán jako poÄÃtaÄem ovládaný hráÄ."
-#: server/stdinhand.c:932
+#: server/stdinhand.c:851
#, c-format
msgid "Error creating new AI player: %s."
msgstr "Chyba vytvoÅ™enà nového poÄÃtaÄem ovládaného hráÄe: %s."
-#: server/stdinhand.c:966
+#: server/stdinhand.c:885
msgid "Players cannot be removed once the game has started."
msgstr "Po zaÄátku hry již nelze odstraňovat hráÄe."
-#: server/stdinhand.c:977
+#: server/stdinhand.c:896
#, c-format
msgid "Removed player %s from the game."
msgstr "HrÃ¡Ä %s byl odstranÄ›n ze hry."
-#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
+#: server/stdinhand.c:935 server/stdinhand.c:3372 server/stdinhand.c:3507
#, c-format
msgid "Name \"%s\" disallowed for security reasons."
msgstr ""
-#: server/stdinhand.c:1029
+#: server/stdinhand.c:948
#, fuzzy, c-format
msgid "No command script found by the name \"%s\"."
msgstr "Neexistuje žádné spojenà se jménem '%s'."
-#: server/stdinhand.c:1037
+#: server/stdinhand.c:956
#, c-format
msgid "Loading script file: %s"
msgstr "Nahrávám soubor se skriptem: %s"
-#: server/stdinhand.c:1052
+#: server/stdinhand.c:971
#, c-format
msgid "Cannot read command line scriptfile '%s'."
msgstr "Nelze pÅ™eÄÃst soubor skriptu '%s' uvedený v pÅ™Ãkazové řádce."
-#: server/stdinhand.c:1054
+#: server/stdinhand.c:973
#, c-format
msgid "Could not read script file '%s'."
msgstr "Nelze pÅ™eÄÃst soubor skriptu '%s'."
-#: server/stdinhand.c:1146
+#: server/stdinhand.c:1065
#, c-format
msgid "Could not write script file '%s'."
msgstr "Nelze zapisovat do souboru skriptu '%s'."
-#: server/stdinhand.c:1158
+#: server/stdinhand.c:1077
msgid "You cannot use the write command on this server for security reasons."
msgstr ""
-#: server/stdinhand.c:1186
+#: server/stdinhand.c:1105
#, c-format
msgid ""
"Cannot decrease command access level '%s' for connection '%s'; you only have "
@@ -5695,313 +5714,382 @@ msgstr ""
"Nelze snÞit pÅ™Ãkazovou pÅ™Ãstupovou úroveň '%s' pro spojenà '%s'; máte pouze "
"'%s'."
-#: server/stdinhand.c:1241
+#: server/stdinhand.c:1114
+#, 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:1163
#, fuzzy, c-format
msgid ""
"Anyone can now become game organizer '%s' by issuing the 'first' command."
msgstr ""
"Kdokoliv může nynà zÃskat úroveň oprávnÄ›nà '%s' pomocà pÅ™Ãkazu 'firstlevel'."
-#: server/stdinhand.c:1274
+#: server/stdinhand.c:1187
msgid "Command access levels in effect:"
msgstr "Platné úrovnÄ› oprávnÄ›nÃ:"
-#: server/stdinhand.c:1282
+#: server/stdinhand.c:1194
#, c-format
msgid "Command access level for new connections: %s"
msgstr "Úroveň oprávnÄ›nà pro nová spojenÃ: %s"
-#: server/stdinhand.c:1285
+#: server/stdinhand.c:1197
#, c-format
msgid "Command access level for first player to take it: %s"
msgstr "Úroveň oprávnÄ›nà pro prvnÃho hráÄe, který o nà požádá: %s"
-#: server/stdinhand.c:1294
+#: server/stdinhand.c:1206
msgid ""
"Error: command access level must be one of 'none', 'info', 'ctrl', or 'hack'."
msgstr "Chyba: úroveň oprávněnà musà být 'none', 'info', 'ctrl' nebo 'hack'."
-#: server/stdinhand.c:1299
+#: server/stdinhand.c:1211
#, c-format
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: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: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:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
+#: server/stdinhand.c:1238 server/stdinhand.c:1252 server/stdinhand.c:1273
#, 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:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
+#: server/stdinhand.c:1243 server/stdinhand.c:1257 server/stdinhand.c:1267
#, 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:1402
+#: server/stdinhand.c:1302
#, 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:1406
+#: server/stdinhand.c:1306
#, 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:1411
+#: server/stdinhand.c:1311
#, fuzzy
msgid "Someone else already is game organizer."
msgstr "NÄ›kdo dalÅ¡Ã má pÅ™Ãkazovou pÅ™Ãstupovou úroveň '%s' nebo lepÅ¡Ã."
-#: server/stdinhand.c:1416
+#: server/stdinhand.c:1316
#, c-format
msgid "Connection %s has opted to become the game organizer."
msgstr ""
-#: server/stdinhand.c:1467
+#: server/stdinhand.c:1367
#, c-format
msgid "Invalid argument %d."
msgstr "Neplatný argument %d."
-#: server/stdinhand.c:1474
+#: server/stdinhand.c:1374
msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
msgstr "PoužitÃ: timeoutincrease <poÄet> <hodnota> <pÅ™Ãrůstek> <násobek>."
-#: server/stdinhand.c:1482
+#: server/stdinhand.c:1382
#, 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:1542 server/stdinhand.c:1545
+#: server/stdinhand.c:1442 server/stdinhand.c:1445
msgid "Option:"
msgstr "Volba:"
-#: server/stdinhand.c:1555 server/stdinhand.c:4031
+#: server/stdinhand.c:1455 server/stdinhand.c:4079
msgid "Description:"
msgstr "Popis:"
-#: server/stdinhand.c:1560
+#: server/stdinhand.c:1460
#, c-format
msgid "Status: %s"
msgstr "Stav: %s"
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "changeable"
msgstr "změnitelné"
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "fixed"
msgstr "neměnné"
-#: server/stdinhand.c:1567
+#: server/stdinhand.c:1467
#, c-format
msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
msgstr "Hodnota: %d, Minimum: 0, VýchozÃ: %d, Maximum: 1"
-#: server/stdinhand.c:1572
+#: server/stdinhand.c:1472
#, c-format
msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
msgstr "Hodnota: %d, Minimum: %d, VýchozÃ: %d, Maximum: %d"
-#: server/stdinhand.c:1578
+#: server/stdinhand.c:1478
#, c-format
msgid "Value: \"%s\", Default: \"%s\""
msgstr "Hodnota: \"%s\", VýchozÃ: \"%s\""
-#: server/stdinhand.c:1597
+#: server/stdinhand.c:1497
msgid "Explanations are available for the following server options:"
msgstr "Pro následujÃcà volby serveru je dostupné vysvÄ›tlenÃ:"
-#: server/stdinhand.c:1643
+#: server/stdinhand.c:1537
msgid "No explanation for that yet."
msgstr "ZatÃm bez vysvÄ›tlenÃ."
-#: server/stdinhand.c:1646 server/stdinhand.c:2480
+#: server/stdinhand.c:1540 server/stdinhand.c:2468
msgid "Ambiguous option name."
msgstr "NejednoznaÄné jméno volby."
-#: server/stdinhand.c:1666
+#: server/stdinhand.c:1560
#, c-format
msgid "Server Operator: %s"
msgstr "Operátor serveru: %s"
-#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
+#: server/stdinhand.c:1686 server/stdinhand.c:1713 server/stdinhand.c:1731
#, 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:1822
+#: server/stdinhand.c:1718
#, c-format
msgid "%s is not controlled by the AI."
msgstr "%s nenà poÄÃtaÄem ovládaný hráÄ."
-#: server/stdinhand.c:1842
+#: server/stdinhand.c:1738
#, c-format
msgid "Default AI skill level set to '%s'."
msgstr "Výchozà schopnosti umělé inteligence nastaveny na '%s'."
-#: server/stdinhand.c:1857 server/stdinhand.c:2162
+#: server/stdinhand.c:1753
msgid "This command is client only."
msgstr "Tento pÅ™Ãkaz je pouze pro klienta."
-#: server/stdinhand.c:1860
+#: server/stdinhand.c:1756
msgid "Usage: away"
msgstr "PoužitÃ: away"
-#: server/stdinhand.c:1865
+#: server/stdinhand.c:1761
msgid "Only players may use the away command."
msgstr "Pouze hráÄi mohou použÃt pÅ™Ãkaz away."
-#: server/stdinhand.c:1869
+#: server/stdinhand.c:1765
#, c-format
msgid "%s set to away mode."
msgstr "%s se nastavil na away mód."
-#: server/stdinhand.c:1877
+#: server/stdinhand.c:1772
#, c-format
msgid "%s returned to game."
msgstr "%s se vrátil(a) do hry."
-#: server/stdinhand.c:1919
+#: server/stdinhand.c:1817
#, 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:1925
+#: server/stdinhand.c:1823
#, c-format
msgid "Unknown option '%s'."
msgstr "Neznámá volba '%s'."
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1848
#, fuzzy
msgid "All options with non-default values"
msgstr "= znamená, že volba má svou výchozà hodnotu"
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1851
msgid "All options"
msgstr "Všechny možnosti"
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1854
msgid "Vital options"
msgstr "RozhodujÃcà možnosti"
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1857
msgid "Situational options"
msgstr "SituaÄnà možnosti"
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1860
msgid "Rarely used options"
msgstr "ZÅ™Ãdka použÃvané možnosti"
-#: server/stdinhand.c:1965
+#: server/stdinhand.c:1863
msgid "+ means you may change the option"
msgstr "+ znamená, že můžete volbu změnit"
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1864
msgid "= means the option is on its default value"
msgstr "= znamená, že volba má svou výchozà hodnotu"
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
#, c-format
msgid "%-*s value (min,max) "
msgstr "%-*s hodnota (min,max) "
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
msgid "Option"
msgstr "Volba"
-#: server/stdinhand.c:1973
+#: server/stdinhand.c:1871
msgid "description"
msgstr "popis"
-#: server/stdinhand.c:2042
+#: server/stdinhand.c:1940
#, 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:2092
+#: server/stdinhand.c:1966
msgid "Cannot change teams once game has begun."
msgstr "Nelze měnit týmy po spuštěnà hry."
-#: server/stdinhand.c:2102
+#: server/stdinhand.c:1976
#, fuzzy
msgid "Undefined argument. Usage: team <player> <team>."
msgstr "Nedefinovaný argument. PoužitÃ: team <hráÄ> [tým]."
-#: server/stdinhand.c:2122
+#: server/stdinhand.c:1996
#, c-format
msgid "No such team %s. Please give a valid team name or number."
msgstr ""
-#: server/stdinhand.c:2129
+#: server/stdinhand.c:2003
msgid "Cannot team a barbarian."
msgstr "Nelze být v týmu s barbary."
-#: server/stdinhand.c:2135
+#: server/stdinhand.c:2009
#, c-format
msgid "Player %s set to team %s."
msgstr "HrÃ¡Ä %s je v týmu %s."
-#: 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:2035 server/voting.c:512
+#, fuzzy
+msgid "Teamvote"
+msgstr "Tým"
-#: server/stdinhand.c:2165
-msgid "Observers cannot vote."
-msgstr "Pozorovatelé nemohou hlasovat."
+#: server/stdinhand.c:2035 server/voting.c:516
+msgid "Vote"
+msgstr ""
-#: server/stdinhand.c:2168
+#: server/stdinhand.c:2037
+#, c-format
msgid ""
-"You can only vote in a running game. Use 'first' to become the game "
-"organizer if there currently is none."
+"%s %d \"%s\" (needs %0.0f%%%s): %d for, %d against, and %d abstained out of %"
+"d players."
msgstr ""
-#: 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:2041
+msgid " no dissent"
+msgstr ""
-#: server/stdinhand.c:2188
+#: server/stdinhand.c:2049
msgid "There are no votes going on."
msgstr "NeprobÃhá žádné hlasovanÃ."
-#: server/stdinhand.c:2208
-msgid "No legal last vote."
+#: server/stdinhand.c:2077
+#, fuzzy
+msgid "Invalid arguments. Usage: vote yes|no|abstain [vote number]."
+msgstr "Nedefinované argumenty. PoužitÃ: vote yes|no [vote ÄÃslo]."
+
+#: server/stdinhand.c:2095 server/stdinhand.c:2213 server/stdinhand.c:3714
+msgid "You are not allowed to use this command."
+msgstr "Nemáte povoleno použÃvat tento pÅ™Ãkaz."
+
+#: server/stdinhand.c:2104
+#, fuzzy, c-format
+msgid "The argument \"%s\" is ambigious."
+msgstr "Argument '%s' pÅ™Ãkazu help je nejednoznaÄný."
+
+#: server/stdinhand.c:2119
+#, fuzzy
+msgid "There are no votes running."
+msgstr "NeprobÃhá žádné hlasovanÃ."
+
+#: server/stdinhand.c:2121
+#, fuzzy, c-format
+msgid "No legal last vote (%d %s)."
msgstr "Žádné pÅ™edchozà platné hlasovánÃ."
-#: server/stdinhand.c:2213
-msgid "Value must be integer."
+#: server/stdinhand.c:2122
+msgid "other vote running"
+msgid_plural "other votes running"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: server/stdinhand.c:2129 server/stdinhand.c:2491 server/stdinhand.c:2532
+msgid "Value must be an integer."
msgstr "Hodnota musà být celé ÄÃslo."
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2135 server/stdinhand.c:2221
#, c-format
msgid "No such vote (%d)."
msgstr "Žádné hlasovánà (%d)."
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2141
+#, fuzzy
+msgid "You are not allowed to vote on that."
+msgstr "Nemáte povoleno měnit tuto volbu."
+
+#: server/stdinhand.c:2146
#, c-format
msgid "You voted for \"%s\""
msgstr "Zvolili jste \"%s\"."
-#: server/stdinhand.c:2232
+#: server/stdinhand.c:2150
#, c-format
msgid "You voted against \"%s\""
msgstr "Hlasoval jsi proti \"%s\""
-#: server/stdinhand.c:2259
+#: server/stdinhand.c:2155
+#, c-format
+msgid "You abstained from voting on \"%s\""
+msgstr ""
+
+#: server/stdinhand.c:2190
+msgid "Missing argument <vote number> or the string \"all\"."
+msgstr ""
+
+#: server/stdinhand.c:2197
+#, fuzzy
+msgid "You don't have any vote going on."
+msgstr "Nemáte zde žádného dÄ›lnÃka."
+
+#: server/stdinhand.c:2204
+#, fuzzy
+msgid "There isn't any vote going on."
+msgstr "NeprobÃhá žádné hlasovanÃ."
+
+#: server/stdinhand.c:2209
+msgid "Server: All votes have been removed."
+msgstr ""
+
+#: server/stdinhand.c:2226
+#, fuzzy, c-format
+msgid "You are not allowed to cancel this vote (%d)."
+msgstr "Nemáte povoleno měnit tuto volbu."
+
+#: server/stdinhand.c:2232
+msgid "Usage: /cancelvote [<vote number>|all]"
+msgstr ""
+
+#: server/stdinhand.c:2241
+#, c-format
+msgid "Server: %s cancelled the vote \"%s\" (number %d)."
+msgstr ""
+
+#: server/stdinhand.c:2247
+#, c-format
+msgid "Server: The vote \"%s\" (number %d) has been cancelled."
+msgstr ""
+
+#: server/stdinhand.c:2265
#, fuzzy
msgid ""
"Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
@@ -6010,131 +6098,127 @@ msgstr ""
"Nedefinované argumenty. PoužitÃ: debug <player <player> | city <x> <y> | "
"units <x> <y> | unit <id>>."
-#: server/stdinhand.c:2265
+#: server/stdinhand.c:2271
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:2294
+#: server/stdinhand.c:2300
#, c-format
msgid "%s diplomacy no longer debugged"
msgstr "%s dipolomacie se již neladÃ"
-#: server/stdinhand.c:2298
+#: server/stdinhand.c:2304
#, c-format
msgid "%s diplomacy debugged"
msgstr "%s diplomacie se ladÃ"
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2323
#, c-format
msgid "%s tech no longer debugged"
msgstr "%s technologie se již neladÃ"
-#: server/stdinhand.c:2321
+#: server/stdinhand.c:2327
#, c-format
msgid "%s tech debugged"
msgstr "%s technologie se ladÃ"
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2358 server/stdinhand.c:2388
msgid "Value 2 & 3 must be integer."
msgstr "Hodnota 2 a 3 musà být celé ÄÃslo."
-#: server/stdinhand.c:2356 server/stdinhand.c:2386
+#: server/stdinhand.c:2362 server/stdinhand.c:2392
msgid "Bad map coordinates."
msgstr "Špatné koordináty mapy."
-#: server/stdinhand.c:2361
+#: server/stdinhand.c:2367
msgid "No city at this coordinate."
msgstr "Na těchto koordinátech nenà město."
-#: server/stdinhand.c:2366
+#: server/stdinhand.c:2372
#, c-format
msgid "%s no longer debugged"
msgstr "%s se již neladÃ"
-#: server/stdinhand.c:2392 server/stdinhand.c:2422
+#: server/stdinhand.c:2398 server/stdinhand.c:2428
#, fuzzy, c-format
msgid "%s %s no longer debugged."
msgstr "%s %s se již neladÃ."
-#: server/stdinhand.c:2397 server/stdinhand.c:2427
+#: server/stdinhand.c:2403 server/stdinhand.c:2433
#, fuzzy, c-format
msgid "%s %s debugged."
msgstr "%s %s se ladÃ."
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2419
msgid "Value 2 must be integer."
msgstr "Hodnota 2 musà být celé ÄÃslo."
-#: server/stdinhand.c:2417
+#: server/stdinhand.c:2423
#, c-format
msgid "Unit %d does not exist."
msgstr "Jednotka %d neexistuje."
-#: server/stdinhand.c:2475
+#: server/stdinhand.c:2464
msgid "Undefined argument. Usage: set <option> <value>."
msgstr "Nedefinovaný argument. PoužitÃ: set <volba> <hodnota>."
-#: server/stdinhand.c:2485
+#: server/stdinhand.c:2473
msgid "You are not allowed to set this option."
msgstr "Nemáte povoleno měnit tuto volbu."
-#: server/stdinhand.c:2490 server/stdinhand.c:3463
+#: server/stdinhand.c:2478 server/stdinhand.c:3501
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:2502 server/stdinhand.c:2543
-msgid "Value must be an integer."
-msgstr "Hodnota musà být celé ÄÃslo."
-
-#: server/stdinhand.c:2512
+#: server/stdinhand.c:2501
#, c-format
msgid "The parameter %s should only contain digits 0-1."
msgstr ""
-#: server/stdinhand.c:2519
+#: server/stdinhand.c:2508
msgid "Value out of range (minimum: 0, maximum: 1)."
msgstr "Hodnota mimo rozsah (minimum: 0, maximum: 1)."
-#: server/stdinhand.c:2534 server/stdinhand.c:2576
+#: server/stdinhand.c:2523 server/stdinhand.c:2565
#, c-format
msgid "Option: %s has been set to %d."
msgstr "Volba: %s byla nastavena na %d."
-#: server/stdinhand.c:2554
+#: server/stdinhand.c:2543
#, c-format
msgid "The parameter %s should only contain +- and 0-9."
msgstr ""
-#: server/stdinhand.c:2561
+#: server/stdinhand.c:2550
#, c-format
msgid "Value out of range (minimum: %d, maximum: %d)."
msgstr "Hodnota mimo rozsah (minimum: %d, maximum: %d)."
-#: server/stdinhand.c:2586
+#: server/stdinhand.c:2575
msgid "String value too long. Usage: set <option> <value>."
msgstr "Textová hodnota je pÅ™ÃliÅ¡ dlouhá. PoužitÃ: set <volba> <hodnota>."
-#: server/stdinhand.c:2600
+#: server/stdinhand.c:2589
#, c-format
msgid "Option: %s has been set to \"%s\"."
msgstr "Volba: %s byla nastavena na \"%s\"."
-#: server/stdinhand.c:2658
+#: server/stdinhand.c:2652
msgid "Sorry, one can't observe globally in this game."
msgstr "Lituji, ale nikdo nemůže pozorovat celou hru."
-#: server/stdinhand.c:2661
+#: server/stdinhand.c:2655
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:2671
+#: server/stdinhand.c:2665
#, 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
+#: server/stdinhand.c:2673
#, c-format
msgid ""
"You cannot take a new player because the maximum of %d player has already "
@@ -6146,73 +6230,73 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: server/stdinhand.c:2691
+#: server/stdinhand.c:2685
msgid "You cannot take a new player because there are no free player slots."
msgstr ""
-#: server/stdinhand.c:2702
+#: server/stdinhand.c:2696
msgid "Sorry, one can't observe barbarians in this game."
msgstr "Lituji, žádné pozorovánà barbarů v této hře."
-#: server/stdinhand.c:2705
+#: server/stdinhand.c:2699
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:2713
+#: server/stdinhand.c:2707
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:2716
+#: server/stdinhand.c:2710
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:2724
+#: server/stdinhand.c:2718
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:2727
+#: server/stdinhand.c:2721
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:2736
+#: server/stdinhand.c:2730
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:2739
+#: server/stdinhand.c:2733
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:2749
+#: server/stdinhand.c:2743
msgid "Sorry, one can't observe in this game."
msgstr "Lituji, nelze pozorovat v této hře."
-#: server/stdinhand.c:2754
+#: server/stdinhand.c:2748
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:2760
+#: server/stdinhand.c:2754
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:2791
+#: server/stdinhand.c:2785
msgid "Usage: observe [connection-name [player-name]]"
msgstr "PoužitÃ: observe [název-spojenà [jméno-hráÄe]]"
-#: server/stdinhand.c:2797
+#: server/stdinhand.c:2791
msgid "Usage: observe [player-name]"
msgstr "PoužitÃ: observe [jméno-hráÄe]"
-#: server/stdinhand.c:2847
+#: server/stdinhand.c:2841
#, 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:2858
+#: server/stdinhand.c:2852
#, c-format
msgid "%s is already observing %s."
msgstr "%s již pozoruje %s."
-#: server/stdinhand.c:2863
+#: server/stdinhand.c:2857
#, c-format
msgid "%s is already observing."
msgstr "%s již pozoruje."
@@ -6227,237 +6311,242 @@ msgstr "%s nynà pozoruje %s"
msgid "%s now observes"
msgstr "%s nynà pozoruje"
-#: server/stdinhand.c:2969
+#: server/stdinhand.c:2971
msgid "Usage: take <connection-name> <player-name>"
msgstr "PoužitÃ: take <název-pÅ™ipojenÃ> <jméno-hráÄe>"
-#: server/stdinhand.c:2974
+#: server/stdinhand.c:2976
msgid "Usage: take <player-name>"
msgstr "PoužitÃ: take <jméno-hráÄe>"
-#: server/stdinhand.c:2980
+#: server/stdinhand.c:2982
msgid "Usage: take [connection-name] <player-name>"
msgstr "PoužitÃ: take [název-spojenÃ] <jméno-hráÄe>"
-#: server/stdinhand.c:3010
+#: server/stdinhand.c:3012
#, fuzzy, c-format
msgid "%s already controls %s."
msgstr "%s již ovládá %s"
-#: server/stdinhand.c:3024
+#: server/stdinhand.c:3026
#, 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:3059
+#: server/stdinhand.c:3061
#, c-format
msgid "being detached from %s."
msgstr "byl odpojen od %s."
-#: server/stdinhand.c:3135
+#: server/stdinhand.c:3146
#, fuzzy, c-format
msgid "%s now controls %s (%s, %s)."
msgstr "%s nynà ovládá %s (%s, %s)"
-#: server/stdinhand.c:3139 server/stdinhand.c:4260
+#: server/stdinhand.c:3150 server/stdinhand.c:4308
#: data/nation/barbarian.ruleset:3
msgid "Barbarian"
msgstr "Barbar"
-#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
+#: server/stdinhand.c:3152 server/stdinhand.c:4310 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-sdl/plrdlg.c:645
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr "PoÄÃtaÄ"
-#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-gtk-2.0/pages.c:2125
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
+#: server/stdinhand.c:3153 server/stdinhand.c:4312
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-gtk-2.0/pages.c:2127
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/connectdlg.c:215
msgid "Human"
msgstr "Člověk"
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-gtk-2.0/pages.c:2124 client/gui-win32/connectdlg.c:200
-#: client/gui-win32/connectdlg.c:212
+#: server/stdinhand.c:3155 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-gtk-2.0/pages.c:2126 client/gui-win32/connectdlg.c:202
+#: client/gui-win32/connectdlg.c:214
msgid "Alive"
msgstr "AktivnÃ"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3156 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-win32/connectdlg.c:202
msgid "Dead"
msgstr "Mrtvý"
-#: server/stdinhand.c:3147
+#: server/stdinhand.c:3159
#, fuzzy, c-format
msgid "%s failed to attach to any player."
msgstr "%s nenà pÅ™ipojen k žádnému hráÄi."
-#: server/stdinhand.c:3182
+#: server/stdinhand.c:3194
msgid "Usage: detach <connection-name>"
msgstr "PoužitÃ: detach <jméno-spojenÃ>"
-#: server/stdinhand.c:3202
+#: server/stdinhand.c:3214
msgid "You can not detach other users."
msgstr "Nemůžete odpojit jiné hráÄe."
-#: server/stdinhand.c:3211
+#: server/stdinhand.c:3223
#, c-format
msgid "%s is not attached to any player."
msgstr "%s nenà pÅ™ipojen k žádnému hráÄi."
-#: server/stdinhand.c:3234
+#: server/stdinhand.c:3246
#, c-format
msgid "%s detaching from %s"
msgstr "%s se odpojuje od %s"
-#: server/stdinhand.c:3240
+#: server/stdinhand.c:3252
#, c-format
msgid "%s no longer observing."
msgstr "%s již nepozoruje."
-#: server/stdinhand.c:3259
+#: server/stdinhand.c:3271
#, c-format
msgid "detaching from %s."
msgstr "odpojovánà od %s."
-#: server/stdinhand.c:3345
+#: server/stdinhand.c:3361
#, fuzzy
msgid "Usage: load <game name>"
msgstr "PoužitÃ: load <jméno-souboru>"
-#: server/stdinhand.c:3350
+#: server/stdinhand.c:3366
#, fuzzy
msgid "Cannot load a game while another is running."
msgstr "Nelze nahrát hru, dokud jiná běžÃ."
-#: server/stdinhand.c:3372
+#: server/stdinhand.c:3388
#, c-format
msgid "Cannot find savegame or scenario with the name \"%s\"."
msgstr ""
-#: server/stdinhand.c:3389
+#: server/stdinhand.c:3405
#, fuzzy, c-format
msgid "Could not load savefile: %s"
msgstr "Nelze nahrát uložený soubor: %s"
-#: server/stdinhand.c:3458
+#: server/stdinhand.c:3496
#, c-format
msgid "Current ruleset directory is \"%s\""
msgstr "SouÄasný adresář s pravidly je: \"%s\""
-#: server/stdinhand.c:3478
+#: server/stdinhand.c:3516
#, c-format
msgid "Ruleset directory \"%s\" not found"
msgstr "Adresář s pravidly \"%s\" nebyl nalezen"
-#: server/stdinhand.c:3484
+#: server/stdinhand.c:3522
#, c-format
msgid "Ruleset directory is already \"%s\""
msgstr "Adresář s pravidly nastaven na \"%s\""
-#: server/stdinhand.c:3488
+#: server/stdinhand.c:3526
#, c-format
msgid "Ruleset directory set to \"%s\""
msgstr "Adresář s pravidly nastaven na \"%s\""
-#: server/stdinhand.c:3536
+#: server/stdinhand.c:3574
msgid "Goodbye."
msgstr "Neshledanou."
-#: server/stdinhand.c:3567
+#: server/stdinhand.c:3606
msgid "Sorry, you are not allowed to use server commands."
msgstr "Lituji, ale nemáte povoleno použÃvat pÅ™Ãkazy serveru."
-#: server/stdinhand.c:3603
+#: server/stdinhand.c:3656
#, 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:3608
+#: server/stdinhand.c:3661
#, c-format
msgid "Unknown command. Try '%shelp'."
msgstr "Neznamý pÅ™Ãkaz. Zkuste '%shelp'."
-#: server/stdinhand.c:3625
-msgid "Your new vote canceled your previous vote."
+#: server/stdinhand.c:3675
+#, fuzzy
+msgid "Your new vote cancelled your previous vote."
msgstr "Váš nový hlas zruÅ¡il vaÅ¡e pÅ™edchozà hlasovánÃ."
-#: server/stdinhand.c:3633
+#: server/stdinhand.c:3688
+msgid "New teamvote"
+msgstr ""
+
+#: server/stdinhand.c:3691
+msgid "New vote"
+msgstr ""
+
+#: server/stdinhand.c:3695
#, fuzzy, c-format
-msgid "New vote (number %d) by %s: %s."
+msgid "%s (number %d) by %s: %s"
msgstr "Nové hlasovánÃ, Ä. %d, od %s: %s."
-#: server/stdinhand.c:3645
+#: server/stdinhand.c:3704
#, c-format
msgid "Your new vote (\"%s\") was not legal or was not recognized."
msgstr ""
-#: 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:3680
+#: server/stdinhand.c:3726
msgid "(server prompt)"
msgstr "(prompt serveru)"
-#: server/stdinhand.c:3787
+#: server/stdinhand.c:3835
msgid "Game ended in a draw."
msgstr "Hra skonÄila remÃzou."
-#: server/stdinhand.c:3791
+#: server/stdinhand.c:3839
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:3796
+#: server/stdinhand.c:3844
msgid "Cannot end the game: no game running."
msgstr "Nelze ukonÄit hru: žádná hra neběžÃ."
-#: server/stdinhand.c:3812
+#: server/stdinhand.c:3860
#, c-format
msgid "%s has conceded the game and can no longer win."
msgstr ""
-#: server/stdinhand.c:3817
+#: server/stdinhand.c:3865
msgid "You cannot surrender now."
msgstr "Nynà nemůžete kapitulovat."
-#: server/stdinhand.c:3883
+#: server/stdinhand.c:3931
#, fuzzy
msgid "Not enough human players, game will not start."
msgstr "NedostateÄný poÄet hráÄů, hru nelze zahájit."
-#: server/stdinhand.c:3888
+#: server/stdinhand.c:3936
#, fuzzy
msgid "No players, game will not start."
msgstr "NedostateÄný poÄet hráÄů, hru nelze zahájit."
-#: server/stdinhand.c:3892
+#: server/stdinhand.c:3940
#, 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:3901
+#: server/stdinhand.c:3949
msgid "All players are ready; starting game."
msgstr "VÅ¡ichni hráÄi pÅ™ipraveni; startuji hru."
-#: server/stdinhand.c:3915
+#: server/stdinhand.c:3963
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:3922
+#: server/stdinhand.c:3970
msgid "Cannot start the game: it is already running."
msgstr "Nelze zahájit hru: hra již běžÃ."
-#: server/stdinhand.c:3953
+#: server/stdinhand.c:4001
#, c-format
msgid "Cutting connection %s."
msgstr "RuÅ¡Ãm spojenà s %s."
-#: server/stdinhand.c:3972
+#: server/stdinhand.c:4020
msgid ""
"Welcome - this is the introductory help text for the Freeciv server.\n"
"\n"
@@ -6495,77 +6584,77 @@ msgstr ""
" save - uložà aktuálnà hru\n"
" quit - ukonÄÃ program"
-#: server/stdinhand.c:4007 server/stdinhand.c:4010
+#: server/stdinhand.c:4055 server/stdinhand.c:4058
msgid "Command:"
msgstr "PÅ™Ãkaz:"
-#: server/stdinhand.c:4014
+#: server/stdinhand.c:4062
msgid "Synopsis: "
msgstr "PoužitÃ:"
-#: server/stdinhand.c:4023
+#: server/stdinhand.c:4071
#, c-format
msgid "Level: %s"
msgstr "Úroveň: %s"
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4096
msgid "The following server commands are available:"
msgstr "Server podporuje následujÃcà pÅ™Ãkazy:"
-#: server/stdinhand.c:4123
+#: server/stdinhand.c:4171
#, c-format
msgid "Help argument '%s' is ambiguous."
msgstr "Argument '%s' pÅ™Ãkazu help je nejednoznaÄný."
-#: server/stdinhand.c:4128
+#: server/stdinhand.c:4176
#, c-format
msgid "No match for help argument '%s'."
msgstr "PÅ™Ãkaz help nenalezl žádnou shodu pro argument '%s'."
-#: server/stdinhand.c:4194
+#: server/stdinhand.c:4242
#, c-format
msgid "Bad list argument: '%s'. Try '%shelp list'."
msgstr "Chybný argument '%s' pÅ™Ãkazu list. Zkuste '%s help list'."
-#: server/stdinhand.c:4234
+#: server/stdinhand.c:4282
msgid "List of players:"
msgstr "Seznam hráÄů:"
-#: server/stdinhand.c:4239
+#: server/stdinhand.c:4287
msgid "<no players>"
msgstr "<žádnà hráÄi>"
-#: server/stdinhand.c:4256
+#: server/stdinhand.c:4304
#, c-format
msgid "user %s, "
msgstr "uživatel %s, "
-#: server/stdinhand.c:4267
+#: server/stdinhand.c:4315
msgid ", Dead"
msgstr ", mrtvý"
-#: server/stdinhand.c:4270
+#: server/stdinhand.c:4318
#, 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:4275 server/stdinhand.c:4279 client/helpdata.c:257
-#: client/helpdata.c:752 client/text.c:241 client/text.c:1224
-#: client/text.c:1262
+#: server/stdinhand.c:4323 server/stdinhand.c:4327 client/helpdata.c:257
+#: client/helpdata.c:752 client/text.c:241 client/text.c:1229
+#: client/text.c:1267
#, c-format
msgid "?clistmore:, %s"
msgstr ", %s"
-#: server/stdinhand.c:4283
+#: server/stdinhand.c:4331
msgid ", ready"
msgstr ", připraven"
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4333
msgid ", not ready"
msgstr ", nepřipraven"
-#: server/stdinhand.c:4293
+#: server/stdinhand.c:4341
#, c-format
msgid " %d connection:"
msgid_plural " %d connections:"
@@ -6573,21 +6662,21 @@ msgstr[0] " %d spojenÃ:"
msgstr[1] " %d spojenÃ:"
msgstr[2] " %d spojenÃ:"
-#: server/stdinhand.c:4299
+#: server/stdinhand.c:4347
#, 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:4304
+#: server/stdinhand.c:4352
msgid " (observer mode)"
msgstr " (režim pozorovatele)"
-#: server/stdinhand.c:4322
+#: server/stdinhand.c:4370
msgid "List of teams:"
msgstr "Seznam týmů:"
#. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4332
+#: server/stdinhand.c:4380
#, c-format
msgid "%2d : '%s' : %d player"
msgid_plural "%2d : '%s' : %d players"
@@ -6595,25 +6684,25 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: server/stdinhand.c:4352
+#: server/stdinhand.c:4400
#, c-format
msgid "%2d : '%s' : 1 player : %s"
msgstr ""
-#: server/stdinhand.c:4360
+#: server/stdinhand.c:4408
#, c-format
msgid "Empty team: %s"
msgstr "Prázdný tým: %s"
-#: server/stdinhand.c:4371
+#: server/stdinhand.c:4419
msgid "List of connections to server:"
msgstr "Seznam spojenà k server:"
-#: server/stdinhand.c:4375
+#: server/stdinhand.c:4423
msgid "<no connections>"
msgstr "<žádná spojenÃ>"
-#: server/stdinhand.c:4399
+#: server/stdinhand.c:4447
#, fuzzy
msgid "List of scenarios available:"
msgstr "Žádné dostupné jednotky"
@@ -6633,44 +6722,44 @@ msgstr "%s zahájili stavbu %s ve městě %s."
msgid "%s acquired from %s!"
msgstr "%s zÃskali %s od %s."
-#: server/techtools.c:220
+#: server/techtools.c:221
#, c-format
msgid ""
"Discovery of %s makes the government form %s available. You may want to "
"start a revolution."
msgstr ""
-#: server/techtools.c:301
+#: server/techtools.c:302
#, c-format
msgid "Discovery of %s OBSOLETES %s in %s!"
msgstr ""
-#: server/techtools.c:351
+#: server/techtools.c:352
#, c-format
msgid "Learned %s. Our scientists focus on %s; goal is %s."
msgstr ""
-#: server/techtools.c:369
+#: server/techtools.c:370
#, c-format
msgid "Learned %s. Scientists choose to research %s."
msgstr ""
-#: server/techtools.c:376
+#: server/techtools.c:377
#, fuzzy, c-format
msgid "Learned %s. "
msgstr "poblÞ %s"
-#: server/techtools.c:379
+#: server/techtools.c:380
#, c-format
msgid "Researching %s."
msgstr "Zkoumá se %s."
-#: server/techtools.c:385
+#: server/techtools.c:386
#, c-format
msgid "Learned %s. Scientists do not know what to research next."
msgstr ""
-#: server/techtools.c:402
+#: server/techtools.c:403
#, fuzzy
msgid ""
"Great scientists from all the world join your civilization: you get an "
@@ -6679,22 +6768,22 @@ msgstr ""
"Velcà filozofové z celého svÄ›ta se pÅ™ipojili k naÅ¡Ã civilizaci: zÃskali jsme "
"novou technologii."
-#: server/techtools.c:570
+#: server/techtools.c:571
#, fuzzy, c-format
msgid "Technology goal is %s."
msgstr "Ve městě %s nebyla nalezena žádná nová technologie."
-#: server/techtools.c:700
+#: server/techtools.c:708
#, fuzzy, c-format
msgid "You steal %s from the %s."
msgstr "%s zÃskali %s od %s."
-#: server/techtools.c:705
+#: server/techtools.c:713
#, c-format
msgid "The %s stole %s from you!"
msgstr ""
-#: server/techtools.c:710
+#: server/techtools.c:718
#, fuzzy, c-format
msgid "The %s have stolen %s from the %s."
msgstr "%s zÃskali %s od %s."
@@ -6718,155 +6807,161 @@ msgstr "Žádné jednotky nemohou být vylepšeny."
msgid "%s upgraded to %s for %d gold."
msgstr "Jednotka %s vylepšena na %s za %d zlatých."
-#: server/unithand.c:396
+#: server/unithand.c:402
#, c-format
msgid "%s refuses to disband!"
msgstr "%s zamÃtli rozpuÅ¡tÄ›nÃ!"
-#: server/unithand.c:449
+#: server/unithand.c:455
msgid "Can't place city here."
msgstr "Zde nelze založit město."
-#: server/unithand.c:456
+#: server/unithand.c:462
#, c-format
msgid "Only %s can build a city."
msgstr "Pouze jednotky %s mohou založit město."
-#: server/unithand.c:461
+#: server/unithand.c:467
msgid "Can't build a city."
msgstr "Nelze založit město."
-#: server/unithand.c:470
+#: server/unithand.c:476
#, c-format
msgid "Only %s can add to a city."
msgstr "Pouze jednotky %s se mohou usadit ve městě."
-#: server/unithand.c:475
+#: server/unithand.c:481
msgid "Can't add to a city."
msgstr "Nelze se usadit ve městě."
-#: server/unithand.c:481
+#: server/unithand.c:487
#, c-format
msgid "%s unit has no moves left to add to %s."
msgstr "Jednotce %s nezbývajà tahy na usazenà ve městě %s."
-#: server/unithand.c:487
+#: server/unithand.c:493
#, c-format
msgid "%s unit has no moves left to build city."
msgstr "Jednotce %s nezbývajà tahy na založenà města."
-#: server/unithand.c:492
+#. TRANS: <city> is owned by <nation>, cannot add <unit>.
+#: server/unithand.c:499
+#, fuzzy, c-format
+msgid "%s is owned by %s, cannot add %s."
+msgstr "MÄ›sto %s je pÅ™ÃliÅ¡ veliké pro usazenà jednotky %s."
+
+#: server/unithand.c:506
#, c-format
msgid "%s is too big to add %s."
msgstr "MÄ›sto %s je pÅ™ÃliÅ¡ veliké pro usazenà jednotky %s."
-#: server/unithand.c:498
+#: server/unithand.c:512
#, c-format
msgid "%s needs an improvement to grow, so you cannot add %s."
msgstr ""
"MÄ›sto %s potÅ™ebuje vylepÅ¡enÃ, aby se mohlo rozrůstat a proto nemůžete pÅ™idat "
"%s."
-#: server/unithand.c:509
+#: server/unithand.c:523
#, c-format
msgid "Can't add %s to %s."
msgstr "Jednotka %s se nemůže usadit ve městě %s."
-#: server/unithand.c:531
+#: server/unithand.c:545
#, fuzzy, c-format
msgid "%s added to aid %s in growing."
msgstr "Jednotka %s se usadila ve městě %s."
-#: server/unithand.c:828
+#: server/unithand.c:842
msgid "Your Nuclear missile was shot down by SDI defences, what a waste."
msgstr "Vaše atomová střela byla sestřelena SDI obranou - jaká škoda."
-#: server/unithand.c:831
+#: server/unithand.c:845
#, c-format
msgid "The nuclear attack on %s was avoided by your SDI defense."
msgstr "Vaše SDI obrana zabránila atomovému útoku na město %s."
#. TRANS: "Your Cannon ... the Polish Destroyer."
-#: server/unithand.c:901
+#: server/unithand.c:915
#, fuzzy, c-format
msgid "Your %s survived the pathetic attack from the %s %s."
msgstr "Vaše %s přežila patetický útok %s %s."
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unithand.c:910
+#: server/unithand.c:924
#, fuzzy, c-format
msgid "Your attacking %s failed against the %s %s!"
msgstr "VaÅ¡e útoÄÃcà %s selhala proti %s %s!"
-#: server/unithand.c:983
+#: server/unithand.c:997
#, c-format
msgid "Only %s can attack from sea."
msgstr "Pouze %s může útoÄit z moÅ™e."
-#: server/unithand.c:988
+#: server/unithand.c:1002
msgid "Cannot attack from sea."
msgstr "Nelze útoÄit z moÅ™e."
-#: server/unithand.c:996 server/unittools.c:2137
+#: server/unithand.c:1010 server/unittools.c:2142
msgid "Cannot attack unless you declare war first."
msgstr "Nelze útoÄit dokud nevyhlásÃte válku."
-#: server/unithand.c:1001
+#: server/unithand.c:1015
#, c-format
msgid "%s can only move into your own zone of control."
msgstr "%s se může pohybovat jen v našich zónach kontroly."
-#: server/unithand.c:1007
+#: server/unithand.c:1021
#, fuzzy, c-format
msgid "Cannot invade unless you break peace with %s first."
msgstr "Nelze útoÄit dokud nevyhlásÃte válku."
-#: server/unithand.c:1052
+#: server/unithand.c:1066
msgid "This unit has no moves left."
msgstr "Této jednotce nezbývajà tahy pro přesun."
-#: server/unithand.c:1107
+#: server/unithand.c:1121
msgid "Unit must be on land to perform diplomatic action."
msgstr "Jednotka musà být na pevnině k provedenà diplomatické akce."
-#: server/unithand.c:1109
+#: server/unithand.c:1123
msgid "No diplomat action possible."
msgstr "Diplomatická akce nenà možná."
-#: server/unithand.c:1125
+#: server/unithand.c:1139
#, c-format
msgid "You must declare war on %s first. Try using players dialog (F3)."
msgstr ""
-#: server/unithand.c:1143
+#: server/unithand.c:1157
msgid "This unit is being transported, and so cannot bombard."
msgstr "Tato jednotka je transportována, takže nemůže bombardovat."
-#: server/unithand.c:1158
+#: server/unithand.c:1172
msgid "You can't attack there."
msgstr "Zde nemůžete útoÄit."
-#: server/unithand.c:1180
+#: server/unithand.c:1194
msgid "This type of troops cannot take over a city."
msgstr "Tento typ jednotek nemůže ovládnout město."
-#: server/unithand.c:1198
+#: server/unithand.c:1212
msgid "A transported unit is not allied to all units or city on target tile."
msgstr ""
"Transportovaná jednotka nenà spojenecká vůÄi vÅ¡em jednotkám nebo mÄ›stu v "
"cÃlové lokaci."
-#: server/unithand.c:1240
+#: server/unithand.c:1254
#, c-format
msgid "Your %s helps build the %s in %s (%d remaining)."
msgstr "Náš %s pomohl se stavbou %s v %s (%d zbývá)."
-#: server/unithand.c:1242
+#: server/unithand.c:1256
#, c-format
msgid "Your %s helps build the %s in %s (%d surplus)."
msgstr "Náš %s pomohl se stavbou %s v %s (%d přebytek)."
-#: server/unithand.c:1286
+#: server/unithand.c:1300
#, c-format
msgid ""
"Sorry, your %s cannot establish a trade route because it has no home city"
@@ -6874,27 +6969,27 @@ msgstr ""
"Lituji, ale jednotka %s nemůže založit obchodnà cestu, protože nemá domovské "
"město"
-#: server/unithand.c:1296
+#: server/unithand.c:1310
#, c-format
msgid "Sorry, your %s cannot establish a trade route between %s and %s"
msgstr "Lituji, ale jednotka %s nemůže založit obchodnà cestu mezi %s a %s"
-#: server/unithand.c:1325 server/unithand.c:1344
+#: server/unithand.c:1339 server/unithand.c:1358
#, c-format
msgid "Sorry, your %s cannot establish a trade route here!"
msgstr "Lituji, ale jednotka %s zde nemůže založit obchodnà cestu!"
-#: server/unithand.c:1329 server/unithand.c:1348
+#: server/unithand.c:1343 server/unithand.c:1362
#, c-format
msgid " The city of %s already has %d better trade routes!"
msgstr " Město %s již má %d lepšà obchodnà cesty!"
-#: server/unithand.c:1361 server/unithand.c:1373
+#: server/unithand.c:1375 server/unithand.c:1387
#, c-format
msgid "Sorry, %s has canceled the trade route from %s to your city %s."
msgstr "Lituji, %s zrušil obchodnà cestu z %s do Vašeho města %s."
-#: server/unithand.c:1406
+#: server/unithand.c:1420
#, c-format
msgid ""
"Your %s from %s has arrived in %s, and revenues amount to %d in gold and "
@@ -6955,55 +7050,55 @@ msgid "Teleported your %s to %s."
msgstr "Teleportována jednotka %s do %s."
#. TRANS: A unit is moved to resolve stack conflicts.
-#: server/unittools.c:1065
+#: server/unittools.c:1070
#, fuzzy, c-format
msgid "Moved your %s."
msgstr "Rozpuštěn náš %s."
-#: server/unittools.c:1076
+#: server/unittools.c:1081
#, c-format
msgid "Disbanded your %s."
msgstr "Rozpuštěn náš %s."
-#: server/unittools.c:1397
+#: server/unittools.c:1402
#, c-format
msgid "Unable to defend %s, %s has lost the game."
msgstr "Nelze bránit %s, %s prohrál hru."
-#: server/unittools.c:1401
+#: server/unittools.c:1406
#, c-format
msgid "Losing %s meant losing the game! Be more careful next time!"
msgstr "Ztráta %s znamená prohru ve hÅ™e! BuÄte pÅ™ÃÅ¡tÄ› vÃce opatrnÄ›jÅ¡Ã!"
-#: server/unittools.c:1503
+#: server/unittools.c:1508
#, c-format
msgid "%s escaped the destruction of %s, and fled to %s."
msgstr "Jednotka %s unikla pÅ™ed zniÄenÃm %s a stáhla se do %s."
-#: server/unittools.c:1512
+#: server/unittools.c:1517
#, c-format
msgid "%s lost when %s was lost."
msgstr "Jednotka %s ztracena spolu s jednotkou %s."
-#: server/unittools.c:1561
+#: server/unittools.c:1566
#, c-format
msgid "Barbarian leader captured, %d gold ransom paid."
msgstr "Vůdce barbarů byl zajat a prodán za výkupné %d zlatých."
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unittools.c:1579
+#: server/unittools.c:1584
#, fuzzy, c-format
msgid "Your attacking %s succeeded against the %s %s!"
msgstr "VaÅ¡e útoÄÃcà %s byla uspěšná proti %s %s!"
#. TRANS: "Cannon ... the Polish Destroyer."
-#: server/unittools.c:1588 server/unittools.c:1646
+#: server/unittools.c:1593 server/unittools.c:1651
#, fuzzy, c-format
msgid "%s lost to an attack by the %s %s."
msgstr "%s ztracena při útoku %s %s."
#. TRANS: "... Cannon ... the Polish Destroyer ...."
-#: server/unittools.c:1622
+#: server/unittools.c:1627
#, fuzzy, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -7014,14 +7109,14 @@ msgstr[2] "VaÅ¡e útoÄÃcà %s byla uspěšná proti %s %s!"
#. TRANS: "Cannon lost when the Polish Destroyer
#. * attacked the German Musketeers."
-#: server/unittools.c:1655
+#: server/unittools.c:1660
#, fuzzy, c-format
msgid "%s lost when the %s %s attacked the %s %s."
msgstr "%s ztracena %s %s při útoku %s %s."
#. TRANS: "Musketeers (and Cannon) lost to an
#. * attack from the Polish Destroyer."
-#: server/unittools.c:1670
+#: server/unittools.c:1675
#, fuzzy, c-format
msgid "%s (and %s) lost to an attack from the %s %s."
msgstr "%s (%s) ztracena při útoku %s %s."
@@ -7029,7 +7124,7 @@ msgstr "%s (%s) ztracena při útoku %s %s."
#. TRANS: "Musketeers and 3 other units lost to
#. * an attack from the Polish Destroyer."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1680
+#: server/unittools.c:1685
#, fuzzy, 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."
@@ -7040,7 +7135,7 @@ msgstr[2] "%s (%d) ztracena při útoku %s %s."
#. TRANS: "2 units lost when the Polish Destroyer
#. * attacked the German Musketeers."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1694
+#: server/unittools.c:1699
#, fuzzy, 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."
@@ -7048,176 +7143,218 @@ msgstr[0] "%d ztracena %s %s při útoku %s %s."
msgstr[1] "%d ztracena %s %s při útoku %s %s."
msgstr[2] "%d ztracena %s %s při útoku %s %s."
-#: server/unittools.c:1962
+#: server/unittools.c:1967
#, c-format
msgid "Your %s was nuked by %s."
msgstr "Na náš %s podnikli %s jaderný útok!"
-#: server/unittools.c:1965 server/unittools.c:1981
+#: server/unittools.c:1970 server/unittools.c:1986
msgid "yourself"
msgstr "Vy"
-#: server/unittools.c:1969
+#: server/unittools.c:1974
#, fuzzy, c-format
msgid "The %s %s was nuked."
msgstr "Na %s %s byl proveden jaderný útok."
-#: server/unittools.c:1978
+#: server/unittools.c:1983
#, c-format
msgid "%s was nuked by %s."
msgstr "Na %s podnikli %s jaderný útok!"
-#: server/unittools.c:1986
+#: server/unittools.c:1991
#, c-format
msgid "You nuked %s."
msgstr "Při atomovém útoku jste ozářil(a) město %s."
-#: server/unittools.c:2027
+#: server/unittools.c:2032
#, fuzzy, c-format
msgid "The %s detonated a nuke!"
msgstr "%s odpálili atomovou zbraň."
-#: server/unittools.c:2051
+#: server/unittools.c:2056
#, c-format
msgid "%s transported successfully."
msgstr "Jednotka %s byla úspěšně transportována."
-#: server/unittools.c:2103
+#: server/unittools.c:2108
msgid "This unit type can not be paradropped."
msgstr "Tento typ jednotky nemůže provést výsadek."
-#: server/unittools.c:2113
+#: server/unittools.c:2118
#, fuzzy
msgid "You cannot paradrop a unit that is transporting other units."
msgstr "Nelze provést výsadek transportnà jednotky."
-#: server/unittools.c:2119
+#: server/unittools.c:2124
msgid "The destination location is not known."
msgstr "CÃlová oblast nenà prozkoumána."
-#: server/unittools.c:2126
+#: server/unittools.c:2131
#, c-format
msgid "This unit cannot paradrop into %s."
msgstr "Tato jednotka nemůže provést výsadek do %s."
-#: server/unittools.c:2146
+#: server/unittools.c:2151
#, c-format
msgid "The distance to the target (%i) is greater than the unit's range (%i)."
msgstr "Vzdálenost k cÃli (%i) je vÄ›tÅ¡Ã než dosah jednotky (%i)."
-#: server/unittools.c:2157
+#: server/unittools.c:2162
#, c-format
msgid "Your %s paradropped into the %s and was lost."
msgstr "Jednotka %s vysazena do %s a ztracena."
-#: server/unittools.c:2170
+#: server/unittools.c:2175
#, c-format
msgid "Your %s was killed by enemy units at the paradrop destination."
msgstr "Jednotka %s byla zabita nepřátelskými jednotkami v mÃstÄ› výsadku."
-#: server/unittools.c:2192
+#: server/unittools.c:2197
#, c-format
msgid "You found %d gold."
msgstr "Nalezli jsme %d zlatých."
-#: server/unittools.c:2209
+#: server/unittools.c:2214
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr "Nalezli jsme %s ve starodávných svitcÃch moudrosti."
-#: server/unittools.c:2216
+#: server/unittools.c:2221
#, c-format
msgid "The %s have acquired %s from ancient scrolls of wisdom."
msgstr "%s nalezli %s ve starodávných svitcÃch moudrosti."
-#: server/unittools.c:2230
+#: server/unittools.c:2235
msgid "A band of friendly mercenaries joins your cause."
msgstr "Připojila se k vám skupina žoldáků."
-#: server/unittools.c:2248
+#: server/unittools.c:2253
msgid "An abandoned village is here."
msgstr "Nalezli jsme opuštěnou osadu."
-#: server/unittools.c:2258
+#: server/unittools.c:2263
msgid "You have unleashed a horde of barbarians!"
msgstr "Vyrušili jsme skupinu barbarů!"
-#: server/unittools.c:2261
+#: server/unittools.c:2266
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr "Jednotka %s byla zniÄena barbary!"
-#: server/unittools.c:2277
+#: server/unittools.c:2282
msgid "You found a friendly city."
msgstr "Nalezli jsme přátelské město."
-#: server/unittools.c:2291
+#: server/unittools.c:2296
#, fuzzy
msgid "Friendly nomads are impressed by you, and join you."
msgstr ""
"UdÄ›lal(a) jste dojem na skupinu koÄovných nomádů, kteřà se k Vám rozhodli "
"připojit."
-#: server/unittools.c:2316
+#: server/unittools.c:2321
#, fuzzy
msgid "Your overflight frightens the tribe; they scatter in terror."
msgstr "Přelet nad osadou vyděsil jejà obyvatele, kteřà se v hrůze rozprchli."
-#: server/unittools.c:2574
+#: server/unittools.c:2579
#, fuzzy, c-format
msgid "Orders for %s aborted after enemy movement was spotted."
msgstr "PÅ™Ãkazy pro %s byly zruÅ¡eny, protože poblÞ jsou jednotky."
-#: server/unittools.c:3023
+#: server/unittools.c:3028
#, fuzzy, c-format
msgid "Orders for %s aborted as there are units nearby."
msgstr "PÅ™Ãkazy pro %s byly zruÅ¡eny, protože poblÞ jsou jednotky."
-#: server/unittools.c:3075
+#: server/unittools.c:3080
#, fuzzy, c-format
msgid "Orders for %s aborted because building of city failed."
msgstr "Rozkazy pro %s zrušeny kvůli selhánà pohybu."
-#: server/unittools.c:3088
+#: server/unittools.c:3093
#, fuzzy, c-format
msgid "Orders for %s aborted since they give an invalid activity."
msgstr "Rozkazy pro %s zruÅ¡eny, protože urÄujà neplatnou Äinnost."
-#: server/unittools.c:3102
+#: server/unittools.c:3107
#, fuzzy, c-format
msgid "Orders for %s aborted since they give an invalid location."
msgstr "Rozkazy pro %s zruÅ¡eny, protože urÄujà neplatnou polohu."
-#: server/unittools.c:3112
+#: server/unittools.c:3117
#, fuzzy, c-format
msgid "Orders for %s aborted as there are units in the way."
msgstr "Rozkazy pro %s zrušeny, v cestě jsou jednotky."
-#: server/unittools.c:3138
+#: server/unittools.c:3143
#, fuzzy, c-format
msgid "Orders for %s aborted because of failed move."
msgstr "Rozkazy pro %s zrušeny kvůli selhánà pohybu."
-#: server/unittools.c:3179
+#: server/unittools.c:3184
#, c-format
msgid "Attempt to change homecity for %s failed."
msgstr "Pokus o změnu domovského města jednotky %s selhal."
-#: server/unittools.c:3190
+#: server/unittools.c:3195
#, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr ""
-#: server/unittools.c:3202
+#: server/unittools.c:3207
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr ""
-#: server/unittools.c:3211
+#: server/unittools.c:3216
#, c-format
msgid "Your %s has invalid orders."
msgstr "Jednotka %s má neplatné rozkazy."
+#: server/voting.c:522
+#, fuzzy, c-format
+msgid ""
+"%s %d \"%s\" is passed %d to %d with %d abstentions and %d who did not vote."
+msgstr "Hlasovánà \"%s\" prošlo %d ku %d a %d se zdrželo."
+
+#: server/voting.c:528
+#, fuzzy, c-format
+msgid ""
+"%s %d \"%s\" failed with %d against, %d for, %d abstentions and %d who did "
+"not vote."
+msgstr "Hlasovánà \"%s\" neprošlo s %d proti, %d pro a %d se zdrželo."
+
+#: server/voting.c:548
+#, c-format
+msgid "%s %d: %s voted yes."
+msgstr ""
+
+#: server/voting.c:553
+#, c-format
+msgid "%s %d: %s voted no."
+msgstr ""
+
+#: server/voting.c:558
+#, c-format
+msgid "%s %d: %s chose to abstain."
+msgstr ""
+
+#. TRANS: Describing a new vote that can only pass
+#. * if there are no dissenting votes.
+#: server/voting.c:726
+#, c-format
+msgid "%s (needs %0.0f%% and no dissent)."
+msgstr ""
+
+#. TRANS: Describing a new vote that can pass only if the
+#. * given percentage of players votes 'yes'.
+#: server/voting.c:732
+#, c-format
+msgid "%s (needs %0.0f%% in favor)."
+msgstr ""
+
#: server/generator/mapgen.c:1771
msgid "High landmass - this may take a few seconds."
msgstr "PÅ™ÃliÅ¡ velká pevnina - to může pár sekund trvat."
@@ -7249,13 +7386,13 @@ msgstr ""
"Možná je poÄet hráÄů/poÄÃtaÄem ovládaných pÅ™ÃliÅ¡ vysoký pro tuto mapu.\n"
"ProsÃm nahlaÅ¡te bug na %s."
-#: client/attribute.c:363
+#: client/attribute.c:368
#, fuzzy
msgid ""
"There has been a CMA error. Your citizen governor settings may be broken."
msgstr "Vyskytla se chyba ASM. VaÅ¡e ASM nastavenà je nejspÃÅ¡e poÅ¡kozené."
-#: client/attribute.c:367
+#: client/attribute.c:372
msgid "Old attributes detected and removed."
msgstr "Staré atributy byly nalezeny a smazány."
@@ -7406,41 +7543,41 @@ msgstr "%s - %s obyvatel"
msgid "%+4d : Taxed from trade\n"
msgstr ""
-#: client/citydlg_common.c:418
+#: client/citydlg_common.c:421
#, fuzzy, c-format
msgid "%+4d : Trade route with %s\n"
msgstr "Neexistujà obchodnà cesty.\n"
-#: client/citydlg_common.c:427
+#: client/citydlg_common.c:430
#, fuzzy, c-format
msgid "%+4d : Building tithes\n"
msgstr "Stavba jednotek"
-#: client/citydlg_common.c:450
+#: client/citydlg_common.c:453
#, c-format
msgid "%+4d : Bonus from %s (%+d%%)\n"
msgstr ""
-#: client/citydlg_common.c:462
+#: client/citydlg_common.c:465
#, c-format
msgid "%+4d : Waste\n"
msgstr ""
-#: client/citydlg_common.c:468
+#: client/citydlg_common.c:471
#, c-format
msgid "%+4d : Disorder\n"
msgstr ""
-#: client/citydlg_common.c:474
+#: client/citydlg_common.c:477
#, c-format
msgid "%+4d : Used\n"
msgstr ""
-#: client/citydlg_common.c:479
+#: client/citydlg_common.c:482
msgid "==== : Adds up to\n"
msgstr ""
-#: client/citydlg_common.c:481
+#: client/citydlg_common.c:484
#, c-format
msgid "%4d : Total surplus"
msgstr ""
@@ -7762,50 +7899,50 @@ msgstr "?specialist:S"
msgid "Specialists"
msgstr "Specialisté"
-#: client/civclient.c:240
+#: client/civclient.c:241
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr " -a, --autoconnect\tVynechat připojovacà dialog\n"
-#: client/civclient.c:250
+#: client/civclient.c:251
msgid " -l, --log FILE\tUse FILE as logfile (spawned server also uses this)\n"
msgstr " -l, --log SOUBOR\tPoužije SOUBOR jako logovacÃ\n"
-#: client/civclient.c:252
+#: client/civclient.c:253
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr " -m, --meta HOST\tPřipojit k metaserveru HOST\n"
-#: client/civclient.c:254
+#: client/civclient.c:255
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr " -n, --name JMÉNO\tPoužÃt jméno JMÉNO\n"
-#: client/civclient.c:256
+#: client/civclient.c:257
#, fuzzy
msgid " -p, --port PORT\tConnect to server port PORT (usually with -a)\n"
msgstr " -p, --port PORT\tPřipojit na port serveru PORT\n"
-#: client/civclient.c:258
+#: client/civclient.c:259
#, c-format
msgid " -P, --Plugin PLUGIN\tUse PLUGIN for sound output %s\n"
msgstr " -P, --Plugin MODUL\tPoužÃt zásuvný MODUL pro zvuk %s\n"
-#: client/civclient.c:260
+#: client/civclient.c:261
msgid " -r, --read FILE\tRead startup script FILE (for spawned server only)\n"
msgstr " -r, --read SOUBOR\tPÅ™eÄte spouÅ¡tÄ›cà skript ze souboru SOUBOR\n"
-#: client/civclient.c:263
+#: client/civclient.c:264
#, fuzzy
msgid " -s, --server HOST\tConnect to the server at HOST (usually with -a)\n"
msgstr " -s, --server HOST\tPřipojit k serveru HOST\n"
-#: client/civclient.c:265
+#: client/civclient.c:266
msgid " -S, --Sound FILE\tRead sound tags from FILE\n"
msgstr " -S, --Sound SOUBOR\tPÅ™eÄte zvukyové tagy ze SOUBORu\n"
-#: client/civclient.c:266
+#: client/civclient.c:267
msgid " -t, --tiles FILE\tUse data file FILE.tilespec for tiles\n"
msgstr " -t, --tiles SOUBOR\tPoužÃt grafiku mapy ze souboru SOUBOR.tilespec\n"
-#: client/civclient.c:269
+#: client/civclient.c:270
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7815,45 +7952,45 @@ msgstr ""
"\t\t\tZkuste \"%s -- --help\" pro dalšà informace.\n"
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:274
+#: client/civclient.c:275
#, fuzzy, c-format
msgid "Report bugs at %s\n"
msgstr "Chyby hlašte na <%s>.\n"
-#: client/civclient.c:298
+#: client/civclient.c:299
#, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr "Neplatný port \"%s\" urÄený s --port volbou.\n"
-#: client/civclient.c:300 client/civclient.c:315
+#: client/civclient.c:301 client/civclient.c:316
msgid "Try using --help.\n"
msgstr "Zkuste použÃt --help.\n"
-#: client/civclient.c:313
+#: client/civclient.c:314
#, c-format
msgid "Invalid debug level \"%s\" specified with --debug option.\n"
msgstr "Neplatná ladÃcà úroveň \"%s\" urÄená s --debug volbou.\n"
-#: client/civclient.c:326
+#: client/civclient.c:327
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr "Neznámá volba: \"%s\"\n"
-#: client/civclient.c:391
+#: client/civclient.c:393
#, fuzzy, c-format
msgid "Updating old metaserver address \"%s\"."
msgstr "metaserver <adresa>"
-#: client/civclient.c:394
+#: client/civclient.c:396
#, fuzzy, c-format
msgid "Default metaserver has been set to \"%s\"."
msgstr "Volba: %s byla nastavena na \"%s\"."
-#: client/civclient.c:550
+#: client/civclient.c:540
msgid "Game started."
msgstr "Hra spuštěna."
-#: client/civclient.c:588
+#: client/civclient.c:606
msgid "There was an error while auto connecting; aborting."
msgstr "PÅ™i autoamtickém spojenà nastala chyba; konÄÃm."
@@ -7983,17 +8120,17 @@ msgstr "ProbÃhá pÅ™ipojovánÃ."
msgid "Disconnected from server."
msgstr "Odpojen od serveru."
-#: client/clinet.c:469
+#: client/clinet.c:473
#, c-format
msgid "Failed to contact server \"%s\" at port %d as \"%s\" after %d attempts"
msgstr ""
"Selhalo kontaktovánà serveru \"%s\" na portu %d jako \"%s\" po %d pokusech"
-#: client/clinet.c:484 client/clinet.c:486
+#: client/clinet.c:488 client/clinet.c:490
msgid "Connection to server refused. Please start the server."
msgstr "Spojenà k serveru odmÃtnuto. ProsÃm spusÅ¥te server."
-#: client/clinet.c:495 client/clinet.c:523
+#: client/clinet.c:499 client/clinet.c:527
#, c-format
msgid ""
"Error contacting server \"%s\" at port %d as \"%s\":\n"
@@ -8002,7 +8139,7 @@ msgstr ""
"Chyba při kontakotvánà serveru \"%s\" na portu %d jako \"%s\":\n"
" %s\n"
-#: client/clinet.c:514
+#: client/clinet.c:518
#, c-format
msgid ""
"Auto-connecting to server \"%s\" at port %d as \"%s\" every %f second(s) for "
@@ -8011,53 +8148,53 @@ 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:1358
+#: client/connectdlg_common.c:78 client/gui-gtk-2.0/pages.c:1358
msgid "novice"
msgstr "nováÄek"
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1358
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
msgid "easy"
msgstr "lehká"
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1359
msgid "normal"
msgstr "normálnÃ"
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr "těžká"
-#: client/connectdlg_common.c:83
+#: client/connectdlg_common.c:82
msgid "experimental"
msgstr "experimentálnÃ"
-#: client/connectdlg_common.c:213
+#: client/connectdlg_common.c:212
msgid "Starting server..."
msgstr "Spouštà se server..."
-#: client/connectdlg_common.c:332
+#: client/connectdlg_common.c:331
msgid "Couldn't start the server."
msgstr "Nelze spustit server."
-#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
+#: client/connectdlg_common.c:332 client/connectdlg_common.c:365
msgid "You'll have to start one manually. Sorry..."
msgstr "MusÃte ho spustit ruÄnÄ›. Lituji..."
-#: client/connectdlg_common.c:364
+#: client/connectdlg_common.c:363
msgid "Couldn't connect to the server."
msgstr "Nelze se připojit k serveru."
-#: client/connectdlg_common.c:365
+#: client/connectdlg_common.c:364
msgid "We probably couldn't start it from here."
msgstr "PravdÄ›podobnÄ› nebudeme moci odtud zaÄit."
-#: client/connectdlg_common.c:470
+#: client/connectdlg_common.c:469
#, fuzzy
msgid ""
"Established control over the server. You have command access level 'hack'."
msgstr "Máme kontrolu nad serverem (úprava úrovnÄ› pÅ™Ãstupových práv)"
-#: client/connectdlg_common.c:475
+#: client/connectdlg_common.c:474
msgid ""
"Failed to obtain the required access level to take control of the server. "
"The server will now be shutdown."
@@ -8067,27 +8204,27 @@ msgstr ""
msgid "Only transporter units can be unloaded."
msgstr "Vyloženy mohou být pouze transportnà jednotky."
-#: client/control.c:1425
+#: client/control.c:1417
msgid "Only settler units can be put into auto mode."
msgstr "Pouze osadnÃci mohou být pÅ™epnuty do auto-módu."
-#: client/control.c:1516
+#: client/control.c:1511
msgid "Only nuclear units can do this."
msgstr "Toto může jen jaderná střela."
-#: client/control.c:1545
+#: client/control.c:1540
msgid "Only paratrooper units can do this."
msgstr "Toto mohou jen výsadkáři."
-#: client/control.c:2020
+#: client/control.c:2015
msgid "Too far for this unit."
msgstr "PÅ™ÃliÅ¡ daleko pro tuto jednotku."
-#: client/control.c:2230 client/control.c:2260 client/control.c:2276
+#: client/control.c:2225 client/control.c:2255 client/control.c:2271
msgid "Didn't find a route to the destination!"
msgstr "NepodaÅ™ilo se nalézt cestu k cÃli!"
-#: client/control.c:2320
+#: client/control.c:2315
msgid "Oh my! You seem to have no capital!"
msgstr "Sakra! Vypadá to, že nemáme hlavnà město!"
@@ -8484,30 +8621,38 @@ 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:1066 client/helpdata.c:1400
+#: client/helpdata.c:1066 client/helpdata.c:1408
msgid " or "
msgstr " nebo "
-#: client/helpdata.c:1068 client/helpdata.c:1388
+#: client/helpdata.c:1068 client/helpdata.c:1396
msgid "?or:, "
msgstr "?or:, "
-#: client/helpdata.c:1080
-#, 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"
+#: client/helpdata.c:1079
+#, fuzzy, c-format
+msgid "* Unit has to be in a city, or a base after %d turn.\n"
+msgid_plural "* Unit has to be in a city, or a base after %d turns.\n"
+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:1087
+#, fuzzy, c-format
+msgid "* Unit has to be in a city, a base, or on a %s after %d turn.\n"
+msgid_plural "* Unit has to be in a city, a base, or on a %s after %d turns.\n"
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:1122
+#: client/helpdata.c:1130
#, 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:1127
+#: client/helpdata.c:1135
#, c-format
msgid ""
"To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8516,90 +8661,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:1135
+#: client/helpdata.c:1143
msgid "You cannot research this technology."
msgstr "Nemůžeme zkoumat tuto technologii."
-#: client/helpdata.c:1139
+#: client/helpdata.c:1147
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:1151
+#: client/helpdata.c:1159
#, 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:1156
+#: client/helpdata.c:1164
#, 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:1159
+#: client/helpdata.c:1167
#, 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:1163
+#: client/helpdata.c:1171
msgid "* Increases the pollution generated by the population.\n"
msgstr "* Zvýšà zneÄiÅ¡tenà produkované populacÃ.\n"
-#: client/helpdata.c:1168
+#: client/helpdata.c:1176
#, 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:1175
+#: client/helpdata.c:1183
#, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr "* Umožňuje %s stavbu pevnostÃ.\n"
-#: client/helpdata.c:1183
+#: client/helpdata.c:1191
#, c-format
msgid "* Allows %s to build airbases.\n"
msgstr "* Umožňuje %s stavbu letišť.\n"
-#: client/helpdata.c:1192
+#: client/helpdata.c:1200
#, c-format
msgid "* Allows %s to upgrade roads to railroads.\n"
msgstr "* Umožňuje %s vylepšit cesty na železnice.\n"
-#: client/helpdata.c:1200
+#: client/helpdata.c:1208
#, 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:1234
+#: client/helpdata.c:1242
msgid "* Pollution cannot be generated on this terrain."
msgstr "* Na tomto terénu nelze generovat zneÄiÅ¡tÄ›nÃ."
-#: client/helpdata.c:1239
+#: client/helpdata.c:1247
msgid "* You cannot build cities on this terrain."
msgstr "* Na tomto terénu nemůžete stavět města."
-#: client/helpdata.c:1245
+#: client/helpdata.c:1253
msgid "* The coastline of this terrain is unsafe."
msgstr "* PobÅ™ežà tohoto terénu je nebezpeÄné."
-#: client/helpdata.c:1250
+#: client/helpdata.c:1258
msgid "* This terrain is unsafe for units to travel on."
msgstr "* Tento terén je nebezpeÄný pro pÅ™esun jednotek."
-#: client/helpdata.c:1255
+#: client/helpdata.c:1263
msgid "* Land units cannot travel on oceanic terrains."
msgstr "* Pozemnà jednotky se nemohou pohybovat v oceánu."
-#: client/helpdata.c:1305
+#: client/helpdata.c:1313
msgid "Features:\n"
msgstr ""
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1411 client/helpdata.c:1412
+#: client/helpdata.c:1419 client/helpdata.c:1420
msgid "?outputlist: Nothing "
msgstr ""
-#: client/helpdata.c:1419
+#: client/helpdata.c:1427
#, fuzzy, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -8620,7 +8765,7 @@ msgstr[2] ""
"nespokojenost.\n"
" "
-#: client/helpdata.c:1429
+#: client/helpdata.c:1437
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8628,48 +8773,48 @@ msgid ""
msgstr ""
#. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1437
+#: client/helpdata.c:1445
#, c-format
msgid "* You pay %d times normal %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1442
+#: client/helpdata.c:1450
#, 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:1447
+#: client/helpdata.c:1455
#, c-format
msgid "* You pay no %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1451
+#: client/helpdata.c:1459
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:1460
+#: client/helpdata.c:1468
#, 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:1468
+#: client/helpdata.c:1476
#, c-format
msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
msgstr ""
-#: client/helpdata.c:1475
+#: client/helpdata.c:1483
#, 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:1482
+#: client/helpdata.c:1490
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -8677,23 +8822,23 @@ msgid ""
msgstr ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1489
+#: client/helpdata.c:1497
#, 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:1497
+#: client/helpdata.c:1505
#, c-format
msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
msgstr ""
-#: client/helpdata.c:1502
+#: client/helpdata.c:1510
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr ""
-#: client/helpdata.c:1507
+#: client/helpdata.c:1515
#, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -8705,7 +8850,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: client/helpdata.c:1519
+#: client/helpdata.c:1527
#, 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"
@@ -8714,64 +8859,64 @@ msgstr[1] ""
msgstr[2] ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1530
+#: client/helpdata.c:1538
#, 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:1536
+#: client/helpdata.c:1544
#, fuzzy
msgid "* Your units cannot be bribed.\n"
msgstr "Tato jednotka nemůže být uplacena!"
-#: client/helpdata.c:1539
+#: client/helpdata.c:1547
#, fuzzy
msgid "* Your cities cannot be incited.\n"
msgstr "Město nemůže být rozvráceno!"
-#: client/helpdata.c:1543
+#: client/helpdata.c:1551
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:1549
+#: client/helpdata.c:1557
msgid "* Has a senate that may prevent declaration of war.\n"
msgstr ""
-#: client/helpdata.c:1553
+#: client/helpdata.c:1561
msgid "* Allows partisans when cities are taken by the enemy.\n"
msgstr ""
-#: client/helpdata.c:1557
+#: client/helpdata.c:1565
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
msgstr ""
-#: client/helpdata.c:1561
+#: client/helpdata.c:1569
msgid "* Pays no upkeep for fanatics.\n"
msgstr ""
-#: client/helpdata.c:1564
+#: client/helpdata.c:1572
#, fuzzy
msgid "* Has no unhappy citizens.\n"
msgstr "%d dalÅ¡Ãch nespokojených obyvatel."
-#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
+#: client/helpdata.c:1582 client/helpdata.c:1586 client/helpdata.c:1590
#, c-format
msgid "* Veteran %s units.\n"
msgstr ""
-#: client/helpdata.c:1585
+#: client/helpdata.c:1593
#, fuzzy
msgid "* Veteran units.\n"
msgstr "Námořnà jednotky"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1591
+#: client/helpdata.c:1599
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8779,7 +8924,7 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1600
+#: client/helpdata.c:1608
#, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8787,71 +8932,71 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1608
+#: client/helpdata.c:1616
#, 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:1617
+#: client/helpdata.c:1625
#, c-format
msgid "* %s production is increased %d%%.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1625
+#: client/helpdata.c:1633
#, c-format
msgid "* %s production will suffer massive waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1630
+#: client/helpdata.c:1638
#, c-format
msgid "* %s production will suffer some waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1635
+#: client/helpdata.c:1643
#, 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:1643
+#: client/helpdata.c:1651
#, 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:1649
+#: client/helpdata.c:1657
#, 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:1655
+#: client/helpdata.c:1663
#, c-format
msgid "* %s waste will increase slowly with distance from capital.\n"
msgstr ""
-#: client/helpdata.c:1672
+#: client/helpdata.c:1680
#, c-format
msgid "* Allows you to build %s.\n"
msgstr "* Umožňuje stavbu %s.\n"
#. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1699
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d %s"
msgstr "%s%d %s"
-#: client/helpdata.c:1700 client/helpdata.c:1708 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1708 client/helpdata.c:1716 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:1707
+#: client/helpdata.c:1715
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d nespokojených"
@@ -8920,7 +9065,7 @@ msgid ""
"or with the -a command-line parameter."
msgstr ""
-#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:916 data/Freeciv.in:107
msgid "Metaserver"
msgstr "Metaserver"
@@ -9284,36 +9429,36 @@ msgstr "Uloženà selhalo, nelze zapisovat do souboru %s"
msgid "Saved settings to file %s"
msgstr "Nastavenà uložena do souboru %s"
-#: client/packhand.c:211 client/packhand.c:217
+#: client/packhand.c:212 client/packhand.c:218
#, fuzzy
msgid "You were rejected from the game...."
msgstr "Byli jste odmÃtnuti ze hry:"
-#: client/packhand.c:229
+#: client/packhand.c:230
#, c-format
msgid "Client capability string: %s"
msgstr "Řetězec možnostà klienta: %s"
-#: client/packhand.c:232
+#: client/packhand.c:233
#, c-format
msgid "Server capability string: %s"
msgstr "String kapacity serveru: %s"
-#: client/packhand.c:850
+#: client/packhand.c:864
#, c-format
msgid "Start of turn %d"
msgstr "ZaÄátek kola %d"
-#: client/packhand.c:1591
+#: client/packhand.c:1621
#, c-format
msgid "AI Mode is now %s."
msgstr "AI Mód je nynà %s."
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "ON"
msgstr "ZAP"
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "OFF"
msgstr "VYP"
@@ -9344,15 +9489,15 @@ msgstr "?Player:Jméno"
msgid "Username"
msgstr "Uživatelské jméno"
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
-#: client/gui-gtk-2.0/pages.c:2157
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:653
+#: client/gui-gtk-2.0/pages.c:1604 client/gui-gtk-2.0/pages.c:2159
msgid "Flag"
msgstr "Vlajka"
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1605
-#: client/gui-gtk-2.0/pages.c:2159 client/gui-sdl/repodlgs.c:2063
-#: client/gui-win32/connectdlg.c:990 client/gui-win32/dialogs.c:542
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:657
+#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1609
+#: client/gui-gtk-2.0/pages.c:2161 client/gui-sdl/repodlgs.c:2063
+#: client/gui-win32/connectdlg.c:992 client/gui-win32/dialogs.c:542
#: client/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "Národ"
@@ -9365,7 +9510,7 @@ msgstr "Hranice"
msgid "Score"
msgstr "Skóre"
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1614
msgid "Team"
msgstr "Tým"
@@ -9398,36 +9543,36 @@ msgstr "?Player_dlg:NeÄinný"
msgid "Ping"
msgstr "Ping"
-#: client/repodlgs_common.c:375
+#: client/repodlgs_common.c:378
msgid "You cannot sell improvements."
msgstr "Nemůžete prodat vylepÅ¡enÃ."
-#: client/repodlgs_common.c:391
+#: client/repodlgs_common.c:394
#, c-format
msgid "Sold %d %s for %d gold."
msgstr "Prodáno %d %s za %d zlatých."
-#: client/repodlgs_common.c:396
+#: client/repodlgs_common.c:399
#, c-format
msgid "No %s could be sold."
msgstr "Žádný %s nebyl prodán."
#. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:415
+#: client/repodlgs_common.c:418
msgid "You cannot disband units."
msgstr "Nemůžete rozpustit jednotky."
-#: client/repodlgs_common.c:420
+#: client/repodlgs_common.c:423
#, c-format
msgid "%s cannot be disbanded."
msgstr "%s nemůže být rozpuštěn."
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:444
#, c-format
msgid "Disbanded %d %s."
msgstr "Rozpuštěn náš %d %s."
-#: client/repodlgs_common.c:445
+#: client/repodlgs_common.c:448
#, c-format
msgid "No %s could be disbanded."
msgstr "Žádný %s nebyl rozpuštěn."
@@ -10049,47 +10194,47 @@ msgstr "?dys/hrs:%02dd %02dh"
msgid "?duration:overflow"
msgstr "?duration:preteÄenÃ"
-#: client/text.c:1143
+#: client/text.c:1145
#, c-format
msgid "%6d.%02d ms"
msgstr "%6d.%02d ms"
#. TRANS: <nation adjective> <government name>.
#. * E.g. "Polish Republic".
-#: client/text.c:1188
+#: client/text.c:1193
#, fuzzy, c-format
msgid "?nationgovernment:%s %s"
msgstr "ZÅ™ÃzenÃ: %s"
#. TRANS: "Observer: 1985"
-#: client/text.c:1198
+#: client/text.c:1203
#, c-format
msgid "Observer: %s"
msgstr "Pozorovatel: %s"
-#: client/text.c:1216
+#: client/text.c:1221
msgid "Buildings: "
msgstr "Stavby: "
-#: client/text.c:1233 client/text.c:1272
+#: client/text.c:1238 client/text.c:1277
msgid "None. "
msgstr "Žádné. "
-#: client/text.c:1235 client/text.c:1274
+#: client/text.c:1240 client/text.c:1279
msgid "?clistend:."
msgstr "."
-#: client/text.c:1253
+#: client/text.c:1258
msgid "Wonders: "
msgstr "Divy: "
-#: client/text.c:1308
+#: client/text.c:1313
#, 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:1312
+#: client/text.c:1317
#, fuzzy, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
@@ -10098,7 +10243,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:1318
+#: client/text.c:1323
#, fuzzy, c-format
msgid "%d additional unhappy citizen."
msgid_plural "%d additional unhappy citizens."
@@ -10106,12 +10251,12 @@ msgstr[0] "%d dalÅ¡Ãch nespokojených obyvatel."
msgstr[1] "%d dalÅ¡Ãch nespokojených obyvatel."
msgstr[2] "%d dalÅ¡Ãch nespokojených obyvatel."
-#: client/text.c:1339
+#: client/text.c:1344
#, fuzzy
msgid "Unlimited martial law in effect."
msgstr "Stanné právo v efektu ("
-#: client/text.c:1341
+#: client/text.c:1346
#, fuzzy, c-format
msgid "%d military unit may impose martial law."
msgid_plural "Up to %d military units may impose martial law."
@@ -10122,7 +10267,7 @@ msgstr[1] ""
msgstr[2] ""
"* Nenà vojenskou jednotkou (nemůže utoÄit, neprosadà stanné právo).\n"
-#: client/text.c:1345
+#: client/text.c:1350
#, fuzzy, c-format
msgid "Each military unit makes %d unhappy citizen content."
msgid_plural "Each military unit makes %d unhappy citizens content."
@@ -10133,38 +10278,38 @@ msgstr[1] ""
msgstr[2] ""
"Obveselà obyvatele mÄ›sta natolik, že uÄinà 3 nespokojené lidi spokojenými."
-#: client/text.c:1352
+#: client/text.c:1357
msgid "Military units in the field may cause unhappiness. "
msgstr "Vojenské jednotky v poli mohou způsobit nespokojenost. "
-#: client/text.c:1355
+#: client/text.c:1360
msgid "Military units have no happiness effect. "
msgstr "Vojenské jednotky nemajà na spokojenost vliv. "
-#: client/text.c:1370
+#: client/text.c:1375
#, c-format
msgid "Luxury: %d total."
msgstr "Luxus: %d celkem."
-#: client/tilespec.c:865
+#: client/tilespec.c:882
msgid "No usable default tileset found, aborting!"
msgstr "Nenalezena použitelná výchozà sada dlaždic, konÄÃm!"
-#: client/tilespec.c:1338
+#: client/tilespec.c:1355
msgid ""
"Client does not support isometric tilesets. Using default tileset instead."
msgstr ""
"Klient nepodporuje izometrickou sadu dlaždic. Použije se namÃsto toho "
"výchozà sada."
-#: client/tilespec.c:1347
+#: client/tilespec.c:1364
msgid ""
"Client does not support overhead view tilesets. Using default tileset "
"instead."
msgstr ""
"Klient nepodporuje dlaždice z hornÃho pohledu. Použijà se mÃsto toho výchozÃ."
-#: client/tilespec.c:3966
+#: client/tilespec.c:3987
#, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -10853,7 +10998,7 @@ msgid "_Display"
msgstr "_Zobrazit"
#: client/gui-gtk-2.0/cityrep.c:1006 client/gui-gtk-2.0/menu.c:839
-#: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
+#: client/gui-sdl/diplodlg.c:692 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
#: client/gui-xaw/cityrep.c:533 client/gui-xaw/menu.c:156
@@ -11029,198 +11174,198 @@ msgstr "Jak se bude jmenovat předvolba?"
msgid "Remove this preset?"
msgstr "Smazat tuto předvolbu?"
-#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:222
+#: client/gui-gtk-2.0/dialogs.c:197 client/gui-gtk-2.0/messagewin.c:222
#, fuzzy
msgid "Goto _Location"
msgstr "JÃt k po_loze"
-#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
+#: client/gui-gtk-2.0/dialogs.c:202 client/gui-gtk-2.0/messagewin.c:226
#, fuzzy
msgid "Inspect _City"
msgstr "_Ukázat město"
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:258 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:258 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:259 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:311 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:312 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:312 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:313 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:506
+#: client/gui-gtk-2.0/dialogs.c:507
msgid "Unit"
msgstr "Jednotka"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:950
-#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2155
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:985
+#: client/gui-gtk-2.0/dialogs.c:508 client/gui-gtk-2.0/pages.c:950
+#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2157
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:987
#: 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:519 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:520 client/gui-sdl/dialogs.c:627
msgid "Unit selection"
msgstr "Výběr jednotek"
-#: client/gui-gtk-2.0/dialogs.c:582
+#: client/gui-gtk-2.0/dialogs.c:583
msgid "_Ready all"
msgstr "_Připravit všechny"
-#: client/gui-gtk-2.0/dialogs.c:590
+#: client/gui-gtk-2.0/dialogs.c:591
msgid "_Sentry idle"
msgstr "_Strážit neÄinné"
-#: client/gui-gtk-2.0/dialogs.c:719
+#: client/gui-gtk-2.0/dialogs.c:721
#, fuzzy
msgid "Nation _Groups:"
msgstr "_Národy:"
-#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:766 data/Freeciv.in:3128
msgid "What Nation Will You Be?"
msgstr "Jaký národ chcete vést?"
-#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
-#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
+#: client/gui-gtk-2.0/dialogs.c:768 client/gui-sdl/chatline.c:842
+#: client/gui-win32/connectdlg.c:1040 data/Freeciv.in:3371
msgid "Pick Nation"
msgstr "Vyberte národ"
-#: client/gui-gtk-2.0/dialogs.c:774
+#: client/gui-gtk-2.0/dialogs.c:776
#, fuzzy
msgid "_Random Nation"
msgstr "Náhodný národ"
-#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:792 client/gui-win32/dialogs.c:517
msgid "Select a nation"
msgstr "Vyberte národ"
-#: client/gui-gtk-2.0/dialogs.c:804
+#: client/gui-gtk-2.0/dialogs.c:810
msgid "_Properties"
msgstr "_Vlastnosti"
-#: client/gui-gtk-2.0/dialogs.c:824
+#: client/gui-gtk-2.0/dialogs.c:830
msgid "_Leader:"
msgstr "_Vůdce:"
-#: client/gui-gtk-2.0/dialogs.c:831
+#: client/gui-gtk-2.0/dialogs.c:837
msgid "_Female"
msgstr "_Žena"
-#: client/gui-gtk-2.0/dialogs.c:836
+#: client/gui-gtk-2.0/dialogs.c:842
msgid "_Male"
msgstr "_Muž"
-#: client/gui-gtk-2.0/dialogs.c:863
+#: client/gui-gtk-2.0/dialogs.c:869
#, fuzzy
msgid "City _Styles:"
msgstr "_Styl měst:"
-#: client/gui-gtk-2.0/dialogs.c:902
+#: client/gui-gtk-2.0/dialogs.c:908
#, fuzzy
msgid "_Description"
msgstr "L_egenda"
-#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1263 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:1253 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1268 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:1262 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1277 client/gui-sdl/dialogs.c:2204
#: 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:1306 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1318 client/gui-win32/citydlg.c:1454
#: data/Freeciv.in:2484
msgid "Upgrade Unit!"
msgstr "Vylepšit jednotku!"
-#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1327 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 "Vylepšit zastaralé jednotky"
-#: client/gui-gtk-2.0/diplodlg.c:231 client/gui-win32/diplodlg.c:151
+#: client/gui-gtk-2.0/diplodlg.c:222 client/gui-win32/diplodlg.c:151
#: client/gui-xaw/diplodlg.c:383 client/gui-xaw/diplodlg.c:401
msgid "World-map"
msgstr "Mapa světa"
-#: client/gui-gtk-2.0/diplodlg.c:237 client/gui-win32/diplodlg.c:146
+#: client/gui-gtk-2.0/diplodlg.c:228 client/gui-win32/diplodlg.c:146
#: client/gui-xaw/diplodlg.c:387 client/gui-xaw/diplodlg.c:405
msgid "Sea-map"
msgstr "Mapa moÅ™Ã"
-#: client/gui-gtk-2.0/diplodlg.c:243
+#: client/gui-gtk-2.0/diplodlg.c:234
msgid "_Maps"
msgstr "_Mapy"
-#: client/gui-gtk-2.0/diplodlg.c:274
+#: client/gui-gtk-2.0/diplodlg.c:265
msgid "_Advances"
msgstr "_Objevy"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/diplodlg.c:315 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "_Města"
-#: client/gui-gtk-2.0/diplodlg.c:333
+#: client/gui-gtk-2.0/diplodlg.c:324
msgid "_Give shared vision"
msgstr "_Poskytnout svoje mapy"
-#: client/gui-gtk-2.0/diplodlg.c:346
+#: client/gui-gtk-2.0/diplodlg.c:337
msgid "Give _embassy"
msgstr "Dát _ambasádu"
-#: client/gui-gtk-2.0/diplodlg.c:376
+#: client/gui-gtk-2.0/diplodlg.c:368
msgid "_Pacts"
msgstr "_Smlouvy"
-#: client/gui-gtk-2.0/diplodlg.c:466
+#: client/gui-gtk-2.0/diplodlg.c:458
#, c-format
msgid "Diplomacy: %s"
msgstr "Diplomacie: %s"
-#: client/gui-gtk-2.0/diplodlg.c:473
+#: client/gui-gtk-2.0/diplodlg.c:465
msgid "_Cancel meeting"
msgstr "_UkonÄit setkánÃ"
-#: client/gui-gtk-2.0/diplodlg.c:475
+#: client/gui-gtk-2.0/diplodlg.c:467
msgid "Accept _treaty"
msgstr "Přijmout _dohodu"
-#: client/gui-gtk-2.0/diplodlg.c:503
+#: client/gui-gtk-2.0/diplodlg.c:495
msgid "C_lauses:"
msgstr "K_lauzule:"
-#: client/gui-gtk-2.0/diplodlg.c:568 client/gui-gtk-2.0/diplodlg.c:642
+#: client/gui-gtk-2.0/diplodlg.c:560 client/gui-gtk-2.0/diplodlg.c:634
msgid "_Gold:"
msgstr "_Zlata:"
-#: client/gui-gtk-2.0/diplodlg.c:580 client/gui-gtk-2.0/diplodlg.c:654
+#: client/gui-gtk-2.0/diplodlg.c:572 client/gui-gtk-2.0/diplodlg.c:646
msgid "_Add Clause..."
msgstr "_Přidat klauzuli..."
-#: client/gui-gtk-2.0/diplodlg.c:699
+#: client/gui-gtk-2.0/diplodlg.c:691
msgid "--- This treaty is blank. Please add some clauses. ---"
msgstr "--- Tato smlouva je prázdná. ProsÃm pÅ™idejte nÄ›jaké odstavce. ---"
-#: client/gui-gtk-2.0/diplodlg.c:905 client/gui-sdl/diplodlg.c:375
+#: client/gui-gtk-2.0/diplodlg.c:897 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 "UrÄeno neplatné množstvà zlata."
@@ -11280,99 +11425,99 @@ msgstr "Zvolte mÃsto urÄenÃ"
msgid "Show _All Cities"
msgstr "Zobrazit _Všechna města"
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:164
msgid "Show Map Scrollbars"
msgstr "Zobrazit posuvnÃky mapy"
-#: client/gui-gtk-2.0/gui_main.c:163
+#: client/gui-gtk-2.0/gui_main.c:165
msgid "Disable this option to hide the scrollbars on the map view."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:169
msgid "Keyboardless goto"
msgstr "Pohyb bez klávesnice"
-#: client/gui-gtk-2.0/gui_main.c:168
+#: client/gui-gtk-2.0/gui_main.c:170
msgid ""
"If this option is set then a goto may be initiated by left-clicking and then "
"holding down the mouse button while dragging the mouse onto a different tile."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:173
+#: client/gui-gtk-2.0/gui_main.c:175
msgid "Keep dialogs on top"
msgstr "Nechat dialogy navrchu"
-#: client/gui-gtk-2.0/gui_main.c:174
+#: client/gui-gtk-2.0/gui_main.c:176
msgid ""
"If this option is set then dialog windows will always remain in front of the "
"main Freeciv window. Disabling this has no effect in fullscreen mode."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:178
+#: client/gui-gtk-2.0/gui_main.c:180
msgid "Show worklist task icons"
msgstr "Zobrazovat ikony v seznamu pracÃ"
-#: client/gui-gtk-2.0/gui_main.c:179
+#: client/gui-gtk-2.0/gui_main.c:181
msgid ""
"Disabling this will turn off the unit and building icons in the worklist "
"dialog and the production tab of the city dialog."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:183
+#: client/gui-gtk-2.0/gui_main.c:185
msgid "Enable status report tabs"
msgstr "Povolit záložky s hlášenÃm stavu"
-#: client/gui-gtk-2.0/gui_main.c:184
+#: client/gui-gtk-2.0/gui_main.c:186
msgid ""
"If this option is enabled then report dialogs will be shown as separate tabs "
"rather than in popup dialogs."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:189 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:191 client/gui-win32/gui_main.c:110
msgid "Better fog-of-war drawing"
msgstr "Lepšà vykreslovánà clony války"
-#: client/gui-gtk-2.0/gui_main.c:190 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:192 client/gui-win32/gui_main.c:111
msgid ""
"If this is enabled then a better method is used for drawing fog-of-war. It "
"is not any slower but will consume about twice as much memory."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:195
+#: client/gui-gtk-2.0/gui_main.c:197
msgid "Show time for each chat message"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:196
+#: client/gui-gtk-2.0/gui_main.c:198
msgid ""
"If this option is enabled then all chat messages will be prefixed by a time "
"string of the form [hour:minute:second]."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:201
+#: client/gui-gtk-2.0/gui_main.c:203
msgid "Split bottom notebook area"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:202
+#: client/gui-gtk-2.0/gui_main.c:204
msgid ""
"Enabling this option will split the bottom notebook into a left and right "
"notebook so that two tabs may be viewed at once."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:207
+#: client/gui-gtk-2.0/gui_main.c:209
msgid "New message events go to top of list"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:208
+#: client/gui-gtk-2.0/gui_main.c:210
msgid ""
"If this option is enabled, new events in the message window will appear at "
"the top of the list, rather than being appended at the bottom."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:213
+#: client/gui-gtk-2.0/gui_main.c:215
msgid "Show extra message window buttons"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:214
+#: client/gui-gtk-2.0/gui_main.c:216
msgid ""
"If this option is enabled, there will be two buttons displayed in the "
"message window for inspecting a city and going to a location. If this option "
@@ -11382,22 +11527,22 @@ msgid ""
"closed and reopened."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:224
+#: client/gui-gtk-2.0/gui_main.c:226
#, fuzzy
msgid "Metaserver tab first in network page"
msgstr "Topic string metaserveru nastaven na '%s'."
-#: client/gui-gtk-2.0/gui_main.c:225
+#: client/gui-gtk-2.0/gui_main.c:227
msgid ""
"If this option is enabled, the metaserver tab will be the first notebook tab "
"in the network page. This option requires a restart in order to take effect."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:230
+#: client/gui-gtk-2.0/gui_main.c:232
msgid "Plain chat messages are sent to allies only"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:231
+#: client/gui-gtk-2.0/gui_main.c:233
msgid ""
"If this option is enabled, then plain messages typed into the chat entry "
"while the game is running will only be sent to your allies. Otherwise plain "
@@ -11407,28 +11552,41 @@ msgid ""
"visible in multiplayer games)."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:340 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:245
+msgid "Arrange widgets for small displays"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:246
+msgid ""
+"If this option is enabled, widgets in the main window will be arrange so "
+"that they take up the least amount of total screen space. Specifically, the "
+"left panel containing the overview, player status, and the unit information "
+"box will be extended over the entire left side of the window. This option "
+"requires a restart in order to take effect."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:352 client/gui-xaw/gui_main.c:245
msgid ""
"This client has no special command line options\n"
"\n"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
+#: client/gui-gtk-2.0/gui_main.c:847 client/gui-gtk-2.0/gui_main.c:1542
msgid "Freeciv"
msgstr "Freeciv"
-#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
+#: client/gui-gtk-2.0/gui_main.c:1251 client/gui-gtk-2.0/gui_main.c:1258
#: client/gui-sdl/mapctrl.c:1566 client/gui-win32/gui_main.c:482
#: data/Freeciv.in:2618
msgid "Turn Done"
msgstr "Konec tahu"
-#: client/gui-gtk-2.0/gui_main.c:1232 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1258 client/gui-sdl/mapctrl.c:1566
#: client/gui-sdl/mapview.c:1082
msgid "Shift+Return"
msgstr "Shift+Enter"
-#: client/gui-gtk-2.0/gui_main.c:1266 client/gui-gtk-2.0/menu.c:797
+#: client/gui-gtk-2.0/gui_main.c:1299 client/gui-gtk-2.0/menu.c:797
#: client/gui-gtk-2.0/menu.c:799 client/gui-gtk-2.0/menu.c:801
#: client/gui-gtk-2.0/menu.c:803 client/gui-gtk-2.0/menu.c:805
#: client/gui-gtk-2.0/menu.c:807 client/gui-gtk-2.0/menu.c:809
@@ -11447,11 +11605,11 @@ msgstr "Shift+Enter"
msgid "View"
msgstr "Zobrazit"
-#: client/gui-gtk-2.0/gui_main.c:1359
+#: client/gui-gtk-2.0/gui_main.c:1393
msgid "Chat"
msgstr "Chat"
-#: client/gui-gtk-2.0/gui_main.c:1377 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1411 client/gui-win32/gui_main.c:538
#: data/Freeciv.in:2809
msgid ""
"Freeciv is free software and you are welcome to distribute copies of it\n"
@@ -11463,82 +11621,82 @@ msgstr ""
"Nápovědy.\n"
"Tak.. Jdeme na to!"
-#: client/gui-gtk-2.0/gui_main.c:1392
+#: client/gui-gtk-2.0/gui_main.c:1426
msgid "Allies Only"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1657
+#: client/gui-gtk-2.0/gui_main.c:1691
#, fuzzy
msgid "Not _ready"
msgstr ", nepřipraven"
-#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
+#: client/gui-gtk-2.0/gui_main.c:1702 client/gui-gtk-2.0/pages.c:1679
msgid "_Ready"
msgstr "_Připraven"
-#: client/gui-gtk-2.0/gui_main.c:1672 client/gui-gtk-2.0/gui_main.c:1678
-#: client/gui-gtk-2.0/pages.c:2204
+#: client/gui-gtk-2.0/gui_main.c:1706 client/gui-gtk-2.0/gui_main.c:1712
+#: client/gui-gtk-2.0/pages.c:2206
msgid "_Start"
msgstr "_Start"
-#: client/gui-gtk-2.0/gui_main.c:1686
+#: client/gui-gtk-2.0/gui_main.c:1720
#, fuzzy
msgid "_Take Player"
msgstr "Města"
-#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
+#: client/gui-gtk-2.0/gui_main.c:1723 client/gui-gtk-2.0/pages.c:1669
msgid "Pick _Nation"
msgstr "Vyberte _národ"
-#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
+#: client/gui-gtk-2.0/gui_main.c:1730 client/gui-gtk-2.0/pages.c:1674
#, fuzzy
msgid "_Observe"
msgstr "_Pozorovatel"
-#: client/gui-gtk-2.0/gui_main.c:1698
+#: client/gui-gtk-2.0/gui_main.c:1732
#, fuzzy
msgid "Do not _observe"
msgstr "nynà _pozoruje"
-#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1755 client/gui-xaw/pages.c:211
msgid "<AI>"
msgstr "<PO>"
-#: client/gui-gtk-2.0/gui_main.c:1723
+#: client/gui-gtk-2.0/gui_main.c:1758
msgid "<Novice AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1726
+#: client/gui-gtk-2.0/gui_main.c:1761
msgid "<Easy AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1729
+#: client/gui-gtk-2.0/gui_main.c:1764
msgid "<Normal AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1732
+#: client/gui-gtk-2.0/gui_main.c:1767
msgid "<Hard AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1742 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1777 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:1808
+#: client/gui-gtk-2.0/gui_main.c:1844 client/gui-gtk-2.0/gui_main.c:1858
msgid "Observer"
msgstr "Pozorovatel"
-#: client/gui-gtk-2.0/gui_main.c:1808
+#: client/gui-gtk-2.0/gui_main.c:1858
#, fuzzy
msgid "Detached"
msgstr "Mrtvý"
-#: client/gui-gtk-2.0/gui_main.c:2073
+#: client/gui-gtk-2.0/gui_main.c:2117
msgid "Are you sure you want to quit?"
msgstr "Opravdu to chcete ukonÄit?"
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
#, c-format
msgid ""
"Close Tab:\n"
@@ -11547,7 +11705,7 @@ msgstr ""
"ZavÅ™Ãt kartu:\n"
"%s"
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
msgid "Ctrl+W"
msgstr "Ctrl+W"
@@ -11652,8 +11810,8 @@ msgid "Trans. Rslt/Time:"
msgstr "Transf. výsledek/Äas:"
#: 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
-#: client/gui-win32/helpdlg.c:709 client/gui-win32/helpdlg.c:733
+#: client/gui-win32/helpdlg.c:502 client/gui-win32/helpdlg.c:550
+#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:739
#: client/gui-xaw/helpdlg.c:759 client/gui-xaw/helpdlg.c:808
#: client/gui-xaw/helpdlg.c:816 client/gui-xaw/helpdlg.c:853
#: client/gui-xaw/helpdlg.c:878
@@ -11700,34 +11858,34 @@ msgstr "s"
msgid "?techhelp:"
msgstr "?techhelp:"
-#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:591
+#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:597
#: client/gui-xaw/helpdlg.c:996
#, c-format
msgid "+%d Trade / %d"
msgstr "+%d obchod / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:595
+#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:601
#: client/gui-xaw/helpdlg.c:1000
#, c-format
msgid "no extra / %d"
msgstr "žádné extra / %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
-#: client/gui-win32/helpdlg.c:602 client/gui-win32/helpdlg.c:616
-#: client/gui-win32/helpdlg.c:635 client/gui-xaw/helpdlg.c:1002
+#: client/gui-gtk-2.0/helpdlg.c:1085 client/gui-win32/helpdlg.c:604
+#: client/gui-win32/helpdlg.c:608 client/gui-win32/helpdlg.c:622
+#: client/gui-win32/helpdlg.c:641 client/gui-xaw/helpdlg.c:1002
#: client/gui-xaw/helpdlg.c:1006 client/gui-xaw/helpdlg.c:1020
#: client/gui-xaw/helpdlg.c:1039
msgid "n/a"
msgstr "neznámo"
-#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:605
+#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:611
#: client/gui-xaw/helpdlg.c:1009
#, c-format
msgid "+%d Food / %d"
msgstr "+%d jÃdlo / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:619
+#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:625
#: client/gui-xaw/helpdlg.c:1023
#, c-format
msgid "+%d Res. / %d"
@@ -12503,41 +12661,41 @@ 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:624 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:302
#: 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:779 client/gui-gtk-2.0/pages.c:820
-#: client/gui-win32/connectdlg.c:916
+#: client/gui-win32/connectdlg.c:918
msgid "Server Name"
msgstr "Jméno serveru"
#: client/gui-gtk-2.0/pages.c:780 client/gui-gtk-2.0/pages.c:821
-#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:916
+#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:918
#: data/Freeciv.in:96
msgid "Port"
msgstr "Port"
#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Version"
msgstr "Verze"
#: client/gui-gtk-2.0/pages.c:782 client/gui-gtk-2.0/pages.c:823
-#: client/gui-gtk-2.0/pages.c:2161 client/gui-win32/connectdlg.c:917
-#: client/gui-win32/connectdlg.c:995
+#: client/gui-gtk-2.0/pages.c:2163 client/gui-win32/connectdlg.c:919
+#: client/gui-win32/connectdlg.c:997
msgid "Status"
msgstr "Stav"
#: client/gui-gtk-2.0/pages.c:783 client/gui-gtk-2.0/pages.c:824
#: client/gui-sdl/connectdlg.c:318 client/gui-sdl/plrdlg.c:330
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Players"
msgstr "HráÄi"
#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
-#: client/gui-win32/connectdlg.c:918
+#: client/gui-win32/connectdlg.c:920
msgid "Comment"
msgstr "Komentář"
@@ -12569,9 +12727,9 @@ msgstr "He_slo:"
msgid "Conf_irm Password:"
msgstr "Heslo z_novu:"
-#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2165
#: 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:1000
+#: client/gui-win32/citydlg.c:1083 client/gui-win32/connectdlg.c:1002
#: client/gui-win32/wldlg.c:800 client/gui-win32/wldlg.c:806
msgid "Type"
msgstr "Typ"
@@ -12671,7 +12829,7 @@ msgstr "Úroveň poÄÃtaÄem ovládaných hráÄů:"
msgid "Ruleset _Version:"
msgstr "Vládce:"
-#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2195
msgid "_More Game Options..."
msgstr "VÃce M_ožnostà Hry..."
@@ -12688,49 +12846,49 @@ msgstr "ÄekánÃ"
msgid "Ready"
msgstr "Připraven"
-#: client/gui-gtk-2.0/pages.c:1601
+#: client/gui-gtk-2.0/pages.c:1600
#, fuzzy
msgid "?player:Leader"
msgstr "?Player:Jméno"
-#: client/gui-gtk-2.0/pages.c:1732 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1734 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:1824
+#: client/gui-gtk-2.0/pages.c:1826
msgid "Choose Saved Game to _Load:"
msgstr "Vyberte uloženou hru pro _nahránÃ:"
-#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
-#: client/gui-gtk-2.0/pages.c:2451
+#: client/gui-gtk-2.0/pages.c:1846 client/gui-gtk-2.0/pages.c:2039
+#: client/gui-gtk-2.0/pages.c:2455
msgid "_Browse..."
msgstr "_Procházet..."
-#: client/gui-gtk-2.0/pages.c:1911
+#: client/gui-gtk-2.0/pages.c:1913
msgid "Choose a Scenario"
msgstr "Vyberte scénář"
-#: client/gui-gtk-2.0/pages.c:1998
+#: client/gui-gtk-2.0/pages.c:2000
msgid "Choose a _Scenario:"
msgstr "Vyberte _scénář:"
-#: client/gui-gtk-2.0/pages.c:2173
+#: client/gui-gtk-2.0/pages.c:2175
msgid "Choose a _nation to play:"
msgstr "Vyberte _národ pro hru:"
-#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2367 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:2448 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2452 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "Uložit hru"
-#: client/gui-gtk-2.0/pages.c:2489
+#: client/gui-gtk-2.0/pages.c:2493
msgid "Saved _Games:"
msgstr "Uložené _hry:"
-#: client/gui-gtk-2.0/pages.c:2516
+#: client/gui-gtk-2.0/pages.c:2520
msgid "Save _Filename:"
msgstr "Uložit _soubor:"
@@ -13082,7 +13240,7 @@ msgstr ""
msgid "Total users logged in : %d"
msgstr ""
-#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1098
msgid "Back"
msgstr "Zpět"
@@ -13091,7 +13249,7 @@ msgid "Start"
msgstr "Start"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:777
+#: client/gui-win32/connectdlg.c:779
msgid "Load Game"
msgstr "Nahrát hru"
@@ -13135,9 +13293,9 @@ msgstr "Nové domovské město"
#: client/gui-sdl/connectdlg.c:308 client/gui-sdl/connectdlg.c:617
#: client/gui-sdl/connectdlg.c:803 client/gui-sdl/connectdlg.c:985
#: client/gui-sdl/dialogs.c:452 client/gui-sdl/dialogs.c:2095
-#: client/gui-sdl/dialogs.c:2893 client/gui-sdl/diplomat_dialog.c:731
+#: client/gui-sdl/dialogs.c:2902 client/gui-sdl/diplomat_dialog.c:731
#: client/gui-sdl/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1043
#: client/gui-win32/dialogs.c:1772 client/gui-win32/finddlg.c:127
#: client/gui-win32/gotodlg.c:171 client/gui-win32/inputdlg.c:146
#: client/gui-win32/messagedlg.c:216 client/gui-win32/ratesdlg.c:328
@@ -13183,7 +13341,7 @@ msgid "Buy it?"
msgstr "Koupit!"
#: 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
+#: client/gui-sdl/diplodlg.c:1336 client/gui-sdl/diplomat_dialog.c:1211
#: client/gui-sdl/diplomat_dialog.c:1417 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:221 client/gui-sdl/repodlgs.c:1559
#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
@@ -13199,7 +13357,7 @@ msgid "No"
msgstr "Ne"
#: client/gui-sdl/citydlg.c:1215 client/gui-sdl/cma_fe.c:318
-#: client/gui-sdl/diplodlg.c:1345 client/gui-sdl/diplomat_dialog.c:1200
+#: client/gui-sdl/diplodlg.c:1346 client/gui-sdl/diplomat_dialog.c:1200
#: client/gui-sdl/diplomat_dialog.c:1407 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:232 client/gui-win32/repodlgs.c:578
#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
@@ -13518,7 +13676,7 @@ msgstr "Freeciv server:"
msgid "Port :"
msgstr "Port:"
-#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1100
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr "Připojit"
@@ -13626,23 +13784,23 @@ msgstr "Vyberte VaÅ¡e nové státnà zÅ™ÃzenÃ"
msgid "REVOLUTION!"
msgstr "REVOLUCE!"
-#: client/gui-sdl/dialogs.c:2232 client/gui-sdl/dialogs.c:2620
+#: client/gui-sdl/dialogs.c:2237 client/gui-sdl/dialogs.c:2625
#: client/gui-win32/dialogs.c:567 data/Freeciv.in:3159
msgid "Female"
msgstr "Žena"
-#: client/gui-sdl/dialogs.c:2234 client/gui-sdl/dialogs.c:2618
-#: client/gui-sdl/dialogs.c:2830 client/gui-win32/dialogs.c:565
+#: client/gui-sdl/dialogs.c:2239 client/gui-sdl/dialogs.c:2623
+#: client/gui-sdl/dialogs.c:2839 client/gui-win32/dialogs.c:565
msgid "Male"
msgstr "Muž"
-#: client/gui-sdl/dialogs.c:2478 client/gui-sdl/dialogs.c:2902
+#: client/gui-sdl/dialogs.c:2483 client/gui-sdl/dialogs.c:2911
#: 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 "OK"
-#: client/gui-sdl/dialogs.c:2685 client/gui-win32/dialogs.c:505
+#: client/gui-sdl/dialogs.c:2694 client/gui-win32/dialogs.c:505
msgid "What nation will you be?"
msgstr "Jaký národ chcete být?"
@@ -13669,77 +13827,77 @@ msgstr "Mapa světa"
msgid "Sea map"
msgstr "Mapa moÅ™Ã"
-#: client/gui-sdl/diplodlg.c:563
+#: client/gui-sdl/diplodlg.c:564
msgid "Give embassy"
msgstr "Dát ambasádu"
-#: client/gui-sdl/diplodlg.c:579 client/gui-win32/diplodlg.c:614
+#: client/gui-sdl/diplodlg.c:580 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 "Zlato(max %d)"
-#: client/gui-sdl/diplodlg.c:613 client/gui-sdl/helpdlg.c:1956
+#: client/gui-sdl/diplodlg.c:614 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 "Technologie"
-#: client/gui-sdl/diplodlg.c:831 client/gui-win32/diplodlg.c:598
+#: client/gui-sdl/diplodlg.c:832 client/gui-win32/diplodlg.c:598
#: data/Freeciv.in:269
msgid "Diplomacy meeting"
msgstr "Diplomatické setkánÃ"
-#: client/gui-sdl/diplodlg.c:883 client/gui-win32/diplodlg.c:680
+#: client/gui-sdl/diplodlg.c:884 client/gui-win32/diplodlg.c:680
#: data/Freeciv.in:510
msgid "Cancel meeting"
msgstr "UkonÄit setkánÃ"
-#: client/gui-sdl/diplodlg.c:895 client/gui-win32/diplodlg.c:679
+#: client/gui-sdl/diplodlg.c:896 client/gui-win32/diplodlg.c:679
#: data/Freeciv.in:501
msgid "Accept treaty"
msgstr "Přijmout dohodu"
#. TRANS: "Polish incident !" FIXME!!!
-#: client/gui-sdl/diplodlg.c:1304
+#: client/gui-sdl/diplodlg.c:1305
#, c-format
msgid "%s incident !"
msgstr "%s incident !"
-#: client/gui-sdl/diplodlg.c:1322
+#: client/gui-sdl/diplodlg.c:1323
msgid "Shall we declare WAR on them?"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1433
+#: client/gui-sdl/diplodlg.c:1434
msgid "Foreign Minister"
msgstr "Ministr zahraniÄÃ"
-#: client/gui-sdl/diplodlg.c:1449
+#: client/gui-sdl/diplodlg.c:1450
#, c-format
msgid ""
"Sir!, the %s ambassador has arrived\n"
"What are your wishes?"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1465
+#: client/gui-sdl/diplodlg.c:1466
msgid "Declare WAR"
msgstr "Vyhlásit VÃLKU"
-#: client/gui-sdl/diplodlg.c:1467 client/gui-win32/plrdlg.c:357
+#: client/gui-sdl/diplodlg.c:1468 client/gui-win32/plrdlg.c:357
msgid "Cancel Treaty"
msgstr "Zrušit dohodu"
-#: client/gui-sdl/diplodlg.c:1490 client/gui-win32/plrdlg.c:358
+#: client/gui-sdl/diplodlg.c:1491 client/gui-win32/plrdlg.c:358
#: data/Freeciv.in:3254
msgid "Withdraw vision"
msgstr "ZruÅ¡it nahlÞenÃ"
-#: client/gui-sdl/diplodlg.c:1507
+#: client/gui-sdl/diplodlg.c:1508
msgid "Call Diplomatic Meeting"
msgstr "Uspořádat Diplomatické setkánÃ"
-#: client/gui-sdl/diplodlg.c:1521
+#: client/gui-sdl/diplodlg.c:1522
msgid "Send him back"
msgstr ""
@@ -14495,12 +14653,12 @@ msgid "Leave Game"
msgstr "Uložit hru"
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1100 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1102 client/gui-xaw/menu.c:121
#: data/Freeciv.in:115 data/Freeciv.in:3180
msgid "Quit"
msgstr "Konec"
-#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:967
msgid "Start New Game"
msgstr "Start nové hry"
@@ -14621,8 +14779,8 @@ msgstr ""
msgid "%s max rate : %d%%"
msgstr "%s max úroveň: %d%%"
-#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
-#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1085
+#: client/gui-win32/connectdlg.c:1093 data/Freeciv.in:155
msgid "Update"
msgstr "Aktualizovat"
@@ -15110,67 +15268,67 @@ msgstr "Nový"
msgid "Delete"
msgstr "Smazat"
-#: client/gui-win32/connectdlg.c:147
+#: client/gui-win32/connectdlg.c:149
msgid "Password:"
msgstr "Heslo:"
-#: client/gui-win32/connectdlg.c:169
+#: client/gui-win32/connectdlg.c:171
msgid "Couldn't load the savegame"
msgstr "Nelze nahrát uloženou hru"
-#: client/gui-win32/connectdlg.c:284 client/gui-xaw/connectdlg.c:311
+#: client/gui-win32/connectdlg.c:286 client/gui-xaw/connectdlg.c:311
msgid "Verify Password"
msgstr "Heslo znovu"
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:916 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr "Freeciv výběr serveru"
-#: client/gui-win32/connectdlg.c:915
+#: client/gui-win32/connectdlg.c:917
msgid "Local Area Network"
msgstr "Lokálnà sÃÅ¥"
-#: client/gui-win32/connectdlg.c:949
+#: client/gui-win32/connectdlg.c:951
msgid "Welcome to Freeciv"
msgstr "VÃtejte ve Freeciv"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Load Saved Game"
msgstr "Nahrát uloženou hru"
-#: client/gui-win32/connectdlg.c:969
+#: client/gui-win32/connectdlg.c:971
msgid "Connect To Network Game"
msgstr "PÅ™ipojit k sÃÅ¥ové hÅ™e"
-#: client/gui-win32/connectdlg.c:979
+#: client/gui-win32/connectdlg.c:981
msgid "Choose a nation to play"
msgstr "Vyberte národ pro hru"
-#: client/gui-win32/connectdlg.c:1014
+#: client/gui-win32/connectdlg.c:1016
msgid "Number of players (Including AI):"
msgstr "PoÄet hráÄů (vÄetnÄ› poÄÃtaÄových):"
-#: client/gui-win32/connectdlg.c:1022
+#: client/gui-win32/connectdlg.c:1024
msgid "AI skill level:"
msgstr "Úroveň poÄÃtaÄem ovládaných hráÄů:"
-#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1038 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr "Možnosti hry"
-#: client/gui-win32/connectdlg.c:1040
+#: client/gui-win32/connectdlg.c:1042
msgid "Start Game"
msgstr "Start hry"
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Login:"
msgstr "Login:"
-#: client/gui-win32/connectdlg.c:1061
+#: client/gui-win32/connectdlg.c:1063
msgid "Host:"
msgstr "Host:"
-#: client/gui-win32/connectdlg.c:1062
+#: client/gui-win32/connectdlg.c:1064
msgid "Port:"
msgstr "Port:"
@@ -15248,21 +15406,21 @@ msgid ""
"this is much slower."
msgstr ""
-#: client/gui-win32/helpdlg.c:769 client/gui-win32/helpdlg.c:792
-#: client/gui-win32/helpdlg.c:803 client/gui-win32/helpdlg.c:809
-#: client/gui-win32/helpdlg.c:822
+#: client/gui-win32/helpdlg.c:775 client/gui-win32/helpdlg.c:798
+#: client/gui-win32/helpdlg.c:809 client/gui-win32/helpdlg.c:815
+#: client/gui-win32/helpdlg.c:828
msgid "Allows "
msgstr "Dovoluje "
-#: client/gui-win32/helpdlg.c:780
+#: client/gui-win32/helpdlg.c:786
msgid "Obsoletes "
msgstr "Zastarává "
-#: client/gui-win32/helpdlg.c:812 client/gui-win32/helpdlg.c:825
+#: client/gui-win32/helpdlg.c:818 client/gui-win32/helpdlg.c:831
msgid " (with "
msgstr " (s "
-#: client/gui-win32/helpdlg.c:815 client/gui-win32/helpdlg.c:828
+#: client/gui-win32/helpdlg.c:821 client/gui-win32/helpdlg.c:834
msgid "?techhelp:)."
msgstr "?techhelp:)."
@@ -16382,11 +16540,12 @@ msgid " Present administrators: "
msgstr " PÅ™Ãtomnà administrátoÅ™i: "
#: 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/"
+" https://gna.org/projects/freeciv/"
msgstr ""
"Pokud naleznete nÄ›jakou chybu, prosÃm poÅ¡lete nám bugreport. Nejlépe pomocà "
"návštěvy Freeciv Bug Tracking System, na:\n"
@@ -18636,6 +18795,7 @@ msgid "Hydro Plant"
msgstr "Hydroelektrárna"
#: data/default/buildings.ruleset:378
+#, fuzzy
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 "
@@ -18643,46 +18803,43 @@ msgid ""
"a Factory, Mfg. Plant and Hydro Plant together give a 150% production "
"bonus.\n"
"\n"
-"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant. A city "
-"can only build a Hydro Plant if it is next to (or on) a Mountain or River "
-"tile."
+"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant."
msgstr ""
"Snižuje množstvà zneÄiÅ¡tÄ›nà produkovaného ve mÄ›stÄ› o 50% a zvyÅ¡uje produkci "
"města, pokud toto má Továrnu neno Výrobnà podnik (mfg. plant). Továrna s "
-"hydroelektrárnou zvýšà produkci o 75%, Výrobnà podnik s Hydroelektrárnou "
-"zvýšà produkci o 150%.\n"
+"Jadernou el. zvýšà produkci o 75%, Výrobnà podnik s Jadernou el. zvýšà "
+"produkci o 150%.\n"
"\n"
"MÄ›sto může mÃt jen jednu elektrárnu - Hydroelektrárnu, (klasickou) "
-"elektrárnu a Jadernou el. MÄ›sto může postavit Hydroelektrárnu jen v pÅ™ÃpadÄ›, "
-"že je na (nebo hned vedle) kopci nebo řece."
+"elektrárnu a Jadernou el. "
-#: data/default/buildings.ruleset:397 data/civ2/buildings.ruleset:373
+#: data/default/buildings.ruleset:396 data/civ2/buildings.ruleset:373
#: data/civ1/buildings.ruleset:297
msgid "Library"
msgstr "Knihovna"
-#: data/default/buildings.ruleset:412
+#: data/default/buildings.ruleset:411
#, no-c-format
msgid "Increases the science output in a city by 100%."
msgstr "Zvyšuje vědecké zdroje ve městě o 100%."
-#: data/default/buildings.ruleset:417 data/civ2/buildings.ruleset:393
+#: data/default/buildings.ruleset:416 data/civ2/buildings.ruleset:393
#: data/civ1/buildings.ruleset:317
msgid "Marketplace"
msgstr "Tržiště"
-#: data/default/buildings.ruleset:432 data/civ2/buildings.ruleset:408
+#: data/default/buildings.ruleset:431 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 "ZvyÅ¡uje spokojenost a pÅ™Ãjmy z danà o 50%."
-#: data/default/buildings.ruleset:437 data/civ2/buildings.ruleset:413
+#: data/default/buildings.ruleset:436 data/civ2/buildings.ruleset:413
#: data/civ1/buildings.ruleset:337
msgid "Mass Transit"
msgstr "Hromadná doprava"
-#: data/default/buildings.ruleset:451 data/civ2/buildings.ruleset:427
+#: data/default/buildings.ruleset:450 data/civ2/buildings.ruleset:427
#: data/civ1/buildings.ruleset:351
msgid ""
"Neutralizes the pollution generated by the population. The population "
@@ -18691,12 +18848,12 @@ msgstr ""
"Nuluje zneÄiÅ¡tÄ›nà produkované populacÃ. Populace jednoduÅ¡e nemá vliv na "
"zneÄiÅ¡tÄ›nà generované mÄ›stem."
-#: data/default/buildings.ruleset:458 data/civ2/buildings.ruleset:434
+#: data/default/buildings.ruleset:457 data/civ2/buildings.ruleset:434
#: data/civ1/buildings.ruleset:358
msgid "Mfg. Plant"
msgstr "Výrobnà podnik (mfg. plant)"
-#: data/default/buildings.ruleset:474 data/civ2/buildings.ruleset:450
+#: data/default/buildings.ruleset:473 data/civ2/buildings.ruleset:450
#: data/civ1/buildings.ruleset:374
#, no-c-format
msgid ""
@@ -18704,12 +18861,12 @@ msgid ""
"production in a city by 100%."
msgstr "Spolu s Továrnou zvýšà produkci ve městě o 100%."
-#: data/default/buildings.ruleset:480 data/civ2/buildings.ruleset:456
+#: data/default/buildings.ruleset:479 data/civ2/buildings.ruleset:456
#: data/civ1/buildings.ruleset:380
msgid "Nuclear Plant"
msgstr "Jaderná elektrárna"
-#: data/default/buildings.ruleset:495
+#: data/default/buildings.ruleset:494
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 "
@@ -18727,11 +18884,11 @@ msgstr ""
"MÄ›sto může mÃt jen jednu elektrárnu - Hydroelektrárnu, (klasickou) "
"elektrárnu a Jadernou el. "
-#: data/default/buildings.ruleset:515 data/civ2/buildings.ruleset:489
+#: data/default/buildings.ruleset:514 data/civ2/buildings.ruleset:489
msgid "Offshore Platform"
msgstr "Těžebnà plošina"
-#: data/default/buildings.ruleset:530 data/civ2/buildings.ruleset:504
+#: data/default/buildings.ruleset:529 data/civ2/buildings.ruleset:504
msgid ""
"Adds 1 extra shield resource on all Ocean squares in a city. The city needs "
"to be coastal to build this improvement."
@@ -18739,12 +18896,12 @@ msgstr ""
"Zvýšà produkci Å¡tÃtů ve mÄ›stÄ› o 1 na vÅ¡ech polÃÄcÃch moÅ™e. MÄ›sto musà ležet "
"na pobÅ™ežÃ, aby mohlo Těžebnà ploÅ¡inu postavit."
-#: data/default/buildings.ruleset:536 data/civ2/buildings.ruleset:510
+#: data/default/buildings.ruleset:535 data/civ2/buildings.ruleset:510
#: data/civ1/buildings.ruleset:411
msgid "Palace"
msgstr "Palác"
-#: data/default/buildings.ruleset:552
+#: data/default/buildings.ruleset:551
#, fuzzy, no-c-format
msgid ""
"Makes a city the capital and the center of your government. Corruption in "
@@ -18769,11 +18926,11 @@ msgstr ""
"obÄanskou válku. Ztráta hlavnÃho mÄ›sta taky znamená ztrátu vesmÃrné lodi, aÅ¥ "
"je v jakémkoliv stavu."
-#: data/default/buildings.ruleset:569 data/civ2/buildings.ruleset:539
+#: data/default/buildings.ruleset:568 data/civ2/buildings.ruleset:539
msgid "Police Station"
msgstr "Policejnà stanice"
-#: data/default/buildings.ruleset:583 data/civ2/buildings.ruleset:553
+#: data/default/buildings.ruleset:582 data/civ2/buildings.ruleset:553
msgid ""
"Reduces the unhappiness caused by military units outside the city by 2 under "
"Democracy and 1 under Republic. This improvement has no effect under other "
@@ -18782,11 +18939,11 @@ msgstr ""
"Snižuje nespokojenost vyvolanou vojenskými jednotkami mimo město o 2 pod "
"Demokracià a o 1 pod Republikou. V ostatnÃch státnÃch zÅ™ÃzenÃch nemá efekt."
-#: data/default/buildings.ruleset:593 data/civ2/buildings.ruleset:560
+#: data/default/buildings.ruleset:592 data/civ2/buildings.ruleset:560
msgid "Port Facility"
msgstr "Loděnice"
-#: data/default/buildings.ruleset:608 data/civ2/buildings.ruleset:575
+#: data/default/buildings.ruleset:607 data/civ2/buildings.ruleset:575
msgid ""
"Allows a city to build veteran sea units. Also, damaged sea units which "
"stay in town for one full turn without moving are completely restored."
@@ -18794,12 +18951,12 @@ msgstr ""
"Umožňuje městu stavit námořnà jednotky se statusem veterán. Poškozené "
"námoÅ™nà jednotky, které strávà celý tah ve mÄ›stÄ›, budou vyléÄeny na maximum."
-#: data/default/buildings.ruleset:615 data/civ2/buildings.ruleset:582
+#: data/default/buildings.ruleset:614 data/civ2/buildings.ruleset:582
#: data/civ1/buildings.ruleset:440
msgid "Power Plant"
msgstr "Elektrárna"
-#: data/default/buildings.ruleset:631
+#: data/default/buildings.ruleset:630
#, no-c-format
msgid ""
"Increases the shield production of a Factory or Mfg. Plant in a city: a "
@@ -18817,12 +18974,12 @@ msgstr ""
"MÄ›sto může mÃt jen jednu elektrárnu - Hydroelektrárnu, (klasickou) "
"elektrárnu a Jadernou el. "
-#: data/default/buildings.ruleset:646 data/civ2/buildings.ruleset:610
+#: data/default/buildings.ruleset:645 data/civ2/buildings.ruleset:610
#: data/civ1/buildings.ruleset:468
msgid "Recycling Center"
msgstr "RecyklaÄnà centrum"
-#: data/default/buildings.ruleset:661 data/civ2/buildings.ruleset:625
+#: data/default/buildings.ruleset:660 data/civ2/buildings.ruleset:625
#: data/civ1/buildings.ruleset:483
#, no-c-format
msgid ""
@@ -18832,11 +18989,11 @@ msgstr ""
"PostavenÃm RecyklaÄnÃho centra snÞÃte množstvà zneÄiÅ¡tÄ›nÃ, produkovaného "
"městem, o 66%."
-#: data/default/buildings.ruleset:667 data/civ2/buildings.ruleset:631
+#: data/default/buildings.ruleset:666 data/civ2/buildings.ruleset:631
msgid "Research Lab"
msgstr "Výzkumná laboratoř"
-#: data/default/buildings.ruleset:682
+#: data/default/buildings.ruleset:681
msgid ""
"Together with a Library, a Research Lab increases the science production of "
"a city by 200%. Together with a Library and a University, a Research Lab "
@@ -18845,11 +19002,11 @@ msgstr ""
"Spolu s knihovnou zrychlà výzkum o 200%. Spolu s knihovnou a univerzitou o "
"450%."
-#: data/default/buildings.ruleset:690 data/civ2/buildings.ruleset:654
+#: data/default/buildings.ruleset:689 data/civ2/buildings.ruleset:654
msgid "SAM Battery"
msgstr "SAM Baterie"
-#: data/default/buildings.ruleset:704 data/civ2/buildings.ruleset:668
+#: data/default/buildings.ruleset:703 data/civ2/buildings.ruleset:668
msgid ""
"Doubles the defense of all units inside the city when attacked by non-"
"nuclear air units."
@@ -18857,12 +19014,12 @@ msgstr ""
"Zdvojnásobà obranyschopnost všem jednotkám ve městě proti leteckým "
"jednotkám. (s výjimkou jaderných zbranÃ)"
-#: data/default/buildings.ruleset:710 data/civ2/buildings.ruleset:674
+#: data/default/buildings.ruleset:709 data/civ2/buildings.ruleset:674
#: data/civ1/buildings.ruleset:489
msgid "SDI Defense"
msgstr "SDI obrana"
-#: data/default/buildings.ruleset:724 data/civ2/buildings.ruleset:688
+#: data/default/buildings.ruleset:723 data/civ2/buildings.ruleset:688
#: data/civ1/buildings.ruleset:503
msgid ""
"Protects a city from attacks from Nuclear units. Nuclear attacks simply "
@@ -18872,11 +19029,11 @@ msgstr ""
"Chránà mÄ›sto pÅ™ed útokem jaderných zbranÃ. Jaderné útoky jsou jednoduÅ¡e bez "
"efektu v tomto mÄ›stÄ›. Také zdvojnásobuje obranu proti konvenÄnÃm raketám."
-#: data/default/buildings.ruleset:733 data/civ2/buildings.ruleset:697
+#: data/default/buildings.ruleset:732 data/civ2/buildings.ruleset:697
msgid "Sewer System"
msgstr "KanalizaÄnà systém"
-#: data/default/buildings.ruleset:748 data/civ2/buildings.ruleset:712
+#: data/default/buildings.ruleset:747 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."
@@ -18884,12 +19041,12 @@ msgstr ""
"Umožnà se městu rozrůst nad velikost 12. Samotný akvadukt je požadován před "
"kanalizacà a umožnà městu růst nad velikost 8."
-#: data/default/buildings.ruleset:754 data/civ2/buildings.ruleset:749
+#: data/default/buildings.ruleset:753 data/civ2/buildings.ruleset:749
#: data/civ1/buildings.ruleset:512
msgid "Space Component"
msgstr "PÅ™ÃsluÅ¡enstvà vesmÃrné lodi. "
-#: data/default/buildings.ruleset:769 data/civ2/buildings.ruleset:763
+#: data/default/buildings.ruleset:768 data/civ2/buildings.ruleset:763
#: data/civ1/buildings.ruleset:526
msgid ""
"Space Components can be differentiated into Propulsion and Fuel Components. "
@@ -18906,12 +19063,12 @@ msgstr ""
"DÅ™Ãve, než budete moci stavÄ›t tyto dÃly, bude muset nÄ›která civilizace "
"postavit div sveta Program Apollo."
-#: data/default/buildings.ruleset:779 data/civ2/buildings.ruleset:773
+#: data/default/buildings.ruleset:778 data/civ2/buildings.ruleset:773
#: data/civ1/buildings.ruleset:536
msgid "Space Module"
msgstr "Modul vesmÃrné lodi"
-#: data/default/buildings.ruleset:794 data/civ2/buildings.ruleset:787
+#: data/default/buildings.ruleset:793 data/civ2/buildings.ruleset:787
#: data/civ1/buildings.ruleset:550
msgid ""
"Space Modules are the most expensive parts of spaceships. There are three "
@@ -18945,12 +19102,12 @@ msgstr ""
"DÅ™Ãve, než budete moci stavÄ›t tyto dÃly, bude muset nÄ›která civilizace "
"postavit div sveta Program Apollo."
-#: data/default/buildings.ruleset:813 data/civ2/buildings.ruleset:806
+#: data/default/buildings.ruleset:812 data/civ2/buildings.ruleset:806
#: data/civ1/buildings.ruleset:569
msgid "Space Structural"
msgstr "Konstrukce vesmÃrné lodi"
-#: data/default/buildings.ruleset:828 data/civ2/buildings.ruleset:820
+#: data/default/buildings.ruleset:827 data/civ2/buildings.ruleset:820
#: data/civ1/buildings.ruleset:583
msgid ""
"Space Structurals form the base of your spaceship. All other spaceship "
@@ -18967,11 +19124,11 @@ msgstr ""
"DÅ™Ãve, než budete moci stavÄ›t tyto dÃly, bude muset nÄ›která civilizace "
"postavit div sveta Program Apollo."
-#: data/default/buildings.ruleset:838 data/civ2/buildings.ruleset:830
+#: data/default/buildings.ruleset:837 data/civ2/buildings.ruleset:830
msgid "Stock Exchange"
msgstr "Burza"
-#: data/default/buildings.ruleset:854 data/civ2/buildings.ruleset:846
+#: data/default/buildings.ruleset:853 data/civ2/buildings.ruleset:846
#, no-c-format
msgid ""
"Together with a Marketplace and a Bank, a Stock Exchange boosts tax and "
@@ -18979,22 +19136,22 @@ msgid ""
msgstr ""
"Spolu s Tržištěm a Bankou Vám Burza zvedne blahobyt a zisk z danà o 150%"
-#: data/default/buildings.ruleset:860 data/civ2/buildings.ruleset:852
+#: data/default/buildings.ruleset:859 data/civ2/buildings.ruleset:852
msgid "Super Highways"
msgstr "Superdálnice"
-#: data/default/buildings.ruleset:875 data/civ2/buildings.ruleset:867
+#: data/default/buildings.ruleset:874 data/civ2/buildings.ruleset:867
#, no-c-format
msgid ""
"Increases trade resources by 50% on all squares with roads or railroads."
msgstr ""
"ZvyÅ¡uje obchodnà zdroje o 50% na vÅ¡ech polÃch s cestami nebo železnicÃ."
-#: data/default/buildings.ruleset:883 data/civ2/buildings.ruleset:873
+#: data/default/buildings.ruleset:882 data/civ2/buildings.ruleset:873
msgid "Supermarket"
msgstr "Supermarket"
-#: data/default/buildings.ruleset:898 data/civ2/buildings.ruleset:888
+#: data/default/buildings.ruleset:897 data/civ2/buildings.ruleset:888
#, no-c-format
msgid ""
"Increases the food resources by 50% on each farmland square which is being "
@@ -19004,12 +19161,12 @@ msgstr ""
"ZvyÅ¡uje produkci jÃdla každé obdÄ›lávané farmy kolem mÄ›sta. Farma je polÃÄko, "
"na kterém bylo podruhé vybudováno zavlažovánÃ."
-#: data/default/buildings.ruleset:905 data/civ2/buildings.ruleset:895
+#: data/default/buildings.ruleset:904 data/civ2/buildings.ruleset:895
#: data/civ1/buildings.ruleset:593
msgid "Temple"
msgstr "Chrám"
-#: data/default/buildings.ruleset:919 data/civ2/buildings.ruleset:909
+#: data/default/buildings.ruleset:918 data/civ2/buildings.ruleset:909
#: data/civ1/buildings.ruleset:607
msgid ""
"Makes one unhappy citizen content. Both the Mysticism advance and the "
@@ -19020,25 +19177,25 @@ msgstr ""
"Mysticismus i div svÄ›ta VěšÃrna zdvojnásobà efekt. S Mysticismem a věštÃrnou "
"udělá chrám 4 spokojené lidi na úkor nespokojených."
-#: data/default/buildings.ruleset:926 data/civ2/buildings.ruleset:916
+#: data/default/buildings.ruleset:925 data/civ2/buildings.ruleset:916
#: data/civ1/buildings.ruleset:614 data/default/techs.ruleset:742
#: data/civ2/techs.ruleset:727 data/civ1/techs.ruleset:723
msgid "University"
msgstr "Univerzita"
-#: data/default/buildings.ruleset:942
+#: data/default/buildings.ruleset:941
#, no-c-format
msgid ""
"Together with a Library, a University increases the science production of a "
"city by 250%."
msgstr "Spolu s knihovnou zvýšà rychlost výzkumu ve městě o 200%."
-#: data/default/buildings.ruleset:948 data/civ2/buildings.ruleset:938
+#: data/default/buildings.ruleset:947 data/civ2/buildings.ruleset:938
#: data/civ1/buildings.ruleset:636
msgid "Apollo Program"
msgstr "Program Apollo"
-#: data/default/buildings.ruleset:962 data/civ2/buildings.ruleset:952
+#: data/default/buildings.ruleset:961 data/civ2/buildings.ruleset:952
msgid ""
"Entire map becomes visible for the player who owns it. It allows all "
"players to start building spaceship parts (assuming they have researched the "
@@ -19048,11 +19205,11 @@ msgstr ""
"Apollo umožnà vÅ¡em hráÄům zahájit stavbu vesmÃrné lodi, pokud jsou na "
"dostateÄné technologické úrovni."
-#: data/default/buildings.ruleset:969 data/civ2/buildings.ruleset:959
+#: data/default/buildings.ruleset:968 data/civ2/buildings.ruleset:959
msgid "A.Smith's Trading Co."
msgstr "A.Smithova obch.spol."
-#: data/default/buildings.ruleset:983
+#: data/default/buildings.ruleset:982
msgid ""
"City improvements which would normally have an upkeep of 1 are free of "
"upkeep, for all your cities."
@@ -19060,12 +19217,12 @@ msgstr ""
"Každé vybavenà města, které potřebuje pro údržbu 1 jednotku (blbý překlad "
"co?) bude s tÃmto divem svÄ›ta zdarma ve vÅ¡ech mÄ›stech."
-#: data/default/buildings.ruleset:989 data/civ2/buildings.ruleset:979
+#: data/default/buildings.ruleset:988 data/civ2/buildings.ruleset:979
#: data/civ1/buildings.ruleset:655
msgid "Colossus"
msgstr "Kolos"
-#: data/default/buildings.ruleset:1003 data/civ2/buildings.ruleset:993
+#: data/default/buildings.ruleset:1002 data/civ2/buildings.ruleset:993
#: data/civ1/buildings.ruleset:669
msgid ""
"Each square around the city where this wonder is built that is already "
@@ -19074,23 +19231,23 @@ msgstr ""
"Každé polÃÄko, které produkuje nÄ›jaké obchodnà pÅ™Ãležitosti, bude produkovat "
"o 1 vÃc."
-#: data/default/buildings.ruleset:1009 data/civ2/buildings.ruleset:999
+#: data/default/buildings.ruleset:1008 data/civ2/buildings.ruleset:999
#: data/civ1/buildings.ruleset:675
msgid "Copernicus' Observatory"
msgstr "Kopernikova observatoÅ™"
-#: data/default/buildings.ruleset:1024 data/civ2/buildings.ruleset:1180
+#: data/default/buildings.ruleset:1023 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 "ZvyÅ¡uje vÄ›decký výstup o 100% ve mÄ›stÄ› kde stojÃ."
-#: data/default/buildings.ruleset:1029 data/civ2/buildings.ruleset:1019
+#: data/default/buildings.ruleset:1028 data/civ2/buildings.ruleset:1019
#: data/civ1/buildings.ruleset:695
msgid "Cure For Cancer"
msgstr "Lék proti rakovině"
-#: data/default/buildings.ruleset:1043
+#: data/default/buildings.ruleset:1042
msgid ""
"This stunning technological achievement makes one unhappy citizen content in "
"all your cities."
@@ -19098,12 +19255,12 @@ msgstr ""
"Tato úžasná technologická vymoženost udÄ›lá jednoho obÄana spokojeného na "
"úkor nespokojených v každém Vašem městě."
-#: data/default/buildings.ruleset:1051 data/civ2/buildings.ruleset:1039
+#: data/default/buildings.ruleset:1050 data/civ2/buildings.ruleset:1039
#: data/civ1/buildings.ruleset:715
msgid "Darwin's Voyage"
msgstr "Darwinova cesta"
-#: data/default/buildings.ruleset:1065 data/civ2/buildings.ruleset:1053
+#: data/default/buildings.ruleset:1064 data/civ2/buildings.ruleset:1053
#: data/civ1/buildings.ruleset:729
msgid ""
"Charles Darwin's voyage sparked the discovery of the evolution of the "
@@ -19113,11 +19270,11 @@ msgstr ""
"Cesta Charlese Darwina odstartovala objev evoluce druhů, což způsobilo většà "
"odvahu ve výzkumech. Tento div dává dva okamžité vynálezy."
-#: data/default/buildings.ruleset:1072 data/civ2/buildings.ruleset:1060
+#: data/default/buildings.ruleset:1071 data/civ2/buildings.ruleset:1060
msgid "Eiffel Tower"
msgstr "Eiffelova věž"
-#: data/default/buildings.ruleset:1087
+#: data/default/buildings.ruleset:1086
#, fuzzy, no-c-format
msgid ""
"Your reputation and goodwill among other nations is recovered twice as fast."
@@ -19125,12 +19282,12 @@ msgstr ""
"VaÅ¡e reputace a dobrá vůle vůÄi ostatnÃm národům se zvýšÃ, pokud vlastnÃte "
"tento div. Reputace se navracà dvakrát rychleji než normálně."
-#: data/default/buildings.ruleset:1093 data/civ2/buildings.ruleset:1081
+#: data/default/buildings.ruleset:1092 data/civ2/buildings.ruleset:1081
#: data/civ1/buildings.ruleset:736
msgid "Great Library"
msgstr "Velká knihovna"
-#: data/default/buildings.ruleset:1107 data/civ2/buildings.ruleset:1095
+#: data/default/buildings.ruleset:1106 data/civ2/buildings.ruleset:1095
#: data/civ1/buildings.ruleset:750
msgid ""
"The civilization which builds the Great Library gets every advance that at "
@@ -19139,21 +19296,21 @@ msgstr ""
"Civilizace, která postavà Velkou knihovnu zÃská každý vynález, který už "
"znajà alespoň dva ostatnà národy."
-#: data/default/buildings.ruleset:1113 data/civ2/buildings.ruleset:1101
+#: data/default/buildings.ruleset:1112 data/civ2/buildings.ruleset:1101
#: data/civ1/buildings.ruleset:756
msgid "Great Wall"
msgstr "Velká zeÄ"
-#: data/default/buildings.ruleset:1127
+#: data/default/buildings.ruleset:1126
msgid "Works as a City Wall in all your cities."
msgstr "Funguje jako Hradby v každém městě."
-#: data/default/buildings.ruleset:1135 data/civ2/buildings.ruleset:1122
+#: data/default/buildings.ruleset:1134 data/civ2/buildings.ruleset:1122
#: data/civ1/buildings.ruleset:777
msgid "Hanging Gardens"
msgstr "Visuté zahrady"
-#: data/default/buildings.ruleset:1149 data/civ2/buildings.ruleset:1136
+#: data/default/buildings.ruleset:1148 data/civ2/buildings.ruleset:1136
#: data/civ1/buildings.ruleset:791
msgid ""
"Makes one content citizen happy in every city. Makes two extra content "
@@ -19167,12 +19324,12 @@ msgstr ""
"ve mÄ›stÄ› nejsou spokojenà lidé, efekt pracuje na nespokojených (Äinà "
"jespokojenými)."
-#: data/default/buildings.ruleset:1158 data/civ2/buildings.ruleset:1145
+#: data/default/buildings.ruleset:1157 data/civ2/buildings.ruleset:1145
#: data/civ1/buildings.ruleset:800
msgid "Hoover Dam"
msgstr "Hooverova hydroelektrárna"
-#: data/default/buildings.ruleset:1173 data/civ2/buildings.ruleset:1159
+#: data/default/buildings.ruleset:1172 data/civ2/buildings.ruleset:1159
msgid ""
"Works as if you had a Hydro Plant in every city. (This reduces pollution "
"and increases the effects of Factories and Mfg. Plants.)"
@@ -19180,12 +19337,12 @@ msgstr ""
"Funguje jako hydroelektrárna v každém mÄ›stÄ›. (to snižuje zneÄiÅ¡tÄ›nà a "
"zvyÅ¡uje efekt továren a výrobnÃch podniků)"
-#: data/default/buildings.ruleset:1179 data/civ2/buildings.ruleset:1165
+#: data/default/buildings.ruleset:1178 data/civ2/buildings.ruleset:1165
#: data/civ1/buildings.ruleset:822
msgid "Isaac Newton's College"
msgstr "Univerzita Izáka Newtona"
-#: data/default/buildings.ruleset:1194
+#: data/default/buildings.ruleset:1193
#, no-c-format
msgid ""
"Boosts science production by 100% in every city you control that has a "
@@ -19193,20 +19350,20 @@ msgid ""
msgstr ""
"Zvyšuje vědecký výstup o 100% v každém městě, které ovládáme a má univerzitu."
-#: data/default/buildings.ruleset:1200 data/civ2/buildings.ruleset:1185
+#: data/default/buildings.ruleset:1199 data/civ2/buildings.ruleset:1185
#: data/civ1/buildings.ruleset:842
msgid "J.S. Bach's Cathedral"
msgstr "Katedrála J.S. Bacha"
-#: data/default/buildings.ruleset:1214 data/civ2/buildings.ruleset:1199
+#: data/default/buildings.ruleset:1213 data/civ2/buildings.ruleset:1199
msgid "Makes two unhappy citizens content in every city."
msgstr "UÄinà dva nespokojené lidi spokojenými v každém mÄ›stÄ›."
-#: data/default/buildings.ruleset:1219 data/civ2/buildings.ruleset:1204
+#: data/default/buildings.ruleset:1218 data/civ2/buildings.ruleset:1204
msgid "King Richard's Crusade"
msgstr "Křižáci krále Richarda"
-#: data/default/buildings.ruleset:1233 data/civ2/buildings.ruleset:1218
+#: data/default/buildings.ruleset:1232 data/civ2/buildings.ruleset:1218
msgid ""
"Adds one extra shield resource on every square around the city where it is "
"built."
@@ -19214,20 +19371,20 @@ msgstr ""
"Ve mÄ›stÄ›, které tento div postavÃ, se zvýšà produkce Å¡tÃtů každého polÃÄka o "
"1."
-#: data/default/buildings.ruleset:1239 data/civ2/buildings.ruleset:1224
+#: data/default/buildings.ruleset:1238 data/civ2/buildings.ruleset:1224
msgid "Leonardo's Workshop"
msgstr "Leonardova dÃlna"
-#: data/default/buildings.ruleset:1253 data/civ2/buildings.ruleset:1238
+#: data/default/buildings.ruleset:1252 data/civ2/buildings.ruleset:1238
msgid "Upgrades one obsolete unit per game turn."
msgstr "Vylepšà jednu zastaralou jednotku každý hernà tah."
-#: data/default/buildings.ruleset:1258 data/civ2/buildings.ruleset:1243
+#: data/default/buildings.ruleset:1257 data/civ2/buildings.ruleset:1243
#: data/civ1/buildings.ruleset:862
msgid "Lighthouse"
msgstr "Maják"
-#: data/default/buildings.ruleset:1273
+#: data/default/buildings.ruleset:1272
msgid ""
"Gives all your sea units 1 additional movement point and eliminates the risk "
"of losing Triremes on the high seas. Makes all your new sea units veterans "
@@ -19237,34 +19394,34 @@ msgstr ""
"ztráty triméry na otevÅ™eném moÅ™i. VÅ¡echny novÄ› postavené lodÄ› budou mÃt "
"status veterán. "
-#: data/default/buildings.ruleset:1280 data/civ2/buildings.ruleset:1264
+#: data/default/buildings.ruleset:1279 data/civ2/buildings.ruleset:1264
#: data/civ1/buildings.ruleset:885
msgid "Magellan's Expedition"
msgstr "Magellanova expedice"
-#: data/default/buildings.ruleset:1295
+#: data/default/buildings.ruleset:1294
msgid "Gives all your sea units 2 additional movement points."
msgstr "PÅ™idá vÅ¡em námoÅ™nÃm jednotkám navÃc 2 pohybové body."
-#: data/default/buildings.ruleset:1300 data/civ2/buildings.ruleset:1283
+#: data/default/buildings.ruleset:1299 data/civ2/buildings.ruleset:1283
#: data/civ1/buildings.ruleset:904
msgid "Manhattan Project"
msgstr "Manhattanský projekt"
-#: data/default/buildings.ruleset:1318 data/civ2/buildings.ruleset:1301
+#: data/default/buildings.ruleset:1317 data/civ2/buildings.ruleset:1301
msgid "Marco Polo's Embassy"
msgstr "Vyslanectvà Marca Pola"
-#: data/default/buildings.ruleset:1332 data/civ2/buildings.ruleset:1315
+#: data/default/buildings.ruleset:1331 data/civ2/buildings.ruleset:1315
msgid "The player who owns it gets an embassy with all players."
msgstr "HráÄ, který ji vlastnÃ, zÃská ambasádu u každého hráÄe."
-#: data/default/buildings.ruleset:1337 data/civ2/buildings.ruleset:1320
+#: data/default/buildings.ruleset:1336 data/civ2/buildings.ruleset:1320
#: data/civ1/buildings.ruleset:922
msgid "Michelangelo's Chapel"
msgstr "Michelangelova kaple"
-#: data/default/buildings.ruleset:1351 data/civ2/buildings.ruleset:1334
+#: data/default/buildings.ruleset:1350 data/civ2/buildings.ruleset:1334
msgid ""
"Counts as having a Cathedral in each of your cities. This makes 3 unhappy "
"citizens content in each city. The discovery of Theology increases the "
@@ -19276,21 +19433,21 @@ msgstr ""
"spokojenými v každém městě. Objev Teologie zvýšà efekt katedrál o 1. Objev "
"Socialismu efekt o 1 snÞÃ."
-#: data/default/buildings.ruleset:1361 data/civ2/buildings.ruleset:1344
+#: data/default/buildings.ruleset:1360 data/civ2/buildings.ruleset:1344
#: data/civ1/buildings.ruleset:941
msgid "Oracle"
msgstr "VěštÃrna"
-#: data/default/buildings.ruleset:1375
+#: data/default/buildings.ruleset:1374
msgid "Makes two of your unhappy citizens content in every city with a temple."
msgstr "UÄinà dva nespokojené lidi spokojenými v každém mÄ›stÄ› s chrámem."
-#: data/default/buildings.ruleset:1380 data/civ2/buildings.ruleset:1363
+#: data/default/buildings.ruleset:1379 data/civ2/buildings.ruleset:1363
#: data/civ1/buildings.ruleset:960
msgid "Pyramids"
msgstr "Pyramidy"
-#: data/default/buildings.ruleset:1394
+#: data/default/buildings.ruleset:1393
#, fuzzy
msgid ""
"The amount of stored food lost when one of your cities grows or shrinks is "
@@ -19301,30 +19458,30 @@ msgstr ""
"nebo naplněna. To pomůže městu rychleji růst a lépe se vyrovnávat s "
"hladomorem."
-#: data/default/buildings.ruleset:1401 data/civ2/buildings.ruleset:1382
+#: data/default/buildings.ruleset:1400 data/civ2/buildings.ruleset:1382
#: data/civ1/buildings.ruleset:981
msgid "SETI Program"
msgstr "SETI Program"
-#: data/default/buildings.ruleset:1415
+#: data/default/buildings.ruleset:1414
msgid "Boosts science production in each city with a Research Lab by 100%. "
msgstr "Zvýšà vědeckou produkci v každém městě s výzkumnou laboratořà o 100%."
-#: data/default/buildings.ruleset:1420 data/civ2/buildings.ruleset:1402
+#: data/default/buildings.ruleset:1419 data/civ2/buildings.ruleset:1402
#: data/civ1/buildings.ruleset:1001
msgid "Shakespeare's Theatre"
msgstr "Shakespeareovo divadlo"
-#: data/default/buildings.ruleset:1434 data/civ2/buildings.ruleset:1416
+#: data/default/buildings.ruleset:1433 data/civ2/buildings.ruleset:1416
#: data/civ1/buildings.ruleset:1015
msgid "Makes all unhappy citizens content, in the city where it is located."
msgstr "UÄinà spokojenými vÅ¡echny nespokojené lidi ve mÄ›stÄ›, kde je postaveno."
-#: data/default/buildings.ruleset:1439 data/civ2/buildings.ruleset:1421
+#: data/default/buildings.ruleset:1438 data/civ2/buildings.ruleset:1421
msgid "Statue of Liberty"
msgstr "Socha svobody"
-#: data/default/buildings.ruleset:1453 data/civ2/buildings.ruleset:1435
+#: data/default/buildings.ruleset:1452 data/civ2/buildings.ruleset:1435
#: data/civ1/buildings.ruleset:974 data/civ1/buildings.ruleset:1034
msgid ""
"Allows you to choose any government, including those that have not yet been "
@@ -19334,11 +19491,11 @@ msgstr ""
"Umožnà Vám zvolit si libovolný typ vlády, vÄetnÄ› tÄ›ch, které jste jeÅ¡tÄ› "
"nevynalezli a bez přechodného obdobà anarchie."
-#: data/default/buildings.ruleset:1460 data/civ2/buildings.ruleset:1442
+#: data/default/buildings.ruleset:1459 data/civ2/buildings.ruleset:1442
msgid "Sun Tzu's War Academy"
msgstr "Sun Tzuova Bojová akademie"
-#: data/default/buildings.ruleset:1474
+#: data/default/buildings.ruleset:1473
msgid ""
"All your new ground units start at the first veteran level. The chance of a "
"unit getting the next veteran level after a battle increases by half."
@@ -19347,21 +19504,21 @@ msgstr ""
"veteran. Å ance, že VaÅ¡e jednotka zÃská dalšà úroveň po boji se o polovinu "
"zvýšÃ."
-#: data/default/buildings.ruleset:1481 data/civ2/buildings.ruleset:1463
+#: data/default/buildings.ruleset:1480 data/civ2/buildings.ruleset:1463
#: data/civ1/buildings.ruleset:1020
msgid "United Nations"
msgstr "Organizace spojených národů"
-#: data/default/buildings.ruleset:1495
+#: data/default/buildings.ruleset:1494
msgid "All your units regain two extra hitpoints per turn."
msgstr "VÅ¡echny jednotky se budou léÄit každým tahem o 2 body zdravÃ."
-#: data/default/buildings.ruleset:1508 data/civ2/buildings.ruleset:1490
+#: data/default/buildings.ruleset:1507 data/civ2/buildings.ruleset:1490
#: data/civ1/buildings.ruleset:1046
msgid "Women's Suffrage"
msgstr "Volebnà právo žen"
-#: data/default/buildings.ruleset:1522 data/civ2/buildings.ruleset:1504
+#: data/default/buildings.ruleset:1521 data/civ2/buildings.ruleset:1504
msgid ""
"Counts as a Police Station in every city. (That is, for each city, reduces "
"unhappiness for military units outside the city by 2 under Democracy and 1 "
@@ -19371,11 +19528,11 @@ msgstr ""
"obyvatele z nespokojených pod Demokracià a jednoho pod Republikou. V "
"ostatnÃch typech vlády nemá vliv)"
-#: data/default/buildings.ruleset:1533
+#: data/default/buildings.ruleset:1532
msgid "Coinage"
msgstr "Ražba mincÃ"
-#: data/default/buildings.ruleset:1554
+#: data/default/buildings.ruleset:1553
msgid ""
"This is not a normal improvement. Instead, setting a city's production to "
"Coinage means its shield production is converted to tax output (money, "
@@ -19804,11 +19961,16 @@ msgstr "?citystyle:Keltský"
msgid "?citystyle:Industrial"
msgstr "?citystyle:Průmyslový"
-#: data/default/cities.ruleset:139 data/civ2/cities.ruleset:150
+#: data/default/cities.ruleset:139
+#, fuzzy
+msgid "?citystyle:ElectricAge"
+msgstr "?citystyle:Keltský"
+
+#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:150
msgid "?citystyle:Modern"
msgstr "?citystyle:ModernÃ"
-#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:161
+#: data/default/cities.ruleset:161 data/civ2/cities.ruleset:161
msgid "?citystyle:PostModern"
msgstr "?citystyle:PostModernÃ"
@@ -24997,6 +25159,39 @@ msgstr "Tým 30"
msgid "Team 31"
msgstr "Tým 31"
+#~ 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."
+
+#~ msgid "Observers cannot vote."
+#~ msgstr "Pozorovatelé nemohou hlasovat."
+
+#~ msgid "Vote %d \"%s\": %d for, %d against"
+#~ msgstr "Hlasovánà %d \"%s\": %d pro, %d proti"
+
+#~ msgid "Value must be integer."
+#~ msgstr "Hodnota musà být celé ÄÃslo."
+
+#~ 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 Hydro Plant, Power Plant, or Nuclear Plant. A "
+#~ "city can only build a Hydro Plant if it is next to (or on) a Mountain or "
+#~ "River tile."
+#~ msgstr ""
+#~ "Snižuje množstvà zneÄiÅ¡tÄ›nà produkovaného ve mÄ›stÄ› o 50% a zvyÅ¡uje "
+#~ "produkci města, pokud toto má Továrnu neno Výrobnà podnik (mfg. plant). "
+#~ "Továrna s hydroelektrárnou zvýšà produkci o 75%, Výrobnà podnik s "
+#~ "Hydroelektrárnou zvýšà produkci o 150%.\n"
+#~ "\n"
+#~ "MÄ›sto může mÃt jen jednu elektrárnu - Hydroelektrárnu, (klasickou) "
+#~ "elektrárnu a Jadernou el. Město může postavit Hydroelektrárnu jen v "
+#~ "pÅ™ÃpadÄ›, že je na (nebo hned vedle) kopci nebo Å™ece."
+
#, fuzzy
#~ msgid "Auth config filename \"%s\" not allowed!"
#~ msgstr "Toto jméno nenà povoleno."
diff --git a/po/da.gmo b/po/da.gmo
index 60f2a0b..7888462 100644
Binary files a/po/da.gmo and b/po/da.gmo differ
diff --git a/po/da.po b/po/da.po
index e346a36..8f6f5eb 100644
--- a/po/da.po
+++ b/po/da.po
@@ -18,8 +18,8 @@ msgid ""
msgstr ""
"Project-Id-Version: da\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-29 21:13+0900\n"
-"PO-Revision-Date: 2009-03-07 18:43+0300\n"
+"POT-Creation-Date: 2009-11-22 21:37+0100\n"
+"PO-Revision-Date: 2009-11-12 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"
@@ -75,21 +75,21 @@ msgstr "?Forældet:F"
msgid "?redundant:*"
msgstr "?Overflødig:*"
-#: common/connection.c:515
+#: common/connection.c:518
#, c-format
msgid "%s from %s"
msgstr "%s fra %s"
-#: common/connection.c:521
+#: common/connection.c:524
msgid " (connection incomplete)"
msgstr " (tilslutning ikke fuldført)"
-#: common/connection.c:525
+#: common/connection.c:528
#, c-format
msgid " (player %s)"
msgstr " (spiller %s)"
-#: common/connection.c:529
+#: common/connection.c:532
msgid " (observer)"
msgstr " (observatør)"
@@ -103,7 +103,7 @@ msgstr "By: Indtaget/ødelagt"
#: common/events.c:44
msgid "City: Celebrating"
-msgstr "By: Fester"
+msgstr "By: Afholder festivitas"
#: common/events.c:45
msgid "City: Civil Disorder"
@@ -493,81 +493,81 @@ msgstr "Kopler til/fra beskeder"
msgid "AI Debug messages"
msgstr "AI fejlrettelse beskeder"
-#: common/player.c:732
+#: common/player.c:746
msgid "?attitude:Genocidal"
msgstr "?attitude:Morderisk"
-#: common/player.c:734
+#: common/player.c:748
msgid "?attitude:Belligerent"
msgstr "?attitude:Krigerisk"
-#: common/player.c:736
+#: common/player.c:750
msgid "?attitude:Hostile"
msgstr "?attitude:Fjendtlig"
-#: common/player.c:738
+#: common/player.c:752
msgid "?attitude:Uncooperative"
msgstr "?attitude:Usamarbejdsvillig"
-#: common/player.c:740
+#: common/player.c:754
msgid "?attitude:Uneasy"
msgstr "?attitude:Urolig"
-#: common/player.c:742
+#: common/player.c:756
msgid "?attitude:Neutral"
msgstr "?attitude:Neutral"
-#: common/player.c:744
+#: common/player.c:758
msgid "?attitude:Respectful"
msgstr "?attitude:Ærefuld"
-#: common/player.c:746
+#: common/player.c:760
msgid "?attitude:Helpful"
msgstr "?attitude:Hjælpsom"
-#: common/player.c:748
+#: common/player.c:762
msgid "?attitude:Enthusiastic"
msgstr "?attitude:Begejstret"
-#: common/player.c:750
+#: common/player.c:764
msgid "?attitude:Admiring"
msgstr "?attitude:Beundring"
-#: common/player.c:753
+#: common/player.c:767
msgid "?attitude:Worshipful"
msgstr "?attitude:Ærværdig"
-#: common/player.c:764
+#: common/player.c:778
msgid "?diplomatic_state:Armistice"
msgstr "?diplomatic_state:VÃ¥benstilstand"
-#: common/player.c:765
+#: common/player.c:779
msgid "?diplomatic_state:War"
msgstr "?diplomatic_state:Krig"
-#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:780 client/gui-gtk-2.0/diplodlg.c:353
#: 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:767 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:781 client/gui-gtk-2.0/diplodlg.c:358
#: 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:768 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:782 client/gui-gtk-2.0/diplodlg.c:363
#: 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:769
+#: common/player.c:783
msgid "?diplomatic_state:Never met"
msgstr "?diplomatic_state:Aldrig mødt"
-#: common/player.c:770
+#: common/player.c:784
msgid "?diplomatic_state:Team"
msgstr "?diplomatic_state:Hold"
@@ -598,7 +598,7 @@ msgstr "Overlevelseskrav kunderstøttes kun for vidundere."
#. TRANS: "Resources: (none)".
#: common/requirements.c:1014 common/team.c:132
#: client/gui-gtk-2.0/helpdlg.c:1055 client/gui-gtk-2.0/inteldlg.c:390
-#: client/gui-win32/helpdlg.c:586 client/gui-xaw/helpdlg.c:991
+#: client/gui-win32/helpdlg.c:592 client/gui-xaw/helpdlg.c:991
#, c-format
msgid "(none)"
msgstr "(ingen)"
@@ -624,10 +624,11 @@ msgstr "Fremtidsteknologi %d"
#: 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
#: client/gui-sdl/helpdlg.c:817 client/gui-sdl/mapview.c:962
-#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:545
-#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:735
-#: 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
+#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:544
+#: client/gui-win32/helpdlg.c:551 client/gui-win32/helpdlg.c:721
+#: client/gui-win32/helpdlg.c:741 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 "Ingen"
@@ -640,29 +641,29 @@ msgstr "Fremtidsteknologi"
msgid "(Unknown)"
msgstr "(Ukendt)"
-#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:553
#: manual/civmanual.c:224
msgid "Road"
msgstr "Vej"
-#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:557
#: client/gui-gtk-2.0/menu.c:829 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:394 common/terrain.c:572 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:567
#: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
#: data/civ1/techs.ruleset:563
msgid "Railroad"
msgstr "Jernbane"
-#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:555
msgid "Mine"
msgstr "Mine"
-#: common/terrain.c:396 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:551 server/report.c:124
#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "Forurening"
@@ -671,7 +672,7 @@ msgstr "Forurening"
msgid "Hut"
msgstr "Landsby"
-#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:563
#: manual/civmanual.c:226
msgid "Fortress"
msgstr "Befæstning"
@@ -684,58 +685,58 @@ msgstr "Flod"
msgid "Farmland"
msgstr "Dyrket land"
-#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:577
#: manual/civmanual.c:226
msgid "Airbase"
msgstr "Flybase"
-#: common/terrain.c:402 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:579
msgid "Fallout"
msgstr "Atomaffald"
-#: common/unit.c:546 client/gui-win32/plrdlg.c:337
+#: common/unit.c:549 client/gui-win32/plrdlg.c:337
msgid "Idle"
msgstr "Inaktiv"
-#: common/unit.c:556
+#: common/unit.c:559
msgid "Fortifying"
msgstr "Befæster"
-#: common/unit.c:558
+#: common/unit.c:561
msgid "Fortified"
msgstr "Befæstet"
-#: common/unit.c:562 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
+#: common/unit.c:565 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
msgid "Sentry"
msgstr "Hold stand"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
+#: common/unit.c:569 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
#: client/gui-win32/menu.c:370 client/gui-xaw/menu.c:185
msgid "Pillage"
msgstr "Plyndr"
-#: common/unit.c:568 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
+#: common/unit.c:571 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
msgid "Goto"
msgstr "GÃ¥ til"
-#: common/unit.c:570
+#: common/unit.c:573
msgid "Explore"
msgstr "Udforsk"
-#: common/unit.c:572 manual/civmanual.c:224
+#: common/unit.c:575 manual/civmanual.c:224
msgid "Transform"
msgstr "Transformér"
-#: common/unit.c:584 client/text.c:157 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:587 client/text.c:157 client/gui-sdl/citydlg.c:1972
#: client/gui-win32/citydlg.c:1257 client/gui-xaw/citydlg.c:1423
msgid "Unknown"
msgstr "Ukendt"
-#: common/unit.c:1022
+#: common/unit.c:1025
msgid "Moves"
msgstr "Træk"
-#: common/unit.c:1571
+#: common/unit.c:1574
#, c-format
msgid ""
"Upgrade %s to %s for %d gold?\n"
@@ -744,12 +745,12 @@ msgstr ""
"Opgradér %s til %s for %d guld?\n"
"Skatkammeret har %d guld."
-#: common/unit.c:1579
+#: common/unit.c:1582
#, c-format
msgid "Sorry, cannot upgrade %s (yet)."
msgstr "Beklager, kan ikke opgradere %s (endnu)."
-#: common/unit.c:1585
+#: common/unit.c:1588
#, c-format
msgid ""
"Upgrading %s to %s costs %d gold.\n"
@@ -758,11 +759,11 @@ msgstr ""
"At opgradere %s til %s koster %d guld.\n"
"Skatkammeret har %d guld."
-#: common/unit.c:1594
+#: common/unit.c:1597
msgid "You can only upgrade units in your cities."
msgstr "Du kan kun opgradere enheder i dine byer."
-#: common/unit.c:1598
+#: common/unit.c:1601
#, c-format
msgid "Upgrading this %s would strand units it transports."
msgstr "Opgradering af %s ville strande de enheder den transporterer."
@@ -795,11 +796,11 @@ msgstr "Atombombe"
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1404
+#: common/unittype.c:349 client/helpdata.c:1412
msgid " and "
msgstr " og "
-#: common/unittype.c:355 client/helpdata.c:1390
+#: common/unittype.c:355 client/helpdata.c:1398
msgid "?and:, "
msgstr "?og:, "
@@ -948,8 +949,8 @@ msgstr "Kunne ikke åbne logfil: %s for tilføjelse \"%s\".\n"
#, c-format
msgid "last message repeated %d time"
msgid_plural "last message repeated %d times"
-msgstr[0] "Sidste besked gentaget %d gange"
-msgstr[1] "Sidste besked gentaget %d gange"
+msgstr[0] "sidste besked gentaget %d gang"
+msgstr[1] "sidste besked gentaget %d gange"
#: utility/log.c:295 utility/log.c:314
#, c-format
@@ -968,70 +969,70 @@ msgstr "Mangler parameter for \"%s\".\n"
msgid "Missing argument for \"%s\".\n"
msgstr "Mangler parameter for \"%s\".\n"
-#: utility/shared.c:501
+#: utility/shared.c:514
#, c-format
msgid "%d BC"
msgstr "%d f.Kr."
-#: utility/shared.c:503
+#: utility/shared.c:516
#, c-format
msgid "%d AD"
msgstr "%d e.Kr."
-#: utility/shared.c:924
+#: utility/shared.c:937
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:1028
+#: utility/shared.c:1041
#, c-format
msgid "Could not read data directory %s: %s."
msgstr "Kunne ikke læse fra datakataloget %s: %s."
-#: utility/shared.c:1279
+#: utility/shared.c:1292
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:1281
+#: utility/shared.c:1294
#, c-format
msgid "Current data path is: \"%s\""
msgstr "Nuværende datasti er: \"%s\""
-#: utility/shared.c:1283
+#: utility/shared.c:1296
#, c-format
msgid "The \"%s\" file is required ... aborting!"
msgstr "Den nødvendige fil \"%s\" mangler... afslutter!"
-#: utility/shared.c:1460
+#: utility/shared.c:1485
#, 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:1462
+#: utility/shared.c:1487
msgid "Use a non-privileged account instead.\n"
msgstr "Brug en ikke-priviligeret konto i stedet.\n"
-#: utility/shared.c:1478
+#: utility/shared.c:1503
msgid "exact match"
msgstr "eksakt fund"
-#: utility/shared.c:1479
+#: utility/shared.c:1504
msgid "only match"
msgstr "eneste fund"
-#: utility/shared.c:1480
+#: utility/shared.c:1505
msgid "ambiguous"
msgstr "tvetydig"
-#: utility/shared.c:1481
+#: utility/shared.c:1506
msgid "empty"
msgstr "tom"
-#: utility/shared.c:1482
+#: utility/shared.c:1507
msgid "too long"
msgstr "for lang"
-#: utility/shared.c:1483
+#: utility/shared.c:1508
msgid "non-match"
msgstr "ikke-fund"
@@ -1060,24 +1061,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:280
+#: ai/advdiplomacy.c:300
#, 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:290
+#: ai/advdiplomacy.c:310
#, c-format
msgid "*%s (AI)* First break alliance with %s, %s."
msgstr "*%s (computer)* Bryd først alliancen med %s, %s."
-#: ai/advdiplomacy.c:303
+#: ai/advdiplomacy.c:322
#, c-format
msgid "*%s (AI)* Let us first cease hostilies, %s."
msgstr "*%s (computer)* Lad os først stoppe blodsudgydelserne, %s."
-#: ai/advdiplomacy.c:308
+#: ai/advdiplomacy.c:327
#, c-format
msgid ""
"*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
@@ -1086,47 +1087,47 @@ msgstr ""
"*%s (Computer)* Jeg ønsker at se dig overholde den nuværende våbenhvile lidt "
"længere, %s."
-#: ai/advdiplomacy.c:331
+#: ai/advdiplomacy.c:350
#, 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:424
+#: ai/advdiplomacy.c:443
#, 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:454
+#: ai/advdiplomacy.c:473
#, c-format
msgid "*%s (AI)* Sorry, sharing vision with you is not safe."
-msgstr "*%s (Computer)* Beklager, delt vision med dig er ikke sikkert"
+msgstr "*%s (Computer)* Beklager, delt synsfelt med dig er ikke sikkert."
-#: ai/advdiplomacy.c:560
+#: ai/advdiplomacy.c:579
#, 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:582
+#: ai/advdiplomacy.c:601
#, c-format
msgid "*%s (AI)* Welcome into our alliance %s!"
msgstr "*%s (Computer)* Velkommen til vores alliance %s!"
-#: ai/advdiplomacy.c:586
+#: ai/advdiplomacy.c:605
#, 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:593
+#: ai/advdiplomacy.c:612
#, c-format
msgid "*%s (AI)* Yes, peace in our time!"
msgstr "*%s (Computer)* Ja, fred i vor tid!"
-#: ai/advdiplomacy.c:598
+#: ai/advdiplomacy.c:617
#, c-format
msgid "*%s (AI)* Agreed. No more hostilities, %s."
msgstr "*%s (Computer)* Enig. Ikke flere blodsudgydelser, %s."
-#: ai/advdiplomacy.c:813
+#: ai/advdiplomacy.c:832
#, c-format
msgid ""
"*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
@@ -1135,22 +1136,22 @@ msgstr ""
"*%s (Computer)* Velkommen %s! Må vi foreslå en våbenhvile så vi kan lære "
"hinanden bedre at kende?"
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1116
#, c-format
msgid "*%s (AI)* Space will never be yours. "
msgstr "*%s (Computer)* Rummet vil aldrig blive dit!"
-#: ai/advdiplomacy.c:1102
+#: ai/advdiplomacy.c:1121
#, 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:1108
+#: ai/advdiplomacy.c:1127
#, c-format
msgid "*%s (AI)* Peace in ... some other time."
msgstr "*%s (Computer)* Fred ... på et andet tidspunkt."
-#: ai/advdiplomacy.c:1113
+#: ai/advdiplomacy.c:1132
#, c-format
msgid ""
"*%s (AI)* Finally I get around to you! Did you really think you could get "
@@ -1159,17 +1160,17 @@ msgstr ""
"*%s (Computer)* Endelig når jeg til dig! Troede du virkelig, at du kunne "
"slippe afsted med dine misgerninger?"
-#: ai/advdiplomacy.c:1119
+#: ai/advdiplomacy.c:1138
#, 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:1126
+#: ai/advdiplomacy.c:1145
#, 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:1209
+#: ai/advdiplomacy.c:1229
#, c-format
msgid ""
"*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1184,7 +1185,7 @@ msgstr[1] ""
"*%s (Computer)* Vi vil starte en totalkrig mod %s i %d runder for at stoppe "
"rumskibsaffyringen."
-#: ai/advdiplomacy.c:1219
+#: ai/advdiplomacy.c:1239
#, c-format
msgid ""
"*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
@@ -1192,7 +1193,7 @@ msgid ""
msgstr ""
"*%s (Computer)* Din assistance forventes. Leve leve vores stærke alliance!"
-#: ai/advdiplomacy.c:1225
+#: ai/advdiplomacy.c:1245
#, c-format
msgid ""
"*%s (AI)* %s has grossly violated his treaties with us for own gain. We "
@@ -1211,7 +1212,7 @@ msgstr[1] ""
"skyld. Vi vil svare med magt om %d runder og forventer, at du står bag os i "
"vores alliance."
-#: ai/advdiplomacy.c:1238
+#: ai/advdiplomacy.c:1258
#, c-format
msgid ""
"*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1226,13 +1227,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:1246
+#: ai/advdiplomacy.c:1266
#, 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!"
-#: ai/advdiplomacy.c:1251
+#: ai/advdiplomacy.c:1271
#, c-format
msgid ""
"*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1247,14 +1248,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:1261
+#: ai/advdiplomacy.c:1281
#, 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:1267
+#: ai/advdiplomacy.c:1287
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance and declare war on %s in %d turn. "
@@ -1269,7 +1270,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:1276
+#: ai/advdiplomacy.c:1296
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1284,7 +1285,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:1344
+#: ai/advdiplomacy.c:1364
#, c-format
msgid ""
"*%s (AI)* Your attempt to conquer space for yourself alone betray your true "
@@ -1293,7 +1294,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:1359
+#: ai/advdiplomacy.c:1379
#, c-format
msgid ""
"*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
@@ -1302,7 +1303,7 @@ msgstr ""
"*%s (AI)* Dit forsøg på unilateralt at dominere det ydre rum er stærkt "
"fornærmende."
-#: ai/advdiplomacy.c:1362
+#: ai/advdiplomacy.c:1382
#, c-format
msgid ""
"*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
@@ -1311,12 +1312,12 @@ msgstr ""
"*%s (AI)* Hvis du ikke stopper konstruktionen af dit rumskib, kan jeg se mig "
"nødsaget til at handle!"
-#: ai/advdiplomacy.c:1474
+#: ai/advdiplomacy.c:1494
#, 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:1549
+#: ai/advdiplomacy.c:1569
#, c-format
msgid ""
"*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
@@ -1325,7 +1326,7 @@ msgstr ""
"*%s (AI)* Hil vores pålideligste allierede, vi beder dig om at tilintetgøre "
"vores fjende, %s."
-#: ai/advdiplomacy.c:1555
+#: ai/advdiplomacy.c:1575
#, c-format
msgid ""
"*%s (AI)* Greetings ally, I see you have not yet made war with our enemy, %"
@@ -1334,7 +1335,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:1562
+#: ai/advdiplomacy.c:1582
#, c-format
msgid ""
"*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1345,7 +1346,7 @@ msgstr ""
"fred med vores dødelige fjende, %s! Dette er uacceptabelt; vores alliance er "
"hermed ophævet!"
-#: ai/advdiplomacy.c:1592
+#: ai/advdiplomacy.c:1612
#, c-format
msgid ""
"*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
@@ -1353,12 +1354,12 @@ msgid ""
msgstr ""
"*%s (AI)* Hil dig ven, må vi foreslå at vi står sammen og skaber en alliance?"
-#: ai/advdiplomacy.c:1607
+#: ai/advdiplomacy.c:1627
#, 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:1622
+#: ai/advdiplomacy.c:1642
#, c-format
msgid ""
"*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
@@ -1367,7 +1368,7 @@ msgstr ""
"*%s (AI)* Vi bliver begge nedbrudt af disse blodsudgydelser. Må vi foreslå "
"at vi ophører med vores fjendtligheder?"
-#: ai/advdiplomacy.c:1742
+#: ai/advdiplomacy.c:1762
#, c-format
msgid ""
"*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1516,17 +1517,17 @@ msgstr ""
"Adgangskoden skal mindst have %d store bogstaver og %d tal og være mindst %d "
"tegn lang. Prøv igen."
-#: server/barbarian.c:183
+#: server/barbarian.c:184
#, c-format
msgid "%s gain a leader by the name %s. Dangerous times may lie ahead."
msgstr "%s har fået en leder ved navn %s. Farlige tider kan ligge forude."
-#: server/barbarian.c:479
+#: server/barbarian.c:480
#, c-format
msgid "Native unrest near %s led by %s."
msgstr "Indfødte gør oprør nær %s, ledet af %s."
-#: server/barbarian.c:484
+#: server/barbarian.c:485
#, c-format
msgid "Sea raiders seen near %s!"
msgstr "Pirater set nær %s!"
@@ -1916,7 +1917,7 @@ msgstr[0] ""
msgstr[1] ""
"%s giver landvindinger i forskningen. Du får %d umiddelbare fremskridt."
-#: server/cityturn.c:1158 server/techtools.c:176
+#: server/cityturn.c:1158 server/techtools.c:172
#, c-format
msgid "The %s have acquired %s from %s."
msgstr "%s har skaffet %s fra %s."
@@ -2000,22 +2001,22 @@ msgid "Warning: the %s option is obsolete. Use -m to enable the metaserver.\n"
msgstr ""
"Advarsel: Tilvalget %s er forældet. Brug -m for at aktivere metaserveren.\n"
-#: server/civserver.c:189
+#: server/civserver.c:193
#, c-format
msgid "Error: unknown option '%s'\n"
msgstr "Fejl: Ukendt tilvalg '%s'\n"
-#: server/civserver.c:200
+#: server/civserver.c:204
#, c-format
msgid "This is the server for %s"
msgstr "Dette er serveren for %s"
-#: server/civserver.c:201
+#: server/civserver.c:205
#, c-format
msgid "You can learn a lot about Freeciv at %s"
msgstr "Du kan lære meget om Freeciv på %s"
-#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
+#: server/civserver.c:210 client/civclient.c:239 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -2024,7 +2025,7 @@ msgstr ""
"Brug: %s [tilvalg ...]\n"
"Gyldige tilvalg er:\n"
-#: server/civserver.c:208
+#: server/civserver.c:212
msgid ""
" -a --auth FILE\tEnable server authentication with configuration from "
"FILE.\n"
@@ -2032,102 +2033,106 @@ msgstr ""
" -a --auth FILE\tAktivér server-identitetsbekræftelse med indstilling fra "
"FIL.\n"
-#: server/civserver.c:210
+#: server/civserver.c:214
msgid " -G --Guests\t\tAllow guests to login if auth is enabled.\n"
msgstr ""
" -G --Guests\t\tTillad gæster at logge på hvis identitetsbekræftelse er "
"aktiveret.\n"
-#: server/civserver.c:212
+#: server/civserver.c:216
msgid " -N --Newusers\tAllow new users to login if auth is enabled.\n"
msgstr ""
" -N --Newusers\tTillad nye brugere at logge på hvis identitetsbekræftelse "
"er aktiveret.\n"
-#: server/civserver.c:215
+#: server/civserver.c:219
msgid " -b --bind ADDR\tListen for clients on ADDR\n"
msgstr " -b, --bind ADR\tLyt efter klienter på ADR\n"
-#: server/civserver.c:217 client/civclient.c:242
+#: server/civserver.c:221 client/civclient.c:243
msgid ""
" -d, --debug NUM\tSet debug log level (0 to 4, or 4:file1,min,max:...)\n"
msgstr ""
" -d, --debug NUM\tSæt fejlfindings-logniveau (0-4, eller 4:fil1,min,"
"max:...)\n"
-#: server/civserver.c:221 client/civclient.c:246
+#: server/civserver.c:225 client/civclient.c:247
msgid " -d, --debug NUM\tSet debug log level (0 to 3)\n"
msgstr " -d, --debug NUM\tSæt debug-logniveau (0-3)\n"
-#: server/civserver.c:223
+#: server/civserver.c:227
msgid " -f, --file FILE\tLoad saved game FILE\n"
msgstr " -f, --file FIL\tIndlæs gemt spil fra FIL\n"
-#: server/civserver.c:225 client/civclient.c:249 manual/civmanual.c:382
+#: server/civserver.c:229 client/civclient.c:250 manual/civmanual.c:382
msgid " -h, --help\t\tPrint a summary of the options\n"
msgstr " -h, --help\t\tUdskriv resume af tilvalg\n"
-#: server/civserver.c:226
+#: server/civserver.c:230
+msgid " -i, --identity ADDR\tBe known as ADDR at metaserver\n"
+msgstr " -i, --identity ADDR\tKendt som ADDR på metaserveren\n"
+
+#: server/civserver.c:231
msgid " -l, --log FILE\tUse FILE as logfile\n"
msgstr " -l, --log FIL\tBrug FIL som logfil\n"
-#: server/civserver.c:227
+#: server/civserver.c:232
msgid " -m, --meta\t\tNotify metaserver and send server's info\n"
msgstr " -m, --meta\t\tInformér metaserveren og send serverens info\n"
-#: server/civserver.c:229
+#: server/civserver.c:234
msgid " -M, --Metaserver ADDR\tSet ADDR as metaserver address\n"
msgstr " -M, --Metaserver ADR\tSæt adressen for metaserveren\n"
-#: server/civserver.c:232
+#: server/civserver.c:237
msgid " -p, --port PORT\tListen for clients on port PORT\n"
msgstr " -p, --port PORT\tLyt efter klienter på PORT\n"
-#: server/civserver.c:234
+#: server/civserver.c:239
msgid " -q, --quitidle TIME\tQuit if no players for TIME seconds\n"
msgstr " -q, --quitidle TID Afslut hvis tomt for spillere i TID sek.\n"
-#: server/civserver.c:236
+#: server/civserver.c:241
msgid " -e, --exit-on-end\tWhen a game ends, exit instead of restarting\n"
msgstr ""
" -e, --exit-on-end\tAfslut i stedet for at genstarte når et spil slutter.\n"
-#: server/civserver.c:239
+#: server/civserver.c:244
msgid " -s, --saves DIR\tSave games to directory DIR\n"
msgstr " -s, --saves DIR\tGem spil i biblioteket DIR\n"
-#: server/civserver.c:241
+#: server/civserver.c:246
msgid " -S, --Serverid ID\tSets the server id to ID\n"
msgstr " -S, --Server VÆRT\tTilslut til serveren på VÆRT\n"
-#: server/civserver.c:243
+#: server/civserver.c:248
msgid " -P, --Ppm\t\tSave ppms of the map when saving the game.\n"
msgstr " -P, --Ppm\t\tGem ppms fra kortet når der gemmes.\n"
-#: server/civserver.c:244
+#: server/civserver.c:249
msgid " -r, --read FILE\tRead startup script FILE\n"
msgstr " -r, --read FIL\tIndlæs startkommandoer fra FIL\n"
-#: server/civserver.c:246
+#: server/civserver.c:251
msgid " -R, --Ranklog FILE\tUse FILE as ranking logfile\n"
msgstr " -R, --Ranklog FIL\tBrug FIL som logfil\n"
-#: server/civserver.c:247 client/civclient.c:268 manual/civmanual.c:383
+#: server/civserver.c:252 client/civclient.c:269 manual/civmanual.c:383
msgid " -v, --version\t\tPrint the version number\n"
msgstr " -v, --version\t\tUdskriv versionsnummeret\n"
-#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
+#: server/civserver.c:253 client/gui-gtk-2.0/gui_main.c:354
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, c-format
msgid "Report bugs at %s.\n"
msgstr "Rapportér fejl til %s.\n"
-#: server/commands.c:28
+#: server/commands.c:29
msgid "Start the game, or restart after loading a savegame."
msgstr "Start spillet, eller start igen efter at have indlæst gemt spil."
-#: server/commands.c:29
+#: server/commands.c:30
msgid ""
"This command starts the game. When starting a new game, it should be used "
"after all human players have connected, and AI players have been created (if "
@@ -2145,7 +2150,7 @@ msgstr ""
"længere tilgængelig."
#. TRANS: translate text between <> only
-#: server/commands.c:42
+#: server/commands.c:44
msgid ""
"help\n"
"help commands\n"
@@ -2159,11 +2164,11 @@ msgstr ""
"help <kommandonavn>\n"
"help <alternativnavn>"
-#: server/commands.c:47
+#: server/commands.c:49
msgid "Show help about server commands and server options."
msgstr "Vis hjælp for serverkommandoer og servertilvalg."
-#: server/commands.c:48
+#: server/commands.c:50
msgid ""
"With no arguments gives some introductory help. With argument \"commands\" "
"or \"options\" gives respectively a list of all commands or all options. "
@@ -2180,12 +2185,12 @@ msgstr ""
"standardværdien. Forkortelser for argumenter kan benyttes hvis det ikke er "
"flertydig."
-#: server/commands.c:63
+#: server/commands.c:66
msgid "Show a list of players, teams, connections, or scenarios."
msgstr ""
"Vis en liste over spillerne, holdene, tilslutningene eller scenarierne."
-#: server/commands.c:64
+#: server/commands.c:67
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 "
@@ -2195,20 +2200,20 @@ msgstr ""
"serveren eller tilgængelige scenarier. Argumentet kan forkortes, og er "
"'spillere' som standard hvis det mangler."
-#: server/commands.c:70
+#: server/commands.c:74
msgid "Quit the game and shutdown the server."
msgstr "Afslut spillet og serveren."
#. TRANS: translate text between <> only
-#: server/commands.c:74
+#: server/commands.c:79
msgid "cut <connection-name>"
msgstr "cut <tilslutningsnavn>"
-#: server/commands.c:75
+#: server/commands.c:80
msgid "Cut a client's connection to server."
msgstr "Afbryd en klients tilslutning til server."
-#: server/commands.c:76
+#: server/commands.c:81
msgid ""
"Cut specified client's connection to the server, removing that client from "
"the game. If the game has not yet started that client's player is removed "
@@ -2221,7 +2226,7 @@ msgstr ""
"tilslutningsnavne, ikke spillernavne."
#. TRANS: translate text between <> only
-#: server/commands.c:83
+#: server/commands.c:89
msgid ""
"explain\n"
"explain <option-name>"
@@ -2229,11 +2234,11 @@ msgstr ""
"explain\n"
"explain <tilvalgnavn>"
-#: server/commands.c:85
+#: server/commands.c:91
msgid "Explain server options."
msgstr "Forklar servertilvalg."
-#: server/commands.c:86
+#: server/commands.c:92
msgid ""
"The 'explain' command gives a subset of the functionality of 'help', and is "
"included for backward compatibility. With no arguments it gives a list of "
@@ -2246,7 +2251,7 @@ msgstr ""
"hjælp for en valgmulighed (som 'help <alternativnavn>')."
#. TRANS: translate text between <> only
-#: server/commands.c:93
+#: server/commands.c:100
msgid ""
"show\n"
"show <option-name>\n"
@@ -2256,11 +2261,11 @@ msgstr ""
"show <optionsnavn>\n"
"show <optionsprefiks>"
-#: server/commands.c:96
+#: server/commands.c:103
msgid "Show server options."
msgstr "Vis server optioner."
-#: server/commands.c:97
+#: server/commands.c:104
msgid ""
"With no arguments, shows all server options (or available options, when used "
"by clients). With an argument, show only the named option, or options with "
@@ -2270,38 +2275,39 @@ msgstr ""
"alternativer, når den er benyttet af klienterne). Med et argument, vises kun "
"de valgte alternativene, eller alternativ med det præfiks."
-#: server/commands.c:102
+#: server/commands.c:110
msgid "wall <message>"
msgstr "wall <besked>"
-#: server/commands.c:103
+#: server/commands.c:111
msgid "Send message to all connections."
msgstr "Sender meddelelsen til alle klienterne."
-#: server/commands.c:104
+#: server/commands.c:112
msgid ""
"For each connected client, pops up a window showing the message entered."
msgstr "For hver klient vises et vindue med den angivne meddelelse."
-#: server/commands.c:108
+#: server/commands.c:117
msgid "vote yes|no [vote number]"
msgstr "stem ja|nej [stemmenummer]"
-#: server/commands.c:109
+#: server/commands.c:118
msgid "Cast a vote."
msgstr "Afgiv stemme."
-#: server/commands.c:111
+#: server/commands.c:120
#, 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."
+"A player with basic 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."
msgstr ""
-"En spiller med rette rettigheder kan starte en kommando der påbegynder "
+"En spiller med basal niveauadgang kan starte en kommando der påbegynder "
"stemmeafgivning. /stem kommandoen efterfulgt af \"ja\" eller \"nej\", og et "
"frivilligt stemmenummer, giver din stemme. Hvis du ikke tilføjer et "
"stemmenummer gives din stemme til den seneste kommando. Du kan kun foreslå "
@@ -2309,7 +2315,7 @@ msgstr ""
"halvdelen af spillerne stemmer for den, eller afvises øjeblikkeligt hvis "
"mindst halvdelen af spillerne stemmer imod den."
-#: server/commands.c:121
+#: server/commands.c:131
msgid ""
"debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
"<player> | timing | info]"
@@ -2317,11 +2323,11 @@ msgstr ""
"debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
"<player> | timing | info]"
-#: server/commands.c:123
+#: server/commands.c:133
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:124
+#: server/commands.c:134
msgid ""
"Print AI debug information about given entity and turn continous debugging "
"output for this entity on or off."
@@ -2329,23 +2335,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:128
+#: server/commands.c:139
msgid "set <option-name> <value>"
msgstr "set <optionsnavn> <værdi>"
-#: server/commands.c:129
+#: server/commands.c:140
msgid "Set server option."
msgstr "Sæt server-option."
-#: server/commands.c:132
+#: server/commands.c:144
msgid "team <player> [team]"
msgstr "team <spiller> [hold]"
-#: server/commands.c:133
+#: server/commands.c:145
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:134
+#: server/commands.c:146
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,18 +2361,18 @@ msgstr ""
"Sætter en spiller som medlem af et hold. Hvis der ikke er specificeret et "
"hold, vil spilleren blive holdløs. Brug \"\" hvis navne indeholder "
"mellemrum. Et hold er en gruppe spillere som starter spillet som allierede, "
-"med delt vision og ambassader, og slås sammen for at opnå holdsejr med "
+"med delt synsfelt og ambassader, og slås sammen for at opnå holdsejr med "
"snittet af de individuelle pointsummer."
-#: server/commands.c:141
+#: server/commands.c:154
msgid "rulesetdir <directory>"
msgstr "rulesetdir <katalog>"
-#: server/commands.c:142
+#: server/commands.c:155
msgid "Choose new ruleset directory or modpack."
msgstr "Vælg nyt katalog for regelopsætning eller tilføjelsespakke."
-#: server/commands.c:143
+#: server/commands.c:156
msgid ""
"Choose new ruleset directory or modpack. Calling this\n"
" without any arguments will show you the currently selected ruleset."
@@ -2375,15 +2381,15 @@ msgstr ""
"At kalde denne uden argumenter vil vise dig den nuværende regelopsætning."
#. TRANS: translate text between <> only
-#: server/commands.c:149
+#: server/commands.c:163
msgid "metainfo <meta-line>"
msgstr "metainfo <metalinje>"
-#: server/commands.c:150
+#: server/commands.c:164
msgid "Set metaserver info line."
msgstr "Sæt metaserver infolinje."
-#: server/commands.c:151
+#: server/commands.c:165
msgid ""
"Set user defined metaserver info line. If parameter is omitted,\n"
"previously set metamessage will be removed. For most of the time\n"
@@ -2396,19 +2402,19 @@ msgstr ""
"beskeder, hvis den er tilgængelig."
#. TRANS: translate text between <> only
-#: server/commands.c:158
+#: server/commands.c:173
msgid "metapatch <meta-line>"
msgstr "metapatch <metalinje>"
-#: server/commands.c:159
+#: server/commands.c:174
msgid "Set metaserver patches line."
msgstr "Sæt metaserver infolinje."
-#: server/commands.c:165
+#: server/commands.c:181
msgid "Control metaserver connection."
msgstr "Kontroller metaserver tilslutning."
-#: server/commands.c:166
+#: server/commands.c:182
msgid ""
"'metaconnection ?' reports on the status of the connection to metaserver.\n"
"'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2421,33 +2427,33 @@ msgstr ""
"metaserveren op."
#. TRANS: translate text between <> only
-#: server/commands.c:172
+#: server/commands.c:189
msgid "metaserver <address>"
msgstr "metaserver <adresse>"
-#: server/commands.c:173
+#: server/commands.c:190
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:177
+#: server/commands.c:195
msgid "aitoggle <player-name>"
msgstr "aitoggle <spillernavn>"
-#: server/commands.c:178
+#: server/commands.c:196
msgid "Toggle AI status of player."
msgstr "Skift spillers AI-status."
#. TRANS: translate text between [] and <> only
-#: server/commands.c:182
+#: server/commands.c:201
msgid "take [connection-name] <player-name>"
msgstr "tag [navnpåforbindelse] <spillernavn>"
-#: server/commands.c:183
+#: server/commands.c:202
msgid "Take over a player's place in the game."
msgstr "Overtag en spillers rolle i spillet."
-#: server/commands.c:184
+#: server/commands.c:203
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 "
@@ -2462,15 +2468,15 @@ msgstr ""
"til forbindelsen."
#. TRANS: translate text between [] only
-#: server/commands.c:192
+#: server/commands.c:212
msgid "observe [connection-name] [player-name]"
msgstr "observe [navnpåforbindelse] [spillernavn]"
-#: server/commands.c:193
+#: server/commands.c:213
msgid "Observe a player or the whole game."
msgstr "Observer en spiller eller hele spillet."
-#: server/commands.c:194
+#: server/commands.c:214
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 "
@@ -2485,15 +2491,15 @@ msgstr ""
"global observerer."
#. TRANS: translate text between <> only
-#: server/commands.c:202
+#: server/commands.c:223
msgid "detach <connection-name>"
msgstr "detach <tilslutningsnavn>"
-#: server/commands.c:203
+#: server/commands.c:224
msgid "detach from a player."
msgstr "Løsgøre fra en spiller."
-#: server/commands.c:204
+#: server/commands.c:225
msgid ""
"Only the console and connections with cmdlevel 'hack' can force other "
"connections to detach from a player."
@@ -2502,20 +2508,20 @@ msgstr ""
"forbindelser til at overtage en spiller."
#. TRANS: translate text between <> only
-#: server/commands.c:209
+#: server/commands.c:231
msgid "create <player-name>"
msgstr "create <spillernavn>"
-#: server/commands.c:210
+#: server/commands.c:232
msgid "Create an AI player with a given name."
msgstr "Opret en AI spiller med givet navn."
-#: server/commands.c:211
+#: server/commands.c:233
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."
-#: server/commands.c:215
+#: server/commands.c:238
msgid ""
"away\n"
"away"
@@ -2523,18 +2529,18 @@ msgstr ""
"away\n"
"away"
-#: server/commands.c:217
+#: server/commands.c:240
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:218
+#: server/commands.c:241
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:222
+#: server/commands.c:246
msgid ""
"novice\n"
"novice <player-name>"
@@ -2542,23 +2548,23 @@ msgstr ""
"Novice\n"
"novice <spillernavn>"
-#: server/commands.c:224
+#: server/commands.c:248
msgid "Set one or all AI players to 'novice'."
-msgstr "Sæt en eller alle AI-spillere til 'novice'."
+msgstr "Sæt en eller alle computerspillere til 'begynder'."
-#: server/commands.c:225
+#: server/commands.c:249
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 "
"the skill level for that player only."
msgstr ""
"Uden argument sætter denne kommando alle datastyrede spilleres sværhedsgrad "
-"til \"novice\", og sætter standardsværhedsgraden for alle nye datastyrede "
-"spillere til \"novice\". Med et argument sætter kommandoen sværhedsgraden "
+"til \"begynder\", og sætter standardsværhedsgraden for alle nye datastyrede "
+"spillere til \"begynder\". Med et argument sætter kommandoen sværhedsgraden "
"kun for den spiller"
#. TRANS: translate text between <> only
-#: server/commands.c:231
+#: server/commands.c:256
msgid ""
"easy\n"
"easy <player-name>"
@@ -2566,23 +2572,23 @@ msgstr ""
"easy\n"
"easy <spillernavn>"
-#: server/commands.c:233
+#: server/commands.c:258
msgid "Set one or all AI players to 'easy'."
msgstr "Sæt en eller alle AI-spillere til 'let'."
-#: server/commands.c:234
+#: server/commands.c:259
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 "
"skill level for that player only."
msgstr ""
"Uden argument sætter denne kommando alle datastyrede spilleres sværhedsgrad "
-"til \"easy\", og sætter standardsværhedsgraden for alle nye datastyrede "
-"spillere til \"easy\". Med et argument sætter kommandoen sværhedsgraden kun "
+"til \"let\", og sætter standardsværhedsgraden for alle nye datastyrede "
+"spillere til \"let\". Med et argument sætter kommandoen sværhedsgraden kun "
"for den spiller"
#. TRANS: translate text between <> only
-#: server/commands.c:240
+#: server/commands.c:266
msgid ""
"normal\n"
"normal <player-name>"
@@ -2590,11 +2596,11 @@ msgstr ""
"normal\n"
"normal <spillernavn>"
-#: server/commands.c:242
+#: server/commands.c:268
msgid "Set one or all AI players to 'normal'."
msgstr "Sæt en eller alle AI-spillere til 'normal'."
-#: server/commands.c:243
+#: server/commands.c:269
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 "
@@ -2606,7 +2612,7 @@ msgstr ""
"kun for den spiller"
#. TRANS: translate text between <> only
-#: server/commands.c:249
+#: server/commands.c:276
msgid ""
"hard\n"
"hard <player-name>"
@@ -2614,23 +2620,23 @@ msgstr ""
"hard\n"
"hard <spillernavn>"
-#: server/commands.c:251
+#: server/commands.c:278
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:252
+#: server/commands.c:279
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 "
"skill level for that player only."
msgstr ""
"Uden argument sætter denne kommando alle datastyrede spilleres sværhedsgrad "
-"til \"hard\", og sætter standardsværhedsgraden for alle nye datastyrede "
-"spillere til \"hard\". Med et argument sætter kommandoen sværhedsgraden kun "
-"for den spiller"
+"til \"vanskelig\", og sætter standardsværhedsgraden for alle nye datastyrede "
+"spillere til \"vanskelig\". Med et argument sætter kommandoen sværhedsgraden "
+"kun for den spiller"
#. TRANS: translate text between <> only
-#: server/commands.c:258
+#: server/commands.c:286
msgid ""
"experimental\n"
"experimental <player-name>"
@@ -2638,11 +2644,11 @@ msgstr ""
" \n"
"<spillernavn>"
-#: server/commands.c:260
+#: server/commands.c:288
msgid "Set one or all AI players to 'experimental'."
msgstr "Sæt en eller alle AI-spillere til 'eksperimental'."
-#: server/commands.c:261
+#: server/commands.c:289
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 "
@@ -2650,13 +2656,13 @@ msgid ""
"FEATURES! For ordinary servers, this option has no effect."
msgstr ""
"Uden argument sætter denne kommando alle datastyrede spilleres sværhedsgrad "
-"til 'experimental', og sætter standardsværhedsgraden for alle nye "
+"til 'eksperimental', og sætter standardsværhedsgraden for alle nye "
"datastyrede spillere til dette. Med et argument sætter kommandoen "
"sværhedsgraden kun for den spiller. DETTE ER KUN FOR TESTNING AF NYE AI "
"FUNKTIONER! For normale servere har denne indstilling ingen effekt."
#. TRANS: translate text between <> only
-#: server/commands.c:269
+#: server/commands.c:298
msgid ""
"cmdlevel\n"
"cmdlevel <level>\n"
@@ -2670,17 +2676,19 @@ msgstr ""
"cmdlevel <niveau> first\n"
"cmdlevel <niveau> <tilslutningsnavn>"
-#: server/commands.c:274
+#: server/commands.c:303
msgid "Query or set command access level access."
msgstr "Bed om eller sæt kommandoniveau adgang."
-#: server/commands.c:275
+#: server/commands.c:304
msgid ""
"The command access level controls which server commands are available\n"
"to users via the client chatline. The available levels are:\n"
" none - no commands\n"
-" info - informational commands only\n"
+" info - informational or observer commands only\n"
+" basic - commands available to players in the game\n"
" ctrl - commands that affect the game and users\n"
+" admin - commands that affect server operation\n"
" hack - *all* commands - dangerous!\n"
"With no arguments, the current command access levels are reported.\n"
"With a single argument, the level is set for all existing connections,\n"
@@ -2695,11 +2703,14 @@ msgid ""
"untrusted person could reconnect with the same name. Note that this command "
"now takes connection names, not player names."
msgstr ""
-"Kommando-adgangsniveauet styrer hvilke kommandoer som er tilgængelige \n"
+"Kommando-adgangsniveauet styrer hvilke serverkommandoer som er "
+"tilgængelige \n"
"for brugere via klientens chatlinje. De tilgængelige niveauer er:\n"
" none - ingen kommandoer\n"
" info - kun informationsgivende kommandoer\n"
+" basic - kommandoer som er tilgængelige for spillere\n"
" ctrl - kommandoer som styrer spillet og spillerne\n"
+" admin - kommandoer som påvirker afviklingen af serveren\n"
" hack - *alle* kommandoer - farligt!\n"
"Uden argument viser denne kommando det nuværende adgangsniveau.\n"
"Med et argument sættes niveauet for alle nuværende tilslutninger, og \n"
@@ -2714,20 +2725,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:296
+#: server/commands.c:328
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:301
+#: server/commands.c:334
msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
msgstr "timeoutincrease <runde> <rundetillæg> <værdi> <faktor>"
-#: server/commands.c:302
+#: server/commands.c:335
msgid "See \"help timeoutincrease\"."
msgstr "Se \"help timeoutincrease\"."
-#: server/commands.c:303
+#: server/commands.c:336
msgid ""
"Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
"<turn> and multiply <value> by <valuemult>. Use this command in concert "
@@ -2741,24 +2752,49 @@ msgstr ""
"Brug denne kommando sammen med \"timeout\". Standardværdiene er 0 0 0 1."
#. TRANS: translate text between <> only
-#: server/commands.c:309
+#: server/commands.c:343
+msgid ""
+"cancelvote\n"
+"cancelvote <vote number>\n"
+"cancelvote all\n"
+msgstr ""
+"cancelvote\n"
+"cancelvote <stemmeafgivningsnummer>\n"
+"cancelvote all\n"
+
+#: server/commands.c:346
+msgid "Cancel a running vote.\n"
+msgstr "Afbryd en igangværende stemmeafgivning.\n"
+
+#: server/commands.c:347
+msgid ""
+"With no arguments this command removes your own vote. If you have an admin "
+"access level, you can cancel any vote by vote number, or all votes with the "
+"'all' argument."
+msgstr ""
+"Uden argumenter fjerner denne kommando din egen stemme. Hvis du har "
+"adgangsniveau som administrator kan du afbryde enhver stemmeafgivning efter "
+"dens nummer, eller alle stemmeafgivninger med argumentet 'all'."
+
+#. TRANS: translate text between <> only
+#: server/commands.c:354
msgid "endgame"
-msgstr "Slutspil"
+msgstr "endgame"
-#: server/commands.c:310
+#: server/commands.c:355
msgid "End the game immediately in a draw."
msgstr "Spillet slutter med det samme som uafgjort"
#. TRANS: translate text between <> only
-#: server/commands.c:314
+#: server/commands.c:360
msgid "surrender"
-msgstr "overgivelse"
+msgstr "surrender"
-#: server/commands.c:315
+#: server/commands.c:361
msgid "Concede the game."
msgstr "Erkende at spillet er tabt."
-#: server/commands.c:316
+#: server/commands.c:362
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."
@@ -2767,15 +2803,15 @@ msgstr ""
"undtagelse af en spiller (eller et hold) har erkendt vil spillet slutte."
#. TRANS: translate text between <> only
-#: server/commands.c:322
+#: server/commands.c:369
msgid "remove <player-name>"
msgstr "remove <spillernavn>"
-#: server/commands.c:323
+#: server/commands.c:370
msgid "Fully remove player from game."
msgstr "Fjern spilleren fuldstændigt fra spillet."
-#: server/commands.c:324
+#: server/commands.c:371
msgid ""
"This *completely* removes a player from the game, including all cities and "
"units etc. Use with care!"
@@ -2784,7 +2820,7 @@ msgstr ""
"enheder. Bruges med forsigtighed!"
#. TRANS: translate text between <> only
-#: server/commands.c:329
+#: server/commands.c:377
msgid ""
"save\n"
"save <file-name>"
@@ -2792,11 +2828,11 @@ msgstr ""
"save\n"
"save <filnavn>"
-#: server/commands.c:331
+#: server/commands.c:379
msgid "Save game to file."
msgstr "Gem spil i fil."
-#: server/commands.c:332
+#: server/commands.c:380
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"
@@ -2813,7 +2849,7 @@ msgstr ""
"og brug 'start' kommandoen når alle spillerne har koblet op igen."
#. TRANS: translate text between <> only
-#: server/commands.c:341
+#: server/commands.c:390
msgid ""
"load\n"
"load <file-name>"
@@ -2821,11 +2857,11 @@ msgstr ""
"load\n"
"load <filnavn>"
-#: server/commands.c:343
+#: server/commands.c:392
msgid "Load game from file."
msgstr "Indlæs spil fra fil."
-#: server/commands.c:344
+#: server/commands.c:393
msgid ""
"Load a game from <file-name>. Any current data including players, rulesets "
"and server options are lost.\n"
@@ -2834,116 +2870,116 @@ msgstr ""
"spillere, regelopsætning og serveralternativer vil forsvinde.\n"
#. TRANS: translate text between <> only
-#: server/commands.c:349
+#: server/commands.c:399
msgid "read <file-name>"
msgstr "read <filnavn>"
-#: server/commands.c:350
+#: server/commands.c:400
msgid "Process server commands from file."
msgstr "Udfør serverkommandoer fra fil."
#. TRANS: translate text between <> only
-#: server/commands.c:354
+#: server/commands.c:405
msgid "write <file-name>"
msgstr "write <filnavn>"
-#: server/commands.c:355
+#: server/commands.c:406
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:359
+#: server/commands.c:411
msgid "Switch server output between 'RFC-style' and normal style."
msgstr "Skift server-udskrifter mellem 'RFC-stil' og normal stil."
-#: server/commands.c:363
+#: server/commands.c:416
msgid "Simply returns the id of the server."
msgstr "Returnerer id på serveren."
-#: server/connecthand.c:85
+#: server/connecthand.c:109
#, c-format
msgid "Welcome to the %s Server running at %s port %d."
msgstr "Velkommen til serveren %s som kører på %s port %d."
-#: server/connecthand.c:89
+#: server/connecthand.c:113
#, c-format
msgid "Welcome to the %s Server at port %d."
msgstr "Velkommen til serveren %s på port %d."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:97
+#: server/connecthand.c:121
#, c-format
msgid "(%d) %s: connected [%s]"
msgstr "(%d) %s: tilsluttet [%s]"
-#: server/connecthand.c:104
+#: server/connecthand.c:128
#, c-format
msgid "Server: %s has connected from %s."
msgstr "Server: %s har tilsluttet sig fra %s."
-#: server/connecthand.c:145
+#: server/connecthand.c:175
msgid "Couldn't attach your connection to new player."
msgstr "Kunne ikke tilslutte din forbindelse til ny spiller."
-#: server/connecthand.c:165
+#: server/connecthand.c:199
#, c-format
msgid "You are logged in as '%s' connected to no player."
msgstr "Du er logget ind som '%s' uden tilslutning til nogen spiller."
-#: server/connecthand.c:169
+#: server/connecthand.c:203
#, c-format
msgid "You are logged in as '%s' connected to an anonymous player."
msgstr "Du er logget ind som '%s' tilsluttet til en anonym spiller."
-#: server/connecthand.c:174
+#: server/connecthand.c:208
#, c-format
msgid "You are logged in as '%s' connected to %s."
msgstr "Du er logget ind som '%s' tilsluttet til %s."
-#: server/connecthand.c:187
+#: server/connecthand.c:221
#, c-format
msgid "Turn-blocking game play: waiting on %s to finish turn..."
msgstr "Turblokerende spillestil: venter på at %s skal blive færdig..."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:240
+#: server/connecthand.c:274
#, c-format
msgid "(%d) %s: connection request [%s]"
msgstr "(%d) %s: Tilkoblingsforespørgsel [%s]"
-#: server/connecthand.c:266
+#: server/connecthand.c:300
msgid "The client is missing a capability that this server needs."
msgstr "Klienten mangler en egenskab, som denne server kræver."
-#: server/connecthand.c:268 server/connecthand.c:279
+#: server/connecthand.c:302 server/connecthand.c:313
#, c-format
msgid "(%d) %s rejected: mismatched capabilities!"
msgstr "(%d) %s blev afvist: Uforenelige egenskaber!"
-#: server/connecthand.c:277
+#: server/connecthand.c:311
msgid "This server is missing a capability that the client needs."
msgstr "Serveren mangler en egenskab, som denne klient kræver."
-#: server/connecthand.c:290
+#: server/connecthand.c:324
msgid "The username is invalid!"
msgstr "Ugyldigt brugernavn!"
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:292
+#: server/connecthand.c:326
#, c-format
msgid "(%d) %s rejected: invalid username [%s]"
msgstr "(%d) %s blev afvist: Ugyldigt navn [%s]"
-#: server/connecthand.c:303
+#: server/connecthand.c:337
msgid "Your username is already connected!"
msgstr "Dit brugernavn er allerede tilsluttet!"
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:305
+#: server/connecthand.c:339
#, c-format
msgid "(%d) %s rejected: duplicate username [%s]"
msgstr "(%d) %s blev afvist: Ens brugernavn [%s]"
-#: server/connecthand.c:335 server/connecthand.c:344
+#: server/connecthand.c:369 server/connecthand.c:378
#, c-format
msgid "Lost connection: %s."
msgstr "Mistet tilslutning: %s."
@@ -2960,113 +2996,113 @@ msgstr "O.k. Standardstil valgt."
msgid "For introductory help, type 'help'."
msgstr "Skriv 'help' for introduktionshjælp."
-#: server/diplhand.c:164
+#: server/diplhand.c:167
#, c-format
msgid "The %s can't accept %s."
msgstr "Folkeslaget %s kan ikke acceptere %s."
-#: server/diplhand.c:176
+#: server/diplhand.c:179
#, c-format
msgid "You don't have tech %s, you can't accept treaty."
msgstr "Du har ikke teknologien %s, du kan ikke acceptere traktaten."
-#: server/diplhand.c:185
+#: server/diplhand.c:188
msgid "City you are trying to give no longer exists, you can't accept treaty."
msgstr ""
"Byen du forsøger at give bort, eksisterer ikke længere, du kan ikke "
"acceptere traktaten."
-#: server/diplhand.c:191
+#: server/diplhand.c:194
#, c-format
msgid "You are not owner of %s, you can't accept treaty."
msgstr "Du ejer ikke %s, du kan ikke acceptere traktaten."
-#: server/diplhand.c:197 server/diplhand.c:301
+#: server/diplhand.c:200 server/diplhand.c:304
#, c-format
msgid "Your capital (%s) is requested, you can't accept treaty."
msgstr "Din hovedstad (%s) er forlangt, du kan ikke acceptere traktaten."
-#: server/diplhand.c:224
+#: server/diplhand.c:227
msgid "You don't have enough gold, you can't accept treaty."
msgstr "Du har ikke nok guld, du kan ikke acceptere traktaten."
-#: server/diplhand.c:256 server/diplhand.c:261
+#: server/diplhand.c:259 server/diplhand.c:264
#, c-format
msgid "A treaty containing %d clause was agreed upon."
msgid_plural "A treaty containing %d clauses was agreed upon."
msgstr[0] "Der blev enighed om en traktat indeholdende %d klausul."
msgstr[1] "Der blev enighed om en traktat indeholdende %d klausul."
-#: server/diplhand.c:277 server/diplhand.c:281
+#: server/diplhand.c:280 server/diplhand.c:284
#, c-format
msgid "One of the cities the %s are giving away is destroyed! Treaty canceled!"
msgstr "En af byerne som %s giver bort, er ødelagt! Traktat brudt!"
-#: server/diplhand.c:288 server/diplhand.c:293
+#: server/diplhand.c:291 server/diplhand.c:296
#, c-format
msgid "The %s no longer control %s! Treaty canceled!"
msgstr "Folkeslaget %s kontrollerer ikke længere %s! Traktaten brudt!"
-#: server/diplhand.c:331 server/diplhand.c:335
+#: server/diplhand.c:334 server/diplhand.c:338
#, c-format
msgid "The %s don't have the promised amount of gold! Treaty canceled!"
msgstr ""
"Folkeslaget %s har ikke så meget guld som de har lovet! Traktaten brudt!"
-#: server/diplhand.c:364
+#: server/diplhand.c:367
#, c-format
msgid "You gave an embassy to %s."
msgstr "Du gav en ambassade til %s."
-#: server/diplhand.c:367
+#: server/diplhand.c:370
#, c-format
msgid "%s allowed you to create an embassy!"
msgstr "%s tillod dig at oprette en ambassade!"
-#: server/diplhand.c:383
+#: server/diplhand.c:386
#, c-format
msgid "You are taught the knowledge of %s."
msgstr "Du opnår kundskab om %s."
-#: server/diplhand.c:387
+#: server/diplhand.c:390
#, c-format
msgid "The %s have acquired %s from the %s."
msgstr "Folkeslaget %s har skaffet %s fra %s."
-#: server/diplhand.c:402
+#: server/diplhand.c:405
#, c-format
msgid "You get %d gold."
msgstr "Du får %d guld."
#. TRANS: ... Polish worldmap.
-#: server/diplhand.c:410
+#: server/diplhand.c:413
#, c-format
msgid "You receive the %s worldmap."
msgstr "Du får verdenskortet som %s opfatter det."
#. TRANS: ... Polish seamap.
-#: server/diplhand.c:419
+#: server/diplhand.c:422
#, c-format
msgid "You receive the %s seamap."
msgstr "Du får søkortet som %s opfatter det."
-#: server/diplhand.c:436
+#: server/diplhand.c:439
#, c-format
msgid "You receive city of %s from %s."
msgstr "Du får byen %s af %s."
-#: server/diplhand.c:441
+#: server/diplhand.c:444
#, c-format
msgid "You give city of %s to %s."
msgstr "Du giver byen %s bort til %s."
-#: server/diplhand.c:454 server/diplhand.c:457
+#: server/diplhand.c:457 server/diplhand.c:460
#, c-format
msgid "You agree on a cease-fire with %s."
msgstr "Du accepterer en våbenhvile med %s."
#. TRANS: ... the Poles ... Polish territory.
-#: server/diplhand.c:476 server/diplhand.c:488
+#: server/diplhand.c:479 server/diplhand.c:491
#, c-format
msgid ""
"You agree on an armistice with the %s. In %d turn, it will become a peace "
@@ -3081,32 +3117,32 @@ msgstr[1] ""
"Du bliver enig om en våbenstilstand med %s. I %d tur vil våbenstilstanden "
"blive til en fredstraktat. Flyt dine enheder ud af %ss territorium."
-#: server/diplhand.c:512 server/diplhand.c:515
+#: server/diplhand.c:515 server/diplhand.c:518
#, c-format
msgid "You agree on an alliance with %s."
msgstr "Du accepterer en alliance med %s."
-#: server/diplhand.c:524
+#: server/diplhand.c:527
#, c-format
msgid "You give shared vision to %s."
msgstr "Du deler dit synsfelt med %s."
-#: server/diplhand.c:527
+#: server/diplhand.c:530
#, c-format
msgid "%s gives you shared vision."
msgstr "%s deler sit synsfelt med dig."
-#: server/diplhand.c:663
+#: server/diplhand.c:666
#, c-format
msgid "%s canceled the meeting!"
msgstr "%s afbrød mødet!"
-#: server/diplhand.c:670
+#: server/diplhand.c:673
#, c-format
msgid "Meeting with %s canceled."
msgstr "Mødet med %s blev aflyst."
-#: server/diplhand.c:712
+#: server/diplhand.c:715
msgid "Your diplomatic envoy was decapitated!"
msgstr "Din diplomatiske udsending blev halshugget!"
@@ -3293,81 +3329,81 @@ msgid "The %s destroyed the %s in %s."
msgstr "Folkeslaget %s ødelagde %s i %s."
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1091
+#: server/diplomats.c:1097
#, c-format
msgid "An enemy %s has been eliminated by your %s."
msgstr "En fjendtlig %s er blevet udslettet af din %s."
#. TRANS: <unit> ... <city> ... <diplomat>
-#: server/diplomats.c:1098
+#: server/diplomats.c:1104
#, c-format
msgid "Your %s has been eliminated defending %s against a %s."
msgstr "Din %s er blevet udslettet under forsvar af %s mod %s."
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1106
+#: server/diplomats.c:1112
#, c-format
msgid "Your %s has been eliminated defending against a %s."
msgstr "Din %s er blevet udslettet da den forsvarede sig mod %s."
-#: server/diplomats.c:1119
+#: server/diplomats.c:1125
#, c-format
msgid "Your %s was eliminated by a defending %s."
msgstr "Din %s blev udslettet af en forsvarende %s."
-#: server/diplomats.c:1127
+#: server/diplomats.c:1133
#, c-format
msgid "Eliminated %s %s while infiltrating %s."
msgstr "Udslettede %s %s under infiltration af %s."
# problem
-#: server/diplomats.c:1134
+#: server/diplomats.c:1140
#, c-format
msgid "Eliminated %s %s while infiltrating our troops."
msgstr "Udslettede %s %s under infiltration af vore tropper."
-#: server/diplomats.c:1185
+#: server/diplomats.c:1191
#, 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
+#: server/diplomats.c:1210
#, 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
+#: server/diplomats.c:1216
#, 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
+#: server/diplomats.c:1248
#, 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."
-#: server/diplomats.c:1247
+#: server/diplomats.c:1253
#, c-format
msgid "%s has caused an incident while bribing your %s."
msgstr "%s har forårsaget en skandale ved at bestikke din %s."
-#: server/diplomats.c:1254
+#: server/diplomats.c:1260
#, c-format
msgid "You have caused an incident while attempting to steal tech from %s."
msgstr "Du har forårsaget en skandale ved teknologityveriet fra %s."
-#: server/diplomats.c:1258
+#: server/diplomats.c:1264
#, c-format
msgid "%s has caused an incident while attempting to steal tech from you."
msgstr "%s har forårsaget en skandale ved at stjæle teknologi fra dig."
-#: server/diplomats.c:1264
+#: server/diplomats.c:1270
#, c-format
msgid "You have caused an incident while inciting a revolt in %s."
msgstr "Du har forårsaget en skandale ved at anspore til oprør i %s."
-#: server/diplomats.c:1268
+#: server/diplomats.c:1274
#, c-format
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."
@@ -3483,12 +3519,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:1418
+#: server/maphand.c:1425
#, c-format
msgid "Moved your %s due to changing terrain."
msgstr "Flyttede din %s på grund af ændret terræn."
-#: server/maphand.c:1436
+#: server/maphand.c:1443
#, c-format
msgid "Disbanded your %s due to changing terrain."
msgstr "Opløste din %s på grund af ændret terræn."
@@ -3497,7 +3533,7 @@ msgstr "Opløste din %s på grund af ændret terræn."
msgid "Not reporting to the metaserver in this game."
msgstr "Rapporterer ikke til metaserver i dette spil."
-#: server/meta.c:430
+#: server/meta.c:432
#, c-format
msgid "Metaserver: bad address: [%s:%d]."
msgstr "Metaserver: ugyldig adresse: [%s:%d]."
@@ -3623,43 +3659,43 @@ msgstr ""
"Din holdkammerat %s erklærede krig med %s. Du er nødt til at annullere "
"alliancen med %s."
-#: server/plrhand.c:1103
+#: server/plrhand.c:1115
#, c-format
msgid "Removing player %s."
msgstr "Fjerner spiller %s."
-#: server/plrhand.c:1105
+#: server/plrhand.c:1117
msgid "You've been removed from the game!"
msgstr "Du er blevet fjernet fra spillet!"
-#: server/plrhand.c:1108
+#: server/plrhand.c:1120
#, c-format
msgid "%s has been removed from the game."
msgstr "%s er blevet fjernet fra spillet."
-#: server/plrhand.c:1153 server/plrhand.c:1158
+#: server/plrhand.c:1167 server/plrhand.c:1172
#, 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:1178
+#: server/plrhand.c:1192
#, 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:1656
+#: server/plrhand.c:1670
#, 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:1663
+#: server/plrhand.c:1677
#, c-format
msgid "Could not throw %s into civil war - no available nations"
msgstr "Kunne ikke kaste %s ind i borgerkrig - ingen tilgængelige nationer"
-#: server/plrhand.c:1686
+#: server/plrhand.c:1700
#, c-format
msgid ""
"Your nation is thrust into civil war! %s is declared the leader of the rebel "
@@ -3668,12 +3704,12 @@ msgstr ""
"Din nation er splittet i en borgerkrig. %s er proklameret leder for de "
"oprørske landsdele."
-#: server/plrhand.c:1707
+#: server/plrhand.c:1721
#, c-format
msgid "%s declares allegiance to %s."
msgstr "%s erklærer troskab mod %s."
-#: server/plrhand.c:1722
+#: server/plrhand.c:1736
#, c-format
msgid ""
"Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3866,67 +3902,67 @@ msgstr "(bygger %s i %s (%s))\n"
msgid "Wonders of the World"
msgstr "Verdens vidundere"
-#: server/report.c:547
+#: server/report.c:552
msgid " sq. mi."
msgstr " km²"
-#: server/report.c:557
+#: server/report.c:562
msgid " M tons"
msgstr " M ton"
-#: server/report.c:562
+#: server/report.c:567
msgid " M goods"
msgstr " M varer"
-#: server/report.c:567
+#: server/report.c:572
msgid " bulbs"
-msgstr " knolde"
+msgstr " forskningspoint"
-#: server/report.c:572
+#: server/report.c:577
msgid " month"
msgid_plural " months"
msgstr[0] " måned"
msgstr[1] " måneder"
-#: server/report.c:577
+#: server/report.c:582
msgid " ton"
msgid_plural " tons"
msgstr[0] " ton"
msgstr[1] " ton"
-#: server/report.c:591
+#: server/report.c:596
msgid "st"
msgstr "."
-#: server/report.c:593
+#: server/report.c:598
msgid "nd"
msgstr "."
-#: server/report.c:595
+#: server/report.c:600
msgid "rd"
msgstr "."
-#: server/report.c:597
+#: server/report.c:602
msgid "th"
msgstr "."
-#: server/report.c:700
+#: server/report.c:705
msgid "Demography string contains invalid characters. Try \"help demography\"."
msgstr ""
"Demografi-tekststrengen indeholder ugyldige bogstaver. Prøv \"help demography"
"\"."
-#: server/report.c:743 server/report.c:768
+#: server/report.c:748 server/report.c:773
msgid "Demographics Report:"
msgstr "Demografirapport:"
-#: server/report.c:744
+#: server/report.c:749
msgid "Sorry, the Demographics report is unavailable."
msgstr "Beklager, demografirapporten er ikke tilgængelig."
#. TRANS: <nation adjective> <government name> (<year>).
#. * E.g. "Polish Despotism (200 AD)".
-#: server/report.c:750
+#: server/report.c:755
#, c-format
msgid "%s %s (%s)"
msgstr "%s %s (%s)"
@@ -3937,11 +3973,11 @@ msgstr "%s %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:2356
+#: server/ruleset.c:2366
msgid "No barbarian nation in rulesets, at least one required!"
msgstr "Ingen barbarnation i regelsæt, mindst 1 kræves!"
-#: server/ruleset.c:3166
+#: server/ruleset.c:3178
msgid "Loading rulesets"
msgstr "Indlæser regelsæt"
@@ -3955,20 +3991,20 @@ 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:3588
+#: server/savegame.c:3587
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."
#. TRANS: Fatal error message.
-#: server/savegame.c:3815
+#: server/savegame.c:3817
msgid ""
"Saved game uses the \"classic\" terrain ruleset, and is no longer supported."
msgstr ""
"Den gemte fil bruger den \"klassiske\" terræn-regelopsætning, som ikke "
"længere er understøttet."
-#: server/savegame.c:3824
+#: server/savegame.c:3826
#, c-format
msgid ""
"Warning: Different rulesetdirs ('%s' and '%s') are no longer supported. "
@@ -3978,7 +4014,7 @@ msgstr ""
"længere støttet. Bruger '%s'."
#. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4051
+#: server/savegame.c:4055
#, c-format
msgid "%s had invalid nation; changing to %s."
msgstr "%s havde ugyldit nation; ændrer til %s."
@@ -4011,7 +4047,7 @@ msgstr "Intern"
msgid "Networking"
msgstr "Netværk"
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:734
#: client/gui-win32/dialogs.c:532
msgid "All"
msgstr "Alle"
@@ -4343,14 +4379,14 @@ msgstr ""
#: server/settings.c:387
msgid "Amount of \"special\" resource squares"
-msgstr "Mængde felter med \"specielle\" resurser"
+msgstr "Mængde felter med \"specielle\" ressourcer"
#: 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 ""
-"Specielle resurser forbedrer den basale terræntype de er på. Serverens "
+"Specielle ressourcer forbedrer den basale terræntype de er på. Serverens "
"variabelskala er dele per tusind."
#: server/settings.c:395
@@ -4597,8 +4633,8 @@ msgid ""
"also notradesize."
msgstr ""
"Der findes en handelsbegrænsning for alle byer mindre en denne værdi. "
-"Begrænsningen er 100% (ingen handel) for byer op til notradesize og "
-"formindskes gradvis til 0% (ingen begrænsning udover normal korruption) for "
+"Begrænsningen er 100 % (ingen handel) for byer op til notradesize og "
+"formindskes gradvis til 0 % (ingen begrænsning udover normal korruption) for "
"byer med størrelse fulltradesize. Se også notradesize."
#: server/settings.c:580
@@ -4669,7 +4705,7 @@ msgid ""
"city will grow after celebrating for n+1 turns."
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."
+"vokse efter at have afholdt festivitas i n+1 runder."
#: server/settings.c:631
msgid "Chance for conquered building destruction"
@@ -4819,7 +4855,7 @@ msgid ""
"4 = raging hordes, lots of barbarians"
msgstr ""
"0 - ingen barbarer \n"
-"1 - barbarer kun i hytter \n"
+"1 - barbarer kun i landsbyer \n"
"2 - normal barbarfrekvens \n"
"3 - høj barbarfrekvens \n"
"4 - vandrende horder, massevis af barbarer"
@@ -5239,11 +5275,11 @@ msgstr ""
"log\" hver runde. Disse statistikker kan benyttes til atlave \"power graphs"
"\" efter spillet er forbi."
-#: server/sernet.c:150
+#: server/sernet.c:151
msgid "Server cannot read standard input. Ignoring input."
msgstr "Serveren kan ikke læse fra tastaturet. Ignorerer det."
-#: server/sernet.c:929
+#: server/sernet.c:933
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr "Server: Ugyldig adresse: [%s:%d]."
@@ -5317,47 +5353,47 @@ msgstr "Dit rumskib har allerede maksimalt antal solcelle-moduler!"
msgid "Without guidance from the capital, the %s spaceship is lost!"
msgstr "Uden vejledning fra hovedstaden er %s rumskibet tabt!"
-#: server/srv_main.c:240
+#: server/srv_main.c:242
msgid "Game ended in a draw as end year exceeded"
msgstr "Spillet var uafgjort fordi slutårstallet blev overskredet"
-#: server/srv_main.c:274
+#: server/srv_main.c:276
#, c-format
msgid "The %s spaceship has arrived at Alpha Centauri."
msgstr "%s-rumskibet er landet på Alfa Centauri."
-#: server/srv_main.c:287 server/srv_main.c:322
+#: server/srv_main.c:289 server/srv_main.c:324
#, c-format
msgid "Team victory to %s"
msgstr "Holdsejr til %s"
-#: server/srv_main.c:297 server/srv_main.c:338
+#: server/srv_main.c:299 server/srv_main.c:340
#, c-format
msgid "Game ended in victory for %s"
msgstr "Spillet endte med sejr til %s"
-#: server/srv_main.c:345
+#: server/srv_main.c:347
msgid "Game ended in a draw"
msgstr "Spillet endte uafgjort"
-#: server/srv_main.c:461 server/srv_main.c:472
+#: server/srv_main.c:465 server/srv_main.c:476
#, c-format
msgid "Your %s was disbanded in accordance with your peace treaty with the %s."
msgstr ""
"Din %s enhed blev opløst i overensstemmelse med din fredstraktat med %s."
-#: server/srv_main.c:512 server/srv_main.c:516
+#: server/srv_main.c:516 server/srv_main.c:520
#, c-format
msgid ""
"Concerned citizens point out that the cease-fire with %s will run out soon."
msgstr "Bekymrede borgere påpeger at våbenhvilen med %s snart udløber."
-#: server/srv_main.c:521 server/srv_main.c:525
+#: server/srv_main.c:525 server/srv_main.c:529
#, c-format
msgid "The cease-fire with %s has run out. You are now at war with the %s."
msgstr "Våbenhvilen med %s er udløbet. Du er nu i krig med %s."
-#: server/srv_main.c:542
+#: server/srv_main.c:546
#, c-format
msgid ""
"Ceasefire between %s and %s has run out. They are at war. You cancel your "
@@ -5366,98 +5402,98 @@ msgstr ""
"VÃ¥benhvilen mellem %s og %s er brudt. De er i krig. Du annullerer alliancen "
"med begge."
-#: server/srv_main.c:961
+#: server/srv_main.c:997
#, c-format
msgid "Failed saving game as %s"
msgstr "Kunne ikke gemme spil som %s"
-#: server/srv_main.c:963
+#: server/srv_main.c:999
#, c-format
msgid "Game saved as %s"
msgstr "Spil gemt som %s"
-#: server/srv_main.c:994
+#: server/srv_main.c:1030
msgid "The game is already running."
msgstr "Spillet er allerede i gang."
-#: server/srv_main.c:1002
+#: server/srv_main.c:1038
#, 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:1009
+#: server/srv_main.c:1045
msgid "Starting game."
msgstr "Starter spil."
-#: server/srv_main.c:1071
+#: server/srv_main.c:1112
#, c-format
msgid "request for unknown report (type %d)"
msgstr "Ukendt rapport (type %d)"
-#: server/srv_main.c:1136
+#: server/srv_main.c:1177
#, c-format
msgid "Warning: rejecting old client %s"
msgstr "Advarsel: Afviser ældre klient %s"
-#: server/srv_main.c:1238
+#: server/srv_main.c:1279
#, 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:1338
+#: server/srv_main.c:1381
msgid "Please choose a non-blank name."
msgstr "Vælg venligst et navn der ikke er blankt."
-#: server/srv_main.c:1354
+#: server/srv_main.c:1397
msgid "That nation is already in use."
msgstr "Denne nation er allerede i brug."
-#: server/srv_main.c:1370
+#: server/srv_main.c:1413
#, 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:1391
+#: server/srv_main.c:1434
msgid "Please choose a name containing only ASCII characters."
msgstr "Vælg venligst et navn der kun indeholder ASCII karakterer."
-#: server/srv_main.c:1490
+#: server/srv_main.c:1533
#, 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:1496
+#: server/srv_main.c:1539
#, c-format
msgid "%s nation is already in use."
msgstr "Nation %s er allerede i brug."
-#: server/srv_main.c:1514
+#: server/srv_main.c:1557
#, c-format
msgid "%s is the %s ruler %s."
msgstr "%s er %s hersker %s."
-#: server/srv_main.c:1570
+#: server/srv_main.c:1613
#, 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:1614 server/srv_main.c:1618
+#: server/srv_main.c:1657 server/srv_main.c:1661
#, 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:1760
+#: server/srv_main.c:1803
#, c-format
msgid "Player %d"
msgstr "Spiller %d"
-#: server/srv_main.c:1771 server/srv_main.c:1777
+#: server/srv_main.c:1814 server/srv_main.c:1820
#, c-format
msgid "%s rules the %s."
msgstr "%s styrer %s."
-#: server/srv_main.c:1942
+#: server/srv_main.c:1985
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
@@ -5465,245 +5501,235 @@ msgstr ""
"Dette civserver program har spillerbekræftelseunderstøttelse, men det er for "
"nuværende ikke i brug."
-#: server/srv_main.c:1993
+#: server/srv_main.c:2037
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr "Sender info til metaserver [%s]"
-#: server/srv_main.c:2024
+#: server/srv_main.c:2069
msgid "The game is over..."
msgstr "Spillet er forbi..."
-#: server/srv_main.c:2237
+#: server/srv_main.c:2286
msgid "Now accepting new client connections."
msgstr "Accepterer nu nye klient-tilslutninger."
-#: server/stdinhand.c:246
-#, c-format
-msgid "Vote \"%s\" is passed %d to %d with %d abstentions."
-msgstr "Stemmeafgivning \"%s\" afgjordes med %d til %d med %d blanke."
-
-#: server/stdinhand.c:253
-#, c-format
-msgid "Vote \"%s\" failed with %d against, %d for and %d abstentions."
-msgstr "Stemmeafgivning \"%s\" faldt med %d imod, %d for og %d blanke."
-
#. TRANS: ambiguous command
-#: server/stdinhand.c:365
+#: server/stdinhand.c:284
msgid "(ambiguous)"
msgstr "(uklar)"
#. TRANS: unrecognized command
#. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:416
+#: server/stdinhand.c:287 client/citydlg_common.c:419
#: 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 "(ukendt)"
-#: server/stdinhand.c:458
+#: server/stdinhand.c:377
msgid "Name is empty, so cannot be a player."
msgstr "Navnet er tomt, så det kan ikke være en spiller."
-#: server/stdinhand.c:462
+#: server/stdinhand.c:381
msgid "Name is too long, so cannot be a player."
msgstr "Navnet er for langt, så det kan ikke være en spiller."
-#: server/stdinhand.c:466
+#: server/stdinhand.c:385
#, c-format
msgid "Player name prefix '%s' is ambiguous."
msgstr "Spillernavn præfikset '%s' er ikke entydigt."
-#: server/stdinhand.c:470
+#: server/stdinhand.c:389
#, c-format
msgid "No player by the name of '%s'."
msgstr "Ingen spiller med navn '%s'."
-#: server/stdinhand.c:474 server/stdinhand.c:509
+#: server/stdinhand.c:393 server/stdinhand.c:428
#, c-format
msgid "Unexpected match_result %d (%s) for '%s'."
msgstr "Uventet match_result %d (%s) for '%s'."
-#: server/stdinhand.c:493
+#: server/stdinhand.c:412
msgid "Name is empty, so cannot be a connection."
msgstr "Navnet er tomt, så det kan ikke være en tilslutning."
-#: server/stdinhand.c:497
+#: server/stdinhand.c:416
msgid "Name is too long, so cannot be a connection."
msgstr "Navnet er for langt, så det kan ikke være en tilslutning."
-#: server/stdinhand.c:501
+#: server/stdinhand.c:420
#, c-format
msgid "Connection name prefix '%s' is ambiguous."
msgstr "Spillernavn-præfikset '%s' er ikke-entydigt."
-#: server/stdinhand.c:505
+#: server/stdinhand.c:424
#, c-format
msgid "No connection by the name of '%s'."
msgstr "Ingen tilslutning med navn '%s'."
-#: server/stdinhand.c:525
+#: server/stdinhand.c:444
#, c-format
msgid "Open metaserver connection to [%s]."
msgstr "Ã…bn metaserver kobling til [%s]."
-#: server/stdinhand.c:538
+#: server/stdinhand.c:457
#, c-format
msgid "Close metaserver connection to [%s]."
msgstr "Luk metaserver-tilknytningen til [%s]."
-#: server/stdinhand.c:553
+#: server/stdinhand.c:472
msgid "Metaserver connection is open."
msgstr "Metaserver-tilknytning er åben."
-#: server/stdinhand.c:556
+#: server/stdinhand.c:475
msgid "Metaserver connection is closed."
msgstr "Metaserver-tilknytning er lukket."
-#: server/stdinhand.c:566
+#: server/stdinhand.c:485
msgid "Metaserver connection is already open."
msgstr "Metaserver-tilknytning er allerede åben."
-#: server/stdinhand.c:577
+#: server/stdinhand.c:496
msgid "Metaserver connection is already closed."
msgstr "Metaserver-tilknytning er allerede lukket."
-#: server/stdinhand.c:582
+#: server/stdinhand.c:501
msgid "Argument must be 'u', 'up', 'd', 'down', or '?'."
msgstr "Argumentet skal være 'u', 'up', 'd', 'down', eller '?'."
-#: server/stdinhand.c:603
+#: server/stdinhand.c:522
#, c-format
msgid "Metaserver patches string set to '%s'."
msgstr "Metaserverens infostrenge er sat til '%s'."
-#: server/stdinhand.c:606
+#: server/stdinhand.c:525
#, c-format
msgid "Metaserver patches string set to '%s', not reporting to metaserver."
msgstr "Metaserverens infostrenge sat til '%s', svarer ikke metaserver."
-#: server/stdinhand.c:627
+#: server/stdinhand.c:546
#, c-format
msgid "Metaserver message string set to '%s'."
msgstr "Metaserver beskedsstreng sat til '%s'."
-#: server/stdinhand.c:630
+#: server/stdinhand.c:549
#, c-format
msgid "Metaserver message string set to '%s', not reporting to metaserver."
msgstr "Metaserverens besked sat til '%s', svarer ikke metaserver."
-#: server/stdinhand.c:650
+#: server/stdinhand.c:569
#, c-format
msgid "Metaserver is now [%s]."
msgstr "Metaserver er nu [%s]."
-#: server/stdinhand.c:660
+#: server/stdinhand.c:579
#, c-format
msgid "Server id: %s"
msgstr "Serveroperatør: %s"
-#: server/stdinhand.c:757
+#: server/stdinhand.c:676
msgid "You cannot save games manually on this server."
msgstr "Du kan ikke afslutte spillet manuelt på denne server."
-#: server/stdinhand.c:774
+#: server/stdinhand.c:693
msgid "Cannot toggle a barbarian player."
msgstr "Kan ikke ændre en 'barbar'-spiller."
-#: server/stdinhand.c:781
+#: server/stdinhand.c:700
#, c-format
msgid "%s is now under AI control."
msgstr "%s er nu under AI-kontrol."
-#: server/stdinhand.c:802
+#: server/stdinhand.c:721
#, c-format
msgid "%s is now under human control."
msgstr "%s er nu under menneskelig kontrol."
-#: server/stdinhand.c:847
+#: server/stdinhand.c:766
msgid "Can't add AI players once the game has begun."
msgstr "Kan ikke tilføje AI-spillere når spillet er startet."
-#: server/stdinhand.c:867
+#: server/stdinhand.c:786
msgid "Can't add more players, server is full."
msgstr "Kan ikke tilføje flere spillere, serveren er fuld."
-#: server/stdinhand.c:874
+#: server/stdinhand.c:793
msgid "Can't use an empty name."
msgstr "Kan ikke bruge et tomt navn"
-#: server/stdinhand.c:881
+#: server/stdinhand.c:800
#, c-format
msgid "That name exceeds the maximum of %d chars."
msgstr "Det navn er længere end det maksimale som er %d tegn."
-#: server/stdinhand.c:887
+#: server/stdinhand.c:806
msgid "That name is not allowed."
msgstr "Det navn er ikke tilladt."
-#: server/stdinhand.c:893
+#: server/stdinhand.c:812
msgid "A player already exists by that name."
msgstr "Der findes allerede en spiller med det navn."
-#: server/stdinhand.c:899
+#: server/stdinhand.c:818
msgid "A user already exists by that name."
msgstr "Der findes allerede en bruger med det navn."
-#: server/stdinhand.c:925
+#: server/stdinhand.c:844
#, c-format
msgid "%s has been added as an AI-controlled player."
msgstr "%s er blevet tilføjet som en AI-kontrolleret spiller."
-#: server/stdinhand.c:932
+#: server/stdinhand.c:851
#, c-format
msgid "Error creating new AI player: %s."
msgstr "Fejl ved oprettelse af ny AI-spiller: %s."
-#: server/stdinhand.c:966
+#: server/stdinhand.c:885
msgid "Players cannot be removed once the game has started."
msgstr "Spillere kan ikke fjernes efter at spillet er startet."
-#: server/stdinhand.c:977
+#: server/stdinhand.c:896
#, c-format
msgid "Removed player %s from the game."
msgstr "Fjernede spiller %s fra spillet."
-#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
+#: server/stdinhand.c:935 server/stdinhand.c:3372 server/stdinhand.c:3507
#, c-format
msgid "Name \"%s\" disallowed for security reasons."
msgstr "Navnet \"%s\" er ikke tilladt af sikkerhedsårasager."
-#: server/stdinhand.c:1029
+#: server/stdinhand.c:948
#, c-format
msgid "No command script found by the name \"%s\"."
msgstr "Ingen tilslutning med navn '%s' fundet."
-#: server/stdinhand.c:1037
+#: server/stdinhand.c:956
#, c-format
msgid "Loading script file: %s"
msgstr "Indlæser skriptfil: %s"
-#: server/stdinhand.c:1052
+#: server/stdinhand.c:971
#, c-format
msgid "Cannot read command line scriptfile '%s'."
msgstr "Kunne ikke læse kommandoskriptfilen \"%s\"."
-#: server/stdinhand.c:1054
+#: server/stdinhand.c:973
#, c-format
msgid "Could not read script file '%s'."
msgstr "Kunne ikke læse skriptfilen '%s'."
-#: server/stdinhand.c:1146
+#: server/stdinhand.c:1065
#, c-format
msgid "Could not write script file '%s'."
msgstr "Kunne ikke skrive til skriptfilen '%s'."
-#: server/stdinhand.c:1158
+#: server/stdinhand.c:1077
msgid "You cannot use the write command on this server for security reasons."
msgstr "Du kan ikke bruge den kommando på denne server af sikkerhedsårsager."
-#: server/stdinhand.c:1186
+#: server/stdinhand.c:1105
#, c-format
msgid ""
"Cannot decrease command access level '%s' for connection '%s'; you only have "
@@ -5711,7 +5737,12 @@ msgid ""
msgstr ""
"Kan ikke sænke kommandoniveau '%s' for tilslutning '%s'; du har kun '%s'."
-#: server/stdinhand.c:1241
+#: server/stdinhand.c:1114
+#, 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:1163
#, c-format
msgid ""
"Anyone can now become game organizer '%s' by issuing the 'first' command."
@@ -5719,226 +5750,216 @@ msgstr ""
"Alle kan få kommando-adgangsniveau '%s' nu ved at bruge 'firstlevel' "
"kommandoen."
-#: server/stdinhand.c:1274
+#: server/stdinhand.c:1187
msgid "Command access levels in effect:"
msgstr "Kommandoniveau i brug:"
-#: server/stdinhand.c:1282
+#: server/stdinhand.c:1194
#, c-format
msgid "Command access level for new connections: %s"
msgstr "Kommandoniveau for nye tilslutninger: %s"
-#: server/stdinhand.c:1285
+#: server/stdinhand.c:1197
#, c-format
msgid "Command access level for first player to take it: %s"
msgstr "Kommando adgangs-niveau for første spiller: %s."
-#: server/stdinhand.c:1294
+#: server/stdinhand.c:1206
msgid ""
"Error: command access level must be one of 'none', 'info', 'ctrl', or 'hack'."
msgstr ""
"Fejl: kommandoniveau skal være en af 'none', 'info', 'ctrl', eller 'hack'."
-#: server/stdinhand.c:1299
+#: server/stdinhand.c:1211
#, c-format
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: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: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:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
+#: server/stdinhand.c:1238 server/stdinhand.c:1252 server/stdinhand.c:1273
#, 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:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
+#: server/stdinhand.c:1243 server/stdinhand.c:1257 server/stdinhand.c:1267
#, 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:1402
+#: server/stdinhand.c:1302
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:1406
+#: server/stdinhand.c:1306
#, c-format
msgid "You already have command access level '%s' or better."
msgstr "Du har allerede adgangsniveau '%s' eller bedre."
-#: server/stdinhand.c:1411
+#: server/stdinhand.c:1311
msgid "Someone else already is game organizer."
msgstr "En andre er allerede spilleder."
-#: server/stdinhand.c:1416
+#: server/stdinhand.c:1316
#, c-format
msgid "Connection %s has opted to become the game organizer."
msgstr "Forbindelse %s har anmodet om at blive spileleder."
-#: server/stdinhand.c:1467
+#: server/stdinhand.c:1367
#, c-format
msgid "Invalid argument %d."
msgstr "Ugyldigt argument %d."
-#: server/stdinhand.c:1474
+#: server/stdinhand.c:1374
msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
msgstr "Brug: timeoutincrease <runde> <rundetillæg> <værdi> <faktor>."
-#: server/stdinhand.c:1482
+#: server/stdinhand.c:1382
#, c-format
msgid "Dynamic timeout set to %d %d %d %d"
msgstr "Dynamisk rundetidsbegrænsning sat til %d %d %d %d"
-#: server/stdinhand.c:1542 server/stdinhand.c:1545
+#: server/stdinhand.c:1442 server/stdinhand.c:1445
msgid "Option:"
msgstr "Indstilling:"
-#: server/stdinhand.c:1555 server/stdinhand.c:4031
+#: server/stdinhand.c:1455 server/stdinhand.c:4079
msgid "Description:"
msgstr "Beskrivelse:"
-#: server/stdinhand.c:1560
+#: server/stdinhand.c:1460
#, c-format
msgid "Status: %s"
msgstr "Status: %s"
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "changeable"
msgstr "kan ændres"
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "fixed"
msgstr "rettet"
-#: server/stdinhand.c:1567
+#: server/stdinhand.c:1467
#, 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:1572
+#: server/stdinhand.c:1472
#, 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:1578
+#: server/stdinhand.c:1478
#, c-format
msgid "Value: \"%s\", Default: \"%s\""
msgstr "Værdi: \"%s\", Std.værdi: \"%s\""
-#: server/stdinhand.c:1597
+#: server/stdinhand.c:1497
msgid "Explanations are available for the following server options:"
msgstr "Forklaringer er tilgængelige for følgende serveroptioner:"
-#: server/stdinhand.c:1643
+#: server/stdinhand.c:1537
msgid "No explanation for that yet."
msgstr "Ingen forklaring på det endnu."
-#: server/stdinhand.c:1646 server/stdinhand.c:2480
+#: server/stdinhand.c:1540 server/stdinhand.c:2468
msgid "Ambiguous option name."
msgstr "Indstillingsnavn er ikke entydigt."
-#: server/stdinhand.c:1666
+#: server/stdinhand.c:1560
#, c-format
msgid "Server Operator: %s"
msgstr "Server Operatør: %s"
-#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
+#: server/stdinhand.c:1686 server/stdinhand.c:1713 server/stdinhand.c:1731
#, c-format
msgid "Player '%s' now has AI skill level '%s'."
msgstr "Spiller '%s' har nu AI sværhedsgrad '%s'."
-#: server/stdinhand.c:1822
+#: server/stdinhand.c:1718
#, c-format
msgid "%s is not controlled by the AI."
msgstr "%s er ikke kontrolleret af AIen."
-#: server/stdinhand.c:1842
+#: server/stdinhand.c:1738
#, c-format
msgid "Default AI skill level set to '%s'."
msgstr "Standard AI sværhedsgrad er sat til '%s'."
-#: server/stdinhand.c:1857 server/stdinhand.c:2162
+#: server/stdinhand.c:1753
msgid "This command is client only."
msgstr "Denne kommando er for klienter kun."
-#: server/stdinhand.c:1860
+#: server/stdinhand.c:1756
msgid "Usage: away"
msgstr "Brug: away"
-#: server/stdinhand.c:1865
+#: server/stdinhand.c:1761
msgid "Only players may use the away command."
msgstr "Kun spillere må anvende væk kommandoen."
-#: server/stdinhand.c:1869
+#: server/stdinhand.c:1765
#, c-format
msgid "%s set to away mode."
msgstr "%s er sat til væk-tilstand."
-#: server/stdinhand.c:1877
+#: server/stdinhand.c:1772
#, c-format
msgid "%s returned to game."
msgstr "%s returnerede til spillet."
-#: server/stdinhand.c:1919
+#: server/stdinhand.c:1817
#, 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:1925
+#: server/stdinhand.c:1823
#, c-format
msgid "Unknown option '%s'."
msgstr "Ukendt indstilling '%s'."
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1848
msgid "All options with non-default values"
msgstr "Alle indstillinger med ikkestandardværdier"
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1851
msgid "All options"
msgstr "Alle indstillinger"
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1854
msgid "Vital options"
msgstr "Vitale indstillinger"
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1857
msgid "Situational options"
msgstr "Situationsindstillinger"
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1860
msgid "Rarely used options"
msgstr "Sjældent brugte indstillinger"
-#: server/stdinhand.c:1965
+#: server/stdinhand.c:1863
msgid "+ means you may change the option"
msgstr "+ betyder at du kan ændre indstillingen"
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1864
msgid "= means the option is on its default value"
msgstr "= betyder at indstillingen har standardværdi"
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
#, c-format
msgid "%-*s value (min,max) "
msgstr "%-*s værdi (min,maks) "
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
msgid "Option"
msgstr "Indstilling"
-#: server/stdinhand.c:1973
+#: server/stdinhand.c:1871
msgid "description"
msgstr "beskrivelse"
-#: server/stdinhand.c:2042
+#: server/stdinhand.c:1940
msgid ""
"Try 'show situational' or 'show rare' to show more options.\n"
"Try 'show changed' to show settings with non-default values."
@@ -5946,78 +5967,146 @@ 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:2092
+#: server/stdinhand.c:1966
msgid "Cannot change teams once game has begun."
msgstr "Kan ikke ændre holdene når spillet er startet."
-#: server/stdinhand.c:2102
+#: server/stdinhand.c:1976
msgid "Undefined argument. Usage: team <player> <team>."
msgstr "Udefineret argument. Brug: team <spiller> <hold>."
-#: server/stdinhand.c:2122
+#: server/stdinhand.c:1996
#, 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:2129
+#: server/stdinhand.c:2003
msgid "Cannot team a barbarian."
msgstr "Kan ikke være på hold sammen med en barbar."
-#: server/stdinhand.c:2135
+#: server/stdinhand.c:2009
#, c-format
msgid "Player %s set to team %s."
msgstr "Spiller %s er med i holdet %s."
-#: server/stdinhand.c:2157
-msgid "Undefined arguments. Usage: vote yes|no [vote number]."
-msgstr "Udefinerede argumenter. Brug: vote yes/no [afstemningsnummer]."
+#: server/stdinhand.c:2035 server/voting.c:512
+msgid "Teamvote"
+msgstr "Holdafstemning"
-#: server/stdinhand.c:2165
-msgid "Observers cannot vote."
-msgstr "Observatører kan ikke stemme."
+#: server/stdinhand.c:2035 server/voting.c:516
+msgid "Vote"
+msgstr "Afstemning"
-#: server/stdinhand.c:2168
+#: server/stdinhand.c:2037
+#, c-format
msgid ""
-"You can only vote in a running game. Use 'first' to become the game "
-"organizer if there currently is none."
+"%s %d \"%s\" (needs %0.0f%%%s): %d for, %d against, and %d abstained out of %"
+"d players."
msgstr ""
-"Du kan kun stemme i et igangværende spil. Brug 'first' for at blive "
-"spilleder, hvis der ikke er en."
+"%s %d \"%s\" (behøver %0.0f%%%s): %d for, %d imod, og %d afstod fra at "
+"stemme ud af %d spillere."
-#: 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:2041
+msgid " no dissent"
+msgstr " ingen uenige"
-#: server/stdinhand.c:2188
+#: server/stdinhand.c:2049
msgid "There are no votes going on."
msgstr "Der er ingen stemmeafgivning i gang."
-#: server/stdinhand.c:2208
-msgid "No legal last vote."
-msgstr "Ingen gyldig sidste stemme."
+#: server/stdinhand.c:2077
+msgid "Invalid arguments. Usage: vote yes|no|abstain [vote number]."
+msgstr "Udefinerede argumenter. Brug: vote yes|no|abstain [afstemningsnummer]."
-#: server/stdinhand.c:2213
-msgid "Value must be integer."
+#: server/stdinhand.c:2095 server/stdinhand.c:2213 server/stdinhand.c:3714
+msgid "You are not allowed to use this command."
+msgstr "Du har ikke lov at bruge denne kommando."
+
+#: server/stdinhand.c:2104
+#, c-format
+msgid "The argument \"%s\" is ambigious."
+msgstr "Argumentet \"%s\" er ikke entydigt."
+
+#: server/stdinhand.c:2119
+msgid "There are no votes running."
+msgstr "Der er ingen stemmeafgivning i gang."
+
+#: server/stdinhand.c:2121
+#, c-format
+msgid "No legal last vote (%d %s)."
+msgstr "Ingen gyldig sidste afstemning (%d %s)."
+
+#: server/stdinhand.c:2122
+msgid "other vote running"
+msgid_plural "other votes running"
+msgstr[0] "anden stemmeafgivning i gang"
+msgstr[1] "andre stemmeafgivninger i gang"
+
+#: server/stdinhand.c:2129 server/stdinhand.c:2491 server/stdinhand.c:2532
+msgid "Value must be an integer."
msgstr "Værdien skal være et heltal."
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2135 server/stdinhand.c:2221
#, c-format
msgid "No such vote (%d)."
msgstr "Ingen sådan stemme (%d)."
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2141
+msgid "You are not allowed to vote on that."
+msgstr "Du må ikke stemme på det."
+
+#: server/stdinhand.c:2146
#, c-format
msgid "You voted for \"%s\""
msgstr "Du stemte for \"%s\""
-#: server/stdinhand.c:2232
+#: server/stdinhand.c:2150
#, c-format
msgid "You voted against \"%s\""
msgstr "Du stemte imod \"%s\""
-#: server/stdinhand.c:2259
+#: server/stdinhand.c:2155
+#, c-format
+msgid "You abstained from voting on \"%s\""
+msgstr "Du afstod fra at stemme på \"%s\""
+
+#: server/stdinhand.c:2190
+msgid "Missing argument <vote number> or the string \"all\"."
+msgstr "Manglende argument <stemmeafgivningsnummer> eller strengen \"alle\"."
+
+#: server/stdinhand.c:2197
+msgid "You don't have any vote going on."
+msgstr "Du har ikke en stemmeafgivning i gang."
+
+#: server/stdinhand.c:2204
+msgid "There isn't any vote going on."
+msgstr "Der er ingen stemmeafgivning i gang."
+
+#: server/stdinhand.c:2209
+msgid "Server: All votes have been removed."
+msgstr "Server: Alle stemmer er blevet fjernet."
+
+#: server/stdinhand.c:2226
+#, c-format
+msgid "You are not allowed to cancel this vote (%d)."
+msgstr "Du har ikke lov til at afbryde denne stemmeafgivning (%d)."
+
+#: server/stdinhand.c:2232
+msgid "Usage: /cancelvote [<vote number>|all]"
+msgstr "Brug: /cancelvote [<stemmeafgivningsnummer>|all]"
+
+#: server/stdinhand.c:2241
+#, c-format
+msgid "Server: %s cancelled the vote \"%s\" (number %d)."
+msgstr "Server: %s afbrød stemmeafgivningen \"%s\" (nummer %d)."
+
+#: server/stdinhand.c:2247
+#, c-format
+msgid "Server: The vote \"%s\" (number %d) has been cancelled."
+msgstr "Server: Stemmeafgivningen \"%s\" (nummer %d) er blevet afbrudt."
+
+#: server/stdinhand.c:2265
msgid ""
"Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
"<x> <y> | unit <id> | tech <player> | timing | info>."
@@ -6025,130 +6114,126 @@ msgstr ""
"Udefinerede argumenter. Brug: debug <diplomati <spiller> | by <x> <y> | "
"enhed <x> <y> | enhed <id> | tech <spiller> | timing | info>."
-#: server/stdinhand.c:2265
+#: server/stdinhand.c:2271
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:2294
+#: server/stdinhand.c:2300
#, c-format
msgid "%s diplomacy no longer debugged"
msgstr "%s diplomati ikke længere i fejlsøgning"
-#: server/stdinhand.c:2298
+#: server/stdinhand.c:2304
#, c-format
msgid "%s diplomacy debugged"
msgstr "%s diplomati fejlsøgt"
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2323
#, c-format
msgid "%s tech no longer debugged"
msgstr "%s teknologi ikke længere i fejlsøgning"
-#: server/stdinhand.c:2321
+#: server/stdinhand.c:2327
#, c-format
msgid "%s tech debugged"
msgstr "%s teknologi fejlsøgt"
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2358 server/stdinhand.c:2388
msgid "Value 2 & 3 must be integer."
msgstr "Værdi 2 og 3 skal være heltal."
-#: server/stdinhand.c:2356 server/stdinhand.c:2386
+#: server/stdinhand.c:2362 server/stdinhand.c:2392
msgid "Bad map coordinates."
msgstr "Ugyldige kortkoordinater."
-#: server/stdinhand.c:2361
+#: server/stdinhand.c:2367
msgid "No city at this coordinate."
msgstr "Ingen by på denne koordinat."
-#: server/stdinhand.c:2366
+#: server/stdinhand.c:2372
#, c-format
msgid "%s no longer debugged"
msgstr "%s ikke længere i fejlsøgning"
-#: server/stdinhand.c:2392 server/stdinhand.c:2422
+#: server/stdinhand.c:2398 server/stdinhand.c:2428
#, c-format
msgid "%s %s no longer debugged."
msgstr "%s's %s ikke længere i fejlsøgning."
-#: server/stdinhand.c:2397 server/stdinhand.c:2427
+#: server/stdinhand.c:2403 server/stdinhand.c:2433
#, c-format
msgid "%s %s debugged."
msgstr "%s's %s fejlsøgt."
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2419
msgid "Value 2 must be integer."
msgstr "Værdi 2 skal være et heltal"
-#: server/stdinhand.c:2417
+#: server/stdinhand.c:2423
#, c-format
msgid "Unit %d does not exist."
msgstr "Enhed %d eksisterer ikke."
-#: server/stdinhand.c:2475
+#: server/stdinhand.c:2464
msgid "Undefined argument. Usage: set <option> <value>."
msgstr "Udefineret argument. Brug: set <indstilling> <værdi>."
-#: server/stdinhand.c:2485
+#: server/stdinhand.c:2473
msgid "You are not allowed to set this option."
msgstr "Du har ikke lov at sætte denne indstilling."
-#: server/stdinhand.c:2490 server/stdinhand.c:3463
+#: server/stdinhand.c:2478 server/stdinhand.c:3501
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:2502 server/stdinhand.c:2543
-msgid "Value must be an integer."
-msgstr "Værdien skal være et heltal"
-
-#: server/stdinhand.c:2512
+#: server/stdinhand.c:2501
#, 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:2519
+#: server/stdinhand.c:2508
msgid "Value out of range (minimum: 0, maximum: 1)."
msgstr "Værdi udenfor område (minimum: 0, maksimum: 1)."
-#: server/stdinhand.c:2534 server/stdinhand.c:2576
+#: server/stdinhand.c:2523 server/stdinhand.c:2565
#, c-format
msgid "Option: %s has been set to %d."
msgstr "Indstilling: %s er blevet sat til %d."
-#: server/stdinhand.c:2554
+#: server/stdinhand.c:2543
#, 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:2561
+#: server/stdinhand.c:2550
#, 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:2586
+#: server/stdinhand.c:2575
msgid "String value too long. Usage: set <option> <value>."
msgstr "Strengværdi for lang. Brug: set <indstilling> <værdi>."
-#: server/stdinhand.c:2600
+#: server/stdinhand.c:2589
#, c-format
msgid "Option: %s has been set to \"%s\"."
msgstr "Indstilling: %s er blevet sat til \"%s\"."
-#: server/stdinhand.c:2658
+#: server/stdinhand.c:2652
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:2661
+#: server/stdinhand.c:2655
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:2671
+#: server/stdinhand.c:2665
msgid "You cannot take a new player at this time."
msgstr "Du kan ikke overtage en ny spiller på dette tidspunkt."
#. TRANS: Do not translate "maxplayers".
-#: server/stdinhand.c:2679
+#: server/stdinhand.c:2673
#, c-format
msgid ""
"You cannot take a new player because the maximum of %d player has already "
@@ -6163,73 +6248,73 @@ msgstr[1] ""
"Du kan ikke overtage en ny spiller da det maksimale antal på %d spillere "
"allerede er nået (indstillingen maksspillere)."
-#: server/stdinhand.c:2691
+#: server/stdinhand.c:2685
msgid "You cannot take a new player because there are no free player slots."
msgstr "Du kan ikke overtage en ny spiller, da der ingen ledige pladser er."
-#: server/stdinhand.c:2702
+#: server/stdinhand.c:2696
msgid "Sorry, one can't observe barbarians in this game."
msgstr "Beklager, man kan ikke observere barbarer i dette spil."
-#: server/stdinhand.c:2705
+#: server/stdinhand.c:2699
msgid "Sorry, one can't take barbarians in this game."
msgstr "Beklager, man kan ikke tage barbarer i dette spil."
-#: server/stdinhand.c:2713
+#: server/stdinhand.c:2707
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:2716
+#: server/stdinhand.c:2710
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:2724
+#: server/stdinhand.c:2718
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:2727
+#: server/stdinhand.c:2721
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:2736
+#: server/stdinhand.c:2730
msgid "Sorry, one can't observe human players in this game."
msgstr "Beklager, man kan ikke observere spillere i dette spil."
-#: server/stdinhand.c:2739
+#: server/stdinhand.c:2733
msgid "Sorry, one can't take human players in this game."
msgstr "Beklager, man kan ikke overtage spiller i dette spil."
-#: server/stdinhand.c:2749
+#: server/stdinhand.c:2743
msgid "Sorry, one can't observe in this game."
msgstr "Beklager, man kan ikke observere i dette spil."
-#: server/stdinhand.c:2754
+#: server/stdinhand.c:2748
msgid "Sorry, one can't take players in this game."
msgstr "Beklager, man kan ikke overtage spillere i dette spil."
-#: server/stdinhand.c:2760
+#: server/stdinhand.c:2754
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:2791
+#: server/stdinhand.c:2785
msgid "Usage: observe [connection-name [player-name]]"
msgstr "Brug: observer [connection-name [spillernavn]]"
-#: server/stdinhand.c:2797
+#: server/stdinhand.c:2791
msgid "Usage: observe [player-name]"
msgstr "Brug: observer [spillernavn]"
-#: server/stdinhand.c:2847
+#: server/stdinhand.c:2841
#, 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:2858
+#: server/stdinhand.c:2852
#, c-format
msgid "%s is already observing %s."
msgstr "%s observerer allerede %s."
-#: server/stdinhand.c:2863
+#: server/stdinhand.c:2857
#, c-format
msgid "%s is already observing."
msgstr "%s observerer allerede."
@@ -6244,231 +6329,235 @@ msgstr "%s observer nu %s"
msgid "%s now observes"
msgstr "%s observer nu"
-#: server/stdinhand.c:2969
+#: server/stdinhand.c:2971
msgid "Usage: take <connection-name> <player-name>"
msgstr "Brug: tag [forbindelsesnavn] <spillernavn>"
-#: server/stdinhand.c:2974
+#: server/stdinhand.c:2976
msgid "Usage: take <player-name>"
msgstr "Brug: tag <spillernavn>"
-#: server/stdinhand.c:2980
+#: server/stdinhand.c:2982
msgid "Usage: take [connection-name] <player-name>"
msgstr "Brug: tag [forbindelsesnavn] <spillernavn>"
-#: server/stdinhand.c:3010
+#: server/stdinhand.c:3012
#, c-format
msgid "%s already controls %s."
msgstr "%s kontrollerer allerede %s."
-#: server/stdinhand.c:3024
+#: server/stdinhand.c:3026
#, c-format
msgid "There is no free player slot for %s."
msgstr "Der er ingen ledige spillerpladser til %s."
-#: server/stdinhand.c:3059
+#: server/stdinhand.c:3061
#, c-format
msgid "being detached from %s."
msgstr "Løsnes fra %s."
-#: server/stdinhand.c:3135
+#: server/stdinhand.c:3146
#, c-format
msgid "%s now controls %s (%s, %s)."
msgstr "%s kontrollerer nu %s (%s, %s)."
-#: server/stdinhand.c:3139 server/stdinhand.c:4260
+#: server/stdinhand.c:3150 server/stdinhand.c:4308
#: data/nation/barbarian.ruleset:3
msgid "Barbarian"
msgstr "Barbar"
-#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
+#: server/stdinhand.c:3152 server/stdinhand.c:4310 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-sdl/plrdlg.c:645
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr "AI"
-#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-gtk-2.0/pages.c:2125
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
+#: server/stdinhand.c:3153 server/stdinhand.c:4312
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-gtk-2.0/pages.c:2127
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/connectdlg.c:215
msgid "Human"
msgstr "Menneske"
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-gtk-2.0/pages.c:2124 client/gui-win32/connectdlg.c:200
-#: client/gui-win32/connectdlg.c:212
+#: server/stdinhand.c:3155 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-gtk-2.0/pages.c:2126 client/gui-win32/connectdlg.c:202
+#: client/gui-win32/connectdlg.c:214
msgid "Alive"
msgstr "I live"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3156 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-win32/connectdlg.c:202
msgid "Dead"
msgstr "Død"
-#: server/stdinhand.c:3147
+#: server/stdinhand.c:3159
#, c-format
msgid "%s failed to attach to any player."
msgstr "%s er ikke knyttet til nogen spiller."
-#: server/stdinhand.c:3182
+#: server/stdinhand.c:3194
msgid "Usage: detach <connection-name>"
msgstr "Brug: løs <tilslutningsnavn>"
-#: server/stdinhand.c:3202
+#: server/stdinhand.c:3214
msgid "You can not detach other users."
msgstr "Du kan ikke løsne andre brugere."
-#: server/stdinhand.c:3211
+#: server/stdinhand.c:3223
#, c-format
msgid "%s is not attached to any player."
msgstr "%s er ikke knyttet til nogen spiller."
-#: server/stdinhand.c:3234
+#: server/stdinhand.c:3246
#, c-format
msgid "%s detaching from %s"
msgstr "%s frigører fra %s"
-#: server/stdinhand.c:3240
+#: server/stdinhand.c:3252
#, c-format
msgid "%s no longer observing."
msgstr "%s observerer ikk mere."
-#: server/stdinhand.c:3259
+#: server/stdinhand.c:3271
#, c-format
msgid "detaching from %s."
msgstr "frigører fra %s."
-#: server/stdinhand.c:3345
+#: server/stdinhand.c:3361
msgid "Usage: load <game name>"
msgstr "Brug: hent <spilnavn>"
-#: server/stdinhand.c:3350
+#: server/stdinhand.c:3366
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:3372
+#: server/stdinhand.c:3388
#, 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:3389
+#: server/stdinhand.c:3405
#, c-format
msgid "Could not load savefile: %s"
msgstr "Kunne ikke indlæse gemt spil: %s"
-#: server/stdinhand.c:3458
+#: server/stdinhand.c:3496
#, c-format
msgid "Current ruleset directory is \"%s\""
msgstr "Nuværende katalog for regelopsætningen er: \"%s\""
-#: server/stdinhand.c:3478
+#: server/stdinhand.c:3516
#, c-format
msgid "Ruleset directory \"%s\" not found"
msgstr "Kunne ikke finde regelopsætningskataloget \"%s\""
-#: server/stdinhand.c:3484
+#: server/stdinhand.c:3522
#, c-format
msgid "Ruleset directory is already \"%s\""
msgstr "Regelopsætningskataloget er allerede \"%s\""
-#: server/stdinhand.c:3488
+#: server/stdinhand.c:3526
#, c-format
msgid "Ruleset directory set to \"%s\""
msgstr "Regelopsætningskataloget er \"%s\""
-#: server/stdinhand.c:3536
+#: server/stdinhand.c:3574
msgid "Goodbye."
msgstr "Farvel."
-#: server/stdinhand.c:3567
+#: server/stdinhand.c:3606
msgid "Sorry, you are not allowed to use server commands."
msgstr "Beklager, du har ikke rettigheder til at benytte serverkommandoer."
-#: server/stdinhand.c:3603
+#: server/stdinhand.c:3656
#, 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:3608
+#: server/stdinhand.c:3661
#, c-format
msgid "Unknown command. Try '%shelp'."
msgstr "Ukendt kommando. Prøv '%shelp'."
-#: server/stdinhand.c:3625
-msgid "Your new vote canceled your previous vote."
-msgstr "Din nye stemmeafgivning afløser din tidligere."
+#: server/stdinhand.c:3675
+msgid "Your new vote cancelled your previous vote."
+msgstr "Din nye stemmeafgivning afløste din tidligere."
-#: server/stdinhand.c:3633
+#: server/stdinhand.c:3688
+msgid "New teamvote"
+msgstr "Ny holdafstemning"
+
+#: server/stdinhand.c:3691
+msgid "New vote"
+msgstr "Ny afstemning"
+
+#: server/stdinhand.c:3695
#, c-format
-msgid "New vote (number %d) by %s: %s."
-msgstr "Ny stemme (nummer %d) fra %s: %s."
+msgid "%s (number %d) by %s: %s"
+msgstr "%s (nummer %d) af %s: %s"
-#: server/stdinhand.c:3645
+#: server/stdinhand.c:3704
#, c-format
msgid "Your new vote (\"%s\") was not legal or was not recognized."
msgstr "Din nye stemme (\"%s\") var ikke gyldig eller kunne ikke genkendes."
-#: 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:3680
+#: server/stdinhand.c:3726
msgid "(server prompt)"
msgstr "(serverkommandolinje)"
-#: server/stdinhand.c:3787
+#: server/stdinhand.c:3835
msgid "Game ended in a draw."
msgstr "Spillet endte uafgjort."
-#: server/stdinhand.c:3791
+#: server/stdinhand.c:3839
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:3796
+#: server/stdinhand.c:3844
msgid "Cannot end the game: no game running."
msgstr "Kan ikke afslutte spil: det er ikke noget spil i gang."
-#: server/stdinhand.c:3812
+#: server/stdinhand.c:3860
#, 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:3817
+#: server/stdinhand.c:3865
msgid "You cannot surrender now."
msgstr "Du kan ikke overgive dig nu."
-#: server/stdinhand.c:3883
+#: server/stdinhand.c:3931
msgid "Not enough human players, game will not start."
msgstr "Ikke nok ikke-computer-spillere, spillet vil ikke starte."
-#: server/stdinhand.c:3888
+#: server/stdinhand.c:3936
msgid "No players, game will not start."
msgstr "Ingen spillere, spillet vil ikke starte."
-#: server/stdinhand.c:3892
+#: server/stdinhand.c:3940
msgid "Not enough nations for all players, game will not start."
msgstr "Ikke nok nationer til alle spillere, spillet vil ikke starte."
-#: server/stdinhand.c:3901
+#: server/stdinhand.c:3949
msgid "All players are ready; starting game."
msgstr "Alle spillere er klar; starter spillet."
-#: server/stdinhand.c:3915
+#: server/stdinhand.c:3963
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:3922
+#: server/stdinhand.c:3970
msgid "Cannot start the game: it is already running."
msgstr "Kan ikke starte spil: Det er allerede i gang."
-#: server/stdinhand.c:3953
+#: server/stdinhand.c:4001
#, c-format
msgid "Cutting connection %s."
msgstr "Afbryder tilslutning til %s."
-#: server/stdinhand.c:3972
+#: server/stdinhand.c:4020
msgid ""
"Welcome - this is the introductory help text for the Freeciv server.\n"
"\n"
@@ -6507,123 +6596,123 @@ msgstr ""
" save - gem det nuværende spil\n"
" quit - afslut"
-#: server/stdinhand.c:4007 server/stdinhand.c:4010
+#: server/stdinhand.c:4055 server/stdinhand.c:4058
msgid "Command:"
msgstr "Kommando:"
-#: server/stdinhand.c:4014
+#: server/stdinhand.c:4062
msgid "Synopsis: "
msgstr "Sammendrag: "
-#: server/stdinhand.c:4023
+#: server/stdinhand.c:4071
#, c-format
msgid "Level: %s"
msgstr "Niveau: %s"
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4096
msgid "The following server commands are available:"
msgstr "Følgende serverkommandoer er tilgængelige:"
-#: server/stdinhand.c:4123
+#: server/stdinhand.c:4171
#, c-format
msgid "Help argument '%s' is ambiguous."
msgstr "Hjælpeargument '%s' er ikke entydigt."
-#: server/stdinhand.c:4128
+#: server/stdinhand.c:4176
#, c-format
msgid "No match for help argument '%s'."
msgstr "Ingen træffer fundet for hjælpeargument '%s'."
-#: server/stdinhand.c:4194
+#: server/stdinhand.c:4242
#, c-format
msgid "Bad list argument: '%s'. Try '%shelp list'."
msgstr "Ulovligt listeargument: '%s'. Forsøg '%shelp list'."
-#: server/stdinhand.c:4234
+#: server/stdinhand.c:4282
msgid "List of players:"
msgstr "Spillerliste:"
-#: server/stdinhand.c:4239
+#: server/stdinhand.c:4287
msgid "<no players>"
msgstr "<ingen spillere>"
-#: server/stdinhand.c:4256
+#: server/stdinhand.c:4304
#, c-format
msgid "user %s, "
msgstr "bruger %s, "
-#: server/stdinhand.c:4267
+#: server/stdinhand.c:4315
msgid ", Dead"
msgstr ", død"
-#: server/stdinhand.c:4270
+#: server/stdinhand.c:4318
#, 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:4275 server/stdinhand.c:4279 client/helpdata.c:257
-#: client/helpdata.c:752 client/text.c:241 client/text.c:1224
-#: client/text.c:1262
+#: server/stdinhand.c:4323 server/stdinhand.c:4327 client/helpdata.c:257
+#: client/helpdata.c:752 client/text.c:241 client/text.c:1229
+#: client/text.c:1267
#, c-format
msgid "?clistmore:, %s"
msgstr ", %s"
-#: server/stdinhand.c:4283
+#: server/stdinhand.c:4331
msgid ", ready"
msgstr ", klar"
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4333
msgid ", not ready"
msgstr ", ikke klar"
-#: server/stdinhand.c:4293
+#: server/stdinhand.c:4341
#, c-format
msgid " %d connection:"
msgid_plural " %d connections:"
msgstr[0] "%d forbindelse:"
msgstr[1] "%d forbindelser:"
-#: server/stdinhand.c:4299
+#: server/stdinhand.c:4347
#, 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:4304
+#: server/stdinhand.c:4352
msgid " (observer mode)"
msgstr " (observatørtilstand)"
-#: server/stdinhand.c:4322
+#: server/stdinhand.c:4370
msgid "List of teams:"
msgstr "Holdliste:"
#. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4332
+#: server/stdinhand.c:4380
#, 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:4352
+#: server/stdinhand.c:4400
#, c-format
msgid "%2d : '%s' : 1 player : %s"
msgstr "%2d : '%s' : 1 spiller : %s"
-#: server/stdinhand.c:4360
+#: server/stdinhand.c:4408
#, c-format
msgid "Empty team: %s"
msgstr "Hold uden spillere: %s"
-#: server/stdinhand.c:4371
+#: server/stdinhand.c:4419
msgid "List of connections to server:"
msgstr "Liste af tilslutninger til server:"
-#: server/stdinhand.c:4375
+#: server/stdinhand.c:4423
msgid "<no connections>"
msgstr "<ingen tilslutninger>"
-#: server/stdinhand.c:4399
+#: server/stdinhand.c:4447
msgid "List of scenarios available:"
msgstr "Tilgængelige scenarier"
@@ -6642,7 +6731,7 @@ msgstr "Folkeslaget %s har forsket sig frem til fremtidsteknologi nr. %d."
msgid "%s acquired from %s!"
msgstr "%s erhvervet fra %s!"
-#: server/techtools.c:220
+#: server/techtools.c:221
#, c-format
msgid ""
"Discovery of %s makes the government form %s available. You may want to "
@@ -6651,37 +6740,37 @@ msgstr ""
"Opdagelsen af %s gør styreformen %s tilgængelig. Måske ønsker du at starte "
"en revolution."
-#: server/techtools.c:301
+#: server/techtools.c:302
#, c-format
msgid "Discovery of %s OBSOLETES %s in %s!"
msgstr "Opdagelsen af %s FORÆLDER %s i %s!"
-#: server/techtools.c:351
+#: server/techtools.c:352
#, c-format
msgid "Learned %s. Our scientists focus on %s; goal is %s."
msgstr "Lærte %s. Vore forskere koncentrerer sig om %s; målet er %s."
-#: server/techtools.c:369
+#: server/techtools.c:370
#, c-format
msgid "Learned %s. Scientists choose to research %s."
msgstr "Lærte %s. Forskerne vælger at forske på %s."
-#: server/techtools.c:376
+#: server/techtools.c:377
#, c-format
msgid "Learned %s. "
msgstr "Lærte %s."
-#: server/techtools.c:379
+#: server/techtools.c:380
#, c-format
msgid "Researching %s."
msgstr "Forsker på %s."
-#: server/techtools.c:385
+#: server/techtools.c:386
#, c-format
msgid "Learned %s. Scientists do not know what to research next."
msgstr "Lærte %s. Forskerne ved ikke hvad der skal forskes på som det næste."
-#: server/techtools.c:402
+#: server/techtools.c:403
msgid ""
"Great scientists from all the world join your civilization: you get an "
"immediate advance."
@@ -6689,22 +6778,22 @@ msgstr ""
"Dygtige videnskabsfolk fra hele verden tilslutter sig dig; du får et "
"umiddelbart gennembrud."
-#: server/techtools.c:570
+#: server/techtools.c:571
#, c-format
msgid "Technology goal is %s."
msgstr "Det teknologiske mål er %s."
-#: server/techtools.c:700
+#: server/techtools.c:708
#, c-format
msgid "You steal %s from the %s."
msgstr "Du stjæler %s fra %s."
-#: server/techtools.c:705
+#: server/techtools.c:713
#, c-format
msgid "The %s stole %s from you!"
msgstr "Folkeslaget %s stjal %s fra dig!"
-#: server/techtools.c:710
+#: server/techtools.c:718
#, c-format
msgid "The %s have stolen %s from the %s."
msgstr "Din %s stjal %s fra %s."
@@ -6728,154 +6817,160 @@ msgstr "Ingen enheder kunne opgraderes."
msgid "%s upgraded to %s for %d gold."
msgstr "%s opgraderet til %s for %d guld."
-#: server/unithand.c:396
+#: server/unithand.c:402
#, c-format
msgid "%s refuses to disband!"
msgstr "%s nægter at opløse sig selv!"
-#: server/unithand.c:449
+#: server/unithand.c:455
msgid "Can't place city here."
msgstr "Kan ikke placere by her."
-#: server/unithand.c:456
+#: server/unithand.c:462
#, c-format
msgid "Only %s can build a city."
msgstr "Kun %s kan bygge en by."
-#: server/unithand.c:461
+#: server/unithand.c:467
msgid "Can't build a city."
msgstr "Kan ikke bygge en by."
-#: server/unithand.c:470
+#: server/unithand.c:476
#, c-format
msgid "Only %s can add to a city."
msgstr "Kun %s kan tilføje til en by."
-#: server/unithand.c:475
+#: server/unithand.c:481
msgid "Can't add to a city."
msgstr "Kan ikke tilføje på en by her."
-#: server/unithand.c:481
+#: server/unithand.c:487
#, c-format
msgid "%s unit has no moves left to add to %s."
msgstr "%s enhed har ikke flere træk at tilføje %s."
-#: server/unithand.c:487
+#: server/unithand.c:493
#, c-format
msgid "%s unit has no moves left to build city."
msgstr "%s enhed har ingen træk igen til at bygge by."
-#: server/unithand.c:492
+#. TRANS: <city> is owned by <nation>, cannot add <unit>.
+#: server/unithand.c:499
+#, c-format
+msgid "%s is owned by %s, cannot add %s."
+msgstr "%s er ejet af %s, kan ikke tilføje %s."
+
+#: server/unithand.c:506
#, c-format
msgid "%s is too big to add %s."
msgstr "%s er for stor til at tilføje %s."
-#: server/unithand.c:498
+#: server/unithand.c:512
#, c-format
msgid "%s needs an improvement to grow, so you cannot add %s."
msgstr ""
-"%s er afhænig af en forbedring for at vokse, så du kan ikke tilføje %s."
+"%s er afhængig af en forbedring for at vokse, så du kan ikke tilføje %s."
-#: server/unithand.c:509
+#: server/unithand.c:523
#, c-format
msgid "Can't add %s to %s."
msgstr "Kan ikke tilføje %s til %s."
-#: server/unithand.c:531
+#: server/unithand.c:545
#, c-format
msgid "%s added to aid %s in growing."
msgstr "%s tilføjet for at hjælpe %s med at vokse."
-#: server/unithand.c:828
+#: server/unithand.c:842
msgid "Your Nuclear missile was shot down by SDI defences, what a waste."
msgstr "Din atomraket blev skudt ned af SDI-forsvar. Sikke et spild."
-#: server/unithand.c:831
+#: server/unithand.c:845
#, c-format
msgid "The nuclear attack on %s was avoided by your SDI defense."
msgstr "Atomangrebet på %s blev undgået af dit SDI-forsvar."
#. TRANS: "Your Cannon ... the Polish Destroyer."
-#: server/unithand.c:901
+#: server/unithand.c:915
#, 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
+#: server/unithand.c:924
#, c-format
msgid "Your attacking %s failed against the %s %s!"
msgstr "Din %s mislykkes i angrebet mod %s %s!"
-#: server/unithand.c:983
+#: server/unithand.c:997
#, c-format
msgid "Only %s can attack from sea."
msgstr "Kun %s kan angribe fra havet."
-#: server/unithand.c:988
+#: server/unithand.c:1002
msgid "Cannot attack from sea."
msgstr "Kan ikke angribe fra havet."
-#: server/unithand.c:996 server/unittools.c:2137
+#: server/unithand.c:1010 server/unittools.c:2142
msgid "Cannot attack unless you declare war first."
msgstr "Kan ikke angribe hvis du ikke erklærer krig først."
-#: server/unithand.c:1001
+#: server/unithand.c:1015
#, c-format
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
+#: server/unithand.c:1021
#, 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."
-#: server/unithand.c:1052
+#: server/unithand.c:1066
msgid "This unit has no moves left."
msgstr "Denne enhed har ingen træk igen."
-#: server/unithand.c:1107
+#: server/unithand.c:1121
msgid "Unit must be on land to perform diplomatic action."
msgstr "Enheden skal være på land for at udføre diplomatiske forhandlinger."
-#: server/unithand.c:1109
+#: server/unithand.c:1123
msgid "No diplomat action possible."
msgstr "Ikke muligt at udføre diplomattjenester."
-#: server/unithand.c:1125
+#: server/unithand.c:1139
#, c-format
msgid "You must declare war on %s first. Try using players dialog (F3)."
msgstr "Du må først erklære %s krig. Prøv at bruge spillerdialogboksen (F3)."
-#: server/unithand.c:1143
+#: server/unithand.c:1157
msgid "This unit is being transported, and so cannot bombard."
msgstr "Denne enhed er under transport og kan derfor ikke bombe."
-#: server/unithand.c:1158
+#: server/unithand.c:1172
msgid "You can't attack there."
msgstr "Du kan ikke angribe der."
-#: server/unithand.c:1180
+#: server/unithand.c:1194
msgid "This type of troops cannot take over a city."
msgstr "Denne type enheder kan ikke overtage en by."
-#: server/unithand.c:1198
+#: server/unithand.c:1212
msgid "A transported unit is not allied to all units or city on target tile."
msgstr ""
"En transport enhed er ikke allieret med alle enheder eller byen på dette "
"felt."
-#: server/unithand.c:1240
+#: server/unithand.c:1254
#, c-format
msgid "Your %s helps build the %s in %s (%d remaining)."
msgstr "Din %s hjælper med at bygge %s i %s (%d udestående)."
-#: server/unithand.c:1242
+#: server/unithand.c:1256
#, c-format
msgid "Your %s helps build the %s in %s (%d surplus)."
msgstr "Din %s hjælper med at bygge %s i %s (%d i overskud)."
-#: server/unithand.c:1286
+#: server/unithand.c:1300
#, c-format
msgid ""
"Sorry, your %s cannot establish a trade route because it has no home city"
@@ -6883,27 +6978,27 @@ msgstr ""
"Beklager, din %s kan ikke etablere en handelsrute her, da den ingen hjemby "
"har."
-#: server/unithand.c:1296
+#: server/unithand.c:1310
#, c-format
msgid "Sorry, your %s cannot establish a trade route between %s and %s"
msgstr "Beklager, din %s kan ikke etablere en handelsrute mellem %s og %s"
-#: server/unithand.c:1325 server/unithand.c:1344
+#: server/unithand.c:1339 server/unithand.c:1358
#, c-format
msgid "Sorry, your %s cannot establish a trade route here!"
msgstr "Beklager, din %s kan ikke etablere en handelsrute her!"
-#: server/unithand.c:1329 server/unithand.c:1348
+#: server/unithand.c:1343 server/unithand.c:1362
#, c-format
msgid " The city of %s already has %d better trade routes!"
msgstr " Byen %s har allerede %d bedre handelsruter!"
-#: server/unithand.c:1361 server/unithand.c:1373
+#: server/unithand.c:1375 server/unithand.c:1387
#, c-format
msgid "Sorry, %s has canceled the trade route from %s to your city %s."
msgstr "Beklager, %s har afbrudt handelsruten fra %s til din by %s."
-#: server/unithand.c:1406
+#: server/unithand.c:1420
#, c-format
msgid ""
"Your %s from %s has arrived in %s, and revenues amount to %d in gold and "
@@ -6963,56 +7058,56 @@ msgid "Teleported your %s to %s."
msgstr "Teleporterede din %s til %s."
#. TRANS: A unit is moved to resolve stack conflicts.
-#: server/unittools.c:1065
+#: server/unittools.c:1070
#, c-format
msgid "Moved your %s."
msgstr "Flyttede din %s."
-#: server/unittools.c:1076
+#: server/unittools.c:1081
#, c-format
msgid "Disbanded your %s."
msgstr "Opløste din %s."
-#: server/unittools.c:1397
+#: server/unittools.c:1402
#, c-format
msgid "Unable to defend %s, %s has lost the game."
msgstr "Kunne ikke forsvare %s, %s har tabt spillet."
-#: server/unittools.c:1401
+#: server/unittools.c:1406
#, c-format
msgid "Losing %s meant losing the game! Be more careful next time!"
msgstr "Tab af %s indebar at du tabte spillet! Vær mere forsigtig næste gang!"
-#: server/unittools.c:1503
+#: server/unittools.c:1508
#, c-format
msgid "%s escaped the destruction of %s, and fled to %s."
msgstr "%s undslap ødelæggelsen af %s, og flygtede til %s. "
# problem
-#: server/unittools.c:1512
+#: server/unittools.c:1517
#, c-format
msgid "%s lost when %s was lost."
msgstr "%s gik tabt da %s gik tabt."
-#: server/unittools.c:1561
+#: server/unittools.c:1566
#, c-format
msgid "Barbarian leader captured, %d gold ransom paid."
msgstr "Barbarleder fanget, %d guld betalt i løsepenge."
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unittools.c:1579
+#: server/unittools.c:1584
#, 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:1588 server/unittools.c:1646
+#: server/unittools.c:1593 server/unittools.c:1651
#, 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:1622
+#: server/unittools.c:1627
#, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -7023,7 +7118,7 @@ msgstr[1] "Din %s lykkedes i angrebet mod %s %s (og %d andre enheder)!"
# problem
#. TRANS: "Cannon lost when the Polish Destroyer
#. * attacked the German Musketeers."
-#: server/unittools.c:1655
+#: server/unittools.c:1660
#, c-format
msgid "%s lost when the %s %s attacked the %s %s."
msgstr "%s gik tabt da %ss %s angreb %ss %s."
@@ -7031,7 +7126,7 @@ msgstr "%s gik tabt da %ss %s angreb %ss %s."
# problem
#. TRANS: "Musketeers (and Cannon) lost to an
#. * attack from the Polish Destroyer."
-#: server/unittools.c:1670
+#: server/unittools.c:1675
#, 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."
@@ -7040,7 +7135,7 @@ msgstr "%s (og %s) gik tabt i et angreb fra %ss %s."
#. TRANS: "Musketeers and 3 other units lost to
#. * an attack from the Polish Destroyer."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1680
+#: server/unittools.c:1685
#, 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."
@@ -7050,181 +7145,225 @@ msgstr[1] "%s og %d andre enheder gik tabt i et angreb fra %ss %s."
#. TRANS: "2 units lost when the Polish Destroyer
#. * attacked the German Musketeers."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1694
+#: server/unittools.c:1699
#, 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"
msgstr[1] "%d enheder tabt da %ss %s angreb %ss %s"
-#: server/unittools.c:1962
+#: server/unittools.c:1967
#, c-format
msgid "Your %s was nuked by %s."
msgstr "Din %s blev udsat for atomangreb fra %s."
-#: server/unittools.c:1965 server/unittools.c:1981
+#: server/unittools.c:1970 server/unittools.c:1986
msgid "yourself"
msgstr "dig selv"
# problem
-#: server/unittools.c:1969
+#: server/unittools.c:1974
#, c-format
msgid "The %s %s was nuked."
msgstr "%ss %s blev udsat for atomangreb."
-#: server/unittools.c:1978
+#: server/unittools.c:1983
#, c-format
msgid "%s was nuked by %s."
msgstr "%s blev udsat for atomangreb fra %s."
-#: server/unittools.c:1986
+#: server/unittools.c:1991
#, c-format
msgid "You nuked %s."
msgstr "Du udførte et atomangreb mod %s."
-#: server/unittools.c:2027
+#: server/unittools.c:2032
#, c-format
msgid "The %s detonated a nuke!"
msgstr "%s detonerede en atombombe!"
-#: server/unittools.c:2051
+#: server/unittools.c:2056
#, c-format
msgid "%s transported successfully."
msgstr "%s blev transporteret uskadt frem."
-#: server/unittools.c:2103
+#: server/unittools.c:2108
msgid "This unit type can not be paradropped."
msgstr "Denne enhed kan ikke lave faldskærmsudspring."
-#: server/unittools.c:2113
+#: server/unittools.c:2118
msgid "You cannot paradrop a unit that is transporting other units."
msgstr "Du kan ikke foretage faldskærmudspring med en transportenhed."
-#: server/unittools.c:2119
+#: server/unittools.c:2124
msgid "The destination location is not known."
msgstr "Bestemmelsesstedet er ukendt."
-#: server/unittools.c:2126
+#: server/unittools.c:2131
#, c-format
msgid "This unit cannot paradrop into %s."
msgstr "Denne enhed kan ikke foretage faldskærmudspring i %s."
-#: server/unittools.c:2146
+#: server/unittools.c:2151
#, c-format
msgid "The distance to the target (%i) is greater than the unit's range (%i)."
msgstr "Afstanden til målet (%i) er større end enhedens rækkevidde (%i)."
-#: server/unittools.c:2157
+#: server/unittools.c:2162
#, c-format
msgid "Your %s paradropped into the %s and was lost."
msgstr "Dine %s udførte faldskærmsudspring på %s og gik til grunde."
-#: server/unittools.c:2170
+#: server/unittools.c:2175
#, c-format
msgid "Your %s was killed by enemy units at the paradrop destination."
msgstr "Dine %s blev dræbt af modstanderens enheder på udspringsstedet."
-#: server/unittools.c:2192
+#: server/unittools.c:2197
#, c-format
msgid "You found %d gold."
msgstr "Du fandt %d guld."
-#: server/unittools.c:2209
+#: server/unittools.c:2214
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr "Du fandt %s i ældgamle skriftruller med viden."
-#: server/unittools.c:2216
+#: server/unittools.c:2221
#, c-format
msgid "The %s have acquired %s from ancient scrolls of wisdom."
msgstr "%s har tilegnet sig %s fra ældgamle skriftruller med viden."
-#: server/unittools.c:2230
+#: server/unittools.c:2235
msgid "A band of friendly mercenaries joins your cause."
msgstr "En gruppe venligtsindede lejesoldater slutter sig til dig."
-#: server/unittools.c:2248
+#: server/unittools.c:2253
msgid "An abandoned village is here."
msgstr "En forladt landsby er her."
-#: server/unittools.c:2258
+#: server/unittools.c:2263
msgid "You have unleashed a horde of barbarians!"
msgstr "Du er blevet overrasket af fjendtlige barbarer!"
-#: server/unittools.c:2261
+#: server/unittools.c:2266
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr "Dine %s er blevet dræbt af barbarer."
-#: server/unittools.c:2277
+#: server/unittools.c:2282
msgid "You found a friendly city."
msgstr "Du fandt en venligtsindet by."
-#: server/unittools.c:2291
+#: server/unittools.c:2296
msgid "Friendly nomads are impressed by you, and join you."
msgstr ""
"Venligtsindede nomader er imponerede af din kunnen og slutter sig til dig."
-#: server/unittools.c:2316
+#: server/unittools.c:2321
msgid "Your overflight frightens the tribe; they scatter in terror."
msgstr "Din overflyvning skræmmer stammen; de spreder sig i frygt."
-#: server/unittools.c:2574
+#: server/unittools.c:2579
#, c-format
msgid "Orders for %s aborted after enemy movement was spotted."
msgstr "Ordre for %s blev afbrudt efter at fjendens bevægelser blev opdaget."
-#: server/unittools.c:3023
+#: server/unittools.c:3028
#, c-format
msgid "Orders for %s aborted as there are units nearby."
msgstr "Ordre for %s blev afbrudt, da der er enheder i vejen."
-#: server/unittools.c:3075
+#: server/unittools.c:3080
#, c-format
msgid "Orders for %s aborted because building of city failed."
msgstr ""
"Ordre for %s blev afbrudt på grund af, at bygningen af byen ikke lykkedes."
-#: server/unittools.c:3088
+#: server/unittools.c:3093
#, c-format
msgid "Orders for %s aborted since they give an invalid activity."
msgstr "Ordre for %s afbrudt, da de medfører en ugyldig aktivitet."
-#: server/unittools.c:3102
+#: server/unittools.c:3107
#, c-format
msgid "Orders for %s aborted since they give an invalid location."
msgstr "Ordre for %s afbrudt, da de medfører en ugyldig placering."
-#: server/unittools.c:3112
+#: server/unittools.c:3117
#, c-format
msgid "Orders for %s aborted as there are units in the way."
msgstr "Ordre for %s afbrudt da der er enheder i vejen."
-#: server/unittools.c:3138
+#: server/unittools.c:3143
#, c-format
msgid "Orders for %s aborted because of failed move."
msgstr "Ordre for %s afbrudt da bevægelse ikke kunne gennemføres."
-#: server/unittools.c:3179
+#: server/unittools.c:3184
#, c-format
msgid "Attempt to change homecity for %s failed."
msgstr "Forsøg på at ændre hjembyen for %s mislykkedes."
-#: server/unittools.c:3190
+#: server/unittools.c:3195
#, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr "Forsøg på at etablere handelsrute for %s mislykkedes."
-#: server/unittools.c:3202
+#: server/unittools.c:3207
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr "Forsøg på at bygge vidunder for %s mislykkedes."
-#: server/unittools.c:3211
+#: server/unittools.c:3216
#, c-format
msgid "Your %s has invalid orders."
msgstr "Din %s har ugyldige ordre."
+#: server/voting.c:522
+#, c-format
+msgid ""
+"%s %d \"%s\" is passed %d to %d with %d abstentions and %d who did not vote."
+msgstr ""
+"%s %d \"%s\" er afgjort med %d til %d med %d blanke og %d som ikke stemte."
+
+#: server/voting.c:528
+#, c-format
+msgid ""
+"%s %d \"%s\" failed with %d against, %d for, %d abstentions and %d who did "
+"not vote."
+msgstr ""
+"%s %d \"%s\" faldt med %d imod, %d for, %d blanke og %d som ikke stemte."
+
+#: server/voting.c:548
+#, c-format
+msgid "%s %d: %s voted yes."
+msgstr "%s %d: %s stemte ja."
+
+#: server/voting.c:553
+#, c-format
+msgid "%s %d: %s voted no."
+msgstr "%s %d: %s stemte nej."
+
+#: server/voting.c:558
+#, c-format
+msgid "%s %d: %s chose to abstain."
+msgstr "%s %d: %s stemte blankt."
+
+#. TRANS: Describing a new vote that can only pass
+#. * if there are no dissenting votes.
+#: server/voting.c:726
+#, c-format
+msgid "%s (needs %0.0f%% and no dissent)."
+msgstr "%s (behøver %0.0f%% og ingen uenige)."
+
+#. TRANS: Describing a new vote that can pass only if the
+#. * given percentage of players votes 'yes'.
+#: server/voting.c:732
+#, c-format
+msgid "%s (needs %0.0f%% in favor)."
+msgstr "%s (behøver %0.0f%% der stemmer for)."
+
#: server/generator/mapgen.c:1771
msgid "High landmass - this may take a few seconds."
msgstr "Stor landmasse - dette kan tage nogen sekunder."
@@ -7256,13 +7395,13 @@ msgstr ""
"meget for denne bane.\n"
"Rapportér venligst denne fejl på %s."
-#: client/attribute.c:363
+#: client/attribute.c:368
msgid ""
"There has been a CMA error. Your citizen governor settings may be broken."
msgstr ""
"Der har været en CMA fejl. Din bylederopsætning er sikkert fejlbehæftet."
-#: client/attribute.c:367
+#: client/attribute.c:372
msgid "Old attributes detected and removed."
msgstr "Gamle attributter opfanget og fjernet."
@@ -7409,41 +7548,41 @@ msgstr "%+4d : byboere\n"
msgid "%+4d : Taxed from trade\n"
msgstr "%+4d : Skatteindkomst fra handel\n"
-#: client/citydlg_common.c:418
+#: client/citydlg_common.c:421
#, c-format
msgid "%+4d : Trade route with %s\n"
msgstr "%+4d : Handelsrute med %s\n"
-#: client/citydlg_common.c:427
+#: client/citydlg_common.c:430
#, c-format
msgid "%+4d : Building tithes\n"
msgstr "%+4d : Skaber tiende\n"
-#: client/citydlg_common.c:450
+#: client/citydlg_common.c:453
#, c-format
msgid "%+4d : Bonus from %s (%+d%%)\n"
msgstr "%+4d : Bonus fra %s (% +d%%)\n"
-#: client/citydlg_common.c:462
+#: client/citydlg_common.c:465
#, c-format
msgid "%+4d : Waste\n"
msgstr "%+4d : Affald\n"
-#: client/citydlg_common.c:468
+#: client/citydlg_common.c:471
#, c-format
msgid "%+4d : Disorder\n"
msgstr "%+4d : Uro\n"
-#: client/citydlg_common.c:474
+#: client/citydlg_common.c:477
#, c-format
msgid "%+4d : Used\n"
msgstr "%+4d : Anvendt\n"
-#: client/citydlg_common.c:479
+#: client/citydlg_common.c:482
msgid "==== : Adds up to\n"
msgstr "==== : Bliver\n"
-#: client/citydlg_common.c:481
+#: client/citydlg_common.c:484
#, c-format
msgid "%4d : Total surplus"
msgstr "%4d : Overskud"
@@ -7748,51 +7887,51 @@ msgstr "?specialist:S"
msgid "Specialists"
msgstr "Specialister"
-#: client/civclient.c:240
+#: client/civclient.c:241
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr " -a, --autoconnect\tSpring over tilslutningsvinduet\n"
-#: client/civclient.c:250
+#: client/civclient.c:251
msgid " -l, --log FILE\tUse FILE as logfile (spawned server also uses this)\n"
msgstr ""
" -l, --log FIL\tBrug FIL som logfil (oprettet server bruger også denne)\n"
-#: client/civclient.c:252
+#: client/civclient.c:253
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr " -m, --meta VÆRT\tTilslut til metaserveren på vært\n"
-#: client/civclient.c:254
+#: client/civclient.c:255
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr " -n, --name NAVN\\tBrug NAVN som navn\n"
-#: client/civclient.c:256
+#: client/civclient.c:257
msgid " -p, --port PORT\tConnect to server port PORT (usually with -a)\n"
msgstr " -p, --port PORT\tTilslut til serverport PORT (normalt med -a)\n"
# %s er vist liste af moduler
-#: client/civclient.c:258
+#: client/civclient.c:259
#, c-format
msgid " -P, --Plugin PLUGIN\tUse PLUGIN for sound output %s\n"
msgstr " -P, --Plugin MODUL\tBenyt MODUL til lyd %s\n"
-#: client/civclient.c:260
+#: client/civclient.c:261
msgid " -r, --read FILE\tRead startup script FILE (for spawned server only)\n"
msgstr ""
" -r, --read FIL\tIndlæs startkommandoer fra FIL (for startet server kun)\n"
-#: client/civclient.c:263
+#: client/civclient.c:264
msgid " -s, --server HOST\tConnect to the server at HOST (usually with -a)\n"
msgstr " -s, --server VÆRT\tTilslut til serveren på VÆRT (normalt med -a)\n"
-#: client/civclient.c:265
+#: client/civclient.c:266
msgid " -S, --Sound FILE\tRead sound tags from FILE\n"
msgstr " -S, --Sound FIL\tLæs lyd-info fra FIL\n"
-#: client/civclient.c:266
+#: client/civclient.c:267
msgid " -t, --tiles FILE\tUse data file FILE.tilespec for tiles\n"
msgstr " -t, --tiles FIL\tBrug datafil FIL.tilespec til feltgrafik\n"
-#: client/civclient.c:269
+#: client/civclient.c:270
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7802,45 +7941,45 @@ msgstr ""
"\t\t\tPrøv \"%s -- --help\" for mere information.\n"
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:274
+#: client/civclient.c:275
#, c-format
msgid "Report bugs at %s\n"
msgstr "Rapportér fejl til %s\n"
-#: client/civclient.c:298
+#: client/civclient.c:299
#, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr "Ugyldig port \"%s\" angivet med --port option.\n"
-#: client/civclient.c:300 client/civclient.c:315
+#: client/civclient.c:301 client/civclient.c:316
msgid "Try using --help.\n"
msgstr "Prøv at bruge --help.\n"
-#: client/civclient.c:313
+#: client/civclient.c:314
#, c-format
msgid "Invalid debug level \"%s\" specified with --debug option.\n"
msgstr "Ugyldig fejlsøgningsniveau \"%s\" specifieret med --debug option.\n"
-#: client/civclient.c:326
+#: client/civclient.c:327
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr "Ukendt indstilling: \"%s\"\n"
-#: client/civclient.c:391
-#, fuzzy, c-format
+#: client/civclient.c:393
+#, c-format
msgid "Updating old metaserver address \"%s\"."
-msgstr "metaserver <adresse>"
+msgstr "Opdaterer gammel metaserveradresse \"%s\"."
-#: client/civclient.c:394
-#, fuzzy, c-format
+#: client/civclient.c:396
+#, c-format
msgid "Default metaserver has been set to \"%s\"."
-msgstr "Indstilling: %s er blevet sat til \"%s\"."
+msgstr "Standardmetaserver er blevet sat til \"%s\"."
-#: client/civclient.c:550
+#: client/civclient.c:540
msgid "Game started."
msgstr "Spil startet."
-#: client/civclient.c:588
+#: client/civclient.c:606
msgid "There was an error while auto connecting; aborting."
msgstr "Der opstod en fejl under automatisk tilslutning, afbryder."
@@ -7921,7 +8060,7 @@ msgstr "Parterne allierer sig"
#: client/climisc.c:296
#, c-format
msgid "The %s give shared vision"
-msgstr "%s giver dig udsyn"
+msgstr "%s giver dig delt synsfelt"
#: client/climisc.c:300
#, c-format
@@ -7970,18 +8109,18 @@ msgstr "Opkobling i gang."
msgid "Disconnected from server."
msgstr "Koblet fra serveren."
-#: client/clinet.c:469
+#: client/clinet.c:473
#, c-format
msgid "Failed to contact server \"%s\" at port %d as \"%s\" after %d attempts"
msgstr ""
"Kunne ikke tilslutte til serveren \"%s\" på port %d som \"%s\" efter %d "
"forsøg"
-#: client/clinet.c:484 client/clinet.c:486
+#: client/clinet.c:488 client/clinet.c:490
msgid "Connection to server refused. Please start the server."
msgstr "Tilslutning til serveren nægtet. Start venligst serveren."
-#: client/clinet.c:495 client/clinet.c:523
+#: client/clinet.c:499 client/clinet.c:527
#, c-format
msgid ""
"Error contacting server \"%s\" at port %d as \"%s\":\n"
@@ -7990,7 +8129,7 @@ msgstr ""
"Kunne ikke kontakte serveren \"%s\" på port %d som \"%s\":\n"
" %s\n"
-#: client/clinet.c:514
+#: client/clinet.c:518
#, c-format
msgid ""
"Auto-connecting to server \"%s\" at port %d as \"%s\" every %f second(s) for "
@@ -7999,53 +8138,53 @@ 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:1358
+#: client/connectdlg_common.c:78 client/gui-gtk-2.0/pages.c:1358
msgid "novice"
msgstr "begynder"
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1358
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
msgid "easy"
msgstr "let"
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1359
msgid "normal"
msgstr "normal"
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr "vanskelig"
-#: client/connectdlg_common.c:83
+#: client/connectdlg_common.c:82
msgid "experimental"
msgstr "eksperimentel"
-#: client/connectdlg_common.c:213
+#: client/connectdlg_common.c:212
msgid "Starting server..."
msgstr "Starter spil..."
-#: client/connectdlg_common.c:332
+#: client/connectdlg_common.c:331
msgid "Couldn't start the server."
msgstr "Kunne ikke starte serveren."
-#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
+#: client/connectdlg_common.c:332 client/connectdlg_common.c:365
msgid "You'll have to start one manually. Sorry..."
msgstr "Du er nød til at starte en manuelt. Beklager..."
-#: client/connectdlg_common.c:364
+#: client/connectdlg_common.c:363
msgid "Couldn't connect to the server."
msgstr "Kunne ikke forbinde til serveren."
-#: client/connectdlg_common.c:365
+#: client/connectdlg_common.c:364
msgid "We probably couldn't start it from here."
msgstr "Vi kunne højst sandsynlig ikke starte herfra."
-#: client/connectdlg_common.c:470
+#: client/connectdlg_common.c:469
msgid ""
"Established control over the server. You have command access level 'hack'."
msgstr ""
"Etablerede kontrol med serveren. Du har adgang på kommandoniveau 'hack'."
-#: client/connectdlg_common.c:475
+#: client/connectdlg_common.c:474
msgid ""
"Failed to obtain the required access level to take control of the server. "
"The server will now be shutdown."
@@ -8057,27 +8196,27 @@ msgstr ""
msgid "Only transporter units can be unloaded."
msgstr "Kun transportenheder kan aflastes."
-#: client/control.c:1425
+#: client/control.c:1417
msgid "Only settler units can be put into auto mode."
msgstr "Kun nybyggere kan placeres i autotilstand."
-#: client/control.c:1516
+#: client/control.c:1511
msgid "Only nuclear units can do this."
msgstr "Kun atombombe-enheder kan gøre dette."
-#: client/control.c:1545
+#: client/control.c:1540
msgid "Only paratrooper units can do this."
msgstr "Kun faldskærmsjægere kan gøre dette."
-#: client/control.c:2020
+#: client/control.c:2015
msgid "Too far for this unit."
msgstr "For langt for denne enhed."
-#: client/control.c:2230 client/control.c:2260 client/control.c:2276
+#: client/control.c:2225 client/control.c:2255 client/control.c:2271
msgid "Didn't find a route to the destination!"
msgstr "Fandt ingen rute til målet."
-#: client/control.c:2320
+#: client/control.c:2315
msgid "Oh my! You seem to have no capital!"
msgstr "Jamen dog! Det ser ud til at du ikke har nogen hovedstad!"
@@ -8266,7 +8405,7 @@ msgstr "* Kan ikke opløses.\n"
#, 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 "
+"* Kan opløses i en by, og du opnår derved at få 50 %% af "
"produktionsomkostningen tilbage.\n"
#: client/helpdata.c:844
@@ -8337,7 +8476,7 @@ msgstr "* Kan bygge lufthavne.\n"
#: client/helpdata.c:904
#, c-format
msgid "* May fortify, granting a 50%% defensive bonus.\n"
-msgstr "* Kan befæste sig, og dermed opnå en 50%% forsvarsbonus.\n"
+msgstr "* Kan befæste sig, og dermed opnå en 50 %% forsvarsbonus.\n"
#: client/helpdata.c:907
msgid "* May pillage to destroy infrastructure from tiles.\n"
@@ -8458,44 +8597,53 @@ msgid ""
"* Must end turn in a city or next to land, or has a 50%% risk of being lost "
"at sea.\n"
msgstr ""
-"* Skal afslutte runden i en by eller ved kysten, ellers har den en 50%% "
+"* 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:1010
#, c-format
msgid "* The discovery of %s reduces the risk to 25%%.\n"
-msgstr "* Opdagelsen af %s reducerer risikoen til 25%%.\n"
+msgstr "* Opdagelsen af %s reducerer risikoen til 25 %%.\n"
#: client/helpdata.c:1015
#, c-format
msgid "* %s reduces the risk to 12%%.\n"
-msgstr "* %s reducerer risikoen til 12%%.\n"
+msgstr "* %s reducerer risikoen til 12 %%.\n"
#. 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:1066 client/helpdata.c:1400
+#: client/helpdata.c:1066 client/helpdata.c:1408
msgid " or "
msgstr " eller "
-#: client/helpdata.c:1068 client/helpdata.c:1388
+#: client/helpdata.c:1068 client/helpdata.c:1396
msgid "?or:, "
msgstr "?eller:, "
-#: client/helpdata.c:1080
+#: client/helpdata.c:1079
#, 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"
+msgid "* Unit has to be in a city, or a base after %d turn.\n"
+msgid_plural "* Unit has to be in a city, or a base after %d turns.\n"
+msgstr[0] "* Enhed skal være i en by, eller en base efter %d runde.\n"
+msgstr[1] "* Enhed skal være i en by, eller en base efter %d runder.\n"
-#: client/helpdata.c:1122
+#: client/helpdata.c:1087
+#, c-format
+msgid "* Unit has to be in a city, a base, or on a %s after %d turn.\n"
+msgid_plural "* Unit has to be in a city, a base, or on a %s after %d turns.\n"
+msgstr[0] ""
+"* Enhed skal være i en by, en base, eller på en %s efter %d runde.\n"
+msgstr[1] ""
+"* Enhed skal være i en by, en base, eller på en %s efter %d runder.\n"
+
+#: client/helpdata.c:1130
#, 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:1127
+#: client/helpdata.c:1135
#, c-format
msgid ""
"To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8504,90 +8652,90 @@ 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:1135
+#: client/helpdata.c:1143
msgid "You cannot research this technology."
msgstr "Du kan ikke forske i denne teknologi."
-#: client/helpdata.c:1139
+#: client/helpdata.c:1147
msgid " This number may vary depending on what other players will research.\n"
msgstr ""
" Dette nummer kan variere afhængigt af hvad andre spillere forsker i.\n"
-#: client/helpdata.c:1151
+#: client/helpdata.c:1159
#, 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:1156
+#: client/helpdata.c:1164
#, 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"
+msgstr "* Reducerer risikoen for at miste skibe på det dybe ocean til 25 %%.\n"
-#: client/helpdata.c:1159
+#: client/helpdata.c:1167
#, 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"
+msgstr "* Reducerer risikoen for at miste skibe på det dybe ocean til 12 %%.\n"
-#: client/helpdata.c:1163
+#: client/helpdata.c:1171
msgid "* Increases the pollution generated by the population.\n"
msgstr "* Øger forureningen skabt af befolkningen.\n"
-#: client/helpdata.c:1168
+#: client/helpdata.c:1176
#, c-format
msgid "* Allows %s to build roads on river squares.\n"
msgstr "* Tillader %s at bygge veje på flodfelter.\n"
-#: client/helpdata.c:1175
+#: client/helpdata.c:1183
#, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr "* Tillader %s at bygge forter.\n"
-#: client/helpdata.c:1183
+#: client/helpdata.c:1191
#, c-format
msgid "* Allows %s to build airbases.\n"
msgstr "* Tillader %s at bygge flybaser.\n"
-#: client/helpdata.c:1192
+#: client/helpdata.c:1200
#, c-format
msgid "* Allows %s to upgrade roads to railroads.\n"
msgstr "* Tillader %s at opgradere veje til jernbaner.\n"
-#: client/helpdata.c:1200
+#: client/helpdata.c:1208
#, c-format
msgid "* Allows %s to upgrade irrigation to farmland.\n"
msgstr "* Tillader %s at opgradere overrislet land til landbrugsland.\n"
-#: client/helpdata.c:1234
+#: client/helpdata.c:1242
msgid "* Pollution cannot be generated on this terrain."
msgstr "* Forurening opstår ikke på denne type terræn."
-#: client/helpdata.c:1239
+#: client/helpdata.c:1247
msgid "* You cannot build cities on this terrain."
msgstr "* Du kan ikke bygge byer på dette terræn."
-#: client/helpdata.c:1245
+#: client/helpdata.c:1253
msgid "* The coastline of this terrain is unsafe."
msgstr "* Kystlinjen på dette terræn er usikker."
-#: client/helpdata.c:1250
+#: client/helpdata.c:1258
msgid "* This terrain is unsafe for units to travel on."
msgstr "* Dette terræn er usikkert for enheder."
-#: client/helpdata.c:1255
+#: client/helpdata.c:1263
msgid "* Land units cannot travel on oceanic terrains."
msgstr "* Landenheder kan ikke rejse på havterræn."
-#: client/helpdata.c:1305
+#: client/helpdata.c:1313
msgid "Features:\n"
msgstr "Fordele:\n"
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1411 client/helpdata.c:1412
+#: client/helpdata.c:1419 client/helpdata.c:1420
msgid "?outputlist: Nothing "
msgstr "?outputlist: Intet "
-#: client/helpdata.c:1419
+#: client/helpdata.c:1427
#, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -8600,7 +8748,7 @@ msgstr[0] ""
msgstr[1] ""
"Militære enheder i felten og feltenheder gør %d indbyggere ulykkelige.\n"
-#: client/helpdata.c:1429
+#: client/helpdata.c:1437
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8609,30 +8757,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:1437
+#: client/helpdata.c:1445
#, 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:1442
+#: client/helpdata.c:1450
#, 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:1447
+#: client/helpdata.c:1455
#, 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:1451
+#: client/helpdata.c:1459
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:1460
+#: client/helpdata.c:1468
#, c-format
msgid "* Each of your cities will avoid paying %d %s towards unit upkeep.\n"
msgstr ""
@@ -8640,19 +8788,19 @@ msgstr ""
#. TRANS: Amount is subtracted from upkeep cost
#. * for each upkeep type.
-#: client/helpdata.c:1468
+#: client/helpdata.c:1476
#, 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:1475
+#: client/helpdata.c:1483
#, 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:1482
+#: client/helpdata.c:1490
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -8662,7 +8810,7 @@ msgstr ""
"størrelse vil opstå når du har %d byer.\n"
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1489
+#: client/helpdata.c:1497
#, c-format
msgid ""
"* After the first unhappy citizen due to city size, for each %d additional "
@@ -8671,17 +8819,17 @@ 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:1497
+#: client/helpdata.c:1505
#, 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:1502
+#: client/helpdata.c:1510
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr "Har ubegrænset videnskab/guld/luksus procenter.\n"
-#: client/helpdata.c:1507
+#: client/helpdata.c:1515
#, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -8696,7 +8844,7 @@ msgstr[1] ""
"* Dine enheder kan indføre undtagelsestilstand. Hver militær enhed i en by "
"vil fremtvinge at %d ulykkelige indbyggere fremstår som tilfreds.\n"
-#: client/helpdata.c:1519
+#: client/helpdata.c:1527
#, 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"
@@ -8706,7 +8854,7 @@ 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:1530
+#: client/helpdata.c:1538
#, c-format
msgid ""
"* You may grow your cities by means of celebrations. Your cities must be at "
@@ -8715,15 +8863,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:1536
+#: client/helpdata.c:1544
msgid "* Your units cannot be bribed.\n"
msgstr "* Dine enheder kan ikke bestikkes.\n"
-#: client/helpdata.c:1539
+#: client/helpdata.c:1547
msgid "* Your cities cannot be incited.\n"
msgstr "* Dine byer kan ikke overtales til oprør.\n"
-#: client/helpdata.c:1543
+#: client/helpdata.c:1551
msgid ""
"* Government will fall into anarchy if any city is in disorder for more than "
"two turns in a row.\n"
@@ -8731,15 +8879,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:1549
+#: client/helpdata.c:1557
msgid "* Has a senate that may prevent declaration of war.\n"
msgstr "* Har et senat som kan forhindre krigserklæring.\n"
-#: client/helpdata.c:1553
+#: client/helpdata.c:1561
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:1557
+#: client/helpdata.c:1565
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
@@ -8747,108 +8895,109 @@ msgstr ""
"* Bygninger som normalt giver bonus mod ulykkelighed vil i stedet generere "
"guld.\n"
-#: client/helpdata.c:1561
+#: client/helpdata.c:1569
msgid "* Pays no upkeep for fanatics.\n"
msgstr "* Betaler ikke vedligeholdelse for fanatikere.\n"
-#: client/helpdata.c:1564
+#: client/helpdata.c:1572
msgid "* Has no unhappy citizens.\n"
msgstr "* Har ingen ulykkelige indbyggere.\n"
-#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
+#: client/helpdata.c:1582 client/helpdata.c:1586 client/helpdata.c:1590
#, c-format
msgid "* Veteran %s units.\n"
msgstr "* Veteran %s enheder.\n"
-#: client/helpdata.c:1585
+#: client/helpdata.c:1593
msgid "* Veteran units.\n"
msgstr "* Veteran enheder.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1591
+#: client/helpdata.c:1599
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
"not celebrating.\n"
msgstr ""
"* Hvert anvendt felt som giver mere end %d %s vil medføre en -1 straf når "
-"der ikke er jubel i byen.\n"
+"der ikke afholdes festivitas i byen.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1600
+#: client/helpdata.c:1608
#, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
"celebrating.\n"
msgstr ""
-"* Hvert anvendt felt med mindst 1 %s vil medføre %d ekstra når der festes.\n"
+"* Hvert anvendt felt med mindst 1 %s vil medføre %d ekstra når der afholdes "
+"festivitas.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1608
+#: client/helpdata.c:1616
#, 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:1617
+#: client/helpdata.c:1625
#, 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:1625
+#: client/helpdata.c:1633
#, 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:1630
+#: client/helpdata.c:1638
#, 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:1635
+#: client/helpdata.c:1643
#, 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:1643
+#: client/helpdata.c:1651
#, 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:1649
+#: client/helpdata.c:1657
#, 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:1655
+#: client/helpdata.c:1663
#, 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:1672
+#: client/helpdata.c:1680
#, 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:1699
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d %s"
msgstr "%s%d %s"
-#: client/helpdata.c:1700 client/helpdata.c:1708 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1708 client/helpdata.c:1716 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:1707
+#: client/helpdata.c:1715
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d ulykkelig"
@@ -8923,7 +9072,7 @@ msgstr ""
"Dette er standard serverporten som vil blive brugt på forbindelsens dialoger "
"eller med -a kommandolinje parametre."
-#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:916 data/Freeciv.in:107
msgid "Metaserver"
msgstr "Metaserver"
@@ -9339,35 +9488,35 @@ msgstr "Gemning mislykkedes, kan ikke skrive til fil %s"
msgid "Saved settings to file %s"
msgstr "Gemte opsætning i filen %s"
-#: client/packhand.c:211 client/packhand.c:217
+#: client/packhand.c:212 client/packhand.c:218
msgid "You were rejected from the game...."
msgstr "Du blev afvist fra spillet...."
-#: client/packhand.c:229
+#: client/packhand.c:230
#, c-format
msgid "Client capability string: %s"
msgstr "Egenskabsstreng for klient: %s"
-#: client/packhand.c:232
+#: client/packhand.c:233
#, c-format
msgid "Server capability string: %s"
msgstr "Egenskabsstreng for server: %s"
-#: client/packhand.c:850
+#: client/packhand.c:864
#, c-format
msgid "Start of turn %d"
msgstr "Runde %d begynder"
-#: client/packhand.c:1591
+#: client/packhand.c:1621
#, c-format
msgid "AI Mode is now %s."
msgstr "AI-tilstand er nu %s."
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "ON"
msgstr "TIL"
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "OFF"
msgstr "FRA"
@@ -9398,15 +9547,15 @@ msgstr "?Player:Navn"
msgid "Username"
msgstr "Brugernavn"
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
-#: client/gui-gtk-2.0/pages.c:2157
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:653
+#: client/gui-gtk-2.0/pages.c:1604 client/gui-gtk-2.0/pages.c:2159
msgid "Flag"
msgstr "Flag"
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1605
-#: client/gui-gtk-2.0/pages.c:2159 client/gui-sdl/repodlgs.c:2063
-#: client/gui-win32/connectdlg.c:990 client/gui-win32/dialogs.c:542
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:657
+#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1609
+#: client/gui-gtk-2.0/pages.c:2161 client/gui-sdl/repodlgs.c:2063
+#: client/gui-win32/connectdlg.c:992 client/gui-win32/dialogs.c:542
#: client/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "Nation"
@@ -9419,7 +9568,7 @@ msgstr "Grænse"
msgid "Score"
msgstr "Point"
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1614
msgid "Team"
msgstr "Hold"
@@ -9452,36 +9601,36 @@ msgstr "?Player_dlg:Inaktiv"
msgid "Ping"
msgstr "Ping"
-#: client/repodlgs_common.c:375
+#: client/repodlgs_common.c:378
msgid "You cannot sell improvements."
msgstr "Du kan ikke sælge forbedringer."
-#: client/repodlgs_common.c:391
+#: client/repodlgs_common.c:394
#, c-format
msgid "Sold %d %s for %d gold."
msgstr "Solgt %d %s for %d guld."
-#: client/repodlgs_common.c:396
+#: client/repodlgs_common.c:399
#, c-format
msgid "No %s could be sold."
msgstr "Ingen %s kunne sælges."
#. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:415
+#: client/repodlgs_common.c:418
msgid "You cannot disband units."
msgstr "Du kan ikke opløse enheder."
-#: client/repodlgs_common.c:420
+#: client/repodlgs_common.c:423
#, c-format
msgid "%s cannot be disbanded."
msgstr "%s kan ikke opløses."
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:444
#, c-format
msgid "Disbanded %d %s."
msgstr "Opløste %d%s."
-#: client/repodlgs_common.c:445
+#: client/repodlgs_common.c:448
#, c-format
msgid "No %s could be disbanded."
msgstr "Ingen %s kunne opløses."
@@ -9742,15 +9891,15 @@ msgstr[1] "Fremskridt: %d runder/fremskridt"
#, c-format
msgid "%d bulb/turn"
msgid_plural "%d bulbs/turn"
-msgstr[0] "%d bulb/runde"
-msgstr[1] "%d bulb/runde"
+msgstr[0] "%d forskningspoint/runde"
+msgstr[1] "%d forskningspoint/runde"
#: client/text.c:544
#, c-format
msgid ", %d bulb/turn from team"
msgid_plural ", %d bulbs/turn from team"
-msgstr[0] ", %d bulb/runde fra hold"
-msgstr[1] ", %d bulb/runder fra hold"
+msgstr[0] ", %d forskningspoint/runde fra hold"
+msgstr[1] ", %d forskningspoint/runde fra hold"
#: client/text.c:571
#, c-format
@@ -9780,8 +9929,8 @@ msgstr[1] "(%d trin)"
#, c-format
msgid "%d bulb"
msgid_plural "%d bulbs"
-msgstr[0] "%d bulb"
-msgstr[1] "%d bulb"
+msgstr[0] "%d forskningspoint"
+msgstr[1] "%d forskningspoint"
#: client/text.c:629 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
@@ -10066,47 +10215,47 @@ msgstr "?dys/hrs:%02dd %02dh"
msgid "?duration:overflow"
msgstr "?duration:overflow"
-#: client/text.c:1143
+#: client/text.c:1145
#, c-format
msgid "%6d.%02d ms"
msgstr "%6d.%02d ms"
#. TRANS: <nation adjective> <government name>.
#. * E.g. "Polish Republic".
-#: client/text.c:1188
+#: client/text.c:1193
#, c-format
msgid "?nationgovernment:%s %s"
msgstr "?nationgovernment:%s %s"
#. TRANS: "Observer: 1985"
-#: client/text.c:1198
+#: client/text.c:1203
#, c-format
msgid "Observer: %s"
msgstr "Observatør: %s"
-#: client/text.c:1216
+#: client/text.c:1221
msgid "Buildings: "
msgstr "Bygninger: "
-#: client/text.c:1233 client/text.c:1272
+#: client/text.c:1238 client/text.c:1277
msgid "None. "
msgstr "Ingen. "
-#: client/text.c:1235 client/text.c:1274
+#: client/text.c:1240 client/text.c:1279
msgid "?clistend:."
msgstr "."
-#: client/text.c:1253
+#: client/text.c:1258
msgid "Wonders: "
msgstr "Vidundere: "
-#: client/text.c:1308
+#: client/text.c:1313
#, 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:1312
+#: client/text.c:1317
#, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
@@ -10114,62 +10263,62 @@ msgstr[0] "%d tilfreds før minuspoint."
msgstr[1] "%d tilfredse før minuspoint."
#. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1318
+#: client/text.c:1323
#, c-format
msgid "%d additional unhappy citizen."
msgid_plural "%d additional unhappy citizens."
msgstr[0] "%d ekstra ulykkelig indbygger."
msgstr[1] "%d ekstra ulykkelige indbyggere."
-#: client/text.c:1339
+#: client/text.c:1344
msgid "Unlimited martial law in effect."
msgstr "Ubegrænset undtagelsestilstand trådt i kraft."
-#: client/text.c:1341
+#: client/text.c:1346
#, c-format
msgid "%d military unit may impose martial law."
msgid_plural "Up to %d military units may impose martial law."
msgstr[0] "%d militærenhed kan indføre undtagelsestilstand."
msgstr[1] "Op til %d militære enheder kan indføre undtagelsestilstand."
-#: client/text.c:1345
+#: client/text.c:1350
#, c-format
msgid "Each military unit makes %d unhappy citizen content."
msgid_plural "Each military unit makes %d unhappy citizens content."
msgstr[0] "Hver ekstra militærenhed gør %d utilfreds borger tilfreds."
msgstr[1] "Hver ekstra militærenhed gør %d utilfredse borgere tilfredse."
-#: client/text.c:1352
+#: client/text.c:1357
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:1355
+#: client/text.c:1360
msgid "Military units have no happiness effect. "
msgstr "Militære enheder har ingen indvirkning på lyksaligheden. "
-#: client/text.c:1370
+#: client/text.c:1375
#, c-format
msgid "Luxury: %d total."
msgstr "Luksus: %d totalt."
-#: client/tilespec.c:865
+#: client/tilespec.c:882
msgid "No usable default tileset found, aborting!"
msgstr "Intet brugbart standardfeltsæt fundet, afbryder!"
-#: client/tilespec.c:1338
+#: client/tilespec.c:1355
msgid ""
"Client does not support isometric tilesets. Using default tileset instead."
msgstr ""
"Klienten understøtter ikke isometrisk grafik. Bruger almindelig grafik."
-#: client/tilespec.c:1347
+#: client/tilespec.c:1364
msgid ""
"Client does not support overhead view tilesets. Using default tileset "
"instead."
msgstr ""
"Klienten understøtter ikke grafik sæt ovenfra. Benytter standard grafik."
-#: client/tilespec.c:3966
+#: client/tilespec.c:3987
#, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -10689,7 +10838,7 @@ msgstr " - OPRØR"
#: client/gui-gtk-2.0/citydlg.c:1326 client/gui-sdl/citydlg.c:3609
msgid " - celebrating"
-msgstr " - fester"
+msgstr " - afholder festivitas"
#: client/gui-gtk-2.0/citydlg.c:1328 client/gui-sdl/citydlg.c:3612
msgid " - happy"
@@ -10848,7 +10997,7 @@ msgid "_Display"
msgstr "Vis _h"
#: client/gui-gtk-2.0/cityrep.c:1006 client/gui-gtk-2.0/menu.c:839
-#: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
+#: client/gui-sdl/diplodlg.c:692 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
#: client/gui-xaw/cityrep.c:533 client/gui-xaw/menu.c:156
@@ -11020,193 +11169,193 @@ msgstr "Hvad skal vi kalde forhåndsvalget?"
msgid "Remove this preset?"
msgstr "Fjern dette forhåndsvalg?"
-#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:222
+#: client/gui-gtk-2.0/dialogs.c:197 client/gui-gtk-2.0/messagewin.c:222
msgid "Goto _Location"
msgstr "GÃ¥ ti_l"
-#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
+#: client/gui-gtk-2.0/dialogs.c:202 client/gui-gtk-2.0/messagewin.c:226
msgid "Inspect _City"
msgstr "_Vis by"
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:258 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:258 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:259 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:311 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:312 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:312 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:313 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:506
+#: client/gui-gtk-2.0/dialogs.c:507
msgid "Unit"
msgstr "Enhed"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:950
-#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2155
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:985
+#: client/gui-gtk-2.0/dialogs.c:508 client/gui-gtk-2.0/pages.c:950
+#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2157
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:987
#: 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:519 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:520 client/gui-sdl/dialogs.c:627
msgid "Unit selection"
msgstr "Valg af enhed"
-#: client/gui-gtk-2.0/dialogs.c:582
+#: client/gui-gtk-2.0/dialogs.c:583
msgid "_Ready all"
msgstr "_Klargør alle"
-#: client/gui-gtk-2.0/dialogs.c:590
+#: client/gui-gtk-2.0/dialogs.c:591
msgid "_Sentry idle"
msgstr "Hold _stand inaktive"
-#: client/gui-gtk-2.0/dialogs.c:719
+#: client/gui-gtk-2.0/dialogs.c:721
msgid "Nation _Groups:"
msgstr "Nation_grupper:"
-#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:766 data/Freeciv.in:3128
msgid "What Nation Will You Be?"
msgstr "Hvilken nation vil du være?"
-#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
-#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
+#: client/gui-gtk-2.0/dialogs.c:768 client/gui-sdl/chatline.c:842
+#: client/gui-win32/connectdlg.c:1040 data/Freeciv.in:3371
msgid "Pick Nation"
msgstr "Vælg nation"
-#: client/gui-gtk-2.0/dialogs.c:774
+#: client/gui-gtk-2.0/dialogs.c:776
msgid "_Random Nation"
msgstr "_Tilfældig nation"
-#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:792 client/gui-win32/dialogs.c:517
msgid "Select a nation"
msgstr "Vælg en nation"
-#: client/gui-gtk-2.0/dialogs.c:804
+#: client/gui-gtk-2.0/dialogs.c:810
msgid "_Properties"
msgstr "_Egenskaber"
-#: client/gui-gtk-2.0/dialogs.c:824
+#: client/gui-gtk-2.0/dialogs.c:830
msgid "_Leader:"
msgstr "_Leder:"
-#: client/gui-gtk-2.0/dialogs.c:831
+#: client/gui-gtk-2.0/dialogs.c:837
msgid "_Female"
msgstr "_Hunkøn"
-#: client/gui-gtk-2.0/dialogs.c:836
+#: client/gui-gtk-2.0/dialogs.c:842
msgid "_Male"
msgstr "_Hankøn"
-#: client/gui-gtk-2.0/dialogs.c:863
+#: client/gui-gtk-2.0/dialogs.c:869
msgid "City _Styles:"
msgstr "_Bystil:"
# RETMIG: rigtigt?
-#: client/gui-gtk-2.0/dialogs.c:902
+#: client/gui-gtk-2.0/dialogs.c:908
msgid "_Description"
msgstr "_Legende"
-#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1263 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:1253 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1268 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:1262 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1277 client/gui-sdl/dialogs.c:2204
#: 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:1306 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1318 client/gui-win32/citydlg.c:1454
#: data/Freeciv.in:2484
msgid "Upgrade Unit!"
msgstr "Opgradér enhed!"
-#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1327 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 "Opgradér forældede enheder"
-#: client/gui-gtk-2.0/diplodlg.c:231 client/gui-win32/diplodlg.c:151
+#: client/gui-gtk-2.0/diplodlg.c:222 client/gui-win32/diplodlg.c:151
#: client/gui-xaw/diplodlg.c:383 client/gui-xaw/diplodlg.c:401
msgid "World-map"
msgstr "Verdenskort"
-#: client/gui-gtk-2.0/diplodlg.c:237 client/gui-win32/diplodlg.c:146
+#: client/gui-gtk-2.0/diplodlg.c:228 client/gui-win32/diplodlg.c:146
#: client/gui-xaw/diplodlg.c:387 client/gui-xaw/diplodlg.c:405
msgid "Sea-map"
msgstr "Søkort"
-#: client/gui-gtk-2.0/diplodlg.c:243
+#: client/gui-gtk-2.0/diplodlg.c:234
msgid "_Maps"
msgstr "_Kort"
-#: client/gui-gtk-2.0/diplodlg.c:274
+#: client/gui-gtk-2.0/diplodlg.c:265
msgid "_Advances"
msgstr "_Fremskridt"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/diplodlg.c:315 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "_Byer"
-#: client/gui-gtk-2.0/diplodlg.c:333
+#: client/gui-gtk-2.0/diplodlg.c:324
msgid "_Give shared vision"
-msgstr "_Giv delt udsyn"
+msgstr "_Giv delt synsfelt"
-#: client/gui-gtk-2.0/diplodlg.c:346
+#: client/gui-gtk-2.0/diplodlg.c:337
msgid "Give _embassy"
msgstr "Giv _ambassade"
-#: client/gui-gtk-2.0/diplodlg.c:376
+#: client/gui-gtk-2.0/diplodlg.c:368
msgid "_Pacts"
msgstr "_Traktater"
-#: client/gui-gtk-2.0/diplodlg.c:466
+#: client/gui-gtk-2.0/diplodlg.c:458
#, c-format
msgid "Diplomacy: %s"
msgstr "Diplomati: %s"
-#: client/gui-gtk-2.0/diplodlg.c:473
+#: client/gui-gtk-2.0/diplodlg.c:465
msgid "_Cancel meeting"
msgstr "_Aflys møde"
-#: client/gui-gtk-2.0/diplodlg.c:475
+#: client/gui-gtk-2.0/diplodlg.c:467
msgid "Accept _treaty"
msgstr "Accepter _traktat"
-#: client/gui-gtk-2.0/diplodlg.c:503
+#: client/gui-gtk-2.0/diplodlg.c:495
msgid "C_lauses:"
msgstr "_Klausuler:"
-#: client/gui-gtk-2.0/diplodlg.c:568 client/gui-gtk-2.0/diplodlg.c:642
+#: client/gui-gtk-2.0/diplodlg.c:560 client/gui-gtk-2.0/diplodlg.c:634
msgid "_Gold:"
msgstr "_Guld:"
-#: client/gui-gtk-2.0/diplodlg.c:580 client/gui-gtk-2.0/diplodlg.c:654
+#: client/gui-gtk-2.0/diplodlg.c:572 client/gui-gtk-2.0/diplodlg.c:646
msgid "_Add Clause..."
msgstr "_Tilføj klausul..."
-#: client/gui-gtk-2.0/diplodlg.c:699
+#: client/gui-gtk-2.0/diplodlg.c:691
msgid "--- This treaty is blank. Please add some clauses. ---"
msgstr "--- Denne traktat er tom. Venligst tilføj klausuler. ---"
-#: client/gui-gtk-2.0/diplodlg.c:905 client/gui-sdl/diplodlg.c:375
+#: client/gui-gtk-2.0/diplodlg.c:897 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 "Ugyldig mængde guld specificeret."
@@ -11265,19 +11414,19 @@ msgstr "Vælg destination"
msgid "Show _All Cities"
msgstr "Vis _alle byer"
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:164
msgid "Show Map Scrollbars"
msgstr "Vis rulleskakter på kort"
-#: client/gui-gtk-2.0/gui_main.c:163
+#: client/gui-gtk-2.0/gui_main.c:165
msgid "Disable this option to hide the scrollbars on the map view."
msgstr "Slå dette valg fra for at skjule rullebjælke på kortet."
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:169
msgid "Keyboardless goto"
msgstr "GÃ¥-til uden tastatur"
-#: client/gui-gtk-2.0/gui_main.c:168
+#: client/gui-gtk-2.0/gui_main.c:170
msgid ""
"If this option is set then a goto may be initiated by left-clicking and then "
"holding down the mouse button while dragging the mouse onto a different tile."
@@ -11285,11 +11434,11 @@ msgstr ""
"Hvis denne er slået til kan en gå-til ordre startes ved at venstreklikke og "
"så holde museknappen nede mens musen trækkes til en andet område."
-#: client/gui-gtk-2.0/gui_main.c:173
+#: client/gui-gtk-2.0/gui_main.c:175
msgid "Keep dialogs on top"
msgstr "Vis vinduer øverst"
-#: client/gui-gtk-2.0/gui_main.c:174
+#: client/gui-gtk-2.0/gui_main.c:176
msgid ""
"If this option is set then dialog windows will always remain in front of the "
"main Freeciv window. Disabling this has no effect in fullscreen mode."
@@ -11297,11 +11446,11 @@ msgstr ""
"Hvis denne er slået til vil dialog vinduer altid være fremme i fronten af "
"hovedbilledet af Freeciv. At slå denne fra har ingen effekt i fuld størrelse."
-#: client/gui-gtk-2.0/gui_main.c:178
+#: client/gui-gtk-2.0/gui_main.c:180
msgid "Show worklist task icons"
msgstr "Vis arbejdslisteikoner"
-#: client/gui-gtk-2.0/gui_main.c:179
+#: client/gui-gtk-2.0/gui_main.c:181
msgid ""
"Disabling this will turn off the unit and building icons in the worklist "
"dialog and the production tab of the city dialog."
@@ -11309,11 +11458,11 @@ msgstr ""
"Hvis denne slås fra fjernes enhed- og byggeikonerne i arbejdslistedialogen "
"og produktionsfanebladet i bydialogvinduet."
-#: client/gui-gtk-2.0/gui_main.c:183
+#: client/gui-gtk-2.0/gui_main.c:185
msgid "Enable status report tabs"
msgstr "Slå statusrapportvinduet til"
-#: client/gui-gtk-2.0/gui_main.c:184
+#: client/gui-gtk-2.0/gui_main.c:186
msgid ""
"If this option is enabled then report dialogs will be shown as separate tabs "
"rather than in popup dialogs."
@@ -11321,11 +11470,11 @@ msgstr ""
"Hvis denne er slået til vil rapportdialogvinduet blive vist som et separat "
"vindue fremfor i et pop-op vindue."
-#: client/gui-gtk-2.0/gui_main.c:189 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:191 client/gui-win32/gui_main.c:110
msgid "Better fog-of-war drawing"
msgstr "Bedre fog-of-war tegning"
-#: client/gui-gtk-2.0/gui_main.c:190 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:192 client/gui-win32/gui_main.c:111
msgid ""
"If this is enabled then a better method is used for drawing fog-of-war. It "
"is not any slower but will consume about twice as much memory."
@@ -11334,11 +11483,11 @@ msgstr ""
"Valget er ikke langsommere, men vil anvende cirka dobbelt så meget "
"hukommelse."
-#: client/gui-gtk-2.0/gui_main.c:195
+#: client/gui-gtk-2.0/gui_main.c:197
msgid "Show time for each chat message"
msgstr "Vis tid for hver enkel snakbesked"
-#: client/gui-gtk-2.0/gui_main.c:196
+#: client/gui-gtk-2.0/gui_main.c:198
msgid ""
"If this option is enabled then all chat messages will be prefixed by a time "
"string of the form [hour:minute:second]."
@@ -11346,11 +11495,11 @@ msgstr ""
"Hvis denne indstilling er slået til så vil alle snakbeskeder være "
"forhåndsvalgt med en tidsstreng med syntaksen [time:minut:sekund]."
-#: client/gui-gtk-2.0/gui_main.c:201
+#: client/gui-gtk-2.0/gui_main.c:203
msgid "Split bottom notebook area"
msgstr "Opdel notebogsområdets bund"
-#: client/gui-gtk-2.0/gui_main.c:202
+#: client/gui-gtk-2.0/gui_main.c:204
msgid ""
"Enabling this option will split the bottom notebook into a left and right "
"notebook so that two tabs may be viewed at once."
@@ -11358,11 +11507,11 @@ msgstr ""
"Ved at slå denne indstilling til vil bunden af notebogen blive opdelt i en "
"højre og venstre notebog så to faneblade kan ses på en gang."
-#: client/gui-gtk-2.0/gui_main.c:207
+#: client/gui-gtk-2.0/gui_main.c:209
msgid "New message events go to top of list"
msgstr "Nye beskedsbegivenheder kommer i toppen af listen"
-#: client/gui-gtk-2.0/gui_main.c:208
+#: client/gui-gtk-2.0/gui_main.c:210
msgid ""
"If this option is enabled, new events in the message window will appear at "
"the top of the list, rather than being appended at the bottom."
@@ -11370,11 +11519,11 @@ msgstr ""
"Hvis denne indstilling er slået til vil nye beskeder i beskedsvinduet vises "
"øverst i listen, fremfor at de bliver tilføjet i bunden."
-#: client/gui-gtk-2.0/gui_main.c:213
+#: client/gui-gtk-2.0/gui_main.c:215
msgid "Show extra message window buttons"
msgstr "Vis ekstra knapper for beskedvindue"
-#: client/gui-gtk-2.0/gui_main.c:214
+#: client/gui-gtk-2.0/gui_main.c:216
msgid ""
"If this option is enabled, there will be two buttons displayed in the "
"message window for inspecting a city and going to a location. If this option "
@@ -11390,11 +11539,11 @@ msgstr ""
"højreklikke på en række for at inspicere eller gå til). Denne indstilling "
"vil kun træde i kraft når beskedvinduet er lukket og genåbnet."
-#: client/gui-gtk-2.0/gui_main.c:224
+#: client/gui-gtk-2.0/gui_main.c:226
msgid "Metaserver tab first in network page"
msgstr "Metaserverfaneblad først på netværksside"
-#: client/gui-gtk-2.0/gui_main.c:225
+#: client/gui-gtk-2.0/gui_main.c:227
msgid ""
"If this option is enabled, the metaserver tab will be the first notebook tab "
"in the network page. This option requires a restart in order to take effect."
@@ -11403,11 +11552,11 @@ msgstr ""
"den første notebogfaneblad på netværkssiden. Denne indstilling kræver en "
"genstart for at træde i kraft."
-#: client/gui-gtk-2.0/gui_main.c:230
+#: client/gui-gtk-2.0/gui_main.c:232
msgid "Plain chat messages are sent to allies only"
msgstr "Enkle snakkebeskeder sendes kun til allierede"
-#: client/gui-gtk-2.0/gui_main.c:231
+#: client/gui-gtk-2.0/gui_main.c:233
msgid ""
"If this option is enabled, then plain messages typed into the chat entry "
"while the game is running will only be sent to your allies. Otherwise plain "
@@ -11423,7 +11572,25 @@ msgstr ""
"beskeden. Denne indstilling kan også indstilles via en knap ved siden af "
"snakkeindgangen (kun synlig i flerspiller)."
-#: client/gui-gtk-2.0/gui_main.c:340 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:245
+msgid "Arrange widgets for small displays"
+msgstr "Aranger kontroller for små skærme"
+
+#: client/gui-gtk-2.0/gui_main.c:246
+msgid ""
+"If this option is enabled, widgets in the main window will be arrange so "
+"that they take up the least amount of total screen space. Specifically, the "
+"left panel containing the overview, player status, and the unit information "
+"box will be extended over the entire left side of the window. This option "
+"requires a restart in order to take effect."
+msgstr ""
+"Hvis denne indstilling er slået til, vil kontroller i hovedvinduet blive "
+"arrangeret så, at de optager mindst mulig plads i forhold til det samlede "
+"skærmareal. Specifikt vil det venstre panel, der indeholder overblikket, "
+"spillerstatus og enhedsinformationen blive udstrækt til hele den venstre "
+"side af vinduet. Denne indstilling kræver en genstart for at træde i kræft."
+
+#: client/gui-gtk-2.0/gui_main.c:352 client/gui-xaw/gui_main.c:245
msgid ""
"This client has no special command line options\n"
"\n"
@@ -11431,22 +11598,22 @@ msgstr ""
"Denne klient har ingen specielle indstillinger for kommandolinje\n"
"\n"
-#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
+#: client/gui-gtk-2.0/gui_main.c:847 client/gui-gtk-2.0/gui_main.c:1542
msgid "Freeciv"
msgstr "Freeciv"
-#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
+#: client/gui-gtk-2.0/gui_main.c:1251 client/gui-gtk-2.0/gui_main.c:1258
#: client/gui-sdl/mapctrl.c:1566 client/gui-win32/gui_main.c:482
#: data/Freeciv.in:2618
msgid "Turn Done"
msgstr "Afslut runde"
-#: client/gui-gtk-2.0/gui_main.c:1232 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1258 client/gui-sdl/mapctrl.c:1566
#: client/gui-sdl/mapview.c:1082
msgid "Shift+Return"
msgstr "Shift+Return"
-#: client/gui-gtk-2.0/gui_main.c:1266 client/gui-gtk-2.0/menu.c:797
+#: client/gui-gtk-2.0/gui_main.c:1299 client/gui-gtk-2.0/menu.c:797
#: client/gui-gtk-2.0/menu.c:799 client/gui-gtk-2.0/menu.c:801
#: client/gui-gtk-2.0/menu.c:803 client/gui-gtk-2.0/menu.c:805
#: client/gui-gtk-2.0/menu.c:807 client/gui-gtk-2.0/menu.c:809
@@ -11465,11 +11632,11 @@ msgstr "Shift+Return"
msgid "View"
msgstr "Kortvindue"
-#: client/gui-gtk-2.0/gui_main.c:1359
+#: client/gui-gtk-2.0/gui_main.c:1393
msgid "Chat"
msgstr "Snak"
-#: client/gui-gtk-2.0/gui_main.c:1377 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1411 client/gui-win32/gui_main.c:538
#: data/Freeciv.in:2809
msgid ""
"Freeciv is free software and you are welcome to distribute copies of it\n"
@@ -11483,77 +11650,77 @@ msgstr ""
"\n"
"Og giv dem så tørt på!"
-#: client/gui-gtk-2.0/gui_main.c:1392
+#: client/gui-gtk-2.0/gui_main.c:1426
msgid "Allies Only"
msgstr "Kun allierede"
-#: client/gui-gtk-2.0/gui_main.c:1657
+#: client/gui-gtk-2.0/gui_main.c:1691
msgid "Not _ready"
msgstr "Ikke kla_r"
-#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
+#: client/gui-gtk-2.0/gui_main.c:1702 client/gui-gtk-2.0/pages.c:1679
msgid "_Ready"
msgstr "_Klargør alle"
-#: client/gui-gtk-2.0/gui_main.c:1672 client/gui-gtk-2.0/gui_main.c:1678
-#: client/gui-gtk-2.0/pages.c:2204
+#: client/gui-gtk-2.0/gui_main.c:1706 client/gui-gtk-2.0/gui_main.c:1712
+#: client/gui-gtk-2.0/pages.c:2206
msgid "_Start"
msgstr "_Start"
-#: client/gui-gtk-2.0/gui_main.c:1686
+#: client/gui-gtk-2.0/gui_main.c:1720
msgid "_Take Player"
msgstr "_Benyt denne spiller"
-#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
+#: client/gui-gtk-2.0/gui_main.c:1723 client/gui-gtk-2.0/pages.c:1669
msgid "Pick _Nation"
msgstr "Vælg _nation"
-#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
+#: client/gui-gtk-2.0/gui_main.c:1730 client/gui-gtk-2.0/pages.c:1674
msgid "_Observe"
msgstr "_Observer"
-#: client/gui-gtk-2.0/gui_main.c:1698
+#: client/gui-gtk-2.0/gui_main.c:1732
msgid "Do not _observe"
msgstr "Undlad at _observere"
-#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1755 client/gui-xaw/pages.c:211
msgid "<AI>"
msgstr "<AI>"
-#: client/gui-gtk-2.0/gui_main.c:1723
+#: client/gui-gtk-2.0/gui_main.c:1758
msgid "<Novice AI>"
msgstr "<Novice AI>"
-#: client/gui-gtk-2.0/gui_main.c:1726
+#: client/gui-gtk-2.0/gui_main.c:1761
msgid "<Easy AI>"
msgstr "<Nem AI>"
-#: client/gui-gtk-2.0/gui_main.c:1729
+#: client/gui-gtk-2.0/gui_main.c:1764
msgid "<Normal AI>"
msgstr "<Normal AI>"
-#: client/gui-gtk-2.0/gui_main.c:1732
+#: client/gui-gtk-2.0/gui_main.c:1767
msgid "<Hard AI>"
msgstr "<Dygtig AI>"
-#: client/gui-gtk-2.0/gui_main.c:1742 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1777 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:1808
+#: client/gui-gtk-2.0/gui_main.c:1844 client/gui-gtk-2.0/gui_main.c:1858
msgid "Observer"
msgstr "Observatør"
-#: client/gui-gtk-2.0/gui_main.c:1808
+#: client/gui-gtk-2.0/gui_main.c:1858
msgid "Detached"
msgstr "Aftaget"
-#: client/gui-gtk-2.0/gui_main.c:2073
+#: client/gui-gtk-2.0/gui_main.c:2117
msgid "Are you sure you want to quit?"
msgstr "Er du sikker på at du vil slutte?"
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
#, c-format
msgid ""
"Close Tab:\n"
@@ -11562,7 +11729,7 @@ msgstr ""
"Luk vindue:\n"
"%s"
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
msgid "Ctrl+W"
msgstr "Ctrl+W"
@@ -11648,7 +11815,7 @@ msgstr "Mad/prod./handel"
#: client/gui-gtk-2.0/helpdlg.c:105 client/gui-win32/helpdlg.c:96
#: data/Freeciv.in:972
msgid "Resources:"
-msgstr "Resurser:"
+msgstr "Ressourcer:"
#: client/gui-gtk-2.0/helpdlg.c:106 client/gui-win32/helpdlg.c:97
msgid "Road Rslt/Time:"
@@ -11667,8 +11834,8 @@ msgid "Trans. Rslt/Time:"
msgstr "Trans.-rslt/tid:"
#: 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
-#: client/gui-win32/helpdlg.c:709 client/gui-win32/helpdlg.c:733
+#: client/gui-win32/helpdlg.c:502 client/gui-win32/helpdlg.c:550
+#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:739
#: client/gui-xaw/helpdlg.c:759 client/gui-xaw/helpdlg.c:808
#: client/gui-xaw/helpdlg.c:816 client/gui-xaw/helpdlg.c:853
#: client/gui-xaw/helpdlg.c:878
@@ -11715,34 +11882,34 @@ msgstr "med"
msgid "?techhelp:"
msgstr "?techhelp:"
-#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:591
+#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:597
#: client/gui-xaw/helpdlg.c:996
#, c-format
msgid "+%d Trade / %d"
msgstr "+%d handel / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:595
+#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:601
#: client/gui-xaw/helpdlg.c:1000
#, c-format
msgid "no extra / %d"
msgstr "ingen ekstra / %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
-#: client/gui-win32/helpdlg.c:602 client/gui-win32/helpdlg.c:616
-#: client/gui-win32/helpdlg.c:635 client/gui-xaw/helpdlg.c:1002
+#: client/gui-gtk-2.0/helpdlg.c:1085 client/gui-win32/helpdlg.c:604
+#: client/gui-win32/helpdlg.c:608 client/gui-win32/helpdlg.c:622
+#: client/gui-win32/helpdlg.c:641 client/gui-xaw/helpdlg.c:1002
#: client/gui-xaw/helpdlg.c:1006 client/gui-xaw/helpdlg.c:1020
#: client/gui-xaw/helpdlg.c:1039
msgid "n/a"
msgstr "-"
-#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:605
+#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:611
#: client/gui-xaw/helpdlg.c:1009
#, c-format
msgid "+%d Food / %d"
msgstr "+%d mad / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:619
+#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:625
#: client/gui-xaw/helpdlg.c:1023
#, c-format
msgid "+%d Res. / %d"
@@ -12509,41 +12676,41 @@ msgstr "_Tilslut til netværksspil"
msgid "Connect to Gaming _Zone"
msgstr "Tilslut til netværksspil"
-#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:302
#: 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:779 client/gui-gtk-2.0/pages.c:820
-#: client/gui-win32/connectdlg.c:916
+#: client/gui-win32/connectdlg.c:918
msgid "Server Name"
msgstr "Servernavn"
#: client/gui-gtk-2.0/pages.c:780 client/gui-gtk-2.0/pages.c:821
-#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:916
+#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:918
#: data/Freeciv.in:96
msgid "Port"
msgstr "Port"
#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Version"
msgstr "Version"
#: client/gui-gtk-2.0/pages.c:782 client/gui-gtk-2.0/pages.c:823
-#: client/gui-gtk-2.0/pages.c:2161 client/gui-win32/connectdlg.c:917
-#: client/gui-win32/connectdlg.c:995
+#: client/gui-gtk-2.0/pages.c:2163 client/gui-win32/connectdlg.c:919
+#: client/gui-win32/connectdlg.c:997
msgid "Status"
msgstr "Status"
#: client/gui-gtk-2.0/pages.c:783 client/gui-gtk-2.0/pages.c:824
#: client/gui-sdl/connectdlg.c:318 client/gui-sdl/plrdlg.c:330
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Players"
msgstr "Spillere"
#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
-#: client/gui-win32/connectdlg.c:918
+#: client/gui-win32/connectdlg.c:920
msgid "Comment"
msgstr "Kommentar"
@@ -12575,9 +12742,9 @@ msgstr "Adgangskode:"
msgid "Conf_irm Password:"
msgstr "Bekræft adgangskode:"
-#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2165
#: 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:1000
+#: client/gui-win32/citydlg.c:1083 client/gui-win32/connectdlg.c:1002
#: client/gui-win32/wldlg.c:800 client/gui-win32/wldlg.c:806
msgid "Type"
msgstr "Type"
@@ -12669,7 +12836,7 @@ msgstr "_AI niveau:"
msgid "Ruleset _Version:"
msgstr "_Regelsæt:"
-#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2195
msgid "_More Game Options..."
msgstr "Flere spil indstillinger..."
@@ -12685,48 +12852,48 @@ msgstr "Rater"
msgid "Ready"
msgstr "Klar"
-#: client/gui-gtk-2.0/pages.c:1601
+#: client/gui-gtk-2.0/pages.c:1600
msgid "?player:Leader"
msgstr "?player:leder"
-#: client/gui-gtk-2.0/pages.c:1732 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1734 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:1824
+#: client/gui-gtk-2.0/pages.c:1826
msgid "Choose Saved Game to _Load:"
msgstr "Vælg gemt spil til ind_læsning"
-#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
-#: client/gui-gtk-2.0/pages.c:2451
+#: client/gui-gtk-2.0/pages.c:1846 client/gui-gtk-2.0/pages.c:2039
+#: client/gui-gtk-2.0/pages.c:2455
msgid "_Browse..."
msgstr "Gennemse"
-#: client/gui-gtk-2.0/pages.c:1911
+#: client/gui-gtk-2.0/pages.c:1913
msgid "Choose a Scenario"
msgstr "Vælg et scenarie"
-#: client/gui-gtk-2.0/pages.c:1998
+#: client/gui-gtk-2.0/pages.c:2000
msgid "Choose a _Scenario:"
msgstr "Vælg et scenarie"
-#: client/gui-gtk-2.0/pages.c:2173
+#: client/gui-gtk-2.0/pages.c:2175
msgid "Choose a _nation to play:"
msgstr "Vælg et folkeslag du ønsker at spille som:"
-#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2367 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:2448 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2452 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "Gem spil"
-#: client/gui-gtk-2.0/pages.c:2489
+#: client/gui-gtk-2.0/pages.c:2493
msgid "Saved _Games:"
msgstr "Gemte spil"
-#: client/gui-gtk-2.0/pages.c:2516
+#: client/gui-gtk-2.0/pages.c:2520
msgid "Save _Filename:"
msgstr "Filnavn:"
@@ -13078,7 +13245,7 @@ msgstr "Luk vindue (Esc)"
msgid "Total users logged in : %d"
msgstr "Total antal brugere logget ind : %d"
-#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1098
msgid "Back"
msgstr "Tilbage"
@@ -13087,7 +13254,7 @@ msgid "Start"
msgstr "Start"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:777
+#: client/gui-win32/connectdlg.c:779
msgid "Load Game"
msgstr "Fortsæt et spil"
@@ -13127,9 +13294,9 @@ msgstr "Lav ny hjemby"
#: client/gui-sdl/connectdlg.c:308 client/gui-sdl/connectdlg.c:617
#: client/gui-sdl/connectdlg.c:803 client/gui-sdl/connectdlg.c:985
#: client/gui-sdl/dialogs.c:452 client/gui-sdl/dialogs.c:2095
-#: client/gui-sdl/dialogs.c:2893 client/gui-sdl/diplomat_dialog.c:731
+#: client/gui-sdl/dialogs.c:2902 client/gui-sdl/diplomat_dialog.c:731
#: client/gui-sdl/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1043
#: client/gui-win32/dialogs.c:1772 client/gui-win32/finddlg.c:127
#: client/gui-win32/gotodlg.c:171 client/gui-win32/inputdlg.c:146
#: client/gui-win32/messagedlg.c:216 client/gui-win32/ratesdlg.c:328
@@ -13173,7 +13340,7 @@ msgid "Buy it?"
msgstr "Køb det?"
#: 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
+#: client/gui-sdl/diplodlg.c:1336 client/gui-sdl/diplomat_dialog.c:1211
#: client/gui-sdl/diplomat_dialog.c:1417 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:221 client/gui-sdl/repodlgs.c:1559
#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
@@ -13189,7 +13356,7 @@ msgid "No"
msgstr "Nej"
#: client/gui-sdl/citydlg.c:1215 client/gui-sdl/cma_fe.c:318
-#: client/gui-sdl/diplodlg.c:1345 client/gui-sdl/diplomat_dialog.c:1200
+#: client/gui-sdl/diplodlg.c:1346 client/gui-sdl/diplomat_dialog.c:1200
#: client/gui-sdl/diplomat_dialog.c:1407 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:232 client/gui-win32/repodlgs.c:578
#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
@@ -13493,7 +13660,7 @@ msgstr "Freeciv server :"
msgid "Port :"
msgstr "Port :"
-#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1100
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr "Tilslut"
@@ -13600,23 +13767,23 @@ msgstr "Vælg din nye styreform"
msgid "REVOLUTION!"
msgstr "REVOLUTION!"
-#: client/gui-sdl/dialogs.c:2232 client/gui-sdl/dialogs.c:2620
+#: client/gui-sdl/dialogs.c:2237 client/gui-sdl/dialogs.c:2625
#: client/gui-win32/dialogs.c:567 data/Freeciv.in:3159
msgid "Female"
msgstr "Hunkøn"
-#: client/gui-sdl/dialogs.c:2234 client/gui-sdl/dialogs.c:2618
-#: client/gui-sdl/dialogs.c:2830 client/gui-win32/dialogs.c:565
+#: client/gui-sdl/dialogs.c:2239 client/gui-sdl/dialogs.c:2623
+#: client/gui-sdl/dialogs.c:2839 client/gui-win32/dialogs.c:565
msgid "Male"
msgstr "Hankøn"
-#: client/gui-sdl/dialogs.c:2478 client/gui-sdl/dialogs.c:2902
+#: client/gui-sdl/dialogs.c:2483 client/gui-sdl/dialogs.c:2911
#: 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 "O.K."
+msgstr "O.k."
-#: client/gui-sdl/dialogs.c:2685 client/gui-win32/dialogs.c:505
+#: client/gui-sdl/dialogs.c:2694 client/gui-win32/dialogs.c:505
msgid "What nation will you be?"
msgstr "Hvilken nation vil du være?"
@@ -13628,7 +13795,7 @@ msgstr "Traktater"
#: client/gui-sdl/diplodlg.c:511 client/gui-win32/diplodlg.c:618
#: client/gui-win32/diplodlg.c:670
msgid "Give shared vision"
-msgstr "Giv delt udsyn"
+msgstr "Giv delt synsfelt"
#: 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
@@ -13643,53 +13810,53 @@ msgstr "Verdenskort"
msgid "Sea map"
msgstr "Søkort"
-#: client/gui-sdl/diplodlg.c:563
+#: client/gui-sdl/diplodlg.c:564
msgid "Give embassy"
msgstr "Giv ambassade"
-#: client/gui-sdl/diplodlg.c:579 client/gui-win32/diplodlg.c:614
+#: client/gui-sdl/diplodlg.c:580 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 "Guld (maks. %d)"
-#: client/gui-sdl/diplodlg.c:613 client/gui-sdl/helpdlg.c:1956
+#: client/gui-sdl/diplodlg.c:614 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 "Fremskridt"
-#: client/gui-sdl/diplodlg.c:831 client/gui-win32/diplodlg.c:598
+#: client/gui-sdl/diplodlg.c:832 client/gui-win32/diplodlg.c:598
#: data/Freeciv.in:269
msgid "Diplomacy meeting"
msgstr "Diplomatisk møde"
-#: client/gui-sdl/diplodlg.c:883 client/gui-win32/diplodlg.c:680
+#: client/gui-sdl/diplodlg.c:884 client/gui-win32/diplodlg.c:680
#: data/Freeciv.in:510
msgid "Cancel meeting"
msgstr "Aflys møde"
-#: client/gui-sdl/diplodlg.c:895 client/gui-win32/diplodlg.c:679
+#: client/gui-sdl/diplodlg.c:896 client/gui-win32/diplodlg.c:679
#: data/Freeciv.in:501
msgid "Accept treaty"
msgstr "Acceptér traktat"
#. TRANS: "Polish incident !" FIXME!!!
-#: client/gui-sdl/diplodlg.c:1304
+#: client/gui-sdl/diplodlg.c:1305
#, c-format
msgid "%s incident !"
msgstr "%s begivenhed !"
-#: client/gui-sdl/diplodlg.c:1322
+#: client/gui-sdl/diplodlg.c:1323
msgid "Shall we declare WAR on them?"
msgstr "Skal vi erklære krig mod dem?"
-#: client/gui-sdl/diplodlg.c:1433
+#: client/gui-sdl/diplodlg.c:1434
msgid "Foreign Minister"
msgstr "Udenrigsminister"
-#: client/gui-sdl/diplodlg.c:1449
+#: client/gui-sdl/diplodlg.c:1450
#, c-format
msgid ""
"Sir!, the %s ambassador has arrived\n"
@@ -13698,24 +13865,24 @@ msgstr ""
"Hr.!, %s ambassadør er ankommet\n"
"Hvad er dine ønsker?"
-#: client/gui-sdl/diplodlg.c:1465
+#: client/gui-sdl/diplodlg.c:1466
msgid "Declare WAR"
msgstr "Erklær krig"
-#: client/gui-sdl/diplodlg.c:1467 client/gui-win32/plrdlg.c:357
+#: client/gui-sdl/diplodlg.c:1468 client/gui-win32/plrdlg.c:357
msgid "Cancel Treaty"
msgstr "Afbryd traktat"
-#: client/gui-sdl/diplodlg.c:1490 client/gui-win32/plrdlg.c:358
+#: client/gui-sdl/diplodlg.c:1491 client/gui-win32/plrdlg.c:358
#: data/Freeciv.in:3254
msgid "Withdraw vision"
msgstr "Træk synsfelt tilbage"
-#: client/gui-sdl/diplodlg.c:1507
+#: client/gui-sdl/diplodlg.c:1508
msgid "Call Diplomatic Meeting"
msgstr "Indkald til diplomatisk møde"
-#: client/gui-sdl/diplodlg.c:1521
+#: client/gui-sdl/diplodlg.c:1522
msgid "Send him back"
msgstr "Send ham tilbage"
@@ -14420,7 +14587,7 @@ msgstr "Tegn bykort omrids"
#: client/gui-sdl/optiondlg.c:1746
msgid "Special Resources"
-msgstr "Specielle resurser"
+msgstr "Specielle ressourcer"
#: client/gui-sdl/optiondlg.c:1880 client/gui-xaw/menu.c:150
msgid "Roads and Rails"
@@ -14460,12 +14627,12 @@ msgid "Leave Game"
msgstr "Forlad spil"
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1100 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1102 client/gui-xaw/menu.c:121
#: data/Freeciv.in:115 data/Freeciv.in:3180
msgid "Quit"
msgstr "Afslut"
-#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:967
msgid "Start New Game"
msgstr "Start nyt spil"
@@ -14582,8 +14749,8 @@ msgstr "Nettoindtægt: "
msgid "%s max rate : %d%%"
msgstr "%s maks niveau: %d%%"
-#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
-#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1085
+#: client/gui-win32/connectdlg.c:1093 data/Freeciv.in:155
msgid "Update"
msgstr "Opdatér"
@@ -15076,67 +15243,67 @@ msgstr "Ny"
msgid "Delete"
msgstr "Slet"
-#: client/gui-win32/connectdlg.c:147
+#: client/gui-win32/connectdlg.c:149
msgid "Password:"
msgstr "Adgangskode:"
-#: client/gui-win32/connectdlg.c:169
+#: client/gui-win32/connectdlg.c:171
msgid "Couldn't load the savegame"
msgstr "Kunne ikke indlæse det gemte spil"
-#: client/gui-win32/connectdlg.c:284 client/gui-xaw/connectdlg.c:311
+#: client/gui-win32/connectdlg.c:286 client/gui-xaw/connectdlg.c:311
msgid "Verify Password"
msgstr "Bekræft adgangskode"
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:916 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr "Freeciv-servervalg"
-#: client/gui-win32/connectdlg.c:915
+#: client/gui-win32/connectdlg.c:917
msgid "Local Area Network"
msgstr "Lokalnetværk"
-#: client/gui-win32/connectdlg.c:949
+#: client/gui-win32/connectdlg.c:951
msgid "Welcome to Freeciv"
msgstr "Velkommen til Freeciv"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Load Saved Game"
msgstr "Indlæs gemt spil"
-#: client/gui-win32/connectdlg.c:969
+#: client/gui-win32/connectdlg.c:971
msgid "Connect To Network Game"
msgstr "Tilslut til netværksspil"
-#: client/gui-win32/connectdlg.c:979
+#: client/gui-win32/connectdlg.c:981
msgid "Choose a nation to play"
msgstr "Vælg et folkeslag at spille:"
-#: client/gui-win32/connectdlg.c:1014
+#: client/gui-win32/connectdlg.c:1016
msgid "Number of players (Including AI):"
msgstr "Antal spillere (inklusiv AI):"
-#: client/gui-win32/connectdlg.c:1022
+#: client/gui-win32/connectdlg.c:1024
msgid "AI skill level:"
msgstr "AI-niveau:"
-#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1038 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr "Spilindstillinger"
-#: client/gui-win32/connectdlg.c:1040
+#: client/gui-win32/connectdlg.c:1042
msgid "Start Game"
msgstr "Start spil"
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Login:"
msgstr "Bruger:"
-#: client/gui-win32/connectdlg.c:1061
+#: client/gui-win32/connectdlg.c:1063
msgid "Host:"
msgstr "Server:"
-#: client/gui-win32/connectdlg.c:1062
+#: client/gui-win32/connectdlg.c:1064
msgid "Port:"
msgstr "Port:"
@@ -15218,21 +15385,21 @@ msgstr ""
"for dither. Hvis der ikke er hardware understøttelse af alpha blending, er "
"dette meget langsommere."
-#: client/gui-win32/helpdlg.c:769 client/gui-win32/helpdlg.c:792
-#: client/gui-win32/helpdlg.c:803 client/gui-win32/helpdlg.c:809
-#: client/gui-win32/helpdlg.c:822
+#: client/gui-win32/helpdlg.c:775 client/gui-win32/helpdlg.c:798
+#: client/gui-win32/helpdlg.c:809 client/gui-win32/helpdlg.c:815
+#: client/gui-win32/helpdlg.c:828
msgid "Allows "
msgstr "Tillader "
-#: client/gui-win32/helpdlg.c:780
+#: client/gui-win32/helpdlg.c:786
msgid "Obsoletes "
msgstr "Forælder"
-#: client/gui-win32/helpdlg.c:812 client/gui-win32/helpdlg.c:825
+#: client/gui-win32/helpdlg.c:818 client/gui-win32/helpdlg.c:831
msgid " (with "
msgstr " (med "
-#: client/gui-win32/helpdlg.c:815 client/gui-win32/helpdlg.c:828
+#: client/gui-win32/helpdlg.c:821 client/gui-win32/helpdlg.c:834
msgid "?techhelp:)."
msgstr "?techhelp:)."
@@ -15606,24 +15773,25 @@ msgstr "Intet versionsnummer i ressourcerne"
#: client/gui-xaw/gui_main.c:324
msgid "You probably have an old (circa V1.0) Freeciv resource file somewhere."
-msgstr "Du har muligvis en ældre (ca. v1.0) Freeciv resursefil et sted."
+msgstr ""
+"Du har muligvis en ældre (cirka version 1.0) Freecivressourcefil et sted."
#: client/gui-xaw/gui_main.c:332
msgid "Game version does not match Resource version."
-msgstr "Spilversion ikke samme som resurseversion."
+msgstr "Spilversion svarer ikke overens med ressourceversion."
#: client/gui-xaw/gui_main.c:333
#, c-format
msgid "Game version: %s - Resource version: %s"
-msgstr "Spilversion: %s - Resurseversion: %s"
+msgstr "Spilversion: %s - Ressourceversion: %s"
#: client/gui-xaw/gui_main.c:335
msgid "You might have an old Freeciv resourcefile in /usr/lib/X11/app-defaults"
-msgstr "Du kan have en gammel Freeciv resursefil i /usr/lib/X11/app-defaults"
+msgstr "Du kan have en gammel Freecivressourcefil i /usr/lib/X11/app-defaults"
#: client/gui-xaw/gui_main.c:341
msgid "Using fallback resources - which is OK"
-msgstr "Bruger reserveresurser - det er OK"
+msgstr "Bruger reserveressourcer - hvilket er o.k."
#: client/gui-xaw/gui_main.c:352
msgid "Only color displays are supported for now..."
@@ -15953,7 +16121,7 @@ msgstr ""
#: manual/civmanual.c:221 data/default/terrain.ruleset:636
#: data/civ2/terrain.ruleset:567 data/civ1/terrain.ruleset:574
msgid "Resources"
-msgstr "Resurser"
+msgstr "Ressourcer"
#: manual/civmanual.c:222
msgid "Move cost"
@@ -16051,7 +16219,7 @@ msgstr "Fjern punkt"
#: data/Freeciv.in:474 data/Freeciv.in:483
msgid "Shared vision"
-msgstr "Delt udsyn"
+msgstr "Delt synsfelt"
#: data/Freeciv.in:558
msgid "Select Unit(s)"
@@ -16311,15 +16479,15 @@ msgstr "Vælg stÃl for byerne:"
#: data/Freeciv.in:3176
msgid " Ok "
-msgstr " Ok "
+msgstr " O.k. "
#: data/Freeciv.in:3209
msgid ""
"Name Nation Embassy Dipl.State Vision "
"Reputation State Host"
msgstr ""
-"Navn Nation Ambassade Dipl. status Udsyn "
-"Rygte Stat Host"
+"Navn Nation Ambassade Dipl. status "
+"SynsfeltRygte Stat Host"
#: data/Freeciv.in:3246
msgid "Cancel pact"
@@ -16359,12 +16527,12 @@ 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/"
+" https://gna.org/projects/freeciv/"
msgstr ""
"Hvis du finder en fejl, så send os venligst en rapport. Dette gøres mest "
"hensigtsmæssig ved at besøge Freeciv Bug Tracking System, på:\n"
"\n"
-" http://bugs.freeciv.org/"
+" https://gna.org/projects/freeciv/"
#: data/helpdata.txt:60
msgid ""
@@ -16867,8 +17035,8 @@ msgstr ""
" 0. Vælg stedet til den første by.\n"
"\n"
" Start spillet med at gå LIDT omkring for at finde et godt sted at "
-"bygge den første by. Bliv ikke fristet til at udforske hyttene endnu - de "
-"kan indeholde barbarer. Byg byen i nærheden af ressourcer og måske i "
+"bygge den første by. Bliv ikke fristet til at udforske landsbyerne endnu - "
+"de kan indeholde barbarer. Byg byen i nærheden af ressourcer og måske i "
"nærheden af havet. Husk at den første by du bygger bliver hovedstaden! "
"Pointet er at balancere kvaliteten af stedet du finder med at få etableret "
"den første by så tidligt som muligt."
@@ -16923,7 +17091,7 @@ msgid ""
msgstr ""
" Husk at med nogen styreformer kan militære enheder inden i eller udenfor "
"byer reducere eller øge lyksaligheden i byen. Når en enhed er inde i en by, "
-"får den desuden 50% forsvarsbonus, som om den var befæstet. Når en ny by "
+"får den desuden 50 % forsvarsbonus, som om den var befæstet. Når en ny by "
"bliver bygget, begynder byen altid med at bygge den bedste tilgængelige "
"forsvarsenhed fra listen ovenover."
@@ -17146,7 +17314,7 @@ msgstr ""
"\n"
" - Handle med byer,\n"
"\n"
-" - Handele delt synsfelt,\n"
+" - Handle delt synsfelt,\n"
"\n"
" - Udveksle ambassader,\n"
"\n"
@@ -17279,10 +17447,10 @@ msgstr ""
" En alliance er det mest udvidede diplomatiske forhold mellem to "
"spillere. I dette forhold kan du flytte enheder ind i hinandens byer og dine "
"enheder kan deles om det samme område. En allieret computer vil gratis give "
-"dig sit verdenskort, delt udsyn samt seriøst overveje at handle teknologier "
-"og byer. Den eneste ulempe ved en alliance er at den vil drage dig ind i "
-"enhver krig som din allierede går i gang med. Afbrydelse af en alliance vil "
-"føre dig til en tilstand med fredsforhandlinger."
+"dig sit verdenskort, delt synsfelt samt seriøst overveje at handle "
+"teknologier og byer. Den eneste ulempe ved en alliance er, at den vil drage "
+"dig ind i enhver krig som din allierede går i gang med. Afbrydelse af en "
+"alliance vil føre dig til en tilstand med fredsforhandlinger."
#: data/helpdata.txt:821
msgid ""
@@ -17438,7 +17606,7 @@ msgstr ""
"landenheder er til søs, kan de ikke angribe eller forsvare sig, der er det "
"enheden som bærer dem som bestemmer. Landenheder er de eneste som "
"kontrolområdet har indvirkning på. På land kan landenheder befæste sig og "
-"får da 50% forsvarsbonus; landenheder i byer får altid denne bonus, uanset "
+"får da 50 % forsvarsbonus; landenheder i byer får altid denne bonus, uanset "
"om de er befæstet eller ikke. Når en landenhed lykkes med et angreb mod en "
"by uden bymure, mindskes indbyggertallet med 1. Landenheder med "
"angrebsstyrke 0 er ikke-militære enheder: de kræver ingen udgifter, har "
@@ -17480,8 +17648,8 @@ msgstr ""
"afhænger af enhedtypen (se info om de individuelle enheder). Ligesom "
"søenheder kan flyenheder ikke overtage tomme fjendtlige byer. Udenfor byer "
"kan flyenheder kun angribes af kampfly. Flyenheder kan ikke blive brugt til "
-"at udforske hytter, men hvis serveren er indstillet til det, kan hytter som "
-"bliver overfløjet blive ødelagt."
+"at udforske landsbyer, men hvis serveren er indstillet til det, kan "
+"landsbyer som bliver overfløjet blive ødelagt."
#: data/helpdata.txt:952
msgid ""
@@ -17716,7 +17884,7 @@ msgstr ""
"Den enhed som overlever kampen har mulighed for at blive veteran, hvis den "
"ikke allerede er det. Hvis vinderens civilisation har Sun Tzus Krigsakademi "
"(og det ikke er forældet), bliver enheden altid veteran. Ellers er chancen "
-"for at blive veteran 50%."
+"for at blive veteran 50 %."
#: data/helpdata.txt:1068
msgid ""
@@ -17809,8 +17977,8 @@ msgid ""
"hit point. Otherwise (about a 72% chance), the attacker loses 1 point."
msgstr ""
"Hver kamprunde bliver et tilfældigt tal mellem 1 og 282 genereret. Hvis "
-"tallet er større end 202 (omtrent 28% chance), så taber forsvareren 1 "
-"træfpoint. Ellers (omtrent 72% chance), så mister angriberen 1 træfpoint."
+"tallet er større end 202 (omtrent 28 % chance), så taber forsvareren 1 "
+"træfpoint. Ellers (omtrent 72 % chance), så mister angriberen 1 træfpoint."
#: data/helpdata.txt:1117
#, no-c-format
@@ -17822,7 +17990,7 @@ msgid ""
"might lose most of its hit points, or it might even lose the battle."
msgstr ""
"Siden begge enheder har 20 træfpoint er det mest sandsynligt at forsvareren "
-"vinder. Forsvareren kommer nok til at tabe omtrent 40% af sine træfpoint "
+"vinder. Forsvareren kommer nok til at tabe omtrent 40 % af sine træfpoint "
"under kampen. Men udfaldet er aldrig sikkert så længe begge enheder har "
"styrke større end nul;\n"
"forsvareren kan komme derfra uskadt, eller tabe de fleste af sine træfpoint, "
@@ -17879,8 +18047,8 @@ msgid ""
"the attacker loses 1 hit point."
msgstr ""
"Hver runde bliver et tilfældig tal mellem 1 og 405 genereret. Hvis det er "
-"større end 225 (ca. 44% chance) så taber forsvareren 1 træfkapacitet. Hvis "
-"ikke, taber angriber 1 af sin træfkapacitet."
+"større end 225 (cirka 44 % chance) så taber forsvareren 1 træfkapacitet. "
+"Hvis ikke, taber angriber 1 af sin træfkapacitet."
#: data/helpdata.txt:1159
#, no-c-format
@@ -17892,8 +18060,8 @@ msgid ""
"points left."
msgstr ""
"I dette tilfælde er det mest sandsynligt, at angriberen vinder. Slagskibet "
-"har 25% mindre chance for at ramme i en runde, men slagskibet har dobbelt så "
-"mange træfpoint. Slagskibet bør forvente at miste omtrent 60% af sine "
+"har 25 % mindre chance for at ramme i en runde, men slagskibet har dobbelt "
+"så mange træfpoint. Slagskibet bør forvente at miste omtrent 60 % af sine "
"træfpoint i løbet af kampen, og ikke have nogen flyttepoint igen."
#: data/helpdata.txt:1168
@@ -18054,8 +18222,8 @@ msgid ""
"Some types of terrain can be mined, which increases the number of resources "
"(shields) produced by that square."
msgstr ""
-"Nogen terræntyper kan have minedrift, som øger antallet ressurser (skjolde) "
-"som bliver produceret på det felt."
+"Nogen terræntyper kan have minedrift, som øger antallet af ressourcer "
+"(skjolde), som bliver produceret på det felt."
#: data/helpdata.txt:1250
msgid ""
@@ -18089,7 +18257,7 @@ msgstr ""
msgid ""
" - A road may increase the trade resources produced by some types of terrain."
msgstr ""
-" - En vej kan øge handelsressursene som bliver produceret af nogen "
+" - En vej kan øge handelsressourcerne som bliver produceret af nogen "
"terræntyper."
#: data/helpdata.txt:1264
@@ -18098,10 +18266,10 @@ msgid ""
"(Depending on server options, railroads may also increase food and trade "
"resources, or may increase shield resources by an amount other than 50%.)"
msgstr ""
-" - En jernbane øger skjold-ressurserne produceret på et felt med 50%. "
+" - En jernbane øger skjoldressourcerne produceret på et felt med 50 %. "
"(Afhængigt af serveralternativene, kan jernbanen også øge mad- og "
-"handelsressurser, eller den kan øge skjoldressurserne med en størrelse "
-"forskellig fra 50%.)"
+"handelsressourcer, eller den kan øge skjoldressourcerne med en størrelse "
+"forskellig fra 50 %.)"
#: data/helpdata.txt:1269
msgid ""
@@ -18306,8 +18474,8 @@ msgid ""
msgstr ""
"At miste hovedstaden fører ikke altid til borgerkrig. Hvis du har behandlet "
"dit folk med godhed, er chancerne større for at folket er loyale mod dig. "
-"Hver by som fejrer reducerer chancerne for borgerkrig, mens hver by med "
-"oprør øger chancerne."
+"Hver by som afholder festivitas reducerer chancerne for borgerkrig, mens "
+"hver by med oprør øger chancerne."
#: data/helpdata.txt:1376
msgid ""
@@ -18507,7 +18675,7 @@ msgid ""
"board may not survive the journey. This reduces the score bonus from the "
"spaceship, but it still counts as a win."
msgstr ""
-"Hvis sandsynligheden for succes er under 100%, kan det hænde at en brøkdel "
+"Hvis sandsynligheden for succes er under 100 %, kan det hænde at en brøkdel "
"af befolkningen ombord ikke overlever rejsen. Dette mindsker pointsum-"
"bonusen fra rumskibet, men det tæller stadig som en sejr."
@@ -18587,7 +18755,7 @@ msgid ""
"turn without moving are completely restored."
msgstr ""
"Med barakker bliver alle nye landenheder veteraner. Det betyder at deres "
-"angrebs- og forsvars-styrke øger med 50%. Skadede landenheder som bliver i "
+"angrebs- og forsvars-styrke øger med 50 %. Skadede landenheder som bliver i "
"byen for en hel runde uden at flytte sig bliver repareret fuldstændigt."
#: data/default/buildings.ruleset:137 data/civ2/buildings.ruleset:119
@@ -18668,7 +18836,7 @@ msgid ""
"Courthouse makes 1 unhappy citizen content. Also makes the revolt cost of "
"the city 4 times bigger."
msgstr ""
-"Reducerer korruptionen i en by med 50%. Under et demokrati vil en retssal "
+"Reducerer korruptionen i en by med 50 %. Under et demokrati vil en retssal "
"gøre en ulykkelig borger glad. Gør også oprørsomkostningen for byen 4 gange "
"så stor. "
@@ -18683,7 +18851,7 @@ msgid ""
"Increases the shield production in a city by 50%. This increase may also "
"contribute significantly to pollution."
msgstr ""
-"Øger skjold-produktionen i en by med 50%. Det fører også til at forureningen "
+"Øger skjoldproduktionen i en by med 50 %. Det fører også til at forureningen "
"øges betragteligt."
#: data/default/buildings.ruleset:331 data/civ2/buildings.ruleset:310
@@ -18706,7 +18874,7 @@ msgid ""
"Gives one extra food resource on all Ocean squares. The city needs to be "
"coastal to build this improvement."
msgstr ""
-"Giver en ekstra mad-resurse på alle vandfelter. Byen behøver at være i "
+"Giver en ekstra madressource på alle vandfelter. Byen behøver at være i "
"nærheden af vand for at bygge denne forbedring."
#: data/default/buildings.ruleset:362 data/civ2/buildings.ruleset:341
@@ -18722,46 +18890,43 @@ msgid ""
"a Factory, Mfg. Plant and Hydro Plant together give a 150% production "
"bonus.\n"
"\n"
-"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant. A city "
-"can only build a Hydro Plant if it is next to (or on) a Mountain or River "
-"tile."
+"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant."
msgstr ""
-"Reducerer mængden af forurening genereret af en by med 50%. Det øger skjold-"
-"produktionen fra en fabrik eller et fabrikskompleks i byen: en fabrik og et "
-"fabrikskompleks giver til sammen 75% produktionsbonus, og en fabrik, et "
-"fabrikskompleks og et vandkraftværk giver tilsammen 150% produktionsbonus.\n"
+"Reducerer mængden af forurening fra produktion i en by med 50 %. Det øger "
+"også skjoldproduktionen fra en fabrik eller et fabrikskompleks i byen: En "
+"fabrik og et vandkraftværk giver tilsammen 75 % produktionsbonus, og en "
+"fabrik, et fabrikskompleks og et vandkraftværk giver tilsammen 150 % "
+"produktionsbonus.\n"
"\n"
-"En by kan kun have et vandkraftværk, kraftværk eller atomkraftværk. En by "
-"kan kun bygge vandkraftværk hvis den er ved siden af (eller på) et fjeld "
-"eller en flod."
+"En by kan kun have et vandkraftværk, kraftværk eller atomkraftværk."
-#: data/default/buildings.ruleset:397 data/civ2/buildings.ruleset:373
+#: data/default/buildings.ruleset:396 data/civ2/buildings.ruleset:373
#: data/civ1/buildings.ruleset:297
msgid "Library"
msgstr "Bibliotek"
-#: data/default/buildings.ruleset:412
+#: data/default/buildings.ruleset:411
#, no-c-format
msgid "Increases the science output in a city by 100%."
msgstr "Øger byens forskningsbidrag med 100 %."
-#: data/default/buildings.ruleset:417 data/civ2/buildings.ruleset:393
+#: data/default/buildings.ruleset:416 data/civ2/buildings.ruleset:393
#: data/civ1/buildings.ruleset:317
msgid "Marketplace"
msgstr "Markedsplads"
-#: data/default/buildings.ruleset:432 data/civ2/buildings.ruleset:408
+#: data/default/buildings.ruleset:431 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 "Øger byens luksus- og skattebidrag med 50 %."
-#: data/default/buildings.ruleset:437 data/civ2/buildings.ruleset:413
+#: data/default/buildings.ruleset:436 data/civ2/buildings.ruleset:413
#: data/civ1/buildings.ruleset:337
msgid "Mass Transit"
msgstr "Kollektiv trafik"
-#: data/default/buildings.ruleset:451 data/civ2/buildings.ruleset:427
+#: data/default/buildings.ruleset:450 data/civ2/buildings.ruleset:427
#: data/civ1/buildings.ruleset:351
msgid ""
"Neutralizes the pollution generated by the population. The population "
@@ -18770,12 +18935,12 @@ msgstr ""
"Neutraliserer forureningen genereret af befolkningen. Befolkningen har "
"absolut ingen effekt på forureningen fra byen."
-#: data/default/buildings.ruleset:458 data/civ2/buildings.ruleset:434
+#: data/default/buildings.ruleset:457 data/civ2/buildings.ruleset:434
#: data/civ1/buildings.ruleset:358
msgid "Mfg. Plant"
msgstr "Fabrikskompleks"
-#: data/default/buildings.ruleset:474 data/civ2/buildings.ruleset:450
+#: data/default/buildings.ruleset:473 data/civ2/buildings.ruleset:450
#: data/civ1/buildings.ruleset:374
#, no-c-format
msgid ""
@@ -18783,14 +18948,14 @@ msgid ""
"production in a city by 100%."
msgstr ""
"Sammen med en fabrik øger et fabrikskompleks skjoldproduktionen i en by med "
-"100%."
+"100 %."
-#: data/default/buildings.ruleset:480 data/civ2/buildings.ruleset:456
+#: data/default/buildings.ruleset:479 data/civ2/buildings.ruleset:456
#: data/civ1/buildings.ruleset:380
msgid "Nuclear Plant"
msgstr "Atomkraftværk"
-#: data/default/buildings.ruleset:495
+#: data/default/buildings.ruleset:494
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 "
@@ -18800,32 +18965,32 @@ msgid ""
"\n"
"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant."
msgstr ""
-"Reducerer mængden af forurening fra produktion i en by med 50%. Det øger "
+"Reducerer mængden af forurening fra produktion i en by med 50 %. Det øger "
"også skjoldproduktionen fra en fabrik eller et fabrikskompleks i byen: en "
-"fabrik og et atomkraftværk giver tilsammen 75% produktionsbonus, og en "
-"fabrik, et fabrikskompleks og et atomkraftværk giver tilsammen 150% "
+"fabrik og et atomkraftværk giver tilsammen 75 % produktionsbonus, og en "
+"fabrik, et fabrikskompleks og et atomkraftværk giver tilsammen 150 % "
"produktionsbonus.\n"
"\n"
"En by kan kun have et vandkraftværk, kraftværk eller atomkraftværk."
-#: data/default/buildings.ruleset:515 data/civ2/buildings.ruleset:489
+#: data/default/buildings.ruleset:514 data/civ2/buildings.ruleset:489
msgid "Offshore Platform"
msgstr "Olieplatform"
-#: data/default/buildings.ruleset:530 data/civ2/buildings.ruleset:504
+#: data/default/buildings.ruleset:529 data/civ2/buildings.ruleset:504
msgid ""
"Adds 1 extra shield resource on all Ocean squares in a city. The city needs "
"to be coastal to build this improvement."
msgstr ""
-"Lægger til 1 ekstra skjold-resurse på alle vandfelter i byen. Byen skal være "
-"en kystby for at bygge denne forbedring."
+"Lægger til 1 ekstra skjoldressource på alle vandfelter i byen. Byen skal "
+"være en kystby for at bygge denne forbedring."
-#: data/default/buildings.ruleset:536 data/civ2/buildings.ruleset:510
+#: data/default/buildings.ruleset:535 data/civ2/buildings.ruleset:510
#: data/civ1/buildings.ruleset:411
msgid "Palace"
msgstr "Slot"
-#: data/default/buildings.ruleset:552
+#: data/default/buildings.ruleset:551
#, no-c-format
msgid ""
"Makes a city the capital and the center of your government. Corruption in "
@@ -18850,14 +19015,14 @@ msgstr ""
"Pas godt på hovedstaden, hvis du mister den kan hele dit rige komme i "
"borgerkrig. Hvis du mister dit palads så mister du også et eventuelt "
"rumskib.\n"
-"Under despotisme giver paladset også en 75% produktionsbonus, og under "
-"monarki en 50% produktionsbonus."
+"Under despotisme giver paladset også en 75 % produktionsbonus, og under "
+"monarki en 50 % produktionsbonus."
-#: data/default/buildings.ruleset:569 data/civ2/buildings.ruleset:539
+#: data/default/buildings.ruleset:568 data/civ2/buildings.ruleset:539
msgid "Police Station"
msgstr "Politistation"
-#: data/default/buildings.ruleset:583 data/civ2/buildings.ruleset:553
+#: data/default/buildings.ruleset:582 data/civ2/buildings.ruleset:553
msgid ""
"Reduces the unhappiness caused by military units outside the city by 2 under "
"Democracy and 1 under Republic. This improvement has no effect under other "
@@ -18867,11 +19032,11 @@ msgstr ""
"under demokrati og 1 under republik. Denne forbedring har ingen effekt under "
"andre styreformer."
-#: data/default/buildings.ruleset:593 data/civ2/buildings.ruleset:560
+#: data/default/buildings.ruleset:592 data/civ2/buildings.ruleset:560
msgid "Port Facility"
msgstr "Havneområde"
-#: data/default/buildings.ruleset:608 data/civ2/buildings.ruleset:575
+#: data/default/buildings.ruleset:607 data/civ2/buildings.ruleset:575
msgid ""
"Allows a city to build veteran sea units. Also, damaged sea units which "
"stay in town for one full turn without moving are completely restored."
@@ -18879,12 +19044,12 @@ msgstr ""
"Tillader en by at bygge veteran-søenheder. Desuden bliver skadede søenheder "
"som bliver i byen en hel runde uden at bevæge sig helt repareret."
-#: data/default/buildings.ruleset:615 data/civ2/buildings.ruleset:582
+#: data/default/buildings.ruleset:614 data/civ2/buildings.ruleset:582
#: data/civ1/buildings.ruleset:440
msgid "Power Plant"
msgstr "Kulkraftværk"
-#: data/default/buildings.ruleset:631
+#: data/default/buildings.ruleset:630
#, no-c-format
msgid ""
"Increases the shield production of a Factory or Mfg. Plant in a city: a "
@@ -18895,18 +19060,18 @@ msgid ""
"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant."
msgstr ""
"Det øger skjoldproduktionen fra en fabrik eller et fabrikskompleks i en by: "
-"en fabrik og et fabrikskompleks giver til sammen 75% produktionsbonus, og "
-"en fabrik, et fabrikskompleks og et kraftværk giver tilsammen 150% "
+"en fabrik og et fabrikskompleks giver til sammen 75 % produktionsbonus, og "
+"en fabrik, et fabrikskompleks og et kraftværk giver tilsammen 150 % "
"produktionsbonus.\n"
"\n"
"En by kan kun have et vandkraftværk, kraftværk eller atomkraftværk. "
-#: data/default/buildings.ruleset:646 data/civ2/buildings.ruleset:610
+#: data/default/buildings.ruleset:645 data/civ2/buildings.ruleset:610
#: data/civ1/buildings.ruleset:468
msgid "Recycling Center"
msgstr "Genbrugsstation"
-#: data/default/buildings.ruleset:661 data/civ2/buildings.ruleset:625
+#: data/default/buildings.ruleset:660 data/civ2/buildings.ruleset:625
#: data/civ1/buildings.ruleset:483
#, no-c-format
msgid ""
@@ -18914,27 +19079,27 @@ msgid ""
"production in a city by 66%."
msgstr ""
"At bygge et genbrugscenter reducerer mængden af forurening genereret af "
-"produktion i en by med 66%."
+"produktion i en by med 66 %."
-#: data/default/buildings.ruleset:667 data/civ2/buildings.ruleset:631
+#: data/default/buildings.ruleset:666 data/civ2/buildings.ruleset:631
msgid "Research Lab"
msgstr "Forskningslaboratorium"
-#: data/default/buildings.ruleset:682
+#: data/default/buildings.ruleset:681
msgid ""
"Together with a Library, a Research Lab increases the science production of "
"a city by 200%. Together with a Library and a University, a Research Lab "
"increases the science production of a city by 450%."
msgstr ""
"Sammen med et bibliotek øger et forskningslaboratorium forskningen i en by "
-"med 200%. Sammen med et bibliotek og et universitet øger et "
-"forskningslaboratorium forskningen i en by med 450%."
+"med 200 %. Sammen med et bibliotek og et universitet øger et "
+"forskningslaboratorium forskningen i en by med 450 %."
-#: data/default/buildings.ruleset:690 data/civ2/buildings.ruleset:654
+#: data/default/buildings.ruleset:689 data/civ2/buildings.ruleset:654
msgid "SAM Battery"
msgstr "SAM-batteri"
-#: data/default/buildings.ruleset:704 data/civ2/buildings.ruleset:668
+#: data/default/buildings.ruleset:703 data/civ2/buildings.ruleset:668
msgid ""
"Doubles the defense of all units inside the city when attacked by non-"
"nuclear air units."
@@ -18942,12 +19107,12 @@ msgstr ""
"Dobler forsvaret af alle enheder inde i en by når de bliver angrebet af "
"flyenheder uden atomvåben."
-#: data/default/buildings.ruleset:710 data/civ2/buildings.ruleset:674
+#: data/default/buildings.ruleset:709 data/civ2/buildings.ruleset:674
#: data/civ1/buildings.ruleset:489
msgid "SDI Defense"
msgstr "SDI-forsvar"
-#: data/default/buildings.ruleset:724 data/civ2/buildings.ruleset:688
+#: data/default/buildings.ruleset:723 data/civ2/buildings.ruleset:688
#: data/civ1/buildings.ruleset:503
msgid ""
"Protects a city from attacks from Nuclear units. Nuclear attacks simply "
@@ -18957,12 +19122,12 @@ msgstr ""
"Beskytter en by mod angreb fra atomenheder. Atomangreb har ingen effekt i "
"byen. Og den dobler forsvaret mod ikke-atombaserede missiler."
-#: data/default/buildings.ruleset:733 data/civ2/buildings.ruleset:697
+#: data/default/buildings.ruleset:732 data/civ2/buildings.ruleset:697
msgid "Sewer System"
msgstr "Kloaksystem"
# problem
-#: data/default/buildings.ruleset:748 data/civ2/buildings.ruleset:712
+#: data/default/buildings.ruleset:747 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."
@@ -18970,12 +19135,12 @@ msgstr ""
"Tillader en by at vokse sig større end størrelse 12. Akvædukt er først "
"krævet når en by skal vokse sig større end 8."
-#: data/default/buildings.ruleset:754 data/civ2/buildings.ruleset:749
+#: data/default/buildings.ruleset:753 data/civ2/buildings.ruleset:749
#: data/civ1/buildings.ruleset:512
msgid "Space Component"
msgstr "Rumkomponent"
-#: data/default/buildings.ruleset:769 data/civ2/buildings.ruleset:763
+#: data/default/buildings.ruleset:768 data/civ2/buildings.ruleset:763
#: data/civ1/buildings.ruleset:526
msgid ""
"Space Components can be differentiated into Propulsion and Fuel Components. "
@@ -18991,12 +19156,12 @@ msgstr ""
"Før du kan bygge nogen rumkomponenter skal en spiller have bygget "
"Apolloprogrammet."
-#: data/default/buildings.ruleset:779 data/civ2/buildings.ruleset:773
+#: data/default/buildings.ruleset:778 data/civ2/buildings.ruleset:773
#: data/civ1/buildings.ruleset:536
msgid "Space Module"
msgstr "Rum-modul"
-#: data/default/buildings.ruleset:794 data/civ2/buildings.ruleset:787
+#: data/default/buildings.ruleset:793 data/civ2/buildings.ruleset:787
#: data/civ1/buildings.ruleset:550
msgid ""
"Space Modules are the most expensive parts of spaceships. There are three "
@@ -19029,12 +19194,12 @@ msgstr ""
"Før man kan bygge nogen rumskibsdele skal en spiller have bygget vidunderet "
"Apolloprogrammet."
-#: data/default/buildings.ruleset:813 data/civ2/buildings.ruleset:806
+#: data/default/buildings.ruleset:812 data/civ2/buildings.ruleset:806
#: data/civ1/buildings.ruleset:569
msgid "Space Structural"
msgstr "Rumstruktur"
-#: data/default/buildings.ruleset:828 data/civ2/buildings.ruleset:820
+#: data/default/buildings.ruleset:827 data/civ2/buildings.ruleset:820
#: data/civ1/buildings.ruleset:583
msgid ""
"Space Structurals form the base of your spaceship. All other spaceship "
@@ -19051,51 +19216,51 @@ msgstr ""
"Før man kan bygge nogen rumskibsdele skal en spiller have bygget vidunderet "
"Apolloprogrammet."
-#: data/default/buildings.ruleset:838 data/civ2/buildings.ruleset:830
+#: data/default/buildings.ruleset:837 data/civ2/buildings.ruleset:830
msgid "Stock Exchange"
msgstr "Børs"
-#: data/default/buildings.ruleset:854 data/civ2/buildings.ruleset:846
+#: data/default/buildings.ruleset:853 data/civ2/buildings.ruleset:846
#, no-c-format
msgid ""
"Together with a Marketplace and a Bank, a Stock Exchange boosts tax and "
"luxury production in a city by 150%."
msgstr ""
"Sammen med en markedsplads og en bank øger børsen skatte- og luksus-"
-"produktionen i en by med 150%."
+"produktionen i en by med 150 %."
-#: data/default/buildings.ruleset:860 data/civ2/buildings.ruleset:852
+#: data/default/buildings.ruleset:859 data/civ2/buildings.ruleset:852
msgid "Super Highways"
msgstr "Motorveje"
-#: data/default/buildings.ruleset:875 data/civ2/buildings.ruleset:867
+#: data/default/buildings.ruleset:874 data/civ2/buildings.ruleset:867
#, no-c-format
msgid ""
"Increases trade resources by 50% on all squares with roads or railroads."
msgstr ""
-"Øger handelsressurserne med 50% på alle felter med veje eller jernbaner."
+"Øger handelsressourcerne med 50 % på alle felter med veje eller jernbaner."
-#: data/default/buildings.ruleset:883 data/civ2/buildings.ruleset:873
+#: data/default/buildings.ruleset:882 data/civ2/buildings.ruleset:873
msgid "Supermarket"
msgstr "Supermarked"
-#: data/default/buildings.ruleset:898 data/civ2/buildings.ruleset:888
+#: data/default/buildings.ruleset:897 data/civ2/buildings.ruleset:888
#, no-c-format
msgid ""
"Increases the food resources by 50% on each farmland square which is being "
"used around the city. Farmland squares are those which have been irrigated "
"a second time."
msgstr ""
-"Øger madressourcerne med 50% på hvert felt med landbrugsjord som bliver "
+"Øger madressourcerne med 50 % på hvert felt med landbrugsjord som bliver "
"brugt omkring byen. Landbrugsjord er de felter som er blevet overrislet en "
"ekstra gang."
-#: data/default/buildings.ruleset:905 data/civ2/buildings.ruleset:895
+#: data/default/buildings.ruleset:904 data/civ2/buildings.ruleset:895
#: data/civ1/buildings.ruleset:593
msgid "Temple"
msgstr "Tempel"
-#: data/default/buildings.ruleset:919 data/civ2/buildings.ruleset:909
+#: data/default/buildings.ruleset:918 data/civ2/buildings.ruleset:909
#: data/civ1/buildings.ruleset:607
msgid ""
"Makes one unhappy citizen content. Both the Mysticism advance and the "
@@ -19105,13 +19270,13 @@ msgstr ""
"Gør en ulykkelig borger glad. Både Mystisisme og Orakel vidunderet dobler "
"denne effekt. Med Mystisisme og Orakel bliver 4 borgere glade."
-#: data/default/buildings.ruleset:926 data/civ2/buildings.ruleset:916
+#: data/default/buildings.ruleset:925 data/civ2/buildings.ruleset:916
#: data/civ1/buildings.ruleset:614 data/default/techs.ruleset:742
#: data/civ2/techs.ruleset:727 data/civ1/techs.ruleset:723
msgid "University"
msgstr "Universitet"
-#: data/default/buildings.ruleset:942
+#: data/default/buildings.ruleset:941
#, no-c-format
msgid ""
"Together with a Library, a University increases the science production of a "
@@ -19120,12 +19285,12 @@ msgstr ""
"Sammen med bibliotek vil et universitet øge forskningsproduktionen i en by "
"med 250 %."
-#: data/default/buildings.ruleset:948 data/civ2/buildings.ruleset:938
+#: data/default/buildings.ruleset:947 data/civ2/buildings.ruleset:938
#: data/civ1/buildings.ruleset:636
msgid "Apollo Program"
msgstr "Apollo-programmet"
-#: data/default/buildings.ruleset:962 data/civ2/buildings.ruleset:952
+#: data/default/buildings.ruleset:961 data/civ2/buildings.ruleset:952
msgid ""
"Entire map becomes visible for the player who owns it. It allows all "
"players to start building spaceship parts (assuming they have researched the "
@@ -19135,11 +19300,11 @@ msgstr ""
"spillere begynde med at bygge rumskibsdele (hvis de har forsket på de "
"nødvendige teknologier)."
-#: data/default/buildings.ruleset:969 data/civ2/buildings.ruleset:959
+#: data/default/buildings.ruleset:968 data/civ2/buildings.ruleset:959
msgid "A.Smith's Trading Co."
msgstr "Adam Smiths Handelsselskab"
-#: data/default/buildings.ruleset:983
+#: data/default/buildings.ruleset:982
msgid ""
"City improvements which would normally have an upkeep of 1 are free of "
"upkeep, for all your cities."
@@ -19147,37 +19312,37 @@ msgstr ""
"Byforbedringer som normalt vil have udgifter på 1 vil blive gratis i alle "
"dine byer."
-#: data/default/buildings.ruleset:989 data/civ2/buildings.ruleset:979
+#: data/default/buildings.ruleset:988 data/civ2/buildings.ruleset:979
#: data/civ1/buildings.ruleset:655
msgid "Colossus"
msgstr "Kolossen"
-#: data/default/buildings.ruleset:1003 data/civ2/buildings.ruleset:993
+#: data/default/buildings.ruleset:1002 data/civ2/buildings.ruleset:993
#: data/civ1/buildings.ruleset:669
msgid ""
"Each square around the city where this wonder is built that is already "
"generating some trade produces one extra trade resource."
msgstr ""
"Hvert felt omkring byen hvor vidunderet er bygget som allerede genererer "
-"noget handel producerer en ekstra handelsresurse."
+"noget handel producerer en ekstra handelsressource."
-#: data/default/buildings.ruleset:1009 data/civ2/buildings.ruleset:999
+#: data/default/buildings.ruleset:1008 data/civ2/buildings.ruleset:999
#: data/civ1/buildings.ruleset:675
msgid "Copernicus' Observatory"
msgstr "Kopernicus' observatorium"
-#: data/default/buildings.ruleset:1024 data/civ2/buildings.ruleset:1180
+#: data/default/buildings.ruleset:1023 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 "Øger forskningen i byen det er bygget i, med 100%."
+msgstr "Øger forskningen i byen det er bygget i, med 100 %."
-#: data/default/buildings.ruleset:1029 data/civ2/buildings.ruleset:1019
+#: data/default/buildings.ruleset:1028 data/civ2/buildings.ruleset:1019
#: data/civ1/buildings.ruleset:695
msgid "Cure For Cancer"
msgstr "Kur mod kræft"
-#: data/default/buildings.ruleset:1043
+#: data/default/buildings.ruleset:1042
msgid ""
"This stunning technological achievement makes one unhappy citizen content in "
"all your cities."
@@ -19185,12 +19350,12 @@ msgstr ""
"Denne imponerende teknologiske præstation gør en ulykkelig borger glad i "
"alle dine byer."
-#: data/default/buildings.ruleset:1051 data/civ2/buildings.ruleset:1039
+#: data/default/buildings.ruleset:1050 data/civ2/buildings.ruleset:1039
#: data/civ1/buildings.ruleset:715
msgid "Darwin's Voyage"
msgstr "Darwins rejse"
-#: data/default/buildings.ruleset:1065 data/civ2/buildings.ruleset:1053
+#: data/default/buildings.ruleset:1064 data/civ2/buildings.ruleset:1053
#: data/civ1/buildings.ruleset:729
msgid ""
"Charles Darwin's voyage sparked the discovery of the evolution of the "
@@ -19200,11 +19365,11 @@ msgstr ""
"Charles Darwins rejse udløste opdagelsen af udviklingen af arter hvilket "
"øgede troen på videnskab. Giver to umiddelbare teknologiske fremskridt."
-#: data/default/buildings.ruleset:1072 data/civ2/buildings.ruleset:1060
+#: data/default/buildings.ruleset:1071 data/civ2/buildings.ruleset:1060
msgid "Eiffel Tower"
msgstr "Eiffeltårnet"
-#: data/default/buildings.ruleset:1087
+#: data/default/buildings.ruleset:1086
#, no-c-format
msgid ""
"Your reputation and goodwill among other nations is recovered twice as fast."
@@ -19212,12 +19377,12 @@ msgstr ""
"Dit omdømme og goodwill blandt de andre nationer forbedres dobbelt så "
"hurtigt som det ellers ville."
-#: data/default/buildings.ruleset:1093 data/civ2/buildings.ruleset:1081
+#: data/default/buildings.ruleset:1092 data/civ2/buildings.ruleset:1081
#: data/civ1/buildings.ruleset:736
msgid "Great Library"
msgstr "Verdensbiblioteket"
-#: data/default/buildings.ruleset:1107 data/civ2/buildings.ruleset:1095
+#: data/default/buildings.ruleset:1106 data/civ2/buildings.ruleset:1095
#: data/civ1/buildings.ruleset:750
msgid ""
"The civilization which builds the Great Library gets every advance that at "
@@ -19226,21 +19391,21 @@ msgstr ""
"Civilisationen som bygger Verdensbiblioteket får alle fremskridt som mindst "
"to andre civilisationer har opdaget."
-#: data/default/buildings.ruleset:1113 data/civ2/buildings.ruleset:1101
+#: data/default/buildings.ruleset:1112 data/civ2/buildings.ruleset:1101
#: data/civ1/buildings.ruleset:756
msgid "Great Wall"
msgstr "Den Kinesiske Mur"
-#: data/default/buildings.ruleset:1127
+#: data/default/buildings.ruleset:1126
msgid "Works as a City Wall in all your cities."
msgstr "Fungerer som bymur i alle dine byer."
-#: data/default/buildings.ruleset:1135 data/civ2/buildings.ruleset:1122
+#: data/default/buildings.ruleset:1134 data/civ2/buildings.ruleset:1122
#: data/civ1/buildings.ruleset:777
msgid "Hanging Gardens"
msgstr "Hængende Haver"
-#: data/default/buildings.ruleset:1149 data/civ2/buildings.ruleset:1136
+#: data/default/buildings.ruleset:1148 data/civ2/buildings.ruleset:1136
#: data/civ1/buildings.ruleset:791
msgid ""
"Makes one content citizen happy in every city. Makes two extra content "
@@ -19254,12 +19419,12 @@ msgstr ""
"er ingen glade borgere som kan tage effekten af Hængende Haver gælder "
"vidunderet for ulykkelige borgere i stedet (og gør dem glade i stedet)."
-#: data/default/buildings.ruleset:1158 data/civ2/buildings.ruleset:1145
+#: data/default/buildings.ruleset:1157 data/civ2/buildings.ruleset:1145
#: data/civ1/buildings.ruleset:800
msgid "Hoover Dam"
msgstr "Aswan-dæmningen"
-#: data/default/buildings.ruleset:1173 data/civ2/buildings.ruleset:1159
+#: data/default/buildings.ruleset:1172 data/civ2/buildings.ruleset:1159
msgid ""
"Works as if you had a Hydro Plant in every city. (This reduces pollution "
"and increases the effects of Factories and Mfg. Plants.)"
@@ -19267,55 +19432,55 @@ msgstr ""
"Fungerer som om du havde et vandkraftværk i hver by. Dette reducerer "
"forureningen og øger effekten af fabrikker og fabrikskomplekser."
-#: data/default/buildings.ruleset:1179 data/civ2/buildings.ruleset:1165
+#: data/default/buildings.ruleset:1178 data/civ2/buildings.ruleset:1165
#: data/civ1/buildings.ruleset:822
msgid "Isaac Newton's College"
msgstr "Isak Newtons Universitet"
-#: data/default/buildings.ruleset:1194
+#: data/default/buildings.ruleset:1193
#, no-c-format
msgid ""
"Boosts science production by 100% in every city you control that has a "
"University."
msgstr ""
-"Øger forskningen med 100 % i alle byer du kontrollerer som samtidig har et "
+"Øger forskningen med 100 % i alle byer, du kontrollerer, som samtidig har et "
"universitet."
-#: data/default/buildings.ruleset:1200 data/civ2/buildings.ruleset:1185
+#: data/default/buildings.ruleset:1199 data/civ2/buildings.ruleset:1185
#: data/civ1/buildings.ruleset:842
msgid "J.S. Bach's Cathedral"
msgstr "J.S. Bachs Domkirke"
-#: data/default/buildings.ruleset:1214 data/civ2/buildings.ruleset:1199
+#: data/default/buildings.ruleset:1213 data/civ2/buildings.ruleset:1199
msgid "Makes two unhappy citizens content in every city."
msgstr "Gør to ulykkelige indbyggere glade i hver by."
-#: data/default/buildings.ruleset:1219 data/civ2/buildings.ruleset:1204
+#: data/default/buildings.ruleset:1218 data/civ2/buildings.ruleset:1204
msgid "King Richard's Crusade"
msgstr "Rikard Løvehjertes Korstog"
-#: data/default/buildings.ruleset:1233 data/civ2/buildings.ruleset:1218
+#: data/default/buildings.ruleset:1232 data/civ2/buildings.ruleset:1218
msgid ""
"Adds one extra shield resource on every square around the city where it is "
"built."
msgstr ""
-"Lægger til en ekstra skjoldressurse på hvert felt omkring byen hvor den "
+"Lægger til en ekstra skjoldressource på hvert felt omkring byen hvor den "
"bygges."
-#: data/default/buildings.ruleset:1239 data/civ2/buildings.ruleset:1224
+#: data/default/buildings.ruleset:1238 data/civ2/buildings.ruleset:1224
msgid "Leonardo's Workshop"
msgstr "Leonardos Arbejdsværelse"
-#: data/default/buildings.ruleset:1253 data/civ2/buildings.ruleset:1238
+#: data/default/buildings.ruleset:1252 data/civ2/buildings.ruleset:1238
msgid "Upgrades one obsolete unit per game turn."
msgstr "Opgraderer en forældet enhed hver spilrunde."
-#: data/default/buildings.ruleset:1258 data/civ2/buildings.ruleset:1243
+#: data/default/buildings.ruleset:1257 data/civ2/buildings.ruleset:1243
#: data/civ1/buildings.ruleset:862
msgid "Lighthouse"
msgstr "Fyrtårn"
-#: data/default/buildings.ruleset:1273
+#: data/default/buildings.ruleset:1272
msgid ""
"Gives all your sea units 1 additional movement point and eliminates the risk "
"of losing Triremes on the high seas. Makes all your new sea units veterans "
@@ -19325,34 +19490,34 @@ msgstr ""
"miste trierer på havet. Gør alle nye søenheder til veteraner (i alle dine "
"byer)."
-#: data/default/buildings.ruleset:1280 data/civ2/buildings.ruleset:1264
+#: data/default/buildings.ruleset:1279 data/civ2/buildings.ruleset:1264
#: data/civ1/buildings.ruleset:885
msgid "Magellan's Expedition"
msgstr "Magellans ekspedition"
-#: data/default/buildings.ruleset:1295
+#: data/default/buildings.ruleset:1294
msgid "Gives all your sea units 2 additional movement points."
msgstr "Giver alle dine søenheder 2 ekstra flyttepoint."
-#: data/default/buildings.ruleset:1300 data/civ2/buildings.ruleset:1283
+#: data/default/buildings.ruleset:1299 data/civ2/buildings.ruleset:1283
#: data/civ1/buildings.ruleset:904
msgid "Manhattan Project"
msgstr "Manhattanprojektet"
-#: data/default/buildings.ruleset:1318 data/civ2/buildings.ruleset:1301
+#: data/default/buildings.ruleset:1317 data/civ2/buildings.ruleset:1301
msgid "Marco Polo's Embassy"
msgstr "Marco Polos ambassade"
-#: data/default/buildings.ruleset:1332 data/civ2/buildings.ruleset:1315
+#: data/default/buildings.ruleset:1331 data/civ2/buildings.ruleset:1315
msgid "The player who owns it gets an embassy with all players."
msgstr "Spilleren som ejer den, får en ambassade hos alle spillerne."
-#: data/default/buildings.ruleset:1337 data/civ2/buildings.ruleset:1320
+#: data/default/buildings.ruleset:1336 data/civ2/buildings.ruleset:1320
#: data/civ1/buildings.ruleset:922
msgid "Michelangelo's Chapel"
msgstr "Det Sixtinske Kapel"
-#: data/default/buildings.ruleset:1351 data/civ2/buildings.ruleset:1334
+#: data/default/buildings.ruleset:1350 data/civ2/buildings.ruleset:1334
msgid ""
"Counts as having a Cathedral in each of your cities. This makes 3 unhappy "
"citizens content in each city. The discovery of Theology increases the "
@@ -19365,55 +19530,55 @@ msgstr ""
"katedral ved at gør yderligere en ulykkelig borger glad. Opdagelsen af "
"kommunisme mindsker antallet med 1."
-#: data/default/buildings.ruleset:1361 data/civ2/buildings.ruleset:1344
+#: data/default/buildings.ruleset:1360 data/civ2/buildings.ruleset:1344
#: data/civ1/buildings.ruleset:941
msgid "Oracle"
msgstr "Oraklet"
-#: data/default/buildings.ruleset:1375
+#: data/default/buildings.ruleset:1374
msgid "Makes two of your unhappy citizens content in every city with a temple."
msgstr "Gør to ulykkelige indbyggere glade i hver by med et tempel."
-#: data/default/buildings.ruleset:1380 data/civ2/buildings.ruleset:1363
+#: data/default/buildings.ruleset:1379 data/civ2/buildings.ruleset:1363
#: data/civ1/buildings.ruleset:960
msgid "Pyramids"
msgstr "Pyramider"
-#: data/default/buildings.ruleset:1394
+#: data/default/buildings.ruleset:1393
msgid ""
"The amount of stored food lost when one of your cities grows or shrinks is "
"reduced by 25%. This helps a city to grow faster and more easily withstand "
"famine. Cumulative with Granary."
msgstr ""
"Antallet af opmaganiseret mad som tabes når en af dine byer vokser eller "
-"mindskes i størrelse reduceres med 25%. Dette hjælper byen med at vokse "
+"mindskes i størrelse reduceres med 25 %. Dette hjælper byen med at vokse "
"hurtigere og bedre modstå sult. Er kumulativ med Kornlager."
-#: data/default/buildings.ruleset:1401 data/civ2/buildings.ruleset:1382
+#: data/default/buildings.ruleset:1400 data/civ2/buildings.ruleset:1382
#: data/civ1/buildings.ruleset:981
msgid "SETI Program"
msgstr "SETI-programmet"
-#: data/default/buildings.ruleset:1415
+#: data/default/buildings.ruleset:1414
msgid "Boosts science production in each city with a Research Lab by 100%. "
msgstr ""
"Øger forskningen i hver by der har et forskningslaboratorium med 100 %. "
-#: data/default/buildings.ruleset:1420 data/civ2/buildings.ruleset:1402
+#: data/default/buildings.ruleset:1419 data/civ2/buildings.ruleset:1402
#: data/civ1/buildings.ruleset:1001
msgid "Shakespeare's Theatre"
msgstr "Shakespeares teater"
-#: data/default/buildings.ruleset:1434 data/civ2/buildings.ruleset:1416
+#: data/default/buildings.ruleset:1433 data/civ2/buildings.ruleset:1416
#: data/civ1/buildings.ruleset:1015
msgid "Makes all unhappy citizens content, in the city where it is located."
msgstr "Gør alle ulykkelige borgere glade i byen hvor den er placeret."
-#: data/default/buildings.ruleset:1439 data/civ2/buildings.ruleset:1421
+#: data/default/buildings.ruleset:1438 data/civ2/buildings.ruleset:1421
msgid "Statue of Liberty"
msgstr "Frihedsstatuen"
-#: data/default/buildings.ruleset:1453 data/civ2/buildings.ruleset:1435
+#: data/default/buildings.ruleset:1452 data/civ2/buildings.ruleset:1435
#: data/civ1/buildings.ruleset:974 data/civ1/buildings.ruleset:1034
msgid ""
"Allows you to choose any government, including those that have not yet been "
@@ -19423,11 +19588,11 @@ msgstr ""
"Lader dig vælge hvilken som helst styreform, inkluderet de som du ikke har "
"forsket frem endnu, uden overgangstid med anarki."
-#: data/default/buildings.ruleset:1460 data/civ2/buildings.ruleset:1442
+#: data/default/buildings.ruleset:1459 data/civ2/buildings.ruleset:1442
msgid "Sun Tzu's War Academy"
msgstr "Sun Tzus Krigsakademi"
-#: data/default/buildings.ruleset:1474
+#: data/default/buildings.ruleset:1473
msgid ""
"All your new ground units start at the first veteran level. The chance of a "
"unit getting the next veteran level after a battle increases by half."
@@ -19435,21 +19600,21 @@ msgstr ""
"Alle din nye landenheder bliver veteraner på første niveau. Chancen for at "
"en enhed opnår næste veteranniveau efter en kamp øges med halvdelen."
-#: data/default/buildings.ruleset:1481 data/civ2/buildings.ruleset:1463
+#: data/default/buildings.ruleset:1480 data/civ2/buildings.ruleset:1463
#: data/civ1/buildings.ruleset:1020
msgid "United Nations"
msgstr "Forenede Nationer"
-#: data/default/buildings.ruleset:1495
+#: data/default/buildings.ruleset:1494
msgid "All your units regain two extra hitpoints per turn."
msgstr "Alle dine enheder gendanner to ekstra træfpoint per runde."
-#: data/default/buildings.ruleset:1508 data/civ2/buildings.ruleset:1490
+#: data/default/buildings.ruleset:1507 data/civ2/buildings.ruleset:1490
#: data/civ1/buildings.ruleset:1046
msgid "Women's Suffrage"
msgstr "Stemmeret for kvinder"
-#: data/default/buildings.ruleset:1522 data/civ2/buildings.ruleset:1504
+#: data/default/buildings.ruleset:1521 data/civ2/buildings.ruleset:1504
msgid ""
"Counts as a Police Station in every city. (That is, for each city, reduces "
"unhappiness for military units outside the city by 2 under Democracy and 1 "
@@ -19459,11 +19624,11 @@ msgstr ""
"ulyksaligheden fra militære enheder uden for byen med 2 under demokrati og 1 "
"under republik. Dette vidunder har ingen effekt under andre styreformer."
-#: data/default/buildings.ruleset:1533
+#: data/default/buildings.ruleset:1532
msgid "Coinage"
msgstr "Kapitalisering"
-#: data/default/buildings.ruleset:1554
+#: data/default/buildings.ruleset:1553
msgid ""
"This is not a normal improvement. Instead, setting a city's production to "
"Coinage means its shield production is converted to tax output (money, "
@@ -19523,7 +19688,7 @@ msgid ""
"Courthouse makes 1 unhappy citizen content. Also halves the effective "
"distance to the capital, for the purpose of calculating revolt cost."
msgstr ""
-"Reducerer korruptionen i en by med 50%. Under et demokrati vil en retssal "
+"Reducerer korruptionen i en by med 50 %. Under et demokrati vil en retssal "
"gøre en ulykkelig borger glad. Desuden halveres den effektive afstand til "
"hovedstaden, med hensigt på at kalkulere oprørsomkostninger."
@@ -19539,10 +19704,10 @@ msgid ""
"can only build a Hydro Plant if it is next to (or on) a Mountain or River "
"tile."
msgstr ""
-"Reducerer mængden af forurening fra produktion i en by med 50%. Det øger "
+"Reducerer mængden af forurening fra produktion i en by med 50 %. Det øger "
"skjoldproduktionen fra en fabrik eller et fabrikskompleks i en by: en fabrik "
-"og et fabrikskompleks giver til sammen 75% produktionsbonus, og en fabrik, "
-"et fabrikskompleks og et vandkraftværk giver tilsammen 150% "
+"og et fabrikskompleks giver til sammen 75 % produktionsbonus, og en fabrik, "
+"et fabrikskompleks og et vandkraftværk giver tilsammen 150 % "
"produktionsbonus.\n"
"\n"
"En by kan kun have et vandkraftværk, kraftværk eller atomkraftværk. En by "
@@ -19552,7 +19717,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 "Øger byens forskningsbidrag med 50%."
+msgstr "Øger byens forskningsbidrag med 50 %."
#: data/civ2/buildings.ruleset:471 data/civ1/buildings.ruleset:395
msgid ""
@@ -19564,10 +19729,10 @@ msgid ""
"\n"
"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant."
msgstr ""
-"Reducerer forureningen fra produktion i en by med 50%. Det reducerer også "
+"Reducerer forureningen fra produktion i en by med 50 %. Det reducerer også "
"skjoldproduktionen fra fabrikker eller fabrikskompleks i en by: en fabrik og "
-"et atomkraftværk giver tilsammen 100% produktionsbonus, og en fabrik, et "
-"fabrikskompleks og et atomkraftværk får tilsammen 150% produktionsbonus.\n"
+"et atomkraftværk giver tilsammen 100 % produktionsbonus, og en fabrik, et "
+"fabrikskompleks og et atomkraftværk får tilsammen 150 % produktionsbonus.\n"
"\n"
"En by kan kun have et vandkraftværk, kraftværk eller atomkraftværk."
@@ -19603,8 +19768,8 @@ msgid ""
"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant."
msgstr ""
"Øger skjoldproduktionen fra en fabrik eller fabrikskompleks i en by: en "
-"fabrik og et fabrikskompleks giver tilsammen 100% produktionsbonus, og et "
-"fabrik, fabrikskompleks og kraftværk giver tilsammen 150% produktionsbonus. "
+"fabrik og et fabrikskompleks giver tilsammen 100 % produktionsbonus, og et "
+"fabrik, fabrikskompleks og kraftværk giver tilsammen 150 % produktionsbonus. "
"Den ekstra produktion kan føre til at byen forurener mere.\n"
"\n"
"En by kan kun have et vandkraftværk, kraftværk eller atomkraftværk."
@@ -19616,8 +19781,8 @@ msgid ""
"increases the science production of a city by 150%."
msgstr ""
"Sammen med et bibliotek øger et forskningslaboratorium forskningen i en by "
-"med 100%. Sammen med et bibliotek og et universitet øger et "
-"forskningslaboratorium forskningen i en by med 150%."
+"med 100 %. Sammen med et bibliotek og et universitet øger et "
+"forskningslaboratorium forskningen i en by med 150 %."
#: data/civ2/buildings.ruleset:718
msgid "Solar Plant"
@@ -19636,8 +19801,9 @@ msgid ""
msgstr ""
"Fjerner al forurening fra produktion i en by. Det øger også "
"skjoldproduktionen fra en fabrik eller et fabrikskompleks i byen: en fabrik "
-"og et solcellekraftværk giver tilsammen 100% produktionsbonus, og en fabrik, "
-"fabrikskompleks og solcellekraftværk giver tilsammen 150% produktionsbonus.\n"
+"og et solcellekraftværk giver tilsammen 100 % produktionsbonus, og en "
+"fabrik, fabrikskompleks og solcellekraftværk giver tilsammen 150 % "
+"produktionsbonus.\n"
"\n"
"En by kan bare have et solcellekraftværk, vandkraftværk, kraftværk eller "
"atomkraftværk."
@@ -19649,7 +19815,7 @@ msgid ""
"city by 100%."
msgstr ""
"Sammen med bibliotek vil et universitet øge forskningsproduktionen i en by "
-"med 100%."
+"med 100 %."
#: data/civ2/buildings.ruleset:973
msgid ""
@@ -19662,7 +19828,7 @@ msgstr ""
#: data/civ2/buildings.ruleset:1014 data/civ1/buildings.ruleset:690
#, no-c-format
msgid "Boosts science production by 50% in the city where it is built."
-msgstr "Øger forskningsproduktionen med 50% i byen den er bygget i."
+msgstr "Øger forskningsproduktionen med 50 % i byen den er bygget i."
#: data/civ2/buildings.ruleset:1033 data/civ1/buildings.ruleset:709
msgid ""
@@ -19711,7 +19877,7 @@ msgid ""
"Boosts science production in each city with a Library by 50%. (Counts as "
"having a Research Lab in all of your cities.)"
msgstr ""
-"Øger forskningen i hver by med et bibliotek med 50%. (Tæller som at have "
+"Øger forskningen i hver by med et bibliotek med 50 %. (Tæller som at have "
"forsknings-laboratorier i alle dine byer.)"
#: data/civ2/buildings.ruleset:1456
@@ -19720,7 +19886,7 @@ msgid ""
"unit becoming a veteran after a battle increases from 50% to 100%."
msgstr ""
"Alle din nye landenheder bliver veteraner (i alle byer). Chancen for at en "
-"enhed bliver veteran efter en kamp øger fra 50% til 100%."
+"enhed bliver veteran efter en kamp øger fra 50 % til 100 %."
#: data/civ2/buildings.ruleset:1477
msgid "Units regain two extra hitpoints per turn."
@@ -19753,7 +19919,7 @@ msgid ""
"without moving are completely restored."
msgstr ""
"Med barakker får alle nye enheder i byen automatisk veteran status, som "
-"betyder at deres angrebs- og forsvars-styrke øges med 50%. Desuden bliver "
+"betyder at deres angrebs- og forsvars-styrke øges med 50 %. Desuden bliver "
"skadede enheder som bliver i byen en hel runde uden at flytte sig "
"fuldstendigt repareret."
@@ -19789,7 +19955,7 @@ msgid ""
"makes 1 unhappy citizen content. Also halves the effective distance to the "
"capital, for the purpose of calculating revolt cost."
msgstr ""
-"Reducerer korruptionen i en by med 50%. Under et demokrati vil en retssal "
+"Reducerer korruptionen i en by med 50 %. Under et demokrati vil en retssal "
"gøre en ulykkelig borger glad. Desuden halveres den effektive afstand til "
"hovedstaden, med hensigt på at kalkulere oprørsomkostninger."
@@ -19832,7 +19998,7 @@ msgstr "Dobler effekten af katedraler, i alle byer."
#: data/civ1/buildings.ruleset:996
#, no-c-format
msgid "Boosts science production in each city by 50%."
-msgstr "Øger forskningen i hver by med 50%."
+msgstr "Øger forskningen i hver by med 50 %."
#: data/civ1/buildings.ruleset:1060
msgid ""
@@ -19896,11 +20062,15 @@ msgstr "?citystyle:Keltisk"
msgid "?citystyle:Industrial"
msgstr "?citystyle:Industriel"
-#: data/default/cities.ruleset:139 data/civ2/cities.ruleset:150
+#: data/default/cities.ruleset:139
+msgid "?citystyle:ElectricAge"
+msgstr "?citystyle:ElektriskeAlder"
+
+#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:150
msgid "?citystyle:Modern"
msgstr "?citystyle:Moderne"
-#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:161
+#: data/default/cities.ruleset:161 data/civ2/cities.ruleset:161
msgid "?citystyle:PostModern"
msgstr "?citystyle:Postmoderne"
@@ -20683,7 +20853,7 @@ msgid ""
msgstr ""
"Alle landskabstyper (undtaget hav) kan have en flod på sig. En flod tilføjer "
"1 handel på ressourcerne som bliver produceret på det felt. Den øger også "
-"feltets forsvarsfaktor med 50%. Landenheder kan flytte sig langs en flod "
+"feltets forsvarsfaktor med 50 %. Landenheder kan flytte sig langs en flod "
"(men ikke diagonalt), bevægelse langs en flod koster kun 1/3 af et "
"flyttepoint.\n"
"\n"
@@ -20749,7 +20919,7 @@ msgid ""
"resources."
msgstr ""
"Foruden at være tilgængelige for landbrug er bakkedrag ofte rige på "
-"ressurser."
+"ressourcer."
#: data/default/terrain.ruleset:371 data/civ2/terrain.ruleset:326
#: data/civ1/terrain.ruleset:316
@@ -21035,7 +21205,7 @@ msgstr ""
"bedre end det en nybygger er i stand til.\n"
"\n"
"Tip 1: Opgradér nybyggere til ingeniører når det er muligt, da ingeniører "
-"kræver de samme ressurser som nybyggere.\n"
+"kræver de samme ressourcer som nybyggere.\n"
"\n"
"Tip 2: Hvis du kan opnår at bygge Leonardos værksted, så forsk på "
"eksplosiver før værkstedet bliver forældet. Da bliver nybyggerne opgraderede "
@@ -21768,7 +21938,7 @@ msgstr ""
"bedre end det en nybygger er i stand til.\n"
"\n"
"Tip 1: Opgradér nybyggere til ingeniører når det er muligt, da ingeniører "
-"kræver de samme ressurser som nybyggere.\n"
+"kræver de samme ressourcer som nybyggere.\n"
"\n"
"Tip 2: Hvis du kan klare at bygge Leonardos værksted, så forsk på "
"eksplosiver før værkstedet bliver forældet. Da bliver nybyggerne opgraderede "
@@ -25108,7 +25278,7 @@ msgstr ""
"til\n"
"luksus (2 enheder af luksus gør 1 indbygger tilfreds). Bygningen af en "
"markedsplads\n"
-"øger denne fordel ved at give +50%% luksus til byen."
+"øger denne fordel ved at give +50 %% luksus til byen."
#: data/scenario/tutorial.sav:162
msgid ""
@@ -25308,22 +25478,22 @@ msgid ""
"technology. When you are done playing around click on the Map tab\n"
"(Alt-M) to return to the map view."
msgstr ""
-"Du har forsket i din første teknologi! Teknologiske fremskridt\n"
-"er en integreret del af Freeciv. Efterhånden som du øger dit\n"
+"Du har forsket i din første teknologi! Teknologiske fremskridt\n"
+"er en integreret del af Freeciv. Efterhånden som du øger dit\n"
"teknologiske niveau bliver nye enheder, bygninger, styreforme og\n"
"forskellige bonuser tilgængelige for dig.\n"
"\n"
"Gå over til videnskabsvinduet og kig dig lidt omkring. Tryk på F6\n"
-"for at åbne vinduet (eller klik på videnskabsknappen). Din den\n"
-"teknologi som hedder Republik og klik på den. Nu er Republik din\n"
+"for at åbne vinduet (eller klik på videnskabsknappen). Find den\n"
+"teknologi som hedder Republik og klik på den. Nu er Republik din\n"
"forskningsmål; dette betyder at det næste teknologiske fremskridt\n"
-"på vejen mod Republik automatisk bliver valgt. I toppen af vinduet\n"
-"vises hvor meget forskning du genererer hver runde - forskning\n"
-"kommer fra beskatning af handel i dine byer. I bunden af vinduet\n"
-"befinder videnskabstræet sig; her kan du venstreklikke og indstille\n"
-"forskningsområde eller -mål, eller højreklikke for at få hjælp til\n"
-"en bestemt teknologi. Nå du er færdig med at kigge så tast Alt-M\n"
-"for at komme retur til spillet."
+"på vejen mod Republik automatisk bliver valgt. I toppen af vinduet\n"
+"vises hvor meget forskning, du genererer hver runde - forskning\n"
+"(forskningspoint) kommer fra beskatning af handel i dine byer. I\n"
+"bunden af vinduet befinder videnskabstræet sig; her kan du\n"
+"venstreklikke og indstille forskningsområde eller -mål, eller\n"
+"højreklikke for at få hjælp til en bestemt teknologi. Når du er\n"
+"færdig med at kigge så tast Alt-M for at komme retur til spillet."
#: data/scenario/tutorial.sav:323
msgid ""
@@ -25400,20 +25570,20 @@ msgid ""
"unit instantly. On average, it is beneficial to search out and enter\n"
"any huts you find as soon as possible."
msgstr ""
-"Din enhed har fundet en hytte. Dette er små landsbyer spredt omkring\n"
-"i landskabet. Når en enhed går ind i en af disse kan flere ting ske. \n"
-"Det mest sandsynlige er at du finder ressourcer som har en værdi i form\n"
-"af guld. Men det er også muligt at finde teknologier eller lejesoldater.\n"
-"Nogle hytter indeholder bosættere som vil tilslutte sig din civilisation og\n"
-"starte en ny by i dit imperium. Endelig kan nogle hytter indeholde "
-"barbarer\n"
-"som vil dræbe din enhed øjeblikkeligt. Samlet set er det en fordel at "
-"finde\n"
-"og undersøge alle de hytter du har mulighed for."
+"Din enhed har fundet en landsby. Dette er små beboelser spredt omkring\n"
+"i landskabet. Når en enhed går ind i en af disse kan flere ting ske.\n"
+"Det mest sandsynlige er, at du finder ressourcer som har en værdi i form\n"
+"af guld. Men det er også muligt at finde teknologier eller lejesoldater.\n"
+"Nogle landsbyer indeholder bosættere, som vil tilslutte sig din "
+"civilisation\n"
+"og starte en ny by i dit imperium. Endelig kan nogle landsbyer indeholde\n"
+"barbarer som vil dræbe din enhed øjeblikkeligt. Samlet set, er det en "
+"fordel,\n"
+"at finde og undersøge alle de landsbyer, du har mulighed for."
#: data/scenario/tutorial.sav:380
msgid "Loading tutorial events."
-msgstr "Henter prøvespil begivenheder."
+msgstr "Henter prøvespilsbegivenheder."
#: data/civ1/game.ruleset:101 data/civ2/game.ruleset:101
#: data/default/game.ruleset:129
@@ -25574,1488 +25744,3 @@ msgstr "Hold 30"
#: data/default/game.ruleset:160
msgid "Team 31"
msgstr "Hold 31"
-
-# bedre bliver det vist ikke
-#~ msgid "%s territory"
-#~ msgstr "Territorium tilhørende %s"
-
-#~ msgid "%s territory (%d turn cease-fire)"
-#~ msgid_plural "%s territory (%d turn cease-fire)"
-#~ msgstr[0] "%s territorium (%d runde våbenhvile)"
-#~ msgstr[1] "%s territorium (%d runde våbenhvile)"
-
-# bedre bliver det vist ikke
-#~ msgid "%s territory (%s)"
-#~ msgstr "Territorium tilhørende %s (%s)"
-
-#~ msgid "City: %s (%s)"
-#~ msgstr "By: %s (%s)"
-
-#~ msgid "Unit: %s (%s)"
-#~ msgstr "Enhed: %s (%s)"
-
-#~ msgid "Select same type"
-#~ msgstr "Vælg samme type"
-
-#~ msgid "Auth config filename \"%s\" not allowed!"
-#~ msgstr "Auth indstillingsfilnavn \"%s\" er ikke tilladt!"
-
-#~ msgid "The %s of the %s (%s)"
-#~ msgstr "%s af %s (%s)"
-
-#~ msgid ""
-#~ "Illegal alliance structure detected: %s alliance to %s reduced to peace "
-#~ "treaty."
-#~ msgstr ""
-#~ "Illegal alliancestruktur opdaget: %s's alliance med %s er reduceret til "
-#~ "en fredstraktat."
-
-#~ msgid "And, became more experienced!"
-#~ msgstr " og blev mere erfaren!"
-
-#~ 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."
-
-#~ msgid "%s of the %s"
-#~ msgstr "%s af %s"
-
-#~ msgid "no maximum, "
-#~ msgstr "intet maksimum, "
-
-#~ msgid "%d unit maximum, "
-#~ msgid_plural "%d units maximum, "
-#~ msgstr[0] "%d enhed maksimum, "
-#~ msgstr[1] "%d enheder maksimum, "
-
-#~ msgid "%d per unit). "
-#~ msgstr "%d per enhed). "
-
-#~ msgid ""
-#~ "Couldn't find stdfont.ttf file. Please link/copy/move anyunicode ttf font "
-#~ "to data dir as stdfont.ttf"
-#~ msgstr ""
-#~ "Kunne ikke finde stdfont.ttf fil. Venligst link/kopier/flyt anyunicode "
-#~ "ttf font til data dir som stdfont.ttf"
-
-#~ msgid "Units: "
-#~ msgstr "Enheder: "
-
-#~ msgid "?outputlist: or "
-#~ msgstr "?outputlist: eller "
-
-#~ msgid "?outputlist: and "
-#~ msgstr "?outputlist: og "
-
-#~ msgid ""
-#~ "* Military units away from home and field units will cause one citizen to "
-#~ "become unhappy.\n"
-#~ msgstr "Militære enheder i felten gør en indbygger ulykkelig.\n"
-
-#~ msgid ""
-#~ "* Your units may impose martial law. Each military unit inside a city "
-#~ "will force an unhappy citizen to become content.\n"
-#~ msgstr ""
-#~ "* Dine enheder kan indføre undtagelsestilstand. Hver militær enhed i en "
-#~ "by vil fremtvinge at en ulykkelig indbygger fremstår som tilfreds.\n"
-
-#~ msgid ""
-#~ "%s%s - %s%s\n"
-#~ "\n"
-#~ msgstr ""
-#~ "%s%s - %s%s\n"
-#~ "\n"
-
-#~ msgid "%s"
-#~ msgstr "%s"
-
-#~ msgid ", "
-#~ msgstr ", "
-
-#~ msgid "%s Welcome"
-#~ msgstr "Velkommen %s"
-
-#~ msgid "Client rejected: %s."
-#~ msgstr "Klient afvist: %s."
-
-#~ msgid "Your %s succeeded in bribing %s's %s and became more experienced."
-#~ msgstr "Din %s bestak %s's %s og blev mere erfaren."
-
-#~ msgid ""
-#~ "Your %s has successfully completed her mission and returned unharmed to %"
-#~ "s and has become more experienced."
-#~ msgstr ""
-#~ "Din %s har klaret sin mission og er returneret uskadt til %s med mere "
-#~ "erfaring."
-
-#~ msgid "Your bombarding %s%s became more experienced!"
-#~ msgstr "Din bombeenhed %s%s blev mere erfaren."
-
-#~ msgid ""
-#~ "Your %s%s survived the pathetic attack from %s's %s and became more "
-#~ "experienced!"
-#~ msgstr ""
-#~ "Din %s%s overlevede det ynkelige angreb fra %s %s og blev mere erfaren!"
-
-# problem
-#~ msgid " at %s"
-#~ msgstr " ved %s"
-
-# problem
-#~ msgid " in %s"
-#~ msgstr " i %s"
-
-# problem
-#~ msgid " outside %s"
-#~ msgstr " udenfor %s"
-
-# problem
-#~ msgid " near %s"
-#~ msgstr " nær %s"
-
-#~ msgid ""
-#~ "Your attacking %s succeeded against %s's %s (and %d other unit)%s and "
-#~ "became more experienced!"
-#~ msgid_plural ""
-#~ "Your attacking %s succeeded against %s's %s (and %d other units)%s and "
-#~ "became more experienced!"
-#~ msgstr[0] ""
-#~ "Din %s lykkedes i angrebet mod %ss %s (og %d anden enhed)%s og blev mere "
-#~ "erfaren"
-#~ msgstr[1] ""
-#~ "Din %s lykkedes i angrebet mod %ss %s (og %d andre enheder)%s og blev "
-#~ "mere erfaren"
-
-# problem
-#~ msgid "%s lost to an attack from %s's %s."
-#~ msgstr "%s gik tabt i et angreb fra %ss %s."
-
-#~ msgid " Choose Your Diplomat's Strategy"
-#~ msgstr " Vælg din diplomats strategi"
-
-#~ msgid "%s has client version %d.%d.%d%s"
-#~ msgstr "%s har klientversion %d.%d.%d%s"
-
-#~ msgid ""
-#~ "Eliminated %s %s while infiltrating %s. The defender became more "
-#~ "experienced."
-#~ msgstr ""
-#~ "Udslettede %s %s under infiltration af %s. Forsvareren fik mere erfaring."
-
-#~ msgid ""
-#~ "Eliminated %s %s while infiltrating our troops. The defender became more "
-#~ "experienced."
-#~ msgstr ""
-#~ "Udslettede %s %s under infiltration af vore tropper. Forsvareren fik mere "
-#~ "erfaring."
-
-#~ msgid ""
-#~ "Your client is too old. To use this server, please upgrade your client to "
-#~ "a Freeciv 2.1 or later."
-#~ msgstr ""
-#~ "Din klient er for gammel. For at anvende denne server skal du opgradere "
-#~ "din klient til Freeciv 2.1 eller senere."
-
-#~ msgid "Ruleset directory name \"%s\" disallowed for security reasons."
-#~ msgstr "Regelopsætningskataloget \"%s\" er slået fra af sikkerhedsårsager."
-
-#~ msgid ", nation %s"
-#~ msgstr ", nation: %s"
-
-#~ msgid "_Map"
-#~ msgstr "_Kort"
-
-#~ msgid "Create _player"
-#~ msgstr "Opret _spiller"
-
-#~ msgid "_Release player"
-#~ msgstr "F_rigiv spiller"
-
-#~ msgid "Gover_nment"
-#~ msgstr "Styreform"
-
-#~ msgid "_Players"
-#~ msgstr "_Spillere"
-
-#~ msgid "_Science"
-#~ msgstr "_Forskning"
-
-#~ msgid "S_paceship"
-#~ msgstr "Rumski_b"
-
-#~ msgid "Game _Options..."
-#~ msgstr "Spilindstillinger"
-
-#~ msgid "Clear _Log"
-#~ msgstr "Rens log"
-
-#~ msgid "Work_lists"
-#~ msgstr "Arbejdsliste"
-
-#~ msgid "Science Report"
-#~ msgstr "Forskningsrapport"
-
-#~ msgid "Reason: line not found"
-#~ msgstr "Begrundelse: linjen blev ikke fundet"
-
-#~ msgid "Reason: line too short (expected %d got %lu"
-#~ msgstr "Begrundelse: linjen er for kort (forventede %d, men fik %lu"
-
-#~ msgid "Plugin '%s' is now selected"
-#~ msgstr "Modul '%s' er nu valgt"
-
-#~ msgid "No real audio plugin present, proceeding with sound support disabled"
-#~ msgstr "Intet lydmodul fundet, fortsætter med lyd deaktiveret."
-
-#~ msgid "http://www.libsdl.org/projects/SDL_mixer/index.html"
-#~ msgstr "http://www.libsdl.org/projects/SDL_mixer/index.html"
-
-#~ msgid "Will continue with disabled sounds."
-#~ msgstr "Fortsætter uden lyd."
-
-#~ msgid "sound spec-file appears incompatible:"
-#~ msgstr "lydopsætningen i filen ser inkompatibel ud:"
-
-#~ msgid "file: \"%s\""
-#~ msgstr "fil: \"%s\""
-
-#~ msgid "file options: %s"
-#~ msgstr "filmuligheder: %s"
-
-#~ msgid "supported options: %s"
-#~ msgstr "understøttede muligheder: %s"
-
-#~ msgid "sound spec-file claims required option(s) which we don't support:"
-#~ msgstr "lydopsætningen kræver alternativer som vi ikke understøtter:"
-
-#~ msgid "Goto _location"
-#~ msgstr "GÃ¥ ti_l"
-
-#~ msgid "Error in create_string16: Aborting ..."
-#~ msgstr "Fej i create_string16: Lukker ned..."
-
-#~ msgid "Couldn't blit text to display: %s"
-#~ msgstr "Kunne ikke sende tekst til display: %s"
-
-#~ msgid ""
-#~ "Error in SDL_create_str16_surf: Couldn't convert text to display format: %"
-#~ "s"
-#~ msgstr ""
-#~ "Fejl i SDL_create_str16_surf: Kunne ikke konvertere tekst til display "
-#~ "format: %s"
-
-#~ msgid ""
-#~ "SDL_create_str16_surf: Font is generally %d big, and string is %hd big"
-#~ msgstr ""
-#~ "SDL_create_str16_surf: Font er generelt %d stor, og string er %hd big"
-
-#~ msgid "SDL_create_str16_surf: String is %d lenght"
-#~ msgstr "SDL_create_str16_surf: String is %d lenght"
-
-#~ msgid "Error in change_ptsize: Change ptsize failed"
-#~ msgstr "Fejl i change_ptsize: Skift af ptsize fejlede"
-
-#~ msgid "Error in load_font: Couldn't load %d pt font from %s: %s"
-#~ msgstr "Error in load_font: Kunne ikke hente %d pt font fra %s: %s"
-
-#~ msgid "Error in unload_font: Trying unload from empty Font ARRAY"
-#~ msgstr "Fejl i unload_font: Trying unload fra tom font ARRAY"
-
-#~ msgid ""
-#~ "Error in unload_font: Trying unload Font which is not include in Font "
-#~ "ARRAY"
-#~ msgstr ""
-#~ "Fejl i unload_font: Trying unload Font som ikke er inkluderet i Font ARRAY"
-
-#~ msgid ""
-#~ "When built, every civilization's attitude toward you is improved by 25%."
-#~ msgstr ""
-#~ "Når det bygges færdig vil hver civilisations indstilling til dig "
-#~ "forbedres med 25%."
-
-#~ msgid ""
-#~ "- A Diplomat can establish embassies with other civilizations by moving "
-#~ "into another player's city.\n"
-#~ "\n"
-#~ "- Diplomats can also try to sabotage enemy production, or steal an "
-#~ "advance from an enemy city. (An advance can only be stolen once per "
-#~ "city).\n"
-#~ "\n"
-#~ "- A Diplomat can also bribe an enemy unit, if that unit is the only unit "
-#~ "on its square.\n"
-#~ "\n"
-#~ "- Diplomats can even start a revolution in an enemy city and turn it into "
-#~ "your own, if you have the money!\n"
-#~ "\n"
-#~ "- In some game strategies, hordes of Diplomats can be used to wreak havoc "
-#~ "on the enemy. Little wonder that Diplomats are often viewed with "
-#~ "suspicion and fear!"
-#~ msgstr ""
-#~ "- En diplomat kan oprette ambassader hos andre civilisationer ved at "
-#~ "flytte ind i en anden spillers by.\n"
-#~ "\n"
-#~ "- Diplomater kan også sabotere fjendens produktion, eller stjæle et "
-#~ "fremskridt fra en fjendtlig by. (Kun et fremskridt kan stjæles fra en "
-#~ "by).\n"
-#~ "\n"
-#~ "- En diplomat kan også bestikke en fjendtlig enhed, hvis den enhed er den "
-#~ "eneste enhed på sit felt.\n"
-#~ "\n"
-#~ "- Diplomater kan også starte en revolution i en fjendtlig by og gøre den "
-#~ "til din egen, hvis du kan betale!\n"
-#~ "\n"
-#~ "- I visse spilstrategier kan horder af diplomater bruges til at overtage "
-#~ "mange byer på meget kort tid. Ikke mærkeligt at diplomater ofte bliver "
-#~ "set på med mistænksomhed og frygt!"
-
-#~ msgid "Team 32"
-#~ msgstr "Hold 32"
-
-#~ msgid "Cleared output window.\n"
-#~ msgstr "Ryddet udskriftsvindue.\n"
-
-#~ msgid "Freeciv - Cityproduction"
-#~ msgstr "Freeciv - Byproduktion"
-
-#~ msgid "Shields"
-#~ msgstr "Skjolde"
-
-#~ msgid "City Overview page"
-#~ msgstr "Byoversigt"
-
-#~ msgid "Units page"
-#~ msgstr "Enheds-side"
-
-#~ msgid "Worklist page"
-#~ msgstr "Side for arbejdsliste"
-
-#~ msgid "Trade Routes page"
-#~ msgstr "Handelsruteside"
-
-#~ msgid "This Misc. Settings page"
-#~ msgstr "Dette er indstillingssiden"
-
-#~ msgid "Freeciv - Cityview"
-#~ msgstr "Freeciv - Bybillede"
-
-#~ msgid "City Output"
-#~ msgstr "By resultat"
-
-#~ msgid "Citymap"
-#~ msgstr "Bykort"
-
-#~ msgid "_Sell"
-#~ msgstr "_Sælg"
-
-#~ msgid "_Add preset"
-#~ msgstr "_Tilføj indstilling"
-
-#~ msgid "_Delete preset"
-#~ msgstr "_Slet forhåndsvalg"
-
-#~ msgid "Name:"
-#~ msgstr "Navn:"
-
-#~ msgid "People (W/E/S/T):"
-#~ msgstr "Folk (A/U/F/S):"
-
-#~ msgid "City grows:"
-#~ msgstr "Byvækst:"
-
-#~ msgid "Production completed:"
-#~ msgstr "Produktion fuldført:"
-
-#~ msgid "_Change"
-#~ msgstr "_Ændr"
-
-#~ msgid "C_hange permanent"
-#~ msgstr "Æ_ndr permanent"
-
-#~ msgid "_Release city"
-#~ msgstr "F_rigiv byen"
-
-#~ msgid "Auto attack vs"
-#~ msgstr "Auto-angreb mod"
-
-#~ msgid "Land units"
-#~ msgstr "Landenheder"
-
-#~ msgid "Sea units"
-#~ msgstr "Havenheder"
-
-#~ msgid "Helicopters"
-#~ msgstr "Helikoptere"
-
-#~ msgid "Air units"
-#~ msgstr "Flyenheder"
-
-#~ msgid "_Disband if build settler at size 1"
-#~ msgstr "Opløs hvis en bygger nybygger på størrelse 1"
-
-#~ msgid "_Close"
-#~ msgstr "_Luk"
-
-#~ msgid "%s (%s) (worklist)"
-#~ msgstr "%s (%s) (arbejdsliste)"
-
-#~ msgid "%s citizens%s"
-#~ msgstr "%s borgere%s"
-
-#~ msgid "%s - %s citizens%s"
-#~ msgstr "%s - %s borgere%s"
-
-#~ msgid "Luxury: %d total (maximum %d usable). "
-#~ msgstr "Luksus: %d totalt (maksimum %d tilgængelig)"
-
-#~ msgid "_Ok"
-#~ msgstr "_Ok"
-
-#~ msgid "_Refresh"
-#~ msgstr "_Opfrisk"
-
-#~ msgid "Con_figure"
-#~ msgstr "_Tilpas"
-
-#~ msgid "Server Selection"
-#~ msgstr "Server valg"
-
-#~ msgid "_Name"
-#~ msgstr "_Navn"
-
-#~ msgid "_Host"
-#~ msgstr "Server"
-
-#~ msgid "_Port"
-#~ msgstr "_Port"
-
-#~ msgid "_Goto and Close"
-#~ msgstr "_GÃ¥ til og luk"
-
-#~ msgid "_Establish embassy"
-#~ msgstr "_Etablér ambassade"
-
-#~ msgid "_Investigate city"
-#~ msgstr "_Inspicér by"
-
-#~ msgid "_Sabotage city"
-#~ msgstr "_Sabotér by"
-
-#~ msgid "Steal _technology"
-#~ msgstr "Stjæl _teknologi"
-
-#~ msgid "Incite a _revolt"
-#~ msgstr "Start op_rør"
-
-#~ msgid "_Poison city"
-#~ msgstr "For_gift byens drikkevand"
-
-#~ msgid "Industrial _sabotage"
-#~ msgstr "Industri_sabotage"
-
-#~ msgid "_Establish traderoute"
-#~ msgstr "_Etablér handelsrute"
-
-#~ msgid "_Enter Marketplace"
-#~ msgstr "Sælg varer på markedspladsen"
-
-#~ msgid "_Help build Wonder"
-#~ msgstr "_Hjælp med til at bygge vidunder"
-
-#~ msgid "Freeciv - Pillage"
-#~ msgstr "Freeciv - Plyndring"
-
-#~ msgid "Freeciv - Connect"
-#~ msgstr "Freeciv - Tilslutning"
-
-#~ msgid "Freeciv - Select an unit"
-#~ msgstr "Freeciv - Vælg enhed"
-
-#~ msgid "_Ready All"
-#~ msgstr "Kla_rgør alle"
-
-#~ msgid "Freeciv - Select a Nation"
-#~ msgstr "Freeciv - Vælg nation"
-
-#~ msgid "_Leader Name"
-#~ msgstr "_Leders navn"
-
-#~ msgid "_City Style"
-#~ msgstr "Bystil"
-
-#~ msgid "Sorry: cannot upgrade %s."
-#~ msgstr "Beklager: kan ikke opgradere %s."
-
-#~ msgid "No technology"
-#~ msgstr "Ingen teknologi"
-
-#~ msgid "No city"
-#~ msgstr "Ingen by"
-
-#~ msgid "_Accept treaty"
-#~ msgstr "_Acceptér traktat"
-
-#~ msgid "World-Map"
-#~ msgstr "Verdenskort"
-
-#~ msgid "Sea-Map"
-#~ msgstr "Søkort"
-
-#~ msgid ""
-#~ "This Eternal Treaty\n"
-#~ "marks the results\n"
-#~ "of the diplomatic work between\n"
-#~ "The %s %s %s\n"
-#~ "and\n"
-#~ "The %s %s %s"
-#~ msgstr ""
-#~ "Denne Evige Traktat\n"
-#~ "markerer resultatet\n"
-#~ "af det diplomatiske arbejde mellem\n"
-#~ "%s %s %s\n"
-#~ "og\n"
-#~ "%s %s %s"
-
-#~ msgid "Select a city"
-#~ msgstr "Vælg en by"
-
-#~ msgid "Set tax, luxury and science rates"
-#~ msgstr "Vælg skat, luksus og forskningsniveau"
-
-#~ msgid "_Airlift"
-#~ msgstr "Flytr_ansport"
-
-#~ msgid ""
-#~ "Could not get the mask although there must be one (%s)! Graphics may look "
-#~ "corrupt.\n"
-#~ msgstr ""
-#~ "Kan ikke skaffe masken, men der skal være en (%s)! Grafikken kan se "
-#~ "ødelagt ud \n"
-
-#~ msgid "Options..."
-#~ msgstr "Indstillinger..."
-
-#~ msgid "Message Options..."
-#~ msgstr "Besked indstillinger..."
-
-#~ msgid "Players..."
-#~ msgstr "Spillere..."
-
-#~ msgid "Message..."
-#~ msgstr "Besked..."
-
-#~ msgid "Server opt initial..."
-#~ msgstr "Server Opt. initielle..."
-
-#~ msgid "Server opt ongoing..."
-#~ msgstr "Server-indstillinger pågående..."
-
-#~ msgid "Kingdom"
-#~ msgstr "Kongedømme"
-
-#~ msgid "Tax Rate..."
-#~ msgstr "Skatteniveau..."
-
-#~ msgid "Find City..."
-#~ msgstr "Find by..."
-
-#~ msgid "Worklists..."
-#~ msgstr "Arbejdslister..."
-
-#~ msgid "REVOLUTION..."
-#~ msgstr "REVOLUTION..."
-
-#~ msgid "Road & Rails"
-#~ msgstr "Vej & Togskinner"
-
-#~ msgid "Order"
-#~ msgstr "Ordrer"
-
-#~ msgid "City Report..."
-#~ msgstr "Byrapport..."
-
-#~ msgid "Science Report..."
-#~ msgstr "Forskningsrapport..."
-
-#~ msgid "Trade Report..."
-#~ msgstr "Handelsrapport..."
-
-#~ msgid "Military Report..."
-#~ msgstr "Militærrapport..."
-
-#~ msgid "Freeciv Client"
-#~ msgstr "Freeciv klient"
-
-#~ msgid "Client for Freeciv"
-#~ msgstr "Klient for Freeciv"
-
-#~ msgid ""
-#~ "Turn\n"
-#~ "Done"
-#~ msgstr ""
-#~ "Runde\n"
-#~ "forbi"
-
-#~ msgid ""
-#~ "Couldn't open the main window (Gfx memory problem or screensize too "
-#~ "small)\n"
-#~ msgstr ""
-#~ "Kunne ikke åbne hovedvinduet (Grafikhukommelsesproblem eller "
-#~ "skærmstørrelse for lille)\n"
-
-#~ msgid "Cost: %ld"
-#~ msgstr "Pris: %ld"
-
-#~ msgid " wonder"
-#~ msgstr " vidunder"
-
-#~ msgid " improvement"
-#~ msgstr " forbedringer"
-
-#~ msgid " unit"
-#~ msgstr " enhed"
-
-#~ msgid "Movecost: %ld"
-#~ msgstr "Flytteomkostning: %ld"
-
-#~ msgid "Defense: %ld.%ld"
-#~ msgstr "Forsvar: %ld.%ld"
-
-#~ msgid ""
-#~ "Food: %d\n"
-#~ "Shield: %d\n"
-#~ "Trade: %d"
-#~ msgstr ""
-#~ "Mad: %d\n"
-#~ "Skjold: %d\n"
-#~ "Handel: %d"
-
-#~ msgid "City: %s(%s)"
-#~ msgstr "By: %s(%s)"
-
-#~ msgid "with City Walls"
-#~ msgstr "med bymure"
-
-#~ msgid "Infrastructure: "
-#~ msgstr "Infrastruktur: "
-
-#~ msgid "Unit: %s(%s%s)"
-#~ msgstr "Enhed: %s (%s%s)"
-
-#~ msgid "A:%d D:%d FP:%d HP:%d/%d%s%s"
-#~ msgstr "A:%d F:%d FP:%d TK:%d/%d%s%s"
-
-#~ msgid "A:%d D:%d FP:%d HP:%d0%%"
-#~ msgstr "A:%d F:%d FP:%d TK:%d0%%"
-
-#~ msgid "City %s"
-#~ msgstr "By %s"
-
-#~ msgid "Unit %s"
-#~ msgstr "Enhed %s"
-
-#~ msgid "Tile %s"
-#~ msgstr "Grafikfelt: \"%s\""
-
-#~ msgid "Wake up"
-#~ msgstr "Væk"
-
-#~ msgid "Activate"
-#~ msgstr "Aktivér"
-
-#~ msgid "List all units"
-#~ msgstr "List alle enheder"
-
-#~ msgid "Connect to this location"
-#~ msgstr "Kobl til dette sted"
-
-#~ msgid "Goto this location"
-#~ msgstr "GÃ¥ til dette sted"
-
-#~ msgid "City_name"
-#~ msgstr "By_navn"
-
-#~ msgid "Tax:%d Lux:%d Sci:%d"
-#~ msgstr "Skat:%d Luks%d Forsk:%d"
-
-#~ msgid "_Goto Location"
-#~ msgstr "_GÃ¥ til"
-
-#~ msgid "Reputation"
-#~ msgstr "Rygte"
-
-#~ msgid "(%ld steps)"
-#~ msgstr "(%ld trin)"
-
-#~ msgid "Science Advisor"
-#~ msgstr "Videnskabsrådgiver"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "(no research)"
-#~ msgstr ""
-#~ "%s\n"
-#~ "(ingen forskning)"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "(%d turn/advance)"
-#~ msgid_plural ""
-#~ "%s\n"
-#~ "(%d turns/advance)"
-#~ msgstr[0] ""
-#~ "%s\n"
-#~ "(%d runde/fremskridt)"
-#~ msgstr[1] ""
-#~ "%s\n"
-#~ "(%d runder/fremskridt)"
-
-#~ msgid "_Goal"
-#~ msgstr "MÃ¥l"
-
-#~ msgid "Trade Advisor"
-#~ msgstr "Handelsrådgiver"
-
-#~ msgid "Military Report"
-#~ msgstr "Militærrapport"
-
-#~ msgid ""
-#~ "Population:\n"
-#~ "Support:\n"
-#~ "Energy:\n"
-#~ "Mass:\n"
-#~ "Travel time:\n"
-#~ "Success prob.:\n"
-#~ "Year of arrival:"
-#~ msgstr ""
-#~ "Befolkning:\n"
-#~ "Support:\n"
-#~ "Energi:\n"
-#~ "Vægt:\n"
-#~ "Rejsetid:\n"
-#~ "Succes sands.:\n"
-#~ "Ankomstår:"
-
-#~ msgid ""
-#~ "%5d\n"
-#~ "%5d %%\n"
-#~ "%5d %%\n"
-#~ "%5d tons\n"
-#~ "%5.1f years\n"
-#~ "%5d %%\n"
-#~ "%8s"
-#~ msgstr ""
-#~ "%5d\n"
-#~ "%5d %%\n"
-#~ "%5d %%\n"
-#~ "%5d ton\n"
-#~ "%5.1f år\n"
-#~ "%5d %%\n"
-#~ "%8s"
-
-#~ msgid "Freeciv - Edit Worklists"
-#~ msgstr "Freeciv - Ændr arbejdslister"
-
-#~ msgid "Available Worklists"
-#~ msgstr "Tilgængelige arbejdslister"
-
-#~ msgid "_Edit"
-#~ msgstr "_Ændr"
-
-#~ msgid "_New"
-#~ msgstr "_Ny"
-
-#~ msgid "_Remove"
-#~ msgstr "Fje_rn"
-
-#~ msgid "Freeciv - Edit Worklist"
-#~ msgstr "Freeciv - Ændr arbejdslister"
-
-#~ msgid "entry"
-#~ msgid_plural "entries"
-#~ msgstr[0] "indgang"
-#~ msgstr[1] "indgange"
-
-#~ msgid "u8Worklistsn"
-#~ msgstr "u8Arbejdslistern"
-
-#~ msgid "Accept"
-#~ msgstr "Acceptér"
-
-#~ msgid "Current Targets"
-#~ msgstr "Nuværende mål"
-
-#~ msgid "Available Targets"
-#~ msgstr "Tilgængelige mål"
-
-#~ msgid "Worklist for city"
-#~ msgstr "Arbejdsliste for by"
-
-#~ msgid "Name of Worklist"
-#~ msgstr "Arbejdslistens navn"
-
-#~ msgid "Options panel"
-#~ msgstr "Indstillinger"
-
-#~ msgid "Unit maintenance panel (%d %s)"
-#~ msgstr "Enheds vedligeholdelsespanel (%d %s)"
-
-#~ msgid "unit"
-#~ msgid_plural "units"
-#~ msgstr[0] "enhed"
-#~ msgstr[1] "enheder"
-
-#~ msgid "Garrison Panel (%d %s)"
-#~ msgstr "Garrisonspanel (%d %s)"
-
-#~ msgid "Info Panel"
-#~ msgstr "For information om"
-
-#~ msgid "Happiness panel"
-#~ msgstr "Lykkepanel"
-
-#~ msgid "Maintenance panel"
-#~ msgstr "Vedligeholdelsesoversigt"
-
-#~ msgid "Garrison panel"
-#~ msgstr "Garrisonsoversigt"
-
-#~ msgid "Information panel"
-#~ msgstr "Informationsoversigt"
-
-#~ msgid "Exit Report"
-#~ msgstr "Forlad rapport"
-
-#~ msgid ""
-#~ "\n"
-#~ "finshed"
-#~ msgstr ""
-#~ "\n"
-#~ "Færdig"
-
-#~ msgid "tech \"%s\": requires itself"
-#~ msgstr "teknologi \"%s\": kræver sig selv"
-
-#~ msgid "%s's %s tried to build %s, which is not available."
-#~ msgstr "%s's %s prøvede at bygge %s som ikke er tilgængelig."
-
-#~ msgid ""
-#~ "Your %s was executed in %s on suspicion of spying. The %s welcome future "
-#~ "diplomatic efforts providing the Ambassador is reputable."
-#~ msgstr ""
-#~ "Din %s blev henrettet i %s pga. mistanke om spionage. Folkeslaget %s "
-#~ "hilser fremtidige diplomatiske bestræbelser velkommen forudsat at "
-#~ "ambassadørens omdømme er anstændigt."
-
-#~ msgid ""
-#~ "You executed a %s the %s had sent to establish an embassy in %s for being "
-#~ "untrustworthy"
-#~ msgstr ""
-#~ "Du henrettede en %s som %s sendte for at etablere ambassade i %s, for at "
-#~ "være utroværdig"
-
-#~ msgid "Sea moving start units are not yet supported, %s not created."
-#~ msgstr "Start flådeenheder er ikke understøttet, %s er ikke skabt."
-
-#~ msgid "Trying alternative ruleset filename syntax."
-#~ msgstr "Prøver med alternativ syntaks for filnavnet til regelfilen."
-
-#~ msgid "Could not load ruleset file \"%s\"."
-#~ msgstr "Kunne ikke indlæse regelfilen \"%s\"."
-
-#~ msgid "Could not load ruleset script file \"%s\"."
-#~ msgstr "Kunne ikke indlæse regelfilen \"%s\"."
-
-#~ msgid "Ruleset datafile appears incompatible:"
-#~ msgstr "Datafilen til regelsættet ser ud til at være inkompatibel:"
-
-#~ msgid "Ruleset datafile claims required option(s) which we don't support:"
-#~ msgstr "Regelsætdatafil kræver muligheder som ikke er understøttet:"
-
-#~ msgid "Section %s has unknown req: \"%s\" \"%s\" (%s)"
-#~ msgstr "Sektion %s har ukendt anmodning: \"%s\" \"%s\" (%s)"
-
-#~ msgid "Unknown terrain %s in entry %s."
-#~ msgstr "Ukendt terræn %s i %s."
-
-#~ msgid "Ruleset doesn't have any terrains (%s)"
-#~ msgstr "Regelsæt har ikke nogen terræntyper (%s)"
-
-#~ msgid "Terrains %s and %s have the same identifier."
-#~ msgstr "Terræn %s og %s har den samme identifikation."
-
-#~ msgid "'%c' cannot be used as a terrain identifier; it is reserved."
-#~ msgstr "'%c' kan ikke bruges for en unik terræntype; det er reserveret."
-
-#~ msgid "Terrain %s has unknown flag %s"
-#~ msgstr "Terræn %s har ukendt markering %s"
-
-#~ msgid "Resources %s and %s have the same identifier."
-#~ msgstr "Resource %s og %s har den samme markering."
-
-#~ msgid "Section %s lists unknown effect type: \"%s\" (%s)"
-#~ msgstr "Sektion %s lister ukendte effekt typer: \"%s\" (%s)"
-
-#~ msgid "Unknown terrain identifier '%c' in savegame."
-#~ msgstr "Ukendt terræn markering '%c' i det gemte spil."
-
-#~ msgid "Warning: Unknown nation %s for starting position no %d"
-#~ msgstr "Advarsel: Ukendt nation %s på start positionen no %d"
-
-#~ msgid ""
-#~ "Number of starts (%d) are lower than rules.max_players (%d), lowering "
-#~ "rules.max_players."
-#~ msgstr ""
-#~ "Antal tilmeldte (%d) er lavere end rules.max_players (%d), sænker regler. "
-#~ "max_players."
-
-#~ msgid "Wrong unit type id value (%d)"
-#~ msgstr "Forkert enhedstypeidværdi (%d)"
-
-#~ msgid "Wrong improvement type id value (%d)"
-#~ msgstr "Forkert forbedringstypeidværdi (%d)"
-
-#~ msgid "Wrong tech type id value (%d)"
-#~ msgstr "Forkert teknologitypeidværdi (%d)"
-
-#~ msgid "Unknown technology (%s)"
-#~ msgstr "Ukendt teknologi (%s)"
-
-#~ msgid "Wrong government type id value (%d)"
-#~ msgstr "Forkert ledelsestypeidværdi (%d)"
-
-#~ msgid "Wrong player%d.u%d.type value (%d)"
-#~ msgstr "Forkert spiller%d.u%d.type værdi (%d)"
-
-#~ msgid "Unknown unit type '%s' in player%d section"
-#~ msgstr "Forkert enhedstype '%s' i spiller%d sektion"
-
-#~ msgid "Unsupported government found (%s)"
-#~ msgstr "Usupporteret ledelsesform fundet (%s)"
-
-#~ msgid "Unsupported city style found in player%d section. Changed to %s"
-#~ msgstr "Usupporteret by stil fundet i spiller%d sektion. Skiftet til %s"
-
-# ferri = formerly, a prisoner's chains
-#~ msgid "Removing %s's unferried %s in %s at (%d, %d)"
-#~ msgstr "Fjernelse af %ss slap %s i %s fri ved (%d, %d)"
-
-#~ msgid "Food Stock"
-#~ msgstr "Madbeholdning"
-
-#~ msgid ""
-#~ "%s file requires option(s) which client doesn't support:\n"
-#~ "file: \"%s\"\n"
-#~ "file options: %s\n"
-#~ "supported options: %s"
-#~ msgstr ""
-#~ "%s filen kræver indstilling(er) vi ikke understøtter:\n"
-#~ "fil: \"%s\"\n"
-#~ "fil indstillinger: %s\n"
-#~ "Understøttede indstillinger: %s"
-
-#~ msgid "Trying \"%s\" tileset."
-#~ msgstr "Forsøger feltsættet \"%s\"."
-
-#~ msgid "Can't find tileset \"%s\"."
-#~ msgstr "Kan ikke finde feltsæt \"%s\"."
-
-#~ msgid "Invalid darkness style set in tileset."
-#~ msgstr "Ugyldig mørketone angivet i feltsæt"
-
-#~ msgid ""
-#~ "Error in %s layer %d: you cannot have tall terrain or\n"
-#~ "a sprite offset with a cell-based drawing method."
-#~ msgstr ""
-#~ "Fejl i %s lag %d: Du kan ikke hav terræn eller\n"
-#~ "sprite offset med en cellebaseret tegnemetode."
-
-#~ msgid "Can't find spec file \"%s\"."
-#~ msgstr "Kan ikke finde specifikationsfil \"%s\"."
-
-#~ msgid "No graphics for specialist %s."
-#~ msgstr "Ingen grafik for specialist %s."
-
-#~ msgid "No graphics for citizen %s."
-#~ msgstr "Ingen grafik for borger %s."
-
-#~ msgid "Missing base sprite tag \"%s1\"."
-#~ msgstr "Mangler base sprite tag \"%s1\"."
-
-#~ msgid "Next advance in %d turn"
-#~ msgid_plural "Next advance in %d turns"
-#~ msgstr[0] "Næste fremskridt om %d runde"
-#~ msgstr[1] "Næste fremskridt om %d runder"
-
-#~ msgid ""
-#~ "Current output : %d per turn\n"
-#~ "Research speed : %d %s/advance\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Nuværende produktion : %d per runde\n"
-#~ "Forskningstempo : %d %s/fremskridt\n"
-#~ "%s"
-
-#~ msgid "Unit %s has unknown unit class %s as cargo."
-#~ msgstr "Ened %s har ukendt enhedsklasse %s som last."
-
-#~ msgid "Terrain %s is native to unknown unit class %s"
-#~ msgstr "Terræn %s er hjemsted for ukendt enhedsklasse %s"
-
-#~ msgid "Oceanic terrain %s is native to land units."
-#~ msgstr "Havterræn %s er hjemsted for landenheder."
-
-#~ msgid "Non oceanic terrain %s is native to sea units."
-#~ msgstr "Ikke havterræn %s er hjemsted for flådeenheder."
-
-#~ msgid "Vote \"%s\" is passed %d to %d with %d blanke."
-#~ msgstr "Afstemning \"%s\" er afsluttet %d til %d med %d imod."
-
-#~ msgid "Vote \"%s\" failed with %d against, %d for and %d blanke."
-#~ msgstr "Afstemning \"%s\" faldt med %d mod %d for og %d imod."
-
-#~ msgid "Unit cannot perform diplomatic action from %s."
-#~ msgstr "Enhed kan ikke udføre diplomatiske handlinger fra %s."
-
-#~ msgid "* Belongs to %s units class.\n"
-#~ msgstr "* Tilhører %s enhedsklasse.\n"
-
-#~ msgid " * Can occupy empty enemy cities.\n"
-#~ msgstr " * Kan besætte tomme fjendebyer.\n"
-
-#~ msgid " * Speed is not affected by terrain.\n"
-#~ msgstr " * Hurtighed begrænses ikke af terræn.\n"
-
-#~ msgid " * Slowed down while damaged\n"
-#~ msgstr " * Langsommere når skadet\n"
-
-#~ msgid " * Gets used up in making an attack.\n"
-#~ msgstr " * En raketenhed: bliver brugt op idet den angriber.\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] "* Kan transportere og forsyne %d enhed fra klassen:\n"
-#~ msgstr[1] "* Kan transportere og forsyne %d enheder fra klassen:\n"
-
-#~ msgid " * %s units\n"
-#~ msgstr " * %s enheder\n"
-
-#~ msgid "* Defends very badly agains fighter type units.\n"
-#~ msgstr "* Forsvarer sig meget dårligt mod jagerenheder.\n"
-
-#~ msgid "* Very bad at attacking AEGIS units.\n"
-#~ msgstr "* Uegnet til at angribe AEGIS enheder.\n"
-
-#~ msgid ""
-#~ "* After the first unhappy citizen due to civilization size, for each %d "
-#~ "additional cities, another unhappy citizen will appear.\n"
-#~ msgstr ""
-#~ "* Efter den første ulykkelige indbyggere er opstået på grund af din "
-#~ "civilisations størrelse, vil der for hver %d yderligere byer opstå endnu "
-#~ "en ulykkelig indbygger.\n"
-
-#~ msgid "Font"
-#~ msgstr "Font"
-
-#~ msgid "clear all"
-#~ msgstr "slet alle"
-
-#~ msgid "Paint"
-#~ msgstr "Mal"
-
-#~ msgid "Player"
-#~ msgstr "Spiller"
-
-#~ msgid "Moves Left"
-#~ msgstr "Træk tilbage"
-
-#~ msgid "Activity"
-#~ msgstr "Aktivitet"
-
-#~ msgid "Activity Target"
-#~ msgstr "Aktivitetsmål"
-
-#~ msgid "Activity Count"
-#~ msgstr "Aktivitetsoptælling"
-
-#~ msgid "Owner"
-#~ msgstr "Ejer"
-
-#~ msgid "Editing Tools"
-#~ msgstr "Maskinværktøjer"
-
-#~ msgid "Edit Nation"
-#~ msgstr "Rediger nation"
-
-#~ msgid "City Label"
-#~ msgstr "By navn"
-
-#~ msgid "FIXME"
-#~ msgstr "Ret mig"
-
-#~ msgid "Notify Label"
-#~ msgstr "Bekendtgørelsesmærke"
-
-#~ msgid "Spaceship Label"
-#~ msgstr "Rumskibsmærke"
-
-#~ msgid "Help Label"
-#~ msgstr "Hjælpemærke"
-
-#~ msgid "Help Link"
-#~ msgstr "Hjælpehenvisning"
-
-#~ msgid "Help Text"
-#~ msgstr "Hjælpetekst"
-
-#~ msgid "Chatline Area"
-#~ msgstr "Snakkekanal"
-
-#~ msgid "Beta Label"
-#~ msgstr "Betamærke"
-
-#~ msgid "Small Font"
-#~ msgstr "Lille font"
-
-#~ msgid "Comment Label"
-#~ msgstr "Kommentarmærke"
-
-#~ msgid "_Editor"
-#~ msgstr "_Ændr"
-
-#~ msgid "_Editing Mode"
-#~ msgstr "_Ændringsindstilling"
-
-#~ msgid "_Tools"
-#~ msgstr "Værktøjer"
-
-#~ msgid "_Recalculate Borders"
-#~ msgstr "Genberegne grænser"
-
-#~ msgid "_Edit Nation..."
-#~ msgstr "Ændr nation..."
-
-#~ msgid "Sp1 F/R/T:"
-#~ msgstr "Sp1 M/P/H:"
-
-#~ msgid "Sp2 F/R/T:"
-#~ msgstr "Sp2 M/P/H:"
-
-#~ msgid "%s F/R/T:"
-#~ msgstr "%s F/P/H:"
-
-#~ msgid "Editing Mode"
-#~ msgstr "Rette indstilling"
-
-#~ msgid "?female:Prime Minister"
-#~ msgstr "?female:Statsminister"
-
-#~ msgid "?female:Speaker"
-#~ msgstr "?female:Speaker"
-
-#~ msgid "?female:Reverend"
-#~ msgstr "?female:Reverend"
-
-#~ msgid ""
-#~ "Australia was founded as a British penal colony in 1788AD. Originally "
-#~ "comprising of several colonies (New South Wales, Victora, 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 ""
-#~ "Australien blev grundlagt som en britisk straffekoloni i 1788. Oprindelig "
-#~ "bestod landet af flere kolonier (New South Wales, Victoria, Queenslnad, "
-#~ "South Australia, Western Australia og Tasmanien). Landet blev forenet i "
-#~ "1902. Det er det eneste land på jorden hvis areal dækker et helt "
-#~ "kontinent."
-
-#~ msgid "Aymara"
-#~ msgstr "Aymaraer"
-
-#~ msgid "?plural:Aymaras"
-#~ msgstr "?plural:Aymaraerne"
-
-#~ 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 ""
-#~ "Efter Tiwanaku civilisationens sammenbrud i Andesbjergene, reorganiserede "
-#~ "deres arvinger sig i en række nært forbundne kongedømmer som blomstrede "
-#~ "omkring Titicacasøen indtil de blev erobret af inkaerne."
-
-#~ 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 "Basque"
-#~ msgstr "Basker"
-
-#~ msgid "?plural:Basques"
-#~ msgstr "?plural:Baskerne"
-
-#~ msgid ""
-#~ "The human being and his quest came to the western foothills of the "
-#~ "Pyrenees in search of a place to settle and live. Close to the natural "
-#~ "border formed by the mountains that stretch across the land joining the "
-#~ "Iberian peninsula to the rest of Europe, he found what he was looking "
-#~ "for.\n"
-#~ "\n"
-#~ " The Basques have lived since the immemorial times in this small region, "
-#~ "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.\n"
-#~ "\n"
-#~ " Actually, the Basque Country (Euskadi) covers a surface area of 20,664 "
-#~ "square kilometres and consists of seven \"herrialdes,\" or districts: "
-#~ "Araba, Bizkaia, Gipuzkoa and Nafarroa situated in the Iberian peninsula, "
-#~ "and Lapurdi, Zuberoa and Benafarroa in French territory. This is the "
-#~ "place, the people, the tradition.\n"
-#~ "\n"
-#~ " 'Ongi etorri Euskadira, eta zorte on!' (Welcome to Euskadi and good "
-#~ "luck!)"
-#~ msgstr ""
-#~ "Mennesket kom til de vestlige bjergegne af Pyrnæerne på udkig efter et "
-#~ "sted at slå sig ned. Tæt på den naturlige grænse som formes af bjergene "
-#~ "der forbinder Den Iberiske Halvø og resten af Europa, fandt han hvad han "
-#~ "kiggede efter./n/nBaskerne har siden forhistorisk tid levet i denne lille "
-#~ "region og vedligeholdt deres gamle kulturelle traditioner. Baskerne er en "
-#~ "forbindelse til menneskets fjerne fortid.Euskara, sproget der tales af "
-#~ "det baskiske folk, er sikkert det ældste talende europæiske sprog./n/nDet "
-#~ "baskiske område (Euskadi) dækker et areal på 20.664 kvadratkilometer og "
-#~ "består af syv \"herrialdes,\" eller distrikter: Araba, Bizkaia, Gipuzkoa "
-#~ "og Nafarroa beliggende på Den Iberiske Halvø, og Lapurdi, Zuberoa og "
-#~ "Nafarroa i Frankrig. Dette er stedet, folket, traditionen.\n"
-#~ "\n"
-#~ "'Ongi etorri Euskadira, eta zorte on! (velkommen til Euskadi og held og "
-#~ "lykke!)"
-
-#~ 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 ""
-#~ "Bengal er et område i den østligste del af det indiske underkontinent. "
-#~ "Den første registrerede uafhængige konge var Shashanka som var ved magten "
-#~ "omkring 606 e.Kr. I dag er områdets østlige del en del af Bangladesh og "
-#~ "den vestlige del en del af Indien. "
-#~ msgstr ""
-#~ "Bengal er et område i den østligste del af det indiske underkontinent. "
-#~ "Den første registrerede uafhængige konge var Shashanka som var ved magten "
-#~ "omkring 606 e.Kr. I dag er områdets østlige del en del af Bangladesh og "
-#~ "den vestlige del en del af Indien. "
-
-#~ msgid "?female:Nabob"
-#~ msgstr "?female:Nabob"
-
-#~ msgid "?female:Major"
-#~ msgstr "?female:Major"
-
-#~ msgid "Bosnian-Herzegovinian"
-#~ msgstr "Bosnier"
-
-#~ msgid "?female:Director-President"
-#~ msgstr "?female:Præsident"
-
-#~ msgid "?female:Bohmugyi"
-#~ msgstr "?female:Bohmugyi"
-
-#~ msgid "?female:Basileus"
-#~ msgstr "?female:Basileus"
-
-#~ msgid "Cherokee"
-#~ msgstr "Cherokeer"
-
-#~ msgid "?plural:Cherokees"
-#~ msgstr "?plural:Cherokeerne"
-
-#~ msgid ""
-#~ "The Cherokee nation is the largest Native American nation in North "
-#~ "America today."
-#~ msgstr ""
-#~ "Cherokeernationen er den største af de indfødte amerikanske nationer i "
-#~ "Nordamerika."
-
-#~ msgid "?female:Great Chief"
-#~ msgstr "?female:Storhøvding"
-
-#~ msgid "Principal Chief"
-#~ msgstr "Principal Chief"
-
-#~ msgid "?female:Principal Chief"
-#~ msgstr "?female:Principal Chief"
-
-#~ msgid "?female:Chieftain"
-#~ msgstr "?female:Chieftain"
-
-#~ msgid "?female:Pharaoh"
-#~ msgstr "?female:Farao"
-
-#~ msgid "?female:Great Pharaoh"
-#~ msgstr "?female:Mægtige farao"
-
-#~ msgid "European"
-#~ msgstr "Europæer"
-
-#~ msgid "?plural:Europeans"
-#~ msgstr "?plural:Europæerne"
-
-#~ 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 ""
-#~ "Grundlaget for Den Europæiske Union blev lagt i 1957 med Rom-traktaten. "
-#~ "EU projektet har udviklet sig siden og begynder at ligne en superstat. "
-#~ "Men tilbage står spørgsmålet: Eksisterer der et grundlag for en fælles "
-#~ "europæisk identitet og nation?"
-
-#~ msgid "Popess"
-#~ msgstr "Popess"
-
-#~ msgid "President of the Commission"
-#~ msgstr "Kommissionsformand"
-
-#~ msgid ""
-#~ "France has long been a major power in Europe. French conquerers like "
-#~ "Emperor Napoleon and King Charlemagne united large parts of Europe under "
-#~ "the French flag."
-#~ msgstr ""
-#~ "Frankrig har længe været en indflydelsesrig magt i Europa. Franske "
-#~ "erobrere som Napoleon og Kong Charlemagne forenede store dele af Europa "
-#~ "under det franske flag."
-
-#~ msgid "?female:Premier"
-#~ msgstr "?female:Premier"
-
-#~ msgid "?female:Archbishop"
-#~ msgstr "?female:Ærkebiskop"
-
-#~ msgid "?plural:Hackers"
-#~ msgstr "?plural:Hackerne"
-
-#~ msgid "h4xx0r r0xx0rz!"
-#~ msgstr "h4xx0r r0xx0rz!"
-
-#~ 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 betyder \"Det indo-europæiske land\" - i lang tid kendt som Persien "
-#~ "i Vesten. Landet er i dag en islamisk republik og en magtfuld kraft i "
-#~ "Mellemøsten."
-
-#~ msgid ""
-#~ "According to traditional Japanese mythology, Japan was founded in the 7th "
-#~ "century BC by the Emperor Jimmu."
-#~ msgstr ""
-#~ "Ifølge den traditionelle japanske mytologi blev Japan grundlagt i det 7. "
-#~ "århundrede af den fædrene kejser Jimmu."
-
-#~ msgid "?female:Great Leader"
-#~ msgstr "?female:Store leder"
-
-#~ msgid "?female:Governor"
-#~ msgstr "?female:Leder"
-
-#~ msgid "?female:Supreme Commander"
-#~ msgstr "?female:Øverstbefalende"
-
-#~ msgid "?female:High Commissioner"
-#~ msgstr "?female:Højkommissær"
-
-#~ msgid "?female:Pierwszy Sekretarz"
-#~ msgstr "?female:Pierwszy Sekretarz"
-
-#~ msgid "?female:Noaydde"
-#~ msgstr "?female:Noaydde"
-
-#~ msgid "Samogitian"
-#~ msgstr "Samogitianer"
-
-#~ msgid "?plural:Samogitians"
-#~ msgstr "?plural:Samogitianerne"
-
-#~ 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 ""
-#~ "Samogitia - historiks et land nær Østersøen - det sidste hedenske land i "
-#~ "Europa (officelt indtil 1413). I dag, Samogitia er en region i Litauen."
-
-#~ msgid "?female:First Minister"
-#~ msgstr "?female:Førsteminister"
-
-#~ msgid "?female:Ah"
-#~ msgstr "?female:Ah"
-
-#~ msgid "?female:Encik"
-#~ msgstr "?female:Encik"
-
-#~ msgid "?female:General Secretary"
-#~ msgstr "?female: Generalsekretær"
-
-#~ msgid "?female:Cardinal"
-#~ msgstr "?female:Konsul"
-
-#~ msgid "?female:General"
-#~ msgstr "?female:General"
-
-#~ msgid "?female:Bailiff"
-#~ msgstr "?female:Bailiff"
-
-#~ msgid "?female:Federal Chancellor"
-#~ msgstr "?female:Federal Chancellor"
-
-#~ msgid ""
-#~ "Uruguay, a small South American country sometimes referred to as "
-#~ "\"Switzerland of the Americas\" due to its once higly developed social "
-#~ "welfare system."
-#~ msgstr ""
-#~ "Uruguay, et lille sydamerikansk land, undertiden refereret som et Schweiz "
-#~ "i Amerikapå grund af dets høje sociale velfærdsprogram. "
-
-#~ msgid "Venezuelan"
-#~ msgstr "Venezueler"
-
-#~ msgid "Terratenienta"
-#~ msgstr "Terratenienta"
diff --git a/po/de.gmo b/po/de.gmo
index 23121af..cf2bec3 100644
Binary files a/po/de.gmo and b/po/de.gmo differ
diff --git a/po/de.po b/po/de.po
index 837e918..76de801 100644
--- a/po/de.po
+++ b/po/de.po
@@ -39,7 +39,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 1.15\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-29 21:13+0900\n"
+"POT-Creation-Date: 2009-11-22 21:37+0100\n"
"PO-Revision-Date: 2009-03-24 22:03+0100\n"
"Last-Translator: Christian Knoke <chrisk at cknoke.de>\n"
"Language-Team: German Freeciv Translators <freeciv.de at freelists.org>\n"
@@ -98,21 +98,21 @@ msgstr "?obsolete:0"
msgid "?redundant:*"
msgstr "?redundant:*"
-#: common/connection.c:515
+#: common/connection.c:518
#, c-format
msgid "%s from %s"
msgstr "%s von %s"
-#: common/connection.c:521
+#: common/connection.c:524
msgid " (connection incomplete)"
msgstr " (Verbindung unvollständig)"
-#: common/connection.c:525
+#: common/connection.c:528
#, c-format
msgid " (player %s)"
msgstr " (Spieler %s)"
-#: common/connection.c:529
+#: common/connection.c:532
msgid " (observer)"
msgstr " (Beobachter)"
@@ -516,81 +516,81 @@ msgstr "Mitteilungen zu Verbindungen"
msgid "AI Debug messages"
msgstr "KI Debug-Meldungen"
-#: common/player.c:732
+#: common/player.c:746
msgid "?attitude:Genocidal"
msgstr "völkermordend"
-#: common/player.c:734
+#: common/player.c:748
msgid "?attitude:Belligerent"
msgstr "kriegswütig"
-#: common/player.c:736
+#: common/player.c:750
msgid "?attitude:Hostile"
msgstr "feindselig"
-#: common/player.c:738
+#: common/player.c:752
msgid "?attitude:Uncooperative"
msgstr "unkooperativ"
-#: common/player.c:740
+#: common/player.c:754
msgid "?attitude:Uneasy"
msgstr "verärgert"
-#: common/player.c:742
+#: common/player.c:756
msgid "?attitude:Neutral"
msgstr "neutral"
-#: common/player.c:744
+#: common/player.c:758
msgid "?attitude:Respectful"
msgstr "respektvoll"
-#: common/player.c:746
+#: common/player.c:760
msgid "?attitude:Helpful"
msgstr "hilfsbereit"
-#: common/player.c:748
+#: common/player.c:762
msgid "?attitude:Enthusiastic"
msgstr "begeistert"
-#: common/player.c:750
+#: common/player.c:764
msgid "?attitude:Admiring"
msgstr "bewundernd"
-#: common/player.c:753
+#: common/player.c:767
msgid "?attitude:Worshipful"
msgstr "anbetend"
-#: common/player.c:764
+#: common/player.c:778
msgid "?diplomatic_state:Armistice"
msgstr "Waffenstillstand"
-#: common/player.c:765
+#: common/player.c:779
msgid "?diplomatic_state:War"
msgstr "Krieg"
-#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:780 client/gui-gtk-2.0/diplodlg.c:353
#: 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:767 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:781 client/gui-gtk-2.0/diplodlg.c:358
#: 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:768 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:782 client/gui-gtk-2.0/diplodlg.c:363
#: 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:769
+#: common/player.c:783
msgid "?diplomatic_state:Never met"
msgstr "Unbekannt"
-#: common/player.c:770
+#: common/player.c:784
msgid "?diplomatic_state:Team"
msgstr "Team"
@@ -621,7 +621,7 @@ msgstr "Surviving requirements are only supported at world range."
#. TRANS: "Resources: (none)".
#: common/requirements.c:1014 common/team.c:132
#: client/gui-gtk-2.0/helpdlg.c:1055 client/gui-gtk-2.0/inteldlg.c:390
-#: client/gui-win32/helpdlg.c:586 client/gui-xaw/helpdlg.c:991
+#: client/gui-win32/helpdlg.c:592 client/gui-xaw/helpdlg.c:991
#, c-format
msgid "(none)"
msgstr "(keine)"
@@ -647,10 +647,11 @@ msgstr "Zukunftstechnologie %d"
#: 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
#: client/gui-sdl/helpdlg.c:817 client/gui-sdl/mapview.c:962
-#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:545
-#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:735
-#: 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
+#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:544
+#: client/gui-win32/helpdlg.c:551 client/gui-win32/helpdlg.c:721
+#: client/gui-win32/helpdlg.c:741 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 "Nichts"
@@ -663,29 +664,29 @@ msgstr "Zukunftstechnologie"
msgid "(Unknown)"
msgstr "(Unbekannt)"
-#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:553
#: manual/civmanual.c:224
msgid "Road"
msgstr "Straße"
-#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:557
#: client/gui-gtk-2.0/menu.c:829 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:394 common/terrain.c:572 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:567
#: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
#: data/civ1/techs.ruleset:563
msgid "Railroad"
msgstr "Eisenbahn"
-#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:555
msgid "Mine"
msgstr "Bergwerk"
-#: common/terrain.c:396 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:551 server/report.c:124
#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "Verschmutzung"
@@ -694,7 +695,7 @@ msgstr "Verschmutzung"
msgid "Hut"
msgstr "Hütte"
-#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:563
#: manual/civmanual.c:226
msgid "Fortress"
msgstr "Befestigung"
@@ -707,58 +708,58 @@ msgstr "Fluß"
msgid "Farmland"
msgstr "Ackerland"
-#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:577
#: manual/civmanual.c:226
msgid "Airbase"
msgstr "Fliegerhorst"
-#: common/terrain.c:402 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:579
msgid "Fallout"
msgstr "Fallout"
-#: common/unit.c:546 client/gui-win32/plrdlg.c:337
+#: common/unit.c:549 client/gui-win32/plrdlg.c:337
msgid "Idle"
msgstr "untätig"
-#: common/unit.c:556
+#: common/unit.c:559
msgid "Fortifying"
msgstr "beim befestigen"
-#: common/unit.c:558
+#: common/unit.c:561
msgid "Fortified"
msgstr "Befestigt"
-#: common/unit.c:562 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
+#: common/unit.c:565 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
msgid "Sentry"
msgstr "Bewachen"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
+#: common/unit.c:569 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
#: client/gui-win32/menu.c:370 client/gui-xaw/menu.c:185
msgid "Pillage"
msgstr "Brandschatzen"
-#: common/unit.c:568 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
+#: common/unit.c:571 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
msgid "Goto"
msgstr "Gehe nach"
-#: common/unit.c:570
+#: common/unit.c:573
msgid "Explore"
msgstr "Erkunde"
-#: common/unit.c:572 manual/civmanual.c:224
+#: common/unit.c:575 manual/civmanual.c:224
msgid "Transform"
msgstr "Verändern"
-#: common/unit.c:584 client/text.c:157 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:587 client/text.c:157 client/gui-sdl/citydlg.c:1972
#: client/gui-win32/citydlg.c:1257 client/gui-xaw/citydlg.c:1423
msgid "Unknown"
msgstr "Unbekannt"
-#: common/unit.c:1022
+#: common/unit.c:1025
msgid "Moves"
msgstr "Züge"
-#: common/unit.c:1571
+#: common/unit.c:1574
#, c-format
msgid ""
"Upgrade %s to %s for %d gold?\n"
@@ -767,12 +768,12 @@ msgstr ""
"%s zu %s für %d Goldstücke modernisieren?\n"
"Die Schatzkammer enthält %d Goldstücke."
-#: common/unit.c:1579
+#: common/unit.c:1582
#, c-format
msgid "Sorry, cannot upgrade %s (yet)."
msgstr "%s können (noch) nicht modernisiert werden."
-#: common/unit.c:1585
+#: common/unit.c:1588
#, c-format
msgid ""
"Upgrading %s to %s costs %d gold.\n"
@@ -781,11 +782,11 @@ msgstr ""
"Modernisierung von %s zu %s kostet %d Goldstücke.\n"
"Die Schatzkammer enthält %d Goldstücke."
-#: common/unit.c:1594
+#: common/unit.c:1597
msgid "You can only upgrade units in your cities."
msgstr "Sie können nur Einheiten in Städten modernisieren."
-#: common/unit.c:1598
+#: common/unit.c:1601
#, c-format
msgid "Upgrading this %s would strand units it transports."
msgstr "Modernisieren der %s würde die transportierten Einheiten stranden."
@@ -818,11 +819,11 @@ msgstr "Atomrakete"
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1404
+#: common/unittype.c:349 client/helpdata.c:1412
msgid " and "
msgstr " und "
-#: common/unittype.c:355 client/helpdata.c:1390
+#: common/unittype.c:355 client/helpdata.c:1398
msgid "?and:, "
msgstr "?and:, "
@@ -991,72 +992,72 @@ msgstr "Unvollständige Eingabe ('%s').\n"
msgid "Missing argument for \"%s\".\n"
msgstr "Unvollständige Eingabe ('%s').\n"
-#: utility/shared.c:501
+#: utility/shared.c:514
#, c-format
msgid "%d BC"
msgstr "%d v. Chr."
-#: utility/shared.c:503
+#: utility/shared.c:516
#, c-format
msgid "%d AD"
msgstr "%d AD"
-#: utility/shared.c:924
+#: utility/shared.c:937
msgid "FREECIV_PATH is set but empty; using default path instead."
msgstr "FREECIV_PATH ist leer; es wird der Standardpfad verwendet."
-#: utility/shared.c:1028
+#: utility/shared.c:1041
#, c-format
msgid "Could not read data directory %s: %s."
msgstr "Kann das Datenverzeichnis %s: %s nicht lesen."
-#: utility/shared.c:1279
+#: utility/shared.c:1292
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:1281
+#: utility/shared.c:1294
#, c-format
msgid "Current data path is: \"%s\""
msgstr "Aktueller Suchpfad: '%s'"
-#: utility/shared.c:1283
+#: utility/shared.c:1296
#, c-format
msgid "The \"%s\" file is required ... aborting!"
msgstr "Die Datei '%s' wird benötigt... Abbruch!"
-#: utility/shared.c:1460
+#: utility/shared.c:1485
#, 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:1462
+#: utility/shared.c:1487
msgid "Use a non-privileged account instead.\n"
msgstr "Starten Sie es als 'normaler' Benutzer.\n"
-#: utility/shared.c:1478
+#: utility/shared.c:1503
msgid "exact match"
msgstr "Volltreffer"
-#: utility/shared.c:1479
+#: utility/shared.c:1504
msgid "only match"
msgstr "Treffer"
-#: utility/shared.c:1480
+#: utility/shared.c:1505
msgid "ambiguous"
msgstr "mehrdeutig"
-#: utility/shared.c:1481
+#: utility/shared.c:1506
msgid "empty"
msgstr "leer"
-#: utility/shared.c:1482
+#: utility/shared.c:1507
msgid "too long"
msgstr "zu lang"
-#: utility/shared.c:1483
+#: utility/shared.c:1508
msgid "non-match"
msgstr "Fehlschlag"
@@ -1086,73 +1087,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:280
+#: ai/advdiplomacy.c:300
#, 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:290
+#: ai/advdiplomacy.c:310
#, 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:303
+#: ai/advdiplomacy.c:322
#, c-format
msgid "*%s (AI)* Let us first cease hostilies, %s."
msgstr "*%s (KI)* Laß uns erst die Feindseligkeiten beenden, %s"
-#: ai/advdiplomacy.c:308
+#: ai/advdiplomacy.c:327
#, 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:331
+#: ai/advdiplomacy.c:350
#, 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:424
+#: ai/advdiplomacy.c:443
#, 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:454
+#: ai/advdiplomacy.c:473
#, 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:560
+#: ai/advdiplomacy.c:579
#, 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:582
+#: ai/advdiplomacy.c:601
#, c-format
msgid "*%s (AI)* Welcome into our alliance %s!"
msgstr "*%s (KI)* Willkommen in unserer Allianz, %s!"
-#: ai/advdiplomacy.c:586
+#: ai/advdiplomacy.c:605
#, 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:593
+#: ai/advdiplomacy.c:612
#, c-format
msgid "*%s (AI)* Yes, peace in our time!"
msgstr "*%s (KI)* Ja, wir brauchen Frieden!"
-#: ai/advdiplomacy.c:598
+#: ai/advdiplomacy.c:617
#, c-format
msgid "*%s (AI)* Agreed. No more hostilities, %s."
msgstr "*%s (KI)* Einverstanden. Keine Feindseligkeiten mehr, %s."
-#: ai/advdiplomacy.c:813
+#: ai/advdiplomacy.c:832
#, c-format
msgid ""
"*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
@@ -1161,23 +1162,23 @@ msgstr ""
"*%s (KI)* Sei gegrüßt, %s! Dürfen wir eine Feuerpause vorschlagen, damit wir "
"uns besser kennenlernen können?"
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1116
#, c-format
msgid "*%s (AI)* Space will never be yours. "
msgstr "*%s (KI)* Der Weltraum wird Dir niemals gehören. "
-#: ai/advdiplomacy.c:1102
+#: ai/advdiplomacy.c:1121
#, 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:1108
+#: ai/advdiplomacy.c:1127
#, c-format
msgid "*%s (AI)* Peace in ... some other time."
msgstr "*%s (KI)* Frieden ... vielleicht ein anderes Mal."
-#: ai/advdiplomacy.c:1113
+#: ai/advdiplomacy.c:1132
#, c-format
msgid ""
"*%s (AI)* Finally I get around to you! Did you really think you could get "
@@ -1186,18 +1187,18 @@ msgstr ""
"*%s (KI)* Endlich kriege ich Dich! Dachtest Du wirklich, Du könntest mit "
"Deinen Verbrechen davonkommen?"
-#: ai/advdiplomacy.c:1119
+#: ai/advdiplomacy.c:1138
#, 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:1126
+#: ai/advdiplomacy.c:1145
#, 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:1209
+#: ai/advdiplomacy.c:1229
#, c-format
msgid ""
"*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1212,7 +1213,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:1219
+#: ai/advdiplomacy.c:1239
#, c-format
msgid ""
"*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
@@ -1221,7 +1222,7 @@ msgstr ""
"*%s (KI) Wir erwarten in dieser Angelegenheit Deine Hilfe. Lang lebe unsere "
"glorreiche Allianz!"
-#: ai/advdiplomacy.c:1225
+#: ai/advdiplomacy.c:1245
#, c-format
msgid ""
"*%s (AI)* %s has grossly violated his treaties with us for own gain. We "
@@ -1240,7 +1241,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:1238
+#: ai/advdiplomacy.c:1258
#, c-format
msgid ""
"*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1255,7 +1256,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:1246
+#: ai/advdiplomacy.c:1266
#, c-format
msgid ""
"*%s (AI)* If you want a piece of the loot, feel free to join in the action!"
@@ -1263,7 +1264,7 @@ msgstr ""
"*%s (KI)* Wenn Du einen Teil der Beute möchtest, kannst Du Dich gerne daran "
"beteiligen!"
-#: ai/advdiplomacy.c:1251
+#: ai/advdiplomacy.c:1271
#, c-format
msgid ""
"*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1278,14 +1279,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:1261
+#: ai/advdiplomacy.c:1281
#, 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:1267
+#: ai/advdiplomacy.c:1287
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance and declare war on %s in %d turn. "
@@ -1300,7 +1301,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:1276
+#: ai/advdiplomacy.c:1296
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1315,7 +1316,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:1344
+#: ai/advdiplomacy.c:1364
#, c-format
msgid ""
"*%s (AI)* Your attempt to conquer space for yourself alone betray your true "
@@ -1324,7 +1325,7 @@ msgstr ""
"*%s (KI)* Dein Versuch, allein den Weltraum zu erobern, zeigt Deine wahren "
"Absichten. Unsere Allianz ist beendet!"
-#: ai/advdiplomacy.c:1359
+#: ai/advdiplomacy.c:1379
#, c-format
msgid ""
"*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
@@ -1333,7 +1334,7 @@ msgstr ""
"*%s (KI)* Dein Versuch, einseitig den Weltraum zu beherrschen, ist äußerst "
"bedrohlich."
-#: ai/advdiplomacy.c:1362
+#: ai/advdiplomacy.c:1382
#, c-format
msgid ""
"*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
@@ -1342,14 +1343,14 @@ msgstr ""
"*%s (KI)* Wenn Du nicht den Raumschiffbau beendest, könnte ich gezwungen "
"sein zu reagieren!"
-#: ai/advdiplomacy.c:1474
+#: ai/advdiplomacy.c:1494
#, 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:1549
+#: ai/advdiplomacy.c:1569
#, c-format
msgid ""
"*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
@@ -1358,7 +1359,7 @@ msgstr ""
"*%s (KI)* Sei gegrüßt, ehrenwerter Verbündeter, wir zählen auf Dich, unseren "
"Feind %s zu vernichten."
-#: ai/advdiplomacy.c:1555
+#: ai/advdiplomacy.c:1575
#, c-format
msgid ""
"*%s (AI)* Greetings ally, I see you have not yet made war with our enemy, %"
@@ -1368,7 +1369,7 @@ msgstr ""
"keinen Krieg gegen unseren Feind %s. Warum müssen wir Dich an Deine "
"Versprechen erinnern?"
-#: ai/advdiplomacy.c:1562
+#: ai/advdiplomacy.c:1582
#, c-format
msgid ""
"*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1379,7 +1380,7 @@ msgstr ""
"und immer noch bist Du im Frieden mit unserem Todfeind %s! Das ist "
"unakzeptabel, unsere Allianz ist beendet!"
-#: ai/advdiplomacy.c:1592
+#: ai/advdiplomacy.c:1612
#, c-format
msgid ""
"*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
@@ -1388,14 +1389,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:1607
+#: ai/advdiplomacy.c:1627
#, 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:1622
+#: ai/advdiplomacy.c:1642
#, c-format
msgid ""
"*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
@@ -1404,7 +1405,7 @@ msgstr ""
"*%s (KI)* Wir sind des andauernden Blutvergießens müde. Dürfen wir eine "
"Einstellung der Feindseligkeiten vorschlagen?"
-#: ai/advdiplomacy.c:1742
+#: ai/advdiplomacy.c:1762
#, c-format
msgid ""
"*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1560,19 +1561,19 @@ msgstr ""
"Das Paßwort muß mindestens %d Großbuchstaben und %d Ziffern enthalten, sowie "
"mindestens %d (druckbare) Zeichen lang. Versuche es nochmals."
-#: server/barbarian.c:183
+#: server/barbarian.c:184
#, c-format
msgid "%s gain a leader by the name %s. Dangerous times may lie ahead."
msgstr ""
"Die %s haben einen neuen Anführer namens %s. Gefährliche Zeiten liegen vor "
"uns."
-#: server/barbarian.c:479
+#: server/barbarian.c:480
#, c-format
msgid "Native unrest near %s led by %s."
msgstr "Barbarenaufstand bei %s; Anführer ist %s."
-#: server/barbarian.c:484
+#: server/barbarian.c:485
#, c-format
msgid "Sea raiders seen near %s!"
msgstr "Piraten in der Nähe von %s entdeckt!"
@@ -1971,7 +1972,7 @@ msgstr[0] ""
msgstr[1] ""
"%s beschleunigt die Forschung; Sie erhalten %d zusätzliche Fortschritte."
-#: server/cityturn.c:1158 server/techtools.c:176
+#: server/cityturn.c:1158 server/techtools.c:172
#, c-format
msgid "The %s have acquired %s from %s."
msgstr "Die %s haben %s von den %s übernommen."
@@ -2059,22 +2060,22 @@ msgstr ""
"WARNUNG: Die '%s' Option gibt es nicht mehr. Benutzen Sie '-m', um die\n"
" Metaserver-Option einzuschalten.\n"
-#: server/civserver.c:189
+#: server/civserver.c:193
#, c-format
msgid "Error: unknown option '%s'\n"
msgstr "FEHLER: unbekannte Option '%s'\n"
-#: server/civserver.c:200
+#: server/civserver.c:204
#, c-format
msgid "This is the server for %s"
msgstr "%s Server"
-#: server/civserver.c:201
+#: server/civserver.c:205
#, c-format
msgid "You can learn a lot about Freeciv at %s"
msgstr "Weitere Informationen zu Freeciv finden Sie auf %s."
-#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
+#: server/civserver.c:210 client/civclient.c:239 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -2083,7 +2084,7 @@ msgstr ""
"Syntax: %s [option ...]\n"
"Gültige Optionen sind:\n"
-#: server/civserver.c:208
+#: server/civserver.c:212
msgid ""
" -a --auth FILE\tEnable server authentication with configuration from "
"FILE.\n"
@@ -2091,86 +2092,90 @@ msgstr ""
" -a --auth DATEI\tServerauthentifizierung einschalten und Konfiguration "
"aus DATEI lesen.\n"
-#: server/civserver.c:210
+#: server/civserver.c:214
msgid " -G --Guests\t\tAllow guests to login if auth is enabled.\n"
msgstr " -G --Guests\t\tGästelogin bei Authentifizierung erlauben.\n"
-#: server/civserver.c:212
+#: server/civserver.c:216
msgid " -N --Newusers\tAllow new users to login if auth is enabled.\n"
msgstr " -N --Newusers\tNeue Benutzer bei Authentifizierung erlauben.\n"
-#: server/civserver.c:215
+#: server/civserver.c:219
msgid " -b --bind ADDR\tListen for clients on ADDR\n"
msgstr " -b, --bind ADR\tNur an ADR auf Client warten\n"
-#: server/civserver.c:217 client/civclient.c:242
+#: server/civserver.c:221 client/civclient.c:243
msgid ""
" -d, --debug NUM\tSet debug log level (0 to 4, or 4:file1,min,max:...)\n"
msgstr ""
" -d, --debug NUM\tSetze Debugloglevel (0-4 oder 4:Datei1,min,max:...)\n"
-#: server/civserver.c:221 client/civclient.c:246
+#: server/civserver.c:225 client/civclient.c:247
msgid " -d, --debug NUM\tSet debug log level (0 to 3)\n"
msgstr " -d, --debug NUM\tSetze Debugloglevel (0-3)\n"
-#: server/civserver.c:223
+#: server/civserver.c:227
msgid " -f, --file FILE\tLoad saved game FILE\n"
msgstr " -f, --file DATEI\tGespeichertes Spiel DATEI laden\n"
-#: server/civserver.c:225 client/civclient.c:249 manual/civmanual.c:382
+#: server/civserver.c:229 client/civclient.c:250 manual/civmanual.c:382
msgid " -h, --help\t\tPrint a summary of the options\n"
msgstr " -h, --help\t\tZeige diesen Text\n"
-#: server/civserver.c:226
+#: server/civserver.c:230
+msgid " -i, --identity ADDR\tBe known as ADDR at metaserver\n"
+msgstr " -i, --identity ADR\tDem Metaserver bekanntgegebene Adresse\n"
+
+#: server/civserver.c:231
msgid " -l, --log FILE\tUse FILE as logfile\n"
msgstr " -l, --log DATEI\tDATEI als Logdatei benutzen\n"
-#: server/civserver.c:227
+#: server/civserver.c:232
msgid " -m, --meta\t\tNotify metaserver and send server's info\n"
msgstr " -m, --meta\t\tMetaserver verständigen und Serverinfo senden\n"
-#: server/civserver.c:229
+#: server/civserver.c:234
msgid " -M, --Metaserver ADDR\tSet ADDR as metaserver address\n"
msgstr " -M, --Metaserver ADR\tMetaserveradresse ADR benutzen\n"
-#: server/civserver.c:232
+#: server/civserver.c:237
msgid " -p, --port PORT\tListen for clients on port PORT\n"
msgstr " -p, --port PORT\tVerwende Portnummer PORT\n"
-#: server/civserver.c:234
+#: server/civserver.c:239
msgid " -q, --quitidle TIME\tQuit if no players for TIME seconds\n"
msgstr " -q, --quitidle ZEIT\tAbbrechen, wenn ZEIT Sekunden ohne Spieler\n"
-#: server/civserver.c:236
+#: server/civserver.c:241
msgid " -e, --exit-on-end\tWhen a game ends, exit instead of restarting\n"
msgstr " -e, --exit-on-end\tBei Spielende stoppen, kein Neustart\n"
-#: server/civserver.c:239
+#: server/civserver.c:244
msgid " -s, --saves DIR\tSave games to directory DIR\n"
msgstr " -s, --saves VERZ\tSpielstände im Verzeichnis VERZ speichern\n"
-#: server/civserver.c:241
+#: server/civserver.c:246
msgid " -S, --Serverid ID\tSets the server id to ID\n"
msgstr " -S, --Serverid ID\tSetze die Server-ID auf ID\n"
-#: server/civserver.c:243
+#: server/civserver.c:248
msgid " -P, --Ppm\t\tSave ppms of the map when saving the game.\n"
msgstr ""
" -P, --Ppm\t\tSpeichere PPMs der Karte beim Speichern des Spielstandes\n"
-#: server/civserver.c:244
+#: server/civserver.c:249
msgid " -r, --read FILE\tRead startup script FILE\n"
msgstr " -r, --read DATEI\tStartskript DATEI laden\n"
-#: server/civserver.c:246
+#: server/civserver.c:251
msgid " -R, --Ranklog FILE\tUse FILE as ranking logfile\n"
msgstr " -R, --Ranklog DATEI\tSchreibe Ranking-Informationen in DATEI\n"
-#: server/civserver.c:247 client/civclient.c:268 manual/civmanual.c:383
+#: server/civserver.c:252 client/civclient.c:269 manual/civmanual.c:383
msgid " -v, --version\t\tPrint the version number\n"
msgstr " -v, --version\t\tGebe die Versionsnummer aus\n"
-#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
+#: server/civserver.c:253 client/gui-gtk-2.0/gui_main.c:354
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, c-format
@@ -2182,11 +2187,11 @@ msgstr ""
"- über Probleme mit der deutschen Übersetzung mit einer E-Mail an "
"<chrisk at cknoke.de>\n"
-#: server/commands.c:28
+#: server/commands.c:29
msgid "Start the game, or restart after loading a savegame."
msgstr "Spiel beginnen oder nach Laden einer Sicherung neu starten."
-#: server/commands.c:29
+#: server/commands.c:30
msgid ""
"This command starts the game. When starting a new game, it should be used "
"after all human players have connected, and AI players have been created (if "
@@ -2205,7 +2210,7 @@ msgstr ""
"Spielbeginn steht der Befehl nicht mehr zur Verfügung."
#. TRANS: translate text between <> only
-#: server/commands.c:42
+#: server/commands.c:44
msgid ""
"help\n"
"help commands\n"
@@ -2219,11 +2224,11 @@ msgstr ""
"help <Befehl>\n"
"help <Option>"
-#: server/commands.c:47
+#: server/commands.c:49
msgid "Show help about server commands and server options."
msgstr "Hilfe zu Serverbefehlen und -einstellungen anzeigen"
-#: server/commands.c:48
+#: server/commands.c:50
msgid ""
"With no arguments gives some introductory help. With argument \"commands\" "
"or \"options\" gives respectively a list of all commands or all options. "
@@ -2237,11 +2242,11 @@ msgstr ""
"Befehle bzw. Optionen an. Für alle anderen Argumente wird die spezifische "
"Hilfe angezeigt. Das Argument darf abgekürzt werden, muß aber eindeutig sein."
-#: server/commands.c:63
+#: server/commands.c:66
msgid "Show a list of players, teams, connections, or scenarios."
msgstr "Liste der Spieler, Teams, Verbindungen oder Szenarios anzeigen."
-#: server/commands.c:64
+#: server/commands.c:67
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 "
@@ -2251,20 +2256,20 @@ msgstr ""
"verfügbaren Szenarios. Das Argument kann abgekürzt werden, Standard ist "
"'players'."
-#: server/commands.c:70
+#: server/commands.c:74
msgid "Quit the game and shutdown the server."
msgstr "Spiel beenden und Server herunterfahren"
#. TRANS: translate text between <> only
-#: server/commands.c:74
+#: server/commands.c:79
msgid "cut <connection-name>"
msgstr "cut <Verbindungsname>"
-#: server/commands.c:75
+#: server/commands.c:80
msgid "Cut a client's connection to server."
msgstr "Eine Client-Server-Verbindung beenden."
-#: server/commands.c:76
+#: server/commands.c:81
msgid ""
"Cut specified client's connection to the server, removing that client from "
"the game. If the game has not yet started that client's player is removed "
@@ -2278,7 +2283,7 @@ msgstr ""
"Spielernamen, sondern die Bezeichnung der Verbindung als Argument."
#. TRANS: translate text between <> only
-#: server/commands.c:83
+#: server/commands.c:89
msgid ""
"explain\n"
"explain <option-name>"
@@ -2286,11 +2291,11 @@ msgstr ""
"explain\n"
"explain <Option>"
-#: server/commands.c:85
+#: server/commands.c:91
msgid "Explain server options."
msgstr "Serveroptionen erläutern"
-#: server/commands.c:86
+#: server/commands.c:92
msgid ""
"The 'explain' command gives a subset of the functionality of 'help', and is "
"included for backward compatibility. With no arguments it gives a list of "
@@ -2301,7 +2306,7 @@ msgstr ""
"entspricht dem Befehl 'help options' bzw. 'help <Option>'."
#. TRANS: translate text between <> only
-#: server/commands.c:93
+#: server/commands.c:100
msgid ""
"show\n"
"show <option-name>\n"
@@ -2311,11 +2316,11 @@ msgstr ""
"show <Option>\n"
"show <abgekürzte Option>"
-#: server/commands.c:96
+#: server/commands.c:103
msgid "Show server options."
msgstr "Servereinstellungen anzeigen"
-#: server/commands.c:97
+#: server/commands.c:104
msgid ""
"With no arguments, shows all server options (or available options, when used "
"by clients). With an argument, show only the named option, or options with "
@@ -2325,38 +2330,39 @@ msgstr ""
"einem Argument werden nur die Einstellungen für dieses Argument angezeigt. "
"Das Argument kann abgekürzt werden."
-#: server/commands.c:102
+#: server/commands.c:110
msgid "wall <message>"
msgstr "wall <Nachricht>"
-#: server/commands.c:103
+#: server/commands.c:111
msgid "Send message to all connections."
msgstr "Nachricht an alle schicken."
-#: server/commands.c:104
+#: server/commands.c:112
msgid ""
"For each connected client, pops up a window showing the message entered."
msgstr ""
"Auf jedem angeschlossenen Client wird ein Fenster mit der eingegebenen "
"Nachricht geöffnet."
-#: server/commands.c:108
+#: server/commands.c:117
msgid "vote yes|no [vote number]"
msgstr "vote yes|no [Abstimmungsnummer]"
-#: server/commands.c:109
+#: server/commands.c:118
msgid "Cast a vote."
msgstr "Abstimmung durchführen."
-#: server/commands.c:111
-#, no-c-format
+#: server/commands.c:120
+#, 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."
+"A player with basic 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."
msgstr ""
"Ein Spieler mit Zugangsberechtigung Info, der einen Befehl der Kontrollebene "
"gibt, leitet damit eine Abstimmung ein. Jeder Spieler kann dann seine Stimme "
@@ -2367,7 +2373,7 @@ msgstr ""
"Ablauf einer vollen Runde oder bis ein klares Votum (mehr als 50%) erreicht "
"ist."
-#: server/commands.c:121
+#: server/commands.c:131
msgid ""
"debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
"<player> | timing | info]"
@@ -2375,11 +2381,11 @@ msgstr ""
"debug [ player <Spieler> | city <x> <y> | units <x> <y> | unit <id> | tech "
"<Spieler> | timing | info]"
-#: server/commands.c:123
+#: server/commands.c:133
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:124
+#: server/commands.c:134
msgid ""
"Print AI debug information about given entity and turn continous debugging "
"output for this entity on or off."
@@ -2387,23 +2393,23 @@ msgstr ""
"Gibt Informationen zur KI-Fehlersuche für das gegebene Spielelement aus und "
"schaltet die fortlaufende Ausgabe ein oder aus."
-#: server/commands.c:128
+#: server/commands.c:139
msgid "set <option-name> <value>"
msgstr "set <Option> <Wert>"
-#: server/commands.c:129
+#: server/commands.c:140
msgid "Set server option."
msgstr "Serveroption einstellen."
-#: server/commands.c:132
+#: server/commands.c:144
msgid "team <player> [team]"
msgstr "team <Spieler> [Team]"
-#: server/commands.c:133
+#: server/commands.c:145
msgid "Change, add or remove a player's team affiliation."
msgstr "Spielerzugehörigkeit zu einem Team"
-#: server/commands.c:134
+#: server/commands.c:146
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 +2422,15 @@ msgstr ""
"Spielern, die Ansichten und Botschaften teilen und zusammen für einen "
"Teamsieg kämpfen. Die Punkte werden aufgeteilt."
-#: server/commands.c:141
+#: server/commands.c:154
msgid "rulesetdir <directory>"
msgstr "rulesetdir <Verzeichnis>"
-#: server/commands.c:142
+#: server/commands.c:155
msgid "Choose new ruleset directory or modpack."
msgstr "Neues Regelverzeichnis oder Modpack wählen."
-#: server/commands.c:143
+#: server/commands.c:156
msgid ""
"Choose new ruleset directory or modpack. Calling this\n"
" without any arguments will show you the currently selected ruleset."
@@ -2433,15 +2439,15 @@ msgstr ""
"Argumente aufgerufen, wird der derzeitige Regelsatz angezeigt."
#. TRANS: translate text between <> only
-#: server/commands.c:149
+#: server/commands.c:163
msgid "metainfo <meta-line>"
msgstr "metainfo <Text>"
-#: server/commands.c:150
+#: server/commands.c:164
msgid "Set metaserver info line."
msgstr "Metaserver-Informationszeile setzen"
-#: server/commands.c:151
+#: server/commands.c:165
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 +2461,19 @@ msgstr ""
"Informationszeilen verwendet, wenn sie verfügbar ist."
#. TRANS: translate text between <> only
-#: server/commands.c:158
+#: server/commands.c:173
msgid "metapatch <meta-line>"
msgstr "metapatch <Patch Info>"
-#: server/commands.c:159
+#: server/commands.c:174
msgid "Set metaserver patches line."
msgstr "Patch-Informationen des Metaservers setzen"
-#: server/commands.c:165
+#: server/commands.c:181
msgid "Control metaserver connection."
msgstr "Verbindung zum Metaserver."
-#: server/commands.c:166
+#: server/commands.c:182
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 +2484,33 @@ msgstr ""
"'metaconnection up' oder 'metac u' stellt die Verbindung zum Metaserver her"
#. TRANS: translate text between <> only
-#: server/commands.c:172
+#: server/commands.c:189
msgid "metaserver <address>"
msgstr "Metaserver <Adresse>"
-#: server/commands.c:173
+#: server/commands.c:190
msgid "Set address (URL) for metaserver to report to."
msgstr "Adresse (URL) des Metaservers einstellen."
#. TRANS: translate text between <> only
-#: server/commands.c:177
+#: server/commands.c:195
msgid "aitoggle <player-name>"
msgstr "aitoggle <Spieler>"
-#: server/commands.c:178
+#: server/commands.c:196
msgid "Toggle AI status of player."
msgstr "Umschalten zwischen menschlichem und KI-Spieler."
#. TRANS: translate text between [] and <> only
-#: server/commands.c:182
+#: server/commands.c:201
msgid "take [connection-name] <player-name>"
msgstr "take [Verbindungsname] <Spieler>"
-#: server/commands.c:183
+#: server/commands.c:202
msgid "Take over a player's place in the game."
msgstr "Den Platz eines Spielers im Spiel einnehmen."
-#: server/commands.c:184
+#: server/commands.c:203
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 +2525,15 @@ msgstr ""
"Verbindung noch keinen Spieler kontrolliert, wird ein neuer Spieler erzeugt."
#. TRANS: translate text between [] only
-#: server/commands.c:192
+#: server/commands.c:212
msgid "observe [connection-name] [player-name]"
msgstr "observe [Verbindungsname] [Spieler]"
-#: server/commands.c:193
+#: server/commands.c:213
msgid "Observe a player or the whole game."
msgstr "Beobachten des Spiels oder eines Spielers."
-#: server/commands.c:194
+#: server/commands.c:214
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 +2548,15 @@ msgstr ""
"beobachtet die Verbindung das Spiel global."
#. TRANS: translate text between <> only
-#: server/commands.c:202
+#: server/commands.c:223
msgid "detach <connection-name>"
msgstr "detach <Verbindungsname>"
-#: server/commands.c:203
+#: server/commands.c:224
msgid "detach from a player."
msgstr "Verbindung zu Spieler lösen."
-#: server/commands.c:204
+#: server/commands.c:225
msgid ""
"Only the console and connections with cmdlevel 'hack' can force other "
"connections to detach from a player."
@@ -2560,20 +2566,20 @@ msgstr ""
"<Spieler> erlaubt"
#. TRANS: translate text between <> only
-#: server/commands.c:209
+#: server/commands.c:231
msgid "create <player-name>"
msgstr "create <Spieler>"
-#: server/commands.c:210
+#: server/commands.c:232
msgid "Create an AI player with a given name."
msgstr "KI-Spieler erzeugen"
-#: server/commands.c:211
+#: server/commands.c:233
msgid ""
"The 'create' command is only available before the game has been started."
msgstr "'create' kann nur vor Spielbeginn verwendet werden."
-#: server/commands.c:215
+#: server/commands.c:238
msgid ""
"away\n"
"away"
@@ -2581,16 +2587,16 @@ msgstr ""
"away\n"
"away"
-#: server/commands.c:217
+#: server/commands.c:240
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:218
+#: server/commands.c:241
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:222
+#: server/commands.c:246
msgid ""
"novice\n"
"novice <player-name>"
@@ -2598,11 +2604,11 @@ msgstr ""
"novice\n"
"novice <Spieler>"
-#: server/commands.c:224
+#: server/commands.c:248
msgid "Set one or all AI players to 'novice'."
msgstr "Einen oder alle KI-Spieler auf 'sehr leichte' Spielstärke einstellen."
-#: server/commands.c:225
+#: server/commands.c:249
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 +2619,7 @@ msgstr ""
"Spieler eingestellt."
#. TRANS: translate text between <> only
-#: server/commands.c:231
+#: server/commands.c:256
msgid ""
"easy\n"
"easy <player-name>"
@@ -2621,11 +2627,11 @@ msgstr ""
"easy\n"
"easy <Spieler>"
-#: server/commands.c:233
+#: server/commands.c:258
msgid "Set one or all AI players to 'easy'."
msgstr "Einen oder alle KI-Spieler auf 'einfache' Spielstärke einstellen."
-#: server/commands.c:234
+#: server/commands.c:259
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 +2642,7 @@ msgstr ""
"KI-Spieler eingestellt."
#. TRANS: translate text between <> only
-#: server/commands.c:240
+#: server/commands.c:266
msgid ""
"normal\n"
"normal <player-name>"
@@ -2644,11 +2650,11 @@ msgstr ""
"normal\n"
"normal <Spieler>"
-#: server/commands.c:242
+#: server/commands.c:268
msgid "Set one or all AI players to 'normal'."
msgstr "Einen oder alle KI-Spieler auf 'normale' Spielstärke einstellen."
-#: server/commands.c:243
+#: server/commands.c:269
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 +2665,7 @@ msgstr ""
"KI-Spieler eingestellt."
#. TRANS: translate text between <> only
-#: server/commands.c:249
+#: server/commands.c:276
msgid ""
"hard\n"
"hard <player-name>"
@@ -2667,11 +2673,11 @@ msgstr ""
"hard\n"
"hard <Spieler>"
-#: server/commands.c:251
+#: server/commands.c:278
msgid "Set one or all AI players to 'hard'."
msgstr "Einen oder alle KI-Spieler auf 'schwere' Spielstärke einstellen."
-#: server/commands.c:252
+#: server/commands.c:279
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 +2688,7 @@ msgstr ""
"KI-Spieler eingestellt."
#. TRANS: translate text between <> only
-#: server/commands.c:258
+#: server/commands.c:286
msgid ""
"experimental\n"
"experimental <player-name>"
@@ -2690,12 +2696,12 @@ msgstr ""
"experimental\n"
"experimental <Spieler>"
-#: server/commands.c:260
+#: server/commands.c:288
msgid "Set one or all AI players to 'experimental'."
msgstr ""
"Einen oder alle KI-Spieler auf 'experimentelle' Spielstärke einstellen."
-#: server/commands.c:261
+#: server/commands.c:289
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 +2714,7 @@ msgstr ""
"NEUEM KI-CODE! Auf normalen Servern hat diese Option keine Auswirkungen."
#. TRANS: translate text between <> only
-#: server/commands.c:269
+#: server/commands.c:298
msgid ""
"cmdlevel\n"
"cmdlevel <level>\n"
@@ -2722,17 +2728,20 @@ msgstr ""
"cmdlevel <Zugriffsberechtigung> first\n"
"cmdlevel <Zugriffsberechtigung> <Verbindungsname>"
-#: server/commands.c:274
+#: server/commands.c:303
msgid "Query or set command access level access."
msgstr "Abfrage bzw. Setzen der Zugriffsberechtigung"
-#: server/commands.c:275
+#: server/commands.c:304
+#, fuzzy
msgid ""
"The command access level controls which server commands are available\n"
"to users via the client chatline. The available levels are:\n"
" none - no commands\n"
-" info - informational commands only\n"
+" info - informational or observer commands only\n"
+" basic - commands available to players in the game\n"
" ctrl - commands that affect the game and users\n"
+" admin - commands that affect server operation\n"
" hack - *all* commands - dangerous!\n"
"With no arguments, the current command access levels are reported.\n"
"With a single argument, the level is set for all existing connections,\n"
@@ -2766,20 +2775,20 @@ msgstr ""
"Um Mißbrauch zu verhindern, gelten Zugangsberechtigungen nur bis zum Ende\n"
"einer Verbindung."
-#: server/commands.c:296
+#: server/commands.c:328
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:301
+#: server/commands.c:334
msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
msgstr "timeoutincrease <Zug> <Zugzahl> <Wert> <Faktor>"
-#: server/commands.c:302
+#: server/commands.c:335
msgid "See \"help timeoutincrease\"."
msgstr "siehe 'help timeoutincrease'"
-#: server/commands.c:303
+#: server/commands.c:336
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 +2799,43 @@ msgstr ""
"der Option 'timeout' benutzt. Die Standardwerte sind 0 0 0 1."
#. TRANS: translate text between <> only
-#: server/commands.c:309
+#: server/commands.c:343
+msgid ""
+"cancelvote\n"
+"cancelvote <vote number>\n"
+"cancelvote all\n"
+msgstr ""
+
+#: server/commands.c:346
+msgid "Cancel a running vote.\n"
+msgstr ""
+
+#: server/commands.c:347
+msgid ""
+"With no arguments this command removes your own vote. If you have an admin "
+"access level, you can cancel any vote by vote number, or all votes with the "
+"'all' argument."
+msgstr ""
+
+#. TRANS: translate text between <> only
+#: server/commands.c:354
msgid "endgame"
msgstr "endgame"
-#: server/commands.c:310
+#: server/commands.c:355
msgid "End the game immediately in a draw."
msgstr "Beendet das Spiel sofort mit einem Unentschieden."
#. TRANS: translate text between <> only
-#: server/commands.c:314
+#: server/commands.c:360
msgid "surrender"
msgstr "surrender"
-#: server/commands.c:315
+#: server/commands.c:361
msgid "Concede the game."
msgstr "Spiel aufgeben."
-#: server/commands.c:316
+#: server/commands.c:362
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 +2844,15 @@ msgstr ""
"auf einen Spieler (oder ein Team) ausgeschieden sind, endet das Spiel."
#. TRANS: translate text between <> only
-#: server/commands.c:322
+#: server/commands.c:369
msgid "remove <player-name>"
msgstr "remove <Spieler>"
-#: server/commands.c:323
+#: server/commands.c:370
msgid "Fully remove player from game."
msgstr "Spieler vollständig aus dem Spiel entfernen"
-#: server/commands.c:324
+#: server/commands.c:371
msgid ""
"This *completely* removes a player from the game, including all cities and "
"units etc. Use with care!"
@@ -2833,7 +2861,7 @@ msgstr ""
"einschließlich aller Städte und Einheiten. Vorsicht!"
#. TRANS: translate text between <> only
-#: server/commands.c:329
+#: server/commands.c:377
msgid ""
"save\n"
"save <file-name>"
@@ -2841,11 +2869,11 @@ msgstr ""
"save\n"
"save <Dateiname>"
-#: server/commands.c:331
+#: server/commands.c:379
msgid "Save game to file."
msgstr "Spiel speichern"
-#: server/commands.c:332
+#: server/commands.c:380
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 +2890,7 @@ msgstr ""
"auf und gibt nachdem alle Mitspieler bereit sind, 'start' ein."
#. TRANS: translate text between <> only
-#: server/commands.c:341
+#: server/commands.c:390
msgid ""
"load\n"
"load <file-name>"
@@ -2870,11 +2898,11 @@ msgstr ""
"load\n"
"load <Dateiname>"
-#: server/commands.c:343
+#: server/commands.c:392
msgid "Load game from file."
msgstr "Spieldatei laden."
-#: server/commands.c:344
+#: server/commands.c:393
msgid ""
"Load a game from <file-name>. Any current data including players, rulesets "
"and server options are lost.\n"
@@ -2883,122 +2911,122 @@ msgstr ""
"Regelsatz und Serveroptionen) gehen dabei verloren.\n"
#. TRANS: translate text between <> only
-#: server/commands.c:349
+#: server/commands.c:399
msgid "read <file-name>"
msgstr "read <Dateiname>"
-#: server/commands.c:350
+#: server/commands.c:400
msgid "Process server commands from file."
msgstr "Servereinstellungen aus Datei übernehmen"
#. TRANS: translate text between <> only
-#: server/commands.c:354
+#: server/commands.c:405
msgid "write <file-name>"
msgstr "write <Dateiname>"
-#: server/commands.c:355
+#: server/commands.c:406
msgid "Write current settings as server commands to file."
msgstr "Servereinstellungen als Datei speichern"
-#: server/commands.c:359
+#: server/commands.c:411
msgid "Switch server output between 'RFC-style' and normal style."
msgstr "Serverausgabe ändern: 'RFC-Stl' oder 'Standard-Stil'"
-#: server/commands.c:363
+#: server/commands.c:416
msgid "Simply returns the id of the server."
msgstr "Gibt die ID des Servers aus."
-#: server/connecthand.c:85
+#: server/connecthand.c:109
#, c-format
msgid "Welcome to the %s Server running at %s port %d."
msgstr "Willkommen auf dem %s Server (%s Port: %d)."
-#: server/connecthand.c:89
+#: server/connecthand.c:113
#, c-format
msgid "Welcome to the %s Server at port %d."
msgstr "Willkommen auf dem %s Server (Port %d)."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:97
+#: server/connecthand.c:121
#, c-format
msgid "(%d) %s: connected [%s]"
msgstr "(%d) %s von %s hat Verbindung aufgenommen."
-#: server/connecthand.c:104
+#: server/connecthand.c:128
#, c-format
msgid "Server: %s has connected from %s."
msgstr "Server: %s von %s hat Verbindung aufgenommen."
-#: server/connecthand.c:145
+#: server/connecthand.c:175
msgid "Couldn't attach your connection to new player."
msgstr "Es steht kein neuer Spieler mehr zur Verfügung."
-#: server/connecthand.c:165
+#: server/connecthand.c:199
#, c-format
msgid "You are logged in as '%s' connected to no player."
msgstr ""
"Sie sind als '%s' mit dem Spiel verbunden, kontrollieren aber keinen Spieler."
-#: server/connecthand.c:169
+#: server/connecthand.c:203
#, c-format
msgid "You are logged in as '%s' connected to an anonymous player."
msgstr ""
"Sie sind als '%s' mit dem Spiel und mit einem Spieler ohne Namen verbunden."
-#: server/connecthand.c:174
+#: server/connecthand.c:208
#, c-format
msgid "You are logged in as '%s' connected to %s."
msgstr "Sie sind als '%s' eingeloggt und mit dem Spieler %s verbunden."
-#: server/connecthand.c:187
+#: server/connecthand.c:221
#, c-format
msgid "Turn-blocking game play: waiting on %s to finish turn..."
msgstr "Runden-Sperre aktiv: %s hat die Runde noch nicht beendet..."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:240
+#: server/connecthand.c:274
#, c-format
msgid "(%d) %s: connection request [%s]"
msgstr "(%d) %s von %s erbittet Verbindung."
-#: server/connecthand.c:266
+#: server/connecthand.c:300
msgid "The client is missing a capability that this server needs."
msgstr ""
"UPDATE ERFORDERLICH:\n"
"Der Client hat nicht die vom Server benötigten Fähigkeiten."
-#: server/connecthand.c:268 server/connecthand.c:279
+#: server/connecthand.c:302 server/connecthand.c:313
#, c-format
msgid "(%d) %s rejected: mismatched capabilities!"
msgstr "(%d) %s abgewiesen: inkompatible Versionen."
-#: server/connecthand.c:277
+#: server/connecthand.c:311
msgid "This server is missing a capability that the client needs."
msgstr ""
"UPDATE ERFORDERLICH:\n"
"Der Server hat nicht die vom Client benötigten Fähigkeiten."
-#: server/connecthand.c:290
+#: server/connecthand.c:324
msgid "The username is invalid!"
msgstr "Unzulässiger Name"
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:292
+#: server/connecthand.c:326
#, c-format
msgid "(%d) %s rejected: invalid username [%s]"
msgstr "(%d) %s wurde abgewiesen: Name [%s] ungültig."
-#: server/connecthand.c:303
+#: server/connecthand.c:337
msgid "Your username is already connected!"
msgstr "Dein Name wird bereits verwendet!"
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:305
+#: server/connecthand.c:339
#, c-format
msgid "(%d) %s rejected: duplicate username [%s]"
msgstr "(%d) %s wurde abgewiesen: doppelter Name [%s]."
-#: server/connecthand.c:335 server/connecthand.c:344
+#: server/connecthand.c:369 server/connecthand.c:378
#, c-format
msgid "Lost connection: %s."
msgstr "Verbindung verloren: %s."
@@ -3015,117 +3043,117 @@ msgstr "OK. Standard-Stil."
msgid "For introductory help, type 'help'."
msgstr "'help' gibt Erläuterungen zur Verwendung der Online-Hilfe."
-#: server/diplhand.c:164
+#: server/diplhand.c:167
#, c-format
msgid "The %s can't accept %s."
msgstr "Die %s können %s nicht akzeptieren."
-#: server/diplhand.c:176
+#: server/diplhand.c:179
#, c-format
msgid "You don't have tech %s, you can't accept treaty."
msgstr "Da %s nicht bekannt ist, kann dem Abkommen nicht zugestimmt werden."
-#: server/diplhand.c:185
+#: server/diplhand.c:188
msgid "City you are trying to give no longer exists, you can't accept treaty."
msgstr ""
"Dem Abkommen kann nicht zugestimmt werden, da die Stadt, die abgegeben "
"werden soll, nicht mehr existiert."
-#: server/diplhand.c:191
+#: server/diplhand.c:194
#, c-format
msgid "You are not owner of %s, you can't accept treaty."
msgstr "Da Ihnen %s nicht gehört, kann dem Abkommen nicht zugestimmt werden."
-#: server/diplhand.c:197 server/diplhand.c:301
+#: server/diplhand.c:200 server/diplhand.c:304
#, c-format
msgid "Your capital (%s) is requested, you can't accept treaty."
msgstr ""
"Dem Abkommen kann nicht zugestimmt werden, da Ihre Hauptstadt (%s) verlangt "
"wird."
-#: server/diplhand.c:224
+#: server/diplhand.c:227
msgid "You don't have enough gold, you can't accept treaty."
msgstr "Nicht genug Gold, um dem Abkommen zustimmen zu können."
-#: server/diplhand.c:256 server/diplhand.c:261
+#: server/diplhand.c:259 server/diplhand.c:264
#, c-format
msgid "A treaty containing %d clause was agreed upon."
msgid_plural "A treaty containing %d clauses was agreed upon."
msgstr[0] "Ein Abkommen mit %d Klausel wurde vereinbart."
msgstr[1] "Ein Abkommen mit %d Klauseln wurde vereinbart."
-#: server/diplhand.c:277 server/diplhand.c:281
+#: server/diplhand.c:280 server/diplhand.c:284
#, c-format
msgid "One of the cities the %s are giving away is destroyed! Treaty canceled!"
msgstr ""
"Eine der Städte, die die %s abgeben möchte, wurde zerstört! Das Abkommen ist "
"gegenstandslos!"
-#: server/diplhand.c:288 server/diplhand.c:293
+#: server/diplhand.c:291 server/diplhand.c:296
#, c-format
msgid "The %s no longer control %s! Treaty canceled!"
msgstr "Die %s regieren %s nicht mehr! Das Abkommen ist gegenstandslos!"
-#: server/diplhand.c:331 server/diplhand.c:335
+#: server/diplhand.c:334 server/diplhand.c:338
#, c-format
msgid "The %s don't have the promised amount of gold! Treaty canceled!"
msgstr ""
"Die %s haben das versprochene Gold nicht! Das Abkommen ist gegenstandslos!"
-#: server/diplhand.c:364
+#: server/diplhand.c:367
#, c-format
msgid "You gave an embassy to %s."
msgstr "Du hast %s erlaubt, eine Botschaft bei dir zu eröffnen."
-#: server/diplhand.c:367
+#: server/diplhand.c:370
#, c-format
msgid "%s allowed you to create an embassy!"
msgstr "%s hat dir erlaubt, eine Botschaft zu eröffnen!"
-#: server/diplhand.c:383
+#: server/diplhand.c:386
#, c-format
msgid "You are taught the knowledge of %s."
msgstr "Die Kenntnis über %s wurde vermittelt."
-#: server/diplhand.c:387
+#: server/diplhand.c:390
#, c-format
msgid "The %s have acquired %s from the %s."
msgstr "Die %s haben %s von den %s übernommen."
-#: server/diplhand.c:402
+#: server/diplhand.c:405
#, c-format
msgid "You get %d gold."
msgstr "%d Goldstücke erhalten."
#. TRANS: ... Polish worldmap.
-#: server/diplhand.c:410
+#: server/diplhand.c:413
#, c-format
msgid "You receive the %s worldmap."
msgstr "Du hast die %se Weltkarte erhalten."
#. TRANS: ... Polish seamap.
-#: server/diplhand.c:419
+#: server/diplhand.c:422
#, c-format
msgid "You receive the %s seamap."
msgstr "Du hast die %se Seekarte erhalten."
-#: server/diplhand.c:436
+#: server/diplhand.c:439
#, c-format
msgid "You receive city of %s from %s."
msgstr "Stadt %s von %s erhalten."
-#: server/diplhand.c:441
+#: server/diplhand.c:444
#, c-format
msgid "You give city of %s to %s."
msgstr "Stadt %s an %s abgegeben."
-#: server/diplhand.c:454 server/diplhand.c:457
+#: server/diplhand.c:457 server/diplhand.c:460
#, c-format
msgid "You agree on a cease-fire with %s."
msgstr "Du stimmst einer Feuerpause mit %s zu."
#. TRANS: ... the Poles ... Polish territory.
-#: server/diplhand.c:476 server/diplhand.c:488
+#: server/diplhand.c:479 server/diplhand.c:491
#, c-format
msgid ""
"You agree on an armistice with the %s. In %d turn, it will become a peace "
@@ -3140,32 +3168,32 @@ msgstr[1] ""
"Du hast einem Waffenstillstand mit den %s zugestimmt. In %d Runden wird "
"daraus ein Friedensvertrag. Entferne deine Einheiten aus dem %sen Gebiet."
-#: server/diplhand.c:512 server/diplhand.c:515
+#: server/diplhand.c:515 server/diplhand.c:518
#, c-format
msgid "You agree on an alliance with %s."
msgstr "Du hast einer Allianz mit %s zugestimmt."
-#: server/diplhand.c:524
+#: server/diplhand.c:527
#, c-format
msgid "You give shared vision to %s."
msgstr "%s darf unsere Karte einsehen."
-#: server/diplhand.c:527
+#: server/diplhand.c:530
#, c-format
msgid "%s gives you shared vision."
msgstr "%s läßt uns die Karte einsehen."
-#: server/diplhand.c:663
+#: server/diplhand.c:666
#, c-format
msgid "%s canceled the meeting!"
msgstr "%s hat die Konferenz abgesagt!"
-#: server/diplhand.c:670
+#: server/diplhand.c:673
#, c-format
msgid "Meeting with %s canceled."
msgstr "Treffen mit %s abgesagt."
-#: server/diplhand.c:712
+#: server/diplhand.c:715
msgid "Your diplomatic envoy was decapitated!"
msgstr "Ihr Unterhändler wurde enthauptet!"
@@ -3352,39 +3380,39 @@ msgid "The %s destroyed the %s in %s."
msgstr "Die %s vernichteten %s in %s."
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1091
+#: server/diplomats.c:1097
#, c-format
msgid "An enemy %s has been eliminated by your %s."
msgstr "Feindlicher %s wurde von Deinem %s getötet."
#. TRANS: <unit> ... <city> ... <diplomat>
-#: server/diplomats.c:1098
+#: server/diplomats.c:1104
#, c-format
msgid "Your %s has been eliminated defending %s against a %s."
msgstr "%s wurde während des Dienstes von einem %s in %s getötet."
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1106
+#: server/diplomats.c:1112
#, c-format
msgid "Your %s has been eliminated defending against a %s."
msgstr "%s wurde von feindlichem %s getötet."
-#: server/diplomats.c:1119
+#: server/diplomats.c:1125
#, c-format
msgid "Your %s was eliminated by a defending %s."
msgstr "%s wurde von einem Wächter (%s) getötet."
-#: server/diplomats.c:1127
+#: server/diplomats.c:1133
#, c-format
msgid "Eliminated %s %s while infiltrating %s."
msgstr "%ser %s wurde bei dem Versuch %s zu unterwandern getötet."
-#: server/diplomats.c:1134
+#: server/diplomats.c:1140
#, c-format
msgid "Eliminated %s %s while infiltrating our troops."
msgstr "%ser %s wurde bei dem Versuch unsere Einheiten zu bestechen getötet."
-#: server/diplomats.c:1185
+#: server/diplomats.c:1191
#, c-format
msgid ""
"Your %s has successfully completed the mission and returned unharmed to %s."
@@ -3392,48 +3420,48 @@ msgstr ""
"Dein %s hat seine Mission erfolgreich beendet und ist unverletzt nach %s "
"zurückgekehrt."
-#: server/diplomats.c:1204
+#: server/diplomats.c:1210
#, c-format
msgid "Your %s was captured after completing the mission in %s."
msgstr "Dein %s wurde nach Beendigung seiner Mission in %s gefangen genommen."
-#: server/diplomats.c:1210
+#: server/diplomats.c:1216
#, c-format
msgid "Your %s was captured after completing the mission."
msgstr "%s wurde nach Beendigung seiner Mission gefangen genommen."
-#: server/diplomats.c:1242
+#: server/diplomats.c:1248
#, c-format
msgid "You have caused an incident while bribing the %s %s."
msgstr "Die Bestechung der %sen %s hat eine diplomatische Krise verursacht."
-#: server/diplomats.c:1247
+#: server/diplomats.c:1253
#, c-format
msgid "%s has caused an incident while bribing your %s."
msgstr "%s hat mit der Bestechung von %s eine diplomatische Krise verursacht."
-#: server/diplomats.c:1254
+#: server/diplomats.c:1260
#, c-format
msgid "You have caused an incident while attempting to steal tech from %s."
msgstr ""
"Du hast durch den Diebstahl eines Forschungsergebnisses von den %s einen "
"diplomatischen Zwischenfall verursacht."
-#: server/diplomats.c:1258
+#: server/diplomats.c:1264
#, c-format
msgid "%s has caused an incident while attempting to steal tech from you."
msgstr ""
"Die %s haben durch den Diebstahl eines Forschungsergebnisses von dir einen "
"diplomatischen Zwischenfall verursacht."
-#: server/diplomats.c:1264
+#: server/diplomats.c:1270
#, c-format
msgid "You have caused an incident while inciting a revolt in %s."
msgstr ""
"Die Anstiftung zu einer Revolte in %s hat eine diplomatische Krise "
"verursacht."
-#: server/diplomats.c:1268
+#: server/diplomats.c:1274
#, c-format
msgid "%s have caused an incident while inciting a revolt in %s."
msgstr ""
@@ -3555,12 +3583,12 @@ msgstr ""
"Wissenschaftler.\n"
" Spontan haben sie alle Städte damit ausgestattet."
-#: server/maphand.c:1418
+#: server/maphand.c:1425
#, c-format
msgid "Moved your %s due to changing terrain."
msgstr "Deine %s wurde wegen Veränderung des Geländes verschoben."
-#: server/maphand.c:1436
+#: server/maphand.c:1443
#, c-format
msgid "Disbanded your %s due to changing terrain."
msgstr "Deine %s wurde wegen Veränderung des Geländes aufgelöst."
@@ -3569,7 +3597,7 @@ msgstr "Deine %s wurde wegen Veränderung des Geländes aufgelöst."
msgid "Not reporting to the metaserver in this game."
msgstr "In diesem Spiel werden keine Daten an den Metaserver geschickt."
-#: server/meta.c:430
+#: server/meta.c:432
#, c-format
msgid "Metaserver: bad address: [%s:%d]."
msgstr "Metaserver: Die Adresse [%s:%d] ist ungültig."
@@ -3698,26 +3726,26 @@ msgstr ""
"Ihr Teampartner %s hat den %s den Krieg erklärt. Sie sind verpflichtet, Ihre "
"Allianz mit %s zu beenden."
-#: server/plrhand.c:1103
+#: server/plrhand.c:1115
#, c-format
msgid "Removing player %s."
msgstr "Spieler %s wird entfernt."
-#: server/plrhand.c:1105
+#: server/plrhand.c:1117
msgid "You've been removed from the game!"
msgstr "Sie wurden aus dem Spiel entfernt."
-#: server/plrhand.c:1108
+#: server/plrhand.c:1120
#, c-format
msgid "%s has been removed from the game."
msgstr "%s wurde aus dem Spiel entfernt."
-#: server/plrhand.c:1153 server/plrhand.c:1158
+#: server/plrhand.c:1167 server/plrhand.c:1172
#, c-format
msgid "You have made contact with the %s, ruled by %s."
msgstr "Die %s entdeckt. Ihr Herrscher ist %s."
-#: server/plrhand.c:1178
+#: server/plrhand.c:1192
#, c-format
msgid ""
"%s and %s meet and go to instant war. You cancel your alliance with both."
@@ -3725,17 +3753,17 @@ msgstr ""
"%s und %s treffen aufeinander und beginnen sofort einen Krieg. Du beendest "
"deine Allianz mit beiden."
-#: server/plrhand.c:1656
+#: server/plrhand.c:1670
#, 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:1663
+#: server/plrhand.c:1677
#, 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:1686
+#: server/plrhand.c:1700
#, c-format
msgid ""
"Your nation is thrust into civil war! %s is declared the leader of the rebel "
@@ -3744,12 +3772,12 @@ msgstr ""
"Die Nation wird vom Bürgerkrieg gespalten. %s ist der Anführer der "
"revoltierenden Provinzen."
-#: server/plrhand.c:1707
+#: server/plrhand.c:1721
#, c-format
msgid "%s declares allegiance to %s."
msgstr "%s erklärt ihre Loyalität zu %s."
-#: server/plrhand.c:1722
+#: server/plrhand.c:1736
#, c-format
msgid ""
"Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3942,67 +3970,67 @@ msgstr "(baut %s in %s (%s))\n"
msgid "Wonders of the World"
msgstr "Weltwunder"
-#: server/report.c:547
+#: server/report.c:552
msgid " sq. mi."
msgstr " qkm"
-#: server/report.c:557
+#: server/report.c:562
msgid " M tons"
msgstr " M t"
-#: server/report.c:562
+#: server/report.c:567
msgid " M goods"
msgstr " M Produkte"
-#: server/report.c:567
+#: server/report.c:572
msgid " bulbs"
msgstr " Punkte"
-#: server/report.c:572
+#: server/report.c:577
msgid " month"
msgid_plural " months"
msgstr[0] " Monat"
msgstr[1] " Monate"
-#: server/report.c:577
+#: server/report.c:582
msgid " ton"
msgid_plural " tons"
msgstr[0] " t"
msgstr[1] " t"
-#: server/report.c:591
+#: server/report.c:596
msgid "st"
msgstr "."
-#: server/report.c:593
+#: server/report.c:598
msgid "nd"
msgstr "."
-#: server/report.c:595
+#: server/report.c:600
msgid "rd"
msgstr "."
-#: server/report.c:597
+#: server/report.c:602
msgid "th"
msgstr "."
-#: server/report.c:700
+#: server/report.c:705
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:743 server/report.c:768
+#: server/report.c:748 server/report.c:773
msgid "Demographics Report:"
msgstr "Bericht zur Lage der Nation:"
-#: server/report.c:744
+#: server/report.c:749
msgid "Sorry, the Demographics report is unavailable."
msgstr "Der Bericht zur Lage der Nation ist leider nicht verfügbar."
#. TRANS: <nation adjective> <government name> (<year>).
#. * E.g. "Polish Despotism (200 AD)".
-#: server/report.c:750
+#: server/report.c:755
#, c-format
msgid "%s %s (%s)"
msgstr "%s %s (%s)"
@@ -4013,11 +4041,11 @@ msgstr "%s %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:2356
+#: server/ruleset.c:2366
msgid "No barbarian nation in rulesets, at least one required!"
msgstr "Keine Barbarennation im Ruleset, eine wird mindestens benötigt!"
-#: server/ruleset.c:3166
+#: server/ruleset.c:3178
msgid "Loading rulesets"
msgstr "Lade Regelsätze"
@@ -4032,19 +4060,19 @@ 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:3588
+#: server/savegame.c:3587
msgid "Saved game is too old, at least version 1.9.0 required."
msgstr "Das abgespeicherte Spiel ist zu alt (< 1.9.0)."
#. TRANS: Fatal error message.
-#: server/savegame.c:3815
+#: server/savegame.c:3817
msgid ""
"Saved game uses the \"classic\" terrain ruleset, and is no longer supported."
msgstr ""
"Das abgespeicherte Spiel verwendet alte Gelände-Regeln, die nicht mehr "
"unterstützt werden."
-#: server/savegame.c:3824
+#: server/savegame.c:3826
#, c-format
msgid ""
"Warning: Different rulesetdirs ('%s' and '%s') are no longer supported. "
@@ -4054,7 +4082,7 @@ msgstr ""
"Stattdessen wird das Verzeichnis '%s' benutzt."
#. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4051
+#: server/savegame.c:4055
#, c-format
msgid "%s had invalid nation; changing to %s."
msgstr "%s ist eine ungültige Nation und wird geändert auf %s."
@@ -4087,7 +4115,7 @@ msgstr "Spiel"
msgid "Networking"
msgstr "Netz"
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:734
#: client/gui-win32/dialogs.c:532
msgid "All"
msgstr "Alle"
@@ -5312,11 +5340,11 @@ msgstr ""
"benutzt werden, nach Spielende Grafiken anzuzeigen."
# EH: Diese Fehlermeldung sollte mE nicht übersetzt werden.
-#: server/sernet.c:150
+#: server/sernet.c:151
msgid "Server cannot read standard input. Ignoring input."
msgstr "Server cannot read standard input. Ignoring input."
-#: server/sernet.c:929
+#: server/sernet.c:933
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr "Server: Die Adresse [%s:%d] ist ungültig."
@@ -5391,51 +5419,51 @@ msgstr "Höchstzulässige Menge an Solarzellen bereits vorhanden!"
msgid "Without guidance from the capital, the %s spaceship is lost!"
msgstr "Ohne Leitung aus der Hauptstadt ist das %s Raumschiff verloren!"
-#: server/srv_main.c:240
+#: server/srv_main.c:242
msgid "Game ended in a draw as end year exceeded"
msgstr "Spiel endete im letzten Jahr unentschieden"
-#: server/srv_main.c:274
+#: server/srv_main.c:276
#, c-format
msgid "The %s spaceship has arrived at Alpha Centauri."
msgstr "Das %s Raumschiff hat Alpha Centauri erreicht."
-#: server/srv_main.c:287 server/srv_main.c:322
+#: server/srv_main.c:289 server/srv_main.c:324
#, c-format
msgid "Team victory to %s"
msgstr "Teamsieg für %s"
-#: server/srv_main.c:297 server/srv_main.c:338
+#: server/srv_main.c:299 server/srv_main.c:340
#, c-format
msgid "Game ended in victory for %s"
msgstr "Spiel endete mit einem Sieg von %s"
-#: server/srv_main.c:345
+#: server/srv_main.c:347
msgid "Game ended in a draw"
msgstr "Spiel endete unentschieden"
-#: server/srv_main.c:461 server/srv_main.c:472
+#: server/srv_main.c:465 server/srv_main.c:476
#, c-format
msgid "Your %s was disbanded in accordance with your peace treaty with the %s."
msgstr ""
"Die %s wurde aufgelöst, in Übereinstimmung mit dem Friedensvertrag mit den %"
"s."
-#: server/srv_main.c:512 server/srv_main.c:516
+#: server/srv_main.c:516 server/srv_main.c:520
#, c-format
msgid ""
"Concerned citizens point out that the cease-fire with %s will run out soon."
msgstr ""
"Besorgte Bürger weisen darauf hin, daß die Feuerpause mit %s bald endet."
-#: server/srv_main.c:521 server/srv_main.c:525
+#: server/srv_main.c:525 server/srv_main.c:529
#, c-format
msgid "The cease-fire with %s has run out. You are now at war with the %s."
msgstr ""
"Die Feuerpause mit %s ist beendet. Du befindest dich jetzt im Krieg mit den %"
"s."
-#: server/srv_main.c:542
+#: server/srv_main.c:546
#, c-format
msgid ""
"Ceasefire between %s and %s has run out. They are at war. You cancel your "
@@ -5444,103 +5472,103 @@ msgstr ""
"Der Waffenstillstand zwischen den %s und den %s ist ausgelaufen. Sie "
"befinden sich im Krieg. Du beendest deine Allianz mit beiden."
-#: server/srv_main.c:961
+#: server/srv_main.c:997
#, c-format
msgid "Failed saving game as %s"
msgstr "Konnte das Spiel nicht in der Datei '%s' speichern"
-#: server/srv_main.c:963
+#: server/srv_main.c:999
#, c-format
msgid "Game saved as %s"
msgstr "Spiel gespeichert als '%s'"
-#: server/srv_main.c:994
+#: server/srv_main.c:1030
msgid "The game is already running."
msgstr "Das Spiel hat bereits angefangen."
-#: server/srv_main.c:1002
+#: server/srv_main.c:1038
#, 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:1009
+#: server/srv_main.c:1045
msgid "Starting game."
msgstr "Spiel begonnen."
# EH: Diese Fehlermeldung sollte mE nicht übersetzt werden.
-#: server/srv_main.c:1071
+#: server/srv_main.c:1112
#, c-format
msgid "request for unknown report (type %d)"
msgstr "request for unknown report (type %d)"
-#: server/srv_main.c:1136
+#: server/srv_main.c:1177
#, 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:1238
+#: server/srv_main.c:1279
#, 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:1338
+#: server/srv_main.c:1381
msgid "Please choose a non-blank name."
msgstr "Es muß ein Name gewählt werden."
-#: server/srv_main.c:1354
+#: server/srv_main.c:1397
msgid "That nation is already in use."
msgstr "Diese Nation ist bereits vergeben."
-#: server/srv_main.c:1370
+#: server/srv_main.c:1413
#, 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:1391
+#: server/srv_main.c:1434
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:1490
+#: server/srv_main.c:1533
#, 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:1496
+#: server/srv_main.c:1539
#, c-format
msgid "%s nation is already in use."
msgstr "Die Nation der %s ist bereits vergeben."
-#: server/srv_main.c:1514
+#: server/srv_main.c:1557
#, c-format
msgid "%s is the %s ruler %s."
msgstr "%s ist der %se Herrscher %s."
-#: server/srv_main.c:1570
+#: server/srv_main.c:1613
#, 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:1614 server/srv_main.c:1618
+#: server/srv_main.c:1657 server/srv_main.c:1661
#, 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:1760
+#: server/srv_main.c:1803
#, c-format
msgid "Player %d"
msgstr "Spieler %d"
-#: server/srv_main.c:1771 server/srv_main.c:1777
+#: server/srv_main.c:1814 server/srv_main.c:1820
#, c-format
msgid "%s rules the %s."
msgstr "%s beherrscht die %s."
-#: server/srv_main.c:1942
+#: server/srv_main.c:1985
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
@@ -5548,256 +5576,242 @@ msgstr ""
"Unterstützung für Spieler-Authentifizierung verfügbar, wird aber nicht "
"verwendet."
-#: server/srv_main.c:1993
+#: server/srv_main.c:2037
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr "Sende Informationen an den Metaserver [%s]"
-#: server/srv_main.c:2024
+#: server/srv_main.c:2069
msgid "The game is over..."
msgstr "Das Spiel ist vorbei..."
-#: server/srv_main.c:2237
+#: server/srv_main.c:2286
msgid "Now accepting new client connections."
msgstr "Warte auf Spieler..."
-#: server/stdinhand.c:246
-#, c-format
-msgid "Vote \"%s\" is passed %d to %d with %d abstentions."
-msgstr ""
-"Der Befehl '%s' wurde in der Abstimmung mit %d zu %d angenommen, bei %d "
-"Enthaltungen."
-
-#: server/stdinhand.c:253
-#, c-format
-msgid "Vote \"%s\" failed with %d against, %d for and %d abstentions."
-msgstr ""
-"Der Befehl '%s' wurde in der Abstimmung mit %d gegen %d abgelehnt, bei %d "
-"Enthaltungen."
-
#. TRANS: ambiguous command
-#: server/stdinhand.c:365
+#: server/stdinhand.c:284
msgid "(ambiguous)"
msgstr "(mehrdeutig)"
#. TRANS: unrecognized command
#. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:416
+#: server/stdinhand.c:287 client/citydlg_common.c:419
#: 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 "(unbekannt)"
-#: server/stdinhand.c:458
+#: server/stdinhand.c:377
msgid "Name is empty, so cannot be a player."
msgstr "Spielername fehlt."
-#: server/stdinhand.c:462
+#: server/stdinhand.c:381
msgid "Name is too long, so cannot be a player."
msgstr "Spielername zu lang."
-#: server/stdinhand.c:466
+#: server/stdinhand.c:385
#, c-format
msgid "Player name prefix '%s' is ambiguous."
msgstr "Abkürzung '%s' des Spielernamens ist mehrdeutig."
-#: server/stdinhand.c:470
+#: server/stdinhand.c:389
#, c-format
msgid "No player by the name of '%s'."
msgstr "Kein Spieler mit dem Namen '%s'."
# CK: TECHNICAL
-#: server/stdinhand.c:474 server/stdinhand.c:509
+#: server/stdinhand.c:393 server/stdinhand.c:428
#, c-format
msgid "Unexpected match_result %d (%s) for '%s'."
msgstr "Unexpected match_result %d (%s) for '%s'."
-#: server/stdinhand.c:493
+#: server/stdinhand.c:412
msgid "Name is empty, so cannot be a connection."
msgstr "Verbindungsname fehlt."
-#: server/stdinhand.c:497
+#: server/stdinhand.c:416
msgid "Name is too long, so cannot be a connection."
msgstr "Verbindungsname zu lang."
-#: server/stdinhand.c:501
+#: server/stdinhand.c:420
#, c-format
msgid "Connection name prefix '%s' is ambiguous."
msgstr "Abkürzung '%s' des Verbindungsnamens ist mehrdeutig."
-#: server/stdinhand.c:505
+#: server/stdinhand.c:424
#, c-format
msgid "No connection by the name of '%s'."
msgstr "Keine Verbindung mit der Bezeichnung '%s'."
-#: server/stdinhand.c:525
+#: server/stdinhand.c:444
#, c-format
msgid "Open metaserver connection to [%s]."
msgstr "Verbindung zu Metaserver '%s' hergestellt."
-#: server/stdinhand.c:538
+#: server/stdinhand.c:457
#, c-format
msgid "Close metaserver connection to [%s]."
msgstr "Verbindung zu Metaserver '%s' beendet."
-#: server/stdinhand.c:553
+#: server/stdinhand.c:472
msgid "Metaserver connection is open."
msgstr "Es besteht Verbindung zum Metaserver."
-#: server/stdinhand.c:556
+#: server/stdinhand.c:475
msgid "Metaserver connection is closed."
msgstr "Es besteht keine Verbindung zum Metaserver."
-#: server/stdinhand.c:566
+#: server/stdinhand.c:485
msgid "Metaserver connection is already open."
msgstr "Es besteht bereits eine Verbindung zum Metaserver."
-#: server/stdinhand.c:577
+#: server/stdinhand.c:496
msgid "Metaserver connection is already closed."
msgstr "Die Verbindung zum Metaserver wurde bereits beendet."
-#: server/stdinhand.c:582
+#: server/stdinhand.c:501
msgid "Argument must be 'u', 'up', 'd', 'down', or '?'."
msgstr "Zulässige Parameter sind 'u', 'up', 'd', 'down' und '?'."
-#: server/stdinhand.c:603
+#: server/stdinhand.c:522
#, c-format
msgid "Metaserver patches string set to '%s'."
msgstr "Patch-Informationen des Metaservers auf '%s' gesetzt."
-#: server/stdinhand.c:606
+#: server/stdinhand.c:525
#, c-format
msgid "Metaserver patches string set to '%s', not reporting to metaserver."
msgstr ""
"Patch-Informationen des Metaservers auf '%s' gesetzt - keine Verbindung zum "
"Metaserver."
-#: server/stdinhand.c:627
+#: server/stdinhand.c:546
#, c-format
msgid "Metaserver message string set to '%s'."
msgstr "Nachrichtenzeile des Metaservers auf '%s' gesetzt."
-#: server/stdinhand.c:630
+#: server/stdinhand.c:549
#, c-format
msgid "Metaserver message string set to '%s', not reporting to metaserver."
msgstr ""
"Nachrichtenzeile des Metaservers auf '%s' gesetzt - keine Verbindung zum "
"Metaserver."
-#: server/stdinhand.c:650
+#: server/stdinhand.c:569
#, c-format
msgid "Metaserver is now [%s]."
msgstr "Metaserver ist jetzt '%s'."
-#: server/stdinhand.c:660
+#: server/stdinhand.c:579
#, c-format
msgid "Server id: %s"
msgstr "Server-ID: %s"
-#: server/stdinhand.c:757
+#: server/stdinhand.c:676
msgid "You cannot save games manually on this server."
msgstr "Du kannst das Spiel auf diesem Server nicht manuell speichern."
-#: server/stdinhand.c:774
+#: server/stdinhand.c:693
msgid "Cannot toggle a barbarian player."
msgstr "Barbaren können nicht von Menschen gespielt werden."
-#: server/stdinhand.c:781
+#: server/stdinhand.c:700
#, c-format
msgid "%s is now under AI control."
msgstr "%s wird jetzt von der KI kontrolliert."
-#: server/stdinhand.c:802
+#: server/stdinhand.c:721
#, c-format
msgid "%s is now under human control."
msgstr "%s wird jetzt von einem Menschen kontrolliert."
-#: server/stdinhand.c:847
+#: server/stdinhand.c:766
msgid "Can't add AI players once the game has begun."
msgstr "KI-Spieler können nach Spielbeginn nicht mehr hinzugefügt werden."
-#: server/stdinhand.c:867
+#: server/stdinhand.c:786
msgid "Can't add more players, server is full."
msgstr "Keine neuen Spieler mehr möglich."
-#: server/stdinhand.c:874
+#: server/stdinhand.c:793
msgid "Can't use an empty name."
msgstr "Name fehlt."
-#: server/stdinhand.c:881
+#: server/stdinhand.c:800
#, c-format
msgid "That name exceeds the maximum of %d chars."
msgstr "Dieser Name hat mehr als %d Zeichen."
-#: server/stdinhand.c:887
+#: server/stdinhand.c:806
msgid "That name is not allowed."
msgstr "Dieser Name ist nicht zulässig."
-#: server/stdinhand.c:893
+#: server/stdinhand.c:812
msgid "A player already exists by that name."
msgstr "Es gibt schon einen Spieler dieses Namens."
-#: server/stdinhand.c:899
+#: server/stdinhand.c:818
msgid "A user already exists by that name."
msgstr "Es gibt schon einen Spieler dieses Namens."
-#: server/stdinhand.c:925
+#: server/stdinhand.c:844
#, c-format
msgid "%s has been added as an AI-controlled player."
msgstr "%s ist als KI-Spieler dazu gekommen."
-#: server/stdinhand.c:932
+#: server/stdinhand.c:851
#, c-format
msgid "Error creating new AI player: %s."
msgstr "Fehler bei der Generierung des neuen KI-Spielers: %s."
-#: server/stdinhand.c:966
+#: server/stdinhand.c:885
msgid "Players cannot be removed once the game has started."
msgstr "Spieler können nach Spielstart nicht mehr entfernt werden."
-#: server/stdinhand.c:977
+#: server/stdinhand.c:896
#, c-format
msgid "Removed player %s from the game."
msgstr "Spieler %s aus dem Spiel entfernt."
-#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
+#: server/stdinhand.c:935 server/stdinhand.c:3372 server/stdinhand.c:3507
#, c-format
msgid "Name \"%s\" disallowed for security reasons."
msgstr "Der Name \"%s\" ist aus Sicherheitsgründen nicht erlaubt."
-#: server/stdinhand.c:1029
+#: server/stdinhand.c:948
#, c-format
msgid "No command script found by the name \"%s\"."
msgstr "Kein Kommandoskript mit der Bezeichnung '%s' gefunden."
-#: server/stdinhand.c:1037
+#: server/stdinhand.c:956
#, c-format
msgid "Loading script file: %s"
msgstr "Lade Skriptdatei '%s'"
-#: server/stdinhand.c:1052
+#: server/stdinhand.c:971
#, c-format
msgid "Cannot read command line scriptfile '%s'."
msgstr "Kann die Skriptdatei '%s' nicht lesen."
-#: server/stdinhand.c:1054
+#: server/stdinhand.c:973
#, c-format
msgid "Could not read script file '%s'."
msgstr "Kann die Skriptdatei '%s' nicht lesen."
-#: server/stdinhand.c:1146
+#: server/stdinhand.c:1065
#, c-format
msgid "Could not write script file '%s'."
msgstr "Kann die Skriptdatei '%s' nicht schreiben."
-#: server/stdinhand.c:1158
+#: server/stdinhand.c:1077
msgid "You cannot use the write command on this server for security reasons."
msgstr ""
"Auf diesem Server ist das Kommando 'write' aus Sicherheitsgründen nicht "
"verfügbar."
-#: server/stdinhand.c:1186
+#: server/stdinhand.c:1105
#, c-format
msgid ""
"Cannot decrease command access level '%s' for connection '%s'; you only have "
@@ -5806,7 +5820,12 @@ msgstr ""
"Die Zugangsberechtigung '%s' für '%s' wird nicht beschränkt;\n"
"da Sie selbst nur Zugangsberechtigung '%s' haben."
-#: server/stdinhand.c:1241
+#: server/stdinhand.c:1114
+#, c-format
+msgid "Command access level set to '%s' for connection %s."
+msgstr "%2$s erhält Zugangsberechtigung '%1$s'."
+
+#: server/stdinhand.c:1163
#, c-format
msgid ""
"Anyone can now become game organizer '%s' by issuing the 'first' command."
@@ -5814,28 +5833,28 @@ msgstr ""
"Ein beliebiger Spieler hat nun die Möglichkeit, durch Eingabe des Befehls "
"'first' Spielleiter mit der Zugriffsberechtigung '%s' zu werden."
-#: server/stdinhand.c:1274
+#: server/stdinhand.c:1187
msgid "Command access levels in effect:"
msgstr "Vorhandene Zugangsberechtigungen:"
-#: server/stdinhand.c:1282
+#: server/stdinhand.c:1194
#, c-format
msgid "Command access level for new connections: %s"
msgstr "Zugangsberechtigung für neue Verbindungen: %s"
-#: server/stdinhand.c:1285
+#: server/stdinhand.c:1197
#, c-format
msgid "Command access level for first player to take it: %s"
msgstr "Zugangsberechtigung für den ersten Spieler: %s"
-#: server/stdinhand.c:1294
+#: server/stdinhand.c:1206
msgid ""
"Error: command access level must be one of 'none', 'info', 'ctrl', or 'hack'."
msgstr ""
"Fehler: Es gibt nur die Zugangsberechtigungen\n"
" 'none', 'info', 'ctrl' und 'hack'."
-#: server/stdinhand.c:1299
+#: server/stdinhand.c:1211
#, c-format
msgid ""
"Cannot increase command access level to '%s'; you only have '%s' yourself."
@@ -5843,200 +5862,190 @@ 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:1375
-#, c-format
-msgid "Command access level set to '%s' for connection %s."
-msgstr "%2$s erhält Zugangsberechtigung '%1$s'."
-
-#: 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:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
+#: server/stdinhand.c:1238 server/stdinhand.c:1252 server/stdinhand.c:1273
#, c-format
msgid "Command access level set to '%s' for new players."
msgstr "Neue Spieler erhalten die Zugangsberechtigung '%s'."
-#: server/stdinhand.c:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
+#: server/stdinhand.c:1243 server/stdinhand.c:1257 server/stdinhand.c:1267
#, 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:1402
+#: server/stdinhand.c:1302
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:1406
+#: server/stdinhand.c:1306
#, c-format
msgid "You already have command access level '%s' or better."
msgstr "Sie haben bereits die Zugangsberechtigung '%s' oder besser."
-#: server/stdinhand.c:1411
+#: server/stdinhand.c:1311
msgid "Someone else already is game organizer."
msgstr "Jemand anders ist bereits Spielleiter."
-#: server/stdinhand.c:1416
+#: server/stdinhand.c:1316
#, 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:1467
+#: server/stdinhand.c:1367
#, c-format
msgid "Invalid argument %d."
msgstr "%d ist unzulässig."
-#: server/stdinhand.c:1474
+#: server/stdinhand.c:1374
msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
msgstr "Syntax: timeoutincrease <n1> <n2> <n3> <n4>"
-#: server/stdinhand.c:1482
+#: server/stdinhand.c:1382
#, 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:1542 server/stdinhand.c:1545
+#: server/stdinhand.c:1442 server/stdinhand.c:1445
msgid "Option:"
msgstr "Option:"
-#: server/stdinhand.c:1555 server/stdinhand.c:4031
+#: server/stdinhand.c:1455 server/stdinhand.c:4079
msgid "Description:"
msgstr "Beschreibung:"
-#: server/stdinhand.c:1560
+#: server/stdinhand.c:1460
#, c-format
msgid "Status: %s"
msgstr "Status: %s"
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "changeable"
msgstr "veränderbar"
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "fixed"
msgstr "fest"
-#: server/stdinhand.c:1567
+#: server/stdinhand.c:1467
#, c-format
msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
msgstr "Wert: %d, Standard: %d, zulässig: 0 oder 1"
-#: server/stdinhand.c:1572
+#: server/stdinhand.c:1472
#, c-format
msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
msgstr "Wert: %d, Minimum: %d, Standard: %d, Maximum: %d"
-#: server/stdinhand.c:1578
+#: server/stdinhand.c:1478
#, c-format
msgid "Value: \"%s\", Default: \"%s\""
msgstr "Wert: '%s', Standard: '%s'"
-#: server/stdinhand.c:1597
+#: server/stdinhand.c:1497
msgid "Explanations are available for the following server options:"
msgstr "Erläuterungen sind für folgende Serveroptionen verfügbar:"
-#: server/stdinhand.c:1643
+#: server/stdinhand.c:1537
msgid "No explanation for that yet."
msgstr "Dafür gibt es noch keine Erklärung."
-#: server/stdinhand.c:1646 server/stdinhand.c:2480
+#: server/stdinhand.c:1540 server/stdinhand.c:2468
msgid "Ambiguous option name."
msgstr "Mehrdeutige Optionsbezeichnung."
-#: server/stdinhand.c:1666
+#: server/stdinhand.c:1560
#, c-format
msgid "Server Operator: %s"
msgstr "Server Operator: %s"
-#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
+#: server/stdinhand.c:1686 server/stdinhand.c:1713 server/stdinhand.c:1731
#, 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:1822
+#: server/stdinhand.c:1718
#, c-format
msgid "%s is not controlled by the AI."
msgstr "%s wird nicht von der KI kontrolliert."
-#: server/stdinhand.c:1842
+#: server/stdinhand.c:1738
#, c-format
msgid "Default AI skill level set to '%s'."
msgstr "Die standardmäßige KI-Spielstärke ist '%s'."
-#: server/stdinhand.c:1857 server/stdinhand.c:2162
+#: server/stdinhand.c:1753
msgid "This command is client only."
msgstr "Dieser Befehl kann nur im Client gegeben werden."
-#: server/stdinhand.c:1860
+#: server/stdinhand.c:1756
msgid "Usage: away"
msgstr "Syntax: away"
-#: server/stdinhand.c:1865
+#: server/stdinhand.c:1761
msgid "Only players may use the away command."
msgstr "Der Befehl 'away' kann nur von Spielern gegeben werden."
-#: server/stdinhand.c:1869
+#: server/stdinhand.c:1765
#, c-format
msgid "%s set to away mode."
msgstr "%s wurde auf Abwesenheitsmodus geschaltet."
-#: server/stdinhand.c:1877
+#: server/stdinhand.c:1772
#, c-format
msgid "%s returned to game."
msgstr "%s ist zum Spiel zurückgekehrt."
-#: server/stdinhand.c:1919
+#: server/stdinhand.c:1817
#, c-format
msgid "Sorry, you do not have access to view option '%s'."
msgstr "Keine Berechtigung, Einstellung '%s' einzusehen!"
-#: server/stdinhand.c:1925
+#: server/stdinhand.c:1823
#, c-format
msgid "Unknown option '%s'."
msgstr "Unbekannte Option '%s'."
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1848
msgid "All options with non-default values"
msgstr "Alle Optionen, die vom Standardwert abweichen"
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1851
msgid "All options"
msgstr "Alle Optionen"
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1854
msgid "Vital options"
msgstr "Wichtige Optionen"
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1857
msgid "Situational options"
msgstr "Interessante Optionen"
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1860
msgid "Rarely used options"
msgstr "Seltene Optionen"
-#: server/stdinhand.c:1965
+#: server/stdinhand.c:1863
msgid "+ means you may change the option"
msgstr "+ heißt, daß diese Einstellung geändert werden kann"
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1864
msgid "= means the option is on its default value"
msgstr "= heißt, daß dies die Standardeinstellung ist"
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
#, c-format
msgid "%-*s value (min,max) "
msgstr "%-*s Wert (min,max) "
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
msgid "Option"
msgstr "Option"
-#: server/stdinhand.c:1973
+#: server/stdinhand.c:1871
msgid "description"
msgstr "Beschreibung"
-#: server/stdinhand.c:2042
+#: server/stdinhand.c:1940
msgid ""
"Try 'show situational' or 'show rare' to show more options.\n"
"Try 'show changed' to show settings with non-default values."
@@ -6044,79 +6053,150 @@ msgstr ""
"Weitere Optionen mit 'show situational' oder 'show rare'\n"
"Geänderte Optionen mit 'show changed'."
-#: server/stdinhand.c:2092
+#: server/stdinhand.c:1966
msgid "Cannot change teams once game has begun."
msgstr "Nach Spielbeginn können Teams nicht mehr geändert werden."
-#: server/stdinhand.c:2102
+#: server/stdinhand.c:1976
msgid "Undefined argument. Usage: team <player> <team>."
msgstr "Falscher Parameter. Anwendung: team <Spieler> <Team>."
-#: server/stdinhand.c:2122
+#: server/stdinhand.c:1996
#, 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:2129
+#: server/stdinhand.c:2003
msgid "Cannot team a barbarian."
msgstr "Barbaren können kein Team bilden."
-#: server/stdinhand.c:2135
+#: server/stdinhand.c:2009
#, c-format
msgid "Player %s set to team %s."
msgstr "Spieler %s gehört zu Team %s."
-#: 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:2035 server/voting.c:512
+#, fuzzy
+msgid "Teamvote"
+msgstr "Team"
-#: server/stdinhand.c:2165
-msgid "Observers cannot vote."
-msgstr "Beobachter können nicht abstimmen."
+#: server/stdinhand.c:2035 server/voting.c:516
+msgid "Vote"
+msgstr ""
-#: server/stdinhand.c:2168
+#: server/stdinhand.c:2037
+#, c-format
msgid ""
-"You can only vote in a running game. Use 'first' to become the game "
-"organizer if there currently is none."
+"%s %d \"%s\" (needs %0.0f%%%s): %d for, %d against, and %d abstained out of %"
+"d players."
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: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:2041
+msgid " no dissent"
+msgstr ""
-#: server/stdinhand.c:2188
+#: server/stdinhand.c:2049
msgid "There are no votes going on."
msgstr "Keine laufenden Abstimmungen."
-#: server/stdinhand.c:2208
-msgid "No legal last vote."
+#: server/stdinhand.c:2077
+#, fuzzy
+msgid "Invalid arguments. Usage: vote yes|no|abstain [vote number]."
+msgstr "Befehl unvollständig. Anwendung: vote yes|no [Wahlnummer]."
+
+#: server/stdinhand.c:2095 server/stdinhand.c:2213 server/stdinhand.c:3714
+msgid "You are not allowed to use this command."
+msgstr "Keine Berechtigung zur Erteilung dieses Befehls."
+
+#: server/stdinhand.c:2104
+#, c-format
+msgid "The argument \"%s\" is ambigious."
+msgstr "Argument '%s' ist mehrdeutig."
+
+#: server/stdinhand.c:2119
+msgid "There are no votes running."
+msgstr "Keine laufenden Abstimmungen."
+
+#: server/stdinhand.c:2121
+#, fuzzy, c-format
+msgid "No legal last vote (%d %s)."
msgstr "Die letzte Abstimmung war ungültig."
-#: server/stdinhand.c:2213
-msgid "Value must be integer."
+#: server/stdinhand.c:2122
+msgid "other vote running"
+msgid_plural "other votes running"
+msgstr[0] ""
+msgstr[1] ""
+
+#: server/stdinhand.c:2129 server/stdinhand.c:2491 server/stdinhand.c:2532
+msgid "Value must be an integer."
msgstr "Wert muß ganzzahlig sein."
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2135 server/stdinhand.c:2221
#, c-format
msgid "No such vote (%d)."
msgstr "Keine Abstimmung mit der Nummer %d vorhanden."
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2141
+#, fuzzy
+msgid "You are not allowed to vote on that."
+msgstr "Keine Berechtigung zur Änderung dieser Einstellung."
+
+#: server/stdinhand.c:2146
#, c-format
msgid "You voted for \"%s\""
msgstr "Sie haben für '%s' gestimmt."
-#: server/stdinhand.c:2232
+#: server/stdinhand.c:2150
#, c-format
msgid "You voted against \"%s\""
msgstr "Sie haben gegen '%s' gestimmt."
-#: server/stdinhand.c:2259
+#: server/stdinhand.c:2155
+#, c-format
+msgid "You abstained from voting on \"%s\""
+msgstr ""
+
+#: server/stdinhand.c:2190
+msgid "Missing argument <vote number> or the string \"all\"."
+msgstr ""
+
+#: server/stdinhand.c:2197
+#, fuzzy
+msgid "You don't have any vote going on."
+msgstr "Hier ist kein Arbeiter."
+
+#: server/stdinhand.c:2204
+#, fuzzy
+msgid "There isn't any vote going on."
+msgstr "Keine laufenden Abstimmungen."
+
+#: server/stdinhand.c:2209
+msgid "Server: All votes have been removed."
+msgstr ""
+
+#: server/stdinhand.c:2226
+#, fuzzy, c-format
+msgid "You are not allowed to cancel this vote (%d)."
+msgstr "Keine Berechtigung zur Änderung dieser Einstellung."
+
+#: server/stdinhand.c:2232
+msgid "Usage: /cancelvote [<vote number>|all]"
+msgstr ""
+
+#: server/stdinhand.c:2241
+#, c-format
+msgid "Server: %s cancelled the vote \"%s\" (number %d)."
+msgstr ""
+
+#: server/stdinhand.c:2247
+#, c-format
+msgid "Server: The vote \"%s\" (number %d) has been cancelled."
+msgstr ""
+
+#: server/stdinhand.c:2265
msgid ""
"Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
"<x> <y> | unit <id> | tech <player> | timing | info>."
@@ -6124,130 +6204,126 @@ msgstr ""
"Fehlende Parameter. Anwendung: debug diplomacy <Spieler> | city <x> <y> | "
"units <x> <y> | unit <id> | tech <Spieler> | timing | info."
-#: server/stdinhand.c:2265
+#: server/stdinhand.c:2271
msgid "Can only use this command once game has begun."
msgstr "Befehl kann nur nach Spielbeginn verwendet werden."
-#: server/stdinhand.c:2294
+#: server/stdinhand.c:2300
#, c-format
msgid "%s diplomacy no longer debugged"
msgstr "Fehlersuche für Diplomatie der %s ausgeschaltet."
-#: server/stdinhand.c:2298
+#: server/stdinhand.c:2304
#, c-format
msgid "%s diplomacy debugged"
msgstr "Fehlersuche für Diplomatie der %s eingeschaltet."
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2323
#, c-format
msgid "%s tech no longer debugged"
msgstr "Fehlersuche für Forschung der %s ausgeschaltet."
-#: server/stdinhand.c:2321
+#: server/stdinhand.c:2327
#, c-format
msgid "%s tech debugged"
msgstr "Fehlersuche für Forschung der %s eingeschaltet."
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2358 server/stdinhand.c:2388
msgid "Value 2 & 3 must be integer."
msgstr "Werte 2 und 3 müssen ganzzahlig sein."
-#: server/stdinhand.c:2356 server/stdinhand.c:2386
+#: server/stdinhand.c:2362 server/stdinhand.c:2392
msgid "Bad map coordinates."
msgstr "Falsche Koordinaten."
-#: server/stdinhand.c:2361
+#: server/stdinhand.c:2367
msgid "No city at this coordinate."
msgstr "Keine Stadt an diesen Koordinaten."
-#: server/stdinhand.c:2366
+#: server/stdinhand.c:2372
#, c-format
msgid "%s no longer debugged"
msgstr "Fehlersuche für %s ausgeschaltet."
-#: server/stdinhand.c:2392 server/stdinhand.c:2422
+#: server/stdinhand.c:2398 server/stdinhand.c:2428
#, c-format
msgid "%s %s no longer debugged."
msgstr "Fehlersuche für %se %s ausgeschaltet."
-#: server/stdinhand.c:2397 server/stdinhand.c:2427
+#: server/stdinhand.c:2403 server/stdinhand.c:2433
#, c-format
msgid "%s %s debugged."
msgstr "Fehlersuche für %se %s eingeschaltet."
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2419
msgid "Value 2 must be integer."
msgstr "Wert 2 muß ganzzahlig sein."
-#: server/stdinhand.c:2417
+#: server/stdinhand.c:2423
#, c-format
msgid "Unit %d does not exist."
msgstr "Einheit %d existiert nicht."
-#: server/stdinhand.c:2475
+#: server/stdinhand.c:2464
msgid "Undefined argument. Usage: set <option> <value>."
msgstr "Falsche oder fehlende Option. Anwendung: set <Option> <Wert>"
-#: server/stdinhand.c:2485
+#: server/stdinhand.c:2473
msgid "You are not allowed to set this option."
msgstr "Keine Berechtigung zur Änderung dieser Einstellung."
-#: server/stdinhand.c:2490 server/stdinhand.c:3463
+#: server/stdinhand.c:2478 server/stdinhand.c:3501
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:2502 server/stdinhand.c:2543
-msgid "Value must be an integer."
-msgstr "Wert muß ganzzahlig sein."
-
-#: server/stdinhand.c:2512
+#: server/stdinhand.c:2501
#, 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:2519
+#: server/stdinhand.c:2508
msgid "Value out of range (minimum: 0, maximum: 1)."
msgstr "Unzulässiger Wert (zulässig: 0 oder 1)."
-#: server/stdinhand.c:2534 server/stdinhand.c:2576
+#: server/stdinhand.c:2523 server/stdinhand.c:2565
#, c-format
msgid "Option: %s has been set to %d."
msgstr "%s auf %d gesetzt."
-#: server/stdinhand.c:2554
+#: server/stdinhand.c:2543
#, 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:2561
+#: server/stdinhand.c:2550
#, c-format
msgid "Value out of range (minimum: %d, maximum: %d)."
msgstr "Unzulässiger Wert (Minimum: %d, Maximum: %d)."
-#: server/stdinhand.c:2586
+#: server/stdinhand.c:2575
msgid "String value too long. Usage: set <option> <value>."
msgstr "Unzulässiger Wert. Anwendung: set <Option> <Wert>"
-#: server/stdinhand.c:2600
+#: server/stdinhand.c:2589
#, c-format
msgid "Option: %s has been set to \"%s\"."
msgstr "%s auf '%s' gesetzt."
-#: server/stdinhand.c:2658
+#: server/stdinhand.c:2652
msgid "Sorry, one can't observe globally in this game."
msgstr "Globale Beobachter sind in diesem Spiel nicht erlaubt."
-#: server/stdinhand.c:2661
+#: server/stdinhand.c:2655
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:2671
+#: server/stdinhand.c:2665
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
+#: server/stdinhand.c:2673
#, c-format
msgid ""
"You cannot take a new player because the maximum of %d player has already "
@@ -6262,78 +6338,78 @@ msgstr[1] ""
"Du kannst keinen neuen Spieler übernehmen, weil die Höchtszahl von %d "
"Spielern bereits erreicht ist (Option mayplayers)."
-#: server/stdinhand.c:2691
+#: server/stdinhand.c:2685
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
+#: server/stdinhand.c:2696
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:2705
+#: server/stdinhand.c:2699
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:2713
+#: server/stdinhand.c:2707
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:2716
+#: server/stdinhand.c:2710
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:2724
+#: server/stdinhand.c:2718
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:2727
+#: server/stdinhand.c:2721
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:2736
+#: server/stdinhand.c:2730
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:2739
+#: server/stdinhand.c:2733
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:2749
+#: server/stdinhand.c:2743
msgid "Sorry, one can't observe in this game."
msgstr "Beobachten ist in diesem Spiel nicht erlaubt."
-#: server/stdinhand.c:2754
+#: server/stdinhand.c:2748
msgid "Sorry, one can't take players in this game."
msgstr "Das Ãœbernehmen von Spielern ist in diesem Spiel nicht erlaubt."
-#: server/stdinhand.c:2760
+#: server/stdinhand.c:2754
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:2791
+#: server/stdinhand.c:2785
msgid "Usage: observe [connection-name [player-name]]"
msgstr "Syntax: observe [Verbindung [Spieler]]"
-#: server/stdinhand.c:2797
+#: server/stdinhand.c:2791
msgid "Usage: observe [player-name]"
msgstr "Syntax: observe [Spieler]"
-#: server/stdinhand.c:2847
+#: server/stdinhand.c:2841
#, 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:2858
+#: server/stdinhand.c:2852
#, c-format
msgid "%s is already observing %s."
msgstr "%s beobachtet %s bereits."
-#: server/stdinhand.c:2863
+#: server/stdinhand.c:2857
#, c-format
msgid "%s is already observing."
msgstr "%s beobachtet bereits."
@@ -6348,236 +6424,240 @@ msgstr "%s beobachtet jetzt den Spieler %s"
msgid "%s now observes"
msgstr "%s beobachtet jetzt"
-#: server/stdinhand.c:2969
+#: server/stdinhand.c:2971
msgid "Usage: take <connection-name> <player-name>"
msgstr "Anwendung: take <Verbindungsname> <Spieler>"
-#: server/stdinhand.c:2974
+#: server/stdinhand.c:2976
msgid "Usage: take <player-name>"
msgstr "Anwendung: take <Spieler>"
-#: server/stdinhand.c:2980
+#: server/stdinhand.c:2982
msgid "Usage: take [connection-name] <player-name>"
msgstr "Anwendung: take [Verbindungsname] <Spieler>"
-#: server/stdinhand.c:3010
+#: server/stdinhand.c:3012
#, c-format
msgid "%s already controls %s."
msgstr "%s kontrolliert %s bereits."
-#: server/stdinhand.c:3024
+#: server/stdinhand.c:3026
#, c-format
msgid "There is no free player slot for %s."
msgstr "Kein Spielerplatz mehr frei für %s"
-#: server/stdinhand.c:3059
+#: server/stdinhand.c:3061
#, c-format
msgid "being detached from %s."
msgstr "Die Verbindung zu Spieler %s wird getrennt."
-#: server/stdinhand.c:3135
+#: server/stdinhand.c:3146
#, c-format
msgid "%s now controls %s (%s, %s)."
msgstr "%s hat den Spieler %s (%s, %s) übernommen."
-#: server/stdinhand.c:3139 server/stdinhand.c:4260
+#: server/stdinhand.c:3150 server/stdinhand.c:4308
#: data/nation/barbarian.ruleset:3
msgid "Barbarian"
msgstr "barbarisch"
-#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
+#: server/stdinhand.c:3152 server/stdinhand.c:4310 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-sdl/plrdlg.c:645
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr "KI"
-#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-gtk-2.0/pages.c:2125
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
+#: server/stdinhand.c:3153 server/stdinhand.c:4312
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-gtk-2.0/pages.c:2127
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/connectdlg.c:215
msgid "Human"
msgstr "menschlich"
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-gtk-2.0/pages.c:2124 client/gui-win32/connectdlg.c:200
-#: client/gui-win32/connectdlg.c:212
+#: server/stdinhand.c:3155 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-gtk-2.0/pages.c:2126 client/gui-win32/connectdlg.c:202
+#: client/gui-win32/connectdlg.c:214
msgid "Alive"
msgstr "Lebend"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3156 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-win32/connectdlg.c:202
msgid "Dead"
msgstr "Tot"
-#: server/stdinhand.c:3147
+#: server/stdinhand.c:3159
#, c-format
msgid "%s failed to attach to any player."
msgstr "%s konnte nicht mit einem Spieler verbunden werden."
-#: server/stdinhand.c:3182
+#: server/stdinhand.c:3194
msgid "Usage: detach <connection-name>"
msgstr "Syntax: detach <Verbindungsname>"
-#: server/stdinhand.c:3202
+#: server/stdinhand.c:3214
msgid "You can not detach other users."
msgstr "Sie können nicht fremde Verbindungen zu Spielern lösen."
-#: server/stdinhand.c:3211
+#: server/stdinhand.c:3223
#, c-format
msgid "%s is not attached to any player."
msgstr "%s ist mit nicht mit einem Spieler verbunden."
-#: server/stdinhand.c:3234
+#: server/stdinhand.c:3246
#, c-format
msgid "%s detaching from %s"
msgstr "%s löst die Verbindung zu %s."
-#: server/stdinhand.c:3240
+#: server/stdinhand.c:3252
#, c-format
msgid "%s no longer observing."
msgstr "%s beobachtet nicht mehr."
-#: server/stdinhand.c:3259
+#: server/stdinhand.c:3271
#, c-format
msgid "detaching from %s."
msgstr "Löse Verbindung zu %s."
-#: server/stdinhand.c:3345
+#: server/stdinhand.c:3361
msgid "Usage: load <game name>"
msgstr "Anwendung: load <Spielname>"
-#: server/stdinhand.c:3350
+#: server/stdinhand.c:3366
msgid "Cannot load a game while another is running."
msgstr "Solange ein Spiel läuft, kann kein weiteres geladen werden."
-#: server/stdinhand.c:3372
+#: server/stdinhand.c:3388
#, 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:3389
+#: server/stdinhand.c:3405
#, c-format
msgid "Could not load savefile: %s"
msgstr "Kann Spielstand '%s' nicht laden."
-#: server/stdinhand.c:3458
+#: server/stdinhand.c:3496
#, c-format
msgid "Current ruleset directory is \"%s\""
msgstr "Derzeitiges Verzeichnis für Regelsätze: '%s'"
-#: server/stdinhand.c:3478
+#: server/stdinhand.c:3516
#, c-format
msgid "Ruleset directory \"%s\" not found"
msgstr "Ruleset-Verzeichnis '%s' nicht gefunden"
-#: server/stdinhand.c:3484
+#: server/stdinhand.c:3522
#, c-format
msgid "Ruleset directory is already \"%s\""
msgstr "Ruleset-Verzeichnis ist bereits '%s'"
-#: server/stdinhand.c:3488
+#: server/stdinhand.c:3526
#, c-format
msgid "Ruleset directory set to \"%s\""
msgstr "Ruleset-Verzeichnis ist jetzt '%s'"
-#: server/stdinhand.c:3536
+#: server/stdinhand.c:3574
msgid "Goodbye."
msgstr "Auf Wiedersehen!"
-#: server/stdinhand.c:3567
+#: server/stdinhand.c:3606
msgid "Sorry, you are not allowed to use server commands."
msgstr "Keine Berechtigung zur Erteilung von Serverbefehlen."
-#: server/stdinhand.c:3603
+#: server/stdinhand.c:3656
#, 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:3608
+#: server/stdinhand.c:3661
#, c-format
msgid "Unknown command. Try '%shelp'."
msgstr "Unbekannter Befehl. '%shelp' gibt nähere Informationen."
-#: server/stdinhand.c:3625
-msgid "Your new vote canceled your previous vote."
-msgstr "Deine Wahl wurde abgeändert."
+#: server/stdinhand.c:3675
+msgid "Your new vote cancelled your previous vote."
+msgstr "Du hast Deine Wahlentscheidung abgeändert."
-#: server/stdinhand.c:3633
-#, c-format
-msgid "New vote (number %d) by %s: %s."
+#: server/stdinhand.c:3688
+msgid "New teamvote"
+msgstr ""
+
+#: server/stdinhand.c:3691
+msgid "New vote"
+msgstr ""
+
+#: server/stdinhand.c:3695
+#, fuzzy, c-format
+msgid "%s (number %d) by %s: %s"
msgstr "Neue Abstimmung (Nr. %d) von %s über den Befehl: %s"
-#: server/stdinhand.c:3645
+#: server/stdinhand.c:3704
#, 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:3655
-msgid "You are not allowed to use this command."
-msgstr "Keine Berechtigung zur Erteilung dieses Befehls."
-
-#: server/stdinhand.c:3680
+#: server/stdinhand.c:3726
msgid "(server prompt)"
msgstr "Serverbefehl"
-#: server/stdinhand.c:3787
+#: server/stdinhand.c:3835
msgid "Game ended in a draw."
msgstr "Spiel endete unentschieden."
-#: server/stdinhand.c:3791
+#: server/stdinhand.c:3839
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:3796
+#: server/stdinhand.c:3844
msgid "Cannot end the game: no game running."
msgstr "Spiel kann nicht beendet werden, da kein Spiel läuft."
-#: server/stdinhand.c:3812
+#: server/stdinhand.c:3860
#, 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:3817
+#: server/stdinhand.c:3865
msgid "You cannot surrender now."
msgstr "Du kannst jetzt nicht aufgeben."
-#: server/stdinhand.c:3883
+#: server/stdinhand.c:3931
msgid "Not enough human players, game will not start."
msgstr "Zu wenige menschliche Mitspieler, Spiel wird nicht gestartet."
-#: server/stdinhand.c:3888
+#: server/stdinhand.c:3936
msgid "No players, game will not start."
msgstr "Keine Mitspieler, Spiel wird nicht gestartet."
-#: server/stdinhand.c:3892
+#: server/stdinhand.c:3940
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:3901
+#: server/stdinhand.c:3949
msgid "All players are ready; starting game."
msgstr "Alle Spieler sind bereit, das Spiel wird gestartet."
-#: server/stdinhand.c:3915
+#: server/stdinhand.c:3963
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:3922
+#: server/stdinhand.c:3970
msgid "Cannot start the game: it is already running."
msgstr "Spiel kann nicht gestartet werden: es läuft bereits."
-#: server/stdinhand.c:3953
+#: server/stdinhand.c:4001
#, c-format
msgid "Cutting connection %s."
msgstr "Verbindung zu %s wird beendet."
-#: server/stdinhand.c:3972
+#: server/stdinhand.c:4020
msgid ""
"Welcome - this is the introductory help text for the Freeciv server.\n"
"\n"
@@ -6615,123 +6695,123 @@ msgstr ""
" save - Spiel speichern\n"
" quit - Server herunterfahren."
-#: server/stdinhand.c:4007 server/stdinhand.c:4010
+#: server/stdinhand.c:4055 server/stdinhand.c:4058
msgid "Command:"
msgstr "Befehl:"
-#: server/stdinhand.c:4014
+#: server/stdinhand.c:4062
msgid "Synopsis: "
msgstr "Ãœbersicht: "
-#: server/stdinhand.c:4023
+#: server/stdinhand.c:4071
#, c-format
msgid "Level: %s"
msgstr "Zugriff während des Spiels: %s"
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4096
msgid "The following server commands are available:"
msgstr "Es gibt folgende Serverbefehle:"
-#: server/stdinhand.c:4123
+#: server/stdinhand.c:4171
#, c-format
msgid "Help argument '%s' is ambiguous."
msgstr "Argument '%s' des 'help'-Befehls ist mehrdeutig."
-#: server/stdinhand.c:4128
+#: server/stdinhand.c:4176
#, c-format
msgid "No match for help argument '%s'."
msgstr "Keine Hilfe zu '%s' vorhanden."
-#: server/stdinhand.c:4194
+#: server/stdinhand.c:4242
#, c-format
msgid "Bad list argument: '%s'. Try '%shelp list'."
msgstr "Unzulässiges Argument zu 'list': '%s'. Versuchen Sie '%shelp list'."
-#: server/stdinhand.c:4234
+#: server/stdinhand.c:4282
msgid "List of players:"
msgstr "Spieler:"
-#: server/stdinhand.c:4239
+#: server/stdinhand.c:4287
msgid "<no players>"
msgstr "<keine>"
-#: server/stdinhand.c:4256
+#: server/stdinhand.c:4304
#, c-format
msgid "user %s, "
msgstr "Benutzername %s, "
-#: server/stdinhand.c:4267
+#: server/stdinhand.c:4315
msgid ", Dead"
msgstr ", Tot"
-#: server/stdinhand.c:4270
+#: server/stdinhand.c:4318
#, c-format
msgid ", difficulty level %s"
msgstr ", Schwierigkeitsgrad %s"
#. TRANS: continue list, in case comma is not the separator of choice.
-#: server/stdinhand.c:4275 server/stdinhand.c:4279 client/helpdata.c:257
-#: client/helpdata.c:752 client/text.c:241 client/text.c:1224
-#: client/text.c:1262
+#: server/stdinhand.c:4323 server/stdinhand.c:4327 client/helpdata.c:257
+#: client/helpdata.c:752 client/text.c:241 client/text.c:1229
+#: client/text.c:1267
#, c-format
msgid "?clistmore:, %s"
msgstr ", %s"
-#: server/stdinhand.c:4283
+#: server/stdinhand.c:4331
msgid ", ready"
msgstr ", bereit"
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4333
msgid ", not ready"
msgstr ", nicht fertig"
-#: server/stdinhand.c:4293
+#: server/stdinhand.c:4341
#, c-format
msgid " %d connection:"
msgid_plural " %d connections:"
msgstr[0] " 1 Verbindung:"
msgstr[1] " %d Verbindungen:"
-#: server/stdinhand.c:4299
+#: server/stdinhand.c:4347
#, c-format
msgid " %s from %s (command access level %s), bufsize=%dkb"
msgstr " %s von %s (Zugriffsberechtigung %s, %d kB Puffer)"
-#: server/stdinhand.c:4304
+#: server/stdinhand.c:4352
msgid " (observer mode)"
msgstr " (Beobachtermodus)"
-#: server/stdinhand.c:4322
+#: server/stdinhand.c:4370
msgid "List of teams:"
msgstr "Liste der Teams:"
#. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4332
+#: server/stdinhand.c:4380
#, 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:4352
+#: server/stdinhand.c:4400
#, c-format
msgid "%2d : '%s' : 1 player : %s"
msgstr "%2d : '%s' : 1 Spieler : %s"
-#: server/stdinhand.c:4360
+#: server/stdinhand.c:4408
#, c-format
msgid "Empty team: %s"
msgstr "Team %s ist leer."
-#: server/stdinhand.c:4371
+#: server/stdinhand.c:4419
msgid "List of connections to server:"
msgstr "Liste der Verbindungen zum Server:"
-#: server/stdinhand.c:4375
+#: server/stdinhand.c:4423
msgid "<no connections>"
msgstr "<keine Verbindungen>"
-#: server/stdinhand.c:4399
+#: server/stdinhand.c:4447
msgid "List of scenarios available:"
msgstr "Liste der verfügbaren Szenarios:"
@@ -6750,7 +6830,7 @@ msgstr "Die %s haben Zukunftstechnologie %d erforscht."
msgid "%s acquired from %s!"
msgstr "Du hast %s von den %s übernommen!"
-#: server/techtools.c:220
+#: server/techtools.c:221
#, c-format
msgid ""
"Discovery of %s makes the government form %s available. You may want to "
@@ -6759,43 +6839,43 @@ msgstr ""
"Die Entdeckung von %s macht die Regierungsform %s verfügbar. Vielleicht "
"willst du eine Revolution beginnen?"
-#: server/techtools.c:301
+#: server/techtools.c:302
#, c-format
msgid "Discovery of %s OBSOLETES %s in %s!"
msgstr "Die Entdeckung von %s veraltet %s in %s!"
-#: server/techtools.c:351
+#: server/techtools.c:352
#, c-format
msgid "Learned %s. Our scientists focus on %s; goal is %s."
msgstr ""
"%s erforscht. Unsere Wissenschaftler konzentrieren sich auf %s - das Ziel "
"ist %s."
-#: server/techtools.c:369
+#: server/techtools.c:370
#, c-format
msgid "Learned %s. Scientists choose to research %s."
msgstr ""
"%s erforscht. Unsere Wissenschaftler entscheiden sich für die Erforschung "
"von %s."
-#: server/techtools.c:376
+#: server/techtools.c:377
#, c-format
msgid "Learned %s. "
msgstr "%s erforscht. "
-#: server/techtools.c:379
+#: server/techtools.c:380
#, c-format
msgid "Researching %s."
msgstr "Erforsche %s."
-#: server/techtools.c:385
+#: server/techtools.c:386
#, c-format
msgid "Learned %s. Scientists do not know what to research next."
msgstr ""
"%s erforscht. Unsere Wissenschaftler wissen nicht, was sie als nächstes "
"erforschen sollen."
-#: server/techtools.c:402
+#: server/techtools.c:403
msgid ""
"Great scientists from all the world join your civilization: you get an "
"immediate advance."
@@ -6803,22 +6883,22 @@ msgstr ""
"Große Wissenschaftler aus aller Welt haben sich deiner Nation angeschlossen: "
"Ein direkter Fortschritt ist die Folge."
-#: server/techtools.c:570
+#: server/techtools.c:571
#, c-format
msgid "Technology goal is %s."
msgstr "Unser Forschungsziel ist %s."
-#: server/techtools.c:700
+#: server/techtools.c:708
#, c-format
msgid "You steal %s from the %s."
msgstr "Du hast %s von den %s gestohlen."
-#: server/techtools.c:705
+#: server/techtools.c:713
#, c-format
msgid "The %s stole %s from you!"
msgstr "Die %s haben %s von dir gestohlen!"
-#: server/techtools.c:710
+#: server/techtools.c:718
#, c-format
msgid "The %s have stolen %s from the %s."
msgstr "Die %s haben %s von den %s gestohlen."
@@ -6843,183 +6923,189 @@ msgstr "Es konnten keine Einheiten erneuert werden."
msgid "%s upgraded to %s for %d gold."
msgstr "%s durch %s ersetzt (Kosten: %d Goldstücke)."
-#: server/unithand.c:396
+#: server/unithand.c:402
#, c-format
msgid "%s refuses to disband!"
msgstr "%s will sich nicht auflösen!"
-#: server/unithand.c:449
+#: server/unithand.c:455
msgid "Can't place city here."
msgstr "Hier kann keine Stadt gebaut werden."
-#: server/unithand.c:456
+#: server/unithand.c:462
#, c-format
msgid "Only %s can build a city."
msgstr "Nur %s können eine Stadt erbauen."
-#: server/unithand.c:461
+#: server/unithand.c:467
msgid "Can't build a city."
msgstr "Stadt kann nicht erbaut werden."
-#: server/unithand.c:470
+#: server/unithand.c:476
#, c-format
msgid "Only %s can add to a city."
msgstr "Eine Stadt kann nur mit %s erweitert werden."
-#: server/unithand.c:475
+#: server/unithand.c:481
msgid "Can't add to a city."
msgstr "Stadt kann nicht erweitert werden."
-#: server/unithand.c:481
+#: server/unithand.c:487
#, c-format
msgid "%s unit has no moves left to add to %s."
msgstr ""
"Die %s können %s nicht erweitern, da sie keine Bewegungspunkte mehr haben."
-#: server/unithand.c:487
+#: server/unithand.c:493
#, c-format
msgid "%s unit has no moves left to build city."
msgstr "Die %s Einheit kann keine Stadt mehr bauen."
-#: server/unithand.c:492
+#. TRANS: <city> is owned by <nation>, cannot add <unit>.
+#: server/unithand.c:499
+#, c-format
+msgid "%s is owned by %s, cannot add %s."
+msgstr "Die Stadt %s gehört zu %s, %s kann nicht hinzufügt werden."
+
+#: server/unithand.c:506
#, c-format
msgid "%s is too big to add %s."
msgstr "%s ist zu groß, um %s hinzufügen zu können."
-#: server/unithand.c:498
+#: server/unithand.c:512
#, c-format
msgid "%s needs an improvement to grow, so you cannot add %s."
msgstr ""
"%s braucht für weiteres Wachstum eine Stadterweiterung, daher kann %s kann "
"nicht hinzugefügt werden."
-#: server/unithand.c:509
+#: server/unithand.c:523
#, c-format
msgid "Can't add %s to %s."
msgstr "%s kann nicht zu %s hinzugefügt werden."
-#: server/unithand.c:531
+#: server/unithand.c:545
#, c-format
msgid "%s added to aid %s in growing."
msgstr "%s hinzugefügt, um beim Wachstum von %s zu helfen."
-#: server/unithand.c:828
+#: server/unithand.c:842
msgid "Your Nuclear missile was shot down by SDI defences, what a waste."
msgstr "Atomrakete von SDI-Verteidigung abgeschossen."
-#: server/unithand.c:831
+#: server/unithand.c:845
#, c-format
msgid "The nuclear attack on %s was avoided by your SDI defense."
msgstr "Der nukleare Angriff auf %s wurde von der SDI-Verteidigung abgewehrt."
#. TRANS: "Your Cannon ... the Polish Destroyer."
-#: server/unithand.c:901
+#: server/unithand.c:915
#, c-format
msgid "Your %s survived the pathetic attack from the %s %s."
msgstr "Deine %s überlebte den Angriff der %sen %s."
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unithand.c:910
+#: server/unithand.c:924
#, c-format
msgid "Your attacking %s failed against the %s %s!"
msgstr "Der Angriff deiner %s gegen die %sen %s ist fehlgeschlagen!"
-#: server/unithand.c:983
+#: server/unithand.c:997
#, c-format
msgid "Only %s can attack from sea."
msgstr "Nur %s können von See aus angreifen."
-#: server/unithand.c:988
+#: server/unithand.c:1002
msgid "Cannot attack from sea."
msgstr "Kann nicht von See aus angreifen."
-#: server/unithand.c:996 server/unittools.c:2137
+#: server/unithand.c:1010 server/unittools.c:2142
msgid "Cannot attack unless you declare war first."
msgstr "Kann erst nach Kriegserklärung angreifen."
-#: server/unithand.c:1001
+#: server/unithand.c:1015
#, c-format
msgid "%s can only move into your own zone of control."
msgstr "%s können sich nur in der eigenen Kontrollzone bewegen."
-#: server/unithand.c:1007
+#: server/unithand.c:1021
#, c-format
msgid "Cannot invade unless you break peace with %s first."
msgstr "Kann erst einmaschieren, wenn du den Frieden mit %s brichst."
-#: server/unithand.c:1052
+#: server/unithand.c:1066
msgid "This unit has no moves left."
msgstr "Diese Einheit kann nicht mehr ziehen."
-#: server/unithand.c:1107
+#: server/unithand.c:1121
msgid "Unit must be on land to perform diplomatic action."
msgstr "Diplomatische Tätigkeiten können nur an Land erfolgen."
-#: server/unithand.c:1109
+#: server/unithand.c:1123
msgid "No diplomat action possible."
msgstr "Verhandlungen sind nicht möglich."
-#: server/unithand.c:1125
+#: server/unithand.c:1139
#, c-format
msgid "You must declare war on %s first. Try using players dialog (F3)."
msgstr ""
"Du mußt %s erst den Krieg erklären. Versuche es mit dem Spieler-Bericht (F3)."
-#: server/unithand.c:1143
+#: server/unithand.c:1157
msgid "This unit is being transported, and so cannot bombard."
msgstr "Diese Einheit wird transportiert und kann daher nicht bombardieren."
-#: server/unithand.c:1158
+#: server/unithand.c:1172
msgid "You can't attack there."
msgstr "Da ist kein Angriff möglich."
-#: server/unithand.c:1180
+#: server/unithand.c:1194
msgid "This type of troops cannot take over a city."
msgstr "Diese Truppenart kann keine Stadt einnehmen."
-#: server/unithand.c:1198
+#: server/unithand.c:1212
msgid "A transported unit is not allied to all units or city on target tile."
msgstr ""
"Eine transportierte Einheit ist nicht mit allen Einheiten oder der Stadt auf "
"dem Zielfeld alliiert."
-#: server/unithand.c:1240
+#: server/unithand.c:1254
#, c-format
msgid "Your %s helps build the %s in %s (%d remaining)."
msgstr "%s hilft, %s in %s zu bauen (Restkosten: %d)."
-#: server/unithand.c:1242
+#: server/unithand.c:1256
#, c-format
msgid "Your %s helps build the %s in %s (%d surplus)."
msgstr "%s hilft, %s in %s zu bauen (Überschuß: %d)."
-#: server/unithand.c:1286
+#: server/unithand.c:1300
#, c-format
msgid ""
"Sorry, your %s cannot establish a trade route because it has no home city"
msgstr "%s kann keinen Handelsweg gründen, da sie keine Heimatstadt haben."
-#: server/unithand.c:1296
+#: server/unithand.c:1310
#, c-format
msgid "Sorry, your %s cannot establish a trade route between %s and %s"
msgstr "%s kann keinen Handelsweg zwischen %s und %s gründen."
-#: server/unithand.c:1325 server/unithand.c:1344
+#: server/unithand.c:1339 server/unithand.c:1358
#, c-format
msgid "Sorry, your %s cannot establish a trade route here!"
msgstr "%s kann hier keinen Handelsweg gründen!"
-#: server/unithand.c:1329 server/unithand.c:1348
+#: server/unithand.c:1343 server/unithand.c:1362
#, c-format
msgid " The city of %s already has %d better trade routes!"
msgstr " Die Stadt %s hat bereits %d bessere Handelswege!"
-#: server/unithand.c:1361 server/unithand.c:1373
+#: server/unithand.c:1375 server/unithand.c:1387
#, c-format
msgid "Sorry, %s has canceled the trade route from %s to your city %s."
msgstr "%s hat die Handelsroute zwischen %s und Ihrer Stadt %s aufgehoben."
-#: server/unithand.c:1406
+#: server/unithand.c:1420
#, c-format
msgid ""
"Your %s from %s has arrived in %s, and revenues amount to %d in gold and "
@@ -7080,57 +7166,57 @@ msgid "Teleported your %s to %s."
msgstr "Habe %s nach %s teleportiert."
#. TRANS: A unit is moved to resolve stack conflicts.
-#: server/unittools.c:1065
+#: server/unittools.c:1070
#, c-format
msgid "Moved your %s."
msgstr "%s wurde verschoben."
-#: server/unittools.c:1076
+#: server/unittools.c:1081
#, c-format
msgid "Disbanded your %s."
msgstr "Einheit %s aufgelöst."
-#: server/unittools.c:1397
+#: server/unittools.c:1402
#, c-format
msgid "Unable to defend %s, %s has lost the game."
msgstr "Konnte %s nicht verteidigen, %s hat das Spiel verloren."
-#: server/unittools.c:1401
+#: server/unittools.c:1406
#, c-format
msgid "Losing %s meant losing the game! Be more careful next time!"
msgstr ""
"Durch den Verlust von %s ist das Spiel verloren. Seien Sie das nächste Mal "
"vorsichtiger!"
-#: server/unittools.c:1503
+#: server/unittools.c:1508
#, c-format
msgid "%s escaped the destruction of %s, and fled to %s."
msgstr "%s ist der Zerstörung von %s entgangen und nach %s geflüchtet."
-#: server/unittools.c:1512
+#: server/unittools.c:1517
#, c-format
msgid "%s lost when %s was lost."
msgstr "%s beim Verlust von %s verloren."
-#: server/unittools.c:1561
+#: server/unittools.c:1566
#, c-format
msgid "Barbarian leader captured, %d gold ransom paid."
msgstr "Barbarenanführer gefaßt, %d Goldstücke Belohnung erhalten."
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unittools.c:1579
+#: server/unittools.c:1584
#, c-format
msgid "Your attacking %s succeeded against the %s %s!"
msgstr "Der Angriff deiner %s gegen die %sen %s ist geglückt!"
#. TRANS: "Cannon ... the Polish Destroyer."
-#: server/unittools.c:1588 server/unittools.c:1646
+#: server/unittools.c:1593 server/unittools.c:1651
#, c-format
msgid "%s lost to an attack by the %s %s."
msgstr "%s beim Angriff der %sen %s verloren."
#. TRANS: "... Cannon ... the Polish Destroyer ...."
-#: server/unittools.c:1622
+#: server/unittools.c:1627
#, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -7144,14 +7230,14 @@ msgstr[1] ""
#. TRANS: "Cannon lost when the Polish Destroyer
#. * attacked the German Musketeers."
-#: server/unittools.c:1655
+#: server/unittools.c:1660
#, c-format
msgid "%s lost when the %s %s attacked the %s %s."
msgstr "%s beim Angriff der %sen %s auf die %sen %s verloren."
#. TRANS: "Musketeers (and Cannon) lost to an
#. * attack from the Polish Destroyer."
-#: server/unittools.c:1670
+#: server/unittools.c:1675
#, c-format
msgid "%s (and %s) lost to an attack from the %s %s."
msgstr "%s (und %s) beim Angriff der %sen %s verloren."
@@ -7159,7 +7245,7 @@ msgstr "%s (und %s) beim Angriff der %sen %s verloren."
#. TRANS: "Musketeers and 3 other units lost to
#. * an attack from the Polish Destroyer."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1680
+#: server/unittools.c:1685
#, 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."
@@ -7169,184 +7255,230 @@ msgstr[1] "%s und %d weitere Einheiten beim Angriff der %sen %s verloren."
#. TRANS: "2 units lost when the Polish Destroyer
#. * attacked the German Musketeers."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1694
+#: server/unittools.c:1699
#, 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 Einheit beim Angriff der %sen %s auf die %sen %s verloren."
msgstr[1] "%d Einheiten beim Angriff der %sen %s auf %sen %s verloren."
-#: server/unittools.c:1962
+#: server/unittools.c:1967
#, c-format
msgid "Your %s was nuked by %s."
msgstr "%s wurde von %s atomar angegriffen."
-#: server/unittools.c:1965 server/unittools.c:1981
+#: server/unittools.c:1970 server/unittools.c:1986
msgid "yourself"
msgstr "selbst"
-#: server/unittools.c:1969
+#: server/unittools.c:1974
#, c-format
msgid "The %s %s was nuked."
msgstr "Die %sen %s wurden atomar angegriffen."
-#: server/unittools.c:1978
+#: server/unittools.c:1983
#, c-format
msgid "%s was nuked by %s."
msgstr "%s wurde von %s atomar angegriffen."
-#: server/unittools.c:1986
+#: server/unittools.c:1991
#, c-format
msgid "You nuked %s."
msgstr "%s atomar angegriffen."
-#: server/unittools.c:2027
+#: server/unittools.c:2032
#, c-format
msgid "The %s detonated a nuke!"
msgstr "Die %s haben eine Atombombe gezündet!"
-#: server/unittools.c:2051
+#: server/unittools.c:2056
#, c-format
msgid "%s transported successfully."
msgstr "%s transportiert."
-#: server/unittools.c:2103
+#: server/unittools.c:2108
msgid "This unit type can not be paradropped."
msgstr "Diese Einheit kann nicht fallschirmspringen."
-#: server/unittools.c:2113
+#: server/unittools.c:2118
msgid "You cannot paradrop a unit that is transporting other units."
msgstr "Ein Transporter kann nicht fallschirmspringen."
-#: server/unittools.c:2119
+#: server/unittools.c:2124
msgid "The destination location is not known."
msgstr "Der Zielort ist nicht bekannt."
-#: server/unittools.c:2126
+#: server/unittools.c:2131
#, c-format
msgid "This unit cannot paradrop into %s."
msgstr "Diese Einheit kann nicht über %s abspringen."
-#: server/unittools.c:2146
+#: server/unittools.c:2151
#, c-format
msgid "The distance to the target (%i) is greater than the unit's range (%i)."
msgstr ""
"Die Entfernung zum Ziel (%i) ist größer als die Reichweite dieser Einheit (%"
"i)."
-#: server/unittools.c:2157
+#: server/unittools.c:2162
#, c-format
msgid "Your %s paradropped into the %s and was lost."
msgstr "Die %s sind über %s abgesprungen und gingen verloren."
-#: server/unittools.c:2170
+#: server/unittools.c:2175
#, c-format
msgid "Your %s was killed by enemy units at the paradrop destination."
msgstr "Die %s wurden von feindlichen Einheiten bei der Landung vernichtet."
-#: server/unittools.c:2192
+#: server/unittools.c:2197
#, c-format
msgid "You found %d gold."
msgstr "%d Goldstücke erhalten."
-#: server/unittools.c:2209
+#: server/unittools.c:2214
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr "%s aus überlieferten Texten gelernt."
-#: server/unittools.c:2216
+#: server/unittools.c:2221
#, c-format
msgid "The %s have acquired %s from ancient scrolls of wisdom."
msgstr ""
"Die %s haben die Kenntnis über %s in überlieferten wissenschaftlichen Texten "
"gefunden."
-#: server/unittools.c:2230
+#: server/unittools.c:2235
msgid "A band of friendly mercenaries joins your cause."
msgstr "Eine Gruppe Söldner stellt sich zur Verfügung."
-#: server/unittools.c:2248
+#: server/unittools.c:2253
msgid "An abandoned village is here."
msgstr "Hier ist eine verlassene Ortschaft."
-#: server/unittools.c:2258
+#: server/unittools.c:2263
msgid "You have unleashed a horde of barbarians!"
msgstr "Barbarenhorde freigesetzt."
-#: server/unittools.c:2261
+#: server/unittools.c:2266
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr "Barbaren haben %s vernichtet."
-#: server/unittools.c:2277
+#: server/unittools.c:2282
msgid "You found a friendly city."
msgstr "Eine unabhängige Stadt schließt sich an."
-#: server/unittools.c:2291
+#: server/unittools.c:2296
msgid "Friendly nomads are impressed by you, and join you."
msgstr "Eine Gruppe Nomaden stellt sich zur Verfügung."
-#: server/unittools.c:2316
+#: server/unittools.c:2321
msgid "Your overflight frightens the tribe; they scatter in terror."
msgstr ""
"Durch den Ãœberflug wurden die Eingeborenen so erschreckt,\n"
" daß sie in alle Himmelsrichtungen flohen."
-#: server/unittools.c:2574
+#: server/unittools.c:2579
#, c-format
msgid "Orders for %s aborted after enemy movement was spotted."
msgstr "Befehle für %s verworfen, weil eine Feindbewegung entdeckt wurde."
-#: server/unittools.c:3023
+#: server/unittools.c:3028
#, c-format
msgid "Orders for %s aborted as there are units nearby."
msgstr "Befehle für %s verworfen, da Einheiten in der Nähe sind."
-#: server/unittools.c:3075
+#: server/unittools.c:3080
#, c-format
msgid "Orders for %s aborted because building of city failed."
msgstr "Befehle für %s verworfen, da die Stadt nicht gegründet werden konnte."
-#: server/unittools.c:3088
+#: server/unittools.c:3093
#, c-format
msgid "Orders for %s aborted since they give an invalid activity."
msgstr "Befehle für %s verworfen, Auftrag unmöglich."
-#: server/unittools.c:3102
+#: server/unittools.c:3107
#, c-format
msgid "Orders for %s aborted since they give an invalid location."
msgstr "Befehle für %s verworfen, das Ziel ist ungültig."
-#: server/unittools.c:3112
+#: server/unittools.c:3117
#, c-format
msgid "Orders for %s aborted as there are units in the way."
msgstr "%s konnte Befehl nicht ausführen, da Einheiten im Weg sind."
-#: server/unittools.c:3138
+#: server/unittools.c:3143
#, c-format
msgid "Orders for %s aborted because of failed move."
msgstr "Befehle für %s verworfen, da der Zug nicht ausgeführt werden konnte."
-#: server/unittools.c:3179
+#: server/unittools.c:3184
#, c-format
msgid "Attempt to change homecity for %s failed."
msgstr "Der Versuch, die Heimatstadt der %s zu ändern, schlug fehl."
-#: server/unittools.c:3190
+#: server/unittools.c:3195
#, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr "Der Versuch, eine Handelsroute nach %s einzurichten, mißlang."
-#: server/unittools.c:3202
+#: server/unittools.c:3207
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr "Der Versuch, ein Weltwunder in %s zu errichten, mißlang."
-#: server/unittools.c:3211
+#: server/unittools.c:3216
#, c-format
msgid "Your %s has invalid orders."
msgstr "Befehle für %s sind ungültig."
+#: server/voting.c:522
+#, fuzzy, c-format
+msgid ""
+"%s %d \"%s\" is passed %d to %d with %d abstentions and %d who did not vote."
+msgstr ""
+"Der Befehl '%s' wurde in der Abstimmung mit %d zu %d angenommen, bei %d "
+"Enthaltungen."
+
+#: server/voting.c:528
+#, fuzzy, c-format
+msgid ""
+"%s %d \"%s\" failed with %d against, %d for, %d abstentions and %d who did "
+"not vote."
+msgstr ""
+"Der Befehl '%s' wurde in der Abstimmung mit %d gegen %d abgelehnt, bei %d "
+"Enthaltungen."
+
+#: server/voting.c:548
+#, c-format
+msgid "%s %d: %s voted yes."
+msgstr ""
+
+#: server/voting.c:553
+#, c-format
+msgid "%s %d: %s voted no."
+msgstr ""
+
+#: server/voting.c:558
+#, c-format
+msgid "%s %d: %s chose to abstain."
+msgstr ""
+
+#. TRANS: Describing a new vote that can only pass
+#. * if there are no dissenting votes.
+#: server/voting.c:726
+#, c-format
+msgid "%s (needs %0.0f%% and no dissent)."
+msgstr ""
+
+#. TRANS: Describing a new vote that can pass only if the
+#. * given percentage of players votes 'yes'.
+#: server/voting.c:732
+#, c-format
+msgid "%s (needs %0.0f%% in favor)."
+msgstr ""
+
#: server/generator/mapgen.c:1771
msgid "High landmass - this may take a few seconds."
msgstr "Große Landfläche - bitte warten..."
@@ -7378,14 +7510,14 @@ msgstr ""
"Vielleicht ist die Anzahl der Spieler für diese Karte zu groß.\n"
"Bitte berichten Sie den Fehler an %s."
-#: client/attribute.c:363
+#: client/attribute.c:368
msgid ""
"There has been a CMA error. Your citizen governor settings may be broken."
msgstr ""
"In der automatischen Stadtverwaltung ist ein Fehler aufgetreten. "
"Möglicherweise sind die Einstellungen für den Bürgermeister fehlerhaft."
-#: client/attribute.c:367
+#: client/attribute.c:372
msgid "Old attributes detected and removed."
msgstr "Alte Attribute wurden entfernt."
@@ -7535,41 +7667,41 @@ msgstr "%+4d : Bürger\n"
msgid "%+4d : Taxed from trade\n"
msgstr "%+4d : Handelssteuern\n"
-#: client/citydlg_common.c:418
+#: client/citydlg_common.c:421
#, c-format
msgid "%+4d : Trade route with %s\n"
msgstr "%+4d : Handelsroute mit %s\n"
-#: client/citydlg_common.c:427
+#: client/citydlg_common.c:430
#, c-format
msgid "%+4d : Building tithes\n"
msgstr "%+4d : Gebäudeabgaben\n"
-#: client/citydlg_common.c:450
+#: client/citydlg_common.c:453
#, c-format
msgid "%+4d : Bonus from %s (%+d%%)\n"
msgstr "%+4d : Bonus von %s (%+d%%)\n"
-#: client/citydlg_common.c:462
+#: client/citydlg_common.c:465
#, c-format
msgid "%+4d : Waste\n"
msgstr "%+4d : Verschwendung\n"
-#: client/citydlg_common.c:468
+#: client/citydlg_common.c:471
#, c-format
msgid "%+4d : Disorder\n"
msgstr "%+4d : Aufruhr\n"
-#: client/citydlg_common.c:474
+#: client/citydlg_common.c:477
#, c-format
msgid "%+4d : Used\n"
msgstr "%+4d : Verbrauch\n"
-#: client/citydlg_common.c:479
+#: client/citydlg_common.c:482
msgid "==== : Adds up to\n"
msgstr "==== : ergibt\n"
-#: client/citydlg_common.c:481
+#: client/citydlg_common.c:484
#, c-format
msgid "%4d : Total surplus"
msgstr "%4d : Gesamtüberschuß"
@@ -7874,55 +8006,55 @@ msgstr "Sp"
msgid "Specialists"
msgstr "Spezialisten"
-#: client/civclient.c:240
+#: client/civclient.c:241
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr " -a, --autoconnect\tAuswahlmenü zur Serverwahl unterdrücken\n"
-#: client/civclient.c:250
+#: client/civclient.c:251
msgid " -l, --log FILE\tUse FILE as logfile (spawned server also uses this)\n"
msgstr ""
" -l, --log DATEI\tDATEI als Logdatei benutzen (auch für gestarteten "
"Server)\n"
-#: client/civclient.c:252
+#: client/civclient.c:253
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr " -m, --metaserver HOST\tMit Metaserver auf HOST verbinden\n"
-#: client/civclient.c:254
+#: client/civclient.c:255
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr " -n, --name NAME\tBenutze NAME als Alias\n"
-#: client/civclient.c:256
+#: client/civclient.c:257
msgid " -p, --port PORT\tConnect to server port PORT (usually with -a)\n"
msgstr ""
" -p, --port PORT\tMit dem Server an PORT verbinden\n"
" \t(meist in Verbindung mit der Option -a)\n"
-#: client/civclient.c:258
+#: client/civclient.c:259
#, c-format
msgid " -P, --Plugin PLUGIN\tUse PLUGIN for sound output %s\n"
msgstr " -P, --Plugin PLUGIN\tPLUGIN zur Soundausgabe benutzen %s\n"
-#: client/civclient.c:260
+#: client/civclient.c:261
msgid " -r, --read FILE\tRead startup script FILE (for spawned server only)\n"
msgstr ""
" -r, --read DATEI\tStartskript DATEI laden (nur für gestarteten Server)\n"
-#: client/civclient.c:263
+#: client/civclient.c:264
msgid " -s, --server HOST\tConnect to the server at HOST (usually with -a)\n"
msgstr ""
" -s, --server HOST\tMit Server auf HOST verbinden\n"
" \t(meist in Verbindung mit der Option -a)\n"
-#: client/civclient.c:265
+#: client/civclient.c:266
msgid " -S, --Sound FILE\tRead sound tags from FILE\n"
msgstr " -S, --Sound DATEI\tSounds aus DATEI laden\n"
-#: client/civclient.c:266
+#: client/civclient.c:267
msgid " -t, --tiles FILE\tUse data file FILE.tilespec for tiles\n"
msgstr " -t, --tiles DATEI\tTiles aus DATEI.tilespec verwenden\n"
-#: client/civclient.c:269
+#: client/civclient.c:270
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7932,7 +8064,7 @@ msgstr ""
"\t\t\tFür mehr Hilfe: \"%s -- --help\"\n"
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:274
+#: client/civclient.c:275
#, c-format
msgid "Report bugs at %s\n"
msgstr ""
@@ -7942,40 +8074,40 @@ msgstr ""
"- über Probleme mit der deutschen Übersetzung mit einer E-Mail an "
"<chrisk at cknoke.de>\n"
-#: client/civclient.c:298
+#: client/civclient.c:299
#, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr "Fehler: Option --port: Portnummer '%s' ist nicht zulässig.\n"
-#: client/civclient.c:300 client/civclient.c:315
+#: client/civclient.c:301 client/civclient.c:316
msgid "Try using --help.\n"
msgstr "Hilfe erhalten Sie mit der Option --help.\n"
-#: client/civclient.c:313
+#: client/civclient.c:314
#, c-format
msgid "Invalid debug level \"%s\" specified with --debug option.\n"
msgstr "Fehler: Option --debug: Debug-Level '%s' ist nicht zulässig.\n"
-#: client/civclient.c:326
+#: client/civclient.c:327
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr "Unbekannte Option: '%s'\n"
-#: client/civclient.c:391
+#: client/civclient.c:393
#, c-format
msgid "Updating old metaserver address \"%s\"."
msgstr "Veraltete Metaserver-Adresse '%s' wird ersetzt."
-#: client/civclient.c:394
+#: client/civclient.c:396
#, c-format
msgid "Default metaserver has been set to \"%s\"."
msgstr "Die Adresse des Standard-Metaservers wurde auf '%s' gesetzt."
-#: client/civclient.c:550
+#: client/civclient.c:540
msgid "Game started."
msgstr "Spiel begonnen."
-#: client/civclient.c:588
+#: client/civclient.c:606
msgid "There was an error while auto connecting; aborting."
msgstr "Fehler bei automatischem Verbindungsaufbau: Abbruch."
@@ -8105,18 +8237,18 @@ msgstr "Verbindungsaufbau."
msgid "Disconnected from server."
msgstr "Verbindung zum Server beendet."
-#: client/clinet.c:469
+#: client/clinet.c:473
#, c-format
msgid "Failed to contact server \"%s\" at port %d as \"%s\" after %d attempts"
msgstr ""
"Verbindungsaufbau zu Server '%s' an Port %d als '%s' war (in %d Versuchen) "
"nicht möglich."
-#: client/clinet.c:484 client/clinet.c:486
+#: client/clinet.c:488 client/clinet.c:490
msgid "Connection to server refused. Please start the server."
msgstr "Verbindung zum Server nicht möglich. Bitte den Server starten."
-#: client/clinet.c:495 client/clinet.c:523
+#: client/clinet.c:499 client/clinet.c:527
#, c-format
msgid ""
"Error contacting server \"%s\" at port %d as \"%s\":\n"
@@ -8125,7 +8257,7 @@ msgstr ""
"Fehler beim Kontaktversuch mit Server '%s' an Port %d als '%s':\n"
"%s\n"
-#: client/clinet.c:514
+#: client/clinet.c:518
#, c-format
msgid ""
"Auto-connecting to server \"%s\" at port %d as \"%s\" every %f second(s) for "
@@ -8134,52 +8266,52 @@ 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:1358
+#: client/connectdlg_common.c:78 client/gui-gtk-2.0/pages.c:1358
msgid "novice"
msgstr "Anfänger"
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1358
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
msgid "easy"
msgstr "Leicht"
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1359
msgid "normal"
msgstr "Normal"
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr "Fortgeschritten"
-#: client/connectdlg_common.c:83
+#: client/connectdlg_common.c:82
msgid "experimental"
msgstr "Experimentell"
-#: client/connectdlg_common.c:213
+#: client/connectdlg_common.c:212
msgid "Starting server..."
msgstr "Starte Server..."
-#: client/connectdlg_common.c:332
+#: client/connectdlg_common.c:331
msgid "Couldn't start the server."
msgstr "Konnte den Server nicht starten."
-#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
+#: client/connectdlg_common.c:332 client/connectdlg_common.c:365
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:364
+#: client/connectdlg_common.c:363
msgid "Couldn't connect to the server."
msgstr "Konnte Verbindung zum Server nicht herstellen."
-#: client/connectdlg_common.c:365
+#: client/connectdlg_common.c:364
msgid "We probably couldn't start it from here."
msgstr "Kann vermutlich nicht hier gestartet werden."
-#: client/connectdlg_common.c:470
+#: client/connectdlg_common.c:469
msgid ""
"Established control over the server. You have command access level 'hack'."
msgstr "Wir kontrollieren den Server (Zugriffsberechtigung 'hack')."
-#: client/connectdlg_common.c:475
+#: client/connectdlg_common.c:474
msgid ""
"Failed to obtain the required access level to take control of the server. "
"The server will now be shutdown."
@@ -8191,27 +8323,27 @@ msgstr ""
msgid "Only transporter units can be unloaded."
msgstr "Nur Schiffe können entladen werden."
-#: client/control.c:1425
+#: client/control.c:1417
msgid "Only settler units can be put into auto mode."
msgstr "Nur Siedler können automatisch agieren."
-#: client/control.c:1516
+#: client/control.c:1511
msgid "Only nuclear units can do this."
msgstr "Das können nur Nuklear-Einheiten."
-#: client/control.c:1545
+#: client/control.c:1540
msgid "Only paratrooper units can do this."
msgstr "Das können nur Fallschirmspringer."
-#: client/control.c:2020
+#: client/control.c:2015
msgid "Too far for this unit."
msgstr "Zu weit für diese Einheit."
-#: client/control.c:2230 client/control.c:2260 client/control.c:2276
+#: client/control.c:2225 client/control.c:2255 client/control.c:2271
msgid "Didn't find a route to the destination!"
msgstr "Es gibt keinen Weg zu diesem Ziel!"
-#: client/control.c:2320
+#: client/control.c:2315
msgid "Oh my! You seem to have no capital!"
msgstr "Oh je! Es scheint keine Hauptstadt zu geben!"
@@ -8615,29 +8747,40 @@ 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:1066 client/helpdata.c:1400
+#: client/helpdata.c:1066 client/helpdata.c:1408
msgid " or "
msgstr " oder "
-#: client/helpdata.c:1068 client/helpdata.c:1388
+#: client/helpdata.c:1068 client/helpdata.c:1396
msgid "?or:, "
msgstr "?or:, "
-#: client/helpdata.c:1080
+#: client/helpdata.c:1079
#, 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"
+msgid "* Unit has to be in a city, or a base after %d turn.\n"
+msgid_plural "* Unit has to be in a city, or a base after %d turns.\n"
msgstr[0] ""
-"* Einheit muß nach einer Runde in einer Stadt oder auf einem %s sein.\n"
+"* Einheit muß nach %d Runde in einer Stadt oder auf einer Basis sein.\n"
msgstr[1] ""
-"* Einheit muß nach %2$d Runden in einer Stadt oder auf einem %1$s sein.\n"
+"* Einheit muß nach %d Runden in einer Stadt oder auf einer Basis sein.\n"
-#: client/helpdata.c:1122
+#: client/helpdata.c:1087
+#, c-format
+msgid "* Unit has to be in a city, a base, or on a %s after %d turn.\n"
+msgid_plural "* Unit has to be in a city, a base, or on a %s after %d turns.\n"
+msgstr[0] ""
+"* Einheit muß nach %2$d Runde in einer Stadt, einer Basis, oder auf einem %1"
+"$s sein.\n"
+msgstr[1] ""
+"* Einheit muß nach %2$d Runden in einer Stadt, einer Basis oder auf einem %1"
+"$s sein.\n"
+
+#: client/helpdata.c:1130
#, 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:1127
+#: client/helpdata.c:1135
#, c-format
msgid ""
"To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8646,94 +8789,94 @@ msgstr ""
"Die Erforschung von %s erfordert zunächst den Abschluß von %d anderen "
"Forschungsprojekten. Insgesamt werden %d Punkte benötigt."
-#: client/helpdata.c:1135
+#: client/helpdata.c:1143
msgid "You cannot research this technology."
msgstr "Sie können diese Technologie nicht erforschen."
-#: client/helpdata.c:1139
+#: client/helpdata.c:1147
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:1151
+#: client/helpdata.c:1159
#, 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:1156
+#: client/helpdata.c:1164
#, 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:1159
+#: client/helpdata.c:1167
#, 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:1163
+#: client/helpdata.c:1171
msgid "* Increases the pollution generated by the population.\n"
msgstr ""
"* Vergrößert die durch die Bevölkerung verursachte Umweltverschmutzung\n"
-#: client/helpdata.c:1168
+#: client/helpdata.c:1176
#, 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:1175
+#: client/helpdata.c:1183
#, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr "* %s mit diesem Wissen können befestigte Stellungen bauen.\n"
-#: client/helpdata.c:1183
+#: client/helpdata.c:1191
#, c-format
msgid "* Allows %s to build airbases.\n"
msgstr "* %s mit diesem Wissen können Fliegerhorste bauen.\n"
-#: client/helpdata.c:1192
+#: client/helpdata.c:1200
#, 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:1200
+#: client/helpdata.c:1208
#, 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:1234
+#: client/helpdata.c:1242
msgid "* Pollution cannot be generated on this terrain."
msgstr "* Auf diesem Geländetyp gibt es keine Umweltverschmutzung."
-#: client/helpdata.c:1239
+#: client/helpdata.c:1247
msgid "* You cannot build cities on this terrain."
msgstr "* Auf diesem Gelände können keine Städte gegründet werden."
-#: client/helpdata.c:1245
+#: client/helpdata.c:1253
msgid "* The coastline of this terrain is unsafe."
msgstr "* Die Küstenlinie dieses Geländetyps ist unsicher."
-#: client/helpdata.c:1250
+#: client/helpdata.c:1258
msgid "* This terrain is unsafe for units to travel on."
msgstr "* Bewegung auf diesem Geländetyp ist unsicher."
-#: client/helpdata.c:1255
+#: client/helpdata.c:1263
msgid "* Land units cannot travel on oceanic terrains."
msgstr "* Landeinheiten können sich nicht auf dem Ozean bewegen."
-#: client/helpdata.c:1305
+#: client/helpdata.c:1313
msgid "Features:\n"
msgstr "Besonderheiten:\n"
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1411 client/helpdata.c:1412
+#: client/helpdata.c:1419 client/helpdata.c:1420
msgid "?outputlist: Nothing "
msgstr "Nichts"
# CK: field units refer to bombers and rocketry inside of cities
-#: client/helpdata.c:1419
+#: client/helpdata.c:1427
#, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -8748,7 +8891,7 @@ msgstr[1] ""
"* Kampfeinheiten im Einsatz und Luftangriffseinheiten machen %d Bürger "
"unzufrieden.\n"
-#: client/helpdata.c:1429
+#: client/helpdata.c:1437
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8758,48 +8901,48 @@ msgstr ""
"Bürger.\n"
#. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1437
+#: client/helpdata.c:1445
#, 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:1442
+#: client/helpdata.c:1450
#, 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:1447
+#: client/helpdata.c:1455
#, 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:1451
+#: client/helpdata.c:1459
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:1460
+#: client/helpdata.c:1468
#, 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:1468
+#: client/helpdata.c:1476
#, 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:1475
+#: client/helpdata.c:1483
#, 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:1482
+#: client/helpdata.c:1490
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -8809,7 +8952,7 @@ msgstr ""
"%d Städten.\n"
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1489
+#: client/helpdata.c:1497
#, c-format
msgid ""
"* After the first unhappy citizen due to city size, for each %d additional "
@@ -8818,16 +8961,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:1497
+#: client/helpdata.c:1505
#, 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:1502
+#: client/helpdata.c:1510
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:1507
+#: client/helpdata.c:1515
#, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -8842,7 +8985,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:1519
+#: client/helpdata.c:1527
#, 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"
@@ -8851,7 +8994,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:1530
+#: client/helpdata.c:1538
#, c-format
msgid ""
"* You may grow your cities by means of celebrations. Your cities must be at "
@@ -8860,15 +9003,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:1536
+#: client/helpdata.c:1544
msgid "* Your units cannot be bribed.\n"
msgstr "* Deine Einheiten sind unbestechlich.\n"
-#: client/helpdata.c:1539
+#: client/helpdata.c:1547
msgid "* Your cities cannot be incited.\n"
msgstr "* In deinen Städten kann es keine Revolte geben.\n"
-#: client/helpdata.c:1543
+#: client/helpdata.c:1551
msgid ""
"* Government will fall into anarchy if any city is in disorder for more than "
"two turns in a row.\n"
@@ -8876,15 +9019,15 @@ msgstr ""
"* Die Regierung fällt in Anarchie, wenn irgendeine Stadt sich mehr als zwei "
"Runden nacheinander in Aufruhr befindet.\n"
-#: client/helpdata.c:1549
+#: client/helpdata.c:1557
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:1553
+#: client/helpdata.c:1561
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:1557
+#: client/helpdata.c:1565
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
@@ -8892,25 +9035,25 @@ msgstr ""
"* Stadterweiterungen, die normalerweise die Zahl der unzufriedenen Bürger "
"verringern, liefern stattdessen Goldstücke.\n"
-#: client/helpdata.c:1561
+#: client/helpdata.c:1569
msgid "* Pays no upkeep for fanatics.\n"
msgstr "* Fanatiker benötigen keinen Unterhalt.\n"
-#: client/helpdata.c:1564
+#: client/helpdata.c:1572
msgid "* Has no unhappy citizens.\n"
msgstr "* Es gibt keine unzufriedenen Bürger.\n"
-#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
+#: client/helpdata.c:1582 client/helpdata.c:1586 client/helpdata.c:1590
#, c-format
msgid "* Veteran %s units.\n"
msgstr "* %s sind Veteranen.\n"
-#: client/helpdata.c:1585
+#: client/helpdata.c:1593
msgid "* Veteran units.\n"
msgstr "* Veteranen.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1591
+#: client/helpdata.c:1599
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8920,7 +9063,7 @@ msgstr ""
"von 1, wenn die Stadt nicht feiert.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1600
+#: client/helpdata.c:1608
#, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8930,74 +9073,74 @@ msgstr ""
"wenn die Stadt feiert.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1608
+#: client/helpdata.c:1616
#, 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:1617
+#: client/helpdata.c:1625
#, 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:1625
+#: client/helpdata.c:1633
#, c-format
msgid "* %s production will suffer massive waste.\n"
msgstr "* Die Produktion von %s leidet unter großer Verschwendung.\n"
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1630
+#: client/helpdata.c:1638
#, c-format
msgid "* %s production will suffer some waste.\n"
msgstr "* Die Produktion von %s leidet unter Verschwendung.\n"
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1635
+#: client/helpdata.c:1643
#, c-format
msgid "* %s production will suffer a small amount of waste.\n"
msgstr "* Die Produktion von %s leidet unter einer geringen Verschwendung.\n"
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1643
+#: client/helpdata.c:1651
#, c-format
msgid "* %s waste will increase quickly with distance from capital.\n"
msgstr ""
"* %s-Verschwendung nimmt mit der Entfernung von der Hauptstadt schnell zu.\n"
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1649
+#: client/helpdata.c:1657
#, c-format
msgid "* %s waste will increase with distance from capital.\n"
msgstr "* %s-Verschwendung nimmt mit der Entfernung von der Hauptstadt zu.\n"
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1655
+#: client/helpdata.c:1663
#, c-format
msgid "* %s waste will increase slowly with distance from capital.\n"
msgstr ""
"* %s-Verschwendung nimmt mit der Entfernung von der Hauptstadt langsam zu.\n"
-#: client/helpdata.c:1672
+#: client/helpdata.c:1680
#, 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:1699
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d %s"
msgstr "%s%d %s"
-#: client/helpdata.c:1700 client/helpdata.c:1708 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1708 client/helpdata.c:1716 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:1707
+#: client/helpdata.c:1715
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d Unzufriedene(r)"
@@ -9066,7 +9209,7 @@ msgid ""
"or with the -a command-line parameter."
msgstr "Dies ist der Standard-Serverport, der für Verbindungen genutzt wird."
-#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:916 data/Freeciv.in:107
msgid "Metaserver"
msgstr "Metaserver"
@@ -9465,37 +9608,37 @@ msgstr "NICHT GESPEICHERT: Kann nicht in Datei '%s' schreiben."
msgid "Saved settings to file %s"
msgstr "Einstellungen in Datei %s gespeichert."
-#: client/packhand.c:211 client/packhand.c:217
+#: client/packhand.c:212 client/packhand.c:218
msgid "You were rejected from the game...."
msgstr "Verbindungsaufbau abgelehnt...."
# EH: Diese Fehlermeldung sollte mE nicht übersetzt werden.
-#: client/packhand.c:229
+#: client/packhand.c:230
#, c-format
msgid "Client capability string: %s"
msgstr "Client capability string: %s"
# EH: Diese Fehlermeldung sollte mE nicht übersetzt werden.
-#: client/packhand.c:232
+#: client/packhand.c:233
#, c-format
msgid "Server capability string: %s"
msgstr "Server capability string: %s"
-#: client/packhand.c:850
+#: client/packhand.c:864
#, c-format
msgid "Start of turn %d"
msgstr "Beginn des %d. Zugs"
-#: client/packhand.c:1591
+#: client/packhand.c:1621
#, c-format
msgid "AI Mode is now %s."
msgstr "KI Modus: %s."
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "ON"
msgstr "AN"
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "OFF"
msgstr "AUS"
@@ -9526,15 +9669,15 @@ msgstr "Name"
msgid "Username"
msgstr "Benutzername"
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
-#: client/gui-gtk-2.0/pages.c:2157
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:653
+#: client/gui-gtk-2.0/pages.c:1604 client/gui-gtk-2.0/pages.c:2159
msgid "Flag"
msgstr "Flagge"
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1605
-#: client/gui-gtk-2.0/pages.c:2159 client/gui-sdl/repodlgs.c:2063
-#: client/gui-win32/connectdlg.c:990 client/gui-win32/dialogs.c:542
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:657
+#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1609
+#: client/gui-gtk-2.0/pages.c:2161 client/gui-sdl/repodlgs.c:2063
+#: client/gui-win32/connectdlg.c:992 client/gui-win32/dialogs.c:542
#: client/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "Nation"
@@ -9547,7 +9690,7 @@ msgstr "Grenze"
msgid "Score"
msgstr "Punkte"
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1614
msgid "Team"
msgstr "Team"
@@ -9580,36 +9723,36 @@ msgstr "untätig"
msgid "Ping"
msgstr "Ping"
-#: client/repodlgs_common.c:375
+#: client/repodlgs_common.c:378
msgid "You cannot sell improvements."
msgstr "Sie können keine Stadterweiterungen verkaufen"
-#: client/repodlgs_common.c:391
+#: client/repodlgs_common.c:394
#, c-format
msgid "Sold %d %s for %d gold."
msgstr "%d %s für %d Goldstücke verkauft."
-#: client/repodlgs_common.c:396
+#: client/repodlgs_common.c:399
#, c-format
msgid "No %s could be sold."
msgstr "Es konnten keine %s verkauft werden."
#. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:415
+#: client/repodlgs_common.c:418
msgid "You cannot disband units."
msgstr "You cannot disband units."
-#: client/repodlgs_common.c:420
+#: client/repodlgs_common.c:423
#, c-format
msgid "%s cannot be disbanded."
msgstr "%s können nicht aufgelöst werden."
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:444
#, c-format
msgid "Disbanded %d %s."
msgstr "%d %s aufgelöst."
-#: client/repodlgs_common.c:445
+#: client/repodlgs_common.c:448
#, c-format
msgid "No %s could be disbanded."
msgstr "Es konnten keine %s aufgelöst werden."
@@ -10196,47 +10339,47 @@ msgstr "?dys/hrs:%02dTge %02dStd"
msgid "?duration:overflow"
msgstr "?duration:überschritten"
-#: client/text.c:1143
+#: client/text.c:1145
#, c-format
msgid "%6d.%02d ms"
msgstr "%6d.%02d ms"
#. TRANS: <nation adjective> <government name>.
#. * E.g. "Polish Republic".
-#: client/text.c:1188
+#: client/text.c:1193
#, c-format
msgid "?nationgovernment:%s %s"
msgstr "%s %s"
#. TRANS: "Observer: 1985"
-#: client/text.c:1198
+#: client/text.c:1203
#, c-format
msgid "Observer: %s"
msgstr "Beobachter: %s"
-#: client/text.c:1216
+#: client/text.c:1221
msgid "Buildings: "
msgstr "Gebäude: "
-#: client/text.c:1233 client/text.c:1272
+#: client/text.c:1238 client/text.c:1277
msgid "None. "
msgstr "Keine."
-#: client/text.c:1235 client/text.c:1274
+#: client/text.c:1240 client/text.c:1279
msgid "?clistend:."
msgstr "."
-#: client/text.c:1253
+#: client/text.c:1258
msgid "Wonders: "
msgstr "Weltwunder: "
-#: client/text.c:1308
+#: client/text.c:1313
#, 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:1312
+#: client/text.c:1317
#, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
@@ -10244,57 +10387,57 @@ msgstr[0] "%d zufrieden; "
msgstr[1] "%d zufrieden; "
#. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1318
+#: client/text.c:1323
#, c-format
msgid "%d additional unhappy citizen."
msgid_plural "%d additional unhappy citizens."
msgstr[0] "%d zusätzlicher unzufriedener Bürger."
msgstr[1] "%d zusätzliche unzufriedene Bürger."
-#: client/text.c:1339
+#: client/text.c:1344
msgid "Unlimited martial law in effect."
msgstr "Unbegrenztes Kriegsrecht in Kraft."
-#: client/text.c:1341
+#: client/text.c:1346
#, c-format
msgid "%d military unit may impose martial law."
msgid_plural "Up to %d military units may impose martial law."
msgstr[0] "%d militärische Einheit kann Kriegsrecht errichten."
msgstr[1] "Bis zu %d militärische Einheiten können Kriegsrecht errichten."
-#: client/text.c:1345
+#: client/text.c:1350
#, c-format
msgid "Each military unit makes %d unhappy citizen content."
msgid_plural "Each military unit makes %d unhappy citizens content."
msgstr[0] "Jede militärische Einheit macht %d unzufriedenen Bürger zufrieden."
msgstr[1] "Jede militärische Einheit macht %d unzufriedene Bürger zufrieden."
-#: client/text.c:1352
+#: client/text.c:1357
msgid "Military units in the field may cause unhappiness. "
msgstr "Kampfeinheiten im Einsatz können zu Unzufriedenheit führen. "
-#: client/text.c:1355
+#: client/text.c:1360
msgid "Military units have no happiness effect. "
msgstr "Kampfeinheiten wirken sich nicht auf die Zufriedenheit aus. "
-#: client/text.c:1370
+#: client/text.c:1375
#, c-format
msgid "Luxury: %d total."
msgstr "Luxus: %d gesamt."
-#: client/tilespec.c:865
+#: client/tilespec.c:882
msgid "No usable default tileset found, aborting!"
msgstr "No usable default tileset found, aborting!"
# EH: Diese Fehlermeldung sollte mE nicht übersetzt werden.
-#: client/tilespec.c:1338
+#: client/tilespec.c:1355
msgid ""
"Client does not support isometric tilesets. Using default tileset instead."
msgstr ""
"Client does not support isometric tilesets. Using default tileset instead."
# EH: Diese Fehlermeldung sollte mE nicht übersetzt werden.
-#: client/tilespec.c:1347
+#: client/tilespec.c:1364
msgid ""
"Client does not support overhead view tilesets. Using default tileset "
"instead."
@@ -10302,7 +10445,7 @@ msgstr ""
"Client does not support overhead view tilesets. Using default tileset "
"instead."
-#: client/tilespec.c:3966
+#: client/tilespec.c:3987
#, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -10980,7 +11123,7 @@ msgid "_Display"
msgstr "A_nzeige"
#: client/gui-gtk-2.0/cityrep.c:1006 client/gui-gtk-2.0/menu.c:839
-#: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
+#: client/gui-sdl/diplodlg.c:692 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
#: client/gui-xaw/cityrep.c:533 client/gui-xaw/menu.c:156
@@ -11156,192 +11299,192 @@ msgstr "Wie soll die Vorgabe heißen?"
msgid "Remove this preset?"
msgstr "Soll die Vorgabe entfernt werden?"
-#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:222
+#: client/gui-gtk-2.0/dialogs.c:197 client/gui-gtk-2.0/messagewin.c:222
msgid "Goto _Location"
msgstr "_Gehe nach"
-#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
+#: client/gui-gtk-2.0/dialogs.c:202 client/gui-gtk-2.0/messagewin.c:226
msgid "Inspect _City"
msgstr "_Stadt ansehen"
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:258 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:258 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:259 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:311 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:312 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:312 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:313 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:506
+#: client/gui-gtk-2.0/dialogs.c:507
msgid "Unit"
msgstr "Einheit"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:950
-#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2155
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:985
+#: client/gui-gtk-2.0/dialogs.c:508 client/gui-gtk-2.0/pages.c:950
+#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2157
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:987
#: 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:519 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:520 client/gui-sdl/dialogs.c:627
msgid "Unit selection"
msgstr "Einheit auswählen"
-#: client/gui-gtk-2.0/dialogs.c:582
+#: client/gui-gtk-2.0/dialogs.c:583
msgid "_Ready all"
msgstr "_Alle aktivieren"
-#: client/gui-gtk-2.0/dialogs.c:590
+#: client/gui-gtk-2.0/dialogs.c:591
msgid "_Sentry idle"
msgstr "_Einheiten stationieren"
-#: client/gui-gtk-2.0/dialogs.c:719
+#: client/gui-gtk-2.0/dialogs.c:721
msgid "Nation _Groups:"
msgstr "_Nationengruppen:"
-#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:766 data/Freeciv.in:3128
msgid "What Nation Will You Be?"
msgstr "Wählen Sie eine Nation!"
-#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
-#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
+#: client/gui-gtk-2.0/dialogs.c:768 client/gui-sdl/chatline.c:842
+#: client/gui-win32/connectdlg.c:1040 data/Freeciv.in:3371
msgid "Pick Nation"
msgstr "Wähle Nation"
-#: client/gui-gtk-2.0/dialogs.c:774
+#: client/gui-gtk-2.0/dialogs.c:776
msgid "_Random Nation"
msgstr "zufällige Auswahl"
-#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:792 client/gui-win32/dialogs.c:517
msgid "Select a nation"
msgstr "Nation wählen"
-#: client/gui-gtk-2.0/dialogs.c:804
+#: client/gui-gtk-2.0/dialogs.c:810
msgid "_Properties"
msgstr "_Eigenschaften"
-#: client/gui-gtk-2.0/dialogs.c:824
+#: client/gui-gtk-2.0/dialogs.c:830
msgid "_Leader:"
msgstr "_Anführer:"
-#: client/gui-gtk-2.0/dialogs.c:831
+#: client/gui-gtk-2.0/dialogs.c:837
msgid "_Female"
msgstr "_weiblich"
-#: client/gui-gtk-2.0/dialogs.c:836
+#: client/gui-gtk-2.0/dialogs.c:842
msgid "_Male"
msgstr "_männlich"
-#: client/gui-gtk-2.0/dialogs.c:863
+#: client/gui-gtk-2.0/dialogs.c:869
msgid "City _Styles:"
msgstr "Bauwei_se:"
-#: client/gui-gtk-2.0/dialogs.c:902
+#: client/gui-gtk-2.0/dialogs.c:908
msgid "_Description"
msgstr "_Legende"
-#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1263 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:1253 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1268 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:1262 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1277 client/gui-sdl/dialogs.c:2204
#: 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:1306 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1318 client/gui-win32/citydlg.c:1454
#: data/Freeciv.in:2484
msgid "Upgrade Unit!"
msgstr "Einheit modernisieren!"
-#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1327 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 "Modernisiere veraltete Einheiten"
-#: client/gui-gtk-2.0/diplodlg.c:231 client/gui-win32/diplodlg.c:151
+#: client/gui-gtk-2.0/diplodlg.c:222 client/gui-win32/diplodlg.c:151
#: client/gui-xaw/diplodlg.c:383 client/gui-xaw/diplodlg.c:401
msgid "World-map"
msgstr "Weltkarte"
-#: client/gui-gtk-2.0/diplodlg.c:237 client/gui-win32/diplodlg.c:146
+#: client/gui-gtk-2.0/diplodlg.c:228 client/gui-win32/diplodlg.c:146
#: client/gui-xaw/diplodlg.c:387 client/gui-xaw/diplodlg.c:405
msgid "Sea-map"
msgstr "Seekarte"
-#: client/gui-gtk-2.0/diplodlg.c:243
+#: client/gui-gtk-2.0/diplodlg.c:234
msgid "_Maps"
msgstr "_Karten"
-#: client/gui-gtk-2.0/diplodlg.c:274
+#: client/gui-gtk-2.0/diplodlg.c:265
msgid "_Advances"
msgstr "_Forschungsergebnisse:"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/diplodlg.c:315 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "_Städte"
-#: client/gui-gtk-2.0/diplodlg.c:333
+#: client/gui-gtk-2.0/diplodlg.c:324
msgid "_Give shared vision"
msgstr "_Karteneinsicht erlauben"
-#: client/gui-gtk-2.0/diplodlg.c:346
+#: client/gui-gtk-2.0/diplodlg.c:337
msgid "Give _embassy"
msgstr "_Botschaft erlauben"
-#: client/gui-gtk-2.0/diplodlg.c:376
+#: client/gui-gtk-2.0/diplodlg.c:368
msgid "_Pacts"
msgstr "_Abkommen"
-#: client/gui-gtk-2.0/diplodlg.c:466
+#: client/gui-gtk-2.0/diplodlg.c:458
#, c-format
msgid "Diplomacy: %s"
msgstr "Diplomatie: %s"
-#: client/gui-gtk-2.0/diplodlg.c:473
+#: client/gui-gtk-2.0/diplodlg.c:465
msgid "_Cancel meeting"
msgstr "Treffen _absagen"
-#: client/gui-gtk-2.0/diplodlg.c:475
+#: client/gui-gtk-2.0/diplodlg.c:467
msgid "Accept _treaty"
msgstr "Abkommen _unterzeichnen"
-#: client/gui-gtk-2.0/diplodlg.c:503
+#: client/gui-gtk-2.0/diplodlg.c:495
msgid "C_lauses:"
msgstr "_Klauseln:"
-#: client/gui-gtk-2.0/diplodlg.c:568 client/gui-gtk-2.0/diplodlg.c:642
+#: client/gui-gtk-2.0/diplodlg.c:560 client/gui-gtk-2.0/diplodlg.c:634
msgid "_Gold:"
msgstr "_Gold:"
-#: client/gui-gtk-2.0/diplodlg.c:580 client/gui-gtk-2.0/diplodlg.c:654
+#: client/gui-gtk-2.0/diplodlg.c:572 client/gui-gtk-2.0/diplodlg.c:646
msgid "_Add Clause..."
msgstr "_Neue Klausel..."
-#: client/gui-gtk-2.0/diplodlg.c:699
+#: client/gui-gtk-2.0/diplodlg.c:691
msgid "--- This treaty is blank. Please add some clauses. ---"
msgstr "Leerer Vertrag. Bitte Klauseln hinzufügen."
-#: client/gui-gtk-2.0/diplodlg.c:905 client/gui-sdl/diplodlg.c:375
+#: client/gui-gtk-2.0/diplodlg.c:897 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 "Ungültiger Betrag an Gold angegeben."
@@ -11400,19 +11543,19 @@ msgstr "Bestimmungsort wählen"
msgid "Show _All Cities"
msgstr "_Zeige Alle Städte"
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:164
msgid "Show Map Scrollbars"
msgstr "Rollbalken für Karte anzeigen"
-#: client/gui-gtk-2.0/gui_main.c:163
+#: client/gui-gtk-2.0/gui_main.c:165
msgid "Disable this option to hide the scrollbars on the map view."
msgstr "Ein/Ausschalten der Rollbalken für die Karte."
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:169
msgid "Keyboardless goto"
msgstr "Mausgesteuerte Gehe-nach-Funktion"
-#: client/gui-gtk-2.0/gui_main.c:168
+#: client/gui-gtk-2.0/gui_main.c:170
msgid ""
"If this option is set then a goto may be initiated by left-clicking and then "
"holding down the mouse button while dragging the mouse onto a different tile."
@@ -11420,11 +11563,11 @@ msgstr ""
"Die Gehe-nach-Funktion kann mittels Klicken und Ziehen der Maus ausgelöst "
"werden."
-#: client/gui-gtk-2.0/gui_main.c:173
+#: client/gui-gtk-2.0/gui_main.c:175
msgid "Keep dialogs on top"
msgstr "Dialoge immer sichtbar"
-#: client/gui-gtk-2.0/gui_main.c:174
+#: client/gui-gtk-2.0/gui_main.c:176
msgid ""
"If this option is set then dialog windows will always remain in front of the "
"main Freeciv window. Disabling this has no effect in fullscreen mode."
@@ -11432,11 +11575,11 @@ msgstr ""
"Dialogfenster bleiben immer vor dem Hauptfenster sichtbar. Im Vollbildmodus "
"nicht abschaltbar."
-#: client/gui-gtk-2.0/gui_main.c:178
+#: client/gui-gtk-2.0/gui_main.c:180
msgid "Show worklist task icons"
msgstr "Zeige Icons in der Arbeitsliste"
-#: client/gui-gtk-2.0/gui_main.c:179
+#: client/gui-gtk-2.0/gui_main.c:181
msgid ""
"Disabling this will turn off the unit and building icons in the worklist "
"dialog and the production tab of the city dialog."
@@ -11444,11 +11587,11 @@ msgstr ""
"Einheiten und Stadtverbesserungen werden im Stadtfenster und in der "
"Arbeitsliste zusätzlich mit Symbolen dargestellt."
-#: client/gui-gtk-2.0/gui_main.c:183
+#: client/gui-gtk-2.0/gui_main.c:185
msgid "Enable status report tabs"
msgstr "Kartenreiteranzeige für Berichte"
-#: client/gui-gtk-2.0/gui_main.c:184
+#: client/gui-gtk-2.0/gui_main.c:186
msgid ""
"If this option is enabled then report dialogs will be shown as separate tabs "
"rather than in popup dialogs."
@@ -11456,11 +11599,11 @@ msgstr ""
"Hiermit werden Berichte als Kartenreiter dargestellt, und nicht als separate "
"Fenster."
-#: client/gui-gtk-2.0/gui_main.c:189 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:191 client/gui-win32/gui_main.c:110
msgid "Better fog-of-war drawing"
msgstr "Bessere Darstellung des 'Nebel des Krieges'"
-#: client/gui-gtk-2.0/gui_main.c:190 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:192 client/gui-win32/gui_main.c:111
msgid ""
"If this is enabled then a better method is used for drawing fog-of-war. It "
"is not any slower but will consume about twice as much memory."
@@ -11468,11 +11611,11 @@ msgstr ""
"Diese Option ergibt eine bessere Art der Darstellung für den 'Nebel des "
"Krieges'. Sie ist nicht langsamer, benötigt aber mehr Speicher."
-#: client/gui-gtk-2.0/gui_main.c:195
+#: client/gui-gtk-2.0/gui_main.c:197
msgid "Show time for each chat message"
msgstr "Zeige Uhrzeit für Chat-Nachrichten"
-#: client/gui-gtk-2.0/gui_main.c:196
+#: client/gui-gtk-2.0/gui_main.c:198
msgid ""
"If this option is enabled then all chat messages will be prefixed by a time "
"string of the form [hour:minute:second]."
@@ -11480,11 +11623,11 @@ msgstr ""
"Mit dieser Option wird allen Chat-Nachrichten die Uhrzeit in der Form "
"[Stunde:Minute:Sekunde] vorangestellt."
-#: client/gui-gtk-2.0/gui_main.c:201
+#: client/gui-gtk-2.0/gui_main.c:203
msgid "Split bottom notebook area"
msgstr "Unteres Fenster zweiteilen"
-#: client/gui-gtk-2.0/gui_main.c:202
+#: client/gui-gtk-2.0/gui_main.c:204
msgid ""
"Enabling this option will split the bottom notebook into a left and right "
"notebook so that two tabs may be viewed at once."
@@ -11492,11 +11635,11 @@ msgstr ""
"Mit dieser Option wird das untere Fenster zweigeteilt, so dass zwei Reiter "
"nebeneinander betrachtet werden können."
-#: client/gui-gtk-2.0/gui_main.c:207
+#: client/gui-gtk-2.0/gui_main.c:209
msgid "New message events go to top of list"
msgstr "Neue Ereignisse erscheinen oben"
-#: client/gui-gtk-2.0/gui_main.c:208
+#: client/gui-gtk-2.0/gui_main.c:210
msgid ""
"If this option is enabled, new events in the message window will appear at "
"the top of the list, rather than being appended at the bottom."
@@ -11504,11 +11647,11 @@ msgstr ""
"Neue Ereignisse im Nachrichtenfenster erscheinen oben in der Liste, anstatt "
"sie unten anzuhängen."
-#: client/gui-gtk-2.0/gui_main.c:213
+#: client/gui-gtk-2.0/gui_main.c:215
msgid "Show extra message window buttons"
msgstr "Zeige Schaltflächen zu Nachrichten"
-#: client/gui-gtk-2.0/gui_main.c:214
+#: client/gui-gtk-2.0/gui_main.c:216
msgid ""
"If this option is enabled, there will be two buttons displayed in the "
"message window for inspecting a city and going to a location. If this option "
@@ -11523,11 +11666,11 @@ msgstr ""
"Klick auf die Nachrichtenzeile ausgelöst werden. Die Änderung wird erst nach "
"Schliessen und Wiederöffnen des Nachrichtenfensters wirksam."
-#: client/gui-gtk-2.0/gui_main.c:224
+#: client/gui-gtk-2.0/gui_main.c:226
msgid "Metaserver tab first in network page"
msgstr "Metaserver ist erster Reiter auf der Netzwerkseite"
-#: client/gui-gtk-2.0/gui_main.c:225
+#: client/gui-gtk-2.0/gui_main.c:227
msgid ""
"If this option is enabled, the metaserver tab will be the first notebook tab "
"in the network page. This option requires a restart in order to take effect."
@@ -11535,11 +11678,11 @@ msgstr ""
"Mit dieser Option wird die Metaserverseite als erster Reiter im "
"Netzwerkfenster angezeigt. Die Änderung erfordert einen Neustart."
-#: client/gui-gtk-2.0/gui_main.c:230
+#: client/gui-gtk-2.0/gui_main.c:232
msgid "Plain chat messages are sent to allies only"
msgstr "Allgemeine Chat-Nachrichten werden nur an Alliierte übermittelt"
-#: client/gui-gtk-2.0/gui_main.c:231
+#: client/gui-gtk-2.0/gui_main.c:233
msgid ""
"If this option is enabled, then plain messages typed into the chat entry "
"while the game is running will only be sent to your allies. Otherwise plain "
@@ -11556,7 +11699,20 @@ msgstr ""
"dem Schalter neben dem Chatfenster gesetzt werden, der nur in "
"Mehrspielerspielen sichtbar ist."
-#: client/gui-gtk-2.0/gui_main.c:340 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:245
+msgid "Arrange widgets for small displays"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:246
+msgid ""
+"If this option is enabled, widgets in the main window will be arrange so "
+"that they take up the least amount of total screen space. Specifically, the "
+"left panel containing the overview, player status, and the unit information "
+"box will be extended over the entire left side of the window. This option "
+"requires a restart in order to take effect."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:352 client/gui-xaw/gui_main.c:245
msgid ""
"This client has no special command line options\n"
"\n"
@@ -11564,22 +11720,22 @@ msgstr ""
"Es gibt keine GUI-bezogenen Kommandozeilenoptionen.\n"
"\n"
-#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
+#: client/gui-gtk-2.0/gui_main.c:847 client/gui-gtk-2.0/gui_main.c:1542
msgid "Freeciv"
msgstr "Freeciv"
-#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
+#: client/gui-gtk-2.0/gui_main.c:1251 client/gui-gtk-2.0/gui_main.c:1258
#: client/gui-sdl/mapctrl.c:1566 client/gui-win32/gui_main.c:482
#: data/Freeciv.in:2618
msgid "Turn Done"
msgstr "Fertig!"
-#: client/gui-gtk-2.0/gui_main.c:1232 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1258 client/gui-sdl/mapctrl.c:1566
#: client/gui-sdl/mapview.c:1082
msgid "Shift+Return"
msgstr "Shift+Eingabe"
-#: client/gui-gtk-2.0/gui_main.c:1266 client/gui-gtk-2.0/menu.c:797
+#: client/gui-gtk-2.0/gui_main.c:1299 client/gui-gtk-2.0/menu.c:797
#: client/gui-gtk-2.0/menu.c:799 client/gui-gtk-2.0/menu.c:801
#: client/gui-gtk-2.0/menu.c:803 client/gui-gtk-2.0/menu.c:805
#: client/gui-gtk-2.0/menu.c:807 client/gui-gtk-2.0/menu.c:809
@@ -11598,11 +11754,11 @@ msgstr "Shift+Eingabe"
msgid "View"
msgstr "Ansicht"
-#: client/gui-gtk-2.0/gui_main.c:1359
+#: client/gui-gtk-2.0/gui_main.c:1393
msgid "Chat"
msgstr "Chat"
-#: client/gui-gtk-2.0/gui_main.c:1377 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1411 client/gui-win32/gui_main.c:538
#: data/Freeciv.in:2809
msgid ""
"Freeciv is free software and you are welcome to distribute copies of it\n"
@@ -11614,77 +11770,77 @@ msgstr ""
"Siehe unter 'Lizenz' im Hilfemenü.\n"
"Und nun ... mach' ihnen die Hölle heiß!"
-#: client/gui-gtk-2.0/gui_main.c:1392
+#: client/gui-gtk-2.0/gui_main.c:1426
msgid "Allies Only"
msgstr "Nur Verbündete"
-#: client/gui-gtk-2.0/gui_main.c:1657
+#: client/gui-gtk-2.0/gui_main.c:1691
msgid "Not _ready"
msgstr "Nicht _bereit"
-#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
+#: client/gui-gtk-2.0/gui_main.c:1702 client/gui-gtk-2.0/pages.c:1679
msgid "_Ready"
msgstr "_Bereit"
-#: client/gui-gtk-2.0/gui_main.c:1672 client/gui-gtk-2.0/gui_main.c:1678
-#: client/gui-gtk-2.0/pages.c:2204
+#: client/gui-gtk-2.0/gui_main.c:1706 client/gui-gtk-2.0/gui_main.c:1712
+#: client/gui-gtk-2.0/pages.c:2206
msgid "_Start"
msgstr "_Start"
-#: client/gui-gtk-2.0/gui_main.c:1686
+#: client/gui-gtk-2.0/gui_main.c:1720
msgid "_Take Player"
msgstr "Spieler übernehmen"
-#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
+#: client/gui-gtk-2.0/gui_main.c:1723 client/gui-gtk-2.0/pages.c:1669
msgid "Pick _Nation"
msgstr "Wähle _Nation"
-#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
+#: client/gui-gtk-2.0/gui_main.c:1730 client/gui-gtk-2.0/pages.c:1674
msgid "_Observe"
msgstr "Be_obachten"
-#: client/gui-gtk-2.0/gui_main.c:1698
+#: client/gui-gtk-2.0/gui_main.c:1732
msgid "Do not _observe"
msgstr "Nicht be_obachten"
-#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1755 client/gui-xaw/pages.c:211
msgid "<AI>"
msgstr "<KI>"
-#: client/gui-gtk-2.0/gui_main.c:1723
+#: client/gui-gtk-2.0/gui_main.c:1758
msgid "<Novice AI>"
msgstr "<Anfänger-KI>"
-#: client/gui-gtk-2.0/gui_main.c:1726
+#: client/gui-gtk-2.0/gui_main.c:1761
msgid "<Easy AI>"
msgstr "<Leichte KI>"
-#: client/gui-gtk-2.0/gui_main.c:1729
+#: client/gui-gtk-2.0/gui_main.c:1764
msgid "<Normal AI>"
msgstr "<Normale KI>"
-#: client/gui-gtk-2.0/gui_main.c:1732
+#: client/gui-gtk-2.0/gui_main.c:1767
msgid "<Hard AI>"
msgstr "<Schwere KI>"
-#: client/gui-gtk-2.0/gui_main.c:1742 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1777 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:1808
+#: client/gui-gtk-2.0/gui_main.c:1844 client/gui-gtk-2.0/gui_main.c:1858
msgid "Observer"
msgstr "Beobachter"
-#: client/gui-gtk-2.0/gui_main.c:1808
+#: client/gui-gtk-2.0/gui_main.c:1858
msgid "Detached"
msgstr "Nicht verbunden"
-#: client/gui-gtk-2.0/gui_main.c:2073
+#: client/gui-gtk-2.0/gui_main.c:2117
msgid "Are you sure you want to quit?"
msgstr "Wollen Sie das Programm wirklich beenden?"
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
#, c-format
msgid ""
"Close Tab:\n"
@@ -11693,7 +11849,7 @@ msgstr ""
"Reiter schließen:\n"
"%s"
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
msgid "Ctrl+W"
msgstr "Strg-W"
@@ -11798,8 +11954,8 @@ msgid "Trans. Rslt/Time:"
msgstr "Verwand. Erg/Zeit:"
#: 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
-#: client/gui-win32/helpdlg.c:709 client/gui-win32/helpdlg.c:733
+#: client/gui-win32/helpdlg.c:502 client/gui-win32/helpdlg.c:550
+#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:739
#: client/gui-xaw/helpdlg.c:759 client/gui-xaw/helpdlg.c:808
#: client/gui-xaw/helpdlg.c:816 client/gui-xaw/helpdlg.c:853
#: client/gui-xaw/helpdlg.c:878
@@ -11846,34 +12002,34 @@ msgstr "mit"
msgid "?techhelp:"
msgstr "?techhelp:"
-#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:591
+#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:597
#: client/gui-xaw/helpdlg.c:996
#, c-format
msgid "+%d Trade / %d"
msgstr "+%d Handel / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:595
+#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:601
#: client/gui-xaw/helpdlg.c:1000
#, c-format
msgid "no extra / %d"
msgstr "kein Extra / %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
-#: client/gui-win32/helpdlg.c:602 client/gui-win32/helpdlg.c:616
-#: client/gui-win32/helpdlg.c:635 client/gui-xaw/helpdlg.c:1002
+#: client/gui-gtk-2.0/helpdlg.c:1085 client/gui-win32/helpdlg.c:604
+#: client/gui-win32/helpdlg.c:608 client/gui-win32/helpdlg.c:622
+#: client/gui-win32/helpdlg.c:641 client/gui-xaw/helpdlg.c:1002
#: client/gui-xaw/helpdlg.c:1006 client/gui-xaw/helpdlg.c:1020
#: client/gui-xaw/helpdlg.c:1039
msgid "n/a"
msgstr "-"
-#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:605
+#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:611
#: client/gui-xaw/helpdlg.c:1009
#, c-format
msgid "+%d Food / %d"
msgstr "+%d Nahrung / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:619
+#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:625
#: client/gui-xaw/helpdlg.c:1023
#, c-format
msgid "+%d Res. / %d"
@@ -12634,41 +12790,41 @@ msgstr "Mit Netzwerkspiel _verbinden"
msgid "Connect to Gaming _Zone"
msgstr "Mit Gaming _Zone verbinden"
-#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:302
#: 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:779 client/gui-gtk-2.0/pages.c:820
-#: client/gui-win32/connectdlg.c:916
+#: client/gui-win32/connectdlg.c:918
msgid "Server Name"
msgstr "Server"
#: client/gui-gtk-2.0/pages.c:780 client/gui-gtk-2.0/pages.c:821
-#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:916
+#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:918
#: data/Freeciv.in:96
msgid "Port"
msgstr "Port"
#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Version"
msgstr "Version"
#: client/gui-gtk-2.0/pages.c:782 client/gui-gtk-2.0/pages.c:823
-#: client/gui-gtk-2.0/pages.c:2161 client/gui-win32/connectdlg.c:917
-#: client/gui-win32/connectdlg.c:995
+#: client/gui-gtk-2.0/pages.c:2163 client/gui-win32/connectdlg.c:919
+#: client/gui-win32/connectdlg.c:997
msgid "Status"
msgstr "Status"
#: client/gui-gtk-2.0/pages.c:783 client/gui-gtk-2.0/pages.c:824
#: client/gui-sdl/connectdlg.c:318 client/gui-sdl/plrdlg.c:330
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Players"
msgstr "Spieler"
#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
-#: client/gui-win32/connectdlg.c:918
+#: client/gui-win32/connectdlg.c:920
msgid "Comment"
msgstr "Kommentar"
@@ -12700,9 +12856,9 @@ msgstr "_Paßwort:"
msgid "Conf_irm Password:"
msgstr "Paßwort _wiederholen:"
-#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2165
#: 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:1000
+#: client/gui-win32/citydlg.c:1083 client/gui-win32/connectdlg.c:1002
#: client/gui-win32/wldlg.c:800 client/gui-win32/wldlg.c:806
msgid "Type"
msgstr "Bild"
@@ -12794,7 +12950,7 @@ msgstr "_KI Stärke:"
msgid "Ruleset _Version:"
msgstr "_Regelsatz:"
-#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2195
msgid "_More Game Options..."
msgstr "Weitere Spiel_optionen..."
@@ -12810,48 +12966,48 @@ msgstr "Bewertung"
msgid "Ready"
msgstr "Bereit"
-#: client/gui-gtk-2.0/pages.c:1601
+#: client/gui-gtk-2.0/pages.c:1600
msgid "?player:Leader"
msgstr "Spieler"
-#: client/gui-gtk-2.0/pages.c:1732 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1734 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:1824
+#: client/gui-gtk-2.0/pages.c:1826
msgid "Choose Saved Game to _Load:"
msgstr "Wähle zu _ladendes Spiel:"
-#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
-#: client/gui-gtk-2.0/pages.c:2451
+#: client/gui-gtk-2.0/pages.c:1846 client/gui-gtk-2.0/pages.c:2039
+#: client/gui-gtk-2.0/pages.c:2455
msgid "_Browse..."
msgstr "_Durchsuchen..."
-#: client/gui-gtk-2.0/pages.c:1911
+#: client/gui-gtk-2.0/pages.c:1913
msgid "Choose a Scenario"
msgstr "Szenario laden"
-#: client/gui-gtk-2.0/pages.c:1998
+#: client/gui-gtk-2.0/pages.c:2000
msgid "Choose a _Scenario:"
msgstr "_Szenario laden:"
-#: client/gui-gtk-2.0/pages.c:2173
+#: client/gui-gtk-2.0/pages.c:2175
msgid "Choose a _nation to play:"
msgstr "Wählen Sie Ihre _Nation:"
-#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2367 client/gui-win32/menu.c:581
msgid "Select Location to Save"
msgstr "Verzeichnis auswählen zum Speichern"
-#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2452 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "Spiel speichern"
-#: client/gui-gtk-2.0/pages.c:2489
+#: client/gui-gtk-2.0/pages.c:2493
msgid "Saved _Games:"
msgstr "_Gespeicherte Spiele:"
-#: client/gui-gtk-2.0/pages.c:2516
+#: client/gui-gtk-2.0/pages.c:2520
msgid "Save _Filename:"
msgstr "_Speichere Datei:"
@@ -13203,7 +13359,7 @@ msgstr "Dialog schließen (Esc)"
msgid "Total users logged in : %d"
msgstr "Angemeldete Benutzer : %d"
-#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1098
msgid "Back"
msgstr "Zurück"
@@ -13212,7 +13368,7 @@ msgid "Start"
msgstr "Start"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:777
+#: client/gui-win32/connectdlg.c:779
msgid "Load Game"
msgstr "Spiel laden"
@@ -13252,9 +13408,9 @@ msgstr "Standort als neue Heimatstadt wählen"
#: client/gui-sdl/connectdlg.c:308 client/gui-sdl/connectdlg.c:617
#: client/gui-sdl/connectdlg.c:803 client/gui-sdl/connectdlg.c:985
#: client/gui-sdl/dialogs.c:452 client/gui-sdl/dialogs.c:2095
-#: client/gui-sdl/dialogs.c:2893 client/gui-sdl/diplomat_dialog.c:731
+#: client/gui-sdl/dialogs.c:2902 client/gui-sdl/diplomat_dialog.c:731
#: client/gui-sdl/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1043
#: client/gui-win32/dialogs.c:1772 client/gui-win32/finddlg.c:127
#: client/gui-win32/gotodlg.c:171 client/gui-win32/inputdlg.c:146
#: client/gui-win32/messagedlg.c:216 client/gui-win32/ratesdlg.c:328
@@ -13298,7 +13454,7 @@ msgid "Buy it?"
msgstr "Kaufen?"
#: 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
+#: client/gui-sdl/diplodlg.c:1336 client/gui-sdl/diplomat_dialog.c:1211
#: client/gui-sdl/diplomat_dialog.c:1417 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:221 client/gui-sdl/repodlgs.c:1559
#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
@@ -13314,7 +13470,7 @@ msgid "No"
msgstr "Nein"
#: client/gui-sdl/citydlg.c:1215 client/gui-sdl/cma_fe.c:318
-#: client/gui-sdl/diplodlg.c:1345 client/gui-sdl/diplomat_dialog.c:1200
+#: client/gui-sdl/diplodlg.c:1346 client/gui-sdl/diplomat_dialog.c:1200
#: client/gui-sdl/diplomat_dialog.c:1407 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:232 client/gui-win32/repodlgs.c:578
#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
@@ -13620,7 +13776,7 @@ msgstr "Freeciv-Server :"
msgid "Port :"
msgstr "Port :"
-#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1100
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr "Verbinden"
@@ -13727,23 +13883,23 @@ msgstr "Wähle die neue Regierungsform"
msgid "REVOLUTION!"
msgstr "REVOLUTION!"
-#: client/gui-sdl/dialogs.c:2232 client/gui-sdl/dialogs.c:2620
+#: client/gui-sdl/dialogs.c:2237 client/gui-sdl/dialogs.c:2625
#: client/gui-win32/dialogs.c:567 data/Freeciv.in:3159
msgid "Female"
msgstr "weiblich"
-#: client/gui-sdl/dialogs.c:2234 client/gui-sdl/dialogs.c:2618
-#: client/gui-sdl/dialogs.c:2830 client/gui-win32/dialogs.c:565
+#: client/gui-sdl/dialogs.c:2239 client/gui-sdl/dialogs.c:2623
+#: client/gui-sdl/dialogs.c:2839 client/gui-win32/dialogs.c:565
msgid "Male"
msgstr "männlich"
-#: client/gui-sdl/dialogs.c:2478 client/gui-sdl/dialogs.c:2902
+#: client/gui-sdl/dialogs.c:2483 client/gui-sdl/dialogs.c:2911
#: 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 "OK"
-#: client/gui-sdl/dialogs.c:2685 client/gui-win32/dialogs.c:505
+#: client/gui-sdl/dialogs.c:2694 client/gui-win32/dialogs.c:505
msgid "What nation will you be?"
msgstr "Welche Nation nimmst du?"
@@ -13770,53 +13926,53 @@ msgstr "Weltkarte"
msgid "Sea map"
msgstr "Seekarte"
-#: client/gui-sdl/diplodlg.c:563
+#: client/gui-sdl/diplodlg.c:564
msgid "Give embassy"
msgstr "Botschaft erlauben"
-#: client/gui-sdl/diplodlg.c:579 client/gui-win32/diplodlg.c:614
+#: client/gui-sdl/diplodlg.c:580 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 "Gold (max %d)"
-#: client/gui-sdl/diplodlg.c:613 client/gui-sdl/helpdlg.c:1956
+#: client/gui-sdl/diplodlg.c:614 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 "Forschungsergebnisse"
-#: client/gui-sdl/diplodlg.c:831 client/gui-win32/diplodlg.c:598
+#: client/gui-sdl/diplodlg.c:832 client/gui-win32/diplodlg.c:598
#: data/Freeciv.in:269
msgid "Diplomacy meeting"
msgstr "Konferenz"
-#: client/gui-sdl/diplodlg.c:883 client/gui-win32/diplodlg.c:680
+#: client/gui-sdl/diplodlg.c:884 client/gui-win32/diplodlg.c:680
#: data/Freeciv.in:510
msgid "Cancel meeting"
msgstr "Konferenz verlassen"
-#: client/gui-sdl/diplodlg.c:895 client/gui-win32/diplodlg.c:679
+#: client/gui-sdl/diplodlg.c:896 client/gui-win32/diplodlg.c:679
#: data/Freeciv.in:501
msgid "Accept treaty"
msgstr "Abkommen unterzeichnen"
#. TRANS: "Polish incident !" FIXME!!!
-#: client/gui-sdl/diplodlg.c:1304
+#: client/gui-sdl/diplodlg.c:1305
#, c-format
msgid "%s incident !"
msgstr "%s Vorfall!"
-#: client/gui-sdl/diplodlg.c:1322
+#: client/gui-sdl/diplodlg.c:1323
msgid "Shall we declare WAR on them?"
msgstr "Sollen wir ihnen den Krieg erklären?"
-#: client/gui-sdl/diplodlg.c:1433
+#: client/gui-sdl/diplodlg.c:1434
msgid "Foreign Minister"
msgstr "Außenminister"
-#: client/gui-sdl/diplodlg.c:1449
+#: client/gui-sdl/diplodlg.c:1450
#, c-format
msgid ""
"Sir!, the %s ambassador has arrived\n"
@@ -13825,24 +13981,24 @@ msgstr ""
"Der %se Botschafter ist angekommen!\n"
"Welches sind die Befehle?"
-#: client/gui-sdl/diplodlg.c:1465
+#: client/gui-sdl/diplodlg.c:1466
msgid "Declare WAR"
msgstr "Erkläre KRIEG"
-#: client/gui-sdl/diplodlg.c:1467 client/gui-win32/plrdlg.c:357
+#: client/gui-sdl/diplodlg.c:1468 client/gui-win32/plrdlg.c:357
msgid "Cancel Treaty"
msgstr "Abkommen aufkündigen"
-#: client/gui-sdl/diplodlg.c:1490 client/gui-win32/plrdlg.c:358
+#: client/gui-sdl/diplodlg.c:1491 client/gui-win32/plrdlg.c:358
#: data/Freeciv.in:3254
msgid "Withdraw vision"
msgstr "Karteneinsicht verbieten"
-#: client/gui-sdl/diplodlg.c:1507
+#: client/gui-sdl/diplodlg.c:1508
msgid "Call Diplomatic Meeting"
msgstr "Konferenz einberufen"
-#: client/gui-sdl/diplodlg.c:1521
+#: client/gui-sdl/diplodlg.c:1522
msgid "Send him back"
msgstr "Sende ihn zurück"
@@ -14594,12 +14750,12 @@ msgid "Leave Game"
msgstr "Spiel verlassen"
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1100 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1102 client/gui-xaw/menu.c:121
#: data/Freeciv.in:115 data/Freeciv.in:3180
msgid "Quit"
msgstr "Beenden"
-#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:967
msgid "Start New Game"
msgstr "Neues Spiel beginnen"
@@ -14712,8 +14868,8 @@ msgstr "Nettoeinkommen: "
msgid "%s max rate : %d%%"
msgstr "%s Maximum : %d%%"
-#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
-#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1085
+#: client/gui-win32/connectdlg.c:1093 data/Freeciv.in:155
msgid "Update"
msgstr "Aktualisieren"
@@ -15214,67 +15370,67 @@ msgstr "Neu"
msgid "Delete"
msgstr "Löschen"
-#: client/gui-win32/connectdlg.c:147
+#: client/gui-win32/connectdlg.c:149
msgid "Password:"
msgstr "Paßwort:"
-#: client/gui-win32/connectdlg.c:169
+#: client/gui-win32/connectdlg.c:171
msgid "Couldn't load the savegame"
msgstr "Konnte den Spielstand nicht laden"
-#: client/gui-win32/connectdlg.c:284 client/gui-xaw/connectdlg.c:311
+#: client/gui-win32/connectdlg.c:286 client/gui-xaw/connectdlg.c:311
msgid "Verify Password"
msgstr "Wiederhole Paßwort"
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:916 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr "Freeciv-Server wählen"
-#: client/gui-win32/connectdlg.c:915
+#: client/gui-win32/connectdlg.c:917
msgid "Local Area Network"
msgstr "Lokales Netzwerk"
-#: client/gui-win32/connectdlg.c:949
+#: client/gui-win32/connectdlg.c:951
msgid "Welcome to Freeciv"
msgstr "Willkommen bei Freeciv"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Load Saved Game"
msgstr "Spiel laden"
-#: client/gui-win32/connectdlg.c:969
+#: client/gui-win32/connectdlg.c:971
msgid "Connect To Network Game"
msgstr "Mit Netzwerkspiel verbinden"
-#: client/gui-win32/connectdlg.c:979
+#: client/gui-win32/connectdlg.c:981
msgid "Choose a nation to play"
msgstr "Wählen Sie Ihre Nation"
-#: client/gui-win32/connectdlg.c:1014
+#: client/gui-win32/connectdlg.c:1016
msgid "Number of players (Including AI):"
msgstr "Anzahl der Spieler (einschließlich KI):"
-#: client/gui-win32/connectdlg.c:1022
+#: client/gui-win32/connectdlg.c:1024
msgid "AI skill level:"
msgstr "KI Stärke:"
-#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1038 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr "Spieloptionen"
-#: client/gui-win32/connectdlg.c:1040
+#: client/gui-win32/connectdlg.c:1042
msgid "Start Game"
msgstr "Spiel beginnen"
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Login:"
msgstr "Name:"
-#: client/gui-win32/connectdlg.c:1061
+#: client/gui-win32/connectdlg.c:1063
msgid "Host:"
msgstr "Server:"
-#: client/gui-win32/connectdlg.c:1062
+#: client/gui-win32/connectdlg.c:1064
msgid "Port:"
msgstr "Port:"
@@ -15355,21 +15511,21 @@ msgstr ""
"Wenn keine Hardwareunterstützung für Alpha Blending vorhanden ist, ist dies "
"viel langsamer."
-#: client/gui-win32/helpdlg.c:769 client/gui-win32/helpdlg.c:792
-#: client/gui-win32/helpdlg.c:803 client/gui-win32/helpdlg.c:809
-#: client/gui-win32/helpdlg.c:822
+#: client/gui-win32/helpdlg.c:775 client/gui-win32/helpdlg.c:798
+#: client/gui-win32/helpdlg.c:809 client/gui-win32/helpdlg.c:815
+#: client/gui-win32/helpdlg.c:828
msgid "Allows "
msgstr "Ermöglicht "
-#: client/gui-win32/helpdlg.c:780
+#: client/gui-win32/helpdlg.c:786
msgid "Obsoletes "
msgstr "Veraltet "
-#: client/gui-win32/helpdlg.c:812 client/gui-win32/helpdlg.c:825
+#: client/gui-win32/helpdlg.c:818 client/gui-win32/helpdlg.c:831
msgid " (with "
msgstr " (mit "
-#: client/gui-win32/helpdlg.c:815 client/gui-win32/helpdlg.c:828
+#: client/gui-win32/helpdlg.c:821 client/gui-win32/helpdlg.c:834
msgid "?techhelp:)."
msgstr "?techhelp:)."
@@ -16502,13 +16658,13 @@ 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/"
+" https://gna.org/projects/freeciv/"
msgstr ""
"Wenn Sie irgendwelche Fehler finden sollten, schicken Sie uns bitte einen "
"Fehlerbericht. Am Besten benutzen Sie dazu unser Fehlerverfolgungssystem "
"unter\n"
"\n"
-" http://bugs.freeciv.org/"
+" https://gna.org/projects/freeciv/"
#: data/helpdata.txt:60
msgid ""
@@ -18870,9 +19026,7 @@ msgid ""
"a Factory, Mfg. Plant and Hydro Plant together give a 150% production "
"bonus.\n"
"\n"
-"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant. A city "
-"can only build a Hydro Plant if it is next to (or on) a Mountain or River "
-"tile."
+"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant."
msgstr ""
"Vermindert nicht nur die durch die Produktion einer Stadt verursachte "
"Umweltverschmutzung um die Hälfte, sondern steigert auch die Produktion von "
@@ -18881,36 +19035,35 @@ msgstr ""
"vorhanden, erhöht sich der Bonus auf 150%.\n"
"\n"
"Eine Stadt kann nur ein Wasserkraftwerk, Kohlekraftwerk oder Atomkraftwerk "
-"bauen. Wasserkraftwerke können nur auf oder neben Berg- oder Flußfeldern "
-"gebaut werden."
+"bauen."
-#: data/default/buildings.ruleset:397 data/civ2/buildings.ruleset:373
+#: data/default/buildings.ruleset:396 data/civ2/buildings.ruleset:373
#: data/civ1/buildings.ruleset:297
msgid "Library"
msgstr "Bücherei"
-#: data/default/buildings.ruleset:412
+#: data/default/buildings.ruleset:411
#, no-c-format
msgid "Increases the science output in a city by 100%."
msgstr "Erhöht das Forschungstempo in der Stadt um 100%."
-#: data/default/buildings.ruleset:417 data/civ2/buildings.ruleset:393
+#: data/default/buildings.ruleset:416 data/civ2/buildings.ruleset:393
#: data/civ1/buildings.ruleset:317
msgid "Marketplace"
msgstr "Marktplatz"
-#: data/default/buildings.ruleset:432 data/civ2/buildings.ruleset:408
+#: data/default/buildings.ruleset:431 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 "Erhöht die Luxusproduktion und Steuereinnahmen der Stadt um 50%."
-#: data/default/buildings.ruleset:437 data/civ2/buildings.ruleset:413
+#: data/default/buildings.ruleset:436 data/civ2/buildings.ruleset:413
#: data/civ1/buildings.ruleset:337
msgid "Mass Transit"
msgstr "Massenbeförderung"
-#: data/default/buildings.ruleset:451 data/civ2/buildings.ruleset:427
+#: data/default/buildings.ruleset:450 data/civ2/buildings.ruleset:427
#: data/civ1/buildings.ruleset:351
msgid ""
"Neutralizes the pollution generated by the population. The population "
@@ -18918,12 +19071,12 @@ msgid ""
msgstr ""
"Neutralisiert die durch die Bevölkerung verursachte Umweltverschmutzung."
-#: data/default/buildings.ruleset:458 data/civ2/buildings.ruleset:434
+#: data/default/buildings.ruleset:457 data/civ2/buildings.ruleset:434
#: data/civ1/buildings.ruleset:358
msgid "Mfg. Plant"
msgstr "Fertigungsstätte"
-#: data/default/buildings.ruleset:474 data/civ2/buildings.ruleset:450
+#: data/default/buildings.ruleset:473 data/civ2/buildings.ruleset:450
#: data/civ1/buildings.ruleset:374
#, no-c-format
msgid ""
@@ -18933,12 +19086,12 @@ msgstr ""
"In Verbindung mit einer Fabrik verdoppelt die Stadt ihre Produktion "
"(Schilde)."
-#: data/default/buildings.ruleset:480 data/civ2/buildings.ruleset:456
+#: data/default/buildings.ruleset:479 data/civ2/buildings.ruleset:456
#: data/civ1/buildings.ruleset:380
msgid "Nuclear Plant"
msgstr "Atomkraftwerk"
-#: data/default/buildings.ruleset:495
+#: data/default/buildings.ruleset:494
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 "
@@ -18957,11 +19110,11 @@ msgstr ""
"Eine Stadt kann nur ein Wasserkraftwerk, Kohlekraftwerk oder Atomkraftwerk "
"bauen."
-#: data/default/buildings.ruleset:515 data/civ2/buildings.ruleset:489
+#: data/default/buildings.ruleset:514 data/civ2/buildings.ruleset:489
msgid "Offshore Platform"
msgstr "Bohrinsel"
-#: data/default/buildings.ruleset:530 data/civ2/buildings.ruleset:504
+#: data/default/buildings.ruleset:529 data/civ2/buildings.ruleset:504
msgid ""
"Adds 1 extra shield resource on all Ocean squares in a city. The city needs "
"to be coastal to build this improvement."
@@ -18969,12 +19122,12 @@ msgstr ""
"+1 Schild von allen Ozeanfeldern\n"
"Kann nur von Küstenstädten gebaut werden."
-#: data/default/buildings.ruleset:536 data/civ2/buildings.ruleset:510
+#: data/default/buildings.ruleset:535 data/civ2/buildings.ruleset:510
#: data/civ1/buildings.ruleset:411
msgid "Palace"
msgstr "Palast"
-#: data/default/buildings.ruleset:552
+#: data/default/buildings.ruleset:551
#, no-c-format
msgid ""
"Makes a city the capital and the center of your government. Corruption in "
@@ -19000,11 +19153,11 @@ msgstr ""
"In einer Diktatur gibt der Palast einen Produktionsbonus von 75%, in einer "
"Monarchie 50%."
-#: data/default/buildings.ruleset:569 data/civ2/buildings.ruleset:539
+#: data/default/buildings.ruleset:568 data/civ2/buildings.ruleset:539
msgid "Police Station"
msgstr "Polizeiwache"
-#: data/default/buildings.ruleset:583 data/civ2/buildings.ruleset:553
+#: data/default/buildings.ruleset:582 data/civ2/buildings.ruleset:553
msgid ""
"Reduces the unhappiness caused by military units outside the city by 2 under "
"Democracy and 1 under Republic. This improvement has no effect under other "
@@ -19014,11 +19167,11 @@ msgstr ""
"Aktionen Unzufriedenen zufrieden. Unter anderen Regierungsformen hat eine "
"Polizeiwache keine Auswirkungen."
-#: data/default/buildings.ruleset:593 data/civ2/buildings.ruleset:560
+#: data/default/buildings.ruleset:592 data/civ2/buildings.ruleset:560
msgid "Port Facility"
msgstr "Werft"
-#: data/default/buildings.ruleset:608 data/civ2/buildings.ruleset:575
+#: data/default/buildings.ruleset:607 data/civ2/buildings.ruleset:575
msgid ""
"Allows a city to build veteran sea units. Also, damaged sea units which "
"stay in town for one full turn without moving are completely restored."
@@ -19028,12 +19181,12 @@ msgstr ""
"Beschädigte Marineeinheiten, die eine Runde in der Stadt bleiben, werden "
"vollständig repariert."
-#: data/default/buildings.ruleset:615 data/civ2/buildings.ruleset:582
+#: data/default/buildings.ruleset:614 data/civ2/buildings.ruleset:582
#: data/civ1/buildings.ruleset:440
msgid "Power Plant"
msgstr "Kohlekraftwerk"
-#: data/default/buildings.ruleset:631
+#: data/default/buildings.ruleset:630
#, no-c-format
msgid ""
"Increases the shield production of a Factory or Mfg. Plant in a city: a "
@@ -19052,12 +19205,12 @@ msgstr ""
"Eine Stadt kann nur ein Wasserkraftwerk, Kohlekraftwerk oder Atomkraftwerk "
"bauen."
-#: data/default/buildings.ruleset:646 data/civ2/buildings.ruleset:610
+#: data/default/buildings.ruleset:645 data/civ2/buildings.ruleset:610
#: data/civ1/buildings.ruleset:468
msgid "Recycling Center"
msgstr "Recycling-Zentrum"
-#: data/default/buildings.ruleset:661 data/civ2/buildings.ruleset:625
+#: data/default/buildings.ruleset:660 data/civ2/buildings.ruleset:625
#: data/civ1/buildings.ruleset:483
#, no-c-format
msgid ""
@@ -19067,11 +19220,11 @@ msgstr ""
"Ein Recycling-Zentrum vermindert die durch Produktion verursachte "
"Umweltverschmutzung einer Stadt um 66%."
-#: data/default/buildings.ruleset:667 data/civ2/buildings.ruleset:631
+#: data/default/buildings.ruleset:666 data/civ2/buildings.ruleset:631
msgid "Research Lab"
msgstr "Forschungslabor"
-#: data/default/buildings.ruleset:682
+#: data/default/buildings.ruleset:681
msgid ""
"Together with a Library, a Research Lab increases the science production of "
"a city by 200%. Together with a Library and a University, a Research Lab "
@@ -19082,11 +19235,11 @@ msgstr ""
"Universität erhöht ein Forschungslabor das Forschungstempo einer Stadt um "
"450%."
-#: data/default/buildings.ruleset:690 data/civ2/buildings.ruleset:654
+#: data/default/buildings.ruleset:689 data/civ2/buildings.ruleset:654
msgid "SAM Battery"
msgstr "SAM Batterie"
-#: data/default/buildings.ruleset:704 data/civ2/buildings.ruleset:668
+#: data/default/buildings.ruleset:703 data/civ2/buildings.ruleset:668
msgid ""
"Doubles the defense of all units inside the city when attacked by non-"
"nuclear air units."
@@ -19094,12 +19247,12 @@ msgstr ""
"Verdoppelt die Verteidigungsstärke aller in der Stadt stationierten "
"Einheiten gegenüber allen nicht-nuklearen Luftwaffeneinheiten."
-#: data/default/buildings.ruleset:710 data/civ2/buildings.ruleset:674
+#: data/default/buildings.ruleset:709 data/civ2/buildings.ruleset:674
#: data/civ1/buildings.ruleset:489
msgid "SDI Defense"
msgstr "SDI Verteidigung"
-#: data/default/buildings.ruleset:724 data/civ2/buildings.ruleset:688
+#: data/default/buildings.ruleset:723 data/civ2/buildings.ruleset:688
#: data/civ1/buildings.ruleset:503
msgid ""
"Protects a city from attacks from Nuclear units. Nuclear attacks simply "
@@ -19111,11 +19264,11 @@ msgstr ""
"Verdoppelt die Verteidigungsstärke aller in der Stadt stationierten "
"Einheiten gegenüber nicht-nuklearen Raketen."
-#: data/default/buildings.ruleset:733 data/civ2/buildings.ruleset:697
+#: data/default/buildings.ruleset:732 data/civ2/buildings.ruleset:697
msgid "Sewer System"
msgstr "Kanalisation"
-#: data/default/buildings.ruleset:748 data/civ2/buildings.ruleset:712
+#: data/default/buildings.ruleset:747 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."
@@ -19123,12 +19276,12 @@ msgstr ""
"Erlaubt einer Stadt über die Größe 12 hinaus zu wachsen. Vorher benötigt "
"eine Stadt bereits ein Aquädukt, um größer als 8 werden zu können."
-#: data/default/buildings.ruleset:754 data/civ2/buildings.ruleset:749
+#: data/default/buildings.ruleset:753 data/civ2/buildings.ruleset:749
#: data/civ1/buildings.ruleset:512
msgid "Space Component"
msgstr "Raumschiffkomponenten"
-#: data/default/buildings.ruleset:769 data/civ2/buildings.ruleset:763
+#: data/default/buildings.ruleset:768 data/civ2/buildings.ruleset:763
#: data/civ1/buildings.ruleset:526
msgid ""
"Space Components can be differentiated into Propulsion and Fuel Components. "
@@ -19145,12 +19298,12 @@ msgstr ""
"Raumschiffteile können erst gefertigt werden, nachdem irgendein Spieler das "
"'Apollo Programm' fertiggestellt hat."
-#: data/default/buildings.ruleset:779 data/civ2/buildings.ruleset:773
+#: data/default/buildings.ruleset:778 data/civ2/buildings.ruleset:773
#: data/civ1/buildings.ruleset:536
msgid "Space Module"
msgstr "Raumschiffmodule"
-#: data/default/buildings.ruleset:794 data/civ2/buildings.ruleset:787
+#: data/default/buildings.ruleset:793 data/civ2/buildings.ruleset:787
#: data/civ1/buildings.ruleset:550
msgid ""
"Space Modules are the most expensive parts of spaceships. There are three "
@@ -19181,12 +19334,12 @@ msgstr ""
"Raumschiffteile können erst gefertigt werden, nachdem irgendein Spieler das "
"'Apollo Programm' fertiggestellt hat."
-#: data/default/buildings.ruleset:813 data/civ2/buildings.ruleset:806
+#: data/default/buildings.ruleset:812 data/civ2/buildings.ruleset:806
#: data/civ1/buildings.ruleset:569
msgid "Space Structural"
msgstr "Raumschiffkörper"
-#: data/default/buildings.ruleset:828 data/civ2/buildings.ruleset:820
+#: data/default/buildings.ruleset:827 data/civ2/buildings.ruleset:820
#: data/civ1/buildings.ruleset:583
msgid ""
"Space Structurals form the base of your spaceship. All other spaceship "
@@ -19203,11 +19356,11 @@ msgstr ""
"Raumschiffteile können erst gefertigt werden, nachdem irgendein Spieler das "
"'Apollo Programm' fertiggestellt hat."
-#: data/default/buildings.ruleset:838 data/civ2/buildings.ruleset:830
+#: data/default/buildings.ruleset:837 data/civ2/buildings.ruleset:830
msgid "Stock Exchange"
msgstr "Börse"
-#: data/default/buildings.ruleset:854 data/civ2/buildings.ruleset:846
+#: data/default/buildings.ruleset:853 data/civ2/buildings.ruleset:846
#, no-c-format
msgid ""
"Together with a Marketplace and a Bank, a Stock Exchange boosts tax and "
@@ -19216,11 +19369,11 @@ msgstr ""
"Zusammen mit einem Marktplatz und einer Bank erhöht eine Börse die "
"Luxusproduktion und Steuereinnahmen einer Stadt um 150%."
-#: data/default/buildings.ruleset:860 data/civ2/buildings.ruleset:852
+#: data/default/buildings.ruleset:859 data/civ2/buildings.ruleset:852
msgid "Super Highways"
msgstr "Autobahnen"
-#: data/default/buildings.ruleset:875 data/civ2/buildings.ruleset:867
+#: data/default/buildings.ruleset:874 data/civ2/buildings.ruleset:867
#, no-c-format
msgid ""
"Increases trade resources by 50% on all squares with roads or railroads."
@@ -19228,11 +19381,11 @@ msgstr ""
"Für alle Felder mit Straßen oder Schienen erhöht sich das Handelsaufkommen "
"um 50 %."
-#: data/default/buildings.ruleset:883 data/civ2/buildings.ruleset:873
+#: data/default/buildings.ruleset:882 data/civ2/buildings.ruleset:873
msgid "Supermarket"
msgstr "Supermarkt"
-#: data/default/buildings.ruleset:898 data/civ2/buildings.ruleset:888
+#: data/default/buildings.ruleset:897 data/civ2/buildings.ruleset:888
#, no-c-format
msgid ""
"Increases the food resources by 50% on each farmland square which is being "
@@ -19243,12 +19396,12 @@ msgstr ""
"Ein Ackerfeld ist ein Feld, auf dem zwei Bewässerungssysteme eingerichtet "
"wurden."
-#: data/default/buildings.ruleset:905 data/civ2/buildings.ruleset:895
+#: data/default/buildings.ruleset:904 data/civ2/buildings.ruleset:895
#: data/civ1/buildings.ruleset:593
msgid "Temple"
msgstr "Tempel"
-#: data/default/buildings.ruleset:919 data/civ2/buildings.ruleset:909
+#: data/default/buildings.ruleset:918 data/civ2/buildings.ruleset:909
#: data/civ1/buildings.ruleset:607
msgid ""
"Makes one unhappy citizen content. Both the Mysticism advance and the "
@@ -19259,13 +19412,13 @@ msgstr ""
"auch das Orakel verdoppeln den Effekt. Somit können bis zu 4 Unzufriedene "
"zufrieden gestellt werden."
-#: data/default/buildings.ruleset:926 data/civ2/buildings.ruleset:916
+#: data/default/buildings.ruleset:925 data/civ2/buildings.ruleset:916
#: data/civ1/buildings.ruleset:614 data/default/techs.ruleset:742
#: data/civ2/techs.ruleset:727 data/civ1/techs.ruleset:723
msgid "University"
msgstr "Universität"
-#: data/default/buildings.ruleset:942
+#: data/default/buildings.ruleset:941
#, no-c-format
msgid ""
"Together with a Library, a University increases the science production of a "
@@ -19274,12 +19427,12 @@ msgstr ""
"In Verbindung mit einer Bücherei wird das Forschungstempo einer Stadt um "
"250% erhöht."
-#: data/default/buildings.ruleset:948 data/civ2/buildings.ruleset:938
+#: data/default/buildings.ruleset:947 data/civ2/buildings.ruleset:938
#: data/civ1/buildings.ruleset:636
msgid "Apollo Program"
msgstr "das Apollo Programm"
-#: data/default/buildings.ruleset:962 data/civ2/buildings.ruleset:952
+#: data/default/buildings.ruleset:961 data/civ2/buildings.ruleset:952
msgid ""
"Entire map becomes visible for the player who owns it. It allows all "
"players to start building spaceship parts (assuming they have researched the "
@@ -19290,11 +19443,11 @@ msgstr ""
"Erlaubt allen Spielern mit den notwendigen Kenntnissen mit dem Raumschiffbau "
"zu beginnen."
-#: data/default/buildings.ruleset:969 data/civ2/buildings.ruleset:959
+#: data/default/buildings.ruleset:968 data/civ2/buildings.ruleset:959
msgid "A.Smith's Trading Co."
msgstr "A. Smiths Handelsgesellschaft"
-#: data/default/buildings.ruleset:983
+#: data/default/buildings.ruleset:982
msgid ""
"City improvements which would normally have an upkeep of 1 are free of "
"upkeep, for all your cities."
@@ -19302,12 +19455,12 @@ msgstr ""
"In allen eigenen Städten braucht für Stadterweiterungen mit Unterhaltskosten "
"von 1 kein Unterhalt mehr bezahlt zu werden."
-#: data/default/buildings.ruleset:989 data/civ2/buildings.ruleset:979
+#: data/default/buildings.ruleset:988 data/civ2/buildings.ruleset:979
#: data/civ1/buildings.ruleset:655
msgid "Colossus"
msgstr "Kolossus"
-#: data/default/buildings.ruleset:1003 data/civ2/buildings.ruleset:993
+#: data/default/buildings.ruleset:1002 data/civ2/buildings.ruleset:993
#: data/civ1/buildings.ruleset:669
msgid ""
"Each square around the city where this wonder is built that is already "
@@ -19316,23 +19469,23 @@ msgstr ""
"Jedes Feld der Stadt, in der dieses Weltwunder steht, und das zumindest 1 "
"Handelspunkt erwirtschaftet, produziert einen zusätzlichen Handelspunkt."
-#: data/default/buildings.ruleset:1009 data/civ2/buildings.ruleset:999
+#: data/default/buildings.ruleset:1008 data/civ2/buildings.ruleset:999
#: data/civ1/buildings.ruleset:675
msgid "Copernicus' Observatory"
msgstr "Kopernikus' Observatorium"
-#: data/default/buildings.ruleset:1024 data/civ2/buildings.ruleset:1180
+#: data/default/buildings.ruleset:1023 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 "Verdoppelt das Forschungstempo in der Stadt, wo sie steht."
-#: data/default/buildings.ruleset:1029 data/civ2/buildings.ruleset:1019
+#: data/default/buildings.ruleset:1028 data/civ2/buildings.ruleset:1019
#: data/civ1/buildings.ruleset:695
msgid "Cure For Cancer"
msgstr "Krebsheilung"
-#: data/default/buildings.ruleset:1043
+#: data/default/buildings.ruleset:1042
msgid ""
"This stunning technological achievement makes one unhappy citizen content in "
"all your cities."
@@ -19340,12 +19493,12 @@ msgstr ""
"Diese faszinierende technologische Errungenschaft macht in jeder Stadt einen "
"Unzufriedenen zufrieden."
-#: data/default/buildings.ruleset:1051 data/civ2/buildings.ruleset:1039
+#: data/default/buildings.ruleset:1050 data/civ2/buildings.ruleset:1039
#: data/civ1/buildings.ruleset:715
msgid "Darwin's Voyage"
msgstr "Darwins Reise"
-#: data/default/buildings.ruleset:1065 data/civ2/buildings.ruleset:1053
+#: data/default/buildings.ruleset:1064 data/civ2/buildings.ruleset:1053
#: data/civ1/buildings.ruleset:729
msgid ""
"Charles Darwin's voyage sparked the discovery of the evolution of the "
@@ -19353,11 +19506,11 @@ msgid ""
"technology advances."
msgstr "2 sofortige Forschungsergebnisse"
-#: data/default/buildings.ruleset:1072 data/civ2/buildings.ruleset:1060
+#: data/default/buildings.ruleset:1071 data/civ2/buildings.ruleset:1060
msgid "Eiffel Tower"
msgstr "den Eiffelturm"
-#: data/default/buildings.ruleset:1087
+#: data/default/buildings.ruleset:1086
#, no-c-format
msgid ""
"Your reputation and goodwill among other nations is recovered twice as fast."
@@ -19365,12 +19518,12 @@ msgstr ""
"Deine Reputation und deine Anerkennung bei anderen Nationen wird doppelt so "
"schnell wiederhergestellt als sonst."
-#: data/default/buildings.ruleset:1093 data/civ2/buildings.ruleset:1081
+#: data/default/buildings.ruleset:1092 data/civ2/buildings.ruleset:1081
#: data/civ1/buildings.ruleset:736
msgid "Great Library"
msgstr "die Große Bibliothek"
-#: data/default/buildings.ruleset:1107 data/civ2/buildings.ruleset:1095
+#: data/default/buildings.ruleset:1106 data/civ2/buildings.ruleset:1095
#: data/civ1/buildings.ruleset:750
msgid ""
"The civilization which builds the Great Library gets every advance that at "
@@ -19379,21 +19532,21 @@ msgstr ""
"Jede Erkenntnis, die mindestens zwei andere Zivilisationen gewonnen haben, "
"steht auch der Zivilisation mit der Großen Bibliothek zur Verfügung."
-#: data/default/buildings.ruleset:1113 data/civ2/buildings.ruleset:1101
+#: data/default/buildings.ruleset:1112 data/civ2/buildings.ruleset:1101
#: data/civ1/buildings.ruleset:756
msgid "Great Wall"
msgstr "die Große Mauer"
-#: data/default/buildings.ruleset:1127
+#: data/default/buildings.ruleset:1126
msgid "Works as a City Wall in all your cities."
msgstr "Gilt als Stadtmauer für jede eigene Stadt."
-#: data/default/buildings.ruleset:1135 data/civ2/buildings.ruleset:1122
+#: data/default/buildings.ruleset:1134 data/civ2/buildings.ruleset:1122
#: data/civ1/buildings.ruleset:777
msgid "Hanging Gardens"
msgstr "die Hängenden Gärten"
-#: data/default/buildings.ruleset:1149 data/civ2/buildings.ruleset:1136
+#: data/default/buildings.ruleset:1148 data/civ2/buildings.ruleset:1136
#: data/civ1/buildings.ruleset:791
msgid ""
"Makes one content citizen happy in every city. Makes two extra content "
@@ -19409,12 +19562,12 @@ msgstr ""
"Sollte es in einer Stadt keine Zufriedenen geben, stellen sie stattdessen "
"Unzufriedene zufrieden."
-#: data/default/buildings.ruleset:1158 data/civ2/buildings.ruleset:1145
+#: data/default/buildings.ruleset:1157 data/civ2/buildings.ruleset:1145
#: data/civ1/buildings.ruleset:800
msgid "Hoover Dam"
msgstr "den Hoover-Staudamm"
-#: data/default/buildings.ruleset:1173 data/civ2/buildings.ruleset:1159
+#: data/default/buildings.ruleset:1172 data/civ2/buildings.ruleset:1159
msgid ""
"Works as if you had a Hydro Plant in every city. (This reduces pollution "
"and increases the effects of Factories and Mfg. Plants.)"
@@ -19422,12 +19575,12 @@ msgstr ""
"Zählt als Wasserkraftwerk in jeder Stadt. (Die Umweltverschmutzung wird "
"verringert und die Produktivität wird erhöht.)"
-#: data/default/buildings.ruleset:1179 data/civ2/buildings.ruleset:1165
+#: data/default/buildings.ruleset:1178 data/civ2/buildings.ruleset:1165
#: data/civ1/buildings.ruleset:822
msgid "Isaac Newton's College"
msgstr "Isaac Newtons Universität"
-#: data/default/buildings.ruleset:1194
+#: data/default/buildings.ruleset:1193
#, no-c-format
msgid ""
"Boosts science production by 100% in every city you control that has a "
@@ -19436,39 +19589,39 @@ msgstr ""
"Verdoppelt das Forschungstempo in jeder Ihrer Städte, die eine Universität "
"besitzt."
-#: data/default/buildings.ruleset:1200 data/civ2/buildings.ruleset:1185
+#: data/default/buildings.ruleset:1199 data/civ2/buildings.ruleset:1185
#: data/civ1/buildings.ruleset:842
msgid "J.S. Bach's Cathedral"
msgstr "J. S. Bachs Kathedrale"
-#: data/default/buildings.ruleset:1214 data/civ2/buildings.ruleset:1199
+#: data/default/buildings.ruleset:1213 data/civ2/buildings.ruleset:1199
msgid "Makes two unhappy citizens content in every city."
msgstr "Macht in jeder Stadt 2 Unzufriedene zufrieden."
-#: data/default/buildings.ruleset:1219 data/civ2/buildings.ruleset:1204
+#: data/default/buildings.ruleset:1218 data/civ2/buildings.ruleset:1204
msgid "King Richard's Crusade"
msgstr "König Richards Kreuzzug"
-#: data/default/buildings.ruleset:1233 data/civ2/buildings.ruleset:1218
+#: data/default/buildings.ruleset:1232 data/civ2/buildings.ruleset:1218
msgid ""
"Adds one extra shield resource on every square around the city where it is "
"built."
msgstr "Jedes Feld der Stadt produziert einen zusätzlichen Schild."
-#: data/default/buildings.ruleset:1239 data/civ2/buildings.ruleset:1224
+#: data/default/buildings.ruleset:1238 data/civ2/buildings.ruleset:1224
msgid "Leonardo's Workshop"
msgstr "Leonardos Werkstatt"
-#: data/default/buildings.ruleset:1253 data/civ2/buildings.ruleset:1238
+#: data/default/buildings.ruleset:1252 data/civ2/buildings.ruleset:1238
msgid "Upgrades one obsolete unit per game turn."
msgstr "Modernisiert eine veraltete Einheit pro Runde."
-#: data/default/buildings.ruleset:1258 data/civ2/buildings.ruleset:1243
+#: data/default/buildings.ruleset:1257 data/civ2/buildings.ruleset:1243
#: data/civ1/buildings.ruleset:862
msgid "Lighthouse"
msgstr "den Leuchtturm"
-#: data/default/buildings.ruleset:1273
+#: data/default/buildings.ruleset:1272
msgid ""
"Gives all your sea units 1 additional movement point and eliminates the risk "
"of losing Triremes on the high seas. Makes all your new sea units veterans "
@@ -19478,34 +19631,34 @@ msgstr ""
"gehen nicht mehr auf hoher See verloren. In allen eigenen Städten erhalten "
"neue Marineeinheiten Veteran-Status."
-#: data/default/buildings.ruleset:1280 data/civ2/buildings.ruleset:1264
+#: data/default/buildings.ruleset:1279 data/civ2/buildings.ruleset:1264
#: data/civ1/buildings.ruleset:885
msgid "Magellan's Expedition"
msgstr "Magellans Expedition"
-#: data/default/buildings.ruleset:1295
+#: data/default/buildings.ruleset:1294
msgid "Gives all your sea units 2 additional movement points."
msgstr "Alle Marineeinheiten erhalten zwei zusätzliche Bewegungspunkte."
-#: data/default/buildings.ruleset:1300 data/civ2/buildings.ruleset:1283
+#: data/default/buildings.ruleset:1299 data/civ2/buildings.ruleset:1283
#: data/civ1/buildings.ruleset:904
msgid "Manhattan Project"
msgstr "das Manhattan Projekt"
-#: data/default/buildings.ruleset:1318 data/civ2/buildings.ruleset:1301
+#: data/default/buildings.ruleset:1317 data/civ2/buildings.ruleset:1301
msgid "Marco Polo's Embassy"
msgstr "Marco Polos Botschaft"
-#: data/default/buildings.ruleset:1332 data/civ2/buildings.ruleset:1315
+#: data/default/buildings.ruleset:1331 data/civ2/buildings.ruleset:1315
msgid "The player who owns it gets an embassy with all players."
msgstr "Gilt als Botschaft bei allen Mitspielern."
-#: data/default/buildings.ruleset:1337 data/civ2/buildings.ruleset:1320
+#: data/default/buildings.ruleset:1336 data/civ2/buildings.ruleset:1320
#: data/civ1/buildings.ruleset:922
msgid "Michelangelo's Chapel"
msgstr "Michelangelos Kapelle"
-#: data/default/buildings.ruleset:1351 data/civ2/buildings.ruleset:1334
+#: data/default/buildings.ruleset:1350 data/civ2/buildings.ruleset:1334
msgid ""
"Counts as having a Cathedral in each of your cities. This makes 3 unhappy "
"citizens content in each city. The discovery of Theology increases the "
@@ -19514,21 +19667,21 @@ msgid ""
"the number of unhappy citizens made content."
msgstr "Zählt als Kathedrale in jeder eigenen Stadt."
-#: data/default/buildings.ruleset:1361 data/civ2/buildings.ruleset:1344
+#: data/default/buildings.ruleset:1360 data/civ2/buildings.ruleset:1344
#: data/civ1/buildings.ruleset:941
msgid "Oracle"
msgstr "das Orakel"
-#: data/default/buildings.ruleset:1375
+#: data/default/buildings.ruleset:1374
msgid "Makes two of your unhappy citizens content in every city with a temple."
msgstr "Macht in jeder Stadt mit einem Tempel 2 Unzufriedene zufrieden."
-#: data/default/buildings.ruleset:1380 data/civ2/buildings.ruleset:1363
+#: data/default/buildings.ruleset:1379 data/civ2/buildings.ruleset:1363
#: data/civ1/buildings.ruleset:960
msgid "Pyramids"
msgstr "die Pyramiden"
-#: data/default/buildings.ruleset:1394
+#: data/default/buildings.ruleset:1393
msgid ""
"The amount of stored food lost when one of your cities grows or shrinks is "
"reduced by 25%. This helps a city to grow faster and more easily withstand "
@@ -19538,32 +19691,32 @@ msgstr ""
"wiederaufgefüllt. Das hilft der Stadt zu wachsen und einer Hungersnot besser "
"zu widerstehen. Summiert sich mit dem Effekt von Kornspeichern."
-#: data/default/buildings.ruleset:1401 data/civ2/buildings.ruleset:1382
+#: data/default/buildings.ruleset:1400 data/civ2/buildings.ruleset:1382
#: data/civ1/buildings.ruleset:981
msgid "SETI Program"
msgstr "das SETI-Programm"
-#: data/default/buildings.ruleset:1415
+#: data/default/buildings.ruleset:1414
msgid "Boosts science production in each city with a Research Lab by 100%. "
msgstr ""
"Beschleunigt das Forschungstempo in jeder Stadt mit einem Forschungslabor um "
"100%."
-#: data/default/buildings.ruleset:1420 data/civ2/buildings.ruleset:1402
+#: data/default/buildings.ruleset:1419 data/civ2/buildings.ruleset:1402
#: data/civ1/buildings.ruleset:1001
msgid "Shakespeare's Theatre"
msgstr "Shakespeares Theater"
-#: data/default/buildings.ruleset:1434 data/civ2/buildings.ruleset:1416
+#: data/default/buildings.ruleset:1433 data/civ2/buildings.ruleset:1416
#: data/civ1/buildings.ruleset:1015
msgid "Makes all unhappy citizens content, in the city where it is located."
msgstr "Macht alle unzufriedenen Bürger der Stadt zufrieden."
-#: data/default/buildings.ruleset:1439 data/civ2/buildings.ruleset:1421
+#: data/default/buildings.ruleset:1438 data/civ2/buildings.ruleset:1421
msgid "Statue of Liberty"
msgstr "die Freiheitsstatue"
-#: data/default/buildings.ruleset:1453 data/civ2/buildings.ruleset:1435
+#: data/default/buildings.ruleset:1452 data/civ2/buildings.ruleset:1435
#: data/civ1/buildings.ruleset:974 data/civ1/buildings.ruleset:1034
msgid ""
"Allows you to choose any government, including those that have not yet been "
@@ -19573,11 +19726,11 @@ msgstr ""
"Gestattet die Wahl jeder Regierungsform (auch ohne entsprechende Kenntnisse) "
"ohne die Periode der Anarchie."
-#: data/default/buildings.ruleset:1460 data/civ2/buildings.ruleset:1442
+#: data/default/buildings.ruleset:1459 data/civ2/buildings.ruleset:1442
msgid "Sun Tzu's War Academy"
msgstr "Sun Tzus Militärakademie"
-#: data/default/buildings.ruleset:1474
+#: data/default/buildings.ruleset:1473
msgid ""
"All your new ground units start at the first veteran level. The chance of a "
"unit getting the next veteran level after a battle increases by half."
@@ -19586,32 +19739,32 @@ msgstr ""
"bestehenden Truppen erhalten nach jedem gewonnenen Kampf den jeweils "
"nächsten Grad."
-#: data/default/buildings.ruleset:1481 data/civ2/buildings.ruleset:1463
+#: data/default/buildings.ruleset:1480 data/civ2/buildings.ruleset:1463
#: data/civ1/buildings.ruleset:1020
msgid "United Nations"
msgstr "die Vereinten Nationen"
-#: data/default/buildings.ruleset:1495
+#: data/default/buildings.ruleset:1494
msgid "All your units regain two extra hitpoints per turn."
msgstr "Alle Einheiten erhalten 2 zusätzliche Trefferpunkte pro Runde zurück."
-#: data/default/buildings.ruleset:1508 data/civ2/buildings.ruleset:1490
+#: data/default/buildings.ruleset:1507 data/civ2/buildings.ruleset:1490
#: data/civ1/buildings.ruleset:1046
msgid "Women's Suffrage"
msgstr "das Frauenstimmrecht"
-#: data/default/buildings.ruleset:1522 data/civ2/buildings.ruleset:1504
+#: data/default/buildings.ruleset:1521 data/civ2/buildings.ruleset:1504
msgid ""
"Counts as a Police Station in every city. (That is, for each city, reduces "
"unhappiness for military units outside the city by 2 under Democracy and 1 "
"under Republic. This wonder has no effect under other governments.)"
msgstr "Zählt als Polizeiwache in jeder eigenen Stadt."
-#: data/default/buildings.ruleset:1533
+#: data/default/buildings.ruleset:1532
msgid "Coinage"
msgstr "Kapitalisierung"
-#: data/default/buildings.ruleset:1554
+#: data/default/buildings.ruleset:1553
msgid ""
"This is not a normal improvement. Instead, setting a city's production to "
"Coinage means its shield production is converted to tax output (money, "
@@ -20050,11 +20203,16 @@ msgstr "keltisch"
msgid "?citystyle:Industrial"
msgstr "Industriezeitalter"
-#: data/default/cities.ruleset:139 data/civ2/cities.ruleset:150
+#: data/default/cities.ruleset:139
+#, fuzzy
+msgid "?citystyle:ElectricAge"
+msgstr "keltisch"
+
+#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:150
msgid "?citystyle:Modern"
msgstr "modern"
-#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:161
+#: data/default/cities.ruleset:161 data/civ2/cities.ruleset:161
msgid "?citystyle:PostModern"
msgstr "postmodern"
@@ -25791,3 +25949,44 @@ msgstr "Team 30"
#: data/default/game.ruleset:160
msgid "Team 31"
msgstr "Team 31"
+
+#~ 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."
+
+#~ msgid "Observers cannot vote."
+#~ msgstr "Beobachter können nicht abstimmen."
+
+#~ msgid ""
+#~ "You can only vote in a running game. Use 'first' to become the game "
+#~ "organizer if there currently is none."
+#~ msgstr ""
+#~ "Es kann nur in einem laufenden Spiel abgestimmt werden. Benutze den "
+#~ "Befehl 'first', um Spielleiter zu werden, falls es noch keinen gibt."
+
+#~ msgid "Vote %d \"%s\": %d for, %d against"
+#~ msgstr "Abstimmung %d über den Befehl '%s': %d dafür, %d dagegen"
+
+#~ msgid "Value must be integer."
+#~ msgstr "Wert muß ganzzahlig sein."
+
+#~ 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 Hydro Plant, Power Plant, or Nuclear Plant. A "
+#~ "city can only build a Hydro Plant if it is next to (or on) a Mountain or "
+#~ "River tile."
+#~ msgstr ""
+#~ "Vermindert nicht nur die durch die Produktion einer Stadt verursachte "
+#~ "Umweltverschmutzung um die Hälfte, sondern steigert auch die Produktion "
+#~ "von Fabriken und Fertigungsstätten der Stadt. In Verbindung mit einer "
+#~ "Fabrik oder einer Fertigungsstätte gibt es einen Bonus von 75%, sind "
+#~ "beide vorhanden, erhöht sich der Bonus auf 150%.\n"
+#~ "\n"
+#~ "Eine Stadt kann nur ein Wasserkraftwerk, Kohlekraftwerk oder "
+#~ "Atomkraftwerk bauen. Wasserkraftwerke können nur auf oder neben Berg- "
+#~ "oder Flußfeldern gebaut werden."
diff --git a/po/el.gmo b/po/el.gmo
index d47a7a8..c3714b9 100644
Binary files a/po/el.gmo and b/po/el.gmo differ
diff --git a/po/el.po b/po/el.po
index 8eb7306..babf7ee 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: 2009-03-29 21:13+0900\n"
+"POT-Creation-Date: 2009-11-22 21:37+0100\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"
@@ -64,21 +64,21 @@ msgstr "?
msgid "?redundant:*"
msgstr "?ðëåïíÜæùí:*"
-#: common/connection.c:515
+#: common/connection.c:518
#, c-format
msgid "%s from %s"
msgstr "%s áðü %s"
-#: common/connection.c:521
+#: common/connection.c:524
msgid " (connection incomplete)"
msgstr " (áíïëïêëÞñùôç óýíäåóç)"
-#: common/connection.c:525
+#: common/connection.c:528
#, c-format
msgid " (player %s)"
msgstr "(ðáß÷ôçò %s)"
-#: common/connection.c:529
+#: common/connection.c:532
msgid " (observer)"
msgstr " (ðáñáôçñçôÞò)"
@@ -540,81 +540,81 @@ msgstr "
msgid "AI Debug messages"
msgstr "Ìçíýìáôá áðïóöáëìÜôùóçò ÔÍ (Ôå÷íçôÞò Íïçìïóýíçò)"
-#: common/player.c:732
+#: common/player.c:746
msgid "?attitude:Genocidal"
msgstr "?óõìðåñéöïñÜ:Ãåíïêôïíéêüò"
-#: common/player.c:734
+#: common/player.c:748
msgid "?attitude:Belligerent"
msgstr "?óõìðåñéöïñÜ:Åìðüëåìïò"
-#: common/player.c:736
+#: common/player.c:750
msgid "?attitude:Hostile"
msgstr "?óõìðåñéöïñÜ:Å÷èñéêüò"
-#: common/player.c:738
+#: common/player.c:752
msgid "?attitude:Uncooperative"
msgstr "?óõìðåñéöïñÜ:Ìç óõíåñãÜóéìïò"
-#: common/player.c:740
+#: common/player.c:754
msgid "?attitude:Uneasy"
msgstr "?óõìðåñéöïñÜ:Ìç Âïëéêüò"
-#: common/player.c:742
+#: common/player.c:756
msgid "?attitude:Neutral"
msgstr "?óõìðåñéöïñÜ:ÏõäÝôåñïò"
-#: common/player.c:744
+#: common/player.c:758
msgid "?attitude:Respectful"
msgstr "?óõìðåñéöïñÜ:ÁîéïóÝâáóôïò"
-#: common/player.c:746
+#: common/player.c:760
msgid "?attitude:Helpful"
msgstr "?óõìðåñéöïñÜ:Âïçèçôéêüò"
-#: common/player.c:748
+#: common/player.c:762
msgid "?attitude:Enthusiastic"
msgstr "?óõìðåñéöïñÜ:Åíèïõóéþäçò"
-#: common/player.c:750
+#: common/player.c:764
msgid "?attitude:Admiring"
msgstr "?óõìðåñéöïñÜ:Áîéïèáýìáóôïò"
-#: common/player.c:753
+#: common/player.c:767
msgid "?attitude:Worshipful"
msgstr "?óõìðåñéöïñÜ:ÁîéïëÜôñåõôïò"
-#: common/player.c:764
+#: common/player.c:778
msgid "?diplomatic_state:Armistice"
msgstr "?äéðëùìáôéêÞ_êáôÜóôáóç:ÐñïóùñéíÞ êáôÜðáõóç ðõñüò"
-#: common/player.c:765
+#: common/player.c:779
msgid "?diplomatic_state:War"
msgstr "?äéðëùìáôéêÞ_êáôÜóôáóç:Ðüëåìïò"
-#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:780 client/gui-gtk-2.0/diplodlg.c:353
#: 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:767 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:781 client/gui-gtk-2.0/diplodlg.c:358
#: 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:768 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:782 client/gui-gtk-2.0/diplodlg.c:363
#: 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:769
+#: common/player.c:783
msgid "?diplomatic_state:Never met"
msgstr "?äéðëùìáôéêÞ_êáôÜóôáóç:Äåí Ý÷ïõí óõíáíôçèåß"
-#: common/player.c:770
+#: common/player.c:784
msgid "?diplomatic_state:Team"
msgstr "?äéðëùìáôéêÞ_êáôÜóôáóç:ÏìÜäá"
@@ -645,7 +645,7 @@ msgstr "
#. TRANS: "Resources: (none)".
#: common/requirements.c:1014 common/team.c:132
#: client/gui-gtk-2.0/helpdlg.c:1055 client/gui-gtk-2.0/inteldlg.c:390
-#: client/gui-win32/helpdlg.c:586 client/gui-xaw/helpdlg.c:991
+#: client/gui-win32/helpdlg.c:592 client/gui-xaw/helpdlg.c:991
#, c-format
msgid "(none)"
msgstr "(êáíÝíáò)"
@@ -671,10 +671,11 @@ msgstr "
#: 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
#: client/gui-sdl/helpdlg.c:817 client/gui-sdl/mapview.c:962
-#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:545
-#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:735
-#: 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
+#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:544
+#: client/gui-win32/helpdlg.c:551 client/gui-win32/helpdlg.c:721
+#: client/gui-win32/helpdlg.c:741 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 "Êáìßá"
@@ -687,29 +688,29 @@ msgstr "
msgid "(Unknown)"
msgstr "(¶ãíùóôç)"
-#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:553
#: manual/civmanual.c:224
msgid "Road"
msgstr "Äñüìïò"
-#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:557
#: client/gui-gtk-2.0/menu.c:829 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:394 common/terrain.c:572 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:567
#: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
#: data/civ1/techs.ruleset:563
msgid "Railroad"
msgstr "Óéäçñüäñïìïò"
-#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:555
msgid "Mine"
msgstr "Ïñõ÷åßï"
-#: common/terrain.c:396 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:551 server/report.c:124
#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "Ìüëõíóç"
@@ -718,7 +719,7 @@ msgstr "
msgid "Hut"
msgstr "Êáëýâá"
-#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:563
#: manual/civmanual.c:226
msgid "Fortress"
msgstr "Öñïýñéï"
@@ -731,59 +732,59 @@ msgstr "
msgid "Farmland"
msgstr "Áãñüêôçìá"
-#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:577
#: manual/civmanual.c:226
msgid "Airbase"
msgstr "ÁåñïðïñéêÞ âÜóç"
-#: common/terrain.c:402 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:579
#, fuzzy
msgid "Fallout"
msgstr "ÑáäéåíåñãÜ êáôÜëïéðá"
-#: common/unit.c:546 client/gui-win32/plrdlg.c:337
+#: common/unit.c:549 client/gui-win32/plrdlg.c:337
msgid "Idle"
msgstr "ÁäñáíÞò"
-#: common/unit.c:556
+#: common/unit.c:559
msgid "Fortifying"
msgstr "Ï÷õñþíåôáé"
-#: common/unit.c:558
+#: common/unit.c:561
msgid "Fortified"
msgstr "Ï÷õñïìÝíï"
-#: common/unit.c:562 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
+#: common/unit.c:565 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
msgid "Sentry"
msgstr "Öñïõñüò"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
+#: common/unit.c:569 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
#: client/gui-win32/menu.c:370 client/gui-xaw/menu.c:185
msgid "Pillage"
msgstr "ËåçëÜôçóå"
-#: common/unit.c:568 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
+#: common/unit.c:571 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
msgid "Goto"
msgstr "ÐÞãáéíå"
-#: common/unit.c:570
+#: common/unit.c:573
msgid "Explore"
msgstr "Åîåñåýíçóå"
-#: common/unit.c:572 manual/civmanual.c:224
+#: common/unit.c:575 manual/civmanual.c:224
msgid "Transform"
msgstr "Ìåôáó÷çìÜôéóå"
-#: common/unit.c:584 client/text.c:157 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:587 client/text.c:157 client/gui-sdl/citydlg.c:1972
#: client/gui-win32/citydlg.c:1257 client/gui-xaw/citydlg.c:1423
msgid "Unknown"
msgstr "¶ãíùóôï"
-#: common/unit.c:1022
+#: common/unit.c:1025
msgid "Moves"
msgstr "ÊéíÞóåéò"
-#: common/unit.c:1571
+#: common/unit.c:1574
#, c-format
msgid ""
"Upgrade %s to %s for %d gold?\n"
@@ -792,12 +793,12 @@ msgstr ""
"ÁíáâÜèìéóå %s óå %s ãéá %d ÷ñõóÜ íïìßóìáôá?\n"
"Ôï èçóáõñïöõëÜêéï ðåñéÝ÷åé %d ÷ñõóÜ íïìßóìáôá."
-#: common/unit.c:1579
+#: common/unit.c:1582
#, c-format
msgid "Sorry, cannot upgrade %s (yet)."
msgstr "Óõãíþìç, áëëÜ äåí ìðïñþ íá áíáâáèìßóù %s (áêüìá)."
-#: common/unit.c:1585
+#: common/unit.c:1588
#, c-format
msgid ""
"Upgrading %s to %s costs %d gold.\n"
@@ -806,11 +807,11 @@ msgstr ""
"ÁíáâÜèìéóç %s óå %s êïóôßæåé %d ÷ñõóÜ.\n"
"Ôï èçóáõñïöõëÜêéï ðåñéÝ÷åé %d ÷ñõóÜ."
-#: common/unit.c:1594
+#: common/unit.c:1597
msgid "You can only upgrade units in your cities."
msgstr "Ìðïñåßò íá áíáâáèìßóåéò ìüíï ìïíÜäåò ðïõ åßíáé ìÝóá óôéò ðüëåéò óïõ"
-#: common/unit.c:1598
+#: common/unit.c:1601
#, c-format
msgid "Upgrading this %s would strand units it transports."
msgstr "ÁíáâÜèìéóç ôïõ %s èá áðïâßâáæå ôéò ìïíÜäåò ðïõ ìåôáöÝñåé. "
@@ -843,11 +844,11 @@ msgstr "
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1404
+#: common/unittype.c:349 client/helpdata.c:1412
msgid " and "
msgstr " êáé "
-#: common/unittype.c:355 client/helpdata.c:1390
+#: common/unittype.c:355 client/helpdata.c:1398
msgid "?and:, "
msgstr "?êáé:, "
@@ -1018,74 +1019,74 @@ msgstr "
msgid "Missing argument for \"%s\".\n"
msgstr "Ëåßðåé üñéóìá ãéá \"%s\".\n"
-#: utility/shared.c:501
+#: utility/shared.c:514
#, c-format
msgid "%d BC"
msgstr "%d Ð.×"
-#: utility/shared.c:503
+#: utility/shared.c:516
#, c-format
msgid "%d AD"
msgstr "%d Ì.×"
-#: utility/shared.c:924
+#: utility/shared.c:937
#, fuzzy
msgid "FREECIV_PATH is set but empty; using default path instead."
msgstr ""
"\"%s\" Ý÷åé ôåèåß áëëÜ åßíáé êåíü; ÷ñçóéìïðïéåßôáé ôï ðñïêáèïñéóìÝíï \"%s\" ."
-#: utility/shared.c:1028
+#: utility/shared.c:1041
#, c-format
msgid "Could not read data directory %s: %s."
msgstr "Äåí ìðïñåß íá ãßíåé áíÜãíùóç êáôáëÜãïõ äåäïìÝíùí %s: %s."
-#: utility/shared.c:1279
+#: utility/shared.c:1292
#, fuzzy
msgid "The data path may be set via the environment variable FREECIV_PATH."
msgstr ""
"Ôï ìïíïðÜôé êáôáëüãïõ ìðïñåß íá ôåèåß ìÝóù ôçò \"%s\" ìåôáâëçôÞò "
"ðåñéâÜëëïíôïò."
-#: utility/shared.c:1281
+#: utility/shared.c:1294
#, c-format
msgid "Current data path is: \"%s\""
msgstr "ÔñÝ÷ùí ìïíïðÜôé äåäïìÝíùí åßíáé : \"%s\""
-#: utility/shared.c:1283
+#: utility/shared.c:1296
#, c-format
msgid "The \"%s\" file is required ... aborting!"
msgstr "Ôï \"%s\" áñ÷åßï áðáôåßôáé... Ýîïäïò!"
-#: utility/shared.c:1460
+#: utility/shared.c:1485
#, c-format
msgid "%s: Fatal error: you're trying to run me as superuser!\n"
msgstr "%s: ÈáíÜóéìï óöÜëìá: ðñïóðáèåßò íá ìå åêôåëÝóåéò óáí õðåñ÷ñÞóôçò!\n"
-#: utility/shared.c:1462
+#: utility/shared.c:1487
msgid "Use a non-privileged account instead.\n"
msgstr "×ñçóéìïðïéÞóå ìç-ðñïíïìéïý÷ï ëïãáñéáóìü.\n"
-#: utility/shared.c:1478
+#: utility/shared.c:1503
msgid "exact match"
msgstr "áêñéâÝò ôáßñéáóìá"
-#: utility/shared.c:1479
+#: utility/shared.c:1504
msgid "only match"
msgstr "áðëü ôáßñéáóìá"
-#: utility/shared.c:1480
+#: utility/shared.c:1505
msgid "ambiguous"
msgstr "áìößóçìï"
-#: utility/shared.c:1481
+#: utility/shared.c:1506
msgid "empty"
msgstr "Üäåéï"
-#: utility/shared.c:1482
+#: utility/shared.c:1507
msgid "too long"
msgstr "ðïëý ìáêñý"
-#: utility/shared.c:1483
+#: utility/shared.c:1508
msgid "non-match"
msgstr "ìç-ôáßñéáóìá"
@@ -1114,24 +1115,24 @@ msgstr "
msgid "%s is selling %s (not needed) for %d."
msgstr "%s ðïõëÜåé %s (äåí ôï ÷ñåéÜæïìáóôå) ãéá %d."
-#: ai/advdiplomacy.c:280
+#: ai/advdiplomacy.c:300
#, c-format
msgid "*%s (AI)* In away mode AI can't sign such a treaty."
msgstr ""
"*%s (AI)* Ç ÔÍ äåí ìðïñåß íá õðïãñÜøåé ìéá ôÝôïéá óõíèÞêç óå áðïìáêñõóìÝíç "
"ëåéôïõñãßá"
-#: ai/advdiplomacy.c:290
+#: ai/advdiplomacy.c:310
#, c-format
msgid "*%s (AI)* First break alliance with %s, %s."
msgstr "*%s (AI)* Ðñþôá ôåñìÜôéóå ôç óõììá÷ßá ìå %s, %s."
-#: ai/advdiplomacy.c:303
+#: ai/advdiplomacy.c:322
#, c-format
msgid "*%s (AI)* Let us first cease hostilies, %s."
msgstr "*%s (AI)* Áò ôåñìáôßóïõìå ðñþôá ôéò å÷èñïðñáîßåò, %s."
-#: ai/advdiplomacy.c:308
+#: ai/advdiplomacy.c:327
#, c-format
msgid ""
"*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
@@ -1140,50 +1141,50 @@ msgstr ""
"*%s (AI)* Åý÷ïìáé íá äéáôçñÞóåéò ëßãï áêüìá ôçí ôùñéíÞ êáôÜðáõóç ðõñüòðñþôá, "
"%s."
-#: ai/advdiplomacy.c:331
+#: ai/advdiplomacy.c:350
#, c-format
msgid "*%s (AI)* I simply do not trust you with an alliance yet, %s."
msgstr ""
"*%s (AI)* ÁðëÜ äåí óå åìðéóôåýïìáé áñêåôÜ áêüìá ãéá íá óõììá÷Þóù ìáæß óïõ, %"
"s."
-#: ai/advdiplomacy.c:424
+#: ai/advdiplomacy.c:443
#, c-format
msgid "*%s (AI)* I do not know the city you mention."
msgstr "*%s (AI)* Äåí ãíùñßæù ôçí ðüëç óôçí ïðïßá áíáöÝñåóáé"
-#: ai/advdiplomacy.c:454
+#: ai/advdiplomacy.c:473
#, c-format
msgid "*%s (AI)* Sorry, sharing vision with you is not safe."
msgstr ""
"*%s (AI)* Óõãíþìç áëëÜ äåí åßíáé áóöáëÝò íá ìïéñÜæïìáé ïñáôüôçôá ìáæß óïõ"
-#: ai/advdiplomacy.c:560
+#: ai/advdiplomacy.c:579
#, c-format
msgid "*%s (AI)* This deal was not very good for us, %s!"
msgstr "*%s (AI)* Ç óõìöùíßá äåí Þôáí ðïëý êáëÞ ãéá ìáò, %s!"
-#: ai/advdiplomacy.c:582
+#: ai/advdiplomacy.c:601
#, c-format
msgid "*%s (AI)* Welcome into our alliance %s!"
msgstr "*%s (AI)* Êáëþò Þñèåò óôç óõììá÷ßá ìáò %s!"
-#: ai/advdiplomacy.c:586
+#: ai/advdiplomacy.c:605
#, c-format
msgid "*%s (AI)* Yes, may we forever stand united, %s."
msgstr "*%s (AI)* Íáé, åßèå íá åßìáóôå ðÜíôá åíùìÝíïé, %s."
-#: ai/advdiplomacy.c:593
+#: ai/advdiplomacy.c:612
#, c-format
msgid "*%s (AI)* Yes, peace in our time!"
msgstr "*%s (AI)* Íáé, åéñÞíç óôçí åðï÷Þ ìáò!"
-#: ai/advdiplomacy.c:598
+#: ai/advdiplomacy.c:617
#, c-format
msgid "*%s (AI)* Agreed. No more hostilities, %s."
msgstr "*%s (AI)* Óýìöùíïé. ÔÝñìá ïé å÷èñïðñáîßåò, %s."
-#: ai/advdiplomacy.c:813
+#: ai/advdiplomacy.c:832
#, c-format
msgid ""
"*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
@@ -1192,23 +1193,23 @@ msgstr ""
"*%s (AI)* ÃåéÜ óïõ %s! Ôé èá Ýëåãåò ãéá êáôÜðáõóç ôïõ ðõñüò þóôå íá "
"ãíùñéóôïýìåêáëýôåñá;"
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1116
#, c-format
msgid "*%s (AI)* Space will never be yours. "
msgstr "*%s (AI)* Ôï äéÜóôçìá äåí èá ãßíåé ðïôÝ äéêü óïõ. "
-#: ai/advdiplomacy.c:1102
+#: ai/advdiplomacy.c:1121
#, c-format
msgid "*%s (AI)* I have tolerated your vicious antics long enough! To war!"
msgstr ""
"*%s (AI)* ÁñêåôÜ áíÝ÷ôçêá ôïõò áññùóôçìÝíïõò èåáôñéíéóìïýò óïõ! Ðüëåìïò!"
-#: ai/advdiplomacy.c:1108
+#: ai/advdiplomacy.c:1127
#, c-format
msgid "*%s (AI)* Peace in ... some other time."
msgstr "*%s (AI)* ÅéñÞíç... êÜðïéá Üëëç óôéãìÞ"
-#: ai/advdiplomacy.c:1113
+#: ai/advdiplomacy.c:1132
#, c-format
msgid ""
"*%s (AI)* Finally I get around to you! Did you really think you could get "
@@ -1217,17 +1218,17 @@ msgstr ""
"*%s (AI)* ÅðéôÝëïõò óå ôóÜêùóá! Ðßóôåøåò áëÞèåéá üôé ìðïñïýóåò íá ìåßíåéò "
"áôéìþñçôïò ãéá ôá åãêëÞìáôÜ óïõ;"
-#: ai/advdiplomacy.c:1119
+#: ai/advdiplomacy.c:1138
#, c-format
msgid "*%s (AI)* Your covert hostilities brought this war upon you!"
msgstr "*%s (AI)* "
-#: ai/advdiplomacy.c:1126
+#: ai/advdiplomacy.c:1145
#, c-format
msgid "*%s (AI)* Your aggression against %s was your last mistake!"
msgstr "*%s (AI)* Ç åðéèåôéêüôçôá åíáíôßïí %s Þôáí ôï ôåëåõôáßï óïõ ëÜèïò!"
-#: ai/advdiplomacy.c:1209
+#: ai/advdiplomacy.c:1229
#, c-format
msgid ""
"*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1242,7 +1243,7 @@ msgstr[1] ""
"*%s (AI)* Èá îåêéíÞóïõìå Ýíáí ïëïêëçñùôéêü ðüëåìï åíáíôßïí %s óôáìáôþíôáò óå "
"%d ãýñïõò."
-#: ai/advdiplomacy.c:1219
+#: ai/advdiplomacy.c:1239
#, c-format
msgid ""
"*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
@@ -1251,7 +1252,7 @@ msgstr ""
"*%s (AI)* ÁíáìÝíïõìå ôç âïçèåéÜ óïõ óå áõôü ôï èÝìá. ×éëéü÷ñïíç ç äïîáóìÝíç "
"óõììá÷ßá ìáò!"
-#: ai/advdiplomacy.c:1225
+#: ai/advdiplomacy.c:1245
#, c-format
msgid ""
"*%s (AI)* %s has grossly violated his treaties with us for own gain. We "
@@ -1270,7 +1271,7 @@ msgstr[1] ""
"üöåëùò. ÈááðáíôÞóïõìå ìå éó÷ý óå %d ãýñï êáé ðåñéìÝíïõìå íá ôéìÞóåéò ôçí "
"óõììá÷ßá óïõ ìáæß ìáò êáé ðñÜîåéò ðáñïìïßùò!"
-#: ai/advdiplomacy.c:1238
+#: ai/advdiplomacy.c:1258
#, c-format
msgid ""
"*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1285,7 +1286,7 @@ msgstr[1] ""
"*%s (AI)* Óêïðåýïõìå íá ëåçëáôÞóïõìå êáé íá ëçóôåýóïõìå ôïí ðëïýóéï "
"ðïëéôéóìü ôùí %sÈá êçñýîïõìå ðüëåìï óå %d ãýñïõò."
-#: ai/advdiplomacy.c:1246
+#: ai/advdiplomacy.c:1266
#, c-format
msgid ""
"*%s (AI)* If you want a piece of the loot, feel free to join in the action!"
@@ -1293,7 +1294,7 @@ msgstr ""
"*%s (AI)* Áí èåò ìåñßäéï áðü ôá ëÜöõñá, ìðïñåßò åëåýèåñá íá óõììåôÜó÷åéò óôç "
"äñÜóç!"
-#: ai/advdiplomacy.c:1251
+#: ai/advdiplomacy.c:1271
#, c-format
msgid ""
"*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1308,12 +1309,12 @@ msgstr[1] ""
"*%s (AI)* ÁñêåôÜ áíå÷ôÞêáìå ôïí %s. ÅðåôñåøÝ ìáò íá äéáëýóïõìå áõôüí ôïí "
"ðáèçôéêü ðïëéôéóìü. Èá êçñýîïõìå ðüëåìï óå %d ãýñïõò."
-#: ai/advdiplomacy.c:1261
+#: ai/advdiplomacy.c:1281
#, c-format
msgid "*%s (AI)* As our glorious allies, we expect your help in this war."
msgstr "*%s (AI)* "
-#: ai/advdiplomacy.c:1267
+#: ai/advdiplomacy.c:1287
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance and declare war on %s in %d turn. "
@@ -1328,7 +1329,7 @@ msgstr[1] ""
"*%s (AI)* Èá ôéìßóïõìå ôç óõììá÷ßá ìáò êáé èá êçñýîïõìå ðüëåìï óôïí %s óå %d "
"ãýñïõò. ÊñáôÞóïõ ãåñÜ - åñ÷üìáóôå!"
-#: ai/advdiplomacy.c:1276
+#: ai/advdiplomacy.c:1296
#, fuzzy, c-format
msgid ""
"*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1339,7 +1340,7 @@ msgid_plural ""
msgstr[0] "*%s (AI)* "
msgstr[1] "*%s (AI)* "
-#: ai/advdiplomacy.c:1344
+#: ai/advdiplomacy.c:1364
#, c-format
msgid ""
"*%s (AI)* Your attempt to conquer space for yourself alone betray your true "
@@ -1348,7 +1349,7 @@ msgstr ""
"*%s (AI)* Ç ðñïóðÜèåéÜ óïõ íá êáôáêôÞóåéò ìüíïò óïõ ôï äéÜóôçìá ðñïäßäïõí "
"ôéò ðñáãìáôéêÝò óïõ ðñïèÝóåéò. Ç óõììá÷ßá ìáò äåí õðÜñ÷åé ðëÝïí!"
-#: ai/advdiplomacy.c:1359
+#: ai/advdiplomacy.c:1379
#, c-format
msgid ""
"*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
@@ -1357,7 +1358,7 @@ msgstr ""
"*%s (AI)* Ç ðñïóðáèåéÜ óïõ íá êõñéáñ÷Þóåéò ìïíïìåñþò óôï äéÜóôçìá åßíáé "
"áñêïýíôùò åðéèåôéêÞ. "
-#: ai/advdiplomacy.c:1362
+#: ai/advdiplomacy.c:1382
#, c-format
msgid ""
"*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
@@ -1366,12 +1367,12 @@ msgstr ""
"*%s (AI)* Áí äåí óôáìáôÞóåéò íá êáôáóêåõÜæåéò ôï äéáóôçìüðëïéï, ßóùò "
"÷ñåéáóôåß íá ëÜâù ìÝôñá!"
-#: ai/advdiplomacy.c:1474
+#: ai/advdiplomacy.c:1494
#, c-format
msgid "*%s (AI)* Sorry, sharing vision with you is no longer safe."
msgstr "*%s (AI)* Óõãíþìç, áëëÜ ðëÝïí äåí åßíáé áóöáëÝò íá ìïéñáæüìáóôå üñáóç "
-#: ai/advdiplomacy.c:1549
+#: ai/advdiplomacy.c:1569
#, c-format
msgid ""
"*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
@@ -1380,7 +1381,7 @@ msgstr ""
"*%s (AI)* Èåñìïýò ÷áéñåôéóìïýò áîéüðéóôå óýììá÷å. Óå êáëïýìå ãéá íá "
"êáôáóôñÝøïõìå ôïí å÷èñü ìáò, %s."
-#: ai/advdiplomacy.c:1555
+#: ai/advdiplomacy.c:1575
#, c-format
msgid ""
"*%s (AI)* Greetings ally, I see you have not yet made war with our enemy, %"
@@ -1389,7 +1390,7 @@ msgstr ""
"*%s (AI)* ×áéñåôßóìáôá óýììá÷å, ÂëÝðù üôé äåí Ý÷åéò êçñýîåé ðüëåìï ìå ôïí "
"å÷èñü ìáò, %s. Ãéáôß ðñÝðåé íá óïõ õðåíèõìßóù ôéò õðïó÷Ýóåéò óïõ;"
-#: ai/advdiplomacy.c:1562
+#: ai/advdiplomacy.c:1582
#, c-format
msgid ""
"*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1400,7 +1401,7 @@ msgstr ""
"åéñçíéêÝòó÷Ýóåéò ìå ôïí èáíÜóéìï å÷èñü ìáò, %s! Áõôü åßíáé áðáñÜäåêôï. Ç "
"óõììá÷ßá ìáò äåí õðÜñ÷åé ðëÝïí!"
-#: ai/advdiplomacy.c:1592
+#: ai/advdiplomacy.c:1612
#, c-format
msgid ""
"*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
@@ -1409,13 +1410,13 @@ msgstr ""
"*%s (AI)* ÃåéÜ óïõ ößëå ìïõ, ôé èá Ýëåãåò íá ìïéñáóôïýìå Ýíáí êïéíü óôü÷ï "
"êáé íá óõììá÷Þóïõìå;"
-#: ai/advdiplomacy.c:1607
+#: ai/advdiplomacy.c:1627
#, c-format
msgid "*%s (AI)* Greetings neighbour, may we suggest more peaceful relations?"
msgstr ""
"*%s (AI)* ×áéñåôßóìáôá ãåßôïíá, Ôé èá Ýëåãåò ãéá ðïéü åéñçíéêÝò ó÷Ýóåéò;"
-#: ai/advdiplomacy.c:1622
+#: ai/advdiplomacy.c:1642
#, c-format
msgid ""
"*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
@@ -1424,7 +1425,7 @@ msgstr ""
"*%s (AI)* ÊïõñáóôÞêáìå áðü áõôÞí ôç óõíå÷Þ áéìáôïóõ÷ßá. Íá ðñïôåßíïõìå ìéá "
"äéáêïðÞ ôùí å÷èñïðñáîéþí;"
-#: ai/advdiplomacy.c:1742
+#: ai/advdiplomacy.c:1762
#, c-format
msgid ""
"*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1579,19 +1580,19 @@ msgstr ""
"Ôï óõíèçìáôéêü ðñÝðåé íá Ý÷åé ôïõëÜ÷éóôïí %d êåöáëáßá , %d áñéèìïýò, êáé "
"íá åßíáé ôïõëÜ÷éóôïí %d [ôõðþóéìïõò] ÷áñáêôÞñåò ìáêñý. ÐñïóðÜèçóå îáíÜ."
-#: server/barbarian.c:183
+#: server/barbarian.c:184
#, fuzzy, c-format
msgid "%s gain a leader by the name %s. Dangerous times may lie ahead."
msgstr ""
"Ïé âÜñâáñïé áðÝ÷ôçóáí çãÝôç ìå ôï üíïìá %s. Åðéêßíäõíïé êáéñïß ìáò "
"ðåñéìÝíïõí.."
-#: server/barbarian.c:479
+#: server/barbarian.c:480
#, c-format
msgid "Native unrest near %s led by %s."
msgstr "Áíáôáñá÷Ýò éèáãåíþí êïíôá óå %s êáèïäçãïýìåíç áðü %s "
-#: server/barbarian.c:484
+#: server/barbarian.c:485
#, c-format
msgid "Sea raiders seen near %s!"
msgstr "Åíôïðßóôçêáí èáëÜóóéïé åéóâïëåßò êïíôÜ óôï %s!"
@@ -1992,7 +1993,7 @@ msgid_plural "%s boosts research; you gain %d immediate advances."
msgstr[0] "%s åêôõíÜóóåé ôçí Ýñåõíá, êåñäßæåéò Üììåóá %d åðßôåõìá"
msgstr[1] "%s åêôõíÜóóåé ôçí Ýñåõíá, êåñäßæåéò Üììåóá %d åðéôåýìáôá"
-#: server/cityturn.c:1158 server/techtools.c:176
+#: server/cityturn.c:1158 server/techtools.c:172
#, c-format
msgid "The %s have acquired %s from %s."
msgstr "Ïé %s áðÝêôçóáí %s áðü %s."
@@ -2079,22 +2080,22 @@ msgstr ""
"Ðñïåéäïðïßçóç: ç åðéëïãÞ %s åßíáé áðáñ÷áéùìÝíç. ×ñçóéìïðïßçóå -m ãéá íá "
"åíåñãïðïéÞóåéò ôïí ìåôáåîõðçñåôçôÞ.\n"
-#: server/civserver.c:189
+#: server/civserver.c:193
#, c-format
msgid "Error: unknown option '%s'\n"
msgstr "ËÜèïò: Üãíùóôç åðéëïãÞ '%s'\n"
-#: server/civserver.c:200
+#: server/civserver.c:204
#, c-format
msgid "This is the server for %s"
msgstr "Áõôüò åßíáé ï åîõðçñåôçôÞò ãéá %s"
-#: server/civserver.c:201
+#: server/civserver.c:205
#, c-format
msgid "You can learn a lot about Freeciv at %s"
msgstr "Ìðïñåßò íá ìÜèåéò ðïëëÜ ãéá ôï Freeciv óôï %s"
-#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
+#: server/civserver.c:210 client/civclient.c:239 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -2103,119 +2104,125 @@ msgstr ""
"×ñÞóç: %s [åðéëïãÞ ...]\n"
"¸ãêõñåò åðéëïãÝò åßíáé:\n"
-#: server/civserver.c:208
+#: server/civserver.c:212
#, fuzzy
msgid ""
" -a --auth FILE\tEnable server authentication with configuration from "
"FILE.\n"
msgstr " -a --auth\t\tÅðÝôñåøå ðéóôïðïßçóç åîõðçñåôçôÞ.\n"
-#: server/civserver.c:210
+#: server/civserver.c:214
msgid " -G --Guests\t\tAllow guests to login if auth is enabled.\n"
msgstr ""
" -G --Guests\t\tÅðÝôñåøå åðéóêÝðôåò íá óõíäåèïýí áí åßíáé åíåñãïðïéçìÝíç ç "
"åðéëïãÞ auth .\n"
-#: server/civserver.c:212
+#: server/civserver.c:216
msgid " -N --Newusers\tAllow new users to login if auth is enabled.\n"
msgstr ""
" -N --Newusers\tÅðÝôñåøå óå íÝïõò ÷ñÞóôåò íá óõíäåèïýí áí åßíáé "
"åíåñãïðïéçìÝíç ç åðéëïãÞ auth .\n"
-#: server/civserver.c:215
+#: server/civserver.c:219
msgid " -b --bind ADDR\tListen for clients on ADDR\n"
msgstr "-b --bind ÄÉÅÕÈ\t¶êïõóå ãéá ðåëÜôåò óôçí äéåýèõíóç ÄÉÅÕÈ\n"
-#: server/civserver.c:217 client/civclient.c:242
+#: server/civserver.c:221 client/civclient.c:243
msgid ""
" -d, --debug NUM\tSet debug log level (0 to 4, or 4:file1,min,max:...)\n"
msgstr ""
" -d, --debug ÁÑÉÈÌ\tÈÝóå åðßðåäï áðïóöáëìÜôùóçò çìåñïëïãßïõ (0 åþò 4, Þ 4:"
"áñ÷åßï1,åëÜ÷éóôï,ìÝãéóôï:...)\n"
-#: server/civserver.c:221 client/civclient.c:246
+#: server/civserver.c:225 client/civclient.c:247
msgid " -d, --debug NUM\tSet debug log level (0 to 3)\n"
msgstr "-d, --debug ÁÑÉÈÌ\tÈÝóå åðßðåäï áðïóöáëìÜôùóçò çìåñïëßïõ (0 åþò 3)\n"
-#: server/civserver.c:223
+#: server/civserver.c:227
msgid " -f, --file FILE\tLoad saved game FILE\n"
msgstr "-f, --file ÁÑ×ÅÉÏ\tÖüñôùóå óùóìÝíï ðáé÷íßäé ÁÑ×ÅÉÏ\n"
-#: server/civserver.c:225 client/civclient.c:249 manual/civmanual.c:382
+#: server/civserver.c:229 client/civclient.c:250 manual/civmanual.c:382
msgid " -h, --help\t\tPrint a summary of the options\n"
msgstr "-h, --help\t\tÔýðùóå ìéá óýíïøç ôùí åðéëïãþí\n"
-#: server/civserver.c:226
+#: server/civserver.c:230
+#, fuzzy
+msgid " -i, --identity ADDR\tBe known as ADDR at metaserver\n"
+msgstr ""
+"-M, --Metaserver ÄÉÅÕÈ\tÈÝóå ôçí ÄÉÅÕÈ óáí äéåýèõíóç ôïõ ìåôáåîõðçñåôçôÞ\n"
+
+#: server/civserver.c:231
msgid " -l, --log FILE\tUse FILE as logfile\n"
msgstr "-l, --log ÁÑ×ÅÉÏ\t×ñçóéìïðïßçóå ÁÑ×ÅÉÏ óáí áñ÷åßï çìåñïëïãßïõ\n"
-#: server/civserver.c:227
+#: server/civserver.c:232
msgid " -m, --meta\t\tNotify metaserver and send server's info\n"
msgstr ""
"-m, --meta\t\tÅéäïðïßçóå ôïí ìåôáåîõðçñåôçôÞ êáé óôåßëå ôçí ðëçñïöïñßá ôïõ "
"åîõðçñåôçôÞ\n"
-#: server/civserver.c:229
+#: server/civserver.c:234
msgid " -M, --Metaserver ADDR\tSet ADDR as metaserver address\n"
msgstr ""
"-M, --Metaserver ÄÉÅÕÈ\tÈÝóå ôçí ÄÉÅÕÈ óáí äéåýèõíóç ôïõ ìåôáåîõðçñåôçôÞ\n"
-#: server/civserver.c:232
+#: server/civserver.c:237
msgid " -p, --port PORT\tListen for clients on port PORT\n"
msgstr " -p, --port ÈÕÑÁ\t¶êïõóå ãéá ðåëÜôåò óôç èýñá ÈÕÑÁ\n"
-#: server/civserver.c:234
+#: server/civserver.c:239
msgid " -q, --quitidle TIME\tQuit if no players for TIME seconds\n"
msgstr ""
" -q, --quitidle ×ÑÏÍÏÓ\tÔåñìÜôéóå áí äåí õðÜñ÷ïõí ðáß÷ôåò ãéá ×ÑÏÍ "
"äåõôåñüëåðôá\n"
-#: server/civserver.c:236
+#: server/civserver.c:241
msgid " -e, --exit-on-end\tWhen a game ends, exit instead of restarting\n"
msgstr ""
" -e, --exit-on-end\t¼ôáí Ýíá ðáé÷íßäé ôåëåéþíåé,ôåñìÜôéóå áíôß ãéá "
"åðáíåêêßíçóç\n"
-#: server/civserver.c:239
+#: server/civserver.c:244
msgid " -s, --saves DIR\tSave games to directory DIR\n"
msgstr " -s, --saves ÊÁÔÁË\tÓþóå ðáé÷íßäéá óôïí êáôÜëïãï ÊÁÔÁË\n"
-#: server/civserver.c:241
+#: server/civserver.c:246
msgid " -S, --Serverid ID\tSets the server id to ID\n"
msgstr ""
" -S, --Serverid ÁÍÁÃÍ\tÈÝóå ôï áíáãíùñéóôéêü ôïõ åîõðçñåôçôÞ óå ÁÍÁÃÍ\n"
-#: server/civserver.c:243
+#: server/civserver.c:248
msgid " -P, --Ppm\t\tSave ppms of the map when saving the game.\n"
msgstr " -P, --Ppm\t\tÓþóå ppms ôïõ ÷Üñôç üôáí óþæåéò ôï ðáé÷íßäé.\n"
-#: server/civserver.c:244
+#: server/civserver.c:249
msgid " -r, --read FILE\tRead startup script FILE\n"
msgstr " -r, --read ÁÑ×ÅÉÏ\tÄéÜâáóå ôï óåíÜñéï åêêßíçóçò ÁÑ×ÅÉÏ\n"
-#: server/civserver.c:246
+#: server/civserver.c:251
msgid " -R, --Ranklog FILE\tUse FILE as ranking logfile\n"
msgstr ""
" -R, --Ranklog ÁÑ×ÅÉÏ\t×ñçóéìïðïßçóå ÁÑ×ÅÉÏ óáí áñ÷åßï çìåñïëïãßï "
"êáôÜôáîçò\n"
-#: server/civserver.c:247 client/civclient.c:268 manual/civmanual.c:383
+#: server/civserver.c:252 client/civclient.c:269 manual/civmanual.c:383
msgid " -v, --version\t\tPrint the version number\n"
msgstr " -v, --version\t\tÔýðùóå ôïí áñéèìü Ýêäïóçò\n"
-#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
+#: server/civserver.c:253 client/gui-gtk-2.0/gui_main.c:354
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, fuzzy, c-format
msgid "Report bugs at %s.\n"
msgstr "ÁíÝöåñå ëÜèç óå <%s>.\n"
-#: server/commands.c:28
+#: server/commands.c:29
msgid "Start the game, or restart after loading a savegame."
msgstr ""
"¶ñ÷éóå ôï ðáé÷íßäé Þ åðáíåêêßíçóå ìåôÜ ôçí öüñôùóç åíüò óùóìÝíïõ ðáé÷íéäßïõ."
-#: server/commands.c:29
+#: server/commands.c:30
msgid ""
"This command starts the game. When starting a new game, it should be used "
"after all human players have connected, and AI players have been created (if "
@@ -2236,7 +2243,7 @@ msgstr ""
"êÜðïéï áðïôÝëåóìá."
#. TRANS: translate text between <> only
-#: server/commands.c:42
+#: server/commands.c:44
msgid ""
"help\n"
"help commands\n"
@@ -2250,11 +2257,11 @@ msgstr ""
"help <üíïìá-åíôïëÞò>\n"
"help <üíïìá-åðéëïãÞò>"
-#: server/commands.c:47
+#: server/commands.c:49
msgid "Show help about server commands and server options."
msgstr "Äåßîå âïÞèåéá ãéá åíôïëÝò åîõðçñåôçôÞ êáé åðéëïãÝò åîõðçñåôçôÞ."
-#: server/commands.c:48
+#: server/commands.c:50
msgid ""
"With no arguments gives some introductory help. With argument \"commands\" "
"or \"options\" gives respectively a list of all commands or all options. "
@@ -2271,11 +2278,11 @@ msgstr ""
"ðñïêáèïñéóìÝíåò ôéìÝò ãéá ìéá åðéëïãÞ. Ôï üñéóìá ìðïñåß íá óõíôïìåõèåß üôáí "
"äåí õðÜñ÷åé áóÜöåéá."
-#: server/commands.c:63
+#: server/commands.c:66
msgid "Show a list of players, teams, connections, or scenarios."
msgstr "Äåß÷íåé ìéá ëßóôá ðáé÷ôþí, ïìÜäùí, óõíäÝóåùí, Þ óåíáñßùí."
-#: server/commands.c:64
+#: server/commands.c:67
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 "
@@ -2285,20 +2292,20 @@ msgstr ""
"åîõðçñåôçôÝò, Þ äéáèÝóéìá óåíÜñéá. Ôï üñéóìá ìðïñåß íá óõíôïìåõèåß, êáé ç "
"ðñïêáèïñéóìÝíç ôéìÞ åßíáé 'players' áí äåí äùèåß üñéóìá."
-#: server/commands.c:70
+#: server/commands.c:74
msgid "Quit the game and shutdown the server."
msgstr "ÔåñìÜôéæåé ôï ðáé÷íßäé êáé êëåßíåé ôïí åîõðçñåôçôÞ."
#. TRANS: translate text between <> only
-#: server/commands.c:74
+#: server/commands.c:79
msgid "cut <connection-name>"
msgstr "cut <üíïìá óýíäåóçò>"
-#: server/commands.c:75
+#: server/commands.c:80
msgid "Cut a client's connection to server."
msgstr "Ôåñìáôßæåé ôçí óýíäåóç ôïõ ðåëÜôç óôïí åîõðçñåôçôÞ."
-#: server/commands.c:76
+#: server/commands.c:81
msgid ""
"Cut specified client's connection to the server, removing that client from "
"the game. If the game has not yet started that client's player is removed "
@@ -2312,7 +2319,7 @@ msgstr ""
"ðáé÷ôþí."
#. TRANS: translate text between <> only
-#: server/commands.c:83
+#: server/commands.c:89
msgid ""
"explain\n"
"explain <option-name>"
@@ -2320,11 +2327,11 @@ msgstr ""
"explain\n"
"explain <üíïìá-åðéëïãÞò>"
-#: server/commands.c:85
+#: server/commands.c:91
msgid "Explain server options."
msgstr "Åîçãåß åðéëïãÝò åîõðçñåôçôÞ."
-#: server/commands.c:86
+#: server/commands.c:92
msgid ""
"The 'explain' command gives a subset of the functionality of 'help', and is "
"included for backward compatibility. With no arguments it gives a list of "
@@ -2337,7 +2344,7 @@ msgstr ""
"óõãêåêñéìÝíç åðéëïãÞ. "
#. TRANS: translate text between <> only
-#: server/commands.c:93
+#: server/commands.c:100
msgid ""
"show\n"
"show <option-name>\n"
@@ -2347,11 +2354,11 @@ msgstr ""
"show <üíïìá-åðéëïãÞò>\n"
"show <ðñüèåìá-åðéëïãÞò>"
-#: server/commands.c:96
+#: server/commands.c:103
msgid "Show server options."
msgstr "Äåß÷íåé åðéëïãÝò åîõðçñåôçôÞ."
-#: server/commands.c:97
+#: server/commands.c:104
msgid ""
"With no arguments, shows all server options (or available options, when used "
"by clients). With an argument, show only the named option, or options with "
@@ -2361,38 +2368,39 @@ msgstr ""
"åðéëïãÝò, üôáí ÷ñçóéìïðïéåßôáé áðü ðåëÜôåò). Ìå Ýíá üñéóìá , äåß÷íåé ìüíï ôç "
"óõãêåêñéìÝíç åðéëïãÞ , ïé åðéëïãÝò ìå áõôü ôï ðñüèåìá."
-#: server/commands.c:102
+#: server/commands.c:110
msgid "wall <message>"
msgstr "wall <ìÞíõìá>"
-#: server/commands.c:103
+#: server/commands.c:111
msgid "Send message to all connections."
msgstr "ÓôÝëíåé ôï ìÞíõìá óå üëåò ôéò óõíäÝóåéò."
-#: server/commands.c:104
+#: server/commands.c:112
msgid ""
"For each connected client, pops up a window showing the message entered."
msgstr ""
"Ãéá êÜèå óõíäåäåìÝíï ðåëÜôç, åìöáíßæåé Ýíá ðáñÜèõñï ðïõ äåß÷íåé ôï "
"åéóáãþìåíï ìÞíõìá."
-#: server/commands.c:108
+#: server/commands.c:117
msgid "vote yes|no [vote number]"
msgstr "vote yes|no [øÞöïò áñéèìüò]"
-#: server/commands.c:109
+#: server/commands.c:118
msgid "Cast a vote."
msgstr "Ñß÷íåé ìéá øÞöï."
-#: server/commands.c:111
+#: server/commands.c:120
#, 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."
+"A player with basic 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."
msgstr ""
"¸íáò ðáß÷ôçò ìå åðßðåäï ðñüóâáóçò ðëçñïöïñéþí ðïõ åêäßäåé ìéá åíôïëÞ "
"åðéðÝäïõ åëÝã÷ïõ áñ÷ßæåé ìéá íåá øçöïöïñßá ãéá ôçí åíôïëÞ. Ç /vote åíôïëÞ "
@@ -2403,19 +2411,19 @@ msgstr ""
"ç èá áðïôý÷åé áììÝóùò áí ôïõëÜ÷éóôïí ïé ìéóïß øçößóïõí êáôÜ. Áí ðåñÜóåé Ýíáò "
"ãýñïò ç øçöïöïñßá ìðïñåß íá ðåñÜóåé õðÝñ áí äåí øçößóåé êáíÝíáò êáôÜ."
-#: server/commands.c:121
+#: server/commands.c:131
msgid ""
"debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
"<player> | timing | info]"
msgstr ""
-#: server/commands.c:123
+#: server/commands.c:133
msgid "Turn on or off AI debugging of given entity."
msgstr ""
"Åíåñãïðïéåß Þ áðáíåñãïðïéåß ôçí áðïóöáëìÜôùóç ôçò Ô.Í ãéá ìéá äïóìÝíç "
"ïíôüôçôá."
-#: server/commands.c:124
+#: server/commands.c:134
msgid ""
"Print AI debug information about given entity and turn continous debugging "
"output for this entity on or off."
@@ -2424,23 +2432,23 @@ msgstr ""
"åíåñãïðïéåß Þ áðåíåñãïðïéåß ôçí óõíå÷Þ åìöÜíéóç ðëçñïöïñéþí áðáóöáëìÜôùóçò "
"ãéá áõôÞ ôçí ïíôüôçôá."
-#: server/commands.c:128
+#: server/commands.c:139
msgid "set <option-name> <value>"
msgstr "set <üíïìá-åðéëïãÞò> <ôéìÞ>"
-#: server/commands.c:129
+#: server/commands.c:140
msgid "Set server option."
msgstr "ÈÝôåé åðéëïãÞ åîõðçñåôçôÞ."
-#: server/commands.c:132
+#: server/commands.c:144
msgid "team <player> [team]"
msgstr "team <ðáß÷ôçò> [ïìÜäá]"
-#: server/commands.c:133
+#: server/commands.c:145
msgid "Change, add or remove a player's team affiliation."
msgstr "ÁëëÜæåé, ðñïóèÝôåé Þ áöáéñåß ôçí ó÷Ýóç åíüò ðáß÷ôç ìå ìßá ïìÜäá."
-#: server/commands.c:134
+#: server/commands.c:146
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 "
@@ -2453,15 +2461,15 @@ msgstr ""
"üñáóç êáé ðñåóâåßåò êáé ðïëåìÜ ìáæß ãéá íá ðåôý÷åé ôçí íßêç ôçò ïìÜäáò ìå "
"êñéôÞñéï ôïí ìÝóï üñï ôùí âáèìïëïãéþí ôùí ìåëþí ôçò."
-#: server/commands.c:141
+#: server/commands.c:154
msgid "rulesetdir <directory>"
msgstr "rulesetdir <êáôÜëïãïò>"
-#: server/commands.c:142
+#: server/commands.c:155
msgid "Choose new ruleset directory or modpack."
msgstr "ÅðÝëåîå íÝï óýíïëï êáíüíùí Þ ðáêÝôï ôñïðïðïéÞóåùí."
-#: server/commands.c:143
+#: server/commands.c:156
msgid ""
"Choose new ruleset directory or modpack. Calling this\n"
" without any arguments will show you the currently selected ruleset."
@@ -2471,15 +2479,15 @@ msgstr ""
"êáíüíùí."
#. TRANS: translate text between <> only
-#: server/commands.c:149
+#: server/commands.c:163
msgid "metainfo <meta-line>"
msgstr "metainfo <ìåôÜ-ãñáììÞ>"
-#: server/commands.c:150
+#: server/commands.c:164
msgid "Set metaserver info line."
msgstr "ÈÝôåé ãñáììÞ ðëçñïöïñéþí ôïõ ìåôÜ-åîõðçñåôçôÞ."
-#: server/commands.c:151
+#: server/commands.c:165
msgid ""
"Set user defined metaserver info line. If parameter is omitted,\n"
"previously set metamessage will be removed. For most of the time\n"
@@ -2494,19 +2502,19 @@ msgstr ""
"áíôß ãéá áõôüìáôá ðáñáãþìåíá ìçíýìáôá, áí åßíáé äéáèÝóéìá."
#. TRANS: translate text between <> only
-#: server/commands.c:158
+#: server/commands.c:173
msgid "metapatch <meta-line>"
msgstr "metapatch <meta-line>"
-#: server/commands.c:159
+#: server/commands.c:174
msgid "Set metaserver patches line."
msgstr "ÈÝóå ôçí åðéäéïñèùôéêÞ ãñáììÞ ôïõ ìåôáåîõðçñåôçôÞ."
-#: server/commands.c:165
+#: server/commands.c:181
msgid "Control metaserver connection."
msgstr "¸ëåíîå ôç óýíäåóç ôïõ ìåôáåîõðçñåôçôÞ."
-#: server/commands.c:166
+#: server/commands.c:182
msgid ""
"'metaconnection ?' reports on the status of the connection to metaserver.\n"
"'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2514,33 +2522,33 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:172
+#: server/commands.c:189
msgid "metaserver <address>"
msgstr "metaserver <äéåýèõíóç>"
-#: server/commands.c:173
+#: server/commands.c:190
msgid "Set address (URL) for metaserver to report to."
msgstr "ÈÝóå äéåýèõíóç (URL) óôçí ïðïßá èá áíáöÝñåé ï ìåôáåîõðçñåôçôÞò."
#. TRANS: translate text between <> only
-#: server/commands.c:177
+#: server/commands.c:195
msgid "aitoggle <player-name>"
msgstr "aitoggle <üíïìá-ðáß÷ôç>"
-#: server/commands.c:178
+#: server/commands.c:196
msgid "Toggle AI status of player."
msgstr "ÅíáëëáãÞ êáôÜóôáóçò Ô.Í ôïõ ðáß÷ôç."
#. TRANS: translate text between [] and <> only
-#: server/commands.c:182
+#: server/commands.c:201
msgid "take [connection-name] <player-name>"
msgstr "take [ïíïìá-óýíäåóçò] <üíïìá-ðáß÷ôç>"
-#: server/commands.c:183
+#: server/commands.c:202
msgid "Take over a player's place in the game."
msgstr "ÐÜñå ôç èÝóç åíüò ðáß÷ôç óôï ðáé÷íßäé."
-#: server/commands.c:184
+#: server/commands.c:203
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 "
@@ -2555,15 +2563,15 @@ msgstr ""
"äçìéïõñãåßôáé Ýíáò êáé áíáôßèåôáé óôç óýíäåóç."
#. TRANS: translate text between [] only
-#: server/commands.c:192
+#: server/commands.c:212
msgid "observe [connection-name] [player-name]"
msgstr "observe [üíïìá-óýíäåóçò] [üíïìá-ðáß÷ôç]"
-#: server/commands.c:193
+#: server/commands.c:213
msgid "Observe a player or the whole game."
msgstr "ÐáñáôÞñçóå Ýíá ðáß÷ôç ãéá üëï ôï ðáé÷íßäé."
-#: server/commands.c:194
+#: server/commands.c:214
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 "
@@ -2578,15 +2586,15 @@ msgstr ""
"ðñïóêïëëåßôáé óå Ýíáí êáèïëéêü ðáñáôçñçôÞ."
#. TRANS: translate text between <> only
-#: server/commands.c:202
+#: server/commands.c:223
msgid "detach <connection-name>"
msgstr "detach <üíïìá-óýíäåóçò>"
-#: server/commands.c:203
+#: server/commands.c:224
msgid "detach from a player."
msgstr "áðïêüëëçóç áðü Ýíá ðáß÷ôç"
-#: server/commands.c:204
+#: server/commands.c:225
msgid ""
"Only the console and connections with cmdlevel 'hack' can force other "
"connections to detach from a player."
@@ -2595,39 +2603,39 @@ msgstr ""
"óõíäÝóåéò íá áðïêïëëçèïýí áðü Ýíáí ðáß÷ôç"
#. TRANS: translate text between <> only
-#: server/commands.c:209
+#: server/commands.c:231
msgid "create <player-name>"
msgstr "create <üíïìá-ðáß÷ôç>"
-#: server/commands.c:210
+#: server/commands.c:232
msgid "Create an AI player with a given name."
msgstr "Äçìéïõñãåß Ýíáí ðáß÷ôç ÔÍ ìå ôï äùèÝí üíïìá."
-#: server/commands.c:211
+#: server/commands.c:233
msgid ""
"The 'create' command is only available before the game has been started."
msgstr ""
"Ç åíôïëÞ 'create' (äçìéïýñãçóå) åßíáé äéáèÝóéìç ìüíï ðñéí áñ÷ßóåé ôï "
"ðáé÷íßäé."
-#: server/commands.c:215
+#: server/commands.c:238
msgid ""
"away\n"
"away"
msgstr ""
-#: server/commands.c:217
+#: server/commands.c:240
msgid "Set yourself in away mode. The AI will watch your back."
msgstr ""
"ÈÝóå ôïí åõáôü óïõ óå áðïìáêñõóìÝíï ôñüðï ðáé÷íéäéïý. Ç ÔÍ èá êáëýøåé ôç "
"èÝóç óïõ!"
-#: server/commands.c:218
+#: server/commands.c:241
msgid "The AI will govern your nation but do minimal changes."
msgstr "Ç ÔÍ èá êõâåñíÜ ôï Ýèíïò óïõ áëëÜ êÜíïíôáò ëßãåò áëëáãÝò."
#. TRANS: translate text between <> only
-#: server/commands.c:222
+#: server/commands.c:246
msgid ""
"novice\n"
"novice <player-name>"
@@ -2635,11 +2643,11 @@ msgstr ""
"novice\n"
"novice <üíïìá-ðáß÷ôç>"
-#: server/commands.c:224
+#: server/commands.c:248
msgid "Set one or all AI players to 'novice'."
msgstr "ÈÝóå Ýíáí Þ üëïõò ôïõ ðáß÷ôåò ÔÍ óå 'áñ÷Üñéïõò'."
-#: server/commands.c:225
+#: server/commands.c:249
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 "
@@ -2650,7 +2658,7 @@ msgstr ""
"üñéóìá , èÝôåé ôï åðßðåäï éêáíüôçôáò ìüíï ãéá áõôüí ôïí ðáß÷ôç. "
#. TRANS: translate text between <> only
-#: server/commands.c:231
+#: server/commands.c:256
msgid ""
"easy\n"
"easy <player-name>"
@@ -2658,11 +2666,11 @@ msgstr ""
"easy\n"
"easy <üíïìá-ðáß÷ôç>"
-#: server/commands.c:233
+#: server/commands.c:258
msgid "Set one or all AI players to 'easy'."
msgstr "ÈÝôåé Ýíáí Þ üëïõò ôïõ ðáß÷ôåò ÔÍ óå åðßðåäï éêáíïôÞôùí 'åýêïëç'"
-#: server/commands.c:234
+#: server/commands.c:259
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 "
@@ -2673,7 +2681,7 @@ msgstr ""
"üñéóìá , èÝôåé ôï åðßðåäï éêáíüôçôáò ìüíï ãéá áõôüí ôïí ðáß÷ôç. "
#. TRANS: translate text between <> only
-#: server/commands.c:240
+#: server/commands.c:266
msgid ""
"normal\n"
"normal <player-name>"
@@ -2681,11 +2689,11 @@ msgstr ""
"normal\n"
"normal <üíïìá-ðáß÷ôç>"
-#: server/commands.c:242
+#: server/commands.c:268
msgid "Set one or all AI players to 'normal'."
msgstr "ÈÝôåé Ýíáí Þ üëïõò ôïõ ðáß÷ôåò ÔÍ óå åðßðåäï éêáíïôÞôùí 'êáíïíéêÞ'"
-#: server/commands.c:243
+#: server/commands.c:269
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 "
@@ -2697,7 +2705,7 @@ msgstr ""
"ôïí ðáß÷ôç. "
#. TRANS: translate text between <> only
-#: server/commands.c:249
+#: server/commands.c:276
msgid ""
"hard\n"
"hard <player-name>"
@@ -2705,11 +2713,11 @@ msgstr ""
"hard\n"
"hard <üíïìá-ðáß÷ôç>"
-#: server/commands.c:251
+#: server/commands.c:278
msgid "Set one or all AI players to 'hard'."
msgstr "ÈÝôåé Ýíáí Þ üëïõò ôïõ ðáß÷ôåò ÔÍ óå åðßðåäï éêáíïôÞôùí 'äýóêïëç'"
-#: server/commands.c:252
+#: server/commands.c:279
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 "
@@ -2721,7 +2729,7 @@ msgstr ""
"ðáß÷ôç. "
#. TRANS: translate text between <> only
-#: server/commands.c:258
+#: server/commands.c:286
msgid ""
"experimental\n"
"experimental <player-name>"
@@ -2729,11 +2737,11 @@ msgstr ""
"experimental\n"
"experimental <üíïìá-ðáß÷ôç>"
-#: server/commands.c:260
+#: server/commands.c:288
msgid "Set one or all AI players to 'experimental'."
msgstr "ÈÝôåé Ýíáí Þ üëïõò ôïõ ðáß÷ôåò ÔÍ óå åðßðåäï éêáíïôÞôùí 'ðåéñáìáôéêÞ'"
-#: server/commands.c:261
+#: server/commands.c:289
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 "
@@ -2748,7 +2756,7 @@ msgstr ""
"åðéëïãÞ äåí Ý÷åé êáíÝíá áðïôÝëåóìá."
#. TRANS: translate text between <> only
-#: server/commands.c:269
+#: server/commands.c:298
msgid ""
"cmdlevel\n"
"cmdlevel <level>\n"
@@ -2762,17 +2770,20 @@ msgstr ""
"cmdlevel <åðßðåäï> first\n"
"cmdlevel <åðßðåäï> <üíïìá-óýíäåóçò>"
-#: server/commands.c:274
+#: server/commands.c:303
msgid "Query or set command access level access."
msgstr "ÈÝôåé Þ äéáâÜæåé åðßðåäá ðñüóâáóçò åíôïëþí."
-#: server/commands.c:275
+#: server/commands.c:304
+#, fuzzy
msgid ""
"The command access level controls which server commands are available\n"
"to users via the client chatline. The available levels are:\n"
" none - no commands\n"
-" info - informational commands only\n"
+" info - informational or observer commands only\n"
+" basic - commands available to players in the game\n"
" ctrl - commands that affect the game and users\n"
+" admin - commands that affect server operation\n"
" hack - *all* commands - dangerous!\n"
"With no arguments, the current command access levels are reported.\n"
"With a single argument, the level is set for all existing connections,\n"
@@ -2809,21 +2820,21 @@ msgstr ""
"üíïìá. Áò óçìåéùèåß üôé ç åíôïëÞ ðÝñíåé ðëåüí ïíüìáôá óõíäÝóåùíü÷é ïíüìáôá "
"ðáé÷ôþí. "
-#: server/commands.c:296
+#: server/commands.c:328
msgid "If there is none, become the game organizer with increased permissions."
msgstr ""
"Áí äåí õðÜñ÷å êáíÝíáò, ãßíå ï ïñãáíùôÞò ôïõ ðáé÷íéäßïõ ìå áõîçìÝíåò Üäåéåò."
#. TRANS: translate text between <> only
-#: server/commands.c:301
+#: server/commands.c:334
msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
msgstr "timeoutincrease <ãýñïò> <áýîçóç-ãýñïõ> <ôéìÞ> <ðïëëáðëáóéáóôÞò-ôéìÞò>"
-#: server/commands.c:302
+#: server/commands.c:335
msgid "See \"help timeoutincrease\"."
msgstr "Äåò \"help timeoutincrease\"."
-#: server/commands.c:303
+#: server/commands.c:336
msgid ""
"Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
"<turn> and multiply <value> by <valuemult>. Use this command in concert "
@@ -2835,41 +2846,60 @@ msgstr ""
"\"timeout\". ÐñïêáèïñéóìÝíåò ôéìÝò: 0 0 0 1"
#. TRANS: translate text between <> only
-#: server/commands.c:309
+#: server/commands.c:343
+msgid ""
+"cancelvote\n"
+"cancelvote <vote number>\n"
+"cancelvote all\n"
+msgstr ""
+
+#: server/commands.c:346
+msgid "Cancel a running vote.\n"
+msgstr ""
+
+#: server/commands.c:347
+msgid ""
+"With no arguments this command removes your own vote. If you have an admin "
+"access level, you can cancel any vote by vote number, or all votes with the "
+"'all' argument."
+msgstr ""
+
+#. TRANS: translate text between <> only
+#: server/commands.c:354
#, fuzzy
msgid "endgame"
msgstr "Ðñéí ôï ðáé÷íßäé"
-#: server/commands.c:310
+#: server/commands.c:355
msgid "End the game immediately in a draw."
msgstr "ÔåñìÜôéóå ôï ðáé÷íßäé Üììåóá ìå éóïðáëßá."
#. TRANS: translate text between <> only
-#: server/commands.c:314
+#: server/commands.c:360
#, fuzzy
msgid "surrender"
msgstr "ÓöåôåñéóôÞò"
-#: server/commands.c:315
+#: server/commands.c:361
msgid "Concede the game."
msgstr ""
-#: server/commands.c:316
+#: server/commands.c:362
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:322
+#: server/commands.c:369
msgid "remove <player-name>"
msgstr "remove <üíïìá-ðáß÷ôç>"
-#: server/commands.c:323
+#: server/commands.c:370
msgid "Fully remove player from game."
msgstr "Áöáßñåóå ðëÞñùò ôïí ðáß÷ôç áðü ôï ðáé÷íßäé."
-#: server/commands.c:324
+#: server/commands.c:371
msgid ""
"This *completely* removes a player from the game, including all cities and "
"units etc. Use with care!"
@@ -2879,7 +2909,7 @@ msgstr ""
"×ñçóéìïðïéÞóå ôçí åíôïëÞ ìå ðñïóï÷Þ."
#. TRANS: translate text between <> only
-#: server/commands.c:329
+#: server/commands.c:377
msgid ""
"save\n"
"save <file-name>"
@@ -2887,11 +2917,11 @@ msgstr ""
"save\n"
"save <üíïìá-áñ÷åßïõ>"
-#: server/commands.c:331
+#: server/commands.c:379
msgid "Save game to file."
msgstr "Óþóéìï ôïõ ðáé÷íéäßïõ óå áñ÷åßï."
-#: server/commands.c:332
+#: server/commands.c:380
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"
@@ -2909,7 +2939,7 @@ msgstr ""
"êáé ÷ñçóéìïðïßçóå ôçí åíôïëÞ 'start' üôáí óõíäåèïýí îáíÜ ïé ðáß÷ôåò."
#. TRANS: translate text between <> only
-#: server/commands.c:341
+#: server/commands.c:390
msgid ""
"load\n"
"load <file-name>"
@@ -2917,11 +2947,11 @@ msgstr ""
"load\n"
"load <üíïìá-áñ÷åßïõ>"
-#: server/commands.c:343
+#: server/commands.c:392
msgid "Load game from file."
msgstr "Öüñôùóå ðáé÷íßäé áðü áñ÷åßï."
-#: server/commands.c:344
+#: server/commands.c:393
msgid ""
"Load a game from <file-name>. Any current data including players, rulesets "
"and server options are lost.\n"
@@ -2931,116 +2961,116 @@ msgstr ""
"÷áèïýí. \n"
#. TRANS: translate text between <> only
-#: server/commands.c:349
+#: server/commands.c:399
msgid "read <file-name>"
msgstr "read <üíïìá-áñ÷åßïõ>"
-#: server/commands.c:350
+#: server/commands.c:400
msgid "Process server commands from file."
msgstr "ÅðåîåñãÜóïõ åðéëïãÝò åîõðçñåôçôÞ áðü áñ÷åßï."
#. TRANS: translate text between <> only
-#: server/commands.c:354
+#: server/commands.c:405
msgid "write <file-name>"
msgstr "write <üíïìá-áñ÷åßïõ>"
-#: server/commands.c:355
+#: server/commands.c:406
msgid "Write current settings as server commands to file."
msgstr "ÃñÜøå ôñÝ÷ïõóåò ñõèìßóåéò óáí åíôïëÝò åîõðçñåôçôÞ óå áñ÷åßï."
-#: server/commands.c:359
+#: server/commands.c:411
msgid "Switch server output between 'RFC-style' and normal style."
msgstr "ÅíáëëáãÞ åîüäïõ åîõðçñåôçôÞ áíÜìåóá óå óôõë RFC êáé êáíïíéêü óôõë."
-#: server/commands.c:363
+#: server/commands.c:416
msgid "Simply returns the id of the server."
msgstr "ÁðëÜ åðÝóôñåøå ôï id ôïõ åîõðçñåôçôÞ."
-#: server/connecthand.c:85
+#: server/connecthand.c:109
#, c-format
msgid "Welcome to the %s Server running at %s port %d."
msgstr "Êáëþò Þñèåò óôïí %s åîõðçñåôçôÞ ðïõ ôñÝ÷åé óôï %s óôç èýñá %d."
-#: server/connecthand.c:89
+#: server/connecthand.c:113
#, c-format
msgid "Welcome to the %s Server at port %d."
msgstr "Êáëþò Þñèåò óôïí %s åîõðçñåôçôÞ óôÞ èýñá %d."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:97
+#: server/connecthand.c:121
#, fuzzy, c-format
msgid "(%d) %s: connected [%s]"
msgstr "%s óõíäÝèçêå áðü %s."
-#: server/connecthand.c:104
+#: server/connecthand.c:128
#, c-format
msgid "Server: %s has connected from %s."
msgstr "ÅîõðçñåôçôÞò: %s óõíäÝèçêå áðü %s."
-#: server/connecthand.c:145
+#: server/connecthand.c:175
msgid "Couldn't attach your connection to new player."
msgstr "Äåí ìðïñåß íá åöáñìüóïõìå ôç óýíäåóÞ óïõ óå íÝï ðáß÷ôç."
-#: server/connecthand.c:165
+#: server/connecthand.c:199
#, c-format
msgid "You are logged in as '%s' connected to no player."
msgstr "¸÷åéò ìðåé óáí '%s' óõíäåäåìÝíïò ìå êáíÝíá ðáß÷ôç."
-#: server/connecthand.c:169
+#: server/connecthand.c:203
#, c-format
msgid "You are logged in as '%s' connected to an anonymous player."
msgstr ""
-#: server/connecthand.c:174
+#: server/connecthand.c:208
#, c-format
msgid "You are logged in as '%s' connected to %s."
msgstr ""
-#: server/connecthand.c:187
+#: server/connecthand.c:221
#, c-format
msgid "Turn-blocking game play: waiting on %s to finish turn..."
msgstr ""
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:240
+#: server/connecthand.c:274
#, c-format
msgid "(%d) %s: connection request [%s]"
msgstr ""
-#: server/connecthand.c:266
+#: server/connecthand.c:300
msgid "The client is missing a capability that this server needs."
msgstr ""
-#: server/connecthand.c:268 server/connecthand.c:279
+#: server/connecthand.c:302 server/connecthand.c:313
#, c-format
msgid "(%d) %s rejected: mismatched capabilities!"
msgstr ""
-#: server/connecthand.c:277
+#: server/connecthand.c:311
msgid "This server is missing a capability that the client needs."
msgstr ""
-#: server/connecthand.c:290
+#: server/connecthand.c:324
msgid "The username is invalid!"
msgstr ""
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:292
+#: server/connecthand.c:326
#, c-format
msgid "(%d) %s rejected: invalid username [%s]"
msgstr ""
-#: server/connecthand.c:303
+#: server/connecthand.c:337
msgid "Your username is already connected!"
msgstr ""
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:305
+#: server/connecthand.c:339
#, c-format
msgid "(%d) %s rejected: duplicate username [%s]"
msgstr ""
-#: server/connecthand.c:335 server/connecthand.c:344
+#: server/connecthand.c:369 server/connecthand.c:378
#, c-format
msgid "Lost connection: %s."
msgstr ""
@@ -3057,110 +3087,110 @@ msgstr ""
msgid "For introductory help, type 'help'."
msgstr ""
-#: server/diplhand.c:164
+#: server/diplhand.c:167
#, c-format
msgid "The %s can't accept %s."
msgstr ""
-#: server/diplhand.c:176
+#: server/diplhand.c:179
#, c-format
msgid "You don't have tech %s, you can't accept treaty."
msgstr ""
-#: server/diplhand.c:185
+#: server/diplhand.c:188
msgid "City you are trying to give no longer exists, you can't accept treaty."
msgstr ""
-#: server/diplhand.c:191
+#: server/diplhand.c:194
#, c-format
msgid "You are not owner of %s, you can't accept treaty."
msgstr ""
-#: server/diplhand.c:197 server/diplhand.c:301
+#: server/diplhand.c:200 server/diplhand.c:304
#, c-format
msgid "Your capital (%s) is requested, you can't accept treaty."
msgstr ""
-#: server/diplhand.c:224
+#: server/diplhand.c:227
msgid "You don't have enough gold, you can't accept treaty."
msgstr ""
-#: server/diplhand.c:256 server/diplhand.c:261
+#: server/diplhand.c:259 server/diplhand.c:264
#, c-format
msgid "A treaty containing %d clause was agreed upon."
msgid_plural "A treaty containing %d clauses was agreed upon."
msgstr[0] ""
msgstr[1] ""
-#: server/diplhand.c:277 server/diplhand.c:281
+#: server/diplhand.c:280 server/diplhand.c:284
#, c-format
msgid "One of the cities the %s are giving away is destroyed! Treaty canceled!"
msgstr ""
-#: server/diplhand.c:288 server/diplhand.c:293
+#: server/diplhand.c:291 server/diplhand.c:296
#, c-format
msgid "The %s no longer control %s! Treaty canceled!"
msgstr ""
-#: server/diplhand.c:331 server/diplhand.c:335
+#: server/diplhand.c:334 server/diplhand.c:338
#, c-format
msgid "The %s don't have the promised amount of gold! Treaty canceled!"
msgstr ""
-#: server/diplhand.c:364
+#: server/diplhand.c:367
#, fuzzy, c-format
msgid "You gave an embassy to %s."
msgstr "ºäñõóåò ôï %s. "
-#: server/diplhand.c:367
+#: server/diplhand.c:370
#, c-format
msgid "%s allowed you to create an embassy!"
msgstr ""
-#: server/diplhand.c:383
+#: server/diplhand.c:386
#, c-format
msgid "You are taught the knowledge of %s."
msgstr ""
-#: server/diplhand.c:387
+#: server/diplhand.c:390
#, c-format
msgid "The %s have acquired %s from the %s."
msgstr ""
-#: server/diplhand.c:402
+#: server/diplhand.c:405
#, c-format
msgid "You get %d gold."
msgstr ""
#. TRANS: ... Polish worldmap.
-#: server/diplhand.c:410
+#: server/diplhand.c:413
#, c-format
msgid "You receive the %s worldmap."
msgstr ""
#. TRANS: ... Polish seamap.
-#: server/diplhand.c:419
+#: server/diplhand.c:422
#, c-format
msgid "You receive the %s seamap."
msgstr ""
-#: server/diplhand.c:436
+#: server/diplhand.c:439
#, c-format
msgid "You receive city of %s from %s."
msgstr ""
-#: server/diplhand.c:441
+#: server/diplhand.c:444
#, c-format
msgid "You give city of %s to %s."
msgstr ""
-#: server/diplhand.c:454 server/diplhand.c:457
+#: server/diplhand.c:457 server/diplhand.c:460
#, c-format
msgid "You agree on a cease-fire with %s."
msgstr ""
#. TRANS: ... the Poles ... Polish territory.
-#: server/diplhand.c:476 server/diplhand.c:488
+#: server/diplhand.c:479 server/diplhand.c:491
#, c-format
msgid ""
"You agree on an armistice with the %s. In %d turn, it will become a peace "
@@ -3171,32 +3201,32 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: server/diplhand.c:512 server/diplhand.c:515
+#: server/diplhand.c:515 server/diplhand.c:518
#, c-format
msgid "You agree on an alliance with %s."
msgstr ""
-#: server/diplhand.c:524
+#: server/diplhand.c:527
#, c-format
msgid "You give shared vision to %s."
msgstr ""
-#: server/diplhand.c:527
+#: server/diplhand.c:530
#, c-format
msgid "%s gives you shared vision."
msgstr ""
-#: server/diplhand.c:663
+#: server/diplhand.c:666
#, c-format
msgid "%s canceled the meeting!"
msgstr ""
-#: server/diplhand.c:670
+#: server/diplhand.c:673
#, c-format
msgid "Meeting with %s canceled."
msgstr ""
-#: server/diplhand.c:712
+#: server/diplhand.c:715
msgid "Your diplomatic envoy was decapitated!"
msgstr ""
@@ -3379,80 +3409,80 @@ msgid "The %s destroyed the %s in %s."
msgstr ""
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1091
+#: server/diplomats.c:1097
#, fuzzy, c-format
msgid "An enemy %s has been eliminated by your %s."
msgstr "%s êáôáóôñÜöçêå áðü %s "
#. TRANS: <unit> ... <city> ... <diplomat>
-#: server/diplomats.c:1098
+#: server/diplomats.c:1104
#, c-format
msgid "Your %s has been eliminated defending %s against a %s."
msgstr ""
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1106
+#: server/diplomats.c:1112
#, c-format
msgid "Your %s has been eliminated defending against a %s."
msgstr ""
-#: server/diplomats.c:1119
+#: server/diplomats.c:1125
#, c-format
msgid "Your %s was eliminated by a defending %s."
msgstr ""
-#: server/diplomats.c:1127
+#: server/diplomats.c:1133
#, c-format
msgid "Eliminated %s %s while infiltrating %s."
msgstr ""
-#: server/diplomats.c:1134
+#: server/diplomats.c:1140
#, c-format
msgid "Eliminated %s %s while infiltrating our troops."
msgstr ""
-#: server/diplomats.c:1185
+#: server/diplomats.c:1191
#, c-format
msgid ""
"Your %s has successfully completed the mission and returned unharmed to %s."
msgstr ""
-#: server/diplomats.c:1204
+#: server/diplomats.c:1210
#, c-format
msgid "Your %s was captured after completing the mission in %s."
msgstr ""
-#: server/diplomats.c:1210
+#: server/diplomats.c:1216
#, c-format
msgid "Your %s was captured after completing the mission."
msgstr ""
-#: server/diplomats.c:1242
+#: server/diplomats.c:1248
#, c-format
msgid "You have caused an incident while bribing the %s %s."
msgstr ""
-#: server/diplomats.c:1247
+#: server/diplomats.c:1253
#, c-format
msgid "%s has caused an incident while bribing your %s."
msgstr ""
-#: server/diplomats.c:1254
+#: server/diplomats.c:1260
#, c-format
msgid "You have caused an incident while attempting to steal tech from %s."
msgstr ""
-#: server/diplomats.c:1258
+#: server/diplomats.c:1264
#, c-format
msgid "%s has caused an incident while attempting to steal tech from you."
msgstr ""
-#: server/diplomats.c:1264
+#: server/diplomats.c:1270
#, c-format
msgid "You have caused an incident while inciting a revolt in %s."
msgstr ""
-#: server/diplomats.c:1268
+#: server/diplomats.c:1274
#, c-format
msgid "%s have caused an incident while inciting a revolt in %s."
msgstr ""
@@ -3559,12 +3589,12 @@ msgid ""
" Workers spontaneously gather and upgrade all cities with railroads."
msgstr ""
-#: server/maphand.c:1418
+#: server/maphand.c:1425
#, c-format
msgid "Moved your %s due to changing terrain."
msgstr ""
-#: server/maphand.c:1436
+#: server/maphand.c:1443
#, c-format
msgid "Disbanded your %s due to changing terrain."
msgstr ""
@@ -3573,7 +3603,7 @@ msgstr ""
msgid "Not reporting to the metaserver in this game."
msgstr ""
-#: server/meta.c:430
+#: server/meta.c:432
#, c-format
msgid "Metaserver: bad address: [%s:%d]."
msgstr ""
@@ -3704,26 +3734,26 @@ msgstr ""
"Ï ößëïò %s ôçò ïìÜäáò óïõ êÞñõîå ðüëåìï óôïí %s. Õðï÷ñåþíåóáé íá áêõñþóåéò "
"óõììá÷ßá ìå ôïí %s."
-#: server/plrhand.c:1103
+#: server/plrhand.c:1115
#, c-format
msgid "Removing player %s."
msgstr "Áðïìáêñýíåôáé ï ðáß÷ôçò %s."
-#: server/plrhand.c:1105
+#: server/plrhand.c:1117
msgid "You've been removed from the game!"
msgstr "Áðïìáêñýíèçêåò áðü ôï ðáé÷íßäé!"
-#: server/plrhand.c:1108
+#: server/plrhand.c:1120
#, c-format
msgid "%s has been removed from the game."
msgstr "%s áðïìáêñýíèçêå áðü ôï ðáé÷íßäé."
-#: server/plrhand.c:1153 server/plrhand.c:1158
+#: server/plrhand.c:1167 server/plrhand.c:1172
#, c-format
msgid "You have made contact with the %s, ruled by %s."
msgstr "¸êáíåò åðáöÞ ìå ôïõò %s ðïõ êõâåñíþíôáé áðü ôïí %s "
-#: server/plrhand.c:1178
+#: server/plrhand.c:1192
#, c-format
msgid ""
"%s and %s meet and go to instant war. You cancel your alliance with both."
@@ -3731,17 +3761,17 @@ msgstr ""
"%s êáé %s óõíáíôÞèçêáí êáé ðÜíå óå Üììåóï ðüëåìï. Áêõñþíåéò ôç óõììá÷ßá óïõ "
"êáé ìå ôïõò äýï."
-#: server/plrhand.c:1656
+#: server/plrhand.c:1670
#, c-format
msgid "Could not throw %s into civil war - too many players"
msgstr "Äåí ìðïñþ íá ðñïêáëÝóù åìöýëéï ðüëåìï óôïí %s - ðïëý ðáß÷ôåò"
-#: server/plrhand.c:1663
+#: server/plrhand.c:1677
#, fuzzy, c-format
msgid "Could not throw %s into civil war - no available nations"
msgstr "Äåí ìðïñþ íá ðñïêáëÝóù åìöýëéï ðüëåìï óôïí %s - ðïëý ðáß÷ôåò"
-#: server/plrhand.c:1686
+#: server/plrhand.c:1700
#, fuzzy, c-format
msgid ""
"Your nation is thrust into civil war! %s is declared the leader of the rebel "
@@ -3750,12 +3780,12 @@ msgstr ""
"Óôï Ýèíïò óïõ îÝóðáóå åìöýëéïò ðüëåìïò, o %s áíáêõñçñß÷ôçêå çãÝôçò ôùí "
"åðáíáóôáôçìÝíùí êñáôþí."
-#: server/plrhand.c:1707
+#: server/plrhand.c:1721
#, fuzzy, c-format
msgid "%s declares allegiance to %s."
msgstr "Ï %s äçëþíåé ðßóôç óôïí %s"
-#: server/plrhand.c:1722
+#: server/plrhand.c:1736
#, fuzzy, c-format
msgid ""
"Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3959,67 +3989,67 @@ msgstr ""
msgid "Wonders of the World"
msgstr "Èáýìáôá ôïõ Êüóìïõ"
-#: server/report.c:547
+#: server/report.c:552
msgid " sq. mi."
msgstr ""
-#: server/report.c:557
+#: server/report.c:562
msgid " M tons"
msgstr ""
-#: server/report.c:562
+#: server/report.c:567
msgid " M goods"
msgstr ""
-#: server/report.c:567
+#: server/report.c:572
msgid " bulbs"
msgstr " ãëüìðïé"
-#: server/report.c:572
+#: server/report.c:577
msgid " month"
msgid_plural " months"
msgstr[0] " ìÞíáò"
msgstr[1] " ìÞíåò"
-#: server/report.c:577
+#: server/report.c:582
msgid " ton"
msgid_plural " tons"
msgstr[0] "ôüíïò"
msgstr[1] "ôüíïé"
-#: server/report.c:591
+#: server/report.c:596
msgid "st"
msgstr "ïò"
-#: server/report.c:593
+#: server/report.c:598
msgid "nd"
msgstr "ïò"
-#: server/report.c:595
+#: server/report.c:600
msgid "rd"
msgstr "ïò"
-#: server/report.c:597
+#: server/report.c:602
msgid "th"
msgstr "ïò"
-#: server/report.c:700
+#: server/report.c:705
msgid "Demography string contains invalid characters. Try \"help demography\"."
msgstr ""
"Ôï äçìïãñáöéêü áëöáñéèìçôéêü ðåñéÝ÷åé Üêõñïõò ÷áñáêôÞñåò. Äþóå åíôïëÞ \"help "
"demography\"."
-#: server/report.c:743 server/report.c:768
+#: server/report.c:748 server/report.c:773
msgid "Demographics Report:"
msgstr "ÄçìïãñáöéêÞ ÁíáöïñÜ:"
-#: server/report.c:744
+#: server/report.c:749
msgid "Sorry, the Demographics report is unavailable."
msgstr "Óõãíþìç, áëëÜ ç ÄçìïãñáöéêÞ áíáöïñÜ äåí åßíáé äéáèÝóéìç"
#. TRANS: <nation adjective> <government name> (<year>).
#. * E.g. "Polish Despotism (200 AD)".
-#: server/report.c:750
+#: server/report.c:755
#, fuzzy, c-format
msgid "%s %s (%s)"
msgstr "Ðüëç: %s (%s)"
@@ -4030,11 +4060,11 @@ msgstr "
msgid "Could not find a readable \"%s.%s\" ruleset file."
msgstr ""
-#: server/ruleset.c:2356
+#: server/ruleset.c:2366
msgid "No barbarian nation in rulesets, at least one required!"
msgstr ""
-#: server/ruleset.c:3166
+#: server/ruleset.c:3178
msgid "Loading rulesets"
msgstr ""
@@ -4046,17 +4076,17 @@ msgid ""
"risk."
msgstr ""
-#: server/savegame.c:3588
+#: server/savegame.c:3587
msgid "Saved game is too old, at least version 1.9.0 required."
msgstr ""
#. TRANS: Fatal error message.
-#: server/savegame.c:3815
+#: server/savegame.c:3817
msgid ""
"Saved game uses the \"classic\" terrain ruleset, and is no longer supported."
msgstr ""
-#: server/savegame.c:3824
+#: server/savegame.c:3826
#, c-format
msgid ""
"Warning: Different rulesetdirs ('%s' and '%s') are no longer supported. "
@@ -4064,7 +4094,7 @@ msgid ""
msgstr ""
#. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4051
+#: server/savegame.c:4055
#, c-format
msgid "%s had invalid nation; changing to %s."
msgstr ""
@@ -4097,7 +4127,7 @@ msgstr "
msgid "Networking"
msgstr "Äéêôýïõ"
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:734
#: client/gui-win32/dialogs.c:532
msgid "All"
msgstr "¼ëá"
@@ -5350,11 +5380,11 @@ msgstr ""
"\"civscore.log\" êÜèå ãýñï. ÁõôÜ ôá óôáôéóôéêÜ ìðïñïýí íá ÷ñçóéìïðïéçèïýí "
"ãéá ôç äçìéïõñãßá ãñáöçìÜôùí óôï ôÝëïò ôïõ ðáé÷íéäßïõ."
-#: server/sernet.c:150
+#: server/sernet.c:151
msgid "Server cannot read standard input. Ignoring input."
msgstr ""
-#: server/sernet.c:929
+#: server/sernet.c:933
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr ""
@@ -5427,46 +5457,46 @@ msgstr ""
msgid "Without guidance from the capital, the %s spaceship is lost!"
msgstr ""
-#: server/srv_main.c:240
+#: server/srv_main.c:242
msgid "Game ended in a draw as end year exceeded"
msgstr ""
-#: server/srv_main.c:274
+#: server/srv_main.c:276
#, c-format
msgid "The %s spaceship has arrived at Alpha Centauri."
msgstr ""
-#: server/srv_main.c:287 server/srv_main.c:322
+#: server/srv_main.c:289 server/srv_main.c:324
#, c-format
msgid "Team victory to %s"
msgstr ""
-#: server/srv_main.c:297 server/srv_main.c:338
+#: server/srv_main.c:299 server/srv_main.c:340
#, c-format
msgid "Game ended in victory for %s"
msgstr ""
-#: server/srv_main.c:345
+#: server/srv_main.c:347
msgid "Game ended in a draw"
msgstr ""
-#: server/srv_main.c:461 server/srv_main.c:472
+#: server/srv_main.c:465 server/srv_main.c:476
#, c-format
msgid "Your %s was disbanded in accordance with your peace treaty with the %s."
msgstr ""
-#: server/srv_main.c:512 server/srv_main.c:516
+#: server/srv_main.c:516 server/srv_main.c:520
#, c-format
msgid ""
"Concerned citizens point out that the cease-fire with %s will run out soon."
msgstr ""
-#: server/srv_main.c:521 server/srv_main.c:525
+#: server/srv_main.c:525 server/srv_main.c:529
#, c-format
msgid "The cease-fire with %s has run out. You are now at war with the %s."
msgstr ""
-#: server/srv_main.c:542
+#: server/srv_main.c:546
#, fuzzy, c-format
msgid ""
"Ceasefire between %s and %s has run out. They are at war. You cancel your "
@@ -5475,781 +5505,834 @@ msgstr ""
"Ç êáôÜðáõóç ðõñüò ìåôáîý %s êáé %s Ý÷åé ëÞîåé. Åßíáé óå ðüëåìï. Áêõñþíåéò "
"óõììá÷ßá ìå %s. "
-#: server/srv_main.c:961
+#: server/srv_main.c:997
#, c-format
msgid "Failed saving game as %s"
msgstr "Áðïôõ÷ßá áðïèÞêåõóçò ðáé÷íéäßïõ óáí %s"
-#: server/srv_main.c:963
+#: server/srv_main.c:999
#, c-format
msgid "Game saved as %s"
msgstr "Ôï ðáé÷íßäé óþèçêå óáí %s"
-#: server/srv_main.c:994
+#: server/srv_main.c:1030
msgid "The game is already running."
msgstr "Ôï ðáé÷íßäé ôñÝ÷åé Þäç."
-#: server/srv_main.c:1002
+#: server/srv_main.c:1038
#, c-format
msgid "%s lost control cmdlevel on game start. Use voting from now on."
msgstr ""
"%s Ý÷áóå Ýëåã÷ï cmdlevel êáôÜ ôçí åêêßíçóç ôïõ ðáé÷íéäßïõ. ×ñçóéìïðïßçóå "
"øçöïöïñßá áðü äþ êáé ðÝñá."
-#: server/srv_main.c:1009
+#: server/srv_main.c:1045
msgid "Starting game."
msgstr "Áñ÷ßæåé ôï ðáé÷íßäé. "
-#: server/srv_main.c:1071
+#: server/srv_main.c:1112
#, c-format
msgid "request for unknown report (type %d)"
msgstr "áßôçóç ãéá áãíþóôç áíáöïñÜ (ôýðïõ %d)"
-#: server/srv_main.c:1136
+#: server/srv_main.c:1177
#, c-format
msgid "Warning: rejecting old client %s"
msgstr "Ðñïåéäïðïßçóç: áðïññßðôåôáé ï ðáëéüò ðåëÜôçò %s"
-#: server/srv_main.c:1238
+#: server/srv_main.c:1279
#, c-format
msgid "Got a packet of type %d from a dead or observer player"
msgstr "¸ëáâá ðáêÝôï ôýðïõ %d áðü íåêñü Þ ðáñáêïëïõèçôÝï ðáß÷ôç"
-#: server/srv_main.c:1338
+#: server/srv_main.c:1381
msgid "Please choose a non-blank name."
msgstr "[áñáêáëþ åðéëÝîôå Ýíá ìç êåíü üíïìá"
-#: server/srv_main.c:1354
+#: server/srv_main.c:1397
msgid "That nation is already in use."
msgstr "Áõôü ôï Ýèíïò ÷ñçóéìïðïéåßôáé Þäç."
-#: server/srv_main.c:1370
+#: server/srv_main.c:1413
#, c-format
msgid "Another player already has the name '%s'. Please choose another name."
msgstr "¶ëëïò ðáß÷ôçò Ý÷åé ôï üíïìá '%s'.Ðáñáêáëþ åðéëÝîôå Üëëï üíïìá."
-#: server/srv_main.c:1391
+#: server/srv_main.c:1434
msgid "Please choose a name containing only ASCII characters."
msgstr "Ðáñáêáëþ åðéëÝîôå Ýíá üíïìá ðïõ íá ðåñéÝ÷åé ìüíï ASCII ÷áñáêôÞñåò."
-#: server/srv_main.c:1490
+#: server/srv_main.c:1533
#, c-format
msgid "%s nation is not available in this scenario."
msgstr "ôï %s Ýèíïò äåí åßíáé äéáèÝóéìï óå áõôü ôï óåíÜñéï."
-#: server/srv_main.c:1496
+#: server/srv_main.c:1539
#, c-format
msgid "%s nation is already in use."
msgstr "ôï %s Ýèíïò ÷ñçóéìïðïéåßôáé Þäç."
-#: server/srv_main.c:1514
+#: server/srv_main.c:1557
#, c-format
msgid "%s is the %s ruler %s."
msgstr "%s åßíáé ï %s çãÝôçò %s"
-#: server/srv_main.c:1570
+#: server/srv_main.c:1613
#, c-format
msgid "Waiting to start game: %d out of %d players are ready to start."
msgstr ""
"ÐåñéìÝíïíôáò íá áñ÷ßóåé ôï ðáé÷íßäé: %d áðü ôïõò %d ðáß÷ôåò åßíáé Ýôïéìïé íá "
"áñ÷ßóïõí. "
-#: server/srv_main.c:1614 server/srv_main.c:1618
+#: server/srv_main.c:1657 server/srv_main.c:1661
#, c-format
msgid "%s has been added as %s level AI-controlled player."
msgstr "%s ðñïóôÝèçêå óáí %s åðéðÝäïõ ðáß÷ôçò åëåã÷üìåíïò áðü ÔÍ."
-#: server/srv_main.c:1760
+#: server/srv_main.c:1803
#, c-format
msgid "Player %d"
msgstr "Ðáß÷ôçò %d"
-#: server/srv_main.c:1771 server/srv_main.c:1777
+#: server/srv_main.c:1814 server/srv_main.c:1820
#, c-format
msgid "%s rules the %s."
msgstr "%s êõâåñíÜåé ôïõò %s."
-#: server/srv_main.c:1942
+#: server/srv_main.c:1985
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
msgstr ""
-#: server/srv_main.c:1993
+#: server/srv_main.c:2037
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr ""
-#: server/srv_main.c:2024
+#: server/srv_main.c:2069
msgid "The game is over..."
msgstr "Ôï ðáé÷íßäé ôåëåßùóå..."
-#: server/srv_main.c:2237
+#: server/srv_main.c:2286
msgid "Now accepting new client connections."
msgstr "Ôþñá áðïäÝ÷ïìáé óõíäÝóåéò ðåëÜôç."
-#: server/stdinhand.c:246
-#, c-format
-msgid "Vote \"%s\" is passed %d to %d with %d abstentions."
-msgstr ""
-
-#: server/stdinhand.c:253
-#, c-format
-msgid "Vote \"%s\" failed with %d against, %d for and %d abstentions."
-msgstr ""
-
#. TRANS: ambiguous command
-#: server/stdinhand.c:365
+#: server/stdinhand.c:284
msgid "(ambiguous)"
msgstr ""
#. TRANS: unrecognized command
#. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:416
+#: server/stdinhand.c:287 client/citydlg_common.c:419
#: 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 ""
-#: server/stdinhand.c:458
+#: server/stdinhand.c:377
msgid "Name is empty, so cannot be a player."
msgstr ""
-#: server/stdinhand.c:462
+#: server/stdinhand.c:381
msgid "Name is too long, so cannot be a player."
msgstr ""
-#: server/stdinhand.c:466
+#: server/stdinhand.c:385
#, c-format
msgid "Player name prefix '%s' is ambiguous."
msgstr ""
-#: server/stdinhand.c:470
+#: server/stdinhand.c:389
#, c-format
msgid "No player by the name of '%s'."
msgstr ""
-#: server/stdinhand.c:474 server/stdinhand.c:509
+#: server/stdinhand.c:393 server/stdinhand.c:428
#, c-format
msgid "Unexpected match_result %d (%s) for '%s'."
msgstr ""
-#: server/stdinhand.c:493
+#: server/stdinhand.c:412
msgid "Name is empty, so cannot be a connection."
msgstr ""
-#: server/stdinhand.c:497
+#: server/stdinhand.c:416
msgid "Name is too long, so cannot be a connection."
msgstr ""
-#: server/stdinhand.c:501
+#: server/stdinhand.c:420
#, c-format
msgid "Connection name prefix '%s' is ambiguous."
msgstr ""
-#: server/stdinhand.c:505
+#: server/stdinhand.c:424
#, c-format
msgid "No connection by the name of '%s'."
msgstr ""
-#: server/stdinhand.c:525
+#: server/stdinhand.c:444
#, c-format
msgid "Open metaserver connection to [%s]."
msgstr ""
-#: server/stdinhand.c:538
+#: server/stdinhand.c:457
#, c-format
msgid "Close metaserver connection to [%s]."
msgstr ""
-#: server/stdinhand.c:553
+#: server/stdinhand.c:472
msgid "Metaserver connection is open."
msgstr ""
-#: server/stdinhand.c:556
+#: server/stdinhand.c:475
msgid "Metaserver connection is closed."
msgstr ""
-#: server/stdinhand.c:566
+#: server/stdinhand.c:485
msgid "Metaserver connection is already open."
msgstr ""
-#: server/stdinhand.c:577
+#: server/stdinhand.c:496
msgid "Metaserver connection is already closed."
msgstr ""
-#: server/stdinhand.c:582
+#: server/stdinhand.c:501
msgid "Argument must be 'u', 'up', 'd', 'down', or '?'."
msgstr ""
-#: server/stdinhand.c:603
+#: server/stdinhand.c:522
#, c-format
msgid "Metaserver patches string set to '%s'."
msgstr ""
-#: server/stdinhand.c:606
+#: server/stdinhand.c:525
#, c-format
msgid "Metaserver patches string set to '%s', not reporting to metaserver."
msgstr ""
-#: server/stdinhand.c:627
+#: server/stdinhand.c:546
#, c-format
msgid "Metaserver message string set to '%s'."
msgstr ""
-#: server/stdinhand.c:630
+#: server/stdinhand.c:549
#, c-format
msgid "Metaserver message string set to '%s', not reporting to metaserver."
msgstr ""
-#: server/stdinhand.c:650
+#: server/stdinhand.c:569
#, c-format
msgid "Metaserver is now [%s]."
msgstr ""
-#: server/stdinhand.c:660
+#: server/stdinhand.c:579
#, c-format
msgid "Server id: %s"
msgstr ""
-#: server/stdinhand.c:757
+#: server/stdinhand.c:676
msgid "You cannot save games manually on this server."
msgstr ""
-#: server/stdinhand.c:774
+#: server/stdinhand.c:693
msgid "Cannot toggle a barbarian player."
msgstr ""
-#: server/stdinhand.c:781
+#: server/stdinhand.c:700
#, c-format
msgid "%s is now under AI control."
msgstr ""
-#: server/stdinhand.c:802
+#: server/stdinhand.c:721
#, c-format
msgid "%s is now under human control."
msgstr ""
-#: server/stdinhand.c:847
+#: server/stdinhand.c:766
msgid "Can't add AI players once the game has begun."
msgstr ""
-#: server/stdinhand.c:867
+#: server/stdinhand.c:786
msgid "Can't add more players, server is full."
msgstr ""
-#: server/stdinhand.c:874
+#: server/stdinhand.c:793
msgid "Can't use an empty name."
msgstr ""
-#: server/stdinhand.c:881
+#: server/stdinhand.c:800
#, c-format
msgid "That name exceeds the maximum of %d chars."
msgstr ""
-#: server/stdinhand.c:887
+#: server/stdinhand.c:806
msgid "That name is not allowed."
msgstr ""
-#: server/stdinhand.c:893
+#: server/stdinhand.c:812
msgid "A player already exists by that name."
msgstr ""
-#: server/stdinhand.c:899
+#: server/stdinhand.c:818
msgid "A user already exists by that name."
msgstr ""
-#: server/stdinhand.c:925
+#: server/stdinhand.c:844
#, c-format
msgid "%s has been added as an AI-controlled player."
msgstr ""
-#: server/stdinhand.c:932
+#: server/stdinhand.c:851
#, c-format
msgid "Error creating new AI player: %s."
msgstr ""
-#: server/stdinhand.c:966
+#: server/stdinhand.c:885
msgid "Players cannot be removed once the game has started."
msgstr ""
-#: server/stdinhand.c:977
+#: server/stdinhand.c:896
#, c-format
msgid "Removed player %s from the game."
msgstr ""
-#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
+#: server/stdinhand.c:935 server/stdinhand.c:3372 server/stdinhand.c:3507
#, c-format
msgid "Name \"%s\" disallowed for security reasons."
msgstr ""
-#: server/stdinhand.c:1029
+#: server/stdinhand.c:948
#, c-format
msgid "No command script found by the name \"%s\"."
msgstr ""
-#: server/stdinhand.c:1037
+#: server/stdinhand.c:956
#, c-format
msgid "Loading script file: %s"
msgstr ""
-#: server/stdinhand.c:1052
+#: server/stdinhand.c:971
#, c-format
msgid "Cannot read command line scriptfile '%s'."
msgstr ""
-#: server/stdinhand.c:1054
+#: server/stdinhand.c:973
#, c-format
msgid "Could not read script file '%s'."
msgstr ""
-#: server/stdinhand.c:1146
+#: server/stdinhand.c:1065
#, c-format
msgid "Could not write script file '%s'."
msgstr ""
-#: server/stdinhand.c:1158
+#: server/stdinhand.c:1077
msgid "You cannot use the write command on this server for security reasons."
msgstr ""
-#: server/stdinhand.c:1186
+#: server/stdinhand.c:1105
#, c-format
msgid ""
"Cannot decrease command access level '%s' for connection '%s'; you only have "
"'%s'."
msgstr ""
-#: server/stdinhand.c:1241
+#: server/stdinhand.c:1114
+#, c-format
+msgid "Command access level set to '%s' for connection %s."
+msgstr ""
+
+#: server/stdinhand.c:1163
#, c-format
msgid ""
"Anyone can now become game organizer '%s' by issuing the 'first' command."
msgstr ""
-#: server/stdinhand.c:1274
+#: server/stdinhand.c:1187
msgid "Command access levels in effect:"
msgstr ""
-#: server/stdinhand.c:1282
+#: server/stdinhand.c:1194
#, c-format
msgid "Command access level for new connections: %s"
msgstr ""
-#: server/stdinhand.c:1285
+#: server/stdinhand.c:1197
#, c-format
msgid "Command access level for first player to take it: %s"
msgstr ""
-#: server/stdinhand.c:1294
+#: server/stdinhand.c:1206
msgid ""
"Error: command access level must be one of 'none', 'info', 'ctrl', or 'hack'."
msgstr ""
-#: server/stdinhand.c:1299
+#: server/stdinhand.c:1211
#, c-format
msgid ""
"Cannot increase command access level to '%s'; you only have '%s' yourself."
msgstr ""
-#: server/stdinhand.c:1326 server/stdinhand.c:1375
-#, c-format
-msgid "Command access level set to '%s' for connection %s."
-msgstr ""
-
-#: 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:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
+#: server/stdinhand.c:1238 server/stdinhand.c:1252 server/stdinhand.c:1273
#, c-format
msgid "Command access level set to '%s' for new players."
msgstr ""
-#: server/stdinhand.c:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
+#: server/stdinhand.c:1243 server/stdinhand.c:1257 server/stdinhand.c:1267
#, c-format
msgid "Command access level set to '%s' for first player to grab it."
msgstr ""
-#: server/stdinhand.c:1402
+#: server/stdinhand.c:1302
msgid "The 'first' command makes no sense from the server command line."
msgstr ""
-#: server/stdinhand.c:1406
+#: server/stdinhand.c:1306
#, c-format
msgid "You already have command access level '%s' or better."
msgstr ""
-#: server/stdinhand.c:1411
+#: server/stdinhand.c:1311
msgid "Someone else already is game organizer."
msgstr ""
-#: server/stdinhand.c:1416
+#: server/stdinhand.c:1316
#, c-format
msgid "Connection %s has opted to become the game organizer."
msgstr ""
-#: server/stdinhand.c:1467
+#: server/stdinhand.c:1367
#, c-format
msgid "Invalid argument %d."
msgstr ""
-#: server/stdinhand.c:1474
+#: server/stdinhand.c:1374
#, fuzzy
msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
msgstr "timeoutincrease <ãýñïò> <áýîçóç-ãýñïõ> <ôéìÞ> <ðïëëáðëáóéáóôÞò-ôéìÞò>"
-#: server/stdinhand.c:1482
+#: server/stdinhand.c:1382
#, c-format
msgid "Dynamic timeout set to %d %d %d %d"
msgstr ""
-#: server/stdinhand.c:1542 server/stdinhand.c:1545
+#: server/stdinhand.c:1442 server/stdinhand.c:1445
#, fuzzy
msgid "Option:"
msgstr "ÅðéëïãÝò"
-#: server/stdinhand.c:1555 server/stdinhand.c:4031
+#: server/stdinhand.c:1455 server/stdinhand.c:4079
msgid "Description:"
msgstr ""
-#: server/stdinhand.c:1560
+#: server/stdinhand.c:1460
#, c-format
msgid "Status: %s"
msgstr ""
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "changeable"
msgstr ""
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "fixed"
msgstr ""
-#: server/stdinhand.c:1567
+#: server/stdinhand.c:1467
#, c-format
msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
msgstr ""
-#: server/stdinhand.c:1572
+#: server/stdinhand.c:1472
#, c-format
msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
msgstr ""
-#: server/stdinhand.c:1578
+#: server/stdinhand.c:1478
#, c-format
msgid "Value: \"%s\", Default: \"%s\""
msgstr ""
-#: server/stdinhand.c:1597
+#: server/stdinhand.c:1497
msgid "Explanations are available for the following server options:"
msgstr ""
-#: server/stdinhand.c:1643
+#: server/stdinhand.c:1537
msgid "No explanation for that yet."
msgstr ""
-#: server/stdinhand.c:1646 server/stdinhand.c:2480
+#: server/stdinhand.c:1540 server/stdinhand.c:2468
msgid "Ambiguous option name."
msgstr ""
-#: server/stdinhand.c:1666
+#: server/stdinhand.c:1560
#, c-format
msgid "Server Operator: %s"
msgstr ""
-#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
+#: server/stdinhand.c:1686 server/stdinhand.c:1713 server/stdinhand.c:1731
#, c-format
msgid "Player '%s' now has AI skill level '%s'."
msgstr ""
-#: server/stdinhand.c:1822
+#: server/stdinhand.c:1718
#, c-format
msgid "%s is not controlled by the AI."
msgstr ""
-#: server/stdinhand.c:1842
+#: server/stdinhand.c:1738
#, c-format
msgid "Default AI skill level set to '%s'."
msgstr ""
-#: server/stdinhand.c:1857 server/stdinhand.c:2162
+#: server/stdinhand.c:1753
msgid "This command is client only."
msgstr ""
-#: server/stdinhand.c:1860
+#: server/stdinhand.c:1756
msgid "Usage: away"
msgstr ""
-#: server/stdinhand.c:1865
+#: server/stdinhand.c:1761
msgid "Only players may use the away command."
msgstr ""
-#: server/stdinhand.c:1869
+#: server/stdinhand.c:1765
#, c-format
msgid "%s set to away mode."
msgstr ""
-#: server/stdinhand.c:1877
+#: server/stdinhand.c:1772
#, c-format
msgid "%s returned to game."
msgstr ""
-#: server/stdinhand.c:1919
+#: server/stdinhand.c:1817
#, c-format
msgid "Sorry, you do not have access to view option '%s'."
msgstr ""
-#: server/stdinhand.c:1925
+#: server/stdinhand.c:1823
#, c-format
msgid "Unknown option '%s'."
msgstr ""
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1848
msgid "All options with non-default values"
msgstr ""
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1851
msgid "All options"
msgstr ""
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1854
msgid "Vital options"
msgstr ""
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1857
msgid "Situational options"
msgstr ""
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1860
msgid "Rarely used options"
msgstr ""
-#: server/stdinhand.c:1965
+#: server/stdinhand.c:1863
msgid "+ means you may change the option"
msgstr ""
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1864
msgid "= means the option is on its default value"
msgstr ""
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
#, c-format
msgid "%-*s value (min,max) "
msgstr ""
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
msgid "Option"
msgstr ""
-#: server/stdinhand.c:1973
+#: server/stdinhand.c:1871
msgid "description"
msgstr ""
-#: server/stdinhand.c:2042
+#: server/stdinhand.c:1940
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:2092
+#: server/stdinhand.c:1966
msgid "Cannot change teams once game has begun."
msgstr ""
-#: server/stdinhand.c:2102
+#: server/stdinhand.c:1976
msgid "Undefined argument. Usage: team <player> <team>."
msgstr ""
-#: server/stdinhand.c:2122
+#: server/stdinhand.c:1996
#, c-format
msgid "No such team %s. Please give a valid team name or number."
msgstr ""
-#: server/stdinhand.c:2129
+#: server/stdinhand.c:2003
msgid "Cannot team a barbarian."
msgstr ""
-#: server/stdinhand.c:2135
+#: server/stdinhand.c:2009
#, c-format
msgid "Player %s set to team %s."
msgstr ""
-#: server/stdinhand.c:2157
+#: server/stdinhand.c:2035 server/voting.c:512
#, fuzzy
-msgid "Undefined arguments. Usage: vote yes|no [vote number]."
-msgstr "vote yes|no [øÞöïò áñéèìüò]"
+msgid "Teamvote"
+msgstr "ÏìÜäá"
-#: server/stdinhand.c:2165
-msgid "Observers cannot vote."
+#: server/stdinhand.c:2035 server/voting.c:516
+msgid "Vote"
msgstr ""
-#: server/stdinhand.c:2168
+#: server/stdinhand.c:2037
+#, c-format
msgid ""
-"You can only vote in a running game. Use 'first' to become the game "
-"organizer if there currently is none."
+"%s %d \"%s\" (needs %0.0f%%%s): %d for, %d against, and %d abstained out of %"
+"d players."
msgstr ""
-#: server/stdinhand.c:2181
-#, c-format
-msgid "Vote %d \"%s\": %d for, %d against"
+#: server/stdinhand.c:2041
+msgid " no dissent"
msgstr ""
-#: server/stdinhand.c:2188
+#: server/stdinhand.c:2049
msgid "There are no votes going on."
msgstr ""
-#: server/stdinhand.c:2208
-msgid "No legal last vote."
+#: server/stdinhand.c:2077
+#, fuzzy
+msgid "Invalid arguments. Usage: vote yes|no|abstain [vote number]."
+msgstr "vote yes|no [øÞöïò áñéèìüò]"
+
+#: server/stdinhand.c:2095 server/stdinhand.c:2213 server/stdinhand.c:3714
+msgid "You are not allowed to use this command."
msgstr ""
-#: server/stdinhand.c:2213
-msgid "Value must be integer."
+#: server/stdinhand.c:2104
+#, c-format
+msgid "The argument \"%s\" is ambigious."
msgstr ""
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2119
+#, fuzzy
+msgid "There are no votes running."
+msgstr "Ôï ðáé÷íßäé ôñÝ÷åé Þäç."
+
+#: server/stdinhand.c:2121
+#, c-format
+msgid "No legal last vote (%d %s)."
+msgstr ""
+
+#: server/stdinhand.c:2122
+msgid "other vote running"
+msgid_plural "other votes running"
+msgstr[0] ""
+msgstr[1] ""
+
+#: server/stdinhand.c:2129 server/stdinhand.c:2491 server/stdinhand.c:2532
+msgid "Value must be an integer."
+msgstr ""
+
+#: server/stdinhand.c:2135 server/stdinhand.c:2221
#, c-format
msgid "No such vote (%d)."
msgstr ""
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2141
+#, fuzzy
+msgid "You are not allowed to vote on that."
+msgstr "Äåí åðéôñÝðïíôáé åðéóêåðôåò óå áõôüí ôïí åîõðçñåôçôÞ. Óõãíþìç."
+
+#: server/stdinhand.c:2146
#, c-format
msgid "You voted for \"%s\""
msgstr ""
-#: server/stdinhand.c:2232
+#: server/stdinhand.c:2150
#, c-format
msgid "You voted against \"%s\""
msgstr ""
-#: server/stdinhand.c:2259
+#: server/stdinhand.c:2155
+#, c-format
+msgid "You abstained from voting on \"%s\""
+msgstr ""
+
+#: server/stdinhand.c:2190
+msgid "Missing argument <vote number> or the string \"all\"."
+msgstr ""
+
+#: server/stdinhand.c:2197
+#, fuzzy
+msgid "You don't have any vote going on."
+msgstr "Äåí Ý÷åéò åñãÜôç åäþ."
+
+#: server/stdinhand.c:2204
+msgid "There isn't any vote going on."
+msgstr ""
+
+#: server/stdinhand.c:2209
+msgid "Server: All votes have been removed."
+msgstr ""
+
+#: server/stdinhand.c:2226
+#, fuzzy, c-format
+msgid "You are not allowed to cancel this vote (%d)."
+msgstr "Äåí åðéôñÝðïíôáé åðéóêåðôåò óå áõôüí ôïí åîõðçñåôçôÞ. Óõãíþìç."
+
+#: server/stdinhand.c:2232
+msgid "Usage: /cancelvote [<vote number>|all]"
+msgstr ""
+
+#: server/stdinhand.c:2241
+#, c-format
+msgid "Server: %s cancelled the vote \"%s\" (number %d)."
+msgstr ""
+
+#: server/stdinhand.c:2247
+#, c-format
+msgid "Server: The vote \"%s\" (number %d) has been cancelled."
+msgstr ""
+
+#: server/stdinhand.c:2265
msgid ""
"Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
"<x> <y> | unit <id> | tech <player> | timing | info>."
msgstr ""
-#: server/stdinhand.c:2265
+#: server/stdinhand.c:2271
msgid "Can only use this command once game has begun."
msgstr ""
-#: server/stdinhand.c:2294
+#: server/stdinhand.c:2300
#, c-format
msgid "%s diplomacy no longer debugged"
msgstr ""
-#: server/stdinhand.c:2298
+#: server/stdinhand.c:2304
#, c-format
msgid "%s diplomacy debugged"
msgstr ""
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2323
#, c-format
msgid "%s tech no longer debugged"
msgstr ""
-#: server/stdinhand.c:2321
+#: server/stdinhand.c:2327
#, c-format
msgid "%s tech debugged"
msgstr ""
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2358 server/stdinhand.c:2388
msgid "Value 2 & 3 must be integer."
msgstr ""
-#: server/stdinhand.c:2356 server/stdinhand.c:2386
+#: server/stdinhand.c:2362 server/stdinhand.c:2392
msgid "Bad map coordinates."
msgstr ""
-#: server/stdinhand.c:2361
+#: server/stdinhand.c:2367
msgid "No city at this coordinate."
msgstr ""
-#: server/stdinhand.c:2366
+#: server/stdinhand.c:2372
#, c-format
msgid "%s no longer debugged"
msgstr ""
-#: server/stdinhand.c:2392 server/stdinhand.c:2422
+#: server/stdinhand.c:2398 server/stdinhand.c:2428
#, c-format
msgid "%s %s no longer debugged."
msgstr ""
-#: server/stdinhand.c:2397 server/stdinhand.c:2427
+#: server/stdinhand.c:2403 server/stdinhand.c:2433
#, c-format
msgid "%s %s debugged."
msgstr ""
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2419
msgid "Value 2 must be integer."
msgstr ""
-#: server/stdinhand.c:2417
+#: server/stdinhand.c:2423
#, c-format
msgid "Unit %d does not exist."
msgstr ""
-#: server/stdinhand.c:2475
+#: server/stdinhand.c:2464
msgid "Undefined argument. Usage: set <option> <value>."
msgstr ""
-#: server/stdinhand.c:2485
+#: server/stdinhand.c:2473
msgid "You are not allowed to set this option."
msgstr ""
-#: server/stdinhand.c:2490 server/stdinhand.c:3463
+#: server/stdinhand.c:2478 server/stdinhand.c:3501
msgid "This setting can't be modified after the game has started."
msgstr ""
-#: server/stdinhand.c:2502 server/stdinhand.c:2543
-msgid "Value must be an integer."
-msgstr ""
-
-#: server/stdinhand.c:2512
+#: server/stdinhand.c:2501
#, c-format
msgid "The parameter %s should only contain digits 0-1."
msgstr ""
-#: server/stdinhand.c:2519
+#: server/stdinhand.c:2508
msgid "Value out of range (minimum: 0, maximum: 1)."
msgstr ""
-#: server/stdinhand.c:2534 server/stdinhand.c:2576
+#: server/stdinhand.c:2523 server/stdinhand.c:2565
#, c-format
msgid "Option: %s has been set to %d."
msgstr ""
-#: server/stdinhand.c:2554
+#: server/stdinhand.c:2543
#, c-format
msgid "The parameter %s should only contain +- and 0-9."
msgstr ""
-#: server/stdinhand.c:2561
+#: server/stdinhand.c:2550
#, c-format
msgid "Value out of range (minimum: %d, maximum: %d)."
msgstr ""
-#: server/stdinhand.c:2586
+#: server/stdinhand.c:2575
msgid "String value too long. Usage: set <option> <value>."
msgstr ""
-#: server/stdinhand.c:2600
+#: server/stdinhand.c:2589
#, c-format
msgid "Option: %s has been set to \"%s\"."
msgstr ""
-#: server/stdinhand.c:2658
+#: server/stdinhand.c:2652
msgid "Sorry, one can't observe globally in this game."
msgstr ""
-#: server/stdinhand.c:2661
+#: server/stdinhand.c:2655
msgid "Sorry, you can't take a global observer. Observe it instead."
msgstr ""
-#: server/stdinhand.c:2671
+#: server/stdinhand.c:2665
msgid "You cannot take a new player at this time."
msgstr ""
#. TRANS: Do not translate "maxplayers".
-#: server/stdinhand.c:2679
+#: server/stdinhand.c:2673
#, c-format
msgid ""
"You cannot take a new player because the maximum of %d player has already "
@@ -6260,75 +6343,75 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: server/stdinhand.c:2691
+#: server/stdinhand.c:2685
msgid "You cannot take a new player because there are no free player slots."
msgstr ""
-#: server/stdinhand.c:2702
+#: server/stdinhand.c:2696
msgid "Sorry, one can't observe barbarians in this game."
msgstr ""
-#: server/stdinhand.c:2705
+#: server/stdinhand.c:2699
msgid "Sorry, one can't take barbarians in this game."
msgstr ""
-#: server/stdinhand.c:2713
+#: server/stdinhand.c:2707
msgid "Sorry, one can't observe dead players in this game."
msgstr ""
-#: server/stdinhand.c:2716
+#: server/stdinhand.c:2710
msgid "Sorry, one can't take dead players in this game."
msgstr ""
-#: server/stdinhand.c:2724
+#: server/stdinhand.c:2718
msgid "Sorry, one can't observe AI players in this game."
msgstr ""
-#: server/stdinhand.c:2727
+#: server/stdinhand.c:2721
msgid "Sorry, one can't take AI players in this game."
msgstr ""
-#: server/stdinhand.c:2736
+#: server/stdinhand.c:2730
msgid "Sorry, one can't observe human players in this game."
msgstr ""
-#: server/stdinhand.c:2739
+#: server/stdinhand.c:2733
msgid "Sorry, one can't take human players in this game."
msgstr ""
-#: server/stdinhand.c:2749
+#: server/stdinhand.c:2743
msgid "Sorry, one can't observe in this game."
msgstr ""
-#: server/stdinhand.c:2754
+#: server/stdinhand.c:2748
msgid "Sorry, one can't take players in this game."
msgstr ""
-#: server/stdinhand.c:2760
+#: server/stdinhand.c:2754
msgid "Sorry, one can't take players already connected in this game."
msgstr ""
-#: server/stdinhand.c:2791
+#: server/stdinhand.c:2785
#, fuzzy
msgid "Usage: observe [connection-name [player-name]]"
msgstr "observe [üíïìá-óýíäåóçò] [üíïìá-ðáß÷ôç]"
-#: server/stdinhand.c:2797
+#: server/stdinhand.c:2791
#, fuzzy
msgid "Usage: observe [player-name]"
msgstr "remove <üíïìá-ðáß÷ôç>"
-#: server/stdinhand.c:2847
+#: server/stdinhand.c:2841
#, c-format
msgid "%s already controls %s. Using 'observe' would remove %s"
msgstr ""
-#: server/stdinhand.c:2858
+#: server/stdinhand.c:2852
#, c-format
msgid "%s is already observing %s."
msgstr ""
-#: server/stdinhand.c:2863
+#: server/stdinhand.c:2857
#, c-format
msgid "%s is already observing."
msgstr ""
@@ -6343,234 +6426,239 @@ msgstr ""
msgid "%s now observes"
msgstr ""
-#: server/stdinhand.c:2969
+#: server/stdinhand.c:2971
#, fuzzy
msgid "Usage: take <connection-name> <player-name>"
msgstr "take [ïíïìá-óýíäåóçò] <üíïìá-ðáß÷ôç>"
-#: server/stdinhand.c:2974
+#: server/stdinhand.c:2976
#, fuzzy
msgid "Usage: take <player-name>"
msgstr "create <üíïìá-ðáß÷ôç>"
-#: server/stdinhand.c:2980
+#: server/stdinhand.c:2982
#, fuzzy
msgid "Usage: take [connection-name] <player-name>"
msgstr "take [ïíïìá-óýíäåóçò] <üíïìá-ðáß÷ôç>"
-#: server/stdinhand.c:3010
+#: server/stdinhand.c:3012
#, fuzzy, c-format
msgid "%s already controls %s."
msgstr "%s ÷Üèçêáí ìáæß ìå ôïí Ýëåã÷ï ôçò %s."
-#: server/stdinhand.c:3024
+#: server/stdinhand.c:3026
#, c-format
msgid "There is no free player slot for %s."
msgstr ""
-#: server/stdinhand.c:3059
+#: server/stdinhand.c:3061
#, fuzzy, c-format
msgid "being detached from %s."
msgstr "%s áðïêôÞèçêå áðü %s!"
-#: server/stdinhand.c:3135
+#: server/stdinhand.c:3146
#, fuzzy, c-format
msgid "%s now controls %s (%s, %s)."
msgstr "ï %s êõâåñíÜåé ôþñá ôïõò %s óáí %s."
-#: server/stdinhand.c:3139 server/stdinhand.c:4260
+#: server/stdinhand.c:3150 server/stdinhand.c:4308
#: data/nation/barbarian.ruleset:3
msgid "Barbarian"
msgstr ""
-#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
+#: server/stdinhand.c:3152 server/stdinhand.c:4310 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-sdl/plrdlg.c:645
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr ""
-#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-gtk-2.0/pages.c:2125
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
+#: server/stdinhand.c:3153 server/stdinhand.c:4312
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-gtk-2.0/pages.c:2127
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/connectdlg.c:215
msgid "Human"
msgstr ""
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-gtk-2.0/pages.c:2124 client/gui-win32/connectdlg.c:200
-#: client/gui-win32/connectdlg.c:212
+#: server/stdinhand.c:3155 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-gtk-2.0/pages.c:2126 client/gui-win32/connectdlg.c:202
+#: client/gui-win32/connectdlg.c:214
msgid "Alive"
msgstr ""
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3156 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-win32/connectdlg.c:202
msgid "Dead"
msgstr ""
-#: server/stdinhand.c:3147
+#: server/stdinhand.c:3159
#, fuzzy, c-format
msgid "%s failed to attach to any player."
msgstr "áðïêüëëçóç áðü Ýíá ðáß÷ôç"
-#: server/stdinhand.c:3182
+#: server/stdinhand.c:3194
#, fuzzy
msgid "Usage: detach <connection-name>"
msgstr "detach <üíïìá-óýíäåóçò>"
-#: server/stdinhand.c:3202
+#: server/stdinhand.c:3214
msgid "You can not detach other users."
msgstr ""
-#: server/stdinhand.c:3211
+#: server/stdinhand.c:3223
#, c-format
msgid "%s is not attached to any player."
msgstr ""
-#: server/stdinhand.c:3234
+#: server/stdinhand.c:3246
#, c-format
msgid "%s detaching from %s"
msgstr ""
-#: server/stdinhand.c:3240
+#: server/stdinhand.c:3252
#, c-format
msgid "%s no longer observing."
msgstr ""
-#: server/stdinhand.c:3259
+#: server/stdinhand.c:3271
#, c-format
msgid "detaching from %s."
msgstr ""
-#: server/stdinhand.c:3345
+#: server/stdinhand.c:3361
msgid "Usage: load <game name>"
msgstr ""
-#: server/stdinhand.c:3350
+#: server/stdinhand.c:3366
msgid "Cannot load a game while another is running."
msgstr ""
-#: server/stdinhand.c:3372
+#: server/stdinhand.c:3388
#, c-format
msgid "Cannot find savegame or scenario with the name \"%s\"."
msgstr ""
-#: server/stdinhand.c:3389
+#: server/stdinhand.c:3405
#, c-format
msgid "Could not load savefile: %s"
msgstr ""
-#: server/stdinhand.c:3458
+#: server/stdinhand.c:3496
#, c-format
msgid "Current ruleset directory is \"%s\""
msgstr ""
-#: server/stdinhand.c:3478
+#: server/stdinhand.c:3516
#, c-format
msgid "Ruleset directory \"%s\" not found"
msgstr ""
-#: server/stdinhand.c:3484
+#: server/stdinhand.c:3522
#, c-format
msgid "Ruleset directory is already \"%s\""
msgstr ""
-#: server/stdinhand.c:3488
+#: server/stdinhand.c:3526
#, c-format
msgid "Ruleset directory set to \"%s\""
msgstr ""
-#: server/stdinhand.c:3536
+#: server/stdinhand.c:3574
msgid "Goodbye."
msgstr ""
-#: server/stdinhand.c:3567
+#: server/stdinhand.c:3606
msgid "Sorry, you are not allowed to use server commands."
msgstr ""
-#: server/stdinhand.c:3603
+#: server/stdinhand.c:3656
#, c-format
msgid "Warning: '%s' interpreted as '%s', but it is ambiguous. Try '%shelp'."
msgstr ""
-#: server/stdinhand.c:3608
+#: server/stdinhand.c:3661
#, c-format
msgid "Unknown command. Try '%shelp'."
msgstr ""
-#: server/stdinhand.c:3625
-msgid "Your new vote canceled your previous vote."
+#: server/stdinhand.c:3675
+msgid "Your new vote cancelled your previous vote."
msgstr ""
-#: server/stdinhand.c:3633
-#, c-format
-msgid "New vote (number %d) by %s: %s."
+#: server/stdinhand.c:3688
+msgid "New teamvote"
msgstr ""
-#: server/stdinhand.c:3645
+#: server/stdinhand.c:3691
+#, fuzzy
+msgid "New vote"
+msgstr "ÍïÝìâñéïò"
+
+#: server/stdinhand.c:3695
#, c-format
-msgid "Your new vote (\"%s\") was not legal or was not recognized."
+msgid "%s (number %d) by %s: %s"
msgstr ""
-#: server/stdinhand.c:3655
-msgid "You are not allowed to use this command."
+#: server/stdinhand.c:3704
+#, c-format
+msgid "Your new vote (\"%s\") was not legal or was not recognized."
msgstr ""
-#: server/stdinhand.c:3680
+#: server/stdinhand.c:3726
msgid "(server prompt)"
msgstr ""
-#: server/stdinhand.c:3787
+#: server/stdinhand.c:3835
msgid "Game ended in a draw."
msgstr ""
-#: server/stdinhand.c:3791
+#: server/stdinhand.c:3839
msgid ""
"Ending the game. The server will restart once all clients have disconnected."
msgstr ""
-#: server/stdinhand.c:3796
+#: server/stdinhand.c:3844
msgid "Cannot end the game: no game running."
msgstr ""
-#: server/stdinhand.c:3812
+#: server/stdinhand.c:3860
#, c-format
msgid "%s has conceded the game and can no longer win."
msgstr ""
-#: server/stdinhand.c:3817
+#: server/stdinhand.c:3865
msgid "You cannot surrender now."
msgstr ""
-#: server/stdinhand.c:3883
+#: server/stdinhand.c:3931
msgid "Not enough human players, game will not start."
msgstr ""
-#: server/stdinhand.c:3888
+#: server/stdinhand.c:3936
msgid "No players, game will not start."
msgstr ""
-#: server/stdinhand.c:3892
+#: server/stdinhand.c:3940
msgid "Not enough nations for all players, game will not start."
msgstr ""
-#: server/stdinhand.c:3901
+#: server/stdinhand.c:3949
msgid "All players are ready; starting game."
msgstr "¼ëïé ïé ðáß÷ôåò åßíáé Ýôïéìïé, áñ÷ßæåé ôï ðáé÷íßäé."
-#: server/stdinhand.c:3915
+#: server/stdinhand.c:3963
msgid ""
"Cannot start the game: the game is waiting for all clients to disconnect."
msgstr ""
-#: server/stdinhand.c:3922
+#: server/stdinhand.c:3970
msgid "Cannot start the game: it is already running."
msgstr ""
-#: server/stdinhand.c:3953
+#: server/stdinhand.c:4001
#, c-format
msgid "Cutting connection %s."
msgstr ""
-#: server/stdinhand.c:3972
+#: server/stdinhand.c:4020
msgid ""
"Welcome - this is the introductory help text for the Freeciv server.\n"
"\n"
@@ -6609,124 +6697,124 @@ msgstr ""
" save - ãéá íá óþóåé ôï ôñÝ÷ùí ðáé÷íßäé\n"
" quit - ãéá Ýîïäï"
-#: server/stdinhand.c:4007 server/stdinhand.c:4010
+#: server/stdinhand.c:4055 server/stdinhand.c:4058
#, fuzzy
msgid "Command:"
msgstr "Êïììïõíéóìüò"
-#: server/stdinhand.c:4014
+#: server/stdinhand.c:4062
msgid "Synopsis: "
msgstr ""
-#: server/stdinhand.c:4023
+#: server/stdinhand.c:4071
#, c-format
msgid "Level: %s"
msgstr ""
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4096
msgid "The following server commands are available:"
msgstr ""
-#: server/stdinhand.c:4123
+#: server/stdinhand.c:4171
#, c-format
msgid "Help argument '%s' is ambiguous."
msgstr ""
-#: server/stdinhand.c:4128
+#: server/stdinhand.c:4176
#, c-format
msgid "No match for help argument '%s'."
msgstr ""
-#: server/stdinhand.c:4194
+#: server/stdinhand.c:4242
#, c-format
msgid "Bad list argument: '%s'. Try '%shelp list'."
msgstr ""
-#: server/stdinhand.c:4234
+#: server/stdinhand.c:4282
msgid "List of players:"
msgstr ""
-#: server/stdinhand.c:4239
+#: server/stdinhand.c:4287
msgid "<no players>"
msgstr ""
-#: server/stdinhand.c:4256
+#: server/stdinhand.c:4304
#, c-format
msgid "user %s, "
msgstr ""
-#: server/stdinhand.c:4267
+#: server/stdinhand.c:4315
msgid ", Dead"
msgstr ""
-#: server/stdinhand.c:4270
+#: server/stdinhand.c:4318
#, c-format
msgid ", difficulty level %s"
msgstr ""
#. TRANS: continue list, in case comma is not the separator of choice.
-#: server/stdinhand.c:4275 server/stdinhand.c:4279 client/helpdata.c:257
-#: client/helpdata.c:752 client/text.c:241 client/text.c:1224
-#: client/text.c:1262
+#: server/stdinhand.c:4323 server/stdinhand.c:4327 client/helpdata.c:257
+#: client/helpdata.c:752 client/text.c:241 client/text.c:1229
+#: client/text.c:1267
#, fuzzy, c-format
msgid "?clistmore:, %s"
msgstr "Åéäéêïß ðüñïé"
-#: server/stdinhand.c:4283
+#: server/stdinhand.c:4331
msgid ", ready"
msgstr ""
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4333
msgid ", not ready"
msgstr ""
-#: server/stdinhand.c:4293
+#: server/stdinhand.c:4341
#, c-format
msgid " %d connection:"
msgid_plural " %d connections:"
msgstr[0] ""
msgstr[1] ""
-#: server/stdinhand.c:4299
+#: server/stdinhand.c:4347
#, c-format
msgid " %s from %s (command access level %s), bufsize=%dkb"
msgstr ""
-#: server/stdinhand.c:4304
+#: server/stdinhand.c:4352
msgid " (observer mode)"
msgstr ""
-#: server/stdinhand.c:4322
+#: server/stdinhand.c:4370
msgid "List of teams:"
msgstr ""
#. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4332
+#: server/stdinhand.c:4380
#, c-format
msgid "%2d : '%s' : %d player"
msgid_plural "%2d : '%s' : %d players"
msgstr[0] ""
msgstr[1] ""
-#: server/stdinhand.c:4352
+#: server/stdinhand.c:4400
#, c-format
msgid "%2d : '%s' : 1 player : %s"
msgstr ""
-#: server/stdinhand.c:4360
+#: server/stdinhand.c:4408
#, c-format
msgid "Empty team: %s"
msgstr ""
-#: server/stdinhand.c:4371
+#: server/stdinhand.c:4419
msgid "List of connections to server:"
msgstr ""
-#: server/stdinhand.c:4375
+#: server/stdinhand.c:4423
msgid "<no connections>"
msgstr ""
-#: server/stdinhand.c:4399
+#: server/stdinhand.c:4447
msgid "List of scenarios available:"
msgstr ""
@@ -6745,7 +6833,7 @@ msgstr "
msgid "%s acquired from %s!"
msgstr "%s áðïêôÞèçêå áðü %s!"
-#: server/techtools.c:220
+#: server/techtools.c:221
#, c-format
msgid ""
"Discovery of %s makes the government form %s available. You may want to "
@@ -6754,58 +6842,58 @@ msgstr ""
"ÁíáêÜëõøç ôïõ %s êÜíåé äéáèÝóéìï ôï ðïëßôåõìá %s . Ìðïñåßò áí èÝëåéò íá "
"îåêéíÞóåéò åðáíÜóôáóç."
-#: server/techtools.c:301
+#: server/techtools.c:302
#, c-format
msgid "Discovery of %s OBSOLETES %s in %s!"
msgstr "Ç áíáêÜëõøç ôïõ %s ÁÐÁÑ×ÁÉÙÍÅÉ %s óôçí %s!"
-#: server/techtools.c:351
+#: server/techtools.c:352
#, c-format
msgid "Learned %s. Our scientists focus on %s; goal is %s."
msgstr " %s ìáèåýôçêå. Ïé åðéóôÞìïíåò ìáò åóôéÜæïõí óå %s, óôü÷ïò %s."
-#: server/techtools.c:369
+#: server/techtools.c:370
#, c-format
msgid "Learned %s. Scientists choose to research %s."
msgstr ""
-#: server/techtools.c:376
+#: server/techtools.c:377
#, c-format
msgid "Learned %s. "
msgstr ""
-#: server/techtools.c:379
+#: server/techtools.c:380
#, c-format
msgid "Researching %s."
msgstr ""
-#: server/techtools.c:385
+#: server/techtools.c:386
#, c-format
msgid "Learned %s. Scientists do not know what to research next."
msgstr ""
-#: server/techtools.c:402
+#: server/techtools.c:403
msgid ""
"Great scientists from all the world join your civilization: you get an "
"immediate advance."
msgstr ""
-#: server/techtools.c:570
+#: server/techtools.c:571
#, c-format
msgid "Technology goal is %s."
msgstr ""
-#: server/techtools.c:700
+#: server/techtools.c:708
#, c-format
msgid "You steal %s from the %s."
msgstr ""
-#: server/techtools.c:705
+#: server/techtools.c:713
#, c-format
msgid "The %s stole %s from you!"
msgstr ""
-#: server/techtools.c:710
+#: server/techtools.c:718
#, c-format
msgid "The %s have stolen %s from the %s."
msgstr ""
@@ -6829,177 +6917,183 @@ msgstr ""
msgid "%s upgraded to %s for %d gold."
msgstr ""
-#: server/unithand.c:396
+#: server/unithand.c:402
#, c-format
msgid "%s refuses to disband!"
msgstr ""
-#: server/unithand.c:449
+#: server/unithand.c:455
msgid "Can't place city here."
msgstr ""
-#: server/unithand.c:456
+#: server/unithand.c:462
#, c-format
msgid "Only %s can build a city."
msgstr ""
-#: server/unithand.c:461
+#: server/unithand.c:467
msgid "Can't build a city."
msgstr ""
-#: server/unithand.c:470
+#: server/unithand.c:476
#, c-format
msgid "Only %s can add to a city."
msgstr ""
-#: server/unithand.c:475
+#: server/unithand.c:481
msgid "Can't add to a city."
msgstr ""
-#: server/unithand.c:481
+#: server/unithand.c:487
#, c-format
msgid "%s unit has no moves left to add to %s."
msgstr ""
-#: server/unithand.c:487
+#: server/unithand.c:493
#, c-format
msgid "%s unit has no moves left to build city."
msgstr ""
-#: server/unithand.c:492
+#. TRANS: <city> is owned by <nation>, cannot add <unit>.
+#: server/unithand.c:499
+#, c-format
+msgid "%s is owned by %s, cannot add %s."
+msgstr ""
+
+#: server/unithand.c:506
#, c-format
msgid "%s is too big to add %s."
msgstr ""
-#: server/unithand.c:498
+#: server/unithand.c:512
#, c-format
msgid "%s needs an improvement to grow, so you cannot add %s."
msgstr ""
-#: server/unithand.c:509
+#: server/unithand.c:523
#, c-format
msgid "Can't add %s to %s."
msgstr ""
-#: server/unithand.c:531
+#: server/unithand.c:545
#, c-format
msgid "%s added to aid %s in growing."
msgstr ""
-#: server/unithand.c:828
+#: server/unithand.c:842
msgid "Your Nuclear missile was shot down by SDI defences, what a waste."
msgstr ""
-#: server/unithand.c:831
+#: server/unithand.c:845
#, c-format
msgid "The nuclear attack on %s was avoided by your SDI defense."
msgstr ""
#. TRANS: "Your Cannon ... the Polish Destroyer."
-#: server/unithand.c:901
+#: server/unithand.c:915
#, c-format
msgid "Your %s survived the pathetic attack from the %s %s."
msgstr ""
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unithand.c:910
+#: server/unithand.c:924
#, c-format
msgid "Your attacking %s failed against the %s %s!"
msgstr ""
-#: server/unithand.c:983
+#: server/unithand.c:997
#, c-format
msgid "Only %s can attack from sea."
msgstr ""
-#: server/unithand.c:988
+#: server/unithand.c:1002
msgid "Cannot attack from sea."
msgstr ""
-#: server/unithand.c:996 server/unittools.c:2137
+#: server/unithand.c:1010 server/unittools.c:2142
msgid "Cannot attack unless you declare war first."
msgstr ""
-#: server/unithand.c:1001
+#: server/unithand.c:1015
#, c-format
msgid "%s can only move into your own zone of control."
msgstr ""
-#: server/unithand.c:1007
+#: server/unithand.c:1021
#, c-format
msgid "Cannot invade unless you break peace with %s first."
msgstr ""
-#: server/unithand.c:1052
+#: server/unithand.c:1066
msgid "This unit has no moves left."
msgstr ""
-#: server/unithand.c:1107
+#: server/unithand.c:1121
msgid "Unit must be on land to perform diplomatic action."
msgstr ""
-#: server/unithand.c:1109
+#: server/unithand.c:1123
msgid "No diplomat action possible."
msgstr ""
-#: server/unithand.c:1125
+#: server/unithand.c:1139
#, c-format
msgid "You must declare war on %s first. Try using players dialog (F3)."
msgstr ""
-#: server/unithand.c:1143
+#: server/unithand.c:1157
msgid "This unit is being transported, and so cannot bombard."
msgstr ""
-#: server/unithand.c:1158
+#: server/unithand.c:1172
msgid "You can't attack there."
msgstr ""
-#: server/unithand.c:1180
+#: server/unithand.c:1194
msgid "This type of troops cannot take over a city."
msgstr ""
-#: server/unithand.c:1198
+#: server/unithand.c:1212
msgid "A transported unit is not allied to all units or city on target tile."
msgstr ""
-#: server/unithand.c:1240
+#: server/unithand.c:1254
#, c-format
msgid "Your %s helps build the %s in %s (%d remaining)."
msgstr ""
-#: server/unithand.c:1242
+#: server/unithand.c:1256
#, c-format
msgid "Your %s helps build the %s in %s (%d surplus)."
msgstr ""
-#: server/unithand.c:1286
+#: server/unithand.c:1300
#, c-format
msgid ""
"Sorry, your %s cannot establish a trade route because it has no home city"
msgstr ""
-#: server/unithand.c:1296
+#: server/unithand.c:1310
#, c-format
msgid "Sorry, your %s cannot establish a trade route between %s and %s"
msgstr ""
-#: server/unithand.c:1325 server/unithand.c:1344
+#: server/unithand.c:1339 server/unithand.c:1358
#, c-format
msgid "Sorry, your %s cannot establish a trade route here!"
msgstr ""
-#: server/unithand.c:1329 server/unithand.c:1348
+#: server/unithand.c:1343 server/unithand.c:1362
#, c-format
msgid " The city of %s already has %d better trade routes!"
msgstr ""
-#: server/unithand.c:1361 server/unithand.c:1373
+#: server/unithand.c:1375 server/unithand.c:1387
#, c-format
msgid "Sorry, %s has canceled the trade route from %s to your city %s."
msgstr ""
-#: server/unithand.c:1406
+#: server/unithand.c:1420
#, c-format
msgid ""
"Your %s from %s has arrived in %s, and revenues amount to %d in gold and "
@@ -7058,55 +7152,55 @@ msgid "Teleported your %s to %s."
msgstr ""
#. TRANS: A unit is moved to resolve stack conflicts.
-#: server/unittools.c:1065
+#: server/unittools.c:1070
#, c-format
msgid "Moved your %s."
msgstr ""
-#: server/unittools.c:1076
+#: server/unittools.c:1081
#, c-format
msgid "Disbanded your %s."
msgstr ""
-#: server/unittools.c:1397
+#: server/unittools.c:1402
#, c-format
msgid "Unable to defend %s, %s has lost the game."
msgstr ""
-#: server/unittools.c:1401
+#: server/unittools.c:1406
#, c-format
msgid "Losing %s meant losing the game! Be more careful next time!"
msgstr ""
-#: server/unittools.c:1503
+#: server/unittools.c:1508
#, c-format
msgid "%s escaped the destruction of %s, and fled to %s."
msgstr ""
-#: server/unittools.c:1512
+#: server/unittools.c:1517
#, c-format
msgid "%s lost when %s was lost."
msgstr ""
-#: server/unittools.c:1561
+#: server/unittools.c:1566
#, c-format
msgid "Barbarian leader captured, %d gold ransom paid."
msgstr ""
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unittools.c:1579
+#: server/unittools.c:1584
#, c-format
msgid "Your attacking %s succeeded against the %s %s!"
msgstr ""
#. TRANS: "Cannon ... the Polish Destroyer."
-#: server/unittools.c:1588 server/unittools.c:1646
+#: server/unittools.c:1593 server/unittools.c:1651
#, c-format
msgid "%s lost to an attack by the %s %s."
msgstr ""
#. TRANS: "... Cannon ... the Polish Destroyer ...."
-#: server/unittools.c:1622
+#: server/unittools.c:1627
#, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -7116,14 +7210,14 @@ msgstr[1] ""
#. TRANS: "Cannon lost when the Polish Destroyer
#. * attacked the German Musketeers."
-#: server/unittools.c:1655
+#: server/unittools.c:1660
#, fuzzy, c-format
msgid "%s lost when the %s %s attacked the %s %s."
msgstr "ï %s êõâåñíÜåé ôþñá ôïõò %s óáí %s."
#. TRANS: "Musketeers (and Cannon) lost to an
#. * attack from the Polish Destroyer."
-#: server/unittools.c:1670
+#: server/unittools.c:1675
#, fuzzy, c-format
msgid "%s (and %s) lost to an attack from the %s %s."
msgstr "%s áðü %s ÷Üèçêáí óôçí ìåôáöïñÜ ðñïò ôïõ %s ôçí %s"
@@ -7131,7 +7225,7 @@ msgstr "%s
#. TRANS: "Musketeers and 3 other units lost to
#. * an attack from the Polish Destroyer."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1680
+#: server/unittools.c:1685
#, 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."
@@ -7141,178 +7235,220 @@ msgstr[1] ""
#. TRANS: "2 units lost when the Polish Destroyer
#. * attacked the German Musketeers."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1694
+#: server/unittools.c:1699
#, 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] ""
-#: server/unittools.c:1962
+#: server/unittools.c:1967
#, c-format
msgid "Your %s was nuked by %s."
msgstr ""
-#: server/unittools.c:1965 server/unittools.c:1981
+#: server/unittools.c:1970 server/unittools.c:1986
msgid "yourself"
msgstr ""
-#: server/unittools.c:1969
+#: server/unittools.c:1974
#, c-format
msgid "The %s %s was nuked."
msgstr ""
-#: server/unittools.c:1978
+#: server/unittools.c:1983
#, c-format
msgid "%s was nuked by %s."
msgstr ""
-#: server/unittools.c:1986
+#: server/unittools.c:1991
#, c-format
msgid "You nuked %s."
msgstr ""
-#: server/unittools.c:2027
+#: server/unittools.c:2032
#, c-format
msgid "The %s detonated a nuke!"
msgstr ""
-#: server/unittools.c:2051
+#: server/unittools.c:2056
#, c-format
msgid "%s transported successfully."
msgstr ""
-#: server/unittools.c:2103
+#: server/unittools.c:2108
msgid "This unit type can not be paradropped."
msgstr ""
-#: server/unittools.c:2113
+#: server/unittools.c:2118
msgid "You cannot paradrop a unit that is transporting other units."
msgstr ""
-#: server/unittools.c:2119
+#: server/unittools.c:2124
msgid "The destination location is not known."
msgstr ""
-#: server/unittools.c:2126
+#: server/unittools.c:2131
#, c-format
msgid "This unit cannot paradrop into %s."
msgstr ""
-#: server/unittools.c:2146
+#: server/unittools.c:2151
#, c-format
msgid "The distance to the target (%i) is greater than the unit's range (%i)."
msgstr ""
-#: server/unittools.c:2157
+#: server/unittools.c:2162
#, c-format
msgid "Your %s paradropped into the %s and was lost."
msgstr ""
-#: server/unittools.c:2170
+#: server/unittools.c:2175
#, c-format
msgid "Your %s was killed by enemy units at the paradrop destination."
msgstr ""
-#: server/unittools.c:2192
+#: server/unittools.c:2197
#, c-format
msgid "You found %d gold."
msgstr ""
-#: server/unittools.c:2209
+#: server/unittools.c:2214
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr ""
-#: server/unittools.c:2216
+#: server/unittools.c:2221
#, fuzzy, c-format
msgid "The %s have acquired %s from ancient scrolls of wisdom."
msgstr "Ïé %s áðÝêôçóáí %s áðü %s."
-#: server/unittools.c:2230
+#: server/unittools.c:2235
msgid "A band of friendly mercenaries joins your cause."
msgstr ""
-#: server/unittools.c:2248
+#: server/unittools.c:2253
msgid "An abandoned village is here."
msgstr ""
-#: server/unittools.c:2258
+#: server/unittools.c:2263
msgid "You have unleashed a horde of barbarians!"
msgstr ""
-#: server/unittools.c:2261
+#: server/unittools.c:2266
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr ""
-#: server/unittools.c:2277
+#: server/unittools.c:2282
msgid "You found a friendly city."
msgstr ""
-#: server/unittools.c:2291
+#: server/unittools.c:2296
msgid "Friendly nomads are impressed by you, and join you."
msgstr ""
-#: server/unittools.c:2316
+#: server/unittools.c:2321
msgid "Your overflight frightens the tribe; they scatter in terror."
msgstr ""
-#: server/unittools.c:2574
+#: server/unittools.c:2579
#, c-format
msgid "Orders for %s aborted after enemy movement was spotted."
msgstr ""
-#: server/unittools.c:3023
+#: server/unittools.c:3028
#, c-format
msgid "Orders for %s aborted as there are units nearby."
msgstr ""
-#: server/unittools.c:3075
+#: server/unittools.c:3080
#, c-format
msgid "Orders for %s aborted because building of city failed."
msgstr ""
-#: server/unittools.c:3088
+#: server/unittools.c:3093
#, c-format
msgid "Orders for %s aborted since they give an invalid activity."
msgstr ""
-#: server/unittools.c:3102
+#: server/unittools.c:3107
#, c-format
msgid "Orders for %s aborted since they give an invalid location."
msgstr ""
-#: server/unittools.c:3112
+#: server/unittools.c:3117
#, c-format
msgid "Orders for %s aborted as there are units in the way."
msgstr ""
-#: server/unittools.c:3138
+#: server/unittools.c:3143
#, c-format
msgid "Orders for %s aborted because of failed move."
msgstr ""
-#: server/unittools.c:3179
+#: server/unittools.c:3184
#, c-format
msgid "Attempt to change homecity for %s failed."
msgstr ""
-#: server/unittools.c:3190
+#: server/unittools.c:3195
#, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr ""
-#: server/unittools.c:3202
+#: server/unittools.c:3207
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr ""
-#: server/unittools.c:3211
+#: server/unittools.c:3216
#, c-format
msgid "Your %s has invalid orders."
msgstr ""
+#: server/voting.c:522
+#, c-format
+msgid ""
+"%s %d \"%s\" is passed %d to %d with %d abstentions and %d who did not vote."
+msgstr ""
+
+#: server/voting.c:528
+#, c-format
+msgid ""
+"%s %d \"%s\" failed with %d against, %d for, %d abstentions and %d who did "
+"not vote."
+msgstr ""
+
+#: server/voting.c:548
+#, c-format
+msgid "%s %d: %s voted yes."
+msgstr ""
+
+#: server/voting.c:553
+#, c-format
+msgid "%s %d: %s voted no."
+msgstr ""
+
+#: server/voting.c:558
+#, c-format
+msgid "%s %d: %s chose to abstain."
+msgstr ""
+
+#. TRANS: Describing a new vote that can only pass
+#. * if there are no dissenting votes.
+#: server/voting.c:726
+#, c-format
+msgid "%s (needs %0.0f%% and no dissent)."
+msgstr ""
+
+#. TRANS: Describing a new vote that can pass only if the
+#. * given percentage of players votes 'yes'.
+#: server/voting.c:732
+#, c-format
+msgid "%s (needs %0.0f%% in favor)."
+msgstr ""
+
#: server/generator/mapgen.c:1771
msgid "High landmass - this may take a few seconds."
msgstr ""
@@ -7340,12 +7476,12 @@ msgid ""
"Please report this bug at %s."
msgstr ""
-#: client/attribute.c:363
+#: client/attribute.c:368
msgid ""
"There has been a CMA error. Your citizen governor settings may be broken."
msgstr ""
-#: client/attribute.c:367
+#: client/attribute.c:372
msgid "Old attributes detected and removed."
msgstr ""
@@ -7492,41 +7628,41 @@ msgstr "%+4d :
msgid "%+4d : Taxed from trade\n"
msgstr "%+4d : öüñïé áðü åìðüñéï\n"
-#: client/citydlg_common.c:418
+#: client/citydlg_common.c:421
#, c-format
msgid "%+4d : Trade route with %s\n"
msgstr "%+4d : ÅìðïñéêÞ äéáäñïìÞ ìå %s\n"
-#: client/citydlg_common.c:427
+#: client/citydlg_common.c:430
#, c-format
msgid "%+4d : Building tithes\n"
msgstr "%+4d : ×ôßæåôáé äåêÜôç\n"
-#: client/citydlg_common.c:450
+#: client/citydlg_common.c:453
#, c-format
msgid "%+4d : Bonus from %s (%+d%%)\n"
msgstr ""
-#: client/citydlg_common.c:462
+#: client/citydlg_common.c:465
#, c-format
msgid "%+4d : Waste\n"
msgstr ""
-#: client/citydlg_common.c:468
+#: client/citydlg_common.c:471
#, c-format
msgid "%+4d : Disorder\n"
msgstr ""
-#: client/citydlg_common.c:474
+#: client/citydlg_common.c:477
#, c-format
msgid "%+4d : Used\n"
msgstr ""
-#: client/citydlg_common.c:479
+#: client/citydlg_common.c:482
msgid "==== : Adds up to\n"
msgstr ""
-#: client/citydlg_common.c:481
+#: client/citydlg_common.c:484
#, c-format
msgid "%4d : Total surplus"
msgstr ""
@@ -7842,48 +7978,48 @@ msgstr "?
msgid "Specialists"
msgstr "Åéäéêïß ðüñïé"
-#: client/civclient.c:240
+#: client/civclient.c:241
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr ""
-#: client/civclient.c:250
+#: client/civclient.c:251
msgid " -l, --log FILE\tUse FILE as logfile (spawned server also uses this)\n"
msgstr ""
-#: client/civclient.c:252
+#: client/civclient.c:253
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr ""
-#: client/civclient.c:254
+#: client/civclient.c:255
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr ""
-#: client/civclient.c:256
+#: client/civclient.c:257
msgid " -p, --port PORT\tConnect to server port PORT (usually with -a)\n"
msgstr ""
-#: client/civclient.c:258
+#: client/civclient.c:259
#, c-format
msgid " -P, --Plugin PLUGIN\tUse PLUGIN for sound output %s\n"
msgstr ""
-#: client/civclient.c:260
+#: client/civclient.c:261
msgid " -r, --read FILE\tRead startup script FILE (for spawned server only)\n"
msgstr ""
-#: client/civclient.c:263
+#: client/civclient.c:264
msgid " -s, --server HOST\tConnect to the server at HOST (usually with -a)\n"
msgstr ""
-#: client/civclient.c:265
+#: client/civclient.c:266
msgid " -S, --Sound FILE\tRead sound tags from FILE\n"
msgstr ""
-#: client/civclient.c:266
+#: client/civclient.c:267
msgid " -t, --tiles FILE\tUse data file FILE.tilespec for tiles\n"
msgstr ""
-#: client/civclient.c:269
+#: client/civclient.c:270
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7891,45 +8027,45 @@ msgid ""
msgstr ""
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:274
+#: client/civclient.c:275
#, fuzzy, c-format
msgid "Report bugs at %s\n"
msgstr "ÁíÝöåñå ëÜèç óå <%s>.\n"
-#: client/civclient.c:298
+#: client/civclient.c:299
#, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr ""
-#: client/civclient.c:300 client/civclient.c:315
+#: client/civclient.c:301 client/civclient.c:316
msgid "Try using --help.\n"
msgstr ""
-#: client/civclient.c:313
+#: client/civclient.c:314
#, c-format
msgid "Invalid debug level \"%s\" specified with --debug option.\n"
msgstr ""
-#: client/civclient.c:326
+#: client/civclient.c:327
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr ""
-#: client/civclient.c:391
+#: client/civclient.c:393
#, fuzzy, c-format
msgid "Updating old metaserver address \"%s\"."
msgstr "metaserver <äéåýèõíóç>"
-#: client/civclient.c:394
+#: client/civclient.c:396
#, c-format
msgid "Default metaserver has been set to \"%s\"."
msgstr ""
-#: client/civclient.c:550
+#: client/civclient.c:540
msgid "Game started."
msgstr ""
-#: client/civclient.c:588
+#: client/civclient.c:606
msgid "There was an error while auto connecting; aborting."
msgstr ""
@@ -8061,82 +8197,82 @@ msgstr ""
msgid "Disconnected from server."
msgstr ""
-#: client/clinet.c:469
+#: client/clinet.c:473
#, c-format
msgid "Failed to contact server \"%s\" at port %d as \"%s\" after %d attempts"
msgstr ""
-#: client/clinet.c:484 client/clinet.c:486
+#: client/clinet.c:488 client/clinet.c:490
msgid "Connection to server refused. Please start the server."
msgstr ""
-#: client/clinet.c:495 client/clinet.c:523
+#: client/clinet.c:499 client/clinet.c:527
#, c-format
msgid ""
"Error contacting server \"%s\" at port %d as \"%s\":\n"
" %s\n"
msgstr ""
-#: client/clinet.c:514
+#: client/clinet.c:518
#, c-format
msgid ""
"Auto-connecting to server \"%s\" at port %d as \"%s\" every %f second(s) for "
"%d times"
msgstr ""
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
+#: client/connectdlg_common.c:78 client/gui-gtk-2.0/pages.c:1358
#, fuzzy
msgid "novice"
msgstr "áñ÷Üñéï"
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1358
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
#, fuzzy
msgid "easy"
msgstr "åýêïëï"
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1359
#, fuzzy
msgid "normal"
msgstr "êáíïíéêü"
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
#, fuzzy
msgid "hard"
msgstr "äýóêïëï"
-#: client/connectdlg_common.c:83
+#: client/connectdlg_common.c:82
#, fuzzy
msgid "experimental"
msgstr "ðåéñáìáôéêü"
-#: client/connectdlg_common.c:213
+#: client/connectdlg_common.c:212
msgid "Starting server..."
msgstr "Åêêßíçóç åîõðçñåôçôÞ..."
-#: client/connectdlg_common.c:332
+#: client/connectdlg_common.c:331
msgid "Couldn't start the server."
msgstr "Äåí ìðüñåóá íá áñ÷ßóù åîõðçñåôçôÞ."
-#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
+#: client/connectdlg_common.c:332 client/connectdlg_common.c:365
msgid "You'll have to start one manually. Sorry..."
msgstr "ÐñÝðåé íá ôïí îåêéíÞóåéò ìüíïò óïõ. Óõãíþìç..."
-#: client/connectdlg_common.c:364
+#: client/connectdlg_common.c:363
msgid "Couldn't connect to the server."
msgstr "Äåí ìðüñåóá íá óõíäåèþ ìå ôïí åîõðçñåôçôÞ."
-#: client/connectdlg_common.c:365
+#: client/connectdlg_common.c:364
msgid "We probably couldn't start it from here."
msgstr "Ðéèáíþò äåí ìðïñïýìå íá ôï îåêéíÞóïõìå áðü åäþ."
-#: client/connectdlg_common.c:470
+#: client/connectdlg_common.c:469
#, fuzzy
msgid ""
"Established control over the server. You have command access level 'hack'."
msgstr ""
"¸÷ïõìå ôïí Ýëåã÷ï ôïõ åîõðçñåôçôÞ (ðåßñáãìá åðéðÝäïõ ðñüóâáóçò åíôïëþí)"
-#: client/connectdlg_common.c:475
+#: client/connectdlg_common.c:474
msgid ""
"Failed to obtain the required access level to take control of the server. "
"The server will now be shutdown."
@@ -8146,27 +8282,27 @@ msgstr ""
msgid "Only transporter units can be unloaded."
msgstr "Ìüíï ìïíÜäåò ìåôáöïñéêÝò ìðïñïýí íá îåöïñôùèïýí."
-#: client/control.c:1425
+#: client/control.c:1417
msgid "Only settler units can be put into auto mode."
msgstr "Ìüíï ìïíÜäåò áðïéêéóìïý ìðïñïýí íá ôåèïýí óå áõôüìáôç ëåéôïõñãßá."
-#: client/control.c:1516
+#: client/control.c:1511
msgid "Only nuclear units can do this."
msgstr "Ìüíï ðõñçíéêÝò ìïíÜäåò ìðïñïýí íá ôï êÜíïõí áõôü."
-#: client/control.c:1545
+#: client/control.c:1540
msgid "Only paratrooper units can do this."
msgstr "Ìüíï ìïíÜäåò áëåîéðôùôéóôþí ìðïñïýí íá ôï êÜíïõí áõôü."
-#: client/control.c:2020
+#: client/control.c:2015
msgid "Too far for this unit."
msgstr "Ðïëý ìáêñßá ãéá áõôÞ ôç ìïíÜäá"
-#: client/control.c:2230 client/control.c:2260 client/control.c:2276
+#: client/control.c:2225 client/control.c:2255 client/control.c:2271
msgid "Didn't find a route to the destination!"
msgstr "Äåí âñÞêá äéáäñïìÞ ãéá ðñïïñéóìü!"
-#: client/control.c:2320
+#: client/control.c:2315
msgid "Oh my! You seem to have no capital!"
msgstr "Á! Öáßíåôáé üôé äåí Ý÷åéò ðñùôåýïõóá!"
@@ -8582,115 +8718,122 @@ msgstr ""
#. * last two elements
#. TRANS: List of possible output types has this between
#. * last two elements
-#: client/helpdata.c:1066 client/helpdata.c:1400
+#: client/helpdata.c:1066 client/helpdata.c:1408
msgid " or "
msgstr ""
-#: client/helpdata.c:1068 client/helpdata.c:1388
+#: client/helpdata.c:1068 client/helpdata.c:1396
msgid "?or:, "
msgstr ""
-#: client/helpdata.c:1080
+#: client/helpdata.c:1079
+#, c-format
+msgid "* Unit has to be in a city, or a base after %d turn.\n"
+msgid_plural "* Unit has to be in a city, or a base after %d turns.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: client/helpdata.c:1087
#, 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"
+msgid "* Unit has to be in a city, a base, or on a %s after %d turn.\n"
+msgid_plural "* Unit has to be in a city, a base, or on a %s after %d turns.\n"
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1122
+#: client/helpdata.c:1130
#, c-format
msgid "If we would now start with %s we would need %d bulbs."
msgstr ""
-#: client/helpdata.c:1127
+#: client/helpdata.c:1135
#, 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:1135
+#: client/helpdata.c:1143
msgid "You cannot research this technology."
msgstr ""
-#: client/helpdata.c:1139
+#: client/helpdata.c:1147
msgid " This number may vary depending on what other players will research.\n"
msgstr ""
-#: client/helpdata.c:1151
+#: client/helpdata.c:1159
#, c-format
msgid "* The first player to research %s gets an immediate advance.\n"
msgstr ""
-#: client/helpdata.c:1156
+#: client/helpdata.c:1164
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
msgstr ""
-#: client/helpdata.c:1159
+#: client/helpdata.c:1167
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
msgstr ""
-#: client/helpdata.c:1163
+#: client/helpdata.c:1171
msgid "* Increases the pollution generated by the population.\n"
msgstr ""
-#: client/helpdata.c:1168
+#: client/helpdata.c:1176
#, c-format
msgid "* Allows %s to build roads on river squares.\n"
msgstr ""
-#: client/helpdata.c:1175
+#: client/helpdata.c:1183
#, fuzzy, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr "* Óïõ åðéôñÝðåé íá ÷ôßóåéò %s.\n"
-#: client/helpdata.c:1183
+#: client/helpdata.c:1191
#, fuzzy, c-format
msgid "* Allows %s to build airbases.\n"
msgstr "* Óïõ åðéôñÝðåé íá ÷ôßóåéò %s.\n"
-#: client/helpdata.c:1192
+#: client/helpdata.c:1200
#, c-format
msgid "* Allows %s to upgrade roads to railroads.\n"
msgstr ""
-#: client/helpdata.c:1200
+#: client/helpdata.c:1208
#, c-format
msgid "* Allows %s to upgrade irrigation to farmland.\n"
msgstr ""
-#: client/helpdata.c:1234
+#: client/helpdata.c:1242
msgid "* Pollution cannot be generated on this terrain."
msgstr ""
-#: client/helpdata.c:1239
+#: client/helpdata.c:1247
msgid "* You cannot build cities on this terrain."
msgstr ""
-#: client/helpdata.c:1245
+#: client/helpdata.c:1253
msgid "* The coastline of this terrain is unsafe."
msgstr ""
-#: client/helpdata.c:1250
+#: client/helpdata.c:1258
msgid "* This terrain is unsafe for units to travel on."
msgstr ""
-#: client/helpdata.c:1255
+#: client/helpdata.c:1263
msgid "* Land units cannot travel on oceanic terrains."
msgstr ""
-#: client/helpdata.c:1305
+#: client/helpdata.c:1313
msgid "Features:\n"
msgstr ""
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1411 client/helpdata.c:1412
+#: client/helpdata.c:1419 client/helpdata.c:1420
msgid "?outputlist: Nothing "
msgstr ""
-#: client/helpdata.c:1419
+#: client/helpdata.c:1427
#, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -8701,7 +8844,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1429
+#: client/helpdata.c:1437
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8709,48 +8852,48 @@ msgid ""
msgstr ""
#. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1437
+#: client/helpdata.c:1445
#, c-format
msgid "* You pay %d times normal %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1442
+#: client/helpdata.c:1450
#, 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:1447
+#: client/helpdata.c:1455
#, c-format
msgid "* You pay no %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1451
+#: client/helpdata.c:1459
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:1460
+#: client/helpdata.c:1468
#, 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:1468
+#: client/helpdata.c:1476
#, c-format
msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
msgstr ""
-#: client/helpdata.c:1475
+#: client/helpdata.c:1483
#, 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:1482
+#: client/helpdata.c:1490
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -8758,23 +8901,23 @@ msgid ""
msgstr ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1489
+#: client/helpdata.c:1497
#, 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:1497
+#: client/helpdata.c:1505
#, c-format
msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
msgstr ""
-#: client/helpdata.c:1502
+#: client/helpdata.c:1510
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr ""
-#: client/helpdata.c:1507
+#: client/helpdata.c:1515
#, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -8785,7 +8928,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1519
+#: client/helpdata.c:1527
#, 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"
@@ -8793,60 +8936,60 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1530
+#: client/helpdata.c:1538
#, 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:1536
+#: client/helpdata.c:1544
msgid "* Your units cannot be bribed.\n"
msgstr ""
-#: client/helpdata.c:1539
+#: client/helpdata.c:1547
msgid "* Your cities cannot be incited.\n"
msgstr ""
-#: client/helpdata.c:1543
+#: client/helpdata.c:1551
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:1549
+#: client/helpdata.c:1557
msgid "* Has a senate that may prevent declaration of war.\n"
msgstr ""
-#: client/helpdata.c:1553
+#: client/helpdata.c:1561
msgid "* Allows partisans when cities are taken by the enemy.\n"
msgstr ""
-#: client/helpdata.c:1557
+#: client/helpdata.c:1565
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
msgstr ""
-#: client/helpdata.c:1561
+#: client/helpdata.c:1569
msgid "* Pays no upkeep for fanatics.\n"
msgstr ""
-#: client/helpdata.c:1564
+#: client/helpdata.c:1572
msgid "* Has no unhappy citizens.\n"
msgstr ""
-#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
+#: client/helpdata.c:1582 client/helpdata.c:1586 client/helpdata.c:1590
#, c-format
msgid "* Veteran %s units.\n"
msgstr ""
-#: client/helpdata.c:1585
+#: client/helpdata.c:1593
msgid "* Veteran units.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1591
+#: client/helpdata.c:1599
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8854,7 +8997,7 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1600
+#: client/helpdata.c:1608
#, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8862,37 +9005,37 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1608
+#: client/helpdata.c:1616
#, 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:1617
+#: client/helpdata.c:1625
#, 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:1625
+#: client/helpdata.c:1633
#, c-format
msgid "* %s production will suffer massive waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1630
+#: client/helpdata.c:1638
#, 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:1635
+#: client/helpdata.c:1643
#, 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:1643
+#: client/helpdata.c:1651
#, c-format
msgid "* %s waste will increase quickly with distance from capital.\n"
msgstr ""
@@ -8900,37 +9043,37 @@ msgstr ""
"ðñùôåýïõóá. \n"
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1649
+#: client/helpdata.c:1657
#, 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:1655
+#: client/helpdata.c:1663
#, c-format
msgid "* %s waste will increase slowly with distance from capital.\n"
msgstr ""
"* %s áðüâëçôá èá áõîçèïýí áñãÜ áíÜëïãá ìå ôçí áðüóôáóç áðü ôçí ðñùôåýïõóá. \n"
-#: client/helpdata.c:1672
+#: client/helpdata.c:1680
#, c-format
msgid "* Allows you to build %s.\n"
msgstr "* Óïõ åðéôñÝðåé íá ÷ôßóåéò %s.\n"
#. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1699
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d %s"
msgstr ""
-#: client/helpdata.c:1700 client/helpdata.c:1708 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1708 client/helpdata.c:1716 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:1707
+#: client/helpdata.c:1715
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d äõóôõ÷éóìÝíïé"
@@ -8999,7 +9142,7 @@ msgid ""
"or with the -a command-line parameter."
msgstr ""
-#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:916 data/Freeciv.in:107
msgid "Metaserver"
msgstr ""
@@ -9349,36 +9492,36 @@ msgstr "
msgid "Saved settings to file %s"
msgstr "Áðïèçêåýôçêáí ïé ñõèìßóåéò óôï áñ÷åßï %s"
-#: client/packhand.c:211 client/packhand.c:217
+#: client/packhand.c:212 client/packhand.c:218
#, fuzzy
msgid "You were rejected from the game...."
msgstr "ÁðïâëÞèçêåò áðü ôï ðáé÷íßäé: %s"
-#: client/packhand.c:229
+#: client/packhand.c:230
#, c-format
msgid "Client capability string: %s"
msgstr "Áëöáñçèìçôéêü äõíáôïôÞôùí ðåëÜôç: %s"
-#: client/packhand.c:232
+#: client/packhand.c:233
#, c-format
msgid "Server capability string: %s"
msgstr "Áëöáñçèìçôéêü äõíáôïôÞôùí åîõðçñåôçôÞ: %s"
-#: client/packhand.c:850
+#: client/packhand.c:864
#, c-format
msgid "Start of turn %d"
msgstr "Áñ÷Þ %d ãýñïõ"
-#: client/packhand.c:1591
+#: client/packhand.c:1621
#, c-format
msgid "AI Mode is now %s."
msgstr "ÔÍ åßíáé ôþñá %s."
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "ON"
msgstr "Áíïé÷ôü"
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "OFF"
msgstr "Êëåéóôü"
@@ -9410,15 +9553,15 @@ msgstr "?Player:
msgid "Username"
msgstr "¼íïìá ÷ñÞóôç"
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
-#: client/gui-gtk-2.0/pages.c:2157
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:653
+#: client/gui-gtk-2.0/pages.c:1604 client/gui-gtk-2.0/pages.c:2159
msgid "Flag"
msgstr "Óçìáßá"
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1605
-#: client/gui-gtk-2.0/pages.c:2159 client/gui-sdl/repodlgs.c:2063
-#: client/gui-win32/connectdlg.c:990 client/gui-win32/dialogs.c:542
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:657
+#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1609
+#: client/gui-gtk-2.0/pages.c:2161 client/gui-sdl/repodlgs.c:2063
+#: client/gui-win32/connectdlg.c:992 client/gui-win32/dialogs.c:542
#: client/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "¸èíïò"
@@ -9431,7 +9574,7 @@ msgstr "
msgid "Score"
msgstr "Âáèìïëïãßá"
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1614
msgid "Team"
msgstr "ÏìÜäá"
@@ -9464,36 +9607,36 @@ msgstr "?Player_dlg:
msgid "Ping"
msgstr "Ping"
-#: client/repodlgs_common.c:375
+#: client/repodlgs_common.c:378
msgid "You cannot sell improvements."
msgstr "Äåí ìðïñåßò íá ðïõëÞóåéò õðïäïìÝò."
-#: client/repodlgs_common.c:391
+#: client/repodlgs_common.c:394
#, c-format
msgid "Sold %d %s for %d gold."
msgstr "ÐïõëÞèçêå %d %s ãéá %d ÷ñõóÜ"
-#: client/repodlgs_common.c:396
+#: client/repodlgs_common.c:399
#, c-format
msgid "No %s could be sold."
msgstr "ÊáíÝíá %s äåí ìðüñåóå íá ðïõëçèåß"
#. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:415
+#: client/repodlgs_common.c:418
msgid "You cannot disband units."
msgstr "Äåí ìðïñåßò íá áðïëýóåéò ìïíÜäåò"
-#: client/repodlgs_common.c:420
+#: client/repodlgs_common.c:423
#, c-format
msgid "%s cannot be disbanded."
msgstr "%s äåí ìðïñåß íá áðïëõèåß"
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:444
#, c-format
msgid "Disbanded %d %s."
msgstr "Áðïëýèçêå %d %s."
-#: client/repodlgs_common.c:445
+#: client/repodlgs_common.c:448
#, c-format
msgid "No %s could be disbanded."
msgstr "ÊáíÝíá %s äåí åãêáôáëåßöèçêå."
@@ -10080,47 +10223,47 @@ msgstr ""
msgid "?duration:overflow"
msgstr ""
-#: client/text.c:1143
+#: client/text.c:1145
#, c-format
msgid "%6d.%02d ms"
msgstr ""
#. TRANS: <nation adjective> <government name>.
#. * E.g. "Polish Republic".
-#: client/text.c:1188
+#: client/text.c:1193
#, fuzzy, c-format
msgid "?nationgovernment:%s %s"
msgstr "Ðïëßôåõìá: %s"
#. TRANS: "Observer: 1985"
-#: client/text.c:1198
+#: client/text.c:1203
#, c-format
msgid "Observer: %s"
msgstr "ÐáñáôçñçôÞò: %s"
-#: client/text.c:1216
+#: client/text.c:1221
msgid "Buildings: "
msgstr "ÊôÞñéá: "
-#: client/text.c:1233 client/text.c:1272
+#: client/text.c:1238 client/text.c:1277
msgid "None. "
msgstr "ÊáíÝíá. "
-#: client/text.c:1235 client/text.c:1274
+#: client/text.c:1240 client/text.c:1279
msgid "?clistend:."
msgstr ""
-#: client/text.c:1253
+#: client/text.c:1258
msgid "Wonders: "
msgstr "Èáýìáôá: "
-#: client/text.c:1308
+#: client/text.c:1313
#, 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:1312
+#: client/text.c:1317
#, fuzzy, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
@@ -10128,61 +10271,61 @@ msgstr[0] "%d
msgstr[1] "%d éêáíïðïéçìÝíïé ðñßí áðü ðïéíÞ áðü "
#. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1318
+#: client/text.c:1323
#, fuzzy, c-format
msgid "%d additional unhappy citizen."
msgid_plural "%d additional unhappy citizens."
msgstr[0] "%d åðéðñüóèåôïé äõóôõ÷éóìÝíïé ðïëßôåò."
msgstr[1] "%d åðéðñüóèåôïé äõóôõ÷éóìÝíïé ðïëßôåò."
-#: client/text.c:1339
+#: client/text.c:1344
#, fuzzy
msgid "Unlimited martial law in effect."
msgstr "Óôñáôéùôéêüò íüìïò óå éó÷ý ("
-#: client/text.c:1341
+#: client/text.c:1346
#, c-format
msgid "%d military unit may impose martial law."
msgid_plural "Up to %d military units may impose martial law."
msgstr[0] ""
msgstr[1] ""
-#: client/text.c:1345
+#: client/text.c:1350
#, c-format
msgid "Each military unit makes %d unhappy citizen content."
msgid_plural "Each military unit makes %d unhappy citizens content."
msgstr[0] ""
msgstr[1] ""
-#: client/text.c:1352
+#: client/text.c:1357
msgid "Military units in the field may cause unhappiness. "
msgstr "ÓôñáôéùôéêÝò ìïíÜäåò óôï ðåäßï ßóùò ðñïêáëÝóïõí äõóôõ÷ßá"
-#: client/text.c:1355
+#: client/text.c:1360
msgid "Military units have no happiness effect. "
msgstr "ÓôñáôéùôéêÝò ìïíÜäåò äåí Ý÷ïõí åðßäñáóç óôçí åõôõ÷ßá"
-#: client/text.c:1370
+#: client/text.c:1375
#, c-format
msgid "Luxury: %d total."
msgstr "ÁíÝóåéò: %d óýíïëï"
-#: client/tilespec.c:865
+#: client/tilespec.c:882
msgid "No usable default tileset found, aborting!"
msgstr ""
-#: client/tilespec.c:1338
+#: client/tilespec.c:1355
msgid ""
"Client does not support isometric tilesets. Using default tileset instead."
msgstr ""
-#: client/tilespec.c:1347
+#: client/tilespec.c:1364
msgid ""
"Client does not support overhead view tilesets. Using default tileset "
"instead."
msgstr ""
-#: client/tilespec.c:3966
+#: client/tilespec.c:3987
#, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -10872,7 +11015,7 @@ msgid "_Display"
msgstr "_Äéðëùìáôßá"
#: client/gui-gtk-2.0/cityrep.c:1006 client/gui-gtk-2.0/menu.c:839
-#: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
+#: client/gui-sdl/diplodlg.c:692 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
#: client/gui-xaw/cityrep.c:533 client/gui-xaw/menu.c:156
@@ -11046,198 +11189,198 @@ msgstr "
msgid "Remove this preset?"
msgstr "Íá áöáéñåèåß áõôüò ï êõâåñíçôéêüò óôü÷ïò;"
-#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:222
+#: client/gui-gtk-2.0/dialogs.c:197 client/gui-gtk-2.0/messagewin.c:222
#, fuzzy
msgid "Goto _Location"
msgstr "ÐÞãáéíå óå ðåñéï÷Þ"
-#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
+#: client/gui-gtk-2.0/dialogs.c:202 client/gui-gtk-2.0/messagewin.c:226
#, fuzzy
msgid "Inspect _City"
msgstr "_Åñåýíçóå ôçí ðüëç"
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:258 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:258 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:259 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:311 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:312 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:312 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:313 client/gui-win32/dialogs.c:1755
#: data/Freeciv.in:2502
msgid "Select what to pillage:"
msgstr "ÅðÝëåîå ôß íá ëåçëáôçèåß:"
-#: client/gui-gtk-2.0/dialogs.c:506
+#: client/gui-gtk-2.0/dialogs.c:507
msgid "Unit"
msgstr "ÌïíÜäá"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:950
-#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2155
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:985
+#: client/gui-gtk-2.0/dialogs.c:508 client/gui-gtk-2.0/pages.c:950
+#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2157
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:987
#: client/gui-win32/plrdlg.c:335 manual/civmanual.c:302 data/Freeciv.in:80
msgid "Name"
msgstr "¼íïìá"
-#: client/gui-gtk-2.0/dialogs.c:519 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:520 client/gui-sdl/dialogs.c:627
msgid "Unit selection"
msgstr "ÅðéëïãÞ ìïíÜäáò"
-#: client/gui-gtk-2.0/dialogs.c:582
+#: client/gui-gtk-2.0/dialogs.c:583
msgid "_Ready all"
msgstr "_¸ôïéìåò üëåò"
-#: client/gui-gtk-2.0/dialogs.c:590
+#: client/gui-gtk-2.0/dialogs.c:591
msgid "_Sentry idle"
msgstr "_Öñïõñüò áäñáíÞò"
-#: client/gui-gtk-2.0/dialogs.c:719
+#: client/gui-gtk-2.0/dialogs.c:721
#, fuzzy
msgid "Nation _Groups:"
msgstr "_¸èíç"
-#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:766 data/Freeciv.in:3128
msgid "What Nation Will You Be?"
msgstr "Ðïéü Ýèíïò èá åßóáé;"
-#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
-#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
+#: client/gui-gtk-2.0/dialogs.c:768 client/gui-sdl/chatline.c:842
+#: client/gui-win32/connectdlg.c:1040 data/Freeciv.in:3371
msgid "Pick Nation"
msgstr "ÅðÝëåîå Ýèíïò"
-#: client/gui-gtk-2.0/dialogs.c:774
+#: client/gui-gtk-2.0/dialogs.c:776
#, fuzzy
msgid "_Random Nation"
msgstr "Ôõ÷áßï Ýèíïò"
-#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:792 client/gui-win32/dialogs.c:517
msgid "Select a nation"
msgstr "ÄéÜëåîå Ýíá Ýèíïò"
-#: client/gui-gtk-2.0/dialogs.c:804
+#: client/gui-gtk-2.0/dialogs.c:810
msgid "_Properties"
msgstr "_Éäéüôçôåò"
-#: client/gui-gtk-2.0/dialogs.c:824
+#: client/gui-gtk-2.0/dialogs.c:830
msgid "_Leader:"
msgstr "_ÇãÝôçò"
-#: client/gui-gtk-2.0/dialogs.c:831
+#: client/gui-gtk-2.0/dialogs.c:837
msgid "_Female"
msgstr "_Ãõíáßêá"
-#: client/gui-gtk-2.0/dialogs.c:836
+#: client/gui-gtk-2.0/dialogs.c:842
msgid "_Male"
msgstr "_¶íäñáò"
-#: client/gui-gtk-2.0/dialogs.c:863
+#: client/gui-gtk-2.0/dialogs.c:869
#, fuzzy
msgid "City _Styles:"
msgstr "_Óôõë ðüëçò"
-#: client/gui-gtk-2.0/dialogs.c:902
+#: client/gui-gtk-2.0/dialogs.c:908
#, fuzzy
msgid "_Description"
msgstr "Óôñáôïëïãßá"
-#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1263 client/gui-xaw/dialogs.c:1480
msgid "You must select your sex."
msgstr "ÐñÝðåé íá åðéëÝîåéò öýëï"
-#: client/gui-gtk-2.0/dialogs.c:1253 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1268 client/gui-xaw/dialogs.c:1485
msgid "You must select your city style."
msgstr "ÐñÝðåé íá åðéëÝîåéò óôõë ðüëçò."
-#: client/gui-gtk-2.0/dialogs.c:1262 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1277 client/gui-sdl/dialogs.c:2204
#: 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:1306 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1318 client/gui-win32/citydlg.c:1454
#: data/Freeciv.in:2484
msgid "Upgrade Unit!"
msgstr "ÁíáâÜèìéóå ìïíÜäá!"
-#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1327 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 "ÁíáâÜèìéóå áðáñ÷áéùìÝíåò ìïíÜäåò"
-#: client/gui-gtk-2.0/diplodlg.c:231 client/gui-win32/diplodlg.c:151
+#: client/gui-gtk-2.0/diplodlg.c:222 client/gui-win32/diplodlg.c:151
#: client/gui-xaw/diplodlg.c:383 client/gui-xaw/diplodlg.c:401
msgid "World-map"
msgstr "Ðáãêüóìéïò-÷Üñôçò"
-#: client/gui-gtk-2.0/diplodlg.c:237 client/gui-win32/diplodlg.c:146
+#: client/gui-gtk-2.0/diplodlg.c:228 client/gui-win32/diplodlg.c:146
#: client/gui-xaw/diplodlg.c:387 client/gui-xaw/diplodlg.c:405
msgid "Sea-map"
msgstr "×Üñôçò-èÜëáóóáò"
-#: client/gui-gtk-2.0/diplodlg.c:243
+#: client/gui-gtk-2.0/diplodlg.c:234
msgid "_Maps"
msgstr "_×Üñôåò"
-#: client/gui-gtk-2.0/diplodlg.c:274
+#: client/gui-gtk-2.0/diplodlg.c:265
msgid "_Advances"
msgstr "_Ðñüïäïé"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/diplodlg.c:315 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "Ðü_ëåéò"
-#: client/gui-gtk-2.0/diplodlg.c:333
+#: client/gui-gtk-2.0/diplodlg.c:324
msgid "_Give shared vision"
msgstr "_Äþóå êïéíÞ ïñáôüôçôá"
-#: client/gui-gtk-2.0/diplodlg.c:346
+#: client/gui-gtk-2.0/diplodlg.c:337
msgid "Give _embassy"
msgstr "Äþóå ðñÝó_âåéá"
-#: client/gui-gtk-2.0/diplodlg.c:376
+#: client/gui-gtk-2.0/diplodlg.c:368
msgid "_Pacts"
msgstr "_Óýìöùíá"
-#: client/gui-gtk-2.0/diplodlg.c:466
+#: client/gui-gtk-2.0/diplodlg.c:458
#, c-format
msgid "Diplomacy: %s"
msgstr "Äéðëùìáôßá %s"
-#: client/gui-gtk-2.0/diplodlg.c:473
+#: client/gui-gtk-2.0/diplodlg.c:465
msgid "_Cancel meeting"
msgstr "_Áêýñùóå óõíÜíôçóç"
-#: client/gui-gtk-2.0/diplodlg.c:475
+#: client/gui-gtk-2.0/diplodlg.c:467
msgid "Accept _treaty"
msgstr "ÁðïäÝ_îïõ óõìöùíßá"
-#: client/gui-gtk-2.0/diplodlg.c:503
+#: client/gui-gtk-2.0/diplodlg.c:495
msgid "C_lauses:"
msgstr "_¼ñïé"
-#: client/gui-gtk-2.0/diplodlg.c:568 client/gui-gtk-2.0/diplodlg.c:642
+#: client/gui-gtk-2.0/diplodlg.c:560 client/gui-gtk-2.0/diplodlg.c:634
msgid "_Gold:"
msgstr "_×ñõóüò"
-#: client/gui-gtk-2.0/diplodlg.c:580 client/gui-gtk-2.0/diplodlg.c:654
+#: client/gui-gtk-2.0/diplodlg.c:572 client/gui-gtk-2.0/diplodlg.c:646
msgid "_Add Clause..."
msgstr "Ðñü_óèåóå ¼ñï..."
-#: client/gui-gtk-2.0/diplodlg.c:699
+#: client/gui-gtk-2.0/diplodlg.c:691
msgid "--- This treaty is blank. Please add some clauses. ---"
msgstr "--- ÁõôÞ ç óõíèÞêç åßíáé êåíÞ. Ðáñáêáëþ ðñïóèÝóôå ìåñéêïýò üñïõò. ---"
-#: client/gui-gtk-2.0/diplodlg.c:905 client/gui-sdl/diplodlg.c:375
+#: client/gui-gtk-2.0/diplodlg.c:897 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 "Êáèïñßóôçêå ëÜèïò ðïóü ÷ñõóïý."
@@ -11298,20 +11441,20 @@ msgstr "
msgid "Show _All Cities"
msgstr "Äåßîå _¼ëåò ôéò ðüëåéò"
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:164
msgid "Show Map Scrollbars"
msgstr "Äåßîå ìðÜñåò êýëéóçò ÷Üñôç"
-#: client/gui-gtk-2.0/gui_main.c:163
+#: client/gui-gtk-2.0/gui_main.c:165
msgid "Disable this option to hide the scrollbars on the map view."
msgstr ""
"Áðåíåñãïðïßçóå áõôÞ ôçí åðéëïãÞ ãéá íá êñýøåéò ôéò ñÜâäïõò êýëéóçò ôïõ ÷Üñôç."
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:169
msgid "Keyboardless goto"
msgstr "Ìåôáêßíçóç ÷ùñßò ðëçêôñïëüãéï"
-#: client/gui-gtk-2.0/gui_main.c:168
+#: client/gui-gtk-2.0/gui_main.c:170
msgid ""
"If this option is set then a goto may be initiated by left-clicking and then "
"holding down the mouse button while dragging the mouse onto a different tile."
@@ -11320,11 +11463,11 @@ msgstr ""
"áñéóôåñü êëßê êáé ìåôÜ êñáôþíôáò ðáôçìÝíï ôï ðïíôßêé ôïõ ðïíôéêéïý êáèþò "
"óÝñíïõìå ôï ðïíôßêé óå Ýíá äéáöïñåôéêü ôåôñÜãùíï"
-#: client/gui-gtk-2.0/gui_main.c:173
+#: client/gui-gtk-2.0/gui_main.c:175
msgid "Keep dialogs on top"
msgstr "ÄéáôÞñçóå ôïõò äéáëüãïõò óôï ðñïóêÞíéï"
-#: client/gui-gtk-2.0/gui_main.c:174
+#: client/gui-gtk-2.0/gui_main.c:176
msgid ""
"If this option is set then dialog windows will always remain in front of the "
"main Freeciv window. Disabling this has no effect in fullscreen mode."
@@ -11333,12 +11476,12 @@ msgstr ""
"ìðñïóôÜ áðü ôï êåíôñéêü ðáñÜèõñï ôïõ Freeciv. ÁðåíåñãïðïßçóÞ ôçò äåí èá Ý÷åé "
"áðïôÝëåóìá óå åìöÜíéóç ðëÞñïõò ïèüíçò"
-#: client/gui-gtk-2.0/gui_main.c:178
+#: client/gui-gtk-2.0/gui_main.c:180
#, fuzzy
msgid "Show worklist task icons"
msgstr "Äåßîå åéêïíßäéá ëßóôáò åñãáóéþí"
-#: client/gui-gtk-2.0/gui_main.c:179
+#: client/gui-gtk-2.0/gui_main.c:181
msgid ""
"Disabling this will turn off the unit and building icons in the worklist "
"dialog and the production tab of the city dialog."
@@ -11346,11 +11489,11 @@ msgstr ""
"Áðåíåñãïðïéþíôáò áõôÞ ôçí åðéëïãÞ èá áðïìáêñõíèïýí ôá åéêïíßäéá ôùí ìïíÜäùí "
"êáé ôùí êôçñßùí áðü ôçí ëßóôá åñãáóßùí."
-#: client/gui-gtk-2.0/gui_main.c:183
+#: client/gui-gtk-2.0/gui_main.c:185
msgid "Enable status report tabs"
msgstr "Åíåñãïðïßçóå êáñôÝëåò áíáöïñÜò êáôÜóôáóçò"
-#: client/gui-gtk-2.0/gui_main.c:184
+#: client/gui-gtk-2.0/gui_main.c:186
msgid ""
"If this option is enabled then report dialogs will be shown as separate tabs "
"rather than in popup dialogs."
@@ -11358,12 +11501,12 @@ msgstr ""
"ÅÜí áõôÞ ç åðéëïãÞ åíåñãïðïéçèåß ôüôå ïé äéÜëïãïé áíáöïñÜò èá åìöáíßæïíôáé "
"óå îå÷ùñéóôÝò êáñôÝëåò êáé ü÷é óå áíáäõüìåíá ðáñÜèõñá."
-#: client/gui-gtk-2.0/gui_main.c:189 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:191 client/gui-win32/gui_main.c:110
#, fuzzy
msgid "Better fog-of-war drawing"
msgstr "Êáëýôåñç áðåéêüíéóç ôçò ïìß÷ëçò ôïõ ðïëÝìïõ"
-#: client/gui-gtk-2.0/gui_main.c:190 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:192 client/gui-win32/gui_main.c:111
msgid ""
"If this is enabled then a better method is used for drawing fog-of-war. It "
"is not any slower but will consume about twice as much memory."
@@ -11371,41 +11514,41 @@ msgstr ""
"ÅÜí áõôÞ ç åðéëïãÞ åíåñãïðïéçèåß ôüôå èá ÷ñçóéìïðïéçèåß ìéá êáëýôåñç ìÝèïäïò "
"ãéá ôï ó÷åäéáóìü ôçò ïìß÷ëçò ôïõ ðïëÝìïõ ðïõ ÷ñåéÜæåôáé üìùò äéðëÜóéá ìíÞìç."
-#: client/gui-gtk-2.0/gui_main.c:195
+#: client/gui-gtk-2.0/gui_main.c:197
msgid "Show time for each chat message"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:196
+#: client/gui-gtk-2.0/gui_main.c:198
msgid ""
"If this option is enabled then all chat messages will be prefixed by a time "
"string of the form [hour:minute:second]."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:201
+#: client/gui-gtk-2.0/gui_main.c:203
msgid "Split bottom notebook area"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:202
+#: client/gui-gtk-2.0/gui_main.c:204
msgid ""
"Enabling this option will split the bottom notebook into a left and right "
"notebook so that two tabs may be viewed at once."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:207
+#: client/gui-gtk-2.0/gui_main.c:209
msgid "New message events go to top of list"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:208
+#: client/gui-gtk-2.0/gui_main.c:210
msgid ""
"If this option is enabled, new events in the message window will appear at "
"the top of the list, rather than being appended at the bottom."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:213
+#: client/gui-gtk-2.0/gui_main.c:215
msgid "Show extra message window buttons"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:214
+#: client/gui-gtk-2.0/gui_main.c:216
msgid ""
"If this option is enabled, there will be two buttons displayed in the "
"message window for inspecting a city and going to a location. If this option "
@@ -11415,21 +11558,21 @@ msgid ""
"closed and reopened."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:224
+#: client/gui-gtk-2.0/gui_main.c:226
msgid "Metaserver tab first in network page"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:225
+#: client/gui-gtk-2.0/gui_main.c:227
msgid ""
"If this option is enabled, the metaserver tab will be the first notebook tab "
"in the network page. This option requires a restart in order to take effect."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:230
+#: client/gui-gtk-2.0/gui_main.c:232
msgid "Plain chat messages are sent to allies only"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:231
+#: client/gui-gtk-2.0/gui_main.c:233
msgid ""
"If this option is enabled, then plain messages typed into the chat entry "
"while the game is running will only be sent to your allies. Otherwise plain "
@@ -11439,28 +11582,41 @@ msgid ""
"visible in multiplayer games)."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:340 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:245
+msgid "Arrange widgets for small displays"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:246
+msgid ""
+"If this option is enabled, widgets in the main window will be arrange so "
+"that they take up the least amount of total screen space. Specifically, the "
+"left panel containing the overview, player status, and the unit information "
+"box will be extended over the entire left side of the window. This option "
+"requires a restart in order to take effect."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:352 client/gui-xaw/gui_main.c:245
msgid ""
"This client has no special command line options\n"
"\n"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
+#: client/gui-gtk-2.0/gui_main.c:847 client/gui-gtk-2.0/gui_main.c:1542
msgid "Freeciv"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
+#: client/gui-gtk-2.0/gui_main.c:1251 client/gui-gtk-2.0/gui_main.c:1258
#: client/gui-sdl/mapctrl.c:1566 client/gui-win32/gui_main.c:482
#: data/Freeciv.in:2618
msgid "Turn Done"
msgstr "ÔÝëïò ãýñïõ"
-#: client/gui-gtk-2.0/gui_main.c:1232 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1258 client/gui-sdl/mapctrl.c:1566
#: client/gui-sdl/mapview.c:1082
msgid "Shift+Return"
msgstr "Shift+¸íôåñ"
-#: client/gui-gtk-2.0/gui_main.c:1266 client/gui-gtk-2.0/menu.c:797
+#: client/gui-gtk-2.0/gui_main.c:1299 client/gui-gtk-2.0/menu.c:797
#: client/gui-gtk-2.0/menu.c:799 client/gui-gtk-2.0/menu.c:801
#: client/gui-gtk-2.0/menu.c:803 client/gui-gtk-2.0/menu.c:805
#: client/gui-gtk-2.0/menu.c:807 client/gui-gtk-2.0/menu.c:809
@@ -11479,12 +11635,12 @@ msgstr "Shift+
msgid "View"
msgstr "ÐñïâïëÞ"
-#: client/gui-gtk-2.0/gui_main.c:1359
+#: client/gui-gtk-2.0/gui_main.c:1393
#, fuzzy
msgid "Chat"
msgstr "_Êïõâåíôïýëá"
-#: client/gui-gtk-2.0/gui_main.c:1377 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1411 client/gui-win32/gui_main.c:538
#: data/Freeciv.in:2809
msgid ""
"Freeciv is free software and you are welcome to distribute copies of it\n"
@@ -11495,80 +11651,80 @@ msgstr ""
"áíôéãñáöÜ ôïõ êÜôù áðü ïñéóìÝíåò ðñïõðïèÝóåéò. Äåò êáé ôçí êáôá÷þóçóç\n"
" \"ÁíôéãñáöÞ\" óôï ìåíïý ÂïÞèåéá. Tþñá... þñá ãéá áãþíá! "
-#: client/gui-gtk-2.0/gui_main.c:1392
+#: client/gui-gtk-2.0/gui_main.c:1426
msgid "Allies Only"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1657
+#: client/gui-gtk-2.0/gui_main.c:1691
msgid "Not _ready"
msgstr "¼÷é Ý_ôïéìïò"
-#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
+#: client/gui-gtk-2.0/gui_main.c:1702 client/gui-gtk-2.0/pages.c:1679
msgid "_Ready"
msgstr "_¸ôïéìïò"
-#: client/gui-gtk-2.0/gui_main.c:1672 client/gui-gtk-2.0/gui_main.c:1678
-#: client/gui-gtk-2.0/pages.c:2204
+#: client/gui-gtk-2.0/gui_main.c:1706 client/gui-gtk-2.0/gui_main.c:1712
+#: client/gui-gtk-2.0/pages.c:2206
msgid "_Start"
msgstr "_Åêêßíçóç"
-#: client/gui-gtk-2.0/gui_main.c:1686
+#: client/gui-gtk-2.0/gui_main.c:1720
#, fuzzy
msgid "_Take Player"
msgstr "ÅðÝëåîå áõôüí ôïí ðáß÷ôç"
-#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
+#: client/gui-gtk-2.0/gui_main.c:1723 client/gui-gtk-2.0/pages.c:1669
msgid "Pick _Nation"
msgstr "ÄéÜëåîå _Åèíïò"
-#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
+#: client/gui-gtk-2.0/gui_main.c:1730 client/gui-gtk-2.0/pages.c:1674
msgid "_Observe"
msgstr "_Ðáñáêïëoýèçóå"
-#: client/gui-gtk-2.0/gui_main.c:1698
+#: client/gui-gtk-2.0/gui_main.c:1732
#, fuzzy
msgid "Do not _observe"
msgstr "_Ìçí ðáñáêïëïõèåßò"
-#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1755 client/gui-xaw/pages.c:211
msgid "<AI>"
msgstr "<ÔÍ>"
-#: client/gui-gtk-2.0/gui_main.c:1723
+#: client/gui-gtk-2.0/gui_main.c:1758
msgid "<Novice AI>"
msgstr "<Áñ÷Üñéá ÔÍ>"
-#: client/gui-gtk-2.0/gui_main.c:1726
+#: client/gui-gtk-2.0/gui_main.c:1761
#, fuzzy
msgid "<Easy AI>"
msgstr "<Åýêïëç ÔÍ>"
-#: client/gui-gtk-2.0/gui_main.c:1729
+#: client/gui-gtk-2.0/gui_main.c:1764
msgid "<Normal AI>"
msgstr "<Äýóêïëç ÔÍ>"
-#: client/gui-gtk-2.0/gui_main.c:1732
+#: client/gui-gtk-2.0/gui_main.c:1767
msgid "<Hard AI>"
msgstr "<ÓêëçñÞ ÔÍ>"
-#: client/gui-gtk-2.0/gui_main.c:1742 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1777 client/gui-win32/dialogs.c:594
#: client/gui-xaw/pages.c:217
msgid "Random"
msgstr "Ôõ÷áßï"
-#: client/gui-gtk-2.0/gui_main.c:1808
+#: client/gui-gtk-2.0/gui_main.c:1844 client/gui-gtk-2.0/gui_main.c:1858
msgid "Observer"
msgstr "Ðáñáêïëïýèçóå"
-#: client/gui-gtk-2.0/gui_main.c:1808
+#: client/gui-gtk-2.0/gui_main.c:1858
msgid "Detached"
msgstr "ÁðïêïììÝíï"
-#: client/gui-gtk-2.0/gui_main.c:2073
+#: client/gui-gtk-2.0/gui_main.c:2117
msgid "Are you sure you want to quit?"
msgstr "Åßóáé óßãïõñïò üôé èÝëåéò íá ôåñìáôßóåéò;"
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
#, c-format
msgid ""
"Close Tab:\n"
@@ -11577,7 +11733,7 @@ msgstr ""
"Êëåßóå êáñôÝëá:\n"
"%s"
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
msgid "Ctrl+W"
msgstr ""
@@ -11682,8 +11838,8 @@ msgid "Trans. Rslt/Time:"
msgstr "Ìåôáó÷çìáôéóìüò ÁðïôÝëåóìá/×ñüíïò"
#: 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
-#: client/gui-win32/helpdlg.c:709 client/gui-win32/helpdlg.c:733
+#: client/gui-win32/helpdlg.c:502 client/gui-win32/helpdlg.c:550
+#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:739
#: client/gui-xaw/helpdlg.c:759 client/gui-xaw/helpdlg.c:808
#: client/gui-xaw/helpdlg.c:816 client/gui-xaw/helpdlg.c:853
#: client/gui-xaw/helpdlg.c:878
@@ -11730,35 +11886,35 @@ msgstr "
msgid "?techhelp:"
msgstr ""
-#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:591
+#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:597
#: client/gui-xaw/helpdlg.c:996
#, c-format
msgid "+%d Trade / %d"
msgstr "+%d Åìðüñéï / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:595
+#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:601
#: client/gui-xaw/helpdlg.c:1000
#, c-format
msgid "no extra / %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
-#: client/gui-win32/helpdlg.c:602 client/gui-win32/helpdlg.c:616
-#: client/gui-win32/helpdlg.c:635 client/gui-xaw/helpdlg.c:1002
+#: client/gui-gtk-2.0/helpdlg.c:1085 client/gui-win32/helpdlg.c:604
+#: client/gui-win32/helpdlg.c:608 client/gui-win32/helpdlg.c:622
+#: client/gui-win32/helpdlg.c:641 client/gui-xaw/helpdlg.c:1002
#: client/gui-xaw/helpdlg.c:1006 client/gui-xaw/helpdlg.c:1020
#: client/gui-xaw/helpdlg.c:1039
#, fuzzy
msgid "n/a"
msgstr "ì/å"
-#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:605
+#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:611
#: client/gui-xaw/helpdlg.c:1009
#, c-format
msgid "+%d Food / %d"
msgstr "+%d Öáãçôü / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:619
+#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:625
#: client/gui-xaw/helpdlg.c:1023
#, c-format
msgid "+%d Res. / %d"
@@ -12530,41 +12686,41 @@ msgstr "_
msgid "Connect to Gaming _Zone"
msgstr "Óýíäåóç óå æþíç ðáé÷íéäßùí"
-#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:302
#: client/gui-xaw/connectdlg.c:326
msgid "Passwords don't match, enter password."
msgstr "Ôá óõíèçìáôéêÜ äåí ôáéñéÜæïõí, ðáñáêáëþ åéóÞãáãå óõíèçìáôéêü"
#: client/gui-gtk-2.0/pages.c:779 client/gui-gtk-2.0/pages.c:820
-#: client/gui-win32/connectdlg.c:916
+#: client/gui-win32/connectdlg.c:918
msgid "Server Name"
msgstr "¼íïìá åîõðçñåôçôÞ"
#: client/gui-gtk-2.0/pages.c:780 client/gui-gtk-2.0/pages.c:821
-#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:916
+#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:918
#: data/Freeciv.in:96
msgid "Port"
msgstr "Èýñá"
#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Version"
msgstr "¸êäïóç"
#: client/gui-gtk-2.0/pages.c:782 client/gui-gtk-2.0/pages.c:823
-#: client/gui-gtk-2.0/pages.c:2161 client/gui-win32/connectdlg.c:917
-#: client/gui-win32/connectdlg.c:995
+#: client/gui-gtk-2.0/pages.c:2163 client/gui-win32/connectdlg.c:919
+#: client/gui-win32/connectdlg.c:997
msgid "Status"
msgstr "ÊáôÜóôáóç"
#: client/gui-gtk-2.0/pages.c:783 client/gui-gtk-2.0/pages.c:824
#: client/gui-sdl/connectdlg.c:318 client/gui-sdl/plrdlg.c:330
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Players"
msgstr "Ðáß÷ôåò"
#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
-#: client/gui-win32/connectdlg.c:918
+#: client/gui-win32/connectdlg.c:920
msgid "Comment"
msgstr "Ó÷üëéï"
@@ -12596,9 +12752,9 @@ msgstr "
msgid "Conf_irm Password:"
msgstr "Åðé_âåâáßùóå óõíèçìáôéêü"
-#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2165
#: 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:1000
+#: client/gui-win32/citydlg.c:1083 client/gui-win32/connectdlg.c:1002
#: client/gui-win32/wldlg.c:800 client/gui-win32/wldlg.c:806
msgid "Type"
msgstr "Ôýðïò"
@@ -12694,7 +12850,7 @@ msgstr "
msgid "Ruleset _Version:"
msgstr "_ÓýíïëïÊáíüíùí"
-#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2195
#, fuzzy
msgid "_More Game Options..."
msgstr "Ðåñéóóüôåñåò åðé_ëïãÝò ðáé÷íéäßïõ..."
@@ -12712,49 +12868,49 @@ msgstr "
msgid "Ready"
msgstr "¸ôïéìïò"
-#: client/gui-gtk-2.0/pages.c:1601
+#: client/gui-gtk-2.0/pages.c:1600
#, fuzzy
msgid "?player:Leader"
msgstr "?Player:¼íïìá"
-#: client/gui-gtk-2.0/pages.c:1732 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1734 client/gui-sdl/chatline.c:185
msgid "Choose Saved Game to Load"
msgstr "ÄéÜëåîå áðïèçêåõìÝíï ðáé÷íßäé ãéá öüñôùìá"
-#: client/gui-gtk-2.0/pages.c:1824
+#: client/gui-gtk-2.0/pages.c:1826
msgid "Choose Saved Game to _Load:"
msgstr "ÄéÜëåîå áðïèçêåõìÝíï ðáé÷íßäé ãéá _öüñôùìá"
-#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
-#: client/gui-gtk-2.0/pages.c:2451
+#: client/gui-gtk-2.0/pages.c:1846 client/gui-gtk-2.0/pages.c:2039
+#: client/gui-gtk-2.0/pages.c:2455
msgid "_Browse..."
msgstr "_ÐåñéçãÞóïõ"
-#: client/gui-gtk-2.0/pages.c:1911
+#: client/gui-gtk-2.0/pages.c:1913
msgid "Choose a Scenario"
msgstr "ÅðÝëåîå Ýíá óåíÜñéï"
-#: client/gui-gtk-2.0/pages.c:1998
+#: client/gui-gtk-2.0/pages.c:2000
msgid "Choose a _Scenario:"
msgstr "ÅðÝëåîå _óåíÜñéï"
-#: client/gui-gtk-2.0/pages.c:2173
+#: client/gui-gtk-2.0/pages.c:2175
msgid "Choose a _nation to play:"
msgstr "ÅðÝëåîå ôï _Ýèíïò óïõ:"
-#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2367 client/gui-win32/menu.c:581
msgid "Select Location to Save"
msgstr "ÅðÝëåîå êáôÜëïãï áðïèÞêåõóçò"
-#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2452 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "ÁðïèÞêåõóç ðáé÷íßäé"
-#: client/gui-gtk-2.0/pages.c:2489
+#: client/gui-gtk-2.0/pages.c:2493
msgid "Saved _Games:"
msgstr "ÁðïèçêåõìÝíá _Ðáé÷íßäéá"
-#: client/gui-gtk-2.0/pages.c:2516
+#: client/gui-gtk-2.0/pages.c:2520
msgid "Save _Filename:"
msgstr "ÁðïèÞêåõóç _¼íïìáÁñ÷åßïõ"
@@ -13111,7 +13267,7 @@ msgstr "
msgid "Total users logged in : %d"
msgstr "Óýíïëï ÷ñçóôþí ðïõ åßíáé óõíäåäåìÝíïé óôï : %d"
-#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1098
msgid "Back"
msgstr "Ðßóù"
@@ -13120,7 +13276,7 @@ msgid "Start"
msgstr "Åêêßíçóç"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:777
+#: client/gui-win32/connectdlg.c:779
msgid "Load Game"
msgstr "Öüñôùóå ðáé÷íßäé"
@@ -13161,9 +13317,9 @@ msgstr "
#: client/gui-sdl/connectdlg.c:308 client/gui-sdl/connectdlg.c:617
#: client/gui-sdl/connectdlg.c:803 client/gui-sdl/connectdlg.c:985
#: client/gui-sdl/dialogs.c:452 client/gui-sdl/dialogs.c:2095
-#: client/gui-sdl/dialogs.c:2893 client/gui-sdl/diplomat_dialog.c:731
+#: client/gui-sdl/dialogs.c:2902 client/gui-sdl/diplomat_dialog.c:731
#: client/gui-sdl/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1043
#: client/gui-win32/dialogs.c:1772 client/gui-win32/finddlg.c:127
#: client/gui-win32/gotodlg.c:171 client/gui-win32/inputdlg.c:146
#: client/gui-win32/messagedlg.c:216 client/gui-win32/ratesdlg.c:328
@@ -13210,7 +13366,7 @@ msgid "Buy it?"
msgstr "ÁãïñáóÝ ôï!"
#: 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
+#: client/gui-sdl/diplodlg.c:1336 client/gui-sdl/diplomat_dialog.c:1211
#: client/gui-sdl/diplomat_dialog.c:1417 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:221 client/gui-sdl/repodlgs.c:1559
#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
@@ -13226,7 +13382,7 @@ msgid "No"
msgstr "¼÷é"
#: client/gui-sdl/citydlg.c:1215 client/gui-sdl/cma_fe.c:318
-#: client/gui-sdl/diplodlg.c:1345 client/gui-sdl/diplomat_dialog.c:1200
+#: client/gui-sdl/diplodlg.c:1346 client/gui-sdl/diplomat_dialog.c:1200
#: client/gui-sdl/diplomat_dialog.c:1407 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:232 client/gui-win32/repodlgs.c:578
#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
@@ -13530,7 +13686,7 @@ msgstr "
msgid "Port :"
msgstr "Èýñá :"
-#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1100
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr "Óýíäåóç "
@@ -13637,23 +13793,23 @@ msgstr "
msgid "REVOLUTION!"
msgstr "ÅÐÁÍÁÓÔÁÓÇ!"
-#: client/gui-sdl/dialogs.c:2232 client/gui-sdl/dialogs.c:2620
+#: client/gui-sdl/dialogs.c:2237 client/gui-sdl/dialogs.c:2625
#: client/gui-win32/dialogs.c:567 data/Freeciv.in:3159
msgid "Female"
msgstr "Èçëõêü"
-#: client/gui-sdl/dialogs.c:2234 client/gui-sdl/dialogs.c:2618
-#: client/gui-sdl/dialogs.c:2830 client/gui-win32/dialogs.c:565
+#: client/gui-sdl/dialogs.c:2239 client/gui-sdl/dialogs.c:2623
+#: client/gui-sdl/dialogs.c:2839 client/gui-win32/dialogs.c:565
msgid "Male"
msgstr "Áñóåíéêü"
-#: client/gui-sdl/dialogs.c:2478 client/gui-sdl/dialogs.c:2902
+#: client/gui-sdl/dialogs.c:2483 client/gui-sdl/dialogs.c:2911
#: 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 "ÅíôÜîåé"
-#: client/gui-sdl/dialogs.c:2685 client/gui-win32/dialogs.c:505
+#: client/gui-sdl/dialogs.c:2694 client/gui-win32/dialogs.c:505
msgid "What nation will you be?"
msgstr "Ðïéü Ýèíïò èá åßóáé;"
@@ -13680,54 +13836,54 @@ msgstr "
msgid "Sea map"
msgstr "×Üñôçò èÜëáóóáò"
-#: client/gui-sdl/diplodlg.c:563
+#: client/gui-sdl/diplodlg.c:564
#, fuzzy
msgid "Give embassy"
msgstr "Äþóå ðñÝó_âåéá"
-#: client/gui-sdl/diplodlg.c:579 client/gui-win32/diplodlg.c:614
+#: client/gui-sdl/diplodlg.c:580 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 "×ñõóüò(ìÝãéóôï %d)"
-#: client/gui-sdl/diplodlg.c:613 client/gui-sdl/helpdlg.c:1956
+#: client/gui-sdl/diplodlg.c:614 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 "Åðéôåýìáôá"
-#: client/gui-sdl/diplodlg.c:831 client/gui-win32/diplodlg.c:598
+#: client/gui-sdl/diplodlg.c:832 client/gui-win32/diplodlg.c:598
#: data/Freeciv.in:269
msgid "Diplomacy meeting"
msgstr "ÄéðëùìáôéêÞ óõíÜíôçóç"
-#: client/gui-sdl/diplodlg.c:883 client/gui-win32/diplodlg.c:680
+#: client/gui-sdl/diplodlg.c:884 client/gui-win32/diplodlg.c:680
#: data/Freeciv.in:510
msgid "Cancel meeting"
msgstr "Áêýñùóå óõíÜíôçóç "
-#: client/gui-sdl/diplodlg.c:895 client/gui-win32/diplodlg.c:679
+#: client/gui-sdl/diplodlg.c:896 client/gui-win32/diplodlg.c:679
#: data/Freeciv.in:501
msgid "Accept treaty"
msgstr "ÁðùäÝîïõ óõìöùíßá"
#. TRANS: "Polish incident !" FIXME!!!
-#: client/gui-sdl/diplodlg.c:1304
+#: client/gui-sdl/diplodlg.c:1305
#, c-format
msgid "%s incident !"
msgstr "%s óõìâÜí !"
-#: client/gui-sdl/diplodlg.c:1322
+#: client/gui-sdl/diplodlg.c:1323
msgid "Shall we declare WAR on them?"
msgstr "Íá ôïõò êçñýîïõìå ÐÏËÅÌÏ;"
-#: client/gui-sdl/diplodlg.c:1433
+#: client/gui-sdl/diplodlg.c:1434
msgid "Foreign Minister"
msgstr "Õðïõñãüò åîùôåñéêþí"
-#: client/gui-sdl/diplodlg.c:1449
+#: client/gui-sdl/diplodlg.c:1450
#, c-format
msgid ""
"Sir!, the %s ambassador has arrived\n"
@@ -13736,24 +13892,24 @@ msgstr ""
"Êýñéå!, ï %s ðñÝóâçò Ý÷åé öôÜóåé\n"
"ÐïéÝò åßíáé ïé åðéèõìßåò óáò?"
-#: client/gui-sdl/diplodlg.c:1465
+#: client/gui-sdl/diplodlg.c:1466
msgid "Declare WAR"
msgstr "ÊÞñõîå ÐÏËÅÌÏ"
-#: client/gui-sdl/diplodlg.c:1467 client/gui-win32/plrdlg.c:357
+#: client/gui-sdl/diplodlg.c:1468 client/gui-win32/plrdlg.c:357
msgid "Cancel Treaty"
msgstr "Áêýñùóå Óõìöùíßá"
-#: client/gui-sdl/diplodlg.c:1490 client/gui-win32/plrdlg.c:358
+#: client/gui-sdl/diplodlg.c:1491 client/gui-win32/plrdlg.c:358
#: data/Freeciv.in:3254
msgid "Withdraw vision"
msgstr "ÁðÝóõñå üñáóç "
-#: client/gui-sdl/diplodlg.c:1507
+#: client/gui-sdl/diplodlg.c:1508
msgid "Call Diplomatic Meeting"
msgstr "ÊÜëåóå äéðëùìáôéêÞ óõíÜíôçóç "
-#: client/gui-sdl/diplodlg.c:1521
+#: client/gui-sdl/diplodlg.c:1522
msgid "Send him back"
msgstr "Óôåßëå ôïí ðßóù"
@@ -14498,12 +14654,12 @@ msgid "Leave Game"
msgstr "ÁðïèÞêåõóç ðáé÷íßäé"
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1100 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1102 client/gui-xaw/menu.c:121
#: data/Freeciv.in:115 data/Freeciv.in:3180
msgid "Quit"
msgstr "¸îïäïò"
-#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:967
msgid "Start New Game"
msgstr "Îåêßíçóå íåï ðáé÷íßäé"
@@ -14621,8 +14777,8 @@ msgstr "
msgid "%s max rate : %d%%"
msgstr "%s ìÝãéóôï ðïóïóôü : %d%%"
-#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
-#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1085
+#: client/gui-win32/connectdlg.c:1093 data/Freeciv.in:155
msgid "Update"
msgstr "ÁíáíÝùóç"
@@ -15086,67 +15242,67 @@ msgstr ""
msgid "Delete"
msgstr "ÄéÝãñáøå"
-#: client/gui-win32/connectdlg.c:147
+#: client/gui-win32/connectdlg.c:149
msgid "Password:"
msgstr ""
-#: client/gui-win32/connectdlg.c:169
+#: client/gui-win32/connectdlg.c:171
msgid "Couldn't load the savegame"
msgstr ""
-#: client/gui-win32/connectdlg.c:284 client/gui-xaw/connectdlg.c:311
+#: client/gui-win32/connectdlg.c:286 client/gui-xaw/connectdlg.c:311
msgid "Verify Password"
msgstr ""
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:916 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr ""
-#: client/gui-win32/connectdlg.c:915
+#: client/gui-win32/connectdlg.c:917
msgid "Local Area Network"
msgstr ""
-#: client/gui-win32/connectdlg.c:949
+#: client/gui-win32/connectdlg.c:951
msgid "Welcome to Freeciv"
msgstr "Êáëþò Þñèåò óôï Freeciv"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Load Saved Game"
msgstr ""
-#: client/gui-win32/connectdlg.c:969
+#: client/gui-win32/connectdlg.c:971
msgid "Connect To Network Game"
msgstr ""
-#: client/gui-win32/connectdlg.c:979
+#: client/gui-win32/connectdlg.c:981
msgid "Choose a nation to play"
msgstr ""
-#: client/gui-win32/connectdlg.c:1014
+#: client/gui-win32/connectdlg.c:1016
msgid "Number of players (Including AI):"
msgstr ""
-#: client/gui-win32/connectdlg.c:1022
+#: client/gui-win32/connectdlg.c:1024
msgid "AI skill level:"
msgstr ""
-#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1038 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr ""
-#: client/gui-win32/connectdlg.c:1040
+#: client/gui-win32/connectdlg.c:1042
msgid "Start Game"
msgstr ""
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Login:"
msgstr ""
-#: client/gui-win32/connectdlg.c:1061
+#: client/gui-win32/connectdlg.c:1063
msgid "Host:"
msgstr ""
-#: client/gui-win32/connectdlg.c:1062
+#: client/gui-win32/connectdlg.c:1064
msgid "Port:"
msgstr ""
@@ -15219,21 +15375,21 @@ msgid ""
"this is much slower."
msgstr ""
-#: client/gui-win32/helpdlg.c:769 client/gui-win32/helpdlg.c:792
-#: client/gui-win32/helpdlg.c:803 client/gui-win32/helpdlg.c:809
-#: client/gui-win32/helpdlg.c:822
+#: client/gui-win32/helpdlg.c:775 client/gui-win32/helpdlg.c:798
+#: client/gui-win32/helpdlg.c:809 client/gui-win32/helpdlg.c:815
+#: client/gui-win32/helpdlg.c:828
msgid "Allows "
msgstr ""
-#: client/gui-win32/helpdlg.c:780
+#: client/gui-win32/helpdlg.c:786
msgid "Obsoletes "
msgstr ""
-#: client/gui-win32/helpdlg.c:812 client/gui-win32/helpdlg.c:825
+#: client/gui-win32/helpdlg.c:818 client/gui-win32/helpdlg.c:831
msgid " (with "
msgstr ""
-#: client/gui-win32/helpdlg.c:815 client/gui-win32/helpdlg.c:828
+#: client/gui-win32/helpdlg.c:821 client/gui-win32/helpdlg.c:834
msgid "?techhelp:)."
msgstr ""
@@ -16315,7 +16471,7 @@ 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/"
+" https://gna.org/projects/freeciv/"
msgstr ""
"Áí âñåßôå ïðïéïäÞðïôå ëÜèïò ,ôüôå ðáñáêáëþ óôåßëôå ìáò ìéá áíáöïñÜ "
"óöÜëìáôïò. Áõôü ãßíåôáé êáëýôåñá ìå ôï íá åðéóêåðôåßôå ôï óýóôçìá "
@@ -18590,58 +18746,54 @@ msgid ""
"a Factory, Mfg. Plant and Hydro Plant together give a 150% production "
"bonus.\n"
"\n"
-"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant. A city "
-"can only build a Hydro Plant if it is next to (or on) a Mountain or River "
-"tile."
+"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant."
msgstr ""
"Ìåéþíåé ôç ìüëõíóç ðïõ ðáñÜãåôáé óå ìéá ðüëç êáôÜ 50%. Åðßóçò áõîÜíåé ôçí "
-"ðáñáãùãÞ áóðßäùí åíüò Åñãïóôáóßïõ Þ Âéïìç÷áíßáò óôçí ðüëç: Óå óõíäõáóìü ìå "
-"åñãïóôÜóéï áõîÜíåé êáôÜ 75% ôçí ðáñáãùãÞ êáé óå óõíäõáóìü ìå åñãïóôÜóéï êáé "
-"âéïìç÷áíßá äßíïõí 150% áýîçóç ôçò ðáñáãùãÞò. \n"
-"\n"
+"ðáñáãùãÞ áóðßäùí åíüò åñãïóôáóßïõ Þ Âéïìç÷áíßáò óôçí ðüëç: óå óõíäõáóìü ìå "
+"åñãïóôÜóéï äßíåé 75% áýîçóç ðáñáãùãÞò, êáé ìáæß ìå åñãïóôÜóéï êáé âéïìç÷áíßá "
+"äßíïõí ìéá áýîçóç 150% óôçí ðáñáãùãÞ.\n"
"Ìéá ðüëç ìðïñåß íá Ý÷åé ìüíï Ýíá Õäñïçëåêôñéêü åñãïóôÜóéï, Óôáèìü ÅíÝñãåéáò "
-"Þ Ðõñçíéêü Óôáèìü. Ìéá ðüëç ìðïñåß íá ÷ôßóåé Õäñïçëåêôñéêü åñãïóôÜóéï áí "
-"åßíáé êïíôÜ óå âïõíü Þ ðïôÜìé."
+"Þ Ðõñçíéêü Óôáèìü."
-#: data/default/buildings.ruleset:397 data/civ2/buildings.ruleset:373
+#: data/default/buildings.ruleset:396 data/civ2/buildings.ruleset:373
#: data/civ1/buildings.ruleset:297
msgid "Library"
msgstr "ÂéâëéïèÞêç"
-#: data/default/buildings.ruleset:412
+#: data/default/buildings.ruleset:411
#, no-c-format
msgid "Increases the science output in a city by 100%."
msgstr "ÁõîÜíåé ôçí Ýñåõíá (ãëüìðïõò) óå ìéá ðüëç êáôÜ 100%. "
-#: data/default/buildings.ruleset:417 data/civ2/buildings.ruleset:393
+#: data/default/buildings.ruleset:416 data/civ2/buildings.ruleset:393
#: data/civ1/buildings.ruleset:317
msgid "Marketplace"
msgstr "ÁãïñÜ"
-#: data/default/buildings.ruleset:432 data/civ2/buildings.ruleset:408
+#: data/default/buildings.ruleset:431 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 "ÁõîÜíåé ôéò áíÝóåéò êáé ôïõò öüñïõò óå ìéá ðüëç êáôÜ 50%"
-#: data/default/buildings.ruleset:437 data/civ2/buildings.ruleset:413
+#: data/default/buildings.ruleset:436 data/civ2/buildings.ruleset:413
#: data/civ1/buildings.ruleset:337
msgid "Mass Transit"
msgstr "ÌáæéêÜ ìÝóá ìåôáöïñÜò"
-#: data/default/buildings.ruleset:451 data/civ2/buildings.ruleset:427
+#: data/default/buildings.ruleset:450 data/civ2/buildings.ruleset:427
#: data/civ1/buildings.ruleset:351
msgid ""
"Neutralizes the pollution generated by the population. The population "
"simply has no effect on the pollution generated in the city."
msgstr "Åîïõäåôåñþíåé ôç ìüëõíóç ðïõ ðáñÜãåé ï ðëçèõóìüò óå ìéá ðüëç."
-#: data/default/buildings.ruleset:458 data/civ2/buildings.ruleset:434
+#: data/default/buildings.ruleset:457 data/civ2/buildings.ruleset:434
#: data/civ1/buildings.ruleset:358
msgid "Mfg. Plant"
msgstr "Âéïìç÷áíßá"
-#: data/default/buildings.ruleset:474 data/civ2/buildings.ruleset:450
+#: data/default/buildings.ruleset:473 data/civ2/buildings.ruleset:450
#: data/civ1/buildings.ruleset:374
#, no-c-format
msgid ""
@@ -18651,12 +18803,12 @@ msgstr ""
"Ìáæß ìå Ýíá ÅñãïóôÜóéï, ìéá Âéïìç÷áíßá áõîÜíåé ôçí ðáñáãùãÞ áóðßäùí óå ìéá "
"ðüëç êáôÜ 100%."
-#: data/default/buildings.ruleset:480 data/civ2/buildings.ruleset:456
+#: data/default/buildings.ruleset:479 data/civ2/buildings.ruleset:456
#: data/civ1/buildings.ruleset:380
msgid "Nuclear Plant"
msgstr "Ðõñçíéêüò óôáèìüò"
-#: data/default/buildings.ruleset:495
+#: data/default/buildings.ruleset:494
#, fuzzy
msgid ""
"Reduces the amount of pollution generated by production in a city by 50%. "
@@ -18674,11 +18826,11 @@ msgstr ""
"Ìéá ðüëç ìðïñåß íá Ý÷åé ìüíï Ýíá Õäñïçëåêôñéêü åñãïóôÜóéï, Óôáèìü ÅíÝñãåéáò "
"Þ Ðõñçíéêü Óôáèìü."
-#: data/default/buildings.ruleset:515 data/civ2/buildings.ruleset:489
+#: data/default/buildings.ruleset:514 data/civ2/buildings.ruleset:489
msgid "Offshore Platform"
msgstr "ÐáñáèáëÜóóéá Ðëáôöüñìá"
-#: data/default/buildings.ruleset:530 data/civ2/buildings.ruleset:504
+#: data/default/buildings.ruleset:529 data/civ2/buildings.ruleset:504
#, fuzzy
msgid ""
"Adds 1 extra shield resource on all Ocean squares in a city. The city needs "
@@ -18687,12 +18839,12 @@ msgstr ""
"ÐñïóèÝôåé 1 åðéðëÝïí áóðßäá óå üëá ôá ôåôñÜãùíá ùêåáíïý ðïõ ðåñéâÜëïõí ìéá "
"ðüëç.Ç ðüëç ðñÝðåé íá åßíáé ðáñáèáëÜóóéá."
-#: data/default/buildings.ruleset:536 data/civ2/buildings.ruleset:510
+#: data/default/buildings.ruleset:535 data/civ2/buildings.ruleset:510
#: data/civ1/buildings.ruleset:411
msgid "Palace"
msgstr "ÐáëÜôé"
-#: data/default/buildings.ruleset:552
+#: data/default/buildings.ruleset:551
#, no-c-format
msgid ""
"Makes a city the capital and the center of your government. Corruption in "
@@ -18720,11 +18872,11 @@ msgstr ""
"\n"
"Ìå Äåóðïôéóìü ôï ðáëÜôé äßíåé ìðüíïõò ðáñáãùãÞò +75% êáé ìå ìïíáñ÷ßá +50%."
-#: data/default/buildings.ruleset:569 data/civ2/buildings.ruleset:539
+#: data/default/buildings.ruleset:568 data/civ2/buildings.ruleset:539
msgid "Police Station"
msgstr "Áóôõíïìéêü ÔìÞìá"
-#: data/default/buildings.ruleset:583 data/civ2/buildings.ruleset:553
+#: data/default/buildings.ruleset:582 data/civ2/buildings.ruleset:553
msgid ""
"Reduces the unhappiness caused by military units outside the city by 2 under "
"Democracy and 1 under Republic. This improvement has no effect under other "
@@ -18734,11 +18886,11 @@ msgstr ""
"êáôÜ 2 óå äçìïêñáôßá êáé êáôÜ 1 óå ïìïóðïíäßá, Äåí Ý÷åé áðïôÝëåóìá óå Üëëá "
"ðïëéôåýìáôá."
-#: data/default/buildings.ruleset:593 data/civ2/buildings.ruleset:560
+#: data/default/buildings.ruleset:592 data/civ2/buildings.ruleset:560
msgid "Port Facility"
msgstr "ËéìåíéêÝò ÅãêáôáóôÜóåéò"
-#: data/default/buildings.ruleset:608 data/civ2/buildings.ruleset:575
+#: data/default/buildings.ruleset:607 data/civ2/buildings.ruleset:575
msgid ""
"Allows a city to build veteran sea units. Also, damaged sea units which "
"stay in town for one full turn without moving are completely restored."
@@ -18747,12 +18899,12 @@ msgstr ""
"èáëÜóóéåò ìïíÜäåò ðïõ Ý÷ïõí õðïóôåß æçìßá áí ìåßíïõí áêßíçôá ãéá Ýíáí ãýñï "
"åðáíáêôïýí ðëÞñùò ôçí áíôï÷Þ ôïõò."
-#: data/default/buildings.ruleset:615 data/civ2/buildings.ruleset:582
+#: data/default/buildings.ruleset:614 data/civ2/buildings.ruleset:582
#: data/civ1/buildings.ruleset:440
msgid "Power Plant"
msgstr "Çëåêôñéêüò Óôáèìüò"
-#: data/default/buildings.ruleset:631
+#: data/default/buildings.ruleset:630
#, fuzzy, no-c-format
msgid ""
"Increases the shield production of a Factory or Mfg. Plant in a city: a "
@@ -18771,12 +18923,12 @@ msgstr ""
"Ìéá ðüëç ìðïñåß íá Ý÷åé Ýíáí Õäñïçëåêôñéêü Óôáèìü, Çëåêôñéêü Þ Ðõñçíéêü "
"Óôáèìü."
-#: data/default/buildings.ruleset:646 data/civ2/buildings.ruleset:610
+#: data/default/buildings.ruleset:645 data/civ2/buildings.ruleset:610
#: data/civ1/buildings.ruleset:468
msgid "Recycling Center"
msgstr "ÊÝíôñï Áíáêýêëùóçò"
-#: data/default/buildings.ruleset:661 data/civ2/buildings.ruleset:625
+#: data/default/buildings.ruleset:660 data/civ2/buildings.ruleset:625
#: data/civ1/buildings.ruleset:483
#, no-c-format
msgid ""
@@ -18786,11 +18938,11 @@ msgstr ""
"Ôï ÷ôßóéìï åíüò êÝíôñïõ áíáêýêëùóçò ìåéþíåé óôçí ðüëç ôçí ðáñáãïýìåíç "
"ìüëõíóç êáôÜ 66%."
-#: data/default/buildings.ruleset:667 data/civ2/buildings.ruleset:631
+#: data/default/buildings.ruleset:666 data/civ2/buildings.ruleset:631
msgid "Research Lab"
msgstr "Åñåõíçôéêü EñãáóôÞñéï"
-#: data/default/buildings.ruleset:682
+#: data/default/buildings.ruleset:681
msgid ""
"Together with a Library, a Research Lab increases the science production of "
"a city by 200%. Together with a Library and a University, a Research Lab "
@@ -18800,11 +18952,11 @@ msgstr ""
"(ãëüìðïé) êáôÜ 200%. Ìáæß ìéá ÂéâëéïèÞêç , Ýíá ÐáíåðéóôÞìéï êáé ¸íá "
"åñåõíçôéêü åñãáóôÞñéï áõîÜíïõí ôçí åðéóôçìïíéêÞ ðáñáãùãÞ êáôÜ 450%."
-#: data/default/buildings.ruleset:690 data/civ2/buildings.ruleset:654
+#: data/default/buildings.ruleset:689 data/civ2/buildings.ruleset:654
msgid "SAM Battery"
msgstr "ÅêôïîåõôÞñáò SAM"
-#: data/default/buildings.ruleset:704 data/civ2/buildings.ruleset:668
+#: data/default/buildings.ruleset:703 data/civ2/buildings.ruleset:668
msgid ""
"Doubles the defense of all units inside the city when attacked by non-"
"nuclear air units."
@@ -18812,12 +18964,12 @@ msgstr ""
"ÄéðëáóéÜæåé ôçí Üìõíá üëùí ôùí ìïíÜäùí ìÝóá óôçí ðüëç üôáí äÝ÷ïíôáé åðßèåóç "
"áðü ìç-ðõñçíéêÝò ìïíÜäåò."
-#: data/default/buildings.ruleset:710 data/civ2/buildings.ruleset:674
+#: data/default/buildings.ruleset:709 data/civ2/buildings.ruleset:674
#: data/civ1/buildings.ruleset:489
msgid "SDI Defense"
msgstr "¶ìõíá SDI"
-#: data/default/buildings.ruleset:724 data/civ2/buildings.ruleset:688
+#: data/default/buildings.ruleset:723 data/civ2/buildings.ruleset:688
#: data/civ1/buildings.ruleset:503
msgid ""
"Protects a city from attacks from Nuclear units. Nuclear attacks simply "
@@ -18828,11 +18980,11 @@ msgstr ""
"ðõñçíéêþí ìïíÜäùí äåí Ý÷ïõí åðßäñáóç óå ðüëåéò. Åðßóçò, äéðëáóéÜæåé ôçí "
"Üìõíá åíÜíôéá óå ìç-ðõñçíéêÝò êåöáëÝò."
-#: data/default/buildings.ruleset:733 data/civ2/buildings.ruleset:697
+#: data/default/buildings.ruleset:732 data/civ2/buildings.ruleset:697
msgid "Sewer System"
msgstr "Óýóôçìá õðïíüìùí"
-#: data/default/buildings.ruleset:748 data/civ2/buildings.ruleset:712
+#: data/default/buildings.ruleset:747 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."
@@ -18840,12 +18992,12 @@ msgstr ""
"ÅðéôñÝðåé óå ìéá ðüëç íá áõîçèåß óå ìÝãåèïò ìåãáëýôåñï áðü 12. ÐñïçãïõìÝíïò "
"áðáéôåßôáé õäñáãùãåßï þóôå ç ðüëç íá áõîçèåß óå ìÝãåèïò ìåãáëýôåñï áðü 8."
-#: data/default/buildings.ruleset:754 data/civ2/buildings.ruleset:749
+#: data/default/buildings.ruleset:753 data/civ2/buildings.ruleset:749
#: data/civ1/buildings.ruleset:512
msgid "Space Component"
msgstr "Äéáóôçìéêü õðüóõóôçìá"
-#: data/default/buildings.ruleset:769 data/civ2/buildings.ruleset:763
+#: data/default/buildings.ruleset:768 data/civ2/buildings.ruleset:763
#: data/civ1/buildings.ruleset:526
#, fuzzy
msgid ""
@@ -18863,12 +19015,12 @@ msgstr ""
"Ðñéí ìðïñÝóåéò íá ÷ôßóåéò ïðïéïäÞðïôå äéáóôçìéêü êïììÜôé ,ðñÝðåé íá Ý÷åé "
"÷ôéóôåß ôï èáýìá ðñüãñáììá Áðüëëï áðü ïðïéïíäÞðïôå ðáß÷ôç."
-#: data/default/buildings.ruleset:779 data/civ2/buildings.ruleset:773
+#: data/default/buildings.ruleset:778 data/civ2/buildings.ruleset:773
#: data/civ1/buildings.ruleset:536
msgid "Space Module"
msgstr "Äéáóôçìéêü Üñèñùìá"
-#: data/default/buildings.ruleset:794 data/civ2/buildings.ruleset:787
+#: data/default/buildings.ruleset:793 data/civ2/buildings.ruleset:787
#: data/civ1/buildings.ruleset:550
msgid ""
"Space Modules are the most expensive parts of spaceships. There are three "
@@ -18903,12 +19055,12 @@ msgstr ""
"Ðñéí ìðïñÝóåéò íá ÷ôßóåéò ïðïéïäÞðïôå äéáóôçìéêü êïììÜôé ,ðñÝðåé íá Ý÷åé "
"÷ôéóôåß ôï èáýìá ðñüãñáììá Áðüëëï áðü ïðïéïíäÞðïôå ðáß÷ôç."
-#: data/default/buildings.ruleset:813 data/civ2/buildings.ruleset:806
+#: data/default/buildings.ruleset:812 data/civ2/buildings.ruleset:806
#: data/civ1/buildings.ruleset:569
msgid "Space Structural"
msgstr "Äéóóôçìéêüò óêåëåôüò"
-#: data/default/buildings.ruleset:828 data/civ2/buildings.ruleset:820
+#: data/default/buildings.ruleset:827 data/civ2/buildings.ruleset:820
#: data/civ1/buildings.ruleset:583
msgid ""
"Space Structurals form the base of your spaceship. All other spaceship "
@@ -18925,11 +19077,11 @@ msgstr ""
"Ðñéí ìðïñÝóåéò íá ÷ôßóåéò ïðïéïäÞðïôå äéáóôçìéêü êïììÜôé ðñÝðåé íá Ý÷åé "
"÷ôéóôåß ôï èáýìá Ðñüãñáììá Áðüëëï áðü ïðïéïäÞðïôå ðáß÷ôç."
-#: data/default/buildings.ruleset:838 data/civ2/buildings.ruleset:830
+#: data/default/buildings.ruleset:837 data/civ2/buildings.ruleset:830
msgid "Stock Exchange"
msgstr "×ñçìáôéóôÞñéï"
-#: data/default/buildings.ruleset:854 data/civ2/buildings.ruleset:846
+#: data/default/buildings.ruleset:853 data/civ2/buildings.ruleset:846
#, no-c-format
msgid ""
"Together with a Marketplace and a Bank, a Stock Exchange boosts tax and "
@@ -18938,11 +19090,11 @@ msgstr ""
"Ìáæß ìå ìéá ÔñÜðåæá êáé ìéá ÁãïñÜ , Ýíá ×ñçìáôéóôÞñéï áíåâÜæåé ôçí óõëëïãÞ "
"öüñùí êáé áíÝóåùí êáôÜ 150%."
-#: data/default/buildings.ruleset:860 data/civ2/buildings.ruleset:852
+#: data/default/buildings.ruleset:859 data/civ2/buildings.ruleset:852
msgid "Super Highways"
msgstr "Óïýðåñ Áõôïêéíçôüäñïìïé"
-#: data/default/buildings.ruleset:875 data/civ2/buildings.ruleset:867
+#: data/default/buildings.ruleset:874 data/civ2/buildings.ruleset:867
#, no-c-format
msgid ""
"Increases trade resources by 50% on all squares with roads or railroads."
@@ -18950,11 +19102,11 @@ msgstr ""
"ÁõîÜíïíôáé ïé åìðïñéêïß ðüñïé êáôÜ 50% óå üëá ôá ôåôñÜãùíá ìå äñüìïõò Þ "
"óéäçñüäñïìïõò."
-#: data/default/buildings.ruleset:883 data/civ2/buildings.ruleset:873
+#: data/default/buildings.ruleset:882 data/civ2/buildings.ruleset:873
msgid "Supermarket"
msgstr "ÓïõðåñìÜñêåô"
-#: data/default/buildings.ruleset:898 data/civ2/buildings.ruleset:888
+#: data/default/buildings.ruleset:897 data/civ2/buildings.ruleset:888
#, no-c-format
msgid ""
"Increases the food resources by 50% on each farmland square which is being "
@@ -18965,12 +19117,12 @@ msgstr ""
"÷ñçóéìïðïéåßôáé ãýñù áðü ôçí ðüëç. Ôá ôåôñÜãùíá áãñïêôÞìáôá åßíáé áõôÜ óôá "
"ïðïéÜ Ý÷åé åöáñìïóôåß ç âåëôßùóç ôçò ýäñåõóçò ãéá äåýôåñç öïñÜ."
-#: data/default/buildings.ruleset:905 data/civ2/buildings.ruleset:895
+#: data/default/buildings.ruleset:904 data/civ2/buildings.ruleset:895
#: data/civ1/buildings.ruleset:593
msgid "Temple"
msgstr "Íáüò"
-#: data/default/buildings.ruleset:919 data/civ2/buildings.ruleset:909
+#: data/default/buildings.ruleset:918 data/civ2/buildings.ruleset:909
#: data/civ1/buildings.ruleset:607
msgid ""
"Makes one unhappy citizen content. Both the Mysticism advance and the "
@@ -18981,13 +19133,13 @@ msgstr ""
"èáýìá Ìáíôåßï äéðëáóéÜæïõí áõôü ôï áðïôÝëåóìá. Ìáæß êáé ï Ìõóôéêéóìüò êáé ôï "
"Ìáíôåßï êÜíïõí 4 ðïëßôåò éêáíïðïéçìÝíïõò."
-#: data/default/buildings.ruleset:926 data/civ2/buildings.ruleset:916
+#: data/default/buildings.ruleset:925 data/civ2/buildings.ruleset:916
#: data/civ1/buildings.ruleset:614 data/default/techs.ruleset:742
#: data/civ2/techs.ruleset:727 data/civ1/techs.ruleset:723
msgid "University"
msgstr "ÐáíåðéóôÞìéï"
-#: data/default/buildings.ruleset:942
+#: data/default/buildings.ruleset:941
#, no-c-format
msgid ""
"Together with a Library, a University increases the science production of a "
@@ -18996,12 +19148,12 @@ msgstr ""
"Ìáæß ìå ìéá âéâëéïèÞêç Ýíá ÐáíåðéóôÞìéï áõîÜíåé ôçí åðéóôçìïíéêÞ ðáñáãùãÞ "
"ìéáò ðüëçò êáôÜ 250%."
-#: data/default/buildings.ruleset:948 data/civ2/buildings.ruleset:938
+#: data/default/buildings.ruleset:947 data/civ2/buildings.ruleset:938
#: data/civ1/buildings.ruleset:636
msgid "Apollo Program"
msgstr "Ðñüãñáììá Áðüëëï"
-#: data/default/buildings.ruleset:962 data/civ2/buildings.ruleset:952
+#: data/default/buildings.ruleset:961 data/civ2/buildings.ruleset:952
msgid ""
"Entire map becomes visible for the player who owns it. It allows all "
"players to start building spaceship parts (assuming they have researched the "
@@ -19011,11 +19163,11 @@ msgstr ""
"ôïõò ðáß÷ôåò íá ÷ôßóïõí äéáóôçìéêÜ ìÝñç (åöüóïí Ý÷ïõí åñåõíÞóåé ôéò áíÜëïãåò "
"ôå÷íïëïãßåò)."
-#: data/default/buildings.ruleset:969 data/civ2/buildings.ruleset:959
+#: data/default/buildings.ruleset:968 data/civ2/buildings.ruleset:959
msgid "A.Smith's Trading Co."
msgstr "ÅìðïñéêÞ åðé÷åßñçóç Á.Óìéè"
-#: data/default/buildings.ruleset:983
+#: data/default/buildings.ruleset:982
msgid ""
"City improvements which would normally have an upkeep of 1 are free of "
"upkeep, for all your cities."
@@ -19023,12 +19175,12 @@ msgstr ""
"ÕðïäïìÝò ôçò ðüëçò ðïõ óõíÞèùò èá ÷ñåéÜæïíôáí Ýíá ÷ñõóü ãéá óõíôÞñçóç äåí ôï "
"÷ñåéÜæïíôáé ðëÝïí."
-#: data/default/buildings.ruleset:989 data/civ2/buildings.ruleset:979
+#: data/default/buildings.ruleset:988 data/civ2/buildings.ruleset:979
#: data/civ1/buildings.ruleset:655
msgid "Colossus"
msgstr "Êïëïóóüò"
-#: data/default/buildings.ruleset:1003 data/civ2/buildings.ruleset:993
+#: data/default/buildings.ruleset:1002 data/civ2/buildings.ruleset:993
#: data/civ1/buildings.ruleset:669
msgid ""
"Each square around the city where this wonder is built that is already "
@@ -19037,12 +19189,12 @@ msgstr ""
"ÊÜèå ôåôñÜãùíï ìÝóá óôç ðüëç ðïõ åßíáé ôï èáýìá ôï ïðïßï ðáñÜãåé Þäç êÜðïéïí "
"åìðïñéêü ðüñï èá ðáñÜãåé Ýíáí åðéðëÝïí."
-#: data/default/buildings.ruleset:1009 data/civ2/buildings.ruleset:999
+#: data/default/buildings.ruleset:1008 data/civ2/buildings.ruleset:999
#: data/civ1/buildings.ruleset:675
msgid "Copernicus' Observatory"
msgstr "ÐáñáôçñçôÞñéï ÊïðÝñíéêïõ"
-#: data/default/buildings.ruleset:1024 data/civ2/buildings.ruleset:1180
+#: data/default/buildings.ruleset:1023 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."
@@ -19050,12 +19202,12 @@ msgstr ""
"Õøþíåé ôçí åðéóôçìïíéêÞ ðáñáãùãÞ (ãëüìðïõò) êáôÜ 100% óôçí ðüëõ ðïõ èá "
"÷ôéóôåß."
-#: data/default/buildings.ruleset:1029 data/civ2/buildings.ruleset:1019
+#: data/default/buildings.ruleset:1028 data/civ2/buildings.ruleset:1019
#: data/civ1/buildings.ruleset:695
msgid "Cure For Cancer"
msgstr "Èåñáðåßá ôïõ Êáñêßíïõ"
-#: data/default/buildings.ruleset:1043
+#: data/default/buildings.ruleset:1042
msgid ""
"This stunning technological achievement makes one unhappy citizen content in "
"all your cities."
@@ -19063,12 +19215,12 @@ msgstr ""
"Áõôü ôï åíôõðùóéáêü ôå÷íïëïãéêü åðßôåõìá êÜíåé Ýíáí äõóáñåóôçìÝíï ðïëßôç "
"éêáíïðïéçìÝíï óå êÜèå ìéá áðü ôéò ðüëåéò óïõ."
-#: data/default/buildings.ruleset:1051 data/civ2/buildings.ruleset:1039
+#: data/default/buildings.ruleset:1050 data/civ2/buildings.ruleset:1039
#: data/civ1/buildings.ruleset:715
msgid "Darwin's Voyage"
msgstr "Ôï ôáîßäé ôïõ Äáñâßíïõ"
-#: data/default/buildings.ruleset:1065 data/civ2/buildings.ruleset:1053
+#: data/default/buildings.ruleset:1064 data/civ2/buildings.ruleset:1053
#: data/civ1/buildings.ruleset:729
msgid ""
"Charles Darwin's voyage sparked the discovery of the evolution of the "
@@ -19079,11 +19231,11 @@ msgstr ""
"åîÝëéîçò, ç ïðïßá Üõîçóå ôçí åìðéóôïóýíç ôïõ êïéíïý óôçí åðéóôÞìç.Äßíåé "
"Üììåóá äýï ôå÷íïëïãéêÝò ðñüïäïõò."
-#: data/default/buildings.ruleset:1072 data/civ2/buildings.ruleset:1060
+#: data/default/buildings.ruleset:1071 data/civ2/buildings.ruleset:1060
msgid "Eiffel Tower"
msgstr "Ðýñãïò ôïõ ¶úöåë"
-#: data/default/buildings.ruleset:1087
+#: data/default/buildings.ruleset:1086
#, fuzzy, no-c-format
msgid ""
"Your reputation and goodwill among other nations is recovered twice as fast."
@@ -19091,12 +19243,12 @@ msgstr ""
"Ç öÞìç óïõ êáé ç êáëçèÝëçóç áíÜìåóá óôá Üëëá Ýèíç áõîÜíåé üóï êáôÝ÷åéò áõôü "
"ôï èáýìá. Ç öÞìç óïõ áíáðëçñþíåôáé ìå äéðëÜóéá ôá÷ýôçôá áðü'ôé áëëßùò."
-#: data/default/buildings.ruleset:1093 data/civ2/buildings.ruleset:1081
+#: data/default/buildings.ruleset:1092 data/civ2/buildings.ruleset:1081
#: data/civ1/buildings.ruleset:736
msgid "Great Library"
msgstr "ÌåãÜëç âéâëéïèÞêç"
-#: data/default/buildings.ruleset:1107 data/civ2/buildings.ruleset:1095
+#: data/default/buildings.ruleset:1106 data/civ2/buildings.ruleset:1095
#: data/civ1/buildings.ruleset:750
msgid ""
"The civilization which builds the Great Library gets every advance that at "
@@ -19105,21 +19257,21 @@ msgstr ""
"Ï ðïëéôéóìüò ðïõ ÷ôßæåé ôç ÌåãÜëç ÂéâëéïèÞêç áðïêôÜ êÜèå ðñüïäï ðïõ Ý÷ïõí "
"åðéôý÷åé ôïõëÜ÷éóôïí Üëëç äýï ðïëéôéóìïß."
-#: data/default/buildings.ruleset:1113 data/civ2/buildings.ruleset:1101
+#: data/default/buildings.ruleset:1112 data/civ2/buildings.ruleset:1101
#: data/civ1/buildings.ruleset:756
msgid "Great Wall"
msgstr "Ôï ìåãÜëï ôïß÷ïò"
-#: data/default/buildings.ruleset:1127
+#: data/default/buildings.ruleset:1126
msgid "Works as a City Wall in all your cities."
msgstr "ÌåôñÜåé óáí ôïß÷ïé óå üëåò ôéò ðüëåéò."
-#: data/default/buildings.ruleset:1135 data/civ2/buildings.ruleset:1122
+#: data/default/buildings.ruleset:1134 data/civ2/buildings.ruleset:1122
#: data/civ1/buildings.ruleset:777
msgid "Hanging Gardens"
msgstr "Êñåìáóôïß ÊÞðïé"
-#: data/default/buildings.ruleset:1149 data/civ2/buildings.ruleset:1136
+#: data/default/buildings.ruleset:1148 data/civ2/buildings.ruleset:1136
#: data/civ1/buildings.ruleset:791
msgid ""
"Makes one content citizen happy in every city. Makes two extra content "
@@ -19133,12 +19285,12 @@ msgstr ""
"óýíïëï 3). Óôï áðßèáíï ãåãïíüò ðïõ äåí õðÜñ÷ïõí éêáíïðïéçìÝíïé êÜôïéêïé ôï "
"èáýìá åðéäñÜ óôïõò äõóáñåóôçìÝíïõò ðïëßôåò êÜíïíôáò ôïõò éêáíïðïéçìÝíïõò."
-#: data/default/buildings.ruleset:1158 data/civ2/buildings.ruleset:1145
+#: data/default/buildings.ruleset:1157 data/civ2/buildings.ruleset:1145
#: data/civ1/buildings.ruleset:800
msgid "Hoover Dam"
msgstr "ÌåãÜëï öñÜãìá"
-#: data/default/buildings.ruleset:1173 data/civ2/buildings.ruleset:1159
+#: data/default/buildings.ruleset:1172 data/civ2/buildings.ruleset:1159
msgid ""
"Works as if you had a Hydro Plant in every city. (This reduces pollution "
"and increases the effects of Factories and Mfg. Plants.)"
@@ -19146,12 +19298,12 @@ msgstr ""
"Ëåéôïõñãåß óáí õäñïçëåêôñéêüò óôáèìüò óå êÜèå ðüëç. ( Áõôü ìåéþíåé ôç "
"ìüëõíóç êáé áõîÜíåé ôçí ðáñáãùãéêüôçôá ôùí Åñãïóôáóßùí êáé ôùí Âéïìç÷áíéþí)."
-#: data/default/buildings.ruleset:1179 data/civ2/buildings.ruleset:1165
+#: data/default/buildings.ruleset:1178 data/civ2/buildings.ruleset:1165
#: data/civ1/buildings.ruleset:822
msgid "Isaac Newton's College"
msgstr "ÊïëëÝãéï ÉóáÜê Íåýôùíá"
-#: data/default/buildings.ruleset:1194
+#: data/default/buildings.ruleset:1193
#, no-c-format
msgid ""
"Boosts science production by 100% in every city you control that has a "
@@ -19160,20 +19312,20 @@ msgstr ""
"Áíõøþíåé ôçí åðéóôçìïíéêÞ ðáñáãùãÞ êáôÜ 100% óå êÜèå ðüëç ðïõ Ý÷åé "
"ÐáíåðéóôÞìéï."
-#: data/default/buildings.ruleset:1200 data/civ2/buildings.ruleset:1185
+#: data/default/buildings.ruleset:1199 data/civ2/buildings.ruleset:1185
#: data/civ1/buildings.ruleset:842
msgid "J.S. Bach's Cathedral"
msgstr "Êáèåäñéêüò ôïõ Ìðá÷"
-#: data/default/buildings.ruleset:1214 data/civ2/buildings.ruleset:1199
+#: data/default/buildings.ruleset:1213 data/civ2/buildings.ruleset:1199
msgid "Makes two unhappy citizens content in every city."
msgstr "ÊÜíåé äýï äõóáñåóôçìÝíïõò ðïëßôåò éêáíïðïéçìÝíïõò óå êÜèå ðüëç."
-#: data/default/buildings.ruleset:1219 data/civ2/buildings.ruleset:1204
+#: data/default/buildings.ruleset:1218 data/civ2/buildings.ruleset:1204
msgid "King Richard's Crusade"
msgstr "Óôáõñïöïñßá ôïõ Âáóéëßá Ñé÷Üñäïõ"
-#: data/default/buildings.ruleset:1233 data/civ2/buildings.ruleset:1218
+#: data/default/buildings.ruleset:1232 data/civ2/buildings.ruleset:1218
msgid ""
"Adds one extra shield resource on every square around the city where it is "
"built."
@@ -19181,20 +19333,20 @@ msgstr ""
"ÐñïóèÝôåé ìéá åðéðëÝïí áóðßäá óå êÜèå ôåôñÜãùíï ãýñù áðü ôçí ðüëç üðïõ èá "
"÷ôéóôåß."
-#: data/default/buildings.ruleset:1239 data/civ2/buildings.ruleset:1224
+#: data/default/buildings.ruleset:1238 data/civ2/buildings.ruleset:1224
msgid "Leonardo's Workshop"
msgstr "Ôï åñãáóôÞñéï ôïõ ÍôáÂßíôóé"
-#: data/default/buildings.ruleset:1253 data/civ2/buildings.ruleset:1238
+#: data/default/buildings.ruleset:1252 data/civ2/buildings.ruleset:1238
msgid "Upgrades one obsolete unit per game turn."
msgstr "Áíáâáèìßæåé ìéá áðáñ÷áéùìÝíç ìïíÜäá áíÜ ãýñï"
-#: data/default/buildings.ruleset:1258 data/civ2/buildings.ruleset:1243
+#: data/default/buildings.ruleset:1257 data/civ2/buildings.ruleset:1243
#: data/civ1/buildings.ruleset:862
msgid "Lighthouse"
msgstr "ÖÜñïò ôçò ÁëåîÜíäñåéáò"
-#: data/default/buildings.ruleset:1273
+#: data/default/buildings.ruleset:1272
#, fuzzy
msgid ""
"Gives all your sea units 1 additional movement point and eliminates the risk "
@@ -19205,34 +19357,34 @@ msgstr ""
"êßíäõíï íá ÷Üóåéò ìéá Ôñßçñç óå ìåãÜëåò èÜëáóóåò. ÊÜíåé üëåò ôéò èáëÜóóéåò "
"ìïíÜäåò âåôåñÜíïõò (óå üëåò ôéò ðüëåéò)."
-#: data/default/buildings.ruleset:1280 data/civ2/buildings.ruleset:1264
+#: data/default/buildings.ruleset:1279 data/civ2/buildings.ruleset:1264
#: data/civ1/buildings.ruleset:885
msgid "Magellan's Expedition"
msgstr "Ôáîßäé ôïõ ÌáããåëÜíïõ"
-#: data/default/buildings.ruleset:1295
+#: data/default/buildings.ruleset:1294
msgid "Gives all your sea units 2 additional movement points."
msgstr "Äßíåé óå üëåò ôéò èáëÜóóéåò ìïíÜäåò 2 åðéðëÝïí ìïíÜäåò êßíçóçò"
-#: data/default/buildings.ruleset:1300 data/civ2/buildings.ruleset:1283
+#: data/default/buildings.ruleset:1299 data/civ2/buildings.ruleset:1283
#: data/civ1/buildings.ruleset:904
msgid "Manhattan Project"
msgstr "Ìáí÷Üôáí ðñüôæåêô"
-#: data/default/buildings.ruleset:1318 data/civ2/buildings.ruleset:1301
+#: data/default/buildings.ruleset:1317 data/civ2/buildings.ruleset:1301
msgid "Marco Polo's Embassy"
msgstr "Ðñåóâåßá ÌÜñêï Ðüëï"
-#: data/default/buildings.ruleset:1332 data/civ2/buildings.ruleset:1315
+#: data/default/buildings.ruleset:1331 data/civ2/buildings.ruleset:1315
msgid "The player who owns it gets an embassy with all players."
msgstr "Ï ðáß÷ôçò ðïõ ôï Ý÷åé áðïêôÜ áõôüìáôá ðñåóâåßá ìå êÜèå ðáß÷ôç."
-#: data/default/buildings.ruleset:1337 data/civ2/buildings.ruleset:1320
+#: data/default/buildings.ruleset:1336 data/civ2/buildings.ruleset:1320
#: data/civ1/buildings.ruleset:922
msgid "Michelangelo's Chapel"
msgstr "Ç åêêëçóßá ôïõ Ìé÷áÞë ¶ããåëïõ"
-#: data/default/buildings.ruleset:1351 data/civ2/buildings.ruleset:1334
+#: data/default/buildings.ruleset:1350 data/civ2/buildings.ruleset:1334
msgid ""
"Counts as having a Cathedral in each of your cities. This makes 3 unhappy "
"citizens content in each city. The discovery of Theology increases the "
@@ -19247,22 +19399,22 @@ msgstr ""
"áðïôÝëåóìá ôïõ Êáèåäñéêïý , ìåéþíïíôáò êáôÜ Ýíá ôïí áñéèìü ôùí äõóôõ÷éóìÝíùí "
"ðïëéôþí ðïõ ãßíïíôáé éêáíïðïéçìÝíïé."
-#: data/default/buildings.ruleset:1361 data/civ2/buildings.ruleset:1344
+#: data/default/buildings.ruleset:1360 data/civ2/buildings.ruleset:1344
#: data/civ1/buildings.ruleset:941
msgid "Oracle"
msgstr "Ìáíôåßï"
-#: data/default/buildings.ruleset:1375
+#: data/default/buildings.ruleset:1374
msgid "Makes two of your unhappy citizens content in every city with a temple."
msgstr ""
"ÌåôáôñÝðåé äýï äõóôõ÷éóìÝíïõò ðïëßôåò óå éêáíïðïéçìÝíïõò óå êÜèå ðüëç ìå íáü."
-#: data/default/buildings.ruleset:1380 data/civ2/buildings.ruleset:1363
+#: data/default/buildings.ruleset:1379 data/civ2/buildings.ruleset:1363
#: data/civ1/buildings.ruleset:960
msgid "Pyramids"
msgstr "Ðõñáìßäåò"
-#: data/default/buildings.ruleset:1394
+#: data/default/buildings.ruleset:1393
msgid ""
"The amount of stored food lost when one of your cities grows or shrinks is "
"reduced by 25%. This helps a city to grow faster and more easily withstand "
@@ -19273,34 +19425,34 @@ msgstr ""
"ðïéü ãñÞãïñá êáé íá áíôÝ÷åé ðïéü åýêïëá ëéìïýò. ÅðéäñÜ áèñïéóôéêÜ ìå ôçí "
"óéôáðïèÞêç."
-#: data/default/buildings.ruleset:1401 data/civ2/buildings.ruleset:1382
+#: data/default/buildings.ruleset:1400 data/civ2/buildings.ruleset:1382
#: data/civ1/buildings.ruleset:981
msgid "SETI Program"
msgstr "Ðñüãñáììá SETI"
-#: data/default/buildings.ruleset:1415
+#: data/default/buildings.ruleset:1414
msgid "Boosts science production in each city with a Research Lab by 100%. "
msgstr ""
"ÁõîÜíåé ôçí åðéóôçìïíéêÞ ðáñáãùãÞ óå êÜèå ðüëç ìå Åñåõíçôéêü ÅñãáóôÞñéï êáôÜ "
"100%."
-#: data/default/buildings.ruleset:1420 data/civ2/buildings.ruleset:1402
+#: data/default/buildings.ruleset:1419 data/civ2/buildings.ruleset:1402
#: data/civ1/buildings.ruleset:1001
msgid "Shakespeare's Theatre"
msgstr "ÈÝáôñï ÓÝîðéñ"
-#: data/default/buildings.ruleset:1434 data/civ2/buildings.ruleset:1416
+#: data/default/buildings.ruleset:1433 data/civ2/buildings.ruleset:1416
#: data/civ1/buildings.ruleset:1015
msgid "Makes all unhappy citizens content, in the city where it is located."
msgstr ""
"ÌåôáôñÝðåé üëïõò ôïõò äõóôõ÷éóìÝíïõò ðïëßôåò óå éêáíïðïéçìÝíïõò, óôçí ðüëç "
"ðïõ âñßóêåôáé."
-#: data/default/buildings.ruleset:1439 data/civ2/buildings.ruleset:1421
+#: data/default/buildings.ruleset:1438 data/civ2/buildings.ruleset:1421
msgid "Statue of Liberty"
msgstr "¶ãáëìá ôçò Åëåõèåñßáò"
-#: data/default/buildings.ruleset:1453 data/civ2/buildings.ruleset:1435
+#: data/default/buildings.ruleset:1452 data/civ2/buildings.ruleset:1435
#: data/civ1/buildings.ruleset:974 data/civ1/buildings.ruleset:1034
msgid ""
"Allows you to choose any government, including those that have not yet been "
@@ -19311,11 +19463,11 @@ msgstr ""
"ðïõ äåí Ý÷ïõí áíáêáëõöèåß áêüìá áðü ôïí ðïëéôéóìü óïõ, êáé ÷ùñßò ôçí "
"ìåôáâáôéêÞ ðåñßïäï ôçò Áíáñ÷ßáò."
-#: data/default/buildings.ruleset:1460 data/civ2/buildings.ruleset:1442
+#: data/default/buildings.ruleset:1459 data/civ2/buildings.ruleset:1442
msgid "Sun Tzu's War Academy"
msgstr "ÐïëåìéêÞ Áêáäçìßá Óáí Ôóïõ"
-#: data/default/buildings.ruleset:1474
+#: data/default/buildings.ruleset:1473
msgid ""
"All your new ground units start at the first veteran level. The chance of a "
"unit getting the next veteran level after a battle increases by half."
@@ -19324,21 +19476,21 @@ msgstr ""
"ìéáò ìïíÜäáò íá öôÜóåé óôï åðüìåíï åðßðåäï âåôåñÜíùí ìåôÜ áðü ìÜ÷ç ,áõîÜíåé "
"óôï ìéóü. "
-#: data/default/buildings.ruleset:1481 data/civ2/buildings.ruleset:1463
+#: data/default/buildings.ruleset:1480 data/civ2/buildings.ruleset:1463
#: data/civ1/buildings.ruleset:1020
msgid "United Nations"
msgstr "ÇíùìÝíá ¸èíç"
-#: data/default/buildings.ruleset:1495
+#: data/default/buildings.ruleset:1494
msgid "All your units regain two extra hitpoints per turn."
msgstr "¼ëåò ïé ìïíÜäåò óïõ åðáíáêôïýí åðéðëÝïí äýï ìïíÜäåò áíôï÷Þò áíÜ ãýñï."
-#: data/default/buildings.ruleset:1508 data/civ2/buildings.ruleset:1490
+#: data/default/buildings.ruleset:1507 data/civ2/buildings.ruleset:1490
#: data/civ1/buildings.ruleset:1046
msgid "Women's Suffrage"
msgstr "Äéêáéþìáôá Ãõíáéêþí"
-#: data/default/buildings.ruleset:1522 data/civ2/buildings.ruleset:1504
+#: data/default/buildings.ruleset:1521 data/civ2/buildings.ruleset:1504
msgid ""
"Counts as a Police Station in every city. (That is, for each city, reduces "
"unhappiness for military units outside the city by 2 under Democracy and 1 "
@@ -19349,11 +19501,11 @@ msgstr ""
"óôçí Äçìïêñáôßá êáé êáôÜ 1 óå Ïìïóðïíäßá. Áõôü ôï èáýìá äåí Ý÷åé åðßäñáóç "
"õðü Üëëá ðïëéôåýìáôá.)"
-#: data/default/buildings.ruleset:1533
+#: data/default/buildings.ruleset:1532
msgid "Coinage"
msgstr "ÑåõóôïðïéÞóç"
-#: data/default/buildings.ruleset:1554
+#: data/default/buildings.ruleset:1553
msgid ""
"This is not a normal improvement. Instead, setting a city's production to "
"Coinage means its shield production is converted to tax output (money, "
@@ -19712,11 +19864,16 @@ msgstr "?citystyle:
msgid "?citystyle:Industrial"
msgstr "?citystyle:Âéïìç÷áíéêü"
-#: data/default/cities.ruleset:139 data/civ2/cities.ruleset:150
+#: data/default/cities.ruleset:139
+#, fuzzy
+msgid "?citystyle:ElectricAge"
+msgstr "?citystyle:Êåëôéêü"
+
+#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:150
msgid "?citystyle:Modern"
msgstr "?citystyle:ÌïíôÝñíïõ"
-#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:161
+#: data/default/cities.ruleset:161 data/civ2/cities.ruleset:161
msgid "?citystyle:PostModern"
msgstr "?citystyle:ÌåôáìïíôÝñíïõ"
@@ -24848,6 +25005,27 @@ msgstr "
msgid "Team 31"
msgstr "ÏìÜäá 31"
+#, fuzzy
+#~ 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 Hydro Plant, Power Plant, or Nuclear Plant. A "
+#~ "city can only build a Hydro Plant if it is next to (or on) a Mountain or "
+#~ "River tile."
+#~ msgstr ""
+#~ "Ìåéþíåé ôç ìüëõíóç ðïõ ðáñÜãåôáé óå ìéá ðüëç êáôÜ 50%. Åðßóçò áõîÜíåé ôçí "
+#~ "ðáñáãùãÞ áóðßäùí åíüò Åñãïóôáóßïõ Þ Âéïìç÷áíßáò óôçí ðüëç: Óå óõíäõáóìü "
+#~ "ìå åñãïóôÜóéï áõîÜíåé êáôÜ 75% ôçí ðáñáãùãÞ êáé óå óõíäõáóìü ìå "
+#~ "åñãïóôÜóéï êáé âéïìç÷áíßá äßíïõí 150% áýîçóç ôçò ðáñáãùãÞò. \n"
+#~ "\n"
+#~ "Ìéá ðüëç ìðïñåß íá Ý÷åé ìüíï Ýíá Õäñïçëåêôñéêü åñãïóôÜóéï, Óôáèìü "
+#~ "ÅíÝñãåéáò Þ Ðõñçíéêü Óôáèìü. Ìéá ðüëç ìðïñåß íá ÷ôßóåé Õäñïçëåêôñéêü "
+#~ "åñãïóôÜóéï áí åßíáé êïíôÜ óå âïõíü Þ ðïôÜìé."
+
#~ msgid "Auth config filename \"%s\" not allowed!"
#~ msgstr "¼íïìá áñ÷åßï äéáìüñöùóçò ðñüóâáóéìüôçôáò \"%s\" äåí åðéôñÝðåôáé!"
@@ -25391,10 +25569,6 @@ msgstr "
#~ msgstr "_Ñýèìéóç Ýèíïõò"
#, fuzzy
-#~ msgid "Never"
-#~ msgstr "ÍïÝìâñéïò"
-
-#, fuzzy
#~ msgid "Loading theme \"%s\"."
#~ msgstr "Êáêü åðßðåäï çìåñïëïãßïõ \"%s\".\n"
diff --git a/po/en_GB.gmo b/po/en_GB.gmo
index 36a3375..d220e6f 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 acebe34..3e506bd 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: 2009-03-29 21:13+0900\n"
+"POT-Creation-Date: 2009-11-22 21:37+0100\n"
"PO-Revision-Date: 2007-09-09 07:42+0900\n"
"Last-Translator: Daniel Markstedt <himasaram at spray.se>\n"
"Language-Team: \n"
@@ -66,21 +66,21 @@ msgstr ""
msgid "?redundant:*"
msgstr ""
-#: common/connection.c:515
+#: common/connection.c:518
#, c-format
msgid "%s from %s"
msgstr ""
-#: common/connection.c:521
+#: common/connection.c:524
msgid " (connection incomplete)"
msgstr ""
-#: common/connection.c:525
+#: common/connection.c:528
#, c-format
msgid " (player %s)"
msgstr ""
-#: common/connection.c:529
+#: common/connection.c:532
msgid " (observer)"
msgstr ""
@@ -484,81 +484,81 @@ msgstr ""
msgid "AI Debug messages"
msgstr ""
-#: common/player.c:732
+#: common/player.c:746
msgid "?attitude:Genocidal"
msgstr ""
-#: common/player.c:734
+#: common/player.c:748
msgid "?attitude:Belligerent"
msgstr ""
-#: common/player.c:736
+#: common/player.c:750
msgid "?attitude:Hostile"
msgstr ""
-#: common/player.c:738
+#: common/player.c:752
msgid "?attitude:Uncooperative"
msgstr ""
-#: common/player.c:740
+#: common/player.c:754
msgid "?attitude:Uneasy"
msgstr ""
-#: common/player.c:742
+#: common/player.c:756
msgid "?attitude:Neutral"
msgstr ""
-#: common/player.c:744
+#: common/player.c:758
msgid "?attitude:Respectful"
msgstr ""
-#: common/player.c:746
+#: common/player.c:760
msgid "?attitude:Helpful"
msgstr ""
-#: common/player.c:748
+#: common/player.c:762
msgid "?attitude:Enthusiastic"
msgstr ""
-#: common/player.c:750
+#: common/player.c:764
msgid "?attitude:Admiring"
msgstr ""
-#: common/player.c:753
+#: common/player.c:767
msgid "?attitude:Worshipful"
msgstr ""
-#: common/player.c:764
+#: common/player.c:778
msgid "?diplomatic_state:Armistice"
msgstr ""
-#: common/player.c:765
+#: common/player.c:779
msgid "?diplomatic_state:War"
msgstr ""
-#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:780 client/gui-gtk-2.0/diplodlg.c:353
#: 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:767 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:781 client/gui-gtk-2.0/diplodlg.c:358
#: 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:768 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:782 client/gui-gtk-2.0/diplodlg.c:363
#: 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:769
+#: common/player.c:783
msgid "?diplomatic_state:Never met"
msgstr ""
-#: common/player.c:770
+#: common/player.c:784
msgid "?diplomatic_state:Team"
msgstr ""
@@ -589,7 +589,7 @@ msgstr ""
#. TRANS: "Resources: (none)".
#: common/requirements.c:1014 common/team.c:132
#: client/gui-gtk-2.0/helpdlg.c:1055 client/gui-gtk-2.0/inteldlg.c:390
-#: client/gui-win32/helpdlg.c:586 client/gui-xaw/helpdlg.c:991
+#: client/gui-win32/helpdlg.c:592 client/gui-xaw/helpdlg.c:991
#, c-format
msgid "(none)"
msgstr ""
@@ -615,10 +615,11 @@ msgstr ""
#: 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
#: client/gui-sdl/helpdlg.c:817 client/gui-sdl/mapview.c:962
-#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:545
-#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:735
-#: 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
+#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:544
+#: client/gui-win32/helpdlg.c:551 client/gui-win32/helpdlg.c:721
+#: client/gui-win32/helpdlg.c:741 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 ""
@@ -631,29 +632,29 @@ msgstr ""
msgid "(Unknown)"
msgstr ""
-#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:553
#: manual/civmanual.c:224
msgid "Road"
msgstr ""
-#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:557
#: client/gui-gtk-2.0/menu.c:829 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:394 common/terrain.c:572 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:567
#: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
#: data/civ1/techs.ruleset:563
msgid "Railroad"
msgstr "Railway"
-#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:555
msgid "Mine"
msgstr ""
-#: common/terrain.c:396 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:551 server/report.c:124
#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr ""
@@ -662,7 +663,7 @@ msgstr ""
msgid "Hut"
msgstr ""
-#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:563
#: manual/civmanual.c:226
msgid "Fortress"
msgstr ""
@@ -675,81 +676,81 @@ msgstr ""
msgid "Farmland"
msgstr ""
-#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:577
#: manual/civmanual.c:226
msgid "Airbase"
msgstr ""
-#: common/terrain.c:402 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:579
msgid "Fallout"
msgstr ""
-#: common/unit.c:546 client/gui-win32/plrdlg.c:337
+#: common/unit.c:549 client/gui-win32/plrdlg.c:337
msgid "Idle"
msgstr ""
-#: common/unit.c:556
+#: common/unit.c:559
msgid "Fortifying"
msgstr ""
-#: common/unit.c:558
+#: common/unit.c:561
msgid "Fortified"
msgstr ""
-#: common/unit.c:562 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
+#: common/unit.c:565 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
msgid "Sentry"
msgstr ""
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
+#: common/unit.c:569 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
#: client/gui-win32/menu.c:370 client/gui-xaw/menu.c:185
msgid "Pillage"
msgstr ""
-#: common/unit.c:568 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
+#: common/unit.c:571 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
msgid "Goto"
msgstr ""
-#: common/unit.c:570
+#: common/unit.c:573
msgid "Explore"
msgstr ""
-#: common/unit.c:572 manual/civmanual.c:224
+#: common/unit.c:575 manual/civmanual.c:224
msgid "Transform"
msgstr ""
-#: common/unit.c:584 client/text.c:157 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:587 client/text.c:157 client/gui-sdl/citydlg.c:1972
#: client/gui-win32/citydlg.c:1257 client/gui-xaw/citydlg.c:1423
msgid "Unknown"
msgstr ""
-#: common/unit.c:1022
+#: common/unit.c:1025
msgid "Moves"
msgstr ""
-#: common/unit.c:1571
+#: common/unit.c:1574
#, c-format
msgid ""
"Upgrade %s to %s for %d gold?\n"
"Treasury contains %d gold."
msgstr ""
-#: common/unit.c:1579
+#: common/unit.c:1582
#, c-format
msgid "Sorry, cannot upgrade %s (yet)."
msgstr ""
-#: common/unit.c:1585
+#: common/unit.c:1588
#, c-format
msgid ""
"Upgrading %s to %s costs %d gold.\n"
"Treasury contains %d gold."
msgstr ""
-#: common/unit.c:1594
+#: common/unit.c:1597
msgid "You can only upgrade units in your cities."
msgstr ""
-#: common/unit.c:1598
+#: common/unit.c:1601
#, c-format
msgid "Upgrading this %s would strand units it transports."
msgstr ""
@@ -782,11 +783,11 @@ msgstr ""
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1404
+#: common/unittype.c:349 client/helpdata.c:1412
msgid " and "
msgstr ""
-#: common/unittype.c:355 client/helpdata.c:1390
+#: common/unittype.c:355 client/helpdata.c:1398
msgid "?and:, "
msgstr ""
@@ -947,69 +948,69 @@ msgstr ""
msgid "Missing argument for \"%s\".\n"
msgstr ""
-#: utility/shared.c:501
+#: utility/shared.c:514
#, c-format
msgid "%d BC"
msgstr ""
-#: utility/shared.c:503
+#: utility/shared.c:516
#, c-format
msgid "%d AD"
msgstr ""
-#: utility/shared.c:924
+#: utility/shared.c:937
msgid "FREECIV_PATH is set but empty; using default path instead."
msgstr ""
-#: utility/shared.c:1028
+#: utility/shared.c:1041
#, c-format
msgid "Could not read data directory %s: %s."
msgstr ""
-#: utility/shared.c:1279
+#: utility/shared.c:1292
msgid "The data path may be set via the environment variable FREECIV_PATH."
msgstr ""
-#: utility/shared.c:1281
+#: utility/shared.c:1294
#, c-format
msgid "Current data path is: \"%s\""
msgstr ""
-#: utility/shared.c:1283
+#: utility/shared.c:1296
#, c-format
msgid "The \"%s\" file is required ... aborting!"
msgstr ""
-#: utility/shared.c:1460
+#: utility/shared.c:1485
#, c-format
msgid "%s: Fatal error: you're trying to run me as superuser!\n"
msgstr ""
-#: utility/shared.c:1462
+#: utility/shared.c:1487
msgid "Use a non-privileged account instead.\n"
msgstr ""
-#: utility/shared.c:1478
+#: utility/shared.c:1503
msgid "exact match"
msgstr ""
-#: utility/shared.c:1479
+#: utility/shared.c:1504
msgid "only match"
msgstr ""
-#: utility/shared.c:1480
+#: utility/shared.c:1505
msgid "ambiguous"
msgstr ""
-#: utility/shared.c:1481
+#: utility/shared.c:1506
msgid "empty"
msgstr ""
-#: utility/shared.c:1482
+#: utility/shared.c:1507
msgid "too long"
msgstr ""
-#: utility/shared.c:1483
+#: utility/shared.c:1508
msgid "non-match"
msgstr ""
@@ -1038,108 +1039,108 @@ msgstr ""
msgid "%s is selling %s (not needed) for %d."
msgstr ""
-#: ai/advdiplomacy.c:280
+#: ai/advdiplomacy.c:300
#, c-format
msgid "*%s (AI)* In away mode AI can't sign such a treaty."
msgstr ""
-#: ai/advdiplomacy.c:290
+#: ai/advdiplomacy.c:310
#, c-format
msgid "*%s (AI)* First break alliance with %s, %s."
msgstr ""
-#: ai/advdiplomacy.c:303
+#: ai/advdiplomacy.c:322
#, c-format
msgid "*%s (AI)* Let us first cease hostilies, %s."
msgstr ""
-#: ai/advdiplomacy.c:308
+#: ai/advdiplomacy.c:327
#, c-format
msgid ""
"*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
"first, %s."
msgstr ""
-#: ai/advdiplomacy.c:331
+#: ai/advdiplomacy.c:350
#, c-format
msgid "*%s (AI)* I simply do not trust you with an alliance yet, %s."
msgstr ""
-#: ai/advdiplomacy.c:424
+#: ai/advdiplomacy.c:443
#, c-format
msgid "*%s (AI)* I do not know the city you mention."
msgstr ""
-#: ai/advdiplomacy.c:454
+#: ai/advdiplomacy.c:473
#, c-format
msgid "*%s (AI)* Sorry, sharing vision with you is not safe."
msgstr ""
-#: ai/advdiplomacy.c:560
+#: ai/advdiplomacy.c:579
#, c-format
msgid "*%s (AI)* This deal was not very good for us, %s!"
msgstr ""
-#: ai/advdiplomacy.c:582
+#: ai/advdiplomacy.c:601
#, c-format
msgid "*%s (AI)* Welcome into our alliance %s!"
msgstr ""
-#: ai/advdiplomacy.c:586
+#: ai/advdiplomacy.c:605
#, c-format
msgid "*%s (AI)* Yes, may we forever stand united, %s."
msgstr ""
-#: ai/advdiplomacy.c:593
+#: ai/advdiplomacy.c:612
#, c-format
msgid "*%s (AI)* Yes, peace in our time!"
msgstr ""
-#: ai/advdiplomacy.c:598
+#: ai/advdiplomacy.c:617
#, c-format
msgid "*%s (AI)* Agreed. No more hostilities, %s."
msgstr ""
-#: ai/advdiplomacy.c:813
+#: ai/advdiplomacy.c:832
#, c-format
msgid ""
"*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
"other better?"
msgstr ""
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1116
#, c-format
msgid "*%s (AI)* Space will never be yours. "
msgstr ""
-#: ai/advdiplomacy.c:1102
+#: ai/advdiplomacy.c:1121
#, c-format
msgid "*%s (AI)* I have tolerated your vicious antics long enough! To war!"
msgstr ""
-#: ai/advdiplomacy.c:1108
+#: ai/advdiplomacy.c:1127
#, c-format
msgid "*%s (AI)* Peace in ... some other time."
msgstr ""
-#: ai/advdiplomacy.c:1113
+#: ai/advdiplomacy.c:1132
#, 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:1119
+#: ai/advdiplomacy.c:1138
#, c-format
msgid "*%s (AI)* Your covert hostilities brought this war upon you!"
msgstr ""
-#: ai/advdiplomacy.c:1126
+#: ai/advdiplomacy.c:1145
#, c-format
msgid "*%s (AI)* Your aggression against %s was your last mistake!"
msgstr ""
-#: ai/advdiplomacy.c:1209
+#: ai/advdiplomacy.c:1229
#, c-format
msgid ""
"*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1150,14 +1151,14 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1219
+#: ai/advdiplomacy.c:1239
#, c-format
msgid ""
"*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
"alliance!"
msgstr ""
-#: ai/advdiplomacy.c:1225
+#: ai/advdiplomacy.c:1245
#, c-format
msgid ""
"*%s (AI)* %s has grossly violated his treaties with us for own gain. We "
@@ -1170,7 +1171,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1238
+#: ai/advdiplomacy.c:1258
#, c-format
msgid ""
"*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1181,13 +1182,13 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1246
+#: ai/advdiplomacy.c:1266
#, c-format
msgid ""
"*%s (AI)* If you want a piece of the loot, feel free to join in the action!"
msgstr ""
-#: ai/advdiplomacy.c:1251
+#: ai/advdiplomacy.c:1271
#, c-format
msgid ""
"*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1198,12 +1199,12 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1261
+#: ai/advdiplomacy.c:1281
#, c-format
msgid "*%s (AI)* As our glorious allies, we expect your help in this war."
msgstr ""
-#: ai/advdiplomacy.c:1267
+#: ai/advdiplomacy.c:1287
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance and declare war on %s in %d turn. "
@@ -1214,7 +1215,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1276
+#: ai/advdiplomacy.c:1296
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1225,47 +1226,47 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1344
+#: ai/advdiplomacy.c:1364
#, 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:1359
+#: ai/advdiplomacy.c:1379
#, c-format
msgid ""
"*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
"offensive."
msgstr ""
-#: ai/advdiplomacy.c:1362
+#: ai/advdiplomacy.c:1382
#, c-format
msgid ""
"*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
"take action!"
msgstr ""
-#: ai/advdiplomacy.c:1474
+#: ai/advdiplomacy.c:1494
#, c-format
msgid "*%s (AI)* Sorry, sharing vision with you is no longer safe."
msgstr ""
-#: ai/advdiplomacy.c:1549
+#: ai/advdiplomacy.c:1569
#, c-format
msgid ""
"*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
"our enemy, %s."
msgstr ""
-#: ai/advdiplomacy.c:1555
+#: ai/advdiplomacy.c:1575
#, 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:1562
+#: ai/advdiplomacy.c:1582
#, c-format
msgid ""
"*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1273,26 +1274,26 @@ msgid ""
"more!"
msgstr ""
-#: ai/advdiplomacy.c:1592
+#: ai/advdiplomacy.c:1612
#, c-format
msgid ""
"*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
"an alliance?"
msgstr ""
-#: ai/advdiplomacy.c:1607
+#: ai/advdiplomacy.c:1627
#, c-format
msgid "*%s (AI)* Greetings neighbour, may we suggest more peaceful relations?"
msgstr ""
-#: ai/advdiplomacy.c:1622
+#: ai/advdiplomacy.c:1642
#, c-format
msgid ""
"*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
"cessation of hostilities?"
msgstr ""
-#: ai/advdiplomacy.c:1742
+#: ai/advdiplomacy.c:1762
#, c-format
msgid ""
"*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1431,17 +1432,17 @@ msgid ""
"minimum %d [printable] characters long. Try again."
msgstr ""
-#: server/barbarian.c:183
+#: server/barbarian.c:184
#, c-format
msgid "%s gain a leader by the name %s. Dangerous times may lie ahead."
msgstr ""
-#: server/barbarian.c:479
+#: server/barbarian.c:480
#, c-format
msgid "Native unrest near %s led by %s."
msgstr ""
-#: server/barbarian.c:484
+#: server/barbarian.c:485
#, c-format
msgid "Sea raiders seen near %s!"
msgstr ""
@@ -1812,7 +1813,7 @@ msgid_plural "%s boosts research; you gain %d immediate advances."
msgstr[0] ""
msgstr[1] ""
-#: server/cityturn.c:1158 server/techtools.c:176
+#: server/cityturn.c:1158 server/techtools.c:172
#, c-format
msgid "The %s have acquired %s from %s."
msgstr ""
@@ -1893,123 +1894,127 @@ msgstr ""
msgid "Warning: the %s option is obsolete. Use -m to enable the metaserver.\n"
msgstr ""
-#: server/civserver.c:189
+#: server/civserver.c:193
#, c-format
msgid "Error: unknown option '%s'\n"
msgstr ""
-#: server/civserver.c:200
+#: server/civserver.c:204
#, c-format
msgid "This is the server for %s"
msgstr ""
-#: server/civserver.c:201
+#: server/civserver.c:205
#, c-format
msgid "You can learn a lot about Freeciv at %s"
msgstr ""
-#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
+#: server/civserver.c:210 client/civclient.c:239 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
"Valid options are:\n"
msgstr ""
-#: server/civserver.c:208
+#: server/civserver.c:212
msgid ""
" -a --auth FILE\tEnable server authentication with configuration from "
"FILE.\n"
msgstr ""
-#: server/civserver.c:210
+#: server/civserver.c:214
msgid " -G --Guests\t\tAllow guests to login if auth is enabled.\n"
msgstr ""
-#: server/civserver.c:212
+#: server/civserver.c:216
msgid " -N --Newusers\tAllow new users to login if auth is enabled.\n"
msgstr ""
-#: server/civserver.c:215
+#: server/civserver.c:219
msgid " -b --bind ADDR\tListen for clients on ADDR\n"
msgstr ""
-#: server/civserver.c:217 client/civclient.c:242
+#: server/civserver.c:221 client/civclient.c:243
msgid ""
" -d, --debug NUM\tSet debug log level (0 to 4, or 4:file1,min,max:...)\n"
msgstr ""
-#: server/civserver.c:221 client/civclient.c:246
+#: server/civserver.c:225 client/civclient.c:247
msgid " -d, --debug NUM\tSet debug log level (0 to 3)\n"
msgstr ""
-#: server/civserver.c:223
+#: server/civserver.c:227
msgid " -f, --file FILE\tLoad saved game FILE\n"
msgstr ""
-#: server/civserver.c:225 client/civclient.c:249 manual/civmanual.c:382
+#: server/civserver.c:229 client/civclient.c:250 manual/civmanual.c:382
msgid " -h, --help\t\tPrint a summary of the options\n"
msgstr ""
-#: server/civserver.c:226
+#: server/civserver.c:230
+msgid " -i, --identity ADDR\tBe known as ADDR at metaserver\n"
+msgstr ""
+
+#: server/civserver.c:231
msgid " -l, --log FILE\tUse FILE as logfile\n"
msgstr ""
-#: server/civserver.c:227
+#: server/civserver.c:232
msgid " -m, --meta\t\tNotify metaserver and send server's info\n"
msgstr ""
-#: server/civserver.c:229
+#: server/civserver.c:234
msgid " -M, --Metaserver ADDR\tSet ADDR as metaserver address\n"
msgstr ""
-#: server/civserver.c:232
+#: server/civserver.c:237
msgid " -p, --port PORT\tListen for clients on port PORT\n"
msgstr ""
-#: server/civserver.c:234
+#: server/civserver.c:239
msgid " -q, --quitidle TIME\tQuit if no players for TIME seconds\n"
msgstr ""
-#: server/civserver.c:236
+#: server/civserver.c:241
msgid " -e, --exit-on-end\tWhen a game ends, exit instead of restarting\n"
msgstr ""
-#: server/civserver.c:239
+#: server/civserver.c:244
msgid " -s, --saves DIR\tSave games to directory DIR\n"
msgstr ""
-#: server/civserver.c:241
+#: server/civserver.c:246
msgid " -S, --Serverid ID\tSets the server id to ID\n"
msgstr ""
-#: server/civserver.c:243
+#: server/civserver.c:248
msgid " -P, --Ppm\t\tSave ppms of the map when saving the game.\n"
msgstr ""
-#: server/civserver.c:244
+#: server/civserver.c:249
msgid " -r, --read FILE\tRead startup script FILE\n"
msgstr ""
-#: server/civserver.c:246
+#: server/civserver.c:251
msgid " -R, --Ranklog FILE\tUse FILE as ranking logfile\n"
msgstr ""
-#: server/civserver.c:247 client/civclient.c:268 manual/civmanual.c:383
+#: server/civserver.c:252 client/civclient.c:269 manual/civmanual.c:383
msgid " -v, --version\t\tPrint the version number\n"
msgstr ""
-#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
+#: server/civserver.c:253 client/gui-gtk-2.0/gui_main.c:354
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, c-format
msgid "Report bugs at %s.\n"
msgstr ""
-#: server/commands.c:28
+#: server/commands.c:29
msgid "Start the game, or restart after loading a savegame."
msgstr ""
-#: server/commands.c:29
+#: server/commands.c:30
msgid ""
"This command starts the game. When starting a new game, it should be used "
"after all human players have connected, and AI players have been created (if "
@@ -2021,7 +2026,7 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:42
+#: server/commands.c:44
msgid ""
"help\n"
"help commands\n"
@@ -2030,11 +2035,11 @@ msgid ""
"help <option-name>"
msgstr ""
-#: server/commands.c:47
+#: server/commands.c:49
msgid "Show help about server commands and server options."
msgstr ""
-#: server/commands.c:48
+#: server/commands.c:50
msgid ""
"With no arguments gives some introductory help. With argument \"commands\" "
"or \"options\" gives respectively a list of all commands or all options. "
@@ -2044,31 +2049,31 @@ msgid ""
"be abbreviated where unambiguous."
msgstr ""
-#: server/commands.c:63
+#: server/commands.c:66
msgid "Show a list of players, teams, connections, or scenarios."
msgstr ""
-#: server/commands.c:64
+#: server/commands.c:67
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 ""
-#: server/commands.c:70
+#: server/commands.c:74
msgid "Quit the game and shutdown the server."
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:74
+#: server/commands.c:79
msgid "cut <connection-name>"
msgstr ""
-#: server/commands.c:75
+#: server/commands.c:80
msgid "Cut a client's connection to server."
msgstr ""
-#: server/commands.c:76
+#: server/commands.c:81
msgid ""
"Cut specified client's connection to the server, removing that client from "
"the game. If the game has not yet started that client's player is removed "
@@ -2077,17 +2082,17 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:83
+#: server/commands.c:89
msgid ""
"explain\n"
"explain <option-name>"
msgstr ""
-#: server/commands.c:85
+#: server/commands.c:91
msgid "Explain server options."
msgstr ""
-#: server/commands.c:86
+#: server/commands.c:92
msgid ""
"The 'explain' command gives a subset of the functionality of 'help', and is "
"included for backward compatibility. With no arguments it gives a list of "
@@ -2096,89 +2101,90 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:93
+#: server/commands.c:100
msgid ""
"show\n"
"show <option-name>\n"
"show <option-prefix>"
msgstr ""
-#: server/commands.c:96
+#: server/commands.c:103
msgid "Show server options."
msgstr ""
-#: server/commands.c:97
+#: server/commands.c:104
msgid ""
"With no arguments, shows all server options (or available options, when used "
"by clients). With an argument, show only the named option, or options with "
"that prefix."
msgstr ""
-#: server/commands.c:102
+#: server/commands.c:110
msgid "wall <message>"
msgstr ""
-#: server/commands.c:103
+#: server/commands.c:111
msgid "Send message to all connections."
msgstr ""
-#: server/commands.c:104
+#: server/commands.c:112
msgid ""
"For each connected client, pops up a window showing the message entered."
msgstr ""
-#: server/commands.c:108
+#: server/commands.c:117
msgid "vote yes|no [vote number]"
msgstr ""
-#: server/commands.c:109
+#: server/commands.c:118
msgid "Cast a vote."
msgstr ""
-#: server/commands.c:111
+#: server/commands.c:120
#, 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."
+"A player with basic 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."
msgstr ""
-#: server/commands.c:121
+#: server/commands.c:131
msgid ""
"debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
"<player> | timing | info]"
msgstr ""
-#: server/commands.c:123
+#: server/commands.c:133
msgid "Turn on or off AI debugging of given entity."
msgstr ""
-#: server/commands.c:124
+#: server/commands.c:134
msgid ""
"Print AI debug information about given entity and turn continous debugging "
"output for this entity on or off."
msgstr ""
-#: server/commands.c:128
+#: server/commands.c:139
msgid "set <option-name> <value>"
msgstr ""
-#: server/commands.c:129
+#: server/commands.c:140
msgid "Set server option."
msgstr ""
-#: server/commands.c:132
+#: server/commands.c:144
msgid "team <player> [team]"
msgstr ""
-#: server/commands.c:133
+#: server/commands.c:145
msgid "Change, add or remove a player's team affiliation."
msgstr ""
-#: server/commands.c:134
+#: server/commands.c:146
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 "
@@ -2186,30 +2192,30 @@ msgid ""
"to achieve team victory with averaged individual scores."
msgstr ""
-#: server/commands.c:141
+#: server/commands.c:154
msgid "rulesetdir <directory>"
msgstr ""
-#: server/commands.c:142
+#: server/commands.c:155
msgid "Choose new ruleset directory or modpack."
msgstr ""
-#: server/commands.c:143
+#: server/commands.c:156
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:149
+#: server/commands.c:163
msgid "metainfo <meta-line>"
msgstr ""
-#: server/commands.c:150
+#: server/commands.c:164
msgid "Set metaserver info line."
msgstr ""
-#: server/commands.c:151
+#: server/commands.c:165
msgid ""
"Set user defined metaserver info line. If parameter is omitted,\n"
"previously set metamessage will be removed. For most of the time\n"
@@ -2218,19 +2224,19 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:158
+#: server/commands.c:173
msgid "metapatch <meta-line>"
msgstr ""
-#: server/commands.c:159
+#: server/commands.c:174
msgid "Set metaserver patches line."
msgstr ""
-#: server/commands.c:165
+#: server/commands.c:181
msgid "Control metaserver connection."
msgstr ""
-#: server/commands.c:166
+#: server/commands.c:182
msgid ""
"'metaconnection ?' reports on the status of the connection to metaserver.\n"
"'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2238,33 +2244,33 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:172
+#: server/commands.c:189
msgid "metaserver <address>"
msgstr ""
-#: server/commands.c:173
+#: server/commands.c:190
msgid "Set address (URL) for metaserver to report to."
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:177
+#: server/commands.c:195
msgid "aitoggle <player-name>"
msgstr ""
-#: server/commands.c:178
+#: server/commands.c:196
msgid "Toggle AI status of player."
msgstr ""
#. TRANS: translate text between [] and <> only
-#: server/commands.c:182
+#: server/commands.c:201
msgid "take [connection-name] <player-name>"
msgstr ""
-#: server/commands.c:183
+#: server/commands.c:202
msgid "Take over a player's place in the game."
msgstr ""
-#: server/commands.c:184
+#: server/commands.c:203
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 "
@@ -2274,15 +2280,15 @@ msgid ""
msgstr ""
#. TRANS: translate text between [] only
-#: server/commands.c:192
+#: server/commands.c:212
msgid "observe [connection-name] [player-name]"
msgstr ""
-#: server/commands.c:193
+#: server/commands.c:213
msgid "Observe a player or the whole game."
msgstr ""
-#: server/commands.c:194
+#: server/commands.c:214
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 "
@@ -2292,60 +2298,60 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:202
+#: server/commands.c:223
msgid "detach <connection-name>"
msgstr ""
-#: server/commands.c:203
+#: server/commands.c:224
msgid "detach from a player."
msgstr ""
-#: server/commands.c:204
+#: server/commands.c:225
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:209
+#: server/commands.c:231
msgid "create <player-name>"
msgstr ""
-#: server/commands.c:210
+#: server/commands.c:232
msgid "Create an AI player with a given name."
msgstr ""
-#: server/commands.c:211
+#: server/commands.c:233
msgid ""
"The 'create' command is only available before the game has been started."
msgstr ""
-#: server/commands.c:215
+#: server/commands.c:238
msgid ""
"away\n"
"away"
msgstr ""
-#: server/commands.c:217
+#: server/commands.c:240
msgid "Set yourself in away mode. The AI will watch your back."
msgstr ""
-#: server/commands.c:218
+#: server/commands.c:241
msgid "The AI will govern your nation but do minimal changes."
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:222
+#: server/commands.c:246
msgid ""
"novice\n"
"novice <player-name>"
msgstr ""
-#: server/commands.c:224
+#: server/commands.c:248
msgid "Set one or all AI players to 'novice'."
msgstr ""
-#: server/commands.c:225
+#: server/commands.c:249
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 "
@@ -2353,17 +2359,17 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:231
+#: server/commands.c:256
msgid ""
"easy\n"
"easy <player-name>"
msgstr ""
-#: server/commands.c:233
+#: server/commands.c:258
msgid "Set one or all AI players to 'easy'."
msgstr ""
-#: server/commands.c:234
+#: server/commands.c:259
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 "
@@ -2371,17 +2377,17 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:240
+#: server/commands.c:266
msgid ""
"normal\n"
"normal <player-name>"
msgstr ""
-#: server/commands.c:242
+#: server/commands.c:268
msgid "Set one or all AI players to 'normal'."
msgstr ""
-#: server/commands.c:243
+#: server/commands.c:269
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 "
@@ -2389,17 +2395,17 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:249
+#: server/commands.c:276
msgid ""
"hard\n"
"hard <player-name>"
msgstr ""
-#: server/commands.c:251
+#: server/commands.c:278
msgid "Set one or all AI players to 'hard'."
msgstr ""
-#: server/commands.c:252
+#: server/commands.c:279
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 "
@@ -2407,17 +2413,17 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:258
+#: server/commands.c:286
msgid ""
"experimental\n"
"experimental <player-name>"
msgstr ""
-#: server/commands.c:260
+#: server/commands.c:288
msgid "Set one or all AI players to 'experimental'."
msgstr ""
-#: server/commands.c:261
+#: server/commands.c:289
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 "
@@ -2426,7 +2432,7 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:269
+#: server/commands.c:298
msgid ""
"cmdlevel\n"
"cmdlevel <level>\n"
@@ -2435,17 +2441,19 @@ msgid ""
"cmdlevel <level> <connection-name>"
msgstr ""
-#: server/commands.c:274
+#: server/commands.c:303
msgid "Query or set command access level access."
msgstr ""
-#: server/commands.c:275
+#: server/commands.c:304
msgid ""
"The command access level controls which server commands are available\n"
"to users via the client chatline. The available levels are:\n"
" none - no commands\n"
-" info - informational commands only\n"
+" info - informational or observer commands only\n"
+" basic - commands available to players in the game\n"
" ctrl - commands that affect the game and users\n"
+" admin - commands that affect server operation\n"
" hack - *all* commands - dangerous!\n"
"With no arguments, the current command access levels are reported.\n"
"With a single argument, the level is set for all existing connections,\n"
@@ -2461,20 +2469,20 @@ msgid ""
"now takes connection names, not player names."
msgstr ""
-#: server/commands.c:296
+#: server/commands.c:328
msgid "If there is none, become the game organizer with increased permissions."
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:301
+#: server/commands.c:334
msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
msgstr ""
-#: server/commands.c:302
+#: server/commands.c:335
msgid "See \"help timeoutincrease\"."
msgstr ""
-#: server/commands.c:303
+#: server/commands.c:336
msgid ""
"Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
"<turn> and multiply <value> by <valuemult>. Use this command in concert "
@@ -2482,56 +2490,75 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:309
+#: server/commands.c:343
+msgid ""
+"cancelvote\n"
+"cancelvote <vote number>\n"
+"cancelvote all\n"
+msgstr ""
+
+#: server/commands.c:346
+msgid "Cancel a running vote.\n"
+msgstr ""
+
+#: server/commands.c:347
+msgid ""
+"With no arguments this command removes your own vote. If you have an admin "
+"access level, you can cancel any vote by vote number, or all votes with the "
+"'all' argument."
+msgstr ""
+
+#. TRANS: translate text between <> only
+#: server/commands.c:354
msgid "endgame"
msgstr ""
-#: server/commands.c:310
+#: server/commands.c:355
msgid "End the game immediately in a draw."
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:314
+#: server/commands.c:360
msgid "surrender"
msgstr ""
-#: server/commands.c:315
+#: server/commands.c:361
msgid "Concede the game."
msgstr ""
-#: server/commands.c:316
+#: server/commands.c:362
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:322
+#: server/commands.c:369
msgid "remove <player-name>"
msgstr ""
-#: server/commands.c:323
+#: server/commands.c:370
msgid "Fully remove player from game."
msgstr ""
-#: server/commands.c:324
+#: server/commands.c:371
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:329
+#: server/commands.c:377
msgid ""
"save\n"
"save <file-name>"
msgstr ""
-#: server/commands.c:331
+#: server/commands.c:379
msgid "Save game to file."
msgstr ""
-#: server/commands.c:332
+#: server/commands.c:380
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"
@@ -2542,133 +2569,133 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:341
+#: server/commands.c:390
msgid ""
"load\n"
"load <file-name>"
msgstr ""
-#: server/commands.c:343
+#: server/commands.c:392
msgid "Load game from file."
msgstr ""
-#: server/commands.c:344
+#: server/commands.c:393
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:349
+#: server/commands.c:399
msgid "read <file-name>"
msgstr ""
-#: server/commands.c:350
+#: server/commands.c:400
msgid "Process server commands from file."
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:354
+#: server/commands.c:405
msgid "write <file-name>"
msgstr ""
-#: server/commands.c:355
+#: server/commands.c:406
msgid "Write current settings as server commands to file."
msgstr ""
-#: server/commands.c:359
+#: server/commands.c:411
msgid "Switch server output between 'RFC-style' and normal style."
msgstr ""
-#: server/commands.c:363
+#: server/commands.c:416
msgid "Simply returns the id of the server."
msgstr ""
-#: server/connecthand.c:85
+#: server/connecthand.c:109
#, c-format
msgid "Welcome to the %s Server running at %s port %d."
msgstr ""
-#: server/connecthand.c:89
+#: server/connecthand.c:113
#, c-format
msgid "Welcome to the %s Server at port %d."
msgstr ""
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:97
+#: server/connecthand.c:121
#, c-format
msgid "(%d) %s: connected [%s]"
msgstr ""
-#: server/connecthand.c:104
+#: server/connecthand.c:128
#, c-format
msgid "Server: %s has connected from %s."
msgstr ""
-#: server/connecthand.c:145
+#: server/connecthand.c:175
msgid "Couldn't attach your connection to new player."
msgstr ""
-#: server/connecthand.c:165
+#: server/connecthand.c:199
#, c-format
msgid "You are logged in as '%s' connected to no player."
msgstr ""
-#: server/connecthand.c:169
+#: server/connecthand.c:203
#, c-format
msgid "You are logged in as '%s' connected to an anonymous player."
msgstr ""
-#: server/connecthand.c:174
+#: server/connecthand.c:208
#, c-format
msgid "You are logged in as '%s' connected to %s."
msgstr ""
-#: server/connecthand.c:187
+#: server/connecthand.c:221
#, c-format
msgid "Turn-blocking game play: waiting on %s to finish turn..."
msgstr ""
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:240
+#: server/connecthand.c:274
#, c-format
msgid "(%d) %s: connection request [%s]"
msgstr ""
-#: server/connecthand.c:266
+#: server/connecthand.c:300
msgid "The client is missing a capability that this server needs."
msgstr ""
-#: server/connecthand.c:268 server/connecthand.c:279
+#: server/connecthand.c:302 server/connecthand.c:313
#, c-format
msgid "(%d) %s rejected: mismatched capabilities!"
msgstr ""
-#: server/connecthand.c:277
+#: server/connecthand.c:311
msgid "This server is missing a capability that the client needs."
msgstr ""
-#: server/connecthand.c:290
+#: server/connecthand.c:324
msgid "The username is invalid!"
msgstr ""
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:292
+#: server/connecthand.c:326
#, c-format
msgid "(%d) %s rejected: invalid username [%s]"
msgstr ""
-#: server/connecthand.c:303
+#: server/connecthand.c:337
msgid "Your username is already connected!"
msgstr ""
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:305
+#: server/connecthand.c:339
#, c-format
msgid "(%d) %s rejected: duplicate username [%s]"
msgstr ""
-#: server/connecthand.c:335 server/connecthand.c:344
+#: server/connecthand.c:369 server/connecthand.c:378
#, c-format
msgid "Lost connection: %s."
msgstr ""
@@ -2685,111 +2712,111 @@ msgstr ""
msgid "For introductory help, type 'help'."
msgstr ""
-#: server/diplhand.c:164
+#: server/diplhand.c:167
#, c-format
msgid "The %s can't accept %s."
msgstr ""
-#: server/diplhand.c:176
+#: server/diplhand.c:179
#, c-format
msgid "You don't have tech %s, you can't accept treaty."
msgstr ""
-#: server/diplhand.c:185
+#: server/diplhand.c:188
msgid "City you are trying to give no longer exists, you can't accept treaty."
msgstr ""
-#: server/diplhand.c:191
+#: server/diplhand.c:194
#, c-format
msgid "You are not owner of %s, you can't accept treaty."
msgstr ""
-#: server/diplhand.c:197 server/diplhand.c:301
+#: server/diplhand.c:200 server/diplhand.c:304
#, c-format
msgid "Your capital (%s) is requested, you can't accept treaty."
msgstr ""
-#: server/diplhand.c:224
+#: server/diplhand.c:227
msgid "You don't have enough gold, you can't accept treaty."
msgstr ""
-#: server/diplhand.c:256 server/diplhand.c:261
+#: server/diplhand.c:259 server/diplhand.c:264
#, c-format
msgid "A treaty containing %d clause was agreed upon."
msgid_plural "A treaty containing %d clauses was agreed upon."
msgstr[0] ""
msgstr[1] ""
-#: server/diplhand.c:277 server/diplhand.c:281
+#: server/diplhand.c:280 server/diplhand.c:284
#, c-format
msgid "One of the cities the %s are giving away is destroyed! Treaty canceled!"
msgstr ""
"One of the cities the %s are giving away is destroyed! Treaty cancelled!"
-#: server/diplhand.c:288 server/diplhand.c:293
+#: server/diplhand.c:291 server/diplhand.c:296
#, c-format
msgid "The %s no longer control %s! Treaty canceled!"
msgstr "The %s no longer control %s! Treaty cancelled!"
-#: server/diplhand.c:331 server/diplhand.c:335
+#: server/diplhand.c:334 server/diplhand.c:338
#, c-format
msgid "The %s don't have the promised amount of gold! Treaty canceled!"
msgstr "The %s don't have the promised amount of gold! Treaty cancelled!"
-#: server/diplhand.c:364
+#: server/diplhand.c:367
#, c-format
msgid "You gave an embassy to %s."
msgstr ""
-#: server/diplhand.c:367
+#: server/diplhand.c:370
#, c-format
msgid "%s allowed you to create an embassy!"
msgstr ""
-#: server/diplhand.c:383
+#: server/diplhand.c:386
#, c-format
msgid "You are taught the knowledge of %s."
msgstr ""
-#: server/diplhand.c:387
+#: server/diplhand.c:390
#, c-format
msgid "The %s have acquired %s from the %s."
msgstr ""
-#: server/diplhand.c:402
+#: server/diplhand.c:405
#, c-format
msgid "You get %d gold."
msgstr ""
#. TRANS: ... Polish worldmap.
-#: server/diplhand.c:410
+#: server/diplhand.c:413
#, c-format
msgid "You receive the %s worldmap."
msgstr ""
#. TRANS: ... Polish seamap.
-#: server/diplhand.c:419
+#: server/diplhand.c:422
#, c-format
msgid "You receive the %s seamap."
msgstr ""
-#: server/diplhand.c:436
+#: server/diplhand.c:439
#, c-format
msgid "You receive city of %s from %s."
msgstr ""
-#: server/diplhand.c:441
+#: server/diplhand.c:444
#, c-format
msgid "You give city of %s to %s."
msgstr ""
-#: server/diplhand.c:454 server/diplhand.c:457
+#: server/diplhand.c:457 server/diplhand.c:460
#, c-format
msgid "You agree on a cease-fire with %s."
msgstr ""
#. TRANS: ... the Poles ... Polish territory.
-#: server/diplhand.c:476 server/diplhand.c:488
+#: server/diplhand.c:479 server/diplhand.c:491
#, c-format
msgid ""
"You agree on an armistice with the %s. In %d turn, it will become a peace "
@@ -2800,32 +2827,32 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: server/diplhand.c:512 server/diplhand.c:515
+#: server/diplhand.c:515 server/diplhand.c:518
#, c-format
msgid "You agree on an alliance with %s."
msgstr ""
-#: server/diplhand.c:524
+#: server/diplhand.c:527
#, c-format
msgid "You give shared vision to %s."
msgstr ""
-#: server/diplhand.c:527
+#: server/diplhand.c:530
#, c-format
msgid "%s gives you shared vision."
msgstr ""
-#: server/diplhand.c:663
+#: server/diplhand.c:666
#, c-format
msgid "%s canceled the meeting!"
msgstr "%s cancelled the meeting!"
-#: server/diplhand.c:670
+#: server/diplhand.c:673
#, c-format
msgid "Meeting with %s canceled."
msgstr "Meeting with %s cancelled."
-#: server/diplhand.c:712
+#: server/diplhand.c:715
msgid "Your diplomatic envoy was decapitated!"
msgstr ""
@@ -3008,80 +3035,80 @@ msgid "The %s destroyed the %s in %s."
msgstr ""
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1091
+#: server/diplomats.c:1097
#, c-format
msgid "An enemy %s has been eliminated by your %s."
msgstr ""
#. TRANS: <unit> ... <city> ... <diplomat>
-#: server/diplomats.c:1098
+#: server/diplomats.c:1104
#, c-format
msgid "Your %s has been eliminated defending %s against a %s."
msgstr ""
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1106
+#: server/diplomats.c:1112
#, c-format
msgid "Your %s has been eliminated defending against a %s."
msgstr ""
-#: server/diplomats.c:1119
+#: server/diplomats.c:1125
#, c-format
msgid "Your %s was eliminated by a defending %s."
msgstr ""
-#: server/diplomats.c:1127
+#: server/diplomats.c:1133
#, c-format
msgid "Eliminated %s %s while infiltrating %s."
msgstr ""
-#: server/diplomats.c:1134
+#: server/diplomats.c:1140
#, c-format
msgid "Eliminated %s %s while infiltrating our troops."
msgstr ""
-#: server/diplomats.c:1185
+#: server/diplomats.c:1191
#, c-format
msgid ""
"Your %s has successfully completed the mission and returned unharmed to %s."
msgstr ""
-#: server/diplomats.c:1204
+#: server/diplomats.c:1210
#, c-format
msgid "Your %s was captured after completing the mission in %s."
msgstr ""
-#: server/diplomats.c:1210
+#: server/diplomats.c:1216
#, c-format
msgid "Your %s was captured after completing the mission."
msgstr ""
-#: server/diplomats.c:1242
+#: server/diplomats.c:1248
#, c-format
msgid "You have caused an incident while bribing the %s %s."
msgstr ""
-#: server/diplomats.c:1247
+#: server/diplomats.c:1253
#, c-format
msgid "%s has caused an incident while bribing your %s."
msgstr ""
-#: server/diplomats.c:1254
+#: server/diplomats.c:1260
#, c-format
msgid "You have caused an incident while attempting to steal tech from %s."
msgstr ""
-#: server/diplomats.c:1258
+#: server/diplomats.c:1264
#, c-format
msgid "%s has caused an incident while attempting to steal tech from you."
msgstr ""
-#: server/diplomats.c:1264
+#: server/diplomats.c:1270
#, c-format
msgid "You have caused an incident while inciting a revolt in %s."
msgstr ""
-#: server/diplomats.c:1268
+#: server/diplomats.c:1274
#, c-format
msgid "%s have caused an incident while inciting a revolt in %s."
msgstr ""
@@ -3194,12 +3221,12 @@ msgstr ""
"railways.\n"
" Workers spontaneously gather and upgrade all cities with railways."
-#: server/maphand.c:1418
+#: server/maphand.c:1425
#, c-format
msgid "Moved your %s due to changing terrain."
msgstr ""
-#: server/maphand.c:1436
+#: server/maphand.c:1443
#, c-format
msgid "Disbanded your %s due to changing terrain."
msgstr ""
@@ -3208,7 +3235,7 @@ msgstr ""
msgid "Not reporting to the metaserver in this game."
msgstr ""
-#: server/meta.c:430
+#: server/meta.c:432
#, c-format
msgid "Metaserver: bad address: [%s:%d]."
msgstr ""
@@ -3325,54 +3352,54 @@ msgid ""
"with %s."
msgstr ""
-#: server/plrhand.c:1103
+#: server/plrhand.c:1115
#, c-format
msgid "Removing player %s."
msgstr ""
-#: server/plrhand.c:1105
+#: server/plrhand.c:1117
msgid "You've been removed from the game!"
msgstr ""
-#: server/plrhand.c:1108
+#: server/plrhand.c:1120
#, c-format
msgid "%s has been removed from the game."
msgstr ""
-#: server/plrhand.c:1153 server/plrhand.c:1158
+#: server/plrhand.c:1167 server/plrhand.c:1172
#, c-format
msgid "You have made contact with the %s, ruled by %s."
msgstr ""
-#: server/plrhand.c:1178
+#: server/plrhand.c:1192
#, c-format
msgid ""
"%s and %s meet and go to instant war. You cancel your alliance with both."
msgstr ""
-#: server/plrhand.c:1656
+#: server/plrhand.c:1670
#, c-format
msgid "Could not throw %s into civil war - too many players"
msgstr ""
-#: server/plrhand.c:1663
+#: server/plrhand.c:1677
#, c-format
msgid "Could not throw %s into civil war - no available nations"
msgstr ""
-#: server/plrhand.c:1686
+#: server/plrhand.c:1700
#, c-format
msgid ""
"Your nation is thrust into civil war! %s is declared the leader of the rebel "
"states."
msgstr ""
-#: server/plrhand.c:1707
+#: server/plrhand.c:1721
#, c-format
msgid "%s declares allegiance to %s."
msgstr ""
-#: server/plrhand.c:1722
+#: server/plrhand.c:1736
#, c-format
msgid ""
"Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3561,65 +3588,65 @@ msgstr ""
msgid "Wonders of the World"
msgstr ""
-#: server/report.c:547
+#: server/report.c:552
msgid " sq. mi."
msgstr ""
-#: server/report.c:557
+#: server/report.c:562
msgid " M tons"
msgstr ""
-#: server/report.c:562
+#: server/report.c:567
msgid " M goods"
msgstr ""
-#: server/report.c:567
+#: server/report.c:572
msgid " bulbs"
msgstr ""
-#: server/report.c:572
+#: server/report.c:577
msgid " month"
msgid_plural " months"
msgstr[0] ""
msgstr[1] ""
-#: server/report.c:577
+#: server/report.c:582
msgid " ton"
msgid_plural " tons"
msgstr[0] ""
msgstr[1] ""
-#: server/report.c:591
+#: server/report.c:596
msgid "st"
msgstr ""
-#: server/report.c:593
+#: server/report.c:598
msgid "nd"
msgstr ""
-#: server/report.c:595
+#: server/report.c:600
msgid "rd"
msgstr ""
-#: server/report.c:597
+#: server/report.c:602
msgid "th"
msgstr ""
-#: server/report.c:700
+#: server/report.c:705
msgid "Demography string contains invalid characters. Try \"help demography\"."
msgstr ""
-#: server/report.c:743 server/report.c:768
+#: server/report.c:748 server/report.c:773
msgid "Demographics Report:"
msgstr ""
-#: server/report.c:744
+#: server/report.c:749
msgid "Sorry, the Demographics report is unavailable."
msgstr ""
#. TRANS: <nation adjective> <government name> (<year>).
#. * E.g. "Polish Despotism (200 AD)".
-#: server/report.c:750
+#: server/report.c:755
#, c-format
msgid "%s %s (%s)"
msgstr ""
@@ -3630,11 +3657,11 @@ msgstr ""
msgid "Could not find a readable \"%s.%s\" ruleset file."
msgstr ""
-#: server/ruleset.c:2356
+#: server/ruleset.c:2366
msgid "No barbarian nation in rulesets, at least one required!"
msgstr ""
-#: server/ruleset.c:3166
+#: server/ruleset.c:3178
msgid "Loading rulesets"
msgstr ""
@@ -3646,17 +3673,17 @@ msgid ""
"risk."
msgstr ""
-#: server/savegame.c:3588
+#: server/savegame.c:3587
msgid "Saved game is too old, at least version 1.9.0 required."
msgstr ""
#. TRANS: Fatal error message.
-#: server/savegame.c:3815
+#: server/savegame.c:3817
msgid ""
"Saved game uses the \"classic\" terrain ruleset, and is no longer supported."
msgstr ""
-#: server/savegame.c:3824
+#: server/savegame.c:3826
#, c-format
msgid ""
"Warning: Different rulesetdirs ('%s' and '%s') are no longer supported. "
@@ -3664,7 +3691,7 @@ msgid ""
msgstr ""
#. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4051
+#: server/savegame.c:4055
#, c-format
msgid "%s had invalid nation; changing to %s."
msgstr ""
@@ -3697,7 +3724,7 @@ msgstr ""
msgid "Networking"
msgstr ""
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:734
#: client/gui-win32/dialogs.c:532
msgid "All"
msgstr ""
@@ -4617,11 +4644,11 @@ msgid ""
"the game."
msgstr ""
-#: server/sernet.c:150
+#: server/sernet.c:151
msgid "Server cannot read standard input. Ignoring input."
msgstr ""
-#: server/sernet.c:929
+#: server/sernet.c:933
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr ""
@@ -4694,820 +4721,869 @@ msgstr ""
msgid "Without guidance from the capital, the %s spaceship is lost!"
msgstr ""
-#: server/srv_main.c:240
+#: server/srv_main.c:242
msgid "Game ended in a draw as end year exceeded"
msgstr ""
-#: server/srv_main.c:274
+#: server/srv_main.c:276
#, c-format
msgid "The %s spaceship has arrived at Alpha Centauri."
msgstr ""
-#: server/srv_main.c:287 server/srv_main.c:322
+#: server/srv_main.c:289 server/srv_main.c:324
#, c-format
msgid "Team victory to %s"
msgstr ""
-#: server/srv_main.c:297 server/srv_main.c:338
+#: server/srv_main.c:299 server/srv_main.c:340
#, c-format
msgid "Game ended in victory for %s"
msgstr ""
-#: server/srv_main.c:345
+#: server/srv_main.c:347
msgid "Game ended in a draw"
msgstr ""
-#: server/srv_main.c:461 server/srv_main.c:472
+#: server/srv_main.c:465 server/srv_main.c:476
#, c-format
msgid "Your %s was disbanded in accordance with your peace treaty with the %s."
msgstr ""
-#: server/srv_main.c:512 server/srv_main.c:516
+#: server/srv_main.c:516 server/srv_main.c:520
#, c-format
msgid ""
"Concerned citizens point out that the cease-fire with %s will run out soon."
msgstr ""
-#: server/srv_main.c:521 server/srv_main.c:525
+#: server/srv_main.c:525 server/srv_main.c:529
#, c-format
msgid "The cease-fire with %s has run out. You are now at war with the %s."
msgstr ""
-#: server/srv_main.c:542
+#: server/srv_main.c:546
#, c-format
msgid ""
"Ceasefire between %s and %s has run out. They are at war. You cancel your "
"alliance with both."
msgstr ""
-#: server/srv_main.c:961
+#: server/srv_main.c:997
#, c-format
msgid "Failed saving game as %s"
msgstr ""
-#: server/srv_main.c:963
+#: server/srv_main.c:999
#, c-format
msgid "Game saved as %s"
msgstr ""
-#: server/srv_main.c:994
+#: server/srv_main.c:1030
msgid "The game is already running."
msgstr ""
-#: server/srv_main.c:1002
+#: server/srv_main.c:1038
#, c-format
msgid "%s lost control cmdlevel on game start. Use voting from now on."
msgstr ""
-#: server/srv_main.c:1009
+#: server/srv_main.c:1045
msgid "Starting game."
msgstr ""
-#: server/srv_main.c:1071
+#: server/srv_main.c:1112
#, c-format
msgid "request for unknown report (type %d)"
msgstr ""
-#: server/srv_main.c:1136
+#: server/srv_main.c:1177
#, c-format
msgid "Warning: rejecting old client %s"
msgstr ""
-#: server/srv_main.c:1238
+#: server/srv_main.c:1279
#, c-format
msgid "Got a packet of type %d from a dead or observer player"
msgstr ""
-#: server/srv_main.c:1338
+#: server/srv_main.c:1381
msgid "Please choose a non-blank name."
msgstr ""
-#: server/srv_main.c:1354
+#: server/srv_main.c:1397
msgid "That nation is already in use."
msgstr ""
-#: server/srv_main.c:1370
+#: server/srv_main.c:1413
#, c-format
msgid "Another player already has the name '%s'. Please choose another name."
msgstr ""
-#: server/srv_main.c:1391
+#: server/srv_main.c:1434
msgid "Please choose a name containing only ASCII characters."
msgstr ""
-#: server/srv_main.c:1490
+#: server/srv_main.c:1533
#, c-format
msgid "%s nation is not available in this scenario."
msgstr ""
-#: server/srv_main.c:1496
+#: server/srv_main.c:1539
#, c-format
msgid "%s nation is already in use."
msgstr ""
-#: server/srv_main.c:1514
+#: server/srv_main.c:1557
#, c-format
msgid "%s is the %s ruler %s."
msgstr ""
-#: server/srv_main.c:1570
+#: server/srv_main.c:1613
#, c-format
msgid "Waiting to start game: %d out of %d players are ready to start."
msgstr ""
-#: server/srv_main.c:1614 server/srv_main.c:1618
+#: server/srv_main.c:1657 server/srv_main.c:1661
#, c-format
msgid "%s has been added as %s level AI-controlled player."
msgstr ""
-#: server/srv_main.c:1760
+#: server/srv_main.c:1803
#, c-format
msgid "Player %d"
msgstr ""
-#: server/srv_main.c:1771 server/srv_main.c:1777
+#: server/srv_main.c:1814 server/srv_main.c:1820
#, c-format
msgid "%s rules the %s."
msgstr ""
-#: server/srv_main.c:1942
+#: server/srv_main.c:1985
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
msgstr ""
-#: server/srv_main.c:1993
+#: server/srv_main.c:2037
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr ""
-#: server/srv_main.c:2024
+#: server/srv_main.c:2069
msgid "The game is over..."
msgstr ""
-#: server/srv_main.c:2237
+#: server/srv_main.c:2286
msgid "Now accepting new client connections."
msgstr ""
-#: server/stdinhand.c:246
-#, c-format
-msgid "Vote \"%s\" is passed %d to %d with %d abstentions."
-msgstr ""
-
-#: server/stdinhand.c:253
-#, c-format
-msgid "Vote \"%s\" failed with %d against, %d for and %d abstentions."
-msgstr ""
-
#. TRANS: ambiguous command
-#: server/stdinhand.c:365
+#: server/stdinhand.c:284
msgid "(ambiguous)"
msgstr ""
#. TRANS: unrecognized command
#. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:416
+#: server/stdinhand.c:287 client/citydlg_common.c:419
#: 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 ""
-#: server/stdinhand.c:458
+#: server/stdinhand.c:377
msgid "Name is empty, so cannot be a player."
msgstr ""
-#: server/stdinhand.c:462
+#: server/stdinhand.c:381
msgid "Name is too long, so cannot be a player."
msgstr ""
-#: server/stdinhand.c:466
+#: server/stdinhand.c:385
#, c-format
msgid "Player name prefix '%s' is ambiguous."
msgstr ""
-#: server/stdinhand.c:470
+#: server/stdinhand.c:389
#, c-format
msgid "No player by the name of '%s'."
msgstr ""
-#: server/stdinhand.c:474 server/stdinhand.c:509
+#: server/stdinhand.c:393 server/stdinhand.c:428
#, c-format
msgid "Unexpected match_result %d (%s) for '%s'."
msgstr ""
-#: server/stdinhand.c:493
+#: server/stdinhand.c:412
msgid "Name is empty, so cannot be a connection."
msgstr ""
-#: server/stdinhand.c:497
+#: server/stdinhand.c:416
msgid "Name is too long, so cannot be a connection."
msgstr ""
-#: server/stdinhand.c:501
+#: server/stdinhand.c:420
#, c-format
msgid "Connection name prefix '%s' is ambiguous."
msgstr ""
-#: server/stdinhand.c:505
+#: server/stdinhand.c:424
#, c-format
msgid "No connection by the name of '%s'."
msgstr ""
-#: server/stdinhand.c:525
+#: server/stdinhand.c:444
#, c-format
msgid "Open metaserver connection to [%s]."
msgstr ""
-#: server/stdinhand.c:538
+#: server/stdinhand.c:457
#, c-format
msgid "Close metaserver connection to [%s]."
msgstr ""
-#: server/stdinhand.c:553
+#: server/stdinhand.c:472
msgid "Metaserver connection is open."
msgstr ""
-#: server/stdinhand.c:556
+#: server/stdinhand.c:475
msgid "Metaserver connection is closed."
msgstr ""
-#: server/stdinhand.c:566
+#: server/stdinhand.c:485
msgid "Metaserver connection is already open."
msgstr ""
-#: server/stdinhand.c:577
+#: server/stdinhand.c:496
msgid "Metaserver connection is already closed."
msgstr ""
-#: server/stdinhand.c:582
+#: server/stdinhand.c:501
msgid "Argument must be 'u', 'up', 'd', 'down', or '?'."
msgstr ""
-#: server/stdinhand.c:603
+#: server/stdinhand.c:522
#, c-format
msgid "Metaserver patches string set to '%s'."
msgstr ""
-#: server/stdinhand.c:606
+#: server/stdinhand.c:525
#, c-format
msgid "Metaserver patches string set to '%s', not reporting to metaserver."
msgstr ""
-#: server/stdinhand.c:627
+#: server/stdinhand.c:546
#, c-format
msgid "Metaserver message string set to '%s'."
msgstr ""
-#: server/stdinhand.c:630
+#: server/stdinhand.c:549
#, c-format
msgid "Metaserver message string set to '%s', not reporting to metaserver."
msgstr ""
-#: server/stdinhand.c:650
+#: server/stdinhand.c:569
#, c-format
msgid "Metaserver is now [%s]."
msgstr ""
-#: server/stdinhand.c:660
+#: server/stdinhand.c:579
#, c-format
msgid "Server id: %s"
msgstr ""
-#: server/stdinhand.c:757
+#: server/stdinhand.c:676
msgid "You cannot save games manually on this server."
msgstr ""
-#: server/stdinhand.c:774
+#: server/stdinhand.c:693
msgid "Cannot toggle a barbarian player."
msgstr ""
-#: server/stdinhand.c:781
+#: server/stdinhand.c:700
#, c-format
msgid "%s is now under AI control."
msgstr ""
-#: server/stdinhand.c:802
+#: server/stdinhand.c:721
#, c-format
msgid "%s is now under human control."
msgstr ""
-#: server/stdinhand.c:847
+#: server/stdinhand.c:766
msgid "Can't add AI players once the game has begun."
msgstr ""
-#: server/stdinhand.c:867
+#: server/stdinhand.c:786
msgid "Can't add more players, server is full."
msgstr ""
-#: server/stdinhand.c:874
+#: server/stdinhand.c:793
msgid "Can't use an empty name."
msgstr ""
-#: server/stdinhand.c:881
+#: server/stdinhand.c:800
#, c-format
msgid "That name exceeds the maximum of %d chars."
msgstr ""
-#: server/stdinhand.c:887
+#: server/stdinhand.c:806
msgid "That name is not allowed."
msgstr ""
-#: server/stdinhand.c:893
+#: server/stdinhand.c:812
msgid "A player already exists by that name."
msgstr ""
-#: server/stdinhand.c:899
+#: server/stdinhand.c:818
msgid "A user already exists by that name."
msgstr ""
-#: server/stdinhand.c:925
+#: server/stdinhand.c:844
#, c-format
msgid "%s has been added as an AI-controlled player."
msgstr ""
-#: server/stdinhand.c:932
+#: server/stdinhand.c:851
#, c-format
msgid "Error creating new AI player: %s."
msgstr ""
-#: server/stdinhand.c:966
+#: server/stdinhand.c:885
msgid "Players cannot be removed once the game has started."
msgstr ""
-#: server/stdinhand.c:977
+#: server/stdinhand.c:896
#, c-format
msgid "Removed player %s from the game."
msgstr ""
-#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
+#: server/stdinhand.c:935 server/stdinhand.c:3372 server/stdinhand.c:3507
#, c-format
msgid "Name \"%s\" disallowed for security reasons."
msgstr ""
-#: server/stdinhand.c:1029
+#: server/stdinhand.c:948
#, c-format
msgid "No command script found by the name \"%s\"."
msgstr ""
-#: server/stdinhand.c:1037
+#: server/stdinhand.c:956
#, c-format
msgid "Loading script file: %s"
msgstr ""
-#: server/stdinhand.c:1052
+#: server/stdinhand.c:971
#, c-format
msgid "Cannot read command line scriptfile '%s'."
msgstr ""
-#: server/stdinhand.c:1054
+#: server/stdinhand.c:973
#, c-format
msgid "Could not read script file '%s'."
msgstr ""
-#: server/stdinhand.c:1146
+#: server/stdinhand.c:1065
#, c-format
msgid "Could not write script file '%s'."
msgstr ""
-#: server/stdinhand.c:1158
+#: server/stdinhand.c:1077
msgid "You cannot use the write command on this server for security reasons."
msgstr ""
-#: server/stdinhand.c:1186
+#: server/stdinhand.c:1105
#, c-format
msgid ""
"Cannot decrease command access level '%s' for connection '%s'; you only have "
"'%s'."
msgstr ""
-#: server/stdinhand.c:1241
+#: server/stdinhand.c:1114
+#, c-format
+msgid "Command access level set to '%s' for connection %s."
+msgstr ""
+
+#: server/stdinhand.c:1163
#, c-format
msgid ""
"Anyone can now become game organizer '%s' by issuing the 'first' command."
msgstr ""
-#: server/stdinhand.c:1274
+#: server/stdinhand.c:1187
msgid "Command access levels in effect:"
msgstr ""
-#: server/stdinhand.c:1282
+#: server/stdinhand.c:1194
#, c-format
msgid "Command access level for new connections: %s"
msgstr ""
-#: server/stdinhand.c:1285
+#: server/stdinhand.c:1197
#, c-format
msgid "Command access level for first player to take it: %s"
msgstr ""
-#: server/stdinhand.c:1294
+#: server/stdinhand.c:1206
msgid ""
"Error: command access level must be one of 'none', 'info', 'ctrl', or 'hack'."
msgstr ""
-#: server/stdinhand.c:1299
+#: server/stdinhand.c:1211
#, c-format
msgid ""
"Cannot increase command access level to '%s'; you only have '%s' yourself."
msgstr ""
-#: server/stdinhand.c:1326 server/stdinhand.c:1375
-#, c-format
-msgid "Command access level set to '%s' for connection %s."
-msgstr ""
-
-#: 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:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
+#: server/stdinhand.c:1238 server/stdinhand.c:1252 server/stdinhand.c:1273
#, c-format
msgid "Command access level set to '%s' for new players."
msgstr ""
-#: server/stdinhand.c:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
+#: server/stdinhand.c:1243 server/stdinhand.c:1257 server/stdinhand.c:1267
#, c-format
msgid "Command access level set to '%s' for first player to grab it."
msgstr ""
-#: server/stdinhand.c:1402
+#: server/stdinhand.c:1302
msgid "The 'first' command makes no sense from the server command line."
msgstr ""
-#: server/stdinhand.c:1406
+#: server/stdinhand.c:1306
#, c-format
msgid "You already have command access level '%s' or better."
msgstr ""
-#: server/stdinhand.c:1411
+#: server/stdinhand.c:1311
msgid "Someone else already is game organizer."
msgstr ""
-#: server/stdinhand.c:1416
+#: server/stdinhand.c:1316
#, c-format
msgid "Connection %s has opted to become the game organizer."
msgstr ""
-#: server/stdinhand.c:1467
+#: server/stdinhand.c:1367
#, c-format
msgid "Invalid argument %d."
msgstr ""
-#: server/stdinhand.c:1474
+#: server/stdinhand.c:1374
msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
msgstr ""
-#: server/stdinhand.c:1482
+#: server/stdinhand.c:1382
#, c-format
msgid "Dynamic timeout set to %d %d %d %d"
msgstr ""
-#: server/stdinhand.c:1542 server/stdinhand.c:1545
+#: server/stdinhand.c:1442 server/stdinhand.c:1445
msgid "Option:"
msgstr ""
-#: server/stdinhand.c:1555 server/stdinhand.c:4031
+#: server/stdinhand.c:1455 server/stdinhand.c:4079
msgid "Description:"
msgstr ""
-#: server/stdinhand.c:1560
+#: server/stdinhand.c:1460
#, c-format
msgid "Status: %s"
msgstr ""
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "changeable"
msgstr ""
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "fixed"
msgstr ""
-#: server/stdinhand.c:1567
+#: server/stdinhand.c:1467
#, c-format
msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
msgstr ""
-#: server/stdinhand.c:1572
+#: server/stdinhand.c:1472
#, c-format
msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
msgstr ""
-#: server/stdinhand.c:1578
+#: server/stdinhand.c:1478
#, c-format
msgid "Value: \"%s\", Default: \"%s\""
msgstr ""
-#: server/stdinhand.c:1597
+#: server/stdinhand.c:1497
msgid "Explanations are available for the following server options:"
msgstr ""
-#: server/stdinhand.c:1643
+#: server/stdinhand.c:1537
msgid "No explanation for that yet."
msgstr ""
-#: server/stdinhand.c:1646 server/stdinhand.c:2480
+#: server/stdinhand.c:1540 server/stdinhand.c:2468
msgid "Ambiguous option name."
msgstr ""
-#: server/stdinhand.c:1666
+#: server/stdinhand.c:1560
#, c-format
msgid "Server Operator: %s"
msgstr ""
-#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
+#: server/stdinhand.c:1686 server/stdinhand.c:1713 server/stdinhand.c:1731
#, c-format
msgid "Player '%s' now has AI skill level '%s'."
msgstr ""
-#: server/stdinhand.c:1822
+#: server/stdinhand.c:1718
#, c-format
msgid "%s is not controlled by the AI."
msgstr ""
-#: server/stdinhand.c:1842
+#: server/stdinhand.c:1738
#, c-format
msgid "Default AI skill level set to '%s'."
msgstr ""
-#: server/stdinhand.c:1857 server/stdinhand.c:2162
+#: server/stdinhand.c:1753
msgid "This command is client only."
msgstr ""
-#: server/stdinhand.c:1860
+#: server/stdinhand.c:1756
msgid "Usage: away"
msgstr ""
-#: server/stdinhand.c:1865
+#: server/stdinhand.c:1761
msgid "Only players may use the away command."
msgstr ""
-#: server/stdinhand.c:1869
+#: server/stdinhand.c:1765
#, c-format
msgid "%s set to away mode."
msgstr ""
-#: server/stdinhand.c:1877
+#: server/stdinhand.c:1772
#, c-format
msgid "%s returned to game."
msgstr ""
-#: server/stdinhand.c:1919
+#: server/stdinhand.c:1817
#, c-format
msgid "Sorry, you do not have access to view option '%s'."
msgstr ""
-#: server/stdinhand.c:1925
+#: server/stdinhand.c:1823
#, c-format
msgid "Unknown option '%s'."
msgstr ""
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1848
msgid "All options with non-default values"
msgstr ""
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1851
msgid "All options"
msgstr ""
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1854
msgid "Vital options"
msgstr ""
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1857
msgid "Situational options"
msgstr ""
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1860
msgid "Rarely used options"
msgstr ""
-#: server/stdinhand.c:1965
+#: server/stdinhand.c:1863
msgid "+ means you may change the option"
msgstr ""
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1864
msgid "= means the option is on its default value"
msgstr ""
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
#, c-format
msgid "%-*s value (min,max) "
msgstr ""
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
msgid "Option"
msgstr ""
-#: server/stdinhand.c:1973
+#: server/stdinhand.c:1871
msgid "description"
msgstr ""
-#: server/stdinhand.c:2042
+#: server/stdinhand.c:1940
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:2092
+#: server/stdinhand.c:1966
msgid "Cannot change teams once game has begun."
msgstr ""
-#: server/stdinhand.c:2102
+#: server/stdinhand.c:1976
msgid "Undefined argument. Usage: team <player> <team>."
msgstr ""
-#: server/stdinhand.c:2122
+#: server/stdinhand.c:1996
#, c-format
msgid "No such team %s. Please give a valid team name or number."
msgstr ""
-#: server/stdinhand.c:2129
+#: server/stdinhand.c:2003
msgid "Cannot team a barbarian."
msgstr ""
-#: server/stdinhand.c:2135
+#: server/stdinhand.c:2009
#, c-format
msgid "Player %s set to team %s."
msgstr ""
-#: server/stdinhand.c:2157
-msgid "Undefined arguments. Usage: vote yes|no [vote number]."
+#: server/stdinhand.c:2035 server/voting.c:512
+msgid "Teamvote"
msgstr ""
-#: server/stdinhand.c:2165
-msgid "Observers cannot vote."
+#: server/stdinhand.c:2035 server/voting.c:516
+msgid "Vote"
msgstr ""
-#: server/stdinhand.c:2168
+#: server/stdinhand.c:2037
+#, c-format
msgid ""
-"You can only vote in a running game. Use 'first' to become the game "
-"organizer if there currently is none."
+"%s %d \"%s\" (needs %0.0f%%%s): %d for, %d against, and %d abstained out of %"
+"d players."
msgstr ""
-#: server/stdinhand.c:2181
-#, c-format
-msgid "Vote %d \"%s\": %d for, %d against"
+#: server/stdinhand.c:2041
+msgid " no dissent"
msgstr ""
-#: server/stdinhand.c:2188
+#: server/stdinhand.c:2049
msgid "There are no votes going on."
msgstr ""
-#: server/stdinhand.c:2208
-msgid "No legal last vote."
+#: server/stdinhand.c:2077
+msgid "Invalid arguments. Usage: vote yes|no|abstain [vote number]."
+msgstr ""
+
+#: server/stdinhand.c:2095 server/stdinhand.c:2213 server/stdinhand.c:3714
+msgid "You are not allowed to use this command."
+msgstr ""
+
+#: server/stdinhand.c:2104
+#, c-format
+msgid "The argument \"%s\" is ambigious."
+msgstr ""
+
+#: server/stdinhand.c:2119
+msgid "There are no votes running."
+msgstr ""
+
+#: server/stdinhand.c:2121
+#, c-format
+msgid "No legal last vote (%d %s)."
msgstr ""
-#: server/stdinhand.c:2213
-msgid "Value must be integer."
+#: server/stdinhand.c:2122
+msgid "other vote running"
+msgid_plural "other votes running"
+msgstr[0] ""
+msgstr[1] ""
+
+#: server/stdinhand.c:2129 server/stdinhand.c:2491 server/stdinhand.c:2532
+msgid "Value must be an integer."
msgstr ""
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2135 server/stdinhand.c:2221
#, c-format
msgid "No such vote (%d)."
msgstr ""
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2141
+msgid "You are not allowed to vote on that."
+msgstr ""
+
+#: server/stdinhand.c:2146
#, c-format
msgid "You voted for \"%s\""
msgstr ""
-#: server/stdinhand.c:2232
+#: server/stdinhand.c:2150
#, c-format
msgid "You voted against \"%s\""
msgstr ""
-#: server/stdinhand.c:2259
+#: server/stdinhand.c:2155
+#, c-format
+msgid "You abstained from voting on \"%s\""
+msgstr ""
+
+#: server/stdinhand.c:2190
+msgid "Missing argument <vote number> or the string \"all\"."
+msgstr ""
+
+#: server/stdinhand.c:2197
+msgid "You don't have any vote going on."
+msgstr ""
+
+#: server/stdinhand.c:2204
+msgid "There isn't any vote going on."
+msgstr ""
+
+#: server/stdinhand.c:2209
+msgid "Server: All votes have been removed."
+msgstr ""
+
+#: server/stdinhand.c:2226
+#, c-format
+msgid "You are not allowed to cancel this vote (%d)."
+msgstr ""
+
+#: server/stdinhand.c:2232
+msgid "Usage: /cancelvote [<vote number>|all]"
+msgstr ""
+
+#: server/stdinhand.c:2241
+#, c-format
+msgid "Server: %s cancelled the vote \"%s\" (number %d)."
+msgstr ""
+
+#: server/stdinhand.c:2247
+#, c-format
+msgid "Server: The vote \"%s\" (number %d) has been cancelled."
+msgstr ""
+
+#: server/stdinhand.c:2265
msgid ""
"Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
"<x> <y> | unit <id> | tech <player> | timing | info>."
msgstr ""
-#: server/stdinhand.c:2265
+#: server/stdinhand.c:2271
msgid "Can only use this command once game has begun."
msgstr ""
-#: server/stdinhand.c:2294
+#: server/stdinhand.c:2300
#, c-format
msgid "%s diplomacy no longer debugged"
msgstr ""
-#: server/stdinhand.c:2298
+#: server/stdinhand.c:2304
#, c-format
msgid "%s diplomacy debugged"
msgstr ""
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2323
#, c-format
msgid "%s tech no longer debugged"
msgstr ""
-#: server/stdinhand.c:2321
+#: server/stdinhand.c:2327
#, c-format
msgid "%s tech debugged"
msgstr ""
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2358 server/stdinhand.c:2388
msgid "Value 2 & 3 must be integer."
msgstr ""
-#: server/stdinhand.c:2356 server/stdinhand.c:2386
+#: server/stdinhand.c:2362 server/stdinhand.c:2392
msgid "Bad map coordinates."
msgstr ""
-#: server/stdinhand.c:2361
+#: server/stdinhand.c:2367
msgid "No city at this coordinate."
msgstr ""
-#: server/stdinhand.c:2366
+#: server/stdinhand.c:2372
#, c-format
msgid "%s no longer debugged"
msgstr ""
-#: server/stdinhand.c:2392 server/stdinhand.c:2422
+#: server/stdinhand.c:2398 server/stdinhand.c:2428
#, c-format
msgid "%s %s no longer debugged."
msgstr ""
-#: server/stdinhand.c:2397 server/stdinhand.c:2427
+#: server/stdinhand.c:2403 server/stdinhand.c:2433
#, c-format
msgid "%s %s debugged."
msgstr ""
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2419
msgid "Value 2 must be integer."
msgstr ""
-#: server/stdinhand.c:2417
+#: server/stdinhand.c:2423
#, c-format
msgid "Unit %d does not exist."
msgstr ""
-#: server/stdinhand.c:2475
+#: server/stdinhand.c:2464
msgid "Undefined argument. Usage: set <option> <value>."
msgstr ""
-#: server/stdinhand.c:2485
+#: server/stdinhand.c:2473
msgid "You are not allowed to set this option."
msgstr ""
-#: server/stdinhand.c:2490 server/stdinhand.c:3463
+#: server/stdinhand.c:2478 server/stdinhand.c:3501
msgid "This setting can't be modified after the game has started."
msgstr ""
-#: server/stdinhand.c:2502 server/stdinhand.c:2543
-msgid "Value must be an integer."
-msgstr ""
-
-#: server/stdinhand.c:2512
+#: server/stdinhand.c:2501
#, c-format
msgid "The parameter %s should only contain digits 0-1."
msgstr ""
-#: server/stdinhand.c:2519
+#: server/stdinhand.c:2508
msgid "Value out of range (minimum: 0, maximum: 1)."
msgstr ""
-#: server/stdinhand.c:2534 server/stdinhand.c:2576
+#: server/stdinhand.c:2523 server/stdinhand.c:2565
#, c-format
msgid "Option: %s has been set to %d."
msgstr ""
-#: server/stdinhand.c:2554
+#: server/stdinhand.c:2543
#, c-format
msgid "The parameter %s should only contain +- and 0-9."
msgstr ""
-#: server/stdinhand.c:2561
+#: server/stdinhand.c:2550
#, c-format
msgid "Value out of range (minimum: %d, maximum: %d)."
msgstr ""
-#: server/stdinhand.c:2586
+#: server/stdinhand.c:2575
msgid "String value too long. Usage: set <option> <value>."
msgstr ""
-#: server/stdinhand.c:2600
+#: server/stdinhand.c:2589
#, c-format
msgid "Option: %s has been set to \"%s\"."
msgstr ""
-#: server/stdinhand.c:2658
+#: server/stdinhand.c:2652
msgid "Sorry, one can't observe globally in this game."
msgstr ""
-#: server/stdinhand.c:2661
+#: server/stdinhand.c:2655
msgid "Sorry, you can't take a global observer. Observe it instead."
msgstr ""
-#: server/stdinhand.c:2671
+#: server/stdinhand.c:2665
msgid "You cannot take a new player at this time."
msgstr ""
#. TRANS: Do not translate "maxplayers".
-#: server/stdinhand.c:2679
+#: server/stdinhand.c:2673
#, c-format
msgid ""
"You cannot take a new player because the maximum of %d player has already "
@@ -5518,73 +5594,73 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: server/stdinhand.c:2691
+#: server/stdinhand.c:2685
msgid "You cannot take a new player because there are no free player slots."
msgstr ""
-#: server/stdinhand.c:2702
+#: server/stdinhand.c:2696
msgid "Sorry, one can't observe barbarians in this game."
msgstr ""
-#: server/stdinhand.c:2705
+#: server/stdinhand.c:2699
msgid "Sorry, one can't take barbarians in this game."
msgstr ""
-#: server/stdinhand.c:2713
+#: server/stdinhand.c:2707
msgid "Sorry, one can't observe dead players in this game."
msgstr ""
-#: server/stdinhand.c:2716
+#: server/stdinhand.c:2710
msgid "Sorry, one can't take dead players in this game."
msgstr ""
-#: server/stdinhand.c:2724
+#: server/stdinhand.c:2718
msgid "Sorry, one can't observe AI players in this game."
msgstr ""
-#: server/stdinhand.c:2727
+#: server/stdinhand.c:2721
msgid "Sorry, one can't take AI players in this game."
msgstr ""
-#: server/stdinhand.c:2736
+#: server/stdinhand.c:2730
msgid "Sorry, one can't observe human players in this game."
msgstr ""
-#: server/stdinhand.c:2739
+#: server/stdinhand.c:2733
msgid "Sorry, one can't take human players in this game."
msgstr ""
-#: server/stdinhand.c:2749
+#: server/stdinhand.c:2743
msgid "Sorry, one can't observe in this game."
msgstr ""
-#: server/stdinhand.c:2754
+#: server/stdinhand.c:2748
msgid "Sorry, one can't take players in this game."
msgstr ""
-#: server/stdinhand.c:2760
+#: server/stdinhand.c:2754
msgid "Sorry, one can't take players already connected in this game."
msgstr ""
-#: server/stdinhand.c:2791
+#: server/stdinhand.c:2785
msgid "Usage: observe [connection-name [player-name]]"
msgstr ""
-#: server/stdinhand.c:2797
+#: server/stdinhand.c:2791
msgid "Usage: observe [player-name]"
msgstr ""
-#: server/stdinhand.c:2847
+#: server/stdinhand.c:2841
#, c-format
msgid "%s already controls %s. Using 'observe' would remove %s"
msgstr ""
-#: server/stdinhand.c:2858
+#: server/stdinhand.c:2852
#, c-format
msgid "%s is already observing %s."
msgstr ""
-#: server/stdinhand.c:2863
+#: server/stdinhand.c:2857
#, c-format
msgid "%s is already observing."
msgstr ""
@@ -5599,230 +5675,235 @@ msgstr ""
msgid "%s now observes"
msgstr ""
-#: server/stdinhand.c:2969
+#: server/stdinhand.c:2971
msgid "Usage: take <connection-name> <player-name>"
msgstr ""
-#: server/stdinhand.c:2974
+#: server/stdinhand.c:2976
msgid "Usage: take <player-name>"
msgstr ""
-#: server/stdinhand.c:2980
+#: server/stdinhand.c:2982
msgid "Usage: take [connection-name] <player-name>"
msgstr ""
-#: server/stdinhand.c:3010
+#: server/stdinhand.c:3012
#, c-format
msgid "%s already controls %s."
msgstr ""
-#: server/stdinhand.c:3024
+#: server/stdinhand.c:3026
#, c-format
msgid "There is no free player slot for %s."
msgstr ""
-#: server/stdinhand.c:3059
+#: server/stdinhand.c:3061
#, c-format
msgid "being detached from %s."
msgstr ""
-#: server/stdinhand.c:3135
+#: server/stdinhand.c:3146
#, c-format
msgid "%s now controls %s (%s, %s)."
msgstr ""
-#: server/stdinhand.c:3139 server/stdinhand.c:4260
+#: server/stdinhand.c:3150 server/stdinhand.c:4308
#: data/nation/barbarian.ruleset:3
msgid "Barbarian"
msgstr ""
-#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
+#: server/stdinhand.c:3152 server/stdinhand.c:4310 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-sdl/plrdlg.c:645
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr ""
-#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-gtk-2.0/pages.c:2125
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
+#: server/stdinhand.c:3153 server/stdinhand.c:4312
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-gtk-2.0/pages.c:2127
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/connectdlg.c:215
msgid "Human"
msgstr ""
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-gtk-2.0/pages.c:2124 client/gui-win32/connectdlg.c:200
-#: client/gui-win32/connectdlg.c:212
+#: server/stdinhand.c:3155 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-gtk-2.0/pages.c:2126 client/gui-win32/connectdlg.c:202
+#: client/gui-win32/connectdlg.c:214
msgid "Alive"
msgstr ""
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3156 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-win32/connectdlg.c:202
msgid "Dead"
msgstr ""
-#: server/stdinhand.c:3147
+#: server/stdinhand.c:3159
#, c-format
msgid "%s failed to attach to any player."
msgstr ""
-#: server/stdinhand.c:3182
+#: server/stdinhand.c:3194
msgid "Usage: detach <connection-name>"
msgstr ""
-#: server/stdinhand.c:3202
+#: server/stdinhand.c:3214
msgid "You can not detach other users."
msgstr ""
-#: server/stdinhand.c:3211
+#: server/stdinhand.c:3223
#, c-format
msgid "%s is not attached to any player."
msgstr ""
-#: server/stdinhand.c:3234
+#: server/stdinhand.c:3246
#, c-format
msgid "%s detaching from %s"
msgstr ""
-#: server/stdinhand.c:3240
+#: server/stdinhand.c:3252
#, c-format
msgid "%s no longer observing."
msgstr ""
-#: server/stdinhand.c:3259
+#: server/stdinhand.c:3271
#, c-format
msgid "detaching from %s."
msgstr ""
-#: server/stdinhand.c:3345
+#: server/stdinhand.c:3361
msgid "Usage: load <game name>"
msgstr ""
-#: server/stdinhand.c:3350
+#: server/stdinhand.c:3366
msgid "Cannot load a game while another is running."
msgstr ""
-#: server/stdinhand.c:3372
+#: server/stdinhand.c:3388
#, c-format
msgid "Cannot find savegame or scenario with the name \"%s\"."
msgstr ""
-#: server/stdinhand.c:3389
+#: server/stdinhand.c:3405
#, c-format
msgid "Could not load savefile: %s"
msgstr ""
-#: server/stdinhand.c:3458
+#: server/stdinhand.c:3496
#, c-format
msgid "Current ruleset directory is \"%s\""
msgstr ""
-#: server/stdinhand.c:3478
+#: server/stdinhand.c:3516
#, c-format
msgid "Ruleset directory \"%s\" not found"
msgstr ""
-#: server/stdinhand.c:3484
+#: server/stdinhand.c:3522
#, c-format
msgid "Ruleset directory is already \"%s\""
msgstr ""
-#: server/stdinhand.c:3488
+#: server/stdinhand.c:3526
#, c-format
msgid "Ruleset directory set to \"%s\""
msgstr ""
-#: server/stdinhand.c:3536
+#: server/stdinhand.c:3574
msgid "Goodbye."
msgstr ""
-#: server/stdinhand.c:3567
+#: server/stdinhand.c:3606
msgid "Sorry, you are not allowed to use server commands."
msgstr ""
-#: server/stdinhand.c:3603
+#: server/stdinhand.c:3656
#, c-format
msgid "Warning: '%s' interpreted as '%s', but it is ambiguous. Try '%shelp'."
msgstr ""
-#: server/stdinhand.c:3608
+#: server/stdinhand.c:3661
#, c-format
msgid "Unknown command. Try '%shelp'."
msgstr ""
-#: server/stdinhand.c:3625
-msgid "Your new vote canceled your previous vote."
+#: server/stdinhand.c:3675
+#, fuzzy
+msgid "Your new vote cancelled your previous vote."
msgstr "Your new vote cancelled your previous vote."
-#: server/stdinhand.c:3633
-#, c-format
-msgid "New vote (number %d) by %s: %s."
+#: server/stdinhand.c:3688
+msgid "New teamvote"
+msgstr ""
+
+#: server/stdinhand.c:3691
+msgid "New vote"
msgstr ""
-#: server/stdinhand.c:3645
+#: server/stdinhand.c:3695
#, c-format
-msgid "Your new vote (\"%s\") was not legal or was not recognized."
+msgid "%s (number %d) by %s: %s"
msgstr ""
-#: server/stdinhand.c:3655
-msgid "You are not allowed to use this command."
+#: server/stdinhand.c:3704
+#, c-format
+msgid "Your new vote (\"%s\") was not legal or was not recognized."
msgstr ""
-#: server/stdinhand.c:3680
+#: server/stdinhand.c:3726
msgid "(server prompt)"
msgstr ""
-#: server/stdinhand.c:3787
+#: server/stdinhand.c:3835
msgid "Game ended in a draw."
msgstr ""
-#: server/stdinhand.c:3791
+#: server/stdinhand.c:3839
msgid ""
"Ending the game. The server will restart once all clients have disconnected."
msgstr ""
-#: server/stdinhand.c:3796
+#: server/stdinhand.c:3844
msgid "Cannot end the game: no game running."
msgstr ""
-#: server/stdinhand.c:3812
+#: server/stdinhand.c:3860
#, c-format
msgid "%s has conceded the game and can no longer win."
msgstr ""
-#: server/stdinhand.c:3817
+#: server/stdinhand.c:3865
msgid "You cannot surrender now."
msgstr ""
-#: server/stdinhand.c:3883
+#: server/stdinhand.c:3931
msgid "Not enough human players, game will not start."
msgstr ""
-#: server/stdinhand.c:3888
+#: server/stdinhand.c:3936
msgid "No players, game will not start."
msgstr ""
-#: server/stdinhand.c:3892
+#: server/stdinhand.c:3940
msgid "Not enough nations for all players, game will not start."
msgstr ""
-#: server/stdinhand.c:3901
+#: server/stdinhand.c:3949
msgid "All players are ready; starting game."
msgstr ""
-#: server/stdinhand.c:3915
+#: server/stdinhand.c:3963
msgid ""
"Cannot start the game: the game is waiting for all clients to disconnect."
msgstr ""
-#: server/stdinhand.c:3922
+#: server/stdinhand.c:3970
msgid "Cannot start the game: it is already running."
msgstr ""
-#: server/stdinhand.c:3953
+#: server/stdinhand.c:4001
#, c-format
msgid "Cutting connection %s."
msgstr ""
-#: server/stdinhand.c:3972
+#: server/stdinhand.c:4020
msgid ""
"Welcome - this is the introductory help text for the Freeciv server.\n"
"\n"
@@ -5843,123 +5924,123 @@ msgid ""
" quit - to exit"
msgstr ""
-#: server/stdinhand.c:4007 server/stdinhand.c:4010
+#: server/stdinhand.c:4055 server/stdinhand.c:4058
msgid "Command:"
msgstr ""
-#: server/stdinhand.c:4014
+#: server/stdinhand.c:4062
msgid "Synopsis: "
msgstr ""
-#: server/stdinhand.c:4023
+#: server/stdinhand.c:4071
#, c-format
msgid "Level: %s"
msgstr ""
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4096
msgid "The following server commands are available:"
msgstr ""
-#: server/stdinhand.c:4123
+#: server/stdinhand.c:4171
#, c-format
msgid "Help argument '%s' is ambiguous."
msgstr ""
-#: server/stdinhand.c:4128
+#: server/stdinhand.c:4176
#, c-format
msgid "No match for help argument '%s'."
msgstr ""
-#: server/stdinhand.c:4194
+#: server/stdinhand.c:4242
#, c-format
msgid "Bad list argument: '%s'. Try '%shelp list'."
msgstr ""
-#: server/stdinhand.c:4234
+#: server/stdinhand.c:4282
msgid "List of players:"
msgstr ""
-#: server/stdinhand.c:4239
+#: server/stdinhand.c:4287
msgid "<no players>"
msgstr ""
-#: server/stdinhand.c:4256
+#: server/stdinhand.c:4304
#, c-format
msgid "user %s, "
msgstr ""
-#: server/stdinhand.c:4267
+#: server/stdinhand.c:4315
msgid ", Dead"
msgstr ""
-#: server/stdinhand.c:4270
+#: server/stdinhand.c:4318
#, c-format
msgid ", difficulty level %s"
msgstr ""
#. TRANS: continue list, in case comma is not the separator of choice.
-#: server/stdinhand.c:4275 server/stdinhand.c:4279 client/helpdata.c:257
-#: client/helpdata.c:752 client/text.c:241 client/text.c:1224
-#: client/text.c:1262
+#: server/stdinhand.c:4323 server/stdinhand.c:4327 client/helpdata.c:257
+#: client/helpdata.c:752 client/text.c:241 client/text.c:1229
+#: client/text.c:1267
#, c-format
msgid "?clistmore:, %s"
msgstr ", %s"
-#: server/stdinhand.c:4283
+#: server/stdinhand.c:4331
msgid ", ready"
msgstr ""
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4333
msgid ", not ready"
msgstr ""
-#: server/stdinhand.c:4293
+#: server/stdinhand.c:4341
#, c-format
msgid " %d connection:"
msgid_plural " %d connections:"
msgstr[0] ""
msgstr[1] ""
-#: server/stdinhand.c:4299
+#: server/stdinhand.c:4347
#, c-format
msgid " %s from %s (command access level %s), bufsize=%dkb"
msgstr ""
-#: server/stdinhand.c:4304
+#: server/stdinhand.c:4352
msgid " (observer mode)"
msgstr ""
-#: server/stdinhand.c:4322
+#: server/stdinhand.c:4370
msgid "List of teams:"
msgstr ""
#. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4332
+#: server/stdinhand.c:4380
#, c-format
msgid "%2d : '%s' : %d player"
msgid_plural "%2d : '%s' : %d players"
msgstr[0] ""
msgstr[1] ""
-#: server/stdinhand.c:4352
+#: server/stdinhand.c:4400
#, c-format
msgid "%2d : '%s' : 1 player : %s"
msgstr ""
-#: server/stdinhand.c:4360
+#: server/stdinhand.c:4408
#, c-format
msgid "Empty team: %s"
msgstr ""
-#: server/stdinhand.c:4371
+#: server/stdinhand.c:4419
msgid "List of connections to server:"
msgstr ""
-#: server/stdinhand.c:4375
+#: server/stdinhand.c:4423
msgid "<no connections>"
msgstr ""
-#: server/stdinhand.c:4399
+#: server/stdinhand.c:4447
msgid "List of scenarios available:"
msgstr ""
@@ -5978,65 +6059,65 @@ msgstr ""
msgid "%s acquired from %s!"
msgstr ""
-#: server/techtools.c:220
+#: server/techtools.c:221
#, c-format
msgid ""
"Discovery of %s makes the government form %s available. You may want to "
"start a revolution."
msgstr ""
-#: server/techtools.c:301
+#: server/techtools.c:302
#, c-format
msgid "Discovery of %s OBSOLETES %s in %s!"
msgstr ""
-#: server/techtools.c:351
+#: server/techtools.c:352
#, c-format
msgid "Learned %s. Our scientists focus on %s; goal is %s."
msgstr ""
-#: server/techtools.c:369
+#: server/techtools.c:370
#, c-format
msgid "Learned %s. Scientists choose to research %s."
msgstr ""
-#: server/techtools.c:376
+#: server/techtools.c:377
#, c-format
msgid "Learned %s. "
msgstr ""
-#: server/techtools.c:379
+#: server/techtools.c:380
#, c-format
msgid "Researching %s."
msgstr ""
-#: server/techtools.c:385
+#: server/techtools.c:386
#, c-format
msgid "Learned %s. Scientists do not know what to research next."
msgstr ""
-#: server/techtools.c:402
+#: server/techtools.c:403
msgid ""
"Great scientists from all the world join your civilization: you get an "
"immediate advance."
msgstr ""
-#: server/techtools.c:570
+#: server/techtools.c:571
#, c-format
msgid "Technology goal is %s."
msgstr ""
-#: server/techtools.c:700
+#: server/techtools.c:708
#, c-format
msgid "You steal %s from the %s."
msgstr ""
-#: server/techtools.c:705
+#: server/techtools.c:713
#, c-format
msgid "The %s stole %s from you!"
msgstr ""
-#: server/techtools.c:710
+#: server/techtools.c:718
#, c-format
msgid "The %s have stolen %s from the %s."
msgstr ""
@@ -6060,177 +6141,183 @@ msgstr ""
msgid "%s upgraded to %s for %d gold."
msgstr ""
-#: server/unithand.c:396
+#: server/unithand.c:402
#, c-format
msgid "%s refuses to disband!"
msgstr ""
-#: server/unithand.c:449
+#: server/unithand.c:455
msgid "Can't place city here."
msgstr ""
-#: server/unithand.c:456
+#: server/unithand.c:462
#, c-format
msgid "Only %s can build a city."
msgstr ""
-#: server/unithand.c:461
+#: server/unithand.c:467
msgid "Can't build a city."
msgstr ""
-#: server/unithand.c:470
+#: server/unithand.c:476
#, c-format
msgid "Only %s can add to a city."
msgstr ""
-#: server/unithand.c:475
+#: server/unithand.c:481
msgid "Can't add to a city."
msgstr ""
-#: server/unithand.c:481
+#: server/unithand.c:487
#, c-format
msgid "%s unit has no moves left to add to %s."
msgstr ""
-#: server/unithand.c:487
+#: server/unithand.c:493
#, c-format
msgid "%s unit has no moves left to build city."
msgstr ""
-#: server/unithand.c:492
+#. TRANS: <city> is owned by <nation>, cannot add <unit>.
+#: server/unithand.c:499
+#, c-format
+msgid "%s is owned by %s, cannot add %s."
+msgstr ""
+
+#: server/unithand.c:506
#, c-format
msgid "%s is too big to add %s."
msgstr ""
-#: server/unithand.c:498
+#: server/unithand.c:512
#, c-format
msgid "%s needs an improvement to grow, so you cannot add %s."
msgstr ""
-#: server/unithand.c:509
+#: server/unithand.c:523
#, c-format
msgid "Can't add %s to %s."
msgstr ""
-#: server/unithand.c:531
+#: server/unithand.c:545
#, c-format
msgid "%s added to aid %s in growing."
msgstr ""
-#: server/unithand.c:828
+#: server/unithand.c:842
msgid "Your Nuclear missile was shot down by SDI defences, what a waste."
msgstr ""
-#: server/unithand.c:831
+#: server/unithand.c:845
#, c-format
msgid "The nuclear attack on %s was avoided by your SDI defense."
msgstr ""
#. TRANS: "Your Cannon ... the Polish Destroyer."
-#: server/unithand.c:901
+#: server/unithand.c:915
#, c-format
msgid "Your %s survived the pathetic attack from the %s %s."
msgstr ""
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unithand.c:910
+#: server/unithand.c:924
#, c-format
msgid "Your attacking %s failed against the %s %s!"
msgstr ""
-#: server/unithand.c:983
+#: server/unithand.c:997
#, c-format
msgid "Only %s can attack from sea."
msgstr ""
-#: server/unithand.c:988
+#: server/unithand.c:1002
msgid "Cannot attack from sea."
msgstr ""
-#: server/unithand.c:996 server/unittools.c:2137
+#: server/unithand.c:1010 server/unittools.c:2142
msgid "Cannot attack unless you declare war first."
msgstr ""
-#: server/unithand.c:1001
+#: server/unithand.c:1015
#, c-format
msgid "%s can only move into your own zone of control."
msgstr ""
-#: server/unithand.c:1007
+#: server/unithand.c:1021
#, c-format
msgid "Cannot invade unless you break peace with %s first."
msgstr ""
-#: server/unithand.c:1052
+#: server/unithand.c:1066
msgid "This unit has no moves left."
msgstr ""
-#: server/unithand.c:1107
+#: server/unithand.c:1121
msgid "Unit must be on land to perform diplomatic action."
msgstr ""
-#: server/unithand.c:1109
+#: server/unithand.c:1123
msgid "No diplomat action possible."
msgstr ""
-#: server/unithand.c:1125
+#: server/unithand.c:1139
#, c-format
msgid "You must declare war on %s first. Try using players dialog (F3)."
msgstr ""
-#: server/unithand.c:1143
+#: server/unithand.c:1157
msgid "This unit is being transported, and so cannot bombard."
msgstr ""
-#: server/unithand.c:1158
+#: server/unithand.c:1172
msgid "You can't attack there."
msgstr ""
-#: server/unithand.c:1180
+#: server/unithand.c:1194
msgid "This type of troops cannot take over a city."
msgstr ""
-#: server/unithand.c:1198
+#: server/unithand.c:1212
msgid "A transported unit is not allied to all units or city on target tile."
msgstr ""
-#: server/unithand.c:1240
+#: server/unithand.c:1254
#, c-format
msgid "Your %s helps build the %s in %s (%d remaining)."
msgstr ""
-#: server/unithand.c:1242
+#: server/unithand.c:1256
#, c-format
msgid "Your %s helps build the %s in %s (%d surplus)."
msgstr ""
-#: server/unithand.c:1286
+#: server/unithand.c:1300
#, c-format
msgid ""
"Sorry, your %s cannot establish a trade route because it has no home city"
msgstr ""
-#: server/unithand.c:1296
+#: server/unithand.c:1310
#, c-format
msgid "Sorry, your %s cannot establish a trade route between %s and %s"
msgstr ""
-#: server/unithand.c:1325 server/unithand.c:1344
+#: server/unithand.c:1339 server/unithand.c:1358
#, c-format
msgid "Sorry, your %s cannot establish a trade route here!"
msgstr ""
-#: server/unithand.c:1329 server/unithand.c:1348
+#: server/unithand.c:1343 server/unithand.c:1362
#, c-format
msgid " The city of %s already has %d better trade routes!"
msgstr ""
-#: server/unithand.c:1361 server/unithand.c:1373
+#: server/unithand.c:1375 server/unithand.c:1387
#, c-format
msgid "Sorry, %s has canceled the trade route from %s to your city %s."
msgstr "Sorry, %s has cancelled the trade route from %s to your city %s."
-#: server/unithand.c:1406
+#: server/unithand.c:1420
#, c-format
msgid ""
"Your %s from %s has arrived in %s, and revenues amount to %d in gold and "
@@ -6289,55 +6376,55 @@ msgid "Teleported your %s to %s."
msgstr ""
#. TRANS: A unit is moved to resolve stack conflicts.
-#: server/unittools.c:1065
+#: server/unittools.c:1070
#, c-format
msgid "Moved your %s."
msgstr ""
-#: server/unittools.c:1076
+#: server/unittools.c:1081
#, c-format
msgid "Disbanded your %s."
msgstr ""
-#: server/unittools.c:1397
+#: server/unittools.c:1402
#, c-format
msgid "Unable to defend %s, %s has lost the game."
msgstr ""
-#: server/unittools.c:1401
+#: server/unittools.c:1406
#, c-format
msgid "Losing %s meant losing the game! Be more careful next time!"
msgstr ""
-#: server/unittools.c:1503
+#: server/unittools.c:1508
#, c-format
msgid "%s escaped the destruction of %s, and fled to %s."
msgstr ""
-#: server/unittools.c:1512
+#: server/unittools.c:1517
#, c-format
msgid "%s lost when %s was lost."
msgstr ""
-#: server/unittools.c:1561
+#: server/unittools.c:1566
#, c-format
msgid "Barbarian leader captured, %d gold ransom paid."
msgstr ""
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unittools.c:1579
+#: server/unittools.c:1584
#, c-format
msgid "Your attacking %s succeeded against the %s %s!"
msgstr ""
#. TRANS: "Cannon ... the Polish Destroyer."
-#: server/unittools.c:1588 server/unittools.c:1646
+#: server/unittools.c:1593 server/unittools.c:1651
#, c-format
msgid "%s lost to an attack by the %s %s."
msgstr ""
#. TRANS: "... Cannon ... the Polish Destroyer ...."
-#: server/unittools.c:1622
+#: server/unittools.c:1627
#, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -6347,14 +6434,14 @@ msgstr[1] ""
#. TRANS: "Cannon lost when the Polish Destroyer
#. * attacked the German Musketeers."
-#: server/unittools.c:1655
+#: server/unittools.c:1660
#, c-format
msgid "%s lost when the %s %s attacked the %s %s."
msgstr ""
#. TRANS: "Musketeers (and Cannon) lost to an
#. * attack from the Polish Destroyer."
-#: server/unittools.c:1670
+#: server/unittools.c:1675
#, c-format
msgid "%s (and %s) lost to an attack from the %s %s."
msgstr ""
@@ -6362,7 +6449,7 @@ msgstr ""
#. TRANS: "Musketeers and 3 other units lost to
#. * an attack from the Polish Destroyer."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1680
+#: server/unittools.c:1685
#, 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."
@@ -6372,178 +6459,220 @@ msgstr[1] ""
#. TRANS: "2 units lost when the Polish Destroyer
#. * attacked the German Musketeers."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1694
+#: server/unittools.c:1699
#, 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] ""
-#: server/unittools.c:1962
+#: server/unittools.c:1967
#, c-format
msgid "Your %s was nuked by %s."
msgstr ""
-#: server/unittools.c:1965 server/unittools.c:1981
+#: server/unittools.c:1970 server/unittools.c:1986
msgid "yourself"
msgstr ""
-#: server/unittools.c:1969
+#: server/unittools.c:1974
#, c-format
msgid "The %s %s was nuked."
msgstr ""
-#: server/unittools.c:1978
+#: server/unittools.c:1983
#, c-format
msgid "%s was nuked by %s."
msgstr ""
-#: server/unittools.c:1986
+#: server/unittools.c:1991
#, c-format
msgid "You nuked %s."
msgstr ""
-#: server/unittools.c:2027
+#: server/unittools.c:2032
#, c-format
msgid "The %s detonated a nuke!"
msgstr ""
-#: server/unittools.c:2051
+#: server/unittools.c:2056
#, c-format
msgid "%s transported successfully."
msgstr ""
-#: server/unittools.c:2103
+#: server/unittools.c:2108
msgid "This unit type can not be paradropped."
msgstr ""
-#: server/unittools.c:2113
+#: server/unittools.c:2118
msgid "You cannot paradrop a unit that is transporting other units."
msgstr ""
-#: server/unittools.c:2119
+#: server/unittools.c:2124
msgid "The destination location is not known."
msgstr ""
-#: server/unittools.c:2126
+#: server/unittools.c:2131
#, c-format
msgid "This unit cannot paradrop into %s."
msgstr ""
-#: server/unittools.c:2146
+#: server/unittools.c:2151
#, c-format
msgid "The distance to the target (%i) is greater than the unit's range (%i)."
msgstr ""
-#: server/unittools.c:2157
+#: server/unittools.c:2162
#, c-format
msgid "Your %s paradropped into the %s and was lost."
msgstr ""
-#: server/unittools.c:2170
+#: server/unittools.c:2175
#, c-format
msgid "Your %s was killed by enemy units at the paradrop destination."
msgstr ""
-#: server/unittools.c:2192
+#: server/unittools.c:2197
#, c-format
msgid "You found %d gold."
msgstr ""
-#: server/unittools.c:2209
+#: server/unittools.c:2214
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr ""
-#: server/unittools.c:2216
+#: server/unittools.c:2221
#, c-format
msgid "The %s have acquired %s from ancient scrolls of wisdom."
msgstr ""
-#: server/unittools.c:2230
+#: server/unittools.c:2235
msgid "A band of friendly mercenaries joins your cause."
msgstr ""
-#: server/unittools.c:2248
+#: server/unittools.c:2253
msgid "An abandoned village is here."
msgstr ""
-#: server/unittools.c:2258
+#: server/unittools.c:2263
msgid "You have unleashed a horde of barbarians!"
msgstr ""
-#: server/unittools.c:2261
+#: server/unittools.c:2266
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr ""
-#: server/unittools.c:2277
+#: server/unittools.c:2282
msgid "You found a friendly city."
msgstr ""
-#: server/unittools.c:2291
+#: server/unittools.c:2296
msgid "Friendly nomads are impressed by you, and join you."
msgstr ""
-#: server/unittools.c:2316
+#: server/unittools.c:2321
msgid "Your overflight frightens the tribe; they scatter in terror."
msgstr ""
-#: server/unittools.c:2574
+#: server/unittools.c:2579
#, c-format
msgid "Orders for %s aborted after enemy movement was spotted."
msgstr ""
-#: server/unittools.c:3023
+#: server/unittools.c:3028
#, c-format
msgid "Orders for %s aborted as there are units nearby."
msgstr ""
-#: server/unittools.c:3075
+#: server/unittools.c:3080
#, c-format
msgid "Orders for %s aborted because building of city failed."
msgstr ""
-#: server/unittools.c:3088
+#: server/unittools.c:3093
#, c-format
msgid "Orders for %s aborted since they give an invalid activity."
msgstr ""
-#: server/unittools.c:3102
+#: server/unittools.c:3107
#, c-format
msgid "Orders for %s aborted since they give an invalid location."
msgstr ""
-#: server/unittools.c:3112
+#: server/unittools.c:3117
#, c-format
msgid "Orders for %s aborted as there are units in the way."
msgstr ""
-#: server/unittools.c:3138
+#: server/unittools.c:3143
#, c-format
msgid "Orders for %s aborted because of failed move."
msgstr ""
-#: server/unittools.c:3179
+#: server/unittools.c:3184
#, c-format
msgid "Attempt to change homecity for %s failed."
msgstr ""
-#: server/unittools.c:3190
+#: server/unittools.c:3195
#, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr ""
-#: server/unittools.c:3202
+#: server/unittools.c:3207
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr ""
-#: server/unittools.c:3211
+#: server/unittools.c:3216
#, c-format
msgid "Your %s has invalid orders."
msgstr ""
+#: server/voting.c:522
+#, c-format
+msgid ""
+"%s %d \"%s\" is passed %d to %d with %d abstentions and %d who did not vote."
+msgstr ""
+
+#: server/voting.c:528
+#, c-format
+msgid ""
+"%s %d \"%s\" failed with %d against, %d for, %d abstentions and %d who did "
+"not vote."
+msgstr ""
+
+#: server/voting.c:548
+#, c-format
+msgid "%s %d: %s voted yes."
+msgstr ""
+
+#: server/voting.c:553
+#, c-format
+msgid "%s %d: %s voted no."
+msgstr ""
+
+#: server/voting.c:558
+#, c-format
+msgid "%s %d: %s chose to abstain."
+msgstr ""
+
+#. TRANS: Describing a new vote that can only pass
+#. * if there are no dissenting votes.
+#: server/voting.c:726
+#, c-format
+msgid "%s (needs %0.0f%% and no dissent)."
+msgstr ""
+
+#. TRANS: Describing a new vote that can pass only if the
+#. * given percentage of players votes 'yes'.
+#: server/voting.c:732
+#, c-format
+msgid "%s (needs %0.0f%% in favor)."
+msgstr ""
+
#: server/generator/mapgen.c:1771
msgid "High landmass - this may take a few seconds."
msgstr ""
@@ -6571,12 +6700,12 @@ msgid ""
"Please report this bug at %s."
msgstr ""
-#: client/attribute.c:363
+#: client/attribute.c:368
msgid ""
"There has been a CMA error. Your citizen governor settings may be broken."
msgstr ""
-#: client/attribute.c:367
+#: client/attribute.c:372
msgid "Old attributes detected and removed."
msgstr ""
@@ -6722,41 +6851,41 @@ msgstr ""
msgid "%+4d : Taxed from trade\n"
msgstr ""
-#: client/citydlg_common.c:418
+#: client/citydlg_common.c:421
#, c-format
msgid "%+4d : Trade route with %s\n"
msgstr ""
-#: client/citydlg_common.c:427
+#: client/citydlg_common.c:430
#, c-format
msgid "%+4d : Building tithes\n"
msgstr ""
-#: client/citydlg_common.c:450
+#: client/citydlg_common.c:453
#, c-format
msgid "%+4d : Bonus from %s (%+d%%)\n"
msgstr ""
-#: client/citydlg_common.c:462
+#: client/citydlg_common.c:465
#, c-format
msgid "%+4d : Waste\n"
msgstr ""
-#: client/citydlg_common.c:468
+#: client/citydlg_common.c:471
#, c-format
msgid "%+4d : Disorder\n"
msgstr ""
-#: client/citydlg_common.c:474
+#: client/citydlg_common.c:477
#, c-format
msgid "%+4d : Used\n"
msgstr ""
-#: client/citydlg_common.c:479
+#: client/citydlg_common.c:482
msgid "==== : Adds up to\n"
msgstr ""
-#: client/citydlg_common.c:481
+#: client/citydlg_common.c:484
#, c-format
msgid "%4d : Total surplus"
msgstr ""
@@ -7061,48 +7190,48 @@ msgstr ""
msgid "Specialists"
msgstr ""
-#: client/civclient.c:240
+#: client/civclient.c:241
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr ""
-#: client/civclient.c:250
+#: client/civclient.c:251
msgid " -l, --log FILE\tUse FILE as logfile (spawned server also uses this)\n"
msgstr ""
-#: client/civclient.c:252
+#: client/civclient.c:253
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr ""
-#: client/civclient.c:254
+#: client/civclient.c:255
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr ""
-#: client/civclient.c:256
+#: client/civclient.c:257
msgid " -p, --port PORT\tConnect to server port PORT (usually with -a)\n"
msgstr ""
-#: client/civclient.c:258
+#: client/civclient.c:259
#, c-format
msgid " -P, --Plugin PLUGIN\tUse PLUGIN for sound output %s\n"
msgstr ""
-#: client/civclient.c:260
+#: client/civclient.c:261
msgid " -r, --read FILE\tRead startup script FILE (for spawned server only)\n"
msgstr ""
-#: client/civclient.c:263
+#: client/civclient.c:264
msgid " -s, --server HOST\tConnect to the server at HOST (usually with -a)\n"
msgstr ""
-#: client/civclient.c:265
+#: client/civclient.c:266
msgid " -S, --Sound FILE\tRead sound tags from FILE\n"
msgstr ""
-#: client/civclient.c:266
+#: client/civclient.c:267
msgid " -t, --tiles FILE\tUse data file FILE.tilespec for tiles\n"
msgstr ""
-#: client/civclient.c:269
+#: client/civclient.c:270
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7110,45 +7239,45 @@ msgid ""
msgstr ""
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:274
+#: client/civclient.c:275
#, c-format
msgid "Report bugs at %s\n"
msgstr ""
-#: client/civclient.c:298
+#: client/civclient.c:299
#, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr ""
-#: client/civclient.c:300 client/civclient.c:315
+#: client/civclient.c:301 client/civclient.c:316
msgid "Try using --help.\n"
msgstr ""
-#: client/civclient.c:313
+#: client/civclient.c:314
#, c-format
msgid "Invalid debug level \"%s\" specified with --debug option.\n"
msgstr ""
-#: client/civclient.c:326
+#: client/civclient.c:327
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr ""
-#: client/civclient.c:391
+#: client/civclient.c:393
#, c-format
msgid "Updating old metaserver address \"%s\"."
msgstr ""
-#: client/civclient.c:394
+#: client/civclient.c:396
#, c-format
msgid "Default metaserver has been set to \"%s\"."
msgstr ""
-#: client/civclient.c:550
+#: client/civclient.c:540
msgid "Game started."
msgstr ""
-#: client/civclient.c:588
+#: client/civclient.c:606
msgid "There was an error while auto connecting; aborting."
msgstr ""
@@ -7278,75 +7407,75 @@ msgstr ""
msgid "Disconnected from server."
msgstr ""
-#: client/clinet.c:469
+#: client/clinet.c:473
#, c-format
msgid "Failed to contact server \"%s\" at port %d as \"%s\" after %d attempts"
msgstr ""
-#: client/clinet.c:484 client/clinet.c:486
+#: client/clinet.c:488 client/clinet.c:490
msgid "Connection to server refused. Please start the server."
msgstr ""
-#: client/clinet.c:495 client/clinet.c:523
+#: client/clinet.c:499 client/clinet.c:527
#, c-format
msgid ""
"Error contacting server \"%s\" at port %d as \"%s\":\n"
" %s\n"
msgstr ""
-#: client/clinet.c:514
+#: client/clinet.c:518
#, c-format
msgid ""
"Auto-connecting to server \"%s\" at port %d as \"%s\" every %f second(s) for "
"%d times"
msgstr ""
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
+#: client/connectdlg_common.c:78 client/gui-gtk-2.0/pages.c:1358
msgid "novice"
msgstr ""
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1358
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
msgid "easy"
msgstr ""
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1359
msgid "normal"
msgstr ""
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr ""
-#: client/connectdlg_common.c:83
+#: client/connectdlg_common.c:82
msgid "experimental"
msgstr ""
-#: client/connectdlg_common.c:213
+#: client/connectdlg_common.c:212
msgid "Starting server..."
msgstr ""
-#: client/connectdlg_common.c:332
+#: client/connectdlg_common.c:331
msgid "Couldn't start the server."
msgstr ""
-#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
+#: client/connectdlg_common.c:332 client/connectdlg_common.c:365
msgid "You'll have to start one manually. Sorry..."
msgstr ""
-#: client/connectdlg_common.c:364
+#: client/connectdlg_common.c:363
msgid "Couldn't connect to the server."
msgstr ""
-#: client/connectdlg_common.c:365
+#: client/connectdlg_common.c:364
msgid "We probably couldn't start it from here."
msgstr ""
-#: client/connectdlg_common.c:470
+#: client/connectdlg_common.c:469
msgid ""
"Established control over the server. You have command access level 'hack'."
msgstr ""
-#: client/connectdlg_common.c:475
+#: client/connectdlg_common.c:474
msgid ""
"Failed to obtain the required access level to take control of the server. "
"The server will now be shutdown."
@@ -7356,27 +7485,27 @@ msgstr ""
msgid "Only transporter units can be unloaded."
msgstr ""
-#: client/control.c:1425
+#: client/control.c:1417
msgid "Only settler units can be put into auto mode."
msgstr ""
-#: client/control.c:1516
+#: client/control.c:1511
msgid "Only nuclear units can do this."
msgstr ""
-#: client/control.c:1545
+#: client/control.c:1540
msgid "Only paratrooper units can do this."
msgstr ""
-#: client/control.c:2020
+#: client/control.c:2015
msgid "Too far for this unit."
msgstr ""
-#: client/control.c:2230 client/control.c:2260 client/control.c:2276
+#: client/control.c:2225 client/control.c:2255 client/control.c:2271
msgid "Didn't find a route to the destination!"
msgstr ""
-#: client/control.c:2320
+#: client/control.c:2315
msgid "Oh my! You seem to have no capital!"
msgstr ""
@@ -7756,115 +7885,122 @@ msgstr ""
#. * last two elements
#. TRANS: List of possible output types has this between
#. * last two elements
-#: client/helpdata.c:1066 client/helpdata.c:1400
+#: client/helpdata.c:1066 client/helpdata.c:1408
msgid " or "
msgstr ""
-#: client/helpdata.c:1068 client/helpdata.c:1388
+#: client/helpdata.c:1068 client/helpdata.c:1396
msgid "?or:, "
msgstr ""
-#: client/helpdata.c:1080
+#: client/helpdata.c:1079
+#, c-format
+msgid "* Unit has to be in a city, or a base after %d turn.\n"
+msgid_plural "* Unit has to be in a city, or a base after %d turns.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: client/helpdata.c:1087
#, 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"
+msgid "* Unit has to be in a city, a base, or on a %s after %d turn.\n"
+msgid_plural "* Unit has to be in a city, a base, or on a %s after %d turns.\n"
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1122
+#: client/helpdata.c:1130
#, c-format
msgid "If we would now start with %s we would need %d bulbs."
msgstr ""
-#: client/helpdata.c:1127
+#: client/helpdata.c:1135
#, 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:1135
+#: client/helpdata.c:1143
msgid "You cannot research this technology."
msgstr ""
-#: client/helpdata.c:1139
+#: client/helpdata.c:1147
msgid " This number may vary depending on what other players will research.\n"
msgstr ""
-#: client/helpdata.c:1151
+#: client/helpdata.c:1159
#, c-format
msgid "* The first player to research %s gets an immediate advance.\n"
msgstr ""
-#: client/helpdata.c:1156
+#: client/helpdata.c:1164
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
msgstr ""
-#: client/helpdata.c:1159
+#: client/helpdata.c:1167
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
msgstr ""
-#: client/helpdata.c:1163
+#: client/helpdata.c:1171
msgid "* Increases the pollution generated by the population.\n"
msgstr ""
-#: client/helpdata.c:1168
+#: client/helpdata.c:1176
#, c-format
msgid "* Allows %s to build roads on river squares.\n"
msgstr ""
-#: client/helpdata.c:1175
+#: client/helpdata.c:1183
#, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr ""
-#: client/helpdata.c:1183
+#: client/helpdata.c:1191
#, c-format
msgid "* Allows %s to build airbases.\n"
msgstr ""
-#: client/helpdata.c:1192
+#: client/helpdata.c:1200
#, c-format
msgid "* Allows %s to upgrade roads to railroads.\n"
msgstr "* Allows %s to upgrade roads to railways.\n"
-#: client/helpdata.c:1200
+#: client/helpdata.c:1208
#, c-format
msgid "* Allows %s to upgrade irrigation to farmland.\n"
msgstr ""
-#: client/helpdata.c:1234
+#: client/helpdata.c:1242
msgid "* Pollution cannot be generated on this terrain."
msgstr ""
-#: client/helpdata.c:1239
+#: client/helpdata.c:1247
msgid "* You cannot build cities on this terrain."
msgstr ""
-#: client/helpdata.c:1245
+#: client/helpdata.c:1253
msgid "* The coastline of this terrain is unsafe."
msgstr ""
-#: client/helpdata.c:1250
+#: client/helpdata.c:1258
msgid "* This terrain is unsafe for units to travel on."
msgstr ""
-#: client/helpdata.c:1255
+#: client/helpdata.c:1263
msgid "* Land units cannot travel on oceanic terrains."
msgstr ""
-#: client/helpdata.c:1305
+#: client/helpdata.c:1313
msgid "Features:\n"
msgstr ""
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1411 client/helpdata.c:1412
+#: client/helpdata.c:1419 client/helpdata.c:1420
msgid "?outputlist: Nothing "
msgstr ""
-#: client/helpdata.c:1419
+#: client/helpdata.c:1427
#, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -7875,7 +8011,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1429
+#: client/helpdata.c:1437
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -7883,48 +8019,48 @@ msgid ""
msgstr ""
#. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1437
+#: client/helpdata.c:1445
#, c-format
msgid "* You pay %d times normal %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1442
+#: client/helpdata.c:1450
#, 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:1447
+#: client/helpdata.c:1455
#, c-format
msgid "* You pay no %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1451
+#: client/helpdata.c:1459
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:1460
+#: client/helpdata.c:1468
#, 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:1468
+#: client/helpdata.c:1476
#, c-format
msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
msgstr ""
-#: client/helpdata.c:1475
+#: client/helpdata.c:1483
#, 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:1482
+#: client/helpdata.c:1490
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -7932,23 +8068,23 @@ msgid ""
msgstr ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1489
+#: client/helpdata.c:1497
#, 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:1497
+#: client/helpdata.c:1505
#, c-format
msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
msgstr ""
-#: client/helpdata.c:1502
+#: client/helpdata.c:1510
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr ""
-#: client/helpdata.c:1507
+#: client/helpdata.c:1515
#, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -7959,7 +8095,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1519
+#: client/helpdata.c:1527
#, 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 +8103,60 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1530
+#: client/helpdata.c:1538
#, 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:1536
+#: client/helpdata.c:1544
msgid "* Your units cannot be bribed.\n"
msgstr ""
-#: client/helpdata.c:1539
+#: client/helpdata.c:1547
msgid "* Your cities cannot be incited.\n"
msgstr ""
-#: client/helpdata.c:1543
+#: client/helpdata.c:1551
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:1549
+#: client/helpdata.c:1557
msgid "* Has a senate that may prevent declaration of war.\n"
msgstr ""
-#: client/helpdata.c:1553
+#: client/helpdata.c:1561
msgid "* Allows partisans when cities are taken by the enemy.\n"
msgstr ""
-#: client/helpdata.c:1557
+#: client/helpdata.c:1565
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
msgstr ""
-#: client/helpdata.c:1561
+#: client/helpdata.c:1569
msgid "* Pays no upkeep for fanatics.\n"
msgstr ""
-#: client/helpdata.c:1564
+#: client/helpdata.c:1572
msgid "* Has no unhappy citizens.\n"
msgstr ""
-#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
+#: client/helpdata.c:1582 client/helpdata.c:1586 client/helpdata.c:1590
#, c-format
msgid "* Veteran %s units.\n"
msgstr ""
-#: client/helpdata.c:1585
+#: client/helpdata.c:1593
msgid "* Veteran units.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1591
+#: client/helpdata.c:1599
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8028,7 +8164,7 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1600
+#: client/helpdata.c:1608
#, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8036,71 +8172,71 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1608
+#: client/helpdata.c:1616
#, 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:1617
+#: client/helpdata.c:1625
#, c-format
msgid "* %s production is increased %d%%.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1625
+#: client/helpdata.c:1633
#, c-format
msgid "* %s production will suffer massive waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1630
+#: client/helpdata.c:1638
#, c-format
msgid "* %s production will suffer some waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1635
+#: client/helpdata.c:1643
#, 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:1643
+#: client/helpdata.c:1651
#, 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:1649
+#: client/helpdata.c:1657
#, 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:1655
+#: client/helpdata.c:1663
#, c-format
msgid "* %s waste will increase slowly with distance from capital.\n"
msgstr ""
-#: client/helpdata.c:1672
+#: client/helpdata.c:1680
#, c-format
msgid "* Allows you to build %s.\n"
msgstr ""
#. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1699
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d %s"
msgstr ""
-#: client/helpdata.c:1700 client/helpdata.c:1708 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1708 client/helpdata.c:1716 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:1707
+#: client/helpdata.c:1715
#, c-format
msgid "%s%d unhappy"
msgstr ""
@@ -8169,7 +8305,7 @@ msgid ""
"or with the -a command-line parameter."
msgstr ""
-#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:916 data/Freeciv.in:107
msgid "Metaserver"
msgstr ""
@@ -8530,35 +8666,35 @@ msgstr ""
msgid "Saved settings to file %s"
msgstr ""
-#: client/packhand.c:211 client/packhand.c:217
+#: client/packhand.c:212 client/packhand.c:218
msgid "You were rejected from the game...."
msgstr ""
-#: client/packhand.c:229
+#: client/packhand.c:230
#, c-format
msgid "Client capability string: %s"
msgstr ""
-#: client/packhand.c:232
+#: client/packhand.c:233
#, c-format
msgid "Server capability string: %s"
msgstr ""
-#: client/packhand.c:850
+#: client/packhand.c:864
#, c-format
msgid "Start of turn %d"
msgstr ""
-#: client/packhand.c:1591
+#: client/packhand.c:1621
#, c-format
msgid "AI Mode is now %s."
msgstr ""
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "ON"
msgstr ""
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "OFF"
msgstr ""
@@ -8589,15 +8725,15 @@ msgstr ""
msgid "Username"
msgstr ""
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
-#: client/gui-gtk-2.0/pages.c:2157
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:653
+#: client/gui-gtk-2.0/pages.c:1604 client/gui-gtk-2.0/pages.c:2159
msgid "Flag"
msgstr ""
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1605
-#: client/gui-gtk-2.0/pages.c:2159 client/gui-sdl/repodlgs.c:2063
-#: client/gui-win32/connectdlg.c:990 client/gui-win32/dialogs.c:542
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:657
+#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1609
+#: client/gui-gtk-2.0/pages.c:2161 client/gui-sdl/repodlgs.c:2063
+#: client/gui-win32/connectdlg.c:992 client/gui-win32/dialogs.c:542
#: client/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr ""
@@ -8610,7 +8746,7 @@ msgstr ""
msgid "Score"
msgstr ""
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1614
msgid "Team"
msgstr ""
@@ -8643,36 +8779,36 @@ msgstr ""
msgid "Ping"
msgstr ""
-#: client/repodlgs_common.c:375
+#: client/repodlgs_common.c:378
msgid "You cannot sell improvements."
msgstr ""
-#: client/repodlgs_common.c:391
+#: client/repodlgs_common.c:394
#, c-format
msgid "Sold %d %s for %d gold."
msgstr ""
-#: client/repodlgs_common.c:396
+#: client/repodlgs_common.c:399
#, c-format
msgid "No %s could be sold."
msgstr ""
#. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:415
+#: client/repodlgs_common.c:418
msgid "You cannot disband units."
msgstr ""
-#: client/repodlgs_common.c:420
+#: client/repodlgs_common.c:423
#, c-format
msgid "%s cannot be disbanded."
msgstr ""
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:444
#, c-format
msgid "Disbanded %d %s."
msgstr ""
-#: client/repodlgs_common.c:445
+#: client/repodlgs_common.c:448
#, c-format
msgid "No %s could be disbanded."
msgstr ""
@@ -9252,47 +9388,47 @@ msgstr ""
msgid "?duration:overflow"
msgstr ""
-#: client/text.c:1143
+#: client/text.c:1145
#, c-format
msgid "%6d.%02d ms"
msgstr ""
#. TRANS: <nation adjective> <government name>.
#. * E.g. "Polish Republic".
-#: client/text.c:1188
+#: client/text.c:1193
#, c-format
msgid "?nationgovernment:%s %s"
msgstr ""
#. TRANS: "Observer: 1985"
-#: client/text.c:1198
+#: client/text.c:1203
#, c-format
msgid "Observer: %s"
msgstr ""
-#: client/text.c:1216
+#: client/text.c:1221
msgid "Buildings: "
msgstr ""
-#: client/text.c:1233 client/text.c:1272
+#: client/text.c:1238 client/text.c:1277
msgid "None. "
msgstr ""
-#: client/text.c:1235 client/text.c:1274
+#: client/text.c:1240 client/text.c:1279
msgid "?clistend:."
msgstr "?clistend:."
-#: client/text.c:1253
+#: client/text.c:1258
msgid "Wonders: "
msgstr ""
-#: client/text.c:1308
+#: client/text.c:1313
#, c-format
msgid "Cities: %d total, %d over threshold of %d cities."
msgstr ""
#. TRANS: 0-21 content [citizen(s)] ...
-#: client/text.c:1312
+#: client/text.c:1317
#, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
@@ -9300,60 +9436,60 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1318
+#: client/text.c:1323
#, c-format
msgid "%d additional unhappy citizen."
msgid_plural "%d additional unhappy citizens."
msgstr[0] ""
msgstr[1] ""
-#: client/text.c:1339
+#: client/text.c:1344
msgid "Unlimited martial law in effect."
msgstr ""
-#: client/text.c:1341
+#: client/text.c:1346
#, c-format
msgid "%d military unit may impose martial law."
msgid_plural "Up to %d military units may impose martial law."
msgstr[0] ""
msgstr[1] ""
-#: client/text.c:1345
+#: client/text.c:1350
#, c-format
msgid "Each military unit makes %d unhappy citizen content."
msgid_plural "Each military unit makes %d unhappy citizens content."
msgstr[0] ""
msgstr[1] ""
-#: client/text.c:1352
+#: client/text.c:1357
msgid "Military units in the field may cause unhappiness. "
msgstr ""
-#: client/text.c:1355
+#: client/text.c:1360
msgid "Military units have no happiness effect. "
msgstr ""
-#: client/text.c:1370
+#: client/text.c:1375
#, c-format
msgid "Luxury: %d total."
msgstr ""
-#: client/tilespec.c:865
+#: client/tilespec.c:882
msgid "No usable default tileset found, aborting!"
msgstr ""
-#: client/tilespec.c:1338
+#: client/tilespec.c:1355
msgid ""
"Client does not support isometric tilesets. Using default tileset instead."
msgstr ""
-#: client/tilespec.c:1347
+#: client/tilespec.c:1364
msgid ""
"Client does not support overhead view tilesets. Using default tileset "
"instead."
msgstr ""
-#: client/tilespec.c:3966
+#: client/tilespec.c:3987
#, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -10004,7 +10140,7 @@ msgid "_Display"
msgstr ""
#: client/gui-gtk-2.0/cityrep.c:1006 client/gui-gtk-2.0/menu.c:839
-#: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
+#: client/gui-sdl/diplodlg.c:692 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
#: client/gui-xaw/cityrep.c:533 client/gui-xaw/menu.c:156
@@ -10172,192 +10308,192 @@ msgstr ""
msgid "Remove this preset?"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:222
+#: client/gui-gtk-2.0/dialogs.c:197 client/gui-gtk-2.0/messagewin.c:222
msgid "Goto _Location"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
+#: client/gui-gtk-2.0/dialogs.c:202 client/gui-gtk-2.0/messagewin.c:226
msgid "Inspect _City"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:258 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:258 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:259 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:311 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:312 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:312 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:313 client/gui-win32/dialogs.c:1755
#: data/Freeciv.in:2502
msgid "Select what to pillage:"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:506
+#: client/gui-gtk-2.0/dialogs.c:507
msgid "Unit"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:950
-#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2155
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:985
+#: client/gui-gtk-2.0/dialogs.c:508 client/gui-gtk-2.0/pages.c:950
+#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2157
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:987
#: client/gui-win32/plrdlg.c:335 manual/civmanual.c:302 data/Freeciv.in:80
msgid "Name"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:519 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:520 client/gui-sdl/dialogs.c:627
msgid "Unit selection"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:582
+#: client/gui-gtk-2.0/dialogs.c:583
msgid "_Ready all"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:590
+#: client/gui-gtk-2.0/dialogs.c:591
msgid "_Sentry idle"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:719
+#: client/gui-gtk-2.0/dialogs.c:721
msgid "Nation _Groups:"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:766 data/Freeciv.in:3128
msgid "What Nation Will You Be?"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
-#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
+#: client/gui-gtk-2.0/dialogs.c:768 client/gui-sdl/chatline.c:842
+#: client/gui-win32/connectdlg.c:1040 data/Freeciv.in:3371
msgid "Pick Nation"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:774
+#: client/gui-gtk-2.0/dialogs.c:776
msgid "_Random Nation"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:792 client/gui-win32/dialogs.c:517
msgid "Select a nation"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:804
+#: client/gui-gtk-2.0/dialogs.c:810
msgid "_Properties"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:824
+#: client/gui-gtk-2.0/dialogs.c:830
msgid "_Leader:"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:831
+#: client/gui-gtk-2.0/dialogs.c:837
msgid "_Female"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:836
+#: client/gui-gtk-2.0/dialogs.c:842
msgid "_Male"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:863
+#: client/gui-gtk-2.0/dialogs.c:869
msgid "City _Styles:"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:902
+#: client/gui-gtk-2.0/dialogs.c:908
msgid "_Description"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1263 client/gui-xaw/dialogs.c:1480
msgid "You must select your sex."
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:1253 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1268 client/gui-xaw/dialogs.c:1485
msgid "You must select your city style."
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:1262 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1277 client/gui-sdl/dialogs.c:2204
#: 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:1306 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1318 client/gui-win32/citydlg.c:1454
#: data/Freeciv.in:2484
msgid "Upgrade Unit!"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1327 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 ""
-#: client/gui-gtk-2.0/diplodlg.c:231 client/gui-win32/diplodlg.c:151
+#: client/gui-gtk-2.0/diplodlg.c:222 client/gui-win32/diplodlg.c:151
#: client/gui-xaw/diplodlg.c:383 client/gui-xaw/diplodlg.c:401
msgid "World-map"
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:237 client/gui-win32/diplodlg.c:146
+#: client/gui-gtk-2.0/diplodlg.c:228 client/gui-win32/diplodlg.c:146
#: client/gui-xaw/diplodlg.c:387 client/gui-xaw/diplodlg.c:405
msgid "Sea-map"
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:243
+#: client/gui-gtk-2.0/diplodlg.c:234
msgid "_Maps"
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:274
+#: client/gui-gtk-2.0/diplodlg.c:265
msgid "_Advances"
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/diplodlg.c:315 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:333
+#: client/gui-gtk-2.0/diplodlg.c:324
msgid "_Give shared vision"
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:346
+#: client/gui-gtk-2.0/diplodlg.c:337
msgid "Give _embassy"
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:376
+#: client/gui-gtk-2.0/diplodlg.c:368
msgid "_Pacts"
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:466
+#: client/gui-gtk-2.0/diplodlg.c:458
#, c-format
msgid "Diplomacy: %s"
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:473
+#: client/gui-gtk-2.0/diplodlg.c:465
msgid "_Cancel meeting"
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:475
+#: client/gui-gtk-2.0/diplodlg.c:467
msgid "Accept _treaty"
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:503
+#: client/gui-gtk-2.0/diplodlg.c:495
msgid "C_lauses:"
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:568 client/gui-gtk-2.0/diplodlg.c:642
+#: client/gui-gtk-2.0/diplodlg.c:560 client/gui-gtk-2.0/diplodlg.c:634
msgid "_Gold:"
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:580 client/gui-gtk-2.0/diplodlg.c:654
+#: client/gui-gtk-2.0/diplodlg.c:572 client/gui-gtk-2.0/diplodlg.c:646
msgid "_Add Clause..."
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:699
+#: client/gui-gtk-2.0/diplodlg.c:691
msgid "--- This treaty is blank. Please add some clauses. ---"
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:905 client/gui-sdl/diplodlg.c:375
+#: client/gui-gtk-2.0/diplodlg.c:897 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 ""
@@ -10416,99 +10552,99 @@ msgstr ""
msgid "Show _All Cities"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:164
msgid "Show Map Scrollbars"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:163
+#: client/gui-gtk-2.0/gui_main.c:165
msgid "Disable this option to hide the scrollbars on the map view."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:169
msgid "Keyboardless goto"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:168
+#: client/gui-gtk-2.0/gui_main.c:170
msgid ""
"If this option is set then a goto may be initiated by left-clicking and then "
"holding down the mouse button while dragging the mouse onto a different tile."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:173
+#: client/gui-gtk-2.0/gui_main.c:175
msgid "Keep dialogs on top"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:174
+#: client/gui-gtk-2.0/gui_main.c:176
msgid ""
"If this option is set then dialog windows will always remain in front of the "
"main Freeciv window. Disabling this has no effect in fullscreen mode."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:178
+#: client/gui-gtk-2.0/gui_main.c:180
msgid "Show worklist task icons"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:179
+#: client/gui-gtk-2.0/gui_main.c:181
msgid ""
"Disabling this will turn off the unit and building icons in the worklist "
"dialog and the production tab of the city dialog."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:183
+#: client/gui-gtk-2.0/gui_main.c:185
msgid "Enable status report tabs"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:184
+#: client/gui-gtk-2.0/gui_main.c:186
msgid ""
"If this option is enabled then report dialogs will be shown as separate tabs "
"rather than in popup dialogs."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:189 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:191 client/gui-win32/gui_main.c:110
msgid "Better fog-of-war drawing"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:190 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:192 client/gui-win32/gui_main.c:111
msgid ""
"If this is enabled then a better method is used for drawing fog-of-war. It "
"is not any slower but will consume about twice as much memory."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:195
+#: client/gui-gtk-2.0/gui_main.c:197
msgid "Show time for each chat message"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:196
+#: client/gui-gtk-2.0/gui_main.c:198
msgid ""
"If this option is enabled then all chat messages will be prefixed by a time "
"string of the form [hour:minute:second]."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:201
+#: client/gui-gtk-2.0/gui_main.c:203
msgid "Split bottom notebook area"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:202
+#: client/gui-gtk-2.0/gui_main.c:204
msgid ""
"Enabling this option will split the bottom notebook into a left and right "
"notebook so that two tabs may be viewed at once."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:207
+#: client/gui-gtk-2.0/gui_main.c:209
msgid "New message events go to top of list"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:208
+#: client/gui-gtk-2.0/gui_main.c:210
msgid ""
"If this option is enabled, new events in the message window will appear at "
"the top of the list, rather than being appended at the bottom."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:213
+#: client/gui-gtk-2.0/gui_main.c:215
msgid "Show extra message window buttons"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:214
+#: client/gui-gtk-2.0/gui_main.c:216
msgid ""
"If this option is enabled, there will be two buttons displayed in the "
"message window for inspecting a city and going to a location. If this option "
@@ -10518,21 +10654,21 @@ msgid ""
"closed and reopened."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:224
+#: client/gui-gtk-2.0/gui_main.c:226
msgid "Metaserver tab first in network page"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:225
+#: client/gui-gtk-2.0/gui_main.c:227
msgid ""
"If this option is enabled, the metaserver tab will be the first notebook tab "
"in the network page. This option requires a restart in order to take effect."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:230
+#: client/gui-gtk-2.0/gui_main.c:232
msgid "Plain chat messages are sent to allies only"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:231
+#: client/gui-gtk-2.0/gui_main.c:233
msgid ""
"If this option is enabled, then plain messages typed into the chat entry "
"while the game is running will only be sent to your allies. Otherwise plain "
@@ -10542,28 +10678,41 @@ msgid ""
"visible in multiplayer games)."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:340 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:245
+msgid "Arrange widgets for small displays"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:246
+msgid ""
+"If this option is enabled, widgets in the main window will be arrange so "
+"that they take up the least amount of total screen space. Specifically, the "
+"left panel containing the overview, player status, and the unit information "
+"box will be extended over the entire left side of the window. This option "
+"requires a restart in order to take effect."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:352 client/gui-xaw/gui_main.c:245
msgid ""
"This client has no special command line options\n"
"\n"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
+#: client/gui-gtk-2.0/gui_main.c:847 client/gui-gtk-2.0/gui_main.c:1542
msgid "Freeciv"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
+#: client/gui-gtk-2.0/gui_main.c:1251 client/gui-gtk-2.0/gui_main.c:1258
#: client/gui-sdl/mapctrl.c:1566 client/gui-win32/gui_main.c:482
#: data/Freeciv.in:2618
msgid "Turn Done"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1232 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1258 client/gui-sdl/mapctrl.c:1566
#: client/gui-sdl/mapview.c:1082
msgid "Shift+Return"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1266 client/gui-gtk-2.0/menu.c:797
+#: client/gui-gtk-2.0/gui_main.c:1299 client/gui-gtk-2.0/menu.c:797
#: client/gui-gtk-2.0/menu.c:799 client/gui-gtk-2.0/menu.c:801
#: client/gui-gtk-2.0/menu.c:803 client/gui-gtk-2.0/menu.c:805
#: client/gui-gtk-2.0/menu.c:807 client/gui-gtk-2.0/menu.c:809
@@ -10582,11 +10731,11 @@ msgstr ""
msgid "View"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1359
+#: client/gui-gtk-2.0/gui_main.c:1393
msgid "Chat"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1377 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1411 client/gui-win32/gui_main.c:538
#: data/Freeciv.in:2809
msgid ""
"Freeciv is free software and you are welcome to distribute copies of it\n"
@@ -10594,84 +10743,84 @@ msgid ""
"Now.. Go give'em hell!"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1392
+#: client/gui-gtk-2.0/gui_main.c:1426
msgid "Allies Only"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1657
+#: client/gui-gtk-2.0/gui_main.c:1691
msgid "Not _ready"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
+#: client/gui-gtk-2.0/gui_main.c:1702 client/gui-gtk-2.0/pages.c:1679
msgid "_Ready"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1672 client/gui-gtk-2.0/gui_main.c:1678
-#: client/gui-gtk-2.0/pages.c:2204
+#: client/gui-gtk-2.0/gui_main.c:1706 client/gui-gtk-2.0/gui_main.c:1712
+#: client/gui-gtk-2.0/pages.c:2206
msgid "_Start"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1686
+#: client/gui-gtk-2.0/gui_main.c:1720
msgid "_Take Player"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
+#: client/gui-gtk-2.0/gui_main.c:1723 client/gui-gtk-2.0/pages.c:1669
msgid "Pick _Nation"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
+#: client/gui-gtk-2.0/gui_main.c:1730 client/gui-gtk-2.0/pages.c:1674
msgid "_Observe"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1698
+#: client/gui-gtk-2.0/gui_main.c:1732
msgid "Do not _observe"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1755 client/gui-xaw/pages.c:211
msgid "<AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1723
+#: client/gui-gtk-2.0/gui_main.c:1758
msgid "<Novice AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1726
+#: client/gui-gtk-2.0/gui_main.c:1761
msgid "<Easy AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1729
+#: client/gui-gtk-2.0/gui_main.c:1764
msgid "<Normal AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1732
+#: client/gui-gtk-2.0/gui_main.c:1767
msgid "<Hard AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1742 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1777 client/gui-win32/dialogs.c:594
#: client/gui-xaw/pages.c:217
msgid "Random"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1808
+#: client/gui-gtk-2.0/gui_main.c:1844 client/gui-gtk-2.0/gui_main.c:1858
msgid "Observer"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1808
+#: client/gui-gtk-2.0/gui_main.c:1858
msgid "Detached"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:2073
+#: client/gui-gtk-2.0/gui_main.c:2117
msgid "Are you sure you want to quit?"
msgstr ""
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
#, c-format
msgid ""
"Close Tab:\n"
"%s"
msgstr ""
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
msgid "Ctrl+W"
msgstr ""
@@ -10776,8 +10925,8 @@ msgid "Trans. Rslt/Time:"
msgstr ""
#: 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
-#: client/gui-win32/helpdlg.c:709 client/gui-win32/helpdlg.c:733
+#: client/gui-win32/helpdlg.c:502 client/gui-win32/helpdlg.c:550
+#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:739
#: client/gui-xaw/helpdlg.c:759 client/gui-xaw/helpdlg.c:808
#: client/gui-xaw/helpdlg.c:816 client/gui-xaw/helpdlg.c:853
#: client/gui-xaw/helpdlg.c:878
@@ -10824,34 +10973,34 @@ msgstr ""
msgid "?techhelp:"
msgstr ""
-#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:591
+#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:597
#: client/gui-xaw/helpdlg.c:996
#, c-format
msgid "+%d Trade / %d"
msgstr ""
-#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:595
+#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:601
#: client/gui-xaw/helpdlg.c:1000
#, c-format
msgid "no extra / %d"
msgstr ""
#: 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
-#: client/gui-win32/helpdlg.c:602 client/gui-win32/helpdlg.c:616
-#: client/gui-win32/helpdlg.c:635 client/gui-xaw/helpdlg.c:1002
+#: client/gui-gtk-2.0/helpdlg.c:1085 client/gui-win32/helpdlg.c:604
+#: client/gui-win32/helpdlg.c:608 client/gui-win32/helpdlg.c:622
+#: client/gui-win32/helpdlg.c:641 client/gui-xaw/helpdlg.c:1002
#: client/gui-xaw/helpdlg.c:1006 client/gui-xaw/helpdlg.c:1020
#: client/gui-xaw/helpdlg.c:1039
msgid "n/a"
msgstr ""
-#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:605
+#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:611
#: client/gui-xaw/helpdlg.c:1009
#, c-format
msgid "+%d Food / %d"
msgstr ""
-#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:619
+#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:625
#: client/gui-xaw/helpdlg.c:1023
#, c-format
msgid "+%d Res. / %d"
@@ -11607,41 +11756,41 @@ msgstr ""
msgid "Connect to Gaming _Zone"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:302
#: client/gui-xaw/connectdlg.c:326
msgid "Passwords don't match, enter password."
msgstr ""
#: client/gui-gtk-2.0/pages.c:779 client/gui-gtk-2.0/pages.c:820
-#: client/gui-win32/connectdlg.c:916
+#: client/gui-win32/connectdlg.c:918
msgid "Server Name"
msgstr ""
#: client/gui-gtk-2.0/pages.c:780 client/gui-gtk-2.0/pages.c:821
-#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:916
+#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:918
#: data/Freeciv.in:96
msgid "Port"
msgstr ""
#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Version"
msgstr ""
#: client/gui-gtk-2.0/pages.c:782 client/gui-gtk-2.0/pages.c:823
-#: client/gui-gtk-2.0/pages.c:2161 client/gui-win32/connectdlg.c:917
-#: client/gui-win32/connectdlg.c:995
+#: client/gui-gtk-2.0/pages.c:2163 client/gui-win32/connectdlg.c:919
+#: client/gui-win32/connectdlg.c:997
msgid "Status"
msgstr ""
#: client/gui-gtk-2.0/pages.c:783 client/gui-gtk-2.0/pages.c:824
#: client/gui-sdl/connectdlg.c:318 client/gui-sdl/plrdlg.c:330
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Players"
msgstr ""
#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
-#: client/gui-win32/connectdlg.c:918
+#: client/gui-win32/connectdlg.c:920
msgid "Comment"
msgstr ""
@@ -11673,9 +11822,9 @@ msgstr ""
msgid "Conf_irm Password:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2165
#: 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:1000
+#: client/gui-win32/citydlg.c:1083 client/gui-win32/connectdlg.c:1002
#: client/gui-win32/wldlg.c:800 client/gui-win32/wldlg.c:806
msgid "Type"
msgstr ""
@@ -11767,7 +11916,7 @@ msgstr ""
msgid "Ruleset _Version:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2195
msgid "_More Game Options..."
msgstr ""
@@ -11783,48 +11932,48 @@ msgstr ""
msgid "Ready"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1601
+#: client/gui-gtk-2.0/pages.c:1600
msgid "?player:Leader"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1732 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1734 client/gui-sdl/chatline.c:185
msgid "Choose Saved Game to Load"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1824
+#: client/gui-gtk-2.0/pages.c:1826
msgid "Choose Saved Game to _Load:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
-#: client/gui-gtk-2.0/pages.c:2451
+#: client/gui-gtk-2.0/pages.c:1846 client/gui-gtk-2.0/pages.c:2039
+#: client/gui-gtk-2.0/pages.c:2455
msgid "_Browse..."
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1911
+#: client/gui-gtk-2.0/pages.c:1913
msgid "Choose a Scenario"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1998
+#: client/gui-gtk-2.0/pages.c:2000
msgid "Choose a _Scenario:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:2173
+#: client/gui-gtk-2.0/pages.c:2175
msgid "Choose a _nation to play:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2367 client/gui-win32/menu.c:581
msgid "Select Location to Save"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2452 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:2489
+#: client/gui-gtk-2.0/pages.c:2493
msgid "Saved _Games:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:2516
+#: client/gui-gtk-2.0/pages.c:2520
msgid "Save _Filename:"
msgstr ""
@@ -12155,7 +12304,7 @@ msgstr ""
msgid "Total users logged in : %d"
msgstr ""
-#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1098
msgid "Back"
msgstr ""
@@ -12164,7 +12313,7 @@ msgid "Start"
msgstr ""
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:777
+#: client/gui-win32/connectdlg.c:779
msgid "Load Game"
msgstr ""
@@ -12204,9 +12353,9 @@ msgstr ""
#: client/gui-sdl/connectdlg.c:308 client/gui-sdl/connectdlg.c:617
#: client/gui-sdl/connectdlg.c:803 client/gui-sdl/connectdlg.c:985
#: client/gui-sdl/dialogs.c:452 client/gui-sdl/dialogs.c:2095
-#: client/gui-sdl/dialogs.c:2893 client/gui-sdl/diplomat_dialog.c:731
+#: client/gui-sdl/dialogs.c:2902 client/gui-sdl/diplomat_dialog.c:731
#: client/gui-sdl/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1043
#: client/gui-win32/dialogs.c:1772 client/gui-win32/finddlg.c:127
#: client/gui-win32/gotodlg.c:171 client/gui-win32/inputdlg.c:146
#: client/gui-win32/messagedlg.c:216 client/gui-win32/ratesdlg.c:328
@@ -12246,7 +12395,7 @@ msgid "Buy it?"
msgstr ""
#: 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
+#: client/gui-sdl/diplodlg.c:1336 client/gui-sdl/diplomat_dialog.c:1211
#: client/gui-sdl/diplomat_dialog.c:1417 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:221 client/gui-sdl/repodlgs.c:1559
#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
@@ -12262,7 +12411,7 @@ msgid "No"
msgstr ""
#: client/gui-sdl/citydlg.c:1215 client/gui-sdl/cma_fe.c:318
-#: client/gui-sdl/diplodlg.c:1345 client/gui-sdl/diplomat_dialog.c:1200
+#: client/gui-sdl/diplodlg.c:1346 client/gui-sdl/diplomat_dialog.c:1200
#: client/gui-sdl/diplomat_dialog.c:1407 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:232 client/gui-win32/repodlgs.c:578
#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
@@ -12562,7 +12711,7 @@ msgstr ""
msgid "Port :"
msgstr ""
-#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1100
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr ""
@@ -12669,23 +12818,23 @@ msgstr ""
msgid "REVOLUTION!"
msgstr ""
-#: client/gui-sdl/dialogs.c:2232 client/gui-sdl/dialogs.c:2620
+#: client/gui-sdl/dialogs.c:2237 client/gui-sdl/dialogs.c:2625
#: client/gui-win32/dialogs.c:567 data/Freeciv.in:3159
msgid "Female"
msgstr ""
-#: client/gui-sdl/dialogs.c:2234 client/gui-sdl/dialogs.c:2618
-#: client/gui-sdl/dialogs.c:2830 client/gui-win32/dialogs.c:565
+#: client/gui-sdl/dialogs.c:2239 client/gui-sdl/dialogs.c:2623
+#: client/gui-sdl/dialogs.c:2839 client/gui-win32/dialogs.c:565
msgid "Male"
msgstr ""
-#: client/gui-sdl/dialogs.c:2478 client/gui-sdl/dialogs.c:2902
+#: client/gui-sdl/dialogs.c:2483 client/gui-sdl/dialogs.c:2911
#: 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 ""
-#: client/gui-sdl/dialogs.c:2685 client/gui-win32/dialogs.c:505
+#: client/gui-sdl/dialogs.c:2694 client/gui-win32/dialogs.c:505
msgid "What nation will you be?"
msgstr ""
@@ -12712,77 +12861,77 @@ msgstr ""
msgid "Sea map"
msgstr ""
-#: client/gui-sdl/diplodlg.c:563
+#: client/gui-sdl/diplodlg.c:564
msgid "Give embassy"
msgstr ""
-#: client/gui-sdl/diplodlg.c:579 client/gui-win32/diplodlg.c:614
+#: client/gui-sdl/diplodlg.c:580 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 ""
-#: client/gui-sdl/diplodlg.c:613 client/gui-sdl/helpdlg.c:1956
+#: client/gui-sdl/diplodlg.c:614 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 ""
-#: client/gui-sdl/diplodlg.c:831 client/gui-win32/diplodlg.c:598
+#: client/gui-sdl/diplodlg.c:832 client/gui-win32/diplodlg.c:598
#: data/Freeciv.in:269
msgid "Diplomacy meeting"
msgstr ""
-#: client/gui-sdl/diplodlg.c:883 client/gui-win32/diplodlg.c:680
+#: client/gui-sdl/diplodlg.c:884 client/gui-win32/diplodlg.c:680
#: data/Freeciv.in:510
msgid "Cancel meeting"
msgstr ""
-#: client/gui-sdl/diplodlg.c:895 client/gui-win32/diplodlg.c:679
+#: client/gui-sdl/diplodlg.c:896 client/gui-win32/diplodlg.c:679
#: data/Freeciv.in:501
msgid "Accept treaty"
msgstr ""
#. TRANS: "Polish incident !" FIXME!!!
-#: client/gui-sdl/diplodlg.c:1304
+#: client/gui-sdl/diplodlg.c:1305
#, c-format
msgid "%s incident !"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1322
+#: client/gui-sdl/diplodlg.c:1323
msgid "Shall we declare WAR on them?"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1433
+#: client/gui-sdl/diplodlg.c:1434
msgid "Foreign Minister"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1449
+#: client/gui-sdl/diplodlg.c:1450
#, c-format
msgid ""
"Sir!, the %s ambassador has arrived\n"
"What are your wishes?"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1465
+#: client/gui-sdl/diplodlg.c:1466
msgid "Declare WAR"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1467 client/gui-win32/plrdlg.c:357
+#: client/gui-sdl/diplodlg.c:1468 client/gui-win32/plrdlg.c:357
msgid "Cancel Treaty"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1490 client/gui-win32/plrdlg.c:358
+#: client/gui-sdl/diplodlg.c:1491 client/gui-win32/plrdlg.c:358
#: data/Freeciv.in:3254
msgid "Withdraw vision"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1507
+#: client/gui-sdl/diplodlg.c:1508
msgid "Call Diplomatic Meeting"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1521
+#: client/gui-sdl/diplodlg.c:1522
msgid "Send him back"
msgstr ""
@@ -13488,12 +13637,12 @@ msgid "Leave Game"
msgstr ""
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1100 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1102 client/gui-xaw/menu.c:121
#: data/Freeciv.in:115 data/Freeciv.in:3180
msgid "Quit"
msgstr ""
-#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:967
msgid "Start New Game"
msgstr ""
@@ -13601,8 +13750,8 @@ msgstr ""
msgid "%s max rate : %d%%"
msgstr ""
-#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
-#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1085
+#: client/gui-win32/connectdlg.c:1093 data/Freeciv.in:155
msgid "Update"
msgstr ""
@@ -14057,67 +14206,67 @@ msgstr ""
msgid "Delete"
msgstr ""
-#: client/gui-win32/connectdlg.c:147
+#: client/gui-win32/connectdlg.c:149
msgid "Password:"
msgstr ""
-#: client/gui-win32/connectdlg.c:169
+#: client/gui-win32/connectdlg.c:171
msgid "Couldn't load the savegame"
msgstr ""
-#: client/gui-win32/connectdlg.c:284 client/gui-xaw/connectdlg.c:311
+#: client/gui-win32/connectdlg.c:286 client/gui-xaw/connectdlg.c:311
msgid "Verify Password"
msgstr ""
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:916 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr ""
-#: client/gui-win32/connectdlg.c:915
+#: client/gui-win32/connectdlg.c:917
msgid "Local Area Network"
msgstr ""
-#: client/gui-win32/connectdlg.c:949
+#: client/gui-win32/connectdlg.c:951
msgid "Welcome to Freeciv"
msgstr ""
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Load Saved Game"
msgstr ""
-#: client/gui-win32/connectdlg.c:969
+#: client/gui-win32/connectdlg.c:971
msgid "Connect To Network Game"
msgstr ""
-#: client/gui-win32/connectdlg.c:979
+#: client/gui-win32/connectdlg.c:981
msgid "Choose a nation to play"
msgstr ""
-#: client/gui-win32/connectdlg.c:1014
+#: client/gui-win32/connectdlg.c:1016
msgid "Number of players (Including AI):"
msgstr ""
-#: client/gui-win32/connectdlg.c:1022
+#: client/gui-win32/connectdlg.c:1024
msgid "AI skill level:"
msgstr ""
-#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1038 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr ""
-#: client/gui-win32/connectdlg.c:1040
+#: client/gui-win32/connectdlg.c:1042
msgid "Start Game"
msgstr ""
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Login:"
msgstr ""
-#: client/gui-win32/connectdlg.c:1061
+#: client/gui-win32/connectdlg.c:1063
msgid "Host:"
msgstr ""
-#: client/gui-win32/connectdlg.c:1062
+#: client/gui-win32/connectdlg.c:1064
msgid "Port:"
msgstr ""
@@ -14190,21 +14339,21 @@ msgid ""
"this is much slower."
msgstr ""
-#: client/gui-win32/helpdlg.c:769 client/gui-win32/helpdlg.c:792
-#: client/gui-win32/helpdlg.c:803 client/gui-win32/helpdlg.c:809
-#: client/gui-win32/helpdlg.c:822
+#: client/gui-win32/helpdlg.c:775 client/gui-win32/helpdlg.c:798
+#: client/gui-win32/helpdlg.c:809 client/gui-win32/helpdlg.c:815
+#: client/gui-win32/helpdlg.c:828
msgid "Allows "
msgstr ""
-#: client/gui-win32/helpdlg.c:780
+#: client/gui-win32/helpdlg.c:786
msgid "Obsoletes "
msgstr ""
-#: client/gui-win32/helpdlg.c:812 client/gui-win32/helpdlg.c:825
+#: client/gui-win32/helpdlg.c:818 client/gui-win32/helpdlg.c:831
msgid " (with "
msgstr ""
-#: client/gui-win32/helpdlg.c:815 client/gui-win32/helpdlg.c:828
+#: client/gui-win32/helpdlg.c:821 client/gui-win32/helpdlg.c:834
msgid "?techhelp:)."
msgstr ""
@@ -15271,7 +15420,7 @@ 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/"
+" https://gna.org/projects/freeciv/"
msgstr ""
#: data/helpdata.txt:60
@@ -16962,50 +17111,48 @@ msgid ""
"a Factory, Mfg. Plant and Hydro Plant together give a 150% production "
"bonus.\n"
"\n"
-"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant. A city "
-"can only build a Hydro Plant if it is next to (or on) a Mountain or River "
-"tile."
+"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant."
msgstr ""
-#: data/default/buildings.ruleset:397 data/civ2/buildings.ruleset:373
+#: data/default/buildings.ruleset:396 data/civ2/buildings.ruleset:373
#: data/civ1/buildings.ruleset:297
msgid "Library"
msgstr ""
-#: data/default/buildings.ruleset:412
+#: data/default/buildings.ruleset:411
#, no-c-format
msgid "Increases the science output in a city by 100%."
msgstr ""
-#: data/default/buildings.ruleset:417 data/civ2/buildings.ruleset:393
+#: data/default/buildings.ruleset:416 data/civ2/buildings.ruleset:393
#: data/civ1/buildings.ruleset:317
msgid "Marketplace"
msgstr ""
-#: data/default/buildings.ruleset:432 data/civ2/buildings.ruleset:408
+#: data/default/buildings.ruleset:431 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 ""
-#: data/default/buildings.ruleset:437 data/civ2/buildings.ruleset:413
+#: data/default/buildings.ruleset:436 data/civ2/buildings.ruleset:413
#: data/civ1/buildings.ruleset:337
msgid "Mass Transit"
msgstr ""
-#: data/default/buildings.ruleset:451 data/civ2/buildings.ruleset:427
+#: data/default/buildings.ruleset:450 data/civ2/buildings.ruleset:427
#: data/civ1/buildings.ruleset:351
msgid ""
"Neutralizes the pollution generated by the population. The population "
"simply has no effect on the pollution generated in the city."
msgstr ""
-#: data/default/buildings.ruleset:458 data/civ2/buildings.ruleset:434
+#: data/default/buildings.ruleset:457 data/civ2/buildings.ruleset:434
#: data/civ1/buildings.ruleset:358
msgid "Mfg. Plant"
msgstr ""
-#: data/default/buildings.ruleset:474 data/civ2/buildings.ruleset:450
+#: data/default/buildings.ruleset:473 data/civ2/buildings.ruleset:450
#: data/civ1/buildings.ruleset:374
#, no-c-format
msgid ""
@@ -17013,12 +17160,12 @@ msgid ""
"production in a city by 100%."
msgstr ""
-#: data/default/buildings.ruleset:480 data/civ2/buildings.ruleset:456
+#: data/default/buildings.ruleset:479 data/civ2/buildings.ruleset:456
#: data/civ1/buildings.ruleset:380
msgid "Nuclear Plant"
msgstr ""
-#: data/default/buildings.ruleset:495
+#: data/default/buildings.ruleset:494
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 "
@@ -17029,22 +17176,22 @@ msgid ""
"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant."
msgstr ""
-#: data/default/buildings.ruleset:515 data/civ2/buildings.ruleset:489
+#: data/default/buildings.ruleset:514 data/civ2/buildings.ruleset:489
msgid "Offshore Platform"
msgstr ""
-#: data/default/buildings.ruleset:530 data/civ2/buildings.ruleset:504
+#: data/default/buildings.ruleset:529 data/civ2/buildings.ruleset:504
msgid ""
"Adds 1 extra shield resource on all Ocean squares in a city. The city needs "
"to be coastal to build this improvement."
msgstr ""
-#: data/default/buildings.ruleset:536 data/civ2/buildings.ruleset:510
+#: data/default/buildings.ruleset:535 data/civ2/buildings.ruleset:510
#: data/civ1/buildings.ruleset:411
msgid "Palace"
msgstr ""
-#: data/default/buildings.ruleset:552
+#: data/default/buildings.ruleset:551
#, no-c-format
msgid ""
"Makes a city the capital and the center of your government. Corruption in "
@@ -17073,33 +17220,33 @@ msgstr ""
"Under Despotism the palace gives you a +75% production bonus, and under "
"Monarchy a +50% production bonus."
-#: data/default/buildings.ruleset:569 data/civ2/buildings.ruleset:539
+#: data/default/buildings.ruleset:568 data/civ2/buildings.ruleset:539
msgid "Police Station"
msgstr ""
-#: data/default/buildings.ruleset:583 data/civ2/buildings.ruleset:553
+#: data/default/buildings.ruleset:582 data/civ2/buildings.ruleset:553
msgid ""
"Reduces the unhappiness caused by military units outside the city by 2 under "
"Democracy and 1 under Republic. This improvement has no effect under other "
"governments."
msgstr ""
-#: data/default/buildings.ruleset:593 data/civ2/buildings.ruleset:560
+#: data/default/buildings.ruleset:592 data/civ2/buildings.ruleset:560
msgid "Port Facility"
msgstr ""
-#: data/default/buildings.ruleset:608 data/civ2/buildings.ruleset:575
+#: data/default/buildings.ruleset:607 data/civ2/buildings.ruleset:575
msgid ""
"Allows a city to build veteran sea units. Also, damaged sea units which "
"stay in town for one full turn without moving are completely restored."
msgstr ""
-#: data/default/buildings.ruleset:615 data/civ2/buildings.ruleset:582
+#: data/default/buildings.ruleset:614 data/civ2/buildings.ruleset:582
#: data/civ1/buildings.ruleset:440
msgid "Power Plant"
msgstr ""
-#: data/default/buildings.ruleset:631
+#: data/default/buildings.ruleset:630
#, no-c-format
msgid ""
"Increases the shield production of a Factory or Mfg. Plant in a city: a "
@@ -17110,12 +17257,12 @@ msgid ""
"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant."
msgstr ""
-#: data/default/buildings.ruleset:646 data/civ2/buildings.ruleset:610
+#: data/default/buildings.ruleset:645 data/civ2/buildings.ruleset:610
#: data/civ1/buildings.ruleset:468
msgid "Recycling Center"
msgstr "Recycling Centre"
-#: data/default/buildings.ruleset:661 data/civ2/buildings.ruleset:625
+#: data/default/buildings.ruleset:660 data/civ2/buildings.ruleset:625
#: data/civ1/buildings.ruleset:483
#, no-c-format
msgid ""
@@ -17125,33 +17272,33 @@ msgstr ""
"Building a Recycling Centre reduces the amount of pollution generated by "
"production in a city by 66%."
-#: data/default/buildings.ruleset:667 data/civ2/buildings.ruleset:631
+#: data/default/buildings.ruleset:666 data/civ2/buildings.ruleset:631
msgid "Research Lab"
msgstr ""
-#: data/default/buildings.ruleset:682
+#: data/default/buildings.ruleset:681
msgid ""
"Together with a Library, a Research Lab increases the science production of "
"a city by 200%. Together with a Library and a University, a Research Lab "
"increases the science production of a city by 450%."
msgstr ""
-#: data/default/buildings.ruleset:690 data/civ2/buildings.ruleset:654
+#: data/default/buildings.ruleset:689 data/civ2/buildings.ruleset:654
msgid "SAM Battery"
msgstr ""
-#: data/default/buildings.ruleset:704 data/civ2/buildings.ruleset:668
+#: data/default/buildings.ruleset:703 data/civ2/buildings.ruleset:668
msgid ""
"Doubles the defense of all units inside the city when attacked by non-"
"nuclear air units."
msgstr ""
-#: data/default/buildings.ruleset:710 data/civ2/buildings.ruleset:674
+#: data/default/buildings.ruleset:709 data/civ2/buildings.ruleset:674
#: data/civ1/buildings.ruleset:489
msgid "SDI Defense"
msgstr ""
-#: data/default/buildings.ruleset:724 data/civ2/buildings.ruleset:688
+#: data/default/buildings.ruleset:723 data/civ2/buildings.ruleset:688
#: data/civ1/buildings.ruleset:503
msgid ""
"Protects a city from attacks from Nuclear units. Nuclear attacks simply "
@@ -17159,22 +17306,22 @@ msgid ""
"missiles."
msgstr ""
-#: data/default/buildings.ruleset:733 data/civ2/buildings.ruleset:697
+#: data/default/buildings.ruleset:732 data/civ2/buildings.ruleset:697
msgid "Sewer System"
msgstr ""
-#: data/default/buildings.ruleset:748 data/civ2/buildings.ruleset:712
+#: data/default/buildings.ruleset:747 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 ""
-#: data/default/buildings.ruleset:754 data/civ2/buildings.ruleset:749
+#: data/default/buildings.ruleset:753 data/civ2/buildings.ruleset:749
#: data/civ1/buildings.ruleset:512
msgid "Space Component"
msgstr ""
-#: data/default/buildings.ruleset:769 data/civ2/buildings.ruleset:763
+#: data/default/buildings.ruleset:768 data/civ2/buildings.ruleset:763
#: data/civ1/buildings.ruleset:526
msgid ""
"Space Components can be differentiated into Propulsion and Fuel Components. "
@@ -17185,12 +17332,12 @@ msgid ""
"have been built by any player."
msgstr ""
-#: data/default/buildings.ruleset:779 data/civ2/buildings.ruleset:773
+#: data/default/buildings.ruleset:778 data/civ2/buildings.ruleset:773
#: data/civ1/buildings.ruleset:536
msgid "Space Module"
msgstr ""
-#: data/default/buildings.ruleset:794 data/civ2/buildings.ruleset:787
+#: data/default/buildings.ruleset:793 data/civ2/buildings.ruleset:787
#: data/civ1/buildings.ruleset:550
msgid ""
"Space Modules are the most expensive parts of spaceships. There are three "
@@ -17210,12 +17357,12 @@ msgid ""
"have been built by any player."
msgstr ""
-#: data/default/buildings.ruleset:813 data/civ2/buildings.ruleset:806
+#: data/default/buildings.ruleset:812 data/civ2/buildings.ruleset:806
#: data/civ1/buildings.ruleset:569
msgid "Space Structural"
msgstr ""
-#: data/default/buildings.ruleset:828 data/civ2/buildings.ruleset:820
+#: data/default/buildings.ruleset:827 data/civ2/buildings.ruleset:820
#: data/civ1/buildings.ruleset:583
msgid ""
"Space Structurals form the base of your spaceship. All other spaceship "
@@ -17226,33 +17373,33 @@ msgid ""
"have been built by any player."
msgstr ""
-#: data/default/buildings.ruleset:838 data/civ2/buildings.ruleset:830
+#: data/default/buildings.ruleset:837 data/civ2/buildings.ruleset:830
msgid "Stock Exchange"
msgstr ""
-#: data/default/buildings.ruleset:854 data/civ2/buildings.ruleset:846
+#: data/default/buildings.ruleset:853 data/civ2/buildings.ruleset:846
#, no-c-format
msgid ""
"Together with a Marketplace and a Bank, a Stock Exchange boosts tax and "
"luxury production in a city by 150%."
msgstr ""
-#: data/default/buildings.ruleset:860 data/civ2/buildings.ruleset:852
+#: data/default/buildings.ruleset:859 data/civ2/buildings.ruleset:852
msgid "Super Highways"
msgstr ""
-#: data/default/buildings.ruleset:875 data/civ2/buildings.ruleset:867
+#: data/default/buildings.ruleset:874 data/civ2/buildings.ruleset:867
#, no-c-format
msgid ""
"Increases trade resources by 50% on all squares with roads or railroads."
msgstr ""
"Increases trade resources by 50% on all squares with roads or railways."
-#: data/default/buildings.ruleset:883 data/civ2/buildings.ruleset:873
+#: data/default/buildings.ruleset:882 data/civ2/buildings.ruleset:873
msgid "Supermarket"
msgstr ""
-#: data/default/buildings.ruleset:898 data/civ2/buildings.ruleset:888
+#: data/default/buildings.ruleset:897 data/civ2/buildings.ruleset:888
#, no-c-format
msgid ""
"Increases the food resources by 50% on each farmland square which is being "
@@ -17260,12 +17407,12 @@ msgid ""
"a second time."
msgstr ""
-#: data/default/buildings.ruleset:905 data/civ2/buildings.ruleset:895
+#: data/default/buildings.ruleset:904 data/civ2/buildings.ruleset:895
#: data/civ1/buildings.ruleset:593
msgid "Temple"
msgstr ""
-#: data/default/buildings.ruleset:919 data/civ2/buildings.ruleset:909
+#: data/default/buildings.ruleset:918 data/civ2/buildings.ruleset:909
#: data/civ1/buildings.ruleset:607
msgid ""
"Makes one unhappy citizen content. Both the Mysticism advance and the "
@@ -17273,81 +17420,81 @@ msgid ""
"citizens are made content."
msgstr ""
-#: data/default/buildings.ruleset:926 data/civ2/buildings.ruleset:916
+#: data/default/buildings.ruleset:925 data/civ2/buildings.ruleset:916
#: data/civ1/buildings.ruleset:614 data/default/techs.ruleset:742
#: data/civ2/techs.ruleset:727 data/civ1/techs.ruleset:723
msgid "University"
msgstr ""
-#: data/default/buildings.ruleset:942
+#: data/default/buildings.ruleset:941
#, no-c-format
msgid ""
"Together with a Library, a University increases the science production of a "
"city by 250%."
msgstr ""
-#: data/default/buildings.ruleset:948 data/civ2/buildings.ruleset:938
+#: data/default/buildings.ruleset:947 data/civ2/buildings.ruleset:938
#: data/civ1/buildings.ruleset:636
msgid "Apollo Program"
msgstr ""
-#: data/default/buildings.ruleset:962 data/civ2/buildings.ruleset:952
+#: data/default/buildings.ruleset:961 data/civ2/buildings.ruleset:952
msgid ""
"Entire map becomes visible for the player who owns it. It allows all "
"players to start building spaceship parts (assuming they have researched the "
"necessary technologies)."
msgstr ""
-#: data/default/buildings.ruleset:969 data/civ2/buildings.ruleset:959
+#: data/default/buildings.ruleset:968 data/civ2/buildings.ruleset:959
msgid "A.Smith's Trading Co."
msgstr ""
-#: data/default/buildings.ruleset:983
+#: data/default/buildings.ruleset:982
msgid ""
"City improvements which would normally have an upkeep of 1 are free of "
"upkeep, for all your cities."
msgstr ""
-#: data/default/buildings.ruleset:989 data/civ2/buildings.ruleset:979
+#: data/default/buildings.ruleset:988 data/civ2/buildings.ruleset:979
#: data/civ1/buildings.ruleset:655
msgid "Colossus"
msgstr ""
-#: data/default/buildings.ruleset:1003 data/civ2/buildings.ruleset:993
+#: data/default/buildings.ruleset:1002 data/civ2/buildings.ruleset:993
#: data/civ1/buildings.ruleset:669
msgid ""
"Each square around the city where this wonder is built that is already "
"generating some trade produces one extra trade resource."
msgstr ""
-#: data/default/buildings.ruleset:1009 data/civ2/buildings.ruleset:999
+#: data/default/buildings.ruleset:1008 data/civ2/buildings.ruleset:999
#: data/civ1/buildings.ruleset:675
msgid "Copernicus' Observatory"
msgstr ""
-#: data/default/buildings.ruleset:1024 data/civ2/buildings.ruleset:1180
+#: data/default/buildings.ruleset:1023 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 ""
-#: data/default/buildings.ruleset:1029 data/civ2/buildings.ruleset:1019
+#: data/default/buildings.ruleset:1028 data/civ2/buildings.ruleset:1019
#: data/civ1/buildings.ruleset:695
msgid "Cure For Cancer"
msgstr ""
-#: data/default/buildings.ruleset:1043
+#: data/default/buildings.ruleset:1042
msgid ""
"This stunning technological achievement makes one unhappy citizen content in "
"all your cities."
msgstr ""
-#: data/default/buildings.ruleset:1051 data/civ2/buildings.ruleset:1039
+#: data/default/buildings.ruleset:1050 data/civ2/buildings.ruleset:1039
#: data/civ1/buildings.ruleset:715
msgid "Darwin's Voyage"
msgstr ""
-#: data/default/buildings.ruleset:1065 data/civ2/buildings.ruleset:1053
+#: data/default/buildings.ruleset:1064 data/civ2/buildings.ruleset:1053
#: data/civ1/buildings.ruleset:729
msgid ""
"Charles Darwin's voyage sparked the discovery of the evolution of the "
@@ -17355,43 +17502,43 @@ msgid ""
"technology advances."
msgstr ""
-#: data/default/buildings.ruleset:1072 data/civ2/buildings.ruleset:1060
+#: data/default/buildings.ruleset:1071 data/civ2/buildings.ruleset:1060
msgid "Eiffel Tower"
msgstr ""
-#: data/default/buildings.ruleset:1087
+#: data/default/buildings.ruleset:1086
#, no-c-format
msgid ""
"Your reputation and goodwill among other nations is recovered twice as fast."
msgstr ""
-#: data/default/buildings.ruleset:1093 data/civ2/buildings.ruleset:1081
+#: data/default/buildings.ruleset:1092 data/civ2/buildings.ruleset:1081
#: data/civ1/buildings.ruleset:736
msgid "Great Library"
msgstr ""
-#: data/default/buildings.ruleset:1107 data/civ2/buildings.ruleset:1095
+#: data/default/buildings.ruleset:1106 data/civ2/buildings.ruleset:1095
#: data/civ1/buildings.ruleset:750
msgid ""
"The civilization which builds the Great Library gets every advance that at "
"least two other civilizations have achieved."
msgstr ""
-#: data/default/buildings.ruleset:1113 data/civ2/buildings.ruleset:1101
+#: data/default/buildings.ruleset:1112 data/civ2/buildings.ruleset:1101
#: data/civ1/buildings.ruleset:756
msgid "Great Wall"
msgstr ""
-#: data/default/buildings.ruleset:1127
+#: data/default/buildings.ruleset:1126
msgid "Works as a City Wall in all your cities."
msgstr ""
-#: data/default/buildings.ruleset:1135 data/civ2/buildings.ruleset:1122
+#: data/default/buildings.ruleset:1134 data/civ2/buildings.ruleset:1122
#: data/civ1/buildings.ruleset:777
msgid "Hanging Gardens"
msgstr ""
-#: data/default/buildings.ruleset:1149 data/civ2/buildings.ruleset:1136
+#: data/default/buildings.ruleset:1148 data/civ2/buildings.ruleset:1136
#: data/civ1/buildings.ruleset:791
msgid ""
"Makes one content citizen happy in every city. Makes two extra content "
@@ -17401,96 +17548,96 @@ msgid ""
"them content instead)."
msgstr ""
-#: data/default/buildings.ruleset:1158 data/civ2/buildings.ruleset:1145
+#: data/default/buildings.ruleset:1157 data/civ2/buildings.ruleset:1145
#: data/civ1/buildings.ruleset:800
msgid "Hoover Dam"
msgstr ""
-#: data/default/buildings.ruleset:1173 data/civ2/buildings.ruleset:1159
+#: data/default/buildings.ruleset:1172 data/civ2/buildings.ruleset:1159
msgid ""
"Works as if you had a Hydro Plant in every city. (This reduces pollution "
"and increases the effects of Factories and Mfg. Plants.)"
msgstr ""
-#: data/default/buildings.ruleset:1179 data/civ2/buildings.ruleset:1165
+#: data/default/buildings.ruleset:1178 data/civ2/buildings.ruleset:1165
#: data/civ1/buildings.ruleset:822
msgid "Isaac Newton's College"
msgstr ""
-#: data/default/buildings.ruleset:1194
+#: data/default/buildings.ruleset:1193
#, no-c-format
msgid ""
"Boosts science production by 100% in every city you control that has a "
"University."
msgstr ""
-#: data/default/buildings.ruleset:1200 data/civ2/buildings.ruleset:1185
+#: data/default/buildings.ruleset:1199 data/civ2/buildings.ruleset:1185
#: data/civ1/buildings.ruleset:842
msgid "J.S. Bach's Cathedral"
msgstr ""
-#: data/default/buildings.ruleset:1214 data/civ2/buildings.ruleset:1199
+#: data/default/buildings.ruleset:1213 data/civ2/buildings.ruleset:1199
msgid "Makes two unhappy citizens content in every city."
msgstr ""
-#: data/default/buildings.ruleset:1219 data/civ2/buildings.ruleset:1204
+#: data/default/buildings.ruleset:1218 data/civ2/buildings.ruleset:1204
msgid "King Richard's Crusade"
msgstr ""
-#: data/default/buildings.ruleset:1233 data/civ2/buildings.ruleset:1218
+#: data/default/buildings.ruleset:1232 data/civ2/buildings.ruleset:1218
msgid ""
"Adds one extra shield resource on every square around the city where it is "
"built."
msgstr ""
-#: data/default/buildings.ruleset:1239 data/civ2/buildings.ruleset:1224
+#: data/default/buildings.ruleset:1238 data/civ2/buildings.ruleset:1224
msgid "Leonardo's Workshop"
msgstr ""
-#: data/default/buildings.ruleset:1253 data/civ2/buildings.ruleset:1238
+#: data/default/buildings.ruleset:1252 data/civ2/buildings.ruleset:1238
msgid "Upgrades one obsolete unit per game turn."
msgstr ""
-#: data/default/buildings.ruleset:1258 data/civ2/buildings.ruleset:1243
+#: data/default/buildings.ruleset:1257 data/civ2/buildings.ruleset:1243
#: data/civ1/buildings.ruleset:862
msgid "Lighthouse"
msgstr ""
-#: data/default/buildings.ruleset:1273
+#: data/default/buildings.ruleset:1272
msgid ""
"Gives all your sea units 1 additional movement point and eliminates the risk "
"of losing Triremes on the high seas. Makes all your new sea units veterans "
"(for all your cities)."
msgstr ""
-#: data/default/buildings.ruleset:1280 data/civ2/buildings.ruleset:1264
+#: data/default/buildings.ruleset:1279 data/civ2/buildings.ruleset:1264
#: data/civ1/buildings.ruleset:885
msgid "Magellan's Expedition"
msgstr ""
-#: data/default/buildings.ruleset:1295
+#: data/default/buildings.ruleset:1294
msgid "Gives all your sea units 2 additional movement points."
msgstr ""
-#: data/default/buildings.ruleset:1300 data/civ2/buildings.ruleset:1283
+#: data/default/buildings.ruleset:1299 data/civ2/buildings.ruleset:1283
#: data/civ1/buildings.ruleset:904
msgid "Manhattan Project"
msgstr ""
-#: data/default/buildings.ruleset:1318 data/civ2/buildings.ruleset:1301
+#: data/default/buildings.ruleset:1317 data/civ2/buildings.ruleset:1301
msgid "Marco Polo's Embassy"
msgstr ""
-#: data/default/buildings.ruleset:1332 data/civ2/buildings.ruleset:1315
+#: data/default/buildings.ruleset:1331 data/civ2/buildings.ruleset:1315
msgid "The player who owns it gets an embassy with all players."
msgstr ""
-#: data/default/buildings.ruleset:1337 data/civ2/buildings.ruleset:1320
+#: data/default/buildings.ruleset:1336 data/civ2/buildings.ruleset:1320
#: data/civ1/buildings.ruleset:922
msgid "Michelangelo's Chapel"
msgstr ""
-#: data/default/buildings.ruleset:1351 data/civ2/buildings.ruleset:1334
+#: data/default/buildings.ruleset:1350 data/civ2/buildings.ruleset:1334
msgid ""
"Counts as having a Cathedral in each of your cities. This makes 3 unhappy "
"citizens content in each city. The discovery of Theology increases the "
@@ -17499,51 +17646,51 @@ msgid ""
"the number of unhappy citizens made content."
msgstr ""
-#: data/default/buildings.ruleset:1361 data/civ2/buildings.ruleset:1344
+#: data/default/buildings.ruleset:1360 data/civ2/buildings.ruleset:1344
#: data/civ1/buildings.ruleset:941
msgid "Oracle"
msgstr ""
-#: data/default/buildings.ruleset:1375
+#: data/default/buildings.ruleset:1374
msgid "Makes two of your unhappy citizens content in every city with a temple."
msgstr ""
-#: data/default/buildings.ruleset:1380 data/civ2/buildings.ruleset:1363
+#: data/default/buildings.ruleset:1379 data/civ2/buildings.ruleset:1363
#: data/civ1/buildings.ruleset:960
msgid "Pyramids"
msgstr ""
-#: data/default/buildings.ruleset:1394
+#: data/default/buildings.ruleset:1393
msgid ""
"The amount of stored food lost when one of your cities grows or shrinks is "
"reduced by 25%. This helps a city to grow faster and more easily withstand "
"famine. Cumulative with Granary."
msgstr ""
-#: data/default/buildings.ruleset:1401 data/civ2/buildings.ruleset:1382
+#: data/default/buildings.ruleset:1400 data/civ2/buildings.ruleset:1382
#: data/civ1/buildings.ruleset:981
msgid "SETI Program"
msgstr ""
-#: data/default/buildings.ruleset:1415
+#: data/default/buildings.ruleset:1414
msgid "Boosts science production in each city with a Research Lab by 100%. "
msgstr ""
-#: data/default/buildings.ruleset:1420 data/civ2/buildings.ruleset:1402
+#: data/default/buildings.ruleset:1419 data/civ2/buildings.ruleset:1402
#: data/civ1/buildings.ruleset:1001
msgid "Shakespeare's Theatre"
msgstr ""
-#: data/default/buildings.ruleset:1434 data/civ2/buildings.ruleset:1416
+#: data/default/buildings.ruleset:1433 data/civ2/buildings.ruleset:1416
#: data/civ1/buildings.ruleset:1015
msgid "Makes all unhappy citizens content, in the city where it is located."
msgstr ""
-#: data/default/buildings.ruleset:1439 data/civ2/buildings.ruleset:1421
+#: data/default/buildings.ruleset:1438 data/civ2/buildings.ruleset:1421
msgid "Statue of Liberty"
msgstr ""
-#: data/default/buildings.ruleset:1453 data/civ2/buildings.ruleset:1435
+#: data/default/buildings.ruleset:1452 data/civ2/buildings.ruleset:1435
#: data/civ1/buildings.ruleset:974 data/civ1/buildings.ruleset:1034
msgid ""
"Allows you to choose any government, including those that have not yet been "
@@ -17551,42 +17698,42 @@ msgid ""
"Anarchy."
msgstr ""
-#: data/default/buildings.ruleset:1460 data/civ2/buildings.ruleset:1442
+#: data/default/buildings.ruleset:1459 data/civ2/buildings.ruleset:1442
msgid "Sun Tzu's War Academy"
msgstr ""
-#: data/default/buildings.ruleset:1474
+#: data/default/buildings.ruleset:1473
msgid ""
"All your new ground units start at the first veteran level. The chance of a "
"unit getting the next veteran level after a battle increases by half."
msgstr ""
-#: data/default/buildings.ruleset:1481 data/civ2/buildings.ruleset:1463
+#: data/default/buildings.ruleset:1480 data/civ2/buildings.ruleset:1463
#: data/civ1/buildings.ruleset:1020
msgid "United Nations"
msgstr ""
-#: data/default/buildings.ruleset:1495
+#: data/default/buildings.ruleset:1494
msgid "All your units regain two extra hitpoints per turn."
msgstr ""
-#: data/default/buildings.ruleset:1508 data/civ2/buildings.ruleset:1490
+#: data/default/buildings.ruleset:1507 data/civ2/buildings.ruleset:1490
#: data/civ1/buildings.ruleset:1046
msgid "Women's Suffrage"
msgstr ""
-#: data/default/buildings.ruleset:1522 data/civ2/buildings.ruleset:1504
+#: data/default/buildings.ruleset:1521 data/civ2/buildings.ruleset:1504
msgid ""
"Counts as a Police Station in every city. (That is, for each city, reduces "
"unhappiness for military units outside the city by 2 under Democracy and 1 "
"under Republic. This wonder has no effect under other governments.)"
msgstr ""
-#: data/default/buildings.ruleset:1533
+#: data/default/buildings.ruleset:1532
msgid "Coinage"
msgstr ""
-#: data/default/buildings.ruleset:1554
+#: data/default/buildings.ruleset:1553
msgid ""
"This is not a normal improvement. Instead, setting a city's production to "
"Coinage means its shield production is converted to tax output (money, "
@@ -17939,11 +18086,15 @@ msgstr ""
msgid "?citystyle:Industrial"
msgstr ""
-#: data/default/cities.ruleset:139 data/civ2/cities.ruleset:150
+#: data/default/cities.ruleset:139
+msgid "?citystyle:ElectricAge"
+msgstr ""
+
+#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:150
msgid "?citystyle:Modern"
msgstr ""
-#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:161
+#: data/default/cities.ruleset:161 data/civ2/cities.ruleset:161
msgid "?citystyle:PostModern"
msgstr ""
diff --git a/po/eo.gmo b/po/eo.gmo
index 36acecc..2291770 100644
Binary files a/po/eo.gmo and b/po/eo.gmo differ
diff --git a/po/eo.po b/po/eo.po
index 078ed23..0aa283b 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: it\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-29 21:13+0900\n"
+"POT-Creation-Date: 2009-11-22 21:37+0100\n"
"PO-Revision-Date: 2008-07-10 17:52+0200\n"
"Last-Translator: Antonio Codazzi <f_sophia at libero.it>\n"
"Language-Team: Esperanto <eo at li.org>\n"
@@ -73,21 +73,21 @@ msgstr "?obsolete:A"
msgid "?redundant:*"
msgstr "?redundant:*"
-#: common/connection.c:515
+#: common/connection.c:518
#, c-format
msgid "%s from %s"
msgstr "%s el %s"
-#: common/connection.c:521
+#: common/connection.c:524
msgid " (connection incomplete)"
msgstr " (nekompleta konekto)"
-#: common/connection.c:525
+#: common/connection.c:528
#, c-format
msgid " (player %s)"
msgstr " (ludanto %s)"
-#: common/connection.c:529
+#: common/connection.c:532
msgid " (observer)"
msgstr " (observanto)"
@@ -574,81 +574,81 @@ msgstr "MesaÄoj de (mal)konektado."
msgid "AI Debug messages"
msgstr ""
-#: common/player.c:732
+#: common/player.c:746
msgid "?attitude:Genocidal"
msgstr "?attitude:Genocida"
-#: common/player.c:734
+#: common/player.c:748
msgid "?attitude:Belligerent"
msgstr "?attitude:Milita"
-#: common/player.c:736
+#: common/player.c:750
msgid "?attitude:Hostile"
msgstr "?attitude:Malamika"
-#: common/player.c:738
+#: common/player.c:752
msgid "?attitude:Uncooperative"
msgstr "?attitude:Malkoopera"
-#: common/player.c:740
+#: common/player.c:754
msgid "?attitude:Uneasy"
msgstr "?attitude:Malfacila"
-#: common/player.c:742
+#: common/player.c:756
msgid "?attitude:Neutral"
msgstr "?attitude:NeÅtrala"
-#: common/player.c:744
+#: common/player.c:758
msgid "?attitude:Respectful"
msgstr "?attitude:Respekta"
-#: common/player.c:746
+#: common/player.c:760
msgid "?attitude:Helpful"
msgstr "?attitude:Koopera"
-#: common/player.c:748
+#: common/player.c:762
msgid "?attitude:Enthusiastic"
msgstr "?attitude:Entuziasma"
-#: common/player.c:750
+#: common/player.c:764
msgid "?attitude:Admiring"
msgstr "?attitude:Admiranta"
-#: common/player.c:753
+#: common/player.c:767
msgid "?attitude:Worshipful"
msgstr "?attitude:Adoranta"
-#: common/player.c:764
+#: common/player.c:778
msgid "?diplomatic_state:Armistice"
msgstr "?diplomatic_state:Armistica"
-#: common/player.c:765
+#: common/player.c:779
msgid "?diplomatic_state:War"
msgstr "?diplomatic_state:Milita"
-#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:780 client/gui-gtk-2.0/diplodlg.c:353
#: 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:Pafĉesiga"
-#: common/player.c:767 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:781 client/gui-gtk-2.0/diplodlg.c:358
#: 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:Paca"
-#: common/player.c:768 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:782 client/gui-gtk-2.0/diplodlg.c:363
#: 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:Alianca"
-#: common/player.c:769
+#: common/player.c:783
msgid "?diplomatic_state:Never met"
msgstr "?diplomatic_state:Nekonata"
-#: common/player.c:770
+#: common/player.c:784
msgid "?diplomatic_state:Team"
msgstr "?diplomatic_state:Grupa"
@@ -679,7 +679,7 @@ msgstr ""
#. TRANS: "Resources: (none)".
#: common/requirements.c:1014 common/team.c:132
#: client/gui-gtk-2.0/helpdlg.c:1055 client/gui-gtk-2.0/inteldlg.c:390
-#: client/gui-win32/helpdlg.c:586 client/gui-xaw/helpdlg.c:991
+#: client/gui-win32/helpdlg.c:592 client/gui-xaw/helpdlg.c:991
#, c-format
msgid "(none)"
msgstr "(nenio)"
@@ -705,10 +705,11 @@ msgstr "Estonta teĥnologio %d"
#: 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
#: client/gui-sdl/helpdlg.c:817 client/gui-sdl/mapview.c:962
-#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:545
-#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:735
-#: 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
+#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:544
+#: client/gui-win32/helpdlg.c:551 client/gui-win32/helpdlg.c:721
+#: client/gui-win32/helpdlg.c:741 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 "Neniu"
@@ -721,29 +722,29 @@ msgstr "Estonta teĥnologio"
msgid "(Unknown)"
msgstr "(Nekonata)"
-#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:553
#: manual/civmanual.c:224
msgid "Road"
msgstr "Vojo"
-#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:557
#: client/gui-gtk-2.0/menu.c:829 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 "Irigacio"
-#: common/terrain.c:394 common/terrain.c:572 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:567
#: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
#: data/civ1/techs.ruleset:563
msgid "Railroad"
msgstr "Fervojo"
-#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:555
msgid "Mine"
msgstr "Minejo"
-#: common/terrain.c:396 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:551 server/report.c:124
#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "Poluado"
@@ -752,7 +753,7 @@ msgstr "Poluado"
msgid "Hut"
msgstr "Kabano"
-#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:563
#: manual/civmanual.c:226
msgid "Fortress"
msgstr "Fortreso"
@@ -765,58 +766,58 @@ msgstr "Rivero"
msgid "Farmland"
msgstr "Farmo"
-#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:577
#: manual/civmanual.c:226
msgid "Airbase"
msgstr "Avia bazo"
-#: common/terrain.c:402 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:579
msgid "Fallout"
msgstr "Radioaktiveco"
-#: common/unit.c:546 client/gui-win32/plrdlg.c:337
+#: common/unit.c:549 client/gui-win32/plrdlg.c:337
msgid "Idle"
msgstr "Nenifaro"
-#: common/unit.c:556
+#: common/unit.c:559
msgid "Fortifying"
msgstr "Fortigado"
-#: common/unit.c:558
+#: common/unit.c:561
msgid "Fortified"
msgstr "Fortigita"
-#: common/unit.c:562 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
+#: common/unit.c:565 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
msgid "Sentry"
msgstr "Gardosoldato"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
+#: common/unit.c:569 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
#: client/gui-win32/menu.c:370 client/gui-xaw/menu.c:185
msgid "Pillage"
msgstr "Disrabado"
-#: common/unit.c:568 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
+#: common/unit.c:571 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
msgid "Goto"
msgstr "Iru al"
-#: common/unit.c:570
+#: common/unit.c:573
msgid "Explore"
msgstr "Esploru"
-#: common/unit.c:572 manual/civmanual.c:224
+#: common/unit.c:575 manual/civmanual.c:224
msgid "Transform"
msgstr "Transformu"
-#: common/unit.c:584 client/text.c:157 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:587 client/text.c:157 client/gui-sdl/citydlg.c:1972
#: client/gui-win32/citydlg.c:1257 client/gui-xaw/citydlg.c:1423
msgid "Unknown"
msgstr "Nekonata"
-#: common/unit.c:1022
+#: common/unit.c:1025
msgid "Moves"
msgstr "Movoj"
-#: common/unit.c:1571
+#: common/unit.c:1574
#, c-format
msgid ""
"Upgrade %s to %s for %d gold?\n"
@@ -825,12 +826,12 @@ msgstr ""
"Ĉu vi dezira Äisdatigi %s al %s per %d oraj moneroj?\n"
"La Åtata kaso entenas %d orajn monerojn."
-#: common/unit.c:1579
+#: common/unit.c:1582
#, c-format
msgid "Sorry, cannot upgrade %s (yet)."
msgstr "BedaÅrinde, estas neeble Äisdatigi %s (ankoraÅ)."
-#: common/unit.c:1585
+#: common/unit.c:1588
#, c-format
msgid ""
"Upgrading %s to %s costs %d gold.\n"
@@ -839,11 +840,11 @@ msgstr ""
"Äœisdatigo de %s al %s necesigas %d orajn monerojn.\n"
"La Åtata kaso entenas %d orajn monerojn."
-#: common/unit.c:1594
+#: common/unit.c:1597
msgid "You can only upgrade units in your cities."
msgstr "Vi povas Äisdatigi nur unuojn en viaj urboj."
-#: common/unit.c:1598
+#: common/unit.c:1601
#, c-format
msgid "Upgrading this %s would strand units it transports."
msgstr ""
@@ -876,11 +877,11 @@ msgstr "Atombomboj"
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1404
+#: common/unittype.c:349 client/helpdata.c:1412
msgid " and "
msgstr " kaj "
-#: common/unittype.c:355 client/helpdata.c:1390
+#: common/unittype.c:355 client/helpdata.c:1398
msgid "?and:, "
msgstr "?and:, "
@@ -1048,70 +1049,70 @@ msgstr "Malplena operando por \"%s\".\n"
msgid "Missing argument for \"%s\".\n"
msgstr "Mankanta operando por \"%s\".\n"
-#: utility/shared.c:501
+#: utility/shared.c:514
#, c-format
msgid "%d BC"
msgstr "%d A.K."
-#: utility/shared.c:503
+#: utility/shared.c:516
#, c-format
msgid "%d AD"
msgstr "%d P.K."
-#: utility/shared.c:924
+#: utility/shared.c:937
msgid "FREECIV_PATH is set but empty; using default path instead."
msgstr ""
-#: utility/shared.c:1028
+#: utility/shared.c:1041
#, c-format
msgid "Could not read data directory %s: %s."
msgstr ""
-#: utility/shared.c:1279
+#: utility/shared.c:1292
msgid "The data path may be set via the environment variable FREECIV_PATH."
msgstr ""
-#: utility/shared.c:1281
+#: utility/shared.c:1294
#, c-format
msgid "Current data path is: \"%s\""
msgstr ""
-#: utility/shared.c:1283
+#: utility/shared.c:1296
#, c-format
msgid "The \"%s\" file is required ... aborting!"
msgstr ""
-#: utility/shared.c:1460
+#: utility/shared.c:1485
#, c-format
msgid "%s: Fatal error: you're trying to run me as superuser!\n"
msgstr ""
"%s: Neriparebla eraro: Freeciv ne povas esti lanĉita de la ĉefuzanto!\n"
-#: utility/shared.c:1462
+#: utility/shared.c:1487
msgid "Use a non-privileged account instead.\n"
msgstr "Uzu normala uzanto.\n"
-#: utility/shared.c:1478
+#: utility/shared.c:1503
msgid "exact match"
msgstr "ekzakta kongruo"
-#: utility/shared.c:1479
+#: utility/shared.c:1504
msgid "only match"
msgstr "nur simpla kongruo"
-#: utility/shared.c:1480
+#: utility/shared.c:1505
msgid "ambiguous"
msgstr "ambigua"
-#: utility/shared.c:1481
+#: utility/shared.c:1506
msgid "empty"
msgstr "malplena"
-#: utility/shared.c:1482
+#: utility/shared.c:1507
msgid "too long"
msgstr "tro longa"
-#: utility/shared.c:1483
+#: utility/shared.c:1508
msgid "non-match"
msgstr "neniu kongruo"
@@ -1140,22 +1141,22 @@ msgstr "La %s komencis la preparadon de la %s en %s."
msgid "%s is selling %s (not needed) for %d."
msgstr "%s plenumas la vendon de %s (ne plu necesa) por %d oraj moneroj."
-#: ai/advdiplomacy.c:280
+#: ai/advdiplomacy.c:300
#, c-format
msgid "*%s (AI)* In away mode AI can't sign such a treaty."
msgstr "*%s (IA)* En \"for\" moduso, la AI ne povas subskribi traktaton."
-#: ai/advdiplomacy.c:290
+#: ai/advdiplomacy.c:310
#, c-format
msgid "*%s (AI)* First break alliance with %s, %s."
msgstr "*%s (IA)* AntaÅe rompu aliancon kun %s, %s."
-#: ai/advdiplomacy.c:303
+#: ai/advdiplomacy.c:322
#, c-format
msgid "*%s (AI)* Let us first cease hostilies, %s."
msgstr "*%s (IA)* AntaÅe ĉesigu ni la militon, %s."
-#: ai/advdiplomacy.c:308
+#: ai/advdiplomacy.c:327
#, c-format
msgid ""
"*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
@@ -1164,47 +1165,47 @@ msgstr ""
"*%s (IA)* AntaÅe mi deziras konstati se vi tenos la nunan pafĉesigon plue, %"
"s."
-#: ai/advdiplomacy.c:331
+#: ai/advdiplomacy.c:350
#, c-format
msgid "*%s (AI)* I simply do not trust you with an alliance yet, %s."
msgstr "*%s (IA)* Mi ne kredas ankoraÅ je alianco kun vi, %s."
-#: ai/advdiplomacy.c:424
+#: ai/advdiplomacy.c:443
#, c-format
msgid "*%s (AI)* I do not know the city you mention."
msgstr "*%s (AI)* Mi ne konas la urbon kiun vi citis."
-#: ai/advdiplomacy.c:454
+#: ai/advdiplomacy.c:473
#, c-format
msgid "*%s (AI)* Sorry, sharing vision with you is not safe."
msgstr "*%s (IA)* Mi bedaÅras, sed komuna vido kun vi ne estas sendanÄera."
-#: ai/advdiplomacy.c:560
+#: ai/advdiplomacy.c:579
#, c-format
msgid "*%s (AI)* This deal was not very good for us, %s!"
msgstr "*%s (AI)* Tiu ĉi renkontiÄo ne estis tre bona por vi, %s!"
-#: ai/advdiplomacy.c:582
+#: ai/advdiplomacy.c:601
#, c-format
msgid "*%s (AI)* Welcome into our alliance %s!"
msgstr "*%s (IA)* Bonvenon en nia alianco, %s!"
-#: ai/advdiplomacy.c:586
+#: ai/advdiplomacy.c:605
#, c-format
msgid "*%s (AI)* Yes, may we forever stand united, %s."
msgstr "*%s (IA)* Jes, esperu ni ke ni estos ĉiam unuiÄintaj, %s"
-#: ai/advdiplomacy.c:593
+#: ai/advdiplomacy.c:612
#, c-format
msgid "*%s (AI)* Yes, peace in our time!"
msgstr "*%s (IA)* Jes, paco estu!"
-#: ai/advdiplomacy.c:598
+#: ai/advdiplomacy.c:617
#, c-format
msgid "*%s (AI)* Agreed. No more hostilities, %s."
msgstr "*%s (IA)* Konsentite! Ne plu malamikeco, %s."
-#: ai/advdiplomacy.c:813
+#: ai/advdiplomacy.c:832
#, c-format
msgid ""
"*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
@@ -1213,22 +1214,22 @@ msgstr ""
"*%s (AI)* Saluton, %s! Mi povas konsili al vi pafĉesigon dum la tempo necesa "
"por sin koni reciproke?"
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1116
#, c-format
msgid "*%s (AI)* Space will never be yours. "
msgstr "*%s (IA)* La kosmo neniam estos via. "
-#: ai/advdiplomacy.c:1102
+#: ai/advdiplomacy.c:1121
#, c-format
msgid "*%s (AI)* I have tolerated your vicious antics long enough! To war!"
msgstr "%s (AI)* Mi toleris viajn fiajn bufonojn tro longe! Ni ekmilitu!"
-#: ai/advdiplomacy.c:1108
+#: ai/advdiplomacy.c:1127
#, c-format
msgid "*%s (AI)* Peace in ... some other time."
msgstr "*%s (IA)* Ĉu paco?... eble alian fojon."
-#: ai/advdiplomacy.c:1113
+#: ai/advdiplomacy.c:1132
#, c-format
msgid ""
"*%s (AI)* Finally I get around to you! Did you really think you could get "
@@ -1237,17 +1238,17 @@ msgstr ""
"*%s (IA)* Finfine mi encirkligis vin! Ĉu vi opinias ke vi povas foriÄis post "
"la fiaj krimoj kiun vi faris?"
-#: ai/advdiplomacy.c:1119
+#: ai/advdiplomacy.c:1138
#, c-format
msgid "*%s (AI)* Your covert hostilities brought this war upon you!"
msgstr "*%s (AI)* Viaj kaÅitaj militaĵoj ĵetas la militon sur vi!"
-#: ai/advdiplomacy.c:1126
+#: ai/advdiplomacy.c:1145
#, c-format
msgid "*%s (AI)* Your aggression against %s was your last mistake!"
msgstr "*%s (IA)* Via agreso kontraÅ %s estis vian lastan eraro!"
-#: ai/advdiplomacy.c:1209
+#: ai/advdiplomacy.c:1229
#, c-format
msgid ""
"*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1262,14 +1263,14 @@ msgstr[1] ""
"*%s (AI)* Ni totale militos kontraŠ%s en %d vicoj por haltigi la lanĉon de "
"la kosmoÅipo."
-#: ai/advdiplomacy.c:1219
+#: ai/advdiplomacy.c:1239
#, c-format
msgid ""
"*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
"alliance!"
msgstr "*%s (AI)* Via helpo pri tio estos atendita. Vivu nia glora alianco!"
-#: ai/advdiplomacy.c:1225
+#: ai/advdiplomacy.c:1245
#, c-format
msgid ""
"*%s (AI)* %s has grossly violated his treaties with us for own gain. We "
@@ -1288,7 +1289,7 @@ msgstr[1] ""
"potence reagos en %d vicoj kaj ni atendas ke vi plenumos la aliancon kun ni "
"kaj do vi agos sammaniere!"
-#: ai/advdiplomacy.c:1238
+#: ai/advdiplomacy.c:1258
#, c-format
msgid ""
"*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1303,7 +1304,7 @@ msgstr[1] ""
"*%s (AI)* Ni intencas disrabadi la riĉan civilizon de %s. Ni ekmilitos en %d "
"vicoj."
-#: ai/advdiplomacy.c:1246
+#: ai/advdiplomacy.c:1266
#, c-format
msgid ""
"*%s (AI)* If you want a piece of the loot, feel free to join in the action!"
@@ -1311,7 +1312,7 @@ msgstr ""
"*%s (AI)* Se vi deziras parton de la kaptaĵo, estu libera pri aliÄo en la "
"agado!"
-#: ai/advdiplomacy.c:1251
+#: ai/advdiplomacy.c:1271
#, c-format
msgid ""
"*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1326,14 +1327,14 @@ msgstr[1] ""
"*%s (AI)* Ni havis tion kun %s. Buĉu ni tiun ĉi patosan civilizon! Ni "
"ekmilitos en %d vicoj."
-#: ai/advdiplomacy.c:1261
+#: ai/advdiplomacy.c:1281
#, c-format
msgid "*%s (AI)* As our glorious allies, we expect your help in this war."
msgstr ""
"*%s (AI)* kiel niaj gloraj aliancanoj, ni atendas vian helpon en tiu ĉi "
"milito."
-#: ai/advdiplomacy.c:1267
+#: ai/advdiplomacy.c:1287
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance and declare war on %s in %d turn. "
@@ -1348,7 +1349,7 @@ msgstr[1] ""
"*%s (AI)* Ni plenumos nian aliancon kaj ekmilitos kontraÅ %s en %d vicoj. "
"Ek! - Ni estas alvenantaj!"
-#: ai/advdiplomacy.c:1276
+#: ai/advdiplomacy.c:1296
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1363,7 +1364,7 @@ msgstr[1] ""
"*%s (AI)* Ni plenumos nian aliancon kun %s kaj ekmilitos kontraÅ %s en %d "
"vicoj. Ni atendas ke vi faros sammaniere."
-#: ai/advdiplomacy.c:1344
+#: ai/advdiplomacy.c:1364
#, c-format
msgid ""
"*%s (AI)* Your attempt to conquer space for yourself alone betray your true "
@@ -1372,7 +1373,7 @@ msgstr ""
"*%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:1359
+#: ai/advdiplomacy.c:1379
#, c-format
msgid ""
"*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
@@ -1380,7 +1381,7 @@ msgid ""
msgstr ""
"*%s (AI)* Via klopodo por unuflanke superregi la kosmospacon estas ege ataka."
-#: ai/advdiplomacy.c:1362
+#: ai/advdiplomacy.c:1382
#, c-format
msgid ""
"*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
@@ -1389,12 +1390,12 @@ msgstr ""
"*%s (IA)* Se vi ne haltigis la konstruadon de via kosmoÅipo, mi severe "
"dispozicios kontraÅ vi!"
-#: ai/advdiplomacy.c:1474
+#: ai/advdiplomacy.c:1494
#, c-format
msgid "*%s (AI)* Sorry, sharing vision with you is no longer safe."
msgstr "*%s (IA)* Mi bedaÅras, sed komuna vido kun vi ne estas plu senriska."
-#: ai/advdiplomacy.c:1549
+#: ai/advdiplomacy.c:1569
#, c-format
msgid ""
"*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
@@ -1403,7 +1404,7 @@ msgstr ""
"*%s (IA)* Saluton al nia plej fidela aliancano. Ni adresas al vi por detrui "
"nian malamikon, %s"
-#: ai/advdiplomacy.c:1555
+#: ai/advdiplomacy.c:1575
#, c-format
msgid ""
"*%s (AI)* Greetings ally, I see you have not yet made war with our enemy, %"
@@ -1412,7 +1413,7 @@ msgstr ""
"*%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:1562
+#: ai/advdiplomacy.c:1582
#, c-format
msgid ""
"*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1423,7 +1424,7 @@ msgstr ""
"kun nia Äismorta malamiko, %s! Tio ne estas akceptebla, kaj do nia alianco "
"ĉesas!"
-#: ai/advdiplomacy.c:1592
+#: ai/advdiplomacy.c:1612
#, c-format
msgid ""
"*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
@@ -1432,12 +1433,12 @@ msgstr ""
"*%s (IA)* Saluton, amiko. Ĉu mi povas konsili al vi kune alfronti la "
"malamikon kaj krei aliancon inter ni?"
-#: ai/advdiplomacy.c:1607
+#: ai/advdiplomacy.c:1627
#, c-format
msgid "*%s (AI)* Greetings neighbour, may we suggest more peaceful relations?"
msgstr "*%s (IA)* Saluton, najbaro. Ĉu ni povas konsili pli pacajn rilatojn?"
-#: ai/advdiplomacy.c:1622
+#: ai/advdiplomacy.c:1642
#, c-format
msgid ""
"*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
@@ -1446,7 +1447,7 @@ msgstr ""
"*%s (AI)* Ni estas naÅzitaj pro tiu ĉi senĉesa sangelverÅo. Ĉu ni povas "
"konsili ĉesigon de la milito?"
-#: ai/advdiplomacy.c:1742
+#: ai/advdiplomacy.c:1762
#, c-format
msgid ""
"*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1590,17 +1591,17 @@ msgstr ""
"La pasvorto devas enteni almenaÅ %d majusklojn, %d numerojn, kaj havi longon "
"je %d presliteroj [do preseblaj]. Provu denove."
-#: server/barbarian.c:183
+#: server/barbarian.c:184
#, c-format
msgid "%s gain a leader by the name %s. Dangerous times may lie ahead."
msgstr "%s havas novan estron nomita %s. DanÄeraj tempoj alvenos."
-#: server/barbarian.c:479
+#: server/barbarian.c:480
#, c-format
msgid "Native unrest near %s led by %s."
msgstr "Apud %s estas ribelo de indiÄenoj estrita de %s."
-#: server/barbarian.c:484
+#: server/barbarian.c:485
#, c-format
msgid "Sea raiders seen near %s!"
msgstr "Piratoj estas viditaj apud %s!"
@@ -1994,7 +1995,7 @@ msgid_plural "%s boosts research; you gain %d immediate advances."
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
+#: server/cityturn.c:1158 server/techtools.c:172
#, c-format
msgid "The %s have acquired %s from %s."
msgstr "La %s aĉetis %sn el %s."
@@ -2079,123 +2080,127 @@ msgid "Warning: the %s option is obsolete. Use -m to enable the metaserver.\n"
msgstr ""
"ATENTU: la opcio %s estas arkaika. Uzu -m por aktivigi la metaservilon.\n"
-#: server/civserver.c:189
+#: server/civserver.c:193
#, c-format
msgid "Error: unknown option '%s'\n"
msgstr "Eraro: opcio '%s' estas nekonata\n"
-#: server/civserver.c:200
+#: server/civserver.c:204
#, c-format
msgid "This is the server for %s"
msgstr "Tiu ĉi estas la servilo por %s"
-#: server/civserver.c:201
+#: server/civserver.c:205
#, c-format
msgid "You can learn a lot about Freeciv at %s"
msgstr "Vi povas multe lerni pri Freeciv ĉe %s"
-#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
+#: server/civserver.c:210 client/civclient.c:239 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
"Valid options are:\n"
msgstr ""
-#: server/civserver.c:208
+#: server/civserver.c:212
msgid ""
" -a --auth FILE\tEnable server authentication with configuration from "
"FILE.\n"
msgstr ""
-#: server/civserver.c:210
+#: server/civserver.c:214
msgid " -G --Guests\t\tAllow guests to login if auth is enabled.\n"
msgstr ""
-#: server/civserver.c:212
+#: server/civserver.c:216
msgid " -N --Newusers\tAllow new users to login if auth is enabled.\n"
msgstr ""
-#: server/civserver.c:215
+#: server/civserver.c:219
msgid " -b --bind ADDR\tListen for clients on ADDR\n"
msgstr ""
-#: server/civserver.c:217 client/civclient.c:242
+#: server/civserver.c:221 client/civclient.c:243
msgid ""
" -d, --debug NUM\tSet debug log level (0 to 4, or 4:file1,min,max:...)\n"
msgstr ""
-#: server/civserver.c:221 client/civclient.c:246
+#: server/civserver.c:225 client/civclient.c:247
msgid " -d, --debug NUM\tSet debug log level (0 to 3)\n"
msgstr ""
-#: server/civserver.c:223
+#: server/civserver.c:227
msgid " -f, --file FILE\tLoad saved game FILE\n"
msgstr ""
-#: server/civserver.c:225 client/civclient.c:249 manual/civmanual.c:382
+#: server/civserver.c:229 client/civclient.c:250 manual/civmanual.c:382
msgid " -h, --help\t\tPrint a summary of the options\n"
msgstr ""
-#: server/civserver.c:226
+#: server/civserver.c:230
+msgid " -i, --identity ADDR\tBe known as ADDR at metaserver\n"
+msgstr ""
+
+#: server/civserver.c:231
msgid " -l, --log FILE\tUse FILE as logfile\n"
msgstr ""
-#: server/civserver.c:227
+#: server/civserver.c:232
msgid " -m, --meta\t\tNotify metaserver and send server's info\n"
msgstr ""
-#: server/civserver.c:229
+#: server/civserver.c:234
msgid " -M, --Metaserver ADDR\tSet ADDR as metaserver address\n"
msgstr ""
-#: server/civserver.c:232
+#: server/civserver.c:237
msgid " -p, --port PORT\tListen for clients on port PORT\n"
msgstr ""
-#: server/civserver.c:234
+#: server/civserver.c:239
msgid " -q, --quitidle TIME\tQuit if no players for TIME seconds\n"
msgstr ""
-#: server/civserver.c:236
+#: server/civserver.c:241
msgid " -e, --exit-on-end\tWhen a game ends, exit instead of restarting\n"
msgstr ""
-#: server/civserver.c:239
+#: server/civserver.c:244
msgid " -s, --saves DIR\tSave games to directory DIR\n"
msgstr ""
-#: server/civserver.c:241
+#: server/civserver.c:246
msgid " -S, --Serverid ID\tSets the server id to ID\n"
msgstr ""
-#: server/civserver.c:243
+#: server/civserver.c:248
msgid " -P, --Ppm\t\tSave ppms of the map when saving the game.\n"
msgstr ""
-#: server/civserver.c:244
+#: server/civserver.c:249
msgid " -r, --read FILE\tRead startup script FILE\n"
msgstr ""
-#: server/civserver.c:246
+#: server/civserver.c:251
msgid " -R, --Ranklog FILE\tUse FILE as ranking logfile\n"
msgstr ""
-#: server/civserver.c:247 client/civclient.c:268 manual/civmanual.c:383
+#: server/civserver.c:252 client/civclient.c:269 manual/civmanual.c:383
msgid " -v, --version\t\tPrint the version number\n"
msgstr ""
-#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
+#: server/civserver.c:253 client/gui-gtk-2.0/gui_main.c:354
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, fuzzy, c-format
msgid "Report bugs at %s.\n"
msgstr "Bonvolu raporti pri la eraro al %s\n"
-#: server/commands.c:28
+#: server/commands.c:29
msgid "Start the game, or restart after loading a savegame."
msgstr "Komencu ludon aÅ restarigu post reÅargo de konservita ludo."
-#: server/commands.c:29
+#: server/commands.c:30
msgid ""
"This command starts the game. When starting a new game, it should be used "
"after all human players have connected, and AI players have been created (if "
@@ -2214,7 +2219,7 @@ msgstr ""
"komencis, tiu ĉi komando ne estas pli videbla, ĉar ĉiukaze Äi ne plu efikas."
#. TRANS: translate text between <> only
-#: server/commands.c:42
+#: server/commands.c:44
msgid ""
"help\n"
"help commands\n"
@@ -2228,11 +2233,11 @@ msgstr ""
"help <komand-nomo>\n"
"help <opci-nomo>"
-#: server/commands.c:47
+#: server/commands.c:49
msgid "Show help about server commands and server options."
msgstr ""
-#: server/commands.c:48
+#: server/commands.c:50
msgid ""
"With no arguments gives some introductory help. With argument \"commands\" "
"or \"options\" gives respectively a list of all commands or all options. "
@@ -2242,31 +2247,31 @@ msgid ""
"be abbreviated where unambiguous."
msgstr ""
-#: server/commands.c:63
+#: server/commands.c:66
msgid "Show a list of players, teams, connections, or scenarios."
msgstr "Vidigu la liston pri ludantoj, grupoj, konektoj kaj scenejoj."
-#: server/commands.c:64
+#: server/commands.c:67
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 ""
-#: server/commands.c:70
+#: server/commands.c:74
msgid "Quit the game and shutdown the server."
msgstr "Eliru el la ludo kaj fermu la servilon."
#. TRANS: translate text between <> only
-#: server/commands.c:74
+#: server/commands.c:79
msgid "cut <connection-name>"
msgstr "cut <konekto>"
-#: server/commands.c:75
+#: server/commands.c:80
msgid "Cut a client's connection to server."
msgstr "CUT interrompas konektadon kun servilo."
-#: server/commands.c:76
+#: server/commands.c:81
msgid ""
"Cut specified client's connection to the server, removing that client from "
"the game. If the game has not yet started that client's player is removed "
@@ -2275,7 +2280,7 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:83
+#: server/commands.c:89
msgid ""
"explain\n"
"explain <option-name>"
@@ -2283,11 +2288,11 @@ msgstr ""
"explain\n"
"explain <opcinomo>"
-#: server/commands.c:85
+#: server/commands.c:91
msgid "Explain server options."
msgstr ""
-#: server/commands.c:86
+#: server/commands.c:92
msgid ""
"The 'explain' command gives a subset of the functionality of 'help', and is "
"included for backward compatibility. With no arguments it gives a list of "
@@ -2296,7 +2301,7 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:93
+#: server/commands.c:100
msgid ""
"show\n"
"show <option-name>\n"
@@ -2306,82 +2311,83 @@ msgstr ""
"show <opcinomo>\n"
"show <antaÅmeta opcio>"
-#: server/commands.c:96
+#: server/commands.c:103
msgid "Show server options."
msgstr ""
-#: server/commands.c:97
+#: server/commands.c:104
msgid ""
"With no arguments, shows all server options (or available options, when used "
"by clients). With an argument, show only the named option, or options with "
"that prefix."
msgstr ""
-#: server/commands.c:102
+#: server/commands.c:110
msgid "wall <message>"
msgstr ""
-#: server/commands.c:103
+#: server/commands.c:111
msgid "Send message to all connections."
msgstr "Sendu mesaÄon al ĉiu konekto."
-#: server/commands.c:104
+#: server/commands.c:112
msgid ""
"For each connected client, pops up a window showing the message entered."
msgstr ""
-#: server/commands.c:108
+#: server/commands.c:117
msgid "vote yes|no [vote number]"
msgstr "vote yes|no [kvanto de voĉdono]"
-#: server/commands.c:109
+#: server/commands.c:118
msgid "Cast a vote."
msgstr "Voĉdonu."
-#: server/commands.c:111
+#: server/commands.c:120
#, 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."
+"A player with basic 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."
msgstr ""
-#: server/commands.c:121
+#: server/commands.c:131
msgid ""
"debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
"<player> | timing | info]"
msgstr ""
-#: server/commands.c:123
+#: server/commands.c:133
msgid "Turn on or off AI debugging of given entity."
msgstr ""
-#: server/commands.c:124
+#: server/commands.c:134
msgid ""
"Print AI debug information about given entity and turn continous debugging "
"output for this entity on or off."
msgstr ""
-#: server/commands.c:128
+#: server/commands.c:139
msgid "set <option-name> <value>"
msgstr "set <opcinomo> <valoro>"
-#: server/commands.c:129
+#: server/commands.c:140
msgid "Set server option."
msgstr "Agordu opciojn pri servilo."
-#: server/commands.c:132
+#: server/commands.c:144
msgid "team <player> [team]"
msgstr "team <ludanto> [grupo]"
-#: server/commands.c:133
+#: server/commands.c:145
msgid "Change, add or remove a player's team affiliation."
msgstr ""
-#: server/commands.c:134
+#: server/commands.c:146
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 "
@@ -2389,30 +2395,30 @@ msgid ""
"to achieve team victory with averaged individual scores."
msgstr ""
-#: server/commands.c:141
+#: server/commands.c:154
msgid "rulesetdir <directory>"
msgstr "rulesetdir <dosierujo>"
-#: server/commands.c:142
+#: server/commands.c:155
msgid "Choose new ruleset directory or modpack."
msgstr ""
-#: server/commands.c:143
+#: server/commands.c:156
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:149
+#: server/commands.c:163
msgid "metainfo <meta-line>"
msgstr "metainfo <lineo de metaservilo>"
-#: server/commands.c:150
+#: server/commands.c:164
msgid "Set metaserver info line."
msgstr ""
-#: server/commands.c:151
+#: server/commands.c:165
msgid ""
"Set user defined metaserver info line. If parameter is omitted,\n"
"previously set metamessage will be removed. For most of the time\n"
@@ -2421,19 +2427,19 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:158
+#: server/commands.c:173
msgid "metapatch <meta-line>"
msgstr "metapatch <lineo de metaservilo>"
-#: server/commands.c:159
+#: server/commands.c:174
msgid "Set metaserver patches line."
msgstr ""
-#: server/commands.c:165
+#: server/commands.c:181
msgid "Control metaserver connection."
msgstr ""
-#: server/commands.c:166
+#: server/commands.c:182
msgid ""
"'metaconnection ?' reports on the status of the connection to metaserver.\n"
"'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2441,33 +2447,33 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:172
+#: server/commands.c:189
msgid "metaserver <address>"
msgstr "metaserver <adreso>"
-#: server/commands.c:173
+#: server/commands.c:190
msgid "Set address (URL) for metaserver to report to."
msgstr "Agordu la adreson (URL) de la metaservilon por raporti."
#. TRANS: translate text between <> only
-#: server/commands.c:177
+#: server/commands.c:195
msgid "aitoggle <player-name>"
msgstr "aitoggle <ludantonomo>"
-#: server/commands.c:178
+#: server/commands.c:196
msgid "Toggle AI status of player."
msgstr "Mastrumu IA-staton de la ludanto."
#. TRANS: translate text between [] and <> only
-#: server/commands.c:182
+#: server/commands.c:201
msgid "take [connection-name] <player-name>"
msgstr "take [konektonomo] <ludantonomo>"
-#: server/commands.c:183
+#: server/commands.c:202
msgid "Take over a player's place in the game."
msgstr "AnstataÅu ludanton en la ludo."
-#: server/commands.c:184
+#: server/commands.c:203
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 "
@@ -2477,15 +2483,15 @@ msgid ""
msgstr ""
#. TRANS: translate text between [] only
-#: server/commands.c:192
+#: server/commands.c:212
msgid "observe [connection-name] [player-name]"
msgstr "observe [konektonomo] [ludantonomo]"
-#: server/commands.c:193
+#: server/commands.c:213
msgid "Observe a player or the whole game."
msgstr ""
-#: server/commands.c:194
+#: server/commands.c:214
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 "
@@ -2495,15 +2501,15 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:202
+#: server/commands.c:223
msgid "detach <connection-name>"
msgstr "detach <konektonomo>"
-#: server/commands.c:203
+#: server/commands.c:224
msgid "detach from a player."
msgstr "Disigu de iu ludanto."
-#: server/commands.c:204
+#: server/commands.c:225
msgid ""
"Only the console and connections with cmdlevel 'hack' can force other "
"connections to detach from a player."
@@ -2512,35 +2518,35 @@ msgstr ""
"aliajn konektojn al la disigo de iu ludanto."
#. TRANS: translate text between <> only
-#: server/commands.c:209
+#: server/commands.c:231
msgid "create <player-name>"
msgstr "create <ludantonomo>"
-#: server/commands.c:210
+#: server/commands.c:232
msgid "Create an AI player with a given name."
msgstr "Kreu IA-ludanton kun nomo."
-#: server/commands.c:211
+#: server/commands.c:233
msgid ""
"The 'create' command is only available before the game has been started."
msgstr "La komando 'create' estas uzebla nur antaÅ la komenco de la ludo."
-#: server/commands.c:215
+#: server/commands.c:238
msgid ""
"away\n"
"away"
msgstr ""
-#: server/commands.c:217
+#: server/commands.c:240
msgid "Set yourself in away mode. The AI will watch your back."
msgstr "FOR moduso. La IA anstataÅas vin dumtempe."
-#: server/commands.c:218
+#: server/commands.c:241
msgid "The AI will govern your nation but do minimal changes."
msgstr "La IA regos vian nacion sed Äi plenumos nur etajn modifojn."
#. TRANS: translate text between <> only
-#: server/commands.c:222
+#: server/commands.c:246
msgid ""
"novice\n"
"novice <player-name>"
@@ -2548,11 +2554,11 @@ msgstr ""
"novice\n"
"novice <ludantonomo>"
-#: server/commands.c:224
+#: server/commands.c:248
msgid "Set one or all AI players to 'novice'."
msgstr "Agordu unu aÅ pluraj IA-ludantoj laÅ nivelo 'novico'."
-#: server/commands.c:225
+#: server/commands.c:249
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 "
@@ -2560,7 +2566,7 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:231
+#: server/commands.c:256
msgid ""
"easy\n"
"easy <player-name>"
@@ -2568,11 +2574,11 @@ msgstr ""
"easy\n"
"easy <ludantonomo>"
-#: server/commands.c:233
+#: server/commands.c:258
msgid "Set one or all AI players to 'easy'."
msgstr "Agordu unu aÅ pluraj IA-ludantoj laÅ nivelo 'facila'."
-#: server/commands.c:234
+#: server/commands.c:259
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 "
@@ -2580,7 +2586,7 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:240
+#: server/commands.c:266
msgid ""
"normal\n"
"normal <player-name>"
@@ -2588,11 +2594,11 @@ msgstr ""
"normal\n"
"normal <ludantonomo>"
-#: server/commands.c:242
+#: server/commands.c:268
msgid "Set one or all AI players to 'normal'."
msgstr "Agordu unu aÅ pluraj IA-ludantoj laÅ nivelo 'normala'."
-#: server/commands.c:243
+#: server/commands.c:269
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 "
@@ -2600,7 +2606,7 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:249
+#: server/commands.c:276
msgid ""
"hard\n"
"hard <player-name>"
@@ -2608,11 +2614,11 @@ msgstr ""
"hard\n"
"hard <ludantonomo>"
-#: server/commands.c:251
+#: server/commands.c:278
msgid "Set one or all AI players to 'hard'."
msgstr "Agordu unu aÅ pluraj IA-ludantoj laÅ nivelo 'malfacila'."
-#: server/commands.c:252
+#: server/commands.c:279
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 "
@@ -2620,7 +2626,7 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:258
+#: server/commands.c:286
msgid ""
"experimental\n"
"experimental <player-name>"
@@ -2628,11 +2634,11 @@ msgstr ""
"experimental\n"
"experimantal <ludantonomo>"
-#: server/commands.c:260
+#: server/commands.c:288
msgid "Set one or all AI players to 'experimental'."
msgstr "Agordu unu aÅ pluraj IA-ludantoj laÅ nivelo 'eksperimenta'."
-#: server/commands.c:261
+#: server/commands.c:289
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 "
@@ -2641,7 +2647,7 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:269
+#: server/commands.c:298
msgid ""
"cmdlevel\n"
"cmdlevel <level>\n"
@@ -2655,17 +2661,19 @@ msgstr ""
"cmdlevel <nivelo> first\n"
"cmdlevel <nivelo> <konektonomo>"
-#: server/commands.c:274
+#: server/commands.c:303
msgid "Query or set command access level access."
msgstr ""
-#: server/commands.c:275
+#: server/commands.c:304
msgid ""
"The command access level controls which server commands are available\n"
"to users via the client chatline. The available levels are:\n"
" none - no commands\n"
-" info - informational commands only\n"
+" info - informational or observer commands only\n"
+" basic - commands available to players in the game\n"
" ctrl - commands that affect the game and users\n"
+" admin - commands that affect server operation\n"
" hack - *all* commands - dangerous!\n"
"With no arguments, the current command access levels are reported.\n"
"With a single argument, the level is set for all existing connections,\n"
@@ -2681,20 +2689,20 @@ msgid ""
"now takes connection names, not player names."
msgstr ""
-#: server/commands.c:296
+#: server/commands.c:328
msgid "If there is none, become the game organizer with increased permissions."
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:301
+#: server/commands.c:334
msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
msgstr "timeoutincrease <vico> <vicprogresado> <valoro> <valormultipliko>."
-#: server/commands.c:302
+#: server/commands.c:335
msgid "See \"help timeoutincrease\"."
msgstr "Vidu \"help timeoutincrease\"."
-#: server/commands.c:303
+#: server/commands.c:336
msgid ""
"Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
"<turn> and multiply <value> by <valuemult>. Use this command in concert "
@@ -2706,48 +2714,67 @@ msgstr ""
"estas 0 0 0 1"
#. TRANS: translate text between <> only
-#: server/commands.c:309
+#: server/commands.c:343
+msgid ""
+"cancelvote\n"
+"cancelvote <vote number>\n"
+"cancelvote all\n"
+msgstr ""
+
+#: server/commands.c:346
+msgid "Cancel a running vote.\n"
+msgstr ""
+
+#: server/commands.c:347
+msgid ""
+"With no arguments this command removes your own vote. If you have an admin "
+"access level, you can cancel any vote by vote number, or all votes with the "
+"'all' argument."
+msgstr ""
+
+#. TRANS: translate text between <> only
+#: server/commands.c:354
#, fuzzy
msgid "endgame"
msgstr "Renomu"
-#: server/commands.c:310
+#: server/commands.c:355
msgid "End the game immediately in a draw."
msgstr "Finigu tuj la ludon egalstate."
#. TRANS: translate text between <> only
-#: server/commands.c:314
+#: server/commands.c:360
#, fuzzy
msgid "surrender"
msgstr "Uzurpatoro"
-#: server/commands.c:315
+#: server/commands.c:361
msgid "Concede the game."
msgstr "Cedo la ludon."
-#: server/commands.c:316
+#: server/commands.c:362
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:322
+#: server/commands.c:369
msgid "remove <player-name>"
msgstr "remove <ludantonomo>"
-#: server/commands.c:323
+#: server/commands.c:370
msgid "Fully remove player from game."
msgstr "TUTE formovu ludanton de la ludo."
-#: server/commands.c:324
+#: server/commands.c:371
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:329
+#: server/commands.c:377
msgid ""
"save\n"
"save <file-name>"
@@ -2755,11 +2782,11 @@ msgstr ""
"save\n"
"save <dosiernomo>"
-#: server/commands.c:331
+#: server/commands.c:379
msgid "Save game to file."
msgstr "Konservu la ludon en dosiero."
-#: server/commands.c:332
+#: server/commands.c:380
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"
@@ -2770,7 +2797,7 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:341
+#: server/commands.c:390
msgid ""
"load\n"
"load <file-name>"
@@ -2778,129 +2805,129 @@ msgstr ""
"load\n"
"load <dosiernomo>"
-#: server/commands.c:343
+#: server/commands.c:392
msgid "Load game from file."
msgstr "Åœargu ludon el dosiero."
-#: server/commands.c:344
+#: server/commands.c:393
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:349
+#: server/commands.c:399
msgid "read <file-name>"
msgstr "read <dosiernomo>"
-#: server/commands.c:350
+#: server/commands.c:400
msgid "Process server commands from file."
msgstr "Plenumu komandojn de la servilo pere de dosiero."
#. TRANS: translate text between <> only
-#: server/commands.c:354
+#: server/commands.c:405
msgid "write <file-name>"
msgstr "write <dosiernomo>"
-#: server/commands.c:355
+#: server/commands.c:406
msgid "Write current settings as server commands to file."
msgstr "Skribu nunajn agordojn kiel komandoj de la servilo en dosiero."
-#: server/commands.c:359
+#: server/commands.c:411
msgid "Switch server output between 'RFC-style' and normal style."
msgstr "InterÅanÄu eligon inter 'RFC-stilo' kaj normala stilo."
-#: server/commands.c:363
+#: server/commands.c:416
msgid "Simply returns the id of the server."
msgstr "Vidigu la ID-on de la servilo."
-#: server/connecthand.c:85
+#: server/connecthand.c:109
#, c-format
msgid "Welcome to the %s Server running at %s port %d."
msgstr "Bonvenon al servilo %s plenumanta ĉe %s - pordo %d."
-#: server/connecthand.c:89
+#: server/connecthand.c:113
#, c-format
msgid "Welcome to the %s Server at port %d."
msgstr "Bonvenon al servilo %s ĉe pordo %d."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:97
+#: server/connecthand.c:121
#, fuzzy, c-format
msgid "(%d) %s: connected [%s]"
msgstr "%s estas konektita el %s."
-#: server/connecthand.c:104
+#: server/connecthand.c:128
#, c-format
msgid "Server: %s has connected from %s."
msgstr "Servilo: %s estas konektita el %s."
-#: server/connecthand.c:145
+#: server/connecthand.c:175
msgid "Couldn't attach your connection to new player."
msgstr "Estas neeble konekti vian konekton kun novan ludanto."
-#: server/connecthand.c:165
+#: server/connecthand.c:199
#, c-format
msgid "You are logged in as '%s' connected to no player."
msgstr "Vi estas konektita kiel '%s' konektita kun neniu ludanto."
-#: server/connecthand.c:169
+#: server/connecthand.c:203
#, c-format
msgid "You are logged in as '%s' connected to an anonymous player."
msgstr "Vi estas konektita kiel '%s' konektita kun anonima ludanto."
-#: server/connecthand.c:174
+#: server/connecthand.c:208
#, c-format
msgid "You are logged in as '%s' connected to %s."
msgstr "Vi estas konektita kiel '%s' konektita kun %s."
-#: server/connecthand.c:187
+#: server/connecthand.c:221
#, c-format
msgid "Turn-blocking game play: waiting on %s to finish turn..."
msgstr "LaÅvica ludo: bonvolu atendi en %s ke la turnoj estas finitaj..."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:240
+#: server/connecthand.c:274
#, fuzzy, c-format
msgid "(%d) %s: connection request [%s]"
msgstr "Konektopeto de %s el %s"
-#: server/connecthand.c:266
+#: server/connecthand.c:300
msgid "The client is missing a capability that this server needs."
msgstr ""
-#: server/connecthand.c:268 server/connecthand.c:279
+#: server/connecthand.c:302 server/connecthand.c:313
#, fuzzy, c-format
msgid "(%d) %s rejected: mismatched capabilities!"
msgstr "%s estis rifuzita: nekongruaj mandatoj."
-#: server/connecthand.c:277
+#: server/connecthand.c:311
msgid "This server is missing a capability that the client needs."
msgstr ""
-#: server/connecthand.c:290
+#: server/connecthand.c:324
#, fuzzy
msgid "The username is invalid!"
msgstr "Tiu nomo ne estas permesita."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:292
+#: server/connecthand.c:326
#, fuzzy, c-format
msgid "(%d) %s rejected: invalid username [%s]"
msgstr "%s estis rifuzita: nevalida nomo [%s]."
-#: server/connecthand.c:303
+#: server/connecthand.c:337
#, fuzzy
msgid "Your username is already connected!"
msgstr "Via kosmoÅipo jam ekflugis!"
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:305
+#: server/connecthand.c:339
#, fuzzy, c-format
msgid "(%d) %s rejected: duplicate username [%s]"
msgstr "%s estis rifuzita: duplikita nomo [%s]."
-#: server/connecthand.c:335 server/connecthand.c:344
+#: server/connecthand.c:369 server/connecthand.c:378
#, c-format
msgid "Lost connection: %s."
msgstr "Konekto estis perdita: %s."
@@ -2917,116 +2944,116 @@ msgstr "BONE. Normala stilo estas ebligita."
msgid "For introductory help, type 'help'."
msgstr "Por helpo, tajpu 'help'."
-#: server/diplhand.c:164
+#: server/diplhand.c:167
#, c-format
msgid "The %s can't accept %s."
msgstr "La %s ne povas akcepti %s."
-#: server/diplhand.c:176
+#: server/diplhand.c:179
#, c-format
msgid "You don't have tech %s, you can't accept treaty."
msgstr "Vi ne havas la teĥnologion %s, do vi ne povas akcepti la kontrakton."
-#: server/diplhand.c:185
+#: server/diplhand.c:188
msgid "City you are trying to give no longer exists, you can't accept treaty."
msgstr ""
"La urbo, kiun vi provas doni, ne ekzistas plu, do vi ne povas akcepti la "
"kontrakton."
-#: server/diplhand.c:191
+#: server/diplhand.c:194
#, c-format
msgid "You are not owner of %s, you can't accept treaty."
msgstr ""
"Vi ne estas la proprietulo de %s, do vi ne povas akcepti la kontrakton."
-#: server/diplhand.c:197 server/diplhand.c:301
+#: server/diplhand.c:200 server/diplhand.c:304
#, c-format
msgid "Your capital (%s) is requested, you can't accept treaty."
msgstr "Oni postulas vian ĉefurbon (%s), do vi ne povas akcepti la kontrakton."
-#: server/diplhand.c:224
+#: server/diplhand.c:227
msgid "You don't have enough gold, you can't accept treaty."
msgstr "Vi ne havas sufiĉe da oro, do vi ne povas akcepti la kontrakton."
-#: server/diplhand.c:256 server/diplhand.c:261
+#: server/diplhand.c:259 server/diplhand.c:264
#, c-format
msgid "A treaty containing %d clause was agreed upon."
msgid_plural "A treaty containing %d clauses was agreed upon."
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
+#: server/diplhand.c:280 server/diplhand.c:284
#, c-format
msgid "One of the cities the %s are giving away is destroyed! Treaty canceled!"
msgstr ""
"Unu el la urboj, kiujn la %s cedas, estas detruita! La kontrakto estas "
"nuligita!"
-#: server/diplhand.c:288 server/diplhand.c:293
+#: server/diplhand.c:291 server/diplhand.c:296
#, c-format
msgid "The %s no longer control %s! Treaty canceled!"
msgstr "La %s ne regas plu %sn! La kontrakto estas nuligita!"
-#: server/diplhand.c:331 server/diplhand.c:335
+#: server/diplhand.c:334 server/diplhand.c:338
#, c-format
msgid "The %s don't have the promised amount of gold! Treaty canceled!"
msgstr ""
"La %s ne havas la promesitan kvanton da oro! La kontrakto estas nuligita!"
-#: server/diplhand.c:364
+#: server/diplhand.c:367
#, fuzzy, c-format
msgid "You gave an embassy to %s."
msgstr "Vi donis komunan vidon al %s."
-#: server/diplhand.c:367
+#: server/diplhand.c:370
#, c-format
msgid "%s allowed you to create an embassy!"
msgstr ""
-#: server/diplhand.c:383
+#: server/diplhand.c:386
#, c-format
msgid "You are taught the knowledge of %s."
msgstr "Vi estis instruita pri %s."
-#: server/diplhand.c:387
+#: server/diplhand.c:390
#, c-format
msgid "The %s have acquired %s from the %s."
msgstr "La %s akiris %sn de la %s."
-#: server/diplhand.c:402
+#: server/diplhand.c:405
#, c-format
msgid "You get %d gold."
msgstr "Vi gajnis %d ora(j) monero(j)."
#. TRANS: ... Polish worldmap.
-#: server/diplhand.c:410
+#: server/diplhand.c:413
#, c-format
msgid "You receive the %s worldmap."
msgstr "Vi ricevis la mapon pri %s."
#. TRANS: ... Polish seamap.
-#: server/diplhand.c:419
+#: server/diplhand.c:422
#, c-format
msgid "You receive the %s seamap."
msgstr "Vi ricevis la marmapon pri %s."
-#: server/diplhand.c:436
+#: server/diplhand.c:439
#, c-format
msgid "You receive city of %s from %s."
msgstr "Vi ricevis la urbon de %s de %s."
-#: server/diplhand.c:441
+#: server/diplhand.c:444
#, c-format
msgid "You give city of %s to %s."
msgstr "Vi cedis la urbon de %s al %s."
-#: server/diplhand.c:454 server/diplhand.c:457
+#: server/diplhand.c:457 server/diplhand.c:460
#, c-format
msgid "You agree on a cease-fire with %s."
msgstr "Vi akordiÄis kun %s pri paf-cesigo."
#. TRANS: ... the Poles ... Polish territory.
-#: server/diplhand.c:476 server/diplhand.c:488
+#: server/diplhand.c:479 server/diplhand.c:491
#, c-format
msgid ""
"You agree on an armistice with the %s. In %d turn, it will become a peace "
@@ -3041,32 +3068,32 @@ msgstr[1] ""
"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
+#: server/diplhand.c:515 server/diplhand.c:518
#, c-format
msgid "You agree on an alliance with %s."
msgstr "Vi akordiÄis kun %s pri alianco."
-#: server/diplhand.c:524
+#: server/diplhand.c:527
#, c-format
msgid "You give shared vision to %s."
msgstr "Vi donis komunan vidon al %s."
-#: server/diplhand.c:527
+#: server/diplhand.c:530
#, c-format
msgid "%s gives you shared vision."
msgstr "%s donis komunan vidon al vi."
-#: server/diplhand.c:663
+#: server/diplhand.c:666
#, c-format
msgid "%s canceled the meeting!"
msgstr "%s nuligis renkontiÄon!"
-#: server/diplhand.c:670
+#: server/diplhand.c:673
#, c-format
msgid "Meeting with %s canceled."
msgstr "La renkontiÄo kun %s estas nuligita."
-#: server/diplhand.c:712
+#: server/diplhand.c:715
msgid "Your diplomatic envoy was decapitated!"
msgstr "Via diplomato estis senkapigita!"
@@ -3251,80 +3278,80 @@ msgid "The %s destroyed the %s in %s."
msgstr "La %s detruis la %sn en %s."
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1091
+#: server/diplomats.c:1097
#, c-format
msgid "An enemy %s has been eliminated by your %s."
msgstr "Malamikaj %s estis mortigitaj de viaj %s."
#. TRANS: <unit> ... <city> ... <diplomat>
-#: server/diplomats.c:1098
+#: server/diplomats.c:1104
#, c-format
msgid "Your %s has been eliminated defending %s against a %s."
msgstr "Viaj %s estis mortigitaj, defendante %sn kontraÅ %s."
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1106
+#: server/diplomats.c:1112
#, c-format
msgid "Your %s has been eliminated defending against a %s."
msgstr "Viaj %s estis mortigitaj dum defendado kontraÅ %s."
-#: server/diplomats.c:1119
+#: server/diplomats.c:1125
#, c-format
msgid "Your %s was eliminated by a defending %s."
msgstr "Viaj %s estis mortigitaj de defendantaj %s."
-#: server/diplomats.c:1127
+#: server/diplomats.c:1133
#, c-format
msgid "Eliminated %s %s while infiltrating %s."
msgstr "%sj %s estis mortigitaj dum enÅteliÄo en %s."
-#: server/diplomats.c:1134
+#: server/diplomats.c:1140
#, c-format
msgid "Eliminated %s %s while infiltrating our troops."
msgstr "%sj %s estis mortigitaj dum enÅteliÄo en niaj trupoj."
-#: server/diplomats.c:1185
+#: server/diplomats.c:1191
#, c-format
msgid ""
"Your %s has successfully completed the mission and returned unharmed to %s."
msgstr "Via %s plenumis la taskon kaj, sendifekta kaj sekura, revenis al %s."
-#: server/diplomats.c:1204
+#: server/diplomats.c:1210
#, c-format
msgid "Your %s was captured after completing the mission in %s."
msgstr "Via %s estis kaptita post la plenumo de la tasko en %s."
-#: server/diplomats.c:1210
+#: server/diplomats.c:1216
#, c-format
msgid "Your %s was captured after completing the mission."
msgstr "Via %s estis kaptita post la plenumo de la tasko."
-#: server/diplomats.c:1242
+#: server/diplomats.c:1248
#, c-format
msgid "You have caused an incident while bribing the %s %s."
msgstr "Vi kaÅzis diplomatan incidenton dum subaĉetado de la %sj %s."
-#: server/diplomats.c:1247
+#: server/diplomats.c:1253
#, c-format
msgid "%s has caused an incident while bribing your %s."
msgstr "%s kaÅzis diplomatan incidenton dum subaĉetado de via %s."
-#: server/diplomats.c:1254
+#: server/diplomats.c:1260
#, c-format
msgid "You have caused an incident while attempting to steal tech from %s."
msgstr "Vi kaÅzis diplomatan incidenton dum Åtelado de teÄ¥nologio de %s."
-#: server/diplomats.c:1258
+#: server/diplomats.c:1264
#, c-format
msgid "%s has caused an incident while attempting to steal tech from you."
msgstr "%s kaÅzis diplomatan incidenton dum Åtelado de teÄ¥nologio de vi."
-#: server/diplomats.c:1264
+#: server/diplomats.c:1270
#, c-format
msgid "You have caused an incident while inciting a revolt in %s."
msgstr "Vi kaÅzis diplomatan incidenton dum instigado al ribelo en %s."
-#: server/diplomats.c:1268
+#: server/diplomats.c:1274
#, c-format
msgid "%s have caused an incident while inciting a revolt in %s."
msgstr "%s kaÅzis diplomatan incidenton dum instigado al ribelo en %s."
@@ -3437,12 +3464,12 @@ msgstr ""
"viaj sciencistoj.\n"
" La laboristoj memvole grupiÄas kaj modernigas ĉiun urbon per fervojo."
-#: server/maphand.c:1418
+#: server/maphand.c:1425
#, c-format
msgid "Moved your %s due to changing terrain."
msgstr "Viaj %s estis movita pro ÅanÄo de speco de areo."
-#: server/maphand.c:1436
+#: server/maphand.c:1443
#, c-format
msgid "Disbanded your %s due to changing terrain."
msgstr "Viaj %s estis forsalutita pro ÅanÄo de grundo."
@@ -3451,7 +3478,7 @@ msgstr "Viaj %s estis forsalutita pro ÅanÄo de grundo."
msgid "Not reporting to the metaserver in this game."
msgstr "Neniu konekto kun metaservilo por tiu ĉi ludo."
-#: server/meta.c:430
+#: server/meta.c:432
#, c-format
msgid "Metaserver: bad address: [%s:%d]."
msgstr "Metaservilo: erara adreso: [%s:%d]."
@@ -3576,26 +3603,26 @@ msgid ""
msgstr ""
"Via grupano %s ekmilitis kun %s. Vi estas devigata nuligi la aliancon kun %s."
-#: server/plrhand.c:1103
+#: server/plrhand.c:1115
#, c-format
msgid "Removing player %s."
msgstr "Formovante la ludanton %s."
-#: server/plrhand.c:1105
+#: server/plrhand.c:1117
msgid "You've been removed from the game!"
msgstr "Vi estis formovita de la ludo!"
-#: server/plrhand.c:1108
+#: server/plrhand.c:1120
#, c-format
msgid "%s has been removed from the game."
msgstr "%s estis formovita de la ludo."
-#: server/plrhand.c:1153 server/plrhand.c:1158
+#: server/plrhand.c:1167 server/plrhand.c:1172
#, c-format
msgid "You have made contact with the %s, ruled by %s."
msgstr "Vi kontaktiÄis kun la %s, estritaj de %s."
-#: server/plrhand.c:1178
+#: server/plrhand.c:1192
#, c-format
msgid ""
"%s and %s meet and go to instant war. You cancel your alliance with both."
@@ -3603,31 +3630,31 @@ msgstr ""
"%s kaj %s renkontiÄis kaj tuj ekmilitis. Vi forigas vian aliancon kun ambaÅ "
"ili."
-#: server/plrhand.c:1656
+#: server/plrhand.c:1670
#, c-format
msgid "Could not throw %s into civil war - too many players"
msgstr ""
"Estas neeble ĵeti %sn en intercivitana milito - ĉar ĉeestas tro ludantoj"
-#: server/plrhand.c:1663
+#: server/plrhand.c:1677
#, fuzzy, c-format
msgid "Could not throw %s into civil war - no available nations"
msgstr ""
"Estas neeble ĵeti %sn en intercivitana milito - ĉar ĉeestas tro ludantoj"
-#: server/plrhand.c:1686
+#: server/plrhand.c:1700
#, fuzzy, c-format
msgid ""
"Your nation is thrust into civil war! %s is declared the leader of the rebel "
"states."
msgstr "Via nacio falis en intercivitana milito."
-#: server/plrhand.c:1707
+#: server/plrhand.c:1721
#, fuzzy, c-format
msgid "%s declares allegiance to %s."
msgstr "%s subskribis aliancon kun la %s."
-#: server/plrhand.c:1722
+#: server/plrhand.c:1736
#, c-format
msgid ""
"Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3831,65 +3858,65 @@ msgstr "(preparante %sn en %s (%s))\n"
msgid "Wonders of the World"
msgstr "Mirindaĵoj de la mondo"
-#: server/report.c:547
+#: server/report.c:552
msgid " sq. mi."
msgstr " kvadr. km."
-#: server/report.c:557
+#: server/report.c:562
msgid " M tons"
msgstr " M tunoj"
-#: server/report.c:562
+#: server/report.c:567
msgid " M goods"
msgstr " M da havaĵoj"
-#: server/report.c:567
+#: server/report.c:572
msgid " bulbs"
msgstr " ampoloj"
-#: server/report.c:572
+#: server/report.c:577
msgid " month"
msgid_plural " months"
msgstr[0] " monato"
msgstr[1] " monatoj"
-#: server/report.c:577
+#: server/report.c:582
msgid " ton"
msgid_plural " tons"
msgstr[0] " tuno"
msgstr[1] " tunoj"
-#: server/report.c:591
+#: server/report.c:596
msgid "st"
msgstr "a"
-#: server/report.c:593
+#: server/report.c:598
msgid "nd"
msgstr "a"
-#: server/report.c:595
+#: server/report.c:600
msgid "rd"
msgstr "a"
-#: server/report.c:597
+#: server/report.c:602
msgid "th"
msgstr "a"
-#: server/report.c:700
+#: server/report.c:705
msgid "Demography string contains invalid characters. Try \"help demography\"."
msgstr ""
-#: server/report.c:743 server/report.c:768
+#: server/report.c:748 server/report.c:773
msgid "Demographics Report:"
msgstr "Demografia raporto:"
-#: server/report.c:744
+#: server/report.c:749
msgid "Sorry, the Demographics report is unavailable."
msgstr "BedaÅrinde, la demografia raporto ne estas disponebla."
#. TRANS: <nation adjective> <government name> (<year>).
#. * E.g. "Polish Despotism (200 AD)".
-#: server/report.c:750
+#: server/report.c:755
#, fuzzy, c-format
msgid "%s %s (%s)"
msgstr "%s en %s (%s)\n"
@@ -3900,11 +3927,11 @@ msgstr "%s en %s (%s)\n"
msgid "Could not find a readable \"%s.%s\" ruleset file."
msgstr "Ne estas trovita legebla dosiero de reguloj \"%s.%s\"."
-#: server/ruleset.c:2356
+#: server/ruleset.c:2366
msgid "No barbarian nation in rulesets, at least one required!"
msgstr ""
-#: server/ruleset.c:3166
+#: server/ruleset.c:3178
msgid "Loading rulesets"
msgstr "Åœargado de la reguloj"
@@ -3919,20 +3946,20 @@ msgstr ""
"konservitaj ludoj, aÅ tio signifas ke la konservita dosiero estas nevalida. "
"Pluiru laÅ via propra risko."
-#: server/savegame.c:3588
+#: server/savegame.c:3587
msgid "Saved game is too old, at least version 1.9.0 required."
msgstr ""
"La konservitan ludon estas tro malnova, necesas almenaÅ la versio 1.9.0."
#. TRANS: Fatal error message.
-#: server/savegame.c:3815
+#: server/savegame.c:3817
msgid ""
"Saved game uses the \"classic\" terrain ruleset, and is no longer supported."
msgstr ""
"La konservitan ludon uzas la \"klasikajn\" grund-regulojn, kaj ili ne estas "
"plu subtenitaj."
-#: server/savegame.c:3824
+#: server/savegame.c:3826
#, c-format
msgid ""
"Warning: Different rulesetdirs ('%s' and '%s') are no longer supported. "
@@ -3942,7 +3969,7 @@ msgstr ""
"subtenitaj. Uzu '%s'."
#. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4051
+#: server/savegame.c:4055
#, c-format
msgid "%s had invalid nation; changing to %s."
msgstr "%s havas nevalidan nacion; ÅanÄante al %s."
@@ -3975,7 +4002,7 @@ msgstr "Interna"
msgid "Networking"
msgstr "Reta"
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:734
#: client/gui-win32/dialogs.c:532
msgid "All"
msgstr "Ĉio"
@@ -5011,11 +5038,11 @@ msgid ""
"the game."
msgstr ""
-#: server/sernet.c:150
+#: server/sernet.c:151
msgid "Server cannot read standard input. Ignoring input."
msgstr ""
-#: server/sernet.c:929
+#: server/sernet.c:933
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr ""
@@ -5089,47 +5116,47 @@ msgstr "Via kosmoÅipo jam havas la maksimuma kvanto da sunpaneloj"
msgid "Without guidance from the capital, the %s spaceship is lost!"
msgstr "Sen regado el la ĉefurbo, la %s kosmoÅipo estis perdita!"
-#: server/srv_main.c:240
+#: server/srv_main.c:242
msgid "Game ended in a draw as end year exceeded"
msgstr ""
"La ludo finis egalstate ĉar finis la jaro kiu estas specifita kiel fino."
-#: server/srv_main.c:274
+#: server/srv_main.c:276
#, c-format
msgid "The %s spaceship has arrived at Alpha Centauri."
msgstr "La %s kosmoÅipo alvenis al Alfa CentaÅro."
-#: server/srv_main.c:287 server/srv_main.c:322
+#: server/srv_main.c:289 server/srv_main.c:324
#, c-format
msgid "Team victory to %s"
msgstr "Grupa venko por %s"
-#: server/srv_main.c:297 server/srv_main.c:338
+#: server/srv_main.c:299 server/srv_main.c:340
#, c-format
msgid "Game ended in victory for %s"
msgstr "%s gajnis la ludon"
-#: server/srv_main.c:345
+#: server/srv_main.c:347
msgid "Game ended in a draw"
msgstr "La ludo finis egalstate"
-#: server/srv_main.c:461 server/srv_main.c:472
+#: server/srv_main.c:465 server/srv_main.c:476
#, c-format
msgid "Your %s was disbanded in accordance with your peace treaty with the %s."
msgstr "Viaj %s estis dissolvitaj laÅ via packontrakto kun la %s."
-#: server/srv_main.c:512 server/srv_main.c:516
+#: server/srv_main.c:516 server/srv_main.c:520
#, c-format
msgid ""
"Concerned citizens point out that the cease-fire with %s will run out soon."
msgstr "Angoroplenaj civitanoj rimarkas ke la pafĉesigo kun %s finos baldaÅ."
-#: server/srv_main.c:521 server/srv_main.c:525
+#: server/srv_main.c:525 server/srv_main.c:529
#, c-format
msgid "The cease-fire with %s has run out. You are now at war with the %s."
msgstr "La pafĉesigo kun %s finis. Nun vi estas en milito kun la %s."
-#: server/srv_main.c:542
+#: server/srv_main.c:546
#, c-format
msgid ""
"Ceasefire between %s and %s has run out. They are at war. You cancel your "
@@ -5138,793 +5165,845 @@ msgstr ""
"La pafĉesigo inter %s kaj %s finis. Ili estas militantaj. Vi nuligas vian "
"aliancon kun ambaÅ ili."
-#: server/srv_main.c:961
+#: server/srv_main.c:997
#, c-format
msgid "Failed saving game as %s"
msgstr "Malsukcesis la konservado de la ludo kiel %s"
-#: server/srv_main.c:963
+#: server/srv_main.c:999
#, c-format
msgid "Game saved as %s"
msgstr "La ludo estas konservita kiel %s"
-#: server/srv_main.c:994
+#: server/srv_main.c:1030
msgid "The game is already running."
msgstr "La ludo estas jam plenumanta."
-#: server/srv_main.c:1002
+#: server/srv_main.c:1038
#, c-format
msgid "%s lost control cmdlevel on game start. Use voting from now on."
msgstr ""
-#: server/srv_main.c:1009
+#: server/srv_main.c:1045
msgid "Starting game."
msgstr "Komenco de la ludo."
-#: server/srv_main.c:1071
+#: server/srv_main.c:1112
#, c-format
msgid "request for unknown report (type %d)"
msgstr "mendo pri nekonata raporto (speco %d)"
-#: server/srv_main.c:1136
+#: server/srv_main.c:1177
#, c-format
msgid "Warning: rejecting old client %s"
msgstr "Atentu: malnova kliento %s estas rifuzita"
-#: server/srv_main.c:1238
+#: server/srv_main.c:1279
#, c-format
msgid "Got a packet of type %d from a dead or observer player"
msgstr "Vi ricevis pakaĵon de %d speco de mortinta aŠobservanta ludanto"
-#: server/srv_main.c:1338
+#: server/srv_main.c:1381
msgid "Please choose a non-blank name."
msgstr "Bonvolu ne elekti nulan nomon."
-#: server/srv_main.c:1354
+#: server/srv_main.c:1397
msgid "That nation is already in use."
msgstr "Tiu nacio estas jam uzata."
-#: server/srv_main.c:1370
+#: server/srv_main.c:1413
#, c-format
msgid "Another player already has the name '%s'. Please choose another name."
msgstr "Jam alia uzanto havas la nomon '%s'. Bonvolu elekti alian nomon."
-#: server/srv_main.c:1391
+#: server/srv_main.c:1434
msgid "Please choose a name containing only ASCII characters."
msgstr "Bonvolu elekti nomon kiu entenas nur ASCII literojn."
-#: server/srv_main.c:1490
+#: server/srv_main.c:1533
#, c-format
msgid "%s nation is not available in this scenario."
msgstr "%s nacio ne estas disponebla en tiu ĉi scenejo."
-#: server/srv_main.c:1496
+#: server/srv_main.c:1539
#, c-format
msgid "%s nation is already in use."
msgstr "%s nacio estas jam uzata."
-#: server/srv_main.c:1514
+#: server/srv_main.c:1557
#, c-format
msgid "%s is the %s ruler %s."
msgstr "%s estas la %s estro %s."
-#: server/srv_main.c:1570
+#: server/srv_main.c:1613
#, 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:1614 server/srv_main.c:1618
+#: server/srv_main.c:1657 server/srv_main.c:1661
#, c-format
msgid "%s has been added as %s level AI-controlled player."
msgstr "%s estis aldonita kiel AI-ludanto je %s nivelo "
-#: server/srv_main.c:1760
+#: server/srv_main.c:1803
#, c-format
msgid "Player %d"
msgstr "Ludanto %d"
-#: server/srv_main.c:1771 server/srv_main.c:1777
+#: server/srv_main.c:1814 server/srv_main.c:1820
#, c-format
msgid "%s rules the %s."
msgstr "%s estas la %s."
-#: server/srv_main.c:1942
+#: server/srv_main.c:1985
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
msgstr ""
-#: server/srv_main.c:1993
+#: server/srv_main.c:2037
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr "Sendante informojn al la metaservilo [%s]"
-#: server/srv_main.c:2024
+#: server/srv_main.c:2069
msgid "The game is over..."
msgstr "La ludo estas finita..."
-#: server/srv_main.c:2237
+#: server/srv_main.c:2286
msgid "Now accepting new client connections."
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 "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 "Voĉo \"%s\" ne estas akceptita: %d malfavore, %d favore, %d sindetene."
-
#. TRANS: ambiguous command
-#: server/stdinhand.c:365
+#: server/stdinhand.c:284
msgid "(ambiguous)"
msgstr "(dubsenca)"
#. TRANS: unrecognized command
#. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:416
+#: server/stdinhand.c:287 client/citydlg_common.c:419
#: 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 "(nekonata)"
-#: server/stdinhand.c:458
+#: server/stdinhand.c:377
msgid "Name is empty, so cannot be a player."
msgstr "La nomo estas malplena, do Äi ne povas aparteni al iu ludanto."
-#: server/stdinhand.c:462
+#: server/stdinhand.c:381
msgid "Name is too long, so cannot be a player."
msgstr "La nomo estas tro longa, do Äi ne povas aparteni al iu ludanto."
-#: server/stdinhand.c:466
+#: server/stdinhand.c:385
#, c-format
msgid "Player name prefix '%s' is ambiguous."
msgstr "AntaÅmetaĵo de ludantonomo '%s' estas dubsenca."
-#: server/stdinhand.c:470
+#: server/stdinhand.c:389
#, c-format
msgid "No player by the name of '%s'."
msgstr "Neniu ludanto nomiÄas '%s'."
-#: server/stdinhand.c:474 server/stdinhand.c:509
+#: server/stdinhand.c:393 server/stdinhand.c:428
#, c-format
msgid "Unexpected match_result %d (%s) for '%s'."
msgstr ""
-#: server/stdinhand.c:493
+#: server/stdinhand.c:412
msgid "Name is empty, so cannot be a connection."
msgstr "La nomo estas malplena, do Äi ne povas aparteni al iu konekto."
-#: server/stdinhand.c:497
+#: server/stdinhand.c:416
msgid "Name is too long, so cannot be a connection."
msgstr "La nomo estas tro longa, do Äi ne povas aparteni al iu konekto."
-#: server/stdinhand.c:501
+#: server/stdinhand.c:420
#, c-format
msgid "Connection name prefix '%s' is ambiguous."
msgstr "AntaÅmetaĵo de konekto '%s' estas dubsenca."
-#: server/stdinhand.c:505
+#: server/stdinhand.c:424
#, c-format
msgid "No connection by the name of '%s'."
msgstr "Neniu konekto havas nomon '%s'."
-#: server/stdinhand.c:525
+#: server/stdinhand.c:444
#, c-format
msgid "Open metaserver connection to [%s]."
msgstr "Estas malfermita la konekto de metaservilo al [%s]."
-#: server/stdinhand.c:538
+#: server/stdinhand.c:457
#, c-format
msgid "Close metaserver connection to [%s]."
msgstr "Estas fermita la konekto de metaservilo al [%s]."
-#: server/stdinhand.c:553
+#: server/stdinhand.c:472
msgid "Metaserver connection is open."
msgstr "La konekto de metaservilo estas malfermita."
-#: server/stdinhand.c:556
+#: server/stdinhand.c:475
msgid "Metaserver connection is closed."
msgstr "La konekto de metaservilo estas fermita."
-#: server/stdinhand.c:566
+#: server/stdinhand.c:485
msgid "Metaserver connection is already open."
msgstr "La konekto de metaservilo estas jam malfermita."
-#: server/stdinhand.c:577
+#: server/stdinhand.c:496
msgid "Metaserver connection is already closed."
msgstr "La konekto de metaservilo estas jam fermita."
-#: server/stdinhand.c:582
+#: server/stdinhand.c:501
msgid "Argument must be 'u', 'up', 'd', 'down', or '?'."
msgstr "La argumento devas esti 'u', 'up', 'd', 'down' aÅ '?'."
-#: server/stdinhand.c:603
+#: server/stdinhand.c:522
#, c-format
msgid "Metaserver patches string set to '%s'."
msgstr ""
-#: server/stdinhand.c:606
+#: server/stdinhand.c:525
#, c-format
msgid "Metaserver patches string set to '%s', not reporting to metaserver."
msgstr ""
-#: server/stdinhand.c:627
+#: server/stdinhand.c:546
#, c-format
msgid "Metaserver message string set to '%s'."
msgstr ""
-#: server/stdinhand.c:630
+#: server/stdinhand.c:549
#, c-format
msgid "Metaserver message string set to '%s', not reporting to metaserver."
msgstr ""
-#: server/stdinhand.c:650
+#: server/stdinhand.c:569
#, c-format
msgid "Metaserver is now [%s]."
msgstr "La metaservilo nun estas [%s]."
-#: server/stdinhand.c:660
+#: server/stdinhand.c:579
#, c-format
msgid "Server id: %s"
msgstr "ID de la servilo: %s"
-#: server/stdinhand.c:757
+#: server/stdinhand.c:676
msgid "You cannot save games manually on this server."
msgstr "Vi ne povas konservi la ludon mane en ĉi tiu servilo."
-#: server/stdinhand.c:774
+#: server/stdinhand.c:693
msgid "Cannot toggle a barbarian player."
msgstr "Estas neeble mastrumi barbaran ludanton."
-#: server/stdinhand.c:781
+#: server/stdinhand.c:700
#, c-format
msgid "%s is now under AI control."
msgstr "%s nun estas mastrumita de AI."
-#: server/stdinhand.c:802
+#: server/stdinhand.c:721
#, c-format
msgid "%s is now under human control."
msgstr "%s nun estas mastrumita de homo."
-#: server/stdinhand.c:847
+#: server/stdinhand.c:766
msgid "Can't add AI players once the game has begun."
msgstr "Estas neeble aldoni AI-ludantojn post la komenco de la ludo."
-#: server/stdinhand.c:867
+#: server/stdinhand.c:786
msgid "Can't add more players, server is full."
msgstr "Estas neeble aldoni pluajn ludantojn: la servilo estas plena."
-#: server/stdinhand.c:874
+#: server/stdinhand.c:793
msgid "Can't use an empty name."
msgstr "Estas neeble uzi malplenan nomon."
-#: server/stdinhand.c:881
+#: server/stdinhand.c:800
#, c-format
msgid "That name exceeds the maximum of %d chars."
msgstr "Tiu nomo superas la maksimumon je %d literoj."
-#: server/stdinhand.c:887
+#: server/stdinhand.c:806
msgid "That name is not allowed."
msgstr "Tiu nomo ne estas permesita."
-#: server/stdinhand.c:893
+#: server/stdinhand.c:812
msgid "A player already exists by that name."
msgstr "Jam ekzistas ludanto kiu havas tiun nomon."
-#: server/stdinhand.c:899
+#: server/stdinhand.c:818
msgid "A user already exists by that name."
msgstr "Jam ekzistas uzanto kiu havas tiun nomon."
-#: server/stdinhand.c:925
+#: server/stdinhand.c:844
#, c-format
msgid "%s has been added as an AI-controlled player."
msgstr "%s estis aldonita kiel AI-ludanto."
-#: server/stdinhand.c:932
+#: server/stdinhand.c:851
#, c-format
msgid "Error creating new AI player: %s."
msgstr ""
-#: server/stdinhand.c:966
+#: server/stdinhand.c:885
msgid "Players cannot be removed once the game has started."
msgstr "Estas neeble formovi ludantoj post la komenco de la ludo."
-#: server/stdinhand.c:977
+#: server/stdinhand.c:896
#, c-format
msgid "Removed player %s from the game."
msgstr "La ludanto %s estis formovita de la ludo."
-#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
+#: server/stdinhand.c:935 server/stdinhand.c:3372 server/stdinhand.c:3507
#, c-format
msgid "Name \"%s\" disallowed for security reasons."
msgstr "La nomo \"%s\" ne estas permesita pro sekureco."
-#: server/stdinhand.c:1029
+#: server/stdinhand.c:948
#, c-format
msgid "No command script found by the name \"%s\"."
msgstr ""
-#: server/stdinhand.c:1037
+#: server/stdinhand.c:956
#, c-format
msgid "Loading script file: %s"
msgstr "Åœargante skripton: %s"
-#: server/stdinhand.c:1052
+#: server/stdinhand.c:971
#, c-format
msgid "Cannot read command line scriptfile '%s'."
msgstr "Estas neeble legi la skripton de komandlinio '%s'."
-#: server/stdinhand.c:1054
+#: server/stdinhand.c:973
#, c-format
msgid "Could not read script file '%s'."
msgstr "Estas neeble legi la skripton '%s'."
-#: server/stdinhand.c:1146
+#: server/stdinhand.c:1065
#, c-format
msgid "Could not write script file '%s'."
msgstr "Estas neeble skribi la skripton '%s'."
-#: server/stdinhand.c:1158
+#: server/stdinhand.c:1077
msgid "You cannot use the write command on this server for security reasons."
msgstr "Vi ne povas uzi komandojn je skribo en tiu ĉi servilo pro sekureco."
-#: server/stdinhand.c:1186
+#: server/stdinhand.c:1105
#, c-format
msgid ""
"Cannot decrease command access level '%s' for connection '%s'; you only have "
"'%s'."
msgstr ""
-#: server/stdinhand.c:1241
+#: server/stdinhand.c:1114
+#, c-format
+msgid "Command access level set to '%s' for connection %s."
+msgstr ""
+
+#: server/stdinhand.c:1163
#, c-format
msgid ""
"Anyone can now become game organizer '%s' by issuing the 'first' command."
msgstr ""
-#: server/stdinhand.c:1274
+#: server/stdinhand.c:1187
msgid "Command access levels in effect:"
msgstr ""
-#: server/stdinhand.c:1282
+#: server/stdinhand.c:1194
#, c-format
msgid "Command access level for new connections: %s"
msgstr ""
-#: server/stdinhand.c:1285
+#: server/stdinhand.c:1197
#, c-format
msgid "Command access level for first player to take it: %s"
msgstr ""
-#: server/stdinhand.c:1294
+#: server/stdinhand.c:1206
msgid ""
"Error: command access level must be one of 'none', 'info', 'ctrl', or 'hack'."
msgstr ""
-#: server/stdinhand.c:1299
+#: server/stdinhand.c:1211
#, c-format
msgid ""
"Cannot increase command access level to '%s'; you only have '%s' yourself."
msgstr ""
-#: server/stdinhand.c:1326 server/stdinhand.c:1375
-#, c-format
-msgid "Command access level set to '%s' for connection %s."
-msgstr ""
-
-#: 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:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
+#: server/stdinhand.c:1238 server/stdinhand.c:1252 server/stdinhand.c:1273
#, c-format
msgid "Command access level set to '%s' for new players."
msgstr ""
-#: server/stdinhand.c:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
+#: server/stdinhand.c:1243 server/stdinhand.c:1257 server/stdinhand.c:1267
#, c-format
msgid "Command access level set to '%s' for first player to grab it."
msgstr ""
-#: server/stdinhand.c:1402
+#: server/stdinhand.c:1302
msgid "The 'first' command makes no sense from the server command line."
msgstr ""
-#: server/stdinhand.c:1406
+#: server/stdinhand.c:1306
#, c-format
msgid "You already have command access level '%s' or better."
msgstr ""
-#: server/stdinhand.c:1411
+#: server/stdinhand.c:1311
msgid "Someone else already is game organizer."
msgstr ""
-#: server/stdinhand.c:1416
+#: server/stdinhand.c:1316
#, c-format
msgid "Connection %s has opted to become the game organizer."
msgstr ""
-#: server/stdinhand.c:1467
+#: server/stdinhand.c:1367
#, c-format
msgid "Invalid argument %d."
msgstr "Nevalida argumento %d."
-#: server/stdinhand.c:1474
+#: server/stdinhand.c:1374
#, fuzzy
msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
msgstr "timeoutincrease <vico> <vicprogresado> <valoro> <valormultipliko>."
-#: server/stdinhand.c:1482
+#: server/stdinhand.c:1382
#, c-format
msgid "Dynamic timeout set to %d %d %d %d"
msgstr "Dinamika tempolimo agordita je %d %d %d %d"
-#: server/stdinhand.c:1542 server/stdinhand.c:1545
+#: server/stdinhand.c:1442 server/stdinhand.c:1445
#, fuzzy
msgid "Option:"
msgstr "Opcio"
-#: server/stdinhand.c:1555 server/stdinhand.c:4031
+#: server/stdinhand.c:1455 server/stdinhand.c:4079
msgid "Description:"
msgstr "Priskribo:"
-#: server/stdinhand.c:1560
+#: server/stdinhand.c:1460
#, c-format
msgid "Status: %s"
msgstr "Stato: %s"
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "changeable"
msgstr "ÅanÄebla"
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "fixed"
msgstr "fiksa"
-#: server/stdinhand.c:1567
+#: server/stdinhand.c:1467
#, c-format
msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
msgstr "Valoro: %d, Minimumo: 0, DefaÅlto: %d, Maksimumo: 1"
-#: server/stdinhand.c:1572
+#: server/stdinhand.c:1472
#, c-format
msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
msgstr "Valoro: %d, Minimumo: %d, DefaÅlto: %d, Maksimumo: %d"
-#: server/stdinhand.c:1578
+#: server/stdinhand.c:1478
#, c-format
msgid "Value: \"%s\", Default: \"%s\""
msgstr "Valoro: \"%s\", DefaÅlto: \"%s\""
-#: server/stdinhand.c:1597
+#: server/stdinhand.c:1497
msgid "Explanations are available for the following server options:"
msgstr "Esplikojn estas disponeblaj pri la jenaj servil-opcioj:"
-#: server/stdinhand.c:1643
+#: server/stdinhand.c:1537
msgid "No explanation for that yet."
msgstr "Neniu espliko estas disponebla pri tio."
-#: server/stdinhand.c:1646 server/stdinhand.c:2480
+#: server/stdinhand.c:1540 server/stdinhand.c:2468
msgid "Ambiguous option name."
msgstr "Dubsenca nomo de opcio."
-#: server/stdinhand.c:1666
+#: server/stdinhand.c:1560
#, c-format
msgid "Server Operator: %s"
msgstr "Servil-operatoro: %s"
-#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
+#: server/stdinhand.c:1686 server/stdinhand.c:1713 server/stdinhand.c:1731
#, c-format
msgid "Player '%s' now has AI skill level '%s'."
msgstr "la ludanto '%s' nun havas nivelon de AI '%s'."
-#: server/stdinhand.c:1822
+#: server/stdinhand.c:1718
#, c-format
msgid "%s is not controlled by the AI."
msgstr "%s ne estas mastrumita de AI."
-#: server/stdinhand.c:1842
+#: server/stdinhand.c:1738
#, c-format
msgid "Default AI skill level set to '%s'."
msgstr "La apriora nivelo de lerteco por IA estas agordita je '%s'."
-#: server/stdinhand.c:1857 server/stdinhand.c:2162
+#: server/stdinhand.c:1753
msgid "This command is client only."
msgstr "Tiu ĉi komando estas nur por klientoj."
-#: server/stdinhand.c:1860
+#: server/stdinhand.c:1756
msgid "Usage: away"
msgstr ""
-#: server/stdinhand.c:1865
+#: server/stdinhand.c:1761
msgid "Only players may use the away command."
msgstr "Nur la ludantoj rajtas uzi tiun komandon."
-#: server/stdinhand.c:1869
+#: server/stdinhand.c:1765
#, c-format
msgid "%s set to away mode."
msgstr "%s estas agordita je 'for' moduso."
-#: server/stdinhand.c:1877
+#: server/stdinhand.c:1772
#, c-format
msgid "%s returned to game."
msgstr "%s estas denove en la ludo."
-#: server/stdinhand.c:1919
+#: server/stdinhand.c:1817
#, c-format
msgid "Sorry, you do not have access to view option '%s'."
msgstr "BedaÅre, vi ne rajtas uzi la opcion '%s'."
-#: server/stdinhand.c:1925
+#: server/stdinhand.c:1823
#, c-format
msgid "Unknown option '%s'."
msgstr "La opcio '%s' estas nekonata."
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1848
msgid "All options with non-default values"
msgstr "Ĉiuj opcioj kun ne-defaÅltaj valoroj"
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1851
msgid "All options"
msgstr "Ĉiuj opcioj"
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1854
msgid "Vital options"
msgstr "Vitalaj opcioj"
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1857
msgid "Situational options"
msgstr "Situaciaj opcioj"
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1860
msgid "Rarely used options"
msgstr "Maloftaj opcioj"
-#: server/stdinhand.c:1965
+#: server/stdinhand.c:1863
msgid "+ means you may change the option"
msgstr "+ signifas ke vi povas ÅanÄi opcion"
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1864
msgid "= means the option is on its default value"
msgstr "= signifas ke la opcio havas sian defaÅltan valoron"
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
#, c-format
msgid "%-*s value (min,max) "
msgstr "%-*s valoro (min,maks) "
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
msgid "Option"
msgstr "Opcio"
-#: server/stdinhand.c:1973
+#: server/stdinhand.c:1871
msgid "description"
msgstr "priskribo"
-#: server/stdinhand.c:2042
+#: server/stdinhand.c:1940
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:2092
+#: server/stdinhand.c:1966
msgid "Cannot change teams once game has begun."
msgstr "Estas neeble ÅanÄi la grupojn post la komenco de la ludo."
-#: server/stdinhand.c:2102
+#: server/stdinhand.c:1976
#, fuzzy
msgid "Undefined argument. Usage: team <player> <team>."
msgstr ""
"Nedifinita argumento. Uzo:\n"
"%s"
-#: server/stdinhand.c:2122
+#: server/stdinhand.c:1996
#, c-format
msgid "No such team %s. Please give a valid team name or number."
msgstr "Neniu grupo %s. Bonvolu havigi validan nomon aÅ numero por la grupo."
-#: server/stdinhand.c:2129
+#: server/stdinhand.c:2003
msgid "Cannot team a barbarian."
msgstr "Estas neeble aligi barbaron."
-#: server/stdinhand.c:2135
+#: server/stdinhand.c:2009
#, c-format
msgid "Player %s set to team %s."
msgstr "La ludanto %s estas aligita al %s grupo."
-#: server/stdinhand.c:2157
+#: server/stdinhand.c:2035 server/voting.c:512
#, fuzzy
-msgid "Undefined arguments. Usage: vote yes|no [vote number]."
-msgstr ""
-"Nedifinita argumento. Uzo:\n"
-"%s"
+msgid "Teamvote"
+msgstr "Grupo"
-#: server/stdinhand.c:2165
-msgid "Observers cannot vote."
-msgstr "La observantoj ne rajtas voĉdoni."
+#: server/stdinhand.c:2035 server/voting.c:516
+msgid "Vote"
+msgstr ""
-#: server/stdinhand.c:2168
+#: server/stdinhand.c:2037
+#, c-format
msgid ""
-"You can only vote in a running game. Use 'first' to become the game "
-"organizer if there currently is none."
+"%s %d \"%s\" (needs %0.0f%%%s): %d for, %d against, and %d abstained out of %"
+"d players."
msgstr ""
-"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:2181
-#, c-format
-msgid "Vote %d \"%s\": %d for, %d against"
-msgstr "Voĉdonado %d \"%s\": %d favore, %d malfavore"
+#: server/stdinhand.c:2041
+msgid " no dissent"
+msgstr ""
-#: server/stdinhand.c:2188
+#: server/stdinhand.c:2049
msgid "There are no votes going on."
msgstr "Neniu voĉdonado."
-#: server/stdinhand.c:2208
-msgid "No legal last vote."
+#: server/stdinhand.c:2077
+#, fuzzy
+msgid "Invalid arguments. Usage: vote yes|no|abstain [vote number]."
+msgstr ""
+"Nedifinita argumento. Uzo:\n"
+"%s"
+
+#: server/stdinhand.c:2095 server/stdinhand.c:2213 server/stdinhand.c:3714
+msgid "You are not allowed to use this command."
+msgstr "Vi ne rajtas uzi tiun komandon."
+
+#: server/stdinhand.c:2104
+#, fuzzy, c-format
+msgid "The argument \"%s\" is ambigious."
+msgstr "La argumento '%s' aldonita al 'help' estas dubsenca."
+
+#: server/stdinhand.c:2119
+#, fuzzy
+msgid "There are no votes running."
+msgstr "Neniu voĉdonado."
+
+#: server/stdinhand.c:2121
+#, fuzzy, c-format
+msgid "No legal last vote (%d %s)."
msgstr "Lasta voĉdono estas nevalida."
-#: server/stdinhand.c:2213
-msgid "Value must be integer."
+#: server/stdinhand.c:2122
+msgid "other vote running"
+msgid_plural "other votes running"
+msgstr[0] ""
+msgstr[1] ""
+
+#: server/stdinhand.c:2129 server/stdinhand.c:2491 server/stdinhand.c:2532
+msgid "Value must be an integer."
msgstr "La valoro devas esti entjero."
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2135 server/stdinhand.c:2221
#, c-format
msgid "No such vote (%d)."
msgstr "Neniu voĉdono (%d)."
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2141
+#, fuzzy
+msgid "You are not allowed to vote on that."
+msgstr "Vi ne rajtas agordi tiun ĉi opcion."
+
+#: server/stdinhand.c:2146
#, c-format
msgid "You voted for \"%s\""
msgstr "Vi voĉdonis favore al \"%s\""
-#: server/stdinhand.c:2232
+#: server/stdinhand.c:2150
#, c-format
msgid "You voted against \"%s\""
msgstr "Vi voĉdonis malfavore al \"%s\""
-#: server/stdinhand.c:2259
+#: server/stdinhand.c:2155
+#, c-format
+msgid "You abstained from voting on \"%s\""
+msgstr ""
+
+#: server/stdinhand.c:2190
+msgid "Missing argument <vote number> or the string \"all\"."
+msgstr ""
+
+#: server/stdinhand.c:2197
+#, fuzzy
+msgid "You don't have any vote going on."
+msgstr "Vi ne povas ataki ĉi tie."
+
+#: server/stdinhand.c:2204
+#, fuzzy
+msgid "There isn't any vote going on."
+msgstr "Neniu voĉdonado."
+
+#: server/stdinhand.c:2209
+msgid "Server: All votes have been removed."
+msgstr ""
+
+#: server/stdinhand.c:2226
+#, fuzzy, c-format
+msgid "You are not allowed to cancel this vote (%d)."
+msgstr "Vi ne rajtas agordi tiun ĉi opcion."
+
+#: server/stdinhand.c:2232
+msgid "Usage: /cancelvote [<vote number>|all]"
+msgstr ""
+
+#: server/stdinhand.c:2241
+#, c-format
+msgid "Server: %s cancelled the vote \"%s\" (number %d)."
+msgstr ""
+
+#: server/stdinhand.c:2247
+#, c-format
+msgid "Server: The vote \"%s\" (number %d) has been cancelled."
+msgstr ""
+
+#: server/stdinhand.c:2265
msgid ""
"Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
"<x> <y> | unit <id> | tech <player> | timing | info>."
msgstr ""
-#: server/stdinhand.c:2265
+#: server/stdinhand.c:2271
msgid "Can only use this command once game has begun."
msgstr "Vi povas uzi tiun komandon nur post la komenco de la ludo."
-#: server/stdinhand.c:2294
+#: server/stdinhand.c:2300
#, c-format
msgid "%s diplomacy no longer debugged"
msgstr ""
-#: server/stdinhand.c:2298
+#: server/stdinhand.c:2304
#, c-format
msgid "%s diplomacy debugged"
msgstr ""
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2323
#, c-format
msgid "%s tech no longer debugged"
msgstr ""
-#: server/stdinhand.c:2321
+#: server/stdinhand.c:2327
#, c-format
msgid "%s tech debugged"
msgstr ""
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2358 server/stdinhand.c:2388
msgid "Value 2 & 3 must be integer."
msgstr "La 2a kaj 3a valoro devas esti entjero."
-#: server/stdinhand.c:2356 server/stdinhand.c:2386
+#: server/stdinhand.c:2362 server/stdinhand.c:2392
msgid "Bad map coordinates."
msgstr "Eraraj mapaj koordinatoj."
-#: server/stdinhand.c:2361
+#: server/stdinhand.c:2367
msgid "No city at this coordinate."
msgstr "Neniu urbo estas ĉe tiuj koordinatoj."
-#: server/stdinhand.c:2366
+#: server/stdinhand.c:2372
#, c-format
msgid "%s no longer debugged"
msgstr ""
-#: server/stdinhand.c:2392 server/stdinhand.c:2422
+#: server/stdinhand.c:2398 server/stdinhand.c:2428
#, c-format
msgid "%s %s no longer debugged."
msgstr ""
-#: server/stdinhand.c:2397 server/stdinhand.c:2427
+#: server/stdinhand.c:2403 server/stdinhand.c:2433
#, c-format
msgid "%s %s debugged."
msgstr ""
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2419
msgid "Value 2 must be integer."
msgstr "La dua valoro devas esti entjero."
-#: server/stdinhand.c:2417
+#: server/stdinhand.c:2423
#, c-format
msgid "Unit %d does not exist."
msgstr "La unuo %d ne ekzistas."
-#: server/stdinhand.c:2475
+#: server/stdinhand.c:2464
#, fuzzy
msgid "Undefined argument. Usage: set <option> <value>."
msgstr ""
"Nedifinita argumento. Uzo:\n"
"%s"
-#: server/stdinhand.c:2485
+#: server/stdinhand.c:2473
msgid "You are not allowed to set this option."
msgstr "Vi ne rajtas agordi tiun ĉi opcion."
-#: server/stdinhand.c:2490 server/stdinhand.c:3463
+#: server/stdinhand.c:2478 server/stdinhand.c:3501
msgid "This setting can't be modified after the game has started."
msgstr "Tiu ĉi agordaĵo ne estas redaktebla post la komenco de la ludo."
-#: server/stdinhand.c:2502 server/stdinhand.c:2543
-msgid "Value must be an integer."
-msgstr "La valoro devas esti entjero."
-
-#: server/stdinhand.c:2512
+#: server/stdinhand.c:2501
#, c-format
msgid "The parameter %s should only contain digits 0-1."
msgstr "La parametro %s devus enteni nur diÄitajn valorojn 0-1."
-#: server/stdinhand.c:2519
+#: server/stdinhand.c:2508
msgid "Value out of range (minimum: 0, maximum: 1)."
msgstr "Ekstera valoro (minimumo: 0, maksimumo: 1)."
-#: server/stdinhand.c:2534 server/stdinhand.c:2576
+#: server/stdinhand.c:2523 server/stdinhand.c:2565
#, c-format
msgid "Option: %s has been set to %d."
msgstr "Opcio: %s estis agordita je %d."
-#: server/stdinhand.c:2554
+#: server/stdinhand.c:2543
#, c-format
msgid "The parameter %s should only contain +- and 0-9."
msgstr "La parametro %s devus enteni nur +- kaj 0-9."
-#: server/stdinhand.c:2561
+#: server/stdinhand.c:2550
#, c-format
msgid "Value out of range (minimum: %d, maximum: %d)."
msgstr "Ekstera valoro (minimumo: %d, maksimumo: %d)."
-#: server/stdinhand.c:2586
+#: server/stdinhand.c:2575
#, fuzzy
msgid "String value too long. Usage: set <option> <value>."
msgstr ""
"La ĉeno estas tro longa. Uzo:\n"
"%s"
-#: server/stdinhand.c:2600
+#: server/stdinhand.c:2589
#, c-format
msgid "Option: %s has been set to \"%s\"."
msgstr "Opcio: %s estis agordita je \"%s\"."
-#: server/stdinhand.c:2658
+#: server/stdinhand.c:2652
msgid "Sorry, one can't observe globally in this game."
msgstr "BedaÅre, oni ne povas observi Äenerale en tiu ĉi ludo."
-#: server/stdinhand.c:2661
+#: server/stdinhand.c:2655
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:2671
+#: server/stdinhand.c:2665
#, 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
+#: server/stdinhand.c:2673
#, c-format
msgid ""
"You cannot take a new player because the maximum of %d player has already "
@@ -5935,76 +6014,76 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: server/stdinhand.c:2691
+#: server/stdinhand.c:2685
msgid "You cannot take a new player because there are no free player slots."
msgstr ""
-#: server/stdinhand.c:2702
+#: server/stdinhand.c:2696
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
+#: server/stdinhand.c:2699
msgid "Sorry, one can't take barbarians in this game."
msgstr "BedaÅre, oni ne povas mastrumi la Barbarojn en tiu ĉi ludo."
-#: server/stdinhand.c:2713
+#: server/stdinhand.c:2707
msgid "Sorry, one can't observe dead players in this game."
msgstr "BedaÅre, oni ne povas observi la mortintajn ludantojn en tiu ĉi ludo."
-#: server/stdinhand.c:2716
+#: server/stdinhand.c:2710
msgid "Sorry, one can't take dead players in this game."
msgstr "BedaÅre, oni ne povas mastrumi la mortintajn ludantojn en tiu ĉi ludo."
-#: server/stdinhand.c:2724
+#: server/stdinhand.c:2718
msgid "Sorry, one can't observe AI players in this game."
msgstr "BedaÅre, oni ne povas observi la AI-jn ludantojn en tiu ĉi ludo."
-#: server/stdinhand.c:2727
+#: server/stdinhand.c:2721
msgid "Sorry, one can't take AI players in this game."
msgstr "BedaÅre, oni ne povas mastrumi la AI-jn ludantojn en tiu ĉi ludo."
-#: server/stdinhand.c:2736
+#: server/stdinhand.c:2730
msgid "Sorry, one can't observe human players in this game."
msgstr "BedaÅre, oni ne povas observi la homajn ludantojn en tiu ĉi ludo."
-#: server/stdinhand.c:2739
+#: server/stdinhand.c:2733
msgid "Sorry, one can't take human players in this game."
msgstr "BedaÅre, oni ne povas mastrumi la homajn ludantojn en tiu ĉi ludo."
-#: server/stdinhand.c:2749
+#: server/stdinhand.c:2743
msgid "Sorry, one can't observe in this game."
msgstr "BedaÅre, oni ne povas observi en tiu ĉi ludo."
-#: server/stdinhand.c:2754
+#: server/stdinhand.c:2748
msgid "Sorry, one can't take players in this game."
msgstr "BedaÅre, oni ne povas mastrumi la ludantojn en tiu ĉi ludo."
-#: server/stdinhand.c:2760
+#: server/stdinhand.c:2754
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:2791
+#: server/stdinhand.c:2785
#, fuzzy
msgid "Usage: observe [connection-name [player-name]]"
msgstr "observe [konektonomo] [ludantonomo]"
-#: server/stdinhand.c:2797
+#: server/stdinhand.c:2791
#, fuzzy
msgid "Usage: observe [player-name]"
msgstr "remove <ludantonomo>"
-#: server/stdinhand.c:2847
+#: server/stdinhand.c:2841
#, c-format
msgid "%s already controls %s. Using 'observe' would remove %s"
msgstr "%s jam mastrumas %sn. Uzante 'observe', tio formovus %sn"
-#: server/stdinhand.c:2858
+#: server/stdinhand.c:2852
#, c-format
msgid "%s is already observing %s."
msgstr "%s estas jam observanta %sn."
-#: server/stdinhand.c:2863
+#: server/stdinhand.c:2857
#, c-format
msgid "%s is already observing."
msgstr "%s estas jam observanta."
@@ -6019,239 +6098,245 @@ msgstr "%s de nun observas %sn"
msgid "%s now observes"
msgstr "%s nun observas"
-#: server/stdinhand.c:2969
+#: server/stdinhand.c:2971
#, fuzzy
msgid "Usage: take <connection-name> <player-name>"
msgstr "take [konektonomo] <ludantonomo>"
-#: server/stdinhand.c:2974
+#: server/stdinhand.c:2976
#, fuzzy
msgid "Usage: take <player-name>"
msgstr "create <ludantonomo>"
-#: server/stdinhand.c:2980
+#: server/stdinhand.c:2982
#, fuzzy
msgid "Usage: take [connection-name] <player-name>"
msgstr "take [konektonomo] <ludantonomo>"
-#: server/stdinhand.c:3010
+#: server/stdinhand.c:3012
#, fuzzy, c-format
msgid "%s already controls %s."
msgstr "%s jam mastrumas %sn"
-#: server/stdinhand.c:3024
+#: server/stdinhand.c:3026
#, fuzzy, c-format
msgid "There is no free player slot for %s."
msgstr "Ne estas libera ludanta ingo por %s"
-#: server/stdinhand.c:3059
+#: server/stdinhand.c:3061
#, fuzzy, c-format
msgid "being detached from %s."
msgstr "malkonektado el %s."
-#: server/stdinhand.c:3135
+#: server/stdinhand.c:3146
#, fuzzy, c-format
msgid "%s now controls %s (%s, %s)."
msgstr "%s nun mastrumas %sn (%s, %s)"
-#: server/stdinhand.c:3139 server/stdinhand.c:4260
+#: server/stdinhand.c:3150 server/stdinhand.c:4308
#: data/nation/barbarian.ruleset:3
msgid "Barbarian"
msgstr "Barbara"
-#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
+#: server/stdinhand.c:3152 server/stdinhand.c:4310 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-sdl/plrdlg.c:645
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr "AI"
-#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-gtk-2.0/pages.c:2125
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
+#: server/stdinhand.c:3153 server/stdinhand.c:4312
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-gtk-2.0/pages.c:2127
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/connectdlg.c:215
msgid "Human"
msgstr "Homo"
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-gtk-2.0/pages.c:2124 client/gui-win32/connectdlg.c:200
-#: client/gui-win32/connectdlg.c:212
+#: server/stdinhand.c:3155 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-gtk-2.0/pages.c:2126 client/gui-win32/connectdlg.c:202
+#: client/gui-win32/connectdlg.c:214
msgid "Alive"
msgstr "Aktiva"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3156 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-win32/connectdlg.c:202
msgid "Dead"
msgstr "Malaktiva"
-#: server/stdinhand.c:3147
+#: server/stdinhand.c:3159
#, fuzzy, c-format
msgid "%s failed to attach to any player."
msgstr "%s malsukcesis konekti kun iu ajn ludanto."
-#: server/stdinhand.c:3182
+#: server/stdinhand.c:3194
#, fuzzy
msgid "Usage: detach <connection-name>"
msgstr "detach <konektonomo>"
-#: server/stdinhand.c:3202
+#: server/stdinhand.c:3214
msgid "You can not detach other users."
msgstr "Vi ne povas malkonetkigi aliajn uzantojn."
-#: server/stdinhand.c:3211
+#: server/stdinhand.c:3223
#, c-format
msgid "%s is not attached to any player."
msgstr "%s ne estas konektita kun iu ajn ludanto."
-#: server/stdinhand.c:3234
+#: server/stdinhand.c:3246
#, c-format
msgid "%s detaching from %s"
msgstr "%s malkonetktanta el %s"
-#: server/stdinhand.c:3240
+#: server/stdinhand.c:3252
#, c-format
msgid "%s no longer observing."
msgstr "%s ne estas plu kontrolita."
-#: server/stdinhand.c:3259
+#: server/stdinhand.c:3271
#, c-format
msgid "detaching from %s."
msgstr "malkonektado el %s."
-#: server/stdinhand.c:3345
+#: server/stdinhand.c:3361
msgid "Usage: load <game name>"
msgstr ""
-#: server/stdinhand.c:3350
+#: server/stdinhand.c:3366
msgid "Cannot load a game while another is running."
msgstr "Vi ne povas Åargi ludon dum alia ludo estas plenumanta."
-#: server/stdinhand.c:3372
+#: server/stdinhand.c:3388
#, c-format
msgid "Cannot find savegame or scenario with the name \"%s\"."
msgstr "Estas neeble trovi konservitan ludon aÅ scenejon nomitan \"%s\"."
-#: server/stdinhand.c:3389
+#: server/stdinhand.c:3405
#, c-format
msgid "Could not load savefile: %s"
msgstr "Estas neeble Åargi la konservitan dosieron: %s"
-#: server/stdinhand.c:3458
+#: server/stdinhand.c:3496
#, c-format
msgid "Current ruleset directory is \"%s\""
msgstr "La nuna dosierujo de la reguloj estas \"%s\""
-#: server/stdinhand.c:3478
+#: server/stdinhand.c:3516
#, c-format
msgid "Ruleset directory \"%s\" not found"
msgstr "La dosierujo de la reguloj \"%s\" ne estis trovita"
-#: server/stdinhand.c:3484
+#: server/stdinhand.c:3522
#, c-format
msgid "Ruleset directory is already \"%s\""
msgstr "La dosierujo de la reguloj jam estas \"%s\""
-#: server/stdinhand.c:3488
+#: server/stdinhand.c:3526
#, c-format
msgid "Ruleset directory set to \"%s\""
msgstr "La dosierujo de la reguloj estas agordita je \"%s\""
-#: server/stdinhand.c:3536
+#: server/stdinhand.c:3574
msgid "Goodbye."
msgstr "Äœis."
-#: server/stdinhand.c:3567
+#: server/stdinhand.c:3606
msgid "Sorry, you are not allowed to use server commands."
msgstr "DomaÄe, vi ne rajtas uzi komandojn de la servilo."
-#: server/stdinhand.c:3603
+#: server/stdinhand.c:3656
#, c-format
msgid "Warning: '%s' interpreted as '%s', but it is ambiguous. Try '%shelp'."
msgstr ""
-#: server/stdinhand.c:3608
+#: server/stdinhand.c:3661
#, c-format
msgid "Unknown command. Try '%shelp'."
msgstr "Nekonata komando. Provu '%shelp'."
-#: server/stdinhand.c:3625
-msgid "Your new vote canceled your previous vote."
+#: server/stdinhand.c:3675
+#, fuzzy
+msgid "Your new vote cancelled your previous vote."
msgstr "Via nova voĉdono forigis vian antaÅan voĉdonon."
-#: server/stdinhand.c:3633
-#, c-format
-msgid "New vote (number %d) by %s: %s."
+#: server/stdinhand.c:3688
+msgid "New teamvote"
+msgstr ""
+
+#: server/stdinhand.c:3691
+#, fuzzy
+msgid "New vote"
+msgstr "Neniam"
+
+#: server/stdinhand.c:3695
+#, fuzzy, c-format
+msgid "%s (number %d) by %s: %s"
msgstr "Nova voĉdono (numero %d) de %s: %s."
-#: server/stdinhand.c:3645
+#: server/stdinhand.c:3704
#, c-format
msgid "Your new vote (\"%s\") was not legal or was not recognized."
msgstr "Via nova voĉdono (\"%s\") estas ĉu ne leÄa ĉu ne konata."
-#: server/stdinhand.c:3655
-msgid "You are not allowed to use this command."
-msgstr "Vi ne rajtas uzi tiun komandon."
-
-#: server/stdinhand.c:3680
+#: server/stdinhand.c:3726
msgid "(server prompt)"
msgstr " (konzolo por servilo)"
-#: server/stdinhand.c:3787
+#: server/stdinhand.c:3835
msgid "Game ended in a draw."
msgstr "La ludon finis egalstate."
-#: server/stdinhand.c:3791
+#: server/stdinhand.c:3839
msgid ""
"Ending the game. The server will restart once all clients have disconnected."
msgstr ""
"La ludo finas. La servilo denove startos kiam ĉiuj klientoj estos "
"malkonektitaj."
-#: server/stdinhand.c:3796
+#: server/stdinhand.c:3844
msgid "Cannot end the game: no game running."
msgstr "Estas neeble finigi la ludon: neniu ludo estas plenumanta."
-#: server/stdinhand.c:3812
+#: server/stdinhand.c:3860
#, c-format
msgid "%s has conceded the game and can no longer win."
msgstr ""
-#: server/stdinhand.c:3817
+#: server/stdinhand.c:3865
msgid "You cannot surrender now."
msgstr "Vi ne povas kapitulaci nun!"
-#: server/stdinhand.c:3883
+#: server/stdinhand.c:3931
#, 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
+#: server/stdinhand.c:3936
#, 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:3892
+#: server/stdinhand.c:3940
#, fuzzy
msgid "Not enough nations for all players, game will not start."
msgstr "La nombro de ludantoj ne estas sufiĉa, la ludo ne povas komenci."
-#: server/stdinhand.c:3901
+#: server/stdinhand.c:3949
msgid "All players are ready; starting game."
msgstr "Ĉiuj ludantoj estas pretaj; la ludo komencas."
-#: server/stdinhand.c:3915
+#: server/stdinhand.c:3963
msgid ""
"Cannot start the game: the game is waiting for all clients to disconnect."
msgstr ""
-#: server/stdinhand.c:3922
+#: server/stdinhand.c:3970
msgid "Cannot start the game: it is already running."
msgstr ""
-#: server/stdinhand.c:3953
+#: server/stdinhand.c:4001
#, c-format
msgid "Cutting connection %s."
msgstr ""
-#: server/stdinhand.c:3972
+#: server/stdinhand.c:4020
msgid ""
"Welcome - this is the introductory help text for the Freeciv server.\n"
"\n"
@@ -6272,124 +6357,124 @@ msgid ""
" quit - to exit"
msgstr ""
-#: server/stdinhand.c:4007 server/stdinhand.c:4010
+#: server/stdinhand.c:4055 server/stdinhand.c:4058
#, fuzzy
msgid "Command:"
msgstr "Komando: %s"
-#: server/stdinhand.c:4014
+#: server/stdinhand.c:4062
msgid "Synopsis: "
msgstr "Skemo: "
-#: server/stdinhand.c:4023
+#: server/stdinhand.c:4071
#, c-format
msgid "Level: %s"
msgstr "Nivelo: %s"
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4096
msgid "The following server commands are available:"
msgstr "Estas disponeblaj la jenaj komandoj de la servilo:"
-#: server/stdinhand.c:4123
+#: server/stdinhand.c:4171
#, c-format
msgid "Help argument '%s' is ambiguous."
msgstr "La argumento '%s' aldonita al 'help' estas dubsenca."
-#: server/stdinhand.c:4128
+#: server/stdinhand.c:4176
#, c-format
msgid "No match for help argument '%s'."
msgstr "Neniu kongruo pri la argumento '%s' aldonita al 'help'."
-#: server/stdinhand.c:4194
+#: server/stdinhand.c:4242
#, c-format
msgid "Bad list argument: '%s'. Try '%shelp list'."
msgstr "Erara argumento aldonita al 'list': '%s'. Provu '%shelp list'."
-#: server/stdinhand.c:4234
+#: server/stdinhand.c:4282
msgid "List of players:"
msgstr "Listo de ludantoj:"
-#: server/stdinhand.c:4239
+#: server/stdinhand.c:4287
msgid "<no players>"
msgstr "<neniu ludanto>"
-#: server/stdinhand.c:4256
+#: server/stdinhand.c:4304
#, c-format
msgid "user %s, "
msgstr "uzanto %s, "
-#: server/stdinhand.c:4267
+#: server/stdinhand.c:4315
msgid ", Dead"
msgstr ", Mortinta"
-#: server/stdinhand.c:4270
+#: server/stdinhand.c:4318
#, c-format
msgid ", difficulty level %s"
msgstr ", ludonivelo %s"
#. TRANS: continue list, in case comma is not the separator of choice.
-#: server/stdinhand.c:4275 server/stdinhand.c:4279 client/helpdata.c:257
-#: client/helpdata.c:752 client/text.c:241 client/text.c:1224
-#: client/text.c:1262
+#: server/stdinhand.c:4323 server/stdinhand.c:4327 client/helpdata.c:257
+#: client/helpdata.c:752 client/text.c:241 client/text.c:1229
+#: client/text.c:1267
#, c-format
msgid "?clistmore:, %s"
msgstr "?clistmore:, %s"
-#: server/stdinhand.c:4283
+#: server/stdinhand.c:4331
msgid ", ready"
msgstr ", preta"
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4333
msgid ", not ready"
msgstr ", ne preta"
-#: server/stdinhand.c:4293
+#: server/stdinhand.c:4341
#, c-format
msgid " %d connection:"
msgid_plural " %d connections:"
msgstr[0] " %d konekto:"
msgstr[1] " %d konektoj:"
-#: server/stdinhand.c:4299
+#: server/stdinhand.c:4347
#, c-format
msgid " %s from %s (command access level %s), bufsize=%dkb"
msgstr ""
-#: server/stdinhand.c:4304
+#: server/stdinhand.c:4352
msgid " (observer mode)"
msgstr " (observanto)"
-#: server/stdinhand.c:4322
+#: server/stdinhand.c:4370
msgid "List of teams:"
msgstr "Gruplisto:"
#. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4332
+#: server/stdinhand.c:4380
#, c-format
msgid "%2d : '%s' : %d player"
msgid_plural "%2d : '%s' : %d players"
msgstr[0] "%2d : '%s' : %d ludanto"
msgstr[1] "%2d : '%s' : %d ludantoj"
-#: server/stdinhand.c:4352
+#: server/stdinhand.c:4400
#, c-format
msgid "%2d : '%s' : 1 player : %s"
msgstr "%2d : '%s' : 1 ludanto : %s"
-#: server/stdinhand.c:4360
+#: server/stdinhand.c:4408
#, c-format
msgid "Empty team: %s"
msgstr "Malplena grupo: %s"
-#: server/stdinhand.c:4371
+#: server/stdinhand.c:4419
msgid "List of connections to server:"
msgstr "Listo de konektoj al la servilo:"
-#: server/stdinhand.c:4375
+#: server/stdinhand.c:4423
msgid "<no connections>"
msgstr "<neniu konekto>"
-#: server/stdinhand.c:4399
+#: server/stdinhand.c:4447
msgid "List of scenarios available:"
msgstr "Listo pri scenejoj disponeblaj:"
@@ -6408,7 +6493,7 @@ msgstr "La %s estis studintaj la Estontan Teĥnologio. %d."
msgid "%s acquired from %s!"
msgstr "%s akiris el %s!"
-#: server/techtools.c:220
+#: server/techtools.c:221
#, c-format
msgid ""
"Discovery of %s makes the government form %s available. You may want to "
@@ -6416,39 +6501,39 @@ msgid ""
msgstr ""
"La eltrovo de %s igas disponebla la regsistemo %s. Vi povus deziri revolucii."
-#: server/techtools.c:301
+#: server/techtools.c:302
#, c-format
msgid "Discovery of %s OBSOLETES %s in %s!"
msgstr "Eltrovo de %s igas ARKAIKA %sn en %s!"
-#: server/techtools.c:351
+#: server/techtools.c:352
#, c-format
msgid "Learned %s. Our scientists focus on %s; goal is %s."
msgstr ""
"%s estas lernita. Niaj sciencistoj sin koncentras sur %s; la celo estas %s."
-#: server/techtools.c:369
+#: server/techtools.c:370
#, c-format
msgid "Learned %s. Scientists choose to research %s."
msgstr "%s estas lernita. Niaj sciencistoj elektas studi pri %s."
-#: server/techtools.c:376
+#: server/techtools.c:377
#, c-format
msgid "Learned %s. "
msgstr "%s estis lernita. "
-#: server/techtools.c:379
+#: server/techtools.c:380
#, c-format
msgid "Researching %s."
msgstr "Studante %sn."
-#: server/techtools.c:385
+#: server/techtools.c:386
#, c-format
msgid "Learned %s. Scientists do not know what to research next."
msgstr ""
"%s estis lernita. Do la sciencistoj ne scias tion kion ili devos studi sekve."
-#: server/techtools.c:402
+#: server/techtools.c:403
msgid ""
"Great scientists from all the world join your civilization: you get an "
"immediate advance."
@@ -6456,22 +6541,22 @@ msgstr ""
"Gravaj sciencistoj el la tuta mondo aliÄis al via civilizo: vi tuj gajnas "
"novan teĥnologion."
-#: server/techtools.c:570
+#: server/techtools.c:571
#, c-format
msgid "Technology goal is %s."
msgstr "Teĥnologia celo estas %s."
-#: server/techtools.c:700
+#: server/techtools.c:708
#, c-format
msgid "You steal %s from the %s."
msgstr "Vi forÅtelis %sn de la %s."
-#: server/techtools.c:705
+#: server/techtools.c:713
#, c-format
msgid "The %s stole %s from you!"
msgstr "La %s forÅtelis %sn de vi!"
-#: server/techtools.c:710
+#: server/techtools.c:718
#, c-format
msgid "The %s have stolen %s from the %s."
msgstr "La %s forÅtelis %sn de la %s."
@@ -6495,182 +6580,188 @@ msgstr "Neniu unuo povis esti modernigita."
msgid "%s upgraded to %s for %d gold."
msgstr "%s moderniÄis al %s per %d oraj moneroj."
-#: server/unithand.c:396
+#: server/unithand.c:402
#, c-format
msgid "%s refuses to disband!"
msgstr "%s rifuzas dissolviÄon!"
-#: server/unithand.c:449
+#: server/unithand.c:455
msgid "Can't place city here."
msgstr "Vi ne povas fondi urbon ĉi tie."
-#: server/unithand.c:456
+#: server/unithand.c:462
#, c-format
msgid "Only %s can build a city."
msgstr "Nur la %s povas fondi urbon."
-#: server/unithand.c:461
+#: server/unithand.c:467
msgid "Can't build a city."
msgstr "Estas neeble fondi urbon"
-#: server/unithand.c:470
+#: server/unithand.c:476
#, c-format
msgid "Only %s can add to a city."
msgstr "Nur la %s povas aldoniÄi al urbo"
-#: server/unithand.c:475
+#: server/unithand.c:481
msgid "Can't add to a city."
msgstr "Estas neeble aldoniÄi al urbo"
-#: server/unithand.c:481
+#: server/unithand.c:487
#, c-format
msgid "%s unit has no moves left to add to %s."
msgstr "La %s unuo ne havas plu movojn por aldoni sin al %s."
-#: server/unithand.c:487
+#: server/unithand.c:493
#, c-format
msgid "%s unit has no moves left to build city."
msgstr "La %s unuo ne havas plu movojn por fondi urbon."
-#: server/unithand.c:492
+#. TRANS: <city> is owned by <nation>, cannot add <unit>.
+#: server/unithand.c:499
+#, fuzzy, c-format
+msgid "%s is owned by %s, cannot add %s."
+msgstr "%s estas tro granda por aldoni %sn."
+
+#: server/unithand.c:506
#, c-format
msgid "%s is too big to add %s."
msgstr "%s estas tro granda por aldoni %sn."
-#: server/unithand.c:498
+#: server/unithand.c:512
#, c-format
msgid "%s needs an improvement to grow, so you cannot add %s."
msgstr "Necesas urba plibonigo por ke %s kresku, do vi ne povas aldoni %sn."
-#: server/unithand.c:509
+#: server/unithand.c:523
#, c-format
msgid "Can't add %s to %s."
msgstr "Vi ne povas aldoni %sn al %s."
-#: server/unithand.c:531
+#: server/unithand.c:545
#, c-format
msgid "%s added to aid %s in growing."
msgstr "%s aldoniÄis por helpi la kreskon de %s."
-#: server/unithand.c:828
+#: server/unithand.c:842
msgid "Your Nuclear missile was shot down by SDI defences, what a waste."
msgstr "Via atom-misilo estis paffaligita fare de SDI-defendo. Kia malÅparo."
-#: server/unithand.c:831
+#: server/unithand.c:845
#, c-format
msgid "The nuclear attack on %s was avoided by your SDI defense."
msgstr "La atom-atako en %s estas senefikigita fare de via SDI-defendo."
#. TRANS: "Your Cannon ... the Polish Destroyer."
-#: server/unithand.c:901
+#: server/unithand.c:915
#, c-format
msgid "Your %s survived the pathetic attack from the %s %s."
msgstr "Viaj %s supervivis la mizeran atakon de la %sj %s."
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unithand.c:910
+#: server/unithand.c:924
#, c-format
msgid "Your attacking %s failed against the %s %s!"
msgstr "Viaj atakantaj %s malsukcesis kontraÅ la %sj %s!"
-#: server/unithand.c:983
+#: server/unithand.c:997
#, c-format
msgid "Only %s can attack from sea."
msgstr "Nur la %s kapablas ataki de la maro."
-#: server/unithand.c:988
+#: server/unithand.c:1002
msgid "Cannot attack from sea."
msgstr "Estas neeble ataki de la maro."
-#: server/unithand.c:996 server/unittools.c:2137
+#: server/unithand.c:1010 server/unittools.c:2142
msgid "Cannot attack unless you declare war first."
msgstr "Vi ne povas ataki sen militdeklari antaÅe."
-#: server/unithand.c:1001
+#: server/unithand.c:1015
#, c-format
msgid "%s can only move into your own zone of control."
msgstr "%s povas nur movi en via influa areo."
-#: server/unithand.c:1007
+#: server/unithand.c:1021
#, c-format
msgid "Cannot invade unless you break peace with %s first."
msgstr "Vi ne povas invadi sen nuligi la pacon kun %s antaÅe."
-#: server/unithand.c:1052
+#: server/unithand.c:1066
msgid "This unit has no moves left."
msgstr "Ĉi tiu unuo ne havas plu movojn."
-#: server/unithand.c:1107
+#: server/unithand.c:1121
#, fuzzy
msgid "Unit must be on land to perform diplomatic action."
msgstr "La unuo ne povas plenumi diplomatian agon de %s."
-#: server/unithand.c:1109
+#: server/unithand.c:1123
msgid "No diplomat action possible."
msgstr "Neniu diplomatia ago estas farebla."
-#: server/unithand.c:1125
+#: server/unithand.c:1139
#, c-format
msgid "You must declare war on %s first. Try using players dialog (F3)."
msgstr ""
"Vi devas militdeklari kontraÅ %s antaÅe. Uzu la fenestron de la ludantoj "
"(F3)."
-#: server/unithand.c:1143
+#: server/unithand.c:1157
msgid "This unit is being transported, and so cannot bombard."
msgstr "Ĉi tiu unuo estas transportita, do Äi ne povas bombi."
-#: server/unithand.c:1158
+#: server/unithand.c:1172
msgid "You can't attack there."
msgstr "Vi ne povas ataki ĉi tie."
-#: server/unithand.c:1180
+#: server/unithand.c:1194
msgid "This type of troops cannot take over a city."
msgstr "Ĉi tiu speco de unuo ne povas konkeri urbon."
-#: server/unithand.c:1198
+#: server/unithand.c:1212
msgid "A transported unit is not allied to all units or city on target tile."
msgstr ""
"Transportita unuo ne estas alianca kun ĉiuj unuoj aŠkun urbo de la kahelo "
"kie Äi estas alvenonta."
-#: server/unithand.c:1240
+#: server/unithand.c:1254
#, c-format
msgid "Your %s helps build the %s in %s (%d remaining)."
msgstr "Viaj %s helpis prepari la %sn en %s (%d ceterajn)."
-#: server/unithand.c:1242
+#: server/unithand.c:1256
#, c-format
msgid "Your %s helps build the %s in %s (%d surplus)."
msgstr "Viaj %s helpis prepari la %sn en %s (troo je %d)."
-#: server/unithand.c:1286
+#: server/unithand.c:1300
#, c-format
msgid ""
"Sorry, your %s cannot establish a trade route because it has no home city"
msgstr "BedaÅre, viaj %s ne povas starigi komercan kurson ĉar mankas hejmurbon"
-#: server/unithand.c:1296
+#: server/unithand.c:1310
#, c-format
msgid "Sorry, your %s cannot establish a trade route between %s and %s"
msgstr "BedaÅre, viaj %s ne povas starigi komercan kurson inter %s kaj %s"
-#: server/unithand.c:1325 server/unithand.c:1344
+#: server/unithand.c:1339 server/unithand.c:1358
#, c-format
msgid "Sorry, your %s cannot establish a trade route here!"
msgstr "BedaÅre, viaj %s ne povas starigi komercan kurson ĉi tie!"
-#: server/unithand.c:1329 server/unithand.c:1348
+#: server/unithand.c:1343 server/unithand.c:1362
#, c-format
msgid " The city of %s already has %d better trade routes!"
msgstr " La urbo %s jam havas %d pli bonajn komercajn kursojn!"
-#: server/unithand.c:1361 server/unithand.c:1373
+#: server/unithand.c:1375 server/unithand.c:1387
#, c-format
msgid "Sorry, %s has canceled the trade route from %s to your city %s."
msgstr "BedaÅrinde, %s forigis la komercan kurson de %s Äis via urbo %s."
-#: server/unithand.c:1406
+#: server/unithand.c:1420
#, c-format
msgid ""
"Your %s from %s has arrived in %s, and revenues amount to %d in gold and "
@@ -6731,37 +6822,37 @@ msgid "Teleported your %s to %s."
msgstr "Viaj %s estis teletransportitaj al %s."
#. TRANS: A unit is moved to resolve stack conflicts.
-#: server/unittools.c:1065
+#: server/unittools.c:1070
#, fuzzy, c-format
msgid "Moved your %s."
msgstr "Viaj %s estis dissolvita."
-#: server/unittools.c:1076
+#: server/unittools.c:1081
#, c-format
msgid "Disbanded your %s."
msgstr "Viaj %s estis dissolvita."
-#: server/unittools.c:1397
+#: server/unittools.c:1402
#, c-format
msgid "Unable to defend %s, %s has lost the game."
msgstr "Oni malkapablas defendi %sn, %s malvenkis la ludon."
-#: server/unittools.c:1401
+#: server/unittools.c:1406
#, c-format
msgid "Losing %s meant losing the game! Be more careful next time!"
msgstr "Perdi %sn signifas malvenki! Estu pli zorgema venont-foje!"
-#: server/unittools.c:1503
+#: server/unittools.c:1508
#, c-format
msgid "%s escaped the destruction of %s, and fled to %s."
msgstr "%s forkuris de la detruo de %s, kaj rifuÄis en %s."
-#: server/unittools.c:1512
+#: server/unittools.c:1517
#, c-format
msgid "%s lost when %s was lost."
msgstr "%s malvenkis pro la perdo de %s."
-#: server/unittools.c:1561
+#: server/unittools.c:1566
#, c-format
msgid "Barbarian leader captured, %d gold ransom paid."
msgstr ""
@@ -6769,19 +6860,19 @@ msgstr ""
"pagita."
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unittools.c:1579
+#: server/unittools.c:1584
#, c-format
msgid "Your attacking %s succeeded against the %s %s!"
msgstr "Viaj atakantaj %s sukcesis kontraÅ la %sj %s!"
#. TRANS: "Cannon ... the Polish Destroyer."
-#: server/unittools.c:1588 server/unittools.c:1646
+#: server/unittools.c:1593 server/unittools.c:1651
#, c-format
msgid "%s lost to an attack by the %s %s."
msgstr "%s pereis pro atako de la %sj %s."
#. TRANS: "... Cannon ... the Polish Destroyer ...."
-#: server/unittools.c:1622
+#: server/unittools.c:1627
#, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -6791,14 +6882,14 @@ 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:1655
+#: server/unittools.c:1660
#, c-format
msgid "%s lost when the %s %s attacked the %s %s."
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:1670
+#: server/unittools.c:1675
#, c-format
msgid "%s (and %s) lost to an attack from the %s %s."
msgstr "%s (kaj %s) pereis pro atako de la %sj %s."
@@ -6806,7 +6897,7 @@ 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."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1680
+#: server/unittools.c:1685
#, 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."
@@ -6816,182 +6907,224 @@ 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."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1694
+#: server/unittools.c:1699
#, 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 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:1962
+#: server/unittools.c:1967
#, c-format
msgid "Your %s was nuked by %s."
msgstr "Via %s estis atombombita fare de %s."
-#: server/unittools.c:1965 server/unittools.c:1981
+#: server/unittools.c:1970 server/unittools.c:1986
msgid "yourself"
msgstr "vi mem"
-#: server/unittools.c:1969
+#: server/unittools.c:1974
#, c-format
msgid "The %s %s was nuked."
msgstr "La %sj %s estis atombombitaj"
-#: server/unittools.c:1978
+#: server/unittools.c:1983
#, c-format
msgid "%s was nuked by %s."
msgstr "%s estis atombombita fare de %s."
-#: server/unittools.c:1986
+#: server/unittools.c:1991
#, c-format
msgid "You nuked %s."
msgstr "Vi atombombis %sn."
-#: server/unittools.c:2027
+#: server/unittools.c:2032
#, c-format
msgid "The %s detonated a nuke!"
msgstr "La %s eksplodigis atombombon!"
-#: server/unittools.c:2051
+#: server/unittools.c:2056
#, c-format
msgid "%s transported successfully."
msgstr "%s estis transportitaj sukcese."
-#: server/unittools.c:2103
+#: server/unittools.c:2108
msgid "This unit type can not be paradropped."
msgstr "Ĉi tiu speco de unuo ne estas paraÅutebla."
-#: server/unittools.c:2113
+#: server/unittools.c:2118
msgid "You cannot paradrop a unit that is transporting other units."
msgstr "Vi ne povas paraÅutigi unuon kiu transportas alian unuon."
-#: server/unittools.c:2119
+#: server/unittools.c:2124
msgid "The destination location is not known."
msgstr "La alvenpunkto estas nekonata."
-#: server/unittools.c:2126
+#: server/unittools.c:2131
#, c-format
msgid "This unit cannot paradrop into %s."
msgstr "Ĉi tiu unuo ne povas paraÅuti en %sn."
-#: server/unittools.c:2146
+#: server/unittools.c:2151
#, c-format
msgid "The distance to the target (%i) is greater than the unit's range (%i)."
msgstr "La distanco de la celo (%i) superas la aÅtonomion de la unuo (%i)."
-#: server/unittools.c:2157
+#: server/unittools.c:2162
#, c-format
msgid "Your %s paradropped into the %s and was lost."
msgstr "Viaj %s paraÅutis en la %s kaj estis perdita."
-#: server/unittools.c:2170
+#: server/unittools.c:2175
#, c-format
msgid "Your %s was killed by enemy units at the paradrop destination."
msgstr ""
"Viaj %s estis mortigita fare de malamikaj unuoj ĉe la paraÅuta alvenpunkto."
-#: server/unittools.c:2192
+#: server/unittools.c:2197
#, c-format
msgid "You found %d gold."
msgstr "Vi trovis %d oraj monerojn."
-#: server/unittools.c:2209
+#: server/unittools.c:2214
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr "Vi trovis %sn en antikvaj pergamenoj de saÄo."
-#: server/unittools.c:2216
+#: server/unittools.c:2221
#, fuzzy, c-format
msgid "The %s have acquired %s from ancient scrolls of wisdom."
msgstr ""
"%s akiris %sn el antikvaj pergamenoj de saÄo."
-#: server/unittools.c:2230
+#: server/unittools.c:2235
msgid "A band of friendly mercenaries joins your cause."
msgstr "Bando da amikaj dungosoldatoj aliÄas al via idealo."
-#: server/unittools.c:2248
+#: server/unittools.c:2253
msgid "An abandoned village is here."
msgstr "Ĉi tie estas forlasita vilaÄo."
-#: server/unittools.c:2258
+#: server/unittools.c:2263
msgid "You have unleashed a horde of barbarians!"
msgstr "Vi senbridigis hordon de barbaroj!"
-#: server/unittools.c:2261
+#: server/unittools.c:2266
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr "Viaj %s estis mortigita de la barbaroj!"
-#: server/unittools.c:2277
+#: server/unittools.c:2282
msgid "You found a friendly city."
msgstr "Vi trovis amikan urbon."
-#: server/unittools.c:2291
+#: server/unittools.c:2296
msgid "Friendly nomads are impressed by you, and join you."
msgstr "Amikaj nomadoj restis imponitaj de vi, kaj ili aliÄas al vi."
-#: server/unittools.c:2316
+#: server/unittools.c:2321
msgid "Your overflight frightens the tribe; they scatter in terror."
msgstr "Via superflugo teruris la tribon; ili forkuris terruroplenaj."
-#: server/unittools.c:2574
+#: server/unittools.c:2579
#, c-format
msgid "Orders for %s aborted after enemy movement was spotted."
msgstr ""
"La ordonoj por %s estis nuligitaj post la ĉesigo de la movoj de la malamiko."
-#: server/unittools.c:3023
+#: server/unittools.c:3028
#, c-format
msgid "Orders for %s aborted as there are units nearby."
msgstr "La ordonoj por %s estis nuligitaj ĉar estas proksimaj unuoj."
-#: server/unittools.c:3075
+#: server/unittools.c:3080
#, c-format
msgid "Orders for %s aborted because building of city failed."
msgstr ""
"La ordonoj por %s estis nuligitaj ĉar la konstruado de urbo malsukcesis."
-#: server/unittools.c:3088
+#: server/unittools.c:3093
#, c-format
msgid "Orders for %s aborted since they give an invalid activity."
msgstr "La ordonoj por %s estis nuligitaj Äis ili estos nevalidaj agoj."
-#: server/unittools.c:3102
+#: server/unittools.c:3107
#, c-format
msgid "Orders for %s aborted since they give an invalid location."
msgstr "La ordonoj por %s estis nuligitaj ĉar ili havas nevalidan lokiÄon."
-#: server/unittools.c:3112
+#: server/unittools.c:3117
#, c-format
msgid "Orders for %s aborted as there are units in the way."
msgstr "La ordonoj por %s estis nuligitaj ĉar estas unuoj en la vojo."
-#: server/unittools.c:3138
+#: server/unittools.c:3143
#, c-format
msgid "Orders for %s aborted because of failed move."
msgstr "La ordonoj por %s estis nuligitaj pro malsukcesa movo."
-#: server/unittools.c:3179
+#: server/unittools.c:3184
#, c-format
msgid "Attempt to change homecity for %s failed."
msgstr "AnstataÅigo de nuna hejmurbo per %s malsukcesis."
-#: server/unittools.c:3190
+#: server/unittools.c:3195
#, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr "Malsukcesis provo por starigi komercan kurson por %s."
-#: server/unittools.c:3202
+#: server/unittools.c:3207
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr "Malsukcesis provo por konstrui mirindaĵon por %s."
-#: server/unittools.c:3211
+#: server/unittools.c:3216
#, c-format
msgid "Your %s has invalid orders."
msgstr "Viaj %s havas nevalidajn ordonojn."
+#: server/voting.c:522
+#, fuzzy, c-format
+msgid ""
+"%s %d \"%s\" is passed %d to %d with %d abstentions and %d who did not vote."
+msgstr "Voĉo \"%s\" estas akceptita: %d favore, %d malfavore, %d sindetene."
+
+#: server/voting.c:528
+#, fuzzy, c-format
+msgid ""
+"%s %d \"%s\" failed with %d against, %d for, %d abstentions and %d who did "
+"not vote."
+msgstr "Voĉo \"%s\" ne estas akceptita: %d malfavore, %d favore, %d sindetene."
+
+#: server/voting.c:548
+#, c-format
+msgid "%s %d: %s voted yes."
+msgstr ""
+
+#: server/voting.c:553
+#, c-format
+msgid "%s %d: %s voted no."
+msgstr ""
+
+#: server/voting.c:558
+#, c-format
+msgid "%s %d: %s chose to abstain."
+msgstr ""
+
+#. TRANS: Describing a new vote that can only pass
+#. * if there are no dissenting votes.
+#: server/voting.c:726
+#, c-format
+msgid "%s (needs %0.0f%% and no dissent)."
+msgstr ""
+
+#. TRANS: Describing a new vote that can pass only if the
+#. * given percentage of players votes 'yes'.
+#: server/voting.c:732
+#, c-format
+msgid "%s (needs %0.0f%% in favor)."
+msgstr ""
+
#: server/generator/mapgen.c:1771
msgid "High landmass - this may take a few seconds."
msgstr ""
@@ -7019,12 +7152,12 @@ msgid ""
"Please report this bug at %s."
msgstr ""
-#: client/attribute.c:363
+#: client/attribute.c:368
msgid ""
"There has been a CMA error. Your citizen governor settings may be broken."
msgstr ""
-#: client/attribute.c:367
+#: client/attribute.c:372
msgid "Old attributes detected and removed."
msgstr ""
@@ -7174,41 +7307,41 @@ msgstr "%+4d : Civitanoj\n"
msgid "%+4d : Taxed from trade\n"
msgstr "%+4d : Impostoj el komerco\n"
-#: client/citydlg_common.c:418
+#: client/citydlg_common.c:421
#, c-format
msgid "%+4d : Trade route with %s\n"
msgstr "%+4d : Komerca kurso kun %s\n"
-#: client/citydlg_common.c:427
+#: client/citydlg_common.c:430
#, c-format
msgid "%+4d : Building tithes\n"
msgstr "%+4d : Dekonaĵoj de konstruado\n"
-#: client/citydlg_common.c:450
+#: client/citydlg_common.c:453
#, c-format
msgid "%+4d : Bonus from %s (%+d%%)\n"
msgstr "%+4d : Pluso el %s (%+d%%)\n"
-#: client/citydlg_common.c:462
+#: client/citydlg_common.c:465
#, c-format
msgid "%+4d : Waste\n"
msgstr "%+4d : MalÅparo\n"
-#: client/citydlg_common.c:468
+#: client/citydlg_common.c:471
#, c-format
msgid "%+4d : Disorder\n"
msgstr "%+4d : Tumulto\n"
-#: client/citydlg_common.c:474
+#: client/citydlg_common.c:477
#, c-format
msgid "%+4d : Used\n"
msgstr "%+4d : Uzata\n"
-#: client/citydlg_common.c:479
+#: client/citydlg_common.c:482
msgid "==== : Adds up to\n"
msgstr "==== : Aldonita al\n"
-#: client/citydlg_common.c:481
+#: client/citydlg_common.c:484
#, c-format
msgid "%4d : Total surplus"
msgstr "%4d : Suma troo"
@@ -7520,48 +7653,48 @@ msgstr "?specialist:S"
msgid "Specialists"
msgstr "Specialistoj: %s"
-#: client/civclient.c:240
+#: client/civclient.c:241
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr ""
-#: client/civclient.c:250
+#: client/civclient.c:251
msgid " -l, --log FILE\tUse FILE as logfile (spawned server also uses this)\n"
msgstr ""
-#: client/civclient.c:252
+#: client/civclient.c:253
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr ""
-#: client/civclient.c:254
+#: client/civclient.c:255
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr ""
-#: client/civclient.c:256
+#: client/civclient.c:257
msgid " -p, --port PORT\tConnect to server port PORT (usually with -a)\n"
msgstr ""
-#: client/civclient.c:258
+#: client/civclient.c:259
#, c-format
msgid " -P, --Plugin PLUGIN\tUse PLUGIN for sound output %s\n"
msgstr ""
-#: client/civclient.c:260
+#: client/civclient.c:261
msgid " -r, --read FILE\tRead startup script FILE (for spawned server only)\n"
msgstr ""
-#: client/civclient.c:263
+#: client/civclient.c:264
msgid " -s, --server HOST\tConnect to the server at HOST (usually with -a)\n"
msgstr ""
-#: client/civclient.c:265
+#: client/civclient.c:266
msgid " -S, --Sound FILE\tRead sound tags from FILE\n"
msgstr ""
-#: client/civclient.c:266
+#: client/civclient.c:267
msgid " -t, --tiles FILE\tUse data file FILE.tilespec for tiles\n"
msgstr ""
-#: client/civclient.c:269
+#: client/civclient.c:270
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7569,45 +7702,45 @@ msgid ""
msgstr ""
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:274
+#: client/civclient.c:275
#, c-format
msgid "Report bugs at %s\n"
msgstr "Bonvolu raporti pri la eraro al %s\n"
-#: client/civclient.c:298
+#: client/civclient.c:299
#, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr ""
-#: client/civclient.c:300 client/civclient.c:315
+#: client/civclient.c:301 client/civclient.c:316
msgid "Try using --help.\n"
msgstr ""
-#: client/civclient.c:313
+#: client/civclient.c:314
#, c-format
msgid "Invalid debug level \"%s\" specified with --debug option.\n"
msgstr ""
-#: client/civclient.c:326
+#: client/civclient.c:327
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr "Nekonata opcio: \"%s\"\n"
-#: client/civclient.c:391
+#: client/civclient.c:393
#, fuzzy, c-format
msgid "Updating old metaserver address \"%s\"."
msgstr "metaserver <adreso>"
-#: client/civclient.c:394
+#: client/civclient.c:396
#, fuzzy, c-format
msgid "Default metaserver has been set to \"%s\"."
msgstr "Opcio: %s estis agordita je \"%s\"."
-#: client/civclient.c:550
+#: client/civclient.c:540
msgid "Game started."
msgstr "La ludo komencas."
-#: client/civclient.c:588
+#: client/civclient.c:606
msgid "There was an error while auto connecting; aborting."
msgstr ""
@@ -7738,19 +7871,19 @@ msgstr "La konekto estas plenumanta."
msgid "Disconnected from server."
msgstr "Malkonektita de la servilo."
-#: client/clinet.c:469
+#: client/clinet.c:473
#, 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
+#: client/clinet.c:488 client/clinet.c:490
msgid "Connection to server refused. Please start the server."
msgstr ""
"La konekto kun la servilo estis rifuzita. Bonvolu startigi la servilon."
-#: client/clinet.c:495 client/clinet.c:523
+#: client/clinet.c:499 client/clinet.c:527
#, c-format
msgid ""
"Error contacting server \"%s\" at port %d as \"%s\":\n"
@@ -7759,7 +7892,7 @@ msgstr ""
"Eraro dum konektado kun la servilo \"%s\" ĉe la pordo %d kiel \"%s\":\n"
" %s\n"
-#: client/clinet.c:514
+#: client/clinet.c:518
#, c-format
msgid ""
"Auto-connecting to server \"%s\" at port %d as \"%s\" every %f second(s) for "
@@ -7768,58 +7901,58 @@ 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:1358
+#: client/connectdlg_common.c:78 client/gui-gtk-2.0/pages.c:1358
#, fuzzy
msgid "novice"
msgstr "Novico"
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1358
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
#, fuzzy
msgid "easy"
msgstr "Facila"
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1359
#, fuzzy
msgid "normal"
msgstr "Normala"
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
#, fuzzy
msgid "hard"
msgstr "Malfacila"
-#: client/connectdlg_common.c:83
+#: client/connectdlg_common.c:82
#, fuzzy
msgid "experimental"
msgstr "Eksperimenta"
-#: client/connectdlg_common.c:213
+#: client/connectdlg_common.c:212
msgid "Starting server..."
msgstr "Preparado de la servilo..."
-#: client/connectdlg_common.c:332
+#: client/connectdlg_common.c:331
msgid "Couldn't start the server."
msgstr "Estas neeble startigi la servilon."
-#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
+#: client/connectdlg_common.c:332 client/connectdlg_common.c:365
msgid "You'll have to start one manually. Sorry..."
msgstr "Vi devos mane startigi Äin. Ni bedaÅras..."
-#: client/connectdlg_common.c:364
+#: client/connectdlg_common.c:363
msgid "Couldn't connect to the server."
msgstr "Estas neeble konektiÄi al la servilo."
-#: client/connectdlg_common.c:365
+#: client/connectdlg_common.c:364
msgid "We probably couldn't start it from here."
msgstr "Eble ni ne povas startigi Äin de ĉi tie."
-#: client/connectdlg_common.c:470
+#: client/connectdlg_common.c:469
#, fuzzy
msgid ""
"Established control over the server. You have command access level 'hack'."
msgstr "Ni mastrumas la servilo (la nivelo de komand-rajto estas hack)"
-#: client/connectdlg_common.c:475
+#: client/connectdlg_common.c:474
msgid ""
"Failed to obtain the required access level to take control of the server. "
"The server will now be shutdown."
@@ -7829,27 +7962,27 @@ msgstr ""
msgid "Only transporter units can be unloaded."
msgstr "Nur la kargo-Åipoj povas esti malÅargitaj."
-#: client/control.c:1425
+#: client/control.c:1417
msgid "Only settler units can be put into auto mode."
msgstr "Nur la farmistoj povas esti aÅtomate mastrumitaj."
-#: client/control.c:1516
+#: client/control.c:1511
msgid "Only nuclear units can do this."
msgstr "Nur la atomaj unuoj povas fari tion."
-#: client/control.c:1545
+#: client/control.c:1540
msgid "Only paratrooper units can do this."
msgstr "Nur la paraÅutistoj povas fari tion."
-#: client/control.c:2020
+#: client/control.c:2015
msgid "Too far for this unit."
msgstr "Tro malproksima por ĉi tiu unuo."
-#: client/control.c:2230 client/control.c:2260 client/control.c:2276
+#: client/control.c:2225 client/control.c:2255 client/control.c:2271
msgid "Didn't find a route to the destination!"
msgstr "Estas neeble trovi irvojon por la alvenpunkto!"
-#: client/control.c:2320
+#: client/control.c:2315
msgid "Oh my! You seem to have no capital!"
msgstr "Oh ve! Ŝajnas ke via nacio ne havas ĉefurbon!"
@@ -8251,27 +8384,34 @@ msgstr ""
#. * last two elements
#. TRANS: List of possible output types has this between
#. * last two elements
-#: client/helpdata.c:1066 client/helpdata.c:1400
+#: client/helpdata.c:1066 client/helpdata.c:1408
msgid " or "
msgstr " aÅ "
-#: client/helpdata.c:1068 client/helpdata.c:1388
+#: client/helpdata.c:1068 client/helpdata.c:1396
msgid "?or:, "
msgstr "?or:, "
-#: client/helpdata.c:1080
+#: client/helpdata.c:1079
+#, c-format
+msgid "* Unit has to be in a city, or a base after %d turn.\n"
+msgid_plural "* Unit has to be in a city, or a base after %d turns.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: client/helpdata.c:1087
#, 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"
+msgid "* Unit has to be in a city, a base, or on a %s after %d turn.\n"
+msgid_plural "* Unit has to be in a city, a base, or on a %s after %d turns.\n"
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1122
+#: client/helpdata.c:1130
#, c-format
msgid "If we would now start with %s we would need %d bulbs."
msgstr "Se ni deziras komenci kun %s, al ni necesas %d ampoloj."
-#: client/helpdata.c:1127
+#: client/helpdata.c:1135
#, c-format
msgid ""
"To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8280,90 +8420,90 @@ msgstr ""
"Por atingi %sn, ni bezonas akiri %d aliajn teÄ¥nologioj antaÅe. La tuta "
"projekto bezonas %d ampolojn por plenumi."
-#: client/helpdata.c:1135
+#: client/helpdata.c:1143
msgid "You cannot research this technology."
msgstr "Vi ne povas studi tiun ĉi teĥnologion."
-#: client/helpdata.c:1139
+#: client/helpdata.c:1147
msgid " This number may vary depending on what other players will research.\n"
msgstr ""
" Tiu ĉi numero povas varii laŠtio kion la aliaj ludantoj estas "
"pristudantaj.\n"
-#: client/helpdata.c:1151
+#: client/helpdata.c:1159
#, c-format
msgid "* The first player to research %s gets an immediate advance.\n"
msgstr ""
-#: client/helpdata.c:1156
+#: client/helpdata.c:1164
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
msgstr ""
-#: client/helpdata.c:1159
+#: client/helpdata.c:1167
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
msgstr ""
-#: client/helpdata.c:1163
+#: client/helpdata.c:1171
msgid "* Increases the pollution generated by the population.\n"
msgstr ""
-#: client/helpdata.c:1168
+#: client/helpdata.c:1176
#, c-format
msgid "* Allows %s to build roads on river squares.\n"
msgstr ""
-#: client/helpdata.c:1175
+#: client/helpdata.c:1183
#, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr ""
-#: client/helpdata.c:1183
+#: client/helpdata.c:1191
#, c-format
msgid "* Allows %s to build airbases.\n"
msgstr ""
-#: client/helpdata.c:1192
+#: client/helpdata.c:1200
#, c-format
msgid "* Allows %s to upgrade roads to railroads.\n"
msgstr ""
-#: client/helpdata.c:1200
+#: client/helpdata.c:1208
#, c-format
msgid "* Allows %s to upgrade irrigation to farmland.\n"
msgstr ""
-#: client/helpdata.c:1234
+#: client/helpdata.c:1242
msgid "* Pollution cannot be generated on this terrain."
msgstr ""
-#: client/helpdata.c:1239
+#: client/helpdata.c:1247
msgid "* You cannot build cities on this terrain."
msgstr ""
-#: client/helpdata.c:1245
+#: client/helpdata.c:1253
msgid "* The coastline of this terrain is unsafe."
msgstr ""
-#: client/helpdata.c:1250
+#: client/helpdata.c:1258
msgid "* This terrain is unsafe for units to travel on."
msgstr ""
-#: client/helpdata.c:1255
+#: client/helpdata.c:1263
msgid "* Land units cannot travel on oceanic terrains."
msgstr ""
-#: client/helpdata.c:1305
+#: client/helpdata.c:1313
msgid "Features:\n"
msgstr ""
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1411 client/helpdata.c:1412
+#: client/helpdata.c:1419 client/helpdata.c:1420
msgid "?outputlist: Nothing "
msgstr "?outputlist: Nenio "
-#: client/helpdata.c:1419
+#: client/helpdata.c:1427
#, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -8374,7 +8514,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1429
+#: client/helpdata.c:1437
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8382,48 +8522,48 @@ msgid ""
msgstr ""
#. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1437
+#: client/helpdata.c:1445
#, c-format
msgid "* You pay %d times normal %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1442
+#: client/helpdata.c:1450
#, 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:1447
+#: client/helpdata.c:1455
#, c-format
msgid "* You pay no %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1451
+#: client/helpdata.c:1459
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:1460
+#: client/helpdata.c:1468
#, 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:1468
+#: client/helpdata.c:1476
#, c-format
msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
msgstr ""
-#: client/helpdata.c:1475
+#: client/helpdata.c:1483
#, 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:1482
+#: client/helpdata.c:1490
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -8431,23 +8571,23 @@ msgid ""
msgstr ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1489
+#: client/helpdata.c:1497
#, 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:1497
+#: client/helpdata.c:1505
#, c-format
msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
msgstr ""
-#: client/helpdata.c:1502
+#: client/helpdata.c:1510
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr ""
-#: client/helpdata.c:1507
+#: client/helpdata.c:1515
#, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -8458,7 +8598,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1519
+#: client/helpdata.c:1527
#, 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"
@@ -8466,60 +8606,60 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1530
+#: client/helpdata.c:1538
#, 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:1536
+#: client/helpdata.c:1544
msgid "* Your units cannot be bribed.\n"
msgstr ""
-#: client/helpdata.c:1539
+#: client/helpdata.c:1547
msgid "* Your cities cannot be incited.\n"
msgstr ""
-#: client/helpdata.c:1543
+#: client/helpdata.c:1551
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:1549
+#: client/helpdata.c:1557
msgid "* Has a senate that may prevent declaration of war.\n"
msgstr ""
-#: client/helpdata.c:1553
+#: client/helpdata.c:1561
msgid "* Allows partisans when cities are taken by the enemy.\n"
msgstr ""
-#: client/helpdata.c:1557
+#: client/helpdata.c:1565
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
msgstr ""
-#: client/helpdata.c:1561
+#: client/helpdata.c:1569
msgid "* Pays no upkeep for fanatics.\n"
msgstr ""
-#: client/helpdata.c:1564
+#: client/helpdata.c:1572
msgid "* Has no unhappy citizens.\n"
msgstr ""
-#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
+#: client/helpdata.c:1582 client/helpdata.c:1586 client/helpdata.c:1590
#, c-format
msgid "* Veteran %s units.\n"
msgstr ""
-#: client/helpdata.c:1585
+#: client/helpdata.c:1593
msgid "* Veteran units.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1591
+#: client/helpdata.c:1599
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8527,7 +8667,7 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1600
+#: client/helpdata.c:1608
#, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8535,71 +8675,71 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1608
+#: client/helpdata.c:1616
#, 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:1617
+#: client/helpdata.c:1625
#, c-format
msgid "* %s production is increased %d%%.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1625
+#: client/helpdata.c:1633
#, c-format
msgid "* %s production will suffer massive waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1630
+#: client/helpdata.c:1638
#, c-format
msgid "* %s production will suffer some waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1635
+#: client/helpdata.c:1643
#, 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:1643
+#: client/helpdata.c:1651
#, 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:1649
+#: client/helpdata.c:1657
#, 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:1655
+#: client/helpdata.c:1663
#, c-format
msgid "* %s waste will increase slowly with distance from capital.\n"
msgstr ""
-#: client/helpdata.c:1672
+#: client/helpdata.c:1680
#, c-format
msgid "* Allows you to build %s.\n"
msgstr ""
#. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1699
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d %s"
msgstr "%s%d %s"
-#: client/helpdata.c:1700 client/helpdata.c:1708 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1708 client/helpdata.c:1716 client/gui-sdl/mapview.c:810
#: client/gui-sdl/mapview.c:816 client/gui-sdl/mapview.c:822
msgid "?blistmore:, "
msgstr "?blistmore:, "
#. TRANS: "2 unhappy" or ", 1 unhappy"
-#: client/helpdata.c:1707
+#: client/helpdata.c:1715
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d malkontenta(j)"
@@ -8668,7 +8808,7 @@ msgid ""
"or with the -a command-line parameter."
msgstr ""
-#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:916 data/Freeciv.in:107
msgid "Metaserver"
msgstr "Metaservilo"
@@ -9018,36 +9158,36 @@ msgstr "La konservo malsukcesis, estas neeble skribi en la dosiero %s"
msgid "Saved settings to file %s"
msgstr "La agordaĵoj estas konservitaj en la dosiero %s"
-#: client/packhand.c:211 client/packhand.c:217
+#: client/packhand.c:212 client/packhand.c:218
#, fuzzy
msgid "You were rejected from the game...."
msgstr "Vi estis forpelitaj de la ludo: %s"
-#: client/packhand.c:229
+#: client/packhand.c:230
#, c-format
msgid "Client capability string: %s"
msgstr "Ĉeno de la klientokapacito: %s"
-#: client/packhand.c:232
+#: client/packhand.c:233
#, c-format
msgid "Server capability string: %s"
msgstr "Ĉeno de la servilkapacito: %s"
-#: client/packhand.c:850
+#: client/packhand.c:864
#, c-format
msgid "Start of turn %d"
msgstr "Komenco de la %da vico"
-#: client/packhand.c:1591
+#: client/packhand.c:1621
#, c-format
msgid "AI Mode is now %s."
msgstr "La IA-moduso nun estas %s."
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "ON"
msgstr "aktiva"
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "OFF"
msgstr "malaktiva"
@@ -9079,15 +9219,15 @@ msgstr "?Player:Nomo"
msgid "Username"
msgstr "Uzantonomo"
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
-#: client/gui-gtk-2.0/pages.c:2157
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:653
+#: client/gui-gtk-2.0/pages.c:1604 client/gui-gtk-2.0/pages.c:2159
msgid "Flag"
msgstr "Flago"
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1605
-#: client/gui-gtk-2.0/pages.c:2159 client/gui-sdl/repodlgs.c:2063
-#: client/gui-win32/connectdlg.c:990 client/gui-win32/dialogs.c:542
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:657
+#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1609
+#: client/gui-gtk-2.0/pages.c:2161 client/gui-sdl/repodlgs.c:2063
+#: client/gui-win32/connectdlg.c:992 client/gui-win32/dialogs.c:542
#: client/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "Nacio"
@@ -9100,7 +9240,7 @@ msgstr "Landlimo"
msgid "Score"
msgstr "Poentaro"
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1614
msgid "Team"
msgstr "Grupo"
@@ -9133,36 +9273,36 @@ msgstr "?Player_dlg:Nenifaro"
msgid "Ping"
msgstr "Ping"
-#: client/repodlgs_common.c:375
+#: client/repodlgs_common.c:378
msgid "You cannot sell improvements."
msgstr "Vi ne povas vendi la urbajn plibonigojn."
-#: client/repodlgs_common.c:391
+#: client/repodlgs_common.c:394
#, c-format
msgid "Sold %d %s for %d gold."
msgstr "Venditaj %d %s por %d oraj moneroj."
-#: client/repodlgs_common.c:396
+#: client/repodlgs_common.c:399
#, c-format
msgid "No %s could be sold."
msgstr "%s ne povus esti venditaj."
#. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:415
+#: client/repodlgs_common.c:418
msgid "You cannot disband units."
msgstr "Vi ne povas dissolvi la unuojn."
-#: client/repodlgs_common.c:420
+#: client/repodlgs_common.c:423
#, c-format
msgid "%s cannot be disbanded."
msgstr "%s ne povas esti dissolvitaj."
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:444
#, c-format
msgid "Disbanded %d %s."
msgstr "Dissolvita(j) %d %s."
-#: client/repodlgs_common.c:445
+#: client/repodlgs_common.c:448
#, c-format
msgid "No %s could be disbanded."
msgstr "%s ne povus esti dissolvitaj."
@@ -9751,47 +9891,47 @@ msgstr "?dys/hrs:%02dg %02dh"
msgid "?duration:overflow"
msgstr "?duration:troo"
-#: client/text.c:1143
+#: client/text.c:1145
#, c-format
msgid "%6d.%02d ms"
msgstr "%6d.%02d ms"
#. TRANS: <nation adjective> <government name>.
#. * E.g. "Polish Republic".
-#: client/text.c:1188
+#: client/text.c:1193
#, fuzzy, c-format
msgid "?nationgovernment:%s %s"
msgstr "Regsistemo: %s"
#. TRANS: "Observer: 1985"
-#: client/text.c:1198
+#: client/text.c:1203
#, c-format
msgid "Observer: %s"
msgstr "Observanto: %s"
-#: client/text.c:1216
+#: client/text.c:1221
msgid "Buildings: "
msgstr "Konstruaĵoj: "
-#: client/text.c:1233 client/text.c:1272
+#: client/text.c:1238 client/text.c:1277
msgid "None. "
msgstr "Neniu. "
-#: client/text.c:1235 client/text.c:1274
+#: client/text.c:1240 client/text.c:1279
msgid "?clistend:."
msgstr "?clistend:."
-#: client/text.c:1253
+#: client/text.c:1258
msgid "Wonders: "
msgstr "Mirindaĵoj: "
-#: client/text.c:1308
+#: client/text.c:1313
#, c-format
msgid "Cities: %d total, %d over threshold of %d cities."
msgstr "Urboj: %d sume, %d trans la sojlo de %d urboj."
#. TRANS: 0-21 content [citizen(s)] ...
-#: client/text.c:1312
+#: client/text.c:1317
#, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
@@ -9799,26 +9939,26 @@ 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:1318
+#: client/text.c:1323
#, c-format
msgid "%d additional unhappy citizen."
msgid_plural "%d additional unhappy citizens."
msgstr[0] "%d aldona malkontenta civitano."
msgstr[1] "%d aldonaj malkontentaj civitanoj."
-#: client/text.c:1339
+#: client/text.c:1344
#, fuzzy
msgid "Unlimited martial law in effect."
msgstr "Milita leÄo plenumanta ("
-#: client/text.c:1341
+#: client/text.c:1346
#, c-format
msgid "%d military unit may impose martial law."
msgid_plural "Up to %d military units may impose martial law."
msgstr[0] ""
msgstr[1] ""
-#: client/text.c:1345
+#: client/text.c:1350
#, fuzzy, c-format
msgid "Each military unit makes %d unhappy citizen content."
msgid_plural "Each military unit makes %d unhappy citizens content."
@@ -9829,37 +9969,37 @@ msgstr[1] ""
"Äœi amuzas la civitanoj de unu urbo kaj igas kontentaj tri malkontentaj "
"civitanoj."
-#: client/text.c:1352
+#: client/text.c:1357
msgid "Military units in the field may cause unhappiness. "
msgstr "Armeaj unuoj en la areo povus kaÅzi malkontenton. "
-#: client/text.c:1355
+#: client/text.c:1360
msgid "Military units have no happiness effect. "
msgstr "Armeaj unuoj ne havas feliĉigantan efikon. "
-#: client/text.c:1370
+#: client/text.c:1375
#, fuzzy, c-format
msgid "Luxury: %d total."
msgstr "Lukso: %d sume."
-#: client/tilespec.c:865
+#: client/tilespec.c:882
msgid "No usable default tileset found, aborting!"
msgstr "Neniu defaÅlta grafikaĵo estas trovita, do oni eliras!"
-#: client/tilespec.c:1338
+#: client/tilespec.c:1355
#, fuzzy
msgid ""
"Client does not support isometric tilesets. Using default tileset instead."
msgstr "La kliento ne subtenas izometrian grafikaĵon."
-#: client/tilespec.c:1347
+#: client/tilespec.c:1364
#, fuzzy
msgid ""
"Client does not support overhead view tilesets. Using default tileset "
"instead."
msgstr "La kliento ne subtenas trarigardantajn grafikaĵojn."
-#: client/tilespec.c:3966
+#: client/tilespec.c:3987
#, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -10545,7 +10685,7 @@ msgid "_Display"
msgstr "_Ekrano"
#: client/gui-gtk-2.0/cityrep.c:1006 client/gui-gtk-2.0/menu.c:839
-#: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
+#: client/gui-sdl/diplodlg.c:692 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
#: client/gui-xaw/cityrep.c:533 client/gui-xaw/menu.c:156
@@ -10713,192 +10853,192 @@ msgstr ""
msgid "Remove this preset?"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:222
+#: client/gui-gtk-2.0/dialogs.c:197 client/gui-gtk-2.0/messagewin.c:222
msgid "Goto _Location"
msgstr "Iru al _loko"
-#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
+#: client/gui-gtk-2.0/dialogs.c:202 client/gui-gtk-2.0/messagewin.c:226
msgid "Inspect _City"
msgstr "_Enketi la urbon"
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:258 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 vi deziras la revolucion?"
-#: client/gui-gtk-2.0/dialogs.c:258 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:259 client/gui-sdl/dialogs.c:2104
#: client/gui-win32/dialogs.c:975 data/Freeciv.in:2462
msgid "Revolution!"
msgstr "Revolucio!"
-#: client/gui-gtk-2.0/dialogs.c:311 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:312 client/gui-sdl/dialogs.c:1742
#: client/gui-win32/dialogs.c:1748 data/Freeciv.in:2500
msgid "What To Pillage"
msgstr "Kio estas disrabenda"
-#: client/gui-gtk-2.0/dialogs.c:312 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:313 client/gui-win32/dialogs.c:1755
#: data/Freeciv.in:2502
msgid "Select what to pillage:"
msgstr "Kio estas disrabenda:"
-#: client/gui-gtk-2.0/dialogs.c:506
+#: client/gui-gtk-2.0/dialogs.c:507
msgid "Unit"
msgstr "Unuo"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:950
-#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2155
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:985
+#: client/gui-gtk-2.0/dialogs.c:508 client/gui-gtk-2.0/pages.c:950
+#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2157
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:987
#: client/gui-win32/plrdlg.c:335 manual/civmanual.c:302 data/Freeciv.in:80
msgid "Name"
msgstr "Nomo"
-#: client/gui-gtk-2.0/dialogs.c:519 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:520 client/gui-sdl/dialogs.c:627
msgid "Unit selection"
msgstr "Elekto de unuo"
-#: client/gui-gtk-2.0/dialogs.c:582
+#: client/gui-gtk-2.0/dialogs.c:583
msgid "_Ready all"
msgstr "_Vekigu ĉiujn"
-#: client/gui-gtk-2.0/dialogs.c:590
+#: client/gui-gtk-2.0/dialogs.c:591
msgid "_Sentry idle"
msgstr "PaÅzigu la gardo_soldaton"
-#: client/gui-gtk-2.0/dialogs.c:719
+#: client/gui-gtk-2.0/dialogs.c:721
msgid "Nation _Groups:"
msgstr "Naciaj _grupoj:"
-#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:766 data/Freeciv.in:3128
msgid "What Nation Will You Be?"
msgstr "Kiu nacio vi deziras esti?"
-#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
-#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
+#: client/gui-gtk-2.0/dialogs.c:768 client/gui-sdl/chatline.c:842
+#: client/gui-win32/connectdlg.c:1040 data/Freeciv.in:3371
msgid "Pick Nation"
msgstr "Elektu nacion"
-#: client/gui-gtk-2.0/dialogs.c:774
+#: client/gui-gtk-2.0/dialogs.c:776
msgid "_Random Nation"
msgstr "_Hazarda nacio"
-#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:792 client/gui-win32/dialogs.c:517
msgid "Select a nation"
msgstr "Elektu nacion"
-#: client/gui-gtk-2.0/dialogs.c:804
+#: client/gui-gtk-2.0/dialogs.c:810
msgid "_Properties"
msgstr "_Ecoj"
-#: client/gui-gtk-2.0/dialogs.c:824
+#: client/gui-gtk-2.0/dialogs.c:830
msgid "_Leader:"
msgstr "_Estro:"
-#: client/gui-gtk-2.0/dialogs.c:831
+#: client/gui-gtk-2.0/dialogs.c:837
msgid "_Female"
msgstr "_Ina"
-#: client/gui-gtk-2.0/dialogs.c:836
+#: client/gui-gtk-2.0/dialogs.c:842
msgid "_Male"
msgstr "_Malina"
-#: client/gui-gtk-2.0/dialogs.c:863
+#: client/gui-gtk-2.0/dialogs.c:869
msgid "City _Styles:"
msgstr "Urbaj _stiloj:"
-#: client/gui-gtk-2.0/dialogs.c:902
+#: client/gui-gtk-2.0/dialogs.c:908
msgid "_Description"
msgstr "_Priskribo"
-#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1263 client/gui-xaw/dialogs.c:1480
msgid "You must select your sex."
msgstr "Vi devas elekti vian sekson."
-#: client/gui-gtk-2.0/dialogs.c:1253 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1268 client/gui-xaw/dialogs.c:1485
msgid "You must select your city style."
msgstr "Vi devas elekti vian urban stilon"
-#: client/gui-gtk-2.0/dialogs.c:1262 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1277 client/gui-sdl/dialogs.c:2204
#: client/gui-win32/dialogs.c:358 client/gui-xaw/dialogs.c:1493
msgid "You must type a legal name."
msgstr "Vi devas tajpi validan nomon."
-#: client/gui-gtk-2.0/dialogs.c:1306 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1318 client/gui-win32/citydlg.c:1454
#: data/Freeciv.in:2484
msgid "Upgrade Unit!"
msgstr "Äœisdatigu unuojn!"
-#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1327 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 "Äœisdatigu arkaikajn unuojn"
-#: client/gui-gtk-2.0/diplodlg.c:231 client/gui-win32/diplodlg.c:151
+#: client/gui-gtk-2.0/diplodlg.c:222 client/gui-win32/diplodlg.c:151
#: client/gui-xaw/diplodlg.c:383 client/gui-xaw/diplodlg.c:401
msgid "World-map"
msgstr "Ter-mapo"
-#: client/gui-gtk-2.0/diplodlg.c:237 client/gui-win32/diplodlg.c:146
+#: client/gui-gtk-2.0/diplodlg.c:228 client/gui-win32/diplodlg.c:146
#: client/gui-xaw/diplodlg.c:387 client/gui-xaw/diplodlg.c:405
msgid "Sea-map"
msgstr "Mar-mapo"
-#: client/gui-gtk-2.0/diplodlg.c:243
+#: client/gui-gtk-2.0/diplodlg.c:234
msgid "_Maps"
msgstr "_Mapoj"
-#: client/gui-gtk-2.0/diplodlg.c:274
+#: client/gui-gtk-2.0/diplodlg.c:265
msgid "_Advances"
msgstr "_Avanaĵoj"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/diplodlg.c:315 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "_Urboj"
-#: client/gui-gtk-2.0/diplodlg.c:333
+#: client/gui-gtk-2.0/diplodlg.c:324
msgid "_Give shared vision"
msgstr "Doni komunan vidon"
-#: client/gui-gtk-2.0/diplodlg.c:346
+#: client/gui-gtk-2.0/diplodlg.c:337
msgid "Give _embassy"
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:376
+#: client/gui-gtk-2.0/diplodlg.c:368
msgid "_Pacts"
msgstr "_Paktoj"
-#: client/gui-gtk-2.0/diplodlg.c:466
+#: client/gui-gtk-2.0/diplodlg.c:458
#, c-format
msgid "Diplomacy: %s"
msgstr "Diplomatio: %s"
-#: client/gui-gtk-2.0/diplodlg.c:473
+#: client/gui-gtk-2.0/diplodlg.c:465
msgid "_Cancel meeting"
msgstr "_Nuligi renkontiÄon"
-#: client/gui-gtk-2.0/diplodlg.c:475
+#: client/gui-gtk-2.0/diplodlg.c:467
msgid "Accept _treaty"
msgstr "Konsenti"
-#: client/gui-gtk-2.0/diplodlg.c:503
+#: client/gui-gtk-2.0/diplodlg.c:495
msgid "C_lauses:"
msgstr "K_laÅzoj:"
-#: client/gui-gtk-2.0/diplodlg.c:568 client/gui-gtk-2.0/diplodlg.c:642
+#: client/gui-gtk-2.0/diplodlg.c:560 client/gui-gtk-2.0/diplodlg.c:634
msgid "_Gold:"
msgstr "_Oro:"
-#: client/gui-gtk-2.0/diplodlg.c:580 client/gui-gtk-2.0/diplodlg.c:654
+#: client/gui-gtk-2.0/diplodlg.c:572 client/gui-gtk-2.0/diplodlg.c:646
msgid "_Add Clause..."
msgstr "_Aldonu klaÅzon..."
-#: client/gui-gtk-2.0/diplodlg.c:699
+#: client/gui-gtk-2.0/diplodlg.c:691
msgid "--- This treaty is blank. Please add some clauses. ---"
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:905 client/gui-sdl/diplodlg.c:375
+#: client/gui-gtk-2.0/diplodlg.c:897 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 "Nevalida kvanto da oro estis specifita."
@@ -10958,99 +11098,99 @@ msgstr "Elektu alvenpunkton"
msgid "Show _All Cities"
msgstr "Vidigu _ĉiujn urbojn"
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:164
msgid "Show Map Scrollbars"
msgstr "Vidigu rulumstangojn"
-#: client/gui-gtk-2.0/gui_main.c:163
+#: client/gui-gtk-2.0/gui_main.c:165
msgid "Disable this option to hide the scrollbars on the map view."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:169
msgid "Keyboardless goto"
msgstr "\"Iru al\" senklavare"
-#: client/gui-gtk-2.0/gui_main.c:168
+#: client/gui-gtk-2.0/gui_main.c:170
msgid ""
"If this option is set then a goto may be initiated by left-clicking and then "
"holding down the mouse button while dragging the mouse onto a different tile."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:173
+#: client/gui-gtk-2.0/gui_main.c:175
msgid "Keep dialogs on top"
msgstr "Tenu la dialgofenestrojn supre"
-#: client/gui-gtk-2.0/gui_main.c:174
+#: client/gui-gtk-2.0/gui_main.c:176
msgid ""
"If this option is set then dialog windows will always remain in front of the "
"main Freeciv window. Disabling this has no effect in fullscreen mode."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:178
+#: client/gui-gtk-2.0/gui_main.c:180
msgid "Show worklist task icons"
msgstr "Vidigu ikonojn de la taskoj de la laborlisto"
-#: client/gui-gtk-2.0/gui_main.c:179
+#: client/gui-gtk-2.0/gui_main.c:181
msgid ""
"Disabling this will turn off the unit and building icons in the worklist "
"dialog and the production tab of the city dialog."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:183
+#: client/gui-gtk-2.0/gui_main.c:185
msgid "Enable status report tabs"
msgstr "Ebligu la langetojn de la raportoj pri la stato"
-#: client/gui-gtk-2.0/gui_main.c:184
+#: client/gui-gtk-2.0/gui_main.c:186
msgid ""
"If this option is enabled then report dialogs will be shown as separate tabs "
"rather than in popup dialogs."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:189 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:191 client/gui-win32/gui_main.c:110
msgid "Better fog-of-war drawing"
msgstr "Plejbona bildigo de militnebulo"
-#: client/gui-gtk-2.0/gui_main.c:190 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:192 client/gui-win32/gui_main.c:111
msgid ""
"If this is enabled then a better method is used for drawing fog-of-war. It "
"is not any slower but will consume about twice as much memory."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:195
+#: client/gui-gtk-2.0/gui_main.c:197
msgid "Show time for each chat message"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:196
+#: client/gui-gtk-2.0/gui_main.c:198
msgid ""
"If this option is enabled then all chat messages will be prefixed by a time "
"string of the form [hour:minute:second]."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:201
+#: client/gui-gtk-2.0/gui_main.c:203
msgid "Split bottom notebook area"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:202
+#: client/gui-gtk-2.0/gui_main.c:204
msgid ""
"Enabling this option will split the bottom notebook into a left and right "
"notebook so that two tabs may be viewed at once."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:207
+#: client/gui-gtk-2.0/gui_main.c:209
msgid "New message events go to top of list"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:208
+#: client/gui-gtk-2.0/gui_main.c:210
msgid ""
"If this option is enabled, new events in the message window will appear at "
"the top of the list, rather than being appended at the bottom."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:213
+#: client/gui-gtk-2.0/gui_main.c:215
msgid "Show extra message window buttons"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:214
+#: client/gui-gtk-2.0/gui_main.c:216
msgid ""
"If this option is enabled, there will be two buttons displayed in the "
"message window for inspecting a city and going to a location. If this option "
@@ -11060,21 +11200,21 @@ msgid ""
"closed and reopened."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:224
+#: client/gui-gtk-2.0/gui_main.c:226
msgid "Metaserver tab first in network page"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:225
+#: client/gui-gtk-2.0/gui_main.c:227
msgid ""
"If this option is enabled, the metaserver tab will be the first notebook tab "
"in the network page. This option requires a restart in order to take effect."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:230
+#: client/gui-gtk-2.0/gui_main.c:232
msgid "Plain chat messages are sent to allies only"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:231
+#: client/gui-gtk-2.0/gui_main.c:233
msgid ""
"If this option is enabled, then plain messages typed into the chat entry "
"while the game is running will only be sent to your allies. Otherwise plain "
@@ -11084,28 +11224,41 @@ msgid ""
"visible in multiplayer games)."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:340 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:245
+msgid "Arrange widgets for small displays"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:246
+msgid ""
+"If this option is enabled, widgets in the main window will be arrange so "
+"that they take up the least amount of total screen space. Specifically, the "
+"left panel containing the overview, player status, and the unit information "
+"box will be extended over the entire left side of the window. This option "
+"requires a restart in order to take effect."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:352 client/gui-xaw/gui_main.c:245
msgid ""
"This client has no special command line options\n"
"\n"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
+#: client/gui-gtk-2.0/gui_main.c:847 client/gui-gtk-2.0/gui_main.c:1542
msgid "Freeciv"
msgstr "Freeciv"
-#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
+#: client/gui-gtk-2.0/gui_main.c:1251 client/gui-gtk-2.0/gui_main.c:1258
#: client/gui-sdl/mapctrl.c:1566 client/gui-win32/gui_main.c:482
#: data/Freeciv.in:2618
msgid "Turn Done"
msgstr "Fino de la vico"
-#: client/gui-gtk-2.0/gui_main.c:1232 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1258 client/gui-sdl/mapctrl.c:1566
#: client/gui-sdl/mapview.c:1082
msgid "Shift+Return"
msgstr "Åœvkl+Enenklavo"
-#: client/gui-gtk-2.0/gui_main.c:1266 client/gui-gtk-2.0/menu.c:797
+#: client/gui-gtk-2.0/gui_main.c:1299 client/gui-gtk-2.0/menu.c:797
#: client/gui-gtk-2.0/menu.c:799 client/gui-gtk-2.0/menu.c:801
#: client/gui-gtk-2.0/menu.c:803 client/gui-gtk-2.0/menu.c:805
#: client/gui-gtk-2.0/menu.c:807 client/gui-gtk-2.0/menu.c:809
@@ -11124,11 +11277,11 @@ msgstr "Åœvkl+Enenklavo"
msgid "View"
msgstr "Videbligo"
-#: client/gui-gtk-2.0/gui_main.c:1359
+#: client/gui-gtk-2.0/gui_main.c:1393
msgid "Chat"
msgstr "_Babillineo"
-#: client/gui-gtk-2.0/gui_main.c:1377 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1411 client/gui-win32/gui_main.c:538
#: data/Freeciv.in:2809
msgid ""
"Freeciv is free software and you are welcome to distribute copies of it\n"
@@ -11139,83 +11292,83 @@ msgstr ""
"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:1392
+#: client/gui-gtk-2.0/gui_main.c:1426
msgid "Allies Only"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1657
+#: client/gui-gtk-2.0/gui_main.c:1691
msgid "Not _ready"
msgstr "Ne preta"
-#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
+#: client/gui-gtk-2.0/gui_main.c:1702 client/gui-gtk-2.0/pages.c:1679
msgid "_Ready"
msgstr "_Preta"
-#: client/gui-gtk-2.0/gui_main.c:1672 client/gui-gtk-2.0/gui_main.c:1678
-#: client/gui-gtk-2.0/pages.c:2204
+#: client/gui-gtk-2.0/gui_main.c:1706 client/gui-gtk-2.0/gui_main.c:1712
+#: client/gui-gtk-2.0/pages.c:2206
msgid "_Start"
msgstr "_Startigu"
-#: client/gui-gtk-2.0/gui_main.c:1686
+#: client/gui-gtk-2.0/gui_main.c:1720
#, fuzzy
msgid "_Take Player"
msgstr "Prenu tiun ĉi ludanton"
-#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
+#: client/gui-gtk-2.0/gui_main.c:1723 client/gui-gtk-2.0/pages.c:1669
msgid "Pick _Nation"
msgstr "Elektu _nacion"
-#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
+#: client/gui-gtk-2.0/gui_main.c:1730 client/gui-gtk-2.0/pages.c:1674
msgid "_Observe"
msgstr "_Observi"
-#: client/gui-gtk-2.0/gui_main.c:1698
+#: client/gui-gtk-2.0/gui_main.c:1732
msgid "Do not _observe"
msgstr "Ne _observi"
-#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1755 client/gui-xaw/pages.c:211
#, fuzzy
msgid "<AI>"
msgstr "AI"
-#: client/gui-gtk-2.0/gui_main.c:1723
+#: client/gui-gtk-2.0/gui_main.c:1758
#, fuzzy
msgid "<Novice AI>"
msgstr "Novico"
-#: client/gui-gtk-2.0/gui_main.c:1726
+#: client/gui-gtk-2.0/gui_main.c:1761
#, fuzzy
msgid "<Easy AI>"
msgstr "Facila"
-#: client/gui-gtk-2.0/gui_main.c:1729
+#: client/gui-gtk-2.0/gui_main.c:1764
#, fuzzy
msgid "<Normal AI>"
msgstr "Normala"
-#: client/gui-gtk-2.0/gui_main.c:1732
+#: client/gui-gtk-2.0/gui_main.c:1767
#, fuzzy
msgid "<Hard AI>"
msgstr "Malfacila"
-#: client/gui-gtk-2.0/gui_main.c:1742 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1777 client/gui-win32/dialogs.c:594
#: client/gui-xaw/pages.c:217
msgid "Random"
msgstr "Hazarda"
-#: client/gui-gtk-2.0/gui_main.c:1808
+#: client/gui-gtk-2.0/gui_main.c:1844 client/gui-gtk-2.0/gui_main.c:1858
msgid "Observer"
msgstr "Observanto"
-#: client/gui-gtk-2.0/gui_main.c:1808
+#: client/gui-gtk-2.0/gui_main.c:1858
msgid "Detached"
msgstr "Malkonektigita"
-#: client/gui-gtk-2.0/gui_main.c:2073
+#: client/gui-gtk-2.0/gui_main.c:2117
msgid "Are you sure you want to quit?"
msgstr "Ĉu vi deziras eliri?"
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
#, c-format
msgid ""
"Close Tab:\n"
@@ -11224,7 +11377,7 @@ msgstr ""
"Fermu langeton:\n"
"%s"
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
msgid "Ctrl+W"
msgstr "Strkl+W"
@@ -11329,8 +11482,8 @@ msgid "Trans. Rslt/Time:"
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
-#: client/gui-win32/helpdlg.c:709 client/gui-win32/helpdlg.c:733
+#: client/gui-win32/helpdlg.c:502 client/gui-win32/helpdlg.c:550
+#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:739
#: client/gui-xaw/helpdlg.c:759 client/gui-xaw/helpdlg.c:808
#: client/gui-xaw/helpdlg.c:816 client/gui-xaw/helpdlg.c:853
#: client/gui-xaw/helpdlg.c:878
@@ -11377,34 +11530,34 @@ msgstr "kun"
msgid "?techhelp:"
msgstr "?techhelp:"
-#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:591
+#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:597
#: client/gui-xaw/helpdlg.c:996
#, c-format
msgid "+%d Trade / %d"
msgstr "+%d Komerco / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:595
+#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:601
#: client/gui-xaw/helpdlg.c:1000
#, c-format
msgid "no extra / %d"
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
-#: client/gui-win32/helpdlg.c:602 client/gui-win32/helpdlg.c:616
-#: client/gui-win32/helpdlg.c:635 client/gui-xaw/helpdlg.c:1002
+#: client/gui-gtk-2.0/helpdlg.c:1085 client/gui-win32/helpdlg.c:604
+#: client/gui-win32/helpdlg.c:608 client/gui-win32/helpdlg.c:622
+#: client/gui-win32/helpdlg.c:641 client/gui-xaw/helpdlg.c:1002
#: client/gui-xaw/helpdlg.c:1006 client/gui-xaw/helpdlg.c:1020
#: client/gui-xaw/helpdlg.c:1039
msgid "n/a"
msgstr "-"
-#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:605
+#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:611
#: client/gui-xaw/helpdlg.c:1009
#, c-format
msgid "+%d Food / %d"
msgstr "+%d Nutraĵo / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:619
+#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:625
#: client/gui-xaw/helpdlg.c:1023
#, c-format
msgid "+%d Res. / %d"
@@ -12177,41 +12330,41 @@ msgstr "K_onekto al retan ludon"
msgid "Connect to Gaming _Zone"
msgstr "Konekto al _areon de ludo"
-#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:302
#: client/gui-xaw/connectdlg.c:326
msgid "Passwords don't match, enter password."
msgstr "Ne kongruas pasvorto, reen enigu pasvorton."
#: client/gui-gtk-2.0/pages.c:779 client/gui-gtk-2.0/pages.c:820
-#: client/gui-win32/connectdlg.c:916
+#: client/gui-win32/connectdlg.c:918
msgid "Server Name"
msgstr "Servilnomo"
#: client/gui-gtk-2.0/pages.c:780 client/gui-gtk-2.0/pages.c:821
-#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:916
+#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:918
#: data/Freeciv.in:96
msgid "Port"
msgstr "Pordo"
#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Version"
msgstr "Versio"
#: client/gui-gtk-2.0/pages.c:782 client/gui-gtk-2.0/pages.c:823
-#: client/gui-gtk-2.0/pages.c:2161 client/gui-win32/connectdlg.c:917
-#: client/gui-win32/connectdlg.c:995
+#: client/gui-gtk-2.0/pages.c:2163 client/gui-win32/connectdlg.c:919
+#: client/gui-win32/connectdlg.c:997
msgid "Status"
msgstr "Stato"
#: client/gui-gtk-2.0/pages.c:783 client/gui-gtk-2.0/pages.c:824
#: client/gui-sdl/connectdlg.c:318 client/gui-sdl/plrdlg.c:330
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Players"
msgstr "Ludantoj"
#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
-#: client/gui-win32/connectdlg.c:918
+#: client/gui-win32/connectdlg.c:920
msgid "Comment"
msgstr "Komento"
@@ -12243,9 +12396,9 @@ msgstr "Pas_vorto:"
msgid "Conf_irm Password:"
msgstr "Konf_irmu pasvorton:"
-#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2165
#: 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:1000
+#: client/gui-win32/citydlg.c:1083 client/gui-win32/connectdlg.c:1002
#: client/gui-win32/wldlg.c:800 client/gui-win32/wldlg.c:806
msgid "Type"
msgstr "Speco"
@@ -12337,7 +12490,7 @@ msgstr "Lerteco de _AI:"
msgid "Ruleset _Version:"
msgstr "_Versio de la reguloj:"
-#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2195
msgid "_More Game Options..."
msgstr "Pluaj opcioj de la ludo..."
@@ -12353,49 +12506,49 @@ msgstr "Skribado"
msgid "Ready"
msgstr "Preta"
-#: client/gui-gtk-2.0/pages.c:1601
+#: client/gui-gtk-2.0/pages.c:1600
#, fuzzy
msgid "?player:Leader"
msgstr "?female:Estrino"
-#: client/gui-gtk-2.0/pages.c:1732 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1734 client/gui-sdl/chatline.c:185
msgid "Choose Saved Game to Load"
msgstr "Elektu konservitan ludon"
-#: client/gui-gtk-2.0/pages.c:1824
+#: client/gui-gtk-2.0/pages.c:1826
msgid "Choose Saved Game to _Load:"
msgstr "Elektu Åargendan konvervitan _ludon:"
-#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
-#: client/gui-gtk-2.0/pages.c:2451
+#: client/gui-gtk-2.0/pages.c:1846 client/gui-gtk-2.0/pages.c:2039
+#: client/gui-gtk-2.0/pages.c:2455
msgid "_Browse..."
msgstr "_Foliumu..."
-#: client/gui-gtk-2.0/pages.c:1911
+#: client/gui-gtk-2.0/pages.c:1913
msgid "Choose a Scenario"
msgstr "Elektu scenejon"
-#: client/gui-gtk-2.0/pages.c:1998
+#: client/gui-gtk-2.0/pages.c:2000
msgid "Choose a _Scenario:"
msgstr "Elektu _scenejon:"
-#: client/gui-gtk-2.0/pages.c:2173
+#: client/gui-gtk-2.0/pages.c:2175
msgid "Choose a _nation to play:"
msgstr "Elektu _nacion por ludi:"
-#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2367 client/gui-win32/menu.c:581
msgid "Select Location to Save"
msgstr "Elektu lokon por konservi"
-#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2452 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "Konservu ludon"
-#: client/gui-gtk-2.0/pages.c:2489
+#: client/gui-gtk-2.0/pages.c:2493
msgid "Saved _Games:"
msgstr "Konservitaj _ludoj:"
-#: client/gui-gtk-2.0/pages.c:2516
+#: client/gui-gtk-2.0/pages.c:2520
msgid "Save _Filename:"
msgstr "Konservu dosiernomon:"
@@ -12747,7 +12900,7 @@ msgstr "Fermu fenestron (ESC)"
msgid "Total users logged in : %d"
msgstr "Sumo de la konektitaj uzantoj: %d"
-#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1098
msgid "Back"
msgstr "AntaÅe"
@@ -12756,7 +12909,7 @@ msgid "Start"
msgstr "Komencu"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:777
+#: client/gui-win32/connectdlg.c:779
msgid "Load Game"
msgstr "Åœargu ludon"
@@ -12796,9 +12949,9 @@ msgstr "Kreu novan hejmurbon"
#: client/gui-sdl/connectdlg.c:308 client/gui-sdl/connectdlg.c:617
#: client/gui-sdl/connectdlg.c:803 client/gui-sdl/connectdlg.c:985
#: client/gui-sdl/dialogs.c:452 client/gui-sdl/dialogs.c:2095
-#: client/gui-sdl/dialogs.c:2893 client/gui-sdl/diplomat_dialog.c:731
+#: client/gui-sdl/dialogs.c:2902 client/gui-sdl/diplomat_dialog.c:731
#: client/gui-sdl/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1043
#: client/gui-win32/dialogs.c:1772 client/gui-win32/finddlg.c:127
#: client/gui-win32/gotodlg.c:171 client/gui-win32/inputdlg.c:146
#: client/gui-win32/messagedlg.c:216 client/gui-win32/ratesdlg.c:328
@@ -12842,7 +12995,7 @@ msgid "Buy it?"
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
+#: client/gui-sdl/diplodlg.c:1336 client/gui-sdl/diplomat_dialog.c:1211
#: client/gui-sdl/diplomat_dialog.c:1417 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:221 client/gui-sdl/repodlgs.c:1559
#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
@@ -12858,7 +13011,7 @@ msgid "No"
msgstr "Ne"
#: client/gui-sdl/citydlg.c:1215 client/gui-sdl/cma_fe.c:318
-#: client/gui-sdl/diplodlg.c:1345 client/gui-sdl/diplomat_dialog.c:1200
+#: client/gui-sdl/diplodlg.c:1346 client/gui-sdl/diplomat_dialog.c:1200
#: client/gui-sdl/diplomat_dialog.c:1407 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:232 client/gui-win32/repodlgs.c:578
#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
@@ -13162,7 +13315,7 @@ msgstr "Freeciv-Servilo :"
msgid "Port :"
msgstr "Pordo :"
-#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1100
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr "Konektu"
@@ -13269,23 +13422,23 @@ msgstr "Elektu vian novan regsistemo"
msgid "REVOLUTION!"
msgstr "REVOLUCIO!"
-#: client/gui-sdl/dialogs.c:2232 client/gui-sdl/dialogs.c:2620
+#: client/gui-sdl/dialogs.c:2237 client/gui-sdl/dialogs.c:2625
#: client/gui-win32/dialogs.c:567 data/Freeciv.in:3159
msgid "Female"
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
+#: client/gui-sdl/dialogs.c:2239 client/gui-sdl/dialogs.c:2623
+#: client/gui-sdl/dialogs.c:2839 client/gui-win32/dialogs.c:565
msgid "Male"
msgstr "Malina"
-#: client/gui-sdl/dialogs.c:2478 client/gui-sdl/dialogs.c:2902
+#: client/gui-sdl/dialogs.c:2483 client/gui-sdl/dialogs.c:2911
#: 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 "BONE"
-#: client/gui-sdl/dialogs.c:2685 client/gui-win32/dialogs.c:505
+#: client/gui-sdl/dialogs.c:2694 client/gui-win32/dialogs.c:505
msgid "What nation will you be?"
msgstr "Kiu nacio vi deziras esti?"
@@ -13312,54 +13465,54 @@ msgstr "Mapo de la mondo"
msgid "Sea map"
msgstr "Mapo de la maro"
-#: client/gui-sdl/diplodlg.c:563
+#: client/gui-sdl/diplodlg.c:564
#, fuzzy
msgid "Give embassy"
msgstr "Ambasado"
-#: client/gui-sdl/diplodlg.c:579 client/gui-win32/diplodlg.c:614
+#: client/gui-sdl/diplodlg.c:580 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 "Oro(maks. %d)"
-#: client/gui-sdl/diplodlg.c:613 client/gui-sdl/helpdlg.c:1956
+#: client/gui-sdl/diplodlg.c:614 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 "Avanaĵoj"
-#: client/gui-sdl/diplodlg.c:831 client/gui-win32/diplodlg.c:598
+#: client/gui-sdl/diplodlg.c:832 client/gui-win32/diplodlg.c:598
#: data/Freeciv.in:269
msgid "Diplomacy meeting"
msgstr "Diplomatia renkontiÄo"
-#: client/gui-sdl/diplodlg.c:883 client/gui-win32/diplodlg.c:680
+#: client/gui-sdl/diplodlg.c:884 client/gui-win32/diplodlg.c:680
#: data/Freeciv.in:510
msgid "Cancel meeting"
msgstr "Nuligu renkontiÄon"
-#: client/gui-sdl/diplodlg.c:895 client/gui-win32/diplodlg.c:679
+#: client/gui-sdl/diplodlg.c:896 client/gui-win32/diplodlg.c:679
#: data/Freeciv.in:501
msgid "Accept treaty"
msgstr "Subskribu kontrakton"
#. TRANS: "Polish incident !" FIXME!!!
-#: client/gui-sdl/diplodlg.c:1304
+#: client/gui-sdl/diplodlg.c:1305
#, c-format
msgid "%s incident !"
msgstr "%s akcidento !"
-#: client/gui-sdl/diplodlg.c:1322
+#: client/gui-sdl/diplodlg.c:1323
msgid "Shall we declare WAR on them?"
msgstr "Ĉu ni deklaros militon kontraŠili?"
-#: client/gui-sdl/diplodlg.c:1433
+#: client/gui-sdl/diplodlg.c:1434
msgid "Foreign Minister"
msgstr "Ministro por eksterlandaj aferoj"
-#: client/gui-sdl/diplodlg.c:1449
+#: client/gui-sdl/diplodlg.c:1450
#, c-format
msgid ""
"Sir!, the %s ambassador has arrived\n"
@@ -13368,24 +13521,24 @@ msgstr ""
"MoÅto!, la %s ambasadoro alvenis\n"
"Kiuj estas viaj deziroj?"
-#: client/gui-sdl/diplodlg.c:1465
+#: client/gui-sdl/diplodlg.c:1466
msgid "Declare WAR"
msgstr "MILITdeklaro"
-#: client/gui-sdl/diplodlg.c:1467 client/gui-win32/plrdlg.c:357
+#: client/gui-sdl/diplodlg.c:1468 client/gui-win32/plrdlg.c:357
msgid "Cancel Treaty"
msgstr "Nuligu kontrakton"
-#: client/gui-sdl/diplodlg.c:1490 client/gui-win32/plrdlg.c:358
+#: client/gui-sdl/diplodlg.c:1491 client/gui-win32/plrdlg.c:358
#: data/Freeciv.in:3254
msgid "Withdraw vision"
msgstr "Repripensu la vidon"
-#: client/gui-sdl/diplodlg.c:1507
+#: client/gui-sdl/diplodlg.c:1508
msgid "Call Diplomatic Meeting"
msgstr "Voku diplomatian renkontiÄon"
-#: client/gui-sdl/diplodlg.c:1521
+#: client/gui-sdl/diplodlg.c:1522
msgid "Send him back"
msgstr "Retrosendu lin"
@@ -14122,12 +14275,12 @@ msgid "Leave Game"
msgstr "Forlasu la ludon"
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1100 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1102 client/gui-xaw/menu.c:121
#: data/Freeciv.in:115 data/Freeciv.in:3180
msgid "Quit"
msgstr "Eliro"
-#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:967
msgid "Start New Game"
msgstr "Startigu novan ludon"
@@ -14241,8 +14394,8 @@ msgstr "Neta enspezo:"
msgid "%s max rate : %d%%"
msgstr "Maksimuma procento de %s: %d%%"
-#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
-#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1085
+#: client/gui-win32/connectdlg.c:1093 data/Freeciv.in:155
msgid "Update"
msgstr "Äœisdatigu"
@@ -14727,67 +14880,67 @@ msgstr "Nova"
msgid "Delete"
msgstr "Forigu"
-#: client/gui-win32/connectdlg.c:147
+#: client/gui-win32/connectdlg.c:149
msgid "Password:"
msgstr "Pasvorto:"
-#: client/gui-win32/connectdlg.c:169
+#: client/gui-win32/connectdlg.c:171
msgid "Couldn't load the savegame"
msgstr "Estas neeble Åargi konservitan ludon"
-#: client/gui-win32/connectdlg.c:284 client/gui-xaw/connectdlg.c:311
+#: client/gui-win32/connectdlg.c:286 client/gui-xaw/connectdlg.c:311
msgid "Verify Password"
msgstr "Kontrolo de la pasvorto"
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:916 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr "Elekto de Freeciv-servilo"
-#: client/gui-win32/connectdlg.c:915
+#: client/gui-win32/connectdlg.c:917
msgid "Local Area Network"
msgstr "Loka reto"
-#: client/gui-win32/connectdlg.c:949
+#: client/gui-win32/connectdlg.c:951
msgid "Welcome to Freeciv"
msgstr "Bonvenon al Freeciv"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Load Saved Game"
msgstr "Åœargu konservitan ludon"
-#: client/gui-win32/connectdlg.c:969
+#: client/gui-win32/connectdlg.c:971
msgid "Connect To Network Game"
msgstr "Konekto al reta ludo"
-#: client/gui-win32/connectdlg.c:979
+#: client/gui-win32/connectdlg.c:981
msgid "Choose a nation to play"
msgstr "Elektu nacion por ludi"
-#: client/gui-win32/connectdlg.c:1014
+#: client/gui-win32/connectdlg.c:1016
msgid "Number of players (Including AI):"
msgstr "Nombro da ludantoj (inkluzive la AI):"
-#: client/gui-win32/connectdlg.c:1022
+#: client/gui-win32/connectdlg.c:1024
msgid "AI skill level:"
msgstr "Lerteco de _AI:"
-#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1038 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr "Opcioj de la ludo"
-#: client/gui-win32/connectdlg.c:1040
+#: client/gui-win32/connectdlg.c:1042
msgid "Start Game"
msgstr "Startigu ludon"
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Login:"
msgstr "Nomo:"
-#: client/gui-win32/connectdlg.c:1061
+#: client/gui-win32/connectdlg.c:1063
msgid "Host:"
msgstr "Gast.Komp.:"
-#: client/gui-win32/connectdlg.c:1062
+#: client/gui-win32/connectdlg.c:1064
msgid "Port:"
msgstr "Pordo:"
@@ -14865,21 +15018,21 @@ msgid ""
"this is much slower."
msgstr ""
-#: client/gui-win32/helpdlg.c:769 client/gui-win32/helpdlg.c:792
-#: client/gui-win32/helpdlg.c:803 client/gui-win32/helpdlg.c:809
-#: client/gui-win32/helpdlg.c:822
+#: client/gui-win32/helpdlg.c:775 client/gui-win32/helpdlg.c:798
+#: client/gui-win32/helpdlg.c:809 client/gui-win32/helpdlg.c:815
+#: client/gui-win32/helpdlg.c:828
msgid "Allows "
msgstr "Ebligas "
-#: client/gui-win32/helpdlg.c:780
+#: client/gui-win32/helpdlg.c:786
msgid "Obsoletes "
msgstr "Igas arkaika "
-#: client/gui-win32/helpdlg.c:812 client/gui-win32/helpdlg.c:825
+#: client/gui-win32/helpdlg.c:818 client/gui-win32/helpdlg.c:831
msgid " (with "
msgstr " (kun "
-#: client/gui-win32/helpdlg.c:815 client/gui-win32/helpdlg.c:828
+#: client/gui-win32/helpdlg.c:821 client/gui-win32/helpdlg.c:834
msgid "?techhelp:)."
msgstr "?techhelp:)."
@@ -15995,7 +16148,7 @@ 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/"
+" https://gna.org/projects/freeciv/"
msgstr ""
#: data/helpdata.txt:60
@@ -17603,50 +17756,48 @@ msgid ""
"a Factory, Mfg. Plant and Hydro Plant together give a 150% production "
"bonus.\n"
"\n"
-"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant. A city "
-"can only build a Hydro Plant if it is next to (or on) a Mountain or River "
-"tile."
+"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant."
msgstr ""
-#: data/default/buildings.ruleset:397 data/civ2/buildings.ruleset:373
+#: data/default/buildings.ruleset:396 data/civ2/buildings.ruleset:373
#: data/civ1/buildings.ruleset:297
msgid "Library"
msgstr "Biblioteko"
-#: data/default/buildings.ruleset:412
+#: data/default/buildings.ruleset:411
#, no-c-format
msgid "Increases the science output in a city by 100%."
msgstr ""
-#: data/default/buildings.ruleset:417 data/civ2/buildings.ruleset:393
+#: data/default/buildings.ruleset:416 data/civ2/buildings.ruleset:393
#: data/civ1/buildings.ruleset:317
msgid "Marketplace"
msgstr "Bazaro"
-#: data/default/buildings.ruleset:432 data/civ2/buildings.ruleset:408
+#: data/default/buildings.ruleset:431 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 ""
-#: data/default/buildings.ruleset:437 data/civ2/buildings.ruleset:413
+#: data/default/buildings.ruleset:436 data/civ2/buildings.ruleset:413
#: data/civ1/buildings.ruleset:337
msgid "Mass Transit"
msgstr "Publikaj trafikiloj"
-#: data/default/buildings.ruleset:451 data/civ2/buildings.ruleset:427
+#: data/default/buildings.ruleset:450 data/civ2/buildings.ruleset:427
#: data/civ1/buildings.ruleset:351
msgid ""
"Neutralizes the pollution generated by the population. The population "
"simply has no effect on the pollution generated in the city."
msgstr ""
-#: data/default/buildings.ruleset:458 data/civ2/buildings.ruleset:434
+#: data/default/buildings.ruleset:457 data/civ2/buildings.ruleset:434
#: data/civ1/buildings.ruleset:358
msgid "Mfg. Plant"
msgstr "Manufakturo"
-#: data/default/buildings.ruleset:474 data/civ2/buildings.ruleset:450
+#: data/default/buildings.ruleset:473 data/civ2/buildings.ruleset:450
#: data/civ1/buildings.ruleset:374
#, no-c-format
msgid ""
@@ -17654,12 +17805,12 @@ msgid ""
"production in a city by 100%."
msgstr ""
-#: data/default/buildings.ruleset:480 data/civ2/buildings.ruleset:456
+#: data/default/buildings.ruleset:479 data/civ2/buildings.ruleset:456
#: data/civ1/buildings.ruleset:380
msgid "Nuclear Plant"
msgstr "Atomcentralo"
-#: data/default/buildings.ruleset:495
+#: data/default/buildings.ruleset:494
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 "
@@ -17670,22 +17821,22 @@ msgid ""
"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant."
msgstr ""
-#: data/default/buildings.ruleset:515 data/civ2/buildings.ruleset:489
+#: data/default/buildings.ruleset:514 data/civ2/buildings.ruleset:489
msgid "Offshore Platform"
msgstr "Petrolplatformo"
-#: data/default/buildings.ruleset:530 data/civ2/buildings.ruleset:504
+#: data/default/buildings.ruleset:529 data/civ2/buildings.ruleset:504
msgid ""
"Adds 1 extra shield resource on all Ocean squares in a city. The city needs "
"to be coastal to build this improvement."
msgstr ""
-#: data/default/buildings.ruleset:536 data/civ2/buildings.ruleset:510
+#: data/default/buildings.ruleset:535 data/civ2/buildings.ruleset:510
#: data/civ1/buildings.ruleset:411
msgid "Palace"
msgstr "Regpalaco"
-#: data/default/buildings.ruleset:552
+#: data/default/buildings.ruleset:551
#, no-c-format
msgid ""
"Makes a city the capital and the center of your government. Corruption in "
@@ -17702,33 +17853,33 @@ msgid ""
"Monarchy a +50% production bonus."
msgstr ""
-#: data/default/buildings.ruleset:569 data/civ2/buildings.ruleset:539
+#: data/default/buildings.ruleset:568 data/civ2/buildings.ruleset:539
msgid "Police Station"
msgstr "Policejo"
-#: data/default/buildings.ruleset:583 data/civ2/buildings.ruleset:553
+#: data/default/buildings.ruleset:582 data/civ2/buildings.ruleset:553
msgid ""
"Reduces the unhappiness caused by military units outside the city by 2 under "
"Democracy and 1 under Republic. This improvement has no effect under other "
"governments."
msgstr ""
-#: data/default/buildings.ruleset:593 data/civ2/buildings.ruleset:560
+#: data/default/buildings.ruleset:592 data/civ2/buildings.ruleset:560
msgid "Port Facility"
msgstr "Haveno"
-#: data/default/buildings.ruleset:608 data/civ2/buildings.ruleset:575
+#: data/default/buildings.ruleset:607 data/civ2/buildings.ruleset:575
msgid ""
"Allows a city to build veteran sea units. Also, damaged sea units which "
"stay in town for one full turn without moving are completely restored."
msgstr ""
-#: data/default/buildings.ruleset:615 data/civ2/buildings.ruleset:582
+#: data/default/buildings.ruleset:614 data/civ2/buildings.ruleset:582
#: data/civ1/buildings.ruleset:440
msgid "Power Plant"
msgstr "Elektrocentralo"
-#: data/default/buildings.ruleset:631
+#: data/default/buildings.ruleset:630
#, no-c-format
msgid ""
"Increases the shield production of a Factory or Mfg. Plant in a city: a "
@@ -17739,12 +17890,12 @@ msgid ""
"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant."
msgstr ""
-#: data/default/buildings.ruleset:646 data/civ2/buildings.ruleset:610
+#: data/default/buildings.ruleset:645 data/civ2/buildings.ruleset:610
#: data/civ1/buildings.ruleset:468
msgid "Recycling Center"
msgstr "Recikladejo"
-#: data/default/buildings.ruleset:661 data/civ2/buildings.ruleset:625
+#: data/default/buildings.ruleset:660 data/civ2/buildings.ruleset:625
#: data/civ1/buildings.ruleset:483
#, no-c-format
msgid ""
@@ -17752,33 +17903,33 @@ msgid ""
"production in a city by 66%."
msgstr ""
-#: data/default/buildings.ruleset:667 data/civ2/buildings.ruleset:631
+#: data/default/buildings.ruleset:666 data/civ2/buildings.ruleset:631
msgid "Research Lab"
msgstr "Esplorada laboratorio"
-#: data/default/buildings.ruleset:682
+#: data/default/buildings.ruleset:681
msgid ""
"Together with a Library, a Research Lab increases the science production of "
"a city by 200%. Together with a Library and a University, a Research Lab "
"increases the science production of a city by 450%."
msgstr ""
-#: data/default/buildings.ruleset:690 data/civ2/buildings.ruleset:654
+#: data/default/buildings.ruleset:689 data/civ2/buildings.ruleset:654
msgid "SAM Battery"
msgstr "SAM-baterio"
-#: data/default/buildings.ruleset:704 data/civ2/buildings.ruleset:668
+#: data/default/buildings.ruleset:703 data/civ2/buildings.ruleset:668
msgid ""
"Doubles the defense of all units inside the city when attacked by non-"
"nuclear air units."
msgstr ""
-#: data/default/buildings.ruleset:710 data/civ2/buildings.ruleset:674
+#: data/default/buildings.ruleset:709 data/civ2/buildings.ruleset:674
#: data/civ1/buildings.ruleset:489
msgid "SDI Defense"
msgstr "SDI-defendo"
-#: data/default/buildings.ruleset:724 data/civ2/buildings.ruleset:688
+#: data/default/buildings.ruleset:723 data/civ2/buildings.ruleset:688
#: data/civ1/buildings.ruleset:503
msgid ""
"Protects a city from attacks from Nuclear units. Nuclear attacks simply "
@@ -17786,22 +17937,22 @@ msgid ""
"missiles."
msgstr ""
-#: data/default/buildings.ruleset:733 data/civ2/buildings.ruleset:697
+#: data/default/buildings.ruleset:732 data/civ2/buildings.ruleset:697
msgid "Sewer System"
msgstr "Kloakreto"
-#: data/default/buildings.ruleset:748 data/civ2/buildings.ruleset:712
+#: data/default/buildings.ruleset:747 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 ""
-#: data/default/buildings.ruleset:754 data/civ2/buildings.ruleset:749
+#: data/default/buildings.ruleset:753 data/civ2/buildings.ruleset:749
#: data/civ1/buildings.ruleset:512
msgid "Space Component"
msgstr "Komponanto de kosmoÅipo"
-#: data/default/buildings.ruleset:769 data/civ2/buildings.ruleset:763
+#: data/default/buildings.ruleset:768 data/civ2/buildings.ruleset:763
#: data/civ1/buildings.ruleset:526
msgid ""
"Space Components can be differentiated into Propulsion and Fuel Components. "
@@ -17812,12 +17963,12 @@ msgid ""
"have been built by any player."
msgstr ""
-#: data/default/buildings.ruleset:779 data/civ2/buildings.ruleset:773
+#: data/default/buildings.ruleset:778 data/civ2/buildings.ruleset:773
#: data/civ1/buildings.ruleset:536
msgid "Space Module"
msgstr "Kosma Modulo"
-#: data/default/buildings.ruleset:794 data/civ2/buildings.ruleset:787
+#: data/default/buildings.ruleset:793 data/civ2/buildings.ruleset:787
#: data/civ1/buildings.ruleset:550
msgid ""
"Space Modules are the most expensive parts of spaceships. There are three "
@@ -17837,12 +17988,12 @@ msgid ""
"have been built by any player."
msgstr ""
-#: data/default/buildings.ruleset:813 data/civ2/buildings.ruleset:806
+#: data/default/buildings.ruleset:812 data/civ2/buildings.ruleset:806
#: data/civ1/buildings.ruleset:569
msgid "Space Structural"
msgstr "Strukturoj por kosmoÅipo"
-#: data/default/buildings.ruleset:828 data/civ2/buildings.ruleset:820
+#: data/default/buildings.ruleset:827 data/civ2/buildings.ruleset:820
#: data/civ1/buildings.ruleset:583
msgid ""
"Space Structurals form the base of your spaceship. All other spaceship "
@@ -17853,32 +18004,32 @@ msgid ""
"have been built by any player."
msgstr ""
-#: data/default/buildings.ruleset:838 data/civ2/buildings.ruleset:830
+#: data/default/buildings.ruleset:837 data/civ2/buildings.ruleset:830
msgid "Stock Exchange"
msgstr "Biloborso"
-#: data/default/buildings.ruleset:854 data/civ2/buildings.ruleset:846
+#: data/default/buildings.ruleset:853 data/civ2/buildings.ruleset:846
#, no-c-format
msgid ""
"Together with a Marketplace and a Bank, a Stock Exchange boosts tax and "
"luxury production in a city by 150%."
msgstr ""
-#: data/default/buildings.ruleset:860 data/civ2/buildings.ruleset:852
+#: data/default/buildings.ruleset:859 data/civ2/buildings.ruleset:852
msgid "Super Highways"
msgstr "AÅtoÅoseo"
-#: data/default/buildings.ruleset:875 data/civ2/buildings.ruleset:867
+#: data/default/buildings.ruleset:874 data/civ2/buildings.ruleset:867
#, no-c-format
msgid ""
"Increases trade resources by 50% on all squares with roads or railroads."
msgstr ""
-#: data/default/buildings.ruleset:883 data/civ2/buildings.ruleset:873
+#: data/default/buildings.ruleset:882 data/civ2/buildings.ruleset:873
msgid "Supermarket"
msgstr "Superbazaro"
-#: data/default/buildings.ruleset:898 data/civ2/buildings.ruleset:888
+#: data/default/buildings.ruleset:897 data/civ2/buildings.ruleset:888
#, no-c-format
msgid ""
"Increases the food resources by 50% on each farmland square which is being "
@@ -17886,12 +18037,12 @@ msgid ""
"a second time."
msgstr ""
-#: data/default/buildings.ruleset:905 data/civ2/buildings.ruleset:895
+#: data/default/buildings.ruleset:904 data/civ2/buildings.ruleset:895
#: data/civ1/buildings.ruleset:593
msgid "Temple"
msgstr "Templo"
-#: data/default/buildings.ruleset:919 data/civ2/buildings.ruleset:909
+#: data/default/buildings.ruleset:918 data/civ2/buildings.ruleset:909
#: data/civ1/buildings.ruleset:607
msgid ""
"Makes one unhappy citizen content. Both the Mysticism advance and the "
@@ -17899,81 +18050,81 @@ msgid ""
"citizens are made content."
msgstr ""
-#: data/default/buildings.ruleset:926 data/civ2/buildings.ruleset:916
+#: data/default/buildings.ruleset:925 data/civ2/buildings.ruleset:916
#: data/civ1/buildings.ruleset:614 data/default/techs.ruleset:742
#: data/civ2/techs.ruleset:727 data/civ1/techs.ruleset:723
msgid "University"
msgstr "Universitato"
-#: data/default/buildings.ruleset:942
+#: data/default/buildings.ruleset:941
#, no-c-format
msgid ""
"Together with a Library, a University increases the science production of a "
"city by 250%."
msgstr ""
-#: data/default/buildings.ruleset:948 data/civ2/buildings.ruleset:938
+#: data/default/buildings.ruleset:947 data/civ2/buildings.ruleset:938
#: data/civ1/buildings.ruleset:636
msgid "Apollo Program"
msgstr "Kosma programo Apolono"
-#: data/default/buildings.ruleset:962 data/civ2/buildings.ruleset:952
+#: data/default/buildings.ruleset:961 data/civ2/buildings.ruleset:952
msgid ""
"Entire map becomes visible for the player who owns it. It allows all "
"players to start building spaceship parts (assuming they have researched the "
"necessary technologies)."
msgstr ""
-#: data/default/buildings.ruleset:969 data/civ2/buildings.ruleset:959
+#: data/default/buildings.ruleset:968 data/civ2/buildings.ruleset:959
msgid "A.Smith's Trading Co."
msgstr "Komerca societo de Adam Smith"
-#: data/default/buildings.ruleset:983
+#: data/default/buildings.ruleset:982
msgid ""
"City improvements which would normally have an upkeep of 1 are free of "
"upkeep, for all your cities."
msgstr ""
-#: data/default/buildings.ruleset:989 data/civ2/buildings.ruleset:979
+#: data/default/buildings.ruleset:988 data/civ2/buildings.ruleset:979
#: data/civ1/buildings.ruleset:655
msgid "Colossus"
msgstr "Koloso"
-#: data/default/buildings.ruleset:1003 data/civ2/buildings.ruleset:993
+#: data/default/buildings.ruleset:1002 data/civ2/buildings.ruleset:993
#: data/civ1/buildings.ruleset:669
msgid ""
"Each square around the city where this wonder is built that is already "
"generating some trade produces one extra trade resource."
msgstr ""
-#: data/default/buildings.ruleset:1009 data/civ2/buildings.ruleset:999
+#: data/default/buildings.ruleset:1008 data/civ2/buildings.ruleset:999
#: data/civ1/buildings.ruleset:675
msgid "Copernicus' Observatory"
msgstr "Observatorio de Koperniko"
-#: data/default/buildings.ruleset:1024 data/civ2/buildings.ruleset:1180
+#: data/default/buildings.ruleset:1023 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 ""
-#: data/default/buildings.ruleset:1029 data/civ2/buildings.ruleset:1019
+#: data/default/buildings.ruleset:1028 data/civ2/buildings.ruleset:1019
#: data/civ1/buildings.ruleset:695
msgid "Cure For Cancer"
msgstr "Kuracado de kancero"
-#: data/default/buildings.ruleset:1043
+#: data/default/buildings.ruleset:1042
msgid ""
"This stunning technological achievement makes one unhappy citizen content in "
"all your cities."
msgstr ""
-#: data/default/buildings.ruleset:1051 data/civ2/buildings.ruleset:1039
+#: data/default/buildings.ruleset:1050 data/civ2/buildings.ruleset:1039
#: data/civ1/buildings.ruleset:715
msgid "Darwin's Voyage"
msgstr "VojaÄo de Darwin"
-#: data/default/buildings.ruleset:1065 data/civ2/buildings.ruleset:1053
+#: data/default/buildings.ruleset:1064 data/civ2/buildings.ruleset:1053
#: data/civ1/buildings.ruleset:729
msgid ""
"Charles Darwin's voyage sparked the discovery of the evolution of the "
@@ -17981,43 +18132,43 @@ msgid ""
"technology advances."
msgstr ""
-#: data/default/buildings.ruleset:1072 data/civ2/buildings.ruleset:1060
+#: data/default/buildings.ruleset:1071 data/civ2/buildings.ruleset:1060
msgid "Eiffel Tower"
msgstr "Eiffel-turo"
-#: data/default/buildings.ruleset:1087
+#: data/default/buildings.ruleset:1086
#, no-c-format
msgid ""
"Your reputation and goodwill among other nations is recovered twice as fast."
msgstr ""
-#: data/default/buildings.ruleset:1093 data/civ2/buildings.ruleset:1081
+#: data/default/buildings.ruleset:1092 data/civ2/buildings.ruleset:1081
#: data/civ1/buildings.ruleset:736
msgid "Great Library"
msgstr "Granda Biblioteko"
-#: data/default/buildings.ruleset:1107 data/civ2/buildings.ruleset:1095
+#: data/default/buildings.ruleset:1106 data/civ2/buildings.ruleset:1095
#: data/civ1/buildings.ruleset:750
msgid ""
"The civilization which builds the Great Library gets every advance that at "
"least two other civilizations have achieved."
msgstr ""
-#: data/default/buildings.ruleset:1113 data/civ2/buildings.ruleset:1101
+#: data/default/buildings.ruleset:1112 data/civ2/buildings.ruleset:1101
#: data/civ1/buildings.ruleset:756
msgid "Great Wall"
msgstr "Murego"
-#: data/default/buildings.ruleset:1127
+#: data/default/buildings.ruleset:1126
msgid "Works as a City Wall in all your cities."
msgstr ""
-#: data/default/buildings.ruleset:1135 data/civ2/buildings.ruleset:1122
+#: data/default/buildings.ruleset:1134 data/civ2/buildings.ruleset:1122
#: data/civ1/buildings.ruleset:777
msgid "Hanging Gardens"
msgstr "PendÄardenoj"
-#: data/default/buildings.ruleset:1149 data/civ2/buildings.ruleset:1136
+#: data/default/buildings.ruleset:1148 data/civ2/buildings.ruleset:1136
#: data/civ1/buildings.ruleset:791
msgid ""
"Makes one content citizen happy in every city. Makes two extra content "
@@ -18027,96 +18178,96 @@ msgid ""
"them content instead)."
msgstr ""
-#: data/default/buildings.ruleset:1158 data/civ2/buildings.ruleset:1145
+#: data/default/buildings.ruleset:1157 data/civ2/buildings.ruleset:1145
#: data/civ1/buildings.ruleset:800
msgid "Hoover Dam"
msgstr "Hoover-digo"
-#: data/default/buildings.ruleset:1173 data/civ2/buildings.ruleset:1159
+#: data/default/buildings.ruleset:1172 data/civ2/buildings.ruleset:1159
msgid ""
"Works as if you had a Hydro Plant in every city. (This reduces pollution "
"and increases the effects of Factories and Mfg. Plants.)"
msgstr ""
-#: data/default/buildings.ruleset:1179 data/civ2/buildings.ruleset:1165
+#: data/default/buildings.ruleset:1178 data/civ2/buildings.ruleset:1165
#: data/civ1/buildings.ruleset:822
msgid "Isaac Newton's College"
msgstr "Universitato de Isaac Newton"
-#: data/default/buildings.ruleset:1194
+#: data/default/buildings.ruleset:1193
#, no-c-format
msgid ""
"Boosts science production by 100% in every city you control that has a "
"University."
msgstr ""
-#: data/default/buildings.ruleset:1200 data/civ2/buildings.ruleset:1185
+#: data/default/buildings.ruleset:1199 data/civ2/buildings.ruleset:1185
#: data/civ1/buildings.ruleset:842
msgid "J.S. Bach's Cathedral"
msgstr "Katedralo de J.S. Bach"
-#: data/default/buildings.ruleset:1214 data/civ2/buildings.ruleset:1199
+#: data/default/buildings.ruleset:1213 data/civ2/buildings.ruleset:1199
msgid "Makes two unhappy citizens content in every city."
msgstr ""
-#: data/default/buildings.ruleset:1219 data/civ2/buildings.ruleset:1204
+#: data/default/buildings.ruleset:1218 data/civ2/buildings.ruleset:1204
msgid "King Richard's Crusade"
msgstr "Krucmilito de Rikardo la Leonkora"
-#: data/default/buildings.ruleset:1233 data/civ2/buildings.ruleset:1218
+#: data/default/buildings.ruleset:1232 data/civ2/buildings.ruleset:1218
msgid ""
"Adds one extra shield resource on every square around the city where it is "
"built."
msgstr ""
-#: data/default/buildings.ruleset:1239 data/civ2/buildings.ruleset:1224
+#: data/default/buildings.ruleset:1238 data/civ2/buildings.ruleset:1224
msgid "Leonardo's Workshop"
msgstr "Laboratorio de Leonardo"
-#: data/default/buildings.ruleset:1253 data/civ2/buildings.ruleset:1238
+#: data/default/buildings.ruleset:1252 data/civ2/buildings.ruleset:1238
msgid "Upgrades one obsolete unit per game turn."
msgstr ""
-#: data/default/buildings.ruleset:1258 data/civ2/buildings.ruleset:1243
+#: data/default/buildings.ruleset:1257 data/civ2/buildings.ruleset:1243
#: data/civ1/buildings.ruleset:862
msgid "Lighthouse"
msgstr "Lumturo"
-#: data/default/buildings.ruleset:1273
+#: data/default/buildings.ruleset:1272
msgid ""
"Gives all your sea units 1 additional movement point and eliminates the risk "
"of losing Triremes on the high seas. Makes all your new sea units veterans "
"(for all your cities)."
msgstr ""
-#: data/default/buildings.ruleset:1280 data/civ2/buildings.ruleset:1264
+#: data/default/buildings.ruleset:1279 data/civ2/buildings.ruleset:1264
#: data/civ1/buildings.ruleset:885
msgid "Magellan's Expedition"
msgstr "Ekspedicio de Magelano"
-#: data/default/buildings.ruleset:1295
+#: data/default/buildings.ruleset:1294
msgid "Gives all your sea units 2 additional movement points."
msgstr ""
-#: data/default/buildings.ruleset:1300 data/civ2/buildings.ruleset:1283
+#: data/default/buildings.ruleset:1299 data/civ2/buildings.ruleset:1283
#: data/civ1/buildings.ruleset:904
msgid "Manhattan Project"
msgstr "Projekto Manhattan"
-#: data/default/buildings.ruleset:1318 data/civ2/buildings.ruleset:1301
+#: data/default/buildings.ruleset:1317 data/civ2/buildings.ruleset:1301
msgid "Marco Polo's Embassy"
msgstr "Ambasado de Marko Polo"
-#: data/default/buildings.ruleset:1332 data/civ2/buildings.ruleset:1315
+#: data/default/buildings.ruleset:1331 data/civ2/buildings.ruleset:1315
msgid "The player who owns it gets an embassy with all players."
msgstr ""
-#: data/default/buildings.ruleset:1337 data/civ2/buildings.ruleset:1320
+#: data/default/buildings.ruleset:1336 data/civ2/buildings.ruleset:1320
#: data/civ1/buildings.ruleset:922
msgid "Michelangelo's Chapel"
msgstr "Kapelo de MikelanÄelo"
-#: data/default/buildings.ruleset:1351 data/civ2/buildings.ruleset:1334
+#: data/default/buildings.ruleset:1350 data/civ2/buildings.ruleset:1334
msgid ""
"Counts as having a Cathedral in each of your cities. This makes 3 unhappy "
"citizens content in each city. The discovery of Theology increases the "
@@ -18125,51 +18276,51 @@ msgid ""
"the number of unhappy citizens made content."
msgstr ""
-#: data/default/buildings.ruleset:1361 data/civ2/buildings.ruleset:1344
+#: data/default/buildings.ruleset:1360 data/civ2/buildings.ruleset:1344
#: data/civ1/buildings.ruleset:941
msgid "Oracle"
msgstr "Orakolo"
-#: data/default/buildings.ruleset:1375
+#: data/default/buildings.ruleset:1374
msgid "Makes two of your unhappy citizens content in every city with a temple."
msgstr ""
-#: data/default/buildings.ruleset:1380 data/civ2/buildings.ruleset:1363
+#: data/default/buildings.ruleset:1379 data/civ2/buildings.ruleset:1363
#: data/civ1/buildings.ruleset:960
msgid "Pyramids"
msgstr "Piramidoj"
-#: data/default/buildings.ruleset:1394
+#: data/default/buildings.ruleset:1393
msgid ""
"The amount of stored food lost when one of your cities grows or shrinks is "
"reduced by 25%. This helps a city to grow faster and more easily withstand "
"famine. Cumulative with Granary."
msgstr ""
-#: data/default/buildings.ruleset:1401 data/civ2/buildings.ruleset:1382
+#: data/default/buildings.ruleset:1400 data/civ2/buildings.ruleset:1382
#: data/civ1/buildings.ruleset:981
msgid "SETI Program"
msgstr "SETI"
-#: data/default/buildings.ruleset:1415
+#: data/default/buildings.ruleset:1414
msgid "Boosts science production in each city with a Research Lab by 100%. "
msgstr ""
-#: data/default/buildings.ruleset:1420 data/civ2/buildings.ruleset:1402
+#: data/default/buildings.ruleset:1419 data/civ2/buildings.ruleset:1402
#: data/civ1/buildings.ruleset:1001
msgid "Shakespeare's Theatre"
msgstr "Teatraĵoj de Shakespeare"
-#: data/default/buildings.ruleset:1434 data/civ2/buildings.ruleset:1416
+#: data/default/buildings.ruleset:1433 data/civ2/buildings.ruleset:1416
#: data/civ1/buildings.ruleset:1015
msgid "Makes all unhappy citizens content, in the city where it is located."
msgstr ""
-#: data/default/buildings.ruleset:1439 data/civ2/buildings.ruleset:1421
+#: data/default/buildings.ruleset:1438 data/civ2/buildings.ruleset:1421
msgid "Statue of Liberty"
msgstr "Statuo de la Libereco"
-#: data/default/buildings.ruleset:1453 data/civ2/buildings.ruleset:1435
+#: data/default/buildings.ruleset:1452 data/civ2/buildings.ruleset:1435
#: data/civ1/buildings.ruleset:974 data/civ1/buildings.ruleset:1034
msgid ""
"Allows you to choose any government, including those that have not yet been "
@@ -18177,42 +18328,42 @@ msgid ""
"Anarchy."
msgstr ""
-#: data/default/buildings.ruleset:1460 data/civ2/buildings.ruleset:1442
+#: data/default/buildings.ruleset:1459 data/civ2/buildings.ruleset:1442
msgid "Sun Tzu's War Academy"
msgstr "Milit-Akademio de Sun Tzu"
-#: data/default/buildings.ruleset:1474
+#: data/default/buildings.ruleset:1473
msgid ""
"All your new ground units start at the first veteran level. The chance of a "
"unit getting the next veteran level after a battle increases by half."
msgstr ""
-#: data/default/buildings.ruleset:1481 data/civ2/buildings.ruleset:1463
+#: data/default/buildings.ruleset:1480 data/civ2/buildings.ruleset:1463
#: data/civ1/buildings.ruleset:1020
msgid "United Nations"
msgstr "UniÄintaj Nacioj"
-#: data/default/buildings.ruleset:1495
+#: data/default/buildings.ruleset:1494
msgid "All your units regain two extra hitpoints per turn."
msgstr ""
-#: data/default/buildings.ruleset:1508 data/civ2/buildings.ruleset:1490
+#: data/default/buildings.ruleset:1507 data/civ2/buildings.ruleset:1490
#: data/civ1/buildings.ruleset:1046
msgid "Women's Suffrage"
msgstr "Voĉdonrajto por virinoj"
-#: data/default/buildings.ruleset:1522 data/civ2/buildings.ruleset:1504
+#: data/default/buildings.ruleset:1521 data/civ2/buildings.ruleset:1504
msgid ""
"Counts as a Police Station in every city. (That is, for each city, reduces "
"unhappiness for military units outside the city by 2 under Democracy and 1 "
"under Republic. This wonder has no effect under other governments.)"
msgstr ""
-#: data/default/buildings.ruleset:1533
+#: data/default/buildings.ruleset:1532
msgid "Coinage"
msgstr "Stampado de monero"
-#: data/default/buildings.ruleset:1554
+#: data/default/buildings.ruleset:1553
msgid ""
"This is not a normal improvement. Instead, setting a city's production to "
"Coinage means its shield production is converted to tax output (money, "
@@ -18575,11 +18726,16 @@ msgstr "?citystyle:Kelta"
msgid "?citystyle:Industrial"
msgstr "?citystyle:Industria"
-#: data/default/cities.ruleset:139 data/civ2/cities.ruleset:150
+#: data/default/cities.ruleset:139
+#, fuzzy
+msgid "?citystyle:ElectricAge"
+msgstr "?citystyle:Kelta"
+
+#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:150
msgid "?citystyle:Modern"
msgstr "?citystyle:Moderna"
-#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:161
+#: data/default/cities.ruleset:161 data/civ2/cities.ruleset:161
msgid "?citystyle:PostModern"
msgstr "?citystyle:Postmoderna"
@@ -23403,6 +23559,22 @@ msgstr "Grupo 30"
msgid "Team 31"
msgstr "Grupo 31"
+#~ msgid "Observers cannot vote."
+#~ msgstr "La observantoj ne rajtas voĉdoni."
+
+#~ msgid ""
+#~ "You can only vote in a running game. Use 'first' to become the game "
+#~ "organizer if there currently is none."
+#~ msgstr ""
+#~ "Vi povas nur voĉdoni en plenumanta ludo. Uzu 'first' por igi organizanto "
+#~ "de la ludo, se la seÄo estas vaka."
+
+#~ msgid "Vote %d \"%s\": %d for, %d against"
+#~ msgstr "Voĉdonado %d \"%s\": %d favore, %d malfavore"
+
+#~ msgid "Value must be integer."
+#~ msgstr "La valoro devas esti entjero."
+
#~ msgid "The %s of the %s (%s)"
#~ msgstr "La %s de la %s (%s)"
@@ -23879,9 +24051,6 @@ msgstr "Grupo 31"
#~ msgid "_Edit Nation..."
#~ msgstr "R_edaktu nacion.."
-#~ msgid "Never"
-#~ msgstr "Neniam"
-
#~ msgid "Loading theme \"%s\"."
#~ msgstr "Åœargante temon \"%s\"."
diff --git a/po/es.gmo b/po/es.gmo
index ea21414..5bb4c47 100644
Binary files a/po/es.gmo and b/po/es.gmo differ
diff --git a/po/es.po b/po/es.po
index 4123f4e..258b035 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,28 +1,30 @@
-# translation of newes.po to Español
-# translation of es.po to Español
+# translation of es.po to Spanish
# Spanish translations for Freeciv
# Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold.
#
-# Nota de M.L.: al igual que el resto de los mensajes, las notas históricas
-# sobre las naciones son traducciones más o menos fieles de la versión inglesa.
-# Para debatir sobre su exactitud es mejor contactar directamente con los
-# autores del juego, escribiendo *en inglés* a <freeciv-dev at freeciv.org>.
# David Pérez Serrada <dperezs at nexo.es>, 1999.
# Miguel Lobo <miguel at miguell.cjb.net>, 2000 - 2003.
# Jordi Negrevernis i Font <jorneg at retemail.es>, 2005.
# Claudio M. Camacho <claudiomkd at gmail.com>, 2006.
+# Jordi Negrevernis i Font <jnegrevernis at jnfprogramari.com>, 2009.
+# Freeciv <jnegrevernis at jnfprogramari.com>, 2009.
+# Nota de M.L.: al igual que el resto de los mensajes, las notas históricas
+# sobre las naciones son traducciones más o menos fieles de la versión inglesa.
+# Para debatir sobre su exactitud es mejor contactar directamente con los
+# autores del juego, escribiendo *en inglés* a <freeciv-dev at freeciv.org>.
msgid ""
msgstr ""
-"Project-Id-Version: Freeciv 2.1-beta1\n"
+"Project-Id-Version: es\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-29 21:13+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"
+"POT-Creation-Date: 2009-11-22 21:37+0100\n"
+"PO-Revision-Date: 2009-10-15 00:26+0200\n"
+"Last-Translator: Freeciv <jnegrevernis at jnfprogramari.com>\n"
+"Language-Team: Spanish\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-15\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.4\n"
#: common/city.c:56 client/gui-gtk-2.0/repodlgs.c:938
#: client/gui-win32/repodlgs.c:700
@@ -71,21 +73,21 @@ msgstr "O"
msgid "?redundant:*"
msgstr "?redundante:*"
-#: common/connection.c:515
+#: common/connection.c:518
#, c-format
msgid "%s from %s"
msgstr "%s de %s"
-#: common/connection.c:521
+#: common/connection.c:524
msgid " (connection incomplete)"
msgstr " (conexión incompleta)"
-#: common/connection.c:525
+#: common/connection.c:528
#, c-format
msgid " (player %s)"
msgstr " (jugador %s)"
-#: common/connection.c:529
+#: common/connection.c:532
msgid " (observer)"
msgstr " (observador)"
@@ -139,7 +141,7 @@ msgstr "Ciudad: Bomba at
#: common/events.c:54
msgid "City: Released from citizen governor"
-msgstr "Ciudad: Liberado del governador CMA"
+msgstr "Ciudad: Liberado del control del gobernador de la ciudad"
#: common/events.c:55
msgid "City: Suggest Growth Throttling"
@@ -155,7 +157,7 @@ msgstr "Ciudad: Se funda"
#: common/events.c:58
msgid "City: Worklist Events"
-msgstr "Ciudad: Noticias de la listas de tareas"
+msgstr "Ciudad: Eventos de la listas de tareas"
#: common/events.c:59
msgid "City: Production changed"
@@ -422,9 +424,8 @@ msgid "Unit: Defender Survived"
msgstr "Unidad: Un defensor sobrevive"
#: common/events.c:125
-#, fuzzy
msgid "Unit: Promoted to Veteran"
-msgstr "Unidad: Se Volvió Más Veterana"
+msgstr "Unidad: Se volvió más veterana"
#: common/events.c:126
msgid "Unit: Production Upgraded"
@@ -488,83 +489,83 @@ msgstr "Mensajes de conectando/desconectado"
#: common/events.c:141
msgid "AI Debug messages"
-msgstr "Mensajes de debug del Ordenador"
+msgstr "Mensajes de debug de la Inteligencia Artificial"
-#: common/player.c:732
+#: common/player.c:746
msgid "?attitude:Genocidal"
msgstr "Genocida"
-#: common/player.c:734
+#: common/player.c:748
msgid "?attitude:Belligerent"
msgstr "Beligerante"
-#: common/player.c:736
+#: common/player.c:750
msgid "?attitude:Hostile"
msgstr "Hostil"
-#: common/player.c:738
+#: common/player.c:752
msgid "?attitude:Uncooperative"
msgstr "Incooperativo"
-#: common/player.c:740
+#: common/player.c:754
msgid "?attitude:Uneasy"
msgstr "No fácil"
-#: common/player.c:742
+#: common/player.c:756
msgid "?attitude:Neutral"
msgstr "Neutral"
-#: common/player.c:744
+#: common/player.c:758
msgid "?attitude:Respectful"
msgstr "Respetuoso"
-#: common/player.c:746
+#: common/player.c:760
msgid "?attitude:Helpful"
msgstr "Ayudado"
-#: common/player.c:748
+#: common/player.c:762
msgid "?attitude:Enthusiastic"
msgstr "Entusiasta"
-#: common/player.c:750
+#: common/player.c:764
msgid "?attitude:Admiring"
msgstr "Admirador"
-#: common/player.c:753
+#: common/player.c:767
msgid "?attitude:Worshipful"
msgstr "Excelentísima"
-#: common/player.c:764
+#: common/player.c:778
msgid "?diplomatic_state:Armistice"
msgstr "Armisticio"
-#: common/player.c:765
+#: common/player.c:779
msgid "?diplomatic_state:War"
msgstr "Guerra"
-#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:780 client/gui-gtk-2.0/diplodlg.c:353
#: 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:767 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:781 client/gui-gtk-2.0/diplodlg.c:358
#: 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:768 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:782 client/gui-gtk-2.0/diplodlg.c:363
#: 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:769
+#: common/player.c:783
msgid "?diplomatic_state:Never met"
msgstr "Sin contacto"
-#: common/player.c:770
+#: common/player.c:784
msgid "?diplomatic_state:Team"
msgstr "Grupo"
@@ -599,7 +600,7 @@ msgstr ""
#. TRANS: "Resources: (none)".
#: common/requirements.c:1014 common/team.c:132
#: client/gui-gtk-2.0/helpdlg.c:1055 client/gui-gtk-2.0/inteldlg.c:390
-#: client/gui-win32/helpdlg.c:586 client/gui-xaw/helpdlg.c:991
+#: client/gui-win32/helpdlg.c:592 client/gui-xaw/helpdlg.c:991
#, c-format
msgid "(none)"
msgstr "(ninguno)"
@@ -625,10 +626,11 @@ msgstr "Siguiente Tecno. %d"
#: 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
#: client/gui-sdl/helpdlg.c:817 client/gui-sdl/mapview.c:962
-#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:545
-#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:735
-#: 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
+#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:544
+#: client/gui-win32/helpdlg.c:551 client/gui-win32/helpdlg.c:721
+#: client/gui-win32/helpdlg.c:741 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 "Ninguna"
@@ -641,29 +643,29 @@ msgstr "Siguiente Tecno."
msgid "(Unknown)"
msgstr "(Desconocida)"
-#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:553
#: manual/civmanual.c:224
msgid "Road"
msgstr "Camino"
-#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:557
#: client/gui-gtk-2.0/menu.c:829 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:394 common/terrain.c:572 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:567
#: 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:395 common/terrain.c:585 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:555
msgid "Mine"
msgstr "Mina"
-#: common/terrain.c:396 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:551 server/report.c:124
#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "Contaminación"
@@ -672,7 +674,7 @@ msgstr "Contaminaci
msgid "Hut"
msgstr "Choza"
-#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:563
#: manual/civmanual.c:226
msgid "Fortress"
msgstr "Fortaleza"
@@ -685,58 +687,58 @@ msgstr "R
msgid "Farmland"
msgstr "Huerta"
-#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:577
#: manual/civmanual.c:226
msgid "Airbase"
msgstr "Base aérea"
-#: common/terrain.c:402 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:579
msgid "Fallout"
msgstr "Radioactividad"
-#: common/unit.c:546 client/gui-win32/plrdlg.c:337
+#: common/unit.c:549 client/gui-win32/plrdlg.c:337
msgid "Idle"
msgstr "Inactivo"
-#: common/unit.c:556
+#: common/unit.c:559
msgid "Fortifying"
msgstr "Atrincherándose"
-#: common/unit.c:558
+#: common/unit.c:561
msgid "Fortified"
msgstr "Atrincherada"
-#: common/unit.c:562 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
+#: common/unit.c:565 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
msgid "Sentry"
msgstr "Vigilante"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
+#: common/unit.c:569 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
#: client/gui-win32/menu.c:370 client/gui-xaw/menu.c:185
msgid "Pillage"
msgstr "Saqueo"
-#: common/unit.c:568 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
+#: common/unit.c:571 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
msgid "Goto"
msgstr "Ir a"
-#: common/unit.c:570
+#: common/unit.c:573
msgid "Explore"
msgstr "Explorar"
-#: common/unit.c:572 manual/civmanual.c:224
+#: common/unit.c:575 manual/civmanual.c:224
msgid "Transform"
msgstr "Transformar"
-#: common/unit.c:584 client/text.c:157 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:587 client/text.c:157 client/gui-sdl/citydlg.c:1972
#: client/gui-win32/citydlg.c:1257 client/gui-xaw/citydlg.c:1423
msgid "Unknown"
msgstr "Desconocido"
-#: common/unit.c:1022
+#: common/unit.c:1025
msgid "Moves"
msgstr "Movimientos"
-#: common/unit.c:1571
+#: common/unit.c:1574
#, c-format
msgid ""
"Upgrade %s to %s for %d gold?\n"
@@ -745,12 +747,12 @@ msgstr ""
"¿Deseas mejorar %s a %s por %d monedas de oro?\n"
"En el tesoro tienes %d monedas de oro."
-#: common/unit.c:1579
+#: common/unit.c:1582
#, c-format
msgid "Sorry, cannot upgrade %s (yet)."
msgstr "Lo siento: no se puede mejorar %s (aún)."
-#: common/unit.c:1585
+#: common/unit.c:1588
#, c-format
msgid ""
"Upgrading %s to %s costs %d gold.\n"
@@ -759,29 +761,26 @@ msgstr ""
"Mejorar %s a %s cuesta %d monedas de oro.\n"
"En el tesoro tienes %d monedas de oro."
-#: common/unit.c:1594
+#: common/unit.c:1597
msgid "You can only upgrade units in your cities."
msgstr "Sólo puede mejorar unidades en sus ciudades."
-#: common/unit.c:1598
+#: common/unit.c:1601
#, c-format
msgid "Upgrading this %s would strand units it transports."
msgstr "Mejorar este %s poducirá la pérdida de las unidades que transporta."
#: common/unittype.c:61
-#, fuzzy
msgid "Missile"
-msgstr "imposible"
+msgstr "Misil"
#: common/unittype.c:62
-#, fuzzy
msgid "Land"
-msgstr "Cargar"
+msgstr "Tierra"
#: common/unittype.c:63
-#, fuzzy
msgid "Sea"
-msgstr "Robar"
+msgstr "Mar"
#: common/unittype.c:64 data/default/units.ruleset:1106
#: data/civ2/units.ruleset:1057
@@ -789,9 +788,8 @@ msgid "Helicopter"
msgstr "Helicóptero"
#: common/unittype.c:65
-#, fuzzy
msgid "Air"
-msgstr "Base aérea"
+msgstr "Aérea"
#: common/unittype.c:66 data/default/units.ruleset:1625
#: data/civ2/units.ruleset:1576 data/civ1/units.ruleset:920
@@ -800,11 +798,11 @@ msgstr "Misil Nuclear"
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1404
+#: common/unittype.c:349 client/helpdata.c:1412
msgid " and "
msgstr " y "
-#: common/unittype.c:355 client/helpdata.c:1390
+#: common/unittype.c:355 client/helpdata.c:1398
msgid "?and:, "
msgstr ", "
@@ -974,73 +972,73 @@ msgstr "Falta el argumento de \"%s\".\n"
msgid "Missing argument for \"%s\".\n"
msgstr "Falta el argumento de \"%s\".\n"
-#: utility/shared.c:501
+#: utility/shared.c:514
#, c-format
msgid "%d BC"
msgstr "%d A.C."
-#: utility/shared.c:503
+#: utility/shared.c:516
#, c-format
msgid "%d AD"
msgstr "%d D.C."
-#: utility/shared.c:924
+#: utility/shared.c:937
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:1028
+#: utility/shared.c:1041
#, c-format
msgid "Could not read data directory %s: %s."
msgstr "No se puede leer el directorio de datos %s: %s."
-#: utility/shared.c:1279
+#: utility/shared.c:1292
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:1281
+#: utility/shared.c:1294
#, c-format
msgid "Current data path is: \"%s\""
msgstr "Los directorios de datos actuales son: \"%s\""
-#: utility/shared.c:1283
+#: utility/shared.c:1296
#, c-format
msgid "The \"%s\" file is required ... aborting!"
msgstr "El fichero \"%s\" es necesario ... ¡abortando!"
-#: utility/shared.c:1460
+#: utility/shared.c:1485
#, 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:1462
+#: utility/shared.c:1487
msgid "Use a non-privileged account instead.\n"
msgstr "Mejor usa una cuenta de usuario sin privilegios.\n"
-#: utility/shared.c:1478
+#: utility/shared.c:1503
msgid "exact match"
msgstr "coincidencia exacta"
-#: utility/shared.c:1479
+#: utility/shared.c:1504
msgid "only match"
msgstr "única coincidencia"
-#: utility/shared.c:1480
+#: utility/shared.c:1505
msgid "ambiguous"
msgstr "ambiguo"
-#: utility/shared.c:1481
+#: utility/shared.c:1506
msgid "empty"
msgstr "vacío"
-#: utility/shared.c:1482
+#: utility/shared.c:1507
msgid "too long"
msgstr "demasiado largo"
-#: utility/shared.c:1483
+#: utility/shared.c:1508
msgid "non-match"
msgstr "no hay coincidencias"
@@ -1069,23 +1067,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:280
+#: ai/advdiplomacy.c:300
#, 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:290
+#: ai/advdiplomacy.c:310
#, c-format
msgid "*%s (AI)* First break alliance with %s, %s."
msgstr "*%s (Ordenador)* Primero rompe tu alianza con %s, %s."
-#: ai/advdiplomacy.c:303
+#: ai/advdiplomacy.c:322
#, c-format
msgid "*%s (AI)* Let us first cease hostilies, %s."
msgstr "*%s (Ordenador)* Detengamos nuestras hostilidades antes, %s."
-#: ai/advdiplomacy.c:308
+#: ai/advdiplomacy.c:327
#, c-format
msgid ""
"*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
@@ -1094,49 +1092,49 @@ msgstr ""
"*%s (Ordenador)* Antes me gustaría que mantuvieses la tregua por un poco más "
"de tiempo, %s."
-#: ai/advdiplomacy.c:331
+#: ai/advdiplomacy.c:350
#, 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:424
+#: ai/advdiplomacy.c:443
#, 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:454
+#: ai/advdiplomacy.c:473
#, 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:560
+#: ai/advdiplomacy.c:579
#, 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:582
+#: ai/advdiplomacy.c:601
#, c-format
msgid "*%s (AI)* Welcome into our alliance %s!"
msgstr "*%s (Ordenador)* ¡Bienvenido a nuestra alianza %s!"
-#: ai/advdiplomacy.c:586
+#: ai/advdiplomacy.c:605
#, 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:593
+#: ai/advdiplomacy.c:612
#, c-format
msgid "*%s (AI)* Yes, peace in our time!"
msgstr "*%s (Ordenador)* ¡Sí, paz en nuestros días!"
-#: ai/advdiplomacy.c:598
+#: ai/advdiplomacy.c:617
#, c-format
msgid "*%s (AI)* Agreed. No more hostilities, %s."
msgstr "*%s (Ordenador)* De acuerdo. Que acaben las hostilidades, %s."
-#: ai/advdiplomacy.c:813
+#: ai/advdiplomacy.c:832
#, c-format
msgid ""
"*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
@@ -1145,24 +1143,24 @@ msgstr ""
"*%s (Ordenador)* ¡Saludos %s! ¿Te interesaría una tregua mientras nos vamos "
"conociendo mejor el uno al otro?"
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1116
#, c-format
msgid "*%s (AI)* Space will never be yours. "
msgstr "*%s (Ordenador)* El Espacio nunca será tuyo. "
-#: ai/advdiplomacy.c:1102
+#: ai/advdiplomacy.c:1121
#, 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:1108
+#: ai/advdiplomacy.c:1127
#, c-format
msgid "*%s (AI)* Peace in ... some other time."
msgstr "*%s (Ordenador)* Paz en ... otro momento."
-#: ai/advdiplomacy.c:1113
+#: ai/advdiplomacy.c:1132
#, c-format
msgid ""
"*%s (AI)* Finally I get around to you! Did you really think you could get "
@@ -1171,18 +1169,18 @@ msgstr ""
"*%s (Ordenador)* ¡Al final te he encontrado! ¿Creías que tus crímenes iban "
"a escapar sin castigo?"
-#: ai/advdiplomacy.c:1119
+#: ai/advdiplomacy.c:1138
#, 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:1126
+#: ai/advdiplomacy.c:1145
#, 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:1209
+#: ai/advdiplomacy.c:1229
#, c-format
msgid ""
"*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1197,7 +1195,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:1219
+#: ai/advdiplomacy.c:1239
#, c-format
msgid ""
"*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
@@ -1206,7 +1204,7 @@ msgstr ""
"*%s (Ordenador)* Confiamos en tu colaboración en este asunto. Larga vida "
"nuestro glorioso "
-#: ai/advdiplomacy.c:1225
+#: ai/advdiplomacy.c:1245
#, c-format
msgid ""
"*%s (AI)* %s has grossly violated his treaties with us for own gain. We "
@@ -1227,7 +1225,7 @@ msgstr[1] ""
"esperamos honrarnos de tu alianza con nosotros y que respondas de la misma "
"manera!"
-#: ai/advdiplomacy.c:1238
+#: ai/advdiplomacy.c:1258
#, c-format
msgid ""
"*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1242,7 +1240,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:1246
+#: ai/advdiplomacy.c:1266
#, c-format
msgid ""
"*%s (AI)* If you want a piece of the loot, feel free to join in the action!"
@@ -1250,7 +1248,7 @@ msgstr ""
"*%s (Ordenador)* Si quieres una pieza del botín, ¡no dudes en unirte a la "
"acción!"
-#: ai/advdiplomacy.c:1251
+#: ai/advdiplomacy.c:1271
#, c-format
msgid ""
"*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1265,14 +1263,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:1261
+#: ai/advdiplomacy.c:1281
#, 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:1267
+#: ai/advdiplomacy.c:1287
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance and declare war on %s in %d turn. "
@@ -1287,7 +1285,7 @@ msgstr[1] ""
"*%s (Ordenador)* Honremos nuestra alianza y declaremos la guerra a los %s en "
"%d turnos."
-#: ai/advdiplomacy.c:1276
+#: ai/advdiplomacy.c:1296
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1302,7 +1300,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:1344
+#: ai/advdiplomacy.c:1364
#, c-format
msgid ""
"*%s (AI)* Your attempt to conquer space for yourself alone betray your true "
@@ -1311,7 +1309,7 @@ msgstr ""
"*%s (Ordenador)* Tus intentos de conquistar el espacio para tí solo "
"demuestran tus verdaderas intenciones. ¡Nuestra alianza ha terminado!"
-#: ai/advdiplomacy.c:1359
+#: ai/advdiplomacy.c:1379
#, c-format
msgid ""
"*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
@@ -1320,7 +1318,7 @@ msgstr ""
"*%s (Ordenador)* Tus intentos de dominar el espacio unilateralmente resultan "
"de lo más ofensivos."
-#: ai/advdiplomacy.c:1362
+#: ai/advdiplomacy.c:1382
#, c-format
msgid ""
"*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
@@ -1329,12 +1327,12 @@ msgstr ""
"*%s (Ordenador) ¡Si no interrumpes la construcción de tu nave espacial puede "
"que me vea obligado a actuar!"
-#: ai/advdiplomacy.c:1474
+#: ai/advdiplomacy.c:1494
#, 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:1549
+#: ai/advdiplomacy.c:1569
#, c-format
msgid ""
"*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
@@ -1343,7 +1341,7 @@ msgstr ""
"*%s (Ordenador)* Saludos, nuestro aliado más digno de confianza. Te "
"solicitamos que destruyas a nuestro enemigo, %s."
-#: ai/advdiplomacy.c:1555
+#: ai/advdiplomacy.c:1575
#, c-format
msgid ""
"*%s (AI)* Greetings ally, I see you have not yet made war with our enemy, %"
@@ -1352,7 +1350,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:1562
+#: ai/advdiplomacy.c:1582
#, c-format
msgid ""
"*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1362,21 +1360,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:1592
+#: ai/advdiplomacy.c:1612
#, 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:1607
+#: ai/advdiplomacy.c:1627
#, 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:1622
+#: ai/advdiplomacy.c:1642
#, c-format
msgid ""
"*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
@@ -1385,7 +1383,7 @@ msgstr ""
"*%s (AI)* Estamos hartos de ver tanta sangre derramada. ¿Te parece bien que "
"cesemos nuestras hostilidades?"
-#: ai/advdiplomacy.c:1742
+#: ai/advdiplomacy.c:1762
#, c-format
msgid ""
"*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1397,41 +1395,40 @@ msgstr ""
#. TRANS: Further information about option will follow.
#: server/auth.c:170
-#, fuzzy, c-format
+#, c-format
msgid "Auth option \"%s\":"
-msgstr "Todas las opciones"
+msgstr "Opcion de Aut \"%s\":"
#. TRANS: After 'Auth option "user":'. Option value
#. may have been inserted between these.
#: server/auth.c:183
msgid " missing from config file (using default)"
-msgstr ""
+msgstr "no definido en fichero de config (usando valor por defecto)"
#. TRANS: auth option originates from internal default
#: server/auth.c:186
msgid " (default)"
-msgstr ""
+msgstr " (por defecto)"
#. TRANS: auth option originates from config file
#: server/auth.c:191
msgid " (config)"
-msgstr ""
+msgstr " (config)"
#. TRANS: auth option has been set from prompt
#: server/auth.c:195
-#, fuzzy
msgid " (set)"
-msgstr " (veterana)"
+msgstr " (asignado)"
#: server/auth.c:234
#, c-format
msgid "Illegal value for auth port: \"%s\""
-msgstr ""
+msgstr "valor ilegal para puerto de aut: \"%s\""
#: server/auth.c:281
-#, fuzzy, c-format
+#, c-format
msgid "Cannot load auth config file \"%s\"!"
-msgstr "No encuentro el fichero de sonido %s"
+msgstr "No se puede cargar el fichero de config de la autentificacion \"%s\"!"
#: server/auth.c:392
#, c-format
@@ -1463,7 +1460,7 @@ msgid ""
"allowed. Sorry"
msgstr ""
"Ha habido un error leyendo la base de datos de usuarios, y además no se "
-"permiten las conexiones como invitado. Lo siento."
+"permiten las conexiones como invitado. Lo siento."
#: server/auth.c:429
#, c-format
@@ -1541,18 +1538,17 @@ msgstr ""
"La contraseña debe contener al menos %d letras mayúsculas y %d dígitos, y "
"ser de al menos %d caracteres (imprimibles). Inténtalo de nuevo."
-#: server/barbarian.c:183
-#, fuzzy, c-format
+#: server/barbarian.c:184
+#, c-format
msgid "%s gain a leader by the name %s. Dangerous times may lie ahead."
-msgstr ""
-"Los bárbaros ganan un nuevo líder llamado %s. Se avecinan tiempos difíciles."
+msgstr "Los %s ganan un líder llamado %s. Se avecinan tiempos difíciles."
-#: server/barbarian.c:479
+#: server/barbarian.c:480
#, c-format
msgid "Native unrest near %s led by %s."
msgstr "Cerca de %s han aparecido indígenas descontentos dirigidos por %s."
-#: server/barbarian.c:484
+#: server/barbarian.c:485
#, c-format
msgid "Sea raiders seen near %s!"
msgstr "¡Se han visto piratas cerca de %s!"
@@ -1631,23 +1627,23 @@ msgstr "Una ciudad con mal nombre"
#: server/citytools.c:508
#, c-format
msgid "Changed homecity of %s to %s."
-msgstr "Se ha establecido en la ciudad de %s a %s."
+msgstr "Tu %s se ha establecido en la ciudad de %s."
#: server/citytools.c:522
#, c-format
msgid "Transfered %s in %s from %s to %s."
-msgstr "Se ha transferido %s de %s desde %s a %s."
+msgstr "Se ha transferido %s de %s desde los %s a los %s."
#: server/citytools.c:535
#, c-format
msgid "Transfered %s from %s to %s."
-msgstr "Se ha transferido %s desde %s a %s."
+msgstr "Se ha transferido %s desde los %s a los %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 "Perdido un %2$s de %1$s en la transferencia a %4$s de %3$s."
+msgstr "Perdido un %2$s %1$s en la transferencia a %4$s %3$s"
#: server/citytools.c:631
#, c-format
@@ -1780,8 +1776,8 @@ msgstr "Nota: La maravilla %s de %s se va a terminar el pr
msgid ""
"Suggest throttling growth in %s to use %s (being built) more effectively."
msgstr ""
-"Sería bueno que %s creciera para usar %s (en construcción) de una forma más "
-"efectiva."
+"Sería bueno que %s no creciera tan rápido para usar %s (en construcción) de "
+"una forma más efectiva."
#: server/cityturn.c:351
#, c-format
@@ -1912,7 +1908,7 @@ msgstr ""
#. TRANS: The <city> worklist ....
#: server/cityturn.c:870
-#, fuzzy, c-format
+#, c-format
msgid "The %s worklist is now empty."
msgstr "La lista de tareas de %s está vacía."
@@ -1950,7 +1946,7 @@ msgstr[0] ""
msgstr[1] ""
"%s impulsa la investigación; consigues %d descubrimientos inmediatamente."
-#: server/cityturn.c:1158 server/techtools.c:176
+#: server/cityturn.c:1158 server/techtools.c:172
#, c-format
msgid "The %s have acquired %s from %s."
msgstr "Los %s reciben %s de los %s."
@@ -2035,22 +2031,22 @@ msgid "Warning: the %s option is obsolete. Use -m to enable the metaserver.\n"
msgstr ""
"Atención: la opción %s está obsoleta. Usa -m para activar el metaservidor.\n"
-#: server/civserver.c:189
+#: server/civserver.c:193
#, c-format
msgid "Error: unknown option '%s'\n"
msgstr "Error: opción desconocida '%s'\n"
-#: server/civserver.c:200
+#: server/civserver.c:204
#, c-format
msgid "This is the server for %s"
msgstr "Este es el servidor %s"
-#: server/civserver.c:201
+#: server/civserver.c:205
#, c-format
msgid "You can learn a lot about Freeciv at %s"
msgstr "Puedes encontrar más información sobre Freeciv en %s"
-#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
+#: server/civserver.c:210 client/civclient.c:239 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -2059,112 +2055,117 @@ msgstr ""
"Uso: %s [opción ...]\n"
"Las opciones válidas son:\n"
-#: server/civserver.c:208
-#, fuzzy
+#: server/civserver.c:212
msgid ""
" -a --auth FILE\tEnable server authentication with configuration from "
"FILE.\n"
-msgstr " -a --auth\t\tHabilitar autentificación en servidor.\n"
+msgstr ""
+" -a --auth FILE\tHabilitar autentificación en el servidor con la "
+"configuracion del fichero FILE.\n"
-#: server/civserver.c:210
+#: server/civserver.c:214
msgid " -G --Guests\t\tAllow guests to login if auth is enabled.\n"
msgstr ""
" -G --Guests\t\tPermitir entrar a los invitados si la autentificación está "
"habilitada.\n"
-#: server/civserver.c:212
+#: server/civserver.c:216
msgid " -N --Newusers\tAllow new users to login if auth is enabled.\n"
msgstr ""
" -N --Newusers\tPermtir entrar a los nuevos usuarios si la autentificación "
"está habilitada.\n"
-#: server/civserver.c:215
+#: server/civserver.c:219
msgid " -b --bind ADDR\tListen for clients on ADDR\n"
msgstr ""
" -b --bind DIRE\tEsperar conexiones de clientes en la dirección DIRE\n"
-#: server/civserver.c:217 client/civclient.c:242
+#: server/civserver.c:221 client/civclient.c:243
msgid ""
" -d, --debug NUM\tSet debug log level (0 to 4, or 4:file1,min,max:...)\n"
msgstr ""
" -d, --debug NUM\tEstablecer el nivel de depuración (de 0 a 4, o 4:fich1,"
"min,max:...)\n"
-#: server/civserver.c:221 client/civclient.c:246
+#: server/civserver.c:225 client/civclient.c:247
msgid " -d, --debug NUM\tSet debug log level (0 to 3)\n"
msgstr " -d, --debug NUM\tEstablecer el nivel de depuración (de 0 a 3)\n"
-#: server/civserver.c:223
+#: server/civserver.c:227
msgid " -f, --file FILE\tLoad saved game FILE\n"
msgstr " -f, --file FICH\tCargar la partida guardada FICH\n"
-#: server/civserver.c:225 client/civclient.c:249 manual/civmanual.c:382
+#: server/civserver.c:229 client/civclient.c:250 manual/civmanual.c:382
msgid " -h, --help\t\tPrint a summary of the options\n"
msgstr " -h, --help\t\tImprimir un resumen de las opciones\n"
-#: server/civserver.c:226
+#: server/civserver.c:230
+msgid " -i, --identity ADDR\tBe known as ADDR at metaserver\n"
+msgstr " -i, --identity ADDR\tSer concido como ADDR en el metaserver\n"
+
+#: server/civserver.c:231
msgid " -l, --log FILE\tUse FILE as logfile\n"
msgstr " -l, --log FICH\tUsar FICH como fichero de registro\n"
-#: server/civserver.c:227
+#: server/civserver.c:232
msgid " -m, --meta\t\tNotify metaserver and send server's info\n"
msgstr " -m, --meta\t\tEnviar información del servidor al metaservidor\n"
-#: server/civserver.c:229
+#: server/civserver.c:234
msgid " -M, --Metaserver ADDR\tSet ADDR as metaserver address\n"
msgstr " -M, --Metaserver DIR\tEstablecer DIR como dirección del servidor\n"
-#: server/civserver.c:232
+#: server/civserver.c:237
msgid " -p, --port PORT\tListen for clients on port PORT\n"
msgstr " -p, --port PUERTO\tEsperar conexiones de clientes al puerto PUERTO\n"
-#: server/civserver.c:234
+#: server/civserver.c:239
msgid " -q, --quitidle TIME\tQuit if no players for TIME seconds\n"
msgstr " -q, --quitidle SEGS\tSalir si no hay jugadores en SEGS segundos\n"
-#: server/civserver.c:236
+#: server/civserver.c:241
msgid " -e, --exit-on-end\tWhen a game ends, exit instead of restarting\n"
msgstr ""
" -e, --exit-on-end\tCuando una partida acaba, acabar en lugar de empezar de "
"nuevo\n"
-#: server/civserver.c:239
+#: server/civserver.c:244
msgid " -s, --saves DIR\tSave games to directory DIR\n"
msgstr " -s, --saves DIR\tGraba las partidas en el directorio DIR\n"
-#: server/civserver.c:241
+#: server/civserver.c:246
msgid " -S, --Serverid ID\tSets the server id to ID\n"
msgstr " -S, --Serverid ID\tAsigna al servidor id a ID\n"
-#: server/civserver.c:243
+#: server/civserver.c:248
msgid " -P, --Ppm\t\tSave ppms of the map when saving the game.\n"
msgstr " -P, --Ppm\t\tGuarda los ppm del mapa al guardar la partida.\n"
-#: server/civserver.c:244
+#: server/civserver.c:249
msgid " -r, --read FILE\tRead startup script FILE\n"
msgstr " -r, --read FICH\tEjecutar el fichero de preparación FICH\n"
-#: server/civserver.c:246
+#: server/civserver.c:251
msgid " -R, --Ranklog FILE\tUse FILE as ranking logfile\n"
msgstr " -R, --Ranklog FICH\tUsar FICH como fichero de ranking\n"
-#: server/civserver.c:247 client/civclient.c:268 manual/civmanual.c:383
+#: server/civserver.c:252 client/civclient.c:269 manual/civmanual.c:383
msgid " -v, --version\t\tPrint the version number\n"
msgstr " -v, --version\t\tImprimir el número de versión\n"
-#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
+#: server/civserver.c:253 client/gui-gtk-2.0/gui_main.c:354
#: 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 "Informa de los bugs a <%s>.\n"
+msgstr "Informa de los bugs a %s.\n"
-#: server/commands.c:28
+#: server/commands.c:29
msgid "Start the game, or restart after loading a savegame."
msgstr ""
"Comenzar la partida, o volver a empezar tras cargar una partida salvada."
-#: server/commands.c:29
+#: server/commands.c:30
msgid ""
"This command starts the game. When starting a new game, it should be used "
"after all human players have connected, and AI players have been created (if "
@@ -2184,7 +2185,7 @@ msgstr ""
"no tiene efecto."
#. TRANS: translate text between <> only
-#: server/commands.c:42
+#: server/commands.c:44
msgid ""
"help\n"
"help commands\n"
@@ -2198,11 +2199,11 @@ msgstr ""
"help <nombre-de-comando>\n"
"help <nombre-de-opción>"
-#: server/commands.c:47
+#: server/commands.c:49
msgid "Show help about server commands and server options."
msgstr "Mostrar ayuda sobre comandos y opciones del servidor."
-#: server/commands.c:48
+#: server/commands.c:50
msgid ""
"With no arguments gives some introductory help. With argument \"commands\" "
"or \"options\" gives respectively a list of all commands or all options. "
@@ -2219,11 +2220,11 @@ msgstr ""
"opciones, esta información incluye los valores actual e inicial. El "
"argumento se puede abreviar si no hay ambigüedad."
-#: server/commands.c:63
+#: server/commands.c:66
msgid "Show a list of players, teams, connections, or scenarios."
msgstr "Mostrar la lista de jugadores, equipos, conexiones, o escenarios."
-#: server/commands.c:64
+#: server/commands.c:67
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 "
@@ -2233,20 +2234,20 @@ msgstr ""
"conexiones en el servidor, o escenarios disponibles. El argumento puede ser "
"abreviado, y se usará 'jugadores' por defecto si no hay argumento."
-#: server/commands.c:70
+#: server/commands.c:74
msgid "Quit the game and shutdown the server."
msgstr "Termina el juego y sale del servidor."
#. TRANS: translate text between <> only
-#: server/commands.c:74
+#: server/commands.c:79
msgid "cut <connection-name>"
msgstr "cut <nombre-de-conexión>"
-#: server/commands.c:75
+#: server/commands.c:80
msgid "Cut a client's connection to server."
msgstr "Cortar la conexión de un cliente con el servidor."
-#: server/commands.c:76
+#: server/commands.c:81
msgid ""
"Cut specified client's connection to the server, removing that client from "
"the game. If the game has not yet started that client's player is removed "
@@ -2260,7 +2261,7 @@ msgstr ""
"conexiones, y no de jugadores."
#. TRANS: translate text between <> only
-#: server/commands.c:83
+#: server/commands.c:89
msgid ""
"explain\n"
"explain <option-name>"
@@ -2268,11 +2269,11 @@ msgstr ""
"explain\n"
"explain <nombre-de-opción>"
-#: server/commands.c:85
+#: server/commands.c:91
msgid "Explain server options."
msgstr "Explicar las opciones del servidor."
-#: server/commands.c:86
+#: server/commands.c:92
msgid ""
"The 'explain' command gives a subset of the functionality of 'help', and is "
"included for backward compatibility. With no arguments it gives a list of "
@@ -2286,7 +2287,7 @@ msgstr ""
"opción>')."
#. TRANS: translate text between <> only
-#: server/commands.c:93
+#: server/commands.c:100
msgid ""
"show\n"
"show <option-name>\n"
@@ -2296,11 +2297,11 @@ msgstr ""
"show <nombre-de-opción>\n"
"show <prefijo-de-opción>"
-#: server/commands.c:96
+#: server/commands.c:103
msgid "Show server options."
msgstr "Muestra opciones del servidor."
-#: server/commands.c:97
+#: server/commands.c:104
msgid ""
"With no arguments, shows all server options (or available options, when used "
"by clients). With an argument, show only the named option, or options with "
@@ -2311,48 +2312,48 @@ msgstr ""
"opción cuyo nombre coincida con ese argumento, u opciones cuyo nombre "
"empiece con ese prefijo."
-#: server/commands.c:102
+#: server/commands.c:110
msgid "wall <message>"
msgstr "wall <mensaje>"
-#: server/commands.c:103
+#: server/commands.c:111
msgid "Send message to all connections."
msgstr "Envía el mensaje a todas las conexiones."
-#: server/commands.c:104
+#: server/commands.c:112
msgid ""
"For each connected client, pops up a window showing the message entered."
msgstr ""
"En cada cliente conectado, muestra una ventana con el mensaje especificado."
-#: server/commands.c:108
+#: server/commands.c:117
msgid "vote yes|no [vote number]"
msgstr "vote yes|no [número de voto]"
-#: server/commands.c:109
+#: server/commands.c:118
msgid "Cast a vote."
msgstr "Emitir un voto."
-#: server/commands.c:111
-#, 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."
-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 "
-"de \"yes\" o \"no\", y opcionalmente un número de voto, te permite votar. Si "
-"no se especifica el número de voto, este se aplica al último comando "
-"entrado. Sólo se puede sugerir un solo voto a la vez. El voto pasará "
-"inmediatamente cuando la mitad de los jugadores vote a favor, o se perderá "
-"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:121
+#: server/commands.c:120
+#, no-c-format
+msgid ""
+"A player with basic 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."
+msgstr ""
+"Un jugador con nivel de acceso básico, provoca que comience un nuevo voto "
+"cuando entra comandos de nivel de control. El comando /vote seguido de \"yes"
+"\" o \"no\", y opcionalmente un número de voto, te permite votar. Si no se "
+"especifica el número de voto, este se aplica al último comando entrado. Sólo "
+"se puede sugerir un solo voto a la vez. El voto pasará inmediatamente cuando "
+"mas de la mitad de los jugadores vote a favor, o se perderá si como mínimo "
+"la mitad de ellos vota en contra."
+
+#: server/commands.c:131
msgid ""
"debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
"<player> | timing | info]"
@@ -2360,13 +2361,13 @@ msgstr ""
"debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
"<player> | timing | info]"
-#: server/commands.c:123
+#: server/commands.c:133
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:124
+#: server/commands.c:134
msgid ""
"Print AI debug information about given entity and turn continous debugging "
"output for this entity on or off."
@@ -2374,23 +2375,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:128
+#: server/commands.c:139
msgid "set <option-name> <value>"
msgstr "set <nombre-de-opción> <valor>"
-#: server/commands.c:129
+#: server/commands.c:140
msgid "Set server option."
msgstr "Cambia una opción del servidor."
-#: server/commands.c:132
+#: server/commands.c:144
msgid "team <player> [team]"
msgstr "team <nombre-del-jugador> [equipo]"
-#: server/commands.c:133
+#: server/commands.c:145
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:134
+#: server/commands.c:146
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 "
@@ -2403,15 +2404,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:141
+#: server/commands.c:154
msgid "rulesetdir <directory>"
msgstr "rulesetdir <directorio>"
-#: server/commands.c:142
+#: server/commands.c:155
msgid "Choose new ruleset directory or modpack."
msgstr "Escoger un nuevo directorio de ruleset o modpack."
-#: server/commands.c:143
+#: server/commands.c:156
msgid ""
"Choose new ruleset directory or modpack. Calling this\n"
" without any arguments will show you the currently selected ruleset."
@@ -2420,36 +2421,40 @@ msgstr ""
"muestra el ruleset actual."
#. TRANS: translate text between <> only
-#: server/commands.c:149
+#: server/commands.c:163
msgid "metainfo <meta-line>"
msgstr "metainfo <meta-línea>"
-#: server/commands.c:150
+#: server/commands.c:164
msgid "Set metaserver info line."
msgstr "Establece la línea de información del metaservidor."
-#: server/commands.c:151
+#: server/commands.c:165
msgid ""
"Set user defined metaserver info line. If parameter is omitted,\n"
"previously set metamessage will be removed. For most of the time\n"
"user defined metamessage will be used instead of automatically\n"
"generated messages, if it is available."
msgstr ""
+"Define la linea de información del metaserver. Si el parámetro se omite,\n"
+" la información anterior se elimina. Usualmente,\n"
+" el metamensaje definido por el usuario se usara en vez de el \n"
+" mensaje generado automáticamente, si esta disponible."
#. TRANS: translate text between <> only
-#: server/commands.c:158
+#: server/commands.c:173
msgid "metapatch <meta-line>"
msgstr "metapatch <meta-línea>"
-#: server/commands.c:159
+#: server/commands.c:174
msgid "Set metaserver patches line."
msgstr "Establece la línea de información de parches del metaservidor."
-#: server/commands.c:165
+#: server/commands.c:181
msgid "Control metaserver connection."
msgstr "Controlar la conexión con el metaservidor."
-#: server/commands.c:166
+#: server/commands.c:182
msgid ""
"'metaconnection ?' reports on the status of the connection to metaserver.\n"
"'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2460,33 +2465,33 @@ msgstr ""
"'metaconnection up' o 'metac u' establece una conexión con el metaservidor."
#. TRANS: translate text between <> only
-#: server/commands.c:172
+#: server/commands.c:189
msgid "metaserver <address>"
msgstr "metaserver <dirección>"
-#: server/commands.c:173
+#: server/commands.c:190
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:177
+#: server/commands.c:195
msgid "aitoggle <player-name>"
msgstr "aitoggle <nombre-del-jugador>"
-#: server/commands.c:178
+#: server/commands.c:196
msgid "Toggle AI status of player."
msgstr "Conmuta el control del ordenador sobre un jugador."
#. TRANS: translate text between [] and <> only
-#: server/commands.c:182
+#: server/commands.c:201
msgid "take [connection-name] <player-name>"
msgstr "take [nombre-de-conexión] <nombre-del-jugador>"
-#: server/commands.c:183
+#: server/commands.c:202
msgid "Take over a player's place in the game."
msgstr "Jugar reemplazando a un jugador determinado."
-#: server/commands.c:184
+#: server/commands.c:203
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 "
@@ -2501,15 +2506,15 @@ msgstr ""
"jugador, uno es creado y asignado a la conexión."
#. TRANS: translate text between [] only
-#: server/commands.c:192
+#: server/commands.c:212
msgid "observe [connection-name] [player-name]"
msgstr "observe [nombre-de-conexión] [nombre-del-jugador]"
-#: server/commands.c:193
+#: server/commands.c:213
msgid "Observe a player or the whole game."
msgstr "Observar a un jugador o todo el juego."
-#: server/commands.c:194
+#: server/commands.c:214
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 "
@@ -2524,15 +2529,15 @@ msgstr ""
"entonces la conexión se asigna a un observador global."
#. TRANS: translate text between <> only
-#: server/commands.c:202
+#: server/commands.c:223
msgid "detach <connection-name>"
msgstr "detach <nombre-de-conexión>"
-#: server/commands.c:203
+#: server/commands.c:224
msgid "detach from a player."
msgstr "Abandonar un jugador."
-#: server/commands.c:204
+#: server/commands.c:225
msgid ""
"Only the console and connections with cmdlevel 'hack' can force other "
"connections to detach from a player."
@@ -2541,35 +2546,35 @@ msgstr ""
"forzar a otras conexiones a abandonar un jugador."
#. TRANS: translate text between <> only
-#: server/commands.c:209
+#: server/commands.c:231
msgid "create <player-name>"
msgstr "create <nombre-del-jugador>"
-#: server/commands.c:210
+#: server/commands.c:232
msgid "Create an AI player with a given name."
msgstr "Crea un jugador controlado por el ordenador."
-#: server/commands.c:211
+#: server/commands.c:233
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:215
+#: server/commands.c:238
msgid ""
"away\n"
"away"
msgstr "away"
-#: server/commands.c:217
+#: server/commands.c:240
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:218
+#: server/commands.c:241
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:222
+#: server/commands.c:246
msgid ""
"novice\n"
"novice <player-name>"
@@ -2577,12 +2582,12 @@ msgstr ""
"novice\n"
"novice <nombre-del-jugador>"
-#: server/commands.c:224
+#: server/commands.c:248
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:225
+#: server/commands.c:249
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 "
@@ -2594,7 +2599,7 @@ msgstr ""
"Con un argumento, cambia el nivel de juego de ese jugador solamente."
#. TRANS: translate text between <> only
-#: server/commands.c:231
+#: server/commands.c:256
msgid ""
"easy\n"
"easy <player-name>"
@@ -2602,11 +2607,11 @@ msgstr ""
"easy\n"
"easy <nombre-del-jugador>"
-#: server/commands.c:233
+#: server/commands.c:258
msgid "Set one or all AI players to 'easy'."
msgstr "Cambia jugadores controlados por el ordenador a 'fácil'."
-#: server/commands.c:234
+#: server/commands.c:259
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 "
@@ -2618,7 +2623,7 @@ msgstr ""
"cambia el nivel de juego de ese jugador solamente."
#. TRANS: translate text between <> only
-#: server/commands.c:240
+#: server/commands.c:266
msgid ""
"normal\n"
"normal <player-name>"
@@ -2626,11 +2631,11 @@ msgstr ""
"normal\n"
"normal <nombre-del-jugador>"
-#: server/commands.c:242
+#: server/commands.c:268
msgid "Set one or all AI players to 'normal'."
msgstr "Cambia jugadores controlados por el ordenador a 'normal'."
-#: server/commands.c:243
+#: server/commands.c:269
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 +2647,7 @@ msgstr ""
"cambia el nivel de juego de ese jugador solamente."
#. TRANS: translate text between <> only
-#: server/commands.c:249
+#: server/commands.c:276
msgid ""
"hard\n"
"hard <player-name>"
@@ -2650,11 +2655,11 @@ msgstr ""
"hard\n"
"hard <nombre-del-jugador>"
-#: server/commands.c:251
+#: server/commands.c:278
msgid "Set one or all AI players to 'hard'."
msgstr "Cambia jugadores controlados por el ordenador a 'difícil'."
-#: server/commands.c:252
+#: server/commands.c:279
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 "
@@ -2666,7 +2671,7 @@ msgstr ""
"cambia el nivel de juego de ese jugador solamente."
#. TRANS: translate text between <> only
-#: server/commands.c:258
+#: server/commands.c:286
msgid ""
"experimental\n"
"experimental <player-name>"
@@ -2674,11 +2679,11 @@ msgstr ""
"experimental\n"
"experimental <nombre-del-jugador>"
-#: server/commands.c:260
+#: server/commands.c:288
msgid "Set one or all AI players to 'experimental'."
msgstr "Cambia jugadores controlados por el ordenador a 'experimental'."
-#: server/commands.c:261
+#: server/commands.c:289
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 "
@@ -2694,7 +2699,7 @@ msgstr ""
"produce efecto alguno."
#. TRANS: translate text between <> only
-#: server/commands.c:269
+#: server/commands.c:298
msgid ""
"cmdlevel\n"
"cmdlevel <level>\n"
@@ -2708,17 +2713,19 @@ msgstr ""
"cmdlevel <nivel> first\n"
"cmdlevel <nivel> <nombre-de-conexión>"
-#: server/commands.c:274
+#: server/commands.c:303
msgid "Query or set command access level access."
msgstr "Consultar o establecer el nivel de acceso a comandos."
-#: server/commands.c:275
+#: server/commands.c:304
msgid ""
"The command access level controls which server commands are available\n"
"to users via the client chatline. The available levels are:\n"
" none - no commands\n"
-" info - informational commands only\n"
+" info - informational or observer commands only\n"
+" basic - commands available to players in the game\n"
" ctrl - commands that affect the game and users\n"
+" admin - commands that affect server operation\n"
" hack - *all* commands - dangerous!\n"
"With no arguments, the current command access levels are reported.\n"
"With a single argument, the level is set for all existing connections,\n"
@@ -2737,8 +2744,10 @@ msgstr ""
"disponibles para los jugadores por medio del chat del cliente. Los\n"
"niveles disponibles son:\n"
" none - ningún comando\n"
-" info - sólo los comandos de información\n"
+" info - sólo los comandos de información o de observación\n"
+" basic - los comandos disponibles de los jugadores de la partida\n"
" ctrl - los comandos que afectan al juego y a los usuarios\n"
+" admin - los comandos que afectan la operación del servidor\n"
" hack - *todos* los comandos - ¡es peligroso!\n"
"Sin argumentos, se informa de los actuales niveles de acceso a comandos.\n"
"Con un solo argumento, se establece el nivel para todas las conexiones "
@@ -2746,7 +2755,7 @@ msgstr ""
"Si se especifica 'new', se establece el nivel para las conexiones futuras.\n"
"Si se especifica 'first come', se establece el nivel para el primer jugador "
"en llegar; se le otorgará al primer cliente que se conecte o, si ya hay "
-"clientes conectados, al primero que envíe el comando 'firstlevel'.\n"
+"clientes conectados, al primero que envíe el comando 'first'.\n"
"Si se especifica el nombre de una conexión, se establece el nivel para esa "
"conexión solamente.\n"
"Si un jugador se desconecta y se vuelve a reconectar, perderá su nivel de "
@@ -2755,22 +2764,22 @@ msgstr ""
"comando ahora utiliza como parámetro el nombre de la conexión y no el del "
"jugador."
-#: server/commands.c:296
+#: server/commands.c:328
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:301
+#: server/commands.c:334
msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
msgstr "timeoutincrease <turnos> <aumento> <valor> <factor>"
-#: server/commands.c:302
+#: server/commands.c:335
msgid "See \"help timeoutincrease\"."
msgstr "Véase \"help timeoutincrease\"."
-#: server/commands.c:303
+#: server/commands.c:336
msgid ""
"Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
"<turn> and multiply <value> by <valuemult>. Use this command in concert "
@@ -2782,24 +2791,43 @@ msgstr ""
"duración de turno dinámica."
#. TRANS: translate text between <> only
-#: server/commands.c:309
+#: server/commands.c:343
+msgid ""
+"cancelvote\n"
+"cancelvote <vote number>\n"
+"cancelvote all\n"
+msgstr ""
+
+#: server/commands.c:346
+msgid "Cancel a running vote.\n"
+msgstr ""
+
+#: server/commands.c:347
+msgid ""
+"With no arguments this command removes your own vote. If you have an admin "
+"access level, you can cancel any vote by vote number, or all votes with the "
+"'all' argument."
+msgstr ""
+
+#. TRANS: translate text between <> only
+#: server/commands.c:354
msgid "endgame"
msgstr "endgame"
-#: server/commands.c:310
+#: server/commands.c:355
msgid "End the game immediately in a draw."
msgstr "Fin del juego inmediatamente con empate."
#. TRANS: translate text between <> only
-#: server/commands.c:314
+#: server/commands.c:360
msgid "surrender"
msgstr "surrender"
-#: server/commands.c:315
+#: server/commands.c:361
msgid "Concede the game."
msgstr "Concede la partida."
-#: server/commands.c:316
+#: server/commands.c:362
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."
@@ -2809,15 +2837,15 @@ msgstr ""
"juego acaba."
#. TRANS: translate text between <> only
-#: server/commands.c:322
+#: server/commands.c:369
msgid "remove <player-name>"
msgstr "remove <nombre-del-jugador>"
-#: server/commands.c:323
+#: server/commands.c:370
msgid "Fully remove player from game."
msgstr "Eliminar completamente a un jugador de la partida."
-#: server/commands.c:324
+#: server/commands.c:371
msgid ""
"This *completely* removes a player from the game, including all cities and "
"units etc. Use with care!"
@@ -2826,7 +2854,7 @@ msgstr ""
"ciudades, unidades, etc. ¡Úsalo con cuidado!"
#. TRANS: translate text between <> only
-#: server/commands.c:329
+#: server/commands.c:377
msgid ""
"save\n"
"save <file-name>"
@@ -2834,11 +2862,11 @@ msgstr ""
"save\n"
"save <nombre-de-fichero>"
-#: server/commands.c:331
+#: server/commands.c:379
msgid "Save game to file."
msgstr "Salva la partida en un fichero."
-#: server/commands.c:332
+#: server/commands.c:380
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"
@@ -2857,7 +2885,7 @@ msgstr ""
"nuevo."
#. TRANS: translate text between <> only
-#: server/commands.c:341
+#: server/commands.c:390
msgid ""
"load\n"
"load <file-name>"
@@ -2865,11 +2893,11 @@ msgstr ""
"load\n"
"load <nombre-de-fichero>"
-#: server/commands.c:343
+#: server/commands.c:392
msgid "Load game from file."
msgstr "Carga una partida de un fichero."
-#: server/commands.c:344
+#: server/commands.c:393
msgid ""
"Load a game from <file-name>. Any current data including players, rulesets "
"and server options are lost.\n"
@@ -2879,120 +2907,117 @@ msgstr ""
"las opciones del servidor.\n"
#. TRANS: translate text between <> only
-#: server/commands.c:349
+#: server/commands.c:399
msgid "read <file-name>"
msgstr "read <nombre-de-fichero>"
-#: server/commands.c:350
+#: server/commands.c:400
msgid "Process server commands from file."
msgstr "Ejecutar los comandos del servidor contenidos en un fichero."
#. TRANS: translate text between <> only
-#: server/commands.c:354
+#: server/commands.c:405
msgid "write <file-name>"
msgstr "write <nombre-de-fichero>"
-#: server/commands.c:355
+#: server/commands.c:406
msgid "Write current settings as server commands to file."
msgstr "Guardar las opciones actuales como comandos del servidor."
-#: server/commands.c:359
+#: server/commands.c:411
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:363
+#: server/commands.c:416
msgid "Simply returns the id of the server."
msgstr "Simplemente retorna el id del servidor."
-#: server/connecthand.c:85
+#: server/connecthand.c:109
#, c-format
msgid "Welcome to the %s Server running at %s port %d."
msgstr "Bienvenido al servidor %s, ejecutándose en %s, puerto %d."
-#: server/connecthand.c:89
+#: server/connecthand.c:113
#, c-format
msgid "Welcome to the %s Server at port %d."
msgstr "Bienvenido al servidor %s, puerto %d."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:97
-#, fuzzy, c-format
+#: server/connecthand.c:121
+#, c-format
msgid "(%d) %s: connected [%s]"
-msgstr "(%d) %s se ha conectado desde %s"
+msgstr "(%d) %s se ha conectado [%s]"
-#: server/connecthand.c:104
+#: server/connecthand.c:128
#, c-format
msgid "Server: %s has connected from %s."
msgstr "Juego: %s se ha conectado desde %s."
-#: server/connecthand.c:145
+#: server/connecthand.c:175
msgid "Couldn't attach your connection to new player."
msgstr "No se ha conseguido un nuevo jugador para tu conexión."
-#: server/connecthand.c:165
+#: server/connecthand.c:199
#, c-format
msgid "You are logged in as '%s' connected to no player."
msgstr "Estás conectado como '%s' pero no estás participando."
-#: server/connecthand.c:169
+#: server/connecthand.c:203
#, c-format
msgid "You are logged in as '%s' connected to an anonymous player."
msgstr "Estás conectado como '%s', participando como jugador anónimo."
-#: server/connecthand.c:174
+#: server/connecthand.c:208
#, c-format
msgid "You are logged in as '%s' connected to %s."
msgstr "Estás conectado como '%s' y participando como %s."
-#: server/connecthand.c:187
+#: server/connecthand.c:221
#, c-format
msgid "Turn-blocking game play: waiting on %s to finish turn..."
msgstr "Esperando a que %s dé su turno por terminado..."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:240
-#, fuzzy, c-format
+#: server/connecthand.c:274
+#, c-format
msgid "(%d) %s: connection request [%s]"
-msgstr "(%d) Solicitud de conexión de %s de %s"
+msgstr "(%d) %s: Solicitud de conexión [%s]"
-#: server/connecthand.c:266
-#, fuzzy
+#: server/connecthand.c:300
msgid "The client is missing a capability that this server needs."
-msgstr "Al cliente le falta una capacidad necesaria para este servidor!"
+msgstr ""
+"Al cliente le faltan capacidades que son necesarias para este servidor!"
-#: server/connecthand.c:268 server/connecthand.c:279
-#, fuzzy, c-format
+#: server/connecthand.c:302 server/connecthand.c:313
+#, c-format
msgid "(%d) %s rejected: mismatched capabilities!"
-msgstr "(%d) Rechazado %s: las capacidades no se corresponden."
+msgstr "(%d) %s rechazado: las capacidades no se corresponden!"
-#: server/connecthand.c:277
-#, fuzzy
+#: server/connecthand.c:311
msgid "This server is missing a capability that the client needs."
-msgstr "Al servidor le falta una capacidad que el cliente necesita!"
+msgstr "Al servidor le falta una capacidad que el cliente necesita."
-#: server/connecthand.c:290
-#, fuzzy
+#: server/connecthand.c:324
msgid "The username is invalid!"
-msgstr "Nombre de usuario inválido"
+msgstr "El nombre de usuario es inválido!"
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:292
-#, fuzzy, c-format
+#: server/connecthand.c:326
+#, c-format
msgid "(%d) %s rejected: invalid username [%s]"
-msgstr "(%d) Rechazado %s: Nombre incorrecto [%s]."
+msgstr "(%d) %s rechazado: nombre de usuario incorrecto [%s]"
-#: server/connecthand.c:303
-#, fuzzy
+#: server/connecthand.c:337
msgid "Your username is already connected!"
-msgstr "ya está conectado."
+msgstr "Tu nombre de usuario ya está conectado!"
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:305
-#, fuzzy, c-format
+#: server/connecthand.c:339
+#, c-format
msgid "(%d) %s rejected: duplicate username [%s]"
-msgstr "(%d) Rechazado %s: Nombre de usuario duplicado [%s]."
+msgstr "(%d) %s rechazado: nombre de usuario duplicado [%s]"
-#: server/connecthand.c:335 server/connecthand.c:344
+#: server/connecthand.c:369 server/connecthand.c:378
#, c-format
msgid "Lost connection: %s."
msgstr "Se ha cortado la conexión: %s."
@@ -3009,112 +3034,112 @@ msgstr "Bien. Usando el estilo est
msgid "For introductory help, type 'help'."
msgstr "Para una ayuda introductoria, teclea 'help'."
-#: server/diplhand.c:164
+#: server/diplhand.c:167
#, c-format
msgid "The %s can't accept %s."
msgstr "Los %s no aceptan %s."
-#: server/diplhand.c:176
+#: server/diplhand.c:179
#, c-format
msgid "You don't have tech %s, you can't accept treaty."
msgstr "No tienes el avance %s, no puedes aceptar el pacto."
-#: server/diplhand.c:185
+#: server/diplhand.c:188
msgid "City you are trying to give no longer exists, you can't accept treaty."
msgstr "La ciudad que tratas de dar ya no existe, no puedes aceptar el pacto."
-#: server/diplhand.c:191
+#: server/diplhand.c:194
#, c-format
msgid "You are not owner of %s, you can't accept treaty."
msgstr "No controlas %s, así que no puedes aceptar el pacto."
-#: server/diplhand.c:197 server/diplhand.c:301
+#: server/diplhand.c:200 server/diplhand.c:304
#, c-format
msgid "Your capital (%s) is requested, you can't accept treaty."
msgstr "Piden tu capital (%s), no puedes aceptar el pacto."
-#: server/diplhand.c:224
+#: server/diplhand.c:227
msgid "You don't have enough gold, you can't accept treaty."
msgstr "No tienes suficiente dinero, no puedes aceptar el pacto."
-#: server/diplhand.c:256 server/diplhand.c:261
+#: server/diplhand.c:259 server/diplhand.c:264
#, c-format
msgid "A treaty containing %d clause was agreed upon."
msgid_plural "A treaty containing %d clauses was agreed upon."
msgstr[0] "Se ha firmado un pacto con %d punto."
msgstr[1] "Se ha firmado un pacto con %d puntos."
-#: server/diplhand.c:277 server/diplhand.c:281
-#, fuzzy, c-format
+#: server/diplhand.c:280 server/diplhand.c:284
+#, c-format
msgid "One of the cities the %s are giving away is destroyed! Treaty canceled!"
msgstr ""
"¡Una de las ciudades que %s está dando está destruida! ¡Se cancela el pacto!"
-#: server/diplhand.c:288 server/diplhand.c:293
+#: server/diplhand.c:291 server/diplhand.c:296
#, c-format
msgid "The %s no longer control %s! Treaty canceled!"
msgstr "¡Los %s ya no controlan %s! ¡Se cancela el pacto!"
-#: server/diplhand.c:331 server/diplhand.c:335
+#: server/diplhand.c:334 server/diplhand.c:338
#, c-format
msgid "The %s don't have the promised amount of gold! Treaty canceled!"
msgstr "¡Los %s no tienen el oro que prometieron! ¡Se cancela el pacto!"
-#: server/diplhand.c:364
+#: server/diplhand.c:367
#, c-format
msgid "You gave an embassy to %s."
msgstr "Has dado una embajada a %s."
-#: server/diplhand.c:367
+#: server/diplhand.c:370
#, c-format
msgid "%s allowed you to create an embassy!"
msgstr "¡%s te ha permitido crear una embajada!"
-#: server/diplhand.c:383
+#: server/diplhand.c:386
#, c-format
msgid "You are taught the knowledge of %s."
msgstr "Recibes el conocimiento de %s."
-#: server/diplhand.c:387
+#: server/diplhand.c:390
#, c-format
msgid "The %s have acquired %s from the %s."
msgstr "Los %s reciben %s de los %s."
-#: server/diplhand.c:402
+#: server/diplhand.c:405
#, c-format
msgid "You get %d gold."
msgstr "Recibes %d monedas de oro."
#. TRANS: ... Polish worldmap.
-#: server/diplhand.c:410
-#, fuzzy, c-format
+#: server/diplhand.c:413
+#, c-format
msgid "You receive the %s worldmap."
msgstr "Recibes el mapamundi de los %s."
#. TRANS: ... Polish seamap.
-#: server/diplhand.c:419
-#, fuzzy, c-format
+#: server/diplhand.c:422
+#, c-format
msgid "You receive the %s seamap."
msgstr "Recibes el mapa marítimo de %s."
-#: server/diplhand.c:436
+#: server/diplhand.c:439
#, c-format
msgid "You receive city of %s from %s."
msgstr "Recibes la ciudad %s de los %s."
-#: server/diplhand.c:441
+#: server/diplhand.c:444
#, c-format
msgid "You give city of %s to %s."
-msgstr "Cedes la ciudad %s a los %s."
+msgstr "Cedes la ciudad %s a %s."
-#: server/diplhand.c:454 server/diplhand.c:457
+#: server/diplhand.c:457 server/diplhand.c:460
#, c-format
msgid "You agree on a cease-fire with %s."
msgstr "Has pactado una tregua con %s."
#. TRANS: ... the Poles ... Polish territory.
-#: server/diplhand.c:476 server/diplhand.c:488
-#, fuzzy, c-format
+#: server/diplhand.c:479 server/diplhand.c:491
+#, 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."
@@ -3122,38 +3147,38 @@ 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] ""
-"Aceptas el armisticio con %s. En %d turno se convertirá en un paco de paz. "
+"Aceptas el armisticio con %s. En %d turnos se convertirá en un pacto de paz. "
"Mueve tus unidades fuera del territorio de los %s."
msgstr[1] ""
-"Aceptas el armisticio con %s. En %d turnos se convertirá en un paco de paz. "
+"Aceptas el armisticio con %s. En %d turnos se convertirá en un pacto de paz. "
"Mueve tus unidades fuera del territorio de los %s."
-#: server/diplhand.c:512 server/diplhand.c:515
+#: server/diplhand.c:515 server/diplhand.c:518
#, c-format
msgid "You agree on an alliance with %s."
msgstr "Has pactado una alianza con los %s."
-#: server/diplhand.c:524
+#: server/diplhand.c:527
#, c-format
msgid "You give shared vision to %s."
msgstr "Compartes tu visión con %s."
-#: server/diplhand.c:527
+#: server/diplhand.c:530
#, c-format
msgid "%s gives you shared vision."
msgstr "%s comparte su visión contigo."
-#: server/diplhand.c:663
+#: server/diplhand.c:666
#, c-format
msgid "%s canceled the meeting!"
msgstr "¡%s ha cancelado la cumbre!"
-#: server/diplhand.c:670
+#: server/diplhand.c:673
#, c-format
msgid "Meeting with %s canceled."
msgstr "Se cancela la cumbre con %s."
-#: server/diplhand.c:712
+#: server/diplhand.c:715
msgid "Your diplomatic envoy was decapitated!"
msgstr "¡Tu emisario ha sido decapitado!"
@@ -3188,46 +3213,46 @@ msgid "The %s have established an embassy in %s."
msgstr "Los %s han establecido una embajada en %s."
#: server/diplomats.c:333
-#, fuzzy, c-format
+#, c-format
msgid "Your %s could not sabotage the %s %s."
-msgstr "Tu %1$s no se pudo sabotear el %3$s de %2$s."
+msgstr "Tu %1$s no pudo sabotear el %3$s de %2$s."
#: server/diplomats.c:355
-#, fuzzy, c-format
+#, c-format
msgid "Your %s succeeded in sabotaging the %s %s."
msgstr "Tu %1$s ha conseguido sabotear el %3$s de %2$s."
#. TRANS: ... the Poles!
#: server/diplomats.c:362
-#, fuzzy, c-format
+#, c-format
msgid "Your %s was sabotaged by the %s!"
-msgstr "¡%2$s ha saboteado tu %1$s!"
+msgstr "Tu %s ha sido saboteado por los %s!"
#: server/diplomats.c:411
msgid "You can't bribe a unit from this nation."
msgstr "No puedes sobornar a una unidad de esta nación."
#: server/diplomats.c:422
-#, fuzzy, c-format
+#, c-format
msgid "You don't have enough gold to bribe the %s %s."
msgstr "No tienes suficiente dinero para sobornar al %2$s de %1$s."
#: server/diplomats.c:432
-#, fuzzy, c-format
+#, c-format
msgid "You cannot bribe the %s!"
-msgstr "¡No puedes sobornar %s!"
+msgstr "¡No puedes sobornar el %s!"
#. TRANS: <diplomat> ... <unit>
#: server/diplomats.c:455
-#, fuzzy, c-format
+#, c-format
msgid "Your %s succeeded in bribing the %s."
msgstr "Tu %s ha conseguido sobornar al %s."
#. TRANS: <unit> ... <Poles>
#: server/diplomats.c:463
-#, fuzzy, c-format
+#, c-format
msgid "Your %s was bribed by the %s."
-msgstr "%2$s ha sobornado a tu %1$s."
+msgstr "Tu %s ha sido sobornado por el %s."
#: server/diplomats.c:594
#, c-format
@@ -3244,7 +3269,7 @@ msgid "Your %s was caught in the attempt of stealing technology from %s."
msgstr "Han pillado a tu %s intentando robar tecnología de los %s."
#: server/diplomats.c:606
-#, fuzzy, c-format
+#, c-format
msgid "The %s %s failed to steal technology from %s."
msgstr "El %2$s de los %1$s no ha conseguido robar tecnología de los %3$s."
@@ -3326,7 +3351,7 @@ msgstr "
#: server/diplomats.c:973
#, c-format
msgid "You caught %s %s attempting to sabotage the %s in %s!"
-msgstr "¡Has pillado a un %2$s %1$s intentando sabotear %3$s de %4$s!"
+msgstr "¡Has pillado a un %2$s %1$s intentando sabotear %3$s %4$s!"
#: server/diplomats.c:986
#, c-format
@@ -3339,80 +3364,80 @@ msgid "The %s destroyed the %s in %s."
msgstr "El %s ha destruido %s de %s."
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1091
-#, fuzzy, c-format
+#: server/diplomats.c:1097
+#, c-format
msgid "An enemy %s has been eliminated by your %s."
-msgstr "Han eliminado a un %s enemigo en defensa de %s."
+msgstr "Tu %2$s ha eliminado a un %1$s enemigo."
#. TRANS: <unit> ... <city> ... <diplomat>
-#: server/diplomats.c:1098
+#: server/diplomats.c:1104
#, c-format
msgid "Your %s has been eliminated defending %s against a %s."
msgstr "Tu %s ha sido eliminado defendiendo %s en contra de %s."
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1106
-#, fuzzy, c-format
+#: server/diplomats.c:1112
+#, c-format
msgid "Your %s has been eliminated defending against a %s."
msgstr "Tu %s ha sido eliminado defendiendo en contra de %s."
-#: server/diplomats.c:1119
+#: server/diplomats.c:1125
#, c-format
msgid "Your %s was eliminated by a defending %s."
msgstr "Tu %s ha sido eliminado por un %s defensor."
-#: server/diplomats.c:1127
+#: server/diplomats.c:1133
#, c-format
msgid "Eliminated %s %s while infiltrating %s."
msgstr "Han eliminado %2$s %1$s al infiltrarse en %3$s."
-#: server/diplomats.c:1134
+#: server/diplomats.c:1140
#, c-format
msgid "Eliminated %s %s while infiltrating our troops."
msgstr "Han eliminado %2$s %1$s al infiltrarse con nuestras tropas."
-#: server/diplomats.c:1185
-#, fuzzy, c-format
+#: server/diplomats.c:1191
+#, c-format
msgid ""
"Your %s has successfully completed the mission and returned unharmed to %s."
msgstr "Tu %s ha completado su misión con éxito y ha vuelto ileso a %s."
-#: server/diplomats.c:1204
-#, fuzzy, c-format
+#: server/diplomats.c:1210
+#, c-format
msgid "Your %s was captured after completing the mission in %s."
-msgstr "Han capturado a tu %s después de completar su misión en %s."
+msgstr "Tu %s ha sido capturado después de completar su misión en %s."
-#: server/diplomats.c:1210
-#, fuzzy, c-format
+#: server/diplomats.c:1216
+#, c-format
msgid "Your %s was captured after completing the mission."
msgstr "Han capturado a tu %s después de completar su misión."
-#: server/diplomats.c:1242
-#, fuzzy, c-format
+#: server/diplomats.c:1248
+#, c-format
msgid "You have caused an incident while bribing the %s %s."
msgstr "Has causado un incidente al sobornar al %2$s de los %1$s."
-#: server/diplomats.c:1247
+#: server/diplomats.c:1253
#, c-format
msgid "%s has caused an incident while bribing your %s."
msgstr "%s ha causado un incidente al sobornar a tu %s."
-#: server/diplomats.c:1254
+#: server/diplomats.c:1260
#, c-format
msgid "You have caused an incident while attempting to steal tech from %s."
msgstr "Has causado un incidente al intentar robar tecnología a los %s."
-#: server/diplomats.c:1258
+#: server/diplomats.c:1264
#, c-format
msgid "%s has caused an incident while attempting to steal tech from you."
msgstr "%s ha causado un incidente al robarte tecnología."
-#: server/diplomats.c:1264
+#: server/diplomats.c:1270
#, c-format
msgid "You have caused an incident while inciting a revolt in %s."
msgstr "Has causado un incidente al provocar disturbios en %s."
-#: server/diplomats.c:1268
+#: server/diplomats.c:1274
#, c-format
msgid "%s have caused an incident while inciting a revolt in %s."
msgstr "%s ha causado un incidente al provocar disturbios en %s."
@@ -3440,12 +3465,13 @@ msgstr "La duraci
#: server/ggzserver.c:123
msgid "Unable to make temporary directory for GGZ game.\n"
-msgstr ""
+msgstr "No se ha podido crear el directorio temporal para el juego GGZ.\n"
#: server/ggzserver.c:131
#, c-format
msgid "Unable to change into temporary server directory %s.\n"
msgstr ""
+"No se ha podido cambiar la ruta al directorio 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"
@@ -3533,12 +3559,12 @@ msgstr ""
" Los obreros se reúnen espontáneamente e instalan vías férreas en "
"todas las ciudades."
-#: server/maphand.c:1418
+#: server/maphand.c:1425
#, c-format
msgid "Moved your %s due to changing terrain."
msgstr "Tu %s se ha movido al transformar el terreno."
-#: server/maphand.c:1436
+#: server/maphand.c:1443
#, c-format
msgid "Disbanded your %s due to changing terrain."
msgstr "Se desarticula a tu %s al transformar el terreno."
@@ -3547,7 +3573,7 @@ msgstr "Se desarticula a tu %s al transformar el terreno."
msgid "Not reporting to the metaserver in this game."
msgstr "No informamos al metaservidor en esta partida."
-#: server/meta.c:430
+#: server/meta.c:432
#, c-format
msgid "Metaserver: bad address: [%s:%d]."
msgstr "Metaservidor: dirección incorrecta: [%s:%d]."
@@ -3643,7 +3669,7 @@ msgid ""
"The senate refuses to break treaty with the %s, but you have no trouble "
"finding a new senate."
msgstr ""
-"El Senado se niega a romper el paco con los %s, pero puedes buscarte un "
+"El Senado se niega a romper el pacto con los %s, pero puedes buscarte un "
"Senado nuevo sin problema."
#: server/plrhand.c:590
@@ -3676,65 +3702,66 @@ 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:1103
+#: server/plrhand.c:1115
#, c-format
msgid "Removing player %s."
msgstr "Se ha eliminado al jugador %s de la partida."
-#: server/plrhand.c:1105
+#: server/plrhand.c:1117
msgid "You've been removed from the game!"
msgstr "¡Te han echado de la partida!"
-#: server/plrhand.c:1108
+#: server/plrhand.c:1120
#, c-format
msgid "%s has been removed from the game."
msgstr "Han echado a %s de la partida."
-#: server/plrhand.c:1153 server/plrhand.c:1158
+#: server/plrhand.c:1167 server/plrhand.c:1172
#, 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:1178
-#, fuzzy, c-format
+#: server/plrhand.c:1192
+#, 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."
+"%s y %s se ha reunido y se han declarado la guerra. Tu cancelas la alianza "
+"con ambos."
-#: server/plrhand.c:1656
+#: server/plrhand.c:1670
#, 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:1663
-#, fuzzy, c-format
+#: server/plrhand.c:1677
+#, 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"
+msgstr "No se pudo instigar la guerra civil de %s - demasiadas naciones"
-#: server/plrhand.c:1686
-#, fuzzy, c-format
+#: server/plrhand.c:1700
+#, c-format
msgid ""
"Your nation is thrust into civil war! %s is declared the leader of the rebel "
"states."
msgstr ""
-"Tu nación ha entrado en guerra civil. %s se declara jefe de los territorios "
+"Tu nación ha entrado en guerra civil! %s se declara jefe de los territorios "
"sublevados."
-#: server/plrhand.c:1707
+#: server/plrhand.c:1721
#, c-format
msgid "%s declares allegiance to %s."
msgstr "%s declara una alianza con %s."
-#: server/plrhand.c:1722
-#, fuzzy, c-format
+#: server/plrhand.c:1736
+#, 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 "
"rebel cause,\n"
" and the upstart %s now holds power in %d rebel provinces."
msgstr ""
-"La captura de la capital de %s y la destrucción de las estructuras "
+"La captura de la capital %s y la destrucción de las estructuras "
"administrativas\n"
" de su nación han provocado una guerra civil. Los oportunistas se han "
"aliado a la\n"
@@ -3921,70 +3948,70 @@ msgstr "(construyendo %s en %s (%s))\n"
msgid "Wonders of the World"
msgstr "Maravillas del mundo"
-#: server/report.c:547
+#: server/report.c:552
msgid " sq. mi."
msgstr " km^2"
-#: server/report.c:557
+#: server/report.c:562
msgid " M tons"
msgstr " M de toneladas"
-#: server/report.c:562
+#: server/report.c:567
msgid " M goods"
msgstr " M de artículos"
-#: server/report.c:567
+#: server/report.c:572
msgid " bulbs"
msgstr " bulbos"
-#: server/report.c:572
+#: server/report.c:577
msgid " month"
msgid_plural " months"
msgstr[0] " mes"
msgstr[1] " meses"
-#: server/report.c:577
+#: server/report.c:582
msgid " ton"
msgid_plural " tons"
msgstr[0] " tonelada"
msgstr[1] " toneladas"
-#: server/report.c:591
+#: server/report.c:596
msgid "st"
msgstr "º"
-#: server/report.c:593
+#: server/report.c:598
msgid "nd"
msgstr "º"
-#: server/report.c:595
+#: server/report.c:600
msgid "rd"
msgstr "º"
-#: server/report.c:597
+#: server/report.c:602
msgid "th"
msgstr "º"
-#: server/report.c:700
+#: server/report.c:705
msgid "Demography string contains invalid characters. Try \"help demography\"."
msgstr ""
"La cadena de \"demography\" contiene caracteres incorrectos. Prueba \"help "
"demography\"."
-#: server/report.c:743 server/report.c:768
+#: server/report.c:748 server/report.c:773
msgid "Demographics Report:"
msgstr "Informe demográfico:"
-#: server/report.c:744
+#: server/report.c:749
msgid "Sorry, the Demographics report is unavailable."
msgstr "Lo siento, el informe demográfico no está disponible."
#. TRANS: <nation adjective> <government name> (<year>).
#. * E.g. "Polish Despotism (200 AD)".
-#: server/report.c:750
-#, fuzzy, c-format
+#: server/report.c:755
+#, c-format
msgid "%s %s (%s)"
-msgstr "%s en %s (%s)\n"
+msgstr "%2$s de los %1$s (%3$s)"
#. TRANS: message about an installation error.
#: server/ruleset.c:163
@@ -3992,17 +4019,17 @@ msgstr "%s en %s (%s)\n"
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:2356
+#: server/ruleset.c:2366
msgid "No barbarian nation in rulesets, at least one required!"
msgstr ""
+"No existe ninguna nación bárbara en el ruleset, se requiere como mínimo una!"
-#: server/ruleset.c:3166
+#: server/ruleset.c:3178
msgid "Loading rulesets"
msgstr "Cargando rulesets"
#. TRANS: Minor error message.
#: server/savegame.c:173
-#, fuzzy
msgid ""
"Saved game contains incomplete map data. This can happen with old saved "
"games, or it may indicate an invalid saved game file. Proceed at your own "
@@ -4010,26 +4037,24 @@ msgid ""
msgstr ""
"Los datos del mapa de la partida grabada están incompletos. Puede que la "
"partida grabada corresponda a una versión antigua de Freeciv, o puede que "
-"sucediera algún error durante la grabación. Si continúas puede que Freeciv "
-"no funcione correctamente."
+"sucediera algún error durante la grabación. Continúa bajo tu "
+"responsabilidad."
-#: server/savegame.c:3588
-#, fuzzy
+#: server/savegame.c:3587
msgid "Saved game is too old, at least version 1.9.0 required."
msgstr ""
-"La partida grabada es demasiado antigua, sólo se pueden cargar partidas "
-"grabadas con la versión 1.9.0 o más recientes."
+"La partida grabada es demasiado antigua, se requiere la versión 1.9.0 como "
+"mínimo."
#. TRANS: Fatal error message.
-#: server/savegame.c:3815
-#, fuzzy
+#: server/savegame.c:3817
msgid ""
"Saved game uses the \"classic\" terrain ruleset, and is no longer supported."
msgstr ""
-"La partida grabada usa las reglas clásicas para el terreno, que ya no se "
-"pueden usar."
+"La partida grabada usa las reglas \"clásicas\" para el terreno, que ya no "
+"están soportadas."
-#: server/savegame.c:3824
+#: server/savegame.c:3826
#, c-format
msgid ""
"Warning: Different rulesetdirs ('%s' and '%s') are no longer supported. "
@@ -4039,10 +4064,10 @@ msgstr ""
"'%s'."
#. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4051
+#: server/savegame.c:4055
#, c-format
msgid "%s had invalid nation; changing to %s."
-msgstr ""
+msgstr "%s tiene una nación inválida; cambiada a %s."
#: server/settings.c:32
msgid "Geological"
@@ -4072,7 +4097,7 @@ msgstr "Internas"
msgid "Networking"
msgstr "De Red"
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:734
#: client/gui-win32/dialogs.c:532
msgid "All"
msgstr "Todas"
@@ -4121,25 +4146,25 @@ msgstr ""
#: server/settings.c:143
msgid "Cannot set endyear earlier than current year."
-msgstr ""
+msgstr "No se puede asignar el año de fin a uno menor que el actual."
#: server/settings.c:160
msgid "Cannot change maxplayers in GGZ mode."
msgstr "No se puede cambiar maxplayers en modo GGZ"
#: server/settings.c:165
-#, fuzzy
msgid ""
"Number of players is higher than requested value;\n"
"Keeping old value."
msgstr ""
-"El número de jugadores ya es mas alto que el especificado; Se mantiene el "
-"valor anterior."
+"El número de jugadores es mas alto que el especificado; \n"
+"Se mantiene el valor anterior."
#: 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."
+msgstr ""
+"No está permitido asignar el valor de expiración de tiempo a menos de 30 "
+"segundos."
#: server/settings.c:227
msgid "Map size (in thousands of tiles)"
@@ -4432,13 +4457,12 @@ msgid "Minimum number of players"
msgstr "Mínimo número de jugadores"
#: server/settings.c:410
-#, fuzzy
msgid ""
"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)."
+"La partida no empezará hasta que haya este número de jugadores (jugadores "
+"humanos conectados)."
#: server/settings.c:417
msgid "Maximum number of players"
@@ -4568,12 +4592,11 @@ msgstr ""
"tecnología en ese turno."
#: server/settings.c:501
-#, fuzzy
msgid "Penalty when getting tech or gold from treaty"
-msgstr "Penalización por avances de un pacto"
+msgstr ""
+"Penalización cuando se obtiene tecnología o dinero a traves de un pacto"
#: server/settings.c:502
-#, fuzzy
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 "
@@ -4583,7 +4606,7 @@ msgstr ""
"Por cada avance tecnológico que obtengas de un pacto diplomático, pierdes "
"una cantidad de puntos de 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."
+"puntos de investigación. También se aplica a las tranferencias de dinero."
#: server/settings.c:512
msgid "Penalty when getting tech from conquering"
@@ -4633,9 +4656,8 @@ msgstr ""
"dependiente del tamaño de la ciudad."
#: server/settings.c:544
-#, fuzzy
msgid "Percentage food lost when building needed"
-msgstr "Alimento perdido por necesitar Acueducto"
+msgstr "Porcentaje de alimento perdido cuando se necesita un edificio"
#: server/settings.c:545
msgid ""
@@ -4725,18 +4747,17 @@ msgid "Minimum distance between cities"
msgstr "Mínima distancia entre ciudades"
#: server/settings.c:610
-#, fuzzy
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 "
"two empty fields between two cities in every direction. If set to 0 "
"(default), the ruleset value will be used."
msgstr ""
-"Cuando un jugador funda una nueva ciudad, se comprueba que no hay ciudades a "
-"una distancia de citymindist. Por ejemplo, si citymindist es 3, tiene que "
-"haber un mínimo de dos casillas vacías entre la nueva ciudad y la ciudad más "
-"cercana en todas las direcciones. Si se fija a 0 (valor por defecto), se "
-"usará el valor fijado en el fichero ruleset."
+"Cuando un jugador intenta fundar una nueva ciudad, no puede haber otras "
+"ciudades a esta distancia. Por ejemplo, si el valor es 3, tiene que haber un "
+"mínimo de dos casillas vacías entre la nueva ciudad y la ciudad más 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:621
msgid "Number of turns between rapture effect"
@@ -4999,9 +5020,8 @@ msgstr ""
"pueden solicitar encuentros diplomáticos sin se tiene una embajada."
#: server/settings.c:801
-#, fuzzy
msgid "Rebuild palace whenever capital is conquered"
-msgstr "Reconstruir palacio si conquistan la capital"
+msgstr "Reconstrucción del palacio si conquistan la capital"
#: server/settings.c:802
msgid ""
@@ -5125,7 +5145,6 @@ msgid "Maximum seconds per turn"
msgstr "Duración máxima en segundos de un turno"
#: 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 "
@@ -5134,11 +5153,12 @@ msgid ""
"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 "
+"Si todos los jugadores no han pulsado \"Fin del Turno\" antes de que "
"transcurra este tiempo, el turno acaba automáticamente. Cero indica que no "
-"hay duración máxima. En servidores compilados con DEBUG, un valor de -1 "
-"activa el modo autojuego, para pruebas. Usa esta opción junto con el comando "
-"\"timeoutincrease\" para conseguir una duración de turno dinámica."
+"hay duración máxima. En servidores compilados para depuración, un valor de -"
+"1 activa el modo autojuego para pruebas.Solo conexiones con nivel de acceso "
+"hack pueden asignar un valor menor a 30 segundos. Usa esta opción junto con "
+"el comando \"timeoutincrease\" para conseguir una duración de turno dinámica."
#: server/settings.c:888
msgid "Timeout at least n seconds when enemy moved"
@@ -5146,13 +5166,12 @@ msgstr ""
"Añade como mínimo n segundos de tiempo cuando un enemino mueva unidades"
#: 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 ""
"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."
+"restante es menor a este valor se asigna a este."
#: server/settings.c:898
msgid "Whether to have simultaneous player phases."
@@ -5221,12 +5240,11 @@ msgid "Turn-blocking game play mode"
msgstr "Modo de juego con bloqueo de turnos"
#: 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 ""
-"Si esta opción vale 1, game.info.turn no se avanza hasta que todos los "
+"Si esta opción vale 1, el turno de juego no avanza hasta que todos los "
"jugadores hayan terminado su turno, inclusive los jugadores desconectados."
#: server/settings.c:948
@@ -5234,12 +5252,11 @@ msgid "Fixed-length turns play mode"
msgstr "Modo de juego con turnos de duración fija"
#: 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 ""
-"Si esta opción vale 1, game.info.turn se avanza hasta que el límite de "
+"Si esta opción vale 1, el turno de juego no avanza hasta que el límite de "
"tiempo haya expirado, aunque todos los jugadores hayan hecho click en \"Fin "
"del Turno\""
@@ -5320,13 +5337,12 @@ msgid "Auto-save name prefix"
msgstr "Prefijo para auto-salvado"
#: server/settings.c:1016
-#, fuzzy
msgid ""
"Automatically saved games will have name \"<prefix>-T<turn>-Y<year>.sav\". "
"This setting sets the <prefix> part."
msgstr ""
-"Las partidas salvadas automáticamente tienen como nombre \"<prefijo><año>.sav"
-"\". Esto permite cambiar la parte de <prefijo>."
+"Las partidas salvadas automáticamente tienen como nombre \"<prefijo>-"
+"T<turno>-Y<año>.sav\". Esta opción permite cambiar la parte de <prefijo>."
#: server/settings.c:1023
msgid "Whether to log player statistics"
@@ -5342,13 +5358,13 @@ msgstr ""
"log\" cada turno. Estas estadísticas se pueden usar para crear gráficos "
"después del juego."
-#: server/sernet.c:150
+#: server/sernet.c:151
msgid "Server cannot read standard input. Ignoring input."
msgstr ""
"No se permite que el servidor lea la entrada estándar, así que lo que se "
"introduzca será descartado."
-#: server/sernet.c:929
+#: server/sernet.c:933
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr "Servidor: dirección incorrecta: [%s:%d]."
@@ -5429,37 +5445,36 @@ msgstr ""
msgid "Without guidance from the capital, the %s spaceship is lost!"
msgstr "¡Al no ser guiada desde la capital, la nave espacial %s se ha perdido!"
-#: server/srv_main.c:240
+#: server/srv_main.c:242
msgid "Game ended in a draw as end year exceeded"
msgstr "La partida ha acabado en tablas al sobrepasar el año final"
-#: server/srv_main.c:274
+#: server/srv_main.c:276
#, c-format
msgid "The %s spaceship has arrived at Alpha Centauri."
msgstr "La nave espacial %s ha llegado a Alfa Centauri."
-#: server/srv_main.c:287 server/srv_main.c:322
+#: server/srv_main.c:289 server/srv_main.c:324
#, c-format
msgid "Team victory to %s"
msgstr "Victoria de equipo para %s"
-#: server/srv_main.c:297 server/srv_main.c:338
+#: server/srv_main.c:299 server/srv_main.c:340
#, c-format
msgid "Game ended in victory for %s"
msgstr "La partida ha acabado con victoria para %s"
-#: server/srv_main.c:345
+#: server/srv_main.c:347
msgid "Game ended in a draw"
msgstr "La partida ha acabado en tablas"
-#: server/srv_main.c:461 server/srv_main.c:472
-#, fuzzy, c-format
+#: server/srv_main.c:465 server/srv_main.c:476
+#, c-format
msgid "Your %s was disbanded in accordance with your peace treaty with the %s."
msgstr ""
-"Tu %s unidad ha sido desarticulada de acuerdo con tu tratado de paz con los %"
-"s."
+"Tu %s ha sido desarticulada de acuerdo con tu tratado de paz con los %s."
-#: server/srv_main.c:512 server/srv_main.c:516
+#: server/srv_main.c:516 server/srv_main.c:520
#, c-format
msgid ""
"Concerned citizens point out that the cease-fire with %s will run out soon."
@@ -5467,370 +5482,362 @@ msgstr ""
"Los ciudadanos, preocupados, te recuerdan que la tregua con %s se acabará "
"pronto."
-#: server/srv_main.c:521 server/srv_main.c:525
+#: server/srv_main.c:525 server/srv_main.c:529
#, c-format
msgid "The cease-fire with %s has run out. You are now at war with the %s."
-msgstr "La tregua con %s se ha acabado. Ahora eres neutral para con los %s."
+msgstr "La tregua con %s se ha acabado. Ahora estás en guerra con los %s."
-#: server/srv_main.c:542
-#, fuzzy, c-format
+#: server/srv_main.c:546
+#, c-format
msgid ""
"Ceasefire between %s and %s has run out. They are at war. You cancel your "
"alliance with both."
msgstr ""
-"Tu compañero de grupo %s ha declarado la guerra a %s. Así que tu eres "
-"obligado a cancelar la alianza con %s."
+"La tregua entre %s y %s se ha acabado. Se han declarado la guerra. Así que "
+"tu cancelas la alianza con ellos."
-#: server/srv_main.c:961
+#: server/srv_main.c:997
#, c-format
msgid "Failed saving game as %s"
msgstr "Error salvando la partida en el fichero %s"
-#: server/srv_main.c:963
+#: server/srv_main.c:999
#, c-format
msgid "Game saved as %s"
msgstr "Partida salvada en el fichero %s"
-#: server/srv_main.c:994
+#: server/srv_main.c:1030
msgid "The game is already running."
msgstr "La partida ya está en marcha."
-#: server/srv_main.c:1002
+#: server/srv_main.c:1038
#, 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:1009
+#: server/srv_main.c:1045
msgid "Starting game."
msgstr "Empezando la partida."
-#: server/srv_main.c:1071
+#: server/srv_main.c:1112
#, c-format
msgid "request for unknown report (type %d)"
msgstr "solicitud de informe desconocido (tipo %d)"
-#: server/srv_main.c:1136
+#: server/srv_main.c:1177
#, c-format
msgid "Warning: rejecting old client %s"
msgstr "Aviso: rechazando cliente antiguo %s"
-#: server/srv_main.c:1238
+#: server/srv_main.c:1279
#, 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:1338
+#: server/srv_main.c:1381
msgid "Please choose a non-blank name."
msgstr "Por favor, elige un nombre no vacío."
-#: server/srv_main.c:1354
+#: server/srv_main.c:1397
msgid "That nation is already in use."
msgstr "La nation ya se está usando."
-#: server/srv_main.c:1370
+#: server/srv_main.c:1413
#, 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:1391
+#: server/srv_main.c:1434
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:1490
+#: server/srv_main.c:1533
#, 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:1496
+#: server/srv_main.c:1539
#, c-format
msgid "%s nation is already in use."
-msgstr "La nacion %s está en uso."
+msgstr "La nación %s está en uso."
-#: server/srv_main.c:1514
+#: server/srv_main.c:1557
#, c-format
msgid "%s is the %s ruler %s."
-msgstr "%s es %s, el gobernante de los %s."
+msgstr "%s es %s, el gobernante %s."
-#: server/srv_main.c:1570
+#: server/srv_main.c:1613
#, 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:1614 server/srv_main.c:1618
+#: server/srv_main.c:1657 server/srv_main.c:1661
#, 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:1760
+#: server/srv_main.c:1803
#, c-format
msgid "Player %d"
msgstr "Jugador %d"
-#: server/srv_main.c:1771 server/srv_main.c:1777
+#: server/srv_main.c:1814 server/srv_main.c:1820
#, c-format
msgid "%s rules the %s."
msgstr "%s gobierna a los %s."
-#: server/srv_main.c:1942
+#: server/srv_main.c:1985
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
msgstr ""
+"Este programa civserver tiene soporte para autentificación de jugadores, "
+"pero no se está usando actualmente."
-#: server/srv_main.c:1993
+#: server/srv_main.c:2037
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr "Enviando información al metaservidor [%s]"
-#: server/srv_main.c:2024
+#: server/srv_main.c:2069
msgid "The game is over..."
msgstr "¡La partida ha finalizado!"
-#: server/srv_main.c:2237
+#: server/srv_main.c:2286
msgid "Now accepting new client connections."
msgstr "Aceptando más conexiones de clientes."
-#: server/stdinhand.c:246
-#, c-format
-msgid "Vote \"%s\" is passed %d to %d with %d abstentions."
-msgstr "Voto \"%s\" passó %d a %d con %d abstenciones."
-
-#: server/stdinhand.c:253
-#, c-format
-msgid "Vote \"%s\" failed with %d against, %d for and %d abstentions."
-msgstr "Voto \"%s\" falló con %d contra %d a favor y %d abstenciones."
-
#. TRANS: ambiguous command
-#: server/stdinhand.c:365
+#: server/stdinhand.c:284
msgid "(ambiguous)"
msgstr "(ambiguo)"
#. TRANS: unrecognized command
#. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:416
+#: server/stdinhand.c:287 client/citydlg_common.c:419
#: 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 "(desconocido)"
-#: server/stdinhand.c:458
+#: server/stdinhand.c:377
msgid "Name is empty, so cannot be a player."
msgstr "Falta el nombre del jugador."
-#: server/stdinhand.c:462
+#: server/stdinhand.c:381
msgid "Name is too long, so cannot be a player."
msgstr "No puede haber un jugador con un nombre tan largo."
-#: server/stdinhand.c:466
+#: server/stdinhand.c:385
#, c-format
msgid "Player name prefix '%s' is ambiguous."
msgstr "El prefijo de nombre de jugador '%s' es ambiguo."
-#: server/stdinhand.c:470
+#: server/stdinhand.c:389
#, c-format
msgid "No player by the name of '%s'."
msgstr "No hay ningún jugador llamado '%s'."
-#: server/stdinhand.c:474 server/stdinhand.c:509
+#: server/stdinhand.c:393 server/stdinhand.c:428
#, c-format
msgid "Unexpected match_result %d (%s) for '%s'."
msgstr "match_result inesperado %d (%s) para '%s'."
-#: server/stdinhand.c:493
+#: server/stdinhand.c:412
msgid "Name is empty, so cannot be a connection."
msgstr "Falta el nombre, así que no puede ser una conexión."
-#: server/stdinhand.c:497
+#: server/stdinhand.c:416
msgid "Name is too long, so cannot be a connection."
msgstr "El nombre es demasiado largo, así que no puede ser una conexión."
-#: server/stdinhand.c:501
+#: server/stdinhand.c:420
#, c-format
msgid "Connection name prefix '%s' is ambiguous."
msgstr "El prefijo de nombre de conexión '%s' es ambiguo."
-#: server/stdinhand.c:505
+#: server/stdinhand.c:424
#, c-format
msgid "No connection by the name of '%s'."
msgstr "No hay ninguna conexión llamada '%s'."
-#: server/stdinhand.c:525
+#: server/stdinhand.c:444
#, c-format
msgid "Open metaserver connection to [%s]."
msgstr "Abrir la conexión con el metaservidor en [%s]."
-#: server/stdinhand.c:538
+#: server/stdinhand.c:457
#, c-format
msgid "Close metaserver connection to [%s]."
msgstr "Cerrar la conexión con el metaservidor en [%s]."
-#: server/stdinhand.c:553
+#: server/stdinhand.c:472
msgid "Metaserver connection is open."
msgstr "La conexión con el metaservidor está abierta."
-#: server/stdinhand.c:556
+#: server/stdinhand.c:475
msgid "Metaserver connection is closed."
msgstr "La conexión con el metaservidor está cerrada."
-#: server/stdinhand.c:566
+#: server/stdinhand.c:485
msgid "Metaserver connection is already open."
msgstr "La conexión con el metaservidor ya está abierta."
-#: server/stdinhand.c:577
+#: server/stdinhand.c:496
msgid "Metaserver connection is already closed."
msgstr "La conexión con el metaservidor ya está cerrada."
-#: server/stdinhand.c:582
+#: server/stdinhand.c:501
msgid "Argument must be 'u', 'up', 'd', 'down', or '?'."
msgstr "El argumento debe ser 'u', 'up', 'd', 'down', o '?'."
-#: server/stdinhand.c:603
+#: server/stdinhand.c:522
#, c-format
msgid "Metaserver patches string set to '%s'."
msgstr "El metaservidor parchea la cadena configurada a '%s'."
-#: server/stdinhand.c:606
+#: server/stdinhand.c:525
#, c-format
msgid "Metaserver patches string set to '%s', not reporting to metaserver."
msgstr ""
"El metaservidor parchea la cadena configurada a '%s', sin informar al "
"metaservidor."
-#: server/stdinhand.c:627
+#: server/stdinhand.c:546
#, c-format
msgid "Metaserver message string set to '%s'."
msgstr "El mensaje del metaservidor se cambió a '%s'."
-#: server/stdinhand.c:630
+#: server/stdinhand.c:549
#, c-format
msgid "Metaserver message string set to '%s', not reporting to metaserver."
msgstr ""
"El mensaje del metaservidor se cambió a '%s', sin informar al metaservidor."
-#: server/stdinhand.c:650
+#: server/stdinhand.c:569
#, c-format
msgid "Metaserver is now [%s]."
msgstr "El metaservidor ahora es [%s]."
-#: server/stdinhand.c:660
+#: server/stdinhand.c:579
#, c-format
msgid "Server id: %s"
msgstr "Servidor id: %s"
-#: server/stdinhand.c:757
+#: server/stdinhand.c:676
msgid "You cannot save games manually on this server."
msgstr "No se pueden guardar las partidas manualmente en este servidor."
-#: server/stdinhand.c:774
+#: server/stdinhand.c:693
msgid "Cannot toggle a barbarian player."
msgstr "No se puede conmutar un jugador bárbaro."
-#: server/stdinhand.c:781
+#: server/stdinhand.c:700
#, c-format
msgid "%s is now under AI control."
msgstr "%s ahora está controlado por el ordenador."
-#: server/stdinhand.c:802
+#: server/stdinhand.c:721
#, c-format
msgid "%s is now under human control."
msgstr "%s ahora está controlado por una persona."
-#: server/stdinhand.c:847
+#: server/stdinhand.c:766
msgid "Can't add AI players once the game has begun."
msgstr ""
"No se pueden añadir jugadores controlados por el ordenador tras el inicio de "
"la partida."
-#: server/stdinhand.c:867
+#: server/stdinhand.c:786
msgid "Can't add more players, server is full."
msgstr "No se pueden añadir más jugadores, el servidor está a tope."
-#: server/stdinhand.c:874
+#: server/stdinhand.c:793
msgid "Can't use an empty name."
msgstr "No se puede usar un nombre en blanco."
-#: server/stdinhand.c:881
+#: server/stdinhand.c:800
#, c-format
msgid "That name exceeds the maximum of %d chars."
msgstr "El nombre excede el máximo de %d caracteres."
-#: server/stdinhand.c:887
+#: server/stdinhand.c:806
msgid "That name is not allowed."
msgstr "Este nombre no se permite."
-#: server/stdinhand.c:893
+#: server/stdinhand.c:812
msgid "A player already exists by that name."
msgstr "Ya existe un jugador llamado así."
-#: server/stdinhand.c:899
+#: server/stdinhand.c:818
msgid "A user already exists by that name."
msgstr "Ya existe un jugador llamado así."
-#: server/stdinhand.c:925
+#: server/stdinhand.c:844
#, c-format
msgid "%s has been added as an AI-controlled player."
msgstr "Se ha unido el jugador %s, controlado por el ordenador."
-#: server/stdinhand.c:932
+#: server/stdinhand.c:851
#, c-format
msgid "Error creating new AI player: %s."
msgstr "Error al crear un nuevo jugador controlado por el ordenador: %s."
-#: server/stdinhand.c:966
+#: server/stdinhand.c:885
msgid "Players cannot be removed once the game has started."
msgstr ""
"No se puede eliminar a los jugadores cuando la partida ya ha comenzado."
-#: server/stdinhand.c:977
+#: server/stdinhand.c:896
#, c-format
msgid "Removed player %s from the game."
msgstr "Se ha eliminado al jugador %s de la partida."
-#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
+#: server/stdinhand.c:935 server/stdinhand.c:3372 server/stdinhand.c:3507
#, c-format
msgid "Name \"%s\" disallowed for security reasons."
msgstr "El nombre \"%s\" se ha prohibido por motivos de seguridad."
-#: server/stdinhand.c:1029
+#: server/stdinhand.c:948
#, c-format
msgid "No command script found by the name \"%s\"."
msgstr "No hay ningún comando con el nombre \"%s\"."
-#: server/stdinhand.c:1037
+#: server/stdinhand.c:956
#, c-format
msgid "Loading script file: %s"
msgstr "Cargando el fichero de comandos: %s"
-#: server/stdinhand.c:1052
+#: server/stdinhand.c:971
#, c-format
msgid "Cannot read command line scriptfile '%s'."
msgstr "No se puede leer el fichero de comandos '%s'."
-#: server/stdinhand.c:1054
+#: server/stdinhand.c:973
#, c-format
msgid "Could not read script file '%s'."
msgstr "No se puede leer el fichero de comandos '%s'."
-#: server/stdinhand.c:1146
+#: server/stdinhand.c:1065
#, c-format
msgid "Could not write script file '%s'."
msgstr "No se puede escribir el fichero de comandos '%s'."
-#: server/stdinhand.c:1158
+#: server/stdinhand.c:1077
msgid "You cannot use the write command on this server for security reasons."
msgstr ""
"No se pueden usar los comandos de escritura en este servidor porrazones de "
"seguridad."
-#: server/stdinhand.c:1186
+#: server/stdinhand.c:1105
#, c-format
msgid ""
"Cannot decrease command access level '%s' for connection '%s'; you only have "
@@ -5839,7 +5846,12 @@ msgstr ""
"No puedes disminuir el nivel de comandos '%s' del jugador '%s': tú sólo "
"tienes '%s'."
-#: server/stdinhand.c:1241
+#: server/stdinhand.c:1114
+#, 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:1163
#, c-format
msgid ""
"Anyone can now become game organizer '%s' by issuing the 'first' command."
@@ -5847,28 +5859,28 @@ msgstr ""
"Cualquiera puede asumir ahora el nivel organizador '%s' usando el comando "
"'first'."
-#: server/stdinhand.c:1274
+#: server/stdinhand.c:1187
msgid "Command access levels in effect:"
msgstr "Niveles de acceso a comandos activos:"
-#: server/stdinhand.c:1282
+#: server/stdinhand.c:1194
#, c-format
msgid "Command access level for new connections: %s"
msgstr "Nivel de acceso a comandos de las conexiones futuras: %s"
-#: server/stdinhand.c:1285
+#: server/stdinhand.c:1197
#, c-format
msgid "Command access level for first player to take it: %s"
msgstr "Nivel de acceso a comandos para el primer jugador en llegar: %s."
-#: server/stdinhand.c:1294
+#: server/stdinhand.c:1206
msgid ""
"Error: command access level must be one of 'none', 'info', 'ctrl', or 'hack'."
msgstr ""
"Error: el nivel de acceso a comandos debe ser 'none', 'info', 'ctrl', o "
"'hack'."
-#: server/stdinhand.c:1299
+#: server/stdinhand.c:1211
#, c-format
msgid ""
"Cannot increase command access level to '%s'; you only have '%s' yourself."
@@ -5876,204 +5888,194 @@ 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: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: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:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
+#: server/stdinhand.c:1238 server/stdinhand.c:1252 server/stdinhand.c:1273
#, 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:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
+#: server/stdinhand.c:1243 server/stdinhand.c:1257 server/stdinhand.c:1267
#, 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:1402
+#: server/stdinhand.c:1302
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:1406
+#: server/stdinhand.c:1306
#, 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:1411
+#: server/stdinhand.c:1311
msgid "Someone else already is game organizer."
msgstr "Ya hay alguien que es organizador del juego."
-#: server/stdinhand.c:1416
+#: server/stdinhand.c:1316
#, 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:1467
+#: server/stdinhand.c:1367
#, c-format
msgid "Invalid argument %d."
msgstr "Argumento inválido: %d."
-#: server/stdinhand.c:1474
+#: server/stdinhand.c:1374
msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
msgstr "Uso: timeoutincrease <turnos> <aumento> <valor> <factor>"
-#: server/stdinhand.c:1482
+#: server/stdinhand.c:1382
#, 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:1542 server/stdinhand.c:1545
+#: server/stdinhand.c:1442 server/stdinhand.c:1445
msgid "Option:"
msgstr "Opción:"
-#: server/stdinhand.c:1555 server/stdinhand.c:4031
+#: server/stdinhand.c:1455 server/stdinhand.c:4079
msgid "Description:"
msgstr "Descripción:"
-#: server/stdinhand.c:1560
+#: server/stdinhand.c:1460
#, c-format
msgid "Status: %s"
msgstr "Estado: %s"
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "changeable"
msgstr "modificable"
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "fixed"
msgstr "fijo"
-#: server/stdinhand.c:1567
+#: server/stdinhand.c:1467
#, 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:1572
+#: server/stdinhand.c:1472
#, 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:1578
+#: server/stdinhand.c:1478
#, c-format
msgid "Value: \"%s\", Default: \"%s\""
msgstr "Valor: \"%s\", Por defecto: \"%s\""
-#: server/stdinhand.c:1597
+#: server/stdinhand.c:1497
msgid "Explanations are available for the following server options:"
msgstr "Existen explicaciones para las siguientes opciones del servidor:"
-#: server/stdinhand.c:1643
+#: server/stdinhand.c:1537
msgid "No explanation for that yet."
msgstr "Todavía no se ha escrito esa explicación."
-#: server/stdinhand.c:1646 server/stdinhand.c:2480
+#: server/stdinhand.c:1540 server/stdinhand.c:2468
msgid "Ambiguous option name."
msgstr "Nombre de opción ambiguo."
-#: server/stdinhand.c:1666
+#: server/stdinhand.c:1560
#, c-format
msgid "Server Operator: %s"
msgstr "Operador del servidor: %s"
-#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
+#: server/stdinhand.c:1686 server/stdinhand.c:1713 server/stdinhand.c:1731
#, 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:1822
+#: server/stdinhand.c:1718
#, c-format
msgid "%s is not controlled by the AI."
msgstr "%s no está controlado por el ordenador."
-#: server/stdinhand.c:1842
+#: server/stdinhand.c:1738
#, 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:1857 server/stdinhand.c:2162
+#: server/stdinhand.c:1753
msgid "This command is client only."
msgstr "Este comando sólo se puede utilizar desde un cliente."
-#: server/stdinhand.c:1860
+#: server/stdinhand.c:1756
msgid "Usage: away"
msgstr "Uso: away"
-#: server/stdinhand.c:1865
+#: server/stdinhand.c:1761
msgid "Only players may use the away command."
msgstr "Sólo jugadores pueden usar el comando away."
-#: server/stdinhand.c:1869
+#: server/stdinhand.c:1765
#, c-format
msgid "%s set to away mode."
msgstr "%s pasa a modo ausente."
-#: server/stdinhand.c:1877
+#: server/stdinhand.c:1772
#, c-format
msgid "%s returned to game."
msgstr "%s ha vuelto a la partida."
-#: server/stdinhand.c:1919
+#: server/stdinhand.c:1817
#, 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:1925
+#: server/stdinhand.c:1823
#, c-format
msgid "Unknown option '%s'."
msgstr "Opción desconocida: '%s'."
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1848
msgid "All options with non-default values"
msgstr "Todas las opciones sin valor por defecto"
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1851
msgid "All options"
msgstr "Todas las opciones"
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1854
msgid "Vital options"
msgstr "Opciones principales"
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1857
msgid "Situational options"
msgstr "Opciones situacionales"
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1860
msgid "Rarely used options"
msgstr "Opciones raras"
-#: server/stdinhand.c:1965
+#: server/stdinhand.c:1863
msgid "+ means you may change the option"
msgstr "+ quiere decir que puedes cambiar la opción"
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1864
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:1969
+#: server/stdinhand.c:1867
#, c-format
msgid "%-*s value (min,max) "
msgstr "%-*s valor (mín,máx) "
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
msgid "Option"
msgstr "Opción"
-#: server/stdinhand.c:1973
+#: server/stdinhand.c:1871
msgid "description"
msgstr "descripción"
-#: server/stdinhand.c:2042
+#: server/stdinhand.c:1940
msgid ""
"Try 'show situational' or 'show rare' to show more options.\n"
"Try 'show changed' to show settings with non-default values."
@@ -6081,79 +6083,149 @@ 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:2092
+#: server/stdinhand.c:1966
msgid "Cannot change teams once game has begun."
msgstr "No se pueden cambiar los equipos tras el inicio de la partida."
-#: server/stdinhand.c:2102
+#: server/stdinhand.c:1976
msgid "Undefined argument. Usage: team <player> <team>."
msgstr "Argumento indefinido. Uso: team <jugador> <equipo>."
-#: server/stdinhand.c:2122
+#: server/stdinhand.c:1996
#, 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:2129
+#: server/stdinhand.c:2003
msgid "Cannot team a barbarian."
msgstr "No se puede agregar un jugador bárbaro a un equipo."
-#: server/stdinhand.c:2135
+#: server/stdinhand.c:2009
#, c-format
msgid "Player %s set to team %s."
msgstr "El jugador %s ahora pertenece al equipo %s."
-#: 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:2035 server/voting.c:512
+msgid "Teamvote"
+msgstr "Equipo de voto"
-#: server/stdinhand.c:2165
-msgid "Observers cannot vote."
-msgstr "Los observadores no pueden votar."
+#: server/stdinhand.c:2035 server/voting.c:516
+msgid "Vote"
+msgstr "Votar"
-#: server/stdinhand.c:2168
+#: server/stdinhand.c:2037
+#, c-format
msgid ""
-"You can only vote in a running game. Use 'first' to become the game "
-"organizer if there currently is none."
+"%s %d \"%s\" (needs %0.0f%%%s): %d for, %d against, and %d abstained out of %"
+"d players."
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."
+"%s %d \"%s\" (necesita %0.0f%%%s): %d a favor, %d en contra, y %d "
+"abstenciones de %d jugadores."
-#: 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:2041
+msgid " no dissent"
+msgstr "no disiente"
-#: server/stdinhand.c:2188
+#: server/stdinhand.c:2049
msgid "There are no votes going on."
msgstr "No hay votos en curso."
-#: server/stdinhand.c:2208
-msgid "No legal last vote."
-msgstr "Último voto no legal."
+#: server/stdinhand.c:2077
+msgid "Invalid arguments. Usage: vote yes|no|abstain [vote number]."
+msgstr "Argumento inválido. Uso: vote yes|no|abstain [num. voto]."
+
+#: server/stdinhand.c:2095 server/stdinhand.c:2213 server/stdinhand.c:3714
+msgid "You are not allowed to use this command."
+msgstr "No se te permite usar ese comando."
+
+#: server/stdinhand.c:2104
+#, c-format
+msgid "The argument \"%s\" is ambigious."
+msgstr "El argumento \"%s\" es ambiguo."
+
+#: server/stdinhand.c:2119
+msgid "There are no votes running."
+msgstr "No hay votos en curso."
+
+#: server/stdinhand.c:2121
+#, c-format
+msgid "No legal last vote (%d %s)."
+msgstr "Último voto no legal (%d %s)."
+
+#: server/stdinhand.c:2122
+msgid "other vote running"
+msgid_plural "other votes running"
+msgstr[0] "Otro voto en curso"
+msgstr[1] "Otros votos en curso"
-#: server/stdinhand.c:2213
-msgid "Value must be integer."
+#: server/stdinhand.c:2129 server/stdinhand.c:2491 server/stdinhand.c:2532
+msgid "Value must be an integer."
msgstr "El valor debe ser un número entero."
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2135 server/stdinhand.c:2221
#, c-format
msgid "No such vote (%d)."
msgstr "No existe el voto (%d)."
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2141
+msgid "You are not allowed to vote on that."
+msgstr "Tu no puedes votar en esto."
+
+#: server/stdinhand.c:2146
#, c-format
msgid "You voted for \"%s\""
msgstr "Tu votaste a favor de \"%s\"."
-#: server/stdinhand.c:2232
+#: server/stdinhand.c:2150
#, c-format
msgid "You voted against \"%s\""
msgstr "Tu votaste en contra de \"%s\""
-#: server/stdinhand.c:2259
+#: server/stdinhand.c:2155
+#, c-format
+msgid "You abstained from voting on \"%s\""
+msgstr "Tu te absteniste de votar en \"%s\""
+
+#: server/stdinhand.c:2190
+msgid "Missing argument <vote number> or the string \"all\"."
+msgstr ""
+
+#: server/stdinhand.c:2197
+#, fuzzy
+msgid "You don't have any vote going on."
+msgstr "Aquí no hay ningún obrero."
+
+#: server/stdinhand.c:2204
+#, fuzzy
+msgid "There isn't any vote going on."
+msgstr "No hay votos en curso."
+
+#: server/stdinhand.c:2209
+msgid "Server: All votes have been removed."
+msgstr ""
+
+#: server/stdinhand.c:2226
+#, fuzzy, c-format
+msgid "You are not allowed to cancel this vote (%d)."
+msgstr "No se te permite cambiar esta opción."
+
+#: server/stdinhand.c:2232
+msgid "Usage: /cancelvote [<vote number>|all]"
+msgstr ""
+
+#: server/stdinhand.c:2241
+#, c-format
+msgid "Server: %s cancelled the vote \"%s\" (number %d)."
+msgstr ""
+
+#: server/stdinhand.c:2247
+#, c-format
+msgid "Server: The vote \"%s\" (number %d) has been cancelled."
+msgstr ""
+
+#: server/stdinhand.c:2265
msgid ""
"Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
"<x> <y> | unit <id> | tech <player> | timing | info>."
@@ -6161,131 +6233,125 @@ msgstr ""
"Argumentos indefinidos. Uso: debug <diplomaciy <jugador> | city <x> <y> | "
"units <x> <y> | unit <id> | tech <player> | timing | info>."
-#: server/stdinhand.c:2265
+#: server/stdinhand.c:2271
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:2294
+#: server/stdinhand.c:2300
#, c-format
msgid "%s diplomacy no longer debugged"
msgstr "La diplomacia %s ya no será depurada"
-#: server/stdinhand.c:2298
+#: server/stdinhand.c:2304
#, c-format
msgid "%s diplomacy debugged"
-msgstr "La diplomacia %s fue depurada"
+msgstr "La diplomacia %s es depurada"
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2323
#, c-format
msgid "%s tech no longer debugged"
msgstr "La tecnología %s ya no será depurada"
-#: server/stdinhand.c:2321
+#: server/stdinhand.c:2327
#, c-format
msgid "%s tech debugged"
msgstr "La tecnología %s fue depurada"
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2358 server/stdinhand.c:2388
msgid "Value 2 & 3 must be integer."
msgstr "El valor 2 i 3 debe ser un número entero."
-#: server/stdinhand.c:2356 server/stdinhand.c:2386
+#: server/stdinhand.c:2362 server/stdinhand.c:2392
msgid "Bad map coordinates."
msgstr "Coordenadas de mapa incorrectas."
-#: server/stdinhand.c:2361
+#: server/stdinhand.c:2367
msgid "No city at this coordinate."
msgstr "No hay ninguna ciudad en estas coordenadas."
-#: server/stdinhand.c:2366
+#: server/stdinhand.c:2372
#, c-format
msgid "%s no longer debugged"
msgstr "%s ya no será depurado"
-#: server/stdinhand.c:2392 server/stdinhand.c:2422
-#, fuzzy, c-format
+#: server/stdinhand.c:2398 server/stdinhand.c:2428
+#, c-format
msgid "%s %s no longer debugged."
-msgstr "El %2$s de %1$s ya no será depurado"
+msgstr "El %2$s de %1$s ya no será depurado."
-#: server/stdinhand.c:2397 server/stdinhand.c:2427
-#, fuzzy, c-format
+#: server/stdinhand.c:2403 server/stdinhand.c:2433
+#, c-format
msgid "%s %s debugged."
-msgstr "El %2$s de %1$s fue depurado."
+msgstr "El %2$s de %1$s es depurado."
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2419
msgid "Value 2 must be integer."
msgstr "El valor 2 debe ser un número entero."
-#: server/stdinhand.c:2417
+#: server/stdinhand.c:2423
#, c-format
msgid "Unit %d does not exist."
msgstr "La unidad %d no existe."
-#: server/stdinhand.c:2475
+#: server/stdinhand.c:2464
msgid "Undefined argument. Usage: set <option> <value>."
msgstr "Argumento indefinido. Uso: set <opción> <valor>."
-#: server/stdinhand.c:2485
+#: server/stdinhand.c:2473
msgid "You are not allowed to set this option."
msgstr "No se te permite cambiar esta opción."
-#: server/stdinhand.c:2490 server/stdinhand.c:3463
+#: server/stdinhand.c:2478 server/stdinhand.c:3501
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:2502 server/stdinhand.c:2543
-msgid "Value must be an integer."
-msgstr "El valor debe ser un número entero."
-
-#: server/stdinhand.c:2512
+#: server/stdinhand.c:2501
#, c-format
msgid "The parameter %s should only contain digits 0-1."
-msgstr ""
+msgstr "El parámetro %s sólo debería contener los digitos 0-1."
-#: server/stdinhand.c:2519
+#: server/stdinhand.c:2508
msgid "Value out of range (minimum: 0, maximum: 1)."
msgstr "Valor fuera de rango (mínimo: 0, máximo: 1)."
-#: server/stdinhand.c:2534 server/stdinhand.c:2576
+#: server/stdinhand.c:2523 server/stdinhand.c:2565
#, c-format
msgid "Option: %s has been set to %d."
msgstr "Opción: %s ahora vale %d."
-#: server/stdinhand.c:2554
+#: server/stdinhand.c:2543
#, c-format
msgid "The parameter %s should only contain +- and 0-9."
-msgstr ""
+msgstr "El parámetro %s sólo debería contener + y 0-9."
-#: server/stdinhand.c:2561
+#: server/stdinhand.c:2550
#, 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:2586
+#: server/stdinhand.c:2575
msgid "String value too long. Usage: set <option> <value>."
msgstr "Cadena demasiado larga. Uso: set <opción> <valor>."
-#: server/stdinhand.c:2600
+#: server/stdinhand.c:2589
#, c-format
msgid "Option: %s has been set to \"%s\"."
msgstr "Opción: %s ahora vale \"%s\"."
-#: server/stdinhand.c:2658
+#: server/stdinhand.c:2652
msgid "Sorry, one can't observe globally in this game."
msgstr "Lo siento, en esta partida no se permite observar globalmente."
-#: server/stdinhand.c:2661
+#: server/stdinhand.c:2655
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:2671
-#, fuzzy
+#: server/stdinhand.c:2665
msgid "You cannot take a new player at this time."
-msgstr ""
-"Lo siento, en esta partida no se permite controlar a los jugadores humanos."
+msgstr "Ahora no puedes controlar un nuevo jugador. "
#. TRANS: Do not translate "maxplayers".
-#: server/stdinhand.c:2679
+#: server/stdinhand.c:2673
#, c-format
msgid ""
"You cannot take a new player because the maximum of %d player has already "
@@ -6294,84 +6360,90 @@ msgid_plural ""
"You cannot take a new player because the maximum of %d players has already "
"been reached (maxplayers setting)."
msgstr[0] ""
+"No puedes coger el nuevo jugador porque ya se ha llegado al máximo de %d "
+"jugador (opción maxplayers)."
msgstr[1] ""
+"No puedes coger el nuevo jugador porque ya se ha llegado al máximo de %d "
+"jugadores (opción maxplayers)."
-#: server/stdinhand.c:2691
+#: server/stdinhand.c:2685
msgid "You cannot take a new player because there are no free player slots."
msgstr ""
+"No puedes coger un nuevo jugador porque no hay espacios libres para "
+"jugadores."
-#: server/stdinhand.c:2702
+#: server/stdinhand.c:2696
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:2705
+#: server/stdinhand.c:2699
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:2713
+#: server/stdinhand.c:2707
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:2716
+#: server/stdinhand.c:2710
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:2724
+#: server/stdinhand.c:2718
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:2727
+#: server/stdinhand.c:2721
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:2736
+#: server/stdinhand.c:2730
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:2739
+#: server/stdinhand.c:2733
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:2749
+#: server/stdinhand.c:2743
msgid "Sorry, one can't observe in this game."
msgstr "Lo siento, en esta partida no se permite observar jugadores."
-#: server/stdinhand.c:2754
+#: server/stdinhand.c:2748
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:2760
+#: server/stdinhand.c:2754
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:2791
+#: server/stdinhand.c:2785
msgid "Usage: observe [connection-name [player-name]]"
msgstr "Uso: observe [nombre-de-conexión] <nombre-de-jugador>"
-#: server/stdinhand.c:2797
+#: server/stdinhand.c:2791
msgid "Usage: observe [player-name]"
msgstr "Uso: observe <nombre-del-jugador>"
-#: server/stdinhand.c:2847
+#: server/stdinhand.c:2841
#, 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:2858
+#: server/stdinhand.c:2852
#, c-format
msgid "%s is already observing %s."
msgstr "%s ya observa %s."
-#: server/stdinhand.c:2863
+#: server/stdinhand.c:2857
#, c-format
msgid "%s is already observing."
msgstr "%s ya está observando."
@@ -6386,240 +6458,242 @@ msgstr "%s ahora observa %s"
msgid "%s now observes"
msgstr "%s ahora observa"
-#: server/stdinhand.c:2969
+#: server/stdinhand.c:2971
msgid "Usage: take <connection-name> <player-name>"
msgstr "Uso: take <nombre-de-conexión> <nombre-de-jugador>"
-#: server/stdinhand.c:2974
+#: server/stdinhand.c:2976
msgid "Usage: take <player-name>"
msgstr "Uso: take <nombre-del-jugador>"
-#: server/stdinhand.c:2980
+#: server/stdinhand.c:2982
msgid "Usage: take [connection-name] <player-name>"
msgstr "Uso: take [nombre-de-conexión] <nombre-de-jugador>"
-#: server/stdinhand.c:3010
-#, fuzzy, c-format
+#: server/stdinhand.c:3012
+#, c-format
msgid "%s already controls %s."
-msgstr "%s ya controla %s"
+msgstr "%s ya controla %s."
-#: server/stdinhand.c:3024
-#, fuzzy, c-format
+#: server/stdinhand.c:3026
+#, c-format
msgid "There is no free player slot for %s."
-msgstr "No hay ningún jugador ni conexión llamado %s."
+msgstr "No hay ningún puesto de jugador disponible para %s."
-#: server/stdinhand.c:3059
+#: server/stdinhand.c:3061
#, c-format
msgid "being detached from %s."
msgstr "abandona %s."
-#: server/stdinhand.c:3135
-#, fuzzy, c-format
+#: server/stdinhand.c:3146
+#, c-format
msgid "%s now controls %s (%s, %s)."
-msgstr "%s ahora controla %s (%s, %s)"
+msgstr "%s ahora controla %s (%s, %s)."
-#: server/stdinhand.c:3139 server/stdinhand.c:4260
+#: server/stdinhand.c:3150 server/stdinhand.c:4308
#: data/nation/barbarian.ruleset:3
msgid "Barbarian"
msgstr "Bárbaro"
-#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
+#: server/stdinhand.c:3152 server/stdinhand.c:4310 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-sdl/plrdlg.c:645
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr "Ordenador"
-#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-gtk-2.0/pages.c:2125
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
+#: server/stdinhand.c:3153 server/stdinhand.c:4312
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-gtk-2.0/pages.c:2127
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/connectdlg.c:215
msgid "Human"
msgstr "Humano"
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-gtk-2.0/pages.c:2124 client/gui-win32/connectdlg.c:200
-#: client/gui-win32/connectdlg.c:212
+#: server/stdinhand.c:3155 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-gtk-2.0/pages.c:2126 client/gui-win32/connectdlg.c:202
+#: client/gui-win32/connectdlg.c:214
msgid "Alive"
msgstr "Vivo"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3156 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-win32/connectdlg.c:202
msgid "Dead"
msgstr "Muerto"
-#: server/stdinhand.c:3147
-#, fuzzy, c-format
+#: server/stdinhand.c:3159
+#, c-format
msgid "%s failed to attach to any player."
-msgstr "%s no está conectado a ningún jugador."
+msgstr "%s ha fallado en unirse a un jugador."
-#: server/stdinhand.c:3182
+#: server/stdinhand.c:3194
msgid "Usage: detach <connection-name>"
msgstr "Uso: detach <nombre-de-conexión>"
-#: server/stdinhand.c:3202
+#: server/stdinhand.c:3214
msgid "You can not detach other users."
msgstr "No puedes forzar a otros jugadores a abandonar."
-#: server/stdinhand.c:3211
+#: server/stdinhand.c:3223
#, c-format
msgid "%s is not attached to any player."
msgstr "%s no está conectado a ningún jugador."
-#: server/stdinhand.c:3234
+#: server/stdinhand.c:3246
#, c-format
msgid "%s detaching from %s"
msgstr "%s se desconecta de %s."
-#: server/stdinhand.c:3240
+#: server/stdinhand.c:3252
#, c-format
msgid "%s no longer observing."
msgstr "%s ya no está observando."
-#: server/stdinhand.c:3259
+#: server/stdinhand.c:3271
#, c-format
msgid "detaching from %s."
msgstr "desconectado de %s."
-#: server/stdinhand.c:3345
+#: server/stdinhand.c:3361
msgid "Usage: load <game name>"
msgstr "Uso: load <nombre juego>"
-#: server/stdinhand.c:3350
+#: server/stdinhand.c:3366
msgid "Cannot load a game while another is running."
msgstr "No se puede cargar una partida mientras hay otra en marcha."
-#: server/stdinhand.c:3372
+#: server/stdinhand.c:3388
#, 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:3389
+#: server/stdinhand.c:3405
#, c-format
msgid "Could not load savefile: %s"
msgstr "No he podido cargar la partida guardada en el fichero: %s"
-#: server/stdinhand.c:3458
+#: server/stdinhand.c:3496
#, c-format
msgid "Current ruleset directory is \"%s\""
msgstr "El directorio de ruleset actual es \"%s\"."
-#: server/stdinhand.c:3478
+#: server/stdinhand.c:3516
#, c-format
msgid "Ruleset directory \"%s\" not found"
msgstr "El directorio de ruleset \"%s\" no existe."
-#: server/stdinhand.c:3484
+#: server/stdinhand.c:3522
#, c-format
msgid "Ruleset directory is already \"%s\""
msgstr "El directorio de ruleset ya es \"%s\""
-#: server/stdinhand.c:3488
+#: server/stdinhand.c:3526
#, c-format
msgid "Ruleset directory set to \"%s\""
msgstr "Se ha cambiado el directorio de ruleset a \"%s\""
-#: server/stdinhand.c:3536
+#: server/stdinhand.c:3574
msgid "Goodbye."
msgstr "Adiós."
-#: server/stdinhand.c:3567
+#: server/stdinhand.c:3606
msgid "Sorry, you are not allowed to use server commands."
msgstr "Lo siento, no se te permite usar comandos del servidor."
-#: server/stdinhand.c:3603
+#: server/stdinhand.c:3656
#, 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:3608
+#: server/stdinhand.c:3661
#, c-format
msgid "Unknown command. Try '%shelp'."
msgstr "Comando desconocido. Prueba '%shelp'."
-#: server/stdinhand.c:3625
-msgid "Your new vote canceled your previous vote."
+#: server/stdinhand.c:3675
+msgid "Your new vote cancelled your previous vote."
msgstr "Tu nuevo voto ha cancelado el previo."
-#: server/stdinhand.c:3633
+#: server/stdinhand.c:3688
+msgid "New teamvote"
+msgstr "Nuevo voto de equipo"
+
+#: server/stdinhand.c:3691
+msgid "New vote"
+msgstr "Nuevo voto"
+
+#: server/stdinhand.c:3695
#, c-format
-msgid "New vote (number %d) by %s: %s."
-msgstr "Nuevo voto, (número %d), por %s: %s."
+msgid "%s (number %d) by %s: %s"
+msgstr "%s (número %d), por %s: %s"
-#: server/stdinhand.c:3645
+#: server/stdinhand.c:3704
#, c-format
msgid "Your new vote (\"%s\") was not legal or was not recognized."
-msgstr ""
+msgstr "Tu nuevo voto (\"%s\") no es legal o no ha sido reconocido."
-#: server/stdinhand.c:3655
-msgid "You are not allowed to use this command."
-msgstr "No se te permite usar ese comando."
-
-#: server/stdinhand.c:3680
+#: server/stdinhand.c:3726
msgid "(server prompt)"
msgstr "(prompt del servidor)"
-#: server/stdinhand.c:3787
+#: server/stdinhand.c:3835
msgid "Game ended in a draw."
msgstr "La partida ha acabado en tablas"
-#: server/stdinhand.c:3791
+#: server/stdinhand.c:3839
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:3796
+#: server/stdinhand.c:3844
msgid "Cannot end the game: no game running."
msgstr "No se puede terminar la partida: no hay partida en marcha."
-#: server/stdinhand.c:3812
+#: server/stdinhand.c:3860
#, 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:3817
+#: server/stdinhand.c:3865
msgid "You cannot surrender now."
msgstr "No puedes redirte ahora."
-#: server/stdinhand.c:3883
-#, fuzzy
+#: server/stdinhand.c:3931
msgid "Not enough human players, game will not start."
-msgstr "No hay suficientes jugadores, no se puede empezar la partida."
+msgstr "No hay suficientes jugadores humanos, no se puede empezar la partida."
-#: server/stdinhand.c:3888
-#, fuzzy
+#: server/stdinhand.c:3936
msgid "No players, game will not start."
-msgstr "No hay suficientes jugadores, no se puede empezar la partida."
+msgstr "No hay jugadores, no se puede empezar la partida."
-#: server/stdinhand.c:3892
-#, fuzzy
+#: server/stdinhand.c:3940
msgid "Not enough nations for all players, game will not start."
-msgstr "No hay suficientes jugadores, no se puede empezar la partida."
+msgstr ""
+"No hay naciones para todos los jugadores, no se puede empezar la partida."
-#: server/stdinhand.c:3901
+#: server/stdinhand.c:3949
msgid "All players are ready; starting game."
msgstr "Todos los jugadorres están preparados; comenzando la partida."
-#: server/stdinhand.c:3915
+#: server/stdinhand.c:3963
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:3922
+#: server/stdinhand.c:3970
msgid "Cannot start the game: it is already running."
msgstr "No se puede empezar la partida: ya está en marcha."
-#: server/stdinhand.c:3953
+#: server/stdinhand.c:4001
#, c-format
msgid "Cutting connection %s."
msgstr "Cortando la conexión %s."
-#: server/stdinhand.c:3972
+#: server/stdinhand.c:4020
msgid ""
"Welcome - this is the introductory help text for the Freeciv server.\n"
"\n"
@@ -6658,123 +6732,123 @@ msgstr ""
" save - para salvar la partida actual\n"
" quit - para salir"
-#: server/stdinhand.c:4007 server/stdinhand.c:4010
+#: server/stdinhand.c:4055 server/stdinhand.c:4058
msgid "Command:"
msgstr "Comando:"
-#: server/stdinhand.c:4014
+#: server/stdinhand.c:4062
msgid "Synopsis: "
msgstr "Resumen: "
-#: server/stdinhand.c:4023
+#: server/stdinhand.c:4071
#, c-format
msgid "Level: %s"
msgstr "Nivel: %s"
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4096
msgid "The following server commands are available:"
msgstr "Puedes usar los siguientes comandos del servidor:"
-#: server/stdinhand.c:4123
+#: server/stdinhand.c:4171
#, c-format
msgid "Help argument '%s' is ambiguous."
msgstr "El tema de ayuda '%s' es ambiguo."
-#: server/stdinhand.c:4128
+#: server/stdinhand.c:4176
#, c-format
msgid "No match for help argument '%s'."
msgstr "No hay ningún tema de ayuda llamado '%s'."
-#: server/stdinhand.c:4194
+#: server/stdinhand.c:4242
#, 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:4234
+#: server/stdinhand.c:4282
msgid "List of players:"
msgstr "Lista de jugadores:"
-#: server/stdinhand.c:4239
+#: server/stdinhand.c:4287
msgid "<no players>"
msgstr "<no hay jugadores>"
-#: server/stdinhand.c:4256
+#: server/stdinhand.c:4304
#, c-format
msgid "user %s, "
msgstr "usuario %s, "
-#: server/stdinhand.c:4267
+#: server/stdinhand.c:4315
msgid ", Dead"
msgstr ", Muerto"
-#: server/stdinhand.c:4270
+#: server/stdinhand.c:4318
#, 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:4275 server/stdinhand.c:4279 client/helpdata.c:257
-#: client/helpdata.c:752 client/text.c:241 client/text.c:1224
-#: client/text.c:1262
+#: server/stdinhand.c:4323 server/stdinhand.c:4327 client/helpdata.c:257
+#: client/helpdata.c:752 client/text.c:241 client/text.c:1229
+#: client/text.c:1267
#, c-format
msgid "?clistmore:, %s"
msgstr ", %s"
-#: server/stdinhand.c:4283
+#: server/stdinhand.c:4331
msgid ", ready"
msgstr ", preparado"
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4333
msgid ", not ready"
msgstr ", no preparado"
-#: server/stdinhand.c:4293
+#: server/stdinhand.c:4341
#, c-format
msgid " %d connection:"
msgid_plural " %d connections:"
msgstr[0] " %d conexión:"
msgstr[1] " %d conexiones:"
-#: server/stdinhand.c:4299
+#: server/stdinhand.c:4347
#, 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:4304
+#: server/stdinhand.c:4352
msgid " (observer mode)"
msgstr " (modo observador)"
-#: server/stdinhand.c:4322
+#: server/stdinhand.c:4370
msgid "List of teams:"
msgstr "Lista de equipos:"
#. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4332
+#: server/stdinhand.c:4380
#, 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:4352
+#: server/stdinhand.c:4400
#, c-format
msgid "%2d : '%s' : 1 player : %s"
msgstr "%d : '%s' : 1 jugador : %s"
-#: server/stdinhand.c:4360
+#: server/stdinhand.c:4408
#, c-format
msgid "Empty team: %s"
msgstr "Equipo vacío: %s"
-#: server/stdinhand.c:4371
+#: server/stdinhand.c:4419
msgid "List of connections to server:"
msgstr "Lista de conexiones del servidor:"
-#: server/stdinhand.c:4375
+#: server/stdinhand.c:4423
msgid "<no connections>"
msgstr "<no hay conexiones>"
-#: server/stdinhand.c:4399
+#: server/stdinhand.c:4447
msgid "List of scenarios available:"
msgstr "Lista de escenarios disponibles:"
@@ -6793,7 +6867,7 @@ msgstr "Los %s han descubierto \"Tecno. Futura %d\"."
msgid "%s acquired from %s!"
msgstr "¡Has obtenido %s de los %s!"
-#: server/techtools.c:220
+#: server/techtools.c:221
#, c-format
msgid ""
"Discovery of %s makes the government form %s available. You may want to "
@@ -6802,38 +6876,38 @@ msgstr ""
"El descubrimiento de %s pone a tu disposición la forma de gobierno %s. Quizá "
"quieras comenzar una revolución."
-#: server/techtools.c:301
+#: server/techtools.c:302
#, c-format
msgid "Discovery of %s OBSOLETES %s in %s!"
msgstr "¡El descubrimiento de %s DEJA OBSOLETO %s en %s!"
-#: server/techtools.c:351
+#: server/techtools.c:352
#, c-format
msgid "Learned %s. Our scientists focus on %s; goal is %s."
msgstr ""
"Hemos descubierto %s. Nuestros científicos se dedican a %s, la meta es %s."
-#: server/techtools.c:369
+#: server/techtools.c:370
#, c-format
msgid "Learned %s. Scientists choose to research %s."
msgstr "Hemos descubierto %s. Los científicos eligen investigar %s."
-#: server/techtools.c:376
+#: server/techtools.c:377
#, c-format
msgid "Learned %s. "
msgstr "Hemos descubierto %s. "
-#: server/techtools.c:379
+#: server/techtools.c:380
#, c-format
msgid "Researching %s."
msgstr "Investigando %s."
-#: server/techtools.c:385
+#: server/techtools.c:386
#, c-format
msgid "Learned %s. Scientists do not know what to research next."
msgstr "Hemos descubierto %s. Los científicos no saben que invertigar ahora."
-#: server/techtools.c:402
+#: server/techtools.c:403
msgid ""
"Great scientists from all the world join your civilization: you get an "
"immediate advance."
@@ -6841,22 +6915,22 @@ msgstr ""
"Grandes científicos de todo el mundo se unen a tu civilización; obtienes un "
"descubrimiento inmediatamente."
-#: server/techtools.c:570
+#: server/techtools.c:571
#, c-format
msgid "Technology goal is %s."
msgstr "La meta tecnológica es %s."
-#: server/techtools.c:700
+#: server/techtools.c:708
#, c-format
msgid "You steal %s from the %s."
msgstr "Has robado %s a los %s."
-#: server/techtools.c:705
+#: server/techtools.c:713
#, c-format
msgid "The %s stole %s from you!"
msgstr "¡Los %s te han robado %s!"
-#: server/techtools.c:710
+#: server/techtools.c:718
#, c-format
msgid "The %s have stolen %s from the %s."
msgstr "Los %s han robado %s a los %s."
@@ -6880,155 +6954,161 @@ msgstr "No pudo actualizarse ninguna."
msgid "%s upgraded to %s for %d gold."
msgstr "%s mejorados a %s por %d monedas de oro."
-#: server/unithand.c:396
+#: server/unithand.c:402
#, c-format
msgid "%s refuses to disband!"
msgstr "¡%s se niega a ser desarticulado!"
-#: server/unithand.c:449
+#: server/unithand.c:455
msgid "Can't place city here."
msgstr "Aquí no puede haber una ciudad."
-#: server/unithand.c:456
+#: server/unithand.c:462
#, c-format
msgid "Only %s can build a city."
msgstr "Sólo los %s pueden fundar una ciudad."
-#: server/unithand.c:461
+#: server/unithand.c:467
msgid "Can't build a city."
msgstr "No puedes fundar una ciudad."
-#: server/unithand.c:470
+#: server/unithand.c:476
#, c-format
msgid "Only %s can add to a city."
msgstr "Sólo los %s pueden añadirse a una ciudad."
-#: server/unithand.c:475
+#: server/unithand.c:481
msgid "Can't add to a city."
msgstr "No puedes añadir a una ciudad."
-#: server/unithand.c:481
+#: server/unithand.c:487
#, c-format
msgid "%s unit has no moves left to add to %s."
msgstr "A la unidad %s no le quedan movimientos para añadirse a %s."
-#: server/unithand.c:487
+#: server/unithand.c:493
#, c-format
msgid "%s unit has no moves left to build city."
msgstr "A la unidad %s no le quedan movimientos para fundar una ciudad."
-#: server/unithand.c:492
+#. TRANS: <city> is owned by <nation>, cannot add <unit>.
+#: server/unithand.c:499
+#, c-format
+msgid "%s is owned by %s, cannot add %s."
+msgstr "%s es propiedad de %s, no se puede añadir %s."
+
+#: server/unithand.c:506
#, c-format
msgid "%s is too big to add %s."
msgstr "%s ya es demasiado grande para añadir un %s."
-#: server/unithand.c:498
+#: server/unithand.c:512
#, c-format
msgid "%s needs an improvement to grow, so you cannot add %s."
msgstr "%s necesita una mejora para crecer, así que no puedes añadir %s."
-#: server/unithand.c:509
+#: server/unithand.c:523
#, c-format
msgid "Can't add %s to %s."
msgstr "No se pueden añadir %s a %s."
-#: server/unithand.c:531
+#: server/unithand.c:545
#, c-format
msgid "%s added to aid %s in growing."
-msgstr "Un %s se ha añadido a %s para contribuir a su crecimiento."
+msgstr "Tu %s se ha añadido a %s para contribuir a su crecimiento."
-#: server/unithand.c:828
+#: server/unithand.c:842
msgid "Your Nuclear missile was shot down by SDI defences, what a waste."
msgstr "La defensa SDI ha derribado tu misil Nuclear, vaya desperdicio."
-#: server/unithand.c:831
+#: server/unithand.c:845
#, c-format
msgid "The nuclear attack on %s was avoided by your SDI defense."
msgstr "Tu defensa SDI ha evitado un ataque nuclear sobre %s."
#. TRANS: "Your Cannon ... the Polish Destroyer."
-#: server/unithand.c:901
-#, fuzzy, c-format
+#: server/unithand.c:915
+#, c-format
msgid "Your %s survived the pathetic attack from the %s %s."
-msgstr "Tu %1$s ha sobrevivido al patético ataque del %3$s de %2$s."
+msgstr "Tu %1$s ha sobrevivido al patético ataque del %3$s %2$s."
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unithand.c:910
-#, fuzzy, c-format
+#: server/unithand.c:924
+#, c-format
msgid "Your attacking %s failed against the %s %s!"
-msgstr "¡Has perdido tu %1$s en un ataque contra un %3$s de %2$s!"
+msgstr "¡Has perdido tu %1$s en un ataque contra un %3$s %2$s!"
-#: server/unithand.c:983
+#: server/unithand.c:997
#, c-format
msgid "Only %s can attack from sea."
msgstr "Sólo los %s pueden atacar desde el mar."
-#: server/unithand.c:988
+#: server/unithand.c:1002
msgid "Cannot attack from sea."
msgstr "No se puede atacar desde el mar."
-#: server/unithand.c:996 server/unittools.c:2137
+#: server/unithand.c:1010 server/unittools.c:2142
msgid "Cannot attack unless you declare war first."
msgstr "No puedes atacar si no declaras primero la guerra."
-#: server/unithand.c:1001
+#: server/unithand.c:1015
#, c-format
msgid "%s can only move into your own zone of control."
msgstr "Sólo puedes mover tu %s a tu propia zona de control."
-#: server/unithand.c:1007
-#, fuzzy, c-format
+#: server/unithand.c:1021
+#, c-format
msgid "Cannot invade unless you break peace with %s first."
-msgstr "No puedes atacar si no declaras primero la guerra."
+msgstr "No puedes invadir si no rompes antes el tratado de paz con %s."
-#: server/unithand.c:1052
+#: server/unithand.c:1066
msgid "This unit has no moves left."
msgstr "A esa unidad no le quedan movimientos."
-#: server/unithand.c:1107
+#: server/unithand.c:1121
msgid "Unit must be on land to perform diplomatic action."
msgstr "La unidad debe estar en tierra para realizar acciones diplomáticas."
-#: server/unithand.c:1109
+#: server/unithand.c:1123
msgid "No diplomat action possible."
msgstr "No hay acciones diplomáticas disponibles."
-#: server/unithand.c:1125
+#: server/unithand.c:1139
#, c-format
msgid "You must declare war on %s first. Try using players dialog (F3)."
msgstr ""
"Primero debes declarar la guerra a los %s. Intenta usar el diálogo de "
"jugadores (F3)."
-#: server/unithand.c:1143
+#: server/unithand.c:1157
msgid "This unit is being transported, and so cannot bombard."
msgstr "Esta unidad está siendo transportada, y no puede bombardear."
-#: server/unithand.c:1158
+#: server/unithand.c:1172
msgid "You can't attack there."
msgstr "No puedes atacar ahí."
-#: server/unithand.c:1180
+#: server/unithand.c:1194
msgid "This type of troops cannot take over a city."
msgstr "Las tropas de este tipo no pueden conquistar una ciudad."
-#: server/unithand.c:1198
+#: server/unithand.c:1212
msgid "A transported unit is not allied to all units or city on target tile."
msgstr ""
"Una unidad transportada no está aliada con todas o alguna de las unidades en "
"la casilla de destino."
-#: server/unithand.c:1240
+#: server/unithand.c:1254
#, c-format
msgid "Your %s helps build the %s in %s (%d remaining)."
msgstr "Tu %s ayuda a construir %s en %s (quedan %d)."
-#: server/unithand.c:1242
+#: server/unithand.c:1256
#, c-format
msgid "Your %s helps build the %s in %s (%d surplus)."
msgstr "Tu %s ayuda a construir %s en %s (%d de superávit)."
-#: server/unithand.c:1286
+#: server/unithand.c:1300
#, c-format
msgid ""
"Sorry, your %s cannot establish a trade route because it has no home city"
@@ -7036,27 +7116,27 @@ msgstr ""
"¡Lo siento, tu %s no puede establecer una ruta comercial porque no pertenece "
"a ninguna ciudad!"
-#: server/unithand.c:1296
+#: server/unithand.c:1310
#, c-format
msgid "Sorry, your %s cannot establish a trade route between %s and %s"
msgstr "¡Lo siento, tu %s no puede establecer una ruta comercial entre %s y %s"
-#: server/unithand.c:1325 server/unithand.c:1344
+#: server/unithand.c:1339 server/unithand.c:1358
#, c-format
msgid "Sorry, your %s cannot establish a trade route here!"
msgstr "¡Lo siento, tu %s no puede establecer una ruta comercial aquí!"
-#: server/unithand.c:1329 server/unithand.c:1348
+#: server/unithand.c:1343 server/unithand.c:1362
#, c-format
msgid " The city of %s already has %d better trade routes!"
msgstr " ¡La ciudad de %s ya tiene %d rutas comerciales mejores!"
-#: server/unithand.c:1361 server/unithand.c:1373
+#: server/unithand.c:1375 server/unithand.c:1387
#, c-format
msgid "Sorry, %s has canceled the trade route from %s to your city %s."
msgstr "Lo siento, %s ha cancelado la ruta comercial de %s a tu ciudad %s."
-#: server/unithand.c:1406
+#: server/unithand.c:1420
#, c-format
msgid ""
"Your %s from %s has arrived in %s, and revenues amount to %d in gold and "
@@ -7066,14 +7146,14 @@ msgstr ""
"investigación."
#: server/unittools.c:253
-#, fuzzy, c-format
+#, c-format
msgid "%s was upgraded for free to %s."
-msgstr "%s se ha mejorado gratuitamente a %s."
+msgstr "Tu %s se ha mejorado gratuitamente a %s."
#: server/unittools.c:297
-#, fuzzy, c-format
+#, c-format
msgid "Not enough gold to pay upkeep for %s. Unit disbanded."
-msgstr "No hay suficiente oro. Se desarticula %s"
+msgstr "No hay suficiente oro para soportar a %s. Se desarticula la unidad."
#: server/unittools.c:343
#, c-format
@@ -7119,57 +7199,57 @@ msgid "Teleported your %s to %s."
msgstr "Se ha teletransportado tu %s a %s."
#. TRANS: A unit is moved to resolve stack conflicts.
-#: server/unittools.c:1065
-#, fuzzy, c-format
+#: server/unittools.c:1070
+#, c-format
msgid "Moved your %s."
-msgstr "Se han desarticulado tu %s."
+msgstr "Se ha movido tu %s."
-#: server/unittools.c:1076
+#: server/unittools.c:1081
#, c-format
msgid "Disbanded your %s."
msgstr "Se han desarticulado tu %s."
-#: server/unittools.c:1397
+#: server/unittools.c:1402
#, c-format
msgid "Unable to defend %s, %s has lost the game."
msgstr "No se puede defender %s, %s ha perdido la partida."
-#: server/unittools.c:1401
+#: server/unittools.c:1406
#, c-format
msgid "Losing %s meant losing the game! Be more careful next time!"
msgstr "¡La pérdida de %s ha supuesto tu derrota! ¡Procura tener más cuidado!"
-#: server/unittools.c:1503
+#: server/unittools.c:1508
#, c-format
msgid "%s escaped the destruction of %s, and fled to %s."
msgstr "%s ha escapado de la destrucción de %s y se ha ido a %s."
-#: server/unittools.c:1512
+#: server/unittools.c:1517
#, c-format
msgid "%s lost when %s was lost."
msgstr "Has perdido un %s al desaparecer tu %s."
-#: server/unittools.c:1561
+#: server/unittools.c:1566
#, c-format
msgid "Barbarian leader captured, %d gold ransom paid."
msgstr ""
"Has capturado a un jefe bárbaro, y obtienes %d monedas de oro como rescate."
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unittools.c:1579
-#, fuzzy, c-format
+#: server/unittools.c:1584
+#, c-format
msgid "Your attacking %s succeeded against the %s %s!"
msgstr "¡Tu %1$s ha atacado y destruido a un %3$s de %2$s!"
#. TRANS: "Cannon ... the Polish Destroyer."
-#: server/unittools.c:1588 server/unittools.c:1646
-#, fuzzy, c-format
+#: server/unittools.c:1593 server/unittools.c:1651
+#, c-format
msgid "%s lost to an attack by the %s %s."
-msgstr "Has perdido un %1$s bajo un ataque de un %3$s de %2$s."
+msgstr "Has perdido un %1$s bajo un ataque de un %3$s %2$s."
#. TRANS: "... Cannon ... the Polish Destroyer ...."
-#: server/unittools.c:1622
-#, fuzzy, c-format
+#: server/unittools.c:1627
+#, 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)!"
@@ -7180,210 +7260,255 @@ msgstr[1] ""
#. TRANS: "Cannon lost when the Polish Destroyer
#. * attacked the German Musketeers."
-#: server/unittools.c:1655
-#, fuzzy, c-format
+#: server/unittools.c:1660
+#, c-format
msgid "%s lost when the %s %s attacked the %s %s."
-msgstr "Has perdido un %1$s cuando %3$s de %2$s atacó %5$s de %4$s."
+msgstr "Has perdido un %1$s cuando %3$s %2$s atacó %5$s %4$s."
#. TRANS: "Musketeers (and Cannon) lost to an
#. * attack from the Polish Destroyer."
-#: server/unittools.c:1670
-#, fuzzy, c-format
+#: server/unittools.c:1675
+#, c-format
msgid "%s (and %s) lost to an attack from the %s %s."
-msgstr "Has perdido un %1$s (y %2$s) bajo un ataque de un %4$s de %3$s."
+msgstr "Has perdido un %1$s (y %2$s) bajo un ataque de un %4$s %3$s."
#. TRANS: "Musketeers and 3 other units lost to
#. * an attack from the Polish Destroyer."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1680
-#, fuzzy, c-format
+#: server/unittools.c:1685
+#, 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] ""
-"Has perdido un %1$s y %2$d unidad más bajo un ataque de un %4$s de %3$s."
+"Has perdido un %1$s y %2$d unidad más bajo un ataque de un %4$s %3$s."
msgstr[1] ""
-"Has perdido un %1$s y %2$d unidades más bajo un ataque de un %4$s de %3$s."
+"Has perdido un %1$s y %2$d unidades más bajo un ataque de un %4$s %3$s."
#. TRANS: "2 units lost when the Polish Destroyer
#. * attacked the German Musketeers."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1694
-#, fuzzy, c-format
+#: server/unittools.c:1699
+#, 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] "%1$d unidad perdida cuando %3$s de %2$s atacó a %5$s de %4$s."
-msgstr[1] "%1$d unidades perdidas cuando %3$s de %2$s atacó a %5$s de %4$s."
+msgstr[0] "%1$d unidad perdida cuando %3$s %2$s atacó a %5$s %4$s."
+msgstr[1] "%1$d unidades perdidas cuando %3$s %2$s atacó a %5$s %4$s."
-#: server/unittools.c:1962
+#: server/unittools.c:1967
#, c-format
msgid "Your %s was nuked by %s."
msgstr "La bomba atómica de %2$s ha destruido tu %1$s."
-#: server/unittools.c:1965 server/unittools.c:1981
+#: server/unittools.c:1970 server/unittools.c:1986
msgid "yourself"
msgstr "tú"
-#: server/unittools.c:1969
-#, fuzzy, c-format
+#: server/unittools.c:1974
+#, c-format
msgid "The %s %s was nuked."
-msgstr "Una bomba atómica ha destruido %2$s de %1$s."
+msgstr "Un %2$s %1$s ha sido detonado."
-#: server/unittools.c:1978
+#: server/unittools.c:1983
#, c-format
msgid "%s was nuked by %s."
msgstr "%2$s ha lanzado una bomba atómica sobre %1$s."
-#: server/unittools.c:1986
+#: server/unittools.c:1991
#, c-format
msgid "You nuked %s."
msgstr "Has lanzado una bomba atómica sobre %s."
-#: server/unittools.c:2027
-#, fuzzy, c-format
+#: server/unittools.c:2032
+#, c-format
msgid "The %s detonated a nuke!"
-msgstr "¡%s ha detonado una bomba atómica!"
+msgstr "¡Los %s han detonado una bomba atómica!"
-#: server/unittools.c:2051
+#: server/unittools.c:2056
#, c-format
msgid "%s transported successfully."
msgstr "%s fue transportado con éxito."
-#: server/unittools.c:2103
+#: server/unittools.c:2108
msgid "This unit type can not be paradropped."
msgstr "Este tipo de unidad no se puede tirar en paracaídas."
-#: server/unittools.c:2113
-#, fuzzy
+#: server/unittools.c:2118
msgid "You cannot paradrop a unit that is transporting other units."
-msgstr "Esta unidad de transporte no se puede tirar en paracaídas."
+msgstr ""
+"Esta unidad que está transportando otras unidades no se puede tirar en "
+"paracaídas."
-#: server/unittools.c:2119
+#: server/unittools.c:2124
msgid "The destination location is not known."
msgstr "Posición de destino desconocida."
-#: server/unittools.c:2126
+#: server/unittools.c:2131
#, c-format
msgid "This unit cannot paradrop into %s."
msgstr "Esta unidad no se puede tirar en paracaídas sobre %s."
-#: server/unittools.c:2146
+#: server/unittools.c:2151
#, c-format
msgid "The distance to the target (%i) is greater than the unit's range (%i)."
msgstr ""
"La distancia al objetivo (%i) es mayor que el alcance de la unidad (%i)."
-#: server/unittools.c:2157
+#: server/unittools.c:2162
#, c-format
msgid "Your %s paradropped into the %s and was lost."
msgstr "Tu %s se ha tirado en paracaídas sobre %s y ha desaparecido."
-#: server/unittools.c:2170
+#: server/unittools.c:2175
#, c-format
msgid "Your %s was killed by enemy units at the paradrop destination."
msgstr "Unidades enemigas han destruido tu %s nada más aterrizar."
-#: server/unittools.c:2192
+#: server/unittools.c:2197
#, c-format
msgid "You found %d gold."
msgstr "Has encontrado %d monedas de oro."
-#: server/unittools.c:2209
+#: server/unittools.c:2214
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr "Tu has encontrado %s en antiguos pergaminos de sabiduría."
-#: server/unittools.c:2216
+#: server/unittools.c:2221
#, c-format
msgid "The %s have acquired %s from ancient scrolls of wisdom."
msgstr "Los %s han adquirido %s de antiguos pergaminos de sabiduría."
-#: server/unittools.c:2230
+#: server/unittools.c:2235
msgid "A band of friendly mercenaries joins your cause."
msgstr "Una banda de mercenarios amistosos se une a tu causa."
-#: server/unittools.c:2248
+#: server/unittools.c:2253
msgid "An abandoned village is here."
msgstr "Encuentras una aldea abandonada."
-#: server/unittools.c:2258
+#: server/unittools.c:2263
msgid "You have unleashed a horde of barbarians!"
msgstr "¡Has provocado una horda de bárbaros!"
-#: server/unittools.c:2261
+#: server/unittools.c:2266
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr "¡Los bárbaros han destruido tu %s!"
-#: server/unittools.c:2277
+#: server/unittools.c:2282
msgid "You found a friendly city."
msgstr "Has encontrado una ciudad amiga."
-#: server/unittools.c:2291
+#: server/unittools.c:2296
msgid "Friendly nomads are impressed by you, and join you."
msgstr "Has impresionado a unos nómadas amistosos, y se han unido a tu causa."
-#: server/unittools.c:2316
+#: server/unittools.c:2321
msgid "Your overflight frightens the tribe; they scatter in terror."
msgstr ""
"Has asustado a los indígenas al sobrevolarlos, y se han marchado "
"aterrorizados."
-#: server/unittools.c:2574
+#: server/unittools.c:2579
#, c-format
msgid "Orders for %s aborted after enemy movement was spotted."
msgstr "Órdenes de %s abortadas porque hay unidades cerca."
-#: server/unittools.c:3023
+#: server/unittools.c:3028
#, c-format
msgid "Orders for %s aborted as there are units nearby."
msgstr "Órdenes de %s abortadas porque hay unidades cerca."
-#: server/unittools.c:3075
+#: server/unittools.c:3080
#, c-format
msgid "Orders for %s aborted because building of city failed."
msgstr ""
"Órdenes de %s abortadas porque la construcción de la ciudad fue imposible."
-#: server/unittools.c:3088
+#: server/unittools.c:3093
#, c-format
msgid "Orders for %s aborted since they give an invalid activity."
msgstr "Órdenes de %s abortadas porque especifican una actividad inválida."
-#: server/unittools.c:3102
+#: server/unittools.c:3107
#, c-format
msgid "Orders for %s aborted since they give an invalid location."
msgstr "Órdenes de %s abortadas porque especifican una localización inválida."
-#: server/unittools.c:3112
+#: server/unittools.c:3117
#, c-format
msgid "Orders for %s aborted as there are units in the way."
msgstr "Órdenes de %s abortadas porque hay unidades en el camino."
-#: server/unittools.c:3138
+#: server/unittools.c:3143
#, c-format
msgid "Orders for %s aborted because of failed move."
msgstr "Órdenes de %s abortadas porque ha habido un movimiento fallido."
-#: server/unittools.c:3179
+#: server/unittools.c:3184
#, c-format
msgid "Attempt to change homecity for %s failed."
msgstr "Falló el intento de asociar %s a la ciudad de origen."
-#: server/unittools.c:3190
+#: server/unittools.c:3195
#, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr "Falló el intento de establecer una ruta comercial por %s."
-#: server/unittools.c:3202
+#: server/unittools.c:3207
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr "Falló el intento de construir una maravilla por %s."
-#: server/unittools.c:3211
+#: server/unittools.c:3216
#, c-format
msgid "Your %s has invalid orders."
msgstr "Tu %s tiene órdenes inválidas."
+#: server/voting.c:522
+#, c-format
+msgid ""
+"%s %d \"%s\" is passed %d to %d with %d abstentions and %d who did not vote."
+msgstr "%s %d \"%s\" pasó %d a %d con %d abstenciones y %d que no votaron."
+
+#: server/voting.c:528
+#, c-format
+msgid ""
+"%s %d \"%s\" failed with %d against, %d for, %d abstentions and %d who did "
+"not vote."
+msgstr ""
+"%s %d \"%s\" falló con %d contra, %d a favor, %d abstenciones y %d que no "
+"votaron."
+
+#: server/voting.c:548
+#, c-format
+msgid "%s %d: %s voted yes."
+msgstr "%s %d: %s votaron sí."
+
+#: server/voting.c:553
+#, c-format
+msgid "%s %d: %s voted no."
+msgstr "%s %d: %s votaron no."
+
+#: server/voting.c:558
+#, c-format
+msgid "%s %d: %s chose to abstain."
+msgstr "%s %d: %s escogió abstenerse."
+
+#. TRANS: Describing a new vote that can only pass
+#. * if there are no dissenting votes.
+#: server/voting.c:726
+#, c-format
+msgid "%s (needs %0.0f%% and no dissent)."
+msgstr "%s (necesita %0.0f%% y ninguna disensión)."
+
+#. TRANS: Describing a new vote that can pass only if the
+#. * given percentage of players votes 'yes'.
+#: server/voting.c:732
+#, c-format
+msgid "%s (needs %0.0f%% in favor)."
+msgstr "%s (necesita %0.0f%% a favor)."
+
#: server/generator/mapgen.c:1771
msgid "High landmass - this may take a few seconds."
msgstr "Gran cantidad de masa terrestre - esto podría llevar unos segundos."
@@ -7415,14 +7540,14 @@ msgstr ""
"Quizás el número de jugadores/AIs es excesivo para este mapa.\n"
"Por favor, informa de este error en %s."
-#: client/attribute.c:363
+#: client/attribute.c:368
msgid ""
"There has been a CMA error. Your citizen governor settings may be broken."
msgstr ""
"Ha habido un error de CMA. Tu configuración del gobernador CMA poden estar "
"corruptas."
-#: client/attribute.c:367
+#: client/attribute.c:372
msgid "Old attributes detected and removed."
msgstr "Se han eliminado los atributos antiguos."
@@ -7444,7 +7569,7 @@ msgstr ""
#: client/audio.c:197
msgid "No real audio plugin present."
-msgstr ""
+msgstr "No está presente un controlador real de audio."
#: client/audio.c:198 client/audio.c:215 client/audio.c:247 client/audio.c:258
msgid "Proceeding with sound support disabled"
@@ -7570,41 +7695,41 @@ msgstr "%+4d : Ciudadanos\n"
msgid "%+4d : Taxed from trade\n"
msgstr "%+4d : Impuesto de comercio\n"
-#: client/citydlg_common.c:418
+#: client/citydlg_common.c:421
#, c-format
msgid "%+4d : Trade route with %s\n"
msgstr "%+4d : Ruta comercial con %s\n"
-#: client/citydlg_common.c:427
+#: client/citydlg_common.c:430
#, c-format
msgid "%+4d : Building tithes\n"
msgstr "%+4d : Construyendo diezmos\n"
-#: client/citydlg_common.c:450
+#: client/citydlg_common.c:453
#, c-format
msgid "%+4d : Bonus from %s (%+d%%)\n"
msgstr "%+4d : Prima de %s (%+d%%)\n"
-#: client/citydlg_common.c:462
+#: client/citydlg_common.c:465
#, c-format
msgid "%+4d : Waste\n"
msgstr "%+4d : Desperdicio\n"
-#: client/citydlg_common.c:468
+#: client/citydlg_common.c:471
#, c-format
msgid "%+4d : Disorder\n"
msgstr "%+4d : Disturbios\n"
-#: client/citydlg_common.c:474
+#: client/citydlg_common.c:477
#, c-format
msgid "%+4d : Used\n"
msgstr "%+4d : Usado\n"
-#: client/citydlg_common.c:479
+#: client/citydlg_common.c:482
msgid "==== : Adds up to\n"
msgstr "==== : Se agrega a\n"
-#: client/citydlg_common.c:481
+#: client/citydlg_common.c:484
#, c-format
msgid "%4d : Total surplus"
msgstr "%4d : Superprima total"
@@ -7634,7 +7759,6 @@ msgid "City Name"
msgstr "Nombre de la Ciudad"
#: client/cityrepdata.c:448
-#, fuzzy
msgid "?size [short]:Sz"
msgstr "Tm"
@@ -7652,9 +7776,8 @@ msgid "Rapture/Peace/Disorder"
msgstr "Celebraciones/Paz/Disturbios"
#: client/cityrepdata.c:452
-#, fuzzy
msgid "Concise *=Rapture, X=Disorder"
-msgstr "Breve: + Celebraciones, - Disturbios"
+msgstr "Breve: * = Celebraciones, X = Disturbios"
#: client/cityrepdata.c:456
msgid "Special"
@@ -7701,7 +7824,6 @@ msgid "Workers: Angry"
msgstr "Obreros: Enfadados"
#: client/cityrepdata.c:469 client/gui-xaw/citydlg.c:2402
-#, fuzzy
msgid "?city:Workers"
msgstr "Obreros"
@@ -7750,9 +7872,8 @@ msgstr "Unidades"
#. TRANS: Header "Number of units inside city"
#: client/cityrepdata.c:480
-#, fuzzy
msgid "?Present (units):Here"
-msgstr "Pre"
+msgstr "Aquí"
#: client/cityrepdata.c:481
msgid "Number of units present"
@@ -7760,9 +7881,8 @@ msgstr "N
#. TRANS: Header "Number of units supported by given city"
#: client/cityrepdata.c:484
-#, fuzzy
msgid "?Supported (units):Owned"
-msgstr "Man"
+msgstr "Mant"
#: client/cityrepdata.c:485
msgid "Number of units supported"
@@ -7770,14 +7890,12 @@ msgstr "N
#. TRANS: Header "It will take this many turns before city grows"
#: client/cityrepdata.c:488
-#, fuzzy
msgid "?food (population):Grow"
msgstr "Crece"
#: client/cityrepdata.c:489 client/cityrepdata.c:528
-#, fuzzy
msgid "?Stock/Target:(Have/Need)"
-msgstr "(Construido/Objetivo)"
+msgstr "(Const/Obj)"
#: client/cityrepdata.c:490
msgid "Turns until growth/famine"
@@ -7796,7 +7914,6 @@ msgid "Surplus: Food, Production, Trade"
msgstr "Superávit: Alimento, Producción, Comercio"
#: client/cityrepdata.c:496
-#, fuzzy
msgid "?Food surplus [short]:+F"
msgstr "+A"
@@ -7805,7 +7922,6 @@ msgid "Surplus: Food"
msgstr "Superávit: Comida"
#: client/cityrepdata.c:498
-#, fuzzy
msgid "?Production surplus [short]:+P"
msgstr "+P"
@@ -7814,7 +7930,6 @@ msgid "Surplus: Production"
msgstr "Superávit: Producción"
#: client/cityrepdata.c:500
-#, fuzzy
msgid "?Production loss (waste) [short]:-P"
msgstr "-P"
@@ -7823,7 +7938,6 @@ msgid "Waste"
msgstr "Desidia"
#: client/cityrepdata.c:502
-#, fuzzy
msgid "?Trade surplus [short]:+T"
msgstr "+C"
@@ -7832,7 +7946,6 @@ msgid "Surplus: Trade"
msgstr "Superávit: Comercio"
#: client/cityrepdata.c:504
-#, fuzzy
msgid "?Trade loss (corruption) [short]:-T"
msgstr "-C"
@@ -7880,12 +7993,10 @@ msgid "Economy: Science"
msgstr "Economía: Ciencia"
#: client/cityrepdata.c:516
-#, fuzzy
msgid "?number_trade_routes:n"
-msgstr "R"
+msgstr "n"
#: client/cityrepdata.c:516
-#, fuzzy
msgid "?number_trade_routes:R"
msgstr "C"
@@ -7908,7 +8019,6 @@ msgid "Citizen Governor"
msgstr "Gobernador del Pueblo"
#: client/cityrepdata.c:524
-#, fuzzy
msgid "Turns/Buy"
msgstr "Turnos/Precio"
@@ -7917,64 +8027,63 @@ msgid "Currently Building"
msgstr "Construyendo"
#: client/cityrepdata.c:573
-#, fuzzy
msgid "?specialist:S"
msgstr "?Especialistas:E"
#: client/cityrepdata.c:576
-#, fuzzy
msgid "Specialists"
msgstr "Especialistas"
-#: client/civclient.c:240
+#: client/civclient.c:241
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr " -a, --autoconnect\tPrescindir de la ventana de conexión\n"
-#: client/civclient.c:250
+#: client/civclient.c:251
msgid " -l, --log FILE\tUse FILE as logfile (spawned server also uses this)\n"
msgstr ""
" -l, --log FICH\tUsar FICH como fichero de registro(el servidor 'hijado' "
"también)\n"
-#: client/civclient.c:252
+#: client/civclient.c:253
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr " -m, --meta HOST\tConectarse al metaservidor en HOST\n"
-#: client/civclient.c:254
+#: client/civclient.c:255
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr " -n, --name NOMBRE\tUsar NOMBRE como nombre\n"
-#: client/civclient.c:256
-#, fuzzy
+#: client/civclient.c:257
msgid " -p, --port PORT\tConnect to server port PORT (usually with -a)\n"
-msgstr " -p, --port PUERTO\tConectarse al puerto PUERTO del servidor\n"
+msgstr ""
+" -p, --port PUERTO\tConectarse al puerto PUERTO del servidor (normalmente "
+"con -a)\n"
-#: client/civclient.c:258
+#: client/civclient.c:259
#, c-format
msgid " -P, --Plugin PLUGIN\tUse PLUGIN for sound output %s\n"
msgstr ""
" -P, --Plugin PLUGIN\tUsar el PLUGIN para la reproducción de sonido %s\n"
-#: client/civclient.c:260
+#: client/civclient.c:261
msgid " -r, --read FILE\tRead startup script FILE (for spawned server only)\n"
msgstr ""
" -r, --read FICH\tEjecutar el fichero FICH de sequencia de comandos(para el "
"servidor 'hijado')\n"
-#: client/civclient.c:263
-#, fuzzy
+#: client/civclient.c:264
msgid " -s, --server HOST\tConnect to the server at HOST (usually with -a)\n"
-msgstr " -s, --server HOST\tConectarse al servidor en HOST\n"
+msgstr ""
+" -s, --server HOST\tConectarse al servidor en HOST (normalmente con -a)\n"
-#: client/civclient.c:265
+#: client/civclient.c:266
msgid " -S, --Sound FILE\tRead sound tags from FILE\n"
msgstr " -S, --Sound FICH\tLeer la configuración del sonido de FICH\n"
-#: client/civclient.c:266
+#: client/civclient.c:267
msgid " -t, --tiles FILE\tUse data file FILE.tilespec for tiles\n"
msgstr " -t, --tiles FICH\tUsar el fichero de casillas FICH.tilespec\n"
-#: client/civclient.c:269
+#: client/civclient.c:270
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7984,46 +8093,46 @@ msgstr ""
" Prueba con \"%s -- --help\" para más información.\n"
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:274
-#, fuzzy, c-format
+#: client/civclient.c:275
+#, c-format
msgid "Report bugs at %s\n"
-msgstr "Informa de los bugs a <%s>.\n"
+msgstr "Informa de los bugs a %s\n"
-#: client/civclient.c:298
+#: client/civclient.c:299
#, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr "Puerto inválido \"%s\" especificado con la opción --port.\n"
-#: client/civclient.c:300 client/civclient.c:315
+#: client/civclient.c:301 client/civclient.c:316
msgid "Try using --help.\n"
msgstr "Prueba usando --help.\n"
-#: client/civclient.c:313
+#: client/civclient.c:314
#, c-format
msgid "Invalid debug level \"%s\" specified with --debug option.\n"
msgstr ""
"Nivel de depuración \"%s\" inválido, especificado con la opción --debug.\n"
-#: client/civclient.c:326
+#: client/civclient.c:327
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr "Opción desconocida: \"%s\"\n"
-#: client/civclient.c:391
-#, fuzzy, c-format
+#: client/civclient.c:393
+#, c-format
msgid "Updating old metaserver address \"%s\"."
-msgstr "metaserver <dirección>"
+msgstr "Actualizando la antigua dirección del metaservidor \"%s\"."
-#: client/civclient.c:394
-#, fuzzy, c-format
+#: client/civclient.c:396
+#, c-format
msgid "Default metaserver has been set to \"%s\"."
-msgstr "Opción: %s ahora vale \"%s\"."
+msgstr "El metaservidor por defecto es \"%s\"."
-#: client/civclient.c:550
+#: client/civclient.c:540
msgid "Game started."
msgstr "La partida ha empezado."
-#: client/civclient.c:588
+#: client/civclient.c:606
msgid "There was an error while auto connecting; aborting."
msgstr "Ha ocurrido un error durante la autoconexión; cancelando."
@@ -8153,19 +8262,19 @@ msgstr "Conectando."
msgid "Disconnected from server."
msgstr "Desconectado del servidor."
-#: client/clinet.c:469
+#: client/clinet.c:473
#, c-format
msgid "Failed to contact server \"%s\" at port %d as \"%s\" after %d attempts"
msgstr ""
"No se ha podido contactar con el servidor \"%s\", puerto %d, como \"%s\" "
"tras %d intentos"
-#: client/clinet.c:484 client/clinet.c:486
+#: client/clinet.c:488 client/clinet.c:490
msgid "Connection to server refused. Please start the server."
msgstr ""
"Rechazado la conexión con el servidor. Por favor, ejecuta el servidor."
-#: client/clinet.c:495 client/clinet.c:523
+#: client/clinet.c:499 client/clinet.c:527
#, c-format
msgid ""
"Error contacting server \"%s\" at port %d as \"%s\":\n"
@@ -8174,7 +8283,7 @@ msgstr ""
"Error al contactar con el servidor \"%s\", puerto %d, como \"%s\":\n"
" %s\n"
-#: client/clinet.c:514
+#: client/clinet.c:518
#, c-format
msgid ""
"Auto-connecting to server \"%s\" at port %d as \"%s\" every %f second(s) for "
@@ -8183,83 +8292,86 @@ 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:1358
+#: client/connectdlg_common.c:78 client/gui-gtk-2.0/pages.c:1358
msgid "novice"
msgstr "novato"
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1358
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
msgid "easy"
msgstr "fácil"
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1359
msgid "normal"
msgstr "normal"
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr "difícil"
-#: client/connectdlg_common.c:83
+#: client/connectdlg_common.c:82
msgid "experimental"
msgstr "experimental"
-#: client/connectdlg_common.c:213
+#: client/connectdlg_common.c:212
msgid "Starting server..."
msgstr "Empezando la partida..."
-#: client/connectdlg_common.c:332
+#: client/connectdlg_common.c:331
msgid "Couldn't start the server."
msgstr "No se ha podido empezar el servidor."
-#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
+#: client/connectdlg_common.c:332 client/connectdlg_common.c:365
msgid "You'll have to start one manually. Sorry..."
msgstr "Tendrás que empezar uno manualmente. Lo siento..."
-#: client/connectdlg_common.c:364
+#: client/connectdlg_common.c:363
msgid "Couldn't connect to the server."
msgstr "No se ha podido conectar con el servidor."
-#: client/connectdlg_common.c:365
+#: client/connectdlg_common.c:364
msgid "We probably couldn't start it from here."
msgstr "Probablemente no lo hemos podido iniciar desde aquí."
-#: client/connectdlg_common.c:470
-#, fuzzy
+#: client/connectdlg_common.c:469
msgid ""
"Established control over the server. You have command access level 'hack'."
-msgstr "Tenemos el control del servidor (nivel de acceso a comandos 'hack')"
+msgstr ""
+"Establecido el control sobre el servidor. Tu tienes el nivel de acceso a "
+"comandos 'hack'."
-#: client/connectdlg_common.c:475
+#: client/connectdlg_common.c:474
msgid ""
"Failed to obtain the required access level to take control of the server. "
"The server will now be shutdown."
msgstr ""
+"Ha fallado el intento de obtener el nivel de acceso para coger el control "
+"del servidor. Se cierra el servidor ."
#: client/control.c:1123
msgid "Only transporter units can be unloaded."
msgstr "Sólo las unidades de transporte pueden descargarse."
-#: client/control.c:1425
+#: client/control.c:1417
msgid "Only settler units can be put into auto mode."
msgstr "Sólo los colonos pueden ponerse en modo automático."
-#: client/control.c:1516
+#: client/control.c:1511
msgid "Only nuclear units can do this."
msgstr "Sólo las armas nucleares pueden hacer eso."
-#: client/control.c:1545
+#: client/control.c:1540
msgid "Only paratrooper units can do this."
msgstr "Sólo los paracaidistas pueden hacer eso."
-#: client/control.c:2020
+#: client/control.c:2015
msgid "Too far for this unit."
msgstr "Demasiado lejos para esa unidad."
-#: client/control.c:2230 client/control.c:2260 client/control.c:2276
+#: client/control.c:2225 client/control.c:2255 client/control.c:2271
msgid "Didn't find a route to the destination!"
msgstr "¡No hay una ruta hacia el destino!"
-#: client/control.c:2320
+#: client/control.c:2315
msgid "Oh my! You seem to have no capital!"
msgstr "¡Vaya! ¡Parece que no tienes capital!"
@@ -8274,67 +8386,49 @@ msgstr ""
"los terrenos)."
#: client/helpdata.c:169
-#, fuzzy, c-format
+#, c-format
msgid "Requires the %s technology.\n"
-msgstr ""
-"Requiere la tecnología %s.\n"
-"\n"
+msgstr "Requiere la tecnología %s.\n"
#: client/helpdata.c:173
-#, fuzzy, c-format
+#, c-format
msgid "Requires the %s government.\n"
-msgstr ""
-"Requiere el tipo de gobierno %s.\n"
-"\n"
+msgstr "Requiere el tipo de gobierno %s.\n"
#: client/helpdata.c:177
-#, fuzzy, c-format
+#, c-format
msgid "Requires the %s building.\n"
-msgstr ""
-"Requiere la construcción de %s.\n"
-"\n"
+msgstr "Requiere la construcción de %s.\n"
#: client/helpdata.c:181
-#, fuzzy, c-format
+#, c-format
msgid "Requires the %s terrain special.\n"
-msgstr ""
-"Requiere el terreno especial %s.\n"
-"\n"
+msgstr "Requiere el terreno especial %s.\n"
#: client/helpdata.c:185
-#, fuzzy, c-format
+#, c-format
msgid "Requires the %s terrain.\n"
-msgstr ""
-"Requiere el terreno %s.\n"
-"\n"
+msgstr "Requiere el terreno %s.\n"
#: client/helpdata.c:189
-#, fuzzy, c-format
+#, c-format
msgid "Requires the %s nation.\n"
-msgstr ""
-"Requiere la nación %s.\n"
-"\n"
+msgstr "Requiere la nación %s.\n"
#: client/helpdata.c:193 client/helpdata.c:197 client/helpdata.c:201
-#, fuzzy, c-format
+#, c-format
msgid "Only applies to %s units.\n"
-msgstr ""
-"Sólo se aplica a las unidades %s.\n"
-"\n"
+msgstr "Sólo se aplica a las unidades %s.\n"
#: client/helpdata.c:205 client/helpdata.c:209
-#, fuzzy, c-format
+#, c-format
msgid "Applies only to %s.\n"
-msgstr ""
-"Sólo se aplica a %s.\n"
-"\n"
+msgstr "Sólo se aplica a %s.\n"
#: client/helpdata.c:213
-#, fuzzy, c-format
+#, c-format
msgid "Requires a minimum size of %d.\n"
-msgstr ""
-"Requiere un tamaño mínimo de %d.\n"
-"\n"
+msgstr "Requiere un tamaño mínimo de %d.\n"
#: client/helpdata.c:263
#, c-format
@@ -8368,12 +8462,11 @@ msgstr ""
"\n"
#: client/helpdata.c:668
-#, fuzzy
msgid ""
"Requires: Nothing\n"
"\n"
msgstr ""
-"Requiere la construcción de %s.\n"
+"Requiere: nada\n"
"\n"
#: client/helpdata.c:673
@@ -8398,9 +8491,9 @@ msgid "* Allows %s.\n"
msgstr "* Permite %s.\n"
#: client/helpdata.c:778
-#, fuzzy, c-format
+#, c-format
msgid "* Can only be built if there is %s in the city.\n"
-msgstr "* Sólo puede construirse gobernando con %s.\n"
+msgstr "* Sólo puede construirse si hay un %s en la ciudad.\n"
#: client/helpdata.c:784
#, c-format
@@ -8691,28 +8784,39 @@ 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:1066 client/helpdata.c:1400
+#: client/helpdata.c:1066 client/helpdata.c:1408
msgid " or "
msgstr " o "
-#: client/helpdata.c:1068 client/helpdata.c:1388
+#: client/helpdata.c:1068 client/helpdata.c:1396
msgid "?or:, "
msgstr ", "
-#: client/helpdata.c:1080
+#: client/helpdata.c:1079
+#, c-format
+msgid "* Unit has to be in a city, or a base after %d turn.\n"
+msgid_plural "* Unit has to be in a city, or a base after %d turns.\n"
+msgstr[0] ""
+"* La unidad tiene que acabar en una ciudad o un una base cada %d turno.\n"
+msgstr[1] ""
+"* La unidad tiene que acabar en una ciudad o una base cada %d turnos.\n"
+
+#: client/helpdata.c:1087
#, 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] "* La unidad tiene que acabar en una ciudad o un %s cada %d turno.\n"
+msgid "* Unit has to be in a city, a base, or on a %s after %d turn.\n"
+msgid_plural "* Unit has to be in a city, a base, or on a %s after %d turns.\n"
+msgstr[0] ""
+"* La unidad tiene que acabar en una ciudad, una base o un %s cada %d turno.\n"
msgstr[1] ""
-"* La unidad tiene que acabar en una ciudad o un %s cada %d turnos.\n"
+"* La unidad tiene que acabar en una ciudad, una base o un %s cada %d "
+"turnos.\n"
-#: client/helpdata.c:1122
+#: client/helpdata.c:1130
#, 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:1127
+#: client/helpdata.c:1135
#, c-format
msgid ""
"To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8721,90 +8825,90 @@ msgstr ""
"Para llegar a %s necesitamos antes otros %d avances. El proyecto entero "
"empleará %d bombillas."
-#: client/helpdata.c:1135
+#: client/helpdata.c:1143
msgid "You cannot research this technology."
msgstr "No puedes investigar este avance."
-#: client/helpdata.c:1139
+#: client/helpdata.c:1147
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:1151
+#: client/helpdata.c:1159
#, 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:1156
+#: client/helpdata.c:1164
#, 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:1159
+#: client/helpdata.c:1167
#, 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:1163
+#: client/helpdata.c:1171
msgid "* Increases the pollution generated by the population.\n"
msgstr "* Aumenta la contaminación generada por la población.\n"
-#: client/helpdata.c:1168
+#: client/helpdata.c:1176
#, 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:1175
+#: client/helpdata.c:1183
#, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr "* Permite que los %s construyan fortalezas.\n"
-#: client/helpdata.c:1183
+#: client/helpdata.c:1191
#, c-format
msgid "* Allows %s to build airbases.\n"
msgstr "* Permite que los %s construyan bases aéreas.\n"
-#: client/helpdata.c:1192
+#: client/helpdata.c:1200
#, 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:1200
+#: client/helpdata.c:1208
#, 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:1234
+#: client/helpdata.c:1242
msgid "* Pollution cannot be generated on this terrain."
msgstr "* No se puede generar polución en este terreno."
-#: client/helpdata.c:1239
+#: client/helpdata.c:1247
msgid "* You cannot build cities on this terrain."
msgstr "* No se pueden construir ciudades en este terreno."
-#: client/helpdata.c:1245
+#: client/helpdata.c:1253
msgid "* The coastline of this terrain is unsafe."
msgstr "* La costa de este terreno no es segura."
-#: client/helpdata.c:1250
+#: client/helpdata.c:1258
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:1255
+#: client/helpdata.c:1263
msgid "* Land units cannot travel on oceanic terrains."
msgstr "* Las unidades terrestres no puede viajar en el océano."
-#: client/helpdata.c:1305
+#: client/helpdata.c:1313
msgid "Features:\n"
msgstr "Características:\n"
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1411 client/helpdata.c:1412
+#: client/helpdata.c:1419 client/helpdata.c:1420
msgid "?outputlist: Nothing "
-msgstr ""
+msgstr "Nada"
-#: client/helpdata.c:1419
-#, fuzzy, c-format
+#: client/helpdata.c:1427
+#, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
"become unhappy.\n"
@@ -8812,13 +8916,13 @@ msgid_plural ""
"* Military units away from home and field units will cause %d citizens to "
"become unhappy.\n"
msgstr[0] ""
-"* Las unidades militares alejadas y las unidades de campo harán que %d "
-"ciudadanos pasen a descontentos.\n"
+"* Las unidades militares alejadas de su ciudad y las unidades de campo harán "
+"que %d ciudadanos pasen a descontentos.\n"
msgstr[1] ""
-"* Las unidades militares alejadas y las unidades de campo harán que %d "
-"ciudadanos pasen a descontentos.\n"
+"* Las unidades militares alejadas de su ciudad y las unidades de campo harán "
+"que %d ciudadanos pasen a descontentos.\n"
-#: client/helpdata.c:1429
+#: client/helpdata.c:1437
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8828,31 +8932,30 @@ msgstr ""
"causado por las unidades.\n"
#. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1437
+#: client/helpdata.c:1445
#, 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:1442
+#: client/helpdata.c:1450
#, 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:1447
-#, fuzzy, c-format
+#: client/helpdata.c:1455
+#, 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"
+msgstr "* No pagas %s del sustento normal de tus unidades.\n"
-#: client/helpdata.c:1451
-#, fuzzy
+#: client/helpdata.c:1459
msgid "* You pay no upkeep for your units.\n"
-msgstr "* Pagas %d veces del sustento normal de tus unidades.\n"
+msgstr "* No pagas el 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:1460
+#: client/helpdata.c:1468
#, c-format
msgid "* Each of your cities will avoid paying %d %s towards unit upkeep.\n"
msgstr ""
@@ -8861,19 +8964,19 @@ msgstr ""
#. TRANS: Amount is subtracted from upkeep cost
#. * for each upkeep type.
-#: client/helpdata.c:1468
+#: client/helpdata.c:1476
#, 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:1475
+#: client/helpdata.c:1483
#, 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:1482
+#: client/helpdata.c:1490
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -8883,7 +8986,7 @@ msgstr ""
"civilización, aparecerá cuando tengas %d ciudades.\n"
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1489
+#: client/helpdata.c:1497
#, c-format
msgid ""
"* After the first unhappy citizen due to city size, for each %d additional "
@@ -8892,18 +8995,18 @@ 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:1497
+#: client/helpdata.c:1505
#, 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:1502
+#: client/helpdata.c:1510
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr "Tienes impuestos ilimitados para Ciencia/Oro/Lujos.\n"
-#: client/helpdata.c:1507
-#, fuzzy, c-format
+#: client/helpdata.c:1515
+#, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
"force %d unhappy citizen to become content.\n"
@@ -8917,8 +9020,8 @@ 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:1519
-#, fuzzy, c-format
+#: client/helpdata.c:1527
+#, 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] ""
@@ -8929,7 +9032,7 @@ msgstr[1] ""
"Marcial.\n"
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1530
+#: client/helpdata.c:1538
#, c-format
msgid ""
"* You may grow your cities by means of celebrations. Your cities must be at "
@@ -8938,15 +9041,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:1536
+#: client/helpdata.c:1544
msgid "* Your units cannot be bribed.\n"
msgstr "* Tus unidades no pueden ser sobornadas.\n"
-#: client/helpdata.c:1539
+#: client/helpdata.c:1547
msgid "* Your cities cannot be incited.\n"
msgstr "* Tus ciudades no pueden ser incitadas.\n"
-#: client/helpdata.c:1543
+#: client/helpdata.c:1551
msgid ""
"* Government will fall into anarchy if any city is in disorder for more than "
"two turns in a row.\n"
@@ -8954,17 +9057,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:1549
+#: client/helpdata.c:1557
msgid "* Has a senate that may prevent declaration of war.\n"
msgstr "* Tiene un Senado que puede prevenir la Guerra.\n"
-#: client/helpdata.c:1553
+#: client/helpdata.c:1561
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:1557
+#: client/helpdata.c:1565
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
@@ -8972,25 +9075,25 @@ msgstr ""
"* Los edificios que normalmente ofrecen primas contra los descontentos, "
"ofrecerán oro en su lugar.\n"
-#: client/helpdata.c:1561
+#: client/helpdata.c:1569
msgid "* Pays no upkeep for fanatics.\n"
msgstr "* No paga nigún sustento para los fanáticos.\n"
-#: client/helpdata.c:1564
+#: client/helpdata.c:1572
msgid "* Has no unhappy citizens.\n"
msgstr "* No tiene ciudadanos descontentos.\n"
-#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
+#: client/helpdata.c:1582 client/helpdata.c:1586 client/helpdata.c:1590
#, c-format
msgid "* Veteran %s units.\n"
msgstr "* Unidades %s veteranas.\n"
-#: client/helpdata.c:1585
+#: client/helpdata.c:1593
msgid "* Veteran units.\n"
msgstr "* Unidades veteranas.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1591
+#: client/helpdata.c:1599
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -9000,84 +9103,83 @@ msgstr ""
"no haya celebraciones.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1600
-#, fuzzy, c-format
+#: client/helpdata.c:1608
+#, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
"celebrating.\n"
msgstr ""
-"* Cada casilla trabajada con al menos 1 %s producirá %d %s adicionales "
-"cuando haya celebraciones.\n"
+"* Cada casilla trabajada con al menos 1 %s producirá %d adicionales cuando "
+"haya celebraciones.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1608
-#, fuzzy, c-format
+#: client/helpdata.c:1616
+#, 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"
+msgstr "* Cada casilla trabajada con al menos 1 %s producirá %d adicionales.\n"
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1617
-#, fuzzy, c-format
+#: client/helpdata.c:1625
+#, c-format
msgid "* %s production is increased %d%%.\n"
-msgstr "* La producción de %s sufrirá un desperdicio masivo.\n"
+msgstr "* La producción de %s será incrementada en %d%%.\n"
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1625
+#: client/helpdata.c:1633
#, 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:1630
+#: client/helpdata.c:1638
#, 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:1635
+#: client/helpdata.c:1643
#, 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:1643
+#: client/helpdata.c:1651
#, 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:1649
+#: client/helpdata.c:1657
#, 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:1655
+#: client/helpdata.c:1663
#, 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:1672
+#: client/helpdata.c:1680
#, c-format
msgid "* Allows you to build %s.\n"
msgstr "* Te permite construir %s.\n"
#. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1699
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d %s"
msgstr "%s%d %s"
-#: client/helpdata.c:1700 client/helpdata.c:1708 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1708 client/helpdata.c:1716 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:1707
+#: client/helpdata.c:1715
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d descontentos"
@@ -9152,7 +9254,7 @@ msgstr ""
"Este es el puerto por defecto del servidor que se usará en los diálogos de "
"conexión o con el parámetro -a de la línea de comandos."
-#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:916 data/Freeciv.in:107
msgid "Metaserver"
msgstr "Metaservidor"
@@ -9193,16 +9295,12 @@ msgstr ""
"lo mismo que usar la opción -P en la línea de comandos."
#: client/options.c:148 client/gui-sdl/gui_main.c:162
-#, fuzzy
msgid "Theme"
-msgstr "Templo"
+msgstr "Tema"
#: client/options.c:149
-#, fuzzy
msgid "By changing this option you change the active theme."
-msgstr ""
-"Cambiando esta opción, cambias el tilesect actual. Esto es lo mismo que usar "
-"el parámetro -t en la línea de comandos."
+msgstr "Cambiando esta opción tu cambias el tema actual."
#: client/options.c:152
msgid "Tileset"
@@ -9441,9 +9539,8 @@ msgstr ""
"ciudad es fundada."
#: client/options.c:250
-#, fuzzy
msgid "Pop up caravan actions"
-msgstr "Acciones de la caravana"
+msgstr "Ventana de acciones de la caravana"
#: client/options.c:251
msgid ""
@@ -9453,11 +9550,16 @@ msgid ""
"to do the action manually by pressing either 'r' (for a traderoute) or "
"'b' (for building a wonder) when the caravan is in the city."
msgstr ""
+"Si esta opción se habilita, aparecerá una ventana para preguntar que acción "
+"realizar cuando las caravanas o convoys lleguen a la ciudad destino donde "
+"pueden establecer una ruta comercial o ayudar a construir una maravilla. "
+"Deshabilitar esta opción significa que tu tendrás que realizar la acción "
+"manualmente presionando 'r' (para una ruta comercial) o 'b' (para contruir "
+"la maravilla) cuando la caravana llegue a la ciudad de destino."
#: client/options.c:260
-#, fuzzy
msgid "Enable cursor changing"
-msgstr "Activar alpha blending (transparencias)"
+msgstr "Activar cambio del cursor"
#: client/options.c:261
msgid ""
@@ -9465,20 +9567,26 @@ msgid ""
"cursor depending on what is being pointed at, as well as to indicate changes "
"in the client or server state."
msgstr ""
+"Esta opción controla si el cliente debe tratar de cambiar el cursor del "
+"ratón en función de lo que se señala, así como para indicar los cambios en "
+"el cliente o el estado del servidor."
#: client/options.c:266
msgid "Select cities before units"
-msgstr ""
+msgstr "Seleccione las ciudades antes de las unidades"
#: client/options.c:267
msgid ""
"If this option is enabled, when both cities and units are present in the "
"selection rectangle, only cities will be selected."
msgstr ""
+"Si esta opción está activada, cuando ambas ciudades y las unidades están "
+"presentes en el rectángulo de selección, las ciudades sólo serán "
+"seleccionadas."
#: client/options.c:272
msgid "Clear unit orders on selection"
-msgstr ""
+msgstr "Elimina las órdenes de las unidades de la selección"
#: client/options.c:273
msgid ""
@@ -9487,6 +9595,11 @@ msgid ""
"not cause them to stop their current activity. Instead, their orders will be "
"cleared only when new orders are given or if you press <space>."
msgstr ""
+"Al habilitar esta opción hará que las órdenes de las unidades se borren "
+"cuando una o más unidades se seleccionen. Si esta opción está desactivada, "
+"la selección de las unidades no hará cesar su actividad actual. En cambio, "
+"sus órdenes seránborradas solamente cuando se den nuevas órdenes o si se "
+"presiona <espacio>."
#: client/options.c:282
msgid "Background layer"
@@ -9561,36 +9674,35 @@ msgstr "Grabaci
msgid "Saved settings to file %s"
msgstr "Se han grabado las preferencias en el fichero %s"
-#: client/packhand.c:211 client/packhand.c:217
-#, fuzzy
+#: client/packhand.c:212 client/packhand.c:218
msgid "You were rejected from the game...."
-msgstr "Te han rechazado en la partida:"
+msgstr "Te han rechazado de la partida...."
-#: client/packhand.c:229
+#: client/packhand.c:230
#, c-format
msgid "Client capability string: %s"
msgstr "Cadena de capacidades del cliente: %s"
-#: client/packhand.c:232
+#: client/packhand.c:233
#, c-format
msgid "Server capability string: %s"
msgstr "Cadena de capacidades del servidor: %s"
-#: client/packhand.c:850
+#: client/packhand.c:864
#, c-format
msgid "Start of turn %d"
msgstr "Comienzo del turno %d"
-#: client/packhand.c:1591
+#: client/packhand.c:1621
#, c-format
msgid "AI Mode is now %s."
msgstr "El control por ordenador ahora está %s."
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "ON"
msgstr "ACTIVO"
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "OFF"
msgstr "INACTIVO"
@@ -9621,15 +9733,15 @@ msgstr "Nombre:"
msgid "Username"
msgstr "Nombre de usuario"
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
-#: client/gui-gtk-2.0/pages.c:2157
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:653
+#: client/gui-gtk-2.0/pages.c:1604 client/gui-gtk-2.0/pages.c:2159
msgid "Flag"
msgstr "Bandera"
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1605
-#: client/gui-gtk-2.0/pages.c:2159 client/gui-sdl/repodlgs.c:2063
-#: client/gui-win32/connectdlg.c:990 client/gui-win32/dialogs.c:542
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:657
+#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1609
+#: client/gui-gtk-2.0/pages.c:2161 client/gui-sdl/repodlgs.c:2063
+#: client/gui-win32/connectdlg.c:992 client/gui-win32/dialogs.c:542
#: client/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "Nación"
@@ -9642,7 +9754,7 @@ msgstr "Frontera"
msgid "Score"
msgstr "Puntuació"
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1614
msgid "Team"
msgstr "Equipo"
@@ -9675,36 +9787,36 @@ msgstr "Inactivo"
msgid "Ping"
msgstr "Ping"
-#: client/repodlgs_common.c:375
+#: client/repodlgs_common.c:378
msgid "You cannot sell improvements."
msgstr "No puedes vender instalaciones urbanas."
-#: client/repodlgs_common.c:391
+#: client/repodlgs_common.c:394
#, c-format
msgid "Sold %d %s for %d gold."
msgstr "Se han vendido %d %s por %d monedas de oro."
-#: client/repodlgs_common.c:396
+#: client/repodlgs_common.c:399
#, c-format
msgid "No %s could be sold."
msgstr "No se han podido vender %s."
#. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:415
+#: client/repodlgs_common.c:418
msgid "You cannot disband units."
msgstr "No puedes desmantelar unidades."
-#: client/repodlgs_common.c:420
+#: client/repodlgs_common.c:423
#, c-format
msgid "%s cannot be disbanded."
msgstr "No se puede desmantelar a %s."
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:444
#, c-format
msgid "Disbanded %d %s."
msgstr "Se han desarticulado %d %s."
-#: client/repodlgs_common.c:445
+#: client/repodlgs_common.c:448
#, c-format
msgid "No %s could be disbanded."
msgstr "No se pudo desmantelar ningún %s."
@@ -9727,13 +9839,13 @@ msgstr "Fallo buscando el metaservidor"
#: client/text.c:94
#, c-format
msgid "AI %s"
-msgstr ""
+msgstr "IA %s"
#. TRANS: "<nation adjective>, team <team name>"
#: client/text.c:118
-#, fuzzy, c-format
+#, c-format
msgid "%s, team %s"
-msgstr ", equipo %s"
+msgstr "%s, equipo %s"
#: client/text.c:135 client/text.c:136 client/text.c:141
#: client/gui-sdl/mapview.c:752
@@ -9792,7 +9904,7 @@ msgstr "Localizaci
#: client/text.c:153
#, c-format
msgid "Native coordinates: (%d, %d)"
-msgstr ""
+msgstr "Coordenadas nativas: (%d, %d)"
#: client/text.c:160
#, c-format
@@ -9809,33 +9921,28 @@ msgid "Minor Tribe Village"
msgstr "Aldea Indígena"
#: client/text.c:173
-#, fuzzy
msgid "Our territory"
-msgstr "Nuestro Territorio"
+msgstr "Nuestro territorio"
#. TRANS: "Territory of <username> (<nation + team>)"
#: client/text.c:176
-#, fuzzy, c-format
+#, c-format
msgid "Territory of %s (%s)"
-msgstr ""
-"\n"
-"Territorio de los %s %s"
+msgstr "Territorio de los %s (%s)"
#: client/text.c:186
-#, fuzzy, c-format
+#, c-format
msgid "Territory of %s (%s) (%d turn cease-fire)"
msgid_plural "Territory of %s (%s) (%d turn cease-fire)"
-msgstr[0] "Ciudad: %s (%s, %d turno de alto el fuego)"
-msgstr[1] "Ciudad: %s (%s, %d turnos de alto el fuego)"
+msgstr[0] "Territorio de %s (%s) (%d turno de alto el fuego)"
+msgstr[1] "Territorio de %s (%s) (%d turnos de alto el fuego)"
#. TRANS: "Territory of <username>
#. * (<nation + team> | <diplomatic state>)"
#: client/text.c:195
-#, fuzzy, c-format
+#, c-format
msgid "Territory of %s (%s | %s)"
-msgstr ""
-"\n"
-"Territorio de los %s %s"
+msgstr "Territorio de %s (%s | %s)"
#: client/text.c:200
msgid "Unclaimed territory"
@@ -9843,29 +9950,29 @@ msgstr "Territorio sin reclamar"
#. TRANS: "City: <city name> | <username> (<nation + team>)"
#: client/text.c:214
-#, fuzzy, c-format
+#, c-format
msgid "City: %s | %s (%s)"
-msgstr "Ciudad: %s (%s, %s)"
+msgstr "Ciudad: %s | %s (%s)"
#. TRANS: "City: <city name> | <username>
#. * (<nation + team>, <number> turn cease-fire)"
#: client/text.c:224
-#, fuzzy, c-format
+#, c-format
msgid "City: %s | %s (%s, %d turn cease-fire)"
msgid_plural "City: %s | %s (%s, %d turn cease-fire)"
-msgstr[0] "Ciudad: %s (%s, %d turno de alto el fuego)"
-msgstr[1] "Ciudad: %s (%s, %d turnos de alto el fuego)"
+msgstr[0] "Ciudad: %s | %s (%s, %d turno de alto el fuego)"
+msgstr[1] "Ciudad: %s | %s (%s, %d turnos de alto el fuego)"
#. TRANS: "City: <city name> | <username>
#. * (<nation + team>, <diplomatic state>)"
#: client/text.c:231
-#, fuzzy, c-format
+#, c-format
msgid "City: %s | %s (%s, %s)"
-msgstr "Ciudad: %s (%s, %s)"
+msgstr "Ciudad: %s | %s, (%s, %s)"
#. TRANS: previous lines gave other information about the city.
#: client/text.c:246
-#, fuzzy, c-format
+#, c-format
msgid "?clistbegin: with %s"
msgstr " con %s"
@@ -9890,24 +9997,24 @@ msgstr "Actividad: %s"
#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
#. * <diplomatic state>)"
#: client/text.c:287 client/text.c:313
-#, fuzzy, c-format
+#, c-format
msgid "Unit: %s | %s (%s, %s)"
-msgstr "Unidad: %s (%s, %s)"
+msgstr "Unidad: %s | %s (%s, %s)"
#. TRANS: "Unit: <unit type> | <username> (<nation + team>)"
#: client/text.c:292
-#, fuzzy, c-format
+#, c-format
msgid "Unit: %s | %s (%s)"
-msgstr "Unidad: %s (%s, %s)"
+msgstr "Unidad: %s | %s (%s)"
#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
#. * <number> turn cease-fire)"
#: client/text.c:305
-#, fuzzy, c-format
+#, c-format
msgid "Unit: %s | %s (%s, %d turn cease-fire)"
msgid_plural "Unit: %s | %s (%s, %d turn cease-fire)"
-msgstr[0] "Unidad: %s (%s, %d turno de alto el fuego)"
-msgstr[1] "Unidad: %s (%s, %d turnos de alto el fuego)"
+msgstr[0] "Unidad: %s | %s (%s, %d turno de alto el fuego)"
+msgstr[1] "Unidad: %s | %s (%s, %d turnos de alto el fuego)"
#. TRANS: "Chance to win: A:95% D:46%"
#: client/text.c:338
@@ -10041,9 +10148,8 @@ msgid "Tax: %d Lux: %d Sci: %d"
msgstr "Imp:%d Lujo:%d Cie:%d"
#: client/text.c:666
-#, fuzzy
msgid "Moving: Nobody"
-msgstr "Moviendo: %s"
+msgstr "Moviendo: Nadie"
#: client/text.c:668
#, c-format
@@ -10112,7 +10218,7 @@ msgstr[1] " %d unidades"
#. TRANS: Impossible to reach goto target tile
#: client/text.c:774 client/gui-sdl/mapview.c:566
msgid "?goto:Unreachable"
-msgstr ""
+msgstr "No alcanzable"
#: client/text.c:776 client/gui-sdl/mapview.c:568
#, c-format
@@ -10133,7 +10239,7 @@ msgstr[1] "%d unidades seleccionadas"
#: client/text.c:789 client/gui-sdl/mapview.c:581
msgid "No units selected."
-msgstr "No hay unidades seleccionadas."
+msgstr "Sin unidades seleccionadas."
#: client/text.c:863 client/gui-sdl/mapview.c:654
#, c-format
@@ -10296,110 +10402,109 @@ msgstr "%02dd %02dh"
msgid "?duration:overflow"
msgstr "desbordamiento"
-#: client/text.c:1143
+#: client/text.c:1145
#, c-format
msgid "%6d.%02d ms"
msgstr "%6d.%02d ms"
#. TRANS: <nation adjective> <government name>.
#. * E.g. "Polish Republic".
-#: client/text.c:1188
-#, fuzzy, c-format
+#: client/text.c:1193
+#, c-format
msgid "?nationgovernment:%s %s"
-msgstr "Gobierno: %s"
+msgstr "%s %s"
#. TRANS: "Observer: 1985"
-#: client/text.c:1198
+#: client/text.c:1203
#, c-format
msgid "Observer: %s"
msgstr "Observador: %s"
-#: client/text.c:1216
+#: client/text.c:1221
msgid "Buildings: "
msgstr "Instalaciones: "
-#: client/text.c:1233 client/text.c:1272
+#: client/text.c:1238 client/text.c:1277
msgid "None. "
msgstr "Ninguna. "
-#: client/text.c:1235 client/text.c:1274
+#: client/text.c:1240 client/text.c:1279
msgid "?clistend:."
msgstr "."
-#: client/text.c:1253
+#: client/text.c:1258
msgid "Wonders: "
msgstr "Maravillas: "
-#: client/text.c:1308
+#: client/text.c:1313
#, 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:1312
-#, fuzzy, c-format
+#: client/text.c:1317
+#, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
-msgstr[0] "%d ciudadanos conformes antes de penalizar con "
-msgstr[1] "%d ciudadanos conformes antes de penalizar con "
+msgstr[0] "%d ciudadano conformes antes de penalizar."
+msgstr[1] "%d ciudadanos conformes antes de penalizar."
#. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1318
-#, fuzzy, c-format
+#: client/text.c:1323
+#, c-format
msgid "%d additional unhappy citizen."
msgid_plural "%d additional unhappy citizens."
-msgstr[0] "%d descontentos adicionales."
+msgstr[0] "%d descontento adicional."
msgstr[1] "%d descontentos adicionales."
-#: client/text.c:1339
-#, fuzzy
+#: client/text.c:1344
msgid "Unlimited martial law in effect."
-msgstr "Ley marcial en vigor ("
+msgstr "Ley marcial ilimitada en vigor."
-#: client/text.c:1341
-#, fuzzy, c-format
+#: client/text.c:1346
+#, c-format
msgid "%d military unit may impose martial law."
msgid_plural "Up to %d military units may impose martial law."
-msgstr[0] "* Es una unidad no militar (no ataca y no provoca ley marcial).\n"
-msgstr[1] "* Es una unidad no militar (no ataca y no provoca ley marcial).\n"
+msgstr[0] "%d unidad militar puede imponer la ley marcial."
+msgstr[1] "Hasta %d unidades militares pueden imponer la ley marcial."
-#: client/text.c:1345
-#, fuzzy, c-format
+#: client/text.c:1350
+#, c-format
msgid "Each military unit makes %d unhappy citizen content."
msgid_plural "Each military unit makes %d unhappy citizens content."
msgstr[0] ""
-"Proporciona diversión a los ciudadanos de una ciudad, transformando 3 "
-"ciudadanos descontentos a conformes."
+"Cada unidad militar provoca que %d ciudadano descontento se transforme en "
+"conforme."
msgstr[1] ""
-"Proporciona diversión a los ciudadanos de una ciudad, transformando 3 "
-"ciudadanos descontentos a conformes."
+"Cada unidad militar provoca que %d ciudadanos descontentos se transformen en "
+"conformes."
-#: client/text.c:1352
+#: client/text.c:1357
msgid "Military units in the field may cause unhappiness. "
msgstr "Las unidades militares en los alrededores pueden causar descontento. "
-#: client/text.c:1355
+#: client/text.c:1360
msgid "Military units have no happiness effect. "
msgstr "Las unidades militares no influyen en el descontento. "
-#: client/text.c:1370
+#: client/text.c:1375
#, c-format
msgid "Luxury: %d total."
msgstr "Lujo: %d en total."
-#: client/tilespec.c:865
+#: client/tilespec.c:882
msgid "No usable default tileset found, aborting!"
msgstr ""
"No encuentro un aspecto (tileset) por defecto que pueda usar, ¡cancelando!"
-#: client/tilespec.c:1338
+#: client/tilespec.c:1355
msgid ""
"Client does not support isometric tilesets. Using default tileset instead."
msgstr ""
"El cliente no soporta el aspecto (tileset) isométrico. Se usará el aspecto "
"por defecto."
-#: client/tilespec.c:1347
+#: client/tilespec.c:1364
msgid ""
"Client does not support overhead view tilesets. Using default tileset "
"instead."
@@ -10407,14 +10512,14 @@ msgstr ""
"El cliente no soporta el aspecto (tileset) de vista superior. Se usará el "
"aspecto por defecto."
-#: client/tilespec.c:3966
-#, fuzzy, c-format
+#: client/tilespec.c:3987
+#, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
"Report this bug at %s"
msgstr ""
"Caminos más largos de 99 no están soportados.\n"
-"Informa de este error a %s."
+"Informa de este error a %s"
#: client/agents/cma_core.c:400
#, c-format
@@ -10422,8 +10527,8 @@ msgid ""
"The citizen governor can't fulfill the requirements for %s. Passing back "
"control."
msgstr ""
-"CMA: No se pueden cumplir los requisitos para %s, así que te devuelve el "
-"control."
+"Gobernador: No se pueden cumplir los requisitos para %s, así que te devuelve "
+"el control."
#: client/agents/cma_core.c:409 client/agents/cma_core.c:429
#, c-format
@@ -10696,15 +10801,13 @@ 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"
+msgstr "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"
+msgstr "El Espía está esperando órdenes"
#: client/gui-gtk-2.0/diplomat_dialog.c:696 client/gui-win32/dialogs.c:1663
msgid "_Bribe Enemy Unit"
@@ -10832,9 +10935,8 @@ msgid "_Buy"
msgstr "_Comprar"
#: client/gui-gtk-2.0/citydlg.c:898 client/gui-gtk-2.0/cityrep.c:869
-#, fuzzy
msgid "_Production"
-msgstr "Pro_ducción"
+msgstr "_Producción"
#: client/gui-gtk-2.0/citydlg.c:949
msgid "_Happiness"
@@ -11041,9 +11143,8 @@ 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:794
-#, fuzzy
msgid "(no worklists defined)"
-msgstr "(lista de tareas)"
+msgstr "(no hay lista de tareas)"
#: client/gui-gtk-2.0/cityrep.c:876
msgid "Chan_ge"
@@ -11051,52 +11152,46 @@ msgstr "Cam_biar"
#: client/gui-gtk-2.0/cityrep.c:880
msgid "Add _First"
-msgstr "Añadir Primero(_F)"
+msgstr "Añadir _Primero"
#: client/gui-gtk-2.0/cityrep.c:884
msgid "Add _Next"
-msgstr "Añadir Siguiente(_N)"
+msgstr "Añadir Siguie_nte"
#: client/gui-gtk-2.0/cityrep.c:888
-#, fuzzy
msgid "Add _2nd Last"
-msgstr "Añadir Ultimo(_L)"
+msgstr "Añadir _2º Último"
#: client/gui-gtk-2.0/cityrep.c:892
msgid "Add _Last"
-msgstr "Añadir Ultimo(_L)"
+msgstr "Añadir Ú_ltimo"
#: client/gui-gtk-2.0/cityrep.c:899
-#, fuzzy
msgid "Set Worklist"
-msgstr "Lista de tareas"
+msgstr "Definir la Lista de tareas"
#: client/gui-gtk-2.0/cityrep.c:905
-#, fuzzy
msgid "Append Worklist"
-msgstr "Renombrar la lista de tareas"
+msgstr "Añadir la lista de tareas"
#: client/gui-gtk-2.0/cityrep.c:911
-#, fuzzy
msgid "Clear _Worklist"
-msgstr "Tareas _resultantes:"
+msgstr "Borrar Lista de _tareas"
#: client/gui-gtk-2.0/cityrep.c:916
-#, fuzzy
msgid "Gover_nor"
-msgstr "Governador"
+msgstr "Gobernador"
#: client/gui-gtk-2.0/cityrep.c:921
msgid "_Select"
msgstr "_Seleccionar"
#: client/gui-gtk-2.0/cityrep.c:925 client/gui-gtk-2.0/plrdlg.c:521
-#, fuzzy
msgid "_Display"
msgstr "_Mostrar"
#: client/gui-gtk-2.0/cityrep.c:1006 client/gui-gtk-2.0/menu.c:839
-#: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
+#: client/gui-sdl/diplodlg.c:692 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
#: client/gui-xaw/cityrep.c:533 client/gui-xaw/menu.c:156
@@ -11106,9 +11201,8 @@ msgid "Cities"
msgstr "Ciudades"
#: client/gui-gtk-2.0/cityrep.c:1023
-#, fuzzy
msgid "_Inspect"
-msgstr "_Ventana"
+msgstr "_Abrir"
#: client/gui-gtk-2.0/cityrep.c:1439 client/gui-gtk-2.0/cityrep.c:1458
#: client/gui-gtk-2.0/cityrep.c:1477 client/gui-gtk-2.0/cityrep.c:1496
@@ -11200,9 +11294,9 @@ msgid "Available Wonders"
msgstr "Maravillas disponibles"
#: client/gui-gtk-2.0/cityrep.c:1882
-#, fuzzy, c-format
+#, c-format
msgid "Total Buy Cost: %d"
-msgstr "Costes totales: "
+msgstr "Costes totales: %d"
#: client/gui-gtk-2.0/cma_fe.c:253 client/gui-xaw/cma_fe.c:78
msgid ""
@@ -11268,198 +11362,192 @@ msgstr "
msgid "Remove this preset?"
msgstr "¿Quieres borrar esta configuración?"
-#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:222
-#, fuzzy
+#: client/gui-gtk-2.0/dialogs.c:197 client/gui-gtk-2.0/messagewin.c:222
msgid "Goto _Location"
-msgstr "Ir a _lugar"
+msgstr "Ir a _Lugar"
-#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
-#, fuzzy
+#: client/gui-gtk-2.0/dialogs.c:202 client/gui-gtk-2.0/messagewin.c:226
msgid "Inspect _City"
-msgstr "Ventana de _ciudad"
+msgstr "Abrir _ciudad"
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:258 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:258 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:259 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:311 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:312 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:312 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:313 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:506
+#: client/gui-gtk-2.0/dialogs.c:507
msgid "Unit"
msgstr "Unidad"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:950
-#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2155
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:985
+#: client/gui-gtk-2.0/dialogs.c:508 client/gui-gtk-2.0/pages.c:950
+#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2157
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:987
#: 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:519 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:520 client/gui-sdl/dialogs.c:627
msgid "Unit selection"
msgstr "Selección de Unidad"
-#: client/gui-gtk-2.0/dialogs.c:582
+#: client/gui-gtk-2.0/dialogs.c:583
msgid "_Ready all"
msgstr "_Activar todas"
-#: client/gui-gtk-2.0/dialogs.c:590
+#: client/gui-gtk-2.0/dialogs.c:591
msgid "_Sentry idle"
msgstr "_Vigilancia"
-#: client/gui-gtk-2.0/dialogs.c:719
-#, fuzzy
+#: client/gui-gtk-2.0/dialogs.c:721
msgid "Nation _Groups:"
-msgstr "_Naciones:"
+msgstr "Grupos de _Naciones:"
-#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:766 data/Freeciv.in:3128
msgid "What Nation Will You Be?"
msgstr "¿Qué nación quieres ser?"
-#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
-#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
+#: client/gui-gtk-2.0/dialogs.c:768 client/gui-sdl/chatline.c:842
+#: client/gui-win32/connectdlg.c:1040 data/Freeciv.in:3371
msgid "Pick Nation"
msgstr "Elegir Nación"
-#: client/gui-gtk-2.0/dialogs.c:774
-#, fuzzy
+#: client/gui-gtk-2.0/dialogs.c:776
msgid "_Random Nation"
-msgstr "Nación al azar"
+msgstr "Nación al aza_r"
-#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:792 client/gui-win32/dialogs.c:517
msgid "Select a nation"
msgstr "Elige tu nación"
-#: client/gui-gtk-2.0/dialogs.c:804
+#: client/gui-gtk-2.0/dialogs.c:810
msgid "_Properties"
msgstr "_Propiedades"
-#: client/gui-gtk-2.0/dialogs.c:824
+#: client/gui-gtk-2.0/dialogs.c:830
msgid "_Leader:"
msgstr "_Líder:"
-#: client/gui-gtk-2.0/dialogs.c:831
+#: client/gui-gtk-2.0/dialogs.c:837
msgid "_Female"
msgstr "_Hembra"
-#: client/gui-gtk-2.0/dialogs.c:836
+#: client/gui-gtk-2.0/dialogs.c:842
msgid "_Male"
msgstr "_Varón"
-#: client/gui-gtk-2.0/dialogs.c:863
-#, fuzzy
+#: client/gui-gtk-2.0/dialogs.c:869
msgid "City _Styles:"
-msgstr "Estilo de las _ciudades:"
+msgstr "Estilo de las ciudade_s:"
-#: client/gui-gtk-2.0/dialogs.c:902
-#, fuzzy
+#: client/gui-gtk-2.0/dialogs.c:908
msgid "_Description"
-msgstr "L_eyenda"
+msgstr "Leyen_da"
-#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1263 client/gui-xaw/dialogs.c:1480
msgid "You must select your sex."
msgstr "Debes elegir tu sexo."
-#: client/gui-gtk-2.0/dialogs.c:1253 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1268 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:1262 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1277 client/gui-sdl/dialogs.c:2204
#: 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:1306 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1318 client/gui-win32/citydlg.c:1454
#: data/Freeciv.in:2484
msgid "Upgrade Unit!"
msgstr "¡Mejorar la unidad!"
-#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1327 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 "Actualizar unidades obsoletas"
-#: client/gui-gtk-2.0/diplodlg.c:231 client/gui-win32/diplodlg.c:151
+#: client/gui-gtk-2.0/diplodlg.c:222 client/gui-win32/diplodlg.c:151
#: client/gui-xaw/diplodlg.c:383 client/gui-xaw/diplodlg.c:401
msgid "World-map"
msgstr "Mapamundi"
-#: client/gui-gtk-2.0/diplodlg.c:237 client/gui-win32/diplodlg.c:146
+#: client/gui-gtk-2.0/diplodlg.c:228 client/gui-win32/diplodlg.c:146
#: client/gui-xaw/diplodlg.c:387 client/gui-xaw/diplodlg.c:405
msgid "Sea-map"
msgstr "Mapa marítimo"
-#: client/gui-gtk-2.0/diplodlg.c:243
+#: client/gui-gtk-2.0/diplodlg.c:234
msgid "_Maps"
msgstr "_Mapas"
-#: client/gui-gtk-2.0/diplodlg.c:274
+#: client/gui-gtk-2.0/diplodlg.c:265
msgid "_Advances"
msgstr "_Avances"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/diplodlg.c:315 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "_Ciudades"
-#: client/gui-gtk-2.0/diplodlg.c:333
+#: client/gui-gtk-2.0/diplodlg.c:324
msgid "_Give shared vision"
msgstr "Dar _visión compartida"
-#: client/gui-gtk-2.0/diplodlg.c:346
+#: client/gui-gtk-2.0/diplodlg.c:337
msgid "Give _embassy"
msgstr "Dar _embajada"
-#: client/gui-gtk-2.0/diplodlg.c:376
+#: client/gui-gtk-2.0/diplodlg.c:368
msgid "_Pacts"
msgstr "_Pactos"
-#: client/gui-gtk-2.0/diplodlg.c:466
+#: client/gui-gtk-2.0/diplodlg.c:458
#, c-format
msgid "Diplomacy: %s"
msgstr "Diplomacia: %s"
-#: client/gui-gtk-2.0/diplodlg.c:473
+#: client/gui-gtk-2.0/diplodlg.c:465
msgid "_Cancel meeting"
msgstr "_Cancelar cumbre"
-#: client/gui-gtk-2.0/diplodlg.c:475
+#: client/gui-gtk-2.0/diplodlg.c:467
msgid "Accept _treaty"
msgstr "Aceptar _pacto"
-#: client/gui-gtk-2.0/diplodlg.c:503
+#: client/gui-gtk-2.0/diplodlg.c:495
msgid "C_lauses:"
msgstr "C_láusulas:"
-#: client/gui-gtk-2.0/diplodlg.c:568 client/gui-gtk-2.0/diplodlg.c:642
+#: client/gui-gtk-2.0/diplodlg.c:560 client/gui-gtk-2.0/diplodlg.c:634
msgid "_Gold:"
msgstr "_Oro:"
-#: client/gui-gtk-2.0/diplodlg.c:580 client/gui-gtk-2.0/diplodlg.c:654
+#: client/gui-gtk-2.0/diplodlg.c:572 client/gui-gtk-2.0/diplodlg.c:646
msgid "_Add Clause..."
msgstr "_Añadir Cláusula..."
-#: client/gui-gtk-2.0/diplodlg.c:699
+#: client/gui-gtk-2.0/diplodlg.c:691
msgid "--- This treaty is blank. Please add some clauses. ---"
msgstr "--- Este pacto está vacío. Por favor, añade algunas cláusulas. ---"
-#: client/gui-gtk-2.0/diplodlg.c:905 client/gui-sdl/diplodlg.c:375
+#: client/gui-gtk-2.0/diplodlg.c:897 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 "Se ha especificado una cantidad inválida de oro."
@@ -11518,20 +11606,20 @@ msgstr "Elegir destino"
msgid "Show _All Cities"
msgstr "_Todas las ciudades"
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:164
msgid "Show Map Scrollbars"
msgstr "Mostrar barras de desplazamiento en el mapa"
-#: client/gui-gtk-2.0/gui_main.c:163
+#: client/gui-gtk-2.0/gui_main.c:165
msgid "Disable this option to hide the scrollbars on the map view."
msgstr ""
"Desactiva esta opción para ocultar las barras laterales en la vista del mapa."
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:169
msgid "Keyboardless goto"
msgstr "Goto sin el teclado"
-#: client/gui-gtk-2.0/gui_main.c:168
+#: client/gui-gtk-2.0/gui_main.c:170
msgid ""
"If this option is set then a goto may be initiated by left-clicking and then "
"holding down the mouse button while dragging the mouse onto a different tile."
@@ -11540,11 +11628,11 @@ msgstr ""
"click (botón izquierdo del ratón) y manteniendo el botón presionado mientras "
"se arrastra la unidad a otra casilla."
-#: client/gui-gtk-2.0/gui_main.c:173
+#: client/gui-gtk-2.0/gui_main.c:175
msgid "Keep dialogs on top"
msgstr "Mantener los diálogos en primer plano"
-#: client/gui-gtk-2.0/gui_main.c:174
+#: client/gui-gtk-2.0/gui_main.c:176
msgid ""
"If this option is set then dialog windows will always remain in front of the "
"main Freeciv window. Disabling this has no effect in fullscreen mode."
@@ -11553,11 +11641,11 @@ msgstr ""
"la ventana principal de Freeciv. Desactivándola, no tiene efecto a pantalla "
"completa."
-#: client/gui-gtk-2.0/gui_main.c:178
+#: client/gui-gtk-2.0/gui_main.c:180
msgid "Show worklist task icons"
msgstr "Mostrar los iconos de tareas de la lista de tareas"
-#: client/gui-gtk-2.0/gui_main.c:179
+#: client/gui-gtk-2.0/gui_main.c:181
msgid ""
"Disabling this will turn off the unit and building icons in the worklist "
"dialog and the production tab of the city dialog."
@@ -11565,11 +11653,11 @@ msgstr ""
"Desactivando esto, se desactivarán los iconos de unidades y edificios de la "
"lista de tareas y de la pestaña de producción en el diálogo de la ciudad."
-#: client/gui-gtk-2.0/gui_main.c:183
+#: client/gui-gtk-2.0/gui_main.c:185
msgid "Enable status report tabs"
msgstr "Habilita informe de estado en lengüetas"
-#: client/gui-gtk-2.0/gui_main.c:184
+#: client/gui-gtk-2.0/gui_main.c:186
msgid ""
"If this option is enabled then report dialogs will be shown as separate tabs "
"rather than in popup dialogs."
@@ -11577,11 +11665,11 @@ msgstr ""
"Si esta opción está activada, los diálogos de mensajes se mostrarán en "
"pestañas separadas en lugar de mostrar una ventana emergente."
-#: client/gui-gtk-2.0/gui_main.c:189 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:191 client/gui-win32/gui_main.c:110
msgid "Better fog-of-war drawing"
msgstr "Dibujo de la neblina de la guerra mejor"
-#: client/gui-gtk-2.0/gui_main.c:190 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:192 client/gui-win32/gui_main.c:111
msgid ""
"If this is enabled then a better method is used for drawing fog-of-war. It "
"is not any slower but will consume about twice as much memory."
@@ -11589,41 +11677,48 @@ msgstr ""
"Si esto está activado, se utilizará un método mejorado para dibujar la "
"niebla en la guerra. No es más lento, pero consume casi el doble de memoria."
-#: client/gui-gtk-2.0/gui_main.c:195
+#: client/gui-gtk-2.0/gui_main.c:197
msgid "Show time for each chat message"
-msgstr ""
+msgstr "Muestra tiempo para cada mensaje de chat"
-#: client/gui-gtk-2.0/gui_main.c:196
+#: client/gui-gtk-2.0/gui_main.c:198
msgid ""
"If this option is enabled then all chat messages will be prefixed by a time "
"string of the form [hour:minute:second]."
msgstr ""
+"Si esta opción está activada, todos los mensajes de chat serán precedidos "
+"por una cadena de hora con el formato [hora:minuto:segundo]."
-#: client/gui-gtk-2.0/gui_main.c:201
+#: client/gui-gtk-2.0/gui_main.c:203
msgid "Split bottom notebook area"
-msgstr ""
+msgstr "Dividir zona inferior de notificaciones"
-#: client/gui-gtk-2.0/gui_main.c:202
+#: client/gui-gtk-2.0/gui_main.c:204
msgid ""
"Enabling this option will split the bottom notebook into a left and right "
"notebook so that two tabs may be viewed at once."
msgstr ""
+"Al habilitar esta opción se dividirá la zona inferior de notificaciones en "
+"dos y se podrán visualizar las fichas de Charla y Mensajes a la vez."
-#: client/gui-gtk-2.0/gui_main.c:207
+#: client/gui-gtk-2.0/gui_main.c:209
msgid "New message events go to top of list"
-msgstr ""
+msgstr "Los nuevos mensajes aparecen a la parte de arriba de la lista"
-#: client/gui-gtk-2.0/gui_main.c:208
+#: client/gui-gtk-2.0/gui_main.c:210
msgid ""
"If this option is enabled, new events in the message window will appear at "
"the top of the list, rather than being appended at the bottom."
msgstr ""
+"Si se habilita esta opción, los nuevos eventos en la ventana de mensaje "
+"aparecerán en la parte superior de la lista, en lugar de ser anexados en la "
+"parte inferior."
-#: client/gui-gtk-2.0/gui_main.c:213
+#: client/gui-gtk-2.0/gui_main.c:215
msgid "Show extra message window buttons"
-msgstr ""
+msgstr "Mostrar botones adicionales en la ventana de mensajes"
-#: client/gui-gtk-2.0/gui_main.c:214
+#: client/gui-gtk-2.0/gui_main.c:216
msgid ""
"If this option is enabled, there will be two buttons displayed in the "
"message window for inspecting a city and going to a location. If this option "
@@ -11632,23 +11727,31 @@ msgid ""
"respectively). This option will only take effect once the message window is "
"closed and reopened."
msgstr ""
+"Si se habilita esta opción, habrá dos botones que se muestran en laventana "
+"de mensajes para la inspección de una ciudad e ir a un lugar. Si esta opción "
+"está desactivada, estos botones no aparecen (todavía puede hacer doble clic "
+"con el botón izquierdo del ratón o haga clic derecho en una fila para "
+"inspeccionar o 'ir a' respectivamente). Esta opción sólo tendrá efecto una "
+"vez que la ventana de mensajes sea cerrada y reabierta."
-#: client/gui-gtk-2.0/gui_main.c:224
-#, fuzzy
+#: client/gui-gtk-2.0/gui_main.c:226
msgid "Metaserver tab first in network page"
-msgstr "Se ha establecido la cadena de información del metaservidor a '%s'."
+msgstr "La ficha de 'metaserver' primera página de la red"
-#: client/gui-gtk-2.0/gui_main.c:225
+#: client/gui-gtk-2.0/gui_main.c:227
msgid ""
"If this option is enabled, the metaserver tab will be the first notebook tab "
"in the network page. This option requires a restart in order to take effect."
msgstr ""
+"Si se habilita esta opción, la ficha 'metaserver' será la primera "
+"seleccionada en la página de la red. Esta opción requiere reiniciar el "
+"programa a fin de tener efecto."
-#: client/gui-gtk-2.0/gui_main.c:230
+#: client/gui-gtk-2.0/gui_main.c:232
msgid "Plain chat messages are sent to allies only"
-msgstr ""
+msgstr "Mensajes de chat sin formato se envían sólo a los aliados"
-#: client/gui-gtk-2.0/gui_main.c:231
+#: client/gui-gtk-2.0/gui_main.c:233
msgid ""
"If this option is enabled, then plain messages typed into the chat entry "
"while the game is running will only be sent to your allies. Otherwise plain "
@@ -11657,29 +11760,57 @@ msgid ""
"option can also be set using a toggle button beside the chat entry (only "
"visible in multiplayer games)."
msgstr ""
+"Si se habilita esta opción, los mensajes de texto escritos en la entrada de "
+"mensajes de chat mientras el juego se ejecuta sólo se enviará a sus aliados. "
+"De lo contrario, los mensajes se envían como mensajes de chat públicos. Para "
+"enviar un mensaje de chat público con esta opción activada, ponga el prefijo "
+"':' antes del mensaje. Esta opción también se puede cambiar mediante un "
+"botón de alternar al lado de la charla de entrada (sólo visible en juegos "
+"multijugador)."
+
+#: client/gui-gtk-2.0/gui_main.c:245
+msgid "Arrange widgets for small displays"
+msgstr "Disponer widgets para pantallas pequeñas"
+
+#: client/gui-gtk-2.0/gui_main.c:246
+msgid ""
+"If this option is enabled, widgets in the main window will be arrange so "
+"that they take up the least amount of total screen space. Specifically, the "
+"left panel containing the overview, player status, and the unit information "
+"box will be extended over the entire left side of the window. This option "
+"requires a restart in order to take effect."
+msgstr ""
+"Si se habilita esta opción, los widgets en la ventana principal será "
+"organizados de manera que ocupen la menor cantidad de espacio en la pantalla "
+"total. En concreto, el panel de la izquierda que contiene el minimapa, el "
+"estado del jugador, y el cuadro de información de unidades se extenderá "
+"durante todo el lado izquierdo de la ventana. Esta opción requiere un "
+"reinicio para tener efecto."
-#: client/gui-gtk-2.0/gui_main.c:340 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:352 client/gui-xaw/gui_main.c:245
msgid ""
"This client has no special command line options\n"
"\n"
msgstr ""
+"Este cliente no tiene opciones especiales de comandos de linea\n"
+"\n"
-#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
+#: client/gui-gtk-2.0/gui_main.c:847 client/gui-gtk-2.0/gui_main.c:1542
msgid "Freeciv"
msgstr "Freeciv"
-#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
+#: client/gui-gtk-2.0/gui_main.c:1251 client/gui-gtk-2.0/gui_main.c:1258
#: client/gui-sdl/mapctrl.c:1566 client/gui-win32/gui_main.c:482
#: data/Freeciv.in:2618
msgid "Turn Done"
msgstr "Fin del turno"
-#: client/gui-gtk-2.0/gui_main.c:1232 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1258 client/gui-sdl/mapctrl.c:1566
#: client/gui-sdl/mapview.c:1082
msgid "Shift+Return"
msgstr "Mayúsculas+Intro"
-#: client/gui-gtk-2.0/gui_main.c:1266 client/gui-gtk-2.0/menu.c:797
+#: client/gui-gtk-2.0/gui_main.c:1299 client/gui-gtk-2.0/menu.c:797
#: client/gui-gtk-2.0/menu.c:799 client/gui-gtk-2.0/menu.c:801
#: client/gui-gtk-2.0/menu.c:803 client/gui-gtk-2.0/menu.c:805
#: client/gui-gtk-2.0/menu.c:807 client/gui-gtk-2.0/menu.c:809
@@ -11698,11 +11829,11 @@ msgstr "May
msgid "View"
msgstr "Ver"
-#: client/gui-gtk-2.0/gui_main.c:1359
+#: client/gui-gtk-2.0/gui_main.c:1393
msgid "Chat"
msgstr "Charla"
-#: client/gui-gtk-2.0/gui_main.c:1377 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1411 client/gui-win32/gui_main.c:538
#: data/Freeciv.in:2809
msgid ""
"Freeciv is free software and you are welcome to distribute copies of it\n"
@@ -11713,79 +11844,77 @@ msgstr ""
"bajo ciertas condiciones; mira el tema \"Copiar\" en el menú de Ayuda.\n"
"Y ahora... ¡a por ellos!"
-#: client/gui-gtk-2.0/gui_main.c:1392
+#: client/gui-gtk-2.0/gui_main.c:1426
msgid "Allies Only"
-msgstr ""
+msgstr "Sólo aliados"
-#: client/gui-gtk-2.0/gui_main.c:1657
+#: client/gui-gtk-2.0/gui_main.c:1691
msgid "Not _ready"
msgstr "No _preparado"
-#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
+#: client/gui-gtk-2.0/gui_main.c:1702 client/gui-gtk-2.0/pages.c:1679
msgid "_Ready"
msgstr "_Listo"
-#: client/gui-gtk-2.0/gui_main.c:1672 client/gui-gtk-2.0/gui_main.c:1678
-#: client/gui-gtk-2.0/pages.c:2204
+#: client/gui-gtk-2.0/gui_main.c:1706 client/gui-gtk-2.0/gui_main.c:1712
+#: client/gui-gtk-2.0/pages.c:2206
msgid "_Start"
msgstr "_Comenzar"
-#: client/gui-gtk-2.0/gui_main.c:1686
-#, fuzzy
+#: client/gui-gtk-2.0/gui_main.c:1720
msgid "_Take Player"
-msgstr "Elegir este jugador"
+msgstr "Con_trolar este jugador"
-#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
+#: client/gui-gtk-2.0/gui_main.c:1723 client/gui-gtk-2.0/pages.c:1669
msgid "Pick _Nation"
msgstr "Elegir _Nación"
-#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
+#: client/gui-gtk-2.0/gui_main.c:1730 client/gui-gtk-2.0/pages.c:1674
msgid "_Observe"
msgstr "_Observar"
-#: client/gui-gtk-2.0/gui_main.c:1698
-#, fuzzy
+#: client/gui-gtk-2.0/gui_main.c:1732
msgid "Do not _observe"
msgstr "No _observar"
-#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1755 client/gui-xaw/pages.c:211
msgid "<AI>"
msgstr "<Ordenador>"
-#: client/gui-gtk-2.0/gui_main.c:1723
+#: client/gui-gtk-2.0/gui_main.c:1758
msgid "<Novice AI>"
msgstr "<Ordenador principiante>"
-#: client/gui-gtk-2.0/gui_main.c:1726
+#: client/gui-gtk-2.0/gui_main.c:1761
msgid "<Easy AI>"
msgstr "<Ordenador fácil>"
-#: client/gui-gtk-2.0/gui_main.c:1729
+#: client/gui-gtk-2.0/gui_main.c:1764
msgid "<Normal AI>"
msgstr "<Ordenador normal>"
-#: client/gui-gtk-2.0/gui_main.c:1732
+#: client/gui-gtk-2.0/gui_main.c:1767
msgid "<Hard AI>"
msgstr "<Ordenador difícil>"
-#: client/gui-gtk-2.0/gui_main.c:1742 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1777 client/gui-win32/dialogs.c:594
#: client/gui-xaw/pages.c:217
msgid "Random"
msgstr "Aleatorio"
-#: client/gui-gtk-2.0/gui_main.c:1808
+#: client/gui-gtk-2.0/gui_main.c:1844 client/gui-gtk-2.0/gui_main.c:1858
msgid "Observer"
msgstr "Observador"
-#: client/gui-gtk-2.0/gui_main.c:1808
+#: client/gui-gtk-2.0/gui_main.c:1858
msgid "Detached"
msgstr "Separado"
-#: client/gui-gtk-2.0/gui_main.c:2073
+#: client/gui-gtk-2.0/gui_main.c:2117
msgid "Are you sure you want to quit?"
msgstr "Seguro que quiere salir?"
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
#, c-format
msgid ""
"Close Tab:\n"
@@ -11794,7 +11923,7 @@ msgstr ""
"Cierra Len:\n"
"%s"
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
msgid "Ctrl+W"
msgstr "Ctrl+W"
@@ -11899,8 +12028,8 @@ msgid "Trans. Rslt/Time:"
msgstr "Transf Res/Tmpo:"
#: 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
-#: client/gui-win32/helpdlg.c:709 client/gui-win32/helpdlg.c:733
+#: client/gui-win32/helpdlg.c:502 client/gui-win32/helpdlg.c:550
+#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:739
#: client/gui-xaw/helpdlg.c:759 client/gui-xaw/helpdlg.c:808
#: client/gui-xaw/helpdlg.c:816 client/gui-xaw/helpdlg.c:853
#: client/gui-xaw/helpdlg.c:878
@@ -11947,34 +12076,34 @@ msgstr "con"
msgid "?techhelp:"
msgstr "?techhelp:"
-#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:591
+#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:597
#: client/gui-xaw/helpdlg.c:996
#, c-format
msgid "+%d Trade / %d"
msgstr "+%d Comercio / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:595
+#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:601
#: client/gui-xaw/helpdlg.c:1000
#, c-format
msgid "no extra / %d"
msgstr "nada / %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
-#: client/gui-win32/helpdlg.c:602 client/gui-win32/helpdlg.c:616
-#: client/gui-win32/helpdlg.c:635 client/gui-xaw/helpdlg.c:1002
+#: client/gui-gtk-2.0/helpdlg.c:1085 client/gui-win32/helpdlg.c:604
+#: client/gui-win32/helpdlg.c:608 client/gui-win32/helpdlg.c:622
+#: client/gui-win32/helpdlg.c:641 client/gui-xaw/helpdlg.c:1002
#: client/gui-xaw/helpdlg.c:1006 client/gui-xaw/helpdlg.c:1020
#: client/gui-xaw/helpdlg.c:1039
msgid "n/a"
msgstr "---"
-#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:605
+#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:611
#: client/gui-xaw/helpdlg.c:1009
#, c-format
msgid "+%d Food / %d"
msgstr "+%d Alimento / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:619
+#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:625
#: client/gui-xaw/helpdlg.c:1023
#, c-format
msgid "+%d Res. / %d"
@@ -11990,7 +12119,7 @@ msgstr "Gobierno:"
#: client/gui-gtk-2.0/inteldlg.c:43
msgid "Capital:"
-msgstr "Captial:"
+msgstr "Capital:"
#: client/gui-gtk-2.0/inteldlg.c:46
msgid "Tax:"
@@ -12066,9 +12195,8 @@ msgid "_Clear Log"
msgstr "_Borrar registro"
#: client/gui-gtk-2.0/menu.c:735 client/gui-win32/menu.c:313
-#, fuzzy
msgid "_Write Log"
-msgstr "E_xportar registro"
+msgstr "_Escribir registro"
#: client/gui-gtk-2.0/menu.c:737 client/gui-win32/menu.c:304
msgid "Local _Options"
@@ -12178,14 +12306,12 @@ msgid "City _Productions"
msgstr "_Producciones de las ciudades"
#: client/gui-gtk-2.0/menu.c:811
-#, fuzzy
msgid "City Buy Cost"
-msgstr "Costes totales: "
+msgstr "Coste de compra"
#: client/gui-gtk-2.0/menu.c:813
-#, fuzzy
msgid "City Traderoutes"
-msgstr "Rutas comerciales : "
+msgstr "Rutas comerciales"
#: client/gui-gtk-2.0/menu.c:815 client/gui-sdl/optiondlg.c:1719
msgid "Draw city worker map grid"
@@ -12416,25 +12542,24 @@ msgid "Select"
msgstr "Seleccionar"
#: client/gui-gtk-2.0/menu.c:934
-#, fuzzy
msgid "Single"
-msgstr "Jungla"
+msgstr "Solo"
#: client/gui-gtk-2.0/menu.c:936
msgid "Same Type On Tile"
-msgstr ""
+msgstr "Mismo Tipo en Casilla"
#: client/gui-gtk-2.0/menu.c:938
msgid "All On Tile"
-msgstr ""
+msgstr "Todos en Casilla"
#: client/gui-gtk-2.0/menu.c:940
msgid "Same Type On Continent"
-msgstr ""
+msgstr "Mismo Tipo en Continente"
#: client/gui-gtk-2.0/menu.c:942
msgid "Same Type Everywhere"
-msgstr ""
+msgstr "Mismo Tipo en el Mundo"
#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:393
msgid "_Wait"
@@ -12466,7 +12591,6 @@ msgstr "_Unidades"
#. TRANS: Nations report action
#: client/gui-gtk-2.0/menu.c:957 client/gui-win32/menu.c:402
-#, fuzzy
msgid "_Nations"
msgstr "_Naciones"
@@ -12476,7 +12600,6 @@ msgstr "_Econom
#. TRANS: Research report action
#: client/gui-gtk-2.0/menu.c:963 client/gui-win32/menu.c:405
-#, fuzzy
msgid "_Research"
msgstr "_Investigar"
@@ -12681,19 +12804,16 @@ msgid "_Meet"
msgstr "_Cumbre"
#: client/gui-gtk-2.0/plrdlg.c:323
-#, fuzzy
msgid "Cancel _Treaty"
-msgstr "_Cancelar pacto"
+msgstr "Cancelar pac_to"
#: client/gui-gtk-2.0/plrdlg.c:329
-#, fuzzy
msgid "_Withdraw Vision"
-msgstr "Retirar visión (_W)"
+msgstr "_Retirar visión"
#: client/gui-gtk-2.0/plrdlg.c:348
-#, fuzzy
msgid "_Report"
-msgstr "Info_rmes"
+msgstr "Info_rme"
#: client/gui-gtk-2.0/plrdlg.c:386
msgid "?show:Dead Players"
@@ -12710,9 +12830,8 @@ msgid "Nations"
msgstr "Naciones"
#: client/gui-gtk-2.0/plrdlg.c:511
-#, fuzzy
msgid "Di_plomacy"
-msgstr "Diplomacia"
+msgstr "Di_plomacia"
#: client/gui-gtk-2.0/plrdlg.c:516
msgid "_Intelligence"
@@ -12746,41 +12865,41 @@ 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:624 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:302
#: 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:779 client/gui-gtk-2.0/pages.c:820
-#: client/gui-win32/connectdlg.c:916
+#: client/gui-win32/connectdlg.c:918
msgid "Server Name"
msgstr "Nombre del servidor"
#: client/gui-gtk-2.0/pages.c:780 client/gui-gtk-2.0/pages.c:821
-#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:916
+#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:918
#: data/Freeciv.in:96
msgid "Port"
msgstr "Puerto"
#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Version"
msgstr "Versión"
#: client/gui-gtk-2.0/pages.c:782 client/gui-gtk-2.0/pages.c:823
-#: client/gui-gtk-2.0/pages.c:2161 client/gui-win32/connectdlg.c:917
-#: client/gui-win32/connectdlg.c:995
+#: client/gui-gtk-2.0/pages.c:2163 client/gui-win32/connectdlg.c:919
+#: client/gui-win32/connectdlg.c:997
msgid "Status"
msgstr "Estado"
#: client/gui-gtk-2.0/pages.c:783 client/gui-gtk-2.0/pages.c:824
#: client/gui-sdl/connectdlg.c:318 client/gui-sdl/plrdlg.c:330
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Players"
msgstr "Jugadores"
#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
-#: client/gui-win32/connectdlg.c:918
+#: client/gui-win32/connectdlg.c:920
msgid "Comment"
msgstr "Comentario"
@@ -12812,9 +12931,9 @@ msgstr "Co_ntrase
msgid "Conf_irm Password:"
msgstr "Conf_irme Contraseña:"
-#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2165
#: 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:1000
+#: client/gui-win32/citydlg.c:1083 client/gui-win32/connectdlg.c:1002
#: client/gui-win32/wldlg.c:800 client/gui-win32/wldlg.c:806
msgid "Type"
msgstr "Tipo"
@@ -12895,22 +13014,18 @@ msgid "Put on %s"
msgstr "Poner en %s"
#: client/gui-gtk-2.0/pages.c:1511
-#, fuzzy
msgid "Number of _Players (including AI):"
-msgstr ""
-"_Número de jugadores a completar con los controladores por el ordenador:"
+msgstr "Número de _Jugadores (incluyendo ordenadores):"
#: client/gui-gtk-2.0/pages.c:1534
-#, fuzzy
msgid "AI Skill _Level:"
-msgstr "Nivell de los Jugadores Controlados por Ordenador:"
+msgstr "Nive_l de los Jugadores Controlados por Ordenador:"
#: client/gui-gtk-2.0/pages.c:1550
-#, fuzzy
msgid "Ruleset _Version:"
-msgstr "_Ruleset:"
+msgstr "Versión de _Ruleset:"
-#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2195
msgid "_More Game Options..."
msgstr "Más _Opciones del Juego..."
@@ -12926,49 +13041,48 @@ msgstr "Grado"
msgid "Ready"
msgstr "Listo"
-#: client/gui-gtk-2.0/pages.c:1601
-#, fuzzy
+#: client/gui-gtk-2.0/pages.c:1600
msgid "?player:Leader"
-msgstr "Nombre:"
+msgstr "Líder"
-#: client/gui-gtk-2.0/pages.c:1732 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1734 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:1824
+#: client/gui-gtk-2.0/pages.c:1826
msgid "Choose Saved Game to _Load:"
msgstr "Escoja la partida guardada a _Cargar:"
-#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
-#: client/gui-gtk-2.0/pages.c:2451
+#: client/gui-gtk-2.0/pages.c:1846 client/gui-gtk-2.0/pages.c:2039
+#: client/gui-gtk-2.0/pages.c:2455
msgid "_Browse..."
msgstr "_Navegar..."
-#: client/gui-gtk-2.0/pages.c:1911
+#: client/gui-gtk-2.0/pages.c:1913
msgid "Choose a Scenario"
msgstr "Escoger un Escenario"
-#: client/gui-gtk-2.0/pages.c:1998
+#: client/gui-gtk-2.0/pages.c:2000
msgid "Choose a _Scenario:"
msgstr "Escoger un E_scenario:"
-#: client/gui-gtk-2.0/pages.c:2173
+#: client/gui-gtk-2.0/pages.c:2175
msgid "Choose a _nation to play:"
msgstr "Elige una _nación para jugar:"
-#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2367 client/gui-win32/menu.c:581
msgid "Select Location to Save"
msgstr "Elige camino para gravar"
-#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2452 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "Grabar partida"
-#: client/gui-gtk-2.0/pages.c:2489
+#: client/gui-gtk-2.0/pages.c:2493
msgid "Saved _Games:"
msgstr "Partidas _Gravadas:"
-#: client/gui-gtk-2.0/pages.c:2516
+#: client/gui-gtk-2.0/pages.c:2520
msgid "Save _Filename:"
msgstr "Grabar a Nombre_Fichero:"
@@ -12983,9 +13097,8 @@ msgstr "Grabar a Nombre_Fichero:"
#: client/gui-win32/repodlgs.c:93 client/gui-win32/repodlgs.c:273
#: client/gui-xaw/menu.c:224 client/gui-xaw/repodlgs.c:274
#: client/gui-xaw/repodlgs.c:485 data/Freeciv.in:1366
-#, fuzzy
msgid "Research"
-msgstr "Investigar"
+msgstr "Investigación"
#: client/gui-gtk-2.0/repodlgs.c:295 client/gui-win32/repodlgs.c:283
msgid "Researching"
@@ -13051,7 +13164,6 @@ msgid "Unit Type"
msgstr "Tipo de unidad"
#: client/gui-gtk-2.0/repodlgs.c:934 client/gui-win32/repodlgs.c:696
-#, fuzzy
msgid "?Upgradable unit [short]:U"
msgstr "U"
@@ -13192,16 +13304,15 @@ msgstr "_Lanzar"
#: client/gui-gtk-2.0/theme_dlg.c:57
msgid "Theme suggested"
-msgstr ""
+msgstr "Tema sugerido"
#: client/gui-gtk-2.0/theme_dlg.c:60
-#, fuzzy
msgid "Load theme"
-msgstr "Cargar partida"
+msgstr "Cargar tema"
#: client/gui-gtk-2.0/theme_dlg.c:62
msgid "Keep current theme"
-msgstr ""
+msgstr "Mantener tema actual"
#: client/gui-gtk-2.0/theme_dlg.c:69
#, c-format
@@ -13209,19 +13320,20 @@ msgid ""
"Tileset suggests using %s theme.\n"
"You are currently using %s."
msgstr ""
+"El Tileset sugiere usar el tema %s.\n"
+"Tu estás usando %s actualmente."
#: client/gui-gtk-2.0/tileset_dlg.c:51
msgid "Prefered tileset"
-msgstr ""
+msgstr "Tileset preferido"
#: client/gui-gtk-2.0/tileset_dlg.c:54
-#, fuzzy
msgid "Load tileset"
-msgstr "_Recargar Tileset"
+msgstr "Cargar Tileset"
#: client/gui-gtk-2.0/tileset_dlg.c:56
msgid "Keep current tileset"
-msgstr ""
+msgstr "Mantener tileset actual"
#: client/gui-gtk-2.0/tileset_dlg.c:63
#, c-format
@@ -13230,6 +13342,9 @@ msgid ""
"It might not work with other tilesets.\n"
"You are currently using tileset %s."
msgstr ""
+"El Modpack sugiere que se use el tileset %s.\n"
+"Podría no funcionar con otros tilesets.\n"
+"Tu estás usando actualmente el tileset %s."
#: client/gui-gtk-2.0/wldlg.c:178
msgid "new"
@@ -13311,16 +13426,15 @@ msgstr "Seguir movi
#: client/gui-sdl/repodlgs.c:1991 client/gui-sdl/repodlgs.c:2867
#: client/gui-sdl/repodlgs.c:3056 client/gui-sdl/repodlgs.c:3321
#: client/gui-sdl/spaceshipdlg.c:162
-#, fuzzy
msgid "Close Dialog (Esc)"
-msgstr "Cerrar ventana"
+msgstr "Cerrar Ventana (Esc)"
#: client/gui-sdl/chatline.c:773
#, c-format
msgid "Total users logged in : %d"
msgstr "Usuarios conectados : %d"
-#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1098
msgid "Back"
msgstr "Volver"
@@ -13329,21 +13443,17 @@ msgid "Start"
msgstr "Comenzar"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:777
+#: client/gui-win32/connectdlg.c:779
msgid "Load Game"
msgstr "Cargar partida"
#: client/gui-sdl/chatline.c:865
-#, fuzzy
msgid "Server Settings"
-msgstr ""
-"Configuración\n"
-"del servidor"
+msgstr "Configuración del servidor"
#: client/gui-sdl/citydlg.c:425
-#, fuzzy
msgid "Unit commands"
-msgstr "Órdenes a la unidad"
+msgstr "Órdenes de unidades"
#: client/gui-sdl/citydlg.c:449 data/Freeciv.in:1162 data/Freeciv.in:1198
msgid "Activate unit"
@@ -13373,9 +13483,9 @@ msgstr "Asignar a esta ciudad"
#: client/gui-sdl/connectdlg.c:308 client/gui-sdl/connectdlg.c:617
#: client/gui-sdl/connectdlg.c:803 client/gui-sdl/connectdlg.c:985
#: client/gui-sdl/dialogs.c:452 client/gui-sdl/dialogs.c:2095
-#: client/gui-sdl/dialogs.c:2893 client/gui-sdl/diplomat_dialog.c:731
+#: client/gui-sdl/dialogs.c:2902 client/gui-sdl/diplomat_dialog.c:731
#: client/gui-sdl/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1043
#: client/gui-win32/dialogs.c:1772 client/gui-win32/finddlg.c:127
#: client/gui-win32/gotodlg.c:171 client/gui-win32/inputdlg.c:146
#: client/gui-win32/messagedlg.c:216 client/gui-win32/ratesdlg.c:328
@@ -13407,22 +13517,19 @@ msgstr ""
"Colonos con tamaño 1"
#: client/gui-sdl/citydlg.c:1171
-#, fuzzy
msgid "Sorry, you have already bought here in this turn."
-msgstr "Lo siento, ya has comprado durante este turno."
+msgstr "Lo siento, ya has comprado aquí durante este turno."
#: client/gui-sdl/citydlg.c:1174
-#, fuzzy
msgid "Sorry, you can't buy here in this turn."
-msgstr "Lo siento, ya has comprado durante este turno."
+msgstr "Lo siento, no se puede comprar aquí durante este turno."
#: client/gui-sdl/citydlg.c:1178
-#, fuzzy
msgid "Buy it?"
msgstr "¿Comprarlo?"
#: 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
+#: client/gui-sdl/diplodlg.c:1336 client/gui-sdl/diplomat_dialog.c:1211
#: client/gui-sdl/diplomat_dialog.c:1417 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:221 client/gui-sdl/repodlgs.c:1559
#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
@@ -13438,7 +13545,7 @@ msgid "No"
msgstr "No"
#: client/gui-sdl/citydlg.c:1215 client/gui-sdl/cma_fe.c:318
-#: client/gui-sdl/diplodlg.c:1345 client/gui-sdl/diplomat_dialog.c:1200
+#: client/gui-sdl/diplodlg.c:1346 client/gui-sdl/diplomat_dialog.c:1200
#: client/gui-sdl/diplomat_dialog.c:1407 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:232 client/gui-win32/repodlgs.c:578
#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
@@ -13453,7 +13560,6 @@ msgid "Yes"
msgstr "Sí"
#: client/gui-sdl/citydlg.c:1393
-#, fuzzy
msgid "Sell it?"
msgstr "¿Venderlo?"
@@ -13466,14 +13572,14 @@ msgid "City options"
msgstr "Opciones de la ciudad"
#: client/gui-sdl/citydlg.c:1779
-#, fuzzy, c-format
+#, c-format
msgid "Supported units: %d"
-msgstr "Unidades mantenidas %d"
+msgstr "Unidades mantenidas: %d"
#: client/gui-sdl/citydlg.c:1837
-#, fuzzy, c-format
+#, c-format
msgid "Present units: %d"
-msgstr "Unidades presentes %d"
+msgstr "Unidades presentes: %d"
#: client/gui-sdl/citydlg.c:1886 client/gui-sdl/citydlg.c:3733
#: client/gui-win32/citydlg.c:778
@@ -13481,24 +13587,22 @@ msgid "City info"
msgstr "Información de la ciudad"
#: client/gui-sdl/citydlg.c:1907
-#, fuzzy, c-format
+#, c-format
msgid "Pollution: %d"
msgstr "Contaminación : %d"
#: client/gui-sdl/citydlg.c:1935
-#, fuzzy
msgid "Pollution: none"
msgstr "Contaminación: no hay"
#: client/gui-sdl/citydlg.c:1948
-#, fuzzy
msgid "Trade routes: "
msgstr "Rutas comerciales : "
#: client/gui-sdl/citydlg.c:1997
-#, fuzzy, c-format
+#, c-format
msgid "Trade: +%d"
-msgstr "Comercio : +%d"
+msgstr "Comercio: +%d"
#: client/gui-sdl/citydlg.c:2537
msgid "Citizens"
@@ -13509,32 +13613,32 @@ msgid "City improvements"
msgstr "Instalaciones urbanas"
#: client/gui-sdl/citydlg.c:2566
-#, fuzzy, c-format
+#, c-format
msgid "Food: %d per turn"
msgstr "Alimento: %d por turno"
#: client/gui-sdl/citydlg.c:2603
-#, fuzzy, c-format
+#, c-format
msgid "?food:Surplus: %d"
msgstr "Superávit: %d"
#: client/gui-sdl/citydlg.c:2651
-#, fuzzy, c-format
+#, c-format
msgid "Production: %d (%d) per turn"
-msgstr "Producción : %d (%d) por turno"
+msgstr "Producción: %d (%d) por turno"
#: client/gui-sdl/citydlg.c:2697
-#, fuzzy, c-format
+#, c-format
msgid "?production:Support: %d"
-msgstr "Mantenimiento : %d"
+msgstr "Mantenimiento: %d"
#: client/gui-sdl/citydlg.c:2735
-#, fuzzy, c-format
+#, c-format
msgid "Trade: %d per turn"
msgstr "Comercio: %d por turno"
#: client/gui-sdl/citydlg.c:2769
-#, fuzzy, c-format
+#, c-format
msgid "Corruption: %d"
msgstr "Corrupción: %d"
@@ -13544,7 +13648,7 @@ msgid "Gold: %d (%d) per turn"
msgstr "Oro: %d (%d) por turno"
#: client/gui-sdl/citydlg.c:2853
-#, fuzzy, c-format
+#, c-format
msgid "Upkeep: %d"
msgstr "Mantenimiento: %d"
@@ -13559,19 +13663,17 @@ msgid "Luxury: %d per turn"
msgstr "Lujo: %d por turno"
#: client/gui-sdl/citydlg.c:2970
-#, fuzzy
msgid "City growth: blocked"
msgstr "Crecimiento: detenido"
#: client/gui-sdl/citydlg.c:2972
-#, fuzzy
msgid "City growth: never"
msgstr "Crecimiento: nunca"
#: client/gui-sdl/citydlg.c:2976
-#, fuzzy, c-format
+#, c-format
msgid "City shrinks: %d %s"
-msgstr "La ciudad decrece : %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:536
@@ -13591,7 +13693,7 @@ msgstr[0] "turno"
msgstr[1] "turnos"
#: client/gui-sdl/citydlg.c:2980
-#, fuzzy, c-format
+#, c-format
msgid "City growth: %d %s"
msgstr "Crecimiento: %d %s"
@@ -13614,21 +13716,18 @@ msgid "City of %s (Population %s citizens)"
msgstr "Ciudad de %s (Población: %s ciudadanos)"
#: client/gui-sdl/citydlg.c:3618
-#, fuzzy
msgid " - under Citizen Governor control."
-msgstr " - bajo control del CMA."
+msgstr " - bajo control del Gobernador."
#: client/gui-sdl/citydlg.c:3697
-#, fuzzy
msgid "Present units"
-msgstr "Unidades presentes %d"
+msgstr "Unidades presentes"
#: client/gui-sdl/citydlg.c:3708 client/gui-win32/citydlg.c:807
msgid "Supported units"
msgstr "Unidades mantenidas"
#: client/gui-sdl/citydlg.c:3780
-#, fuzzy
msgid "Change production"
msgstr "Cambiar producción"
@@ -13637,7 +13736,6 @@ msgid "Hurry production"
msgstr "Panel urgente"
#: client/gui-sdl/citydlg.c:3825
-#, fuzzy
msgid "Previous city"
msgstr "Ciudad anterior"
@@ -13660,9 +13758,8 @@ msgid "Cities Report"
msgstr "Informe de Ciudades"
#: client/gui-sdl/cityrep.c:201
-#, fuzzy
msgid "Close Dialog"
-msgstr "Cerrar ventana"
+msgstr "Cerrar Ventana"
#: client/gui-sdl/cityrep.c:215
msgid "Information Report"
@@ -13685,11 +13782,12 @@ msgid "worklist"
msgstr "lista de tareas"
#: client/gui-sdl/cityrep.c:522
-#, fuzzy
msgid ""
"\n"
"finished"
-msgstr "acabado"
+msgstr ""
+"\n"
+"acabado"
#: client/gui-sdl/cma_fe.c:452 client/gui-win32/cma_fe.c:458
msgid "Presets"
@@ -13730,13 +13828,12 @@ msgid "Creating Server List..."
msgstr "Creando lista de servidores..."
#: client/gui-sdl/connectdlg.c:280 client/gui-sdl/connectdlg.c:344
-#, fuzzy
msgid "No LAN servers found"
-msgstr "Servidores LAN"
+msgstr "No hay Servidores LAN"
#: client/gui-sdl/connectdlg.c:282 client/gui-sdl/connectdlg.c:346
msgid "No public servers found"
-msgstr ""
+msgstr "No se ha encontrado servidores públicos"
#: client/gui-sdl/connectdlg.c:556
msgid "Player Name :"
@@ -13750,7 +13847,7 @@ msgstr "Servidor de Freeciv :"
msgid "Port :"
msgstr "Puerto:"
-#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1100
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr "Conectar"
@@ -13806,9 +13903,8 @@ msgid "Change Production"
msgstr "Cambiar producción"
#: client/gui-sdl/dialogs.c:1282
-#, fuzzy
msgid "Change City Governor settings"
-msgstr "Guardar configuración del CMA"
+msgstr "Cambiar la configuración del Gobernador de la Ciudad"
#: client/gui-sdl/dialogs.c:1303
msgid "Goto here"
@@ -13858,23 +13954,23 @@ msgstr "Elige tu nuevo gobierno"
msgid "REVOLUTION!"
msgstr "¡REVOLUCIÓN!"
-#: client/gui-sdl/dialogs.c:2232 client/gui-sdl/dialogs.c:2620
+#: client/gui-sdl/dialogs.c:2237 client/gui-sdl/dialogs.c:2625
#: client/gui-win32/dialogs.c:567 data/Freeciv.in:3159
msgid "Female"
msgstr "Hembra"
-#: client/gui-sdl/dialogs.c:2234 client/gui-sdl/dialogs.c:2618
-#: client/gui-sdl/dialogs.c:2830 client/gui-win32/dialogs.c:565
+#: client/gui-sdl/dialogs.c:2239 client/gui-sdl/dialogs.c:2623
+#: client/gui-sdl/dialogs.c:2839 client/gui-win32/dialogs.c:565
msgid "Male"
msgstr "Varón"
-#: client/gui-sdl/dialogs.c:2478 client/gui-sdl/dialogs.c:2902
+#: client/gui-sdl/dialogs.c:2483 client/gui-sdl/dialogs.c:2911
#: 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 "Vale"
-#: client/gui-sdl/dialogs.c:2685 client/gui-win32/dialogs.c:505
+#: client/gui-sdl/dialogs.c:2694 client/gui-win32/dialogs.c:505
msgid "What nation will you be?"
msgstr "¿Qué nación quieres ser?"
@@ -13901,79 +13997,79 @@ msgstr "Mapamundi"
msgid "Sea map"
msgstr "Mapa marítimo"
-#: client/gui-sdl/diplodlg.c:563
+#: client/gui-sdl/diplodlg.c:564
msgid "Give embassy"
msgstr "Dar embajada"
-#: client/gui-sdl/diplodlg.c:579 client/gui-win32/diplodlg.c:614
+#: client/gui-sdl/diplodlg.c:580 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 "Oro(máx %d)"
-#: client/gui-sdl/diplodlg.c:613 client/gui-sdl/helpdlg.c:1956
+#: client/gui-sdl/diplodlg.c:614 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 "Avances"
-#: client/gui-sdl/diplodlg.c:831 client/gui-win32/diplodlg.c:598
+#: client/gui-sdl/diplodlg.c:832 client/gui-win32/diplodlg.c:598
#: data/Freeciv.in:269
msgid "Diplomacy meeting"
msgstr "Cumbre diplomática"
-#: client/gui-sdl/diplodlg.c:883 client/gui-win32/diplodlg.c:680
+#: client/gui-sdl/diplodlg.c:884 client/gui-win32/diplodlg.c:680
#: data/Freeciv.in:510
msgid "Cancel meeting"
msgstr "Cancelar cumbre"
-#: client/gui-sdl/diplodlg.c:895 client/gui-win32/diplodlg.c:679
+#: client/gui-sdl/diplodlg.c:896 client/gui-win32/diplodlg.c:679
#: data/Freeciv.in:501
msgid "Accept treaty"
msgstr "Aceptar pacto"
#. TRANS: "Polish incident !" FIXME!!!
-#: client/gui-sdl/diplodlg.c:1304
+#: client/gui-sdl/diplodlg.c:1305
#, c-format
msgid "%s incident !"
msgstr "¡Incidente %s!"
-#: client/gui-sdl/diplodlg.c:1322
+#: client/gui-sdl/diplodlg.c:1323
msgid "Shall we declare WAR on them?"
msgstr "¿Les declaramos la GUERRA?"
-#: client/gui-sdl/diplodlg.c:1433
+#: client/gui-sdl/diplodlg.c:1434
msgid "Foreign Minister"
-msgstr "Ministro extranjero"
+msgstr "Ministro de exteriores"
-#: client/gui-sdl/diplodlg.c:1449
-#, fuzzy, c-format
+#: client/gui-sdl/diplodlg.c:1450
+#, c-format
msgid ""
"Sir!, the %s ambassador has arrived\n"
"What are your wishes?"
msgstr ""
-"¡Señor, ha llegado el embajador de %s!\n"
+"¡Señor, ha llegado el embajador %s!\n"
"¿Qué hacemos?"
-#: client/gui-sdl/diplodlg.c:1465
+#: client/gui-sdl/diplodlg.c:1466
msgid "Declare WAR"
msgstr "Declarar la GUERRA"
-#: client/gui-sdl/diplodlg.c:1467 client/gui-win32/plrdlg.c:357
+#: client/gui-sdl/diplodlg.c:1468 client/gui-win32/plrdlg.c:357
msgid "Cancel Treaty"
msgstr "Cancelar pacto"
-#: client/gui-sdl/diplodlg.c:1490 client/gui-win32/plrdlg.c:358
+#: client/gui-sdl/diplodlg.c:1491 client/gui-win32/plrdlg.c:358
#: data/Freeciv.in:3254
msgid "Withdraw vision"
msgstr "Retirar visión"
-#: client/gui-sdl/diplodlg.c:1507
+#: client/gui-sdl/diplodlg.c:1508
msgid "Call Diplomatic Meeting"
msgstr "Convocar cumbre diplomática"
-#: client/gui-sdl/diplodlg.c:1521
+#: client/gui-sdl/diplodlg.c:1522
msgid "Send him back"
msgstr "Enviarle de vuelta"
@@ -14037,7 +14133,7 @@ msgid "Unable to initialize SDL library: %s"
msgstr "No se ha podido inicializar la librería SDL: %s"
#: client/gui-sdl/graphics.c:1021
-#, fuzzy, c-format
+#, c-format
msgid "Unable to initialize SDL_ttf library: %s"
msgstr "No se ha podido inicializar la librería SDL_ttf: %s"
@@ -14061,40 +14157,38 @@ msgid "Setting resolution to: %d x %d %d bpp"
msgstr "Se usará la resolución: %dx%d %d bpp"
#: client/gui-sdl/gui_main.c:150
-#, fuzzy
msgid "Full Screen"
-msgstr "Pantalla(_F) completa"
+msgstr "Pantalla Completa"
#: client/gui-sdl/gui_main.c:151
msgid ""
"If this option is set the client will use the whole screen area for drawing"
msgstr ""
+"Si es activa esta opción, el cliente usará toda la pantalla para la ventana"
#: client/gui-sdl/gui_main.c:154
msgid "Screen width"
-msgstr ""
+msgstr "Anchura de pantalla"
#: client/gui-sdl/gui_main.c:155
msgid "This option saves the width of the selected screen resolution"
-msgstr ""
+msgstr "Esta opción guarda el ancho de la resolución de pantalla seleccionada"
#: client/gui-sdl/gui_main.c:158
-#, fuzzy
msgid "Screen height"
-msgstr "Vuelo espacial"
+msgstr "Alto de pantalla"
#: client/gui-sdl/gui_main.c:159
msgid "This option saves the height of the selected screen resolution"
-msgstr ""
+msgstr "Esta opción guarda el ancho de la resolución de pantalla seleccionada"
#: client/gui-sdl/gui_main.c:163
-#, fuzzy
msgid ""
"By changing this option you change the active theme. This is the same as "
"using the -- --theme command-line parameter."
msgstr ""
-"Cambiando esta opción, cambias el tilesect actual. Esto es lo mismo que usar "
-"el parámetro -t en la línea de comandos."
+"Cambiando esta opción, cambias el tema actual. Esto es lo mismo que usar el "
+"parámetro -- --theme en la línea de comandos."
#: client/gui-sdl/gui_main.c:204
msgid " -f, --fullscreen\tStart Client in Fullscreen mode\n"
@@ -14110,12 +14204,12 @@ msgstr ""
#: client/gui-sdl/gui_main.c:207
msgid " -t, --theme THEME\tUse GUI theme THEME\n"
-msgstr ""
+msgstr " -t, --theme TEMA\tUsar el tema de la interficie de usuario TEMA\n"
#: client/gui-sdl/gui_main.c:665
#, c-format
msgid "Making screenshot fc_%05d.bmp"
-msgstr ""
+msgstr "Haciendo toma de pantalla fc_%05d.bmp"
#: client/gui-sdl/gui_main.c:798
#, c-format
@@ -14136,9 +14230,8 @@ msgid "FT"
msgstr "TL"
#: client/gui-sdl/helpdlg.c:212
-#, fuzzy
msgid "Help : Improvements"
-msgstr "Ayuda : Instalación urbana"
+msgstr "Ayuda : Instalaciones urbanas"
#: client/gui-sdl/helpdlg.c:601
msgid "Help : Units"
@@ -14174,7 +14267,6 @@ msgstr[0] "moneda de oro"
msgstr[1] "monedas de oro"
#: client/gui-sdl/helpdlg.c:1000
-#, fuzzy
msgid "( with "
msgstr "( con "
@@ -14192,9 +14284,9 @@ msgid "Foreign Intelligence Report"
msgstr "Informe de los Servicios de Información"
#: client/gui-sdl/inteldlg.c:258
-#, fuzzy, c-format
+#, c-format
msgid "Intelligence Information about the %s Spaceship"
-msgstr "Información de Inteligencia acerca de la nave espacial %s"
+msgstr "Información de Inteligencia acerca de la Nave Espacial %s"
#: client/gui-sdl/inteldlg.c:266 client/gui-win32/inteldlg.c:94
#: client/gui-xaw/inteldlg.c:182
@@ -14203,7 +14295,7 @@ msgid "Intelligence Information for the %s Empire"
msgstr "Información sobre la Civilización %s"
#: client/gui-sdl/inteldlg.c:289
-#, fuzzy, c-format
+#, c-format
msgid ""
"Ruler: %s %s Government: %s\n"
"Capital: %s Gold: %d\n"
@@ -14249,14 +14341,12 @@ msgid "Hide MiniMap"
msgstr "Ocultar minimapa"
#: client/gui-sdl/mapctrl.c:514
-#, fuzzy
msgid "Show Messages (F10)"
-msgstr "Mostrar mensajes (F10)"
+msgstr "Mostrar Mensajes (F10)"
#: client/gui-sdl/mapctrl.c:517
-#, fuzzy
msgid "Hide Messages (F10)"
-msgstr "Ocultar mensajes (F10)"
+msgstr "Ocultar Mensajes (F10)"
#: client/gui-sdl/mapctrl.c:673
msgid "Scale Minimap"
@@ -14292,19 +14382,16 @@ msgid "Revolution"
msgstr "Revolución"
#: client/gui-sdl/mapctrl.c:1591
-#, fuzzy
msgid "or"
-msgstr " o "
+msgstr "o"
#: client/gui-sdl/mapctrl.c:1615
-#, fuzzy
msgid "Hide Messages"
-msgstr "Mensajes"
+msgstr "Ocultar Mensajes"
#: client/gui-sdl/mapctrl.c:1625
-#, fuzzy
msgid "Toggle Minimap Mode"
-msgstr "Cambiar modo del minimapa (Mays + \\)"
+msgstr "Cambiar Modo del Minimapa"
#: client/gui-sdl/mapctrl.c:1637 client/gui-sdl/optiondlg.c:2110
#: client/gui-sdl/optiondlg.c:2166 client/gui-sdl/pages.c:241
@@ -14313,20 +14400,20 @@ msgid "Options"
msgstr "Opciones"
#: client/gui-sdl/mapview.c:155
-#, fuzzy, c-format
+#, c-format
msgid ""
"The SDL event buffer is full; you may see drawing errors\n"
"as a result. If you see this message often, please\n"
"report it at %s. Thank you."
msgstr ""
"El buffer de eventos de SDL está lleno; puede que aparezcan\n"
-"errores de dibujo. Si esto sucede frecuentemente, avisa en\n"
-"%s (en inglés)."
+"errores de dibujo. Si esto sucede frecuentemente, avisa de esto en\n"
+"%s (en inglés). Gracias"
#: client/gui-sdl/mapview.c:412
-#, fuzzy, c-format
+#, c-format
msgid "%s Population: %s Year: %s Gold %d "
-msgstr "%s Población: %s Año: %s Oro: %d Imp: %d Lujo: %d Cie: %d"
+msgstr "%s Población: %s Año: %s Oro %d "
#: client/gui-sdl/mapview.c:420
#, c-format
@@ -14430,16 +14517,12 @@ msgstr ""
"Alimento/Producción/Comercio: %s"
#: client/gui-sdl/mapview.c:1082
-#, fuzzy
msgid "End of Turn"
-msgstr ""
-"Fin del turno\n"
-"(Pulsa Retorno)"
+msgstr "Fin del turno"
#: client/gui-sdl/mapview.c:1082
-#, fuzzy
msgid "Press"
-msgstr "Configuraciones"
+msgstr "Pulsar"
#. TRANS: keyboard
#: client/gui-sdl/menu.c:373
@@ -14447,9 +14530,8 @@ msgid "No orders"
msgstr "No hay órdenes"
#: client/gui-sdl/menu.c:373
-#, fuzzy
msgid "Space"
-msgstr "Especias"
+msgstr "Espacio"
#: client/gui-sdl/menu.c:387 client/gui-xaw/menu.c:212
msgid "Wait"
@@ -14483,19 +14565,16 @@ msgid "Patrol"
msgstr "Patrullar"
#: client/gui-sdl/menu.c:513
-#, fuzzy
msgid "Connect irrigation"
-msgstr "Conectar/Regadío"
+msgstr "Conectar regadío"
#: client/gui-sdl/menu.c:526
-#, fuzzy
msgid "Connect road"
-msgstr "Conectar/Carretera"
+msgstr "Conectar carretera"
#: client/gui-sdl/menu.c:539
-#, fuzzy
msgid "Connect railroad"
-msgstr "Conectar/Carretera"
+msgstr "Conectar ferrocaril"
#: client/gui-sdl/menu.c:552
msgid "Auto-Explore"
@@ -14675,7 +14754,7 @@ msgstr "Mostrar la animaci
#: client/gui-sdl/optiondlg.c:1095
msgid "Use color cursors"
-msgstr ""
+msgstr "Usa cursores de colores"
#: client/gui-sdl/optiondlg.c:1557 client/gui-xaw/menu.c:143
msgid "City Names"
@@ -14731,17 +14810,16 @@ msgid "Worklists"
msgstr "Listas de tareas"
#: client/gui-sdl/optiondlg.c:2287
-#, fuzzy
msgid "Leave Game"
-msgstr "Grabar partida"
+msgstr "Abandonar la partida"
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1100 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1102 client/gui-xaw/menu.c:121
#: data/Freeciv.in:115 data/Freeciv.in:3180
msgid "Quit"
msgstr "Salir"
-#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:967
msgid "Start New Game"
msgstr "Empezar una nueva partida"
@@ -14810,20 +14888,20 @@ msgid "Units Report"
msgstr "Informe de unidades"
#: client/gui-sdl/repodlgs.c:1518
-#, fuzzy, c-format
+#, c-format
msgid ""
"We have %d of %s\n"
"(total value is : %d)\n"
"We can sell %d of them for %d gold."
msgstr ""
"Tenemos %d de %s\n"
-"(valor total: %d)\n"
-"Podemos vender %d por %d monedas"
+"(valor total es: %d)\n"
+"Podemos vender %d por %d monedas."
#: client/gui-sdl/repodlgs.c:1525
-#, fuzzy, c-format
+#, c-format
msgid "We can't sell any %s in this turn."
-msgstr "No podemos vender ningún %s este turno"
+msgstr "No podemos vender ningún %s en este turno."
#: client/gui-sdl/repodlgs.c:1530
msgid "Sell It?"
@@ -14858,8 +14936,8 @@ msgstr "Beneficios netos: "
msgid "%s max rate : %d%%"
msgstr "máxima tasa en %s: %d%%"
-#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
-#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1085
+#: client/gui-win32/connectdlg.c:1093 data/Freeciv.in:155
msgid "Update"
msgstr "Actualizar"
@@ -14872,9 +14950,8 @@ msgid "What should we focus on now?"
msgstr "¿Qué hacemos ahora?"
#: client/gui-sdl/repodlgs.c:3040
-#, fuzzy
msgid "Select target :"
-msgstr "Elige la producción: "
+msgstr "Elige el objetivo :"
#: client/gui-sdl/repodlgs.c:3107
msgid "step"
@@ -14901,9 +14978,9 @@ msgid "The Greatest Civilizations in the world."
msgstr "Las mayores civilizaciones del mundo."
#: client/gui-sdl/spaceshipdlg.c:142
-#, fuzzy, c-format
+#, c-format
msgid "The %s Spaceship"
-msgstr "La nave espacial de %s"
+msgstr "La nave espacial %s"
#: client/gui-sdl/spaceshipdlg.c:172 client/gui-win32/spaceshipdlg.c:241
#: data/Freeciv.in:1709
@@ -15354,67 +15431,67 @@ msgstr "Nuevo"
msgid "Delete"
msgstr "Borrar"
-#: client/gui-win32/connectdlg.c:147
+#: client/gui-win32/connectdlg.c:149
msgid "Password:"
msgstr "Contraseña:"
-#: client/gui-win32/connectdlg.c:169
+#: client/gui-win32/connectdlg.c:171
msgid "Couldn't load the savegame"
msgstr "No se ha podido cargar la partida salvada"
-#: client/gui-win32/connectdlg.c:284 client/gui-xaw/connectdlg.c:311
+#: client/gui-win32/connectdlg.c:286 client/gui-xaw/connectdlg.c:311
msgid "Verify Password"
msgstr "Repite la contraseña"
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:916 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr "Selección del servidor Freeciv"
-#: client/gui-win32/connectdlg.c:915
+#: client/gui-win32/connectdlg.c:917
msgid "Local Area Network"
msgstr "Red de Área Local"
-#: client/gui-win32/connectdlg.c:949
+#: client/gui-win32/connectdlg.c:951
msgid "Welcome to Freeciv"
msgstr "Bienvenidos a Freeciv"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Load Saved Game"
msgstr "Cargar Partida Salvada"
-#: client/gui-win32/connectdlg.c:969
+#: client/gui-win32/connectdlg.c:971
msgid "Connect To Network Game"
msgstr "Conectar a Partida en Red"
-#: client/gui-win32/connectdlg.c:979
+#: client/gui-win32/connectdlg.c:981
msgid "Choose a nation to play"
msgstr "Escoje una nación para jugar"
-#: client/gui-win32/connectdlg.c:1014
+#: client/gui-win32/connectdlg.c:1016
msgid "Number of players (Including AI):"
msgstr "Número de jugadores (incluidos los controlados por el ordenador):"
-#: client/gui-win32/connectdlg.c:1022
+#: client/gui-win32/connectdlg.c:1024
msgid "AI skill level:"
msgstr "Nivell de dificultad de Jug. Contr. por Ordenador:"
-#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1038 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr "Opciones de Juego"
-#: client/gui-win32/connectdlg.c:1040
+#: client/gui-win32/connectdlg.c:1042
msgid "Start Game"
msgstr "Empezando la partida"
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Login:"
msgstr "Usuario:"
-#: client/gui-win32/connectdlg.c:1061
+#: client/gui-win32/connectdlg.c:1063
msgid "Host:"
msgstr "Host:"
-#: client/gui-win32/connectdlg.c:1062
+#: client/gui-win32/connectdlg.c:1064
msgid "Port:"
msgstr "Puerto:"
@@ -15495,21 +15572,21 @@ msgstr ""
"lugar del dibujado 'dither'. Si no hay soporte hardware para el alpha "
"blending, irá muy lento."
-#: client/gui-win32/helpdlg.c:769 client/gui-win32/helpdlg.c:792
-#: client/gui-win32/helpdlg.c:803 client/gui-win32/helpdlg.c:809
-#: client/gui-win32/helpdlg.c:822
+#: client/gui-win32/helpdlg.c:775 client/gui-win32/helpdlg.c:798
+#: client/gui-win32/helpdlg.c:809 client/gui-win32/helpdlg.c:815
+#: client/gui-win32/helpdlg.c:828
msgid "Allows "
msgstr "Permite "
-#: client/gui-win32/helpdlg.c:780
+#: client/gui-win32/helpdlg.c:786
msgid "Obsoletes "
msgstr "Deja obsoleto "
-#: client/gui-win32/helpdlg.c:812 client/gui-win32/helpdlg.c:825
+#: client/gui-win32/helpdlg.c:818 client/gui-win32/helpdlg.c:831
msgid " (with "
msgstr " (con "
-#: client/gui-win32/helpdlg.c:815 client/gui-win32/helpdlg.c:828
+#: client/gui-win32/helpdlg.c:821 client/gui-win32/helpdlg.c:834
msgid "?techhelp:)."
msgstr ")."
@@ -15538,9 +15615,8 @@ msgid "Luxury: %d%%"
msgstr "Lujo: %d%%"
#: client/gui-win32/inteldlg.c:129 client/gui-xaw/inteldlg.c:242
-#, fuzzy
msgid "Researching: (Unknown)"
-msgstr "Investigando: Desconocido(%d/-)"
+msgstr "Investigando: (Desconocido)"
#: client/gui-win32/inteldlg.c:132 client/gui-xaw/inteldlg.c:245
#, c-format
@@ -15944,7 +16020,7 @@ msgstr "Permite %s (con %s).\n"
#: client/gui-xaw/inteldlg.c:423
#, c-format
msgid "Intelligence Diplomacy Information for the %s Empire"
-msgstr "Información de la Inteligencia sobre el Imperio %s"
+msgstr "Información de Inteligencia sobre el Imperio %s"
#: client/gui-xaw/menu.c:111
msgid "Local Options"
@@ -16630,18 +16706,17 @@ msgid " Present administrators: "
msgstr " Administradores actuales: "
#: 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/"
+" https://gna.org/projects/freeciv/"
msgstr ""
"Si encuentras algún error, por favor infórmanos de él. Lo mejor es visitar "
"el 'Freeciv Bug Tracking System' (Sistema de Seguimiento de Errores de "
"Freeciv), en:\n"
"\n"
-" http://bugs.freeciv.org/"
+" https://gna.org/projects/freeciv/"
#: data/helpdata.txt:60
msgid ""
@@ -16659,7 +16734,6 @@ msgstr ""
"Freeciv se distribuye bajo la licencia GPL, que se reproduce a continuación: "
#: data/helpdata.txt:379
-#, fuzzy
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 "
@@ -16686,27 +16760,26 @@ msgstr ""
"Si te gustaría añadir una localización (traducción) para tu idioma, lee las "
"instrucciones de:\n"
"\n"
-" http://www.freeciv.org/index.php/Localization\n"
+" http://www.freeciv.org/wiki/Localization\n"
"\n"
"Mira primero si ya se ha comenzado una localización para tu idioma:\n"
"\n"
-" http://www.freeciv.org/index.php/Translations\n"
+" http://www.freeciv.org/wiki/Translations\n"
"\n"
"En cualquier caso, no dudes en enviar cualquier pregunta a la lista de "
"correo freeciv-i18n:\n"
"\n"
-" freeciv-i18n at freeciv.org"
+" freeciv-i18n at gna.org"
#: data/helpdata.txt:402
-#, fuzzy
msgid ""
"Before a game is started, anyone can connect to the server by supplying its "
"hostname and port number (5556 by default). If the server is started with "
"the -m flag, it will report to the metaserver,"
msgstr ""
"Antes de que comience la partida, cualquiera puede conectarse al servidor si "
-"conoce su host y número de puerto (5555 por defecto). Si el servidor se "
-"arranca con el flag -m, se notificará al metaservidor,"
+"conoce su host y número de puerto (5556 por defecto). Si el servidor se "
+"arranca con el argumento -m, se notificará al metaservidor,"
#: data/helpdata.txt:409
msgid ""
@@ -16747,7 +16820,6 @@ msgstr ""
"los jugadores."
#: data/helpdata.txt:430
-#, fuzzy
msgid ""
"Unit Orders:\n"
"============\n"
@@ -16805,7 +16877,8 @@ msgstr ""
" f: construir fortaleza (unidades de colonización)\n"
" g: ir a (y click-izquierdo para indicar el destino)\n"
" g: añadir un punto de paso (cuando estamos en modo de ir a destino)\n"
-" h: establecerse en la ciudad en la que está en ese momento\n"
+" G: Ir a/retornar a la ciudad más cercana\n"
+" h: establecerse en la ciudad (en la que está en ese momento)\n"
" i: construir regadío o huerta o transformar (colonos/trabajadores)\n"
" l: cargar unidad en transporte marítimo\n"
" L: ir a/transporte aéreo instantáneo a una ciudad\n"
@@ -16817,18 +16890,24 @@ msgstr ""
" p: lanzarse en paracaídas (unidades paracaidistas)\n"
" P: saqueo (eliminar modificación del terreno)\n"
" q: patrullar (y click-izquierdo para elegir el destino)\n"
-" q: añadir punto de paso (cuando estamos en modo patrulla) r: "
-"construir camino/vía férrea (unidades de colonización/trabajadores)\n"
-" r: construir ca(r)retera/ferrocarril (colono/trabajadores)\n"
+" q: añadir punto de paso (cuando estamos en modo patrulla)\n"
+" r: construir camino/vía férrea (unidades de colonización/trabajadores)\n"
" r: establecer ruta comercial (unidades de comercio)\n"
" s: unidad en vigilancia\n"
" u: descargar unidad en un transporte\n"
" U: descargar todas las unidades del transporte\n"
" x: exploración automática\n"
-"espacio: la unidad se queda quieta durante este turno\n"
+" y: Seleccionar todas las unidades inactivas del mismo tipo de la unidad "
+"activa\n"
+"espacio: unidad inactiva\n"
+"\n"
+" Ctrl-U: actualizar unidad\n"
+"Shift-Ctrl-B: Ir a destino y fundar una ciudad\n"
+"Shift-Ctrl-R: Conectar posición actual y destino con una carretera\n"
+"Shift-Ctrl-L: Conectar posición actual y destino con una vía ferrea\n"
+"Shift-Ctrl-I: Conectar posición actual y destino con regadío\n"
#: data/helpdata.txt:473
-#, fuzzy
msgid ""
"Unit Movement:\n"
"==============\n"
@@ -16858,7 +16937,6 @@ msgstr ""
"\n"
" 5: pasar el foco a la unidad previa\n"
" w: dejar para más tarde (en el mismo turno)\n"
-" W: despertar a las demás unidades de la casilla\n"
" c: centrar la vista en la unidad\n"
#: data/helpdata.txt:488
@@ -17284,9 +17362,9 @@ msgid ""
"farmland by clicking on the occupied farmland square. This citizen can then "
"be transferred to the other duties mentioned previously."
msgstr ""
-"Si se están generando demasiados alimentos, puedes retirar a un ciudadano "
-"pulsando en una de las casillas usadas por la ciudad. Este ciudadano se "
-"puede transferir después a alguna de las otras tareas."
+" Si se están generando demasiados alimentos, puedes retirar a un "
+"ciudadano pulsando en una de las casillas usadas por la ciudad. Este "
+"ciudadano se puede transferir después a alguna de las otras tareas."
#: data/helpdata.txt:690
msgid ""
@@ -17294,9 +17372,9 @@ msgid ""
"central tile of the farmland, the citizens will be rearranged to maximise "
"food production."
msgstr ""
-"Si mueves a todos los ciudadanos a la ciudad y pulsas con el botón derecho "
-"sobre ella, los ciudadanos se reorganizarán de forma que la generación de "
-"alimentos sea máxima."
+" Si mueves a todos los ciudadanos a la ciudad y pulsas con el botón "
+"derecho sobre ella, los ciudadanos se reorganizarán de forma que la "
+"generación de alimentos sea máxima."
#: data/helpdata.txt:696
msgid ""
@@ -17305,10 +17383,10 @@ msgid ""
"so is labelled with a lightning bolt. Take care not to let this happen to "
"any of your cities, as unhappy cities produce nothing, and will soon revolt."
msgstr ""
-"La regla más importante del cuidado de una ciudad es que tiene que haber al "
-"menos tantos ciudadanos felices como descontentos. Una ciudad en la que no "
-"se da esta situación se marcará en el mapa con un rayo. Ten cuidado de que "
-"esto no le suceda a tus ciudades, ya que las ciudades descontentas no "
+" La regla más importante del cuidado de una ciudad es que tiene que haber "
+"al menos tantos ciudadanos felices como descontentos. Una ciudad en la que "
+"no se da esta situación se marcará en el mapa con un rayo. Ten cuidado de "
+"que esto no le suceda a tus ciudades, ya que las ciudades descontentas no "
"producen nada, y podrían rebelarse en poco tiempo."
#: data/helpdata.txt:702
@@ -17379,7 +17457,6 @@ msgstr ""
"conectar con otros jugadores."
#: data/helpdata.txt:734
-#, fuzzy
msgid ""
" 10. Interacting with other players (Diplomacy).\n"
"\n"
@@ -17390,15 +17467,16 @@ msgid ""
"entry under the embassy column is not blank and the other player is "
"connected (or is a server AI) then a diplomacy menu will pop up."
msgstr ""
-"Si hace poco de tu último contacto con un jugador, o has establecido una "
-"embajada con él, puedes convocar una cumbre diplomática. Para ello ve al "
+" 10- Interacción con otros jugadores (Diplomacia).\n"
+"\n"
+" Si hace poco de tu último contacto con un jugador, o has establecido una "
+"embajada con él, puedes convocar una cumbre diplomática. Para ello ve al "
"menú 'Informes', elige 'Jugadores', pulsa en el jugador con el que deseas "
"tratar y elige 'Cumbre' en el menú 'Jugador'. Si la columna 'Embajada' de "
"ese jugador no está vacía y el otro jugador está conectado (o está "
"controlado por el ordenador) aparecerá un menú de diplomacia."
#: data/helpdata.txt:744
-#, fuzzy
msgid ""
" In this menu you can choose to:\n"
"\n"
@@ -17416,23 +17494,28 @@ msgid ""
"\n"
" - and Give Gold."
msgstr ""
-"Usando este menú puedes decidir:\n"
+" Usando este menú puedes decidir:\n"
+"\n"
+" - Comerciar con mapas (marítimo o el mapa completo),\n"
+"\n"
+" - comerciar con avances tecnológicos,\n"
"\n"
-" - Comerciar con mapas (marítimo o el mapa completo),\n"
+" - comerciar con ciudades,\n"
"\n"
-" - comerciar con avances tecnológicos,\n"
+" - comerciar con la visión compartida, \n"
+" - intercambiar embajadas,\n"
"\n"
-" - comerciar con ciudades,\n"
+" - crear tratados,\n"
"\n"
-" - y dar oro."
+" - y dar oro."
#: data/helpdata.txt:760
msgid ""
" There is no need to trade like for like, by trading say, an advance or "
"city for gold - you can consider this buying and selling."
msgstr ""
-"No tienes por qué intercambiar una cosa por otra del mismo tipo; por ejemplo "
-"se puede cambiar un avance o una ciudad por oro."
+" No tienes por qué intercambiar una cosa por otra del mismo tipo; por "
+"ejemplo se puede cambiar un avance o una ciudad por oro."
#: data/helpdata.txt:764
msgid ""
@@ -17442,7 +17525,7 @@ msgid ""
"\n"
" - If you can't see a city on your map, then you can't request it."
msgstr ""
-"Un par de indicaciones:\n"
+" Un par de indicaciones:\n"
"\n"
" - No puedes entregar tu capital.\n"
"\n"
@@ -17456,8 +17539,8 @@ msgid ""
"(but not those sitting in other cities). So make sure the other player "
"isn't getting a better deal than you expect."
msgstr ""
-"No obstante, el propietario de la ciudad sí puede dártela, en cuyo caso el "
-"área alrededor de la ciudad aparecerá en tu mapa. Una observación "
+" No obstante, el propietario de la ciudad sí puede dártela, en cuyo caso "
+"el área alrededor de la ciudad aparecerá en tu mapa. Una observación "
"importante: las unidades con base en esa ciudad y que en ese momento no se "
"encuentren en otras ciudades también son transferidas. Así que ten cuidado "
"de que no le das al otro jugador más de lo que creías."
@@ -17468,6 +17551,10 @@ msgid ""
"Armistice, Peace, and Alliance. The first is the default state, while the "
"others can be achieved by signing diplomatic treaties."
msgstr ""
+" Hay cinco estados diplomáticas entre los jugadores: la Guerra, la "
+"Tregua, Armisticio, la Paz y la Alianza. El primero es el estado por "
+"defecto, mientras que los otros pueden ser alcanzados mediante la firma de "
+"los tratados diplomáticos."
#: data/helpdata.txt:781
msgid ""
@@ -17478,6 +17565,12 @@ msgid ""
"contact with them after a set number of turns without direct physical "
"contact."
msgstr ""
+" Para tener una relación diplomática con otro jugador, primero se debe "
+"establecer contacto con ese jugador. Para establecer contacto, usted tiene "
+"que mover una de sus unidades al lado de una ciudad o de una unidad "
+"perteneciente a ese jugador, o vice versa. A menos que usted establezca una "
+"embajada con ese jugador, usted puede volver a perder de contacto con ellos "
+"después de un determinado número de turnos sin contacto físico directo."
#: data/helpdata.txt:788
msgid ""
@@ -17485,6 +17578,9 @@ msgid ""
"can freely move you units inside enemy territory and attack their units and "
"cities at will."
msgstr ""
+" El estado diplomático por defecto entre los jugadores es la guerra. "
+"Durante la guerra, usted puede mover libremente sus unidades dentro del "
+"territorio enemigo y atacar sus unidades y sus ciudades a su antojo."
#: data/helpdata.txt:792
msgid ""
@@ -17493,6 +17589,11 @@ msgid ""
"lead back to War. Upon first contact with an AI player, it will "
"automatically offer you a Cease-fire treaty."
msgstr ""
+" Cuando dos jugadores deciden poner fin a las hostilidades entre ellos, "
+"pueden ponerse de acuerdo en la cesación del fuego en virtud de un tratado "
+"de tregua. Después de un número determinado de turnos, el alto el fuego "
+"conducirá de nuevo a la guerra. Tras el primer contacto con un jugador "
+"controlado por Ordenador, seofrecerle automáticamente un tratado de tregua."
#: data/helpdata.txt:797
msgid ""
@@ -17501,6 +17602,10 @@ msgid ""
"will turn into a permanent Peace treaty. Breaking an Armistice will drop you "
"directly back to War."
msgstr ""
+" Si usted desea para una coexistencia permanente más pacífica con otro "
+"jugador, puede declarar en un armisticio, que después de otro número de "
+"turnos se convertirá en un tratado de paz permanente. Romper un armisticio "
+"significa ir directamente a la guerra."
#: data/helpdata.txt:802
msgid ""
@@ -17511,6 +17616,12 @@ msgid ""
"declare War, or forge an Alliance. Breaking a Peace treaty will drop you "
"directly back to War."
msgstr ""
+" En el momento en que dos jugadores entran en el estado diplomático de "
+"Paz, todas las unidades pertenecientes a cualquiera de los jugadores que "
+"estan dentro de las otras fronteras, se disolverán automáticamente de "
+"acuerdo con el tratado. Después de esto, usted no puede mover las unidades "
+"en el territorio del otro hasta que se declare la guerra, o se forje una "
+"alianza. Romper un tratado de paz te conduce directamente a la guerra."
#: data/helpdata.txt:809
msgid ""
@@ -17522,6 +17633,14 @@ msgid ""
"draw you into to any wars your ally enters against other players. Breaking "
"an Alliance will drop you to an Armistice treaty."
msgstr ""
+" Una alianza es la relación diplomática final entre dos jugadores. En "
+"este estado, puede mover unidades en las ciudades de los dos y vuestras las "
+"unidades pueden compartir la misma casilla. Un jugador aliado controlado por "
+"ordenador te dará libremente sus mapas del mundo, visión compartida, así "
+"como considerara seriamente la posibilidad de negociación las tecnologías y "
+"de ciudades. El único inconveniente con una alianza, es que te obligara a "
+"entrar en guerra contra todos los enemigos que tenga tu aliado. Romper una "
+"Alianza significa ir a un tratado de Armisticio."
#: data/helpdata.txt:821
msgid ""
@@ -19023,48 +19142,44 @@ msgid ""
"a Factory, Mfg. Plant and Hydro Plant together give a 150% production "
"bonus.\n"
"\n"
-"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant. A city "
-"can only build a Hydro Plant if it is next to (or on) a Mountain or River "
-"tile."
+"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant."
msgstr ""
"Reduce en un 50% la contaminación proveniente de la producción de la "
"ciudad. También aumenta la producción de la Fábrica y de la Planta "
-"Industrial: una Fábrica junto con una Central Hidroeléctrica incrementan la "
+"Industrial: una Fábrica junto con una Central Eléctrica incrementan la "
"producción en un 100%, y una Fábrica junto con una Planta Industrial y una "
-"Central Hidroeléctrica incrementan la producción en un 150%.\n"
+"Central Eléctrica incrementan la producción en un 150%.\n"
"\n"
"En una ciudad sólo puede haber una Central Hidroeléctrica, una Central "
-"Térmica o una Central Nuclear. Sólo se pueden construir Centrales "
-"Hidroeléctricas en ciudades que están junto a (o en) una casilla de Montaña "
-"o de Río."
+"Térmica o una Central Nuclear."
-#: data/default/buildings.ruleset:397 data/civ2/buildings.ruleset:373
+#: data/default/buildings.ruleset:396 data/civ2/buildings.ruleset:373
#: data/civ1/buildings.ruleset:297
msgid "Library"
msgstr "Biblioteca"
-#: data/default/buildings.ruleset:412
+#: data/default/buildings.ruleset:411
#, no-c-format
msgid "Increases the science output in a city by 100%."
msgstr "Incrementa la investigación científica de una ciudad en un 100%."
-#: data/default/buildings.ruleset:417 data/civ2/buildings.ruleset:393
+#: data/default/buildings.ruleset:416 data/civ2/buildings.ruleset:393
#: data/civ1/buildings.ruleset:317
msgid "Marketplace"
msgstr "Mercado"
-#: data/default/buildings.ruleset:432 data/civ2/buildings.ruleset:408
+#: data/default/buildings.ruleset:431 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 "Incrementa la generación de lujo e impuestos en una ciudad en un 50%."
-#: data/default/buildings.ruleset:437 data/civ2/buildings.ruleset:413
+#: data/default/buildings.ruleset:436 data/civ2/buildings.ruleset:413
#: data/civ1/buildings.ruleset:337
msgid "Mass Transit"
msgstr "Transporte Público"
-#: data/default/buildings.ruleset:451 data/civ2/buildings.ruleset:427
+#: data/default/buildings.ruleset:450 data/civ2/buildings.ruleset:427
#: data/civ1/buildings.ruleset:351
msgid ""
"Neutralizes the pollution generated by the population. The population "
@@ -19073,12 +19188,12 @@ msgstr ""
"Neutraliza la contaminación generada por la población. La población "
"simplemente deja de tener efecto en la contaminación generada por la ciudad."
-#: data/default/buildings.ruleset:458 data/civ2/buildings.ruleset:434
+#: data/default/buildings.ruleset:457 data/civ2/buildings.ruleset:434
#: data/civ1/buildings.ruleset:358
msgid "Mfg. Plant"
msgstr "Planta Industrial"
-#: data/default/buildings.ruleset:474 data/civ2/buildings.ruleset:450
+#: data/default/buildings.ruleset:473 data/civ2/buildings.ruleset:450
#: data/civ1/buildings.ruleset:374
#, no-c-format
msgid ""
@@ -19088,12 +19203,12 @@ msgstr ""
"Junto con una Fábrica, una Planta Industrial incrementa la producción total "
"de la ciudad en un 100%."
-#: data/default/buildings.ruleset:480 data/civ2/buildings.ruleset:456
+#: data/default/buildings.ruleset:479 data/civ2/buildings.ruleset:456
#: data/civ1/buildings.ruleset:380
msgid "Nuclear Plant"
msgstr "Central Nuclear"
-#: data/default/buildings.ruleset:495
+#: data/default/buildings.ruleset:494
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 "
@@ -19112,11 +19227,11 @@ msgstr ""
"En una ciudad sólo puede haber una Central Hidroeléctrica, una Central "
"Térmica o una Central Nuclear."
-#: data/default/buildings.ruleset:515 data/civ2/buildings.ruleset:489
+#: data/default/buildings.ruleset:514 data/civ2/buildings.ruleset:489
msgid "Offshore Platform"
msgstr "Plataforma petrolífera"
-#: data/default/buildings.ruleset:530 data/civ2/buildings.ruleset:504
+#: data/default/buildings.ruleset:529 data/civ2/buildings.ruleset:504
msgid ""
"Adds 1 extra shield resource on all Ocean squares in a city. The city needs "
"to be coastal to build this improvement."
@@ -19124,12 +19239,12 @@ msgstr ""
"Añade 1 recurso de producción a todas las casillas de Océano de la ciudad. "
"Sólo se puede construir en ciudades costeras."
-#: data/default/buildings.ruleset:536 data/civ2/buildings.ruleset:510
+#: data/default/buildings.ruleset:535 data/civ2/buildings.ruleset:510
#: data/civ1/buildings.ruleset:411
msgid "Palace"
msgstr "Palacio"
-#: data/default/buildings.ruleset:552
+#: data/default/buildings.ruleset:551
#, no-c-format
msgid ""
"Makes a city the capital and the center of your government. Corruption in "
@@ -19158,11 +19273,11 @@ msgstr ""
"Bajo Despotismo, el palacio te da un +75% extra en la producción, y bajo "
"Monarquía, un +50% extra (también en producción)."
-#: data/default/buildings.ruleset:569 data/civ2/buildings.ruleset:539
+#: data/default/buildings.ruleset:568 data/civ2/buildings.ruleset:539
msgid "Police Station"
msgstr "Comisaría"
-#: data/default/buildings.ruleset:583 data/civ2/buildings.ruleset:553
+#: data/default/buildings.ruleset:582 data/civ2/buildings.ruleset:553
msgid ""
"Reduces the unhappiness caused by military units outside the city by 2 under "
"Democracy and 1 under Republic. This improvement has no effect under other "
@@ -19172,11 +19287,11 @@ msgstr ""
"la ciudad en 2 bajo la Democracia en 1 bajo la República. Esta instalación "
"no tiene efecto alguno con otras formas de gobierno."
-#: data/default/buildings.ruleset:593 data/civ2/buildings.ruleset:560
+#: data/default/buildings.ruleset:592 data/civ2/buildings.ruleset:560
msgid "Port Facility"
msgstr "Astilleros"
-#: data/default/buildings.ruleset:608 data/civ2/buildings.ruleset:575
+#: data/default/buildings.ruleset:607 data/civ2/buildings.ruleset:575
msgid ""
"Allows a city to build veteran sea units. Also, damaged sea units which "
"stay in town for one full turn without moving are completely restored."
@@ -19185,12 +19300,12 @@ msgstr ""
"unidades marítimas dañadas que permanezcan sin moverse en la ciudad durante "
"un turno entero quedarán completamente reparadas."
-#: data/default/buildings.ruleset:615 data/civ2/buildings.ruleset:582
+#: data/default/buildings.ruleset:614 data/civ2/buildings.ruleset:582
#: data/civ1/buildings.ruleset:440
msgid "Power Plant"
msgstr "Central Térmica"
-#: data/default/buildings.ruleset:631
+#: data/default/buildings.ruleset:630
#, no-c-format
msgid ""
"Increases the shield production of a Factory or Mfg. Plant in a city: a "
@@ -19208,12 +19323,12 @@ msgstr ""
"En una ciudad sólo puede haber una Central Solar, una Central "
"Hidroeléctrica, una Central Térmica o una Central Nuclear."
-#: data/default/buildings.ruleset:646 data/civ2/buildings.ruleset:610
+#: data/default/buildings.ruleset:645 data/civ2/buildings.ruleset:610
#: data/civ1/buildings.ruleset:468
msgid "Recycling Center"
msgstr "Centro de Reciclaje"
-#: data/default/buildings.ruleset:661 data/civ2/buildings.ruleset:625
+#: data/default/buildings.ruleset:660 data/civ2/buildings.ruleset:625
#: data/civ1/buildings.ruleset:483
#, no-c-format
msgid ""
@@ -19223,11 +19338,11 @@ msgstr ""
"El Centro de Reciclaje reduce la contaminación proveniente de la producción "
"de la ciudad en un 66%."
-#: data/default/buildings.ruleset:667 data/civ2/buildings.ruleset:631
+#: data/default/buildings.ruleset:666 data/civ2/buildings.ruleset:631
msgid "Research Lab"
msgstr "Laboratorio"
-#: data/default/buildings.ruleset:682
+#: data/default/buildings.ruleset:681
msgid ""
"Together with a Library, a Research Lab increases the science production of "
"a city by 200%. Together with a Library and a University, a Research Lab "
@@ -19237,11 +19352,11 @@ msgstr ""
"de la ciudad en un 200%. Junto con una Biblioteca y una Universidad, el "
"Laboratorio aumenta la investigación científica de la ciudad en un 450%."
-#: data/default/buildings.ruleset:690 data/civ2/buildings.ruleset:654
+#: data/default/buildings.ruleset:689 data/civ2/buildings.ruleset:654
msgid "SAM Battery"
msgstr "Batería SAM"
-#: data/default/buildings.ruleset:704 data/civ2/buildings.ruleset:668
+#: data/default/buildings.ruleset:703 data/civ2/buildings.ruleset:668
msgid ""
"Doubles the defense of all units inside the city when attacked by non-"
"nuclear air units."
@@ -19249,12 +19364,12 @@ msgstr ""
"Duplica la fuerza de defensa de todas las unidades que se encuentren en la "
"ciudad contra los ataques de unidades aéreas no nucleares."
-#: data/default/buildings.ruleset:710 data/civ2/buildings.ruleset:674
+#: data/default/buildings.ruleset:709 data/civ2/buildings.ruleset:674
#: data/civ1/buildings.ruleset:489
msgid "SDI Defense"
msgstr "Defensa SDI"
-#: data/default/buildings.ruleset:724 data/civ2/buildings.ruleset:688
+#: data/default/buildings.ruleset:723 data/civ2/buildings.ruleset:688
#: data/civ1/buildings.ruleset:503
msgid ""
"Protects a city from attacks from Nuclear units. Nuclear attacks simply "
@@ -19265,11 +19380,11 @@ msgstr ""
"nucleares simplemente no surten efecto alguno sobre la ciudad. Además, "
"duplica la defensa contra los misiles no nucleares."
-#: data/default/buildings.ruleset:733 data/civ2/buildings.ruleset:697
+#: data/default/buildings.ruleset:732 data/civ2/buildings.ruleset:697
msgid "Sewer System"
msgstr "Alcantarillado"
-#: data/default/buildings.ruleset:748 data/civ2/buildings.ruleset:712
+#: data/default/buildings.ruleset:747 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."
@@ -19277,12 +19392,12 @@ msgstr ""
"Permite que una ciudad crezca a un tamaño mayor que 12. Primero hace falta "
"un Acueducto para crecer a un tamaño mayor que 8."
-#: data/default/buildings.ruleset:754 data/civ2/buildings.ruleset:749
+#: data/default/buildings.ruleset:753 data/civ2/buildings.ruleset:749
#: data/civ1/buildings.ruleset:512
msgid "Space Component"
msgstr "Componente Espacial"
-#: data/default/buildings.ruleset:769 data/civ2/buildings.ruleset:763
+#: data/default/buildings.ruleset:768 data/civ2/buildings.ruleset:763
#: data/civ1/buildings.ruleset:526
msgid ""
"Space Components can be differentiated into Propulsion and Fuel Components. "
@@ -19299,12 +19414,12 @@ msgstr ""
"Para que puedas construir cualquier parte de la nave espacial, es necesario "
"que algún jugador haya construido la maravilla Proyecto Apolo."
-#: data/default/buildings.ruleset:779 data/civ2/buildings.ruleset:773
+#: data/default/buildings.ruleset:778 data/civ2/buildings.ruleset:773
#: data/civ1/buildings.ruleset:536
msgid "Space Module"
msgstr "Módulo Espacial"
-#: data/default/buildings.ruleset:794 data/civ2/buildings.ruleset:787
+#: data/default/buildings.ruleset:793 data/civ2/buildings.ruleset:787
#: data/civ1/buildings.ruleset:550
msgid ""
"Space Modules are the most expensive parts of spaceships. There are three "
@@ -19339,12 +19454,12 @@ msgstr ""
"Para que puedas construir cualquier parte de la nave espacial, es necesario "
"que algún jugador haya construido la maravilla Proyecto Apolo."
-#: data/default/buildings.ruleset:813 data/civ2/buildings.ruleset:806
+#: data/default/buildings.ruleset:812 data/civ2/buildings.ruleset:806
#: data/civ1/buildings.ruleset:569
msgid "Space Structural"
msgstr "Estructura Espacial"
-#: data/default/buildings.ruleset:828 data/civ2/buildings.ruleset:820
+#: data/default/buildings.ruleset:827 data/civ2/buildings.ruleset:820
#: data/civ1/buildings.ruleset:583
msgid ""
"Space Structurals form the base of your spaceship. All other spaceship "
@@ -19361,11 +19476,11 @@ msgstr ""
"Para que puedas construir cualquier parte de la nave espacial, es necesario "
"que algún jugador haya construido la maravilla Proyecto Apolo."
-#: data/default/buildings.ruleset:838 data/civ2/buildings.ruleset:830
+#: data/default/buildings.ruleset:837 data/civ2/buildings.ruleset:830
msgid "Stock Exchange"
msgstr "Bolsa"
-#: data/default/buildings.ruleset:854 data/civ2/buildings.ruleset:846
+#: data/default/buildings.ruleset:853 data/civ2/buildings.ruleset:846
#, no-c-format
msgid ""
"Together with a Marketplace and a Bank, a Stock Exchange boosts tax and "
@@ -19374,11 +19489,11 @@ msgstr ""
"Junto con el Mercado y el Banco, la Bolsa impulsa en un 150% la generación "
"de impuestos y lujo de una ciudad."
-#: data/default/buildings.ruleset:860 data/civ2/buildings.ruleset:852
+#: data/default/buildings.ruleset:859 data/civ2/buildings.ruleset:852
msgid "Super Highways"
msgstr "Autopistas"
-#: data/default/buildings.ruleset:875 data/civ2/buildings.ruleset:867
+#: data/default/buildings.ruleset:874 data/civ2/buildings.ruleset:867
#, no-c-format
msgid ""
"Increases trade resources by 50% on all squares with roads or railroads."
@@ -19386,11 +19501,11 @@ msgstr ""
"Aumenta la generación de comercio en un 50% en todas las casillas con "
"caminos y vías férreas que pertenezcan a la ciudad."
-#: data/default/buildings.ruleset:883 data/civ2/buildings.ruleset:873
+#: data/default/buildings.ruleset:882 data/civ2/buildings.ruleset:873
msgid "Supermarket"
msgstr "Supermercado"
-#: data/default/buildings.ruleset:898 data/civ2/buildings.ruleset:888
+#: data/default/buildings.ruleset:897 data/civ2/buildings.ruleset:888
#, no-c-format
msgid ""
"Increases the food resources by 50% on each farmland square which is being "
@@ -19401,12 +19516,12 @@ msgstr ""
"pertenezca a la ciudad. Las casillas de Huerta son las que han sido "
"irrigadas por segunda vez."
-#: data/default/buildings.ruleset:905 data/civ2/buildings.ruleset:895
+#: data/default/buildings.ruleset:904 data/civ2/buildings.ruleset:895
#: data/civ1/buildings.ruleset:593
msgid "Temple"
msgstr "Templo"
-#: data/default/buildings.ruleset:919 data/civ2/buildings.ruleset:909
+#: data/default/buildings.ruleset:918 data/civ2/buildings.ruleset:909
#: data/civ1/buildings.ruleset:607
msgid ""
"Makes one unhappy citizen content. Both the Mysticism advance and the "
@@ -19418,13 +19533,13 @@ msgstr ""
"tienes el Misticismo y el Oráculo, son 4 los ciudadanos que pasan a estar "
"conformes."
-#: data/default/buildings.ruleset:926 data/civ2/buildings.ruleset:916
+#: data/default/buildings.ruleset:925 data/civ2/buildings.ruleset:916
#: data/civ1/buildings.ruleset:614 data/default/techs.ruleset:742
#: data/civ2/techs.ruleset:727 data/civ1/techs.ruleset:723
msgid "University"
msgstr "Universidad"
-#: data/default/buildings.ruleset:942
+#: data/default/buildings.ruleset:941
#, no-c-format
msgid ""
"Together with a Library, a University increases the science production of a "
@@ -19433,12 +19548,12 @@ msgstr ""
"Junto con la Biblioteca, la Universidad aumenta la investigación científica "
"de la ciudad en un 250%."
-#: data/default/buildings.ruleset:948 data/civ2/buildings.ruleset:938
+#: data/default/buildings.ruleset:947 data/civ2/buildings.ruleset:938
#: data/civ1/buildings.ruleset:636
msgid "Apollo Program"
msgstr "El Proyecto Apolo"
-#: data/default/buildings.ruleset:962 data/civ2/buildings.ruleset:952
+#: data/default/buildings.ruleset:961 data/civ2/buildings.ruleset:952
msgid ""
"Entire map becomes visible for the player who owns it. It allows all "
"players to start building spaceship parts (assuming they have researched the "
@@ -19448,11 +19563,11 @@ msgstr ""
"jugadores (que hayan investigado las tecnologías necesarias) comiencen a "
"producir partes de la nave espacial."
-#: data/default/buildings.ruleset:969 data/civ2/buildings.ruleset:959
+#: data/default/buildings.ruleset:968 data/civ2/buildings.ruleset:959
msgid "A.Smith's Trading Co."
msgstr "La Compañía de Adam Smith"
-#: data/default/buildings.ruleset:983
+#: data/default/buildings.ruleset:982
msgid ""
"City improvements which would normally have an upkeep of 1 are free of "
"upkeep, for all your cities."
@@ -19460,12 +19575,12 @@ msgstr ""
"Las instalaciones urbanas por las que normalmente se pagaría un sustento de "
"1 pasan a no necesitar sustento, en todas las ciudades."
-#: data/default/buildings.ruleset:989 data/civ2/buildings.ruleset:979
+#: data/default/buildings.ruleset:988 data/civ2/buildings.ruleset:979
#: data/civ1/buildings.ruleset:655
msgid "Colossus"
msgstr "El Coloso"
-#: data/default/buildings.ruleset:1003 data/civ2/buildings.ruleset:993
+#: data/default/buildings.ruleset:1002 data/civ2/buildings.ruleset:993
#: data/civ1/buildings.ruleset:669
msgid ""
"Each square around the city where this wonder is built that is already "
@@ -19474,12 +19589,12 @@ msgstr ""
"Las casillas de la ciudad en la que se encuentra esta maravilla que ya "
"generaran comercio pasan a generar una unidad más de comercio."
-#: data/default/buildings.ruleset:1009 data/civ2/buildings.ruleset:999
+#: data/default/buildings.ruleset:1008 data/civ2/buildings.ruleset:999
#: data/civ1/buildings.ruleset:675
msgid "Copernicus' Observatory"
msgstr "El Observatorio de Copérnico"
-#: data/default/buildings.ruleset:1024 data/civ2/buildings.ruleset:1180
+#: data/default/buildings.ruleset:1023 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."
@@ -19487,12 +19602,12 @@ msgstr ""
"Impulsa en un 100% la producción científica de la ciudad en la que se "
"encuentra."
-#: data/default/buildings.ruleset:1029 data/civ2/buildings.ruleset:1019
+#: data/default/buildings.ruleset:1028 data/civ2/buildings.ruleset:1019
#: data/civ1/buildings.ruleset:695
msgid "Cure For Cancer"
msgstr "La Cura del Cáncer"
-#: data/default/buildings.ruleset:1043
+#: data/default/buildings.ruleset:1042
msgid ""
"This stunning technological achievement makes one unhappy citizen content in "
"all your cities."
@@ -19500,12 +19615,12 @@ msgstr ""
"Este asombroso logro tecnológico hace que un ciudadano descontento pase a "
"estar conforme en todas las ciudades."
-#: data/default/buildings.ruleset:1051 data/civ2/buildings.ruleset:1039
+#: data/default/buildings.ruleset:1050 data/civ2/buildings.ruleset:1039
#: data/civ1/buildings.ruleset:715
msgid "Darwin's Voyage"
msgstr "El Viaje de Darwin"
-#: data/default/buildings.ruleset:1065 data/civ2/buildings.ruleset:1053
+#: data/default/buildings.ruleset:1064 data/civ2/buildings.ruleset:1053
#: data/civ1/buildings.ruleset:729
msgid ""
"Charles Darwin's voyage sparked the discovery of the evolution of the "
@@ -19516,24 +19631,24 @@ msgstr ""
"las especias, inspirando así una mayor confianza en la ciencia. Proporciona "
"dos avences tecnológicos inmediatamente."
-#: data/default/buildings.ruleset:1072 data/civ2/buildings.ruleset:1060
+#: data/default/buildings.ruleset:1071 data/civ2/buildings.ruleset:1060
msgid "Eiffel Tower"
msgstr "La Torre Eiffel"
-#: data/default/buildings.ruleset:1087
-#, fuzzy, no-c-format
+#: data/default/buildings.ruleset:1086
+#, no-c-format
msgid ""
"Your reputation and goodwill among other nations is recovered twice as fast."
msgstr ""
-"Tu reputación y buena voluntad entre las naciones se incrementa mientras "
-"posees esta Maravilla. La reputación se recupera al doble de velocidad."
+"Tu reputación y buena voluntad entre las naciones se incrementa al doble de "
+"velocidad."
-#: data/default/buildings.ruleset:1093 data/civ2/buildings.ruleset:1081
+#: data/default/buildings.ruleset:1092 data/civ2/buildings.ruleset:1081
#: data/civ1/buildings.ruleset:736
msgid "Great Library"
msgstr "La Gran Biblioteca"
-#: data/default/buildings.ruleset:1107 data/civ2/buildings.ruleset:1095
+#: data/default/buildings.ruleset:1106 data/civ2/buildings.ruleset:1095
#: data/civ1/buildings.ruleset:750
msgid ""
"The civilization which builds the Great Library gets every advance that at "
@@ -19542,21 +19657,21 @@ msgstr ""
"La civilización que posee la Gran Biblioteca obtiene todo avance tecnológico "
"que hayan conseguido al menos otras dos civilizaciones."
-#: data/default/buildings.ruleset:1113 data/civ2/buildings.ruleset:1101
+#: data/default/buildings.ruleset:1112 data/civ2/buildings.ruleset:1101
#: data/civ1/buildings.ruleset:756
msgid "Great Wall"
msgstr "La Gran Muralla"
-#: data/default/buildings.ruleset:1127
+#: data/default/buildings.ruleset:1126
msgid "Works as a City Wall in all your cities."
msgstr "Opera como si todas las ciudades estuvieran provistas de Murallas."
-#: data/default/buildings.ruleset:1135 data/civ2/buildings.ruleset:1122
+#: data/default/buildings.ruleset:1134 data/civ2/buildings.ruleset:1122
#: data/civ1/buildings.ruleset:777
msgid "Hanging Gardens"
msgstr "Los Jardines Colgantes"
-#: data/default/buildings.ruleset:1149 data/civ2/buildings.ruleset:1136
+#: data/default/buildings.ruleset:1148 data/civ2/buildings.ruleset:1136
#: data/civ1/buildings.ruleset:791
msgid ""
"Makes one content citizen happy in every city. Makes two extra content "
@@ -19571,12 +19686,12 @@ msgstr ""
"conforme sobre el que actuar, la maravilla operará sobre los ciudadanos "
"desconentos (haciéndolos conformes)."
-#: data/default/buildings.ruleset:1158 data/civ2/buildings.ruleset:1145
+#: data/default/buildings.ruleset:1157 data/civ2/buildings.ruleset:1145
#: data/civ1/buildings.ruleset:800
msgid "Hoover Dam"
msgstr "La Presa de Hoover"
-#: data/default/buildings.ruleset:1173 data/civ2/buildings.ruleset:1159
+#: data/default/buildings.ruleset:1172 data/civ2/buildings.ruleset:1159
msgid ""
"Works as if you had a Hydro Plant in every city. (This reduces pollution "
"and increases the effects of Factories and Mfg. Plants.)"
@@ -19585,12 +19700,12 @@ msgstr ""
"reduce la contaminación e incrementa los efectos de las Fábricas y las "
"Plantas de Fabricación)."
-#: data/default/buildings.ruleset:1179 data/civ2/buildings.ruleset:1165
+#: data/default/buildings.ruleset:1178 data/civ2/buildings.ruleset:1165
#: data/civ1/buildings.ruleset:822
msgid "Isaac Newton's College"
msgstr "La Cátedra de Isaac Newton"
-#: data/default/buildings.ruleset:1194
+#: data/default/buildings.ruleset:1193
#, no-c-format
msgid ""
"Boosts science production by 100% in every city you control that has a "
@@ -19599,22 +19714,22 @@ msgstr ""
"Impulsa en un 100% la producción científica de las ciudadades que posees que "
"tienen una Universidad."
-#: data/default/buildings.ruleset:1200 data/civ2/buildings.ruleset:1185
+#: data/default/buildings.ruleset:1199 data/civ2/buildings.ruleset:1185
#: data/civ1/buildings.ruleset:842
msgid "J.S. Bach's Cathedral"
msgstr "La Catedral de J.S. Bach"
-#: data/default/buildings.ruleset:1214 data/civ2/buildings.ruleset:1199
+#: data/default/buildings.ruleset:1213 data/civ2/buildings.ruleset:1199
msgid "Makes two unhappy citizens content in every city."
msgstr ""
"Hace que dos ciudadanos descontentos pasen a estar conformes en todas las "
"ciudades."
-#: data/default/buildings.ruleset:1219 data/civ2/buildings.ruleset:1204
+#: data/default/buildings.ruleset:1218 data/civ2/buildings.ruleset:1204
msgid "King Richard's Crusade"
msgstr "La Cruzada del Rey Ricardo"
-#: data/default/buildings.ruleset:1233 data/civ2/buildings.ruleset:1218
+#: data/default/buildings.ruleset:1232 data/civ2/buildings.ruleset:1218
msgid ""
"Adds one extra shield resource on every square around the city where it is "
"built."
@@ -19622,20 +19737,20 @@ msgstr ""
"Hace que cada casilla de la ciudad en la que se construye genere una unidad "
"de producción más."
-#: data/default/buildings.ruleset:1239 data/civ2/buildings.ruleset:1224
+#: data/default/buildings.ruleset:1238 data/civ2/buildings.ruleset:1224
msgid "Leonardo's Workshop"
msgstr "El Taller de Leonardo"
-#: data/default/buildings.ruleset:1253 data/civ2/buildings.ruleset:1238
+#: data/default/buildings.ruleset:1252 data/civ2/buildings.ruleset:1238
msgid "Upgrades one obsolete unit per game turn."
msgstr "Actualiza una unidad obsoleta por turno."
-#: data/default/buildings.ruleset:1258 data/civ2/buildings.ruleset:1243
+#: data/default/buildings.ruleset:1257 data/civ2/buildings.ruleset:1243
#: data/civ1/buildings.ruleset:862
msgid "Lighthouse"
msgstr "El Faro"
-#: data/default/buildings.ruleset:1273
+#: data/default/buildings.ruleset:1272
msgid ""
"Gives all your sea units 1 additional movement point and eliminates the risk "
"of losing Triremes on the high seas. Makes all your new sea units veterans "
@@ -19645,37 +19760,37 @@ msgstr ""
"elimina el riesgo de perder las Trirremes en alta mar. Hace que todas las "
"unidades marítimas que se produzcan (en cualquier ciudad) sean veteranas."
-#: data/default/buildings.ruleset:1280 data/civ2/buildings.ruleset:1264
+#: data/default/buildings.ruleset:1279 data/civ2/buildings.ruleset:1264
#: data/civ1/buildings.ruleset:885
msgid "Magellan's Expedition"
msgstr "La Expedición de Magallanes"
-#: data/default/buildings.ruleset:1295
+#: data/default/buildings.ruleset:1294
msgid "Gives all your sea units 2 additional movement points."
msgstr ""
"Otorga a todas las unidades marítimas 2 puntos de movimiento adicionales."
-#: data/default/buildings.ruleset:1300 data/civ2/buildings.ruleset:1283
+#: data/default/buildings.ruleset:1299 data/civ2/buildings.ruleset:1283
#: data/civ1/buildings.ruleset:904
msgid "Manhattan Project"
msgstr "El Proyecto Manhattan"
-#: data/default/buildings.ruleset:1318 data/civ2/buildings.ruleset:1301
+#: data/default/buildings.ruleset:1317 data/civ2/buildings.ruleset:1301
msgid "Marco Polo's Embassy"
msgstr "La Embajada de Marco Polo"
-#: data/default/buildings.ruleset:1332 data/civ2/buildings.ruleset:1315
+#: data/default/buildings.ruleset:1331 data/civ2/buildings.ruleset:1315
msgid "The player who owns it gets an embassy with all players."
msgstr ""
"El jugador que la posee obtiene una embajada con cada uno de los demás "
"jugadores."
-#: data/default/buildings.ruleset:1337 data/civ2/buildings.ruleset:1320
+#: data/default/buildings.ruleset:1336 data/civ2/buildings.ruleset:1320
#: data/civ1/buildings.ruleset:922
msgid "Michelangelo's Chapel"
msgstr "La Capilla Sixtina"
-#: data/default/buildings.ruleset:1351 data/civ2/buildings.ruleset:1334
+#: data/default/buildings.ruleset:1350 data/civ2/buildings.ruleset:1334
msgid ""
"Counts as having a Cathedral in each of your cities. This makes 3 unhappy "
"citizens content in each city. The discovery of Theology increases the "
@@ -19688,23 +19803,23 @@ msgstr ""
"descubrimiento de la Teología incrementa este efecto en 1, y el del "
"Comunismo lo reduce en 1)."
-#: data/default/buildings.ruleset:1361 data/civ2/buildings.ruleset:1344
+#: data/default/buildings.ruleset:1360 data/civ2/buildings.ruleset:1344
#: data/civ1/buildings.ruleset:941
msgid "Oracle"
msgstr "El Oráculo"
-#: data/default/buildings.ruleset:1375
+#: data/default/buildings.ruleset:1374
msgid "Makes two of your unhappy citizens content in every city with a temple."
msgstr ""
"Hace que dos ciudadanos descontentos pasen a estar conformes en todas las "
"ciudades que tengan un Templo."
-#: data/default/buildings.ruleset:1380 data/civ2/buildings.ruleset:1363
+#: data/default/buildings.ruleset:1379 data/civ2/buildings.ruleset:1363
#: data/civ1/buildings.ruleset:960
msgid "Pyramids"
msgstr "Las Pirámides"
-#: data/default/buildings.ruleset:1394
+#: data/default/buildings.ruleset:1393
msgid ""
"The amount of stored food lost when one of your cities grows or shrinks is "
"reduced by 25%. This helps a city to grow faster and more easily withstand "
@@ -19714,34 +19829,34 @@ msgstr ""
"decrece será reducido en un 25%. Esto ayuda a que la ciudad crezca más "
"rápidamente o que resista mejor a las hambrunas. Acumulativo con Granero."
-#: data/default/buildings.ruleset:1401 data/civ2/buildings.ruleset:1382
+#: data/default/buildings.ruleset:1400 data/civ2/buildings.ruleset:1382
#: data/civ1/buildings.ruleset:981
msgid "SETI Program"
msgstr "El Proyecto SETI"
-#: data/default/buildings.ruleset:1415
+#: data/default/buildings.ruleset:1414
msgid "Boosts science production in each city with a Research Lab by 100%. "
msgstr ""
"Impulsa en un 100% la producción científica de todas tus ciudades que tengan "
"un Laboratorio. "
-#: data/default/buildings.ruleset:1420 data/civ2/buildings.ruleset:1402
+#: data/default/buildings.ruleset:1419 data/civ2/buildings.ruleset:1402
#: data/civ1/buildings.ruleset:1001
msgid "Shakespeare's Theatre"
msgstr "El Teatro de Shakespeare"
-#: data/default/buildings.ruleset:1434 data/civ2/buildings.ruleset:1416
+#: data/default/buildings.ruleset:1433 data/civ2/buildings.ruleset:1416
#: data/civ1/buildings.ruleset:1015
msgid "Makes all unhappy citizens content, in the city where it is located."
msgstr ""
"Hace que todos los ciudadanos descontentos de la ciudad en la que se "
"encuentra pasen a estar conformes."
-#: data/default/buildings.ruleset:1439 data/civ2/buildings.ruleset:1421
+#: data/default/buildings.ruleset:1438 data/civ2/buildings.ruleset:1421
msgid "Statue of Liberty"
msgstr "Estatua de la Libertad"
-#: data/default/buildings.ruleset:1453 data/civ2/buildings.ruleset:1435
+#: data/default/buildings.ruleset:1452 data/civ2/buildings.ruleset:1435
#: data/civ1/buildings.ruleset:974 data/civ1/buildings.ruleset:1034
msgid ""
"Allows you to choose any government, including those that have not yet been "
@@ -19751,11 +19866,11 @@ msgstr ""
"Te permite elegir cualquier forma de gobierno, incluyendo las que todavía no "
"has descubierto, y sin el periodo intermedio de Anarquía."
-#: data/default/buildings.ruleset:1460 data/civ2/buildings.ruleset:1442
+#: data/default/buildings.ruleset:1459 data/civ2/buildings.ruleset:1442
msgid "Sun Tzu's War Academy"
msgstr "La Academia Militar de Sun Tzu"
-#: data/default/buildings.ruleset:1474
+#: data/default/buildings.ruleset:1473
msgid ""
"All your new ground units start at the first veteran level. The chance of a "
"unit getting the next veteran level after a battle increases by half."
@@ -19764,21 +19879,21 @@ msgstr ""
"primer nivel de veteranía. Además, la probabilidad de que una unidad se "
"vuelva más veterana tras una batalla aumenta en un 50%."
-#: data/default/buildings.ruleset:1481 data/civ2/buildings.ruleset:1463
+#: data/default/buildings.ruleset:1480 data/civ2/buildings.ruleset:1463
#: data/civ1/buildings.ruleset:1020
msgid "United Nations"
msgstr "Las Naciones Unidas"
-#: data/default/buildings.ruleset:1495
+#: data/default/buildings.ruleset:1494
msgid "All your units regain two extra hitpoints per turn."
msgstr "La unidades recuperan dos puntos de vida adicionales cada turno."
-#: data/default/buildings.ruleset:1508 data/civ2/buildings.ruleset:1490
+#: data/default/buildings.ruleset:1507 data/civ2/buildings.ruleset:1490
#: data/civ1/buildings.ruleset:1046
msgid "Women's Suffrage"
msgstr "El Sufragio Femenino"
-#: data/default/buildings.ruleset:1522 data/civ2/buildings.ruleset:1504
+#: data/default/buildings.ruleset:1521 data/civ2/buildings.ruleset:1504
msgid ""
"Counts as a Police Station in every city. (That is, for each city, reduces "
"unhappiness for military units outside the city by 2 under Democracy and 1 "
@@ -19789,11 +19904,11 @@ msgstr ""
"están fuera de la ciudad en 2 ciudadanos bajo Democracia y en 1 bajo "
"República. Esta maravilla no tiene efecto con otras formas de gobierno)."
-#: data/default/buildings.ruleset:1533
+#: data/default/buildings.ruleset:1532
msgid "Coinage"
msgstr "Acuñación"
-#: data/default/buildings.ruleset:1554
+#: data/default/buildings.ruleset:1553
msgid ""
"This is not a normal improvement. Instead, setting a city's production to "
"Coinage means its shield production is converted to tax output (money, "
@@ -20012,13 +20127,13 @@ msgstr ""
"estar conforme en todas las ciudades."
#: 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 ""
-"Tu reputación y buena voluntad entre las naciones se incrementa mientras "
-"posees esta Maravilla. La reputación se recupera al doble de velocidad."
+"Tu reputación y buena voluntad entre las naciones se recupera al cuádruple "
+"de velocidad."
#: data/civ2/buildings.ruleset:1115 data/civ1/buildings.ruleset:770
msgid "Works as a City Wall in all cities."
@@ -20242,11 +20357,16 @@ msgstr "Celta"
msgid "?citystyle:Industrial"
msgstr "Industrial"
-#: data/default/cities.ruleset:139 data/civ2/cities.ruleset:150
+#: data/default/cities.ruleset:139
+#, fuzzy
+msgid "?citystyle:ElectricAge"
+msgstr "Celta"
+
+#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:150
msgid "?citystyle:Modern"
msgstr "Moderno"
-#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:161
+#: data/default/cities.ruleset:161 data/civ2/cities.ruleset:161
msgid "?citystyle:PostModern"
msgstr "Posmoderno"
@@ -20301,9 +20421,8 @@ msgstr "Jefe"
#: data/default/governments.ruleset:79 data/civ2/governments.ruleset:76
#: data/civ1/governments.ruleset:78
-#, fuzzy
msgid "?female:Chief"
-msgstr "Camarada"
+msgstr "Jefa"
#: data/default/governments.ruleset:81 data/civ1/governments.ruleset:80
msgid ""
@@ -21344,7 +21463,6 @@ msgstr ""
"a los ataques enemigos."
#: data/default/units.ruleset:238
-#, fuzzy
msgid "?unit:Workers"
msgstr "Obreros"
@@ -21423,7 +21541,7 @@ msgstr "Falange"
#: data/default/units.ruleset:378 data/civ2/units.ruleset:232
#: data/civ1/units.ruleset:199
msgid "The Phalanx is armored infantry, suitable for defending your cities."
-msgstr ""
+msgstr "La Falange es una infantería armada, usada para defender sus ciudades."
#: data/default/units.ruleset:383 data/civ2/units.ruleset:237
msgid "Archers"
@@ -21434,6 +21552,8 @@ msgid ""
"Archers fight with bows and arrows and has a good offensive value as well as "
"decent defense."
msgstr ""
+"Los arqueros luchan con arcos y flechas, y tiene un valor ofensivo bueno y "
+"una defensa decente."
#: data/default/units.ruleset:415 data/civ2/units.ruleset:269
#: data/civ1/units.ruleset:204
@@ -21446,6 +21566,8 @@ msgid ""
"Legions are heavily armed and well disciplined infantry units with an "
"excellent offensive value."
msgstr ""
+"Las legiones están fuertemente armadas, son muy disciplinadas y tienen un "
+"valor ofensivo excelente."
#: data/default/units.ruleset:447 data/civ2/units.ruleset:301
msgid "Pikemen"
@@ -21456,6 +21578,8 @@ msgid ""
"Equipped with long pikes, Pikemen replaces Phalanx as the preferred city "
"defender."
msgstr ""
+"Equipado con largas picas, los Piqueros sustituye las Falanges como la "
+"unidad preferida para defender ciudades."
#: data/default/units.ruleset:479 data/civ2/units.ruleset:333
#: data/civ1/units.ruleset:236
@@ -21467,6 +21591,8 @@ msgid ""
"Musketeers are infantry equipped with early firearms and replace Pikemen as "
"the preferred city defender."
msgstr ""
+"Mosqueteros son una infantería equipada con armas de fuego tempranas que "
+"reemplazar los Piqueros como el defensor preferido de las ciudades."
#: data/default/units.ruleset:513 data/civ2/units.ruleset:400
msgid "Partisan"
@@ -21503,6 +21629,8 @@ msgstr "Tropas alpinas"
#: data/default/units.ruleset:579 data/civ2/units.ruleset:466
msgid "Alpine Troops are highly mobile units as well as excellent defenders."
msgstr ""
+"Las Tropas Alpinas son altamente móviles, así como unos excelentes "
+"defensores."
#: data/default/units.ruleset:585 data/civ2/units.ruleset:472
#: data/civ1/units.ruleset:270
@@ -21514,6 +21642,8 @@ msgstr "Fusileros"
msgid ""
"Riflemen are World War-era infantry, very good at defending your cities."
msgstr ""
+"Los Fusileros son la infantería de la Primera Guerra Mundial, muy buenos en "
+"la defensa de sus ciudades."
#: data/default/units.ruleset:617 data/civ2/units.ruleset:504
msgid "Marines"
@@ -21521,7 +21651,7 @@ msgstr "Marines"
#: data/default/units.ruleset:643 data/civ2/units.ruleset:530
msgid "Marines are infantry who are experts at marine warfare."
-msgstr ""
+msgstr "Los Marines son una infantería que son expertos en la guerra naval."
#: data/default/units.ruleset:648 data/civ2/units.ruleset:535
msgid "Paratroopers"
@@ -21529,7 +21659,7 @@ msgstr "Paracaidistas"
#: data/default/units.ruleset:674 data/civ2/units.ruleset:561
msgid "Paratroopers are experts at airborne attacks."
-msgstr ""
+msgstr "Los paracaidistas son expertos en ataques aéreos."
#: data/default/units.ruleset:683 data/civ2/units.ruleset:570
#: data/civ1/units.ruleset:302
@@ -21554,6 +21684,8 @@ msgid ""
"Horsemen are mounted warriors and an early shock-troop that can penetrate "
"deep into enemy territory."
msgstr ""
+"Los Jinetes son guerreros montados a caballo y unas tropas de choque "
+"tempranas que pueden penetrar profundamente en territorio enemigo."
#: data/default/units.ruleset:749 data/civ2/units.ruleset:636
#: data/civ1/units.ruleset:368
@@ -21566,6 +21698,8 @@ msgid ""
"Chariots are horse-pulled war wagons, stronger but more expensive than "
"horsemen."
msgstr ""
+"Los Carros son carros de combate tirados a caballo, más fuertes pero más "
+"caros que los jinetes."
#: data/default/units.ruleset:781 data/civ2/units.ruleset:732
#: data/civ1/units.ruleset:400
@@ -21576,6 +21710,7 @@ msgstr "Caballeros"
#: data/civ1/units.ruleset:427
msgid "Knights are mounted and heavily armored warriors."
msgstr ""
+"Los Caballeros son guerreros montados a caballos y con armadura pesada."
#: data/default/units.ruleset:813 data/civ2/units.ruleset:764
msgid "Dragoons"
@@ -21584,6 +21719,8 @@ msgstr "Dragones"
#: data/default/units.ruleset:840 data/civ2/units.ruleset:791
msgid "Dragoons are mounted warriors carrying early firearms."
msgstr ""
+"Los Dragones están guerreros montados a caballo que llevan armas de fuego "
+"tempranas."
#: data/default/units.ruleset:845 data/civ2/units.ruleset:796
#: data/civ1/units.ruleset:335
@@ -21592,7 +21729,7 @@ msgstr "Caballer
#: data/default/units.ruleset:871 data/civ2/units.ruleset:822
msgid "Cavalry are mounted and highly trained soldiers."
-msgstr ""
+msgstr "La Caballería son soldados montados a caballo y altamente entrenados."
#: data/default/units.ruleset:876 data/civ2/units.ruleset:827
#: data/civ1/units.ruleset:432
@@ -21605,6 +21742,8 @@ msgid ""
"Armors are motorized war wagons that are faster, stronger, and can take more "
"damage than any mounted unit."
msgstr ""
+"Los Tanques son carros de guerra motorizados que son más rápidos, más "
+"fuertes, y puede infligir más daños que cualquier unidad montada."
#: data/default/units.ruleset:909 data/civ2/units.ruleset:860
#: data/civ1/units.ruleset:465
@@ -21617,6 +21756,9 @@ msgid ""
"Catapults are large rock-throwing machines of war. They are very strong "
"attackers but equally weak defenders and will need an escort to be effective."
msgstr ""
+"Las Catapultas son grandes máquinas de guerra que lanzan rocas. Son unos "
+"atacantes muy fuertes pero son unos defensores muy débiles y necesitan una "
+"escolta para ser eficaz."
#: data/default/units.ruleset:942 data/civ2/units.ruleset:893
#: data/civ1/units.ruleset:498
@@ -21630,6 +21772,9 @@ msgid ""
"distances. They are very strong attackers but equally weak defenders and "
"will need an escort to be effective."
msgstr ""
+"Los Cañones son armas de fuego de gran tamaño que puede disparar proyectiles "
+"pesados a largas distancias. Son muy fuertes atacando, pero igualmente "
+"débiles defendiendo por lo necesitan de una escolta para ser eficazes."
#: data/default/units.ruleset:976 data/civ2/units.ruleset:927
#: data/civ1/units.ruleset:532
@@ -21641,6 +21786,8 @@ msgid ""
"The artillery is an upgraded cannon. It is a very strong attacker but "
"equally weak defender and will need an escort to be effective."
msgstr ""
+" La artillería es un cañón actualizado. Es un atacante muy fuerte "
+"peroigualmente un débil defensor y necesita una escolta para ser eficaz."
#: data/default/units.ruleset:1009 data/civ2/units.ruleset:960
msgid "Howitzer"
@@ -21651,6 +21798,8 @@ msgid ""
"Howitzers are upgraded artillery with improved defensive as well as "
"offensive capabilities."
msgstr ""
+"Los Obuses son una artillería actualizada con una mejora defensiva, así "
+"comocapacidades ofensivas muy notables."
#: data/default/units.ruleset:1041 data/civ2/units.ruleset:992
#: data/civ1/units.ruleset:564
@@ -21663,6 +21812,8 @@ msgid ""
"Fighters are your first airborne units. They can move anywhere and attack "
"any unit."
msgstr ""
+"Los Cazas son las primeras unidades aéreas. Se pueden mover por todos los "
+"sitios y atacar a cualquier unidad."
#: data/default/units.ruleset:1073 data/civ2/units.ruleset:1024
#: data/civ1/units.ruleset:596
@@ -21675,6 +21826,8 @@ msgid ""
"Bombers are specialized airborne units that may only attack ground targets, "
"not other airborne units."
msgstr ""
+"Los bombarderos son unidades aéreas especializadas que sólo se puede atacar "
+"objetivos en tierra, no a otras unidades en el aire."
#: data/default/units.ruleset:1132 data/civ2/units.ruleset:1083
msgid ""
@@ -21719,6 +21872,9 @@ 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 trirreme es su primera unidad de barco. Puede actuar como un buque de "
+"transporte y tiene una rudimentaria capacidad ofensiva, pero no puede "
+"alejarse demasiado de la orilla."
#: data/default/units.ruleset:1237 data/civ2/units.ruleset:1188
msgid "Caravel"
@@ -21728,6 +21884,7 @@ msgstr "Caravela"
msgid ""
"The Caravel replaces the Trireme and is much more reliable on the open seas."
msgstr ""
+"La carabela sustituye al trirreme y es mucho más fiable en mar abierto."
#: data/default/units.ruleset:1269 data/civ2/units.ruleset:1220
msgid "Galleon"
@@ -21738,6 +21895,8 @@ msgid ""
"The Galleon is a pure transport ship and cannot attack other ships, though "
"it may still defend itself when attacked."
msgstr ""
+"El Galeón es un buque de transporte puro y no puede atacar a otros barcos, "
+"aunque todavía puede defenderse cuando es atacado."
#: data/default/units.ruleset:1302 data/civ2/units.ruleset:1253
#: data/civ1/units.ruleset:694
@@ -21750,6 +21909,8 @@ msgid ""
"The Frigate is a highly versatile boat unit, that is both a strong offensive "
"unit as well as a decent transport ship."
msgstr ""
+"La Fragata es una unidad naval de gran versatilidad, que es tanto una fuerte "
+"unidad ofensiva, así como un buque de transporte decente."
#: data/default/units.ruleset:1335 data/civ2/units.ruleset:1286
#: data/civ1/units.ruleset:727
@@ -21762,6 +21923,8 @@ msgid ""
"The Ironclad is an armored ship that is much more sturdy than the Frigate "
"but loses the latter's transport capability."
msgstr ""
+"La Patrullera es un buque blindado que es mucho más sólido que la "
+"Fragatapero pierde la capacidad de transporte de este último."
#: data/default/units.ruleset:1368 data/civ2/units.ruleset:1319
msgid "Destroyer"
@@ -21783,7 +21946,7 @@ msgstr "Crucero"
#: data/default/units.ruleset:1426 data/civ2/units.ruleset:1377
#: data/civ1/units.ruleset:786
msgid "The Cruiser is a strong offensive boat unit."
-msgstr ""
+msgstr "El Crucero es una unidad naval con gran poder ofensivo."
#: data/default/units.ruleset:1431 data/civ2/units.ruleset:1382
msgid "AEGIS Cruiser"
@@ -21793,6 +21956,7 @@ msgstr "Crucero AEGIS"
msgid ""
"The AEGIS Cruiser is equipped with an advanced defensive missile system."
msgstr ""
+"El Crucero Aegis está equipado con un avanzado sistema defensivo de misiles."
#: data/default/units.ruleset:1463 data/civ2/units.ruleset:1414
#: data/civ1/units.ruleset:791
@@ -21805,6 +21969,8 @@ msgid ""
"The Battleship is the supreme naval unit with excellent offensive and "
"defensive values."
msgstr ""
+"El Acorazado es la unidad naval suprema con excelentes valores ofensivos "
+"ydefensivos."
#: data/default/units.ruleset:1495 data/civ2/units.ruleset:1446
#: data/civ1/units.ruleset:823
@@ -21842,6 +22008,8 @@ msgid ""
"The Transport cannot attack on its own but may defend itself when under "
"attack."
msgstr ""
+"El transporte no puede atacar por su cuenta, pero pueden defenderse cuando "
+"está siendo atacado."
#: data/default/units.ruleset:1593 data/civ2/units.ruleset:1544
msgid "Cruise Missile"
@@ -21899,7 +22067,6 @@ msgstr "Diplom
#: data/default/units.ruleset:1698 data/civ2/units.ruleset:1649
#: data/civ1/units.ruleset:993
-#, fuzzy
msgid ""
"A Diplomat is an official that carries your dispatches and is authorized to "
"deal with foreign dignitaries. He may also undertake various covert "
@@ -21920,15 +22087,24 @@ msgid ""
"the enemy. Little wonder that Diplomats are often viewed with suspicion and "
"fear!"
msgstr ""
-"- Un Diplomático puede establecer embajadas con otras civilizaciones "
-"entrando en la ciudad de otro jugador.\n"
-"\n"
-"- Los Diplomáticos también pueden intentar sabotear la producción enemiga, o "
-"robar un avance de una ciudad enemiga (sólo se puede robar un avance de cada "
-"ciudad).\n"
-"\n"
-"- ¡Un Diplomático puede incluso provocar una sublevación en una ciudad "
-"enemiga, y hacer que pase a ser tuya, si tienes suficiente oro!\n"
+"Un diplomático es un funcionario que lleva sus despachos y tiene "
+"autorización para hacer frente a dignatarios extranjeros. También puede "
+"llevar a cabo diversas operaciones encubiertas con la intención de dañar a "
+"sus oponentes.\n"
+"\n"
+"Si una unidad enemiga está sola en una casilla, puede intentar sobornarla "
+"con su diplomático. Mediante el pago de una suma de oro, la unidad se "
+"convertirá inmediatamente en suya.\n"
+"\n"
+"El diplomático también puede realizar una serie de acciones en la ciudad de "
+"otro jugador:\n"
+"- \"Investigar\" Revelar información detallada sobre la ciudad.\n"
+"- \"Establecer Embajada\" Obtener información permanente sobre el jugador.\n"
+"- \"Sabotear\" Arruinar toda la producción en la ciudad.\n"
+"- \"Robar Tecnología\" Adquirir un nueva tecnología del propietario de la "
+"ciudad.\n"
+"- \"Incitar una Revuelta\" Hacer una ciudad suya mediante el pago de una "
+"suma de oro. Nótese que no se puede incitar una revuelta en la capital.\n"
"\n"
"- En algunas estrategias de juego, se puede usar hordas de Diplomáticos para "
"debilitar al enemigo. ¡No es de extrañar que a menudo se mire a los "
@@ -21939,7 +22115,6 @@ msgid "Spy"
msgstr "Espía"
#: data/default/units.ruleset:1749 data/civ2/units.ruleset:1700
-#, fuzzy
msgid ""
"A Spy is more skilled in the arts of espionage than her Diplomat "
"predecessor.\n"
@@ -21956,23 +22131,21 @@ msgid ""
"A Spy can also be of aid on the battlefield - sabotaging enemy units as well "
"as bribing them to change allegiance."
msgstr ""
-"Un Espía es un profesional a tiempo completo y es mucho más hábil en las "
+"Una Espía es un profesional a tiempo completo y es mucho más hábil en las "
"artes del espionaje que su predecesor, el Diplomático.\n"
"\n"
-"Las habilidades más inofensivas del repertorio un Espía son la investigación "
-"de ciudades, dando información detallada sobre ellas, y el establecimiento "
-"de embajadas. No obstante, si tu Espía tiene mala reputación por su "
-"conducta clandestina será ejecutado si trata de establecer una embajada.\n"
+"Ella puede realizar todas las funciones del diplomático, pero con una mayor "
+"tasa de éxito. Refiérase a la entrada diplomático para un resumen.\n"
"\n"
-"Un Espía también se puede usar para: envenenar el suministro de agua de una "
+"Una Espía también se puede usar para: envenenar el suministro de agua de una "
"ciudad (reduciendo la población), robar una tecnología en concreto, y "
"sabotear objetivos predeterminados de la ciudad (nota: sabotear las "
"instalaciones de la capital o sabotear las Murallas incrementa el riesgo de "
-"captura). También puede infiltrarse en una ciudad e inducir una "
+"captura). También puede infiltrarse en una ciudad e inducir una "
"sublevación.\n"
"\n"
-"Los Espías también se pueden usar en el campo de batalla: puede sabotear "
-"unidades enemigas y también sobornarlas para que deserten."
+"Las Espías también se pueden usar en el campo de batalla saboteando unidades "
+"enemigas y también sobornandolas para que deserten."
#: data/default/units.ruleset:1766 data/civ2/units.ruleset:1717
#: data/civ1/units.ruleset:1018
@@ -22014,7 +22187,6 @@ msgstr ""
"Los Exploradores son muy útiles para explorar un territorio desconocido."
#: data/default/units.ruleset:1864
-#, fuzzy
msgid "?unit:Leader"
msgstr "Líder"
@@ -22126,6 +22298,9 @@ msgid ""
"Elephants are towering animals trained for war that are often used as "
"powerful shock troops, but defend poorly against most other units."
msgstr ""
+"Los elefantes son animales imponentes entrenados para la guerra que a menudo "
+"son utilizados como las tropas de choque de gran alcance, pero se defienden "
+"mal en contra de la mayoría de las unidades."
#: data/civ2/units.ruleset:700
msgid "Crusaders"
@@ -22135,6 +22310,8 @@ msgstr "Cruzados"
msgid ""
"Crusaders are highly disciplined mounted warriors driven by a higher cause."
msgstr ""
+"Los Cruzados son unos guerreros montados muy disciplinados impulsados por "
+"una causa superior."
#: data/civ1/units.ruleset:123
msgid ""
@@ -22174,18 +22351,23 @@ msgid ""
"Musketeers are infantry equipped with early firearms and replace Phalanx as "
"the preferred city defender."
msgstr ""
+"Los Mosqueteros son una infantería equipada con armas de fuego tempranas y "
+"reemplazan a las Falanges como el defensor preferido de la ciudad ."
#: data/civ1/units.ruleset:361
msgid ""
"Cavalry are mounted warriors and an early shock-troop that can penetrate "
"deep into enemy territory."
msgstr ""
+"La Caballería son tropas montadas y constituien una fuerza de choque "
+"temprana que pueden penetrar profundamente en territorio enemigo."
#: data/civ1/units.ruleset:558
msgid ""
"The artillery is an upgraded cannon with improved defensive as well as "
"offensive capabilities."
msgstr ""
+"La Artillería es un cañón mejorado con una mejora defensiva así comoofensiva."
#: data/civ1/units.ruleset:662
msgid "Sail"
@@ -22194,7 +22376,7 @@ msgstr "Barco"
#: data/civ1/units.ruleset:688
msgid ""
"The Sail replaces the Trireme and is much more reliable on the open seas."
-msgstr ""
+msgstr "El Barco sustituye el trirreme y es mucho más fiable en mar abierto."
#: data/civ1/units.ruleset:946
msgid ""
@@ -22406,7 +22588,6 @@ msgid "?plural:Armenians"
msgstr "Armenios"
#: data/nation/armenian.ruleset:6
-#, fuzzy
msgid ""
"According to legend, the Armenian people are the descendants of Haik - the "
"great-great-grandson of Noah. The modern Republic of Armenia gained "
@@ -23471,16 +23652,17 @@ msgid "?plural:Icelanders"
msgstr "Islandeses"
#: data/nation/icelandic.ruleset:6
-#, fuzzy
msgid ""
"Iceland was long one of the largest uninhabited islands in the world, until "
"it was settled by Norwegian Vikings in the late 9th century. The island was "
"kept initially under the Norwegian and later the Danish crown until "
"independence from Denmark in 1944."
msgstr ""
-"Islandia fue descubierta y colonizada por los Vikingos Noruegos al final del "
-"siglo IX. La isla estuvo bajo dominio noruego y más tarde pasó a estar en "
-"manos de la corona danesa hasta que recibieron su independencia en 1944."
+"Islandia fue durante mucho tiempo una de las mayores islas deshabitadas del "
+"mundo, hasta que fue descubierta y colonizada por los Vikingos Noruegos al "
+"final del siglo IX. La isla estuvo bajo dominio noruego y más tarde pasó a "
+"estar en manos de la corona danesa hasta que recibieron su independencia en "
+"1944."
#: data/nation/illyrian.ruleset:3
msgid "Illyrian"
@@ -23491,7 +23673,6 @@ msgid "?plural:Illyrians"
msgstr "Illyrianos"
#: data/nation/illyrian.ruleset:6
-#, fuzzy
msgid ""
"Illyrians were Indo-European tribes who appeared in the western part of the "
"Balkan Peninsula before 1000 BC, including Corcyra island and Ambracia bay "
@@ -23499,13 +23680,12 @@ msgid ""
"the east, and settled Messapia across the Adriatic Sea. Illyrian kingdoms "
"were independent for centuries, until conquered by the Roman Republic."
msgstr ""
-"Los Illyrianos fueron una de las tribus Indoeuropeas que aparecieron en la "
-"parte oeste de la Península Balcánica antes del año 1000 A.C., incluyendo a "
-"los Dalmáticos en el norte, la isla de Corfú y la bahía de Arta en la "
-"prehistórica Epira, al sur, mezclados con los Thracianos de Dardania del "
-"Este, y conquistando Mesapia por todo el Mar Adriático. Los reinos de "
-"Illyria fueron independientes durante siglos, hasta que fueron conquistados "
-"por el Imperio Romano."
+"Los Illirios fueron una de las tribus Indoeuropeas que aparecieron en la "
+"parte oeste de la Península Balcánica antes del año 1000 A.C., incluyendo a "
+"la isla de Corfú y la bahía de Arta en la prehistórica Epira al sur. Se "
+"mezclaron con los Thracianos de Dardania del Este, y conquistaron Mesapia "
+"por todo el Mar Adriático. Los reinos de Illiria fueron independientes "
+"durante siglos, hasta que fueron conquistados por el Imperio Romano."
#: data/nation/inca.ruleset:3
msgid "Inca"
@@ -23592,7 +23772,6 @@ msgid "?plural:Inuits"
msgstr "Inuits"
#: 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 "
@@ -23812,9 +23991,8 @@ msgid "Kenya gained independence from Britain in December 1963."
msgstr "Kenia adquirió su independencia de Gran Bretaña en Diciembre de 1963."
#: data/nation/kenyan.ruleset:18
-#, fuzzy
msgid "Nabongo"
-msgstr "Nabab"
+msgstr "Nabongo"
#: data/nation/korean.ruleset:3
msgid "Korean"
@@ -23873,7 +24051,7 @@ msgstr "Princesa"
#: data/nation/lankese.ruleset:21 data/nation/quebecois.ruleset:20
#: data/nation/texan.ruleset:19
msgid "Governor"
-msgstr "Governador"
+msgstr "Gobernador"
#: data/nation/lankese.ruleset:22
msgid "Supreme Commander"
@@ -24011,7 +24189,6 @@ msgid "?plural:Malians"
msgstr "Malíes"
#: data/nation/malian.ruleset:6
-#, fuzzy
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 "
@@ -24020,8 +24197,8 @@ msgid ""
"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 ""
-"La África Sub-Sahariana ha sido cultural y étnicamente un crisol para los "
-"milenarios. En tiempos medievales, la región fue casa para una suecesión de "
+"La África Sub-Sahariana ha sido cultural y étnicamente un crisol durante "
+"milenios. En tiempos medievales, la región fue la morada de una sucesión de "
"imperios denominados Imperios Sahelianos. De estos, el Imperio Islámico Malí "
"con su capital en Timbuktu fue el más influente. Este imperio reinó desde el "
"siglo XIV hasta el XVII y fue famoso por su buena vida y benévolos reyes. La "
@@ -24089,12 +24266,11 @@ msgid "?plural:Mayas"
msgstr "Mayas"
#: data/nation/mayan.ruleset:6
-#, fuzzy
msgid ""
"The Mayans were a Mesoamerican civilization. They are famous for building "
"great pyramids and palaces in the jungle."
msgstr ""
-"Los Mayas fueron una civilización de Mesoamérica. Famosos por construir "
+"Los Mayas fueron una civilización de Mesoamérica. Son famosos por construir "
"grandes pirámides y palacios en medio de la selva."
#: data/nation/mayan.ruleset:19
@@ -24510,15 +24686,14 @@ msgid "?plural:Sami"
msgstr "Saamis"
#: 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 ""
"Los Saamis, o Laponios, son gente que viven al norte de Escandinavia. Se "
-"extienden al norte de regiones escandinavas siguientes: Finnmark de Noruega, "
-"Laponia de Suecia y Laponia de Finlandia."
+"extienden al norte de regiones escandinavas siguientes: Finnmark de Noruega "
+"y Laponia de Suecia y de Finlandia."
#: data/nation/sami.ruleset:21
msgid "Noaydde"
@@ -24651,14 +24826,12 @@ msgstr ""
"Checoslovaquia, fue parte del Imperio Austro-Húngaro hasta el año 1918."
#: data/nation/slovakian.ruleset:26
-#, fuzzy
msgid "?male:Leader"
msgstr "Líder"
#: data/nation/slovakian.ruleset:26
-#, fuzzy
msgid "?female:Leader"
-msgstr "Camarada"
+msgstr "Líder"
#: data/nation/slovakian.ruleset:29
msgid "Pope"
@@ -24706,7 +24879,6 @@ msgid "?plural:Soviets"
msgstr "Soviéticos"
#: data/nation/soviet.ruleset:6
-#, fuzzy
msgid ""
"The history of the Soviet Union starts in November 1917, when under Lenin's "
"leadership a Bolshevik revolution occurred. On December 31 1922, four Soviet "
@@ -24718,7 +24890,7 @@ msgstr ""
"La historia de la Unión Soviética comienza en Noviembre de 1917, cuando tuvo "
"lugar la revolución Bolchevique bajo el mando de Lenin. El 31 de Diciembre "
"de 1922, cuatro repúblicas soviéticas fueron unificadas en un país. La Unión "
-"Soviética pasó a ser uno de los estados más potentes en el siglo XX. Pero a "
+"Soviética pasó a ser uno de los estados más potentes en el siglo XX, pero a "
"finales del año 1991, debido a varios conflictos sociales, se desintegró en "
"quince países independientes."
@@ -25157,7 +25329,6 @@ msgid "?plural:Westphalians"
msgstr "Westfalianos"
#: data/nation/westphalian.ruleset:6
-#, fuzzy
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 "
@@ -25253,6 +25424,11 @@ msgid ""
"and using your settlers to find a good place to build\n"
"a city. Use the number pad to move units around."
msgstr ""
+"Bienvenido a Freeciv. Tu lideras a una civilizacion. Tu tarea\n"
+"es conquistar el mundo! Tu deberías comenzar a \n"
+"explorar la tierrra a tu alrededor con un explorador,\n"
+"y usar tus colonos para encontrar una buen sitio para fundar\n"
+"ciudades. Usa el teclado numérico para mover tus unidades."
#: data/scenario/tutorial.sav:34
msgid ""
@@ -25263,6 +25439,14 @@ msgid ""
"is the most important resource for any city. Grassland and plains\n"
"provide plenty of food."
msgstr ""
+"Aquí parece un buen lugar para construir una ciudad. La próxima vez que "
+"esta\n"
+"unidad tenga la oportunidad de mover, pulsa (b) para fundar una ciudad.\n"
+"\n"
+"En general, tu quieres construir ciudades en campo abierto cerca del agua. "
+"La comida\n"
+"es el recurso más importante para cualquier ciudad. Las praderas y llanuras\n"
+" proporcionan un montón de comida."
#: data/scenario/tutorial.sav:49
msgid ""
@@ -25278,6 +25462,19 @@ msgid ""
"dialog. If all goes well the city should display the settler\n"
"production on the map view."
msgstr ""
+"Ahora, tu has construido tu primera ciudad. La ventana de la ciudad se\n"
+"abre automáticamente, y si no, haz clic sobre la ciudad para abrirla. Las\n"
+"ciudades son un concepto fundamental en Freeciv, por lo que debes\n"
+"familiarizarse con ellas jugando en la ventana. Ver el menú de ayuda para "
+"más información.\n"
+"\n"
+"Es probable que quieras construir algunos colonos primero, a fin de ampliar\n"
+"tu civilización. Haz clic en la ficha de producción, a continuación, haz "
+"clic\n"
+"en la unidad de los colonos de la lista de producciones posibles, \n"
+"a continuación, haz clic en el Botón Cambiar para comenzar su construcción.\n"
+"Cuando haya terminado, cierra la ventana de la ciudad. Si todo va bien, la\n"
+"ciudad debe mostrar la producción de los colonos en el mapa."
#: data/scenario/tutorial.sav:62
msgid ""
@@ -25286,6 +25483,11 @@ msgid ""
"because of the terrain around it. You probably want to build\n"
"settlers here too."
msgstr ""
+"Felicitaciones, has fundado tu segunda ciudad. Esta ciudad se\n"
+"comportará casi exactamente igual que la primera - que será un poco "
+"diferente\n"
+"debido al terreno a su alrededor. Es probable que quieras construir\n"
+"colonos también aquí."
#: data/scenario/tutorial.sav:68
msgid ""
@@ -25303,6 +25505,24 @@ msgid ""
"append it to the worklist. As soon as the Barracks are complete the\n"
"city will automatically switch over to producing the unit."
msgstr ""
+"Tu has construido tu tercera ciudad! Tu civilización parece ser\n"
+"próspera. Podría ser el momento de pensar en la parte militar. Elije una de\n"
+"las ciudades que tiene una alta producción, y conviertela en una base "
+"militar.\n"
+"Primero construye un cuartel, y luego empieza a trabajar en una unidad "
+"militar.\n"
+"Elige la mejor unidad que tienes disponible - al principio del juego,\n"
+"los Guerreros será la única opción, pero pronto tendrás un montón\n"
+"de opciones.\n"
+"\n"
+"Este también podría ser un buen momento para utilizar la función de lista "
+"de\n"
+"trabajo del informe de producción de la ventana de la ciudad . Haz clic en "
+"el\n"
+"cuartel, a continuación, haz clic en Cambiar para comenzar su construcción.\n"
+"Luego, haga doble clic sobre una unidad militar para añadir a la lista de \n"
+"trabajo. Tan pronto como el cuartel se complete, la ciudad cambiará\n"
+"automáticamente a la producción de la unidad."
#: data/scenario/tutorial.sav:83
msgid ""
@@ -25318,6 +25538,19 @@ msgid ""
"will take; it also shows how long the city will take to grow to the\n"
"next largest size."
msgstr ""
+"Otra ciudad! Tu estás realmente cogiendo el truquillo. Tú ahora\n"
+"probablemente tiene una idea bastante buena de qué hacer con las ciudades\n"
+"nuevas. Toma un momento para mirar en la barra de abajo de la ciudad\n"
+"en el mapa. Se muestra información útil sobre la ciudad. La bandera y el "
+"color\n"
+"de fondo indican a que civilización pertenece la ciudad (esto será útil "
+"cuando\n"
+"contactes con otras civilizaciones). La fila superior de la barra también \n"
+"muestra el nombre y el tamaño de la ciudad, y mostrará una o más estrellas\n"
+"para indicar si hay unidades en la ciudad. La fila inferior muestra lo que "
+"la\n"
+"ciudad está construyendo, y cuánto tiempo falta para terminar; también \n"
+"muestra el tiempo que llevará a la ciudad crecer al siguiente tamaño."
#: data/scenario/tutorial.sav:96
msgid ""
@@ -25330,6 +25563,18 @@ msgid ""
"from this report. The full power of the city report is beyond the\n"
"scope of this tutorial, however."
msgstr ""
+"Cuando el número de ciudades en el imperio crece, se hace más difícil\n"
+"gestionar las ciudades individualmente. Entonces el Informe de ciudades es\n"
+"cuando se convierte en útil. Presiona F1 para mostrarlo. Este informe "
+"muestra\n"
+"una lista de ciudades con distintas estadísticas sobre cada una. Juega un "
+"poco\n"
+"con él si quieres (vuelve a la vista de mapa haciendo clic en la pestaña "
+"Mapa).\n"
+"Con un poco de la práctica, es posible controlar casi cualquier aspecto de "
+"las\n"
+"ciudades desde este informe. Sin embargo, explicar el poder completo del\n"
+"informe de ciudades va más allá del ámbito de aplicación de este tutorial."
#: data/scenario/tutorial.sav:115
msgid ""
@@ -25343,6 +25588,16 @@ msgid ""
"in gold (if you have enough of it) to instantly complete the\n"
"production."
msgstr ""
+"Tu ciudad ha crecido! Cuando una ciudad crece, se tienen más ciudadanos\n"
+"disponibles que se pueden poner a trabajar en los campos o dedicarlos como\n"
+"especialistas. Una ciudad del tamaño de dos o más también pueden construir\n"
+"colonos, que cuestan una unidad de la población.\n"
+"\n"
+"Si tu ciudad está construyendo colonos, puedes considerar la opción de\n"
+"comprarlos ahora. Abre el diálogo de la ciudad y haz clic en el botón "
+"Comprar.\n"
+"Esto completa la producción instantáneamente a cambio de oro (si tienes\n"
+"bastante)."
#: data/scenario/tutorial.sav:127
msgid ""
@@ -25362,6 +25617,25 @@ msgid ""
"specialists - right now they are all entertainers which provide\n"
"only luxuries (which will not be useful until later)."
msgstr ""
+"Tu ciudad ha crecido de nuevo! Ahora, con tres ciudadanos tienes\n"
+"una buena cantidad de opciones donde la ciudad debe centrar su\n"
+"recursos. Una ciudad con tres ciudadanos puede trabajar tres cuadros\n"
+"diferentes, además de su casilla central que se trabaja de forma gratuita.\n"
+"En el diálogo de la ciudad, el mapa muestra las casillas que se\n"
+"están trabajando y la cantidad de comida, escudos, y el comercio que cada\n"
+"una proporciona. La comida se utiliza para hacer crecer tu ciudad, los "
+"escudos\n"
+"se utilizan para la producción de los edificios y las unidades, mientras que "
+"el\n"
+"comercio proporciona ingresos imponibles que se convirten en investigación\n"
+"científica, oro o lujos.\n"
+"\n"
+"Haz clic en una casilla trabajada para eliminar el ciudadano de la misma.\n"
+"Entonces haz clic en una casilla no trabajada para poner a un trabajador "
+"allí.\n"
+"Tu puedes colocar hasta tres trabajadores, por supuesto. El resto de los\n"
+"ciudadanos son todos especialistas - ahora todos son artistas (Elvies) que\n"
+"sólo ofrecen lujos (que no serán útiles hasta más tarde)."
#: data/scenario/tutorial.sav:145
#, c-format
@@ -25381,6 +25655,22 @@ msgid ""
"citizen). Building a marketplace enhances the benefit from this\n"
"by providing +50%% luxuries to the city."
msgstr ""
+"Ahora tu ciudad ha crecido al tamaño cinco. A medida que las ciudades se\n"
+"hacen más grandes, los disturbios se convierte en un problema. Una ciudad\n"
+"de este tamaño por lo general tendrá un ciudadano infeliz a menos que se\n"
+"utilicen los efectos de pacificación; lo que significa que se requiere un\n"
+"artista especialista para mantener conformes de los ciudadanos. Esto\n"
+"significa básicamente que se pierde un ciudadano.\n"
+"\n"
+"Hay varias cosas que puedes hacer al respecto. Una solución rápida\n"
+"es construir un templo (o un edificio cultural de otro tipo) que hará\n"
+"contento un ciudadano descontento (consulta la ayuda de los edificios para\n"
+"las especificaciones para cada tipo de edificio). A medida que tienes "
+"ciudades\n"
+"más grandes, puede convenirte cambiar tus tarifas de impuestos (pulsando\n"
+"Mayús-T) para dedicar parte de tus impuestos directamente a los lujos (cada\n"
+"dos lujos se pacifica un ciudadano). La construcción de un mercado aumenta\n"
+"el beneficio de esto proporcionando +50%% lujos de la ciudad."
#: data/scenario/tutorial.sav:162
msgid ""
@@ -25392,6 +25682,15 @@ msgid ""
"going to continue to grow you should start building one soon. Building\n"
"an aqueduct requires the Construction technology."
msgstr ""
+"Por último, tu has hecho crecer una ciudad a tamaño ocho. Una ciudad \n"
+"tamaño ocho puede proporcionar una importante cantidad de recursos siempre "
+"y\n"
+"cuando tenga suficientes lujos para mantener su población contenta.\n"
+"\n"
+"Se requiere un acueducto para que una ciudad crezca más allá de tamaño "
+"ocho.\n"
+"Si tu ciudad va a seguir creciendo debes empezar a construir uno pronto. La\n"
+"construcción de un acueducto requiere de la tecnología de Construcción."
#: data/scenario/tutorial.sav:172
msgid ""
@@ -25399,6 +25698,9 @@ msgid ""
"it larger, however, you will need to build a Sewer System. This\n"
"requires the Sanitation technology."
msgstr ""
+"Has hecho crecer una ciudad a tamaño doce. Para que crezca más, sin \n"
+"embargo, tendrás que construir un sistema de Alcantarillado. Esto requiere\n"
+"la tecnología de Higiene."
#: data/scenario/tutorial.sav:178
msgid ""
@@ -25414,6 +25716,21 @@ msgid ""
"provide enough taxable revenue (gold) to allow you to purchase some\n"
"buildings to accelerate their productions."
msgstr ""
+"Felicitaciones, tu has conseguido hacer crecer una ciudad a tamaño 13. "
+"Estas\n"
+"ciudades tan grandes pueden proporcionar una gran cantidad de la producción\n"
+"debidamente actualizadas. Asegúrate de tener suficientes impuestos y\n"
+"edificios culturales para mantener sus ciudadanos conformes o contentos. Tu\n"
+"también debes asegurarte de que la ciudad se actualiza con edificios que\n"
+"proporcionan incentivos para su producción. Una Biblioteca, un Mercado, una\n"
+" Fábrica y una Plataforma Petrolífera son cuatro edificios buenos que\n"
+"proporcionan unos bonus grandes en grandes ciudades. Considera qué\n"
+"beneficio cada edificio te proporcionará y sopesa esto en contra de su "
+"costo.\n"
+"En casi todas las ciudades muy grandes casi todos los edificios valen la "
+"pena.\n"
+"Estas ciudades grandes también proporcionar suficientes impuestos (de oro)\n"
+"que te permiten comprar algunos edificios a fin de acelerar sus producciones."
#: data/scenario/tutorial.sav:208
msgid ""
@@ -25430,6 +25747,21 @@ msgid ""
"of much use to small cities. See the help on terrain and specials\n"
"for more information about terrain specs."
msgstr ""
+"Tu has construido una unidad de Colonos. Los Colonos se usan mejor para\n"
+"construir nuevas ciudades, con el fin de ampliar tu civilización. Mueve el\n"
+"colono lejos de tus ciudades existentes para encontrar un lugar para una \n"
+"nueva ciudad. Cuándo hayas escogido un punto teclea B para fundar una \n"
+"ciudad.\n"
+"\n"
+"Otra vez, las ciudades se construyen mejor en un terreno abierto cerca del\n"
+"agua. Las Praderas y las llanuras proporcionar alimentos a la ciudad. Los\n"
+"bosques y las colinas proporcionan los recursos necesarios para la\n"
+"construcción de cosas. Los ríos y los océanos dan bonus comerciales que\n"
+"proporcionan beneficios a toda la civilización. El desierto, la tundra, y "
+"las\n"
+"montañas en general, proporcionan pocos recursos y no son de gran utilidad\n"
+"para las pequeñas ciudades. Consulta la ayuda de los terrenos y sus \n"
+"especiales para obtener más información acerca de las sus características."
#: data/scenario/tutorial.sav:222
msgid ""
@@ -25444,6 +25776,23 @@ msgid ""
"out cities properly gives each city access to more resources, allowing\n"
"them to grow to larger sizes."
msgstr ""
+"Tu segunda unidad de Colonos también debería utilizarse para construir una\n"
+"nueva ciudad. Observa cómo al mover los colonos fuera de tus ciudades\n"
+"existentes se dibuja un esquema alrededor de ellos. Esto muestra el área que "
+"se\n"
+"cubriría si una ciudad fuese construida en este lugar; se muestra además con "
+"el\n"
+"esquema en la vista de mapa que muestra las casillas que están cubiertas "
+"por\n"
+"tus ciudades ya existentes. En general, cuando se construyen nuevas "
+"ciudades\n"
+"lo que queremos hacer es que todas las casillas esten cubiertas por al "
+"menos\n"
+"una ciudad, pero después de esto, lo mejor es que tus ciudades se "
+"superponga\n"
+"tan poco como sea posible. Distribuir correctamente las ciudades les da a "
+"cada\n"
+"ciudad el acceso a más recursos, lo que permite crecer a tamaños más grandes."
#: data/scenario/tutorial.sav:245
msgid ""
@@ -25458,6 +25807,17 @@ msgid ""
"and have a small upkeep as well, so it is not a good idea to let\n"
"them go to waste."
msgstr ""
+"Tu has construido un Cuartel. Este edificio hará que cualquier unidad "
+"militar\n"
+"que construyas se cree como veterana. Las unidades veteranas son más\n"
+"fuertes que las tropas inexpertas (verdes) , y sobreviven más tiempo en\n"
+"combate. Consulta la ayuda de los edificios para obtener más información\n"
+"acerca de este y otros edificios.\n"
+"\n"
+"Tu querrás probablemente comenzar a construir una unidad militar en la\n"
+"ciudad que construyó el cuartel. Un cuartel es una inversión importante\n"
+"y tiene un mantenimiento reducido, por lo tanto, no es una buena idea dejar\n"
+"de aprovecharlo."
#: data/scenario/tutorial.sav:267
msgid ""
@@ -25471,6 +25831,19 @@ msgid ""
"founding a new city, make sure it is built on terrain that provides\n"
"enough food - grassland is best; plains or hills are almost as good."
msgstr ""
+"Tu ciudad no puede construir un Colono. Los colonos tomar una unidad de\n"
+"la población para crearse, por lo que en una ciudad de un tamaño 1 no se\n"
+"puede construir uno sin la disolución de la ciudad.\n"
+"\n"
+"Para remediar esto, es necesario ajustar los ciudadanos de la ciudad a fin "
+"de\n"
+"proporcionar más alimento para hacer crecer más rápido la ciudad. Las "
+"ciudades\n"
+"que no tienen mucha comida no debe tratar de construir los colonos. Cuándo\n"
+"fundas una nueva ciudad, asegúrate de que está construida en un terreno que\n"
+"proporciona suficiente comida - las praderas son la mejor; las llanuras o "
+"las\n"
+"colinas son casi tan buenas."
#: data/scenario/tutorial.sav:279
msgid ""
@@ -25487,6 +25860,25 @@ msgid ""
"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 ""
+"Tu has construido tu primera unidad militar! Las unidades militares tienen \n"
+"dos propósitos básicos: ataque y defensa. Cada unidad tiene una fuerza de\n"
+"ataque y una fuerza de defensa. Mientras que un Guerreros tiene un\n"
+"miserable 1 / 1, una falange es un defensor más fuerte que tiene una "
+"defensa\n"
+"de 2 (1 / 2). Una catapulta es una buena unidad de ataque, ya que tiene 6 "
+"de\n"
+"ataque (6 / 1).\n"
+"\n"
+"Generalmente es una buena idea tener uno o dos defensores en cada ciudad.\n"
+"Ciudades importantes como tu capital pueden merecer una protección\n"
+" adicional. Las unidades que has construido en una ciudad puede ser "
+"enviadas\n"
+"para defender a otra ciudad (pulse la tecla G para entrar en el modo 'Ir a' "
+"para\n"
+"mover unidades fácilmente a través de largas distancias). Si estás en "
+"guerra,\n"
+"sin embargo, puede que desees mover la unidad hacia una ciudad enemiga\n"
+"para atacarla. Ten cuidado de no perderla sin embargo!"
#: data/scenario/tutorial.sav:304
msgid ""
@@ -25508,6 +25900,34 @@ msgid ""
"technology. When you are done playing around click on the Map tab\n"
"(Alt-M) to return to the map view."
msgstr ""
+"Has descubierto tu primera tecnología! Los avances tecnológicos\n"
+"son un concepto primordial en Freeciv. A medida que aumenta tu nivel de\n"
+"tecnología, unidades, edificios, tipos de gobierno y diversas "
+"bonificaciones\n"
+"estarán disponible para ti.\n"
+"\n"
+"Ahora, ves al diálogo de la Ciencia a jugar un poco. Presiona F6 para abrir "
+"el\n"
+"diálogo de la ciencia (o haz clic en la pestaña de la Ciencia en el área\n"
+"de la ventana principal). Encuentra la tecnología llamada República y haz "
+"clic\n"
+"en ella. Ahora la República se ha establecido como tu objetivo de "
+"tecnología,\n"
+"lo que significa que el siguiente avance en el camino hacia esta tecnología "
+"se\n"
+"elegirá de forma automática. En la parte superior de la ventana se muestra "
+"la\n"
+"cantidad de investigación científica que se obtiene cada turno - la\n"
+"investigación (bulbos) proviene del comercio pasivo en tus ciudades. En la\n"
+"parte inferior de la ventana hay el árbol de tecnología; aquí se puede "
+"hacer\n"
+"clic con el boton izquierdo para establecer la investigación objetivo o meta "
+"de\n"
+"la investigación, o hacer clic con el botón derecho para obtener ayuda "
+"acerca\n"
+"de una tecnología en particular. Cuando hayas terminado de jugar, haz clic "
+"en\n"
+"la pestaña Mapa (Alt-M) para volver a la vista de mapa."
#: data/scenario/tutorial.sav:323
msgid ""
@@ -25525,6 +25945,19 @@ msgid ""
"to worry about picking a new research target each time you finish\n"
"researching a technology."
msgstr ""
+"Ahora tu has acabado de investigar tu segunda tecnología. Vuelve al\n"
+"diálogo de la ciencia (F6) y echa un vistazo rápido a su progreso. Si\n"
+"estableciste la República como tu objetivo tecnológico anterior, se debería\n"
+"haber elegido automáticamente un nuevo objetivo de investigación. Si tu\n"
+"no tienes definido ningún objetivo, sin embargo, no habrá ningún nuevo\n"
+"objetivo elegido hasta el final del turno.\n"
+"\n"
+"En el turno que se completa tu investigación, tu puedes escoger una nueva\n"
+"tecnología a investigar. Sin embargo, cambiar la nueva tecnología a medio\n"
+"camino de la investigación significa que se pierde toda la investigación\n"
+"realizada hasta el momento. Configurar la meta de tecnología de una manera\n"
+"inteligente significa que no tienes que preocuparse de elegir un nuevo\n"
+"objetivo de investigación cada vez que termine la investigación en curso."
#: data/scenario/tutorial.sav:338
msgid ""
@@ -25544,6 +25977,23 @@ msgid ""
"However Republic is a substantially better form of government\n"
"than Despotism so the investment will soon pay off."
msgstr ""
+"Has completado con éxito la investigación de la República. Esta tecnología "
+"es\n"
+"particularmente útil ya que permite una nueva forma de gobierno. El "
+"gobierno\n"
+"de tu civilización que tu escoges es muy importante en la determinación de \n"
+"su desarrollo. En el principio, tu gobierno es un despotismo, una forma muy\n"
+"ineficiente de gobierno. Las posteriores opciones de gobierno le darán la "
+"opción\n"
+"a tu civilización de ser una nación pacífica de comercio, o una maquina de\n"
+"conquistar. Cada forma de gobierno tiene sus ventajas.\n"
+"\n"
+"Por ahora, es probable que quieras cambiar directamente a República. En "
+"elMenú de Gobierno, ves al submenú de Cambiar de Gobierno y elijeRepública. "
+"Si, tu deseas una revolución! El cambio de gobierno significapasar por unos "
+"cuantos turnos de anarquía, lo que no es sin costo. Sin embargo, la "
+"República es una forma bastante mejor de gobierno que el despotismo con lo "
+"que la inversión pronto dará sus frutos."
#: data/scenario/tutorial.sav:365
msgid ""
@@ -25557,17 +26007,26 @@ msgid ""
"unit instantly. On average, it is beneficial to search out and enter\n"
"any huts you find as soon as possible."
msgstr ""
+"Tu unidad ha encontrado una choza. Son pequeños pueblos esparcidos por el\n"
+"campo. Cuando una unidad entra en uno pueden suceder varias cosas. El\n"
+"resultado más probable es que tu encuentres recursos variados como una\n"
+"pequeña cantidad de oro. Sin embargo, también es posible encontrar \n"
+"tecnologías o unidades de mercenarios dentro de una choza. Algunas chozas\n"
+"contienen pobladores nativos que se incorporarán a tu civilización y "
+"fundarán\n"
+"una nueva ciudad para tu imperio. Por último, algunas chozas contienen\n"
+"bárbaros que matarán a tu unidad inmediatamente. En promedio, es "
+"beneficioso\n"
+"buscar chozas y entrar en ellas lo antes posible."
#: data/scenario/tutorial.sav:380
-#, fuzzy
msgid "Loading tutorial events."
-msgstr "Cargando rulesets"
+msgstr "Cargando eventos del tutorial"
#: data/civ1/game.ruleset:101 data/civ2/game.ruleset:101
#: data/default/game.ruleset:129
-#, fuzzy
msgid "Team 0"
-msgstr "Equipo 10"
+msgstr "Equipo 0"
#: data/civ1/game.ruleset:102 data/civ2/game.ruleset:102
#: data/default/game.ruleset:130
@@ -25723,3796 +26182,3 @@ msgstr "Equipo 30"
#: data/default/game.ruleset:160
msgid "Team 31"
msgstr "Equipo 31"
-
-#, fuzzy
-#~ msgid "Auth config filename \"%s\" not allowed!"
-#~ msgstr "Este nombre no se permite."
-
-#~ msgid "The %s of the %s (%s)"
-#~ msgstr "El %s de los %s (%s)"
-
-#, fuzzy
-#~ msgid ""
-#~ "Illegal alliance structure detected: %s alliance to %s reduced to peace "
-#~ "treaty."
-#~ msgstr ""
-#~ "Se ha detectado una estructura de alianza inválida: la alianza de %s para "
-#~ "%s se reduce a tratado de paz."
-
-#, fuzzy
-#~ msgid "And, became more experienced!"
-#~ msgstr " y se ha vuelto más experimentado!"
-
-#~ msgid "We can't take control of server, attempting to kill it."
-#~ msgstr "No hemos obtenido el control del servidor, lo intentamos matar."
-
-#, fuzzy
-#~ msgid "%s territory"
-#~ msgstr "Territorio de %s"
-
-#~ msgid "%s territory (%d turn cease-fire)"
-#~ msgid_plural "%s territory (%d turn cease-fire)"
-#~ msgstr[0] "territorio de %s (%d turno de alto el fuego)"
-#~ msgstr[1] "territorio de %s (%d turnos de alto el fuego)"
-
-#, fuzzy
-#~ msgid "%s territory (%s)"
-#~ msgstr "Territorio de %s %s"
-
-#~ msgid "City: %s (%s)"
-#~ msgstr "Ciudad: %s(%s)"
-
-#, fuzzy
-#~ msgid "Unit: %s (%s)"
-#~ msgstr "Unidad: %s (%s)"
-
-#~ msgid "%s of the %s"
-#~ msgstr "%s de los %s"
-
-#~ msgid "no maximum, "
-#~ msgstr "sin límite, "
-
-#~ msgid "%d unit maximum, "
-#~ msgid_plural "%d units maximum, "
-#~ msgstr[0] "límite de %d unidad, "
-#~ msgstr[1] "límite de %d unidades, "
-
-#~ msgid "%d per unit). "
-#~ msgstr "%d por unidad). "
-
-#~ msgid "Select same type"
-#~ msgstr "Elegir el mismo tipo"
-
-#~ msgid ""
-#~ "Couldn't find stdfont.ttf file. Please link/copy/move anyunicode ttf font "
-#~ "to data dir as stdfont.ttf"
-#~ msgstr ""
-#~ "No encuentro el fichero stdfont.ttf. Por favor, enlaza/copia/mueve un "
-#~ "fuente\n"
-#~ "Unicode cualquiera a data/stdfont.ttf"
-
-#~ msgid "Units: "
-#~ msgstr "Unidades: "
-
-#~ msgid ""
-#~ "* Military units away from home and field units will cause one citizen to "
-#~ "become unhappy.\n"
-#~ msgstr ""
-#~ "* Las unidades militares alejadas y las unidades de campo harán que un "
-#~ "ciudadano pase a descontento.\n"
-
-#~ msgid ""
-#~ "* Your units may impose martial law. Each military unit inside a city "
-#~ "will force an unhappy citizen to become content.\n"
-#~ msgstr ""
-#~ "* Tus unidades pueden imponer la Ley Marcial. Cada unidad militar dentro "
-#~ "de una ciudad obligará a un ciudadano descontento a estar contento.\n"
-
-#~ msgid ""
-#~ "%s%s - %s%s\n"
-#~ "\n"
-#~ msgstr ""
-#~ "%s%s - %s%s\n"
-#~ "\n"
-
-#~ msgid "%s"
-#~ msgstr "%s"
-
-#~ msgid ", "
-#~ msgstr ", "
-
-#~ msgid "%s Welcome"
-#~ msgstr "%s Bienvenido"
-
-#~ msgid "Client rejected: %s."
-#~ msgstr "Se rechaza el cliente: %s."
-
-#~ msgid "Your %s succeeded in bribing %s's %s and became more experienced."
-#~ msgstr ""
-#~ "Tu %1$s ha conseguido sobornar al %3$s de %2$s y se volvió más "
-#~ "experimentado."
-
-#~ msgid ""
-#~ "Your %s has successfully completed her mission and returned unharmed to %"
-#~ "s and has become more experienced."
-#~ msgstr ""
-#~ "Tu %s ha completado su misión con éxito y ha vuelto ileso a %s y se ha "
-#~ "vuelto más experimentado."
-
-#~ msgid "Your bombarding %s%s became more experienced!"
-#~ msgstr "Tu bombardero %s%s se volvió más experimentada!"
-
-#~ msgid ""
-#~ "Your %s%s survived the pathetic attack from %s's %s and became more "
-#~ "experienced!"
-#~ msgstr ""
-#~ "Tu %1$s%2$s ha sobrevivido al patético ataque del %4$s de %3$s y se "
-#~ "volvió más experimentada."
-
-#~ msgid " at %s"
-#~ msgstr " en %s"
-
-#~ msgid " in %s"
-#~ msgstr " en %s"
-
-#~ msgid " outside %s"
-#~ msgstr " en las afueras de %s"
-
-#~ msgid " near %s"
-#~ msgstr " cerca de %s"
-
-#~ msgid ""
-#~ "Your attacking %s succeeded against %s's %s (and %d other unit)%s and "
-#~ "became more experienced!"
-#~ msgid_plural ""
-#~ "Your attacking %s succeeded against %s's %s (and %d other units)%s and "
-#~ "became more experienced!"
-#~ msgstr[0] ""
-#~ "¡Tu %1$s ha atacado y destruido a un %3$s de %2$s (y %4$d unidad más) %5"
-#~ "$s y se ha vuelto más experimentado!"
-#~ msgstr[1] ""
-#~ "¡Tu %1$s ha atacado y destruido a un %3$s de %2$s (y %4$d unidades más) %5"
-#~ "$s y se ha vuelto más experimentado!"
-
-#~ msgid "%s lost to an attack from %s's %s."
-#~ msgstr "Has perdido un %1$s bajo un ataque de un %3$s de %2$s."
-
-#~ msgid " Choose Your Diplomat's Strategy"
-#~ msgstr " Elige el objetivo de tu Diplomático"
-
-#~ msgid "%s has client version %d.%d.%d%s"
-#~ msgstr "%s tiene la versión %d.%d.%d%s del cliente"
-
-#~ msgid ""
-#~ "Eliminated %s %s while infiltrating %s. The defender became more "
-#~ "experienced."
-#~ msgstr ""
-#~ "Se ha eliminado un %2$s %1$s al infiltrarse en %3$s. El defensor se ha "
-#~ "vuelto más experimentado."
-
-#~ msgid ""
-#~ "Eliminated %s %s while infiltrating our troops. The defender became more "
-#~ "experienced."
-#~ msgstr ""
-#~ "Han eliminado %2$s de %1$s infiltrando a nuestras tropas. El defensor se "
-#~ "volvió más experimentado."
-
-#, fuzzy
-#~ msgid ""
-#~ "Your client is too old. To use this server, please upgrade your client to "
-#~ "a Freeciv 2.1 or later."
-#~ msgstr ""
-#~ "Tu cliente es muy antiguo. Para usar este servidor actualiza tu cliente a "
-#~ "la version CVS posterior 28-11-2003 or a Freeciv 2.1 o posterior."
-
-#~ msgid "Ruleset directory name \"%s\" disallowed for security reasons."
-#~ msgstr ""
-#~ "El directorio de ruleset \"%s\" no está permitido por razones de "
-#~ "seguridad."
-
-#~ msgid ", nation %s"
-#~ msgstr ", nación %s"
-
-#~ msgid "_Map"
-#~ msgstr "_Mapa"
-
-#~ msgid "Create _player"
-#~ msgstr "Crear _jugador"
-
-#~ msgid "_Release player"
-#~ msgstr "_Liberar jugador"
-
-#~ msgid "Gover_nment"
-#~ msgstr "Gobier_no"
-
-#~ msgid "_Players"
-#~ msgstr "_Jugadores"
-
-#~ msgid "_Science"
-#~ msgstr "C_iencia"
-
-#~ msgid "S_paceship"
-#~ msgstr "_Nave espacial"
-
-#~ msgid "Game _Options..."
-#~ msgstr "_Opciones de juego..."
-
-#~ msgid "Clear _Log"
-#~ msgstr "Borrar registro(_L)"
-
-#~ msgid "Work_lists"
-#~ msgstr "_Listas de tareas"
-
-#~ msgid "Science Report"
-#~ msgstr "Informe de investigación"
-
-#~ msgid "Reason: line not found"
-#~ msgstr "Motivo: no se encuentra la línea"
-
-#~ msgid "Reason: line too short (expected %d got %lu"
-#~ msgstr "Motivo: la línea es demasiado corta (se esperaba %d y hay %lu"
-
-#~ msgid "Plugin '%s' is now selected"
-#~ msgstr "Se ha seleccionado el plugin '%s'"
-
-#~ msgid "No real audio plugin present, proceeding with sound support disabled"
-#~ msgstr ""
-#~ "No hay ningún plugin de sonido real, se prosigue con el sonido desactivado"
-
-#~ msgid "http://www.libsdl.org/projects/SDL_mixer/index.html"
-#~ msgstr "http://www.libsdl.org/projects/SDL_mixer/index.html"
-
-#~ msgid "Will continue with disabled sounds."
-#~ msgstr "El sonido queda desactivado."
-
-#~ msgid "sound spec-file appears incompatible:"
-#~ msgstr "El ruleset de sonido parece incompatible:"
-
-#~ msgid "file: \"%s\""
-#~ msgstr "fichero: \"%s\""
-
-#~ msgid "file options: %s"
-#~ msgstr "opciones de fichero: %s"
-
-#~ msgid "supported options: %s"
-#~ msgstr "opciones aceptadas: %s"
-
-#~ msgid "sound spec-file claims required option(s) which we don't support:"
-#~ msgstr "El ruleset de sonido reclama una o varias opciones que no existen:"
-
-#~ msgid "Goto _location"
-#~ msgstr "Ir a _lugar"
-
-#~ msgid "Error in create_string16: Aborting ..."
-#~ msgstr "Error en create_string16: Saliendo..."
-
-#~ msgid "Couldn't blit text to display: %s"
-#~ msgstr "No se pudo convertir el texto a mostrar: %s"
-
-#~ msgid ""
-#~ "Error in SDL_create_str16_surf: Couldn't convert text to display format: %"
-#~ "s"
-#~ msgstr ""
-#~ "Error en SDL_create_str16_surf: No se puede convertir el texto al "
-#~ "formato: %s"
-
-#~ msgid ""
-#~ "SDL_create_str16_surf: Font is generally %d big, and string is %hd big"
-#~ msgstr ""
-#~ "SDL_create_str16_surf: El tamaño de la fuente es en general %d, y el de "
-#~ "la cadena es %hd"
-
-#~ msgid "SDL_create_str16_surf: String is %d lenght"
-#~ msgstr "SDL_create_str16_surf: La longitud de la cadena es %d"
-
-#~ msgid "Error in change_ptsize: Change ptsize failed"
-#~ msgstr "Error en change_ptsize"
-
-#~ msgid "Error in load_font: Couldn't load %d pt font from %s: %s"
-#~ msgstr ""
-#~ "Error en load_font: No se puede cargar una fuente de %d puntos de %s: %s"
-
-#~ msgid "Error in unload_font: Trying unload from empty Font ARRAY"
-#~ msgstr ""
-#~ "Error en unload_font: Se ha intentado descargar un ARRAY de fuentes vacío."
-
-#~ msgid ""
-#~ "Error in unload_font: Trying unload Font which is not include in Font "
-#~ "ARRAY"
-#~ msgstr ""
-#~ "Error en unload_font: Se ha intentado descargar una fuente que no está en "
-#~ "el ARRAY"
-
-#~ msgid ""
-#~ "When built, every civilization's attitude toward you is improved by 25%."
-#~ msgstr "La actitud de cada civilización hacia ti mejora en un 25%."
-
-#~ msgid ""
-#~ "- A Diplomat can establish embassies with other civilizations by moving "
-#~ "into another player's city.\n"
-#~ "\n"
-#~ "- Diplomats can also try to sabotage enemy production, or steal an "
-#~ "advance from an enemy city. (An advance can only be stolen once per "
-#~ "city).\n"
-#~ "\n"
-#~ "- A Diplomat can also bribe an enemy unit, if that unit is the only unit "
-#~ "on its square.\n"
-#~ "\n"
-#~ "- Diplomats can even start a revolution in an enemy city and turn it into "
-#~ "your own, if you have the money!\n"
-#~ "\n"
-#~ "- In some game strategies, hordes of Diplomats can be used to wreak havoc "
-#~ "on the enemy. Little wonder that Diplomats are often viewed with "
-#~ "suspicion and fear!"
-#~ msgstr ""
-#~ "- Un Diplomático puede establecer embajadas con otras civilizaciones "
-#~ "entrando en la ciudad de otro jugador.\n"
-#~ "\n"
-#~ "- Los Diplomáticos también pueden intentar sabotear la producción "
-#~ "enemiga, o robar un avance de una ciudad enemiga (sólo se puede robar un "
-#~ "avance de cada ciudad).\n"
-#~ "\n"
-#~ "- ¡Un Diplomático puede incluso provocar una sublevación en una ciudad "
-#~ "enemiga, y hacer que pase a ser tuya, si tienes suficiente oro!\n"
-#~ "\n"
-#~ "- En algunas estrategias de juego, se puede usar hordas de Diplomáticos "
-#~ "para debilitar al enemigo. ¡No es de extrañar que a menudo se mire a los "
-#~ "Diplomáticos con sospecha y temor!"
-
-#~ msgid "Team 32"
-#~ msgstr "Equipo 32"
-
-#~ msgid "Cleared output window.\n"
-#~ msgstr "Se ha borrado la ventana principal.\n"
-
-#~ msgid "u8Unitsn"
-#~ msgstr "u8Unidadesn"
-
-#~ msgid "u8Improvementsn"
-#~ msgstr "u8Instalacionesn"
-
-#~ msgid "Rounds"
-#~ msgstr "Rondas"
-
-#~ msgid "_Darn"
-#~ msgstr "_Vaya, hombre"
-
-#~ msgid "Freeciv - Cityproduction"
-#~ msgstr "Freeciv - Producción de la ciudad"
-
-#~ msgid "Shields"
-#~ msgstr "Producción"
-
-#~ msgid "City Overview page"
-#~ msgstr "Página de la vista de la ciudad"
-
-#~ msgid "Units page"
-#~ msgstr "Página de unidades"
-
-#~ msgid "Worklist page"
-#~ msgstr "Página de la lista de tareas"
-
-#~ msgid "Trade Routes page"
-#~ msgstr "Página de rutas comerciales"
-
-#~ msgid "This Misc. Settings page"
-#~ msgstr "Esta página de varias opciones"
-
-#~ msgid "Freeciv - Cityview"
-#~ msgstr "Freeciv - Vista de la ciudad"
-
-#~ msgid "City Output"
-#~ msgstr "Resultados de la ciudad"
-
-#~ msgid "Citymap"
-#~ msgstr "Mapa de la ciudad"
-
-#~ msgid "_Sell"
-#~ msgstr "_Vender"
-
-#~ msgid "_Add preset"
-#~ msgstr "_Añadir configuración"
-
-#~ msgid "_Delete preset"
-#~ msgstr "_Borrar"
-
-#~ msgid "Name:"
-#~ msgstr "Nombre:"
-
-#~ msgid "People (W/E/S/T):"
-#~ msgstr "Población (O/H/C/R):"
-
-#~ msgid "City grows:"
-#~ msgstr "La ciudad crece:"
-
-#~ msgid "Production completed:"
-#~ msgstr "Se termina la producción:"
-
-#~ msgid "_Change"
-#~ msgstr "C_ambiar"
-
-#~ msgid "C_hange permanent"
-#~ msgstr "C_ambio permanente"
-
-#~ msgid "_Release city"
-#~ msgstr "_Dejar la ciudad"
-
-#~ msgid "Auto attack vs"
-#~ msgstr "Autoatacar a"
-
-#~ msgid "Land units"
-#~ msgstr "Unidades terrestres"
-
-#~ msgid "Sea units"
-#~ msgstr "Unidades marítimas"
-
-#~ msgid "Helicopters"
-#~ msgstr "Helicópteros"
-
-#~ msgid "Air units"
-#~ msgstr "Unidades aéreas"
-
-#~ msgid "_Disband if build settler at size 1"
-#~ msgstr "A_bandonar al producir Colonos con tamaño 1"
-
-#~ msgid "_Close"
-#~ msgstr "_Cerrar"
-
-#~ msgid "%s (%s) (worklist)"
-#~ msgstr "%s (%s) (lista de tareas)"
-
-#~ msgid "%s citizens%s"
-#~ msgstr "%s ciudadanos%s"
-
-#~ msgid "%s - %s citizens%s"
-#~ msgstr "%s - %s ciudadanos%s"
-
-#~ msgid "Luxury: %d total (maximum %d usable). "
-#~ msgstr "Lujo: %d en total (el máximo usable es %d). "
-
-#~ msgid "_Ok"
-#~ msgstr "_Aceptar"
-
-#~ msgid "_Refresh"
-#~ msgstr "_Refrescar"
-
-#~ msgid "Con_figure"
-#~ msgstr "Con_figurar"
-
-#~ msgid "Server Selection"
-#~ msgstr "Selección de Servidor"
-
-#~ msgid "_Name"
-#~ msgstr "_Nombre"
-
-#~ msgid "_Host"
-#~ msgstr "_Host"
-
-#~ msgid "_Port"
-#~ msgstr "_Puerto"
-
-#~ msgid "_Goto and Close"
-#~ msgstr "_Ir y cerrar"
-
-#~ msgid "_Establish embassy"
-#~ msgstr "_Establecer embajada"
-
-#~ msgid "_Investigate city"
-#~ msgstr "_Investigar la ciudad"
-
-#~ msgid "_Sabotage city"
-#~ msgstr "_Sabotear la ciudad"
-
-#~ msgid "Steal _technology"
-#~ msgstr "Robar _tecnología"
-
-#~ msgid "Incite a _revolt"
-#~ msgstr "Incitar una _revuelta"
-
-#~ msgid "_Poison city"
-#~ msgstr "_Envenenar la ciudad"
-
-#~ msgid "Industrial _sabotage"
-#~ msgstr "_Sabotaje industrial"
-
-#~ msgid "_Establish traderoute"
-#~ msgstr "_Establecer ruta comercial"
-
-#~ msgid "_Enter Marketplace"
-#~ msgstr "_Entrar al mercado"
-
-#~ msgid "_Help build Wonder"
-#~ msgstr "Contribuir a la _maravilla"
-
-#~ msgid "Freeciv - Pillage"
-#~ msgstr "Freeciv - saqueo"
-
-#~ msgid "Freeciv - Connect"
-#~ msgstr "Freeciv - conectar"
-
-#~ msgid "Freeciv - Select an unit"
-#~ msgstr "Freeciv - elige una unidad"
-
-#~ msgid "_Ready All"
-#~ msgstr "_Activar todas"
-
-#~ msgid "Freeciv - Select a Nation"
-#~ msgstr "Freeciv - elige una nación"
-
-#~ msgid "_Leader Name"
-#~ msgstr "Nombre del _líder"
-
-#~ msgid "_City Style"
-#~ msgstr "Estilo de las _ciudades"
-
-#~ msgid "Sorry: cannot upgrade %s."
-#~ msgstr "Lo siento: no se puede mejorar %s."
-
-#~ msgid "No technology"
-#~ msgstr "Sin tecnología"
-
-#~ msgid "No city"
-#~ msgstr "Sin ciudades"
-
-#~ msgid "_Accept treaty"
-#~ msgstr "_Aceptar pacto"
-
-#~ msgid "World-Map"
-#~ msgstr "Mapamundi"
-
-#~ msgid "Sea-Map"
-#~ msgstr "Mapa marítimo"
-
-#~ msgid ""
-#~ "This Eternal Treaty\n"
-#~ "marks the results\n"
-#~ "of the diplomatic work between\n"
-#~ "The %s %s %s\n"
-#~ "and\n"
-#~ "The %s %s %s"
-#~ msgstr ""
-#~ "Este Pacto Eterno\n"
-#~ "es el resultado de\n"
-#~ "la actividad diplomática entre\n"
-#~ "los %s %s %s\n"
-#~ "y\n"
-#~ "los %s %s %s"
-
-#~ msgid "Select a city"
-#~ msgstr "Elige una ciudad"
-
-#~ msgid "Set tax, luxury and science rates"
-#~ msgstr "Elige las tasas de impuestos, lujo y ciencia"
-
-#~ msgid "_Airlift"
-#~ msgstr "_Aerotransportar"
-
-#~ msgid ""
-#~ "Could not get the mask although there must be one (%s)! Graphics may look "
-#~ "corrupt.\n"
-#~ msgstr ""
-#~ "¡No se ha podido obtener la máscara, aunque debería existir (%s)! Puede "
-#~ "que los gráficos aparezcan distorsionados.\n"
-
-#~ msgid "Options..."
-#~ msgstr "Opciones..."
-
-#~ msgid "Message Options..."
-#~ msgstr "Opciones sobre mensajes..."
-
-#~ msgid "Players..."
-#~ msgstr "Jugadores..."
-
-#~ msgid "Message..."
-#~ msgstr "Mensaje..."
-
-#~ msgid "Server opt initial..."
-#~ msgstr "Opciones iniciales del servidor..."
-
-#~ msgid "Server opt ongoing..."
-#~ msgstr "Opciones actuales del servidor..."
-
-#~ msgid "Kingdom"
-#~ msgstr "Nación"
-
-#~ msgid "Tax Rate..."
-#~ msgstr "Impuestos..."
-
-#~ msgid "Find City..."
-#~ msgstr "Buscar ciudad..."
-
-#~ msgid "Worklists..."
-#~ msgstr "Listas de tareas..."
-
-#~ msgid "REVOLUTION..."
-#~ msgstr "REVOLUCIÓN..."
-
-#~ msgid "Road & Rails"
-#~ msgstr "Caminos y vías"
-
-#~ msgid "Order"
-#~ msgstr "Órdenes"
-
-#~ msgid "City Report..."
-#~ msgstr "Informe de ciudades..."
-
-#~ msgid "Science Report..."
-#~ msgstr "Informe de investigación..."
-
-#~ msgid "Trade Report..."
-#~ msgstr "Informe comercial..."
-
-#~ msgid "Military Report..."
-#~ msgstr "Informe militar..."
-
-#~ msgid "Freeciv Client"
-#~ msgstr "Cliente de Freeciv"
-
-#~ msgid "Client for Freeciv"
-#~ msgstr "Cliente para Freeciv"
-
-#~ msgid ""
-#~ "Turn\n"
-#~ "Done"
-#~ msgstr ""
-#~ "Fin del\n"
-#~ "turno"
-
-#~ msgid ""
-#~ "Couldn't open the main window (Gfx memory problem or screensize too "
-#~ "small)\n"
-#~ msgstr ""
-#~ "No se ha podido abrir la ventana principal (problema de memoria gráfica o "
-#~ "pantalla demasiado pequeña)\n"
-
-#~ msgid "Cost: %ld"
-#~ msgstr "Coste: %ld"
-
-#~ msgid " wonder"
-#~ msgstr " maravilla"
-
-#~ msgid " improvement"
-#~ msgstr " instalaciones"
-
-#~ msgid " unit"
-#~ msgstr " unidad"
-
-#~ msgid "Movecost: %ld"
-#~ msgstr "Coste de movimiento: %ld"
-
-#~ msgid "Defense: %ld.%ld"
-#~ msgstr "Defensa: %ld.%ld"
-
-#~ msgid ""
-#~ "Food: %d\n"
-#~ "Shield: %d\n"
-#~ "Trade: %d"
-#~ msgstr ""
-#~ "Alim: %d\n"
-#~ "Prod: %d\n"
-#~ "Comrc: %d"
-
-#~ msgid "City: %s(%s)"
-#~ msgstr "Ciudad: %s(%s)"
-
-#~ msgid "with City Walls"
-#~ msgstr "con Murallas"
-
-#~ msgid "Infrastructure: "
-#~ msgstr "Infraestructura: "
-
-#~ msgid "Unit: %s(%s%s)"
-#~ msgstr "Unidad: %s(%s%s)"
-
-#~ msgid "A:%d D:%d FP:%d HP:%d/%d%s%s"
-#~ msgstr "A:%d D:%d PF:%d PV:%d/%d%s%s"
-
-#~ msgid "A:%d D:%d FP:%d HP:%d0%%"
-#~ msgstr "A:%d D:%d PF:%d PV:%d0%%"
-
-#~ msgid "City %s"
-#~ msgstr "Ciudad %s"
-
-#~ msgid "Unit %s"
-#~ msgstr "Unidad %s"
-
-#~ msgid "Tile %s"
-#~ msgstr "Casilla %s"
-
-#~ msgid "Wake up"
-#~ msgstr "Despertar"
-
-#~ msgid "Activate"
-#~ msgstr "Activar"
-
-#~ msgid "List all units"
-#~ msgstr "Listar todas las unidades"
-
-#~ msgid "Connect to this location"
-#~ msgstr "Conectar con esta posición"
-
-#~ msgid "Goto this location"
-#~ msgstr "Ir a esta posición"
-
-#~ msgid "City_name"
-#~ msgstr "Nombre de la Ciudad"
-
-#~ msgid "Tax:%d Lux:%d Sci:%d"
-#~ msgstr "Imp:%d Lujo:%d Cie:%d"
-
-#~ msgid "_Goto Location"
-#~ msgstr "_Ir a posición"
-
-#~ msgid "Reputation"
-#~ msgstr "Reputación"
-
-#~ msgid "(%ld steps)"
-#~ msgstr "(%ld pasos)"
-
-#~ msgid "Science Advisor"
-#~ msgstr "Consejero científico"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "(no research)"
-#~ msgstr ""
-#~ "%s\n"
-#~ "(no hay investigación)"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "(%d turn/advance)"
-#~ msgid_plural ""
-#~ "%s\n"
-#~ "(%d turns/advance)"
-#~ msgstr[0] ""
-#~ "%s\n"
-#~ "(%d turno/avance)"
-#~ msgstr[1] ""
-#~ "%s\n"
-#~ "(%d turnos/avance)"
-
-#~ msgid "_Goal"
-#~ msgstr "_Meta"
-
-#~ msgid "Trade Advisor"
-#~ msgstr "Consejero de comercio"
-
-#~ msgid "Military Report"
-#~ msgstr "Informe militar"
-
-#~ msgid ""
-#~ "Population:\n"
-#~ "Support:\n"
-#~ "Energy:\n"
-#~ "Mass:\n"
-#~ "Travel time:\n"
-#~ "Success prob.:\n"
-#~ "Year of arrival:"
-#~ msgstr ""
-#~ "Población:\n"
-#~ "Soporte:\n"
-#~ "Energía:\n"
-#~ "Masa:\n"
-#~ "Duración:\n"
-#~ "Prob. éxito:\n"
-#~ "Año de llegada:"
-
-#~ msgid ""
-#~ "%5d\n"
-#~ "%5d %%\n"
-#~ "%5d %%\n"
-#~ "%5d tons\n"
-#~ "%5.1f years\n"
-#~ "%5d %%\n"
-#~ "%8s"
-#~ msgstr ""
-#~ "%5d\n"
-#~ "%5d %%\n"
-#~ "%5d %%\n"
-#~ "%5d tm\n"
-#~ "%5.1f años\n"
-#~ "%5d %%\n"
-#~ "%8s"
-
-#~ msgid "Freeciv - Edit Worklists"
-#~ msgstr "Freeciv - Editar listas de tareas"
-
-#~ msgid "Available Worklists"
-#~ msgstr "Listas de tareas existentes"
-
-#~ msgid "_Edit"
-#~ msgstr "_Editar"
-
-#~ msgid "_New"
-#~ msgstr "_Nuevo"
-
-#~ msgid "_Remove"
-#~ msgstr "_Eliminar"
-
-#~ msgid "Freeciv - Edit Worklist"
-#~ msgstr "Freeciv - Editar listas de tareas"
-
-#~ msgid "entry"
-#~ msgid_plural "entries"
-#~ msgstr[0] "entrada"
-#~ msgstr[1] "entradas"
-
-#~ msgid "u8Worklistsn"
-#~ msgstr "u8Listas de tareasn"
-
-#~ msgid "Accept"
-#~ msgstr "Aceptar"
-
-#~ msgid "Current Targets"
-#~ msgstr "Objetivos actuales"
-
-#~ msgid "Available Targets"
-#~ msgstr "Objetivos disponibles"
-
-#~ msgid "Worklist for city"
-#~ msgstr "Lista de tareas de la ciudad"
-
-#~ msgid "Name of Worklist"
-#~ msgstr "Nombre de la lista de tareas"
-
-#~ msgid "Options panel"
-#~ msgstr "Panel de opciones"
-
-#~ msgid "Unit maintenance panel (%d %s)"
-#~ msgstr "Panel de mantenimiento de unidades (%d %s)"
-
-#~ msgid "unit"
-#~ msgid_plural "units"
-#~ msgstr[0] "unidad"
-#~ msgstr[1] "unidades"
-
-#~ msgid "Garrison Panel (%d %s)"
-#~ msgstr "Panel de unidades (%d %s)"
-
-#~ msgid "Info Panel"
-#~ msgstr "Panel informativo"
-
-#~ msgid "Happiness panel"
-#~ msgstr "Panel de felicidad"
-
-#~ msgid "Maintenance panel"
-#~ msgstr "Panel de mantenimiento"
-
-#~ msgid "Garrison panel"
-#~ msgstr "Panel de unidades"
-
-#~ msgid "Information panel"
-#~ msgstr "Panel de información"
-
-#~ msgid "Exit Report"
-#~ msgstr "Informe de Producción"
-
-#~ msgid ""
-#~ "\n"
-#~ "finshed"
-#~ msgstr ""
-#~ "\n"
-#~ "acabado"
-
-#~ msgid "tech \"%s\": requires itself"
-#~ msgstr "Tecnología \"%s\" se necesita a sí misma"
-
-#~ msgid "%s's %s tried to build %s, which is not available."
-#~ msgstr ""
-#~ "El %2$s de %1$s ha intentado producir %3$s, lo cual no está disponible"
-
-#~ msgid ""
-#~ "Your %s was executed in %s on suspicion of spying. The %s welcome future "
-#~ "diplomatic efforts providing the Ambassador is reputable."
-#~ msgstr ""
-#~ "Han ejecutado a tu %s en %s bajo la acusación de espionaje. Los %s "
-#~ "aceptarán futuros contactos diplomáticos siempre que el Embajador sea de "
-#~ "fiar."
-
-#~ msgid ""
-#~ "You executed a %s the %s had sent to establish an embassy in %s for being "
-#~ "untrustworthy"
-#~ msgstr ""
-#~ "Has ejecutado un %s que los %s habían enviado para establecer una "
-#~ "embajada en %s, porque no era de fiar."
-
-#~ msgid "Sea moving start units are not yet supported, %s not created."
-#~ msgstr ""
-#~ "Aún no están soportadas las unidades navales de inicio, %s no ha sido "
-#~ "creada."
-
-#~ msgid "Trying alternative ruleset filename syntax."
-#~ msgstr ""
-#~ "Probando la sintaxis alternativa para los nombres de ficheros ruleset."
-
-#~ msgid "Could not load ruleset file \"%s\"."
-#~ msgstr "No he podido cargar el fichero ruleset \"%s\"."
-
-#~ msgid "Could not load ruleset script file \"%s\"."
-#~ msgstr "No he podido cargar el fichero ruleset \"%s\"."
-
-#~ msgid "Ruleset datafile appears incompatible:"
-#~ msgstr "El fichero ruleset parece ser incompatible:"
-
-#~ msgid "Ruleset datafile claims required option(s) which we don't support:"
-#~ msgstr "El fichero ruleset necesita opciones que no aceptamos:"
-
-#~ msgid "Section %s has unknown req: \"%s\" \"%s\" (%s)"
-#~ msgstr "La sección %s tiene un req. desconocido: \"%s\" \"%s\" (%s)"
-
-#~ msgid "Unknown terrain %s in entry %s."
-#~ msgstr "Terreno %s desconocido en la entrada %s."
-
-#~ msgid "Ruleset doesn't have any terrains (%s)"
-#~ msgstr "El ruleset no contiene ningún terreno (%s)"
-
-#~ msgid "Terrains %s and %s have the same identifier."
-#~ msgstr "Los terrenos %s y %s tienen el mismo identificador"
-
-#~ msgid "'%c' cannot be used as a terrain identifier; it is reserved."
-#~ msgstr ""
-#~ "'%c' no se puede usar como identificador de terreno; está reservado."
-
-#~ msgid "Terrain %s has unknown flag %s"
-#~ msgstr "El terreno %s tiene un flag %s desconocido"
-
-#~ msgid "Resources %s and %s have the same identifier."
-#~ msgstr "Los recursos %s y %s tienen el mismo identificador."
-
-#~ msgid "Section %s lists unknown effect type: \"%s\" (%s)"
-#~ msgstr "La sección %s contiene un tipo de efecto desconocido: \"%s\" (%s)"
-
-#~ msgid "Unknown terrain identifier '%c' in savegame."
-#~ msgstr "Nombre de terreno desconocido '%c' en el juego guardado."
-
-#~ msgid "Warning: Unknown nation %s for starting position no %d"
-#~ msgstr "Aviso: Nación %s desconocida para la posición de arranque no %d"
-
-#~ msgid ""
-#~ "Number of starts (%d) are lower than rules.max_players (%d), lowering "
-#~ "rules.max_players."
-#~ msgstr ""
-#~ "El número de posiciones iniciales (%d) es menor que rules.max_players (%"
-#~ "d), reduciendo rules.max_players."
-
-#~ msgid "Wrong unit type id value (%d)"
-#~ msgstr "Tipo de unidad incorrecto (%d)"
-
-#~ msgid "Wrong improvement type id value (%d)"
-#~ msgstr "Tipo de mejora incorrecto (%d)"
-
-#~ msgid "Wrong tech type id value (%d)"
-#~ msgstr "Tipo de tecnología incorrecto (%d)"
-
-#~ msgid "Unknown technology (%s)"
-#~ msgstr "Tecnología desconocida (%s)"
-
-#~ msgid "Wrong government type id value (%d)"
-#~ msgstr "Tipo de gobierno incorrecto (%d)"
-
-#~ msgid "Wrong player%d.u%d.type value (%d)"
-#~ msgstr "Jugador player%d.u%d incorrecto (%d)"
-
-#~ msgid "Unknown unit type '%s' in player%d section"
-#~ msgstr "Tipo de unidad '%s' desconocido en la sección player%d"
-
-#~ msgid "Savegame error: invalid unit orders."
-#~ msgstr "Error en la partida guardada: órdenes de unidad inválidas."
-
-#~ msgid "Unsupported government found (%s)"
-#~ msgstr "Se encontró un gobierno no soportado (%s)"
-
-#~ msgid "Unsupported city style found in player%d section. Changed to %s"
-#~ msgstr ""
-#~ "Se encontró un estilo de ciudad no soportado en la sección player%d. "
-#~ "Cambiando a %s"
-
-#, fuzzy
-#~ msgid "Removing %s's unferried %s in %s at (%d, %d)"
-#~ msgstr "%s construye %s en %s (%i,%i)"
-
-#~ msgid "Food Stock"
-#~ msgstr "Granero"
-
-#, fuzzy
-#~ msgid ""
-#~ "%s file requires option(s) which client doesn't support:\n"
-#~ "file: \"%s\"\n"
-#~ "file options: %s\n"
-#~ "supported options: %s"
-#~ msgstr ""
-#~ "El fichero %s necesita una o más opciones que no están soportadas:\n"
-#~ "Fichero: \"%s\"\n"
-#~ "Opciones del fichero: %s\n"
-#~ "Opciones soportadas: %s"
-
-#~ msgid "Trying \"%s\" tileset."
-#~ msgstr "Intentando el aspecto (tileset) \"%s\"."
-
-#, fuzzy
-#~ msgid "Can't find tileset \"%s\"."
-#~ msgstr "No se encuentra el ruleset de sonido \"%s\"."
-
-#~ msgid "Invalid darkness style set in tileset."
-#~ msgstr "Estilo de oscuridad inválido en el tileset."
-
-#~ msgid ""
-#~ "Error in %s layer %d: you cannot have tall terrain or\n"
-#~ "a sprite offset with a cell-based drawing method."
-#~ msgstr ""
-#~ "Error en %s, capa %d: no se puede tener terreno alto o\n"
-#~ "un offset de sprite con un método de dibujado por celdas."
-
-#, fuzzy
-#~ msgid "Can't find spec file \"%s\"."
-#~ msgstr "No se encuentra el ruleset de sonido \"%s\"."
-
-#~ msgid "No graphics for specialist %s."
-#~ msgstr "No hay gráficos para los especialistas %s."
-
-#~ msgid "No graphics for citizen %s."
-#~ msgstr "No hay gráficos para los ciudadanos %s."
-
-#~ msgid "Missing base sprite tag \"%s1\"."
-#~ msgstr "No se encontró la etiqueta del sprite \"%s1\"."
-
-#~ msgid "Economy (F5)"
-#~ msgstr "Economía (F5)"
-
-#~ msgid "Research (F6)"
-#~ msgstr "Investigación (F6)"
-
-#~ msgid "Revolution (Shift + R)"
-#~ msgstr "Revolución (Mays + R)"
-
-#~ msgid "End Turn (Enter)"
-#~ msgstr "Finalizar turno (Retorno)"
-
-#~ msgid "Players (F3)"
-#~ msgstr "Jugadores (F3)"
-
-#~ msgid ""
-#~ "Cities Report (F1)\n"
-#~ "or\n"
-#~ "Find City (Shift + F)"
-#~ msgstr ""
-#~ "Informe de ciudades (F1)\n"
-#~ "o\n"
-#~ "Ir a ciudad (Mays + F)"
-
-#~ msgid "Units (F2)"
-#~ msgstr "Unidades (F2)"
-
-#~ msgid ""
-#~ "Revolution (Shift + R)\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Revolución (Mays + R)\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Research (F6)\n"
-#~ "%s (%d/%d)"
-#~ msgstr ""
-#~ "Investigación (F6)\n"
-#~ "%s (%d/%d)"
-
-#~ msgid ""
-#~ "Name : %s\n"
-#~ "Nation : %s\n"
-#~ "Team : %s\n"
-#~ "Embassy :%s\n"
-#~ "State : %s\n"
-#~ "Idle : %d %s"
-#~ msgstr ""
-#~ "Nombre : %s\n"
-#~ "Nación : %s\n"
-#~ "Equipo : %s\n"
-#~ "Embajada : %s\n"
-#~ "Estado : %s\n"
-#~ "Inactividad : %d %s"
-
-#~ msgid "Dictatress"
-#~ msgstr "Dictadora"
-
-#~ msgid "Log"
-#~ msgstr "Registro"
-
-#~ msgid ""
-#~ "Start\n"
-#~ "Game"
-#~ msgstr ""
-#~ "Empezar\n"
-#~ "la partida"
-
-#~ msgid ""
-#~ "Select\n"
-#~ "Nation"
-#~ msgstr ""
-#~ "Elige\n"
-#~ "Nación"
-
-#~ msgid "Citizen Management Agent"
-#~ msgstr "Agente de Control de Ciudades (CMA)"
-
-#~ msgid ""
-#~ "Current output : 0\n"
-#~ "Research speed : none\n"
-#~ "Next's advance time : never"
-#~ msgstr ""
-#~ "Investigación actual : 0\n"
-#~ "Velocidad de investigación : nula\n"
-#~ "El siguiente avance será : nunca"
-
-#~ msgid "Next advance in %d turn"
-#~ msgid_plural "Next advance in %d turns"
-#~ msgstr[0] "Próximo avance en %d turno"
-#~ msgstr[1] "Próximo avance en %d turnos"
-
-#~ msgid ""
-#~ "Current output : %d per turn\n"
-#~ "Research speed : %d %s/advance\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Investigación actual : %d por turno\n"
-#~ "Velocidad de investigación : %d %s/avance\n"
-#~ "%s"
-
-#~ msgid "Sp1 F/R/T:"
-#~ msgstr "Esp1 A/P/C:"
-
-#~ msgid "Sp2 F/R/T:"
-#~ msgstr "Esp2 A/P/C:"
-
-#~ msgid "%s F/R/T:"
-#~ msgstr "%s A/P/C:"
-
-#~ msgid "Ah"
-#~ msgstr "Ah"
-
-#~ msgid " -z, --zone\t\tEnable GGZ mode\n"
-#~ msgstr " -z, --zone\t\tActiva el modo GGZ\n"
-
-#~ msgid "%s load with own %d bpp format !"
-#~ msgstr "¡Se carga %s con formato %d bpp!"
-
-#~ msgid "%s (%d bpp) load with screen (%d bpp) format !"
-#~ msgstr "¡Se carga %s (%d bpp) con formato de la pantalla (%d bpp)!"
-
-#~ msgid "?nationgroup:Transitional"
-#~ msgstr "Transicional"
-
-#~ msgid "Oceanian"
-#~ msgstr "Océanico"
-
-#~ msgid "Modern"
-#~ msgstr "Moderno"
-
-#~ msgid "Asian"
-#~ msgstr "Asiático"
-
-#~ msgid "African"
-#~ msgstr "Africano"
-
-#~ msgid "Fictional"
-#~ msgstr "Fantástico"
-
-#~ msgid "Medieval"
-#~ msgstr "Medieval"
-
-#~ msgid "Ancient"
-#~ msgstr "Antiguo"
-
-#~ msgid "European"
-#~ msgstr "Europeo"
-
-#~ msgid "Transitional"
-#~ msgstr "Transicional"
-
-#~ msgid "If enabled then cities will be drawn on the overview."
-#~ msgstr "Si se activa, las ciudades serán mostradas en la vista general"
-
-#~ msgid "Qween"
-#~ msgstr "La Reina"
-
-#~ 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 "
-#~ "<player-name> argument is allowed"
-#~ msgstr ""
-#~ "El parámetro nombre-de-conexión permite especificar qué conexión "
-#~ "reemplazará al jugador indicado; si no se especifica se asume la misma "
-#~ "conexión desde la que se ejecuta el comando. Este parámetro sólo se "
-#~ "puede especificar desde la consola y desde las conexiones con nivel de "
-#~ "acceso 'hack'."
-
-#~ msgid "* Attacks with full strength even if less than one movement left.\n"
-#~ msgstr ""
-#~ "* No pierde fuerza de ataque aunque le quede menos de un movimiento.\n"
-
-#~ msgid ""
-#~ " - \"Exhausted\" attackers are weaker: if the attacker has only 1/3 "
-#~ "movement point left, its strength is divided by 3; if it has 2/3 movement "
-#~ "point, its strength is multiplied by 2/3. If the attacker has 1 or more "
-#~ "movement points left, no further modifications occur."
-#~ msgstr ""
-#~ " - Los atacantes \"exhaustos\" son más débiles: si al atacante sólo le "
-#~ "quedan 1/3 puntos de movimiento, su fuerza se divide entre 3; si le "
-#~ "quedan 2/3 puntos de movimiento, su fuerza se multiplica por 2/3. Si al "
-#~ "atacante le quedan 1 o más puntos de movimiento, su fuerza no se modifica."
-
-#~ msgid ""
-#~ "The attacker's base strength is 8. Veteran status makes this 12, but "
-#~ "because it only has 2/3 movement points its final strength is 8."
-#~ msgstr ""
-#~ "La fuerza inicial del atacante es 8. Al ser veterano, pasa a ser 12, "
-#~ "pero como sólo le quedan 2/3 puntos de movimiento su fuerza final es 8."
-
-#~ msgid "Tropical"
-#~ msgstr "Tropical"
-
-#~ msgid "Industrial"
-#~ msgstr "Industrial"
-
-#~ msgid "PostModern"
-#~ msgstr "Posmoderno"
-
-#~ msgid "_Editor"
-#~ msgstr "_Editor"
-
-#~ msgid "_Tools"
-#~ msgstr "_Herramientas"
-
-#~ msgid "Special1"
-#~ msgstr "Especial1"
-
-#~ msgid "Special2"
-#~ msgstr "Especial2"
-
-#~ msgid "Spotless"
-#~ msgstr "Intachable"
-
-#~ msgid "Excellent"
-#~ msgstr "Excelente"
-
-#~ msgid "Honorable"
-#~ msgstr "Honrosa"
-
-#~ msgid "Questionable"
-#~ msgstr "Dudosa"
-
-#~ msgid "Dishonorable"
-#~ msgstr "Deshonrosa"
-
-#~ msgid "Poor"
-#~ msgstr "Mala"
-
-#~ msgid "Despicable"
-#~ msgstr "Despreciable"
-
-#~ msgid "Atrocious"
-#~ msgstr "Atroz"
-
-#~ msgid "?diplomatic_state:Neutral"
-#~ msgstr "Neutral"
-
-#~ msgid ""
-#~ "*%s (AI)* %s leads our alliance. You must contact and make peace with him "
-#~ "first."
-#~ msgstr ""
-#~ "*%s (Ordenador)* %s preside nuestra alianza. Debes contactar con él y "
-#~ "firmar la paz antes."
-
-#~ msgid "*%s (AI)* Begone scoundrel, we all know that you cannot be trusted!"
-#~ msgstr ""
-#~ "*%s (Ordenador)* Sabemos que no eres de fiar. ¡Fuera de nuestra vista!"
-
-#~ msgid ""
-#~ "*%s (AI)* I will not let you go that easy, %s. The current treaty stands."
-#~ msgstr ""
-#~ "*%s (Ordenador)* No vamos a dejar que te marches por las buenas, %s. El "
-#~ "tratado actual se mantiene."
-
-#~ msgid ""
-#~ "*%s (AI)* %s recommended that I give you a ceasefire. This is your lucky "
-#~ "day."
-#~ msgstr ""
-#~ "*%s (Ordenador)* %s recomienda que te conceda una tregua. Estás de "
-#~ "suerte."
-
-#~ msgid "*%s (AI)* Let us first make peace, %s"
-#~ msgstr "*%s (Ordenador)* Firmemos la paz antes, %s."
-
-#~ msgid "*%s (AI)* You don't have the offered city!"
-#~ msgstr "*%s (Ordenador)* ¡No posees la ciudad que nos ofreces!"
-
-#~ msgid "*%s (AI)* I will NOT accept such behaviour! This means WAR!"
-#~ msgstr ""
-#~ "*%s (Ordenador)* ¡Esta conducta es intolerable! ¡Esto significa la "
-#~ "GUERRA!"
-
-#~ msgid "*%s (AI)* Your despicable actions will not go unpunished!"
-#~ msgstr ""
-#~ "*%s (Ordenador)* ¡Tus despreciables acciones van a recibir su justo "
-#~ "castigo!"
-
-#~ msgid "Game: Auto-Attack: %s's %s found a too tough enemy (%s)"
-#~ msgstr ""
-#~ "Juego: Autoataque: %2$s de %1$s se ha encontrado un enemigo demasiado "
-#~ "fuerte (%3$s)"
-
-#~ msgid "Game: %s bought in %s for %d gold."
-#~ msgstr "Juego: Has comprado %s en %s por %d monedas de oro."
-
-#~ msgid "Game: %s"
-#~ msgstr "Juego: %s"
-
-#~ msgid "Game: %s is building %s."
-#~ msgstr "Juego: %s está produciendo %s."
-
-#~ msgid " -g, --gamelog FILE\tUse FILE as game logfile\n"
-#~ msgstr ""
-#~ " -g, --gamelog FICH\tUsar FICH como fichero de registro del juego\n"
-
-#~ msgid "Show current scores."
-#~ msgstr "Mostrar las puntuaciones actuales."
-
-#~ msgid ""
-#~ "For each connected client, pops up a window showing the current player "
-#~ "scores."
-#~ msgstr ""
-#~ "En cada cliente conectado, muestra una ventana con las puntuaciones "
-#~ "actuales de los jugadores."
-
-#~ msgid "metatopic <meta-line>"
-#~ msgstr "metatopic <meta-línea>"
-
-#~ msgid "Set metaserver topic line."
-#~ msgstr "Establece la línea de información del metaservidor."
-
-#~ msgid "Grab the 'first come' command access level."
-#~ msgstr ""
-#~ "Reclamar el nivel de comandos para el primero en llegar ('first come')."
-
-#~ msgid ""
-#~ "If 'cmdlevel first come' has been used to set a special 'first come'\n"
-#~ "command access level, this is the command to grab it with."
-#~ msgstr ""
-#~ "Si se ha usado 'cmdlevel first come' para establecer un nivel de acceso\n"
-#~ "especial para el primero en llegar ('first come'), éste es el comando "
-#~ "que\n"
-#~ "permite reclamarlo."
-
-#~ msgid "endgame <player1 player2 player3 ...>"
-#~ msgstr "endgame <jugador1 jugador2 jugador3 ...>"
-
-#~ msgid "End the game. If players are listed, these win the game."
-#~ msgstr ""
-#~ "Termina la partida. Si es suministran jugadores, estos ganan la partida."
-
-#~ msgid ""
-#~ "This command ends the game immediately and credits the given players, if "
-#~ "any, with winning it."
-#~ msgstr ""
-#~ "Este comando termina la partida inmediatamente y da puntos a los "
-#~ "jugadores proporcionados, si los hay, por haberlo ganado."
-
-#~ msgid "Rejected connection from %s with invalid name."
-#~ msgstr "Se ha rechazado la conexión de %s con nombre inválido."
-
-#~ msgid "Rejected connection from %s with duplicate login name."
-#~ msgstr "Se ha rechazado la conexión de %s con nombre ya existente."
-
-#~ msgid "Game: Lost connection: %s."
-#~ msgstr "Juego: Se ha cortado la conexión: %s."
-
-#~ msgid ""
-#~ "Game: You are at war with one of %s's allies - an alliance with %s is "
-#~ "impossible."
-#~ msgstr ""
-#~ "Juego: Estás en guerra con uno de los aliados de %s, así que no te puedes "
-#~ "aliar con %s."
-
-#~ msgid ""
-#~ "Game: %s is at war with one of your allies - an alliance with %s is "
-#~ "impossible."
-#~ msgstr ""
-#~ "Juego: %s está en guerra con uno de tus aliados - no te puedes aliar con %"
-#~ "s."
-
-#~ msgid "Game: You agree on a peace treaty with %s."
-#~ msgstr "Juego: Has pactado la paz con los %s."
-
-#~ msgid "Game: Your %s could not find the %s technology to steal in %s."
-#~ msgstr ""
-#~ "Juego: Tu %s no ha podido encontrar la tecnología %s en %s para robarla."
-
-#~ msgid "Game: Your %s stole Future Tech. %d from %s."
-#~ msgstr "Juego: Tu %s ha robado \"Future Tech %d\" a los %s."
-
-#~ msgid "Game: Future Tech. %d stolen by %s %s from %s."
-#~ msgstr "Juego: Un %3$s %2$s ha robado \"Future Tech %1$d\" a los %4$s."
-
-#~ msgid "Game: Your %s stole %s from %s."
-#~ msgstr "Juego: Tu %s ha robado %s a los %s."
-
-#~ msgid "Game: %s's %s stole %s from %s."
-#~ msgstr "Juego: El %2$s de %1$s ha robado %3$s a los %4$s."
-
-#~ msgid "Game: You can't subvert a city from this nation."
-#~ msgstr "Juego: No puedes sublevar una ciudad de esta nación."
-
-#~ msgid "Couldn't open gamelogfile \"%s\" for appending."
-#~ msgstr ""
-#~ "No se puede abrir el fichero de registro del juego \"%s\" para añadir."
-
-#~ msgid ""
-#~ "Game: Learned %s in cooperation with %s. Scientists choose to research %s."
-#~ msgstr ""
-#~ "Juego: Hemos descubierto %s en cooperación con %s. Los científicos "
-#~ "eligen investigar %s."
-
-#~ msgid ""
-#~ "Game: Learned %s in cooperation with %s. Scientists do not know what to "
-#~ "research next."
-#~ msgstr ""
-#~ "Juego: Hemos descubierto %s en cooperación con %s. Los científicos no "
-#~ "saben que investigar ahora."
-
-#~ msgid "Game: The %s have incited a revolt!"
-#~ msgstr "Juego: ¡Los %s han empezado una revolución!"
-
-#~ msgid "Game: Your reputation is now %s."
-#~ msgstr "Juego: Tu reputación ahora es %s."
-
-#~ msgid ""
-#~ "Game: The senate decides to dissolve rather than support your actions any "
-#~ "longer."
-#~ msgstr ""
-#~ "Juego: El Senado decide disolverse antes que seguir apoyando tus acciones."
-
-#~ msgid "%2d: The %s %s scored %d point\n"
-#~ msgid_plural "%2d: The %s %s scored %d points\n"
-#~ msgstr[0] "%2d: Los %s %s han obtenido %d punto\n"
-#~ msgstr[1] "%2d: Los %s %s han obtenido %d puntos\n"
-
-#~ msgid "Progress Scores:"
-#~ msgstr "Puntuaciones de progreso:"
-
-#~ msgid "Nation %s (used by %s) isn't available."
-#~ msgstr "Nación %s (usada por %s) no está disponible"
-
-#~ msgid "Ecological"
-#~ msgstr "Ecológicas"
-
-#~ msgid "Points required to gain a new tech"
-#~ msgstr "Puntos requeridos por cada avance"
-
-#~ msgid "Whether angry citizens are enabled"
-#~ msgstr "Permitir ciudadanos enfadados"
-
-#~ msgid ""
-#~ "Introduces angry citizens like in civilization II. Angry citizens have to "
-#~ "become unhappy before any other class of citizens may be considered. See "
-#~ "also unhappysize, cityfactor and governments."
-#~ msgstr ""
-#~ "Introduce los ciudadanos enfadados, como en Civilization II. Los "
-#~ "ciudadanos enfadados tienen que pasar a estar descontentos para que se "
-#~ "puedan considerar otras clases de ciudadanos. Véase también unhappysize, "
-#~ "cityfactor y las formas de gobierno."
-
-#~ msgid "civstyle is an obsolete setting"
-#~ msgstr "civstyle es una opción obsoleta"
-
-#~ msgid "Range of vision for units in a fortress"
-#~ msgstr "Alcance de visión para unidades en fortalezas"
-
-#~ msgid ""
-#~ "If set to 1, it has no effect. If 2 or larger, the vision range of a unit "
-#~ "inside a fortress is set to this value, if the necessary invention has "
-#~ "been made. This invention is determined by the flag 'Watchtower' in the "
-#~ "techs ruleset. See also wtowerevision."
-#~ msgstr ""
-#~ "Si vale 1, no tiene efecto. Si vale 2 o más, la visión de una unidad en "
-#~ "una fortaleza es esta, si se ha desarrollado el avance necesario. El "
-#~ "avance necesario queda determinado por el flag 'Watchtower' en el ruleset "
-#~ "de tecnología. Véase también wtowerevision."
-
-#~ msgid "Extra vision range for units in a fortress"
-#~ msgstr "Alcance de visión adicional para las unidades en fortalezas"
-
-#~ msgid ""
-#~ "If set to 0, it has no effect. If larger than 0, the vision range of a "
-#~ "unit is raised by this value, if the unit is inside a fortress and the "
-#~ "invention determined by the flag 'Watchtower' in the techs ruleset has "
-#~ "been made. Always the larger value of wtowervision and wtowerevision will "
-#~ "be used. Also see wtowervision."
-#~ msgstr ""
-#~ "Si vale 0, no tiene efecto. Si vale más de 0, el alcance de visión de una "
-#~ "unidad aumenta en este valor, si la unidad está en una fortaleza y se ha "
-#~ "conseguido el avance determinado por el flag 'Watchtower' del ruleset de "
-#~ "tecnología. Siempre se usa el valor mayor de wtowervision o "
-#~ "wtowerevision. Véase también wtowervision."
-
-#~ msgid "Chance in diplomat/spy contests"
-#~ msgstr "Suerte de diplomáticos y espías"
-
-#~ msgid ""
-#~ "A diplomatic unit acting against a city which has one or more defending "
-#~ "diplomatic units has a diplchance (percent) chance to defeat each such "
-#~ "defender. Also, the chance of a spy returning from a successful mission "
-#~ "is diplchance percent (diplomats never return). This value is also the "
-#~ "basic chance of success for diplomats and spies. Defending spies are "
-#~ "generally twice as capable as diplomats; veteran units are 50% more "
-#~ "capable than non-veteran ones."
-#~ msgstr ""
-#~ "Un Diplomático o Espía que actúa contra una ciudad enemiga defendida por "
-#~ "uno o varios Diplomáticos o Espías tiene una probabilidad diplchance (en "
-#~ "porcentaje) de vencer a cada uno de estos defensores. Además, la "
-#~ "probabilidad de que un Espía vuelva de una misión con éxito es también "
-#~ "diplchance en porcentaje (los Diplomáticos nunca vuelven). Este valor es "
-#~ "además la probabilidad básica de éxito para espias y diplomáticos. Los "
-#~ "Espías son en general el doble de eficaces en defensa que los "
-#~ "Diplomáticos, y las unidades veteranas un 50% más eficaces que las no "
-#~ "veteranas."
-
-#~ msgid "Detail level for logging game events"
-#~ msgstr "Detalle de registro del juego"
-
-#~ msgid ""
-#~ "Only applies if the game log feature is enabled (with the -g command line "
-#~ "option). Levels: 0=no logging, 20=standard logging, 30=detailed logging, "
-#~ "40=debuging logging."
-#~ msgstr ""
-#~ "Sólo se utiliza cuando la función de registro del juego está activa "
-#~ "(usando la opción -g de la línea de comandos). Niveles: 0=sin registro, "
-#~ "20=registro normal, 30=registro detallado, 40=registro para depuración."
-
-#~ msgid "Game: The %s spaceship has arrived at Alpha Centauri."
-#~ msgstr "Juego: La nave espacial %s ha llegado a Alfa Centauri."
-
-#~ msgid "Game ended in allied victory"
-#~ msgstr "La partida ha acabado en victoria de los aliados"
-
-#~ msgid "Trying to alloc nation outside of SELECT_RACES_STATE!"
-#~ msgstr "¡Se ha intentado crear una nación fuera de SELECT_RACES_STATE!"
-
-#~ msgid "No nations left: Removing player %s."
-#~ msgstr "No quedan naciones: el jugador %s será eliminado."
-
-#~ msgid "Game: Sorry, there are no nations left."
-#~ msgstr "Juego: Lo siento, no quedan naciones."
-
-#~ msgid "Ran out of nations. AI controlled player %s not created."
-#~ msgstr ""
-#~ "Por quedarnos sin naciones, el jugador controlado por ordenador %s no fue "
-#~ "creado."
-
-#~ msgid "Nation count smaller than aifill; aifill reduced to %d."
-#~ msgstr "El número de naciones es menor que aifill; se reduce aifill a %d."
-
-#~ msgid "Maxplayers smaller than aifill; aifill reduced to %d."
-#~ msgstr "Maxplayers es menor que aifill; se reduce aifill a %d."
-
-#~ msgid "Game: %s has been added as an AI-controlled player."
-#~ msgstr "Juego: Se ha unido el jugador %s, controlado por el ordenador."
-
-#~ msgid "Error creating new AI player: %s\n"
-#~ msgstr "Error al crear un nuevo jugador controlado por el ordenador: %s\n"
-
-#~ msgid "AI is controlling the %s ruled by %s."
-#~ msgstr "El ordenador controla a los %s, gobernados por %s."
-
-#~ msgid "Game: The game is over..."
-#~ msgstr "Juego: La partida ha finalizado..."
-
-#~ msgid "Last player has disconnected: will need to restart."
-#~ msgstr ""
-#~ "El último jugador que quedaba se ha desconectado: habrá que volver a "
-#~ "empezar (restart)."
-
-#~ msgid "Metaserver topic string set to '%s', not reporting to metaserver."
-#~ msgstr ""
-#~ "Se ha establecido la cadena de información del metaservidor a '%s', no se "
-#~ "informará al servidor."
-
-#~ msgid "The game cannot be saved before it is started."
-#~ msgstr "No se puede salvar la partida antes de que comience."
-
-#~ msgid "Command access level '%s' has been grabbed by connection %s."
-#~ msgstr "El nivel de acceso a comandos '%s' lo ha recibido la conexión %s."
-
-#~ msgid "%-20svalue (min , max)"
-#~ msgstr "%-20svalor (mín , máx)"
-
-#~ msgid "Server Options (initial)"
-#~ msgstr "Opciones del servidor (iniciales)"
-
-#~ msgid "Player %s is made teamless."
-#~ msgstr "El jugador %s queda sin equipo."
-
-#~ msgid "Only ASCII characters are allowed for team names."
-#~ msgstr "Sólo se permiten caracteres ASCII para nombres de equipo."
-
-#~ msgid "Cannot team an observer."
-#~ msgstr "No se puede agregar un observador a un equipo."
-
-#~ msgid "Game: A global observer cannot be created: too many regular players."
-#~ msgstr ""
-#~ "Juego: Un observador global no se puede crear: demasiados jugadores "
-#~ "normales."
-
-#~ msgid "Game: A global observer has been created"
-#~ msgstr "Juego: Se ha creado un observador global."
-
-#~ msgid "%s cannot be taken."
-#~ msgstr "no se puede tomar %s."
-
-#~ msgid "The game must be running before you can see the score."
-#~ msgstr ""
-#~ "Para que se puedan ver las puntuaciones la partida debe estar en marcha."
-
-#~ msgid "But %s is dead!"
-#~ msgstr "Pero %s está muerto!"
-
-#~ msgid "Cannot start the game: it has already been started."
-#~ msgstr "No se puede empezar la partida: ya está en marcha."
-
-#~ msgid "Pregame level: %s"
-#~ msgstr "Nivel de prejuego: %s"
-
-#~ msgid "Game: Cancel treaty in the players dialog first (F3)."
-#~ msgstr "Juego: Antes cancela el pacto en la ventana de jugadores (F3)."
-
-#~ msgid "Game: Can't attack %s because you are not at war with %s."
-#~ msgstr "Juego: No puedes atacar %s porque no estás en guerra con los %s."
-
-#~ msgid "Game: Can't attack %s's unit because you are not at war with %s."
-#~ msgstr ""
-#~ "Juego: No puedes atacar a la unidad de %s porque no estás en guerra con "
-#~ "los %s."
-
-#~ msgid "Game: Moved your %s due to changing land to sea."
-#~ msgstr "Juego: Tu %s se han movido al transformar de tierra a mar."
-
-#~ msgid "Game: Embarked your %s due to changing land to sea."
-#~ msgstr "Juego: Tu %s han embarcado al transformar la tierra en mar."
-
-#~ msgid "Game: Disbanded your %s due to changing land to sea."
-#~ msgstr "Juego: Se desarticula a tu %s al transformar la tierra en mar."
-
-#~ msgid "Game: Docked your %s due to changing sea to land."
-#~ msgstr "Juego: Tu %s se ha amarrado al transformar la mar en tierra."
-
-#~ msgid "Game: You lost %d unit to an attack from %s's %s%s."
-#~ msgid_plural "Game: You lost %d units to an attack from %s's %s%s."
-#~ msgstr[0] ""
-#~ "Juego: Has perdido %1$d unidad bajo un ataque de un %3$s de %2$s%4$s."
-#~ msgstr[1] ""
-#~ "Juego: Has perdido %1$d unidades bajo un ataque de un %3$s de %2$s%4$s."
-
-#~ msgid ""
-#~ "Game: Your %s cancelled patrol order because it encountered a foreign "
-#~ "unit."
-#~ msgstr ""
-#~ "Juego: Tu %s ha abandonado la patrulla porque ha encontrado una unidad "
-#~ "extranjera."
-
-#~ msgid "Esound: http://www.tux.org/~ricdude/EsounD.html"
-#~ msgstr "Esound: http://www.tux.org/~ricdude/EsounD.html"
-
-#~ msgid "Error while caching sample <%d>: confirm value != music_id\n"
-#~ msgstr ""
-#~ "Error al almacenar la muestra <%d> en el caché: confirm value != "
-#~ "music_id\n"
-
-#~ msgid "Error while caching sample <%d>: confirm value != samples[].id\n"
-#~ msgstr ""
-#~ "Error al almacenar la muestra <%d> en el caché: confirm value != samples"
-#~ "[].id\n"
-
-#~ msgid "?Entertainers:E"
-#~ msgstr "H"
-
-#~ msgid "CMA"
-#~ msgstr "CMA"
-
-#~ msgid "City Management Agent"
-#~ msgstr "Agente de Control de Ciudades (CMA)"
-
-#~ msgid "Failed querying socket"
-#~ msgstr "Fallo preguntando al socket"
-
-#~ msgid "Game: Sorry, airunit patrol not yet implemented."
-#~ msgstr ""
-#~ "Juego: Lo siento, no se ha implementado aún la patrulla de unidades "
-#~ "aéreas."
-
-#~ msgid "Game: Sorry, airunit connect not yet implemented."
-#~ msgstr ""
-#~ "Juego: Lo siento, no se ha implementado aún la patrulla de unidades "
-#~ "aéreas."
-
-#~ msgid "* Allows changing government to %s.\n"
-#~ msgstr "* Permite cambiar el gobierno a %s.\n"
-
-#~ msgid "%s%d shield"
-#~ msgstr "%s%d producción"
-
-#~ msgid "%s%d gold"
-#~ msgstr "%s%d monedas de oro"
-
-#~ msgid "Game: "
-#~ msgstr "Juego: "
-
-#~ msgid "Default player's login name"
-#~ msgstr "Nombre del jugador por defecto"
-
-#~ msgid "Default server"
-#~ msgstr "Servidor por defecto"
-
-#~ msgid "Default server's port"
-#~ msgstr "Puerto del servidor por defecto"
-
-#~ msgid "Default metaserver"
-#~ msgstr "Metaservidor por defecto"
-
-#~ msgid "Default name of sound set"
-#~ msgstr "Nombre de los sonidos por defecto"
-
-#~ msgid "Default sound plugin"
-#~ msgstr "Nombre del plugin de sonido por defecto"
-
-#~ msgid "Popup dialogs in AI Mode"
-#~ msgstr "Ventanas en modo ordenador"
-
-#~ msgid "Game: Game Started"
-#~ msgstr "Juego: Comienza la partida"
-
-#~ msgid "Game: Report"
-#~ msgstr "Juego: Informe"
-
-#~ msgid "Other"
-#~ msgstr "Otros"
-
-#~ msgid " with City Walls"
-#~ msgstr " con Murallas"
-
-#~ msgid "Progress: %d turn/advance (%d pts/turn, %d pts/turn from team)"
-#~ msgid_plural ""
-#~ "Progress: %d turns/advance (%d pts/turn, %d pts/turn from team)"
-#~ msgstr[0] ""
-#~ "Progreso: %d turno/avance (%d pts/turno, %d pts/turno desde equipo)"
-#~ msgstr[1] ""
-#~ "Progreso: %d turnos/avance (%d pts/turno, %d pts/turno desde equipo)"
-
-#~ msgid "%s. "
-#~ msgstr "%s. "
-
-#~ msgid "CMA: You lost control of %s. Detaching from city."
-#~ msgstr "CMA: Ya no posees %s, así que el CMA deja de controlar esa ciudad."
-
-#~ msgid ""
-#~ "CMA: %s has changed and the calculated result can't be applied. Will "
-#~ "retry."
-#~ msgstr ""
-#~ "CMA: %s ha cambiado y el resultado que había precalculado no se puede "
-#~ "usar, así que volverá a probar."
-
-#~ msgid ""
-#~ "CMA: %s has changed multiple times. This may be an error in Freeciv or "
-#~ "bad luck. The CMA will detach itself from the city now."
-#~ msgstr ""
-#~ "CMA: %s ha cambiado muchas veces. Puede que la causa sea un error de "
-#~ "Freeciv, o simplemente mala suerte. El CMA dejará de controlar esa ciudad."
-
-#~ msgid "C_MA"
-#~ msgstr "C_MA"
-
-#~ msgid "Trade Ro_utes"
-#~ msgstr "R_utas de Comercio"
-
-#~ msgid "CMA page"
-#~ msgstr "Página del CMA"
-
-#~ msgid "Total trade from trade route %d"
-#~ msgstr "Comercio total de las ruta comercial %d"
-
-#~ msgid "CMA Enabl_ed"
-#~ msgstr "CMA Habilitado(_E)"
-
-#~ msgid "Class"
-#~ msgstr "Clase"
-
-#~ msgid "Use Alt/Meta for accelerators"
-#~ msgstr "Usar Alt/Meta para teclas rápidas"
-
-#~ msgid "Solid unit icon background color in city dialog"
-#~ msgstr "Unidades con fondo opaco en diálogo de ciudades"
-
-#~ msgid ""
-#~ "%s People\n"
-#~ "Year: %s Turn: %d\n"
-#~ "Gold: %d\n"
-#~ "Net Income: %d\n"
-#~ "Tax:%d Lux:%d Sci:%d\n"
-#~ "Researching %s: %d/%d\n"
-#~ "Government: %s"
-#~ msgstr ""
-#~ "Pueblo %s\n"
-#~ "Año: %s Turno: %d\n"
-#~ "Oro: %d\n"
-#~ "Ganancias netas: %d\n"
-#~ "Imp:%d Lujo:%d Cie:%d\n"
-#~ "Investigando %s: %d/%d\n"
-#~ "Gobierno: %s"
-
-#~ msgid "_Initial Server Options"
-#~ msgstr "Opciones _Iniciales del Servidor"
-
-#~ msgid "_Auto Attack"
-#~ msgstr "_Autoatacar"
-
-#~ msgid "City _Overview"
-#~ msgstr "_Vista de la ciudad"
-
-#~ msgid "<"
-#~ msgstr "<"
-
-#~ msgid ">"
-#~ msgstr ">"
-
-#~ msgid "Acti_vate present units"
-#~ msgstr "Acti_var unidades presentes"
-
-#~ msgid "_Sentry idle units"
-#~ msgstr "_Vigilancia"
-
-#~ msgid "_List present units"
-#~ msgstr "_Listar las unidades presentes"
-
-#~ msgid "_Worklist"
-#~ msgstr "_Lista de tareas"
-
-#~ msgid "CM_A"
-#~ msgstr "CM_A"
-
-#~ msgid "_Trade Routes"
-#~ msgstr "_Rutas comerciales"
-
-#~ msgid "Established trade routes"
-#~ msgstr "Rutas comerciales"
-
-#~ msgid "_Misc. Settings"
-#~ msgstr "_Varias opciones"
-
-#~ msgid "City name"
-#~ msgstr "Nombre de la ciudad"
-
-#~ msgid "%s - %s citizens"
-#~ msgstr "%s - %s ciudadanos"
-
-#~ msgid " (worklist)"
-#~ msgstr " (lista de tareas)"
-
-#~ msgid "Supported units (%d)"
-#~ msgstr "Unidades mantenidas (%d)"
-
-#~ msgid "Present units (%d)"
-#~ msgstr "Unidades presentes (%d)"
-
-#~ msgid "Ca_ncel"
-#~ msgstr "Ca_ncelar"
-
-#~ msgid "Sell (worth %d gold)"
-#~ msgstr "Vender (por %d monedas de oro)"
-
-#~ msgid "C_lose"
-#~ msgstr "C_errar"
-
-#~ msgid "_Change..."
-#~ msgstr "C_ambiar..."
-
-#~ msgid "_Select..."
-#~ msgstr "_Seleccionar..."
-
-#~ msgid "Con_figure..."
-#~ msgstr "Con_figurar..."
-
-#~ msgid "Add preset"
-#~ msgstr "Añadir configuración"
-
-#~ msgid "Apply onc_e"
-#~ msgstr "Aplicar una ve_z"
-
-#~ msgid "Control c_ity"
-#~ msgstr "_Controlar la ciudad"
-
-#~ msgid " Connect to Freeciv Server"
-#~ msgstr " Conectar al servidor Freeciv"
-
-#~ msgid ""
-#~ "Auto-connecting to server \"%s\" at port %d as \"%s\" every %d.%d second"
-#~ "(s) for %d times"
-#~ msgstr ""
-#~ "Autoconectando con el servidor \"%s\", puerto %d, como \"%s\" cada %d.%d "
-#~ "segundo(s) hasta %d intentos"
-
-#~ msgid "Message:"
-#~ msgstr "Mensaje:"
-
-#~ msgid "Nation:"
-#~ msgstr "Nación:"
-
-#~ msgid "Class:"
-#~ msgstr "Clase:"
-
-#~ msgid "Description"
-#~ msgstr "Descripción"
-
-#~ msgid "Select your city style"
-#~ msgstr "Elige el estilo de tus ciudades"
-
-#~ msgid "Reset Tree"
-#~ msgstr "Restablecer Árbol"
-
-#~ msgid "Expand Unknown"
-#~ msgstr "Expandir Desconocidos"
-
-#~ msgid "?techhelp:."
-#~ msgstr "."
-
-#~ msgid "_Local Options"
-#~ msgstr "Opciones _locales"
-
-#~ msgid "Messa_ge Options"
-#~ msgstr "_Opciones sobre mensajes"
-
-#~ msgid "_Save Settings"
-#~ msgstr "_Guardar preferencias"
-
-#~ msgid "Server Opt _initial"
-#~ msgstr "Opciones _iniciales del servidor"
-
-#~ msgid "Server Opt _ongoing"
-#~ msgstr "Opciones _actuales del servidor"
-
-#~ msgid "_Export Log"
-#~ msgstr "_Exportar registro"
-
-#~ msgid "_Revolution!"
-#~ msgstr "¡_Revolución!"
-
-#~ msgid "Go|Airlift to City"
-#~ msgstr "Aerotransportar a ciudad"
-
-#~ msgid "_Disband Unit"
-#~ msgstr "_Desarticular unidad"
-
-#~ msgid "Go/Air_lift to City"
-#~ msgstr "Aerotransportar a ciudad (_L)"
-
-#~ msgid "_Diplomat/Spy Actions"
-#~ msgstr "Acciones _diplom/espionaje"
-
-#~ msgid ""
-#~ "Where to Display Messages\n"
-#~ "Out = Output window, Mes = Messages window,\n"
-#~ "Pop = Popup individual window"
-#~ msgstr ""
-#~ "Dónde mostrar los mensajes\n"
-#~ "Pri = Ventana principal, Men = Ventana de mensajes,\n"
-#~ "Ind = Crear una ventana individual"
-
-#~ msgid "Totals: %s%9d%s%9d%s%9d%s%9d%s%9d"
-#~ msgstr "Totales: %s%9d%s%9d%s%9d%s%9d%s%9d"
-
-#~ msgid "Production worklist"
-#~ msgstr "Lista de tareas"
-
-#~ msgid "Auto-attack vs land units"
-#~ msgstr "Atacar a las unidades terrestres"
-
-#~ msgid "Auto-attack vs sea units"
-#~ msgstr "Atacar a las unidades marítimas"
-
-#~ msgid "Auto-attack vs air units"
-#~ msgstr "Atacar a las unidades aéreas"
-
-#~ msgid "Auto-attack vs helicopters"
-#~ msgstr "Atacar a los helicópteros"
-
-#~ msgid "Select nation and name"
-#~ msgstr "Elige tu nación y tu nombre"
-
-#~ msgid "Your leader name"
-#~ msgstr "Nombre del _líder"
-
-#~ msgid "Select your sex"
-#~ msgstr "Elige tu sexo"
-
-#~ msgid ""
-#~ "%s People\n"
-#~ "Year: %s\n"
-#~ "Gold: %d\n"
-#~ "Tax:%d Lux:%d Sci:%d"
-#~ msgstr ""
-#~ "Pueblo de los %s\n"
-#~ "Año: %s\n"
-#~ "Oro: %d\n"
-#~ "Imp:%d Lujo:%d Cie:%d"
-
-#~ msgid "Server Opt initial"
-#~ msgstr "Opciones iniciales del servidor"
-
-#~ msgid "Server Opt ongoing"
-#~ msgstr "Opciones actuales del servidor"
-
-#~ msgid "CMA..."
-#~ msgstr "CMA..."
-
-#~ 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 Solar Plant, Hydro Plant, Power Plant, or "
-#~ "Nuclear Plant."
-#~ msgstr ""
-#~ "Elimina toda la contaminación proveniente de la producción de la ciudad. "
-#~ "Además aumenta la producción de la Fábrica y de la Planta Industrial: una "
-#~ "Fábrica junto con una Central Solar incrementan la producción en un 75%, "
-#~ "y una Fábrica junto con una Planta Industrial y una Central Solar "
-#~ "incrementan la producción en un 150%.\n"
-#~ "\n"
-#~ "En una ciudad sólo puede haber una Central Solar, una Central "
-#~ "Hidroeléctrica, una Central Térmica o una Central Nuclear."
-
-#~ msgid ""
-#~ "Boosts science production by 33% in each city with a library, and 33% in "
-#~ "each city with a university."
-#~ msgstr ""
-#~ "Impulsa en un 33% la producción científica de las ciudadades con una "
-#~ "biblioteca, y un 33% de aquellas que tienen una universidad."
-
-#~ msgid "Mr."
-#~ msgstr "Don"
-
-#~ msgid "Ms."
-#~ msgstr "Doña"
-
-#~ msgid ""
-#~ "Anarchy is simply the absence of any recognizable government. Citizens "
-#~ "are disorganized and unproductive, and will spend all income as quickly "
-#~ "as possible, rather than paying taxes or conducting research.\n"
-#~ "\n"
-#~ "Anarchy offers slightly less corruption than Despotism, but slightly more "
-#~ "unhappiness.\n"
-#~ "\n"
-#~ "Settlers consume 1 food per turn under Anarchy. Squares which would "
-#~ "normally yield more than 2 units of food, shields or trade suffer a 1-"
-#~ "unit penalty (e.g., an irrigated grassland square which would normally "
-#~ "yield 3 food only yields 2 food while you are in Anarchy). (This penalty "
-#~ "is removed if the city is celebrating; see Happiness.)\n"
-#~ "\n"
-#~ "Under Anarchy, each of your cities can support a number of military units "
-#~ "equal to its size without paying shields for upkeep. (Additional units "
-#~ "require 1 production shield each.)\n"
-#~ "\n"
-#~ "You may impose martial law under Anarchy: each military unit inside a "
-#~ "city will keep one unhappy citizen content. (Or at least, unhappy "
-#~ "citizens will act content, and will not cause disorder.)"
-#~ msgstr ""
-#~ "La Anarquía consiste simplemente en la ausencia de gobierno. Los "
-#~ "ciudadanos están desorganizados y producen poco, y gastan todo lo que "
-#~ "ganan tan pronto como pueden, en lugar de pagar impuestos e investigar.\n"
-#~ "\n"
-#~ "Con la Anarquía la corrupción es algo menor que con el Despotismo, pero "
-#~ "el descontento es algo mayor.\n"
-#~ "\n"
-#~ "En una Anarquía los Colonos consumen 1 unidad de alimento por turno. Las "
-#~ "casillas que normalmente generarían más de 2 unidades de alimento, "
-#~ "producción o comercio sufren una penalización de 1 unidad (por ejemplo, "
-#~ "las praderas con regadío que normalmente producirían 3 unidades de "
-#~ "alimento sólo producen 2 en una Anarquía). (Esta penalización "
-#~ "desaparece si la ciudad está en Celebraciones, véase Felicidad).\n"
-#~ "\n"
-#~ "Cada una de tus ciudades puede mantener un número de unidades militares "
-#~ "igual a su tamaño sin necesidad de sustento (el sustento de cada unidad "
-#~ "adicional es de 1 unidad de producción).\n"
-#~ "\n"
-#~ "En una Anarquía, puedes imponer la ley marcial: por cada unidad militar "
-#~ "que esté en una ciudad un ciudadano descontento pasará a estar conforme "
-#~ "(o, al menos, fingirá estar conforme y no participará en disturbios)."
-
-#~ msgid ""
-#~ "Under Despotism, you are the absolute ruler of your people. Your control "
-#~ "over your citizens is maintained largely by martial law.\n"
-#~ "\n"
-#~ "Despotism suffers the highest level of corruption of all forms of "
-#~ "government.\n"
-#~ "\n"
-#~ "Settlers consume 1 food per turn under Despotism. Squares which would "
-#~ "normally yield more than 2 units of food, shields or trade suffer a 1-"
-#~ "unit penalty (e.g., an irrigated grassland square which would normally "
-#~ "yield 3 food only yields 2 food while you are under Despotic rule). "
-#~ "(This penalty is removed if the city is celebrating; see Happiness.)\n"
-#~ "\n"
-#~ "The maximum rate you can set for science, tax or luxuries is 60%.\n"
-#~ "\n"
-#~ "Under Despotism, each of your cities can support a number of military "
-#~ "units equal to its size without paying shields for upkeep. (Additional "
-#~ "units require 1 production shield each.)\n"
-#~ "\n"
-#~ "You may impose martial law under Despotism: each military unit inside a "
-#~ "city will keep one unhappy citizen content. (Or at least, unhappy "
-#~ "citizens will act content, and will not cause disorder.)"
-#~ msgstr ""
-#~ "Con el Despotismo, tu poder sobre el pueblo es absoluto. El control de "
-#~ "los ciudadanos se basa sobre todo en la ley marcial.\n"
-#~ "\n"
-#~ "El Despotismo sufre el mayor nivel de corrupción de todas las formas de "
-#~ "gobierno.\n"
-#~ "\n"
-#~ "Con el Despotismo los Colonos consumen 1 unidad de alimento por turno. "
-#~ "Las casillas que normalmente generarían más de 2 unidades de alimento, "
-#~ "producción o comercio sufren una penalización de 1 unidad (por ejemplo, "
-#~ "las praderas con regadío que normalmente producirían 3 unidades de "
-#~ "alimento sólo producen 2 con un gobierno Despótico). (Esta penalización "
-#~ "desaparece si la ciudad está en Celebraciones, véase Felicidad).\n"
-#~ "\n"
-#~ "La máxima tasa que puedes fijar para ciencia, impuestos o lujo es del "
-#~ "60%.\n"
-#~ "\n"
-#~ "Cada una de tus ciudades puede mantener un número de unidades militares "
-#~ "igual a su tamaño sin necesidad de sustento (el sustento de cada unidad "
-#~ "adicional es de 1 unidad de producción).\n"
-#~ "\n"
-#~ "En un Despotismo, puedes imponer la ley marcial: por cada unidad militar "
-#~ "que esté en una ciudad un ciudadano descontento pasará a estar conforme "
-#~ "(o, al menos, fingirá estar conforme y no participará en disturbios)."
-
-#~ msgid ""
-#~ "Under Monarchy, a king or queen serves as a hereditary figurehead for "
-#~ "your government.\n"
-#~ "\n"
-#~ "Monarchy suffers the same small amount of corruption that the Republic "
-#~ "does.\n"
-#~ "\n"
-#~ "Settlers consume 1 food per turn under Monarchy.\n"
-#~ "\n"
-#~ "If a city governed by a Monarchy is celebrating, it will receive a bonus "
-#~ "of 1 trade in each square which already produces at least 1 trade. See "
-#~ "Happiness for details.\n"
-#~ "\n"
-#~ "The maximum rate you can set for science, tax or luxuries is 70%.\n"
-#~ "\n"
-#~ "Under Monarchy, your cities can support up to 3 military units without "
-#~ "paying shields for upkeep. (Additional units require 1 production shield "
-#~ "each.)\n"
-#~ "\n"
-#~ "You may impose limited martial law under Monarchy: each military unit in "
-#~ "a city, up to a maximum of 3, will keep one unhappy citizen content."
-#~ msgstr ""
-#~ "En una Monarquía, un rey o una reina son los dirigentes hereditarios del "
-#~ "gobierno.\n"
-#~ "\n"
-#~ "La Monarquía sufre de la misma pequeña cantidad de corrupción que la "
-#~ "República.\n"
-#~ "\n"
-#~ "Los Colonos consumen una unidad de alimento cada turno.\n"
-#~ "\n"
-#~ "Si una ciudad bajo gobierno Monárquico está en celebraciones, recibirá un "
-#~ "bonus de 1 unidad de comercio en cada casilla que ya produjera al menos 1 "
-#~ "comercio. Véase Felicidad para más detalles.\n"
-#~ "\n"
-#~ "La máxima tasa que puedes fijar para ciencia, impuestos o lujo es del "
-#~ "70%.\n"
-#~ "\n"
-#~ "En la Monarquía, tus ciudades pueden mantener hasta 3 unidades militares "
-#~ "sin necesidad de sustento (el sustento de cada unidad adicional es de 1 "
-#~ "unidad de producción).\n"
-#~ "\n"
-#~ "Puedes imponer una ley marcial limitada: cada unidad militar que haya en "
-#~ "una ciudad, hasta un máximo de 3, hará que un ciudadano descontento pase "
-#~ "a estar conforme."
-
-#~ msgid ""
-#~ "A Communist government is based on the ideal that all people are equal. "
-#~ "All goods are owned by the state, rather than by private citizens. "
-#~ "Communism gives a balance between military and commercial styles of "
-#~ "government.\n"
-#~ "\n"
-#~ "Under Communism, corruption does not vary by distance from the capital; "
-#~ "all cities (including the capital) have a modest amount of corruption. "
-#~ "In addition, Communist cities more than 10 squares away from the capital "
-#~ "are considered to be only 10 squares away when computing the cost of "
-#~ "inciting a revolt. See Units, Diplomat.\n"
-#~ "\n"
-#~ "Settlers consume 1 food per turn under Communism.\n"
-#~ "\n"
-#~ "If a city governed by Communism is celebrating, it will receive a bonus "
-#~ "of 1 trade in each square which already produces at least 1 trade. See "
-#~ "Happiness for details.\n"
-#~ "\n"
-#~ "The maximum rate you can set for science, tax or luxuries is 80%.\n"
-#~ "\n"
-#~ "Diplomats and Spies created under Communism are always veterans.\n"
-#~ "\n"
-#~ "Under Communism, your cities can support up to 3 military units without "
-#~ "paying shields for upkeep. (Additional units require 1 production shield "
-#~ "each.)\n"
-#~ "\n"
-#~ "You impose limited but efficient martial law under Communism. Each "
-#~ "military unit inside a city, up to a maximum of 3, will keep 2 unhappy "
-#~ "citizens content."
-#~ msgstr ""
-#~ "Un gobierno Comunista se basa en el ideal de que todas las personas son "
-#~ "iguales. Todos los bienes son propiedad del estado y no de ciudadanos "
-#~ "privados. El Comunismo proporciona un equilibrio entre un estilo de "
-#~ "gobierno militar y uno comercial.\n"
-#~ "\n"
-#~ "Con el Comunismo, la corrupción no depende de la distancia a la capital; "
-#~ "todas las ciudades (incluyendo la capital) sufren un poco de corrupción. "
-#~ "Además, para las ciudades Comunistas que estén a más de 10 casillas de la "
-#~ "capital la distancia efectiva para calcular el coste de provocar una "
-#~ "sublevación será de sólo 10 casillas (véase Unidades, Diplomático).\n"
-#~ "\n"
-#~ "Los Colonos consumen 1 unidades de alimento por turno con el Comunismo.\n"
-#~ "\n"
-#~ "Si una ciudad Comunista está en celebraciones, recibirá un bonus de 1 "
-#~ "unidad de comercio en cada casilla que ya produjera al menos 1 comercio. "
-#~ "Véase Felicidad para más detalles.\n"
-#~ "\n"
-#~ "La máxima tasa que puedes fijar para ciencia, impuestos y lujos es del "
-#~ "80%.\n"
-#~ "\n"
-#~ "Los Diplomáticos y Espías creados bajo el Comunismo son siempre "
-#~ "veteranos.\n"
-#~ "\n"
-#~ "En el Comunismo, tus ciudades pueden mantener hasta 3 unidades militares "
-#~ "sin necesidad de sustento (el sustento de cada unidad adicional es de 1 "
-#~ "unidad de producción).\n"
-#~ "\n"
-#~ "Con el Comunismo se impone una ley marcial limitada pero eficaz: cada "
-#~ "unidad militar que haya en una ciudad, hasta un máximo de 3, hará que 2 "
-#~ "ciudadanos descontentos pasen a estar conformes."
-
-#~ msgid ""
-#~ "Under a Republican government, citizens hold an election to select a "
-#~ "representative who will govern them; since elected leaders must remain "
-#~ "popular to remain in control, citizens are given a greater degree of "
-#~ "freedom. Citizens under the Republic become unhappy easily, but the self-"
-#~ "sufficiency of your citizens allows high levels of trade.\n"
-#~ "\n"
-#~ "Cities under the Republic suffer a small amount of corruption.\n"
-#~ "\n"
-#~ "Settlers consume 2 food per turn under the Republic. Squares with at "
-#~ "least 1 trade resource get a trade bonus of 1 under the Republic.\n"
-#~ "\n"
-#~ "Republican cities which are celebrating grow at a rate of 1 citizen per "
-#~ "turn; see Happiness for details.\n"
-#~ "\n"
-#~ "The maximum rate you can set for science, tax or luxuries is 80%.\n"
-#~ "\n"
-#~ "Under the Republic, military units require 1 production shield each for "
-#~ "upkeep. In addition the following units are considered aggressive "
-#~ "units:\n"
-#~ "\n"
-#~ "- units with an attack strength greater than 0 which are not inside a "
-#~ "city or inside a fortress within 3 squares of a friendly city\n"
-#~ "\n"
-#~ "- air units (including missiles and helicopters, but not fighters) with "
-#~ "an attack strength greater than 0, regardless of their location\n"
-#~ "\n"
-#~ "The citizens of a city will tolerate 1 aggressive unit; subsequent units "
-#~ "will generate 1 unhappy citizen each."
-#~ msgstr ""
-#~ "En una República, se celebran elecciones en las que los ciudadanos eligen "
-#~ "a los representantes que los gobernarán; como los dirigentes electos "
-#~ "deben ser populares para no perder el poder, los ciudadanos obtienen un "
-#~ "mayor grado de libertad. El descontento surge fácilmente entre los "
-#~ "ciudadanos de una República, pero la autonomía de tus ciudadanos permite "
-#~ "mayores niveles de comercio.\n"
-#~ "\n"
-#~ "Las ciudades de una República sufren una pequeña cantidad de corrupción.\n"
-#~ "\n"
-#~ "Los Colonos consumen 2 unidades de alimento por turno en una República. "
-#~ "Las casillas que ya produjeran al menos 1 unidad de comercio reciben un "
-#~ "bonus de 1 comercio adicional.\n"
-#~ "\n"
-#~ "Las ciudades de una República en las que haya celebraciones crecen a un "
-#~ "ritmo de 1 ciudadano por turno; véase Felicidad para más detalles.\n"
-#~ "\n"
-#~ "La máxima tasa que se puede fijar para ciencia, impuestos o lujo es del "
-#~ "80%.\n"
-#~ "\n"
-#~ "En la República, cada unidad militar necesita un sustento de 1 unidad de "
-#~ "producción por turno. Además, se consideran agresivas las siguientes "
-#~ "unidades:\n"
-#~ "\n"
-#~ "- Las unidades con una fuerza de ataque no nula que no están ni en una "
-#~ "ciudad, ni en una fortaleza a menos de 3 casillas de una ciudad propia.\n"
-#~ "\n"
-#~ "- Las unidades aéreas (incluyendo misiles y helicópteros, pero no cazas) "
-#~ "con una fuerza de ataque no nula, independientemente de su ubicación.\n"
-#~ "\n"
-#~ "Los habitantes de una ciudad tolerarán 1 unidad agresiva; cada unidad "
-#~ "agresiva subsiguiente generará 1 ciudadano descontento."
-
-#~ msgid ""
-#~ "Under Democracy, citizens govern directly by voting on issues. Democracy "
-#~ "offers the highest possible level of trade, but also offers the most "
-#~ "potential for unhappiness. There is no corruption during Democracy, but "
-#~ "citizens become very upset during wars.\n"
-#~ "\n"
-#~ "Settlers consume 2 food per turn under Democracy. Squares with at least "
-#~ "1 trade resource get a trade bonus of 1 under Democracy.\n"
-#~ "\n"
-#~ "Democratic cities which are celebrating grow at a rate of 1 citizen per "
-#~ "turn; see Happiness for details.\n"
-#~ "\n"
-#~ "There are no taxation limits under Democracy; you can set science, tax or "
-#~ "luxuries to 100%.\n"
-#~ "\n"
-#~ "Under Democracy, military units require 1 production shield each for "
-#~ "upkeep. In addition the following units generate unhappiness:\n"
-#~ "\n"
-#~ "- Units with an attack strength greater than 0 which are not inside a "
-#~ "city, or inside a fortress within 3 squares of a friendly city, generate "
-#~ "2 unhappy citizens.\n"
-#~ "\n"
-#~ "- Air units with an attack strength greater than 0 which are inside a "
-#~ "city generate only 1 unhappy citizen. Fighters generate no unhappiness.\n"
-#~ "\n"
-#~ "If a city remains in disorder more than 2 turns under Democratic rule, "
-#~ "the citizens will spontaneously revolt and plunge your civilization into "
-#~ "Anarchy.\n"
-#~ "\n"
-#~ "Because (happy) citizens of Democracy believe strongly in the government, "
-#~ "their loyalty is unswerving. Military units of Democratic civilizations "
-#~ "cannot be bribed, and Democratic cities cannot be incited to revolt by "
-#~ "enemy Diplomats and Spies."
-#~ msgstr ""
-#~ "En una Democracia, los ciudadanos gobiernan directamente votando las "
-#~ "decisiones. Con la Democracia se consigue el mayor nivel posible de "
-#~ "comercio, pero también ofrece las mayores posibilidades para el "
-#~ "descontento. No hay corrupción en la Democracia, pero los ciudadanos "
-#~ "están muy descontentos durante las guerras.\n"
-#~ "\n"
-#~ "Los Colonos consumen 2 unidades de alimento por turno en una Democracia. "
-#~ "Las casillas que ya produjeran al menos 1 unidad de comercio reciben un "
-#~ "bonus de 1 comercio adicional.\n"
-#~ "\n"
-#~ "Las ciudades de una Democracia en las que haya celebraciones crecen a un "
-#~ "ritmo de 1 ciudadano por turno; véase Felicidad para más detalles.\n"
-#~ "\n"
-#~ "No hay tasas máximas en Democracia; puedes fijar la ciencia, los "
-#~ "impuestos o el lujo al 100%.\n"
-#~ "\n"
-#~ "En la Democracia, cada unidad militar necesita un sustento de 1 unidad de "
-#~ "producción por turno. Además, las siguientes unidades provocan "
-#~ "descontento:\n"
-#~ "\n"
-#~ "- Las unidades con una fuerza de ataque no nula que no están ni en una "
-#~ "ciudad, ni en una fortaleza a menos de 3 casillas de una ciudad propia, "
-#~ "provocan dos ciudadanos descontentos cada una.\n"
-#~ "\n"
-#~ "- Las unidades aéreas (incluyendo misiles y helicópteros) con una fuerza "
-#~ "de ataque no nula, que están en una ciudad generan sólo 1 ciudadano "
-#~ "descontento cada una, excepto los cazas que no generan descontento.\n"
-#~ "\n"
-#~ "Si en Democracia hay disturbios en una ciudad durante más de dos turnos "
-#~ "consecutivos, los ciudadanos se sublevarán espontáneamente y tu "
-#~ "civilización caerá en la Anarquía.\n"
-#~ "\n"
-#~ "Como los ciudadanos (felices) de una Democracia creen fuertemente en el "
-#~ "gobierno, demuestran una gran lealtad. No se puede sobornar a las "
-#~ "unidades militares de los gobiernos Democráticos, y no se puede provocar "
-#~ "una sublevación en una ciudad Democrática por medio de Diplomáticos o "
-#~ "Espías."
-
-#~ msgid ""
-#~ "Anarchy is simply the absence of any recognizable government. Citizens "
-#~ "are disorganized and unproductive, and will spend all income as quickly "
-#~ "as possible, rather than paying taxes or conducting research.\n"
-#~ "\n"
-#~ "Anarchy offers slightly less corruption and waste than Despotism, but "
-#~ "slightly more unhappiness.\n"
-#~ "\n"
-#~ "Settlers consume 1 food per turn under Anarchy. Squares which would "
-#~ "normally yield more than 2 units of food, shields or trade suffer a 1-"
-#~ "unit penalty (e.g., an irrigated grassland square which would normally "
-#~ "yield 3 food only yields 2 food while you are in Anarchy). (This penalty "
-#~ "is removed if the city is celebrating; see Happiness.)\n"
-#~ "\n"
-#~ "Under Anarchy, each of your cities can support a number of military units "
-#~ "equal to its size without paying shields for upkeep. (Additional units "
-#~ "require 1 production shield each.)\n"
-#~ "\n"
-#~ "You may impose martial law under Anarchy: each military unit inside a "
-#~ "city will keep one unhappy citizen content. (Or at least, unhappy "
-#~ "citizens will act content, and will not cause disorder.)"
-#~ msgstr ""
-#~ "La Anarquía consiste simplemente en la ausencia de gobierno. Los "
-#~ "ciudadanos están desorganizados y producen poco, y gastan todo lo que "
-#~ "ganan tan pronto como pueden, en lugar de pagar impuestos e investigar.\n"
-#~ "\n"
-#~ "Con la Anarquía la corrupción y la desidia son algo menores que con el "
-#~ "Despotismo, pero el descontento es algo mayor.\n"
-#~ "\n"
-#~ "En una Anarquía los Colonos consumen 1 unidad de alimento por turno. Las "
-#~ "casillas que normalmente generarían más de 2 unidades de alimento, "
-#~ "producción o comercio sufren una penalización de 1 unidad (por ejemplo, "
-#~ "las praderas con regadío que normalmente producirían 3 unidades de "
-#~ "alimento sólo producen 2 en una Anarquía). (Esta penalización "
-#~ "desaparece si la ciudad está en Celebraciones, véase Felicidad).\n"
-#~ "\n"
-#~ "Cada una de tus ciudades puede mantener un número de unidades militares "
-#~ "igual a su tamaño sin necesidad de sustento (el sustento de cada unidad "
-#~ "adicional es de 1 unidad de producción).\n"
-#~ "\n"
-#~ "En una Anarquía, puedes imponer la ley marcial: por cada unidad militar "
-#~ "que esté en una ciudad un ciudadano descontento pasará a estar conforme "
-#~ "(o, al menos, fingirá estar conforme y no participará en disturbios)."
-
-#~ msgid ""
-#~ "Under Despotism, you are the absolute ruler of your people. Your control "
-#~ "over your citizens is maintained largely by martial law.\n"
-#~ "\n"
-#~ "Despotism suffers the highest level of corruption and waste of all forms "
-#~ "of government.\n"
-#~ "\n"
-#~ "Settlers consume 1 food per turn under Despotism. Squares which would "
-#~ "normally yield more than 2 units of food, shields or trade suffer a 1-"
-#~ "unit penalty (e.g., an irrigated grassland square which would normally "
-#~ "yield 3 food only yields 2 food while you are under Despotic rule). "
-#~ "(This penalty is removed if the city is celebrating; see Happiness.)\n"
-#~ "\n"
-#~ "The maximum rate you can set for science, tax or luxuries is 60%.\n"
-#~ "\n"
-#~ "Under Despotism, each of your cities can support a number of military "
-#~ "units equal to its size without paying shields for upkeep. (Additional "
-#~ "units require 1 production shield each.)\n"
-#~ "\n"
-#~ "You may impose martial law under Despotism: each military unit inside a "
-#~ "city will keep one unhappy citizen content. (Or at least, unhappy "
-#~ "citizens will act content, and will not cause disorder.)"
-#~ msgstr ""
-#~ "Con el Despotismo, tu poder sobre el pueblo es absoluto. El control de "
-#~ "los ciudadanos se basa sobre todo en la ley marcial.\n"
-#~ "\n"
-#~ "El Despotismo sufre el mayor nivel de corrupción y desidia de todas las "
-#~ "formas de gobierno.\n"
-#~ "\n"
-#~ "Con el Despotismo los Colonos consumen 1 unidad de alimento por turno. "
-#~ "Las casillas que normalmente generarían más de 2 unidades de alimento, "
-#~ "producción o comercio sufren una penalización de 1 unidad (por ejemplo, "
-#~ "las praderas con regadío que normalmente producirían 3 unidades de "
-#~ "alimento sólo producen 2 con un gobierno Despótico). (Esta penalización "
-#~ "desaparece si la ciudad está en Celebraciones, véase Felicidad).\n"
-#~ "\n"
-#~ "La máxima tasa que puedes fijar para ciencia, impuestos o lujo es del "
-#~ "60%.\n"
-#~ "\n"
-#~ "Cada una de tus ciudades puede mantener un número de unidades militares "
-#~ "igual a su tamaño sin necesidad de sustento (el sustento de cada unidad "
-#~ "adicional es de 1 unidad de producción).\n"
-#~ "\n"
-#~ "En un Despotismo, puedes imponer la ley marcial: por cada unidad militar "
-#~ "que esté en una ciudad un ciudadano descontento pasará a estar conforme "
-#~ "(o, al menos, fingirá estar conforme y no participará en disturbios)."
-
-#~ msgid ""
-#~ "Under Monarchy, a king or queen serves as a hereditary figurehead for "
-#~ "your government.\n"
-#~ "\n"
-#~ "Monarchy suffers the same small amount of corruption and waste that the "
-#~ "Republic does.\n"
-#~ "\n"
-#~ "Settlers consume 1 food per turn under Monarchy.\n"
-#~ "\n"
-#~ "If a city governed by a Monarchy is celebrating, it will receive a bonus "
-#~ "of 1 trade in each square which already produces at least 1 trade. See "
-#~ "Happiness for details.\n"
-#~ "\n"
-#~ "The maximum rate you can set for science, tax or luxuries is 70%.\n"
-#~ "\n"
-#~ "Under Monarchy, your cities can support up to 3 military units without "
-#~ "paying shields for upkeep. (Additional units require 1 production shield "
-#~ "each.)\n"
-#~ "\n"
-#~ "You may impose limited martial law under Monarchy: each military unit in "
-#~ "a city, up to a maximum of 3, will keep one unhappy citizen content."
-#~ msgstr ""
-#~ "En una Monarquía, un rey o una reina son los dirigentes hereditarios del "
-#~ "gobierno.\n"
-#~ "\n"
-#~ "La Monarquía sufre de la misma pequeña cantidad de corrupción y desidia "
-#~ "que la República.\n"
-#~ "\n"
-#~ "Los Colonos consumen una unidad de alimento cada turno.\n"
-#~ "\n"
-#~ "Si una ciudad bajo gobierno Monárquico está en celebraciones, recibirá un "
-#~ "bonus de 1 unidad de comercio en cada casilla que ya produjera al menos 1 "
-#~ "comercio. Véase Felicidad para más detalles.\n"
-#~ "\n"
-#~ "La máxima tasa que puedes fijar para ciencia, impuestos o lujo es del "
-#~ "70%.\n"
-#~ "\n"
-#~ "En la Monarquía, tus ciudades pueden mantener hasta 3 unidades militares "
-#~ "sin necesidad de sustento (el sustento de cada unidad adicional es de 1 "
-#~ "unidad de producción).\n"
-#~ "\n"
-#~ "Puedes imponer una ley marcial limitada: cada unidad militar que haya en "
-#~ "una ciudad, hasta un máximo de 3, hará que un ciudadano descontento pase "
-#~ "a estar conforme."
-
-#~ msgid ""
-#~ "A Communist government is based on the ideal that all people are equal. "
-#~ "All goods are owned by the state, rather than by private citizens. "
-#~ "Communism gives a balance between military and commercial styles of "
-#~ "government.\n"
-#~ "\n"
-#~ "Under Communism, corruption and waste does not vary by distance from the "
-#~ "capital; all cities (including the capital) have a modest amount of "
-#~ "corruption. In addition, Communist cities more than 10 squares away from "
-#~ "the capital are considered to be only 10 squares away when computing the "
-#~ "cost of inciting a revolt (see Units, Diplomat).\n"
-#~ "\n"
-#~ "Settlers consume 2 food per turn under Communism.\n"
-#~ "\n"
-#~ "If a city governed by Communism is celebrating, it will receive a bonus "
-#~ "of 1 trade in each square which already produces at least 1 trade. See "
-#~ "Happiness for details.\n"
-#~ "\n"
-#~ "The maximum rate you can set for science, tax or luxuries is 80%.\n"
-#~ "\n"
-#~ "Diplomats and Spies created under Communism are always veterans.\n"
-#~ "\n"
-#~ "Under Communism, your cities can support up to 3 military units without "
-#~ "paying shields for upkeep. (Additional units require 1 production shield "
-#~ "each.)\n"
-#~ "\n"
-#~ "You impose limited but efficient martial law under Communism. Each "
-#~ "military unit inside a city, up to a maximum of 3, will keep 2 unhappy "
-#~ "citizens content."
-#~ msgstr ""
-#~ "Un gobierno Comunista se basa en el ideal de que todas las personas son "
-#~ "iguales. Todos los bienes son propiedad del estado, y no de ciudadanos "
-#~ "privados. El Comunismo proporciona un equilibrio entre un estilo de "
-#~ "gobierno militar y uno comercial.\n"
-#~ "\n"
-#~ "Con el Comunismo, la corrupción y la desidia no dependen de la distancia "
-#~ "a la capital; todas las ciudades (incluyendo la capital) sufren un poco "
-#~ "de corrupción. Además, para las ciudades Comunistas que estén a más de "
-#~ "10 casillas de la capital la distancia efectiva para calcular el coste de "
-#~ "provocar una sublevación será de sólo 10 casillas (véase Unidades, "
-#~ "Diplomático).\n"
-#~ "\n"
-#~ "Los Colonos consumen 2 unidades de alimento por turno con el Comunismo.\n"
-#~ "\n"
-#~ "Si una ciudad Comunista está en celebraciones, recibirá un bonus de 1 "
-#~ "unidad de comercio en cada casilla que ya produjera al menos 1 comercio. "
-#~ "Véase Felicidad para más detalles.\n"
-#~ "\n"
-#~ "La máxima tasa que puedes fijar para ciencia, impuestos y lujos es del "
-#~ "80%.\n"
-#~ "\n"
-#~ "Los Diplomáticos y Espías creados bajo el Comunismo son siempre "
-#~ "veteranos.\n"
-#~ "\n"
-#~ "En el Comunismo, tus ciudades pueden mantener hasta 3 unidades militares "
-#~ "sin necesidad de sustento (el sustento de cada unidad adicional es de 1 "
-#~ "unidad de producción).\n"
-#~ "\n"
-#~ "Puedes imponer una ley marcial limitada pero eficaz: cada unidad militar "
-#~ "que haya en una ciudad, hasta un máximo de 3, hará que 2 ciudadanos "
-#~ "descontentos pasen a estar conformes."
-
-#~ msgid ""
-#~ "Under a Republican government, citizens hold an election to select a "
-#~ "representative who will govern them; since elected leaders must remain "
-#~ "popular to remain in control, citizens are given a greater degree of "
-#~ "freedom. Citizens under the Republic become unhappy easily, but the self-"
-#~ "sufficiency of your citizens allows high levels of trade.\n"
-#~ "\n"
-#~ "Cities under the Republic suffer a small amount of corruption and waste.\n"
-#~ "\n"
-#~ "Settlers consume 2 food per turn under the Republic. Squares with at "
-#~ "least 1 trade resource get a trade bonus of 1 under the Republic.\n"
-#~ "\n"
-#~ "Republican cities which are celebrating grow at a rate of 1 citizen per "
-#~ "turn; see Happiness for details.\n"
-#~ "\n"
-#~ "The maximum rate you can set for science, tax or luxuries is 80%.\n"
-#~ "\n"
-#~ "Under the Republic, military units require 1 production shield each for "
-#~ "upkeep. In addition the following units are considered aggressive "
-#~ "units:\n"
-#~ "\n"
-#~ "- units with an attack strength greater than 0 which are not inside a "
-#~ "city or inside a fortress within 3 squares of a friendly city\n"
-#~ "\n"
-#~ "- air units (including missiles and helicopters, but not fighters) with "
-#~ "an attack strength greater than 0, regardless of their location\n"
-#~ "\n"
-#~ "The citizens of a city will tolerate 1 aggressive unit; subsequent units "
-#~ "will generate 1 unhappy citizen each."
-#~ msgstr ""
-#~ "En una República, se celebran elecciones en las que los ciudadanos eligen "
-#~ "a los representantes que los gobernarán; como los dirigentes electos "
-#~ "deben ser populares para no perder el poder, los ciudadanos obtienen un "
-#~ "mayor grado de libertad. El descontento surge fácilmente entre los "
-#~ "ciudadanos de una República, pero la autonomía de tus ciudadanos permite "
-#~ "mayores niveles de comercio.\n"
-#~ "\n"
-#~ "Las ciudades de una República sufren una pequeña cantidad de corrupción y "
-#~ "desidia.\n"
-#~ "\n"
-#~ "Los Colonos consumen 2 unidades de alimento por turno en una República. "
-#~ "Las casillas que ya produjeran al menos 1 unidad de comercio reciben un "
-#~ "bonus de 1 comercio adicional.\n"
-#~ "\n"
-#~ "Las ciudades de una República en las que haya celebraciones crecen a un "
-#~ "ritmo de 1 ciudadano por turno; véase Felicidad para más detalles.\n"
-#~ "\n"
-#~ "La máxima tasa que se puede fijar para ciencia, impuestos o lujo es del "
-#~ "80%.\n"
-#~ "\n"
-#~ "En la República, cada unidad militar necesita un sustento de 1 unidad de "
-#~ "producción por turno. Además, se consideran agresivas las siguientes "
-#~ "unidades:\n"
-#~ "\n"
-#~ "- Las unidades con una fuerza de ataque no nula que no están ni en una "
-#~ "ciudad, ni en una fortaleza a menos de 3 casillas de una ciudad propia.\n"
-#~ "\n"
-#~ "- Las unidades aéreas (incluyendo misiles y helicópteros, pero no cazas) "
-#~ "con una fuerza de ataque no nula, independientemente de su ubicación.\n"
-#~ "\n"
-#~ "Los habitantes de una ciudad tolerarán 1 unidad agresiva; cada unidad "
-#~ "agresiva subsiguiente generará 1 ciudadano descontento."
-
-#~ msgid ""
-#~ "Under Democracy, citizens govern directly by voting on issues. Democracy "
-#~ "offers the highest possible level of trade, but also offers the most "
-#~ "potential for unhappiness. There is no corruption or waste during "
-#~ "Democracy, but citizens become very upset during wars.\n"
-#~ "\n"
-#~ "Settlers consume 2 food per turn under Democracy. Squares with at least "
-#~ "1 trade resource get a trade bonus of 1 under Democracy.\n"
-#~ "\n"
-#~ "Democratic cities which are celebrating grow at a rate of 1 citizen per "
-#~ "turn; see Happiness for details.\n"
-#~ "\n"
-#~ "There are no taxation limits under Democracy; you can set science, tax or "
-#~ "luxuries to 100%.\n"
-#~ "\n"
-#~ "Under Democracy, military units require 1 production shield each for "
-#~ "upkeep. In addition the following units generate unhappiness:\n"
-#~ "\n"
-#~ "- Units with an attack strength greater than 0 which are not inside a "
-#~ "city, or inside a fortress within 3 squares of a friendly city, generate "
-#~ "2 unhappy citizens.\n"
-#~ "\n"
-#~ "- Air units with an attack strength greater than 0 which are inside a "
-#~ "city generate only 1 unhappy citizen. Fighters generate no unhappiness.\n"
-#~ "\n"
-#~ "If a city remains in disorder more than 2 turns under Democratic rule, "
-#~ "the citizens will spontaneously revolt and plunge your civilization into "
-#~ "Anarchy.\n"
-#~ "\n"
-#~ "Because (happy) citizens of Democracy believe strongly in the government, "
-#~ "their loyalty is unswerving. Military units of Democratic civilizations "
-#~ "cannot be bribed, and Democratic cities cannot be incited to revolt by "
-#~ "enemy Diplomats and Spies."
-#~ msgstr ""
-#~ "En una Democracia, los ciudadanos gobiernan directamente votando las "
-#~ "decisiones. Con la Democracia se consigue el mayor nivel posible de "
-#~ "comercio, pero también ofrece las mayores posibilidades para el "
-#~ "descontento. No hay corrupción ni desidia en la Democracia, pero los "
-#~ "ciudadanos están muy descontentos durante las guerras.\n"
-#~ "\n"
-#~ "Los Colonos consumen 2 unidades de alimento por turno en una Democracia. "
-#~ "Las casillas que ya produjeran al menos 1 unidad de comercio reciben un "
-#~ "bonus de 1 comercio adicional.\n"
-#~ "\n"
-#~ "Las ciudades de una Democracia en las que haya celebraciones crecen a un "
-#~ "ritmo de 1 ciudadano por turno; véase Felicidad para más detalles.\n"
-#~ "\n"
-#~ "No hay tasas máximas en Democracia; puedes fijar la ciencia, los "
-#~ "impuestos o el lujo al 100%.\n"
-#~ "\n"
-#~ "En la Democracia, cada unidad militar necesita un sustento de 1 unidad de "
-#~ "producción por turno. Además, las siguientes unidades provocan "
-#~ "descontento:\n"
-#~ "\n"
-#~ "- Las unidades con una fuerza de ataque no nula que no están ni en una "
-#~ "ciudad, ni en una fortaleza a menos de 3 casillas de una ciudad propia, "
-#~ "provocan dos ciudadanos descontentos cada una.\n"
-#~ "\n"
-#~ "- Las unidades aéreas (incluyendo misiles y helicópteros) con una fuerza "
-#~ "de ataque no nula, que están en una ciudad generan sólo 1 ciudadano "
-#~ "descontento cada una, excepto los cazas que no generan descontento.\n"
-#~ "\n"
-#~ "Si en Democracia hay disturbios en una ciudad durante más de dos turnos "
-#~ "consecutivos, los ciudadanos se sublevarán espontáneamente y tu "
-#~ "civilización caerá en la Anarquía.\n"
-#~ "\n"
-#~ "Como los ciudadanos (felices) de una Democracia creen fuertemente en el "
-#~ "gobierno, demuestran una gran lealtad. No se puede sobornar a las "
-#~ "unidades militares de los gobiernos Democráticos, y no se puede provocar "
-#~ "una sublevación en una ciudad Democrática por medio de Diplomáticos o "
-#~ "Espías."
-
-#~ msgid ""
-#~ "Under Despotism, you are the absolute ruler of your people. Your control "
-#~ "over your citizens is maintained largely by martial law.\n"
-#~ "\n"
-#~ "Despotism suffers the highest level of corruption of all forms of "
-#~ "government.\n"
-#~ "\n"
-#~ "Settlers consume 1 food per turn under Despotism. Squares which would "
-#~ "normally yield more than 2 units of food, shields or trade suffer a 1-"
-#~ "unit penalty (e.g., an irrigated grassland square which would normally "
-#~ "yield 3 food only yields 2 food while you are under Despotic rule). "
-#~ "(This penalty is removed if the city is celebrating; see Happiness.)\n"
-#~ "\n"
-#~ "Under Despotism, each of your cities can support a number of military "
-#~ "units equal to its size without paying shields for upkeep. (Additional "
-#~ "units require 1 production shield each.)\n"
-#~ "\n"
-#~ "You may impose martial law under Despotism: each military unit inside a "
-#~ "city will keep one unhappy citizen content. (Or at least, unhappy "
-#~ "citizens will act content, and will not cause disorder.)"
-#~ msgstr ""
-#~ "Con el Despotismo, tu poder sobre el pueblo es absoluto. El control de "
-#~ "los ciudadanos se basa sobre todo en la ley marcial.\n"
-#~ "\n"
-#~ "El Despotismo sufre el mayor nivel de corrupción de todas las formas de "
-#~ "gobierno.\n"
-#~ "\n"
-#~ "Con el Despotismo los Colonos consumen 1 unidad de alimento por turno. "
-#~ "Las casillas que normalmente generarían más de 2 unidades de alimento, "
-#~ "producción o comercio sufren una penalización de 1 unidad (por ejemplo, "
-#~ "las praderas con regadío que normalmente producirían 3 unidades de "
-#~ "alimento sólo producen 2 con un gobierno Despótico). (Esta penalización "
-#~ "desaparece si la ciudad está en Celebraciones, véase Felicidad).\n"
-#~ "\n"
-#~ "Cada una de tus ciudades puede mantener un número de unidades militares "
-#~ "igual a su tamaño sin necesidad de sustento (el sustento de cada unidad "
-#~ "adicional es de 1 unidad de producción).\n"
-#~ "\n"
-#~ "En un Despotismo, puedes imponer la ley marcial: por cada unidad militar "
-#~ "que esté en una ciudad un ciudadano descontento pasará a estar conforme "
-#~ "(o, al menos, fingirá estar conforme y no participará en disturbios)."
-
-#~ msgid ""
-#~ "Under Monarchy, a king or queen serves as a hereditary figurehead for "
-#~ "your government.\n"
-#~ "\n"
-#~ "Monarchy suffers the same small amount of corruption that the Republic "
-#~ "does.\n"
-#~ "\n"
-#~ "Settlers consume 1 food per turn under Monarchy.\n"
-#~ "\n"
-#~ "If a city governed by a Monarchy is celebrating, it will receive a bonus "
-#~ "of 1 trade in each square which already produces at least 1 trade. See "
-#~ "Happiness for details.\n"
-#~ "\n"
-#~ "Under Monarchy, your cities can support up to 3 military units without "
-#~ "paying shields for upkeep. (Additional units require 1 production shield "
-#~ "each.)\n"
-#~ "\n"
-#~ "You may impose martial law under Monarchy: each military unit in a city "
-#~ "will keep one unhappy citizen content."
-#~ msgstr ""
-#~ "En una Monarquía, un rey o una reina son los dirigentes hereditarios del "
-#~ "gobierno.\n"
-#~ "\n"
-#~ "La Monarquía sufre de la misma pequeña cantidad de corrupción que la "
-#~ "República.\n"
-#~ "\n"
-#~ "Los Colonos consumen una unidad de alimento cada turno.\n"
-#~ "\n"
-#~ "Si una ciudad bajo gobierno Monárquico está en celebraciones, recibirá un "
-#~ "bonus de 1 unidad de comercio en cada casilla que ya produjera al menos 1 "
-#~ "comercio. Véase Felicidad para más detalles.\n"
-#~ "\n"
-#~ "En la Monarquía, tus ciudades pueden mantener hasta 3 unidades militares "
-#~ "sin necesidad de sustento (el sustento de cada unidad adicional es de 1 "
-#~ "unidad de producción).\n"
-#~ "\n"
-#~ "Finalmente, en la Monarquía existe la ley marcial: cada unidad militar "
-#~ "que haya en una ciudad hará que un ciudadano descontento pase a estar "
-#~ "conforme."
-
-#~ msgid ""
-#~ "A Communist government is based on the ideal that all people are equal. "
-#~ "All goods are owned by the state, rather than by private citizens. "
-#~ "Communism gives a balance between military and commercial styles of "
-#~ "government.\n"
-#~ "\n"
-#~ "Under Communism, corruption does not vary by distance from the capital; "
-#~ "all cities (including the capital) have a modest amount of corruption. "
-#~ "In addition, Communist cities more than 10 squares away from the capital "
-#~ "are considered to be only 10 squares away when computing the cost of "
-#~ "inciting a revolt (see Units, Diplomat).\n"
-#~ "\n"
-#~ "Settlers consume 1 food per turn under Communism.\n"
-#~ "\n"
-#~ "If a city governed by Communism is celebrating, it will receive a bonus "
-#~ "of 1 trade in each square which already produces at least 1 trade. See "
-#~ "Happiness for details.\n"
-#~ "\n"
-#~ "Diplomats and Spies created under Communism are always veterans.\n"
-#~ "\n"
-#~ "Under Communism, your cities can support up to 3 military units without "
-#~ "paying shields for upkeep. (Additional units require 1 production shield "
-#~ "each.)\n"
-#~ "\n"
-#~ "You may impose martial law under Communism: each military unit inside a "
-#~ "city will keep one unhappy citizen content. (Or at least, unhappy "
-#~ "citizens will act content, and will not cause disorder.)"
-#~ msgstr ""
-#~ "Un gobierno Comunista se basa en el ideal de que todas las personas son "
-#~ "iguales. Todos los bienes son propiedad del estado y no de ciudadanos "
-#~ "privados. El Comunismo proporciona un equilibrio entre un estilo de "
-#~ "gobierno militar y uno comercial.\n"
-#~ "\n"
-#~ "Con el Comunismo, la corrupción no depende de la distancia a la capital; "
-#~ "todas las ciudades (incluyendo la capital) sufren un poco de corrupción. "
-#~ "Además, para las ciudades Comunistas que estén a más de 10 casillas de la "
-#~ "capital la distancia efectiva para calcular el coste de provocar una "
-#~ "sublevación será de sólo 10 casillas (véase Unidades, Diplomático).\n"
-#~ "\n"
-#~ "Los Colonos consumen 1 unidades de alimento por turno con el Comunismo.\n"
-#~ "\n"
-#~ "Si una ciudad Comunista está en celebraciones, recibirá un bonus de 1 "
-#~ "unidad de comercio en cada casilla que ya produjera al menos 1 comercio. "
-#~ "Véase Felicidad para más detalles.\n"
-#~ "\n"
-#~ "Los Diplomáticos y Espías creados bajo el Comunismo son siempre "
-#~ "veteranos.\n"
-#~ "\n"
-#~ "En el Comunismo, tus ciudades pueden mantener hasta 3 unidades militares "
-#~ "sin necesidad de sustento (el sustento de cada unidad adicional es de 1 "
-#~ "unidad de producción).\n"
-#~ "\n"
-#~ "Finalmente, en el Comunismo existe la ley marcial: cada unidad militar "
-#~ "que haya en una ciudad hará que 2 ciudadanos descontentos pasen a estar "
-#~ "conformes."
-
-#~ msgid ""
-#~ "Under a Republican government, citizens hold an election to select a "
-#~ "representative who will govern them; since elected leaders must remain "
-#~ "popular to remain in control, citizens are given a greater degree of "
-#~ "freedom. Citizens under the Republic become unhappy easily, but the self-"
-#~ "sufficiency of your citizens allows high levels of trade.\n"
-#~ "\n"
-#~ "Cities under the Republic suffer a small amount of corruption.\n"
-#~ "\n"
-#~ "Settlers consume 2 food per turn under the Republic. Squares with at "
-#~ "least 1 trade resource get a trade bonus of 1 under the Republic.\n"
-#~ "\n"
-#~ "Republican cities which are celebrating grow at a rate of 1 citizen per "
-#~ "turn; see Happiness for details.\n"
-#~ "\n"
-#~ "Under the Republic, military units require 1 production shield each for "
-#~ "upkeep. In addition the following units are considered aggressive "
-#~ "units:\n"
-#~ "\n"
-#~ "- units with an attack strength greater than 0 which are not inside a "
-#~ "city or inside a fortress within 3 squares of a friendly city\n"
-#~ "\n"
-#~ "- air units (including missiles and helicopters) with an attack strength "
-#~ "greater than 0, regardless of their location\n"
-#~ "\n"
-#~ "The citizens of a city will tolerate 1 aggressive unit; subsequent units "
-#~ "will generate 1 unhappy citizen each."
-#~ msgstr ""
-#~ "En una República, se celebran elecciones en las que los ciudadanos eligen "
-#~ "a los representantes que los gobernarán; como los dirigentes electos "
-#~ "deben ser populares para no perder el poder, los ciudadanos obtienen un "
-#~ "mayor grado de libertad. El descontento surge fácilmente entre los "
-#~ "ciudadanos de una República, pero la autonomía de tus ciudadanos permite "
-#~ "mayores niveles de comercio.\n"
-#~ "\n"
-#~ "Las ciudades de una República sufren una pequeña cantidad de corrupción.\n"
-#~ "\n"
-#~ "Los Colonos consumen 2 unidades de alimento por turno en una República. "
-#~ "Las casillas que ya produjeran al menos 1 unidad de comercio reciben un "
-#~ "bonus de 1 comercio adicional.\n"
-#~ "\n"
-#~ "Las ciudades de una República en las que haya celebraciones crecen a un "
-#~ "ritmo de 1 ciudadano por turno; véase Felicidad para más detalles.\n"
-#~ "\n"
-#~ "En la República, cada unidad militar necesita un sustento de 1 unidad de "
-#~ "producción por turno. Además, se consideran agresivas las siguientes "
-#~ "unidades:\n"
-#~ "\n"
-#~ "- Las unidades con una fuerza de ataque no nula que no están ni en una "
-#~ "ciudad, ni en una fortaleza a menos de 3 casillas de una ciudad propia.\n"
-#~ "\n"
-#~ "- Las unidades aéreas (incluyendo misiles y helicópteros, pero no cazas) "
-#~ "con una fuerza de ataque no nula, independientemente de su ubicación.\n"
-#~ "\n"
-#~ "Los habitantes de una ciudad tolerarán 1 unidad agresiva; cada unidad "
-#~ "agresiva subsiguiente generará 1 ciudadano descontento."
-
-#~ msgid ""
-#~ "Under Democracy, citizens govern directly by voting on issues. Democracy "
-#~ "offers the highest possible level of trade, but also offers the most "
-#~ "potential for unhappiness. There is no corruption during Democracy, but "
-#~ "citizens become very upset during wars.\n"
-#~ "\n"
-#~ "Settlers consume 2 food per turn under Democracy. Squares with at least "
-#~ "1 trade resource get a trade bonus of 1 under Democracy.\n"
-#~ "\n"
-#~ "Democratic cities which are celebrating grow at a rate of 1 citizen per "
-#~ "turn; see Happiness for details.\n"
-#~ "\n"
-#~ "Under Democracy, military units require 1 production shield each for "
-#~ "upkeep. In addition the following units generate unhappiness:\n"
-#~ "\n"
-#~ "- Units with an attack strength greater than 0 which are not inside a "
-#~ "city, or inside a fortress within 3 squares of a friendly city, generate "
-#~ "2 unhappy citizens.\n"
-#~ "\n"
-#~ "- Air units with an attack strength greater than 0 which are inside a "
-#~ "city generate only 1 unhappy citizen.\n"
-#~ "\n"
-#~ "If a city remains in disorder more than 2 turns under Democratic rule, "
-#~ "the citizens will spontaneously revolt and plunge your civilization into "
-#~ "Anarchy.\n"
-#~ "\n"
-#~ "Because (happy) citizens of Democracy believe strongly in the government, "
-#~ "their loyalty is unswerving. Military units of Democratic civilizations "
-#~ "cannot be bribed, and Democratic cities cannot be incited to revolt by "
-#~ "enemy Diplomats and Spies."
-#~ msgstr ""
-#~ "En una Democracia, los ciudadanos gobiernan directamente votando las "
-#~ "decisiones. Con la Democracia se consigue el mayor nivel posible de "
-#~ "comercio, pero también ofrece las mayores posibilidades para el "
-#~ "descontento. No hay corrupción en la Democracia, pero los ciudadanos "
-#~ "están muy descontentos durante las guerras.\n"
-#~ "\n"
-#~ "Los Colonos consumen 2 unidades de alimento por turno en una Democracia. "
-#~ "Las casillas que ya produjeran al menos 1 unidad de comercio reciben un "
-#~ "bonus de 1 comercio adicional.\n"
-#~ "\n"
-#~ "Las ciudades de una Democracia en las que haya celebraciones crecen a un "
-#~ "ritmo de 1 ciudadano por turno; véase Felicidad para más detalles.\n"
-#~ "\n"
-#~ "En la Democracia, cada unidad militar necesita un sustento de 1 unidad de "
-#~ "producción por turno. Además, las siguientes unidades provocan "
-#~ "descontento:\n"
-#~ "\n"
-#~ "- Las unidades con una fuerza de ataque no nula que no están ni en una "
-#~ "ciudad, ni en una fortaleza a menos de 3 casillas de una ciudad propia, "
-#~ "provocan dos ciudadanos descontentos cada una.\n"
-#~ "\n"
-#~ "- Las unidades aéreas (incluyendo misiles y helicópteros) con una fuerza "
-#~ "de ataque no nula, que están en una ciudad generan sólo 1 ciudadano "
-#~ "descontento cada una, excepto los cazas que no generan descontento.\n"
-#~ "\n"
-#~ "Si en Democracia hay disturbios en una ciudad durante más de dos turnos "
-#~ "consecutivos, los ciudadanos se sublevarán espontáneamente y tu "
-#~ "civilización caerá en la Anarquía.\n"
-#~ "\n"
-#~ "Como los ciudadanos (felices) de una Democracia creen fuertemente en el "
-#~ "gobierno, demuestran una gran lealtad. No se puede sobornar a las "
-#~ "unidades militares de los gobiernos Democráticos, y no se puede provocar "
-#~ "una sublevación en una ciudad Democrática por medio de Diplomáticos o "
-#~ "Espías."
-
-#~ msgid ""
-#~ "A Communist government is based on the ideal that all people are equal. "
-#~ "All goods are owned by the state, rather than by private citizens. "
-#~ "Communism gives a balance between military and commercial styles of "
-#~ "government.\n"
-#~ "\n"
-#~ "Under Communism, corruption and waste does not vary by distance from the "
-#~ "capital; all cities (including the capital) have a modest amount of "
-#~ "corruption and waste. In addition, Communist cities more than 10 "
-#~ "squares away from the capital are considered to be only 10 squares away "
-#~ "when computing the cost of inciting a revolt (see Units, Diplomat).\n"
-#~ "\n"
-#~ "Settlers consume 2 food per turn under Communism.\n"
-#~ "\n"
-#~ "If a city governed by Communism is celebrating, it will receive a bonus "
-#~ "of 1 trade in each square which already produces at least 1 trade. See "
-#~ "Happiness for details.\n"
-#~ "\n"
-#~ "The maximum rate you can set for science, tax or luxuries is 80%.\n"
-#~ "\n"
-#~ "Diplomats and Spies created under Communism are always veterans.\n"
-#~ "\n"
-#~ "Under Communism, your cities can support up to 3 military units without "
-#~ "paying shields for upkeep. (Additional units require 1 production shield "
-#~ "each.)\n"
-#~ "\n"
-#~ "You impose limited but efficient martial law under Communism. Each "
-#~ "military unit inside a city, up to a maximum of 3, will keep 2 unhappy "
-#~ "citizens content."
-#~ msgstr ""
-#~ "Un gobierno Comunista se basa en el ideal de que todas las personas son "
-#~ "iguales. Todos los bienes son propiedad del estado, y no de ciudadanos "
-#~ "privados. El Comunismo proporciona un equilibrio entre un estilo de "
-#~ "gobierno militar y uno comercial.\n"
-#~ "\n"
-#~ "Con el Comunismo, la corrupción y la desidia no dependen de la distancia "
-#~ "a la capital; todas las ciudades (incluyendo la capital) sufren un poco "
-#~ "de corrupción y desidia. Además, para las ciudades Comunistas que estén "
-#~ "a más de 10 casillas de la capital la distancia efectiva para calcular el "
-#~ "coste de provocar una sublevación será de sólo 10 casillas (véase "
-#~ "Unidades, Diplomático).\n"
-#~ "\n"
-#~ "Los Colonos consumen 2 unidades de alimento por turno con el Comunismo.\n"
-#~ "\n"
-#~ "Si una ciudad Comunista está en celebraciones, recibirá un bonus de 1 "
-#~ "unidad de comercio en cada casilla que ya produjera al menos 1 comercio. "
-#~ "Véase Felicidad para más detalles.\n"
-#~ "\n"
-#~ "La máxima tasa que puedes fijar para ciencia, impuestos y lujos es del "
-#~ "80%.\n"
-#~ "\n"
-#~ "Los Diplomáticos y Espías creados bajo el Comunismo son siempre "
-#~ "veteranos.\n"
-#~ "\n"
-#~ "En el Comunismo, tus ciudades pueden mantener hasta 3 unidades militares "
-#~ "sin necesidad de sustento (el sustento de cada unidad adicional es de 1 "
-#~ "unidad de producción).\n"
-#~ "\n"
-#~ "Puedes imponer una ley marcial limitada pero eficaz: cada unidad militar "
-#~ "que haya en una ciudad, hasta un máximo de 3, hará que 2 ciudadanos "
-#~ "descontentos pasen a estar conformes."
-
-#~ msgid "Riflery"
-#~ msgstr "Fusileros"
-
-#~ msgid "Argentina is located on the south-eastern coast of South America."
-#~ msgstr "Argentina ocupa la costa sudeste de Sudamérica."
-
-#~ msgid "Dunedain"
-#~ msgstr "Dúnedain"
-
-#~ msgid "?plural:Dunedan"
-#~ msgstr "Dúnedan"
-
-#~ msgid "The Men of the West from J.R.R. Tolkien's Middle Earth fantasies."
-#~ msgstr ""
-#~ "Los Hombres del Oeste en las fábulas de la Tierra Media de J.R.R. Tolkien."
-
-#~ msgid "Elves"
-#~ msgstr "Elves"
-
-#~ msgid "?plural:Elves"
-#~ msgstr "Elves"
-
-#~ msgid "High King of the Noldor"
-#~ msgstr "High King of the Noldor"
-
-#~ msgid "Queen of Doriath"
-#~ msgstr "Queen of Doriath"
-
-#~ msgid "Hobbit"
-#~ msgstr "Hobbit"
-
-#~ msgid "Mayor of the Shire"
-#~ msgstr "Mayor of the Shire"
-
-#~ msgid "Mordor"
-#~ msgstr "Mordorés"
-
-#~ msgid "?plural:Mordors"
-#~ msgstr "Mordoreses"
-
-#~ msgid ""
-#~ "The armies of the Dark Lord Sauron, from J.R.R. Tolkien's Middle Earth "
-#~ "fantasies."
-#~ msgstr ""
-#~ "Los ejércitos del Señor Oscuro, Sauron, en las fábulas de la Tierra Media "
-#~ "de J.R.R. Tolkien."
-
-#~ msgid "Overlord"
-#~ msgstr "Gran Señor"
-
-#~ msgid "Dark Lord"
-#~ msgstr "Señor Oscuro"
-
-#~ msgid "?plural:Observers"
-#~ msgstr "Observadores"
-
-#~ msgid ""
-#~ "Russia originated as the Kievan Rus, territory seized during the early "
-#~ "medieval period by Vikings from what is now Sweden."
-#~ msgstr ""
-#~ "Rusia proviene del estado de los russ de Kiev, fundado durante la Alta "
-#~ "Edad Media por vikingos originarios de la actual Suecia."
-
-#~ msgid ""
-#~ "The server you tried to connect is too old (1.12.0 or earlier). Please "
-#~ "choose another server next time. Good bye."
-#~ msgstr ""
-#~ "El servidor al que has intentado conectarte es demasiado antiguo (versión "
-#~ "1.12.0 o anteriores). Por favor, escoge otro servidor para el siguiente "
-#~ "intento de conexión."
-
-#~ msgid "Game: %s aborted GOTO as there are units in the way."
-#~ msgstr ""
-#~ "Juego: %s ha desistido de un \"IR A\" porque hay unidades en el camino."
-
-#~ msgid " V"
-#~ msgstr " V"
-
-#~ msgid "Game: Your %s has been eliminated defending against a %s in %s."
-#~ msgstr "Juego: Un %2$s ha eliminado a tu %1$s que defendía %3$s."
-
-#~ msgid ""
-#~ "notradesize must be always smaller than fulltradesize; keeping old value."
-#~ msgstr ""
-#~ "notradesize siempre debe ser menor que fulltradesize; cambio descartado."
-
-#~ msgid ""
-#~ "fulltradesize must be always bigger than notradesize; keeping old value."
-#~ msgstr ""
-#~ "fulltradesize siempre debe ser mayor que notradesize; cambio descartado."
-
-#~ msgid " -i, --info INFO\tExtra info for the metaserver\n"
-#~ msgstr " -i, --info INFO\tInformación adicional para el metaservidor\n"
-
-#~ msgid "serverid"
-#~ msgstr "serverid"
-
-#~ msgid "Game: You start a research pool with %s."
-#~ msgstr ""
-#~ "Juego: Has iniciado un pacto de inveestigación compartida con los %s."
-
-#~ msgid "The parties resume the research pool"
-#~ msgstr "Las partes finalizan el pacto de investigación compartida"
-
-#~ msgid "(veteran)"
-#~ msgstr "(veteranos)"
-
-#~ msgid "Style of Civ rules"
-#~ msgstr "Estilo de reglas de Civ"
-
-#~ msgid ""
-#~ "Sets some basic rules; 1 means style of Civ1, 2 means Civ2.\n"
-#~ "Currently this option affects the following rules:\n"
-#~ " - Apollo shows whole map in Civ2, only cities in Civ1.\n"
-#~ "See also README.rulesets."
-#~ msgstr ""
-#~ "Establece algunas reglas básicas; 1 significa al estilo de Civ1, 2 "
-#~ "significa Civ2.\n"
-#~ "Ahora mismo esta opción afecta a las siguientes reglas:\n"
-#~ "- Con Civ1, el Proyecto Apolo muestra sólo las ciudades; con Civ2, todo "
-#~ "el mapa.\n"
-#~ "Más información en README.rulesets."
-
-#~ msgid "Granary: %3d/%-3d"
-#~ msgstr "Granero: %3d/%-3d"
-
-#~ msgid ""
-#~ "Food: %2d (%+2d)\n"
-#~ "Prod: %2d (%+2d)\n"
-#~ "Trade: %2d (%+2d)"
-#~ msgstr ""
-#~ "Alimento: %2d (%+2d)\n"
-#~ "Prod: %2d (%+2d)\n"
-#~ "Comercio: %2d (%+2d)"
-
-#~ msgid ""
-#~ "Gold: %2d (%+2d)\n"
-#~ "Luxury: %2d\n"
-#~ "Science: %2d"
-#~ msgstr ""
-#~ "Oro: %2d (%+2d)\n"
-#~ "Lujo: %2d\n"
-#~ "Ciencia: %2d"
-
-#~ msgid "%s lose %s (%i,%i)"
-#~ msgstr "%s pierde %s (%i, %i)"
-
-#~ msgid "%s (%i, %i) founded by the %s"
-#~ msgstr "Los %4$s han fundado %1$s (%2$i, %3$i)"
-
-#~ msgid "%s (%s) (%i,%i) destroyed by %s"
-#~ msgstr "%5$s ha destruido %1$s %2$s (%3$i, %4$i)"
-
-#~ msgid "%s (%s) (%i,%i) conquered by %s"
-#~ msgstr "%5$s ha conquistado %1$s (%2$s) (%3$i,%4$i)"
-
-#~ msgid "%s lose %s (famine)"
-#~ msgstr "%s pierde %s (hambruna)"
-
-#~ msgid "%s build %s in %s"
-#~ msgstr "%s produce %s en %s"
-
-#~ msgid "%s (%i, %i) disbanded into %s by the %s"
-#~ msgstr ""
-#~ "Los %5$s han abandonado %1$s (%2$i, %3$i) y sus habitantes ahora son %4$s"
-
-#~ msgid "%s and %s agree to a treaty"
-#~ msgstr "%s y %s firman un pacto"
-
-#~ msgid "%s acquire %s (Treaty) from %s"
-#~ msgstr "%s recibe %s (Pacto) de %s"
-
-#~ msgid "%s acquire %d gold from %s"
-#~ msgstr "%s reciben %d monedas de %s"
-
-#~ msgid "%s acquire the city %s from %s"
-#~ msgstr "%s recibe la ciudad de %s de %s"
-
-#~ msgid "%s agree on an alliance with %s"
-#~ msgstr "%s pacta una alianza con %s"
-
-#~ msgid "%s share vision with %s"
-#~ msgstr "%s comparte la visión con %s"
-
-#~ msgid "%s establish an embassy in %s (%s) (%i,%i)"
-#~ msgstr "%s establece una embajada en %s (%s) (%i, %i)"
-
-#~ msgid "%s steals Future Tech. %d from the %s"
-#~ msgstr "%s roba \"Future Tech %d\" a los %s"
-
-#~ msgid "%s steals %s from the %s"
-#~ msgstr "%s roba %s a los %s"
-
-#~ msgid "(%d,%d) land created from ocean"
-#~ msgstr "Se ha transformado el óceano en tierra en (%d,%d)"
-
-#~ msgid "(%d,%d) ocean created from land"
-#~ msgstr "Se ha transformado la tierra en océano en (%d,%d)"
-
-#~ msgid "%s discover %s (building)"
-#~ msgstr "%s descubren %s (instalación urbana)"
-
-#~ msgid "Game: The %s have acquired %s from a building."
-#~ msgstr "Juego: Los %s reciben %s de una instalación urbana."
-
-#~ msgid "The feared barbarian leader %s is no more"
-#~ msgstr "El temido jefe bárbaro %s ya no existe"
-
-#~ msgid "%s civilization destroyed"
-#~ msgstr "Han destruido la civilización %s"
-
-#~ msgid "%s are first to learn %s"
-#~ msgstr "Los %s son los primeros en descubrir %s"
-
-#~ msgid "%s discover Future Tech %d"
-#~ msgstr "Los %s descubren \"Future Tech %d\"."
-
-#~ msgid "%s steal %s from %s"
-#~ msgstr "%s roba %s a los %s"
-
-#~ msgid "RATE CHANGE: %s %i %i %i"
-#~ msgstr "CAMBIO DE TASAS: %s %i %i %i"
-
-#~ msgid "%s form a %s"
-#~ msgstr "%s forma un %s"
-
-#~ msgid "The %s revolt!"
-#~ msgstr "¡Los %s han empezado una revolución!"
-
-#~ msgid "Starting new log"
-#~ msgstr "Empezando un nuevo registro"
-
-#~ msgid "%s lose a %s (out of hp)"
-#~ msgstr "%s pierde un %s (sin puntos de vida)"
-
-#~ msgid "%s's %s lost at sea"
-#~ msgstr "%2$s de %1$s se perdido en el mar"
-
-#~ msgid "%s lose a %s (fuel)"
-#~ msgstr "%s pierde un %s (combustible)"
-
-#~ msgid "Player %s lost a game loss unit and died"
-#~ msgstr "El jugador %s ha perdido una unidad vital y ha muerto"
-
-#~ msgid "%s lose %s when %s lost"
-#~ msgstr "%s ha perdido %s al desaparecer su %s"
-
-#~ msgid "%s lose %s to the %s"
-#~ msgstr "%s ha perdido %s ante los %s"
-
-#~ msgid "%s discover %s (Hut)"
-#~ msgstr "%s descubren %s (Choza)"
-
-#~ msgid "Doubles the effect of Temples, in all your cities."
-#~ msgstr "Duplica el efecto de los Templos, en todas tus ciudades."
-
-#~ msgid "China has the largest population of any nation on earth."
-#~ msgstr "China es la nación más poblada del mundo."
-
-#~ msgid "Game: %s is not a valid name."
-#~ msgstr "Juego: %s no es un nombre válido."
-
-#~ msgid "Game: The %s have acquired %s and %s from %s."
-#~ msgstr "Juego: Los %s reciben %s y %s de los %s."
-
-#~ msgid ""
-#~ "Warning: your non-authenticating client is logging into an authenticating "
-#~ "server, logging in as guest connection '%s'."
-#~ msgstr ""
-#~ "Atención: tu cliente sin autenticación se ha conectado a un servidor con "
-#~ "autenticación. Te has conectado como el invitado '%s'."
-
-#~ msgid ""
-#~ "Your non-authenticating client is logging into an authenticating server. "
-#~ "Guest logins are not allowed. Sorry"
-#~ msgstr ""
-#~ "Tu cliente sin autenticación se ha intentado conectar a un servidor con "
-#~ "autenticación, pero no se permiten las conexiones de invitados. Lo "
-#~ "siento."
-
-#~ msgid "Game: You can't subvert the capital of a nation."
-#~ msgstr "Juego: No se puede sublevar la capital de una nación."
-
-#~ msgid "Running"
-#~ msgstr "En marcha"
-
-#~ msgid "Game over"
-#~ msgstr "Fin de la partida"
-
-#~ msgid "%s discover %s (Library)"
-#~ msgstr "%s descubre %s (Biblioteca)"
-
-#~ msgid "Game: The %s have acquired %s from the Great Library."
-#~ msgstr "Juego: Los %s han obtenido %s de la Gran Biblioteca."
-
-#~ msgid "Map width in squares"
-#~ msgstr "Anchura del mapa en casillas"
-
-#~ msgid "Map height in squares"
-#~ msgstr "Altura del mapa en casillas"
-
-#~ msgid ""
-#~ "1 = standard, with random continents;\n"
-#~ "2 = equally sized large islands with one player each, and twice that "
-#~ "many\n"
-#~ " smaller islands;\n"
-#~ "3 = equally sized large islands with one player each, and a number of "
-#~ "other\n"
-#~ " islands of similar size;\n"
-#~ "4 = equally sized large islands with two players on every island (or one\n"
-#~ " with three players for an odd number of players), and additional\n"
-#~ " smaller islands;\n"
-#~ "5 = one or more large earthlike continents with some scatter.\n"
-#~ "Note: values 2,3 and 4 generate \"fairer\" (but more boring) maps.\n"
-#~ "(Zero indicates a scenario map.)"
-#~ msgstr ""
-#~ "1 = normal, con continentes aleatorios;\n"
-#~ "2 = islas de igual tamaño con un jugador cada una, y el doble de\n"
-#~ " islas más pequeñas;\n"
-#~ "3 = islas de igual tamaño con un jugador cada una, y unas cuantas\n"
-#~ " islas de tamaño similar;\n"
-#~ "4 = islas de igual tamaño con dos jugadores cada una (habrá una\n"
-#~ " con tres jugadores si el número de jugadores es impar), y unas\n"
-#~ " cuantas islas más pequeñas;\n"
-#~ "5 = uno o más continentes grandes como los de la Tierra, y algunas\n"
-#~ " islas.\n"
-#~ "Nota: los valores 2, 3 y 4 generan mapas \"más justos\" (pero más\n"
-#~ "aburridos). (El 0 indica un mapa de escenario)."
-
-#~ msgid "Amount of river squares"
-#~ msgstr "Cantidad de casillas de río"
-
-#~ msgid "Amount of grass squares"
-#~ msgstr "Cantidad de casillas de praderas"
-
-#~ msgid "Amount of forest squares"
-#~ msgstr "Cantidad de casillas de bosque"
-
-#~ msgid "Amount of swamp squares"
-#~ msgstr "Cantidad de casillas de ciénagas"
-
-#~ msgid "Amount of desert squares"
-#~ msgstr "Cantidad de casillas de desierto"
-
-#~ msgid "Number of initial explorers per player"
-#~ msgstr "Exploradores iniciales para cada jugador"
-
-#~ msgid "Number of initial advances per player"
-#~ msgstr "Número inicial de avances para cada jugador"
-
-#~ msgid ""
-#~ "If this is set to greater than 0, nations will have territory delineated "
-#~ "by borders placed on the loci between cities, with the maximum distance "
-#~ "from any city specified."
-#~ msgstr ""
-#~ "Si vale más de 0, las fronteras de las naciones pasarán por los espacios "
-#~ "entre las ciudades, a esa distancia como máximo."
-
-#~ msgid "Number of turns players may meet after contact"
-#~ msgstr "Número de turnos tras un contacto para un encuentro diplomático"
-
-#~ 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. 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 hay duración máxima. Usa esta opción junto con el comando "
-#~ "\"timeoutincrease\" para conseguir una duración de turno dinámica."
-
-#~ msgid "fix <option-name>"
-#~ msgstr "fix <nombre-de-opción>"
-
-#~ msgid "Make server option unchangeable during game."
-#~ msgstr ""
-#~ "Impide que la opción del servidor se pueda cambiar durante la partida."
-
-#~ msgid "unfix <option-name>"
-#~ msgstr "unfix <nombre-de-opción>"
-
-#~ msgid "This command is not currently implemented."
-#~ msgstr "Este comando no está implementado actualmente."
-
-#~ msgid "Not reporting to the metaserver."
-#~ msgstr "No estamos conectados al metaservidor."
-
-#~ msgid "Sorry, the '%s' command is not implemented yet."
-#~ msgstr "Lo sentimos, todavía no hemos implementado el comando '%s'."
-
-#~ msgid "Experimental AI isn't available; using hard instead."
-#~ msgstr ""
-#~ "La dificultad 'experimental' no está disponible; se usará 'difícil' en su "
-#~ "lugar."
-
-#~ msgid "Bad team name."
-#~ msgstr "Nombre de equipo incorrecto."
-
-#~ msgid ""
-#~ "This setting is protected from being modified after the game has started."
-#~ msgstr ""
-#~ "Se han prohibido los cambios a esta opción tras el inicio de la partida."
-
-#~ msgid "This command may only be used before the game has started."
-#~ msgstr "Este comando sólo se puede usar antes de comenzar la partida."
-
-#~ msgid "Need an argument. Usage: %s <option-name>."
-#~ msgstr "Se necesita un argumento. Uso: %s <nombre-de-opción>."
-
-#~ msgid "Unknown option name."
-#~ msgstr "Opción desconocida."
-
-#~ msgid "Option '%s' can never be modified after the game has started."
-#~ msgstr "La opción '%s' nunca se puede cambiar tras el inicio de la partida."
-
-#~ msgid ""
-#~ "You are not allowed to set option '%s', so you may not prevent it from "
-#~ "being set, either."
-#~ msgstr ""
-#~ "No se te permite cambiar el valor de '%s', así que tampoco puedes impedir "
-#~ "que otros la cambien."
-
-#~ msgid ""
-#~ "You are not allowed to set option '%s', so you may not allow it to be "
-#~ "set, either."
-#~ msgstr ""
-#~ "No se te permite cambiar el valor de '%s', así que tampoco puedes "
-#~ "permitir que otros la cambien."
-
-#~ msgid "Option: '%s' now cannot be modified after the game has started."
-#~ msgstr ""
-#~ "Ahora se impide modificar la opción '%s' tras el inicio de la partida."
-
-#~ msgid "Option: '%s' may now be modified after the game has started."
-#~ msgstr ""
-#~ "Ahora se permite modificar la opción '%s' tras el inicio de la partida."
-
-#~ msgid "Loading saved game: %s..."
-#~ msgstr "Cargando la partida salvada: %s..."
-
-#~ msgid "Game: Illegal move, unit not in city!"
-#~ msgstr "Juego: ¡Movimiento ilegal, la unidad no está en una ciudad!"
-
-#~ msgid "Game: Illegal package, can't upgrade %s (yet)."
-#~ msgstr "Juego: Paquete ilegal, no se puede mejorar %s (todavía)."
-
-#~ msgid "Game: Insufficient funds, upgrade costs %d."
-#~ msgstr "Juego: No hay dinero suficiente, esa mejora cuesta %d."
-
-#~ msgid "Game: Let's not build a city with such a stupid name."
-#~ msgstr "Juego: No construyamos una ciudad con un nombre tan estúpido."
-
-#~ msgid ""
-#~ "Population: 1234\n"
-#~ "Support: 100 %\n"
-#~ "Energy: 100 %\n"
-#~ "Mass: 12345 tons\n"
-#~ "Travel time: 1234 years\n"
-#~ "Success prob.: 100 %\n"
-#~ "Year of arrival: 1234 AD"
-#~ msgstr ""
-#~ "Población: 1234\n"
-#~ "Soporte: 100 %\n"
-#~ "Energía: 100 %\n"
-#~ "Masa: 12345 tm\n"
-#~ "Duración: 1234 años\n"
-#~ "Prob. éxito: 100 %\n"
-#~ "Año de llegada: 1234 D.C."
-
-#~ msgid ""
-#~ "Population: %5d\n"
-#~ "Support: %5d %%\n"
-#~ "Energy: %5d %%\n"
-#~ "%s\n"
-#~ "%s\n"
-#~ "Success prob.: %5d %%\n"
-#~ "Year of arrival: %8s"
-#~ msgstr ""
-#~ "Población: %5d\n"
-#~ "Mantenimiento: %5d %%\n"
-#~ "Energía: %5d %%\n"
-#~ "%s\n"
-#~ "%s\n"
-#~ "Prob. éxito: %5d %%\n"
-#~ "Año de llegada: %8s"
-
-#~ msgid "%s (veteran)"
-#~ msgstr "%s (veterana)"
-
-#~ msgid "Invalid metaserver URL, must start with 'http://'"
-#~ msgstr "URL inválida para el metaservidor, debe empezar con 'http://'"
-
-#~ msgid "Invalid $http_proxy value, cannot find separating '/'"
-#~ msgstr "Valor inválido para $http_proxy, falta la '/' de separación"
-
-#~ msgid ""
-#~ "(The %s improvement is also required for a city to grow larger than size %"
-#~ "d.) "
-#~ msgstr ""
-#~ "(También hace falta un %s para que una ciudad crezca a un tamaño mayor "
-#~ "que %d). "
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "Note that discovering %s or %s will obsolete any existing %s. "
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "Observa que el descubrimiento de %s o de %s dejará obsoletos todos los %s "
-#~ "existentes. "
-
-#~ msgid "Smooth unit moves"
-#~ msgstr "Mover unidades suavemente"
-
-#~ msgid "Draw Diagonal Roads/Rails"
-#~ msgstr "Mostrar caminos y vías diagonales"
-
-#~ msgid "Game: Revolution finished"
-#~ msgstr "Juego: Ha terminado la revolución."
-
-#~ msgid "%s file appears incompatible:"
-#~ msgstr "El fichero %s parece incompatible:"
-
-#~ msgid "_Investigate City (free)"
-#~ msgstr "_Investigar la ciudad (gratis)"
-
-#~ msgid "_Connected Users:"
-#~ msgstr "Usuarios _Conectados:"
-
-#~ msgid ""
-#~ "\n"
-#~ " "
-#~ msgstr ""
-#~ "\n"
-#~ " "
-
-#~ msgid "("
-#~ msgstr "("
-
-#~ msgid "_Kingdom"
-#~ msgstr "_Nación"
-
-#~ msgid "Research speed: no research"
-#~ msgstr "Ritmo de investigación: no hay investigación."
-
-#~ msgid "Research speed: %d turn/advance"
-#~ msgid_plural "Research speed: %d turns/advance"
-#~ msgstr[0] "Ritmo de investigación: %d turno/avance"
-#~ msgstr[1] "Ritmo de investigación: %d turnos/avance"
-
-#~ msgid "_Investigate city (free)"
-#~ msgstr "_Investigar la ciudad (gratis)"
-
-#~ msgid "off"
-#~ msgstr "off"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "%s of the %s\n"
-#~ "%s %s: %s"
-#~ msgstr ""
-#~ "%s\n"
-#~ "%s de los %s\n"
-#~ "%s %s: %s"
-
-#~ msgid "Tabs"
-#~ msgstr "Pestañas"
-
-#~ msgid "land units"
-#~ msgstr "unidades terrestres"
-
-#~ msgid "air units"
-#~ msgstr "unidades aéreas"
-
-#~ msgid ""
-#~ "\n"
-#~ "Defense : +"
-#~ msgstr ""
-#~ "\n"
-#~ "Defensa: +"
-
-#~ msgid ""
-#~ "Terrain: %s\n"
-#~ "Food/Prod/Trade: %s"
-#~ msgstr ""
-#~ "Terreno: %s\n"
-#~ "Alimento/Producción/Comercio: %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "Minor Tribe Village"
-#~ msgstr ""
-#~ "\n"
-#~ "Aldea indígena"
-
-#~ msgid ""
-#~ "\n"
-#~ "Infrastructure: "
-#~ msgstr ""
-#~ "\n"
-#~ "Infraestructura: "
-
-#~ msgid ""
-#~ "\n"
-#~ "Claimed by %s"
-#~ msgstr ""
-#~ "\n"
-#~ "Reclamado por %s"
-
-#~ msgid "Terrain : UNKNOWN"
-#~ msgstr "Terreno: DESCONOCIDO"
-
-#~ msgid "sprite is NULL"
-#~ msgstr "El sprite es NULL"
-
-#~ msgid "Infrastructure"
-#~ msgstr "Infraestructuras"
-
-#~ msgid ""
-#~ "%d/%d shields\n"
-#~ "%s"
-#~ msgstr ""
-#~ "%d/%d producción\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "(%s)\n"
-#~ "%d shields"
-#~ msgstr ""
-#~ "(%s)\n"
-#~ "%d producción"
-
-#~ msgid "%d shields"
-#~ msgstr "%d producción"
-
-#~ msgid "End Game"
-#~ msgstr "Acabar partida"
-
-#~ msgid "Get Score"
-#~ msgstr "Obtener puntuación"
-
-#~ msgid "Port: %d"
-#~ msgstr "Puerto: %d"
-
-#~ msgid "Cannot create pipe"
-#~ msgstr "No puedo crear la tubería"
-
-#~ msgid "Game Control"
-#~ msgstr "Controles de la partida"
-
-#~ msgid "Select connection"
-#~ msgstr "Elegir conexión"
-
-#~ msgid "Choose player to be"
-#~ msgstr "Elige tu jugador"
-
-#~ msgid "Start game automatically?"
-#~ msgstr "¿Empezar la partida automáticamente?"
-
-#~ msgid "Your name:"
-#~ msgstr "Tu nombre:"
-
-#~ msgid "Difficulty:"
-#~ msgstr "Dificultad:"
-
-#~ msgid "medium"
-#~ msgstr "media"
-
-#~ msgid "Start a game"
-#~ msgstr "Empezar una partida"
-
-#~ msgid "What do you wish to to?"
-#~ msgstr "¿Qué quieres hacer?"
-
-#~ msgid "New Game"
-#~ msgstr "Nueva partida"
-
-#~ msgid "Quit Game"
-#~ msgstr "Salir de la partida"
-
-#~ msgid ""
-#~ "\n"
-#~ "(%d turn/advance)"
-#~ msgid_plural ""
-#~ "\n"
-#~ "(%d turns/advance)"
-#~ msgstr[0] ""
-#~ "\n"
-#~ "(%d turno/avance)"
-#~ msgstr[1] ""
-#~ "\n"
-#~ "(%d turnos/avance)"
-
-#~ msgid "Granary: %c%3d/%-3d"
-#~ msgstr "Granero: %c%3d/%-3d"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "%s of the %s\n"
-#~ "%s %s: %s%s"
-#~ msgstr ""
-#~ "%s\n"
-#~ "%s de los %s\n"
-#~ "%s %s: %s%s"
-
-#~ msgid "Metaserver List"
-#~ msgstr "Lista del metaservidor"
-
-#~ msgid ""
-#~ "Mouse:\n"
-#~ "======\n"
-#~ " Left-click: (on city): Pop up city window\n"
-#~ " (on unit): Activate unit\n"
-#~ " Center-click or\n"
-#~ " Control-right-click: Show tile info\n"
-#~ " Right-click: Center tile in view\n"
-#~ " Shift-click: Adjust city workers from main map"
-#~ msgstr ""
-#~ "Ratón:\n"
-#~ "======\n"
-#~ "\n"
-#~ " Click-izquierdo:\n"
-#~ " (sobre una ciudad): Mostrar la ventana de la ciudad.\n"
-#~ " (sobre una unidad): Activar la unidad.\n"
-#~ " Click-central\n"
-#~ " o Control-click-derecho: Mostrar información sobre la casilla.\n"
-#~ " Click-derecho: Centrar la vista en la casilla.\n"
-#~ " Mayúsculas-click: Ajustar los obreros desde el mapa."
-
-#~ msgid ""
-#~ "In addition to providing for fishing, Rivers make for excellent lines of "
-#~ "communications and trade.\n"
-#~ "\n"
-#~ "Roads and railroads can only be built on River squares if your "
-#~ "civilization has learned Bridge Building technology."
-#~ msgstr ""
-#~ "Además de proporcionar pesca, los Ríos son excelentes líneas de "
-#~ "comunicaciones y comercio.\n"
-#~ "\n"
-#~ "Sólo puedes construir caminos y vías férreas en las casillas de Río si tu "
-#~ "civilización conoce la Construcción de Puentes."
-
-#~ msgid "Prezydent"
-#~ msgstr "Presidente"
diff --git a/po/et.gmo b/po/et.gmo
index f2b7216..b563434 100644
Binary files a/po/et.gmo and b/po/et.gmo differ
diff --git a/po/et.po b/po/et.po
index 8404344..c69a5e7 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: 2009-03-29 21:13+0900\n"
+"POT-Creation-Date: 2009-11-22 21:37+0100\n"
"PO-Revision-Date: 2009-02-27 00:03+0200\n"
"Last-Translator: Elmo Todurov <todurov at gmail.com>\n"
"Language-Team: eesti\n"
@@ -66,21 +66,21 @@ msgstr "?obsolete:O"
msgid "?redundant:*"
msgstr "?redundant:*"
-#: common/connection.c:515
+#: common/connection.c:518
#, c-format
msgid "%s from %s"
msgstr "%s aadressilt %s"
-#: common/connection.c:521
+#: common/connection.c:524
msgid " (connection incomplete)"
msgstr " (ühendus ebaõnnestus)"
-#: common/connection.c:525
+#: common/connection.c:528
#, c-format
msgid " (player %s)"
msgstr " (mängija %s)"
-#: common/connection.c:529
+#: common/connection.c:532
msgid " (observer)"
msgstr " (pealtvaataja)"
@@ -484,81 +484,81 @@ msgstr "Ühendumise/lahtiühendumise sõnumid"
msgid "AI Debug messages"
msgstr "Tehisintellekti silumissõnumid"
-#: common/player.c:732
+#: common/player.c:746
msgid "?attitude:Genocidal"
msgstr "?attitude:Genotsiidne"
-#: common/player.c:734
+#: common/player.c:748
msgid "?attitude:Belligerent"
msgstr "?attitude:Sõjahimuline"
-#: common/player.c:736
+#: common/player.c:750
msgid "?attitude:Hostile"
msgstr "?attitude:Vaenulik"
-#: common/player.c:738
+#: common/player.c:752
msgid "?attitude:Uncooperative"
msgstr "?attitude:Ebaabivalmis"
-#: common/player.c:740
+#: common/player.c:754
msgid "?attitude:Uneasy"
msgstr "?attitude:Murelik"
-#: common/player.c:742
+#: common/player.c:756
msgid "?attitude:Neutral"
msgstr "?attitude:Neutraalne"
-#: common/player.c:744
+#: common/player.c:758
msgid "?attitude:Respectful"
msgstr "?attitude:Aupaklik"
-#: common/player.c:746
+#: common/player.c:760
msgid "?attitude:Helpful"
msgstr "?attitude:Abivalmis"
-#: common/player.c:748
+#: common/player.c:762
msgid "?attitude:Enthusiastic"
msgstr "?attitude:Entusiastlik"
-#: common/player.c:750
+#: common/player.c:764
msgid "?attitude:Admiring"
msgstr "?attitude:Imetlev"
-#: common/player.c:753
+#: common/player.c:767
msgid "?attitude:Worshipful"
msgstr "?attitude:Jumaldav"
-#: common/player.c:764
+#: common/player.c:778
msgid "?diplomatic_state:Armistice"
msgstr "?diplomatic_state:Vaherahu"
-#: common/player.c:765
+#: common/player.c:779
msgid "?diplomatic_state:War"
msgstr "?diplomatic_state:Sõda"
-#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:780 client/gui-gtk-2.0/diplodlg.c:353
#: 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:767 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:781 client/gui-gtk-2.0/diplodlg.c:358
#: 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:768 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:782 client/gui-gtk-2.0/diplodlg.c:363
#: 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:769
+#: common/player.c:783
msgid "?diplomatic_state:Never met"
msgstr "?diplomatic_state:Pole kohtunud"
-#: common/player.c:770
+#: common/player.c:784
msgid "?diplomatic_state:Team"
msgstr "?diplomatic_state:Tiimikaaslane"
@@ -589,7 +589,7 @@ msgstr "Ellujäämise nõudmisi toetakse ainult maailma lõikes."
#. TRANS: "Resources: (none)".
#: common/requirements.c:1014 common/team.c:132
#: client/gui-gtk-2.0/helpdlg.c:1055 client/gui-gtk-2.0/inteldlg.c:390
-#: client/gui-win32/helpdlg.c:586 client/gui-xaw/helpdlg.c:991
+#: client/gui-win32/helpdlg.c:592 client/gui-xaw/helpdlg.c:991
#, c-format
msgid "(none)"
msgstr "(pole)"
@@ -615,10 +615,11 @@ msgstr "Tuleviku tehnoloogia %d"
#: 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
#: client/gui-sdl/helpdlg.c:817 client/gui-sdl/mapview.c:962
-#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:545
-#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:735
-#: 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
+#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:544
+#: client/gui-win32/helpdlg.c:551 client/gui-win32/helpdlg.c:721
+#: client/gui-win32/helpdlg.c:741 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 "Pole"
@@ -631,29 +632,29 @@ msgstr "Tuleviku tehnoloogia."
msgid "(Unknown)"
msgstr "(Teadmata)"
-#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:553
#: manual/civmanual.c:224
msgid "Road"
msgstr "Tee"
-#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:557
#: client/gui-gtk-2.0/menu.c:829 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:394 common/terrain.c:572 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:567
#: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
#: data/civ1/techs.ruleset:563
msgid "Railroad"
msgstr "Raudtee"
-#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:555
msgid "Mine"
msgstr "Kaevandus"
-#: common/terrain.c:396 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:551 server/report.c:124
#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "Saast"
@@ -662,7 +663,7 @@ msgstr "Saast"
msgid "Hut"
msgstr "Onn"
-#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:563
#: manual/civmanual.c:226
msgid "Fortress"
msgstr "Kindlus"
@@ -675,58 +676,58 @@ msgstr "Jõgi"
msgid "Farmland"
msgstr "Põllumaa"
-#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:577
#: manual/civmanual.c:226
msgid "Airbase"
msgstr "Lennubaas"
-#: common/terrain.c:402 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:579
msgid "Fallout"
msgstr "Tuumajäätmed"
-#: common/unit.c:546 client/gui-win32/plrdlg.c:337
+#: common/unit.c:549 client/gui-win32/plrdlg.c:337
msgid "Idle"
msgstr "Tegevusetu"
-#: common/unit.c:556
+#: common/unit.c:559
msgid "Fortifying"
msgstr "Kindlustab"
-#: common/unit.c:558
+#: common/unit.c:561
msgid "Fortified"
msgstr "Kindlustatud"
-#: common/unit.c:562 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
+#: common/unit.c:565 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
msgid "Sentry"
msgstr "Vahiteenistus"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
+#: common/unit.c:569 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
#: client/gui-win32/menu.c:370 client/gui-xaw/menu.c:185
msgid "Pillage"
msgstr "Rüüsta"
-#: common/unit.c:568 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
+#: common/unit.c:571 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
msgid "Goto"
msgstr "Mine"
-#: common/unit.c:570
+#: common/unit.c:573
msgid "Explore"
msgstr "Avasta"
-#: common/unit.c:572 manual/civmanual.c:224
+#: common/unit.c:575 manual/civmanual.c:224
msgid "Transform"
msgstr "Muuda"
-#: common/unit.c:584 client/text.c:157 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:587 client/text.c:157 client/gui-sdl/citydlg.c:1972
#: client/gui-win32/citydlg.c:1257 client/gui-xaw/citydlg.c:1423
msgid "Unknown"
msgstr "Teadmata"
-#: common/unit.c:1022
+#: common/unit.c:1025
msgid "Moves"
msgstr "Käike"
-#: common/unit.c:1571
+#: common/unit.c:1574
#, c-format
msgid ""
"Upgrade %s to %s for %d gold?\n"
@@ -735,12 +736,12 @@ msgstr ""
"Kas uuendada %s %s-ks %d raha eest?\n"
"Meil on %d raha."
-#: common/unit.c:1579
+#: common/unit.c:1582
#, c-format
msgid "Sorry, cannot upgrade %s (yet)."
msgstr "Vabadust: ei saa (veel) uuendada %s."
-#: common/unit.c:1585
+#: common/unit.c:1588
#, c-format
msgid ""
"Upgrading %s to %s costs %d gold.\n"
@@ -749,11 +750,11 @@ msgstr ""
"%s %s-iks uuendamine maksab %d.\n"
"Meil on %d raha."
-#: common/unit.c:1594
+#: common/unit.c:1597
msgid "You can only upgrade units in your cities."
msgstr "Ãœksuseid saab uuendada ainult oma linnades."
-#: common/unit.c:1598
+#: common/unit.c:1601
#, c-format
msgid "Upgrading this %s would strand units it transports."
msgstr "Selle %s uuendamine jätaks tema transporditud üksused maha."
@@ -786,11 +787,11 @@ msgstr "Tuumapomm"
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1404
+#: common/unittype.c:349 client/helpdata.c:1412
msgid " and "
msgstr " ja "
-#: common/unittype.c:355 client/helpdata.c:1390
+#: common/unittype.c:355 client/helpdata.c:1398
msgid "?and:, "
msgstr "?and:, "
@@ -958,71 +959,71 @@ msgstr "Puudu argument võtmele \"%s\".\n"
msgid "Missing argument for \"%s\".\n"
msgstr "Puudu argument võtmele \"%s\".\n"
-#: utility/shared.c:501
+#: utility/shared.c:514
#, c-format
msgid "%d BC"
msgstr "%d eKr"
-#: utility/shared.c:503
+#: utility/shared.c:516
#, c-format
msgid "%d AD"
msgstr "%d"
-#: utility/shared.c:924
+#: utility/shared.c:937
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:1028
+#: utility/shared.c:1041
#, c-format
msgid "Could not read data directory %s: %s."
msgstr "Ei suuda lugeda andmekataloogi %s: %s."
-#: utility/shared.c:1279
+#: utility/shared.c:1292
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:1281
+#: utility/shared.c:1294
#, c-format
msgid "Current data path is: \"%s\""
msgstr "Praegune andmete asukoht on: \"%s\""
-#: utility/shared.c:1283
+#: utility/shared.c:1296
#, c-format
msgid "The \"%s\" file is required ... aborting!"
msgstr "\"%s\" fail on puudu ... katkestan!"
-#: utility/shared.c:1460
+#: utility/shared.c:1485
#, 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:1462
+#: utility/shared.c:1487
msgid "Use a non-privileged account instead.\n"
msgstr "Kasuta selle asemel mittepriviligeeritud kontot.\n"
-#: utility/shared.c:1478
+#: utility/shared.c:1503
msgid "exact match"
msgstr "täpne vaste"
-#: utility/shared.c:1479
+#: utility/shared.c:1504
msgid "only match"
msgstr "ainus vaste"
-#: utility/shared.c:1480
+#: utility/shared.c:1505
msgid "ambiguous"
msgstr "ebaselge"
-#: utility/shared.c:1481
+#: utility/shared.c:1506
msgid "empty"
msgstr "tühi"
-#: utility/shared.c:1482
+#: utility/shared.c:1507
msgid "too long"
msgstr "liiga pikk"
-#: utility/shared.c:1483
+#: utility/shared.c:1508
msgid "non-match"
msgstr "mittevastav"
@@ -1051,69 +1052,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:280
+#: ai/advdiplomacy.c:300
#, 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:290
+#: ai/advdiplomacy.c:310
#, c-format
msgid "*%s (AI)* First break alliance with %s, %s."
msgstr "*%s (AI)* Esiteks astu %s liidust välja, %s."
-#: ai/advdiplomacy.c:303
+#: ai/advdiplomacy.c:322
#, c-format
msgid "*%s (AI)* Let us first cease hostilies, %s."
msgstr "*%s (AI)* Lõpetame kõigepealt vaenutsemise, %s."
-#: ai/advdiplomacy.c:308
+#: ai/advdiplomacy.c:327
#, 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:331
+#: ai/advdiplomacy.c:350
#, 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:424
+#: ai/advdiplomacy.c:443
#, c-format
msgid "*%s (AI)* I do not know the city you mention."
msgstr "*%s (AI)* Ma ei tunne sellist linna."
-#: ai/advdiplomacy.c:454
+#: ai/advdiplomacy.c:473
#, 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:560
+#: ai/advdiplomacy.c:579
#, 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:582
+#: ai/advdiplomacy.c:601
#, c-format
msgid "*%s (AI)* Welcome into our alliance %s!"
msgstr "*%s (AI)* Tere tulemast meie liitlaseks %s!"
-#: ai/advdiplomacy.c:586
+#: ai/advdiplomacy.c:605
#, 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:593
+#: ai/advdiplomacy.c:612
#, c-format
msgid "*%s (AI)* Yes, peace in our time!"
msgstr "*%s (AI)* Jah, rahu selleks korraks!"
-#: ai/advdiplomacy.c:598
+#: ai/advdiplomacy.c:617
#, c-format
msgid "*%s (AI)* Agreed. No more hostilities, %s."
msgstr "*%s (AI)* Nõus, lõpetame vaenutsemise, %s."
-#: ai/advdiplomacy.c:813
+#: ai/advdiplomacy.c:832
#, c-format
msgid ""
"*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
@@ -1122,22 +1123,22 @@ msgstr ""
"*%s (AI)* Tervitus, %s! Kas me tohime ette panna sõjategevus peatada kuni "
"õpime teineteist paremini tundma?"
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1116
#, c-format
msgid "*%s (AI)* Space will never be yours. "
msgstr "*%s (AI)* Kosmos ei saa iial sinu omaks. "
-#: ai/advdiplomacy.c:1102
+#: ai/advdiplomacy.c:1121
#, 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:1108
+#: ai/advdiplomacy.c:1127
#, c-format
msgid "*%s (AI)* Peace in ... some other time."
msgstr "*%s (AI)* Rahu ... mõni teine kord."
-#: ai/advdiplomacy.c:1113
+#: ai/advdiplomacy.c:1132
#, c-format
msgid ""
"*%s (AI)* Finally I get around to you! Did you really think you could get "
@@ -1146,17 +1147,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:1119
+#: ai/advdiplomacy.c:1138
#, 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:1126
+#: ai/advdiplomacy.c:1145
#, 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:1209
+#: ai/advdiplomacy.c:1229
#, c-format
msgid ""
"*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1171,7 +1172,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:1219
+#: ai/advdiplomacy.c:1239
#, c-format
msgid ""
"*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
@@ -1179,7 +1180,7 @@ msgid ""
msgstr ""
"*%s (AI)* Me ootame su abi selles asjas. Elagu meie kuulsusrikas liiit!"
-#: ai/advdiplomacy.c:1225
+#: ai/advdiplomacy.c:1245
#, c-format
msgid ""
"*%s (AI)* %s has grossly violated his treaties with us for own gain. We "
@@ -1198,7 +1199,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:1238
+#: ai/advdiplomacy.c:1258
#, c-format
msgid ""
"*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1213,13 +1214,13 @@ msgstr[1] ""
"*%s (AI)* Me kavatseme rüüstada %s rikast tsivilisatsioon. Me kuulutame sõja "
"%d käigu pärast."
-#: ai/advdiplomacy.c:1246
+#: ai/advdiplomacy.c:1266
#, 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:1251
+#: ai/advdiplomacy.c:1271
#, c-format
msgid ""
"*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1234,13 +1235,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:1261
+#: ai/advdiplomacy.c:1281
#, 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:1267
+#: ai/advdiplomacy.c:1287
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance and declare war on %s in %d turn. "
@@ -1255,7 +1256,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:1276
+#: ai/advdiplomacy.c:1296
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1270,7 +1271,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:1344
+#: ai/advdiplomacy.c:1364
#, c-format
msgid ""
"*%s (AI)* Your attempt to conquer space for yourself alone betray your true "
@@ -1279,14 +1280,14 @@ msgstr ""
"*%s (AI)* Teie soov vallutada kosmos ainult endale reedab teie tõelisi "
"kavatsusi. Meie liit on läbi!"
-#: ai/advdiplomacy.c:1359
+#: ai/advdiplomacy.c:1379
#, 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:1362
+#: ai/advdiplomacy.c:1382
#, c-format
msgid ""
"*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
@@ -1295,12 +1296,12 @@ msgstr ""
"*%s (AI)* Kui Sa ei lõpeta kosmoselaeva ehitamist, olen ma sunnitud midagi "
"ette võtma!"
-#: ai/advdiplomacy.c:1474
+#: ai/advdiplomacy.c:1494
#, 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:1549
+#: ai/advdiplomacy.c:1569
#, c-format
msgid ""
"*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
@@ -1309,7 +1310,7 @@ msgstr ""
"*%s (AI)* Tervitus, me ustavaim liitlane. Me kutsume teid üles hävitama meie "
"vaenlast %s."
-#: ai/advdiplomacy.c:1555
+#: ai/advdiplomacy.c:1575
#, c-format
msgid ""
"*%s (AI)* Greetings ally, I see you have not yet made war with our enemy, %"
@@ -1318,7 +1319,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:1562
+#: ai/advdiplomacy.c:1582
#, c-format
msgid ""
"*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1328,7 +1329,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:1592
+#: ai/advdiplomacy.c:1612
#, c-format
msgid ""
"*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
@@ -1336,13 +1337,13 @@ msgid ""
msgstr ""
"*%s (AI)* Tervist, sõber. Kas me tohiks soovitada ühiseid eesmärke ja liitu?"
-#: ai/advdiplomacy.c:1607
+#: ai/advdiplomacy.c:1627
#, 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:1622
+#: ai/advdiplomacy.c:1642
#, c-format
msgid ""
"*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
@@ -1351,7 +1352,7 @@ msgstr ""
"*%s (AI)* Me oleme väsinud pidevast verevalamisest. Kas me tohiks soovitada "
"sõjategevuse peatamist?"
-#: ai/advdiplomacy.c:1742
+#: ai/advdiplomacy.c:1762
#, c-format
msgid ""
"*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1498,17 +1499,17 @@ msgstr ""
"Paroolis peab olema vähemalt %d suurtähte, %d numbrit ja kokku vähemalt %d "
"[nähtavat] tähte pikk. Proovi uuesti."
-#: server/barbarian.c:183
+#: server/barbarian.c:184
#, c-format
msgid "%s gain a leader by the name %s. Dangerous times may lie ahead."
msgstr "%s saavad juhi nimega %s. Asi võib ohtlikuks minna."
-#: server/barbarian.c:479
+#: server/barbarian.c:480
#, c-format
msgid "Native unrest near %s led by %s."
msgstr "Pärismaalaste rahutused %s lähedal juhituna %s poolt."
-#: server/barbarian.c:484
+#: server/barbarian.c:485
#, c-format
msgid "Sea raiders seen near %s!"
msgstr "Merel seilajaid märgatud %s lähistel!"
@@ -1899,7 +1900,7 @@ msgid_plural "%s boosts research; you gain %d immediate advances."
msgstr[0] "%s annab uuringutele tõuke, saad kohe %d avastuse."
msgstr[1] "%s annab uuringutele tõuke, saad kohe %d avastuse."
-#: server/cityturn.c:1158 server/techtools.c:176
+#: server/cityturn.c:1158 server/techtools.c:172
#, c-format
msgid "The %s have acquired %s from %s."
msgstr "%s õppisid %s-lt %s."
@@ -1983,22 +1984,22 @@ msgstr ""
msgid "Warning: the %s option is obsolete. Use -m to enable the metaserver.\n"
msgstr "Hoiatus: võti %s on iganenud. Metaserveri jaoks kasuta -m lippu.\n"
-#: server/civserver.c:189
+#: server/civserver.c:193
#, c-format
msgid "Error: unknown option '%s'\n"
msgstr "Viga: teadmata võti '%s'\n"
-#: server/civserver.c:200
+#: server/civserver.c:204
#, c-format
msgid "This is the server for %s"
msgstr "See on %s server"
-#: server/civserver.c:201
+#: server/civserver.c:205
#, c-format
msgid "You can learn a lot about Freeciv at %s"
msgstr "Sa võid Freecivi kohta juurde õppida siin: %s"
-#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
+#: server/civserver.c:210 client/civclient.c:239 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -2007,7 +2008,7 @@ msgstr ""
"Kasutamine: %s [võti ...]\n"
"Võimalikud võtmed on:\n"
-#: server/civserver.c:208
+#: server/civserver.c:212
msgid ""
" -a --auth FILE\tEnable server authentication with configuration from "
"FILE.\n"
@@ -2015,101 +2016,106 @@ msgstr ""
" -a --auth FAIL\tLülita sisse serveri autentimine konfiga mis tuleb "
"FAIList.\n"
-#: server/civserver.c:210
+#: server/civserver.c:214
msgid " -G --Guests\t\tAllow guests to login if auth is enabled.\n"
msgstr ""
" -G --Guests\t\tLuba külalistel sisse logistada, kui autentimine on sisse "
"lülitatud.\n"
-#: server/civserver.c:212
+#: server/civserver.c:216
msgid " -N --Newusers\tAllow new users to login if auth is enabled.\n"
msgstr ""
" -N --Newusers\tLuba uutel kasutajatel sisse logistada, kui autentimine on "
"sisse lülitatud.\n"
-#: server/civserver.c:215
+#: server/civserver.c:219
msgid " -b --bind ADDR\tListen for clients on ADDR\n"
msgstr " -b --bind ADDR\tootab kliente aadressil ADDR\n"
-#: server/civserver.c:217 client/civclient.c:242
+#: server/civserver.c:221 client/civclient.c:243
msgid ""
" -d, --debug NUM\tSet debug log level (0 to 4, or 4:file1,min,max:...)\n"
msgstr ""
" -d, --debug NUM\tMäära silumise logimistase (0 - 4 või 4:file1,min, "
"max:...)\n"
-#: server/civserver.c:221 client/civclient.c:246
+#: server/civserver.c:225 client/civclient.c:247
msgid " -d, --debug NUM\tSet debug log level (0 to 3)\n"
msgstr " -d, --debug NUM\tMäära logimistase (0 - 3)\n"
-#: server/civserver.c:223
+#: server/civserver.c:227
msgid " -f, --file FILE\tLoad saved game FILE\n"
msgstr " -f, --file FAIL\tLae salvestatud mäng FAIL\n"
-#: server/civserver.c:225 client/civclient.c:249 manual/civmanual.c:382
+#: server/civserver.c:229 client/civclient.c:250 manual/civmanual.c:382
msgid " -h, --help\t\tPrint a summary of the options\n"
msgstr " -h, --help\t\tVõtmete ülevaade\n"
-#: server/civserver.c:226
+#: server/civserver.c:230
+#, fuzzy
+msgid " -i, --identity ADDR\tBe known as ADDR at metaserver\n"
+msgstr " -M, --Metaserver ADDR\tMäära metaserveri aadressiks ADDR\n"
+
+#: server/civserver.c:231
msgid " -l, --log FILE\tUse FILE as logfile\n"
msgstr " -l, --log FILE\tLogi faili FILE\n"
-#: server/civserver.c:227
+#: server/civserver.c:232
msgid " -m, --meta\t\tNotify metaserver and send server's info\n"
msgstr " -m, --meta\t\tSaada teave metaserverile\n"
-#: server/civserver.c:229
+#: server/civserver.c:234
msgid " -M, --Metaserver ADDR\tSet ADDR as metaserver address\n"
msgstr " -M, --Metaserver ADDR\tMäära metaserveri aadressiks ADDR\n"
-#: server/civserver.c:232
+#: server/civserver.c:237
msgid " -p, --port PORT\tListen for clients on port PORT\n"
msgstr " -p, --port PORT\tKuula pordil PORT\n"
-#: server/civserver.c:234
+#: server/civserver.c:239
msgid " -q, --quitidle TIME\tQuit if no players for TIME seconds\n"
msgstr " -q, --quitidle AEG\tVälju, kui AEG sekundit ei ole ühtegi mängijat\n"
-#: server/civserver.c:236
+#: server/civserver.c:241
msgid " -e, --exit-on-end\tWhen a game ends, exit instead of restarting\n"
msgstr " -e, --exit-on-end\tMängu lõppedes välju taaskäivituse asemel\n"
-#: server/civserver.c:239
+#: server/civserver.c:244
msgid " -s, --saves DIR\tSave games to directory DIR\n"
msgstr " -s, --saves DIR\tSalvesta mängud kataloogi DIR\n"
-#: server/civserver.c:241
+#: server/civserver.c:246
msgid " -S, --Serverid ID\tSets the server id to ID\n"
msgstr " -S, --Serverid ID\tSäti serveri identifikatsioon ID-ks\n"
-#: server/civserver.c:243
+#: server/civserver.c:248
msgid " -P, --Ppm\t\tSave ppms of the map when saving the game.\n"
msgstr " -P, --Ppm\t\tSalvesta kaardi ppm-id mängu salvestamisel.\n"
-#: server/civserver.c:244
+#: server/civserver.c:249
msgid " -r, --read FILE\tRead startup script FILE\n"
msgstr " -r, --read FAIL\tLoe käivitusskript FAIL\n"
-#: server/civserver.c:246
+#: server/civserver.c:251
msgid " -R, --Ranklog FILE\tUse FILE as ranking logfile\n"
msgstr " -R, --Ranklog FILE\tKasuta FILEi kui edetabeli logifaili\n"
-#: server/civserver.c:247 client/civclient.c:268 manual/civmanual.c:383
+#: server/civserver.c:252 client/civclient.c:269 manual/civmanual.c:383
msgid " -v, --version\t\tPrint the version number\n"
msgstr " -v, --version\t\tNäita versiooninumbrit\n"
-#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
+#: server/civserver.c:253 client/gui-gtk-2.0/gui_main.c:354
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, c-format
msgid "Report bugs at %s.\n"
msgstr "Teata vigadest aadressile %s.\n"
-#: server/commands.c:28
+#: server/commands.c:29
msgid "Start the game, or restart after loading a savegame."
msgstr "Alusta mänguga või jätka salvestatud mängu."
-#: server/commands.c:29
+#: server/commands.c:30
msgid ""
"This command starts the game. When starting a new game, it should be used "
"after all human players have connected, and AI players have been created (if "
@@ -2128,7 +2134,7 @@ msgstr ""
"toimet."
#. TRANS: translate text between <> only
-#: server/commands.c:42
+#: server/commands.c:44
msgid ""
"help\n"
"help commands\n"
@@ -2142,11 +2148,11 @@ msgstr ""
"help <käsu nimi>\n"
"help <lipu nimi>"
-#: server/commands.c:47
+#: server/commands.c:49
msgid "Show help about server commands and server options."
msgstr "Näita abi serveri käskude ja lippude (seadete) kohta."
-#: server/commands.c:48
+#: server/commands.c:50
msgid ""
"With no arguments gives some introductory help. With argument \"commands\" "
"or \"options\" gives respectively a list of all commands or all options. "
@@ -2161,11 +2167,11 @@ msgstr ""
"kohtakäivat abi. Lippude puhul näidab abi ka praegust ja vaikeväärtust. "
"Argumenti võib lühendada kuni ei kattu mõne teisega."
-#: server/commands.c:63
+#: server/commands.c:66
msgid "Show a list of players, teams, connections, or scenarios."
msgstr "Näita mängijate, meeskondade, ühenduste või stsenaariumite nimekirja."
-#: server/commands.c:64
+#: server/commands.c:67
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 "
@@ -2175,20 +2181,20 @@ msgstr ""
"stsenaariume. Argumenti võib lühendada ja kui seda mitte määrata, on see "
"vaikimisi \"players\"."
-#: server/commands.c:70
+#: server/commands.c:74
msgid "Quit the game and shutdown the server."
msgstr "Lõpeta mäng ja pane server kinni."
#. TRANS: translate text between <> only
-#: server/commands.c:74
+#: server/commands.c:79
msgid "cut <connection-name>"
msgstr "cut <ühenduse nimi>"
-#: server/commands.c:75
+#: server/commands.c:80
msgid "Cut a client's connection to server."
msgstr "Katkestab kliendi ühenduse."
-#: server/commands.c:76
+#: server/commands.c:81
msgid ""
"Cut specified client's connection to the server, removing that client from "
"the game. If the game has not yet started that client's player is removed "
@@ -2201,7 +2207,7 @@ msgstr ""
"argumendiks nüüd ühenduste, mitte mängijate nimed."
#. TRANS: translate text between <> only
-#: server/commands.c:83
+#: server/commands.c:89
msgid ""
"explain\n"
"explain <option-name>"
@@ -2209,11 +2215,11 @@ msgstr ""
"explain\n"
"explain <seade nimi>"
-#: server/commands.c:85
+#: server/commands.c:91
msgid "Explain server options."
msgstr "Seletab serveri seadeid."
-#: server/commands.c:86
+#: server/commands.c:92
msgid ""
"The 'explain' command gives a subset of the functionality of 'help', and is "
"included for backward compatibility. With no arguments it gives a list of "
@@ -2225,7 +2231,7 @@ msgstr ""
"options'), argumendiga toimib nagu 'help <seade nimi>'."
#. TRANS: translate text between <> only
-#: server/commands.c:93
+#: server/commands.c:100
msgid ""
"show\n"
"show <option-name>\n"
@@ -2235,11 +2241,11 @@ msgstr ""
"show <seade nimi>\n"
"show <seade prefiks>"
-#: server/commands.c:96
+#: server/commands.c:103
msgid "Show server options."
msgstr "Näita serveri seadeid."
-#: server/commands.c:97
+#: server/commands.c:104
msgid ""
"With no arguments, shows all server options (or available options, when used "
"by clients). With an argument, show only the named option, or options with "
@@ -2248,37 +2254,38 @@ msgstr ""
"Ilma argumentiteta näitab kõiki võimalikke serveri seadeid. Argumendiga "
"näitab ainult nimetet seadet või nõnda algavaid seadeid."
-#: server/commands.c:102
+#: server/commands.c:110
msgid "wall <message>"
msgstr "wall <teade>"
-#: server/commands.c:103
+#: server/commands.c:111
msgid "Send message to all connections."
msgstr "Saada sõnum kõigile ühendustele."
-#: server/commands.c:104
+#: server/commands.c:112
msgid ""
"For each connected client, pops up a window showing the message entered."
msgstr ""
"Iga ühendunud kliendi kohta hüppab välja kast, kus kirjas sisestatud sõnum."
-#: server/commands.c:108
+#: server/commands.c:117
msgid "vote yes|no [vote number]"
msgstr "hääleta yes|no [hääletuse number]"
-#: server/commands.c:109
+#: server/commands.c:118
msgid "Cast a vote."
msgstr "Hääleta."
-#: server/commands.c:111
-#, no-c-format
+#: server/commands.c:120
+#, 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."
+"A player with basic 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."
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"
@@ -2288,7 +2295,7 @@ msgstr ""
"kui rohkem kui pooled mängijad hääletavad poolt või automaatselt kaotatud, "
"kui üle poole mängijatest hääletab vastu."
-#: server/commands.c:121
+#: server/commands.c:131
msgid ""
"debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
"<player> | timing | info]"
@@ -2296,11 +2303,11 @@ msgstr ""
"debug [ player <mängija> | city <x> <y> | units <x> <y> | unit <id> | tech "
"<mängija> | timing | info]"
-#: server/commands.c:123
+#: server/commands.c:133
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:124
+#: server/commands.c:134
msgid ""
"Print AI debug information about given entity and turn continous debugging "
"output for this entity on or off."
@@ -2308,23 +2315,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:128
+#: server/commands.c:139
msgid "set <option-name> <value>"
msgstr "set <seade nimi> <väärtus>"
-#: server/commands.c:129
+#: server/commands.c:140
msgid "Set server option."
msgstr "Määra serveri seaded."
-#: server/commands.c:132
+#: server/commands.c:144
msgid "team <player> [team]"
msgstr "team <mängija> [meeskond]"
-#: server/commands.c:133
+#: server/commands.c:145
msgid "Change, add or remove a player's team affiliation."
msgstr "Muuda, lisa või eemalda mängija meeskonda kuuluvust."
-#: server/commands.c:134
+#: server/commands.c:146
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 "
@@ -2336,15 +2343,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:141
+#: server/commands.c:154
msgid "rulesetdir <directory>"
msgstr "rulesetdir <kataloog>"
-#: server/commands.c:142
+#: server/commands.c:155
msgid "Choose new ruleset directory or modpack."
msgstr "Vali uus reeglistik või modifikatsioon."
-#: server/commands.c:143
+#: server/commands.c:156
msgid ""
"Choose new ruleset directory or modpack. Calling this\n"
" without any arguments will show you the currently selected ruleset."
@@ -2353,15 +2360,15 @@ msgstr ""
" ilma argumentideta näitab praegust reeglistikku."
#. TRANS: translate text between <> only
-#: server/commands.c:149
+#: server/commands.c:163
msgid "metainfo <meta-line>"
msgstr "metainfo <meta-rida>"
-#: server/commands.c:150
+#: server/commands.c:164
msgid "Set metaserver info line."
msgstr "Määra metaserveri info-rida."
-#: server/commands.c:151
+#: server/commands.c:165
msgid ""
"Set user defined metaserver info line. If parameter is omitted,\n"
"previously set metamessage will be removed. For most of the time\n"
@@ -2373,19 +2380,19 @@ msgstr ""
"metasõnumit automaatselt genereeritu asemel, kui see on olemas."
#. TRANS: translate text between <> only
-#: server/commands.c:158
+#: server/commands.c:173
msgid "metapatch <meta-line>"
msgstr "metapatch <meta-rida>"
-#: server/commands.c:159
+#: server/commands.c:174
msgid "Set metaserver patches line."
msgstr "Määra metaserveri lapirida."
-#: server/commands.c:165
+#: server/commands.c:181
msgid "Control metaserver connection."
msgstr "Kontrolli ühendust metaserveriga."
-#: server/commands.c:166
+#: server/commands.c:182
msgid ""
"'metaconnection ?' reports on the status of the connection to metaserver.\n"
"'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2396,33 +2403,33 @@ msgstr ""
"'metaconnection up' ehk 'metac up' ühendub metaserverisse."
#. TRANS: translate text between <> only
-#: server/commands.c:172
+#: server/commands.c:189
msgid "metaserver <address>"
msgstr "metaserver <aadress>"
-#: server/commands.c:173
+#: server/commands.c:190
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:177
+#: server/commands.c:195
msgid "aitoggle <player-name>"
msgstr "aitoggle <mängija nimi>"
-#: server/commands.c:178
+#: server/commands.c:196
msgid "Toggle AI status of player."
msgstr "Lülitab mängija AI-oleku."
#. TRANS: translate text between [] and <> only
-#: server/commands.c:182
+#: server/commands.c:201
msgid "take [connection-name] <player-name>"
msgstr "take [ühenduse-nimi] <mängija-nimi>"
-#: server/commands.c:183
+#: server/commands.c:202
msgid "Take over a player's place in the game."
msgstr "Võta mängija positsioon mängus endale."
-#: server/commands.c:184
+#: server/commands.c:203
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 "
@@ -2436,15 +2443,15 @@ msgstr ""
"juba mängijat, luuakse uus mängija ja antakse tollele ühendusele."
#. TRANS: translate text between [] only
-#: server/commands.c:192
+#: server/commands.c:212
msgid "observe [connection-name] [player-name]"
msgstr "observe [ühenduse-nimi] [mängija-nimi]"
-#: server/commands.c:193
+#: server/commands.c:213
msgid "Observe a player or the whole game."
msgstr "Piilu mängijat või tervet mängu."
-#: server/commands.c:194
+#: server/commands.c:214
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 +2465,15 @@ msgstr ""
"argumente, siis ühendus pannakse globaalse vaatleja külge."
#. TRANS: translate text between <> only
-#: server/commands.c:202
+#: server/commands.c:223
msgid "detach <connection-name>"
msgstr "detach <ühenduse-nimi>"
-#: server/commands.c:203
+#: server/commands.c:224
msgid "detach from a player."
msgstr "ühendub mängijast lahti."
-#: server/commands.c:204
+#: server/commands.c:225
msgid ""
"Only the console and connections with cmdlevel 'hack' can force other "
"connections to detach from a player."
@@ -2475,20 +2482,20 @@ msgstr ""
"ühendusi ühenduma lahti mängijast."
#. TRANS: translate text between <> only
-#: server/commands.c:209
+#: server/commands.c:231
msgid "create <player-name>"
msgstr "create <mängija nimi>"
-#: server/commands.c:210
+#: server/commands.c:232
msgid "Create an AI player with a given name."
msgstr "Loob selle nimega AI-mängija."
-#: server/commands.c:211
+#: server/commands.c:233
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:215
+#: server/commands.c:238
msgid ""
"away\n"
"away"
@@ -2496,16 +2503,16 @@ msgstr ""
"eemal\n"
"eemal"
-#: server/commands.c:217
+#: server/commands.c:240
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:218
+#: server/commands.c:241
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:222
+#: server/commands.c:246
msgid ""
"novice\n"
"novice <player-name>"
@@ -2513,11 +2520,11 @@ msgstr ""
"novice\n"
"novice <mängija-nimi>"
-#: server/commands.c:224
+#: server/commands.c:248
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:225
+#: server/commands.c:249
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 "
@@ -2528,7 +2535,7 @@ msgstr ""
"selle mängija taseme."
#. TRANS: translate text between <> only
-#: server/commands.c:231
+#: server/commands.c:256
msgid ""
"easy\n"
"easy <player-name>"
@@ -2536,11 +2543,11 @@ msgstr ""
"easy\n"
"easy <mängija nimi>"
-#: server/commands.c:233
+#: server/commands.c:258
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:234
+#: server/commands.c:259
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 "
@@ -2551,7 +2558,7 @@ msgstr ""
"selle mängija taseme."
#. TRANS: translate text between <> only
-#: server/commands.c:240
+#: server/commands.c:266
msgid ""
"normal\n"
"normal <player-name>"
@@ -2559,11 +2566,11 @@ msgstr ""
"normal\n"
"normal <mängija-nimi>"
-#: server/commands.c:242
+#: server/commands.c:268
msgid "Set one or all AI players to 'normal'."
msgstr "Märgib ühe või kõik AI mängijatest normaalseteks."
-#: server/commands.c:243
+#: server/commands.c:269
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 "
@@ -2574,7 +2581,7 @@ msgstr ""
"selle mängija taseme."
#. TRANS: translate text between <> only
-#: server/commands.c:249
+#: server/commands.c:276
msgid ""
"hard\n"
"hard <player-name>"
@@ -2582,11 +2589,11 @@ msgstr ""
"hard\n"
"hard <mängija-nimi>"
-#: server/commands.c:251
+#: server/commands.c:278
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:252
+#: server/commands.c:279
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 "
@@ -2597,7 +2604,7 @@ msgstr ""
"selle mängija taseme."
#. TRANS: translate text between <> only
-#: server/commands.c:258
+#: server/commands.c:286
msgid ""
"experimental\n"
"experimental <player-name>"
@@ -2605,11 +2612,11 @@ msgstr ""
"experimental\n"
"experimental <mängija-nimi>"
-#: server/commands.c:260
+#: server/commands.c:288
msgid "Set one or all AI players to 'experimental'."
msgstr "Märgib ühe või kõik AI mängijatest eksperimentaalseks."
-#: server/commands.c:261
+#: server/commands.c:289
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 "
@@ -2622,7 +2629,7 @@ msgstr ""
"TESTIMISEKS! Tavalistel serveritel ei tähenda see seade midagi."
#. TRANS: translate text between <> only
-#: server/commands.c:269
+#: server/commands.c:298
msgid ""
"cmdlevel\n"
"cmdlevel <level>\n"
@@ -2636,17 +2643,20 @@ msgstr ""
"cmdlevel <tase> first\n"
"cmdlevel <tase> <ühenduse-nimi>"
-#: server/commands.c:274
+#: server/commands.c:303
msgid "Query or set command access level access."
msgstr "Päri või määra käsutaseme ligipääsu."
-#: server/commands.c:275
+#: server/commands.c:304
+#, fuzzy
msgid ""
"The command access level controls which server commands are available\n"
"to users via the client chatline. The available levels are:\n"
" none - no commands\n"
-" info - informational commands only\n"
+" info - informational or observer commands only\n"
+" basic - commands available to players in the game\n"
" ctrl - commands that affect the game and users\n"
+" admin - commands that affect server operation\n"
" hack - *all* commands - dangerous!\n"
"With no arguments, the current command access levels are reported.\n"
"With a single argument, the level is set for all existing connections,\n"
@@ -2679,20 +2689,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:296
+#: server/commands.c:328
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:301
+#: server/commands.c:334
msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
msgstr "timeoutincrease <käik> <käiguinkrement> <väärtus> <kordaja>"
-#: server/commands.c:302
+#: server/commands.c:335
msgid "See \"help timeoutincrease\"."
msgstr "Vaata \"help timeoutincrease\"."
-#: server/commands.c:303
+#: server/commands.c:336
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 +2713,43 @@ msgstr ""
"käsku koos \"timeout\" seadega. Vaikimisi väärtused on 0 0 0 1"
#. TRANS: translate text between <> only
-#: server/commands.c:309
+#: server/commands.c:343
+msgid ""
+"cancelvote\n"
+"cancelvote <vote number>\n"
+"cancelvote all\n"
+msgstr ""
+
+#: server/commands.c:346
+msgid "Cancel a running vote.\n"
+msgstr ""
+
+#: server/commands.c:347
+msgid ""
+"With no arguments this command removes your own vote. If you have an admin "
+"access level, you can cancel any vote by vote number, or all votes with the "
+"'all' argument."
+msgstr ""
+
+#. TRANS: translate text between <> only
+#: server/commands.c:354
msgid "endgame"
msgstr "mängu lõpuosa"
-#: server/commands.c:310
+#: server/commands.c:355
msgid "End the game immediately in a draw."
msgstr "Lõpeta mäng kohe viigiga."
#. TRANS: translate text between <> only
-#: server/commands.c:314
+#: server/commands.c:360
msgid "surrender"
msgstr "alistu"
-#: server/commands.c:315
+#: server/commands.c:361
msgid "Concede the game."
msgstr "Anna alla."
-#: server/commands.c:316
+#: server/commands.c:362
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 +2758,15 @@ msgstr ""
"andnud, mäng lõpeb."
#. TRANS: translate text between <> only
-#: server/commands.c:322
+#: server/commands.c:369
msgid "remove <player-name>"
msgstr "remove <mängija nimi>"
-#: server/commands.c:323
+#: server/commands.c:370
msgid "Fully remove player from game."
msgstr "Korista mängija täielikult mängust ära."
-#: server/commands.c:324
+#: server/commands.c:371
msgid ""
"This *completely* removes a player from the game, including all cities and "
"units etc. Use with care!"
@@ -2746,7 +2775,7 @@ msgstr ""
"Kasuta ettevaatlikult!"
#. TRANS: translate text between <> only
-#: server/commands.c:329
+#: server/commands.c:377
msgid ""
"save\n"
"save <file-name>"
@@ -2754,11 +2783,11 @@ msgstr ""
"save\n"
"save <failinimi>"
-#: server/commands.c:331
+#: server/commands.c:379
msgid "Save game to file."
msgstr "Salvesta mäng faili."
-#: server/commands.c:332
+#: server/commands.c:380
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"
@@ -2774,17 +2803,17 @@ msgstr ""
"ja lase käima käsk 'start', kui mängijad on ühendunud."
#. TRANS: translate text between <> only
-#: server/commands.c:341
+#: server/commands.c:390
msgid ""
"load\n"
"load <file-name>"
msgstr "load <failinimi>"
-#: server/commands.c:343
+#: server/commands.c:392
msgid "Load game from file."
msgstr "Lae mäng failist."
-#: server/commands.c:344
+#: server/commands.c:393
msgid ""
"Load a game from <file-name>. Any current data including players, rulesets "
"and server options are lost.\n"
@@ -2793,116 +2822,116 @@ msgstr ""
"reeglistikud ja serveri seaded on kaovad.\n"
#. TRANS: translate text between <> only
-#: server/commands.c:349
+#: server/commands.c:399
msgid "read <file-name>"
msgstr "read <failinimi>"
-#: server/commands.c:350
+#: server/commands.c:400
msgid "Process server commands from file."
msgstr "Loe serveri käsud failist."
#. TRANS: translate text between <> only
-#: server/commands.c:354
+#: server/commands.c:405
msgid "write <file-name>"
msgstr "write <failinimi>"
-#: server/commands.c:355
+#: server/commands.c:406
msgid "Write current settings as server commands to file."
msgstr "Salvesta praegused seaded serveri käskudena faili."
-#: server/commands.c:359
+#: server/commands.c:411
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:363
+#: server/commands.c:416
msgid "Simply returns the id of the server."
msgstr "Lihtsalt annab serveri ID."
-#: server/connecthand.c:85
+#: server/connecthand.c:109
#, c-format
msgid "Welcome to the %s Server running at %s port %d."
msgstr "Tere tulemast %s serverisse %s port %d."
-#: server/connecthand.c:89
+#: server/connecthand.c:113
#, c-format
msgid "Welcome to the %s Server at port %d."
msgstr "Tere tulemast %s serverisse pordil %d."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:97
+#: server/connecthand.c:121
#, c-format
msgid "(%d) %s: connected [%s]"
msgstr "(%d) %s ühines aadressilt %s."
-#: server/connecthand.c:104
+#: server/connecthand.c:128
#, c-format
msgid "Server: %s has connected from %s."
msgstr "Server: %s ühines aadressilt %s."
-#: server/connecthand.c:145
+#: server/connecthand.c:175
msgid "Couldn't attach your connection to new player."
msgstr "Ei suutnud siduda su ühendust uue mängijaga."
-#: server/connecthand.c:165
+#: server/connecthand.c:199
#, c-format
msgid "You are logged in as '%s' connected to no player."
msgstr "Oled sees kui '%s' aga pole seotud ühegi mängijaga."
-#: server/connecthand.c:169
+#: server/connecthand.c:203
#, c-format
msgid "You are logged in as '%s' connected to an anonymous player."
msgstr "Oled sees kui '%s' ja oled seotud anonüümse mängijaga."
-#: server/connecthand.c:174
+#: server/connecthand.c:208
#, c-format
msgid "You are logged in as '%s' connected to %s."
msgstr "Oled sees kui '%s' ja oled seotud mängijaga %s."
-#: server/connecthand.c:187
+#: server/connecthand.c:221
#, c-format
msgid "Turn-blocking game play: waiting on %s to finish turn..."
msgstr "Blokeerivate käikudega mäng: ootame, et %s lõpetaks käigu..."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:240
+#: server/connecthand.c:274
#, c-format
msgid "(%d) %s: connection request [%s]"
msgstr "(%d) %s: ühendumise katse [%s]"
-#: server/connecthand.c:266
+#: server/connecthand.c:300
msgid "The client is missing a capability that this server needs."
msgstr "Sellel kliendil pole mingit võimet, mida server vajab."
-#: server/connecthand.c:268 server/connecthand.c:279
+#: server/connecthand.c:302 server/connecthand.c:313
#, c-format
msgid "(%d) %s rejected: mismatched capabilities!"
msgstr "(%d) %s saadeti ära: kokkusobimatud võimed!"
-#: server/connecthand.c:277
+#: server/connecthand.c:311
msgid "This server is missing a capability that the client needs."
msgstr "Serveril pole mingit võimet, mida see klient vajab."
-#: server/connecthand.c:290
+#: server/connecthand.c:324
msgid "The username is invalid!"
msgstr "Vigane loginanimi!"
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:292
+#: server/connecthand.c:326
#, c-format
msgid "(%d) %s rejected: invalid username [%s]"
msgstr "(%d) %s saadeti kukele, loginanimi [%s] on invaliidne"
-#: server/connecthand.c:303
+#: server/connecthand.c:337
msgid "Your username is already connected!"
msgstr "Su loginanimi on juba ühendunud!"
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:305
+#: server/connecthand.c:339
#, c-format
msgid "(%d) %s rejected: duplicate username [%s]"
msgstr "(%d) %s saadeti kukele: selline loginanimi [%s] on juba olemas."
-#: server/connecthand.c:335 server/connecthand.c:344
+#: server/connecthand.c:369 server/connecthand.c:378
#, c-format
msgid "Lost connection: %s."
msgstr "Kadus ühendus: %s."
@@ -2919,111 +2948,111 @@ msgstr "Ok. Standardstiil seatud."
msgid "For introductory help, type 'help'."
msgstr "Sissejuhatavaks abiks trüki 'help'."
-#: server/diplhand.c:164
+#: server/diplhand.c:167
#, c-format
msgid "The %s can't accept %s."
msgstr "%s ei suuda vastu võtta %s."
-#: server/diplhand.c:176
+#: server/diplhand.c:179
#, c-format
msgid "You don't have tech %s, you can't accept treaty."
msgstr "Sul pole tehnoloogiat %s, ei saa lepingut sõlmida."
-#: server/diplhand.c:185
+#: server/diplhand.c:188
msgid "City you are trying to give no longer exists, you can't accept treaty."
msgstr ""
"Linna, mida püüad anda, enam ei eksisteeri. Sa ei saa lepingut sõlmida."
-#: server/diplhand.c:191
+#: server/diplhand.c:194
#, c-format
msgid "You are not owner of %s, you can't accept treaty."
msgstr "Sa ei ole linna %s omanik. Ei saa lepingut sõlmida."
-#: server/diplhand.c:197 server/diplhand.c:301
+#: server/diplhand.c:200 server/diplhand.c:304
#, c-format
msgid "Your capital (%s) is requested, you can't accept treaty."
msgstr "Küsitakse su pealinna (%s), ei saa lepingut sõlmida."
-#: server/diplhand.c:224
+#: server/diplhand.c:227
msgid "You don't have enough gold, you can't accept treaty."
msgstr "Sul pole piisavalt raha, et lepingut sõlmida."
-#: server/diplhand.c:256 server/diplhand.c:261
+#: server/diplhand.c:259 server/diplhand.c:264
#, c-format
msgid "A treaty containing %d clause was agreed upon."
msgid_plural "A treaty containing %d clauses was agreed upon."
msgstr[0] "Nõustuti leppega, milles on %d tingimus."
msgstr[1] "Nõustuti leppega, milles on %d tingimust."
-#: server/diplhand.c:277 server/diplhand.c:281
+#: server/diplhand.c:280 server/diplhand.c:284
#, c-format
msgid "One of the cities the %s are giving away is destroyed! Treaty canceled!"
msgstr "Linn, mille %s ära annavad, on hävitatud! Lepe tühistatud!"
-#: server/diplhand.c:288 server/diplhand.c:293
+#: server/diplhand.c:291 server/diplhand.c:296
#, c-format
msgid "The %s no longer control %s! Treaty canceled!"
msgstr "%s ei valitse enam linnas %s! Lepe tühistatud!"
-#: server/diplhand.c:331 server/diplhand.c:335
+#: server/diplhand.c:334 server/diplhand.c:338
#, c-format
msgid "The %s don't have the promised amount of gold! Treaty canceled!"
msgstr "%s ei oma lubatud koguses raha! Lepe tühistatud!"
-#: server/diplhand.c:364
+#: server/diplhand.c:367
#, c-format
msgid "You gave an embassy to %s."
msgstr "Sa andsid saatkonna %s-le."
-#: server/diplhand.c:367
+#: server/diplhand.c:370
#, c-format
msgid "%s allowed you to create an embassy!"
msgstr "%s lubas sul teha saatkonna!"
-#: server/diplhand.c:383
+#: server/diplhand.c:386
#, c-format
msgid "You are taught the knowledge of %s."
msgstr "Sulle õpetatakse %s tarkus."
-#: server/diplhand.c:387
+#: server/diplhand.c:390
#, c-format
msgid "The %s have acquired %s from the %s."
msgstr "%s said teaduse %s rahvuselt %s."
-#: server/diplhand.c:402
+#: server/diplhand.c:405
#, c-format
msgid "You get %d gold."
msgstr "Sa said %d raha."
#. TRANS: ... Polish worldmap.
-#: server/diplhand.c:410
+#: server/diplhand.c:413
#, c-format
msgid "You receive the %s worldmap."
msgstr "Sa saad rahva %s maailmakaardi."
#. TRANS: ... Polish seamap.
-#: server/diplhand.c:419
+#: server/diplhand.c:422
#, c-format
msgid "You receive the %s seamap."
msgstr "Sa saad rahva %s merekaardi."
-#: server/diplhand.c:436
+#: server/diplhand.c:439
#, c-format
msgid "You receive city of %s from %s."
msgstr "Saad linna %s rahvalt %s."
-#: server/diplhand.c:441
+#: server/diplhand.c:444
#, c-format
msgid "You give city of %s to %s."
msgstr "Sa annad linna %s rahvale %s."
-#: server/diplhand.c:454 server/diplhand.c:457
+#: server/diplhand.c:457 server/diplhand.c:460
#, c-format
msgid "You agree on a cease-fire with %s."
msgstr "Sa sõlmid %s'ga vaherahu."
#. TRANS: ... the Poles ... Polish territory.
-#: server/diplhand.c:476 server/diplhand.c:488
+#: server/diplhand.c:479 server/diplhand.c:491
#, fuzzy, c-format
msgid ""
"You agree on an armistice with the %s. In %d turn, it will become a peace "
@@ -3038,32 +3067,32 @@ msgstr[1] ""
"Sinu ja %s vahel on nüüd relvarahu. %d käigu pärast muutub see rahuleppeks. "
"Korista oma üksused %s-te territooriumilt ära."
-#: server/diplhand.c:512 server/diplhand.c:515
+#: server/diplhand.c:515 server/diplhand.c:518
#, c-format
msgid "You agree on an alliance with %s."
msgstr "Sa astusid %s-tega liitu."
-#: server/diplhand.c:524
+#: server/diplhand.c:527
#, c-format
msgid "You give shared vision to %s."
msgstr "Sa annad %s-tele jagatud vaate."
-#: server/diplhand.c:527
+#: server/diplhand.c:530
#, c-format
msgid "%s gives you shared vision."
msgstr "%s annavad sulle jagatud vaate."
-#: server/diplhand.c:663
+#: server/diplhand.c:666
#, c-format
msgid "%s canceled the meeting!"
msgstr "%s jättis kohtumise ära!"
-#: server/diplhand.c:670
+#: server/diplhand.c:673
#, c-format
msgid "Meeting with %s canceled."
msgstr "Kohtumine %s-iga katkestati."
-#: server/diplhand.c:712
+#: server/diplhand.c:715
msgid "Your diplomatic envoy was decapitated!"
msgstr "Su saadikud tehti peajagu lühemaks."
@@ -3248,80 +3277,80 @@ msgid "The %s destroyed the %s in %s."
msgstr "%s hävitas %s %s-is."
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1091
+#: server/diplomats.c:1097
#, c-format
msgid "An enemy %s has been eliminated by your %s."
msgstr "Vaenlase üksus %s hävitati sinu üksuse %s poolt."
#. TRANS: <unit> ... <city> ... <diplomat>
-#: server/diplomats.c:1098
+#: server/diplomats.c:1104
#, c-format
msgid "Your %s has been eliminated defending %s against a %s."
msgstr "Su %s hävitati, kui ta üritas kaitsta %s-i %s-ide vastu."
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1106
+#: server/diplomats.c:1112
#, c-format
msgid "Your %s has been eliminated defending against a %s."
msgstr "Su %s langes kaitses üksuse %s vastu."
-#: server/diplomats.c:1119
+#: server/diplomats.c:1125
#, c-format
msgid "Your %s was eliminated by a defending %s."
msgstr "Su %s elimineeriti kaitsva %s poolt."
-#: server/diplomats.c:1127
+#: server/diplomats.c:1133
#, c-format
msgid "Eliminated %s %s while infiltrating %s."
msgstr "Elimineeriti %s-te %s, kes üritas hiilida %s-sse."
-#: server/diplomats.c:1134
+#: server/diplomats.c:1140
#, c-format
msgid "Eliminated %s %s while infiltrating our troops."
msgstr "Elimineeriti %s-te %s, kes üritas me üksustega midagi teha."
-#: server/diplomats.c:1185
+#: server/diplomats.c:1191
#, c-format
msgid ""
"Your %s has successfully completed the mission and returned unharmed to %s."
msgstr "Su %s lõpetas edukalt oma missiooni ja naases vigastamatult linna %s."
-#: server/diplomats.c:1204
+#: server/diplomats.c:1210
#, c-format
msgid "Your %s was captured after completing the mission in %s."
msgstr "Su %s saadi kätte, aga ta jõudis oma ülesande täita linnas %s."
-#: server/diplomats.c:1210
+#: server/diplomats.c:1216
#, c-format
msgid "Your %s was captured after completing the mission."
msgstr "Su %s saadi kätte pärast ülesande täitmist."
-#: server/diplomats.c:1242
+#: server/diplomats.c:1248
#, c-format
msgid "You have caused an incident while bribing the %s %s."
msgstr "Sa põhjustasid intsidendi üritades ära osta rahvuse %s üksust %s."
-#: server/diplomats.c:1247
+#: server/diplomats.c:1253
#, c-format
msgid "%s has caused an incident while bribing your %s."
msgstr "%s põhjustas intsidendi, kui üritas osta ära su %s."
-#: server/diplomats.c:1254
+#: server/diplomats.c:1260
#, c-format
msgid "You have caused an incident while attempting to steal tech from %s."
msgstr "Sa põhjustasid intsidendi, kui üritasid varastada teadust %s-ilt."
-#: server/diplomats.c:1258
+#: server/diplomats.c:1264
#, c-format
msgid "%s has caused an incident while attempting to steal tech from you."
msgstr "%s põhjustas intsidendi üritades varastada sult teadust."
-#: server/diplomats.c:1264
+#: server/diplomats.c:1270
#, c-format
msgid "You have caused an incident while inciting a revolt in %s."
msgstr "Sa põhjustasid intsidendi, kui üritasid revolutsiooni süüdata %s-s."
-#: server/diplomats.c:1268
+#: server/diplomats.c:1274
#, c-format
msgid "%s have caused an incident while inciting a revolt in %s."
msgstr "%s põhjustasid intsidendi, kui üritasid revolutsiooni süüdata %s-s."
@@ -3436,12 +3465,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:1418
+#: server/maphand.c:1425
#, c-format
msgid "Moved your %s due to changing terrain."
msgstr "Su %s nihutati, kuna maastik muutus."
-#: server/maphand.c:1436
+#: server/maphand.c:1443
#, c-format
msgid "Disbanded your %s due to changing terrain."
msgstr "Su %s lasti lahti, kuna maastik muutus."
@@ -3450,7 +3479,7 @@ msgstr "Su %s lasti lahti, kuna maastik muutus."
msgid "Not reporting to the metaserver in this game."
msgstr "Selles mängus metaserverile ei raporteerita."
-#: server/meta.c:430
+#: server/meta.c:432
#, c-format
msgid "Metaserver: bad address: [%s:%d]."
msgstr "Metaserver: halb aadress: [%s:%d]."
@@ -3575,54 +3604,54 @@ msgstr ""
"Su meeskonnakaaslane %s kuulutas sõja %s-le. Sa oled kohustatud lõpetama "
"liidu %s-ga."
-#: server/plrhand.c:1103
+#: server/plrhand.c:1115
#, c-format
msgid "Removing player %s."
msgstr "Eemaldan mängija %s."
-#: server/plrhand.c:1105
+#: server/plrhand.c:1117
msgid "You've been removed from the game!"
msgstr "Sind eemaldati mängust!"
-#: server/plrhand.c:1108
+#: server/plrhand.c:1120
#, c-format
msgid "%s has been removed from the game."
msgstr "%s eemaldati mängust."
-#: server/plrhand.c:1153 server/plrhand.c:1158
+#: server/plrhand.c:1167 server/plrhand.c:1172
#, c-format
msgid "You have made contact with the %s, ruled by %s."
msgstr "Lõid kontakti rahvusega %s, valitseja %s."
-#: server/plrhand.c:1178
+#: server/plrhand.c:1192
#, 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:1656
+#: server/plrhand.c:1670
#, 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:1663
+#: server/plrhand.c:1677
#, 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:1686
+#: server/plrhand.c:1700
#, fuzzy, 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:1707
+#: server/plrhand.c:1721
#, c-format
msgid "%s declares allegiance to %s."
msgstr "%s vannub truudust %s'le."
-#: server/plrhand.c:1722
+#: server/plrhand.c:1736
#, fuzzy, c-format
msgid ""
"Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3815,65 +3844,65 @@ msgstr "(ehitatamisel, %s linnas %s (%s))\n"
msgid "Wonders of the World"
msgstr "Ilmaimed"
-#: server/report.c:547
+#: server/report.c:552
msgid " sq. mi."
msgstr " ruutmiili"
-#: server/report.c:557
+#: server/report.c:562
msgid " M tons"
msgstr " M tonni"
-#: server/report.c:562
+#: server/report.c:567
msgid " M goods"
msgstr " M kaupa"
-#: server/report.c:567
+#: server/report.c:572
msgid " bulbs"
msgstr " pirni"
-#: server/report.c:572
+#: server/report.c:577
msgid " month"
msgid_plural " months"
msgstr[0] " kuu"
msgstr[1] " kuud"
-#: server/report.c:577
+#: server/report.c:582
msgid " ton"
msgid_plural " tons"
msgstr[0] " tonn"
msgstr[1] " tonni"
-#: server/report.c:591
+#: server/report.c:596
msgid "st"
msgstr "."
-#: server/report.c:593
+#: server/report.c:598
msgid "nd"
msgstr "."
-#: server/report.c:595
+#: server/report.c:600
msgid "rd"
msgstr "."
-#: server/report.c:597
+#: server/report.c:602
msgid "th"
msgstr "."
-#: server/report.c:700
+#: server/report.c:705
msgid "Demography string contains invalid characters. Try \"help demography\"."
msgstr "Demograafia stringis on imelikud tähed. Proovi \"help demography\"."
-#: server/report.c:743 server/report.c:768
+#: server/report.c:748 server/report.c:773
msgid "Demographics Report:"
msgstr "Demograafiline Raport:"
-#: server/report.c:744
+#: server/report.c:749
msgid "Sorry, the Demographics report is unavailable."
msgstr "Vabandame, Demograafiline raport pole kättesaadav."
#. TRANS: <nation adjective> <government name> (<year>).
#. * E.g. "Polish Despotism (200 AD)".
-#: server/report.c:750
+#: server/report.c:755
#, fuzzy, c-format
msgid "%s %s (%s)"
msgstr "%s %s-s (%s)\n"
@@ -3884,13 +3913,13 @@ msgstr "%s %s-s (%s)\n"
msgid "Could not find a readable \"%s.%s\" ruleset file."
msgstr "Ei suutnud leida loetavat \"%s.%s\" reeglistiku faili."
-#: server/ruleset.c:2356
+#: server/ruleset.c:2366
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:3166
+#: server/ruleset.c:3178
msgid "Loading rulesets"
msgstr "Laen reeglistikke"
@@ -3904,19 +3933,19 @@ 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:3588
+#: server/savegame.c:3587
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."
#. TRANS: Fatal error message.
-#: server/savegame.c:3815
+#: server/savegame.c:3817
msgid ""
"Saved game uses the \"classic\" terrain ruleset, and is no longer supported."
msgstr ""
"Salvestatud mäng kasutab \"klassikalist\" maastiku reeglite seadistust, mis "
"ei ole enam toetaud."
-#: server/savegame.c:3824
+#: server/savegame.c:3826
#, c-format
msgid ""
"Warning: Different rulesetdirs ('%s' and '%s') are no longer supported. "
@@ -3926,7 +3955,7 @@ msgstr ""
"toetatud. Kasutan '%s'."
#. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4051
+#: server/savegame.c:4055
#, c-format
msgid "%s had invalid nation; changing to %s."
msgstr "%s sattus vigase rahva juhiks. Annan talle rahva %s."
@@ -3959,7 +3988,7 @@ msgstr "Sisene"
msgid "Networking"
msgstr "Võrgundus"
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:734
#: client/gui-win32/dialogs.c:532
msgid "All"
msgstr "Kõik"
@@ -5177,11 +5206,11 @@ msgstr ""
"Kui see on 1, lisatakse faili \"civscore.log\" iga käigu järel mängijate "
"statistika. Selle abil saab peale mängu luua võimsuse graafikuid."
-#: server/sernet.c:150
+#: server/sernet.c:151
msgid "Server cannot read standard input. Ignoring input."
msgstr "Server ei suuda standardsisendit lugeda. Ignoreerin sisendit."
-#: server/sernet.c:929
+#: server/sernet.c:933
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr "Server: halb aadress: [%s:%d]."
@@ -5254,46 +5283,46 @@ msgstr "Su laeval on juba maksimaalselt päikesepaneele!"
msgid "Without guidance from the capital, the %s spaceship is lost!"
msgstr "%s kosmoselaev läks kaotsi, kuna side pealinnaga katkes!"
-#: server/srv_main.c:240
+#: server/srv_main.c:242
msgid "Game ended in a draw as end year exceeded"
msgstr "Mäng lõppes viigiga, kuna lõpuaasta saabus"
-#: server/srv_main.c:274
+#: server/srv_main.c:276
#, c-format
msgid "The %s spaceship has arrived at Alpha Centauri."
msgstr "%s jõudsid kosmoselaevaga Alpha Centaurile."
-#: server/srv_main.c:287 server/srv_main.c:322
+#: server/srv_main.c:289 server/srv_main.c:324
#, c-format
msgid "Team victory to %s"
msgstr "Võitis meeskond %s"
-#: server/srv_main.c:297 server/srv_main.c:338
+#: server/srv_main.c:299 server/srv_main.c:340
#, c-format
msgid "Game ended in victory for %s"
msgstr "Mäng lõppes %s võiduga"
-#: server/srv_main.c:345
+#: server/srv_main.c:347
msgid "Game ended in a draw"
msgstr "Mäng lõppes viigiga"
-#: server/srv_main.c:461 server/srv_main.c:472
+#: server/srv_main.c:465 server/srv_main.c:476
#, c-format
msgid "Your %s was disbanded in accordance with your peace treaty with the %s."
msgstr "Su üksus %s lasti lahti, kuna nii nõudis rahulepe rahvusega %s."
-#: server/srv_main.c:512 server/srv_main.c:516
+#: server/srv_main.c:516 server/srv_main.c:520
#, c-format
msgid ""
"Concerned citizens point out that the cease-fire with %s will run out soon."
msgstr "Ärevuses kodanikud märgivad ära, et vaherahu %s'ga lõpeb varsti."
-#: server/srv_main.c:521 server/srv_main.c:525
+#: server/srv_main.c:525 server/srv_main.c:529
#, c-format
msgid "The cease-fire with %s has run out. You are now at war with the %s."
msgstr "Vaherahu %s'ga on lõpenud. Oled nüüd %s-ga sõjas."
-#: server/srv_main.c:542
+#: server/srv_main.c:546
#, c-format
msgid ""
"Ceasefire between %s and %s has run out. They are at war. You cancel your "
@@ -5302,97 +5331,97 @@ msgstr ""
"Vaherahu %s ja %s vahel on lõppenud. Nad on nüüd sõjas. Sa katkestad liidu "
"mõlemaga."
-#: server/srv_main.c:961
+#: server/srv_main.c:997
#, c-format
msgid "Failed saving game as %s"
msgstr "Ei suutnud salvestada mängu faili %s"
-#: server/srv_main.c:963
+#: server/srv_main.c:999
#, c-format
msgid "Game saved as %s"
msgstr "Mäng salvestati faili %s."
-#: server/srv_main.c:994
+#: server/srv_main.c:1030
msgid "The game is already running."
msgstr "Mäng juba käib."
-#: server/srv_main.c:1002
+#: server/srv_main.c:1038
#, 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:1009
+#: server/srv_main.c:1045
msgid "Starting game."
msgstr "Alustame mänguga."
-#: server/srv_main.c:1071
+#: server/srv_main.c:1112
#, c-format
msgid "request for unknown report (type %d)"
msgstr "küsiti tundmatut raportit (tüüp %d)"
-#: server/srv_main.c:1136
+#: server/srv_main.c:1177
#, c-format
msgid "Warning: rejecting old client %s"
msgstr "Hoiatus: ei luba sisse vana klienti %s"
-#: server/srv_main.c:1238
+#: server/srv_main.c:1279
#, 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:1338
+#: server/srv_main.c:1381
msgid "Please choose a non-blank name."
msgstr "Palun vali mittetühi nimi."
-#: server/srv_main.c:1354
+#: server/srv_main.c:1397
msgid "That nation is already in use."
msgstr "See rahvus on juba kasutusel."
-#: server/srv_main.c:1370
+#: server/srv_main.c:1413
#, 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:1391
+#: server/srv_main.c:1434
msgid "Please choose a name containing only ASCII characters."
msgstr "Palun vali nimi, mis sisaldab ainult ASCII märke."
-#: server/srv_main.c:1490
+#: server/srv_main.c:1533
#, c-format
msgid "%s nation is not available in this scenario."
msgstr "Rahvus %s ei ole saadaval selles stsenaariumis."
-#: server/srv_main.c:1496
+#: server/srv_main.c:1539
#, c-format
msgid "%s nation is already in use."
msgstr "Rahvus %s on juba kasutuses."
-#: server/srv_main.c:1514
+#: server/srv_main.c:1557
#, c-format
msgid "%s is the %s ruler %s."
msgstr "%s on rahvuse %s valitseja %s."
-#: server/srv_main.c:1570
+#: server/srv_main.c:1613
#, 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:1614 server/srv_main.c:1618
+#: server/srv_main.c:1657 server/srv_main.c:1661
#, 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:1760
+#: server/srv_main.c:1803
#, c-format
msgid "Player %d"
msgstr "Mängija %d"
-#: server/srv_main.c:1771 server/srv_main.c:1777
+#: server/srv_main.c:1814 server/srv_main.c:1820
#, c-format
msgid "%s rules the %s."
msgstr "%s on %s valitseja."
-#: server/srv_main.c:1942
+#: server/srv_main.c:1985
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
@@ -5400,481 +5429,465 @@ msgstr ""
"See civserver'i programm toetab mängijate autentimist, kuid see pole hetkel "
"kasutuses."
-#: server/srv_main.c:1993
+#: server/srv_main.c:2037
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr "Saadan infot metaserverile [%s]"
-#: server/srv_main.c:2024
+#: server/srv_main.c:2069
msgid "The game is over..."
msgstr "Mäng on läbi..."
-#: server/srv_main.c:2237
+#: server/srv_main.c:2286
msgid "Now accepting new client connections."
msgstr "Ootan klientprogrammide ühendusi."
-#: server/stdinhand.c:246
-#, c-format
-msgid "Vote \"%s\" is passed %d to %d with %d abstentions."
-msgstr "Hääletus \"%s\" läks läbi häältega %d %d vastu, %d jätsid hääletamata."
-
-#: server/stdinhand.c:253
-#, c-format
-msgid "Vote \"%s\" failed with %d against, %d for and %d abstentions."
-msgstr ""
-"Hääletus \"%s\" lükati tagasi häältega %d %d vastu, %d jätsid hääletamata."
-
#. TRANS: ambiguous command
-#: server/stdinhand.c:365
+#: server/stdinhand.c:284
msgid "(ambiguous)"
msgstr "(mitmetähenduslik)"
#. TRANS: unrecognized command
#. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:416
+#: server/stdinhand.c:287 client/citydlg_common.c:419
#: 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 "(teadmata)"
-#: server/stdinhand.c:458
+#: server/stdinhand.c:377
msgid "Name is empty, so cannot be a player."
msgstr "Nimi on tühi, järelikult ei saa olla mängija."
-#: server/stdinhand.c:462
+#: server/stdinhand.c:381
msgid "Name is too long, so cannot be a player."
msgstr "Nimi on liiga pikk, järelikult ei saa olla mängija."
-#: server/stdinhand.c:466
+#: server/stdinhand.c:385
#, c-format
msgid "Player name prefix '%s' is ambiguous."
msgstr "Mängija nime prefix '%s' on mitmesti mõistetav."
-#: server/stdinhand.c:470
+#: server/stdinhand.c:389
#, c-format
msgid "No player by the name of '%s'."
msgstr "Pole mängijat nimega '%s'."
-#: server/stdinhand.c:474 server/stdinhand.c:509
+#: server/stdinhand.c:393 server/stdinhand.c:428
#, c-format
msgid "Unexpected match_result %d (%s) for '%s'."
msgstr "Ootamatu match_result %d (%s) '%s' kohta."
-#: server/stdinhand.c:493
+#: server/stdinhand.c:412
msgid "Name is empty, so cannot be a connection."
msgstr "Nimi on tühi, seega see ei saa olla ühendus."
-#: server/stdinhand.c:497
+#: server/stdinhand.c:416
msgid "Name is too long, so cannot be a connection."
msgstr "Nimi on liiga pikk, seega ei saa olla ühendus."
-#: server/stdinhand.c:501
+#: server/stdinhand.c:420
#, c-format
msgid "Connection name prefix '%s' is ambiguous."
msgstr "Ühenduse nimi '%s' on mitmesti mõistetav."
-#: server/stdinhand.c:505
+#: server/stdinhand.c:424
#, c-format
msgid "No connection by the name of '%s'."
msgstr "Pole ühendust nimega '%s'."
-#: server/stdinhand.c:525
+#: server/stdinhand.c:444
#, c-format
msgid "Open metaserver connection to [%s]."
msgstr "Ava metaserveri ühendus masinasse [%s]."
-#: server/stdinhand.c:538
+#: server/stdinhand.c:457
#, c-format
msgid "Close metaserver connection to [%s]."
msgstr "Sule metaserveri ühendus masinasse [%s]."
-#: server/stdinhand.c:553
+#: server/stdinhand.c:472
msgid "Metaserver connection is open."
msgstr "Metaserveri ühendus on avatud."
-#: server/stdinhand.c:556
+#: server/stdinhand.c:475
msgid "Metaserver connection is closed."
msgstr "Metaserveri ühendus on suletud."
-#: server/stdinhand.c:566
+#: server/stdinhand.c:485
msgid "Metaserver connection is already open."
msgstr "Metaserveri ühendus on juba avatud."
-#: server/stdinhand.c:577
+#: server/stdinhand.c:496
msgid "Metaserver connection is already closed."
msgstr "Metaserveri ühendus on juba suletud."
-#: server/stdinhand.c:582
+#: server/stdinhand.c:501
msgid "Argument must be 'u', 'up', 'd', 'down', or '?'."
msgstr "Argument peab olema 'u', 'up', 'd', 'down' või '?'."
-#: server/stdinhand.c:603
+#: server/stdinhand.c:522
#, c-format
msgid "Metaserver patches string set to '%s'."
msgstr "Metaserveri lappide string seatud väärtusele '%s'."
-#: server/stdinhand.c:606
+#: server/stdinhand.c:525
#, c-format
msgid "Metaserver patches string set to '%s', not reporting to metaserver."
msgstr "Metaserveri lappide string seatud '%s', ei kanna ette metaserverile."
-#: server/stdinhand.c:627
+#: server/stdinhand.c:546
#, c-format
msgid "Metaserver message string set to '%s'."
msgstr "Metaserveri sõnumi string seatud väärtusele '%s'."
-#: server/stdinhand.c:630
+#: server/stdinhand.c:549
#, c-format
msgid "Metaserver message string set to '%s', not reporting to metaserver."
msgstr ""
"Metaserveri sõnumi string seatud väärtusele '%s', ei kanna ette "
"metaserverile."
-#: server/stdinhand.c:650
+#: server/stdinhand.c:569
#, c-format
msgid "Metaserver is now [%s]."
msgstr "Metaserver on nüüd [%s]."
-#: server/stdinhand.c:660
+#: server/stdinhand.c:579
#, c-format
msgid "Server id: %s"
msgstr "Serveri ID: %s"
-#: server/stdinhand.c:757
+#: server/stdinhand.c:676
msgid "You cannot save games manually on this server."
msgstr "Selles serveris ei saa mänge käsitsi salvestada."
-#: server/stdinhand.c:774
+#: server/stdinhand.c:693
msgid "Cannot toggle a barbarian player."
msgstr "Ei saa ümber lülitada barbar-mängijat."
-#: server/stdinhand.c:781
+#: server/stdinhand.c:700
#, c-format
msgid "%s is now under AI control."
msgstr "%s on nüüd tehismõistuse juhitud."
-#: server/stdinhand.c:802
+#: server/stdinhand.c:721
#, c-format
msgid "%s is now under human control."
msgstr "%s on nüüd inimese juhitud."
-#: server/stdinhand.c:847
+#: server/stdinhand.c:766
msgid "Can't add AI players once the game has begun."
msgstr "Ei saa lisada tehismõistusi, kui mäng juba käib."
-#: server/stdinhand.c:867
+#: server/stdinhand.c:786
msgid "Can't add more players, server is full."
msgstr "Rohkem mängijaid ei saa lisada, serveril on kuhi peal."
-#: server/stdinhand.c:874
+#: server/stdinhand.c:793
msgid "Can't use an empty name."
msgstr "Tühja nime ei saa kasutada."
-#: server/stdinhand.c:881
+#: server/stdinhand.c:800
#, c-format
msgid "That name exceeds the maximum of %d chars."
msgstr "See nimi ületab piirpikkust %d märki."
-#: server/stdinhand.c:887
+#: server/stdinhand.c:806
msgid "That name is not allowed."
msgstr "See nimi pole lubatud."
-#: server/stdinhand.c:893
+#: server/stdinhand.c:812
msgid "A player already exists by that name."
msgstr "Sellise nimega mängija on juba olemas."
-#: server/stdinhand.c:899
+#: server/stdinhand.c:818
msgid "A user already exists by that name."
msgstr "Sellise nimega mängija on juba olemas."
-#: server/stdinhand.c:925
+#: server/stdinhand.c:844
#, c-format
msgid "%s has been added as an AI-controlled player."
msgstr "%s liitus arvuti juhitud mängijana."
-#: server/stdinhand.c:932
+#: server/stdinhand.c:851
#, c-format
msgid "Error creating new AI player: %s."
msgstr "Viga uue AI mängija %s loomisel"
-#: server/stdinhand.c:966
+#: server/stdinhand.c:885
msgid "Players cannot be removed once the game has started."
msgstr "Mängijaid ei saa eemaldada kui mäng juba käib."
-#: server/stdinhand.c:977
+#: server/stdinhand.c:896
#, c-format
msgid "Removed player %s from the game."
msgstr "Mängija %s eemaldati mängust."
-#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
+#: server/stdinhand.c:935 server/stdinhand.c:3372 server/stdinhand.c:3507
#, c-format
msgid "Name \"%s\" disallowed for security reasons."
msgstr "Nime \"%s\" ei lubata turvapõhjustel."
-#: server/stdinhand.c:1029
+#: server/stdinhand.c:948
#, c-format
msgid "No command script found by the name \"%s\"."
msgstr "Ei leidu käsuskripti nimega \"%s\"."
-#: server/stdinhand.c:1037
+#: server/stdinhand.c:956
#, c-format
msgid "Loading script file: %s"
msgstr "Loen skriptifaili: %s"
-#: server/stdinhand.c:1052
+#: server/stdinhand.c:971
#, c-format
msgid "Cannot read command line scriptfile '%s'."
msgstr "Ei suuda lugeda käsurea skriptifaili '%s'."
-#: server/stdinhand.c:1054
+#: server/stdinhand.c:973
#, c-format
msgid "Could not read script file '%s'."
msgstr "Ei suutnud lugeda skriptifaili '%s'."
-#: server/stdinhand.c:1146
+#: server/stdinhand.c:1065
#, c-format
msgid "Could not write script file '%s'."
msgstr "Ei suutnud kirjutada skriptifaili '%s'."
-#: server/stdinhand.c:1158
+#: server/stdinhand.c:1077
msgid "You cannot use the write command on this server for security reasons."
msgstr "Sa ei saa kasudada 'write' käsku siin serveris turvapõhjustel."
-#: server/stdinhand.c:1186
+#: server/stdinhand.c:1105
#, c-format
msgid ""
"Cannot decrease command access level '%s' for connection '%s'; you only have "
"'%s'."
msgstr "Ei saa alandada käsutasest '%s' ühendusel '%s' — sul on ainult '%s'."
-#: server/stdinhand.c:1241
+#: server/stdinhand.c:1114
+#, c-format
+msgid "Command access level set to '%s' for connection %s."
+msgstr "Käsutase seatud '%s'-iks ühendusel %s."
+
+#: server/stdinhand.c:1163
#, c-format
msgid ""
"Anyone can now become game organizer '%s' by issuing the 'first' command."
msgstr "Ükskõik kes võib nüüd saada mängujuhiks '%s' andes käsu 'first'."
-#: server/stdinhand.c:1274
+#: server/stdinhand.c:1187
msgid "Command access levels in effect:"
msgstr "Hetkel aktiivsed käsutasemed:"
-#: server/stdinhand.c:1282
+#: server/stdinhand.c:1194
#, c-format
msgid "Command access level for new connections: %s"
msgstr "Käsutase uutele ühendustele: %s"
-#: server/stdinhand.c:1285
+#: server/stdinhand.c:1197
#, c-format
msgid "Command access level for first player to take it: %s"
msgstr "Käsutase esimesele võtjale: %s"
-#: server/stdinhand.c:1294
+#: server/stdinhand.c:1206
msgid ""
"Error: command access level must be one of 'none', 'info', 'ctrl', or 'hack'."
msgstr ""
"Viga: käsutase peab olema üks neist: 'none', 'info', 'ctrl' või 'hack'."
-#: server/stdinhand.c:1299
+#: server/stdinhand.c:1211
#, c-format
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:1375
-#, c-format
-msgid "Command access level set to '%s' for connection %s."
-msgstr "Käsutase seatud '%s'-iks ühendusel %s."
-
-#: 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:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
+#: server/stdinhand.c:1238 server/stdinhand.c:1252 server/stdinhand.c:1273
#, c-format
msgid "Command access level set to '%s' for new players."
msgstr "Käsutase seatud '%s'-iks uutele mängijatele."
-#: server/stdinhand.c:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
+#: server/stdinhand.c:1243 server/stdinhand.c:1257 server/stdinhand.c:1267
#, 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:1402
+#: server/stdinhand.c:1302
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:1406
+#: server/stdinhand.c:1306
#, 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:1411
+#: server/stdinhand.c:1311
msgid "Someone else already is game organizer."
msgstr "Keegi teine on juba mängujuht."
-#: server/stdinhand.c:1416
+#: server/stdinhand.c:1316
#, c-format
msgid "Connection %s has opted to become the game organizer."
msgstr "Ühendus %s on vabatahtlik mängujuhiks saama."
-#: server/stdinhand.c:1467
+#: server/stdinhand.c:1367
#, c-format
msgid "Invalid argument %d."
msgstr "Vigane argument %d."
-#: server/stdinhand.c:1474
+#: server/stdinhand.c:1374
msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
msgstr ""
"Kasutamine: timeoutincrease <käik> <käigulisand> <väärtus> <väärtusetegur>"
-#: server/stdinhand.c:1482
+#: server/stdinhand.c:1382
#, c-format
msgid "Dynamic timeout set to %d %d %d %d"
msgstr "Dünaamiline ajapiirang seatud %d %d %d %d"
-#: server/stdinhand.c:1542 server/stdinhand.c:1545
+#: server/stdinhand.c:1442 server/stdinhand.c:1445
msgid "Option:"
msgstr "Seade:"
-#: server/stdinhand.c:1555 server/stdinhand.c:4031
+#: server/stdinhand.c:1455 server/stdinhand.c:4079
msgid "Description:"
msgstr "Kirjeldus:"
-#: server/stdinhand.c:1560
+#: server/stdinhand.c:1460
#, c-format
msgid "Status: %s"
msgstr "Staatus: %s"
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "changeable"
msgstr "muudetav"
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "fixed"
msgstr "fikseeritud"
-#: server/stdinhand.c:1567
+#: server/stdinhand.c:1467
#, c-format
msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
msgstr "Väärtus: %d, miinimum: 0, vaikimisi: %d, maksimum: 1"
-#: server/stdinhand.c:1572
+#: server/stdinhand.c:1472
#, c-format
msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
msgstr "Väärtus: %d, miinimum: %d, vaikimisi %d, maksimum: %d"
-#: server/stdinhand.c:1578
+#: server/stdinhand.c:1478
#, c-format
msgid "Value: \"%s\", Default: \"%s\""
msgstr "Väärtus: \"%s\", vaikimisi \"%s\""
-#: server/stdinhand.c:1597
+#: server/stdinhand.c:1497
msgid "Explanations are available for the following server options:"
msgstr "Selgitused on saadaval järgnevatele serveri seadetele:"
-#: server/stdinhand.c:1643
+#: server/stdinhand.c:1537
msgid "No explanation for that yet."
msgstr "Sellele ei ole veel selgitust."
-#: server/stdinhand.c:1646 server/stdinhand.c:2480
+#: server/stdinhand.c:1540 server/stdinhand.c:2468
msgid "Ambiguous option name."
msgstr "Mitmesti mõistetav seade nimi."
-#: server/stdinhand.c:1666
+#: server/stdinhand.c:1560
#, c-format
msgid "Server Operator: %s"
msgstr "Serveri operaator: %s"
-#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
+#: server/stdinhand.c:1686 server/stdinhand.c:1713 server/stdinhand.c:1731
#, 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:1822
+#: server/stdinhand.c:1718
#, c-format
msgid "%s is not controlled by the AI."
msgstr "%s ei ole tehismõistuse juhitud."
-#: server/stdinhand.c:1842
+#: server/stdinhand.c:1738
#, c-format
msgid "Default AI skill level set to '%s'."
msgstr "Tehismõistuse vaikimisi mänguoskus '%s'."
-#: server/stdinhand.c:1857 server/stdinhand.c:2162
+#: server/stdinhand.c:1753
msgid "This command is client only."
msgstr "See käsk on ainult kliendile."
-#: server/stdinhand.c:1860
+#: server/stdinhand.c:1756
msgid "Usage: away"
msgstr "Kasutus: away"
-#: server/stdinhand.c:1865
+#: server/stdinhand.c:1761
msgid "Only players may use the away command."
msgstr "Ainult mängijad võivad away-käsku käivitada."
-#: server/stdinhand.c:1869
+#: server/stdinhand.c:1765
#, c-format
msgid "%s set to away mode."
msgstr "%s seatud eemalolekurežiimi."
-#: server/stdinhand.c:1877
+#: server/stdinhand.c:1772
#, c-format
msgid "%s returned to game."
msgstr "%s taasühines mänguga."
-#: server/stdinhand.c:1919
+#: server/stdinhand.c:1817
#, 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:1925
+#: server/stdinhand.c:1823
#, c-format
msgid "Unknown option '%s'."
msgstr "Tundmatu seade '%s'."
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1848
msgid "All options with non-default values"
msgstr "Kõik seaded mitte-vaikimisi väärtustega"
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1851
msgid "All options"
msgstr "Kõik seaded"
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1854
msgid "Vital options"
msgstr "Eluliselt tähtsad seaded"
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1857
msgid "Situational options"
msgstr "Mõnikord kasutatavad seaded"
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1860
msgid "Rarely used options"
msgstr "Harva kasutatavad seaded"
-#: server/stdinhand.c:1965
+#: server/stdinhand.c:1863
msgid "+ means you may change the option"
msgstr "+ tähendab, et sa võid muuta seda seadet"
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1864
msgid "= means the option is on its default value"
msgstr "= tähendab, et see seade on vaikimisi väärtusega"
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
#, c-format
msgid "%-*s value (min,max) "
msgstr "%-*s väärtus (min,max) "
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
msgid "Option"
msgstr "Seade"
-#: server/stdinhand.c:1973
+#: server/stdinhand.c:1871
msgid "description"
msgstr "kirjeldus"
-#: server/stdinhand.c:2042
+#: server/stdinhand.c:1940
msgid ""
"Try 'show situational' or 'show rare' to show more options.\n"
"Try 'show changed' to show settings with non-default values."
@@ -5882,77 +5895,149 @@ msgstr ""
"Proovi 'show situational' või 'show rare', näitamaks muid valikuid.\n"
"Proovi 'show changed', näitamaks muudetud seadeid."
-#: server/stdinhand.c:2092
+#: server/stdinhand.c:1966
msgid "Cannot change teams once game has begun."
msgstr "Ei saa muuta meeskondi peale mängu algust."
-#: server/stdinhand.c:2102
+#: server/stdinhand.c:1976
msgid "Undefined argument. Usage: team <player> <team>."
msgstr "Defineerimata argument. Kasutus: team <mängija> <meeskond>."
-#: server/stdinhand.c:2122
+#: server/stdinhand.c:1996
#, 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:2129
+#: server/stdinhand.c:2003
msgid "Cannot team a barbarian."
msgstr "Ei saa võtta meeskonda barbarit."
-#: server/stdinhand.c:2135
+#: server/stdinhand.c:2009
#, c-format
msgid "Player %s set to team %s."
msgstr "Mängija %s liidetud meeskonda %s."
-#: 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:2035 server/voting.c:512
+#, fuzzy
+msgid "Teamvote"
+msgstr "Meeskond"
-#: server/stdinhand.c:2165
-msgid "Observers cannot vote."
-msgstr "Vaatlejad ei saa hääletada."
+#: server/stdinhand.c:2035 server/voting.c:516
+msgid "Vote"
+msgstr ""
-#: server/stdinhand.c:2168
+#: server/stdinhand.c:2037
+#, c-format
msgid ""
-"You can only vote in a running game. Use 'first' to become the game "
-"organizer if there currently is none."
+"%s %d \"%s\" (needs %0.0f%%%s): %d for, %d against, and %d abstained out of %"
+"d players."
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:2181
-#, c-format
-msgid "Vote %d \"%s\": %d for, %d against"
-msgstr "Hääletus %d \"%s\": %d poolt, %d vastu"
+#: server/stdinhand.c:2041
+msgid " no dissent"
+msgstr ""
-#: server/stdinhand.c:2188
+#: server/stdinhand.c:2049
msgid "There are no votes going on."
msgstr "Hetkel pole ühtegi hääletust."
-#: server/stdinhand.c:2208
-msgid "No legal last vote."
+#: server/stdinhand.c:2077
+#, fuzzy
+msgid "Invalid arguments. Usage: vote yes|no|abstain [vote number]."
+msgstr "Defineerimata argumendid. Kasutus: vote yes|no [hääletuse nr]."
+
+#: server/stdinhand.c:2095 server/stdinhand.c:2213 server/stdinhand.c:3714
+msgid "You are not allowed to use this command."
+msgstr "Sul pole lubatud seda käsku kasutada."
+
+#: server/stdinhand.c:2104
+#, fuzzy, c-format
+msgid "The argument \"%s\" is ambigious."
+msgstr "Abi argument '%s' on mitmesti mõistetav."
+
+#: server/stdinhand.c:2119
+#, fuzzy
+msgid "There are no votes running."
+msgstr "Hetkel pole ühtegi hääletust."
+
+#: server/stdinhand.c:2121
+#, fuzzy, c-format
+msgid "No legal last vote (%d %s)."
msgstr "Pole kobedat viimast hääletust."
-#: server/stdinhand.c:2213
-msgid "Value must be integer."
+#: server/stdinhand.c:2122
+msgid "other vote running"
+msgid_plural "other votes running"
+msgstr[0] ""
+msgstr[1] ""
+
+#: server/stdinhand.c:2129 server/stdinhand.c:2491 server/stdinhand.c:2532
+msgid "Value must be an integer."
msgstr "Väärtus peab olema täisarv."
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2135 server/stdinhand.c:2221
#, c-format
msgid "No such vote (%d)."
msgstr "Pole sellist hääletust (%d)."
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2141
+#, fuzzy
+msgid "You are not allowed to vote on that."
+msgstr "Sa ei tohi seda seadet muuta."
+
+#: server/stdinhand.c:2146
#, c-format
msgid "You voted for \"%s\""
msgstr "Sa hääletasid \"%s\" kasuks"
-#: server/stdinhand.c:2232
+#: server/stdinhand.c:2150
#, c-format
msgid "You voted against \"%s\""
msgstr "Sa hääletasid \"%s\" vastu."
-#: server/stdinhand.c:2259
+#: server/stdinhand.c:2155
+#, c-format
+msgid "You abstained from voting on \"%s\""
+msgstr ""
+
+#: server/stdinhand.c:2190
+msgid "Missing argument <vote number> or the string \"all\"."
+msgstr ""
+
+#: server/stdinhand.c:2197
+#, fuzzy
+msgid "You don't have any vote going on."
+msgstr "Sul ei ole siin töölist."
+
+#: server/stdinhand.c:2204
+#, fuzzy
+msgid "There isn't any vote going on."
+msgstr "Hetkel pole ühtegi hääletust."
+
+#: server/stdinhand.c:2209
+msgid "Server: All votes have been removed."
+msgstr ""
+
+#: server/stdinhand.c:2226
+#, fuzzy, c-format
+msgid "You are not allowed to cancel this vote (%d)."
+msgstr "Sa ei tohi seda seadet muuta."
+
+#: server/stdinhand.c:2232
+msgid "Usage: /cancelvote [<vote number>|all]"
+msgstr ""
+
+#: server/stdinhand.c:2241
+#, c-format
+msgid "Server: %s cancelled the vote \"%s\" (number %d)."
+msgstr ""
+
+#: server/stdinhand.c:2247
+#, c-format
+msgid "Server: The vote \"%s\" (number %d) has been cancelled."
+msgstr ""
+
+#: server/stdinhand.c:2265
msgid ""
"Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
"<x> <y> | unit <id> | tech <player> | timing | info>."
@@ -5960,131 +6045,127 @@ msgstr ""
"Defineerimata argumendid. Kasutus: debug <diplomaatia <mängija> | city <x> "
"<y> | units <x> <y> | unit <id> | tech <mängija> | timing | info>."
-#: server/stdinhand.c:2265
+#: server/stdinhand.c:2271
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:2294
+#: server/stdinhand.c:2300
#, c-format
msgid "%s diplomacy no longer debugged"
msgstr "%s diplomaatiat ei debugita enam"
-#: server/stdinhand.c:2298
+#: server/stdinhand.c:2304
#, c-format
msgid "%s diplomacy debugged"
msgstr "%s diplomaatiat debugitakse"
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2323
#, c-format
msgid "%s tech no longer debugged"
msgstr "%s teadust ei debugita enam"
-#: server/stdinhand.c:2321
+#: server/stdinhand.c:2327
#, c-format
msgid "%s tech debugged"
msgstr "%s teadust debugitakse"
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2358 server/stdinhand.c:2388
msgid "Value 2 & 3 must be integer."
msgstr "Väärtus 2 & 3 peab olema täisarv"
-#: server/stdinhand.c:2356 server/stdinhand.c:2386
+#: server/stdinhand.c:2362 server/stdinhand.c:2392
msgid "Bad map coordinates."
msgstr "Vigased kaardi koordinaadid."
-#: server/stdinhand.c:2361
+#: server/stdinhand.c:2367
msgid "No city at this coordinate."
msgstr "Pole linna neil koordinaatidel."
-#: server/stdinhand.c:2366
+#: server/stdinhand.c:2372
#, c-format
msgid "%s no longer debugged"
msgstr "%s ei debugita enam."
-#: server/stdinhand.c:2392 server/stdinhand.c:2422
+#: server/stdinhand.c:2398 server/stdinhand.c:2428
#, fuzzy, c-format
msgid "%s %s no longer debugged."
msgstr "Rahva %s %s'i ei debugita enam."
-#: server/stdinhand.c:2397 server/stdinhand.c:2427
+#: server/stdinhand.c:2403 server/stdinhand.c:2433
#, fuzzy, c-format
msgid "%s %s debugged."
msgstr "Rahva %s %s'i debugitakse."
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2419
msgid "Value 2 must be integer."
msgstr "Väärtus 2 peab olema täisarv."
-#: server/stdinhand.c:2417
+#: server/stdinhand.c:2423
#, c-format
msgid "Unit %d does not exist."
msgstr "Ãœksus %d ei eksisteeri."
-#: server/stdinhand.c:2475
+#: server/stdinhand.c:2464
msgid "Undefined argument. Usage: set <option> <value>."
msgstr "Defineerimata argument. Kasutus: set <seade> <väärtus>."
-#: server/stdinhand.c:2485
+#: server/stdinhand.c:2473
msgid "You are not allowed to set this option."
msgstr "Sa ei tohi seda seadet muuta."
-#: server/stdinhand.c:2490 server/stdinhand.c:3463
+#: server/stdinhand.c:2478 server/stdinhand.c:3501
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:2502 server/stdinhand.c:2543
-msgid "Value must be an integer."
-msgstr "Väärtus peab olema täisarv."
-
-#: server/stdinhand.c:2512
+#: server/stdinhand.c:2501
#, 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:2519
+#: server/stdinhand.c:2508
msgid "Value out of range (minimum: 0, maximum: 1)."
msgstr "Väärtus lubatud vahemikust väljas (miinimum: 0, maksimum: 1)."
-#: server/stdinhand.c:2534 server/stdinhand.c:2576
+#: server/stdinhand.c:2523 server/stdinhand.c:2565
#, c-format
msgid "Option: %s has been set to %d."
msgstr "Seade: %s seati %d-ks."
-#: server/stdinhand.c:2554
+#: server/stdinhand.c:2543
#, 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:2561
+#: server/stdinhand.c:2550
#, 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:2586
+#: server/stdinhand.c:2575
msgid "String value too long. Usage: set <option> <value>."
msgstr "Stringi väärtus on liiga pikk. Kasutus: set <seade> <väärtus>."
-#: server/stdinhand.c:2600
+#: server/stdinhand.c:2589
#, c-format
msgid "Option: %s has been set to \"%s\"."
msgstr "Seade: %s seati \"%s\"."
-#: server/stdinhand.c:2658
+#: server/stdinhand.c:2652
msgid "Sorry, one can't observe globally in this game."
msgstr "Vabanda, selles mängus ei saa olla globaalne vaatleja."
-#: server/stdinhand.c:2661
+#: server/stdinhand.c:2655
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:2671
+#: server/stdinhand.c:2665
#, 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
+#: server/stdinhand.c:2673
#, c-format
msgid ""
"You cannot take a new player because the maximum of %d player has already "
@@ -6095,75 +6176,75 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: server/stdinhand.c:2691
+#: server/stdinhand.c:2685
msgid "You cannot take a new player because there are no free player slots."
msgstr ""
-#: server/stdinhand.c:2702
+#: server/stdinhand.c:2696
msgid "Sorry, one can't observe barbarians in this game."
msgstr "Vabanda, selles mängus ei saa vaadelda barbareid."
-#: server/stdinhand.c:2705
+#: server/stdinhand.c:2699
msgid "Sorry, one can't take barbarians in this game."
msgstr "Vabanda, selles mängus ei saa hakata barbariks."
-#: server/stdinhand.c:2713
+#: server/stdinhand.c:2707
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:2716
+#: server/stdinhand.c:2710
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:2724
+#: server/stdinhand.c:2718
msgid "Sorry, one can't observe AI players in this game."
msgstr "Vabanda, selles mängus ei saa vaadelda tehismõistusi."
-#: server/stdinhand.c:2727
+#: server/stdinhand.c:2721
msgid "Sorry, one can't take AI players in this game."
msgstr "Vabanda, selles mängijas ei saa hakata tehismõistuseks."
-#: server/stdinhand.c:2736
+#: server/stdinhand.c:2730
msgid "Sorry, one can't observe human players in this game."
msgstr "Vabanda, selles mängus ei saa vaadelda inimmängijaid."
-#: server/stdinhand.c:2739
+#: server/stdinhand.c:2733
msgid "Sorry, one can't take human players in this game."
msgstr "Vabanda, selles mängus ei saa hakata inimmängijaks."
-#: server/stdinhand.c:2749
+#: server/stdinhand.c:2743
msgid "Sorry, one can't observe in this game."
msgstr "Vabanda, seda mängu ei saa vaadelda."
-#: server/stdinhand.c:2754
+#: server/stdinhand.c:2748
msgid "Sorry, one can't take players in this game."
msgstr "Vabanda, selles mängus ei saa mängijaks hakata."
-#: server/stdinhand.c:2760
+#: server/stdinhand.c:2754
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:2791
+#: server/stdinhand.c:2785
msgid "Usage: observe [connection-name [player-name]]"
msgstr "Kasutus: observe [ühenduse nimi [mängija nimi]]"
-#: server/stdinhand.c:2797
+#: server/stdinhand.c:2791
msgid "Usage: observe [player-name]"
msgstr "Kasutus: observe [mängija nimi]"
-#: server/stdinhand.c:2847
+#: server/stdinhand.c:2841
#, c-format
msgid "%s already controls %s. Using 'observe' would remove %s"
msgstr "%s juba juhib %s. 'observe' kasutamine eemaldaks %s"
-#: server/stdinhand.c:2858
+#: server/stdinhand.c:2852
#, c-format
msgid "%s is already observing %s."
msgstr "%s juba vaatleb %s."
-#: server/stdinhand.c:2863
+#: server/stdinhand.c:2857
#, c-format
msgid "%s is already observing."
msgstr "%s juba vaatleb."
@@ -6178,236 +6259,241 @@ msgstr "%s vaatleb nüüd %s"
msgid "%s now observes"
msgstr "%s on nüüd pealtvaataja"
-#: server/stdinhand.c:2969
+#: server/stdinhand.c:2971
msgid "Usage: take <connection-name> <player-name>"
msgstr "Kasutamine: take <ühenduse-nimi> <mängija-nimi>"
-#: server/stdinhand.c:2974
+#: server/stdinhand.c:2976
msgid "Usage: take <player-name>"
msgstr "Kasutamine: take <mängija nimi>"
-#: server/stdinhand.c:2980
+#: server/stdinhand.c:2982
msgid "Usage: take [connection-name] <player-name>"
msgstr "Kasutus: take [ühenduse nimi] <mängija nimi>"
-#: server/stdinhand.c:3010
+#: server/stdinhand.c:3012
#, fuzzy, c-format
msgid "%s already controls %s."
msgstr "%s juba juhib %s"
-#: server/stdinhand.c:3024
+#: server/stdinhand.c:3026
#, fuzzy, c-format
msgid "There is no free player slot for %s."
msgstr "Mängijale %s pole vaba mängijakohta."
-#: server/stdinhand.c:3059
+#: server/stdinhand.c:3061
#, c-format
msgid "being detached from %s."
msgstr "ühendub lahti %s-st"
-#: server/stdinhand.c:3135
+#: server/stdinhand.c:3146
#, fuzzy, c-format
msgid "%s now controls %s (%s, %s)."
msgstr " %s juhib nüüd %s (%s, %s)"
-#: server/stdinhand.c:3139 server/stdinhand.c:4260
+#: server/stdinhand.c:3150 server/stdinhand.c:4308
#: data/nation/barbarian.ruleset:3
msgid "Barbarian"
msgstr "Barbar"
-#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
+#: server/stdinhand.c:3152 server/stdinhand.c:4310 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-sdl/plrdlg.c:645
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr "Tehisintellekt"
-#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-gtk-2.0/pages.c:2125
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
+#: server/stdinhand.c:3153 server/stdinhand.c:4312
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-gtk-2.0/pages.c:2127
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/connectdlg.c:215
msgid "Human"
msgstr "inimene"
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-gtk-2.0/pages.c:2124 client/gui-win32/connectdlg.c:200
-#: client/gui-win32/connectdlg.c:212
+#: server/stdinhand.c:3155 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-gtk-2.0/pages.c:2126 client/gui-win32/connectdlg.c:202
+#: client/gui-win32/connectdlg.c:214
msgid "Alive"
msgstr "Elus"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3156 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-win32/connectdlg.c:202
msgid "Dead"
msgstr "Surnud"
-#: server/stdinhand.c:3147
+#: server/stdinhand.c:3159
#, fuzzy, c-format
msgid "%s failed to attach to any player."
msgstr "%s ei ole ühendatud ühegi mängija külge."
-#: server/stdinhand.c:3182
+#: server/stdinhand.c:3194
msgid "Usage: detach <connection-name>"
msgstr "Kasutus: detach <ühenduse nimi>"
-#: server/stdinhand.c:3202
+#: server/stdinhand.c:3214
msgid "You can not detach other users."
msgstr "Sa ei saa teisi kasutajaid lahti ühendada."
-#: server/stdinhand.c:3211
+#: server/stdinhand.c:3223
#, c-format
msgid "%s is not attached to any player."
msgstr "%s ei ole ühendatud ühegi mängija külge."
-#: server/stdinhand.c:3234
+#: server/stdinhand.c:3246
#, c-format
msgid "%s detaching from %s"
msgstr "%s ühendub lahti %s-st"
-#: server/stdinhand.c:3240
+#: server/stdinhand.c:3252
#, c-format
msgid "%s no longer observing."
msgstr "%s ei jälgi enam."
-#: server/stdinhand.c:3259
+#: server/stdinhand.c:3271
#, c-format
msgid "detaching from %s."
msgstr "ühendun lahti %s-st."
-#: server/stdinhand.c:3345
+#: server/stdinhand.c:3361
msgid "Usage: load <game name>"
msgstr "Kasutamine: load <mängu nimi>"
-#: server/stdinhand.c:3350
+#: server/stdinhand.c:3366
msgid "Cannot load a game while another is running."
msgstr "Mängu ei saa laadida, teine juba käib."
-#: server/stdinhand.c:3372
+#: server/stdinhand.c:3388
#, c-format
msgid "Cannot find savegame or scenario with the name \"%s\"."
msgstr "Ei leia salvestust või stsenaariumi nimega \"%s\"."
-#: server/stdinhand.c:3389
+#: server/stdinhand.c:3405
#, c-format
msgid "Could not load savefile: %s"
msgstr "Ei suuda laadida salvestatud faili: %s"
-#: server/stdinhand.c:3458
+#: server/stdinhand.c:3496
#, c-format
msgid "Current ruleset directory is \"%s\""
msgstr "Praegune reeglistike kataloog on \"%s\""
-#: server/stdinhand.c:3478
+#: server/stdinhand.c:3516
#, c-format
msgid "Ruleset directory \"%s\" not found"
msgstr "Reeglistike kataloogi \"%s\" ei leitud"
-#: server/stdinhand.c:3484
+#: server/stdinhand.c:3522
#, c-format
msgid "Ruleset directory is already \"%s\""
msgstr "Reeglistike kataloog on juba \"%s\""
-#: server/stdinhand.c:3488
+#: server/stdinhand.c:3526
#, c-format
msgid "Ruleset directory set to \"%s\""
msgstr "Reeglistiku kataloog seatud väärtusele \"%s\""
-#: server/stdinhand.c:3536
+#: server/stdinhand.c:3574
msgid "Goodbye."
msgstr "Head aega."
-#: server/stdinhand.c:3567
+#: server/stdinhand.c:3606
msgid "Sorry, you are not allowed to use server commands."
msgstr "Vabanda, sa ei tohi serveri käske käivitada."
-#: server/stdinhand.c:3603
+#: server/stdinhand.c:3656
#, 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:3608
+#: server/stdinhand.c:3661
#, c-format
msgid "Unknown command. Try '%shelp'."
msgstr "Tundmatu käsk. Vaata '%shelp'"
-#: server/stdinhand.c:3625
-msgid "Your new vote canceled your previous vote."
+#: server/stdinhand.c:3675
+#, fuzzy
+msgid "Your new vote cancelled your previous vote."
msgstr "Sinu uus hääletus anulleeris su eelmise hääletuse."
-#: server/stdinhand.c:3633
-#, c-format
-msgid "New vote (number %d) by %s: %s."
+#: server/stdinhand.c:3688
+msgid "New teamvote"
+msgstr ""
+
+#: server/stdinhand.c:3691
+msgid "New vote"
+msgstr ""
+
+#: server/stdinhand.c:3695
+#, fuzzy, c-format
+msgid "%s (number %d) by %s: %s"
msgstr "Uus hääletus (number %d) mängijalt %s: %s."
-#: server/stdinhand.c:3645
+#: server/stdinhand.c:3704
#, 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:3655
-msgid "You are not allowed to use this command."
-msgstr "Sul pole lubatud seda käsku kasutada."
-
-#: server/stdinhand.c:3680
+#: server/stdinhand.c:3726
msgid "(server prompt)"
msgstr "(serveri käsurida)"
-#: server/stdinhand.c:3787
+#: server/stdinhand.c:3835
msgid "Game ended in a draw."
msgstr "Mäng lõppes viigiga."
-#: server/stdinhand.c:3791
+#: server/stdinhand.c:3839
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:3796
+#: server/stdinhand.c:3844
msgid "Cannot end the game: no game running."
msgstr "Mängu ei saa lõpetada, mäng ei käi."
-#: server/stdinhand.c:3812
+#: server/stdinhand.c:3860
#, 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:3817
+#: server/stdinhand.c:3865
msgid "You cannot surrender now."
msgstr "Sa ei saa praegu alla anda."
-#: server/stdinhand.c:3883
+#: server/stdinhand.c:3931
#, fuzzy
msgid "Not enough human players, game will not start."
msgstr "Pole piisavalt mängijaid, mäng ei alga."
-#: server/stdinhand.c:3888
+#: server/stdinhand.c:3936
#, fuzzy
msgid "No players, game will not start."
msgstr "Pole piisavalt mängijaid, mäng ei alga."
-#: server/stdinhand.c:3892
+#: server/stdinhand.c:3940
#, fuzzy
msgid "Not enough nations for all players, game will not start."
msgstr "Pole piisavalt mängijaid, mäng ei alga."
-#: server/stdinhand.c:3901
+#: server/stdinhand.c:3949
msgid "All players are ready; starting game."
msgstr "Kõik mängijad on valmis. Mäng algab."
-#: server/stdinhand.c:3915
+#: server/stdinhand.c:3963
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:3922
+#: server/stdinhand.c:3970
msgid "Cannot start the game: it is already running."
msgstr "Mängu ei saa alustada, see juba käib."
-#: server/stdinhand.c:3953
+#: server/stdinhand.c:4001
#, c-format
msgid "Cutting connection %s."
msgstr "Lõikas %s ühenduse."
-#: server/stdinhand.c:3972
+#: server/stdinhand.c:4020
msgid ""
"Welcome - this is the introductory help text for the Freeciv server.\n"
"\n"
@@ -6445,123 +6531,123 @@ msgstr ""
" save - praeguse mängu salvestamiseks\n"
" quit - väljumiseks"
-#: server/stdinhand.c:4007 server/stdinhand.c:4010
+#: server/stdinhand.c:4055 server/stdinhand.c:4058
msgid "Command:"
msgstr "Käsk:"
-#: server/stdinhand.c:4014
+#: server/stdinhand.c:4062
msgid "Synopsis: "
msgstr "Kokkuvõte:"
-#: server/stdinhand.c:4023
+#: server/stdinhand.c:4071
#, c-format
msgid "Level: %s"
msgstr "Tase: %s"
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4096
msgid "The following server commands are available:"
msgstr "Järgmised serveri käsud on saadaval:"
-#: server/stdinhand.c:4123
+#: server/stdinhand.c:4171
#, c-format
msgid "Help argument '%s' is ambiguous."
msgstr "Abi argument '%s' on mitmesti mõistetav."
-#: server/stdinhand.c:4128
+#: server/stdinhand.c:4176
#, c-format
msgid "No match for help argument '%s'."
msgstr "Pole vasteid abi argumendile '%s'."
-#: server/stdinhand.c:4194
+#: server/stdinhand.c:4242
#, c-format
msgid "Bad list argument: '%s'. Try '%shelp list'."
msgstr "Halb listi argument: '%s'. Vaata '%shelp list'."
-#: server/stdinhand.c:4234
+#: server/stdinhand.c:4282
msgid "List of players:"
msgstr "Mängijate nimekiri:"
-#: server/stdinhand.c:4239
+#: server/stdinhand.c:4287
msgid "<no players>"
msgstr "<mängijaid ei ole>"
-#: server/stdinhand.c:4256
+#: server/stdinhand.c:4304
#, c-format
msgid "user %s, "
msgstr "kasutajanimi %s, "
-#: server/stdinhand.c:4267
+#: server/stdinhand.c:4315
msgid ", Dead"
msgstr ", Surnud"
-#: server/stdinhand.c:4270
+#: server/stdinhand.c:4318
#, c-format
msgid ", difficulty level %s"
msgstr ", raskusaste %s"
#. TRANS: continue list, in case comma is not the separator of choice.
-#: server/stdinhand.c:4275 server/stdinhand.c:4279 client/helpdata.c:257
-#: client/helpdata.c:752 client/text.c:241 client/text.c:1224
-#: client/text.c:1262
+#: server/stdinhand.c:4323 server/stdinhand.c:4327 client/helpdata.c:257
+#: client/helpdata.c:752 client/text.c:241 client/text.c:1229
+#: client/text.c:1267
#, c-format
msgid "?clistmore:, %s"
msgstr ", %s"
-#: server/stdinhand.c:4283
+#: server/stdinhand.c:4331
msgid ", ready"
msgstr ", valmis"
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4333
msgid ", not ready"
msgstr ", pole valmis"
-#: server/stdinhand.c:4293
+#: server/stdinhand.c:4341
#, c-format
msgid " %d connection:"
msgid_plural " %d connections:"
msgstr[0] " %d ühendus:"
msgstr[1] " %d ühendust:"
-#: server/stdinhand.c:4299
+#: server/stdinhand.c:4347
#, c-format
msgid " %s from %s (command access level %s), bufsize=%dkb"
msgstr " %s %s-ist (käsutase %s), puhver=%dkb"
-#: server/stdinhand.c:4304
+#: server/stdinhand.c:4352
msgid " (observer mode)"
msgstr " (vaatlejarežiim)"
-#: server/stdinhand.c:4322
+#: server/stdinhand.c:4370
msgid "List of teams:"
msgstr "Meeskondade nimekiri:"
#. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4332
+#: server/stdinhand.c:4380
#, 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:4352
+#: server/stdinhand.c:4400
#, c-format
msgid "%2d : '%s' : 1 player : %s"
msgstr "%2d : '%s' : 1 mängija : %s"
-#: server/stdinhand.c:4360
+#: server/stdinhand.c:4408
#, c-format
msgid "Empty team: %s"
msgstr "Tühi meeskond: %s"
-#: server/stdinhand.c:4371
+#: server/stdinhand.c:4419
msgid "List of connections to server:"
msgstr "Nimekiri ühendustest serverisse:"
-#: server/stdinhand.c:4375
+#: server/stdinhand.c:4423
msgid "<no connections>"
msgstr "<ühendusi ei ole>"
-#: server/stdinhand.c:4399
+#: server/stdinhand.c:4447
msgid "List of scenarios available:"
msgstr "Nimekiri saadaolevatest stsenaariumidest:"
@@ -6580,7 +6666,7 @@ msgstr "%s on avastanud Tuleviku Tehnoloogia %d."
msgid "%s acquired from %s!"
msgstr "Said %s %s-telt."
-#: server/techtools.c:220
+#: server/techtools.c:221
#, c-format
msgid ""
"Discovery of %s makes the government form %s available. You may want to "
@@ -6589,38 +6675,38 @@ msgstr ""
"Teaduse %s avastamine võimaldab valida valitsusvormi %s. Võid tahta alustada "
"revolutsiooni."
-#: server/techtools.c:301
+#: server/techtools.c:302
#, c-format
msgid "Discovery of %s OBSOLETES %s in %s!"
msgstr "Teaduse %s avastamine IGANDAB %s linnas %s!"
-#: server/techtools.c:351
+#: server/techtools.c:352
#, c-format
msgid "Learned %s. Our scientists focus on %s; goal is %s."
msgstr ""
"%s selgeks saadud. Teadlased fokuseerivad tehnoloogiale %s, sihtmärk on %s."
-#: server/techtools.c:369
+#: server/techtools.c:370
#, c-format
msgid "Learned %s. Scientists choose to research %s."
msgstr "%s selgeks saadud. Teadlased valivad uurimiseks %s."
-#: server/techtools.c:376
+#: server/techtools.c:377
#, c-format
msgid "Learned %s. "
msgstr "%s selgeks saadud."
-#: server/techtools.c:379
+#: server/techtools.c:380
#, c-format
msgid "Researching %s."
msgstr "Uuritakse %s."
-#: server/techtools.c:385
+#: server/techtools.c:386
#, c-format
msgid "Learned %s. Scientists do not know what to research next."
msgstr "%s selgeks saadud. Teadlased ei tea, mida edasi uurida."
-#: server/techtools.c:402
+#: server/techtools.c:403
msgid ""
"Great scientists from all the world join your civilization: you get an "
"immediate advance."
@@ -6628,22 +6714,22 @@ msgstr ""
"Suured teadlased üle kogu maa ühinevad sinu tsivilisatsiooniga ja saad kohe "
"uue tehnoloogia."
-#: server/techtools.c:570
+#: server/techtools.c:571
#, c-format
msgid "Technology goal is %s."
msgstr "Tehnoloogiline eesmärk on %s."
-#: server/techtools.c:700
+#: server/techtools.c:708
#, c-format
msgid "You steal %s from the %s."
msgstr "Varastad %s %s-telt."
-#: server/techtools.c:705
+#: server/techtools.c:713
#, c-format
msgid "The %s stole %s from you!"
msgstr "%s varastasid sult %s!"
-#: server/techtools.c:710
+#: server/techtools.c:718
#, c-format
msgid "The %s have stolen %s from the %s."
msgstr "%s varastasid tehnoloogia %s rahvuselt %s."
@@ -6667,177 +6753,183 @@ msgstr "Ühtki üksust ei saanud uuendada."
msgid "%s upgraded to %s for %d gold."
msgstr "%s uuendatud üksuseks %s %d raha eest."
-#: server/unithand.c:396
+#: server/unithand.c:402
#, c-format
msgid "%s refuses to disband!"
msgstr "Ãœksus %s keeldub laiali minemast!"
-#: server/unithand.c:449
+#: server/unithand.c:455
msgid "Can't place city here."
msgstr "Siia ei saa linna rajada."
-#: server/unithand.c:456
+#: server/unithand.c:462
#, c-format
msgid "Only %s can build a city."
msgstr "Ainult %s saab rajada linna."
-#: server/unithand.c:461
+#: server/unithand.c:467
msgid "Can't build a city."
msgstr "Linna ei saa rajada."
-#: server/unithand.c:470
+#: server/unithand.c:476
#, c-format
msgid "Only %s can add to a city."
msgstr "Ainult %s saab linnale lisanduda."
-#: server/unithand.c:475
+#: server/unithand.c:481
msgid "Can't add to a city."
msgstr "Ei saa linnale lisanduda."
-#: server/unithand.c:481
+#: server/unithand.c:487
#, c-format
msgid "%s unit has no moves left to add to %s."
msgstr "Üksusel %s pole käike, mida üle anda üksusele %s."
-#: server/unithand.c:487
+#: server/unithand.c:493
#, c-format
msgid "%s unit has no moves left to build city."
msgstr "Üksusel %s pole käike linna asutamiseks."
-#: server/unithand.c:492
+#. TRANS: <city> is owned by <nation>, cannot add <unit>.
+#: server/unithand.c:499
+#, fuzzy, c-format
+msgid "%s is owned by %s, cannot add %s."
+msgstr "%s on liiga suur, et lisada %s."
+
+#: server/unithand.c:506
#, c-format
msgid "%s is too big to add %s."
msgstr "%s on liiga suur, et lisada %s."
-#: server/unithand.c:498
+#: server/unithand.c:512
#, c-format
msgid "%s needs an improvement to grow, so you cannot add %s."
msgstr "%s vajab ehitist kasvamiseks, seega sa ei saa lisada sinna %s."
-#: server/unithand.c:509
+#: server/unithand.c:523
#, c-format
msgid "Can't add %s to %s."
msgstr "Ei saa lisada üksust %s linnale %s."
-#: server/unithand.c:531
+#: server/unithand.c:545
#, c-format
msgid "%s added to aid %s in growing."
msgstr "%s lisatud aitamaks linnal %s kasvada."
-#: server/unithand.c:828
+#: server/unithand.c:842
msgid "Your Nuclear missile was shot down by SDI defences, what a waste."
msgstr "SDI kaitse lasi su tuumapommi alla. Milline raiskamine."
-#: server/unithand.c:831
+#: server/unithand.c:845
#, c-format
msgid "The nuclear attack on %s was avoided by your SDI defense."
msgstr "Tuumarünnak linnale %s hoiti ära su SDI kaitse poolt."
#. TRANS: "Your Cannon ... the Polish Destroyer."
-#: server/unithand.c:901
+#: server/unithand.c:915
#, fuzzy, c-format
msgid "Your %s survived the pathetic attack from the %s %s."
msgstr "Su %s lõi tagasi %s üksuse %s rünnaku."
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unithand.c:910
+#: server/unithand.c:924
#, fuzzy, c-format
msgid "Your attacking %s failed against the %s %s!"
msgstr "Su ründav üksus %s sai lüüa %s üksuselt %s!"
-#: server/unithand.c:983
+#: server/unithand.c:997
#, c-format
msgid "Only %s can attack from sea."
msgstr "Ainult %s suudab merelt rünnata."
-#: server/unithand.c:988
+#: server/unithand.c:1002
msgid "Cannot attack from sea."
msgstr "Merelt ei saa rünnata."
-#: server/unithand.c:996 server/unittools.c:2137
+#: server/unithand.c:1010 server/unittools.c:2142
msgid "Cannot attack unless you declare war first."
msgstr "Rünnata ei saa, selleks peab enne sõja kuulutama."
-#: server/unithand.c:1001
+#: server/unithand.c:1015
#, c-format
msgid "%s can only move into your own zone of control."
msgstr "%s võib liikuda ainult oma kontrolltsoonis."
-#: server/unithand.c:1007
+#: server/unithand.c:1021
#, fuzzy, c-format
msgid "Cannot invade unless you break peace with %s first."
msgstr "Ei saa territooriumile tungida, peab enne sõja kuulutama %s-tele."
-#: server/unithand.c:1052
+#: server/unithand.c:1066
msgid "This unit has no moves left."
msgstr "Üksusel on käigud otsas."
-#: server/unithand.c:1107
+#: server/unithand.c:1121
msgid "Unit must be on land to perform diplomatic action."
msgstr "Ãœksus peab asuma maapinnal, et diplomaatiaga tegeleda."
-#: server/unithand.c:1109
+#: server/unithand.c:1123
msgid "No diplomat action possible."
msgstr "Diplomaatiat ei saa teha."
-#: server/unithand.c:1125
+#: server/unithand.c:1139
#, c-format
msgid "You must declare war on %s first. Try using players dialog (F3)."
msgstr "Sa pead rahvusele %s enne sõja kuulutama. Vaata mängijate akent (F3)."
-#: server/unithand.c:1143
+#: server/unithand.c:1157
msgid "This unit is being transported, and so cannot bombard."
msgstr "Seda üksust transporditakse, seega ta ei saa pommitada."
-#: server/unithand.c:1158
+#: server/unithand.c:1172
msgid "You can't attack there."
msgstr "Sinna ei saa rünnata."
-#: server/unithand.c:1180
+#: server/unithand.c:1194
msgid "This type of troops cannot take over a city."
msgstr "Seda tüüpi väed ei saa linna üle võtta."
-#: server/unithand.c:1198
+#: server/unithand.c:1212
msgid "A transported unit is not allied to all units or city on target tile."
msgstr "Transporditav üksus pole liidus kõigi teiste üksustega sihtruudul."
-#: server/unithand.c:1240
+#: server/unithand.c:1254
#, c-format
msgid "Your %s helps build the %s in %s (%d remaining)."
msgstr "Su %s aitab ehitada ilmaimet %s linnas %s (%d veel)."
-#: server/unithand.c:1242
+#: server/unithand.c:1256
#, c-format
msgid "Your %s helps build the %s in %s (%d surplus)."
msgstr "Su %s aitab ehitada ilmaimet %s linnas %s (%d jäi üle)."
-#: server/unithand.c:1286
+#: server/unithand.c:1300
#, c-format
msgid ""
"Sorry, your %s cannot establish a trade route because it has no home city"
msgstr "Kahjuks ei saa sinu %s luua kaubateed, kuna üksusel puudub kodulinn"
-#: server/unithand.c:1296
+#: server/unithand.c:1310
#, c-format
msgid "Sorry, your %s cannot establish a trade route between %s and %s"
msgstr "Kahjuks ei saa su %s luua kaubateed linnade %s ja %s vahel"
-#: server/unithand.c:1325 server/unithand.c:1344
+#: server/unithand.c:1339 server/unithand.c:1358
#, c-format
msgid "Sorry, your %s cannot establish a trade route here!"
msgstr "Kahjuks ei saa sinu %s siia kaubateed luua."
-#: server/unithand.c:1329 server/unithand.c:1348
+#: server/unithand.c:1343 server/unithand.c:1362
#, c-format
msgid " The city of %s already has %d better trade routes!"
msgstr "Linnal %s on juba %d paremat kaubateed olemas!"
-#: server/unithand.c:1361 server/unithand.c:1373
+#: server/unithand.c:1375 server/unithand.c:1387
#, c-format
msgid "Sorry, %s has canceled the trade route from %s to your city %s."
msgstr "Kahjuks katkestas %s kaubatee linnast %s sinu linna %s."
-#: server/unithand.c:1406
+#: server/unithand.c:1420
#, c-format
msgid ""
"Your %s from %s has arrived in %s, and revenues amount to %d in gold and "
@@ -6897,56 +6989,56 @@ msgid "Teleported your %s to %s."
msgstr "Sinu %s teleporditi linna %s."
#. TRANS: A unit is moved to resolve stack conflicts.
-#: server/unittools.c:1065
+#: server/unittools.c:1070
#, c-format
msgid "Moved your %s."
msgstr "Sinu üksust %s nihutati."
-#: server/unittools.c:1076
+#: server/unittools.c:1081
#, c-format
msgid "Disbanded your %s."
msgstr "Sinu %s saadeti laiali."
-#: server/unittools.c:1397
+#: server/unittools.c:1402
#, c-format
msgid "Unable to defend %s, %s has lost the game."
msgstr "Kuna %s kaitsmine ei õnnestunud, siis kaotas %s mängu."
-#: server/unittools.c:1401
+#: server/unittools.c:1406
#, c-format
msgid "Losing %s meant losing the game! Be more careful next time!"
msgstr ""
"Kuna kaotasid %s, siis kaotasid ka kogu mängu! Ole järgmine kord hoolikam!"
-#: server/unittools.c:1503
+#: server/unittools.c:1508
#, c-format
msgid "%s escaped the destruction of %s, and fled to %s."
msgstr "Üksus %s pääses üksuse %s hävitamisest ja põgenes linna %s."
-#: server/unittools.c:1512
+#: server/unittools.c:1517
#, c-format
msgid "%s lost when %s was lost."
msgstr "Üksus %s kaotati koos üksusega %s."
-#: server/unittools.c:1561
+#: server/unittools.c:1566
#, c-format
msgid "Barbarian leader captured, %d gold ransom paid."
msgstr "Barbarite juht vangistatud, maksti lunaraha %d raha."
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unittools.c:1579
+#: server/unittools.c:1584
#, c-format
msgid "Your attacking %s succeeded against the %s %s!"
msgstr "Sinu ründav üksus %s võitis lahingu rahva %s üksuse %s vastu!"
#. TRANS: "Cannon ... the Polish Destroyer."
-#: server/unittools.c:1588 server/unittools.c:1646
+#: server/unittools.c:1593 server/unittools.c:1651
#, c-format
msgid "%s lost to an attack by the %s %s."
msgstr "Üksus %s kaotati rahva %s rünnakus üksusega %s."
#. TRANS: "... Cannon ... the Polish Destroyer ...."
-#: server/unittools.c:1622
+#: server/unittools.c:1627
#, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -6956,14 +7048,14 @@ msgstr[1] ""
#. TRANS: "Cannon lost when the Polish Destroyer
#. * attacked the German Musketeers."
-#: server/unittools.c:1655
+#: server/unittools.c:1660
#, c-format
msgid "%s lost when the %s %s attacked the %s %s."
msgstr "Kaotati üksus %s, kui rahva %s üksus %s ründas rahva %s üksust %s."
#. TRANS: "Musketeers (and Cannon) lost to an
#. * attack from the Polish Destroyer."
-#: server/unittools.c:1670
+#: server/unittools.c:1675
#, c-format
msgid "%s (and %s) lost to an attack from the %s %s."
msgstr "Ükss %s (ja üksus%s) kaotati rahva %s üksuse %s rünnakus."
@@ -6971,7 +7063,7 @@ msgstr "Ükss %s (ja üksus%s) kaotati rahva %s üksuse %s rünnakus."
#. TRANS: "Musketeers and 3 other units lost to
#. * an attack from the Polish Destroyer."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1680
+#: server/unittools.c:1685
#, 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."
@@ -6981,178 +7073,221 @@ msgstr[1] ""
#. TRANS: "2 units lost when the Polish Destroyer
#. * attacked the German Musketeers."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1694
+#: server/unittools.c:1699
#, fuzzy, 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] "Kaotasime %d üksuse, kui %s-ide %s ründas %s-ide %s."
msgstr[1] "Kaotasime %d üksust, kui %s-ide %s ründas %s-ide %s."
-#: server/unittools.c:1962
+#: server/unittools.c:1967
#, c-format
msgid "Your %s was nuked by %s."
msgstr "Sinu linn %s sai pihta %s tuumapommiga."
-#: server/unittools.c:1965 server/unittools.c:1981
+#: server/unittools.c:1970 server/unittools.c:1986
msgid "yourself"
msgstr "iseennast"
-#: server/unittools.c:1969
+#: server/unittools.c:1974
#, fuzzy, c-format
msgid "The %s %s was nuked."
msgstr "Mängija %s %s sai tuumapommiga pihta."
-#: server/unittools.c:1978
+#: server/unittools.c:1983
#, c-format
msgid "%s was nuked by %s."
msgstr "%s sai pihta %s tuumapommiga."
-#: server/unittools.c:1986
+#: server/unittools.c:1991
#, c-format
msgid "You nuked %s."
msgstr "Sa lasid %s tuumapommiga õhku."
-#: server/unittools.c:2027
+#: server/unittools.c:2032
#, fuzzy, c-format
msgid "The %s detonated a nuke!"
msgstr "Rahvus %s lasi tuumapommi õhku!"
-#: server/unittools.c:2051
+#: server/unittools.c:2056
#, c-format
msgid "%s transported successfully."
msgstr "%s edukalt transporditud."
-#: server/unittools.c:2103
+#: server/unittools.c:2108
msgid "This unit type can not be paradropped."
msgstr "Seda tüüpi üksust ei saa langevarjutada."
-#: server/unittools.c:2113
+#: server/unittools.c:2118
msgid "You cannot paradrop a unit that is transporting other units."
msgstr "Ei saa langevarjutada üksust, mis transpordib teisi üksusi."
-#: server/unittools.c:2119
+#: server/unittools.c:2124
msgid "The destination location is not known."
msgstr "Sihtkoht on tundmatu."
-#: server/unittools.c:2126
+#: server/unittools.c:2131
#, c-format
msgid "This unit cannot paradrop into %s."
msgstr "Seda üksus ei saa langevarjutada linna %s."
-#: server/unittools.c:2146
+#: server/unittools.c:2151
#, c-format
msgid "The distance to the target (%i) is greater than the unit's range (%i)."
msgstr "Kaugus sihtmärgini (%i) on suurem, kui üksuse laskeulatus (%i)."
-#: server/unittools.c:2157
+#: server/unittools.c:2162
#, c-format
msgid "Your %s paradropped into the %s and was lost."
msgstr "Su üksus %s langevarjutati linna %s ja kaotati."
-#: server/unittools.c:2170
+#: server/unittools.c:2175
#, c-format
msgid "Your %s was killed by enemy units at the paradrop destination."
msgstr "Su üksus %s tapeti vaenlase poolt langevarjutamise sihtkohas."
-#: server/unittools.c:2192
+#: server/unittools.c:2197
#, c-format
msgid "You found %d gold."
msgstr "Sa leidsid %d raha."
-#: server/unittools.c:2209
+#: server/unittools.c:2214
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr "Sa leidsid tehnoloogia %s iidsetest tarkuserullidest."
-#: server/unittools.c:2216
+#: server/unittools.c:2221
#, c-format
msgid "The %s have acquired %s from ancient scrolls of wisdom."
msgstr "%s leidsid tehnoloogia %s iidsetest tarkuserullidest."
-#: server/unittools.c:2230
+#: server/unittools.c:2235
msgid "A band of friendly mercenaries joins your cause."
msgstr "Jõuk sõbralikke kõrilõikajad liituvad su vägedega."
-#: server/unittools.c:2248
+#: server/unittools.c:2253
msgid "An abandoned village is here."
msgstr "Siin on mahajäetud küla."
-#: server/unittools.c:2258
+#: server/unittools.c:2263
msgid "You have unleashed a horde of barbarians!"
msgstr "Sa vallandasid barbarite hordi viha!"
-#: server/unittools.c:2261
+#: server/unittools.c:2266
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr "Barbarid lõikasid su üksuse %s kõri!"
-#: server/unittools.c:2277
+#: server/unittools.c:2282
msgid "You found a friendly city."
msgstr "Sa leidsid sõbraliku linna."
-#: server/unittools.c:2291
+#: server/unittools.c:2296
msgid "Friendly nomads are impressed by you, and join you."
msgstr "Sa vaimustasid sõbralikke nomaade, nad ühinevad sinuga."
-#: server/unittools.c:2316
+#: server/unittools.c:2321
msgid "Your overflight frightens the tribe; they scatter in terror."
msgstr "Su ülelend ehmatab hõimu, nad jooksevad paanikas laiali."
-#: server/unittools.c:2574
+#: server/unittools.c:2579
#, c-format
msgid "Orders for %s aborted after enemy movement was spotted."
msgstr "Käsk üksusele %s katkestatud, kuna märgati vaenlase liikumist."
-#: server/unittools.c:3023
+#: server/unittools.c:3028
#, c-format
msgid "Orders for %s aborted as there are units nearby."
msgstr "Käsk üksusele %s katkestatud, kuna läheduses on vastaste mehed."
-#: server/unittools.c:3075
+#: server/unittools.c:3080
#, c-format
msgid "Orders for %s aborted because building of city failed."
msgstr "Käsk üksusele %s katkestatud, kuna linna ehitamine ebaõnnestus."
-#: server/unittools.c:3088
+#: server/unittools.c:3093
#, c-format
msgid "Orders for %s aborted since they give an invalid activity."
msgstr "Käsk üksusele %s katkestatud, kuna seesugust tegevust ei saa teha."
-#: server/unittools.c:3102
+#: server/unittools.c:3107
#, c-format
msgid "Orders for %s aborted since they give an invalid location."
msgstr "Käsk üksusele %s katkestatud, kuna anti ette vigane asukoht."
-#: server/unittools.c:3112
+#: server/unittools.c:3117
#, c-format
msgid "Orders for %s aborted as there are units in the way."
msgstr "Käsk üksusele %s katkestatud, kuna teised üksused on tee peal ees."
-#: server/unittools.c:3138
+#: server/unittools.c:3143
#, c-format
msgid "Orders for %s aborted because of failed move."
msgstr "Käsk üksusele %s katkestatud, kuna ei õnnestunud liikuda."
-#: server/unittools.c:3179
+#: server/unittools.c:3184
#, c-format
msgid "Attempt to change homecity for %s failed."
msgstr "Katse muuta %s kodulinna ei õnnestunud."
-#: server/unittools.c:3190
+#: server/unittools.c:3195
#, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr "Katse luua kaubatee linna %s ei õnnestunud."
-#: server/unittools.c:3202
+#: server/unittools.c:3207
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr "Katse ehitada ilmaime linna %s ei õnnestunud."
-#: server/unittools.c:3211
+#: server/unittools.c:3216
#, c-format
msgid "Your %s has invalid orders."
msgstr "Su üksusel %s on vigased käsud."
+#: server/voting.c:522
+#, fuzzy, c-format
+msgid ""
+"%s %d \"%s\" is passed %d to %d with %d abstentions and %d who did not vote."
+msgstr "Hääletus \"%s\" läks läbi häältega %d %d vastu, %d jätsid hääletamata."
+
+#: server/voting.c:528
+#, fuzzy, c-format
+msgid ""
+"%s %d \"%s\" failed with %d against, %d for, %d abstentions and %d who did "
+"not vote."
+msgstr ""
+"Hääletus \"%s\" lükati tagasi häältega %d %d vastu, %d jätsid hääletamata."
+
+#: server/voting.c:548
+#, c-format
+msgid "%s %d: %s voted yes."
+msgstr ""
+
+#: server/voting.c:553
+#, c-format
+msgid "%s %d: %s voted no."
+msgstr ""
+
+#: server/voting.c:558
+#, c-format
+msgid "%s %d: %s chose to abstain."
+msgstr ""
+
+#. TRANS: Describing a new vote that can only pass
+#. * if there are no dissenting votes.
+#: server/voting.c:726
+#, c-format
+msgid "%s (needs %0.0f%% and no dissent)."
+msgstr ""
+
+#. TRANS: Describing a new vote that can pass only if the
+#. * given percentage of players votes 'yes'.
+#: server/voting.c:732
+#, c-format
+msgid "%s (needs %0.0f%% in favor)."
+msgstr ""
+
#: server/generator/mapgen.c:1771
msgid "High landmass - this may take a few seconds."
msgstr "Massiivne maa - see võib võtta mõni sekund."
@@ -7184,12 +7319,12 @@ msgstr ""
"Võimalik, et mängijate arv on selle kaardi jaoks liiga suur,\n"
"Palun anna sellest veast teada aadressil %s."
-#: client/attribute.c:363
+#: client/attribute.c:368
msgid ""
"There has been a CMA error. Your citizen governor settings may be broken."
msgstr "Juhtus linnapea viga: Su linnapea seaded võivad olla vigased."
-#: client/attribute.c:367
+#: client/attribute.c:372
msgid "Old attributes detected and removed."
msgstr "Leitud ja eemaldatud vanad atribuudid."
@@ -7336,41 +7471,41 @@ msgstr "%+4d : Kodanikud\n"
msgid "%+4d : Taxed from trade\n"
msgstr "%+4d : Maksud kaubandusest\n"
-#: client/citydlg_common.c:418
+#: client/citydlg_common.c:421
#, c-format
msgid "%+4d : Trade route with %s\n"
msgstr "%+4d : Kaubatee linnaga %s\n"
-#: client/citydlg_common.c:427
+#: client/citydlg_common.c:430
#, c-format
msgid "%+4d : Building tithes\n"
msgstr ""
-#: client/citydlg_common.c:450
+#: client/citydlg_common.c:453
#, c-format
msgid "%+4d : Bonus from %s (%+d%%)\n"
msgstr ""
-#: client/citydlg_common.c:462
+#: client/citydlg_common.c:465
#, c-format
msgid "%+4d : Waste\n"
msgstr "%+4d : Saast\n"
-#: client/citydlg_common.c:468
+#: client/citydlg_common.c:471
#, c-format
msgid "%+4d : Disorder\n"
msgstr "%+4d : Rahutused\n"
-#: client/citydlg_common.c:474
+#: client/citydlg_common.c:477
#, c-format
msgid "%+4d : Used\n"
msgstr "%+4d : Kasutatud\n"
-#: client/citydlg_common.c:479
+#: client/citydlg_common.c:482
msgid "==== : Adds up to\n"
msgstr "====: Kokku\n"
-#: client/citydlg_common.c:481
+#: client/citydlg_common.c:484
#, c-format
msgid "%4d : Total surplus"
msgstr "%4d : Kogu ülejääk"
@@ -7679,54 +7814,54 @@ msgstr "?specialist:S"
msgid "Specialists"
msgstr "Spetsialistid"
-#: client/civclient.c:240
+#: client/civclient.c:241
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr " -a, --autoconnect\tÄra näita ühendumisdialoogi\n"
-#: client/civclient.c:250
+#: client/civclient.c:251
msgid " -l, --log FILE\tUse FILE as logfile (spawned server also uses this)\n"
msgstr ""
" -l, --log FILE\tKasuta FILE logimiseks (lokaalne server kasutab ka seda)\n"
-#: client/civclient.c:252
+#: client/civclient.c:253
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr " -m, --meta AADRESS\tÃœhenda metaserveriga aadressil AADRESS\n"
-#: client/civclient.c:254
+#: client/civclient.c:255
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr " -n, --name NIMI\tKasuta NIME oma nimena\n"
-#: client/civclient.c:256
+#: client/civclient.c:257
msgid " -p, --port PORT\tConnect to server port PORT (usually with -a)\n"
msgstr ""
" -p, --port PORT\tÃœhendu serveri porti PORT (tavaliselt koos valikuga -a)\n"
-#: client/civclient.c:258
+#: client/civclient.c:259
#, c-format
msgid " -P, --Plugin PLUGIN\tUse PLUGIN for sound output %s\n"
msgstr " -P, --Plugin PLUGIN\tKasuta PLUGINat heli väljastamiseks %s\n"
-#: client/civclient.c:260
+#: client/civclient.c:261
msgid " -r, --read FILE\tRead startup script FILE (for spawned server only)\n"
msgstr ""
" -r, --read FILE\tLoe stardikäske FILE-st (ainult kohalike serverite "
"jaoks)\n"
-#: client/civclient.c:263
+#: client/civclient.c:264
msgid " -s, --server HOST\tConnect to the server at HOST (usually with -a)\n"
msgstr ""
" -s, --server AADRESS\tÃœhendu serveriga AADRESSil (tavaliselt koos valikuga "
"-a)\n"
-#: client/civclient.c:265
+#: client/civclient.c:266
msgid " -S, --Sound FILE\tRead sound tags from FILE\n"
msgstr " -s, --sound FAIL\tLoe hääleinfo failist FAIL\n"
-#: client/civclient.c:266
+#: client/civclient.c:267
msgid " -t, --tiles FILE\tUse data file FILE.tilespec for tiles\n"
msgstr " -t, --tiles FILE\tKasuta FAIL.tilespeci andmeid ruutudeks\n"
-#: client/civclient.c:269
+#: client/civclient.c:270
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7736,45 +7871,45 @@ msgstr ""
"\t\t\tProovi \"%s -- --help\" lisainfo saamiseks.\n"
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:274
+#: client/civclient.c:275
#, fuzzy, c-format
msgid "Report bugs at %s\n"
msgstr "Teata vigadest aadressile %s.\n"
-#: client/civclient.c:298
+#: client/civclient.c:299
#, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr "Võtme --port abil ette antud port \"%s\" on vigane.\n"
-#: client/civclient.c:300 client/civclient.c:315
+#: client/civclient.c:301 client/civclient.c:316
msgid "Try using --help.\n"
msgstr "Proovi --help.\n"
-#: client/civclient.c:313
+#: client/civclient.c:314
#, c-format
msgid "Invalid debug level \"%s\" specified with --debug option.\n"
msgstr "Võtme --debug abil ette antud silumistase \"%s\" on vigane.\n"
-#: client/civclient.c:326
+#: client/civclient.c:327
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr "Tundmatu võti: \"%s\"\n"
-#: client/civclient.c:391
+#: client/civclient.c:393
#, fuzzy, c-format
msgid "Updating old metaserver address \"%s\"."
msgstr "metaserver <aadress>"
-#: client/civclient.c:394
+#: client/civclient.c:396
#, fuzzy, c-format
msgid "Default metaserver has been set to \"%s\"."
msgstr "Seade: %s seati \"%s\"."
-#: client/civclient.c:550
+#: client/civclient.c:540
msgid "Game started."
msgstr "Mäng algas."
-#: client/civclient.c:588
+#: client/civclient.c:606
msgid "There was an error while auto connecting; aborting."
msgstr "Automaatse ühendamise käigus tekkis viga; katkestan ühendamise."
@@ -7904,17 +8039,17 @@ msgstr "Ãœhendumine..."
msgid "Disconnected from server."
msgstr "Ãœhendus serveriga katkestati."
-#: client/clinet.c:469
+#: client/clinet.c:473
#, c-format
msgid "Failed to contact server \"%s\" at port %d as \"%s\" after %d attempts"
msgstr ""
"Ei suutnud ühenduda serveri \"%s\" porti %d mängijana \"%s\" %d katsega"
-#: client/clinet.c:484 client/clinet.c:486
+#: client/clinet.c:488 client/clinet.c:490
msgid "Connection to server refused. Please start the server."
msgstr "Serveriga ühendamisest keelduti. Palun käivita server."
-#: client/clinet.c:495 client/clinet.c:523
+#: client/clinet.c:499 client/clinet.c:527
#, c-format
msgid ""
"Error contacting server \"%s\" at port %d as \"%s\":\n"
@@ -7923,7 +8058,7 @@ msgstr ""
"Viga ühendumisel serveri \"%s\" porti %d mängijana \"%s\":\n"
" %s\n"
-#: client/clinet.c:514
+#: client/clinet.c:518
#, c-format
msgid ""
"Auto-connecting to server \"%s\" at port %d as \"%s\" every %f second(s) for "
@@ -7932,53 +8067,53 @@ 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:1358
+#: client/connectdlg_common.c:78 client/gui-gtk-2.0/pages.c:1358
msgid "novice"
msgstr "algaja"
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1358
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
msgid "easy"
msgstr "kerge"
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1359
msgid "normal"
msgstr "tavaline"
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr "raske"
-#: client/connectdlg_common.c:83
+#: client/connectdlg_common.c:82
msgid "experimental"
msgstr "eksperimentaalne"
-#: client/connectdlg_common.c:213
+#: client/connectdlg_common.c:212
msgid "Starting server..."
msgstr "Käivitan serverit..."
-#: client/connectdlg_common.c:332
+#: client/connectdlg_common.c:331
msgid "Couldn't start the server."
msgstr "Ei suutnud käivitada serverit."
-#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
+#: client/connectdlg_common.c:332 client/connectdlg_common.c:365
msgid "You'll have to start one manually. Sorry..."
msgstr "Vabanda, aga sa pead ühe käsitsi käivitama."
-#: client/connectdlg_common.c:364
+#: client/connectdlg_common.c:363
msgid "Couldn't connect to the server."
msgstr "Ei suutnud serverisse ühenduda."
-#: client/connectdlg_common.c:365
+#: client/connectdlg_common.c:364
msgid "We probably couldn't start it from here."
msgstr ""
-#: client/connectdlg_common.c:470
+#: client/connectdlg_common.c:469
#, fuzzy
msgid ""
"Established control over the server. You have command access level 'hack'."
msgstr "Meil on täielik võim serveri üle (käsutase 'hack')"
-#: client/connectdlg_common.c:475
+#: client/connectdlg_common.c:474
msgid ""
"Failed to obtain the required access level to take control of the server. "
"The server will now be shutdown."
@@ -7988,27 +8123,27 @@ msgstr ""
msgid "Only transporter units can be unloaded."
msgstr "Ainult transportivaid aluseid saab tühjaks laadida."
-#: client/control.c:1425
+#: client/control.c:1417
msgid "Only settler units can be put into auto mode."
msgstr "Ainult asunikke saab panna automaatrežiimi."
-#: client/control.c:1516
+#: client/control.c:1511
msgid "Only nuclear units can do this."
msgstr "Ainult tuumarelvad saavad seda teha."
-#: client/control.c:1545
+#: client/control.c:1540
msgid "Only paratrooper units can do this."
msgstr "Ainult langevarjurid saavad seda teha."
-#: client/control.c:2020
+#: client/control.c:2015
msgid "Too far for this unit."
msgstr "Liiga kaugel selle üksuse jaoks."
-#: client/control.c:2230 client/control.c:2260 client/control.c:2276
+#: client/control.c:2225 client/control.c:2255 client/control.c:2271
msgid "Didn't find a route to the destination!"
msgstr "Sihtkohani ei leidnud teed."
-#: client/control.c:2320
+#: client/control.c:2315
msgid "Oh my! You seem to have no capital!"
msgstr "Jama! Sul vist polegi pealinna!"
@@ -8407,27 +8542,34 @@ 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:1066 client/helpdata.c:1400
+#: client/helpdata.c:1066 client/helpdata.c:1408
msgid " or "
msgstr "või"
-#: client/helpdata.c:1068 client/helpdata.c:1388
+#: client/helpdata.c:1068 client/helpdata.c:1396
msgid "?or:, "
msgstr "?or:,"
-#: client/helpdata.c:1080
-#, 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"
+#: client/helpdata.c:1079
+#, fuzzy, c-format
+msgid "* Unit has to be in a city, or a base after %d turn.\n"
+msgid_plural "* Unit has to be in a city, or a base 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:1122
+#: client/helpdata.c:1087
+#, fuzzy, c-format
+msgid "* Unit has to be in a city, a base, or on a %s after %d turn.\n"
+msgid_plural "* Unit has to be in a city, a base, 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:1130
#, 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:1127
+#: client/helpdata.c:1135
#, c-format
msgid ""
"To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8436,90 +8578,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:1135
+#: client/helpdata.c:1143
msgid "You cannot research this technology."
msgstr "Seda teadust sa ei saa uurida."
-#: client/helpdata.c:1139
+#: client/helpdata.c:1147
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:1151
+#: client/helpdata.c:1159
#, 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:1156
+#: client/helpdata.c:1164
#, 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:1159
+#: client/helpdata.c:1167
#, 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:1163
+#: client/helpdata.c:1171
msgid "* Increases the pollution generated by the population.\n"
msgstr "* Suurendab rahvastiku poolt tekitatavat saasta hulka.\n"
-#: client/helpdata.c:1168
+#: client/helpdata.c:1176
#, 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:1175
+#: client/helpdata.c:1183
#, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr "* Võimaldab üksusel %s ehitada kindluseid.\n"
-#: client/helpdata.c:1183
+#: client/helpdata.c:1191
#, c-format
msgid "* Allows %s to build airbases.\n"
msgstr "* Võimaldab üksusel %s ehitada lennuvälju.\n"
-#: client/helpdata.c:1192
+#: client/helpdata.c:1200
#, c-format
msgid "* Allows %s to upgrade roads to railroads.\n"
msgstr "* Võimaldab üksusel %s uuendada teed raudteedeks.\n"
-#: client/helpdata.c:1200
+#: client/helpdata.c:1208
#, c-format
msgid "* Allows %s to upgrade irrigation to farmland.\n"
msgstr "* Võimaldab üksusel %s uuendada niisutuse põllumaaks.\n"
-#: client/helpdata.c:1234
+#: client/helpdata.c:1242
msgid "* Pollution cannot be generated on this terrain."
msgstr "* Sellel pinnasel ei saa tekitada saasta."
-#: client/helpdata.c:1239
+#: client/helpdata.c:1247
msgid "* You cannot build cities on this terrain."
msgstr "* Sa ei saa sellele maastikule linnu ehitada."
-#: client/helpdata.c:1245
+#: client/helpdata.c:1253
msgid "* The coastline of this terrain is unsafe."
msgstr "* Selle piirkonna rannikuala on ebaturvaline."
-#: client/helpdata.c:1250
+#: client/helpdata.c:1258
msgid "* This terrain is unsafe for units to travel on."
msgstr "* See maastik on üksustele liikumiseks ohtlik."
-#: client/helpdata.c:1255
+#: client/helpdata.c:1263
msgid "* Land units cannot travel on oceanic terrains."
msgstr "* Maaüksused ei saa liikuda mere aladel."
-#: client/helpdata.c:1305
+#: client/helpdata.c:1313
msgid "Features:\n"
msgstr "Omadused:\n"
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1411 client/helpdata.c:1412
+#: client/helpdata.c:1419 client/helpdata.c:1420
msgid "?outputlist: Nothing "
msgstr ""
-#: client/helpdata.c:1419
+#: client/helpdata.c:1427
#, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -8530,7 +8672,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1429
+#: client/helpdata.c:1437
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8539,49 +8681,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:1437
+#: client/helpdata.c:1445
#, 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:1442
+#: client/helpdata.c:1450
#, 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:1447
+#: client/helpdata.c:1455
#, 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:1451
+#: client/helpdata.c:1459
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:1460
+#: client/helpdata.c:1468
#, 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:1468
+#: client/helpdata.c:1476
#, c-format
msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
msgstr ""
-#: client/helpdata.c:1475
+#: client/helpdata.c:1483
#, 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:1482
+#: client/helpdata.c:1490
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -8591,23 +8733,23 @@ msgstr ""
"sul on %d linna.\n"
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1489
+#: client/helpdata.c:1497
#, 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:1497
+#: client/helpdata.c:1505
#, 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:1502
+#: client/helpdata.c:1510
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr "Piiramata suurusega teaduse/maksude/hüvede määr.\n"
-#: client/helpdata.c:1507
+#: client/helpdata.c:1515
#, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -8618,7 +8760,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1519
+#: client/helpdata.c:1527
#, 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"
@@ -8626,7 +8768,7 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1530
+#: client/helpdata.c:1538
#, c-format
msgid ""
"* You may grow your cities by means of celebrations. Your cities must be at "
@@ -8635,15 +8777,15 @@ msgstr ""
"* Kasvada saab ka pidustuste korraldamise abil. Su linna suurus peab olema "
"vähemalt %d, et sel viisil kasvada.\n"
-#: client/helpdata.c:1536
+#: client/helpdata.c:1544
msgid "* Your units cannot be bribed.\n"
msgstr "* Su üksusi ei saa ära osta.\n"
-#: client/helpdata.c:1539
+#: client/helpdata.c:1547
msgid "* Your cities cannot be incited.\n"
msgstr "* Su linnu ei saa mässule õhutada.\n"
-#: client/helpdata.c:1543
+#: client/helpdata.c:1551
msgid ""
"* Government will fall into anarchy if any city is in disorder for more than "
"two turns in a row.\n"
@@ -8651,15 +8793,15 @@ msgstr ""
"* Valitsus langeb anarhiasse, kui mõnes linnas on rahutused kauem, kui kaks "
"käiku järjest.\n"
-#: client/helpdata.c:1549
+#: client/helpdata.c:1557
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:1553
+#: client/helpdata.c:1561
msgid "* Allows partisans when cities are taken by the enemy.\n"
msgstr "* Lubab partisanidel tegutsema hakata, kui linnad vallutatakse.\n"
-#: client/helpdata.c:1557
+#: client/helpdata.c:1565
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
@@ -8667,25 +8809,25 @@ msgstr ""
"* Ehitised, mis muidu annaks boonuseid õnnetu meeleolu vastu, toodavad "
"hoopis raha.\n"
-#: client/helpdata.c:1561
+#: client/helpdata.c:1569
msgid "* Pays no upkeep for fanatics.\n"
msgstr "* Ei maksa fanaatikute ülalpidamiskulusid.\n"
-#: client/helpdata.c:1564
+#: client/helpdata.c:1572
msgid "* Has no unhappy citizens.\n"
msgstr "* Pole õnnetuid kodanikke.\n"
-#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
+#: client/helpdata.c:1582 client/helpdata.c:1586 client/helpdata.c:1590
#, c-format
msgid "* Veteran %s units.\n"
msgstr "* Veteran-%s üksused.\n"
-#: client/helpdata.c:1585
+#: client/helpdata.c:1593
msgid "* Veteran units.\n"
msgstr "* Veteranid.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1591
+#: client/helpdata.c:1599
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8693,7 +8835,7 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1600
+#: client/helpdata.c:1608
#, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8701,37 +8843,37 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1608
+#: client/helpdata.c:1616
#, 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:1617
+#: client/helpdata.c:1625
#, 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:1625
+#: client/helpdata.c:1633
#, 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:1630
+#: client/helpdata.c:1638
#, 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:1635
+#: client/helpdata.c:1643
#, 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:1643
+#: client/helpdata.c:1651
#, fuzzy, c-format
msgid "* %s waste will increase quickly with distance from capital.\n"
msgstr ""
@@ -8739,38 +8881,38 @@ msgstr ""
"pealinnast.\n"
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1649
+#: client/helpdata.c:1657
#, 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:1655
+#: client/helpdata.c:1663
#, 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:1672
+#: client/helpdata.c:1680
#, 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:1699
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d %s"
msgstr "%s%d %s"
-#: client/helpdata.c:1700 client/helpdata.c:1708 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1708 client/helpdata.c:1716 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:1707
+#: client/helpdata.c:1715
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d õnnetus"
@@ -8845,7 +8987,7 @@ msgstr ""
"See on vaikimisi serveriport, mida kasutatakse ühenduse loomise "
"dialoogiakendes või käsureavõtmega -a."
-#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:916 data/Freeciv.in:107
msgid "Metaserver"
msgstr "Metaserver"
@@ -9222,36 +9364,36 @@ msgstr "Salvestamine ebaõnnestus, ei suutnud kirjutada faili %s"
msgid "Saved settings to file %s"
msgstr "Seaded salvestatud faili %s"
-#: client/packhand.c:211 client/packhand.c:217
+#: client/packhand.c:212 client/packhand.c:218
#, fuzzy
msgid "You were rejected from the game...."
msgstr "Sind ei võetud mängu:"
-#: client/packhand.c:229
+#: client/packhand.c:230
#, c-format
msgid "Client capability string: %s"
msgstr "Kliendi oskused: %s"
-#: client/packhand.c:232
+#: client/packhand.c:233
#, c-format
msgid "Server capability string: %s"
msgstr "Serveri oskused: %s"
-#: client/packhand.c:850
+#: client/packhand.c:864
#, c-format
msgid "Start of turn %d"
msgstr "Käigu %d algus"
-#: client/packhand.c:1591
+#: client/packhand.c:1621
#, c-format
msgid "AI Mode is now %s."
msgstr "Tehisintellekti režiim on nüüd %s"
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "ON"
msgstr "SEES"
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "OFF"
msgstr "VÄLJAS"
@@ -9282,15 +9424,15 @@ msgstr "?Player:Nimi"
msgid "Username"
msgstr "Kasutajanimi"
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
-#: client/gui-gtk-2.0/pages.c:2157
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:653
+#: client/gui-gtk-2.0/pages.c:1604 client/gui-gtk-2.0/pages.c:2159
msgid "Flag"
msgstr "Lipp"
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1605
-#: client/gui-gtk-2.0/pages.c:2159 client/gui-sdl/repodlgs.c:2063
-#: client/gui-win32/connectdlg.c:990 client/gui-win32/dialogs.c:542
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:657
+#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1609
+#: client/gui-gtk-2.0/pages.c:2161 client/gui-sdl/repodlgs.c:2063
+#: client/gui-win32/connectdlg.c:992 client/gui-win32/dialogs.c:542
#: client/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "Rahvus"
@@ -9303,7 +9445,7 @@ msgstr "Piir"
msgid "Score"
msgstr "Skoor"
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1614
msgid "Team"
msgstr "Meeskond"
@@ -9336,36 +9478,36 @@ msgstr "?Player_dlg:Jõudeolekus"
msgid "Ping"
msgstr "Ping"
-#: client/repodlgs_common.c:375
+#: client/repodlgs_common.c:378
msgid "You cannot sell improvements."
msgstr "Sa ei saa müüa ehitisi."
-#: client/repodlgs_common.c:391
+#: client/repodlgs_common.c:394
#, c-format
msgid "Sold %d %s for %d gold."
msgstr "Müüsid %d %s %d raha eest."
-#: client/repodlgs_common.c:396
+#: client/repodlgs_common.c:399
#, c-format
msgid "No %s could be sold."
msgstr "Ühtegi %s ei saanud müüa"
#. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:415
+#: client/repodlgs_common.c:418
msgid "You cannot disband units."
msgstr "Sa ei saa üksusi laiali saata."
-#: client/repodlgs_common.c:420
+#: client/repodlgs_common.c:423
#, c-format
msgid "%s cannot be disbanded."
msgstr "%s-t ei saa laiali saata.."
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:444
#, c-format
msgid "Disbanded %d %s."
msgstr "Saadeti laiali %d üksust %s."
-#: client/repodlgs_common.c:445
+#: client/repodlgs_common.c:448
#, c-format
msgid "No %s could be disbanded."
msgstr "Ãœhtegi %s ei saanud lahti lasta."
@@ -9956,47 +10098,47 @@ msgstr "%02dd %02dh"
msgid "?duration:overflow"
msgstr ""
-#: client/text.c:1143
+#: client/text.c:1145
#, c-format
msgid "%6d.%02d ms"
msgstr "%6d.%02d ms"
#. TRANS: <nation adjective> <government name>.
#. * E.g. "Polish Republic".
-#: client/text.c:1188
+#: client/text.c:1193
#, fuzzy, c-format
msgid "?nationgovernment:%s %s"
msgstr "Riigikord: %s"
#. TRANS: "Observer: 1985"
-#: client/text.c:1198
+#: client/text.c:1203
#, c-format
msgid "Observer: %s"
msgstr "Pealtvaataja: %s"
-#: client/text.c:1216
+#: client/text.c:1221
msgid "Buildings: "
msgstr "Ehitised: "
-#: client/text.c:1233 client/text.c:1272
+#: client/text.c:1238 client/text.c:1277
msgid "None. "
msgstr "Puudub."
-#: client/text.c:1235 client/text.c:1274
+#: client/text.c:1240 client/text.c:1279
msgid "?clistend:."
msgstr "."
-#: client/text.c:1253
+#: client/text.c:1258
msgid "Wonders: "
msgstr "Ilmaimed: "
-#: client/text.c:1308
+#: client/text.c:1313
#, c-format
msgid "Cities: %d total, %d over threshold of %d cities."
msgstr ""
#. TRANS: 0-21 content [citizen(s)] ...
-#: client/text.c:1312
+#: client/text.c:1317
#, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
@@ -10004,64 +10146,64 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1318
+#: client/text.c:1323
#, fuzzy, c-format
msgid "%d additional unhappy citizen."
msgid_plural "%d additional unhappy citizens."
msgstr[0] "%d uut õnnetut kodanikku."
msgstr[1] "%d uut õnnetut kodanikku."
-#: client/text.c:1339
+#: client/text.c:1344
#, fuzzy
msgid "Unlimited martial law in effect."
msgstr "Kehtib sõjaolukord ("
-#: client/text.c:1341
+#: client/text.c:1346
#, fuzzy, c-format
msgid "%d military unit may impose martial law."
msgid_plural "Up to %d military units may impose martial law."
msgstr[0] "* Tsiviilüksus (ei saa rünnata ega sõjaseisukorda kehtestada).\n"
msgstr[1] "* Tsiviilüksus (ei saa rünnata ega sõjaseisukorda kehtestada).\n"
-#: client/text.c:1345
+#: client/text.c:1350
#, fuzzy, c-format
msgid "Each military unit makes %d unhappy citizen content."
msgid_plural "Each military unit makes %d unhappy citizens content."
msgstr[0] "Lõbustab linnaelanikke, tehes 3 õnnetut kodanikku rahulolevaks."
msgstr[1] "Lõbustab linnaelanikke, tehes 3 õnnetut kodanikku rahulolevaks."
-#: client/text.c:1352
+#: client/text.c:1357
msgid "Military units in the field may cause unhappiness. "
msgstr ""
-#: client/text.c:1355
+#: client/text.c:1360
msgid "Military units have no happiness effect. "
msgstr "Sõjaväeüksusi ei mõjuta meeleolu."
-#: client/text.c:1370
+#: client/text.c:1375
#, c-format
msgid "Luxury: %d total."
msgstr "Hüved: kokku %d."
-#: client/tilespec.c:865
+#: client/tilespec.c:882
msgid "No usable default tileset found, aborting!"
msgstr ""
"Ei leitud kasutatavat vaikimisi valitavat ruudustikku, tegevus katkestatud!"
-#: client/tilespec.c:1338
+#: client/tilespec.c:1355
msgid ""
"Client does not support isometric tilesets. Using default tileset instead."
msgstr ""
"Mängijal puudub isomeetrilise ruudustiku tugi. Kasutan selle asemel "
"vaikimisi ruudustikku."
-#: client/tilespec.c:1347
+#: client/tilespec.c:1364
msgid ""
"Client does not support overhead view tilesets. Using default tileset "
"instead."
msgstr ""
-#: client/tilespec.c:3966
+#: client/tilespec.c:3987
#, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -10743,7 +10885,7 @@ msgid "_Display"
msgstr "_Näita"
#: client/gui-gtk-2.0/cityrep.c:1006 client/gui-gtk-2.0/menu.c:839
-#: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
+#: client/gui-sdl/diplodlg.c:692 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
#: client/gui-xaw/cityrep.c:533 client/gui-xaw/menu.c:156
@@ -10914,194 +11056,194 @@ msgstr "Milline oleks sobiv nimi uuele mallile?"
msgid "Remove this preset?"
msgstr "Eemalda see mall?"
-#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:222
+#: client/gui-gtk-2.0/dialogs.c:197 client/gui-gtk-2.0/messagewin.c:222
msgid "Goto _Location"
msgstr "_Mine sinna"
-#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
+#: client/gui-gtk-2.0/dialogs.c:202 client/gui-gtk-2.0/messagewin.c:226
msgid "Inspect _City"
msgstr "Vaata _linna"
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:258 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:258 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:259 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:311 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:312 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:312 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:313 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:506
+#: client/gui-gtk-2.0/dialogs.c:507
msgid "Unit"
msgstr "Ãœksus"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:950
-#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2155
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:985
+#: client/gui-gtk-2.0/dialogs.c:508 client/gui-gtk-2.0/pages.c:950
+#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2157
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:987
#: 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:519 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:520 client/gui-sdl/dialogs.c:627
msgid "Unit selection"
msgstr "Ãœksuse valimine"
-#: client/gui-gtk-2.0/dialogs.c:582
+#: client/gui-gtk-2.0/dialogs.c:583
msgid "_Ready all"
msgstr "Pane kõik valmis"
-#: client/gui-gtk-2.0/dialogs.c:590
+#: client/gui-gtk-2.0/dialogs.c:591
msgid "_Sentry idle"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:719
+#: client/gui-gtk-2.0/dialogs.c:721
#, fuzzy
msgid "Nation _Groups:"
msgstr "_Rahvused:"
-#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:766 data/Freeciv.in:3128
msgid "What Nation Will You Be?"
msgstr "Mis rahvusest sa oled?"
-#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
-#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
+#: client/gui-gtk-2.0/dialogs.c:768 client/gui-sdl/chatline.c:842
+#: client/gui-win32/connectdlg.c:1040 data/Freeciv.in:3371
msgid "Pick Nation"
msgstr "Vali rahvus"
-#: client/gui-gtk-2.0/dialogs.c:774
+#: client/gui-gtk-2.0/dialogs.c:776
msgid "_Random Nation"
msgstr "_Juhuslik rahvus"
-#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:792 client/gui-win32/dialogs.c:517
msgid "Select a nation"
msgstr "Vali rahvus"
-#: client/gui-gtk-2.0/dialogs.c:804
+#: client/gui-gtk-2.0/dialogs.c:810
msgid "_Properties"
msgstr "_Omadused"
-#: client/gui-gtk-2.0/dialogs.c:824
+#: client/gui-gtk-2.0/dialogs.c:830
msgid "_Leader:"
msgstr "_Juht:"
-#: client/gui-gtk-2.0/dialogs.c:831
+#: client/gui-gtk-2.0/dialogs.c:837
msgid "_Female"
msgstr "_Naine"
-#: client/gui-gtk-2.0/dialogs.c:836
+#: client/gui-gtk-2.0/dialogs.c:842
msgid "_Male"
msgstr "_Mees"
-#: client/gui-gtk-2.0/dialogs.c:863
+#: client/gui-gtk-2.0/dialogs.c:869
msgid "City _Styles:"
msgstr "Linnade _stiil:"
-#: client/gui-gtk-2.0/dialogs.c:902
+#: client/gui-gtk-2.0/dialogs.c:908
#, fuzzy
msgid "_Description"
msgstr "L_egend"
-#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1263 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:1253 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1268 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:1262 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1277 client/gui-sdl/dialogs.c:2204
#: 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:1306 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1318 client/gui-win32/citydlg.c:1454
#: data/Freeciv.in:2484
msgid "Upgrade Unit!"
msgstr "Uuenda üksust!"
-#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1327 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 "Uuenda aegunud üksuseid"
-#: client/gui-gtk-2.0/diplodlg.c:231 client/gui-win32/diplodlg.c:151
+#: client/gui-gtk-2.0/diplodlg.c:222 client/gui-win32/diplodlg.c:151
#: client/gui-xaw/diplodlg.c:383 client/gui-xaw/diplodlg.c:401
msgid "World-map"
msgstr "Maakaart"
-#: client/gui-gtk-2.0/diplodlg.c:237 client/gui-win32/diplodlg.c:146
+#: client/gui-gtk-2.0/diplodlg.c:228 client/gui-win32/diplodlg.c:146
#: client/gui-xaw/diplodlg.c:387 client/gui-xaw/diplodlg.c:405
msgid "Sea-map"
msgstr "Merekaart"
-#: client/gui-gtk-2.0/diplodlg.c:243
+#: client/gui-gtk-2.0/diplodlg.c:234
msgid "_Maps"
msgstr "_Kaardid"
-#: client/gui-gtk-2.0/diplodlg.c:274
+#: client/gui-gtk-2.0/diplodlg.c:265
msgid "_Advances"
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/diplodlg.c:315 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "_Linnad"
-#: client/gui-gtk-2.0/diplodlg.c:333
+#: client/gui-gtk-2.0/diplodlg.c:324
msgid "_Give shared vision"
msgstr "Jaga vaadet"
-#: client/gui-gtk-2.0/diplodlg.c:346
+#: client/gui-gtk-2.0/diplodlg.c:337
msgid "Give _embassy"
msgstr "Anna _saatkond"
-#: client/gui-gtk-2.0/diplodlg.c:376
+#: client/gui-gtk-2.0/diplodlg.c:368
msgid "_Pacts"
msgstr "_Paktid"
-#: client/gui-gtk-2.0/diplodlg.c:466
+#: client/gui-gtk-2.0/diplodlg.c:458
#, c-format
msgid "Diplomacy: %s"
msgstr "Diplomaatia: %s"
-#: client/gui-gtk-2.0/diplodlg.c:473
+#: client/gui-gtk-2.0/diplodlg.c:465
msgid "_Cancel meeting"
msgstr "_Katkesta kohtumine"
-#: client/gui-gtk-2.0/diplodlg.c:475
+#: client/gui-gtk-2.0/diplodlg.c:467
msgid "Accept _treaty"
msgstr "Võta vastu"
-#: client/gui-gtk-2.0/diplodlg.c:503
+#: client/gui-gtk-2.0/diplodlg.c:495
msgid "C_lauses:"
msgstr "_Tingimused:"
-#: client/gui-gtk-2.0/diplodlg.c:568 client/gui-gtk-2.0/diplodlg.c:642
+#: client/gui-gtk-2.0/diplodlg.c:560 client/gui-gtk-2.0/diplodlg.c:634
msgid "_Gold:"
msgstr "Kulda:"
-#: client/gui-gtk-2.0/diplodlg.c:580 client/gui-gtk-2.0/diplodlg.c:654
+#: client/gui-gtk-2.0/diplodlg.c:572 client/gui-gtk-2.0/diplodlg.c:646
msgid "_Add Clause..."
msgstr "Lisa tingimus..."
-#: client/gui-gtk-2.0/diplodlg.c:699
+#: client/gui-gtk-2.0/diplodlg.c:691
msgid "--- This treaty is blank. Please add some clauses. ---"
msgstr "--- See leping on tühi. Palun lisa mõned punktid. ---"
-#: client/gui-gtk-2.0/diplodlg.c:905 client/gui-sdl/diplodlg.c:375
+#: client/gui-gtk-2.0/diplodlg.c:897 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 "Määratud vigane hulk raha."
@@ -11160,29 +11302,29 @@ msgstr "Vali sihtkoht"
msgid "Show _All Cities"
msgstr "Näita kõiki linnu"
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:164
msgid "Show Map Scrollbars"
msgstr "Näita kaardi kerimisribasid"
-#: client/gui-gtk-2.0/gui_main.c:163
+#: client/gui-gtk-2.0/gui_main.c:165
msgid "Disable this option to hide the scrollbars on the map view."
msgstr "Lülita see valik välja, et peita kaardi vaates kerimisribad."
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:169
msgid "Keyboardless goto"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:168
+#: client/gui-gtk-2.0/gui_main.c:170
msgid ""
"If this option is set then a goto may be initiated by left-clicking and then "
"holding down the mouse button while dragging the mouse onto a different tile."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:173
+#: client/gui-gtk-2.0/gui_main.c:175
msgid "Keep dialogs on top"
msgstr "Hoia aknad kõige peal"
-#: client/gui-gtk-2.0/gui_main.c:174
+#: client/gui-gtk-2.0/gui_main.c:176
msgid ""
"If this option is set then dialog windows will always remain in front of the "
"main Freeciv window. Disabling this has no effect in fullscreen mode."
@@ -11190,31 +11332,31 @@ msgstr ""
"Kui see valik on aktiivne, siis jäävad avanenud aknad Freecivi põhiakna "
"peale. Täisekraani korral ei muuda selle valiku keelamine midagi."
-#: client/gui-gtk-2.0/gui_main.c:178
+#: client/gui-gtk-2.0/gui_main.c:180
msgid "Show worklist task icons"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:179
+#: client/gui-gtk-2.0/gui_main.c:181
msgid ""
"Disabling this will turn off the unit and building icons in the worklist "
"dialog and the production tab of the city dialog."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:183
+#: client/gui-gtk-2.0/gui_main.c:185
msgid "Enable status report tabs"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:184
+#: client/gui-gtk-2.0/gui_main.c:186
msgid ""
"If this option is enabled then report dialogs will be shown as separate tabs "
"rather than in popup dialogs."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:189 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:191 client/gui-win32/gui_main.c:110
msgid "Better fog-of-war drawing"
msgstr "Parem sõjaudu joonistamine"
-#: client/gui-gtk-2.0/gui_main.c:190 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:192 client/gui-win32/gui_main.c:111
msgid ""
"If this is enabled then a better method is used for drawing fog-of-war. It "
"is not any slower but will consume about twice as much memory."
@@ -11223,41 +11365,41 @@ msgstr ""
"joonistamiseks. See meetod ei ole aeglasem, kuid nõuab umbes kaks korda "
"rohkem mälu."
-#: client/gui-gtk-2.0/gui_main.c:195
+#: client/gui-gtk-2.0/gui_main.c:197
msgid "Show time for each chat message"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:196
+#: client/gui-gtk-2.0/gui_main.c:198
msgid ""
"If this option is enabled then all chat messages will be prefixed by a time "
"string of the form [hour:minute:second]."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:201
+#: client/gui-gtk-2.0/gui_main.c:203
msgid "Split bottom notebook area"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:202
+#: client/gui-gtk-2.0/gui_main.c:204
msgid ""
"Enabling this option will split the bottom notebook into a left and right "
"notebook so that two tabs may be viewed at once."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:207
+#: client/gui-gtk-2.0/gui_main.c:209
msgid "New message events go to top of list"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:208
+#: client/gui-gtk-2.0/gui_main.c:210
msgid ""
"If this option is enabled, new events in the message window will appear at "
"the top of the list, rather than being appended at the bottom."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:213
+#: client/gui-gtk-2.0/gui_main.c:215
msgid "Show extra message window buttons"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:214
+#: client/gui-gtk-2.0/gui_main.c:216
msgid ""
"If this option is enabled, there will be two buttons displayed in the "
"message window for inspecting a city and going to a location. If this option "
@@ -11267,21 +11409,21 @@ msgid ""
"closed and reopened."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:224
+#: client/gui-gtk-2.0/gui_main.c:226
msgid "Metaserver tab first in network page"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:225
+#: client/gui-gtk-2.0/gui_main.c:227
msgid ""
"If this option is enabled, the metaserver tab will be the first notebook tab "
"in the network page. This option requires a restart in order to take effect."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:230
+#: client/gui-gtk-2.0/gui_main.c:232
msgid "Plain chat messages are sent to allies only"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:231
+#: client/gui-gtk-2.0/gui_main.c:233
msgid ""
"If this option is enabled, then plain messages typed into the chat entry "
"while the game is running will only be sent to your allies. Otherwise plain "
@@ -11291,28 +11433,41 @@ msgid ""
"visible in multiplayer games)."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:340 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:245
+msgid "Arrange widgets for small displays"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:246
+msgid ""
+"If this option is enabled, widgets in the main window will be arrange so "
+"that they take up the least amount of total screen space. Specifically, the "
+"left panel containing the overview, player status, and the unit information "
+"box will be extended over the entire left side of the window. This option "
+"requires a restart in order to take effect."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:352 client/gui-xaw/gui_main.c:245
msgid ""
"This client has no special command line options\n"
"\n"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
+#: client/gui-gtk-2.0/gui_main.c:847 client/gui-gtk-2.0/gui_main.c:1542
msgid "Freeciv"
msgstr "Freeciv"
-#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
+#: client/gui-gtk-2.0/gui_main.c:1251 client/gui-gtk-2.0/gui_main.c:1258
#: client/gui-sdl/mapctrl.c:1566 client/gui-win32/gui_main.c:482
#: data/Freeciv.in:2618
msgid "Turn Done"
msgstr "Käigud käidud"
-#: client/gui-gtk-2.0/gui_main.c:1232 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1258 client/gui-sdl/mapctrl.c:1566
#: client/gui-sdl/mapview.c:1082
msgid "Shift+Return"
msgstr "Shift+Return"
-#: client/gui-gtk-2.0/gui_main.c:1266 client/gui-gtk-2.0/menu.c:797
+#: client/gui-gtk-2.0/gui_main.c:1299 client/gui-gtk-2.0/menu.c:797
#: client/gui-gtk-2.0/menu.c:799 client/gui-gtk-2.0/menu.c:801
#: client/gui-gtk-2.0/menu.c:803 client/gui-gtk-2.0/menu.c:805
#: client/gui-gtk-2.0/menu.c:807 client/gui-gtk-2.0/menu.c:809
@@ -11331,11 +11486,11 @@ msgstr "Shift+Return"
msgid "View"
msgstr "Vaade"
-#: client/gui-gtk-2.0/gui_main.c:1359
+#: client/gui-gtk-2.0/gui_main.c:1393
msgid "Chat"
msgstr "Loba"
-#: client/gui-gtk-2.0/gui_main.c:1377 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1411 client/gui-win32/gui_main.c:538
#: data/Freeciv.in:2809
msgid ""
"Freeciv is free software and you are welcome to distribute copies of it\n"
@@ -11346,78 +11501,78 @@ msgstr ""
"arvestades teatud tingimusi; Loe Abi menüüst \"Koopiate tegemine\".\n"
"Aga nüüd mine ja tiri nendel närakatel tsivilisatsioon üle kõrvade!"
-#: client/gui-gtk-2.0/gui_main.c:1392
+#: client/gui-gtk-2.0/gui_main.c:1426
msgid "Allies Only"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1657
+#: client/gui-gtk-2.0/gui_main.c:1691
msgid "Not _ready"
msgstr "Pole _valmis"
-#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
+#: client/gui-gtk-2.0/gui_main.c:1702 client/gui-gtk-2.0/pages.c:1679
msgid "_Ready"
msgstr "_Valmis"
-#: client/gui-gtk-2.0/gui_main.c:1672 client/gui-gtk-2.0/gui_main.c:1678
-#: client/gui-gtk-2.0/pages.c:2204
+#: client/gui-gtk-2.0/gui_main.c:1706 client/gui-gtk-2.0/gui_main.c:1712
+#: client/gui-gtk-2.0/pages.c:2206
msgid "_Start"
msgstr "_Alusta"
-#: client/gui-gtk-2.0/gui_main.c:1686
+#: client/gui-gtk-2.0/gui_main.c:1720
#, fuzzy
msgid "_Take Player"
msgstr "Vali see mängija"
-#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
+#: client/gui-gtk-2.0/gui_main.c:1723 client/gui-gtk-2.0/pages.c:1669
msgid "Pick _Nation"
msgstr "Vali _Rahvus"
-#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
+#: client/gui-gtk-2.0/gui_main.c:1730 client/gui-gtk-2.0/pages.c:1674
msgid "_Observe"
msgstr "_Vaatle"
-#: client/gui-gtk-2.0/gui_main.c:1698
+#: client/gui-gtk-2.0/gui_main.c:1732
msgid "Do not _observe"
msgstr "Ära _vaatle"
-#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1755 client/gui-xaw/pages.c:211
msgid "<AI>"
msgstr "<tehismõistus>"
-#: client/gui-gtk-2.0/gui_main.c:1723
+#: client/gui-gtk-2.0/gui_main.c:1758
msgid "<Novice AI>"
msgstr "<Algaja tehismõistus>"
-#: client/gui-gtk-2.0/gui_main.c:1726
+#: client/gui-gtk-2.0/gui_main.c:1761
msgid "<Easy AI>"
msgstr "<Kerge tehismõistus>"
-#: client/gui-gtk-2.0/gui_main.c:1729
+#: client/gui-gtk-2.0/gui_main.c:1764
msgid "<Normal AI>"
msgstr "<Normaalne tehismõistus>"
-#: client/gui-gtk-2.0/gui_main.c:1732
+#: client/gui-gtk-2.0/gui_main.c:1767
msgid "<Hard AI>"
msgstr "<Raske tehismõistus>"
-#: client/gui-gtk-2.0/gui_main.c:1742 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1777 client/gui-win32/dialogs.c:594
#: client/gui-xaw/pages.c:217
msgid "Random"
msgstr "Juhuslik"
-#: client/gui-gtk-2.0/gui_main.c:1808
+#: client/gui-gtk-2.0/gui_main.c:1844 client/gui-gtk-2.0/gui_main.c:1858
msgid "Observer"
msgstr "Vaatleja"
-#: client/gui-gtk-2.0/gui_main.c:1808
+#: client/gui-gtk-2.0/gui_main.c:1858
msgid "Detached"
msgstr "Lahti ühenduund"
-#: client/gui-gtk-2.0/gui_main.c:2073
+#: client/gui-gtk-2.0/gui_main.c:2117
msgid "Are you sure you want to quit?"
msgstr "Ära välju veel, kogu maailm polegi sinu ideoloogiat täis."
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
#, c-format
msgid ""
"Close Tab:\n"
@@ -11426,7 +11581,7 @@ msgstr ""
"Sulge kaart:\n"
"%s"
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
msgid "Ctrl+W"
msgstr "Ctrl+W"
@@ -11531,8 +11686,8 @@ msgid "Trans. Rslt/Time:"
msgstr "Trans. Tulem/Aeg:"
#: 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
-#: client/gui-win32/helpdlg.c:709 client/gui-win32/helpdlg.c:733
+#: client/gui-win32/helpdlg.c:502 client/gui-win32/helpdlg.c:550
+#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:739
#: client/gui-xaw/helpdlg.c:759 client/gui-xaw/helpdlg.c:808
#: client/gui-xaw/helpdlg.c:816 client/gui-xaw/helpdlg.c:853
#: client/gui-xaw/helpdlg.c:878
@@ -11579,34 +11734,34 @@ msgstr "kui on"
msgid "?techhelp:"
msgstr "?tehnoabi:"
-#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:591
+#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:597
#: client/gui-xaw/helpdlg.c:996
#, c-format
msgid "+%d Trade / %d"
msgstr "+%d Kaubandus / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:595
+#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:601
#: client/gui-xaw/helpdlg.c:1000
#, c-format
msgid "no extra / %d"
msgstr "ei lisandu / %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
-#: client/gui-win32/helpdlg.c:602 client/gui-win32/helpdlg.c:616
-#: client/gui-win32/helpdlg.c:635 client/gui-xaw/helpdlg.c:1002
+#: client/gui-gtk-2.0/helpdlg.c:1085 client/gui-win32/helpdlg.c:604
+#: client/gui-win32/helpdlg.c:608 client/gui-win32/helpdlg.c:622
+#: client/gui-win32/helpdlg.c:641 client/gui-xaw/helpdlg.c:1002
#: client/gui-xaw/helpdlg.c:1006 client/gui-xaw/helpdlg.c:1020
#: client/gui-xaw/helpdlg.c:1039
msgid "n/a"
msgstr "n/a"
-#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:605
+#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:611
#: client/gui-xaw/helpdlg.c:1009
#, c-format
msgid "+%d Food / %d"
msgstr "+%d Toit / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:619
+#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:625
#: client/gui-xaw/helpdlg.c:1023
#, c-format
msgid "+%d Res. / %d"
@@ -12372,41 +12527,41 @@ msgstr "Ühendu _võrgumängu"
msgid "Connect to Gaming _Zone"
msgstr "Ãœhendu Gaming _Zone'sse"
-#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:302
#: 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:779 client/gui-gtk-2.0/pages.c:820
-#: client/gui-win32/connectdlg.c:916
+#: client/gui-win32/connectdlg.c:918
msgid "Server Name"
msgstr "Serveri nimi"
#: client/gui-gtk-2.0/pages.c:780 client/gui-gtk-2.0/pages.c:821
-#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:916
+#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:918
#: data/Freeciv.in:96
msgid "Port"
msgstr "Port"
#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Version"
msgstr "Versioon"
#: client/gui-gtk-2.0/pages.c:782 client/gui-gtk-2.0/pages.c:823
-#: client/gui-gtk-2.0/pages.c:2161 client/gui-win32/connectdlg.c:917
-#: client/gui-win32/connectdlg.c:995
+#: client/gui-gtk-2.0/pages.c:2163 client/gui-win32/connectdlg.c:919
+#: client/gui-win32/connectdlg.c:997
msgid "Status"
msgstr "Staatus"
#: client/gui-gtk-2.0/pages.c:783 client/gui-gtk-2.0/pages.c:824
#: client/gui-sdl/connectdlg.c:318 client/gui-sdl/plrdlg.c:330
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Players"
msgstr "Mängijaid"
#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
-#: client/gui-win32/connectdlg.c:918
+#: client/gui-win32/connectdlg.c:920
msgid "Comment"
msgstr "Kommentaar"
@@ -12438,9 +12593,9 @@ msgstr "_Parool:"
msgid "Conf_irm Password:"
msgstr "Kinnita _parool:"
-#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2165
#: 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:1000
+#: client/gui-win32/citydlg.c:1083 client/gui-win32/connectdlg.c:1002
#: client/gui-win32/wldlg.c:800 client/gui-win32/wldlg.c:806
msgid "Type"
msgstr "Tüüp"
@@ -12532,7 +12687,7 @@ msgstr "_Tehisintellekti tase:"
msgid "Ruleset _Version:"
msgstr "_Reeglistiku versioon:"
-#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2195
msgid "_More Game Options..."
msgstr "Rohkem mängu_seadeid..."
@@ -12548,49 +12703,49 @@ msgstr "Reiting"
msgid "Ready"
msgstr "Valmis"
-#: client/gui-gtk-2.0/pages.c:1601
+#: client/gui-gtk-2.0/pages.c:1600
#, fuzzy
msgid "?player:Leader"
msgstr "?Player:Nimi"
-#: client/gui-gtk-2.0/pages.c:1732 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1734 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:1824
+#: client/gui-gtk-2.0/pages.c:1826
msgid "Choose Saved Game to _Load:"
msgstr "Vali salvestatud mäng _laadimiseks:"
-#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
-#: client/gui-gtk-2.0/pages.c:2451
+#: client/gui-gtk-2.0/pages.c:1846 client/gui-gtk-2.0/pages.c:2039
+#: client/gui-gtk-2.0/pages.c:2455
msgid "_Browse..."
msgstr "Lehitse..."
-#: client/gui-gtk-2.0/pages.c:1911
+#: client/gui-gtk-2.0/pages.c:1913
msgid "Choose a Scenario"
msgstr "Vali stsenaarium"
-#: client/gui-gtk-2.0/pages.c:1998
+#: client/gui-gtk-2.0/pages.c:2000
msgid "Choose a _Scenario:"
msgstr "Vali _stsenaarium:"
-#: client/gui-gtk-2.0/pages.c:2173
+#: client/gui-gtk-2.0/pages.c:2175
msgid "Choose a _nation to play:"
msgstr "Vali _rahvus, mida mängida:"
-#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2367 client/gui-win32/menu.c:581
msgid "Select Location to Save"
msgstr "Vali koht salvestamiseks"
-#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2452 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "Salvesta mäng"
-#: client/gui-gtk-2.0/pages.c:2489
+#: client/gui-gtk-2.0/pages.c:2493
msgid "Saved _Games:"
msgstr "_Salvestatud mängud:"
-#: client/gui-gtk-2.0/pages.c:2516
+#: client/gui-gtk-2.0/pages.c:2520
msgid "Save _Filename:"
msgstr "Salvestise _failinimi:"
@@ -12937,7 +13092,7 @@ msgstr "Sulge dialoog (Esc)"
msgid "Total users logged in : %d"
msgstr "Sisseloginud kasutajaid : %d"
-#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1098
msgid "Back"
msgstr "Tagasi"
@@ -12946,7 +13101,7 @@ msgid "Start"
msgstr "Alusta"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:777
+#: client/gui-win32/connectdlg.c:779
msgid "Load Game"
msgstr "Lae mäng"
@@ -12987,9 +13142,9 @@ msgstr "Tee uueks kodulinnaks"
#: client/gui-sdl/connectdlg.c:308 client/gui-sdl/connectdlg.c:617
#: client/gui-sdl/connectdlg.c:803 client/gui-sdl/connectdlg.c:985
#: client/gui-sdl/dialogs.c:452 client/gui-sdl/dialogs.c:2095
-#: client/gui-sdl/dialogs.c:2893 client/gui-sdl/diplomat_dialog.c:731
+#: client/gui-sdl/dialogs.c:2902 client/gui-sdl/diplomat_dialog.c:731
#: client/gui-sdl/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1043
#: client/gui-win32/dialogs.c:1772 client/gui-win32/finddlg.c:127
#: client/gui-win32/gotodlg.c:171 client/gui-win32/inputdlg.c:146
#: client/gui-win32/messagedlg.c:216 client/gui-win32/ratesdlg.c:328
@@ -13031,7 +13186,7 @@ msgid "Buy it?"
msgstr "Ostad?"
#: 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
+#: client/gui-sdl/diplodlg.c:1336 client/gui-sdl/diplomat_dialog.c:1211
#: client/gui-sdl/diplomat_dialog.c:1417 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:221 client/gui-sdl/repodlgs.c:1559
#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
@@ -13047,7 +13202,7 @@ msgid "No"
msgstr "Ei"
#: client/gui-sdl/citydlg.c:1215 client/gui-sdl/cma_fe.c:318
-#: client/gui-sdl/diplodlg.c:1345 client/gui-sdl/diplomat_dialog.c:1200
+#: client/gui-sdl/diplodlg.c:1346 client/gui-sdl/diplomat_dialog.c:1200
#: client/gui-sdl/diplomat_dialog.c:1407 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:232 client/gui-win32/repodlgs.c:578
#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
@@ -13352,7 +13507,7 @@ msgstr "Freecivi server :"
msgid "Port :"
msgstr "Port :"
-#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1100
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr "Ãœhenda"
@@ -13459,23 +13614,23 @@ msgstr "Vali omale uus valitsus"
msgid "REVOLUTION!"
msgstr "REVOLUTSIOON!"
-#: client/gui-sdl/dialogs.c:2232 client/gui-sdl/dialogs.c:2620
+#: client/gui-sdl/dialogs.c:2237 client/gui-sdl/dialogs.c:2625
#: client/gui-win32/dialogs.c:567 data/Freeciv.in:3159
msgid "Female"
msgstr "Naine"
-#: client/gui-sdl/dialogs.c:2234 client/gui-sdl/dialogs.c:2618
-#: client/gui-sdl/dialogs.c:2830 client/gui-win32/dialogs.c:565
+#: client/gui-sdl/dialogs.c:2239 client/gui-sdl/dialogs.c:2623
+#: client/gui-sdl/dialogs.c:2839 client/gui-win32/dialogs.c:565
msgid "Male"
msgstr "Mees"
-#: client/gui-sdl/dialogs.c:2478 client/gui-sdl/dialogs.c:2902
+#: client/gui-sdl/dialogs.c:2483 client/gui-sdl/dialogs.c:2911
#: 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 "Olgu"
-#: client/gui-sdl/dialogs.c:2685 client/gui-win32/dialogs.c:505
+#: client/gui-sdl/dialogs.c:2694 client/gui-win32/dialogs.c:505
msgid "What nation will you be?"
msgstr "Mis rahvusest Sa oled ?"
@@ -13502,53 +13657,53 @@ msgstr "Maailma kaart"
msgid "Sea map"
msgstr "Merekaart"
-#: client/gui-sdl/diplodlg.c:563
+#: client/gui-sdl/diplodlg.c:564
msgid "Give embassy"
msgstr "Anna saatkonnale"
-#: client/gui-sdl/diplodlg.c:579 client/gui-win32/diplodlg.c:614
+#: client/gui-sdl/diplodlg.c:580 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 "Kulda (max %d)"
-#: client/gui-sdl/diplodlg.c:613 client/gui-sdl/helpdlg.c:1956
+#: client/gui-sdl/diplodlg.c:614 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 "Leiutised"
-#: client/gui-sdl/diplodlg.c:831 client/gui-win32/diplodlg.c:598
+#: client/gui-sdl/diplodlg.c:832 client/gui-win32/diplodlg.c:598
#: data/Freeciv.in:269
msgid "Diplomacy meeting"
msgstr "Diplomaatiline kohtumine"
-#: client/gui-sdl/diplodlg.c:883 client/gui-win32/diplodlg.c:680
+#: client/gui-sdl/diplodlg.c:884 client/gui-win32/diplodlg.c:680
#: data/Freeciv.in:510
msgid "Cancel meeting"
msgstr "Katkesta kohtumine"
-#: client/gui-sdl/diplodlg.c:895 client/gui-win32/diplodlg.c:679
+#: client/gui-sdl/diplodlg.c:896 client/gui-win32/diplodlg.c:679
#: data/Freeciv.in:501
msgid "Accept treaty"
msgstr "Nõustu lepinguga"
#. TRANS: "Polish incident !" FIXME!!!
-#: client/gui-sdl/diplodlg.c:1304
+#: client/gui-sdl/diplodlg.c:1305
#, c-format
msgid "%s incident !"
msgstr "%s vahejuhtum!"
-#: client/gui-sdl/diplodlg.c:1322
+#: client/gui-sdl/diplodlg.c:1323
msgid "Shall we declare WAR on them?"
msgstr "Kas kuulutame neile SÕJA?"
-#: client/gui-sdl/diplodlg.c:1433
+#: client/gui-sdl/diplodlg.c:1434
msgid "Foreign Minister"
msgstr "Välisminister"
-#: client/gui-sdl/diplodlg.c:1449
+#: client/gui-sdl/diplodlg.c:1450
#, c-format
msgid ""
"Sir!, the %s ambassador has arrived\n"
@@ -13557,24 +13712,24 @@ msgstr ""
"Härra, %s suursaadik jõudis kohale\n"
"Millised on teie soovid?"
-#: client/gui-sdl/diplodlg.c:1465
+#: client/gui-sdl/diplodlg.c:1466
msgid "Declare WAR"
msgstr "Kuuluta SÕDA"
-#: client/gui-sdl/diplodlg.c:1467 client/gui-win32/plrdlg.c:357
+#: client/gui-sdl/diplodlg.c:1468 client/gui-win32/plrdlg.c:357
msgid "Cancel Treaty"
msgstr "Katkesta kohtumine"
-#: client/gui-sdl/diplodlg.c:1490 client/gui-win32/plrdlg.c:358
+#: client/gui-sdl/diplodlg.c:1491 client/gui-win32/plrdlg.c:358
#: data/Freeciv.in:3254
msgid "Withdraw vision"
msgstr "Võta vaade tagasi"
-#: client/gui-sdl/diplodlg.c:1507
+#: client/gui-sdl/diplodlg.c:1508
msgid "Call Diplomatic Meeting"
msgstr "Kutsu kokku diplomaatiline kohtumine"
-#: client/gui-sdl/diplodlg.c:1521
+#: client/gui-sdl/diplodlg.c:1522
msgid "Send him back"
msgstr "Saada ta tagasi"
@@ -14315,12 +14470,12 @@ msgid "Leave Game"
msgstr "Lahku mängust"
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1100 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1102 client/gui-xaw/menu.c:121
#: data/Freeciv.in:115 data/Freeciv.in:3180
msgid "Quit"
msgstr "Välju"
-#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:967
msgid "Start New Game"
msgstr "Alusta uut mängu"
@@ -14432,8 +14587,8 @@ msgstr "Sissetulek (neto): "
msgid "%s max rate : %d%%"
msgstr "%s maksimaalne määr: %d%%"
-#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
-#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1085
+#: client/gui-win32/connectdlg.c:1093 data/Freeciv.in:155
msgid "Update"
msgstr "Värskenda vaadet"
@@ -14926,67 +15081,67 @@ msgstr "Uus"
msgid "Delete"
msgstr "Kustuta"
-#: client/gui-win32/connectdlg.c:147
+#: client/gui-win32/connectdlg.c:149
msgid "Password:"
msgstr "Parool:"
-#: client/gui-win32/connectdlg.c:169
+#: client/gui-win32/connectdlg.c:171
msgid "Couldn't load the savegame"
msgstr "Ei suuda laadida salvestatud mängu: %s"
-#: client/gui-win32/connectdlg.c:284 client/gui-xaw/connectdlg.c:311
+#: client/gui-win32/connectdlg.c:286 client/gui-xaw/connectdlg.c:311
msgid "Verify Password"
msgstr "Kinnita parool"
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:916 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr "Freeciv'i serveri valik"
-#: client/gui-win32/connectdlg.c:915
+#: client/gui-win32/connectdlg.c:917
msgid "Local Area Network"
msgstr "Kohtvõrk"
-#: client/gui-win32/connectdlg.c:949
+#: client/gui-win32/connectdlg.c:951
msgid "Welcome to Freeciv"
msgstr "Tere tulemast Freecivi"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Load Saved Game"
msgstr "Lae salvestatud mäng"
-#: client/gui-win32/connectdlg.c:969
+#: client/gui-win32/connectdlg.c:971
msgid "Connect To Network Game"
msgstr "Ühenda võrgumänguga"
-#: client/gui-win32/connectdlg.c:979
+#: client/gui-win32/connectdlg.c:981
msgid "Choose a nation to play"
msgstr "Vali omale rahvus"
-#: client/gui-win32/connectdlg.c:1014
+#: client/gui-win32/connectdlg.c:1016
msgid "Number of players (Including AI):"
msgstr "Mängijate hulk (kaasa arvatud arvuti):"
-#: client/gui-win32/connectdlg.c:1022
+#: client/gui-win32/connectdlg.c:1024
msgid "AI skill level:"
msgstr "Arvuti mänguoskus:"
-#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1038 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr "Mängu seaded"
-#: client/gui-win32/connectdlg.c:1040
+#: client/gui-win32/connectdlg.c:1042
msgid "Start Game"
msgstr "Alusta mängu"
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Login:"
msgstr "Kasutajanimi:"
-#: client/gui-win32/connectdlg.c:1061
+#: client/gui-win32/connectdlg.c:1063
msgid "Host:"
msgstr "Server:"
-#: client/gui-win32/connectdlg.c:1062
+#: client/gui-win32/connectdlg.c:1064
msgid "Port:"
msgstr "Port:"
@@ -15059,21 +15214,21 @@ msgid ""
"this is much slower."
msgstr ""
-#: client/gui-win32/helpdlg.c:769 client/gui-win32/helpdlg.c:792
-#: client/gui-win32/helpdlg.c:803 client/gui-win32/helpdlg.c:809
-#: client/gui-win32/helpdlg.c:822
+#: client/gui-win32/helpdlg.c:775 client/gui-win32/helpdlg.c:798
+#: client/gui-win32/helpdlg.c:809 client/gui-win32/helpdlg.c:815
+#: client/gui-win32/helpdlg.c:828
msgid "Allows "
msgstr "Lubab"
-#: client/gui-win32/helpdlg.c:780
+#: client/gui-win32/helpdlg.c:786
msgid "Obsoletes "
msgstr "Muudab kasutuks"
-#: client/gui-win32/helpdlg.c:812 client/gui-win32/helpdlg.c:825
+#: client/gui-win32/helpdlg.c:818 client/gui-win32/helpdlg.c:831
msgid " (with "
msgstr ""
-#: client/gui-win32/helpdlg.c:815 client/gui-win32/helpdlg.c:828
+#: client/gui-win32/helpdlg.c:821 client/gui-win32/helpdlg.c:834
msgid "?techhelp:)."
msgstr "?techhelp:)."
@@ -16189,11 +16344,12 @@ msgid " Present administrators: "
msgstr " Praegused haldajad:"
#: 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/"
+" https://gna.org/projects/freeciv/"
msgstr ""
"Kui leiad Freecivis vigu, siis palun saada vearaport. Parim on, kui teed "
"seda spetsiaalse Freecivi vigadejahtimissüsteemi kaudu:\n"
@@ -18466,6 +18622,7 @@ msgid "Hydro Plant"
msgstr "Hüdroelektrijaam"
#: data/default/buildings.ruleset:378
+#, fuzzy
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 "
@@ -18473,46 +18630,42 @@ msgid ""
"a Factory, Mfg. Plant and Hydro Plant together give a 150% production "
"bonus.\n"
"\n"
-"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant. A city "
-"can only build a Hydro Plant if it is next to (or on) a Mountain or River "
-"tile."
+"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant."
msgstr ""
-"Vähendab linnas tootmisest tulenevat saastamist 50%. Samutis suurendab linna "
-"käsitöövabriku või tehase kogutoodangut: tehas ja hüdroelektrijaam annavad "
-"100% boonuse, kuid tehas, käsitöövabrik ja hüdroelektrijaam üheskoos annavad "
-"150%-lise toodanguboonuse.\n"
+"Vähendab tootmisest tuleneva saastamise hulka 50%. Samuti suurendab tehase "
+"ja manufaktuuri tootlikkust: vabrik ja tuumaelektrijaam annavad 75% lisa; "
+"teahs, manufaktuur ja tuumaelektrijaam koos annavad 150% lisa.\n"
"\n"
-"Linnas saab olla ainult üks hüdroelektrijaam, elektrijaam või "
-"tuumaelektrijaam. Linn saab ehitada hüdroelektrijaama ainult siis, kui ta "
-"vahetus läheduses asuvad mäed või jõgi."
+"Linnas saab korraga olla ainult üks elektrijaam - päikese- , hüdro-, tuuma- "
+"või tavaline elektrijaam."
-#: data/default/buildings.ruleset:397 data/civ2/buildings.ruleset:373
+#: data/default/buildings.ruleset:396 data/civ2/buildings.ruleset:373
#: data/civ1/buildings.ruleset:297
msgid "Library"
msgstr "Raamatukogu"
-#: data/default/buildings.ruleset:412
+#: data/default/buildings.ruleset:411
#, no-c-format
msgid "Increases the science output in a city by 100%."
msgstr "Tõstab linna teadustoodangut 100%."
-#: data/default/buildings.ruleset:417 data/civ2/buildings.ruleset:393
+#: data/default/buildings.ruleset:416 data/civ2/buildings.ruleset:393
#: data/civ1/buildings.ruleset:317
msgid "Marketplace"
msgstr "Turg"
-#: data/default/buildings.ruleset:432 data/civ2/buildings.ruleset:408
+#: data/default/buildings.ruleset:431 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 "Tõstab linna luksuskaupade ja maksude tootlikkust 50%."
-#: data/default/buildings.ruleset:437 data/civ2/buildings.ruleset:413
+#: data/default/buildings.ruleset:436 data/civ2/buildings.ruleset:413
#: data/civ1/buildings.ruleset:337
msgid "Mass Transit"
msgstr "Ãœhistransport"
-#: data/default/buildings.ruleset:451 data/civ2/buildings.ruleset:427
+#: data/default/buildings.ruleset:450 data/civ2/buildings.ruleset:427
#: data/civ1/buildings.ruleset:351
msgid ""
"Neutralizes the pollution generated by the population. The population "
@@ -18521,12 +18674,12 @@ msgstr ""
"Neutraliseerib elanike poolt tekitatava saasta. Elanikud ei mõjuta mitte "
"kuidagi linnas tekkiva saastamise hulka."
-#: data/default/buildings.ruleset:458 data/civ2/buildings.ruleset:434
+#: data/default/buildings.ruleset:457 data/civ2/buildings.ruleset:434
#: data/civ1/buildings.ruleset:358
msgid "Mfg. Plant"
msgstr "Manufaktuur"
-#: data/default/buildings.ruleset:474 data/civ2/buildings.ruleset:450
+#: data/default/buildings.ruleset:473 data/civ2/buildings.ruleset:450
#: data/civ1/buildings.ruleset:374
#, no-c-format
msgid ""
@@ -18534,12 +18687,12 @@ msgid ""
"production in a city by 100%."
msgstr "Koos tehasega tõstab manufaktuur linna toodangut 100%."
-#: data/default/buildings.ruleset:480 data/civ2/buildings.ruleset:456
+#: data/default/buildings.ruleset:479 data/civ2/buildings.ruleset:456
#: data/civ1/buildings.ruleset:380
msgid "Nuclear Plant"
msgstr "Tuumaelektrijaam"
-#: data/default/buildings.ruleset:495
+#: data/default/buildings.ruleset:494
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 "
@@ -18556,11 +18709,11 @@ msgstr ""
"Linnas saab korraga olla ainult üks elektrijaam - päikese- , hüdro-, tuuma- "
"või tavaline elektrijaam."
-#: data/default/buildings.ruleset:515 data/civ2/buildings.ruleset:489
+#: data/default/buildings.ruleset:514 data/civ2/buildings.ruleset:489
msgid "Offshore Platform"
msgstr "Mereplatvorm"
-#: data/default/buildings.ruleset:530 data/civ2/buildings.ruleset:504
+#: data/default/buildings.ruleset:529 data/civ2/buildings.ruleset:504
msgid ""
"Adds 1 extra shield resource on all Ocean squares in a city. The city needs "
"to be coastal to build this improvement."
@@ -18568,12 +18721,12 @@ msgstr ""
"Lisab 1 toodangupunkti kõigile mereruudukestele linna ümbruses. Saab ehitada "
"ainult mereäärsetes linnades."
-#: data/default/buildings.ruleset:536 data/civ2/buildings.ruleset:510
+#: data/default/buildings.ruleset:535 data/civ2/buildings.ruleset:510
#: data/civ1/buildings.ruleset:411
msgid "Palace"
msgstr "Palee"
-#: data/default/buildings.ruleset:552
+#: data/default/buildings.ruleset:551
#, no-c-format
msgid ""
"Makes a city the capital and the center of your government. Corruption in "
@@ -18601,11 +18754,11 @@ msgstr ""
"Despootlikus riigis annab palee 75% toodangulisa, monarhia korral 50% "
"toodangulisa."
-#: data/default/buildings.ruleset:569 data/civ2/buildings.ruleset:539
+#: data/default/buildings.ruleset:568 data/civ2/buildings.ruleset:539
msgid "Police Station"
msgstr "Politseimaja"
-#: data/default/buildings.ruleset:583 data/civ2/buildings.ruleset:553
+#: data/default/buildings.ruleset:582 data/civ2/buildings.ruleset:553
msgid ""
"Reduces the unhappiness caused by military units outside the city by 2 under "
"Democracy and 1 under Republic. This improvement has no effect under other "
@@ -18615,11 +18768,11 @@ msgstr ""
"sõdurite poolt, demokraatia korral 2, vabariigi korral 1 võrra. Muude "
"valitsusvormide korral pole sellest ehitisest midagi kasu."
-#: data/default/buildings.ruleset:593 data/civ2/buildings.ruleset:560
+#: data/default/buildings.ruleset:592 data/civ2/buildings.ruleset:560
msgid "Port Facility"
msgstr "Sõjaväesadam"
-#: data/default/buildings.ruleset:608 data/civ2/buildings.ruleset:575
+#: data/default/buildings.ruleset:607 data/civ2/buildings.ruleset:575
msgid ""
"Allows a city to build veteran sea units. Also, damaged sea units which "
"stay in town for one full turn without moving are completely restored."
@@ -18627,12 +18780,12 @@ msgstr ""
"Võimaldab ehitada veteranlaevu. Samuti parandab täielikult ära viga saanud "
"laevad, mis jäävad linna vähemalt üheks käiguks."
-#: data/default/buildings.ruleset:615 data/civ2/buildings.ruleset:582
+#: data/default/buildings.ruleset:614 data/civ2/buildings.ruleset:582
#: data/civ1/buildings.ruleset:440
msgid "Power Plant"
msgstr "Elektrijaam"
-#: data/default/buildings.ruleset:631
+#: data/default/buildings.ruleset:630
#, no-c-format
msgid ""
"Increases the shield production of a Factory or Mfg. Plant in a city: a "
@@ -18649,12 +18802,12 @@ msgstr ""
"Linnas saab korraga olla ainult üks elektrijaam - päikese- , hüdro-, tuuma- "
"või tavaline elektrijaam."
-#: data/default/buildings.ruleset:646 data/civ2/buildings.ruleset:610
+#: data/default/buildings.ruleset:645 data/civ2/buildings.ruleset:610
#: data/civ1/buildings.ruleset:468
msgid "Recycling Center"
msgstr "Ümbertöötlemise keskus"
-#: data/default/buildings.ruleset:661 data/civ2/buildings.ruleset:625
+#: data/default/buildings.ruleset:660 data/civ2/buildings.ruleset:625
#: data/civ1/buildings.ruleset:483
#, no-c-format
msgid ""
@@ -18662,11 +18815,11 @@ msgid ""
"production in a city by 66%."
msgstr "Ümbertöötlemise keskus vähendab linna poolt tekitatavat saasta 66%."
-#: data/default/buildings.ruleset:667 data/civ2/buildings.ruleset:631
+#: data/default/buildings.ruleset:666 data/civ2/buildings.ruleset:631
msgid "Research Lab"
msgstr "Uuringukeskus"
-#: data/default/buildings.ruleset:682
+#: data/default/buildings.ruleset:681
msgid ""
"Together with a Library, a Research Lab increases the science production of "
"a city by 200%. Together with a Library and a University, a Research Lab "
@@ -18675,11 +18828,11 @@ msgstr ""
"Raamatukoguga koos tõstab uuringukeskus teadustoodangut 200%. Koos "
"raamatukogu ja ülikooliga tõstab uuringukeskus teadustoodangut 450%."
-#: data/default/buildings.ruleset:690 data/civ2/buildings.ruleset:654
+#: data/default/buildings.ruleset:689 data/civ2/buildings.ruleset:654
msgid "SAM Battery"
msgstr "Õhutõrjesüsteem"
-#: data/default/buildings.ruleset:704 data/civ2/buildings.ruleset:668
+#: data/default/buildings.ruleset:703 data/civ2/buildings.ruleset:668
msgid ""
"Doubles the defense of all units inside the city when attacked by non-"
"nuclear air units."
@@ -18687,12 +18840,12 @@ msgstr ""
"Tõstab kõigi linnas asuvate üksuste kaitsejõudu, kui neid ründab mõni "
"õhuüksus (välja arvatud tuumapomm)"
-#: data/default/buildings.ruleset:710 data/civ2/buildings.ruleset:674
+#: data/default/buildings.ruleset:709 data/civ2/buildings.ruleset:674
#: data/civ1/buildings.ruleset:489
msgid "SDI Defense"
msgstr "SDI kaitse"
-#: data/default/buildings.ruleset:724 data/civ2/buildings.ruleset:688
+#: data/default/buildings.ruleset:723 data/civ2/buildings.ruleset:688
#: data/civ1/buildings.ruleset:503
msgid ""
"Protects a city from attacks from Nuclear units. Nuclear attacks simply "
@@ -18703,11 +18856,11 @@ msgstr ""
"tuumapommid linnale mitte kui midagi. Samuti tõstab kaitset rakettide (välja "
"arvatud tuumapommid) vastu kaks korda."
-#: data/default/buildings.ruleset:733 data/civ2/buildings.ruleset:697
+#: data/default/buildings.ruleset:732 data/civ2/buildings.ruleset:697
msgid "Sewer System"
msgstr "Kanalisatsioon"
-#: data/default/buildings.ruleset:748 data/civ2/buildings.ruleset:712
+#: data/default/buildings.ruleset:747 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."
@@ -18715,12 +18868,12 @@ msgstr ""
"Võimaldab linnal kasvada suuremaks, kui 12. Eelnevalt peab olemas olema "
"akvedukt, et oleks võimalik kasvada suuremaks, kui 8."
-#: data/default/buildings.ruleset:754 data/civ2/buildings.ruleset:749
+#: data/default/buildings.ruleset:753 data/civ2/buildings.ruleset:749
#: data/civ1/buildings.ruleset:512
msgid "Space Component"
msgstr "Kosmoselaeva küttesüsteem"
-#: data/default/buildings.ruleset:769 data/civ2/buildings.ruleset:763
+#: data/default/buildings.ruleset:768 data/civ2/buildings.ruleset:763
#: data/civ1/buildings.ruleset:526
msgid ""
"Space Components can be differentiated into Propulsion and Fuel Components. "
@@ -18737,12 +18890,12 @@ msgstr ""
"Enne kui saad hakata kosmoselaeva osi ehitama, peab üks mängijatest olema "
"ehitanud valmis Apollo programmi ilmaime."
-#: data/default/buildings.ruleset:779 data/civ2/buildings.ruleset:773
+#: data/default/buildings.ruleset:778 data/civ2/buildings.ruleset:773
#: data/civ1/buildings.ruleset:536
msgid "Space Module"
msgstr "Kosmosemoodul"
-#: data/default/buildings.ruleset:794 data/civ2/buildings.ruleset:787
+#: data/default/buildings.ruleset:793 data/civ2/buildings.ruleset:787
#: data/civ1/buildings.ruleset:550
msgid ""
"Space Modules are the most expensive parts of spaceships. There are three "
@@ -18775,12 +18928,12 @@ msgstr ""
"Enne kui saad hakata kosmoselaeva osi ehitama, peab üks mängijatest olema "
"ehitanud valmis Apollo programmi ilmaime."
-#: data/default/buildings.ruleset:813 data/civ2/buildings.ruleset:806
+#: data/default/buildings.ruleset:812 data/civ2/buildings.ruleset:806
#: data/civ1/buildings.ruleset:569
msgid "Space Structural"
msgstr "Kosmoselaeva liitekohad"
-#: data/default/buildings.ruleset:828 data/civ2/buildings.ruleset:820
+#: data/default/buildings.ruleset:827 data/civ2/buildings.ruleset:820
#: data/civ1/buildings.ruleset:583
#, fuzzy
msgid ""
@@ -18798,11 +18951,11 @@ msgstr ""
"Enne kui saad hakata kosmoselaeva osi ehitama, peab üks mängijatest olema "
"ehitanud valmis Apollo programmi ilmaime."
-#: data/default/buildings.ruleset:838 data/civ2/buildings.ruleset:830
+#: data/default/buildings.ruleset:837 data/civ2/buildings.ruleset:830
msgid "Stock Exchange"
msgstr "Börs"
-#: data/default/buildings.ruleset:854 data/civ2/buildings.ruleset:846
+#: data/default/buildings.ruleset:853 data/civ2/buildings.ruleset:846
#, no-c-format
msgid ""
"Together with a Marketplace and a Bank, a Stock Exchange boosts tax and "
@@ -18811,11 +18964,11 @@ msgstr ""
"Turu ja pangaga üheskoos tõstab börs maksudest ja hüvedest saadavat tulu "
"150%."
-#: data/default/buildings.ruleset:860 data/civ2/buildings.ruleset:852
+#: data/default/buildings.ruleset:859 data/civ2/buildings.ruleset:852
msgid "Super Highways"
msgstr "Super kiirtee"
-#: data/default/buildings.ruleset:875 data/civ2/buildings.ruleset:867
+#: data/default/buildings.ruleset:874 data/civ2/buildings.ruleset:867
#, no-c-format
msgid ""
"Increases trade resources by 50% on all squares with roads or railroads."
@@ -18823,11 +18976,11 @@ msgstr ""
"Suurendab kaubanduse tootlikkust 50% ruudukestel, millel on teed või "
"raudteed."
-#: data/default/buildings.ruleset:883 data/civ2/buildings.ruleset:873
+#: data/default/buildings.ruleset:882 data/civ2/buildings.ruleset:873
msgid "Supermarket"
msgstr "Ostukeskus"
-#: data/default/buildings.ruleset:898 data/civ2/buildings.ruleset:888
+#: data/default/buildings.ruleset:897 data/civ2/buildings.ruleset:888
#, no-c-format
msgid ""
"Increases the food resources by 50% on each farmland square which is being "
@@ -18837,12 +18990,12 @@ msgstr ""
"Tõstab linna ümbruses olevate põllumaade toidutoodangut 50%. Põllumaadeks "
"peetakse ruudukesi, mida on kaks korda niisutatud."
-#: data/default/buildings.ruleset:905 data/civ2/buildings.ruleset:895
+#: data/default/buildings.ruleset:904 data/civ2/buildings.ruleset:895
#: data/civ1/buildings.ruleset:593
msgid "Temple"
msgstr "Tempel"
-#: data/default/buildings.ruleset:919 data/civ2/buildings.ruleset:909
+#: data/default/buildings.ruleset:918 data/civ2/buildings.ruleset:909
#: data/civ1/buildings.ruleset:607
msgid ""
"Makes one unhappy citizen content. Both the Mysticism advance and the "
@@ -18853,25 +19006,25 @@ msgstr ""
"mõju kahekordseks. Kui on olemas nii müstika kui Oraakel, muudetakse "
"rahulolevaks 4 kodanikku."
-#: data/default/buildings.ruleset:926 data/civ2/buildings.ruleset:916
+#: data/default/buildings.ruleset:925 data/civ2/buildings.ruleset:916
#: data/civ1/buildings.ruleset:614 data/default/techs.ruleset:742
#: data/civ2/techs.ruleset:727 data/civ1/techs.ruleset:723
msgid "University"
msgstr "Ãœlikool"
-#: data/default/buildings.ruleset:942
+#: data/default/buildings.ruleset:941
#, no-c-format
msgid ""
"Together with a Library, a University increases the science production of a "
"city by 250%."
msgstr "Raamatukoguga koos tõstab ülikool linna teadustoodangut 250%."
-#: data/default/buildings.ruleset:948 data/civ2/buildings.ruleset:938
+#: data/default/buildings.ruleset:947 data/civ2/buildings.ruleset:938
#: data/civ1/buildings.ruleset:636
msgid "Apollo Program"
msgstr "Apollo Programm"
-#: data/default/buildings.ruleset:962 data/civ2/buildings.ruleset:952
+#: data/default/buildings.ruleset:961 data/civ2/buildings.ruleset:952
msgid ""
"Entire map becomes visible for the player who owns it. It allows all "
"players to start building spaceship parts (assuming they have researched the "
@@ -18881,11 +19034,11 @@ msgstr ""
"hakata ehitama kosmoselaeva osi (eeldusel, et vajalikud tehnoloogiad on "
"avastatud)."
-#: data/default/buildings.ruleset:969 data/civ2/buildings.ruleset:959
+#: data/default/buildings.ruleset:968 data/civ2/buildings.ruleset:959
msgid "A.Smith's Trading Co."
msgstr "A. Smithi kaubafirma"
-#: data/default/buildings.ruleset:983
+#: data/default/buildings.ruleset:982
msgid ""
"City improvements which would normally have an upkeep of 1 are free of "
"upkeep, for all your cities."
@@ -18893,12 +19046,12 @@ msgstr ""
"Ehitised, mille ülalpidamiskulu on 1 kuldraha, vabastatakse "
"ülalpidamiskulust. Kehtib kõigis linnades."
-#: data/default/buildings.ruleset:989 data/civ2/buildings.ruleset:979
+#: data/default/buildings.ruleset:988 data/civ2/buildings.ruleset:979
#: data/civ1/buildings.ruleset:655
msgid "Colossus"
msgstr "Kolossus"
-#: data/default/buildings.ruleset:1003 data/civ2/buildings.ruleset:993
+#: data/default/buildings.ruleset:1002 data/civ2/buildings.ruleset:993
#: data/civ1/buildings.ruleset:669
msgid ""
"Each square around the city where this wonder is built that is already "
@@ -18907,23 +19060,23 @@ msgstr ""
"Linnas, kus see ilmaime on ehitatud, hakkavad kõik juba midagi tootvad "
"ruudukesed tootma kõike ühe ühiku võrra rohkem."
-#: data/default/buildings.ruleset:1009 data/civ2/buildings.ruleset:999
+#: data/default/buildings.ruleset:1008 data/civ2/buildings.ruleset:999
#: data/civ1/buildings.ruleset:675
msgid "Copernicus' Observatory"
msgstr "Copernicuse Observatoorium"
-#: data/default/buildings.ruleset:1024 data/civ2/buildings.ruleset:1180
+#: data/default/buildings.ruleset:1023 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 "Tõstab teadustoodangut 100% linnas, kuhu see ehitatakse."
-#: data/default/buildings.ruleset:1029 data/civ2/buildings.ruleset:1019
+#: data/default/buildings.ruleset:1028 data/civ2/buildings.ruleset:1019
#: data/civ1/buildings.ruleset:695
msgid "Cure For Cancer"
msgstr "Vähiravi"
-#: data/default/buildings.ruleset:1043
+#: data/default/buildings.ruleset:1042
msgid ""
"This stunning technological achievement makes one unhappy citizen content in "
"all your cities."
@@ -18931,12 +19084,12 @@ msgstr ""
"See suurepärane tehnoloogiline läbimurre muudab igas su linnas ühe õnnetu "
"kodaniku rahulolevaks."
-#: data/default/buildings.ruleset:1051 data/civ2/buildings.ruleset:1039
+#: data/default/buildings.ruleset:1050 data/civ2/buildings.ruleset:1039
#: data/civ1/buildings.ruleset:715
msgid "Darwin's Voyage"
msgstr "Darwini retk"
-#: data/default/buildings.ruleset:1065 data/civ2/buildings.ruleset:1053
+#: data/default/buildings.ruleset:1064 data/civ2/buildings.ruleset:1053
#: data/civ1/buildings.ruleset:729
msgid ""
"Charles Darwin's voyage sparked the discovery of the evolution of the "
@@ -18947,11 +19100,11 @@ msgstr ""
"süvendas inimeste usku teadustöösse. Annab sulle koheselt kaks seni "
"avastamata tehnoloogiat."
-#: data/default/buildings.ruleset:1072 data/civ2/buildings.ruleset:1060
+#: data/default/buildings.ruleset:1071 data/civ2/buildings.ruleset:1060
msgid "Eiffel Tower"
msgstr "Eiffeli torn"
-#: data/default/buildings.ruleset:1087
+#: data/default/buildings.ruleset:1086
#, fuzzy, no-c-format
msgid ""
"Your reputation and goodwill among other nations is recovered twice as fast."
@@ -18959,12 +19112,12 @@ msgstr ""
"Kui sul on see ilmaime, hindavad su vastased sind kõrgemalt ja suhtuvad "
"sinusse paremini. Su reputatsioon paraneb kaks korda kiiremini."
-#: data/default/buildings.ruleset:1093 data/civ2/buildings.ruleset:1081
+#: data/default/buildings.ruleset:1092 data/civ2/buildings.ruleset:1081
#: data/civ1/buildings.ruleset:736
msgid "Great Library"
msgstr "Suur Raamatukogu"
-#: data/default/buildings.ruleset:1107 data/civ2/buildings.ruleset:1095
+#: data/default/buildings.ruleset:1106 data/civ2/buildings.ruleset:1095
#: data/civ1/buildings.ruleset:750
msgid ""
"The civilization which builds the Great Library gets every advance that at "
@@ -18973,21 +19126,21 @@ msgstr ""
"Tsivilisatsioon, mis ehitab Suure Raamatukogu, saab omale iga uue "
"tehnoloogia, mille on omale saanud vähemalt kaks muud tsivilisatsiooni."
-#: data/default/buildings.ruleset:1113 data/civ2/buildings.ruleset:1101
+#: data/default/buildings.ruleset:1112 data/civ2/buildings.ruleset:1101
#: data/civ1/buildings.ruleset:756
msgid "Great Wall"
msgstr "Suur Müür"
-#: data/default/buildings.ruleset:1127
+#: data/default/buildings.ruleset:1126
msgid "Works as a City Wall in all your cities."
msgstr "Sama efekt, kui igasse linna ehitada linnamüür"
-#: data/default/buildings.ruleset:1135 data/civ2/buildings.ruleset:1122
+#: data/default/buildings.ruleset:1134 data/civ2/buildings.ruleset:1122
#: data/civ1/buildings.ruleset:777
msgid "Hanging Gardens"
msgstr "Rippaiad"
-#: data/default/buildings.ruleset:1149 data/civ2/buildings.ruleset:1136
+#: data/default/buildings.ruleset:1148 data/civ2/buildings.ruleset:1136
#: data/civ1/buildings.ruleset:791
msgid ""
"Makes one content citizen happy in every city. Makes two extra content "
@@ -19001,12 +19154,12 @@ msgstr ""
"kodanikku õnnelikuks. Kui juhtumisi pole linnas ühtki rahulolevat kodanikku, "
"muudetakse nende asemel õnnetuid kodanikke rahulolevaks."
-#: data/default/buildings.ruleset:1158 data/civ2/buildings.ruleset:1145
+#: data/default/buildings.ruleset:1157 data/civ2/buildings.ruleset:1145
#: data/civ1/buildings.ruleset:800
msgid "Hoover Dam"
msgstr "Hooveri tamm"
-#: data/default/buildings.ruleset:1173 data/civ2/buildings.ruleset:1159
+#: data/default/buildings.ruleset:1172 data/civ2/buildings.ruleset:1159
msgid ""
"Works as if you had a Hydro Plant in every city. (This reduces pollution "
"and increases the effects of Factories and Mfg. Plants.)"
@@ -19014,12 +19167,12 @@ msgstr ""
"Annab sama efekti, nagu sul oleks hüdroelektrijaam igas linnas. (See "
"vähendab saastamist ja suurendab vabrikute ja manufaktuuride efektiivsust.)"
-#: data/default/buildings.ruleset:1179 data/civ2/buildings.ruleset:1165
+#: data/default/buildings.ruleset:1178 data/civ2/buildings.ruleset:1165
#: data/civ1/buildings.ruleset:822
msgid "Isaac Newton's College"
msgstr "Isaac Newton'i Kolledž"
-#: data/default/buildings.ruleset:1194
+#: data/default/buildings.ruleset:1193
#, no-c-format
msgid ""
"Boosts science production by 100% in every city you control that has a "
@@ -19027,20 +19180,20 @@ msgid ""
msgstr ""
"Tõstab teadustoodangut 100% igas sinu valduses olevas ülikooliga linnas."
-#: data/default/buildings.ruleset:1200 data/civ2/buildings.ruleset:1185
+#: data/default/buildings.ruleset:1199 data/civ2/buildings.ruleset:1185
#: data/civ1/buildings.ruleset:842
msgid "J.S. Bach's Cathedral"
msgstr "J.S. Bach'i Katedraal"
-#: data/default/buildings.ruleset:1214 data/civ2/buildings.ruleset:1199
+#: data/default/buildings.ruleset:1213 data/civ2/buildings.ruleset:1199
msgid "Makes two unhappy citizens content in every city."
msgstr "Muudab igas linnas kaks õnnetut kodanikku rahulolevaks."
-#: data/default/buildings.ruleset:1219 data/civ2/buildings.ruleset:1204
+#: data/default/buildings.ruleset:1218 data/civ2/buildings.ruleset:1204
msgid "King Richard's Crusade"
msgstr "Kuningas Richardi ristisõda"
-#: data/default/buildings.ruleset:1233 data/civ2/buildings.ruleset:1218
+#: data/default/buildings.ruleset:1232 data/civ2/buildings.ruleset:1218
msgid ""
"Adds one extra shield resource on every square around the city where it is "
"built."
@@ -19048,20 +19201,20 @@ msgstr ""
"Lisab selle linna, kuhu see ilmaime on ehitatud, igale ruudukesele ühe "
"toodangupunkti juurde."
-#: data/default/buildings.ruleset:1239 data/civ2/buildings.ruleset:1224
+#: data/default/buildings.ruleset:1238 data/civ2/buildings.ruleset:1224
msgid "Leonardo's Workshop"
msgstr "Leonardo Töökoda"
-#: data/default/buildings.ruleset:1253 data/civ2/buildings.ruleset:1238
+#: data/default/buildings.ruleset:1252 data/civ2/buildings.ruleset:1238
msgid "Upgrades one obsolete unit per game turn."
msgstr "Uuendab iga käigu jooksul ühe iganenud üksuse."
-#: data/default/buildings.ruleset:1258 data/civ2/buildings.ruleset:1243
+#: data/default/buildings.ruleset:1257 data/civ2/buildings.ruleset:1243
#: data/civ1/buildings.ruleset:862
msgid "Lighthouse"
msgstr "Tuletorn"
-#: data/default/buildings.ruleset:1273
+#: data/default/buildings.ruleset:1272
msgid ""
"Gives all your sea units 1 additional movement point and eliminates the risk "
"of losing Triremes on the high seas. Makes all your new sea units veterans "
@@ -19071,34 +19224,34 @@ msgstr ""
"kaotamiseks avamerel. Teeb kõik uued mereüksused veteranideks (kõigis "
"linnades)."
-#: data/default/buildings.ruleset:1280 data/civ2/buildings.ruleset:1264
+#: data/default/buildings.ruleset:1279 data/civ2/buildings.ruleset:1264
#: data/civ1/buildings.ruleset:885
msgid "Magellan's Expedition"
msgstr "Magellani ekspeditsioon"
-#: data/default/buildings.ruleset:1295
+#: data/default/buildings.ruleset:1294
msgid "Gives all your sea units 2 additional movement points."
msgstr "Annab kõikidele mereüksustele 2 lisakäiku."
-#: data/default/buildings.ruleset:1300 data/civ2/buildings.ruleset:1283
+#: data/default/buildings.ruleset:1299 data/civ2/buildings.ruleset:1283
#: data/civ1/buildings.ruleset:904
msgid "Manhattan Project"
msgstr "Manhattani projekt"
-#: data/default/buildings.ruleset:1318 data/civ2/buildings.ruleset:1301
+#: data/default/buildings.ruleset:1317 data/civ2/buildings.ruleset:1301
msgid "Marco Polo's Embassy"
msgstr "Marco Polo Saatkond"
-#: data/default/buildings.ruleset:1332 data/civ2/buildings.ruleset:1315
+#: data/default/buildings.ruleset:1331 data/civ2/buildings.ruleset:1315
msgid "The player who owns it gets an embassy with all players."
msgstr "Seda omav mängija saab kõigi mängijatega saatkonna."
-#: data/default/buildings.ruleset:1337 data/civ2/buildings.ruleset:1320
+#: data/default/buildings.ruleset:1336 data/civ2/buildings.ruleset:1320
#: data/civ1/buildings.ruleset:922
msgid "Michelangelo's Chapel"
msgstr "Michelangelo Kabel"
-#: data/default/buildings.ruleset:1351 data/civ2/buildings.ruleset:1334
+#: data/default/buildings.ruleset:1350 data/civ2/buildings.ruleset:1334
msgid ""
"Counts as having a Cathedral in each of your cities. This makes 3 unhappy "
"citizens content in each city. The discovery of Theology increases the "
@@ -19111,22 +19264,22 @@ msgstr ""
"muutes veel ühe õnnetu kodaniku rahulolevaks. Kommunismi avastamine vähendab "
"katedraali mõju ehk rahulolevaks muudetakse üks õnnetu kodanik vähem."
-#: data/default/buildings.ruleset:1361 data/civ2/buildings.ruleset:1344
+#: data/default/buildings.ruleset:1360 data/civ2/buildings.ruleset:1344
#: data/civ1/buildings.ruleset:941
msgid "Oracle"
msgstr "Oraakel"
-#: data/default/buildings.ruleset:1375
+#: data/default/buildings.ruleset:1374
msgid "Makes two of your unhappy citizens content in every city with a temple."
msgstr ""
"Muudab rahulolevaks kaks õnnetut kodanikku igas linnas, kus on olemas tempel"
-#: data/default/buildings.ruleset:1380 data/civ2/buildings.ruleset:1363
+#: data/default/buildings.ruleset:1379 data/civ2/buildings.ruleset:1363
#: data/civ1/buildings.ruleset:960
msgid "Pyramids"
msgstr "Püramiidid"
-#: data/default/buildings.ruleset:1394
+#: data/default/buildings.ruleset:1393
msgid ""
"The amount of stored food lost when one of your cities grows or shrinks is "
"reduced by 25%. This helps a city to grow faster and more easily withstand "
@@ -19136,31 +19289,31 @@ msgstr ""
"aitab linnal kiiremini kasvada ja kergemini näljahäda üle elada. Mõju liitub "
"viljaaida mõjule."
-#: data/default/buildings.ruleset:1401 data/civ2/buildings.ruleset:1382
+#: data/default/buildings.ruleset:1400 data/civ2/buildings.ruleset:1382
#: data/civ1/buildings.ruleset:981
msgid "SETI Program"
msgstr "SETI programm"
-#: data/default/buildings.ruleset:1415
+#: data/default/buildings.ruleset:1414
msgid "Boosts science production in each city with a Research Lab by 100%. "
msgstr "Tõstab kõigi uuringukeskust omavate linnade teadustoodangut 100%."
-#: data/default/buildings.ruleset:1420 data/civ2/buildings.ruleset:1402
+#: data/default/buildings.ruleset:1419 data/civ2/buildings.ruleset:1402
#: data/civ1/buildings.ruleset:1001
msgid "Shakespeare's Theatre"
msgstr "Shakespeare'i teater"
-#: data/default/buildings.ruleset:1434 data/civ2/buildings.ruleset:1416
+#: data/default/buildings.ruleset:1433 data/civ2/buildings.ruleset:1416
#: data/civ1/buildings.ruleset:1015
msgid "Makes all unhappy citizens content, in the city where it is located."
msgstr ""
"Muudab kõik rahulolematud elanikud rahulolevateks linnas, kus on ehitatud."
-#: data/default/buildings.ruleset:1439 data/civ2/buildings.ruleset:1421
+#: data/default/buildings.ruleset:1438 data/civ2/buildings.ruleset:1421
msgid "Statue of Liberty"
msgstr "Vabadussammas"
-#: data/default/buildings.ruleset:1453 data/civ2/buildings.ruleset:1435
+#: data/default/buildings.ruleset:1452 data/civ2/buildings.ruleset:1435
#: data/civ1/buildings.ruleset:974 data/civ1/buildings.ruleset:1034
msgid ""
"Allows you to choose any government, including those that have not yet been "
@@ -19170,11 +19323,11 @@ msgstr ""
"Laseb võtta suvalise valitsuse, kaasa arvatud need, mis pole veel avastatud "
"su tsivilisatsiooni poolt ja ilma anarhia-vaheperioodita."
-#: data/default/buildings.ruleset:1460 data/civ2/buildings.ruleset:1442
+#: data/default/buildings.ruleset:1459 data/civ2/buildings.ruleset:1442
msgid "Sun Tzu's War Academy"
msgstr "Sun Tzu Sõjaakadeemia"
-#: data/default/buildings.ruleset:1474
+#: data/default/buildings.ruleset:1473
msgid ""
"All your new ground units start at the first veteran level. The chance of a "
"unit getting the next veteran level after a battle increases by half."
@@ -19182,21 +19335,21 @@ msgstr ""
"Kõik su uued maismaaüksused alustavad esimese taseme veteranidena. Šanss "
"veteranitaseme suurenemisele pärast lahingut suureneb poole võrra."
-#: data/default/buildings.ruleset:1481 data/civ2/buildings.ruleset:1463
+#: data/default/buildings.ruleset:1480 data/civ2/buildings.ruleset:1463
#: data/civ1/buildings.ruleset:1020
msgid "United Nations"
msgstr "ÃœRO"
-#: data/default/buildings.ruleset:1495
+#: data/default/buildings.ruleset:1494
msgid "All your units regain two extra hitpoints per turn."
msgstr "Kõik su üksused taastavad kaks lisa-tervisepunkti käigus."
-#: data/default/buildings.ruleset:1508 data/civ2/buildings.ruleset:1490
+#: data/default/buildings.ruleset:1507 data/civ2/buildings.ruleset:1490
#: data/civ1/buildings.ruleset:1046
msgid "Women's Suffrage"
msgstr "Naiste hääleõigus"
-#: data/default/buildings.ruleset:1522 data/civ2/buildings.ruleset:1504
+#: data/default/buildings.ruleset:1521 data/civ2/buildings.ruleset:1504
msgid ""
"Counts as a Police Station in every city. (That is, for each city, reduces "
"unhappiness for military units outside the city by 2 under Democracy and 1 "
@@ -19207,11 +19360,11 @@ msgstr ""
"demokraatia ajal 2, vabariigi ajal 1 võrra. Teiste valitsemisviiside puhul "
"ei ole sellest ilmaimest mitte midagi kasu.)"
-#: data/default/buildings.ruleset:1533
+#: data/default/buildings.ruleset:1532
msgid "Coinage"
msgstr "Rahatrükk"
-#: data/default/buildings.ruleset:1554
+#: data/default/buildings.ruleset:1553
msgid ""
"This is not a normal improvement. Instead, setting a city's production to "
"Coinage means its shield production is converted to tax output (money, "
@@ -19635,11 +19788,16 @@ msgstr "?citystyle:Keldi"
msgid "?citystyle:Industrial"
msgstr "?citystyle:Tööstuslik"
-#: data/default/cities.ruleset:139 data/civ2/cities.ruleset:150
+#: data/default/cities.ruleset:139
+#, fuzzy
+msgid "?citystyle:ElectricAge"
+msgstr "?citystyle:Keldi"
+
+#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:150
msgid "?citystyle:Modern"
msgstr "?citystyle:Kaasaegne"
-#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:161
+#: data/default/cities.ruleset:161 data/civ2/cities.ruleset:161
msgid "?citystyle:PostModern"
msgstr "?citystyle:Postmodernism"
@@ -25221,6 +25379,45 @@ msgstr "Meeskond 30"
msgid "Team 31"
msgstr "Meeskond 31"
+#~ msgid "Command access level could not be set to '%s' for connection %s."
+#~ msgstr "Ei saanud seada käsutaset '%s'-iks ühendusele %s."
+
+#~ msgid "Observers cannot vote."
+#~ msgstr "Vaatlejad ei saa hääletada."
+
+#~ msgid ""
+#~ "You can only vote in a running game. Use 'first' to become the game "
+#~ "organizer if there currently is none."
+#~ msgstr ""
+#~ "Hääletada saab ainult käimas olevas mängus. Kasuta käsku 'first' saamaks "
+#~ "mängujuhiks, kui hetkel pole mängujuhti."
+
+#~ msgid "Vote %d \"%s\": %d for, %d against"
+#~ msgstr "Hääletus %d \"%s\": %d poolt, %d vastu"
+
+#~ msgid "Value must be integer."
+#~ msgstr "Väärtus peab olema täisarv."
+
+#~ 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 Hydro Plant, Power Plant, or Nuclear Plant. A "
+#~ "city can only build a Hydro Plant if it is next to (or on) a Mountain or "
+#~ "River tile."
+#~ msgstr ""
+#~ "Vähendab linnas tootmisest tulenevat saastamist 50%. Samutis suurendab "
+#~ "linna käsitöövabriku või tehase kogutoodangut: tehas ja hüdroelektrijaam "
+#~ "annavad 100% boonuse, kuid tehas, käsitöövabrik ja hüdroelektrijaam "
+#~ "üheskoos annavad 150%-lise toodanguboonuse.\n"
+#~ "\n"
+#~ "Linnas saab olla ainult üks hüdroelektrijaam, elektrijaam või "
+#~ "tuumaelektrijaam. Linn saab ehitada hüdroelektrijaama ainult siis, kui ta "
+#~ "vahetus läheduses asuvad mäed või jõgi."
+
#, fuzzy
#~ msgid "%s territory"
#~ msgstr "%s-ide territoorium"
diff --git a/po/fa.gmo b/po/fa.gmo
index c3d3d4b..d30fc4a 100644
Binary files a/po/fa.gmo and b/po/fa.gmo differ
diff --git a/po/fa.po b/po/fa.po
index 494538a..724d1d3 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: 2009-03-29 21:13+0900\n"
+"POT-Creation-Date: 2009-11-22 21:37+0100\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"
@@ -66,21 +66,21 @@ msgstr "Ù…"
msgid "?redundant:*"
msgstr "*"
-#: common/connection.c:515
+#: common/connection.c:518
#, c-format
msgid "%s from %s"
msgstr "%s از %s"
-#: common/connection.c:521
+#: common/connection.c:524
msgid " (connection incomplete)"
msgstr " (ارتباط کامل نیست)"
-#: common/connection.c:525
+#: common/connection.c:528
#, c-format
msgid " (player %s)"
msgstr " (بازیکن %s)"
-#: common/connection.c:529
+#: common/connection.c:532
msgid " (observer)"
msgstr " (ناظر)"
@@ -485,81 +485,81 @@ msgstr "پیام‌های اتصال/قطع اتصال"
msgid "AI Debug messages"
msgstr "پیام‌های اشکال‌زدایی هوش‌مصنوعی"
-#: common/player.c:732
+#: common/player.c:746
msgid "?attitude:Genocidal"
msgstr "قاتل"
-#: common/player.c:734
+#: common/player.c:748
msgid "?attitude:Belligerent"
msgstr "در Øال جنگ"
-#: common/player.c:736
+#: common/player.c:750
msgid "?attitude:Hostile"
msgstr "دشمن"
-#: common/player.c:738
+#: common/player.c:752
msgid "?attitude:Uncooperative"
msgstr "بدون سود"
-#: common/player.c:740
+#: common/player.c:754
msgid "?attitude:Uneasy"
msgstr "مضطرب"
-#: common/player.c:742
+#: common/player.c:756
msgid "?attitude:Neutral"
msgstr "طبیعی"
-#: common/player.c:744
+#: common/player.c:758
msgid "?attitude:Respectful"
msgstr "اØترام گذار"
-#: common/player.c:746
+#: common/player.c:760
msgid "?attitude:Helpful"
msgstr "سودمند"
-#: common/player.c:748
+#: common/player.c:762
msgid "?attitude:Enthusiastic"
msgstr "مجذوب"
-#: common/player.c:750
+#: common/player.c:764
msgid "?attitude:Admiring"
msgstr "تØسین برانگیز"
-#: common/player.c:753
+#: common/player.c:767
msgid "?attitude:Worshipful"
msgstr "Ù…Øترم"
-#: common/player.c:764
+#: common/player.c:778
msgid "?diplomatic_state:Armistice"
msgstr ""
-#: common/player.c:765
+#: common/player.c:779
msgid "?diplomatic_state:War"
msgstr "جنگ"
-#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:780 client/gui-gtk-2.0/diplodlg.c:353
#: 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:767 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:781 client/gui-gtk-2.0/diplodlg.c:358
#: 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:768 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:782 client/gui-gtk-2.0/diplodlg.c:363
#: 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:769
+#: common/player.c:783
msgid "?diplomatic_state:Never met"
msgstr "ملاقات نشده"
-#: common/player.c:770
+#: common/player.c:784
msgid "?diplomatic_state:Team"
msgstr "تیم"
@@ -590,7 +590,7 @@ msgstr ""
#. TRANS: "Resources: (none)".
#: common/requirements.c:1014 common/team.c:132
#: client/gui-gtk-2.0/helpdlg.c:1055 client/gui-gtk-2.0/inteldlg.c:390
-#: client/gui-win32/helpdlg.c:586 client/gui-xaw/helpdlg.c:991
+#: client/gui-win32/helpdlg.c:592 client/gui-xaw/helpdlg.c:991
#, c-format
msgid "(none)"
msgstr "(هیچ)"
@@ -616,10 +616,11 @@ msgstr "تکنولوژی آینده %d"
#: 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
#: client/gui-sdl/helpdlg.c:817 client/gui-sdl/mapview.c:962
-#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:545
-#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:735
-#: 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
+#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:544
+#: client/gui-win32/helpdlg.c:551 client/gui-win32/helpdlg.c:721
+#: client/gui-win32/helpdlg.c:741 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 "هیچ"
@@ -632,29 +633,29 @@ msgstr "تکنولوژی آینده."
msgid "(Unknown)"
msgstr "(ناشناس)"
-#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:553
#: manual/civmanual.c:224
msgid "Road"
msgstr "جاده"
-#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:557
#: client/gui-gtk-2.0/menu.c:829 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:394 common/terrain.c:572 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:567
#: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
#: data/civ1/techs.ruleset:563
msgid "Railroad"
msgstr "راه‌آهن"
-#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:555
msgid "Mine"
msgstr "معدن"
-#: common/terrain.c:396 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:551 server/report.c:124
#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "آلودگی"
@@ -663,7 +664,7 @@ msgstr "آلودگی"
msgid "Hut"
msgstr "کلبه"
-#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:563
#: manual/civmanual.c:226
msgid "Fortress"
msgstr "دژ"
@@ -676,58 +677,58 @@ msgstr "رود"
msgid "Farmland"
msgstr "مزرعه"
-#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:577
#: manual/civmanual.c:226
msgid "Airbase"
msgstr "پایگاه هوایی"
-#: common/terrain.c:402 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:579
msgid "Fallout"
msgstr "غبار اتمی"
-#: common/unit.c:546 client/gui-win32/plrdlg.c:337
+#: common/unit.c:549 client/gui-win32/plrdlg.c:337
msgid "Idle"
msgstr "کاری نمیکند"
-#: common/unit.c:556
+#: common/unit.c:559
msgid "Fortifying"
msgstr "در Øال تقویت"
-#: common/unit.c:558
+#: common/unit.c:561
msgid "Fortified"
msgstr "تقویت شده"
-#: common/unit.c:562 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
+#: common/unit.c:565 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
msgid "Sentry"
msgstr "نگهبانی"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
+#: common/unit.c:569 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
#: client/gui-win32/menu.c:370 client/gui-xaw/menu.c:185
msgid "Pillage"
msgstr "غارت"
-#: common/unit.c:568 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
+#: common/unit.c:571 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
msgid "Goto"
msgstr "برو"
-#: common/unit.c:570
+#: common/unit.c:573
msgid "Explore"
msgstr "گشتن"
-#: common/unit.c:572 manual/civmanual.c:224
+#: common/unit.c:575 manual/civmanual.c:224
msgid "Transform"
msgstr "تبدیل"
-#: common/unit.c:584 client/text.c:157 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:587 client/text.c:157 client/gui-sdl/citydlg.c:1972
#: client/gui-win32/citydlg.c:1257 client/gui-xaw/citydlg.c:1423
msgid "Unknown"
msgstr "ناشناخته"
-#: common/unit.c:1022
+#: common/unit.c:1025
msgid "Moves"
msgstr "Øرکات"
-#: common/unit.c:1571
+#: common/unit.c:1574
#, c-format
msgid ""
"Upgrade %s to %s for %d gold?\n"
@@ -736,12 +737,12 @@ msgstr ""
"ترÙیع %s به %s با %d طلا؟\n"
"خزانه %d طلا دارد."
-#: common/unit.c:1579
+#: common/unit.c:1582
#, c-format
msgid "Sorry, cannot upgrade %s (yet)."
msgstr "شرمنده،(هنوز) نمی‌توان %s را ترÙیع کرد."
-#: common/unit.c:1585
+#: common/unit.c:1588
#, c-format
msgid ""
"Upgrading %s to %s costs %d gold.\n"
@@ -750,11 +751,11 @@ msgstr ""
"ترÙیع %s به %s %d طلا نیاز دارد.\n"
"خزانه %d طلا دارد."
-#: common/unit.c:1594
+#: common/unit.c:1597
msgid "You can only upgrade units in your cities."
msgstr "شما تنها می‌توانید مهره‌های داخل شهر را ترÙیع کنید."
-#: common/unit.c:1598
+#: common/unit.c:1601
#, c-format
msgid "Upgrading this %s would strand units it transports."
msgstr ""
@@ -791,11 +792,11 @@ msgstr "بمب اتم"
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1404
+#: common/unittype.c:349 client/helpdata.c:1412
msgid " and "
msgstr " Ùˆ "
-#: common/unittype.c:355 client/helpdata.c:1390
+#: common/unittype.c:355 client/helpdata.c:1398
msgid "?and:, "
msgstr "، "
@@ -959,69 +960,69 @@ msgstr ""
msgid "Missing argument for \"%s\".\n"
msgstr ""
-#: utility/shared.c:501
+#: utility/shared.c:514
#, c-format
msgid "%d BC"
msgstr "%d ق‌م"
-#: utility/shared.c:503
+#: utility/shared.c:516
#, c-format
msgid "%d AD"
msgstr "%d ب‌م"
-#: utility/shared.c:924
+#: utility/shared.c:937
msgid "FREECIV_PATH is set but empty; using default path instead."
msgstr ""
-#: utility/shared.c:1028
+#: utility/shared.c:1041
#, c-format
msgid "Could not read data directory %s: %s."
msgstr ""
-#: utility/shared.c:1279
+#: utility/shared.c:1292
msgid "The data path may be set via the environment variable FREECIV_PATH."
msgstr ""
-#: utility/shared.c:1281
+#: utility/shared.c:1294
#, c-format
msgid "Current data path is: \"%s\""
msgstr ""
-#: utility/shared.c:1283
+#: utility/shared.c:1296
#, c-format
msgid "The \"%s\" file is required ... aborting!"
msgstr ""
-#: utility/shared.c:1460
+#: utility/shared.c:1485
#, c-format
msgid "%s: Fatal error: you're trying to run me as superuser!\n"
msgstr ""
-#: utility/shared.c:1462
+#: utility/shared.c:1487
msgid "Use a non-privileged account instead.\n"
msgstr ""
-#: utility/shared.c:1478
+#: utility/shared.c:1503
msgid "exact match"
msgstr ""
-#: utility/shared.c:1479
+#: utility/shared.c:1504
msgid "only match"
msgstr ""
-#: utility/shared.c:1480
+#: utility/shared.c:1505
msgid "ambiguous"
msgstr ""
-#: utility/shared.c:1481
+#: utility/shared.c:1506
msgid "empty"
msgstr "خالی"
-#: utility/shared.c:1482
+#: utility/shared.c:1507
msgid "too long"
msgstr ""
-#: utility/shared.c:1483
+#: utility/shared.c:1508
msgid "non-match"
msgstr ""
@@ -1050,108 +1051,108 @@ msgstr "%s ساخت %s در %s را شروع کردند."
msgid "%s is selling %s (not needed) for %d."
msgstr ""
-#: ai/advdiplomacy.c:280
+#: ai/advdiplomacy.c:300
#, c-format
msgid "*%s (AI)* In away mode AI can't sign such a treaty."
msgstr ""
-#: ai/advdiplomacy.c:290
+#: ai/advdiplomacy.c:310
#, c-format
msgid "*%s (AI)* First break alliance with %s, %s."
msgstr "*%s (ه‌م)* %s ابتدا اتØاد با %sØŒ را برهم زنید."
-#: ai/advdiplomacy.c:303
+#: ai/advdiplomacy.c:322
#, c-format
msgid "*%s (AI)* Let us first cease hostilies, %s."
msgstr "*%s (ه‌م)* %s اجازه بده ابتدا دشمنی را کنار بگذاریم."
-#: ai/advdiplomacy.c:308
+#: ai/advdiplomacy.c:327
#, c-format
msgid ""
"*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
"first, %s."
msgstr ""
-#: ai/advdiplomacy.c:331
+#: ai/advdiplomacy.c:350
#, c-format
msgid "*%s (AI)* I simply do not trust you with an alliance yet, %s."
msgstr ""
-#: ai/advdiplomacy.c:424
+#: ai/advdiplomacy.c:443
#, c-format
msgid "*%s (AI)* I do not know the city you mention."
msgstr ""
-#: ai/advdiplomacy.c:454
+#: ai/advdiplomacy.c:473
#, c-format
msgid "*%s (AI)* Sorry, sharing vision with you is not safe."
msgstr ""
-#: ai/advdiplomacy.c:560
+#: ai/advdiplomacy.c:579
#, c-format
msgid "*%s (AI)* This deal was not very good for us, %s!"
msgstr ""
-#: ai/advdiplomacy.c:582
+#: ai/advdiplomacy.c:601
#, c-format
msgid "*%s (AI)* Welcome into our alliance %s!"
msgstr "*%s (ه‌م)* %s به اتØاد ما خوش آمدید!"
-#: ai/advdiplomacy.c:586
+#: ai/advdiplomacy.c:605
#, c-format
msgid "*%s (AI)* Yes, may we forever stand united, %s."
msgstr "*%s (ه‌م)* بله، %s شاید همیشه متØد بمانیم."
-#: ai/advdiplomacy.c:593
+#: ai/advdiplomacy.c:612
#, c-format
msgid "*%s (AI)* Yes, peace in our time!"
msgstr "*%s (ه‌م)* بله، اکنون ØµÙ„Ø Ù…ÛŒâ€ŒÚ©Ù†ÛŒÙ…!"
-#: ai/advdiplomacy.c:598
+#: ai/advdiplomacy.c:617
#, c-format
msgid "*%s (AI)* Agreed. No more hostilities, %s."
msgstr "*%s (ه‌م)* مواÙقم %s. دشمنی نداریم"
-#: ai/advdiplomacy.c:813
+#: ai/advdiplomacy.c:832
#, c-format
msgid ""
"*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
"other better?"
msgstr ""
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1116
#, c-format
msgid "*%s (AI)* Space will never be yours. "
msgstr ""
-#: ai/advdiplomacy.c:1102
+#: ai/advdiplomacy.c:1121
#, c-format
msgid "*%s (AI)* I have tolerated your vicious antics long enough! To war!"
msgstr ""
-#: ai/advdiplomacy.c:1108
+#: ai/advdiplomacy.c:1127
#, c-format
msgid "*%s (AI)* Peace in ... some other time."
msgstr "*%s (ه‌م)* در وقتی... دیگر ØµÙ„Ø Ú©Ù†ÛŒØ¯"
-#: ai/advdiplomacy.c:1113
+#: ai/advdiplomacy.c:1132
#, 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:1119
+#: ai/advdiplomacy.c:1138
#, c-format
msgid "*%s (AI)* Your covert hostilities brought this war upon you!"
msgstr ""
-#: ai/advdiplomacy.c:1126
+#: ai/advdiplomacy.c:1145
#, c-format
msgid "*%s (AI)* Your aggression against %s was your last mistake!"
msgstr ""
-#: ai/advdiplomacy.c:1209
+#: ai/advdiplomacy.c:1229
#, c-format
msgid ""
"*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1162,14 +1163,14 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1219
+#: ai/advdiplomacy.c:1239
#, c-format
msgid ""
"*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
"alliance!"
msgstr ""
-#: ai/advdiplomacy.c:1225
+#: ai/advdiplomacy.c:1245
#, c-format
msgid ""
"*%s (AI)* %s has grossly violated his treaties with us for own gain. We "
@@ -1182,7 +1183,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1238
+#: ai/advdiplomacy.c:1258
#, c-format
msgid ""
"*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1193,13 +1194,13 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1246
+#: ai/advdiplomacy.c:1266
#, c-format
msgid ""
"*%s (AI)* If you want a piece of the loot, feel free to join in the action!"
msgstr ""
-#: ai/advdiplomacy.c:1251
+#: ai/advdiplomacy.c:1271
#, c-format
msgid ""
"*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1210,12 +1211,12 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1261
+#: ai/advdiplomacy.c:1281
#, c-format
msgid "*%s (AI)* As our glorious allies, we expect your help in this war."
msgstr ""
-#: ai/advdiplomacy.c:1267
+#: ai/advdiplomacy.c:1287
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance and declare war on %s in %d turn. "
@@ -1226,7 +1227,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1276
+#: ai/advdiplomacy.c:1296
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1237,47 +1238,47 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1344
+#: ai/advdiplomacy.c:1364
#, 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:1359
+#: ai/advdiplomacy.c:1379
#, c-format
msgid ""
"*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
"offensive."
msgstr ""
-#: ai/advdiplomacy.c:1362
+#: ai/advdiplomacy.c:1382
#, c-format
msgid ""
"*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
"take action!"
msgstr ""
-#: ai/advdiplomacy.c:1474
+#: ai/advdiplomacy.c:1494
#, c-format
msgid "*%s (AI)* Sorry, sharing vision with you is no longer safe."
msgstr "*%s (ه‌م)* شرمنده، دید مشترک با شما دیگر بی‌خطر نیست."
-#: ai/advdiplomacy.c:1549
+#: ai/advdiplomacy.c:1569
#, c-format
msgid ""
"*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
"our enemy, %s."
msgstr ""
-#: ai/advdiplomacy.c:1555
+#: ai/advdiplomacy.c:1575
#, 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:1562
+#: ai/advdiplomacy.c:1582
#, c-format
msgid ""
"*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1285,26 +1286,26 @@ msgid ""
"more!"
msgstr ""
-#: ai/advdiplomacy.c:1592
+#: ai/advdiplomacy.c:1612
#, c-format
msgid ""
"*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
"an alliance?"
msgstr ""
-#: ai/advdiplomacy.c:1607
+#: ai/advdiplomacy.c:1627
#, c-format
msgid "*%s (AI)* Greetings neighbour, may we suggest more peaceful relations?"
msgstr ""
-#: ai/advdiplomacy.c:1622
+#: ai/advdiplomacy.c:1642
#, c-format
msgid ""
"*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
"cessation of hostilities?"
msgstr ""
-#: ai/advdiplomacy.c:1742
+#: ai/advdiplomacy.c:1762
#, c-format
msgid ""
"*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1443,17 +1444,17 @@ msgid ""
"minimum %d [printable] characters long. Try again."
msgstr ""
-#: server/barbarian.c:183
+#: server/barbarian.c:184
#, c-format
msgid "%s gain a leader by the name %s. Dangerous times may lie ahead."
msgstr ""
-#: server/barbarian.c:479
+#: server/barbarian.c:480
#, c-format
msgid "Native unrest near %s led by %s."
msgstr ""
-#: server/barbarian.c:484
+#: server/barbarian.c:485
#, c-format
msgid "Sea raiders seen near %s!"
msgstr ""
@@ -1822,7 +1823,7 @@ msgid_plural "%s boosts research; you gain %d immediate advances."
msgstr[0] ""
msgstr[1] ""
-#: server/cityturn.c:1158 server/techtools.c:176
+#: server/cityturn.c:1158 server/techtools.c:172
#, c-format
msgid "The %s have acquired %s from %s."
msgstr "%s %s را از %s گرÙتند."
@@ -1903,123 +1904,127 @@ msgstr ""
msgid "Warning: the %s option is obsolete. Use -m to enable the metaserver.\n"
msgstr ""
-#: server/civserver.c:189
+#: server/civserver.c:193
#, c-format
msgid "Error: unknown option '%s'\n"
msgstr ""
-#: server/civserver.c:200
+#: server/civserver.c:204
#, c-format
msgid "This is the server for %s"
msgstr "این سرور %s است."
-#: server/civserver.c:201
+#: server/civserver.c:205
#, c-format
msgid "You can learn a lot about Freeciv at %s"
msgstr ""
-#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
+#: server/civserver.c:210 client/civclient.c:239 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
"Valid options are:\n"
msgstr ""
-#: server/civserver.c:208
+#: server/civserver.c:212
msgid ""
" -a --auth FILE\tEnable server authentication with configuration from "
"FILE.\n"
msgstr ""
-#: server/civserver.c:210
+#: server/civserver.c:214
msgid " -G --Guests\t\tAllow guests to login if auth is enabled.\n"
msgstr ""
-#: server/civserver.c:212
+#: server/civserver.c:216
msgid " -N --Newusers\tAllow new users to login if auth is enabled.\n"
msgstr ""
-#: server/civserver.c:215
+#: server/civserver.c:219
msgid " -b --bind ADDR\tListen for clients on ADDR\n"
msgstr ""
-#: server/civserver.c:217 client/civclient.c:242
+#: server/civserver.c:221 client/civclient.c:243
msgid ""
" -d, --debug NUM\tSet debug log level (0 to 4, or 4:file1,min,max:...)\n"
msgstr ""
-#: server/civserver.c:221 client/civclient.c:246
+#: server/civserver.c:225 client/civclient.c:247
msgid " -d, --debug NUM\tSet debug log level (0 to 3)\n"
msgstr ""
-#: server/civserver.c:223
+#: server/civserver.c:227
msgid " -f, --file FILE\tLoad saved game FILE\n"
msgstr ""
-#: server/civserver.c:225 client/civclient.c:249 manual/civmanual.c:382
+#: server/civserver.c:229 client/civclient.c:250 manual/civmanual.c:382
msgid " -h, --help\t\tPrint a summary of the options\n"
msgstr ""
-#: server/civserver.c:226
+#: server/civserver.c:230
+msgid " -i, --identity ADDR\tBe known as ADDR at metaserver\n"
+msgstr ""
+
+#: server/civserver.c:231
msgid " -l, --log FILE\tUse FILE as logfile\n"
msgstr ""
-#: server/civserver.c:227
+#: server/civserver.c:232
msgid " -m, --meta\t\tNotify metaserver and send server's info\n"
msgstr ""
-#: server/civserver.c:229
+#: server/civserver.c:234
msgid " -M, --Metaserver ADDR\tSet ADDR as metaserver address\n"
msgstr ""
-#: server/civserver.c:232
+#: server/civserver.c:237
msgid " -p, --port PORT\tListen for clients on port PORT\n"
msgstr ""
-#: server/civserver.c:234
+#: server/civserver.c:239
msgid " -q, --quitidle TIME\tQuit if no players for TIME seconds\n"
msgstr ""
-#: server/civserver.c:236
+#: server/civserver.c:241
msgid " -e, --exit-on-end\tWhen a game ends, exit instead of restarting\n"
msgstr ""
-#: server/civserver.c:239
+#: server/civserver.c:244
msgid " -s, --saves DIR\tSave games to directory DIR\n"
msgstr ""
-#: server/civserver.c:241
+#: server/civserver.c:246
msgid " -S, --Serverid ID\tSets the server id to ID\n"
msgstr ""
-#: server/civserver.c:243
+#: server/civserver.c:248
msgid " -P, --Ppm\t\tSave ppms of the map when saving the game.\n"
msgstr ""
-#: server/civserver.c:244
+#: server/civserver.c:249
msgid " -r, --read FILE\tRead startup script FILE\n"
msgstr ""
-#: server/civserver.c:246
+#: server/civserver.c:251
msgid " -R, --Ranklog FILE\tUse FILE as ranking logfile\n"
msgstr ""
-#: server/civserver.c:247 client/civclient.c:268 manual/civmanual.c:383
+#: server/civserver.c:252 client/civclient.c:269 manual/civmanual.c:383
msgid " -v, --version\t\tPrint the version number\n"
msgstr ""
-#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
+#: server/civserver.c:253 client/gui-gtk-2.0/gui_main.c:354
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, fuzzy, c-format
msgid "Report bugs at %s.\n"
msgstr "اشکالات را به <%s> گزارش دهید.\n"
-#: server/commands.c:28
+#: server/commands.c:29
msgid "Start the game, or restart after loading a savegame."
msgstr ""
-#: server/commands.c:29
+#: server/commands.c:30
msgid ""
"This command starts the game. When starting a new game, it should be used "
"after all human players have connected, and AI players have been created (if "
@@ -2031,7 +2036,7 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:42
+#: server/commands.c:44
msgid ""
"help\n"
"help commands\n"
@@ -2040,11 +2045,11 @@ msgid ""
"help <option-name>"
msgstr ""
-#: server/commands.c:47
+#: server/commands.c:49
msgid "Show help about server commands and server options."
msgstr ""
-#: server/commands.c:48
+#: server/commands.c:50
msgid ""
"With no arguments gives some introductory help. With argument \"commands\" "
"or \"options\" gives respectively a list of all commands or all options. "
@@ -2054,31 +2059,31 @@ msgid ""
"be abbreviated where unambiguous."
msgstr ""
-#: server/commands.c:63
+#: server/commands.c:66
msgid "Show a list of players, teams, connections, or scenarios."
msgstr ""
-#: server/commands.c:64
+#: server/commands.c:67
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 ""
-#: server/commands.c:70
+#: server/commands.c:74
msgid "Quit the game and shutdown the server."
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:74
+#: server/commands.c:79
msgid "cut <connection-name>"
msgstr ""
-#: server/commands.c:75
+#: server/commands.c:80
msgid "Cut a client's connection to server."
msgstr ""
-#: server/commands.c:76
+#: server/commands.c:81
msgid ""
"Cut specified client's connection to the server, removing that client from "
"the game. If the game has not yet started that client's player is removed "
@@ -2087,17 +2092,17 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:83
+#: server/commands.c:89
msgid ""
"explain\n"
"explain <option-name>"
msgstr ""
-#: server/commands.c:85
+#: server/commands.c:91
msgid "Explain server options."
msgstr ""
-#: server/commands.c:86
+#: server/commands.c:92
msgid ""
"The 'explain' command gives a subset of the functionality of 'help', and is "
"included for backward compatibility. With no arguments it gives a list of "
@@ -2106,89 +2111,90 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:93
+#: server/commands.c:100
msgid ""
"show\n"
"show <option-name>\n"
"show <option-prefix>"
msgstr ""
-#: server/commands.c:96
+#: server/commands.c:103
msgid "Show server options."
msgstr ""
-#: server/commands.c:97
+#: server/commands.c:104
msgid ""
"With no arguments, shows all server options (or available options, when used "
"by clients). With an argument, show only the named option, or options with "
"that prefix."
msgstr ""
-#: server/commands.c:102
+#: server/commands.c:110
msgid "wall <message>"
msgstr ""
-#: server/commands.c:103
+#: server/commands.c:111
msgid "Send message to all connections."
msgstr ""
-#: server/commands.c:104
+#: server/commands.c:112
msgid ""
"For each connected client, pops up a window showing the message entered."
msgstr ""
-#: server/commands.c:108
+#: server/commands.c:117
msgid "vote yes|no [vote number]"
msgstr ""
-#: server/commands.c:109
+#: server/commands.c:118
msgid "Cast a vote."
msgstr ""
-#: server/commands.c:111
+#: server/commands.c:120
#, 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."
+"A player with basic 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."
msgstr ""
-#: server/commands.c:121
+#: server/commands.c:131
msgid ""
"debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
"<player> | timing | info]"
msgstr ""
-#: server/commands.c:123
+#: server/commands.c:133
msgid "Turn on or off AI debugging of given entity."
msgstr ""
-#: server/commands.c:124
+#: server/commands.c:134
msgid ""
"Print AI debug information about given entity and turn continous debugging "
"output for this entity on or off."
msgstr ""
-#: server/commands.c:128
+#: server/commands.c:139
msgid "set <option-name> <value>"
msgstr ""
-#: server/commands.c:129
+#: server/commands.c:140
msgid "Set server option."
msgstr ""
-#: server/commands.c:132
+#: server/commands.c:144
msgid "team <player> [team]"
msgstr ""
-#: server/commands.c:133
+#: server/commands.c:145
msgid "Change, add or remove a player's team affiliation."
msgstr ""
-#: server/commands.c:134
+#: server/commands.c:146
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 "
@@ -2196,30 +2202,30 @@ msgid ""
"to achieve team victory with averaged individual scores."
msgstr ""
-#: server/commands.c:141
+#: server/commands.c:154
msgid "rulesetdir <directory>"
msgstr ""
-#: server/commands.c:142
+#: server/commands.c:155
msgid "Choose new ruleset directory or modpack."
msgstr ""
-#: server/commands.c:143
+#: server/commands.c:156
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:149
+#: server/commands.c:163
msgid "metainfo <meta-line>"
msgstr ""
-#: server/commands.c:150
+#: server/commands.c:164
msgid "Set metaserver info line."
msgstr ""
-#: server/commands.c:151
+#: server/commands.c:165
msgid ""
"Set user defined metaserver info line. If parameter is omitted,\n"
"previously set metamessage will be removed. For most of the time\n"
@@ -2228,19 +2234,19 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:158
+#: server/commands.c:173
msgid "metapatch <meta-line>"
msgstr ""
-#: server/commands.c:159
+#: server/commands.c:174
msgid "Set metaserver patches line."
msgstr ""
-#: server/commands.c:165
+#: server/commands.c:181
msgid "Control metaserver connection."
msgstr ""
-#: server/commands.c:166
+#: server/commands.c:182
msgid ""
"'metaconnection ?' reports on the status of the connection to metaserver.\n"
"'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2248,33 +2254,33 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:172
+#: server/commands.c:189
msgid "metaserver <address>"
msgstr ""
-#: server/commands.c:173
+#: server/commands.c:190
msgid "Set address (URL) for metaserver to report to."
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:177
+#: server/commands.c:195
msgid "aitoggle <player-name>"
msgstr ""
-#: server/commands.c:178
+#: server/commands.c:196
msgid "Toggle AI status of player."
msgstr ""
#. TRANS: translate text between [] and <> only
-#: server/commands.c:182
+#: server/commands.c:201
msgid "take [connection-name] <player-name>"
msgstr ""
-#: server/commands.c:183
+#: server/commands.c:202
msgid "Take over a player's place in the game."
msgstr ""
-#: server/commands.c:184
+#: server/commands.c:203
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 "
@@ -2284,15 +2290,15 @@ msgid ""
msgstr ""
#. TRANS: translate text between [] only
-#: server/commands.c:192
+#: server/commands.c:212
msgid "observe [connection-name] [player-name]"
msgstr ""
-#: server/commands.c:193
+#: server/commands.c:213
msgid "Observe a player or the whole game."
msgstr ""
-#: server/commands.c:194
+#: server/commands.c:214
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 "
@@ -2302,60 +2308,60 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:202
+#: server/commands.c:223
msgid "detach <connection-name>"
msgstr ""
-#: server/commands.c:203
+#: server/commands.c:224
msgid "detach from a player."
msgstr ""
-#: server/commands.c:204
+#: server/commands.c:225
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:209
+#: server/commands.c:231
msgid "create <player-name>"
msgstr ""
-#: server/commands.c:210
+#: server/commands.c:232
msgid "Create an AI player with a given name."
msgstr ""
-#: server/commands.c:211
+#: server/commands.c:233
msgid ""
"The 'create' command is only available before the game has been started."
msgstr ""
-#: server/commands.c:215
+#: server/commands.c:238
msgid ""
"away\n"
"away"
msgstr ""
-#: server/commands.c:217
+#: server/commands.c:240
msgid "Set yourself in away mode. The AI will watch your back."
msgstr ""
-#: server/commands.c:218
+#: server/commands.c:241
msgid "The AI will govern your nation but do minimal changes."
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:222
+#: server/commands.c:246
msgid ""
"novice\n"
"novice <player-name>"
msgstr ""
-#: server/commands.c:224
+#: server/commands.c:248
msgid "Set one or all AI players to 'novice'."
msgstr ""
-#: server/commands.c:225
+#: server/commands.c:249
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 "
@@ -2363,17 +2369,17 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:231
+#: server/commands.c:256
msgid ""
"easy\n"
"easy <player-name>"
msgstr ""
-#: server/commands.c:233
+#: server/commands.c:258
msgid "Set one or all AI players to 'easy'."
msgstr ""
-#: server/commands.c:234
+#: server/commands.c:259
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 "
@@ -2381,17 +2387,17 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:240
+#: server/commands.c:266
msgid ""
"normal\n"
"normal <player-name>"
msgstr ""
-#: server/commands.c:242
+#: server/commands.c:268
msgid "Set one or all AI players to 'normal'."
msgstr ""
-#: server/commands.c:243
+#: server/commands.c:269
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 "
@@ -2399,17 +2405,17 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:249
+#: server/commands.c:276
msgid ""
"hard\n"
"hard <player-name>"
msgstr ""
-#: server/commands.c:251
+#: server/commands.c:278
msgid "Set one or all AI players to 'hard'."
msgstr ""
-#: server/commands.c:252
+#: server/commands.c:279
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 "
@@ -2417,17 +2423,17 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:258
+#: server/commands.c:286
msgid ""
"experimental\n"
"experimental <player-name>"
msgstr ""
-#: server/commands.c:260
+#: server/commands.c:288
msgid "Set one or all AI players to 'experimental'."
msgstr ""
-#: server/commands.c:261
+#: server/commands.c:289
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 "
@@ -2436,7 +2442,7 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:269
+#: server/commands.c:298
msgid ""
"cmdlevel\n"
"cmdlevel <level>\n"
@@ -2445,17 +2451,19 @@ msgid ""
"cmdlevel <level> <connection-name>"
msgstr ""
-#: server/commands.c:274
+#: server/commands.c:303
msgid "Query or set command access level access."
msgstr ""
-#: server/commands.c:275
+#: server/commands.c:304
msgid ""
"The command access level controls which server commands are available\n"
"to users via the client chatline. The available levels are:\n"
" none - no commands\n"
-" info - informational commands only\n"
+" info - informational or observer commands only\n"
+" basic - commands available to players in the game\n"
" ctrl - commands that affect the game and users\n"
+" admin - commands that affect server operation\n"
" hack - *all* commands - dangerous!\n"
"With no arguments, the current command access levels are reported.\n"
"With a single argument, the level is set for all existing connections,\n"
@@ -2471,20 +2479,20 @@ msgid ""
"now takes connection names, not player names."
msgstr ""
-#: server/commands.c:296
+#: server/commands.c:328
msgid "If there is none, become the game organizer with increased permissions."
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:301
+#: server/commands.c:334
msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
msgstr ""
-#: server/commands.c:302
+#: server/commands.c:335
msgid "See \"help timeoutincrease\"."
msgstr ""
-#: server/commands.c:303
+#: server/commands.c:336
msgid ""
"Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
"<turn> and multiply <value> by <valuemult>. Use this command in concert "
@@ -2492,56 +2500,75 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:309
+#: server/commands.c:343
+msgid ""
+"cancelvote\n"
+"cancelvote <vote number>\n"
+"cancelvote all\n"
+msgstr ""
+
+#: server/commands.c:346
+msgid "Cancel a running vote.\n"
+msgstr ""
+
+#: server/commands.c:347
+msgid ""
+"With no arguments this command removes your own vote. If you have an admin "
+"access level, you can cancel any vote by vote number, or all votes with the "
+"'all' argument."
+msgstr ""
+
+#. TRANS: translate text between <> only
+#: server/commands.c:354
msgid "endgame"
msgstr "پایان بازی"
-#: server/commands.c:310
+#: server/commands.c:355
msgid "End the game immediately in a draw."
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:314
+#: server/commands.c:360
msgid "surrender"
msgstr ""
-#: server/commands.c:315
+#: server/commands.c:361
msgid "Concede the game."
msgstr ""
-#: server/commands.c:316
+#: server/commands.c:362
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:322
+#: server/commands.c:369
msgid "remove <player-name>"
msgstr ""
-#: server/commands.c:323
+#: server/commands.c:370
msgid "Fully remove player from game."
msgstr ""
-#: server/commands.c:324
+#: server/commands.c:371
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:329
+#: server/commands.c:377
msgid ""
"save\n"
"save <file-name>"
msgstr ""
-#: server/commands.c:331
+#: server/commands.c:379
msgid "Save game to file."
msgstr ""
-#: server/commands.c:332
+#: server/commands.c:380
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"
@@ -2552,133 +2579,133 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:341
+#: server/commands.c:390
msgid ""
"load\n"
"load <file-name>"
msgstr ""
-#: server/commands.c:343
+#: server/commands.c:392
msgid "Load game from file."
msgstr ""
-#: server/commands.c:344
+#: server/commands.c:393
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:349
+#: server/commands.c:399
msgid "read <file-name>"
msgstr ""
-#: server/commands.c:350
+#: server/commands.c:400
msgid "Process server commands from file."
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:354
+#: server/commands.c:405
msgid "write <file-name>"
msgstr ""
-#: server/commands.c:355
+#: server/commands.c:406
msgid "Write current settings as server commands to file."
msgstr ""
-#: server/commands.c:359
+#: server/commands.c:411
msgid "Switch server output between 'RFC-style' and normal style."
msgstr ""
-#: server/commands.c:363
+#: server/commands.c:416
msgid "Simply returns the id of the server."
msgstr ""
-#: server/connecthand.c:85
+#: server/connecthand.c:109
#, c-format
msgid "Welcome to the %s Server running at %s port %d."
msgstr "به %s خوش آمدید. سرور در %s پرت %d در Øال اجراست."
-#: server/connecthand.c:89
+#: server/connecthand.c:113
#, c-format
msgid "Welcome to the %s Server at port %d."
msgstr "به %s خوش‌آمدید. سرور در پرت %d است."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:97
+#: server/connecthand.c:121
#, fuzzy, c-format
msgid "(%d) %s: connected [%s]"
msgstr "(%d) %s وصل شده است از %s."
-#: server/connecthand.c:104
+#: server/connecthand.c:128
#, c-format
msgid "Server: %s has connected from %s."
msgstr "سرور: %s وصل شده است از %s."
-#: server/connecthand.c:145
+#: server/connecthand.c:175
msgid "Couldn't attach your connection to new player."
msgstr "نمی‌توان شما را به بازیکنی جدید وصل کرد."
-#: server/connecthand.c:165
+#: server/connecthand.c:199
#, c-format
msgid "You are logged in as '%s' connected to no player."
msgstr "شما با نام '%s' وارد شده‌اید و به هیچ بازیکنی وصل نیستید."
-#: server/connecthand.c:169
+#: server/connecthand.c:203
#, c-format
msgid "You are logged in as '%s' connected to an anonymous player."
msgstr "شما با نام '%s' وارد شده‌اید و به بازیکنی بدون نام متصلید."
-#: server/connecthand.c:174
+#: server/connecthand.c:208
#, c-format
msgid "You are logged in as '%s' connected to %s."
msgstr "شما با نام '%s' وارد شده‌اید و به %s وصل شده‌اید."
-#: server/connecthand.c:187
+#: server/connecthand.c:221
#, c-format
msgid "Turn-blocking game play: waiting on %s to finish turn..."
msgstr ""
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:240
+#: server/connecthand.c:274
#, c-format
msgid "(%d) %s: connection request [%s]"
msgstr ""
-#: server/connecthand.c:266
+#: server/connecthand.c:300
msgid "The client is missing a capability that this server needs."
msgstr ""
-#: server/connecthand.c:268 server/connecthand.c:279
+#: server/connecthand.c:302 server/connecthand.c:313
#, c-format
msgid "(%d) %s rejected: mismatched capabilities!"
msgstr ""
-#: server/connecthand.c:277
+#: server/connecthand.c:311
msgid "This server is missing a capability that the client needs."
msgstr ""
-#: server/connecthand.c:290
+#: server/connecthand.c:324
msgid "The username is invalid!"
msgstr ""
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:292
+#: server/connecthand.c:326
#, c-format
msgid "(%d) %s rejected: invalid username [%s]"
msgstr ""
-#: server/connecthand.c:303
+#: server/connecthand.c:337
msgid "Your username is already connected!"
msgstr ""
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:305
+#: server/connecthand.c:339
#, c-format
msgid "(%d) %s rejected: duplicate username [%s]"
msgstr ""
-#: server/connecthand.c:335 server/connecthand.c:344
+#: server/connecthand.c:369 server/connecthand.c:378
#, c-format
msgid "Lost connection: %s."
msgstr ""
@@ -2695,110 +2722,110 @@ msgstr ""
msgid "For introductory help, type 'help'."
msgstr ""
-#: server/diplhand.c:164
+#: server/diplhand.c:167
#, c-format
msgid "The %s can't accept %s."
msgstr ""
-#: server/diplhand.c:176
+#: server/diplhand.c:179
#, c-format
msgid "You don't have tech %s, you can't accept treaty."
msgstr ""
-#: server/diplhand.c:185
+#: server/diplhand.c:188
msgid "City you are trying to give no longer exists, you can't accept treaty."
msgstr ""
-#: server/diplhand.c:191
+#: server/diplhand.c:194
#, c-format
msgid "You are not owner of %s, you can't accept treaty."
msgstr ""
-#: server/diplhand.c:197 server/diplhand.c:301
+#: server/diplhand.c:200 server/diplhand.c:304
#, c-format
msgid "Your capital (%s) is requested, you can't accept treaty."
msgstr ""
-#: server/diplhand.c:224
+#: server/diplhand.c:227
msgid "You don't have enough gold, you can't accept treaty."
msgstr "شما طلای کاÙÛŒ ندارید، نمی‌توانید قرارداد را قبول کنید."
-#: server/diplhand.c:256 server/diplhand.c:261
+#: server/diplhand.c:259 server/diplhand.c:264
#, c-format
msgid "A treaty containing %d clause was agreed upon."
msgid_plural "A treaty containing %d clauses was agreed upon."
msgstr[0] "قراردادی با %d بند پذیرÙته شد."
msgstr[1] "قراردادی با %d بند پذیرÙته شد."
-#: server/diplhand.c:277 server/diplhand.c:281
+#: server/diplhand.c:280 server/diplhand.c:284
#, c-format
msgid "One of the cities the %s are giving away is destroyed! Treaty canceled!"
msgstr ""
-#: server/diplhand.c:288 server/diplhand.c:293
+#: server/diplhand.c:291 server/diplhand.c:296
#, c-format
msgid "The %s no longer control %s! Treaty canceled!"
msgstr ""
-#: server/diplhand.c:331 server/diplhand.c:335
+#: server/diplhand.c:334 server/diplhand.c:338
#, c-format
msgid "The %s don't have the promised amount of gold! Treaty canceled!"
msgstr ""
-#: server/diplhand.c:364
+#: server/diplhand.c:367
#, c-format
msgid "You gave an embassy to %s."
msgstr "شما سÙارتی به %s دادید."
-#: server/diplhand.c:367
+#: server/diplhand.c:370
#, c-format
msgid "%s allowed you to create an embassy!"
msgstr "%s به شما اجازه داد تا سÙارتی بسازید!"
-#: server/diplhand.c:383
+#: server/diplhand.c:386
#, c-format
msgid "You are taught the knowledge of %s."
msgstr "شما علم %s را دارید."
-#: server/diplhand.c:387
+#: server/diplhand.c:390
#, c-format
msgid "The %s have acquired %s from the %s."
msgstr "%s %s را از %s گرÙتند."
-#: server/diplhand.c:402
+#: server/diplhand.c:405
#, c-format
msgid "You get %d gold."
msgstr "شما %d طلا گرÙتید."
#. TRANS: ... Polish worldmap.
-#: server/diplhand.c:410
+#: server/diplhand.c:413
#, fuzzy, c-format
msgid "You receive the %s worldmap."
msgstr "شما نقشه جهان %s را گرÙتید."
#. TRANS: ... Polish seamap.
-#: server/diplhand.c:419
+#: server/diplhand.c:422
#, fuzzy, c-format
msgid "You receive the %s seamap."
msgstr "شما نقشه دریا %s را گرÙتید."
-#: server/diplhand.c:436
+#: server/diplhand.c:439
#, c-format
msgid "You receive city of %s from %s."
msgstr "شما شهر %s را از %s گرÙتید."
-#: server/diplhand.c:441
+#: server/diplhand.c:444
#, c-format
msgid "You give city of %s to %s."
msgstr "شما شهر %s را به %s دادید."
-#: server/diplhand.c:454 server/diplhand.c:457
+#: server/diplhand.c:457 server/diplhand.c:460
#, c-format
msgid "You agree on a cease-fire with %s."
msgstr "شما به آتش‌بس با %s مواÙÙ‚ هستید."
#. TRANS: ... the Poles ... Polish territory.
-#: server/diplhand.c:476 server/diplhand.c:488
+#: server/diplhand.c:479 server/diplhand.c:491
#, c-format
msgid ""
"You agree on an armistice with the %s. In %d turn, it will become a peace "
@@ -2809,32 +2836,32 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: server/diplhand.c:512 server/diplhand.c:515
+#: server/diplhand.c:515 server/diplhand.c:518
#, c-format
msgid "You agree on an alliance with %s."
msgstr "شما به اتØاد با %s مواÙÙ‚ هستید."
-#: server/diplhand.c:524
+#: server/diplhand.c:527
#, c-format
msgid "You give shared vision to %s."
msgstr "شما به %s دید مشترک دادید."
-#: server/diplhand.c:527
+#: server/diplhand.c:530
#, c-format
msgid "%s gives you shared vision."
msgstr "%s به شما دید مشترک داد."
-#: server/diplhand.c:663
+#: server/diplhand.c:666
#, c-format
msgid "%s canceled the meeting!"
msgstr "%s دیدار را لغو کرد!"
-#: server/diplhand.c:670
+#: server/diplhand.c:673
#, c-format
msgid "Meeting with %s canceled."
msgstr "دیدار با %s لغو شد."
-#: server/diplhand.c:712
+#: server/diplhand.c:715
msgid "Your diplomatic envoy was decapitated!"
msgstr ""
@@ -3017,80 +3044,80 @@ msgid "The %s destroyed the %s in %s."
msgstr ""
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1091
+#: server/diplomats.c:1097
#, c-format
msgid "An enemy %s has been eliminated by your %s."
msgstr ""
#. TRANS: <unit> ... <city> ... <diplomat>
-#: server/diplomats.c:1098
+#: server/diplomats.c:1104
#, c-format
msgid "Your %s has been eliminated defending %s against a %s."
msgstr ""
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1106
+#: server/diplomats.c:1112
#, c-format
msgid "Your %s has been eliminated defending against a %s."
msgstr ""
-#: server/diplomats.c:1119
+#: server/diplomats.c:1125
#, c-format
msgid "Your %s was eliminated by a defending %s."
msgstr ""
-#: server/diplomats.c:1127
+#: server/diplomats.c:1133
#, c-format
msgid "Eliminated %s %s while infiltrating %s."
msgstr ""
-#: server/diplomats.c:1134
+#: server/diplomats.c:1140
#, c-format
msgid "Eliminated %s %s while infiltrating our troops."
msgstr ""
-#: server/diplomats.c:1185
+#: server/diplomats.c:1191
#, c-format
msgid ""
"Your %s has successfully completed the mission and returned unharmed to %s."
msgstr ""
-#: server/diplomats.c:1204
+#: server/diplomats.c:1210
#, c-format
msgid "Your %s was captured after completing the mission in %s."
msgstr ""
-#: server/diplomats.c:1210
+#: server/diplomats.c:1216
#, c-format
msgid "Your %s was captured after completing the mission."
msgstr ""
-#: server/diplomats.c:1242
+#: server/diplomats.c:1248
#, c-format
msgid "You have caused an incident while bribing the %s %s."
msgstr ""
-#: server/diplomats.c:1247
+#: server/diplomats.c:1253
#, c-format
msgid "%s has caused an incident while bribing your %s."
msgstr ""
-#: server/diplomats.c:1254
+#: server/diplomats.c:1260
#, c-format
msgid "You have caused an incident while attempting to steal tech from %s."
msgstr ""
-#: server/diplomats.c:1258
+#: server/diplomats.c:1264
#, c-format
msgid "%s has caused an incident while attempting to steal tech from you."
msgstr ""
-#: server/diplomats.c:1264
+#: server/diplomats.c:1270
#, c-format
msgid "You have caused an incident while inciting a revolt in %s."
msgstr ""
-#: server/diplomats.c:1268
+#: server/diplomats.c:1274
#, c-format
msgid "%s have caused an incident while inciting a revolt in %s."
msgstr ""
@@ -3197,12 +3224,12 @@ msgid ""
" Workers spontaneously gather and upgrade all cities with railroads."
msgstr ""
-#: server/maphand.c:1418
+#: server/maphand.c:1425
#, c-format
msgid "Moved your %s due to changing terrain."
msgstr ""
-#: server/maphand.c:1436
+#: server/maphand.c:1443
#, c-format
msgid "Disbanded your %s due to changing terrain."
msgstr ""
@@ -3211,7 +3238,7 @@ msgstr ""
msgid "Not reporting to the metaserver in this game."
msgstr ""
-#: server/meta.c:430
+#: server/meta.c:432
#, c-format
msgid "Metaserver: bad address: [%s:%d]."
msgstr ""
@@ -3327,54 +3354,54 @@ msgid ""
"with %s."
msgstr ""
-#: server/plrhand.c:1103
+#: server/plrhand.c:1115
#, c-format
msgid "Removing player %s."
msgstr "بازیکن %s Øذ٠می‌شود."
-#: server/plrhand.c:1105
+#: server/plrhand.c:1117
msgid "You've been removed from the game!"
msgstr "شما از بازی Øذ٠شدید!"
-#: server/plrhand.c:1108
+#: server/plrhand.c:1120
#, c-format
msgid "%s has been removed from the game."
msgstr "%s از بازی Øذ٠شد."
-#: server/plrhand.c:1153 server/plrhand.c:1158
+#: server/plrhand.c:1167 server/plrhand.c:1172
#, c-format
msgid "You have made contact with the %s, ruled by %s."
msgstr "شما با %s Ú©Ù‡ %s بر آن Øکومت می‌کند رابطه برقرار کردید."
-#: server/plrhand.c:1178
+#: server/plrhand.c:1192
#, c-format
msgid ""
"%s and %s meet and go to instant war. You cancel your alliance with both."
msgstr ""
-#: server/plrhand.c:1656
+#: server/plrhand.c:1670
#, c-format
msgid "Could not throw %s into civil war - too many players"
msgstr ""
-#: server/plrhand.c:1663
+#: server/plrhand.c:1677
#, c-format
msgid "Could not throw %s into civil war - no available nations"
msgstr ""
-#: server/plrhand.c:1686
+#: server/plrhand.c:1700
#, c-format
msgid ""
"Your nation is thrust into civil war! %s is declared the leader of the rebel "
"states."
msgstr ""
-#: server/plrhand.c:1707
+#: server/plrhand.c:1721
#, c-format
msgid "%s declares allegiance to %s."
msgstr ""
-#: server/plrhand.c:1722
+#: server/plrhand.c:1736
#, c-format
msgid ""
"Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3563,65 +3590,65 @@ msgstr ""
msgid "Wonders of the World"
msgstr "Ø´Ú¯Ùتی‌های جهان"
-#: server/report.c:547
+#: server/report.c:552
msgid " sq. mi."
msgstr "مایل مربع"
-#: server/report.c:557
+#: server/report.c:562
msgid " M tons"
msgstr "م تن"
-#: server/report.c:562
+#: server/report.c:567
msgid " M goods"
msgstr "م کالا"
-#: server/report.c:567
+#: server/report.c:572
msgid " bulbs"
msgstr ""
-#: server/report.c:572
+#: server/report.c:577
msgid " month"
msgid_plural " months"
msgstr[0] " ماه"
msgstr[1] " ماه"
-#: server/report.c:577
+#: server/report.c:582
msgid " ton"
msgid_plural " tons"
msgstr[0] " تن"
msgstr[1] " تن"
-#: server/report.c:591
+#: server/report.c:596
msgid "st"
msgstr ""
-#: server/report.c:593
+#: server/report.c:598
msgid "nd"
msgstr ""
-#: server/report.c:595
+#: server/report.c:600
msgid "rd"
msgstr ""
-#: server/report.c:597
+#: server/report.c:602
msgid "th"
msgstr ""
-#: server/report.c:700
+#: server/report.c:705
msgid "Demography string contains invalid characters. Try \"help demography\"."
msgstr ""
-#: server/report.c:743 server/report.c:768
+#: server/report.c:748 server/report.c:773
msgid "Demographics Report:"
msgstr ""
-#: server/report.c:744
+#: server/report.c:749
msgid "Sorry, the Demographics report is unavailable."
msgstr ""
#. TRANS: <nation adjective> <government name> (<year>).
#. * E.g. "Polish Despotism (200 AD)".
-#: server/report.c:750
+#: server/report.c:755
#, fuzzy, c-format
msgid "%s %s (%s)"
msgstr "%s در %s (%s)\n"
@@ -3632,11 +3659,11 @@ msgstr "%s در %s (%s)\n"
msgid "Could not find a readable \"%s.%s\" ruleset file."
msgstr ""
-#: server/ruleset.c:2356
+#: server/ruleset.c:2366
msgid "No barbarian nation in rulesets, at least one required!"
msgstr ""
-#: server/ruleset.c:3166
+#: server/ruleset.c:3178
msgid "Loading rulesets"
msgstr ""
@@ -3648,17 +3675,17 @@ msgid ""
"risk."
msgstr ""
-#: server/savegame.c:3588
+#: server/savegame.c:3587
msgid "Saved game is too old, at least version 1.9.0 required."
msgstr ""
#. TRANS: Fatal error message.
-#: server/savegame.c:3815
+#: server/savegame.c:3817
msgid ""
"Saved game uses the \"classic\" terrain ruleset, and is no longer supported."
msgstr ""
-#: server/savegame.c:3824
+#: server/savegame.c:3826
#, c-format
msgid ""
"Warning: Different rulesetdirs ('%s' and '%s') are no longer supported. "
@@ -3666,7 +3693,7 @@ msgid ""
msgstr ""
#. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4051
+#: server/savegame.c:4055
#, c-format
msgid "%s had invalid nation; changing to %s."
msgstr ""
@@ -3699,7 +3726,7 @@ msgstr "داخلی"
msgid "Networking"
msgstr "شبکه‌ای"
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:734
#: client/gui-win32/dialogs.c:532
msgid "All"
msgstr "همه"
@@ -4619,11 +4646,11 @@ msgid ""
"the game."
msgstr ""
-#: server/sernet.c:150
+#: server/sernet.c:151
msgid "Server cannot read standard input. Ignoring input."
msgstr ""
-#: server/sernet.c:929
+#: server/sernet.c:933
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr ""
@@ -4696,821 +4723,874 @@ msgstr ""
msgid "Without guidance from the capital, the %s spaceship is lost!"
msgstr ""
-#: server/srv_main.c:240
+#: server/srv_main.c:242
msgid "Game ended in a draw as end year exceeded"
msgstr ""
-#: server/srv_main.c:274
+#: server/srv_main.c:276
#, c-format
msgid "The %s spaceship has arrived at Alpha Centauri."
msgstr ""
-#: server/srv_main.c:287 server/srv_main.c:322
+#: server/srv_main.c:289 server/srv_main.c:324
#, c-format
msgid "Team victory to %s"
msgstr ""
-#: server/srv_main.c:297 server/srv_main.c:338
+#: server/srv_main.c:299 server/srv_main.c:340
#, c-format
msgid "Game ended in victory for %s"
msgstr ""
-#: server/srv_main.c:345
+#: server/srv_main.c:347
msgid "Game ended in a draw"
msgstr ""
-#: server/srv_main.c:461 server/srv_main.c:472
+#: server/srv_main.c:465 server/srv_main.c:476
#, c-format
msgid "Your %s was disbanded in accordance with your peace treaty with the %s."
msgstr ""
-#: server/srv_main.c:512 server/srv_main.c:516
+#: server/srv_main.c:516 server/srv_main.c:520
#, c-format
msgid ""
"Concerned citizens point out that the cease-fire with %s will run out soon."
msgstr ""
-#: server/srv_main.c:521 server/srv_main.c:525
+#: server/srv_main.c:525 server/srv_main.c:529
#, c-format
msgid "The cease-fire with %s has run out. You are now at war with the %s."
msgstr ""
-#: server/srv_main.c:542
+#: server/srv_main.c:546
#, c-format
msgid ""
"Ceasefire between %s and %s has run out. They are at war. You cancel your "
"alliance with both."
msgstr ""
-#: server/srv_main.c:961
+#: server/srv_main.c:997
#, c-format
msgid "Failed saving game as %s"
msgstr ""
-#: server/srv_main.c:963
+#: server/srv_main.c:999
#, c-format
msgid "Game saved as %s"
msgstr "بازی با نام %s ذخیره شد"
-#: server/srv_main.c:994
+#: server/srv_main.c:1030
msgid "The game is already running."
msgstr "بازی از قبل اجرا شده است."
-#: server/srv_main.c:1002
+#: server/srv_main.c:1038
#, c-format
msgid "%s lost control cmdlevel on game start. Use voting from now on."
msgstr ""
-#: server/srv_main.c:1009
+#: server/srv_main.c:1045
msgid "Starting game."
msgstr "در Øال شروع بازی"
-#: server/srv_main.c:1071
+#: server/srv_main.c:1112
#, c-format
msgid "request for unknown report (type %d)"
msgstr ""
-#: server/srv_main.c:1136
+#: server/srv_main.c:1177
#, c-format
msgid "Warning: rejecting old client %s"
msgstr ""
-#: server/srv_main.c:1238
+#: server/srv_main.c:1279
#, c-format
msgid "Got a packet of type %d from a dead or observer player"
msgstr ""
-#: server/srv_main.c:1338
+#: server/srv_main.c:1381
msgid "Please choose a non-blank name."
msgstr ""
-#: server/srv_main.c:1354
+#: server/srv_main.c:1397
msgid "That nation is already in use."
msgstr ""
-#: server/srv_main.c:1370
+#: server/srv_main.c:1413
#, c-format
msgid "Another player already has the name '%s'. Please choose another name."
msgstr ""
-#: server/srv_main.c:1391
+#: server/srv_main.c:1434
msgid "Please choose a name containing only ASCII characters."
msgstr ""
-#: server/srv_main.c:1490
+#: server/srv_main.c:1533
#, c-format
msgid "%s nation is not available in this scenario."
msgstr ""
-#: server/srv_main.c:1496
+#: server/srv_main.c:1539
#, c-format
msgid "%s nation is already in use."
msgstr ""
-#: server/srv_main.c:1514
+#: server/srv_main.c:1557
#, c-format
msgid "%s is the %s ruler %s."
msgstr "%s Øاکم %sØŒ %s است."
-#: server/srv_main.c:1570
+#: server/srv_main.c:1613
#, c-format
msgid "Waiting to start game: %d out of %d players are ready to start."
msgstr ""
-#: server/srv_main.c:1614 server/srv_main.c:1618
+#: server/srv_main.c:1657 server/srv_main.c:1661
#, c-format
msgid "%s has been added as %s level AI-controlled player."
msgstr "%s به عنوان بازیکن هوش‌مصنوعی Ø³Ø·Ø %s اضاÙÙ‡ شد."
-#: server/srv_main.c:1760
+#: server/srv_main.c:1803
#, c-format
msgid "Player %d"
msgstr "بازیکن %d"
-#: server/srv_main.c:1771 server/srv_main.c:1777
+#: server/srv_main.c:1814 server/srv_main.c:1820
#, c-format
msgid "%s rules the %s."
msgstr "%s بر %s Øکومت می‌کند."
-#: server/srv_main.c:1942
+#: server/srv_main.c:1985
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
msgstr ""
-#: server/srv_main.c:1993
+#: server/srv_main.c:2037
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr ""
-#: server/srv_main.c:2024
+#: server/srv_main.c:2069
msgid "The game is over..."
msgstr "بازی تمام شد..."
-#: server/srv_main.c:2237
+#: server/srv_main.c:2286
msgid "Now accepting new client connections."
msgstr ""
-#: server/stdinhand.c:246
-#, c-format
-msgid "Vote \"%s\" is passed %d to %d with %d abstentions."
-msgstr ""
-
-#: server/stdinhand.c:253
-#, c-format
-msgid "Vote \"%s\" failed with %d against, %d for and %d abstentions."
-msgstr ""
-
#. TRANS: ambiguous command
-#: server/stdinhand.c:365
+#: server/stdinhand.c:284
msgid "(ambiguous)"
msgstr ""
#. TRANS: unrecognized command
#. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:416
+#: server/stdinhand.c:287 client/citydlg_common.c:419
#: 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 ""
-#: server/stdinhand.c:458
+#: server/stdinhand.c:377
msgid "Name is empty, so cannot be a player."
msgstr ""
-#: server/stdinhand.c:462
+#: server/stdinhand.c:381
msgid "Name is too long, so cannot be a player."
msgstr ""
-#: server/stdinhand.c:466
+#: server/stdinhand.c:385
#, c-format
msgid "Player name prefix '%s' is ambiguous."
msgstr ""
-#: server/stdinhand.c:470
+#: server/stdinhand.c:389
#, c-format
msgid "No player by the name of '%s'."
msgstr ""
-#: server/stdinhand.c:474 server/stdinhand.c:509
+#: server/stdinhand.c:393 server/stdinhand.c:428
#, c-format
msgid "Unexpected match_result %d (%s) for '%s'."
msgstr ""
-#: server/stdinhand.c:493
+#: server/stdinhand.c:412
msgid "Name is empty, so cannot be a connection."
msgstr ""
-#: server/stdinhand.c:497
+#: server/stdinhand.c:416
msgid "Name is too long, so cannot be a connection."
msgstr ""
-#: server/stdinhand.c:501
+#: server/stdinhand.c:420
#, c-format
msgid "Connection name prefix '%s' is ambiguous."
msgstr ""
-#: server/stdinhand.c:505
+#: server/stdinhand.c:424
#, c-format
msgid "No connection by the name of '%s'."
msgstr ""
-#: server/stdinhand.c:525
+#: server/stdinhand.c:444
#, c-format
msgid "Open metaserver connection to [%s]."
msgstr ""
-#: server/stdinhand.c:538
+#: server/stdinhand.c:457
#, c-format
msgid "Close metaserver connection to [%s]."
msgstr ""
-#: server/stdinhand.c:553
+#: server/stdinhand.c:472
msgid "Metaserver connection is open."
msgstr ""
-#: server/stdinhand.c:556
+#: server/stdinhand.c:475
msgid "Metaserver connection is closed."
msgstr ""
-#: server/stdinhand.c:566
+#: server/stdinhand.c:485
msgid "Metaserver connection is already open."
msgstr ""
-#: server/stdinhand.c:577
+#: server/stdinhand.c:496
msgid "Metaserver connection is already closed."
msgstr ""
-#: server/stdinhand.c:582
+#: server/stdinhand.c:501
msgid "Argument must be 'u', 'up', 'd', 'down', or '?'."
msgstr ""
-#: server/stdinhand.c:603
+#: server/stdinhand.c:522
#, c-format
msgid "Metaserver patches string set to '%s'."
msgstr ""
-#: server/stdinhand.c:606
+#: server/stdinhand.c:525
#, c-format
msgid "Metaserver patches string set to '%s', not reporting to metaserver."
msgstr ""
-#: server/stdinhand.c:627
+#: server/stdinhand.c:546
#, c-format
msgid "Metaserver message string set to '%s'."
msgstr ""
-#: server/stdinhand.c:630
+#: server/stdinhand.c:549
#, c-format
msgid "Metaserver message string set to '%s', not reporting to metaserver."
msgstr ""
-#: server/stdinhand.c:650
+#: server/stdinhand.c:569
#, c-format
msgid "Metaserver is now [%s]."
msgstr ""
-#: server/stdinhand.c:660
+#: server/stdinhand.c:579
#, c-format
msgid "Server id: %s"
msgstr ""
-#: server/stdinhand.c:757
+#: server/stdinhand.c:676
msgid "You cannot save games manually on this server."
msgstr ""
-#: server/stdinhand.c:774
+#: server/stdinhand.c:693
msgid "Cannot toggle a barbarian player."
msgstr ""
-#: server/stdinhand.c:781
+#: server/stdinhand.c:700
#, c-format
msgid "%s is now under AI control."
msgstr "%s اکنون تØت کنترل هوش‌مصنوعی است."
-#: server/stdinhand.c:802
+#: server/stdinhand.c:721
#, c-format
msgid "%s is now under human control."
msgstr "%s اکنون تØت کنترل انسان است."
-#: server/stdinhand.c:847
+#: server/stdinhand.c:766
msgid "Can't add AI players once the game has begun."
msgstr ""
-#: server/stdinhand.c:867
+#: server/stdinhand.c:786
msgid "Can't add more players, server is full."
msgstr ""
-#: server/stdinhand.c:874
+#: server/stdinhand.c:793
msgid "Can't use an empty name."
msgstr ""
-#: server/stdinhand.c:881
+#: server/stdinhand.c:800
#, c-format
msgid "That name exceeds the maximum of %d chars."
msgstr ""
-#: server/stdinhand.c:887
+#: server/stdinhand.c:806
msgid "That name is not allowed."
msgstr ""
-#: server/stdinhand.c:893
+#: server/stdinhand.c:812
msgid "A player already exists by that name."
msgstr "یک بازیکن با این نام وجود دارد."
-#: server/stdinhand.c:899
+#: server/stdinhand.c:818
msgid "A user already exists by that name."
msgstr "یک کاربر با این نام وجود دارد."
-#: server/stdinhand.c:925
+#: server/stdinhand.c:844
#, c-format
msgid "%s has been added as an AI-controlled player."
msgstr "%s به عنوان بازیکن هوش‌مصنوعی اضاÙÙ‡ شد."
-#: server/stdinhand.c:932
+#: server/stdinhand.c:851
#, c-format
msgid "Error creating new AI player: %s."
msgstr ""
-#: server/stdinhand.c:966
+#: server/stdinhand.c:885
msgid "Players cannot be removed once the game has started."
msgstr ""
-#: server/stdinhand.c:977
+#: server/stdinhand.c:896
#, c-format
msgid "Removed player %s from the game."
msgstr ""
-#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
+#: server/stdinhand.c:935 server/stdinhand.c:3372 server/stdinhand.c:3507
#, c-format
msgid "Name \"%s\" disallowed for security reasons."
msgstr ""
-#: server/stdinhand.c:1029
+#: server/stdinhand.c:948
#, c-format
msgid "No command script found by the name \"%s\"."
msgstr ""
-#: server/stdinhand.c:1037
+#: server/stdinhand.c:956
#, c-format
msgid "Loading script file: %s"
msgstr ""
-#: server/stdinhand.c:1052
+#: server/stdinhand.c:971
#, c-format
msgid "Cannot read command line scriptfile '%s'."
msgstr ""
-#: server/stdinhand.c:1054
+#: server/stdinhand.c:973
#, c-format
msgid "Could not read script file '%s'."
msgstr ""
-#: server/stdinhand.c:1146
+#: server/stdinhand.c:1065
#, c-format
msgid "Could not write script file '%s'."
msgstr ""
-#: server/stdinhand.c:1158
+#: server/stdinhand.c:1077
msgid "You cannot use the write command on this server for security reasons."
msgstr ""
-#: server/stdinhand.c:1186
+#: server/stdinhand.c:1105
#, c-format
msgid ""
"Cannot decrease command access level '%s' for connection '%s'; you only have "
"'%s'."
msgstr ""
-#: server/stdinhand.c:1241
+#: server/stdinhand.c:1114
+#, c-format
+msgid "Command access level set to '%s' for connection %s."
+msgstr ""
+
+#: server/stdinhand.c:1163
#, c-format
msgid ""
"Anyone can now become game organizer '%s' by issuing the 'first' command."
msgstr ""
-#: server/stdinhand.c:1274
+#: server/stdinhand.c:1187
msgid "Command access levels in effect:"
msgstr ""
-#: server/stdinhand.c:1282
+#: server/stdinhand.c:1194
#, c-format
msgid "Command access level for new connections: %s"
msgstr ""
-#: server/stdinhand.c:1285
+#: server/stdinhand.c:1197
#, c-format
msgid "Command access level for first player to take it: %s"
msgstr ""
-#: server/stdinhand.c:1294
+#: server/stdinhand.c:1206
msgid ""
"Error: command access level must be one of 'none', 'info', 'ctrl', or 'hack'."
msgstr ""
-#: server/stdinhand.c:1299
+#: server/stdinhand.c:1211
#, c-format
msgid ""
"Cannot increase command access level to '%s'; you only have '%s' yourself."
msgstr ""
-#: server/stdinhand.c:1326 server/stdinhand.c:1375
-#, c-format
-msgid "Command access level set to '%s' for connection %s."
-msgstr ""
-
-#: 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:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
+#: server/stdinhand.c:1238 server/stdinhand.c:1252 server/stdinhand.c:1273
#, c-format
msgid "Command access level set to '%s' for new players."
msgstr ""
-#: server/stdinhand.c:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
+#: server/stdinhand.c:1243 server/stdinhand.c:1257 server/stdinhand.c:1267
#, c-format
msgid "Command access level set to '%s' for first player to grab it."
msgstr ""
-#: server/stdinhand.c:1402
+#: server/stdinhand.c:1302
msgid "The 'first' command makes no sense from the server command line."
msgstr ""
-#: server/stdinhand.c:1406
+#: server/stdinhand.c:1306
#, c-format
msgid "You already have command access level '%s' or better."
msgstr ""
-#: server/stdinhand.c:1411
+#: server/stdinhand.c:1311
msgid "Someone else already is game organizer."
msgstr ""
-#: server/stdinhand.c:1416
+#: server/stdinhand.c:1316
#, c-format
msgid "Connection %s has opted to become the game organizer."
msgstr ""
-#: server/stdinhand.c:1467
+#: server/stdinhand.c:1367
#, c-format
msgid "Invalid argument %d."
msgstr ""
-#: server/stdinhand.c:1474
+#: server/stdinhand.c:1374
msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
msgstr ""
-#: server/stdinhand.c:1482
+#: server/stdinhand.c:1382
#, c-format
msgid "Dynamic timeout set to %d %d %d %d"
msgstr ""
-#: server/stdinhand.c:1542 server/stdinhand.c:1545
+#: server/stdinhand.c:1442 server/stdinhand.c:1445
msgid "Option:"
msgstr "تنظیم:"
-#: server/stdinhand.c:1555 server/stdinhand.c:4031
+#: server/stdinhand.c:1455 server/stdinhand.c:4079
msgid "Description:"
msgstr "توضیØ:"
-#: server/stdinhand.c:1560
+#: server/stdinhand.c:1460
#, c-format
msgid "Status: %s"
msgstr "وضعیت: %s"
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "changeable"
msgstr "قابل تغییر"
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "fixed"
msgstr "ثابت"
-#: server/stdinhand.c:1567
+#: server/stdinhand.c:1467
#, c-format
msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
msgstr ""
-#: server/stdinhand.c:1572
+#: server/stdinhand.c:1472
#, c-format
msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
msgstr ""
-#: server/stdinhand.c:1578
+#: server/stdinhand.c:1478
#, c-format
msgid "Value: \"%s\", Default: \"%s\""
msgstr ""
-#: server/stdinhand.c:1597
+#: server/stdinhand.c:1497
msgid "Explanations are available for the following server options:"
msgstr ""
-#: server/stdinhand.c:1643
+#: server/stdinhand.c:1537
msgid "No explanation for that yet."
msgstr ""
-#: server/stdinhand.c:1646 server/stdinhand.c:2480
+#: server/stdinhand.c:1540 server/stdinhand.c:2468
msgid "Ambiguous option name."
msgstr ""
-#: server/stdinhand.c:1666
+#: server/stdinhand.c:1560
#, c-format
msgid "Server Operator: %s"
msgstr ""
-#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
+#: server/stdinhand.c:1686 server/stdinhand.c:1713 server/stdinhand.c:1731
#, c-format
msgid "Player '%s' now has AI skill level '%s'."
msgstr "بازیکن '%s' اکنون Ø³Ø·Ø Ù‡ÙˆØ´ '%s' را دارد."
-#: server/stdinhand.c:1822
+#: server/stdinhand.c:1718
#, c-format
msgid "%s is not controlled by the AI."
msgstr ""
-#: server/stdinhand.c:1842
+#: server/stdinhand.c:1738
#, c-format
msgid "Default AI skill level set to '%s'."
msgstr "Ø³Ø·Ø Ù‡ÙˆØ´ پیشÙرض به '%s' تغییر یاÙت."
-#: server/stdinhand.c:1857 server/stdinhand.c:2162
+#: server/stdinhand.c:1753
msgid "This command is client only."
msgstr "این دستور Ùقط از Client قابل اجراست."
-#: server/stdinhand.c:1860
+#: server/stdinhand.c:1756
msgid "Usage: away"
msgstr ""
-#: server/stdinhand.c:1865
+#: server/stdinhand.c:1761
msgid "Only players may use the away command."
msgstr ""
-#: server/stdinhand.c:1869
+#: server/stdinhand.c:1765
#, c-format
msgid "%s set to away mode."
msgstr ""
-#: server/stdinhand.c:1877
+#: server/stdinhand.c:1772
#, c-format
msgid "%s returned to game."
msgstr ""
-#: server/stdinhand.c:1919
+#: server/stdinhand.c:1817
#, c-format
msgid "Sorry, you do not have access to view option '%s'."
msgstr ""
-#: server/stdinhand.c:1925
+#: server/stdinhand.c:1823
#, c-format
msgid "Unknown option '%s'."
msgstr ""
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1848
msgid "All options with non-default values"
msgstr ""
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1851
msgid "All options"
msgstr "همه تنظیمات"
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1854
msgid "Vital options"
msgstr ""
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1857
msgid "Situational options"
msgstr ""
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1860
msgid "Rarely used options"
msgstr ""
-#: server/stdinhand.c:1965
+#: server/stdinhand.c:1863
msgid "+ means you may change the option"
msgstr ""
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1864
msgid "= means the option is on its default value"
msgstr ""
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
#, c-format
msgid "%-*s value (min,max) "
msgstr ""
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
msgid "Option"
msgstr "تنظیمات"
-#: server/stdinhand.c:1973
+#: server/stdinhand.c:1871
msgid "description"
msgstr "توضیØ"
-#: server/stdinhand.c:2042
+#: server/stdinhand.c:1940
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:2092
+#: server/stdinhand.c:1966
msgid "Cannot change teams once game has begun."
msgstr ""
-#: server/stdinhand.c:2102
+#: server/stdinhand.c:1976
msgid "Undefined argument. Usage: team <player> <team>."
msgstr ""
-#: server/stdinhand.c:2122
+#: server/stdinhand.c:1996
#, c-format
msgid "No such team %s. Please give a valid team name or number."
msgstr ""
-#: server/stdinhand.c:2129
+#: server/stdinhand.c:2003
msgid "Cannot team a barbarian."
msgstr ""
-#: server/stdinhand.c:2135
+#: server/stdinhand.c:2009
#, c-format
msgid "Player %s set to team %s."
msgstr ""
-#: server/stdinhand.c:2157
-msgid "Undefined arguments. Usage: vote yes|no [vote number]."
-msgstr ""
+#: server/stdinhand.c:2035 server/voting.c:512
+#, fuzzy
+msgid "Teamvote"
+msgstr "تیم"
-#: server/stdinhand.c:2165
-msgid "Observers cannot vote."
+#: server/stdinhand.c:2035 server/voting.c:516
+msgid "Vote"
msgstr ""
-#: server/stdinhand.c:2168
+#: server/stdinhand.c:2037
+#, c-format
msgid ""
-"You can only vote in a running game. Use 'first' to become the game "
-"organizer if there currently is none."
+"%s %d \"%s\" (needs %0.0f%%%s): %d for, %d against, and %d abstained out of %"
+"d players."
msgstr ""
-#: server/stdinhand.c:2181
-#, c-format
-msgid "Vote %d \"%s\": %d for, %d against"
+#: server/stdinhand.c:2041
+msgid " no dissent"
msgstr ""
-#: server/stdinhand.c:2188
+#: server/stdinhand.c:2049
msgid "There are no votes going on."
msgstr ""
-#: server/stdinhand.c:2208
-msgid "No legal last vote."
+#: server/stdinhand.c:2077
+msgid "Invalid arguments. Usage: vote yes|no|abstain [vote number]."
+msgstr ""
+
+#: server/stdinhand.c:2095 server/stdinhand.c:2213 server/stdinhand.c:3714
+msgid "You are not allowed to use this command."
+msgstr ""
+
+#: server/stdinhand.c:2104
+#, c-format
+msgid "The argument \"%s\" is ambigious."
+msgstr ""
+
+#: server/stdinhand.c:2119
+#, fuzzy
+msgid "There are no votes running."
+msgstr "بازی از قبل اجرا شده است."
+
+#: server/stdinhand.c:2121
+#, c-format
+msgid "No legal last vote (%d %s)."
msgstr ""
-#: server/stdinhand.c:2213
-msgid "Value must be integer."
+#: server/stdinhand.c:2122
+msgid "other vote running"
+msgid_plural "other votes running"
+msgstr[0] ""
+msgstr[1] ""
+
+#: server/stdinhand.c:2129 server/stdinhand.c:2491 server/stdinhand.c:2532
+msgid "Value must be an integer."
msgstr ""
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2135 server/stdinhand.c:2221
#, c-format
msgid "No such vote (%d)."
msgstr ""
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2141
+#, fuzzy
+msgid "You are not allowed to vote on that."
+msgstr "شما به هیچ بازیکنی وصل نیستید."
+
+#: server/stdinhand.c:2146
#, c-format
msgid "You voted for \"%s\""
msgstr ""
-#: server/stdinhand.c:2232
+#: server/stdinhand.c:2150
#, c-format
msgid "You voted against \"%s\""
msgstr ""
-#: server/stdinhand.c:2259
+#: server/stdinhand.c:2155
+#, c-format
+msgid "You abstained from voting on \"%s\""
+msgstr ""
+
+#: server/stdinhand.c:2190
+msgid "Missing argument <vote number> or the string \"all\"."
+msgstr ""
+
+#: server/stdinhand.c:2197
+#, fuzzy
+msgid "You don't have any vote going on."
+msgstr "شما اینجا کارگری ندارید."
+
+#: server/stdinhand.c:2204
+msgid "There isn't any vote going on."
+msgstr ""
+
+#: server/stdinhand.c:2209
+msgid "Server: All votes have been removed."
+msgstr ""
+
+#: server/stdinhand.c:2226
+#, c-format
+msgid "You are not allowed to cancel this vote (%d)."
+msgstr ""
+
+#: server/stdinhand.c:2232
+msgid "Usage: /cancelvote [<vote number>|all]"
+msgstr ""
+
+#: server/stdinhand.c:2241
+#, c-format
+msgid "Server: %s cancelled the vote \"%s\" (number %d)."
+msgstr ""
+
+#: server/stdinhand.c:2247
+#, c-format
+msgid "Server: The vote \"%s\" (number %d) has been cancelled."
+msgstr ""
+
+#: server/stdinhand.c:2265
msgid ""
"Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
"<x> <y> | unit <id> | tech <player> | timing | info>."
msgstr ""
-#: server/stdinhand.c:2265
+#: server/stdinhand.c:2271
msgid "Can only use this command once game has begun."
msgstr ""
-#: server/stdinhand.c:2294
+#: server/stdinhand.c:2300
#, c-format
msgid "%s diplomacy no longer debugged"
msgstr ""
-#: server/stdinhand.c:2298
+#: server/stdinhand.c:2304
#, c-format
msgid "%s diplomacy debugged"
msgstr ""
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2323
#, c-format
msgid "%s tech no longer debugged"
msgstr ""
-#: server/stdinhand.c:2321
+#: server/stdinhand.c:2327
#, c-format
msgid "%s tech debugged"
msgstr ""
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2358 server/stdinhand.c:2388
msgid "Value 2 & 3 must be integer."
msgstr ""
-#: server/stdinhand.c:2356 server/stdinhand.c:2386
+#: server/stdinhand.c:2362 server/stdinhand.c:2392
msgid "Bad map coordinates."
msgstr ""
-#: server/stdinhand.c:2361
+#: server/stdinhand.c:2367
msgid "No city at this coordinate."
msgstr ""
-#: server/stdinhand.c:2366
+#: server/stdinhand.c:2372
#, c-format
msgid "%s no longer debugged"
msgstr ""
-#: server/stdinhand.c:2392 server/stdinhand.c:2422
+#: server/stdinhand.c:2398 server/stdinhand.c:2428
#, c-format
msgid "%s %s no longer debugged."
msgstr ""
-#: server/stdinhand.c:2397 server/stdinhand.c:2427
+#: server/stdinhand.c:2403 server/stdinhand.c:2433
#, c-format
msgid "%s %s debugged."
msgstr ""
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2419
msgid "Value 2 must be integer."
msgstr ""
-#: server/stdinhand.c:2417
+#: server/stdinhand.c:2423
#, c-format
msgid "Unit %d does not exist."
msgstr ""
-#: server/stdinhand.c:2475
+#: server/stdinhand.c:2464
msgid "Undefined argument. Usage: set <option> <value>."
msgstr ""
-#: server/stdinhand.c:2485
+#: server/stdinhand.c:2473
msgid "You are not allowed to set this option."
msgstr ""
-#: server/stdinhand.c:2490 server/stdinhand.c:3463
+#: server/stdinhand.c:2478 server/stdinhand.c:3501
msgid "This setting can't be modified after the game has started."
msgstr ""
-#: server/stdinhand.c:2502 server/stdinhand.c:2543
-msgid "Value must be an integer."
-msgstr ""
-
-#: server/stdinhand.c:2512
+#: server/stdinhand.c:2501
#, c-format
msgid "The parameter %s should only contain digits 0-1."
msgstr ""
-#: server/stdinhand.c:2519
+#: server/stdinhand.c:2508
msgid "Value out of range (minimum: 0, maximum: 1)."
msgstr ""
-#: server/stdinhand.c:2534 server/stdinhand.c:2576
+#: server/stdinhand.c:2523 server/stdinhand.c:2565
#, c-format
msgid "Option: %s has been set to %d."
msgstr "تنظیمات: %s به %d تغییر یاÙت."
-#: server/stdinhand.c:2554
+#: server/stdinhand.c:2543
#, c-format
msgid "The parameter %s should only contain +- and 0-9."
msgstr ""
-#: server/stdinhand.c:2561
+#: server/stdinhand.c:2550
#, c-format
msgid "Value out of range (minimum: %d, maximum: %d)."
msgstr ""
-#: server/stdinhand.c:2586
+#: server/stdinhand.c:2575
msgid "String value too long. Usage: set <option> <value>."
msgstr ""
-#: server/stdinhand.c:2600
+#: server/stdinhand.c:2589
#, c-format
msgid "Option: %s has been set to \"%s\"."
msgstr ""
-#: server/stdinhand.c:2658
+#: server/stdinhand.c:2652
msgid "Sorry, one can't observe globally in this game."
msgstr ""
-#: server/stdinhand.c:2661
+#: server/stdinhand.c:2655
msgid "Sorry, you can't take a global observer. Observe it instead."
msgstr ""
-#: server/stdinhand.c:2671
+#: server/stdinhand.c:2665
#, fuzzy
msgid "You cannot take a new player at this time."
msgstr "شما نمی‌توانید مهره‌ای از این ملت را تطمیع کنید."
#. TRANS: Do not translate "maxplayers".
-#: server/stdinhand.c:2679
+#: server/stdinhand.c:2673
#, c-format
msgid ""
"You cannot take a new player because the maximum of %d player has already "
@@ -5521,73 +5601,73 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: server/stdinhand.c:2691
+#: server/stdinhand.c:2685
msgid "You cannot take a new player because there are no free player slots."
msgstr ""
-#: server/stdinhand.c:2702
+#: server/stdinhand.c:2696
msgid "Sorry, one can't observe barbarians in this game."
msgstr ""
-#: server/stdinhand.c:2705
+#: server/stdinhand.c:2699
msgid "Sorry, one can't take barbarians in this game."
msgstr ""
-#: server/stdinhand.c:2713
+#: server/stdinhand.c:2707
msgid "Sorry, one can't observe dead players in this game."
msgstr ""
-#: server/stdinhand.c:2716
+#: server/stdinhand.c:2710
msgid "Sorry, one can't take dead players in this game."
msgstr ""
-#: server/stdinhand.c:2724
+#: server/stdinhand.c:2718
msgid "Sorry, one can't observe AI players in this game."
msgstr ""
-#: server/stdinhand.c:2727
+#: server/stdinhand.c:2721
msgid "Sorry, one can't take AI players in this game."
msgstr ""
-#: server/stdinhand.c:2736
+#: server/stdinhand.c:2730
msgid "Sorry, one can't observe human players in this game."
msgstr ""
-#: server/stdinhand.c:2739
+#: server/stdinhand.c:2733
msgid "Sorry, one can't take human players in this game."
msgstr ""
-#: server/stdinhand.c:2749
+#: server/stdinhand.c:2743
msgid "Sorry, one can't observe in this game."
msgstr ""
-#: server/stdinhand.c:2754
+#: server/stdinhand.c:2748
msgid "Sorry, one can't take players in this game."
msgstr ""
-#: server/stdinhand.c:2760
+#: server/stdinhand.c:2754
msgid "Sorry, one can't take players already connected in this game."
msgstr ""
-#: server/stdinhand.c:2791
+#: server/stdinhand.c:2785
msgid "Usage: observe [connection-name [player-name]]"
msgstr ""
-#: server/stdinhand.c:2797
+#: server/stdinhand.c:2791
msgid "Usage: observe [player-name]"
msgstr ""
-#: server/stdinhand.c:2847
+#: server/stdinhand.c:2841
#, c-format
msgid "%s already controls %s. Using 'observe' would remove %s"
msgstr ""
-#: server/stdinhand.c:2858
+#: server/stdinhand.c:2852
#, c-format
msgid "%s is already observing %s."
msgstr ""
-#: server/stdinhand.c:2863
+#: server/stdinhand.c:2857
#, c-format
msgid "%s is already observing."
msgstr ""
@@ -5602,230 +5682,234 @@ msgstr ""
msgid "%s now observes"
msgstr "%s اکنون ناظر است"
-#: server/stdinhand.c:2969
+#: server/stdinhand.c:2971
msgid "Usage: take <connection-name> <player-name>"
msgstr ""
-#: server/stdinhand.c:2974
+#: server/stdinhand.c:2976
msgid "Usage: take <player-name>"
msgstr ""
-#: server/stdinhand.c:2980
+#: server/stdinhand.c:2982
msgid "Usage: take [connection-name] <player-name>"
msgstr ""
-#: server/stdinhand.c:3010
+#: server/stdinhand.c:3012
#, fuzzy, c-format
msgid "%s already controls %s."
msgstr "%s را از %s برداشت!"
-#: server/stdinhand.c:3024
+#: server/stdinhand.c:3026
#, c-format
msgid "There is no free player slot for %s."
msgstr ""
-#: server/stdinhand.c:3059
+#: server/stdinhand.c:3061
#, c-format
msgid "being detached from %s."
msgstr ""
-#: server/stdinhand.c:3135
+#: server/stdinhand.c:3146
#, fuzzy, c-format
msgid "%s now controls %s (%s, %s)."
msgstr "%s اکنون %s را کنترل می‌کند(%s, %s)"
-#: server/stdinhand.c:3139 server/stdinhand.c:4260
+#: server/stdinhand.c:3150 server/stdinhand.c:4308
#: data/nation/barbarian.ruleset:3
msgid "Barbarian"
msgstr "بیگانه"
-#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
+#: server/stdinhand.c:3152 server/stdinhand.c:4310 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-sdl/plrdlg.c:645
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr "ه‌م"
-#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-gtk-2.0/pages.c:2125
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
+#: server/stdinhand.c:3153 server/stdinhand.c:4312
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-gtk-2.0/pages.c:2127
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/connectdlg.c:215
msgid "Human"
msgstr "انسان"
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-gtk-2.0/pages.c:2124 client/gui-win32/connectdlg.c:200
-#: client/gui-win32/connectdlg.c:212
+#: server/stdinhand.c:3155 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-gtk-2.0/pages.c:2126 client/gui-win32/connectdlg.c:202
+#: client/gui-win32/connectdlg.c:214
msgid "Alive"
msgstr "زنده"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3156 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-win32/connectdlg.c:202
msgid "Dead"
msgstr "مرده"
-#: server/stdinhand.c:3147
+#: server/stdinhand.c:3159
#, fuzzy, c-format
msgid "%s failed to attach to any player."
msgstr "شما به هیچ بازیکنی وصل نیستید."
-#: server/stdinhand.c:3182
+#: server/stdinhand.c:3194
msgid "Usage: detach <connection-name>"
msgstr ""
-#: server/stdinhand.c:3202
+#: server/stdinhand.c:3214
msgid "You can not detach other users."
msgstr ""
-#: server/stdinhand.c:3211
+#: server/stdinhand.c:3223
#, c-format
msgid "%s is not attached to any player."
msgstr ""
-#: server/stdinhand.c:3234
+#: server/stdinhand.c:3246
#, c-format
msgid "%s detaching from %s"
msgstr ""
-#: server/stdinhand.c:3240
+#: server/stdinhand.c:3252
#, c-format
msgid "%s no longer observing."
msgstr ""
-#: server/stdinhand.c:3259
+#: server/stdinhand.c:3271
#, c-format
msgid "detaching from %s."
msgstr ""
-#: server/stdinhand.c:3345
+#: server/stdinhand.c:3361
msgid "Usage: load <game name>"
msgstr ""
-#: server/stdinhand.c:3350
+#: server/stdinhand.c:3366
msgid "Cannot load a game while another is running."
msgstr ""
-#: server/stdinhand.c:3372
+#: server/stdinhand.c:3388
#, c-format
msgid "Cannot find savegame or scenario with the name \"%s\"."
msgstr ""
-#: server/stdinhand.c:3389
+#: server/stdinhand.c:3405
#, c-format
msgid "Could not load savefile: %s"
msgstr ""
-#: server/stdinhand.c:3458
+#: server/stdinhand.c:3496
#, c-format
msgid "Current ruleset directory is \"%s\""
msgstr ""
-#: server/stdinhand.c:3478
+#: server/stdinhand.c:3516
#, c-format
msgid "Ruleset directory \"%s\" not found"
msgstr ""
-#: server/stdinhand.c:3484
+#: server/stdinhand.c:3522
#, c-format
msgid "Ruleset directory is already \"%s\""
msgstr ""
-#: server/stdinhand.c:3488
+#: server/stdinhand.c:3526
#, c-format
msgid "Ruleset directory set to \"%s\""
msgstr ""
-#: server/stdinhand.c:3536
+#: server/stdinhand.c:3574
msgid "Goodbye."
msgstr ""
-#: server/stdinhand.c:3567
+#: server/stdinhand.c:3606
msgid "Sorry, you are not allowed to use server commands."
msgstr ""
-#: server/stdinhand.c:3603
+#: server/stdinhand.c:3656
#, c-format
msgid "Warning: '%s' interpreted as '%s', but it is ambiguous. Try '%shelp'."
msgstr ""
-#: server/stdinhand.c:3608
+#: server/stdinhand.c:3661
#, c-format
msgid "Unknown command. Try '%shelp'."
msgstr ""
-#: server/stdinhand.c:3625
-msgid "Your new vote canceled your previous vote."
+#: server/stdinhand.c:3675
+msgid "Your new vote cancelled your previous vote."
msgstr ""
-#: server/stdinhand.c:3633
-#, c-format
-msgid "New vote (number %d) by %s: %s."
+#: server/stdinhand.c:3688
+msgid "New teamvote"
msgstr ""
-#: server/stdinhand.c:3645
+#: server/stdinhand.c:3691
+msgid "New vote"
+msgstr ""
+
+#: server/stdinhand.c:3695
#, c-format
-msgid "Your new vote (\"%s\") was not legal or was not recognized."
+msgid "%s (number %d) by %s: %s"
msgstr ""
-#: server/stdinhand.c:3655
-msgid "You are not allowed to use this command."
+#: server/stdinhand.c:3704
+#, c-format
+msgid "Your new vote (\"%s\") was not legal or was not recognized."
msgstr ""
-#: server/stdinhand.c:3680
+#: server/stdinhand.c:3726
msgid "(server prompt)"
msgstr ""
-#: server/stdinhand.c:3787
+#: server/stdinhand.c:3835
msgid "Game ended in a draw."
msgstr ""
-#: server/stdinhand.c:3791
+#: server/stdinhand.c:3839
msgid ""
"Ending the game. The server will restart once all clients have disconnected."
msgstr ""
-#: server/stdinhand.c:3796
+#: server/stdinhand.c:3844
msgid "Cannot end the game: no game running."
msgstr ""
-#: server/stdinhand.c:3812
+#: server/stdinhand.c:3860
#, c-format
msgid "%s has conceded the game and can no longer win."
msgstr ""
-#: server/stdinhand.c:3817
+#: server/stdinhand.c:3865
msgid "You cannot surrender now."
msgstr ""
-#: server/stdinhand.c:3883
+#: server/stdinhand.c:3931
msgid "Not enough human players, game will not start."
msgstr ""
-#: server/stdinhand.c:3888
+#: server/stdinhand.c:3936
msgid "No players, game will not start."
msgstr ""
-#: server/stdinhand.c:3892
+#: server/stdinhand.c:3940
msgid "Not enough nations for all players, game will not start."
msgstr ""
-#: server/stdinhand.c:3901
+#: server/stdinhand.c:3949
msgid "All players are ready; starting game."
msgstr "همه‌ي بازیکنان آماده هستند؛ بازی را شروع می‌کنیم."
-#: server/stdinhand.c:3915
+#: server/stdinhand.c:3963
msgid ""
"Cannot start the game: the game is waiting for all clients to disconnect."
msgstr ""
-#: server/stdinhand.c:3922
+#: server/stdinhand.c:3970
msgid "Cannot start the game: it is already running."
msgstr ""
-#: server/stdinhand.c:3953
+#: server/stdinhand.c:4001
#, c-format
msgid "Cutting connection %s."
msgstr ""
-#: server/stdinhand.c:3972
+#: server/stdinhand.c:4020
msgid ""
"Welcome - this is the introductory help text for the Freeciv server.\n"
"\n"
@@ -5846,123 +5930,123 @@ msgid ""
" quit - to exit"
msgstr ""
-#: server/stdinhand.c:4007 server/stdinhand.c:4010
+#: server/stdinhand.c:4055 server/stdinhand.c:4058
msgid "Command:"
msgstr ""
-#: server/stdinhand.c:4014
+#: server/stdinhand.c:4062
msgid "Synopsis: "
msgstr ""
-#: server/stdinhand.c:4023
+#: server/stdinhand.c:4071
#, c-format
msgid "Level: %s"
msgstr ""
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4096
msgid "The following server commands are available:"
msgstr ""
-#: server/stdinhand.c:4123
+#: server/stdinhand.c:4171
#, c-format
msgid "Help argument '%s' is ambiguous."
msgstr ""
-#: server/stdinhand.c:4128
+#: server/stdinhand.c:4176
#, c-format
msgid "No match for help argument '%s'."
msgstr ""
-#: server/stdinhand.c:4194
+#: server/stdinhand.c:4242
#, c-format
msgid "Bad list argument: '%s'. Try '%shelp list'."
msgstr ""
-#: server/stdinhand.c:4234
+#: server/stdinhand.c:4282
msgid "List of players:"
msgstr "لیست بازیکنان:"
-#: server/stdinhand.c:4239
+#: server/stdinhand.c:4287
msgid "<no players>"
msgstr ""
-#: server/stdinhand.c:4256
+#: server/stdinhand.c:4304
#, c-format
msgid "user %s, "
msgstr "کاربر %s, "
-#: server/stdinhand.c:4267
+#: server/stdinhand.c:4315
msgid ", Dead"
msgstr ", مرده"
-#: server/stdinhand.c:4270
+#: server/stdinhand.c:4318
#, c-format
msgid ", difficulty level %s"
msgstr ""
#. TRANS: continue list, in case comma is not the separator of choice.
-#: server/stdinhand.c:4275 server/stdinhand.c:4279 client/helpdata.c:257
-#: client/helpdata.c:752 client/text.c:241 client/text.c:1224
-#: client/text.c:1262
+#: server/stdinhand.c:4323 server/stdinhand.c:4327 client/helpdata.c:257
+#: client/helpdata.c:752 client/text.c:241 client/text.c:1229
+#: client/text.c:1267
#, c-format
msgid "?clistmore:, %s"
msgstr ", %s"
-#: server/stdinhand.c:4283
+#: server/stdinhand.c:4331
msgid ", ready"
msgstr ""
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4333
msgid ", not ready"
msgstr ""
-#: server/stdinhand.c:4293
+#: server/stdinhand.c:4341
#, c-format
msgid " %d connection:"
msgid_plural " %d connections:"
msgstr[0] " %d اتصال:"
msgstr[1] " %d اتصال:"
-#: server/stdinhand.c:4299
+#: server/stdinhand.c:4347
#, c-format
msgid " %s from %s (command access level %s), bufsize=%dkb"
msgstr " %s از %s (Ø³Ø·Ø Ø¯Ø³ØªØ±Ø³ÛŒ %s)ØŒ اندازه باÙر=%dکیلوبایت"
-#: server/stdinhand.c:4304
+#: server/stdinhand.c:4352
msgid " (observer mode)"
msgstr " (Øالت ناظر)"
-#: server/stdinhand.c:4322
+#: server/stdinhand.c:4370
msgid "List of teams:"
msgstr "لیست تیم‌ها:"
#. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4332
+#: server/stdinhand.c:4380
#, c-format
msgid "%2d : '%s' : %d player"
msgid_plural "%2d : '%s' : %d players"
msgstr[0] ""
msgstr[1] ""
-#: server/stdinhand.c:4352
+#: server/stdinhand.c:4400
#, c-format
msgid "%2d : '%s' : 1 player : %s"
msgstr ""
-#: server/stdinhand.c:4360
+#: server/stdinhand.c:4408
#, c-format
msgid "Empty team: %s"
msgstr ""
-#: server/stdinhand.c:4371
+#: server/stdinhand.c:4419
msgid "List of connections to server:"
msgstr ""
-#: server/stdinhand.c:4375
+#: server/stdinhand.c:4423
msgid "<no connections>"
msgstr ""
-#: server/stdinhand.c:4399
+#: server/stdinhand.c:4447
msgid "List of scenarios available:"
msgstr ""
@@ -5981,65 +6065,65 @@ msgstr ""
msgid "%s acquired from %s!"
msgstr "%s را از %s برداشت!"
-#: server/techtools.c:220
+#: server/techtools.c:221
#, c-format
msgid ""
"Discovery of %s makes the government form %s available. You may want to "
"start a revolution."
msgstr "Ú©Ø´Ù %s باعث شد Ú©Ù‡ Øکومت %s قابل دسترس شود. شاید بخواهید انقلاب کنید."
-#: server/techtools.c:301
+#: server/techtools.c:302
#, c-format
msgid "Discovery of %s OBSOLETES %s in %s!"
msgstr "کش٠%s %s را در %s منسوخ کرد!"
-#: server/techtools.c:351
+#: server/techtools.c:352
#, c-format
msgid "Learned %s. Our scientists focus on %s; goal is %s."
msgstr "%s یاد گرÙته شد. دانشمندان ما در Øال یادگیری %s هستند, هد٠%s است."
-#: server/techtools.c:369
+#: server/techtools.c:370
#, c-format
msgid "Learned %s. Scientists choose to research %s."
msgstr "%s یاد گرÙته شد. دانشمندان %s را برای پژوهش انتخاب کردند."
-#: server/techtools.c:376
+#: server/techtools.c:377
#, c-format
msgid "Learned %s. "
msgstr "%s یاد گرÙته شد. "
-#: server/techtools.c:379
+#: server/techtools.c:380
#, c-format
msgid "Researching %s."
msgstr "در Øال جستجو %s."
-#: server/techtools.c:385
+#: server/techtools.c:386
#, c-format
msgid "Learned %s. Scientists do not know what to research next."
msgstr "%s یادگرÙته شد. دانشمندان نمی‌دانند درباره Ú†Ù‡ پژوهش کنند."
-#: server/techtools.c:402
+#: server/techtools.c:403
msgid ""
"Great scientists from all the world join your civilization: you get an "
"immediate advance."
msgstr ""
-#: server/techtools.c:570
+#: server/techtools.c:571
#, c-format
msgid "Technology goal is %s."
msgstr "تکنولوژی هد٠%s است."
-#: server/techtools.c:700
+#: server/techtools.c:708
#, c-format
msgid "You steal %s from the %s."
msgstr "شما %s را از %s دزدیدید."
-#: server/techtools.c:705
+#: server/techtools.c:713
#, c-format
msgid "The %s stole %s from you!"
msgstr "%s %s را از شما دزدیدند!"
-#: server/techtools.c:710
+#: server/techtools.c:718
#, c-format
msgid "The %s have stolen %s from the %s."
msgstr "%s %s را از %s دزدیده بود."
@@ -6063,177 +6147,183 @@ msgstr ""
msgid "%s upgraded to %s for %d gold."
msgstr "%s به %s با %d طلا ترÙیع شد."
-#: server/unithand.c:396
+#: server/unithand.c:402
#, c-format
msgid "%s refuses to disband!"
msgstr ""
-#: server/unithand.c:449
+#: server/unithand.c:455
msgid "Can't place city here."
msgstr ""
-#: server/unithand.c:456
+#: server/unithand.c:462
#, c-format
msgid "Only %s can build a city."
msgstr ""
-#: server/unithand.c:461
+#: server/unithand.c:467
msgid "Can't build a city."
msgstr ""
-#: server/unithand.c:470
+#: server/unithand.c:476
#, c-format
msgid "Only %s can add to a city."
msgstr ""
-#: server/unithand.c:475
+#: server/unithand.c:481
msgid "Can't add to a city."
msgstr ""
-#: server/unithand.c:481
+#: server/unithand.c:487
#, c-format
msgid "%s unit has no moves left to add to %s."
msgstr ""
-#: server/unithand.c:487
+#: server/unithand.c:493
#, c-format
msgid "%s unit has no moves left to build city."
msgstr ""
-#: server/unithand.c:492
+#. TRANS: <city> is owned by <nation>, cannot add <unit>.
+#: server/unithand.c:499
+#, c-format
+msgid "%s is owned by %s, cannot add %s."
+msgstr ""
+
+#: server/unithand.c:506
#, c-format
msgid "%s is too big to add %s."
msgstr ""
-#: server/unithand.c:498
+#: server/unithand.c:512
#, c-format
msgid "%s needs an improvement to grow, so you cannot add %s."
msgstr ""
-#: server/unithand.c:509
+#: server/unithand.c:523
#, c-format
msgid "Can't add %s to %s."
msgstr ""
-#: server/unithand.c:531
+#: server/unithand.c:545
#, c-format
msgid "%s added to aid %s in growing."
msgstr ""
-#: server/unithand.c:828
+#: server/unithand.c:842
msgid "Your Nuclear missile was shot down by SDI defences, what a waste."
msgstr ""
-#: server/unithand.c:831
+#: server/unithand.c:845
#, c-format
msgid "The nuclear attack on %s was avoided by your SDI defense."
msgstr ""
#. TRANS: "Your Cannon ... the Polish Destroyer."
-#: server/unithand.c:901
+#: server/unithand.c:915
#, fuzzy, c-format
msgid "Your %s survived the pathetic attack from the %s %s."
msgstr "%s شما از Øمله‌ی %s %s نجات یاÙت."
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unithand.c:910
+#: server/unithand.c:924
#, c-format
msgid "Your attacking %s failed against the %s %s!"
msgstr ""
-#: server/unithand.c:983
+#: server/unithand.c:997
#, c-format
msgid "Only %s can attack from sea."
msgstr ""
-#: server/unithand.c:988
+#: server/unithand.c:1002
msgid "Cannot attack from sea."
msgstr ""
-#: server/unithand.c:996 server/unittools.c:2137
+#: server/unithand.c:1010 server/unittools.c:2142
msgid "Cannot attack unless you declare war first."
msgstr ""
-#: server/unithand.c:1001
+#: server/unithand.c:1015
#, c-format
msgid "%s can only move into your own zone of control."
msgstr "%s Ùقط می‌تواند داخل Ù…Øدوده کنترل شما باشد."
-#: server/unithand.c:1007
+#: server/unithand.c:1021
#, c-format
msgid "Cannot invade unless you break peace with %s first."
msgstr ""
-#: server/unithand.c:1052
+#: server/unithand.c:1066
msgid "This unit has no moves left."
msgstr "برای این مهره Øرکتی نمانده."
-#: server/unithand.c:1107
+#: server/unithand.c:1121
msgid "Unit must be on land to perform diplomatic action."
msgstr "مهره باید روی زمین باشد تا بتواند Ùعالیت دیپلماتیک انجام دهد."
-#: server/unithand.c:1109
+#: server/unithand.c:1123
msgid "No diplomat action possible."
msgstr ""
-#: server/unithand.c:1125
+#: server/unithand.c:1139
#, c-format
msgid "You must declare war on %s first. Try using players dialog (F3)."
msgstr ""
-#: server/unithand.c:1143
+#: server/unithand.c:1157
msgid "This unit is being transported, and so cannot bombard."
msgstr ""
-#: server/unithand.c:1158
+#: server/unithand.c:1172
msgid "You can't attack there."
msgstr ""
-#: server/unithand.c:1180
+#: server/unithand.c:1194
msgid "This type of troops cannot take over a city."
msgstr ""
-#: server/unithand.c:1198
+#: server/unithand.c:1212
msgid "A transported unit is not allied to all units or city on target tile."
msgstr ""
-#: server/unithand.c:1240
+#: server/unithand.c:1254
#, c-format
msgid "Your %s helps build the %s in %s (%d remaining)."
msgstr "%s شما به ساخت %s در %s کمک کرد. (%d مانده)"
-#: server/unithand.c:1242
+#: server/unithand.c:1256
#, c-format
msgid "Your %s helps build the %s in %s (%d surplus)."
msgstr "%s شما به ساخت %s در %s کمک کرد. (%d مازاد)"
-#: server/unithand.c:1286
+#: server/unithand.c:1300
#, c-format
msgid ""
"Sorry, your %s cannot establish a trade route because it has no home city"
msgstr ""
-#: server/unithand.c:1296
+#: server/unithand.c:1310
#, c-format
msgid "Sorry, your %s cannot establish a trade route between %s and %s"
msgstr ""
-#: server/unithand.c:1325 server/unithand.c:1344
+#: server/unithand.c:1339 server/unithand.c:1358
#, c-format
msgid "Sorry, your %s cannot establish a trade route here!"
msgstr ""
-#: server/unithand.c:1329 server/unithand.c:1348
+#: server/unithand.c:1343 server/unithand.c:1362
#, c-format
msgid " The city of %s already has %d better trade routes!"
msgstr ""
-#: server/unithand.c:1361 server/unithand.c:1373
+#: server/unithand.c:1375 server/unithand.c:1387
#, c-format
msgid "Sorry, %s has canceled the trade route from %s to your city %s."
msgstr ""
-#: server/unithand.c:1406
+#: server/unithand.c:1420
#, c-format
msgid ""
"Your %s from %s has arrived in %s, and revenues amount to %d in gold and "
@@ -6292,55 +6382,55 @@ msgid "Teleported your %s to %s."
msgstr ""
#. TRANS: A unit is moved to resolve stack conflicts.
-#: server/unittools.c:1065
+#: server/unittools.c:1070
#, fuzzy, c-format
msgid "Moved your %s."
msgstr "قیمت Øرکت"
-#: server/unittools.c:1076
+#: server/unittools.c:1081
#, c-format
msgid "Disbanded your %s."
msgstr ""
-#: server/unittools.c:1397
+#: server/unittools.c:1402
#, c-format
msgid "Unable to defend %s, %s has lost the game."
msgstr ""
-#: server/unittools.c:1401
+#: server/unittools.c:1406
#, c-format
msgid "Losing %s meant losing the game! Be more careful next time!"
msgstr ""
-#: server/unittools.c:1503
+#: server/unittools.c:1508
#, c-format
msgid "%s escaped the destruction of %s, and fled to %s."
msgstr ""
-#: server/unittools.c:1512
+#: server/unittools.c:1517
#, c-format
msgid "%s lost when %s was lost."
msgstr ""
-#: server/unittools.c:1561
+#: server/unittools.c:1566
#, c-format
msgid "Barbarian leader captured, %d gold ransom paid."
msgstr ""
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unittools.c:1579
+#: server/unittools.c:1584
#, c-format
msgid "Your attacking %s succeeded against the %s %s!"
msgstr ""
#. TRANS: "Cannon ... the Polish Destroyer."
-#: server/unittools.c:1588 server/unittools.c:1646
+#: server/unittools.c:1593 server/unittools.c:1651
#, fuzzy, c-format
msgid "%s lost to an attack by the %s %s."
msgstr "%s بر اثر Øمله‌ی %s %s از بین رÙت."
#. TRANS: "... Cannon ... the Polish Destroyer ...."
-#: server/unittools.c:1622
+#: server/unittools.c:1627
#, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -6350,14 +6440,14 @@ msgstr[1] ""
#. TRANS: "Cannon lost when the Polish Destroyer
#. * attacked the German Musketeers."
-#: server/unittools.c:1655
+#: server/unittools.c:1660
#, c-format
msgid "%s lost when the %s %s attacked the %s %s."
msgstr ""
#. TRANS: "Musketeers (and Cannon) lost to an
#. * attack from the Polish Destroyer."
-#: server/unittools.c:1670
+#: server/unittools.c:1675
#, c-format
msgid "%s (and %s) lost to an attack from the %s %s."
msgstr ""
@@ -6365,7 +6455,7 @@ msgstr ""
#. TRANS: "Musketeers and 3 other units lost to
#. * an attack from the Polish Destroyer."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1680
+#: server/unittools.c:1685
#, 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."
@@ -6375,178 +6465,220 @@ msgstr[1] ""
#. TRANS: "2 units lost when the Polish Destroyer
#. * attacked the German Musketeers."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1694
+#: server/unittools.c:1699
#, 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] ""
-#: server/unittools.c:1962
+#: server/unittools.c:1967
#, c-format
msgid "Your %s was nuked by %s."
msgstr ""
-#: server/unittools.c:1965 server/unittools.c:1981
+#: server/unittools.c:1970 server/unittools.c:1986
msgid "yourself"
msgstr "شما"
-#: server/unittools.c:1969
+#: server/unittools.c:1974
#, c-format
msgid "The %s %s was nuked."
msgstr ""
-#: server/unittools.c:1978
+#: server/unittools.c:1983
#, c-format
msgid "%s was nuked by %s."
msgstr ""
-#: server/unittools.c:1986
+#: server/unittools.c:1991
#, c-format
msgid "You nuked %s."
msgstr ""
-#: server/unittools.c:2027
+#: server/unittools.c:2032
#, c-format
msgid "The %s detonated a nuke!"
msgstr ""
-#: server/unittools.c:2051
+#: server/unittools.c:2056
#, c-format
msgid "%s transported successfully."
msgstr ""
-#: server/unittools.c:2103
+#: server/unittools.c:2108
msgid "This unit type can not be paradropped."
msgstr ""
-#: server/unittools.c:2113
+#: server/unittools.c:2118
msgid "You cannot paradrop a unit that is transporting other units."
msgstr ""
-#: server/unittools.c:2119
+#: server/unittools.c:2124
msgid "The destination location is not known."
msgstr ""
-#: server/unittools.c:2126
+#: server/unittools.c:2131
#, c-format
msgid "This unit cannot paradrop into %s."
msgstr ""
-#: server/unittools.c:2146
+#: server/unittools.c:2151
#, c-format
msgid "The distance to the target (%i) is greater than the unit's range (%i)."
msgstr ""
-#: server/unittools.c:2157
+#: server/unittools.c:2162
#, c-format
msgid "Your %s paradropped into the %s and was lost."
msgstr ""
-#: server/unittools.c:2170
+#: server/unittools.c:2175
#, c-format
msgid "Your %s was killed by enemy units at the paradrop destination."
msgstr ""
-#: server/unittools.c:2192
+#: server/unittools.c:2197
#, c-format
msgid "You found %d gold."
msgstr "شما %d طلا پیدا کردید."
-#: server/unittools.c:2209
+#: server/unittools.c:2214
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr "شما %s را در نوشته‌های دانشمندان قدیم پیدا کردید."
-#: server/unittools.c:2216
+#: server/unittools.c:2221
#, c-format
msgid "The %s have acquired %s from ancient scrolls of wisdom."
msgstr "بازی: %s %s را از نوشته‌های دانشمندان قدیم پیدا کردند."
-#: server/unittools.c:2230
+#: server/unittools.c:2235
msgid "A band of friendly mercenaries joins your cause."
msgstr "یک مهره‌ی بی‌طر٠به سپاه شما پیوست."
-#: server/unittools.c:2248
+#: server/unittools.c:2253
msgid "An abandoned village is here."
msgstr "یک کلبه متروکه اینجاست."
-#: server/unittools.c:2258
+#: server/unittools.c:2263
msgid "You have unleashed a horde of barbarians!"
msgstr ""
-#: server/unittools.c:2261
+#: server/unittools.c:2266
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr "%s شما توسط بیگانگان کشته شد!"
-#: server/unittools.c:2277
+#: server/unittools.c:2282
msgid "You found a friendly city."
msgstr "شما یک شهر دوستانه پیدا کردید."
-#: server/unittools.c:2291
+#: server/unittools.c:2296
msgid "Friendly nomads are impressed by you, and join you."
msgstr ""
-#: server/unittools.c:2316
+#: server/unittools.c:2321
msgid "Your overflight frightens the tribe; they scatter in terror."
msgstr ""
-#: server/unittools.c:2574
+#: server/unittools.c:2579
#, c-format
msgid "Orders for %s aborted after enemy movement was spotted."
msgstr ""
-#: server/unittools.c:3023
+#: server/unittools.c:3028
#, c-format
msgid "Orders for %s aborted as there are units nearby."
msgstr ""
-#: server/unittools.c:3075
+#: server/unittools.c:3080
#, c-format
msgid "Orders for %s aborted because building of city failed."
msgstr ""
-#: server/unittools.c:3088
+#: server/unittools.c:3093
#, c-format
msgid "Orders for %s aborted since they give an invalid activity."
msgstr ""
-#: server/unittools.c:3102
+#: server/unittools.c:3107
#, c-format
msgid "Orders for %s aborted since they give an invalid location."
msgstr ""
-#: server/unittools.c:3112
+#: server/unittools.c:3117
#, c-format
msgid "Orders for %s aborted as there are units in the way."
msgstr ""
-#: server/unittools.c:3138
+#: server/unittools.c:3143
#, c-format
msgid "Orders for %s aborted because of failed move."
msgstr ""
-#: server/unittools.c:3179
+#: server/unittools.c:3184
#, c-format
msgid "Attempt to change homecity for %s failed."
msgstr ""
-#: server/unittools.c:3190
+#: server/unittools.c:3195
#, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr ""
-#: server/unittools.c:3202
+#: server/unittools.c:3207
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr ""
-#: server/unittools.c:3211
+#: server/unittools.c:3216
#, c-format
msgid "Your %s has invalid orders."
msgstr ""
+#: server/voting.c:522
+#, c-format
+msgid ""
+"%s %d \"%s\" is passed %d to %d with %d abstentions and %d who did not vote."
+msgstr ""
+
+#: server/voting.c:528
+#, c-format
+msgid ""
+"%s %d \"%s\" failed with %d against, %d for, %d abstentions and %d who did "
+"not vote."
+msgstr ""
+
+#: server/voting.c:548
+#, c-format
+msgid "%s %d: %s voted yes."
+msgstr ""
+
+#: server/voting.c:553
+#, c-format
+msgid "%s %d: %s voted no."
+msgstr ""
+
+#: server/voting.c:558
+#, c-format
+msgid "%s %d: %s chose to abstain."
+msgstr ""
+
+#. TRANS: Describing a new vote that can only pass
+#. * if there are no dissenting votes.
+#: server/voting.c:726
+#, c-format
+msgid "%s (needs %0.0f%% and no dissent)."
+msgstr ""
+
+#. TRANS: Describing a new vote that can pass only if the
+#. * given percentage of players votes 'yes'.
+#: server/voting.c:732
+#, c-format
+msgid "%s (needs %0.0f%% in favor)."
+msgstr ""
+
#: server/generator/mapgen.c:1771
msgid "High landmass - this may take a few seconds."
msgstr ""
@@ -6574,12 +6706,12 @@ msgid ""
"Please report this bug at %s."
msgstr ""
-#: client/attribute.c:363
+#: client/attribute.c:368
msgid ""
"There has been a CMA error. Your citizen governor settings may be broken."
msgstr ""
-#: client/attribute.c:367
+#: client/attribute.c:372
msgid "Old attributes detected and removed."
msgstr ""
@@ -6726,41 +6858,41 @@ msgstr ""
msgid "%+4d : Taxed from trade\n"
msgstr ""
-#: client/citydlg_common.c:418
+#: client/citydlg_common.c:421
#, c-format
msgid "%+4d : Trade route with %s\n"
msgstr ""
-#: client/citydlg_common.c:427
+#: client/citydlg_common.c:430
#, c-format
msgid "%+4d : Building tithes\n"
msgstr ""
-#: client/citydlg_common.c:450
+#: client/citydlg_common.c:453
#, c-format
msgid "%+4d : Bonus from %s (%+d%%)\n"
msgstr ""
-#: client/citydlg_common.c:462
+#: client/citydlg_common.c:465
#, c-format
msgid "%+4d : Waste\n"
msgstr ""
-#: client/citydlg_common.c:468
+#: client/citydlg_common.c:471
#, c-format
msgid "%+4d : Disorder\n"
msgstr ""
-#: client/citydlg_common.c:474
+#: client/citydlg_common.c:477
#, c-format
msgid "%+4d : Used\n"
msgstr ""
-#: client/citydlg_common.c:479
+#: client/citydlg_common.c:482
msgid "==== : Adds up to\n"
msgstr ""
-#: client/citydlg_common.c:481
+#: client/citydlg_common.c:484
#, c-format
msgid "%4d : Total surplus"
msgstr ""
@@ -7082,48 +7214,48 @@ msgstr "Ùˆ"
msgid "Specialists"
msgstr "لیست ویژه‌ها"
-#: client/civclient.c:240
+#: client/civclient.c:241
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr ""
-#: client/civclient.c:250
+#: client/civclient.c:251
msgid " -l, --log FILE\tUse FILE as logfile (spawned server also uses this)\n"
msgstr ""
-#: client/civclient.c:252
+#: client/civclient.c:253
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr ""
-#: client/civclient.c:254
+#: client/civclient.c:255
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr ""
-#: client/civclient.c:256
+#: client/civclient.c:257
msgid " -p, --port PORT\tConnect to server port PORT (usually with -a)\n"
msgstr ""
-#: client/civclient.c:258
+#: client/civclient.c:259
#, c-format
msgid " -P, --Plugin PLUGIN\tUse PLUGIN for sound output %s\n"
msgstr ""
-#: client/civclient.c:260
+#: client/civclient.c:261
msgid " -r, --read FILE\tRead startup script FILE (for spawned server only)\n"
msgstr ""
-#: client/civclient.c:263
+#: client/civclient.c:264
msgid " -s, --server HOST\tConnect to the server at HOST (usually with -a)\n"
msgstr ""
-#: client/civclient.c:265
+#: client/civclient.c:266
msgid " -S, --Sound FILE\tRead sound tags from FILE\n"
msgstr ""
-#: client/civclient.c:266
+#: client/civclient.c:267
msgid " -t, --tiles FILE\tUse data file FILE.tilespec for tiles\n"
msgstr ""
-#: client/civclient.c:269
+#: client/civclient.c:270
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7131,45 +7263,45 @@ msgid ""
msgstr ""
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:274
+#: client/civclient.c:275
#, fuzzy, c-format
msgid "Report bugs at %s\n"
msgstr "اشکالات را به <%s> گزارش دهید.\n"
-#: client/civclient.c:298
+#: client/civclient.c:299
#, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr ""
-#: client/civclient.c:300 client/civclient.c:315
+#: client/civclient.c:301 client/civclient.c:316
msgid "Try using --help.\n"
msgstr ""
-#: client/civclient.c:313
+#: client/civclient.c:314
#, c-format
msgid "Invalid debug level \"%s\" specified with --debug option.\n"
msgstr ""
-#: client/civclient.c:326
+#: client/civclient.c:327
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr ""
-#: client/civclient.c:391
+#: client/civclient.c:393
#, c-format
msgid "Updating old metaserver address \"%s\"."
msgstr ""
-#: client/civclient.c:394
+#: client/civclient.c:396
#, fuzzy, c-format
msgid "Default metaserver has been set to \"%s\"."
msgstr "Ø³Ø·Ø Ù‡ÙˆØ´ پیشÙرض به '%s' تغییر یاÙت."
-#: client/civclient.c:550
+#: client/civclient.c:540
msgid "Game started."
msgstr "بازی شروع شد."
-#: client/civclient.c:588
+#: client/civclient.c:606
msgid "There was an error while auto connecting; aborting."
msgstr ""
@@ -7299,76 +7431,76 @@ msgstr "در Øال اتصال."
msgid "Disconnected from server."
msgstr "ارتباط را قطع کردیم."
-#: client/clinet.c:469
+#: client/clinet.c:473
#, c-format
msgid "Failed to contact server \"%s\" at port %d as \"%s\" after %d attempts"
msgstr ""
-#: client/clinet.c:484 client/clinet.c:486
+#: client/clinet.c:488 client/clinet.c:490
msgid "Connection to server refused. Please start the server."
msgstr ""
-#: client/clinet.c:495 client/clinet.c:523
+#: client/clinet.c:499 client/clinet.c:527
#, c-format
msgid ""
"Error contacting server \"%s\" at port %d as \"%s\":\n"
" %s\n"
msgstr ""
-#: client/clinet.c:514
+#: client/clinet.c:518
#, c-format
msgid ""
"Auto-connecting to server \"%s\" at port %d as \"%s\" every %f second(s) for "
"%d times"
msgstr ""
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
+#: client/connectdlg_common.c:78 client/gui-gtk-2.0/pages.c:1358
msgid "novice"
msgstr "نوآموز"
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1358
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
msgid "easy"
msgstr "آسان"
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1359
msgid "normal"
msgstr "متوسط"
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr "سخت"
-#: client/connectdlg_common.c:83
+#: client/connectdlg_common.c:82
msgid "experimental"
msgstr "پیشرÙته"
-#: client/connectdlg_common.c:213
+#: client/connectdlg_common.c:212
msgid "Starting server..."
msgstr "شروع کردن سرور..."
-#: client/connectdlg_common.c:332
+#: client/connectdlg_common.c:331
msgid "Couldn't start the server."
msgstr "نمی‌توان سورو را آغاز کرد."
-#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
+#: client/connectdlg_common.c:332 client/connectdlg_common.c:365
msgid "You'll have to start one manually. Sorry..."
msgstr ""
-#: client/connectdlg_common.c:364
+#: client/connectdlg_common.c:363
msgid "Couldn't connect to the server."
msgstr "نمی‌توان به سرور وصل شد."
-#: client/connectdlg_common.c:365
+#: client/connectdlg_common.c:364
msgid "We probably couldn't start it from here."
msgstr ""
-#: client/connectdlg_common.c:470
+#: client/connectdlg_common.c:469
#, fuzzy
msgid ""
"Established control over the server. You have command access level 'hack'."
msgstr "ما کنترل سرور را داریم (Ø³Ø·Ø Ú©Ù†ØªØ±Ù„ Ù‡Ú©)"
-#: client/connectdlg_common.c:475
+#: client/connectdlg_common.c:474
msgid ""
"Failed to obtain the required access level to take control of the server. "
"The server will now be shutdown."
@@ -7378,27 +7510,27 @@ msgstr ""
msgid "Only transporter units can be unloaded."
msgstr ""
-#: client/control.c:1425
+#: client/control.c:1417
msgid "Only settler units can be put into auto mode."
msgstr ""
-#: client/control.c:1516
+#: client/control.c:1511
msgid "Only nuclear units can do this."
msgstr ""
-#: client/control.c:1545
+#: client/control.c:1540
msgid "Only paratrooper units can do this."
msgstr ""
-#: client/control.c:2020
+#: client/control.c:2015
msgid "Too far for this unit."
msgstr ""
-#: client/control.c:2230 client/control.c:2260 client/control.c:2276
+#: client/control.c:2225 client/control.c:2255 client/control.c:2271
msgid "Didn't find a route to the destination!"
msgstr "راهی برای رسیدن به مقصد وجود ندارد!"
-#: client/control.c:2320
+#: client/control.c:2315
msgid "Oh my! You seem to have no capital!"
msgstr ""
@@ -7782,27 +7914,34 @@ msgstr "* %s ریسک را به 12%% کم می‌کند.\n"
#. * last two elements
#. TRANS: List of possible output types has this between
#. * last two elements
-#: client/helpdata.c:1066 client/helpdata.c:1400
+#: client/helpdata.c:1066 client/helpdata.c:1408
msgid " or "
msgstr " یا "
-#: client/helpdata.c:1068 client/helpdata.c:1388
+#: client/helpdata.c:1068 client/helpdata.c:1396
msgid "?or:, "
msgstr "، "
-#: client/helpdata.c:1080
-#, 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"
+#: client/helpdata.c:1079
+#, fuzzy, c-format
+msgid "* Unit has to be in a city, or a base after %d turn.\n"
+msgid_plural "* Unit has to be in a city, or a base after %d turns.\n"
msgstr[0] "* مهره باید در یک شهر یا در یک %s بعد از %d نوبت باشد.\n"
msgstr[1] "* مهره باید در یک شهر یا در یک %s بعد از %d نوبت باشد.\n"
-#: client/helpdata.c:1122
+#: client/helpdata.c:1087
+#, fuzzy, c-format
+msgid "* Unit has to be in a city, a base, or on a %s after %d turn.\n"
+msgid_plural "* Unit has to be in a city, a base, or on a %s after %d turns.\n"
+msgstr[0] "* مهره باید در یک شهر یا در یک %s بعد از %d نوبت باشد.\n"
+msgstr[1] "* مهره باید در یک شهر یا در یک %s بعد از %d نوبت باشد.\n"
+
+#: client/helpdata.c:1130
#, c-format
msgid "If we would now start with %s we would need %d bulbs."
msgstr "اگر مایلید %s را شروع کنید %d امتیاز نیاز دارید."
-#: client/helpdata.c:1127
+#: client/helpdata.c:1135
#, c-format
msgid ""
"To reach %s we need to obtain %d other technologies first. The whole project "
@@ -7811,88 +7950,88 @@ msgstr ""
"برای رسیدن به %s ما نیاز به %d تکنولوژی دیگر داریم. این پروژه %d امتیاز لازم "
"دارد."
-#: client/helpdata.c:1135
+#: client/helpdata.c:1143
msgid "You cannot research this technology."
msgstr ""
-#: client/helpdata.c:1139
+#: client/helpdata.c:1147
msgid " This number may vary depending on what other players will research.\n"
msgstr ""
-#: client/helpdata.c:1151
+#: client/helpdata.c:1159
#, c-format
msgid "* The first player to research %s gets an immediate advance.\n"
msgstr "* اولین بازیکنی Ú©Ù‡ %s را بگیرد آن Ù„Øظه یک تکنولوژی می‌گیرد.\n"
-#: client/helpdata.c:1156
+#: client/helpdata.c:1164
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
msgstr "* شانس از دست دادن قایق‌ها را در دریای آزاد 25%% کاهش می‌دهد.\n"
-#: client/helpdata.c:1159
+#: client/helpdata.c:1167
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
msgstr "* شانس از دست دادن قایق‌ها را در دریای آزاد 12%% کاهش می‌دهد.\n"
-#: client/helpdata.c:1163
+#: client/helpdata.c:1171
msgid "* Increases the pollution generated by the population.\n"
msgstr "* آلودگی Øاصل از جمعیت را زیاد می‌کند.\n"
-#: client/helpdata.c:1168
+#: client/helpdata.c:1176
#, c-format
msgid "* Allows %s to build roads on river squares.\n"
msgstr "* به %s اجازه ساخت جاده را روی رودخانه می‌دهد.\n"
-#: client/helpdata.c:1175
+#: client/helpdata.c:1183
#, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr "* به %s اجازه می‌دهد تا دژ بسازد.\n"
-#: client/helpdata.c:1183
+#: client/helpdata.c:1191
#, c-format
msgid "* Allows %s to build airbases.\n"
msgstr "* به %s اجازه می‌دهد پایگاه هوایی بسازد.\n"
-#: client/helpdata.c:1192
+#: client/helpdata.c:1200
#, c-format
msgid "* Allows %s to upgrade roads to railroads.\n"
msgstr "* به %s اجازه می‌دهد تا جاده‌ها را به خط‌آهن تبدیل کند.\n"
-#: client/helpdata.c:1200
+#: client/helpdata.c:1208
#, c-format
msgid "* Allows %s to upgrade irrigation to farmland.\n"
msgstr "* به %s اجازه می‌دهد تا زمین‌های آبیاری را به مزرعه تبدیل کند.\n"
-#: client/helpdata.c:1234
+#: client/helpdata.c:1242
msgid "* Pollution cannot be generated on this terrain."
msgstr "* در این خانه آلودگی تولید نمی‌شود."
-#: client/helpdata.c:1239
+#: client/helpdata.c:1247
msgid "* You cannot build cities on this terrain."
msgstr "* نمی‌توان روی این خانه شهر ساخت."
-#: client/helpdata.c:1245
+#: client/helpdata.c:1253
msgid "* The coastline of this terrain is unsafe."
msgstr ""
-#: client/helpdata.c:1250
+#: client/helpdata.c:1258
msgid "* This terrain is unsafe for units to travel on."
msgstr ""
-#: client/helpdata.c:1255
+#: client/helpdata.c:1263
msgid "* Land units cannot travel on oceanic terrains."
msgstr ""
-#: client/helpdata.c:1305
+#: client/helpdata.c:1313
msgid "Features:\n"
msgstr ""
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1411 client/helpdata.c:1412
+#: client/helpdata.c:1419 client/helpdata.c:1420
msgid "?outputlist: Nothing "
msgstr ""
-#: client/helpdata.c:1419
+#: client/helpdata.c:1427
#, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -7903,7 +8042,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1429
+#: client/helpdata.c:1437
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -7911,48 +8050,48 @@ msgid ""
msgstr ""
#. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1437
+#: client/helpdata.c:1445
#, c-format
msgid "* You pay %d times normal %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1442
+#: client/helpdata.c:1450
#, 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:1447
+#: client/helpdata.c:1455
#, c-format
msgid "* You pay no %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1451
+#: client/helpdata.c:1459
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:1460
+#: client/helpdata.c:1468
#, 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:1468
+#: client/helpdata.c:1476
#, c-format
msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
msgstr ""
-#: client/helpdata.c:1475
+#: client/helpdata.c:1483
#, 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:1482
+#: client/helpdata.c:1490
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -7960,23 +8099,23 @@ msgid ""
msgstr ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1489
+#: client/helpdata.c:1497
#, 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:1497
+#: client/helpdata.c:1505
#, c-format
msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
msgstr ""
-#: client/helpdata.c:1502
+#: client/helpdata.c:1510
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr ""
-#: client/helpdata.c:1507
+#: client/helpdata.c:1515
#, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -7987,7 +8126,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1519
+#: client/helpdata.c:1527
#, 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"
@@ -7995,60 +8134,60 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1530
+#: client/helpdata.c:1538
#, 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:1536
+#: client/helpdata.c:1544
msgid "* Your units cannot be bribed.\n"
msgstr ""
-#: client/helpdata.c:1539
+#: client/helpdata.c:1547
msgid "* Your cities cannot be incited.\n"
msgstr ""
-#: client/helpdata.c:1543
+#: client/helpdata.c:1551
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:1549
+#: client/helpdata.c:1557
msgid "* Has a senate that may prevent declaration of war.\n"
msgstr ""
-#: client/helpdata.c:1553
+#: client/helpdata.c:1561
msgid "* Allows partisans when cities are taken by the enemy.\n"
msgstr ""
-#: client/helpdata.c:1557
+#: client/helpdata.c:1565
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
msgstr ""
-#: client/helpdata.c:1561
+#: client/helpdata.c:1569
msgid "* Pays no upkeep for fanatics.\n"
msgstr ""
-#: client/helpdata.c:1564
+#: client/helpdata.c:1572
msgid "* Has no unhappy citizens.\n"
msgstr ""
-#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
+#: client/helpdata.c:1582 client/helpdata.c:1586 client/helpdata.c:1590
#, c-format
msgid "* Veteran %s units.\n"
msgstr ""
-#: client/helpdata.c:1585
+#: client/helpdata.c:1593
msgid "* Veteran units.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1591
+#: client/helpdata.c:1599
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8056,7 +8195,7 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1600
+#: client/helpdata.c:1608
#, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8064,71 +8203,71 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1608
+#: client/helpdata.c:1616
#, 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:1617
+#: client/helpdata.c:1625
#, c-format
msgid "* %s production is increased %d%%.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1625
+#: client/helpdata.c:1633
#, c-format
msgid "* %s production will suffer massive waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1630
+#: client/helpdata.c:1638
#, c-format
msgid "* %s production will suffer some waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1635
+#: client/helpdata.c:1643
#, 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:1643
+#: client/helpdata.c:1651
#, 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:1649
+#: client/helpdata.c:1657
#, 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:1655
+#: client/helpdata.c:1663
#, c-format
msgid "* %s waste will increase slowly with distance from capital.\n"
msgstr ""
-#: client/helpdata.c:1672
+#: client/helpdata.c:1680
#, c-format
msgid "* Allows you to build %s.\n"
msgstr ""
#. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1699
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d %s"
msgstr "%s%d %s"
-#: client/helpdata.c:1700 client/helpdata.c:1708 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1708 client/helpdata.c:1716 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:1707
+#: client/helpdata.c:1715
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d ناراØت"
@@ -8197,7 +8336,7 @@ msgid ""
"or with the -a command-line parameter."
msgstr ""
-#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:916 data/Freeciv.in:107
msgid "Metaserver"
msgstr ""
@@ -8548,35 +8687,35 @@ msgstr ""
msgid "Saved settings to file %s"
msgstr ""
-#: client/packhand.c:211 client/packhand.c:217
+#: client/packhand.c:212 client/packhand.c:218
msgid "You were rejected from the game...."
msgstr ""
-#: client/packhand.c:229
+#: client/packhand.c:230
#, c-format
msgid "Client capability string: %s"
msgstr ""
-#: client/packhand.c:232
+#: client/packhand.c:233
#, c-format
msgid "Server capability string: %s"
msgstr ""
-#: client/packhand.c:850
+#: client/packhand.c:864
#, c-format
msgid "Start of turn %d"
msgstr "شروع نوبت %d"
-#: client/packhand.c:1591
+#: client/packhand.c:1621
#, c-format
msgid "AI Mode is now %s."
msgstr ""
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "ON"
msgstr "روشن"
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "OFF"
msgstr "خاموش"
@@ -8607,15 +8746,15 @@ msgstr "نام"
msgid "Username"
msgstr "نام کاربری"
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
-#: client/gui-gtk-2.0/pages.c:2157
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:653
+#: client/gui-gtk-2.0/pages.c:1604 client/gui-gtk-2.0/pages.c:2159
msgid "Flag"
msgstr "پرچم"
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1605
-#: client/gui-gtk-2.0/pages.c:2159 client/gui-sdl/repodlgs.c:2063
-#: client/gui-win32/connectdlg.c:990 client/gui-win32/dialogs.c:542
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:657
+#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1609
+#: client/gui-gtk-2.0/pages.c:2161 client/gui-sdl/repodlgs.c:2063
+#: client/gui-win32/connectdlg.c:992 client/gui-win32/dialogs.c:542
#: client/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "ملت"
@@ -8628,7 +8767,7 @@ msgstr "Ù…Øدوده"
msgid "Score"
msgstr "امتیاز"
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1614
msgid "Team"
msgstr "تیم"
@@ -8661,36 +8800,36 @@ msgstr ""
msgid "Ping"
msgstr "Ping"
-#: client/repodlgs_common.c:375
+#: client/repodlgs_common.c:378
msgid "You cannot sell improvements."
msgstr ""
-#: client/repodlgs_common.c:391
+#: client/repodlgs_common.c:394
#, c-format
msgid "Sold %d %s for %d gold."
msgstr ""
-#: client/repodlgs_common.c:396
+#: client/repodlgs_common.c:399
#, c-format
msgid "No %s could be sold."
msgstr ""
#. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:415
+#: client/repodlgs_common.c:418
msgid "You cannot disband units."
msgstr ""
-#: client/repodlgs_common.c:420
+#: client/repodlgs_common.c:423
#, c-format
msgid "%s cannot be disbanded."
msgstr ""
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:444
#, c-format
msgid "Disbanded %d %s."
msgstr ""
-#: client/repodlgs_common.c:445
+#: client/repodlgs_common.c:448
#, c-format
msgid "No %s could be disbanded."
msgstr ""
@@ -9280,47 +9419,47 @@ msgstr "?dys/hrs:%02dر %02dس"
msgid "?duration:overflow"
msgstr "بالاتر از Øد"
-#: client/text.c:1143
+#: client/text.c:1145
#, c-format
msgid "%6d.%02d ms"
msgstr "%6d.%02d م‌ث"
#. TRANS: <nation adjective> <government name>.
#. * E.g. "Polish Republic".
-#: client/text.c:1188
+#: client/text.c:1193
#, fuzzy, c-format
msgid "?nationgovernment:%s %s"
msgstr "Øکومت: %s"
#. TRANS: "Observer: 1985"
-#: client/text.c:1198
+#: client/text.c:1203
#, c-format
msgid "Observer: %s"
msgstr "ناظر: %s"
-#: client/text.c:1216
+#: client/text.c:1221
msgid "Buildings: "
msgstr "ساختمان‌ها: "
-#: client/text.c:1233 client/text.c:1272
+#: client/text.c:1238 client/text.c:1277
msgid "None. "
msgstr "هیچ. "
-#: client/text.c:1235 client/text.c:1274
+#: client/text.c:1240 client/text.c:1279
msgid "?clistend:."
msgstr "?clistend:."
-#: client/text.c:1253
+#: client/text.c:1258
msgid "Wonders: "
msgstr "Ø´Ú¯Ùتی‌ها: "
-#: client/text.c:1308
+#: client/text.c:1313
#, 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:1312
+#: client/text.c:1317
#, fuzzy, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
@@ -9328,60 +9467,60 @@ msgstr[0] "%d قبل از جزا با "
msgstr[1] "%d قبل از جزا با "
#. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1318
+#: client/text.c:1323
#, fuzzy, c-format
msgid "%d additional unhappy citizen."
msgid_plural "%d additional unhappy citizens."
msgstr[0] "%d شهر ناراضی اضاÙÙ‡."
msgstr[1] "%d شهر ناراضی اضاÙÙ‡."
-#: client/text.c:1339
+#: client/text.c:1344
msgid "Unlimited martial law in effect."
msgstr ""
-#: client/text.c:1341
+#: client/text.c:1346
#, fuzzy, c-format
msgid "%d military unit may impose martial law."
msgid_plural "Up to %d military units may impose martial law."
msgstr[0] "* یک مهره غیر نظامی (نمی‌تواند Øمله کند; بدون قانون نظامی).\n"
msgstr[1] "* یک مهره غیر نظامی (نمی‌تواند Øمله کند; بدون قانون نظامی).\n"
-#: client/text.c:1345
+#: client/text.c:1350
#, c-format
msgid "Each military unit makes %d unhappy citizen content."
msgid_plural "Each military unit makes %d unhappy citizens content."
msgstr[0] ""
msgstr[1] ""
-#: client/text.c:1352
+#: client/text.c:1357
msgid "Military units in the field may cause unhappiness. "
msgstr ""
-#: client/text.c:1355
+#: client/text.c:1360
msgid "Military units have no happiness effect. "
msgstr ""
-#: client/text.c:1370
+#: client/text.c:1375
#, c-format
msgid "Luxury: %d total."
msgstr "رÙاه: مجموعا %d."
-#: client/tilespec.c:865
+#: client/tilespec.c:882
msgid "No usable default tileset found, aborting!"
msgstr ""
-#: client/tilespec.c:1338
+#: client/tilespec.c:1355
msgid ""
"Client does not support isometric tilesets. Using default tileset instead."
msgstr ""
-#: client/tilespec.c:1347
+#: client/tilespec.c:1364
msgid ""
"Client does not support overhead view tilesets. Using default tileset "
"instead."
msgstr ""
-#: client/tilespec.c:3966
+#: client/tilespec.c:3987
#, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -10064,7 +10203,7 @@ msgid "_Display"
msgstr "نشان بده"
#: client/gui-gtk-2.0/cityrep.c:1006 client/gui-gtk-2.0/menu.c:839
-#: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
+#: client/gui-sdl/diplodlg.c:692 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
#: client/gui-xaw/cityrep.c:533 client/gui-xaw/menu.c:156
@@ -10233,197 +10372,197 @@ msgstr ""
msgid "Remove this preset?"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:222
+#: client/gui-gtk-2.0/dialogs.c:197 client/gui-gtk-2.0/messagewin.c:222
msgid "Goto _Location"
msgstr "برو به مکان"
-#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
+#: client/gui-gtk-2.0/dialogs.c:202 client/gui-gtk-2.0/messagewin.c:226
#, fuzzy
msgid "Inspect _City"
msgstr "باز کردن"
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:258 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:258 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:259 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:311 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:312 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:312 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:313 client/gui-win32/dialogs.c:1755
#: data/Freeciv.in:2502
msgid "Select what to pillage:"
msgstr "چیزی را که می‌خواهید غارت کنید، انتخاب کنید:"
-#: client/gui-gtk-2.0/dialogs.c:506
+#: client/gui-gtk-2.0/dialogs.c:507
msgid "Unit"
msgstr "مهره"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:950
-#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2155
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:985
+#: client/gui-gtk-2.0/dialogs.c:508 client/gui-gtk-2.0/pages.c:950
+#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2157
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:987
#: client/gui-win32/plrdlg.c:335 manual/civmanual.c:302 data/Freeciv.in:80
msgid "Name"
msgstr "نام"
-#: client/gui-gtk-2.0/dialogs.c:519 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:520 client/gui-sdl/dialogs.c:627
msgid "Unit selection"
msgstr "انتخاب مهره"
-#: client/gui-gtk-2.0/dialogs.c:582
+#: client/gui-gtk-2.0/dialogs.c:583
msgid "_Ready all"
msgstr "آمادگی همه"
-#: client/gui-gtk-2.0/dialogs.c:590
+#: client/gui-gtk-2.0/dialogs.c:591
msgid "_Sentry idle"
msgstr "نگهبانی"
-#: client/gui-gtk-2.0/dialogs.c:719
+#: client/gui-gtk-2.0/dialogs.c:721
#, fuzzy
msgid "Nation _Groups:"
msgstr "ملیت ها"
-#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:766 data/Freeciv.in:3128
msgid "What Nation Will You Be?"
msgstr "چه ملیتی می‌خواهید باشید؟"
-#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
-#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
+#: client/gui-gtk-2.0/dialogs.c:768 client/gui-sdl/chatline.c:842
+#: client/gui-win32/connectdlg.c:1040 data/Freeciv.in:3371
msgid "Pick Nation"
msgstr "انتخاب ملیت"
-#: client/gui-gtk-2.0/dialogs.c:774
+#: client/gui-gtk-2.0/dialogs.c:776
#, fuzzy
msgid "_Random Nation"
msgstr "ملیت تصادÙÛŒ"
-#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:792 client/gui-win32/dialogs.c:517
msgid "Select a nation"
msgstr "یک ملیت انتخاب کنید"
-#: client/gui-gtk-2.0/dialogs.c:804
+#: client/gui-gtk-2.0/dialogs.c:810
msgid "_Properties"
msgstr "خصوصیات"
-#: client/gui-gtk-2.0/dialogs.c:824
+#: client/gui-gtk-2.0/dialogs.c:830
msgid "_Leader:"
msgstr "Ùرمانده:"
-#: client/gui-gtk-2.0/dialogs.c:831
+#: client/gui-gtk-2.0/dialogs.c:837
msgid "_Female"
msgstr "مؤنث"
-#: client/gui-gtk-2.0/dialogs.c:836
+#: client/gui-gtk-2.0/dialogs.c:842
msgid "_Male"
msgstr "مذکر"
-#: client/gui-gtk-2.0/dialogs.c:863
+#: client/gui-gtk-2.0/dialogs.c:869
#, fuzzy
msgid "City _Styles:"
msgstr "سبک شهرها:"
-#: client/gui-gtk-2.0/dialogs.c:902
+#: client/gui-gtk-2.0/dialogs.c:908
#, fuzzy
msgid "_Description"
msgstr "داستان"
-#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1263 client/gui-xaw/dialogs.c:1480
msgid "You must select your sex."
msgstr "شما باید یک جنسیت را انتخاب کنید."
-#: client/gui-gtk-2.0/dialogs.c:1253 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1268 client/gui-xaw/dialogs.c:1485
msgid "You must select your city style."
msgstr "شما باید سبک شهرها را انتخاب کنید."
-#: client/gui-gtk-2.0/dialogs.c:1262 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1277 client/gui-sdl/dialogs.c:2204
#: 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:1306 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1318 client/gui-win32/citydlg.c:1454
#: data/Freeciv.in:2484
msgid "Upgrade Unit!"
msgstr "ترÙیع مهره!"
-#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1327 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 "ترÙیع مهره‌های منسوخ شده"
-#: client/gui-gtk-2.0/diplodlg.c:231 client/gui-win32/diplodlg.c:151
+#: client/gui-gtk-2.0/diplodlg.c:222 client/gui-win32/diplodlg.c:151
#: client/gui-xaw/diplodlg.c:383 client/gui-xaw/diplodlg.c:401
msgid "World-map"
msgstr "نقشه جهان"
-#: client/gui-gtk-2.0/diplodlg.c:237 client/gui-win32/diplodlg.c:146
+#: client/gui-gtk-2.0/diplodlg.c:228 client/gui-win32/diplodlg.c:146
#: client/gui-xaw/diplodlg.c:387 client/gui-xaw/diplodlg.c:405
msgid "Sea-map"
msgstr "نقشه دریا"
-#: client/gui-gtk-2.0/diplodlg.c:243
+#: client/gui-gtk-2.0/diplodlg.c:234
msgid "_Maps"
msgstr "نقشه‌ها"
-#: client/gui-gtk-2.0/diplodlg.c:274
+#: client/gui-gtk-2.0/diplodlg.c:265
msgid "_Advances"
msgstr "تکنولوژی‌ها"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/diplodlg.c:315 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "شهرها"
-#: client/gui-gtk-2.0/diplodlg.c:333
+#: client/gui-gtk-2.0/diplodlg.c:324
msgid "_Give shared vision"
msgstr "دادن دید مشترک"
-#: client/gui-gtk-2.0/diplodlg.c:346
+#: client/gui-gtk-2.0/diplodlg.c:337
msgid "Give _embassy"
msgstr "دادن سÙارت"
-#: client/gui-gtk-2.0/diplodlg.c:376
+#: client/gui-gtk-2.0/diplodlg.c:368
msgid "_Pacts"
msgstr "قراردادها"
-#: client/gui-gtk-2.0/diplodlg.c:466
+#: client/gui-gtk-2.0/diplodlg.c:458
#, c-format
msgid "Diplomacy: %s"
msgstr "دیپلماسی: %s"
-#: client/gui-gtk-2.0/diplodlg.c:473
+#: client/gui-gtk-2.0/diplodlg.c:465
msgid "_Cancel meeting"
msgstr "لغو دیدار"
-#: client/gui-gtk-2.0/diplodlg.c:475
+#: client/gui-gtk-2.0/diplodlg.c:467
msgid "Accept _treaty"
msgstr "قبول قرارداد"
-#: client/gui-gtk-2.0/diplodlg.c:503
+#: client/gui-gtk-2.0/diplodlg.c:495
msgid "C_lauses:"
msgstr "بندها:"
-#: client/gui-gtk-2.0/diplodlg.c:568 client/gui-gtk-2.0/diplodlg.c:642
+#: client/gui-gtk-2.0/diplodlg.c:560 client/gui-gtk-2.0/diplodlg.c:634
msgid "_Gold:"
msgstr "طلا:"
-#: client/gui-gtk-2.0/diplodlg.c:580 client/gui-gtk-2.0/diplodlg.c:654
+#: client/gui-gtk-2.0/diplodlg.c:572 client/gui-gtk-2.0/diplodlg.c:646
msgid "_Add Clause..."
msgstr "اضاÙÙ‡ کردن بند..."
-#: client/gui-gtk-2.0/diplodlg.c:699
+#: client/gui-gtk-2.0/diplodlg.c:691
msgid "--- This treaty is blank. Please add some clauses. ---"
msgstr "-- این قرارداد خالی است. لطÙا چند بند اضاÙÙ‡ کنید. --"
-#: client/gui-gtk-2.0/diplodlg.c:905 client/gui-sdl/diplodlg.c:375
+#: client/gui-gtk-2.0/diplodlg.c:897 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 "مقدار طلا نامعتبر است."
@@ -10483,99 +10622,99 @@ msgstr "انتخاب مقصد"
msgid "Show _All Cities"
msgstr "نشان دادن همه شهرها"
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:164
msgid "Show Map Scrollbars"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:163
+#: client/gui-gtk-2.0/gui_main.c:165
msgid "Disable this option to hide the scrollbars on the map view."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:169
msgid "Keyboardless goto"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:168
+#: client/gui-gtk-2.0/gui_main.c:170
msgid ""
"If this option is set then a goto may be initiated by left-clicking and then "
"holding down the mouse button while dragging the mouse onto a different tile."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:173
+#: client/gui-gtk-2.0/gui_main.c:175
msgid "Keep dialogs on top"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:174
+#: client/gui-gtk-2.0/gui_main.c:176
msgid ""
"If this option is set then dialog windows will always remain in front of the "
"main Freeciv window. Disabling this has no effect in fullscreen mode."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:178
+#: client/gui-gtk-2.0/gui_main.c:180
msgid "Show worklist task icons"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:179
+#: client/gui-gtk-2.0/gui_main.c:181
msgid ""
"Disabling this will turn off the unit and building icons in the worklist "
"dialog and the production tab of the city dialog."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:183
+#: client/gui-gtk-2.0/gui_main.c:185
msgid "Enable status report tabs"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:184
+#: client/gui-gtk-2.0/gui_main.c:186
msgid ""
"If this option is enabled then report dialogs will be shown as separate tabs "
"rather than in popup dialogs."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:189 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:191 client/gui-win32/gui_main.c:110
msgid "Better fog-of-war drawing"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:190 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:192 client/gui-win32/gui_main.c:111
msgid ""
"If this is enabled then a better method is used for drawing fog-of-war. It "
"is not any slower but will consume about twice as much memory."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:195
+#: client/gui-gtk-2.0/gui_main.c:197
msgid "Show time for each chat message"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:196
+#: client/gui-gtk-2.0/gui_main.c:198
msgid ""
"If this option is enabled then all chat messages will be prefixed by a time "
"string of the form [hour:minute:second]."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:201
+#: client/gui-gtk-2.0/gui_main.c:203
msgid "Split bottom notebook area"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:202
+#: client/gui-gtk-2.0/gui_main.c:204
msgid ""
"Enabling this option will split the bottom notebook into a left and right "
"notebook so that two tabs may be viewed at once."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:207
+#: client/gui-gtk-2.0/gui_main.c:209
msgid "New message events go to top of list"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:208
+#: client/gui-gtk-2.0/gui_main.c:210
msgid ""
"If this option is enabled, new events in the message window will appear at "
"the top of the list, rather than being appended at the bottom."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:213
+#: client/gui-gtk-2.0/gui_main.c:215
msgid "Show extra message window buttons"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:214
+#: client/gui-gtk-2.0/gui_main.c:216
msgid ""
"If this option is enabled, there will be two buttons displayed in the "
"message window for inspecting a city and going to a location. If this option "
@@ -10585,21 +10724,21 @@ msgid ""
"closed and reopened."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:224
+#: client/gui-gtk-2.0/gui_main.c:226
msgid "Metaserver tab first in network page"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:225
+#: client/gui-gtk-2.0/gui_main.c:227
msgid ""
"If this option is enabled, the metaserver tab will be the first notebook tab "
"in the network page. This option requires a restart in order to take effect."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:230
+#: client/gui-gtk-2.0/gui_main.c:232
msgid "Plain chat messages are sent to allies only"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:231
+#: client/gui-gtk-2.0/gui_main.c:233
msgid ""
"If this option is enabled, then plain messages typed into the chat entry "
"while the game is running will only be sent to your allies. Otherwise plain "
@@ -10609,28 +10748,41 @@ msgid ""
"visible in multiplayer games)."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:340 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:245
+msgid "Arrange widgets for small displays"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:246
+msgid ""
+"If this option is enabled, widgets in the main window will be arrange so "
+"that they take up the least amount of total screen space. Specifically, the "
+"left panel containing the overview, player status, and the unit information "
+"box will be extended over the entire left side of the window. This option "
+"requires a restart in order to take effect."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:352 client/gui-xaw/gui_main.c:245
msgid ""
"This client has no special command line options\n"
"\n"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
+#: client/gui-gtk-2.0/gui_main.c:847 client/gui-gtk-2.0/gui_main.c:1542
msgid "Freeciv"
msgstr "Freeciv"
-#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
+#: client/gui-gtk-2.0/gui_main.c:1251 client/gui-gtk-2.0/gui_main.c:1258
#: client/gui-sdl/mapctrl.c:1566 client/gui-win32/gui_main.c:482
#: data/Freeciv.in:2618
msgid "Turn Done"
msgstr "پایان نوبت"
-#: client/gui-gtk-2.0/gui_main.c:1232 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1258 client/gui-sdl/mapctrl.c:1566
#: client/gui-sdl/mapview.c:1082
msgid "Shift+Return"
msgstr "Ø´ÛŒÙت+اینتر"
-#: client/gui-gtk-2.0/gui_main.c:1266 client/gui-gtk-2.0/menu.c:797
+#: client/gui-gtk-2.0/gui_main.c:1299 client/gui-gtk-2.0/menu.c:797
#: client/gui-gtk-2.0/menu.c:799 client/gui-gtk-2.0/menu.c:801
#: client/gui-gtk-2.0/menu.c:803 client/gui-gtk-2.0/menu.c:805
#: client/gui-gtk-2.0/menu.c:807 client/gui-gtk-2.0/menu.c:809
@@ -10649,11 +10801,11 @@ msgstr "Ø´ÛŒÙت+اینتر"
msgid "View"
msgstr "نمایش"
-#: client/gui-gtk-2.0/gui_main.c:1359
+#: client/gui-gtk-2.0/gui_main.c:1393
msgid "Chat"
msgstr "Ú¯Ùتگو"
-#: client/gui-gtk-2.0/gui_main.c:1377 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1411 client/gui-win32/gui_main.c:538
#: data/Freeciv.in:2809
msgid ""
"Freeciv is free software and you are welcome to distribute copies of it\n"
@@ -10664,79 +10816,79 @@ msgstr ""
"از آنرا توزیع کنید؛ گزینه‌ی کپی‌کردن را از منو راهنما بخوانید.\n"
"Øالا... اونارو بÙرستین به جهنم!"
-#: client/gui-gtk-2.0/gui_main.c:1392
+#: client/gui-gtk-2.0/gui_main.c:1426
msgid "Allies Only"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1657
+#: client/gui-gtk-2.0/gui_main.c:1691
msgid "Not _ready"
msgstr "نا آماده"
-#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
+#: client/gui-gtk-2.0/gui_main.c:1702 client/gui-gtk-2.0/pages.c:1679
msgid "_Ready"
msgstr "آماده"
-#: client/gui-gtk-2.0/gui_main.c:1672 client/gui-gtk-2.0/gui_main.c:1678
-#: client/gui-gtk-2.0/pages.c:2204
+#: client/gui-gtk-2.0/gui_main.c:1706 client/gui-gtk-2.0/gui_main.c:1712
+#: client/gui-gtk-2.0/pages.c:2206
msgid "_Start"
msgstr "شروع"
-#: client/gui-gtk-2.0/gui_main.c:1686
+#: client/gui-gtk-2.0/gui_main.c:1720
#, fuzzy
msgid "_Take Player"
msgstr "انتخاب این بازیکن"
-#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
+#: client/gui-gtk-2.0/gui_main.c:1723 client/gui-gtk-2.0/pages.c:1669
msgid "Pick _Nation"
msgstr "انتخاب ملیت"
-#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
+#: client/gui-gtk-2.0/gui_main.c:1730 client/gui-gtk-2.0/pages.c:1674
msgid "_Observe"
msgstr "ناظر"
-#: client/gui-gtk-2.0/gui_main.c:1698
+#: client/gui-gtk-2.0/gui_main.c:1732
#, fuzzy
msgid "Do not _observe"
msgstr "نا ناظر"
-#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1755 client/gui-xaw/pages.c:211
msgid "<AI>"
msgstr "<ه‌م>"
-#: client/gui-gtk-2.0/gui_main.c:1723
+#: client/gui-gtk-2.0/gui_main.c:1758
msgid "<Novice AI>"
msgstr "<ه‌م نوآموز>"
-#: client/gui-gtk-2.0/gui_main.c:1726
+#: client/gui-gtk-2.0/gui_main.c:1761
msgid "<Easy AI>"
msgstr "<ه‌م آسان>"
-#: client/gui-gtk-2.0/gui_main.c:1729
+#: client/gui-gtk-2.0/gui_main.c:1764
msgid "<Normal AI>"
msgstr "<ه‌م متوسط>"
-#: client/gui-gtk-2.0/gui_main.c:1732
+#: client/gui-gtk-2.0/gui_main.c:1767
msgid "<Hard AI>"
msgstr "<ه‌م سخت>"
-#: client/gui-gtk-2.0/gui_main.c:1742 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1777 client/gui-win32/dialogs.c:594
#: client/gui-xaw/pages.c:217
msgid "Random"
msgstr "تصادÙÛŒ"
-#: client/gui-gtk-2.0/gui_main.c:1808
+#: client/gui-gtk-2.0/gui_main.c:1844 client/gui-gtk-2.0/gui_main.c:1858
msgid "Observer"
msgstr "ناظر"
-#: client/gui-gtk-2.0/gui_main.c:1808
+#: client/gui-gtk-2.0/gui_main.c:1858
msgid "Detached"
msgstr "جدا شده"
-#: client/gui-gtk-2.0/gui_main.c:2073
+#: client/gui-gtk-2.0/gui_main.c:2117
msgid "Are you sure you want to quit?"
msgstr "آیا مطمئنید که می‌خواهید خارج شود؟"
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
#, c-format
msgid ""
"Close Tab:\n"
@@ -10745,7 +10897,7 @@ msgstr ""
"بستن برگه:\n"
"%s"
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
msgid "Ctrl+W"
msgstr ""
@@ -10850,8 +11002,8 @@ msgid "Trans. Rslt/Time:"
msgstr "تبدیل نتیجه/زمان:"
#: 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
-#: client/gui-win32/helpdlg.c:709 client/gui-win32/helpdlg.c:733
+#: client/gui-win32/helpdlg.c:502 client/gui-win32/helpdlg.c:550
+#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:739
#: client/gui-xaw/helpdlg.c:759 client/gui-xaw/helpdlg.c:808
#: client/gui-xaw/helpdlg.c:816 client/gui-xaw/helpdlg.c:853
#: client/gui-xaw/helpdlg.c:878
@@ -10898,34 +11050,34 @@ msgstr "را با"
msgid "?techhelp:"
msgstr "?techhelp:"
-#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:591
+#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:597
#: client/gui-xaw/helpdlg.c:996
#, c-format
msgid "+%d Trade / %d"
msgstr "+%d تجارت / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:595
+#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:601
#: client/gui-xaw/helpdlg.c:1000
#, c-format
msgid "no extra / %d"
msgstr ""
#: 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
-#: client/gui-win32/helpdlg.c:602 client/gui-win32/helpdlg.c:616
-#: client/gui-win32/helpdlg.c:635 client/gui-xaw/helpdlg.c:1002
+#: client/gui-gtk-2.0/helpdlg.c:1085 client/gui-win32/helpdlg.c:604
+#: client/gui-win32/helpdlg.c:608 client/gui-win32/helpdlg.c:622
+#: client/gui-win32/helpdlg.c:641 client/gui-xaw/helpdlg.c:1002
#: client/gui-xaw/helpdlg.c:1006 client/gui-xaw/helpdlg.c:1020
#: client/gui-xaw/helpdlg.c:1039
msgid "n/a"
msgstr "نامشخص"
-#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:605
+#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:611
#: client/gui-xaw/helpdlg.c:1009
#, c-format
msgid "+%d Food / %d"
msgstr "+%d غذا / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:619
+#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:625
#: client/gui-xaw/helpdlg.c:1023
#, c-format
msgid "+%d Res. / %d"
@@ -11691,41 +11843,41 @@ msgstr "وصل شدن به بازی شبکه"
msgid "Connect to Gaming _Zone"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:302
#: client/gui-xaw/connectdlg.c:326
msgid "Passwords don't match, enter password."
msgstr "رمز عبور مطابقت نمی‌کند.رمز را وارد کنید."
#: client/gui-gtk-2.0/pages.c:779 client/gui-gtk-2.0/pages.c:820
-#: client/gui-win32/connectdlg.c:916
+#: client/gui-win32/connectdlg.c:918
msgid "Server Name"
msgstr "نام سرور"
#: client/gui-gtk-2.0/pages.c:780 client/gui-gtk-2.0/pages.c:821
-#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:916
+#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:918
#: data/Freeciv.in:96
msgid "Port"
msgstr "پرت"
#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Version"
msgstr "نسخه"
#: client/gui-gtk-2.0/pages.c:782 client/gui-gtk-2.0/pages.c:823
-#: client/gui-gtk-2.0/pages.c:2161 client/gui-win32/connectdlg.c:917
-#: client/gui-win32/connectdlg.c:995
+#: client/gui-gtk-2.0/pages.c:2163 client/gui-win32/connectdlg.c:919
+#: client/gui-win32/connectdlg.c:997
msgid "Status"
msgstr "وضعیت"
#: client/gui-gtk-2.0/pages.c:783 client/gui-gtk-2.0/pages.c:824
#: client/gui-sdl/connectdlg.c:318 client/gui-sdl/plrdlg.c:330
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Players"
msgstr "بازیکنان"
#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
-#: client/gui-win32/connectdlg.c:918
+#: client/gui-win32/connectdlg.c:920
msgid "Comment"
msgstr "توضیØ"
@@ -11757,9 +11909,9 @@ msgstr "رمز:"
msgid "Conf_irm Password:"
msgstr "تکرار رمز:"
-#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2165
#: 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:1000
+#: client/gui-win32/citydlg.c:1083 client/gui-win32/connectdlg.c:1002
#: client/gui-win32/wldlg.c:800 client/gui-win32/wldlg.c:806
msgid "Type"
msgstr "نوع"
@@ -11854,7 +12006,7 @@ msgstr "Ø³Ø·Ø Ø¨Ø§Ø²ÛŒ هوش‌مصنوعی:"
msgid "Ruleset _Version:"
msgstr "مجموعه قوانین"
-#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2195
msgid "_More Game Options..."
msgstr "تنظیمات دیگر..."
@@ -11870,49 +12022,49 @@ msgstr "درجه"
msgid "Ready"
msgstr "آماده"
-#: client/gui-gtk-2.0/pages.c:1601
+#: client/gui-gtk-2.0/pages.c:1600
#, fuzzy
msgid "?player:Leader"
msgstr "نام"
-#: client/gui-gtk-2.0/pages.c:1732 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1734 client/gui-sdl/chatline.c:185
msgid "Choose Saved Game to Load"
msgstr "بازی ذخیره شده را برای بارگذاری انتخاب کنید"
-#: client/gui-gtk-2.0/pages.c:1824
+#: client/gui-gtk-2.0/pages.c:1826
msgid "Choose Saved Game to _Load:"
msgstr "بازی ذخیره شده را برای بارگذاری انتخاب کنید"
-#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
-#: client/gui-gtk-2.0/pages.c:2451
+#: client/gui-gtk-2.0/pages.c:1846 client/gui-gtk-2.0/pages.c:2039
+#: client/gui-gtk-2.0/pages.c:2455
msgid "_Browse..."
msgstr "گشتن..."
-#: client/gui-gtk-2.0/pages.c:1911
+#: client/gui-gtk-2.0/pages.c:1913
msgid "Choose a Scenario"
msgstr "یک سناریو انتخاب کنید"
-#: client/gui-gtk-2.0/pages.c:1998
+#: client/gui-gtk-2.0/pages.c:2000
msgid "Choose a _Scenario:"
msgstr "یک سناریو انتخاب کنید:"
-#: client/gui-gtk-2.0/pages.c:2173
+#: client/gui-gtk-2.0/pages.c:2175
msgid "Choose a _nation to play:"
msgstr "یک ملت را برای بازی انتخاب کنید:"
-#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2367 client/gui-win32/menu.c:581
msgid "Select Location to Save"
msgstr "Ù…ØÙ„ ذخیره را انتخاب کنید"
-#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2452 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "ذخیره بازی"
-#: client/gui-gtk-2.0/pages.c:2489
+#: client/gui-gtk-2.0/pages.c:2493
msgid "Saved _Games:"
msgstr "بازی‌های ذخیره شده:"
-#: client/gui-gtk-2.0/pages.c:2516
+#: client/gui-gtk-2.0/pages.c:2520
msgid "Save _Filename:"
msgstr "نام Ùایل ذخیره:"
@@ -12263,7 +12415,7 @@ msgstr ""
msgid "Total users logged in : %d"
msgstr ""
-#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1098
msgid "Back"
msgstr ""
@@ -12272,7 +12424,7 @@ msgid "Start"
msgstr "شروع"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:777
+#: client/gui-win32/connectdlg.c:779
msgid "Load Game"
msgstr "بارگذاری بازی"
@@ -12313,9 +12465,9 @@ msgstr ""
#: client/gui-sdl/connectdlg.c:308 client/gui-sdl/connectdlg.c:617
#: client/gui-sdl/connectdlg.c:803 client/gui-sdl/connectdlg.c:985
#: client/gui-sdl/dialogs.c:452 client/gui-sdl/dialogs.c:2095
-#: client/gui-sdl/dialogs.c:2893 client/gui-sdl/diplomat_dialog.c:731
+#: client/gui-sdl/dialogs.c:2902 client/gui-sdl/diplomat_dialog.c:731
#: client/gui-sdl/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1043
#: client/gui-win32/dialogs.c:1772 client/gui-win32/finddlg.c:127
#: client/gui-win32/gotodlg.c:171 client/gui-win32/inputdlg.c:146
#: client/gui-win32/messagedlg.c:216 client/gui-win32/ratesdlg.c:328
@@ -12362,7 +12514,7 @@ msgid "Buy it?"
msgstr "آنرا بخریم؟"
#: 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
+#: client/gui-sdl/diplodlg.c:1336 client/gui-sdl/diplomat_dialog.c:1211
#: client/gui-sdl/diplomat_dialog.c:1417 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:221 client/gui-sdl/repodlgs.c:1559
#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
@@ -12378,7 +12530,7 @@ msgid "No"
msgstr "خیر"
#: client/gui-sdl/citydlg.c:1215 client/gui-sdl/cma_fe.c:318
-#: client/gui-sdl/diplodlg.c:1345 client/gui-sdl/diplomat_dialog.c:1200
+#: client/gui-sdl/diplodlg.c:1346 client/gui-sdl/diplomat_dialog.c:1200
#: client/gui-sdl/diplomat_dialog.c:1407 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:232 client/gui-win32/repodlgs.c:578
#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
@@ -12690,7 +12842,7 @@ msgstr "سرور Freeciv:"
msgid "Port :"
msgstr "پرت :"
-#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1100
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr ""
@@ -12798,23 +12950,23 @@ msgstr "Øکومت جدید را انتخاب کنید"
msgid "REVOLUTION!"
msgstr "انقلاب!"
-#: client/gui-sdl/dialogs.c:2232 client/gui-sdl/dialogs.c:2620
+#: client/gui-sdl/dialogs.c:2237 client/gui-sdl/dialogs.c:2625
#: client/gui-win32/dialogs.c:567 data/Freeciv.in:3159
msgid "Female"
msgstr "مؤنث"
-#: client/gui-sdl/dialogs.c:2234 client/gui-sdl/dialogs.c:2618
-#: client/gui-sdl/dialogs.c:2830 client/gui-win32/dialogs.c:565
+#: client/gui-sdl/dialogs.c:2239 client/gui-sdl/dialogs.c:2623
+#: client/gui-sdl/dialogs.c:2839 client/gui-win32/dialogs.c:565
msgid "Male"
msgstr "مذکر"
-#: client/gui-sdl/dialogs.c:2478 client/gui-sdl/dialogs.c:2902
+#: client/gui-sdl/dialogs.c:2483 client/gui-sdl/dialogs.c:2911
#: 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 ""
-#: client/gui-sdl/dialogs.c:2685 client/gui-win32/dialogs.c:505
+#: client/gui-sdl/dialogs.c:2694 client/gui-win32/dialogs.c:505
msgid "What nation will you be?"
msgstr ""
@@ -12841,77 +12993,77 @@ msgstr "نقشه جهان"
msgid "Sea map"
msgstr "نقشه دریا"
-#: client/gui-sdl/diplodlg.c:563
+#: client/gui-sdl/diplodlg.c:564
msgid "Give embassy"
msgstr "دادن سÙارت"
-#: client/gui-sdl/diplodlg.c:579 client/gui-win32/diplodlg.c:614
+#: client/gui-sdl/diplodlg.c:580 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 ""
-#: client/gui-sdl/diplodlg.c:613 client/gui-sdl/helpdlg.c:1956
+#: client/gui-sdl/diplodlg.c:614 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 ""
-#: client/gui-sdl/diplodlg.c:831 client/gui-win32/diplodlg.c:598
+#: client/gui-sdl/diplodlg.c:832 client/gui-win32/diplodlg.c:598
#: data/Freeciv.in:269
msgid "Diplomacy meeting"
msgstr "دیدار دیپماتیک"
-#: client/gui-sdl/diplodlg.c:883 client/gui-win32/diplodlg.c:680
+#: client/gui-sdl/diplodlg.c:884 client/gui-win32/diplodlg.c:680
#: data/Freeciv.in:510
msgid "Cancel meeting"
msgstr "لغو دیدار"
-#: client/gui-sdl/diplodlg.c:895 client/gui-win32/diplodlg.c:679
+#: client/gui-sdl/diplodlg.c:896 client/gui-win32/diplodlg.c:679
#: data/Freeciv.in:501
msgid "Accept treaty"
msgstr "قبول قرارداد"
#. TRANS: "Polish incident !" FIXME!!!
-#: client/gui-sdl/diplodlg.c:1304
+#: client/gui-sdl/diplodlg.c:1305
#, c-format
msgid "%s incident !"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1322
+#: client/gui-sdl/diplodlg.c:1323
msgid "Shall we declare WAR on them?"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1433
+#: client/gui-sdl/diplodlg.c:1434
msgid "Foreign Minister"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1449
+#: client/gui-sdl/diplodlg.c:1450
#, c-format
msgid ""
"Sir!, the %s ambassador has arrived\n"
"What are your wishes?"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1465
+#: client/gui-sdl/diplodlg.c:1466
msgid "Declare WAR"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1467 client/gui-win32/plrdlg.c:357
+#: client/gui-sdl/diplodlg.c:1468 client/gui-win32/plrdlg.c:357
msgid "Cancel Treaty"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1490 client/gui-win32/plrdlg.c:358
+#: client/gui-sdl/diplodlg.c:1491 client/gui-win32/plrdlg.c:358
#: data/Freeciv.in:3254
msgid "Withdraw vision"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1507
+#: client/gui-sdl/diplodlg.c:1508
msgid "Call Diplomatic Meeting"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1521
+#: client/gui-sdl/diplodlg.c:1522
msgid "Send him back"
msgstr ""
@@ -13640,12 +13792,12 @@ msgid "Leave Game"
msgstr "ذخیره بازی"
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1100 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1102 client/gui-xaw/menu.c:121
#: data/Freeciv.in:115 data/Freeciv.in:3180
msgid "Quit"
msgstr "خروج"
-#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:967
msgid "Start New Game"
msgstr "شروع بازی جدید"
@@ -13761,8 +13913,8 @@ msgstr ""
msgid "%s max rate : %d%%"
msgstr "%s Øداکثر مقدار : %d%%"
-#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
-#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1085
+#: client/gui-win32/connectdlg.c:1093 data/Freeciv.in:155
msgid "Update"
msgstr "بروزرسانی"
@@ -14240,67 +14392,67 @@ msgstr ""
msgid "Delete"
msgstr "ØØ°Ù"
-#: client/gui-win32/connectdlg.c:147
+#: client/gui-win32/connectdlg.c:149
msgid "Password:"
msgstr "رمز:"
-#: client/gui-win32/connectdlg.c:169
+#: client/gui-win32/connectdlg.c:171
msgid "Couldn't load the savegame"
msgstr ""
-#: client/gui-win32/connectdlg.c:284 client/gui-xaw/connectdlg.c:311
+#: client/gui-win32/connectdlg.c:286 client/gui-xaw/connectdlg.c:311
msgid "Verify Password"
msgstr ""
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:916 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr ""
-#: client/gui-win32/connectdlg.c:915
+#: client/gui-win32/connectdlg.c:917
msgid "Local Area Network"
msgstr ""
-#: client/gui-win32/connectdlg.c:949
+#: client/gui-win32/connectdlg.c:951
msgid "Welcome to Freeciv"
msgstr ""
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Load Saved Game"
msgstr ""
-#: client/gui-win32/connectdlg.c:969
+#: client/gui-win32/connectdlg.c:971
msgid "Connect To Network Game"
msgstr ""
-#: client/gui-win32/connectdlg.c:979
+#: client/gui-win32/connectdlg.c:981
msgid "Choose a nation to play"
msgstr ""
-#: client/gui-win32/connectdlg.c:1014
+#: client/gui-win32/connectdlg.c:1016
msgid "Number of players (Including AI):"
msgstr ""
-#: client/gui-win32/connectdlg.c:1022
+#: client/gui-win32/connectdlg.c:1024
msgid "AI skill level:"
msgstr ""
-#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1038 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr "تنظیمات بازی"
-#: client/gui-win32/connectdlg.c:1040
+#: client/gui-win32/connectdlg.c:1042
msgid "Start Game"
msgstr "شروع بازی"
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Login:"
msgstr ""
-#: client/gui-win32/connectdlg.c:1061
+#: client/gui-win32/connectdlg.c:1063
msgid "Host:"
msgstr "میزبان:"
-#: client/gui-win32/connectdlg.c:1062
+#: client/gui-win32/connectdlg.c:1064
msgid "Port:"
msgstr ""
@@ -14373,21 +14525,21 @@ msgid ""
"this is much slower."
msgstr ""
-#: client/gui-win32/helpdlg.c:769 client/gui-win32/helpdlg.c:792
-#: client/gui-win32/helpdlg.c:803 client/gui-win32/helpdlg.c:809
-#: client/gui-win32/helpdlg.c:822
+#: client/gui-win32/helpdlg.c:775 client/gui-win32/helpdlg.c:798
+#: client/gui-win32/helpdlg.c:809 client/gui-win32/helpdlg.c:815
+#: client/gui-win32/helpdlg.c:828
msgid "Allows "
msgstr "مجاز می‌کند "
-#: client/gui-win32/helpdlg.c:780
+#: client/gui-win32/helpdlg.c:786
msgid "Obsoletes "
msgstr "منسوخ می‌کند "
-#: client/gui-win32/helpdlg.c:812 client/gui-win32/helpdlg.c:825
+#: client/gui-win32/helpdlg.c:818 client/gui-win32/helpdlg.c:831
msgid " (with "
msgstr " )با"
-#: client/gui-win32/helpdlg.c:815 client/gui-win32/helpdlg.c:828
+#: client/gui-win32/helpdlg.c:821 client/gui-win32/helpdlg.c:834
msgid "?techhelp:)."
msgstr "(."
@@ -15459,7 +15611,7 @@ 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/"
+" https://gna.org/projects/freeciv/"
msgstr ""
#: data/helpdata.txt:60
@@ -17066,6 +17218,7 @@ msgid "Hydro Plant"
msgstr "تأسیسات آبداری"
#: data/default/buildings.ruleset:378
+#, fuzzy
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 "
@@ -17073,47 +17226,44 @@ msgid ""
"a Factory, Mfg. Plant and Hydro Plant together give a 150% production "
"bonus.\n"
"\n"
-"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant. A city "
-"can only build a Hydro Plant if it is next to (or on) a Mountain or River "
-"tile."
+"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant."
msgstr ""
-"مقدار آلودگی بر اثر Ù…Øصولات را ÛµÛ°Ùª کاهش می‌دهد Ùˆ اثر یک کارخانه یا تأسیسات "
-"ساخت را زیاد می‌کند: تأسیسات آبداری با کارخانه Û·ÛµÙª امتیاز Ù…Øصول را اÙزایش "
-"می‌دهد؛ تأسیسات آبداری با کارخانه Ùˆ تأسیسات ساخت Û±ÛµÛ°Ùª امتیاز Ù…Øصول را اÙزایش "
-"می‌دهد.\n"
+"آلودگی بر اثر Ù…Øصول را ÛµÛ°Ùª کاهش می‌دهد Ùˆ امتیاز Ù…Øصول یک کارخانه یا تأسیسات "
+"ساخت را زیاد می‌کند: یک کارخانه با تأسیسات هسته‌ای امتیاز Ù…Øصول را Û·ÛµÙª اÙزایش "
+"می‌دهد؛ یک کارخانه با تأسیسات ساخت Ùˆ تأسیسات هسته‌ای امتیاز Ù…Øصول را Û±ÛµÛ°Ùª "
+"اÙزایش می‌دهد.\n"
"\n"
"یک شهر می‌تواند تنها یک تأسیسات آبداری یا تأسیسات قدرت یا تأسیسات اتمی داشته "
-"باشد. یک شهر تنها در صورت اینکه روی (یا کنار) کوه یا رود باشد می‌تواند "
-"تأسیسات آبداری بسازد."
+"باشد. "
-#: data/default/buildings.ruleset:397 data/civ2/buildings.ruleset:373
+#: data/default/buildings.ruleset:396 data/civ2/buildings.ruleset:373
#: data/civ1/buildings.ruleset:297
msgid "Library"
msgstr "کتابخانه"
-#: data/default/buildings.ruleset:412
+#: data/default/buildings.ruleset:411
#, no-c-format
msgid "Increases the science output in a city by 100%."
msgstr "خروجی علم شهر را Û±Û°Û°Ùª اÙزایش می‌دهد."
-#: data/default/buildings.ruleset:417 data/civ2/buildings.ruleset:393
+#: data/default/buildings.ruleset:416 data/civ2/buildings.ruleset:393
#: data/civ1/buildings.ruleset:317
msgid "Marketplace"
msgstr "بازار"
-#: data/default/buildings.ruleset:432 data/civ2/buildings.ruleset:408
+#: data/default/buildings.ruleset:431 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 "خروجی رÙاه Ùˆ مالیات شهر را ÛµÛ°Ùª اÙزایش می‌دهد."
# TODO: Better Translation
-#: data/default/buildings.ruleset:437 data/civ2/buildings.ruleset:413
+#: data/default/buildings.ruleset:436 data/civ2/buildings.ruleset:413
#: data/civ1/buildings.ruleset:337
msgid "Mass Transit"
msgstr "ترانزیت جمعیت"
-#: data/default/buildings.ruleset:451 data/civ2/buildings.ruleset:427
+#: data/default/buildings.ruleset:450 data/civ2/buildings.ruleset:427
#: data/civ1/buildings.ruleset:351
msgid ""
"Neutralizes the pollution generated by the population. The population "
@@ -17122,12 +17272,12 @@ msgstr ""
"آلودگی بر اثر جمعیت را از بین می‌برد. سپس آلودگی که در شهر ایجاد می‌شود ربطی "
"به جمعیت ندارد."
-#: data/default/buildings.ruleset:458 data/civ2/buildings.ruleset:434
+#: data/default/buildings.ruleset:457 data/civ2/buildings.ruleset:434
#: data/civ1/buildings.ruleset:358
msgid "Mfg. Plant"
msgstr "تأسیسات ساخت"
-#: data/default/buildings.ruleset:474 data/civ2/buildings.ruleset:450
+#: data/default/buildings.ruleset:473 data/civ2/buildings.ruleset:450
#: data/civ1/buildings.ruleset:374
#, no-c-format
msgid ""
@@ -17135,12 +17285,12 @@ msgid ""
"production in a city by 100%."
msgstr "با یک کارخانه، تأسیسات ساخت امتیاز Ù…Øصول را در شهر Û±Û°Û°Ùª اÙزایش می‌دهد."
-#: data/default/buildings.ruleset:480 data/civ2/buildings.ruleset:456
+#: data/default/buildings.ruleset:479 data/civ2/buildings.ruleset:456
#: data/civ1/buildings.ruleset:380
msgid "Nuclear Plant"
msgstr "تأسیسات هسته‌ای"
-#: data/default/buildings.ruleset:495
+#: data/default/buildings.ruleset:494
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 "
@@ -17158,11 +17308,11 @@ msgstr ""
"یک شهر می‌تواند تنها یک تأسیسات آبداری یا تأسیسات قدرت یا تأسیسات اتمی داشته "
"باشد. "
-#: data/default/buildings.ruleset:515 data/civ2/buildings.ruleset:489
+#: data/default/buildings.ruleset:514 data/civ2/buildings.ruleset:489
msgid "Offshore Platform"
msgstr "پایگاه ساØÙ„ÛŒ"
-#: data/default/buildings.ruleset:530 data/civ2/buildings.ruleset:504
+#: data/default/buildings.ruleset:529 data/civ2/buildings.ruleset:504
msgid ""
"Adds 1 extra shield resource on all Ocean squares in a city. The city needs "
"to be coastal to build this improvement."
@@ -17170,12 +17320,12 @@ msgstr ""
"به تمام خانه‌های اقیانوس شهر یک امتیاز دÙاعی می‌دهد. شهر برای ساختن این "
"اصلاØیه باید ساØÙ„ÛŒ باشد."
-#: data/default/buildings.ruleset:536 data/civ2/buildings.ruleset:510
+#: data/default/buildings.ruleset:535 data/civ2/buildings.ruleset:510
#: data/civ1/buildings.ruleset:411
msgid "Palace"
msgstr "پایتخت"
-#: data/default/buildings.ruleset:552
+#: data/default/buildings.ruleset:551
#, no-c-format
msgid ""
"Makes a city the capital and the center of your government. Corruption in "
@@ -17200,11 +17350,11 @@ msgstr ""
"در Øکومت مطلقه پایتخت به شما +Û·ÛµÙª امتیاز ساخت می‌دهد Ùˆ در شاهنشاهی +ÛµÛ°Ùª "
"امتیاز ساخت."
-#: data/default/buildings.ruleset:569 data/civ2/buildings.ruleset:539
+#: data/default/buildings.ruleset:568 data/civ2/buildings.ruleset:539
msgid "Police Station"
msgstr "پایگاه پلیس"
-#: data/default/buildings.ruleset:583 data/civ2/buildings.ruleset:553
+#: data/default/buildings.ruleset:582 data/civ2/buildings.ruleset:553
msgid ""
"Reduces the unhappiness caused by military units outside the city by 2 under "
"Democracy and 1 under Republic. This improvement has no effect under other "
@@ -17213,11 +17363,11 @@ msgstr ""
"ناراØتی Ú©Ù‡ بر اثر مهره‌های نظامی ایجاد می‌شود در دموکراسی Û² Ùˆ در جمهوری Û± Ú©Ù… "
"می‌کند. این اصلاØیه بر Øکومت‌های دیگر تأثیری ندارد."
-#: data/default/buildings.ruleset:593 data/civ2/buildings.ruleset:560
+#: data/default/buildings.ruleset:592 data/civ2/buildings.ruleset:560
msgid "Port Facility"
msgstr "تأسیسات لنگرگاه"
-#: data/default/buildings.ruleset:608 data/civ2/buildings.ruleset:575
+#: data/default/buildings.ruleset:607 data/civ2/buildings.ruleset:575
msgid ""
"Allows a city to build veteran sea units. Also, damaged sea units which "
"stay in town for one full turn without moving are completely restored."
@@ -17225,12 +17375,12 @@ msgstr ""
"به شهر اجازه می‌دهد که مهره‌های دریایی کارآزموده بسازد. مهره‌های دریایی که یک "
"نوبت کامل بدون Øرکت در شهر بمانند کامل تعمیر می‌شوند."
-#: data/default/buildings.ruleset:615 data/civ2/buildings.ruleset:582
+#: data/default/buildings.ruleset:614 data/civ2/buildings.ruleset:582
#: data/civ1/buildings.ruleset:440
msgid "Power Plant"
msgstr "تأسیسات قدرت"
-#: data/default/buildings.ruleset:631
+#: data/default/buildings.ruleset:630
#, no-c-format
msgid ""
"Increases the shield production of a Factory or Mfg. Plant in a city: a "
@@ -17241,12 +17391,12 @@ msgid ""
"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant."
msgstr ""
-#: data/default/buildings.ruleset:646 data/civ2/buildings.ruleset:610
+#: data/default/buildings.ruleset:645 data/civ2/buildings.ruleset:610
#: data/civ1/buildings.ruleset:468
msgid "Recycling Center"
msgstr "مرکز بازیاÙت"
-#: data/default/buildings.ruleset:661 data/civ2/buildings.ruleset:625
+#: data/default/buildings.ruleset:660 data/civ2/buildings.ruleset:625
#: data/civ1/buildings.ruleset:483
#, no-c-format
msgid ""
@@ -17254,11 +17404,11 @@ msgid ""
"production in a city by 66%."
msgstr ""
-#: data/default/buildings.ruleset:667 data/civ2/buildings.ruleset:631
+#: data/default/buildings.ruleset:666 data/civ2/buildings.ruleset:631
msgid "Research Lab"
msgstr "پژوهشگاه"
-#: data/default/buildings.ruleset:682
+#: data/default/buildings.ruleset:681
msgid ""
"Together with a Library, a Research Lab increases the science production of "
"a city by 200%. Together with a Library and a University, a Research Lab "
@@ -17267,23 +17417,23 @@ msgstr ""
"با یک کتابخانه، یک پژوهشگاه خروجی علم شهر را 200Ùª اÙزایش می‌دهد. با کتابخانه "
"Ùˆ دانشگاه، پژوهشگاه خروجی علم شهر را 450Ùª اÙزایش می‌دهد."
-#: data/default/buildings.ruleset:690 data/civ2/buildings.ruleset:654
+#: data/default/buildings.ruleset:689 data/civ2/buildings.ruleset:654
msgid "SAM Battery"
msgstr "آتش‌بار SAM"
-#: data/default/buildings.ruleset:704 data/civ2/buildings.ruleset:668
+#: data/default/buildings.ruleset:703 data/civ2/buildings.ruleset:668
msgid ""
"Doubles the defense of all units inside the city when attacked by non-"
"nuclear air units."
msgstr ""
"دÙاع تمام مهره‌های داخل شهر را در برابر مهره‌های هوایی غیر اتمی دو برابر می‌کند."
-#: data/default/buildings.ruleset:710 data/civ2/buildings.ruleset:674
+#: data/default/buildings.ruleset:709 data/civ2/buildings.ruleset:674
#: data/civ1/buildings.ruleset:489
msgid "SDI Defense"
msgstr "دÙاع SDI"
-#: data/default/buildings.ruleset:724 data/civ2/buildings.ruleset:688
+#: data/default/buildings.ruleset:723 data/civ2/buildings.ruleset:688
#: data/civ1/buildings.ruleset:503
msgid ""
"Protects a city from attacks from Nuclear units. Nuclear attacks simply "
@@ -17293,11 +17443,11 @@ msgstr ""
"شهر را در مقابل Øمله‌های اتمی Ù…ØاÙظت می‌کند. Øمله‌های اتمی هیچ اثری بر شهر "
"ندارد. علاوه بر این دÙاع در برابر موشک‌های غیر اتمی دو برابر می‌کند."
-#: data/default/buildings.ruleset:733 data/civ2/buildings.ruleset:697
+#: data/default/buildings.ruleset:732 data/civ2/buildings.ruleset:697
msgid "Sewer System"
msgstr "سیستبم Ùاضلاب"
-#: data/default/buildings.ruleset:748 data/civ2/buildings.ruleset:712
+#: data/default/buildings.ruleset:747 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."
@@ -17305,12 +17455,12 @@ msgstr ""
"به یک شهر اجازه می‌دهد تا به بیشتر از 12 رشد کند. ابتدا یک آبرو نیاز است تا "
"شهر بزرگ‌تر از ۸ شود."
-#: data/default/buildings.ruleset:754 data/civ2/buildings.ruleset:749
+#: data/default/buildings.ruleset:753 data/civ2/buildings.ruleset:749
#: data/civ1/buildings.ruleset:512
msgid "Space Component"
msgstr "اجزا سÙینه"
-#: data/default/buildings.ruleset:769 data/civ2/buildings.ruleset:763
+#: data/default/buildings.ruleset:768 data/civ2/buildings.ruleset:763
#: data/civ1/buildings.ruleset:526
msgid ""
"Space Components can be differentiated into Propulsion and Fuel Components. "
@@ -17321,12 +17471,12 @@ msgid ""
"have been built by any player."
msgstr ""
-#: data/default/buildings.ruleset:779 data/civ2/buildings.ruleset:773
+#: data/default/buildings.ruleset:778 data/civ2/buildings.ruleset:773
#: data/civ1/buildings.ruleset:536
msgid "Space Module"
msgstr "قسمت‌های سÙینه"
-#: data/default/buildings.ruleset:794 data/civ2/buildings.ruleset:787
+#: data/default/buildings.ruleset:793 data/civ2/buildings.ruleset:787
#: data/civ1/buildings.ruleset:550
msgid ""
"Space Modules are the most expensive parts of spaceships. There are three "
@@ -17346,12 +17496,12 @@ msgid ""
"have been built by any player."
msgstr ""
-#: data/default/buildings.ruleset:813 data/civ2/buildings.ruleset:806
+#: data/default/buildings.ruleset:812 data/civ2/buildings.ruleset:806
#: data/civ1/buildings.ruleset:569
msgid "Space Structural"
msgstr "ساختمان سÙینه"
-#: data/default/buildings.ruleset:828 data/civ2/buildings.ruleset:820
+#: data/default/buildings.ruleset:827 data/civ2/buildings.ruleset:820
#: data/civ1/buildings.ruleset:583
msgid ""
"Space Structurals form the base of your spaceship. All other spaceship "
@@ -17362,32 +17512,32 @@ msgid ""
"have been built by any player."
msgstr ""
-#: data/default/buildings.ruleset:838 data/civ2/buildings.ruleset:830
+#: data/default/buildings.ruleset:837 data/civ2/buildings.ruleset:830
msgid "Stock Exchange"
msgstr "معاوضه کالا"
-#: data/default/buildings.ruleset:854 data/civ2/buildings.ruleset:846
+#: data/default/buildings.ruleset:853 data/civ2/buildings.ruleset:846
#, no-c-format
msgid ""
"Together with a Marketplace and a Bank, a Stock Exchange boosts tax and "
"luxury production in a city by 150%."
msgstr ""
-#: data/default/buildings.ruleset:860 data/civ2/buildings.ruleset:852
+#: data/default/buildings.ruleset:859 data/civ2/buildings.ruleset:852
msgid "Super Highways"
msgstr "اتوبان‌های پرسرعت"
-#: data/default/buildings.ruleset:875 data/civ2/buildings.ruleset:867
+#: data/default/buildings.ruleset:874 data/civ2/buildings.ruleset:867
#, no-c-format
msgid ""
"Increases trade resources by 50% on all squares with roads or railroads."
msgstr ""
-#: data/default/buildings.ruleset:883 data/civ2/buildings.ruleset:873
+#: data/default/buildings.ruleset:882 data/civ2/buildings.ruleset:873
msgid "Supermarket"
msgstr "Ùروشگاه بزرگ"
-#: data/default/buildings.ruleset:898 data/civ2/buildings.ruleset:888
+#: data/default/buildings.ruleset:897 data/civ2/buildings.ruleset:888
#, no-c-format
msgid ""
"Increases the food resources by 50% on each farmland square which is being "
@@ -17395,12 +17545,12 @@ msgid ""
"a second time."
msgstr ""
-#: data/default/buildings.ruleset:905 data/civ2/buildings.ruleset:895
+#: data/default/buildings.ruleset:904 data/civ2/buildings.ruleset:895
#: data/civ1/buildings.ruleset:593
msgid "Temple"
msgstr "معبد"
-#: data/default/buildings.ruleset:919 data/civ2/buildings.ruleset:909
+#: data/default/buildings.ruleset:918 data/civ2/buildings.ruleset:909
#: data/civ1/buildings.ruleset:607
msgid ""
"Makes one unhappy citizen content. Both the Mysticism advance and the "
@@ -17408,81 +17558,81 @@ msgid ""
"citizens are made content."
msgstr ""
-#: data/default/buildings.ruleset:926 data/civ2/buildings.ruleset:916
+#: data/default/buildings.ruleset:925 data/civ2/buildings.ruleset:916
#: data/civ1/buildings.ruleset:614 data/default/techs.ruleset:742
#: data/civ2/techs.ruleset:727 data/civ1/techs.ruleset:723
msgid "University"
msgstr "دانشگاه"
-#: data/default/buildings.ruleset:942
+#: data/default/buildings.ruleset:941
#, no-c-format
msgid ""
"Together with a Library, a University increases the science production of a "
"city by 250%."
msgstr ""
-#: data/default/buildings.ruleset:948 data/civ2/buildings.ruleset:938
+#: data/default/buildings.ruleset:947 data/civ2/buildings.ruleset:938
#: data/civ1/buildings.ruleset:636
msgid "Apollo Program"
msgstr "برنامه آپلو"
-#: data/default/buildings.ruleset:962 data/civ2/buildings.ruleset:952
+#: data/default/buildings.ruleset:961 data/civ2/buildings.ruleset:952
msgid ""
"Entire map becomes visible for the player who owns it. It allows all "
"players to start building spaceship parts (assuming they have researched the "
"necessary technologies)."
msgstr ""
-#: data/default/buildings.ruleset:969 data/civ2/buildings.ruleset:959
+#: data/default/buildings.ruleset:968 data/civ2/buildings.ruleset:959
msgid "A.Smith's Trading Co."
msgstr "شرکت تجاری A.Smith"
-#: data/default/buildings.ruleset:983
+#: data/default/buildings.ruleset:982
msgid ""
"City improvements which would normally have an upkeep of 1 are free of "
"upkeep, for all your cities."
msgstr ""
-#: data/default/buildings.ruleset:989 data/civ2/buildings.ruleset:979
+#: data/default/buildings.ruleset:988 data/civ2/buildings.ruleset:979
#: data/civ1/buildings.ruleset:655
msgid "Colossus"
msgstr "مجسمه عظیم‌الجثه"
-#: data/default/buildings.ruleset:1003 data/civ2/buildings.ruleset:993
+#: data/default/buildings.ruleset:1002 data/civ2/buildings.ruleset:993
#: data/civ1/buildings.ruleset:669
msgid ""
"Each square around the city where this wonder is built that is already "
"generating some trade produces one extra trade resource."
msgstr ""
-#: data/default/buildings.ruleset:1009 data/civ2/buildings.ruleset:999
+#: data/default/buildings.ruleset:1008 data/civ2/buildings.ruleset:999
#: data/civ1/buildings.ruleset:675
msgid "Copernicus' Observatory"
msgstr "رصدخانه کپرنیک"
-#: data/default/buildings.ruleset:1024 data/civ2/buildings.ruleset:1180
+#: data/default/buildings.ruleset:1023 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 ""
-#: data/default/buildings.ruleset:1029 data/civ2/buildings.ruleset:1019
+#: data/default/buildings.ruleset:1028 data/civ2/buildings.ruleset:1019
#: data/civ1/buildings.ruleset:695
msgid "Cure For Cancer"
msgstr "علاج سرطان"
-#: data/default/buildings.ruleset:1043
+#: data/default/buildings.ruleset:1042
msgid ""
"This stunning technological achievement makes one unhappy citizen content in "
"all your cities."
msgstr ""
-#: data/default/buildings.ruleset:1051 data/civ2/buildings.ruleset:1039
+#: data/default/buildings.ruleset:1050 data/civ2/buildings.ruleset:1039
#: data/civ1/buildings.ruleset:715
msgid "Darwin's Voyage"
msgstr "سÙر دریایی داروین"
-#: data/default/buildings.ruleset:1065 data/civ2/buildings.ruleset:1053
+#: data/default/buildings.ruleset:1064 data/civ2/buildings.ruleset:1053
#: data/civ1/buildings.ruleset:729
msgid ""
"Charles Darwin's voyage sparked the discovery of the evolution of the "
@@ -17490,43 +17640,43 @@ msgid ""
"technology advances."
msgstr ""
-#: data/default/buildings.ruleset:1072 data/civ2/buildings.ruleset:1060
+#: data/default/buildings.ruleset:1071 data/civ2/buildings.ruleset:1060
msgid "Eiffel Tower"
msgstr "برج ایÙÙ„"
-#: data/default/buildings.ruleset:1087
+#: data/default/buildings.ruleset:1086
#, no-c-format
msgid ""
"Your reputation and goodwill among other nations is recovered twice as fast."
msgstr ""
-#: data/default/buildings.ruleset:1093 data/civ2/buildings.ruleset:1081
+#: data/default/buildings.ruleset:1092 data/civ2/buildings.ruleset:1081
#: data/civ1/buildings.ruleset:736
msgid "Great Library"
msgstr "کتابخانه کبیر"
-#: data/default/buildings.ruleset:1107 data/civ2/buildings.ruleset:1095
+#: data/default/buildings.ruleset:1106 data/civ2/buildings.ruleset:1095
#: data/civ1/buildings.ruleset:750
msgid ""
"The civilization which builds the Great Library gets every advance that at "
"least two other civilizations have achieved."
msgstr ""
-#: data/default/buildings.ruleset:1113 data/civ2/buildings.ruleset:1101
+#: data/default/buildings.ruleset:1112 data/civ2/buildings.ruleset:1101
#: data/civ1/buildings.ruleset:756
msgid "Great Wall"
msgstr "دیوار کبیر"
-#: data/default/buildings.ruleset:1127
+#: data/default/buildings.ruleset:1126
msgid "Works as a City Wall in all your cities."
msgstr ""
-#: data/default/buildings.ruleset:1135 data/civ2/buildings.ruleset:1122
+#: data/default/buildings.ruleset:1134 data/civ2/buildings.ruleset:1122
#: data/civ1/buildings.ruleset:777
msgid "Hanging Gardens"
msgstr "باغ‌های معلق"
-#: data/default/buildings.ruleset:1149 data/civ2/buildings.ruleset:1136
+#: data/default/buildings.ruleset:1148 data/civ2/buildings.ruleset:1136
#: data/civ1/buildings.ruleset:791
msgid ""
"Makes one content citizen happy in every city. Makes two extra content "
@@ -17537,96 +17687,96 @@ msgid ""
msgstr ""
# TODO: Translate Hoover
-#: data/default/buildings.ruleset:1158 data/civ2/buildings.ruleset:1145
+#: data/default/buildings.ruleset:1157 data/civ2/buildings.ruleset:1145
#: data/civ1/buildings.ruleset:800
msgid "Hoover Dam"
msgstr "سد Hoover"
-#: data/default/buildings.ruleset:1173 data/civ2/buildings.ruleset:1159
+#: data/default/buildings.ruleset:1172 data/civ2/buildings.ruleset:1159
msgid ""
"Works as if you had a Hydro Plant in every city. (This reduces pollution "
"and increases the effects of Factories and Mfg. Plants.)"
msgstr ""
-#: data/default/buildings.ruleset:1179 data/civ2/buildings.ruleset:1165
+#: data/default/buildings.ruleset:1178 data/civ2/buildings.ruleset:1165
#: data/civ1/buildings.ruleset:822
msgid "Isaac Newton's College"
msgstr "کالج آیزاک نیوتن"
-#: data/default/buildings.ruleset:1194
+#: data/default/buildings.ruleset:1193
#, no-c-format
msgid ""
"Boosts science production by 100% in every city you control that has a "
"University."
msgstr ""
-#: data/default/buildings.ruleset:1200 data/civ2/buildings.ruleset:1185
+#: data/default/buildings.ruleset:1199 data/civ2/buildings.ruleset:1185
#: data/civ1/buildings.ruleset:842
msgid "J.S. Bach's Cathedral"
msgstr "کلیسای جامع J.S. Bach"
-#: data/default/buildings.ruleset:1214 data/civ2/buildings.ruleset:1199
+#: data/default/buildings.ruleset:1213 data/civ2/buildings.ruleset:1199
msgid "Makes two unhappy citizens content in every city."
msgstr ""
-#: data/default/buildings.ruleset:1219 data/civ2/buildings.ruleset:1204
+#: data/default/buildings.ruleset:1218 data/civ2/buildings.ruleset:1204
msgid "King Richard's Crusade"
msgstr "نهضت شاه ریچارد"
-#: data/default/buildings.ruleset:1233 data/civ2/buildings.ruleset:1218
+#: data/default/buildings.ruleset:1232 data/civ2/buildings.ruleset:1218
msgid ""
"Adds one extra shield resource on every square around the city where it is "
"built."
msgstr ""
-#: data/default/buildings.ruleset:1239 data/civ2/buildings.ruleset:1224
+#: data/default/buildings.ruleset:1238 data/civ2/buildings.ruleset:1224
msgid "Leonardo's Workshop"
msgstr "کارگاه لئونارد"
-#: data/default/buildings.ruleset:1253 data/civ2/buildings.ruleset:1238
+#: data/default/buildings.ruleset:1252 data/civ2/buildings.ruleset:1238
msgid "Upgrades one obsolete unit per game turn."
msgstr "در هر نوبت یک مهره‌ی منسوخ شده را ترÙیع می‌کند."
-#: data/default/buildings.ruleset:1258 data/civ2/buildings.ruleset:1243
+#: data/default/buildings.ruleset:1257 data/civ2/buildings.ruleset:1243
#: data/civ1/buildings.ruleset:862
msgid "Lighthouse"
msgstr "Ùانوس دریایی"
-#: data/default/buildings.ruleset:1273
+#: data/default/buildings.ruleset:1272
msgid ""
"Gives all your sea units 1 additional movement point and eliminates the risk "
"of losing Triremes on the high seas. Makes all your new sea units veterans "
"(for all your cities)."
msgstr ""
-#: data/default/buildings.ruleset:1280 data/civ2/buildings.ruleset:1264
+#: data/default/buildings.ruleset:1279 data/civ2/buildings.ruleset:1264
#: data/civ1/buildings.ruleset:885
msgid "Magellan's Expedition"
msgstr "سÙر ماگلان"
-#: data/default/buildings.ruleset:1295
+#: data/default/buildings.ruleset:1294
msgid "Gives all your sea units 2 additional movement points."
msgstr "به تمام مهره‌های دریایی شما یک Øرکت اضاÙÙ‡ می‌دهد."
-#: data/default/buildings.ruleset:1300 data/civ2/buildings.ruleset:1283
+#: data/default/buildings.ruleset:1299 data/civ2/buildings.ruleset:1283
#: data/civ1/buildings.ruleset:904
msgid "Manhattan Project"
msgstr "پروژه منهتن"
-#: data/default/buildings.ruleset:1318 data/civ2/buildings.ruleset:1301
+#: data/default/buildings.ruleset:1317 data/civ2/buildings.ruleset:1301
msgid "Marco Polo's Embassy"
msgstr "سÙارت ماركو‌پلو"
-#: data/default/buildings.ruleset:1332 data/civ2/buildings.ruleset:1315
+#: data/default/buildings.ruleset:1331 data/civ2/buildings.ruleset:1315
msgid "The player who owns it gets an embassy with all players."
msgstr "در تمام تمدن‌ها یک سÙارت می‌سازد."
-#: data/default/buildings.ruleset:1337 data/civ2/buildings.ruleset:1320
+#: data/default/buildings.ruleset:1336 data/civ2/buildings.ruleset:1320
#: data/civ1/buildings.ruleset:922
msgid "Michelangelo's Chapel"
msgstr "كليساي ميچلانگلو"
-#: data/default/buildings.ruleset:1351 data/civ2/buildings.ruleset:1334
+#: data/default/buildings.ruleset:1350 data/civ2/buildings.ruleset:1334
msgid ""
"Counts as having a Cathedral in each of your cities. This makes 3 unhappy "
"citizens content in each city. The discovery of Theology increases the "
@@ -17635,21 +17785,21 @@ msgid ""
"the number of unhappy citizens made content."
msgstr ""
-#: data/default/buildings.ruleset:1361 data/civ2/buildings.ruleset:1344
+#: data/default/buildings.ruleset:1360 data/civ2/buildings.ruleset:1344
#: data/civ1/buildings.ruleset:941
msgid "Oracle"
msgstr "پيشگويي"
-#: data/default/buildings.ruleset:1375
+#: data/default/buildings.ruleset:1374
msgid "Makes two of your unhappy citizens content in every city with a temple."
msgstr ""
-#: data/default/buildings.ruleset:1380 data/civ2/buildings.ruleset:1363
+#: data/default/buildings.ruleset:1379 data/civ2/buildings.ruleset:1363
#: data/civ1/buildings.ruleset:960
msgid "Pyramids"
msgstr "اهرام"
-#: data/default/buildings.ruleset:1394
+#: data/default/buildings.ruleset:1393
msgid ""
"The amount of stored food lost when one of your cities grows or shrinks is "
"reduced by 25%. This helps a city to grow faster and more easily withstand "
@@ -17659,30 +17809,30 @@ msgstr ""
"اÙزایش می‌یابد. این باعث می‌شود Ú©Ù‡ شهر با انبار غله راØت‌تر بزرگ شود Ùˆ بهتر با "
"Ù‚ØØ·ÛŒ مقابله کند."
-#: data/default/buildings.ruleset:1401 data/civ2/buildings.ruleset:1382
+#: data/default/buildings.ruleset:1400 data/civ2/buildings.ruleset:1382
#: data/civ1/buildings.ruleset:981
msgid "SETI Program"
msgstr "برنامه SETI"
-#: data/default/buildings.ruleset:1415
+#: data/default/buildings.ruleset:1414
msgid "Boosts science production in each city with a Research Lab by 100%. "
msgstr ""
-#: data/default/buildings.ruleset:1420 data/civ2/buildings.ruleset:1402
+#: data/default/buildings.ruleset:1419 data/civ2/buildings.ruleset:1402
#: data/civ1/buildings.ruleset:1001
msgid "Shakespeare's Theatre"
msgstr "تئاتر شكسپير"
-#: data/default/buildings.ruleset:1434 data/civ2/buildings.ruleset:1416
+#: data/default/buildings.ruleset:1433 data/civ2/buildings.ruleset:1416
#: data/civ1/buildings.ruleset:1015
msgid "Makes all unhappy citizens content, in the city where it is located."
msgstr ""
-#: data/default/buildings.ruleset:1439 data/civ2/buildings.ruleset:1421
+#: data/default/buildings.ruleset:1438 data/civ2/buildings.ruleset:1421
msgid "Statue of Liberty"
msgstr "مجسمه آزادی"
-#: data/default/buildings.ruleset:1453 data/civ2/buildings.ruleset:1435
+#: data/default/buildings.ruleset:1452 data/civ2/buildings.ruleset:1435
#: data/civ1/buildings.ruleset:974 data/civ1/buildings.ruleset:1034
msgid ""
"Allows you to choose any government, including those that have not yet been "
@@ -17690,31 +17840,31 @@ msgid ""
"Anarchy."
msgstr ""
-#: data/default/buildings.ruleset:1460 data/civ2/buildings.ruleset:1442
+#: data/default/buildings.ruleset:1459 data/civ2/buildings.ruleset:1442
msgid "Sun Tzu's War Academy"
msgstr "آموزشگاه جنگ Sun Tzu"
-#: data/default/buildings.ruleset:1474
+#: data/default/buildings.ruleset:1473
msgid ""
"All your new ground units start at the first veteran level. The chance of a "
"unit getting the next veteran level after a battle increases by half."
msgstr ""
-#: data/default/buildings.ruleset:1481 data/civ2/buildings.ruleset:1463
+#: data/default/buildings.ruleset:1480 data/civ2/buildings.ruleset:1463
#: data/civ1/buildings.ruleset:1020
msgid "United Nations"
msgstr "ملل متØد"
-#: data/default/buildings.ruleset:1495
+#: data/default/buildings.ruleset:1494
msgid "All your units regain two extra hitpoints per turn."
msgstr "به همه مهره‌های شما در هر نوبت دو امتیاز ضربه اضاÙÙ‡ می‌دهد."
-#: data/default/buildings.ruleset:1508 data/civ2/buildings.ruleset:1490
+#: data/default/buildings.ruleset:1507 data/civ2/buildings.ruleset:1490
#: data/civ1/buildings.ruleset:1046
msgid "Women's Suffrage"
msgstr "ØÙ‚ رأی زنان"
-#: data/default/buildings.ruleset:1522 data/civ2/buildings.ruleset:1504
+#: data/default/buildings.ruleset:1521 data/civ2/buildings.ruleset:1504
msgid ""
"Counts as a Police Station in every city. (That is, for each city, reduces "
"unhappiness for military units outside the city by 2 under Democracy and 1 "
@@ -17724,11 +17874,11 @@ msgstr ""
"را برای مهره‌های نظامی بیرون شهر در دموکراسی ۲ و در جمهوری ۱ کاهش می‌دهد. این "
"Ø´Ú¯Ùتی بر Øکومت‌های دیگر اثری ندارد.)"
-#: data/default/buildings.ruleset:1533
+#: data/default/buildings.ruleset:1532
msgid "Coinage"
msgstr "ضرب سكه"
-#: data/default/buildings.ruleset:1554
+#: data/default/buildings.ruleset:1553
msgid ""
"This is not a normal improvement. Instead, setting a city's production to "
"Coinage means its shield production is converted to tax output (money, "
@@ -18081,11 +18231,16 @@ msgstr "سلتیکی"
msgid "?citystyle:Industrial"
msgstr "صنعتی"
-#: data/default/cities.ruleset:139 data/civ2/cities.ruleset:150
+#: data/default/cities.ruleset:139
+#, fuzzy
+msgid "?citystyle:ElectricAge"
+msgstr "سلتیکی"
+
+#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:150
msgid "?citystyle:Modern"
msgstr "مدرن"
-#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:161
+#: data/default/cities.ruleset:161 data/civ2/cities.ruleset:161
msgid "?citystyle:PostModern"
msgstr "پست مدرن"
@@ -22855,6 +23010,26 @@ msgstr "تیم ۳۰"
msgid "Team 31"
msgstr "تیم ۳۱"
+#~ 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 Hydro Plant, Power Plant, or Nuclear Plant. A "
+#~ "city can only build a Hydro Plant if it is next to (or on) a Mountain or "
+#~ "River tile."
+#~ msgstr ""
+#~ "مقدار آلودگی بر اثر Ù…Øصولات را ÛµÛ°Ùª کاهش می‌دهد Ùˆ اثر یک کارخانه یا تأسیسات "
+#~ "ساخت را زیاد می‌کند: تأسیسات آبداری با کارخانه Û·ÛµÙª امتیاز Ù…Øصول را اÙزایش "
+#~ "می‌دهد؛ تأسیسات آبداری با کارخانه Ùˆ تأسیسات ساخت Û±ÛµÛ°Ùª امتیاز Ù…Øصول را "
+#~ "اÙزایش می‌دهد.\n"
+#~ "\n"
+#~ "یک شهر می‌تواند تنها یک تأسیسات آبداری یا تأسیسات قدرت یا تأسیسات اتمی "
+#~ "داشته باشد. یک شهر تنها در صورت اینکه روی (یا کنار) کوه یا رود باشد "
+#~ "می‌تواند تأسیسات آبداری بسازد."
+
#~ msgid "The %s of the %s (%s)"
#~ msgstr "%s %s (%s("
diff --git a/po/fi.gmo b/po/fi.gmo
index 6b12d71..f5f5d9c 100644
Binary files a/po/fi.gmo and b/po/fi.gmo differ
diff --git a/po/fi.po b/po/fi.po
index 973003c..2660a16 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -15,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: freeciv 2.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-29 21:13+0900\n"
-"PO-Revision-Date: 2009-03-05 15:43+0200\n"
+"POT-Creation-Date: 2009-11-22 21:37+0100\n"
+"PO-Revision-Date: 2009-07-09 18:20+0300\n"
"Last-Translator: Sini Ruohomaa <sini.ruohomaa at iki.fi>\n"
"Language-Team: Finnish <laatu at lokalisointi.org>\n"
"MIME-Version: 1.0\n"
@@ -72,21 +72,21 @@ msgstr "?vanhentunut:v"
msgid "?redundant:*"
msgstr "?redundant:*"
-#: common/connection.c:515
+#: common/connection.c:518
#, c-format
msgid "%s from %s"
msgstr "%s osoitteesta %s"
-#: common/connection.c:521
+#: common/connection.c:524
msgid " (connection incomplete)"
msgstr " (yhteys ei ole valmis)"
-#: common/connection.c:525
+#: common/connection.c:528
#, c-format
msgid " (player %s)"
msgstr " (pelaaja %s)"
-#: common/connection.c:529
+#: common/connection.c:532
msgid " (observer)"
msgstr " (tarkkailija)"
@@ -492,81 +492,81 @@ msgstr "Yhteydenotto/-katkeamisviestit"
msgid "AI Debug messages"
msgstr "AI:n debug-viestit"
-#: common/player.c:732
+#: common/player.c:746
msgid "?attitude:Genocidal"
msgstr "Kansansurmahakuinen"
-#: common/player.c:734
+#: common/player.c:748
msgid "?attitude:Belligerent"
msgstr "Sotaisa"
-#: common/player.c:736
+#: common/player.c:750
msgid "?attitude:Hostile"
msgstr "Pahantahtoinen"
-#: common/player.c:738
+#: common/player.c:752
msgid "?attitude:Uncooperative"
msgstr "Yhteistyökyvytön"
-#: common/player.c:740
+#: common/player.c:754
msgid "?attitude:Uneasy"
msgstr "Rauhaton"
-#: common/player.c:742
+#: common/player.c:756
msgid "?attitude:Neutral"
msgstr "Neutraali"
-#: common/player.c:744
+#: common/player.c:758
msgid "?attitude:Respectful"
msgstr "Kunnioittava"
-#: common/player.c:746
+#: common/player.c:760
msgid "?attitude:Helpful"
msgstr "Avulias"
-#: common/player.c:748
+#: common/player.c:762
msgid "?attitude:Enthusiastic"
msgstr "Innokas"
-#: common/player.c:750
+#: common/player.c:764
msgid "?attitude:Admiring"
msgstr "Ihaileva"
-#: common/player.c:753
+#: common/player.c:767
msgid "?attitude:Worshipful"
msgstr "Palvova"
-#: common/player.c:764
+#: common/player.c:778
msgid "?diplomatic_state:Armistice"
msgstr "Aselepo"
-#: common/player.c:765
+#: common/player.c:779
msgid "?diplomatic_state:War"
msgstr "?diplomatic_state:Sotatila"
-#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:780 client/gui-gtk-2.0/diplodlg.c:353
#: 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:767 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:781 client/gui-gtk-2.0/diplodlg.c:358
#: 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:768 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:782 client/gui-gtk-2.0/diplodlg.c:363
#: 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:769
+#: common/player.c:783
msgid "?diplomatic_state:Never met"
msgstr "?diplomatic_state:Ei tavattu"
-#: common/player.c:770
+#: common/player.c:784
msgid "?diplomatic_state:Team"
msgstr "Joukkuetoveri"
@@ -600,7 +600,7 @@ msgstr "Vain maailmanlaajuisia hengissäpysymisvaatimuksia tuetaan."
#. TRANS: "Resources: (none)".
#: common/requirements.c:1014 common/team.c:132
#: client/gui-gtk-2.0/helpdlg.c:1055 client/gui-gtk-2.0/inteldlg.c:390
-#: client/gui-win32/helpdlg.c:586 client/gui-xaw/helpdlg.c:991
+#: client/gui-win32/helpdlg.c:592 client/gui-xaw/helpdlg.c:991
#, c-format
msgid "(none)"
msgstr "(ei mitään)"
@@ -626,10 +626,11 @@ msgstr "Tulevaisuuden teknologia %d"
#: 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
#: client/gui-sdl/helpdlg.c:817 client/gui-sdl/mapview.c:962
-#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:545
-#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:735
-#: 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
+#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:544
+#: client/gui-win32/helpdlg.c:551 client/gui-win32/helpdlg.c:721
+#: client/gui-win32/helpdlg.c:741 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 "Ei yhtään"
@@ -642,31 +643,31 @@ msgstr "Tulevaisuuden teknologia"
msgid "(Unknown)"
msgstr "(Tuntematon)"
-#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:553
#: manual/civmanual.c:224
msgid "Road"
msgstr "Tie"
-#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:557
#: client/gui-gtk-2.0/menu.c:829 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:394 common/terrain.c:572 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:567
#: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
#: data/civ1/techs.ruleset:563
msgid "Railroad"
msgstr "Rautatie"
-#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:555
msgid "Mine"
msgstr "Kaivos"
# *** Depends too much on the context, phenomenom pollution & 'substance' pollution
# aren't the same. ***
-#: common/terrain.c:396 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:551 server/report.c:124
#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "Saastetta"
@@ -675,7 +676,7 @@ msgstr "Saastetta"
msgid "Hut"
msgstr "Maja"
-#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:563
#: manual/civmanual.c:226
msgid "Fortress"
msgstr "Linnoitus"
@@ -688,60 +689,60 @@ msgstr "Joki"
msgid "Farmland"
msgstr "Viljelysmaa"
-#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:577
#: manual/civmanual.c:226
msgid "Airbase"
msgstr "Lentotukikohta"
-#: common/terrain.c:402 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:579
msgid "Fallout"
msgstr "Laskeuma"
-#: common/unit.c:546 client/gui-win32/plrdlg.c:337
+#: common/unit.c:549 client/gui-win32/plrdlg.c:337
msgid "Idle"
msgstr "Toimeton"
-#: common/unit.c:556
+#: common/unit.c:559
msgid "Fortifying"
msgstr "Linnoittautumassa"
-#: common/unit.c:558
+#: common/unit.c:561
msgid "Fortified"
msgstr "Linnoittautunut"
# *** The three first ones are states, this and a few next are imperative. ***
-#: common/unit.c:562 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
+#: common/unit.c:565 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
msgid "Sentry"
msgstr "Leiriydy"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
+#: common/unit.c:569 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
#: client/gui-win32/menu.c:370 client/gui-xaw/menu.c:185
msgid "Pillage"
msgstr "Turmele"
-#: common/unit.c:568 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
+#: common/unit.c:571 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
msgid "Goto"
msgstr "Mene"
-#: common/unit.c:570
+#: common/unit.c:573
msgid "Explore"
msgstr "Tutki"
-#: common/unit.c:572 manual/civmanual.c:224
+#: common/unit.c:575 manual/civmanual.c:224
msgid "Transform"
msgstr "Muokkaa"
-#: common/unit.c:584 client/text.c:157 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:587 client/text.c:157 client/gui-sdl/citydlg.c:1972
#: client/gui-win32/citydlg.c:1257 client/gui-xaw/citydlg.c:1423
msgid "Unknown"
msgstr "Tuntematon"
# *** '(s/he/it) moves' ***
-#: common/unit.c:1022
+#: common/unit.c:1025
msgid "Moves"
msgstr "Liikkuu"
-#: common/unit.c:1571
+#: common/unit.c:1574
#, c-format
msgid ""
"Upgrade %s to %s for %d gold?\n"
@@ -750,12 +751,12 @@ msgstr ""
"Ajanmukaista %s yksiköksi %s hintaan %d ?\n"
"Valtion kassassa on %d."
-#: common/unit.c:1579
+#: common/unit.c:1582
#, c-format
msgid "Sorry, cannot upgrade %s (yet)."
msgstr "Valitan: yksikköä %s ei voi (vielä) ajanmukaistaa."
-#: common/unit.c:1585
+#: common/unit.c:1588
#, c-format
msgid ""
"Upgrading %s to %s costs %d gold.\n"
@@ -764,11 +765,11 @@ msgstr ""
"Ajanmukaistaminen %s -> %s maksaa %d.\n"
"Valtion kassassa on %d."
-#: common/unit.c:1594
+#: common/unit.c:1597
msgid "You can only upgrade units in your cities."
msgstr "Voit päivittää yksiköitä ainoastaan kaupungeissasi."
-#: common/unit.c:1598
+#: common/unit.c:1601
#, c-format
msgid "Upgrading this %s would strand units it transports."
msgstr ""
@@ -802,11 +803,11 @@ msgstr "Ydinohjus"
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1404
+#: common/unittype.c:349 client/helpdata.c:1412
msgid " and "
msgstr " ja "
-#: common/unittype.c:355 client/helpdata.c:1390
+#: common/unittype.c:355 client/helpdata.c:1398
msgid "?and:, "
msgstr ", "
@@ -980,72 +981,72 @@ 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:501
+#: utility/shared.c:514
#, c-format
msgid "%d BC"
msgstr "%d eKr."
-#: utility/shared.c:503
+#: utility/shared.c:516
#, c-format
msgid "%d AD"
msgstr "%d jKr."
-#: utility/shared.c:924
+#: utility/shared.c:937
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:1028
+#: utility/shared.c:1041
#, c-format
msgid "Could not read data directory %s: %s."
msgstr "Datahakemiston %s lukeminen epäonnistui: %s."
-#: utility/shared.c:1279
+#: utility/shared.c:1292
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:1281
+#: utility/shared.c:1294
#, c-format
msgid "Current data path is: \"%s\""
msgstr "Tämänhetkinen data-hakemistopolku on: \"%s\""
-#: utility/shared.c:1283
+#: utility/shared.c:1296
#, c-format
msgid "The \"%s\" file is required ... aborting!"
msgstr "Tiedosto \"%s\" vaaditaan ... keskeytän!"
-#: utility/shared.c:1460
+#: utility/shared.c:1485
#, 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:1462
+#: utility/shared.c:1487
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:1478
+#: utility/shared.c:1503
msgid "exact match"
msgstr "täysosuma"
-#: utility/shared.c:1479
+#: utility/shared.c:1504
msgid "only match"
msgstr "ainoa osuma"
# *** 'non-clear' ***
-#: utility/shared.c:1480
+#: utility/shared.c:1505
msgid "ambiguous"
msgstr "epäselvä"
-#: utility/shared.c:1481
+#: utility/shared.c:1506
msgid "empty"
msgstr "tyhjä"
-#: utility/shared.c:1482
+#: utility/shared.c:1507
msgid "too long"
msgstr "liian pitkä"
# *** Urmh. ***
-#: utility/shared.c:1483
+#: utility/shared.c:1508
msgid "non-match"
msgstr "huti"
@@ -1075,22 +1076,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:280
+#: ai/advdiplomacy.c:300
#, 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:290
+#: ai/advdiplomacy.c:310
#, c-format
msgid "*%s (AI)* First break alliance with %s, %s."
msgstr "*%s (AI)* Pura ensin liittosi pelaajan %s kanssa, %s."
-#: ai/advdiplomacy.c:303
+#: ai/advdiplomacy.c:322
#, c-format
msgid "*%s (AI)* Let us first cease hostilies, %s."
msgstr "*%s (AI)* Lopettakaamme ensin vihollisuutemme, %s."
-#: ai/advdiplomacy.c:308
+#: ai/advdiplomacy.c:327
#, c-format
msgid ""
"*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
@@ -1099,47 +1100,47 @@ msgstr ""
"*%s (AI)* Haluaisin sinun pitävän nykyisen tulitauon ensin hieman pidempään, "
"%s."
-#: ai/advdiplomacy.c:331
+#: ai/advdiplomacy.c:350
#, 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:424
+#: ai/advdiplomacy.c:443
#, c-format
msgid "*%s (AI)* I do not know the city you mention."
msgstr "*%s (AI)* En tunne mainitsemaasi kaupunkia."
-#: ai/advdiplomacy.c:454
+#: ai/advdiplomacy.c:473
#, 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:560
+#: ai/advdiplomacy.c:579
#, 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:582
+#: ai/advdiplomacy.c:601
#, c-format
msgid "*%s (AI)* Welcome into our alliance %s!"
msgstr "*%s (AI)* Tervetuloa liittolaiseksemme, %s!"
-#: ai/advdiplomacy.c:586
+#: ai/advdiplomacy.c:605
#, 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:593
+#: ai/advdiplomacy.c:612
#, c-format
msgid "*%s (AI)* Yes, peace in our time!"
msgstr "*%s (AI)* Aivan, rauha meidän aikanamme!"
-#: ai/advdiplomacy.c:598
+#: ai/advdiplomacy.c:617
#, c-format
msgid "*%s (AI)* Agreed. No more hostilities, %s."
msgstr "*%s (AI)* Olen samaa mieltä. Lopetetaan vihanpito, %s."
-#: ai/advdiplomacy.c:813
+#: ai/advdiplomacy.c:832
#, c-format
msgid ""
"*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
@@ -1148,22 +1149,22 @@ msgstr ""
"*%s (AI)* Tervehdys, %s! Voimmeko ehdottaa tulitaukoa jotta ehdimme paremmin "
"tutustua?"
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1116
#, c-format
msgid "*%s (AI)* Space will never be yours. "
msgstr "*%s (AI)* Avaruus ei tule koskaan kuulumaan teille. "
-#: ai/advdiplomacy.c:1102
+#: ai/advdiplomacy.c:1121
#, 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:1108
+#: ai/advdiplomacy.c:1127
#, c-format
msgid "*%s (AI)* Peace in ... some other time."
msgstr "*%s (AI)* Rauha... on toisen ajan asia."
-#: ai/advdiplomacy.c:1113
+#: ai/advdiplomacy.c:1132
#, c-format
msgid ""
"*%s (AI)* Finally I get around to you! Did you really think you could get "
@@ -1172,17 +1173,17 @@ msgstr ""
"*%s (AI)* Lopultakin yhytin sinut! Luulitko tosiaan pääseväsi kuin koira "
"veräjästä?"
-#: ai/advdiplomacy.c:1119
+#: ai/advdiplomacy.c:1138
#, 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:1126
+#: ai/advdiplomacy.c:1145
#, 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:1209
+#: ai/advdiplomacy.c:1229
#, c-format
msgid ""
"*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1197,7 +1198,7 @@ msgstr[1] ""
"*%s (AI)* %s saa tuta sotavoimiemme täyden mahdin %d vuoron kuluttua, jotta "
"avaruusaluksen laukaisu tulee estetyksi."
-#: ai/advdiplomacy.c:1219
+#: ai/advdiplomacy.c:1239
#, c-format
msgid ""
"*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
@@ -1206,7 +1207,7 @@ msgstr ""
"*%s (AI)* Odotamme teidän auttavan tässä asiassa. Kauan eläköön mahtava "
"liittomme!"
-#: ai/advdiplomacy.c:1225
+#: ai/advdiplomacy.c:1245
#, c-format
msgid ""
"*%s (AI)* %s has grossly violated his treaties with us for own gain. We "
@@ -1225,7 +1226,7 @@ msgstr[1] ""
"edukseen. Vastaamme voimakeinoin %d vuoron kuluttua ja odotamme teidän "
"kunnioittavan liittoumaamme toimimalla samoin!"
-#: ai/advdiplomacy.c:1238
+#: ai/advdiplomacy.c:1258
#, c-format
msgid ""
"*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1240,13 +1241,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:1246
+#: ai/advdiplomacy.c:1266
#, 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:1251
+#: ai/advdiplomacy.c:1271
#, c-format
msgid ""
"*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1261,14 +1262,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:1261
+#: ai/advdiplomacy.c:1281
#, 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:1267
+#: ai/advdiplomacy.c:1287
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance and declare war on %s in %d turn. "
@@ -1283,7 +1284,7 @@ msgstr[1] ""
"*%s (AI)* Kunnioitamme liittoamme, alas %s! Julistamme sodan %d vuoron "
"kuluttua. Tulossa ollaan!"
-#: ai/advdiplomacy.c:1276
+#: ai/advdiplomacy.c:1296
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1300,7 +1301,7 @@ msgstr[1] ""
"vihollisemme. Julistamme sodan %d vuoron kuluttua! Odotamme teidän toimivan "
"samoin."
-#: ai/advdiplomacy.c:1344
+#: ai/advdiplomacy.c:1364
#, c-format
msgid ""
"*%s (AI)* Your attempt to conquer space for yourself alone betray your true "
@@ -1309,7 +1310,7 @@ msgstr ""
"*%s (AI)* Yrityksesi valloittaa avaruus yksin itsellesi antaa ilmi "
"todelliset aikomuksesi, ja liittomme on tästä pitäen ohi!"
-#: ai/advdiplomacy.c:1359
+#: ai/advdiplomacy.c:1379
#, c-format
msgid ""
"*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
@@ -1317,7 +1318,7 @@ msgid ""
msgstr ""
"*%s (AI)* Pyrkimyksesi hallita ulkoavaruutta yksin loukkaa meitä syvästi."
-#: ai/advdiplomacy.c:1362
+#: ai/advdiplomacy.c:1382
#, c-format
msgid ""
"*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
@@ -1326,14 +1327,14 @@ msgstr ""
"*%s (AI)* Jos et lopeta avaruusaluksesi rakentamista, minun pitää varmaankin "
"tehdä asialle jotakin!"
-#: ai/advdiplomacy.c:1474
+#: ai/advdiplomacy.c:1494
#, 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:1549
+#: ai/advdiplomacy.c:1569
#, c-format
msgid ""
"*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
@@ -1342,7 +1343,7 @@ msgstr ""
"*%s (AI)* Tervehdys, oi luotettu liittolaisemme. Pyydämme apuanne - "
"vihollisemme %s pitää tuhota."
-#: ai/advdiplomacy.c:1555
+#: ai/advdiplomacy.c:1575
#, c-format
msgid ""
"*%s (AI)* Greetings ally, I see you have not yet made war with our enemy, %"
@@ -1352,7 +1353,7 @@ msgstr ""
"vieläkään ole vastaanottanut sodanjulistustasi. Pitääkö minun muistuttaa "
"teitä tekemistänne lupauksista?"
-#: ai/advdiplomacy.c:1562
+#: ai/advdiplomacy.c:1582
#, c-format
msgid ""
"*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1363,7 +1364,7 @@ msgstr ""
"vieläkin juonia rauhassa, etkä sinä nosta sormeasikaan! Tällaista en voi "
"hyväksyä, liittomme olkoon purettu!"
-#: ai/advdiplomacy.c:1592
+#: ai/advdiplomacy.c:1612
#, c-format
msgid ""
"*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
@@ -1372,13 +1373,13 @@ msgstr ""
"*%s (AI)* Tervehdys, ystävä, haluaisimme ehdottaa yhteisen edun ajamista "
"liittoutumalla."
-#: ai/advdiplomacy.c:1607
+#: ai/advdiplomacy.c:1627
#, 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:1622
+#: ai/advdiplomacy.c:1642
#, c-format
msgid ""
"*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
@@ -1387,7 +1388,7 @@ msgstr ""
"*%s (AI)* Tämä jatkuva verenvuodatus väsyttää meitä. Voisimmeko haudata "
"sotakirveen?"
-#: ai/advdiplomacy.c:1742
+#: ai/advdiplomacy.c:1762
#, c-format
msgid ""
"*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1538,18 +1539,18 @@ msgstr ""
"Salasanassa on oltava vähintään %d isoa kirjainta, %d numeroa ja sen "
"pituuden on oltava vähintään %d [näkyvää] merkkiä pitkä. Anna uusi salasana."
-#: server/barbarian.c:183
+#: server/barbarian.c:184
#, c-format
msgid "%s gain a leader by the name %s. Dangerous times may lie ahead."
msgstr ""
-"%s ovat saaneet uuden johtajan, nimeltään %s. Vaaralliset ajat uhkaavat."
+"%s ovat saaneet uuden hallitsijan, nimeltään %s. Vaaralliset ajat uhkaavat."
-#: server/barbarian.c:479
+#: server/barbarian.c:480
#, c-format
msgid "Native unrest near %s led by %s."
msgstr "%s raportoi levottomuuksia lähistöllä, %s johtaa rähinöijiä."
-#: server/barbarian.c:484
+#: server/barbarian.c:485
#, c-format
msgid "Sea raiders seen near %s!"
msgstr "%s on havainnut merirosvoja!"
@@ -1938,7 +1939,7 @@ msgid_plural "%s boosts research; you gain %d immediate advances."
msgstr[0] "Peli: %s tehostaa tutkimusta, harppaat %d edistysaskeleen."
msgstr[1] "Peli: %s tehostaa tutkimusta, harppaat %d edistysaskelta."
-#: server/cityturn.c:1158 server/techtools.c:176
+#: server/cityturn.c:1158 server/techtools.c:172
#, c-format
msgid "The %s have acquired %s from %s."
msgstr "%s saivat edistysaskeleen %s, opettajina %s."
@@ -1972,12 +1973,12 @@ msgstr "%s raportoi saasteista lähistöllään."
#: server/cityturn.c:1483
#, c-format
msgid "We Love The %s Day celebrated in %s."
-msgstr "Rakastamme johtajaamme %s -päivää vietettiin kaupungissa %s."
+msgstr "Rakas %s -päivää vietettiin kaupungissa %s."
#: server/cityturn.c:1490
#, c-format
msgid "We Love The %s Day canceled in %s."
-msgstr "Rakastamme johtajaamme %s -päivä peruutettiin kaupungissa %s."
+msgstr "Rakas %s -päivä peruutettiin kaupungissa %s."
#: server/cityturn.c:1519
#, c-format
@@ -2025,22 +2026,22 @@ msgid "Warning: the %s option is obsolete. Use -m to enable the metaserver.\n"
msgstr ""
"Varoitus: %s ei enää ole käytössä. Valitse -m käyttääksesi välipalvelinta.\n"
-#: server/civserver.c:189
+#: server/civserver.c:193
#, c-format
msgid "Error: unknown option '%s'\n"
msgstr "Virhe: tuntematon valinta/\"option\" (%s)\n"
-#: server/civserver.c:200
+#: server/civserver.c:204
#, c-format
msgid "This is the server for %s"
msgstr "Tällä palvelimella pyörii %s."
-#: server/civserver.c:201
+#: server/civserver.c:205
#, c-format
msgid "You can learn a lot about Freeciv at %s"
msgstr "Voit oppia paljon Freecivistä osoitteessa %s"
-#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
+#: server/civserver.c:210 client/civclient.c:239 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -2049,111 +2050,115 @@ msgstr ""
"Käyttö: %s [valinta ...]\n"
"Sallitut valinnat:\n"
-#: server/civserver.c:208
+#: server/civserver.c:212
msgid ""
" -a --auth FILE\tEnable server authentication with configuration from "
"FILE.\n"
msgstr " -a --auth TDSTO\tSalli palvelinautentikaatio, asetukset TDSTOsta.\n"
-#: server/civserver.c:210
+#: server/civserver.c:214
msgid " -G --Guests\t\tAllow guests to login if auth is enabled.\n"
msgstr ""
" -G --Guests\t\tSalli vierailijoiden kirjautua sisään jos autentikaatio on "
"käytössä.\n"
-#: server/civserver.c:212
+#: server/civserver.c:216
msgid " -N --Newusers\tAllow new users to login if auth is enabled.\n"
msgstr ""
" -N --Newusers\tSalli uusien käyttäjien kirjautua sisään jos autentikaatio "
"on käytössä.\n"
# *** "Expect client-connections to port.." ***
-#: server/civserver.c:215
+#: server/civserver.c:219
msgid " -b --bind ADDR\tListen for clients on ADDR\n"
msgstr " -b --bind ADDR\tOdota asiakasyhteydenottoja osoitteessa ADDR\n"
-#: server/civserver.c:217 client/civclient.c:242
+#: server/civserver.c:221 client/civclient.c:243
msgid ""
" -d, --debug NUM\tSet debug log level (0 to 4, or 4:file1,min,max:...)\n"
msgstr ""
" -d, --debug NUM\tAseta debug-lokitarkkuus (0,1,2,3 tai 4:tiedosto1,min,"
"max:...)\n"
-#: server/civserver.c:221 client/civclient.c:246
+#: server/civserver.c:225 client/civclient.c:247
msgid " -d, --debug NUM\tSet debug log level (0 to 3)\n"
msgstr " -d --debug NUM\tAseta debug-lokitarkkuus (0 - 3)\n"
-#: server/civserver.c:223
+#: server/civserver.c:227
msgid " -f, --file FILE\tLoad saved game FILE\n"
msgstr " -f, --file FILE\tLataa tallennettu peli tiedostosta FILE\n"
-#: server/civserver.c:225 client/civclient.c:249 manual/civmanual.c:382
+#: server/civserver.c:229 client/civclient.c:250 manual/civmanual.c:382
msgid " -h, --help\t\tPrint a summary of the options\n"
msgstr " -h, --help\t\tNäytä valintojen yhteenveto\n"
-#: server/civserver.c:226
+#: server/civserver.c:230
+msgid " -i, --identity ADDR\tBe known as ADDR at metaserver\n"
+msgstr " -i, --identity ADDR\tAseta ADDR tunnisteeksesi metapalvelimella\n"
+
+#: server/civserver.c:231
msgid " -l, --log FILE\tUse FILE as logfile\n"
-msgstr " -l, --log FILE\tKäytä tiedostoa FILE lokia varten.\n"
+msgstr " -l, --log FILE\tKäytä tiedostoa FILE lokia varten\n"
-#: server/civserver.c:227
+#: server/civserver.c:232
msgid " -m, --meta\t\tNotify metaserver and send server's info\n"
msgstr " -m, --meta\t\tIlmoittaudu ja lähetä tietoa metapalvelimelle\n"
-#: server/civserver.c:229
+#: server/civserver.c:234
msgid " -M, --Metaserver ADDR\tSet ADDR as metaserver address\n"
msgstr " -M, -Metaserver ADDR\tAseta ADDR metapalvelimen osoitteeksi\n"
# *** "Expect client-connections to port.." ***
-#: server/civserver.c:232
+#: server/civserver.c:237
msgid " -p, --port PORT\tListen for clients on port PORT\n"
-msgstr " -p, --port PORT\tOdota client-yhteydenottoja porttiin PORT\n"
+msgstr " -p, --port PORT\tOdota asiakasyhteydenottoja porttiin PORT\n"
-#: server/civserver.c:234
+#: server/civserver.c:239
msgid " -q, --quitidle TIME\tQuit if no players for TIME seconds\n"
msgstr " -q, --quitidle TIME\tLopeta jos ei pelaajia TIME sekuntiin\n"
-#: server/civserver.c:236
+#: server/civserver.c:241
msgid " -e, --exit-on-end\tWhen a game ends, exit instead of restarting\n"
msgstr ""
" -e, --exit-on-end\tKun peli päättyy, lopeta uudelleenkäynnistyksen sijaan\n"
-#: server/civserver.c:239
+#: server/civserver.c:244
msgid " -s, --saves DIR\tSave games to directory DIR\n"
msgstr " -s, --saves HAK\tTallenna pelit hakemistoon HAK\n"
-#: server/civserver.c:241
+#: server/civserver.c:246
msgid " -S, --Serverid ID\tSets the server id to ID\n"
msgstr " -S, --Serverid ID\tYhdistä palvelimeen, jonka tunniste on ID\n"
-#: server/civserver.c:243
+#: server/civserver.c:248
msgid " -P, --Ppm\t\tSave ppms of the map when saving the game.\n"
msgstr " -P, --Ppm\\t\\t Tallenna kartan ppm-kuvat peliä tallennettaessa.\n"
-#: server/civserver.c:244
+#: server/civserver.c:249
msgid " -r, --read FILE\tRead startup script FILE\n"
msgstr " -r, --read FILE\tLue käynnistysskripti tiedostosta FILE\n"
-#: server/civserver.c:246
+#: server/civserver.c:251
msgid " -R, --Ranklog FILE\tUse FILE as ranking logfile\n"
msgstr " -R, --Ranklog FILE\tKäytä tiedostoa FILE sijoituslokina\n"
-#: server/civserver.c:247 client/civclient.c:268 manual/civmanual.c:383
+#: server/civserver.c:252 client/civclient.c:269 manual/civmanual.c:383
msgid " -v, --version\t\tPrint the version number\n"
msgstr " -v, --version\t\tNäytä versionumero.\n"
-#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
+#: server/civserver.c:253 client/gui-gtk-2.0/gui_main.c:354
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, c-format
msgid "Report bugs at %s.\n"
msgstr "Lähetä virheraportteja: %s.\n"
-#: server/commands.c:28
+#: server/commands.c:29
msgid "Start the game, or restart after loading a savegame."
msgstr ""
"Aloita peli tai käynnistä uudelleen tallennetun pelin lataamisen jälkeen."
-#: server/commands.c:29
+#: server/commands.c:30
msgid ""
"This command starts the game. When starting a new game, it should be used "
"after all human players have connected, and AI players have been created (if "
@@ -2172,7 +2177,7 @@ msgstr ""
"ole käytettävissä - sillä ei enää olisi vaikutusta."
#. TRANS: translate text between <> only
-#: server/commands.c:42
+#: server/commands.c:44
msgid ""
"help\n"
"help commands\n"
@@ -2186,11 +2191,11 @@ msgstr ""
"help <komennon nimi>\n"
"help <parametrin ('option') nimi>"
-#: server/commands.c:47
+#: server/commands.c:49
msgid "Show help about server commands and server options."
msgstr "Näytä ohje palvelinkomentojen ja parametrien käytöstä."
-#: server/commands.c:48
+#: server/commands.c:50
msgid ""
"With no arguments gives some introductory help. With argument \"commands\" "
"or \"options\" gives respectively a list of all commands or all options. "
@@ -2206,11 +2211,11 @@ msgstr ""
"parametrin tämänhetkisen ja oletusarvon. Argumentin saa lyhentää jos lyhenne "
"on yksiselitteinen."
-#: server/commands.c:63
+#: server/commands.c:66
msgid "Show a list of players, teams, connections, or scenarios."
msgstr "Näytä lista pelaajista, joukkueista, yhteyksistä tai skenaarioista."
-#: server/commands.c:64
+#: server/commands.c:67
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 "
@@ -2220,20 +2225,20 @@ msgstr ""
"saatavilla olevista skenaarioista. Parametri voidaan lyhentää, ja mikäli "
"sitä ei ole, käytetään 'players'iä oletusarvona."
-#: server/commands.c:70
+#: server/commands.c:74
msgid "Quit the game and shutdown the server."
msgstr "Lopeta peli ja sulje palvelin."
#. TRANS: translate text between <> only
-#: server/commands.c:74
+#: server/commands.c:79
msgid "cut <connection-name>"
msgstr "cut <yhteysnimi>"
-#: server/commands.c:75
+#: server/commands.c:80
msgid "Cut a client's connection to server."
msgstr "Katkaise clientin yhteys palvelimeen."
-#: server/commands.c:76
+#: server/commands.c:81
msgid ""
"Cut specified client's connection to the server, removing that client from "
"the game. If the game has not yet started that client's player is removed "
@@ -2246,7 +2251,7 @@ msgstr ""
"nykyään yhteyksien nimiä, ei pelaajien."
#. TRANS: translate text between <> only
-#: server/commands.c:83
+#: server/commands.c:89
msgid ""
"explain\n"
"explain <option-name>"
@@ -2254,11 +2259,11 @@ msgstr ""
"explain\n"
"explain <parametrin nimi>"
-#: server/commands.c:85
+#: server/commands.c:91
msgid "Explain server options."
msgstr "Selosta palvelimen asetusparametrit ('options')."
-#: server/commands.c:86
+#: server/commands.c:92
msgid ""
"The 'explain' command gives a subset of the functionality of 'help', and is "
"included for backward compatibility. With no arguments it gives a list of "
@@ -2271,7 +2276,7 @@ msgstr ""
"mukaisen parametrin ohjeen (kuten 'help <parametrin nimi>')."
#. TRANS: translate text between <> only
-#: server/commands.c:93
+#: server/commands.c:100
msgid ""
"show\n"
"show <option-name>\n"
@@ -2281,55 +2286,56 @@ msgstr ""
"show <parametrin nimi>\n"
"show <parametrin nimen alku>"
-#: server/commands.c:96
+#: server/commands.c:103
msgid "Show server options."
msgstr "Näytä palvelimen asetusparametrit."
-#: server/commands.c:97
+#: server/commands.c:104
msgid ""
"With no arguments, shows all server options (or available options, when used "
"by clients). With an argument, show only the named option, or options with "
"that prefix."
msgstr ""
"Ilman argumentteja, tämä näyttää kaikki palvelimen asetusparametrit (tai "
-"saatavilla olevat asetukset, jos se ajetaan client-ohjelmista käsin. Muussa "
+"saatavilla olevat asetukset, jos se ajetaan asiakasohjelmista käsin. Muussa "
"tapauksessa show näyttää vain kyseisen asetuksen, tai asetukset jotka "
"alkavat annetulla tavalla."
-#: server/commands.c:102
+#: server/commands.c:110
msgid "wall <message>"
msgstr "wall <viesti>"
-#: server/commands.c:103
+#: server/commands.c:111
msgid "Send message to all connections."
msgstr "Lähetä viesti kaikille."
-#: server/commands.c:104
+#: server/commands.c:112
msgid ""
"For each connected client, pops up a window showing the message entered."
msgstr ""
-"Avaa jokaista yhteydessä olevaa client-ohjelmaa kohden ikkunan jossa "
+"Avaa jokaista yhteydessä olevaa asiakasohjelmaa kohden ikkunan jossa "
"lähetetty viesti näkyy."
-#: server/commands.c:108
+#: server/commands.c:117
msgid "vote yes|no [vote number]"
msgstr "vote yes|no [äänestyksen numero]"
-#: server/commands.c:109
+#: server/commands.c:118
msgid "Cast a vote."
msgstr "Anna ääni."
-#: server/commands.c:111
+#: server/commands.c:120
#, 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."
+"A player with basic 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."
msgstr ""
-"Pelaaja, joka on info-komentotasolla ja ajaa kontrollitason komennon, "
+"Pelaaja, joka on peruskomentotasolla ja ajaa kontrollitason komennon, "
"aloittaa äänestyksen komennosta. /vote-komento, jonka parametriksi annetaan "
"\"yes\" (kyllä) tai \"no\" (ei), mahdollisesti myös äänestyksen numero, "
"antaa äänen. Jos äänestyksen numeroa ei anneta, ääni koskee viimeisintä "
@@ -2337,7 +2343,7 @@ msgstr ""
"on myönteinen välittömästi jos yli puolet pelaajista äänestää sen puolesta, "
"tai kielteinen mikäli ainakin puolet pelaajista äänestää sitä vastaan."
-#: server/commands.c:121
+#: server/commands.c:131
msgid ""
"debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
"<player> | timing | info]"
@@ -2345,11 +2351,11 @@ msgstr ""
"debug [ player <pelaaja> | city <x> <y> | units <x> <y> | unit <id> | tech "
"<pelaaja> | timing | info]"
-#: server/commands.c:123
+#: server/commands.c:133
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:124
+#: server/commands.c:134
msgid ""
"Print AI debug information about given entity and turn continous debugging "
"output for this entity on or off."
@@ -2357,23 +2363,23 @@ msgstr ""
"Tulosta AI-debugtietoa annetusta oliosta ja aseta jatkuva debuggaustuloste "
"tästä oliosta päälle tai pois päältä."
-#: server/commands.c:128
+#: server/commands.c:139
msgid "set <option-name> <value>"
msgstr "set <asetusparametrin nimi> <arvo>"
-#: server/commands.c:129
+#: server/commands.c:140
msgid "Set server option."
msgstr "Muuta palvelimen asetuksia."
-#: server/commands.c:132
+#: server/commands.c:144
msgid "team <player> [team]"
msgstr "team <pelaaja> [joukkue]"
-#: server/commands.c:133
+#: server/commands.c:145
msgid "Change, add or remove a player's team affiliation."
msgstr "Muuta pelaajan joukkuetta: liity, vaihda uuteen tai poistu."
-#: server/commands.c:134
+#: server/commands.c:146
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 "
@@ -2386,15 +2392,15 @@ msgstr ""
"suurlähetystöin, <ja taistelee rinta rinnan saavuttaakseen joukkuevoiton. "
"Yksilöiden pistemäärät keskiarvotetaan."
-#: server/commands.c:141
+#: server/commands.c:154
msgid "rulesetdir <directory>"
msgstr "rulesetdir <hakemisto>"
-#: server/commands.c:142
+#: server/commands.c:155
msgid "Choose new ruleset directory or modpack."
msgstr "Valitse uusi sääntökokoelmahakemisto tai mod-paketti."
-#: server/commands.c:143
+#: server/commands.c:156
msgid ""
"Choose new ruleset directory or modpack. Calling this\n"
" without any arguments will show you the currently selected ruleset."
@@ -2403,15 +2409,15 @@ msgstr ""
"Jos uutta hakemistoa ei anneta, tämänhetkinen hakemisto näytetään."
#. TRANS: translate text between <> only
-#: server/commands.c:149
+#: server/commands.c:163
msgid "metainfo <meta-line>"
msgstr "metainfo <metateksti>"
-#: server/commands.c:150
+#: server/commands.c:164
msgid "Set metaserver info line."
msgstr "Muuta metapalvelimen infotekstiä."
-#: server/commands.c:151
+#: server/commands.c:165
msgid ""
"Set user defined metaserver info line. If parameter is omitted,\n"
"previously set metamessage will be removed. For most of the time\n"
@@ -2424,19 +2430,19 @@ msgstr ""
"luotavien viestien sijaan, jos sellainen on saatavilla."
#. TRANS: translate text between <> only
-#: server/commands.c:158
+#: server/commands.c:173
msgid "metapatch <meta-line>"
msgstr "metapatch <metarivi>"
-#: server/commands.c:159
+#: server/commands.c:174
msgid "Set metaserver patches line."
msgstr "Aseta metapalvelimen aliversiotiedot (\"paikat\")."
-#: server/commands.c:165
+#: server/commands.c:181
msgid "Control metaserver connection."
msgstr "Kontrolloi yhteyttä metapalvelimeen."
-#: server/commands.c:166
+#: server/commands.c:182
msgid ""
"'metaconnection ?' reports on the status of the connection to metaserver.\n"
"'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2447,33 +2453,33 @@ msgstr ""
"'metaconnection up' tai 'metac u' ottaa yhteyden metapalvelimeen."
#. TRANS: translate text between <> only
-#: server/commands.c:172
+#: server/commands.c:189
msgid "metaserver <address>"
msgstr "metaserver <osoite>"
-#: server/commands.c:173
+#: server/commands.c:190
msgid "Set address (URL) for metaserver to report to."
msgstr "Aseta osoite (URL) johon metapalvelimen tulee raportoida."
#. TRANS: translate text between <> only
-#: server/commands.c:177
+#: server/commands.c:195
msgid "aitoggle <player-name>"
msgstr "aitoggle <pelaajan nimi>"
-#: server/commands.c:178
+#: server/commands.c:196
msgid "Toggle AI status of player."
msgstr "Muuta pelaajan AI-tilaa."
#. TRANS: translate text between [] and <> only
-#: server/commands.c:182
+#: server/commands.c:201
msgid "take [connection-name] <player-name>"
msgstr "take [yhteyden nimi] <pelaajan nimi>"
-#: server/commands.c:183
+#: server/commands.c:202
msgid "Take over a player's place in the game."
msgstr "Ota pelaajan paikka pelissä."
-#: server/commands.c:184
+#: server/commands.c:203
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 "
@@ -2487,15 +2493,15 @@ msgstr ""
"ennestään hallitse pelaajaa, yhteyden hallintaan luodaan uusi pelaaja."
#. TRANS: translate text between [] only
-#: server/commands.c:192
+#: server/commands.c:212
msgid "observe [connection-name] [player-name]"
msgstr "observe [yhteyden nimi] [pelaajan nimi]"
-#: server/commands.c:193
+#: server/commands.c:213
msgid "Observe a player or the whole game."
msgstr "Tarkkaile pelaajaa tai koko peliä."
-#: server/commands.c:194
+#: server/commands.c:214
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 "
@@ -2509,15 +2515,15 @@ msgstr ""
"parametrejä, yhteys yhdistetään globaaliin tarkkailijaan."
#. TRANS: translate text between <> only
-#: server/commands.c:202
+#: server/commands.c:223
msgid "detach <connection-name>"
msgstr "detach <yhteysnimi>"
-#: server/commands.c:203
+#: server/commands.c:224
msgid "detach from a player."
msgstr "irrottaudu pelaajasta."
-#: server/commands.c:204
+#: server/commands.c:225
msgid ""
"Only the console and connections with cmdlevel 'hack' can force other "
"connections to detach from a player."
@@ -2527,20 +2533,20 @@ msgstr ""
"<pelaajanimi> on sallittu"
#. TRANS: translate text between <> only
-#: server/commands.c:209
+#: server/commands.c:231
msgid "create <player-name>"
msgstr "create <pelaajan nimi>"
-#: server/commands.c:210
+#: server/commands.c:232
msgid "Create an AI player with a given name."
msgstr "Luo annetunniminen AI-pelaaja."
-#: server/commands.c:211
+#: server/commands.c:233
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:215
+#: server/commands.c:238
msgid ""
"away\n"
"away"
@@ -2548,16 +2554,16 @@ msgstr ""
"away\n"
"away"
-#: server/commands.c:217
+#: server/commands.c:240
msgid "Set yourself in away mode. The AI will watch your back."
msgstr "Laita itsesi poissa-tilaan. AI vahtii selustaasi."
-#: server/commands.c:218
+#: server/commands.c:241
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:222
+#: server/commands.c:246
msgid ""
"novice\n"
"novice <player-name>"
@@ -2565,11 +2571,11 @@ msgstr ""
"novice\n"
"novice <pelaajan nimi>"
-#: server/commands.c:224
+#: server/commands.c:248
msgid "Set one or all AI players to 'novice'."
msgstr "Aseta yhden tai kaikkien AI-pelaajien vaikeustasoksi 'aloittelija'."
-#: server/commands.c:225
+#: server/commands.c:249
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 "
@@ -2580,7 +2586,7 @@ msgstr ""
"Muussa tapauksessa vain kyseisen pelaajan vaikeustasoa muutetaan."
#. TRANS: translate text between <> only
-#: server/commands.c:231
+#: server/commands.c:256
msgid ""
"easy\n"
"easy <player-name>"
@@ -2588,11 +2594,11 @@ msgstr ""
"easy\n"
"easy <pelaajan nimi>"
-#: server/commands.c:233
+#: server/commands.c:258
msgid "Set one or all AI players to 'easy'."
msgstr "Aseta yhden tai kaikkien AI-pelaajien vaikeustasoksi helppo."
-#: server/commands.c:234
+#: server/commands.c:259
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 "
@@ -2603,7 +2609,7 @@ msgstr ""
"kyseisen pelaajan vaikeustasoa muutetaan."
#. TRANS: translate text between <> only
-#: server/commands.c:240
+#: server/commands.c:266
msgid ""
"normal\n"
"normal <player-name>"
@@ -2611,11 +2617,11 @@ msgstr ""
"normal\n"
"normal <pelaajan nimi>"
-#: server/commands.c:242
+#: server/commands.c:268
msgid "Set one or all AI players to 'normal'."
msgstr "Aseta yhden tai kaikkien AI-pelaajien vaikeustasoksi tavallinen."
-#: server/commands.c:243
+#: server/commands.c:269
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 "
@@ -2626,7 +2632,7 @@ msgstr ""
"tapauksessa vain kyseisen pelaajan vaikeustasoa muutetaan."
#. TRANS: translate text between <> only
-#: server/commands.c:249
+#: server/commands.c:276
msgid ""
"hard\n"
"hard <player-name>"
@@ -2634,11 +2640,11 @@ msgstr ""
"hard\n"
"hard <pelaajan nimi>"
-#: server/commands.c:251
+#: server/commands.c:278
msgid "Set one or all AI players to 'hard'."
msgstr "Aseta yhden tai kaikkien AI-pelaajien vaikeustasoksi vaikea."
-#: server/commands.c:252
+#: server/commands.c:279
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 "
@@ -2649,7 +2655,7 @@ msgstr ""
"kyseisen pelaajan vaikeustasoa muutetaan."
#. TRANS: translate text between <> only
-#: server/commands.c:258
+#: server/commands.c:286
msgid ""
"experimental\n"
"experimental <player-name>"
@@ -2657,11 +2663,11 @@ msgstr ""
"experimental\n"
"experimental <pelaajan nimi>"
-#: server/commands.c:260
+#: server/commands.c:288
msgid "Set one or all AI players to 'experimental'."
msgstr "Aseta yhden tai kaikkien AI-pelaajien vaikeustasoksi 'kokeellinen'."
-#: server/commands.c:261
+#: server/commands.c:289
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 "
@@ -2675,7 +2681,7 @@ msgstr ""
"asetus ei tee mitään."
#. TRANS: translate text between <> only
-#: server/commands.c:269
+#: server/commands.c:298
msgid ""
"cmdlevel\n"
"cmdlevel <level>\n"
@@ -2689,17 +2695,19 @@ msgstr ""
"cmdlevel <taso> first\n"
"cmdlevel <taso> <yhteyden nimi>"
-#: server/commands.c:274
+#: server/commands.c:303
msgid "Query or set command access level access."
msgstr "Tarkista tai aseta sallittu komentotaso."
-#: server/commands.c:275
+#: server/commands.c:304
msgid ""
"The command access level controls which server commands are available\n"
"to users via the client chatline. The available levels are:\n"
" none - no commands\n"
-" info - informational commands only\n"
+" info - informational or observer commands only\n"
+" basic - commands available to players in the game\n"
" ctrl - commands that affect the game and users\n"
+" admin - commands that affect server operation\n"
" hack - *all* commands - dangerous!\n"
"With no arguments, the current command access levels are reported.\n"
"With a single argument, the level is set for all existing connections,\n"
@@ -2715,38 +2723,41 @@ msgid ""
"now takes connection names, not player names."
msgstr ""
"Komentotason asetuksilla määritellään mitkä komennot ovat pelaajien \n"
-"käytettävissä client-ohjelman keskustelulinjan kautta. Eri tasot ovat:\n"
-" none - ei sallittuja komentoja\n"
-" info - vain informatiiviset komennot sallittu\n"
-" ctrl - komennot joilla on vaikutusta peliin ja käyttäjiin sallittu\n"
-" hack - *kaikki* komennot sallittu - vaarallista!\n"
+"käytettävissä asiakasohjelman keskustelukentän kautta. Eri tasot ovat:\n"
+" none - ei sallittuja komentoja\n"
+" info - vain informatiiviset komennot sallittu\n"
+" perus - komennot, jotka ovat saatavilla peliin osallistuville "
+"pelaajille\n"
+" ctrl - komennot joilla on vaikutusta peliin ja käyttäjiin sallittu\n"
+" admin - komennot, jotka vaikuttavat palvelimen toimintaan\n"
+" hack - *kaikki* komennot sallittu - vaarallista!\n"
"Jos argumentteja ei ole, kone raportoi tämänhetkisen tilanteen.\n"
"Jos argumentteja on yksi, kyseinen taso asetetaan kaikille yhteyksille, ja \n"
"taso toimii oletusarvona uusille yhteydenotoille.\n"
"Jos lisäargumenttina on 'new', taso asetetaan uusille yhteydenotoille.\n"
"Jos 'first come', taso asetetaan ensimmäiselle yhteydenottajalle, tai jos \n"
"joku on jo yhteydessä, ensimmäiselle joka ajaa komennon 'first'.\n"
-"Jos pelaajan nimi on lisäargumenttina, taso asetetaan vain tälle "
-"pelaajalle.\n"
+"Jos yhteyden nimi on lisäargumenttina, taso asetetaan vain tälle "
+"yhteydelle.\n"
"\n"
"Komentotasot unohtuvat jos pelaaja katkaisee yhteyden, jottei taso siirry\n"
"seuraavalle samannimiselle yhteydelle. Huomaa, että komento ottaa nykyään\n"
"vastaan yhteysnimiä, ei pelaajanimiä."
-#: server/commands.c:296
+#: server/commands.c:328
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:301
+#: server/commands.c:334
msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
msgstr "timeoutincrease <vuoro> <vuorolisä> <arvo> <arvokerroin>."
-#: server/commands.c:302
+#: server/commands.c:335
msgid "See \"help timeoutincrease\"."
msgstr "Ks. 'help timeoutincrease'."
-#: server/commands.c:303
+#: server/commands.c:336
msgid ""
"Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
"<turn> and multiply <value> by <valuemult>. Use this command in concert "
@@ -2757,24 +2768,43 @@ msgstr ""
"komentoa yhdessä \"timeout\"-asetuksen kanssa. Oletusarvot ovat 0 0 0 1"
#. TRANS: translate text between <> only
-#: server/commands.c:309
+#: server/commands.c:343
+msgid ""
+"cancelvote\n"
+"cancelvote <vote number>\n"
+"cancelvote all\n"
+msgstr ""
+
+#: server/commands.c:346
+msgid "Cancel a running vote.\n"
+msgstr ""
+
+#: server/commands.c:347
+msgid ""
+"With no arguments this command removes your own vote. If you have an admin "
+"access level, you can cancel any vote by vote number, or all votes with the "
+"'all' argument."
+msgstr ""
+
+#. TRANS: translate text between <> only
+#: server/commands.c:354
msgid "endgame"
msgstr "endgame"
-#: server/commands.c:310
+#: server/commands.c:355
msgid "End the game immediately in a draw."
msgstr "Lopeta peli välittömästi tasapeliin."
#. TRANS: translate text between <> only
-#: server/commands.c:314
+#: server/commands.c:360
msgid "surrender"
msgstr "surrender"
-#: server/commands.c:315
+#: server/commands.c:361
msgid "Concede the game."
msgstr "Luovuta peli."
-#: server/commands.c:316
+#: server/commands.c:362
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 +2813,15 @@ msgstr ""
"pelaaj a (tai joukkue) ovat luovuttaneet näin, peli päättyy."
#. TRANS: translate text between <> only
-#: server/commands.c:322
+#: server/commands.c:369
msgid "remove <player-name>"
msgstr "remove <pelaajan nimi>"
-#: server/commands.c:323
+#: server/commands.c:370
msgid "Fully remove player from game."
msgstr "Poista pelaaja pelistä lopullisesti."
-#: server/commands.c:324
+#: server/commands.c:371
msgid ""
"This *completely* removes a player from the game, including all cities and "
"units etc. Use with care!"
@@ -2800,7 +2830,7 @@ msgstr ""
"kaupungit ja yksiköt jne. Käytä varoen!"
#. TRANS: translate text between <> only
-#: server/commands.c:329
+#: server/commands.c:377
msgid ""
"save\n"
"save <file-name>"
@@ -2808,11 +2838,11 @@ msgstr ""
"save\n"
"save <tiedostonimi>"
-#: server/commands.c:331
+#: server/commands.c:379
msgid "Save game to file."
msgstr "Tallenna peli annettuun tiedostoon."
-#: server/commands.c:332
+#: server/commands.c:380
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 +2860,7 @@ msgstr ""
"ja käytä komentoa 'start' kunhan pelaajat ovat taas yhteydessä."
#. TRANS: translate text between <> only
-#: server/commands.c:341
+#: server/commands.c:390
msgid ""
"load\n"
"load <file-name>"
@@ -2838,11 +2868,11 @@ msgstr ""
"load\n"
"load <tiedosto>"
-#: server/commands.c:343
+#: server/commands.c:392
msgid "Load game from file."
msgstr "Lataa peli annetusta tiedostosta."
-#: server/commands.c:344
+#: server/commands.c:393
msgid ""
"Load a game from <file-name>. Any current data including players, rulesets "
"and server options are lost.\n"
@@ -2851,118 +2881,118 @@ msgstr ""
"ja palvelinasetukset unohdetaan.\n"
#. TRANS: translate text between <> only
-#: server/commands.c:349
+#: server/commands.c:399
msgid "read <file-name>"
msgstr "read <tiedosto>"
-#: server/commands.c:350
+#: server/commands.c:400
msgid "Process server commands from file."
msgstr "Suorita palvelinkäskyjä tiedostosta."
#. TRANS: translate text between <> only
-#: server/commands.c:354
+#: server/commands.c:405
msgid "write <file-name>"
msgstr "write <tiedosto>"
-#: server/commands.c:355
+#: server/commands.c:406
msgid "Write current settings as server commands to file."
msgstr "Tallenna tämänhetkiset palvelinkomentojen asetukset tiedostoon."
-#: server/commands.c:359
+#: server/commands.c:411
msgid "Switch server output between 'RFC-style' and normal style."
msgstr "Muuta palvelimen tulostus RFC-tyyliseksi tai tavalliseksi."
-#: server/commands.c:363
+#: server/commands.c:416
msgid "Simply returns the id of the server."
msgstr "Palauttaa palvelimen tunnisteen."
-#: server/connecthand.c:85
+#: server/connecthand.c:109
#, c-format
msgid "Welcome to the %s Server running at %s port %d."
msgstr "Tervetuloa %s -palvelimelle, osoitteessa %s:%d."
-#: server/connecthand.c:89
+#: server/connecthand.c:113
#, c-format
msgid "Welcome to the %s Server at port %d."
msgstr "Tervetuloa %s-palvelimelle portissa %d."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:97
+#: server/connecthand.c:121
#, c-format
msgid "(%d) %s: connected [%s]"
msgstr "(%d) %s on liittynyt osoitteesta %s."
-#: server/connecthand.c:104
+#: server/connecthand.c:128
#, c-format
msgid "Server: %s has connected from %s."
msgstr "Palvelin: %s on liittynyt yhteydestä %s."
-#: server/connecthand.c:145
+#: server/connecthand.c:175
msgid "Couldn't attach your connection to new player."
msgstr "Yhteytesi yhdistäminen uuteen pelaajaan epäonnistui."
-#: server/connecthand.c:165
+#: server/connecthand.c:199
#, c-format
msgid "You are logged in as '%s' connected to no player."
msgstr "Olet kirjautunut sisään nimellä '%s', etkä ole yhteydessä pelaajaan."
-#: server/connecthand.c:169
+#: server/connecthand.c:203
#, c-format
msgid "You are logged in as '%s' connected to an anonymous player."
msgstr ""
"Olet kirjautunut sisään nimellä '%s', yhteydessä nimettömään pelaajaan."
-#: server/connecthand.c:174
+#: server/connecthand.c:208
#, c-format
msgid "You are logged in as '%s' connected to %s."
msgstr "Olet kirjautunut sisään nimellä '%s', yhteydessä pelaajaan %s."
-#: server/connecthand.c:187
+#: server/connecthand.c:221
#, c-format
msgid "Turn-blocking game play: waiting on %s to finish turn..."
msgstr "%s ei ole valmis vuoronsa kanssa, peli odottaa..."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:240
+#: server/connecthand.c:274
#, c-format
msgid "(%d) %s: connection request [%s]"
msgstr "(%d) %s osoitteesta %s lähettää yhteyspyynnön"
-#: server/connecthand.c:266
+#: server/connecthand.c:300
msgid "The client is missing a capability that this server needs."
msgstr "Asiakasohjelmasta puuttuu tämän palvelimen vaatima ominaisuus."
# Unliteral translation.
-#: server/connecthand.c:268 server/connecthand.c:279
+#: server/connecthand.c:302 server/connecthand.c:313
#, c-format
msgid "(%d) %s rejected: mismatched capabilities!"
msgstr "(%d) %s katkaistu: epäyhteensopivat ohjelmistot."
-#: server/connecthand.c:277
+#: server/connecthand.c:311
msgid "This server is missing a capability that the client needs."
msgstr "Palvelimesta puuttuu asiakasohjelman vaatima ominaisuus."
-#: server/connecthand.c:290
+#: server/connecthand.c:324
msgid "The username is invalid!"
msgstr "Käyttäjätunnus ei kelpaa!"
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:292
+#: server/connecthand.c:326
#, c-format
msgid "(%d) %s rejected: invalid username [%s]"
msgstr "(%d) %s jätetty ulkopuolelle: epäkelpo käyttäjänimi [%s]"
-#: server/connecthand.c:303
+#: server/connecthand.c:337
msgid "Your username is already connected!"
msgstr "Käyttäjänimesi on jo yhteydessä palvelimeen!"
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:305
+#: server/connecthand.c:339
#, c-format
msgid "(%d) %s rejected: duplicate username [%s]"
msgstr "(%d) %s jätetty ulkopuolelle: käyttäjänimi käytössä [%s]"
-#: server/connecthand.c:335 server/connecthand.c:344
+#: server/connecthand.c:369 server/connecthand.c:378
#, c-format
msgid "Lost connection: %s."
msgstr "Yhteys katkesi: %s."
@@ -2979,110 +3009,110 @@ msgstr "OK. Standardityyli valittu."
msgid "For introductory help, type 'help'."
msgstr "Jos haluat esittelyn, kirjoita 'help'."
-#: server/diplhand.c:164
+#: server/diplhand.c:167
#, c-format
msgid "The %s can't accept %s."
msgstr "%s eivät voi hyväksyä tarjousta (%s)."
-#: server/diplhand.c:176
+#: server/diplhand.c:179
#, c-format
msgid "You don't have tech %s, you can't accept treaty."
msgstr "Sinulla ei ole teknologiaa %s, et voi hyväksyä sopimusta."
-#: server/diplhand.c:185
+#: server/diplhand.c:188
msgid "City you are trying to give no longer exists, you can't accept treaty."
msgstr "Yrität antaa kaupungin, jota ei enää ole. Et voi hyväksyä sopimusta."
-#: server/diplhand.c:191
+#: server/diplhand.c:194
#, c-format
msgid "You are not owner of %s, you can't accept treaty."
msgstr "%s ei ole sinun, et voi hyväksyä sopimusta."
-#: server/diplhand.c:197 server/diplhand.c:301
+#: server/diplhand.c:200 server/diplhand.c:304
#, c-format
msgid "Your capital (%s) is requested, you can't accept treaty."
msgstr "Vastapuoli haluaa pääkaupunkisi (%s). Et voi hyväksyä sopimusta."
-#: server/diplhand.c:224
+#: server/diplhand.c:227
msgid "You don't have enough gold, you can't accept treaty."
msgstr "Rahasi eivät riitä. Et voi hyväksyä sopimusta."
-#: server/diplhand.c:256 server/diplhand.c:261
+#: server/diplhand.c:259 server/diplhand.c:264
#, c-format
msgid "A treaty containing %d clause was agreed upon."
msgid_plural "A treaty containing %d clauses was agreed upon."
msgstr[0] "%d-kohtainen sopimus hyväksyttiin."
msgstr[1] "%d-kohtainen sopimus hyväksyttiin."
-#: server/diplhand.c:277 server/diplhand.c:281
+#: server/diplhand.c:280 server/diplhand.c:284
#, c-format
msgid "One of the cities the %s are giving away is destroyed! Treaty canceled!"
msgstr "Yksi kaupungeista, joita %s on antamassa, on tuhottu! Sopimus peruttu!"
-#: server/diplhand.c:288 server/diplhand.c:293
+#: server/diplhand.c:291 server/diplhand.c:296
#, c-format
msgid "The %s no longer control %s! Treaty canceled!"
msgstr "%s eivät enää omista kaupunkia %s! Sopimus peruutettu!"
-#: server/diplhand.c:331 server/diplhand.c:335
+#: server/diplhand.c:334 server/diplhand.c:338
#, c-format
msgid "The %s don't have the promised amount of gold! Treaty canceled!"
msgstr "%s eivät kykene maksamaan sovittua kultamäärää! Sopimus peruutettu!"
-#: server/diplhand.c:364
+#: server/diplhand.c:367
#, c-format
msgid "You gave an embassy to %s."
msgstr "Olet perustanut lähetystön kaupunkiin %s."
-#: server/diplhand.c:367
+#: server/diplhand.c:370
#, c-format
msgid "%s allowed you to create an embassy!"
msgstr "%s salli sinun perustaa lähetystön!"
-#: server/diplhand.c:383
+#: server/diplhand.c:386
#, c-format
msgid "You are taught the knowledge of %s."
msgstr "Saat uutta tietoa: %s opittu."
-#: server/diplhand.c:387
+#: server/diplhand.c:390
#, c-format
msgid "The %s have acquired %s from the %s."
msgstr "%s saivat edistysaskeleen %s, luovuttajina %s."
-#: server/diplhand.c:402
+#: server/diplhand.c:405
#, c-format
msgid "You get %d gold."
msgstr "Saat %d kultaa."
#. TRANS: ... Polish worldmap.
-#: server/diplhand.c:410
+#: server/diplhand.c:413
#, c-format
msgid "You receive the %s worldmap."
msgstr "%s näyttävät maailmankarttansa."
#. TRANS: ... Polish seamap.
-#: server/diplhand.c:419
+#: server/diplhand.c:422
#, c-format
msgid "You receive the %s seamap."
msgstr "%s näyttävät merikarttansa."
-#: server/diplhand.c:436
+#: server/diplhand.c:439
#, c-format
msgid "You receive city of %s from %s."
msgstr "%2$s antoivat sinulle kaupungin %1$s."
-#: server/diplhand.c:441
+#: server/diplhand.c:444
#, c-format
msgid "You give city of %s to %s."
msgstr "%2$s saa sinulta kaupungin %1$s."
-#: server/diplhand.c:454 server/diplhand.c:457
+#: server/diplhand.c:457 server/diplhand.c:460
#, c-format
msgid "You agree on a cease-fire with %s."
msgstr "Sinä ja %s sovitte tulitauosta."
#. TRANS: ... the Poles ... Polish territory.
-#: server/diplhand.c:476 server/diplhand.c:488
+#: server/diplhand.c:479 server/diplhand.c:491
#, c-format
msgid ""
"You agree on an armistice with the %s. In %d turn, it will become a peace "
@@ -3097,32 +3127,32 @@ msgstr[1] ""
"Sinä ja %s sovitte aselevosta. %d vuoron jälkeen siitä tulee rauhansopimus. "
"Siirrä yksikkösi pois %s alueelta."
-#: server/diplhand.c:512 server/diplhand.c:515
+#: server/diplhand.c:515 server/diplhand.c:518
#, c-format
msgid "You agree on an alliance with %s."
msgstr "%s ovat nyt liittolaisesi."
-#: server/diplhand.c:524
+#: server/diplhand.c:527
#, c-format
msgid "You give shared vision to %s."
msgstr "%s näkee nyt sen mitä sinäkin."
-#: server/diplhand.c:527
+#: server/diplhand.c:530
#, c-format
msgid "%s gives you shared vision."
msgstr "%s jakaa näkymänsä kanssasi."
-#: server/diplhand.c:663
+#: server/diplhand.c:666
#, c-format
msgid "%s canceled the meeting!"
msgstr "%s peruutti tapaamisen!"
-#: server/diplhand.c:670
+#: server/diplhand.c:673
#, c-format
msgid "Meeting with %s canceled."
msgstr "%s ei voikaan tavata sinua..."
-#: server/diplhand.c:712
+#: server/diplhand.c:715
msgid "Your diplomatic envoy was decapitated!"
msgstr "Diplomaattiselta viestinviejältäsi katkaistiin kaula!"
@@ -3314,39 +3344,39 @@ msgid "The %s destroyed the %s in %s."
msgstr "%s tuhosivat kohteen %s kaupungissa %s."
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1091
+#: server/diplomats.c:1097
#, c-format
msgid "An enemy %s has been eliminated by your %s."
msgstr "Yksikkösi %2$s eliminoi vihollisen yksikön %1$s."
#. TRANS: <unit> ... <city> ... <diplomat>
-#: server/diplomats.c:1098
+#: server/diplomats.c:1104
#, c-format
msgid "Your %s has been eliminated defending %s against a %s."
msgstr "Puolustava %s kaupungissa %s tuhoutui, kun %s yritti tunkeutua sinne."
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1106
+#: server/diplomats.c:1112
#, c-format
msgid "Your %s has been eliminated defending against a %s."
msgstr "Puolustava %s kaupungissa tuhoutui, kun %s yritti tunkeutua sinne."
-#: server/diplomats.c:1119
+#: server/diplomats.c:1125
#, c-format
msgid "Your %s was eliminated by a defending %s."
msgstr "Lähettämäsi %s tuhoutui - puolustanut %s oli liian kova pala."
-#: server/diplomats.c:1127
+#: server/diplomats.c:1133
#, c-format
msgid "Eliminated %s %s while infiltrating %s."
msgstr "%s %s tuhoutui yrittäessään soluttautua kaupunkiin %s."
-#: server/diplomats.c:1134
+#: server/diplomats.c:1140
#, c-format
msgid "Eliminated %s %s while infiltrating our troops."
msgstr "%s %s tuhoutui yrittäessään soluttautua joukkoihimme."
-#: server/diplomats.c:1185
+#: server/diplomats.c:1191
#, c-format
msgid ""
"Your %s has successfully completed the mission and returned unharmed to %s."
@@ -3354,43 +3384,43 @@ msgstr ""
"Lähettämäsi %s onnistui tehtävässään ja palasi vahingoittumattomana "
"kaupunkiin %s."
-#: server/diplomats.c:1204
+#: server/diplomats.c:1210
#, c-format
msgid "Your %s was captured after completing the mission in %s."
msgstr "Lähettämäsi %s onnistui tehtävässään, mutta jäi kiinni kaupungissa %s."
-#: server/diplomats.c:1210
+#: server/diplomats.c:1216
#, c-format
msgid "Your %s was captured after completing the mission."
msgstr "Lähettämäsi %s onnistui tehtävässään, mutta jäi kiinni."
-#: server/diplomats.c:1242
+#: server/diplomats.c:1248
#, c-format
msgid "You have caused an incident while bribing the %s %s."
msgstr "Olet aiheuttanut selkkauksen %s yksikön %s lahjontayrityksellä."
-#: server/diplomats.c:1247
+#: server/diplomats.c:1253
#, c-format
msgid "%s has caused an incident while bribing your %s."
msgstr "%s on aiheuttanut selkkauksen lahjoessaan yksikköäsi %s."
-#: server/diplomats.c:1254
+#: server/diplomats.c:1260
#, c-format
msgid "You have caused an incident while attempting to steal tech from %s."
msgstr ""
"Olet aiheuttanut selkkauksen varastaessasi teknologiaa - %s raivostuivat."
-#: server/diplomats.c:1258
+#: server/diplomats.c:1264
#, c-format
msgid "%s has caused an incident while attempting to steal tech from you."
msgstr "%s on aiheuttanut selkkauksen varastaessaan teknologiaa sinulta."
-#: server/diplomats.c:1264
+#: server/diplomats.c:1270
#, c-format
msgid "You have caused an incident while inciting a revolt in %s."
msgstr "Olet aiheuttanut selkkauksen lietsoessasi kapinaa kaupungissa %s."
-#: server/diplomats.c:1268
+#: server/diplomats.c:1274
#, c-format
msgid "%s have caused an incident while inciting a revolt in %s."
msgstr "%s ovat aiheuttaneet selkkauksen lietsoessaan kapinaa kaupungissa %s."
@@ -3509,12 +3539,12 @@ msgstr ""
"rautatiet.\n"
" Työläiset pitävät talkoot ja rakentavat rautatien joka kaupunkiin."
-#: server/maphand.c:1418
+#: server/maphand.c:1425
#, c-format
msgid "Moved your %s due to changing terrain."
msgstr "Yksikkösi %s on siirretty muuttuneen maaston takia."
-#: server/maphand.c:1436
+#: server/maphand.c:1443
#, c-format
msgid "Disbanded your %s due to changing terrain."
msgstr "Yksikkösi %s on lakkautettu muuttuneen maaston takia."
@@ -3523,7 +3553,7 @@ msgstr "Yksikkösi %s on lakkautettu muuttuneen maaston takia."
msgid "Not reporting to the metaserver in this game."
msgstr "En lähetä raportteja metapalvelimelle tässä pelissä."
-#: server/meta.c:430
+#: server/meta.c:432
#, c-format
msgid "Metaserver: bad address: [%s:%d]."
msgstr "Välipalvelin: epäkelpo osoite: [%s:%d]."
@@ -3653,26 +3683,26 @@ msgstr ""
"Joukkuetoverisi %s ja liittolaisesi %s ovat nyt sodassa. Sinulla ei ole "
"vaihtoehtoa, %s ei voi enää olla liittolaisesi."
-#: server/plrhand.c:1103
+#: server/plrhand.c:1115
#, c-format
msgid "Removing player %s."
msgstr "Pelaaja %s on poistettu pelistä."
-#: server/plrhand.c:1105
+#: server/plrhand.c:1117
msgid "You've been removed from the game!"
msgstr "Sinut on poistettu pelistä!"
-#: server/plrhand.c:1108
+#: server/plrhand.c:1120
#, c-format
msgid "%s has been removed from the game."
msgstr "%s on poistettu pelistä."
-#: server/plrhand.c:1153 server/plrhand.c:1158
+#: server/plrhand.c:1167 server/plrhand.c:1172
#, c-format
msgid "You have made contact with the %s, ruled by %s."
msgstr "Olet kohdannut %s, joita hallitsee %s."
-#: server/plrhand.c:1178
+#: server/plrhand.c:1192
#, c-format
msgid ""
"%s and %s meet and go to instant war. You cancel your alliance with both."
@@ -3680,30 +3710,30 @@ msgstr ""
"%s ja %s ovat kohdanneet ja julistaneet välittömästi sodan. Peruutat "
"liittoutumasi molempien kanssa."
-#: server/plrhand.c:1656
+#: server/plrhand.c:1670
#, 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:1663
+#: server/plrhand.c:1677
#, c-format
msgid "Could not throw %s into civil war - no available nations"
msgstr "%s eivät voi vajota sisällissotaan - pelissä on liikaa pelaajia"
-#: server/plrhand.c:1686
+#: server/plrhand.c:1700
#, c-format
msgid ""
"Your nation is thrust into civil war! %s is declared the leader of the rebel "
"states."
-msgstr "Sisällissota syttyy: %s nimitetään kapinallisvaltion johtajaksi!"
+msgstr "Sisällissota syttyy: %s nimitetään kapinallisvaltion hallitsijaksi!"
-#: server/plrhand.c:1707
+#: server/plrhand.c:1721
#, c-format
msgid "%s declares allegiance to %s."
msgstr "%s vannoo uskollisuutta uudelle hallitsijalle (%s)."
-#: server/plrhand.c:1722
+#: server/plrhand.c:1736
#, c-format
msgid ""
"Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3899,67 +3929,67 @@ msgid "Wonders of the World"
msgstr "Maailman ihmeet"
# The scale probably isn't precise enough to suffer from miles-to-kilometers swap.
-#: server/report.c:547
+#: server/report.c:552
msgid " sq. mi."
msgstr " km^2"
-#: server/report.c:557
+#: server/report.c:562
msgid " M tons"
msgstr " M t"
-#: server/report.c:562
+#: server/report.c:567
msgid " M goods"
msgstr " M tuotteita"
-#: server/report.c:567
+#: server/report.c:572
msgid " bulbs"
msgstr " lamppua"
-#: server/report.c:572
+#: server/report.c:577
msgid " month"
msgid_plural " months"
msgstr[0] " kk"
msgstr[1] " kk"
-#: server/report.c:577
+#: server/report.c:582
msgid " ton"
msgid_plural " tons"
msgstr[0] " t"
msgstr[1] " t"
# You shouldn't assume a language can fix ordinals by appending letters in the end.
-#: server/report.c:591
+#: server/report.c:596
msgid "st"
msgstr "."
-#: server/report.c:593
+#: server/report.c:598
msgid "nd"
msgstr "."
-#: server/report.c:595
+#: server/report.c:600
msgid "rd"
msgstr "."
-#: server/report.c:597
+#: server/report.c:602
msgid "th"
msgstr "."
-#: server/report.c:700
+#: server/report.c:705
msgid "Demography string contains invalid characters. Try \"help demography\"."
msgstr ""
"Väestötietomerkkijonossa on sopimattomia merkkejä. Katso \"help demography\"."
-#: server/report.c:743 server/report.c:768
+#: server/report.c:748 server/report.c:773
msgid "Demographics Report:"
msgstr "Väestökatsaus:"
-#: server/report.c:744
+#: server/report.c:749
msgid "Sorry, the Demographics report is unavailable."
msgstr "Ikävä kyllä väestökatsaus ei ole saatavilla."
#. TRANS: <nation adjective> <government name> (<year>).
#. * E.g. "Polish Despotism (200 AD)".
-#: server/report.c:750
+#: server/report.c:755
#, c-format
msgid "%s %s (%s)"
msgstr "%s %s (%s)"
@@ -3970,11 +4000,11 @@ msgstr "%s %s (%s)"
msgid "Could not find a readable \"%s.%s\" ruleset file."
msgstr "En löytänyt lukukelpoista \"%s.%s\"-sääntökokoelmatiedostoa."
-#: server/ruleset.c:2356
+#: server/ruleset.c:2366
msgid "No barbarian nation in rulesets, at least one required!"
msgstr "Sääntökokoelmista puuttuu barbaarivaltio, joita oltava ainakin yksi!"
-#: server/ruleset.c:3166
+#: server/ruleset.c:3178
msgid "Loading rulesets"
msgstr "Lataan sääntökokoelmaa"
@@ -3989,18 +4019,18 @@ msgstr ""
"tallennettu peli on vanha, tai tiedosto voi olla viallinen. Jatka omalla "
"vastuullasi."
-#: server/savegame.c:3588
+#: server/savegame.c:3587
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."
#. TRANS: Fatal error message.
-#: server/savegame.c:3815
+#: server/savegame.c:3817
msgid ""
"Saved game uses the \"classic\" terrain ruleset, and is no longer supported."
msgstr ""
"Tallennettu peli käyttää \"klassista\" maastosäännöstöä, jota ei enää tueta."
-#: server/savegame.c:3824
+#: server/savegame.c:3826
#, c-format
msgid ""
"Warning: Different rulesetdirs ('%s' and '%s') are no longer supported. "
@@ -4010,7 +4040,7 @@ msgstr ""
"Käytetään hakemistoa '%s'."
#. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4051
+#: server/savegame.c:4055
#, c-format
msgid "%s had invalid nation; changing to %s."
msgstr "%s johtaa epäkelpoa kansakuntaa; vaihdetaan tilalle %s."
@@ -4043,7 +4073,7 @@ msgstr "Sisäiset"
msgid "Networking"
msgstr "Verkkoon liittyvät"
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:734
#: client/gui-win32/dialogs.c:532
msgid "All"
msgstr "Kaikki"
@@ -5148,7 +5178,7 @@ msgstr "Aika clientin leikkaamiseen"
#: server/settings.c:934
msgid ""
"If a client doesn't reply to a PING in this time the client is disconnected."
-msgstr "Jos client-ohjelma ei vastaa PINGiin tässä ajassa, yhteys katkaistaan."
+msgstr "Jos asiakasohjelma ei vastaa PINGiin tässä ajassa, yhteys katkaistaan."
#: server/settings.c:940
msgid "Turn-blocking game play mode"
@@ -5271,13 +5301,13 @@ msgstr ""
"vuoro. Näitä tilastoja voidaan käyttää valta/voima-kuvaajien luomiseen pelin "
"päätyttyä."
-#: server/sernet.c:150
+#: server/sernet.c:151
msgid "Server cannot read standard input. Ignoring input."
msgstr ""
"Palvelin ei saa luettua STDIN:iä. Sen kautta tulevat komennot jätetään "
"huomiotta."
-#: server/sernet.c:929
+#: server/sernet.c:933
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr "Palvelin: epäkelpo osoite: [%s:%d]."
@@ -5355,48 +5385,48 @@ msgstr "Avaruusaluksessasi on jo maksimimäärä aurinkopaneeleita!"
msgid "Without guidance from the capital, the %s spaceship is lost!"
msgstr "%s pääkaupungin myötä menetettiin avaruusaluskin!"
-#: server/srv_main.c:240
+#: server/srv_main.c:242
msgid "Game ended in a draw as end year exceeded"
msgstr "Peli päättyi tasapeliin, kun lopetusvuosi ylittyi"
-#: server/srv_main.c:274
+#: server/srv_main.c:276
#, c-format
msgid "The %s spaceship has arrived at Alpha Centauri."
msgstr "%s avaruusalus on laskeutunut Alpha Centauriin."
-#: server/srv_main.c:287 server/srv_main.c:322
+#: server/srv_main.c:289 server/srv_main.c:324
#, c-format
msgid "Team victory to %s"
msgstr "Joukkuevoitto joukkueelle %s"
-#: server/srv_main.c:297 server/srv_main.c:338
+#: server/srv_main.c:299 server/srv_main.c:340
#, c-format
msgid "Game ended in victory for %s"
msgstr "Peli päättyi, %s voitti"
-#: server/srv_main.c:345
+#: server/srv_main.c:347
msgid "Game ended in a draw"
msgstr "Peli päättyi tasapeliin"
-#: server/srv_main.c:461 server/srv_main.c:472
+#: server/srv_main.c:465 server/srv_main.c:476
#, c-format
msgid "Your %s was disbanded in accordance with your peace treaty with the %s."
msgstr "%s lakkautettu rauhansopimuksen perusteella - %s arvostavat."
-#: server/srv_main.c:512 server/srv_main.c:516
+#: server/srv_main.c:516 server/srv_main.c:520
#, c-format
msgid ""
"Concerned citizens point out that the cease-fire with %s will run out soon."
msgstr ""
"%s aiheuttaa huolta: kansalaiset muistuttavat tulitauon päättyvän pian."
-#: server/srv_main.c:521 server/srv_main.c:525
+#: server/srv_main.c:525 server/srv_main.c:529
#, c-format
msgid "The cease-fire with %s has run out. You are now at war with the %s."
msgstr ""
"%s ilmoittaa, että tulitauko on päättynyt. %s ja sinä olette nyt sodassa."
-#: server/srv_main.c:542
+#: server/srv_main.c:546
#, c-format
msgid ""
"Ceasefire between %s and %s has run out. They are at war. You cancel your "
@@ -5405,102 +5435,102 @@ msgstr ""
"%s ja %s ovat nyt sodassa tulitauon päätyttyä. Purat liittosi molempien "
"kanssa."
-#: server/srv_main.c:961
+#: server/srv_main.c:997
#, c-format
msgid "Failed saving game as %s"
msgstr "Pelin tallennus tiedostoon %s epäonnistui"
-#: server/srv_main.c:963
+#: server/srv_main.c:999
#, c-format
msgid "Game saved as %s"
msgstr "Peli tallennettu tiedostoon %s"
-#: server/srv_main.c:994
+#: server/srv_main.c:1030
msgid "The game is already running."
msgstr "Peli on jo käynnissä."
-#: server/srv_main.c:1002
+#: server/srv_main.c:1038
#, 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:1009
+#: server/srv_main.c:1045
msgid "Starting game."
msgstr "Aloitan pelin."
-#: server/srv_main.c:1071
+#: server/srv_main.c:1112
#, c-format
msgid "request for unknown report (type %d)"
msgstr "tuntemattoman raporttityypin pyyntö (tyyppi %d)"
-#: server/srv_main.c:1136
+#: server/srv_main.c:1177
#, c-format
msgid "Warning: rejecting old client %s"
msgstr "Varoitus: hylättiin vanha asiakasohjelma %s\""
-#: server/srv_main.c:1238
+#: server/srv_main.c:1279
#, 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:1338
+#: server/srv_main.c:1381
msgid "Please choose a non-blank name."
msgstr "Ole hyvä ja valitse nimi joka ei ole tyhjä."
-#: server/srv_main.c:1354
+#: server/srv_main.c:1397
msgid "That nation is already in use."
msgstr "Valitsemasi kansakunta on jo käytössä."
-#: server/srv_main.c:1370
+#: server/srv_main.c:1413
#, 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:1391
+#: server/srv_main.c:1434
msgid "Please choose a name containing only ASCII characters."
msgstr "Ole hyvä ja valitse nimi jossa on vain ASCII-kirjaimia."
-#: server/srv_main.c:1490
+#: server/srv_main.c:1533
#, c-format
msgid "%s nation is not available in this scenario."
msgstr "Kansakunta (%s) ei ole saatavilla tässä skenaariossa."
-#: server/srv_main.c:1496
+#: server/srv_main.c:1539
#, 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:1514
+#: server/srv_main.c:1557
#, c-format
msgid "%s is the %s ruler %s."
msgstr "%s on %s hallitsija %s."
-#: server/srv_main.c:1570
+#: server/srv_main.c:1613
#, 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:1614 server/srv_main.c:1618
+#: server/srv_main.c:1657 server/srv_main.c:1661
#, 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:1760
+#: server/srv_main.c:1803
#, c-format
msgid "Player %d"
msgstr "Pelaaja %d"
-#: server/srv_main.c:1771 server/srv_main.c:1777
+#: server/srv_main.c:1814 server/srv_main.c:1820
#, c-format
msgid "%s rules the %s."
msgstr "%s sai johtaakseen %s."
-#: server/srv_main.c:1942
+#: server/srv_main.c:1985
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
@@ -5508,249 +5538,237 @@ msgstr ""
"Tämä civ-palvelinohjelma tukee käyttäjien kirjautumista (autentikaatiota), "
"mutta se ei ole tällä hetkellä käytössä."
-#: server/srv_main.c:1993
+#: server/srv_main.c:2037
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr "Lähetän tietoa metapalvelimelle [%s]"
-#: server/srv_main.c:2024
+#: server/srv_main.c:2069
msgid "The game is over..."
msgstr "Peli päättyy..."
-#: server/srv_main.c:2237
+#: server/srv_main.c:2286
msgid "Now accepting new client connections."
-msgstr "Vastaanotan nyt uusia client-yhteydenottoja."
-
-#: server/stdinhand.c:246
-#, c-format
-msgid "Vote \"%s\" is passed %d to %d with %d abstentions."
-msgstr ""
-"Äänestyksen \"%s\" tulos on myöntävä, %d puolesta, %d vastaan ja %d tyhjää."
-
-#: server/stdinhand.c:253
-#, c-format
-msgid "Vote \"%s\" failed with %d against, %d for and %d abstentions."
-msgstr ""
-"Äänestyksen \"%s\" tulos on kieltävä, %d vastaan, %d puolesta ja %d tyhjää."
+msgstr "Vastaanotan nyt uusia asiakkaiden yhteydenottoja."
#. TRANS: ambiguous command
-#: server/stdinhand.c:365
+#: server/stdinhand.c:284
msgid "(ambiguous)"
msgstr "(epäselvä)"
#. TRANS: unrecognized command
#. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:416
+#: server/stdinhand.c:287 client/citydlg_common.c:419
#: 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 "(tuntematon)"
-#: server/stdinhand.c:458
+#: server/stdinhand.c:377
msgid "Name is empty, so cannot be a player."
msgstr "Nimi on tyhjä, joten tämä ei voi olla pelaaja."
-#: server/stdinhand.c:462
+#: server/stdinhand.c:381
msgid "Name is too long, so cannot be a player."
msgstr "Nimi on liian pitkä, joten tämä ei voi olla pelaaja."
-#: server/stdinhand.c:466
+#: server/stdinhand.c:385
#, c-format
msgid "Player name prefix '%s' is ambiguous."
msgstr "Pelaajanimen etuliite '%s' ei ole yksiselitteinen."
-#: server/stdinhand.c:470
+#: server/stdinhand.c:389
#, c-format
msgid "No player by the name of '%s'."
msgstr "Pelaajaa nimellä '%s' ei ole."
-#: server/stdinhand.c:474 server/stdinhand.c:509
+#: server/stdinhand.c:393 server/stdinhand.c:428
#, c-format
msgid "Unexpected match_result %d (%s) for '%s'."
msgstr "Odottamaton match_result (osumatulos) %d (%s) haulle '%s'."
-#: server/stdinhand.c:493
+#: server/stdinhand.c:412
msgid "Name is empty, so cannot be a connection."
msgstr "Nimi on tyhjä, joten tämä ei voi olla pelaajayhteys."
-#: server/stdinhand.c:497
+#: server/stdinhand.c:416
msgid "Name is too long, so cannot be a connection."
msgstr "Nimi on liian pitkä, joten tämä ei voi olla pelaajayhteys."
-#: server/stdinhand.c:501
+#: server/stdinhand.c:420
#, c-format
msgid "Connection name prefix '%s' is ambiguous."
msgstr "Pelaajayhteyden nimen etuliite '%s' on moniselitteinen."
-#: server/stdinhand.c:505
+#: server/stdinhand.c:424
#, c-format
msgid "No connection by the name of '%s'."
msgstr "Ei pelaajayhteyttä nimellä '%s'."
-#: server/stdinhand.c:525
+#: server/stdinhand.c:444
#, c-format
msgid "Open metaserver connection to [%s]."
msgstr "Avaa yhteys välityspalvelimeen [%s]."
-#: server/stdinhand.c:538
+#: server/stdinhand.c:457
#, c-format
msgid "Close metaserver connection to [%s]."
msgstr "Yhteys välityspalvelimeen [%s] katkaistu."
-#: server/stdinhand.c:553
+#: server/stdinhand.c:472
msgid "Metaserver connection is open."
msgstr "Yhteys välityspalvelimeen on muodostettu."
-#: server/stdinhand.c:556
+#: server/stdinhand.c:475
msgid "Metaserver connection is closed."
msgstr "Yhteys välityspalvelimeen on katkaistu."
-#: server/stdinhand.c:566
+#: server/stdinhand.c:485
msgid "Metaserver connection is already open."
msgstr "Yhteys välityspalvelimeen on jo muodostettu."
-#: server/stdinhand.c:577
+#: server/stdinhand.c:496
msgid "Metaserver connection is already closed."
msgstr "Yhteys välityspalvelimeen on jo katkaistu."
-#: server/stdinhand.c:582
+#: server/stdinhand.c:501
msgid "Argument must be 'u', 'up', 'd', 'down', or '?'."
msgstr "Argumentin tulee olla 'u', 'up', 'd', 'down' tai '?'."
-#: server/stdinhand.c:603
+#: server/stdinhand.c:522
#, c-format
msgid "Metaserver patches string set to '%s'."
msgstr "Metapalvelimen paikkaustietorivi on nyt '%s'."
-#: server/stdinhand.c:606
+#: server/stdinhand.c:525
#, c-format
msgid "Metaserver patches string set to '%s', not reporting to metaserver."
msgstr ""
"Metapalvelimen paikkaustietorivi (patches) asetettu arvoksi '%s', en "
"raportoi metapalvelimelle."
-#: server/stdinhand.c:627
+#: server/stdinhand.c:546
#, c-format
msgid "Metaserver message string set to '%s'."
msgstr "Metapalvelimen viestirivi on nyt '%s'."
-#: server/stdinhand.c:630
+#: server/stdinhand.c:549
#, c-format
msgid "Metaserver message string set to '%s', not reporting to metaserver."
msgstr "Metapalvelimen viestirivi on nyt '%s', en raportoi metapalvelimelle."
-#: server/stdinhand.c:650
+#: server/stdinhand.c:569
#, c-format
msgid "Metaserver is now [%s]."
msgstr "Välityspalvelin on nyt [%s]."
-#: server/stdinhand.c:660
+#: server/stdinhand.c:579
#, c-format
msgid "Server id: %s"
msgstr "Palvelimen tunniste: %s"
-#: server/stdinhand.c:757
+#: server/stdinhand.c:676
msgid "You cannot save games manually on this server."
msgstr "Et voi tallentaa pelejä käsin tällä palvelimella."
-#: server/stdinhand.c:774
+#: server/stdinhand.c:693
msgid "Cannot toggle a barbarian player."
msgstr "Barbaaripelaajaa ei voi muuttaa."
-#: server/stdinhand.c:781
+#: server/stdinhand.c:700
#, c-format
msgid "%s is now under AI control."
msgstr "%s on nyt AI:n ohjaama."
-#: server/stdinhand.c:802
+#: server/stdinhand.c:721
#, c-format
msgid "%s is now under human control."
msgstr "%s on nyt ihmisen ohjaama."
-#: server/stdinhand.c:847
+#: server/stdinhand.c:766
msgid "Can't add AI players once the game has begun."
msgstr "AI:n ohjaamia pelaajia ei voi lisätä pelin alettua."
-#: server/stdinhand.c:867
+#: server/stdinhand.c:786
msgid "Can't add more players, server is full."
msgstr "Palvelin on täynnä, en voi lisätä enempää pelaajia."
-#: server/stdinhand.c:874
+#: server/stdinhand.c:793
msgid "Can't use an empty name."
msgstr "En voi käyttää tyhjää nimeä."
-#: server/stdinhand.c:881
+#: server/stdinhand.c:800
#, c-format
msgid "That name exceeds the maximum of %d chars."
msgstr "Nimi on liian pitkä, yläraja on %d merkkiä."
-#: server/stdinhand.c:887
+#: server/stdinhand.c:806
msgid "That name is not allowed."
msgstr "Antamasi nimi ei ole sallittu."
-#: server/stdinhand.c:893
+#: server/stdinhand.c:812
msgid "A player already exists by that name."
msgstr "Nimi on jo toisen pelaajan käytössä."
-#: server/stdinhand.c:899
+#: server/stdinhand.c:818
msgid "A user already exists by that name."
msgstr "Nimi on jo toisen pelaajan käytössä."
-#: server/stdinhand.c:925
+#: server/stdinhand.c:844
#, c-format
msgid "%s has been added as an AI-controlled player."
msgstr "AI-pelaaja %s lisätty."
-#: server/stdinhand.c:932
+#: server/stdinhand.c:851
#, c-format
msgid "Error creating new AI player: %s."
msgstr "Virhe luotaessa uutta AI-pelaajaa: %s."
-#: server/stdinhand.c:966
+#: server/stdinhand.c:885
msgid "Players cannot be removed once the game has started."
msgstr "Pelaajia ei voi poistaa kun peli on alkanut."
-#: server/stdinhand.c:977
+#: server/stdinhand.c:896
#, c-format
msgid "Removed player %s from the game."
msgstr "Pelaaja %s on poistettu pelistä."
-#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
+#: server/stdinhand.c:935 server/stdinhand.c:3372 server/stdinhand.c:3507
#, c-format
msgid "Name \"%s\" disallowed for security reasons."
msgstr "Nimi \"%s\" on kielletty tietoturvasyistä."
-#: server/stdinhand.c:1029
+#: server/stdinhand.c:948
#, c-format
msgid "No command script found by the name \"%s\"."
msgstr "Komentojuontotiedostoa ('skripti') ei löytynyt nimellä \"%s\"."
-#: server/stdinhand.c:1037
+#: server/stdinhand.c:956
#, c-format
msgid "Loading script file: %s"
msgstr "Lataan juontotiedostoa: %s"
-#: server/stdinhand.c:1052
+#: server/stdinhand.c:971
#, c-format
msgid "Cannot read command line scriptfile '%s'."
msgstr "Komentolinjan juontotiedoston ('skripti') '%s' lukeminen epäonnistui."
-#: server/stdinhand.c:1054
+#: server/stdinhand.c:973
#, c-format
msgid "Could not read script file '%s'."
msgstr "Juontotiedoston ('skripti') '%s' lukeminen epäonnistui."
-#: server/stdinhand.c:1146
+#: server/stdinhand.c:1065
#, c-format
msgid "Could not write script file '%s'."
msgstr "Juontotiedostoon ('skripti') '%s' kirjoittaminen epäonnistui."
-#: server/stdinhand.c:1158
+#: server/stdinhand.c:1077
msgid "You cannot use the write command on this server for security reasons."
msgstr "Et voi käyttää write-komentoa tällä palvelimella tietoturvasyistä."
-#: server/stdinhand.c:1186
+#: server/stdinhand.c:1105
#, c-format
msgid ""
"Cannot decrease command access level '%s' for connection '%s'; you only have "
@@ -5758,235 +5776,229 @@ msgid ""
msgstr ""
"Et voi laskea pelaajan '%2$s' komentotasoa '%1$s'; sinulla on vain '%3$s'."
-#: server/stdinhand.c:1241
+#: server/stdinhand.c:1114
+#, 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:1163
#, c-format
msgid ""
"Anyone can now become game organizer '%s' by issuing the 'first' command."
msgstr ""
"Kuka tahansa voi ryhtyä pelinohjaajaksi '%s' käyttämällä komentoa 'first'."
-#: server/stdinhand.c:1274
+#: server/stdinhand.c:1187
msgid "Command access levels in effect:"
msgstr "Käytössä olevat komentotasot:"
-#: server/stdinhand.c:1282
+#: server/stdinhand.c:1194
#, c-format
msgid "Command access level for new connections: %s"
msgstr "Komentotaso uusille yhteydenottajille: %s"
-#: server/stdinhand.c:1285
+#: server/stdinhand.c:1197
#, c-format
msgid "Command access level for first player to take it: %s"
msgstr "Komentotaso ensimmäiselle ottajalle: %s"
-#: server/stdinhand.c:1294
+#: server/stdinhand.c:1206
msgid ""
"Error: command access level must be one of 'none', 'info', 'ctrl', or 'hack'."
msgstr "Virhe: komentotason tulee olla 'none', 'info', 'ctrl' tai 'hack'."
-#: server/stdinhand.c:1299
+#: server/stdinhand.c:1211
#, c-format
msgid ""
"Cannot increase command access level to '%s'; you only have '%s' yourself."
msgstr ""
"Et voi nostaa komentotasoa arvoon '%s'; oma tasosi '%s' ei riitä siihen."
-#: 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: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:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
+#: server/stdinhand.c:1238 server/stdinhand.c:1252 server/stdinhand.c:1273
#, c-format
msgid "Command access level set to '%s' for new players."
msgstr "Komentojen taso uusille pelaajille asetettu arvoon '%s'."
-#: server/stdinhand.c:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
+#: server/stdinhand.c:1243 server/stdinhand.c:1257 server/stdinhand.c:1267
#, c-format
msgid "Command access level set to '%s' for first player to grab it."
msgstr "Komentotaso ensimmäiselle ottajalle: %s"
-#: server/stdinhand.c:1402
+#: server/stdinhand.c:1302
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:1406
+#: server/stdinhand.c:1306
#, 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:1411
+#: server/stdinhand.c:1311
msgid "Someone else already is game organizer."
msgstr "Joku muu on jo pelinohjaaja."
-#: server/stdinhand.c:1416
+#: server/stdinhand.c:1316
#, c-format
msgid "Connection %s has opted to become the game organizer."
msgstr "Yhteys %s on tarjoutunut pelinohjaajaksi."
-#: server/stdinhand.c:1467
+#: server/stdinhand.c:1367
#, c-format
msgid "Invalid argument %d."
msgstr "Kelvoton argumentti %d."
-#: server/stdinhand.c:1474
+#: server/stdinhand.c:1374
msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
msgstr "Käyttö: timeoutincrease <vuoro> <vuorolisä> <arvo> <arvokerroin>."
-#: server/stdinhand.c:1482
+#: server/stdinhand.c:1382
#, c-format
msgid "Dynamic timeout set to %d %d %d %d"
msgstr "Dynaaminen vuoron aikaraja asetettu arvoiksi %d %d %d %d."
-#: server/stdinhand.c:1542 server/stdinhand.c:1545
+#: server/stdinhand.c:1442 server/stdinhand.c:1445
msgid "Option:"
msgstr "Asetus:"
-#: server/stdinhand.c:1555 server/stdinhand.c:4031
+#: server/stdinhand.c:1455 server/stdinhand.c:4079
msgid "Description:"
msgstr "Kuvaus:"
-#: server/stdinhand.c:1560
+#: server/stdinhand.c:1460
#, c-format
msgid "Status: %s"
msgstr "Tila: %s"
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "changeable"
msgstr "on muutettavissa"
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "fixed"
msgstr "kiinteä"
-#: server/stdinhand.c:1567
+#: server/stdinhand.c:1467
#, c-format
msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
msgstr "Arvo: %d, alaraja: 0, oletus: %d, yläraja: 1"
-#: server/stdinhand.c:1572
+#: server/stdinhand.c:1472
#, c-format
msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
msgstr "Arvo: %d, alaraja: %d, oletus: %d, yläraja: %d"
-#: server/stdinhand.c:1578
+#: server/stdinhand.c:1478
#, c-format
msgid "Value: \"%s\", Default: \"%s\""
msgstr "Arvo: \"%s\", oletus: \"%s\""
-#: server/stdinhand.c:1597
+#: server/stdinhand.c:1497
msgid "Explanations are available for the following server options:"
msgstr "Seuraavista palvelimen asetuksista on saatavilla seloste:"
-#: server/stdinhand.c:1643
+#: server/stdinhand.c:1537
msgid "No explanation for that yet."
msgstr "Tuolle ei ole vielä selostetta."
-#: server/stdinhand.c:1646 server/stdinhand.c:2480
+#: server/stdinhand.c:1540 server/stdinhand.c:2468
msgid "Ambiguous option name."
msgstr "Asetuksen nimi ei ole yksiselitteinen."
-#: server/stdinhand.c:1666
+#: server/stdinhand.c:1560
#, c-format
msgid "Server Operator: %s"
msgstr "Palvelinoperaattori: %s"
-#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
+#: server/stdinhand.c:1686 server/stdinhand.c:1713 server/stdinhand.c:1731
#, c-format
msgid "Player '%s' now has AI skill level '%s'."
msgstr "Pelaajan '%s' AI-vaikeustaso on nyt '%s'."
-#: server/stdinhand.c:1822
+#: server/stdinhand.c:1718
#, c-format
msgid "%s is not controlled by the AI."
msgstr "%s ei ole AI:n ohjauksessa."
-#: server/stdinhand.c:1842
+#: server/stdinhand.c:1738
#, c-format
msgid "Default AI skill level set to '%s'."
msgstr "AI:n vaikeustason oletusarvo on nyt '%s'."
-#: server/stdinhand.c:1857 server/stdinhand.c:2162
+#: server/stdinhand.c:1753
msgid "This command is client only."
-msgstr "Tämä komento on vain client-ohjelman käytettävissä."
+msgstr "Tämä komento on vain asiakasohjelman käytettävissä."
-#: server/stdinhand.c:1860
+#: server/stdinhand.c:1756
msgid "Usage: away"
msgstr "Käyttö: away"
-#: server/stdinhand.c:1865
+#: server/stdinhand.c:1761
msgid "Only players may use the away command."
msgstr "Vain pelaajat voivat käyttää away-komentoa."
-#: server/stdinhand.c:1869
+#: server/stdinhand.c:1765
#, c-format
msgid "%s set to away mode."
msgstr "%s on poissa-tilassa."
-#: server/stdinhand.c:1877
+#: server/stdinhand.c:1772
#, c-format
msgid "%s returned to game."
msgstr "%s palasi pelin ääreen."
-#: server/stdinhand.c:1919
+#: server/stdinhand.c:1817
#, 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:1925
+#: server/stdinhand.c:1823
#, c-format
msgid "Unknown option '%s'."
msgstr "Tuntematon asetusparametri '%s'."
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1848
msgid "All options with non-default values"
msgstr "Asetukset joilla on oletuksesta poikkeava arvo"
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1851
msgid "All options"
msgstr "Kaikki asetukset"
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1854
msgid "Vital options"
msgstr "Keskeiset asetukset"
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1857
msgid "Situational options"
msgstr "Tilannekohtaiset asetukset"
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1860
msgid "Rarely used options"
msgstr "Harvinaiset asetukset"
-#: server/stdinhand.c:1965
+#: server/stdinhand.c:1863
msgid "+ means you may change the option"
msgstr "+ tarkoittaa että voit muuttaa asetusta"
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1864
msgid "= means the option is on its default value"
msgstr "= tarkoittaa että asetus on oletusarvossaan"
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
#, c-format
msgid "%-*s value (min,max) "
msgstr "%-*s arvo (min, maks)"
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
msgid "Option"
msgstr "Asetus"
-#: server/stdinhand.c:1973
+#: server/stdinhand.c:1871
msgid "description"
msgstr "kuvaus"
-#: server/stdinhand.c:2042
+#: server/stdinhand.c:1940
msgid ""
"Try 'show situational' or 'show rare' to show more options.\n"
"Try 'show changed' to show settings with non-default values."
@@ -5995,78 +6007,150 @@ msgstr ""
"asetuksia.\n"
"Komento 'show changed' näyttää asetukset, joiden arvo eroaa oletuksesta."
-#: server/stdinhand.c:2092
+#: server/stdinhand.c:1966
msgid "Cannot change teams once game has begun."
msgstr "Joukkueita ei voi vaihtaa pelin alettua."
-#: server/stdinhand.c:2102
+#: server/stdinhand.c:1976
msgid "Undefined argument. Usage: team <player> <team>."
msgstr "Parametriä ei ole määritelty. Käyttö: team <pelaaja> <joukkue>."
-#: server/stdinhand.c:2122
+#: server/stdinhand.c:1996
#, 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:2129
+#: server/stdinhand.c:2003
msgid "Cannot team a barbarian."
msgstr "Barbaarit eivät voi kuulua joukkueeseen."
-#: server/stdinhand.c:2135
+#: server/stdinhand.c:2009
#, c-format
msgid "Player %s set to team %s."
msgstr "Pelaaja %s on nyt joukkueessa %s."
-#: 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:2035 server/voting.c:512
+msgid "Teamvote"
+msgstr "Joukkueäänestys"
-#: server/stdinhand.c:2165
-msgid "Observers cannot vote."
-msgstr "Tarkkailijat eivät voi äänestää."
+#: server/stdinhand.c:2035 server/voting.c:516
+msgid "Vote"
+msgstr "Äänestys"
-#: server/stdinhand.c:2168
+#: server/stdinhand.c:2037
+#, c-format
msgid ""
-"You can only vote in a running game. Use 'first' to become the game "
-"organizer if there currently is none."
+"%s %d \"%s\" (needs %0.0f%%%s): %d for, %d against, and %d abstained out of %"
+"d players."
msgstr ""
-"Voit äänestää vain käynnissä olevassa pelissä. Käytä 'first'-komentoa "
-"ryhtyäksesi pelinohjaajaksi jos sellaista ei ole."
+"%s %d \"%s\" (vaaditaan %0.0f%%%s): %d puolesta, %d vastaan, ja %d tyhjää "
+"kaikkiaan %d pelaajasta."
-#: 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:2041
+msgid " no dissent"
+msgstr " yksimielinen päätös"
-#: server/stdinhand.c:2188
+#: server/stdinhand.c:2049
msgid "There are no votes going on."
msgstr "Yhtään äänestystä ei ole käynnissä."
-#: server/stdinhand.c:2208
-msgid "No legal last vote."
-msgstr "Kelvollista viimeisintä äänestystä ei ole."
+#: server/stdinhand.c:2077
+msgid "Invalid arguments. Usage: vote yes|no|abstain [vote number]."
+msgstr ""
+"Parametri ei kelpaa. Käyttö: vote yes|no|abstain [äänestyksen nro]. 'Yes' on "
+"puolesta, 'no' vastaan, 'abstain' on tyhjä ääni."
+
+#: server/stdinhand.c:2095 server/stdinhand.c:2213 server/stdinhand.c:3714
+msgid "You are not allowed to use this command."
+msgstr "Sinulla ei ole lupaa käyttää tätä komentoa."
+
+#: server/stdinhand.c:2104
+#, c-format
+msgid "The argument \"%s\" is ambigious."
+msgstr "Parametri \"%s\" ei ole yksiselitteinen."
+
+#: server/stdinhand.c:2119
+msgid "There are no votes running."
+msgstr "Yhtään äänestystä ei ole käynnissä."
+
+#: server/stdinhand.c:2121
+#, c-format
+msgid "No legal last vote (%d %s)."
+msgstr "Kelvollista viimeisintä äänestystä ei ole (%d %s)."
-#: server/stdinhand.c:2213
-msgid "Value must be integer."
+#: server/stdinhand.c:2122
+msgid "other vote running"
+msgid_plural "other votes running"
+msgstr[0] "muu äänestys käynnissä"
+msgstr[1] "muuta äänestystä käynnissä"
+
+#: server/stdinhand.c:2129 server/stdinhand.c:2491 server/stdinhand.c:2532
+msgid "Value must be an integer."
msgstr "Arvon pitää olla kokonaisluku."
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2135 server/stdinhand.c:2221
#, c-format
msgid "No such vote (%d)."
msgstr "Äänestystä %d ei ole."
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2141
+msgid "You are not allowed to vote on that."
+msgstr "Et voi osallistua tähän äänestykseen."
+
+#: server/stdinhand.c:2146
#, c-format
msgid "You voted for \"%s\""
-msgstr "Äänestit ehdotuksen \"%s\" puolesta."
+msgstr "Äänestit ehdotuksen \"%s\" puolesta"
-#: server/stdinhand.c:2232
+#: server/stdinhand.c:2150
#, c-format
msgid "You voted against \"%s\""
msgstr "Äänestit ehdotusta \"%s\" vastaan"
-#: server/stdinhand.c:2259
+#: server/stdinhand.c:2155
+#, c-format
+msgid "You abstained from voting on \"%s\""
+msgstr "Äänestit tyhjää ehdotuksen \"%s\" suhteen"
+
+#: server/stdinhand.c:2190
+msgid "Missing argument <vote number> or the string \"all\"."
+msgstr ""
+
+#: server/stdinhand.c:2197
+#, fuzzy
+msgid "You don't have any vote going on."
+msgstr "Täällä ei ole työvoimaa."
+
+#: server/stdinhand.c:2204
+#, fuzzy
+msgid "There isn't any vote going on."
+msgstr "Yhtään äänestystä ei ole käynnissä."
+
+#: server/stdinhand.c:2209
+msgid "Server: All votes have been removed."
+msgstr ""
+
+#: server/stdinhand.c:2226
+#, fuzzy, c-format
+msgid "You are not allowed to cancel this vote (%d)."
+msgstr "Sinulla ei ole tarvittavia oikeuksia tämän asetuksen muuttamiseen."
+
+#: server/stdinhand.c:2232
+msgid "Usage: /cancelvote [<vote number>|all]"
+msgstr ""
+
+#: server/stdinhand.c:2241
+#, c-format
+msgid "Server: %s cancelled the vote \"%s\" (number %d)."
+msgstr ""
+
+#: server/stdinhand.c:2247
+#, c-format
+msgid "Server: The vote \"%s\" (number %d) has been cancelled."
+msgstr ""
+
+#: server/stdinhand.c:2265
msgid ""
"Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
"<x> <y> | unit <id> | tech <player> | timing | info>."
@@ -6074,129 +6158,125 @@ 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:2265
+#: server/stdinhand.c:2271
msgid "Can only use this command once game has begun."
msgstr "Komentoa voi käyttää vain pelin alettua."
-#: server/stdinhand.c:2294
+#: server/stdinhand.c:2300
#, c-format
msgid "%s diplomacy no longer debugged"
msgstr "Pelaajan %s diplomatiaa ei enää debugata"
-#: server/stdinhand.c:2298
+#: server/stdinhand.c:2304
#, c-format
msgid "%s diplomacy debugged"
msgstr "Pelaajan %s diplomatiaa debugataan"
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2323
#, c-format
msgid "%s tech no longer debugged"
msgstr "Pelaajan %s teknologiaa ei enää debugata"
-#: server/stdinhand.c:2321
+#: server/stdinhand.c:2327
#, c-format
msgid "%s tech debugged"
msgstr "Pelaajan %s teknologiaa debugataan"
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2358 server/stdinhand.c:2388
msgid "Value 2 & 3 must be integer."
msgstr "Arvojen 2 ja 3 pitää olla kokonaislukuja."
-#: server/stdinhand.c:2356 server/stdinhand.c:2386
+#: server/stdinhand.c:2362 server/stdinhand.c:2392
msgid "Bad map coordinates."
msgstr "Karttakoordinaatit ovat epäkelvot."
-#: server/stdinhand.c:2361
+#: server/stdinhand.c:2367
msgid "No city at this coordinate."
msgstr "Näissä koordinaateissa ei ole kaupunkia."
-#: server/stdinhand.c:2366
+#: server/stdinhand.c:2372
#, c-format
msgid "%s no longer debugged"
msgstr "Kohdetta %s ei enää debugata"
-#: server/stdinhand.c:2392 server/stdinhand.c:2422
+#: server/stdinhand.c:2398 server/stdinhand.c:2428
#, c-format
msgid "%s %s no longer debugged."
msgstr "%s %s ei ole enää debugattavana."
-#: server/stdinhand.c:2397 server/stdinhand.c:2427
+#: server/stdinhand.c:2403 server/stdinhand.c:2433
#, c-format
msgid "%s %s debugged."
msgstr "%s %s debugattu."
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2419
msgid "Value 2 must be integer."
msgstr "Arvon 2 pitää olla kokonaisluku."
-#: server/stdinhand.c:2417
+#: server/stdinhand.c:2423
#, c-format
msgid "Unit %d does not exist."
msgstr "Yksikköä %d ei ole olemassa."
-#: server/stdinhand.c:2475
+#: server/stdinhand.c:2464
msgid "Undefined argument. Usage: set <option> <value>."
msgstr "Argumenttia ei ole määritelty. Käyttö: set <asetus> <arvo>."
-#: server/stdinhand.c:2485
+#: server/stdinhand.c:2473
msgid "You are not allowed to set this option."
msgstr "Sinulla ei ole tarvittavia oikeuksia tämän asetuksen muuttamiseen."
-#: server/stdinhand.c:2490 server/stdinhand.c:3463
+#: server/stdinhand.c:2478 server/stdinhand.c:3501
msgid "This setting can't be modified after the game has started."
msgstr "Tätä asetusta ei voida muuttaa pelin alettua."
-#: server/stdinhand.c:2502 server/stdinhand.c:2543
-msgid "Value must be an integer."
-msgstr "Arvon pitää olla kokonaisluku."
-
-#: server/stdinhand.c:2512
+#: server/stdinhand.c:2501
#, c-format
msgid "The parameter %s should only contain digits 0-1."
msgstr "Parametrin %s tulisi sisältää vain numeroita 0 ja 1."
-#: server/stdinhand.c:2519
+#: server/stdinhand.c:2508
msgid "Value out of range (minimum: 0, maximum: 1)."
msgstr "Arvon tulee olla välillä 0 - 1."
-#: server/stdinhand.c:2534 server/stdinhand.c:2576
+#: server/stdinhand.c:2523 server/stdinhand.c:2565
#, c-format
msgid "Option: %s has been set to %d."
msgstr "Asetus: %s on muutettu arvoon %d."
-#: server/stdinhand.c:2554
+#: server/stdinhand.c:2543
#, c-format
msgid "The parameter %s should only contain +- and 0-9."
msgstr "Parametrin %s tulisi sisältää vain +- ja numeroita 0-9."
-#: server/stdinhand.c:2561
+#: server/stdinhand.c:2550
#, c-format
msgid "Value out of range (minimum: %d, maximum: %d)."
msgstr "Virhe: Arvon tulee olla välillä %d - %d."
-#: server/stdinhand.c:2586
+#: server/stdinhand.c:2575
msgid "String value too long. Usage: set <option> <value>."
msgstr "Merkkijonoarvo on liian pitkä. Käyttö: set <asetus> <arvo>."
-#: server/stdinhand.c:2600
+#: server/stdinhand.c:2589
#, c-format
msgid "Option: %s has been set to \"%s\"."
msgstr "Asetus: %s on asetettu arvoon \"%s\"."
-#: server/stdinhand.c:2658
+#: server/stdinhand.c:2652
msgid "Sorry, one can't observe globally in this game."
msgstr "Tässä pelissä ei voi tarkkailla koko maailmaa."
-#: server/stdinhand.c:2661
+#: server/stdinhand.c:2655
msgid "Sorry, you can't take a global observer. Observe it instead."
msgstr "Et voi ottaa yleistä tarkkailijaa hallintaasi: tarkkaile sitä."
-#: server/stdinhand.c:2671
+#: server/stdinhand.c:2665
msgid "You cannot take a new player at this time."
msgstr "Et voi ottaa hallintaasi uutta pelaajaa tässä vaiheessa peliä."
#. TRANS: Do not translate "maxplayers".
-#: server/stdinhand.c:2679
+#: server/stdinhand.c:2673
#, c-format
msgid ""
"You cannot take a new player because the maximum of %d player has already "
@@ -6211,76 +6291,76 @@ msgstr[1] ""
"Et voi ottaa uutta pelaajaa hallintaasi, koska %d pelaajan maksimi on jo "
"saavutettu (maxplayers-asetus)."
-#: server/stdinhand.c:2691
+#: server/stdinhand.c:2685
msgid "You cannot take a new player because there are no free player slots."
msgstr ""
"Et voi ottaa uutta pelaajaa hallintaasi, koska vapaita pelaajapaikkoja ei "
"ole."
-#: server/stdinhand.c:2702
+#: server/stdinhand.c:2696
msgid "Sorry, one can't observe barbarians in this game."
msgstr "Tässä pelissä ei voi tarkkailla barbaareja."
-#: server/stdinhand.c:2705
+#: server/stdinhand.c:2699
msgid "Sorry, one can't take barbarians in this game."
msgstr "Tässä pelissä ei voi hallita barbaareja."
-#: server/stdinhand.c:2713
+#: server/stdinhand.c:2707
msgid "Sorry, one can't observe dead players in this game."
msgstr "Tässä pelissä ei voi seurata kuolleita pelaajia."
-#: server/stdinhand.c:2716
+#: server/stdinhand.c:2710
msgid "Sorry, one can't take dead players in this game."
msgstr "Tässä pelissä ei voi hallita kuolleita pelaajia."
-#: server/stdinhand.c:2724
+#: server/stdinhand.c:2718
msgid "Sorry, one can't observe AI players in this game."
msgstr "Tässä pelissä ei voi tarkkailla AI-pelaajia."
-#: server/stdinhand.c:2727
+#: server/stdinhand.c:2721
msgid "Sorry, one can't take AI players in this game."
msgstr "Tässä pelissä ei voi hallita AI-pelaajia."
-#: server/stdinhand.c:2736
+#: server/stdinhand.c:2730
msgid "Sorry, one can't observe human players in this game."
msgstr "Tässä pelissä ei voi tarkkailla ihmispelaajia."
-#: server/stdinhand.c:2739
+#: server/stdinhand.c:2733
msgid "Sorry, one can't take human players in this game."
msgstr "Tässä pelissä ei voi ottaa hallintaan ihmispelaajia."
-#: server/stdinhand.c:2749
+#: server/stdinhand.c:2743
msgid "Sorry, one can't observe in this game."
msgstr "Tässä pelissä ei voi tarkkailla."
-#: server/stdinhand.c:2754
+#: server/stdinhand.c:2748
msgid "Sorry, one can't take players in this game."
msgstr "Tässä pelissä ei voi ottaa pelaajia hallintaan."
-#: server/stdinhand.c:2760
+#: server/stdinhand.c:2754
msgid "Sorry, one can't take players already connected in this game."
msgstr "Tässä pelissä ei voi ottaa hallintaan jo yhdistettyjä pelaajia."
-#: server/stdinhand.c:2791
+#: server/stdinhand.c:2785
msgid "Usage: observe [connection-name [player-name]]"
msgstr "Käyttö: observe [yhteyden nimi] <pelaajan nimi>"
-#: server/stdinhand.c:2797
+#: server/stdinhand.c:2791
msgid "Usage: observe [player-name]"
msgstr "Käyttö: observe <pelaajan nimi>"
-#: server/stdinhand.c:2847
+#: server/stdinhand.c:2841
#, 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:2858
+#: server/stdinhand.c:2852
#, c-format
msgid "%s is already observing %s."
msgstr "%s tarkkailee jo pelaajaa %s."
-#: server/stdinhand.c:2863
+#: server/stdinhand.c:2857
#, c-format
msgid "%s is already observing."
msgstr "%s on jo tarkkailija."
@@ -6295,236 +6375,240 @@ msgstr "%s tarkkailee nyt pelaajaa %s."
msgid "%s now observes"
msgstr "%s on nyt tarkkailija"
-#: server/stdinhand.c:2969
+#: server/stdinhand.c:2971
msgid "Usage: take <connection-name> <player-name>"
msgstr "Käyttö: take <yhteyden nimi> <pelaajan nimi>"
-#: server/stdinhand.c:2974
+#: server/stdinhand.c:2976
msgid "Usage: take <player-name>"
msgstr "Käyttö: take <pelaajan nimi>"
-#: server/stdinhand.c:2980
+#: server/stdinhand.c:2982
msgid "Usage: take [connection-name] <player-name>"
msgstr "Käyttö: take [yhteyden nimi] <pelaajan nimi>"
-#: server/stdinhand.c:3010
+#: server/stdinhand.c:3012
#, c-format
msgid "%s already controls %s."
msgstr "%s hallitsee jo pelaajaa %s."
-#: server/stdinhand.c:3024
+#: server/stdinhand.c:3026
#, c-format
msgid "There is no free player slot for %s."
msgstr "Vapaata paikkaa pelaajalle %s ei ole."
-#: server/stdinhand.c:3059
+#: server/stdinhand.c:3061
#, c-format
msgid "being detached from %s."
msgstr "irroittaudutaan pelaajasta %s."
-#: server/stdinhand.c:3135
+#: server/stdinhand.c:3146
#, c-format
msgid "%s now controls %s (%s, %s)."
msgstr "%s hallitsee nyt pelaajaa %s (%s, %s)."
-#: server/stdinhand.c:3139 server/stdinhand.c:4260
+#: server/stdinhand.c:3150 server/stdinhand.c:4308
#: data/nation/barbarian.ruleset:3
msgid "Barbarian"
msgstr "Barbaari"
-#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
+#: server/stdinhand.c:3152 server/stdinhand.c:4310 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-sdl/plrdlg.c:645
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr "AI"
-#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-gtk-2.0/pages.c:2125
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
+#: server/stdinhand.c:3153 server/stdinhand.c:4312
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-gtk-2.0/pages.c:2127
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/connectdlg.c:215
msgid "Human"
msgstr "ihminen"
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-gtk-2.0/pages.c:2124 client/gui-win32/connectdlg.c:200
-#: client/gui-win32/connectdlg.c:212
+#: server/stdinhand.c:3155 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-gtk-2.0/pages.c:2126 client/gui-win32/connectdlg.c:202
+#: client/gui-win32/connectdlg.c:214
msgid "Alive"
msgstr "elossa"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3156 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-win32/connectdlg.c:202
msgid "Dead"
msgstr "kuollut"
-#: server/stdinhand.c:3147
+#: server/stdinhand.c:3159
#, c-format
msgid "%s failed to attach to any player."
msgstr "%s ei saanut kytkeydyttyä yhteenkään pelaajaan."
-#: server/stdinhand.c:3182
+#: server/stdinhand.c:3194
msgid "Usage: detach <connection-name>"
msgstr "Käyttö: detach <yhteysnimi>"
-#: server/stdinhand.c:3202
+#: server/stdinhand.c:3214
msgid "You can not detach other users."
msgstr "Et voi irrottaa muita käyttäjiä."
-#: server/stdinhand.c:3211
+#: server/stdinhand.c:3223
#, c-format
msgid "%s is not attached to any player."
msgstr "%s ei ole yhteydessä pelaajiin."
-#: server/stdinhand.c:3234
+#: server/stdinhand.c:3246
#, c-format
msgid "%s detaching from %s"
msgstr "%s irrottautuu pelaajasta %s"
-#: server/stdinhand.c:3240
+#: server/stdinhand.c:3252
#, c-format
msgid "%s no longer observing."
msgstr "%s ei enää tarkkaile."
-#: server/stdinhand.c:3259
+#: server/stdinhand.c:3271
#, c-format
msgid "detaching from %s."
msgstr "irrottaudutaan pelaajasta %s."
-#: server/stdinhand.c:3345
+#: server/stdinhand.c:3361
msgid "Usage: load <game name>"
msgstr "Käyttö: load <pelin nimi>"
-#: server/stdinhand.c:3350
+#: server/stdinhand.c:3366
msgid "Cannot load a game while another is running."
msgstr "Peliä ei voi ladata kun toinen peli on käynnissä."
-#: server/stdinhand.c:3372
+#: server/stdinhand.c:3388
#, c-format
msgid "Cannot find savegame or scenario with the name \"%s\"."
msgstr "En löydä tallennettua peliä tai skenaariota nimellä \"%s\"."
-#: server/stdinhand.c:3389
+#: server/stdinhand.c:3405
#, c-format
msgid "Could not load savefile: %s"
msgstr "Tallennustiedoston avaaminen epäonnistui: %s"
-#: server/stdinhand.c:3458
+#: server/stdinhand.c:3496
#, c-format
msgid "Current ruleset directory is \"%s\""
msgstr "Tämänhetkinen hakemistopolku sääntökokoelmille on: \"%s\""
-#: server/stdinhand.c:3478
+#: server/stdinhand.c:3516
#, c-format
msgid "Ruleset directory \"%s\" not found"
msgstr "Sääntökokoelmahakemistoa \"%s\" ei löydy"
-#: server/stdinhand.c:3484
+#: server/stdinhand.c:3522
#, c-format
msgid "Ruleset directory is already \"%s\""
msgstr "Sääntökokoelmahakemistoksi on jo asetettu \"%s\""
-#: server/stdinhand.c:3488
+#: server/stdinhand.c:3526
#, c-format
msgid "Ruleset directory set to \"%s\""
msgstr "%s asetettu sääntökokoelmahakemistoksi"
-#: server/stdinhand.c:3536
+#: server/stdinhand.c:3574
msgid "Goodbye."
msgstr "Näkemiin."
-#: server/stdinhand.c:3567
+#: server/stdinhand.c:3606
msgid "Sorry, you are not allowed to use server commands."
msgstr "Pahoittelen, sinulla ei ole lupaa käyttää palvelimen komentoja."
-#: server/stdinhand.c:3603
+#: server/stdinhand.c:3656
#, 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:3608
+#: server/stdinhand.c:3661
#, c-format
msgid "Unknown command. Try '%shelp'."
msgstr "Tuntematon käsky. Ks. '%shelp'."
-#: server/stdinhand.c:3625
-msgid "Your new vote canceled your previous vote."
+#: server/stdinhand.c:3675
+msgid "Your new vote cancelled your previous vote."
msgstr "Uusi äänesi peruutti edellisen äänesi."
-#: server/stdinhand.c:3633
+#: server/stdinhand.c:3688
+msgid "New teamvote"
+msgstr "Uusi joukkueäänestys"
+
+#: server/stdinhand.c:3691
+msgid "New vote"
+msgstr "Uusi äänestys"
+
+#: server/stdinhand.c:3695
#, c-format
-msgid "New vote (number %d) by %s: %s."
-msgstr "Uuden äänen (nro %d), antoi %s: %s."
+msgid "%s (number %d) by %s: %s"
+msgstr "%s (nro %d), avaajana %s: %s"
-#: server/stdinhand.c:3645
+#: server/stdinhand.c:3704
#, c-format
msgid "Your new vote (\"%s\") was not legal or was not recognized."
msgstr "Uusi äänesi (\"%s\") oli epäkelpo tai sitä ei tunnustettu."
-#: 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:3680
+#: server/stdinhand.c:3726
msgid "(server prompt)"
msgstr "(palvelinkehote)"
-#: server/stdinhand.c:3787
+#: server/stdinhand.c:3835
msgid "Game ended in a draw."
msgstr "Peli päättyi tasapeliin."
-#: server/stdinhand.c:3791
+#: server/stdinhand.c:3839
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:3796
+#: server/stdinhand.c:3844
msgid "Cannot end the game: no game running."
msgstr "En voi lopettaa peliä: yhtään peliä ei ole käynnissä."
-#: server/stdinhand.c:3812
+#: server/stdinhand.c:3860
#, c-format
msgid "%s has conceded the game and can no longer win."
msgstr "%s on luovuttanut pelin eikä voi enää voittaa."
-#: server/stdinhand.c:3817
+#: server/stdinhand.c:3865
msgid "You cannot surrender now."
msgstr "Et voi antautua nyt."
-#: server/stdinhand.c:3883
+#: server/stdinhand.c:3931
msgid "Not enough human players, game will not start."
msgstr "Pelaajia ei ole tarpeeksi, peliä ei aloiteta."
-#: server/stdinhand.c:3888
+#: server/stdinhand.c:3936
msgid "No players, game will not start."
msgstr "Pelaajia ei ole, peliä ei aloiteta."
-#: server/stdinhand.c:3892
+#: server/stdinhand.c:3940
msgid "Not enough nations for all players, game will not start."
msgstr "Pelaajille ei ole tarpeeksi kansakuntia, peliä ei aloiteta."
-#: server/stdinhand.c:3901
+#: server/stdinhand.c:3949
msgid "All players are ready; starting game."
msgstr "Pelaajat ovat valmiina; aloitetaan peli."
-#: server/stdinhand.c:3915
+#: server/stdinhand.c:3963
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:3922
+#: server/stdinhand.c:3970
msgid "Cannot start the game: it is already running."
msgstr "En voi aloittaa peliä: se on jo käynnissä."
-#: server/stdinhand.c:3953
+#: server/stdinhand.c:4001
#, c-format
msgid "Cutting connection %s."
msgstr "Katkaisen yhteyden %s."
-#: server/stdinhand.c:3972
+#: server/stdinhand.c:4020
msgid ""
"Welcome - this is the introductory help text for the Freeciv server.\n"
"\n"
@@ -6564,123 +6648,123 @@ msgstr ""
" save - tallenna tämänhetkinen peli\n"
" quit - poistu ohjelmasta"
-#: server/stdinhand.c:4007 server/stdinhand.c:4010
+#: server/stdinhand.c:4055 server/stdinhand.c:4058
msgid "Command:"
msgstr "Komento:"
-#: server/stdinhand.c:4014
+#: server/stdinhand.c:4062
msgid "Synopsis: "
msgstr "Yhteenveto: "
-#: server/stdinhand.c:4023
+#: server/stdinhand.c:4071
#, c-format
msgid "Level: %s"
msgstr "Taso: %s"
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4096
msgid "The following server commands are available:"
msgstr "Seuraavat palvelinkomennot ovat saatavilla:"
-#: server/stdinhand.c:4123
+#: server/stdinhand.c:4171
#, c-format
msgid "Help argument '%s' is ambiguous."
msgstr "Avun argumentti '%s' ei ole yksiselitteinen."
-#: server/stdinhand.c:4128
+#: server/stdinhand.c:4176
#, c-format
msgid "No match for help argument '%s'."
msgstr "Avun argumentille '%s' ei löytynyt vastinetta."
-#: server/stdinhand.c:4194
+#: server/stdinhand.c:4242
#, c-format
msgid "Bad list argument: '%s'. Try '%shelp list'."
msgstr "Kelvoton parametri komennolle 'list': '%s'. Ks. '%shelp list'."
-#: server/stdinhand.c:4234
+#: server/stdinhand.c:4282
msgid "List of players:"
msgstr "Pelaajaluettelo:"
-#: server/stdinhand.c:4239
+#: server/stdinhand.c:4287
msgid "<no players>"
msgstr "<ei pelaajia>"
-#: server/stdinhand.c:4256
+#: server/stdinhand.c:4304
#, c-format
msgid "user %s, "
msgstr "käyttäjä %s, "
-#: server/stdinhand.c:4267
+#: server/stdinhand.c:4315
msgid ", Dead"
msgstr ", kuollut"
-#: server/stdinhand.c:4270
+#: server/stdinhand.c:4318
#, c-format
msgid ", difficulty level %s"
msgstr ", vaikeusaste %s"
#. TRANS: continue list, in case comma is not the separator of choice.
-#: server/stdinhand.c:4275 server/stdinhand.c:4279 client/helpdata.c:257
-#: client/helpdata.c:752 client/text.c:241 client/text.c:1224
-#: client/text.c:1262
+#: server/stdinhand.c:4323 server/stdinhand.c:4327 client/helpdata.c:257
+#: client/helpdata.c:752 client/text.c:241 client/text.c:1229
+#: client/text.c:1267
#, c-format
msgid "?clistmore:, %s"
msgstr ", %s"
-#: server/stdinhand.c:4283
+#: server/stdinhand.c:4331
msgid ", ready"
msgstr ", valmis"
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4333
msgid ", not ready"
msgstr ", ei valmis"
-#: server/stdinhand.c:4293
+#: server/stdinhand.c:4341
#, c-format
msgid " %d connection:"
msgid_plural " %d connections:"
msgstr[0] " %d yhteys:"
msgstr[1] " %d yhteyttä:"
-#: server/stdinhand.c:4299
+#: server/stdinhand.c:4347
#, c-format
msgid " %s from %s (command access level %s), bufsize=%dkb"
msgstr " %s, yhteys %s (komentotaso %s), puskurikoko = %d kb"
-#: server/stdinhand.c:4304
+#: server/stdinhand.c:4352
msgid " (observer mode)"
msgstr " (tarkkailijamoodi)"
-#: server/stdinhand.c:4322
+#: server/stdinhand.c:4370
msgid "List of teams:"
msgstr "Joukkueluettelo:"
#. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4332
+#: server/stdinhand.c:4380
#, 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:4352
+#: server/stdinhand.c:4400
#, c-format
msgid "%2d : '%s' : 1 player : %s"
msgstr "%2d : '%s' : 1 pelaaja : %s"
-#: server/stdinhand.c:4360
+#: server/stdinhand.c:4408
#, c-format
msgid "Empty team: %s"
msgstr "Tyhjä joukkue: %s"
-#: server/stdinhand.c:4371
+#: server/stdinhand.c:4419
msgid "List of connections to server:"
msgstr "Lista yhteyksistä palvelimeen:"
-#: server/stdinhand.c:4375
+#: server/stdinhand.c:4423
msgid "<no connections>"
msgstr "<ei yhteyksiä>"
-#: server/stdinhand.c:4399
+#: server/stdinhand.c:4447
msgid "List of scenarios available:"
msgstr "Saatavilla olevat skenaariot:"
@@ -6699,7 +6783,7 @@ msgstr "%s ovat saavuttaneet Tulevaisuuden teknologian %d."
msgid "%s acquired from %s!"
msgstr "%s saatu, opettajina %s!"
-#: server/techtools.c:220
+#: server/techtools.c:221
#, c-format
msgid ""
"Discovery of %s makes the government form %s available. You may want to "
@@ -6708,37 +6792,37 @@ msgstr ""
"Edistysaskel %s mahdollistaa hallitusmuodon %s. Saatat haluta polkaista "
"vallankumouksen käyntiin."
-#: server/techtools.c:301
+#: server/techtools.c:302
#, c-format
msgid "Discovery of %s OBSOLETES %s in %s!"
msgstr "%s opittu, seurauksena %s VANHENTUU kaupungissa %s!"
-#: server/techtools.c:351
+#: server/techtools.c:352
#, c-format
msgid "Learned %s. Our scientists focus on %s; goal is %s."
msgstr "%s opittu. Tutkimuksen seuraavana kohteena %s, tavoitteena %s."
-#: server/techtools.c:369
+#: server/techtools.c:370
#, c-format
msgid "Learned %s. Scientists choose to research %s."
msgstr "%s opittu. Tutkimuksen seuraavana kohteena %s."
-#: server/techtools.c:376
+#: server/techtools.c:377
#, c-format
msgid "Learned %s. "
msgstr "%s opittu."
-#: server/techtools.c:379
+#: server/techtools.c:380
#, c-format
msgid "Researching %s."
msgstr "Tutkimuskohteena %s."
-#: server/techtools.c:385
+#: server/techtools.c:386
#, c-format
msgid "Learned %s. Scientists do not know what to research next."
msgstr "%s opittu. Tiedemiehet eivät tiedä, mitä tutkisivat seuraavaksi."
-#: server/techtools.c:402
+#: server/techtools.c:403
msgid ""
"Great scientists from all the world join your civilization: you get an "
"immediate advance."
@@ -6746,22 +6830,22 @@ msgstr ""
"Suuret filosofit ympäri maailmaa liittyvät riveihisi; saavutat välittömästi "
"edistysaskeleen."
-#: server/techtools.c:570
+#: server/techtools.c:571
#, c-format
msgid "Technology goal is %s."
msgstr "Teknologiatavoitteena on %s."
-#: server/techtools.c:700
+#: server/techtools.c:708
#, c-format
msgid "You steal %s from the %s."
msgstr "Varastat edistysaskeleen %s, kohteena %s."
-#: server/techtools.c:705
+#: server/techtools.c:713
#, c-format
msgid "The %s stole %s from you!"
msgstr "%s varastivat edistysaskeleen %s sinulta!"
-#: server/techtools.c:710
+#: server/techtools.c:718
#, c-format
msgid "The %s have stolen %s from the %s."
msgstr "%s varastivat edistysaskeleen %s, kohteena %s."
@@ -6785,188 +6869,194 @@ msgstr "Yhtään yksikköä ei voitu ajanmukaistaa."
msgid "%s upgraded to %s for %d gold."
msgstr "%s ajanmukaistettu yksiköksi %s %d kullasta."
-#: server/unithand.c:396
+#: server/unithand.c:402
#, c-format
msgid "%s refuses to disband!"
msgstr "%s vastustaa lakkauttamistaan!"
-#: server/unithand.c:449
+#: server/unithand.c:455
msgid "Can't place city here."
msgstr "Tähän ei voi rakentaa kaupunkia."
-#: server/unithand.c:456
+#: server/unithand.c:462
#, c-format
msgid "Only %s can build a city."
msgstr "Vain %s voi rakentaa kaupungin."
-#: server/unithand.c:461
+#: server/unithand.c:467
msgid "Can't build a city."
msgstr "Kaupungin rakentaminen ei onnistu."
-#: server/unithand.c:470
+#: server/unithand.c:476
#, c-format
msgid "Only %s can add to a city."
msgstr "Vain %s voi liittyä kaupunkiin."
-#: server/unithand.c:475
+#: server/unithand.c:481
msgid "Can't add to a city."
msgstr "Kaupunkiin liittyminen epäonnistui."
# Can settlers add population to a city?
-#: server/unithand.c:481
+#: server/unithand.c:487
#, c-format
msgid "%s unit has no moves left to add to %s."
msgstr ""
"%s yksiköllä ei ole tarpeeksi liikepisteitä jäljellä kasvattaakseen "
"kaupunkia %s."
-#: server/unithand.c:487
+#: server/unithand.c:493
#, c-format
msgid "%s unit has no moves left to build city."
msgstr ""
"%s yksiköllä ei ole tarpeeksi liikepisteitä jäljellä kaupungin rakentamiseen."
-#: server/unithand.c:492
+#. TRANS: <city> is owned by <nation>, cannot add <unit>.
+#: server/unithand.c:499
+#, c-format
+msgid "%s is owned by %s, cannot add %s."
+msgstr "Koska %s on %s kaupunki, %s ei voi liittyä siihen."
+
+#: server/unithand.c:506
#, c-format
msgid "%s is too big to add %s."
msgstr "%s on liian suuri, %s ei voi liittyä joukkoon."
-#: server/unithand.c:498
+#: server/unithand.c:512
#, c-format
msgid "%s needs an improvement to grow, so you cannot add %s."
msgstr "%s: kasvamiseen tarvitaan rakennushanke, %s ei voi liittyä."
-#: server/unithand.c:509
+#: server/unithand.c:523
#, c-format
msgid "Can't add %s to %s."
msgstr "%s ei voi liittyä kaupunkiin %s."
-#: server/unithand.c:531
+#: server/unithand.c:545
#, c-format
msgid "%s added to aid %s in growing."
msgstr "%s lisätty auttamaan kaupunkia %s kasvamaan."
-#: server/unithand.c:828
+#: server/unithand.c:842
msgid "Your Nuclear missile was shot down by SDI defences, what a waste."
msgstr "Ydinohjuksesi ammuttiin alas - kohteessa oli toimiva ohjustorjunta. "
-#: server/unithand.c:831
+#: server/unithand.c:845
#, c-format
msgid "The nuclear attack on %s was avoided by your SDI defense."
msgstr "Ohjustorjuntajärjestelmä pilasi ydiniskusi - %s ei vahingoittunut."
#. TRANS: "Your Cannon ... the Polish Destroyer."
-#: server/unithand.c:901
+#: server/unithand.c:915
#, c-format
msgid "Your %s survived the pathetic attack from the %s %s."
msgstr "Yksikkösi %s selviytyi %s yksikön (%s) surkeasta hyökkäyksestä."
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unithand.c:910
+#: server/unithand.c:924
#, c-format
msgid "Your attacking %s failed against the %s %s!"
msgstr "Hyökännyt yksikkösi %s hävisi - %s yksikkö %s voitti."
-#: server/unithand.c:983
+#: server/unithand.c:997
#, c-format
msgid "Only %s can attack from sea."
msgstr "Vain %s voi hyökätä mereltä."
-#: server/unithand.c:988
+#: server/unithand.c:1002
msgid "Cannot attack from sea."
msgstr "Merihyökkäys ei onnistu."
-#: server/unithand.c:996 server/unittools.c:2137
+#: server/unithand.c:1010 server/unittools.c:2142
msgid "Cannot attack unless you declare war first."
msgstr "Et voi hyökätä ennen sodanjulistusta."
-#: server/unithand.c:1001
+#: server/unithand.c:1015
#, c-format
msgid "%s can only move into your own zone of control."
msgstr "Yksikkösi %s voi liikkua vain itse valvomallesi alueelle."
-#: server/unithand.c:1007
+#: server/unithand.c:1021
#, c-format
msgid "Cannot invade unless you break peace with %s first."
msgstr ""
"Sinä ja %s olette solmineet rauhan, et voi hyökätä ennen sopimuksen purkua."
-#: server/unithand.c:1052
+#: server/unithand.c:1066
msgid "This unit has no moves left."
msgstr "Tällä yksiköllä ei ole liikepisteitä jäljellä."
-#: server/unithand.c:1107
+#: server/unithand.c:1121
msgid "Unit must be on land to perform diplomatic action."
msgstr "Yksikön pitää olla maissa toimiakseen diplomaattina."
-#: server/unithand.c:1109
+#: server/unithand.c:1123
msgid "No diplomat action possible."
msgstr "Diplomaattitoiminta ei ole mahdollista."
-#: server/unithand.c:1125
+#: server/unithand.c:1139
#, c-format
msgid "You must declare war on %s first. Try using players dialog (F3)."
msgstr ""
"Tämä vaatii että sinä ja %s olette julistaneet sodan. Käytä pelaajadialogia "
"(F3)."
-#: server/unithand.c:1143
+#: server/unithand.c:1157
msgid "This unit is being transported, and so cannot bombard."
msgstr "Tätä yksikköä kuljetetaan, joten se ei voi pommittaa."
-#: server/unithand.c:1158
+#: server/unithand.c:1172
msgid "You can't attack there."
msgstr "Et voi hyökätä sinne."
-#: server/unithand.c:1180
+#: server/unithand.c:1194
msgid "This type of troops cannot take over a city."
msgstr "Tämäntyyppinen yksikkö ei voi valloittaa kaupunkia."
-#: server/unithand.c:1198
+#: server/unithand.c:1212
msgid "A transported unit is not allied to all units or city on target tile."
msgstr ""
"Kuljetettu yksikkö ei ole liitossa kaikkien kohderuudun joukkojen tai sen "
"kaupungin kanssa."
-#: server/unithand.c:1240
+#: server/unithand.c:1254
#, c-format
msgid "Your %s helps build the %s in %s (%d remaining)."
msgstr "%s auttaa rakennushanketta %s kaupungissa %s (%d jäljellä)."
-#: server/unithand.c:1242
+#: server/unithand.c:1256
#, c-format
msgid "Your %s helps build the %s in %s (%d surplus)."
msgstr ""
"%s auttaa valmistelemaan rakennushanketta %s kaupungissa %s (%d "
"ylimääräistä)."
-#: server/unithand.c:1286
+#: server/unithand.c:1300
#, c-format
msgid ""
"Sorry, your %s cannot establish a trade route because it has no home city"
msgstr "%s ei voi luoda kauppareittiä, koska sillä ei ole kotikaupunkia"
-#: server/unithand.c:1296
+#: server/unithand.c:1310
#, c-format
msgid "Sorry, your %s cannot establish a trade route between %s and %s"
msgstr "%s ei voi luoda %s - %s -kauppareittiä"
-#: server/unithand.c:1325 server/unithand.c:1344
+#: server/unithand.c:1339 server/unithand.c:1358
#, c-format
msgid "Sorry, your %s cannot establish a trade route here!"
msgstr "%s ei voi luoda kauppareittiä tänne!"
-#: server/unithand.c:1329 server/unithand.c:1348
+#: server/unithand.c:1343 server/unithand.c:1362
#, c-format
msgid " The city of %s already has %d better trade routes!"
msgstr " Kaupungilla %s on jo %d parempaa kauppareittiä!"
-#: server/unithand.c:1361 server/unithand.c:1373
+#: server/unithand.c:1375 server/unithand.c:1387
#, c-format
msgid "Sorry, %s has canceled the trade route from %s to your city %s."
msgstr "%s on peruuttanut kauppareitin kaupungista %s kaupunkiisi %s."
-#: server/unithand.c:1406
+#: server/unithand.c:1420
#, c-format
msgid ""
"Your %s from %s has arrived in %s, and revenues amount to %d in gold and "
@@ -7028,57 +7118,57 @@ msgid "Teleported your %s to %s."
msgstr "%s siirrettiin kaupunkiin %s."
#. TRANS: A unit is moved to resolve stack conflicts.
-#: server/unittools.c:1065
+#: server/unittools.c:1070
#, c-format
msgid "Moved your %s."
msgstr "%s siirrettiin."
-#: server/unittools.c:1076
+#: server/unittools.c:1081
#, c-format
msgid "Disbanded your %s."
msgstr "%s lakkautettiin."
-#: server/unittools.c:1397
+#: server/unittools.c:1402
#, c-format
msgid "Unable to defend %s, %s has lost the game."
msgstr "Yksikön %s puolustaminen epäonnistui, %s on hävinnyt pelin."
-#: server/unittools.c:1401
+#: server/unittools.c:1406
#, c-format
msgid "Losing %s meant losing the game! Be more careful next time!"
msgstr ""
"Yksikön %s menettäminen sai sinut häviämään pelin - ole vähän varovaisempi "
"ensi kerralla!"
-#: server/unittools.c:1503
+#: server/unittools.c:1508
#, c-format
msgid "%s escaped the destruction of %s, and fled to %s."
msgstr "%s pakeni yksikön %s tuhoa ja pakeni kaupunkiin %s"
-#: server/unittools.c:1512
+#: server/unittools.c:1517
#, c-format
msgid "%s lost when %s was lost."
msgstr "%s menetetty yksikön %s mukana."
-#: server/unittools.c:1561
+#: server/unittools.c:1566
#, c-format
msgid "Barbarian leader captured, %d gold ransom paid."
msgstr "Barbaarijohtaja vangittu, %d kultaa maksettu lunnaina."
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unittools.c:1579
+#: server/unittools.c:1584
#, c-format
msgid "Your attacking %s succeeded against the %s %s!"
msgstr "Hyökännyt yksikkösi %s onnistui, %s %s kukistettiin!"
#. TRANS: "Cannon ... the Polish Destroyer."
-#: server/unittools.c:1588 server/unittools.c:1646
+#: server/unittools.c:1593 server/unittools.c:1651
#, c-format
msgid "%s lost to an attack by the %s %s."
msgstr "%s menetettiin %s hyökättyä yksiköllään %s."
#. TRANS: "... Cannon ... the Polish Destroyer ...."
-#: server/unittools.c:1622
+#: server/unittools.c:1627
#, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -7090,14 +7180,14 @@ msgstr[1] ""
#. TRANS: "Cannon lost when the Polish Destroyer
#. * attacked the German Musketeers."
-#: server/unittools.c:1655
+#: server/unittools.c:1660
#, c-format
msgid "%s lost when the %s %s attacked the %s %s."
msgstr "%s menetettiin kun %s %s hyökkäsi kohteen %s %s kimppuun."
#. TRANS: "Musketeers (and Cannon) lost to an
#. * attack from the Polish Destroyer."
-#: server/unittools.c:1670
+#: server/unittools.c:1675
#, c-format
msgid "%s (and %s) lost to an attack from the %s %s."
msgstr "%s (ja %s) menetettiin kun %s %s hyökkäsi."
@@ -7105,7 +7195,7 @@ msgstr "%s (ja %s) menetettiin kun %s %s hyökkäsi."
#. TRANS: "Musketeers and 3 other units lost to
#. * an attack from the Polish Destroyer."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1680
+#: server/unittools.c:1685
#, 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."
@@ -7115,179 +7205,225 @@ msgstr[1] "%s ja %d lisäyksikköä menetetty kun %s %s hyökkäsi."
#. TRANS: "2 units lost when the Polish Destroyer
#. * attacked the German Musketeers."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1694
+#: server/unittools.c:1699
#, 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 yksikkö menetettiin kun %s %s hyökkäsi kohteenaan %s %s."
msgstr[1] "%d yksikköä menetettiin kun %s %s hyökkäsi kohteenaan %s %s."
-#: server/unittools.c:1962
+#: server/unittools.c:1967
#, c-format
msgid "Your %s was nuked by %s."
msgstr "Yksikkösi %s pamautettiin tuusannuuskaksi, %s ydiniskun takana."
-#: server/unittools.c:1965 server/unittools.c:1981
+#: server/unittools.c:1970 server/unittools.c:1986
msgid "yourself"
msgstr "sinä itse"
-#: server/unittools.c:1969
+#: server/unittools.c:1974
#, c-format
msgid "The %s %s was nuked."
msgstr "%s %s tuhottiin ydiniskussa."
-#: server/unittools.c:1978
+#: server/unittools.c:1983
#, c-format
msgid "%s was nuked by %s."
msgstr "%s pamautettiin tuusannuuskaksi, %s ydiniskun takana."
-#: server/unittools.c:1986
+#: server/unittools.c:1991
#, c-format
msgid "You nuked %s."
msgstr "Olet pamauttanut kohteen %s tuusannuuskaksi ydiniskussa."
-#: server/unittools.c:2027
+#: server/unittools.c:2032
#, c-format
msgid "The %s detonated a nuke!"
msgstr "%s räjäyttivät ydinohjuksen!"
-#: server/unittools.c:2051
+#: server/unittools.c:2056
#, c-format
msgid "%s transported successfully."
msgstr "%s on turvallisesti siirretty kohteeseensa."
-#: server/unittools.c:2103
+#: server/unittools.c:2108
msgid "This unit type can not be paradropped."
msgstr "Tämä yksikkö ei sovellu laskuvarjohyppelyyn."
-#: server/unittools.c:2113
+#: server/unittools.c:2118
msgid "You cannot paradrop a unit that is transporting other units."
msgstr "Yksikkö joka kuljettaa muita yksiköitä ei voi hypätä laskuvarjolla."
-#: server/unittools.c:2119
+#: server/unittools.c:2124
msgid "The destination location is not known."
msgstr "Kohderuutu on tuntematon."
-#: server/unittools.c:2126
+#: server/unittools.c:2131
#, c-format
msgid "This unit cannot paradrop into %s."
msgstr "%s on sopimaton laskuvarjohypyn laskeutumispaikka tälle yksikölle."
-#: server/unittools.c:2146
+#: server/unittools.c:2151
#, c-format
msgid "The distance to the target (%i) is greater than the unit's range (%i)."
msgstr "Etäisyys kohteesta (%i) ylittää yksikön toimintasäteen (%i)."
-#: server/unittools.c:2157
+#: server/unittools.c:2162
#, c-format
msgid "Your %s paradropped into the %s and was lost."
msgstr "Yksikkösi %s hyppäsi laskuvarjolla (alla %s) ja katosi."
-#: server/unittools.c:2170
+#: server/unittools.c:2175
#, c-format
msgid "Your %s was killed by enemy units at the paradrop destination."
msgstr "Maahanlaskupaikalla olleet viholliset tuhosivat yksikkösi %s."
-#: server/unittools.c:2192
+#: server/unittools.c:2197
#, c-format
msgid "You found %d gold."
msgstr "Löysit %d kultaa."
-#: server/unittools.c:2209
+#: server/unittools.c:2214
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr "%s opittiin vanhoista tietäjien kirjoituksista."
-#: server/unittools.c:2216
+#: server/unittools.c:2221
#, c-format
msgid "The %s have acquired %s from ancient scrolls of wisdom."
msgstr "%s ovat oppineet teknologian %s muinaisista kirjoituksista."
-#: server/unittools.c:2230
+#: server/unittools.c:2235
msgid "A band of friendly mercenaries joins your cause."
msgstr "Ryhmä palkkasotureita liittyy joukkoihisi."
-#: server/unittools.c:2248
+#: server/unittools.c:2253
msgid "An abandoned village is here."
msgstr "Täällä on vain hylätty kylä."
-#: server/unittools.c:2258
+#: server/unittools.c:2263
msgid "You have unleashed a horde of barbarians!"
msgstr "Olet joutunut keskelle barbaarijoukon leiriä!"
-#: server/unittools.c:2261
+#: server/unittools.c:2266
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr "Barbaarit tappoivat yksikkösi %s!"
-#: server/unittools.c:2277
+#: server/unittools.c:2282
msgid "You found a friendly city."
msgstr "Löysit kannattajakaupungin."
-#: server/unittools.c:2291
+#: server/unittools.c:2296
msgid "Friendly nomads are impressed by you, and join you."
msgstr "Joukko paimentolaisia liittyy seurueeseesi."
-#: server/unittools.c:2316
+#: server/unittools.c:2321
msgid "Your overflight frightens the tribe; they scatter in terror."
msgstr "Ylilentosi pelottaa alkukantaista heimoa; he hajaantuvat kauhuissaan."
-#: server/unittools.c:2574
+#: server/unittools.c:2579
#, c-format
msgid "Orders for %s aborted after enemy movement was spotted."
msgstr "%s keskeytti toimintansa havaittuaan vihollisen liikehdintää."
-#: server/unittools.c:3023
+#: server/unittools.c:3028
#, c-format
msgid "Orders for %s aborted as there are units nearby."
msgstr "%s keskeytti toimintansa, koska lähistöllä on yksiköitä."
-#: server/unittools.c:3075
+#: server/unittools.c:3080
#, c-format
msgid "Orders for %s aborted because building of city failed."
msgstr "%s keskeytti toimintansa, koska kaupungin rakentaminen epäonnistui."
-#: server/unittools.c:3088
+#: server/unittools.c:3093
#, c-format
msgid "Orders for %s aborted since they give an invalid activity."
msgstr ""
"%s kieltäytyy jatkamasta sopimattomiksi käyneiden komentojen seuraamista."
-#: server/unittools.c:3102
+#: server/unittools.c:3107
#, c-format
msgid "Orders for %s aborted since they give an invalid location."
msgstr "%s keskeytti liikkumisensa, koska kohdepaikka on sopimaton."
-#: server/unittools.c:3112
+#: server/unittools.c:3117
#, c-format
msgid "Orders for %s aborted as there are units in the way."
msgstr "%s keskeytti toimintansa, koska muut yksiköt ovat sen tiellä."
-#: server/unittools.c:3138
+#: server/unittools.c:3143
#, c-format
msgid "Orders for %s aborted because of failed move."
msgstr "%s keskeytti toimintansa, koska sen liikkuminen epäonnistui."
-#: server/unittools.c:3179
+#: server/unittools.c:3184
#, c-format
msgid "Attempt to change homecity for %s failed."
msgstr "Yksikön %s kotipaikan muutos epäonnistui."
-#: server/unittools.c:3190
+#: server/unittools.c:3195
#, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr "Yritys perustaa kauppareitti yksiköllä %s epäonnistui."
-#: server/unittools.c:3202
+#: server/unittools.c:3207
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr "Yritys rakentaa ihme yksiköllä %s epäonnistui."
-#: server/unittools.c:3211
+#: server/unittools.c:3216
#, c-format
msgid "Your %s has invalid orders."
msgstr "Yksikkösi %s ohjeet ovat kelvottomat."
+#: server/voting.c:522
+#, c-format
+msgid ""
+"%s %d \"%s\" is passed %d to %d with %d abstentions and %d who did not vote."
+msgstr ""
+"%s %d, \"%s\", on tulokseltaan myöntävä: %d puolesta, %d vastaan, %d tyhjää "
+"ja %d äänestämätöntä."
+
+#: server/voting.c:528
+#, c-format
+msgid ""
+"%s %d \"%s\" failed with %d against, %d for, %d abstentions and %d who did "
+"not vote."
+msgstr ""
+"%s %d, \"%s\", on tulokseltaan kieltävä: %d vastaan, %d puolesta, %d tyhjää "
+"ja %d äänestämätöntä."
+
+#: server/voting.c:548
+#, c-format
+msgid "%s %d: %s voted yes."
+msgstr "%s %d: %s äänesti puolesta."
+
+#: server/voting.c:553
+#, c-format
+msgid "%s %d: %s voted no."
+msgstr "%s %d: %s äänesti vastaan."
+
+#: server/voting.c:558
+#, c-format
+msgid "%s %d: %s chose to abstain."
+msgstr "%s %d: %s äänesti tyhjää."
+
+#. TRANS: Describing a new vote that can only pass
+#. * if there are no dissenting votes.
+#: server/voting.c:726
+#, c-format
+msgid "%s (needs %0.0f%% and no dissent)."
+msgstr "%s (vaatii %0.0f%% äänistä ja yksimielisyyden)."
+
+#. TRANS: Describing a new vote that can pass only if the
+#. * given percentage of players votes 'yes'.
+#: server/voting.c:732
+#, c-format
+msgid "%s (needs %0.0f%% in favor)."
+msgstr "%s (vaatii %0.0f%% kannatuksen)."
+
#: server/generator/mapgen.c:1771
msgid "High landmass - this may take a few seconds."
msgstr "Paljon maa-alaa - tässä voi mennä jonkin aikaa."
@@ -7319,14 +7455,14 @@ msgstr ""
"Kenties pelaajia on liikaa tälle kartalle?\n"
"Ole hyvä ja raportoi tämä virhe osoitteessa %s."
-#: client/attribute.c:363
+#: client/attribute.c:368
msgid ""
"There has been a CMA error. Your citizen governor settings may be broken."
msgstr ""
"Käskynhaltijan toiminnassa tapahtui virhe; sen asetukset voivat olla "
"vialliset."
-#: client/attribute.c:367
+#: client/attribute.c:372
msgid "Old attributes detected and removed."
msgstr "Löysin ja poistin vanhoja attribuutteja."
@@ -7475,41 +7611,41 @@ msgstr "%+4d : Asukkaat\n"
msgid "%+4d : Taxed from trade\n"
msgstr "%+4d : Verotettu kaupasta\n"
-#: client/citydlg_common.c:418
+#: client/citydlg_common.c:421
#, c-format
msgid "%+4d : Trade route with %s\n"
msgstr "%+4d : Kauppareitti (%s)\n"
-#: client/citydlg_common.c:427
+#: client/citydlg_common.c:430
#, c-format
msgid "%+4d : Building tithes\n"
msgstr "%+4d : Rakennuskymmenykset\n"
-#: client/citydlg_common.c:450
+#: client/citydlg_common.c:453
#, c-format
msgid "%+4d : Bonus from %s (%+d%%)\n"
msgstr "%+4d : %s-bonus (%+d%%)\n"
-#: client/citydlg_common.c:462
+#: client/citydlg_common.c:465
#, c-format
msgid "%+4d : Waste\n"
msgstr "%+4d : Hukka\n"
-#: client/citydlg_common.c:468
+#: client/citydlg_common.c:471
#, c-format
msgid "%+4d : Disorder\n"
msgstr "%+4d : Epäjärjestys\n"
-#: client/citydlg_common.c:474
+#: client/citydlg_common.c:477
#, c-format
msgid "%+4d : Used\n"
msgstr "%+4d : Käytetty\n"
-#: client/citydlg_common.c:479
+#: client/citydlg_common.c:482
msgid "==== : Adds up to\n"
msgstr "==== : Yhteensä\n"
-#: client/citydlg_common.c:481
+#: client/citydlg_common.c:484
#, c-format
msgid "%4d : Total surplus"
msgstr "%4d : Ylijäämä yhteensä"
@@ -7556,9 +7692,8 @@ msgid "Rapture/Peace/Disorder"
msgstr "Hurmoksessa/Rauhallinen/Levoton"
#: client/cityrepdata.c:452
-#, fuzzy
msgid "Concise *=Rapture, X=Disorder"
-msgstr "Lyhenne + Hurmoksessa, - Levoton"
+msgstr "Lyhyesti +=Hurmoksessa, -=Levoton"
#: client/cityrepdata.c:456
msgid "Special"
@@ -7817,53 +7952,53 @@ msgstr "E"
msgid "Specialists"
msgstr "Erikoistujat"
-#: client/civclient.c:240
+#: client/civclient.c:241
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr " -a, --autoconnect\tOhita liittymisikkuna\n"
-#: client/civclient.c:250
+#: client/civclient.c:251
msgid " -l, --log FILE\tUse FILE as logfile (spawned server also uses this)\n"
msgstr ""
" -l, --log FILE\tKäytä tiedostoa FILE lokia varten (myös synnytetty "
"palvelin).\n"
-#: client/civclient.c:252
+#: client/civclient.c:253
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr " -m, --meta HOST\tYhdistä välipalvelimeen osoitteessa HOST\n"
-#: client/civclient.c:254
+#: client/civclient.c:255
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr " -n, --name NAME\tkäytä nimeä NAME\n"
-#: client/civclient.c:256
+#: client/civclient.c:257
msgid " -p, --port PORT\tConnect to server port PORT (usually with -a)\n"
msgstr " -p, --port PORT\tYhdistä palvelimen porttiin PORT (yleensä -a:lla)\n"
-#: client/civclient.c:258
+#: client/civclient.c:259
#, c-format
msgid " -P, --Plugin PLUGIN\tUse PLUGIN for sound output %s\n"
msgstr " -P, --Plugin LIITÄNNÄINEN Käytä LIITÄNNÄISTÄ äänentoistoon %s\n"
-#: client/civclient.c:260
+#: client/civclient.c:261
msgid " -r, --read FILE\tRead startup script FILE (for spawned server only)\n"
msgstr ""
" -r, --read FILE\tLue käynnistysskripti tiedostosta FILE (vain synnytetty "
"palvelin)\n"
-#: client/civclient.c:263
+#: client/civclient.c:264
msgid " -s, --server HOST\tConnect to the server at HOST (usually with -a)\n"
msgstr ""
" -s, --server HOST\tYhdistä palvelimeen osoitteessa HOST (yleensä -a:lla)\n"
-#: client/civclient.c:265
+#: client/civclient.c:266
msgid " -S, --Sound FILE\tRead sound tags from FILE\n"
msgstr " -S, --Sound TIED\tLue äänitiedot tiedostosta TIED\n"
-#: client/civclient.c:266
+#: client/civclient.c:267
msgid " -t, --tiles FILE\tUse data file FILE.tilespec for tiles\n"
msgstr " -t, --tiles TIED\tKäytä tiedostoa TIED.tilespec kuvitustyylinä\n"
-#: client/civclient.c:269
+#: client/civclient.c:270
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7873,45 +8008,45 @@ msgstr ""
"\t\t\tKs. myös \"%s -- --help\".\n"
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:274
+#: client/civclient.c:275
#, c-format
msgid "Report bugs at %s\n"
msgstr "Jätä virheraportti osoitteessa %s\n"
-#: client/civclient.c:298
+#: client/civclient.c:299
#, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr "Epäkelpo portti \"%s\" --port-parametrille.\n"
-#: client/civclient.c:300 client/civclient.c:315
+#: client/civclient.c:301 client/civclient.c:316
msgid "Try using --help.\n"
msgstr "Kokeile parametriä --help.\n"
-#: client/civclient.c:313
+#: client/civclient.c:314
#, c-format
msgid "Invalid debug level \"%s\" specified with --debug option.\n"
msgstr "Epäkelpo debug-taso \"%s\" --debug-parametrille.\n"
-#: client/civclient.c:326
+#: client/civclient.c:327
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr "Tunnistamaton asetus: \"%s\"\n"
-#: client/civclient.c:391
-#, fuzzy, c-format
+#: client/civclient.c:393
+#, c-format
msgid "Updating old metaserver address \"%s\"."
-msgstr "metaserver <osoite>"
+msgstr "Päivitän vanhan metapalvelimen osoitteen \"%s\"."
-#: client/civclient.c:394
-#, fuzzy, c-format
+#: client/civclient.c:396
+#, c-format
msgid "Default metaserver has been set to \"%s\"."
-msgstr "Asetus: %s on asetettu arvoon \"%s\"."
+msgstr "Oletusmetapalvelin on asetettu arvoon \"%s\"."
-#: client/civclient.c:550
+#: client/civclient.c:540
msgid "Game started."
msgstr "Peli on käynnissä."
-#: client/civclient.c:588
+#: client/civclient.c:606
msgid "There was an error while auto connecting; aborting."
msgstr "Automaattisen liittymisen aikana tapahtui virhe, lopetan."
@@ -8041,18 +8176,18 @@ msgstr "Yhdistäminen käynnissä"
msgid "Disconnected from server."
msgstr "Katkaistiin yhteys palvelimeen."
-#: client/clinet.c:469
+#: client/clinet.c:473
#, c-format
msgid "Failed to contact server \"%s\" at port %d as \"%s\" after %d attempts"
msgstr ""
"Palvelimen \"%s\" porttiin %d yhdistyminen nimellä \"%s\" epäonnistui %d "
"yrityksen jälkeen"
-#: client/clinet.c:484 client/clinet.c:486
+#: client/clinet.c:488 client/clinet.c:490
msgid "Connection to server refused. Please start the server."
msgstr "Palvelimeen ei saada yhteyttä. Ole hyvä ja käynnistä se."
-#: client/clinet.c:495 client/clinet.c:523
+#: client/clinet.c:499 client/clinet.c:527
#, c-format
msgid ""
"Error contacting server \"%s\" at port %d as \"%s\":\n"
@@ -8061,7 +8196,7 @@ msgstr ""
"Virhe yhdistettäessä palvelimeen \"%s\", portti %d, nimellä \"%s\":\n"
"%s\n"
-#: client/clinet.c:514
+#: client/clinet.c:518
#, c-format
msgid ""
"Auto-connecting to server \"%s\" at port %d as \"%s\" every %f second(s) for "
@@ -8070,52 +8205,52 @@ msgstr ""
"Automaattinen yhdistys palvelimeen \"%s\", portti %d, nimellä \"%s\" %f "
"sekunnin välein %d kertaa"
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
+#: client/connectdlg_common.c:78 client/gui-gtk-2.0/pages.c:1358
msgid "novice"
msgstr "aloittelija"
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1358
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
msgid "easy"
msgstr "helppo"
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1359
msgid "normal"
msgstr "tavallinen"
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr "vaikea"
-#: client/connectdlg_common.c:83
+#: client/connectdlg_common.c:82
msgid "experimental"
msgstr "kokeellinen"
-#: client/connectdlg_common.c:213
+#: client/connectdlg_common.c:212
msgid "Starting server..."
msgstr "Käynnistän palvelimen..."
-#: client/connectdlg_common.c:332
+#: client/connectdlg_common.c:331
msgid "Couldn't start the server."
msgstr "Palvelimen käynnistys epäonnistui."
-#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
+#: client/connectdlg_common.c:332 client/connectdlg_common.c:365
msgid "You'll have to start one manually. Sorry..."
msgstr "Sinun pitää käynnistää palvelin käsin. Pahoittelen."
-#: client/connectdlg_common.c:364
+#: client/connectdlg_common.c:363
msgid "Couldn't connect to the server."
msgstr "Palvelimeen yhdistäminen epäonnistui."
-#: client/connectdlg_common.c:365
+#: client/connectdlg_common.c:364
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:470
+#: client/connectdlg_common.c:469
msgid ""
"Established control over the server. You have command access level 'hack'."
msgstr "Palvelimen hallintatila asetettu. Sinulla on komentotaso 'hack'."
-#: client/connectdlg_common.c:475
+#: client/connectdlg_common.c:474
msgid ""
"Failed to obtain the required access level to take control of the server. "
"The server will now be shutdown."
@@ -8127,27 +8262,27 @@ msgstr ""
msgid "Only transporter units can be unloaded."
msgstr "Vain kuljetusyksiköt pystyvät purkamaan lastinsa."
-#: client/control.c:1425
+#: client/control.c:1417
msgid "Only settler units can be put into auto mode."
msgstr "Vain uudisraivaajat voidaan automatisoida."
-#: client/control.c:1516
+#: client/control.c:1511
msgid "Only nuclear units can do this."
msgstr "Vain ydinaseet pystyvät tähän."
-#: client/control.c:1545
+#: client/control.c:1540
msgid "Only paratrooper units can do this."
msgstr "Vain laskuvarjojääkärit pystyvät tähän."
-#: client/control.c:2020
+#: client/control.c:2015
msgid "Too far for this unit."
msgstr "Välimatka on liian pitkä tälle yksikölle."
-#: client/control.c:2230 client/control.c:2260 client/control.c:2276
+#: client/control.c:2225 client/control.c:2255 client/control.c:2271
msgid "Didn't find a route to the destination!"
msgstr "Kohteeseen ei löytynyt käyttökelpoista reittiä!"
-#: client/control.c:2320
+#: client/control.c:2315
msgid "Oh my! You seem to have no capital!"
msgstr "Katsohan mokomaa, sinulla ei näköjään ole pääkaupunkia!"
@@ -8553,29 +8688,40 @@ 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:1066 client/helpdata.c:1400
+#: client/helpdata.c:1066 client/helpdata.c:1408
msgid " or "
msgstr " tai "
-#: client/helpdata.c:1068 client/helpdata.c:1388
+#: client/helpdata.c:1068 client/helpdata.c:1396
msgid "?or:, "
msgstr ", "
-#: client/helpdata.c:1080
+#: client/helpdata.c:1079
#, 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"
+msgid "* Unit has to be in a city, or a base after %d turn.\n"
+msgid_plural "* Unit has to be in a city, or a base after %d turns.\n"
msgstr[0] ""
-"* Yksikön tulee olla kaupungissa (%s riittää myös) %d vuoron jälkeen.\n"
+"* Yksikön tulee olla kaupungissa tai tukikohdassa %d vuoron jälkeen.\n"
msgstr[1] ""
-"* Yksikön tulee olla kaupungissa (%s riittää myös) %d vuoron jälkeen.\n"
+"* Yksikön tulee olla kaupungissa tai tukikohdassa %d vuoron jälkeen.\n"
-#: client/helpdata.c:1122
+#: client/helpdata.c:1087
+#, c-format
+msgid "* Unit has to be in a city, a base, or on a %s after %d turn.\n"
+msgid_plural "* Unit has to be in a city, a base, or on a %s after %d turns.\n"
+msgstr[0] ""
+"* Yksikön tulee olla kaupungissa tai tukikohdassa (%s riittää myös) %d "
+"vuoron jälkeen.\n"
+msgstr[1] ""
+"* Yksikön tulee olla kaupungissa tai tukikohdassa (%s riittää myös) %d "
+"vuoron jälkeen.\n"
+
+#: client/helpdata.c:1130
#, 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:1127
+#: client/helpdata.c:1135
#, c-format
msgid ""
"To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8584,90 +8730,90 @@ msgstr ""
"Jotta %s saavutettaisiin, %d muuta teknologiaa pitää keksiä ensin. Koko "
"projekti vaatii %d lamppua."
-#: client/helpdata.c:1135
+#: client/helpdata.c:1143
msgid "You cannot research this technology."
msgstr "Et voi tutkia tätä teknologiaa."
-#: client/helpdata.c:1139
+#: client/helpdata.c:1147
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:1151
+#: client/helpdata.c:1159
#, 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:1156
+#: client/helpdata.c:1164
#, 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:1159
+#: client/helpdata.c:1167
#, 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:1163
+#: client/helpdata.c:1171
msgid "* Increases the pollution generated by the population.\n"
msgstr "* Lisää väestön aiheuttamaa saastumista.\n"
-#: client/helpdata.c:1168
+#: client/helpdata.c:1176
#, 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:1175
+#: client/helpdata.c:1183
#, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr "* Sallii %s-yksiköiden rakentaa linnakkeita.\n"
-#: client/helpdata.c:1183
+#: client/helpdata.c:1191
#, c-format
msgid "* Allows %s to build airbases.\n"
msgstr "* Sallii %s-yksiköiden rakentaa lentotukikohtia.\n"
-#: client/helpdata.c:1192
+#: client/helpdata.c:1200
#, c-format
msgid "* Allows %s to upgrade roads to railroads.\n"
msgstr "* Sallii %s-yksiköiden parantaa tiet rautateiksi.\n"
-#: client/helpdata.c:1200
+#: client/helpdata.c:1208
#, c-format
msgid "* Allows %s to upgrade irrigation to farmland.\n"
msgstr "* Mahdollistaa %s-yksiköille kastellun maan muuttamisen pelloksi.\n"
-#: client/helpdata.c:1234
+#: client/helpdata.c:1242
msgid "* Pollution cannot be generated on this terrain."
msgstr "* Tälle maastotyypille ei voi kehittyä saastetta."
-#: client/helpdata.c:1239
+#: client/helpdata.c:1247
msgid "* You cannot build cities on this terrain."
msgstr "* Tälle maastotyypille ei voi rakentaa kaupunkeja."
-#: client/helpdata.c:1245
+#: client/helpdata.c:1253
msgid "* The coastline of this terrain is unsafe."
msgstr "* Tämä maastotyypin rannikko on turvaton."
-#: client/helpdata.c:1250
+#: client/helpdata.c:1258
msgid "* This terrain is unsafe for units to travel on."
msgstr "* Yksiköiden ei ole turvallista kulkea tällä maastotyypillä."
-#: client/helpdata.c:1255
+#: client/helpdata.c:1263
msgid "* Land units cannot travel on oceanic terrains."
msgstr "* Maayksiköt eivät voi kulkea merellisillä maastotyypeillä."
-#: client/helpdata.c:1305
+#: client/helpdata.c:1313
msgid "Features:\n"
msgstr "Ominaisuuksia:\n"
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1411 client/helpdata.c:1412
+#: client/helpdata.c:1419 client/helpdata.c:1420
msgid "?outputlist: Nothing "
msgstr "Ei mitään "
-#: client/helpdata.c:1419
+#: client/helpdata.c:1427
#, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -8682,7 +8828,7 @@ msgstr[1] ""
"* Poissa kotoa olevat sotilasyksiköt ja kenttäyksiköt tekevät %d asukasta "
"tyytymättömäksi.\n"
-#: client/helpdata.c:1429
+#: client/helpdata.c:1437
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8692,30 +8838,30 @@ msgstr ""
"muuten aiheuttaisivat.\n"
#. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1437
+#: client/helpdata.c:1445
#, 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:1442
+#: client/helpdata.c:1450
#, 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:1447
+#: client/helpdata.c:1455
#, c-format
msgid "* You pay no %s upkeep for your units.\n"
msgstr "* Yksikköjen ylläpito ei maksa yhtään %s.\n"
-#: client/helpdata.c:1451
+#: client/helpdata.c:1459
msgid "* You pay no upkeep for your units.\n"
msgstr "* Yksikköjesi ylläpito ei maksa mitään.\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:1460
+#: client/helpdata.c:1468
#, c-format
msgid "* Each of your cities will avoid paying %d %s towards unit upkeep.\n"
msgstr ""
@@ -8724,18 +8870,18 @@ msgstr ""
#. TRANS: Amount is subtracted from upkeep cost
#. * for each upkeep type.
-#: client/helpdata.c:1468
+#: client/helpdata.c:1476
#, 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:1475
+#: client/helpdata.c:1483
#, 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:1482
+#: client/helpdata.c:1490
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -8745,7 +8891,7 @@ msgstr ""
"kaupunkiin kun sinulla on niitä %d.\n"
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1489
+#: client/helpdata.c:1497
#, c-format
msgid ""
"* After the first unhappy citizen due to city size, for each %d additional "
@@ -8754,16 +8900,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:1497
+#: client/helpdata.c:1505
#, 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:1502
+#: client/helpdata.c:1510
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr "Tieteen/veron/luksuksen osuuksia ei ole rajoitettu.\n"
-#: client/helpdata.c:1507
+#: client/helpdata.c:1515
#, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -8778,7 +8924,7 @@ msgstr[1] ""
"* Yksikkösi voivat ylläpitää sotilashallintoa. Kukin sotayksikkö kaupungissa "
"pakottaa %d tyytymätöntä asukasta tyytyväiseksi.\n"
-#: client/helpdata.c:1519
+#: client/helpdata.c:1527
#, 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"
@@ -8790,7 +8936,7 @@ msgstr[1] ""
"kaupungissa.\n"
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1530
+#: client/helpdata.c:1538
#, c-format
msgid ""
"* You may grow your cities by means of celebrations. Your cities must be at "
@@ -8799,15 +8945,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:1536
+#: client/helpdata.c:1544
msgid "* Your units cannot be bribed.\n"
msgstr "* Yksikköjäsi ei voi lahjoa.\n"
-#: client/helpdata.c:1539
+#: client/helpdata.c:1547
msgid "* Your cities cannot be incited.\n"
msgstr "* Kaupungeissasi ei voi lietsoa kapinaa.\n"
-#: client/helpdata.c:1543
+#: client/helpdata.c:1551
msgid ""
"* Government will fall into anarchy if any city is in disorder for more than "
"two turns in a row.\n"
@@ -8815,16 +8961,16 @@ msgstr ""
"* Hallintomuoto muuttuu anarkiaksi jos mikään kaupunki on rauhaton enemmän "
"kuin kaksi vuoroa peräkkäin.\n"
-#: client/helpdata.c:1549
+#: client/helpdata.c:1557
msgid "* Has a senate that may prevent declaration of war.\n"
msgstr "* Hallintomuotoon kuuluva edustajisto voi estää sodanjulistuksen.\n"
-#: client/helpdata.c:1553
+#: client/helpdata.c:1561
msgid "* Allows partisans when cities are taken by the enemy.\n"
msgstr ""
"* Mahdollistaa partisaanien vastustuksen kun vihollinen valtaa kaupungin.\n"
-#: client/helpdata.c:1557
+#: client/helpdata.c:1565
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
@@ -8832,25 +8978,25 @@ msgstr ""
"* Rakennukset jotka tavallisesti poistavat tyytymättömyyttä tuottavat sen "
"sijaan rahaa.\n"
-#: client/helpdata.c:1561
+#: client/helpdata.c:1569
msgid "* Pays no upkeep for fanatics.\n"
msgstr "* Fanaatikkojen ylläpito ei maksa mitään.\n"
-#: client/helpdata.c:1564
+#: client/helpdata.c:1572
msgid "* Has no unhappy citizens.\n"
msgstr "* Tyytymättömiä asukkaita ei ole.\n"
-#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
+#: client/helpdata.c:1582 client/helpdata.c:1586 client/helpdata.c:1590
#, c-format
msgid "* Veteran %s units.\n"
msgstr "* Tekee %s yksiköstä konkareita.\n"
-#: client/helpdata.c:1585
+#: client/helpdata.c:1593
msgid "* Veteran units.\n"
msgstr "* Tekee yksiköistä konkareita.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1591
+#: client/helpdata.c:1599
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8860,7 +9006,7 @@ msgstr ""
"leikkauksen kun kaupunki ei juhli.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1600
+#: client/helpdata.c:1608
#, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8870,7 +9016,7 @@ msgstr ""
"yksikköä lisää kun kaupunki juhlii.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1608
+#: client/helpdata.c:1616
#, c-format
msgid "* Each worked tile with at least 1 %s will yield %d more of it.\n"
msgstr ""
@@ -8878,65 +9024,65 @@ msgstr ""
"yksikköä lisää.\n"
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1617
+#: client/helpdata.c:1625
#, c-format
msgid "* %s production is increased %d%%.\n"
msgstr "* %stuotanto lisääntyy %d%%.\n"
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1625
+#: client/helpdata.c:1633
#, 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:1630
+#: client/helpdata.c:1638
#, 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:1635
+#: client/helpdata.c:1643
#, 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:1643
+#: client/helpdata.c:1651
#, 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:1649
+#: client/helpdata.c:1657
#, 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:1655
+#: client/helpdata.c:1663
#, 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:1672
+#: client/helpdata.c:1680
#, 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:1699
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d %s"
msgstr "%s%d %s"
-#: client/helpdata.c:1700 client/helpdata.c:1708 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1708 client/helpdata.c:1716 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:1707
+#: client/helpdata.c:1715
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d tyytymätöntä"
@@ -9011,7 +9157,7 @@ msgstr ""
"Tämä on palvelimen portti jota käytetään oletuksena yhteysdialogeissa tai "
"komentoriviparametrin -a kanssa."
-#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:916 data/Freeciv.in:107
msgid "Metaserver"
msgstr "Välipalvelin"
@@ -9291,13 +9437,12 @@ msgid ""
"Setting this option will pop up a newly-founded city's city dialog "
"automatically."
msgstr ""
-"Jos asetus on päällä, kaupunkia perustettaessa kaupunki-ikkuna avautuu "
+"Jos asetus on valittuna, kaupunkia perustettaessa kaupunki-ikkuna avautuu "
"automaattisesti."
#: client/options.c:250
-#, fuzzy
msgid "Pop up caravan actions"
-msgstr "Karavaanitapahtumat"
+msgstr "Avaa karavaanitapahtumat ikkunaan"
#: client/options.c:251
msgid ""
@@ -9307,6 +9452,12 @@ msgid ""
"to do the action manually by pressing either 'r' (for a traderoute) or "
"'b' (for building a wonder) when the caravan is in the city."
msgstr ""
+"Jos tämä asetus on valittuna, karavaanin saapuminen kaupunkiin, johon se voi "
+"perustaa vakituisen kauppareitin tai jossa se voi auttaa rakentamaan "
+"ihmettä, avaa ikkunan, joka kysyy, mitä tehdään. Jos asetus ei ole "
+"valittuna, nämä toiminnot pitää käskyttää erikseen painamalla "
+"'r' (kauppareitille) tai 'b' (ihmeen rakentamiselle), kun karavaani on "
+"kaupungissa."
#: client/options.c:260
msgid "Enable cursor changing"
@@ -9336,7 +9487,7 @@ msgstr ""
#: client/options.c:272
msgid "Clear unit orders on selection"
-msgstr ""
+msgstr "Unohda yksikön komennot valittaessa"
#: client/options.c:273
msgid ""
@@ -9345,6 +9496,10 @@ msgid ""
"not cause them to stop their current activity. Instead, their orders will be "
"cleared only when new orders are given or if you press <space>."
msgstr ""
+"Jos tämä asetus on valittu, yksiköt unohtavat vanhat komentonsa kun ne "
+"valitaan joko yksin tai osana joukkoa. Jos asetusta ei ole valittu, yksikön "
+"valinta ei saa sitä keskeyttämään komentojensa toteuttamista. Sen sijaan se "
+"unohtaa vanhat käskynsä vasta saadessaan uudet tai jos painat välilyöntiä."
#: client/options.c:282
msgid "Background layer"
@@ -9419,35 +9574,35 @@ msgstr "Tallennus epäonnistui, tiedostoon %s ei voi kirjoittaa"
msgid "Saved settings to file %s"
msgstr "Asetukset tallennettu tiedostoon %s"
-#: client/packhand.c:211 client/packhand.c:217
+#: client/packhand.c:212 client/packhand.c:218
msgid "You were rejected from the game...."
msgstr "Sinut poistettiin pelistä..."
-#: client/packhand.c:229
+#: client/packhand.c:230
#, c-format
msgid "Client capability string: %s"
msgstr "Asiakasohjelman toimintomuuttuja: %s"
-#: client/packhand.c:232
+#: client/packhand.c:233
#, c-format
msgid "Server capability string: %s"
msgstr "Palvelimen toimintomuuttuja: %s"
-#: client/packhand.c:850
+#: client/packhand.c:864
#, c-format
msgid "Start of turn %d"
msgstr "Vuoron %d alku"
-#: client/packhand.c:1591
+#: client/packhand.c:1621
#, c-format
msgid "AI Mode is now %s."
msgstr "AI-moodi on nyt %s."
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "ON"
msgstr "päällä"
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "OFF"
msgstr "pois päältä"
@@ -9478,15 +9633,15 @@ msgstr "Nimi"
msgid "Username"
msgstr "Käyttäjänimi"
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
-#: client/gui-gtk-2.0/pages.c:2157
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:653
+#: client/gui-gtk-2.0/pages.c:1604 client/gui-gtk-2.0/pages.c:2159
msgid "Flag"
msgstr "Lippu"
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1605
-#: client/gui-gtk-2.0/pages.c:2159 client/gui-sdl/repodlgs.c:2063
-#: client/gui-win32/connectdlg.c:990 client/gui-win32/dialogs.c:542
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:657
+#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1609
+#: client/gui-gtk-2.0/pages.c:2161 client/gui-sdl/repodlgs.c:2063
+#: client/gui-win32/connectdlg.c:992 client/gui-win32/dialogs.c:542
#: client/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "Kansakunta"
@@ -9499,7 +9654,7 @@ msgstr "Raja"
msgid "Score"
msgstr "Pisteet"
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1614
msgid "Team"
msgstr "Joukkue"
@@ -9532,36 +9687,36 @@ msgstr "Jouten"
msgid "Ping"
msgstr "Ping"
-#: client/repodlgs_common.c:375
+#: client/repodlgs_common.c:378
msgid "You cannot sell improvements."
msgstr "Et voi myydä parannuksia."
-#: client/repodlgs_common.c:391
+#: client/repodlgs_common.c:394
#, c-format
msgid "Sold %d %s for %d gold."
msgstr "Myyty %d x %s, saatu %d kultaa."
-#: client/repodlgs_common.c:396
+#: client/repodlgs_common.c:399
#, c-format
msgid "No %s could be sold."
msgstr "%s ei myytävissä"
#. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:415
+#: client/repodlgs_common.c:418
msgid "You cannot disband units."
msgstr "Et voi lakkauttaa yksiköitä."
-#: client/repodlgs_common.c:420
+#: client/repodlgs_common.c:423
#, c-format
msgid "%s cannot be disbanded."
msgstr "Yksikköä %s ei voi lakkauttaa."
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:444
#, c-format
msgid "Disbanded %d %s."
msgstr "Lakkautettiin %d %s-yksikköä."
-#: client/repodlgs_common.c:445
+#: client/repodlgs_common.c:448
#, c-format
msgid "No %s could be disbanded."
msgstr "Yhtään %s-yksikköä ei voitu lakkauttaa."
@@ -9583,13 +9738,13 @@ msgstr "Metapalvelinta ei löytynyt"
#: client/text.c:94
#, c-format
msgid "AI %s"
-msgstr ""
+msgstr "AI %s"
#. TRANS: "<nation adjective>, team <team name>"
#: client/text.c:118
-#, fuzzy, c-format
+#, c-format
msgid "%s, team %s"
-msgstr ", joukkue %s"
+msgstr "%s, joukkue %s"
#: client/text.c:135 client/text.c:136 client/text.c:141
#: client/gui-sdl/mapview.c:752
@@ -9648,7 +9803,7 @@ msgstr "Sijainti: (%d, %d) [%d]"
#: client/text.c:153
#, c-format
msgid "Native coordinates: (%d, %d)"
-msgstr ""
+msgstr "Laskennalliset (natiivi)koordinaatit: (%d, %d)"
#: client/text.c:160
#, c-format
@@ -9666,31 +9821,27 @@ msgstr "Pieni heimokylä"
#: client/text.c:173
msgid "Our territory"
-msgstr "Meidän aluetta"
+msgstr "Meidän aluettamme"
#. TRANS: "Territory of <username> (<nation + team>)"
#: client/text.c:176
-#, fuzzy, c-format
+#, c-format
msgid "Territory of %s (%s)"
-msgstr ""
-"\n"
-"%s %s hallitsevat aluetta"
+msgstr "%s (%s) hallitsee aluetta"
#: client/text.c:186
-#, fuzzy, c-format
+#, c-format
msgid "Territory of %s (%s) (%d turn cease-fire)"
msgid_plural "Territory of %s (%s) (%d turn cease-fire)"
-msgstr[0] "Kaupunki: %s (%s, %d vuoron tulitauko)"
-msgstr[1] "Kaupunki: %s (%s, %d vuoron tulitauko)"
+msgstr[0] "Kaupunki: %s (%s) (%d vuoron tulitauko)"
+msgstr[1] "Kaupunki: %s (%s) (%d vuoron tulitauko)"
#. TRANS: "Territory of <username>
#. * (<nation + team> | <diplomatic state>)"
#: client/text.c:195
-#, fuzzy, c-format
+#, c-format
msgid "Territory of %s (%s | %s)"
-msgstr ""
-"\n"
-"%s %s hallitsevat aluetta"
+msgstr "%s (%s | %s) hallitsee aluetta"
#: client/text.c:200
msgid "Unclaimed territory"
@@ -9698,25 +9849,25 @@ msgstr "Valtaamatonta aluetta"
#. TRANS: "City: <city name> | <username> (<nation + team>)"
#: client/text.c:214
-#, fuzzy, c-format
+#, c-format
msgid "City: %s | %s (%s)"
-msgstr "Kaupunki: %s (%s, %s)"
+msgstr "Kaupunki: %s | %s (%s)"
#. TRANS: "City: <city name> | <username>
#. * (<nation + team>, <number> turn cease-fire)"
#: client/text.c:224
-#, fuzzy, c-format
+#, c-format
msgid "City: %s | %s (%s, %d turn cease-fire)"
msgid_plural "City: %s | %s (%s, %d turn cease-fire)"
-msgstr[0] "Kaupunki: %s (%s, %d vuoron tulitauko)"
-msgstr[1] "Kaupunki: %s (%s, %d vuoron tulitauko)"
+msgstr[0] "Kaupunki: %s | %s (%s, %d vuoron tulitauko)"
+msgstr[1] "Kaupunki: %s | %s (%s, %d vuoron tulitauko)"
#. TRANS: "City: <city name> | <username>
#. * (<nation + team>, <diplomatic state>)"
#: client/text.c:231
-#, fuzzy, c-format
+#, c-format
msgid "City: %s | %s (%s, %s)"
-msgstr "Kaupunki: %s (%s, %s)"
+msgstr "Kaupunki: %s | %s (%s, %s)"
#. TRANS: previous lines gave other information about the city.
#: client/text.c:246
@@ -9745,24 +9896,24 @@ msgstr "Toiminta: %s"
#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
#. * <diplomatic state>)"
#: client/text.c:287 client/text.c:313
-#, fuzzy, c-format
+#, c-format
msgid "Unit: %s | %s (%s, %s)"
-msgstr "Yksikkö: %s (%s, %s)"
+msgstr "Yksikkö: %s | %s (%s, %s)"
#. TRANS: "Unit: <unit type> | <username> (<nation + team>)"
#: client/text.c:292
-#, fuzzy, c-format
+#, c-format
msgid "Unit: %s | %s (%s)"
-msgstr "Yksikkö: %s (%s, %s)"
+msgstr "Yksikkö: %s | %s (%s)"
#. TRANS: "Unit: <unit type> | <username> (<nation + team>,
#. * <number> turn cease-fire)"
#: client/text.c:305
-#, fuzzy, c-format
+#, c-format
msgid "Unit: %s | %s (%s, %d turn cease-fire)"
msgid_plural "Unit: %s | %s (%s, %d turn cease-fire)"
-msgstr[0] "Yksikkö: %s (%s, %d vuoron tulitauko)"
-msgstr[1] "Yksikkö: %s (%s, %d vuoron tulitauko)"
+msgstr[0] "Yksikkö: %s | %s (%s, %d vuoron tulitauko)"
+msgstr[1] "Yksikkö: %s | %s (%s, %d vuoron tulitauko)"
#. TRANS: "Chance to win: A:95% D:46%"
#: client/text.c:338
@@ -10150,47 +10301,47 @@ msgstr "?dys/hrs:%02dpv %02dh"
msgid "?duration:overflow"
msgstr "?duration:ylivuoto"
-#: client/text.c:1143
+#: client/text.c:1145
#, c-format
msgid "%6d.%02d ms"
msgstr "%6d.%02d ms"
#. TRANS: <nation adjective> <government name>.
#. * E.g. "Polish Republic".
-#: client/text.c:1188
+#: client/text.c:1193
#, c-format
msgid "?nationgovernment:%s %s"
msgstr "%s %s"
#. TRANS: "Observer: 1985"
-#: client/text.c:1198
+#: client/text.c:1203
#, c-format
msgid "Observer: %s"
msgstr "Tarkkailija: %s"
-#: client/text.c:1216
+#: client/text.c:1221
msgid "Buildings: "
msgstr "Rakennukset: "
-#: client/text.c:1233 client/text.c:1272
+#: client/text.c:1238 client/text.c:1277
msgid "None. "
msgstr "Ei yhtään. "
-#: client/text.c:1235 client/text.c:1274
+#: client/text.c:1240 client/text.c:1279
msgid "?clistend:."
msgstr "."
-#: client/text.c:1253
+#: client/text.c:1258
msgid "Wonders: "
msgstr "Ihmeet: "
-#: client/text.c:1308
+#: client/text.c:1313
#, 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:1312
+#: client/text.c:1317
#, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
@@ -10198,25 +10349,25 @@ msgstr[0] "%d rauhallinen ennen vähennyksiä."
msgstr[1] "%d rauhallista ennen vähennyksiä."
#. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1318
+#: client/text.c:1323
#, c-format
msgid "%d additional unhappy citizen."
msgid_plural "%d additional unhappy citizens."
msgstr[0] "%d tyytymätön lisää."
msgstr[1] "%d tyytymätöntä lisää."
-#: client/text.c:1339
+#: client/text.c:1344
msgid "Unlimited martial law in effect."
msgstr "Rajoittamaton armeijan kurinpito käytössä."
-#: client/text.c:1341
+#: client/text.c:1346
#, c-format
msgid "%d military unit may impose martial law."
msgid_plural "Up to %d military units may impose martial law."
msgstr[0] "%d sotilasyksikkö voi pitää kuria."
msgstr[1] "Korkeintaan %d sotilasyksikköä voi pitää kuria."
-#: client/text.c:1345
+#: client/text.c:1350
#, c-format
msgid "Each military unit makes %d unhappy citizen content."
msgid_plural "Each military unit makes %d unhappy citizens content."
@@ -10225,37 +10376,37 @@ msgstr[0] ""
msgstr[1] ""
"Jokainen sotilasyksikkö tekee %d tyytymättömästä asukkaasta rauhallisia."
-#: client/text.c:1352
+#: client/text.c:1357
msgid "Military units in the field may cause unhappiness. "
msgstr "Sotilasyksiköt poissa kotoa voivat aiheuttaa tyytymättömyyttä. "
-#: client/text.c:1355
+#: client/text.c:1360
msgid "Military units have no happiness effect. "
msgstr "Sotilasyksiköillä ei ole vaikutusta onnellisuuteen. "
-#: client/text.c:1370
+#: client/text.c:1375
#, c-format
msgid "Luxury: %d total."
msgstr "Luksus: %d kaikkiaan."
-#: client/tilespec.c:865
+#: client/tilespec.c:882
msgid "No usable default tileset found, aborting!"
msgstr "Käyttökelpoista oletuskuvitusta ei löydy, lopetan!"
-#: client/tilespec.c:1338
+#: client/tilespec.c:1355
msgid ""
"Client does not support isometric tilesets. Using default tileset instead."
msgstr ""
"Asiakasohjelma ei tue isometristä kuvitusta. Käytetään oletusasetuksia."
-#: client/tilespec.c:1347
+#: client/tilespec.c:1364
msgid ""
"Client does not support overhead view tilesets. Using default tileset "
"instead."
msgstr ""
"Asiakasohjelma ei tue ylhäältä nähtävää kuvitusta. Käytetään oletusasetuksia."
-#: client/tilespec.c:3966
+#: client/tilespec.c:3987
#, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -10890,9 +11041,8 @@ msgid "What should we rename the city to?"
msgstr "Mikä annetaan kaupungin uudeksi nimeksi?"
#: client/gui-gtk-2.0/cityrep.c:794
-#, fuzzy
msgid "(no worklists defined)"
-msgstr "(työlista)"
+msgstr "(ei työlistaa)"
#: client/gui-gtk-2.0/cityrep.c:876
msgid "Chan_ge"
@@ -10900,35 +11050,31 @@ msgstr "Vai_hda"
#: client/gui-gtk-2.0/cityrep.c:880
msgid "Add _First"
-msgstr "Lisää _ensimmäinen"
+msgstr "Lisää _ensimmäiseksi"
#: client/gui-gtk-2.0/cityrep.c:884
msgid "Add _Next"
-msgstr "Lisää _seuraava"
+msgstr "Lisää _seuraavaksi"
#: client/gui-gtk-2.0/cityrep.c:888
-#, fuzzy
msgid "Add _2nd Last"
-msgstr "Lisää _viimeinen"
+msgstr "Lisää 2. viimeiseksi"
#: client/gui-gtk-2.0/cityrep.c:892
msgid "Add _Last"
-msgstr "Lisää _viimeinen"
+msgstr "Lisää _viimeiseksi"
#: client/gui-gtk-2.0/cityrep.c:899
-#, fuzzy
msgid "Set Worklist"
-msgstr "Työlista"
+msgstr "Aseta työlistaksi"
#: client/gui-gtk-2.0/cityrep.c:905
-#, fuzzy
msgid "Append Worklist"
-msgstr "Nimeä työlista"
+msgstr "Liitä työlistaan"
#: client/gui-gtk-2.0/cityrep.c:911
-#, fuzzy
msgid "Clear _Worklist"
-msgstr "Kohdetyölista"
+msgstr "T_yhjennä työlista"
#: client/gui-gtk-2.0/cityrep.c:916
msgid "Gover_nor"
@@ -10943,7 +11089,7 @@ msgid "_Display"
msgstr "_Näytä"
#: client/gui-gtk-2.0/cityrep.c:1006 client/gui-gtk-2.0/menu.c:839
-#: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
+#: client/gui-sdl/diplodlg.c:692 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
#: client/gui-xaw/cityrep.c:533 client/gui-xaw/menu.c:156
@@ -11115,192 +11261,192 @@ 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:196 client/gui-gtk-2.0/messagewin.c:222
+#: client/gui-gtk-2.0/dialogs.c:197 client/gui-gtk-2.0/messagewin.c:222
msgid "Goto _Location"
msgstr "Mene _kohteeseen"
-#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
+#: client/gui-gtk-2.0/dialogs.c:202 client/gui-gtk-2.0/messagewin.c:226
msgid "Inspect _City"
msgstr "_Tutki kaupunkia"
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:258 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:258 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:259 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:311 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:312 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:312 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:313 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:506
+#: client/gui-gtk-2.0/dialogs.c:507
msgid "Unit"
msgstr "Yksikkö"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:950
-#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2155
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:985
+#: client/gui-gtk-2.0/dialogs.c:508 client/gui-gtk-2.0/pages.c:950
+#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2157
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:987
#: 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:519 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:520 client/gui-sdl/dialogs.c:627
msgid "Unit selection"
msgstr "Valitse yksikkö"
-#: client/gui-gtk-2.0/dialogs.c:582
+#: client/gui-gtk-2.0/dialogs.c:583
msgid "_Ready all"
msgstr "Aktivoi kaikki"
-#: client/gui-gtk-2.0/dialogs.c:590
+#: client/gui-gtk-2.0/dialogs.c:591
msgid "_Sentry idle"
msgstr "Leiriydy odotellessa"
-#: client/gui-gtk-2.0/dialogs.c:719
+#: client/gui-gtk-2.0/dialogs.c:721
msgid "Nation _Groups:"
msgstr "Kansakunta_ryhmät:"
-#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:766 data/Freeciv.in:3128
msgid "What Nation Will You Be?"
msgstr "Mitä kansakuntaa haluat johtaa?"
-#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
-#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
+#: client/gui-gtk-2.0/dialogs.c:768 client/gui-sdl/chatline.c:842
+#: client/gui-win32/connectdlg.c:1040 data/Freeciv.in:3371
msgid "Pick Nation"
msgstr "Kansakunnan valinta"
-#: client/gui-gtk-2.0/dialogs.c:774
+#: client/gui-gtk-2.0/dialogs.c:776
msgid "_Random Nation"
msgstr "_Satunnainen kansakunta"
-#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:792 client/gui-win32/dialogs.c:517
msgid "Select a nation"
msgstr "Valitse kansakunta"
-#: client/gui-gtk-2.0/dialogs.c:804
+#: client/gui-gtk-2.0/dialogs.c:810
msgid "_Properties"
msgstr "_Ominaisuudet"
-#: client/gui-gtk-2.0/dialogs.c:824
+#: client/gui-gtk-2.0/dialogs.c:830
msgid "_Leader:"
-msgstr "_Johtaja:"
+msgstr "Hallitsi_ja"
-#: client/gui-gtk-2.0/dialogs.c:831
+#: client/gui-gtk-2.0/dialogs.c:837
msgid "_Female"
msgstr "_Nainen"
-#: client/gui-gtk-2.0/dialogs.c:836
+#: client/gui-gtk-2.0/dialogs.c:842
msgid "_Male"
msgstr "_Mies"
-#: client/gui-gtk-2.0/dialogs.c:863
+#: client/gui-gtk-2.0/dialogs.c:869
msgid "City _Styles:"
msgstr "Kaupunki_tyylit:"
-#: client/gui-gtk-2.0/dialogs.c:902
+#: client/gui-gtk-2.0/dialogs.c:908
msgid "_Description"
msgstr "_Kuvaus"
-#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1263 client/gui-xaw/dialogs.c:1480
msgid "You must select your sex."
msgstr "Kaikki ovat jotain sukupuolta."
-#: client/gui-gtk-2.0/dialogs.c:1253 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1268 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:1262 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1277 client/gui-sdl/dialogs.c:2204
#: 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:1306 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1318 client/gui-win32/citydlg.c:1454
#: data/Freeciv.in:2484
msgid "Upgrade Unit!"
msgstr "Ajanmukaista!"
-#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1327 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 "Ajanmukaista vanhentuneet yksiköt"
-#: client/gui-gtk-2.0/diplodlg.c:231 client/gui-win32/diplodlg.c:151
+#: client/gui-gtk-2.0/diplodlg.c:222 client/gui-win32/diplodlg.c:151
#: client/gui-xaw/diplodlg.c:383 client/gui-xaw/diplodlg.c:401
msgid "World-map"
msgstr "Maailmankartta"
-#: client/gui-gtk-2.0/diplodlg.c:237 client/gui-win32/diplodlg.c:146
+#: client/gui-gtk-2.0/diplodlg.c:228 client/gui-win32/diplodlg.c:146
#: client/gui-xaw/diplodlg.c:387 client/gui-xaw/diplodlg.c:405
msgid "Sea-map"
msgstr "Merikartta"
-#: client/gui-gtk-2.0/diplodlg.c:243
+#: client/gui-gtk-2.0/diplodlg.c:234
msgid "_Maps"
msgstr "Kartat"
-#: client/gui-gtk-2.0/diplodlg.c:274
+#: client/gui-gtk-2.0/diplodlg.c:265
msgid "_Advances"
msgstr "Edistysaskeleet"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/diplodlg.c:315 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "Kaupungit"
-#: client/gui-gtk-2.0/diplodlg.c:333
+#: client/gui-gtk-2.0/diplodlg.c:324
msgid "_Give shared vision"
msgstr "Jaa näkymä"
-#: client/gui-gtk-2.0/diplodlg.c:346
+#: client/gui-gtk-2.0/diplodlg.c:337
msgid "Give _embassy"
msgstr "Lähetystö"
-#: client/gui-gtk-2.0/diplodlg.c:376
+#: client/gui-gtk-2.0/diplodlg.c:368
msgid "_Pacts"
msgstr "Sopimukset"
-#: client/gui-gtk-2.0/diplodlg.c:466
+#: client/gui-gtk-2.0/diplodlg.c:458
#, c-format
msgid "Diplomacy: %s"
msgstr "Diplomatia: %s"
-#: client/gui-gtk-2.0/diplodlg.c:473
+#: client/gui-gtk-2.0/diplodlg.c:465
msgid "_Cancel meeting"
msgstr "Peruuta tapaaminen"
-#: client/gui-gtk-2.0/diplodlg.c:475
+#: client/gui-gtk-2.0/diplodlg.c:467
msgid "Accept _treaty"
msgstr "Hyväksy sopimus"
-#: client/gui-gtk-2.0/diplodlg.c:503
+#: client/gui-gtk-2.0/diplodlg.c:495
msgid "C_lauses:"
msgstr "Ehdot:"
-#: client/gui-gtk-2.0/diplodlg.c:568 client/gui-gtk-2.0/diplodlg.c:642
+#: client/gui-gtk-2.0/diplodlg.c:560 client/gui-gtk-2.0/diplodlg.c:634
msgid "_Gold:"
msgstr "Rahaa:"
-#: client/gui-gtk-2.0/diplodlg.c:580 client/gui-gtk-2.0/diplodlg.c:654
+#: client/gui-gtk-2.0/diplodlg.c:572 client/gui-gtk-2.0/diplodlg.c:646
msgid "_Add Clause..."
msgstr "L_isää ehto..."
-#: client/gui-gtk-2.0/diplodlg.c:699
+#: client/gui-gtk-2.0/diplodlg.c:691
msgid "--- This treaty is blank. Please add some clauses. ---"
msgstr "--- Tämä sopimus on tyhjä. Ole hyvä ja lisää ehtoja. ---"
-#: client/gui-gtk-2.0/diplodlg.c:905 client/gui-sdl/diplodlg.c:375
+#: client/gui-gtk-2.0/diplodlg.c:897 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 "Annettu rahamäärä on sopimaton."
@@ -11359,20 +11505,20 @@ msgstr "Valitse kohde"
msgid "Show _All Cities"
msgstr "Näytä kaikki kaupungit"
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:164
msgid "Show Map Scrollbars"
msgstr "Näytä kartan vierityspalkit"
-#: client/gui-gtk-2.0/gui_main.c:163
+#: client/gui-gtk-2.0/gui_main.c:165
msgid "Disable this option to hide the scrollbars on the map view."
msgstr ""
"Tämän asetuksen poisto käytöstä piilottaa karttanäkymän vierityspalkit."
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:169
msgid "Keyboardless goto"
msgstr "Näppäimistötön meno"
-#: client/gui-gtk-2.0/gui_main.c:168
+#: client/gui-gtk-2.0/gui_main.c:170
msgid ""
"If this option is set then a goto may be initiated by left-clicking and then "
"holding down the mouse button while dragging the mouse onto a different tile."
@@ -11381,11 +11527,11 @@ msgstr ""
"napsauttamalla sitä vasemmalla hiiren napilla, pitäen nappia alhaalla ja "
"raahaten osoittimen kohderuutuun."
-#: client/gui-gtk-2.0/gui_main.c:173
+#: client/gui-gtk-2.0/gui_main.c:175
msgid "Keep dialogs on top"
msgstr "Pidä dialogit päällimmäisenä"
-#: client/gui-gtk-2.0/gui_main.c:174
+#: client/gui-gtk-2.0/gui_main.c:176
msgid ""
"If this option is set then dialog windows will always remain in front of the "
"main Freeciv window. Disabling this has no effect in fullscreen mode."
@@ -11394,11 +11540,11 @@ msgstr ""
"pääikkunan yläpuolella. Asetuksen poistolla ei ole vaikutusta "
"kokoruututilassa."
-#: client/gui-gtk-2.0/gui_main.c:178
+#: client/gui-gtk-2.0/gui_main.c:180
msgid "Show worklist task icons"
msgstr "Näytä työlistan tehtäväkuvakkeet"
-#: client/gui-gtk-2.0/gui_main.c:179
+#: client/gui-gtk-2.0/gui_main.c:181
msgid ""
"Disabling this will turn off the unit and building icons in the worklist "
"dialog and the production tab of the city dialog."
@@ -11406,11 +11552,11 @@ msgstr ""
"Tämän asetuksen poisto käytöstä piilottaa yksikkö- ja rakentamiskuvakkeet "
"työlistaikkunasta sekä kaupunki-ikkunan tuotantovälilehdeltä."
-#: client/gui-gtk-2.0/gui_main.c:183
+#: client/gui-gtk-2.0/gui_main.c:185
msgid "Enable status report tabs"
msgstr "Käytä tilanneraporttivälilehtiä"
-#: client/gui-gtk-2.0/gui_main.c:184
+#: client/gui-gtk-2.0/gui_main.c:186
msgid ""
"If this option is enabled then report dialogs will be shown as separate tabs "
"rather than in popup dialogs."
@@ -11418,11 +11564,11 @@ msgstr ""
"Jos tämä asetus on käytössä, raporttidialogit näytetään erillisinä "
"välilehtinä ponnahdusikkunoiden sijaan."
-#: client/gui-gtk-2.0/gui_main.c:189 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:191 client/gui-win32/gui_main.c:110
msgid "Better fog-of-war drawing"
msgstr "Kauniimmat näkyvyysrajat (\"fog of war\")"
-#: client/gui-gtk-2.0/gui_main.c:190 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:192 client/gui-win32/gui_main.c:111
msgid ""
"If this is enabled then a better method is used for drawing fog-of-war. It "
"is not any slower but will consume about twice as much memory."
@@ -11431,11 +11577,11 @@ msgstr ""
"vaativan näkyvyysrajapiirtotyylin käyttöä. Tyyli ei ole suoritustehollisesti "
"hitaampi."
-#: client/gui-gtk-2.0/gui_main.c:195
+#: client/gui-gtk-2.0/gui_main.c:197
msgid "Show time for each chat message"
msgstr "Näytä aika jokaiselle keskustelun viestille"
-#: client/gui-gtk-2.0/gui_main.c:196
+#: client/gui-gtk-2.0/gui_main.c:198
msgid ""
"If this option is enabled then all chat messages will be prefixed by a time "
"string of the form [hour:minute:second]."
@@ -11443,31 +11589,36 @@ msgstr ""
"Jos tämä asetus on valittu, kaikissa keskusteluissa kunkin viestin alkuun "
"lisätään aikaleima muotoa [tunti:minuutti:sekunti]."
-#: client/gui-gtk-2.0/gui_main.c:201
+#: client/gui-gtk-2.0/gui_main.c:203
msgid "Split bottom notebook area"
-msgstr ""
+msgstr "Jaa alareunan muistiinpanoalue kahtia"
-#: client/gui-gtk-2.0/gui_main.c:202
+#: client/gui-gtk-2.0/gui_main.c:204
msgid ""
"Enabling this option will split the bottom notebook into a left and right "
"notebook so that two tabs may be viewed at once."
msgstr ""
+"Jos tämä asetus on valittu, ikkunan alareunan muistiinpanoalue jaetaan "
+"vasempaan ja oikeaan puoliskoon, joissa voi pitää auki yhteensä kahta "
+"välilehteä yhtä aikaa."
-#: client/gui-gtk-2.0/gui_main.c:207
+#: client/gui-gtk-2.0/gui_main.c:209
msgid "New message events go to top of list"
-msgstr ""
+msgstr "Lisää uudet viestitapahtumat listan alkuun"
-#: client/gui-gtk-2.0/gui_main.c:208
+#: client/gui-gtk-2.0/gui_main.c:210
msgid ""
"If this option is enabled, new events in the message window will appear at "
"the top of the list, rather than being appended at the bottom."
msgstr ""
+"Jos tämä asetus on valittu, uudet tapahtumat viesti-ikkunassa näytetään "
+"listan alussa, muussa tapausksessa ne lisätään listan loppuun."
-#: client/gui-gtk-2.0/gui_main.c:213
+#: client/gui-gtk-2.0/gui_main.c:215
msgid "Show extra message window buttons"
-msgstr ""
+msgstr "Näytä lisänapit viesti-ikkunassa"
-#: client/gui-gtk-2.0/gui_main.c:214
+#: client/gui-gtk-2.0/gui_main.c:216
msgid ""
"If this option is enabled, there will be two buttons displayed in the "
"message window for inspecting a city and going to a location. If this option "
@@ -11476,22 +11627,31 @@ msgid ""
"respectively). This option will only take effect once the message window is "
"closed and reopened."
msgstr ""
+"Jos tämä asetus on valittu, viesti-ikkunassa näytetään napit kaupungin "
+"tarkastelemiseksi ja tapahtumapaikkaan siirtymiseksi. Jos asetusta ei ole "
+"valittu, nappeja ei näytetä. Voit tällöinkin kaksosnapsauttaa kaupunkien "
+"nimiä hiiren vasemmalla napilla tarkastellaksesi niitä, tai napsauttaa riviä "
+"hiiren oikealla napilla siirtyäksesi tapahtumapaikalle. Tämän asetuksen "
+"muutos tulee voimaan vasta kun viesti-ikkuna suljetaan ja avataan uudelleen."
-#: client/gui-gtk-2.0/gui_main.c:224
+#: client/gui-gtk-2.0/gui_main.c:226
msgid "Metaserver tab first in network page"
-msgstr ""
+msgstr "Metapalvelimen välilehti ensimmäisenä verkkosivulla"
-#: client/gui-gtk-2.0/gui_main.c:225
+#: client/gui-gtk-2.0/gui_main.c:227
msgid ""
"If this option is enabled, the metaserver tab will be the first notebook tab "
"in the network page. This option requires a restart in order to take effect."
msgstr ""
+"Jos tämä asetus on valittu, metapalvelimen välilehti on verkkosivun "
+"ensimmäinen välilehti. Tämän asetuksen muutos tulee voimaan vasta Freecivin "
+"uudelleenkäynnistämisen jälkeen."
-#: client/gui-gtk-2.0/gui_main.c:230
+#: client/gui-gtk-2.0/gui_main.c:232
msgid "Plain chat messages are sent to allies only"
-msgstr ""
+msgstr "Lähetä viestit oletuksena vain liittolaisille"
-#: client/gui-gtk-2.0/gui_main.c:231
+#: client/gui-gtk-2.0/gui_main.c:233
msgid ""
"If this option is enabled, then plain messages typed into the chat entry "
"while the game is running will only be sent to your allies. Otherwise plain "
@@ -11500,8 +11660,32 @@ msgid ""
"option can also be set using a toggle button beside the chat entry (only "
"visible in multiplayer games)."
msgstr ""
+"Jos tämä asetus on valittuna, pelin aikana viestikenttään kirjoitetut, "
+"erikseen osoittamattomat viestit lähetetään vain liittolaisillesi. Jos "
+"asetusta ei ole valittu, tällaiset viestit tulkitaan julkisiksi viesteiksi. "
+"Voit lähettää julkisen viestin asetuksen ollessa valittuna lisäämällä sen "
+"alkuun kaksoispisteen ':'. Asetuksen tilaa voi muuttaa myös viestikentän "
+"vieressä olevallaa kytkinnäppäimellä (näkyy vain moninpeleissä)."
+
+#: client/gui-gtk-2.0/gui_main.c:245
+msgid "Arrange widgets for small displays"
+msgstr "Sovita käyttöliittymä pienille näytöille"
-#: client/gui-gtk-2.0/gui_main.c:340 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:246
+msgid ""
+"If this option is enabled, widgets in the main window will be arrange so "
+"that they take up the least amount of total screen space. Specifically, the "
+"left panel containing the overview, player status, and the unit information "
+"box will be extended over the entire left side of the window. This option "
+"requires a restart in order to take effect."
+msgstr ""
+"Jos tämä asetus on valittu, pääikkunan elementit järjestetään tavalla, jolla "
+"ne vievät mahdollisimman vähän tilaa näytöllä. Tällöin vasen paneeli, joka "
+"sisältää yleiskuvan, pelaajan tilanteen ja yksikön tiedot, laajennetaan koko "
+"ikkunan vasemman laidan kokoiseksi. Asetuksen muutos astuu voimaan vasta "
+"Freecivin uudelleenkäynnistyksen jälkeen."
+
+#: client/gui-gtk-2.0/gui_main.c:352 client/gui-xaw/gui_main.c:245
msgid ""
"This client has no special command line options\n"
"\n"
@@ -11509,22 +11693,22 @@ msgstr ""
"Tässä asiakasohjelmassa ei ole erityisiä komentoriviasetuksia\n"
"\n"
-#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
+#: client/gui-gtk-2.0/gui_main.c:847 client/gui-gtk-2.0/gui_main.c:1542
msgid "Freeciv"
msgstr "Freeciv"
-#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
+#: client/gui-gtk-2.0/gui_main.c:1251 client/gui-gtk-2.0/gui_main.c:1258
#: client/gui-sdl/mapctrl.c:1566 client/gui-win32/gui_main.c:482
#: data/Freeciv.in:2618
msgid "Turn Done"
msgstr "Vuoro valmis"
-#: client/gui-gtk-2.0/gui_main.c:1232 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1258 client/gui-sdl/mapctrl.c:1566
#: client/gui-sdl/mapview.c:1082
msgid "Shift+Return"
msgstr "Shift+Enter"
-#: client/gui-gtk-2.0/gui_main.c:1266 client/gui-gtk-2.0/menu.c:797
+#: client/gui-gtk-2.0/gui_main.c:1299 client/gui-gtk-2.0/menu.c:797
#: client/gui-gtk-2.0/menu.c:799 client/gui-gtk-2.0/menu.c:801
#: client/gui-gtk-2.0/menu.c:803 client/gui-gtk-2.0/menu.c:805
#: client/gui-gtk-2.0/menu.c:807 client/gui-gtk-2.0/menu.c:809
@@ -11543,11 +11727,11 @@ msgstr "Shift+Enter"
msgid "View"
msgstr "Näkymä"
-#: client/gui-gtk-2.0/gui_main.c:1359
+#: client/gui-gtk-2.0/gui_main.c:1393
msgid "Chat"
msgstr "Keskustelu"
-#: client/gui-gtk-2.0/gui_main.c:1377 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1411 client/gui-win32/gui_main.c:538
#: data/Freeciv.in:2809
msgid ""
"Freeciv is free software and you are welcome to distribute copies of it\n"
@@ -11563,77 +11747,77 @@ msgstr ""
"peruslähtökohdiltaan varsin erilaisia, ja kaikki suomennokset eivät\n"
"ikävä kyllä ole erinomaisen sujuvia."
-#: client/gui-gtk-2.0/gui_main.c:1392
+#: client/gui-gtk-2.0/gui_main.c:1426
msgid "Allies Only"
-msgstr ""
+msgstr "Vain liittolaiset"
-#: client/gui-gtk-2.0/gui_main.c:1657
+#: client/gui-gtk-2.0/gui_main.c:1691
msgid "Not _ready"
msgstr "_Ei valmis"
-#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
+#: client/gui-gtk-2.0/gui_main.c:1702 client/gui-gtk-2.0/pages.c:1679
msgid "_Ready"
msgstr "_Valmis"
-#: client/gui-gtk-2.0/gui_main.c:1672 client/gui-gtk-2.0/gui_main.c:1678
-#: client/gui-gtk-2.0/pages.c:2204
+#: client/gui-gtk-2.0/gui_main.c:1706 client/gui-gtk-2.0/gui_main.c:1712
+#: client/gui-gtk-2.0/pages.c:2206
msgid "_Start"
msgstr "_Aloita"
-#: client/gui-gtk-2.0/gui_main.c:1686
+#: client/gui-gtk-2.0/gui_main.c:1720
msgid "_Take Player"
msgstr "Ota pelaaja hallintaan"
-#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
+#: client/gui-gtk-2.0/gui_main.c:1723 client/gui-gtk-2.0/pages.c:1669
msgid "Pick _Nation"
msgstr "Valitse ka_nsakunta"
-#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
+#: client/gui-gtk-2.0/gui_main.c:1730 client/gui-gtk-2.0/pages.c:1674
msgid "_Observe"
msgstr "_Tarkkaile"
-#: client/gui-gtk-2.0/gui_main.c:1698
+#: client/gui-gtk-2.0/gui_main.c:1732
msgid "Do not _observe"
msgstr "Älä _tarkkaile"
-#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1755 client/gui-xaw/pages.c:211
msgid "<AI>"
msgstr "<AI>"
-#: client/gui-gtk-2.0/gui_main.c:1723
+#: client/gui-gtk-2.0/gui_main.c:1758
msgid "<Novice AI>"
msgstr "<Aloittelija-AI>"
-#: client/gui-gtk-2.0/gui_main.c:1726
+#: client/gui-gtk-2.0/gui_main.c:1761
msgid "<Easy AI>"
msgstr "<Helppo AI>"
-#: client/gui-gtk-2.0/gui_main.c:1729
+#: client/gui-gtk-2.0/gui_main.c:1764
msgid "<Normal AI>"
msgstr "<Tavallinen AI>"
-#: client/gui-gtk-2.0/gui_main.c:1732
+#: client/gui-gtk-2.0/gui_main.c:1767
msgid "<Hard AI>"
msgstr "<Vaikea AI>"
-#: client/gui-gtk-2.0/gui_main.c:1742 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1777 client/gui-win32/dialogs.c:594
#: client/gui-xaw/pages.c:217
msgid "Random"
msgstr "Satunnainen"
-#: client/gui-gtk-2.0/gui_main.c:1808
+#: client/gui-gtk-2.0/gui_main.c:1844 client/gui-gtk-2.0/gui_main.c:1858
msgid "Observer"
msgstr "Tarkkailija"
-#: client/gui-gtk-2.0/gui_main.c:1808
+#: client/gui-gtk-2.0/gui_main.c:1858
msgid "Detached"
msgstr "Irrotettu"
-#: client/gui-gtk-2.0/gui_main.c:2073
+#: client/gui-gtk-2.0/gui_main.c:2117
msgid "Are you sure you want to quit?"
msgstr "Haluatko todella lopettaa?"
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
#, c-format
msgid ""
"Close Tab:\n"
@@ -11642,7 +11826,7 @@ msgstr ""
"Sulje välilehti:\n"
"%s"
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
msgid "Ctrl+W"
msgstr "Ctrl+W"
@@ -11747,8 +11931,8 @@ msgid "Trans. Rslt/Time:"
msgstr "Muunna lopputulos/aika:"
#: 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
-#: client/gui-win32/helpdlg.c:709 client/gui-win32/helpdlg.c:733
+#: client/gui-win32/helpdlg.c:502 client/gui-win32/helpdlg.c:550
+#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:739
#: client/gui-xaw/helpdlg.c:759 client/gui-xaw/helpdlg.c:808
#: client/gui-xaw/helpdlg.c:816 client/gui-xaw/helpdlg.c:853
#: client/gui-xaw/helpdlg.c:878
@@ -11795,34 +11979,34 @@ msgstr "(yhdessä askeleen"
msgid "?techhelp:"
msgstr "?techhelp: kanssa)"
-#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:591
+#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:597
#: client/gui-xaw/helpdlg.c:996
#, c-format
msgid "+%d Trade / %d"
msgstr "+%d Kauppaa / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:595
+#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:601
#: client/gui-xaw/helpdlg.c:1000
#, c-format
msgid "no extra / %d"
msgstr "ei lisiä / %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
-#: client/gui-win32/helpdlg.c:602 client/gui-win32/helpdlg.c:616
-#: client/gui-win32/helpdlg.c:635 client/gui-xaw/helpdlg.c:1002
+#: client/gui-gtk-2.0/helpdlg.c:1085 client/gui-win32/helpdlg.c:604
+#: client/gui-win32/helpdlg.c:608 client/gui-win32/helpdlg.c:622
+#: client/gui-win32/helpdlg.c:641 client/gui-xaw/helpdlg.c:1002
#: client/gui-xaw/helpdlg.c:1006 client/gui-xaw/helpdlg.c:1020
#: client/gui-xaw/helpdlg.c:1039
msgid "n/a"
msgstr "-"
-#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:605
+#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:611
#: client/gui-xaw/helpdlg.c:1009
#, c-format
msgid "+%d Food / %d"
msgstr "+%d Ruokaa / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:619
+#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:625
#: client/gui-xaw/helpdlg.c:1023
#, c-format
msgid "+%d Res. / %d"
@@ -12031,9 +12215,8 @@ msgid "City _Productions"
msgstr "Kaupunkien tuotanto"
#: client/gui-gtk-2.0/menu.c:811
-#, fuzzy
msgid "City Buy Cost"
-msgstr "Kokonaismenot: %d"
+msgstr "Kaupunkien ostohinnat"
#: client/gui-gtk-2.0/menu.c:813
msgid "City Traderoutes"
@@ -12270,27 +12453,24 @@ msgid "Select"
msgstr "Valitse"
#: client/gui-gtk-2.0/menu.c:934
-#, fuzzy
msgid "Single"
-msgstr "viidakko"
+msgstr "Yksittäinen"
#: client/gui-gtk-2.0/menu.c:936
-#, fuzzy
msgid "Same Type On Tile"
-msgstr "Valitse sama tyyppi kohdassa"
+msgstr "Sama tyyppi ruudulla"
#: client/gui-gtk-2.0/menu.c:938
msgid "All On Tile"
-msgstr ""
+msgstr "Kaikki ruudulla"
#: client/gui-gtk-2.0/menu.c:940
-#, fuzzy
msgid "Same Type On Continent"
-msgstr "Valitse sama tyyppi kohdassa"
+msgstr "Sama tyyppi mantereella"
#: client/gui-gtk-2.0/menu.c:942
msgid "Same Type Everywhere"
-msgstr ""
+msgstr "Sama tyyppi kaikkialla"
#: client/gui-gtk-2.0/menu.c:944 client/gui-win32/menu.c:393
msgid "_Wait"
@@ -12541,14 +12721,12 @@ msgid "Cancel _Treaty"
msgstr "Pura _sopimus"
#: client/gui-gtk-2.0/plrdlg.c:329
-#, fuzzy
msgid "_Withdraw Vision"
-msgstr "Lopeta näkymä"
+msgstr "_Lopeta näkymä"
#: client/gui-gtk-2.0/plrdlg.c:348
-#, fuzzy
msgid "_Report"
-msgstr "_Raportit"
+msgstr "_Raportoi"
#: client/gui-gtk-2.0/plrdlg.c:386
msgid "?show:Dead Players"
@@ -12565,9 +12743,8 @@ msgid "Nations"
msgstr "Kansakunnat"
#: client/gui-gtk-2.0/plrdlg.c:511
-#, fuzzy
msgid "Di_plomacy"
-msgstr "Diplomatia"
+msgstr "Di_plomatia"
#: client/gui-gtk-2.0/plrdlg.c:516
msgid "_Intelligence"
@@ -12599,43 +12776,43 @@ msgstr "_Yhdistä verkkopeliin"
#: client/gui-gtk-2.0/pages.c:247
msgid "Connect to Gaming _Zone"
-msgstr "Yhdistä verkkopeliin"
+msgstr "Y_hdistä pelialueelle"
-#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:302
#: 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:779 client/gui-gtk-2.0/pages.c:820
-#: client/gui-win32/connectdlg.c:916
+#: client/gui-win32/connectdlg.c:918
msgid "Server Name"
msgstr "Palvelimen nimi"
#: client/gui-gtk-2.0/pages.c:780 client/gui-gtk-2.0/pages.c:821
-#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:916
+#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:918
#: data/Freeciv.in:96
msgid "Port"
msgstr "Portti"
#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Version"
msgstr "Versio"
#: client/gui-gtk-2.0/pages.c:782 client/gui-gtk-2.0/pages.c:823
-#: client/gui-gtk-2.0/pages.c:2161 client/gui-win32/connectdlg.c:917
-#: client/gui-win32/connectdlg.c:995
+#: client/gui-gtk-2.0/pages.c:2163 client/gui-win32/connectdlg.c:919
+#: client/gui-win32/connectdlg.c:997
msgid "Status"
msgstr "Tila"
#: client/gui-gtk-2.0/pages.c:783 client/gui-gtk-2.0/pages.c:824
#: client/gui-sdl/connectdlg.c:318 client/gui-sdl/plrdlg.c:330
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Players"
msgstr "Pelaajat"
#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
-#: client/gui-win32/connectdlg.c:918
+#: client/gui-win32/connectdlg.c:920
msgid "Comment"
msgstr "Lisätiedot"
@@ -12667,9 +12844,9 @@ msgstr "Sala_sana:"
msgid "Conf_irm Password:"
msgstr "Vahv_ista salasana:"
-#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2165
#: 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:1000
+#: client/gui-win32/citydlg.c:1083 client/gui-win32/connectdlg.c:1002
#: client/gui-win32/wldlg.c:800 client/gui-win32/wldlg.c:806
msgid "Type"
msgstr "Yksikön tyyppi"
@@ -12761,7 +12938,7 @@ msgstr "AI:n vaikeus_taso:"
msgid "Ruleset _Version:"
msgstr "Sääntökokoelman _versio:"
-#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2195
msgid "_More Game Options..."
msgstr "_Lisää peliasetuksia..."
@@ -12778,49 +12955,48 @@ msgstr "Luokitus"
msgid "Ready"
msgstr "Valmis"
-#: client/gui-gtk-2.0/pages.c:1601
-#, fuzzy
+#: client/gui-gtk-2.0/pages.c:1600
msgid "?player:Leader"
-msgstr "Nimi"
+msgstr "Hallitsija"
-#: client/gui-gtk-2.0/pages.c:1732 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1734 client/gui-sdl/chatline.c:185
msgid "Choose Saved Game to Load"
msgstr "Valitse ladattava peli"
-#: client/gui-gtk-2.0/pages.c:1824
+#: client/gui-gtk-2.0/pages.c:1826
msgid "Choose Saved Game to _Load:"
msgstr "Valitse _ladattava peli:"
-#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
-#: client/gui-gtk-2.0/pages.c:2451
+#: client/gui-gtk-2.0/pages.c:1846 client/gui-gtk-2.0/pages.c:2039
+#: client/gui-gtk-2.0/pages.c:2455
msgid "_Browse..."
msgstr "_Selaa..."
-#: client/gui-gtk-2.0/pages.c:1911
+#: client/gui-gtk-2.0/pages.c:1913
msgid "Choose a Scenario"
msgstr "Valitse skenaario"
-#: client/gui-gtk-2.0/pages.c:1998
+#: client/gui-gtk-2.0/pages.c:2000
msgid "Choose a _Scenario:"
msgstr "Valitse _skenaario"
-#: client/gui-gtk-2.0/pages.c:2173
+#: client/gui-gtk-2.0/pages.c:2175
msgid "Choose a _nation to play:"
msgstr "Valitse pelattava _kansakunta:"
-#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2367 client/gui-win32/menu.c:581
msgid "Select Location to Save"
msgstr "Valitse sijainti johon tallennetaan"
-#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2452 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "Tallenna peli"
-#: client/gui-gtk-2.0/pages.c:2489
+#: client/gui-gtk-2.0/pages.c:2493
msgid "Saved _Games:"
msgstr "Tallennetut _pelit:"
-#: client/gui-gtk-2.0/pages.c:2516
+#: client/gui-gtk-2.0/pages.c:2520
msgid "Save _Filename:"
msgstr "Tallenna _tiedostoon:"
@@ -13172,7 +13348,7 @@ msgstr "Sulje valintaikkuna (Esc)"
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:1096
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1098
msgid "Back"
msgstr "Palaa"
@@ -13181,7 +13357,7 @@ msgid "Start"
msgstr "Aloita"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:777
+#: client/gui-win32/connectdlg.c:779
msgid "Load Game"
msgstr "Lataa peli"
@@ -13221,9 +13397,9 @@ msgstr "Tee tästä uusi kotikaupunki"
#: client/gui-sdl/connectdlg.c:308 client/gui-sdl/connectdlg.c:617
#: client/gui-sdl/connectdlg.c:803 client/gui-sdl/connectdlg.c:985
#: client/gui-sdl/dialogs.c:452 client/gui-sdl/dialogs.c:2095
-#: client/gui-sdl/dialogs.c:2893 client/gui-sdl/diplomat_dialog.c:731
+#: client/gui-sdl/dialogs.c:2902 client/gui-sdl/diplomat_dialog.c:731
#: client/gui-sdl/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1043
#: client/gui-win32/dialogs.c:1772 client/gui-win32/finddlg.c:127
#: client/gui-win32/gotodlg.c:171 client/gui-win32/inputdlg.c:146
#: client/gui-win32/messagedlg.c:216 client/gui-win32/ratesdlg.c:328
@@ -13267,7 +13443,7 @@ msgid "Buy it?"
msgstr "Ostetaanko?"
#: 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
+#: client/gui-sdl/diplodlg.c:1336 client/gui-sdl/diplomat_dialog.c:1211
#: client/gui-sdl/diplomat_dialog.c:1417 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:221 client/gui-sdl/repodlgs.c:1559
#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
@@ -13283,7 +13459,7 @@ msgid "No"
msgstr "Ei"
#: client/gui-sdl/citydlg.c:1215 client/gui-sdl/cma_fe.c:318
-#: client/gui-sdl/diplodlg.c:1345 client/gui-sdl/diplomat_dialog.c:1200
+#: client/gui-sdl/diplodlg.c:1346 client/gui-sdl/diplomat_dialog.c:1200
#: client/gui-sdl/diplomat_dialog.c:1407 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:232 client/gui-win32/repodlgs.c:578
#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
@@ -13587,7 +13763,7 @@ msgstr "Freeciv-palvelin :"
msgid "Port :"
msgstr "Portti :"
-#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1100
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr "Yhdistä"
@@ -13695,23 +13871,23 @@ msgstr "Valitse uusi hallintomuotosi"
msgid "REVOLUTION!"
msgstr "VALLANKUMOUS!"
-#: client/gui-sdl/dialogs.c:2232 client/gui-sdl/dialogs.c:2620
+#: client/gui-sdl/dialogs.c:2237 client/gui-sdl/dialogs.c:2625
#: client/gui-win32/dialogs.c:567 data/Freeciv.in:3159
msgid "Female"
msgstr "Nainen"
-#: client/gui-sdl/dialogs.c:2234 client/gui-sdl/dialogs.c:2618
-#: client/gui-sdl/dialogs.c:2830 client/gui-win32/dialogs.c:565
+#: client/gui-sdl/dialogs.c:2239 client/gui-sdl/dialogs.c:2623
+#: client/gui-sdl/dialogs.c:2839 client/gui-win32/dialogs.c:565
msgid "Male"
msgstr "Mies"
-#: client/gui-sdl/dialogs.c:2478 client/gui-sdl/dialogs.c:2902
+#: client/gui-sdl/dialogs.c:2483 client/gui-sdl/dialogs.c:2911
#: 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 "Selvä!"
-#: client/gui-sdl/dialogs.c:2685 client/gui-win32/dialogs.c:505
+#: client/gui-sdl/dialogs.c:2694 client/gui-win32/dialogs.c:505
msgid "What nation will you be?"
msgstr "Mitä kansakuntaa haluat johtaa?"
@@ -13738,79 +13914,79 @@ msgstr "Maailmankartta"
msgid "Sea map"
msgstr "Merikartta"
-#: client/gui-sdl/diplodlg.c:563
+#: client/gui-sdl/diplodlg.c:564
msgid "Give embassy"
msgstr "Myönnä lähetystö"
-#: client/gui-sdl/diplodlg.c:579 client/gui-win32/diplodlg.c:614
+#: client/gui-sdl/diplodlg.c:580 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 "Kultaa(max %d)"
-#: client/gui-sdl/diplodlg.c:613 client/gui-sdl/helpdlg.c:1956
+#: client/gui-sdl/diplodlg.c:614 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 "Edistysaskeleet"
-#: client/gui-sdl/diplodlg.c:831 client/gui-win32/diplodlg.c:598
+#: client/gui-sdl/diplodlg.c:832 client/gui-win32/diplodlg.c:598
#: data/Freeciv.in:269
msgid "Diplomacy meeting"
msgstr "Diplomaattinen kohtaaminen"
-#: client/gui-sdl/diplodlg.c:883 client/gui-win32/diplodlg.c:680
+#: client/gui-sdl/diplodlg.c:884 client/gui-win32/diplodlg.c:680
#: data/Freeciv.in:510
msgid "Cancel meeting"
msgstr "Peruuta tapaaminen"
-#: client/gui-sdl/diplodlg.c:895 client/gui-win32/diplodlg.c:679
+#: client/gui-sdl/diplodlg.c:896 client/gui-win32/diplodlg.c:679
#: data/Freeciv.in:501
msgid "Accept treaty"
msgstr "Hyväksy sopimus"
#. TRANS: "Polish incident !" FIXME!!!
-#: client/gui-sdl/diplodlg.c:1304
+#: client/gui-sdl/diplodlg.c:1305
#, c-format
msgid "%s incident !"
msgstr "%s selkkaus!"
-#: client/gui-sdl/diplodlg.c:1322
+#: client/gui-sdl/diplodlg.c:1323
msgid "Shall we declare WAR on them?"
msgstr "Julistammeko SODAN heitä vastaan?"
-#: client/gui-sdl/diplodlg.c:1433
+#: client/gui-sdl/diplodlg.c:1434
msgid "Foreign Minister"
msgstr "Ulkoministeri"
-#: client/gui-sdl/diplodlg.c:1449
+#: client/gui-sdl/diplodlg.c:1450
#, c-format
msgid ""
"Sir!, the %s ambassador has arrived\n"
"What are your wishes?"
msgstr ""
-"Kunnioitettu johtaja, %s lähettiläs on saapunut.\n"
+"Kunnioitettu hallitsija, %s lähettiläs on saapunut.\n"
"Mitä määräätte?"
-#: client/gui-sdl/diplodlg.c:1465
+#: client/gui-sdl/diplodlg.c:1466
msgid "Declare WAR"
msgstr "Julista SOTA"
-#: client/gui-sdl/diplodlg.c:1467 client/gui-win32/plrdlg.c:357
+#: client/gui-sdl/diplodlg.c:1468 client/gui-win32/plrdlg.c:357
msgid "Cancel Treaty"
msgstr "Pura sopimus"
-#: client/gui-sdl/diplodlg.c:1490 client/gui-win32/plrdlg.c:358
+#: client/gui-sdl/diplodlg.c:1491 client/gui-win32/plrdlg.c:358
#: data/Freeciv.in:3254
msgid "Withdraw vision"
msgstr "Irtisano jaettu näkymä"
-#: client/gui-sdl/diplodlg.c:1507
+#: client/gui-sdl/diplodlg.c:1508
msgid "Call Diplomatic Meeting"
msgstr "Kutsu diplomaattinen kokous"
-#: client/gui-sdl/diplodlg.c:1521
+#: client/gui-sdl/diplodlg.c:1522
msgid "Send him back"
msgstr "Lähetä hänet pois"
@@ -14553,12 +14729,12 @@ msgid "Leave Game"
msgstr "Poistu pelistä"
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1100 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1102 client/gui-xaw/menu.c:121
#: data/Freeciv.in:115 data/Freeciv.in:3180
msgid "Quit"
msgstr "Lopeta"
-#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:967
msgid "Start New Game"
msgstr "Aloita uusi peli"
@@ -14675,8 +14851,8 @@ msgstr "Nettotulo: "
msgid "%s max rate : %d%%"
msgstr "%s maksimitaso: %d%%"
-#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
-#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1085
+#: client/gui-win32/connectdlg.c:1093 data/Freeciv.in:155
msgid "Update"
msgstr "Päivitä"
@@ -14703,8 +14879,8 @@ msgstr[1] "vaihetta"
#, 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 johtaja %s sai %d pisteen\n"
-msgstr[1] "%2d: %s johtaja %s sai %d pistettä\n"
+msgstr[0] "%2d: %s hallitsija %s sai %d pisteen\n"
+msgstr[1] "%2d: %s hallitsija %s sai %d pistettä\n"
#: client/gui-sdl/repodlgs.c:3395 client/gui-win32/repodlgs.c:772
#: client/gui-xaw/repodlgs.c:1161
@@ -15169,67 +15345,67 @@ msgstr "Uusi"
msgid "Delete"
msgstr "Poista"
-#: client/gui-win32/connectdlg.c:147
+#: client/gui-win32/connectdlg.c:149
msgid "Password:"
msgstr "Salasana:"
-#: client/gui-win32/connectdlg.c:169
+#: client/gui-win32/connectdlg.c:171
msgid "Couldn't load the savegame"
msgstr "Tallennetun pelin lataaminen epäonnistui."
-#: client/gui-win32/connectdlg.c:284 client/gui-xaw/connectdlg.c:311
+#: client/gui-win32/connectdlg.c:286 client/gui-xaw/connectdlg.c:311
msgid "Verify Password"
msgstr "Vahvista salasana"
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:916 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr "Freeciv-palvelimen valinta"
-#: client/gui-win32/connectdlg.c:915
+#: client/gui-win32/connectdlg.c:917
msgid "Local Area Network"
msgstr "Paikallisverkko (LAN)"
-#: client/gui-win32/connectdlg.c:949
+#: client/gui-win32/connectdlg.c:951
msgid "Welcome to Freeciv"
msgstr "Tervetuloa pelaamaan Freeciviä"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Load Saved Game"
msgstr "Lataa tallennettu peli"
-#: client/gui-win32/connectdlg.c:969
+#: client/gui-win32/connectdlg.c:971
msgid "Connect To Network Game"
msgstr "Yhdistä verkkopeliin"
-#: client/gui-win32/connectdlg.c:979
+#: client/gui-win32/connectdlg.c:981
msgid "Choose a nation to play"
msgstr "Valitse pelattava kansakunta"
-#: client/gui-win32/connectdlg.c:1014
+#: client/gui-win32/connectdlg.c:1016
msgid "Number of players (Including AI):"
msgstr "Pelaajien määrä (mukaanlukien AI-pelaajat):"
-#: client/gui-win32/connectdlg.c:1022
+#: client/gui-win32/connectdlg.c:1024
msgid "AI skill level:"
msgstr "AI:n vaikeustaso:"
-#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1038 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr "Pelin asetukset"
-#: client/gui-win32/connectdlg.c:1040
+#: client/gui-win32/connectdlg.c:1042
msgid "Start Game"
msgstr "Aloita peli"
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Login:"
msgstr "Kirjaudu sisään:"
-#: client/gui-win32/connectdlg.c:1061
+#: client/gui-win32/connectdlg.c:1063
msgid "Host:"
msgstr "Palvelin:"
-#: client/gui-win32/connectdlg.c:1062
+#: client/gui-win32/connectdlg.c:1064
msgid "Port:"
msgstr "Portti:"
@@ -15239,7 +15415,7 @@ msgstr "Siirry ja sulje"
#: client/gui-win32/dialogs.c:555
msgid "Leader:"
-msgstr "Johtaja:"
+msgstr "Hallitsija:"
#: client/gui-win32/dialogs.c:575
msgid "City Style:"
@@ -15311,21 +15487,21 @@ msgstr ""
"blending) järjestetyn ditherin (ordered dither) sijaan. Jos alfasekoitusta "
"ei tueta laitteistotasolla, tämä on paljon hitaampaa."
-#: client/gui-win32/helpdlg.c:769 client/gui-win32/helpdlg.c:792
-#: client/gui-win32/helpdlg.c:803 client/gui-win32/helpdlg.c:809
-#: client/gui-win32/helpdlg.c:822
+#: client/gui-win32/helpdlg.c:775 client/gui-win32/helpdlg.c:798
+#: client/gui-win32/helpdlg.c:809 client/gui-win32/helpdlg.c:815
+#: client/gui-win32/helpdlg.c:828
msgid "Allows "
msgstr "Sallii: "
-#: client/gui-win32/helpdlg.c:780
+#: client/gui-win32/helpdlg.c:786
msgid "Obsoletes "
msgstr "Vanhentaa: "
-#: client/gui-win32/helpdlg.c:812 client/gui-win32/helpdlg.c:825
+#: client/gui-win32/helpdlg.c:818 client/gui-win32/helpdlg.c:831
msgid " (with "
msgstr " (yhdessä askeleen "
-#: client/gui-win32/helpdlg.c:815 client/gui-win32/helpdlg.c:828
+#: client/gui-win32/helpdlg.c:821 client/gui-win32/helpdlg.c:834
msgid "?techhelp:)."
msgstr "?techhelp: kanssa)."
@@ -16424,7 +16600,7 @@ msgstr "Peli ei ole alkanut"
#: data/Freeciv.in:3350
msgid "Name Ready Leader Nation "
-msgstr "Nimi Valmis Johtaja Kansakunta "
+msgstr "Nimi Valmis Hallitsija Kansakunta "
#: data/helpdata.txt:38
msgid ""
@@ -16433,7 +16609,7 @@ msgid ""
"extinction of all other civilizations."
msgstr ""
"Freeciv on vuoropohjainen strategiapeli, jossa jokainen pelaaja oman "
-"sivilisaationsa johtajana taistelee saavuttaakseen lopullisen päämäärän: "
+"sivilisaationsa hallistijana taistelee saavuttaakseen lopullisen päämäärän: "
"kaikkien muiden sivilisaatioiden hävittämisen."
#: data/helpdata.txt:42
@@ -16453,12 +16629,12 @@ 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/"
+" https://gna.org/projects/freeciv/"
msgstr ""
"Jos löydät ohjelmasta vian, raportoi se mieluusti meille. Parhaiten tämä "
"onnistuu Freecivin buginseurantasivustolla: \n"
"\n"
-" http://bugs.freeciv.org/"
+" http://gna.org/projects/freeciv/"
#: data/helpdata.txt:60
msgid ""
@@ -18387,7 +18563,7 @@ msgid ""
msgstr ""
"Sisällissota tuhoaa minkä valtakunnan tahansa. Se syttyy jos menetät "
"pääkaupunkisi (sen, jossa palatsisi sijaitsee). Jopa puolet kaupungeistasi "
-"kapinoi ja liittoutuu uuden AI-johtajan kanssa. Hän saa puolet "
+"kapinoi ja liittoutuu uuden AI-hallitsijan kanssa. Hän saa puolet "
"käteisvaroistasi ja kaiken teknologisen tietämyksesi."
#: data/helpdata.txt:1367
@@ -18826,57 +19002,54 @@ msgid ""
"a Factory, Mfg. Plant and Hydro Plant together give a 150% production "
"bonus.\n"
"\n"
-"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant. A city "
-"can only build a Hydro Plant if it is next to (or on) a Mountain or River "
-"tile."
+"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant."
msgstr ""
-"Vähentää tuotannosta johtuvaa saastutusta kaupungissa 50%. Lisää Tehtaan ja "
+"Vähentää tuotannosta johtuvaa saastumista kaupungissa 50%. Lisää Tehtaan ja "
"Teollisuuskompleksin tuotantoa: Tehdas ja Vesivoimala yhdessä antavat 75% "
-"lisän, ja Tehdas, Teollisuuskompleksi ja Vesivoimala yhdessä antavat 150% "
-"bonuksen.\n"
+"lisän, kun taas Tehdas, Teollisuuskompleksi ja Vesivoimala yhdessä antavat "
+"150% bonuksen.\n"
"\n"
-"Kaupungissa voi olla vain yksi voimala. Vesivoimala voidaan rakentaa vain "
-"joen tai vuoren välittömään läheisyyteen."
+"Kaupungissa voi olla vain yksi voimalaitos: vesi-, hiili- tai ydinvoimala."
-#: data/default/buildings.ruleset:397 data/civ2/buildings.ruleset:373
+#: data/default/buildings.ruleset:396 data/civ2/buildings.ruleset:373
#: data/civ1/buildings.ruleset:297
msgid "Library"
msgstr "Kirjasto"
-#: data/default/buildings.ruleset:412
+#: data/default/buildings.ruleset:411
#, no-c-format
msgid "Increases the science output in a city by 100%."
msgstr "Kasvattaa kaupungin tutkimustuotantoa 100%."
-#: data/default/buildings.ruleset:417 data/civ2/buildings.ruleset:393
+#: data/default/buildings.ruleset:416 data/civ2/buildings.ruleset:393
#: data/civ1/buildings.ruleset:317
msgid "Marketplace"
msgstr "Tori"
-#: data/default/buildings.ruleset:432 data/civ2/buildings.ruleset:408
+#: data/default/buildings.ruleset:431 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 "Lisää kaupungin luksusta ja verokertymää 50%."
-#: data/default/buildings.ruleset:437 data/civ2/buildings.ruleset:413
+#: data/default/buildings.ruleset:436 data/civ2/buildings.ruleset:413
#: data/civ1/buildings.ruleset:337
msgid "Mass Transit"
msgstr "Joukkoliikenne"
-#: data/default/buildings.ruleset:451 data/civ2/buildings.ruleset:427
+#: data/default/buildings.ruleset:450 data/civ2/buildings.ruleset:427
#: data/civ1/buildings.ruleset:351
msgid ""
"Neutralizes the pollution generated by the population. The population "
"simply has no effect on the pollution generated in the city."
msgstr "Poistaa väkimäärän vaikutuksen kaupungin saastutukseen."
-#: data/default/buildings.ruleset:458 data/civ2/buildings.ruleset:434
+#: data/default/buildings.ruleset:457 data/civ2/buildings.ruleset:434
#: data/civ1/buildings.ruleset:358
msgid "Mfg. Plant"
msgstr "Teollisuuskompleksi"
-#: data/default/buildings.ruleset:474 data/civ2/buildings.ruleset:450
+#: data/default/buildings.ruleset:473 data/civ2/buildings.ruleset:450
#: data/civ1/buildings.ruleset:374
#, no-c-format
msgid ""
@@ -18885,12 +19058,12 @@ msgid ""
msgstr ""
"Yhdessä Tehtaan kanssa Teollisuuskompleksi lisää tuotantoa kaupungissa 100%."
-#: data/default/buildings.ruleset:480 data/civ2/buildings.ruleset:456
+#: data/default/buildings.ruleset:479 data/civ2/buildings.ruleset:456
#: data/civ1/buildings.ruleset:380
msgid "Nuclear Plant"
msgstr "Ydinvoimala"
-#: data/default/buildings.ruleset:495
+#: data/default/buildings.ruleset:494
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 "
@@ -18907,11 +19080,11 @@ msgstr ""
"\n"
"Kaupungissa voi olla vain yksi voimalaitos."
-#: data/default/buildings.ruleset:515 data/civ2/buildings.ruleset:489
+#: data/default/buildings.ruleset:514 data/civ2/buildings.ruleset:489
msgid "Offshore Platform"
msgstr "Porauslautta"
-#: data/default/buildings.ruleset:530 data/civ2/buildings.ruleset:504
+#: data/default/buildings.ruleset:529 data/civ2/buildings.ruleset:504
msgid ""
"Adds 1 extra shield resource on all Ocean squares in a city. The city needs "
"to be coastal to build this improvement."
@@ -18919,12 +19092,12 @@ msgstr ""
"Kaikkien kaupungin meriruutujen tuotanto lisääntyy yhdellä. Voidaan "
"rakentaa vain rannikkokaupunkeihin."
-#: data/default/buildings.ruleset:536 data/civ2/buildings.ruleset:510
+#: data/default/buildings.ruleset:535 data/civ2/buildings.ruleset:510
#: data/civ1/buildings.ruleset:411
msgid "Palace"
msgstr "Palatsi"
-#: data/default/buildings.ruleset:552
+#: data/default/buildings.ruleset:551
#, no-c-format
msgid ""
"Makes a city the capital and the center of your government. Corruption in "
@@ -18952,11 +19125,11 @@ msgstr ""
"Yksinvaltiuden alla palatsi antaa myös +75% tuotantobonuksen, monarkian alla "
"taas +50% tuotantobonuksen."
-#: data/default/buildings.ruleset:569 data/civ2/buildings.ruleset:539
+#: data/default/buildings.ruleset:568 data/civ2/buildings.ruleset:539
msgid "Police Station"
msgstr "Poliisiasema"
-#: data/default/buildings.ruleset:583 data/civ2/buildings.ruleset:553
+#: data/default/buildings.ruleset:582 data/civ2/buildings.ruleset:553
msgid ""
"Reduces the unhappiness caused by military units outside the city by 2 under "
"Democracy and 1 under Republic. This improvement has no effect under other "
@@ -18966,11 +19139,11 @@ msgstr ""
"kahdella Demokratiassa ja yhdellä Tasavallassa. Ei vaikutusta muissa "
"hallitusmuodoissa."
-#: data/default/buildings.ruleset:593 data/civ2/buildings.ruleset:560
+#: data/default/buildings.ruleset:592 data/civ2/buildings.ruleset:560
msgid "Port Facility"
msgstr "Sotilassatama"
-#: data/default/buildings.ruleset:608 data/civ2/buildings.ruleset:575
+#: data/default/buildings.ruleset:607 data/civ2/buildings.ruleset:575
msgid ""
"Allows a city to build veteran sea units. Also, damaged sea units which "
"stay in town for one full turn without moving are completely restored."
@@ -18979,12 +19152,12 @@ msgstr ""
"yksiköt, jotka viipyvät kaupungissa täyden vuoron liikkumatta korjataan "
"täydellisesti."
-#: data/default/buildings.ruleset:615 data/civ2/buildings.ruleset:582
+#: data/default/buildings.ruleset:614 data/civ2/buildings.ruleset:582
#: data/civ1/buildings.ruleset:440
msgid "Power Plant"
msgstr "Hiilivoimala"
-#: data/default/buildings.ruleset:631
+#: data/default/buildings.ruleset:630
#, no-c-format
msgid ""
"Increases the shield production of a Factory or Mfg. Plant in a city: a "
@@ -19001,12 +19174,12 @@ msgstr ""
"\n"
"Kaupungissa voi olla vain yksi voimalaitos."
-#: data/default/buildings.ruleset:646 data/civ2/buildings.ruleset:610
+#: data/default/buildings.ruleset:645 data/civ2/buildings.ruleset:610
#: data/civ1/buildings.ruleset:468
msgid "Recycling Center"
msgstr "Kierrätyskeskus"
-#: data/default/buildings.ruleset:661 data/civ2/buildings.ruleset:625
+#: data/default/buildings.ruleset:660 data/civ2/buildings.ruleset:625
#: data/civ1/buildings.ruleset:483
#, no-c-format
msgid ""
@@ -19016,11 +19189,11 @@ msgstr ""
"Kierrätyskeskuksen rakentaminen Vähentää kaupungin tuotannosta johtuvan "
"saasteen määrää 66%."
-#: data/default/buildings.ruleset:667 data/civ2/buildings.ruleset:631
+#: data/default/buildings.ruleset:666 data/civ2/buildings.ruleset:631
msgid "Research Lab"
msgstr "Tutkimuslaitos"
-#: data/default/buildings.ruleset:682
+#: data/default/buildings.ruleset:681
msgid ""
"Together with a Library, a Research Lab increases the science production of "
"a city by 200%. Together with a Library and a University, a Research Lab "
@@ -19030,11 +19203,11 @@ msgstr ""
"200%. Tutkimuslaitos yhdessä Kirjaston ja Yliopiston kanssa lisää "
"tutkimuspanosta 450%."
-#: data/default/buildings.ruleset:690 data/civ2/buildings.ruleset:654
+#: data/default/buildings.ruleset:689 data/civ2/buildings.ruleset:654
msgid "SAM Battery"
msgstr "Ilmatorjuntaohjuspatteri"
-#: data/default/buildings.ruleset:704 data/civ2/buildings.ruleset:668
+#: data/default/buildings.ruleset:703 data/civ2/buildings.ruleset:668
msgid ""
"Doubles the defense of all units inside the city when attacked by non-"
"nuclear air units."
@@ -19042,12 +19215,12 @@ msgstr ""
"Kaksinkertaistaa kaikkien kaupungissa olevien yksiköiden puolustuskyvyn "
"ilmaiskua vastaan. Ei tehoa ydiniskuun."
-#: data/default/buildings.ruleset:710 data/civ2/buildings.ruleset:674
+#: data/default/buildings.ruleset:709 data/civ2/buildings.ruleset:674
#: data/civ1/buildings.ruleset:489
msgid "SDI Defense"
msgstr "Tähtien sota"
-#: data/default/buildings.ruleset:724 data/civ2/buildings.ruleset:688
+#: data/default/buildings.ruleset:723 data/civ2/buildings.ruleset:688
#: data/civ1/buildings.ruleset:503
msgid ""
"Protects a city from attacks from Nuclear units. Nuclear attacks simply "
@@ -19057,11 +19230,11 @@ msgstr ""
"Suojelee kaupunkia ydiniskulta. Ydiniskut eivät vaikuta kaupunkiin "
"mitenkään. Kaksinkertaistaa puolustuskyvyn tavanomaisia ohjuksia vastaan."
-#: data/default/buildings.ruleset:733 data/civ2/buildings.ruleset:697
+#: data/default/buildings.ruleset:732 data/civ2/buildings.ruleset:697
msgid "Sewer System"
msgstr "Viemäriverkosto"
-#: data/default/buildings.ruleset:748 data/civ2/buildings.ruleset:712
+#: data/default/buildings.ruleset:747 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."
@@ -19069,12 +19242,12 @@ msgstr ""
"Sallii kaupungin kasvaa suuremmaksi kuin 12. Ensin tosin tarvitaan "
"vesijohtoverkosto, jotta kaupunki voisi kasvaa suuremmaksi kuin 8."
-#: data/default/buildings.ruleset:754 data/civ2/buildings.ruleset:749
+#: data/default/buildings.ruleset:753 data/civ2/buildings.ruleset:749
#: data/civ1/buildings.ruleset:512
msgid "Space Component"
msgstr "Avaruusaluksen komponentti"
-#: data/default/buildings.ruleset:769 data/civ2/buildings.ruleset:763
+#: data/default/buildings.ruleset:768 data/civ2/buildings.ruleset:763
#: data/civ1/buildings.ruleset:526
msgid ""
"Space Components can be differentiated into Propulsion and Fuel Components. "
@@ -19090,12 +19263,12 @@ msgstr ""
"Ennen kuin voit rakentaa avaruusaluksen osia, on jonkun pelaajan pitänyt "
"rakentaa Apollo-ohjelma."
-#: data/default/buildings.ruleset:779 data/civ2/buildings.ruleset:773
+#: data/default/buildings.ruleset:778 data/civ2/buildings.ruleset:773
#: data/civ1/buildings.ruleset:536
msgid "Space Module"
msgstr "Avaruusaseman moduuli"
-#: data/default/buildings.ruleset:794 data/civ2/buildings.ruleset:787
+#: data/default/buildings.ruleset:793 data/civ2/buildings.ruleset:787
#: data/civ1/buildings.ruleset:550
msgid ""
"Space Modules are the most expensive parts of spaceships. There are three "
@@ -19127,12 +19300,12 @@ msgstr ""
"Ennen kuin voit rakentaa avaruusaluksen osia, on jonkun pelaajan pitänyt "
"rakentaa Apollo-ohjelma."
-#: data/default/buildings.ruleset:813 data/civ2/buildings.ruleset:806
+#: data/default/buildings.ruleset:812 data/civ2/buildings.ruleset:806
#: data/civ1/buildings.ruleset:569
msgid "Space Structural"
msgstr "Avaruusaseman runko-osa"
-#: data/default/buildings.ruleset:828 data/civ2/buildings.ruleset:820
+#: data/default/buildings.ruleset:827 data/civ2/buildings.ruleset:820
#: data/civ1/buildings.ruleset:583
msgid ""
"Space Structurals form the base of your spaceship. All other spaceship "
@@ -19149,11 +19322,11 @@ msgstr ""
"Ennen kuin voit rakentaa avaruusaluksen osia, on jonkun pelaajan pitänyt "
"rakentaa Apollo-ohjelma."
-#: data/default/buildings.ruleset:838 data/civ2/buildings.ruleset:830
+#: data/default/buildings.ruleset:837 data/civ2/buildings.ruleset:830
msgid "Stock Exchange"
msgstr "Pörssi"
-#: data/default/buildings.ruleset:854 data/civ2/buildings.ruleset:846
+#: data/default/buildings.ruleset:853 data/civ2/buildings.ruleset:846
#, no-c-format
msgid ""
"Together with a Marketplace and a Bank, a Stock Exchange boosts tax and "
@@ -19162,21 +19335,21 @@ msgstr ""
"Yhdessä Torin ja Pankin kanssa lisää luksuksen ja verojen tuottoja "
"kaupungissa 150%."
-#: data/default/buildings.ruleset:860 data/civ2/buildings.ruleset:852
+#: data/default/buildings.ruleset:859 data/civ2/buildings.ruleset:852
msgid "Super Highways"
msgstr "Moottoritie"
-#: data/default/buildings.ruleset:875 data/civ2/buildings.ruleset:867
+#: data/default/buildings.ruleset:874 data/civ2/buildings.ruleset:867
#, no-c-format
msgid ""
"Increases trade resources by 50% on all squares with roads or railroads."
msgstr "Lisää kauppaa 50% kaikissa ruuduissa joissa on tie tai rautatie."
-#: data/default/buildings.ruleset:883 data/civ2/buildings.ruleset:873
+#: data/default/buildings.ruleset:882 data/civ2/buildings.ruleset:873
msgid "Supermarket"
msgstr "Supermarket"
-#: data/default/buildings.ruleset:898 data/civ2/buildings.ruleset:888
+#: data/default/buildings.ruleset:897 data/civ2/buildings.ruleset:888
#, no-c-format
msgid ""
"Increases the food resources by 50% on each farmland square which is being "
@@ -19186,12 +19359,12 @@ msgstr ""
"Lisää ruuan tuotantoa 50% kaikilla kaupungin viljelysmailla. Viljelysmailla "
"on kaksinkertainen kasteluverkosto."
-#: data/default/buildings.ruleset:905 data/civ2/buildings.ruleset:895
+#: data/default/buildings.ruleset:904 data/civ2/buildings.ruleset:895
#: data/civ1/buildings.ruleset:593
msgid "Temple"
msgstr "Temppeli"
-#: data/default/buildings.ruleset:919 data/civ2/buildings.ruleset:909
+#: data/default/buildings.ruleset:918 data/civ2/buildings.ruleset:909
#: data/civ1/buildings.ruleset:607
msgid ""
"Makes one unhappy citizen content. Both the Mysticism advance and the "
@@ -19201,13 +19374,13 @@ msgstr ""
"Muuttaa yhden tyytymättömän asukkaan rauhalliseksi. Sekä Mystiikka että "
"Oraakkeli tuplaavat tämän vaikutuksen."
-#: data/default/buildings.ruleset:926 data/civ2/buildings.ruleset:916
+#: data/default/buildings.ruleset:925 data/civ2/buildings.ruleset:916
#: data/civ1/buildings.ruleset:614 data/default/techs.ruleset:742
#: data/civ2/techs.ruleset:727 data/civ1/techs.ruleset:723
msgid "University"
msgstr "Yliopisto"
-#: data/default/buildings.ruleset:942
+#: data/default/buildings.ruleset:941
#, no-c-format
msgid ""
"Together with a Library, a University increases the science production of a "
@@ -19215,12 +19388,12 @@ msgid ""
msgstr ""
"Yliopisto yhdessä Kirjaston kanssa lisää tutkimuspanosta kaupungissa 250%"
-#: data/default/buildings.ruleset:948 data/civ2/buildings.ruleset:938
+#: data/default/buildings.ruleset:947 data/civ2/buildings.ruleset:938
#: data/civ1/buildings.ruleset:636
msgid "Apollo Program"
msgstr "Apollo-ohjelma"
-#: data/default/buildings.ruleset:962 data/civ2/buildings.ruleset:952
+#: data/default/buildings.ruleset:961 data/civ2/buildings.ruleset:952
msgid ""
"Entire map becomes visible for the player who owns it. It allows all "
"players to start building spaceship parts (assuming they have researched the "
@@ -19229,11 +19402,11 @@ msgstr ""
"Apollon rakentanut pelaaja näkee koko maailman kartan. Kaikki pelaajat "
"voivat alkaa rakentaa avaruusalusta (jos heidän teknologiansa riittää)."
-#: data/default/buildings.ruleset:969 data/civ2/buildings.ruleset:959
+#: data/default/buildings.ruleset:968 data/civ2/buildings.ruleset:959
msgid "A.Smith's Trading Co."
msgstr "Adam Smithin kauppakomppania"
-#: data/default/buildings.ruleset:983
+#: data/default/buildings.ruleset:982
msgid ""
"City improvements which would normally have an upkeep of 1 are free of "
"upkeep, for all your cities."
@@ -19241,12 +19414,12 @@ msgstr ""
"Kaikkien perusparannusten, joiden normaali ylläpitokustannus on 1, ylläpito "
"on ilmaista. Koskee pelaajan kaikkia kaupunkeja."
-#: data/default/buildings.ruleset:989 data/civ2/buildings.ruleset:979
+#: data/default/buildings.ruleset:988 data/civ2/buildings.ruleset:979
#: data/civ1/buildings.ruleset:655
msgid "Colossus"
msgstr "Kolossipatsas"
-#: data/default/buildings.ruleset:1003 data/civ2/buildings.ruleset:993
+#: data/default/buildings.ruleset:1002 data/civ2/buildings.ruleset:993
#: data/civ1/buildings.ruleset:669
msgid ""
"Each square around the city where this wonder is built that is already "
@@ -19255,23 +19428,23 @@ msgstr ""
"Kaikki kauppaa tuottavat ruudut tämän kaupungin ympärillä tuottavat yhden "
"yksikön enemmän kauppaa."
-#: data/default/buildings.ruleset:1009 data/civ2/buildings.ruleset:999
+#: data/default/buildings.ruleset:1008 data/civ2/buildings.ruleset:999
#: data/civ1/buildings.ruleset:675
msgid "Copernicus' Observatory"
msgstr "Kopernikuksen observatorio"
-#: data/default/buildings.ruleset:1024 data/civ2/buildings.ruleset:1180
+#: data/default/buildings.ruleset:1023 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 "Lisää tutkimuspanosta kaupungissaan 100%."
-#: data/default/buildings.ruleset:1029 data/civ2/buildings.ruleset:1019
+#: data/default/buildings.ruleset:1028 data/civ2/buildings.ruleset:1019
#: data/civ1/buildings.ruleset:695
msgid "Cure For Cancer"
msgstr "Syövän parannus"
-#: data/default/buildings.ruleset:1043
+#: data/default/buildings.ruleset:1042
msgid ""
"This stunning technological achievement makes one unhappy citizen content in "
"all your cities."
@@ -19279,12 +19452,12 @@ msgstr ""
"Tämä hämmästyttävä lääketieteellinen saavutus muuttaa yhden tyytymättömän "
"asukkaan rauhalliseksi kaikissa kaupungeissa."
-#: data/default/buildings.ruleset:1051 data/civ2/buildings.ruleset:1039
+#: data/default/buildings.ruleset:1050 data/civ2/buildings.ruleset:1039
#: data/civ1/buildings.ruleset:715
msgid "Darwin's Voyage"
msgstr "Darwinin tutkimusretket"
-#: data/default/buildings.ruleset:1065 data/civ2/buildings.ruleset:1053
+#: data/default/buildings.ruleset:1064 data/civ2/buildings.ruleset:1053
#: data/civ1/buildings.ruleset:729
msgid ""
"Charles Darwin's voyage sparked the discovery of the evolution of the "
@@ -19294,11 +19467,11 @@ msgstr ""
"Charles Darwin lisäsi tutkimuksellaan lajien synnystä ihmisten uskoa tieteen "
"mahtiin. Antaa kaksi teknologista edistysaskelta välittömästi."
-#: data/default/buildings.ruleset:1072 data/civ2/buildings.ruleset:1060
+#: data/default/buildings.ruleset:1071 data/civ2/buildings.ruleset:1060
msgid "Eiffel Tower"
msgstr "Eiffel-torni"
-#: data/default/buildings.ruleset:1087
+#: data/default/buildings.ruleset:1086
#, no-c-format
msgid ""
"Your reputation and goodwill among other nations is recovered twice as fast."
@@ -19306,12 +19479,12 @@ msgstr ""
"Maineesi muiden kansojen keskuudessa ja näiden hyväntahtoisuus palautuvat "
"kaksi kertaa tavallista nopeammin."
-#: data/default/buildings.ruleset:1093 data/civ2/buildings.ruleset:1081
+#: data/default/buildings.ruleset:1092 data/civ2/buildings.ruleset:1081
#: data/civ1/buildings.ruleset:736
msgid "Great Library"
msgstr "Aleksandrian kirjasto"
-#: data/default/buildings.ruleset:1107 data/civ2/buildings.ruleset:1095
+#: data/default/buildings.ruleset:1106 data/civ2/buildings.ruleset:1095
#: data/civ1/buildings.ruleset:750
msgid ""
"The civilization which builds the Great Library gets every advance that at "
@@ -19321,21 +19494,21 @@ msgstr ""
"ne tieteen ja teknologian saavutukset, jotka ainakin kaksi muuta kansakuntaa "
"ovat saavuttaneet."
-#: data/default/buildings.ruleset:1113 data/civ2/buildings.ruleset:1101
+#: data/default/buildings.ruleset:1112 data/civ2/buildings.ruleset:1101
#: data/civ1/buildings.ruleset:756
msgid "Great Wall"
msgstr "Kiinan muuri"
-#: data/default/buildings.ruleset:1127
+#: data/default/buildings.ruleset:1126
msgid "Works as a City Wall in all your cities."
msgstr "Vaikuttaa kuin kaupunginmuuri kaikissa kaupungeissasi."
-#: data/default/buildings.ruleset:1135 data/civ2/buildings.ruleset:1122
+#: data/default/buildings.ruleset:1134 data/civ2/buildings.ruleset:1122
#: data/civ1/buildings.ruleset:777
msgid "Hanging Gardens"
msgstr "Riippuvat puutarhat"
-#: data/default/buildings.ruleset:1149 data/civ2/buildings.ruleset:1136
+#: data/default/buildings.ruleset:1148 data/civ2/buildings.ruleset:1136
#: data/civ1/buildings.ruleset:791
msgid ""
"Makes one content citizen happy in every city. Makes two extra content "
@@ -19349,12 +19522,12 @@ msgstr ""
"rauhallista asukasta tulee onnelliseksi. Jos kaupungissa ei ole rauhallisia "
"asukkaita, vaikutus muuttaa tyytymättömiä asukkaita rauhallisiksi."
-#: data/default/buildings.ruleset:1158 data/civ2/buildings.ruleset:1145
+#: data/default/buildings.ruleset:1157 data/civ2/buildings.ruleset:1145
#: data/civ1/buildings.ruleset:800
msgid "Hoover Dam"
msgstr "Assuanin pato"
-#: data/default/buildings.ruleset:1173 data/civ2/buildings.ruleset:1159
+#: data/default/buildings.ruleset:1172 data/civ2/buildings.ruleset:1159
msgid ""
"Works as if you had a Hydro Plant in every city. (This reduces pollution "
"and increases the effects of Factories and Mfg. Plants.)"
@@ -19362,12 +19535,12 @@ msgstr ""
"Aivan kuin sinulla olisi vesivoimala joka kaupungissa (vähentää saastumista "
"ja lisää tehtaiden ja teollisuuskompleksien tehoa)."
-#: data/default/buildings.ruleset:1179 data/civ2/buildings.ruleset:1165
+#: data/default/buildings.ruleset:1178 data/civ2/buildings.ruleset:1165
#: data/civ1/buildings.ruleset:822
msgid "Isaac Newton's College"
msgstr "Isaac Newtonin yliopisto"
-#: data/default/buildings.ruleset:1194
+#: data/default/buildings.ruleset:1193
#, no-c-format
msgid ""
"Boosts science production by 100% in every city you control that has a "
@@ -19376,40 +19549,40 @@ msgstr ""
"Lisää tutkimuspanosta 100%:lla jokaisessa hallitsemassasi kaupungissa, jossa "
"on Yliopisto."
-#: data/default/buildings.ruleset:1200 data/civ2/buildings.ruleset:1185
+#: data/default/buildings.ruleset:1199 data/civ2/buildings.ruleset:1185
#: data/civ1/buildings.ruleset:842
msgid "J.S. Bach's Cathedral"
msgstr "J.S. Bachin katedraali"
-#: data/default/buildings.ruleset:1214 data/civ2/buildings.ruleset:1199
+#: data/default/buildings.ruleset:1213 data/civ2/buildings.ruleset:1199
msgid "Makes two unhappy citizens content in every city."
msgstr "Muuttaa kaksi tyytymätöntä asukasta rauhalliseksi joka kaupungissa."
-#: data/default/buildings.ruleset:1219 data/civ2/buildings.ruleset:1204
+#: data/default/buildings.ruleset:1218 data/civ2/buildings.ruleset:1204
msgid "King Richard's Crusade"
msgstr "Ristiretki"
-#: data/default/buildings.ruleset:1233 data/civ2/buildings.ruleset:1218
+#: data/default/buildings.ruleset:1232 data/civ2/buildings.ruleset:1218
msgid ""
"Adds one extra shield resource on every square around the city where it is "
"built."
msgstr ""
"Lisää tuotantoa joka ruudussa sen kaupungin ympärillä, johon rakennetaan."
-#: data/default/buildings.ruleset:1239 data/civ2/buildings.ruleset:1224
+#: data/default/buildings.ruleset:1238 data/civ2/buildings.ruleset:1224
msgid "Leonardo's Workshop"
msgstr "Leonardon työpaja"
-#: data/default/buildings.ruleset:1253 data/civ2/buildings.ruleset:1238
+#: data/default/buildings.ruleset:1252 data/civ2/buildings.ruleset:1238
msgid "Upgrades one obsolete unit per game turn."
msgstr "Nykyaikaistaa yhden vanhentuneen yksikön joka pelivuorolla."
-#: data/default/buildings.ruleset:1258 data/civ2/buildings.ruleset:1243
+#: data/default/buildings.ruleset:1257 data/civ2/buildings.ruleset:1243
#: data/civ1/buildings.ruleset:862
msgid "Lighthouse"
msgstr "Majakka"
-#: data/default/buildings.ruleset:1273
+#: data/default/buildings.ruleset:1272
msgid ""
"Gives all your sea units 1 additional movement point and eliminates the risk "
"of losing Triremes on the high seas. Makes all your new sea units veterans "
@@ -19419,36 +19592,36 @@ msgstr ""
"kaleerit enää katoa avoremelle. Kaikki uudet laivastoyksiköt (kaikissa "
"kaupungeissa) ovat konkareita."
-#: data/default/buildings.ruleset:1280 data/civ2/buildings.ruleset:1264
+#: data/default/buildings.ruleset:1279 data/civ2/buildings.ruleset:1264
#: data/civ1/buildings.ruleset:885
msgid "Magellan's Expedition"
msgstr "Magalhaesin tutkimukset"
-#: data/default/buildings.ruleset:1295
+#: data/default/buildings.ruleset:1294
msgid "Gives all your sea units 2 additional movement points."
msgstr "Kaikki laivastoyksiköt saavat 2 ylimääräistä liikepistettä."
-#: data/default/buildings.ruleset:1300 data/civ2/buildings.ruleset:1283
+#: data/default/buildings.ruleset:1299 data/civ2/buildings.ruleset:1283
#: data/civ1/buildings.ruleset:904
msgid "Manhattan Project"
msgstr "Manhattan-projekti"
-#: data/default/buildings.ruleset:1318 data/civ2/buildings.ruleset:1301
+#: data/default/buildings.ruleset:1317 data/civ2/buildings.ruleset:1301
msgid "Marco Polo's Embassy"
msgstr "Marco Polon lähetystö"
-#: data/default/buildings.ruleset:1332 data/civ2/buildings.ruleset:1315
+#: data/default/buildings.ruleset:1331 data/civ2/buildings.ruleset:1315
msgid "The player who owns it gets an embassy with all players."
msgstr ""
"Tämän rakentanut pelaaja saa lähetystön kaikkien muiden pelaajien "
"kaupunkeihin."
-#: data/default/buildings.ruleset:1337 data/civ2/buildings.ruleset:1320
+#: data/default/buildings.ruleset:1336 data/civ2/buildings.ruleset:1320
#: data/civ1/buildings.ruleset:922
msgid "Michelangelo's Chapel"
msgstr "Sikstiiniläiskappeli"
-#: data/default/buildings.ruleset:1351 data/civ2/buildings.ruleset:1334
+#: data/default/buildings.ruleset:1350 data/civ2/buildings.ruleset:1334
msgid ""
"Counts as having a Cathedral in each of your cities. This makes 3 unhappy "
"citizens content in each city. The discovery of Theology increases the "
@@ -19461,23 +19634,23 @@ msgstr ""
"vaikutusta yhdellä, kun taas kommunismin keksiminen vähentää vaikutusta "
"yhdellä."
-#: data/default/buildings.ruleset:1361 data/civ2/buildings.ruleset:1344
+#: data/default/buildings.ruleset:1360 data/civ2/buildings.ruleset:1344
#: data/civ1/buildings.ruleset:941
msgid "Oracle"
msgstr "Delfoin oraakkeli"
-#: data/default/buildings.ruleset:1375
+#: data/default/buildings.ruleset:1374
msgid "Makes two of your unhappy citizens content in every city with a temple."
msgstr ""
"Muuttaa kaksi tyytymätöntä asukasta rauhalliseksi joka kaupungissa, jossa on "
"Temppeli."
-#: data/default/buildings.ruleset:1380 data/civ2/buildings.ruleset:1363
+#: data/default/buildings.ruleset:1379 data/civ2/buildings.ruleset:1363
#: data/civ1/buildings.ruleset:960
msgid "Pyramids"
msgstr "Pyramidi"
-#: data/default/buildings.ruleset:1394
+#: data/default/buildings.ruleset:1393
msgid ""
"The amount of stored food lost when one of your cities grows or shrinks is "
"reduced by 25%. This helps a city to grow faster and more easily withstand "
@@ -19487,31 +19660,31 @@ msgstr ""
"Tämä auttaa kaupunkia kasvamaan nopeammin ja sietämään nälänhätää paremmin. "
"Vaikutus kumuloituu Viljasiilon vaikutusten kanssa."
-#: data/default/buildings.ruleset:1401 data/civ2/buildings.ruleset:1382
+#: data/default/buildings.ruleset:1400 data/civ2/buildings.ruleset:1382
#: data/civ1/buildings.ruleset:981
msgid "SETI Program"
msgstr "SETI-ohjelma"
-#: data/default/buildings.ruleset:1415
+#: data/default/buildings.ruleset:1414
msgid "Boosts science production in each city with a Research Lab by 100%. "
msgstr ""
"Lisää tutkimuspanosta 100% kaikissa kaupungeissa, joissa on Tutkimuslaitos."
-#: data/default/buildings.ruleset:1420 data/civ2/buildings.ruleset:1402
+#: data/default/buildings.ruleset:1419 data/civ2/buildings.ruleset:1402
#: data/civ1/buildings.ruleset:1001
msgid "Shakespeare's Theatre"
msgstr "Shakespearen teatteri"
-#: data/default/buildings.ruleset:1434 data/civ2/buildings.ruleset:1416
+#: data/default/buildings.ruleset:1433 data/civ2/buildings.ruleset:1416
#: data/civ1/buildings.ruleset:1015
msgid "Makes all unhappy citizens content, in the city where it is located."
msgstr "Muuttaa kaikki tyytymättömät asukkaat rauhallisiksi kaupungissaan."
-#: data/default/buildings.ruleset:1439 data/civ2/buildings.ruleset:1421
+#: data/default/buildings.ruleset:1438 data/civ2/buildings.ruleset:1421
msgid "Statue of Liberty"
msgstr "Vapaudenpatsas"
-#: data/default/buildings.ruleset:1453 data/civ2/buildings.ruleset:1435
+#: data/default/buildings.ruleset:1452 data/civ2/buildings.ruleset:1435
#: data/civ1/buildings.ruleset:974 data/civ1/buildings.ruleset:1034
msgid ""
"Allows you to choose any government, including those that have not yet been "
@@ -19521,11 +19694,11 @@ msgstr ""
"Voit valita minkä tahansa hallitusmuodon (myös sellaisen jota et ole "
"tutkinut) ja vaihtaa niitä ilman välikauden anarkiaa."
-#: data/default/buildings.ruleset:1460 data/civ2/buildings.ruleset:1442
+#: data/default/buildings.ruleset:1459 data/civ2/buildings.ruleset:1442
msgid "Sun Tzu's War Academy"
msgstr "Sun Tzun sotakorkeakoulu"
-#: data/default/buildings.ruleset:1474
+#: data/default/buildings.ruleset:1473
msgid ""
"All your new ground units start at the first veteran level. The chance of a "
"unit getting the next veteran level after a battle increases by half."
@@ -19534,23 +19707,23 @@ msgstr ""
"Todennäköisyys sille, että yksikkösi nousee seuraavalle konkariuden tasolle "
"taistelun jälkeen lisääntyy puolella."
-#: data/default/buildings.ruleset:1481 data/civ2/buildings.ruleset:1463
+#: data/default/buildings.ruleset:1480 data/civ2/buildings.ruleset:1463
#: data/civ1/buildings.ruleset:1020
msgid "United Nations"
msgstr "Yhdistyneet Kansakunnat"
-#: data/default/buildings.ruleset:1495
+#: data/default/buildings.ruleset:1494
msgid "All your units regain two extra hitpoints per turn."
msgstr ""
"Yksiköidesi voimapisteiden palautumisnopeus kiihtyy kahdella pisteellä "
"pelivuoroa kohti."
-#: data/default/buildings.ruleset:1508 data/civ2/buildings.ruleset:1490
+#: data/default/buildings.ruleset:1507 data/civ2/buildings.ruleset:1490
#: data/civ1/buildings.ruleset:1046
msgid "Women's Suffrage"
msgstr "Naisasialiike"
-#: data/default/buildings.ruleset:1522 data/civ2/buildings.ruleset:1504
+#: data/default/buildings.ruleset:1521 data/civ2/buildings.ruleset:1504
msgid ""
"Counts as a Police Station in every city. (That is, for each city, reduces "
"unhappiness for military units outside the city by 2 under Democracy and 1 "
@@ -19559,11 +19732,11 @@ msgstr ""
"Lasketaan poliisiasemaksi kaikissa kaupungeissa. Tällä ihmeellä on "
"vaikutusta vain demokratiana tai tasavaltana hallituille kansakunnille."
-#: data/default/buildings.ruleset:1533
+#: data/default/buildings.ruleset:1532
msgid "Coinage"
msgstr "Kotiuta tulot"
-#: data/default/buildings.ruleset:1554
+#: data/default/buildings.ruleset:1553
msgid ""
"This is not a normal improvement. Instead, setting a city's production to "
"Coinage means its shield production is converted to tax output (money, "
@@ -19667,8 +19840,7 @@ msgstr ""
"kaksinkertaistavat tuotannon, ja tehdas, teollisuuskompleksi ja ydinvoimala "
"yhdessä lisäävät tuotantoa 150%.\n"
"\n"
-"Kaupungissa voi olla vain yksi voimalaitos: Vesivoimala, hiilivoimala tai "
-"ydinvoimala."
+"Kaupungissa voi olla vain yksi voimalaitos: Vesi-, hiili- tai ydinvoimala."
#: data/civ2/buildings.ruleset:525 data/civ1/buildings.ruleset:426
msgid ""
@@ -19706,8 +19878,7 @@ msgstr ""
"teollisuuskompleksi ja hiilivoimala yhdessä lisäävät tuotantoa 150%. "
"Lisääntynyt tuotanto saattaa lisätä kaupungin saastepäästöjä merkittävästi.\n"
"\n"
-"Kaupungissa voi olla vain yksi voimalaitos: Vesivoimala, hiilivoimala tai "
-"ydinvoimala."
+"Kaupungissa voi olla vain yksi voimalaitos: vesi-, hiili- tai ydinvoimala."
#: data/civ2/buildings.ruleset:646
msgid ""
@@ -19999,11 +20170,16 @@ msgstr "Kelttiläinen"
msgid "?citystyle:Industrial"
msgstr "Teollinen"
-#: data/default/cities.ruleset:139 data/civ2/cities.ruleset:150
+#: data/default/cities.ruleset:139
+#, fuzzy
+msgid "?citystyle:ElectricAge"
+msgstr "Kelttiläinen"
+
+#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:150
msgid "?citystyle:Modern"
msgstr "Moderni"
-#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:161
+#: data/default/cities.ruleset:161 data/civ2/cities.ruleset:161
msgid "?citystyle:PostModern"
msgstr "Postmoderni"
@@ -21820,9 +21996,8 @@ msgstr ""
"kartoituksessa."
#: data/default/units.ruleset:1864
-#, fuzzy
msgid "?unit:Leader"
-msgstr "Johtaja"
+msgstr "Hallitsija"
#: data/default/units.ruleset:1892
msgid "This is you. If you lose this unit, you lose the game. So don't."
@@ -22596,7 +22771,7 @@ msgstr "burmalaisten"
#: data/nation/burmese.ruleset:4
msgid "?plural:Burmese"
-msgstr "burmalaisten"
+msgstr "burmalaiset"
#: data/nation/burmese.ruleset:6
msgid ""
@@ -24023,7 +24198,7 @@ msgid ""
"aftermath of WWI."
msgstr ""
"1300-luvun alussa Osman, pienen länsianatolialaisen turkkilaisheimon "
-"johtaja, valloitti kaikki naapuriheimonsa. Vuosisata myöhemmin Bysantin "
+"päällikkö, valloitti kaikki naapuriheimonsa. Vuosisata myöhemmin Bysantin "
"valtakunnan pääkaupunki kukistui turkkilaisille, mikä antoi Osmanien "
"valtakunnalle (tunnetaan myös Ottomaanien valtakuntana) pääsyn Eurooppaan. "
"Osmanit valloittivat tämän jälkeen laajoja alueita lounaisesta Euroopasta, "
@@ -24456,18 +24631,16 @@ 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 ""
-"Slovakia on valtio Euroopan sydämmessä. Se oli osa osa Tsekkoslovakiaa, joka "
+"Slovakia on valtio Euroopan sydämessä. Se oli osa osa Tsekkoslovakiaa, joka "
"taas oli vuoteen 1918 asti ollut osa Itävalta-Unkaria."
#: data/nation/slovakian.ruleset:26
-#, fuzzy
msgid "?male:Leader"
msgstr "Johtaja"
#: data/nation/slovakian.ruleset:26
-#, fuzzy
msgid "?female:Leader"
-msgstr "Toveri"
+msgstr "Johtaja"
#: data/nation/slovakian.ruleset:29
msgid "Pope"
@@ -25752,6 +25925,45 @@ msgstr "Joukkue 30"
msgid "Team 31"
msgstr "Joukkue 31"
+#~ msgid "Command access level could not be set to '%s' for connection %s."
+#~ msgstr ""
+#~ "Sallittujen komentojen tasoa ei voitu asettaa arvoon '%s' pelaajalle %s."
+
+#~ msgid "Observers cannot vote."
+#~ msgstr "Tarkkailijat eivät voi äänestää."
+
+#~ msgid ""
+#~ "You can only vote in a running game. Use 'first' to become the game "
+#~ "organizer if there currently is none."
+#~ msgstr ""
+#~ "Voit äänestää vain käynnissä olevassa pelissä. Käytä 'first'-komentoa "
+#~ "ryhtyäksesi pelinohjaajaksi jos sellaista ei ole."
+
+#~ msgid "Vote %d \"%s\": %d for, %d against"
+#~ msgstr "Äänestys %d \"%s\": %d puolesta, %d vastaan"
+
+#~ msgid "Value must be integer."
+#~ msgstr "Arvon pitää olla kokonaisluku."
+
+#~ 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 Hydro Plant, Power Plant, or Nuclear Plant. A "
+#~ "city can only build a Hydro Plant if it is next to (or on) a Mountain or "
+#~ "River tile."
+#~ msgstr ""
+#~ "Vähentää tuotannosta johtuvaa saastutusta kaupungissa 50%. Lisää Tehtaan "
+#~ "ja Teollisuuskompleksin tuotantoa: Tehdas ja Vesivoimala yhdessä antavat "
+#~ "75% lisän, ja Tehdas, Teollisuuskompleksi ja Vesivoimala yhdessä antavat "
+#~ "150% bonuksen.\n"
+#~ "\n"
+#~ "Kaupungissa voi olla vain yksi voimala. Vesivoimala voidaan rakentaa vain "
+#~ "joen tai vuoren välittömään läheisyyteen."
+
#~ msgid "%s territory"
#~ msgstr "%s-aluetta"
@@ -26141,37 +26353,13 @@ msgstr "Joukkue 31"
#~ msgid "%s has connected from %s."
#~ msgstr "%s on liittynyt yhteydestä %s."
-#~ msgid "Client rejected: %s."
-#~ msgstr "Client-ohjelma torjuttu: %s."
-
#~ msgid "Connection request from %s from %s"
#~ msgstr "%s osoitteesta %s lähettää yhteyspyynnön"
-#~ msgid "%s has client version %d.%d.%d%s"
-#~ msgstr "Pelaajalla %s on client-versio %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 ""
-#~ "Client-ohjelmasta puuttuu tämän palvelimen vaatima ominaisuus.\n"
-#~ "Palvelimen versio: %d.%d.%d%s Client-ohjelman versio: %d.%d.%d%s. "
-#~ "Päivittäminen voi auttaa!"
-
# Unliteral translation.
#~ msgid "%s was rejected: Mismatched capabilities."
#~ msgstr "%s jätetty ulkopuolelle: epäyhteensopivat ohjelmistot."
-#~ 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 ""
-#~ "Palvelimesta puuttuu client-ohjelman vaatima ominaisuus.\n"
-#~ "Palvelimen versio: %d.%d.%d%s Client-ohjelman versio: %d.%d.%d%s.\n"
-#~ "Päivittäminen saattaa auttaa!"
-
#~ msgid "Invalid username '%s'"
#~ msgstr "Kelvoton käyttäjätunnus '%s'"
@@ -26658,9 +26846,6 @@ msgstr "Joukkue 31"
#~ msgid "U"
#~ msgstr "Y"
-#~ msgid "Never"
-#~ msgstr "Ei koskaan"
-
#~ msgid "Editing Mode"
#~ msgstr "Muokkaustila"
diff --git a/po/fr.gmo b/po/fr.gmo
index dff9377..bbf75f0 100644
Binary files a/po/fr.gmo and b/po/fr.gmo differ
diff --git a/po/fr.po b/po/fr.po
index 3d5af0a..29addc8 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: 2009-03-29 21:13+0900\n"
+"POT-Creation-Date: 2009-11-22 21:37+0100\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"
@@ -71,21 +71,21 @@ msgstr "?obsolete:O"
msgid "?redundant:*"
msgstr "?redundant:*"
-#: common/connection.c:515
+#: common/connection.c:518
#, c-format
msgid "%s from %s"
msgstr "%s de %s"
-#: common/connection.c:521
+#: common/connection.c:524
msgid " (connection incomplete)"
msgstr " (connexion incomplète)"
-#: common/connection.c:525
+#: common/connection.c:528
#, c-format
msgid " (player %s)"
msgstr " (joueur %s)"
-#: common/connection.c:529
+#: common/connection.c:532
msgid " (observer)"
msgstr " (observateur)"
@@ -490,81 +490,81 @@ msgstr "Messages de connexion/d
msgid "AI Debug messages"
msgstr "Message de débogage de l'IA"
-#: common/player.c:732
+#: common/player.c:746
msgid "?attitude:Genocidal"
msgstr "?attitude:Tueur"
-#: common/player.c:734
+#: common/player.c:748
msgid "?attitude:Belligerent"
msgstr "?attitude:Belliqueux"
-#: common/player.c:736
+#: common/player.c:750
msgid "?attitude:Hostile"
msgstr "?attitude:Hostile"
-#: common/player.c:738
+#: common/player.c:752
msgid "?attitude:Uncooperative"
msgstr "?attitude:Pas Commode"
-#: common/player.c:740
+#: common/player.c:754
msgid "?attitude:Uneasy"
msgstr "?attitude:Équivoque"
-#: common/player.c:742
+#: common/player.c:756
msgid "?attitude:Neutral"
msgstr "?attitude:Neutre"
-#: common/player.c:744
+#: common/player.c:758
msgid "?attitude:Respectful"
msgstr "?attitude:Respectueux"
-#: common/player.c:746
+#: common/player.c:760
msgid "?attitude:Helpful"
msgstr "?attitude:Coopératif"
-#: common/player.c:748
+#: common/player.c:762
msgid "?attitude:Enthusiastic"
msgstr "?attitude:Enthousiaste"
-#: common/player.c:750
+#: common/player.c:764
msgid "?attitude:Admiring"
msgstr "?attitude:Admiratif"
-#: common/player.c:753
+#: common/player.c:767
msgid "?attitude:Worshipful"
msgstr "?attitude:Idolâtre"
-#: common/player.c:764
+#: common/player.c:778
msgid "?diplomatic_state:Armistice"
msgstr "?diplomatic_state:Armistice"
-#: common/player.c:765
+#: common/player.c:779
msgid "?diplomatic_state:War"
msgstr "?diplomatic_state:Guerre"
-#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:780 client/gui-gtk-2.0/diplodlg.c:353
#: 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:767 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:781 client/gui-gtk-2.0/diplodlg.c:358
#: 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:768 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:782 client/gui-gtk-2.0/diplodlg.c:363
#: 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:769
+#: common/player.c:783
msgid "?diplomatic_state:Never met"
msgstr "?diplomatic_state:Jamais rencontré"
-#: common/player.c:770
+#: common/player.c:784
msgid "?diplomatic_state:Team"
msgstr "?diplomatic_state:Partenariat"
@@ -599,7 +599,7 @@ msgstr "Les pr
#. TRANS: "Resources: (none)".
#: common/requirements.c:1014 common/team.c:132
#: client/gui-gtk-2.0/helpdlg.c:1055 client/gui-gtk-2.0/inteldlg.c:390
-#: client/gui-win32/helpdlg.c:586 client/gui-xaw/helpdlg.c:991
+#: client/gui-win32/helpdlg.c:592 client/gui-xaw/helpdlg.c:991
#, c-format
msgid "(none)"
msgstr "(aucun)"
@@ -625,10 +625,11 @@ msgstr "Techno. Future %d"
#: 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
#: client/gui-sdl/helpdlg.c:817 client/gui-sdl/mapview.c:962
-#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:545
-#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:735
-#: 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
+#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:544
+#: client/gui-win32/helpdlg.c:551 client/gui-win32/helpdlg.c:721
+#: client/gui-win32/helpdlg.c:741 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 "Aucun"
@@ -641,29 +642,29 @@ msgstr "Techno. Future"
msgid "(Unknown)"
msgstr "(Inconnu)"
-#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:553
#: manual/civmanual.c:224
msgid "Road"
msgstr "Route"
-#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:557
#: client/gui-gtk-2.0/menu.c:829 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:394 common/terrain.c:572 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:567
#: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
#: data/civ1/techs.ruleset:563
msgid "Railroad"
msgstr "Chemin de fer"
-#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:555
msgid "Mine"
msgstr "Mine"
-#: common/terrain.c:396 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:551 server/report.c:124
#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "Pollution"
@@ -672,7 +673,7 @@ msgstr "Pollution"
msgid "Hut"
msgstr "Hutte"
-#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:563
#: manual/civmanual.c:226
msgid "Fortress"
msgstr "Forteresse"
@@ -685,58 +686,58 @@ msgstr "Rivi
msgid "Farmland"
msgstr "Ferme"
-#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:577
#: manual/civmanual.c:226
msgid "Airbase"
msgstr "Base aérienne"
-#: common/terrain.c:402 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:579
msgid "Fallout"
msgstr "Retombée"
-#: common/unit.c:546 client/gui-win32/plrdlg.c:337
+#: common/unit.c:549 client/gui-win32/plrdlg.c:337
msgid "Idle"
msgstr "Inactif"
-#: common/unit.c:556
+#: common/unit.c:559
msgid "Fortifying"
msgstr "Se retranchant"
-#: common/unit.c:558
+#: common/unit.c:561
msgid "Fortified"
msgstr "Retranché"
-#: common/unit.c:562 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
+#: common/unit.c:565 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
msgid "Sentry"
msgstr "Veiller"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
+#: common/unit.c:569 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
#: client/gui-win32/menu.c:370 client/gui-xaw/menu.c:185
msgid "Pillage"
msgstr "Piller"
-#: common/unit.c:568 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
+#: common/unit.c:571 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
msgid "Goto"
msgstr "Aller à"
-#: common/unit.c:570
+#: common/unit.c:573
msgid "Explore"
msgstr "Explorer"
-#: common/unit.c:572 manual/civmanual.c:224
+#: common/unit.c:575 manual/civmanual.c:224
msgid "Transform"
msgstr "Transformer"
-#: common/unit.c:584 client/text.c:157 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:587 client/text.c:157 client/gui-sdl/citydlg.c:1972
#: client/gui-win32/citydlg.c:1257 client/gui-xaw/citydlg.c:1423
msgid "Unknown"
msgstr "Ville inconnue"
-#: common/unit.c:1022
+#: common/unit.c:1025
msgid "Moves"
msgstr "Mouvements"
-#: common/unit.c:1571
+#: common/unit.c:1574
#, c-format
msgid ""
"Upgrade %s to %s for %d gold?\n"
@@ -745,12 +746,12 @@ msgstr ""
"Transformer %s en %s pour %d lingots ?\n"
"Les finances sont à %d lingots."
-#: common/unit.c:1579
+#: common/unit.c:1582
#, c-format
msgid "Sorry, cannot upgrade %s (yet)."
msgstr "Désolé, impossible de déjà mettre %s à jour."
-#: common/unit.c:1585
+#: common/unit.c:1588
#, c-format
msgid ""
"Upgrading %s to %s costs %d gold.\n"
@@ -759,11 +760,11 @@ msgstr ""
"Transformer %s en %s coûte %d lingots.\n"
"Les finances sont à %d lingots."
-#: common/unit.c:1594
+#: common/unit.c:1597
msgid "You can only upgrade units in your cities."
msgstr "Vous ne pouvez mettre à jour les unités que dans vos villes."
-#: common/unit.c:1598
+#: common/unit.c:1601
#, c-format
msgid "Upgrading this %s would strand units it transports."
msgstr "Mettre à jour %s laisserait en plan les unités transportées."
@@ -796,11 +797,11 @@ msgstr "Missile Nucl
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1404
+#: common/unittype.c:349 client/helpdata.c:1412
msgid " and "
msgstr " et "
-#: common/unittype.c:355 client/helpdata.c:1390
+#: common/unittype.c:355 client/helpdata.c:1398
msgid "?and:, "
msgstr "?and:, "
@@ -971,74 +972,74 @@ msgstr "Argument vide pour \"%s\".\n"
msgid "Missing argument for \"%s\".\n"
msgstr "Argument manquant pour \"%s\".\n"
-#: utility/shared.c:501
+#: utility/shared.c:514
#, c-format
msgid "%d BC"
msgstr "%d av. J.-C."
-#: utility/shared.c:503
+#: utility/shared.c:516
#, c-format
msgid "%d AD"
msgstr "%d"
-#: utility/shared.c:924
+#: utility/shared.c:937
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:1028
+#: utility/shared.c:1041
#, 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:1279
+#: utility/shared.c:1292
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:1281
+#: utility/shared.c:1294
#, c-format
msgid "Current data path is: \"%s\""
msgstr "Le chemin actuel d'accès aux données est : \"%s\""
-#: utility/shared.c:1283
+#: utility/shared.c:1296
#, c-format
msgid "The \"%s\" file is required ... aborting!"
msgstr "Le fichier \"%s\" est nécessaire ... abandon!"
-#: utility/shared.c:1460
+#: utility/shared.c:1485
#, 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:1462
+#: utility/shared.c:1487
msgid "Use a non-privileged account instead.\n"
msgstr "Utilisez plutôt un compte non privilégié.\n"
-#: utility/shared.c:1478
+#: utility/shared.c:1503
msgid "exact match"
msgstr "correspondance exacte"
-#: utility/shared.c:1479
+#: utility/shared.c:1504
msgid "only match"
msgstr "correspondance unique"
-#: utility/shared.c:1480
+#: utility/shared.c:1505
msgid "ambiguous"
msgstr "ambigu"
-#: utility/shared.c:1481
+#: utility/shared.c:1506
msgid "empty"
msgstr "vide"
-#: utility/shared.c:1482
+#: utility/shared.c:1507
msgid "too long"
msgstr "trop long"
-#: utility/shared.c:1483
+#: utility/shared.c:1508
msgid "non-match"
msgstr "pas de correspondance"
@@ -1067,22 +1068,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:280
+#: ai/advdiplomacy.c:300
#, 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:290
+#: ai/advdiplomacy.c:310
#, 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:303
+#: ai/advdiplomacy.c:322
#, c-format
msgid "*%s (AI)* Let us first cease hostilies, %s."
msgstr "*%s (IA)* D'abord, cessons les hostilités, %s."
-#: ai/advdiplomacy.c:308
+#: ai/advdiplomacy.c:327
#, c-format
msgid ""
"*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
@@ -1090,48 +1091,48 @@ msgid ""
msgstr ""
"*%s (IA)* J'espère que vous respecterez durablement le cessez-le-feu, %s."
-#: ai/advdiplomacy.c:331
+#: ai/advdiplomacy.c:350
#, 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:424
+#: ai/advdiplomacy.c:443
#, 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:454
+#: ai/advdiplomacy.c:473
#, 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:560
+#: ai/advdiplomacy.c:579
#, 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:582
+#: ai/advdiplomacy.c:601
#, c-format
msgid "*%s (AI)* Welcome into our alliance %s!"
msgstr "%s (IA)* Bienvenue dans notre alliance %s !"
-#: ai/advdiplomacy.c:586
+#: ai/advdiplomacy.c:605
#, 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:593
+#: ai/advdiplomacy.c:612
#, c-format
msgid "*%s (AI)* Yes, peace in our time!"
msgstr "*%s (IA)* Oui, paix en notre temps !"
-#: ai/advdiplomacy.c:598
+#: ai/advdiplomacy.c:617
#, c-format
msgid "*%s (AI)* Agreed. No more hostilities, %s."
msgstr "*%s (IA)* Soit. Plus d'hostilités, %s."
-#: ai/advdiplomacy.c:813
+#: ai/advdiplomacy.c:832
#, c-format
msgid ""
"*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
@@ -1140,23 +1141,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:1097
+#: ai/advdiplomacy.c:1116
#, c-format
msgid "*%s (AI)* Space will never be yours. "
msgstr "*%s (IA)* L'espace ne sera jamais à vous. "
-#: ai/advdiplomacy.c:1102
+#: ai/advdiplomacy.c:1121
#, 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:1108
+#: ai/advdiplomacy.c:1127
#, c-format
msgid "*%s (AI)* Peace in ... some other time."
msgstr "*%s (IA)* Paix ... une autre fois."
-#: ai/advdiplomacy.c:1113
+#: ai/advdiplomacy.c:1132
#, c-format
msgid ""
"*%s (AI)* Finally I get around to you! Did you really think you could get "
@@ -1165,18 +1166,18 @@ msgstr ""
"*%s (IA)* Finalement je vous retrouve ! Pensiez-vous vraiment que vous "
"pourriez vous en tirer avec vos crimes ?"
-#: ai/advdiplomacy.c:1119
+#: ai/advdiplomacy.c:1138
#, 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:1126
+#: ai/advdiplomacy.c:1145
#, 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:1209
+#: ai/advdiplomacy.c:1229
#, c-format
msgid ""
"*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1191,7 +1192,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:1219
+#: ai/advdiplomacy.c:1239
#, c-format
msgid ""
"*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
@@ -1200,7 +1201,7 @@ msgstr ""
"*%s (IA)* Votre aide ce faisait attendre. Longue vie à notre glorieuse "
"alliance !"
-#: ai/advdiplomacy.c:1225
+#: ai/advdiplomacy.c:1245
#, c-format
msgid ""
"*%s (AI)* %s has grossly violated his treaties with us for own gain. We "
@@ -1219,7 +1220,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:1238
+#: ai/advdiplomacy.c:1258
#, c-format
msgid ""
"*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1234,7 +1235,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:1246
+#: ai/advdiplomacy.c:1266
#, c-format
msgid ""
"*%s (AI)* If you want a piece of the loot, feel free to join in the action!"
@@ -1242,7 +1243,7 @@ msgstr ""
"*%s (IA)* Si vous voulez votre part du butin, libre à vous de vous joindre à "
"notre action !"
-#: ai/advdiplomacy.c:1251
+#: ai/advdiplomacy.c:1271
#, c-format
msgid ""
"*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1257,14 +1258,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:1261
+#: ai/advdiplomacy.c:1281
#, 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:1267
+#: ai/advdiplomacy.c:1287
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance and declare war on %s in %d turn. "
@@ -1279,7 +1280,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:1276
+#: ai/advdiplomacy.c:1296
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1294,7 +1295,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:1344
+#: ai/advdiplomacy.c:1364
#, c-format
msgid ""
"*%s (AI)* Your attempt to conquer space for yourself alone betray your true "
@@ -1303,7 +1304,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:1359
+#: ai/advdiplomacy.c:1379
#, c-format
msgid ""
"*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
@@ -1312,7 +1313,7 @@ msgstr ""
"*%s (IA)* Votre tentative de dominer l'espace de façon unilatérale est "
"hautement offensante."
-#: ai/advdiplomacy.c:1362
+#: ai/advdiplomacy.c:1382
#, c-format
msgid ""
"*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
@@ -1321,12 +1322,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:1474
+#: ai/advdiplomacy.c:1494
#, 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:1549
+#: ai/advdiplomacy.c:1569
#, c-format
msgid ""
"*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
@@ -1335,7 +1336,7 @@ msgstr ""
"*%s (IA)* Salutations ô notre allié le plus fiable, nous vous appelons à "
"détruire notre ennemi, %s."
-#: ai/advdiplomacy.c:1555
+#: ai/advdiplomacy.c:1575
#, c-format
msgid ""
"*%s (AI)* Greetings ally, I see you have not yet made war with our enemy, %"
@@ -1344,7 +1345,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:1562
+#: ai/advdiplomacy.c:1582
#, c-format
msgid ""
"*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1355,7 +1356,7 @@ msgstr ""
"vivre en paix avec notre ennemi mortel, %s ! Ceci est inacceptable, notre "
"alliance n'est plus !"
-#: ai/advdiplomacy.c:1592
+#: ai/advdiplomacy.c:1612
#, c-format
msgid ""
"*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
@@ -1364,14 +1365,14 @@ msgstr ""
"*%s (IA)* Salutations ami, pouvons-nous suggérer de faire cause commune dans "
"une alliance ?"
-#: ai/advdiplomacy.c:1607
+#: ai/advdiplomacy.c:1627
#, 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:1622
+#: ai/advdiplomacy.c:1642
#, c-format
msgid ""
"*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
@@ -1380,7 +1381,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:1742
+#: ai/advdiplomacy.c:1762
#, c-format
msgid ""
"*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1543,19 +1544,19 @@ msgstr ""
"Le mot de passe doit avoir au moins %d lettres capitales, %d chiffres, et "
"être long d'au moins %d caractères [imprimables]. Essayez encore."
-#: server/barbarian.c:183
+#: server/barbarian.c:184
#, c-format
msgid "%s gain a leader by the name %s. Dangerous times may lie ahead."
msgstr ""
"Les %s trouvent un nouveau chef en la personne de %s. Des temps difficiles "
"sont à prévoir."
-#: server/barbarian.c:479
+#: server/barbarian.c:480
#, c-format
msgid "Native unrest near %s led by %s."
msgstr "Apparition d'indigènes menés par %2$s aux abords de %1$s."
-#: server/barbarian.c:484
+#: server/barbarian.c:485
#, c-format
msgid "Sea raiders seen near %s!"
msgstr "Pirates aperçus au large de %s !"
@@ -1952,7 +1953,7 @@ msgid_plural "%s boosts research; you gain %d immediate advances."
msgstr[0] "%s accélère la recherche, vous obtenez %d découverte immédiate."
msgstr[1] "%s accélère la recherche, vous obtenez %d découvertes immédiates."
-#: server/cityturn.c:1158 server/techtools.c:176
+#: server/cityturn.c:1158 server/techtools.c:172
#, c-format
msgid "The %s have acquired %s from %s."
msgstr "Les %s ont acquis %s de %s."
@@ -2038,22 +2039,22 @@ msgstr ""
"Avertissement : l'option %s est obsolète. Utiliser -m pour activer le "
"métaserveur.\n"
-#: server/civserver.c:189
+#: server/civserver.c:193
#, c-format
msgid "Error: unknown option '%s'\n"
msgstr "Erreur : option \"%s\" inconnue\n"
-#: server/civserver.c:200
+#: server/civserver.c:204
#, c-format
msgid "This is the server for %s"
msgstr "Ceci est le serveur pour %s"
-#: server/civserver.c:201
+#: server/civserver.c:205
#, c-format
msgid "You can learn a lot about Freeciv at %s"
msgstr "Vous pouvez en apprendre davantage sur Freeciv sur %s"
-#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
+#: server/civserver.c:210 client/civclient.c:239 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -2062,7 +2063,7 @@ msgstr ""
"Utilisation: %s [option ...]\n"
"Les options valides sont:\n"
-#: server/civserver.c:208
+#: server/civserver.c:212
msgid ""
" -a --auth FILE\tEnable server authentication with configuration from "
"FILE.\n"
@@ -2070,109 +2071,114 @@ msgstr ""
" -a --auth FICH\tActive l'authentification serveur avec la configuration "
"depuis FICH.\n"
-#: server/civserver.c:210
+#: server/civserver.c:214
msgid " -G --Guests\t\tAllow guests to login if auth is enabled.\n"
msgstr ""
" -G --Guests\t\tPermet aux invités de se connecter si l'authentification "
"est activée.\n"
-#: server/civserver.c:212
+#: server/civserver.c:216
msgid " -N --Newusers\tAllow new users to login if auth is enabled.\n"
msgstr ""
" -N --Newusers\tPermet la connexion de nouveaux utilisateurs si "
"l'authentification est activée.\n"
-#: server/civserver.c:215
+#: server/civserver.c:219
msgid " -b --bind ADDR\tListen for clients on ADDR\n"
msgstr " -b, --bind ADR\tÉcouter les clients sur ADR\n"
-#: server/civserver.c:217 client/civclient.c:242
+#: server/civserver.c:221 client/civclient.c:243
msgid ""
" -d, --debug NUM\tSet debug log level (0 to 4, or 4:file1,min,max:...)\n"
msgstr ""
" -d, --debug NUM\tChoisir le niveau de débogage (0 à 4 ou 4:fichier1,min,"
"max:...)\n"
-#: server/civserver.c:221 client/civclient.c:246
+#: server/civserver.c:225 client/civclient.c:247
msgid " -d, --debug NUM\tSet debug log level (0 to 3)\n"
msgstr " -d, --debug NUM\tChoisir le niveau de débogage (0 à 3)\n"
-#: server/civserver.c:223
+#: server/civserver.c:227
msgid " -f, --file FILE\tLoad saved game FILE\n"
msgstr " -f, --file FICH\tCharger une partie sauvegardée dans FICH\n"
-#: server/civserver.c:225 client/civclient.c:249 manual/civmanual.c:382
+#: server/civserver.c:229 client/civclient.c:250 manual/civmanual.c:382
msgid " -h, --help\t\tPrint a summary of the options\n"
msgstr " -h, --help\t\tAfficher un résumé des options\n"
-#: server/civserver.c:226
+#: server/civserver.c:230
+#, fuzzy
+msgid " -i, --identity ADDR\tBe known as ADDR at metaserver\n"
+msgstr " -M, --Metaserver ADR\tRègle l'adresse du métaserveur sur ADR\n"
+
+#: server/civserver.c:231
msgid " -l, --log FILE\tUse FILE as logfile\n"
msgstr " -l, --log FICH\tSauver les journaux dans FICH\n"
-#: server/civserver.c:227
+#: server/civserver.c:232
msgid " -m, --meta\t\tNotify metaserver and send server's info\n"
msgstr " -m, --meta\t\tNotifie au métaserveur et lui envoie l'information\n"
-#: server/civserver.c:229
+#: server/civserver.c:234
msgid " -M, --Metaserver ADDR\tSet ADDR as metaserver address\n"
msgstr " -M, --Metaserver ADR\tRègle l'adresse du métaserveur sur ADR\n"
-#: server/civserver.c:232
+#: server/civserver.c:237
msgid " -p, --port PORT\tListen for clients on port PORT\n"
msgstr " -p, --port PORT\tÉcouter les clients sur le port PORT\n"
-#: server/civserver.c:234
+#: server/civserver.c:239
msgid " -q, --quitidle TIME\tQuit if no players for TIME seconds\n"
msgstr ""
" -q, --quitidle SEC\tQuitter s'il n'y a pas de joueurs pendant SEC "
"secondes\n"
-#: server/civserver.c:236
+#: server/civserver.c:241
msgid " -e, --exit-on-end\tWhen a game ends, exit instead of restarting\n"
msgstr ""
" -e, --exit-on-end\tQuand une partie s'achève, quitte au lieu de "
"redémarrer\n"
-#: server/civserver.c:239
+#: server/civserver.c:244
msgid " -s, --saves DIR\tSave games to directory DIR\n"
msgstr " -s, --saves REP\tSauvegarde les parties dans le répertoire REP\n"
-#: server/civserver.c:241
+#: server/civserver.c:246
msgid " -S, --Serverid ID\tSets the server id to ID\n"
msgstr " -S, --Serverid ID\tPositionne l'identifiant de serveur sur ID\n"
-#: server/civserver.c:243
+#: server/civserver.c:248
msgid " -P, --Ppm\t\tSave ppms of the map when saving the game.\n"
msgstr ""
" -P, --Ppm\t\tSauvegarde des ppms de la carte lors de la sauvegarde de la "
"partie.\n"
-#: server/civserver.c:244
+#: server/civserver.c:249
msgid " -r, --read FILE\tRead startup script FILE\n"
msgstr " -r, --read FICH\tLire le script de démarrage FICH\n"
-#: server/civserver.c:246
+#: server/civserver.c:251
msgid " -R, --Ranklog FILE\tUse FILE as ranking logfile\n"
msgstr ""
" -R, --Ranklok FICHIER\tUtiliser FICHIER comme fichier historique des "
"classements\n"
-#: server/civserver.c:247 client/civclient.c:268 manual/civmanual.c:383
+#: server/civserver.c:252 client/civclient.c:269 manual/civmanual.c:383
msgid " -v, --version\t\tPrint the version number\n"
msgstr " -v, --version\t\tAfficher le numéro de version\n"
-#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
+#: server/civserver.c:253 client/gui-gtk-2.0/gui_main.c:354
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, c-format
msgid "Report bugs at %s.\n"
msgstr "Signaler les bogues à %s.\n"
-#: server/commands.c:28
+#: server/commands.c:29
msgid "Start the game, or restart after loading a savegame."
msgstr "Démarre la partie, ou redémarre après le chargement d'une sauvegarde."
-#: server/commands.c:29
+#: server/commands.c:30
msgid ""
"This command starts the game. When starting a new game, it should be used "
"after all human players have connected, and AI players have been created (if "
@@ -2192,7 +2198,7 @@ msgstr ""
"servirait à rien."
#. TRANS: translate text between <> only
-#: server/commands.c:42
+#: server/commands.c:44
msgid ""
"help\n"
"help commands\n"
@@ -2206,11 +2212,11 @@ msgstr ""
"help <commande>\n"
"help <option>"
-#: server/commands.c:47
+#: server/commands.c:49
msgid "Show help about server commands and server options."
msgstr "Affiche l'aide sur les commandes et les options du serveur."
-#: server/commands.c:48
+#: server/commands.c:50
msgid ""
"With no arguments gives some introductory help. With argument \"commands\" "
"or \"options\" gives respectively a list of all commands or all options. "
@@ -2226,11 +2232,11 @@ msgstr ""
"options, l'information fournie comprend la valeur courante et par défaut. "
"L'argument peut être abrégé s'il n'y a pas d'ambiguïté."
-#: server/commands.c:63
+#: server/commands.c:66
msgid "Show a list of players, teams, connections, or scenarios."
msgstr "Montrer la liste des joueurs, équipes, connexions ou scénarios."
-#: server/commands.c:64
+#: server/commands.c:67
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 "
@@ -2241,20 +2247,20 @@ msgstr ""
"L'argument peut être abrégé, et prend \"players\" comme valeur par défaut "
"s'il n'est pas précisé."
-#: server/commands.c:70
+#: server/commands.c:74
msgid "Quit the game and shutdown the server."
msgstr "Quitte la partie et arrête le serveur."
#. TRANS: translate text between <> only
-#: server/commands.c:74
+#: server/commands.c:79
msgid "cut <connection-name>"
msgstr "cut <nom-connexion>"
-#: server/commands.c:75
+#: server/commands.c:80
msgid "Cut a client's connection to server."
msgstr "Coupe la connexion d'un client."
-#: server/commands.c:76
+#: server/commands.c:81
msgid ""
"Cut specified client's connection to the server, removing that client from "
"the game. If the game has not yet started that client's player is removed "
@@ -2267,7 +2273,7 @@ msgstr ""
"utilise à présent les noms de connexion, pas les noms de joueurs."
#. TRANS: translate text between <> only
-#: server/commands.c:83
+#: server/commands.c:89
msgid ""
"explain\n"
"explain <option-name>"
@@ -2275,11 +2281,11 @@ msgstr ""
"explain\n"
"explain <option>"
-#: server/commands.c:85
+#: server/commands.c:91
msgid "Explain server options."
msgstr "Explique les options du serveur."
-#: server/commands.c:86
+#: server/commands.c:92
msgid ""
"The 'explain' command gives a subset of the functionality of 'help', and is "
"included for backward compatibility. With no arguments it gives a list of "
@@ -2293,7 +2299,7 @@ msgstr ""
"correspondant à l'option donnée (comme \"help <option>\")."
#. TRANS: translate text between <> only
-#: server/commands.c:93
+#: server/commands.c:100
msgid ""
"show\n"
"show <option-name>\n"
@@ -2303,11 +2309,11 @@ msgstr ""
"show <option>\n"
"show <préfixe-option>"
-#: server/commands.c:96
+#: server/commands.c:103
msgid "Show server options."
msgstr "Affiche les options du serveur."
-#: server/commands.c:97
+#: server/commands.c:104
msgid ""
"With no arguments, shows all server options (or available options, when used "
"by clients). With an argument, show only the named option, or options with "
@@ -2318,37 +2324,38 @@ msgstr ""
"argument, affiche l'option nommée, ou toutes les options commençant par le "
"préfixe donné."
-#: server/commands.c:102
+#: server/commands.c:110
msgid "wall <message>"
msgstr "wall <message>"
-#: server/commands.c:103
+#: server/commands.c:111
msgid "Send message to all connections."
msgstr "Envoie un message à tous les connectés."
-#: server/commands.c:104
+#: server/commands.c:112
msgid ""
"For each connected client, pops up a window showing the message entered."
msgstr ""
"Pour chaque joueur connecté, affiche une fenêtre avec le message choisi."
-#: server/commands.c:108
+#: server/commands.c:117
msgid "vote yes|no [vote number]"
msgstr "vote yes|no [n° de vote]"
-#: server/commands.c:109
+#: server/commands.c:118
msgid "Cast a vote."
msgstr "Voter."
-#: server/commands.c:111
+#: server/commands.c:120
#, 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."
+"A player with basic 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."
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"
@@ -2358,7 +2365,7 @@ msgstr ""
"complet se soit écoulé ou que plus de 50% des voix aient été exprimées pour "
"ou contre."
-#: server/commands.c:121
+#: server/commands.c:131
msgid ""
"debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
"<player> | timing | info]"
@@ -2366,11 +2373,11 @@ msgstr ""
"debug [ player <joueur> | city <x> <y> | units <x> <y> | unit <id> | tech "
"<joueur> [ timing | info]"
-#: server/commands.c:123
+#: server/commands.c:133
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:124
+#: server/commands.c:134
msgid ""
"Print AI debug information about given entity and turn continous debugging "
"output for this entity on or off."
@@ -2378,23 +2385,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:128
+#: server/commands.c:139
msgid "set <option-name> <value>"
msgstr "set <option> <valeur>"
-#: server/commands.c:129
+#: server/commands.c:140
msgid "Set server option."
msgstr "Règle les options du serveur."
-#: server/commands.c:132
+#: server/commands.c:144
msgid "team <player> [team]"
msgstr "team <joueur> [équipe]"
-#: server/commands.c:133
+#: server/commands.c:145
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:134
+#: server/commands.c:146
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 "
@@ -2407,15 +2414,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:141
+#: server/commands.c:154
msgid "rulesetdir <directory>"
msgstr "<répertoire> du jeu de règles"
-#: server/commands.c:142
+#: server/commands.c:155
msgid "Choose new ruleset directory or modpack."
msgstr "Sélectionne un nouveau répertoire de jeu de règles."
-#: server/commands.c:143
+#: server/commands.c:156
msgid ""
"Choose new ruleset directory or modpack. Calling this\n"
" without any arguments will show you the currently selected ruleset."
@@ -2424,15 +2431,15 @@ msgstr ""
" ou un modpack. Sans argument, montre le jeu de règles utilisé actuellement."
#. TRANS: translate text between <> only
-#: server/commands.c:149
+#: server/commands.c:163
msgid "metainfo <meta-line>"
msgstr "metainfo <meta-ligne>"
-#: server/commands.c:150
+#: server/commands.c:164
msgid "Set metaserver info line."
msgstr "Règle la chaîne d'information du métaserveur."
-#: server/commands.c:151
+#: server/commands.c:165
msgid ""
"Set user defined metaserver info line. If parameter is omitted,\n"
"previously set metamessage will be removed. For most of the time\n"
@@ -2445,19 +2452,19 @@ msgstr ""
"messages générés automatiquement, s'il est disponible."
#. TRANS: translate text between <> only
-#: server/commands.c:158
+#: server/commands.c:173
msgid "metapatch <meta-line>"
msgstr "metapatch <meta-ligne>"
-#: server/commands.c:159
+#: server/commands.c:174
msgid "Set metaserver patches line."
msgstr "Règle la chaîne des patches du métaserveur."
-#: server/commands.c:165
+#: server/commands.c:181
msgid "Control metaserver connection."
msgstr "Contrôle la connexion au métaserveur."
-#: server/commands.c:166
+#: server/commands.c:182
msgid ""
"'metaconnection ?' reports on the status of the connection to metaserver.\n"
"'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2470,33 +2477,33 @@ msgstr ""
"serveur."
#. TRANS: translate text between <> only
-#: server/commands.c:172
+#: server/commands.c:189
msgid "metaserver <address>"
msgstr "metaserver <adresse>"
-#: server/commands.c:173
+#: server/commands.c:190
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:177
+#: server/commands.c:195
msgid "aitoggle <player-name>"
msgstr "aitoggle <nom-joueur>"
-#: server/commands.c:178
+#: server/commands.c:196
msgid "Toggle AI status of player."
msgstr "Permute entre joueur et IA."
#. TRANS: translate text between [] and <> only
-#: server/commands.c:182
+#: server/commands.c:201
msgid "take [connection-name] <player-name>"
msgstr "take [nom-connexion] <nom-joueur>"
-#: server/commands.c:183
+#: server/commands.c:202
msgid "Take over a player's place in the game."
msgstr "Prend la place d'un joueur dans une partie."
-#: server/commands.c:184
+#: server/commands.c:203
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 "
@@ -2511,15 +2518,15 @@ msgstr ""
"nouveau joueur est crée et assigné à la connexion."
#. TRANS: translate text between [] only
-#: server/commands.c:192
+#: server/commands.c:212
msgid "observe [connection-name] [player-name]"
msgstr "observe [nom-connexion] [nom-joueur]"
-#: server/commands.c:193
+#: server/commands.c:213
msgid "Observe a player or the whole game."
msgstr "Observer un joueur ou une partie en entier."
-#: server/commands.c:194
+#: server/commands.c:214
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 "
@@ -2534,15 +2541,15 @@ msgstr ""
"d'arguments, alors la connexion est attachée à un observateur global."
#. TRANS: translate text between <> only
-#: server/commands.c:202
+#: server/commands.c:223
msgid "detach <connection-name>"
msgstr "detach <nom-connexion>"
-#: server/commands.c:203
+#: server/commands.c:224
msgid "detach from a player."
msgstr "détachement d'un joueur."
-#: server/commands.c:204
+#: server/commands.c:225
msgid ""
"Only the console and connections with cmdlevel 'hack' can force other "
"connections to detach from a player."
@@ -2551,21 +2558,21 @@ msgstr ""
"peuvent forcer d'autres connexions à se détacher d'un joueur."
#. TRANS: translate text between <> only
-#: server/commands.c:209
+#: server/commands.c:231
msgid "create <player-name>"
msgstr "create <nom-joueur>"
-#: server/commands.c:210
+#: server/commands.c:232
msgid "Create an AI player with a given name."
msgstr "Crée un joueur IA avec le nom spécifié."
-#: server/commands.c:211
+#: server/commands.c:233
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:215
+#: server/commands.c:238
msgid ""
"away\n"
"away"
@@ -2573,16 +2580,16 @@ msgstr ""
"away\n"
"away"
-#: server/commands.c:217
+#: server/commands.c:240
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:218
+#: server/commands.c:241
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:222
+#: server/commands.c:246
msgid ""
"novice\n"
"novice <player-name>"
@@ -2590,11 +2597,11 @@ msgstr ""
"novice\n"
"novice <nom-joueur>"
-#: server/commands.c:224
+#: server/commands.c:248
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:225
+#: server/commands.c:249
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 "
@@ -2605,7 +2612,7 @@ msgstr ""
"règle le niveau que du joueur IA concerné."
#. TRANS: translate text between <> only
-#: server/commands.c:231
+#: server/commands.c:256
msgid ""
"easy\n"
"easy <player-name>"
@@ -2613,11 +2620,11 @@ msgstr ""
"easy\n"
"easy <nom-joueur>"
-#: server/commands.c:233
+#: server/commands.c:258
msgid "Set one or all AI players to 'easy'."
msgstr "Règle le niveau du ou des joueurs IA à \"facile\"."
-#: server/commands.c:234
+#: server/commands.c:259
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 "
@@ -2628,7 +2635,7 @@ msgstr ""
"règle le niveau que du joueur IA concerné."
#. TRANS: translate text between <> only
-#: server/commands.c:240
+#: server/commands.c:266
msgid ""
"normal\n"
"normal <player-name>"
@@ -2636,11 +2643,11 @@ msgstr ""
"normal\n"
"normal <nom-joueur>"
-#: server/commands.c:242
+#: server/commands.c:268
msgid "Set one or all AI players to 'normal'."
msgstr "Règle le niveau du ou des joueurs IA à \"normale\"."
-#: server/commands.c:243
+#: server/commands.c:269
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 "
@@ -2651,7 +2658,7 @@ msgstr ""
"règle le niveau que du joueur IA concerné."
#. TRANS: translate text between <> only
-#: server/commands.c:249
+#: server/commands.c:276
msgid ""
"hard\n"
"hard <player-name>"
@@ -2659,11 +2666,11 @@ msgstr ""
"hard\n"
"hard <nom-joueur>"
-#: server/commands.c:251
+#: server/commands.c:278
msgid "Set one or all AI players to 'hard'."
msgstr "Règle le niveau du ou des joueurs IA à \"difficile\"."
-#: server/commands.c:252
+#: server/commands.c:279
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 "
@@ -2674,7 +2681,7 @@ msgstr ""
"ne règle le niveau que du joueur IA concerné."
#. TRANS: translate text between <> only
-#: server/commands.c:258
+#: server/commands.c:286
msgid ""
"experimental\n"
"experimental <player-name>"
@@ -2682,11 +2689,11 @@ msgstr ""
"experimental\n"
"experimental <nom-joueur>"
-#: server/commands.c:260
+#: server/commands.c:288
msgid "Set one or all AI players to 'experimental'."
msgstr "Règle un ou tous les joueurs IA à \"experimental\"."
-#: server/commands.c:261
+#: server/commands.c:289
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 "
@@ -2700,7 +2707,7 @@ msgstr ""
"option n'a pas d'effet."
#. TRANS: translate text between <> only
-#: server/commands.c:269
+#: server/commands.c:298
msgid ""
"cmdlevel\n"
"cmdlevel <level>\n"
@@ -2714,17 +2721,20 @@ msgstr ""
"cmdlevel <niveau> first\n"
"cmdlevel <niveau> <nom-connexion>"
-#: server/commands.c:274
+#: server/commands.c:303
msgid "Query or set command access level access."
msgstr "Affiche ou règle le niveau de commande autorisé."
-#: server/commands.c:275
+#: server/commands.c:304
+#, fuzzy
msgid ""
"The command access level controls which server commands are available\n"
"to users via the client chatline. The available levels are:\n"
" none - no commands\n"
-" info - informational commands only\n"
+" info - informational or observer commands only\n"
+" basic - commands available to players in the game\n"
" ctrl - commands that affect the game and users\n"
+" admin - commands that affect server operation\n"
" hack - *all* commands - dangerous!\n"
"With no arguments, the current command access levels are reported.\n"
"With a single argument, the level is set for all existing connections,\n"
@@ -2763,21 +2773,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:296
+#: server/commands.c:328
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:301
+#: server/commands.c:334
msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
msgstr "timeoutincrease <tour> <accr> <valeur> <multiplicateur>"
-#: server/commands.c:302
+#: server/commands.c:335
msgid "See \"help timeoutincrease\"."
msgstr "voir \"help timeoutincrease\"."
-#: server/commands.c:303
+#: server/commands.c:336
msgid ""
"Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
"<turn> and multiply <value> by <valuemult>. Use this command in concert "
@@ -2789,24 +2799,43 @@ msgstr ""
"0 0 1"
#. TRANS: translate text between <> only
-#: server/commands.c:309
+#: server/commands.c:343
+msgid ""
+"cancelvote\n"
+"cancelvote <vote number>\n"
+"cancelvote all\n"
+msgstr ""
+
+#: server/commands.c:346
+msgid "Cancel a running vote.\n"
+msgstr ""
+
+#: server/commands.c:347
+msgid ""
+"With no arguments this command removes your own vote. If you have an admin "
+"access level, you can cancel any vote by vote number, or all votes with the "
+"'all' argument."
+msgstr ""
+
+#. TRANS: translate text between <> only
+#: server/commands.c:354
msgid "endgame"
msgstr "endgame"
-#: server/commands.c:310
+#: server/commands.c:355
msgid "End the game immediately in a draw."
msgstr "Partie finissant par une égalité."
#. TRANS: translate text between <> only
-#: server/commands.c:314
+#: server/commands.c:360
msgid "surrender"
msgstr "se rendre"
-#: server/commands.c:315
+#: server/commands.c:361
msgid "Concede the game."
msgstr "S'avouer vaincu."
-#: server/commands.c:316
+#: server/commands.c:362
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."
@@ -2815,15 +2844,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:322
+#: server/commands.c:369
msgid "remove <player-name>"
msgstr "remove <joueur>"
-#: server/commands.c:323
+#: server/commands.c:370
msgid "Fully remove player from game."
msgstr "Enlève complètement le joueur de la partie."
-#: server/commands.c:324
+#: server/commands.c:371
msgid ""
"This *completely* removes a player from the game, including all cities and "
"units etc. Use with care!"
@@ -2832,7 +2861,7 @@ msgstr ""
"villes et ses unités. A utiliser avec précaution!"
#. TRANS: translate text between <> only
-#: server/commands.c:329
+#: server/commands.c:377
msgid ""
"save\n"
"save <file-name>"
@@ -2840,11 +2869,11 @@ msgstr ""
"save\n"
"save <nom-fichier>"
-#: server/commands.c:331
+#: server/commands.c:379
msgid "Save game to file."
msgstr "Sauvegarde la partie dans le fichier."
-#: server/commands.c:332
+#: server/commands.c:380
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"
@@ -2861,7 +2890,7 @@ msgstr ""
"reconnectés."
#. TRANS: translate text between <> only
-#: server/commands.c:341
+#: server/commands.c:390
msgid ""
"load\n"
"load <file-name>"
@@ -2869,11 +2898,11 @@ msgstr ""
"load\n"
"load <nom-fichier>"
-#: server/commands.c:343
+#: server/commands.c:392
msgid "Load game from file."
msgstr "Charge une partie depuis un fichier."
-#: server/commands.c:344
+#: server/commands.c:393
msgid ""
"Load a game from <file-name>. Any current data including players, rulesets "
"and server options are lost.\n"
@@ -2882,123 +2911,123 @@ msgstr ""
"compris joueurs, jeu de règles et options du serveur sont perdues.\n"
#. TRANS: translate text between <> only
-#: server/commands.c:349
+#: server/commands.c:399
msgid "read <file-name>"
msgstr "read <nom-fichier>"
-#: server/commands.c:350
+#: server/commands.c:400
msgid "Process server commands from file."
msgstr "Exécute les commandes du serveur provenant du fichier."
#. TRANS: translate text between <> only
-#: server/commands.c:354
+#: server/commands.c:405
msgid "write <file-name>"
msgstr "write <nom-fichier>"
-#: server/commands.c:355
+#: server/commands.c:406
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:359
+#: server/commands.c:411
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:363
+#: server/commands.c:416
msgid "Simply returns the id of the server."
msgstr "Retourne l'identifiant du serveur."
-#: server/connecthand.c:85
+#: server/connecthand.c:109
#, c-format
msgid "Welcome to the %s Server running at %s port %d."
msgstr "Bienvenue sur le serveur %s tournant sur %s, port %d."
-#: server/connecthand.c:89
+#: server/connecthand.c:113
#, c-format
msgid "Welcome to the %s Server at port %d."
msgstr "Bienvenue sur le serveur %s, port %d."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:97
+#: server/connecthand.c:121
#, fuzzy, c-format
msgid "(%d) %s: connected [%s]"
msgstr "(%d) %s s'est connecté depuis %s."
-#: server/connecthand.c:104
+#: server/connecthand.c:128
#, c-format
msgid "Server: %s has connected from %s."
msgstr "Serveur : %s s'est connecté depuis %s."
-#: server/connecthand.c:145
+#: server/connecthand.c:175
msgid "Couldn't attach your connection to new player."
msgstr "Impossible d'attacher votre connexion à un nouveau joueur."
-#: server/connecthand.c:165
+#: server/connecthand.c:199
#, c-format
msgid "You are logged in as '%s' connected to no player."
msgstr "Vous êtes logué en tant que \"%s\" connecté à aucun joueur."
-#: server/connecthand.c:169
+#: server/connecthand.c:203
#, c-format
msgid "You are logged in as '%s' connected to an anonymous player."
msgstr "Vous êtes logué en tant que \"%s\" connecté à un joueur anonyme."
-#: server/connecthand.c:174
+#: server/connecthand.c:208
#, c-format
msgid "You are logged in as '%s' connected to %s."
msgstr "Vous êtes logué en tant que \"%s\" connecté à %s."
-#: server/connecthand.c:187
+#: server/connecthand.c:221
#, c-format
msgid "Turn-blocking game play: waiting on %s to finish turn..."
msgstr "Jeu par tour : en attente de %s pour finir le tour..."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:240
+#: server/connecthand.c:274
#, fuzzy, c-format
msgid "(%d) %s: connection request [%s]"
msgstr "(%d) Connexion demandée par %s depuis %s"
-#: server/connecthand.c:266
+#: server/connecthand.c:300
#, fuzzy
msgid "The client is missing a capability that this server needs."
msgstr "Il manque au client une fonctionnalité nécessaire à ce serveur."
-#: server/connecthand.c:268 server/connecthand.c:279
+#: server/connecthand.c:302 server/connecthand.c:313
#, fuzzy, c-format
msgid "(%d) %s rejected: mismatched capabilities!"
msgstr "(%d) %s a été rejeté : non correspondance des fonctionnalités."
-#: server/connecthand.c:277
+#: server/connecthand.c:311
#, fuzzy
msgid "This server is missing a capability that the client needs."
msgstr "Il manque au serveur une fonctionnalité nécessaire à ce client."
-#: server/connecthand.c:290
+#: server/connecthand.c:324
#, fuzzy
msgid "The username is invalid!"
msgstr "Nom d'utilisateur invalide"
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:292
+#: server/connecthand.c:326
#, fuzzy, c-format
msgid "(%d) %s rejected: invalid username [%s]"
msgstr "(%d) %s a été rejeté : nom invalide [%s]."
-#: server/connecthand.c:303
+#: server/connecthand.c:337
#, fuzzy
msgid "Your username is already connected!"
msgstr "déjà connecté."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:305
+#: server/connecthand.c:339
#, fuzzy, c-format
msgid "(%d) %s rejected: duplicate username [%s]"
msgstr "(%d) %s a été rejeté : login redondant [%s]."
-#: server/connecthand.c:335 server/connecthand.c:344
+#: server/connecthand.c:369 server/connecthand.c:378
#, c-format
msgid "Lost connection: %s."
msgstr "Connexion perdue: %s."
@@ -3015,115 +3044,115 @@ msgstr "Ok, style Standard positionn
msgid "For introductory help, type 'help'."
msgstr "Pour obtenir une aide sommaire, tapez \"help\"."
-#: server/diplhand.c:164
+#: server/diplhand.c:167
#, c-format
msgid "The %s can't accept %s."
msgstr "Les %s ne peuvent accepter %s."
-#: server/diplhand.c:176
+#: server/diplhand.c:179
#, c-format
msgid "You don't have tech %s, you can't accept treaty."
msgstr "Vous n'avez pas la technologie %s, vous ne pouvez accepter le traité."
-#: server/diplhand.c:185
+#: server/diplhand.c:188
msgid "City you are trying to give no longer exists, you can't accept treaty."
msgstr ""
"La ville que vous essayez de donner n'existe plus, vous ne pouvez pas "
"accepter le traité."
-#: server/diplhand.c:191
+#: server/diplhand.c:194
#, c-format
msgid "You are not owner of %s, you can't accept treaty."
msgstr ""
"Vous n'êtes pas le propriétaire de %s, vous ne pouvez pas accepter le traité."
-#: server/diplhand.c:197 server/diplhand.c:301
+#: server/diplhand.c:200 server/diplhand.c:304
#, c-format
msgid "Your capital (%s) is requested, you can't accept treaty."
msgstr ""
"Votre capitale (%s) est requise, vous ne pouvez pas accepter le traité."
#
-#: server/diplhand.c:224
+#: server/diplhand.c:227
msgid "You don't have enough gold, you can't accept treaty."
msgstr "Vous n'avez pas assez d'or pour accepter le traité."
-#: server/diplhand.c:256 server/diplhand.c:261
+#: server/diplhand.c:259 server/diplhand.c:264
#, c-format
msgid "A treaty containing %d clause was agreed upon."
msgid_plural "A treaty containing %d clauses was agreed upon."
msgstr[0] "Un traité contenant %d clause a été conclu."
msgstr[1] "Un traité contenant %d clauses a été conclu."
-#: server/diplhand.c:277 server/diplhand.c:281
+#: server/diplhand.c:280 server/diplhand.c:284
#, c-format
msgid "One of the cities the %s are giving away is destroyed! Treaty canceled!"
msgstr "Une des villes que %s vous donne a été détruite ! Traité annulé !"
-#: server/diplhand.c:288 server/diplhand.c:293
+#: server/diplhand.c:291 server/diplhand.c:296
#, c-format
msgid "The %s no longer control %s! Treaty canceled!"
msgstr "Les %s ne contrôlent plus %s ! Traité annulé !"
-#: server/diplhand.c:331 server/diplhand.c:335
+#: server/diplhand.c:334 server/diplhand.c:338
#, c-format
msgid "The %s don't have the promised amount of gold! Treaty canceled!"
msgstr "Les %s n'ont pas la quantité d'or promise ! Traité annulé !"
-#: server/diplhand.c:364
+#: server/diplhand.c:367
#, c-format
msgid "You gave an embassy to %s."
msgstr "Vous accordez une ambassade à %s."
-#: server/diplhand.c:367
+#: server/diplhand.c:370
#, c-format
msgid "%s allowed you to create an embassy!"
msgstr "%s vous a permis de créer une ambassade !"
-#: server/diplhand.c:383
+#: server/diplhand.c:386
#, c-format
msgid "You are taught the knowledge of %s."
msgstr "La connaissance de %s vous est enseignée."
-#: server/diplhand.c:387
+#: server/diplhand.c:390
#, c-format
msgid "The %s have acquired %s from the %s."
msgstr "Les %s ont acquis %s des %s."
-#: server/diplhand.c:402
+#: server/diplhand.c:405
#, c-format
msgid "You get %d gold."
msgstr "Vous recevez %d lingots."
#. TRANS: ... Polish worldmap.
-#: server/diplhand.c:410
+#: server/diplhand.c:413
#, fuzzy, c-format
msgid "You receive the %s worldmap."
msgstr "Vous recevez la carte des contrées connues de %s."
#. TRANS: ... Polish seamap.
-#: server/diplhand.c:419
+#: server/diplhand.c:422
#, fuzzy, c-format
msgid "You receive the %s seamap."
msgstr "Vous recevez la carte maritime de %s."
-#: server/diplhand.c:436
+#: server/diplhand.c:439
#, c-format
msgid "You receive city of %s from %s."
msgstr "Vous recevez la ville de %s de %s."
-#: server/diplhand.c:441
+#: server/diplhand.c:444
#, c-format
msgid "You give city of %s to %s."
msgstr "Vous donnez la ville de %s à %s."
-#: server/diplhand.c:454 server/diplhand.c:457
+#: server/diplhand.c:457 server/diplhand.c:460
#, c-format
msgid "You agree on a cease-fire with %s."
msgstr "Vous acceptez un cessez-le-feu avec %s."
#. TRANS: ... the Poles ... Polish territory.
-#: server/diplhand.c:476 server/diplhand.c:488
+#: server/diplhand.c:479 server/diplhand.c:491
#, fuzzy, c-format
msgid ""
"You agree on an armistice with the %s. In %d turn, it will become a peace "
@@ -3138,32 +3167,32 @@ msgstr[1] ""
"Vous êtes d'accord pour un armistice avec %s. Dans %d tours cela deviendra "
"un traité de paix. Retirez vous unités du territoire des %s."
-#: server/diplhand.c:512 server/diplhand.c:515
+#: server/diplhand.c:515 server/diplhand.c:518
#, c-format
msgid "You agree on an alliance with %s."
msgstr "Vous concluez une alliance avec %s."
-#: server/diplhand.c:524
+#: server/diplhand.c:527
#, c-format
msgid "You give shared vision to %s."
msgstr "Vous partagez votre vue avec %s."
-#: server/diplhand.c:527
+#: server/diplhand.c:530
#, c-format
msgid "%s gives you shared vision."
msgstr "%s partage sa vue avec vous."
-#: server/diplhand.c:663
+#: server/diplhand.c:666
#, c-format
msgid "%s canceled the meeting!"
msgstr "%s a annulé la rencontre!"
-#: server/diplhand.c:670
+#: server/diplhand.c:673
#, c-format
msgid "Meeting with %s canceled."
msgstr "Réunion avec %s annulée."
-#: server/diplhand.c:712
+#: server/diplhand.c:715
msgid "Your diplomatic envoy was decapitated!"
msgstr "Votre émissaire diplomatique a été décapité !"
@@ -3352,87 +3381,87 @@ msgid "The %s destroyed the %s in %s."
msgstr "Les %s ont détruit %s à %s."
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1091
+#: server/diplomats.c:1097
#, fuzzy, c-format
msgid "An enemy %s has been eliminated by your %s."
msgstr "Un %s ennemi a été éliminé en défendant %s."
#. TRANS: <unit> ... <city> ... <diplomat>
-#: server/diplomats.c:1098
+#: server/diplomats.c:1104
#, c-format
msgid "Your %s has been eliminated defending %s against a %s."
msgstr "Votre %1$s a été éliminé par %3$s en défendant %2$s."
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1106
+#: server/diplomats.c:1112
#, fuzzy, c-format
msgid "Your %s has been eliminated defending against a %s."
msgstr "Votre %s a été éliminé par %s en défendant."
-#: server/diplomats.c:1119
+#: server/diplomats.c:1125
#, c-format
msgid "Your %s was eliminated by a defending %s."
msgstr "Votre %s a été éliminé par un %s en défense."
-#: server/diplomats.c:1127
+#: server/diplomats.c:1133
#, c-format
msgid "Eliminated %s %s while infiltrating %s."
msgstr "Un %2$s %1$s a été éliminé en infiltrant %3$s."
-#: server/diplomats.c:1134
+#: server/diplomats.c:1140
#, c-format
msgid "Eliminated %s %s while infiltrating our troops."
msgstr "Un %2$s %1$s a été éliminé en infiltrant nos troupes."
-#: server/diplomats.c:1185
+#: server/diplomats.c:1191
#, fuzzy, c-format
msgid ""
"Your %s has successfully completed the mission and returned unharmed to %s."
msgstr ""
"Votre %s a rempli sa mission avec succès et est revenu sain et sauf à %s."
-#: server/diplomats.c:1204
+#: server/diplomats.c:1210
#, fuzzy, c-format
msgid "Your %s was captured after completing the mission in %s."
msgstr "Votre %s a été capturé après avoir réussi sa mission à %s."
-#: server/diplomats.c:1210
+#: server/diplomats.c:1216
#, fuzzy, c-format
msgid "Your %s was captured after completing the mission."
msgstr "Votre %s a été capturé après avoir rempli sa mission."
-#: server/diplomats.c:1242
+#: server/diplomats.c:1248
#, fuzzy, c-format
msgid "You have caused an incident while bribing the %s %s."
msgstr ""
"Vous avez causé un incident diplomatique en tentant de soudoyer %2$s de %1$s."
-#: server/diplomats.c:1247
+#: server/diplomats.c:1253
#, c-format
msgid "%s has caused an incident while bribing your %s."
msgstr "%s a provoqué un incident diplomatique en soudoyant votre %s."
-#: server/diplomats.c:1254
+#: server/diplomats.c:1260
#, c-format
msgid "You have caused an incident while attempting to steal tech from %s."
msgstr ""
"Vous avez provoqué un incident diplomatique en essayant de voler une "
"technologie à %s."
-#: server/diplomats.c:1258
+#: server/diplomats.c:1264
#, c-format
msgid "%s has caused an incident while attempting to steal tech from you."
msgstr ""
"%s a provoqué un incident diplomatique en essayant de vous voler une "
"technologie."
-#: server/diplomats.c:1264
+#: server/diplomats.c:1270
#, c-format
msgid "You have caused an incident while inciting a revolt in %s."
msgstr ""
"Vous avez provoqué un incident diplomatique en fomentant une révolte dans %s."
-#: server/diplomats.c:1268
+#: server/diplomats.c:1274
#, c-format
msgid "%s have caused an incident while inciting a revolt in %s."
msgstr ""
@@ -3554,12 +3583,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:1418
+#: server/maphand.c:1425
#, c-format
msgid "Moved your %s due to changing terrain."
msgstr "Déplacement de %s suite à la transformation du terrain."
-#: server/maphand.c:1436
+#: server/maphand.c:1443
#, c-format
msgid "Disbanded your %s due to changing terrain."
msgstr "Démantèlement de votre %s suite à la transformation du terrain."
@@ -3568,7 +3597,7 @@ msgstr "D
msgid "Not reporting to the metaserver in this game."
msgstr "Pas de rapport au métaserveur pour cette partie."
-#: server/meta.c:430
+#: server/meta.c:432
#, c-format
msgid "Metaserver: bad address: [%s:%d]."
msgstr "Métaserveur: erreur d'adresse : [%s:%d]."
@@ -3699,26 +3728,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:1103
+#: server/plrhand.c:1115
#, c-format
msgid "Removing player %s."
msgstr "Joueur %s retiré."
-#: server/plrhand.c:1105
+#: server/plrhand.c:1117
msgid "You've been removed from the game!"
msgstr "Vous avez été retiré de la partie !"
-#: server/plrhand.c:1108
+#: server/plrhand.c:1120
#, c-format
msgid "%s has been removed from the game."
msgstr "%s a été retiré de la partie."
-#: server/plrhand.c:1153 server/plrhand.c:1158
+#: server/plrhand.c:1167 server/plrhand.c:1172
#, 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:1178
+#: server/plrhand.c:1192
#, c-format
msgid ""
"%s and %s meet and go to instant war. You cancel your alliance with both."
@@ -3726,17 +3755,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:1656
+#: server/plrhand.c:1670
#, 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:1663
+#: server/plrhand.c:1677
#, 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:1686
+#: server/plrhand.c:1700
#, fuzzy, c-format
msgid ""
"Your nation is thrust into civil war! %s is declared the leader of the rebel "
@@ -3745,12 +3774,12 @@ msgstr ""
"Votre nation plonge dans la guerre civile; %s est déclaré chef des États "
"rebelles."
-#: server/plrhand.c:1707
+#: server/plrhand.c:1721
#, c-format
msgid "%s declares allegiance to %s."
msgstr "%s fait allégeance à %s."
-#: server/plrhand.c:1722
+#: server/plrhand.c:1736
#, fuzzy, c-format
msgid ""
"Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3954,67 +3983,67 @@ msgstr "(construction de %s
msgid "Wonders of the World"
msgstr "Merveilles du monde"
-#: server/report.c:547
+#: server/report.c:552
msgid " sq. mi."
msgstr " m²"
-#: server/report.c:557
+#: server/report.c:562
msgid " M tons"
msgstr " M de tonnes"
-#: server/report.c:562
+#: server/report.c:567
msgid " M goods"
msgstr " M d'unités"
-#: server/report.c:567
+#: server/report.c:572
msgid " bulbs"
msgstr " ampoules"
-#: server/report.c:572
+#: server/report.c:577
msgid " month"
msgid_plural " months"
msgstr[0] " mois"
msgstr[1] " mois"
-#: server/report.c:577
+#: server/report.c:582
msgid " ton"
msgid_plural " tons"
msgstr[0] " tonne"
msgstr[1] " tonnes"
-#: server/report.c:591
+#: server/report.c:596
msgid "st"
msgstr "er"
-#: server/report.c:593
+#: server/report.c:598
msgid "nd"
msgstr "ème"
-#: server/report.c:595
+#: server/report.c:600
msgid "rd"
msgstr "ème"
-#: server/report.c:597
+#: server/report.c:602
msgid "th"
msgstr "ème"
-#: server/report.c:700
+#: server/report.c:705
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:743 server/report.c:768
+#: server/report.c:748 server/report.c:773
msgid "Demographics Report:"
msgstr "Bulletin Démographique :"
-#: server/report.c:744
+#: server/report.c:749
msgid "Sorry, the Demographics report is unavailable."
msgstr "Désolé, le bulletin démographique n'est pas disponible."
#. TRANS: <nation adjective> <government name> (<year>).
#. * E.g. "Polish Despotism (200 AD)".
-#: server/report.c:750
+#: server/report.c:755
#, fuzzy, c-format
msgid "%s %s (%s)"
msgstr "%s dans %s (%s)\n"
@@ -4025,11 +4054,11 @@ msgstr "%s dans %s (%s)\n"
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:2356
+#: server/ruleset.c:2366
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:3166
+#: server/ruleset.c:3178
msgid "Loading rulesets"
msgstr "Chargement des jeux de règles"
@@ -4045,13 +4074,13 @@ 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:3588
+#: server/savegame.c:3587
#, 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."
#. TRANS: Fatal error message.
-#: server/savegame.c:3815
+#: server/savegame.c:3817
#, fuzzy
msgid ""
"Saved game uses the \"classic\" terrain ruleset, and is no longer supported."
@@ -4059,7 +4088,7 @@ msgstr ""
"La sauvegarde utilise le jeu de règles des terrains classique qui n'est plus "
"supporté."
-#: server/savegame.c:3824
+#: server/savegame.c:3826
#, c-format
msgid ""
"Warning: Different rulesetdirs ('%s' and '%s') are no longer supported. "
@@ -4069,7 +4098,7 @@ msgstr ""
"sont plus supportés. Utilisation de \"%s\"."
#. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4051
+#: server/savegame.c:4055
#, c-format
msgid "%s had invalid nation; changing to %s."
msgstr ""
@@ -4102,7 +4131,7 @@ msgstr "Internes"
msgid "Networking"
msgstr "Réseau"
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:734
#: client/gui-win32/dialogs.c:532
msgid "All"
msgstr "Tout"
@@ -5363,11 +5392,11 @@ msgstr ""
"le fichier \"civscore.log\" à chaque tour. Ces statistiques peuvent être "
"utilisées pour faire des graphes de puissance après la partie."
-#: server/sernet.c:150
+#: server/sernet.c:151
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:929
+#: server/sernet.c:933
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr "Serveur: erreur d'adresse : [%s:%d]."
@@ -5449,35 +5478,35 @@ msgid "Without guidance from the capital, the %s spaceship is lost!"
msgstr ""
"Sans les instructions de la capitale, le vaisseau spatial des %s est perdu !"
-#: server/srv_main.c:240
+#: server/srv_main.c:242
msgid "Game ended in a draw as end year exceeded"
msgstr "Partie terminée par un match nul après la date fixée de fin de partie"
-#: server/srv_main.c:274
+#: server/srv_main.c:276
#, c-format
msgid "The %s spaceship has arrived at Alpha Centauri."
msgstr "Le vaisseau spatial des %s est arrivé sur Alpha du Centaure."
-#: server/srv_main.c:287 server/srv_main.c:322
+#: server/srv_main.c:289 server/srv_main.c:324
#, c-format
msgid "Team victory to %s"
msgstr "Victoire d'équipe à %s"
-#: server/srv_main.c:297 server/srv_main.c:338
+#: server/srv_main.c:299 server/srv_main.c:340
#, c-format
msgid "Game ended in victory for %s"
msgstr "Partie se terminant par une victoire de %s"
-#: server/srv_main.c:345
+#: server/srv_main.c:347
msgid "Game ended in a draw"
msgstr "Partie finissant par une égalité"
-#: server/srv_main.c:461 server/srv_main.c:472
+#: server/srv_main.c:465 server/srv_main.c:476
#, fuzzy, c-format
msgid "Your %s was disbanded in accordance with your peace treaty with the %s."
msgstr "Votre %s a été congédié conformément au traité de paix avec les %s."
-#: server/srv_main.c:512 server/srv_main.c:516
+#: server/srv_main.c:516 server/srv_main.c:520
#, c-format
msgid ""
"Concerned citizens point out that the cease-fire with %s will run out soon."
@@ -5486,14 +5515,14 @@ msgstr ""
"fin."
# AR
-#: server/srv_main.c:521 server/srv_main.c:525
+#: server/srv_main.c:525 server/srv_main.c:529
#, c-format
msgid "The cease-fire with %s has run out. You are now at war with the %s."
msgstr ""
"Le cessez-le-feu avec %s a pris fin. Vos relations avec les %s sont "
"désormais à la guerre."
-#: server/srv_main.c:542
+#: server/srv_main.c:546
#, c-format
msgid ""
"Ceasefire between %s and %s has run out. They are at war. You cancel your "
@@ -5503,101 +5532,101 @@ msgstr ""
"alliance avec ces deux joueurs est annulée."
# AR
-#: server/srv_main.c:961
+#: server/srv_main.c:997
#, c-format
msgid "Failed saving game as %s"
msgstr "Échec dans la sauvegarde de la partie sous %s"
-#: server/srv_main.c:963
+#: server/srv_main.c:999
#, c-format
msgid "Game saved as %s"
msgstr "Partie sauvegardée sous %s"
-#: server/srv_main.c:994
+#: server/srv_main.c:1030
msgid "The game is already running."
msgstr "La partie est déjà en cours."
-#: server/srv_main.c:1002
+#: server/srv_main.c:1038
#, 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:1009
+#: server/srv_main.c:1045
msgid "Starting game."
msgstr "Démarrage du jeu."
-#: server/srv_main.c:1071
+#: server/srv_main.c:1112
#, c-format
msgid "request for unknown report (type %d)"
msgstr "requête d'un rapport inconnu (type %d)"
-#: server/srv_main.c:1136
+#: server/srv_main.c:1177
#, c-format
msgid "Warning: rejecting old client %s"
msgstr "Attention : rejet d'un ancien client %s"
-#: server/srv_main.c:1238
+#: server/srv_main.c:1279
#, 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:1338
+#: server/srv_main.c:1381
msgid "Please choose a non-blank name."
msgstr "Veuillez choisir un nom non vide."
-#: server/srv_main.c:1354
+#: server/srv_main.c:1397
msgid "That nation is already in use."
msgstr "Cette nation est déjà prise."
-#: server/srv_main.c:1370
+#: server/srv_main.c:1413
#, 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:1391
+#: server/srv_main.c:1434
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:1490
+#: server/srv_main.c:1533
#, 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:1496
+#: server/srv_main.c:1539
#, c-format
msgid "%s nation is already in use."
msgstr "La nation %s est déjà prise."
-#: server/srv_main.c:1514
+#: server/srv_main.c:1557
#, c-format
msgid "%s is the %s ruler %s."
msgstr "%s est le chef %s %s."
-#: server/srv_main.c:1570
+#: server/srv_main.c:1613
#, 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:1614 server/srv_main.c:1618
+#: server/srv_main.c:1657 server/srv_main.c:1661
#, 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:1760
+#: server/srv_main.c:1803
#, c-format
msgid "Player %d"
msgstr "Joueur %d"
-#: server/srv_main.c:1771 server/srv_main.c:1777
+#: server/srv_main.c:1814 server/srv_main.c:1820
#, c-format
msgid "%s rules the %s."
msgstr "%s dirige les %s."
-#: server/srv_main.c:1942
+#: server/srv_main.c:1985
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
@@ -5605,253 +5634,243 @@ msgstr ""
"Ce civserveur a un support d'authentification des joueurs, mais il est "
"actuellement desactivé."
-#: server/srv_main.c:1993
+#: server/srv_main.c:2037
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr "Envoi d'information au métaserveur [%s]"
-#: server/srv_main.c:2024
+#: server/srv_main.c:2069
msgid "The game is over..."
msgstr "La partie est terminée..."
-#: server/srv_main.c:2237
+#: server/srv_main.c:2286
msgid "Now accepting new client connections."
msgstr "Accepte dorénavant la connexion de nouveaux clients."
-#: server/stdinhand.c:246
-#, c-format
-msgid "Vote \"%s\" is passed %d to %d with %d abstentions."
-msgstr "Vote \"%s\" est passé %d à %d avec %d abstentions."
-
-#: server/stdinhand.c:253
-#, c-format
-msgid "Vote \"%s\" failed with %d against, %d for and %d abstentions."
-msgstr "Vote \"%s\" n'est pas passé avec %d contre, %d pour et %d abstentions."
-
#. TRANS: ambiguous command
-#: server/stdinhand.c:365
+#: server/stdinhand.c:284
msgid "(ambiguous)"
msgstr "(ambigu)"
#. TRANS: unrecognized command
#. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:416
+#: server/stdinhand.c:287 client/citydlg_common.c:419
#: 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 "(inconnu)"
-#: server/stdinhand.c:458
+#: server/stdinhand.c:377
msgid "Name is empty, so cannot be a player."
msgstr "Le nom est vide, et ne peut donc être celui d'un joueur."
-#: server/stdinhand.c:462
+#: server/stdinhand.c:381
msgid "Name is too long, so cannot be a player."
msgstr "Le nom est trop long pour être celui d'un joueur."
-#: server/stdinhand.c:466
+#: server/stdinhand.c:385
#, c-format
msgid "Player name prefix '%s' is ambiguous."
msgstr "Le préfixe du nom du joueur \"%s\" est ambigu."
-#: server/stdinhand.c:470
+#: server/stdinhand.c:389
#, c-format
msgid "No player by the name of '%s'."
msgstr "Aucun joueur du nom de \"%s\"."
-#: server/stdinhand.c:474 server/stdinhand.c:509
+#: server/stdinhand.c:393 server/stdinhand.c:428
#, c-format
msgid "Unexpected match_result %d (%s) for '%s'."
msgstr "match_result inattendu : %d (%s) pour \"%s\"."
-#: server/stdinhand.c:493
+#: server/stdinhand.c:412
msgid "Name is empty, so cannot be a connection."
msgstr "Le nom est vide, et ne peut donc être un nom de connexion."
-#: server/stdinhand.c:497
+#: server/stdinhand.c:416
msgid "Name is too long, so cannot be a connection."
msgstr "Le nom est trop long pour être un nom de connexion."
-#: server/stdinhand.c:501
+#: server/stdinhand.c:420
#, c-format
msgid "Connection name prefix '%s' is ambiguous."
msgstr "Le préfixe du nom de connexion \"%s\" est ambigu."
-#: server/stdinhand.c:505
+#: server/stdinhand.c:424
#, c-format
msgid "No connection by the name of '%s'."
msgstr "Aucune connexion du nom de \"%s\"."
-#: server/stdinhand.c:525
+#: server/stdinhand.c:444
#, c-format
msgid "Open metaserver connection to [%s]."
msgstr "Ouvrir la connexion avec le métaserveur de \"%s\"."
-#: server/stdinhand.c:538
+#: server/stdinhand.c:457
#, c-format
msgid "Close metaserver connection to [%s]."
msgstr "Interrompre la connexion avec le métaserveur de \"%s\"."
-#: server/stdinhand.c:553
+#: server/stdinhand.c:472
msgid "Metaserver connection is open."
msgstr "Connexion métaserveur ouverte."
-#: server/stdinhand.c:556
+#: server/stdinhand.c:475
msgid "Metaserver connection is closed."
msgstr "Connexion au métaserveur fermée."
-#: server/stdinhand.c:566
+#: server/stdinhand.c:485
msgid "Metaserver connection is already open."
msgstr "Connexion métaserveur déjà ouverte."
-#: server/stdinhand.c:577
+#: server/stdinhand.c:496
msgid "Metaserver connection is already closed."
msgstr "Connexion au métaserveur déjà fermée."
-#: server/stdinhand.c:582
+#: server/stdinhand.c:501
msgid "Argument must be 'u', 'up', 'd', 'down', or '?'."
msgstr "L'argument doit être \"u\", \"up\", \"d\", \"down\", ou \"?\"."
-#: server/stdinhand.c:603
+#: server/stdinhand.c:522
#, c-format
msgid "Metaserver patches string set to '%s'."
msgstr "Chaîne des patches du métaserveur positionnée à \"%s\"."
-#: server/stdinhand.c:606
+#: server/stdinhand.c:525
#, c-format
msgid "Metaserver patches string set to '%s', not reporting to metaserver."
msgstr ""
"Chaîne des patches du métaserveur positionnée à \"%s\", pas de rapport au "
"métaserveur."
-#: server/stdinhand.c:627
+#: server/stdinhand.c:546
#, c-format
msgid "Metaserver message string set to '%s'."
msgstr "Chaîne de message du métaserveur positionnée à \"%s\"."
-#: server/stdinhand.c:630
+#: server/stdinhand.c:549
#, c-format
msgid "Metaserver message string set to '%s', not reporting to metaserver."
msgstr ""
"Chaîne de message du métaserveur positionnée à \"%s\", pas de rapport au "
"métaserveur."
-#: server/stdinhand.c:650
+#: server/stdinhand.c:569
#, c-format
msgid "Metaserver is now [%s]."
msgstr "Le métaserveur est dorénavant \"%s\"."
-#: server/stdinhand.c:660
+#: server/stdinhand.c:579
#, c-format
msgid "Server id: %s"
msgstr "Identifiant du serveur: %s"
-#: server/stdinhand.c:757
+#: server/stdinhand.c:676
msgid "You cannot save games manually on this server."
msgstr ""
"Vous ne pouvez pas sauvegarder manuellement les parties sur ce serveur."
-#: server/stdinhand.c:774
+#: server/stdinhand.c:693
msgid "Cannot toggle a barbarian player."
msgstr "Impossible de sélectionner un joueur barbare."
-#: server/stdinhand.c:781
+#: server/stdinhand.c:700
#, c-format
msgid "%s is now under AI control."
msgstr "%s est à présent contrôlé par l'IA."
-#: server/stdinhand.c:802
+#: server/stdinhand.c:721
#, c-format
msgid "%s is now under human control."
msgstr "%s est à présent contrôlé par un humain."
-#: server/stdinhand.c:847
+#: server/stdinhand.c:766
msgid "Can't add AI players once the game has begun."
msgstr "Impossible d'ajouter des joueurs IA après le début de la partie."
-#: server/stdinhand.c:867
+#: server/stdinhand.c:786
msgid "Can't add more players, server is full."
msgstr "Impossible d'ajouter des joueurs, le serveur est complet."
-#: server/stdinhand.c:874
+#: server/stdinhand.c:793
msgid "Can't use an empty name."
msgstr "Impossible d'utiliser un nom vide."
-#: server/stdinhand.c:881
+#: server/stdinhand.c:800
#, c-format
msgid "That name exceeds the maximum of %d chars."
msgstr "Ce nom est trop long (%d caractères maximum)."
-#: server/stdinhand.c:887
+#: server/stdinhand.c:806
msgid "That name is not allowed."
msgstr "Ce nom n'est pas autorisé."
-#: server/stdinhand.c:893
+#: server/stdinhand.c:812
msgid "A player already exists by that name."
msgstr "Un autre joueur a déjà pris ce nom."
-#: server/stdinhand.c:899
+#: server/stdinhand.c:818
msgid "A user already exists by that name."
msgstr "Un autre joueur de ce nom existe déjà."
-#: server/stdinhand.c:925
+#: server/stdinhand.c:844
#, c-format
msgid "%s has been added as an AI-controlled player."
msgstr "%s a été ajouté en tant que joueur contrôlé par une IA."
-#: server/stdinhand.c:932
+#: server/stdinhand.c:851
#, c-format
msgid "Error creating new AI player: %s."
msgstr "Erreur lors de la création d'un nouveau joueur IA : %s."
-#: server/stdinhand.c:966
+#: server/stdinhand.c:885
msgid "Players cannot be removed once the game has started."
msgstr ""
"Les joueurs ne peuvent pas être supprimés une fois que la partie a commencé."
-#: server/stdinhand.c:977
+#: server/stdinhand.c:896
#, c-format
msgid "Removed player %s from the game."
msgstr "Joueur %s retiré de la partie."
-#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
+#: server/stdinhand.c:935 server/stdinhand.c:3372 server/stdinhand.c:3507
#, c-format
msgid "Name \"%s\" disallowed for security reasons."
msgstr "Le nom \"%s\" est interdit pour des raisons de sécurité."
-#: server/stdinhand.c:1029
+#: server/stdinhand.c:948
#, c-format
msgid "No command script found by the name \"%s\"."
msgstr "Aucun script de commandes trouvé du nom de \"%s\"."
-#: server/stdinhand.c:1037
+#: server/stdinhand.c:956
#, c-format
msgid "Loading script file: %s"
msgstr "Chargement du fichier de script : %s"
-#: server/stdinhand.c:1052
+#: server/stdinhand.c:971
#, c-format
msgid "Cannot read command line scriptfile '%s'."
msgstr "Impossible de lire le fichier de script \"%s\"."
-#: server/stdinhand.c:1054
+#: server/stdinhand.c:973
#, c-format
msgid "Could not read script file '%s'."
msgstr "Impossible de lire le fichier de script \"%s\"."
-#: server/stdinhand.c:1146
+#: server/stdinhand.c:1065
#, c-format
msgid "Could not write script file '%s'."
msgstr "Impossible d'écrire dans le fichier de script \"%s\"."
-#: server/stdinhand.c:1158
+#: server/stdinhand.c:1077
msgid "You cannot use the write command on this server for security reasons."
msgstr ""
"Vous ne pouvez pas utiliser la commande write sur ce serveur pour des "
"raisons de sécurité."
-#: server/stdinhand.c:1186
+#: server/stdinhand.c:1105
#, c-format
msgid ""
"Cannot decrease command access level '%s' for connection '%s'; you only have "
@@ -5860,7 +5879,12 @@ msgstr ""
"Impossible de diminuer le niveau de commande \"%s\" pour la connexion \"%s"
"\" ; vous n'avez que \"%s\"."
-#: server/stdinhand.c:1241
+#: server/stdinhand.c:1114
+#, 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:1163
#, c-format
msgid ""
"Anyone can now become game organizer '%s' by issuing the 'first' command."
@@ -5868,28 +5892,28 @@ msgstr ""
"N'importe qui peut maintenant devenir \"%s\" l'organisateur en tapant la "
"commande \"first\"."
-#: server/stdinhand.c:1274
+#: server/stdinhand.c:1187
msgid "Command access levels in effect:"
msgstr "Niveaux de commandes effectifs :"
-#: server/stdinhand.c:1282
+#: server/stdinhand.c:1194
#, c-format
msgid "Command access level for new connections: %s"
msgstr "Niveau de commande pour les nouvelles connexions : %s"
-#: server/stdinhand.c:1285
+#: server/stdinhand.c:1197
#, c-format
msgid "Command access level for first player to take it: %s"
msgstr "Niveau de commande d'accès pour le premier joueur qui le prend : %s"
-#: server/stdinhand.c:1294
+#: server/stdinhand.c:1206
msgid ""
"Error: command access level must be one of 'none', 'info', 'ctrl', or 'hack'."
msgstr ""
"Erreur : le niveau de commande doit être \"none\", \"info\", \"ctrl\", ou "
"\"hack\"."
-#: server/stdinhand.c:1299
+#: server/stdinhand.c:1211
#, c-format
msgid ""
"Cannot increase command access level to '%s'; you only have '%s' yourself."
@@ -5897,203 +5921,192 @@ 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: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: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:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
+#: server/stdinhand.c:1238 server/stdinhand.c:1252 server/stdinhand.c:1273
#, 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:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
+#: server/stdinhand.c:1243 server/stdinhand.c:1257 server/stdinhand.c:1267
#, 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:1402
+#: server/stdinhand.c:1302
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:1406
+#: server/stdinhand.c:1306
#, 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:1411
+#: server/stdinhand.c:1311
msgid "Someone else already is game organizer."
msgstr "Quelqu'un d'autre est déjà l'organisateur."
-#: server/stdinhand.c:1416
+#: server/stdinhand.c:1316
#, 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:1467
+#: server/stdinhand.c:1367
#, c-format
msgid "Invalid argument %d."
msgstr "Argument %d invalide."
-#: server/stdinhand.c:1474
+#: server/stdinhand.c:1374
msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
msgstr "Utilisation : timeoutincrease <turn> <turnadd> <value> <valuemult>."
-#: server/stdinhand.c:1482
+#: server/stdinhand.c:1382
#, 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:1542 server/stdinhand.c:1545
+#: server/stdinhand.c:1442 server/stdinhand.c:1445
msgid "Option:"
msgstr "Option :"
-#: server/stdinhand.c:1555 server/stdinhand.c:4031
+#: server/stdinhand.c:1455 server/stdinhand.c:4079
msgid "Description:"
msgstr "Description :"
-#: server/stdinhand.c:1560
+#: server/stdinhand.c:1460
#, c-format
msgid "Status: %s"
msgstr "État : %s"
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "changeable"
msgstr "modifiable"
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "fixed"
msgstr "fixe"
-#: server/stdinhand.c:1567
+#: server/stdinhand.c:1467
#, c-format
msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
msgstr "Valeur : %d, Minimum : 0, Défaut : %d, Maximum : 1"
-#: server/stdinhand.c:1572
+#: server/stdinhand.c:1472
#, c-format
msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
msgstr "Valeur : %d, Minimum : %d, Défaut : %d, Maximum : %d"
-#: server/stdinhand.c:1578
+#: server/stdinhand.c:1478
#, c-format
msgid "Value: \"%s\", Default: \"%s\""
msgstr "Valeur : \"%s\", Défaut : \"%s\""
-#: server/stdinhand.c:1597
+#: server/stdinhand.c:1497
msgid "Explanations are available for the following server options:"
msgstr "Explications disponibles pour les options suivantes du serveur :"
-#: server/stdinhand.c:1643
+#: server/stdinhand.c:1537
msgid "No explanation for that yet."
msgstr "Pas encore d'explication pour ceci."
-#: server/stdinhand.c:1646 server/stdinhand.c:2480
+#: server/stdinhand.c:1540 server/stdinhand.c:2468
msgid "Ambiguous option name."
msgstr "Nom d'option ambigu."
-#: server/stdinhand.c:1666
+#: server/stdinhand.c:1560
#, c-format
msgid "Server Operator: %s"
msgstr "Opérateur du serveur: %s"
-#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
+#: server/stdinhand.c:1686 server/stdinhand.c:1713 server/stdinhand.c:1731
#, c-format
msgid "Player '%s' now has AI skill level '%s'."
msgstr "Le joueur \"%s\" a maintenant le niveau IA \"%s\"."
-#: server/stdinhand.c:1822
+#: server/stdinhand.c:1718
#, c-format
msgid "%s is not controlled by the AI."
msgstr "%s n'est pas contrôlé par l'IA."
-#: server/stdinhand.c:1842
+#: server/stdinhand.c:1738
#, c-format
msgid "Default AI skill level set to '%s'."
msgstr "Niveau IA par défaut positionné à \"%s\"."
-#: server/stdinhand.c:1857 server/stdinhand.c:2162
+#: server/stdinhand.c:1753
msgid "This command is client only."
msgstr "Cette commande ne concerne que le client."
-#: server/stdinhand.c:1860
+#: server/stdinhand.c:1756
msgid "Usage: away"
msgstr "Utilisation : away"
-#: server/stdinhand.c:1865
+#: server/stdinhand.c:1761
msgid "Only players may use the away command."
msgstr "Uniquement les joueurs peuvent utiliser la commande away."
-#: server/stdinhand.c:1869
+#: server/stdinhand.c:1765
#, c-format
msgid "%s set to away mode."
msgstr "%s mis en mode away."
-#: server/stdinhand.c:1877
+#: server/stdinhand.c:1772
#, c-format
msgid "%s returned to game."
msgstr "%s est revenu dans la partie."
-#: server/stdinhand.c:1919
+#: server/stdinhand.c:1817
#, 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:1925
+#: server/stdinhand.c:1823
#, c-format
msgid "Unknown option '%s'."
msgstr "Erreur : option \"%s\" inconnue."
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1848
msgid "All options with non-default values"
msgstr "Toutes les options qui n'ont pas les valeurs pas défaut"
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1851
msgid "All options"
msgstr "Toutes les options"
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1854
msgid "Vital options"
msgstr "Options vitales"
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1857
msgid "Situational options"
msgstr "Options occasionnelles"
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1860
msgid "Rarely used options"
msgstr "Options rarement utilisées"
-#: server/stdinhand.c:1965
+#: server/stdinhand.c:1863
msgid "+ means you may change the option"
msgstr "+ signifie que vous pouvez modifier cette option"
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1864
msgid "= means the option is on its default value"
msgstr "= signifie que l'option a sa valeur par défaut"
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
#, c-format
msgid "%-*s value (min,max) "
msgstr "%-*s valeur (min,max) "
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
msgid "Option"
msgstr "Option"
-#: server/stdinhand.c:1973
+#: server/stdinhand.c:1871
msgid "description"
msgstr "description"
-#: server/stdinhand.c:2042
+#: server/stdinhand.c:1940
msgid ""
"Try 'show situational' or 'show rare' to show more options.\n"
"Try 'show changed' to show settings with non-default values."
@@ -6102,78 +6115,151 @@ msgstr ""
"Essayez \"show changed\" pour voir les paramètres avec des valeurs autres "
"que celles par défaut."
-#: server/stdinhand.c:2092
+#: server/stdinhand.c:1966
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:2102
+#: server/stdinhand.c:1976
msgid "Undefined argument. Usage: team <player> <team>."
msgstr "Argument non défini. Usage : team <joueur> <équipe>."
-#: server/stdinhand.c:2122
+#: server/stdinhand.c:1996
#, 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:2129
+#: server/stdinhand.c:2003
msgid "Cannot team a barbarian."
msgstr "Impossible d'affecter un barbare à une équipe."
-#: server/stdinhand.c:2135
+#: server/stdinhand.c:2009
#, c-format
msgid "Player %s set to team %s."
msgstr "Joueur %s assigné à l'équipe %s."
-#: 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]."
+# AR
+#: server/stdinhand.c:2035 server/voting.c:512
+#, fuzzy
+msgid "Teamvote"
+msgstr "Équipe"
-#: server/stdinhand.c:2165
-msgid "Observers cannot vote."
-msgstr "Les observateurs ne peuvent pas voter."
+#: server/stdinhand.c:2035 server/voting.c:516
+msgid "Vote"
+msgstr ""
-#: server/stdinhand.c:2168
+#: server/stdinhand.c:2037
+#, c-format
msgid ""
-"You can only vote in a running game. Use 'first' to become the game "
-"organizer if there currently is none."
+"%s %d \"%s\" (needs %0.0f%%%s): %d for, %d against, and %d abstained out of %"
+"d players."
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:2181
-#, c-format
-msgid "Vote %d \"%s\": %d for, %d against"
-msgstr "Vote %d \"%s\" : %d pour, %d contre"
+#: server/stdinhand.c:2041
+msgid " no dissent"
+msgstr ""
-#: server/stdinhand.c:2188
+#: server/stdinhand.c:2049
msgid "There are no votes going on."
msgstr "Il n'y a pas de vote en cours."
-#: server/stdinhand.c:2208
-msgid "No legal last vote."
+#: server/stdinhand.c:2077
+#, fuzzy
+msgid "Invalid arguments. Usage: vote yes|no|abstain [vote number]."
+msgstr "Arguments non définis. Usage : vote yes|no [n° de vote]."
+
+#: server/stdinhand.c:2095 server/stdinhand.c:2213 server/stdinhand.c:3714
+msgid "You are not allowed to use this command."
+msgstr "Vous n'êtes pas autorisé à utiliser cette commande."
+
+#: server/stdinhand.c:2104
+#, fuzzy, c-format
+msgid "The argument \"%s\" is ambigious."
+msgstr "L'argument \"%s\" de \"help\" est ambigu."
+
+#: server/stdinhand.c:2119
+#, fuzzy
+msgid "There are no votes running."
+msgstr "Il n'y a pas de vote en cours."
+
+#: server/stdinhand.c:2121
+#, fuzzy, c-format
+msgid "No legal last vote (%d %s)."
msgstr "Dernier vote illégal."
-#: server/stdinhand.c:2213
-msgid "Value must be integer."
+#: server/stdinhand.c:2122
+msgid "other vote running"
+msgid_plural "other votes running"
+msgstr[0] ""
+msgstr[1] ""
+
+#: server/stdinhand.c:2129 server/stdinhand.c:2491 server/stdinhand.c:2532
+msgid "Value must be an integer."
msgstr "La valeur doit être un entier."
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2135 server/stdinhand.c:2221
#, c-format
msgid "No such vote (%d)."
msgstr "Aucun vote %d."
+#: server/stdinhand.c:2141
+#, fuzzy
+msgid "You are not allowed to vote on that."
+msgstr "Vous n'êtes pas autorisé à régler cette option."
+
# AR
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2146
#, c-format
msgid "You voted for \"%s\""
msgstr "Vous avez voté pour \"%s\""
-#: server/stdinhand.c:2232
+#: server/stdinhand.c:2150
#, c-format
msgid "You voted against \"%s\""
msgstr "Vous avez voté contre \"%s\""
-#: server/stdinhand.c:2259
+#: server/stdinhand.c:2155
+#, c-format
+msgid "You abstained from voting on \"%s\""
+msgstr ""
+
+#: server/stdinhand.c:2190
+msgid "Missing argument <vote number> or the string \"all\"."
+msgstr ""
+
+#: server/stdinhand.c:2197
+#, fuzzy
+msgid "You don't have any vote going on."
+msgstr "Vous n'avez pas de travailleur ici."
+
+#: server/stdinhand.c:2204
+#, fuzzy
+msgid "There isn't any vote going on."
+msgstr "Il n'y a pas de vote en cours."
+
+#: server/stdinhand.c:2209
+msgid "Server: All votes have been removed."
+msgstr ""
+
+#: server/stdinhand.c:2226
+#, fuzzy, c-format
+msgid "You are not allowed to cancel this vote (%d)."
+msgstr "Vous n'êtes pas autorisé à régler cette option."
+
+#: server/stdinhand.c:2232
+msgid "Usage: /cancelvote [<vote number>|all]"
+msgstr ""
+
+#: server/stdinhand.c:2241
+#, c-format
+msgid "Server: %s cancelled the vote \"%s\" (number %d)."
+msgstr ""
+
+#: server/stdinhand.c:2247
+#, c-format
+msgid "Server: The vote \"%s\" (number %d) has been cancelled."
+msgstr ""
+
+#: server/stdinhand.c:2265
msgid ""
"Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
"<x> <y> | unit <id> | tech <player> | timing | info>."
@@ -6181,127 +6267,123 @@ msgstr ""
"Arguments indéfinis. Usage : debug <diplomacy <joueur> | city <x> <y> | "
"units <x> <y> | unit <id>| tech <joueur> | timing | info>."
-#: server/stdinhand.c:2265
+#: server/stdinhand.c:2271
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:2294
+#: server/stdinhand.c:2300
#, c-format
msgid "%s diplomacy no longer debugged"
msgstr "La diplomatie de %s n'est plus déboguée"
-#: server/stdinhand.c:2298
+#: server/stdinhand.c:2304
#, c-format
msgid "%s diplomacy debugged"
msgstr "La diplomatie de %s est deboguée"
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2323
#, c-format
msgid "%s tech no longer debugged"
msgstr "La technologie de %s n'est plus déboguée"
-#: server/stdinhand.c:2321
+#: server/stdinhand.c:2327
#, c-format
msgid "%s tech debugged"
msgstr "La technologie de %s est deboguée"
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2358 server/stdinhand.c:2388
msgid "Value 2 & 3 must be integer."
msgstr "Les valeurs 2 & 3 doivent être entières."
-#: server/stdinhand.c:2356 server/stdinhand.c:2386
+#: server/stdinhand.c:2362 server/stdinhand.c:2392
msgid "Bad map coordinates."
msgstr "Mauvaises coordonnées."
-#: server/stdinhand.c:2361
+#: server/stdinhand.c:2367
msgid "No city at this coordinate."
msgstr "Pas de ville à ces coordonnées."
-#: server/stdinhand.c:2366
+#: server/stdinhand.c:2372
#, c-format
msgid "%s no longer debugged"
msgstr "%s n'est plus débogué"
-#: server/stdinhand.c:2392 server/stdinhand.c:2422
+#: server/stdinhand.c:2398 server/stdinhand.c:2428
#, fuzzy, c-format
msgid "%s %s no longer debugged."
msgstr "%2$s de %1$s n'est plus débogué."
-#: server/stdinhand.c:2397 server/stdinhand.c:2427
+#: server/stdinhand.c:2403 server/stdinhand.c:2433
#, fuzzy, c-format
msgid "%s %s debugged."
msgstr "%2$s de %1$s débogué."
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2419
msgid "Value 2 must be integer."
msgstr "La valeur 2 doit être un entier."
-#: server/stdinhand.c:2417
+#: server/stdinhand.c:2423
#, c-format
msgid "Unit %d does not exist."
msgstr "L'unité %d n'existe pas."
-#: server/stdinhand.c:2475
+#: server/stdinhand.c:2464
msgid "Undefined argument. Usage: set <option> <value>."
msgstr "Argument non défini. Usage : set <option> <valeur>."
-#: server/stdinhand.c:2485
+#: server/stdinhand.c:2473
msgid "You are not allowed to set this option."
msgstr "Vous n'êtes pas autorisé à régler cette option."
-#: server/stdinhand.c:2490 server/stdinhand.c:3463
+#: server/stdinhand.c:2478 server/stdinhand.c:3501
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:2502 server/stdinhand.c:2543
-msgid "Value must be an integer."
-msgstr "La valeur doit être un entier."
-
-#: server/stdinhand.c:2512
+#: server/stdinhand.c:2501
#, 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:2519
+#: server/stdinhand.c:2508
msgid "Value out of range (minimum: 0, maximum: 1)."
msgstr "Valeur incorrecte (minimum : 0, maximum : 1)."
-#: server/stdinhand.c:2534 server/stdinhand.c:2576
+#: server/stdinhand.c:2523 server/stdinhand.c:2565
#, c-format
msgid "Option: %s has been set to %d."
msgstr "Option : %s a été positionnée à %d."
-#: server/stdinhand.c:2554
+#: server/stdinhand.c:2543
#, 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:2561
+#: server/stdinhand.c:2550
#, c-format
msgid "Value out of range (minimum: %d, maximum: %d)."
msgstr "Valeur incorrecte (minimum : %d, maximum : %d)."
-#: server/stdinhand.c:2586
+#: server/stdinhand.c:2575
msgid "String value too long. Usage: set <option> <value>."
msgstr "Chaîne trop longue. Usage : set <option> <valeur>."
-#: server/stdinhand.c:2600
+#: server/stdinhand.c:2589
#, c-format
msgid "Option: %s has been set to \"%s\"."
msgstr "Option : %s a été positionnée à \"%s\"."
-#: server/stdinhand.c:2658
+#: server/stdinhand.c:2652
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:2661
+#: server/stdinhand.c:2655
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:2671
+#: server/stdinhand.c:2665
#, fuzzy
msgid "You cannot take a new player at this time."
msgstr ""
@@ -6309,7 +6391,7 @@ msgstr ""
"partie."
#. TRANS: Do not translate "maxplayers".
-#: server/stdinhand.c:2679
+#: server/stdinhand.c:2673
#, c-format
msgid ""
"You cannot take a new player because the maximum of %d player has already "
@@ -6320,80 +6402,80 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: server/stdinhand.c:2691
+#: server/stdinhand.c:2685
msgid "You cannot take a new player because there are no free player slots."
msgstr ""
-#: server/stdinhand.c:2702
+#: server/stdinhand.c:2696
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:2705
+#: server/stdinhand.c:2699
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:2713
+#: server/stdinhand.c:2707
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:2716
+#: server/stdinhand.c:2710
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:2724
+#: server/stdinhand.c:2718
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:2727
+#: server/stdinhand.c:2721
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:2736
+#: server/stdinhand.c:2730
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:2739
+#: server/stdinhand.c:2733
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:2749
+#: server/stdinhand.c:2743
msgid "Sorry, one can't observe in this game."
msgstr "Désolé, on ne peut pas observer dans cette partie."
-#: server/stdinhand.c:2754
+#: server/stdinhand.c:2748
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:2760
+#: server/stdinhand.c:2754
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:2791
+#: server/stdinhand.c:2785
msgid "Usage: observe [connection-name [player-name]]"
msgstr "Utilisation : observe [nom-connexion [nom-joueur]]"
-#: server/stdinhand.c:2797
+#: server/stdinhand.c:2791
msgid "Usage: observe [player-name]"
msgstr "Utilisation : observe [nom-joueur]"
-#: server/stdinhand.c:2847
+#: server/stdinhand.c:2841
#, 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:2858
+#: server/stdinhand.c:2852
#, c-format
msgid "%s is already observing %s."
msgstr "%s observe déjà %s."
-#: server/stdinhand.c:2863
+#: server/stdinhand.c:2857
#, c-format
msgid "%s is already observing."
msgstr "%s est déjà un observateur."
@@ -6408,240 +6490,245 @@ msgstr "%s observe maintenant %s"
msgid "%s now observes"
msgstr "%s est maintenant un observateur "
-#: server/stdinhand.c:2969
+#: server/stdinhand.c:2971
msgid "Usage: take <connection-name> <player-name>"
msgstr "Utilisation : take <nom-connexion> <nom-joueur>"
-#: server/stdinhand.c:2974
+#: server/stdinhand.c:2976
msgid "Usage: take <player-name>"
msgstr "Utilisation : take <nom-joueur>"
-#: server/stdinhand.c:2980
+#: server/stdinhand.c:2982
msgid "Usage: take [connection-name] <player-name>"
msgstr "Utilisation : take [nom-connexion] <nom-joueur>"
-#: server/stdinhand.c:3010
+#: server/stdinhand.c:3012
#, fuzzy, c-format
msgid "%s already controls %s."
msgstr "%s contrôle déjà %s"
-#: server/stdinhand.c:3024
+#: server/stdinhand.c:3026
#, 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:3059
+#: server/stdinhand.c:3061
#, c-format
msgid "being detached from %s."
msgstr "détachement de %s."
-#: server/stdinhand.c:3135
+#: server/stdinhand.c:3146
#, fuzzy, c-format
msgid "%s now controls %s (%s, %s)."
msgstr "%s contrôle maintenant %s (%s, %s)"
# AR
-#: server/stdinhand.c:3139 server/stdinhand.c:4260
+#: server/stdinhand.c:3150 server/stdinhand.c:4308
#: data/nation/barbarian.ruleset:3
msgid "Barbarian"
msgstr "Barbare"
-#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
+#: server/stdinhand.c:3152 server/stdinhand.c:4310 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-sdl/plrdlg.c:645
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr "IA"
# AR
-#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-gtk-2.0/pages.c:2125
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
+#: server/stdinhand.c:3153 server/stdinhand.c:4312
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-gtk-2.0/pages.c:2127
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/connectdlg.c:215
msgid "Human"
msgstr "Humain"
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-gtk-2.0/pages.c:2124 client/gui-win32/connectdlg.c:200
-#: client/gui-win32/connectdlg.c:212
+#: server/stdinhand.c:3155 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-gtk-2.0/pages.c:2126 client/gui-win32/connectdlg.c:202
+#: client/gui-win32/connectdlg.c:214
msgid "Alive"
msgstr "Vivant"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3156 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-win32/connectdlg.c:202
msgid "Dead"
msgstr "Mort"
-#: server/stdinhand.c:3147
+#: server/stdinhand.c:3159
#, fuzzy, c-format
msgid "%s failed to attach to any player."
msgstr "%s n'est attaché à aucun joueur."
-#: server/stdinhand.c:3182
+#: server/stdinhand.c:3194
msgid "Usage: detach <connection-name>"
msgstr "Utilisation : detach <nom-connexion>"
-#: server/stdinhand.c:3202
+#: server/stdinhand.c:3214
msgid "You can not detach other users."
msgstr "Vous ne pouvez pas détacher d'autres utilisateurs."
-#: server/stdinhand.c:3211
+#: server/stdinhand.c:3223
#, c-format
msgid "%s is not attached to any player."
msgstr "%s n'est attaché à aucun joueur."
-#: server/stdinhand.c:3234
+#: server/stdinhand.c:3246
#, c-format
msgid "%s detaching from %s"
msgstr "%s détaché de %s"
-#: server/stdinhand.c:3240
+#: server/stdinhand.c:3252
#, c-format
msgid "%s no longer observing."
msgstr "%s n'est plus un observateur."
-#: server/stdinhand.c:3259
+#: server/stdinhand.c:3271
#, c-format
msgid "detaching from %s."
msgstr "détachement de %s."
-#: server/stdinhand.c:3345
+#: server/stdinhand.c:3361
msgid "Usage: load <game name>"
msgstr "Utilisation : load <nom de la partie>"
-#: server/stdinhand.c:3350
+#: server/stdinhand.c:3366
msgid "Cannot load a game while another is running."
msgstr "Impossible de charger une partie pendant qu'une autre est active."
-#: server/stdinhand.c:3372
+#: server/stdinhand.c:3388
#, 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:3389
+#: server/stdinhand.c:3405
#, c-format
msgid "Could not load savefile: %s"
msgstr "Impossible de charger le fichier de sauvegarde : %s"
-#: server/stdinhand.c:3458
+#: server/stdinhand.c:3496
#, c-format
msgid "Current ruleset directory is \"%s\""
msgstr "Le répertoire du jeu de règles actuel est : \"%s\""
-#: server/stdinhand.c:3478
+#: server/stdinhand.c:3516
#, 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:3484
+#: server/stdinhand.c:3522
#, c-format
msgid "Ruleset directory is already \"%s\""
msgstr "Le répertoire du jeu de règles est déjà \"%s\""
-#: server/stdinhand.c:3488
+#: server/stdinhand.c:3526
#, c-format
msgid "Ruleset directory set to \"%s\""
msgstr "Le répertoire du jeu de règles est \"%s\""
-#: server/stdinhand.c:3536
+#: server/stdinhand.c:3574
msgid "Goodbye."
msgstr "Au revoir."
-#: server/stdinhand.c:3567
+#: server/stdinhand.c:3606
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:3603
+#: server/stdinhand.c:3656
#, 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:3608
+#: server/stdinhand.c:3661
#, c-format
msgid "Unknown command. Try '%shelp'."
msgstr "Commande inconnue. Essayez \"%shelp\"."
-#: server/stdinhand.c:3625
-msgid "Your new vote canceled your previous vote."
+#: server/stdinhand.c:3675
+#, fuzzy
+msgid "Your new vote cancelled your previous vote."
msgstr "Votre nouveau vote a annulé le précédent."
-#: server/stdinhand.c:3633
-#, c-format
-msgid "New vote (number %d) by %s: %s."
+#: server/stdinhand.c:3688
+msgid "New teamvote"
+msgstr ""
+
+#: server/stdinhand.c:3691
+msgid "New vote"
+msgstr ""
+
+#: server/stdinhand.c:3695
+#, fuzzy, c-format
+msgid "%s (number %d) by %s: %s"
msgstr "Nouveau vote (numéro %d) par %s: %s."
-#: server/stdinhand.c:3645
+#: server/stdinhand.c:3704
#, c-format
msgid "Your new vote (\"%s\") was not legal or was not recognized."
msgstr ""
-#: 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:3680
+#: server/stdinhand.c:3726
msgid "(server prompt)"
msgstr "(invite du serveur)"
-#: server/stdinhand.c:3787
+#: server/stdinhand.c:3835
msgid "Game ended in a draw."
msgstr "Partie finissant par une égalité."
-#: server/stdinhand.c:3791
+#: server/stdinhand.c:3839
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:3796
+#: server/stdinhand.c:3844
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:3812
+#: server/stdinhand.c:3860
#, 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:3817
+#: server/stdinhand.c:3865
msgid "You cannot surrender now."
msgstr "Vous ne pouvez pas congédier d'unité."
-#: server/stdinhand.c:3883
+#: server/stdinhand.c:3931
#, fuzzy
msgid "Not enough human players, game will not start."
msgstr "Pas assez de joueurs, partie non lancée."
-#: server/stdinhand.c:3888
+#: server/stdinhand.c:3936
#, fuzzy
msgid "No players, game will not start."
msgstr "Pas assez de joueurs, partie non lancée."
-#: server/stdinhand.c:3892
+#: server/stdinhand.c:3940
#, fuzzy
msgid "Not enough nations for all players, game will not start."
msgstr "Pas assez de joueurs, partie non lancée."
-#: server/stdinhand.c:3901
+#: server/stdinhand.c:3949
msgid "All players are ready; starting game."
msgstr "Tous les joueurs sont prêts; la partie peut commencer."
-#: server/stdinhand.c:3915
+#: server/stdinhand.c:3963
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:3922
+#: server/stdinhand.c:3970
msgid "Cannot start the game: it is already running."
msgstr "Impossible de lancer la partie : elle est déjà en cours."
-#: server/stdinhand.c:3953
+#: server/stdinhand.c:4001
#, c-format
msgid "Cutting connection %s."
msgstr "Coupure de la connexion %s."
-#: server/stdinhand.c:3972
+#: server/stdinhand.c:4020
msgid ""
"Welcome - this is the introductory help text for the Freeciv server.\n"
"\n"
@@ -6680,123 +6767,123 @@ msgstr ""
" save - pour sauver la partie en cours\n"
" quit - pour quitter"
-#: server/stdinhand.c:4007 server/stdinhand.c:4010
+#: server/stdinhand.c:4055 server/stdinhand.c:4058
msgid "Command:"
msgstr "Commande :"
-#: server/stdinhand.c:4014
+#: server/stdinhand.c:4062
msgid "Synopsis: "
msgstr "Synopsis : "
-#: server/stdinhand.c:4023
+#: server/stdinhand.c:4071
#, c-format
msgid "Level: %s"
msgstr "Niveau : %s"
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4096
msgid "The following server commands are available:"
msgstr "Les commandes suivantes du serveur sont disponibles :"
-#: server/stdinhand.c:4123
+#: server/stdinhand.c:4171
#, c-format
msgid "Help argument '%s' is ambiguous."
msgstr "L'argument \"%s\" de \"help\" est ambigu."
-#: server/stdinhand.c:4128
+#: server/stdinhand.c:4176
#, c-format
msgid "No match for help argument '%s'."
msgstr "Pas de correspondance pour l'argument \"%s\" de \"help\"."
-#: server/stdinhand.c:4194
+#: server/stdinhand.c:4242
#, c-format
msgid "Bad list argument: '%s'. Try '%shelp list'."
msgstr "Mauvais argument pour \"list\" : \"%s\" . Essayez \"%shelp list\"."
-#: server/stdinhand.c:4234
+#: server/stdinhand.c:4282
msgid "List of players:"
msgstr "Liste des joueurs :"
-#: server/stdinhand.c:4239
+#: server/stdinhand.c:4287
msgid "<no players>"
msgstr "<aucun joueur>"
-#: server/stdinhand.c:4256
+#: server/stdinhand.c:4304
#, c-format
msgid "user %s, "
msgstr "utilisateur %s, "
-#: server/stdinhand.c:4267
+#: server/stdinhand.c:4315
msgid ", Dead"
msgstr ", Mort"
-#: server/stdinhand.c:4270
+#: server/stdinhand.c:4318
#, 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:4275 server/stdinhand.c:4279 client/helpdata.c:257
-#: client/helpdata.c:752 client/text.c:241 client/text.c:1224
-#: client/text.c:1262
+#: server/stdinhand.c:4323 server/stdinhand.c:4327 client/helpdata.c:257
+#: client/helpdata.c:752 client/text.c:241 client/text.c:1229
+#: client/text.c:1267
#, c-format
msgid "?clistmore:, %s"
msgstr ", %s"
-#: server/stdinhand.c:4283
+#: server/stdinhand.c:4331
msgid ", ready"
msgstr ", prêt"
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4333
msgid ", not ready"
msgstr ", pas prêt"
-#: server/stdinhand.c:4293
+#: server/stdinhand.c:4341
#, c-format
msgid " %d connection:"
msgid_plural " %d connections:"
msgstr[0] " %d connexion :"
msgstr[1] " %d connexions :"
-#: server/stdinhand.c:4299
+#: server/stdinhand.c:4347
#, 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:4304
+#: server/stdinhand.c:4352
msgid " (observer mode)"
msgstr " (mode observateur)"
-#: server/stdinhand.c:4322
+#: server/stdinhand.c:4370
msgid "List of teams:"
msgstr "Liste des équipes :"
#. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4332
+#: server/stdinhand.c:4380
#, 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:4352
+#: server/stdinhand.c:4400
#, c-format
msgid "%2d : '%s' : 1 player : %s"
msgstr "%2d : \"%s\" : 1 joueur : %s"
-#: server/stdinhand.c:4360
+#: server/stdinhand.c:4408
#, c-format
msgid "Empty team: %s"
msgstr "Équipe vide : %s"
-#: server/stdinhand.c:4371
+#: server/stdinhand.c:4419
msgid "List of connections to server:"
msgstr "Liste des connexions au serveur :"
-#: server/stdinhand.c:4375
+#: server/stdinhand.c:4423
msgid "<no connections>"
msgstr "<pas de connexions>"
-#: server/stdinhand.c:4399
+#: server/stdinhand.c:4447
msgid "List of scenarios available:"
msgstr "Liste des scénarios disponibles :"
@@ -6815,7 +6902,7 @@ msgstr "Les %s ont d
msgid "%s acquired from %s!"
msgstr "%s acquis de %s !"
-#: server/techtools.c:220
+#: server/techtools.c:221
#, c-format
msgid ""
"Discovery of %s makes the government form %s available. You may want to "
@@ -6824,38 +6911,38 @@ msgstr ""
"La découverte de %s rend disponible le type de gouvernement %s. Vous pouvez "
"commencer une révolution."
-#: server/techtools.c:301
+#: server/techtools.c:302
#, c-format
msgid "Discovery of %s OBSOLETES %s in %s!"
msgstr "La découverte de %s rend %s OBSOLÈTE à %s !"
-#: server/techtools.c:351
+#: server/techtools.c:352
#, c-format
msgid "Learned %s. Our scientists focus on %s; goal is %s."
msgstr "Appris %s. Nos scientifiques se focalisent sur %s, le but étant %s."
-#: server/techtools.c:369
+#: server/techtools.c:370
#, c-format
msgid "Learned %s. Scientists choose to research %s."
msgstr ""
"Appris %s. Nos scientifiques décident d'entreprendre des recherches sur %s."
-#: server/techtools.c:376
+#: server/techtools.c:377
#, c-format
msgid "Learned %s. "
msgstr "Appris %s. "
-#: server/techtools.c:379
+#: server/techtools.c:380
#, c-format
msgid "Researching %s."
msgstr "Recherche %s."
-#: server/techtools.c:385
+#: server/techtools.c:386
#, c-format
msgid "Learned %s. Scientists do not know what to research next."
msgstr "Appris %s. Nos scientifiques ne savent quoi rechercher pour la suite."
-#: server/techtools.c:402
+#: server/techtools.c:403
msgid ""
"Great scientists from all the world join your civilization: you get an "
"immediate advance."
@@ -6863,22 +6950,22 @@ msgstr ""
"De grands philosophes du monde entier rejoignent votre civilisation ; vous "
"obtenez une découverte."
-#: server/techtools.c:570
+#: server/techtools.c:571
#, c-format
msgid "Technology goal is %s."
msgstr "Le but technologique est %s."
-#: server/techtools.c:700
+#: server/techtools.c:708
#, c-format
msgid "You steal %s from the %s."
msgstr "Vous avez volé %s aux %s."
-#: server/techtools.c:705
+#: server/techtools.c:713
#, c-format
msgid "The %s stole %s from you!"
msgstr "Les %s vous ont volé %s!"
-#: server/techtools.c:710
+#: server/techtools.c:718
#, c-format
msgid "The %s have stolen %s from the %s."
msgstr "Les %s ont volé %s aux %s."
@@ -6902,160 +6989,166 @@ msgstr "Aucune unit
msgid "%s upgraded to %s for %d gold."
msgstr "%s mis à jour en %s pour %d lingots."
-#: server/unithand.c:396
+#: server/unithand.c:402
#, c-format
msgid "%s refuses to disband!"
msgstr "%s refuse d'être congédié !"
-#: server/unithand.c:449
+#: server/unithand.c:455
msgid "Can't place city here."
msgstr "Impossible de placer une ville ici."
-#: server/unithand.c:456
+#: server/unithand.c:462
#, c-format
msgid "Only %s can build a city."
msgstr "Seul %s peut construire une ville."
-#: server/unithand.c:461
+#: server/unithand.c:467
msgid "Can't build a city."
msgstr "Impossible de construire une ville."
-#: server/unithand.c:470
+#: server/unithand.c:476
#, c-format
msgid "Only %s can add to a city."
msgstr "Seul %s peut être ajouté à une ville."
-#: server/unithand.c:475
+#: server/unithand.c:481
msgid "Can't add to a city."
msgstr "Impossible d'ajouter à une ville."
-#: server/unithand.c:481
+#: server/unithand.c:487
#, c-format
msgid "%s unit has no moves left to add to %s."
msgstr "L'unité %s n'a plus de déplacements pour être ajoutée à %s."
-#: server/unithand.c:487
+#: server/unithand.c:493
#, c-format
msgid "%s unit has no moves left to build city."
msgstr "L'unité %s n'a plus de déplacements pour construire une ville."
-#: server/unithand.c:492
+#. TRANS: <city> is owned by <nation>, cannot add <unit>.
+#: server/unithand.c:499
+#, fuzzy, c-format
+msgid "%s is owned by %s, cannot add %s."
+msgstr "%s est trop grande pour y ajouter %s."
+
+#: server/unithand.c:506
#, c-format
msgid "%s is too big to add %s."
msgstr "%s est trop grande pour y ajouter %s."
-#: server/unithand.c:498
+#: server/unithand.c:512
#, c-format
msgid "%s needs an improvement to grow, so you cannot add %s."
msgstr ""
"%s a besoin d'un bâtiment pour se développer, vous ne pouvez ajouter %s."
-#: server/unithand.c:509
+#: server/unithand.c:523
#, c-format
msgid "Can't add %s to %s."
msgstr "Impossible d'ajouter %s à %s."
-#: server/unithand.c:531
+#: server/unithand.c:545
#, c-format
msgid "%s added to aid %s in growing."
msgstr "Ajout de %s pour aider le développement de %s."
-#: server/unithand.c:828
+#: server/unithand.c:842
msgid "Your Nuclear missile was shot down by SDI defences, what a waste."
msgstr ""
"Votre missile nucléaire a été abattu par les défenses SDI, quel gâchis."
-#: server/unithand.c:831
+#: server/unithand.c:845
#, c-format
msgid "The nuclear attack on %s was avoided by your SDI defense."
msgstr "L'attaque nucléaire sur %s a été évitée grâce à votre défense SDI."
#. TRANS: "Your Cannon ... the Polish Destroyer."
-#: server/unithand.c:901
+#: server/unithand.c:915
#, fuzzy, c-format
msgid "Your %s survived the pathetic attack from the %s %s."
msgstr "Votre %1$s a survécu à l'attaque pathétique de %3$s de %2$s."
# AR : Le pluriel pourrait être utile...
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unithand.c:910
+#: server/unithand.c:924
#, fuzzy, c-format
msgid "Your attacking %s failed against the %s %s!"
msgstr "L'attaque de votre %1$s a échoué contre %3$s de %2$s !"
-#: server/unithand.c:983
+#: server/unithand.c:997
#, c-format
msgid "Only %s can attack from sea."
msgstr "Il n'y a que %s qui puisse attaquer depuis la mer."
-#: server/unithand.c:988
+#: server/unithand.c:1002
msgid "Cannot attack from sea."
msgstr "Impossible d'attaquer depuis la mer."
-#: server/unithand.c:996 server/unittools.c:2137
+#: server/unithand.c:1010 server/unittools.c:2142
msgid "Cannot attack unless you declare war first."
msgstr "Impossible d'attaquer tant que vous n'avez pas déclaré la guerre."
-#: server/unithand.c:1001
+#: server/unithand.c:1015
#, c-format
msgid "%s can only move into your own zone of control."
msgstr "%s ne peut se déplacer qu'à l'intérieur de votre zone de contrôle."
-#: server/unithand.c:1007
+#: server/unithand.c:1021
#, fuzzy, c-format
msgid "Cannot invade unless you break peace with %s first."
msgstr ""
"Impossible d'envahir ce territoire tant que vous n'avez pas annuléle traité "
"de paix avec %s."
-#: server/unithand.c:1052
+#: server/unithand.c:1066
msgid "This unit has no moves left."
msgstr "Cette unité n'a plus de déplacement."
-#: server/unithand.c:1107
+#: server/unithand.c:1121
msgid "Unit must be on land to perform diplomatic action."
msgstr "L'unité doit être sur la terre pour effectuer une action diplomatique."
-#: server/unithand.c:1109
+#: server/unithand.c:1123
msgid "No diplomat action possible."
msgstr "Pas d'action diplomatique possible."
-#: server/unithand.c:1125
+#: server/unithand.c:1139
#, c-format
msgid "You must declare war on %s first. Try using players dialog (F3)."
msgstr ""
"Vous devez d'abord déclarer la guerre à %s. Essayez en utilisant le "
"dialogue des joueurs (F3)."
-#: server/unithand.c:1143
+#: server/unithand.c:1157
msgid "This unit is being transported, and so cannot bombard."
msgstr "Cette unité est transportée et donc ne peut bombarder."
-#: server/unithand.c:1158
+#: server/unithand.c:1172
msgid "You can't attack there."
msgstr "Vous ne pouvez pas attaquer ici."
-#: server/unithand.c:1180
+#: server/unithand.c:1194
msgid "This type of troops cannot take over a city."
msgstr "Ce type d'unité ne peut pas prendre une ville."
-#: server/unithand.c:1198
+#: server/unithand.c:1212
msgid "A transported unit is not allied to all units or city on target tile."
msgstr ""
"Une des unités transportées n'est pas alliée à toutes les unités ou la ville "
"de la case ciblée."
-#: server/unithand.c:1240
+#: server/unithand.c:1254
#, c-format
msgid "Your %s helps build the %s in %s (%d remaining)."
msgstr "Votre %s aide à la construction de %s à %s (reste %d)."
-#: server/unithand.c:1242
+#: server/unithand.c:1256
#, c-format
msgid "Your %s helps build the %s in %s (%d surplus)."
msgstr "Votre %s aide à la construction de %s à %s (%d en surplus)."
-#: server/unithand.c:1286
+#: server/unithand.c:1300
#, c-format
msgid ""
"Sorry, your %s cannot establish a trade route because it has no home city"
@@ -7063,27 +7156,27 @@ msgstr ""
"Désolé, sans ville de rattachement, votre %s ne peut établir une route "
"commerciale"
-#: server/unithand.c:1296
+#: server/unithand.c:1310
#, c-format
msgid "Sorry, your %s cannot establish a trade route between %s and %s"
msgstr "Désolé, votre %s ne peut établir une route commerciale entre %s et %s"
-#: server/unithand.c:1325 server/unithand.c:1344
+#: server/unithand.c:1339 server/unithand.c:1358
#, c-format
msgid "Sorry, your %s cannot establish a trade route here!"
msgstr "Désolé, votre %s ne peut établir une route commerciale ici !"
-#: server/unithand.c:1329 server/unithand.c:1348
+#: server/unithand.c:1343 server/unithand.c:1362
#, c-format
msgid " The city of %s already has %d better trade routes!"
msgstr " La ville de %s a déjà %d routes commerciales meilleures !"
-#: server/unithand.c:1361 server/unithand.c:1373
+#: server/unithand.c:1375 server/unithand.c:1387
#, c-format
msgid "Sorry, %s has canceled the trade route from %s to your city %s."
msgstr "Désolé, %s a annulé la route commerciale de %s à votre ville %s."
-#: server/unithand.c:1406
+#: server/unithand.c:1420
#, c-format
msgid ""
"Your %s from %s has arrived in %s, and revenues amount to %d in gold and "
@@ -7143,59 +7236,59 @@ msgid "Teleported your %s to %s."
msgstr "Téléportation de %s à %s."
#. TRANS: A unit is moved to resolve stack conflicts.
-#: server/unittools.c:1065
+#: server/unittools.c:1070
#, fuzzy, c-format
msgid "Moved your %s."
msgstr "%s congédié."
-#: server/unittools.c:1076
+#: server/unittools.c:1081
#, c-format
msgid "Disbanded your %s."
msgstr "%s congédié."
-#: server/unittools.c:1397
+#: server/unittools.c:1402
#, c-format
msgid "Unable to defend %s, %s has lost the game."
msgstr "Incapable de défendre %s, %s a perdu la partie."
-#: server/unittools.c:1401
+#: server/unittools.c:1406
#, c-format
msgid "Losing %s meant losing the game! Be more careful next time!"
msgstr ""
"Perdre %s revenait à perdre la partie ! Faites plus attention la prochaine "
"fois !"
-#: server/unittools.c:1503
+#: server/unittools.c:1508
#, c-format
msgid "%s escaped the destruction of %s, and fled to %s."
msgstr "%s a réchappé de la destruction de %s et s'est réfugié à %s."
-#: server/unittools.c:1512
+#: server/unittools.c:1517
#, c-format
msgid "%s lost when %s was lost."
msgstr "Vous avez perdu %s lors de la perte de %s."
# AR : problème de a/an
-#: server/unittools.c:1561
+#: server/unittools.c:1566
#, c-format
msgid "Barbarian leader captured, %d gold ransom paid."
msgstr "Chef barbare capturé, %d lingots de rançon ont été payés."
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unittools.c:1579
+#: server/unittools.c:1584
#, fuzzy, c-format
msgid "Your attacking %s succeeded against the %s %s!"
msgstr "L'attaque de votre %1$s a réussi contre %3$s de %2$s !"
# AR : problème de a/an ?
#. TRANS: "Cannon ... the Polish Destroyer."
-#: server/unittools.c:1588 server/unittools.c:1646
+#: server/unittools.c:1593 server/unittools.c:1651
#, fuzzy, c-format
msgid "%s lost to an attack by the %s %s."
msgstr "Vous avez perdu %1$s dans une attaque de %3$s de %2$s."
#. TRANS: "... Cannon ... the Polish Destroyer ...."
-#: server/unittools.c:1622
+#: server/unittools.c:1627
#, fuzzy, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -7207,14 +7300,14 @@ msgstr[1] ""
#. TRANS: "Cannon lost when the Polish Destroyer
#. * attacked the German Musketeers."
-#: server/unittools.c:1655
+#: server/unittools.c:1660
#, fuzzy, c-format
msgid "%s lost when the %s %s attacked the %s %s."
msgstr "%1$s perdu dans une attaque de %3$s de %2$s contre %4$s de %5$s."
#. TRANS: "Musketeers (and Cannon) lost to an
#. * attack from the Polish Destroyer."
-#: server/unittools.c:1670
+#: server/unittools.c:1675
#, fuzzy, c-format
msgid "%s (and %s) lost to an attack from the %s %s."
msgstr "%1$s (et %2$s) perdu dans une attaque de %4$s de %3$s."
@@ -7222,7 +7315,7 @@ msgstr "%1$s (et %2$s) perdu dans une attaque de %4$s de %3$s."
#. TRANS: "Musketeers and 3 other units lost to
#. * an attack from the Polish Destroyer."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1680
+#: server/unittools.c:1685
#, fuzzy, 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."
@@ -7233,7 +7326,7 @@ msgstr[1] ""
#. TRANS: "2 units lost when the Polish Destroyer
#. * attacked the German Musketeers."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1694
+#: server/unittools.c:1699
#, fuzzy, 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."
@@ -7242,176 +7335,218 @@ msgstr[0] ""
msgstr[1] ""
"%1$d unités perdues lors d'un attaque de %5$s de %4$s par %3$s de %2$s."
-#: server/unittools.c:1962
+#: server/unittools.c:1967
#, c-format
msgid "Your %s was nuked by %s."
msgstr "Votre %s a été atomisé(e) par %s."
-#: server/unittools.c:1965 server/unittools.c:1981
+#: server/unittools.c:1970 server/unittools.c:1986
msgid "yourself"
msgstr "vous-même"
-#: server/unittools.c:1969
+#: server/unittools.c:1974
#, fuzzy, c-format
msgid "The %s %s was nuked."
msgstr "%2$s de %1$s a été atomisé(e)."
-#: server/unittools.c:1978
+#: server/unittools.c:1983
#, c-format
msgid "%s was nuked by %s."
msgstr "%s a été atomisé(e) par %s."
-#: server/unittools.c:1986
+#: server/unittools.c:1991
#, c-format
msgid "You nuked %s."
msgstr "Vous avez atomisé %s."
-#: server/unittools.c:2027
+#: server/unittools.c:2032
#, fuzzy, c-format
msgid "The %s detonated a nuke!"
msgstr "%s a lancé une bombe atomique !"
-#: server/unittools.c:2051
+#: server/unittools.c:2056
#, c-format
msgid "%s transported successfully."
msgstr "%s transporté avec succès."
-#: server/unittools.c:2103
+#: server/unittools.c:2108
msgid "This unit type can not be paradropped."
msgstr "Ce type d'unité ne peut pas être parachuté."
-#: server/unittools.c:2113
+#: server/unittools.c:2118
#, fuzzy
msgid "You cannot paradrop a unit that is transporting other units."
msgstr "Une unité de transport ne peut pas être parachutée."
-#: server/unittools.c:2119
+#: server/unittools.c:2124
msgid "The destination location is not known."
msgstr "L'endroit de destination n'est pas connu."
-#: server/unittools.c:2126
+#: server/unittools.c:2131
#, c-format
msgid "This unit cannot paradrop into %s."
msgstr "Cette unité ne peut pas être parachutée dans %s."
-#: server/unittools.c:2146
+#: server/unittools.c:2151
#, c-format
msgid "The distance to the target (%i) is greater than the unit's range (%i)."
msgstr ""
"La distance à la cible (%i) est supérieure à la portée de l'unité (%i)."
-#: server/unittools.c:2157
+#: server/unittools.c:2162
#, c-format
msgid "Your %s paradropped into the %s and was lost."
msgstr "Votre %s a été parachuté dans %s et a été perdu."
-#: server/unittools.c:2170
+#: server/unittools.c:2175
#, c-format
msgid "Your %s was killed by enemy units at the paradrop destination."
msgstr "Votre %s a été tué par des unités ennemies au point de parachutage."
-#: server/unittools.c:2192
+#: server/unittools.c:2197
#, c-format
msgid "You found %d gold."
msgstr "Vous trouvez %d lingots."
-#: server/unittools.c:2209
+#: server/unittools.c:2214
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr "Vous trouvez %s dans d'anciens parchemins de sagesse."
-#: server/unittools.c:2216
+#: server/unittools.c:2221
#, c-format
msgid "The %s have acquired %s from ancient scrolls of wisdom."
msgstr "Les %s ont acquis %s grâce à d'anciens parchemins de sagesse."
-#: server/unittools.c:2230
+#: server/unittools.c:2235
msgid "A band of friendly mercenaries joins your cause."
msgstr "Une bande de mercenaires amicaux rejoint votre cause."
-#: server/unittools.c:2248
+#: server/unittools.c:2253
msgid "An abandoned village is here."
msgstr "Il y a ici un village abandonné."
-#: server/unittools.c:2258
+#: server/unittools.c:2263
msgid "You have unleashed a horde of barbarians!"
msgstr "Vous avez découvert une horde de barbares !"
-#: server/unittools.c:2261
+#: server/unittools.c:2266
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr "Votre %s a été tué(e) par les barbares !"
-#: server/unittools.c:2277
+#: server/unittools.c:2282
msgid "You found a friendly city."
msgstr "Vous avez trouvé une ville amicale."
-#: server/unittools.c:2291
+#: server/unittools.c:2296
msgid "Friendly nomads are impressed by you, and join you."
msgstr "Vous impressionnez des nomades amicaux, et ils se joignent à vous."
-#: server/unittools.c:2316
+#: server/unittools.c:2321
msgid "Your overflight frightens the tribe; they scatter in terror."
msgstr "Votre survol effraie la tribu ; prise de terreur, elle s'enfuit."
-#: server/unittools.c:2574
+#: server/unittools.c:2579
#, c-format
msgid "Orders for %s aborted after enemy movement was spotted."
msgstr ""
"Les ordres de %s ont été annulés car des mouvements ennemies ont été aperçus."
-#: server/unittools.c:3023
+#: server/unittools.c:3028
#, c-format
msgid "Orders for %s aborted as there are units nearby."
msgstr "Les ordres de %s ont été annulés car il y a des unités à proximité."
-#: server/unittools.c:3075
+#: server/unittools.c:3080
#, c-format
msgid "Orders for %s aborted because building of city failed."
msgstr ""
"Les ordres pour %s ont été annulés car la fondation de la ville a échoué."
-#: server/unittools.c:3088
+#: server/unittools.c:3093
#, c-format
msgid "Orders for %s aborted since they give an invalid activity."
msgstr "Les ordres pour %s ont été annulés car l'activité est invalide."
-#: server/unittools.c:3102
+#: server/unittools.c:3107
#, c-format
msgid "Orders for %s aborted since they give an invalid location."
msgstr ""
"Les ordres pour %s ont été annulés car ils pointent sur un lieu invalide."
-#: server/unittools.c:3112
+#: server/unittools.c:3117
#, c-format
msgid "Orders for %s aborted as there are units in the way."
msgstr "Les ordres pour %s ont été annulés car il y a des unités à proximité."
-#: server/unittools.c:3138
+#: server/unittools.c:3143
#, c-format
msgid "Orders for %s aborted because of failed move."
msgstr "Les ordres pour %s ont été annulés à cause de l'échec d'un mouvement."
-#: server/unittools.c:3179
+#: server/unittools.c:3184
#, c-format
msgid "Attempt to change homecity for %s failed."
msgstr "La tentative de changer la ville de support de %s a échoué."
-#: server/unittools.c:3190
+#: server/unittools.c:3195
#, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr "La tentative de créer une route commerciale pour %s a échoué."
-#: server/unittools.c:3202
+#: server/unittools.c:3207
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr "La tentative de construction de merveille à %s a échoué."
-#: server/unittools.c:3211
+#: server/unittools.c:3216
#, c-format
msgid "Your %s has invalid orders."
msgstr "Votre %s a des ordres invalides."
+#: server/voting.c:522
+#, fuzzy, c-format
+msgid ""
+"%s %d \"%s\" is passed %d to %d with %d abstentions and %d who did not vote."
+msgstr "Vote \"%s\" est passé %d à %d avec %d abstentions."
+
+#: server/voting.c:528
+#, fuzzy, c-format
+msgid ""
+"%s %d \"%s\" failed with %d against, %d for, %d abstentions and %d who did "
+"not vote."
+msgstr "Vote \"%s\" n'est pas passé avec %d contre, %d pour et %d abstentions."
+
+#: server/voting.c:548
+#, c-format
+msgid "%s %d: %s voted yes."
+msgstr ""
+
+#: server/voting.c:553
+#, c-format
+msgid "%s %d: %s voted no."
+msgstr ""
+
+#: server/voting.c:558
+#, c-format
+msgid "%s %d: %s chose to abstain."
+msgstr ""
+
+#. TRANS: Describing a new vote that can only pass
+#. * if there are no dissenting votes.
+#: server/voting.c:726
+#, c-format
+msgid "%s (needs %0.0f%% and no dissent)."
+msgstr ""
+
+#. TRANS: Describing a new vote that can pass only if the
+#. * given percentage of players votes 'yes'.
+#: server/voting.c:732
+#, c-format
+msgid "%s (needs %0.0f%% in favor)."
+msgstr ""
+
#: server/generator/mapgen.c:1771
msgid "High landmass - this may take a few seconds."
msgstr "Beaucoup de terres - cela risque de prendre quelques secondes."
@@ -7443,12 +7578,12 @@ msgstr ""
"Le nombre de joueurs est peut être trop grand pour cette carte.\n"
"SVP, rapportez ce bogue à %s."
-#: client/attribute.c:363
+#: client/attribute.c:368
msgid ""
"There has been a CMA error. Your citizen governor settings may be broken."
msgstr "Il y a eu une erreur de l'AGU. Vos réglages sont peut-être cassés."
-#: client/attribute.c:367
+#: client/attribute.c:372
msgid "Old attributes detected and removed."
msgstr "Des attributs anciens ont été détectés et supprimés."
@@ -7596,41 +7731,41 @@ msgstr "%+4d : Habitants\n"
msgid "%+4d : Taxed from trade\n"
msgstr "%+4d : Provenant du commerce\n"
-#: client/citydlg_common.c:418
+#: client/citydlg_common.c:421
#, c-format
msgid "%+4d : Trade route with %s\n"
msgstr "%+4d : Routes commerciales avec %s\n"
-#: client/citydlg_common.c:427
+#: client/citydlg_common.c:430
#, c-format
msgid "%+4d : Building tithes\n"
msgstr "%+4d : Bonus des bâtiments\n"
-#: client/citydlg_common.c:450
+#: client/citydlg_common.c:453
#, c-format
msgid "%+4d : Bonus from %s (%+d%%)\n"
msgstr "%+4d : Bonus de %s (%+d%%)\n"
-#: client/citydlg_common.c:462
+#: client/citydlg_common.c:465
#, c-format
msgid "%+4d : Waste\n"
msgstr "%+4d : Gaspillage\n"
-#: client/citydlg_common.c:468
+#: client/citydlg_common.c:471
#, c-format
msgid "%+4d : Disorder\n"
msgstr "%+4d : Désordre\n"
-#: client/citydlg_common.c:474
+#: client/citydlg_common.c:477
#, c-format
msgid "%+4d : Used\n"
msgstr "%+4d : Utilisé\n"
-#: client/citydlg_common.c:479
+#: client/citydlg_common.c:482
msgid "==== : Adds up to\n"
msgstr "==== : Donnant un total de\n"
-#: client/citydlg_common.c:481
+#: client/citydlg_common.c:484
#, c-format
msgid "%4d : Total surplus"
msgstr "%4d : Surplus total"
@@ -7937,57 +8072,57 @@ msgstr "?specialist:S"
msgid "Specialists"
msgstr "Spécialistes"
-#: client/civclient.c:240
+#: client/civclient.c:241
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr " -a, --autoconnect\t\tConnexion automatique à un serveur\n"
-#: client/civclient.c:250
+#: client/civclient.c:251
msgid " -l, --log FILE\tUse FILE as logfile (spawned server also uses this)\n"
msgstr ""
" -l, --log FICHIER\t\tUtilise FICHIER comme fichier journal (le serveur "
"dépendant utilise également ce fichier)\n"
-#: client/civclient.c:252
+#: client/civclient.c:253
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr " -m, --meta M\t\tSe connecter au métaserveur M\n"
-#: client/civclient.c:254
+#: client/civclient.c:255
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr " -n, --name N\t\tUtiliser le nom N\n"
-#: client/civclient.c:256
+#: client/civclient.c:257
msgid " -p, --port PORT\tConnect to server port PORT (usually with -a)\n"
msgstr ""
" -p, --port P\t\tSe connecter au port P du serveur (habituellement utilisé "
"avec -a)\n"
-#: client/civclient.c:258
+#: client/civclient.c:259
#, c-format
msgid " -P, --Plugin PLUGIN\tUse PLUGIN for sound output %s\n"
msgstr " -P, --Plugin PLUGIN\tUtilise PLUGIN pour la sortie audio %s\n"
-#: client/civclient.c:260
+#: client/civclient.c:261
msgid " -r, --read FILE\tRead startup script FILE (for spawned server only)\n"
msgstr ""
" -r, --read FICHIER\t\t\tLire le script de démarrage FICHIER (pour le "
"serveur dépendant seulement)\n"
-#: client/civclient.c:263
+#: client/civclient.c:264
msgid " -s, --server HOST\tConnect to the server at HOST (usually with -a)\n"
msgstr ""
" -s, --server S\tSe connecter au serveur S(habituellement utilisé avec -a)\n"
-#: client/civclient.c:265
+#: client/civclient.c:266
msgid " -S, --Sound FILE\tRead sound tags from FILE\n"
msgstr " -S, --Sound F\tLire les informations sur le son dans le fichier F\n"
-#: client/civclient.c:266
+#: client/civclient.c:267
msgid " -t, --tiles FILE\tUse data file FILE.tilespec for tiles\n"
msgstr ""
" -t, --tiles F\t\tUtiliser le fichier de données F.tilespec pour les "
"graphiques\n"
-#: client/civclient.c:269
+#: client/civclient.c:270
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7997,45 +8132,45 @@ msgstr ""
"\t\t\tEssayez \"%s -- --help\" pour plus d'info.\n"
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:274
+#: client/civclient.c:275
#, fuzzy, c-format
msgid "Report bugs at %s\n"
msgstr "Signaler les bogues à %s.\n"
-#: client/civclient.c:298
+#: client/civclient.c:299
#, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr "Port invalide \"%s\" spécifié pour l'option --port.\n"
-#: client/civclient.c:300 client/civclient.c:315
+#: client/civclient.c:301 client/civclient.c:316
msgid "Try using --help.\n"
msgstr "Essayer d'utiliser --help.\n"
-#: client/civclient.c:313
+#: client/civclient.c:314
#, c-format
msgid "Invalid debug level \"%s\" specified with --debug option.\n"
msgstr "Niveau de débogage invalide \"%s\" spécifié pour l'option --debug.\n"
-#: client/civclient.c:326
+#: client/civclient.c:327
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr "Option non reconnue: \"%s\"\n"
-#: client/civclient.c:391
+#: client/civclient.c:393
#, fuzzy, c-format
msgid "Updating old metaserver address \"%s\"."
msgstr "metaserver <adresse>"
-#: client/civclient.c:394
+#: client/civclient.c:396
#, fuzzy, c-format
msgid "Default metaserver has been set to \"%s\"."
msgstr "Option : %s a été positionnée à \"%s\"."
-#: client/civclient.c:550
+#: client/civclient.c:540
msgid "Game started."
msgstr "Partie commencée."
-#: client/civclient.c:588
+#: client/civclient.c:606
msgid "There was an error while auto connecting; aborting."
msgstr "La connexion automatique a échoué ; abandon."
@@ -8167,18 +8302,18 @@ msgstr "Connexion en cours."
msgid "Disconnected from server."
msgstr "Déconnecté du serveur."
-#: client/clinet.c:469
+#: client/clinet.c:473
#, c-format
msgid "Failed to contact server \"%s\" at port %d as \"%s\" after %d attempts"
msgstr ""
"Erreur de connexion au serveur \"%s\" port %d en tant que \"%s\" après %d "
"essais"
-#: client/clinet.c:484 client/clinet.c:486
+#: client/clinet.c:488 client/clinet.c:490
msgid "Connection to server refused. Please start the server."
msgstr "Connexion au serveur refusée. Veuillez démarrer le serveur."
-#: client/clinet.c:495 client/clinet.c:523
+#: client/clinet.c:499 client/clinet.c:527
#, c-format
msgid ""
"Error contacting server \"%s\" at port %d as \"%s\":\n"
@@ -8187,7 +8322,7 @@ msgstr ""
"Erreur de contact du server \"%s\" port %d en tant que \"%s\":\n"
" %s\n"
-#: client/clinet.c:514
+#: client/clinet.c:518
#, c-format
msgid ""
"Auto-connecting to server \"%s\" at port %d as \"%s\" every %f second(s) for "
@@ -8196,53 +8331,53 @@ 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:1358
+#: client/connectdlg_common.c:78 client/gui-gtk-2.0/pages.c:1358
msgid "novice"
msgstr "novice"
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1358
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
msgid "easy"
msgstr "facile"
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1359
msgid "normal"
msgstr "normal"
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr "difficile"
-#: client/connectdlg_common.c:83
+#: client/connectdlg_common.c:82
msgid "experimental"
msgstr "expérimental"
-#: client/connectdlg_common.c:213
+#: client/connectdlg_common.c:212
msgid "Starting server..."
msgstr "Démarrage du serveur..."
-#: client/connectdlg_common.c:332
+#: client/connectdlg_common.c:331
msgid "Couldn't start the server."
msgstr "Impossible de démarrer le serveur."
-#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
+#: client/connectdlg_common.c:332 client/connectdlg_common.c:365
msgid "You'll have to start one manually. Sorry..."
msgstr "Vous devez en démarrer un manuellement. Désolé..."
-#: client/connectdlg_common.c:364
+#: client/connectdlg_common.c:363
msgid "Couldn't connect to the server."
msgstr "Impossible de se connecter au serveur."
-#: client/connectdlg_common.c:365
+#: client/connectdlg_common.c:364
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:470
+#: client/connectdlg_common.c:469
#, fuzzy
msgid ""
"Established control over the server. You have command access level 'hack'."
msgstr "Nous avons le contrôle du serveur (niveau de commande hack)"
-#: client/connectdlg_common.c:475
+#: client/connectdlg_common.c:474
msgid ""
"Failed to obtain the required access level to take control of the server. "
"The server will now be shutdown."
@@ -8252,27 +8387,27 @@ msgstr ""
msgid "Only transporter units can be unloaded."
msgstr "Seules les unités de transport peuvent être déchargées."
-#: client/control.c:1425
+#: client/control.c:1417
msgid "Only settler units can be put into auto mode."
msgstr "Seuls les colons peuvent être mis en mode automatique."
-#: client/control.c:1516
+#: client/control.c:1511
msgid "Only nuclear units can do this."
msgstr "Seules les unités nucléaires peuvent faire cela."
-#: client/control.c:1545
+#: client/control.c:1540
msgid "Only paratrooper units can do this."
msgstr "Seuls les parachutistes peuvent faire cela."
-#: client/control.c:2020
+#: client/control.c:2015
msgid "Too far for this unit."
msgstr "Trop loin pour cette unité."
-#: client/control.c:2230 client/control.c:2260 client/control.c:2276
+#: client/control.c:2225 client/control.c:2255 client/control.c:2271
msgid "Didn't find a route to the destination!"
msgstr "Impossible de trouver une route pour cette destination !"
-#: client/control.c:2320
+#: client/control.c:2315
msgid "Oh my! You seem to have no capital!"
msgstr "Hé ! On dirait que vous n'avez pas de capitale !"
@@ -8684,28 +8819,35 @@ msgstr "* %s r
#. * last two elements
#. TRANS: List of possible output types has this between
#. * last two elements
-#: client/helpdata.c:1066 client/helpdata.c:1400
+#: client/helpdata.c:1066 client/helpdata.c:1408
msgid " or "
msgstr " ou "
-#: client/helpdata.c:1068 client/helpdata.c:1388
+#: client/helpdata.c:1068 client/helpdata.c:1396
msgid "?or:, "
msgstr "?ou:, "
-#: client/helpdata.c:1080
-#, 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"
+#: client/helpdata.c:1079
+#, fuzzy, c-format
+msgid "* Unit has to be in a city, or a base after %d turn.\n"
+msgid_plural "* Unit has to be in a city, or a base 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:1087
+#, fuzzy, c-format
+msgid "* Unit has to be in a city, a base, or on a %s after %d turn.\n"
+msgid_plural "* Unit has to be in a city, a base, 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:1122
+#: client/helpdata.c:1130
#, 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:1127
+#: client/helpdata.c:1135
#, c-format
msgid ""
"To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8714,91 +8856,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:1135
+#: client/helpdata.c:1143
msgid "You cannot research this technology."
msgstr "Vous ne pouvez pas rechercher cette technologie."
-#: client/helpdata.c:1139
+#: client/helpdata.c:1147
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:1151
+#: client/helpdata.c:1159
#, 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:1156
+#: client/helpdata.c:1164
#, 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:1159
+#: client/helpdata.c:1167
#, 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:1163
+#: client/helpdata.c:1171
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:1168
+#: client/helpdata.c:1176
#, 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:1175
+#: client/helpdata.c:1183
#, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr "* Permet aux %s de construire des forteresses.\n"
-#: client/helpdata.c:1183
+#: client/helpdata.c:1191
#, c-format
msgid "* Allows %s to build airbases.\n"
msgstr "* Permet aux %s de construire des bases aériennes.\n"
-#: client/helpdata.c:1192
+#: client/helpdata.c:1200
#, 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:1200
+#: client/helpdata.c:1208
#, 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:1234
+#: client/helpdata.c:1242
msgid "* Pollution cannot be generated on this terrain."
msgstr "* Aucune pollution ne peut apparaître sur ce terrain."
-#: client/helpdata.c:1239
+#: client/helpdata.c:1247
msgid "* You cannot build cities on this terrain."
msgstr "* Vous ne pouvez pas construire de ville sur ce terrain."
-#: client/helpdata.c:1245
+#: client/helpdata.c:1253
msgid "* The coastline of this terrain is unsafe."
msgstr "* Les lignes côtières de ce terrain sont dangereuses."
-#: client/helpdata.c:1250
+#: client/helpdata.c:1258
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:1255
+#: client/helpdata.c:1263
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:1305
+#: client/helpdata.c:1313
msgid "Features:\n"
msgstr "Caractéristiques :\n"
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1411 client/helpdata.c:1412
+#: client/helpdata.c:1419 client/helpdata.c:1420
msgid "?outputlist: Nothing "
msgstr " vide "
-#: client/helpdata.c:1419
+#: client/helpdata.c:1427
#, fuzzy, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -8813,7 +8955,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:1429
+#: client/helpdata.c:1437
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8823,30 +8965,30 @@ msgstr ""
"par les unités.\n"
#. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1437
+#: client/helpdata.c:1445
#, 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:1442
+#: client/helpdata.c:1450
#, 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:1447
+#: client/helpdata.c:1455
#, 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:1451
+#: client/helpdata.c:1459
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:1460
+#: client/helpdata.c:1468
#, c-format
msgid "* Each of your cities will avoid paying %d %s towards unit upkeep.\n"
msgstr ""
@@ -8855,12 +8997,12 @@ msgstr ""
#. TRANS: Amount is subtracted from upkeep cost
#. * for each upkeep type.
-#: client/helpdata.c:1468
+#: client/helpdata.c:1476
#, 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:1475
+#: client/helpdata.c:1483
#, c-format
msgid "* Chance of civil war is %d%% if you lose your capital.\n"
msgstr ""
@@ -8868,7 +9010,7 @@ msgstr ""
"capitale.\n"
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1482
+#: client/helpdata.c:1490
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -8878,7 +9020,7 @@ msgstr ""
"civilisation apparaît quand vous avez %d villes.\n"
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1489
+#: client/helpdata.c:1497
#, c-format
msgid ""
"* After the first unhappy citizen due to city size, for each %d additional "
@@ -8887,18 +9029,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:1497
+#: client/helpdata.c:1505
#, 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:1502
+#: client/helpdata.c:1510
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr "Pas de limite pour les taux de science/or/luxe.\n"
-#: client/helpdata.c:1507
+#: client/helpdata.c:1515
#, fuzzy, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -8913,7 +9055,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:1519
+#: client/helpdata.c:1527
#, 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"
@@ -8925,7 +9067,7 @@ msgstr[1] ""
"martiale.\n"
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1530
+#: client/helpdata.c:1538
#, c-format
msgid ""
"* You may grow your cities by means of celebrations. Your cities must be at "
@@ -8934,15 +9076,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:1536
+#: client/helpdata.c:1544
msgid "* Your units cannot be bribed.\n"
msgstr "* Vos unités ne peuvent pas être soudoyées.\n"
-#: client/helpdata.c:1539
+#: client/helpdata.c:1547
msgid "* Your cities cannot be incited.\n"
msgstr "* Vos villes ne peuvent pas être incitées à la révolte.\n"
-#: client/helpdata.c:1543
+#: client/helpdata.c:1551
msgid ""
"* Government will fall into anarchy if any city is in disorder for more than "
"two turns in a row.\n"
@@ -8950,16 +9092,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:1549
+#: client/helpdata.c:1557
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:1553
+#: client/helpdata.c:1561
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:1557
+#: client/helpdata.c:1565
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
@@ -8967,25 +9109,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:1561
+#: client/helpdata.c:1569
msgid "* Pays no upkeep for fanatics.\n"
msgstr "* Ne paye pas d'entretien pour les fanatiques.\n"
-#: client/helpdata.c:1564
+#: client/helpdata.c:1572
msgid "* Has no unhappy citizens.\n"
msgstr "* N'a pas de citoyen mécontent.\n"
-#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
+#: client/helpdata.c:1582 client/helpdata.c:1586 client/helpdata.c:1590
#, c-format
msgid "* Veteran %s units.\n"
msgstr "* %s unités vétérantes.\n"
-#: client/helpdata.c:1585
+#: client/helpdata.c:1593
msgid "* Veteran units.\n"
msgstr "* Unité vétérante.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1591
+#: client/helpdata.c:1599
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8995,7 +9137,7 @@ msgstr ""
"quand la ville n'est pas en extase.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1600
+#: client/helpdata.c:1608
#, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -9005,74 +9147,74 @@ msgstr ""
"quand la ville est en extase.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1608
+#: client/helpdata.c:1616
#, 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:1617
+#: client/helpdata.c:1625
#, 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:1625
+#: client/helpdata.c:1633
#, 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:1630
+#: client/helpdata.c:1638
#, 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:1635
+#: client/helpdata.c:1643
#, 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:1643
+#: client/helpdata.c:1651
#, 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:1649
+#: client/helpdata.c:1657
#, 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:1655
+#: client/helpdata.c:1663
#, 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:1672
+#: client/helpdata.c:1680
#, 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:1699
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d %s"
msgstr "%s%d %s"
-#: client/helpdata.c:1700 client/helpdata.c:1708 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1708 client/helpdata.c:1716 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:1707
+#: client/helpdata.c:1715
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d mécontents"
@@ -9147,7 +9289,7 @@ msgstr ""
"C'est le port par défaut du serveur qui sera utilisé dans le dialogue de "
"connexion ou avec le paramètre -a en ligne de commande."
-#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:916 data/Freeciv.in:107
msgid "Metaserver"
msgstr "Métaserveur"
@@ -9556,36 +9698,36 @@ msgstr "Impossible d'
msgid "Saved settings to file %s"
msgstr "Les options sont sauvegardées dans %s"
-#: client/packhand.c:211 client/packhand.c:217
+#: client/packhand.c:212 client/packhand.c:218
#, fuzzy
msgid "You were rejected from the game...."
msgstr "Vous avez été rejeté de la partie:"
-#: client/packhand.c:229
+#: client/packhand.c:230
#, c-format
msgid "Client capability string: %s"
msgstr "Chaîne de capacités du client: %s"
-#: client/packhand.c:232
+#: client/packhand.c:233
#, c-format
msgid "Server capability string: %s"
msgstr "Chaîne de capacités du serveur: %s"
-#: client/packhand.c:850
+#: client/packhand.c:864
#, c-format
msgid "Start of turn %d"
msgstr "Début du tour %d"
-#: client/packhand.c:1591
+#: client/packhand.c:1621
#, c-format
msgid "AI Mode is now %s."
msgstr "L'IA est maintenant %s."
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "ON"
msgstr "activée"
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "OFF"
msgstr "désactivée"
@@ -9616,15 +9758,15 @@ msgstr "?joueur:Nom"
msgid "Username"
msgstr "Nom d'utilisateur"
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
-#: client/gui-gtk-2.0/pages.c:2157
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:653
+#: client/gui-gtk-2.0/pages.c:1604 client/gui-gtk-2.0/pages.c:2159
msgid "Flag"
msgstr "Drapeau"
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1605
-#: client/gui-gtk-2.0/pages.c:2159 client/gui-sdl/repodlgs.c:2063
-#: client/gui-win32/connectdlg.c:990 client/gui-win32/dialogs.c:542
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:657
+#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1609
+#: client/gui-gtk-2.0/pages.c:2161 client/gui-sdl/repodlgs.c:2063
+#: client/gui-win32/connectdlg.c:992 client/gui-win32/dialogs.c:542
#: client/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "Nation"
@@ -9638,7 +9780,7 @@ msgid "Score"
msgstr "Score"
# AR
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1614
msgid "Team"
msgstr "Équipe"
@@ -9671,36 +9813,36 @@ msgstr "?dialogue_joueurs:Inactif"
msgid "Ping"
msgstr "Ping"
-#: client/repodlgs_common.c:375
+#: client/repodlgs_common.c:378
msgid "You cannot sell improvements."
msgstr "Vous ne pouvez pas vendre de bâtiment."
-#: client/repodlgs_common.c:391
+#: client/repodlgs_common.c:394
#, c-format
msgid "Sold %d %s for %d gold."
msgstr "Vente de %d %s pour %d lingots."
-#: client/repodlgs_common.c:396
+#: client/repodlgs_common.c:399
#, c-format
msgid "No %s could be sold."
msgstr "Aucun %s n'a pu être vendu."
#. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:415
+#: client/repodlgs_common.c:418
msgid "You cannot disband units."
msgstr "Vous ne pouvez pas congédier d'unité."
-#: client/repodlgs_common.c:420
+#: client/repodlgs_common.c:423
#, c-format
msgid "%s cannot be disbanded."
msgstr "%s ne peut pas être congédié."
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:444
#, c-format
msgid "Disbanded %d %s."
msgstr "Congédié %d %s."
-#: client/repodlgs_common.c:445
+#: client/repodlgs_common.c:448
#, c-format
msgid "No %s could be disbanded."
msgstr "Aucun %s n'a pu être congédié."
@@ -10294,47 +10436,47 @@ msgstr "?jrs/hrs:%02dj %02dh"
msgid "?duration:overflow"
msgstr "?duration:débordement"
-#: client/text.c:1143
+#: client/text.c:1145
#, c-format
msgid "%6d.%02d ms"
msgstr "%6d.%02d ms"
#. TRANS: <nation adjective> <government name>.
#. * E.g. "Polish Republic".
-#: client/text.c:1188
+#: client/text.c:1193
#, fuzzy, c-format
msgid "?nationgovernment:%s %s"
msgstr "Gouvernement: %s"
#. TRANS: "Observer: 1985"
-#: client/text.c:1198
+#: client/text.c:1203
#, c-format
msgid "Observer: %s"
msgstr "Observateur : %s"
-#: client/text.c:1216
+#: client/text.c:1221
msgid "Buildings: "
msgstr "Constructions : "
-#: client/text.c:1233 client/text.c:1272
+#: client/text.c:1238 client/text.c:1277
msgid "None. "
msgstr "Aucun. "
-#: client/text.c:1235 client/text.c:1274
+#: client/text.c:1240 client/text.c:1279
msgid "?clistend:."
msgstr "."
-#: client/text.c:1253
+#: client/text.c:1258
msgid "Wonders: "
msgstr "Merveilles : "
-#: client/text.c:1308
+#: client/text.c:1313
#, 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:1312
+#: client/text.c:1317
#, fuzzy, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
@@ -10342,26 +10484,26 @@ 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:1318
+#: client/text.c:1323
#, fuzzy, c-format
msgid "%d additional unhappy citizen."
msgid_plural "%d additional unhappy citizens."
msgstr[0] "%d citoyens mécontents supplémentaires."
msgstr[1] "%d citoyens mécontents supplémentaires."
-#: client/text.c:1339
+#: client/text.c:1344
#, fuzzy
msgid "Unlimited martial law in effect."
msgstr "Loi martiale effective ("
-#: client/text.c:1341
+#: client/text.c:1346
#, fuzzy, c-format
msgid "%d military unit may impose martial law."
msgid_plural "Up to %d military units may impose martial law."
msgstr[0] "* Unité non militaire (ne peut attaquer ; pas de loi martiale).\n"
msgstr[1] "* Unité non militaire (ne peut attaquer ; pas de loi martiale).\n"
-#: client/text.c:1345
+#: client/text.c:1350
#, fuzzy, c-format
msgid "Each military unit makes %d unhappy citizen content."
msgid_plural "Each military unit makes %d unhappy citizens content."
@@ -10370,31 +10512,31 @@ msgstr[0] ""
msgstr[1] ""
"Amuse les citoyens de la ville, rendant contents 3 citoyens mécontents."
-#: client/text.c:1352
+#: client/text.c:1357
msgid "Military units in the field may cause unhappiness. "
msgstr "Les unités militaires en campagne peuvent causer du mécontentent. "
-#: client/text.c:1355
+#: client/text.c:1360
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:1370
+#: client/text.c:1375
#, c-format
msgid "Luxury: %d total."
msgstr "Luxe : %d au total."
-#: client/tilespec.c:865
+#: client/tilespec.c:882
msgid "No usable default tileset found, aborting!"
msgstr "Aucun jeu de textures par défaut utilisable, annulation!"
-#: client/tilespec.c:1338
+#: client/tilespec.c:1355
msgid ""
"Client does not support isometric tilesets. Using default tileset instead."
msgstr ""
"Le client ne supporte pas les jeux de textures isométriques. Utilisation "
"d'un jeu de textures standard à la place."
-#: client/tilespec.c:1347
+#: client/tilespec.c:1364
msgid ""
"Client does not support overhead view tilesets. Using default tileset "
"instead."
@@ -10402,7 +10544,7 @@ msgstr ""
"Le client ne supporte pas les jeux de textures de vue par dessus la tête. "
"Utilisation d'un jeu de textures standard à la place."
-#: client/tilespec.c:3966
+#: client/tilespec.c:3987
#, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -11091,7 +11233,7 @@ msgid "_Display"
msgstr "_Montrer"
#: client/gui-gtk-2.0/cityrep.c:1006 client/gui-gtk-2.0/menu.c:839
-#: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
+#: client/gui-sdl/diplodlg.c:692 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
#: client/gui-xaw/cityrep.c:533 client/gui-xaw/menu.c:156
@@ -11267,198 +11409,198 @@ msgstr "Quel nom doit porter le pr
msgid "Remove this preset?"
msgstr "Supprimer ce pré-réglage ?"
-#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:222
+#: client/gui-gtk-2.0/dialogs.c:197 client/gui-gtk-2.0/messagewin.c:222
#, fuzzy
msgid "Goto _Location"
msgstr "A_ller vers"
-#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
+#: client/gui-gtk-2.0/dialogs.c:202 client/gui-gtk-2.0/messagewin.c:226
#, fuzzy
msgid "Inspect _City"
msgstr "Fenêtre _ville"
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:258 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:258 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:259 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:311 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:312 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:312 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:313 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:506
+#: client/gui-gtk-2.0/dialogs.c:507
msgid "Unit"
msgstr "Unité"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:950
-#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2155
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:985
+#: client/gui-gtk-2.0/dialogs.c:508 client/gui-gtk-2.0/pages.c:950
+#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2157
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:987
#: 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:519 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:520 client/gui-sdl/dialogs.c:627
msgid "Unit selection"
msgstr "Choix de l'unité"
-#: client/gui-gtk-2.0/dialogs.c:582
+#: client/gui-gtk-2.0/dialogs.c:583
msgid "_Ready all"
msgstr "P_réparer tous"
-#: client/gui-gtk-2.0/dialogs.c:590
+#: client/gui-gtk-2.0/dialogs.c:591
msgid "_Sentry idle"
msgstr "Veiller les unité_s inactives"
-#: client/gui-gtk-2.0/dialogs.c:719
+#: client/gui-gtk-2.0/dialogs.c:721
#, fuzzy
msgid "Nation _Groups:"
msgstr "_Nations :"
-#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:766 data/Freeciv.in:3128
msgid "What Nation Will You Be?"
msgstr "Quelle nation voulez-vous être ?"
-#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
-#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
+#: client/gui-gtk-2.0/dialogs.c:768 client/gui-sdl/chatline.c:842
+#: client/gui-win32/connectdlg.c:1040 data/Freeciv.in:3371
msgid "Pick Nation"
msgstr "Prendre un nation"
-#: client/gui-gtk-2.0/dialogs.c:774
+#: client/gui-gtk-2.0/dialogs.c:776
#, fuzzy
msgid "_Random Nation"
msgstr "Nation aléatoire"
-#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:792 client/gui-win32/dialogs.c:517
msgid "Select a nation"
msgstr "Choisissez une nation"
-#: client/gui-gtk-2.0/dialogs.c:804
+#: client/gui-gtk-2.0/dialogs.c:810
msgid "_Properties"
msgstr "_Propriétés"
-#: client/gui-gtk-2.0/dialogs.c:824
+#: client/gui-gtk-2.0/dialogs.c:830
msgid "_Leader:"
msgstr "_Chef :"
-#: client/gui-gtk-2.0/dialogs.c:831
+#: client/gui-gtk-2.0/dialogs.c:837
msgid "_Female"
msgstr "_Femme"
-#: client/gui-gtk-2.0/dialogs.c:836
+#: client/gui-gtk-2.0/dialogs.c:842
msgid "_Male"
msgstr "Ho_mme"
-#: client/gui-gtk-2.0/dialogs.c:863
+#: client/gui-gtk-2.0/dialogs.c:869
#, fuzzy
msgid "City _Styles:"
msgstr "Styles des _villes:"
-#: client/gui-gtk-2.0/dialogs.c:902
+#: client/gui-gtk-2.0/dialogs.c:908
#, fuzzy
msgid "_Description"
msgstr "Lég_ende"
-#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1263 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:1253 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1268 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:1262 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1277 client/gui-sdl/dialogs.c:2204
#: 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:1306 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1318 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:1315 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1327 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 "Mettre à jour les unités obsolètes"
-#: client/gui-gtk-2.0/diplodlg.c:231 client/gui-win32/diplodlg.c:151
+#: client/gui-gtk-2.0/diplodlg.c:222 client/gui-win32/diplodlg.c:151
#: client/gui-xaw/diplodlg.c:383 client/gui-xaw/diplodlg.c:401
msgid "World-map"
msgstr "La carte du monde"
-#: client/gui-gtk-2.0/diplodlg.c:237 client/gui-win32/diplodlg.c:146
+#: client/gui-gtk-2.0/diplodlg.c:228 client/gui-win32/diplodlg.c:146
#: client/gui-xaw/diplodlg.c:387 client/gui-xaw/diplodlg.c:405
msgid "Sea-map"
msgstr "La carte des mers"
-#: client/gui-gtk-2.0/diplodlg.c:243
+#: client/gui-gtk-2.0/diplodlg.c:234
msgid "_Maps"
msgstr "_Cartes"
-#: client/gui-gtk-2.0/diplodlg.c:274
+#: client/gui-gtk-2.0/diplodlg.c:265
msgid "_Advances"
msgstr "_Découvertes"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/diplodlg.c:315 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "_Villes"
-#: client/gui-gtk-2.0/diplodlg.c:333
+#: client/gui-gtk-2.0/diplodlg.c:324
msgid "_Give shared vision"
msgstr "_Donne la vue partagée"
-#: client/gui-gtk-2.0/diplodlg.c:346
+#: client/gui-gtk-2.0/diplodlg.c:337
msgid "Give _embassy"
msgstr "Donn_e une ambassade"
-#: client/gui-gtk-2.0/diplodlg.c:376
+#: client/gui-gtk-2.0/diplodlg.c:368
msgid "_Pacts"
msgstr "_Pactes"
-#: client/gui-gtk-2.0/diplodlg.c:466
+#: client/gui-gtk-2.0/diplodlg.c:458
#, c-format
msgid "Diplomacy: %s"
msgstr "Diplomatie : %s"
-#: client/gui-gtk-2.0/diplodlg.c:473
+#: client/gui-gtk-2.0/diplodlg.c:465
msgid "_Cancel meeting"
msgstr "Annuler la ren_contre"
-#: client/gui-gtk-2.0/diplodlg.c:475
+#: client/gui-gtk-2.0/diplodlg.c:467
msgid "Accept _treaty"
msgstr "Accepter le _traité"
-#: client/gui-gtk-2.0/diplodlg.c:503
+#: client/gui-gtk-2.0/diplodlg.c:495
msgid "C_lauses:"
msgstr "C_lauses :"
-#: client/gui-gtk-2.0/diplodlg.c:568 client/gui-gtk-2.0/diplodlg.c:642
+#: client/gui-gtk-2.0/diplodlg.c:560 client/gui-gtk-2.0/diplodlg.c:634
msgid "_Gold:"
msgstr "_Or :"
-#: client/gui-gtk-2.0/diplodlg.c:580 client/gui-gtk-2.0/diplodlg.c:654
+#: client/gui-gtk-2.0/diplodlg.c:572 client/gui-gtk-2.0/diplodlg.c:646
msgid "_Add Clause..."
msgstr "_Ajouter une Clause ..."
-#: client/gui-gtk-2.0/diplodlg.c:699
+#: client/gui-gtk-2.0/diplodlg.c:691
msgid "--- This treaty is blank. Please add some clauses. ---"
msgstr "--- Ce traité est vide. Veuillez ajouter des clauses. ---"
-#: client/gui-gtk-2.0/diplodlg.c:905 client/gui-sdl/diplodlg.c:375
+#: client/gui-gtk-2.0/diplodlg.c:897 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 "Quantité d'or non valide."
@@ -11518,20 +11660,20 @@ msgstr "Choisissez une destination"
msgid "Show _All Cities"
msgstr "Montrer _toutes les villes"
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:164
msgid "Show Map Scrollbars"
msgstr "Montrer les barres de défilement de la carte"
-#: client/gui-gtk-2.0/gui_main.c:163
+#: client/gui-gtk-2.0/gui_main.c:165
msgid "Disable this option to hide the scrollbars on the map view."
msgstr ""
"Désactivez cette option pour cacher les barres de défilement de la carte."
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:169
msgid "Keyboardless goto"
msgstr "\"Aller à\" sans clavier"
-#: client/gui-gtk-2.0/gui_main.c:168
+#: client/gui-gtk-2.0/gui_main.c:170
msgid ""
"If this option is set then a goto may be initiated by left-clicking and then "
"holding down the mouse button while dragging the mouse onto a different tile."
@@ -11539,11 +11681,11 @@ msgstr ""
"Si cette option est activée, un \"Aller à\" peut être initié par un \"clic-"
"gauche-tiré\" sur la case de destination."
-#: client/gui-gtk-2.0/gui_main.c:173
+#: client/gui-gtk-2.0/gui_main.c:175
msgid "Keep dialogs on top"
msgstr "Garder les dialogues au dessus"
-#: client/gui-gtk-2.0/gui_main.c:174
+#: client/gui-gtk-2.0/gui_main.c:176
msgid ""
"If this option is set then dialog windows will always remain in front of the "
"main Freeciv window. Disabling this has no effect in fullscreen mode."
@@ -11551,11 +11693,11 @@ msgstr ""
"si cette option est activée les fenêtres de dialogue resteront au dessus de "
"la fenêtre principale. Désactiver ceci n'a aucun effet en mode plein écran."
-#: client/gui-gtk-2.0/gui_main.c:178
+#: client/gui-gtk-2.0/gui_main.c:180
msgid "Show worklist task icons"
msgstr "Montrer les icônes des tâches de la liste de travail"
-#: client/gui-gtk-2.0/gui_main.c:179
+#: client/gui-gtk-2.0/gui_main.c:181
msgid ""
"Disabling this will turn off the unit and building icons in the worklist "
"dialog and the production tab of the city dialog."
@@ -11563,11 +11705,11 @@ msgstr ""
"Désactiver ceci retirera les icônes d'unités et bâtiments dans le dialogue "
"des listes de travail et de l'onglet production des dialogues de villes."
-#: client/gui-gtk-2.0/gui_main.c:183
+#: client/gui-gtk-2.0/gui_main.c:185
msgid "Enable status report tabs"
msgstr "Active les onglets de rapport"
-#: client/gui-gtk-2.0/gui_main.c:184
+#: client/gui-gtk-2.0/gui_main.c:186
msgid ""
"If this option is enabled then report dialogs will be shown as separate tabs "
"rather than in popup dialogs."
@@ -11575,11 +11717,11 @@ msgstr ""
"Si cette option est activée, les rapports seront affichés comme des onglets "
"plutôt que des popups."
-#: client/gui-gtk-2.0/gui_main.c:189 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:191 client/gui-win32/gui_main.c:110
msgid "Better fog-of-war drawing"
msgstr "Dessin du champ de vision réel amélioré"
-#: client/gui-gtk-2.0/gui_main.c:190 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:192 client/gui-win32/gui_main.c:111
msgid ""
"If this is enabled then a better method is used for drawing fog-of-war. It "
"is not any slower but will consume about twice as much memory."
@@ -11588,41 +11730,41 @@ msgstr ""
"champ de vision. Ce n'est pas plus lent mais demande a peu près deux fois "
"plus de mémoire."
-#: client/gui-gtk-2.0/gui_main.c:195
+#: client/gui-gtk-2.0/gui_main.c:197
msgid "Show time for each chat message"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:196
+#: client/gui-gtk-2.0/gui_main.c:198
msgid ""
"If this option is enabled then all chat messages will be prefixed by a time "
"string of the form [hour:minute:second]."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:201
+#: client/gui-gtk-2.0/gui_main.c:203
msgid "Split bottom notebook area"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:202
+#: client/gui-gtk-2.0/gui_main.c:204
msgid ""
"Enabling this option will split the bottom notebook into a left and right "
"notebook so that two tabs may be viewed at once."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:207
+#: client/gui-gtk-2.0/gui_main.c:209
msgid "New message events go to top of list"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:208
+#: client/gui-gtk-2.0/gui_main.c:210
msgid ""
"If this option is enabled, new events in the message window will appear at "
"the top of the list, rather than being appended at the bottom."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:213
+#: client/gui-gtk-2.0/gui_main.c:215
msgid "Show extra message window buttons"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:214
+#: client/gui-gtk-2.0/gui_main.c:216
msgid ""
"If this option is enabled, there will be two buttons displayed in the "
"message window for inspecting a city and going to a location. If this option "
@@ -11632,22 +11774,22 @@ msgid ""
"closed and reopened."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:224
+#: client/gui-gtk-2.0/gui_main.c:226
#, fuzzy
msgid "Metaserver tab first in network page"
msgstr "Chaîne du sujet du métaserveur positionnée à \"%s\"."
-#: client/gui-gtk-2.0/gui_main.c:225
+#: client/gui-gtk-2.0/gui_main.c:227
msgid ""
"If this option is enabled, the metaserver tab will be the first notebook tab "
"in the network page. This option requires a restart in order to take effect."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:230
+#: client/gui-gtk-2.0/gui_main.c:232
msgid "Plain chat messages are sent to allies only"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:231
+#: client/gui-gtk-2.0/gui_main.c:233
msgid ""
"If this option is enabled, then plain messages typed into the chat entry "
"while the game is running will only be sent to your allies. Otherwise plain "
@@ -11657,7 +11799,20 @@ msgid ""
"visible in multiplayer games)."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:340 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:245
+msgid "Arrange widgets for small displays"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:246
+msgid ""
+"If this option is enabled, widgets in the main window will be arrange so "
+"that they take up the least amount of total screen space. Specifically, the "
+"left panel containing the overview, player status, and the unit information "
+"box will be extended over the entire left side of the window. This option "
+"requires a restart in order to take effect."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:352 client/gui-xaw/gui_main.c:245
msgid ""
"This client has no special command line options\n"
"\n"
@@ -11665,22 +11820,22 @@ msgstr ""
"Ce client n'a pas d'option spécifique pour la ligne de commande\n"
"\n"
-#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
+#: client/gui-gtk-2.0/gui_main.c:847 client/gui-gtk-2.0/gui_main.c:1542
msgid "Freeciv"
msgstr "Freeciv"
-#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
+#: client/gui-gtk-2.0/gui_main.c:1251 client/gui-gtk-2.0/gui_main.c:1258
#: client/gui-sdl/mapctrl.c:1566 client/gui-win32/gui_main.c:482
#: data/Freeciv.in:2618
msgid "Turn Done"
msgstr "Fin du tour"
-#: client/gui-gtk-2.0/gui_main.c:1232 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1258 client/gui-sdl/mapctrl.c:1566
#: client/gui-sdl/mapview.c:1082
msgid "Shift+Return"
msgstr "Maj+Entrée"
-#: client/gui-gtk-2.0/gui_main.c:1266 client/gui-gtk-2.0/menu.c:797
+#: client/gui-gtk-2.0/gui_main.c:1299 client/gui-gtk-2.0/menu.c:797
#: client/gui-gtk-2.0/menu.c:799 client/gui-gtk-2.0/menu.c:801
#: client/gui-gtk-2.0/menu.c:803 client/gui-gtk-2.0/menu.c:805
#: client/gui-gtk-2.0/menu.c:807 client/gui-gtk-2.0/menu.c:809
@@ -11699,11 +11854,11 @@ msgstr "Maj+Entr
msgid "View"
msgstr "Voir"
-#: client/gui-gtk-2.0/gui_main.c:1359
+#: client/gui-gtk-2.0/gui_main.c:1393
msgid "Chat"
msgstr "Discussion"
-#: client/gui-gtk-2.0/gui_main.c:1377 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1411 client/gui-win32/gui_main.c:538
#: data/Freeciv.in:2809
msgid ""
"Freeciv is free software and you are welcome to distribute copies of it\n"
@@ -11715,78 +11870,78 @@ msgstr ""
"Aide.\n"
"Maintenant... Envoyez les en Enfer !"
-#: client/gui-gtk-2.0/gui_main.c:1392
+#: client/gui-gtk-2.0/gui_main.c:1426
msgid "Allies Only"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1657
+#: client/gui-gtk-2.0/gui_main.c:1691
msgid "Not _ready"
msgstr "Pas p_rêt"
-#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
+#: client/gui-gtk-2.0/gui_main.c:1702 client/gui-gtk-2.0/pages.c:1679
msgid "_Ready"
msgstr "P_rêt"
-#: client/gui-gtk-2.0/gui_main.c:1672 client/gui-gtk-2.0/gui_main.c:1678
-#: client/gui-gtk-2.0/pages.c:2204
+#: client/gui-gtk-2.0/gui_main.c:1706 client/gui-gtk-2.0/gui_main.c:1712
+#: client/gui-gtk-2.0/pages.c:2206
msgid "_Start"
msgstr "_Démarrage"
-#: client/gui-gtk-2.0/gui_main.c:1686
+#: client/gui-gtk-2.0/gui_main.c:1720
#, fuzzy
msgid "_Take Player"
msgstr "Prendre ce joueur"
-#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
+#: client/gui-gtk-2.0/gui_main.c:1723 client/gui-gtk-2.0/pages.c:1669
msgid "Pick _Nation"
msgstr "Prendre une _nation"
-#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
+#: client/gui-gtk-2.0/gui_main.c:1730 client/gui-gtk-2.0/pages.c:1674
msgid "_Observe"
msgstr "_Observateur"
-#: client/gui-gtk-2.0/gui_main.c:1698
+#: client/gui-gtk-2.0/gui_main.c:1732
msgid "Do not _observe"
msgstr "Ne pas _observer"
-#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1755 client/gui-xaw/pages.c:211
msgid "<AI>"
msgstr "<IA>"
-#: client/gui-gtk-2.0/gui_main.c:1723
+#: client/gui-gtk-2.0/gui_main.c:1758
msgid "<Novice AI>"
msgstr "<IA novice>"
-#: client/gui-gtk-2.0/gui_main.c:1726
+#: client/gui-gtk-2.0/gui_main.c:1761
msgid "<Easy AI>"
msgstr "<IA facile>"
-#: client/gui-gtk-2.0/gui_main.c:1729
+#: client/gui-gtk-2.0/gui_main.c:1764
msgid "<Normal AI>"
msgstr "<IA normal>"
-#: client/gui-gtk-2.0/gui_main.c:1732
+#: client/gui-gtk-2.0/gui_main.c:1767
msgid "<Hard AI>"
msgstr "<IA difficile>"
-#: client/gui-gtk-2.0/gui_main.c:1742 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1777 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:1808
+#: client/gui-gtk-2.0/gui_main.c:1844 client/gui-gtk-2.0/gui_main.c:1858
msgid "Observer"
msgstr "Observateur"
-#: client/gui-gtk-2.0/gui_main.c:1808
+#: client/gui-gtk-2.0/gui_main.c:1858
msgid "Detached"
msgstr "Détaché"
-#: client/gui-gtk-2.0/gui_main.c:2073
+#: client/gui-gtk-2.0/gui_main.c:2117
msgid "Are you sure you want to quit?"
msgstr "Voulez-vous vraiment quitter?"
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
#, c-format
msgid ""
"Close Tab:\n"
@@ -11795,7 +11950,7 @@ msgstr ""
"Fermer l'onglet:\n"
"%s"
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
msgid "Ctrl+W"
msgstr "Ctrl+W"
@@ -11900,8 +12055,8 @@ msgid "Trans. Rslt/Time:"
msgstr "Transf. Résult./Temps :"
#: 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
-#: client/gui-win32/helpdlg.c:709 client/gui-win32/helpdlg.c:733
+#: client/gui-win32/helpdlg.c:502 client/gui-win32/helpdlg.c:550
+#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:739
#: client/gui-xaw/helpdlg.c:759 client/gui-xaw/helpdlg.c:808
#: client/gui-xaw/helpdlg.c:816 client/gui-xaw/helpdlg.c:853
#: client/gui-xaw/helpdlg.c:878
@@ -11948,34 +12103,34 @@ msgstr "avec"
msgid "?techhelp:"
msgstr "?techhelp:"
-#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:591
+#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:597
#: client/gui-xaw/helpdlg.c:996
#, c-format
msgid "+%d Trade / %d"
msgstr "+%d Comm. / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:595
+#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:601
#: client/gui-xaw/helpdlg.c:1000
#, c-format
msgid "no extra / %d"
msgstr "pas d'extra / %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
-#: client/gui-win32/helpdlg.c:602 client/gui-win32/helpdlg.c:616
-#: client/gui-win32/helpdlg.c:635 client/gui-xaw/helpdlg.c:1002
+#: client/gui-gtk-2.0/helpdlg.c:1085 client/gui-win32/helpdlg.c:604
+#: client/gui-win32/helpdlg.c:608 client/gui-win32/helpdlg.c:622
+#: client/gui-win32/helpdlg.c:641 client/gui-xaw/helpdlg.c:1002
#: client/gui-xaw/helpdlg.c:1006 client/gui-xaw/helpdlg.c:1020
#: client/gui-xaw/helpdlg.c:1039
msgid "n/a"
msgstr "nc"
-#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:605
+#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:611
#: client/gui-xaw/helpdlg.c:1009
#, c-format
msgid "+%d Food / %d"
msgstr "+%d Nour. / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:619
+#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:625
#: client/gui-xaw/helpdlg.c:1023
#, c-format
msgid "+%d Res. / %d"
@@ -12749,41 +12904,41 @@ msgstr "Se c_onnecter
msgid "Connect to Gaming _Zone"
msgstr "Se connecter à Gaming _Zone"
-#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:302
#: 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:779 client/gui-gtk-2.0/pages.c:820
-#: client/gui-win32/connectdlg.c:916
+#: client/gui-win32/connectdlg.c:918
msgid "Server Name"
msgstr "Nom du serveur"
#: client/gui-gtk-2.0/pages.c:780 client/gui-gtk-2.0/pages.c:821
-#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:916
+#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:918
#: data/Freeciv.in:96
msgid "Port"
msgstr "Port"
#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Version"
msgstr "Version"
#: client/gui-gtk-2.0/pages.c:782 client/gui-gtk-2.0/pages.c:823
-#: client/gui-gtk-2.0/pages.c:2161 client/gui-win32/connectdlg.c:917
-#: client/gui-win32/connectdlg.c:995
+#: client/gui-gtk-2.0/pages.c:2163 client/gui-win32/connectdlg.c:919
+#: client/gui-win32/connectdlg.c:997
msgid "Status"
msgstr "Statut"
#: client/gui-gtk-2.0/pages.c:783 client/gui-gtk-2.0/pages.c:824
#: client/gui-sdl/connectdlg.c:318 client/gui-sdl/plrdlg.c:330
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Players"
msgstr "Joueurs"
#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
-#: client/gui-win32/connectdlg.c:918
+#: client/gui-win32/connectdlg.c:920
msgid "Comment"
msgstr "Commentaire"
@@ -12815,9 +12970,9 @@ msgstr "Mot de passe (_w):"
msgid "Conf_irm Password:"
msgstr "Conf_irmer le mot de passe:"
-#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2165
#: 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:1000
+#: client/gui-win32/citydlg.c:1083 client/gui-win32/connectdlg.c:1002
#: client/gui-win32/wldlg.c:800 client/gui-win32/wldlg.c:806
msgid "Type"
msgstr "Type"
@@ -12912,7 +13067,7 @@ msgstr "Niveau de l'I_A :"
msgid "Ruleset _Version:"
msgstr "Jeu de _règles :"
-#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2195
msgid "_More Game Options..."
msgstr "Plus d'_options..."
@@ -12928,49 +13083,49 @@ msgstr "Classement"
msgid "Ready"
msgstr "Prêt"
-#: client/gui-gtk-2.0/pages.c:1601
+#: client/gui-gtk-2.0/pages.c:1600
#, fuzzy
msgid "?player:Leader"
msgstr "?joueur:Nom"
-#: client/gui-gtk-2.0/pages.c:1732 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1734 client/gui-sdl/chatline.c:185
msgid "Choose Saved Game to Load"
msgstr "Choisissez la partie à charger"
-#: client/gui-gtk-2.0/pages.c:1824
+#: client/gui-gtk-2.0/pages.c:1826
msgid "Choose Saved Game to _Load:"
msgstr "Choisissez _la partie à charger :"
-#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
-#: client/gui-gtk-2.0/pages.c:2451
+#: client/gui-gtk-2.0/pages.c:1846 client/gui-gtk-2.0/pages.c:2039
+#: client/gui-gtk-2.0/pages.c:2455
msgid "_Browse..."
msgstr "_Parcourir..."
-#: client/gui-gtk-2.0/pages.c:1911
+#: client/gui-gtk-2.0/pages.c:1913
msgid "Choose a Scenario"
msgstr "Choisissez un scénario"
-#: client/gui-gtk-2.0/pages.c:1998
+#: client/gui-gtk-2.0/pages.c:2000
msgid "Choose a _Scenario:"
msgstr "Choisissez un _scénario :"
-#: client/gui-gtk-2.0/pages.c:2173
+#: client/gui-gtk-2.0/pages.c:2175
msgid "Choose a _nation to play:"
msgstr "Choisissez une _nation à diriger :"
-#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2367 client/gui-win32/menu.c:581
msgid "Select Location to Save"
msgstr "Choisissez l'endroit où sauvegarder"
-#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2452 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "Sauvegarder la partie"
-#: client/gui-gtk-2.0/pages.c:2489
+#: client/gui-gtk-2.0/pages.c:2493
msgid "Saved _Games:"
msgstr "Parties sauve_gardées :"
-#: client/gui-gtk-2.0/pages.c:2516
+#: client/gui-gtk-2.0/pages.c:2520
msgid "Save _Filename:"
msgstr "Sauvegarder le _fichier :"
@@ -13323,7 +13478,7 @@ msgstr "Fermer le dialogue (Esc)"
msgid "Total users logged in : %d"
msgstr "Total des utilisateurs connectés : %d"
-#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1098
msgid "Back"
msgstr "Retour"
@@ -13332,7 +13487,7 @@ msgid "Start"
msgstr "Démarrer"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:777
+#: client/gui-win32/connectdlg.c:779
msgid "Load Game"
msgstr "Charger une partie"
@@ -13372,9 +13527,9 @@ msgstr "Se rattacher
#: client/gui-sdl/connectdlg.c:308 client/gui-sdl/connectdlg.c:617
#: client/gui-sdl/connectdlg.c:803 client/gui-sdl/connectdlg.c:985
#: client/gui-sdl/dialogs.c:452 client/gui-sdl/dialogs.c:2095
-#: client/gui-sdl/dialogs.c:2893 client/gui-sdl/diplomat_dialog.c:731
+#: client/gui-sdl/dialogs.c:2902 client/gui-sdl/diplomat_dialog.c:731
#: client/gui-sdl/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1043
#: client/gui-win32/dialogs.c:1772 client/gui-win32/finddlg.c:127
#: client/gui-win32/gotodlg.c:171 client/gui-win32/inputdlg.c:146
#: client/gui-win32/messagedlg.c:216 client/gui-win32/ratesdlg.c:328
@@ -13418,7 +13573,7 @@ msgid "Buy it?"
msgstr "L'acheter ?"
#: 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
+#: client/gui-sdl/diplodlg.c:1336 client/gui-sdl/diplomat_dialog.c:1211
#: client/gui-sdl/diplomat_dialog.c:1417 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:221 client/gui-sdl/repodlgs.c:1559
#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
@@ -13434,7 +13589,7 @@ msgid "No"
msgstr "Non"
#: client/gui-sdl/citydlg.c:1215 client/gui-sdl/cma_fe.c:318
-#: client/gui-sdl/diplodlg.c:1345 client/gui-sdl/diplomat_dialog.c:1200
+#: client/gui-sdl/diplodlg.c:1346 client/gui-sdl/diplomat_dialog.c:1200
#: client/gui-sdl/diplomat_dialog.c:1407 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:232 client/gui-win32/repodlgs.c:578
#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
@@ -13740,7 +13895,7 @@ msgstr "Serveur Freeciv :"
msgid "Port :"
msgstr "Port :"
-#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1100
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr "Se connecter"
@@ -13847,23 +14002,23 @@ msgstr "Choisissez votre nouveau gouvernement"
msgid "REVOLUTION!"
msgstr "RÉVOLUTION !"
-#: client/gui-sdl/dialogs.c:2232 client/gui-sdl/dialogs.c:2620
+#: client/gui-sdl/dialogs.c:2237 client/gui-sdl/dialogs.c:2625
#: client/gui-win32/dialogs.c:567 data/Freeciv.in:3159
msgid "Female"
msgstr "Une femme"
-#: client/gui-sdl/dialogs.c:2234 client/gui-sdl/dialogs.c:2618
-#: client/gui-sdl/dialogs.c:2830 client/gui-win32/dialogs.c:565
+#: client/gui-sdl/dialogs.c:2239 client/gui-sdl/dialogs.c:2623
+#: client/gui-sdl/dialogs.c:2839 client/gui-win32/dialogs.c:565
msgid "Male"
msgstr "Un homme"
-#: client/gui-sdl/dialogs.c:2478 client/gui-sdl/dialogs.c:2902
+#: client/gui-sdl/dialogs.c:2483 client/gui-sdl/dialogs.c:2911
#: 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 "OK"
-#: client/gui-sdl/dialogs.c:2685 client/gui-win32/dialogs.c:505
+#: client/gui-sdl/dialogs.c:2694 client/gui-win32/dialogs.c:505
msgid "What nation will you be?"
msgstr "Quelle nation voulez-vous être ?"
@@ -13890,53 +14045,53 @@ msgstr "Mappemonde"
msgid "Sea map"
msgstr "Carte des mers"
-#: client/gui-sdl/diplodlg.c:563
+#: client/gui-sdl/diplodlg.c:564
msgid "Give embassy"
msgstr "Donner une ambassade"
-#: client/gui-sdl/diplodlg.c:579 client/gui-win32/diplodlg.c:614
+#: client/gui-sdl/diplodlg.c:580 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 "De l'or (max %d)"
-#: client/gui-sdl/diplodlg.c:613 client/gui-sdl/helpdlg.c:1956
+#: client/gui-sdl/diplodlg.c:614 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 "Des découvertes"
-#: client/gui-sdl/diplodlg.c:831 client/gui-win32/diplodlg.c:598
+#: client/gui-sdl/diplodlg.c:832 client/gui-win32/diplodlg.c:598
#: data/Freeciv.in:269
msgid "Diplomacy meeting"
msgstr "Réunion diplomatique"
-#: client/gui-sdl/diplodlg.c:883 client/gui-win32/diplodlg.c:680
+#: client/gui-sdl/diplodlg.c:884 client/gui-win32/diplodlg.c:680
#: data/Freeciv.in:510
msgid "Cancel meeting"
msgstr "Annuler la réunion"
-#: client/gui-sdl/diplodlg.c:895 client/gui-win32/diplodlg.c:679
+#: client/gui-sdl/diplodlg.c:896 client/gui-win32/diplodlg.c:679
#: data/Freeciv.in:501
msgid "Accept treaty"
msgstr "Accepter le traité"
#. TRANS: "Polish incident !" FIXME!!!
-#: client/gui-sdl/diplodlg.c:1304
+#: client/gui-sdl/diplodlg.c:1305
#, c-format
msgid "%s incident !"
msgstr "Incident %s !"
-#: client/gui-sdl/diplodlg.c:1322
+#: client/gui-sdl/diplodlg.c:1323
msgid "Shall we declare WAR on them?"
msgstr "Devons-nous lui déclarer la guerre ?"
-#: client/gui-sdl/diplodlg.c:1433
+#: client/gui-sdl/diplodlg.c:1434
msgid "Foreign Minister"
msgstr "Ministre des Affaires étrangères"
-#: client/gui-sdl/diplodlg.c:1449
+#: client/gui-sdl/diplodlg.c:1450
#, c-format
msgid ""
"Sir!, the %s ambassador has arrived\n"
@@ -13945,24 +14100,24 @@ msgstr ""
"Sire, un ambassadeur de %s est arrivé\n"
"Quels sont vos souhaits ?"
-#: client/gui-sdl/diplodlg.c:1465
+#: client/gui-sdl/diplodlg.c:1466
msgid "Declare WAR"
msgstr "Déclarer la guerre"
-#: client/gui-sdl/diplodlg.c:1467 client/gui-win32/plrdlg.c:357
+#: client/gui-sdl/diplodlg.c:1468 client/gui-win32/plrdlg.c:357
msgid "Cancel Treaty"
msgstr "Annuler traité"
-#: client/gui-sdl/diplodlg.c:1490 client/gui-win32/plrdlg.c:358
+#: client/gui-sdl/diplodlg.c:1491 client/gui-win32/plrdlg.c:358
#: data/Freeciv.in:3254
msgid "Withdraw vision"
msgstr "Retirer la vue"
-#: client/gui-sdl/diplodlg.c:1507
+#: client/gui-sdl/diplodlg.c:1508
msgid "Call Diplomatic Meeting"
msgstr "Demande de réunion diplomatique"
-#: client/gui-sdl/diplodlg.c:1521
+#: client/gui-sdl/diplodlg.c:1522
msgid "Send him back"
msgstr "Le renvoyer"
@@ -14710,12 +14865,12 @@ msgid "Leave Game"
msgstr "Sauvegarder la partie"
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1100 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1102 client/gui-xaw/menu.c:121
#: data/Freeciv.in:115 data/Freeciv.in:3180
msgid "Quit"
msgstr "Quitter"
-#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:967
msgid "Start New Game"
msgstr "Démarrer une nouvelle partie"
@@ -14832,8 +14987,8 @@ msgstr "Revenu net : "
msgid "%s max rate : %d%%"
msgstr "%s taux maximum : %d%%"
-#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
-#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1085
+#: client/gui-win32/connectdlg.c:1093 data/Freeciv.in:155
msgid "Update"
msgstr "M.À.J."
@@ -15330,67 +15485,67 @@ msgstr "Nouveau"
msgid "Delete"
msgstr "Supprimer"
-#: client/gui-win32/connectdlg.c:147
+#: client/gui-win32/connectdlg.c:149
msgid "Password:"
msgstr "Mot de passe:"
-#: client/gui-win32/connectdlg.c:169
+#: client/gui-win32/connectdlg.c:171
msgid "Couldn't load the savegame"
msgstr "Impossible de charger le fichier de sauvegarde"
-#: client/gui-win32/connectdlg.c:284 client/gui-xaw/connectdlg.c:311
+#: client/gui-win32/connectdlg.c:286 client/gui-xaw/connectdlg.c:311
msgid "Verify Password"
msgstr "Vérification du mot de passe"
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:916 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr "Sélection du Serveur Freeciv"
-#: client/gui-win32/connectdlg.c:915
+#: client/gui-win32/connectdlg.c:917
msgid "Local Area Network"
msgstr "Réseau local"
-#: client/gui-win32/connectdlg.c:949
+#: client/gui-win32/connectdlg.c:951
msgid "Welcome to Freeciv"
msgstr "Bienvenue à Freeciv"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Load Saved Game"
msgstr "Charger une partie"
-#: client/gui-win32/connectdlg.c:969
+#: client/gui-win32/connectdlg.c:971
msgid "Connect To Network Game"
msgstr "Se connecter à une partie en réseau"
-#: client/gui-win32/connectdlg.c:979
+#: client/gui-win32/connectdlg.c:981
msgid "Choose a nation to play"
msgstr "Choisissez une nation à diriger"
-#: client/gui-win32/connectdlg.c:1014
+#: client/gui-win32/connectdlg.c:1016
msgid "Number of players (Including AI):"
msgstr "Nombre de joueurs (y compris IA) :"
-#: client/gui-win32/connectdlg.c:1022
+#: client/gui-win32/connectdlg.c:1024
msgid "AI skill level:"
msgstr "Niveau de l'IA :"
-#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1038 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr "Options du jeu"
-#: client/gui-win32/connectdlg.c:1040
+#: client/gui-win32/connectdlg.c:1042
msgid "Start Game"
msgstr "Démarrer la partie"
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Login:"
msgstr "Login:"
-#: client/gui-win32/connectdlg.c:1061
+#: client/gui-win32/connectdlg.c:1063
msgid "Host:"
msgstr "Hôte :"
-#: client/gui-win32/connectdlg.c:1062
+#: client/gui-win32/connectdlg.c:1064
msgid "Port:"
msgstr "Port :"
@@ -15472,21 +15627,21 @@ msgstr ""
"pas de support matériel pour les effets de transparence le rendu sera plus "
"lent."
-#: client/gui-win32/helpdlg.c:769 client/gui-win32/helpdlg.c:792
-#: client/gui-win32/helpdlg.c:803 client/gui-win32/helpdlg.c:809
-#: client/gui-win32/helpdlg.c:822
+#: client/gui-win32/helpdlg.c:775 client/gui-win32/helpdlg.c:798
+#: client/gui-win32/helpdlg.c:809 client/gui-win32/helpdlg.c:815
+#: client/gui-win32/helpdlg.c:828
msgid "Allows "
msgstr "Autorise "
-#: client/gui-win32/helpdlg.c:780
+#: client/gui-win32/helpdlg.c:786
msgid "Obsoletes "
msgstr "Rend obsolète "
-#: client/gui-win32/helpdlg.c:812 client/gui-win32/helpdlg.c:825
+#: client/gui-win32/helpdlg.c:818 client/gui-win32/helpdlg.c:831
msgid " (with "
msgstr " (avec "
-#: client/gui-win32/helpdlg.c:815 client/gui-win32/helpdlg.c:828
+#: client/gui-win32/helpdlg.c:821 client/gui-win32/helpdlg.c:834
msgid "?techhelp:)."
msgstr "?techhelp:)."
@@ -16615,11 +16770,12 @@ msgid " Present administrators: "
msgstr " Administrateurs actuels: "
#: 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/"
+" https://gna.org/projects/freeciv/"
msgstr ""
"Si vous trouvez un bogue, merci de nous le signaler. Le mieux est d'aller "
"visiter le site \"Freeciv Bug Tracking System\":\n"
@@ -19066,6 +19222,7 @@ msgid "Hydro Plant"
msgstr "Centrale hydroélectrique"
#: data/default/buildings.ruleset:378
+#, fuzzy
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 "
@@ -19073,47 +19230,43 @@ msgid ""
"a Factory, Mfg. Plant and Hydro Plant together give a 150% production "
"bonus.\n"
"\n"
-"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant. A city "
-"can only build a Hydro Plant if it is next to (or on) a Mountain or River "
-"tile."
+"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant."
msgstr ""
-"Réduit de 50% la quantité de pollution générée dans une ville. De plus, elle "
+"Réduit de 50% la quantité de pollution générée par une ville. De plus, elle "
"augmente la production des Usines et des Fabriques dans la ville : une "
-"Fabrique et une Centrale hydroélectrique donnent ensemble un bonus de 75%. "
-"Une Usine, une Fabrique et une Centrale hydroélectrique donnent ensemble un "
-"bonus de 150%.\n"
+"Fabrique et une Centrale donnent ensemble un bonus de 75%. Une Usine, une "
+"Fabrique et une Centrale donnent ensemble un bonus de 150%.\n"
"\n"
-"Une ville ne peut avoir qu'une seule Centrale hydroélectrique, électrique ou "
-"nucléaire. Une ville ne peut construire une centrale hydroélectrique que si "
-"elle est sur ou à proximité d'une montagne ou d'une rivière."
+"Une ville ne peut avoir qu'une seule centrale hydroélectrique, électrique, "
+"ou nucléaire."
-#: data/default/buildings.ruleset:397 data/civ2/buildings.ruleset:373
+#: data/default/buildings.ruleset:396 data/civ2/buildings.ruleset:373
#: data/civ1/buildings.ruleset:297
msgid "Library"
msgstr "Bibliothèque"
-#: data/default/buildings.ruleset:412
+#: data/default/buildings.ruleset:411
#, no-c-format
msgid "Increases the science output in a city by 100%."
msgstr "Augmente de 100% la recherche scientifique d'une ville."
-#: data/default/buildings.ruleset:417 data/civ2/buildings.ruleset:393
+#: data/default/buildings.ruleset:416 data/civ2/buildings.ruleset:393
#: data/civ1/buildings.ruleset:317
msgid "Marketplace"
msgstr "Marché"
-#: data/default/buildings.ruleset:432 data/civ2/buildings.ruleset:408
+#: data/default/buildings.ruleset:431 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 "Augmente de 50% les revenus de luxe et de taxe d'une ville."
-#: data/default/buildings.ruleset:437 data/civ2/buildings.ruleset:413
+#: data/default/buildings.ruleset:436 data/civ2/buildings.ruleset:413
#: data/civ1/buildings.ruleset:337
msgid "Mass Transit"
msgstr "Transports en commun"
-#: data/default/buildings.ruleset:451 data/civ2/buildings.ruleset:427
+#: data/default/buildings.ruleset:450 data/civ2/buildings.ruleset:427
#: data/civ1/buildings.ruleset:351
msgid ""
"Neutralizes the pollution generated by the population. The population "
@@ -19122,13 +19275,13 @@ msgstr ""
"Neutralise la pollution générée par la population. Celle-ci n'a tout "
"simplement plus d'effets sur la pollution générée dans la ville."
-#: data/default/buildings.ruleset:458 data/civ2/buildings.ruleset:434
+#: data/default/buildings.ruleset:457 data/civ2/buildings.ruleset:434
#: data/civ1/buildings.ruleset:358
msgid "Mfg. Plant"
msgstr "Usine"
# AR
-#: data/default/buildings.ruleset:474 data/civ2/buildings.ruleset:450
+#: data/default/buildings.ruleset:473 data/civ2/buildings.ruleset:450
#: data/civ1/buildings.ruleset:374
#, no-c-format
msgid ""
@@ -19137,12 +19290,12 @@ msgid ""
msgstr ""
"Avec une Fabrique, une Usine accroît de 100% la production d'une ville."
-#: data/default/buildings.ruleset:480 data/civ2/buildings.ruleset:456
+#: data/default/buildings.ruleset:479 data/civ2/buildings.ruleset:456
#: data/civ1/buildings.ruleset:380
msgid "Nuclear Plant"
msgstr "Centrale nucléaire"
-#: data/default/buildings.ruleset:495
+#: data/default/buildings.ruleset:494
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 "
@@ -19160,11 +19313,11 @@ msgstr ""
"Une ville ne peut avoir qu'une seule centrale hydroélectrique, électrique, "
"ou nucléaire."
-#: data/default/buildings.ruleset:515 data/civ2/buildings.ruleset:489
+#: data/default/buildings.ruleset:514 data/civ2/buildings.ruleset:489
msgid "Offshore Platform"
msgstr "Plate-forme Offshore"
-#: data/default/buildings.ruleset:530 data/civ2/buildings.ruleset:504
+#: data/default/buildings.ruleset:529 data/civ2/buildings.ruleset:504
msgid ""
"Adds 1 extra shield resource on all Ocean squares in a city. The city needs "
"to be coastal to build this improvement."
@@ -19173,12 +19326,12 @@ msgstr ""
"ville. La ville doit être côtière pour pouvoir construire ce bâtiment."
# AR
-#: data/default/buildings.ruleset:536 data/civ2/buildings.ruleset:510
+#: data/default/buildings.ruleset:535 data/civ2/buildings.ruleset:510
#: data/civ1/buildings.ruleset:411
msgid "Palace"
msgstr "Palais"
-#: data/default/buildings.ruleset:552
+#: data/default/buildings.ruleset:551
#, no-c-format
msgid ""
"Makes a city the capital and the center of your government. Corruption in "
@@ -19207,11 +19360,11 @@ msgstr ""
"En despotisme le palais donne un bonnus de +75% de production et sous le "
"monarchie de +50%."
-#: data/default/buildings.ruleset:569 data/civ2/buildings.ruleset:539
+#: data/default/buildings.ruleset:568 data/civ2/buildings.ruleset:539
msgid "Police Station"
msgstr "Commissariat"
-#: data/default/buildings.ruleset:583 data/civ2/buildings.ruleset:553
+#: data/default/buildings.ruleset:582 data/civ2/buildings.ruleset:553
msgid ""
"Reduces the unhappiness caused by military units outside the city by 2 under "
"Democracy and 1 under Republic. This improvement has no effect under other "
@@ -19221,12 +19374,12 @@ msgstr ""
"Démocratie ou par 1 sous une République. Ce bâtiment n'a aucun effet sous "
"les autres formes de gouvernement."
-#: data/default/buildings.ruleset:593 data/civ2/buildings.ruleset:560
+#: data/default/buildings.ruleset:592 data/civ2/buildings.ruleset:560
msgid "Port Facility"
msgstr "Service portuaire"
# AR
-#: data/default/buildings.ruleset:608 data/civ2/buildings.ruleset:575
+#: data/default/buildings.ruleset:607 data/civ2/buildings.ruleset:575
msgid ""
"Allows a city to build veteran sea units. Also, damaged sea units which "
"stay in town for one full turn without moving are completely restored."
@@ -19235,12 +19388,12 @@ msgstr ""
"unités maritimes endommagées qui restent dans la ville pendant un tour sont "
"complètement réparées."
-#: data/default/buildings.ruleset:615 data/civ2/buildings.ruleset:582
+#: data/default/buildings.ruleset:614 data/civ2/buildings.ruleset:582
#: data/civ1/buildings.ruleset:440
msgid "Power Plant"
msgstr "Centrale électrique"
-#: data/default/buildings.ruleset:631
+#: data/default/buildings.ruleset:630
#, no-c-format
msgid ""
"Increases the shield production of a Factory or Mfg. Plant in a city: a "
@@ -19258,12 +19411,12 @@ msgstr ""
"Une ville ne peut avoir qu'une seule centrale (hydroélectrique, électrique, "
"ou nucléaire)."
-#: data/default/buildings.ruleset:646 data/civ2/buildings.ruleset:610
+#: data/default/buildings.ruleset:645 data/civ2/buildings.ruleset:610
#: data/civ1/buildings.ruleset:468
msgid "Recycling Center"
msgstr "Usine de recyclage"
-#: data/default/buildings.ruleset:661 data/civ2/buildings.ruleset:625
+#: data/default/buildings.ruleset:660 data/civ2/buildings.ruleset:625
#: data/civ1/buildings.ruleset:483
#, no-c-format
msgid ""
@@ -19273,11 +19426,11 @@ msgstr ""
"Construire une Usine de recyclage permet de réduire de 66% la pollution "
"générée par la production dans une ville."
-#: data/default/buildings.ruleset:667 data/civ2/buildings.ruleset:631
+#: data/default/buildings.ruleset:666 data/civ2/buildings.ruleset:631
msgid "Research Lab"
msgstr "Laboratoire de recherche"
-#: data/default/buildings.ruleset:682
+#: data/default/buildings.ruleset:681
msgid ""
"Together with a Library, a Research Lab increases the science production of "
"a city by 200%. Together with a Library and a University, a Research Lab "
@@ -19287,11 +19440,11 @@ msgstr ""
"recherche scientifique d'une ville. Avec une bibliothèque et une université, "
"un laboratoire de recherche accroît la recherche dans une ville de 450%."
-#: data/default/buildings.ruleset:690 data/civ2/buildings.ruleset:654
+#: data/default/buildings.ruleset:689 data/civ2/buildings.ruleset:654
msgid "SAM Battery"
msgstr "Batterie SAM"
-#: data/default/buildings.ruleset:704 data/civ2/buildings.ruleset:668
+#: data/default/buildings.ruleset:703 data/civ2/buildings.ruleset:668
msgid ""
"Doubles the defense of all units inside the city when attacked by non-"
"nuclear air units."
@@ -19299,12 +19452,12 @@ msgstr ""
"Double la défense de toute unité à l'intérieur de la ville lorsqu'elle est "
"attaquée par une unité aérienne non nucléaire."
-#: data/default/buildings.ruleset:710 data/civ2/buildings.ruleset:674
+#: data/default/buildings.ruleset:709 data/civ2/buildings.ruleset:674
#: data/civ1/buildings.ruleset:489
msgid "SDI Defense"
msgstr "Défense SDI"
-#: data/default/buildings.ruleset:724 data/civ2/buildings.ruleset:688
+#: data/default/buildings.ruleset:723 data/civ2/buildings.ruleset:688
#: data/civ1/buildings.ruleset:503
msgid ""
"Protects a city from attacks from Nuclear units. Nuclear attacks simply "
@@ -19315,11 +19468,11 @@ msgstr ""
"nucléaires n'ont tout simplement aucun effet sur la ville. De plus, la "
"défense contre les missiles non nucléaires est doublée."
-#: data/default/buildings.ruleset:733 data/civ2/buildings.ruleset:697
+#: data/default/buildings.ruleset:732 data/civ2/buildings.ruleset:697
msgid "Sewer System"
msgstr "Égouts"
-#: data/default/buildings.ruleset:748 data/civ2/buildings.ruleset:712
+#: data/default/buildings.ruleset:747 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."
@@ -19327,12 +19480,12 @@ msgstr ""
"Permet à une ville de dépasser une taille de 12. Un aqueduc est d'abord "
"requis pour qu'une ville dépasse une taille de 8."
-#: data/default/buildings.ruleset:754 data/civ2/buildings.ruleset:749
+#: data/default/buildings.ruleset:753 data/civ2/buildings.ruleset:749
#: data/civ1/buildings.ruleset:512
msgid "Space Component"
msgstr "Composant spatial"
-#: data/default/buildings.ruleset:769 data/civ2/buildings.ruleset:763
+#: data/default/buildings.ruleset:768 data/civ2/buildings.ruleset:763
#: data/civ1/buildings.ruleset:526
msgid ""
"Space Components can be differentiated into Propulsion and Fuel Components. "
@@ -19349,12 +19502,12 @@ msgstr ""
"Avant de pouvoir construire un module, la merveille Programme Apollo doit "
"avoir été construite par un des joueurs."
-#: data/default/buildings.ruleset:779 data/civ2/buildings.ruleset:773
+#: data/default/buildings.ruleset:778 data/civ2/buildings.ruleset:773
#: data/civ1/buildings.ruleset:536
msgid "Space Module"
msgstr "Module spatial"
-#: data/default/buildings.ruleset:794 data/civ2/buildings.ruleset:787
+#: data/default/buildings.ruleset:793 data/civ2/buildings.ruleset:787
#: data/civ1/buildings.ruleset:550
msgid ""
"Space Modules are the most expensive parts of spaceships. There are three "
@@ -19389,12 +19542,12 @@ msgstr ""
"Avant de pouvoir construire un module, la merveille Programme Apollo doit "
"avoir été construite par un des joueurs."
-#: data/default/buildings.ruleset:813 data/civ2/buildings.ruleset:806
+#: data/default/buildings.ruleset:812 data/civ2/buildings.ruleset:806
#: data/civ1/buildings.ruleset:569
msgid "Space Structural"
msgstr "Structure spatiale"
-#: data/default/buildings.ruleset:828 data/civ2/buildings.ruleset:820
+#: data/default/buildings.ruleset:827 data/civ2/buildings.ruleset:820
#: data/civ1/buildings.ruleset:583
msgid ""
"Space Structurals form the base of your spaceship. All other spaceship "
@@ -19411,11 +19564,11 @@ msgstr ""
"Avant de pouvoir construire un module, la merveille Programme Apollo doit "
"avoir été construite par un des joueurs."
-#: data/default/buildings.ruleset:838 data/civ2/buildings.ruleset:830
+#: data/default/buildings.ruleset:837 data/civ2/buildings.ruleset:830
msgid "Stock Exchange"
msgstr "Bourse"
-#: data/default/buildings.ruleset:854 data/civ2/buildings.ruleset:846
+#: data/default/buildings.ruleset:853 data/civ2/buildings.ruleset:846
#, no-c-format
msgid ""
"Together with a Marketplace and a Bank, a Stock Exchange boosts tax and "
@@ -19424,12 +19577,12 @@ msgstr ""
"Après la construction d'un Marché et d'une Banque, une Bourse accroît de "
"150% les revenus du luxe et des taxes."
-#: data/default/buildings.ruleset:860 data/civ2/buildings.ruleset:852
+#: data/default/buildings.ruleset:859 data/civ2/buildings.ruleset:852
msgid "Super Highways"
msgstr "Autoroutes"
# AR
-#: data/default/buildings.ruleset:875 data/civ2/buildings.ruleset:867
+#: data/default/buildings.ruleset:874 data/civ2/buildings.ruleset:867
#, no-c-format
msgid ""
"Increases trade resources by 50% on all squares with roads or railroads."
@@ -19437,11 +19590,11 @@ msgstr ""
"Augmente de 50% la production de commerce des cases par lesquelles passe une "
"route ou un chemin de fer."
-#: data/default/buildings.ruleset:883 data/civ2/buildings.ruleset:873
+#: data/default/buildings.ruleset:882 data/civ2/buildings.ruleset:873
msgid "Supermarket"
msgstr "Supermarché"
-#: data/default/buildings.ruleset:898 data/civ2/buildings.ruleset:888
+#: data/default/buildings.ruleset:897 data/civ2/buildings.ruleset:888
#, no-c-format
msgid ""
"Increases the food resources by 50% on each farmland square which is being "
@@ -19452,12 +19605,12 @@ msgstr ""
"ville. Les carrés labourés sont ceux qui ont été irrigués une seconde fois."
# AR
-#: data/default/buildings.ruleset:905 data/civ2/buildings.ruleset:895
+#: data/default/buildings.ruleset:904 data/civ2/buildings.ruleset:895
#: data/civ1/buildings.ruleset:593
msgid "Temple"
msgstr "Temple"
-#: data/default/buildings.ruleset:919 data/civ2/buildings.ruleset:909
+#: data/default/buildings.ruleset:918 data/civ2/buildings.ruleset:909
#: data/civ1/buildings.ruleset:607
msgid ""
"Makes one unhappy citizen content. Both the Mysticism advance and the "
@@ -19468,13 +19621,13 @@ msgstr ""
"l'Oracle doublent cet effet. Ensemble, ce sont 4 habitants qui sont rendus "
"contents."
-#: data/default/buildings.ruleset:926 data/civ2/buildings.ruleset:916
+#: data/default/buildings.ruleset:925 data/civ2/buildings.ruleset:916
#: data/civ1/buildings.ruleset:614 data/default/techs.ruleset:742
#: data/civ2/techs.ruleset:727 data/civ1/techs.ruleset:723
msgid "University"
msgstr "Université"
-#: data/default/buildings.ruleset:942
+#: data/default/buildings.ruleset:941
#, no-c-format
msgid ""
"Together with a Library, a University increases the science production of a "
@@ -19483,12 +19636,12 @@ msgstr ""
"Après la construction d'une bibliothèque, une Université augmente de 250% la "
"recherche scientifique d'une ville."
-#: data/default/buildings.ruleset:948 data/civ2/buildings.ruleset:938
+#: data/default/buildings.ruleset:947 data/civ2/buildings.ruleset:938
#: data/civ1/buildings.ruleset:636
msgid "Apollo Program"
msgstr "Programme Apollo"
-#: data/default/buildings.ruleset:962 data/civ2/buildings.ruleset:952
+#: data/default/buildings.ruleset:961 data/civ2/buildings.ruleset:952
msgid ""
"Entire map becomes visible for the player who owns it. It allows all "
"players to start building spaceship parts (assuming they have researched the "
@@ -19499,11 +19652,11 @@ msgstr ""
"vaisseau spatial (en supposant qu'ils aient acquis la technologie "
"nécessaire)."
-#: data/default/buildings.ruleset:969 data/civ2/buildings.ruleset:959
+#: data/default/buildings.ruleset:968 data/civ2/buildings.ruleset:959
msgid "A.Smith's Trading Co."
msgstr "Société de commerce de A. Smith"
-#: data/default/buildings.ruleset:983
+#: data/default/buildings.ruleset:982
msgid ""
"City improvements which would normally have an upkeep of 1 are free of "
"upkeep, for all your cities."
@@ -19511,12 +19664,12 @@ msgstr ""
"Les bâtiments qui ont normalement un coût d'entretien de 1 sont entretenus "
"gratuitement pour toutes les villes."
-#: data/default/buildings.ruleset:989 data/civ2/buildings.ruleset:979
+#: data/default/buildings.ruleset:988 data/civ2/buildings.ruleset:979
#: data/civ1/buildings.ruleset:655
msgid "Colossus"
msgstr "Colosse"
-#: data/default/buildings.ruleset:1003 data/civ2/buildings.ruleset:993
+#: data/default/buildings.ruleset:1002 data/civ2/buildings.ruleset:993
#: data/civ1/buildings.ruleset:669
msgid ""
"Each square around the city where this wonder is built that is already "
@@ -19525,24 +19678,24 @@ msgstr ""
"Chaque case autour de la ville qui a construit cette merveille produit une "
"ressource de commerce en plus (pour les cases produisant déjà du commerce)."
-#: data/default/buildings.ruleset:1009 data/civ2/buildings.ruleset:999
+#: data/default/buildings.ruleset:1008 data/civ2/buildings.ruleset:999
#: data/civ1/buildings.ruleset:675
msgid "Copernicus' Observatory"
msgstr "Observatoire de Copernic"
-#: data/default/buildings.ruleset:1024 data/civ2/buildings.ruleset:1180
+#: data/default/buildings.ruleset:1023 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 ""
"Accroît la recherche scientifique de 100% dans la ville où il est construit."
-#: data/default/buildings.ruleset:1029 data/civ2/buildings.ruleset:1019
+#: data/default/buildings.ruleset:1028 data/civ2/buildings.ruleset:1019
#: data/civ1/buildings.ruleset:695
msgid "Cure For Cancer"
msgstr "Guérison du cancer"
-#: data/default/buildings.ruleset:1043
+#: data/default/buildings.ruleset:1042
msgid ""
"This stunning technological achievement makes one unhappy citizen content in "
"all your cities."
@@ -19550,12 +19703,12 @@ msgstr ""
"Cette réussite technologique sensationnelle rend rend heureux un habitant "
"mécontent dans toutes les villes."
-#: data/default/buildings.ruleset:1051 data/civ2/buildings.ruleset:1039
+#: data/default/buildings.ruleset:1050 data/civ2/buildings.ruleset:1039
#: data/civ1/buildings.ruleset:715
msgid "Darwin's Voyage"
msgstr "Voyage de Darwin"
-#: data/default/buildings.ruleset:1065 data/civ2/buildings.ruleset:1053
+#: data/default/buildings.ruleset:1064 data/civ2/buildings.ruleset:1053
#: data/civ1/buildings.ruleset:729
msgid ""
"Charles Darwin's voyage sparked the discovery of the evolution of the "
@@ -19566,11 +19719,11 @@ msgstr ""
"des espèces, qui à inspiré une plus grande confiance dans la science. Donne "
"immédiatement deux découvertes."
-#: data/default/buildings.ruleset:1072 data/civ2/buildings.ruleset:1060
+#: data/default/buildings.ruleset:1071 data/civ2/buildings.ruleset:1060
msgid "Eiffel Tower"
msgstr "Tour Eiffel"
-#: data/default/buildings.ruleset:1087
+#: data/default/buildings.ruleset:1086
#, fuzzy, no-c-format
msgid ""
"Your reputation and goodwill among other nations is recovered twice as fast."
@@ -19579,12 +19732,12 @@ msgstr ""
"vous possédez cette merveille. La réputation est récupérée deux fois plus "
"vite qu'elle le serait autrement."
-#: data/default/buildings.ruleset:1093 data/civ2/buildings.ruleset:1081
+#: data/default/buildings.ruleset:1092 data/civ2/buildings.ruleset:1081
#: data/civ1/buildings.ruleset:736
msgid "Great Library"
msgstr "Grande Bibliothèque"
-#: data/default/buildings.ruleset:1107 data/civ2/buildings.ruleset:1095
+#: data/default/buildings.ruleset:1106 data/civ2/buildings.ruleset:1095
#: data/civ1/buildings.ruleset:750
msgid ""
"The civilization which builds the Great Library gets every advance that at "
@@ -19593,21 +19746,21 @@ msgstr ""
"Le peuple qui construit la Grande Bibliothèque acquiert toutes les "
"découvertes qu'au moins deux autres peuples ont déjà obtenues."
-#: data/default/buildings.ruleset:1113 data/civ2/buildings.ruleset:1101
+#: data/default/buildings.ruleset:1112 data/civ2/buildings.ruleset:1101
#: data/civ1/buildings.ruleset:756
msgid "Great Wall"
msgstr "Grande Muraille"
-#: data/default/buildings.ruleset:1127
+#: data/default/buildings.ruleset:1126
msgid "Works as a City Wall in all your cities."
msgstr "Équivaut à avoir des remparts dans toutes les villes."
-#: data/default/buildings.ruleset:1135 data/civ2/buildings.ruleset:1122
+#: data/default/buildings.ruleset:1134 data/civ2/buildings.ruleset:1122
#: data/civ1/buildings.ruleset:777
msgid "Hanging Gardens"
msgstr "Jardins Suspendus"
-#: data/default/buildings.ruleset:1149 data/civ2/buildings.ruleset:1136
+#: data/default/buildings.ruleset:1148 data/civ2/buildings.ruleset:1136
#: data/civ1/buildings.ruleset:791
msgid ""
"Makes one content citizen happy in every city. Makes two extra content "
@@ -19622,12 +19775,12 @@ msgstr ""
"bénéficier des effets des Jardins Suspendus, cette merveille agit sur les "
"habitants mécontents (les rendant contents)."
-#: data/default/buildings.ruleset:1158 data/civ2/buildings.ruleset:1145
+#: data/default/buildings.ruleset:1157 data/civ2/buildings.ruleset:1145
#: data/civ1/buildings.ruleset:800
msgid "Hoover Dam"
msgstr "Barrage Hoover"
-#: data/default/buildings.ruleset:1173 data/civ2/buildings.ruleset:1159
+#: data/default/buildings.ruleset:1172 data/civ2/buildings.ruleset:1159
msgid ""
"Works as if you had a Hydro Plant in every city. (This reduces pollution "
"and increases the effects of Factories and Mfg. Plants.)"
@@ -19635,12 +19788,12 @@ msgstr ""
"Équivaut à avoir une centrale hydroélectrique dans chaque ville (réduit la "
"pollution et accroît les effets des Usines et des Fabriques)."
-#: data/default/buildings.ruleset:1179 data/civ2/buildings.ruleset:1165
+#: data/default/buildings.ruleset:1178 data/civ2/buildings.ruleset:1165
#: data/civ1/buildings.ruleset:822
msgid "Isaac Newton's College"
msgstr "Collège Isaac Newton"
-#: data/default/buildings.ruleset:1194
+#: data/default/buildings.ruleset:1193
#, no-c-format
msgid ""
"Boosts science production by 100% in every city you control that has a "
@@ -19649,21 +19802,21 @@ msgstr ""
"Accroît la recherche scientifique de 100% dans chaque ville équipée d'une "
"université."
-#: data/default/buildings.ruleset:1200 data/civ2/buildings.ruleset:1185
+#: data/default/buildings.ruleset:1199 data/civ2/buildings.ruleset:1185
#: data/civ1/buildings.ruleset:842
msgid "J.S. Bach's Cathedral"
msgstr "Cathédrale J.S. Bach"
-#: data/default/buildings.ruleset:1214 data/civ2/buildings.ruleset:1199
+#: data/default/buildings.ruleset:1213 data/civ2/buildings.ruleset:1199
msgid "Makes two unhappy citizens content in every city."
msgstr ""
"Transforme deux citoyens mécontents de chaque ville en citoyens contents ."
-#: data/default/buildings.ruleset:1219 data/civ2/buildings.ruleset:1204
+#: data/default/buildings.ruleset:1218 data/civ2/buildings.ruleset:1204
msgid "King Richard's Crusade"
msgstr "Croisade du roi Richard"
-#: data/default/buildings.ruleset:1233 data/civ2/buildings.ruleset:1218
+#: data/default/buildings.ruleset:1232 data/civ2/buildings.ruleset:1218
msgid ""
"Adds one extra shield resource on every square around the city where it is "
"built."
@@ -19671,20 +19824,20 @@ msgstr ""
"Ajoute une production dans chaque case autour de la ville où il a été "
"construit."
-#: data/default/buildings.ruleset:1239 data/civ2/buildings.ruleset:1224
+#: data/default/buildings.ruleset:1238 data/civ2/buildings.ruleset:1224
msgid "Leonardo's Workshop"
msgstr "Atelier de Léonard"
-#: data/default/buildings.ruleset:1253 data/civ2/buildings.ruleset:1238
+#: data/default/buildings.ruleset:1252 data/civ2/buildings.ruleset:1238
msgid "Upgrades one obsolete unit per game turn."
msgstr "Met à jour une unité devenue obsolète à chaque tour."
-#: data/default/buildings.ruleset:1258 data/civ2/buildings.ruleset:1243
+#: data/default/buildings.ruleset:1257 data/civ2/buildings.ruleset:1243
#: data/civ1/buildings.ruleset:862
msgid "Lighthouse"
msgstr "Phare"
-#: data/default/buildings.ruleset:1273
+#: data/default/buildings.ruleset:1272
msgid ""
"Gives all your sea units 1 additional movement point and eliminates the risk "
"of losing Triremes on the high seas. Makes all your new sea units veterans "
@@ -19694,34 +19847,34 @@ msgstr ""
"le risque de perdre les Trirèmes en pleine mer. Rend chaque nouvelle unité "
"marine vétérante (pour toutes les villes)."
-#: data/default/buildings.ruleset:1280 data/civ2/buildings.ruleset:1264
+#: data/default/buildings.ruleset:1279 data/civ2/buildings.ruleset:1264
#: data/civ1/buildings.ruleset:885
msgid "Magellan's Expedition"
msgstr "Expédition de Magellan"
-#: data/default/buildings.ruleset:1295
+#: data/default/buildings.ruleset:1294
msgid "Gives all your sea units 2 additional movement points."
msgstr "Donne à chaque unité marine 2 points de mouvement supplémentaires."
-#: data/default/buildings.ruleset:1300 data/civ2/buildings.ruleset:1283
+#: data/default/buildings.ruleset:1299 data/civ2/buildings.ruleset:1283
#: data/civ1/buildings.ruleset:904
msgid "Manhattan Project"
msgstr "Projet Manhattan"
-#: data/default/buildings.ruleset:1318 data/civ2/buildings.ruleset:1301
+#: data/default/buildings.ruleset:1317 data/civ2/buildings.ruleset:1301
msgid "Marco Polo's Embassy"
msgstr "Ambassade de Marco Polo"
-#: data/default/buildings.ruleset:1332 data/civ2/buildings.ruleset:1315
+#: data/default/buildings.ruleset:1331 data/civ2/buildings.ruleset:1315
msgid "The player who owns it gets an embassy with all players."
msgstr "Le joueur qui la possède obtient une ambassade chez tous les joueurs."
-#: data/default/buildings.ruleset:1337 data/civ2/buildings.ruleset:1320
+#: data/default/buildings.ruleset:1336 data/civ2/buildings.ruleset:1320
#: data/civ1/buildings.ruleset:922
msgid "Michelangelo's Chapel"
msgstr "Chapelle Michel-Ange"
-#: data/default/buildings.ruleset:1351 data/civ2/buildings.ruleset:1334
+#: data/default/buildings.ruleset:1350 data/civ2/buildings.ruleset:1334
msgid ""
"Counts as having a Cathedral in each of your cities. This makes 3 unhappy "
"citizens content in each city. The discovery of Theology increases the "
@@ -19735,22 +19888,22 @@ msgstr ""
"découverte du Communisme atténue l'effet d'une Cathédrale, en réduisant de "
"un le nombre de citoyens mécontents rendus contents."
-#: data/default/buildings.ruleset:1361 data/civ2/buildings.ruleset:1344
+#: data/default/buildings.ruleset:1360 data/civ2/buildings.ruleset:1344
#: data/civ1/buildings.ruleset:941
msgid "Oracle"
msgstr "Oracle"
-#: data/default/buildings.ruleset:1375
+#: data/default/buildings.ruleset:1374
msgid "Makes two of your unhappy citizens content in every city with a temple."
msgstr ""
"Rend content deux citoyens mécontents dans chaque ville avec un temple."
-#: data/default/buildings.ruleset:1380 data/civ2/buildings.ruleset:1363
+#: data/default/buildings.ruleset:1379 data/civ2/buildings.ruleset:1363
#: data/civ1/buildings.ruleset:960
msgid "Pyramids"
msgstr "Pyramides"
-#: data/default/buildings.ruleset:1394
+#: data/default/buildings.ruleset:1393
msgid ""
"The amount of stored food lost when one of your cities grows or shrinks is "
"reduced by 25%. This helps a city to grow faster and more easily withstand "
@@ -19760,34 +19913,34 @@ msgstr ""
"serra réduite de 25%. Cela aide les villes à grandir plus rapidement et à "
"mieux résister aux famines. Effet cumulatif avec les greniers."
-#: data/default/buildings.ruleset:1401 data/civ2/buildings.ruleset:1382
+#: data/default/buildings.ruleset:1400 data/civ2/buildings.ruleset:1382
#: data/civ1/buildings.ruleset:981
msgid "SETI Program"
msgstr "Programme SETI"
-#: data/default/buildings.ruleset:1415
+#: data/default/buildings.ruleset:1414
msgid "Boosts science production in each city with a Research Lab by 100%. "
msgstr ""
"Augmente la production de science de 100% dans chaque ville avec un "
"laboratoire de recherche. "
-#: data/default/buildings.ruleset:1420 data/civ2/buildings.ruleset:1402
+#: data/default/buildings.ruleset:1419 data/civ2/buildings.ruleset:1402
#: data/civ1/buildings.ruleset:1001
msgid "Shakespeare's Theatre"
msgstr "Théatre Shakespeare"
-#: data/default/buildings.ruleset:1434 data/civ2/buildings.ruleset:1416
+#: data/default/buildings.ruleset:1433 data/civ2/buildings.ruleset:1416
#: data/civ1/buildings.ruleset:1015
msgid "Makes all unhappy citizens content, in the city where it is located."
msgstr ""
"Rend contents tous les habitants mécontents de la ville dans laquelle il est "
"situé."
-#: data/default/buildings.ruleset:1439 data/civ2/buildings.ruleset:1421
+#: data/default/buildings.ruleset:1438 data/civ2/buildings.ruleset:1421
msgid "Statue of Liberty"
msgstr "Statue de la Liberté"
-#: data/default/buildings.ruleset:1453 data/civ2/buildings.ruleset:1435
+#: data/default/buildings.ruleset:1452 data/civ2/buildings.ruleset:1435
#: data/civ1/buildings.ruleset:974 data/civ1/buildings.ruleset:1034
msgid ""
"Allows you to choose any government, including those that have not yet been "
@@ -19798,11 +19951,11 @@ msgstr ""
"encore été trouvés par votre peuple, et ce, sans la période d'Anarchie de "
"transition."
-#: data/default/buildings.ruleset:1460 data/civ2/buildings.ruleset:1442
+#: data/default/buildings.ruleset:1459 data/civ2/buildings.ruleset:1442
msgid "Sun Tzu's War Academy"
msgstr "École de guerre Sun Tzu"
-#: data/default/buildings.ruleset:1474
+#: data/default/buildings.ruleset:1473
msgid ""
"All your new ground units start at the first veteran level. The chance of a "
"unit getting the next veteran level after a battle increases by half."
@@ -19811,22 +19964,22 @@ msgstr ""
"vétérans (pour toutes les villes). Les chances pour une unité d'atteindre le "
"prochain niveau après une bataille augmentent de 50%."
-#: data/default/buildings.ruleset:1481 data/civ2/buildings.ruleset:1463
+#: data/default/buildings.ruleset:1480 data/civ2/buildings.ruleset:1463
#: data/civ1/buildings.ruleset:1020
msgid "United Nations"
msgstr "Nations Unies"
-#: data/default/buildings.ruleset:1495
+#: data/default/buildings.ruleset:1494
msgid "All your units regain two extra hitpoints per turn."
msgstr ""
"Toutes les unités regagnent deux points de vie supplémentaires par tour."
-#: data/default/buildings.ruleset:1508 data/civ2/buildings.ruleset:1490
+#: data/default/buildings.ruleset:1507 data/civ2/buildings.ruleset:1490
#: data/civ1/buildings.ruleset:1046
msgid "Women's Suffrage"
msgstr "Vote des femmes"
-#: data/default/buildings.ruleset:1522 data/civ2/buildings.ruleset:1504
+#: data/default/buildings.ruleset:1521 data/civ2/buildings.ruleset:1504
msgid ""
"Counts as a Police Station in every city. (That is, for each city, reduces "
"unhappiness for military units outside the city by 2 under Democracy and 1 "
@@ -19837,11 +19990,11 @@ msgstr ""
"diminué de 2 sous une Démocratie, et de 1 sous une République. Cette "
"merveille n'a pas d'effet sous les autres gouvernements.)"
-#: data/default/buildings.ruleset:1533
+#: data/default/buildings.ruleset:1532
msgid "Coinage"
msgstr "Capitalisation"
-#: data/default/buildings.ruleset:1554
+#: data/default/buildings.ruleset:1553
msgid ""
"This is not a normal improvement. Instead, setting a city's production to "
"Coinage means its shield production is converted to tax output (money, "
@@ -20286,11 +20439,16 @@ msgstr "?citystyle:Celtique"
msgid "?citystyle:Industrial"
msgstr "?citystyle:Industriel"
-#: data/default/cities.ruleset:139 data/civ2/cities.ruleset:150
+#: data/default/cities.ruleset:139
+#, fuzzy
+msgid "?citystyle:ElectricAge"
+msgstr "?citystyle:Celtique"
+
+#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:150
msgid "?citystyle:Modern"
msgstr "?citystyle:Moderne"
-#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:161
+#: data/default/cities.ruleset:161 data/civ2/cities.ruleset:161
msgid "?citystyle:PostModern"
msgstr "?citystyle:Post moderne"
@@ -26082,6 +26240,48 @@ msgstr "
msgid "Team 31"
msgstr "Équipe 31"
+#~ 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."
+
+#~ msgid "Observers cannot vote."
+#~ msgstr "Les observateurs ne peuvent pas voter."
+
+#~ msgid ""
+#~ "You can only vote in a running game. Use 'first' to become the game "
+#~ "organizer if there currently is none."
+#~ 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."
+
+#~ msgid "Vote %d \"%s\": %d for, %d against"
+#~ msgstr "Vote %d \"%s\" : %d pour, %d contre"
+
+#~ msgid "Value must be integer."
+#~ msgstr "La valeur doit être un entier."
+
+#~ 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 Hydro Plant, Power Plant, or Nuclear Plant. A "
+#~ "city can only build a Hydro Plant if it is next to (or on) a Mountain or "
+#~ "River tile."
+#~ msgstr ""
+#~ "Réduit de 50% la quantité de pollution générée dans une ville. De plus, "
+#~ "elle augmente la production des Usines et des Fabriques dans la ville : "
+#~ "une Fabrique et une Centrale hydroélectrique donnent ensemble un bonus de "
+#~ "75%. Une Usine, une Fabrique et une Centrale hydroélectrique donnent "
+#~ "ensemble un bonus de 150%.\n"
+#~ "\n"
+#~ "Une ville ne peut avoir qu'une seule Centrale hydroélectrique, électrique "
+#~ "ou nucléaire. Une ville ne peut construire une centrale hydroélectrique "
+#~ "que si elle est sur ou à proximité d'une montagne ou d'une rivière."
+
#~ msgid "Auth config filename \"%s\" not allowed!"
#~ msgstr ""
#~ "Nom de fichier de configuration de l'authentification \"%s\" non "
diff --git a/po/freeciv.pot b/po/freeciv.pot
index b86b388..a50b38b 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: 2009-03-29 21:13+0900\n"
+"POT-Creation-Date: 2009-11-22 21:37+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -64,21 +64,21 @@ msgstr ""
msgid "?redundant:*"
msgstr ""
-#: common/connection.c:515
+#: common/connection.c:518
#, c-format
msgid "%s from %s"
msgstr ""
-#: common/connection.c:521
+#: common/connection.c:524
msgid " (connection incomplete)"
msgstr ""
-#: common/connection.c:525
+#: common/connection.c:528
#, c-format
msgid " (player %s)"
msgstr ""
-#: common/connection.c:529
+#: common/connection.c:532
msgid " (observer)"
msgstr ""
@@ -482,81 +482,81 @@ msgstr ""
msgid "AI Debug messages"
msgstr ""
-#: common/player.c:732
+#: common/player.c:746
msgid "?attitude:Genocidal"
msgstr ""
-#: common/player.c:734
+#: common/player.c:748
msgid "?attitude:Belligerent"
msgstr ""
-#: common/player.c:736
+#: common/player.c:750
msgid "?attitude:Hostile"
msgstr ""
-#: common/player.c:738
+#: common/player.c:752
msgid "?attitude:Uncooperative"
msgstr ""
-#: common/player.c:740
+#: common/player.c:754
msgid "?attitude:Uneasy"
msgstr ""
-#: common/player.c:742
+#: common/player.c:756
msgid "?attitude:Neutral"
msgstr ""
-#: common/player.c:744
+#: common/player.c:758
msgid "?attitude:Respectful"
msgstr ""
-#: common/player.c:746
+#: common/player.c:760
msgid "?attitude:Helpful"
msgstr ""
-#: common/player.c:748
+#: common/player.c:762
msgid "?attitude:Enthusiastic"
msgstr ""
-#: common/player.c:750
+#: common/player.c:764
msgid "?attitude:Admiring"
msgstr ""
-#: common/player.c:753
+#: common/player.c:767
msgid "?attitude:Worshipful"
msgstr ""
-#: common/player.c:764
+#: common/player.c:778
msgid "?diplomatic_state:Armistice"
msgstr ""
-#: common/player.c:765
+#: common/player.c:779
msgid "?diplomatic_state:War"
msgstr ""
-#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:780 client/gui-gtk-2.0/diplodlg.c:353
#: 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:767 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:781 client/gui-gtk-2.0/diplodlg.c:358
#: 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:768 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:782 client/gui-gtk-2.0/diplodlg.c:363
#: 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:769
+#: common/player.c:783
msgid "?diplomatic_state:Never met"
msgstr ""
-#: common/player.c:770
+#: common/player.c:784
msgid "?diplomatic_state:Team"
msgstr ""
@@ -587,7 +587,7 @@ msgstr ""
#. TRANS: "Resources: (none)".
#: common/requirements.c:1014 common/team.c:132
#: client/gui-gtk-2.0/helpdlg.c:1055 client/gui-gtk-2.0/inteldlg.c:390
-#: client/gui-win32/helpdlg.c:586 client/gui-xaw/helpdlg.c:991
+#: client/gui-win32/helpdlg.c:592 client/gui-xaw/helpdlg.c:991
#, c-format
msgid "(none)"
msgstr ""
@@ -613,10 +613,11 @@ msgstr ""
#: 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
#: client/gui-sdl/helpdlg.c:817 client/gui-sdl/mapview.c:962
-#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:545
-#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:735
-#: 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
+#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:544
+#: client/gui-win32/helpdlg.c:551 client/gui-win32/helpdlg.c:721
+#: client/gui-win32/helpdlg.c:741 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 ""
@@ -629,29 +630,29 @@ msgstr ""
msgid "(Unknown)"
msgstr ""
-#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:553
#: manual/civmanual.c:224
msgid "Road"
msgstr ""
-#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:557
#: client/gui-gtk-2.0/menu.c:829 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:394 common/terrain.c:572 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:567
#: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
#: data/civ1/techs.ruleset:563
msgid "Railroad"
msgstr ""
-#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:555
msgid "Mine"
msgstr ""
-#: common/terrain.c:396 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:551 server/report.c:124
#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr ""
@@ -660,7 +661,7 @@ msgstr ""
msgid "Hut"
msgstr ""
-#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:563
#: manual/civmanual.c:226
msgid "Fortress"
msgstr ""
@@ -673,81 +674,81 @@ msgstr ""
msgid "Farmland"
msgstr ""
-#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:577
#: manual/civmanual.c:226
msgid "Airbase"
msgstr ""
-#: common/terrain.c:402 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:579
msgid "Fallout"
msgstr ""
-#: common/unit.c:546 client/gui-win32/plrdlg.c:337
+#: common/unit.c:549 client/gui-win32/plrdlg.c:337
msgid "Idle"
msgstr ""
-#: common/unit.c:556
+#: common/unit.c:559
msgid "Fortifying"
msgstr ""
-#: common/unit.c:558
+#: common/unit.c:561
msgid "Fortified"
msgstr ""
-#: common/unit.c:562 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
+#: common/unit.c:565 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
msgid "Sentry"
msgstr ""
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
+#: common/unit.c:569 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
#: client/gui-win32/menu.c:370 client/gui-xaw/menu.c:185
msgid "Pillage"
msgstr ""
-#: common/unit.c:568 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
+#: common/unit.c:571 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
msgid "Goto"
msgstr ""
-#: common/unit.c:570
+#: common/unit.c:573
msgid "Explore"
msgstr ""
-#: common/unit.c:572 manual/civmanual.c:224
+#: common/unit.c:575 manual/civmanual.c:224
msgid "Transform"
msgstr ""
-#: common/unit.c:584 client/text.c:157 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:587 client/text.c:157 client/gui-sdl/citydlg.c:1972
#: client/gui-win32/citydlg.c:1257 client/gui-xaw/citydlg.c:1423
msgid "Unknown"
msgstr ""
-#: common/unit.c:1022
+#: common/unit.c:1025
msgid "Moves"
msgstr ""
-#: common/unit.c:1571
+#: common/unit.c:1574
#, c-format
msgid ""
"Upgrade %s to %s for %d gold?\n"
"Treasury contains %d gold."
msgstr ""
-#: common/unit.c:1579
+#: common/unit.c:1582
#, c-format
msgid "Sorry, cannot upgrade %s (yet)."
msgstr ""
-#: common/unit.c:1585
+#: common/unit.c:1588
#, c-format
msgid ""
"Upgrading %s to %s costs %d gold.\n"
"Treasury contains %d gold."
msgstr ""
-#: common/unit.c:1594
+#: common/unit.c:1597
msgid "You can only upgrade units in your cities."
msgstr ""
-#: common/unit.c:1598
+#: common/unit.c:1601
#, c-format
msgid "Upgrading this %s would strand units it transports."
msgstr ""
@@ -780,11 +781,11 @@ msgstr ""
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1404
+#: common/unittype.c:349 client/helpdata.c:1412
msgid " and "
msgstr ""
-#: common/unittype.c:355 client/helpdata.c:1390
+#: common/unittype.c:355 client/helpdata.c:1398
msgid "?and:, "
msgstr ""
@@ -945,69 +946,69 @@ msgstr ""
msgid "Missing argument for \"%s\".\n"
msgstr ""
-#: utility/shared.c:501
+#: utility/shared.c:514
#, c-format
msgid "%d BC"
msgstr ""
-#: utility/shared.c:503
+#: utility/shared.c:516
#, c-format
msgid "%d AD"
msgstr ""
-#: utility/shared.c:924
+#: utility/shared.c:937
msgid "FREECIV_PATH is set but empty; using default path instead."
msgstr ""
-#: utility/shared.c:1028
+#: utility/shared.c:1041
#, c-format
msgid "Could not read data directory %s: %s."
msgstr ""
-#: utility/shared.c:1279
+#: utility/shared.c:1292
msgid "The data path may be set via the environment variable FREECIV_PATH."
msgstr ""
-#: utility/shared.c:1281
+#: utility/shared.c:1294
#, c-format
msgid "Current data path is: \"%s\""
msgstr ""
-#: utility/shared.c:1283
+#: utility/shared.c:1296
#, c-format
msgid "The \"%s\" file is required ... aborting!"
msgstr ""
-#: utility/shared.c:1460
+#: utility/shared.c:1485
#, c-format
msgid "%s: Fatal error: you're trying to run me as superuser!\n"
msgstr ""
-#: utility/shared.c:1462
+#: utility/shared.c:1487
msgid "Use a non-privileged account instead.\n"
msgstr ""
-#: utility/shared.c:1478
+#: utility/shared.c:1503
msgid "exact match"
msgstr ""
-#: utility/shared.c:1479
+#: utility/shared.c:1504
msgid "only match"
msgstr ""
-#: utility/shared.c:1480
+#: utility/shared.c:1505
msgid "ambiguous"
msgstr ""
-#: utility/shared.c:1481
+#: utility/shared.c:1506
msgid "empty"
msgstr ""
-#: utility/shared.c:1482
+#: utility/shared.c:1507
msgid "too long"
msgstr ""
-#: utility/shared.c:1483
+#: utility/shared.c:1508
msgid "non-match"
msgstr ""
@@ -1036,108 +1037,108 @@ msgstr ""
msgid "%s is selling %s (not needed) for %d."
msgstr ""
-#: ai/advdiplomacy.c:280
+#: ai/advdiplomacy.c:300
#, c-format
msgid "*%s (AI)* In away mode AI can't sign such a treaty."
msgstr ""
-#: ai/advdiplomacy.c:290
+#: ai/advdiplomacy.c:310
#, c-format
msgid "*%s (AI)* First break alliance with %s, %s."
msgstr ""
-#: ai/advdiplomacy.c:303
+#: ai/advdiplomacy.c:322
#, c-format
msgid "*%s (AI)* Let us first cease hostilies, %s."
msgstr ""
-#: ai/advdiplomacy.c:308
+#: ai/advdiplomacy.c:327
#, c-format
msgid ""
"*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
"first, %s."
msgstr ""
-#: ai/advdiplomacy.c:331
+#: ai/advdiplomacy.c:350
#, c-format
msgid "*%s (AI)* I simply do not trust you with an alliance yet, %s."
msgstr ""
-#: ai/advdiplomacy.c:424
+#: ai/advdiplomacy.c:443
#, c-format
msgid "*%s (AI)* I do not know the city you mention."
msgstr ""
-#: ai/advdiplomacy.c:454
+#: ai/advdiplomacy.c:473
#, c-format
msgid "*%s (AI)* Sorry, sharing vision with you is not safe."
msgstr ""
-#: ai/advdiplomacy.c:560
+#: ai/advdiplomacy.c:579
#, c-format
msgid "*%s (AI)* This deal was not very good for us, %s!"
msgstr ""
-#: ai/advdiplomacy.c:582
+#: ai/advdiplomacy.c:601
#, c-format
msgid "*%s (AI)* Welcome into our alliance %s!"
msgstr ""
-#: ai/advdiplomacy.c:586
+#: ai/advdiplomacy.c:605
#, c-format
msgid "*%s (AI)* Yes, may we forever stand united, %s."
msgstr ""
-#: ai/advdiplomacy.c:593
+#: ai/advdiplomacy.c:612
#, c-format
msgid "*%s (AI)* Yes, peace in our time!"
msgstr ""
-#: ai/advdiplomacy.c:598
+#: ai/advdiplomacy.c:617
#, c-format
msgid "*%s (AI)* Agreed. No more hostilities, %s."
msgstr ""
-#: ai/advdiplomacy.c:813
+#: ai/advdiplomacy.c:832
#, c-format
msgid ""
"*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
"other better?"
msgstr ""
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1116
#, c-format
msgid "*%s (AI)* Space will never be yours. "
msgstr ""
-#: ai/advdiplomacy.c:1102
+#: ai/advdiplomacy.c:1121
#, c-format
msgid "*%s (AI)* I have tolerated your vicious antics long enough! To war!"
msgstr ""
-#: ai/advdiplomacy.c:1108
+#: ai/advdiplomacy.c:1127
#, c-format
msgid "*%s (AI)* Peace in ... some other time."
msgstr ""
-#: ai/advdiplomacy.c:1113
+#: ai/advdiplomacy.c:1132
#, 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:1119
+#: ai/advdiplomacy.c:1138
#, c-format
msgid "*%s (AI)* Your covert hostilities brought this war upon you!"
msgstr ""
-#: ai/advdiplomacy.c:1126
+#: ai/advdiplomacy.c:1145
#, c-format
msgid "*%s (AI)* Your aggression against %s was your last mistake!"
msgstr ""
-#: ai/advdiplomacy.c:1209
+#: ai/advdiplomacy.c:1229
#, c-format
msgid ""
"*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1148,14 +1149,14 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1219
+#: ai/advdiplomacy.c:1239
#, c-format
msgid ""
"*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
"alliance!"
msgstr ""
-#: ai/advdiplomacy.c:1225
+#: ai/advdiplomacy.c:1245
#, c-format
msgid ""
"*%s (AI)* %s has grossly violated his treaties with us for own gain. We "
@@ -1168,7 +1169,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1238
+#: ai/advdiplomacy.c:1258
#, c-format
msgid ""
"*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1179,13 +1180,13 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1246
+#: ai/advdiplomacy.c:1266
#, c-format
msgid ""
"*%s (AI)* If you want a piece of the loot, feel free to join in the action!"
msgstr ""
-#: ai/advdiplomacy.c:1251
+#: ai/advdiplomacy.c:1271
#, c-format
msgid ""
"*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1196,12 +1197,12 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1261
+#: ai/advdiplomacy.c:1281
#, c-format
msgid "*%s (AI)* As our glorious allies, we expect your help in this war."
msgstr ""
-#: ai/advdiplomacy.c:1267
+#: ai/advdiplomacy.c:1287
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance and declare war on %s in %d turn. "
@@ -1212,7 +1213,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1276
+#: ai/advdiplomacy.c:1296
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1223,47 +1224,47 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1344
+#: ai/advdiplomacy.c:1364
#, 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:1359
+#: ai/advdiplomacy.c:1379
#, c-format
msgid ""
"*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
"offensive."
msgstr ""
-#: ai/advdiplomacy.c:1362
+#: ai/advdiplomacy.c:1382
#, c-format
msgid ""
"*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
"take action!"
msgstr ""
-#: ai/advdiplomacy.c:1474
+#: ai/advdiplomacy.c:1494
#, c-format
msgid "*%s (AI)* Sorry, sharing vision with you is no longer safe."
msgstr ""
-#: ai/advdiplomacy.c:1549
+#: ai/advdiplomacy.c:1569
#, c-format
msgid ""
"*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
"our enemy, %s."
msgstr ""
-#: ai/advdiplomacy.c:1555
+#: ai/advdiplomacy.c:1575
#, 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:1562
+#: ai/advdiplomacy.c:1582
#, c-format
msgid ""
"*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1271,26 +1272,26 @@ msgid ""
"more!"
msgstr ""
-#: ai/advdiplomacy.c:1592
+#: ai/advdiplomacy.c:1612
#, c-format
msgid ""
"*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
"an alliance?"
msgstr ""
-#: ai/advdiplomacy.c:1607
+#: ai/advdiplomacy.c:1627
#, c-format
msgid "*%s (AI)* Greetings neighbour, may we suggest more peaceful relations?"
msgstr ""
-#: ai/advdiplomacy.c:1622
+#: ai/advdiplomacy.c:1642
#, c-format
msgid ""
"*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
"cessation of hostilities?"
msgstr ""
-#: ai/advdiplomacy.c:1742
+#: ai/advdiplomacy.c:1762
#, c-format
msgid ""
"*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1429,17 +1430,17 @@ msgid ""
"minimum %d [printable] characters long. Try again."
msgstr ""
-#: server/barbarian.c:183
+#: server/barbarian.c:184
#, c-format
msgid "%s gain a leader by the name %s. Dangerous times may lie ahead."
msgstr ""
-#: server/barbarian.c:479
+#: server/barbarian.c:480
#, c-format
msgid "Native unrest near %s led by %s."
msgstr ""
-#: server/barbarian.c:484
+#: server/barbarian.c:485
#, c-format
msgid "Sea raiders seen near %s!"
msgstr ""
@@ -1808,7 +1809,7 @@ msgid_plural "%s boosts research; you gain %d immediate advances."
msgstr[0] ""
msgstr[1] ""
-#: server/cityturn.c:1158 server/techtools.c:176
+#: server/cityturn.c:1158 server/techtools.c:172
#, c-format
msgid "The %s have acquired %s from %s."
msgstr ""
@@ -1889,123 +1890,127 @@ msgstr ""
msgid "Warning: the %s option is obsolete. Use -m to enable the metaserver.\n"
msgstr ""
-#: server/civserver.c:189
+#: server/civserver.c:193
#, c-format
msgid "Error: unknown option '%s'\n"
msgstr ""
-#: server/civserver.c:200
+#: server/civserver.c:204
#, c-format
msgid "This is the server for %s"
msgstr ""
-#: server/civserver.c:201
+#: server/civserver.c:205
#, c-format
msgid "You can learn a lot about Freeciv at %s"
msgstr ""
-#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
+#: server/civserver.c:210 client/civclient.c:239 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
"Valid options are:\n"
msgstr ""
-#: server/civserver.c:208
+#: server/civserver.c:212
msgid ""
" -a --auth FILE\tEnable server authentication with configuration from "
"FILE.\n"
msgstr ""
-#: server/civserver.c:210
+#: server/civserver.c:214
msgid " -G --Guests\t\tAllow guests to login if auth is enabled.\n"
msgstr ""
-#: server/civserver.c:212
+#: server/civserver.c:216
msgid " -N --Newusers\tAllow new users to login if auth is enabled.\n"
msgstr ""
-#: server/civserver.c:215
+#: server/civserver.c:219
msgid " -b --bind ADDR\tListen for clients on ADDR\n"
msgstr ""
-#: server/civserver.c:217 client/civclient.c:242
+#: server/civserver.c:221 client/civclient.c:243
msgid ""
" -d, --debug NUM\tSet debug log level (0 to 4, or 4:file1,min,max:...)\n"
msgstr ""
-#: server/civserver.c:221 client/civclient.c:246
+#: server/civserver.c:225 client/civclient.c:247
msgid " -d, --debug NUM\tSet debug log level (0 to 3)\n"
msgstr ""
-#: server/civserver.c:223
+#: server/civserver.c:227
msgid " -f, --file FILE\tLoad saved game FILE\n"
msgstr ""
-#: server/civserver.c:225 client/civclient.c:249 manual/civmanual.c:382
+#: server/civserver.c:229 client/civclient.c:250 manual/civmanual.c:382
msgid " -h, --help\t\tPrint a summary of the options\n"
msgstr ""
-#: server/civserver.c:226
+#: server/civserver.c:230
+msgid " -i, --identity ADDR\tBe known as ADDR at metaserver\n"
+msgstr ""
+
+#: server/civserver.c:231
msgid " -l, --log FILE\tUse FILE as logfile\n"
msgstr ""
-#: server/civserver.c:227
+#: server/civserver.c:232
msgid " -m, --meta\t\tNotify metaserver and send server's info\n"
msgstr ""
-#: server/civserver.c:229
+#: server/civserver.c:234
msgid " -M, --Metaserver ADDR\tSet ADDR as metaserver address\n"
msgstr ""
-#: server/civserver.c:232
+#: server/civserver.c:237
msgid " -p, --port PORT\tListen for clients on port PORT\n"
msgstr ""
-#: server/civserver.c:234
+#: server/civserver.c:239
msgid " -q, --quitidle TIME\tQuit if no players for TIME seconds\n"
msgstr ""
-#: server/civserver.c:236
+#: server/civserver.c:241
msgid " -e, --exit-on-end\tWhen a game ends, exit instead of restarting\n"
msgstr ""
-#: server/civserver.c:239
+#: server/civserver.c:244
msgid " -s, --saves DIR\tSave games to directory DIR\n"
msgstr ""
-#: server/civserver.c:241
+#: server/civserver.c:246
msgid " -S, --Serverid ID\tSets the server id to ID\n"
msgstr ""
-#: server/civserver.c:243
+#: server/civserver.c:248
msgid " -P, --Ppm\t\tSave ppms of the map when saving the game.\n"
msgstr ""
-#: server/civserver.c:244
+#: server/civserver.c:249
msgid " -r, --read FILE\tRead startup script FILE\n"
msgstr ""
-#: server/civserver.c:246
+#: server/civserver.c:251
msgid " -R, --Ranklog FILE\tUse FILE as ranking logfile\n"
msgstr ""
-#: server/civserver.c:247 client/civclient.c:268 manual/civmanual.c:383
+#: server/civserver.c:252 client/civclient.c:269 manual/civmanual.c:383
msgid " -v, --version\t\tPrint the version number\n"
msgstr ""
-#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
+#: server/civserver.c:253 client/gui-gtk-2.0/gui_main.c:354
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, c-format
msgid "Report bugs at %s.\n"
msgstr ""
-#: server/commands.c:28
+#: server/commands.c:29
msgid "Start the game, or restart after loading a savegame."
msgstr ""
-#: server/commands.c:29
+#: server/commands.c:30
msgid ""
"This command starts the game. When starting a new game, it should be used "
"after all human players have connected, and AI players have been created (if "
@@ -2017,7 +2022,7 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:42
+#: server/commands.c:44
msgid ""
"help\n"
"help commands\n"
@@ -2026,11 +2031,11 @@ msgid ""
"help <option-name>"
msgstr ""
-#: server/commands.c:47
+#: server/commands.c:49
msgid "Show help about server commands and server options."
msgstr ""
-#: server/commands.c:48
+#: server/commands.c:50
msgid ""
"With no arguments gives some introductory help. With argument \"commands\" "
"or \"options\" gives respectively a list of all commands or all options. "
@@ -2040,31 +2045,31 @@ msgid ""
"be abbreviated where unambiguous."
msgstr ""
-#: server/commands.c:63
+#: server/commands.c:66
msgid "Show a list of players, teams, connections, or scenarios."
msgstr ""
-#: server/commands.c:64
+#: server/commands.c:67
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 ""
-#: server/commands.c:70
+#: server/commands.c:74
msgid "Quit the game and shutdown the server."
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:74
+#: server/commands.c:79
msgid "cut <connection-name>"
msgstr ""
-#: server/commands.c:75
+#: server/commands.c:80
msgid "Cut a client's connection to server."
msgstr ""
-#: server/commands.c:76
+#: server/commands.c:81
msgid ""
"Cut specified client's connection to the server, removing that client from "
"the game. If the game has not yet started that client's player is removed "
@@ -2073,17 +2078,17 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:83
+#: server/commands.c:89
msgid ""
"explain\n"
"explain <option-name>"
msgstr ""
-#: server/commands.c:85
+#: server/commands.c:91
msgid "Explain server options."
msgstr ""
-#: server/commands.c:86
+#: server/commands.c:92
msgid ""
"The 'explain' command gives a subset of the functionality of 'help', and is "
"included for backward compatibility. With no arguments it gives a list of "
@@ -2092,89 +2097,90 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:93
+#: server/commands.c:100
msgid ""
"show\n"
"show <option-name>\n"
"show <option-prefix>"
msgstr ""
-#: server/commands.c:96
+#: server/commands.c:103
msgid "Show server options."
msgstr ""
-#: server/commands.c:97
+#: server/commands.c:104
msgid ""
"With no arguments, shows all server options (or available options, when used "
"by clients). With an argument, show only the named option, or options with "
"that prefix."
msgstr ""
-#: server/commands.c:102
+#: server/commands.c:110
msgid "wall <message>"
msgstr ""
-#: server/commands.c:103
+#: server/commands.c:111
msgid "Send message to all connections."
msgstr ""
-#: server/commands.c:104
+#: server/commands.c:112
msgid ""
"For each connected client, pops up a window showing the message entered."
msgstr ""
-#: server/commands.c:108
+#: server/commands.c:117
msgid "vote yes|no [vote number]"
msgstr ""
-#: server/commands.c:109
+#: server/commands.c:118
msgid "Cast a vote."
msgstr ""
-#: server/commands.c:111
+#: server/commands.c:120
#, 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."
+"A player with basic 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."
msgstr ""
-#: server/commands.c:121
+#: server/commands.c:131
msgid ""
"debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
"<player> | timing | info]"
msgstr ""
-#: server/commands.c:123
+#: server/commands.c:133
msgid "Turn on or off AI debugging of given entity."
msgstr ""
-#: server/commands.c:124
+#: server/commands.c:134
msgid ""
"Print AI debug information about given entity and turn continous debugging "
"output for this entity on or off."
msgstr ""
-#: server/commands.c:128
+#: server/commands.c:139
msgid "set <option-name> <value>"
msgstr ""
-#: server/commands.c:129
+#: server/commands.c:140
msgid "Set server option."
msgstr ""
-#: server/commands.c:132
+#: server/commands.c:144
msgid "team <player> [team]"
msgstr ""
-#: server/commands.c:133
+#: server/commands.c:145
msgid "Change, add or remove a player's team affiliation."
msgstr ""
-#: server/commands.c:134
+#: server/commands.c:146
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 "
@@ -2182,30 +2188,30 @@ msgid ""
"to achieve team victory with averaged individual scores."
msgstr ""
-#: server/commands.c:141
+#: server/commands.c:154
msgid "rulesetdir <directory>"
msgstr ""
-#: server/commands.c:142
+#: server/commands.c:155
msgid "Choose new ruleset directory or modpack."
msgstr ""
-#: server/commands.c:143
+#: server/commands.c:156
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:149
+#: server/commands.c:163
msgid "metainfo <meta-line>"
msgstr ""
-#: server/commands.c:150
+#: server/commands.c:164
msgid "Set metaserver info line."
msgstr ""
-#: server/commands.c:151
+#: server/commands.c:165
msgid ""
"Set user defined metaserver info line. If parameter is omitted,\n"
"previously set metamessage will be removed. For most of the time\n"
@@ -2214,19 +2220,19 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:158
+#: server/commands.c:173
msgid "metapatch <meta-line>"
msgstr ""
-#: server/commands.c:159
+#: server/commands.c:174
msgid "Set metaserver patches line."
msgstr ""
-#: server/commands.c:165
+#: server/commands.c:181
msgid "Control metaserver connection."
msgstr ""
-#: server/commands.c:166
+#: server/commands.c:182
msgid ""
"'metaconnection ?' reports on the status of the connection to metaserver.\n"
"'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2234,33 +2240,33 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:172
+#: server/commands.c:189
msgid "metaserver <address>"
msgstr ""
-#: server/commands.c:173
+#: server/commands.c:190
msgid "Set address (URL) for metaserver to report to."
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:177
+#: server/commands.c:195
msgid "aitoggle <player-name>"
msgstr ""
-#: server/commands.c:178
+#: server/commands.c:196
msgid "Toggle AI status of player."
msgstr ""
#. TRANS: translate text between [] and <> only
-#: server/commands.c:182
+#: server/commands.c:201
msgid "take [connection-name] <player-name>"
msgstr ""
-#: server/commands.c:183
+#: server/commands.c:202
msgid "Take over a player's place in the game."
msgstr ""
-#: server/commands.c:184
+#: server/commands.c:203
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 "
@@ -2270,15 +2276,15 @@ msgid ""
msgstr ""
#. TRANS: translate text between [] only
-#: server/commands.c:192
+#: server/commands.c:212
msgid "observe [connection-name] [player-name]"
msgstr ""
-#: server/commands.c:193
+#: server/commands.c:213
msgid "Observe a player or the whole game."
msgstr ""
-#: server/commands.c:194
+#: server/commands.c:214
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 "
@@ -2288,60 +2294,60 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:202
+#: server/commands.c:223
msgid "detach <connection-name>"
msgstr ""
-#: server/commands.c:203
+#: server/commands.c:224
msgid "detach from a player."
msgstr ""
-#: server/commands.c:204
+#: server/commands.c:225
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:209
+#: server/commands.c:231
msgid "create <player-name>"
msgstr ""
-#: server/commands.c:210
+#: server/commands.c:232
msgid "Create an AI player with a given name."
msgstr ""
-#: server/commands.c:211
+#: server/commands.c:233
msgid ""
"The 'create' command is only available before the game has been started."
msgstr ""
-#: server/commands.c:215
+#: server/commands.c:238
msgid ""
"away\n"
"away"
msgstr ""
-#: server/commands.c:217
+#: server/commands.c:240
msgid "Set yourself in away mode. The AI will watch your back."
msgstr ""
-#: server/commands.c:218
+#: server/commands.c:241
msgid "The AI will govern your nation but do minimal changes."
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:222
+#: server/commands.c:246
msgid ""
"novice\n"
"novice <player-name>"
msgstr ""
-#: server/commands.c:224
+#: server/commands.c:248
msgid "Set one or all AI players to 'novice'."
msgstr ""
-#: server/commands.c:225
+#: server/commands.c:249
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 "
@@ -2349,17 +2355,17 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:231
+#: server/commands.c:256
msgid ""
"easy\n"
"easy <player-name>"
msgstr ""
-#: server/commands.c:233
+#: server/commands.c:258
msgid "Set one or all AI players to 'easy'."
msgstr ""
-#: server/commands.c:234
+#: server/commands.c:259
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 "
@@ -2367,17 +2373,17 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:240
+#: server/commands.c:266
msgid ""
"normal\n"
"normal <player-name>"
msgstr ""
-#: server/commands.c:242
+#: server/commands.c:268
msgid "Set one or all AI players to 'normal'."
msgstr ""
-#: server/commands.c:243
+#: server/commands.c:269
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 "
@@ -2385,17 +2391,17 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:249
+#: server/commands.c:276
msgid ""
"hard\n"
"hard <player-name>"
msgstr ""
-#: server/commands.c:251
+#: server/commands.c:278
msgid "Set one or all AI players to 'hard'."
msgstr ""
-#: server/commands.c:252
+#: server/commands.c:279
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 "
@@ -2403,17 +2409,17 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:258
+#: server/commands.c:286
msgid ""
"experimental\n"
"experimental <player-name>"
msgstr ""
-#: server/commands.c:260
+#: server/commands.c:288
msgid "Set one or all AI players to 'experimental'."
msgstr ""
-#: server/commands.c:261
+#: server/commands.c:289
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 "
@@ -2422,7 +2428,7 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:269
+#: server/commands.c:298
msgid ""
"cmdlevel\n"
"cmdlevel <level>\n"
@@ -2431,17 +2437,19 @@ msgid ""
"cmdlevel <level> <connection-name>"
msgstr ""
-#: server/commands.c:274
+#: server/commands.c:303
msgid "Query or set command access level access."
msgstr ""
-#: server/commands.c:275
+#: server/commands.c:304
msgid ""
"The command access level controls which server commands are available\n"
"to users via the client chatline. The available levels are:\n"
" none - no commands\n"
-" info - informational commands only\n"
+" info - informational or observer commands only\n"
+" basic - commands available to players in the game\n"
" ctrl - commands that affect the game and users\n"
+" admin - commands that affect server operation\n"
" hack - *all* commands - dangerous!\n"
"With no arguments, the current command access levels are reported.\n"
"With a single argument, the level is set for all existing connections,\n"
@@ -2457,20 +2465,20 @@ msgid ""
"now takes connection names, not player names."
msgstr ""
-#: server/commands.c:296
+#: server/commands.c:328
msgid "If there is none, become the game organizer with increased permissions."
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:301
+#: server/commands.c:334
msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
msgstr ""
-#: server/commands.c:302
+#: server/commands.c:335
msgid "See \"help timeoutincrease\"."
msgstr ""
-#: server/commands.c:303
+#: server/commands.c:336
msgid ""
"Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
"<turn> and multiply <value> by <valuemult>. Use this command in concert "
@@ -2478,56 +2486,75 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:309
+#: server/commands.c:343
+msgid ""
+"cancelvote\n"
+"cancelvote <vote number>\n"
+"cancelvote all\n"
+msgstr ""
+
+#: server/commands.c:346
+msgid "Cancel a running vote.\n"
+msgstr ""
+
+#: server/commands.c:347
+msgid ""
+"With no arguments this command removes your own vote. If you have an admin "
+"access level, you can cancel any vote by vote number, or all votes with the "
+"'all' argument."
+msgstr ""
+
+#. TRANS: translate text between <> only
+#: server/commands.c:354
msgid "endgame"
msgstr ""
-#: server/commands.c:310
+#: server/commands.c:355
msgid "End the game immediately in a draw."
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:314
+#: server/commands.c:360
msgid "surrender"
msgstr ""
-#: server/commands.c:315
+#: server/commands.c:361
msgid "Concede the game."
msgstr ""
-#: server/commands.c:316
+#: server/commands.c:362
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:322
+#: server/commands.c:369
msgid "remove <player-name>"
msgstr ""
-#: server/commands.c:323
+#: server/commands.c:370
msgid "Fully remove player from game."
msgstr ""
-#: server/commands.c:324
+#: server/commands.c:371
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:329
+#: server/commands.c:377
msgid ""
"save\n"
"save <file-name>"
msgstr ""
-#: server/commands.c:331
+#: server/commands.c:379
msgid "Save game to file."
msgstr ""
-#: server/commands.c:332
+#: server/commands.c:380
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"
@@ -2538,133 +2565,133 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:341
+#: server/commands.c:390
msgid ""
"load\n"
"load <file-name>"
msgstr ""
-#: server/commands.c:343
+#: server/commands.c:392
msgid "Load game from file."
msgstr ""
-#: server/commands.c:344
+#: server/commands.c:393
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:349
+#: server/commands.c:399
msgid "read <file-name>"
msgstr ""
-#: server/commands.c:350
+#: server/commands.c:400
msgid "Process server commands from file."
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:354
+#: server/commands.c:405
msgid "write <file-name>"
msgstr ""
-#: server/commands.c:355
+#: server/commands.c:406
msgid "Write current settings as server commands to file."
msgstr ""
-#: server/commands.c:359
+#: server/commands.c:411
msgid "Switch server output between 'RFC-style' and normal style."
msgstr ""
-#: server/commands.c:363
+#: server/commands.c:416
msgid "Simply returns the id of the server."
msgstr ""
-#: server/connecthand.c:85
+#: server/connecthand.c:109
#, c-format
msgid "Welcome to the %s Server running at %s port %d."
msgstr ""
-#: server/connecthand.c:89
+#: server/connecthand.c:113
#, c-format
msgid "Welcome to the %s Server at port %d."
msgstr ""
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:97
+#: server/connecthand.c:121
#, c-format
msgid "(%d) %s: connected [%s]"
msgstr ""
-#: server/connecthand.c:104
+#: server/connecthand.c:128
#, c-format
msgid "Server: %s has connected from %s."
msgstr ""
-#: server/connecthand.c:145
+#: server/connecthand.c:175
msgid "Couldn't attach your connection to new player."
msgstr ""
-#: server/connecthand.c:165
+#: server/connecthand.c:199
#, c-format
msgid "You are logged in as '%s' connected to no player."
msgstr ""
-#: server/connecthand.c:169
+#: server/connecthand.c:203
#, c-format
msgid "You are logged in as '%s' connected to an anonymous player."
msgstr ""
-#: server/connecthand.c:174
+#: server/connecthand.c:208
#, c-format
msgid "You are logged in as '%s' connected to %s."
msgstr ""
-#: server/connecthand.c:187
+#: server/connecthand.c:221
#, c-format
msgid "Turn-blocking game play: waiting on %s to finish turn..."
msgstr ""
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:240
+#: server/connecthand.c:274
#, c-format
msgid "(%d) %s: connection request [%s]"
msgstr ""
-#: server/connecthand.c:266
+#: server/connecthand.c:300
msgid "The client is missing a capability that this server needs."
msgstr ""
-#: server/connecthand.c:268 server/connecthand.c:279
+#: server/connecthand.c:302 server/connecthand.c:313
#, c-format
msgid "(%d) %s rejected: mismatched capabilities!"
msgstr ""
-#: server/connecthand.c:277
+#: server/connecthand.c:311
msgid "This server is missing a capability that the client needs."
msgstr ""
-#: server/connecthand.c:290
+#: server/connecthand.c:324
msgid "The username is invalid!"
msgstr ""
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:292
+#: server/connecthand.c:326
#, c-format
msgid "(%d) %s rejected: invalid username [%s]"
msgstr ""
-#: server/connecthand.c:303
+#: server/connecthand.c:337
msgid "Your username is already connected!"
msgstr ""
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:305
+#: server/connecthand.c:339
#, c-format
msgid "(%d) %s rejected: duplicate username [%s]"
msgstr ""
-#: server/connecthand.c:335 server/connecthand.c:344
+#: server/connecthand.c:369 server/connecthand.c:378
#, c-format
msgid "Lost connection: %s."
msgstr ""
@@ -2681,110 +2708,110 @@ msgstr ""
msgid "For introductory help, type 'help'."
msgstr ""
-#: server/diplhand.c:164
+#: server/diplhand.c:167
#, c-format
msgid "The %s can't accept %s."
msgstr ""
-#: server/diplhand.c:176
+#: server/diplhand.c:179
#, c-format
msgid "You don't have tech %s, you can't accept treaty."
msgstr ""
-#: server/diplhand.c:185
+#: server/diplhand.c:188
msgid "City you are trying to give no longer exists, you can't accept treaty."
msgstr ""
-#: server/diplhand.c:191
+#: server/diplhand.c:194
#, c-format
msgid "You are not owner of %s, you can't accept treaty."
msgstr ""
-#: server/diplhand.c:197 server/diplhand.c:301
+#: server/diplhand.c:200 server/diplhand.c:304
#, c-format
msgid "Your capital (%s) is requested, you can't accept treaty."
msgstr ""
-#: server/diplhand.c:224
+#: server/diplhand.c:227
msgid "You don't have enough gold, you can't accept treaty."
msgstr ""
-#: server/diplhand.c:256 server/diplhand.c:261
+#: server/diplhand.c:259 server/diplhand.c:264
#, c-format
msgid "A treaty containing %d clause was agreed upon."
msgid_plural "A treaty containing %d clauses was agreed upon."
msgstr[0] ""
msgstr[1] ""
-#: server/diplhand.c:277 server/diplhand.c:281
+#: server/diplhand.c:280 server/diplhand.c:284
#, c-format
msgid "One of the cities the %s are giving away is destroyed! Treaty canceled!"
msgstr ""
-#: server/diplhand.c:288 server/diplhand.c:293
+#: server/diplhand.c:291 server/diplhand.c:296
#, c-format
msgid "The %s no longer control %s! Treaty canceled!"
msgstr ""
-#: server/diplhand.c:331 server/diplhand.c:335
+#: server/diplhand.c:334 server/diplhand.c:338
#, c-format
msgid "The %s don't have the promised amount of gold! Treaty canceled!"
msgstr ""
-#: server/diplhand.c:364
+#: server/diplhand.c:367
#, c-format
msgid "You gave an embassy to %s."
msgstr ""
-#: server/diplhand.c:367
+#: server/diplhand.c:370
#, c-format
msgid "%s allowed you to create an embassy!"
msgstr ""
-#: server/diplhand.c:383
+#: server/diplhand.c:386
#, c-format
msgid "You are taught the knowledge of %s."
msgstr ""
-#: server/diplhand.c:387
+#: server/diplhand.c:390
#, c-format
msgid "The %s have acquired %s from the %s."
msgstr ""
-#: server/diplhand.c:402
+#: server/diplhand.c:405
#, c-format
msgid "You get %d gold."
msgstr ""
#. TRANS: ... Polish worldmap.
-#: server/diplhand.c:410
+#: server/diplhand.c:413
#, c-format
msgid "You receive the %s worldmap."
msgstr ""
#. TRANS: ... Polish seamap.
-#: server/diplhand.c:419
+#: server/diplhand.c:422
#, c-format
msgid "You receive the %s seamap."
msgstr ""
-#: server/diplhand.c:436
+#: server/diplhand.c:439
#, c-format
msgid "You receive city of %s from %s."
msgstr ""
-#: server/diplhand.c:441
+#: server/diplhand.c:444
#, c-format
msgid "You give city of %s to %s."
msgstr ""
-#: server/diplhand.c:454 server/diplhand.c:457
+#: server/diplhand.c:457 server/diplhand.c:460
#, c-format
msgid "You agree on a cease-fire with %s."
msgstr ""
#. TRANS: ... the Poles ... Polish territory.
-#: server/diplhand.c:476 server/diplhand.c:488
+#: server/diplhand.c:479 server/diplhand.c:491
#, c-format
msgid ""
"You agree on an armistice with the %s. In %d turn, it will become a peace "
@@ -2795,32 +2822,32 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: server/diplhand.c:512 server/diplhand.c:515
+#: server/diplhand.c:515 server/diplhand.c:518
#, c-format
msgid "You agree on an alliance with %s."
msgstr ""
-#: server/diplhand.c:524
+#: server/diplhand.c:527
#, c-format
msgid "You give shared vision to %s."
msgstr ""
-#: server/diplhand.c:527
+#: server/diplhand.c:530
#, c-format
msgid "%s gives you shared vision."
msgstr ""
-#: server/diplhand.c:663
+#: server/diplhand.c:666
#, c-format
msgid "%s canceled the meeting!"
msgstr ""
-#: server/diplhand.c:670
+#: server/diplhand.c:673
#, c-format
msgid "Meeting with %s canceled."
msgstr ""
-#: server/diplhand.c:712
+#: server/diplhand.c:715
msgid "Your diplomatic envoy was decapitated!"
msgstr ""
@@ -3003,80 +3030,80 @@ msgid "The %s destroyed the %s in %s."
msgstr ""
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1091
+#: server/diplomats.c:1097
#, c-format
msgid "An enemy %s has been eliminated by your %s."
msgstr ""
#. TRANS: <unit> ... <city> ... <diplomat>
-#: server/diplomats.c:1098
+#: server/diplomats.c:1104
#, c-format
msgid "Your %s has been eliminated defending %s against a %s."
msgstr ""
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1106
+#: server/diplomats.c:1112
#, c-format
msgid "Your %s has been eliminated defending against a %s."
msgstr ""
-#: server/diplomats.c:1119
+#: server/diplomats.c:1125
#, c-format
msgid "Your %s was eliminated by a defending %s."
msgstr ""
-#: server/diplomats.c:1127
+#: server/diplomats.c:1133
#, c-format
msgid "Eliminated %s %s while infiltrating %s."
msgstr ""
-#: server/diplomats.c:1134
+#: server/diplomats.c:1140
#, c-format
msgid "Eliminated %s %s while infiltrating our troops."
msgstr ""
-#: server/diplomats.c:1185
+#: server/diplomats.c:1191
#, c-format
msgid ""
"Your %s has successfully completed the mission and returned unharmed to %s."
msgstr ""
-#: server/diplomats.c:1204
+#: server/diplomats.c:1210
#, c-format
msgid "Your %s was captured after completing the mission in %s."
msgstr ""
-#: server/diplomats.c:1210
+#: server/diplomats.c:1216
#, c-format
msgid "Your %s was captured after completing the mission."
msgstr ""
-#: server/diplomats.c:1242
+#: server/diplomats.c:1248
#, c-format
msgid "You have caused an incident while bribing the %s %s."
msgstr ""
-#: server/diplomats.c:1247
+#: server/diplomats.c:1253
#, c-format
msgid "%s has caused an incident while bribing your %s."
msgstr ""
-#: server/diplomats.c:1254
+#: server/diplomats.c:1260
#, c-format
msgid "You have caused an incident while attempting to steal tech from %s."
msgstr ""
-#: server/diplomats.c:1258
+#: server/diplomats.c:1264
#, c-format
msgid "%s has caused an incident while attempting to steal tech from you."
msgstr ""
-#: server/diplomats.c:1264
+#: server/diplomats.c:1270
#, c-format
msgid "You have caused an incident while inciting a revolt in %s."
msgstr ""
-#: server/diplomats.c:1268
+#: server/diplomats.c:1274
#, c-format
msgid "%s have caused an incident while inciting a revolt in %s."
msgstr ""
@@ -3183,12 +3210,12 @@ msgid ""
" Workers spontaneously gather and upgrade all cities with railroads."
msgstr ""
-#: server/maphand.c:1418
+#: server/maphand.c:1425
#, c-format
msgid "Moved your %s due to changing terrain."
msgstr ""
-#: server/maphand.c:1436
+#: server/maphand.c:1443
#, c-format
msgid "Disbanded your %s due to changing terrain."
msgstr ""
@@ -3197,7 +3224,7 @@ msgstr ""
msgid "Not reporting to the metaserver in this game."
msgstr ""
-#: server/meta.c:430
+#: server/meta.c:432
#, c-format
msgid "Metaserver: bad address: [%s:%d]."
msgstr ""
@@ -3312,54 +3339,54 @@ msgid ""
"with %s."
msgstr ""
-#: server/plrhand.c:1103
+#: server/plrhand.c:1115
#, c-format
msgid "Removing player %s."
msgstr ""
-#: server/plrhand.c:1105
+#: server/plrhand.c:1117
msgid "You've been removed from the game!"
msgstr ""
-#: server/plrhand.c:1108
+#: server/plrhand.c:1120
#, c-format
msgid "%s has been removed from the game."
msgstr ""
-#: server/plrhand.c:1153 server/plrhand.c:1158
+#: server/plrhand.c:1167 server/plrhand.c:1172
#, c-format
msgid "You have made contact with the %s, ruled by %s."
msgstr ""
-#: server/plrhand.c:1178
+#: server/plrhand.c:1192
#, c-format
msgid ""
"%s and %s meet and go to instant war. You cancel your alliance with both."
msgstr ""
-#: server/plrhand.c:1656
+#: server/plrhand.c:1670
#, c-format
msgid "Could not throw %s into civil war - too many players"
msgstr ""
-#: server/plrhand.c:1663
+#: server/plrhand.c:1677
#, c-format
msgid "Could not throw %s into civil war - no available nations"
msgstr ""
-#: server/plrhand.c:1686
+#: server/plrhand.c:1700
#, c-format
msgid ""
"Your nation is thrust into civil war! %s is declared the leader of the rebel "
"states."
msgstr ""
-#: server/plrhand.c:1707
+#: server/plrhand.c:1721
#, c-format
msgid "%s declares allegiance to %s."
msgstr ""
-#: server/plrhand.c:1722
+#: server/plrhand.c:1736
#, c-format
msgid ""
"Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3548,65 +3575,65 @@ msgstr ""
msgid "Wonders of the World"
msgstr ""
-#: server/report.c:547
+#: server/report.c:552
msgid " sq. mi."
msgstr ""
-#: server/report.c:557
+#: server/report.c:562
msgid " M tons"
msgstr ""
-#: server/report.c:562
+#: server/report.c:567
msgid " M goods"
msgstr ""
-#: server/report.c:567
+#: server/report.c:572
msgid " bulbs"
msgstr ""
-#: server/report.c:572
+#: server/report.c:577
msgid " month"
msgid_plural " months"
msgstr[0] ""
msgstr[1] ""
-#: server/report.c:577
+#: server/report.c:582
msgid " ton"
msgid_plural " tons"
msgstr[0] ""
msgstr[1] ""
-#: server/report.c:591
+#: server/report.c:596
msgid "st"
msgstr ""
-#: server/report.c:593
+#: server/report.c:598
msgid "nd"
msgstr ""
-#: server/report.c:595
+#: server/report.c:600
msgid "rd"
msgstr ""
-#: server/report.c:597
+#: server/report.c:602
msgid "th"
msgstr ""
-#: server/report.c:700
+#: server/report.c:705
msgid "Demography string contains invalid characters. Try \"help demography\"."
msgstr ""
-#: server/report.c:743 server/report.c:768
+#: server/report.c:748 server/report.c:773
msgid "Demographics Report:"
msgstr ""
-#: server/report.c:744
+#: server/report.c:749
msgid "Sorry, the Demographics report is unavailable."
msgstr ""
#. TRANS: <nation adjective> <government name> (<year>).
#. * E.g. "Polish Despotism (200 AD)".
-#: server/report.c:750
+#: server/report.c:755
#, c-format
msgid "%s %s (%s)"
msgstr ""
@@ -3617,11 +3644,11 @@ msgstr ""
msgid "Could not find a readable \"%s.%s\" ruleset file."
msgstr ""
-#: server/ruleset.c:2356
+#: server/ruleset.c:2366
msgid "No barbarian nation in rulesets, at least one required!"
msgstr ""
-#: server/ruleset.c:3166
+#: server/ruleset.c:3178
msgid "Loading rulesets"
msgstr ""
@@ -3633,17 +3660,17 @@ msgid ""
"risk."
msgstr ""
-#: server/savegame.c:3588
+#: server/savegame.c:3587
msgid "Saved game is too old, at least version 1.9.0 required."
msgstr ""
#. TRANS: Fatal error message.
-#: server/savegame.c:3815
+#: server/savegame.c:3817
msgid ""
"Saved game uses the \"classic\" terrain ruleset, and is no longer supported."
msgstr ""
-#: server/savegame.c:3824
+#: server/savegame.c:3826
#, c-format
msgid ""
"Warning: Different rulesetdirs ('%s' and '%s') are no longer supported. "
@@ -3651,7 +3678,7 @@ msgid ""
msgstr ""
#. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4051
+#: server/savegame.c:4055
#, c-format
msgid "%s had invalid nation; changing to %s."
msgstr ""
@@ -3684,7 +3711,7 @@ msgstr ""
msgid "Networking"
msgstr ""
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:734
#: client/gui-win32/dialogs.c:532
msgid "All"
msgstr ""
@@ -4604,11 +4631,11 @@ msgid ""
"the game."
msgstr ""
-#: server/sernet.c:150
+#: server/sernet.c:151
msgid "Server cannot read standard input. Ignoring input."
msgstr ""
-#: server/sernet.c:929
+#: server/sernet.c:933
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr ""
@@ -4681,820 +4708,869 @@ msgstr ""
msgid "Without guidance from the capital, the %s spaceship is lost!"
msgstr ""
-#: server/srv_main.c:240
+#: server/srv_main.c:242
msgid "Game ended in a draw as end year exceeded"
msgstr ""
-#: server/srv_main.c:274
+#: server/srv_main.c:276
#, c-format
msgid "The %s spaceship has arrived at Alpha Centauri."
msgstr ""
-#: server/srv_main.c:287 server/srv_main.c:322
+#: server/srv_main.c:289 server/srv_main.c:324
#, c-format
msgid "Team victory to %s"
msgstr ""
-#: server/srv_main.c:297 server/srv_main.c:338
+#: server/srv_main.c:299 server/srv_main.c:340
#, c-format
msgid "Game ended in victory for %s"
msgstr ""
-#: server/srv_main.c:345
+#: server/srv_main.c:347
msgid "Game ended in a draw"
msgstr ""
-#: server/srv_main.c:461 server/srv_main.c:472
+#: server/srv_main.c:465 server/srv_main.c:476
#, c-format
msgid "Your %s was disbanded in accordance with your peace treaty with the %s."
msgstr ""
-#: server/srv_main.c:512 server/srv_main.c:516
+#: server/srv_main.c:516 server/srv_main.c:520
#, c-format
msgid ""
"Concerned citizens point out that the cease-fire with %s will run out soon."
msgstr ""
-#: server/srv_main.c:521 server/srv_main.c:525
+#: server/srv_main.c:525 server/srv_main.c:529
#, c-format
msgid "The cease-fire with %s has run out. You are now at war with the %s."
msgstr ""
-#: server/srv_main.c:542
+#: server/srv_main.c:546
#, c-format
msgid ""
"Ceasefire between %s and %s has run out. They are at war. You cancel your "
"alliance with both."
msgstr ""
-#: server/srv_main.c:961
+#: server/srv_main.c:997
#, c-format
msgid "Failed saving game as %s"
msgstr ""
-#: server/srv_main.c:963
+#: server/srv_main.c:999
#, c-format
msgid "Game saved as %s"
msgstr ""
-#: server/srv_main.c:994
+#: server/srv_main.c:1030
msgid "The game is already running."
msgstr ""
-#: server/srv_main.c:1002
+#: server/srv_main.c:1038
#, c-format
msgid "%s lost control cmdlevel on game start. Use voting from now on."
msgstr ""
-#: server/srv_main.c:1009
+#: server/srv_main.c:1045
msgid "Starting game."
msgstr ""
-#: server/srv_main.c:1071
+#: server/srv_main.c:1112
#, c-format
msgid "request for unknown report (type %d)"
msgstr ""
-#: server/srv_main.c:1136
+#: server/srv_main.c:1177
#, c-format
msgid "Warning: rejecting old client %s"
msgstr ""
-#: server/srv_main.c:1238
+#: server/srv_main.c:1279
#, c-format
msgid "Got a packet of type %d from a dead or observer player"
msgstr ""
-#: server/srv_main.c:1338
+#: server/srv_main.c:1381
msgid "Please choose a non-blank name."
msgstr ""
-#: server/srv_main.c:1354
+#: server/srv_main.c:1397
msgid "That nation is already in use."
msgstr ""
-#: server/srv_main.c:1370
+#: server/srv_main.c:1413
#, c-format
msgid "Another player already has the name '%s'. Please choose another name."
msgstr ""
-#: server/srv_main.c:1391
+#: server/srv_main.c:1434
msgid "Please choose a name containing only ASCII characters."
msgstr ""
-#: server/srv_main.c:1490
+#: server/srv_main.c:1533
#, c-format
msgid "%s nation is not available in this scenario."
msgstr ""
-#: server/srv_main.c:1496
+#: server/srv_main.c:1539
#, c-format
msgid "%s nation is already in use."
msgstr ""
-#: server/srv_main.c:1514
+#: server/srv_main.c:1557
#, c-format
msgid "%s is the %s ruler %s."
msgstr ""
-#: server/srv_main.c:1570
+#: server/srv_main.c:1613
#, c-format
msgid "Waiting to start game: %d out of %d players are ready to start."
msgstr ""
-#: server/srv_main.c:1614 server/srv_main.c:1618
+#: server/srv_main.c:1657 server/srv_main.c:1661
#, c-format
msgid "%s has been added as %s level AI-controlled player."
msgstr ""
-#: server/srv_main.c:1760
+#: server/srv_main.c:1803
#, c-format
msgid "Player %d"
msgstr ""
-#: server/srv_main.c:1771 server/srv_main.c:1777
+#: server/srv_main.c:1814 server/srv_main.c:1820
#, c-format
msgid "%s rules the %s."
msgstr ""
-#: server/srv_main.c:1942
+#: server/srv_main.c:1985
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
msgstr ""
-#: server/srv_main.c:1993
+#: server/srv_main.c:2037
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr ""
-#: server/srv_main.c:2024
+#: server/srv_main.c:2069
msgid "The game is over..."
msgstr ""
-#: server/srv_main.c:2237
+#: server/srv_main.c:2286
msgid "Now accepting new client connections."
msgstr ""
-#: server/stdinhand.c:246
-#, c-format
-msgid "Vote \"%s\" is passed %d to %d with %d abstentions."
-msgstr ""
-
-#: server/stdinhand.c:253
-#, c-format
-msgid "Vote \"%s\" failed with %d against, %d for and %d abstentions."
-msgstr ""
-
#. TRANS: ambiguous command
-#: server/stdinhand.c:365
+#: server/stdinhand.c:284
msgid "(ambiguous)"
msgstr ""
#. TRANS: unrecognized command
#. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:416
+#: server/stdinhand.c:287 client/citydlg_common.c:419
#: 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 ""
-#: server/stdinhand.c:458
+#: server/stdinhand.c:377
msgid "Name is empty, so cannot be a player."
msgstr ""
-#: server/stdinhand.c:462
+#: server/stdinhand.c:381
msgid "Name is too long, so cannot be a player."
msgstr ""
-#: server/stdinhand.c:466
+#: server/stdinhand.c:385
#, c-format
msgid "Player name prefix '%s' is ambiguous."
msgstr ""
-#: server/stdinhand.c:470
+#: server/stdinhand.c:389
#, c-format
msgid "No player by the name of '%s'."
msgstr ""
-#: server/stdinhand.c:474 server/stdinhand.c:509
+#: server/stdinhand.c:393 server/stdinhand.c:428
#, c-format
msgid "Unexpected match_result %d (%s) for '%s'."
msgstr ""
-#: server/stdinhand.c:493
+#: server/stdinhand.c:412
msgid "Name is empty, so cannot be a connection."
msgstr ""
-#: server/stdinhand.c:497
+#: server/stdinhand.c:416
msgid "Name is too long, so cannot be a connection."
msgstr ""
-#: server/stdinhand.c:501
+#: server/stdinhand.c:420
#, c-format
msgid "Connection name prefix '%s' is ambiguous."
msgstr ""
-#: server/stdinhand.c:505
+#: server/stdinhand.c:424
#, c-format
msgid "No connection by the name of '%s'."
msgstr ""
-#: server/stdinhand.c:525
+#: server/stdinhand.c:444
#, c-format
msgid "Open metaserver connection to [%s]."
msgstr ""
-#: server/stdinhand.c:538
+#: server/stdinhand.c:457
#, c-format
msgid "Close metaserver connection to [%s]."
msgstr ""
-#: server/stdinhand.c:553
+#: server/stdinhand.c:472
msgid "Metaserver connection is open."
msgstr ""
-#: server/stdinhand.c:556
+#: server/stdinhand.c:475
msgid "Metaserver connection is closed."
msgstr ""
-#: server/stdinhand.c:566
+#: server/stdinhand.c:485
msgid "Metaserver connection is already open."
msgstr ""
-#: server/stdinhand.c:577
+#: server/stdinhand.c:496
msgid "Metaserver connection is already closed."
msgstr ""
-#: server/stdinhand.c:582
+#: server/stdinhand.c:501
msgid "Argument must be 'u', 'up', 'd', 'down', or '?'."
msgstr ""
-#: server/stdinhand.c:603
+#: server/stdinhand.c:522
#, c-format
msgid "Metaserver patches string set to '%s'."
msgstr ""
-#: server/stdinhand.c:606
+#: server/stdinhand.c:525
#, c-format
msgid "Metaserver patches string set to '%s', not reporting to metaserver."
msgstr ""
-#: server/stdinhand.c:627
+#: server/stdinhand.c:546
#, c-format
msgid "Metaserver message string set to '%s'."
msgstr ""
-#: server/stdinhand.c:630
+#: server/stdinhand.c:549
#, c-format
msgid "Metaserver message string set to '%s', not reporting to metaserver."
msgstr ""
-#: server/stdinhand.c:650
+#: server/stdinhand.c:569
#, c-format
msgid "Metaserver is now [%s]."
msgstr ""
-#: server/stdinhand.c:660
+#: server/stdinhand.c:579
#, c-format
msgid "Server id: %s"
msgstr ""
-#: server/stdinhand.c:757
+#: server/stdinhand.c:676
msgid "You cannot save games manually on this server."
msgstr ""
-#: server/stdinhand.c:774
+#: server/stdinhand.c:693
msgid "Cannot toggle a barbarian player."
msgstr ""
-#: server/stdinhand.c:781
+#: server/stdinhand.c:700
#, c-format
msgid "%s is now under AI control."
msgstr ""
-#: server/stdinhand.c:802
+#: server/stdinhand.c:721
#, c-format
msgid "%s is now under human control."
msgstr ""
-#: server/stdinhand.c:847
+#: server/stdinhand.c:766
msgid "Can't add AI players once the game has begun."
msgstr ""
-#: server/stdinhand.c:867
+#: server/stdinhand.c:786
msgid "Can't add more players, server is full."
msgstr ""
-#: server/stdinhand.c:874
+#: server/stdinhand.c:793
msgid "Can't use an empty name."
msgstr ""
-#: server/stdinhand.c:881
+#: server/stdinhand.c:800
#, c-format
msgid "That name exceeds the maximum of %d chars."
msgstr ""
-#: server/stdinhand.c:887
+#: server/stdinhand.c:806
msgid "That name is not allowed."
msgstr ""
-#: server/stdinhand.c:893
+#: server/stdinhand.c:812
msgid "A player already exists by that name."
msgstr ""
-#: server/stdinhand.c:899
+#: server/stdinhand.c:818
msgid "A user already exists by that name."
msgstr ""
-#: server/stdinhand.c:925
+#: server/stdinhand.c:844
#, c-format
msgid "%s has been added as an AI-controlled player."
msgstr ""
-#: server/stdinhand.c:932
+#: server/stdinhand.c:851
#, c-format
msgid "Error creating new AI player: %s."
msgstr ""
-#: server/stdinhand.c:966
+#: server/stdinhand.c:885
msgid "Players cannot be removed once the game has started."
msgstr ""
-#: server/stdinhand.c:977
+#: server/stdinhand.c:896
#, c-format
msgid "Removed player %s from the game."
msgstr ""
-#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
+#: server/stdinhand.c:935 server/stdinhand.c:3372 server/stdinhand.c:3507
#, c-format
msgid "Name \"%s\" disallowed for security reasons."
msgstr ""
-#: server/stdinhand.c:1029
+#: server/stdinhand.c:948
#, c-format
msgid "No command script found by the name \"%s\"."
msgstr ""
-#: server/stdinhand.c:1037
+#: server/stdinhand.c:956
#, c-format
msgid "Loading script file: %s"
msgstr ""
-#: server/stdinhand.c:1052
+#: server/stdinhand.c:971
#, c-format
msgid "Cannot read command line scriptfile '%s'."
msgstr ""
-#: server/stdinhand.c:1054
+#: server/stdinhand.c:973
#, c-format
msgid "Could not read script file '%s'."
msgstr ""
-#: server/stdinhand.c:1146
+#: server/stdinhand.c:1065
#, c-format
msgid "Could not write script file '%s'."
msgstr ""
-#: server/stdinhand.c:1158
+#: server/stdinhand.c:1077
msgid "You cannot use the write command on this server for security reasons."
msgstr ""
-#: server/stdinhand.c:1186
+#: server/stdinhand.c:1105
#, c-format
msgid ""
"Cannot decrease command access level '%s' for connection '%s'; you only have "
"'%s'."
msgstr ""
-#: server/stdinhand.c:1241
+#: server/stdinhand.c:1114
+#, c-format
+msgid "Command access level set to '%s' for connection %s."
+msgstr ""
+
+#: server/stdinhand.c:1163
#, c-format
msgid ""
"Anyone can now become game organizer '%s' by issuing the 'first' command."
msgstr ""
-#: server/stdinhand.c:1274
+#: server/stdinhand.c:1187
msgid "Command access levels in effect:"
msgstr ""
-#: server/stdinhand.c:1282
+#: server/stdinhand.c:1194
#, c-format
msgid "Command access level for new connections: %s"
msgstr ""
-#: server/stdinhand.c:1285
+#: server/stdinhand.c:1197
#, c-format
msgid "Command access level for first player to take it: %s"
msgstr ""
-#: server/stdinhand.c:1294
+#: server/stdinhand.c:1206
msgid ""
"Error: command access level must be one of 'none', 'info', 'ctrl', or 'hack'."
msgstr ""
-#: server/stdinhand.c:1299
+#: server/stdinhand.c:1211
#, c-format
msgid ""
"Cannot increase command access level to '%s'; you only have '%s' yourself."
msgstr ""
-#: server/stdinhand.c:1326 server/stdinhand.c:1375
-#, c-format
-msgid "Command access level set to '%s' for connection %s."
-msgstr ""
-
-#: 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:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
+#: server/stdinhand.c:1238 server/stdinhand.c:1252 server/stdinhand.c:1273
#, c-format
msgid "Command access level set to '%s' for new players."
msgstr ""
-#: server/stdinhand.c:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
+#: server/stdinhand.c:1243 server/stdinhand.c:1257 server/stdinhand.c:1267
#, c-format
msgid "Command access level set to '%s' for first player to grab it."
msgstr ""
-#: server/stdinhand.c:1402
+#: server/stdinhand.c:1302
msgid "The 'first' command makes no sense from the server command line."
msgstr ""
-#: server/stdinhand.c:1406
+#: server/stdinhand.c:1306
#, c-format
msgid "You already have command access level '%s' or better."
msgstr ""
-#: server/stdinhand.c:1411
+#: server/stdinhand.c:1311
msgid "Someone else already is game organizer."
msgstr ""
-#: server/stdinhand.c:1416
+#: server/stdinhand.c:1316
#, c-format
msgid "Connection %s has opted to become the game organizer."
msgstr ""
-#: server/stdinhand.c:1467
+#: server/stdinhand.c:1367
#, c-format
msgid "Invalid argument %d."
msgstr ""
-#: server/stdinhand.c:1474
+#: server/stdinhand.c:1374
msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
msgstr ""
-#: server/stdinhand.c:1482
+#: server/stdinhand.c:1382
#, c-format
msgid "Dynamic timeout set to %d %d %d %d"
msgstr ""
-#: server/stdinhand.c:1542 server/stdinhand.c:1545
+#: server/stdinhand.c:1442 server/stdinhand.c:1445
msgid "Option:"
msgstr ""
-#: server/stdinhand.c:1555 server/stdinhand.c:4031
+#: server/stdinhand.c:1455 server/stdinhand.c:4079
msgid "Description:"
msgstr ""
-#: server/stdinhand.c:1560
+#: server/stdinhand.c:1460
#, c-format
msgid "Status: %s"
msgstr ""
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "changeable"
msgstr ""
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "fixed"
msgstr ""
-#: server/stdinhand.c:1567
+#: server/stdinhand.c:1467
#, c-format
msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
msgstr ""
-#: server/stdinhand.c:1572
+#: server/stdinhand.c:1472
#, c-format
msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
msgstr ""
-#: server/stdinhand.c:1578
+#: server/stdinhand.c:1478
#, c-format
msgid "Value: \"%s\", Default: \"%s\""
msgstr ""
-#: server/stdinhand.c:1597
+#: server/stdinhand.c:1497
msgid "Explanations are available for the following server options:"
msgstr ""
-#: server/stdinhand.c:1643
+#: server/stdinhand.c:1537
msgid "No explanation for that yet."
msgstr ""
-#: server/stdinhand.c:1646 server/stdinhand.c:2480
+#: server/stdinhand.c:1540 server/stdinhand.c:2468
msgid "Ambiguous option name."
msgstr ""
-#: server/stdinhand.c:1666
+#: server/stdinhand.c:1560
#, c-format
msgid "Server Operator: %s"
msgstr ""
-#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
+#: server/stdinhand.c:1686 server/stdinhand.c:1713 server/stdinhand.c:1731
#, c-format
msgid "Player '%s' now has AI skill level '%s'."
msgstr ""
-#: server/stdinhand.c:1822
+#: server/stdinhand.c:1718
#, c-format
msgid "%s is not controlled by the AI."
msgstr ""
-#: server/stdinhand.c:1842
+#: server/stdinhand.c:1738
#, c-format
msgid "Default AI skill level set to '%s'."
msgstr ""
-#: server/stdinhand.c:1857 server/stdinhand.c:2162
+#: server/stdinhand.c:1753
msgid "This command is client only."
msgstr ""
-#: server/stdinhand.c:1860
+#: server/stdinhand.c:1756
msgid "Usage: away"
msgstr ""
-#: server/stdinhand.c:1865
+#: server/stdinhand.c:1761
msgid "Only players may use the away command."
msgstr ""
-#: server/stdinhand.c:1869
+#: server/stdinhand.c:1765
#, c-format
msgid "%s set to away mode."
msgstr ""
-#: server/stdinhand.c:1877
+#: server/stdinhand.c:1772
#, c-format
msgid "%s returned to game."
msgstr ""
-#: server/stdinhand.c:1919
+#: server/stdinhand.c:1817
#, c-format
msgid "Sorry, you do not have access to view option '%s'."
msgstr ""
-#: server/stdinhand.c:1925
+#: server/stdinhand.c:1823
#, c-format
msgid "Unknown option '%s'."
msgstr ""
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1848
msgid "All options with non-default values"
msgstr ""
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1851
msgid "All options"
msgstr ""
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1854
msgid "Vital options"
msgstr ""
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1857
msgid "Situational options"
msgstr ""
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1860
msgid "Rarely used options"
msgstr ""
-#: server/stdinhand.c:1965
+#: server/stdinhand.c:1863
msgid "+ means you may change the option"
msgstr ""
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1864
msgid "= means the option is on its default value"
msgstr ""
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
#, c-format
msgid "%-*s value (min,max) "
msgstr ""
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
msgid "Option"
msgstr ""
-#: server/stdinhand.c:1973
+#: server/stdinhand.c:1871
msgid "description"
msgstr ""
-#: server/stdinhand.c:2042
+#: server/stdinhand.c:1940
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:2092
+#: server/stdinhand.c:1966
msgid "Cannot change teams once game has begun."
msgstr ""
-#: server/stdinhand.c:2102
+#: server/stdinhand.c:1976
msgid "Undefined argument. Usage: team <player> <team>."
msgstr ""
-#: server/stdinhand.c:2122
+#: server/stdinhand.c:1996
#, c-format
msgid "No such team %s. Please give a valid team name or number."
msgstr ""
-#: server/stdinhand.c:2129
+#: server/stdinhand.c:2003
msgid "Cannot team a barbarian."
msgstr ""
-#: server/stdinhand.c:2135
+#: server/stdinhand.c:2009
#, c-format
msgid "Player %s set to team %s."
msgstr ""
-#: server/stdinhand.c:2157
-msgid "Undefined arguments. Usage: vote yes|no [vote number]."
+#: server/stdinhand.c:2035 server/voting.c:512
+msgid "Teamvote"
msgstr ""
-#: server/stdinhand.c:2165
-msgid "Observers cannot vote."
+#: server/stdinhand.c:2035 server/voting.c:516
+msgid "Vote"
msgstr ""
-#: server/stdinhand.c:2168
+#: server/stdinhand.c:2037
+#, c-format
msgid ""
-"You can only vote in a running game. Use 'first' to become the game "
-"organizer if there currently is none."
+"%s %d \"%s\" (needs %0.0f%%%s): %d for, %d against, and %d abstained out of %"
+"d players."
msgstr ""
-#: server/stdinhand.c:2181
-#, c-format
-msgid "Vote %d \"%s\": %d for, %d against"
+#: server/stdinhand.c:2041
+msgid " no dissent"
msgstr ""
-#: server/stdinhand.c:2188
+#: server/stdinhand.c:2049
msgid "There are no votes going on."
msgstr ""
-#: server/stdinhand.c:2208
-msgid "No legal last vote."
+#: server/stdinhand.c:2077
+msgid "Invalid arguments. Usage: vote yes|no|abstain [vote number]."
msgstr ""
-#: server/stdinhand.c:2213
-msgid "Value must be integer."
+#: server/stdinhand.c:2095 server/stdinhand.c:2213 server/stdinhand.c:3714
+msgid "You are not allowed to use this command."
msgstr ""
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2104
+#, c-format
+msgid "The argument \"%s\" is ambigious."
+msgstr ""
+
+#: server/stdinhand.c:2119
+msgid "There are no votes running."
+msgstr ""
+
+#: server/stdinhand.c:2121
+#, c-format
+msgid "No legal last vote (%d %s)."
+msgstr ""
+
+#: server/stdinhand.c:2122
+msgid "other vote running"
+msgid_plural "other votes running"
+msgstr[0] ""
+msgstr[1] ""
+
+#: server/stdinhand.c:2129 server/stdinhand.c:2491 server/stdinhand.c:2532
+msgid "Value must be an integer."
+msgstr ""
+
+#: server/stdinhand.c:2135 server/stdinhand.c:2221
#, c-format
msgid "No such vote (%d)."
msgstr ""
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2141
+msgid "You are not allowed to vote on that."
+msgstr ""
+
+#: server/stdinhand.c:2146
#, c-format
msgid "You voted for \"%s\""
msgstr ""
-#: server/stdinhand.c:2232
+#: server/stdinhand.c:2150
#, c-format
msgid "You voted against \"%s\""
msgstr ""
-#: server/stdinhand.c:2259
+#: server/stdinhand.c:2155
+#, c-format
+msgid "You abstained from voting on \"%s\""
+msgstr ""
+
+#: server/stdinhand.c:2190
+msgid "Missing argument <vote number> or the string \"all\"."
+msgstr ""
+
+#: server/stdinhand.c:2197
+msgid "You don't have any vote going on."
+msgstr ""
+
+#: server/stdinhand.c:2204
+msgid "There isn't any vote going on."
+msgstr ""
+
+#: server/stdinhand.c:2209
+msgid "Server: All votes have been removed."
+msgstr ""
+
+#: server/stdinhand.c:2226
+#, c-format
+msgid "You are not allowed to cancel this vote (%d)."
+msgstr ""
+
+#: server/stdinhand.c:2232
+msgid "Usage: /cancelvote [<vote number>|all]"
+msgstr ""
+
+#: server/stdinhand.c:2241
+#, c-format
+msgid "Server: %s cancelled the vote \"%s\" (number %d)."
+msgstr ""
+
+#: server/stdinhand.c:2247
+#, c-format
+msgid "Server: The vote \"%s\" (number %d) has been cancelled."
+msgstr ""
+
+#: server/stdinhand.c:2265
msgid ""
"Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
"<x> <y> | unit <id> | tech <player> | timing | info>."
msgstr ""
-#: server/stdinhand.c:2265
+#: server/stdinhand.c:2271
msgid "Can only use this command once game has begun."
msgstr ""
-#: server/stdinhand.c:2294
+#: server/stdinhand.c:2300
#, c-format
msgid "%s diplomacy no longer debugged"
msgstr ""
-#: server/stdinhand.c:2298
+#: server/stdinhand.c:2304
#, c-format
msgid "%s diplomacy debugged"
msgstr ""
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2323
#, c-format
msgid "%s tech no longer debugged"
msgstr ""
-#: server/stdinhand.c:2321
+#: server/stdinhand.c:2327
#, c-format
msgid "%s tech debugged"
msgstr ""
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2358 server/stdinhand.c:2388
msgid "Value 2 & 3 must be integer."
msgstr ""
-#: server/stdinhand.c:2356 server/stdinhand.c:2386
+#: server/stdinhand.c:2362 server/stdinhand.c:2392
msgid "Bad map coordinates."
msgstr ""
-#: server/stdinhand.c:2361
+#: server/stdinhand.c:2367
msgid "No city at this coordinate."
msgstr ""
-#: server/stdinhand.c:2366
+#: server/stdinhand.c:2372
#, c-format
msgid "%s no longer debugged"
msgstr ""
-#: server/stdinhand.c:2392 server/stdinhand.c:2422
+#: server/stdinhand.c:2398 server/stdinhand.c:2428
#, c-format
msgid "%s %s no longer debugged."
msgstr ""
-#: server/stdinhand.c:2397 server/stdinhand.c:2427
+#: server/stdinhand.c:2403 server/stdinhand.c:2433
#, c-format
msgid "%s %s debugged."
msgstr ""
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2419
msgid "Value 2 must be integer."
msgstr ""
-#: server/stdinhand.c:2417
+#: server/stdinhand.c:2423
#, c-format
msgid "Unit %d does not exist."
msgstr ""
-#: server/stdinhand.c:2475
+#: server/stdinhand.c:2464
msgid "Undefined argument. Usage: set <option> <value>."
msgstr ""
-#: server/stdinhand.c:2485
+#: server/stdinhand.c:2473
msgid "You are not allowed to set this option."
msgstr ""
-#: server/stdinhand.c:2490 server/stdinhand.c:3463
+#: server/stdinhand.c:2478 server/stdinhand.c:3501
msgid "This setting can't be modified after the game has started."
msgstr ""
-#: server/stdinhand.c:2502 server/stdinhand.c:2543
-msgid "Value must be an integer."
-msgstr ""
-
-#: server/stdinhand.c:2512
+#: server/stdinhand.c:2501
#, c-format
msgid "The parameter %s should only contain digits 0-1."
msgstr ""
-#: server/stdinhand.c:2519
+#: server/stdinhand.c:2508
msgid "Value out of range (minimum: 0, maximum: 1)."
msgstr ""
-#: server/stdinhand.c:2534 server/stdinhand.c:2576
+#: server/stdinhand.c:2523 server/stdinhand.c:2565
#, c-format
msgid "Option: %s has been set to %d."
msgstr ""
-#: server/stdinhand.c:2554
+#: server/stdinhand.c:2543
#, c-format
msgid "The parameter %s should only contain +- and 0-9."
msgstr ""
-#: server/stdinhand.c:2561
+#: server/stdinhand.c:2550
#, c-format
msgid "Value out of range (minimum: %d, maximum: %d)."
msgstr ""
-#: server/stdinhand.c:2586
+#: server/stdinhand.c:2575
msgid "String value too long. Usage: set <option> <value>."
msgstr ""
-#: server/stdinhand.c:2600
+#: server/stdinhand.c:2589
#, c-format
msgid "Option: %s has been set to \"%s\"."
msgstr ""
-#: server/stdinhand.c:2658
+#: server/stdinhand.c:2652
msgid "Sorry, one can't observe globally in this game."
msgstr ""
-#: server/stdinhand.c:2661
+#: server/stdinhand.c:2655
msgid "Sorry, you can't take a global observer. Observe it instead."
msgstr ""
-#: server/stdinhand.c:2671
+#: server/stdinhand.c:2665
msgid "You cannot take a new player at this time."
msgstr ""
#. TRANS: Do not translate "maxplayers".
-#: server/stdinhand.c:2679
+#: server/stdinhand.c:2673
#, c-format
msgid ""
"You cannot take a new player because the maximum of %d player has already "
@@ -5505,73 +5581,73 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: server/stdinhand.c:2691
+#: server/stdinhand.c:2685
msgid "You cannot take a new player because there are no free player slots."
msgstr ""
-#: server/stdinhand.c:2702
+#: server/stdinhand.c:2696
msgid "Sorry, one can't observe barbarians in this game."
msgstr ""
-#: server/stdinhand.c:2705
+#: server/stdinhand.c:2699
msgid "Sorry, one can't take barbarians in this game."
msgstr ""
-#: server/stdinhand.c:2713
+#: server/stdinhand.c:2707
msgid "Sorry, one can't observe dead players in this game."
msgstr ""
-#: server/stdinhand.c:2716
+#: server/stdinhand.c:2710
msgid "Sorry, one can't take dead players in this game."
msgstr ""
-#: server/stdinhand.c:2724
+#: server/stdinhand.c:2718
msgid "Sorry, one can't observe AI players in this game."
msgstr ""
-#: server/stdinhand.c:2727
+#: server/stdinhand.c:2721
msgid "Sorry, one can't take AI players in this game."
msgstr ""
-#: server/stdinhand.c:2736
+#: server/stdinhand.c:2730
msgid "Sorry, one can't observe human players in this game."
msgstr ""
-#: server/stdinhand.c:2739
+#: server/stdinhand.c:2733
msgid "Sorry, one can't take human players in this game."
msgstr ""
-#: server/stdinhand.c:2749
+#: server/stdinhand.c:2743
msgid "Sorry, one can't observe in this game."
msgstr ""
-#: server/stdinhand.c:2754
+#: server/stdinhand.c:2748
msgid "Sorry, one can't take players in this game."
msgstr ""
-#: server/stdinhand.c:2760
+#: server/stdinhand.c:2754
msgid "Sorry, one can't take players already connected in this game."
msgstr ""
-#: server/stdinhand.c:2791
+#: server/stdinhand.c:2785
msgid "Usage: observe [connection-name [player-name]]"
msgstr ""
-#: server/stdinhand.c:2797
+#: server/stdinhand.c:2791
msgid "Usage: observe [player-name]"
msgstr ""
-#: server/stdinhand.c:2847
+#: server/stdinhand.c:2841
#, c-format
msgid "%s already controls %s. Using 'observe' would remove %s"
msgstr ""
-#: server/stdinhand.c:2858
+#: server/stdinhand.c:2852
#, c-format
msgid "%s is already observing %s."
msgstr ""
-#: server/stdinhand.c:2863
+#: server/stdinhand.c:2857
#, c-format
msgid "%s is already observing."
msgstr ""
@@ -5586,230 +5662,234 @@ msgstr ""
msgid "%s now observes"
msgstr ""
-#: server/stdinhand.c:2969
+#: server/stdinhand.c:2971
msgid "Usage: take <connection-name> <player-name>"
msgstr ""
-#: server/stdinhand.c:2974
+#: server/stdinhand.c:2976
msgid "Usage: take <player-name>"
msgstr ""
-#: server/stdinhand.c:2980
+#: server/stdinhand.c:2982
msgid "Usage: take [connection-name] <player-name>"
msgstr ""
-#: server/stdinhand.c:3010
+#: server/stdinhand.c:3012
#, c-format
msgid "%s already controls %s."
msgstr ""
-#: server/stdinhand.c:3024
+#: server/stdinhand.c:3026
#, c-format
msgid "There is no free player slot for %s."
msgstr ""
-#: server/stdinhand.c:3059
+#: server/stdinhand.c:3061
#, c-format
msgid "being detached from %s."
msgstr ""
-#: server/stdinhand.c:3135
+#: server/stdinhand.c:3146
#, c-format
msgid "%s now controls %s (%s, %s)."
msgstr ""
-#: server/stdinhand.c:3139 server/stdinhand.c:4260
+#: server/stdinhand.c:3150 server/stdinhand.c:4308
#: data/nation/barbarian.ruleset:3
msgid "Barbarian"
msgstr ""
-#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
+#: server/stdinhand.c:3152 server/stdinhand.c:4310 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-sdl/plrdlg.c:645
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr ""
-#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-gtk-2.0/pages.c:2125
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
+#: server/stdinhand.c:3153 server/stdinhand.c:4312
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-gtk-2.0/pages.c:2127
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/connectdlg.c:215
msgid "Human"
msgstr ""
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-gtk-2.0/pages.c:2124 client/gui-win32/connectdlg.c:200
-#: client/gui-win32/connectdlg.c:212
+#: server/stdinhand.c:3155 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-gtk-2.0/pages.c:2126 client/gui-win32/connectdlg.c:202
+#: client/gui-win32/connectdlg.c:214
msgid "Alive"
msgstr ""
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3156 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-win32/connectdlg.c:202
msgid "Dead"
msgstr ""
-#: server/stdinhand.c:3147
+#: server/stdinhand.c:3159
#, c-format
msgid "%s failed to attach to any player."
msgstr ""
-#: server/stdinhand.c:3182
+#: server/stdinhand.c:3194
msgid "Usage: detach <connection-name>"
msgstr ""
-#: server/stdinhand.c:3202
+#: server/stdinhand.c:3214
msgid "You can not detach other users."
msgstr ""
-#: server/stdinhand.c:3211
+#: server/stdinhand.c:3223
#, c-format
msgid "%s is not attached to any player."
msgstr ""
-#: server/stdinhand.c:3234
+#: server/stdinhand.c:3246
#, c-format
msgid "%s detaching from %s"
msgstr ""
-#: server/stdinhand.c:3240
+#: server/stdinhand.c:3252
#, c-format
msgid "%s no longer observing."
msgstr ""
-#: server/stdinhand.c:3259
+#: server/stdinhand.c:3271
#, c-format
msgid "detaching from %s."
msgstr ""
-#: server/stdinhand.c:3345
+#: server/stdinhand.c:3361
msgid "Usage: load <game name>"
msgstr ""
-#: server/stdinhand.c:3350
+#: server/stdinhand.c:3366
msgid "Cannot load a game while another is running."
msgstr ""
-#: server/stdinhand.c:3372
+#: server/stdinhand.c:3388
#, c-format
msgid "Cannot find savegame or scenario with the name \"%s\"."
msgstr ""
-#: server/stdinhand.c:3389
+#: server/stdinhand.c:3405
#, c-format
msgid "Could not load savefile: %s"
msgstr ""
-#: server/stdinhand.c:3458
+#: server/stdinhand.c:3496
#, c-format
msgid "Current ruleset directory is \"%s\""
msgstr ""
-#: server/stdinhand.c:3478
+#: server/stdinhand.c:3516
#, c-format
msgid "Ruleset directory \"%s\" not found"
msgstr ""
-#: server/stdinhand.c:3484
+#: server/stdinhand.c:3522
#, c-format
msgid "Ruleset directory is already \"%s\""
msgstr ""
-#: server/stdinhand.c:3488
+#: server/stdinhand.c:3526
#, c-format
msgid "Ruleset directory set to \"%s\""
msgstr ""
-#: server/stdinhand.c:3536
+#: server/stdinhand.c:3574
msgid "Goodbye."
msgstr ""
-#: server/stdinhand.c:3567
+#: server/stdinhand.c:3606
msgid "Sorry, you are not allowed to use server commands."
msgstr ""
-#: server/stdinhand.c:3603
+#: server/stdinhand.c:3656
#, c-format
msgid "Warning: '%s' interpreted as '%s', but it is ambiguous. Try '%shelp'."
msgstr ""
-#: server/stdinhand.c:3608
+#: server/stdinhand.c:3661
#, c-format
msgid "Unknown command. Try '%shelp'."
msgstr ""
-#: server/stdinhand.c:3625
-msgid "Your new vote canceled your previous vote."
+#: server/stdinhand.c:3675
+msgid "Your new vote cancelled your previous vote."
msgstr ""
-#: server/stdinhand.c:3633
-#, c-format
-msgid "New vote (number %d) by %s: %s."
+#: server/stdinhand.c:3688
+msgid "New teamvote"
msgstr ""
-#: server/stdinhand.c:3645
+#: server/stdinhand.c:3691
+msgid "New vote"
+msgstr ""
+
+#: server/stdinhand.c:3695
#, c-format
-msgid "Your new vote (\"%s\") was not legal or was not recognized."
+msgid "%s (number %d) by %s: %s"
msgstr ""
-#: server/stdinhand.c:3655
-msgid "You are not allowed to use this command."
+#: server/stdinhand.c:3704
+#, c-format
+msgid "Your new vote (\"%s\") was not legal or was not recognized."
msgstr ""
-#: server/stdinhand.c:3680
+#: server/stdinhand.c:3726
msgid "(server prompt)"
msgstr ""
-#: server/stdinhand.c:3787
+#: server/stdinhand.c:3835
msgid "Game ended in a draw."
msgstr ""
-#: server/stdinhand.c:3791
+#: server/stdinhand.c:3839
msgid ""
"Ending the game. The server will restart once all clients have disconnected."
msgstr ""
-#: server/stdinhand.c:3796
+#: server/stdinhand.c:3844
msgid "Cannot end the game: no game running."
msgstr ""
-#: server/stdinhand.c:3812
+#: server/stdinhand.c:3860
#, c-format
msgid "%s has conceded the game and can no longer win."
msgstr ""
-#: server/stdinhand.c:3817
+#: server/stdinhand.c:3865
msgid "You cannot surrender now."
msgstr ""
-#: server/stdinhand.c:3883
+#: server/stdinhand.c:3931
msgid "Not enough human players, game will not start."
msgstr ""
-#: server/stdinhand.c:3888
+#: server/stdinhand.c:3936
msgid "No players, game will not start."
msgstr ""
-#: server/stdinhand.c:3892
+#: server/stdinhand.c:3940
msgid "Not enough nations for all players, game will not start."
msgstr ""
-#: server/stdinhand.c:3901
+#: server/stdinhand.c:3949
msgid "All players are ready; starting game."
msgstr ""
-#: server/stdinhand.c:3915
+#: server/stdinhand.c:3963
msgid ""
"Cannot start the game: the game is waiting for all clients to disconnect."
msgstr ""
-#: server/stdinhand.c:3922
+#: server/stdinhand.c:3970
msgid "Cannot start the game: it is already running."
msgstr ""
-#: server/stdinhand.c:3953
+#: server/stdinhand.c:4001
#, c-format
msgid "Cutting connection %s."
msgstr ""
-#: server/stdinhand.c:3972
+#: server/stdinhand.c:4020
msgid ""
"Welcome - this is the introductory help text for the Freeciv server.\n"
"\n"
@@ -5830,123 +5910,123 @@ msgid ""
" quit - to exit"
msgstr ""
-#: server/stdinhand.c:4007 server/stdinhand.c:4010
+#: server/stdinhand.c:4055 server/stdinhand.c:4058
msgid "Command:"
msgstr ""
-#: server/stdinhand.c:4014
+#: server/stdinhand.c:4062
msgid "Synopsis: "
msgstr ""
-#: server/stdinhand.c:4023
+#: server/stdinhand.c:4071
#, c-format
msgid "Level: %s"
msgstr ""
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4096
msgid "The following server commands are available:"
msgstr ""
-#: server/stdinhand.c:4123
+#: server/stdinhand.c:4171
#, c-format
msgid "Help argument '%s' is ambiguous."
msgstr ""
-#: server/stdinhand.c:4128
+#: server/stdinhand.c:4176
#, c-format
msgid "No match for help argument '%s'."
msgstr ""
-#: server/stdinhand.c:4194
+#: server/stdinhand.c:4242
#, c-format
msgid "Bad list argument: '%s'. Try '%shelp list'."
msgstr ""
-#: server/stdinhand.c:4234
+#: server/stdinhand.c:4282
msgid "List of players:"
msgstr ""
-#: server/stdinhand.c:4239
+#: server/stdinhand.c:4287
msgid "<no players>"
msgstr ""
-#: server/stdinhand.c:4256
+#: server/stdinhand.c:4304
#, c-format
msgid "user %s, "
msgstr ""
-#: server/stdinhand.c:4267
+#: server/stdinhand.c:4315
msgid ", Dead"
msgstr ""
-#: server/stdinhand.c:4270
+#: server/stdinhand.c:4318
#, c-format
msgid ", difficulty level %s"
msgstr ""
#. TRANS: continue list, in case comma is not the separator of choice.
-#: server/stdinhand.c:4275 server/stdinhand.c:4279 client/helpdata.c:257
-#: client/helpdata.c:752 client/text.c:241 client/text.c:1224
-#: client/text.c:1262
+#: server/stdinhand.c:4323 server/stdinhand.c:4327 client/helpdata.c:257
+#: client/helpdata.c:752 client/text.c:241 client/text.c:1229
+#: client/text.c:1267
#, c-format
msgid "?clistmore:, %s"
msgstr ""
-#: server/stdinhand.c:4283
+#: server/stdinhand.c:4331
msgid ", ready"
msgstr ""
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4333
msgid ", not ready"
msgstr ""
-#: server/stdinhand.c:4293
+#: server/stdinhand.c:4341
#, c-format
msgid " %d connection:"
msgid_plural " %d connections:"
msgstr[0] ""
msgstr[1] ""
-#: server/stdinhand.c:4299
+#: server/stdinhand.c:4347
#, c-format
msgid " %s from %s (command access level %s), bufsize=%dkb"
msgstr ""
-#: server/stdinhand.c:4304
+#: server/stdinhand.c:4352
msgid " (observer mode)"
msgstr ""
-#: server/stdinhand.c:4322
+#: server/stdinhand.c:4370
msgid "List of teams:"
msgstr ""
#. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4332
+#: server/stdinhand.c:4380
#, c-format
msgid "%2d : '%s' : %d player"
msgid_plural "%2d : '%s' : %d players"
msgstr[0] ""
msgstr[1] ""
-#: server/stdinhand.c:4352
+#: server/stdinhand.c:4400
#, c-format
msgid "%2d : '%s' : 1 player : %s"
msgstr ""
-#: server/stdinhand.c:4360
+#: server/stdinhand.c:4408
#, c-format
msgid "Empty team: %s"
msgstr ""
-#: server/stdinhand.c:4371
+#: server/stdinhand.c:4419
msgid "List of connections to server:"
msgstr ""
-#: server/stdinhand.c:4375
+#: server/stdinhand.c:4423
msgid "<no connections>"
msgstr ""
-#: server/stdinhand.c:4399
+#: server/stdinhand.c:4447
msgid "List of scenarios available:"
msgstr ""
@@ -5965,65 +6045,65 @@ msgstr ""
msgid "%s acquired from %s!"
msgstr ""
-#: server/techtools.c:220
+#: server/techtools.c:221
#, c-format
msgid ""
"Discovery of %s makes the government form %s available. You may want to "
"start a revolution."
msgstr ""
-#: server/techtools.c:301
+#: server/techtools.c:302
#, c-format
msgid "Discovery of %s OBSOLETES %s in %s!"
msgstr ""
-#: server/techtools.c:351
+#: server/techtools.c:352
#, c-format
msgid "Learned %s. Our scientists focus on %s; goal is %s."
msgstr ""
-#: server/techtools.c:369
+#: server/techtools.c:370
#, c-format
msgid "Learned %s. Scientists choose to research %s."
msgstr ""
-#: server/techtools.c:376
+#: server/techtools.c:377
#, c-format
msgid "Learned %s. "
msgstr ""
-#: server/techtools.c:379
+#: server/techtools.c:380
#, c-format
msgid "Researching %s."
msgstr ""
-#: server/techtools.c:385
+#: server/techtools.c:386
#, c-format
msgid "Learned %s. Scientists do not know what to research next."
msgstr ""
-#: server/techtools.c:402
+#: server/techtools.c:403
msgid ""
"Great scientists from all the world join your civilization: you get an "
"immediate advance."
msgstr ""
-#: server/techtools.c:570
+#: server/techtools.c:571
#, c-format
msgid "Technology goal is %s."
msgstr ""
-#: server/techtools.c:700
+#: server/techtools.c:708
#, c-format
msgid "You steal %s from the %s."
msgstr ""
-#: server/techtools.c:705
+#: server/techtools.c:713
#, c-format
msgid "The %s stole %s from you!"
msgstr ""
-#: server/techtools.c:710
+#: server/techtools.c:718
#, c-format
msgid "The %s have stolen %s from the %s."
msgstr ""
@@ -6047,177 +6127,183 @@ msgstr ""
msgid "%s upgraded to %s for %d gold."
msgstr ""
-#: server/unithand.c:396
+#: server/unithand.c:402
#, c-format
msgid "%s refuses to disband!"
msgstr ""
-#: server/unithand.c:449
+#: server/unithand.c:455
msgid "Can't place city here."
msgstr ""
-#: server/unithand.c:456
+#: server/unithand.c:462
#, c-format
msgid "Only %s can build a city."
msgstr ""
-#: server/unithand.c:461
+#: server/unithand.c:467
msgid "Can't build a city."
msgstr ""
-#: server/unithand.c:470
+#: server/unithand.c:476
#, c-format
msgid "Only %s can add to a city."
msgstr ""
-#: server/unithand.c:475
+#: server/unithand.c:481
msgid "Can't add to a city."
msgstr ""
-#: server/unithand.c:481
+#: server/unithand.c:487
#, c-format
msgid "%s unit has no moves left to add to %s."
msgstr ""
-#: server/unithand.c:487
+#: server/unithand.c:493
#, c-format
msgid "%s unit has no moves left to build city."
msgstr ""
-#: server/unithand.c:492
+#. TRANS: <city> is owned by <nation>, cannot add <unit>.
+#: server/unithand.c:499
+#, c-format
+msgid "%s is owned by %s, cannot add %s."
+msgstr ""
+
+#: server/unithand.c:506
#, c-format
msgid "%s is too big to add %s."
msgstr ""
-#: server/unithand.c:498
+#: server/unithand.c:512
#, c-format
msgid "%s needs an improvement to grow, so you cannot add %s."
msgstr ""
-#: server/unithand.c:509
+#: server/unithand.c:523
#, c-format
msgid "Can't add %s to %s."
msgstr ""
-#: server/unithand.c:531
+#: server/unithand.c:545
#, c-format
msgid "%s added to aid %s in growing."
msgstr ""
-#: server/unithand.c:828
+#: server/unithand.c:842
msgid "Your Nuclear missile was shot down by SDI defences, what a waste."
msgstr ""
-#: server/unithand.c:831
+#: server/unithand.c:845
#, c-format
msgid "The nuclear attack on %s was avoided by your SDI defense."
msgstr ""
#. TRANS: "Your Cannon ... the Polish Destroyer."
-#: server/unithand.c:901
+#: server/unithand.c:915
#, c-format
msgid "Your %s survived the pathetic attack from the %s %s."
msgstr ""
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unithand.c:910
+#: server/unithand.c:924
#, c-format
msgid "Your attacking %s failed against the %s %s!"
msgstr ""
-#: server/unithand.c:983
+#: server/unithand.c:997
#, c-format
msgid "Only %s can attack from sea."
msgstr ""
-#: server/unithand.c:988
+#: server/unithand.c:1002
msgid "Cannot attack from sea."
msgstr ""
-#: server/unithand.c:996 server/unittools.c:2137
+#: server/unithand.c:1010 server/unittools.c:2142
msgid "Cannot attack unless you declare war first."
msgstr ""
-#: server/unithand.c:1001
+#: server/unithand.c:1015
#, c-format
msgid "%s can only move into your own zone of control."
msgstr ""
-#: server/unithand.c:1007
+#: server/unithand.c:1021
#, c-format
msgid "Cannot invade unless you break peace with %s first."
msgstr ""
-#: server/unithand.c:1052
+#: server/unithand.c:1066
msgid "This unit has no moves left."
msgstr ""
-#: server/unithand.c:1107
+#: server/unithand.c:1121
msgid "Unit must be on land to perform diplomatic action."
msgstr ""
-#: server/unithand.c:1109
+#: server/unithand.c:1123
msgid "No diplomat action possible."
msgstr ""
-#: server/unithand.c:1125
+#: server/unithand.c:1139
#, c-format
msgid "You must declare war on %s first. Try using players dialog (F3)."
msgstr ""
-#: server/unithand.c:1143
+#: server/unithand.c:1157
msgid "This unit is being transported, and so cannot bombard."
msgstr ""
-#: server/unithand.c:1158
+#: server/unithand.c:1172
msgid "You can't attack there."
msgstr ""
-#: server/unithand.c:1180
+#: server/unithand.c:1194
msgid "This type of troops cannot take over a city."
msgstr ""
-#: server/unithand.c:1198
+#: server/unithand.c:1212
msgid "A transported unit is not allied to all units or city on target tile."
msgstr ""
-#: server/unithand.c:1240
+#: server/unithand.c:1254
#, c-format
msgid "Your %s helps build the %s in %s (%d remaining)."
msgstr ""
-#: server/unithand.c:1242
+#: server/unithand.c:1256
#, c-format
msgid "Your %s helps build the %s in %s (%d surplus)."
msgstr ""
-#: server/unithand.c:1286
+#: server/unithand.c:1300
#, c-format
msgid ""
"Sorry, your %s cannot establish a trade route because it has no home city"
msgstr ""
-#: server/unithand.c:1296
+#: server/unithand.c:1310
#, c-format
msgid "Sorry, your %s cannot establish a trade route between %s and %s"
msgstr ""
-#: server/unithand.c:1325 server/unithand.c:1344
+#: server/unithand.c:1339 server/unithand.c:1358
#, c-format
msgid "Sorry, your %s cannot establish a trade route here!"
msgstr ""
-#: server/unithand.c:1329 server/unithand.c:1348
+#: server/unithand.c:1343 server/unithand.c:1362
#, c-format
msgid " The city of %s already has %d better trade routes!"
msgstr ""
-#: server/unithand.c:1361 server/unithand.c:1373
+#: server/unithand.c:1375 server/unithand.c:1387
#, c-format
msgid "Sorry, %s has canceled the trade route from %s to your city %s."
msgstr ""
-#: server/unithand.c:1406
+#: server/unithand.c:1420
#, c-format
msgid ""
"Your %s from %s has arrived in %s, and revenues amount to %d in gold and "
@@ -6276,55 +6362,55 @@ msgid "Teleported your %s to %s."
msgstr ""
#. TRANS: A unit is moved to resolve stack conflicts.
-#: server/unittools.c:1065
+#: server/unittools.c:1070
#, c-format
msgid "Moved your %s."
msgstr ""
-#: server/unittools.c:1076
+#: server/unittools.c:1081
#, c-format
msgid "Disbanded your %s."
msgstr ""
-#: server/unittools.c:1397
+#: server/unittools.c:1402
#, c-format
msgid "Unable to defend %s, %s has lost the game."
msgstr ""
-#: server/unittools.c:1401
+#: server/unittools.c:1406
#, c-format
msgid "Losing %s meant losing the game! Be more careful next time!"
msgstr ""
-#: server/unittools.c:1503
+#: server/unittools.c:1508
#, c-format
msgid "%s escaped the destruction of %s, and fled to %s."
msgstr ""
-#: server/unittools.c:1512
+#: server/unittools.c:1517
#, c-format
msgid "%s lost when %s was lost."
msgstr ""
-#: server/unittools.c:1561
+#: server/unittools.c:1566
#, c-format
msgid "Barbarian leader captured, %d gold ransom paid."
msgstr ""
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unittools.c:1579
+#: server/unittools.c:1584
#, c-format
msgid "Your attacking %s succeeded against the %s %s!"
msgstr ""
#. TRANS: "Cannon ... the Polish Destroyer."
-#: server/unittools.c:1588 server/unittools.c:1646
+#: server/unittools.c:1593 server/unittools.c:1651
#, c-format
msgid "%s lost to an attack by the %s %s."
msgstr ""
#. TRANS: "... Cannon ... the Polish Destroyer ...."
-#: server/unittools.c:1622
+#: server/unittools.c:1627
#, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -6334,14 +6420,14 @@ msgstr[1] ""
#. TRANS: "Cannon lost when the Polish Destroyer
#. * attacked the German Musketeers."
-#: server/unittools.c:1655
+#: server/unittools.c:1660
#, c-format
msgid "%s lost when the %s %s attacked the %s %s."
msgstr ""
#. TRANS: "Musketeers (and Cannon) lost to an
#. * attack from the Polish Destroyer."
-#: server/unittools.c:1670
+#: server/unittools.c:1675
#, c-format
msgid "%s (and %s) lost to an attack from the %s %s."
msgstr ""
@@ -6349,7 +6435,7 @@ msgstr ""
#. TRANS: "Musketeers and 3 other units lost to
#. * an attack from the Polish Destroyer."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1680
+#: server/unittools.c:1685
#, 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."
@@ -6359,178 +6445,220 @@ msgstr[1] ""
#. TRANS: "2 units lost when the Polish Destroyer
#. * attacked the German Musketeers."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1694
+#: server/unittools.c:1699
#, 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] ""
-#: server/unittools.c:1962
+#: server/unittools.c:1967
#, c-format
msgid "Your %s was nuked by %s."
msgstr ""
-#: server/unittools.c:1965 server/unittools.c:1981
+#: server/unittools.c:1970 server/unittools.c:1986
msgid "yourself"
msgstr ""
-#: server/unittools.c:1969
+#: server/unittools.c:1974
#, c-format
msgid "The %s %s was nuked."
msgstr ""
-#: server/unittools.c:1978
+#: server/unittools.c:1983
#, c-format
msgid "%s was nuked by %s."
msgstr ""
-#: server/unittools.c:1986
+#: server/unittools.c:1991
#, c-format
msgid "You nuked %s."
msgstr ""
-#: server/unittools.c:2027
+#: server/unittools.c:2032
#, c-format
msgid "The %s detonated a nuke!"
msgstr ""
-#: server/unittools.c:2051
+#: server/unittools.c:2056
#, c-format
msgid "%s transported successfully."
msgstr ""
-#: server/unittools.c:2103
+#: server/unittools.c:2108
msgid "This unit type can not be paradropped."
msgstr ""
-#: server/unittools.c:2113
+#: server/unittools.c:2118
msgid "You cannot paradrop a unit that is transporting other units."
msgstr ""
-#: server/unittools.c:2119
+#: server/unittools.c:2124
msgid "The destination location is not known."
msgstr ""
-#: server/unittools.c:2126
+#: server/unittools.c:2131
#, c-format
msgid "This unit cannot paradrop into %s."
msgstr ""
-#: server/unittools.c:2146
+#: server/unittools.c:2151
#, c-format
msgid "The distance to the target (%i) is greater than the unit's range (%i)."
msgstr ""
-#: server/unittools.c:2157
+#: server/unittools.c:2162
#, c-format
msgid "Your %s paradropped into the %s and was lost."
msgstr ""
-#: server/unittools.c:2170
+#: server/unittools.c:2175
#, c-format
msgid "Your %s was killed by enemy units at the paradrop destination."
msgstr ""
-#: server/unittools.c:2192
+#: server/unittools.c:2197
#, c-format
msgid "You found %d gold."
msgstr ""
-#: server/unittools.c:2209
+#: server/unittools.c:2214
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr ""
-#: server/unittools.c:2216
+#: server/unittools.c:2221
#, c-format
msgid "The %s have acquired %s from ancient scrolls of wisdom."
msgstr ""
-#: server/unittools.c:2230
+#: server/unittools.c:2235
msgid "A band of friendly mercenaries joins your cause."
msgstr ""
-#: server/unittools.c:2248
+#: server/unittools.c:2253
msgid "An abandoned village is here."
msgstr ""
-#: server/unittools.c:2258
+#: server/unittools.c:2263
msgid "You have unleashed a horde of barbarians!"
msgstr ""
-#: server/unittools.c:2261
+#: server/unittools.c:2266
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr ""
-#: server/unittools.c:2277
+#: server/unittools.c:2282
msgid "You found a friendly city."
msgstr ""
-#: server/unittools.c:2291
+#: server/unittools.c:2296
msgid "Friendly nomads are impressed by you, and join you."
msgstr ""
-#: server/unittools.c:2316
+#: server/unittools.c:2321
msgid "Your overflight frightens the tribe; they scatter in terror."
msgstr ""
-#: server/unittools.c:2574
+#: server/unittools.c:2579
#, c-format
msgid "Orders for %s aborted after enemy movement was spotted."
msgstr ""
-#: server/unittools.c:3023
+#: server/unittools.c:3028
#, c-format
msgid "Orders for %s aborted as there are units nearby."
msgstr ""
-#: server/unittools.c:3075
+#: server/unittools.c:3080
#, c-format
msgid "Orders for %s aborted because building of city failed."
msgstr ""
-#: server/unittools.c:3088
+#: server/unittools.c:3093
#, c-format
msgid "Orders for %s aborted since they give an invalid activity."
msgstr ""
-#: server/unittools.c:3102
+#: server/unittools.c:3107
#, c-format
msgid "Orders for %s aborted since they give an invalid location."
msgstr ""
-#: server/unittools.c:3112
+#: server/unittools.c:3117
#, c-format
msgid "Orders for %s aborted as there are units in the way."
msgstr ""
-#: server/unittools.c:3138
+#: server/unittools.c:3143
#, c-format
msgid "Orders for %s aborted because of failed move."
msgstr ""
-#: server/unittools.c:3179
+#: server/unittools.c:3184
#, c-format
msgid "Attempt to change homecity for %s failed."
msgstr ""
-#: server/unittools.c:3190
+#: server/unittools.c:3195
#, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr ""
-#: server/unittools.c:3202
+#: server/unittools.c:3207
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr ""
-#: server/unittools.c:3211
+#: server/unittools.c:3216
#, c-format
msgid "Your %s has invalid orders."
msgstr ""
+#: server/voting.c:522
+#, c-format
+msgid ""
+"%s %d \"%s\" is passed %d to %d with %d abstentions and %d who did not vote."
+msgstr ""
+
+#: server/voting.c:528
+#, c-format
+msgid ""
+"%s %d \"%s\" failed with %d against, %d for, %d abstentions and %d who did "
+"not vote."
+msgstr ""
+
+#: server/voting.c:548
+#, c-format
+msgid "%s %d: %s voted yes."
+msgstr ""
+
+#: server/voting.c:553
+#, c-format
+msgid "%s %d: %s voted no."
+msgstr ""
+
+#: server/voting.c:558
+#, c-format
+msgid "%s %d: %s chose to abstain."
+msgstr ""
+
+#. TRANS: Describing a new vote that can only pass
+#. * if there are no dissenting votes.
+#: server/voting.c:726
+#, c-format
+msgid "%s (needs %0.0f%% and no dissent)."
+msgstr ""
+
+#. TRANS: Describing a new vote that can pass only if the
+#. * given percentage of players votes 'yes'.
+#: server/voting.c:732
+#, c-format
+msgid "%s (needs %0.0f%% in favor)."
+msgstr ""
+
#: server/generator/mapgen.c:1771
msgid "High landmass - this may take a few seconds."
msgstr ""
@@ -6558,12 +6686,12 @@ msgid ""
"Please report this bug at %s."
msgstr ""
-#: client/attribute.c:363
+#: client/attribute.c:368
msgid ""
"There has been a CMA error. Your citizen governor settings may be broken."
msgstr ""
-#: client/attribute.c:367
+#: client/attribute.c:372
msgid "Old attributes detected and removed."
msgstr ""
@@ -6710,41 +6838,41 @@ msgstr ""
msgid "%+4d : Taxed from trade\n"
msgstr ""
-#: client/citydlg_common.c:418
+#: client/citydlg_common.c:421
#, c-format
msgid "%+4d : Trade route with %s\n"
msgstr ""
-#: client/citydlg_common.c:427
+#: client/citydlg_common.c:430
#, c-format
msgid "%+4d : Building tithes\n"
msgstr ""
-#: client/citydlg_common.c:450
+#: client/citydlg_common.c:453
#, c-format
msgid "%+4d : Bonus from %s (%+d%%)\n"
msgstr ""
-#: client/citydlg_common.c:462
+#: client/citydlg_common.c:465
#, c-format
msgid "%+4d : Waste\n"
msgstr ""
-#: client/citydlg_common.c:468
+#: client/citydlg_common.c:471
#, c-format
msgid "%+4d : Disorder\n"
msgstr ""
-#: client/citydlg_common.c:474
+#: client/citydlg_common.c:477
#, c-format
msgid "%+4d : Used\n"
msgstr ""
-#: client/citydlg_common.c:479
+#: client/citydlg_common.c:482
msgid "==== : Adds up to\n"
msgstr ""
-#: client/citydlg_common.c:481
+#: client/citydlg_common.c:484
#, c-format
msgid "%4d : Total surplus"
msgstr ""
@@ -7049,48 +7177,48 @@ msgstr ""
msgid "Specialists"
msgstr ""
-#: client/civclient.c:240
+#: client/civclient.c:241
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr ""
-#: client/civclient.c:250
+#: client/civclient.c:251
msgid " -l, --log FILE\tUse FILE as logfile (spawned server also uses this)\n"
msgstr ""
-#: client/civclient.c:252
+#: client/civclient.c:253
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr ""
-#: client/civclient.c:254
+#: client/civclient.c:255
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr ""
-#: client/civclient.c:256
+#: client/civclient.c:257
msgid " -p, --port PORT\tConnect to server port PORT (usually with -a)\n"
msgstr ""
-#: client/civclient.c:258
+#: client/civclient.c:259
#, c-format
msgid " -P, --Plugin PLUGIN\tUse PLUGIN for sound output %s\n"
msgstr ""
-#: client/civclient.c:260
+#: client/civclient.c:261
msgid " -r, --read FILE\tRead startup script FILE (for spawned server only)\n"
msgstr ""
-#: client/civclient.c:263
+#: client/civclient.c:264
msgid " -s, --server HOST\tConnect to the server at HOST (usually with -a)\n"
msgstr ""
-#: client/civclient.c:265
+#: client/civclient.c:266
msgid " -S, --Sound FILE\tRead sound tags from FILE\n"
msgstr ""
-#: client/civclient.c:266
+#: client/civclient.c:267
msgid " -t, --tiles FILE\tUse data file FILE.tilespec for tiles\n"
msgstr ""
-#: client/civclient.c:269
+#: client/civclient.c:270
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7098,45 +7226,45 @@ msgid ""
msgstr ""
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:274
+#: client/civclient.c:275
#, c-format
msgid "Report bugs at %s\n"
msgstr ""
-#: client/civclient.c:298
+#: client/civclient.c:299
#, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr ""
-#: client/civclient.c:300 client/civclient.c:315
+#: client/civclient.c:301 client/civclient.c:316
msgid "Try using --help.\n"
msgstr ""
-#: client/civclient.c:313
+#: client/civclient.c:314
#, c-format
msgid "Invalid debug level \"%s\" specified with --debug option.\n"
msgstr ""
-#: client/civclient.c:326
+#: client/civclient.c:327
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr ""
-#: client/civclient.c:391
+#: client/civclient.c:393
#, c-format
msgid "Updating old metaserver address \"%s\"."
msgstr ""
-#: client/civclient.c:394
+#: client/civclient.c:396
#, c-format
msgid "Default metaserver has been set to \"%s\"."
msgstr ""
-#: client/civclient.c:550
+#: client/civclient.c:540
msgid "Game started."
msgstr ""
-#: client/civclient.c:588
+#: client/civclient.c:606
msgid "There was an error while auto connecting; aborting."
msgstr ""
@@ -7266,75 +7394,75 @@ msgstr ""
msgid "Disconnected from server."
msgstr ""
-#: client/clinet.c:469
+#: client/clinet.c:473
#, c-format
msgid "Failed to contact server \"%s\" at port %d as \"%s\" after %d attempts"
msgstr ""
-#: client/clinet.c:484 client/clinet.c:486
+#: client/clinet.c:488 client/clinet.c:490
msgid "Connection to server refused. Please start the server."
msgstr ""
-#: client/clinet.c:495 client/clinet.c:523
+#: client/clinet.c:499 client/clinet.c:527
#, c-format
msgid ""
"Error contacting server \"%s\" at port %d as \"%s\":\n"
" %s\n"
msgstr ""
-#: client/clinet.c:514
+#: client/clinet.c:518
#, c-format
msgid ""
"Auto-connecting to server \"%s\" at port %d as \"%s\" every %f second(s) for "
"%d times"
msgstr ""
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
+#: client/connectdlg_common.c:78 client/gui-gtk-2.0/pages.c:1358
msgid "novice"
msgstr ""
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1358
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
msgid "easy"
msgstr ""
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1359
msgid "normal"
msgstr ""
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr ""
-#: client/connectdlg_common.c:83
+#: client/connectdlg_common.c:82
msgid "experimental"
msgstr ""
-#: client/connectdlg_common.c:213
+#: client/connectdlg_common.c:212
msgid "Starting server..."
msgstr ""
-#: client/connectdlg_common.c:332
+#: client/connectdlg_common.c:331
msgid "Couldn't start the server."
msgstr ""
-#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
+#: client/connectdlg_common.c:332 client/connectdlg_common.c:365
msgid "You'll have to start one manually. Sorry..."
msgstr ""
-#: client/connectdlg_common.c:364
+#: client/connectdlg_common.c:363
msgid "Couldn't connect to the server."
msgstr ""
-#: client/connectdlg_common.c:365
+#: client/connectdlg_common.c:364
msgid "We probably couldn't start it from here."
msgstr ""
-#: client/connectdlg_common.c:470
+#: client/connectdlg_common.c:469
msgid ""
"Established control over the server. You have command access level 'hack'."
msgstr ""
-#: client/connectdlg_common.c:475
+#: client/connectdlg_common.c:474
msgid ""
"Failed to obtain the required access level to take control of the server. "
"The server will now be shutdown."
@@ -7344,27 +7472,27 @@ msgstr ""
msgid "Only transporter units can be unloaded."
msgstr ""
-#: client/control.c:1425
+#: client/control.c:1417
msgid "Only settler units can be put into auto mode."
msgstr ""
-#: client/control.c:1516
+#: client/control.c:1511
msgid "Only nuclear units can do this."
msgstr ""
-#: client/control.c:1545
+#: client/control.c:1540
msgid "Only paratrooper units can do this."
msgstr ""
-#: client/control.c:2020
+#: client/control.c:2015
msgid "Too far for this unit."
msgstr ""
-#: client/control.c:2230 client/control.c:2260 client/control.c:2276
+#: client/control.c:2225 client/control.c:2255 client/control.c:2271
msgid "Didn't find a route to the destination!"
msgstr ""
-#: client/control.c:2320
+#: client/control.c:2315
msgid "Oh my! You seem to have no capital!"
msgstr ""
@@ -7744,115 +7872,122 @@ msgstr ""
#. * last two elements
#. TRANS: List of possible output types has this between
#. * last two elements
-#: client/helpdata.c:1066 client/helpdata.c:1400
+#: client/helpdata.c:1066 client/helpdata.c:1408
msgid " or "
msgstr ""
-#: client/helpdata.c:1068 client/helpdata.c:1388
+#: client/helpdata.c:1068 client/helpdata.c:1396
msgid "?or:, "
msgstr ""
-#: client/helpdata.c:1080
+#: client/helpdata.c:1079
#, 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"
+msgid "* Unit has to be in a city, or a base after %d turn.\n"
+msgid_plural "* Unit has to be in a city, or a base after %d turns.\n"
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1122
+#: client/helpdata.c:1087
+#, c-format
+msgid "* Unit has to be in a city, a base, or on a %s after %d turn.\n"
+msgid_plural "* Unit has to be in a city, a base, or on a %s after %d turns.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: client/helpdata.c:1130
#, c-format
msgid "If we would now start with %s we would need %d bulbs."
msgstr ""
-#: client/helpdata.c:1127
+#: client/helpdata.c:1135
#, 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:1135
+#: client/helpdata.c:1143
msgid "You cannot research this technology."
msgstr ""
-#: client/helpdata.c:1139
+#: client/helpdata.c:1147
msgid " This number may vary depending on what other players will research.\n"
msgstr ""
-#: client/helpdata.c:1151
+#: client/helpdata.c:1159
#, c-format
msgid "* The first player to research %s gets an immediate advance.\n"
msgstr ""
-#: client/helpdata.c:1156
+#: client/helpdata.c:1164
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
msgstr ""
-#: client/helpdata.c:1159
+#: client/helpdata.c:1167
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
msgstr ""
-#: client/helpdata.c:1163
+#: client/helpdata.c:1171
msgid "* Increases the pollution generated by the population.\n"
msgstr ""
-#: client/helpdata.c:1168
+#: client/helpdata.c:1176
#, c-format
msgid "* Allows %s to build roads on river squares.\n"
msgstr ""
-#: client/helpdata.c:1175
+#: client/helpdata.c:1183
#, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr ""
-#: client/helpdata.c:1183
+#: client/helpdata.c:1191
#, c-format
msgid "* Allows %s to build airbases.\n"
msgstr ""
-#: client/helpdata.c:1192
+#: client/helpdata.c:1200
#, c-format
msgid "* Allows %s to upgrade roads to railroads.\n"
msgstr ""
-#: client/helpdata.c:1200
+#: client/helpdata.c:1208
#, c-format
msgid "* Allows %s to upgrade irrigation to farmland.\n"
msgstr ""
-#: client/helpdata.c:1234
+#: client/helpdata.c:1242
msgid "* Pollution cannot be generated on this terrain."
msgstr ""
-#: client/helpdata.c:1239
+#: client/helpdata.c:1247
msgid "* You cannot build cities on this terrain."
msgstr ""
-#: client/helpdata.c:1245
+#: client/helpdata.c:1253
msgid "* The coastline of this terrain is unsafe."
msgstr ""
-#: client/helpdata.c:1250
+#: client/helpdata.c:1258
msgid "* This terrain is unsafe for units to travel on."
msgstr ""
-#: client/helpdata.c:1255
+#: client/helpdata.c:1263
msgid "* Land units cannot travel on oceanic terrains."
msgstr ""
-#: client/helpdata.c:1305
+#: client/helpdata.c:1313
msgid "Features:\n"
msgstr ""
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1411 client/helpdata.c:1412
+#: client/helpdata.c:1419 client/helpdata.c:1420
msgid "?outputlist: Nothing "
msgstr ""
-#: client/helpdata.c:1419
+#: client/helpdata.c:1427
#, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -7863,7 +7998,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1429
+#: client/helpdata.c:1437
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -7871,48 +8006,48 @@ msgid ""
msgstr ""
#. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1437
+#: client/helpdata.c:1445
#, c-format
msgid "* You pay %d times normal %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1442
+#: client/helpdata.c:1450
#, 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:1447
+#: client/helpdata.c:1455
#, c-format
msgid "* You pay no %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1451
+#: client/helpdata.c:1459
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:1460
+#: client/helpdata.c:1468
#, 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:1468
+#: client/helpdata.c:1476
#, c-format
msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
msgstr ""
-#: client/helpdata.c:1475
+#: client/helpdata.c:1483
#, 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:1482
+#: client/helpdata.c:1490
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -7920,23 +8055,23 @@ msgid ""
msgstr ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1489
+#: client/helpdata.c:1497
#, 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:1497
+#: client/helpdata.c:1505
#, c-format
msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
msgstr ""
-#: client/helpdata.c:1502
+#: client/helpdata.c:1510
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr ""
-#: client/helpdata.c:1507
+#: client/helpdata.c:1515
#, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -7947,7 +8082,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1519
+#: client/helpdata.c:1527
#, 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"
@@ -7955,60 +8090,60 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1530
+#: client/helpdata.c:1538
#, 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:1536
+#: client/helpdata.c:1544
msgid "* Your units cannot be bribed.\n"
msgstr ""
-#: client/helpdata.c:1539
+#: client/helpdata.c:1547
msgid "* Your cities cannot be incited.\n"
msgstr ""
-#: client/helpdata.c:1543
+#: client/helpdata.c:1551
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:1549
+#: client/helpdata.c:1557
msgid "* Has a senate that may prevent declaration of war.\n"
msgstr ""
-#: client/helpdata.c:1553
+#: client/helpdata.c:1561
msgid "* Allows partisans when cities are taken by the enemy.\n"
msgstr ""
-#: client/helpdata.c:1557
+#: client/helpdata.c:1565
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
msgstr ""
-#: client/helpdata.c:1561
+#: client/helpdata.c:1569
msgid "* Pays no upkeep for fanatics.\n"
msgstr ""
-#: client/helpdata.c:1564
+#: client/helpdata.c:1572
msgid "* Has no unhappy citizens.\n"
msgstr ""
-#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
+#: client/helpdata.c:1582 client/helpdata.c:1586 client/helpdata.c:1590
#, c-format
msgid "* Veteran %s units.\n"
msgstr ""
-#: client/helpdata.c:1585
+#: client/helpdata.c:1593
msgid "* Veteran units.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1591
+#: client/helpdata.c:1599
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8016,7 +8151,7 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1600
+#: client/helpdata.c:1608
#, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8024,71 +8159,71 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1608
+#: client/helpdata.c:1616
#, 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:1617
+#: client/helpdata.c:1625
#, c-format
msgid "* %s production is increased %d%%.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1625
+#: client/helpdata.c:1633
#, c-format
msgid "* %s production will suffer massive waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1630
+#: client/helpdata.c:1638
#, c-format
msgid "* %s production will suffer some waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1635
+#: client/helpdata.c:1643
#, 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:1643
+#: client/helpdata.c:1651
#, 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:1649
+#: client/helpdata.c:1657
#, 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:1655
+#: client/helpdata.c:1663
#, c-format
msgid "* %s waste will increase slowly with distance from capital.\n"
msgstr ""
-#: client/helpdata.c:1672
+#: client/helpdata.c:1680
#, c-format
msgid "* Allows you to build %s.\n"
msgstr ""
#. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1699
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d %s"
msgstr ""
-#: client/helpdata.c:1700 client/helpdata.c:1708 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1708 client/helpdata.c:1716 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:1707
+#: client/helpdata.c:1715
#, c-format
msgid "%s%d unhappy"
msgstr ""
@@ -8157,7 +8292,7 @@ msgid ""
"or with the -a command-line parameter."
msgstr ""
-#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:916 data/Freeciv.in:107
msgid "Metaserver"
msgstr ""
@@ -8506,35 +8641,35 @@ msgstr ""
msgid "Saved settings to file %s"
msgstr ""
-#: client/packhand.c:211 client/packhand.c:217
+#: client/packhand.c:212 client/packhand.c:218
msgid "You were rejected from the game...."
msgstr ""
-#: client/packhand.c:229
+#: client/packhand.c:230
#, c-format
msgid "Client capability string: %s"
msgstr ""
-#: client/packhand.c:232
+#: client/packhand.c:233
#, c-format
msgid "Server capability string: %s"
msgstr ""
-#: client/packhand.c:850
+#: client/packhand.c:864
#, c-format
msgid "Start of turn %d"
msgstr ""
-#: client/packhand.c:1591
+#: client/packhand.c:1621
#, c-format
msgid "AI Mode is now %s."
msgstr ""
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "ON"
msgstr ""
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "OFF"
msgstr ""
@@ -8565,15 +8700,15 @@ msgstr ""
msgid "Username"
msgstr ""
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
-#: client/gui-gtk-2.0/pages.c:2157
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:653
+#: client/gui-gtk-2.0/pages.c:1604 client/gui-gtk-2.0/pages.c:2159
msgid "Flag"
msgstr ""
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1605
-#: client/gui-gtk-2.0/pages.c:2159 client/gui-sdl/repodlgs.c:2063
-#: client/gui-win32/connectdlg.c:990 client/gui-win32/dialogs.c:542
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:657
+#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1609
+#: client/gui-gtk-2.0/pages.c:2161 client/gui-sdl/repodlgs.c:2063
+#: client/gui-win32/connectdlg.c:992 client/gui-win32/dialogs.c:542
#: client/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr ""
@@ -8586,7 +8721,7 @@ msgstr ""
msgid "Score"
msgstr ""
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1614
msgid "Team"
msgstr ""
@@ -8619,36 +8754,36 @@ msgstr ""
msgid "Ping"
msgstr ""
-#: client/repodlgs_common.c:375
+#: client/repodlgs_common.c:378
msgid "You cannot sell improvements."
msgstr ""
-#: client/repodlgs_common.c:391
+#: client/repodlgs_common.c:394
#, c-format
msgid "Sold %d %s for %d gold."
msgstr ""
-#: client/repodlgs_common.c:396
+#: client/repodlgs_common.c:399
#, c-format
msgid "No %s could be sold."
msgstr ""
#. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:415
+#: client/repodlgs_common.c:418
msgid "You cannot disband units."
msgstr ""
-#: client/repodlgs_common.c:420
+#: client/repodlgs_common.c:423
#, c-format
msgid "%s cannot be disbanded."
msgstr ""
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:444
#, c-format
msgid "Disbanded %d %s."
msgstr ""
-#: client/repodlgs_common.c:445
+#: client/repodlgs_common.c:448
#, c-format
msgid "No %s could be disbanded."
msgstr ""
@@ -9228,47 +9363,47 @@ msgstr ""
msgid "?duration:overflow"
msgstr ""
-#: client/text.c:1143
+#: client/text.c:1145
#, c-format
msgid "%6d.%02d ms"
msgstr ""
#. TRANS: <nation adjective> <government name>.
#. * E.g. "Polish Republic".
-#: client/text.c:1188
+#: client/text.c:1193
#, c-format
msgid "?nationgovernment:%s %s"
msgstr ""
#. TRANS: "Observer: 1985"
-#: client/text.c:1198
+#: client/text.c:1203
#, c-format
msgid "Observer: %s"
msgstr ""
-#: client/text.c:1216
+#: client/text.c:1221
msgid "Buildings: "
msgstr ""
-#: client/text.c:1233 client/text.c:1272
+#: client/text.c:1238 client/text.c:1277
msgid "None. "
msgstr ""
-#: client/text.c:1235 client/text.c:1274
+#: client/text.c:1240 client/text.c:1279
msgid "?clistend:."
msgstr ""
-#: client/text.c:1253
+#: client/text.c:1258
msgid "Wonders: "
msgstr ""
-#: client/text.c:1308
+#: client/text.c:1313
#, c-format
msgid "Cities: %d total, %d over threshold of %d cities."
msgstr ""
#. TRANS: 0-21 content [citizen(s)] ...
-#: client/text.c:1312
+#: client/text.c:1317
#, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
@@ -9276,60 +9411,60 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1318
+#: client/text.c:1323
#, c-format
msgid "%d additional unhappy citizen."
msgid_plural "%d additional unhappy citizens."
msgstr[0] ""
msgstr[1] ""
-#: client/text.c:1339
+#: client/text.c:1344
msgid "Unlimited martial law in effect."
msgstr ""
-#: client/text.c:1341
+#: client/text.c:1346
#, c-format
msgid "%d military unit may impose martial law."
msgid_plural "Up to %d military units may impose martial law."
msgstr[0] ""
msgstr[1] ""
-#: client/text.c:1345
+#: client/text.c:1350
#, c-format
msgid "Each military unit makes %d unhappy citizen content."
msgid_plural "Each military unit makes %d unhappy citizens content."
msgstr[0] ""
msgstr[1] ""
-#: client/text.c:1352
+#: client/text.c:1357
msgid "Military units in the field may cause unhappiness. "
msgstr ""
-#: client/text.c:1355
+#: client/text.c:1360
msgid "Military units have no happiness effect. "
msgstr ""
-#: client/text.c:1370
+#: client/text.c:1375
#, c-format
msgid "Luxury: %d total."
msgstr ""
-#: client/tilespec.c:865
+#: client/tilespec.c:882
msgid "No usable default tileset found, aborting!"
msgstr ""
-#: client/tilespec.c:1338
+#: client/tilespec.c:1355
msgid ""
"Client does not support isometric tilesets. Using default tileset instead."
msgstr ""
-#: client/tilespec.c:1347
+#: client/tilespec.c:1364
msgid ""
"Client does not support overhead view tilesets. Using default tileset "
"instead."
msgstr ""
-#: client/tilespec.c:3966
+#: client/tilespec.c:3987
#, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -9980,7 +10115,7 @@ msgid "_Display"
msgstr ""
#: client/gui-gtk-2.0/cityrep.c:1006 client/gui-gtk-2.0/menu.c:839
-#: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
+#: client/gui-sdl/diplodlg.c:692 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
#: client/gui-xaw/cityrep.c:533 client/gui-xaw/menu.c:156
@@ -10148,192 +10283,192 @@ msgstr ""
msgid "Remove this preset?"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:222
+#: client/gui-gtk-2.0/dialogs.c:197 client/gui-gtk-2.0/messagewin.c:222
msgid "Goto _Location"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
+#: client/gui-gtk-2.0/dialogs.c:202 client/gui-gtk-2.0/messagewin.c:226
msgid "Inspect _City"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:258 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:258 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:259 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:311 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:312 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:312 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:313 client/gui-win32/dialogs.c:1755
#: data/Freeciv.in:2502
msgid "Select what to pillage:"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:506
+#: client/gui-gtk-2.0/dialogs.c:507
msgid "Unit"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:950
-#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2155
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:985
+#: client/gui-gtk-2.0/dialogs.c:508 client/gui-gtk-2.0/pages.c:950
+#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2157
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:987
#: client/gui-win32/plrdlg.c:335 manual/civmanual.c:302 data/Freeciv.in:80
msgid "Name"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:519 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:520 client/gui-sdl/dialogs.c:627
msgid "Unit selection"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:582
+#: client/gui-gtk-2.0/dialogs.c:583
msgid "_Ready all"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:590
+#: client/gui-gtk-2.0/dialogs.c:591
msgid "_Sentry idle"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:719
+#: client/gui-gtk-2.0/dialogs.c:721
msgid "Nation _Groups:"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:766 data/Freeciv.in:3128
msgid "What Nation Will You Be?"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
-#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
+#: client/gui-gtk-2.0/dialogs.c:768 client/gui-sdl/chatline.c:842
+#: client/gui-win32/connectdlg.c:1040 data/Freeciv.in:3371
msgid "Pick Nation"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:774
+#: client/gui-gtk-2.0/dialogs.c:776
msgid "_Random Nation"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:792 client/gui-win32/dialogs.c:517
msgid "Select a nation"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:804
+#: client/gui-gtk-2.0/dialogs.c:810
msgid "_Properties"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:824
+#: client/gui-gtk-2.0/dialogs.c:830
msgid "_Leader:"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:831
+#: client/gui-gtk-2.0/dialogs.c:837
msgid "_Female"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:836
+#: client/gui-gtk-2.0/dialogs.c:842
msgid "_Male"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:863
+#: client/gui-gtk-2.0/dialogs.c:869
msgid "City _Styles:"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:902
+#: client/gui-gtk-2.0/dialogs.c:908
msgid "_Description"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1263 client/gui-xaw/dialogs.c:1480
msgid "You must select your sex."
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:1253 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1268 client/gui-xaw/dialogs.c:1485
msgid "You must select your city style."
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:1262 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1277 client/gui-sdl/dialogs.c:2204
#: 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:1306 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1318 client/gui-win32/citydlg.c:1454
#: data/Freeciv.in:2484
msgid "Upgrade Unit!"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1327 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 ""
-#: client/gui-gtk-2.0/diplodlg.c:231 client/gui-win32/diplodlg.c:151
+#: client/gui-gtk-2.0/diplodlg.c:222 client/gui-win32/diplodlg.c:151
#: client/gui-xaw/diplodlg.c:383 client/gui-xaw/diplodlg.c:401
msgid "World-map"
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:237 client/gui-win32/diplodlg.c:146
+#: client/gui-gtk-2.0/diplodlg.c:228 client/gui-win32/diplodlg.c:146
#: client/gui-xaw/diplodlg.c:387 client/gui-xaw/diplodlg.c:405
msgid "Sea-map"
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:243
+#: client/gui-gtk-2.0/diplodlg.c:234
msgid "_Maps"
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:274
+#: client/gui-gtk-2.0/diplodlg.c:265
msgid "_Advances"
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/diplodlg.c:315 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:333
+#: client/gui-gtk-2.0/diplodlg.c:324
msgid "_Give shared vision"
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:346
+#: client/gui-gtk-2.0/diplodlg.c:337
msgid "Give _embassy"
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:376
+#: client/gui-gtk-2.0/diplodlg.c:368
msgid "_Pacts"
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:466
+#: client/gui-gtk-2.0/diplodlg.c:458
#, c-format
msgid "Diplomacy: %s"
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:473
+#: client/gui-gtk-2.0/diplodlg.c:465
msgid "_Cancel meeting"
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:475
+#: client/gui-gtk-2.0/diplodlg.c:467
msgid "Accept _treaty"
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:503
+#: client/gui-gtk-2.0/diplodlg.c:495
msgid "C_lauses:"
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:568 client/gui-gtk-2.0/diplodlg.c:642
+#: client/gui-gtk-2.0/diplodlg.c:560 client/gui-gtk-2.0/diplodlg.c:634
msgid "_Gold:"
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:580 client/gui-gtk-2.0/diplodlg.c:654
+#: client/gui-gtk-2.0/diplodlg.c:572 client/gui-gtk-2.0/diplodlg.c:646
msgid "_Add Clause..."
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:699
+#: client/gui-gtk-2.0/diplodlg.c:691
msgid "--- This treaty is blank. Please add some clauses. ---"
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:905 client/gui-sdl/diplodlg.c:375
+#: client/gui-gtk-2.0/diplodlg.c:897 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 ""
@@ -10392,99 +10527,99 @@ msgstr ""
msgid "Show _All Cities"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:164
msgid "Show Map Scrollbars"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:163
+#: client/gui-gtk-2.0/gui_main.c:165
msgid "Disable this option to hide the scrollbars on the map view."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:169
msgid "Keyboardless goto"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:168
+#: client/gui-gtk-2.0/gui_main.c:170
msgid ""
"If this option is set then a goto may be initiated by left-clicking and then "
"holding down the mouse button while dragging the mouse onto a different tile."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:173
+#: client/gui-gtk-2.0/gui_main.c:175
msgid "Keep dialogs on top"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:174
+#: client/gui-gtk-2.0/gui_main.c:176
msgid ""
"If this option is set then dialog windows will always remain in front of the "
"main Freeciv window. Disabling this has no effect in fullscreen mode."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:178
+#: client/gui-gtk-2.0/gui_main.c:180
msgid "Show worklist task icons"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:179
+#: client/gui-gtk-2.0/gui_main.c:181
msgid ""
"Disabling this will turn off the unit and building icons in the worklist "
"dialog and the production tab of the city dialog."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:183
+#: client/gui-gtk-2.0/gui_main.c:185
msgid "Enable status report tabs"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:184
+#: client/gui-gtk-2.0/gui_main.c:186
msgid ""
"If this option is enabled then report dialogs will be shown as separate tabs "
"rather than in popup dialogs."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:189 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:191 client/gui-win32/gui_main.c:110
msgid "Better fog-of-war drawing"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:190 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:192 client/gui-win32/gui_main.c:111
msgid ""
"If this is enabled then a better method is used for drawing fog-of-war. It "
"is not any slower but will consume about twice as much memory."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:195
+#: client/gui-gtk-2.0/gui_main.c:197
msgid "Show time for each chat message"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:196
+#: client/gui-gtk-2.0/gui_main.c:198
msgid ""
"If this option is enabled then all chat messages will be prefixed by a time "
"string of the form [hour:minute:second]."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:201
+#: client/gui-gtk-2.0/gui_main.c:203
msgid "Split bottom notebook area"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:202
+#: client/gui-gtk-2.0/gui_main.c:204
msgid ""
"Enabling this option will split the bottom notebook into a left and right "
"notebook so that two tabs may be viewed at once."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:207
+#: client/gui-gtk-2.0/gui_main.c:209
msgid "New message events go to top of list"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:208
+#: client/gui-gtk-2.0/gui_main.c:210
msgid ""
"If this option is enabled, new events in the message window will appear at "
"the top of the list, rather than being appended at the bottom."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:213
+#: client/gui-gtk-2.0/gui_main.c:215
msgid "Show extra message window buttons"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:214
+#: client/gui-gtk-2.0/gui_main.c:216
msgid ""
"If this option is enabled, there will be two buttons displayed in the "
"message window for inspecting a city and going to a location. If this option "
@@ -10494,21 +10629,21 @@ msgid ""
"closed and reopened."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:224
+#: client/gui-gtk-2.0/gui_main.c:226
msgid "Metaserver tab first in network page"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:225
+#: client/gui-gtk-2.0/gui_main.c:227
msgid ""
"If this option is enabled, the metaserver tab will be the first notebook tab "
"in the network page. This option requires a restart in order to take effect."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:230
+#: client/gui-gtk-2.0/gui_main.c:232
msgid "Plain chat messages are sent to allies only"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:231
+#: client/gui-gtk-2.0/gui_main.c:233
msgid ""
"If this option is enabled, then plain messages typed into the chat entry "
"while the game is running will only be sent to your allies. Otherwise plain "
@@ -10518,28 +10653,41 @@ msgid ""
"visible in multiplayer games)."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:340 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:245
+msgid "Arrange widgets for small displays"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:246
+msgid ""
+"If this option is enabled, widgets in the main window will be arrange so "
+"that they take up the least amount of total screen space. Specifically, the "
+"left panel containing the overview, player status, and the unit information "
+"box will be extended over the entire left side of the window. This option "
+"requires a restart in order to take effect."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:352 client/gui-xaw/gui_main.c:245
msgid ""
"This client has no special command line options\n"
"\n"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
+#: client/gui-gtk-2.0/gui_main.c:847 client/gui-gtk-2.0/gui_main.c:1542
msgid "Freeciv"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
+#: client/gui-gtk-2.0/gui_main.c:1251 client/gui-gtk-2.0/gui_main.c:1258
#: client/gui-sdl/mapctrl.c:1566 client/gui-win32/gui_main.c:482
#: data/Freeciv.in:2618
msgid "Turn Done"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1232 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1258 client/gui-sdl/mapctrl.c:1566
#: client/gui-sdl/mapview.c:1082
msgid "Shift+Return"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1266 client/gui-gtk-2.0/menu.c:797
+#: client/gui-gtk-2.0/gui_main.c:1299 client/gui-gtk-2.0/menu.c:797
#: client/gui-gtk-2.0/menu.c:799 client/gui-gtk-2.0/menu.c:801
#: client/gui-gtk-2.0/menu.c:803 client/gui-gtk-2.0/menu.c:805
#: client/gui-gtk-2.0/menu.c:807 client/gui-gtk-2.0/menu.c:809
@@ -10558,11 +10706,11 @@ msgstr ""
msgid "View"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1359
+#: client/gui-gtk-2.0/gui_main.c:1393
msgid "Chat"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1377 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1411 client/gui-win32/gui_main.c:538
#: data/Freeciv.in:2809
msgid ""
"Freeciv is free software and you are welcome to distribute copies of it\n"
@@ -10570,84 +10718,84 @@ msgid ""
"Now.. Go give'em hell!"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1392
+#: client/gui-gtk-2.0/gui_main.c:1426
msgid "Allies Only"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1657
+#: client/gui-gtk-2.0/gui_main.c:1691
msgid "Not _ready"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
+#: client/gui-gtk-2.0/gui_main.c:1702 client/gui-gtk-2.0/pages.c:1679
msgid "_Ready"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1672 client/gui-gtk-2.0/gui_main.c:1678
-#: client/gui-gtk-2.0/pages.c:2204
+#: client/gui-gtk-2.0/gui_main.c:1706 client/gui-gtk-2.0/gui_main.c:1712
+#: client/gui-gtk-2.0/pages.c:2206
msgid "_Start"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1686
+#: client/gui-gtk-2.0/gui_main.c:1720
msgid "_Take Player"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
+#: client/gui-gtk-2.0/gui_main.c:1723 client/gui-gtk-2.0/pages.c:1669
msgid "Pick _Nation"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
+#: client/gui-gtk-2.0/gui_main.c:1730 client/gui-gtk-2.0/pages.c:1674
msgid "_Observe"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1698
+#: client/gui-gtk-2.0/gui_main.c:1732
msgid "Do not _observe"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1755 client/gui-xaw/pages.c:211
msgid "<AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1723
+#: client/gui-gtk-2.0/gui_main.c:1758
msgid "<Novice AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1726
+#: client/gui-gtk-2.0/gui_main.c:1761
msgid "<Easy AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1729
+#: client/gui-gtk-2.0/gui_main.c:1764
msgid "<Normal AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1732
+#: client/gui-gtk-2.0/gui_main.c:1767
msgid "<Hard AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1742 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1777 client/gui-win32/dialogs.c:594
#: client/gui-xaw/pages.c:217
msgid "Random"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1808
+#: client/gui-gtk-2.0/gui_main.c:1844 client/gui-gtk-2.0/gui_main.c:1858
msgid "Observer"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1808
+#: client/gui-gtk-2.0/gui_main.c:1858
msgid "Detached"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:2073
+#: client/gui-gtk-2.0/gui_main.c:2117
msgid "Are you sure you want to quit?"
msgstr ""
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
#, c-format
msgid ""
"Close Tab:\n"
"%s"
msgstr ""
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
msgid "Ctrl+W"
msgstr ""
@@ -10752,8 +10900,8 @@ msgid "Trans. Rslt/Time:"
msgstr ""
#: 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
-#: client/gui-win32/helpdlg.c:709 client/gui-win32/helpdlg.c:733
+#: client/gui-win32/helpdlg.c:502 client/gui-win32/helpdlg.c:550
+#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:739
#: client/gui-xaw/helpdlg.c:759 client/gui-xaw/helpdlg.c:808
#: client/gui-xaw/helpdlg.c:816 client/gui-xaw/helpdlg.c:853
#: client/gui-xaw/helpdlg.c:878
@@ -10800,34 +10948,34 @@ msgstr ""
msgid "?techhelp:"
msgstr ""
-#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:591
+#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:597
#: client/gui-xaw/helpdlg.c:996
#, c-format
msgid "+%d Trade / %d"
msgstr ""
-#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:595
+#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:601
#: client/gui-xaw/helpdlg.c:1000
#, c-format
msgid "no extra / %d"
msgstr ""
#: 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
-#: client/gui-win32/helpdlg.c:602 client/gui-win32/helpdlg.c:616
-#: client/gui-win32/helpdlg.c:635 client/gui-xaw/helpdlg.c:1002
+#: client/gui-gtk-2.0/helpdlg.c:1085 client/gui-win32/helpdlg.c:604
+#: client/gui-win32/helpdlg.c:608 client/gui-win32/helpdlg.c:622
+#: client/gui-win32/helpdlg.c:641 client/gui-xaw/helpdlg.c:1002
#: client/gui-xaw/helpdlg.c:1006 client/gui-xaw/helpdlg.c:1020
#: client/gui-xaw/helpdlg.c:1039
msgid "n/a"
msgstr ""
-#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:605
+#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:611
#: client/gui-xaw/helpdlg.c:1009
#, c-format
msgid "+%d Food / %d"
msgstr ""
-#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:619
+#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:625
#: client/gui-xaw/helpdlg.c:1023
#, c-format
msgid "+%d Res. / %d"
@@ -11583,41 +11731,41 @@ msgstr ""
msgid "Connect to Gaming _Zone"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:302
#: client/gui-xaw/connectdlg.c:326
msgid "Passwords don't match, enter password."
msgstr ""
#: client/gui-gtk-2.0/pages.c:779 client/gui-gtk-2.0/pages.c:820
-#: client/gui-win32/connectdlg.c:916
+#: client/gui-win32/connectdlg.c:918
msgid "Server Name"
msgstr ""
#: client/gui-gtk-2.0/pages.c:780 client/gui-gtk-2.0/pages.c:821
-#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:916
+#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:918
#: data/Freeciv.in:96
msgid "Port"
msgstr ""
#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Version"
msgstr ""
#: client/gui-gtk-2.0/pages.c:782 client/gui-gtk-2.0/pages.c:823
-#: client/gui-gtk-2.0/pages.c:2161 client/gui-win32/connectdlg.c:917
-#: client/gui-win32/connectdlg.c:995
+#: client/gui-gtk-2.0/pages.c:2163 client/gui-win32/connectdlg.c:919
+#: client/gui-win32/connectdlg.c:997
msgid "Status"
msgstr ""
#: client/gui-gtk-2.0/pages.c:783 client/gui-gtk-2.0/pages.c:824
#: client/gui-sdl/connectdlg.c:318 client/gui-sdl/plrdlg.c:330
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Players"
msgstr ""
#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
-#: client/gui-win32/connectdlg.c:918
+#: client/gui-win32/connectdlg.c:920
msgid "Comment"
msgstr ""
@@ -11649,9 +11797,9 @@ msgstr ""
msgid "Conf_irm Password:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2165
#: 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:1000
+#: client/gui-win32/citydlg.c:1083 client/gui-win32/connectdlg.c:1002
#: client/gui-win32/wldlg.c:800 client/gui-win32/wldlg.c:806
msgid "Type"
msgstr ""
@@ -11743,7 +11891,7 @@ msgstr ""
msgid "Ruleset _Version:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2195
msgid "_More Game Options..."
msgstr ""
@@ -11759,48 +11907,48 @@ msgstr ""
msgid "Ready"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1601
+#: client/gui-gtk-2.0/pages.c:1600
msgid "?player:Leader"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1732 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1734 client/gui-sdl/chatline.c:185
msgid "Choose Saved Game to Load"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1824
+#: client/gui-gtk-2.0/pages.c:1826
msgid "Choose Saved Game to _Load:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
-#: client/gui-gtk-2.0/pages.c:2451
+#: client/gui-gtk-2.0/pages.c:1846 client/gui-gtk-2.0/pages.c:2039
+#: client/gui-gtk-2.0/pages.c:2455
msgid "_Browse..."
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1911
+#: client/gui-gtk-2.0/pages.c:1913
msgid "Choose a Scenario"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1998
+#: client/gui-gtk-2.0/pages.c:2000
msgid "Choose a _Scenario:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:2173
+#: client/gui-gtk-2.0/pages.c:2175
msgid "Choose a _nation to play:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2367 client/gui-win32/menu.c:581
msgid "Select Location to Save"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2452 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:2489
+#: client/gui-gtk-2.0/pages.c:2493
msgid "Saved _Games:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:2516
+#: client/gui-gtk-2.0/pages.c:2520
msgid "Save _Filename:"
msgstr ""
@@ -12131,7 +12279,7 @@ msgstr ""
msgid "Total users logged in : %d"
msgstr ""
-#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1098
msgid "Back"
msgstr ""
@@ -12140,7 +12288,7 @@ msgid "Start"
msgstr ""
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:777
+#: client/gui-win32/connectdlg.c:779
msgid "Load Game"
msgstr ""
@@ -12180,9 +12328,9 @@ msgstr ""
#: client/gui-sdl/connectdlg.c:308 client/gui-sdl/connectdlg.c:617
#: client/gui-sdl/connectdlg.c:803 client/gui-sdl/connectdlg.c:985
#: client/gui-sdl/dialogs.c:452 client/gui-sdl/dialogs.c:2095
-#: client/gui-sdl/dialogs.c:2893 client/gui-sdl/diplomat_dialog.c:731
+#: client/gui-sdl/dialogs.c:2902 client/gui-sdl/diplomat_dialog.c:731
#: client/gui-sdl/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1043
#: client/gui-win32/dialogs.c:1772 client/gui-win32/finddlg.c:127
#: client/gui-win32/gotodlg.c:171 client/gui-win32/inputdlg.c:146
#: client/gui-win32/messagedlg.c:216 client/gui-win32/ratesdlg.c:328
@@ -12222,7 +12370,7 @@ msgid "Buy it?"
msgstr ""
#: 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
+#: client/gui-sdl/diplodlg.c:1336 client/gui-sdl/diplomat_dialog.c:1211
#: client/gui-sdl/diplomat_dialog.c:1417 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:221 client/gui-sdl/repodlgs.c:1559
#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
@@ -12238,7 +12386,7 @@ msgid "No"
msgstr ""
#: client/gui-sdl/citydlg.c:1215 client/gui-sdl/cma_fe.c:318
-#: client/gui-sdl/diplodlg.c:1345 client/gui-sdl/diplomat_dialog.c:1200
+#: client/gui-sdl/diplodlg.c:1346 client/gui-sdl/diplomat_dialog.c:1200
#: client/gui-sdl/diplomat_dialog.c:1407 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:232 client/gui-win32/repodlgs.c:578
#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
@@ -12538,7 +12686,7 @@ msgstr ""
msgid "Port :"
msgstr ""
-#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1100
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr ""
@@ -12645,23 +12793,23 @@ msgstr ""
msgid "REVOLUTION!"
msgstr ""
-#: client/gui-sdl/dialogs.c:2232 client/gui-sdl/dialogs.c:2620
+#: client/gui-sdl/dialogs.c:2237 client/gui-sdl/dialogs.c:2625
#: client/gui-win32/dialogs.c:567 data/Freeciv.in:3159
msgid "Female"
msgstr ""
-#: client/gui-sdl/dialogs.c:2234 client/gui-sdl/dialogs.c:2618
-#: client/gui-sdl/dialogs.c:2830 client/gui-win32/dialogs.c:565
+#: client/gui-sdl/dialogs.c:2239 client/gui-sdl/dialogs.c:2623
+#: client/gui-sdl/dialogs.c:2839 client/gui-win32/dialogs.c:565
msgid "Male"
msgstr ""
-#: client/gui-sdl/dialogs.c:2478 client/gui-sdl/dialogs.c:2902
+#: client/gui-sdl/dialogs.c:2483 client/gui-sdl/dialogs.c:2911
#: 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 ""
-#: client/gui-sdl/dialogs.c:2685 client/gui-win32/dialogs.c:505
+#: client/gui-sdl/dialogs.c:2694 client/gui-win32/dialogs.c:505
msgid "What nation will you be?"
msgstr ""
@@ -12688,77 +12836,77 @@ msgstr ""
msgid "Sea map"
msgstr ""
-#: client/gui-sdl/diplodlg.c:563
+#: client/gui-sdl/diplodlg.c:564
msgid "Give embassy"
msgstr ""
-#: client/gui-sdl/diplodlg.c:579 client/gui-win32/diplodlg.c:614
+#: client/gui-sdl/diplodlg.c:580 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 ""
-#: client/gui-sdl/diplodlg.c:613 client/gui-sdl/helpdlg.c:1956
+#: client/gui-sdl/diplodlg.c:614 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 ""
-#: client/gui-sdl/diplodlg.c:831 client/gui-win32/diplodlg.c:598
+#: client/gui-sdl/diplodlg.c:832 client/gui-win32/diplodlg.c:598
#: data/Freeciv.in:269
msgid "Diplomacy meeting"
msgstr ""
-#: client/gui-sdl/diplodlg.c:883 client/gui-win32/diplodlg.c:680
+#: client/gui-sdl/diplodlg.c:884 client/gui-win32/diplodlg.c:680
#: data/Freeciv.in:510
msgid "Cancel meeting"
msgstr ""
-#: client/gui-sdl/diplodlg.c:895 client/gui-win32/diplodlg.c:679
+#: client/gui-sdl/diplodlg.c:896 client/gui-win32/diplodlg.c:679
#: data/Freeciv.in:501
msgid "Accept treaty"
msgstr ""
#. TRANS: "Polish incident !" FIXME!!!
-#: client/gui-sdl/diplodlg.c:1304
+#: client/gui-sdl/diplodlg.c:1305
#, c-format
msgid "%s incident !"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1322
+#: client/gui-sdl/diplodlg.c:1323
msgid "Shall we declare WAR on them?"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1433
+#: client/gui-sdl/diplodlg.c:1434
msgid "Foreign Minister"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1449
+#: client/gui-sdl/diplodlg.c:1450
#, c-format
msgid ""
"Sir!, the %s ambassador has arrived\n"
"What are your wishes?"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1465
+#: client/gui-sdl/diplodlg.c:1466
msgid "Declare WAR"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1467 client/gui-win32/plrdlg.c:357
+#: client/gui-sdl/diplodlg.c:1468 client/gui-win32/plrdlg.c:357
msgid "Cancel Treaty"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1490 client/gui-win32/plrdlg.c:358
+#: client/gui-sdl/diplodlg.c:1491 client/gui-win32/plrdlg.c:358
#: data/Freeciv.in:3254
msgid "Withdraw vision"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1507
+#: client/gui-sdl/diplodlg.c:1508
msgid "Call Diplomatic Meeting"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1521
+#: client/gui-sdl/diplodlg.c:1522
msgid "Send him back"
msgstr ""
@@ -13464,12 +13612,12 @@ msgid "Leave Game"
msgstr ""
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1100 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1102 client/gui-xaw/menu.c:121
#: data/Freeciv.in:115 data/Freeciv.in:3180
msgid "Quit"
msgstr ""
-#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:967
msgid "Start New Game"
msgstr ""
@@ -13577,8 +13725,8 @@ msgstr ""
msgid "%s max rate : %d%%"
msgstr ""
-#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
-#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1085
+#: client/gui-win32/connectdlg.c:1093 data/Freeciv.in:155
msgid "Update"
msgstr ""
@@ -14033,67 +14181,67 @@ msgstr ""
msgid "Delete"
msgstr ""
-#: client/gui-win32/connectdlg.c:147
+#: client/gui-win32/connectdlg.c:149
msgid "Password:"
msgstr ""
-#: client/gui-win32/connectdlg.c:169
+#: client/gui-win32/connectdlg.c:171
msgid "Couldn't load the savegame"
msgstr ""
-#: client/gui-win32/connectdlg.c:284 client/gui-xaw/connectdlg.c:311
+#: client/gui-win32/connectdlg.c:286 client/gui-xaw/connectdlg.c:311
msgid "Verify Password"
msgstr ""
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:916 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr ""
-#: client/gui-win32/connectdlg.c:915
+#: client/gui-win32/connectdlg.c:917
msgid "Local Area Network"
msgstr ""
-#: client/gui-win32/connectdlg.c:949
+#: client/gui-win32/connectdlg.c:951
msgid "Welcome to Freeciv"
msgstr ""
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Load Saved Game"
msgstr ""
-#: client/gui-win32/connectdlg.c:969
+#: client/gui-win32/connectdlg.c:971
msgid "Connect To Network Game"
msgstr ""
-#: client/gui-win32/connectdlg.c:979
+#: client/gui-win32/connectdlg.c:981
msgid "Choose a nation to play"
msgstr ""
-#: client/gui-win32/connectdlg.c:1014
+#: client/gui-win32/connectdlg.c:1016
msgid "Number of players (Including AI):"
msgstr ""
-#: client/gui-win32/connectdlg.c:1022
+#: client/gui-win32/connectdlg.c:1024
msgid "AI skill level:"
msgstr ""
-#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1038 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr ""
-#: client/gui-win32/connectdlg.c:1040
+#: client/gui-win32/connectdlg.c:1042
msgid "Start Game"
msgstr ""
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Login:"
msgstr ""
-#: client/gui-win32/connectdlg.c:1061
+#: client/gui-win32/connectdlg.c:1063
msgid "Host:"
msgstr ""
-#: client/gui-win32/connectdlg.c:1062
+#: client/gui-win32/connectdlg.c:1064
msgid "Port:"
msgstr ""
@@ -14166,21 +14314,21 @@ msgid ""
"this is much slower."
msgstr ""
-#: client/gui-win32/helpdlg.c:769 client/gui-win32/helpdlg.c:792
-#: client/gui-win32/helpdlg.c:803 client/gui-win32/helpdlg.c:809
-#: client/gui-win32/helpdlg.c:822
+#: client/gui-win32/helpdlg.c:775 client/gui-win32/helpdlg.c:798
+#: client/gui-win32/helpdlg.c:809 client/gui-win32/helpdlg.c:815
+#: client/gui-win32/helpdlg.c:828
msgid "Allows "
msgstr ""
-#: client/gui-win32/helpdlg.c:780
+#: client/gui-win32/helpdlg.c:786
msgid "Obsoletes "
msgstr ""
-#: client/gui-win32/helpdlg.c:812 client/gui-win32/helpdlg.c:825
+#: client/gui-win32/helpdlg.c:818 client/gui-win32/helpdlg.c:831
msgid " (with "
msgstr ""
-#: client/gui-win32/helpdlg.c:815 client/gui-win32/helpdlg.c:828
+#: client/gui-win32/helpdlg.c:821 client/gui-win32/helpdlg.c:834
msgid "?techhelp:)."
msgstr ""
@@ -15247,7 +15395,7 @@ 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/"
+" https://gna.org/projects/freeciv/"
msgstr ""
#: data/helpdata.txt:60
@@ -16810,50 +16958,48 @@ msgid ""
"a Factory, Mfg. Plant and Hydro Plant together give a 150% production "
"bonus.\n"
"\n"
-"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant. A city "
-"can only build a Hydro Plant if it is next to (or on) a Mountain or River "
-"tile."
+"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant."
msgstr ""
-#: data/default/buildings.ruleset:397 data/civ2/buildings.ruleset:373
+#: data/default/buildings.ruleset:396 data/civ2/buildings.ruleset:373
#: data/civ1/buildings.ruleset:297
msgid "Library"
msgstr ""
-#: data/default/buildings.ruleset:412
+#: data/default/buildings.ruleset:411
#, no-c-format
msgid "Increases the science output in a city by 100%."
msgstr ""
-#: data/default/buildings.ruleset:417 data/civ2/buildings.ruleset:393
+#: data/default/buildings.ruleset:416 data/civ2/buildings.ruleset:393
#: data/civ1/buildings.ruleset:317
msgid "Marketplace"
msgstr ""
-#: data/default/buildings.ruleset:432 data/civ2/buildings.ruleset:408
+#: data/default/buildings.ruleset:431 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 ""
-#: data/default/buildings.ruleset:437 data/civ2/buildings.ruleset:413
+#: data/default/buildings.ruleset:436 data/civ2/buildings.ruleset:413
#: data/civ1/buildings.ruleset:337
msgid "Mass Transit"
msgstr ""
-#: data/default/buildings.ruleset:451 data/civ2/buildings.ruleset:427
+#: data/default/buildings.ruleset:450 data/civ2/buildings.ruleset:427
#: data/civ1/buildings.ruleset:351
msgid ""
"Neutralizes the pollution generated by the population. The population "
"simply has no effect on the pollution generated in the city."
msgstr ""
-#: data/default/buildings.ruleset:458 data/civ2/buildings.ruleset:434
+#: data/default/buildings.ruleset:457 data/civ2/buildings.ruleset:434
#: data/civ1/buildings.ruleset:358
msgid "Mfg. Plant"
msgstr ""
-#: data/default/buildings.ruleset:474 data/civ2/buildings.ruleset:450
+#: data/default/buildings.ruleset:473 data/civ2/buildings.ruleset:450
#: data/civ1/buildings.ruleset:374
#, no-c-format
msgid ""
@@ -16861,12 +17007,12 @@ msgid ""
"production in a city by 100%."
msgstr ""
-#: data/default/buildings.ruleset:480 data/civ2/buildings.ruleset:456
+#: data/default/buildings.ruleset:479 data/civ2/buildings.ruleset:456
#: data/civ1/buildings.ruleset:380
msgid "Nuclear Plant"
msgstr ""
-#: data/default/buildings.ruleset:495
+#: data/default/buildings.ruleset:494
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 "
@@ -16877,22 +17023,22 @@ msgid ""
"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant."
msgstr ""
-#: data/default/buildings.ruleset:515 data/civ2/buildings.ruleset:489
+#: data/default/buildings.ruleset:514 data/civ2/buildings.ruleset:489
msgid "Offshore Platform"
msgstr ""
-#: data/default/buildings.ruleset:530 data/civ2/buildings.ruleset:504
+#: data/default/buildings.ruleset:529 data/civ2/buildings.ruleset:504
msgid ""
"Adds 1 extra shield resource on all Ocean squares in a city. The city needs "
"to be coastal to build this improvement."
msgstr ""
-#: data/default/buildings.ruleset:536 data/civ2/buildings.ruleset:510
+#: data/default/buildings.ruleset:535 data/civ2/buildings.ruleset:510
#: data/civ1/buildings.ruleset:411
msgid "Palace"
msgstr ""
-#: data/default/buildings.ruleset:552
+#: data/default/buildings.ruleset:551
#, no-c-format
msgid ""
"Makes a city the capital and the center of your government. Corruption in "
@@ -16909,33 +17055,33 @@ msgid ""
"Monarchy a +50% production bonus."
msgstr ""
-#: data/default/buildings.ruleset:569 data/civ2/buildings.ruleset:539
+#: data/default/buildings.ruleset:568 data/civ2/buildings.ruleset:539
msgid "Police Station"
msgstr ""
-#: data/default/buildings.ruleset:583 data/civ2/buildings.ruleset:553
+#: data/default/buildings.ruleset:582 data/civ2/buildings.ruleset:553
msgid ""
"Reduces the unhappiness caused by military units outside the city by 2 under "
"Democracy and 1 under Republic. This improvement has no effect under other "
"governments."
msgstr ""
-#: data/default/buildings.ruleset:593 data/civ2/buildings.ruleset:560
+#: data/default/buildings.ruleset:592 data/civ2/buildings.ruleset:560
msgid "Port Facility"
msgstr ""
-#: data/default/buildings.ruleset:608 data/civ2/buildings.ruleset:575
+#: data/default/buildings.ruleset:607 data/civ2/buildings.ruleset:575
msgid ""
"Allows a city to build veteran sea units. Also, damaged sea units which "
"stay in town for one full turn without moving are completely restored."
msgstr ""
-#: data/default/buildings.ruleset:615 data/civ2/buildings.ruleset:582
+#: data/default/buildings.ruleset:614 data/civ2/buildings.ruleset:582
#: data/civ1/buildings.ruleset:440
msgid "Power Plant"
msgstr ""
-#: data/default/buildings.ruleset:631
+#: data/default/buildings.ruleset:630
#, no-c-format
msgid ""
"Increases the shield production of a Factory or Mfg. Plant in a city: a "
@@ -16946,12 +17092,12 @@ msgid ""
"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant."
msgstr ""
-#: data/default/buildings.ruleset:646 data/civ2/buildings.ruleset:610
+#: data/default/buildings.ruleset:645 data/civ2/buildings.ruleset:610
#: data/civ1/buildings.ruleset:468
msgid "Recycling Center"
msgstr ""
-#: data/default/buildings.ruleset:661 data/civ2/buildings.ruleset:625
+#: data/default/buildings.ruleset:660 data/civ2/buildings.ruleset:625
#: data/civ1/buildings.ruleset:483
#, no-c-format
msgid ""
@@ -16959,33 +17105,33 @@ msgid ""
"production in a city by 66%."
msgstr ""
-#: data/default/buildings.ruleset:667 data/civ2/buildings.ruleset:631
+#: data/default/buildings.ruleset:666 data/civ2/buildings.ruleset:631
msgid "Research Lab"
msgstr ""
-#: data/default/buildings.ruleset:682
+#: data/default/buildings.ruleset:681
msgid ""
"Together with a Library, a Research Lab increases the science production of "
"a city by 200%. Together with a Library and a University, a Research Lab "
"increases the science production of a city by 450%."
msgstr ""
-#: data/default/buildings.ruleset:690 data/civ2/buildings.ruleset:654
+#: data/default/buildings.ruleset:689 data/civ2/buildings.ruleset:654
msgid "SAM Battery"
msgstr ""
-#: data/default/buildings.ruleset:704 data/civ2/buildings.ruleset:668
+#: data/default/buildings.ruleset:703 data/civ2/buildings.ruleset:668
msgid ""
"Doubles the defense of all units inside the city when attacked by non-"
"nuclear air units."
msgstr ""
-#: data/default/buildings.ruleset:710 data/civ2/buildings.ruleset:674
+#: data/default/buildings.ruleset:709 data/civ2/buildings.ruleset:674
#: data/civ1/buildings.ruleset:489
msgid "SDI Defense"
msgstr ""
-#: data/default/buildings.ruleset:724 data/civ2/buildings.ruleset:688
+#: data/default/buildings.ruleset:723 data/civ2/buildings.ruleset:688
#: data/civ1/buildings.ruleset:503
msgid ""
"Protects a city from attacks from Nuclear units. Nuclear attacks simply "
@@ -16993,22 +17139,22 @@ msgid ""
"missiles."
msgstr ""
-#: data/default/buildings.ruleset:733 data/civ2/buildings.ruleset:697
+#: data/default/buildings.ruleset:732 data/civ2/buildings.ruleset:697
msgid "Sewer System"
msgstr ""
-#: data/default/buildings.ruleset:748 data/civ2/buildings.ruleset:712
+#: data/default/buildings.ruleset:747 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 ""
-#: data/default/buildings.ruleset:754 data/civ2/buildings.ruleset:749
+#: data/default/buildings.ruleset:753 data/civ2/buildings.ruleset:749
#: data/civ1/buildings.ruleset:512
msgid "Space Component"
msgstr ""
-#: data/default/buildings.ruleset:769 data/civ2/buildings.ruleset:763
+#: data/default/buildings.ruleset:768 data/civ2/buildings.ruleset:763
#: data/civ1/buildings.ruleset:526
msgid ""
"Space Components can be differentiated into Propulsion and Fuel Components. "
@@ -17019,12 +17165,12 @@ msgid ""
"have been built by any player."
msgstr ""
-#: data/default/buildings.ruleset:779 data/civ2/buildings.ruleset:773
+#: data/default/buildings.ruleset:778 data/civ2/buildings.ruleset:773
#: data/civ1/buildings.ruleset:536
msgid "Space Module"
msgstr ""
-#: data/default/buildings.ruleset:794 data/civ2/buildings.ruleset:787
+#: data/default/buildings.ruleset:793 data/civ2/buildings.ruleset:787
#: data/civ1/buildings.ruleset:550
msgid ""
"Space Modules are the most expensive parts of spaceships. There are three "
@@ -17044,12 +17190,12 @@ msgid ""
"have been built by any player."
msgstr ""
-#: data/default/buildings.ruleset:813 data/civ2/buildings.ruleset:806
+#: data/default/buildings.ruleset:812 data/civ2/buildings.ruleset:806
#: data/civ1/buildings.ruleset:569
msgid "Space Structural"
msgstr ""
-#: data/default/buildings.ruleset:828 data/civ2/buildings.ruleset:820
+#: data/default/buildings.ruleset:827 data/civ2/buildings.ruleset:820
#: data/civ1/buildings.ruleset:583
msgid ""
"Space Structurals form the base of your spaceship. All other spaceship "
@@ -17060,32 +17206,32 @@ msgid ""
"have been built by any player."
msgstr ""
-#: data/default/buildings.ruleset:838 data/civ2/buildings.ruleset:830
+#: data/default/buildings.ruleset:837 data/civ2/buildings.ruleset:830
msgid "Stock Exchange"
msgstr ""
-#: data/default/buildings.ruleset:854 data/civ2/buildings.ruleset:846
+#: data/default/buildings.ruleset:853 data/civ2/buildings.ruleset:846
#, no-c-format
msgid ""
"Together with a Marketplace and a Bank, a Stock Exchange boosts tax and "
"luxury production in a city by 150%."
msgstr ""
-#: data/default/buildings.ruleset:860 data/civ2/buildings.ruleset:852
+#: data/default/buildings.ruleset:859 data/civ2/buildings.ruleset:852
msgid "Super Highways"
msgstr ""
-#: data/default/buildings.ruleset:875 data/civ2/buildings.ruleset:867
+#: data/default/buildings.ruleset:874 data/civ2/buildings.ruleset:867
#, no-c-format
msgid ""
"Increases trade resources by 50% on all squares with roads or railroads."
msgstr ""
-#: data/default/buildings.ruleset:883 data/civ2/buildings.ruleset:873
+#: data/default/buildings.ruleset:882 data/civ2/buildings.ruleset:873
msgid "Supermarket"
msgstr ""
-#: data/default/buildings.ruleset:898 data/civ2/buildings.ruleset:888
+#: data/default/buildings.ruleset:897 data/civ2/buildings.ruleset:888
#, no-c-format
msgid ""
"Increases the food resources by 50% on each farmland square which is being "
@@ -17093,12 +17239,12 @@ msgid ""
"a second time."
msgstr ""
-#: data/default/buildings.ruleset:905 data/civ2/buildings.ruleset:895
+#: data/default/buildings.ruleset:904 data/civ2/buildings.ruleset:895
#: data/civ1/buildings.ruleset:593
msgid "Temple"
msgstr ""
-#: data/default/buildings.ruleset:919 data/civ2/buildings.ruleset:909
+#: data/default/buildings.ruleset:918 data/civ2/buildings.ruleset:909
#: data/civ1/buildings.ruleset:607
msgid ""
"Makes one unhappy citizen content. Both the Mysticism advance and the "
@@ -17106,81 +17252,81 @@ msgid ""
"citizens are made content."
msgstr ""
-#: data/default/buildings.ruleset:926 data/civ2/buildings.ruleset:916
+#: data/default/buildings.ruleset:925 data/civ2/buildings.ruleset:916
#: data/civ1/buildings.ruleset:614 data/default/techs.ruleset:742
#: data/civ2/techs.ruleset:727 data/civ1/techs.ruleset:723
msgid "University"
msgstr ""
-#: data/default/buildings.ruleset:942
+#: data/default/buildings.ruleset:941
#, no-c-format
msgid ""
"Together with a Library, a University increases the science production of a "
"city by 250%."
msgstr ""
-#: data/default/buildings.ruleset:948 data/civ2/buildings.ruleset:938
+#: data/default/buildings.ruleset:947 data/civ2/buildings.ruleset:938
#: data/civ1/buildings.ruleset:636
msgid "Apollo Program"
msgstr ""
-#: data/default/buildings.ruleset:962 data/civ2/buildings.ruleset:952
+#: data/default/buildings.ruleset:961 data/civ2/buildings.ruleset:952
msgid ""
"Entire map becomes visible for the player who owns it. It allows all "
"players to start building spaceship parts (assuming they have researched the "
"necessary technologies)."
msgstr ""
-#: data/default/buildings.ruleset:969 data/civ2/buildings.ruleset:959
+#: data/default/buildings.ruleset:968 data/civ2/buildings.ruleset:959
msgid "A.Smith's Trading Co."
msgstr ""
-#: data/default/buildings.ruleset:983
+#: data/default/buildings.ruleset:982
msgid ""
"City improvements which would normally have an upkeep of 1 are free of "
"upkeep, for all your cities."
msgstr ""
-#: data/default/buildings.ruleset:989 data/civ2/buildings.ruleset:979
+#: data/default/buildings.ruleset:988 data/civ2/buildings.ruleset:979
#: data/civ1/buildings.ruleset:655
msgid "Colossus"
msgstr ""
-#: data/default/buildings.ruleset:1003 data/civ2/buildings.ruleset:993
+#: data/default/buildings.ruleset:1002 data/civ2/buildings.ruleset:993
#: data/civ1/buildings.ruleset:669
msgid ""
"Each square around the city where this wonder is built that is already "
"generating some trade produces one extra trade resource."
msgstr ""
-#: data/default/buildings.ruleset:1009 data/civ2/buildings.ruleset:999
+#: data/default/buildings.ruleset:1008 data/civ2/buildings.ruleset:999
#: data/civ1/buildings.ruleset:675
msgid "Copernicus' Observatory"
msgstr ""
-#: data/default/buildings.ruleset:1024 data/civ2/buildings.ruleset:1180
+#: data/default/buildings.ruleset:1023 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 ""
-#: data/default/buildings.ruleset:1029 data/civ2/buildings.ruleset:1019
+#: data/default/buildings.ruleset:1028 data/civ2/buildings.ruleset:1019
#: data/civ1/buildings.ruleset:695
msgid "Cure For Cancer"
msgstr ""
-#: data/default/buildings.ruleset:1043
+#: data/default/buildings.ruleset:1042
msgid ""
"This stunning technological achievement makes one unhappy citizen content in "
"all your cities."
msgstr ""
-#: data/default/buildings.ruleset:1051 data/civ2/buildings.ruleset:1039
+#: data/default/buildings.ruleset:1050 data/civ2/buildings.ruleset:1039
#: data/civ1/buildings.ruleset:715
msgid "Darwin's Voyage"
msgstr ""
-#: data/default/buildings.ruleset:1065 data/civ2/buildings.ruleset:1053
+#: data/default/buildings.ruleset:1064 data/civ2/buildings.ruleset:1053
#: data/civ1/buildings.ruleset:729
msgid ""
"Charles Darwin's voyage sparked the discovery of the evolution of the "
@@ -17188,43 +17334,43 @@ msgid ""
"technology advances."
msgstr ""
-#: data/default/buildings.ruleset:1072 data/civ2/buildings.ruleset:1060
+#: data/default/buildings.ruleset:1071 data/civ2/buildings.ruleset:1060
msgid "Eiffel Tower"
msgstr ""
-#: data/default/buildings.ruleset:1087
+#: data/default/buildings.ruleset:1086
#, no-c-format
msgid ""
"Your reputation and goodwill among other nations is recovered twice as fast."
msgstr ""
-#: data/default/buildings.ruleset:1093 data/civ2/buildings.ruleset:1081
+#: data/default/buildings.ruleset:1092 data/civ2/buildings.ruleset:1081
#: data/civ1/buildings.ruleset:736
msgid "Great Library"
msgstr ""
-#: data/default/buildings.ruleset:1107 data/civ2/buildings.ruleset:1095
+#: data/default/buildings.ruleset:1106 data/civ2/buildings.ruleset:1095
#: data/civ1/buildings.ruleset:750
msgid ""
"The civilization which builds the Great Library gets every advance that at "
"least two other civilizations have achieved."
msgstr ""
-#: data/default/buildings.ruleset:1113 data/civ2/buildings.ruleset:1101
+#: data/default/buildings.ruleset:1112 data/civ2/buildings.ruleset:1101
#: data/civ1/buildings.ruleset:756
msgid "Great Wall"
msgstr ""
-#: data/default/buildings.ruleset:1127
+#: data/default/buildings.ruleset:1126
msgid "Works as a City Wall in all your cities."
msgstr ""
-#: data/default/buildings.ruleset:1135 data/civ2/buildings.ruleset:1122
+#: data/default/buildings.ruleset:1134 data/civ2/buildings.ruleset:1122
#: data/civ1/buildings.ruleset:777
msgid "Hanging Gardens"
msgstr ""
-#: data/default/buildings.ruleset:1149 data/civ2/buildings.ruleset:1136
+#: data/default/buildings.ruleset:1148 data/civ2/buildings.ruleset:1136
#: data/civ1/buildings.ruleset:791
msgid ""
"Makes one content citizen happy in every city. Makes two extra content "
@@ -17234,96 +17380,96 @@ msgid ""
"them content instead)."
msgstr ""
-#: data/default/buildings.ruleset:1158 data/civ2/buildings.ruleset:1145
+#: data/default/buildings.ruleset:1157 data/civ2/buildings.ruleset:1145
#: data/civ1/buildings.ruleset:800
msgid "Hoover Dam"
msgstr ""
-#: data/default/buildings.ruleset:1173 data/civ2/buildings.ruleset:1159
+#: data/default/buildings.ruleset:1172 data/civ2/buildings.ruleset:1159
msgid ""
"Works as if you had a Hydro Plant in every city. (This reduces pollution "
"and increases the effects of Factories and Mfg. Plants.)"
msgstr ""
-#: data/default/buildings.ruleset:1179 data/civ2/buildings.ruleset:1165
+#: data/default/buildings.ruleset:1178 data/civ2/buildings.ruleset:1165
#: data/civ1/buildings.ruleset:822
msgid "Isaac Newton's College"
msgstr ""
-#: data/default/buildings.ruleset:1194
+#: data/default/buildings.ruleset:1193
#, no-c-format
msgid ""
"Boosts science production by 100% in every city you control that has a "
"University."
msgstr ""
-#: data/default/buildings.ruleset:1200 data/civ2/buildings.ruleset:1185
+#: data/default/buildings.ruleset:1199 data/civ2/buildings.ruleset:1185
#: data/civ1/buildings.ruleset:842
msgid "J.S. Bach's Cathedral"
msgstr ""
-#: data/default/buildings.ruleset:1214 data/civ2/buildings.ruleset:1199
+#: data/default/buildings.ruleset:1213 data/civ2/buildings.ruleset:1199
msgid "Makes two unhappy citizens content in every city."
msgstr ""
-#: data/default/buildings.ruleset:1219 data/civ2/buildings.ruleset:1204
+#: data/default/buildings.ruleset:1218 data/civ2/buildings.ruleset:1204
msgid "King Richard's Crusade"
msgstr ""
-#: data/default/buildings.ruleset:1233 data/civ2/buildings.ruleset:1218
+#: data/default/buildings.ruleset:1232 data/civ2/buildings.ruleset:1218
msgid ""
"Adds one extra shield resource on every square around the city where it is "
"built."
msgstr ""
-#: data/default/buildings.ruleset:1239 data/civ2/buildings.ruleset:1224
+#: data/default/buildings.ruleset:1238 data/civ2/buildings.ruleset:1224
msgid "Leonardo's Workshop"
msgstr ""
-#: data/default/buildings.ruleset:1253 data/civ2/buildings.ruleset:1238
+#: data/default/buildings.ruleset:1252 data/civ2/buildings.ruleset:1238
msgid "Upgrades one obsolete unit per game turn."
msgstr ""
-#: data/default/buildings.ruleset:1258 data/civ2/buildings.ruleset:1243
+#: data/default/buildings.ruleset:1257 data/civ2/buildings.ruleset:1243
#: data/civ1/buildings.ruleset:862
msgid "Lighthouse"
msgstr ""
-#: data/default/buildings.ruleset:1273
+#: data/default/buildings.ruleset:1272
msgid ""
"Gives all your sea units 1 additional movement point and eliminates the risk "
"of losing Triremes on the high seas. Makes all your new sea units veterans "
"(for all your cities)."
msgstr ""
-#: data/default/buildings.ruleset:1280 data/civ2/buildings.ruleset:1264
+#: data/default/buildings.ruleset:1279 data/civ2/buildings.ruleset:1264
#: data/civ1/buildings.ruleset:885
msgid "Magellan's Expedition"
msgstr ""
-#: data/default/buildings.ruleset:1295
+#: data/default/buildings.ruleset:1294
msgid "Gives all your sea units 2 additional movement points."
msgstr ""
-#: data/default/buildings.ruleset:1300 data/civ2/buildings.ruleset:1283
+#: data/default/buildings.ruleset:1299 data/civ2/buildings.ruleset:1283
#: data/civ1/buildings.ruleset:904
msgid "Manhattan Project"
msgstr ""
-#: data/default/buildings.ruleset:1318 data/civ2/buildings.ruleset:1301
+#: data/default/buildings.ruleset:1317 data/civ2/buildings.ruleset:1301
msgid "Marco Polo's Embassy"
msgstr ""
-#: data/default/buildings.ruleset:1332 data/civ2/buildings.ruleset:1315
+#: data/default/buildings.ruleset:1331 data/civ2/buildings.ruleset:1315
msgid "The player who owns it gets an embassy with all players."
msgstr ""
-#: data/default/buildings.ruleset:1337 data/civ2/buildings.ruleset:1320
+#: data/default/buildings.ruleset:1336 data/civ2/buildings.ruleset:1320
#: data/civ1/buildings.ruleset:922
msgid "Michelangelo's Chapel"
msgstr ""
-#: data/default/buildings.ruleset:1351 data/civ2/buildings.ruleset:1334
+#: data/default/buildings.ruleset:1350 data/civ2/buildings.ruleset:1334
msgid ""
"Counts as having a Cathedral in each of your cities. This makes 3 unhappy "
"citizens content in each city. The discovery of Theology increases the "
@@ -17332,51 +17478,51 @@ msgid ""
"the number of unhappy citizens made content."
msgstr ""
-#: data/default/buildings.ruleset:1361 data/civ2/buildings.ruleset:1344
+#: data/default/buildings.ruleset:1360 data/civ2/buildings.ruleset:1344
#: data/civ1/buildings.ruleset:941
msgid "Oracle"
msgstr ""
-#: data/default/buildings.ruleset:1375
+#: data/default/buildings.ruleset:1374
msgid "Makes two of your unhappy citizens content in every city with a temple."
msgstr ""
-#: data/default/buildings.ruleset:1380 data/civ2/buildings.ruleset:1363
+#: data/default/buildings.ruleset:1379 data/civ2/buildings.ruleset:1363
#: data/civ1/buildings.ruleset:960
msgid "Pyramids"
msgstr ""
-#: data/default/buildings.ruleset:1394
+#: data/default/buildings.ruleset:1393
msgid ""
"The amount of stored food lost when one of your cities grows or shrinks is "
"reduced by 25%. This helps a city to grow faster and more easily withstand "
"famine. Cumulative with Granary."
msgstr ""
-#: data/default/buildings.ruleset:1401 data/civ2/buildings.ruleset:1382
+#: data/default/buildings.ruleset:1400 data/civ2/buildings.ruleset:1382
#: data/civ1/buildings.ruleset:981
msgid "SETI Program"
msgstr ""
-#: data/default/buildings.ruleset:1415
+#: data/default/buildings.ruleset:1414
msgid "Boosts science production in each city with a Research Lab by 100%. "
msgstr ""
-#: data/default/buildings.ruleset:1420 data/civ2/buildings.ruleset:1402
+#: data/default/buildings.ruleset:1419 data/civ2/buildings.ruleset:1402
#: data/civ1/buildings.ruleset:1001
msgid "Shakespeare's Theatre"
msgstr ""
-#: data/default/buildings.ruleset:1434 data/civ2/buildings.ruleset:1416
+#: data/default/buildings.ruleset:1433 data/civ2/buildings.ruleset:1416
#: data/civ1/buildings.ruleset:1015
msgid "Makes all unhappy citizens content, in the city where it is located."
msgstr ""
-#: data/default/buildings.ruleset:1439 data/civ2/buildings.ruleset:1421
+#: data/default/buildings.ruleset:1438 data/civ2/buildings.ruleset:1421
msgid "Statue of Liberty"
msgstr ""
-#: data/default/buildings.ruleset:1453 data/civ2/buildings.ruleset:1435
+#: data/default/buildings.ruleset:1452 data/civ2/buildings.ruleset:1435
#: data/civ1/buildings.ruleset:974 data/civ1/buildings.ruleset:1034
msgid ""
"Allows you to choose any government, including those that have not yet been "
@@ -17384,42 +17530,42 @@ msgid ""
"Anarchy."
msgstr ""
-#: data/default/buildings.ruleset:1460 data/civ2/buildings.ruleset:1442
+#: data/default/buildings.ruleset:1459 data/civ2/buildings.ruleset:1442
msgid "Sun Tzu's War Academy"
msgstr ""
-#: data/default/buildings.ruleset:1474
+#: data/default/buildings.ruleset:1473
msgid ""
"All your new ground units start at the first veteran level. The chance of a "
"unit getting the next veteran level after a battle increases by half."
msgstr ""
-#: data/default/buildings.ruleset:1481 data/civ2/buildings.ruleset:1463
+#: data/default/buildings.ruleset:1480 data/civ2/buildings.ruleset:1463
#: data/civ1/buildings.ruleset:1020
msgid "United Nations"
msgstr ""
-#: data/default/buildings.ruleset:1495
+#: data/default/buildings.ruleset:1494
msgid "All your units regain two extra hitpoints per turn."
msgstr ""
-#: data/default/buildings.ruleset:1508 data/civ2/buildings.ruleset:1490
+#: data/default/buildings.ruleset:1507 data/civ2/buildings.ruleset:1490
#: data/civ1/buildings.ruleset:1046
msgid "Women's Suffrage"
msgstr ""
-#: data/default/buildings.ruleset:1522 data/civ2/buildings.ruleset:1504
+#: data/default/buildings.ruleset:1521 data/civ2/buildings.ruleset:1504
msgid ""
"Counts as a Police Station in every city. (That is, for each city, reduces "
"unhappiness for military units outside the city by 2 under Democracy and 1 "
"under Republic. This wonder has no effect under other governments.)"
msgstr ""
-#: data/default/buildings.ruleset:1533
+#: data/default/buildings.ruleset:1532
msgid "Coinage"
msgstr ""
-#: data/default/buildings.ruleset:1554
+#: data/default/buildings.ruleset:1553
msgid ""
"This is not a normal improvement. Instead, setting a city's production to "
"Coinage means its shield production is converted to tax output (money, "
@@ -17763,11 +17909,15 @@ msgstr ""
msgid "?citystyle:Industrial"
msgstr ""
-#: data/default/cities.ruleset:139 data/civ2/cities.ruleset:150
+#: data/default/cities.ruleset:139
+msgid "?citystyle:ElectricAge"
+msgstr ""
+
+#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:150
msgid "?citystyle:Modern"
msgstr ""
-#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:161
+#: data/default/cities.ruleset:161 data/civ2/cities.ruleset:161
msgid "?citystyle:PostModern"
msgstr ""
diff --git a/po/he.gmo b/po/he.gmo
index 810a2b1..cbe46e3 100644
Binary files a/po/he.gmo and b/po/he.gmo differ
diff --git a/po/he.po b/po/he.po
index 2c4c53a..b5d48b2 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: 2009-03-29 21:13+0900\n"
+"POT-Creation-Date: 2009-11-22 21:37+0100\n"
"PO-Revision-Date: 2007-08-12 15:15+0300\n"
"Last-Translator: Chen Levy <contrib at chenlevy.com>\n"
"Language-Team: Hebrew <kde-il at yahoogroups.com>\n"
@@ -66,21 +66,21 @@ msgstr "?מיושן:י"
msgid "?redundant:*"
msgstr "?מיותר:*"
-#: common/connection.c:515
+#: common/connection.c:518
#, c-format
msgid "%s from %s"
msgstr "%s מתוך %s"
-#: common/connection.c:521
+#: common/connection.c:524
msgid " (connection incomplete)"
msgstr "(חיבור ×œ× ×”×•×©×œ×)"
-#: common/connection.c:525
+#: common/connection.c:528
#, c-format
msgid " (player %s)"
msgstr "(שחקן %s)"
-#: common/connection.c:529
+#: common/connection.c:532
msgid " (observer)"
msgstr "(משקיף)"
@@ -485,81 +485,81 @@ msgstr "הודעת חיבור/× ×™×ª×•×§"
msgid "AI Debug messages"
msgstr "הודעות דיבוג ×\"מ"
-#: common/player.c:732
+#: common/player.c:746
msgid "?attitude:Genocidal"
msgstr "?גישה:× ×˜×™×™×” לרצח ×¢×"
-#: common/player.c:734
+#: common/player.c:748
msgid "?attitude:Belligerent"
msgstr "?גישה:מלחמתית"
-#: common/player.c:736
+#: common/player.c:750
msgid "?attitude:Hostile"
msgstr "?גישה:×¢×™×™× ×ª"
-#: common/player.c:738
+#: common/player.c:752
msgid "?attitude:Uncooperative"
msgstr "?גישה:חוסר שיתוף פעולה"
-#: common/player.c:740
+#: common/player.c:754
msgid "?attitude:Uneasy"
msgstr "?גישה:חוסר × ×•×—×•×ª"
-#: common/player.c:742
+#: common/player.c:756
msgid "?attitude:Neutral"
msgstr "?גישה:× ×™×˜×¨×œ×™"
-#: common/player.c:744
+#: common/player.c:758
msgid "?attitude:Respectful"
msgstr "?גישה:יחס של כבוד"
-#: common/player.c:746
+#: common/player.c:760
msgid "?attitude:Helpful"
msgstr "?גישה:מועילה"
-#: common/player.c:748
+#: common/player.c:762
msgid "?attitude:Enthusiastic"
msgstr "?גישה:התלהבות"
-#: common/player.c:750
+#: common/player.c:764
msgid "?attitude:Admiring"
msgstr "?גישה:הערצה"
-#: common/player.c:753
+#: common/player.c:767
msgid "?attitude:Worshipful"
msgstr "?גישה:סגידה"
-#: common/player.c:764
+#: common/player.c:778
msgid "?diplomatic_state:Armistice"
msgstr "?מצב_דיפלומטי:שביתת × ×©×§"
-#: common/player.c:765
+#: common/player.c:779
msgid "?diplomatic_state:War"
msgstr "?מצב_דיפלומטי:מלחמה"
-#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:780 client/gui-gtk-2.0/diplodlg.c:353
#: 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:767 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:781 client/gui-gtk-2.0/diplodlg.c:358
#: 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:768 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:782 client/gui-gtk-2.0/diplodlg.c:363
#: 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:769
+#: common/player.c:783
msgid "?diplomatic_state:Never met"
msgstr "?מצב_דיפלומטי:×œ× × ×¤×’×©×•"
-#: common/player.c:770
+#: common/player.c:784
msgid "?diplomatic_state:Team"
msgstr "?מצב_דיפלומטי:צוות"
@@ -590,7 +590,7 @@ msgstr "דרישות שרידות × ×ª×ž×›×•×ª רק עבור טווח עול×."
#. TRANS: "Resources: (none)".
#: common/requirements.c:1014 common/team.c:132
#: client/gui-gtk-2.0/helpdlg.c:1055 client/gui-gtk-2.0/inteldlg.c:390
-#: client/gui-win32/helpdlg.c:586 client/gui-xaw/helpdlg.c:991
+#: client/gui-win32/helpdlg.c:592 client/gui-xaw/helpdlg.c:991
#, c-format
msgid "(none)"
msgstr "(שו×־דבר)"
@@ -616,10 +616,11 @@ msgstr "×˜×›× ×•×œ×•×’×™×” עתידית. %d"
#: 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
#: client/gui-sdl/helpdlg.c:817 client/gui-sdl/mapview.c:962
-#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:545
-#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:735
-#: 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
+#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:544
+#: client/gui-win32/helpdlg.c:551 client/gui-win32/helpdlg.c:721
+#: client/gui-win32/helpdlg.c:741 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 "שו×־דבר"
@@ -632,29 +633,29 @@ msgstr "×˜×›× ×•×œ×•×’×™×” עתידית."
msgid "(Unknown)"
msgstr "(×œ× ×™×“×•×¢)"
-#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:553
#: manual/civmanual.c:224
msgid "Road"
msgstr "דרך"
-#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:557
#: client/gui-gtk-2.0/menu.c:829 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:394 common/terrain.c:572 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:567
#: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
#: data/civ1/techs.ruleset:563
msgid "Railroad"
msgstr "מסילת־ברזל"
-#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:555
msgid "Mine"
msgstr "מכרה"
-#: common/terrain.c:396 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:551 server/report.c:124
#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "זיהו×"
@@ -663,7 +664,7 @@ msgstr "זיהו×"
msgid "Hut"
msgstr "בקתה"
-#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:563
#: manual/civmanual.c:226
msgid "Fortress"
msgstr "מבצר"
@@ -676,58 +677,58 @@ msgstr "× ×”×¨"
msgid "Farmland"
msgstr "חווה"
-#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:577
#: manual/civmanual.c:226
msgid "Airbase"
msgstr "בסיס תעופה"
-#: common/terrain.c:402 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:579
msgid "Fallout"
msgstr "× ×©×•×¨×ª"
-#: common/unit.c:546 client/gui-win32/plrdlg.c:337
+#: common/unit.c:549 client/gui-win32/plrdlg.c:337
msgid "Idle"
msgstr "חסר־מעש"
-#: common/unit.c:556
+#: common/unit.c:559
msgid "Fortifying"
msgstr "ביצור"
-#: common/unit.c:558
+#: common/unit.c:561
msgid "Fortified"
msgstr "מבוצר"
-#: common/unit.c:562 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
+#: common/unit.c:565 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
msgid "Sentry"
msgstr "חיל־משמר"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
+#: common/unit.c:569 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
#: client/gui-win32/menu.c:370 client/gui-xaw/menu.c:185
msgid "Pillage"
msgstr "ביזה"
-#: common/unit.c:568 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
+#: common/unit.c:571 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
msgid "Goto"
msgstr "לך ×ל"
-#: common/unit.c:570
+#: common/unit.c:573
msgid "Explore"
msgstr "גלה ×רץ"
-#: common/unit.c:572 manual/civmanual.c:224
+#: common/unit.c:575 manual/civmanual.c:224
msgid "Transform"
msgstr "המרה"
-#: common/unit.c:584 client/text.c:157 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:587 client/text.c:157 client/gui-sdl/citydlg.c:1972
#: client/gui-win32/citydlg.c:1257 client/gui-xaw/citydlg.c:1423
msgid "Unknown"
msgstr "×œ× ×™×“×•×¢"
-#: common/unit.c:1022
+#: common/unit.c:1025
msgid "Moves"
msgstr "מהלכי×"
-#: common/unit.c:1571
+#: common/unit.c:1574
#, c-format
msgid ""
"Upgrade %s to %s for %d gold?\n"
@@ -736,12 +737,12 @@ msgstr ""
"שדרג %s לכדי %s עבור %d זהב?\n"
"×”×וצר מכיל %d זהב."
-#: common/unit.c:1579
+#: common/unit.c:1582
#, c-format
msgid "Sorry, cannot upgrade %s (yet)."
msgstr "מצטערי×, ×ין ×פשרות לשדרג ×ת %s (עדיין)."
-#: common/unit.c:1585
+#: common/unit.c:1588
#, c-format
msgid ""
"Upgrading %s to %s costs %d gold.\n"
@@ -750,11 +751,11 @@ msgstr ""
"שדרוג %s לכדי %s עולה %d זהב.\n"
"×”×וצר מכיל %d זהב."
-#: common/unit.c:1594
+#: common/unit.c:1597
msgid "You can only upgrade units in your cities."
msgstr "× ×™×ª×Ÿ לשדרג רק יחידות ×©× ×ž×¦×ות בעריך."
-#: common/unit.c:1598
+#: common/unit.c:1601
#, c-format
msgid "Upgrading this %s would strand units it transports."
msgstr "שדרוג %s ×–×” יוריד יחידות מהמשלוחי×."
@@ -791,11 +792,11 @@ msgstr "יחידה ×’×¨×¢×™× ×™×ª"
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1404
+#: common/unittype.c:349 client/helpdata.c:1412
msgid " and "
msgstr "וג×"
-#: common/unittype.c:355 client/helpdata.c:1390
+#: common/unittype.c:355 client/helpdata.c:1398
msgid "?and:, "
msgstr "?וג×:,"
@@ -962,69 +963,69 @@ msgstr "טיעון ריק בשביל \"%s\".\n"
msgid "Missing argument for \"%s\".\n"
msgstr "חסר טיעון בשביל \"%s\".\n"
-#: utility/shared.c:501
+#: utility/shared.c:514
#, c-format
msgid "%d BC"
msgstr "%d ×œ×¤× ×™ הספירה"
-#: utility/shared.c:503
+#: utility/shared.c:516
#, c-format
msgid "%d AD"
msgstr "%d ×חרי הספירה"
-#: utility/shared.c:924
+#: utility/shared.c:937
msgid "FREECIV_PATH is set but empty; using default path instead."
msgstr "×”×ž×©×ª× ×” FREECIV_PATH × ×ž×¦× ×ך ריק; משתמש בתיקיה ×”× ×•×›×—×™×ª."
-#: utility/shared.c:1028
+#: utility/shared.c:1041
#, c-format
msgid "Could not read data directory %s: %s."
msgstr "×œ× ×ž×¦×œ×™×— ×œ×§×¨×•× ×ž×™×“×¢ בספריה %s: %s."
-#: utility/shared.c:1279
+#: utility/shared.c:1292
msgid "The data path may be set via the environment variable FREECIV_PATH."
msgstr "תיקיית ×”× ×ª×•× ×™× ×¦×¨×™×›×” להיקבע דרך ×ž×©×ª× ×” הסביבה FREECIV_PATH."
-#: utility/shared.c:1281
+#: utility/shared.c:1294
#, c-format
msgid "Current data path is: \"%s\""
msgstr "תיקיית המידה ×”× ×•×›×—×™×ª ×”×™×: \"%s\""
-#: utility/shared.c:1283
+#: utility/shared.c:1296
#, c-format
msgid "The \"%s\" file is required ... aborting!"
msgstr "קובץ ×” \"%s\" × ×“×¨×©... מבטל!"
-#: utility/shared.c:1460
+#: utility/shared.c:1485
#, c-format
msgid "%s: Fatal error: you're trying to run me as superuser!\n"
msgstr "%sשגי××”: ×תה ×ž× ×¡×” להריץ ×ת המשחק ×›-סופר משתמש.\n"
-#: utility/shared.c:1462
+#: utility/shared.c:1487
msgid "Use a non-privileged account instead.\n"
msgstr "השתמש במשתמש חסר-זכויות במקו×. \n"
-#: utility/shared.c:1478
+#: utility/shared.c:1503
msgid "exact match"
msgstr "הת×מה מדויקת"
-#: utility/shared.c:1479
+#: utility/shared.c:1504
msgid "only match"
msgstr "הת×מה בלבד"
-#: utility/shared.c:1480
+#: utility/shared.c:1505
msgid "ambiguous"
msgstr "רב משמעי"
-#: utility/shared.c:1481
+#: utility/shared.c:1506
msgid "empty"
msgstr "ריק"
-#: utility/shared.c:1482
+#: utility/shared.c:1507
msgid "too long"
msgstr "×רוך מדי"
-#: utility/shared.c:1483
+#: utility/shared.c:1508
msgid "non-match"
msgstr "חוסר הת×מה"
@@ -1053,108 +1054,108 @@ msgstr "×”%s התחילו ×œ×‘× ×•×ª ×ת %s ב%s."
msgid "%s is selling %s (not needed) for %d."
msgstr "%s מוכר ×ת %s (×œ× × ×—×•×¥) עבור %d."
-#: ai/advdiplomacy.c:280
+#: ai/advdiplomacy.c:300
#, c-format
msgid "*%s (AI)* In away mode AI can't sign such a treaty."
msgstr "*%s (×\"מ)* במצב מרוחק ×\"מ ××™× ×” יכולה ×œ×—×ª×•× ×¢×œ ×”×¡×›× ×©×›×–×”."
-#: ai/advdiplomacy.c:290
+#: ai/advdiplomacy.c:310
#, c-format
msgid "*%s (AI)* First break alliance with %s, %s."
msgstr ""
-#: ai/advdiplomacy.c:303
+#: ai/advdiplomacy.c:322
#, c-format
msgid "*%s (AI)* Let us first cease hostilies, %s."
msgstr ""
-#: ai/advdiplomacy.c:308
+#: ai/advdiplomacy.c:327
#, c-format
msgid ""
"*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
"first, %s."
msgstr ""
-#: ai/advdiplomacy.c:331
+#: ai/advdiplomacy.c:350
#, c-format
msgid "*%s (AI)* I simply do not trust you with an alliance yet, %s."
msgstr ""
-#: ai/advdiplomacy.c:424
+#: ai/advdiplomacy.c:443
#, c-format
msgid "*%s (AI)* I do not know the city you mention."
msgstr ""
-#: ai/advdiplomacy.c:454
+#: ai/advdiplomacy.c:473
#, c-format
msgid "*%s (AI)* Sorry, sharing vision with you is not safe."
msgstr ""
-#: ai/advdiplomacy.c:560
+#: ai/advdiplomacy.c:579
#, c-format
msgid "*%s (AI)* This deal was not very good for us, %s!"
msgstr ""
-#: ai/advdiplomacy.c:582
+#: ai/advdiplomacy.c:601
#, c-format
msgid "*%s (AI)* Welcome into our alliance %s!"
msgstr ""
-#: ai/advdiplomacy.c:586
+#: ai/advdiplomacy.c:605
#, c-format
msgid "*%s (AI)* Yes, may we forever stand united, %s."
msgstr ""
-#: ai/advdiplomacy.c:593
+#: ai/advdiplomacy.c:612
#, c-format
msgid "*%s (AI)* Yes, peace in our time!"
msgstr ""
-#: ai/advdiplomacy.c:598
+#: ai/advdiplomacy.c:617
#, c-format
msgid "*%s (AI)* Agreed. No more hostilities, %s."
msgstr ""
-#: ai/advdiplomacy.c:813
+#: ai/advdiplomacy.c:832
#, c-format
msgid ""
"*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
"other better?"
msgstr ""
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1116
#, c-format
msgid "*%s (AI)* Space will never be yours. "
msgstr ""
-#: ai/advdiplomacy.c:1102
+#: ai/advdiplomacy.c:1121
#, c-format
msgid "*%s (AI)* I have tolerated your vicious antics long enough! To war!"
msgstr ""
-#: ai/advdiplomacy.c:1108
+#: ai/advdiplomacy.c:1127
#, c-format
msgid "*%s (AI)* Peace in ... some other time."
msgstr ""
-#: ai/advdiplomacy.c:1113
+#: ai/advdiplomacy.c:1132
#, 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:1119
+#: ai/advdiplomacy.c:1138
#, c-format
msgid "*%s (AI)* Your covert hostilities brought this war upon you!"
msgstr ""
-#: ai/advdiplomacy.c:1126
+#: ai/advdiplomacy.c:1145
#, c-format
msgid "*%s (AI)* Your aggression against %s was your last mistake!"
msgstr ""
-#: ai/advdiplomacy.c:1209
+#: ai/advdiplomacy.c:1229
#, c-format
msgid ""
"*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1165,14 +1166,14 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1219
+#: ai/advdiplomacy.c:1239
#, c-format
msgid ""
"*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
"alliance!"
msgstr ""
-#: ai/advdiplomacy.c:1225
+#: ai/advdiplomacy.c:1245
#, c-format
msgid ""
"*%s (AI)* %s has grossly violated his treaties with us for own gain. We "
@@ -1185,7 +1186,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1238
+#: ai/advdiplomacy.c:1258
#, c-format
msgid ""
"*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1196,13 +1197,13 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1246
+#: ai/advdiplomacy.c:1266
#, c-format
msgid ""
"*%s (AI)* If you want a piece of the loot, feel free to join in the action!"
msgstr ""
-#: ai/advdiplomacy.c:1251
+#: ai/advdiplomacy.c:1271
#, c-format
msgid ""
"*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1213,12 +1214,12 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1261
+#: ai/advdiplomacy.c:1281
#, c-format
msgid "*%s (AI)* As our glorious allies, we expect your help in this war."
msgstr ""
-#: ai/advdiplomacy.c:1267
+#: ai/advdiplomacy.c:1287
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance and declare war on %s in %d turn. "
@@ -1229,7 +1230,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1276
+#: ai/advdiplomacy.c:1296
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1240,47 +1241,47 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1344
+#: ai/advdiplomacy.c:1364
#, 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:1359
+#: ai/advdiplomacy.c:1379
#, c-format
msgid ""
"*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
"offensive."
msgstr ""
-#: ai/advdiplomacy.c:1362
+#: ai/advdiplomacy.c:1382
#, c-format
msgid ""
"*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
"take action!"
msgstr ""
-#: ai/advdiplomacy.c:1474
+#: ai/advdiplomacy.c:1494
#, c-format
msgid "*%s (AI)* Sorry, sharing vision with you is no longer safe."
msgstr ""
-#: ai/advdiplomacy.c:1549
+#: ai/advdiplomacy.c:1569
#, c-format
msgid ""
"*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
"our enemy, %s."
msgstr ""
-#: ai/advdiplomacy.c:1555
+#: ai/advdiplomacy.c:1575
#, 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:1562
+#: ai/advdiplomacy.c:1582
#, c-format
msgid ""
"*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1288,26 +1289,26 @@ msgid ""
"more!"
msgstr ""
-#: ai/advdiplomacy.c:1592
+#: ai/advdiplomacy.c:1612
#, c-format
msgid ""
"*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
"an alliance?"
msgstr ""
-#: ai/advdiplomacy.c:1607
+#: ai/advdiplomacy.c:1627
#, c-format
msgid "*%s (AI)* Greetings neighbour, may we suggest more peaceful relations?"
msgstr ""
-#: ai/advdiplomacy.c:1622
+#: ai/advdiplomacy.c:1642
#, c-format
msgid ""
"*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
"cessation of hostilities?"
msgstr ""
-#: ai/advdiplomacy.c:1742
+#: ai/advdiplomacy.c:1762
#, c-format
msgid ""
"*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1447,17 +1448,17 @@ msgid ""
"minimum %d [printable] characters long. Try again."
msgstr ""
-#: server/barbarian.c:183
+#: server/barbarian.c:184
#, c-format
msgid "%s gain a leader by the name %s. Dangerous times may lie ahead."
msgstr ""
-#: server/barbarian.c:479
+#: server/barbarian.c:480
#, c-format
msgid "Native unrest near %s led by %s."
msgstr "התקוממת ×™×œ×™×“×™× ×œ×™×“ %s ×‘×”× ×”×’×ª %s."
-#: server/barbarian.c:484
+#: server/barbarian.c:485
#, c-format
msgid "Sea raiders seen near %s!"
msgstr "פושטי ×™× × ×¦×¤×• ליד %s!"
@@ -1826,7 +1827,7 @@ msgid_plural "%s boosts research; you gain %d immediate advances."
msgstr[0] ""
msgstr[1] ""
-#: server/cityturn.c:1158 server/techtools.c:176
+#: server/cityturn.c:1158 server/techtools.c:172
#, c-format
msgid "The %s have acquired %s from %s."
msgstr ""
@@ -1907,123 +1908,127 @@ msgstr ""
msgid "Warning: the %s option is obsolete. Use -m to enable the metaserver.\n"
msgstr ""
-#: server/civserver.c:189
+#: server/civserver.c:193
#, c-format
msgid "Error: unknown option '%s'\n"
msgstr ""
-#: server/civserver.c:200
+#: server/civserver.c:204
#, c-format
msgid "This is the server for %s"
msgstr ""
-#: server/civserver.c:201
+#: server/civserver.c:205
#, c-format
msgid "You can learn a lot about Freeciv at %s"
msgstr ""
-#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
+#: server/civserver.c:210 client/civclient.c:239 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
"Valid options are:\n"
msgstr ""
-#: server/civserver.c:208
+#: server/civserver.c:212
msgid ""
" -a --auth FILE\tEnable server authentication with configuration from "
"FILE.\n"
msgstr ""
-#: server/civserver.c:210
+#: server/civserver.c:214
msgid " -G --Guests\t\tAllow guests to login if auth is enabled.\n"
msgstr ""
-#: server/civserver.c:212
+#: server/civserver.c:216
msgid " -N --Newusers\tAllow new users to login if auth is enabled.\n"
msgstr ""
-#: server/civserver.c:215
+#: server/civserver.c:219
msgid " -b --bind ADDR\tListen for clients on ADDR\n"
msgstr ""
-#: server/civserver.c:217 client/civclient.c:242
+#: server/civserver.c:221 client/civclient.c:243
msgid ""
" -d, --debug NUM\tSet debug log level (0 to 4, or 4:file1,min,max:...)\n"
msgstr ""
-#: server/civserver.c:221 client/civclient.c:246
+#: server/civserver.c:225 client/civclient.c:247
msgid " -d, --debug NUM\tSet debug log level (0 to 3)\n"
msgstr ""
-#: server/civserver.c:223
+#: server/civserver.c:227
msgid " -f, --file FILE\tLoad saved game FILE\n"
msgstr ""
-#: server/civserver.c:225 client/civclient.c:249 manual/civmanual.c:382
+#: server/civserver.c:229 client/civclient.c:250 manual/civmanual.c:382
msgid " -h, --help\t\tPrint a summary of the options\n"
msgstr ""
-#: server/civserver.c:226
+#: server/civserver.c:230
+msgid " -i, --identity ADDR\tBe known as ADDR at metaserver\n"
+msgstr ""
+
+#: server/civserver.c:231
msgid " -l, --log FILE\tUse FILE as logfile\n"
msgstr ""
-#: server/civserver.c:227
+#: server/civserver.c:232
msgid " -m, --meta\t\tNotify metaserver and send server's info\n"
msgstr ""
-#: server/civserver.c:229
+#: server/civserver.c:234
msgid " -M, --Metaserver ADDR\tSet ADDR as metaserver address\n"
msgstr ""
-#: server/civserver.c:232
+#: server/civserver.c:237
msgid " -p, --port PORT\tListen for clients on port PORT\n"
msgstr ""
-#: server/civserver.c:234
+#: server/civserver.c:239
msgid " -q, --quitidle TIME\tQuit if no players for TIME seconds\n"
msgstr ""
-#: server/civserver.c:236
+#: server/civserver.c:241
msgid " -e, --exit-on-end\tWhen a game ends, exit instead of restarting\n"
msgstr ""
-#: server/civserver.c:239
+#: server/civserver.c:244
msgid " -s, --saves DIR\tSave games to directory DIR\n"
msgstr ""
-#: server/civserver.c:241
+#: server/civserver.c:246
msgid " -S, --Serverid ID\tSets the server id to ID\n"
msgstr ""
-#: server/civserver.c:243
+#: server/civserver.c:248
msgid " -P, --Ppm\t\tSave ppms of the map when saving the game.\n"
msgstr ""
-#: server/civserver.c:244
+#: server/civserver.c:249
msgid " -r, --read FILE\tRead startup script FILE\n"
msgstr ""
-#: server/civserver.c:246
+#: server/civserver.c:251
msgid " -R, --Ranklog FILE\tUse FILE as ranking logfile\n"
msgstr ""
-#: server/civserver.c:247 client/civclient.c:268 manual/civmanual.c:383
+#: server/civserver.c:252 client/civclient.c:269 manual/civmanual.c:383
msgid " -v, --version\t\tPrint the version number\n"
msgstr ""
-#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
+#: server/civserver.c:253 client/gui-gtk-2.0/gui_main.c:354
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, c-format
msgid "Report bugs at %s.\n"
msgstr ""
-#: server/commands.c:28
+#: server/commands.c:29
msgid "Start the game, or restart after loading a savegame."
msgstr ""
-#: server/commands.c:29
+#: server/commands.c:30
msgid ""
"This command starts the game. When starting a new game, it should be used "
"after all human players have connected, and AI players have been created (if "
@@ -2035,7 +2040,7 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:42
+#: server/commands.c:44
msgid ""
"help\n"
"help commands\n"
@@ -2044,11 +2049,11 @@ msgid ""
"help <option-name>"
msgstr ""
-#: server/commands.c:47
+#: server/commands.c:49
msgid "Show help about server commands and server options."
msgstr ""
-#: server/commands.c:48
+#: server/commands.c:50
msgid ""
"With no arguments gives some introductory help. With argument \"commands\" "
"or \"options\" gives respectively a list of all commands or all options. "
@@ -2058,31 +2063,31 @@ msgid ""
"be abbreviated where unambiguous."
msgstr ""
-#: server/commands.c:63
+#: server/commands.c:66
msgid "Show a list of players, teams, connections, or scenarios."
msgstr ""
-#: server/commands.c:64
+#: server/commands.c:67
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 ""
-#: server/commands.c:70
+#: server/commands.c:74
msgid "Quit the game and shutdown the server."
msgstr "×¦× ×ž×”×ž×©×—×§ וסגור ×ת השרת"
#. TRANS: translate text between <> only
-#: server/commands.c:74
+#: server/commands.c:79
msgid "cut <connection-name>"
msgstr ""
-#: server/commands.c:75
+#: server/commands.c:80
msgid "Cut a client's connection to server."
msgstr ""
-#: server/commands.c:76
+#: server/commands.c:81
msgid ""
"Cut specified client's connection to the server, removing that client from "
"the game. If the game has not yet started that client's player is removed "
@@ -2091,17 +2096,17 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:83
+#: server/commands.c:89
msgid ""
"explain\n"
"explain <option-name>"
msgstr ""
-#: server/commands.c:85
+#: server/commands.c:91
msgid "Explain server options."
msgstr ""
-#: server/commands.c:86
+#: server/commands.c:92
msgid ""
"The 'explain' command gives a subset of the functionality of 'help', and is "
"included for backward compatibility. With no arguments it gives a list of "
@@ -2110,89 +2115,90 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:93
+#: server/commands.c:100
msgid ""
"show\n"
"show <option-name>\n"
"show <option-prefix>"
msgstr ""
-#: server/commands.c:96
+#: server/commands.c:103
msgid "Show server options."
msgstr ""
-#: server/commands.c:97
+#: server/commands.c:104
msgid ""
"With no arguments, shows all server options (or available options, when used "
"by clients). With an argument, show only the named option, or options with "
"that prefix."
msgstr ""
-#: server/commands.c:102
+#: server/commands.c:110
msgid "wall <message>"
msgstr ""
-#: server/commands.c:103
+#: server/commands.c:111
msgid "Send message to all connections."
msgstr ""
-#: server/commands.c:104
+#: server/commands.c:112
msgid ""
"For each connected client, pops up a window showing the message entered."
msgstr ""
-#: server/commands.c:108
+#: server/commands.c:117
msgid "vote yes|no [vote number]"
msgstr ""
-#: server/commands.c:109
+#: server/commands.c:118
msgid "Cast a vote."
msgstr ""
-#: server/commands.c:111
+#: server/commands.c:120
#, 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."
+"A player with basic 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."
msgstr ""
-#: server/commands.c:121
+#: server/commands.c:131
msgid ""
"debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
"<player> | timing | info]"
msgstr ""
-#: server/commands.c:123
+#: server/commands.c:133
msgid "Turn on or off AI debugging of given entity."
msgstr ""
-#: server/commands.c:124
+#: server/commands.c:134
msgid ""
"Print AI debug information about given entity and turn continous debugging "
"output for this entity on or off."
msgstr ""
-#: server/commands.c:128
+#: server/commands.c:139
msgid "set <option-name> <value>"
msgstr ""
-#: server/commands.c:129
+#: server/commands.c:140
msgid "Set server option."
msgstr ""
-#: server/commands.c:132
+#: server/commands.c:144
msgid "team <player> [team]"
msgstr ""
-#: server/commands.c:133
+#: server/commands.c:145
msgid "Change, add or remove a player's team affiliation."
msgstr ""
-#: server/commands.c:134
+#: server/commands.c:146
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 "
@@ -2200,30 +2206,30 @@ msgid ""
"to achieve team victory with averaged individual scores."
msgstr ""
-#: server/commands.c:141
+#: server/commands.c:154
msgid "rulesetdir <directory>"
msgstr ""
-#: server/commands.c:142
+#: server/commands.c:155
msgid "Choose new ruleset directory or modpack."
msgstr ""
-#: server/commands.c:143
+#: server/commands.c:156
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:149
+#: server/commands.c:163
msgid "metainfo <meta-line>"
msgstr ""
-#: server/commands.c:150
+#: server/commands.c:164
msgid "Set metaserver info line."
msgstr ""
-#: server/commands.c:151
+#: server/commands.c:165
msgid ""
"Set user defined metaserver info line. If parameter is omitted,\n"
"previously set metamessage will be removed. For most of the time\n"
@@ -2232,19 +2238,19 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:158
+#: server/commands.c:173
msgid "metapatch <meta-line>"
msgstr ""
-#: server/commands.c:159
+#: server/commands.c:174
msgid "Set metaserver patches line."
msgstr ""
-#: server/commands.c:165
+#: server/commands.c:181
msgid "Control metaserver connection."
msgstr ""
-#: server/commands.c:166
+#: server/commands.c:182
msgid ""
"'metaconnection ?' reports on the status of the connection to metaserver.\n"
"'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2252,33 +2258,33 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:172
+#: server/commands.c:189
msgid "metaserver <address>"
msgstr ""
-#: server/commands.c:173
+#: server/commands.c:190
msgid "Set address (URL) for metaserver to report to."
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:177
+#: server/commands.c:195
msgid "aitoggle <player-name>"
msgstr ""
-#: server/commands.c:178
+#: server/commands.c:196
msgid "Toggle AI status of player."
msgstr ""
#. TRANS: translate text between [] and <> only
-#: server/commands.c:182
+#: server/commands.c:201
msgid "take [connection-name] <player-name>"
msgstr ""
-#: server/commands.c:183
+#: server/commands.c:202
msgid "Take over a player's place in the game."
msgstr ""
-#: server/commands.c:184
+#: server/commands.c:203
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 "
@@ -2288,15 +2294,15 @@ msgid ""
msgstr ""
#. TRANS: translate text between [] only
-#: server/commands.c:192
+#: server/commands.c:212
msgid "observe [connection-name] [player-name]"
msgstr ""
-#: server/commands.c:193
+#: server/commands.c:213
msgid "Observe a player or the whole game."
msgstr ""
-#: server/commands.c:194
+#: server/commands.c:214
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 "
@@ -2306,60 +2312,60 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:202
+#: server/commands.c:223
msgid "detach <connection-name>"
msgstr ""
-#: server/commands.c:203
+#: server/commands.c:224
msgid "detach from a player."
msgstr ""
-#: server/commands.c:204
+#: server/commands.c:225
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:209
+#: server/commands.c:231
msgid "create <player-name>"
msgstr ""
-#: server/commands.c:210
+#: server/commands.c:232
msgid "Create an AI player with a given name."
msgstr ""
-#: server/commands.c:211
+#: server/commands.c:233
msgid ""
"The 'create' command is only available before the game has been started."
msgstr ""
-#: server/commands.c:215
+#: server/commands.c:238
msgid ""
"away\n"
"away"
msgstr ""
-#: server/commands.c:217
+#: server/commands.c:240
msgid "Set yourself in away mode. The AI will watch your back."
msgstr ""
-#: server/commands.c:218
+#: server/commands.c:241
msgid "The AI will govern your nation but do minimal changes."
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:222
+#: server/commands.c:246
msgid ""
"novice\n"
"novice <player-name>"
msgstr ""
-#: server/commands.c:224
+#: server/commands.c:248
msgid "Set one or all AI players to 'novice'."
msgstr "קבע ×חד ×ו ×ת כל ×©×—×§× ×™ ×”×\"מ ל'טירון'"
-#: server/commands.c:225
+#: server/commands.c:249
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 "
@@ -2367,17 +2373,17 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:231
+#: server/commands.c:256
msgid ""
"easy\n"
"easy <player-name>"
msgstr ""
-#: server/commands.c:233
+#: server/commands.c:258
msgid "Set one or all AI players to 'easy'."
msgstr ""
-#: server/commands.c:234
+#: server/commands.c:259
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 "
@@ -2385,17 +2391,17 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:240
+#: server/commands.c:266
msgid ""
"normal\n"
"normal <player-name>"
msgstr ""
-#: server/commands.c:242
+#: server/commands.c:268
msgid "Set one or all AI players to 'normal'."
msgstr ""
-#: server/commands.c:243
+#: server/commands.c:269
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 "
@@ -2403,17 +2409,17 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:249
+#: server/commands.c:276
msgid ""
"hard\n"
"hard <player-name>"
msgstr ""
-#: server/commands.c:251
+#: server/commands.c:278
msgid "Set one or all AI players to 'hard'."
msgstr ""
-#: server/commands.c:252
+#: server/commands.c:279
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 "
@@ -2421,17 +2427,17 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:258
+#: server/commands.c:286
msgid ""
"experimental\n"
"experimental <player-name>"
msgstr ""
-#: server/commands.c:260
+#: server/commands.c:288
msgid "Set one or all AI players to 'experimental'."
msgstr ""
-#: server/commands.c:261
+#: server/commands.c:289
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 "
@@ -2440,7 +2446,7 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:269
+#: server/commands.c:298
msgid ""
"cmdlevel\n"
"cmdlevel <level>\n"
@@ -2449,17 +2455,19 @@ msgid ""
"cmdlevel <level> <connection-name>"
msgstr ""
-#: server/commands.c:274
+#: server/commands.c:303
msgid "Query or set command access level access."
msgstr ""
-#: server/commands.c:275
+#: server/commands.c:304
msgid ""
"The command access level controls which server commands are available\n"
"to users via the client chatline. The available levels are:\n"
" none - no commands\n"
-" info - informational commands only\n"
+" info - informational or observer commands only\n"
+" basic - commands available to players in the game\n"
" ctrl - commands that affect the game and users\n"
+" admin - commands that affect server operation\n"
" hack - *all* commands - dangerous!\n"
"With no arguments, the current command access levels are reported.\n"
"With a single argument, the level is set for all existing connections,\n"
@@ -2475,20 +2483,20 @@ msgid ""
"now takes connection names, not player names."
msgstr ""
-#: server/commands.c:296
+#: server/commands.c:328
msgid "If there is none, become the game organizer with increased permissions."
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:301
+#: server/commands.c:334
msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
msgstr ""
-#: server/commands.c:302
+#: server/commands.c:335
msgid "See \"help timeoutincrease\"."
msgstr ""
-#: server/commands.c:303
+#: server/commands.c:336
msgid ""
"Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
"<turn> and multiply <value> by <valuemult>. Use this command in concert "
@@ -2496,24 +2504,43 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:309
+#: server/commands.c:343
+msgid ""
+"cancelvote\n"
+"cancelvote <vote number>\n"
+"cancelvote all\n"
+msgstr ""
+
+#: server/commands.c:346
+msgid "Cancel a running vote.\n"
+msgstr ""
+
+#: server/commands.c:347
+msgid ""
+"With no arguments this command removes your own vote. If you have an admin "
+"access level, you can cancel any vote by vote number, or all votes with the "
+"'all' argument."
+msgstr ""
+
+#. TRANS: translate text between <> only
+#: server/commands.c:354
msgid "endgame"
msgstr "×¡×™×™× ×ž×©×—×§"
-#: server/commands.c:310
+#: server/commands.c:355
msgid "End the game immediately in a draw."
msgstr "×¡×™×™× ×ת המשחק מיד בתיקו."
#. TRANS: translate text between <> only
-#: server/commands.c:314
+#: server/commands.c:360
msgid "surrender"
msgstr "×”×™×›× ×¢"
-#: server/commands.c:315
+#: server/commands.c:361
msgid "Concede the game."
msgstr "וותר על המשחק."
-#: server/commands.c:316
+#: server/commands.c:362
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."
@@ -2522,15 +2549,15 @@ msgstr ""
"וויתרו על המשחק ב×ופן ×–×”, המשחק מסתיי×."
#. TRANS: translate text between <> only
-#: server/commands.c:322
+#: server/commands.c:369
msgid "remove <player-name>"
msgstr "הסר <player-name>"
-#: server/commands.c:323
+#: server/commands.c:370
msgid "Fully remove player from game."
msgstr "מסיר שחקן ב×ופן ×ž×œ× ×ž×”×ž×©×—×§."
-#: server/commands.c:324
+#: server/commands.c:371
msgid ""
"This *completely* removes a player from the game, including all cities and "
"units etc. Use with care!"
@@ -2539,7 +2566,7 @@ msgstr ""
"בזהירות!"
#. TRANS: translate text between <> only
-#: server/commands.c:329
+#: server/commands.c:377
msgid ""
"save\n"
"save <file-name>"
@@ -2547,11 +2574,11 @@ msgstr ""
"שמור\n"
"שמור <file-name>"
-#: server/commands.c:331
+#: server/commands.c:379
msgid "Save game to file."
msgstr "שמור משחק לקובץ."
-#: server/commands.c:332
+#: server/commands.c:380
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"
@@ -2562,133 +2589,133 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:341
+#: server/commands.c:390
msgid ""
"load\n"
"load <file-name>"
msgstr ""
-#: server/commands.c:343
+#: server/commands.c:392
msgid "Load game from file."
msgstr ""
-#: server/commands.c:344
+#: server/commands.c:393
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:349
+#: server/commands.c:399
msgid "read <file-name>"
msgstr ""
-#: server/commands.c:350
+#: server/commands.c:400
msgid "Process server commands from file."
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:354
+#: server/commands.c:405
msgid "write <file-name>"
msgstr ""
-#: server/commands.c:355
+#: server/commands.c:406
msgid "Write current settings as server commands to file."
msgstr ""
-#: server/commands.c:359
+#: server/commands.c:411
msgid "Switch server output between 'RFC-style' and normal style."
msgstr ""
-#: server/commands.c:363
+#: server/commands.c:416
msgid "Simply returns the id of the server."
msgstr ""
-#: server/connecthand.c:85
+#: server/connecthand.c:109
#, c-format
msgid "Welcome to the %s Server running at %s port %d."
msgstr ""
-#: server/connecthand.c:89
+#: server/connecthand.c:113
#, c-format
msgid "Welcome to the %s Server at port %d."
msgstr ""
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:97
+#: server/connecthand.c:121
#, c-format
msgid "(%d) %s: connected [%s]"
msgstr ""
-#: server/connecthand.c:104
+#: server/connecthand.c:128
#, c-format
msgid "Server: %s has connected from %s."
msgstr ""
-#: server/connecthand.c:145
+#: server/connecthand.c:175
msgid "Couldn't attach your connection to new player."
msgstr ""
-#: server/connecthand.c:165
+#: server/connecthand.c:199
#, c-format
msgid "You are logged in as '%s' connected to no player."
msgstr ""
-#: server/connecthand.c:169
+#: server/connecthand.c:203
#, c-format
msgid "You are logged in as '%s' connected to an anonymous player."
msgstr ""
-#: server/connecthand.c:174
+#: server/connecthand.c:208
#, c-format
msgid "You are logged in as '%s' connected to %s."
msgstr ""
-#: server/connecthand.c:187
+#: server/connecthand.c:221
#, c-format
msgid "Turn-blocking game play: waiting on %s to finish turn..."
msgstr ""
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:240
+#: server/connecthand.c:274
#, c-format
msgid "(%d) %s: connection request [%s]"
msgstr ""
-#: server/connecthand.c:266
+#: server/connecthand.c:300
msgid "The client is missing a capability that this server needs."
msgstr ""
-#: server/connecthand.c:268 server/connecthand.c:279
+#: server/connecthand.c:302 server/connecthand.c:313
#, c-format
msgid "(%d) %s rejected: mismatched capabilities!"
msgstr ""
-#: server/connecthand.c:277
+#: server/connecthand.c:311
msgid "This server is missing a capability that the client needs."
msgstr ""
-#: server/connecthand.c:290
+#: server/connecthand.c:324
msgid "The username is invalid!"
msgstr ""
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:292
+#: server/connecthand.c:326
#, c-format
msgid "(%d) %s rejected: invalid username [%s]"
msgstr ""
-#: server/connecthand.c:303
+#: server/connecthand.c:337
msgid "Your username is already connected!"
msgstr ""
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:305
+#: server/connecthand.c:339
#, c-format
msgid "(%d) %s rejected: duplicate username [%s]"
msgstr ""
-#: server/connecthand.c:335 server/connecthand.c:344
+#: server/connecthand.c:369 server/connecthand.c:378
#, c-format
msgid "Lost connection: %s."
msgstr ""
@@ -2705,110 +2732,110 @@ msgstr ""
msgid "For introductory help, type 'help'."
msgstr ""
-#: server/diplhand.c:164
+#: server/diplhand.c:167
#, c-format
msgid "The %s can't accept %s."
msgstr ""
-#: server/diplhand.c:176
+#: server/diplhand.c:179
#, c-format
msgid "You don't have tech %s, you can't accept treaty."
msgstr ""
-#: server/diplhand.c:185
+#: server/diplhand.c:188
msgid "City you are trying to give no longer exists, you can't accept treaty."
msgstr ""
-#: server/diplhand.c:191
+#: server/diplhand.c:194
#, c-format
msgid "You are not owner of %s, you can't accept treaty."
msgstr ""
-#: server/diplhand.c:197 server/diplhand.c:301
+#: server/diplhand.c:200 server/diplhand.c:304
#, c-format
msgid "Your capital (%s) is requested, you can't accept treaty."
msgstr ""
-#: server/diplhand.c:224
+#: server/diplhand.c:227
msgid "You don't have enough gold, you can't accept treaty."
msgstr ""
-#: server/diplhand.c:256 server/diplhand.c:261
+#: server/diplhand.c:259 server/diplhand.c:264
#, c-format
msgid "A treaty containing %d clause was agreed upon."
msgid_plural "A treaty containing %d clauses was agreed upon."
msgstr[0] ""
msgstr[1] ""
-#: server/diplhand.c:277 server/diplhand.c:281
+#: server/diplhand.c:280 server/diplhand.c:284
#, c-format
msgid "One of the cities the %s are giving away is destroyed! Treaty canceled!"
msgstr ""
-#: server/diplhand.c:288 server/diplhand.c:293
+#: server/diplhand.c:291 server/diplhand.c:296
#, c-format
msgid "The %s no longer control %s! Treaty canceled!"
msgstr ""
-#: server/diplhand.c:331 server/diplhand.c:335
+#: server/diplhand.c:334 server/diplhand.c:338
#, c-format
msgid "The %s don't have the promised amount of gold! Treaty canceled!"
msgstr ""
-#: server/diplhand.c:364
+#: server/diplhand.c:367
#, c-format
msgid "You gave an embassy to %s."
msgstr ""
-#: server/diplhand.c:367
+#: server/diplhand.c:370
#, c-format
msgid "%s allowed you to create an embassy!"
msgstr ""
-#: server/diplhand.c:383
+#: server/diplhand.c:386
#, c-format
msgid "You are taught the knowledge of %s."
msgstr ""
-#: server/diplhand.c:387
+#: server/diplhand.c:390
#, c-format
msgid "The %s have acquired %s from the %s."
msgstr ""
-#: server/diplhand.c:402
+#: server/diplhand.c:405
#, c-format
msgid "You get %d gold."
msgstr ""
#. TRANS: ... Polish worldmap.
-#: server/diplhand.c:410
+#: server/diplhand.c:413
#, c-format
msgid "You receive the %s worldmap."
msgstr ""
#. TRANS: ... Polish seamap.
-#: server/diplhand.c:419
+#: server/diplhand.c:422
#, c-format
msgid "You receive the %s seamap."
msgstr ""
-#: server/diplhand.c:436
+#: server/diplhand.c:439
#, c-format
msgid "You receive city of %s from %s."
msgstr ""
-#: server/diplhand.c:441
+#: server/diplhand.c:444
#, c-format
msgid "You give city of %s to %s."
msgstr ""
-#: server/diplhand.c:454 server/diplhand.c:457
+#: server/diplhand.c:457 server/diplhand.c:460
#, c-format
msgid "You agree on a cease-fire with %s."
msgstr ""
#. TRANS: ... the Poles ... Polish territory.
-#: server/diplhand.c:476 server/diplhand.c:488
+#: server/diplhand.c:479 server/diplhand.c:491
#, c-format
msgid ""
"You agree on an armistice with the %s. In %d turn, it will become a peace "
@@ -2819,32 +2846,32 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: server/diplhand.c:512 server/diplhand.c:515
+#: server/diplhand.c:515 server/diplhand.c:518
#, c-format
msgid "You agree on an alliance with %s."
msgstr ""
-#: server/diplhand.c:524
+#: server/diplhand.c:527
#, c-format
msgid "You give shared vision to %s."
msgstr ""
-#: server/diplhand.c:527
+#: server/diplhand.c:530
#, c-format
msgid "%s gives you shared vision."
msgstr ""
-#: server/diplhand.c:663
+#: server/diplhand.c:666
#, c-format
msgid "%s canceled the meeting!"
msgstr ""
-#: server/diplhand.c:670
+#: server/diplhand.c:673
#, c-format
msgid "Meeting with %s canceled."
msgstr ""
-#: server/diplhand.c:712
+#: server/diplhand.c:715
msgid "Your diplomatic envoy was decapitated!"
msgstr ""
@@ -3027,80 +3054,80 @@ msgid "The %s destroyed the %s in %s."
msgstr ""
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1091
+#: server/diplomats.c:1097
#, c-format
msgid "An enemy %s has been eliminated by your %s."
msgstr ""
#. TRANS: <unit> ... <city> ... <diplomat>
-#: server/diplomats.c:1098
+#: server/diplomats.c:1104
#, c-format
msgid "Your %s has been eliminated defending %s against a %s."
msgstr ""
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1106
+#: server/diplomats.c:1112
#, c-format
msgid "Your %s has been eliminated defending against a %s."
msgstr ""
-#: server/diplomats.c:1119
+#: server/diplomats.c:1125
#, c-format
msgid "Your %s was eliminated by a defending %s."
msgstr ""
-#: server/diplomats.c:1127
+#: server/diplomats.c:1133
#, c-format
msgid "Eliminated %s %s while infiltrating %s."
msgstr ""
-#: server/diplomats.c:1134
+#: server/diplomats.c:1140
#, c-format
msgid "Eliminated %s %s while infiltrating our troops."
msgstr ""
-#: server/diplomats.c:1185
+#: server/diplomats.c:1191
#, c-format
msgid ""
"Your %s has successfully completed the mission and returned unharmed to %s."
msgstr ""
-#: server/diplomats.c:1204
+#: server/diplomats.c:1210
#, c-format
msgid "Your %s was captured after completing the mission in %s."
msgstr ""
-#: server/diplomats.c:1210
+#: server/diplomats.c:1216
#, c-format
msgid "Your %s was captured after completing the mission."
msgstr ""
-#: server/diplomats.c:1242
+#: server/diplomats.c:1248
#, c-format
msgid "You have caused an incident while bribing the %s %s."
msgstr ""
-#: server/diplomats.c:1247
+#: server/diplomats.c:1253
#, c-format
msgid "%s has caused an incident while bribing your %s."
msgstr ""
-#: server/diplomats.c:1254
+#: server/diplomats.c:1260
#, c-format
msgid "You have caused an incident while attempting to steal tech from %s."
msgstr ""
-#: server/diplomats.c:1258
+#: server/diplomats.c:1264
#, c-format
msgid "%s has caused an incident while attempting to steal tech from you."
msgstr ""
-#: server/diplomats.c:1264
+#: server/diplomats.c:1270
#, c-format
msgid "You have caused an incident while inciting a revolt in %s."
msgstr ""
-#: server/diplomats.c:1268
+#: server/diplomats.c:1274
#, c-format
msgid "%s have caused an incident while inciting a revolt in %s."
msgstr ""
@@ -3207,12 +3234,12 @@ msgid ""
" Workers spontaneously gather and upgrade all cities with railroads."
msgstr ""
-#: server/maphand.c:1418
+#: server/maphand.c:1425
#, c-format
msgid "Moved your %s due to changing terrain."
msgstr ""
-#: server/maphand.c:1436
+#: server/maphand.c:1443
#, c-format
msgid "Disbanded your %s due to changing terrain."
msgstr ""
@@ -3221,7 +3248,7 @@ msgstr ""
msgid "Not reporting to the metaserver in this game."
msgstr ""
-#: server/meta.c:430
+#: server/meta.c:432
#, c-format
msgid "Metaserver: bad address: [%s:%d]."
msgstr ""
@@ -3336,54 +3363,54 @@ msgid ""
"with %s."
msgstr ""
-#: server/plrhand.c:1103
+#: server/plrhand.c:1115
#, c-format
msgid "Removing player %s."
msgstr ""
-#: server/plrhand.c:1105
+#: server/plrhand.c:1117
msgid "You've been removed from the game!"
msgstr ""
-#: server/plrhand.c:1108
+#: server/plrhand.c:1120
#, c-format
msgid "%s has been removed from the game."
msgstr ""
-#: server/plrhand.c:1153 server/plrhand.c:1158
+#: server/plrhand.c:1167 server/plrhand.c:1172
#, c-format
msgid "You have made contact with the %s, ruled by %s."
msgstr ""
-#: server/plrhand.c:1178
+#: server/plrhand.c:1192
#, c-format
msgid ""
"%s and %s meet and go to instant war. You cancel your alliance with both."
msgstr ""
-#: server/plrhand.c:1656
+#: server/plrhand.c:1670
#, c-format
msgid "Could not throw %s into civil war - too many players"
msgstr ""
-#: server/plrhand.c:1663
+#: server/plrhand.c:1677
#, c-format
msgid "Could not throw %s into civil war - no available nations"
msgstr ""
-#: server/plrhand.c:1686
+#: server/plrhand.c:1700
#, c-format
msgid ""
"Your nation is thrust into civil war! %s is declared the leader of the rebel "
"states."
msgstr ""
-#: server/plrhand.c:1707
+#: server/plrhand.c:1721
#, c-format
msgid "%s declares allegiance to %s."
msgstr ""
-#: server/plrhand.c:1722
+#: server/plrhand.c:1736
#, c-format
msgid ""
"Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3572,65 +3599,65 @@ msgstr ""
msgid "Wonders of the World"
msgstr "פל××™ עול×"
-#: server/report.c:547
+#: server/report.c:552
msgid " sq. mi."
msgstr "מיל רבוע"
-#: server/report.c:557
+#: server/report.c:562
msgid " M tons"
msgstr "מ. ×˜×•× ×•×ª"
-#: server/report.c:562
+#: server/report.c:567
msgid " M goods"
msgstr "מ. סחורות"
-#: server/report.c:567
+#: server/report.c:572
msgid " bulbs"
msgstr "× ×•×¨×•×ª"
-#: server/report.c:572
+#: server/report.c:577
msgid " month"
msgid_plural " months"
msgstr[0] "חודש"
msgstr[1] ""
-#: server/report.c:577
+#: server/report.c:582
msgid " ton"
msgid_plural " tons"
msgstr[0] "טון"
msgstr[1] ""
-#: server/report.c:591
+#: server/report.c:596
msgid "st"
msgstr " "
-#: server/report.c:593
+#: server/report.c:598
msgid "nd"
msgstr " "
-#: server/report.c:595
+#: server/report.c:600
msgid "rd"
msgstr " "
-#: server/report.c:597
+#: server/report.c:602
msgid "th"
msgstr " "
-#: server/report.c:700
+#: server/report.c:705
msgid "Demography string contains invalid characters. Try \"help demography\"."
msgstr ""
-#: server/report.c:743 server/report.c:768
+#: server/report.c:748 server/report.c:773
msgid "Demographics Report:"
msgstr ""
-#: server/report.c:744
+#: server/report.c:749
msgid "Sorry, the Demographics report is unavailable."
msgstr ""
#. TRANS: <nation adjective> <government name> (<year>).
#. * E.g. "Polish Despotism (200 AD)".
-#: server/report.c:750
+#: server/report.c:755
#, fuzzy, c-format
msgid "%s %s (%s)"
msgstr "%s (%s) (רשימת־עבודה)"
@@ -3641,11 +3668,11 @@ msgstr "%s (%s) (רשימת־עבודה)"
msgid "Could not find a readable \"%s.%s\" ruleset file."
msgstr ""
-#: server/ruleset.c:2356
+#: server/ruleset.c:2366
msgid "No barbarian nation in rulesets, at least one required!"
msgstr ""
-#: server/ruleset.c:3166
+#: server/ruleset.c:3178
msgid "Loading rulesets"
msgstr ""
@@ -3657,17 +3684,17 @@ msgid ""
"risk."
msgstr ""
-#: server/savegame.c:3588
+#: server/savegame.c:3587
msgid "Saved game is too old, at least version 1.9.0 required."
msgstr ""
#. TRANS: Fatal error message.
-#: server/savegame.c:3815
+#: server/savegame.c:3817
msgid ""
"Saved game uses the \"classic\" terrain ruleset, and is no longer supported."
msgstr ""
-#: server/savegame.c:3824
+#: server/savegame.c:3826
#, c-format
msgid ""
"Warning: Different rulesetdirs ('%s' and '%s') are no longer supported. "
@@ -3675,7 +3702,7 @@ msgid ""
msgstr ""
#. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4051
+#: server/savegame.c:4055
#, c-format
msgid "%s had invalid nation; changing to %s."
msgstr ""
@@ -3708,7 +3735,7 @@ msgstr "×¤× ×™×ž×™"
msgid "Networking"
msgstr "עבודת רשת"
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:734
#: client/gui-win32/dialogs.c:532
msgid "All"
msgstr "הכל"
@@ -4628,11 +4655,11 @@ msgid ""
"the game."
msgstr ""
-#: server/sernet.c:150
+#: server/sernet.c:151
msgid "Server cannot read standard input. Ignoring input."
msgstr ""
-#: server/sernet.c:929
+#: server/sernet.c:933
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr ""
@@ -4705,821 +4732,872 @@ msgstr ""
msgid "Without guidance from the capital, the %s spaceship is lost!"
msgstr ""
-#: server/srv_main.c:240
+#: server/srv_main.c:242
msgid "Game ended in a draw as end year exceeded"
msgstr ""
-#: server/srv_main.c:274
+#: server/srv_main.c:276
#, c-format
msgid "The %s spaceship has arrived at Alpha Centauri."
msgstr ""
-#: server/srv_main.c:287 server/srv_main.c:322
+#: server/srv_main.c:289 server/srv_main.c:324
#, c-format
msgid "Team victory to %s"
msgstr ""
-#: server/srv_main.c:297 server/srv_main.c:338
+#: server/srv_main.c:299 server/srv_main.c:340
#, c-format
msgid "Game ended in victory for %s"
msgstr ""
-#: server/srv_main.c:345
+#: server/srv_main.c:347
msgid "Game ended in a draw"
msgstr ""
-#: server/srv_main.c:461 server/srv_main.c:472
+#: server/srv_main.c:465 server/srv_main.c:476
#, c-format
msgid "Your %s was disbanded in accordance with your peace treaty with the %s."
msgstr ""
-#: server/srv_main.c:512 server/srv_main.c:516
+#: server/srv_main.c:516 server/srv_main.c:520
#, c-format
msgid ""
"Concerned citizens point out that the cease-fire with %s will run out soon."
msgstr ""
-#: server/srv_main.c:521 server/srv_main.c:525
+#: server/srv_main.c:525 server/srv_main.c:529
#, c-format
msgid "The cease-fire with %s has run out. You are now at war with the %s."
msgstr ""
-#: server/srv_main.c:542
+#: server/srv_main.c:546
#, c-format
msgid ""
"Ceasefire between %s and %s has run out. They are at war. You cancel your "
"alliance with both."
msgstr ""
-#: server/srv_main.c:961
+#: server/srv_main.c:997
#, c-format
msgid "Failed saving game as %s"
msgstr ""
-#: server/srv_main.c:963
+#: server/srv_main.c:999
#, c-format
msgid "Game saved as %s"
msgstr ""
-#: server/srv_main.c:994
+#: server/srv_main.c:1030
msgid "The game is already running."
msgstr ""
-#: server/srv_main.c:1002
+#: server/srv_main.c:1038
#, c-format
msgid "%s lost control cmdlevel on game start. Use voting from now on."
msgstr ""
-#: server/srv_main.c:1009
+#: server/srv_main.c:1045
msgid "Starting game."
msgstr ""
-#: server/srv_main.c:1071
+#: server/srv_main.c:1112
#, c-format
msgid "request for unknown report (type %d)"
msgstr ""
-#: server/srv_main.c:1136
+#: server/srv_main.c:1177
#, c-format
msgid "Warning: rejecting old client %s"
msgstr ""
-#: server/srv_main.c:1238
+#: server/srv_main.c:1279
#, c-format
msgid "Got a packet of type %d from a dead or observer player"
msgstr ""
-#: server/srv_main.c:1338
+#: server/srv_main.c:1381
msgid "Please choose a non-blank name."
msgstr ""
-#: server/srv_main.c:1354
+#: server/srv_main.c:1397
msgid "That nation is already in use."
msgstr ""
-#: server/srv_main.c:1370
+#: server/srv_main.c:1413
#, c-format
msgid "Another player already has the name '%s'. Please choose another name."
msgstr ""
-#: server/srv_main.c:1391
+#: server/srv_main.c:1434
msgid "Please choose a name containing only ASCII characters."
msgstr ""
-#: server/srv_main.c:1490
+#: server/srv_main.c:1533
#, c-format
msgid "%s nation is not available in this scenario."
msgstr ""
-#: server/srv_main.c:1496
+#: server/srv_main.c:1539
#, c-format
msgid "%s nation is already in use."
msgstr ""
-#: server/srv_main.c:1514
+#: server/srv_main.c:1557
#, c-format
msgid "%s is the %s ruler %s."
msgstr ""
-#: server/srv_main.c:1570
+#: server/srv_main.c:1613
#, c-format
msgid "Waiting to start game: %d out of %d players are ready to start."
msgstr ""
-#: server/srv_main.c:1614 server/srv_main.c:1618
+#: server/srv_main.c:1657 server/srv_main.c:1661
#, c-format
msgid "%s has been added as %s level AI-controlled player."
msgstr ""
-#: server/srv_main.c:1760
+#: server/srv_main.c:1803
#, c-format
msgid "Player %d"
msgstr "שחקן %d"
-#: server/srv_main.c:1771 server/srv_main.c:1777
+#: server/srv_main.c:1814 server/srv_main.c:1820
#, c-format
msgid "%s rules the %s."
msgstr ""
-#: server/srv_main.c:1942
+#: server/srv_main.c:1985
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
msgstr ""
-#: server/srv_main.c:1993
+#: server/srv_main.c:2037
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr ""
-#: server/srv_main.c:2024
+#: server/srv_main.c:2069
msgid "The game is over..."
msgstr ""
-#: server/srv_main.c:2237
+#: server/srv_main.c:2286
msgid "Now accepting new client connections."
msgstr ""
-#: server/stdinhand.c:246
-#, c-format
-msgid "Vote \"%s\" is passed %d to %d with %d abstentions."
-msgstr ""
-
-#: server/stdinhand.c:253
-#, c-format
-msgid "Vote \"%s\" failed with %d against, %d for and %d abstentions."
-msgstr ""
-
#. TRANS: ambiguous command
-#: server/stdinhand.c:365
+#: server/stdinhand.c:284
msgid "(ambiguous)"
msgstr ""
#. TRANS: unrecognized command
#. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:416
+#: server/stdinhand.c:287 client/citydlg_common.c:419
#: 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 ""
-#: server/stdinhand.c:458
+#: server/stdinhand.c:377
msgid "Name is empty, so cannot be a player."
msgstr ""
-#: server/stdinhand.c:462
+#: server/stdinhand.c:381
msgid "Name is too long, so cannot be a player."
msgstr ""
-#: server/stdinhand.c:466
+#: server/stdinhand.c:385
#, c-format
msgid "Player name prefix '%s' is ambiguous."
msgstr ""
-#: server/stdinhand.c:470
+#: server/stdinhand.c:389
#, c-format
msgid "No player by the name of '%s'."
msgstr ""
-#: server/stdinhand.c:474 server/stdinhand.c:509
+#: server/stdinhand.c:393 server/stdinhand.c:428
#, c-format
msgid "Unexpected match_result %d (%s) for '%s'."
msgstr ""
-#: server/stdinhand.c:493
+#: server/stdinhand.c:412
msgid "Name is empty, so cannot be a connection."
msgstr ""
-#: server/stdinhand.c:497
+#: server/stdinhand.c:416
msgid "Name is too long, so cannot be a connection."
msgstr ""
-#: server/stdinhand.c:501
+#: server/stdinhand.c:420
#, c-format
msgid "Connection name prefix '%s' is ambiguous."
msgstr ""
-#: server/stdinhand.c:505
+#: server/stdinhand.c:424
#, c-format
msgid "No connection by the name of '%s'."
msgstr ""
-#: server/stdinhand.c:525
+#: server/stdinhand.c:444
#, c-format
msgid "Open metaserver connection to [%s]."
msgstr ""
-#: server/stdinhand.c:538
+#: server/stdinhand.c:457
#, c-format
msgid "Close metaserver connection to [%s]."
msgstr ""
-#: server/stdinhand.c:553
+#: server/stdinhand.c:472
msgid "Metaserver connection is open."
msgstr ""
-#: server/stdinhand.c:556
+#: server/stdinhand.c:475
msgid "Metaserver connection is closed."
msgstr ""
-#: server/stdinhand.c:566
+#: server/stdinhand.c:485
msgid "Metaserver connection is already open."
msgstr ""
-#: server/stdinhand.c:577
+#: server/stdinhand.c:496
msgid "Metaserver connection is already closed."
msgstr ""
-#: server/stdinhand.c:582
+#: server/stdinhand.c:501
msgid "Argument must be 'u', 'up', 'd', 'down', or '?'."
msgstr ""
-#: server/stdinhand.c:603
+#: server/stdinhand.c:522
#, c-format
msgid "Metaserver patches string set to '%s'."
msgstr ""
-#: server/stdinhand.c:606
+#: server/stdinhand.c:525
#, c-format
msgid "Metaserver patches string set to '%s', not reporting to metaserver."
msgstr ""
-#: server/stdinhand.c:627
+#: server/stdinhand.c:546
#, c-format
msgid "Metaserver message string set to '%s'."
msgstr ""
-#: server/stdinhand.c:630
+#: server/stdinhand.c:549
#, c-format
msgid "Metaserver message string set to '%s', not reporting to metaserver."
msgstr ""
-#: server/stdinhand.c:650
+#: server/stdinhand.c:569
#, c-format
msgid "Metaserver is now [%s]."
msgstr ""
-#: server/stdinhand.c:660
+#: server/stdinhand.c:579
#, c-format
msgid "Server id: %s"
msgstr ""
-#: server/stdinhand.c:757
+#: server/stdinhand.c:676
msgid "You cannot save games manually on this server."
msgstr "×ין ב×פשרותך לשמור משחק ב×ופן ×™×“× ×™ על שרת ×–×”."
-#: server/stdinhand.c:774
+#: server/stdinhand.c:693
msgid "Cannot toggle a barbarian player."
msgstr ""
-#: server/stdinhand.c:781
+#: server/stdinhand.c:700
#, c-format
msgid "%s is now under AI control."
msgstr ""
-#: server/stdinhand.c:802
+#: server/stdinhand.c:721
#, c-format
msgid "%s is now under human control."
msgstr ""
-#: server/stdinhand.c:847
+#: server/stdinhand.c:766
msgid "Can't add AI players once the game has begun."
msgstr "×ין ×פשרות להוסיף ×©×—×§× ×™ ×\"מ ל×חר שהמשחק החל."
-#: server/stdinhand.c:867
+#: server/stdinhand.c:786
msgid "Can't add more players, server is full."
msgstr "×ין ×פשרות להוסיף עוד ×©×—×§× ×™×, השרת מל×."
-#: server/stdinhand.c:874
+#: server/stdinhand.c:793
msgid "Can't use an empty name."
msgstr "×ין ×פשרות להשתמש ×‘×©× ×¨×™×§"
-#: server/stdinhand.c:881
+#: server/stdinhand.c:800
#, c-format
msgid "That name exceeds the maximum of %d chars."
msgstr ""
-#: server/stdinhand.c:887
+#: server/stdinhand.c:806
msgid "That name is not allowed."
msgstr "×©× ×–×” ×סור."
-#: server/stdinhand.c:893
+#: server/stdinhand.c:812
msgid "A player already exists by that name."
msgstr "כבר ×§×™×™× ×©×—×§×Ÿ ×¢× ×©× ×–×”."
-#: server/stdinhand.c:899
+#: server/stdinhand.c:818
msgid "A user already exists by that name."
msgstr "כבר ×§×™×™× ×ž×©×ª×ž×© ×¢× ×©× ×–×”."
-#: server/stdinhand.c:925
+#: server/stdinhand.c:844
#, c-format
msgid "%s has been added as an AI-controlled player."
msgstr ""
-#: server/stdinhand.c:932
+#: server/stdinhand.c:851
#, c-format
msgid "Error creating new AI player: %s."
msgstr ""
-#: server/stdinhand.c:966
+#: server/stdinhand.c:885
msgid "Players cannot be removed once the game has started."
msgstr ""
-#: server/stdinhand.c:977
+#: server/stdinhand.c:896
#, c-format
msgid "Removed player %s from the game."
msgstr ""
-#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
+#: server/stdinhand.c:935 server/stdinhand.c:3372 server/stdinhand.c:3507
#, c-format
msgid "Name \"%s\" disallowed for security reasons."
msgstr ""
-#: server/stdinhand.c:1029
+#: server/stdinhand.c:948
#, c-format
msgid "No command script found by the name \"%s\"."
msgstr ""
-#: server/stdinhand.c:1037
+#: server/stdinhand.c:956
#, c-format
msgid "Loading script file: %s"
msgstr ""
-#: server/stdinhand.c:1052
+#: server/stdinhand.c:971
#, c-format
msgid "Cannot read command line scriptfile '%s'."
msgstr ""
-#: server/stdinhand.c:1054
+#: server/stdinhand.c:973
#, c-format
msgid "Could not read script file '%s'."
msgstr ""
-#: server/stdinhand.c:1146
+#: server/stdinhand.c:1065
#, c-format
msgid "Could not write script file '%s'."
msgstr ""
-#: server/stdinhand.c:1158
+#: server/stdinhand.c:1077
msgid "You cannot use the write command on this server for security reasons."
msgstr ""
-#: server/stdinhand.c:1186
+#: server/stdinhand.c:1105
#, c-format
msgid ""
"Cannot decrease command access level '%s' for connection '%s'; you only have "
"'%s'."
msgstr ""
-#: server/stdinhand.c:1241
+#: server/stdinhand.c:1114
+#, c-format
+msgid "Command access level set to '%s' for connection %s."
+msgstr ""
+
+#: server/stdinhand.c:1163
#, c-format
msgid ""
"Anyone can now become game organizer '%s' by issuing the 'first' command."
msgstr ""
-#: server/stdinhand.c:1274
+#: server/stdinhand.c:1187
msgid "Command access levels in effect:"
msgstr ""
-#: server/stdinhand.c:1282
+#: server/stdinhand.c:1194
#, c-format
msgid "Command access level for new connections: %s"
msgstr ""
-#: server/stdinhand.c:1285
+#: server/stdinhand.c:1197
#, c-format
msgid "Command access level for first player to take it: %s"
msgstr ""
-#: server/stdinhand.c:1294
+#: server/stdinhand.c:1206
msgid ""
"Error: command access level must be one of 'none', 'info', 'ctrl', or 'hack'."
msgstr ""
-#: server/stdinhand.c:1299
+#: server/stdinhand.c:1211
#, c-format
msgid ""
"Cannot increase command access level to '%s'; you only have '%s' yourself."
msgstr ""
-#: server/stdinhand.c:1326 server/stdinhand.c:1375
-#, c-format
-msgid "Command access level set to '%s' for connection %s."
-msgstr ""
-
-#: 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:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
+#: server/stdinhand.c:1238 server/stdinhand.c:1252 server/stdinhand.c:1273
#, c-format
msgid "Command access level set to '%s' for new players."
msgstr ""
-#: server/stdinhand.c:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
+#: server/stdinhand.c:1243 server/stdinhand.c:1257 server/stdinhand.c:1267
#, c-format
msgid "Command access level set to '%s' for first player to grab it."
msgstr ""
-#: server/stdinhand.c:1402
+#: server/stdinhand.c:1302
msgid "The 'first' command makes no sense from the server command line."
msgstr ""
-#: server/stdinhand.c:1406
+#: server/stdinhand.c:1306
#, c-format
msgid "You already have command access level '%s' or better."
msgstr ""
-#: server/stdinhand.c:1411
+#: server/stdinhand.c:1311
msgid "Someone else already is game organizer."
msgstr ""
-#: server/stdinhand.c:1416
+#: server/stdinhand.c:1316
#, c-format
msgid "Connection %s has opted to become the game organizer."
msgstr ""
-#: server/stdinhand.c:1467
+#: server/stdinhand.c:1367
#, c-format
msgid "Invalid argument %d."
msgstr ""
-#: server/stdinhand.c:1474
+#: server/stdinhand.c:1374
msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
msgstr ""
-#: server/stdinhand.c:1482
+#: server/stdinhand.c:1382
#, c-format
msgid "Dynamic timeout set to %d %d %d %d"
msgstr ""
-#: server/stdinhand.c:1542 server/stdinhand.c:1545
+#: server/stdinhand.c:1442 server/stdinhand.c:1445
msgid "Option:"
msgstr ""
-#: server/stdinhand.c:1555 server/stdinhand.c:4031
+#: server/stdinhand.c:1455 server/stdinhand.c:4079
msgid "Description:"
msgstr ""
-#: server/stdinhand.c:1560
+#: server/stdinhand.c:1460
#, c-format
msgid "Status: %s"
msgstr ""
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "changeable"
msgstr ""
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "fixed"
msgstr ""
-#: server/stdinhand.c:1567
+#: server/stdinhand.c:1467
#, c-format
msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
msgstr ""
-#: server/stdinhand.c:1572
+#: server/stdinhand.c:1472
#, c-format
msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
msgstr ""
-#: server/stdinhand.c:1578
+#: server/stdinhand.c:1478
#, c-format
msgid "Value: \"%s\", Default: \"%s\""
msgstr ""
-#: server/stdinhand.c:1597
+#: server/stdinhand.c:1497
msgid "Explanations are available for the following server options:"
msgstr ""
-#: server/stdinhand.c:1643
+#: server/stdinhand.c:1537
msgid "No explanation for that yet."
msgstr ""
-#: server/stdinhand.c:1646 server/stdinhand.c:2480
+#: server/stdinhand.c:1540 server/stdinhand.c:2468
msgid "Ambiguous option name."
msgstr ""
-#: server/stdinhand.c:1666
+#: server/stdinhand.c:1560
#, c-format
msgid "Server Operator: %s"
msgstr ""
-#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
+#: server/stdinhand.c:1686 server/stdinhand.c:1713 server/stdinhand.c:1731
#, c-format
msgid "Player '%s' now has AI skill level '%s'."
msgstr ""
-#: server/stdinhand.c:1822
+#: server/stdinhand.c:1718
#, c-format
msgid "%s is not controlled by the AI."
msgstr ""
-#: server/stdinhand.c:1842
+#: server/stdinhand.c:1738
#, c-format
msgid "Default AI skill level set to '%s'."
msgstr ""
-#: server/stdinhand.c:1857 server/stdinhand.c:2162
+#: server/stdinhand.c:1753
msgid "This command is client only."
msgstr ""
-#: server/stdinhand.c:1860
+#: server/stdinhand.c:1756
msgid "Usage: away"
msgstr ""
-#: server/stdinhand.c:1865
+#: server/stdinhand.c:1761
msgid "Only players may use the away command."
msgstr ""
-#: server/stdinhand.c:1869
+#: server/stdinhand.c:1765
#, c-format
msgid "%s set to away mode."
msgstr ""
-#: server/stdinhand.c:1877
+#: server/stdinhand.c:1772
#, c-format
msgid "%s returned to game."
msgstr ""
-#: server/stdinhand.c:1919
+#: server/stdinhand.c:1817
#, c-format
msgid "Sorry, you do not have access to view option '%s'."
msgstr ""
-#: server/stdinhand.c:1925
+#: server/stdinhand.c:1823
#, c-format
msgid "Unknown option '%s'."
msgstr ""
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1848
msgid "All options with non-default values"
msgstr ""
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1851
msgid "All options"
msgstr "כל ×”×פשריות"
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1854
msgid "Vital options"
msgstr ""
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1857
msgid "Situational options"
msgstr ""
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1860
msgid "Rarely used options"
msgstr ""
-#: server/stdinhand.c:1965
+#: server/stdinhand.c:1863
msgid "+ means you may change the option"
msgstr ""
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1864
msgid "= means the option is on its default value"
msgstr ""
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
#, c-format
msgid "%-*s value (min,max) "
msgstr ""
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
msgid "Option"
msgstr ""
-#: server/stdinhand.c:1973
+#: server/stdinhand.c:1871
msgid "description"
msgstr ""
-#: server/stdinhand.c:2042
+#: server/stdinhand.c:1940
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:2092
+#: server/stdinhand.c:1966
msgid "Cannot change teams once game has begun."
msgstr ""
-#: server/stdinhand.c:2102
+#: server/stdinhand.c:1976
msgid "Undefined argument. Usage: team <player> <team>."
msgstr ""
-#: server/stdinhand.c:2122
+#: server/stdinhand.c:1996
#, c-format
msgid "No such team %s. Please give a valid team name or number."
msgstr ""
-#: server/stdinhand.c:2129
+#: server/stdinhand.c:2003
msgid "Cannot team a barbarian."
msgstr ""
-#: server/stdinhand.c:2135
+#: server/stdinhand.c:2009
#, c-format
msgid "Player %s set to team %s."
msgstr ""
-#: server/stdinhand.c:2157
-msgid "Undefined arguments. Usage: vote yes|no [vote number]."
-msgstr ""
+#: server/stdinhand.c:2035 server/voting.c:512
+#, fuzzy
+msgid "Teamvote"
+msgstr "צוות"
-#: server/stdinhand.c:2165
-msgid "Observers cannot vote."
+#: server/stdinhand.c:2035 server/voting.c:516
+msgid "Vote"
msgstr ""
-#: server/stdinhand.c:2168
+#: server/stdinhand.c:2037
+#, c-format
msgid ""
-"You can only vote in a running game. Use 'first' to become the game "
-"organizer if there currently is none."
+"%s %d \"%s\" (needs %0.0f%%%s): %d for, %d against, and %d abstained out of %"
+"d players."
msgstr ""
-#: server/stdinhand.c:2181
-#, c-format
-msgid "Vote %d \"%s\": %d for, %d against"
+#: server/stdinhand.c:2041
+msgid " no dissent"
msgstr ""
-#: server/stdinhand.c:2188
+#: server/stdinhand.c:2049
msgid "There are no votes going on."
msgstr ""
-#: server/stdinhand.c:2208
-msgid "No legal last vote."
+#: server/stdinhand.c:2077
+msgid "Invalid arguments. Usage: vote yes|no|abstain [vote number]."
+msgstr ""
+
+#: server/stdinhand.c:2095 server/stdinhand.c:2213 server/stdinhand.c:3714
+msgid "You are not allowed to use this command."
+msgstr ""
+
+#: server/stdinhand.c:2104
+#, c-format
+msgid "The argument \"%s\" is ambigious."
+msgstr ""
+
+#: server/stdinhand.c:2119
+msgid "There are no votes running."
msgstr ""
-#: server/stdinhand.c:2213
-msgid "Value must be integer."
+#: server/stdinhand.c:2121
+#, c-format
+msgid "No legal last vote (%d %s)."
+msgstr ""
+
+#: server/stdinhand.c:2122
+msgid "other vote running"
+msgid_plural "other votes running"
+msgstr[0] ""
+msgstr[1] ""
+
+#: server/stdinhand.c:2129 server/stdinhand.c:2491 server/stdinhand.c:2532
+msgid "Value must be an integer."
msgstr ""
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2135 server/stdinhand.c:2221
#, c-format
msgid "No such vote (%d)."
msgstr ""
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2141
+msgid "You are not allowed to vote on that."
+msgstr ""
+
+#: server/stdinhand.c:2146
#, c-format
msgid "You voted for \"%s\""
msgstr ""
-#: server/stdinhand.c:2232
+#: server/stdinhand.c:2150
#, c-format
msgid "You voted against \"%s\""
msgstr ""
-#: server/stdinhand.c:2259
+#: server/stdinhand.c:2155
+#, c-format
+msgid "You abstained from voting on \"%s\""
+msgstr ""
+
+#: server/stdinhand.c:2190
+msgid "Missing argument <vote number> or the string \"all\"."
+msgstr ""
+
+#: server/stdinhand.c:2197
+#, fuzzy
+msgid "You don't have any vote going on."
+msgstr "×ין לך ×›×ן פועלי×."
+
+#: server/stdinhand.c:2204
+msgid "There isn't any vote going on."
+msgstr ""
+
+#: server/stdinhand.c:2209
+msgid "Server: All votes have been removed."
+msgstr ""
+
+#: server/stdinhand.c:2226
+#, c-format
+msgid "You are not allowed to cancel this vote (%d)."
+msgstr ""
+
+#: server/stdinhand.c:2232
+msgid "Usage: /cancelvote [<vote number>|all]"
+msgstr ""
+
+#: server/stdinhand.c:2241
+#, c-format
+msgid "Server: %s cancelled the vote \"%s\" (number %d)."
+msgstr ""
+
+#: server/stdinhand.c:2247
+#, c-format
+msgid "Server: The vote \"%s\" (number %d) has been cancelled."
+msgstr ""
+
+#: server/stdinhand.c:2265
msgid ""
"Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
"<x> <y> | unit <id> | tech <player> | timing | info>."
msgstr ""
-#: server/stdinhand.c:2265
+#: server/stdinhand.c:2271
msgid "Can only use this command once game has begun."
msgstr ""
-#: server/stdinhand.c:2294
+#: server/stdinhand.c:2300
#, c-format
msgid "%s diplomacy no longer debugged"
msgstr ""
-#: server/stdinhand.c:2298
+#: server/stdinhand.c:2304
#, c-format
msgid "%s diplomacy debugged"
msgstr ""
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2323
#, c-format
msgid "%s tech no longer debugged"
msgstr ""
-#: server/stdinhand.c:2321
+#: server/stdinhand.c:2327
#, c-format
msgid "%s tech debugged"
msgstr ""
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2358 server/stdinhand.c:2388
msgid "Value 2 & 3 must be integer."
msgstr ""
-#: server/stdinhand.c:2356 server/stdinhand.c:2386
+#: server/stdinhand.c:2362 server/stdinhand.c:2392
msgid "Bad map coordinates."
msgstr ""
-#: server/stdinhand.c:2361
+#: server/stdinhand.c:2367
msgid "No city at this coordinate."
msgstr ""
-#: server/stdinhand.c:2366
+#: server/stdinhand.c:2372
#, c-format
msgid "%s no longer debugged"
msgstr ""
-#: server/stdinhand.c:2392 server/stdinhand.c:2422
+#: server/stdinhand.c:2398 server/stdinhand.c:2428
#, c-format
msgid "%s %s no longer debugged."
msgstr ""
-#: server/stdinhand.c:2397 server/stdinhand.c:2427
+#: server/stdinhand.c:2403 server/stdinhand.c:2433
#, c-format
msgid "%s %s debugged."
msgstr ""
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2419
msgid "Value 2 must be integer."
msgstr ""
-#: server/stdinhand.c:2417
+#: server/stdinhand.c:2423
#, c-format
msgid "Unit %d does not exist."
msgstr ""
-#: server/stdinhand.c:2475
+#: server/stdinhand.c:2464
msgid "Undefined argument. Usage: set <option> <value>."
msgstr ""
-#: server/stdinhand.c:2485
+#: server/stdinhand.c:2473
msgid "You are not allowed to set this option."
msgstr ""
-#: server/stdinhand.c:2490 server/stdinhand.c:3463
+#: server/stdinhand.c:2478 server/stdinhand.c:3501
msgid "This setting can't be modified after the game has started."
msgstr ""
-#: server/stdinhand.c:2502 server/stdinhand.c:2543
-msgid "Value must be an integer."
-msgstr ""
-
-#: server/stdinhand.c:2512
+#: server/stdinhand.c:2501
#, c-format
msgid "The parameter %s should only contain digits 0-1."
msgstr ""
-#: server/stdinhand.c:2519
+#: server/stdinhand.c:2508
msgid "Value out of range (minimum: 0, maximum: 1)."
msgstr ""
-#: server/stdinhand.c:2534 server/stdinhand.c:2576
+#: server/stdinhand.c:2523 server/stdinhand.c:2565
#, c-format
msgid "Option: %s has been set to %d."
msgstr ""
-#: server/stdinhand.c:2554
+#: server/stdinhand.c:2543
#, c-format
msgid "The parameter %s should only contain +- and 0-9."
msgstr ""
-#: server/stdinhand.c:2561
+#: server/stdinhand.c:2550
#, c-format
msgid "Value out of range (minimum: %d, maximum: %d)."
msgstr ""
-#: server/stdinhand.c:2586
+#: server/stdinhand.c:2575
msgid "String value too long. Usage: set <option> <value>."
msgstr ""
-#: server/stdinhand.c:2600
+#: server/stdinhand.c:2589
#, c-format
msgid "Option: %s has been set to \"%s\"."
msgstr ""
-#: server/stdinhand.c:2658
+#: server/stdinhand.c:2652
msgid "Sorry, one can't observe globally in this game."
msgstr ""
-#: server/stdinhand.c:2661
+#: server/stdinhand.c:2655
msgid "Sorry, you can't take a global observer. Observe it instead."
msgstr ""
-#: server/stdinhand.c:2671
+#: server/stdinhand.c:2665
#, fuzzy
msgid "You cannot take a new player at this time."
msgstr "×ין ב×פשרותך לשמור משחק ב×ופן ×™×“× ×™ על שרת ×–×”."
#. TRANS: Do not translate "maxplayers".
-#: server/stdinhand.c:2679
+#: server/stdinhand.c:2673
#, c-format
msgid ""
"You cannot take a new player because the maximum of %d player has already "
@@ -5530,73 +5608,73 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: server/stdinhand.c:2691
+#: server/stdinhand.c:2685
msgid "You cannot take a new player because there are no free player slots."
msgstr ""
-#: server/stdinhand.c:2702
+#: server/stdinhand.c:2696
msgid "Sorry, one can't observe barbarians in this game."
msgstr ""
-#: server/stdinhand.c:2705
+#: server/stdinhand.c:2699
msgid "Sorry, one can't take barbarians in this game."
msgstr ""
-#: server/stdinhand.c:2713
+#: server/stdinhand.c:2707
msgid "Sorry, one can't observe dead players in this game."
msgstr ""
-#: server/stdinhand.c:2716
+#: server/stdinhand.c:2710
msgid "Sorry, one can't take dead players in this game."
msgstr ""
-#: server/stdinhand.c:2724
+#: server/stdinhand.c:2718
msgid "Sorry, one can't observe AI players in this game."
msgstr ""
-#: server/stdinhand.c:2727
+#: server/stdinhand.c:2721
msgid "Sorry, one can't take AI players in this game."
msgstr ""
-#: server/stdinhand.c:2736
+#: server/stdinhand.c:2730
msgid "Sorry, one can't observe human players in this game."
msgstr ""
-#: server/stdinhand.c:2739
+#: server/stdinhand.c:2733
msgid "Sorry, one can't take human players in this game."
msgstr ""
-#: server/stdinhand.c:2749
+#: server/stdinhand.c:2743
msgid "Sorry, one can't observe in this game."
msgstr ""
-#: server/stdinhand.c:2754
+#: server/stdinhand.c:2748
msgid "Sorry, one can't take players in this game."
msgstr ""
-#: server/stdinhand.c:2760
+#: server/stdinhand.c:2754
msgid "Sorry, one can't take players already connected in this game."
msgstr ""
-#: server/stdinhand.c:2791
+#: server/stdinhand.c:2785
msgid "Usage: observe [connection-name [player-name]]"
msgstr ""
-#: server/stdinhand.c:2797
+#: server/stdinhand.c:2791
msgid "Usage: observe [player-name]"
msgstr ""
-#: server/stdinhand.c:2847
+#: server/stdinhand.c:2841
#, c-format
msgid "%s already controls %s. Using 'observe' would remove %s"
msgstr ""
-#: server/stdinhand.c:2858
+#: server/stdinhand.c:2852
#, c-format
msgid "%s is already observing %s."
msgstr ""
-#: server/stdinhand.c:2863
+#: server/stdinhand.c:2857
#, c-format
msgid "%s is already observing."
msgstr ""
@@ -5611,230 +5689,234 @@ msgstr ""
msgid "%s now observes"
msgstr ""
-#: server/stdinhand.c:2969
+#: server/stdinhand.c:2971
msgid "Usage: take <connection-name> <player-name>"
msgstr ""
-#: server/stdinhand.c:2974
+#: server/stdinhand.c:2976
msgid "Usage: take <player-name>"
msgstr ""
-#: server/stdinhand.c:2980
+#: server/stdinhand.c:2982
msgid "Usage: take [connection-name] <player-name>"
msgstr ""
-#: server/stdinhand.c:3010
+#: server/stdinhand.c:3012
#, fuzzy, c-format
msgid "%s already controls %s."
msgstr "%s × ×¨×›×© מ־ %s!"
-#: server/stdinhand.c:3024
+#: server/stdinhand.c:3026
#, c-format
msgid "There is no free player slot for %s."
msgstr ""
-#: server/stdinhand.c:3059
+#: server/stdinhand.c:3061
#, c-format
msgid "being detached from %s."
msgstr ""
-#: server/stdinhand.c:3135
+#: server/stdinhand.c:3146
#, c-format
msgid "%s now controls %s (%s, %s)."
msgstr ""
-#: server/stdinhand.c:3139 server/stdinhand.c:4260
+#: server/stdinhand.c:3150 server/stdinhand.c:4308
#: data/nation/barbarian.ruleset:3
msgid "Barbarian"
msgstr ""
-#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
+#: server/stdinhand.c:3152 server/stdinhand.c:4310 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-sdl/plrdlg.c:645
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr ""
-#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-gtk-2.0/pages.c:2125
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
+#: server/stdinhand.c:3153 server/stdinhand.c:4312
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-gtk-2.0/pages.c:2127
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/connectdlg.c:215
msgid "Human"
msgstr ""
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-gtk-2.0/pages.c:2124 client/gui-win32/connectdlg.c:200
-#: client/gui-win32/connectdlg.c:212
+#: server/stdinhand.c:3155 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-gtk-2.0/pages.c:2126 client/gui-win32/connectdlg.c:202
+#: client/gui-win32/connectdlg.c:214
msgid "Alive"
msgstr "בחיי×"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3156 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-win32/connectdlg.c:202
msgid "Dead"
msgstr ""
-#: server/stdinhand.c:3147
+#: server/stdinhand.c:3159
#, c-format
msgid "%s failed to attach to any player."
msgstr ""
-#: server/stdinhand.c:3182
+#: server/stdinhand.c:3194
msgid "Usage: detach <connection-name>"
msgstr ""
-#: server/stdinhand.c:3202
+#: server/stdinhand.c:3214
msgid "You can not detach other users."
msgstr ""
-#: server/stdinhand.c:3211
+#: server/stdinhand.c:3223
#, c-format
msgid "%s is not attached to any player."
msgstr ""
-#: server/stdinhand.c:3234
+#: server/stdinhand.c:3246
#, c-format
msgid "%s detaching from %s"
msgstr "%s × ×¤×¨×“ מ־ %s"
-#: server/stdinhand.c:3240
+#: server/stdinhand.c:3252
#, c-format
msgid "%s no longer observing."
msgstr ""
-#: server/stdinhand.c:3259
+#: server/stdinhand.c:3271
#, c-format
msgid "detaching from %s."
msgstr ""
-#: server/stdinhand.c:3345
+#: server/stdinhand.c:3361
msgid "Usage: load <game name>"
msgstr ""
-#: server/stdinhand.c:3350
+#: server/stdinhand.c:3366
msgid "Cannot load a game while another is running."
msgstr ""
-#: server/stdinhand.c:3372
+#: server/stdinhand.c:3388
#, c-format
msgid "Cannot find savegame or scenario with the name \"%s\"."
msgstr ""
-#: server/stdinhand.c:3389
+#: server/stdinhand.c:3405
#, c-format
msgid "Could not load savefile: %s"
msgstr "×ין ×פשרות לטעון ×ת קובץ־השמירה: %s"
-#: server/stdinhand.c:3458
+#: server/stdinhand.c:3496
#, c-format
msgid "Current ruleset directory is \"%s\""
msgstr ""
-#: server/stdinhand.c:3478
+#: server/stdinhand.c:3516
#, c-format
msgid "Ruleset directory \"%s\" not found"
msgstr ""
-#: server/stdinhand.c:3484
+#: server/stdinhand.c:3522
#, c-format
msgid "Ruleset directory is already \"%s\""
msgstr ""
-#: server/stdinhand.c:3488
+#: server/stdinhand.c:3526
#, c-format
msgid "Ruleset directory set to \"%s\""
msgstr ""
-#: server/stdinhand.c:3536
+#: server/stdinhand.c:3574
msgid "Goodbye."
msgstr "להתר×ות"
-#: server/stdinhand.c:3567
+#: server/stdinhand.c:3606
msgid "Sorry, you are not allowed to use server commands."
msgstr ""
-#: server/stdinhand.c:3603
+#: server/stdinhand.c:3656
#, c-format
msgid "Warning: '%s' interpreted as '%s', but it is ambiguous. Try '%shelp'."
msgstr ""
-#: server/stdinhand.c:3608
+#: server/stdinhand.c:3661
#, c-format
msgid "Unknown command. Try '%shelp'."
msgstr ""
-#: server/stdinhand.c:3625
-msgid "Your new vote canceled your previous vote."
+#: server/stdinhand.c:3675
+msgid "Your new vote cancelled your previous vote."
msgstr ""
-#: server/stdinhand.c:3633
-#, c-format
-msgid "New vote (number %d) by %s: %s."
+#: server/stdinhand.c:3688
+msgid "New teamvote"
msgstr ""
-#: server/stdinhand.c:3645
+#: server/stdinhand.c:3691
+msgid "New vote"
+msgstr ""
+
+#: server/stdinhand.c:3695
#, c-format
-msgid "Your new vote (\"%s\") was not legal or was not recognized."
+msgid "%s (number %d) by %s: %s"
msgstr ""
-#: server/stdinhand.c:3655
-msgid "You are not allowed to use this command."
+#: server/stdinhand.c:3704
+#, c-format
+msgid "Your new vote (\"%s\") was not legal or was not recognized."
msgstr ""
-#: server/stdinhand.c:3680
+#: server/stdinhand.c:3726
msgid "(server prompt)"
msgstr ""
-#: server/stdinhand.c:3787
+#: server/stdinhand.c:3835
msgid "Game ended in a draw."
msgstr ""
-#: server/stdinhand.c:3791
+#: server/stdinhand.c:3839
msgid ""
"Ending the game. The server will restart once all clients have disconnected."
msgstr ""
-#: server/stdinhand.c:3796
+#: server/stdinhand.c:3844
msgid "Cannot end the game: no game running."
msgstr ""
-#: server/stdinhand.c:3812
+#: server/stdinhand.c:3860
#, c-format
msgid "%s has conceded the game and can no longer win."
msgstr ""
-#: server/stdinhand.c:3817
+#: server/stdinhand.c:3865
msgid "You cannot surrender now."
msgstr ""
-#: server/stdinhand.c:3883
+#: server/stdinhand.c:3931
msgid "Not enough human players, game will not start."
msgstr ""
-#: server/stdinhand.c:3888
+#: server/stdinhand.c:3936
msgid "No players, game will not start."
msgstr ""
-#: server/stdinhand.c:3892
+#: server/stdinhand.c:3940
msgid "Not enough nations for all players, game will not start."
msgstr ""
-#: server/stdinhand.c:3901
+#: server/stdinhand.c:3949
msgid "All players are ready; starting game."
msgstr "כל ×”×©×—×§× ×™× ×ž×•×›× ×™×; המשחק מתחיל."
-#: server/stdinhand.c:3915
+#: server/stdinhand.c:3963
msgid ""
"Cannot start the game: the game is waiting for all clients to disconnect."
msgstr ""
-#: server/stdinhand.c:3922
+#: server/stdinhand.c:3970
msgid "Cannot start the game: it is already running."
msgstr ""
-#: server/stdinhand.c:3953
+#: server/stdinhand.c:4001
#, c-format
msgid "Cutting connection %s."
msgstr ""
-#: server/stdinhand.c:3972
+#: server/stdinhand.c:4020
msgid ""
"Welcome - this is the introductory help text for the Freeciv server.\n"
"\n"
@@ -5855,123 +5937,123 @@ msgid ""
" quit - to exit"
msgstr ""
-#: server/stdinhand.c:4007 server/stdinhand.c:4010
+#: server/stdinhand.c:4055 server/stdinhand.c:4058
msgid "Command:"
msgstr ""
-#: server/stdinhand.c:4014
+#: server/stdinhand.c:4062
msgid "Synopsis: "
msgstr ""
-#: server/stdinhand.c:4023
+#: server/stdinhand.c:4071
#, c-format
msgid "Level: %s"
msgstr ""
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4096
msgid "The following server commands are available:"
msgstr ""
-#: server/stdinhand.c:4123
+#: server/stdinhand.c:4171
#, c-format
msgid "Help argument '%s' is ambiguous."
msgstr ""
-#: server/stdinhand.c:4128
+#: server/stdinhand.c:4176
#, c-format
msgid "No match for help argument '%s'."
msgstr ""
-#: server/stdinhand.c:4194
+#: server/stdinhand.c:4242
#, c-format
msgid "Bad list argument: '%s'. Try '%shelp list'."
msgstr ""
-#: server/stdinhand.c:4234
+#: server/stdinhand.c:4282
msgid "List of players:"
msgstr "רשימת ×©×—×§× ×™×:"
-#: server/stdinhand.c:4239
+#: server/stdinhand.c:4287
msgid "<no players>"
msgstr "<×ין ×©×—×§× ×™×>"
-#: server/stdinhand.c:4256
+#: server/stdinhand.c:4304
#, c-format
msgid "user %s, "
msgstr "משתמש %s, "
-#: server/stdinhand.c:4267
+#: server/stdinhand.c:4315
msgid ", Dead"
msgstr ", מת"
-#: server/stdinhand.c:4270
+#: server/stdinhand.c:4318
#, c-format
msgid ", difficulty level %s"
msgstr ", רמת קושי %s"
#. TRANS: continue list, in case comma is not the separator of choice.
-#: server/stdinhand.c:4275 server/stdinhand.c:4279 client/helpdata.c:257
-#: client/helpdata.c:752 client/text.c:241 client/text.c:1224
-#: client/text.c:1262
+#: server/stdinhand.c:4323 server/stdinhand.c:4327 client/helpdata.c:257
+#: client/helpdata.c:752 client/text.c:241 client/text.c:1229
+#: client/text.c:1267
#, c-format
msgid "?clistmore:, %s"
msgstr ", %s"
-#: server/stdinhand.c:4283
+#: server/stdinhand.c:4331
msgid ", ready"
msgstr ", מוכן"
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4333
msgid ", not ready"
msgstr ", ×œ× ×ž×•×›×Ÿ"
-#: server/stdinhand.c:4293
+#: server/stdinhand.c:4341
#, c-format
msgid " %d connection:"
msgid_plural " %d connections:"
msgstr[0] " חיבור ×חד:"
msgstr[1] " %d חיבורי×:"
-#: server/stdinhand.c:4299
+#: server/stdinhand.c:4347
#, c-format
msgid " %s from %s (command access level %s), bufsize=%dkb"
msgstr ""
-#: server/stdinhand.c:4304
+#: server/stdinhand.c:4352
msgid " (observer mode)"
msgstr "(מצב משקיף)"
-#: server/stdinhand.c:4322
+#: server/stdinhand.c:4370
msgid "List of teams:"
msgstr "רשימת צוותי×:"
#. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4332
+#: server/stdinhand.c:4380
#, c-format
msgid "%2d : '%s' : %d player"
msgid_plural "%2d : '%s' : %d players"
msgstr[0] ""
msgstr[1] ""
-#: server/stdinhand.c:4352
+#: server/stdinhand.c:4400
#, c-format
msgid "%2d : '%s' : 1 player : %s"
msgstr ""
-#: server/stdinhand.c:4360
+#: server/stdinhand.c:4408
#, c-format
msgid "Empty team: %s"
msgstr "צוות ריק: %s"
-#: server/stdinhand.c:4371
+#: server/stdinhand.c:4419
msgid "List of connections to server:"
msgstr "רשימת ×—×™×‘×•×¨×™× ×œ×©×¨×ª:"
-#: server/stdinhand.c:4375
+#: server/stdinhand.c:4423
msgid "<no connections>"
msgstr "<×ין חיבורי×>"
-#: server/stdinhand.c:4399
+#: server/stdinhand.c:4447
msgid "List of scenarios available:"
msgstr ""
@@ -5990,65 +6072,65 @@ msgstr ""
msgid "%s acquired from %s!"
msgstr "%s × ×¨×›×© מ־ %s!"
-#: server/techtools.c:220
+#: server/techtools.c:221
#, c-format
msgid ""
"Discovery of %s makes the government form %s available. You may want to "
"start a revolution."
msgstr ""
-#: server/techtools.c:301
+#: server/techtools.c:302
#, c-format
msgid "Discovery of %s OBSOLETES %s in %s!"
msgstr "גילוי %s ×’×•×¨× ×œ×”×ª×™×™×©× ×•×ª %s ב־ %s!"
-#: server/techtools.c:351
+#: server/techtools.c:352
#, c-format
msgid "Learned %s. Our scientists focus on %s; goal is %s."
msgstr "× ×œ×ž×“ %s. ×”×ž×“×¢× ×™× ×©×œ× ×• ×ž×ª×ž×§×“×™× ×‘%s; המטרה ×”×™× %s."
-#: server/techtools.c:369
+#: server/techtools.c:370
#, c-format
msgid "Learned %s. Scientists choose to research %s."
msgstr "× ×œ×ž×“ %s. ×ž×“×¢× ×™× ×‘×—×¨×• לחקור %s."
-#: server/techtools.c:376
+#: server/techtools.c:377
#, c-format
msgid "Learned %s. "
msgstr "× ×œ×ž×“ %s."
-#: server/techtools.c:379
+#: server/techtools.c:380
#, c-format
msgid "Researching %s."
msgstr "חוקר %s."
-#: server/techtools.c:385
+#: server/techtools.c:386
#, c-format
msgid "Learned %s. Scientists do not know what to research next."
msgstr ""
-#: server/techtools.c:402
+#: server/techtools.c:403
msgid ""
"Great scientists from all the world join your civilization: you get an "
"immediate advance."
msgstr ""
-#: server/techtools.c:570
+#: server/techtools.c:571
#, c-format
msgid "Technology goal is %s."
msgstr ""
-#: server/techtools.c:700
+#: server/techtools.c:708
#, c-format
msgid "You steal %s from the %s."
msgstr ""
-#: server/techtools.c:705
+#: server/techtools.c:713
#, c-format
msgid "The %s stole %s from you!"
msgstr ""
-#: server/techtools.c:710
+#: server/techtools.c:718
#, c-format
msgid "The %s have stolen %s from the %s."
msgstr ""
@@ -6072,177 +6154,183 @@ msgstr ""
msgid "%s upgraded to %s for %d gold."
msgstr ""
-#: server/unithand.c:396
+#: server/unithand.c:402
#, c-format
msgid "%s refuses to disband!"
msgstr ""
-#: server/unithand.c:449
+#: server/unithand.c:455
msgid "Can't place city here."
msgstr ""
-#: server/unithand.c:456
+#: server/unithand.c:462
#, c-format
msgid "Only %s can build a city."
msgstr ""
-#: server/unithand.c:461
+#: server/unithand.c:467
msgid "Can't build a city."
msgstr ""
-#: server/unithand.c:470
+#: server/unithand.c:476
#, c-format
msgid "Only %s can add to a city."
msgstr ""
-#: server/unithand.c:475
+#: server/unithand.c:481
msgid "Can't add to a city."
msgstr ""
-#: server/unithand.c:481
+#: server/unithand.c:487
#, c-format
msgid "%s unit has no moves left to add to %s."
msgstr ""
-#: server/unithand.c:487
+#: server/unithand.c:493
#, c-format
msgid "%s unit has no moves left to build city."
msgstr ""
-#: server/unithand.c:492
+#. TRANS: <city> is owned by <nation>, cannot add <unit>.
+#: server/unithand.c:499
+#, c-format
+msgid "%s is owned by %s, cannot add %s."
+msgstr ""
+
+#: server/unithand.c:506
#, c-format
msgid "%s is too big to add %s."
msgstr ""
-#: server/unithand.c:498
+#: server/unithand.c:512
#, c-format
msgid "%s needs an improvement to grow, so you cannot add %s."
msgstr ""
-#: server/unithand.c:509
+#: server/unithand.c:523
#, c-format
msgid "Can't add %s to %s."
msgstr ""
-#: server/unithand.c:531
+#: server/unithand.c:545
#, c-format
msgid "%s added to aid %s in growing."
msgstr ""
-#: server/unithand.c:828
+#: server/unithand.c:842
msgid "Your Nuclear missile was shot down by SDI defences, what a waste."
msgstr ""
-#: server/unithand.c:831
+#: server/unithand.c:845
#, c-format
msgid "The nuclear attack on %s was avoided by your SDI defense."
msgstr ""
#. TRANS: "Your Cannon ... the Polish Destroyer."
-#: server/unithand.c:901
+#: server/unithand.c:915
#, c-format
msgid "Your %s survived the pathetic attack from the %s %s."
msgstr ""
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unithand.c:910
+#: server/unithand.c:924
#, c-format
msgid "Your attacking %s failed against the %s %s!"
msgstr ""
-#: server/unithand.c:983
+#: server/unithand.c:997
#, c-format
msgid "Only %s can attack from sea."
msgstr ""
-#: server/unithand.c:988
+#: server/unithand.c:1002
msgid "Cannot attack from sea."
msgstr ""
-#: server/unithand.c:996 server/unittools.c:2137
+#: server/unithand.c:1010 server/unittools.c:2142
msgid "Cannot attack unless you declare war first."
msgstr ""
-#: server/unithand.c:1001
+#: server/unithand.c:1015
#, c-format
msgid "%s can only move into your own zone of control."
msgstr ""
-#: server/unithand.c:1007
+#: server/unithand.c:1021
#, c-format
msgid "Cannot invade unless you break peace with %s first."
msgstr ""
-#: server/unithand.c:1052
+#: server/unithand.c:1066
msgid "This unit has no moves left."
msgstr ""
-#: server/unithand.c:1107
+#: server/unithand.c:1121
msgid "Unit must be on land to perform diplomatic action."
msgstr ""
-#: server/unithand.c:1109
+#: server/unithand.c:1123
msgid "No diplomat action possible."
msgstr ""
-#: server/unithand.c:1125
+#: server/unithand.c:1139
#, c-format
msgid "You must declare war on %s first. Try using players dialog (F3)."
msgstr ""
-#: server/unithand.c:1143
+#: server/unithand.c:1157
msgid "This unit is being transported, and so cannot bombard."
msgstr ""
-#: server/unithand.c:1158
+#: server/unithand.c:1172
msgid "You can't attack there."
msgstr ""
-#: server/unithand.c:1180
+#: server/unithand.c:1194
msgid "This type of troops cannot take over a city."
msgstr ""
-#: server/unithand.c:1198
+#: server/unithand.c:1212
msgid "A transported unit is not allied to all units or city on target tile."
msgstr ""
-#: server/unithand.c:1240
+#: server/unithand.c:1254
#, c-format
msgid "Your %s helps build the %s in %s (%d remaining)."
msgstr ""
-#: server/unithand.c:1242
+#: server/unithand.c:1256
#, c-format
msgid "Your %s helps build the %s in %s (%d surplus)."
msgstr ""
-#: server/unithand.c:1286
+#: server/unithand.c:1300
#, c-format
msgid ""
"Sorry, your %s cannot establish a trade route because it has no home city"
msgstr ""
-#: server/unithand.c:1296
+#: server/unithand.c:1310
#, c-format
msgid "Sorry, your %s cannot establish a trade route between %s and %s"
msgstr ""
-#: server/unithand.c:1325 server/unithand.c:1344
+#: server/unithand.c:1339 server/unithand.c:1358
#, c-format
msgid "Sorry, your %s cannot establish a trade route here!"
msgstr ""
-#: server/unithand.c:1329 server/unithand.c:1348
+#: server/unithand.c:1343 server/unithand.c:1362
#, c-format
msgid " The city of %s already has %d better trade routes!"
msgstr ""
-#: server/unithand.c:1361 server/unithand.c:1373
+#: server/unithand.c:1375 server/unithand.c:1387
#, c-format
msgid "Sorry, %s has canceled the trade route from %s to your city %s."
msgstr ""
-#: server/unithand.c:1406
+#: server/unithand.c:1420
#, c-format
msgid ""
"Your %s from %s has arrived in %s, and revenues amount to %d in gold and "
@@ -6301,55 +6389,55 @@ msgid "Teleported your %s to %s."
msgstr ""
#. TRANS: A unit is moved to resolve stack conflicts.
-#: server/unittools.c:1065
+#: server/unittools.c:1070
#, fuzzy, c-format
msgid "Moved your %s."
msgstr "עלות ×ª× ×•×¢×”"
-#: server/unittools.c:1076
+#: server/unittools.c:1081
#, c-format
msgid "Disbanded your %s."
msgstr ""
-#: server/unittools.c:1397
+#: server/unittools.c:1402
#, c-format
msgid "Unable to defend %s, %s has lost the game."
msgstr ""
-#: server/unittools.c:1401
+#: server/unittools.c:1406
#, c-format
msgid "Losing %s meant losing the game! Be more careful next time!"
msgstr ""
-#: server/unittools.c:1503
+#: server/unittools.c:1508
#, c-format
msgid "%s escaped the destruction of %s, and fled to %s."
msgstr ""
-#: server/unittools.c:1512
+#: server/unittools.c:1517
#, c-format
msgid "%s lost when %s was lost."
msgstr ""
-#: server/unittools.c:1561
+#: server/unittools.c:1566
#, c-format
msgid "Barbarian leader captured, %d gold ransom paid."
msgstr ""
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unittools.c:1579
+#: server/unittools.c:1584
#, c-format
msgid "Your attacking %s succeeded against the %s %s!"
msgstr ""
#. TRANS: "Cannon ... the Polish Destroyer."
-#: server/unittools.c:1588 server/unittools.c:1646
+#: server/unittools.c:1593 server/unittools.c:1651
#, c-format
msgid "%s lost to an attack by the %s %s."
msgstr ""
#. TRANS: "... Cannon ... the Polish Destroyer ...."
-#: server/unittools.c:1622
+#: server/unittools.c:1627
#, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -6359,14 +6447,14 @@ msgstr[1] ""
#. TRANS: "Cannon lost when the Polish Destroyer
#. * attacked the German Musketeers."
-#: server/unittools.c:1655
+#: server/unittools.c:1660
#, c-format
msgid "%s lost when the %s %s attacked the %s %s."
msgstr ""
#. TRANS: "Musketeers (and Cannon) lost to an
#. * attack from the Polish Destroyer."
-#: server/unittools.c:1670
+#: server/unittools.c:1675
#, c-format
msgid "%s (and %s) lost to an attack from the %s %s."
msgstr ""
@@ -6374,7 +6462,7 @@ msgstr ""
#. TRANS: "Musketeers and 3 other units lost to
#. * an attack from the Polish Destroyer."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1680
+#: server/unittools.c:1685
#, 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."
@@ -6384,178 +6472,220 @@ msgstr[1] ""
#. TRANS: "2 units lost when the Polish Destroyer
#. * attacked the German Musketeers."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1694
+#: server/unittools.c:1699
#, 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] ""
-#: server/unittools.c:1962
+#: server/unittools.c:1967
#, c-format
msgid "Your %s was nuked by %s."
msgstr ""
-#: server/unittools.c:1965 server/unittools.c:1981
+#: server/unittools.c:1970 server/unittools.c:1986
msgid "yourself"
msgstr ""
-#: server/unittools.c:1969
+#: server/unittools.c:1974
#, c-format
msgid "The %s %s was nuked."
msgstr ""
-#: server/unittools.c:1978
+#: server/unittools.c:1983
#, c-format
msgid "%s was nuked by %s."
msgstr ""
-#: server/unittools.c:1986
+#: server/unittools.c:1991
#, c-format
msgid "You nuked %s."
msgstr ""
-#: server/unittools.c:2027
+#: server/unittools.c:2032
#, c-format
msgid "The %s detonated a nuke!"
msgstr ""
-#: server/unittools.c:2051
+#: server/unittools.c:2056
#, c-format
msgid "%s transported successfully."
msgstr ""
-#: server/unittools.c:2103
+#: server/unittools.c:2108
msgid "This unit type can not be paradropped."
msgstr ""
-#: server/unittools.c:2113
+#: server/unittools.c:2118
msgid "You cannot paradrop a unit that is transporting other units."
msgstr ""
-#: server/unittools.c:2119
+#: server/unittools.c:2124
msgid "The destination location is not known."
msgstr ""
-#: server/unittools.c:2126
+#: server/unittools.c:2131
#, c-format
msgid "This unit cannot paradrop into %s."
msgstr ""
-#: server/unittools.c:2146
+#: server/unittools.c:2151
#, c-format
msgid "The distance to the target (%i) is greater than the unit's range (%i)."
msgstr ""
-#: server/unittools.c:2157
+#: server/unittools.c:2162
#, c-format
msgid "Your %s paradropped into the %s and was lost."
msgstr ""
-#: server/unittools.c:2170
+#: server/unittools.c:2175
#, c-format
msgid "Your %s was killed by enemy units at the paradrop destination."
msgstr ""
-#: server/unittools.c:2192
+#: server/unittools.c:2197
#, c-format
msgid "You found %d gold."
msgstr ""
-#: server/unittools.c:2209
+#: server/unittools.c:2214
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr ""
-#: server/unittools.c:2216
+#: server/unittools.c:2221
#, c-format
msgid "The %s have acquired %s from ancient scrolls of wisdom."
msgstr ""
-#: server/unittools.c:2230
+#: server/unittools.c:2235
msgid "A band of friendly mercenaries joins your cause."
msgstr ""
-#: server/unittools.c:2248
+#: server/unittools.c:2253
msgid "An abandoned village is here."
msgstr ""
-#: server/unittools.c:2258
+#: server/unittools.c:2263
msgid "You have unleashed a horde of barbarians!"
msgstr ""
-#: server/unittools.c:2261
+#: server/unittools.c:2266
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr ""
-#: server/unittools.c:2277
+#: server/unittools.c:2282
msgid "You found a friendly city."
msgstr ""
-#: server/unittools.c:2291
+#: server/unittools.c:2296
msgid "Friendly nomads are impressed by you, and join you."
msgstr ""
-#: server/unittools.c:2316
+#: server/unittools.c:2321
msgid "Your overflight frightens the tribe; they scatter in terror."
msgstr ""
-#: server/unittools.c:2574
+#: server/unittools.c:2579
#, c-format
msgid "Orders for %s aborted after enemy movement was spotted."
msgstr ""
-#: server/unittools.c:3023
+#: server/unittools.c:3028
#, c-format
msgid "Orders for %s aborted as there are units nearby."
msgstr ""
-#: server/unittools.c:3075
+#: server/unittools.c:3080
#, c-format
msgid "Orders for %s aborted because building of city failed."
msgstr ""
-#: server/unittools.c:3088
+#: server/unittools.c:3093
#, c-format
msgid "Orders for %s aborted since they give an invalid activity."
msgstr ""
-#: server/unittools.c:3102
+#: server/unittools.c:3107
#, c-format
msgid "Orders for %s aborted since they give an invalid location."
msgstr ""
-#: server/unittools.c:3112
+#: server/unittools.c:3117
#, c-format
msgid "Orders for %s aborted as there are units in the way."
msgstr ""
-#: server/unittools.c:3138
+#: server/unittools.c:3143
#, c-format
msgid "Orders for %s aborted because of failed move."
msgstr ""
-#: server/unittools.c:3179
+#: server/unittools.c:3184
#, c-format
msgid "Attempt to change homecity for %s failed."
msgstr "× ×™×¡×™×•×Ÿ ×œ×©× ×•×ª ×ת העיר־בית עבור %s × ×›×©×œ."
-#: server/unittools.c:3190
+#: server/unittools.c:3195
#, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr "× ×™×¡×™×•×Ÿ ×œ×”×§×™× × ×ª×™×‘Ö¾×¡×—×¨ עבור %s × ×›×©×œ."
-#: server/unittools.c:3202
+#: server/unittools.c:3207
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr "× ×™×¡×™×•×Ÿ ×œ×‘× ×•×ª פל×־תבל עבור %s × ×›×©×œ."
-#: server/unittools.c:3211
+#: server/unittools.c:3216
#, c-format
msgid "Your %s has invalid orders."
msgstr "יחידת ×”%s שלך קבלה פקודה ×œ× ×ª×§×™× ×”."
+#: server/voting.c:522
+#, c-format
+msgid ""
+"%s %d \"%s\" is passed %d to %d with %d abstentions and %d who did not vote."
+msgstr ""
+
+#: server/voting.c:528
+#, c-format
+msgid ""
+"%s %d \"%s\" failed with %d against, %d for, %d abstentions and %d who did "
+"not vote."
+msgstr ""
+
+#: server/voting.c:548
+#, c-format
+msgid "%s %d: %s voted yes."
+msgstr ""
+
+#: server/voting.c:553
+#, c-format
+msgid "%s %d: %s voted no."
+msgstr ""
+
+#: server/voting.c:558
+#, c-format
+msgid "%s %d: %s chose to abstain."
+msgstr ""
+
+#. TRANS: Describing a new vote that can only pass
+#. * if there are no dissenting votes.
+#: server/voting.c:726
+#, c-format
+msgid "%s (needs %0.0f%% and no dissent)."
+msgstr ""
+
+#. TRANS: Describing a new vote that can pass only if the
+#. * given percentage of players votes 'yes'.
+#: server/voting.c:732
+#, c-format
+msgid "%s (needs %0.0f%% in favor)."
+msgstr ""
+
#: server/generator/mapgen.c:1771
msgid "High landmass - this may take a few seconds."
msgstr ""
@@ -6583,12 +6713,12 @@ msgid ""
"Please report this bug at %s."
msgstr ""
-#: client/attribute.c:363
+#: client/attribute.c:368
msgid ""
"There has been a CMA error. Your citizen governor settings may be broken."
msgstr ""
-#: client/attribute.c:367
+#: client/attribute.c:372
msgid "Old attributes detected and removed."
msgstr ""
@@ -6735,41 +6865,41 @@ msgstr ""
msgid "%+4d : Taxed from trade\n"
msgstr ""
-#: client/citydlg_common.c:418
+#: client/citydlg_common.c:421
#, c-format
msgid "%+4d : Trade route with %s\n"
msgstr ""
-#: client/citydlg_common.c:427
+#: client/citydlg_common.c:430
#, c-format
msgid "%+4d : Building tithes\n"
msgstr ""
-#: client/citydlg_common.c:450
+#: client/citydlg_common.c:453
#, c-format
msgid "%+4d : Bonus from %s (%+d%%)\n"
msgstr ""
-#: client/citydlg_common.c:462
+#: client/citydlg_common.c:465
#, c-format
msgid "%+4d : Waste\n"
msgstr ""
-#: client/citydlg_common.c:468
+#: client/citydlg_common.c:471
#, c-format
msgid "%+4d : Disorder\n"
msgstr ""
-#: client/citydlg_common.c:474
+#: client/citydlg_common.c:477
#, c-format
msgid "%+4d : Used\n"
msgstr ""
-#: client/citydlg_common.c:479
+#: client/citydlg_common.c:482
msgid "==== : Adds up to\n"
msgstr ""
-#: client/citydlg_common.c:481
+#: client/citydlg_common.c:484
#, c-format
msgid "%4d : Total surplus"
msgstr ""
@@ -7089,48 +7219,48 @@ msgstr "?מומחה:מ"
msgid "Specialists"
msgstr "מומחה"
-#: client/civclient.c:240
+#: client/civclient.c:241
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr ""
-#: client/civclient.c:250
+#: client/civclient.c:251
msgid " -l, --log FILE\tUse FILE as logfile (spawned server also uses this)\n"
msgstr ""
-#: client/civclient.c:252
+#: client/civclient.c:253
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr ""
-#: client/civclient.c:254
+#: client/civclient.c:255
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr ""
-#: client/civclient.c:256
+#: client/civclient.c:257
msgid " -p, --port PORT\tConnect to server port PORT (usually with -a)\n"
msgstr ""
-#: client/civclient.c:258
+#: client/civclient.c:259
#, c-format
msgid " -P, --Plugin PLUGIN\tUse PLUGIN for sound output %s\n"
msgstr ""
-#: client/civclient.c:260
+#: client/civclient.c:261
msgid " -r, --read FILE\tRead startup script FILE (for spawned server only)\n"
msgstr ""
-#: client/civclient.c:263
+#: client/civclient.c:264
msgid " -s, --server HOST\tConnect to the server at HOST (usually with -a)\n"
msgstr ""
-#: client/civclient.c:265
+#: client/civclient.c:266
msgid " -S, --Sound FILE\tRead sound tags from FILE\n"
msgstr ""
-#: client/civclient.c:266
+#: client/civclient.c:267
msgid " -t, --tiles FILE\tUse data file FILE.tilespec for tiles\n"
msgstr ""
-#: client/civclient.c:269
+#: client/civclient.c:270
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7138,45 +7268,45 @@ msgid ""
msgstr ""
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:274
+#: client/civclient.c:275
#, c-format
msgid "Report bugs at %s\n"
msgstr ""
-#: client/civclient.c:298
+#: client/civclient.c:299
#, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr ""
-#: client/civclient.c:300 client/civclient.c:315
+#: client/civclient.c:301 client/civclient.c:316
msgid "Try using --help.\n"
msgstr ""
-#: client/civclient.c:313
+#: client/civclient.c:314
#, c-format
msgid "Invalid debug level \"%s\" specified with --debug option.\n"
msgstr ""
-#: client/civclient.c:326
+#: client/civclient.c:327
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr ""
-#: client/civclient.c:391
+#: client/civclient.c:393
#, c-format
msgid "Updating old metaserver address \"%s\"."
msgstr ""
-#: client/civclient.c:394
+#: client/civclient.c:396
#, c-format
msgid "Default metaserver has been set to \"%s\"."
msgstr ""
-#: client/civclient.c:550
+#: client/civclient.c:540
msgid "Game started."
msgstr "משחק החל. "
-#: client/civclient.c:588
+#: client/civclient.c:606
msgid "There was an error while auto connecting; aborting."
msgstr ""
@@ -7306,75 +7436,75 @@ msgstr ""
msgid "Disconnected from server."
msgstr ""
-#: client/clinet.c:469
+#: client/clinet.c:473
#, c-format
msgid "Failed to contact server \"%s\" at port %d as \"%s\" after %d attempts"
msgstr ""
-#: client/clinet.c:484 client/clinet.c:486
+#: client/clinet.c:488 client/clinet.c:490
msgid "Connection to server refused. Please start the server."
msgstr ""
-#: client/clinet.c:495 client/clinet.c:523
+#: client/clinet.c:499 client/clinet.c:527
#, c-format
msgid ""
"Error contacting server \"%s\" at port %d as \"%s\":\n"
" %s\n"
msgstr ""
-#: client/clinet.c:514
+#: client/clinet.c:518
#, c-format
msgid ""
"Auto-connecting to server \"%s\" at port %d as \"%s\" every %f second(s) for "
"%d times"
msgstr ""
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
+#: client/connectdlg_common.c:78 client/gui-gtk-2.0/pages.c:1358
msgid "novice"
msgstr "טירון"
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1358
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
msgid "easy"
msgstr "קל"
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1359
msgid "normal"
msgstr "רגיל"
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr "קשה"
-#: client/connectdlg_common.c:83
+#: client/connectdlg_common.c:82
msgid "experimental"
msgstr "× ×™×¡×™×•× ×™"
-#: client/connectdlg_common.c:213
+#: client/connectdlg_common.c:212
msgid "Starting server..."
msgstr ""
-#: client/connectdlg_common.c:332
+#: client/connectdlg_common.c:331
msgid "Couldn't start the server."
msgstr ""
-#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
+#: client/connectdlg_common.c:332 client/connectdlg_common.c:365
msgid "You'll have to start one manually. Sorry..."
msgstr ""
-#: client/connectdlg_common.c:364
+#: client/connectdlg_common.c:363
msgid "Couldn't connect to the server."
msgstr "×ין ×פשרות להתחבר לשרת."
-#: client/connectdlg_common.c:365
+#: client/connectdlg_common.c:364
msgid "We probably couldn't start it from here."
msgstr ""
-#: client/connectdlg_common.c:470
+#: client/connectdlg_common.c:469
msgid ""
"Established control over the server. You have command access level 'hack'."
msgstr ""
-#: client/connectdlg_common.c:475
+#: client/connectdlg_common.c:474
msgid ""
"Failed to obtain the required access level to take control of the server. "
"The server will now be shutdown."
@@ -7384,27 +7514,27 @@ msgstr ""
msgid "Only transporter units can be unloaded."
msgstr "רק יחידות תובלה יכולות להיפרק."
-#: client/control.c:1425
+#: client/control.c:1417
msgid "Only settler units can be put into auto mode."
msgstr "רק יחידות ×ž×ª× ×—×œ×™× ×™×›×•×œ×•×ª לעבור למצב ×וטומטי."
-#: client/control.c:1516
+#: client/control.c:1511
msgid "Only nuclear units can do this."
msgstr "רק יחידות ×’×¨×¢×™× ×™×•×ª יכולות לעשות ×–×ת."
-#: client/control.c:1545
+#: client/control.c:1540
msgid "Only paratrooper units can do this."
msgstr "רק יחידות ×¦× ×—× ×™× ×™×›×•×œ×•×ª לעשות ×–×ת."
-#: client/control.c:2020
+#: client/control.c:2015
msgid "Too far for this unit."
msgstr "רחוק מדי עבור יחיד זו."
-#: client/control.c:2230 client/control.c:2260 client/control.c:2276
+#: client/control.c:2225 client/control.c:2255 client/control.c:2271
msgid "Didn't find a route to the destination!"
msgstr "×œ× × ×ž×¦× × ×ª×™×‘ ליעד!"
-#: client/control.c:2320
+#: client/control.c:2315
msgid "Oh my! You seem to have no capital!"
msgstr "×בוי! × ×¨××” ש×ין לך עיר בירה!"
@@ -7803,115 +7933,122 @@ msgstr ""
#. * last two elements
#. TRANS: List of possible output types has this between
#. * last two elements
-#: client/helpdata.c:1066 client/helpdata.c:1400
+#: client/helpdata.c:1066 client/helpdata.c:1408
msgid " or "
msgstr ""
-#: client/helpdata.c:1068 client/helpdata.c:1388
+#: client/helpdata.c:1068 client/helpdata.c:1396
msgid "?or:, "
msgstr ""
-#: client/helpdata.c:1080
+#: client/helpdata.c:1079
#, 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"
+msgid "* Unit has to be in a city, or a base after %d turn.\n"
+msgid_plural "* Unit has to be in a city, or a base after %d turns.\n"
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1122
+#: client/helpdata.c:1087
+#, c-format
+msgid "* Unit has to be in a city, a base, or on a %s after %d turn.\n"
+msgid_plural "* Unit has to be in a city, a base, or on a %s after %d turns.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: client/helpdata.c:1130
#, c-format
msgid "If we would now start with %s we would need %d bulbs."
msgstr ""
-#: client/helpdata.c:1127
+#: client/helpdata.c:1135
#, 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:1135
+#: client/helpdata.c:1143
msgid "You cannot research this technology."
msgstr ""
-#: client/helpdata.c:1139
+#: client/helpdata.c:1147
msgid " This number may vary depending on what other players will research.\n"
msgstr ""
-#: client/helpdata.c:1151
+#: client/helpdata.c:1159
#, c-format
msgid "* The first player to research %s gets an immediate advance.\n"
msgstr ""
-#: client/helpdata.c:1156
+#: client/helpdata.c:1164
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
msgstr ""
-#: client/helpdata.c:1159
+#: client/helpdata.c:1167
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
msgstr ""
-#: client/helpdata.c:1163
+#: client/helpdata.c:1171
msgid "* Increases the pollution generated by the population.\n"
msgstr ""
-#: client/helpdata.c:1168
+#: client/helpdata.c:1176
#, c-format
msgid "* Allows %s to build roads on river squares.\n"
msgstr ""
-#: client/helpdata.c:1175
+#: client/helpdata.c:1183
#, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr ""
-#: client/helpdata.c:1183
+#: client/helpdata.c:1191
#, c-format
msgid "* Allows %s to build airbases.\n"
msgstr ""
-#: client/helpdata.c:1192
+#: client/helpdata.c:1200
#, c-format
msgid "* Allows %s to upgrade roads to railroads.\n"
msgstr ""
-#: client/helpdata.c:1200
+#: client/helpdata.c:1208
#, c-format
msgid "* Allows %s to upgrade irrigation to farmland.\n"
msgstr ""
-#: client/helpdata.c:1234
+#: client/helpdata.c:1242
msgid "* Pollution cannot be generated on this terrain."
msgstr ""
-#: client/helpdata.c:1239
+#: client/helpdata.c:1247
msgid "* You cannot build cities on this terrain."
msgstr ""
-#: client/helpdata.c:1245
+#: client/helpdata.c:1253
msgid "* The coastline of this terrain is unsafe."
msgstr ""
-#: client/helpdata.c:1250
+#: client/helpdata.c:1258
msgid "* This terrain is unsafe for units to travel on."
msgstr ""
-#: client/helpdata.c:1255
+#: client/helpdata.c:1263
msgid "* Land units cannot travel on oceanic terrains."
msgstr ""
-#: client/helpdata.c:1305
+#: client/helpdata.c:1313
msgid "Features:\n"
msgstr ""
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1411 client/helpdata.c:1412
+#: client/helpdata.c:1419 client/helpdata.c:1420
msgid "?outputlist: Nothing "
msgstr ""
-#: client/helpdata.c:1419
+#: client/helpdata.c:1427
#, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -7922,7 +8059,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1429
+#: client/helpdata.c:1437
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -7930,48 +8067,48 @@ msgid ""
msgstr ""
#. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1437
+#: client/helpdata.c:1445
#, c-format
msgid "* You pay %d times normal %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1442
+#: client/helpdata.c:1450
#, 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:1447
+#: client/helpdata.c:1455
#, c-format
msgid "* You pay no %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1451
+#: client/helpdata.c:1459
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:1460
+#: client/helpdata.c:1468
#, 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:1468
+#: client/helpdata.c:1476
#, c-format
msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
msgstr ""
-#: client/helpdata.c:1475
+#: client/helpdata.c:1483
#, 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:1482
+#: client/helpdata.c:1490
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -7979,23 +8116,23 @@ msgid ""
msgstr ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1489
+#: client/helpdata.c:1497
#, 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:1497
+#: client/helpdata.c:1505
#, c-format
msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
msgstr ""
-#: client/helpdata.c:1502
+#: client/helpdata.c:1510
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr ""
-#: client/helpdata.c:1507
+#: client/helpdata.c:1515
#, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -8006,7 +8143,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1519
+#: client/helpdata.c:1527
#, 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"
@@ -8014,60 +8151,60 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1530
+#: client/helpdata.c:1538
#, 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:1536
+#: client/helpdata.c:1544
msgid "* Your units cannot be bribed.\n"
msgstr ""
-#: client/helpdata.c:1539
+#: client/helpdata.c:1547
msgid "* Your cities cannot be incited.\n"
msgstr ""
-#: client/helpdata.c:1543
+#: client/helpdata.c:1551
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:1549
+#: client/helpdata.c:1557
msgid "* Has a senate that may prevent declaration of war.\n"
msgstr ""
-#: client/helpdata.c:1553
+#: client/helpdata.c:1561
msgid "* Allows partisans when cities are taken by the enemy.\n"
msgstr ""
-#: client/helpdata.c:1557
+#: client/helpdata.c:1565
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
msgstr ""
-#: client/helpdata.c:1561
+#: client/helpdata.c:1569
msgid "* Pays no upkeep for fanatics.\n"
msgstr ""
-#: client/helpdata.c:1564
+#: client/helpdata.c:1572
msgid "* Has no unhappy citizens.\n"
msgstr ""
-#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
+#: client/helpdata.c:1582 client/helpdata.c:1586 client/helpdata.c:1590
#, c-format
msgid "* Veteran %s units.\n"
msgstr ""
-#: client/helpdata.c:1585
+#: client/helpdata.c:1593
msgid "* Veteran units.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1591
+#: client/helpdata.c:1599
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8075,7 +8212,7 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1600
+#: client/helpdata.c:1608
#, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8083,71 +8220,71 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1608
+#: client/helpdata.c:1616
#, 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:1617
+#: client/helpdata.c:1625
#, c-format
msgid "* %s production is increased %d%%.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1625
+#: client/helpdata.c:1633
#, c-format
msgid "* %s production will suffer massive waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1630
+#: client/helpdata.c:1638
#, c-format
msgid "* %s production will suffer some waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1635
+#: client/helpdata.c:1643
#, 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:1643
+#: client/helpdata.c:1651
#, 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:1649
+#: client/helpdata.c:1657
#, 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:1655
+#: client/helpdata.c:1663
#, c-format
msgid "* %s waste will increase slowly with distance from capital.\n"
msgstr ""
-#: client/helpdata.c:1672
+#: client/helpdata.c:1680
#, c-format
msgid "* Allows you to build %s.\n"
msgstr ""
#. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1699
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d %s"
msgstr ""
-#: client/helpdata.c:1700 client/helpdata.c:1708 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1708 client/helpdata.c:1716 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:1707
+#: client/helpdata.c:1715
#, c-format
msgid "%s%d unhappy"
msgstr ""
@@ -8216,7 +8353,7 @@ msgid ""
"or with the -a command-line parameter."
msgstr ""
-#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:916 data/Freeciv.in:107
msgid "Metaserver"
msgstr "שרתי×"
@@ -8566,35 +8703,35 @@ msgstr ""
msgid "Saved settings to file %s"
msgstr ""
-#: client/packhand.c:211 client/packhand.c:217
+#: client/packhand.c:212 client/packhand.c:218
msgid "You were rejected from the game...."
msgstr ""
-#: client/packhand.c:229
+#: client/packhand.c:230
#, c-format
msgid "Client capability string: %s"
msgstr ""
-#: client/packhand.c:232
+#: client/packhand.c:233
#, c-format
msgid "Server capability string: %s"
msgstr ""
-#: client/packhand.c:850
+#: client/packhand.c:864
#, c-format
msgid "Start of turn %d"
msgstr ""
-#: client/packhand.c:1591
+#: client/packhand.c:1621
#, c-format
msgid "AI Mode is now %s."
msgstr ""
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "ON"
msgstr "פועל"
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "OFF"
msgstr "כבוי"
@@ -8625,15 +8762,15 @@ msgstr "?שחקן:ש×"
msgid "Username"
msgstr "×©× ×ž×©×ª×ž×©"
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
-#: client/gui-gtk-2.0/pages.c:2157
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:653
+#: client/gui-gtk-2.0/pages.c:1604 client/gui-gtk-2.0/pages.c:2159
msgid "Flag"
msgstr "דגל"
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1605
-#: client/gui-gtk-2.0/pages.c:2159 client/gui-sdl/repodlgs.c:2063
-#: client/gui-win32/connectdlg.c:990 client/gui-win32/dialogs.c:542
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:657
+#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1609
+#: client/gui-gtk-2.0/pages.c:2161 client/gui-sdl/repodlgs.c:2063
+#: client/gui-win32/connectdlg.c:992 client/gui-win32/dialogs.c:542
#: client/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "×ומה"
@@ -8646,7 +8783,7 @@ msgstr "גבול"
msgid "Score"
msgstr "× ×™×§×•×“"
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1614
msgid "Team"
msgstr "צוות"
@@ -8679,36 +8816,36 @@ msgstr "?דשח־שחקן:חסר־מעש"
msgid "Ping"
msgstr ""
-#: client/repodlgs_common.c:375
+#: client/repodlgs_common.c:378
msgid "You cannot sell improvements."
msgstr "×ין ×פשרות למכור שיפור."
-#: client/repodlgs_common.c:391
+#: client/repodlgs_common.c:394
#, c-format
msgid "Sold %d %s for %d gold."
msgstr ""
-#: client/repodlgs_common.c:396
+#: client/repodlgs_common.c:399
#, c-format
msgid "No %s could be sold."
msgstr ""
#. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:415
+#: client/repodlgs_common.c:418
msgid "You cannot disband units."
msgstr ""
-#: client/repodlgs_common.c:420
+#: client/repodlgs_common.c:423
#, c-format
msgid "%s cannot be disbanded."
msgstr ""
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:444
#, c-format
msgid "Disbanded %d %s."
msgstr ""
-#: client/repodlgs_common.c:445
+#: client/repodlgs_common.c:448
#, c-format
msgid "No %s could be disbanded."
msgstr ""
@@ -9308,47 +9445,47 @@ msgstr ""
msgid "?duration:overflow"
msgstr ""
-#: client/text.c:1143
+#: client/text.c:1145
#, c-format
msgid "%6d.%02d ms"
msgstr ""
#. TRANS: <nation adjective> <government name>.
#. * E.g. "Polish Republic".
-#: client/text.c:1188
+#: client/text.c:1193
#, fuzzy, c-format
msgid "?nationgovernment:%s %s"
msgstr "ממשל: %s"
#. TRANS: "Observer: 1985"
-#: client/text.c:1198
+#: client/text.c:1203
#, c-format
msgid "Observer: %s"
msgstr "משקיף: %s"
-#: client/text.c:1216
+#: client/text.c:1221
msgid "Buildings: "
msgstr "×‘× ×™×™× ×™×:"
-#: client/text.c:1233 client/text.c:1272
+#: client/text.c:1238 client/text.c:1277
msgid "None. "
msgstr ""
-#: client/text.c:1235 client/text.c:1274
+#: client/text.c:1240 client/text.c:1279
msgid "?clistend:."
msgstr "?blistend:"
-#: client/text.c:1253
+#: client/text.c:1258
msgid "Wonders: "
msgstr "פל×י־תבל:"
-#: client/text.c:1308
+#: client/text.c:1313
#, c-format
msgid "Cities: %d total, %d over threshold of %d cities."
msgstr ""
#. TRANS: 0-21 content [citizen(s)] ...
-#: client/text.c:1312
+#: client/text.c:1317
#, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
@@ -9356,60 +9493,60 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1318
+#: client/text.c:1323
#, c-format
msgid "%d additional unhappy citizen."
msgid_plural "%d additional unhappy citizens."
msgstr[0] ""
msgstr[1] ""
-#: client/text.c:1339
+#: client/text.c:1344
msgid "Unlimited martial law in effect."
msgstr ""
-#: client/text.c:1341
+#: client/text.c:1346
#, c-format
msgid "%d military unit may impose martial law."
msgid_plural "Up to %d military units may impose martial law."
msgstr[0] ""
msgstr[1] ""
-#: client/text.c:1345
+#: client/text.c:1350
#, c-format
msgid "Each military unit makes %d unhappy citizen content."
msgid_plural "Each military unit makes %d unhappy citizens content."
msgstr[0] ""
msgstr[1] ""
-#: client/text.c:1352
+#: client/text.c:1357
msgid "Military units in the field may cause unhappiness. "
msgstr ""
-#: client/text.c:1355
+#: client/text.c:1360
msgid "Military units have no happiness effect. "
msgstr ""
-#: client/text.c:1370
+#: client/text.c:1375
#, c-format
msgid "Luxury: %d total."
msgstr ""
-#: client/tilespec.c:865
+#: client/tilespec.c:882
msgid "No usable default tileset found, aborting!"
msgstr ""
-#: client/tilespec.c:1338
+#: client/tilespec.c:1355
msgid ""
"Client does not support isometric tilesets. Using default tileset instead."
msgstr ""
-#: client/tilespec.c:1347
+#: client/tilespec.c:1364
msgid ""
"Client does not support overhead view tilesets. Using default tileset "
"instead."
msgstr ""
-#: client/tilespec.c:3966
+#: client/tilespec.c:3987
#, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -10073,7 +10210,7 @@ msgid "_Display"
msgstr "ה_צג"
#: client/gui-gtk-2.0/cityrep.c:1006 client/gui-gtk-2.0/menu.c:839
-#: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
+#: client/gui-sdl/diplodlg.c:692 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
#: client/gui-xaw/cityrep.c:533 client/gui-xaw/menu.c:156
@@ -10246,198 +10383,198 @@ msgstr "××™×–×” ×©× ×œ×ª×ª לערך קבוע ×–×”?"
msgid "Remove this preset?"
msgstr "הסר ערך קבוע זה?"
-#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:222
+#: client/gui-gtk-2.0/dialogs.c:197 client/gui-gtk-2.0/messagewin.c:222
#, fuzzy
msgid "Goto _Location"
msgstr "לך ל_מקו×"
-#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
+#: client/gui-gtk-2.0/dialogs.c:202 client/gui-gtk-2.0/messagewin.c:226
#, fuzzy
msgid "Inspect _City"
msgstr "_הקפץ עיר"
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:258 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:258 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:259 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:311 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:312 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:312 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:313 client/gui-win32/dialogs.c:1755
#: data/Freeciv.in:2502
msgid "Select what to pillage:"
msgstr "בחר מה לבזוז:"
-#: client/gui-gtk-2.0/dialogs.c:506
+#: client/gui-gtk-2.0/dialogs.c:507
msgid "Unit"
msgstr "יחידה"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:950
-#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2155
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:985
+#: client/gui-gtk-2.0/dialogs.c:508 client/gui-gtk-2.0/pages.c:950
+#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2157
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:987
#: client/gui-win32/plrdlg.c:335 manual/civmanual.c:302 data/Freeciv.in:80
msgid "Name"
msgstr "ש×"
-#: client/gui-gtk-2.0/dialogs.c:519 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:520 client/gui-sdl/dialogs.c:627
msgid "Unit selection"
msgstr "מבחר יחידות"
-#: client/gui-gtk-2.0/dialogs.c:582
+#: client/gui-gtk-2.0/dialogs.c:583
msgid "_Ready all"
msgstr "_הכן הכל"
-#: client/gui-gtk-2.0/dialogs.c:590
+#: client/gui-gtk-2.0/dialogs.c:591
msgid "_Sentry idle"
msgstr "_זקיף חסר־מעש"
-#: client/gui-gtk-2.0/dialogs.c:719
+#: client/gui-gtk-2.0/dialogs.c:721
#, fuzzy
msgid "Nation _Groups:"
msgstr "_×ומות:"
-#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:766 data/Freeciv.in:3128
msgid "What Nation Will You Be?"
msgstr "××™×–×” ×ומה תהייה?"
-#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
-#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
+#: client/gui-gtk-2.0/dialogs.c:768 client/gui-sdl/chatline.c:842
+#: client/gui-win32/connectdlg.c:1040 data/Freeciv.in:3371
msgid "Pick Nation"
msgstr "בחר ×ומה"
-#: client/gui-gtk-2.0/dialogs.c:774
+#: client/gui-gtk-2.0/dialogs.c:776
#, fuzzy
msgid "_Random Nation"
msgstr "×ומה ×קר×ית"
-#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:792 client/gui-win32/dialogs.c:517
msgid "Select a nation"
msgstr "בחר ×ומה"
-#: client/gui-gtk-2.0/dialogs.c:804
+#: client/gui-gtk-2.0/dialogs.c:810
msgid "_Properties"
msgstr "_×ª×›×•× ×•×ª"
-#: client/gui-gtk-2.0/dialogs.c:824
+#: client/gui-gtk-2.0/dialogs.c:830
msgid "_Leader:"
msgstr "_×ž× ×”×™×’:"
-#: client/gui-gtk-2.0/dialogs.c:831
+#: client/gui-gtk-2.0/dialogs.c:837
msgid "_Female"
msgstr "_× ×§×‘×”"
-#: client/gui-gtk-2.0/dialogs.c:836
+#: client/gui-gtk-2.0/dialogs.c:842
msgid "_Male"
msgstr "_זכר"
-#: client/gui-gtk-2.0/dialogs.c:863
+#: client/gui-gtk-2.0/dialogs.c:869
#, fuzzy
msgid "City _Styles:"
msgstr "_×¡×’× ×•×Ÿ עיר:"
-#: client/gui-gtk-2.0/dialogs.c:902
+#: client/gui-gtk-2.0/dialogs.c:908
#, fuzzy
msgid "_Description"
msgstr "_× ×¨×˜×™×‘ ל×ומי"
-#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1263 client/gui-xaw/dialogs.c:1480
msgid "You must select your sex."
msgstr "חובה לבחור ×ת ×ž×™× ×š"
-#: client/gui-gtk-2.0/dialogs.c:1253 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1268 client/gui-xaw/dialogs.c:1485
msgid "You must select your city style."
msgstr "חובה לבחור ×ת ×¡×’× ×•×Ÿ העיר."
-#: client/gui-gtk-2.0/dialogs.c:1262 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1277 client/gui-sdl/dialogs.c:2204
#: 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:1306 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1318 client/gui-win32/citydlg.c:1454
#: data/Freeciv.in:2484
msgid "Upgrade Unit!"
msgstr "שדרג יחידה!"
-#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1327 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 "שדרג יחידות ×ž×™×•×©× ×•×ª"
-#: client/gui-gtk-2.0/diplodlg.c:231 client/gui-win32/diplodlg.c:151
+#: client/gui-gtk-2.0/diplodlg.c:222 client/gui-win32/diplodlg.c:151
#: client/gui-xaw/diplodlg.c:383 client/gui-xaw/diplodlg.c:401
msgid "World-map"
msgstr "מפת־העול×"
-#: client/gui-gtk-2.0/diplodlg.c:237 client/gui-win32/diplodlg.c:146
+#: client/gui-gtk-2.0/diplodlg.c:228 client/gui-win32/diplodlg.c:146
#: client/gui-xaw/diplodlg.c:387 client/gui-xaw/diplodlg.c:405
msgid "Sea-map"
msgstr "מפת־י×"
-#: client/gui-gtk-2.0/diplodlg.c:243
+#: client/gui-gtk-2.0/diplodlg.c:234
msgid "_Maps"
msgstr "_מפות"
-#: client/gui-gtk-2.0/diplodlg.c:274
+#: client/gui-gtk-2.0/diplodlg.c:265
msgid "_Advances"
msgstr "_התקדמויות"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/diplodlg.c:315 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "_ערי×"
-#: client/gui-gtk-2.0/diplodlg.c:333
+#: client/gui-gtk-2.0/diplodlg.c:324
msgid "_Give shared vision"
msgstr "_×”×¢× ×§ חזון משותף"
-#: client/gui-gtk-2.0/diplodlg.c:346
+#: client/gui-gtk-2.0/diplodlg.c:337
msgid "Give _embassy"
msgstr "×”×¢× ×§ _שגרירות"
-#: client/gui-gtk-2.0/diplodlg.c:376
+#: client/gui-gtk-2.0/diplodlg.c:368
msgid "_Pacts"
msgstr "_בריתות"
-#: client/gui-gtk-2.0/diplodlg.c:466
+#: client/gui-gtk-2.0/diplodlg.c:458
#, c-format
msgid "Diplomacy: %s"
msgstr "דיפלומטיה: %s"
-#: client/gui-gtk-2.0/diplodlg.c:473
+#: client/gui-gtk-2.0/diplodlg.c:465
msgid "_Cancel meeting"
msgstr " _בטל פגישה"
-#: client/gui-gtk-2.0/diplodlg.c:475
+#: client/gui-gtk-2.0/diplodlg.c:467
msgid "Accept _treaty"
msgstr "_קבל הסכ×"
-#: client/gui-gtk-2.0/diplodlg.c:503
+#: client/gui-gtk-2.0/diplodlg.c:495
msgid "C_lauses:"
msgstr "_סעיפי×:"
-#: client/gui-gtk-2.0/diplodlg.c:568 client/gui-gtk-2.0/diplodlg.c:642
+#: client/gui-gtk-2.0/diplodlg.c:560 client/gui-gtk-2.0/diplodlg.c:634
msgid "_Gold:"
msgstr "_זהב: "
-#: client/gui-gtk-2.0/diplodlg.c:580 client/gui-gtk-2.0/diplodlg.c:654
+#: client/gui-gtk-2.0/diplodlg.c:572 client/gui-gtk-2.0/diplodlg.c:646
msgid "_Add Clause..."
msgstr "_הוסף סעיף..."
-#: client/gui-gtk-2.0/diplodlg.c:699
+#: client/gui-gtk-2.0/diplodlg.c:691
msgid "--- This treaty is blank. Please add some clauses. ---"
msgstr "--- חוזה ×–×” ריק. ×× × ×”×•×¡×£ מספר סעיפי×. ---"
-#: client/gui-gtk-2.0/diplodlg.c:905 client/gui-sdl/diplodlg.c:375
+#: client/gui-gtk-2.0/diplodlg.c:897 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 "× ×§×‘×¢×” כמות זהב ×œ× ×—×•×§×™×ª."
@@ -10497,99 +10634,99 @@ msgstr "בחר יעד"
msgid "Show _All Cities"
msgstr "הצג ×ת _כל הערי×"
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:164
msgid "Show Map Scrollbars"
msgstr "הצג סרגל־גלילה למפה"
-#: client/gui-gtk-2.0/gui_main.c:163
+#: client/gui-gtk-2.0/gui_main.c:165
msgid "Disable this option to hide the scrollbars on the map view."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:169
msgid "Keyboardless goto"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:168
+#: client/gui-gtk-2.0/gui_main.c:170
msgid ""
"If this option is set then a goto may be initiated by left-clicking and then "
"holding down the mouse button while dragging the mouse onto a different tile."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:173
+#: client/gui-gtk-2.0/gui_main.c:175
msgid "Keep dialogs on top"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:174
+#: client/gui-gtk-2.0/gui_main.c:176
msgid ""
"If this option is set then dialog windows will always remain in front of the "
"main Freeciv window. Disabling this has no effect in fullscreen mode."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:178
+#: client/gui-gtk-2.0/gui_main.c:180
msgid "Show worklist task icons"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:179
+#: client/gui-gtk-2.0/gui_main.c:181
msgid ""
"Disabling this will turn off the unit and building icons in the worklist "
"dialog and the production tab of the city dialog."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:183
+#: client/gui-gtk-2.0/gui_main.c:185
msgid "Enable status report tabs"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:184
+#: client/gui-gtk-2.0/gui_main.c:186
msgid ""
"If this option is enabled then report dialogs will be shown as separate tabs "
"rather than in popup dialogs."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:189 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:191 client/gui-win32/gui_main.c:110
msgid "Better fog-of-war drawing"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:190 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:192 client/gui-win32/gui_main.c:111
msgid ""
"If this is enabled then a better method is used for drawing fog-of-war. It "
"is not any slower but will consume about twice as much memory."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:195
+#: client/gui-gtk-2.0/gui_main.c:197
msgid "Show time for each chat message"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:196
+#: client/gui-gtk-2.0/gui_main.c:198
msgid ""
"If this option is enabled then all chat messages will be prefixed by a time "
"string of the form [hour:minute:second]."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:201
+#: client/gui-gtk-2.0/gui_main.c:203
msgid "Split bottom notebook area"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:202
+#: client/gui-gtk-2.0/gui_main.c:204
msgid ""
"Enabling this option will split the bottom notebook into a left and right "
"notebook so that two tabs may be viewed at once."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:207
+#: client/gui-gtk-2.0/gui_main.c:209
msgid "New message events go to top of list"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:208
+#: client/gui-gtk-2.0/gui_main.c:210
msgid ""
"If this option is enabled, new events in the message window will appear at "
"the top of the list, rather than being appended at the bottom."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:213
+#: client/gui-gtk-2.0/gui_main.c:215
msgid "Show extra message window buttons"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:214
+#: client/gui-gtk-2.0/gui_main.c:216
msgid ""
"If this option is enabled, there will be two buttons displayed in the "
"message window for inspecting a city and going to a location. If this option "
@@ -10599,21 +10736,21 @@ msgid ""
"closed and reopened."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:224
+#: client/gui-gtk-2.0/gui_main.c:226
msgid "Metaserver tab first in network page"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:225
+#: client/gui-gtk-2.0/gui_main.c:227
msgid ""
"If this option is enabled, the metaserver tab will be the first notebook tab "
"in the network page. This option requires a restart in order to take effect."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:230
+#: client/gui-gtk-2.0/gui_main.c:232
msgid "Plain chat messages are sent to allies only"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:231
+#: client/gui-gtk-2.0/gui_main.c:233
msgid ""
"If this option is enabled, then plain messages typed into the chat entry "
"while the game is running will only be sent to your allies. Otherwise plain "
@@ -10623,28 +10760,41 @@ msgid ""
"visible in multiplayer games)."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:340 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:245
+msgid "Arrange widgets for small displays"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:246
+msgid ""
+"If this option is enabled, widgets in the main window will be arrange so "
+"that they take up the least amount of total screen space. Specifically, the "
+"left panel containing the overview, player status, and the unit information "
+"box will be extended over the entire left side of the window. This option "
+"requires a restart in order to take effect."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:352 client/gui-xaw/gui_main.c:245
msgid ""
"This client has no special command line options\n"
"\n"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
+#: client/gui-gtk-2.0/gui_main.c:847 client/gui-gtk-2.0/gui_main.c:1542
msgid "Freeciv"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
+#: client/gui-gtk-2.0/gui_main.c:1251 client/gui-gtk-2.0/gui_main.c:1258
#: client/gui-sdl/mapctrl.c:1566 client/gui-win32/gui_main.c:482
#: data/Freeciv.in:2618
msgid "Turn Done"
msgstr "×¡×™×™× ×ª×•×¨"
-#: client/gui-gtk-2.0/gui_main.c:1232 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1258 client/gui-sdl/mapctrl.c:1566
#: client/gui-sdl/mapview.c:1082
msgid "Shift+Return"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1266 client/gui-gtk-2.0/menu.c:797
+#: client/gui-gtk-2.0/gui_main.c:1299 client/gui-gtk-2.0/menu.c:797
#: client/gui-gtk-2.0/menu.c:799 client/gui-gtk-2.0/menu.c:801
#: client/gui-gtk-2.0/menu.c:803 client/gui-gtk-2.0/menu.c:805
#: client/gui-gtk-2.0/menu.c:807 client/gui-gtk-2.0/menu.c:809
@@ -10663,11 +10813,11 @@ msgstr ""
msgid "View"
msgstr "הצג"
-#: client/gui-gtk-2.0/gui_main.c:1359
+#: client/gui-gtk-2.0/gui_main.c:1393
msgid "Chat"
msgstr "שיחה"
-#: client/gui-gtk-2.0/gui_main.c:1377 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1411 client/gui-win32/gui_main.c:538
#: data/Freeciv.in:2809
msgid ""
"Freeciv is free software and you are welcome to distribute copies of it\n"
@@ -10678,79 +10828,79 @@ msgstr ""
"בכמה ×ª× ××™×; ר××” סעיף \"Copying\" בדף העזרה\n"
"ועכשיו... - תר××” ×œ×”× ×ת ×”×’×™×”×™× ×•×!"
-#: client/gui-gtk-2.0/gui_main.c:1392
+#: client/gui-gtk-2.0/gui_main.c:1426
msgid "Allies Only"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1657
+#: client/gui-gtk-2.0/gui_main.c:1691
msgid "Not _ready"
msgstr "_×œ× ×ž×•×›×Ÿ"
-#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
+#: client/gui-gtk-2.0/gui_main.c:1702 client/gui-gtk-2.0/pages.c:1679
msgid "_Ready"
msgstr "_מוכן"
-#: client/gui-gtk-2.0/gui_main.c:1672 client/gui-gtk-2.0/gui_main.c:1678
-#: client/gui-gtk-2.0/pages.c:2204
+#: client/gui-gtk-2.0/gui_main.c:1706 client/gui-gtk-2.0/gui_main.c:1712
+#: client/gui-gtk-2.0/pages.c:2206
msgid "_Start"
msgstr "_התחל"
-#: client/gui-gtk-2.0/gui_main.c:1686
+#: client/gui-gtk-2.0/gui_main.c:1720
#, fuzzy
msgid "_Take Player"
msgstr "קח שחקן זה"
-#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
+#: client/gui-gtk-2.0/gui_main.c:1723 client/gui-gtk-2.0/pages.c:1669
msgid "Pick _Nation"
msgstr "בחר _×ומה"
-#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
+#: client/gui-gtk-2.0/gui_main.c:1730 client/gui-gtk-2.0/pages.c:1674
msgid "_Observe"
msgstr "_השקף"
-#: client/gui-gtk-2.0/gui_main.c:1698
+#: client/gui-gtk-2.0/gui_main.c:1732
#, fuzzy
msgid "Do not _observe"
msgstr "_×ל תשקיף"
-#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1755 client/gui-xaw/pages.c:211
msgid "<AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1723
+#: client/gui-gtk-2.0/gui_main.c:1758
msgid "<Novice AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1726
+#: client/gui-gtk-2.0/gui_main.c:1761
msgid "<Easy AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1729
+#: client/gui-gtk-2.0/gui_main.c:1764
msgid "<Normal AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1732
+#: client/gui-gtk-2.0/gui_main.c:1767
msgid "<Hard AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1742 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1777 client/gui-win32/dialogs.c:594
#: client/gui-xaw/pages.c:217
msgid "Random"
msgstr "×קר××™"
-#: client/gui-gtk-2.0/gui_main.c:1808
+#: client/gui-gtk-2.0/gui_main.c:1844 client/gui-gtk-2.0/gui_main.c:1858
msgid "Observer"
msgstr "השקף"
-#: client/gui-gtk-2.0/gui_main.c:1808
+#: client/gui-gtk-2.0/gui_main.c:1858
msgid "Detached"
msgstr "×”×ª× ×ª×§"
-#: client/gui-gtk-2.0/gui_main.c:2073
+#: client/gui-gtk-2.0/gui_main.c:2117
msgid "Are you sure you want to quit?"
msgstr "×”×× ×תה בטוח ×©×‘×¨×¦×•× ×š לצ×ת?"
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
#, c-format
msgid ""
"Close Tab:\n"
@@ -10759,7 +10909,7 @@ msgstr ""
"סגור ×œ×©×•× ×™×ª:\n"
"%s"
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
msgid "Ctrl+W"
msgstr ""
@@ -10864,8 +11014,8 @@ msgid "Trans. Rslt/Time:"
msgstr "חתבורה תו×צה\\זמן:"
#: 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
-#: client/gui-win32/helpdlg.c:709 client/gui-win32/helpdlg.c:733
+#: client/gui-win32/helpdlg.c:502 client/gui-win32/helpdlg.c:550
+#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:739
#: client/gui-xaw/helpdlg.c:759 client/gui-xaw/helpdlg.c:808
#: client/gui-xaw/helpdlg.c:816 client/gui-xaw/helpdlg.c:853
#: client/gui-xaw/helpdlg.c:878
@@ -10912,34 +11062,34 @@ msgstr "יחד ×¢×"
msgid "?techhelp:"
msgstr "?×¢×–×¨×”Ö¾×œ×˜×›× ×•×œ×•×’×™×”:"
-#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:591
+#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:597
#: client/gui-xaw/helpdlg.c:996
#, c-format
msgid "+%d Trade / %d"
msgstr "+%d סחר / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:595
+#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:601
#: client/gui-xaw/helpdlg.c:1000
#, c-format
msgid "no extra / %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
-#: client/gui-win32/helpdlg.c:602 client/gui-win32/helpdlg.c:616
-#: client/gui-win32/helpdlg.c:635 client/gui-xaw/helpdlg.c:1002
+#: client/gui-gtk-2.0/helpdlg.c:1085 client/gui-win32/helpdlg.c:604
+#: client/gui-win32/helpdlg.c:608 client/gui-win32/helpdlg.c:622
+#: client/gui-win32/helpdlg.c:641 client/gui-xaw/helpdlg.c:1002
#: client/gui-xaw/helpdlg.c:1006 client/gui-xaw/helpdlg.c:1020
#: client/gui-xaw/helpdlg.c:1039
msgid "n/a"
msgstr "×œ× ×–×ž×™×Ÿ"
-#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:605
+#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:611
#: client/gui-xaw/helpdlg.c:1009
#, c-format
msgid "+%d Food / %d"
msgstr "+%d מזון / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:619
+#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:625
#: client/gui-xaw/helpdlg.c:1023
#, c-format
msgid "+%d Res. / %d"
@@ -11707,41 +11857,41 @@ msgstr "הת_חבר למשחק רשת"
msgid "Connect to Gaming _Zone"
msgstr "התחבר ×ל Gaming _Zone"
-#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:302
#: client/gui-xaw/connectdlg.c:326
msgid "Passwords don't match, enter password."
msgstr "ססמ×ות ××™× ×Ÿ תו×מות, הזן ססמה."
#: client/gui-gtk-2.0/pages.c:779 client/gui-gtk-2.0/pages.c:820
-#: client/gui-win32/connectdlg.c:916
+#: client/gui-win32/connectdlg.c:918
msgid "Server Name"
msgstr "×©× ×©×¨×ª"
#: client/gui-gtk-2.0/pages.c:780 client/gui-gtk-2.0/pages.c:821
-#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:916
+#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:918
#: data/Freeciv.in:96
msgid "Port"
msgstr "פורט"
#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Version"
msgstr "גרסה"
#: client/gui-gtk-2.0/pages.c:782 client/gui-gtk-2.0/pages.c:823
-#: client/gui-gtk-2.0/pages.c:2161 client/gui-win32/connectdlg.c:917
-#: client/gui-win32/connectdlg.c:995
+#: client/gui-gtk-2.0/pages.c:2163 client/gui-win32/connectdlg.c:919
+#: client/gui-win32/connectdlg.c:997
msgid "Status"
msgstr "מצב"
#: client/gui-gtk-2.0/pages.c:783 client/gui-gtk-2.0/pages.c:824
#: client/gui-sdl/connectdlg.c:318 client/gui-sdl/plrdlg.c:330
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Players"
msgstr "×©×—×§× ×™×"
#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
-#: client/gui-win32/connectdlg.c:918
+#: client/gui-win32/connectdlg.c:920
msgid "Comment"
msgstr "הערה"
@@ -11773,9 +11923,9 @@ msgstr "_ססמה:"
msgid "Conf_irm Password:"
msgstr "_×ישור ססמה:"
-#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2165
#: 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:1000
+#: client/gui-win32/citydlg.c:1083 client/gui-win32/connectdlg.c:1002
#: client/gui-win32/wldlg.c:800 client/gui-win32/wldlg.c:806
msgid "Type"
msgstr "סוג"
@@ -11870,7 +12020,7 @@ msgstr "רמת ×”_×ž×™×•×ž× ×•×ª של ×\"מ:"
msgid "Ruleset _Version:"
msgstr "_קבוצת כללי×:"
-#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2195
msgid "_More Game Options..."
msgstr "_×פשרויות משחק × ×¡×¤×•×ª..."
@@ -11886,49 +12036,49 @@ msgstr "דרוג"
msgid "Ready"
msgstr "מוכן"
-#: client/gui-gtk-2.0/pages.c:1601
+#: client/gui-gtk-2.0/pages.c:1600
#, fuzzy
msgid "?player:Leader"
msgstr "?שחקן:ש×"
-#: client/gui-gtk-2.0/pages.c:1732 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1734 client/gui-sdl/chatline.c:185
msgid "Choose Saved Game to Load"
msgstr "בחר משחק שמור ×œ×˜×¢×™× ×”"
-#: client/gui-gtk-2.0/pages.c:1824
+#: client/gui-gtk-2.0/pages.c:1826
msgid "Choose Saved Game to _Load:"
msgstr "בחר משחק שמור ל_×˜×¢×™× ×”:"
-#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
-#: client/gui-gtk-2.0/pages.c:2451
+#: client/gui-gtk-2.0/pages.c:1846 client/gui-gtk-2.0/pages.c:2039
+#: client/gui-gtk-2.0/pages.c:2455
msgid "_Browse..."
msgstr "_עיין..."
-#: client/gui-gtk-2.0/pages.c:1911
+#: client/gui-gtk-2.0/pages.c:1913
msgid "Choose a Scenario"
msgstr "בחר בתסריט"
-#: client/gui-gtk-2.0/pages.c:1998
+#: client/gui-gtk-2.0/pages.c:2000
msgid "Choose a _Scenario:"
msgstr "בחר ב_תסריט"
-#: client/gui-gtk-2.0/pages.c:2173
+#: client/gui-gtk-2.0/pages.c:2175
msgid "Choose a _nation to play:"
msgstr "בחר לשחק ב×_ומה:"
-#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2367 client/gui-win32/menu.c:581
msgid "Select Location to Save"
msgstr "בחר ×ž×™×§×•× ×œ×©×ž×™×¨×”"
-#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2452 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "שמור משחק"
-#: client/gui-gtk-2.0/pages.c:2489
+#: client/gui-gtk-2.0/pages.c:2493
msgid "Saved _Games:"
msgstr "_×ž×©×—×§×™× ×©×ž×•×¨×™×:"
-#: client/gui-gtk-2.0/pages.c:2516
+#: client/gui-gtk-2.0/pages.c:2520
msgid "Save _Filename:"
msgstr "שמור ש×Ö¾_קובץ:"
@@ -12277,7 +12427,7 @@ msgstr ""
msgid "Total users logged in : %d"
msgstr ""
-#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1098
msgid "Back"
msgstr "×חורה"
@@ -12286,7 +12436,7 @@ msgid "Start"
msgstr "התחל"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:777
+#: client/gui-win32/connectdlg.c:779
msgid "Load Game"
msgstr "טען משחק"
@@ -12326,9 +12476,9 @@ msgstr "הפוך לעיר־בית חדשה"
#: client/gui-sdl/connectdlg.c:308 client/gui-sdl/connectdlg.c:617
#: client/gui-sdl/connectdlg.c:803 client/gui-sdl/connectdlg.c:985
#: client/gui-sdl/dialogs.c:452 client/gui-sdl/dialogs.c:2095
-#: client/gui-sdl/dialogs.c:2893 client/gui-sdl/diplomat_dialog.c:731
+#: client/gui-sdl/dialogs.c:2902 client/gui-sdl/diplomat_dialog.c:731
#: client/gui-sdl/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1043
#: client/gui-win32/dialogs.c:1772 client/gui-win32/finddlg.c:127
#: client/gui-win32/gotodlg.c:171 client/gui-win32/inputdlg.c:146
#: client/gui-win32/messagedlg.c:216 client/gui-win32/ratesdlg.c:328
@@ -12371,7 +12521,7 @@ msgid "Buy it?"
msgstr "×§× ×” ×ת ×–×”?"
#: 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
+#: client/gui-sdl/diplodlg.c:1336 client/gui-sdl/diplomat_dialog.c:1211
#: client/gui-sdl/diplomat_dialog.c:1417 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:221 client/gui-sdl/repodlgs.c:1559
#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
@@ -12387,7 +12537,7 @@ msgid "No"
msgstr "ל×"
#: client/gui-sdl/citydlg.c:1215 client/gui-sdl/cma_fe.c:318
-#: client/gui-sdl/diplodlg.c:1345 client/gui-sdl/diplomat_dialog.c:1200
+#: client/gui-sdl/diplodlg.c:1346 client/gui-sdl/diplomat_dialog.c:1200
#: client/gui-sdl/diplomat_dialog.c:1407 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:232 client/gui-win32/repodlgs.c:578
#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
@@ -12696,7 +12846,7 @@ msgstr "שרת Freeciv :"
msgid "Port :"
msgstr "פורט :"
-#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1100
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr ""
@@ -12803,23 +12953,23 @@ msgstr "בחר בממשל החדש שלך"
msgid "REVOLUTION!"
msgstr "מ ה פ כ ה !"
-#: client/gui-sdl/dialogs.c:2232 client/gui-sdl/dialogs.c:2620
+#: client/gui-sdl/dialogs.c:2237 client/gui-sdl/dialogs.c:2625
#: client/gui-win32/dialogs.c:567 data/Freeciv.in:3159
msgid "Female"
msgstr "× ×§×‘×”"
-#: client/gui-sdl/dialogs.c:2234 client/gui-sdl/dialogs.c:2618
-#: client/gui-sdl/dialogs.c:2830 client/gui-win32/dialogs.c:565
+#: client/gui-sdl/dialogs.c:2239 client/gui-sdl/dialogs.c:2623
+#: client/gui-sdl/dialogs.c:2839 client/gui-win32/dialogs.c:565
msgid "Male"
msgstr "זכר"
-#: client/gui-sdl/dialogs.c:2478 client/gui-sdl/dialogs.c:2902
+#: client/gui-sdl/dialogs.c:2483 client/gui-sdl/dialogs.c:2911
#: 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 "×ישור"
-#: client/gui-sdl/dialogs.c:2685 client/gui-win32/dialogs.c:505
+#: client/gui-sdl/dialogs.c:2694 client/gui-win32/dialogs.c:505
msgid "What nation will you be?"
msgstr "×יזו ×ומה תהייה?"
@@ -12846,77 +12996,77 @@ msgstr "מפת עול×"
msgid "Sea map"
msgstr "מפת ×™×"
-#: client/gui-sdl/diplodlg.c:563
+#: client/gui-sdl/diplodlg.c:564
msgid "Give embassy"
msgstr "×”×¢× ×§ שגרירות"
-#: client/gui-sdl/diplodlg.c:579 client/gui-win32/diplodlg.c:614
+#: client/gui-sdl/diplodlg.c:580 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 "זהב(×ž×§×¡×™×ž×•× %d)"
-#: client/gui-sdl/diplodlg.c:613 client/gui-sdl/helpdlg.c:1956
+#: client/gui-sdl/diplodlg.c:614 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 "התקדמויות"
-#: client/gui-sdl/diplodlg.c:831 client/gui-win32/diplodlg.c:598
+#: client/gui-sdl/diplodlg.c:832 client/gui-win32/diplodlg.c:598
#: data/Freeciv.in:269
msgid "Diplomacy meeting"
msgstr "מפגש דיפלומטי"
-#: client/gui-sdl/diplodlg.c:883 client/gui-win32/diplodlg.c:680
+#: client/gui-sdl/diplodlg.c:884 client/gui-win32/diplodlg.c:680
#: data/Freeciv.in:510
msgid "Cancel meeting"
msgstr "בטל פגישה"
-#: client/gui-sdl/diplodlg.c:895 client/gui-win32/diplodlg.c:679
+#: client/gui-sdl/diplodlg.c:896 client/gui-win32/diplodlg.c:679
#: data/Freeciv.in:501
msgid "Accept treaty"
msgstr "קבל הסכ×"
#. TRANS: "Polish incident !" FIXME!!!
-#: client/gui-sdl/diplodlg.c:1304
+#: client/gui-sdl/diplodlg.c:1305
#, c-format
msgid "%s incident !"
msgstr "תקרית %s !"
-#: client/gui-sdl/diplodlg.c:1322
+#: client/gui-sdl/diplodlg.c:1323
msgid "Shall we declare WAR on them?"
msgstr "×”×× ×œ×”×›×¨×™×– על מ ל ×— מ ×” ×ית×?"
-#: client/gui-sdl/diplodlg.c:1433
+#: client/gui-sdl/diplodlg.c:1434
msgid "Foreign Minister"
msgstr "שר חוץ"
-#: client/gui-sdl/diplodlg.c:1449
+#: client/gui-sdl/diplodlg.c:1450
#, c-format
msgid ""
"Sir!, the %s ambassador has arrived\n"
"What are your wishes?"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1465
+#: client/gui-sdl/diplodlg.c:1466
msgid "Declare WAR"
msgstr "הכרז מ ל ח מ ה"
-#: client/gui-sdl/diplodlg.c:1467 client/gui-win32/plrdlg.c:357
+#: client/gui-sdl/diplodlg.c:1468 client/gui-win32/plrdlg.c:357
msgid "Cancel Treaty"
msgstr "בטל הסכ×"
-#: client/gui-sdl/diplodlg.c:1490 client/gui-win32/plrdlg.c:358
+#: client/gui-sdl/diplodlg.c:1491 client/gui-win32/plrdlg.c:358
#: data/Freeciv.in:3254
msgid "Withdraw vision"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1507
+#: client/gui-sdl/diplodlg.c:1508
msgid "Call Diplomatic Meeting"
msgstr "×›× ×¡ פגישה דיפלומטית"
-#: client/gui-sdl/diplodlg.c:1521
+#: client/gui-sdl/diplodlg.c:1522
msgid "Send him back"
msgstr ""
@@ -13639,12 +13789,12 @@ msgid "Leave Game"
msgstr "שמור משחק"
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1100 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1102 client/gui-xaw/menu.c:121
#: data/Freeciv.in:115 data/Freeciv.in:3180
msgid "Quit"
msgstr "יצי××”"
-#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:967
msgid "Start New Game"
msgstr "התחל משחק חדש"
@@ -13759,8 +13909,8 @@ msgstr "×”×›× ×¡×” × ×˜×•:"
msgid "%s max rate : %d%%"
msgstr "%s שיעור־מרבי : %d%%"
-#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
-#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1085
+#: client/gui-win32/connectdlg.c:1093 data/Freeciv.in:155
msgid "Update"
msgstr "עדכון"
@@ -14215,67 +14365,67 @@ msgstr "חדש"
msgid "Delete"
msgstr "מחק"
-#: client/gui-win32/connectdlg.c:147
+#: client/gui-win32/connectdlg.c:149
msgid "Password:"
msgstr "ססמה:"
-#: client/gui-win32/connectdlg.c:169
+#: client/gui-win32/connectdlg.c:171
msgid "Couldn't load the savegame"
msgstr "×ין ×פשרות לטעון משחק שמור"
-#: client/gui-win32/connectdlg.c:284 client/gui-xaw/connectdlg.c:311
+#: client/gui-win32/connectdlg.c:286 client/gui-xaw/connectdlg.c:311
msgid "Verify Password"
msgstr "×•×•×“× ×¡×¡×ž×”"
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:916 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr "בחירת שרת Freeciv"
-#: client/gui-win32/connectdlg.c:915
+#: client/gui-win32/connectdlg.c:917
msgid "Local Area Network"
msgstr "רשת תקשורת מקומית"
-#: client/gui-win32/connectdlg.c:949
+#: client/gui-win32/connectdlg.c:951
msgid "Welcome to Freeciv"
msgstr "ברוך בו×ך ל־ Freeciv"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Load Saved Game"
msgstr "טען משחק שמור"
-#: client/gui-win32/connectdlg.c:969
+#: client/gui-win32/connectdlg.c:971
msgid "Connect To Network Game"
msgstr "התחבר למשחק רשת"
-#: client/gui-win32/connectdlg.c:979
+#: client/gui-win32/connectdlg.c:981
msgid "Choose a nation to play"
msgstr "בחר לשחק ב×ומה"
-#: client/gui-win32/connectdlg.c:1014
+#: client/gui-win32/connectdlg.c:1016
msgid "Number of players (Including AI):"
msgstr "מספר ×©×—×§× ×™× (כולל ×\"מ):"
-#: client/gui-win32/connectdlg.c:1022
+#: client/gui-win32/connectdlg.c:1024
msgid "AI skill level:"
msgstr "רמת ×ž×™×•×ž× ×•×ª ×\"מ:"
-#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1038 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr "×פשריות משחק"
-#: client/gui-win32/connectdlg.c:1040
+#: client/gui-win32/connectdlg.c:1042
msgid "Start Game"
msgstr "התחל משחק"
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Login:"
msgstr ""
-#: client/gui-win32/connectdlg.c:1061
+#: client/gui-win32/connectdlg.c:1063
msgid "Host:"
msgstr "שרת:"
-#: client/gui-win32/connectdlg.c:1062
+#: client/gui-win32/connectdlg.c:1064
msgid "Port:"
msgstr "פורט:"
@@ -14348,21 +14498,21 @@ msgid ""
"this is much slower."
msgstr ""
-#: client/gui-win32/helpdlg.c:769 client/gui-win32/helpdlg.c:792
-#: client/gui-win32/helpdlg.c:803 client/gui-win32/helpdlg.c:809
-#: client/gui-win32/helpdlg.c:822
+#: client/gui-win32/helpdlg.c:775 client/gui-win32/helpdlg.c:798
+#: client/gui-win32/helpdlg.c:809 client/gui-win32/helpdlg.c:815
+#: client/gui-win32/helpdlg.c:828
msgid "Allows "
msgstr "מ×פשר"
-#: client/gui-win32/helpdlg.c:780
+#: client/gui-win32/helpdlg.c:786
msgid "Obsoletes "
msgstr "×’×•×¨× ×œ×”×ª×™×™×©× ×•×ª"
-#: client/gui-win32/helpdlg.c:812 client/gui-win32/helpdlg.c:825
+#: client/gui-win32/helpdlg.c:818 client/gui-win32/helpdlg.c:831
msgid " (with "
msgstr "(יחד ×¢× "
-#: client/gui-win32/helpdlg.c:815 client/gui-win32/helpdlg.c:828
+#: client/gui-win32/helpdlg.c:821 client/gui-win32/helpdlg.c:834
msgid "?techhelp:)."
msgstr ""
@@ -15450,7 +15600,7 @@ 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/"
+" https://gna.org/projects/freeciv/"
msgstr ""
#: data/helpdata.txt:60
@@ -17046,6 +17196,7 @@ msgid "Hydro Plant"
msgstr "×ª×—× ×” הידרו־חשמלית"
#: data/default/buildings.ruleset:378
+#, fuzzy
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 "
@@ -17053,45 +17204,42 @@ msgid ""
"a Factory, Mfg. Plant and Hydro Plant together give a 150% production "
"bonus.\n"
"\n"
-"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant. A city "
-"can only build a Hydro Plant if it is next to (or on) a Mountain or River "
-"tile."
+"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant."
msgstr ""
-"מפחית ×ת כמות ×”×–×™×”×•× ×”× ×’×¨×ž×ª מייצור בעיר ב־ 50%. הדבר מגביר ×’× ×ת ייצור המגן "
+"מפחית ×ת כמות ×”×–×™×”×•× ×”× ×’×¨×ž×ª מייצור בעיר ב־ 50%. הדבר מגביר ×’× ×ת ייצור מהגן "
"של בית־חרושת ומפעל ×וטומטי בעיר: בית־חרושת ×•×ª×—× ×” הידרו־חשמלית יחדיו ×ž× ×™×‘×•×ª "
"×‘×•× ×•×¡ ייצור של 75%, מפעל ×וטומטי ×•×ª×—× ×” הידרו־חשמלית ×ž× ×™×‘×•×ª יחד ×‘×•× ×•×¡ יצור של "
"150%.\n"
"\n"
-"עיר יכולה להחזיק ×ª×—× ×” הידרו־חשמלית, ×ª×—× ×ª כוח, ×ו כור ×’×¨×¢×™× ×™. עיר יכולה "
-"×œ×‘× ×•×ª ×ª×—× ×” הידרו־חשמלית ×× ×œ×™×“×” (×ו בתוכה) יש משבצת ×”×¨×™× ×ו × ×”×¨."
+"עיר יכולה להחזיק ×ª×—× ×” הידרו־חשמלית, ×ª×—× ×ª כוח, ×ו כור ×’×¨×¢×™× ×™."
-#: data/default/buildings.ruleset:397 data/civ2/buildings.ruleset:373
+#: data/default/buildings.ruleset:396 data/civ2/buildings.ruleset:373
#: data/civ1/buildings.ruleset:297
msgid "Library"
msgstr "ספריה"
-#: data/default/buildings.ruleset:412
+#: data/default/buildings.ruleset:411
#, no-c-format
msgid "Increases the science output in a city by 100%."
msgstr "מגביר ×ת תפוקת המדע בעיר ב־ 100%."
-#: data/default/buildings.ruleset:417 data/civ2/buildings.ruleset:393
+#: data/default/buildings.ruleset:416 data/civ2/buildings.ruleset:393
#: data/civ1/buildings.ruleset:317
msgid "Marketplace"
msgstr "שוק"
-#: data/default/buildings.ruleset:432 data/civ2/buildings.ruleset:408
+#: data/default/buildings.ruleset:431 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 "מגביר ×ת תפוקת השפע ומס בעיר ב־ 50%."
-#: data/default/buildings.ruleset:437 data/civ2/buildings.ruleset:413
+#: data/default/buildings.ruleset:436 data/civ2/buildings.ruleset:413
#: data/civ1/buildings.ruleset:337
msgid "Mass Transit"
msgstr "תחבורה ציבורית"
-#: data/default/buildings.ruleset:451 data/civ2/buildings.ruleset:427
+#: data/default/buildings.ruleset:450 data/civ2/buildings.ruleset:427
#: data/civ1/buildings.ruleset:351
msgid ""
"Neutralizes the pollution generated by the population. The population "
@@ -17100,12 +17248,12 @@ msgstr ""
"מבטל ×ת השפעת ×”×–×™×”×•× ×”× ×’×¨× ×¢×œÖ¾×™×“×™ ×וכלוסייה. ×”×וכלוסייה ××™× ×” תורמת עוד "
"×œ×–×™×”×•× ×”× ×’×¨× ×‘×¢×™×¨."
-#: data/default/buildings.ruleset:458 data/civ2/buildings.ruleset:434
+#: data/default/buildings.ruleset:457 data/civ2/buildings.ruleset:434
#: data/civ1/buildings.ruleset:358
msgid "Mfg. Plant"
msgstr "מפעל ×וטומטי"
-#: data/default/buildings.ruleset:474 data/civ2/buildings.ruleset:450
+#: data/default/buildings.ruleset:473 data/civ2/buildings.ruleset:450
#: data/civ1/buildings.ruleset:374
#, no-c-format
msgid ""
@@ -17113,12 +17261,12 @@ msgid ""
"production in a city by 100%."
msgstr "יחד ×¢× ×‘×™×ªÖ¾×—×¨×•×©×ª, מפעל ×וטומטי מגביר ×ת ייצור המגן בעיר ב־ 100%."
-#: data/default/buildings.ruleset:480 data/civ2/buildings.ruleset:456
+#: data/default/buildings.ruleset:479 data/civ2/buildings.ruleset:456
#: data/civ1/buildings.ruleset:380
msgid "Nuclear Plant"
msgstr "כור ×’×¨×¢×™× ×™"
-#: data/default/buildings.ruleset:495
+#: data/default/buildings.ruleset:494
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 "
@@ -17135,11 +17283,11 @@ msgstr ""
"\n"
"עיר יכולה להחזיק ×ª×—× ×” הידרו־חשמלית, ×ª×—× ×ª כוח, ×ו כור ×’×¨×¢×™× ×™."
-#: data/default/buildings.ruleset:515 data/civ2/buildings.ruleset:489
+#: data/default/buildings.ruleset:514 data/civ2/buildings.ruleset:489
msgid "Offshore Platform"
msgstr "×סדת־י×"
-#: data/default/buildings.ruleset:530 data/civ2/buildings.ruleset:504
+#: data/default/buildings.ruleset:529 data/civ2/buildings.ruleset:504
msgid ""
"Adds 1 extra shield resource on all Ocean squares in a city. The city needs "
"to be coastal to build this improvement."
@@ -17147,12 +17295,12 @@ msgstr ""
"מוסיף מש×ב מגן × ×•×¡×£ ×חד עבור כל משבצת ××•×§×™×™× ×•×¡ בעיר. רק עיר חוף יכולה ×œ×‘× ×•×ª "
"שיפור זה."
-#: data/default/buildings.ruleset:536 data/civ2/buildings.ruleset:510
+#: data/default/buildings.ruleset:535 data/civ2/buildings.ruleset:510
#: data/civ1/buildings.ruleset:411
msgid "Palace"
msgstr "×רמון"
-#: data/default/buildings.ruleset:552
+#: data/default/buildings.ruleset:551
#, no-c-format
msgid ""
"Makes a city the capital and the center of your government. Corruption in "
@@ -17172,11 +17320,11 @@ msgstr ""
"מעיר הבירה, חוץ ×ž×‘×ž×©×˜×¨×™× ×“×ž×•×§×¨×˜×™ ×ו ×§×•×ž×•× ×™×¡×˜×™. עלות ההמרדה בעיר תלויה ×’×־כן "
"במרחק שלה מהבירה (תחת כל שיטות המשטר)."
-#: data/default/buildings.ruleset:569 data/civ2/buildings.ruleset:539
+#: data/default/buildings.ruleset:568 data/civ2/buildings.ruleset:539
msgid "Police Station"
msgstr "×ª×—× ×ª משטרה"
-#: data/default/buildings.ruleset:583 data/civ2/buildings.ruleset:553
+#: data/default/buildings.ruleset:582 data/civ2/buildings.ruleset:553
msgid ""
"Reduces the unhappiness caused by military units outside the city by 2 under "
"Democracy and 1 under Republic. This improvement has no effect under other "
@@ -17185,11 +17333,11 @@ msgstr ""
"מפחית ×ת ×”×ומללות ×”× ×’×¨×ž×ª על־ידי יחידות מחוץ לעיר ב־ 2 תחת משטר דמוקרטי, ו־ 1 "
"תחת רפובליקה. לשיפור ×–×” ×ין השפעה תחת שיטות משטר ×חרות."
-#: data/default/buildings.ruleset:593 data/civ2/buildings.ruleset:560
+#: data/default/buildings.ruleset:592 data/civ2/buildings.ruleset:560
msgid "Port Facility"
msgstr "×ž×ª×§× ×™ × ×ž×œ"
-#: data/default/buildings.ruleset:608 data/civ2/buildings.ruleset:575
+#: data/default/buildings.ruleset:607 data/civ2/buildings.ruleset:575
msgid ""
"Allows a city to build veteran sea units. Also, damaged sea units which "
"stay in town for one full turn without moving are completely restored."
@@ -17197,12 +17345,12 @@ msgstr ""
"מ×פשר לעיר ×œ×‘× ×•×ª יחידת ×™× ×¢× ×•×•×ª×§ רקבות. כמו כן יחידות ×™× ×©×¡×¤×’×• × ×–×§, "
"×©× ×©×רות בעיר תור ×©×œ× ×œ×œ× ×ª×•× ×¢ משוקמות לחלוטין."
-#: data/default/buildings.ruleset:615 data/civ2/buildings.ruleset:582
+#: data/default/buildings.ruleset:614 data/civ2/buildings.ruleset:582
#: data/civ1/buildings.ruleset:440
msgid "Power Plant"
msgstr "×ª×—× ×ª כוח"
-#: data/default/buildings.ruleset:631
+#: data/default/buildings.ruleset:630
#, no-c-format
msgid ""
"Increases the shield production of a Factory or Mfg. Plant in a city: a "
@@ -17218,12 +17366,12 @@ msgstr ""
"\n"
"עיר יכולה להחזיק ×ª×—× ×” הידרו־חשמלית, ×ª×—× ×ª כוח, ×ו כור ×’×¨×¢×™× ×™."
-#: data/default/buildings.ruleset:646 data/civ2/buildings.ruleset:610
+#: data/default/buildings.ruleset:645 data/civ2/buildings.ruleset:610
#: data/civ1/buildings.ruleset:468
msgid "Recycling Center"
msgstr "מרכז מחזור"
-#: data/default/buildings.ruleset:661 data/civ2/buildings.ruleset:625
+#: data/default/buildings.ruleset:660 data/civ2/buildings.ruleset:625
#: data/civ1/buildings.ruleset:483
#, no-c-format
msgid ""
@@ -17232,11 +17380,11 @@ msgid ""
msgstr ""
"×‘× ×™×™×ª מרכז מחזור מפחית ×ת רמת ×”×–×™×”×•× ×”× ×’×¨×ž×ª כתוצ××” של ייצור בעיר ב־ 66%."
-#: data/default/buildings.ruleset:667 data/civ2/buildings.ruleset:631
+#: data/default/buildings.ruleset:666 data/civ2/buildings.ruleset:631
msgid "Research Lab"
msgstr "מעבדת מחקר"
-#: data/default/buildings.ruleset:682
+#: data/default/buildings.ruleset:681
msgid ""
"Together with a Library, a Research Lab increases the science production of "
"a city by 200%. Together with a Library and a University, a Research Lab "
@@ -17245,22 +17393,22 @@ msgstr ""
"יחד ×¢× ×¡×¤×™×¨×”, מעבדת מחקר מגבירה ×ת תפוקת המדע של העיר ב־ 200%. יחד ×¢× ×¡×¤×¨×™×” "
"ו××•× ×™×‘×¨×¡×™×˜×”, מעבדת מחקר מגבירה ×ת תפוקת המדע בעיר ב־ 450%."
-#: data/default/buildings.ruleset:690 data/civ2/buildings.ruleset:654
+#: data/default/buildings.ruleset:689 data/civ2/buildings.ruleset:654
msgid "SAM Battery"
msgstr "סוללת טק\"×"
-#: data/default/buildings.ruleset:704 data/civ2/buildings.ruleset:668
+#: data/default/buildings.ruleset:703 data/civ2/buildings.ruleset:668
msgid ""
"Doubles the defense of all units inside the city when attacked by non-"
"nuclear air units."
msgstr "בכפילה ×ת ×”×”×’× ×” של כל היחידות בתוך העיר ×ž×¤× ×™ התקפת ×וויר ×§×•× ×‘× ×¦×™×•× ×œ×™×ª."
-#: data/default/buildings.ruleset:710 data/civ2/buildings.ruleset:674
+#: data/default/buildings.ruleset:709 data/civ2/buildings.ruleset:674
#: data/civ1/buildings.ruleset:489
msgid "SDI Defense"
msgstr "×”×’× ×” ×סטרטגית"
-#: data/default/buildings.ruleset:724 data/civ2/buildings.ruleset:688
+#: data/default/buildings.ruleset:723 data/civ2/buildings.ruleset:688
#: data/civ1/buildings.ruleset:503
msgid ""
"Protects a city from attacks from Nuclear units. Nuclear attacks simply "
@@ -17270,11 +17418,11 @@ msgstr ""
"מגן על עיר ×ž×¤× ×™ התקפה של יחידות ×’×¨×¢×™× ×™×•×ª. להתקפה ×’×¨×¢×™× ×™×ª פשוט ×ין השפעה על "
"היער. כמו כן מכפיל ×ת ×”×”×’× ×” ×›× ×’×Ÿ ×˜×™×œ×™× ×§×•× ×‘× ×¦×™×•× ×œ×™×™×."
-#: data/default/buildings.ruleset:733 data/civ2/buildings.ruleset:697
+#: data/default/buildings.ruleset:732 data/civ2/buildings.ruleset:697
msgid "Sewer System"
msgstr "מערכת ביוב"
-#: data/default/buildings.ruleset:748 data/civ2/buildings.ruleset:712
+#: data/default/buildings.ruleset:747 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."
@@ -17282,12 +17430,12 @@ msgstr ""
"מ×פשר לעיר לצמוח מעבר לגודל 12. ××ž×ªÖ¾×ž×™× × ×“×¨×©×ª תחילה ×¢×œÖ¾×ž× ×ª שהעיר תצמח מעבר "
"לגודל 8."
-#: data/default/buildings.ruleset:754 data/civ2/buildings.ruleset:749
+#: data/default/buildings.ruleset:753 data/civ2/buildings.ruleset:749
#: data/civ1/buildings.ruleset:512
msgid "Space Component"
msgstr "רכיב חלל"
-#: data/default/buildings.ruleset:769 data/civ2/buildings.ruleset:763
+#: data/default/buildings.ruleset:768 data/civ2/buildings.ruleset:763
#: data/civ1/buildings.ruleset:526
msgid ""
"Space Components can be differentiated into Propulsion and Fuel Components. "
@@ -17303,12 +17451,12 @@ msgstr ""
"×œ×¤× ×™ שיש ב×פשרותך ×œ×‘× ×•×ª חלקי ×¡×¤×™× ×ªÖ¾×—×œ×œ, פל×־התבל ×ª×›× ×™×ªÖ¾×פולו חייב ×œ×”×™×‘× ×•×ª "
"על־ידי ×חד ×”×©×—×§× ×™×."
-#: data/default/buildings.ruleset:779 data/civ2/buildings.ruleset:773
+#: data/default/buildings.ruleset:778 data/civ2/buildings.ruleset:773
#: data/civ1/buildings.ruleset:536
msgid "Space Module"
msgstr "מודול חלל"
-#: data/default/buildings.ruleset:794 data/civ2/buildings.ruleset:787
+#: data/default/buildings.ruleset:793 data/civ2/buildings.ruleset:787
#: data/civ1/buildings.ruleset:550
msgid ""
"Space Modules are the most expensive parts of spaceships. There are three "
@@ -17340,12 +17488,12 @@ msgstr ""
"×œ×¤× ×™ שיש ב×פשרותך ×œ×‘× ×•×ª חלקי ×¡×¤×™× ×ªÖ¾×—×œ×œ, פל×־התבל ×ª×›× ×™×ªÖ¾×פולו חייב ×œ×”×™×‘× ×•×ª "
"על־ידי ×חד ×”×©×—×§× ×™×."
-#: data/default/buildings.ruleset:813 data/civ2/buildings.ruleset:806
+#: data/default/buildings.ruleset:812 data/civ2/buildings.ruleset:806
#: data/civ1/buildings.ruleset:569
msgid "Space Structural"
msgstr "×ž×‘× ×” חלל"
-#: data/default/buildings.ruleset:828 data/civ2/buildings.ruleset:820
+#: data/default/buildings.ruleset:827 data/civ2/buildings.ruleset:820
#: data/civ1/buildings.ruleset:583
msgid ""
"Space Structurals form the base of your spaceship. All other spaceship "
@@ -17361,32 +17509,32 @@ msgstr ""
"×œ×¤× ×™ שיש ב×פשרותך ×œ×‘× ×•×ª חלקי ×¡×¤×™× ×ªÖ¾×—×œ×œ, פל×־התבל ×ª×›× ×™×ªÖ¾×פולו חייב ×œ×”×™×‘× ×•×ª "
"על־ידי ×חד ×”×©×—×§× ×™×."
-#: data/default/buildings.ruleset:838 data/civ2/buildings.ruleset:830
+#: data/default/buildings.ruleset:837 data/civ2/buildings.ruleset:830
msgid "Stock Exchange"
msgstr "בורסה"
-#: data/default/buildings.ruleset:854 data/civ2/buildings.ruleset:846
+#: data/default/buildings.ruleset:853 data/civ2/buildings.ruleset:846
#, no-c-format
msgid ""
"Together with a Marketplace and a Bank, a Stock Exchange boosts tax and "
"luxury production in a city by 150%."
msgstr "יחד ×¢× ×©×•×§ ×•×‘× ×§, בורסה מגבירה ×ת המס וייצור השפע בעיר ב־ 150%."
-#: data/default/buildings.ruleset:860 data/civ2/buildings.ruleset:852
+#: data/default/buildings.ruleset:859 data/civ2/buildings.ruleset:852
msgid "Super Highways"
msgstr "×וטוסטרדה"
-#: data/default/buildings.ruleset:875 data/civ2/buildings.ruleset:867
+#: data/default/buildings.ruleset:874 data/civ2/buildings.ruleset:867
#, no-c-format
msgid ""
"Increases trade resources by 50% on all squares with roads or railroads."
msgstr "מגביר ×ת מש×בי הסחר ב־ 50% בכל המשבצות ×¢× ×“×¨×›×™× ×ו מסילות־ברזל."
-#: data/default/buildings.ruleset:883 data/civ2/buildings.ruleset:873
+#: data/default/buildings.ruleset:882 data/civ2/buildings.ruleset:873
msgid "Supermarket"
msgstr "סופרמרקט"
-#: data/default/buildings.ruleset:898 data/civ2/buildings.ruleset:888
+#: data/default/buildings.ruleset:897 data/civ2/buildings.ruleset:888
#, no-c-format
msgid ""
"Increases the food resources by 50% on each farmland square which is being "
@@ -17396,12 +17544,12 @@ msgstr ""
"מגביר ×ת מש×בי המזון ב־ 50% לכל משבצת חווה השמשת המשמשת סביב העיר. משבצות "
"חווה הן ×לו שהושקו ×‘×¤×¢× ×”×©× ×™×™×”."
-#: data/default/buildings.ruleset:905 data/civ2/buildings.ruleset:895
+#: data/default/buildings.ruleset:904 data/civ2/buildings.ruleset:895
#: data/civ1/buildings.ruleset:593
msgid "Temple"
msgstr "מקדש"
-#: data/default/buildings.ruleset:919 data/civ2/buildings.ruleset:909
+#: data/default/buildings.ruleset:918 data/civ2/buildings.ruleset:909
#: data/civ1/buildings.ruleset:607
msgid ""
"Makes one unhappy citizen content. Both the Mysticism advance and the "
@@ -17411,25 +17559,25 @@ msgstr ""
"הפוך ×זרח ×ומלל ×חד לשבע־רצון. הן ההתקדמות מיסטיקה והן פל×־התבל ×ורקל מכפיל "
"×ת השפעתו. ×¢× ×ž×™×¡×˜×™×§×” ×•×¢× ×ורקל ×’× ×™×—×“, 4 ××–×¨×—×™× ×”×•×¤×›×™× ×œ×”×™×•×ª שבעי־רצון."
-#: data/default/buildings.ruleset:926 data/civ2/buildings.ruleset:916
+#: data/default/buildings.ruleset:925 data/civ2/buildings.ruleset:916
#: data/civ1/buildings.ruleset:614 data/default/techs.ruleset:742
#: data/civ2/techs.ruleset:727 data/civ1/techs.ruleset:723
msgid "University"
msgstr "××•× ×™×‘×¨×¡×™×˜×”"
-#: data/default/buildings.ruleset:942
+#: data/default/buildings.ruleset:941
#, no-c-format
msgid ""
"Together with a Library, a University increases the science production of a "
"city by 250%."
msgstr "יחד ×¢× ×¡×¤×¨×™×™×”, ××•× ×™×‘×¨×¡×™×˜×” מגבירה ×ת תפוקת המדע של עיר ב־ 250%."
-#: data/default/buildings.ruleset:948 data/civ2/buildings.ruleset:938
+#: data/default/buildings.ruleset:947 data/civ2/buildings.ruleset:938
#: data/civ1/buildings.ruleset:636
msgid "Apollo Program"
msgstr "×ª×›× ×™×ª ×פולו"
-#: data/default/buildings.ruleset:962 data/civ2/buildings.ruleset:952
+#: data/default/buildings.ruleset:961 data/civ2/buildings.ruleset:952
msgid ""
"Entire map becomes visible for the player who owns it. It allows all "
"players to start building spaceship parts (assuming they have researched the "
@@ -17438,23 +17586,23 @@ msgstr ""
"כל המפה × ×—×©×¤×ª לשחקן שהמחזיק בפל×־תבל ×–×”. ×”×•× ×ž×פשר לכל ×”×©×—×§× ×™× ×œ×”×ª×—×™×œ "
"×‘×‘× ×™×™×ª חלקי ×¡×¤×™× ×ªÖ¾×”×—×œ×œ (×‘×”× ×—×” שחקרו ×ת ×”×˜×›× ×•×œ×•×’×™×•×ª הדרושות)."
-#: data/default/buildings.ruleset:969 data/civ2/buildings.ruleset:959
+#: data/default/buildings.ruleset:968 data/civ2/buildings.ruleset:959
msgid "A.Smith's Trading Co."
msgstr "חברת הסחר של ××“× ×¡×ž×™×ª"
-#: data/default/buildings.ruleset:983
+#: data/default/buildings.ruleset:982
msgid ""
"City improvements which would normally have an upkeep of 1 are free of "
"upkeep, for all your cities."
msgstr ""
"שיפורי־עיר העלות התחזוקה הרגילה ×©×œ×”× ×”×™× 1, ×ª×—×–×•×§×ª× ×ª×”×™×™×” ×‘×—×™× ×, לכל הערי×."
-#: data/default/buildings.ruleset:989 data/civ2/buildings.ruleset:979
+#: data/default/buildings.ruleset:988 data/civ2/buildings.ruleset:979
#: data/civ1/buildings.ruleset:655
msgid "Colossus"
msgstr "קולוסוס"
-#: data/default/buildings.ruleset:1003 data/civ2/buildings.ruleset:993
+#: data/default/buildings.ruleset:1002 data/civ2/buildings.ruleset:993
#: data/civ1/buildings.ruleset:669
msgid ""
"Each square around the city where this wonder is built that is already "
@@ -17463,34 +17611,34 @@ msgstr ""
"כל משבצת מסביב לעיר בה פל×־תבל ×–×” ×‘× ×•×™ שכבר מייצרת מידה מסוימת סחר ×ª× ×™×‘ מש×ב "
"סחר ×חד × ×•×¡×£."
-#: data/default/buildings.ruleset:1009 data/civ2/buildings.ruleset:999
+#: data/default/buildings.ruleset:1008 data/civ2/buildings.ruleset:999
#: data/civ1/buildings.ruleset:675
msgid "Copernicus' Observatory"
msgstr "מצפה ×”×›×•×›×‘×™× ×©×œ ×§×•×¤×¨× ×™×§×•×¡"
-#: data/default/buildings.ruleset:1024 data/civ2/buildings.ruleset:1180
+#: data/default/buildings.ruleset:1023 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 "מגדיל ×ת תפוקת המדע של של העיר בה פל×־תבל ×–×” ×‘× ×•×™ ב־ 100%."
-#: data/default/buildings.ruleset:1029 data/civ2/buildings.ruleset:1019
+#: data/default/buildings.ruleset:1028 data/civ2/buildings.ruleset:1019
#: data/civ1/buildings.ruleset:695
msgid "Cure For Cancer"
msgstr "תרופה לסרטן"
-#: data/default/buildings.ruleset:1043
+#: data/default/buildings.ruleset:1042
msgid ""
"This stunning technological achievement makes one unhappy citizen content in "
"all your cities."
msgstr "הישג ×˜×›× ×•×œ×•×’×™ ×ž×“×”×™× ×–×• הופך ×זרח ×מלל ×חד למרוצה בכל עירך."
-#: data/default/buildings.ruleset:1051 data/civ2/buildings.ruleset:1039
+#: data/default/buildings.ruleset:1050 data/civ2/buildings.ruleset:1039
#: data/civ1/buildings.ruleset:715
msgid "Darwin's Voyage"
msgstr "המסע של דרווין"
-#: data/default/buildings.ruleset:1065 data/civ2/buildings.ruleset:1053
+#: data/default/buildings.ruleset:1064 data/civ2/buildings.ruleset:1053
#: data/civ1/buildings.ruleset:729
msgid ""
"Charles Darwin's voyage sparked the discovery of the evolution of the "
@@ -17500,11 +17648,11 @@ msgstr ""
"המסע של צ'×רלס דרווין הצית ×ת גילוי תורת־ה×בולוציה של ×”×ž×™× ×™×, שהגבירה ×ת "
"הביטחון במדע. פל×־תבל ×–×” ×ž×¢× ×™×§ מיד שתי התקדמויות ×˜×›× ×•×œ×•×’×™×•×ª."
-#: data/default/buildings.ruleset:1072 data/civ2/buildings.ruleset:1060
+#: data/default/buildings.ruleset:1071 data/civ2/buildings.ruleset:1060
msgid "Eiffel Tower"
msgstr "מגדל ×ייפל"
-#: data/default/buildings.ruleset:1087
+#: data/default/buildings.ruleset:1086
#, fuzzy, no-c-format
msgid ""
"Your reputation and goodwill among other nations is recovered twice as fast."
@@ -17512,12 +17660,12 @@ msgstr ""
"×”×ž×•× ×™×˜×™×Ÿ שלך והרצון הטוב מצד ×ומות ×חרות ×ž×ª×’×‘×¨×™× ×‘×©×¢×” ש×תה מחזיק בפל×־תבל "
"×–×”. ×ž×•× ×™×˜×™×Ÿ ×ž×©×•×§× ×‘×ž×”×™×¨×•×ª כפולה מבלעדיו."
-#: data/default/buildings.ruleset:1093 data/civ2/buildings.ruleset:1081
+#: data/default/buildings.ruleset:1092 data/civ2/buildings.ruleset:1081
#: data/civ1/buildings.ruleset:736
msgid "Great Library"
msgstr "הספרייה הגדולה"
-#: data/default/buildings.ruleset:1107 data/civ2/buildings.ruleset:1095
+#: data/default/buildings.ruleset:1106 data/civ2/buildings.ruleset:1095
#: data/civ1/buildings.ruleset:750
msgid ""
"The civilization which builds the Great Library gets every advance that at "
@@ -17526,21 +17674,21 @@ msgstr ""
"התרבות שמקימה ×ת הספרייה הגדולה מקבל ×ת כל התקדמות ×©× ×ž×¦×ת ברשות לפחות שתי "
"תרבויות ×חרות."
-#: data/default/buildings.ruleset:1113 data/civ2/buildings.ruleset:1101
+#: data/default/buildings.ruleset:1112 data/civ2/buildings.ruleset:1101
#: data/civ1/buildings.ruleset:756
msgid "Great Wall"
msgstr "החומה הגדולה"
-#: data/default/buildings.ruleset:1127
+#: data/default/buildings.ruleset:1126
msgid "Works as a City Wall in all your cities."
msgstr "פועלת כחומה סביב כל ×חת מעריך."
-#: data/default/buildings.ruleset:1135 data/civ2/buildings.ruleset:1122
+#: data/default/buildings.ruleset:1134 data/civ2/buildings.ruleset:1122
#: data/civ1/buildings.ruleset:777
msgid "Hanging Gardens"
msgstr "×”×’× ×™× ×”×ª×œ×•×™×™×"
-#: data/default/buildings.ruleset:1149 data/civ2/buildings.ruleset:1136
+#: data/default/buildings.ruleset:1148 data/civ2/buildings.ruleset:1136
#: data/civ1/buildings.ruleset:791
msgid ""
"Makes one content citizen happy in every city. Makes two extra content "
@@ -17554,12 +17702,12 @@ msgstr ""
"×ין ××–×¨×—×™× ×©×‘×¢×™Ö¾×¨×¦×•×Ÿ שיושפעו על־ידי ×”×’× ×™× ×”×ª×œ×•×™×™×, פל×־תבל ×–×” ישפיע על "
"××–×¨×—×™× ××•×ž×œ×œ×™× (יהפוך ××•×ª× ×œ×©×‘×¢×™Ö¾×¨×¦×•×Ÿ, תחת ×–×ת)."
-#: data/default/buildings.ruleset:1158 data/civ2/buildings.ruleset:1145
+#: data/default/buildings.ruleset:1157 data/civ2/buildings.ruleset:1145
#: data/civ1/buildings.ruleset:800
msgid "Hoover Dam"
msgstr "הסכר ע\"ש הובר"
-#: data/default/buildings.ruleset:1173 data/civ2/buildings.ruleset:1159
+#: data/default/buildings.ruleset:1172 data/civ2/buildings.ruleset:1159
msgid ""
"Works as if you had a Hydro Plant in every city. (This reduces pollution "
"and increases the effects of Factories and Mfg. Plants.)"
@@ -17567,51 +17715,51 @@ msgstr ""
"פועל ×›×ילו ישב לך ×ª×—× ×” ×לקטרו־חשמלית בכל עיר. (הדבר מפחית ×ת רמת ×”×–×™×”×•× "
"ומגביר ×ת השפעת בתי־החרושת ×•×”×ž×¤×¢×œ×™× ×”×וטומטיי×.)"
-#: data/default/buildings.ruleset:1179 data/civ2/buildings.ruleset:1165
+#: data/default/buildings.ruleset:1178 data/civ2/buildings.ruleset:1165
#: data/civ1/buildings.ruleset:822
msgid "Isaac Newton's College"
msgstr "הקולג' של ×ייזק × ×™×•×˜×•×Ÿ"
-#: data/default/buildings.ruleset:1194
+#: data/default/buildings.ruleset:1193
#, no-c-format
msgid ""
"Boosts science production by 100% in every city you control that has a "
"University."
msgstr "מגביר ×ת תפוקת המדע ב־ 100% עבור כל עיר בשליטתך בה יש ××•× ×™×‘×¨×¡×™×˜×”."
-#: data/default/buildings.ruleset:1200 data/civ2/buildings.ruleset:1185
+#: data/default/buildings.ruleset:1199 data/civ2/buildings.ruleset:1185
#: data/civ1/buildings.ruleset:842
msgid "J.S. Bach's Cathedral"
msgstr "הקתדרלה של ×™\"ס ב×ך"
-#: data/default/buildings.ruleset:1214 data/civ2/buildings.ruleset:1199
+#: data/default/buildings.ruleset:1213 data/civ2/buildings.ruleset:1199
msgid "Makes two unhappy citizens content in every city."
msgstr "הופרך ×©× ×™ ××–×¨×—×™× ××•×ž×œ×œ×™× ×œ×©×‘×¢×™Ö¾×¨×¦×•×Ÿ בכל עיר."
-#: data/default/buildings.ruleset:1219 data/civ2/buildings.ruleset:1204
+#: data/default/buildings.ruleset:1218 data/civ2/buildings.ruleset:1204
msgid "King Richard's Crusade"
msgstr "טירת המלך ריצ'×רד"
-#: data/default/buildings.ruleset:1233 data/civ2/buildings.ruleset:1218
+#: data/default/buildings.ruleset:1232 data/civ2/buildings.ruleset:1218
msgid ""
"Adds one extra shield resource on every square around the city where it is "
"built."
msgstr "מוסיף מש×ב מגן ×חד × ×•×¡×£ על כל משבצת סביב לעיר בה ×‘× ×•×™×” הטירה."
-#: data/default/buildings.ruleset:1239 data/civ2/buildings.ruleset:1224
+#: data/default/buildings.ruleset:1238 data/civ2/buildings.ruleset:1224
msgid "Leonardo's Workshop"
msgstr "×”×¡×“× ×” של ל××•× ×¨×“×•"
-#: data/default/buildings.ruleset:1253 data/civ2/buildings.ruleset:1238
+#: data/default/buildings.ruleset:1252 data/civ2/buildings.ruleset:1238
msgid "Upgrades one obsolete unit per game turn."
msgstr "משדרג יחידה ×ž×™×•×©× ×ª ×חת בכל תור."
-#: data/default/buildings.ruleset:1258 data/civ2/buildings.ruleset:1243
+#: data/default/buildings.ruleset:1257 data/civ2/buildings.ruleset:1243
#: data/civ1/buildings.ruleset:862
msgid "Lighthouse"
msgstr "מגדלור"
-#: data/default/buildings.ruleset:1273
+#: data/default/buildings.ruleset:1272
msgid ""
"Gives all your sea units 1 additional movement point and eliminates the risk "
"of losing Triremes on the high seas. Makes all your new sea units veterans "
@@ -17620,34 +17768,34 @@ msgstr ""
"×ž×¢× ×™×§ לכל יחידת ×”×™× ×©×œ×š × ×§×•×“×ª ×ª× ×•×¢×” ×חת × ×•×¡×¤×ª, ומבטל ×ת ×”×¡×›× ×” של ×בדת "
"×¡×¤×™× ×•×ªÖ¾×ž×©×•×˜×™× ×‘×œ×‘ ×™×. הופך ×ת כל יחידת ×™× ×—×“×©×” לוותיקת קרבות (עבור כל עריך)."
-#: data/default/buildings.ruleset:1280 data/civ2/buildings.ruleset:1264
+#: data/default/buildings.ruleset:1279 data/civ2/buildings.ruleset:1264
#: data/civ1/buildings.ruleset:885
msgid "Magellan's Expedition"
msgstr "מסע הגילוי של מגלן"
-#: data/default/buildings.ruleset:1295
+#: data/default/buildings.ruleset:1294
msgid "Gives all your sea units 2 additional movement points."
msgstr "× ×•×ª×Ÿ לכל יחידות ×”×™× ×©×œ×š 2 × ×§×•×“×•×ª ×ª× ×•×¢×” × ×•×¡×¤×•×ª."
-#: data/default/buildings.ruleset:1300 data/civ2/buildings.ruleset:1283
+#: data/default/buildings.ruleset:1299 data/civ2/buildings.ruleset:1283
#: data/civ1/buildings.ruleset:904
msgid "Manhattan Project"
msgstr "פרויקט ×ž× ×”×˜×Ÿ"
-#: data/default/buildings.ruleset:1318 data/civ2/buildings.ruleset:1301
+#: data/default/buildings.ruleset:1317 data/civ2/buildings.ruleset:1301
msgid "Marco Polo's Embassy"
msgstr "השגרירות של מרקו פולו"
-#: data/default/buildings.ruleset:1332 data/civ2/buildings.ruleset:1315
+#: data/default/buildings.ruleset:1331 data/civ2/buildings.ruleset:1315
msgid "The player who owns it gets an embassy with all players."
msgstr "השחקן שמחזיק בזה, מקבל שגרירויות ×צל כל ×”×©×—×§× ×™×."
-#: data/default/buildings.ruleset:1337 data/civ2/buildings.ruleset:1320
+#: data/default/buildings.ruleset:1336 data/civ2/buildings.ruleset:1320
#: data/civ1/buildings.ruleset:922
msgid "Michelangelo's Chapel"
msgstr "הקתדרלה של מיכל×× ×’'לו"
-#: data/default/buildings.ruleset:1351 data/civ2/buildings.ruleset:1334
+#: data/default/buildings.ruleset:1350 data/civ2/buildings.ruleset:1334
msgid ""
"Counts as having a Cathedral in each of your cities. This makes 3 unhappy "
"citizens content in each city. The discovery of Theology increases the "
@@ -17660,21 +17808,21 @@ msgstr ""
"לשבע־רצון. גילוי ×”×§×•×ž×•× ×™×–× ×ž×¤×—×™×ª ×ת השפעת הקתדרלה, מפחית ב×חד ×ת מספר "
"×”××–×¨×—×™× ×”××•×ž×œ×œ×™× ×©×”×•×¤×›×™× ×œ×©×‘×¢×™Ö¾×¨×¦×•×Ÿ."
-#: data/default/buildings.ruleset:1361 data/civ2/buildings.ruleset:1344
+#: data/default/buildings.ruleset:1360 data/civ2/buildings.ruleset:1344
#: data/civ1/buildings.ruleset:941
msgid "Oracle"
msgstr "×ורקל"
-#: data/default/buildings.ruleset:1375
+#: data/default/buildings.ruleset:1374
msgid "Makes two of your unhappy citizens content in every city with a temple."
msgstr "הופך ×©× ×™× ×ž×זרחיך ×”××•×ž×œ×œ×™× ×œ×©×‘×¢×™Ö¾×¨×¦×•×Ÿ בכל עיר ×¢× ×ž×§×“×©."
-#: data/default/buildings.ruleset:1380 data/civ2/buildings.ruleset:1363
+#: data/default/buildings.ruleset:1379 data/civ2/buildings.ruleset:1363
#: data/civ1/buildings.ruleset:960
msgid "Pyramids"
msgstr "פירמידות"
-#: data/default/buildings.ruleset:1394
+#: data/default/buildings.ruleset:1393
msgid ""
"The amount of stored food lost when one of your cities grows or shrinks is "
"reduced by 25%. This helps a city to grow faster and more easily withstand "
@@ -17684,30 +17832,30 @@ msgstr ""
"מסייע לעיר לצמוח מהר יותר ולעמוד טוב יותר ×‘×¤× ×™ רעב. ההשפעה מצטברת על זו של "
"ממגורה."
-#: data/default/buildings.ruleset:1401 data/civ2/buildings.ruleset:1382
+#: data/default/buildings.ruleset:1400 data/civ2/buildings.ruleset:1382
#: data/civ1/buildings.ruleset:981
msgid "SETI Program"
msgstr "×ª×›× ×™×ª חיפוש ×ª×‘×•× ×” חייזרית"
-#: data/default/buildings.ruleset:1415
+#: data/default/buildings.ruleset:1414
msgid "Boosts science production in each city with a Research Lab by 100%. "
msgstr "מגביר ×ת תפוקת המדע בכל עיר ×¢× ×ž×¢×‘×“×ª מחקר ב־ 100%."
-#: data/default/buildings.ruleset:1420 data/civ2/buildings.ruleset:1402
+#: data/default/buildings.ruleset:1419 data/civ2/buildings.ruleset:1402
#: data/civ1/buildings.ruleset:1001
msgid "Shakespeare's Theatre"
msgstr "הת×טרון של שייקספיר"
-#: data/default/buildings.ruleset:1434 data/civ2/buildings.ruleset:1416
+#: data/default/buildings.ruleset:1433 data/civ2/buildings.ruleset:1416
#: data/civ1/buildings.ruleset:1015
msgid "Makes all unhappy citizens content, in the city where it is located."
msgstr "הופך ×ת כל ×”××–×¨×—×™× ×”××•×ž×œ×œ×™× ×œ×©×‘×¢×™Ö¾×¨×¦×•×Ÿ, בעיר בה ×”×•× ×ž×ž×•×§×."
-#: data/default/buildings.ruleset:1439 data/civ2/buildings.ruleset:1421
+#: data/default/buildings.ruleset:1438 data/civ2/buildings.ruleset:1421
msgid "Statue of Liberty"
msgstr "פסל החירות"
-#: data/default/buildings.ruleset:1453 data/civ2/buildings.ruleset:1435
+#: data/default/buildings.ruleset:1452 data/civ2/buildings.ruleset:1435
#: data/civ1/buildings.ruleset:974 data/civ1/buildings.ruleset:1034
msgid ""
"Allows you to choose any government, including those that have not yet been "
@@ -17717,11 +17865,11 @@ msgstr ""
"מ×פשר לבחור בכל שיטת ממשל, כולל ×לו ×©×œ× × ×—×§×¨×• עדיין על־ידי תרבותך, ×•×œ×œ× "
"תקופת מעבר של ×× ×¨×›×™×”."
-#: data/default/buildings.ruleset:1460 data/civ2/buildings.ruleset:1442
+#: data/default/buildings.ruleset:1459 data/civ2/buildings.ruleset:1442
msgid "Sun Tzu's War Academy"
msgstr "×קדמית המלחמה של ס×ן צו"
-#: data/default/buildings.ruleset:1474
+#: data/default/buildings.ruleset:1473
msgid ""
"All your new ground units start at the first veteran level. The chance of a "
"unit getting the next veteran level after a battle increases by half."
@@ -17729,21 +17877,21 @@ msgstr ""
"כל יחידות היבשה שלך מוקמות ×¢× ×¨×ž×ª וותק קרבות. הסיכוי שיחידה תקבל ×ת רמת "
"וותק הקרבות הב××” ל×חר קרב עולה בחצי."
-#: data/default/buildings.ruleset:1481 data/civ2/buildings.ruleset:1463
+#: data/default/buildings.ruleset:1480 data/civ2/buildings.ruleset:1463
#: data/civ1/buildings.ruleset:1020
msgid "United Nations"
msgstr "×”×ומות המ×וחדות"
-#: data/default/buildings.ruleset:1495
+#: data/default/buildings.ruleset:1494
msgid "All your units regain two extra hitpoints per turn."
msgstr "כל היחידות שלך מקבלות חזרה ×ת שתי × ×§×•×“×•×ª פגיעה × ×•×¡×¤×•×ª לתור."
-#: data/default/buildings.ruleset:1508 data/civ2/buildings.ruleset:1490
+#: data/default/buildings.ruleset:1507 data/civ2/buildings.ruleset:1490
#: data/civ1/buildings.ruleset:1046
msgid "Women's Suffrage"
msgstr "זכות הצבעה ×œ× ×©×™×"
-#: data/default/buildings.ruleset:1522 data/civ2/buildings.ruleset:1504
+#: data/default/buildings.ruleset:1521 data/civ2/buildings.ruleset:1504
msgid ""
"Counts as a Police Station in every city. (That is, for each city, reduces "
"unhappiness for military units outside the city by 2 under Democracy and 1 "
@@ -17753,11 +17901,11 @@ msgstr ""
"שמחוץ לעיר ב־ 2 תחת ממשל דמוקרטי, וב־ 1 תחת משטר רפובליקה. ×ין לפל×־תבל ×–×” "
"השפעה תחת שיטת ממשל ×חרות.)"
-#: data/default/buildings.ruleset:1533
+#: data/default/buildings.ruleset:1532
msgid "Coinage"
msgstr "מטבעות"
-#: data/default/buildings.ruleset:1554
+#: data/default/buildings.ruleset:1553
msgid ""
"This is not a normal improvement. Instead, setting a city's production to "
"Coinage means its shield production is converted to tax output (money, "
@@ -18110,11 +18258,16 @@ msgstr "?×¡×’× ×•×ŸÖ¾×¢×™×¨:קלטי"
msgid "?citystyle:Industrial"
msgstr "?×¡×’× ×•×ŸÖ¾×¢×™×¨:תעשייתי"
-#: data/default/cities.ruleset:139 data/civ2/cities.ruleset:150
+#: data/default/cities.ruleset:139
+#, fuzzy
+msgid "?citystyle:ElectricAge"
+msgstr "?×¡×’× ×•×ŸÖ¾×¢×™×¨:קלטי"
+
+#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:150
msgid "?citystyle:Modern"
msgstr "?×¡×’× ×•×ŸÖ¾×¢×™×¨:×ž×•×“×¨× ×™"
-#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:161
+#: data/default/cities.ruleset:161 data/civ2/cities.ruleset:161
msgid "?citystyle:PostModern"
msgstr "?×¡×’× ×•×ŸÖ¾×¢×™×¨:×¤×•×¡×˜Ö¾×ž×•×“×¨× ×™"
@@ -22924,6 +23077,25 @@ msgstr "צוות 30"
msgid "Team 31"
msgstr "צוות 31"
+#~ 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 Hydro Plant, Power Plant, or Nuclear Plant. A "
+#~ "city can only build a Hydro Plant if it is next to (or on) a Mountain or "
+#~ "River tile."
+#~ msgstr ""
+#~ "מפחית ×ת כמות ×”×–×™×”×•× ×”× ×’×¨×ž×ª מייצור בעיר ב־ 50%. הדבר מגביר ×’× ×ת ייצור "
+#~ "המגן של בית־חרושת ומפעל ×וטומטי בעיר: בית־חרושת ×•×ª×—× ×” הידרו־חשמלית יחדיו "
+#~ "×ž× ×™×‘×•×ª ×‘×•× ×•×¡ ייצור של 75%, מפעל ×וטומטי ×•×ª×—× ×” הידרו־חשמלית ×ž× ×™×‘×•×ª יחד "
+#~ "×‘×•× ×•×¡ יצור של 150%.\n"
+#~ "\n"
+#~ "עיר יכולה להחזיק ×ª×—× ×” הידרו־חשמלית, ×ª×—× ×ª כוח, ×ו כור ×’×¨×¢×™× ×™. עיר יכולה "
+#~ "×œ×‘× ×•×ª ×ª×—× ×” הידרו־חשמלית ×× ×œ×™×“×” (×ו בתוכה) יש משבצת ×”×¨×™× ×ו × ×”×¨."
+
#, fuzzy
#~ msgid "Auth config filename \"%s\" not allowed!"
#~ msgstr "×©× ×–×” ×סור."
diff --git a/po/hu.gmo b/po/hu.gmo
index 9ddfe09..edf6d0d 100644
Binary files a/po/hu.gmo and b/po/hu.gmo differ
diff --git a/po/hu.po b/po/hu.po
index 54f2491..f42ddec 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: 2009-03-29 21:13+0900\n"
+"POT-Creation-Date: 2009-11-22 21:37+0100\n"
"PO-Revision-Date: 2007-08-12 15:37+0300\n"
"Last-Translator: Gábor Takács <tg330 at hszk.bme.hu>\n"
"Language-Team: Hungarian <hu at li.org>\n"
@@ -65,21 +65,21 @@ msgstr "?obsolate:E"
msgid "?redundant:*"
msgstr "?redundant:*"
-#: common/connection.c:515
+#: common/connection.c:518
#, c-format
msgid "%s from %s"
msgstr "%s@%s"
-#: common/connection.c:521
+#: common/connection.c:524
msgid " (connection incomplete)"
msgstr " (a kapcsolat még nem épült ki)"
-#: common/connection.c:525
+#: common/connection.c:528
#, c-format
msgid " (player %s)"
msgstr " (%s játékos)"
-#: common/connection.c:529
+#: common/connection.c:532
msgid " (observer)"
msgstr " (megfigyelõ)"
@@ -494,84 +494,84 @@ msgstr "Kapcsol
msgid "AI Debug messages"
msgstr ""
-#: common/player.c:732
+#: common/player.c:746
msgid "?attitude:Genocidal"
msgstr ""
-#: common/player.c:734
+#: common/player.c:748
msgid "?attitude:Belligerent"
msgstr ""
-#: common/player.c:736
+#: common/player.c:750
msgid "?attitude:Hostile"
msgstr ""
-#: common/player.c:738
+#: common/player.c:752
msgid "?attitude:Uncooperative"
msgstr ""
-#: common/player.c:740
+#: common/player.c:754
msgid "?attitude:Uneasy"
msgstr ""
-#: common/player.c:742
+#: common/player.c:756
#, fuzzy
msgid "?attitude:Neutral"
msgstr "?diplomatic_state:Semleges"
-#: common/player.c:744
+#: common/player.c:758
msgid "?attitude:Respectful"
msgstr ""
-#: common/player.c:746
+#: common/player.c:760
msgid "?attitude:Helpful"
msgstr ""
-#: common/player.c:748
+#: common/player.c:762
msgid "?attitude:Enthusiastic"
msgstr ""
-#: common/player.c:750
+#: common/player.c:764
msgid "?attitude:Admiring"
msgstr ""
-#: common/player.c:753
+#: common/player.c:767
msgid "?attitude:Worshipful"
msgstr ""
-#: common/player.c:764
+#: common/player.c:778
#, fuzzy
msgid "?diplomatic_state:Armistice"
msgstr "?diplomatic_state:Szövetség"
-#: common/player.c:765
+#: common/player.c:779
msgid "?diplomatic_state:War"
msgstr "?diplomatic_state:Háború"
-#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:780 client/gui-gtk-2.0/diplodlg.c:353
#: 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:767 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:781 client/gui-gtk-2.0/diplodlg.c:358
#: 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:768 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:782 client/gui-gtk-2.0/diplodlg.c:363
#: 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:769
+#: common/player.c:783
#, fuzzy
msgid "?diplomatic_state:Never met"
msgstr "?diplomatic_state:Semleges"
-#: common/player.c:770
+#: common/player.c:784
#, fuzzy
msgid "?diplomatic_state:Team"
msgstr "?diplomatic_state:Béke"
@@ -603,7 +603,7 @@ msgstr ""
#. TRANS: "Resources: (none)".
#: common/requirements.c:1014 common/team.c:132
#: client/gui-gtk-2.0/helpdlg.c:1055 client/gui-gtk-2.0/inteldlg.c:390
-#: client/gui-win32/helpdlg.c:586 client/gui-xaw/helpdlg.c:991
+#: client/gui-win32/helpdlg.c:592 client/gui-xaw/helpdlg.c:991
#, fuzzy, c-format
msgid "(none)"
msgstr "semmi"
@@ -629,10 +629,11 @@ msgstr "%d. J
#: 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
#: client/gui-sdl/helpdlg.c:817 client/gui-sdl/mapview.c:962
-#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:545
-#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:735
-#: 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
+#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:544
+#: client/gui-win32/helpdlg.c:551 client/gui-win32/helpdlg.c:721
+#: client/gui-win32/helpdlg.c:741 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 "Semmi"
@@ -646,29 +647,29 @@ msgstr "%d. J
msgid "(Unknown)"
msgstr "(Ismeretlen)"
-#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:553
#: manual/civmanual.c:224
msgid "Road"
msgstr "Út"
-#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:557
#: client/gui-gtk-2.0/menu.c:829 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:394 common/terrain.c:572 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:567
#: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
#: data/civ1/techs.ruleset:563
msgid "Railroad"
msgstr "Vasút"
-#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:555
msgid "Mine"
msgstr "Bánya"
-#: common/terrain.c:396 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:551 server/report.c:124
#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "Szennyezés"
@@ -677,7 +678,7 @@ msgstr "Szennyez
msgid "Hut"
msgstr "Kunyhó"
-#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:563
#: manual/civmanual.c:226
msgid "Fortress"
msgstr "Erõd"
@@ -690,59 +691,59 @@ msgstr "Foly
msgid "Farmland"
msgstr "Farm"
-#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:577
#: manual/civmanual.c:226
msgid "Airbase"
msgstr "Légibázis"
-#: common/terrain.c:402 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:579
msgid "Fallout"
msgstr "Nukleáris Szennyezés"
-#: common/unit.c:546 client/gui-win32/plrdlg.c:337
+#: common/unit.c:549 client/gui-win32/plrdlg.c:337
msgid "Idle"
msgstr "Tétlen"
-#: common/unit.c:556
+#: common/unit.c:559
msgid "Fortifying"
msgstr "Megerõsít"
-#: common/unit.c:558
+#: common/unit.c:561
msgid "Fortified"
msgstr "Megerõsítve"
-#: common/unit.c:562 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
+#: common/unit.c:565 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
msgid "Sentry"
msgstr "Õrjáratozik"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
+#: common/unit.c:569 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
#: client/gui-win32/menu.c:370 client/gui-xaw/menu.c:185
msgid "Pillage"
msgstr "Fosztogat"
-#: common/unit.c:568 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
+#: common/unit.c:571 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
msgid "Goto"
msgstr "Menj"
-#: common/unit.c:570
+#: common/unit.c:573
msgid "Explore"
msgstr "Felfedez"
-#: common/unit.c:572 manual/civmanual.c:224
+#: common/unit.c:575 manual/civmanual.c:224
msgid "Transform"
msgstr "Átalakít"
-#: common/unit.c:584 client/text.c:157 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:587 client/text.c:157 client/gui-sdl/citydlg.c:1972
#: client/gui-win32/citydlg.c:1257 client/gui-xaw/citydlg.c:1423
msgid "Unknown"
msgstr "Ismeretlen"
#
-#: common/unit.c:1022
+#: common/unit.c:1025
msgid "Moves"
msgstr "Lépések"
-#: common/unit.c:1571
+#: common/unit.c:1574
#, c-format
msgid ""
"Upgrade %s to %s for %d gold?\n"
@@ -751,12 +752,12 @@ msgstr ""
"Felfejlesszük a(z) %s egységet %s egységgé %d aranyért?\n"
"A kincstárban %d arany van."
-#: common/unit.c:1579
+#: common/unit.c:1582
#, fuzzy, c-format
msgid "Sorry, cannot upgrade %s (yet)."
msgstr "Sajnálom: A(z) %s nem fejleszthetõ fel."
-#: common/unit.c:1585
+#: common/unit.c:1588
#, c-format
msgid ""
"Upgrading %s to %s costs %d gold.\n"
@@ -765,11 +766,11 @@ msgstr ""
"%s felfejlesztése %s egységre %d aranyért.\n"
"A kincstárban %d arany van."
-#: common/unit.c:1594
+#: common/unit.c:1597
msgid "You can only upgrade units in your cities."
msgstr ""
-#: common/unit.c:1598
+#: common/unit.c:1601
#, c-format
msgid "Upgrading this %s would strand units it transports."
msgstr ""
@@ -806,11 +807,11 @@ msgstr "Atomrak
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1404
+#: common/unittype.c:349 client/helpdata.c:1412
msgid " and "
msgstr " és "
-#: common/unittype.c:355 client/helpdata.c:1390
+#: common/unittype.c:355 client/helpdata.c:1398
msgid "?and:, "
msgstr "?and:, "
@@ -975,72 +976,72 @@ msgstr "A(z) \"%s\" opci
msgid "Missing argument for \"%s\".\n"
msgstr "A(z) \"%s\" opciónak hiányzik a paramétere.\n"
-#: utility/shared.c:501
+#: utility/shared.c:514
#, c-format
msgid "%d BC"
msgstr "i.e. %d"
-#: utility/shared.c:503
+#: utility/shared.c:516
#, c-format
msgid "%d AD"
msgstr "i.sz. %d"
-#: utility/shared.c:924
+#: utility/shared.c:937
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:1028
+#: utility/shared.c:1041
#, 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:1279
+#: utility/shared.c:1292
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:1281
+#: utility/shared.c:1294
#, c-format
msgid "Current data path is: \"%s\""
msgstr "A jelenlegi adatelérési útvonal: \"%s\""
-#: utility/shared.c:1283
+#: utility/shared.c:1296
#, 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:1460
+#: utility/shared.c:1485
#, 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:1462
+#: utility/shared.c:1487
msgid "Use a non-privileged account instead.\n"
msgstr "Használj inkább nem privilegizált felhsználót.\n"
-#: utility/shared.c:1478
+#: utility/shared.c:1503
msgid "exact match"
msgstr "illeszthetõ"
-#: utility/shared.c:1479
+#: utility/shared.c:1504
msgid "only match"
msgstr "csak eggyel illesztehtõ"
-#: utility/shared.c:1480
+#: utility/shared.c:1505
msgid "ambiguous"
msgstr "nem egyértelmû"
-#: utility/shared.c:1481
+#: utility/shared.c:1506
msgid "empty"
msgstr "üres"
-#: utility/shared.c:1482
+#: utility/shared.c:1507
msgid "too long"
msgstr "túl hosszú"
-#: utility/shared.c:1483
+#: utility/shared.c:1508
msgid "non-match"
msgstr "nem illeszthetõ"
@@ -1069,108 +1070,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:280
+#: ai/advdiplomacy.c:300
#, c-format
msgid "*%s (AI)* In away mode AI can't sign such a treaty."
msgstr ""
-#: ai/advdiplomacy.c:290
+#: ai/advdiplomacy.c:310
#, c-format
msgid "*%s (AI)* First break alliance with %s, %s."
msgstr ""
-#: ai/advdiplomacy.c:303
+#: ai/advdiplomacy.c:322
#, c-format
msgid "*%s (AI)* Let us first cease hostilies, %s."
msgstr ""
-#: ai/advdiplomacy.c:308
+#: ai/advdiplomacy.c:327
#, c-format
msgid ""
"*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
"first, %s."
msgstr ""
-#: ai/advdiplomacy.c:331
+#: ai/advdiplomacy.c:350
#, c-format
msgid "*%s (AI)* I simply do not trust you with an alliance yet, %s."
msgstr ""
-#: ai/advdiplomacy.c:424
+#: ai/advdiplomacy.c:443
#, c-format
msgid "*%s (AI)* I do not know the city you mention."
msgstr ""
-#: ai/advdiplomacy.c:454
+#: ai/advdiplomacy.c:473
#, c-format
msgid "*%s (AI)* Sorry, sharing vision with you is not safe."
msgstr ""
-#: ai/advdiplomacy.c:560
+#: ai/advdiplomacy.c:579
#, c-format
msgid "*%s (AI)* This deal was not very good for us, %s!"
msgstr ""
-#: ai/advdiplomacy.c:582
+#: ai/advdiplomacy.c:601
#, c-format
msgid "*%s (AI)* Welcome into our alliance %s!"
msgstr ""
-#: ai/advdiplomacy.c:586
+#: ai/advdiplomacy.c:605
#, c-format
msgid "*%s (AI)* Yes, may we forever stand united, %s."
msgstr ""
-#: ai/advdiplomacy.c:593
+#: ai/advdiplomacy.c:612
#, c-format
msgid "*%s (AI)* Yes, peace in our time!"
msgstr ""
-#: ai/advdiplomacy.c:598
+#: ai/advdiplomacy.c:617
#, c-format
msgid "*%s (AI)* Agreed. No more hostilities, %s."
msgstr ""
-#: ai/advdiplomacy.c:813
+#: ai/advdiplomacy.c:832
#, c-format
msgid ""
"*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
"other better?"
msgstr ""
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1116
#, c-format
msgid "*%s (AI)* Space will never be yours. "
msgstr ""
-#: ai/advdiplomacy.c:1102
+#: ai/advdiplomacy.c:1121
#, c-format
msgid "*%s (AI)* I have tolerated your vicious antics long enough! To war!"
msgstr ""
-#: ai/advdiplomacy.c:1108
+#: ai/advdiplomacy.c:1127
#, c-format
msgid "*%s (AI)* Peace in ... some other time."
msgstr ""
-#: ai/advdiplomacy.c:1113
+#: ai/advdiplomacy.c:1132
#, 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:1119
+#: ai/advdiplomacy.c:1138
#, c-format
msgid "*%s (AI)* Your covert hostilities brought this war upon you!"
msgstr ""
-#: ai/advdiplomacy.c:1126
+#: ai/advdiplomacy.c:1145
#, c-format
msgid "*%s (AI)* Your aggression against %s was your last mistake!"
msgstr ""
-#: ai/advdiplomacy.c:1209
+#: ai/advdiplomacy.c:1229
#, c-format
msgid ""
"*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1180,14 +1181,14 @@ msgid_plural ""
"the spaceship launch."
msgstr[0] ""
-#: ai/advdiplomacy.c:1219
+#: ai/advdiplomacy.c:1239
#, c-format
msgid ""
"*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
"alliance!"
msgstr ""
-#: ai/advdiplomacy.c:1225
+#: ai/advdiplomacy.c:1245
#, c-format
msgid ""
"*%s (AI)* %s has grossly violated his treaties with us for own gain. We "
@@ -1199,7 +1200,7 @@ msgid_plural ""
"us and do likewise!"
msgstr[0] ""
-#: ai/advdiplomacy.c:1238
+#: ai/advdiplomacy.c:1258
#, c-format
msgid ""
"*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1209,13 +1210,13 @@ msgid_plural ""
"declare war in %d turns."
msgstr[0] ""
-#: ai/advdiplomacy.c:1246
+#: ai/advdiplomacy.c:1266
#, c-format
msgid ""
"*%s (AI)* If you want a piece of the loot, feel free to join in the action!"
msgstr ""
-#: ai/advdiplomacy.c:1251
+#: ai/advdiplomacy.c:1271
#, c-format
msgid ""
"*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1225,12 +1226,12 @@ msgid_plural ""
"apart. We declare war in %d turns."
msgstr[0] ""
-#: ai/advdiplomacy.c:1261
+#: ai/advdiplomacy.c:1281
#, c-format
msgid "*%s (AI)* As our glorious allies, we expect your help in this war."
msgstr ""
-#: ai/advdiplomacy.c:1267
+#: ai/advdiplomacy.c:1287
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance and declare war on %s in %d turn. "
@@ -1240,7 +1241,7 @@ msgid_plural ""
"Hold on - we are coming!"
msgstr[0] ""
-#: ai/advdiplomacy.c:1276
+#: ai/advdiplomacy.c:1296
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1250,47 +1251,47 @@ msgid_plural ""
"turns. We expect you to do likewise."
msgstr[0] ""
-#: ai/advdiplomacy.c:1344
+#: ai/advdiplomacy.c:1364
#, 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:1359
+#: ai/advdiplomacy.c:1379
#, c-format
msgid ""
"*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
"offensive."
msgstr ""
-#: ai/advdiplomacy.c:1362
+#: ai/advdiplomacy.c:1382
#, c-format
msgid ""
"*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
"take action!"
msgstr ""
-#: ai/advdiplomacy.c:1474
+#: ai/advdiplomacy.c:1494
#, c-format
msgid "*%s (AI)* Sorry, sharing vision with you is no longer safe."
msgstr ""
-#: ai/advdiplomacy.c:1549
+#: ai/advdiplomacy.c:1569
#, c-format
msgid ""
"*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
"our enemy, %s."
msgstr ""
-#: ai/advdiplomacy.c:1555
+#: ai/advdiplomacy.c:1575
#, 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:1562
+#: ai/advdiplomacy.c:1582
#, c-format
msgid ""
"*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1298,26 +1299,26 @@ msgid ""
"more!"
msgstr ""
-#: ai/advdiplomacy.c:1592
+#: ai/advdiplomacy.c:1612
#, c-format
msgid ""
"*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
"an alliance?"
msgstr ""
-#: ai/advdiplomacy.c:1607
+#: ai/advdiplomacy.c:1627
#, c-format
msgid "*%s (AI)* Greetings neighbour, may we suggest more peaceful relations?"
msgstr ""
-#: ai/advdiplomacy.c:1622
+#: ai/advdiplomacy.c:1642
#, c-format
msgid ""
"*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
"cessation of hostilities?"
msgstr ""
-#: ai/advdiplomacy.c:1742
+#: ai/advdiplomacy.c:1762
#, c-format
msgid ""
"*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1461,17 +1462,17 @@ msgid ""
"minimum %d [printable] characters long. Try again."
msgstr ""
-#: server/barbarian.c:183
+#: server/barbarian.c:184
#, c-format
msgid "%s gain a leader by the name %s. Dangerous times may lie ahead."
msgstr ""
-#: server/barbarian.c:479
+#: server/barbarian.c:480
#, c-format
msgid "Native unrest near %s led by %s."
msgstr "Bennszülött felkelés %s közelében %s vezetésével."
-#: server/barbarian.c:484
+#: server/barbarian.c:485
#, c-format
msgid "Sea raiders seen near %s!"
msgstr "Kalózok %s közelében!"
@@ -1865,7 +1866,7 @@ msgid "%s boosts research; you gain %d immediate advance."
msgid_plural "%s boosts research; you gain %d immediate advances."
msgstr[0] "A(z) %s felgyorsítja a kutatást, kapsz 2 tudományt."
-#: server/cityturn.c:1158 server/techtools.c:176
+#: server/cityturn.c:1158 server/techtools.c:172
#, fuzzy, c-format
msgid "The %s have acquired %s from %s."
msgstr "A(z) %s megszerezték a(z) %s tudományt a(z) %s népétõl."
@@ -1951,22 +1952,22 @@ msgstr ""
"Figyelmeztetés: a(z) %s opció elavult. Használj -m -et a metaszerver "
"engedélyezéséhez.\n"
-#: server/civserver.c:189
+#: server/civserver.c:193
#, c-format
msgid "Error: unknown option '%s'\n"
msgstr "Hiba: a(z) '%s' ismeretlen opció\n"
-#: server/civserver.c:200
+#: server/civserver.c:204
#, c-format
msgid "This is the server for %s"
msgstr "Ez a %s szervere"
-#: server/civserver.c:201
+#: server/civserver.c:205
#, c-format
msgid "You can learn a lot about Freeciv at %s"
msgstr "Többet is megtudhatsz a Freecivrõl a %s oldalon"
-#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
+#: server/civserver.c:210 client/civclient.c:239 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -1975,110 +1976,115 @@ msgstr ""
"Használat: %s [opció ...]\n"
"A lehetséges opciók:\n"
-#: server/civserver.c:208
+#: server/civserver.c:212
msgid ""
" -a --auth FILE\tEnable server authentication with configuration from "
"FILE.\n"
msgstr ""
-#: server/civserver.c:210
+#: server/civserver.c:214
msgid " -G --Guests\t\tAllow guests to login if auth is enabled.\n"
msgstr ""
-#: server/civserver.c:212
+#: server/civserver.c:216
msgid " -N --Newusers\tAllow new users to login if auth is enabled.\n"
msgstr ""
-#: server/civserver.c:215
+#: server/civserver.c:219
#, fuzzy
msgid " -b --bind ADDR\tListen for clients on ADDR\n"
msgstr " -p, --port PORT\tA szerver a PORT porton figyeljen\n"
-#: server/civserver.c:217 client/civclient.c:242
+#: server/civserver.c:221 client/civclient.c:243
msgid ""
" -d, --debug NUM\tSet debug log level (0 to 4, or 4:file1,min,max:...)\n"
msgstr ""
" -d, --debug NUM\tNaplózási szint beállítása (0-tól 4-ig, vagy 4:file1,min,"
"max:...)\n"
-#: server/civserver.c:221 client/civclient.c:246
+#: server/civserver.c:225 client/civclient.c:247
msgid " -d, --debug NUM\tSet debug log level (0 to 3)\n"
msgstr " -d, --debug NUM\tNaplózási szint beállítása (0-tól 3-ig)\n"
-#: server/civserver.c:223
+#: server/civserver.c:227
msgid " -f, --file FILE\tLoad saved game FILE\n"
msgstr " -f, --file FÁJL\tA FÁJL játékállás betöltése\n"
-#: server/civserver.c:225 client/civclient.c:249 manual/civmanual.c:382
+#: server/civserver.c:229 client/civclient.c:250 manual/civmanual.c:382
msgid " -h, --help\t\tPrint a summary of the options\n"
msgstr " -h, --help\t\tAz összes opció kiíratása\n"
-#: server/civserver.c:226
+#: server/civserver.c:230
+#, fuzzy
+msgid " -i, --identity ADDR\tBe known as ADDR at metaserver\n"
+msgstr " -M, --Metaserver CÍM\tA CÍM használata metaszervercímként\n"
+
+#: server/civserver.c:231
msgid " -l, --log FILE\tUse FILE as logfile\n"
msgstr " -l, --log FÁJL\tA FÁJL használata naplófájlként\n"
-#: server/civserver.c:227
+#: server/civserver.c:232
#, fuzzy
msgid " -m, --meta\t\tNotify metaserver and send server's info\n"
msgstr " -m, --meta\t\tMetaszerver értesítése és szerverinfó elküldése\n"
-#: server/civserver.c:229
+#: server/civserver.c:234
msgid " -M, --Metaserver ADDR\tSet ADDR as metaserver address\n"
msgstr " -M, --Metaserver CÍM\tA CÍM használata metaszervercímként\n"
-#: server/civserver.c:232
+#: server/civserver.c:237
msgid " -p, --port PORT\tListen for clients on port PORT\n"
msgstr " -p, --port PORT\tA szerver a PORT porton figyeljen\n"
-#: server/civserver.c:234
+#: server/civserver.c:239
msgid " -q, --quitidle TIME\tQuit if no players for TIME seconds\n"
msgstr ""
" -q, --quitidle IDÕ\tKilépés, ha IDÕ másodpercig nincsenek játékosok\n"
-#: server/civserver.c:236
+#: server/civserver.c:241
msgid " -e, --exit-on-end\tWhen a game ends, exit instead of restarting\n"
msgstr ""
-#: server/civserver.c:239
+#: server/civserver.c:244
msgid " -s, --saves DIR\tSave games to directory DIR\n"
msgstr ""
-#: server/civserver.c:241
+#: server/civserver.c:246
#, fuzzy
msgid " -S, --Serverid ID\tSets the server id to ID\n"
msgstr ""
" -s, --server HOST\tA HOST címen található szerverhez való kapcsolódás\n"
-#: server/civserver.c:243
+#: server/civserver.c:248
msgid " -P, --Ppm\t\tSave ppms of the map when saving the game.\n"
msgstr ""
-#: server/civserver.c:244
+#: server/civserver.c:249
msgid " -r, --read FILE\tRead startup script FILE\n"
msgstr " -r, --read FÁJL\tA FÁJL inicializáló szkript futtatása\n"
-#: server/civserver.c:246
+#: server/civserver.c:251
#, fuzzy
msgid " -R, --Ranklog FILE\tUse FILE as ranking logfile\n"
msgstr " -l, --log FÁJL\tA FÁJL használata naplófájlként\n"
-#: server/civserver.c:247 client/civclient.c:268 manual/civmanual.c:383
+#: server/civserver.c:252 client/civclient.c:269 manual/civmanual.c:383
msgid " -v, --version\t\tPrint the version number\n"
msgstr " -v, --version\t\tVerziószám kiíratása\n"
-#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
+#: server/civserver.c:253 client/gui-gtk-2.0/gui_main.c:354
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, fuzzy, c-format
msgid "Report bugs at %s.\n"
msgstr "Hibajelentéseket a(z) <%s> címre küldj.\n"
-#: server/commands.c:28
+#: server/commands.c:29
msgid "Start the game, or restart after loading a savegame."
msgstr ""
"Játék elindítása, illetve betöltött játékállás esetén játék folytatása."
-#: server/commands.c:29
+#: server/commands.c:30
msgid ""
"This command starts the game. When starting a new game, it should be used "
"after all human players have connected, and AI players have been created (if "
@@ -2097,7 +2103,7 @@ msgstr ""
"már úgysem lenne hatása."
#. TRANS: translate text between <> only
-#: server/commands.c:42
+#: server/commands.c:44
msgid ""
"help\n"
"help commands\n"
@@ -2111,11 +2117,11 @@ msgstr ""
"help <parancsnév>\n"
"help <beállításnév>"
-#: server/commands.c:47
+#: server/commands.c:49
msgid "Show help about server commands and server options."
msgstr "Segítség megjelenítése a szerverparancsokról és szerverbeállításokról."
-#: server/commands.c:48
+#: server/commands.c:50
msgid ""
"With no arguments gives some introductory help. With argument \"commands\" "
"or \"options\" gives respectively a list of all commands or all options. "
@@ -2132,12 +2138,12 @@ msgstr ""
"és alapértelmezett értékét is. Az argumentum megadásánál rövidíthetünk, "
"feltéve hogy ez nem okoz kétértelmûséget."
-#: server/commands.c:63
+#: server/commands.c:66
#, fuzzy
msgid "Show a list of players, teams, connections, or scenarios."
msgstr "Játékosok vagy kapcsolódások kilistázása."
-#: server/commands.c:64
+#: server/commands.c:67
#, fuzzy
msgid ""
"Show a list of players in the game, teams of players, connections to the "
@@ -2148,20 +2154,20 @@ msgstr ""
"kapcsolódásokat. Az argumentum rövidíthetõ, 'players' az alapértelmezés, ha "
"hiányzik."
-#: server/commands.c:70
+#: server/commands.c:74
msgid "Quit the game and shutdown the server."
msgstr "Kilép a játékból és leállítja a szervert."
#. TRANS: translate text between <> only
-#: server/commands.c:74
+#: server/commands.c:79
msgid "cut <connection-name>"
msgstr "cut <kapcsolatnév>"
-#: server/commands.c:75
+#: server/commands.c:80
msgid "Cut a client's connection to server."
msgstr "Egy klienssel való kapcsolat megszakítása."
-#: server/commands.c:76
+#: server/commands.c:81
msgid ""
"Cut specified client's connection to the server, removing that client from "
"the game. If the game has not yet started that client's player is removed "
@@ -2175,7 +2181,7 @@ msgstr ""
"játékosnév argumentumot vár."
#. TRANS: translate text between <> only
-#: server/commands.c:83
+#: server/commands.c:89
msgid ""
"explain\n"
"explain <option-name>"
@@ -2183,11 +2189,11 @@ msgstr ""
"explain\n"
"explain <beállításnév>"
-#: server/commands.c:85
+#: server/commands.c:91
msgid "Explain server options."
msgstr "Magyarázat a szerverbeállításokhoz."
-#: server/commands.c:86
+#: server/commands.c:92
msgid ""
"The 'explain' command gives a subset of the functionality of 'help', and is "
"included for backward compatibility. With no arguments it gives a list of "
@@ -2202,7 +2208,7 @@ msgstr ""
"(ugyanúgy mint a 'help <beállításnév>' parancs)."
#. TRANS: translate text between <> only
-#: server/commands.c:93
+#: server/commands.c:100
msgid ""
"show\n"
"show <option-name>\n"
@@ -2212,11 +2218,11 @@ msgstr ""
"show <beállításnév>\n"
"show <beállításnév-elõtag>"
-#: server/commands.c:96
+#: server/commands.c:103
msgid "Show server options."
msgstr "Szerverbeállítások értékének megjelenítése."
-#: server/commands.c:97
+#: server/commands.c:104
msgid ""
"With no arguments, shows all server options (or available options, when used "
"by clients). With an argument, show only the named option, or options with "
@@ -2227,75 +2233,76 @@ msgstr ""
"használjuk). Ha argumentummal adjuk ki, akkor csak a megnevezett beállítás "
"értékét írja ki, illetve azokét, amelyek illeszkednek a megadott elõtagra."
-#: server/commands.c:102
+#: server/commands.c:110
msgid "wall <message>"
msgstr "wall <üzenet>"
-#: server/commands.c:103
+#: server/commands.c:111
msgid "Send message to all connections."
msgstr "Üzenetküldés az összes kapcsolódott kliensnek."
-#: server/commands.c:104
+#: server/commands.c:112
msgid ""
"For each connected client, pops up a window showing the message entered."
msgstr ""
"Minden kapcsolódott kliensnél felnyit egy ablakot, amelyben a megadott "
"üzenet látható."
-#: server/commands.c:108
+#: server/commands.c:117
msgid "vote yes|no [vote number]"
msgstr ""
-#: server/commands.c:109
+#: server/commands.c:118
#, fuzzy
msgid "Cast a vote."
msgstr "Partmenti városok"
-#: server/commands.c:111
+#: server/commands.c:120
#, 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."
+"A player with basic 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."
msgstr ""
-#: server/commands.c:121
+#: server/commands.c:131
msgid ""
"debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
"<player> | timing | info]"
msgstr ""
-#: server/commands.c:123
+#: server/commands.c:133
msgid "Turn on or off AI debugging of given entity."
msgstr ""
-#: server/commands.c:124
+#: server/commands.c:134
msgid ""
"Print AI debug information about given entity and turn continous debugging "
"output for this entity on or off."
msgstr ""
-#: server/commands.c:128
+#: server/commands.c:139
msgid "set <option-name> <value>"
msgstr "set <beállításnév> <érték>"
-#: server/commands.c:129
+#: server/commands.c:140
msgid "Set server option."
msgstr "Szerverbeállítások értékének megadása."
-#: server/commands.c:132
+#: server/commands.c:144
#, fuzzy
msgid "team <player> [team]"
msgstr "remove <játékosnév>"
-#: server/commands.c:133
+#: server/commands.c:145
msgid "Change, add or remove a player's team affiliation."
msgstr ""
-#: server/commands.c:134
+#: server/commands.c:146
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 "
@@ -2303,16 +2310,16 @@ msgid ""
"to achieve team victory with averaged individual scores."
msgstr ""
-#: server/commands.c:141
+#: server/commands.c:154
msgid "rulesetdir <directory>"
msgstr "rulesetdir <könyvtár>"
-#: server/commands.c:142
+#: server/commands.c:155
#, fuzzy
msgid "Choose new ruleset directory or modpack."
msgstr "A jelenlegi szabálykészlet könyvtár: \"%s\""
-#: server/commands.c:143
+#: server/commands.c:156
msgid ""
"Choose new ruleset directory or modpack. Calling this\n"
" without any arguments will show you the currently selected ruleset."
@@ -2321,15 +2328,15 @@ msgstr ""
"adjuk ki, akkor kíirja a jelenleg használt szabálykészletet."
#. TRANS: translate text between <> only
-#: server/commands.c:149
+#: server/commands.c:163
msgid "metainfo <meta-line>"
msgstr "metainfo <metainfó sor>"
-#: server/commands.c:150
+#: server/commands.c:164
msgid "Set metaserver info line."
msgstr "A metaszerveren megjelenõ infó sor beállítása."
-#: server/commands.c:151
+#: server/commands.c:165
msgid ""
"Set user defined metaserver info line. If parameter is omitted,\n"
"previously set metamessage will be removed. For most of the time\n"
@@ -2338,21 +2345,21 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:158
+#: server/commands.c:173
#, fuzzy
msgid "metapatch <meta-line>"
msgstr "metainfo <metainfó sor>"
-#: server/commands.c:159
+#: server/commands.c:174
#, fuzzy
msgid "Set metaserver patches line."
msgstr "A metaszerveren megjelenõ infó sor beállítása."
-#: server/commands.c:165
+#: server/commands.c:181
msgid "Control metaserver connection."
msgstr "A metaszerverrel való kapcsolat vezérlése."
-#: server/commands.c:166
+#: server/commands.c:182
msgid ""
"'metaconnection ?' reports on the status of the connection to metaserver.\n"
"'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2366,36 +2373,36 @@ msgstr ""
"való kapcsolatot."
#. TRANS: translate text between <> only
-#: server/commands.c:172
+#: server/commands.c:189
msgid "metaserver <address>"
msgstr "metaserver <cím>"
-#: server/commands.c:173
+#: server/commands.c:190
#, 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:177
+#: server/commands.c:195
msgid "aitoggle <player-name>"
msgstr "aitoggle <játékosnév>"
-#: server/commands.c:178
+#: server/commands.c:196
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:182
+#: server/commands.c:201
#, fuzzy
msgid "take [connection-name] <player-name>"
msgstr "create <játékosnév>"
-#: server/commands.c:183
+#: server/commands.c:202
#, 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:184
+#: server/commands.c:203
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 "
@@ -2405,16 +2412,16 @@ msgid ""
msgstr ""
#. TRANS: translate text between [] only
-#: server/commands.c:192
+#: server/commands.c:212
msgid "observe [connection-name] [player-name]"
msgstr ""
-#: server/commands.c:193
+#: server/commands.c:213
#, 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:194
+#: server/commands.c:214
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 "
@@ -2424,63 +2431,63 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:202
+#: server/commands.c:223
#, fuzzy
msgid "detach <connection-name>"
msgstr "cut <kapcsolatnév>"
-#: server/commands.c:203
+#: server/commands.c:224
msgid "detach from a player."
msgstr ""
-#: server/commands.c:204
+#: server/commands.c:225
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:209
+#: server/commands.c:231
msgid "create <player-name>"
msgstr "create <játékosnév>"
-#: server/commands.c:210
+#: server/commands.c:232
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:211
+#: server/commands.c:233
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:215
+#: server/commands.c:238
msgid ""
"away\n"
"away"
msgstr ""
-#: server/commands.c:217
+#: server/commands.c:240
msgid "Set yourself in away mode. The AI will watch your back."
msgstr ""
-#: server/commands.c:218
+#: server/commands.c:241
msgid "The AI will govern your nation but do minimal changes."
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:222
+#: server/commands.c:246
#, fuzzy
msgid ""
"novice\n"
"novice <player-name>"
msgstr "remove <játékosnév>"
-#: server/commands.c:224
+#: server/commands.c:248
#, 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:225
+#: server/commands.c:249
#, fuzzy
msgid ""
"With no arguments, sets all AI players to skill level 'novice', and sets the "
@@ -2493,7 +2500,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:231
+#: server/commands.c:256
msgid ""
"easy\n"
"easy <player-name>"
@@ -2501,11 +2508,11 @@ msgstr ""
"easy\n"
"easy <játékosnév>"
-#: server/commands.c:233
+#: server/commands.c:258
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:234
+#: server/commands.c:259
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 "
@@ -2517,7 +2524,7 @@ msgstr ""
"kijelölt játékos erõsségi szintjét állítja be."
#. TRANS: translate text between <> only
-#: server/commands.c:240
+#: server/commands.c:266
msgid ""
"normal\n"
"normal <player-name>"
@@ -2525,11 +2532,11 @@ msgstr ""
"normal\n"
"normal <játékosnév>"
-#: server/commands.c:242
+#: server/commands.c:268
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:243
+#: server/commands.c:269
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 +2548,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:249
+#: server/commands.c:276
msgid ""
"hard\n"
"hard <player-name>"
@@ -2549,11 +2556,11 @@ msgstr ""
"hard\n"
"hard <játékosnév>"
-#: server/commands.c:251
+#: server/commands.c:278
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:252
+#: server/commands.c:279
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 "
@@ -2565,7 +2572,7 @@ msgstr ""
"kijelölt játékos erõsségi szintjét állítja be."
#. TRANS: translate text between <> only
-#: server/commands.c:258
+#: server/commands.c:286
msgid ""
"experimental\n"
"experimental <player-name>"
@@ -2573,11 +2580,11 @@ msgstr ""
"experimental\n"
"experimental <játékosnév>"
-#: server/commands.c:260
+#: server/commands.c:288
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:261
+#: server/commands.c:289
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 "
@@ -2592,7 +2599,7 @@ msgstr ""
"ennek a beállításnak nincs hatása."
#. TRANS: translate text between <> only
-#: server/commands.c:269
+#: server/commands.c:298
msgid ""
"cmdlevel\n"
"cmdlevel <level>\n"
@@ -2606,18 +2613,20 @@ msgstr ""
"cmdlevel <szint> first\n"
"cmdlevel <szint> <kapcsolatnév>"
-#: server/commands.c:274
+#: server/commands.c:303
msgid "Query or set command access level access."
msgstr "Parancselérési szintek lekérdezése és beállítása."
-#: server/commands.c:275
+#: server/commands.c:304
#, fuzzy
msgid ""
"The command access level controls which server commands are available\n"
"to users via the client chatline. The available levels are:\n"
" none - no commands\n"
-" info - informational commands only\n"
+" info - informational or observer commands only\n"
+" basic - commands available to players in the game\n"
" ctrl - commands that affect the game and users\n"
+" admin - commands that affect server operation\n"
" hack - *all* commands - dangerous!\n"
"With no arguments, the current command access levels are reported.\n"
"With a single argument, the level is set for all existing connections,\n"
@@ -2659,20 +2668,20 @@ msgstr ""
"is) újra tud csatlakozni. Megjegyzés: a parancs kapcsolatnév, nem pedig "
"játékosnév argumentumot vár."
-#: server/commands.c:296
+#: server/commands.c:328
msgid "If there is none, become the game organizer with increased permissions."
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:301
+#: server/commands.c:334
msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
msgstr "timeoutincrease <kör> <körnövelés> <érték> <értékszorzó>."
-#: server/commands.c:302
+#: server/commands.c:335
msgid "See \"help timeoutincrease\"."
msgstr "Segítségért írd be: \"help timeoutincrease\"."
-#: server/commands.c:303
+#: server/commands.c:336
msgid ""
"Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
"<turn> and multiply <value> by <valuemult>. Use this command in concert "
@@ -2684,42 +2693,61 @@ msgstr ""
"argumentumok alapértelmezett értéke 0 0 0 1."
#. TRANS: translate text between <> only
-#: server/commands.c:309
+#: server/commands.c:343
+msgid ""
+"cancelvote\n"
+"cancelvote <vote number>\n"
+"cancelvote all\n"
+msgstr ""
+
+#: server/commands.c:346
+msgid "Cancel a running vote.\n"
+msgstr ""
+
+#: server/commands.c:347
+msgid ""
+"With no arguments this command removes your own vote. If you have an admin "
+"access level, you can cancel any vote by vote number, or all votes with the "
+"'all' argument."
+msgstr ""
+
+#. TRANS: translate text between <> only
+#: server/commands.c:354
#, fuzzy
msgid "endgame"
msgstr "Átnevezés"
-#: server/commands.c:310
+#: server/commands.c:355
#, 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:314
+#: server/commands.c:360
msgid "surrender"
msgstr ""
-#: server/commands.c:315
+#: server/commands.c:361
#, fuzzy
msgid "Concede the game."
msgstr "Játék befejezése."
-#: server/commands.c:316
+#: server/commands.c:362
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:322
+#: server/commands.c:369
msgid "remove <player-name>"
msgstr "remove <játékosnév>"
-#: server/commands.c:323
+#: server/commands.c:370
msgid "Fully remove player from game."
msgstr "Játékos teljes törlése a játékból."
-#: server/commands.c:324
+#: server/commands.c:371
msgid ""
"This *completely* removes a player from the game, including all cities and "
"units etc. Use with care!"
@@ -2728,7 +2756,7 @@ msgstr ""
"stb. együtt. Óvatosan használd!"
#. TRANS: translate text between <> only
-#: server/commands.c:329
+#: server/commands.c:377
msgid ""
"save\n"
"save <file-name>"
@@ -2736,11 +2764,11 @@ msgstr ""
"save\n"
"save <fájlnév>"
-#: server/commands.c:331
+#: server/commands.c:379
msgid "Save game to file."
msgstr "Játékállás elmentése fájlba."
-#: server/commands.c:332
+#: server/commands.c:380
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"
@@ -2758,7 +2786,7 @@ msgstr ""
"parancsot, miután a játékosok csatlakoztak."
#. TRANS: translate text between <> only
-#: server/commands.c:341
+#: server/commands.c:390
msgid ""
"load\n"
"load <file-name>"
@@ -2766,11 +2794,11 @@ msgstr ""
"load\n"
"load <fájlnév>"
-#: server/commands.c:343
+#: server/commands.c:392
msgid "Load game from file."
msgstr "Játékállás betöltése fájlból."
-#: server/commands.c:344
+#: server/commands.c:393
msgid ""
"Load a game from <file-name>. Any current data including players, rulesets "
"and server options are lost.\n"
@@ -2780,77 +2808,77 @@ msgstr ""
"szerverbeállításokat.\n"
#. TRANS: translate text between <> only
-#: server/commands.c:349
+#: server/commands.c:399
msgid "read <file-name>"
msgstr "read <fájlnév>"
-#: server/commands.c:350
+#: server/commands.c:400
msgid "Process server commands from file."
msgstr "Szerverparancsok végrehajtása egy fájlból."
#. TRANS: translate text between <> only
-#: server/commands.c:354
+#: server/commands.c:405
msgid "write <file-name>"
msgstr "write <fájlnév>"
-#: server/commands.c:355
+#: server/commands.c:406
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:359
+#: server/commands.c:411
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:363
+#: server/commands.c:416
msgid "Simply returns the id of the server."
msgstr ""
-#: server/connecthand.c:85
+#: server/connecthand.c:109
#, c-format
msgid "Welcome to the %s Server running at %s port %d."
msgstr "Üdvözöl a %s Szerver a(z) %s gépen (port: %d)."
-#: server/connecthand.c:89
+#: server/connecthand.c:113
#, c-format
msgid "Welcome to the %s Server at port %d."
msgstr "Üdvözöl a %s Szerver (port: %d)."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:97
+#: server/connecthand.c:121
#, fuzzy, c-format
msgid "(%d) %s: connected [%s]"
msgstr "(%d) Játék: %s játékossal nem áll fenn a kapcsolat %s."
-#: server/connecthand.c:104
+#: server/connecthand.c:128
#, c-format
msgid "Server: %s has connected from %s."
msgstr ""
-#: server/connecthand.c:145
+#: server/connecthand.c:175
#, fuzzy
msgid "Couldn't attach your connection to new player."
msgstr "%s visszautasítva: Nem csatlakozhatnak új játékosok."
-#: server/connecthand.c:165
+#: server/connecthand.c:199
#, c-format
msgid "You are logged in as '%s' connected to no player."
msgstr ""
-#: server/connecthand.c:169
+#: server/connecthand.c:203
#, c-format
msgid "You are logged in as '%s' connected to an anonymous player."
msgstr ""
-#: server/connecthand.c:174
+#: server/connecthand.c:208
#, c-format
msgid "You are logged in as '%s' connected to %s."
msgstr ""
-#: server/connecthand.c:187
+#: server/connecthand.c:221
#, c-format
msgid "Turn-blocking game play: waiting on %s to finish turn..."
msgstr ""
@@ -2858,50 +2886,50 @@ msgstr ""
"körét..."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:240
+#: server/connecthand.c:274
#, fuzzy, c-format
msgid "(%d) %s: connection request [%s]"
msgstr "(%d) %s csatlakozni szeretne a(z) %s címrõl"
-#: server/connecthand.c:266
+#: server/connecthand.c:300
#, fuzzy
msgid "The client is missing a capability that this server needs."
msgstr "A kliensbõl hiányzik egy képesség, amit a szerver megkövetel."
-#: server/connecthand.c:268 server/connecthand.c:279
+#: server/connecthand.c:302 server/connecthand.c:313
#, fuzzy, c-format
msgid "(%d) %s rejected: mismatched capabilities!"
msgstr ""
"(%d) %s visszautasítva: A szerver és a kliens képességei nem kompatibilisek."
-#: server/connecthand.c:277
+#: server/connecthand.c:311
#, fuzzy
msgid "This server is missing a capability that the client needs."
msgstr "A szerverbõl hiányzik egy képesség, amit a kliens megkövetel."
-#: server/connecthand.c:290
+#: server/connecthand.c:324
#, fuzzy
msgid "The username is invalid!"
msgstr "A(z) érvénytelen név"
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:292
+#: server/connecthand.c:326
#, fuzzy, c-format
msgid "(%d) %s rejected: invalid username [%s]"
msgstr "(%d) %s visszautasítva: A játék már fut, és a(z) %s ismeretlen név."
-#: server/connecthand.c:303
+#: server/connecthand.c:337
#, fuzzy
msgid "Your username is already connected!"
msgstr "Sajnálom, már kapcsolódott."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:305
+#: server/connecthand.c:339
#, fuzzy, c-format
msgid "(%d) %s rejected: duplicate username [%s]"
msgstr "(%d) %s visszautasítva: A játék már fut, és a(z) %s ismeretlen név."
-#: server/connecthand.c:335 server/connecthand.c:344
+#: server/connecthand.c:369 server/connecthand.c:378
#, c-format
msgid "Lost connection: %s."
msgstr "Megszakadt a(z) %s kapcsolat."
@@ -2918,114 +2946,114 @@ msgstr "Rendben. Szabv
msgid "For introductory help, type 'help'."
msgstr "Rövid segítségért írd be, hogy 'help'!"
-#: server/diplhand.c:164
+#: server/diplhand.c:167
#, fuzzy, c-format
msgid "The %s can't accept %s."
msgstr "A(z) %s felfedezték a(z) %s tudományt."
-#: server/diplhand.c:176
+#: server/diplhand.c:179
#, c-format
msgid "You don't have tech %s, you can't accept treaty."
msgstr "Nem ismered a(z) %s technológiát, nem kötheted meg az egyezményt."
-#: server/diplhand.c:185
+#: server/diplhand.c:188
msgid "City you are trying to give no longer exists, you can't accept treaty."
msgstr ""
"Olyan várost próbálsz adni, ami már nem létezik, nem kötheted meg az "
"egyezményt."
-#: server/diplhand.c:191
+#: server/diplhand.c:194
#, c-format
msgid "You are not owner of %s, you can't accept treaty."
msgstr "%s nem a te városod, nem kötheted meg az egyezményt."
-#: server/diplhand.c:197 server/diplhand.c:301
+#: server/diplhand.c:200 server/diplhand.c:304
#, c-format
msgid "Your capital (%s) is requested, you can't accept treaty."
msgstr "A fõvárosodat (%s) kéne odaadnod, nem kötheted meg az egyezményt."
-#: server/diplhand.c:224
+#: server/diplhand.c:227
msgid "You don't have enough gold, you can't accept treaty."
msgstr "Nincs elég pénzed, nem kötheted meg az egyezményt."
-#: server/diplhand.c:256 server/diplhand.c:261
+#: server/diplhand.c:259 server/diplhand.c:264
#, c-format
msgid "A treaty containing %d clause was agreed upon."
msgid_plural "A treaty containing %d clauses was agreed upon."
msgstr[0] "Egy %d pontból álló egyezmény köttetett meg."
-#: server/diplhand.c:277 server/diplhand.c:281
+#: server/diplhand.c:280 server/diplhand.c:284
#, fuzzy, c-format
msgid "One of the cities the %s are giving away is destroyed! Treaty canceled!"
msgstr ""
"Megsemmisült az egyik %s által felajánlott város! Az egyezmény visszavonva!"
-#: server/diplhand.c:288 server/diplhand.c:293
+#: server/diplhand.c:291 server/diplhand.c:296
#, c-format
msgid "The %s no longer control %s! Treaty canceled!"
msgstr "%2$s városa már nem a(z) %1$s kezén van! Az egyezmény visszavonva!"
-#: server/diplhand.c:331 server/diplhand.c:335
+#: server/diplhand.c:334 server/diplhand.c:338
#, c-format
msgid "The %s don't have the promised amount of gold! Treaty canceled!"
msgstr ""
"A(z) %s nem rendelkeznek a megígért aranymennyiséggel! Az egyezmény "
"visszavonva!"
-#: server/diplhand.c:364
+#: server/diplhand.c:367
#, fuzzy, c-format
msgid "You gave an embassy to %s."
msgstr "Nagykövetséget alapítottál %s városában."
-#: server/diplhand.c:367
+#: server/diplhand.c:370
#, c-format
msgid "%s allowed you to create an embassy!"
msgstr ""
-#: server/diplhand.c:383
+#: server/diplhand.c:386
#, c-format
msgid "You are taught the knowledge of %s."
msgstr "Megkaptad a(z) %s tudományt."
-#: server/diplhand.c:387
+#: server/diplhand.c:390
#, c-format
msgid "The %s have acquired %s from the %s."
msgstr "A(z) %s megszerezték a(z) %s tudományt a(z) %s népétõl."
-#: server/diplhand.c:402
+#: server/diplhand.c:405
#, c-format
msgid "You get %d gold."
msgstr "Kapsz %d aranyat."
#. TRANS: ... Polish worldmap.
-#: server/diplhand.c:410
+#: server/diplhand.c:413
#, fuzzy, c-format
msgid "You receive the %s worldmap."
msgstr "Megkapod %s világtérképét."
#. TRANS: ... Polish seamap.
-#: server/diplhand.c:419
+#: server/diplhand.c:422
#, fuzzy, c-format
msgid "You receive the %s seamap."
msgstr "Megkapod %s hajózási térképét."
-#: server/diplhand.c:436
+#: server/diplhand.c:439
#, c-format
msgid "You receive city of %s from %s."
msgstr "%2$s átadja neked %1$s városát."
-#: server/diplhand.c:441
+#: server/diplhand.c:444
#, c-format
msgid "You give city of %s to %s."
msgstr "%2$s megkapja tõled %1$s városát."
-#: server/diplhand.c:454 server/diplhand.c:457
+#: server/diplhand.c:457 server/diplhand.c:460
#, c-format
msgid "You agree on a cease-fire with %s."
msgstr "Tûzszünetet kötöttél %s játékossal."
#. TRANS: ... the Poles ... Polish territory.
-#: server/diplhand.c:476 server/diplhand.c:488
+#: server/diplhand.c:479 server/diplhand.c:491
#, c-format
msgid ""
"You agree on an armistice with the %s. In %d turn, it will become a peace "
@@ -3035,32 +3063,32 @@ msgid_plural ""
"treaty. Move your units out of %s territory."
msgstr[0] ""
-#: server/diplhand.c:512 server/diplhand.c:515
+#: server/diplhand.c:515 server/diplhand.c:518
#, c-format
msgid "You agree on an alliance with %s."
msgstr "Szövetséget kötöttél %s játékossal."
-#: server/diplhand.c:524
+#: server/diplhand.c:527
#, c-format
msgid "You give shared vision to %s."
msgstr "Közös látványt biztosítasz %s számára."
-#: server/diplhand.c:527
+#: server/diplhand.c:530
#, c-format
msgid "%s gives you shared vision."
msgstr "%s közös látványt biztosít neked."
-#: server/diplhand.c:663
+#: server/diplhand.c:666
#, c-format
msgid "%s canceled the meeting!"
msgstr "%s megszakította a találkozót!"
-#: server/diplhand.c:670
+#: server/diplhand.c:673
#, c-format
msgid "Meeting with %s canceled."
msgstr "Megszakítottuk a találkozót %s játékossal."
-#: server/diplhand.c:712
+#: server/diplhand.c:715
msgid "Your diplomatic envoy was decapitated!"
msgstr ""
@@ -3255,87 +3283,87 @@ msgid "The %s destroyed the %s in %s."
msgstr "A(z) %s megsemmisítették a(z) %s épületet %s városában."
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1091
+#: server/diplomats.c:1097
#, fuzzy, c-format
msgid "An enemy %s has been eliminated by your %s."
msgstr "Egy támadó %s megsemmisített egy védõ egységedet %s városában."
#. TRANS: <unit> ... <city> ... <diplomat>
-#: server/diplomats.c:1098
+#: server/diplomats.c:1104
#, fuzzy, c-format
msgid "Your %s has been eliminated defending %s against a %s."
msgstr ""
"Egy támadó %2$s megsemmisített egy védõ %1$s egységedet %3$s városában."
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1106
+#: server/diplomats.c:1112
#, fuzzy, c-format
msgid "Your %s has been eliminated defending against a %s."
msgstr "Egy támadó megsemmisített egy védõ %s egységedet %s városában."
-#: server/diplomats.c:1119
+#: server/diplomats.c:1125
#, fuzzy, c-format
msgid "Your %s was eliminated by a defending %s."
msgstr "A %s egységedet elfogta egy védõ %s városában."
-#: server/diplomats.c:1127
+#: server/diplomats.c:1133
#, c-format
msgid "Eliminated %s %s while infiltrating %s."
msgstr ""
"Elfogtak egy %s %s egységet, miközben megpróbált beépülni az ellenséghez %s "
"városában."
-#: server/diplomats.c:1134
+#: server/diplomats.c:1140
#, fuzzy, c-format
msgid "Eliminated %s %s while infiltrating our troops."
msgstr ""
"Elfogtak egy %s %s egységet, miközben megpróbált beépülni az ellenséghez %s "
"városában."
-#: server/diplomats.c:1185
+#: server/diplomats.c:1191
#, fuzzy, c-format
msgid ""
"Your %s has successfully completed the mission and returned unharmed to %s."
msgstr "A %s teljesítette a küldetését és sértetlenül visszatért %s városába."
-#: server/diplomats.c:1204
+#: server/diplomats.c:1210
#, fuzzy, c-format
msgid "Your %s was captured after completing the mission in %s."
msgstr ""
"A %s egységedet elfogták %s városában, miután teljesítette a küldetését."
-#: server/diplomats.c:1210
+#: server/diplomats.c:1216
#, fuzzy, c-format
msgid "Your %s was captured after completing the mission."
msgstr "A %s egységedet elfogták, miután teljesítette a küldetését."
-#: server/diplomats.c:1242
+#: server/diplomats.c:1248
#, fuzzy, c-format
msgid "You have caused an incident while bribing the %s %s."
msgstr "%s %s egységének lefizetésével diplomáciai incidenst okozotál."
-#: server/diplomats.c:1247
+#: server/diplomats.c:1253
#, c-format
msgid "%s has caused an incident while bribing your %s."
msgstr "%s diplomáciai incidenst okozott egy %s egységed lefizetésével."
-#: server/diplomats.c:1254
+#: server/diplomats.c:1260
#, fuzzy, c-format
msgid "You have caused an incident while attempting to steal tech from %s."
msgstr ""
"A(z) %s játékostól való tudománylopással diplomáciai incidenst okoztál."
-#: server/diplomats.c:1258
+#: server/diplomats.c:1264
#, fuzzy, c-format
msgid "%s has caused an incident while attempting to steal tech from you."
msgstr "%s diplomáciai incidenst okozott a tudománylopással."
-#: server/diplomats.c:1264
+#: server/diplomats.c:1270
#, c-format
msgid "You have caused an incident while inciting a revolt in %s."
msgstr "A(z) %si lázadás kirobbantásával diplomáciai incidenst okoztál."
-#: server/diplomats.c:1268
+#: server/diplomats.c:1274
#, c-format
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."
@@ -3450,14 +3478,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:1418
+#: server/maphand.c:1425
#, 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:1436
+#: server/maphand.c:1443
#, fuzzy, c-format
msgid "Disbanded your %s due to changing terrain."
msgstr ""
@@ -3468,7 +3496,7 @@ msgstr ""
msgid "Not reporting to the metaserver in this game."
msgstr "Nincs jelentés a metaszervernek ebben a játékban."
-#: server/meta.c:430
+#: server/meta.c:432
#, fuzzy, c-format
msgid "Metaserver: bad address: [%s:%d]."
msgstr "Metaszerver: rossz cím: [%s]."
@@ -3593,54 +3621,54 @@ msgid ""
"with %s."
msgstr ""
-#: server/plrhand.c:1103
+#: server/plrhand.c:1115
#, c-format
msgid "Removing player %s."
msgstr "%s játékos törlése."
-#: server/plrhand.c:1105
+#: server/plrhand.c:1117
msgid "You've been removed from the game!"
msgstr "Kiutasítottak a játékból!"
-#: server/plrhand.c:1108
+#: server/plrhand.c:1120
#, 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:1153 server/plrhand.c:1158
+#: server/plrhand.c:1167 server/plrhand.c:1172
#, 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:1178
+#: server/plrhand.c:1192
#, c-format
msgid ""
"%s and %s meet and go to instant war. You cancel your alliance with both."
msgstr ""
-#: server/plrhand.c:1656
+#: server/plrhand.c:1670
#, c-format
msgid "Could not throw %s into civil war - too many players"
msgstr ""
-#: server/plrhand.c:1663
+#: server/plrhand.c:1677
#, c-format
msgid "Could not throw %s into civil war - no available nations"
msgstr ""
-#: server/plrhand.c:1686
+#: server/plrhand.c:1700
#, fuzzy, 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:1707
+#: server/plrhand.c:1721
#, c-format
msgid "%s declares allegiance to %s."
msgstr "%s hûségesküt tesz le %s mellett."
-#: server/plrhand.c:1722
+#: server/plrhand.c:1736
#, fuzzy, c-format
msgid ""
"Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3834,65 +3862,65 @@ msgstr "(%2$s v
msgid "Wonders of the World"
msgstr "A Világ Csodái"
-#: server/report.c:547
+#: server/report.c:552
msgid " sq. mi."
msgstr " négyzetmérföld"
-#: server/report.c:557
+#: server/report.c:562
msgid " M tons"
msgstr " millió tonna"
-#: server/report.c:562
+#: server/report.c:567
msgid " M goods"
msgstr " millió termék"
-#: server/report.c:567
+#: server/report.c:572
msgid " bulbs"
msgstr ""
-#: server/report.c:572
+#: server/report.c:577
msgid " month"
msgid_plural " months"
msgstr[0] " hónap"
-#: server/report.c:577
+#: server/report.c:582
msgid " ton"
msgid_plural " tons"
msgstr[0] " tonna"
-#: server/report.c:591
+#: server/report.c:596
msgid "st"
msgstr "."
-#: server/report.c:593
+#: server/report.c:598
msgid "nd"
msgstr "."
-#: server/report.c:595
+#: server/report.c:600
msgid "rd"
msgstr "."
-#: server/report.c:597
+#: server/report.c:602
msgid "th"
msgstr "."
-#: server/report.c:700
+#: server/report.c:705
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:743 server/report.c:768
+#: server/report.c:748 server/report.c:773
msgid "Demographics Report:"
msgstr "Demográfiai jelentés:"
-#: server/report.c:744
+#: server/report.c:749
msgid "Sorry, the Demographics report is unavailable."
msgstr "Sajnálom, a Demográfiai jelentés nem elérhetõ."
#. TRANS: <nation adjective> <government name> (<year>).
#. * E.g. "Polish Despotism (200 AD)".
-#: server/report.c:750
+#: server/report.c:755
#, fuzzy, c-format
msgid "%s %s (%s)"
msgstr "A(z) %2$si %1$s (%3$s)\n"
@@ -3905,11 +3933,11 @@ msgstr ""
"Nem sikerült megtalálni a(z) \"%s\" szabálykészletfájlt. (Vagy a fájl nem "
"olvasható.)"
-#: server/ruleset.c:2356
+#: server/ruleset.c:2366
msgid "No barbarian nation in rulesets, at least one required!"
msgstr ""
-#: server/ruleset.c:3166
+#: server/ruleset.c:3178
msgid "Loading rulesets"
msgstr "Szabályok betöltése"
@@ -3925,13 +3953,13 @@ 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:3588
+#: server/savegame.c:3587
#, 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."
#. TRANS: Fatal error message.
-#: server/savegame.c:3815
+#: server/savegame.c:3817
#, fuzzy
msgid ""
"Saved game uses the \"classic\" terrain ruleset, and is no longer supported."
@@ -3939,7 +3967,7 @@ msgstr ""
"A játékállás a már nem támogatott klasszikus terep szabálykészletet "
"használja."
-#: server/savegame.c:3824
+#: server/savegame.c:3826
#, c-format
msgid ""
"Warning: Different rulesetdirs ('%s' and '%s') are no longer supported. "
@@ -3949,7 +3977,7 @@ msgstr ""
"s' használata."
#. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4051
+#: server/savegame.c:4055
#, c-format
msgid "%s had invalid nation; changing to %s."
msgstr ""
@@ -3987,7 +4015,7 @@ msgstr "Ipari"
msgid "Networking"
msgstr ""
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:734
#: client/gui-win32/dialogs.c:532
#, fuzzy
msgid "All"
@@ -5158,13 +5186,13 @@ msgstr ""
"\"civscore.log\" fájl végére. Ezek a statisztikák fejlõdési grafikonok "
"készítéséhez használhatók fel a játék után."
-#: server/sernet.c:150
+#: server/sernet.c:151
msgid "Server cannot read standard input. Ignoring input."
msgstr ""
"A szerver nem tudja olvasni a standard bemenetet. Bemenet figyelmen kívül "
"hagyása."
-#: server/sernet.c:929
+#: server/sernet.c:933
#, fuzzy, c-format
msgid "Server: bad address: [%s:%d]."
msgstr "Metaszerver: rossz cím: [%s]."
@@ -5240,36 +5268,36 @@ msgstr "Az
msgid "Without guidance from the capital, the %s spaceship is lost!"
msgstr "A fõváros irányítása nélkül a(z) %s ûrhajó elveszett!"
-#: server/srv_main.c:240
+#: server/srv_main.c:242
msgid "Game ended in a draw as end year exceeded"
msgstr ""
-#: server/srv_main.c:274
+#: server/srv_main.c:276
#, c-format
msgid "The %s spaceship has arrived at Alpha Centauri."
msgstr "A(z) %s ûrhajó megérkezett az Alpha Centaurira."
-#: server/srv_main.c:287 server/srv_main.c:322
+#: server/srv_main.c:289 server/srv_main.c:324
#, fuzzy, c-format
msgid "Team victory to %s"
msgstr "Átalakít %s tereptípusra"
-#: server/srv_main.c:297 server/srv_main.c:338
+#: server/srv_main.c:299 server/srv_main.c:340
#, c-format
msgid "Game ended in victory for %s"
msgstr ""
-#: server/srv_main.c:345
+#: server/srv_main.c:347
#, fuzzy
msgid "Game ended in a draw"
msgstr "Játék vége"
-#: server/srv_main.c:461 server/srv_main.c:472
+#: server/srv_main.c:465 server/srv_main.c:476
#, c-format
msgid "Your %s was disbanded in accordance with your peace treaty with the %s."
msgstr ""
-#: server/srv_main.c:512 server/srv_main.c:516
+#: server/srv_main.c:516 server/srv_main.c:520
#, c-format
msgid ""
"Concerned citizens point out that the cease-fire with %s will run out soon."
@@ -5277,14 +5305,14 @@ msgstr ""
"Az aggódó állampolgárok arra hívják fel a figyelmedet, hogy a(z) %s "
"játékossal kötött tûzszüneti megállapodás hamarosan érvényét veszti."
-#: server/srv_main.c:521 server/srv_main.c:525
+#: server/srv_main.c:525 server/srv_main.c:529
#, fuzzy, c-format
msgid "The cease-fire with %s has run out. You are now at war with the %s."
msgstr ""
"Lejárt a(z) %s játékossal kötött tûzszünet. Mostantól semleges vagy a(z) %s "
"felé."
-#: server/srv_main.c:542
+#: server/srv_main.c:546
#, fuzzy, c-format
msgid ""
"Ceasefire between %s and %s has run out. They are at war. You cancel your "
@@ -5293,346 +5321,336 @@ msgstr ""
"Lejárt a(z) %s játékossal kötött tûzszünet. Mostantól semleges vagy a(z) %s "
"felé."
-#: server/srv_main.c:961
+#: server/srv_main.c:997
#, c-format
msgid "Failed saving game as %s"
msgstr "Nem sikerült elmenteni a játékállást %s néven"
-#: server/srv_main.c:963
+#: server/srv_main.c:999
#, c-format
msgid "Game saved as %s"
msgstr "A játékállást elmentettem %s néven"
-#: server/srv_main.c:994
+#: server/srv_main.c:1030
msgid "The game is already running."
msgstr "A játék már fut."
-#: server/srv_main.c:1002
+#: server/srv_main.c:1038
#, c-format
msgid "%s lost control cmdlevel on game start. Use voting from now on."
msgstr ""
-#: server/srv_main.c:1009
+#: server/srv_main.c:1045
msgid "Starting game."
msgstr "Játék indítása."
-#: server/srv_main.c:1071
+#: server/srv_main.c:1112
#, c-format
msgid "request for unknown report (type %d)"
msgstr ""
-#: server/srv_main.c:1136
+#: server/srv_main.c:1177
#, fuzzy, c-format
msgid "Warning: rejecting old client %s"
msgstr "Figyelmeztetés: Éhínség van %s városában."
-#: server/srv_main.c:1238
+#: server/srv_main.c:1279
#, 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:1338
+#: server/srv_main.c:1381
msgid "Please choose a non-blank name."
msgstr "Nem üres nevet válassz."
-#: server/srv_main.c:1354
+#: server/srv_main.c:1397
#, fuzzy
msgid "That nation is already in use."
msgstr "A játék már fut."
-#: server/srv_main.c:1370
+#: server/srv_main.c:1413
#, 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:1391
+#: server/srv_main.c:1434
#, fuzzy
msgid "Please choose a name containing only ASCII characters."
msgstr "Nem üres nevet válassz."
-#: server/srv_main.c:1490
+#: server/srv_main.c:1533
#, c-format
msgid "%s nation is not available in this scenario."
msgstr ""
-#: server/srv_main.c:1496
+#: server/srv_main.c:1539
#, fuzzy, c-format
msgid "%s nation is already in use."
msgstr "A játék már fut."
-#: server/srv_main.c:1514
+#: server/srv_main.c:1557
#, c-format
msgid "%s is the %s ruler %s."
msgstr "%s a(z) %s uralkodó %s néven."
-#: server/srv_main.c:1570
+#: server/srv_main.c:1613
#, 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:1614 server/srv_main.c:1618
+#: server/srv_main.c:1657 server/srv_main.c:1661
#, 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:1760
+#: server/srv_main.c:1803
#, c-format
msgid "Player %d"
msgstr "%d. Játékos"
-#: server/srv_main.c:1771 server/srv_main.c:1777
+#: server/srv_main.c:1814 server/srv_main.c:1820
#, c-format
msgid "%s rules the %s."
msgstr "%s a(z) %s uralkodója."
-#: server/srv_main.c:1942
+#: server/srv_main.c:1985
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
msgstr ""
-#: server/srv_main.c:1993
+#: server/srv_main.c:2037
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr "Információ küldése a metszervernek [%s]"
-#: server/srv_main.c:2024
+#: server/srv_main.c:2069
msgid "The game is over..."
msgstr "Vége a játéknak..."
-#: server/srv_main.c:2237
+#: server/srv_main.c:2286
msgid "Now accepting new client connections."
msgstr "Most fogadom a kliensek kapcsolódását."
-#: server/stdinhand.c:246
-#, c-format
-msgid "Vote \"%s\" is passed %d to %d with %d abstentions."
-msgstr ""
-
-#: server/stdinhand.c:253
-#, c-format
-msgid "Vote \"%s\" failed with %d against, %d for and %d abstentions."
-msgstr ""
-
#. TRANS: ambiguous command
-#: server/stdinhand.c:365
+#: server/stdinhand.c:284
msgid "(ambiguous)"
msgstr "(kétértelmû)"
#. TRANS: unrecognized command
#. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:416
+#: server/stdinhand.c:287 client/citydlg_common.c:419
#: 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 "(ismeretlen)"
-#: server/stdinhand.c:458
+#: server/stdinhand.c:377
msgid "Name is empty, so cannot be a player."
msgstr "A név üres, ezért nem lehet egy játékos neve."
-#: server/stdinhand.c:462
+#: server/stdinhand.c:381
msgid "Name is too long, so cannot be a player."
msgstr "A név túl hosszú, ezért nem lehet egy játékos neve."
-#: server/stdinhand.c:466
+#: server/stdinhand.c:385
#, c-format
msgid "Player name prefix '%s' is ambiguous."
msgstr "A(z) '%s' játékosnév-prefix nem egyértelmû."
-#: server/stdinhand.c:470
+#: server/stdinhand.c:389
#, c-format
msgid "No player by the name of '%s'."
msgstr "Nincs '%s' nevû játékos."
-#: server/stdinhand.c:474 server/stdinhand.c:509
+#: server/stdinhand.c:393 server/stdinhand.c:428
#, c-format
msgid "Unexpected match_result %d (%s) for '%s'."
msgstr "'%3$s' esetén ismeretlen illesztési eredmény született: %1$d (%2$s)."
-#: server/stdinhand.c:493
+#: server/stdinhand.c:412
msgid "Name is empty, so cannot be a connection."
msgstr "A név üres, ezért nem lehet egy kapcsolat neve."
-#: server/stdinhand.c:497
+#: server/stdinhand.c:416
msgid "Name is too long, so cannot be a connection."
msgstr "A név túl hosszú, ezért nem lehet egy kapcsolat neve."
-#: server/stdinhand.c:501
+#: server/stdinhand.c:420
#, c-format
msgid "Connection name prefix '%s' is ambiguous."
msgstr "A(z) '%s' kapcsolatnév-prefix nem egyértelmû."
-#: server/stdinhand.c:505
+#: server/stdinhand.c:424
#, c-format
msgid "No connection by the name of '%s'."
msgstr "Nincs '%s' nevû kapcsolat."
-#: server/stdinhand.c:525
+#: server/stdinhand.c:444
#, c-format
msgid "Open metaserver connection to [%s]."
msgstr "Kapcsolat kezdeményezése a metaszerverrel [%s]."
-#: server/stdinhand.c:538
+#: server/stdinhand.c:457
#, c-format
msgid "Close metaserver connection to [%s]."
msgstr "Kapcsolat bontása a metaszerverrel [%s]."
-#: server/stdinhand.c:553
+#: server/stdinhand.c:472
msgid "Metaserver connection is open."
msgstr "A metaszerver kapcsolat nyitva van."
-#: server/stdinhand.c:556
+#: server/stdinhand.c:475
msgid "Metaserver connection is closed."
msgstr "A metaszerver kapcsolat zárva van."
-#: server/stdinhand.c:566
+#: server/stdinhand.c:485
msgid "Metaserver connection is already open."
msgstr "A metaszerver kapcsolat már nyitva van."
-#: server/stdinhand.c:577
+#: server/stdinhand.c:496
msgid "Metaserver connection is already closed."
msgstr "A metaszerver kapcsolat már zárva van."
-#: server/stdinhand.c:582
+#: server/stdinhand.c:501
msgid "Argument must be 'u', 'up', 'd', 'down', or '?'."
msgstr "Argumentumként 'u', 'up', 'd', 'down' vagy '?' adható meg."
-#: server/stdinhand.c:603
+#: server/stdinhand.c:522
#, fuzzy, c-format
msgid "Metaserver patches string set to '%s'."
msgstr "Az infó sor a metaszerveren mostantól '%s'."
-#: server/stdinhand.c:606
+#: server/stdinhand.c:525
#, c-format
msgid "Metaserver patches string set to '%s', not reporting to metaserver."
msgstr ""
-#: server/stdinhand.c:627
+#: server/stdinhand.c:546
#, fuzzy, c-format
msgid "Metaserver message string set to '%s'."
msgstr "Az infó sor a metaszerveren mostantól '%s'."
-#: server/stdinhand.c:630
+#: server/stdinhand.c:549
#, c-format
msgid "Metaserver message string set to '%s', not reporting to metaserver."
msgstr ""
-#: server/stdinhand.c:650
+#: server/stdinhand.c:569
#, c-format
msgid "Metaserver is now [%s]."
msgstr "A metaszerver mostantól [%s]."
-#: server/stdinhand.c:660
+#: server/stdinhand.c:579
#, fuzzy, c-format
msgid "Server id: %s"
msgstr "Szerveroperátor: %s"
-#: server/stdinhand.c:757
+#: server/stdinhand.c:676
#, fuzzy
msgid "You cannot save games manually on this server."
msgstr "Kilép a játékból és leállítja a szervert."
-#: server/stdinhand.c:774
+#: server/stdinhand.c:693
msgid "Cannot toggle a barbarian player."
msgstr "Barbár játékos MI irányítását nem lehet kikapcsolni."
-#: server/stdinhand.c:781
+#: server/stdinhand.c:700
#, c-format
msgid "%s is now under AI control."
msgstr "%s mostantól MI irányítás alatt áll."
-#: server/stdinhand.c:802
+#: server/stdinhand.c:721
#, c-format
msgid "%s is now under human control."
msgstr "%s mostantól emberi irányítás alatt áll."
-#: server/stdinhand.c:847
+#: server/stdinhand.c:766
msgid "Can't add AI players once the game has begun."
msgstr "A játék elkezdõdése után nem lehet MI játékosokat hozzáadni."
-#: server/stdinhand.c:867
+#: server/stdinhand.c:786
msgid "Can't add more players, server is full."
msgstr "Nem lehet több játékost hozzáadni, a szerver megtelt."
-#: server/stdinhand.c:874
+#: server/stdinhand.c:793
msgid "Can't use an empty name."
msgstr "Nem lehet üres nevet használni."
-#: server/stdinhand.c:881
+#: server/stdinhand.c:800
#, c-format
msgid "That name exceeds the maximum of %d chars."
msgstr "Ez a név túllépi a megengedett %d karakter hosszt."
-#: server/stdinhand.c:887
+#: server/stdinhand.c:806
#, fuzzy
msgid "That name is not allowed."
msgstr "Milyen típusú kapcsolódások engedélyezettek"
-#: server/stdinhand.c:893
+#: server/stdinhand.c:812
msgid "A player already exists by that name."
msgstr "Van már ilyen nevû játékos."
-#: server/stdinhand.c:899
+#: server/stdinhand.c:818
#, fuzzy
msgid "A user already exists by that name."
msgstr "Van már ilyen nevû játékos."
-#: server/stdinhand.c:925
+#: server/stdinhand.c:844
#, c-format
msgid "%s has been added as an AI-controlled player."
msgstr "A szerver felvette a játékba %s MI irányította játékost."
-#: server/stdinhand.c:932
+#: server/stdinhand.c:851
#, c-format
msgid "Error creating new AI player: %s."
msgstr "Hiba történt %s MI játékos létrehozása közben."
-#: server/stdinhand.c:966
+#: server/stdinhand.c:885
msgid "Players cannot be removed once the game has started."
msgstr "A játék elkezdõdése után nem lehet már eltávolítani játékosokat."
-#: server/stdinhand.c:977
+#: server/stdinhand.c:896
#, c-format
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:3356 server/stdinhand.c:3469
+#: server/stdinhand.c:935 server/stdinhand.c:3372 server/stdinhand.c:3507
#, c-format
msgid "Name \"%s\" disallowed for security reasons."
msgstr ""
-#: server/stdinhand.c:1029
+#: server/stdinhand.c:948
#, fuzzy, c-format
msgid "No command script found by the name \"%s\"."
msgstr "Nincs '%s' nevû kapcsolat."
-#: server/stdinhand.c:1037
+#: server/stdinhand.c:956
#, c-format
msgid "Loading script file: %s"
msgstr "A(z) %s parancsfájl (script) betöltése"
-#: server/stdinhand.c:1052
+#: server/stdinhand.c:971
#, c-format
msgid "Cannot read command line scriptfile '%s'."
msgstr "Nem sikerült beolvasni a(z) '%s' parancsfájlt."
-#: server/stdinhand.c:1054
+#: server/stdinhand.c:973
#, c-format
msgid "Could not read script file '%s'."
msgstr "Nem sikerült beolvasni a(z) '%s' parancsfájlt."
-#: server/stdinhand.c:1146
+#: server/stdinhand.c:1065
#, c-format
msgid "Could not write script file '%s'."
msgstr "Nem sikerült elkészíteni a(z) '%s' parancsfájlt."
-#: server/stdinhand.c:1158
+#: server/stdinhand.c:1077
msgid "You cannot use the write command on this server for security reasons."
msgstr ""
-#: server/stdinhand.c:1186
+#: server/stdinhand.c:1105
#, c-format
msgid ""
"Cannot decrease command access level '%s' for connection '%s'; you only have "
@@ -5641,7 +5659,12 @@ msgstr ""
"Nem sikerült csökkenteni a(z) '%2$s' kapcsolat parancselérési szintjét ('%1"
"$s'); csak '%3$s' szinttel rendelkezel."
-#: server/stdinhand.c:1241
+#: server/stdinhand.c:1114
+#, 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:1163
#, fuzzy, c-format
msgid ""
"Anyone can now become game organizer '%s' by issuing the 'first' command."
@@ -5649,27 +5672,27 @@ msgstr ""
"Most bárki felveheti a(z) '%s' parancselérési szintet a 'firstlevel' parancs "
"kiadásával."
-#: server/stdinhand.c:1274
+#: server/stdinhand.c:1187
msgid "Command access levels in effect:"
msgstr "A jelenleg érvényben lévõ parancselérési szintek:"
-#: server/stdinhand.c:1282
+#: server/stdinhand.c:1194
#, c-format
msgid "Command access level for new connections: %s"
msgstr "Parancselérési szint az új kapcsolatok számára: %s."
-#: server/stdinhand.c:1285
+#: server/stdinhand.c:1197
#, c-format
msgid "Command access level for first player to take it: %s"
msgstr "Parancselérési szint az elsõ játékos számára: %s"
-#: server/stdinhand.c:1294
+#: server/stdinhand.c:1206
msgid ""
"Error: command access level must be one of 'none', 'info', 'ctrl', or 'hack'."
msgstr ""
"Hiba: a parancselérési szint csak 'none', 'info', 'ctrl' vagy 'hack' lehet."
-#: server/stdinhand.c:1299
+#: server/stdinhand.c:1211
#, c-format
msgid ""
"Cannot increase command access level to '%s'; you only have '%s' yourself."
@@ -5677,419 +5700,473 @@ msgstr ""
"Nem sikerült '%s' szintre növelni a parancselérési szintet; csak '%s' "
"szinttel rendelkezel."
-#: 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: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:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
+#: server/stdinhand.c:1238 server/stdinhand.c:1252 server/stdinhand.c:1273
#, 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:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
+#: server/stdinhand.c:1243 server/stdinhand.c:1257 server/stdinhand.c:1267
#, 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:1402
+#: server/stdinhand.c:1302
#, 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:1406
+#: server/stdinhand.c:1306
#, 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:1411
+#: server/stdinhand.c:1311
#, fuzzy
msgid "Someone else already is game organizer."
msgstr "Sajnálom, ez már valaki másnak a neve."
-#: server/stdinhand.c:1416
+#: server/stdinhand.c:1316
#, c-format
msgid "Connection %s has opted to become the game organizer."
msgstr ""
-#: server/stdinhand.c:1467
+#: server/stdinhand.c:1367
#, c-format
msgid "Invalid argument %d."
msgstr "Érvénytelen argumentum: %d."
-#: server/stdinhand.c:1474
+#: server/stdinhand.c:1374
msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
msgstr "Használat: timeoutincrease <kör> <körnövelés> <érték> <értékszorzó>."
-#: server/stdinhand.c:1482
+#: server/stdinhand.c:1382
#, 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:1542 server/stdinhand.c:1545
+#: server/stdinhand.c:1442 server/stdinhand.c:1445
msgid "Option:"
msgstr "Beállítás:"
-#: server/stdinhand.c:1555 server/stdinhand.c:4031
+#: server/stdinhand.c:1455 server/stdinhand.c:4079
msgid "Description:"
msgstr "Leírás:"
-#: server/stdinhand.c:1560
+#: server/stdinhand.c:1460
#, c-format
msgid "Status: %s"
msgstr "Státusz: %s"
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "changeable"
msgstr "változtatható"
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "fixed"
msgstr "fix"
-#: server/stdinhand.c:1567
+#: server/stdinhand.c:1467
#, 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:1572
+#: server/stdinhand.c:1472
#, 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:1578
+#: server/stdinhand.c:1478
#, c-format
msgid "Value: \"%s\", Default: \"%s\""
msgstr "Érték: \"%s\", Alapértelmezés: \"%s\""
-#: server/stdinhand.c:1597
+#: server/stdinhand.c:1497
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:1643
+#: server/stdinhand.c:1537
msgid "No explanation for that yet."
msgstr "Még nincs hozzá leírás."
-#: server/stdinhand.c:1646 server/stdinhand.c:2480
+#: server/stdinhand.c:1540 server/stdinhand.c:2468
msgid "Ambiguous option name."
msgstr "Kétértelmû beállításnév."
-#: server/stdinhand.c:1666
+#: server/stdinhand.c:1560
#, c-format
msgid "Server Operator: %s"
msgstr "Szerveroperátor: %s"
-#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
+#: server/stdinhand.c:1686 server/stdinhand.c:1713 server/stdinhand.c:1731
#, 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:1822
+#: server/stdinhand.c:1718
#, 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:1842
+#: server/stdinhand.c:1738
#, c-format
msgid "Default AI skill level set to '%s'."
msgstr "Az alapértelmezett MI erõsségi szint '%s'."
-#: server/stdinhand.c:1857 server/stdinhand.c:2162
+#: server/stdinhand.c:1753
#, fuzzy
msgid "This command is client only."
msgstr "Ez a parancs pillanatnyilag még nincs megvalósítva."
-#: server/stdinhand.c:1860
+#: server/stdinhand.c:1756
msgid "Usage: away"
msgstr ""
-#: server/stdinhand.c:1865
+#: server/stdinhand.c:1761
msgid "Only players may use the away command."
msgstr ""
-#: server/stdinhand.c:1869
+#: server/stdinhand.c:1765
#, fuzzy, c-format
msgid "%s set to away mode."
msgstr "A(z) \"%s\" érvénytelen városnév."
-#: server/stdinhand.c:1877
+#: server/stdinhand.c:1772
#, fuzzy, c-format
msgid "%s returned to game."
msgstr "A(z) %s egységed visszatért üzemanyagfelvételre."
-#: server/stdinhand.c:1919
+#: server/stdinhand.c:1817
#, 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:1925
+#: server/stdinhand.c:1823
#, c-format
msgid "Unknown option '%s'."
msgstr "A(z) '%s' ismeretlen beállítás."
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1848
#, 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:1953
+#: server/stdinhand.c:1851
#, fuzzy
msgid "All options"
msgstr "Helyi beállítások"
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1854
#, fuzzy
msgid "Vital options"
msgstr "Városbeállítások"
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1857
#, fuzzy
msgid "Situational options"
msgstr "Helyi beállítások"
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1860
msgid "Rarely used options"
msgstr ""
-#: server/stdinhand.c:1965
+#: server/stdinhand.c:1863
msgid "+ means you may change the option"
msgstr "a '+' jelentése: a beállítás változtatható"
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1864
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:1969
+#: server/stdinhand.c:1867
#, c-format
msgid "%-*s value (min,max) "
msgstr "%-*s érték (min,max) "
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
msgid "Option"
msgstr "Beállítás"
-#: server/stdinhand.c:1973
+#: server/stdinhand.c:1871
msgid "description"
msgstr "leírás"
-#: server/stdinhand.c:2042
+#: server/stdinhand.c:1940
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:2092
+#: server/stdinhand.c:1966
#, 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:2102
+#: server/stdinhand.c:1976
#, fuzzy
msgid "Undefined argument. Usage: team <player> <team>."
msgstr "Definiálatlan argumentum. Használat: set <beállítás> <érték>."
-#: server/stdinhand.c:2122
+#: server/stdinhand.c:1996
#, c-format
msgid "No such team %s. Please give a valid team name or number."
msgstr ""
-#: server/stdinhand.c:2129
+#: server/stdinhand.c:2003
#, fuzzy
msgid "Cannot team a barbarian."
msgstr "Barbár játékos MI irányítását nem lehet kikapcsolni."
-#: server/stdinhand.c:2135
+#: server/stdinhand.c:2009
#, 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:2157
+#: server/stdinhand.c:2035 server/voting.c:512
#, fuzzy
-msgid "Undefined arguments. Usage: vote yes|no [vote number]."
-msgstr "Definiálatlan argumentum. Használat: set <beállítás> <érték>."
+msgid "Teamvote"
+msgstr "Templom"
-#: server/stdinhand.c:2165
-msgid "Observers cannot vote."
+#: server/stdinhand.c:2035 server/voting.c:516
+msgid "Vote"
msgstr ""
-#: server/stdinhand.c:2168
+#: server/stdinhand.c:2037
+#, c-format
msgid ""
-"You can only vote in a running game. Use 'first' to become the game "
-"organizer if there currently is none."
+"%s %d \"%s\" (needs %0.0f%%%s): %d for, %d against, and %d abstained out of %"
+"d players."
msgstr ""
-#: server/stdinhand.c:2181
-#, c-format
-msgid "Vote %d \"%s\": %d for, %d against"
+#: server/stdinhand.c:2041
+msgid " no dissent"
msgstr ""
-#: server/stdinhand.c:2188
+#: server/stdinhand.c:2049
msgid "There are no votes going on."
msgstr ""
-#: server/stdinhand.c:2208
-msgid "No legal last vote."
-msgstr ""
+#: server/stdinhand.c:2077
+#, fuzzy
+msgid "Invalid arguments. Usage: vote yes|no|abstain [vote number]."
+msgstr "Definiálatlan argumentum. Használat: set <beállítás> <érték>."
+
+#: server/stdinhand.c:2095 server/stdinhand.c:2213 server/stdinhand.c:3714
+msgid "You are not allowed to use this command."
+msgstr "Nincs jogosultságod használni ezt a parancsot."
+
+#: server/stdinhand.c:2104
+#, fuzzy, c-format
+msgid "The argument \"%s\" is ambigious."
+msgstr "A help parancs '%s' argumentuma kétértelmû."
-#: server/stdinhand.c:2213
+#: server/stdinhand.c:2119
#, fuzzy
-msgid "Value must be integer."
+msgid "There are no votes running."
+msgstr "A játék már fut."
+
+#: server/stdinhand.c:2121
+#, c-format
+msgid "No legal last vote (%d %s)."
+msgstr ""
+
+#: server/stdinhand.c:2122
+msgid "other vote running"
+msgid_plural "other votes running"
+msgstr[0] ""
+
+#: server/stdinhand.c:2129 server/stdinhand.c:2491 server/stdinhand.c:2532
+msgid "Value must be an integer."
msgstr "Egész számot kell megadni."
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2135 server/stdinhand.c:2221
#, c-format
msgid "No such vote (%d)."
msgstr ""
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2141
+#, fuzzy
+msgid "You are not allowed to vote on that."
+msgstr "Nincs jogosultságod a beállítás megváltoztatására."
+
+#: server/stdinhand.c:2146
#, fuzzy, c-format
msgid "You voted for \"%s\""
msgstr "Megalapítottad %s városát"
-#: server/stdinhand.c:2232
+#: server/stdinhand.c:2150
#, c-format
msgid "You voted against \"%s\""
msgstr ""
-#: server/stdinhand.c:2259
+#: server/stdinhand.c:2155
+#, c-format
+msgid "You abstained from voting on \"%s\""
+msgstr ""
+
+#: server/stdinhand.c:2190
+msgid "Missing argument <vote number> or the string \"all\"."
+msgstr ""
+
+#: server/stdinhand.c:2197
+#, fuzzy
+msgid "You don't have any vote going on."
+msgstr "nincs itt munkásod."
+
+#: server/stdinhand.c:2204
+msgid "There isn't any vote going on."
+msgstr ""
+
+#: server/stdinhand.c:2209
+msgid "Server: All votes have been removed."
+msgstr ""
+
+#: server/stdinhand.c:2226
+#, fuzzy, c-format
+msgid "You are not allowed to cancel this vote (%d)."
+msgstr "Nincs jogosultságod a beállítás megváltoztatására."
+
+#: server/stdinhand.c:2232
+msgid "Usage: /cancelvote [<vote number>|all]"
+msgstr ""
+
+#: server/stdinhand.c:2241
+#, c-format
+msgid "Server: %s cancelled the vote \"%s\" (number %d)."
+msgstr ""
+
+#: server/stdinhand.c:2247
+#, c-format
+msgid "Server: The vote \"%s\" (number %d) has been cancelled."
+msgstr ""
+
+#: server/stdinhand.c:2265
msgid ""
"Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
"<x> <y> | unit <id> | tech <player> | timing | info>."
msgstr ""
-#: server/stdinhand.c:2265
+#: server/stdinhand.c:2271
#, 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:2294
+#: server/stdinhand.c:2300
#, c-format
msgid "%s diplomacy no longer debugged"
msgstr ""
-#: server/stdinhand.c:2298
+#: server/stdinhand.c:2304
#, c-format
msgid "%s diplomacy debugged"
msgstr ""
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2323
#, c-format
msgid "%s tech no longer debugged"
msgstr ""
-#: server/stdinhand.c:2321
+#: server/stdinhand.c:2327
#, c-format
msgid "%s tech debugged"
msgstr ""
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2358 server/stdinhand.c:2388
#, fuzzy
msgid "Value 2 & 3 must be integer."
msgstr "Egész számot kell megadni."
-#: server/stdinhand.c:2356 server/stdinhand.c:2386
+#: server/stdinhand.c:2362 server/stdinhand.c:2392
msgid "Bad map coordinates."
msgstr ""
-#: server/stdinhand.c:2361
+#: server/stdinhand.c:2367
msgid "No city at this coordinate."
msgstr ""
-#: server/stdinhand.c:2366
+#: server/stdinhand.c:2372
#, c-format
msgid "%s no longer debugged"
msgstr ""
-#: server/stdinhand.c:2392 server/stdinhand.c:2422
+#: server/stdinhand.c:2398 server/stdinhand.c:2428
#, fuzzy, c-format
msgid "%s %s no longer debugged."
msgstr "%s %s egységét atomtámadás érte."
-#: server/stdinhand.c:2397 server/stdinhand.c:2427
+#: server/stdinhand.c:2403 server/stdinhand.c:2433
#, fuzzy, c-format
msgid "%s %s debugged."
msgstr "%s %s egységét atomtámadás érte."
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2419
#, fuzzy
msgid "Value 2 must be integer."
msgstr "Egész számot kell megadni."
-#: server/stdinhand.c:2417
+#: server/stdinhand.c:2423
#, c-format
msgid "Unit %d does not exist."
msgstr ""
-#: server/stdinhand.c:2475
+#: server/stdinhand.c:2464
msgid "Undefined argument. Usage: set <option> <value>."
msgstr "Definiálatlan argumentum. Használat: set <beállítás> <érték>."
-#: server/stdinhand.c:2485
+#: server/stdinhand.c:2473
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:2490 server/stdinhand.c:3463
+#: server/stdinhand.c:2478 server/stdinhand.c:3501
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:2502 server/stdinhand.c:2543
-msgid "Value must be an integer."
-msgstr "Egész számot kell megadni."
-
-#: server/stdinhand.c:2512
+#: server/stdinhand.c:2501
#, c-format
msgid "The parameter %s should only contain digits 0-1."
msgstr ""
-#: server/stdinhand.c:2519
+#: server/stdinhand.c:2508
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:2534 server/stdinhand.c:2576
+#: server/stdinhand.c:2523 server/stdinhand.c:2565
#, 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:2554
+#: server/stdinhand.c:2543
#, c-format
msgid "The parameter %s should only contain +- and 0-9."
msgstr ""
-#: server/stdinhand.c:2561
+#: server/stdinhand.c:2550
#, 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:2586
+#: server/stdinhand.c:2575
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:2600
+#: server/stdinhand.c:2589
#, 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:2658
+#: server/stdinhand.c:2652
#, 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:2661
+#: server/stdinhand.c:2655
msgid "Sorry, you can't take a global observer. Observe it instead."
msgstr ""
-#: server/stdinhand.c:2671
+#: server/stdinhand.c:2665
#, fuzzy
msgid "You cannot take a new player at this time."
msgstr ""
@@ -6097,7 +6174,7 @@ msgstr ""
"újrakapcsolódás."
#. TRANS: Do not translate "maxplayers".
-#: server/stdinhand.c:2679
+#: server/stdinhand.c:2673
#, c-format
msgid ""
"You cannot take a new player because the maximum of %d player has already "
@@ -6107,87 +6184,87 @@ msgid_plural ""
"been reached (maxplayers setting)."
msgstr[0] ""
-#: server/stdinhand.c:2691
+#: server/stdinhand.c:2685
msgid "You cannot take a new player because there are no free player slots."
msgstr ""
-#: server/stdinhand.c:2702
+#: server/stdinhand.c:2696
#, 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:2705
+#: server/stdinhand.c:2699
#, 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:2713
+#: server/stdinhand.c:2707
#, 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:2716
+#: server/stdinhand.c:2710
#, 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:2724
+#: server/stdinhand.c:2718
#, 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:2727
+#: server/stdinhand.c:2721
#, 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:2736
+#: server/stdinhand.c:2730
#, 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:2739
+#: server/stdinhand.c:2733
#, 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:2749
+#: server/stdinhand.c:2743
#, 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:2754
+#: server/stdinhand.c:2748
#, 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:2760
+#: server/stdinhand.c:2754
#, 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:2791
+#: server/stdinhand.c:2785
msgid "Usage: observe [connection-name [player-name]]"
msgstr ""
-#: server/stdinhand.c:2797
+#: server/stdinhand.c:2791
#, fuzzy
msgid "Usage: observe [player-name]"
msgstr "remove <játékosnév>"
-#: server/stdinhand.c:2847
+#: server/stdinhand.c:2841
#, c-format
msgid "%s already controls %s. Using 'observe' would remove %s"
msgstr ""
-#: server/stdinhand.c:2858
+#: server/stdinhand.c:2852
#, fuzzy, c-format
msgid "%s is already observing %s."
msgstr "%s városában %s épül."
-#: server/stdinhand.c:2863
+#: server/stdinhand.c:2857
#, fuzzy, c-format
msgid "%s is already observing."
msgstr "%s városában %s épül."
@@ -6202,247 +6279,253 @@ msgstr "%1$s mostant
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:2969
+#: server/stdinhand.c:2971
#, fuzzy
msgid "Usage: take <connection-name> <player-name>"
msgstr "set <beállításnév> <érték>"
-#: server/stdinhand.c:2974
+#: server/stdinhand.c:2976
#, fuzzy
msgid "Usage: take <player-name>"
msgstr "create <játékosnév>"
-#: server/stdinhand.c:2980
+#: server/stdinhand.c:2982
msgid "Usage: take [connection-name] <player-name>"
msgstr ""
-#: server/stdinhand.c:3010
+#: server/stdinhand.c:3012
#, fuzzy, c-format
msgid "%s already controls %s."
msgstr "%s városában %s épül."
-#: server/stdinhand.c:3024
+#: server/stdinhand.c:3026
#, 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:3059
+#: server/stdinhand.c:3061
#, c-format
msgid "being detached from %s."
msgstr ""
-#: server/stdinhand.c:3135
+#: server/stdinhand.c:3146
#, fuzzy, c-format
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:3139 server/stdinhand.c:4260
+#: server/stdinhand.c:3150 server/stdinhand.c:4308
#: data/nation/barbarian.ruleset:3
msgid "Barbarian"
msgstr "Barbár"
-#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
+#: server/stdinhand.c:3152 server/stdinhand.c:4310 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-sdl/plrdlg.c:645
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr "MI"
-#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-gtk-2.0/pages.c:2125
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
+#: server/stdinhand.c:3153 server/stdinhand.c:4312
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-gtk-2.0/pages.c:2127
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/connectdlg.c:215
msgid "Human"
msgstr "Ember"
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-gtk-2.0/pages.c:2124 client/gui-win32/connectdlg.c:200
-#: client/gui-win32/connectdlg.c:212
+#: server/stdinhand.c:3155 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-gtk-2.0/pages.c:2126 client/gui-win32/connectdlg.c:202
+#: client/gui-win32/connectdlg.c:214
#, fuzzy
msgid "Alive"
msgstr "Aktív"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3156 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-win32/connectdlg.c:202
#, fuzzy
msgid "Dead"
msgstr ", Legyõzött"
-#: server/stdinhand.c:3147
+#: server/stdinhand.c:3159
#, fuzzy, c-format
msgid "%s failed to attach to any player."
msgstr "A(z) \"%s\" érvénytelen városnév."
-#: server/stdinhand.c:3182
+#: server/stdinhand.c:3194
#, fuzzy
msgid "Usage: detach <connection-name>"
msgstr "cut <kapcsolatnév>"
-#: server/stdinhand.c:3202
+#: server/stdinhand.c:3214
#, fuzzy
msgid "You can not detach other users."
msgstr "Ott nem támadhatsz."
-#: server/stdinhand.c:3211
+#: server/stdinhand.c:3223
#, fuzzy, c-format
msgid "%s is not attached to any player."
msgstr "A(z) \"%s\" érvénytelen városnév."
-#: server/stdinhand.c:3234
+#: server/stdinhand.c:3246
#, 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:3240
+#: server/stdinhand.c:3252
#, fuzzy, c-format
msgid "%s no longer observing."
msgstr "%s városában %s épül."
-#: server/stdinhand.c:3259
+#: server/stdinhand.c:3271
#, fuzzy, c-format
msgid "detaching from %s."
msgstr "Kutatás alatt: %s."
-#: server/stdinhand.c:3345
+#: server/stdinhand.c:3361
#, fuzzy
msgid "Usage: load <game name>"
msgstr "Használat: load <fájlnév>"
-#: server/stdinhand.c:3350
+#: server/stdinhand.c:3366
#, 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:3372
+#: server/stdinhand.c:3388
#, c-format
msgid "Cannot find savegame or scenario with the name \"%s\"."
msgstr ""
-#: server/stdinhand.c:3389
+#: server/stdinhand.c:3405
#, 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:3458
+#: server/stdinhand.c:3496
#, c-format
msgid "Current ruleset directory is \"%s\""
msgstr "A jelenlegi szabálykészlet könyvtár: \"%s\""
-#: server/stdinhand.c:3478
+#: server/stdinhand.c:3516
#, c-format
msgid "Ruleset directory \"%s\" not found"
msgstr "A(z) \"%s\" szabálykészlet könyvtár nem található"
-#: server/stdinhand.c:3484
+#: server/stdinhand.c:3522
#, fuzzy, c-format
msgid "Ruleset directory is already \"%s\""
msgstr "A szabálykészlet könyvtár mostantól \"%s\""
-#: server/stdinhand.c:3488
+#: server/stdinhand.c:3526
#, c-format
msgid "Ruleset directory set to \"%s\""
msgstr "A szabálykészlet könyvtár mostantól \"%s\""
-#: server/stdinhand.c:3536
+#: server/stdinhand.c:3574
msgid "Goodbye."
msgstr "Viszlát!"
-#: server/stdinhand.c:3567
+#: server/stdinhand.c:3606
msgid "Sorry, you are not allowed to use server commands."
msgstr "Sajnálom, nincs jogosultságod szerverparancsok kiadására."
-#: server/stdinhand.c:3603
+#: server/stdinhand.c:3656
#, 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:3608
+#: server/stdinhand.c:3661
#, c-format
msgid "Unknown command. Try '%shelp'."
msgstr "Ismeretlen parancs. Próbálkozz '%shelp'-pel!"
-#: server/stdinhand.c:3625
-msgid "Your new vote canceled your previous vote."
+#: server/stdinhand.c:3675
+msgid "Your new vote cancelled your previous vote."
msgstr ""
-#: server/stdinhand.c:3633
-#, c-format
-msgid "New vote (number %d) by %s: %s."
-msgstr ""
+#: server/stdinhand.c:3688
+#, fuzzy
+msgid "New teamvote"
+msgstr "Új játék"
+
+#: server/stdinhand.c:3691
+#, fuzzy
+msgid "New vote"
+msgstr "Új játék"
-#: server/stdinhand.c:3645
+#: server/stdinhand.c:3695
+#, fuzzy, c-format
+msgid "%s (number %d) by %s: %s"
+msgstr "%s városát atomtámadás érte %s részérõl."
+
+#: server/stdinhand.c:3704
#, c-format
msgid "Your new vote (\"%s\") was not legal or was not recognized."
msgstr ""
-#: 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:3680
+#: server/stdinhand.c:3726
msgid "(server prompt)"
msgstr "(szerverprompt)"
-#: server/stdinhand.c:3787
+#: server/stdinhand.c:3835
#, fuzzy
msgid "Game ended in a draw."
msgstr "Játék vége"
-#: server/stdinhand.c:3791
+#: server/stdinhand.c:3839
msgid ""
"Ending the game. The server will restart once all clients have disconnected."
msgstr ""
-#: server/stdinhand.c:3796
+#: server/stdinhand.c:3844
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:3812
+#: server/stdinhand.c:3860
#, c-format
msgid "%s has conceded the game and can no longer win."
msgstr ""
-#: server/stdinhand.c:3817
+#: server/stdinhand.c:3865
#, fuzzy
msgid "You cannot surrender now."
msgstr "Épület szabotálása"
-#: server/stdinhand.c:3883
+#: server/stdinhand.c:3931
#, 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
+#: server/stdinhand.c:3936
#, 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:3892
+#: server/stdinhand.c:3940
#, 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:3901
+#: server/stdinhand.c:3949
#, fuzzy
msgid "All players are ready; starting game."
msgstr "Van már ilyen nevû játékos."
-#: server/stdinhand.c:3915
+#: server/stdinhand.c:3963
#, 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:3922
+#: server/stdinhand.c:3970
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:3953
+#: server/stdinhand.c:4001
#, c-format
msgid "Cutting connection %s."
msgstr "A(z) %s kapcsolat megszakítása."
-#: server/stdinhand.c:3972
+#: server/stdinhand.c:4020
msgid ""
"Welcome - this is the introductory help text for the Freeciv server.\n"
"\n"
@@ -6483,124 +6566,124 @@ msgstr ""
" save - pillanatnyi játékállás elmentése\n"
" quit - kilépés"
-#: server/stdinhand.c:4007 server/stdinhand.c:4010
+#: server/stdinhand.c:4055 server/stdinhand.c:4058
msgid "Command:"
msgstr "Parancs:"
-#: server/stdinhand.c:4014
+#: server/stdinhand.c:4062
msgid "Synopsis: "
msgstr "Áttekintés: "
-#: server/stdinhand.c:4023
+#: server/stdinhand.c:4071
#, c-format
msgid "Level: %s"
msgstr "Szint: %s"
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4096
msgid "The following server commands are available:"
msgstr "A lehetséges szerverparancsok a következõk:"
-#: server/stdinhand.c:4123
+#: server/stdinhand.c:4171
#, c-format
msgid "Help argument '%s' is ambiguous."
msgstr "A help parancs '%s' argumentuma kétértelmû."
-#: server/stdinhand.c:4128
+#: server/stdinhand.c:4176
#, c-format
msgid "No match for help argument '%s'."
msgstr "A help parancs '%s' argumentumára semmi sem illeszkedik."
-#: server/stdinhand.c:4194
+#: server/stdinhand.c:4242
#, 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:4234
+#: server/stdinhand.c:4282
msgid "List of players:"
msgstr "A játékosok listája:"
-#: server/stdinhand.c:4239
+#: server/stdinhand.c:4287
msgid "<no players>"
msgstr "<nincsenek játékosok>"
-#: server/stdinhand.c:4256
+#: server/stdinhand.c:4304
#, fuzzy, c-format
msgid "user %s, "
msgstr "felhasználói név: %s, "
-#: server/stdinhand.c:4267
+#: server/stdinhand.c:4315
msgid ", Dead"
msgstr ", Legyõzött"
-#: server/stdinhand.c:4270
+#: server/stdinhand.c:4318
#, 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:4275 server/stdinhand.c:4279 client/helpdata.c:257
-#: client/helpdata.c:752 client/text.c:241 client/text.c:1224
-#: client/text.c:1262
+#: server/stdinhand.c:4323 server/stdinhand.c:4327 client/helpdata.c:257
+#: client/helpdata.c:752 client/text.c:241 client/text.c:1229
+#: client/text.c:1267
#, c-format
msgid "?clistmore:, %s"
msgstr ", %s"
-#: server/stdinhand.c:4283
+#: server/stdinhand.c:4331
#, fuzzy
msgid ", ready"
msgstr ", Legyõzött"
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4333
msgid ", not ready"
msgstr ""
-#: server/stdinhand.c:4293
+#: server/stdinhand.c:4341
#, c-format
msgid " %d connection:"
msgid_plural " %d connections:"
msgstr[0] "%d kapcsolat:"
-#: server/stdinhand.c:4299
+#: server/stdinhand.c:4347
#, 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:4304
+#: server/stdinhand.c:4352
msgid " (observer mode)"
msgstr " (megfigyelõ üzemmód)"
-#: server/stdinhand.c:4322
+#: server/stdinhand.c:4370
#, 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:4332
+#: server/stdinhand.c:4380
#, c-format
msgid "%2d : '%s' : %d player"
msgid_plural "%2d : '%s' : %d players"
msgstr[0] ""
-#: server/stdinhand.c:4352
+#: server/stdinhand.c:4400
#, c-format
msgid "%2d : '%s' : 1 player : %s"
msgstr ""
-#: server/stdinhand.c:4360
+#: server/stdinhand.c:4408
#, c-format
msgid "Empty team: %s"
msgstr ""
-#: server/stdinhand.c:4371
+#: server/stdinhand.c:4419
msgid "List of connections to server:"
msgstr "A szerverhez való kapcsolódások listája:"
-#: server/stdinhand.c:4375
+#: server/stdinhand.c:4423
msgid "<no connections>"
msgstr "<nincs kapcsolat>"
-#: server/stdinhand.c:4399
+#: server/stdinhand.c:4447
#, fuzzy
msgid "List of scenarios available:"
msgstr "Nincsenek egységek"
@@ -6620,7 +6703,7 @@ msgstr "A(z) %s felfedezt
msgid "%s acquired from %s!"
msgstr "A(z) %s megszerezték a(z) %s tudományt a(z) %s népétõl (Egyezmény)"
-#: server/techtools.c:220
+#: server/techtools.c:221
#, c-format
msgid ""
"Discovery of %s makes the government form %s available. You may want to "
@@ -6629,43 +6712,43 @@ msgstr ""
"A(z) %s felfedezése lehetõvé teszi a(z) %s államformát. Indíts forrasalmat, "
"ha át akarsz térni erre az államformára!"
-#: server/techtools.c:301
+#: server/techtools.c:302
#, c-format
msgid "Discovery of %s OBSOLETES %s in %s!"
msgstr "A(z) %1$s felfedezésével ELAVULT a(z) %3$si %2$s!"
-#: server/techtools.c:351
+#: server/techtools.c:352
#, fuzzy, c-format
msgid "Learned %s. Our scientists focus on %s; goal is %s."
msgstr ""
"Megtanultuk a(z) %s tudományt. Tudósaink a(z) %s tudományra koncentrálnak, "
"cél a(z) %s."
-#: server/techtools.c:369
+#: server/techtools.c:370
#, c-format
msgid "Learned %s. Scientists choose to research %s."
msgstr ""
"Megtanultuk a(z) %s tudományt. Tudósaink a(z) %s tudományt választották "
"kutatásuk céljául."
-#: server/techtools.c:376
+#: server/techtools.c:377
#, c-format
msgid "Learned %s. "
msgstr "Megtanultuk a(z) %st. "
-#: server/techtools.c:379
+#: server/techtools.c:380
#, c-format
msgid "Researching %s."
msgstr "Kutatás alatt: %s."
-#: server/techtools.c:385
+#: server/techtools.c:386
#, fuzzy, c-format
msgid "Learned %s. Scientists do not know what to research next."
msgstr ""
"Megtanultuk a(z) %s tudományt. Tudósaink a(z) %s tudományt választották "
"kutatásuk céljául."
-#: server/techtools.c:402
+#: server/techtools.c:403
msgid ""
"Great scientists from all the world join your civilization: you get an "
"immediate advance."
@@ -6673,22 +6756,22 @@ msgstr ""
"Nagy tudósok csatlakoznak civilizációdhoz az egész világból; kapsz egy "
"azonnali tudományt."
-#: server/techtools.c:570
+#: server/techtools.c:571
#, c-format
msgid "Technology goal is %s."
msgstr "A technológiai cél a(z) %s."
-#: server/techtools.c:700
+#: server/techtools.c:708
#, 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:705
+#: server/techtools.c:713
#, 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:710
+#: server/techtools.c:718
#, 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."
@@ -6712,180 +6795,186 @@ msgstr "Nem volt felfejlesztend
msgid "%s upgraded to %s for %d gold."
msgstr "Egy %s felfejlesztve %s egységgé %d aranyért."
-#: server/unithand.c:396
+#: server/unithand.c:402
#, c-format
msgid "%s refuses to disband!"
msgstr ""
-#: server/unithand.c:449
+#: server/unithand.c:455
msgid "Can't place city here."
msgstr "Nem helyezhetsz el itt várost."
-#: server/unithand.c:456
+#: server/unithand.c:462
#, c-format
msgid "Only %s can build a city."
msgstr "Csak %s építhet várost."
-#: server/unithand.c:461
+#: server/unithand.c:467
msgid "Can't build a city."
msgstr "Nem építhet várost."
-#: server/unithand.c:470
+#: server/unithand.c:476
#, c-format
msgid "Only %s can add to a city."
msgstr "Csak %s adható hozzá városhoz."
-#: server/unithand.c:475
+#: server/unithand.c:481
msgid "Can't add to a city."
msgstr "Nem adható hozzá városhoz."
-#: server/unithand.c:481
+#: server/unithand.c:487
#, c-format
msgid "%s unit has no moves left to add to %s."
msgstr "A(z) %s nem adható hozzá %s városához, mert elfogytak a lépései."
-#: server/unithand.c:487
+#: server/unithand.c:493
#, c-format
msgid "%s unit has no moves left to build city."
msgstr "A(z) %s nem építhet várost, mert elfogytak a lépései."
-#: server/unithand.c:492
+#. TRANS: <city> is owned by <nation>, cannot add <unit>.
+#: server/unithand.c:499
+#, fuzzy, c-format
+msgid "%s is owned by %s, cannot add %s."
+msgstr "%s már túl nagy, a(z) %s nem adható hozzá."
+
+#: server/unithand.c:506
#, c-format
msgid "%s is too big to add %s."
msgstr "%s már túl nagy, a(z) %s nem adható hozzá."
-#: server/unithand.c:498
+#: server/unithand.c:512
#, fuzzy, c-format
msgid "%s needs an improvement to grow, so you cannot add %s."
msgstr "%s növekedéséhez %s szükséges, ezért a(z) %s nem adható hozzá."
-#: server/unithand.c:509
+#: server/unithand.c:523
#, c-format
msgid "Can't add %s to %s."
msgstr "A(z) %s nem adható hozzá %s városához."
-#: server/unithand.c:531
+#: server/unithand.c:545
#, c-format
msgid "%s added to aid %s in growing."
msgstr "Egy %s hozzáadódott %s városához ezzel segítve a város növekedését."
-#: server/unithand.c:828
+#: server/unithand.c:842
msgid "Your Nuclear missile was shot down by SDI defences, what a waste."
msgstr "Az Atomrakétádat lelõtte az SDI védelem."
-#: server/unithand.c:831
+#: server/unithand.c:845
#, c-format
msgid "The nuclear attack on %s was avoided by your SDI defense."
msgstr "A(z) %s elleni atomtámadást kivédte az SDI védelmed."
#. TRANS: "Your Cannon ... the Polish Destroyer."
-#: server/unithand.c:901
+#: server/unithand.c:915
#, fuzzy, c-format
msgid "Your %s survived the pathetic attack from the %s %s."
msgstr "%s egységed túlélte %s %s egységének hõsies támadását."
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unithand.c:910
+#: server/unithand.c:924
#, fuzzy, c-format
msgid "Your attacking %s failed against the %s %s!"
msgstr "A támadó %s egységed vereséget szenvedett %s %s egységétõl!"
-#: server/unithand.c:983
+#: server/unithand.c:997
#, c-format
msgid "Only %s can attack from sea."
msgstr "Csak %s támadhatnak tengerrõl."
-#: server/unithand.c:988
+#: server/unithand.c:1002
msgid "Cannot attack from sea."
msgstr "Nem támadhatsz tengerrõl."
-#: server/unithand.c:996 server/unittools.c:2137
+#: server/unithand.c:1010 server/unittools.c:2142
msgid "Cannot attack unless you declare war first."
msgstr "Nem támadhatsz, ha nem üzensz hadat elõbb."
-#: server/unithand.c:1001
+#: server/unithand.c:1015
#, c-format
msgid "%s can only move into your own zone of control."
msgstr "A(z) %s csak általad ellenõrzött területre léphet."
-#: server/unithand.c:1007
+#: server/unithand.c:1021
#, fuzzy, c-format
msgid "Cannot invade unless you break peace with %s first."
msgstr "Nem támadhatsz, ha nem üzensz hadat elõbb."
-#: server/unithand.c:1052
+#: server/unithand.c:1066
msgid "This unit has no moves left."
msgstr "Ennek az egységnek nincsen több lépése."
-#: server/unithand.c:1107
+#: server/unithand.c:1121
msgid "Unit must be on land to perform diplomatic action."
msgstr "Az egység csak szárazföldi mezõrõl hajthat végre diplomáciai akciót."
-#: server/unithand.c:1109
+#: server/unithand.c:1123
msgid "No diplomat action possible."
msgstr "Nem lehetséges a diplomatatevékenység."
-#: server/unithand.c:1125
+#: server/unithand.c:1139
#, c-format
msgid "You must declare war on %s first. Try using players dialog (F3)."
msgstr ""
-#: server/unithand.c:1143
+#: server/unithand.c:1157
msgid "This unit is being transported, and so cannot bombard."
msgstr ""
-#: server/unithand.c:1158
+#: server/unithand.c:1172
msgid "You can't attack there."
msgstr "Ott nem támadhatsz."
-#: server/unithand.c:1180
+#: server/unithand.c:1194
#, fuzzy
msgid "This type of troops cannot take over a city."
msgstr "Csak földi egységek foglalhatnak el várost."
-#: server/unithand.c:1198
+#: server/unithand.c:1212
msgid "A transported unit is not allied to all units or city on target tile."
msgstr ""
-#: server/unithand.c:1240
+#: server/unithand.c:1254
#, c-format
msgid "Your %s helps build the %s in %s (%d remaining)."
msgstr ""
"Egy %1$s egységed besegít a(z) %3$si %2$s építésébe (%4$d pajzs van hátra)."
-#: server/unithand.c:1242
+#: server/unithand.c:1256
#, fuzzy, c-format
msgid "Your %s helps build the %s in %s (%d surplus)."
msgstr ""
"Egy %1$s egységed besegít a(z) %3$si %2$s építésébe (%4$d pajzs van hátra)."
-#: server/unithand.c:1286
+#: server/unithand.c:1300
#, fuzzy, c-format
msgid ""
"Sorry, your %s cannot establish a trade route because it has no home city"
msgstr "Sajnálom, a(z) %s egységed itt nem alapíthat kereskedelmi útvonalat."
-#: server/unithand.c:1296
+#: server/unithand.c:1310
#, fuzzy, c-format
msgid "Sorry, your %s cannot establish a trade route between %s and %s"
msgstr "Sajnálom, a(z) %s egységed itt nem alapíthat kereskedelmi útvonalat."
-#: server/unithand.c:1325 server/unithand.c:1344
+#: server/unithand.c:1339 server/unithand.c:1358
#, c-format
msgid "Sorry, your %s cannot establish a trade route here!"
msgstr "Sajnálom, a(z) %s egységed itt nem alapíthat kereskedelmi útvonalat."
-#: server/unithand.c:1329 server/unithand.c:1348
+#: server/unithand.c:1343 server/unithand.c:1362
#, fuzzy, c-format
msgid " The city of %s already has %d better trade routes!"
msgstr " %s városa már %d kereskedelmi útvonallal rendelkezik!"
-#: server/unithand.c:1361 server/unithand.c:1373
+#: server/unithand.c:1375 server/unithand.c:1387
#, c-format
msgid "Sorry, %s has canceled the trade route from %s to your city %s."
msgstr ""
-#: server/unithand.c:1406
+#: server/unithand.c:1420
#, c-format
msgid ""
"Your %s from %s has arrived in %s, and revenues amount to %d in gold and "
@@ -6946,55 +7035,55 @@ msgid "Teleported your %s to %s."
msgstr "Egy %s egységed teleportált a(z) (%d, %d) mezõrõl %s városába."
#. TRANS: A unit is moved to resolve stack conflicts.
-#: server/unittools.c:1065
+#: server/unittools.c:1070
#, fuzzy, c-format
msgid "Moved your %s."
msgstr "Feloszlott egy %s egységed a(z) (%d, %d) mezõn."
-#: server/unittools.c:1076
+#: server/unittools.c:1081
#, fuzzy, c-format
msgid "Disbanded your %s."
msgstr "Feloszlott egy %s egységed a(z) (%d, %d) mezõn."
-#: server/unittools.c:1397
+#: server/unittools.c:1402
#, c-format
msgid "Unable to defend %s, %s has lost the game."
msgstr ""
-#: server/unittools.c:1401
+#: server/unittools.c:1406
#, c-format
msgid "Losing %s meant losing the game! Be more careful next time!"
msgstr ""
-#: server/unittools.c:1503
+#: server/unittools.c:1508
#, c-format
msgid "%s escaped the destruction of %s, and fled to %s."
msgstr ""
-#: server/unittools.c:1512
+#: server/unittools.c:1517
#, c-format
msgid "%s lost when %s was lost."
msgstr "A(z) %2$s elvesztésével a(z) %1$s is elveszett."
-#: server/unittools.c:1561
+#: server/unittools.c:1566
#, c-format
msgid "Barbarian leader captured, %d gold ransom paid."
msgstr "Az elfogott barbár fõnökért %d arany váltságdíjat fizettek."
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unittools.c:1579
+#: server/unittools.c:1584
#, fuzzy, c-format
msgid "Your attacking %s succeeded against the %s %s!"
msgstr "a támadó %s egységed legyõzte %s egységét %s!"
#. TRANS: "Cannon ... the Polish Destroyer."
-#: server/unittools.c:1588 server/unittools.c:1646
+#: server/unittools.c:1593 server/unittools.c:1651
#, fuzzy, c-format
msgid "%s lost to an attack by the %s %s."
msgstr "%2$s %3$s egysége megsemmisített egy %1$s egységedet."
#. TRANS: "... Cannon ... the Polish Destroyer ...."
-#: server/unittools.c:1622
+#: server/unittools.c:1627
#, fuzzy, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -7003,14 +7092,14 @@ msgstr[0] "a t
#. TRANS: "Cannon lost when the Polish Destroyer
#. * attacked the German Musketeers."
-#: server/unittools.c:1655
+#: server/unittools.c:1660
#, fuzzy, c-format
msgid "%s lost when the %s %s attacked the %s %s."
msgstr "%2$s %3$s egysége megsemmisített egy %1$s egységedet."
#. TRANS: "Musketeers (and Cannon) lost to an
#. * attack from the Polish Destroyer."
-#: server/unittools.c:1670
+#: server/unittools.c:1675
#, fuzzy, c-format
msgid "%s (and %s) lost to an attack from the %s %s."
msgstr "%3$s %4$s egysége megsemmisített egy %1$s (%2$s) egységedet."
@@ -7018,7 +7107,7 @@ msgstr "%3$s %4$s egys
#. TRANS: "Musketeers and 3 other units lost to
#. * an attack from the Polish Destroyer."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1680
+#: server/unittools.c:1685
#, fuzzy, 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."
@@ -7027,187 +7116,229 @@ msgstr[0] "%3$s %4$s egys
#. TRANS: "2 units lost when the Polish Destroyer
#. * attacked the German Musketeers."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1694
+#: server/unittools.c:1699
#, fuzzy, 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] "Automata Támadás: A(z) %d %si %s %s %s egységét támadja"
-#: server/unittools.c:1962
+#: server/unittools.c:1967
#, c-format
msgid "Your %s was nuked by %s."
msgstr "A(z) %s egységedet atomtámadás érte %s részérõl."
-#: server/unittools.c:1965 server/unittools.c:1981
+#: server/unittools.c:1970 server/unittools.c:1986
msgid "yourself"
msgstr "a saját magad"
-#: server/unittools.c:1969
+#: server/unittools.c:1974
#, fuzzy, c-format
msgid "The %s %s was nuked."
msgstr "%s %s egységét atomtámadás érte."
-#: server/unittools.c:1978
+#: server/unittools.c:1983
#, c-format
msgid "%s was nuked by %s."
msgstr "%s városát atomtámadás érte %s részérõl."
-#: server/unittools.c:1986
+#: server/unittools.c:1991
#, c-format
msgid "You nuked %s."
msgstr "Atombombát dobtál le %s városára."
-#: server/unittools.c:2027
+#: server/unittools.c:2032
#, fuzzy, c-format
msgid "The %s detonated a nuke!"
msgstr "%s atombombát robbantott!"
-#: server/unittools.c:2051
+#: server/unittools.c:2056
#, c-format
msgid "%s transported successfully."
msgstr "A(z) %s átszállítása sikerült."
-#: server/unittools.c:2103
+#: server/unittools.c:2108
msgid "This unit type can not be paradropped."
msgstr "Ez az egységtípus nem hajthat végre ejtõernyõs támadást."
-#: server/unittools.c:2113
+#: server/unittools.c:2118
#, fuzzy
msgid "You cannot paradrop a unit that is transporting other units."
msgstr "Nem lehet óceánba ejtõernyõzni."
-#: server/unittools.c:2119
+#: server/unittools.c:2124
msgid "The destination location is not known."
msgstr "A célmezõ ismeretlen."
-#: server/unittools.c:2126
+#: server/unittools.c:2131
#, fuzzy, c-format
msgid "This unit cannot paradrop into %s."
msgstr "Nem lehet óceánba ejtõernyõzni."
-#: server/unittools.c:2146
+#: server/unittools.c:2151
#, c-format
msgid "The distance to the target (%i) is greater than the unit's range (%i)."
msgstr "A célmezõ távolsága (%i) nagyobb mint az egység hatótávolsága (%i)."
-#: server/unittools.c:2157
+#: server/unittools.c:2162
#, fuzzy, c-format
msgid "Your %s paradropped into the %s and was lost."
msgstr "A(z) %s egységed az óceánba esett, és elveszett."
-#: server/unittools.c:2170
+#: server/unittools.c:2175
#, c-format
msgid "Your %s was killed by enemy units at the paradrop destination."
msgstr ""
"A(z) %s egységedet ellenséges egységek ölték meg a leérkezés helyszínén."
-#: server/unittools.c:2192
+#: server/unittools.c:2197
#, c-format
msgid "You found %d gold."
msgstr "Találtál %d aranyat."
-#: server/unittools.c:2209
+#: server/unittools.c:2214
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr "Megtaláltad a(z) %s tudományt õsi papírtekercseken."
-#: server/unittools.c:2216
+#: server/unittools.c:2221
#, c-format
msgid "The %s have acquired %s from ancient scrolls of wisdom."
msgstr "A(z) %s megszerezték a(z) %s tudományt õsi papírtekercsekbõl."
-#: server/unittools.c:2230
+#: server/unittools.c:2235
msgid "A band of friendly mercenaries joins your cause."
msgstr "Egy csapat szolgálatkész zsoldos csatlakozott hozzád."
-#: server/unittools.c:2248
+#: server/unittools.c:2253
msgid "An abandoned village is here."
msgstr "Egy elhagyatott falu van itt."
-#: server/unittools.c:2258
+#: server/unittools.c:2263
msgid "You have unleashed a horde of barbarians!"
msgstr "Elszabadítottál egy barbár hordát!"
-#: server/unittools.c:2261
+#: server/unittools.c:2266
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr "Barbárok ölték meg a(z) %s egységedet!"
-#: server/unittools.c:2277
+#: server/unittools.c:2282
msgid "You found a friendly city."
msgstr "Találtál egy szövetséges várost."
-#: server/unittools.c:2291
+#: server/unittools.c:2296
msgid "Friendly nomads are impressed by you, and join you."
msgstr "Jó benyomást tettél egy csapat nomádra, ezért csatlakoztak hozzád."
-#: server/unittools.c:2316
+#: server/unittools.c:2321
msgid "Your overflight frightens the tribe; they scatter in terror."
msgstr "A primitív törzs nagyon megijed a repülõdtõl; rémülten szétszélednek."
-#: server/unittools.c:2574
+#: server/unittools.c:2579
#, fuzzy, c-format
msgid "Orders for %s aborted after enemy movement was spotted."
msgstr ""
"Egy %s félbeszakította a kijelölt útvonalon haladását (GOTO), mert útban "
"vannak neki más egységek."
-#: server/unittools.c:3023
+#: server/unittools.c:3028
#, fuzzy, c-format
msgid "Orders for %s aborted as there are units nearby."
msgstr ""
"Egy %s félbeszakította a kijelölt útvonalon haladását (GOTO), mert útban "
"vannak neki más egységek."
-#: server/unittools.c:3075
+#: server/unittools.c:3080
#, fuzzy, c-format
msgid "Orders for %s aborted because building of city failed."
msgstr ""
"Egy %s félbeszakította a kijelölt útvonalon haladását (GOTO), mert útban "
"vannak neki más egységek."
-#: server/unittools.c:3088
+#: server/unittools.c:3093
#, c-format
msgid "Orders for %s aborted since they give an invalid activity."
msgstr ""
-#: server/unittools.c:3102
+#: server/unittools.c:3107
#, c-format
msgid "Orders for %s aborted since they give an invalid location."
msgstr ""
-#: server/unittools.c:3112
+#: server/unittools.c:3117
#, fuzzy, c-format
msgid "Orders for %s aborted as there are units in the way."
msgstr ""
"Egy %s félbeszakította a kijelölt útvonalon haladását (GOTO), mert útban "
"vannak neki más egységek."
-#: server/unittools.c:3138
+#: server/unittools.c:3143
#, c-format
msgid "Orders for %s aborted because of failed move."
msgstr ""
-#: server/unittools.c:3179
+#: server/unittools.c:3184
#, fuzzy, c-format
msgid "Attempt to change homecity for %s failed."
msgstr "A(z) %s ellátóvárosa mostantól %s."
-#: server/unittools.c:3190
+#: server/unittools.c:3195
#, fuzzy, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr "* Létesíthet kereskedelmi kapcsolatokat.\n"
-#: server/unittools.c:3202
+#: server/unittools.c:3207
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr ""
-#: server/unittools.c:3211
+#: server/unittools.c:3216
#, fuzzy, c-format
msgid "Your %s has invalid orders."
msgstr "A(z) %s egységed visszatért üzemanyagfelvételre."
+#: server/voting.c:522
+#, c-format
+msgid ""
+"%s %d \"%s\" is passed %d to %d with %d abstentions and %d who did not vote."
+msgstr ""
+
+#: server/voting.c:528
+#, c-format
+msgid ""
+"%s %d \"%s\" failed with %d against, %d for, %d abstentions and %d who did "
+"not vote."
+msgstr ""
+
+#: server/voting.c:548
+#, c-format
+msgid "%s %d: %s voted yes."
+msgstr ""
+
+#: server/voting.c:553
+#, c-format
+msgid "%s %d: %s voted no."
+msgstr ""
+
+#: server/voting.c:558
+#, c-format
+msgid "%s %d: %s chose to abstain."
+msgstr ""
+
+#. TRANS: Describing a new vote that can only pass
+#. * if there are no dissenting votes.
+#: server/voting.c:726
+#, c-format
+msgid "%s (needs %0.0f%% and no dissent)."
+msgstr ""
+
+#. TRANS: Describing a new vote that can pass only if the
+#. * given percentage of players votes 'yes'.
+#: server/voting.c:732
+#, c-format
+msgid "%s (needs %0.0f%% in favor)."
+msgstr ""
+
#: server/generator/mapgen.c:1771
msgid "High landmass - this may take a few seconds."
msgstr "Sok szárazföld - ez néhány másodpercet vehet igénybe."
@@ -7235,12 +7366,12 @@ msgid ""
"Please report this bug at %s."
msgstr ""
-#: client/attribute.c:363
+#: client/attribute.c:368
msgid ""
"There has been a CMA error. Your citizen governor settings may be broken."
msgstr ""
-#: client/attribute.c:367
+#: client/attribute.c:372
msgid "Old attributes detected and removed."
msgstr ""
@@ -7389,41 +7520,41 @@ msgstr "%s - %s lakos"
msgid "%+4d : Taxed from trade\n"
msgstr ""
-#: client/citydlg_common.c:418
+#: client/citydlg_common.c:421
#, fuzzy, c-format
msgid "%+4d : Trade route with %s\n"
msgstr "Nem létezik kereskedelmi útvonal.\n"
-#: client/citydlg_common.c:427
+#: client/citydlg_common.c:430
#, fuzzy, c-format
msgid "%+4d : Building tithes\n"
msgstr "Egységet épít"
-#: client/citydlg_common.c:450
+#: client/citydlg_common.c:453
#, c-format
msgid "%+4d : Bonus from %s (%+d%%)\n"
msgstr ""
-#: client/citydlg_common.c:462
+#: client/citydlg_common.c:465
#, c-format
msgid "%+4d : Waste\n"
msgstr ""
-#: client/citydlg_common.c:468
+#: client/citydlg_common.c:471
#, c-format
msgid "%+4d : Disorder\n"
msgstr ""
-#: client/citydlg_common.c:474
+#: client/citydlg_common.c:477
#, c-format
msgid "%+4d : Used\n"
msgstr ""
-#: client/citydlg_common.c:479
+#: client/citydlg_common.c:482
msgid "==== : Adds up to\n"
msgstr ""
-#: client/citydlg_common.c:481
+#: client/citydlg_common.c:484
#, c-format
msgid "%4d : Total surplus"
msgstr ""
@@ -7773,54 +7904,54 @@ msgstr "?Speci
msgid "Specialists"
msgstr "Speciálisok"
-#: client/civclient.c:240
+#: client/civclient.c:241
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr " -a, --autoconnect\tKapcsolódás ablak átugrása\n"
-#: client/civclient.c:250
+#: client/civclient.c:251
#, fuzzy
msgid " -l, --log FILE\tUse FILE as logfile (spawned server also uses this)\n"
msgstr " -l, --log FÁJL\tA FÁJL használata naplófájlként\n"
-#: client/civclient.c:252
+#: client/civclient.c:253
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr " -m, --meta HOST\tHOST használata metaszerverként\n"
-#: client/civclient.c:254
+#: client/civclient.c:255
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr " -n, --name NÉV\tA NÉV név használata\n"
-#: client/civclient.c:256
+#: client/civclient.c:257
#, fuzzy
msgid " -p, --port PORT\tConnect to server port PORT (usually with -a)\n"
msgstr " -p, --port PORT\tKapcsolódás a szerver PORT portjára\n"
-#: client/civclient.c:258
+#: client/civclient.c:259
#, c-format
msgid " -P, --Plugin PLUGIN\tUse PLUGIN for sound output %s\n"
msgstr " -P, --Plugin PLUGIN\tPLUGIN használata a hangkimenethez %s\n"
-#: client/civclient.c:260
+#: client/civclient.c:261
#, fuzzy
msgid " -r, --read FILE\tRead startup script FILE (for spawned server only)\n"
msgstr " -r, --read FÁJL\tA FÁJL inicializáló szkript futtatása\n"
-#: client/civclient.c:263
+#: client/civclient.c:264
#, fuzzy
msgid " -s, --server HOST\tConnect to the server at HOST (usually with -a)\n"
msgstr ""
" -s, --server HOST\tA HOST címen található szerverhez való kapcsolódás\n"
-#: client/civclient.c:265
+#: client/civclient.c:266
msgid " -S, --Sound FILE\tRead sound tags from FILE\n"
msgstr " -S, --Sound FÁJL\tHang tag-ek beolvasása a FÁJL fájlból\n"
-#: client/civclient.c:266
+#: client/civclient.c:267
msgid " -t, --tiles FILE\tUse data file FILE.tilespec for tiles\n"
msgstr ""
" -t, --tiles FÁJL\tA FÁJL.tilespec adatfájl használata a mezõkészlethez\n"
-#: client/civclient.c:269
+#: client/civclient.c:270
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7828,45 +7959,45 @@ msgid ""
msgstr ""
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:274
+#: client/civclient.c:275
#, fuzzy, c-format
msgid "Report bugs at %s\n"
msgstr "Hibajelentéseket a(z) <%s> címre küldj.\n"
-#: client/civclient.c:298
+#: client/civclient.c:299
#, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr ""
-#: client/civclient.c:300 client/civclient.c:315
+#: client/civclient.c:301 client/civclient.c:316
msgid "Try using --help.\n"
msgstr ""
-#: client/civclient.c:313
+#: client/civclient.c:314
#, c-format
msgid "Invalid debug level \"%s\" specified with --debug option.\n"
msgstr ""
-#: client/civclient.c:326
+#: client/civclient.c:327
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr "Ismeretlen opció: \"%s\"\n"
-#: client/civclient.c:391
+#: client/civclient.c:393
#, fuzzy, c-format
msgid "Updating old metaserver address \"%s\"."
msgstr "metaserver <cím>"
-#: client/civclient.c:394
+#: client/civclient.c:396
#, fuzzy, c-format
msgid "Default metaserver has been set to \"%s\"."
msgstr "A(z) %s beállítás új értéke: \"%s\"."
-#: client/civclient.c:550
+#: client/civclient.c:540
msgid "Game started."
msgstr "A játék elkezdõdött."
-#: client/civclient.c:588
+#: client/civclient.c:606
msgid "There was an error while auto connecting; aborting."
msgstr "Hiba történt az automatikus kapcsolódás közben; félbeszakítás."
@@ -8001,18 +8132,18 @@ msgstr "Kapcsol
msgid "Disconnected from server."
msgstr "Elszakadás a szervertõl"
-#: client/clinet.c:469
+#: client/clinet.c:473
#, c-format
msgid "Failed to contact server \"%s\" at port %d as \"%s\" after %d attempts"
msgstr ""
"Nem sikerült kapcsolódni a(z) \"%s\" szerver %d portjára \"%s\" néven (%d "
"kapcsolódási kísérlet)"
-#: client/clinet.c:484 client/clinet.c:486
+#: client/clinet.c:488 client/clinet.c:490
msgid "Connection to server refused. Please start the server."
msgstr "Nem sikerült kapcsolódni a szerverhez. Indíts el egy szervert!"
-#: client/clinet.c:495 client/clinet.c:523
+#: client/clinet.c:499 client/clinet.c:527
#, c-format
msgid ""
"Error contacting server \"%s\" at port %d as \"%s\":\n"
@@ -8022,7 +8153,7 @@ msgstr ""
"néven:\n"
" %s\n"
-#: client/clinet.c:514
+#: client/clinet.c:518
#, fuzzy, c-format
msgid ""
"Auto-connecting to server \"%s\" at port %d as \"%s\" every %f second(s) for "
@@ -8031,58 +8162,58 @@ 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:1358
+#: client/connectdlg_common.c:78 client/gui-gtk-2.0/pages.c:1358
#, fuzzy
msgid "novice"
msgstr "semmi"
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1358
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
msgid "easy"
msgstr "könnyû"
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1359
#, fuzzy
msgid "normal"
msgstr "Tisztességes"
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr "nehéz"
-#: client/connectdlg_common.c:83
+#: client/connectdlg_common.c:82
msgid "experimental"
msgstr ""
-#: client/connectdlg_common.c:213
+#: client/connectdlg_common.c:212
#, fuzzy
msgid "Starting server..."
msgstr "Játék indítása."
-#: client/connectdlg_common.c:332
+#: client/connectdlg_common.c:331
#, fuzzy
msgid "Couldn't start the server."
msgstr "Ott nem támadhatsz."
-#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
+#: client/connectdlg_common.c:332 client/connectdlg_common.c:365
msgid "You'll have to start one manually. Sorry..."
msgstr ""
-#: client/connectdlg_common.c:364
+#: client/connectdlg_common.c:363
#, fuzzy
msgid "Couldn't connect to the server."
msgstr "Egy klienssel való kapcsolat megszakítása."
-#: client/connectdlg_common.c:365
+#: client/connectdlg_common.c:364
msgid "We probably couldn't start it from here."
msgstr ""
-#: client/connectdlg_common.c:470
+#: client/connectdlg_common.c:469
#, fuzzy
msgid ""
"Established control over the server. You have command access level 'hack'."
msgstr "Parancselérési szintek lekérdezése és beállítása."
-#: client/connectdlg_common.c:475
+#: client/connectdlg_common.c:474
msgid ""
"Failed to obtain the required access level to take control of the server. "
"The server will now be shutdown."
@@ -8092,29 +8223,29 @@ msgstr ""
msgid "Only transporter units can be unloaded."
msgstr "Csak szállító egységek tudnak kirakodni."
-#: client/control.c:1425
+#: client/control.c:1417
#, fuzzy
msgid "Only settler units can be put into auto mode."
msgstr ""
"Csak telepesek és városban lévõ katonai egységek tehetõk automata módba."
-#: client/control.c:1516
+#: client/control.c:1511
msgid "Only nuclear units can do this."
msgstr "Csak nukleáris egységek tehetik ezt."
-#: client/control.c:1545
+#: client/control.c:1540
msgid "Only paratrooper units can do this."
msgstr "Csak ejtõernyõs egységet tehetik ezt."
-#: client/control.c:2020
+#: client/control.c:2015
msgid "Too far for this unit."
msgstr "Túl messze van az egységtõl."
-#: client/control.c:2230 client/control.c:2260 client/control.c:2276
+#: client/control.c:2225 client/control.c:2255 client/control.c:2271
msgid "Didn't find a route to the destination!"
msgstr "Nem sikerült útvonalat találni a célhoz!"
-#: client/control.c:2320
+#: client/control.c:2315
msgid "Oh my! You seem to have no capital!"
msgstr ""
@@ -8523,29 +8654,34 @@ msgstr ""
#. * last two elements
#. TRANS: List of possible output types has this between
#. * last two elements
-#: client/helpdata.c:1066 client/helpdata.c:1400
+#: client/helpdata.c:1066 client/helpdata.c:1408
msgid " or "
msgstr " vagy "
-#: client/helpdata.c:1068 client/helpdata.c:1388
+#: client/helpdata.c:1068 client/helpdata.c:1396
msgid "?or:, "
msgstr "?or:, "
-#: client/helpdata.c:1080
+#: client/helpdata.c:1079
+#, c-format
+msgid "* Unit has to be in a city, or a base after %d turn.\n"
+msgid_plural "* Unit has to be in a city, or a base after %d turns.\n"
+msgstr[0] ""
+
+#: client/helpdata.c:1087
#, 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"
+msgid "* Unit has to be in a city, a base, or on a %s after %d turn.\n"
+msgid_plural "* Unit has to be in a city, a base, or on a %s after %d turns.\n"
msgstr[0] ""
-msgstr[1] ""
-#: client/helpdata.c:1122
+#: client/helpdata.c:1130
#, 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:1127
+#: client/helpdata.c:1135
#, c-format
msgid ""
"To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8554,97 +8690,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:1135
+#: client/helpdata.c:1143
msgid "You cannot research this technology."
msgstr ""
-#: client/helpdata.c:1139
+#: client/helpdata.c:1147
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:1151
+#: client/helpdata.c:1159
#, 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:1156
+#: client/helpdata.c:1164
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
msgstr ""
-#: client/helpdata.c:1159
+#: client/helpdata.c:1167
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
msgstr ""
-#: client/helpdata.c:1163
+#: client/helpdata.c:1171
#, fuzzy
msgid "* Increases the pollution generated by the population.\n"
msgstr "Növeli a lakosság által termelt szennyezést.\n"
-#: client/helpdata.c:1168
+#: client/helpdata.c:1176
#, 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:1175
+#: client/helpdata.c:1183
#, 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:1183
+#: client/helpdata.c:1191
#, 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:1192
+#: client/helpdata.c:1200
#, 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:1200
+#: client/helpdata.c:1208
#, 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:1234
+#: client/helpdata.c:1242
msgid "* Pollution cannot be generated on this terrain."
msgstr ""
-#: client/helpdata.c:1239
+#: client/helpdata.c:1247
#, fuzzy
msgid "* You cannot build cities on this terrain."
msgstr "Ennek a népnek az egységeit nem lehet lefizetni."
-#: client/helpdata.c:1245
+#: client/helpdata.c:1253
msgid "* The coastline of this terrain is unsafe."
msgstr ""
-#: client/helpdata.c:1250
+#: client/helpdata.c:1258
msgid "* This terrain is unsafe for units to travel on."
msgstr ""
-#: client/helpdata.c:1255
+#: client/helpdata.c:1263
msgid "* Land units cannot travel on oceanic terrains."
msgstr ""
-#: client/helpdata.c:1305
+#: client/helpdata.c:1313
msgid "Features:\n"
msgstr ""
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1411 client/helpdata.c:1412
+#: client/helpdata.c:1419 client/helpdata.c:1420
msgid "?outputlist: Nothing "
msgstr ""
-#: client/helpdata.c:1419
+#: client/helpdata.c:1427
#, fuzzy, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -8654,7 +8790,7 @@ msgid_plural ""
"become unhappy.\n"
msgstr[0] "A harcmezõn lévõ katonai egységek boldogtalanságot okozhatnak. "
-#: client/helpdata.c:1429
+#: client/helpdata.c:1437
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8662,48 +8798,48 @@ msgid ""
msgstr ""
#. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1437
+#: client/helpdata.c:1445
#, c-format
msgid "* You pay %d times normal %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1442
+#: client/helpdata.c:1450
#, 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:1447
+#: client/helpdata.c:1455
#, c-format
msgid "* You pay no %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1451
+#: client/helpdata.c:1459
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:1460
+#: client/helpdata.c:1468
#, 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:1468
+#: client/helpdata.c:1476
#, c-format
msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
msgstr ""
-#: client/helpdata.c:1475
+#: client/helpdata.c:1483
#, 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:1482
+#: client/helpdata.c:1490
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -8711,23 +8847,23 @@ msgid ""
msgstr ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1489
+#: client/helpdata.c:1497
#, 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:1497
+#: client/helpdata.c:1505
#, c-format
msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
msgstr ""
-#: client/helpdata.c:1502
+#: client/helpdata.c:1510
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr ""
-#: client/helpdata.c:1507
+#: client/helpdata.c:1515
#, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -8737,71 +8873,71 @@ msgid_plural ""
"force %d unhappy citizens to become content.\n"
msgstr[0] ""
-#: client/helpdata.c:1519
+#: client/helpdata.c:1527
#, 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:1530
+#: client/helpdata.c:1538
#, 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:1536
+#: client/helpdata.c:1544
#, 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:1539
+#: client/helpdata.c:1547
#, fuzzy
msgid "* Your cities cannot be incited.\n"
msgstr "A város nem lázítható fel!"
-#: client/helpdata.c:1543
+#: client/helpdata.c:1551
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:1549
+#: client/helpdata.c:1557
msgid "* Has a senate that may prevent declaration of war.\n"
msgstr ""
-#: client/helpdata.c:1553
+#: client/helpdata.c:1561
msgid "* Allows partisans when cities are taken by the enemy.\n"
msgstr ""
-#: client/helpdata.c:1557
+#: client/helpdata.c:1565
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
msgstr ""
-#: client/helpdata.c:1561
+#: client/helpdata.c:1569
msgid "* Pays no upkeep for fanatics.\n"
msgstr ""
-#: client/helpdata.c:1564
+#: client/helpdata.c:1572
#, fuzzy
msgid "* Has no unhappy citizens.\n"
msgstr "a plusz %d boldogtalan lakosos büntetés életbe lépéséig."
-#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
+#: client/helpdata.c:1582 client/helpdata.c:1586 client/helpdata.c:1590
#, c-format
msgid "* Veteran %s units.\n"
msgstr ""
-#: client/helpdata.c:1585
+#: client/helpdata.c:1593
#, fuzzy
msgid "* Veteran units.\n"
msgstr "Tengeri egységek ellen"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1591
+#: client/helpdata.c:1599
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8809,7 +8945,7 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1600
+#: client/helpdata.c:1608
#, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8817,71 +8953,71 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1608
+#: client/helpdata.c:1616
#, 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:1617
+#: client/helpdata.c:1625
#, c-format
msgid "* %s production is increased %d%%.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1625
+#: client/helpdata.c:1633
#, c-format
msgid "* %s production will suffer massive waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1630
+#: client/helpdata.c:1638
#, c-format
msgid "* %s production will suffer some waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1635
+#: client/helpdata.c:1643
#, 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:1643
+#: client/helpdata.c:1651
#, 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:1649
+#: client/helpdata.c:1657
#, 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:1655
+#: client/helpdata.c:1663
#, c-format
msgid "* %s waste will increase slowly with distance from capital.\n"
msgstr ""
-#: client/helpdata.c:1672
+#: client/helpdata.c:1680
#, 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:1699
+#: client/helpdata.c:1707
#, fuzzy, c-format
msgid "%s%d %s"
msgstr "%3d/%3d %s"
-#: client/helpdata.c:1700 client/helpdata.c:1708 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1708 client/helpdata.c:1716 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:1707
+#: client/helpdata.c:1715
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d boldogtalan"
@@ -8956,7 +9092,7 @@ msgid ""
"or with the -a command-line parameter."
msgstr ""
-#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:916 data/Freeciv.in:107
msgid "Metaserver"
msgstr "Metaszerver"
@@ -9326,36 +9462,36 @@ msgstr "Nem siker
msgid "Saved settings to file %s"
msgstr "Beállítások elmentve a(z) %s fájlba"
-#: client/packhand.c:211 client/packhand.c:217
+#: client/packhand.c:212 client/packhand.c:218
#, fuzzy
msgid "You were rejected from the game...."
msgstr "Kiutasítottak a játékból:"
-#: client/packhand.c:229
+#: client/packhand.c:230
#, c-format
msgid "Client capability string: %s"
msgstr "A kliens képességei: %s"
-#: client/packhand.c:232
+#: client/packhand.c:233
#, c-format
msgid "Server capability string: %s"
msgstr "A szerver képességei: %s"
-#: client/packhand.c:850
+#: client/packhand.c:864
#, c-format
msgid "Start of turn %d"
msgstr "Elkezdõdött a(z) %d. kör"
-#: client/packhand.c:1591
+#: client/packhand.c:1621
#, c-format
msgid "AI Mode is now %s."
msgstr "Az MI irányítás %s van kapcsolva."
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "ON"
msgstr "BE"
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "OFF"
msgstr "KI"
@@ -9389,15 +9525,15 @@ msgstr "?city:N
msgid "Username"
msgstr "Átnevezés"
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
-#: client/gui-gtk-2.0/pages.c:2157
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:653
+#: client/gui-gtk-2.0/pages.c:1604 client/gui-gtk-2.0/pages.c:2159
msgid "Flag"
msgstr "Zászló"
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1605
-#: client/gui-gtk-2.0/pages.c:2159 client/gui-sdl/repodlgs.c:2063
-#: client/gui-win32/connectdlg.c:990 client/gui-win32/dialogs.c:542
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:657
+#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1609
+#: client/gui-gtk-2.0/pages.c:2161 client/gui-sdl/repodlgs.c:2063
+#: client/gui-win32/connectdlg.c:992 client/gui-win32/dialogs.c:542
#: client/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "Nép"
@@ -9412,7 +9548,7 @@ msgstr "B
msgid "Score"
msgstr "Pontszámok"
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1614
#, fuzzy
msgid "Team"
msgstr "Templom"
@@ -9449,37 +9585,37 @@ msgstr ""
msgid "Ping"
msgstr "Király"
-#: client/repodlgs_common.c:375
+#: client/repodlgs_common.c:378
#, fuzzy
msgid "You cannot sell improvements."
msgstr "Épület szabotálása"
-#: client/repodlgs_common.c:391
+#: client/repodlgs_common.c:394
#, fuzzy, c-format
msgid "Sold %d %s for %d gold."
msgstr "%d %s eladva %d aranyért"
-#: client/repodlgs_common.c:396
+#: client/repodlgs_common.c:399
#, fuzzy, c-format
msgid "No %s could be sold."
msgstr "Egy %s sem adható el"
#. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:415
+#: client/repodlgs_common.c:418
msgid "You cannot disband units."
msgstr ""
-#: client/repodlgs_common.c:420
+#: client/repodlgs_common.c:423
#, fuzzy, c-format
msgid "%s cannot be disbanded."
msgstr "Egy %si %s feloszlott, mert a város nem tudja fenntartani."
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:444
#, fuzzy, c-format
msgid "Disbanded %d %s."
msgstr "Feloszlott egy %s egységed a(z) (%d, %d) mezõn."
-#: client/repodlgs_common.c:445
+#: client/repodlgs_common.c:448
#, fuzzy, c-format
msgid "No %s could be disbanded."
msgstr "Egy %s sem adható el"
@@ -10065,72 +10201,72 @@ msgstr "?dys/hrs:%02dnap %02d
msgid "?duration:overflow"
msgstr "?duration:túlcsordulás"
-#: client/text.c:1143
+#: client/text.c:1145
#, c-format
msgid "%6d.%02d ms"
msgstr ""
#. TRANS: <nation adjective> <government name>.
#. * E.g. "Polish Republic".
-#: client/text.c:1188
+#: client/text.c:1193
#, fuzzy, c-format
msgid "?nationgovernment:%s %s"
msgstr "Államforma: %s"
#. TRANS: "Observer: 1985"
-#: client/text.c:1198
+#: client/text.c:1203
#, fuzzy, c-format
msgid "Observer: %s"
msgstr " (megfigyelõ)"
-#: client/text.c:1216
+#: client/text.c:1221
msgid "Buildings: "
msgstr "Épületek: "
-#: client/text.c:1233 client/text.c:1272
+#: client/text.c:1238 client/text.c:1277
msgid "None. "
msgstr "Nincsenek. "
-#: client/text.c:1235 client/text.c:1274
+#: client/text.c:1240 client/text.c:1279
msgid "?clistend:."
msgstr "."
-#: client/text.c:1253
+#: client/text.c:1258
msgid "Wonders: "
msgstr "Világcsodák: "
-#: client/text.c:1308
+#: client/text.c:1313
#, 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:1312
+#: client/text.c:1317
#, 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:1318
+#: client/text.c:1323
#, 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."
-#: client/text.c:1339
+#: client/text.c:1344
#, fuzzy
msgid "Unlimited martial law in effect."
msgstr "Katonai jelenlét hatása ("
-#: client/text.c:1341
+#: client/text.c:1346
#, fuzzy, c-format
msgid "%d military unit may impose martial law."
msgid_plural "Up to %d military units may impose martial law."
msgstr[0] ""
"* Nem katonai egység (nem tud támadni; nem csökkenti a zavargást).\n"
-#: client/text.c:1345
+#: client/text.c:1350
#, fuzzy, c-format
msgid "Each military unit makes %d unhappy citizen content."
msgid_plural "Each military unit makes %d unhappy citizens content."
@@ -10138,32 +10274,32 @@ msgstr[0] ""
"Szórakozási lehetõségeket nyújt a város lakosainak, és ezzel 3 elégedetlen "
"lakost közömbösít."
-#: client/text.c:1352
+#: client/text.c:1357
msgid "Military units in the field may cause unhappiness. "
msgstr "A harcmezõn lévõ katonai egységek boldogtalanságot okozhatnak. "
-#: client/text.c:1355
+#: client/text.c:1360
msgid "Military units have no happiness effect. "
msgstr "A katonai egységek nincsenek hatással a közhangulatra. "
-#: client/text.c:1370
+#: client/text.c:1375
#, c-format
msgid "Luxury: %d total."
msgstr "Luxus: összesen %d."
-#: client/tilespec.c:865
+#: client/tilespec.c:882
#, fuzzy
msgid "No usable default tileset found, aborting!"
msgstr "Nincs használható alapértelmezett mezõkészlet; félbeszakítás!"
-#: client/tilespec.c:1338
+#: client/tilespec.c:1355
msgid ""
"Client does not support isometric tilesets. Using default tileset instead."
msgstr ""
"A kliens nem támogatja az izometrikus mezõkészleteket. Alapértelmezett "
"mezõkészlet használata."
-#: client/tilespec.c:1347
+#: client/tilespec.c:1364
msgid ""
"Client does not support overhead view tilesets. Using default tileset "
"instead."
@@ -10171,7 +10307,7 @@ msgstr ""
"A kliens nem támogatja a felülnézeti mezõkészleteket. Alapértelmezett "
"mezõkészlet használata."
-#: client/tilespec.c:3966
+#: client/tilespec.c:3987
#, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -10882,7 +11018,7 @@ msgid "_Display"
msgstr "_Megjelenítés..."
#: client/gui-gtk-2.0/cityrep.c:1006 client/gui-gtk-2.0/menu.c:839
-#: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
+#: client/gui-sdl/diplodlg.c:692 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
#: client/gui-xaw/cityrep.c:533 client/gui-xaw/menu.c:156
@@ -11053,214 +11189,214 @@ msgstr "Mi legyen az
msgid "Remove this preset?"
msgstr "Töröljem ezt a mintát?"
-#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:222
+#: client/gui-gtk-2.0/dialogs.c:197 client/gui-gtk-2.0/messagewin.c:222
msgid "Goto _Location"
msgstr "Menj (_L)"
-#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
+#: client/gui-gtk-2.0/dialogs.c:202 client/gui-gtk-2.0/messagewin.c:226
#, fuzzy
msgid "Inspect _City"
msgstr "_Városablak felnyitása"
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:258 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:258 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:259 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:311 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:312 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:312 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:313 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:506
+#: client/gui-gtk-2.0/dialogs.c:507
#, fuzzy
msgid "Unit"
msgstr "Egységek"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:950
-#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2155
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:985
+#: client/gui-gtk-2.0/dialogs.c:508 client/gui-gtk-2.0/pages.c:950
+#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2157
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:987
#: 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:519 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:520 client/gui-sdl/dialogs.c:627
msgid "Unit selection"
msgstr "Egységválasztás"
-#: client/gui-gtk-2.0/dialogs.c:582
+#: client/gui-gtk-2.0/dialogs.c:583
#, fuzzy
msgid "_Ready all"
msgstr "Mindenki készenlétbe"
-#: client/gui-gtk-2.0/dialogs.c:590
+#: client/gui-gtk-2.0/dialogs.c:591
#, fuzzy
msgid "_Sentry idle"
msgstr "A tétlen egységek õrködjenek (_s)"
-#: client/gui-gtk-2.0/dialogs.c:719
+#: client/gui-gtk-2.0/dialogs.c:721
#, fuzzy
msgid "Nation _Groups:"
msgstr "_Nép:"
-#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:766 data/Freeciv.in:3128
msgid "What Nation Will You Be?"
msgstr "Melyik nemzet leszel?"
-#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
-#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
+#: client/gui-gtk-2.0/dialogs.c:768 client/gui-sdl/chatline.c:842
+#: client/gui-win32/connectdlg.c:1040 data/Freeciv.in:3371
#, fuzzy
msgid "Pick Nation"
msgstr "Rendõrállomás"
-#: client/gui-gtk-2.0/dialogs.c:774
+#: client/gui-gtk-2.0/dialogs.c:776
#, fuzzy
msgid "_Random Nation"
msgstr "Egyesült Nemzetek"
-#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:792 client/gui-win32/dialogs.c:517
#, fuzzy
msgid "Select a nation"
msgstr "Válassz célt"
-#: client/gui-gtk-2.0/dialogs.c:804
+#: client/gui-gtk-2.0/dialogs.c:810
#, fuzzy
msgid "_Properties"
msgstr "Prófétanõ"
-#: client/gui-gtk-2.0/dialogs.c:824
+#: client/gui-gtk-2.0/dialogs.c:830
#, fuzzy
msgid "_Leader:"
msgstr "Vezetõ:"
-#: client/gui-gtk-2.0/dialogs.c:831
+#: client/gui-gtk-2.0/dialogs.c:837
#, fuzzy
msgid "_Female"
msgstr "Lány"
-#: client/gui-gtk-2.0/dialogs.c:836
+#: client/gui-gtk-2.0/dialogs.c:842
#, fuzzy
msgid "_Male"
msgstr "Fiú"
-#: client/gui-gtk-2.0/dialogs.c:863
+#: client/gui-gtk-2.0/dialogs.c:869
#, fuzzy
msgid "City _Styles:"
msgstr "_Városstílus"
-#: client/gui-gtk-2.0/dialogs.c:902
+#: client/gui-gtk-2.0/dialogs.c:908
#, fuzzy
msgid "_Description"
msgstr "Légió"
-#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1263 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:1253 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1268 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:1262 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1277 client/gui-sdl/dialogs.c:2204
#: 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:1306 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1318 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:1315 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1327 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 "Elavult egységek felfejlesztése"
-#: client/gui-gtk-2.0/diplodlg.c:231 client/gui-win32/diplodlg.c:151
+#: client/gui-gtk-2.0/diplodlg.c:222 client/gui-win32/diplodlg.c:151
#: client/gui-xaw/diplodlg.c:383 client/gui-xaw/diplodlg.c:401
msgid "World-map"
msgstr "Világtérkép"
-#: client/gui-gtk-2.0/diplodlg.c:237 client/gui-win32/diplodlg.c:146
+#: client/gui-gtk-2.0/diplodlg.c:228 client/gui-win32/diplodlg.c:146
#: client/gui-xaw/diplodlg.c:387 client/gui-xaw/diplodlg.c:405
msgid "Sea-map"
msgstr "Hajózási térkép"
-#: client/gui-gtk-2.0/diplodlg.c:243
+#: client/gui-gtk-2.0/diplodlg.c:234
#, fuzzy
msgid "_Maps"
msgstr "Térképek"
-#: client/gui-gtk-2.0/diplodlg.c:274
+#: client/gui-gtk-2.0/diplodlg.c:265
#, fuzzy
msgid "_Advances"
msgstr "Technológiák"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/diplodlg.c:315 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "_Városok"
-#: client/gui-gtk-2.0/diplodlg.c:333
+#: client/gui-gtk-2.0/diplodlg.c:324
#, fuzzy
msgid "_Give shared vision"
msgstr "Közös látvány biztosítása"
-#: client/gui-gtk-2.0/diplodlg.c:346
+#: client/gui-gtk-2.0/diplodlg.c:337
#, fuzzy
msgid "Give _embassy"
msgstr "Követség"
-#: client/gui-gtk-2.0/diplodlg.c:376
+#: client/gui-gtk-2.0/diplodlg.c:368
#, fuzzy
msgid "_Pacts"
msgstr "Egyezmények"
-#: client/gui-gtk-2.0/diplodlg.c:466
+#: client/gui-gtk-2.0/diplodlg.c:458
#, fuzzy, c-format
msgid "Diplomacy: %s"
msgstr "Diplomata"
-#: client/gui-gtk-2.0/diplodlg.c:473
+#: client/gui-gtk-2.0/diplodlg.c:465
msgid "_Cancel meeting"
msgstr "Találkozó _megszakítása"
-#: client/gui-gtk-2.0/diplodlg.c:475
+#: client/gui-gtk-2.0/diplodlg.c:467
#, fuzzy
msgid "Accept _treaty"
msgstr "Egyezmény elfogadása"
-#: client/gui-gtk-2.0/diplodlg.c:503
+#: client/gui-gtk-2.0/diplodlg.c:495
#, fuzzy
msgid "C_lauses:"
msgstr "_Bezárás"
-#: client/gui-gtk-2.0/diplodlg.c:568 client/gui-gtk-2.0/diplodlg.c:642
+#: client/gui-gtk-2.0/diplodlg.c:560 client/gui-gtk-2.0/diplodlg.c:634
#, fuzzy
msgid "_Gold:"
msgstr "Arany:"
-#: client/gui-gtk-2.0/diplodlg.c:580 client/gui-gtk-2.0/diplodlg.c:654
+#: client/gui-gtk-2.0/diplodlg.c:572 client/gui-gtk-2.0/diplodlg.c:646
msgid "_Add Clause..."
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:699
+#: client/gui-gtk-2.0/diplodlg.c:691
msgid "--- This treaty is blank. Please add some clauses. ---"
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:905 client/gui-sdl/diplodlg.c:375
+#: client/gui-gtk-2.0/diplodlg.c:897 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 "Nem megfelelõ aranymennyiséget adtál meg."
@@ -11322,101 +11458,101 @@ msgstr "V
msgid "Show _All Cities"
msgstr "Összes város"
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:164
#, fuzzy
msgid "Show Map Scrollbars"
msgstr "Térkép görgetõsávjainak megjelenítése (csak GTK)"
-#: client/gui-gtk-2.0/gui_main.c:163
+#: client/gui-gtk-2.0/gui_main.c:165
msgid "Disable this option to hide the scrollbars on the map view."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:169
msgid "Keyboardless goto"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:168
+#: client/gui-gtk-2.0/gui_main.c:170
msgid ""
"If this option is set then a goto may be initiated by left-clicking and then "
"holding down the mouse button while dragging the mouse onto a different tile."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:173
+#: client/gui-gtk-2.0/gui_main.c:175
#, fuzzy
msgid "Keep dialogs on top"
msgstr "Felbukkanó ablakok MI módban"
-#: client/gui-gtk-2.0/gui_main.c:174
+#: client/gui-gtk-2.0/gui_main.c:176
msgid ""
"If this option is set then dialog windows will always remain in front of the "
"main Freeciv window. Disabling this has no effect in fullscreen mode."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:178
+#: client/gui-gtk-2.0/gui_main.c:180
msgid "Show worklist task icons"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:179
+#: client/gui-gtk-2.0/gui_main.c:181
msgid ""
"Disabling this will turn off the unit and building icons in the worklist "
"dialog and the production tab of the city dialog."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:183
+#: client/gui-gtk-2.0/gui_main.c:185
msgid "Enable status report tabs"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:184
+#: client/gui-gtk-2.0/gui_main.c:186
msgid ""
"If this option is enabled then report dialogs will be shown as separate tabs "
"rather than in popup dialogs."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:189 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:191 client/gui-win32/gui_main.c:110
msgid "Better fog-of-war drawing"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:190 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:192 client/gui-win32/gui_main.c:111
msgid ""
"If this is enabled then a better method is used for drawing fog-of-war. It "
"is not any slower but will consume about twice as much memory."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:195
+#: client/gui-gtk-2.0/gui_main.c:197
msgid "Show time for each chat message"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:196
+#: client/gui-gtk-2.0/gui_main.c:198
msgid ""
"If this option is enabled then all chat messages will be prefixed by a time "
"string of the form [hour:minute:second]."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:201
+#: client/gui-gtk-2.0/gui_main.c:203
msgid "Split bottom notebook area"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:202
+#: client/gui-gtk-2.0/gui_main.c:204
msgid ""
"Enabling this option will split the bottom notebook into a left and right "
"notebook so that two tabs may be viewed at once."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:207
+#: client/gui-gtk-2.0/gui_main.c:209
msgid "New message events go to top of list"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:208
+#: client/gui-gtk-2.0/gui_main.c:210
msgid ""
"If this option is enabled, new events in the message window will appear at "
"the top of the list, rather than being appended at the bottom."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:213
+#: client/gui-gtk-2.0/gui_main.c:215
msgid "Show extra message window buttons"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:214
+#: client/gui-gtk-2.0/gui_main.c:216
msgid ""
"If this option is enabled, there will be two buttons displayed in the "
"message window for inspecting a city and going to a location. If this option "
@@ -11426,22 +11562,22 @@ msgid ""
"closed and reopened."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:224
+#: client/gui-gtk-2.0/gui_main.c:226
#, fuzzy
msgid "Metaserver tab first in network page"
msgstr "Az infó sor a metaszerveren mostantól '%s'."
-#: client/gui-gtk-2.0/gui_main.c:225
+#: client/gui-gtk-2.0/gui_main.c:227
msgid ""
"If this option is enabled, the metaserver tab will be the first notebook tab "
"in the network page. This option requires a restart in order to take effect."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:230
+#: client/gui-gtk-2.0/gui_main.c:232
msgid "Plain chat messages are sent to allies only"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:231
+#: client/gui-gtk-2.0/gui_main.c:233
msgid ""
"If this option is enabled, then plain messages typed into the chat entry "
"while the game is running will only be sent to your allies. Otherwise plain "
@@ -11451,28 +11587,41 @@ msgid ""
"visible in multiplayer games)."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:340 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:245
+msgid "Arrange widgets for small displays"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:246
+msgid ""
+"If this option is enabled, widgets in the main window will be arrange so "
+"that they take up the least amount of total screen space. Specifically, the "
+"left panel containing the overview, player status, and the unit information "
+"box will be extended over the entire left side of the window. This option "
+"requires a restart in order to take effect."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:352 client/gui-xaw/gui_main.c:245
msgid ""
"This client has no special command line options\n"
"\n"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
+#: client/gui-gtk-2.0/gui_main.c:847 client/gui-gtk-2.0/gui_main.c:1542
msgid "Freeciv"
msgstr "Freeciv"
-#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
+#: client/gui-gtk-2.0/gui_main.c:1251 client/gui-gtk-2.0/gui_main.c:1258
#: client/gui-sdl/mapctrl.c:1566 client/gui-win32/gui_main.c:482
#: data/Freeciv.in:2618
msgid "Turn Done"
msgstr "Kör vége"
-#: client/gui-gtk-2.0/gui_main.c:1232 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1258 client/gui-sdl/mapctrl.c:1566
#: client/gui-sdl/mapview.c:1082
msgid "Shift+Return"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1266 client/gui-gtk-2.0/menu.c:797
+#: client/gui-gtk-2.0/gui_main.c:1299 client/gui-gtk-2.0/menu.c:797
#: client/gui-gtk-2.0/menu.c:799 client/gui-gtk-2.0/menu.c:801
#: client/gui-gtk-2.0/menu.c:803 client/gui-gtk-2.0/menu.c:805
#: client/gui-gtk-2.0/menu.c:807 client/gui-gtk-2.0/menu.c:809
@@ -11491,12 +11640,12 @@ msgstr ""
msgid "View"
msgstr "Látvány"
-#: client/gui-gtk-2.0/gui_main.c:1359
+#: client/gui-gtk-2.0/gui_main.c:1393
#, fuzzy
msgid "Chat"
msgstr "Harci Szekér"
-#: client/gui-gtk-2.0/gui_main.c:1377 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1411 client/gui-win32/gui_main.c:538
#: data/Freeciv.in:2809
msgid ""
"Freeciv is free software and you are welcome to distribute copies of it\n"
@@ -11508,96 +11657,96 @@ msgstr ""
"(Lásd a \"Másolás\" pontot a Súgó menüben.)\n"
"És most.. Adj nekik! :)"
-#: client/gui-gtk-2.0/gui_main.c:1392
+#: client/gui-gtk-2.0/gui_main.c:1426
msgid "Allies Only"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1657
+#: client/gui-gtk-2.0/gui_main.c:1691
msgid "Not _ready"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
+#: client/gui-gtk-2.0/gui_main.c:1702 client/gui-gtk-2.0/pages.c:1679
#, fuzzy
msgid "_Ready"
msgstr "Mindenki készenlétbe"
-#: client/gui-gtk-2.0/gui_main.c:1672 client/gui-gtk-2.0/gui_main.c:1678
-#: client/gui-gtk-2.0/pages.c:2204
+#: client/gui-gtk-2.0/gui_main.c:1706 client/gui-gtk-2.0/gui_main.c:1712
+#: client/gui-gtk-2.0/pages.c:2206
#, fuzzy
msgid "_Start"
msgstr "Állapot"
-#: client/gui-gtk-2.0/gui_main.c:1686
+#: client/gui-gtk-2.0/gui_main.c:1720
#, fuzzy
msgid "_Take Player"
msgstr "Városok"
-#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
+#: client/gui-gtk-2.0/gui_main.c:1723 client/gui-gtk-2.0/pages.c:1669
#, fuzzy
msgid "Pick _Nation"
msgstr "Rendõrállomás"
-#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
+#: client/gui-gtk-2.0/gui_main.c:1730 client/gui-gtk-2.0/pages.c:1674
#, fuzzy
msgid "_Observe"
msgstr " (megfigyelõ)"
-#: client/gui-gtk-2.0/gui_main.c:1698
+#: client/gui-gtk-2.0/gui_main.c:1732
#, 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:1720 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1755 client/gui-xaw/pages.c:211
#, fuzzy
msgid "<AI>"
msgstr "MI"
-#: client/gui-gtk-2.0/gui_main.c:1723
+#: client/gui-gtk-2.0/gui_main.c:1758
msgid "<Novice AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1726
+#: client/gui-gtk-2.0/gui_main.c:1761
#, fuzzy
msgid "<Easy AI>"
msgstr "MI"
-#: client/gui-gtk-2.0/gui_main.c:1729
+#: client/gui-gtk-2.0/gui_main.c:1764
msgid "<Normal AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1732
+#: client/gui-gtk-2.0/gui_main.c:1767
#, fuzzy
msgid "<Hard AI>"
msgstr "MI"
-#: client/gui-gtk-2.0/gui_main.c:1742 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1777 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:1808
+#: client/gui-gtk-2.0/gui_main.c:1844 client/gui-gtk-2.0/gui_main.c:1858
#, fuzzy
msgid "Observer"
msgstr " (megfigyelõ)"
-#: client/gui-gtk-2.0/gui_main.c:1808
+#: client/gui-gtk-2.0/gui_main.c:1858
#, fuzzy
msgid "Detached"
msgstr ", Legyõzött"
-#: client/gui-gtk-2.0/gui_main.c:2073
+#: client/gui-gtk-2.0/gui_main.c:2117
msgid "Are you sure you want to quit?"
msgstr ""
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
#, c-format
msgid ""
"Close Tab:\n"
"%s"
msgstr ""
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
msgid "Ctrl+W"
msgstr ""
@@ -11703,8 +11852,8 @@ msgid "Trans. Rslt/Time:"
msgstr "Átalakítás eredm./elk.ideje:"
#: 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
-#: client/gui-win32/helpdlg.c:709 client/gui-win32/helpdlg.c:733
+#: client/gui-win32/helpdlg.c:502 client/gui-win32/helpdlg.c:550
+#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:739
#: client/gui-xaw/helpdlg.c:759 client/gui-xaw/helpdlg.c:808
#: client/gui-xaw/helpdlg.c:816 client/gui-xaw/helpdlg.c:853
#: client/gui-xaw/helpdlg.c:878
@@ -11751,34 +11900,34 @@ msgstr " (ezzel: "
msgid "?techhelp:"
msgstr "?techhelp:)."
-#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:591
+#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:597
#: client/gui-xaw/helpdlg.c:996
#, c-format
msgid "+%d Trade / %d"
msgstr "+%d kereskedelem / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:595
+#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:601
#: client/gui-xaw/helpdlg.c:1000
#, c-format
msgid "no extra / %d"
msgstr "semmi extra / %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
-#: client/gui-win32/helpdlg.c:602 client/gui-win32/helpdlg.c:616
-#: client/gui-win32/helpdlg.c:635 client/gui-xaw/helpdlg.c:1002
+#: client/gui-gtk-2.0/helpdlg.c:1085 client/gui-win32/helpdlg.c:604
+#: client/gui-win32/helpdlg.c:608 client/gui-win32/helpdlg.c:622
+#: client/gui-win32/helpdlg.c:641 client/gui-xaw/helpdlg.c:1002
#: client/gui-xaw/helpdlg.c:1006 client/gui-xaw/helpdlg.c:1020
#: client/gui-xaw/helpdlg.c:1039
msgid "n/a"
msgstr "-"
-#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:605
+#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:611
#: client/gui-xaw/helpdlg.c:1009
#, c-format
msgid "+%d Food / %d"
msgstr "+%d Élelem / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:619
+#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:625
#: client/gui-xaw/helpdlg.c:1023
#, c-format
msgid "+%d Res. / %d"
@@ -12582,41 +12731,41 @@ msgstr ""
msgid "Connect to Gaming _Zone"
msgstr "Kapcsolódj be itt"
-#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:302
#: client/gui-xaw/connectdlg.c:326
msgid "Passwords don't match, enter password."
msgstr ""
#: client/gui-gtk-2.0/pages.c:779 client/gui-gtk-2.0/pages.c:820
-#: client/gui-win32/connectdlg.c:916
+#: client/gui-win32/connectdlg.c:918
msgid "Server Name"
msgstr "Szervernév"
#: client/gui-gtk-2.0/pages.c:780 client/gui-gtk-2.0/pages.c:821
-#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:916
+#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:918
#: data/Freeciv.in:96
msgid "Port"
msgstr "Port"
#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Version"
msgstr "Verzió"
#: client/gui-gtk-2.0/pages.c:782 client/gui-gtk-2.0/pages.c:823
-#: client/gui-gtk-2.0/pages.c:2161 client/gui-win32/connectdlg.c:917
-#: client/gui-win32/connectdlg.c:995
+#: client/gui-gtk-2.0/pages.c:2163 client/gui-win32/connectdlg.c:919
+#: client/gui-win32/connectdlg.c:997
msgid "Status"
msgstr "Állapot"
#: client/gui-gtk-2.0/pages.c:783 client/gui-gtk-2.0/pages.c:824
#: client/gui-sdl/connectdlg.c:318 client/gui-sdl/plrdlg.c:330
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Players"
msgstr "Játékosok"
#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
-#: client/gui-win32/connectdlg.c:918
+#: client/gui-win32/connectdlg.c:920
msgid "Comment"
msgstr "Megjegyzés"
@@ -12652,9 +12801,9 @@ msgstr ""
msgid "Conf_irm Password:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2165
#: 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:1000
+#: client/gui-win32/citydlg.c:1083 client/gui-win32/connectdlg.c:1002
#: client/gui-win32/wldlg.c:800 client/gui-win32/wldlg.c:806
msgid "Type"
msgstr "Típus"
@@ -12755,7 +12904,7 @@ msgstr ""
msgid "Ruleset _Version:"
msgstr "CMA _kikapcsolása"
-#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2195
#, fuzzy
msgid "_More Game Options..."
msgstr "Üzenetbeállítások..."
@@ -12775,55 +12924,55 @@ msgstr "V
msgid "Ready"
msgstr "Mindenki készenlétbe"
-#: client/gui-gtk-2.0/pages.c:1601
+#: client/gui-gtk-2.0/pages.c:1600
#, fuzzy
msgid "?player:Leader"
msgstr "?city:Név"
-#: client/gui-gtk-2.0/pages.c:1732 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1734 client/gui-sdl/chatline.c:185
msgid "Choose Saved Game to Load"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1824
+#: client/gui-gtk-2.0/pages.c:1826
msgid "Choose Saved Game to _Load:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
-#: client/gui-gtk-2.0/pages.c:2451
+#: client/gui-gtk-2.0/pages.c:1846 client/gui-gtk-2.0/pages.c:2039
+#: client/gui-gtk-2.0/pages.c:2455
#, fuzzy
msgid "_Browse..."
msgstr "_Megjelenítés..."
-#: client/gui-gtk-2.0/pages.c:1911
+#: client/gui-gtk-2.0/pages.c:1913
#, fuzzy
msgid "Choose a Scenario"
msgstr "Scenario betöltése"
-#: client/gui-gtk-2.0/pages.c:1998
+#: client/gui-gtk-2.0/pages.c:2000
#, fuzzy
msgid "Choose a _Scenario:"
msgstr "Scenario betöltése"
-#: client/gui-gtk-2.0/pages.c:2173
+#: client/gui-gtk-2.0/pages.c:2175
#, fuzzy
msgid "Choose a _nation to play:"
msgstr "Válassz tevékenységet:"
-#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2367 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:2448 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2452 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "Játék elmentése"
-#: client/gui-gtk-2.0/pages.c:2489
+#: client/gui-gtk-2.0/pages.c:2493
#, fuzzy
msgid "Saved _Games:"
msgstr "Játék elmentése"
-#: client/gui-gtk-2.0/pages.c:2516
+#: client/gui-gtk-2.0/pages.c:2520
#, fuzzy
msgid "Save _Filename:"
msgstr "Játék elmentése"
@@ -13186,7 +13335,7 @@ msgstr "V
msgid "Total users logged in : %d"
msgstr ""
-#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1098
#, fuzzy
msgid "Back"
msgstr "Bank"
@@ -13197,7 +13346,7 @@ msgid "Start"
msgstr "Állapot"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:777
+#: client/gui-win32/connectdlg.c:779
msgid "Load Game"
msgstr "Játék betöltése"
@@ -13239,9 +13388,9 @@ msgstr "Ell
#: client/gui-sdl/connectdlg.c:308 client/gui-sdl/connectdlg.c:617
#: client/gui-sdl/connectdlg.c:803 client/gui-sdl/connectdlg.c:985
#: client/gui-sdl/dialogs.c:452 client/gui-sdl/dialogs.c:2095
-#: client/gui-sdl/dialogs.c:2893 client/gui-sdl/diplomat_dialog.c:731
+#: client/gui-sdl/dialogs.c:2902 client/gui-sdl/diplomat_dialog.c:731
#: client/gui-sdl/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1043
#: client/gui-win32/dialogs.c:1772 client/gui-win32/finddlg.c:127
#: client/gui-win32/gotodlg.c:171 client/gui-win32/inputdlg.c:146
#: client/gui-win32/messagedlg.c:216 client/gui-win32/ratesdlg.c:328
@@ -13286,7 +13435,7 @@ msgid "Buy it?"
msgstr "Vegyük meg!"
#: 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
+#: client/gui-sdl/diplodlg.c:1336 client/gui-sdl/diplomat_dialog.c:1211
#: client/gui-sdl/diplomat_dialog.c:1417 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:221 client/gui-sdl/repodlgs.c:1559
#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
@@ -13302,7 +13451,7 @@ msgid "No"
msgstr "Nem"
#: client/gui-sdl/citydlg.c:1215 client/gui-sdl/cma_fe.c:318
-#: client/gui-sdl/diplodlg.c:1345 client/gui-sdl/diplomat_dialog.c:1200
+#: client/gui-sdl/diplodlg.c:1346 client/gui-sdl/diplomat_dialog.c:1200
#: client/gui-sdl/diplomat_dialog.c:1407 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:232 client/gui-win32/repodlgs.c:578
#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
@@ -13635,7 +13784,7 @@ msgstr "Freeciv szerver v
msgid "Port :"
msgstr "Port:"
-#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1100
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr "Kapcsolódás"
@@ -13752,23 +13901,23 @@ msgstr "Mi legyen az
msgid "REVOLUTION!"
msgstr "FORRADALOM..."
-#: client/gui-sdl/dialogs.c:2232 client/gui-sdl/dialogs.c:2620
+#: client/gui-sdl/dialogs.c:2237 client/gui-sdl/dialogs.c:2625
#: client/gui-win32/dialogs.c:567 data/Freeciv.in:3159
msgid "Female"
msgstr "Lány"
-#: client/gui-sdl/dialogs.c:2234 client/gui-sdl/dialogs.c:2618
-#: client/gui-sdl/dialogs.c:2830 client/gui-win32/dialogs.c:565
+#: client/gui-sdl/dialogs.c:2239 client/gui-sdl/dialogs.c:2623
+#: client/gui-sdl/dialogs.c:2839 client/gui-win32/dialogs.c:565
msgid "Male"
msgstr "Fiú"
-#: client/gui-sdl/dialogs.c:2478 client/gui-sdl/dialogs.c:2902
+#: client/gui-sdl/dialogs.c:2483 client/gui-sdl/dialogs.c:2911
#: 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 "Rendben"
-#: client/gui-sdl/dialogs.c:2685 client/gui-win32/dialogs.c:505
+#: client/gui-sdl/dialogs.c:2694 client/gui-win32/dialogs.c:505
msgid "What nation will you be?"
msgstr "Melyik nemzet leszel?"
@@ -13797,80 +13946,80 @@ msgstr "Vil
msgid "Sea map"
msgstr "Hajózási térkép"
-#: client/gui-sdl/diplodlg.c:563
+#: client/gui-sdl/diplodlg.c:564
#, fuzzy
msgid "Give embassy"
msgstr "Követség"
-#: client/gui-sdl/diplodlg.c:579 client/gui-win32/diplodlg.c:614
+#: client/gui-sdl/diplodlg.c:580 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 "Arany(max %d)"
-#: client/gui-sdl/diplodlg.c:613 client/gui-sdl/helpdlg.c:1956
+#: client/gui-sdl/diplodlg.c:614 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 "Technológiák"
-#: client/gui-sdl/diplodlg.c:831 client/gui-win32/diplodlg.c:598
+#: client/gui-sdl/diplodlg.c:832 client/gui-win32/diplodlg.c:598
#: data/Freeciv.in:269
msgid "Diplomacy meeting"
msgstr "Diplomáciai találkozó"
-#: client/gui-sdl/diplodlg.c:883 client/gui-win32/diplodlg.c:680
+#: client/gui-sdl/diplodlg.c:884 client/gui-win32/diplodlg.c:680
#: data/Freeciv.in:510
msgid "Cancel meeting"
msgstr "Találkozó megszakítása"
-#: client/gui-sdl/diplodlg.c:895 client/gui-win32/diplodlg.c:679
+#: client/gui-sdl/diplodlg.c:896 client/gui-win32/diplodlg.c:679
#: data/Freeciv.in:501
msgid "Accept treaty"
msgstr "Egyezmény elfogadása"
#. TRANS: "Polish incident !" FIXME!!!
-#: client/gui-sdl/diplodlg.c:1304
+#: client/gui-sdl/diplodlg.c:1305
#, fuzzy, c-format
msgid "%s incident !"
msgstr "Tudósok"
-#: client/gui-sdl/diplodlg.c:1322
+#: client/gui-sdl/diplodlg.c:1323
msgid "Shall we declare WAR on them?"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1433
+#: client/gui-sdl/diplodlg.c:1434
#, fuzzy
msgid "Foreign Minister"
msgstr "Miniszterelnök"
-#: client/gui-sdl/diplodlg.c:1449
+#: client/gui-sdl/diplodlg.c:1450
#, c-format
msgid ""
"Sir!, the %s ambassador has arrived\n"
"What are your wishes?"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1465
+#: client/gui-sdl/diplodlg.c:1466
msgid "Declare WAR"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1467 client/gui-win32/plrdlg.c:357
+#: client/gui-sdl/diplodlg.c:1468 client/gui-win32/plrdlg.c:357
msgid "Cancel Treaty"
msgstr "Egyezmény Felbontása"
-#: client/gui-sdl/diplodlg.c:1490 client/gui-win32/plrdlg.c:358
+#: client/gui-sdl/diplodlg.c:1491 client/gui-win32/plrdlg.c:358
#: data/Freeciv.in:3254
msgid "Withdraw vision"
msgstr "Látvány visszavonása"
-#: client/gui-sdl/diplodlg.c:1507
+#: client/gui-sdl/diplodlg.c:1508
#, fuzzy
msgid "Call Diplomatic Meeting"
msgstr "Diplomáciai találkozó"
-#: client/gui-sdl/diplodlg.c:1521
+#: client/gui-sdl/diplodlg.c:1522
msgid "Send him back"
msgstr ""
@@ -14627,12 +14776,12 @@ msgid "Leave Game"
msgstr "Játék elmentése"
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1100 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1102 client/gui-xaw/menu.c:121
#: data/Freeciv.in:115 data/Freeciv.in:3180
msgid "Quit"
msgstr "Kilépés"
-#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:967
msgid "Start New Game"
msgstr "Új játék indítása"
@@ -14759,8 +14908,8 @@ msgstr ""
msgid "%s max rate : %d%%"
msgstr "Maximális lehetséges arány %s államforma esetén: %d%%"
-#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
-#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1085
+#: client/gui-win32/connectdlg.c:1093 data/Freeciv.in:155
msgid "Update"
msgstr "Frissítés"
@@ -15219,73 +15368,73 @@ msgstr "_
msgid "Delete"
msgstr "Törlés"
-#: client/gui-win32/connectdlg.c:147
+#: client/gui-win32/connectdlg.c:149
msgid "Password:"
msgstr ""
-#: client/gui-win32/connectdlg.c:169
+#: client/gui-win32/connectdlg.c:171
#, fuzzy
msgid "Couldn't load the savegame"
msgstr "Nem sikerült betölteni a(z) %s játékállást"
-#: client/gui-win32/connectdlg.c:284 client/gui-xaw/connectdlg.c:311
+#: client/gui-win32/connectdlg.c:286 client/gui-xaw/connectdlg.c:311
msgid "Verify Password"
msgstr ""
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:916 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr "Freeciv szerver választás"
-#: client/gui-win32/connectdlg.c:915
+#: client/gui-win32/connectdlg.c:917
msgid "Local Area Network"
msgstr ""
-#: client/gui-win32/connectdlg.c:949
+#: client/gui-win32/connectdlg.c:951
#, fuzzy
msgid "Welcome to Freeciv"
msgstr "Egy kliens a Freeciv-hez"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
#, fuzzy
msgid "Load Saved Game"
msgstr "Játék elmentése"
-#: client/gui-win32/connectdlg.c:969
+#: client/gui-win32/connectdlg.c:971
msgid "Connect To Network Game"
msgstr ""
-#: client/gui-win32/connectdlg.c:979
+#: client/gui-win32/connectdlg.c:981
msgid "Choose a nation to play"
msgstr ""
-#: client/gui-win32/connectdlg.c:1014
+#: client/gui-win32/connectdlg.c:1016
#, 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-win32/connectdlg.c:1022
+#: client/gui-win32/connectdlg.c:1024
msgid "AI skill level:"
msgstr ""
-#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1038 client/gui-win32/repodlgs.c:931
#, fuzzy
msgid "Game Options"
msgstr "Üzenetbeállítások"
-#: client/gui-win32/connectdlg.c:1040
+#: client/gui-win32/connectdlg.c:1042
msgid "Start Game"
msgstr "Játék indítása"
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
#, fuzzy
msgid "Login:"
msgstr "Légió"
-#: client/gui-win32/connectdlg.c:1061
+#: client/gui-win32/connectdlg.c:1063
msgid "Host:"
msgstr "Gazdagép:"
-#: client/gui-win32/connectdlg.c:1062
+#: client/gui-win32/connectdlg.c:1064
msgid "Port:"
msgstr "Port:"
@@ -15366,21 +15515,21 @@ msgid ""
"this is much slower."
msgstr ""
-#: client/gui-win32/helpdlg.c:769 client/gui-win32/helpdlg.c:792
-#: client/gui-win32/helpdlg.c:803 client/gui-win32/helpdlg.c:809
-#: client/gui-win32/helpdlg.c:822
+#: client/gui-win32/helpdlg.c:775 client/gui-win32/helpdlg.c:798
+#: client/gui-win32/helpdlg.c:809 client/gui-win32/helpdlg.c:815
+#: client/gui-win32/helpdlg.c:828
msgid "Allows "
msgstr "Engedélyezi: "
-#: client/gui-win32/helpdlg.c:780
+#: client/gui-win32/helpdlg.c:786
msgid "Obsoletes "
msgstr "Elavulttá teszi: "
-#: client/gui-win32/helpdlg.c:812 client/gui-win32/helpdlg.c:825
+#: client/gui-win32/helpdlg.c:818 client/gui-win32/helpdlg.c:831
msgid " (with "
msgstr " (ezzel: "
-#: client/gui-win32/helpdlg.c:815 client/gui-win32/helpdlg.c:828
+#: client/gui-win32/helpdlg.c:821 client/gui-win32/helpdlg.c:834
msgid "?techhelp:)."
msgstr "?techhelp:)."
@@ -16515,7 +16664,7 @@ 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/"
+" https://gna.org/projects/freeciv/"
msgstr ""
"Ha találsz valami hibát, küldhetsz nekünk hibajelentést. Ezt "
"legegyszerûbben úgy teheted meg, hogy meglátogatod a Freeciv Hibakövetõ "
@@ -18505,6 +18654,7 @@ msgid "Hydro Plant"
msgstr "Vízerõmû"
#: data/default/buildings.ruleset:378
+#, fuzzy
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 "
@@ -18512,46 +18662,43 @@ msgid ""
"a Factory, Mfg. Plant and Hydro Plant together give a 150% production "
"bonus.\n"
"\n"
-"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant. A city "
-"can only build a Hydro Plant if it is next to (or on) a Mountain or River "
-"tile."
+"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant."
msgstr ""
"50%-kal csökkenti a város termelésbõl származó szennyezését, emellett növeli "
-"a Gyár és a Gyártósor pajzstermelését is: a Gyár és a Vízierõmû együtt 75%-"
-"os, a Gyár, a Gyártósor és a Vízierõmû pedig együtt 150%-os pajzstermelési "
+"a Gyár és a Gyártósor pajzstermelését is: a Gyár és az Atomerõmû együtt 75%-"
+"os, a Gyár, a Gyártósor és az Atomerõmû pedig együtt 150%-os pajzstermelési "
"bónuszt ad.\n"
"\n"
"Egy városban csak egy féle erõmûvet lehet építeni: Vízierõmûvet, Hõerõmûvet "
-"vagy Atomerõmûvet. Vízierõmûvet csak olyan város építhet, amely Folyó vagy "
-"Hegység típusú mezõn, vagy közvetlenül a mezõ mellett van."
+"vagy Atomerõmûvet."
-#: data/default/buildings.ruleset:397 data/civ2/buildings.ruleset:373
+#: data/default/buildings.ruleset:396 data/civ2/buildings.ruleset:373
#: data/civ1/buildings.ruleset:297
msgid "Library"
msgstr "Könyvtár"
-#: data/default/buildings.ruleset:412
+#: data/default/buildings.ruleset:411
#, fuzzy, no-c-format
msgid "Increases the science output in a city by 100%."
msgstr "50%-kal növeli a város tudománytermelését."
-#: data/default/buildings.ruleset:417 data/civ2/buildings.ruleset:393
+#: data/default/buildings.ruleset:416 data/civ2/buildings.ruleset:393
#: data/civ1/buildings.ruleset:317
msgid "Marketplace"
msgstr "Piac"
-#: data/default/buildings.ruleset:432 data/civ2/buildings.ruleset:408
+#: data/default/buildings.ruleset:431 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 "50%-kal növeli a város luxus- és adótermelését."
-#: data/default/buildings.ruleset:437 data/civ2/buildings.ruleset:413
+#: data/default/buildings.ruleset:436 data/civ2/buildings.ruleset:413
#: data/civ1/buildings.ruleset:337
msgid "Mass Transit"
msgstr "Tömegközlekedés"
-#: data/default/buildings.ruleset:451 data/civ2/buildings.ruleset:427
+#: data/default/buildings.ruleset:450 data/civ2/buildings.ruleset:427
#: data/civ1/buildings.ruleset:351
msgid ""
"Neutralizes the pollution generated by the population. The population "
@@ -18560,12 +18707,12 @@ msgstr ""
"Semlegesíti a lakosságból származó szennyezést. Ha egy városban van "
"Tömegközlekedés, akkor a város méretének nincs hatása a szennyezésre."
-#: data/default/buildings.ruleset:458 data/civ2/buildings.ruleset:434
+#: data/default/buildings.ruleset:457 data/civ2/buildings.ruleset:434
#: data/civ1/buildings.ruleset:358
msgid "Mfg. Plant"
msgstr "Gyártósor"
-#: data/default/buildings.ruleset:474 data/civ2/buildings.ruleset:450
+#: data/default/buildings.ruleset:473 data/civ2/buildings.ruleset:450
#: data/civ1/buildings.ruleset:374
#, no-c-format
msgid ""
@@ -18573,12 +18720,12 @@ msgid ""
"production in a city by 100%."
msgstr "Gyárral együtt a Gyártósor 100%-kal növeli a város pajzstermelését."
-#: data/default/buildings.ruleset:480 data/civ2/buildings.ruleset:456
+#: data/default/buildings.ruleset:479 data/civ2/buildings.ruleset:456
#: data/civ1/buildings.ruleset:380
msgid "Nuclear Plant"
msgstr "Atomerõmû"
-#: data/default/buildings.ruleset:495
+#: data/default/buildings.ruleset:494
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 "
@@ -18596,11 +18743,11 @@ msgstr ""
"Egy városban csak egy féle erõmûvet lehet építeni: Vízierõmûvet, Hõerõmûvet "
"vagy Atomerõmûvet."
-#: data/default/buildings.ruleset:515 data/civ2/buildings.ruleset:489
+#: data/default/buildings.ruleset:514 data/civ2/buildings.ruleset:489
msgid "Offshore Platform"
msgstr "Fúrótorony"
-#: data/default/buildings.ruleset:530 data/civ2/buildings.ruleset:504
+#: data/default/buildings.ruleset:529 data/civ2/buildings.ruleset:504
msgid ""
"Adds 1 extra shield resource on all Ocean squares in a city. The city needs "
"to be coastal to build this improvement."
@@ -18608,12 +18755,12 @@ msgstr ""
"1 extra pajzsot ad a város Óceán mezõin. Csak tengerparti városok építhetik "
"meg."
-#: data/default/buildings.ruleset:536 data/civ2/buildings.ruleset:510
+#: data/default/buildings.ruleset:535 data/civ2/buildings.ruleset:510
#: data/civ1/buildings.ruleset:411
msgid "Palace"
msgstr "Palota"
-#: data/default/buildings.ruleset:552
+#: data/default/buildings.ruleset:551
#, no-c-format
msgid ""
"Makes a city the capital and the center of your government. Corruption in "
@@ -18630,11 +18777,11 @@ msgid ""
"Monarchy a +50% production bonus."
msgstr ""
-#: data/default/buildings.ruleset:569 data/civ2/buildings.ruleset:539
+#: data/default/buildings.ruleset:568 data/civ2/buildings.ruleset:539
msgid "Police Station"
msgstr "Rendõrállomás"
-#: data/default/buildings.ruleset:583 data/civ2/buildings.ruleset:553
+#: data/default/buildings.ruleset:582 data/civ2/buildings.ruleset:553
msgid ""
"Reduces the unhappiness caused by military units outside the city by 2 under "
"Democracy and 1 under Republic. This improvement has no effect under other "
@@ -18644,11 +18791,11 @@ msgstr ""
"boldogtalanságot. Demokrácia alatt 2-vel, Köztársaság alatt 1-gyel. Más "
"államformák esetén az épületnek nincs hatása."
-#: data/default/buildings.ruleset:593 data/civ2/buildings.ruleset:560
+#: data/default/buildings.ruleset:592 data/civ2/buildings.ruleset:560
msgid "Port Facility"
msgstr "Kikötõi berendezés"
-#: data/default/buildings.ruleset:608 data/civ2/buildings.ruleset:575
+#: data/default/buildings.ruleset:607 data/civ2/buildings.ruleset:575
msgid ""
"Allows a city to build veteran sea units. Also, damaged sea units which "
"stay in town for one full turn without moving are completely restored."
@@ -18657,12 +18804,12 @@ msgstr ""
"megrongálódott tengeri egység egy teljes kört a városban tölt, teljesen "
"kijavítódik."
-#: data/default/buildings.ruleset:615 data/civ2/buildings.ruleset:582
+#: data/default/buildings.ruleset:614 data/civ2/buildings.ruleset:582
#: data/civ1/buildings.ruleset:440
msgid "Power Plant"
msgstr "Erõmû"
-#: data/default/buildings.ruleset:631
+#: data/default/buildings.ruleset:630
#, no-c-format
msgid ""
"Increases the shield production of a Factory or Mfg. Plant in a city: a "
@@ -18679,12 +18826,12 @@ msgstr ""
"Egy városban csak egy féle erõmûvet lehet építeni: Vízierõmûvet, Hõerõmûvet "
"vagy Atomerõmûvet."
-#: data/default/buildings.ruleset:646 data/civ2/buildings.ruleset:610
+#: data/default/buildings.ruleset:645 data/civ2/buildings.ruleset:610
#: data/civ1/buildings.ruleset:468
msgid "Recycling Center"
msgstr "Újrahasznosító központ"
-#: data/default/buildings.ruleset:661 data/civ2/buildings.ruleset:625
+#: data/default/buildings.ruleset:660 data/civ2/buildings.ruleset:625
#: data/civ1/buildings.ruleset:483
#, fuzzy, no-c-format
msgid ""
@@ -18692,11 +18839,11 @@ msgid ""
"production in a city by 66%."
msgstr "66%-kal csökkenti a város termelésbõl származó szennyezését."
-#: data/default/buildings.ruleset:667 data/civ2/buildings.ruleset:631
+#: data/default/buildings.ruleset:666 data/civ2/buildings.ruleset:631
msgid "Research Lab"
msgstr "Kutató laboratórium"
-#: data/default/buildings.ruleset:682
+#: data/default/buildings.ruleset:681
#, fuzzy
msgid ""
"Together with a Library, a Research Lab increases the science production of "
@@ -18707,11 +18854,11 @@ msgstr ""
"tudománytermelését. Könyvtárral és Egyetemmel együtt a Kutatólaboratórium "
"150%-kal növeli a város tudománytermelését."
-#: data/default/buildings.ruleset:690 data/civ2/buildings.ruleset:654
+#: data/default/buildings.ruleset:689 data/civ2/buildings.ruleset:654
msgid "SAM Battery"
msgstr "Légvédelmi Üteg"
-#: data/default/buildings.ruleset:704 data/civ2/buildings.ruleset:668
+#: data/default/buildings.ruleset:703 data/civ2/buildings.ruleset:668
msgid ""
"Doubles the defense of all units inside the city when attacked by non-"
"nuclear air units."
@@ -18719,12 +18866,12 @@ msgstr ""
"Megduplázza a városban tartózkodó egységek védõerejét a nem nukleáris légi "
"egységek ellen."
-#: data/default/buildings.ruleset:710 data/civ2/buildings.ruleset:674
+#: data/default/buildings.ruleset:709 data/civ2/buildings.ruleset:674
#: data/civ1/buildings.ruleset:489
msgid "SDI Defense"
msgstr "SDI Védelem"
-#: data/default/buildings.ruleset:724 data/civ2/buildings.ruleset:688
+#: data/default/buildings.ruleset:723 data/civ2/buildings.ruleset:688
#: data/civ1/buildings.ruleset:503
msgid ""
"Protects a city from attacks from Nuclear units. Nuclear attacks simply "
@@ -18735,11 +18882,11 @@ msgstr ""
"egyszerûen nem lesz hatása a városra. Megduplázza a nem nukleáris rakéták "
"elleni védelmet is."
-#: data/default/buildings.ruleset:733 data/civ2/buildings.ruleset:697
+#: data/default/buildings.ruleset:732 data/civ2/buildings.ruleset:697
msgid "Sewer System"
msgstr "Csatornarendszer"
-#: data/default/buildings.ruleset:748 data/civ2/buildings.ruleset:712
+#: data/default/buildings.ruleset:747 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."
@@ -18747,12 +18894,12 @@ msgstr ""
"Lehetõvé teszi, hogy a város 12-nél nagyobb méretûre nõjön. Elõtte egy "
"Vízvezeték is szükséges, hogy a város 8-nál nagyobb méretûre nõhessen."
-#: data/default/buildings.ruleset:754 data/civ2/buildings.ruleset:749
+#: data/default/buildings.ruleset:753 data/civ2/buildings.ruleset:749
#: data/civ1/buildings.ruleset:512
msgid "Space Component"
msgstr "Ûrhajó-részegység"
-#: data/default/buildings.ruleset:769 data/civ2/buildings.ruleset:763
+#: data/default/buildings.ruleset:768 data/civ2/buildings.ruleset:763
#: data/civ1/buildings.ruleset:526
msgid ""
"Space Components can be differentiated into Propulsion and Fuel Components. "
@@ -18763,12 +18910,12 @@ msgid ""
"have been built by any player."
msgstr ""
-#: data/default/buildings.ruleset:779 data/civ2/buildings.ruleset:773
+#: data/default/buildings.ruleset:778 data/civ2/buildings.ruleset:773
#: data/civ1/buildings.ruleset:536
msgid "Space Module"
msgstr "Ûrhajómodul"
-#: data/default/buildings.ruleset:794 data/civ2/buildings.ruleset:787
+#: data/default/buildings.ruleset:793 data/civ2/buildings.ruleset:787
#: data/civ1/buildings.ruleset:550
msgid ""
"Space Modules are the most expensive parts of spaceships. There are three "
@@ -18788,12 +18935,12 @@ msgid ""
"have been built by any player."
msgstr ""
-#: data/default/buildings.ruleset:813 data/civ2/buildings.ruleset:806
+#: data/default/buildings.ruleset:812 data/civ2/buildings.ruleset:806
#: data/civ1/buildings.ruleset:569
msgid "Space Structural"
msgstr "Ûrhajóváz elem"
-#: data/default/buildings.ruleset:828 data/civ2/buildings.ruleset:820
+#: data/default/buildings.ruleset:827 data/civ2/buildings.ruleset:820
#: data/civ1/buildings.ruleset:583
msgid ""
"Space Structurals form the base of your spaceship. All other spaceship "
@@ -18804,11 +18951,11 @@ msgid ""
"have been built by any player."
msgstr ""
-#: data/default/buildings.ruleset:838 data/civ2/buildings.ruleset:830
+#: data/default/buildings.ruleset:837 data/civ2/buildings.ruleset:830
msgid "Stock Exchange"
msgstr "Tõzsde"
-#: data/default/buildings.ruleset:854 data/civ2/buildings.ruleset:846
+#: data/default/buildings.ruleset:853 data/civ2/buildings.ruleset:846
#, no-c-format
msgid ""
"Together with a Marketplace and a Bank, a Stock Exchange boosts tax and "
@@ -18817,11 +18964,11 @@ msgstr ""
"Bankkal és Piaccal együtt a Tõzsde 150%-kal növeli a város adó- és "
"luxustermelését."
-#: data/default/buildings.ruleset:860 data/civ2/buildings.ruleset:852
+#: data/default/buildings.ruleset:859 data/civ2/buildings.ruleset:852
msgid "Super Highways"
msgstr "Autópálya"
-#: data/default/buildings.ruleset:875 data/civ2/buildings.ruleset:867
+#: data/default/buildings.ruleset:874 data/civ2/buildings.ruleset:867
#, no-c-format
msgid ""
"Increases trade resources by 50% on all squares with roads or railroads."
@@ -18829,11 +18976,11 @@ msgstr ""
"50%-kal növeli a kereskedelmi erõforrásokat az úttal vagy vasúttal "
"rendelkezõ mezõkön."
-#: data/default/buildings.ruleset:883 data/civ2/buildings.ruleset:873
+#: data/default/buildings.ruleset:882 data/civ2/buildings.ruleset:873
msgid "Supermarket"
msgstr "Szupermarket"
-#: data/default/buildings.ruleset:898 data/civ2/buildings.ruleset:888
+#: data/default/buildings.ruleset:897 data/civ2/buildings.ruleset:888
#, no-c-format
msgid ""
"Increases the food resources by 50% on each farmland square which is being "
@@ -18841,12 +18988,12 @@ msgid ""
"a second time."
msgstr "50%-kal növeli az élelemtermelést a farmmal rendelkezõ mezõkön."
-#: data/default/buildings.ruleset:905 data/civ2/buildings.ruleset:895
+#: data/default/buildings.ruleset:904 data/civ2/buildings.ruleset:895
#: data/civ1/buildings.ruleset:593
msgid "Temple"
msgstr "Templom"
-#: data/default/buildings.ruleset:919 data/civ2/buildings.ruleset:909
+#: data/default/buildings.ruleset:918 data/civ2/buildings.ruleset:909
#: data/civ1/buildings.ruleset:607
msgid ""
"Makes one unhappy citizen content. Both the Mysticism advance and the "
@@ -18857,13 +19004,13 @@ msgstr ""
"világcsoda megduplázza ezt a hatást. Miszticizmussal és Jósdával együtt a "
"Templom 4 boldogtalan lakost tesz elégedetté."
-#: data/default/buildings.ruleset:926 data/civ2/buildings.ruleset:916
+#: data/default/buildings.ruleset:925 data/civ2/buildings.ruleset:916
#: data/civ1/buildings.ruleset:614 data/default/techs.ruleset:742
#: data/civ2/techs.ruleset:727 data/civ1/techs.ruleset:723
msgid "University"
msgstr "Egyetem"
-#: data/default/buildings.ruleset:942
+#: data/default/buildings.ruleset:941
#, fuzzy, no-c-format
msgid ""
"Together with a Library, a University increases the science production of a "
@@ -18871,12 +19018,12 @@ msgid ""
msgstr ""
"Könyvtárral együtt az Egyetem 100%-kal növeli a város tudománytermelését."
-#: data/default/buildings.ruleset:948 data/civ2/buildings.ruleset:938
+#: data/default/buildings.ruleset:947 data/civ2/buildings.ruleset:938
#: data/civ1/buildings.ruleset:636
msgid "Apollo Program"
msgstr "Apollo program"
-#: data/default/buildings.ruleset:962 data/civ2/buildings.ruleset:952
+#: data/default/buildings.ruleset:961 data/civ2/buildings.ruleset:952
msgid ""
"Entire map becomes visible for the player who owns it. It allows all "
"players to start building spaceship parts (assuming they have researched the "
@@ -18886,11 +19033,11 @@ msgstr ""
"Minden játékos elkezdheti építeni az ûrhajóját (feltéve, hogy ismeri a "
"szükséges technológiákat)."
-#: data/default/buildings.ruleset:969 data/civ2/buildings.ruleset:959
+#: data/default/buildings.ruleset:968 data/civ2/buildings.ruleset:959
msgid "A.Smith's Trading Co."
msgstr "A.Smith Keresk. Vállalat"
-#: data/default/buildings.ruleset:983
+#: data/default/buildings.ruleset:982
#, fuzzy
msgid ""
"City improvements which would normally have an upkeep of 1 are free of "
@@ -18899,12 +19046,12 @@ msgstr ""
"Nem kell fenntartást fizetni azokra az épületekre, amelyek körönként 1 "
"fenntartást igényelnének."
-#: data/default/buildings.ruleset:989 data/civ2/buildings.ruleset:979
+#: data/default/buildings.ruleset:988 data/civ2/buildings.ruleset:979
#: data/civ1/buildings.ruleset:655
msgid "Colossus"
msgstr "Kolosszus"
-#: data/default/buildings.ruleset:1003 data/civ2/buildings.ruleset:993
+#: data/default/buildings.ruleset:1002 data/civ2/buildings.ruleset:993
#: data/civ1/buildings.ruleset:669
msgid ""
"Each square around the city where this wonder is built that is already "
@@ -18913,34 +19060,34 @@ msgstr ""
"A világcsodát megépítõ város körül minden mezõ plusz egy kereskedelmet "
"termel, ha már eddig is termelt valamennyi kereskedelmet."
-#: data/default/buildings.ruleset:1009 data/civ2/buildings.ruleset:999
+#: data/default/buildings.ruleset:1008 data/civ2/buildings.ruleset:999
#: data/civ1/buildings.ruleset:675
msgid "Copernicus' Observatory"
msgstr "Kopernikusz csillagv."
-#: data/default/buildings.ruleset:1024 data/civ2/buildings.ruleset:1180
+#: data/default/buildings.ruleset:1023 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 "A megépítõ városban 100%-kal növeli a tudománytermelést."
-#: data/default/buildings.ruleset:1029 data/civ2/buildings.ruleset:1019
+#: data/default/buildings.ruleset:1028 data/civ2/buildings.ruleset:1019
#: data/civ1/buildings.ruleset:695
msgid "Cure For Cancer"
msgstr "A rák gyógymódja"
-#: data/default/buildings.ruleset:1043
+#: data/default/buildings.ruleset:1042
msgid ""
"This stunning technological achievement makes one unhappy citizen content in "
"all your cities."
msgstr ""
-#: data/default/buildings.ruleset:1051 data/civ2/buildings.ruleset:1039
+#: data/default/buildings.ruleset:1050 data/civ2/buildings.ruleset:1039
#: data/civ1/buildings.ruleset:715
msgid "Darwin's Voyage"
msgstr "Darwin utazása"
-#: data/default/buildings.ruleset:1065 data/civ2/buildings.ruleset:1053
+#: data/default/buildings.ruleset:1064 data/civ2/buildings.ruleset:1053
#: data/civ1/buildings.ruleset:729
msgid ""
"Charles Darwin's voyage sparked the discovery of the evolution of the "
@@ -18948,22 +19095,22 @@ msgid ""
"technology advances."
msgstr ""
-#: data/default/buildings.ruleset:1072 data/civ2/buildings.ruleset:1060
+#: data/default/buildings.ruleset:1071 data/civ2/buildings.ruleset:1060
msgid "Eiffel Tower"
msgstr "Eiffel torony"
-#: data/default/buildings.ruleset:1087
+#: data/default/buildings.ruleset:1086
#, no-c-format
msgid ""
"Your reputation and goodwill among other nations is recovered twice as fast."
msgstr ""
-#: data/default/buildings.ruleset:1093 data/civ2/buildings.ruleset:1081
+#: data/default/buildings.ruleset:1092 data/civ2/buildings.ruleset:1081
#: data/civ1/buildings.ruleset:736
msgid "Great Library"
msgstr "Nagy Könyvtár"
-#: data/default/buildings.ruleset:1107 data/civ2/buildings.ruleset:1095
+#: data/default/buildings.ruleset:1106 data/civ2/buildings.ruleset:1095
#: data/civ1/buildings.ruleset:750
msgid ""
"The civilization which builds the Great Library gets every advance that at "
@@ -18972,22 +19119,22 @@ msgstr ""
"Ha egy civilizáció megépíti a Nagy Könyvtárat, akkor minden olyan tudományt "
"automatikusan megkap, amelyet legalább két másik civilizáció ismer."
-#: data/default/buildings.ruleset:1113 data/civ2/buildings.ruleset:1101
+#: data/default/buildings.ruleset:1112 data/civ2/buildings.ruleset:1101
#: data/civ1/buildings.ruleset:756
msgid "Great Wall"
msgstr "Nagy Fal"
-#: data/default/buildings.ruleset:1127
+#: data/default/buildings.ruleset:1126
#, fuzzy
msgid "Works as a City Wall in all your cities."
msgstr "Városfalként hat a játékos összes városában."
-#: data/default/buildings.ruleset:1135 data/civ2/buildings.ruleset:1122
+#: data/default/buildings.ruleset:1134 data/civ2/buildings.ruleset:1122
#: data/civ1/buildings.ruleset:777
msgid "Hanging Gardens"
msgstr "Függõkertek"
-#: data/default/buildings.ruleset:1149 data/civ2/buildings.ruleset:1136
+#: data/default/buildings.ruleset:1148 data/civ2/buildings.ruleset:1136
#: data/civ1/buildings.ruleset:791
msgid ""
"Makes one content citizen happy in every city. Makes two extra content "
@@ -19002,12 +19149,12 @@ msgstr ""
"akin a Függõkertek kifejthetné hatását, a világcsoda a boldogtalan lakosokra "
"hat (elégedetté teszi õket)."
-#: data/default/buildings.ruleset:1158 data/civ2/buildings.ruleset:1145
+#: data/default/buildings.ruleset:1157 data/civ2/buildings.ruleset:1145
#: data/civ1/buildings.ruleset:800
msgid "Hoover Dam"
msgstr "Hoover Gát"
-#: data/default/buildings.ruleset:1173 data/civ2/buildings.ruleset:1159
+#: data/default/buildings.ruleset:1172 data/civ2/buildings.ruleset:1159
msgid ""
"Works as if you had a Hydro Plant in every city. (This reduces pollution "
"and increases the effects of Factories and Mfg. Plants.)"
@@ -19015,51 +19162,51 @@ msgstr ""
"Olyan a hatása, mintha Vízierõmû lenne a játékos összes városában. (Ez "
"csökkenti a szennyezést, és növeli a Gyárak és Gyártósorok hatását.)"
-#: data/default/buildings.ruleset:1179 data/civ2/buildings.ruleset:1165
+#: data/default/buildings.ruleset:1178 data/civ2/buildings.ruleset:1165
#: data/civ1/buildings.ruleset:822
msgid "Isaac Newton's College"
msgstr "Isaac Newton Fõiskolája"
-#: data/default/buildings.ruleset:1194
+#: data/default/buildings.ruleset:1193
#, fuzzy, no-c-format
msgid ""
"Boosts science production by 100% in every city you control that has a "
"University."
msgstr "A megépítõ városban 100%-kal növeli a tudománytermelést."
-#: data/default/buildings.ruleset:1200 data/civ2/buildings.ruleset:1185
+#: data/default/buildings.ruleset:1199 data/civ2/buildings.ruleset:1185
#: data/civ1/buildings.ruleset:842
msgid "J.S. Bach's Cathedral"
msgstr "J.S. Bach Katedrálisa"
-#: data/default/buildings.ruleset:1214 data/civ2/buildings.ruleset:1199
+#: data/default/buildings.ruleset:1213 data/civ2/buildings.ruleset:1199
msgid "Makes two unhappy citizens content in every city."
msgstr "A játékos minden városában elégedetté tesz két boldogtalan lakost."
-#: data/default/buildings.ruleset:1219 data/civ2/buildings.ruleset:1204
+#: data/default/buildings.ruleset:1218 data/civ2/buildings.ruleset:1204
msgid "King Richard's Crusade"
msgstr "Richard király keresztesh."
-#: data/default/buildings.ruleset:1233 data/civ2/buildings.ruleset:1218
+#: data/default/buildings.ruleset:1232 data/civ2/buildings.ruleset:1218
msgid ""
"Adds one extra shield resource on every square around the city where it is "
"built."
msgstr "Minden mezõn plusz egy pajzsot ad a világcsodát megépítõ város körül."
-#: data/default/buildings.ruleset:1239 data/civ2/buildings.ruleset:1224
+#: data/default/buildings.ruleset:1238 data/civ2/buildings.ruleset:1224
msgid "Leonardo's Workshop"
msgstr "Leonardo mûhelye"
-#: data/default/buildings.ruleset:1253 data/civ2/buildings.ruleset:1238
+#: data/default/buildings.ruleset:1252 data/civ2/buildings.ruleset:1238
msgid "Upgrades one obsolete unit per game turn."
msgstr "Minden körben felfejleszt egy elavult egységet."
-#: data/default/buildings.ruleset:1258 data/civ2/buildings.ruleset:1243
+#: data/default/buildings.ruleset:1257 data/civ2/buildings.ruleset:1243
#: data/civ1/buildings.ruleset:862
msgid "Lighthouse"
msgstr "Világítótorony"
-#: data/default/buildings.ruleset:1273
+#: data/default/buildings.ruleset:1272
#, fuzzy
msgid ""
"Gives all your sea units 1 additional movement point and eliminates the risk "
@@ -19070,35 +19217,35 @@ msgstr ""
"Gályák elsüllyedésének kockázatát a nyílt tengeren. A játékos újonnan "
"épített tengeri egységei veteránok lesznek (minden városban)."
-#: data/default/buildings.ruleset:1280 data/civ2/buildings.ruleset:1264
+#: data/default/buildings.ruleset:1279 data/civ2/buildings.ruleset:1264
#: data/civ1/buildings.ruleset:885
msgid "Magellan's Expedition"
msgstr "Magellán Expedíciója"
-#: data/default/buildings.ruleset:1295
+#: data/default/buildings.ruleset:1294
#, fuzzy
msgid "Gives all your sea units 2 additional movement points."
msgstr "Minden tengeri egységnek plusz 2 lépéspontot ad."
-#: data/default/buildings.ruleset:1300 data/civ2/buildings.ruleset:1283
+#: data/default/buildings.ruleset:1299 data/civ2/buildings.ruleset:1283
#: data/civ1/buildings.ruleset:904
msgid "Manhattan Project"
msgstr "Manhattan Terv"
-#: data/default/buildings.ruleset:1318 data/civ2/buildings.ruleset:1301
+#: data/default/buildings.ruleset:1317 data/civ2/buildings.ruleset:1301
msgid "Marco Polo's Embassy"
msgstr "Marco Polo Követsége"
-#: data/default/buildings.ruleset:1332 data/civ2/buildings.ruleset:1315
+#: data/default/buildings.ruleset:1331 data/civ2/buildings.ruleset:1315
msgid "The player who owns it gets an embassy with all players."
msgstr "A világcsoda birtokosának nagykövetsége lesz az összes játékosnál."
-#: data/default/buildings.ruleset:1337 data/civ2/buildings.ruleset:1320
+#: data/default/buildings.ruleset:1336 data/civ2/buildings.ruleset:1320
#: data/civ1/buildings.ruleset:922
msgid "Michelangelo's Chapel"
msgstr "Michelangelo Kápolnája"
-#: data/default/buildings.ruleset:1351 data/civ2/buildings.ruleset:1334
+#: data/default/buildings.ruleset:1350 data/civ2/buildings.ruleset:1334
msgid ""
"Counts as having a Cathedral in each of your cities. This makes 3 unhappy "
"citizens content in each city. The discovery of Theology increases the "
@@ -19112,22 +19259,22 @@ msgstr ""
"felfedezése csökkenti a Katedrálisok hatását: eggyel csökken az elégedetté "
"tett lakosok száma."
-#: data/default/buildings.ruleset:1361 data/civ2/buildings.ruleset:1344
+#: data/default/buildings.ruleset:1360 data/civ2/buildings.ruleset:1344
#: data/civ1/buildings.ruleset:941
msgid "Oracle"
msgstr "Jósda"
-#: data/default/buildings.ruleset:1375
+#: data/default/buildings.ruleset:1374
#, fuzzy
msgid "Makes two of your unhappy citizens content in every city with a temple."
msgstr "A játékos minden városában elégedetté tesz két boldogtalan lakost."
-#: data/default/buildings.ruleset:1380 data/civ2/buildings.ruleset:1363
+#: data/default/buildings.ruleset:1379 data/civ2/buildings.ruleset:1363
#: data/civ1/buildings.ruleset:960
msgid "Pyramids"
msgstr "Piramisok"
-#: data/default/buildings.ruleset:1394
+#: data/default/buildings.ruleset:1393
#, fuzzy
msgid ""
"The amount of stored food lost when one of your cities grows or shrinks is "
@@ -19138,31 +19285,31 @@ msgstr ""
"növekedése vagy csökkenése után. Magtár segítségével a város gyorsabban "
"növekszik, és jobban viseli az élelemhiányt."
-#: data/default/buildings.ruleset:1401 data/civ2/buildings.ruleset:1382
+#: data/default/buildings.ruleset:1400 data/civ2/buildings.ruleset:1382
#: data/civ1/buildings.ruleset:981
msgid "SETI Program"
msgstr "SETI Program"
-#: data/default/buildings.ruleset:1415
+#: data/default/buildings.ruleset:1414
#, fuzzy
msgid "Boosts science production in each city with a Research Lab by 100%. "
msgstr "A megépítõ városban 50%-kal növeli a tudománytermelést."
-#: data/default/buildings.ruleset:1420 data/civ2/buildings.ruleset:1402
+#: data/default/buildings.ruleset:1419 data/civ2/buildings.ruleset:1402
#: data/civ1/buildings.ruleset:1001
msgid "Shakespeare's Theatre"
msgstr "Shakespeare Színháza"
-#: data/default/buildings.ruleset:1434 data/civ2/buildings.ruleset:1416
+#: data/default/buildings.ruleset:1433 data/civ2/buildings.ruleset:1416
#: data/civ1/buildings.ruleset:1015
msgid "Makes all unhappy citizens content, in the city where it is located."
msgstr ""
-#: data/default/buildings.ruleset:1439 data/civ2/buildings.ruleset:1421
+#: data/default/buildings.ruleset:1438 data/civ2/buildings.ruleset:1421
msgid "Statue of Liberty"
msgstr "Szabadságszobor"
-#: data/default/buildings.ruleset:1453 data/civ2/buildings.ruleset:1435
+#: data/default/buildings.ruleset:1452 data/civ2/buildings.ruleset:1435
#: data/civ1/buildings.ruleset:974 data/civ1/buildings.ruleset:1034
msgid ""
"Allows you to choose any government, including those that have not yet been "
@@ -19170,42 +19317,42 @@ msgid ""
"Anarchy."
msgstr ""
-#: data/default/buildings.ruleset:1460 data/civ2/buildings.ruleset:1442
+#: data/default/buildings.ruleset:1459 data/civ2/buildings.ruleset:1442
msgid "Sun Tzu's War Academy"
msgstr "Sun Tzu Katonai Akadémiája"
-#: data/default/buildings.ruleset:1474
+#: data/default/buildings.ruleset:1473
msgid ""
"All your new ground units start at the first veteran level. The chance of a "
"unit getting the next veteran level after a battle increases by half."
msgstr ""
-#: data/default/buildings.ruleset:1481 data/civ2/buildings.ruleset:1463
+#: data/default/buildings.ruleset:1480 data/civ2/buildings.ruleset:1463
#: data/civ1/buildings.ruleset:1020
msgid "United Nations"
msgstr "Egyesült Nemzetek"
-#: data/default/buildings.ruleset:1495
+#: data/default/buildings.ruleset:1494
msgid "All your units regain two extra hitpoints per turn."
msgstr ""
-#: data/default/buildings.ruleset:1508 data/civ2/buildings.ruleset:1490
+#: data/default/buildings.ruleset:1507 data/civ2/buildings.ruleset:1490
#: data/civ1/buildings.ruleset:1046
msgid "Women's Suffrage"
msgstr "Nõk Választójoga"
-#: data/default/buildings.ruleset:1522 data/civ2/buildings.ruleset:1504
+#: data/default/buildings.ruleset:1521 data/civ2/buildings.ruleset:1504
msgid ""
"Counts as a Police Station in every city. (That is, for each city, reduces "
"unhappiness for military units outside the city by 2 under Democracy and 1 "
"under Republic. This wonder has no effect under other governments.)"
msgstr ""
-#: data/default/buildings.ruleset:1533
+#: data/default/buildings.ruleset:1532
msgid "Coinage"
msgstr "Pénzverés"
-#: data/default/buildings.ruleset:1554
+#: data/default/buildings.ruleset:1553
msgid ""
"This is not a normal improvement. Instead, setting a city's production to "
"Coinage means its shield production is converted to tax output (money, "
@@ -19591,12 +19738,17 @@ msgstr "?city_state:B
msgid "?citystyle:Industrial"
msgstr "?city:Név"
-#: data/default/cities.ruleset:139 data/civ2/cities.ruleset:150
+#: data/default/cities.ruleset:139
+#, fuzzy
+msgid "?citystyle:ElectricAge"
+msgstr "?city_state:Béke"
+
+#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:150
#, fuzzy
msgid "?citystyle:Modern"
msgstr "?city_state:Zavargás"
-#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:161
+#: data/default/cities.ruleset:161 data/civ2/cities.ruleset:161
#, fuzzy
msgid "?citystyle:PostModern"
msgstr "?city_state:Zavargás"
@@ -24611,6 +24763,36 @@ msgstr "Templom"
msgid "Team 31"
msgstr "Templom"
+#~ 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."
+
+#, fuzzy
+#~ msgid "Value must be integer."
+#~ msgstr "Egész számot kell megadni."
+
+#~ 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 Hydro Plant, Power Plant, or Nuclear Plant. A "
+#~ "city can only build a Hydro Plant if it is next to (or on) a Mountain or "
+#~ "River tile."
+#~ msgstr ""
+#~ "50%-kal csökkenti a város termelésbõl származó szennyezését, emellett "
+#~ "növeli a Gyár és a Gyártósor pajzstermelését is: a Gyár és a Vízierõmû "
+#~ "együtt 75%-os, a Gyár, a Gyártósor és a Vízierõmû pedig együtt 150%-os "
+#~ "pajzstermelési bónuszt ad.\n"
+#~ "\n"
+#~ "Egy városban csak egy féle erõmûvet lehet építeni: Vízierõmûvet, "
+#~ "Hõerõmûvet vagy Atomerõmûvet. Vízierõmûvet csak olyan város építhet, "
+#~ "amely Folyó vagy Hegység típusú mezõn, vagy közvetlenül a mezõ mellett "
+#~ "van."
+
#, fuzzy
#~ msgid "Auth config filename \"%s\" not allowed!"
#~ msgstr "Milyen típusú kapcsolódások engedélyezettek"
@@ -26832,9 +27014,6 @@ msgstr "Templom"
#~ msgid "What do you wish to to?"
#~ msgstr "Mit szeretnél csinálni?"
-#~ msgid "New Game"
-#~ msgstr "Új játék"
-
#~ msgid "Quit Game"
#~ msgstr "Kilépés"
diff --git a/po/it.gmo b/po/it.gmo
index 233282b..fe1fc50 100644
Binary files a/po/it.gmo and b/po/it.gmo differ
diff --git a/po/it.po b/po/it.po
index 7237ca0..23ff220 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,4 +1,4 @@
-# $Id: it.po 15599 2009-03-24 00:31:07Z dmarks $
+# $Id: it.po 16405 2009-11-22 12:52:35Z 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: 2009-03-29 21:13+0900\n"
+"POT-Creation-Date: 2009-11-22 21:37+0100\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"
@@ -69,21 +69,21 @@ msgstr "?obsolete:O"
msgid "?redundant:*"
msgstr "?redundant:*"
-#: common/connection.c:515
+#: common/connection.c:518
#, c-format
msgid "%s from %s"
msgstr "%s da %s"
-#: common/connection.c:521
+#: common/connection.c:524
msgid " (connection incomplete)"
msgstr " (connessione incompleta)"
-#: common/connection.c:525
+#: common/connection.c:528
#, c-format
msgid " (player %s)"
msgstr " (giocatore %s)"
-#: common/connection.c:529
+#: common/connection.c:532
msgid " (observer)"
msgstr " (osservatore)"
@@ -496,82 +496,82 @@ msgstr "Connessione in avanzamento."
msgid "AI Debug messages"
msgstr ""
-#: common/player.c:732
+#: common/player.c:746
msgid "?attitude:Genocidal"
msgstr "?attitude:Genocidio"
-#: common/player.c:734
+#: common/player.c:748
msgid "?attitude:Belligerent"
msgstr "?attitude:Belligerante"
-#: common/player.c:736
+#: common/player.c:750
msgid "?attitude:Hostile"
msgstr "?attitude:Ostile"
-#: common/player.c:738
+#: common/player.c:752
msgid "?attitude:Uncooperative"
msgstr "?attitude:Non cooperativo"
-#: common/player.c:740
+#: common/player.c:754
msgid "?attitude:Uneasy"
msgstr "?attitude:Scontento"
-#: common/player.c:742
+#: common/player.c:756
msgid "?attitude:Neutral"
msgstr "?attitude:Neutrale"
-#: common/player.c:744
+#: common/player.c:758
msgid "?attitude:Respectful"
msgstr "?attitude:Rispettoso"
-#: common/player.c:746
+#: common/player.c:760
msgid "?attitude:Helpful"
msgstr "?attitude:Cooperante"
-#: common/player.c:748
+#: common/player.c:762
msgid "?attitude:Enthusiastic"
msgstr "?attitude:Entusiasta"
-#: common/player.c:750
+#: common/player.c:764
msgid "?attitude:Admiring"
msgstr "?attitude:In ammirazione"
-#: common/player.c:753
+#: common/player.c:767
msgid "?attitude:Worshipful"
msgstr "?attitude:In adorazione"
-#: common/player.c:764
+#: common/player.c:778
#, fuzzy
msgid "?diplomatic_state:Armistice"
msgstr "?diplomatic_state:Alleanza"
-#: common/player.c:765
+#: common/player.c:779
msgid "?diplomatic_state:War"
msgstr "?diplomatic_state:Guerra"
-#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:780 client/gui-gtk-2.0/diplodlg.c:353
#: 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:767 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:781 client/gui-gtk-2.0/diplodlg.c:358
#: 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:768 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:782 client/gui-gtk-2.0/diplodlg.c:363
#: 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:769
+#: common/player.c:783
msgid "?diplomatic_state:Never met"
msgstr "?diplomatic_state:Mai incontrati"
-#: common/player.c:770
+#: common/player.c:784
msgid "?diplomatic_state:Team"
msgstr "?diplomatic_state:Squadra"
@@ -603,7 +603,7 @@ msgstr "Unit
#. TRANS: "Resources: (none)".
#: common/requirements.c:1014 common/team.c:132
#: client/gui-gtk-2.0/helpdlg.c:1055 client/gui-gtk-2.0/inteldlg.c:390
-#: client/gui-win32/helpdlg.c:586 client/gui-xaw/helpdlg.c:991
+#: client/gui-win32/helpdlg.c:592 client/gui-xaw/helpdlg.c:991
#, fuzzy, c-format
msgid "(none)"
msgstr "nessuno"
@@ -629,10 +629,11 @@ msgstr "Ricerca della Tecnologia Futura %d"
#: 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
#: client/gui-sdl/helpdlg.c:817 client/gui-sdl/mapview.c:962
-#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:545
-#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:735
-#: 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
+#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:544
+#: client/gui-win32/helpdlg.c:551 client/gui-win32/helpdlg.c:721
+#: client/gui-win32/helpdlg.c:741 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 "Nessuno"
@@ -646,29 +647,29 @@ msgstr "Ricerca della Tecnologia Futura %d"
msgid "(Unknown)"
msgstr "(Sconosciuto)"
-#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:553
#: manual/civmanual.c:224
msgid "Road"
msgstr "Strada"
-#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:557
#: client/gui-gtk-2.0/menu.c:829 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:394 common/terrain.c:572 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:567
#: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
#: data/civ1/techs.ruleset:563
msgid "Railroad"
msgstr "Ferrovia"
-#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:555
msgid "Mine"
msgstr "Miniera"
-#: common/terrain.c:396 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:551 server/report.c:124
#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "Inquinamento"
@@ -677,7 +678,7 @@ msgstr "Inquinamento"
msgid "Hut"
msgstr "Capanna"
-#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:563
#: manual/civmanual.c:226
msgid "Fortress"
msgstr "Fortezza"
@@ -690,58 +691,58 @@ msgstr "Fiume"
msgid "Farmland"
msgstr "Fattoria"
-#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:577
#: manual/civmanual.c:226
msgid "Airbase"
msgstr "Base aerea"
-#: common/terrain.c:402 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:579
msgid "Fallout"
msgstr "Radioattività"
-#: common/unit.c:546 client/gui-win32/plrdlg.c:337
+#: common/unit.c:549 client/gui-win32/plrdlg.c:337
msgid "Idle"
msgstr "Inattivo"
-#: common/unit.c:556
+#: common/unit.c:559
msgid "Fortifying"
msgstr "Fortificazione in corso"
-#: common/unit.c:558
+#: common/unit.c:561
msgid "Fortified"
msgstr "Fortificato"
-#: common/unit.c:562 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
+#: common/unit.c:565 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
msgid "Sentry"
msgstr "Sentinella"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
+#: common/unit.c:569 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
#: client/gui-win32/menu.c:370 client/gui-xaw/menu.c:185
msgid "Pillage"
msgstr "Saccheggio"
-#: common/unit.c:568 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
+#: common/unit.c:571 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
msgid "Goto"
msgstr "Vai a"
-#: common/unit.c:570
+#: common/unit.c:573
msgid "Explore"
msgstr "Esplora"
-#: common/unit.c:572 manual/civmanual.c:224
+#: common/unit.c:575 manual/civmanual.c:224
msgid "Transform"
msgstr "Trasforma"
-#: common/unit.c:584 client/text.c:157 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:587 client/text.c:157 client/gui-sdl/citydlg.c:1972
#: client/gui-win32/citydlg.c:1257 client/gui-xaw/citydlg.c:1423
msgid "Unknown"
msgstr "Sconosciuto"
-#: common/unit.c:1022
+#: common/unit.c:1025
msgid "Moves"
msgstr "Movimenti"
-#: common/unit.c:1571
+#: common/unit.c:1574
#, c-format
msgid ""
"Upgrade %s to %s for %d gold?\n"
@@ -750,12 +751,12 @@ msgstr ""
"Aggiornare %s a %s per %d auri?\n"
"Il tesoro contiene %d auri."
-#: common/unit.c:1579
+#: common/unit.c:1582
#, c-format
msgid "Sorry, cannot upgrade %s (yet)."
msgstr "Spiacente, impossibile aggiornare %s (al momento)."
-#: common/unit.c:1585
+#: common/unit.c:1588
#, c-format
msgid ""
"Upgrading %s to %s costs %d gold.\n"
@@ -764,11 +765,11 @@ msgstr ""
"L'aggiornamento di %s a %s costa %d auri.\n"
"Il tesoro contiene %d auri."
-#: common/unit.c:1594
+#: common/unit.c:1597
msgid "You can only upgrade units in your cities."
msgstr "Puoi aggiornare solo le truppe presenti nelle tue città."
-#: common/unit.c:1598
+#: common/unit.c:1601
#, c-format
msgid "Upgrading this %s would strand units it transports."
msgstr "Aggiornare questo %s farà sbarcare le unità che trasporta."
@@ -805,11 +806,11 @@ msgstr "Missile Nucleare"
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1404
+#: common/unittype.c:349 client/helpdata.c:1412
msgid " and "
msgstr " e "
-#: common/unittype.c:355 client/helpdata.c:1390
+#: common/unittype.c:355 client/helpdata.c:1398
msgid "?and:, "
msgstr "?and:, "
@@ -975,73 +976,73 @@ msgstr "Argomento vuoto per \"%s\".\n"
msgid "Missing argument for \"%s\".\n"
msgstr "Argomento mancante per \"%s\".\n"
-#: utility/shared.c:501
+#: utility/shared.c:514
#, c-format
msgid "%d BC"
msgstr "%d a.C."
-#: utility/shared.c:503
+#: utility/shared.c:516
#, c-format
msgid "%d AD"
msgstr "%d d.C."
-#: utility/shared.c:924
+#: utility/shared.c:937
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:1028
+#: utility/shared.c:1041
#, c-format
msgid "Could not read data directory %s: %s."
msgstr "Impossibile leggere la directory dei dati %s: %s."
-#: utility/shared.c:1279
+#: utility/shared.c:1292
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:1281
+#: utility/shared.c:1294
#, c-format
msgid "Current data path is: \"%s\""
msgstr "Il percorso dei file dati attuale è: \"%s\""
-#: utility/shared.c:1283
+#: utility/shared.c:1296
#, c-format
msgid "The \"%s\" file is required ... aborting!"
msgstr "È necessario il file \"%s\"... chiusura!"
-#: utility/shared.c:1460
+#: utility/shared.c:1485
#, 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:1462
+#: utility/shared.c:1487
msgid "Use a non-privileged account instead.\n"
msgstr "Utilizzate un account non privilegiato invece.\n"
-#: utility/shared.c:1478
+#: utility/shared.c:1503
msgid "exact match"
msgstr "corrispondenza esatta"
-#: utility/shared.c:1479
+#: utility/shared.c:1504
msgid "only match"
msgstr "unica corrispondenza"
-#: utility/shared.c:1480
+#: utility/shared.c:1505
msgid "ambiguous"
msgstr "ambiguo"
-#: utility/shared.c:1481
+#: utility/shared.c:1506
msgid "empty"
msgstr "vuoto"
-#: utility/shared.c:1482
+#: utility/shared.c:1507
msgid "too long"
msgstr "troppo lungo"
-#: utility/shared.c:1483
+#: utility/shared.c:1508
msgid "non-match"
msgstr "nessuna corrispondenza"
@@ -1070,22 +1071,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:280
+#: ai/advdiplomacy.c:300
#, 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:290
+#: ai/advdiplomacy.c:310
#, 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:303
+#: ai/advdiplomacy.c:322
#, fuzzy, c-format
msgid "*%s (AI)* Let us first cease hostilies, %s."
msgstr "*%s (IA)* Cessiamo innanzitutto le ostilità, %s"
-#: ai/advdiplomacy.c:308
+#: ai/advdiplomacy.c:327
#, fuzzy, c-format
msgid ""
"*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
@@ -1094,69 +1095,69 @@ msgstr ""
"*%s (IA)* Non ti permetterò di liberarti così facilmente, %s. L'attuale "
"trattato permane."
-#: ai/advdiplomacy.c:331
+#: ai/advdiplomacy.c:350
#, 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:424
+#: ai/advdiplomacy.c:443
#, c-format
msgid "*%s (AI)* I do not know the city you mention."
msgstr ""
-#: ai/advdiplomacy.c:454
+#: ai/advdiplomacy.c:473
#, 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:560
+#: ai/advdiplomacy.c:579
#, c-format
msgid "*%s (AI)* This deal was not very good for us, %s!"
msgstr ""
-#: ai/advdiplomacy.c:582
+#: ai/advdiplomacy.c:601
#, c-format
msgid "*%s (AI)* Welcome into our alliance %s!"
msgstr "*%s (IA)* Benvenuto nella nostra alleanza %s!"
-#: ai/advdiplomacy.c:586
+#: ai/advdiplomacy.c:605
#, 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:593
+#: ai/advdiplomacy.c:612
#, c-format
msgid "*%s (AI)* Yes, peace in our time!"
msgstr "*%s (IA)* Si, firmiamo la pace!"
-#: ai/advdiplomacy.c:598
+#: ai/advdiplomacy.c:617
#, fuzzy, c-format
msgid "*%s (AI)* Agreed. No more hostilities, %s."
msgstr "*%s (IA)* D'accordo. Niente più ostilità, %s"
-#: ai/advdiplomacy.c:813
+#: ai/advdiplomacy.c:832
#, c-format
msgid ""
"*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
"other better?"
msgstr ""
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1116
#, fuzzy, c-format
msgid "*%s (AI)* Space will never be yours. "
msgstr "*%s (IA)* Si, firmiamo la pace!"
-#: ai/advdiplomacy.c:1102
+#: ai/advdiplomacy.c:1121
#, c-format
msgid "*%s (AI)* I have tolerated your vicious antics long enough! To war!"
msgstr ""
-#: ai/advdiplomacy.c:1108
+#: ai/advdiplomacy.c:1127
#, fuzzy, c-format
msgid "*%s (AI)* Peace in ... some other time."
msgstr "*%s (IA)* Pace?... forse un'altra volta!"
-#: ai/advdiplomacy.c:1113
+#: ai/advdiplomacy.c:1132
#, c-format
msgid ""
"*%s (AI)* Finally I get around to you! Did you really think you could get "
@@ -1165,19 +1166,19 @@ msgstr ""
"*%s (IA)* Alla fine siamo di fronte! Speri forse di poter scappare dopo i "
"crimini che hai commesso?"
-#: ai/advdiplomacy.c:1119
+#: ai/advdiplomacy.c:1138
#, c-format
msgid "*%s (AI)* Your covert hostilities brought this war upon you!"
msgstr ""
-#: ai/advdiplomacy.c:1126
+#: ai/advdiplomacy.c:1145
#, 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:1209
+#: ai/advdiplomacy.c:1229
#, c-format
msgid ""
"*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1188,14 +1189,14 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1219
+#: ai/advdiplomacy.c:1239
#, c-format
msgid ""
"*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
"alliance!"
msgstr ""
-#: ai/advdiplomacy.c:1225
+#: ai/advdiplomacy.c:1245
#, c-format
msgid ""
"*%s (AI)* %s has grossly violated his treaties with us for own gain. We "
@@ -1208,7 +1209,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1238
+#: ai/advdiplomacy.c:1258
#, c-format
msgid ""
"*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1219,13 +1220,13 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1246
+#: ai/advdiplomacy.c:1266
#, c-format
msgid ""
"*%s (AI)* If you want a piece of the loot, feel free to join in the action!"
msgstr ""
-#: ai/advdiplomacy.c:1251
+#: ai/advdiplomacy.c:1271
#, c-format
msgid ""
"*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1236,12 +1237,12 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1261
+#: ai/advdiplomacy.c:1281
#, c-format
msgid "*%s (AI)* As our glorious allies, we expect your help in this war."
msgstr ""
-#: ai/advdiplomacy.c:1267
+#: ai/advdiplomacy.c:1287
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance and declare war on %s in %d turn. "
@@ -1252,7 +1253,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1276
+#: ai/advdiplomacy.c:1296
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1263,7 +1264,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1344
+#: ai/advdiplomacy.c:1364
#, c-format
msgid ""
"*%s (AI)* Your attempt to conquer space for yourself alone betray your true "
@@ -1272,7 +1273,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:1359
+#: ai/advdiplomacy.c:1379
#, c-format
msgid ""
"*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
@@ -1281,7 +1282,7 @@ msgstr ""
"*%s (IA)* Il tuo tentativo di dominare unilateralmente lo spazio esterno è "
"estremamente offensivo."
-#: ai/advdiplomacy.c:1362
+#: ai/advdiplomacy.c:1382
#, c-format
msgid ""
"*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
@@ -1290,13 +1291,13 @@ msgstr ""
"*%s (IA)* Se non fermate i lavori di costruzione della nave spaziale, ci "
"vedremo costretti a prendere provvedimenti!"
-#: ai/advdiplomacy.c:1474
+#: ai/advdiplomacy.c:1494
#, 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:1549
+#: ai/advdiplomacy.c:1569
#, fuzzy, c-format
msgid ""
"*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
@@ -1305,7 +1306,7 @@ msgstr ""
"*%s (IA)* Saluti al nostro più fedele alleato, ci rivolgiamo a te per "
"distruggere il nostro nemico, %s"
-#: ai/advdiplomacy.c:1555
+#: ai/advdiplomacy.c:1575
#, c-format
msgid ""
"*%s (AI)* Greetings ally, I see you have not yet made war with our enemy, %"
@@ -1315,7 +1316,7 @@ msgstr ""
"dichiarato guerra al nostro nemico, %s. Perché dobbiamo essere noi a "
"ricordarti le tue promesse?"
-#: ai/advdiplomacy.c:1562
+#: ai/advdiplomacy.c:1582
#, fuzzy, c-format
msgid ""
"*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1326,7 +1327,7 @@ msgstr ""
"pace con il nostro mortale nemico, %s! Questo è inaccettabile, la nostra "
"alleanza è finita!"
-#: ai/advdiplomacy.c:1592
+#: ai/advdiplomacy.c:1612
#, fuzzy, c-format
msgid ""
"*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
@@ -1335,14 +1336,14 @@ msgstr ""
"*%s (IA)* Saluti amico, possiamo suggerire una campagna militare congiunta "
"contro %s?"
-#: ai/advdiplomacy.c:1607
+#: ai/advdiplomacy.c:1627
#, 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:1622
+#: ai/advdiplomacy.c:1642
#, fuzzy, c-format
msgid ""
"*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
@@ -1351,7 +1352,7 @@ msgstr ""
"*%s (IA)* %s sta minacciando entrambi, possiamo suggerire di terminare le "
"ostilità?"
-#: ai/advdiplomacy.c:1742
+#: ai/advdiplomacy.c:1762
#, c-format
msgid ""
"*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1505,19 +1506,19 @@ msgstr ""
"La password deve avere almeno %d lettere maiuscole, %d numeri, ed essere "
"lunga almeno %d caratteri [stampabili]. Riprova."
-#: server/barbarian.c:183
+#: server/barbarian.c:184
#, fuzzy, c-format
msgid "%s gain a leader by the name %s. Dangerous times may lie ahead."
msgstr ""
"I barbari hanno un nuovo capo di nome %s. Tempi pericolosi potrebbero "
"attenderci."
-#: server/barbarian.c:479
+#: server/barbarian.c:480
#, c-format
msgid "Native unrest near %s led by %s."
msgstr "Rivolta di indigeni guidati da %2$s vicino a %1$s."
-#: server/barbarian.c:484
+#: server/barbarian.c:485
#, c-format
msgid "Sea raiders seen near %s!"
msgstr "Pirati avvistati al largo di %s!"
@@ -1918,7 +1919,7 @@ msgid_plural "%s boosts research; you gain %d immediate advances."
msgstr[0] "%s accelera la ricerca, ottenete subito %d tecnologia."
msgstr[1] "%s accelera la ricerca, ottenete subito %d tecnologie."
-#: server/cityturn.c:1158 server/techtools.c:176
+#: server/cityturn.c:1158 server/techtools.c:172
#, c-format
msgid "The %s have acquired %s from %s."
msgstr "gli %s hanno acquisito %s dagli %s."
@@ -2002,22 +2003,22 @@ msgid "Warning: the %s option is obsolete. Use -m to enable the metaserver.\n"
msgstr ""
"Attenzione: l'opzione %s è obsoleta. Usare -m per attivare il metaserver.\n"
-#: server/civserver.c:189
+#: server/civserver.c:193
#, c-format
msgid "Error: unknown option '%s'\n"
msgstr "Errore: opzione '%s' sconosciuta\n"
-#: server/civserver.c:200
+#: server/civserver.c:204
#, c-format
msgid "This is the server for %s"
msgstr "Questo è il server di %s"
-#: server/civserver.c:201
+#: server/civserver.c:205
#, c-format
msgid "You can learn a lot about Freeciv at %s"
msgstr "Potete trovare importanti informazioni su Freeciv a: %s"
-#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
+#: server/civserver.c:210 client/civclient.c:239 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -2026,113 +2027,118 @@ msgstr ""
"Uso: %s [opzione ...]\n"
"Le opzioni valide sono:\n"
-#: server/civserver.c:208
+#: server/civserver.c:212
#, fuzzy
msgid ""
" -a --auth FILE\tEnable server authentication with configuration from "
"FILE.\n"
msgstr " -a --auth\t\tAbilita l'autenticazione del server.\n"
-#: server/civserver.c:210
+#: server/civserver.c:214
msgid " -G --Guests\t\tAllow guests to login if auth is enabled.\n"
msgstr ""
" -G --Guests\t\tPermetti a degli ospiti di entrare quando l'autenticazione "
"è abilitata.\n"
-#: server/civserver.c:212
+#: server/civserver.c:216
msgid " -N --Newusers\tAllow new users to login if auth is enabled.\n"
msgstr ""
" -N -Newusers\tPermetti a nuovi utenti di entare quando l'autenticazione è "
"abilitata.\n"
-#: server/civserver.c:215
+#: server/civserver.c:219
msgid " -b --bind ADDR\tListen for clients on ADDR\n"
msgstr " -b, --bind ADDR\tAttesa di clienti all'indirizzo ADDR\n"
-#: server/civserver.c:217 client/civclient.c:242
+#: server/civserver.c:221 client/civclient.c:243
msgid ""
" -d, --debug NUM\tSet debug log level (0 to 4, or 4:file1,min,max:...)\n"
msgstr ""
" -d, --debug NUM\tImposta il livello di log per il debug (da 0 a 4, o 4:"
"file1,min,max:...)\n"
-#: server/civserver.c:221 client/civclient.c:246
+#: server/civserver.c:225 client/civclient.c:247
msgid " -d, --debug NUM\tSet debug log level (0 to 3)\n"
msgstr " -d, --debug NUM\tImposta il livello di log per il debug (da 0 a 3)\n"
-#: server/civserver.c:223
+#: server/civserver.c:227
msgid " -f, --file FILE\tLoad saved game FILE\n"
msgstr " -f, --file FILE\tCarica il gioco salvato FILE\n"
-#: server/civserver.c:225 client/civclient.c:249 manual/civmanual.c:382
+#: server/civserver.c:229 client/civclient.c:250 manual/civmanual.c:382
msgid " -h, --help\t\tPrint a summary of the options\n"
msgstr " -h, --help\t\tVisualizza una lista delle opzioni\n"
-#: server/civserver.c:226
+#: server/civserver.c:230
+#, fuzzy
+msgid " -i, --identity ADDR\tBe known as ADDR at metaserver\n"
+msgstr " -M, --Metaserver ADDR\tImposta ADDR come indirizzo del metaserver\n"
+
+#: server/civserver.c:231
msgid " -l, --log FILE\tUse FILE as logfile\n"
msgstr " -l, --log FILE\tUsa FILE come file di log\n"
-#: server/civserver.c:227
+#: server/civserver.c:232
msgid " -m, --meta\t\tNotify metaserver and send server's info\n"
msgstr ""
" -m, --meta\t\tContatta il metaserver e manda le informazioni del server\n"
-#: server/civserver.c:229
+#: server/civserver.c:234
msgid " -M, --Metaserver ADDR\tSet ADDR as metaserver address\n"
msgstr " -M, --Metaserver ADDR\tImposta ADDR come indirizzo del metaserver\n"
-#: server/civserver.c:232
+#: server/civserver.c:237
msgid " -p, --port PORT\tListen for clients on port PORT\n"
msgstr " -p, --port PORT\tAttende dei client sulla porta PORT\n"
-#: server/civserver.c:234
+#: server/civserver.c:239
msgid " -q, --quitidle TIME\tQuit if no players for TIME seconds\n"
msgstr " -q, --quitidle SEC\tEsce se non ci sono giocatori per SEC secondi\n"
-#: server/civserver.c:236
+#: server/civserver.c:241
msgid " -e, --exit-on-end\tWhen a game ends, exit instead of restarting\n"
msgstr ""
" -e, --exit-on-end\tQuando la partita termina, esci anziché ripartire\n"
-#: server/civserver.c:239
+#: server/civserver.c:244
msgid " -s, --saves DIR\tSave games to directory DIR\n"
msgstr " -s, --saves DIR\tSalva le partite nella directory DIR\n"
-#: server/civserver.c:241
+#: server/civserver.c:246
#, fuzzy
msgid " -S, --Serverid ID\tSets the server id to ID\n"
msgstr " -s, --server HOST\tSi collega al server HOST\n"
-#: server/civserver.c:243
+#: server/civserver.c:248
msgid " -P, --Ppm\t\tSave ppms of the map when saving the game.\n"
msgstr ""
-#: server/civserver.c:244
+#: server/civserver.c:249
msgid " -r, --read FILE\tRead startup script FILE\n"
msgstr " -r, --read FILE\tLegge lo script iniziale FILE\n"
-#: server/civserver.c:246
+#: server/civserver.c:251
#, fuzzy
msgid " -R, --Ranklog FILE\tUse FILE as ranking logfile\n"
msgstr " -l, --log FILE\tUsa FILE come file di log\n"
-#: server/civserver.c:247 client/civclient.c:268 manual/civmanual.c:383
+#: server/civserver.c:252 client/civclient.c:269 manual/civmanual.c:383
msgid " -v, --version\t\tPrint the version number\n"
msgstr " -v, --version\t\tVisualizza il numero di versione\n"
-#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
+#: server/civserver.c:253 client/gui-gtk-2.0/gui_main.c:354
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, fuzzy, c-format
msgid "Report bugs at %s.\n"
msgstr "Riferite i bug a <%s>.\n"
-#: server/commands.c:28
+#: server/commands.c:29
msgid "Start the game, or restart after loading a savegame."
msgstr ""
"Inizia il gioco o ricomincia dopo il caricamento di una partita salvata."
-#: server/commands.c:29
+#: server/commands.c:30
msgid ""
"This command starts the game. When starting a new game, it should be used "
"after all human players have connected, and AI players have been created (if "
@@ -2152,7 +2158,7 @@ msgstr ""
"comando non è più disponibile, poichè non avrebbe alcun effetto."
#. TRANS: translate text between <> only
-#: server/commands.c:42
+#: server/commands.c:44
msgid ""
"help\n"
"help commands\n"
@@ -2166,11 +2172,11 @@ msgstr ""
"help <nome-comando>\n"
"help <nome-opzione>"
-#: server/commands.c:47
+#: server/commands.c:49
msgid "Show help about server commands and server options."
msgstr "Visualizza l'aiuto sui comandi e le opzioni del server."
-#: server/commands.c:48
+#: server/commands.c:50
msgid ""
"With no arguments gives some introductory help. With argument \"commands\" "
"or \"options\" gives respectively a list of all commands or all options. "
@@ -2186,12 +2192,12 @@ msgstr ""
"comprendono il valore corrente e quello predefinito dell'opzione. "
"L'argomento può essere abbreviato, purchè non sia ambiguo."
-#: server/commands.c:63
+#: server/commands.c:66
#, fuzzy
msgid "Show a list of players, teams, connections, or scenarios."
msgstr "Mostra una lista dei giocatori o dei collegamenti."
-#: server/commands.c:64
+#: server/commands.c:67
#, fuzzy
msgid ""
"Show a list of players in the game, teams of players, connections to the "
@@ -2201,20 +2207,20 @@ msgstr ""
"Mostra una lista dei giocatori o dei collegamenti al server. L'argomento "
"può essere abbreviato e se è omesso viene usato 'players'."
-#: server/commands.c:70
+#: server/commands.c:74
msgid "Quit the game and shutdown the server."
msgstr "Interrompe il gioco ed esce dal server."
#. TRANS: translate text between <> only
-#: server/commands.c:74
+#: server/commands.c:79
msgid "cut <connection-name>"
msgstr "cut <nome-collegamento>"
-#: server/commands.c:75
+#: server/commands.c:80
msgid "Cut a client's connection to server."
msgstr "Interrompe il collegamento di un client con il server."
-#: server/commands.c:76
+#: server/commands.c:81
msgid ""
"Cut specified client's connection to the server, removing that client from "
"the game. If the game has not yet started that client's player is removed "
@@ -2228,7 +2234,7 @@ msgstr ""
"giocatore."
#. TRANS: translate text between <> only
-#: server/commands.c:83
+#: server/commands.c:89
msgid ""
"explain\n"
"explain <option-name>"
@@ -2236,11 +2242,11 @@ msgstr ""
"explain\n"
"explain <nome-opzione>"
-#: server/commands.c:85
+#: server/commands.c:91
msgid "Explain server options."
msgstr "Spiega un'opzione del server."
-#: server/commands.c:86
+#: server/commands.c:92
msgid ""
"The 'explain' command gives a subset of the functionality of 'help', and is "
"included for backward compatibility. With no arguments it gives a list of "
@@ -2253,7 +2259,7 @@ msgstr ""
"una particolare opzione (come 'help <nome-opzione>')."
#. TRANS: translate text between <> only
-#: server/commands.c:93
+#: server/commands.c:100
msgid ""
"show\n"
"show <option-name>\n"
@@ -2263,11 +2269,11 @@ msgstr ""
"show <nome-opzione>\n"
"show <prefisso-opzione>"
-#: server/commands.c:96
+#: server/commands.c:103
msgid "Show server options."
msgstr "Mostra le opzioni del server."
-#: server/commands.c:97
+#: server/commands.c:104
msgid ""
"With no arguments, shows all server options (or available options, when used "
"by clients). With an argument, show only the named option, or options with "
@@ -2277,36 +2283,37 @@ msgstr ""
"disponibili, quando è usato dai client). Con un argomento mostra solo "
"l'opzione richiesta o tutte le opzioni che iniziano con quel prefisso."
-#: server/commands.c:102
+#: server/commands.c:110
msgid "wall <message>"
msgstr "stampa <messaggio>"
-#: server/commands.c:103
+#: server/commands.c:111
msgid "Send message to all connections."
msgstr "Manda un messaggio a tutte le connessioni"
-#: server/commands.c:104
+#: server/commands.c:112
msgid ""
"For each connected client, pops up a window showing the message entered."
msgstr "Per ogni client collegato mostra in una finestra i messaggi inseriti."
-#: server/commands.c:108
+#: server/commands.c:117
msgid "vote yes|no [vote number]"
msgstr "vota si/no [numero voto]"
-#: server/commands.c:109
+#: server/commands.c:118
msgid "Cast a vote."
msgstr "Effettua un voto."
-#: server/commands.c:111
+#: server/commands.c:120
#, 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."
+"A player with basic 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."
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 "
@@ -2318,7 +2325,7 @@ msgstr ""
"vota contro. Se trascorre un intero turno il voto può passare se nessuno "
"vota contro."
-#: server/commands.c:121
+#: server/commands.c:131
#, fuzzy
msgid ""
"debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
@@ -2326,12 +2333,12 @@ msgid ""
msgstr ""
"debug [ player <giocatore> | city <x> <y> | units <x> <y> | unit <id> ]"
-#: server/commands.c:123
+#: server/commands.c:133
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:124
+#: server/commands.c:134
msgid ""
"Print AI debug information about given entity and turn continous debugging "
"output for this entity on or off."
@@ -2339,24 +2346,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:128
+#: server/commands.c:139
msgid "set <option-name> <value>"
msgstr "set <nome-opzione> <valore>"
-#: server/commands.c:129
+#: server/commands.c:140
msgid "Set server option."
msgstr "Imposta le opzioni del server."
-#: server/commands.c:132
+#: server/commands.c:144
msgid "team <player> [team]"
msgstr "squadra <nome-giocatore> [squadra]"
-#: server/commands.c:133
+#: server/commands.c:145
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:134
+#: server/commands.c:146
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 "
@@ -2370,15 +2377,15 @@ msgstr ""
"che combattono assieme per raggiungere la vittoria, ottenendone dei punteggi "
"individuali mediati."
-#: server/commands.c:141
+#: server/commands.c:154
msgid "rulesetdir <directory>"
msgstr "Directory dei ruleset <directory>"
-#: server/commands.c:142
+#: server/commands.c:155
msgid "Choose new ruleset directory or modpack."
msgstr "Scegli una nuova directory dei ruleset o un nuovo modpack."
-#: server/commands.c:143
+#: server/commands.c:156
msgid ""
"Choose new ruleset directory or modpack. Calling this\n"
" without any arguments will show you the currently selected ruleset."
@@ -2387,15 +2394,15 @@ msgstr ""
"senza argomenti e verrà visualizzata la directory attualmente selezionata."
#. TRANS: translate text between <> only
-#: server/commands.c:149
+#: server/commands.c:163
msgid "metainfo <meta-line>"
msgstr "metainfo <linea-metaserver>"
-#: server/commands.c:150
+#: server/commands.c:164
msgid "Set metaserver info line."
msgstr "Imposta la linea di informazioni per il metaserver."
-#: server/commands.c:151
+#: server/commands.c:165
msgid ""
"Set user defined metaserver info line. If parameter is omitted,\n"
"previously set metamessage will be removed. For most of the time\n"
@@ -2404,19 +2411,19 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:158
+#: server/commands.c:173
msgid "metapatch <meta-line>"
msgstr "metapatch <linea-metaserver>"
-#: server/commands.c:159
+#: server/commands.c:174
msgid "Set metaserver patches line."
msgstr "Imposta la linea per le patches del metaserver."
-#: server/commands.c:165
+#: server/commands.c:181
msgid "Control metaserver connection."
msgstr "Controlla il collegamento con il metaserver."
-#: server/commands.c:166
+#: server/commands.c:182
msgid ""
"'metaconnection ?' reports on the status of the connection to metaserver.\n"
"'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2427,33 +2434,33 @@ msgstr ""
"'metaconnection up' oppure 'metac u' si connette al metaserver."
#. TRANS: translate text between <> only
-#: server/commands.c:172
+#: server/commands.c:189
msgid "metaserver <address>"
msgstr "metaserver <indirizzo>"
-#: server/commands.c:173
+#: server/commands.c:190
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:177
+#: server/commands.c:195
msgid "aitoggle <player-name>"
msgstr "aitoggle <nome-giocatore>"
-#: server/commands.c:178
+#: server/commands.c:196
msgid "Toggle AI status of player."
msgstr "Cambia lo stato di IA del giocatore."
#. TRANS: translate text between [] and <> only
-#: server/commands.c:182
+#: server/commands.c:201
msgid "take [connection-name] <player-name>"
msgstr "prendi [nome-connessione] <nome-giocatore>"
-#: server/commands.c:183
+#: server/commands.c:202
msgid "Take over a player's place in the game."
msgstr "Prendi il posto di un giocatore nella partita."
-#: server/commands.c:184
+#: server/commands.c:203
#, fuzzy
msgid ""
"Only the console and connections with cmdlevel 'hack' can force other "
@@ -2470,15 +2477,15 @@ msgstr ""
"attaccata a un osservatore globale."
#. TRANS: translate text between [] only
-#: server/commands.c:192
+#: server/commands.c:212
msgid "observe [connection-name] [player-name]"
msgstr "osserva [nome-connessione] [nome-giocatore]"
-#: server/commands.c:193
+#: server/commands.c:213
msgid "Observe a player or the whole game."
msgstr "Osserva un giocatore o l'intera partita."
-#: server/commands.c:194
+#: server/commands.c:214
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 "
@@ -2494,15 +2501,15 @@ msgstr ""
"attaccata a un osservatore globale."
#. TRANS: translate text between <> only
-#: server/commands.c:202
+#: server/commands.c:223
msgid "detach <connection-name>"
msgstr "distacca <nome-connessione>"
-#: server/commands.c:203
+#: server/commands.c:224
msgid "detach from a player."
msgstr "distacca da un giocatre."
-#: server/commands.c:204
+#: server/commands.c:225
msgid ""
"Only the console and connections with cmdlevel 'hack' can force other "
"connections to detach from a player."
@@ -2511,21 +2518,21 @@ msgstr ""
"possono forzare il distacco di un giocatore."
#. TRANS: translate text between <> only
-#: server/commands.c:209
+#: server/commands.c:231
msgid "create <player-name>"
msgstr "create <nome-giocatore>"
-#: server/commands.c:210
+#: server/commands.c:232
msgid "Create an AI player with a given name."
msgstr "Crea un giocatore IA con il nome specificato."
-#: server/commands.c:211
+#: server/commands.c:233
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:215
+#: server/commands.c:238
msgid ""
"away\n"
"away"
@@ -2533,16 +2540,16 @@ msgstr ""
"away\n"
"away"
-#: server/commands.c:217
+#: server/commands.c:240
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:218
+#: server/commands.c:241
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:222
+#: server/commands.c:246
msgid ""
"novice\n"
"novice <player-name>"
@@ -2550,11 +2557,11 @@ msgstr ""
"novice\n"
"novice <nome-giocatore>"
-#: server/commands.c:224
+#: server/commands.c:248
msgid "Set one or all AI players to 'novice'."
msgstr "Imposta uno o tutti i giocatori IA a 'novizio'."
-#: server/commands.c:225
+#: server/commands.c:249
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 "
@@ -2566,7 +2573,7 @@ msgstr ""
"giocatore."
#. TRANS: translate text between <> only
-#: server/commands.c:231
+#: server/commands.c:256
msgid ""
"easy\n"
"easy <player-name>"
@@ -2574,11 +2581,11 @@ msgstr ""
"easy\n"
"easy <nome-giocatore>"
-#: server/commands.c:233
+#: server/commands.c:258
msgid "Set one or all AI players to 'easy'."
msgstr "Imposta uno o tutti i giocatori IA a 'facile'."
-#: server/commands.c:234
+#: server/commands.c:259
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 "
@@ -2590,7 +2597,7 @@ msgstr ""
"giocatore."
#. TRANS: translate text between <> only
-#: server/commands.c:240
+#: server/commands.c:266
msgid ""
"normal\n"
"normal <player-name>"
@@ -2598,11 +2605,11 @@ msgstr ""
"normal\n"
"normal <nome-giocatore>"
-#: server/commands.c:242
+#: server/commands.c:268
msgid "Set one or all AI players to 'normal'."
msgstr "Imposta uno o tutti i giocatori IA a 'normale'."
-#: server/commands.c:243
+#: server/commands.c:269
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 "
@@ -2614,7 +2621,7 @@ msgstr ""
"giocatore."
#. TRANS: translate text between <> only
-#: server/commands.c:249
+#: server/commands.c:276
msgid ""
"hard\n"
"hard <player-name>"
@@ -2622,11 +2629,11 @@ msgstr ""
"hard\n"
"hard <nome-giocatore>"
-#: server/commands.c:251
+#: server/commands.c:278
msgid "Set one or all AI players to 'hard'."
msgstr "Imposta uno o tutti i giocatori IA a 'difficile'."
-#: server/commands.c:252
+#: server/commands.c:279
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 "
@@ -2638,7 +2645,7 @@ msgstr ""
"quel giocatore."
#. TRANS: translate text between <> only
-#: server/commands.c:258
+#: server/commands.c:286
msgid ""
"experimental\n"
"experimental <player-name>"
@@ -2646,11 +2653,11 @@ msgstr ""
"experimental\n"
"experimantal <nome-giocatore>"
-#: server/commands.c:260
+#: server/commands.c:288
msgid "Set one or all AI players to 'experimental'."
msgstr "Imposta uno o tutti i giocatori IA a 'sperimentale'."
-#: server/commands.c:261
+#: server/commands.c:289
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 "
@@ -2663,7 +2670,7 @@ msgstr ""
"quel giocatore."
#. TRANS: translate text between <> only
-#: server/commands.c:269
+#: server/commands.c:298
msgid ""
"cmdlevel\n"
"cmdlevel <level>\n"
@@ -2677,18 +2684,20 @@ msgstr ""
"cmdlevel <livello> first\n"
"cmdlevel <livello> <nome-collegamento>"
-#: server/commands.c:274
+#: server/commands.c:303
msgid "Query or set command access level access."
msgstr "Mostra o imposta il livello di accesso ai comandi."
-#: server/commands.c:275
+#: server/commands.c:304
#, fuzzy
msgid ""
"The command access level controls which server commands are available\n"
"to users via the client chatline. The available levels are:\n"
" none - no commands\n"
-" info - informational commands only\n"
+" info - informational or observer commands only\n"
+" basic - commands available to players in the game\n"
" ctrl - commands that affect the game and users\n"
+" admin - commands that affect server operation\n"
" hack - *all* commands - dangerous!\n"
"With no arguments, the current command access levels are reported.\n"
"With a single argument, the level is set for all existing connections,\n"
@@ -2724,20 +2733,20 @@ msgstr ""
"nome. Attenzione che questo comando richiede il nome di un collegamento, "
"non di un giocatore."
-#: server/commands.c:296
+#: server/commands.c:328
msgid "If there is none, become the game organizer with increased permissions."
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:301
+#: server/commands.c:334
msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
msgstr "timeoutincrease <turno> <incrementoturno> <valore> <moltiplicavalore>."
-#: server/commands.c:302
+#: server/commands.c:335
msgid "See \"help timeoutincrease\"."
msgstr "Vedete \"help timeoutincrease\"."
-#: server/commands.c:303
+#: server/commands.c:336
msgid ""
"Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
"<turn> and multiply <value> by <valuemult>. Use this command in concert "
@@ -2748,42 +2757,61 @@ msgstr ""
"opzione assieme all'opzione \"timeout\". Il valore predefinito è 0 0 0 1"
#. TRANS: translate text between <> only
-#: server/commands.c:309
+#: server/commands.c:343
+msgid ""
+"cancelvote\n"
+"cancelvote <vote number>\n"
+"cancelvote all\n"
+msgstr ""
+
+#: server/commands.c:346
+msgid "Cancel a running vote.\n"
+msgstr ""
+
+#: server/commands.c:347
+msgid ""
+"With no arguments this command removes your own vote. If you have an admin "
+"access level, you can cancel any vote by vote number, or all votes with the "
+"'all' argument."
+msgstr ""
+
+#. TRANS: translate text between <> only
+#: server/commands.c:354
#, fuzzy
msgid "endgame"
msgstr "Rinomina"
-#: server/commands.c:310
+#: server/commands.c:355
#, fuzzy
msgid "End the game immediately in a draw."
msgstr "La partita è finita con un pareggio"
#. TRANS: translate text between <> only
-#: server/commands.c:314
+#: server/commands.c:360
msgid "surrender"
msgstr ""
-#: server/commands.c:315
+#: server/commands.c:361
#, fuzzy
msgid "Concede the game."
msgstr "Impossibile caricare il file con la partita salvata"
-#: server/commands.c:316
+#: server/commands.c:362
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:322
+#: server/commands.c:369
msgid "remove <player-name>"
msgstr "remove <nome-giocatore>"
-#: server/commands.c:323
+#: server/commands.c:370
msgid "Fully remove player from game."
msgstr "Elimina completamente un giocatore dalla partita."
-#: server/commands.c:324
+#: server/commands.c:371
msgid ""
"This *completely* removes a player from the game, including all cities and "
"units etc. Use with care!"
@@ -2792,7 +2820,7 @@ msgstr ""
"e le unità ecc. Usare con cautela!"
#. TRANS: translate text between <> only
-#: server/commands.c:329
+#: server/commands.c:377
msgid ""
"save\n"
"save <file-name>"
@@ -2800,11 +2828,11 @@ msgstr ""
"save\n"
"save <nome-file>"
-#: server/commands.c:331
+#: server/commands.c:379
msgid "Save game to file."
msgstr "Salva la partita in un file."
-#: server/commands.c:332
+#: server/commands.c:380
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"
@@ -2821,7 +2849,7 @@ msgstr ""
"e usate il comando 'start' quando i giocatori si sono ricollegati."
#. TRANS: translate text between <> only
-#: server/commands.c:341
+#: server/commands.c:390
msgid ""
"load\n"
"load <file-name>"
@@ -2829,11 +2857,11 @@ msgstr ""
"load\n"
"load <nome-file>"
-#: server/commands.c:343
+#: server/commands.c:392
msgid "Load game from file."
msgstr "Carica la partita da un file."
-#: server/commands.c:344
+#: server/commands.c:393
msgid ""
"Load a game from <file-name>. Any current data including players, rulesets "
"and server options are lost.\n"
@@ -2842,120 +2870,120 @@ msgstr ""
"ruleset e le opzioni del server vengono perse.\n"
#. TRANS: translate text between <> only
-#: server/commands.c:349
+#: server/commands.c:399
msgid "read <file-name>"
msgstr "read <nome-file>"
-#: server/commands.c:350
+#: server/commands.c:400
msgid "Process server commands from file."
msgstr "Esegue dei comandi per il server da un file."
#. TRANS: translate text between <> only
-#: server/commands.c:354
+#: server/commands.c:405
msgid "write <file-name>"
msgstr "write <nome-file>"
-#: server/commands.c:355
+#: server/commands.c:406
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:359
+#: server/commands.c:411
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:363
+#: server/commands.c:416
msgid "Simply returns the id of the server."
msgstr ""
-#: server/connecthand.c:85
+#: server/connecthand.c:109
#, c-format
msgid "Welcome to the %s Server running at %s port %d."
msgstr "Benvenuto al server %s che gira su %s porta %d."
-#: server/connecthand.c:89
+#: server/connecthand.c:113
#, c-format
msgid "Welcome to the %s Server at port %d."
msgstr "Benvenuto al server %s sulla porta %d."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:97
+#: server/connecthand.c:121
#, fuzzy, c-format
msgid "(%d) %s: connected [%s]"
msgstr "(%d) %s si è connesso da %s."
-#: server/connecthand.c:104
+#: server/connecthand.c:128
#, c-format
msgid "Server: %s has connected from %s."
msgstr "Server: %s è connesso da %s."
-#: server/connecthand.c:145
+#: server/connecthand.c:175
msgid "Couldn't attach your connection to new player."
msgstr "Impossibile attaccare la connessione ad un nuovo giocatore."
-#: server/connecthand.c:165
+#: server/connecthand.c:199
#, c-format
msgid "You are logged in as '%s' connected to no player."
msgstr "Sei connesso come '%s' non collegato ad alcun giocatore."
-#: server/connecthand.c:169
+#: server/connecthand.c:203
#, c-format
msgid "You are logged in as '%s' connected to an anonymous player."
msgstr "Sei connesso come '%s' collegato a un giocatore anonimo."
-#: server/connecthand.c:174
+#: server/connecthand.c:208
#, c-format
msgid "You are logged in as '%s' connected to %s."
msgstr "Sei entrato come '%s' connesso a %s."
-#: server/connecthand.c:187
+#: server/connecthand.c:221
#, c-format
msgid "Turn-blocking game play: waiting on %s to finish turn..."
msgstr "Gioco a turni: in attesa di %s per finire il turno..."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:240
+#: server/connecthand.c:274
#, fuzzy, c-format
msgid "(%d) %s: connection request [%s]"
msgstr "(%d) Richiesta di collegamento da %s da %s"
-#: server/connecthand.c:266
+#: server/connecthand.c:300
#, fuzzy
msgid "The client is missing a capability that this server needs."
msgstr "Al client manca una capacità richiesta da questo server."
-#: server/connecthand.c:268 server/connecthand.c:279
+#: server/connecthand.c:302 server/connecthand.c:313
#, fuzzy, c-format
msgid "(%d) %s rejected: mismatched capabilities!"
msgstr "(%d) %s è stato rifiutato: capacità non corrispondenti."
-#: server/connecthand.c:277
+#: server/connecthand.c:311
#, fuzzy
msgid "This server is missing a capability that the client needs."
msgstr "Al server manca una capacità richiesta dal client."
-#: server/connecthand.c:290
+#: server/connecthand.c:324
#, fuzzy
msgid "The username is invalid!"
msgstr "Nome non consentito"
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:292
+#: server/connecthand.c:326
#, fuzzy, c-format
msgid "(%d) %s rejected: invalid username [%s]"
msgstr "(%d) %s è stato rifiutato: capacità non corrispondenti [%s]"
-#: server/connecthand.c:303
+#: server/connecthand.c:337
#, fuzzy
msgid "Your username is already connected!"
msgstr "Spiacente, è già connesso."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:305
+#: server/connecthand.c:339
#, fuzzy, c-format
msgid "(%d) %s rejected: duplicate username [%s]"
msgstr "(%d) %s è stato rifiutato: capacità non corrispondenti [%s]"
-#: server/connecthand.c:335 server/connecthand.c:344
+#: server/connecthand.c:369 server/connecthand.c:378
#, c-format
msgid "Lost connection: %s."
msgstr "Connessione persa: %s."
@@ -2972,113 +3000,113 @@ msgstr "Ok. Stile standard attivato."
msgid "For introductory help, type 'help'."
msgstr "Per un primo aiuto, digitare 'help'."
-#: server/diplhand.c:164
+#: server/diplhand.c:167
#, c-format
msgid "The %s can't accept %s."
msgstr "gli %s non possono accettare %s."
-#: server/diplhand.c:176
+#: server/diplhand.c:179
#, c-format
msgid "You don't have tech %s, you can't accept treaty."
msgstr "non possedete la tecnologia %s, non potete accettare il trattato."
-#: server/diplhand.c:185
+#: server/diplhand.c:188
msgid "City you are trying to give no longer exists, you can't accept treaty."
msgstr ""
"La città che state provando a cedere non esiste più, non potete accettare il "
"trattato."
-#: server/diplhand.c:191
+#: server/diplhand.c:194
#, c-format
msgid "You are not owner of %s, you can't accept treaty."
msgstr "Non siete il proprietario di %s, non potete accettare il trattato."
-#: server/diplhand.c:197 server/diplhand.c:301
+#: server/diplhand.c:200 server/diplhand.c:304
#, c-format
msgid "Your capital (%s) is requested, you can't accept treaty."
msgstr "è richiesta la vostra capitale (%s), non potete accettare il trattato."
-#: server/diplhand.c:224
+#: server/diplhand.c:227
msgid "You don't have enough gold, you can't accept treaty."
msgstr "non avete abbastanza auri, non potete accettare il trattato."
-#: server/diplhand.c:256 server/diplhand.c:261
+#: server/diplhand.c:259 server/diplhand.c:264
#, c-format
msgid "A treaty containing %d clause was agreed upon."
msgid_plural "A treaty containing %d clauses was agreed upon."
msgstr[0] "è stato firmato un trattato contenente %d clausola."
msgstr[1] "è stato firmato un trattato contenente %d clausole."
-#: server/diplhand.c:277 server/diplhand.c:281
+#: server/diplhand.c:280 server/diplhand.c:284
#, fuzzy, c-format
msgid "One of the cities the %s are giving away is destroyed! Treaty canceled!"
msgstr ""
"una delle città che gli %s stanno cedendo è distrutta! Trattato annullato!"
-#: server/diplhand.c:288 server/diplhand.c:293
+#: server/diplhand.c:291 server/diplhand.c:296
#, c-format
msgid "The %s no longer control %s! Treaty canceled!"
msgstr "gli %s non controllano più %s! Trattato annullato!"
-#: server/diplhand.c:331 server/diplhand.c:335
+#: server/diplhand.c:334 server/diplhand.c:338
#, c-format
msgid "The %s don't have the promised amount of gold! Treaty canceled!"
msgstr "gli %s non hanno la quantità di oro promessa! Trattato annullato!"
-#: server/diplhand.c:364
+#: server/diplhand.c:367
#, c-format
msgid "You gave an embassy to %s."
msgstr "Avete concesso un'ambasciata a %s."
-#: server/diplhand.c:367
+#: server/diplhand.c:370
#, c-format
msgid "%s allowed you to create an embassy!"
msgstr "%s ti ha permesso di creare un'ambasciata!"
-#: server/diplhand.c:383
+#: server/diplhand.c:386
#, c-format
msgid "You are taught the knowledge of %s."
msgstr "vi è stata insegnata la conoscenza di %s."
-#: server/diplhand.c:387
+#: server/diplhand.c:390
#, c-format
msgid "The %s have acquired %s from the %s."
msgstr "gli %s hanno acquisito %s dagli %s."
-#: server/diplhand.c:402
+#: server/diplhand.c:405
#, c-format
msgid "You get %d gold."
msgstr "guadagnate %d auri."
#. TRANS: ... Polish worldmap.
-#: server/diplhand.c:410
+#: server/diplhand.c:413
#, fuzzy, c-format
msgid "You receive the %s worldmap."
msgstr "avete ricevuto la mappa dei territori conosciuti di %s."
#. TRANS: ... Polish seamap.
-#: server/diplhand.c:419
+#: server/diplhand.c:422
#, fuzzy, c-format
msgid "You receive the %s seamap."
msgstr "avete ricevuto la mappa marittima di %s."
-#: server/diplhand.c:436
+#: server/diplhand.c:439
#, c-format
msgid "You receive city of %s from %s."
msgstr "avete ricevuto la città di %s da %s."
-#: server/diplhand.c:441
+#: server/diplhand.c:444
#, c-format
msgid "You give city of %s to %s."
msgstr "avete ceduto la città di %s a %s."
-#: server/diplhand.c:454 server/diplhand.c:457
+#: server/diplhand.c:457 server/diplhand.c:460
#, c-format
msgid "You agree on a cease-fire with %s."
msgstr "avete accettato un cessate-il-fuoco con %s."
#. TRANS: ... the Poles ... Polish territory.
-#: server/diplhand.c:476 server/diplhand.c:488
+#: server/diplhand.c:479 server/diplhand.c:491
#, c-format
msgid ""
"You agree on an armistice with the %s. In %d turn, it will become a peace "
@@ -3089,32 +3117,32 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: server/diplhand.c:512 server/diplhand.c:515
+#: server/diplhand.c:515 server/diplhand.c:518
#, c-format
msgid "You agree on an alliance with %s."
msgstr "avete accettato un'alleanza con %s."
-#: server/diplhand.c:524
+#: server/diplhand.c:527
#, c-format
msgid "You give shared vision to %s."
msgstr "avete dato la visione in comune a %s."
-#: server/diplhand.c:527
+#: server/diplhand.c:530
#, c-format
msgid "%s gives you shared vision."
msgstr "%s vi ha dato la visione in comune."
-#: server/diplhand.c:663
+#: server/diplhand.c:666
#, c-format
msgid "%s canceled the meeting!"
msgstr "%s ha annullato la riunione!"
-#: server/diplhand.c:670
+#: server/diplhand.c:673
#, c-format
msgid "Meeting with %s canceled."
msgstr "riunione con %s cancellata."
-#: server/diplhand.c:712
+#: server/diplhand.c:715
msgid "Your diplomatic envoy was decapitated!"
msgstr "Il tuo inviato diplomatico è stato decapitato!"
@@ -3301,90 +3329,90 @@ msgid "The %s destroyed the %s in %s."
msgstr "il %s ha distrutto il %s a %s."
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1091
+#: server/diplomats.c:1097
#, fuzzy, c-format
msgid "An enemy %s has been eliminated by your %s."
msgstr "un %s nemico è stato ucciso mentre difendeva %s."
#. TRANS: <unit> ... <city> ... <diplomat>
-#: server/diplomats.c:1098
+#: server/diplomats.c:1104
#, c-format
msgid "Your %s has been eliminated defending %s against a %s."
msgstr "il tuo %1$s è stato ucciso da un %3$s mentre difendeva %2$s."
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1106
+#: server/diplomats.c:1112
#, fuzzy, c-format
msgid "Your %s has been eliminated defending against a %s."
msgstr "il tuo %s è stato ucciso da un %s mentre difendeva."
-#: server/diplomats.c:1119
+#: server/diplomats.c:1125
#, c-format
msgid "Your %s was eliminated by a defending %s."
msgstr "il tuo %s è stato ucciso da un %s che difendeva."
-#: server/diplomats.c:1127
+#: server/diplomats.c:1133
#, c-format
msgid "Eliminated %s %s while infiltrating %s."
msgstr "un %2$s %1$s è stato ucciso mentre si infiltrava a %3$s."
-#: server/diplomats.c:1134
+#: server/diplomats.c:1140
#, c-format
msgid "Eliminated %s %s while infiltrating our troops."
msgstr "un %2$s %1$s è stato ucciso mentre si infiltrava tra le nostre truppe."
-#: server/diplomats.c:1185
+#: server/diplomats.c:1191
#, fuzzy, c-format
msgid ""
"Your %s has successfully completed the mission and returned unharmed to %s."
msgstr ""
"la vostra %s è riuscita nella sua missione ed è tornata sana e salva a %s."
-#: server/diplomats.c:1204
+#: server/diplomats.c:1210
#, fuzzy, c-format
msgid "Your %s was captured after completing the mission in %s."
msgstr ""
"il vostro %s è stato catturato dopo aver compiuto la sua missione a %s."
-#: server/diplomats.c:1210
+#: server/diplomats.c:1216
#, fuzzy, c-format
msgid "Your %s was captured after completing the mission."
msgstr "la vostra %s è stata catturata dopo aver compiuto la sua missione."
-#: server/diplomats.c:1242
+#: server/diplomats.c:1248
#, fuzzy, c-format
msgid "You have caused an incident while bribing the %s %s."
msgstr ""
"avete provocato un incidente diplomatico tentando di corrompere un %2$s di %1"
"$s."
-#: server/diplomats.c:1247
+#: server/diplomats.c:1253
#, c-format
msgid "%s has caused an incident while bribing your %s."
msgstr ""
"%s ha provocato un incidente diplomatico tentando di corrompere il vostro %s."
-#: server/diplomats.c:1254
+#: server/diplomats.c:1260
#, fuzzy, c-format
msgid "You have caused an incident while attempting to steal tech from %s."
msgstr ""
"avete provocato un incidente diplomatico tentando di rubare una tecnologia a "
"%s."
-#: server/diplomats.c:1258
+#: server/diplomats.c:1264
#, fuzzy, c-format
msgid "%s has caused an incident while attempting to steal tech from you."
msgstr ""
"%s ha provocato un incidente diplomatico tentando di rubarvi una tecnologia."
-#: server/diplomats.c:1264
+#: server/diplomats.c:1270
#, c-format
msgid "You have caused an incident while inciting a revolt in %s."
msgstr ""
"avete provocato un incidente diplomatico tentando di incitare una rivolta a %"
"s."
-#: server/diplomats.c:1268
+#: server/diplomats.c:1274
#, c-format
msgid "%s have caused an incident while inciting a revolt in %s."
msgstr ""
@@ -3506,14 +3534,14 @@ msgstr ""
" I lavoratori si riuniscono spontaneamente e modernizzano tutte le "
"città con ferrovie."
-#: server/maphand.c:1418
+#: server/maphand.c:1425
#, 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:1436
+#: server/maphand.c:1443
#, fuzzy, c-format
msgid "Disbanded your %s due to changing terrain."
msgstr ""
@@ -3524,7 +3552,7 @@ msgstr ""
msgid "Not reporting to the metaserver in this game."
msgstr "Nessun collegamento con il metaserver per questo gioco."
-#: server/meta.c:430
+#: server/meta.c:432
#, c-format
msgid "Metaserver: bad address: [%s:%d]."
msgstr "Metaserver: indirizzo errato: [%s:%d]."
@@ -3646,43 +3674,43 @@ msgstr ""
"Il tuo compagno di squadra %s ha dichiarato guerra a %s. Sei obbligato a "
"cancellare l'alleanza con %s."
-#: server/plrhand.c:1103
+#: server/plrhand.c:1115
#, c-format
msgid "Removing player %s."
msgstr "Rimosso giocatore %s."
-#: server/plrhand.c:1105
+#: server/plrhand.c:1117
msgid "You've been removed from the game!"
msgstr "siete stati rimossi dal gioco!"
-#: server/plrhand.c:1108
+#: server/plrhand.c:1120
#, c-format
msgid "%s has been removed from the game."
msgstr "%s è stato rimosso dal gioco."
-#: server/plrhand.c:1153 server/plrhand.c:1158
+#: server/plrhand.c:1167 server/plrhand.c:1172
#, 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:1178
+#: server/plrhand.c:1192
#, 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:1656
+#: server/plrhand.c:1670
#, 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:1663
+#: server/plrhand.c:1677
#, 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:1686
+#: server/plrhand.c:1700
#, fuzzy, c-format
msgid ""
"Your nation is thrust into civil war! %s is declared the leader of the rebel "
@@ -3691,12 +3719,12 @@ msgstr ""
"la vostra nazione è spinta nella guerra civile; %s è dichiarato capo degli "
"stati ribelli."
-#: server/plrhand.c:1707
+#: server/plrhand.c:1721
#, c-format
msgid "%s declares allegiance to %s."
msgstr "%s firma un'alleanza con %s."
-#: server/plrhand.c:1722
+#: server/plrhand.c:1736
#, fuzzy, c-format
msgid ""
"Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3891,67 +3919,67 @@ msgstr "(costruendo %s a %s (%s))\n"
msgid "Wonders of the World"
msgstr "Meraviglie del Mondo"
-#: server/report.c:547
+#: server/report.c:552
msgid " sq. mi."
msgstr " km quadrati"
-#: server/report.c:557
+#: server/report.c:562
msgid " M tons"
msgstr " M tonnellate"
-#: server/report.c:562
+#: server/report.c:567
msgid " M goods"
msgstr " M di beni"
-#: server/report.c:567
+#: server/report.c:572
msgid " bulbs"
msgstr ""
-#: server/report.c:572
+#: server/report.c:577
msgid " month"
msgid_plural " months"
msgstr[0] " mese"
msgstr[1] " mesi"
-#: server/report.c:577
+#: server/report.c:582
msgid " ton"
msgid_plural " tons"
msgstr[0] " tonnellata"
msgstr[1] " tonnellate"
-#: server/report.c:591
+#: server/report.c:596
msgid "st"
msgstr "°"
-#: server/report.c:593
+#: server/report.c:598
msgid "nd"
msgstr "°"
-#: server/report.c:595
+#: server/report.c:600
msgid "rd"
msgstr "°"
-#: server/report.c:597
+#: server/report.c:602
msgid "th"
msgstr "°"
-#: server/report.c:700
+#: server/report.c:705
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:743 server/report.c:768
+#: server/report.c:748 server/report.c:773
msgid "Demographics Report:"
msgstr "Rapporto Demografico:"
-#: server/report.c:744
+#: server/report.c:749
msgid "Sorry, the Demographics report is unavailable."
msgstr "Spiacente, il rapporto demografico non è disponibile."
#. TRANS: <nation adjective> <government name> (<year>).
#. * E.g. "Polish Despotism (200 AD)".
-#: server/report.c:750
+#: server/report.c:755
#, fuzzy, c-format
msgid "%s %s (%s)"
msgstr "%s a %s (%s)\n"
@@ -3962,11 +3990,11 @@ msgstr "%s a %s (%s)\n"
msgid "Could not find a readable \"%s.%s\" ruleset file."
msgstr "Impossibile trovare un file \"%s\" di ruleset leggibile."
-#: server/ruleset.c:2356
+#: server/ruleset.c:2366
msgid "No barbarian nation in rulesets, at least one required!"
msgstr ""
-#: server/ruleset.c:3166
+#: server/ruleset.c:3178
msgid "Loading rulesets"
msgstr "Caricamento ruleset"
@@ -3982,14 +4010,14 @@ msgstr ""
"accadere con alcuni vecchi salvataggi di partite, o può indicare un file di "
"salvataggio non valido. Procedete a vostro rischio."
-#: server/savegame.c:3588
+#: server/savegame.c:3587
#, fuzzy
msgid "Saved game is too old, at least version 1.9.0 required."
msgstr ""
"File di salvataggio troppo vecchio, è richiesta almeno la versione 1.9.0."
#. TRANS: Fatal error message.
-#: server/savegame.c:3815
+#: server/savegame.c:3817
#, fuzzy
msgid ""
"Saved game uses the \"classic\" terrain ruleset, and is no longer supported."
@@ -3997,7 +4025,7 @@ msgstr ""
"Il file di salvataggio utilizza il ruleset di terreno classic che non è più "
"supportato."
-#: server/savegame.c:3824
+#: server/savegame.c:3826
#, c-format
msgid ""
"Warning: Different rulesetdirs ('%s' and '%s') are no longer supported. "
@@ -4007,7 +4035,7 @@ msgstr ""
"supportate. Utilizzo '%s'."
#. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4051
+#: server/savegame.c:4055
#, c-format
msgid "%s had invalid nation; changing to %s."
msgstr ""
@@ -4040,7 +4068,7 @@ msgstr "Interno"
msgid "Networking"
msgstr "Rete"
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:734
#: client/gui-win32/dialogs.c:532
msgid "All"
msgstr "Tutto"
@@ -5306,11 +5334,11 @@ msgstr ""
"aggiunte in fondo al file \"civscore.log\" ogni turno. Queste statistiche "
"possono essere usate per creare grafici dopo il gioco."
-#: server/sernet.c:150
+#: server/sernet.c:151
msgid "Server cannot read standard input. Ignoring input."
msgstr "Il server non può leggere l'ingresso standard. Ignoro l'ingresso."
-#: server/sernet.c:929
+#: server/sernet.c:933
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr "Metaserver: indirizzo errato: [%s:%d]."
@@ -5392,48 +5420,48 @@ msgstr ""
msgid "Without guidance from the capital, the %s spaceship is lost!"
msgstr "senza guida dalla capitale, la nave spaziale %s è persa!"
-#: server/srv_main.c:240
+#: server/srv_main.c:242
msgid "Game ended in a draw as end year exceeded"
msgstr ""
"La partita è terminata con un pareggio poiché è stato raggiunto l'anno "
"limite fissato"
-#: server/srv_main.c:274
+#: server/srv_main.c:276
#, c-format
msgid "The %s spaceship has arrived at Alpha Centauri."
msgstr "la nave spaziale di %s è arrivata su Alfa Centauri."
-#: server/srv_main.c:287 server/srv_main.c:322
+#: server/srv_main.c:289 server/srv_main.c:324
#, c-format
msgid "Team victory to %s"
msgstr "Vittoria di squadra a %s"
-#: server/srv_main.c:297 server/srv_main.c:338
+#: server/srv_main.c:299 server/srv_main.c:340
#, c-format
msgid "Game ended in victory for %s"
msgstr "La partita è finita col la vittoria per %s"
-#: server/srv_main.c:345
+#: server/srv_main.c:347
msgid "Game ended in a draw"
msgstr "La partita è finita con un pareggio"
-#: server/srv_main.c:461 server/srv_main.c:472
+#: server/srv_main.c:465 server/srv_main.c:476
#, c-format
msgid "Your %s was disbanded in accordance with your peace treaty with the %s."
msgstr ""
-#: server/srv_main.c:512 server/srv_main.c:516
+#: server/srv_main.c:516 server/srv_main.c:520
#, c-format
msgid ""
"Concerned citizens point out that the cease-fire with %s will run out soon."
msgstr "i cittadini interessati affermano che la tregua con %s è imminente."
-#: server/srv_main.c:521 server/srv_main.c:525
+#: server/srv_main.c:525 server/srv_main.c:529
#, fuzzy, c-format
msgid "The cease-fire with %s has run out. You are now at war with the %s."
msgstr "la tregua con %s è raggiunta. Ora siete neutrale con %s."
-#: server/srv_main.c:542
+#: server/srv_main.c:546
#, fuzzy, c-format
msgid ""
"Ceasefire between %s and %s has run out. They are at war. You cancel your "
@@ -5442,350 +5470,339 @@ msgstr ""
"Il tuo compagno di squadra %s ha dichiarato guerra a %s. Sei obbligato a "
"cancellare l'alleanza con %s."
-#: server/srv_main.c:961
+#: server/srv_main.c:997
#, c-format
msgid "Failed saving game as %s"
msgstr "Ho fallito nel salvataggio del gioco come %s"
-#: server/srv_main.c:963
+#: server/srv_main.c:999
#, c-format
msgid "Game saved as %s"
msgstr "Gioco salvato come %s"
-#: server/srv_main.c:994
+#: server/srv_main.c:1030
msgid "The game is already running."
msgstr "Il gioco sta già girando."
-#: server/srv_main.c:1002
+#: server/srv_main.c:1038
#, c-format
msgid "%s lost control cmdlevel on game start. Use voting from now on."
msgstr ""
-#: server/srv_main.c:1009
+#: server/srv_main.c:1045
msgid "Starting game."
msgstr "Inizio gioco."
-#: server/srv_main.c:1071
+#: server/srv_main.c:1112
#, c-format
msgid "request for unknown report (type %d)"
msgstr "richiesta per rapporto sconosciuto (tipo %d)"
-#: server/srv_main.c:1136
+#: server/srv_main.c:1177
#, c-format
msgid "Warning: rejecting old client %s"
msgstr "Attenzione: vecchio client %s rifiutato"
-#: server/srv_main.c:1238
+#: server/srv_main.c:1279
#, 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:1338
+#: server/srv_main.c:1381
msgid "Please choose a non-blank name."
msgstr "Per favore scegliete un nome non vuoto."
-#: server/srv_main.c:1354
+#: server/srv_main.c:1397
msgid "That nation is already in use."
msgstr "Quella nazione è già in uso."
-#: server/srv_main.c:1370
+#: server/srv_main.c:1413
#, 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:1391
+#: server/srv_main.c:1434
msgid "Please choose a name containing only ASCII characters."
msgstr "Per favore scegliete un nome contenente solo caratteri ASCII."
-#: server/srv_main.c:1490
+#: server/srv_main.c:1533
#, c-format
msgid "%s nation is not available in this scenario."
msgstr ""
-#: server/srv_main.c:1496
+#: server/srv_main.c:1539
#, fuzzy, c-format
msgid "%s nation is already in use."
msgstr "Quella nazione è già in uso."
-#: server/srv_main.c:1514
+#: server/srv_main.c:1557
#, c-format
msgid "%s is the %s ruler %s."
msgstr "%s è il governatore %s %s."
-#: server/srv_main.c:1570
+#: server/srv_main.c:1613
#, 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:1614 server/srv_main.c:1618
+#: server/srv_main.c:1657 server/srv_main.c:1661
#, 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:1760
+#: server/srv_main.c:1803
#, c-format
msgid "Player %d"
msgstr "Giocatore %d"
-#: server/srv_main.c:1771 server/srv_main.c:1777
+#: server/srv_main.c:1814 server/srv_main.c:1820
#, c-format
msgid "%s rules the %s."
msgstr "%s guida gli %s."
-#: server/srv_main.c:1942
+#: server/srv_main.c:1985
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
msgstr ""
-#: server/srv_main.c:1993
+#: server/srv_main.c:2037
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr "Sto mandando informazioni al metaserver [%s]"
-#: server/srv_main.c:2024
+#: server/srv_main.c:2069
msgid "The game is over..."
msgstr "il gioco è finito..."
-#: server/srv_main.c:2237
+#: server/srv_main.c:2286
msgid "Now accepting new client connections."
msgstr "Da ora sono accettate nuove connessioni dai client."
-#: server/stdinhand.c:246
-#, c-format
-msgid "Vote \"%s\" is passed %d to %d with %d abstentions."
-msgstr "Voto \"%s\" è passato %d a %d con %d astenuti."
-
-#: server/stdinhand.c:253
-#, c-format
-msgid "Vote \"%s\" failed with %d against, %d for and %d abstentions."
-msgstr ""
-"Voto \"%s\" non è passato con %d contrari, %d favorevoli e %d astenuti."
-
#. TRANS: ambiguous command
-#: server/stdinhand.c:365
+#: server/stdinhand.c:284
msgid "(ambiguous)"
msgstr "(ambiguo)"
#. TRANS: unrecognized command
#. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:416
+#: server/stdinhand.c:287 client/citydlg_common.c:419
#: 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 "(sconosciuto)"
-#: server/stdinhand.c:458
+#: server/stdinhand.c:377
msgid "Name is empty, so cannot be a player."
msgstr "Il nome è vuoto, non può essere quello di un giocatore."
-#: server/stdinhand.c:462
+#: server/stdinhand.c:381
msgid "Name is too long, so cannot be a player."
msgstr "Il nome è troppo lungo, non può essere quello di un giocatore."
-#: server/stdinhand.c:466
+#: server/stdinhand.c:385
#, c-format
msgid "Player name prefix '%s' is ambiguous."
msgstr "Il prefisso del nome di giocatore '%s' è ambiguo."
-#: server/stdinhand.c:470
+#: server/stdinhand.c:389
#, c-format
msgid "No player by the name of '%s'."
msgstr "Nessun giocatore di nome '%s'."
-#: server/stdinhand.c:474 server/stdinhand.c:509
+#: server/stdinhand.c:393 server/stdinhand.c:428
#, c-format
msgid "Unexpected match_result %d (%s) for '%s'."
msgstr "Valore di match_result inatteso %d (%s) per '%s'."
-#: server/stdinhand.c:493
+#: server/stdinhand.c:412
msgid "Name is empty, so cannot be a connection."
msgstr "Il nome è vuoto, non può essere quello di un collegamento."
-#: server/stdinhand.c:497
+#: server/stdinhand.c:416
msgid "Name is too long, so cannot be a connection."
msgstr "Il nome è troppo lungo, non può essere quello di un collegamento."
-#: server/stdinhand.c:501
+#: server/stdinhand.c:420
#, c-format
msgid "Connection name prefix '%s' is ambiguous."
msgstr "Il prefisso del nome di collegamento '%s' è ambiguo."
-#: server/stdinhand.c:505
+#: server/stdinhand.c:424
#, c-format
msgid "No connection by the name of '%s'."
msgstr "Nessun collegamento di nome '%s'."
-#: server/stdinhand.c:525
+#: server/stdinhand.c:444
#, c-format
msgid "Open metaserver connection to [%s]."
msgstr "Aperto il collegamento al metaserver [%s]."
-#: server/stdinhand.c:538
+#: server/stdinhand.c:457
#, c-format
msgid "Close metaserver connection to [%s]."
msgstr "Chiuso il collegamento al metaserver [%s]."
-#: server/stdinhand.c:553
+#: server/stdinhand.c:472
msgid "Metaserver connection is open."
msgstr "Il collegamento con il metaserver è aperto."
-#: server/stdinhand.c:556
+#: server/stdinhand.c:475
msgid "Metaserver connection is closed."
msgstr "Il collegamento con il metaserver è chiuso."
-#: server/stdinhand.c:566
+#: server/stdinhand.c:485
msgid "Metaserver connection is already open."
msgstr "Il collegamento con il metaserver è già aperto."
-#: server/stdinhand.c:577
+#: server/stdinhand.c:496
msgid "Metaserver connection is already closed."
msgstr "Il collegamento con il metaserver è già chiuso."
-#: server/stdinhand.c:582
+#: server/stdinhand.c:501
msgid "Argument must be 'u', 'up', 'd', 'down', or '?'."
msgstr "L'argomento deve essere 'u', 'up', 'd', 'down' o '?'."
-#: server/stdinhand.c:603
+#: server/stdinhand.c:522
#, c-format
msgid "Metaserver patches string set to '%s'."
msgstr "Stringa delle patches del metaserver impostata a '%s'."
-#: server/stdinhand.c:606
+#: server/stdinhand.c:525
#, c-format
msgid "Metaserver patches string set to '%s', not reporting to metaserver."
msgstr ""
"Stringa delle patches del metaserver impostata a '%s', non riportato al "
"metaserver."
-#: server/stdinhand.c:627
+#: server/stdinhand.c:546
#, c-format
msgid "Metaserver message string set to '%s'."
msgstr "Stringa del messaggio del metaserver impostata a '%s'."
-#: server/stdinhand.c:630
+#: server/stdinhand.c:549
#, c-format
msgid "Metaserver message string set to '%s', not reporting to metaserver."
msgstr ""
"Stringa del messaggio del metaserver impostata a '%s', non riportato al "
"metaserver."
-#: server/stdinhand.c:650
+#: server/stdinhand.c:569
#, c-format
msgid "Metaserver is now [%s]."
msgstr "Il metaserver è ora [%s]."
-#: server/stdinhand.c:660
+#: server/stdinhand.c:579
#, fuzzy, c-format
msgid "Server id: %s"
msgstr "Operatore Server: %s"
-#: server/stdinhand.c:757
+#: server/stdinhand.c:676
#, fuzzy
msgid "You cannot save games manually on this server."
msgstr "Interrompe il gioco ed esce dal server."
-#: server/stdinhand.c:774
+#: server/stdinhand.c:693
msgid "Cannot toggle a barbarian player."
msgstr "Impossibile commutare un giocatore barbaro."
-#: server/stdinhand.c:781
+#: server/stdinhand.c:700
#, c-format
msgid "%s is now under AI control."
msgstr "%s ora è controllato da una IA."
-#: server/stdinhand.c:802
+#: server/stdinhand.c:721
#, c-format
msgid "%s is now under human control."
msgstr "%s ora è umano."
-#: server/stdinhand.c:847
+#: server/stdinhand.c:766
msgid "Can't add AI players once the game has begun."
msgstr "Impossibile aggiungere giocatori IA dopo l'inizio della partita."
-#: server/stdinhand.c:867
+#: server/stdinhand.c:786
msgid "Can't add more players, server is full."
msgstr "Impossibile aggiungere altri giocatori: il server è completo."
-#: server/stdinhand.c:874
+#: server/stdinhand.c:793
msgid "Can't use an empty name."
msgstr "Impossibile usare un nome vuoto."
-#: server/stdinhand.c:881
+#: server/stdinhand.c:800
#, c-format
msgid "That name exceeds the maximum of %d chars."
msgstr "Questo nome supera il limite massimo di %d caratteri."
-#: server/stdinhand.c:887
+#: server/stdinhand.c:806
msgid "That name is not allowed."
msgstr "Quel nome non è permesso."
-#: server/stdinhand.c:893
+#: server/stdinhand.c:812
msgid "A player already exists by that name."
msgstr "Esiste già un giocatore con questo nome."
-#: server/stdinhand.c:899
+#: server/stdinhand.c:818
msgid "A user already exists by that name."
msgstr "Esiste già un utente con quel nome."
-#: server/stdinhand.c:925
+#: server/stdinhand.c:844
#, c-format
msgid "%s has been added as an AI-controlled player."
msgstr "%s è stato aggiunto come giocatore controllato dalla IA."
-#: server/stdinhand.c:932
+#: server/stdinhand.c:851
#, c-format
msgid "Error creating new AI player: %s."
msgstr "Errore nel creare un nuovo giocatore IA: %s."
-#: server/stdinhand.c:966
+#: server/stdinhand.c:885
msgid "Players cannot be removed once the game has started."
msgstr "I giocatori non possono essere rimossi dopo l'inizio della partita."
-#: server/stdinhand.c:977
+#: server/stdinhand.c:896
#, c-format
msgid "Removed player %s from the game."
msgstr "Giocatore %s rimosso dalla partita."
-#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
+#: server/stdinhand.c:935 server/stdinhand.c:3372 server/stdinhand.c:3507
#, c-format
msgid "Name \"%s\" disallowed for security reasons."
msgstr ""
-#: server/stdinhand.c:1029
+#: server/stdinhand.c:948
#, fuzzy, c-format
msgid "No command script found by the name \"%s\"."
msgstr "Nessun collegamento di nome '%s'."
-#: server/stdinhand.c:1037
+#: server/stdinhand.c:956
#, c-format
msgid "Loading script file: %s"
msgstr "Carico il file script: %s"
-#: server/stdinhand.c:1052
+#: server/stdinhand.c:971
#, c-format
msgid "Cannot read command line scriptfile '%s'."
msgstr ""
"Impossibile leggere il file script '%s' richiesto dalla linea di comando."
-#: server/stdinhand.c:1054
+#: server/stdinhand.c:973
#, c-format
msgid "Could not read script file '%s'."
msgstr "Impossibile leggere il file script '%s'."
-#: server/stdinhand.c:1146
+#: server/stdinhand.c:1065
#, c-format
msgid "Could not write script file '%s'."
msgstr "Impossibile scrivere il file script '%s'."
-#: server/stdinhand.c:1158
+#: server/stdinhand.c:1077
msgid "You cannot use the write command on this server for security reasons."
msgstr ""
-#: server/stdinhand.c:1186
+#: server/stdinhand.c:1105
#, c-format
msgid ""
"Cannot decrease command access level '%s' for connection '%s'; you only have "
@@ -5794,7 +5811,12 @@ msgstr ""
"Non potete restringere il livello di accesso ai comandi '%s' per il "
"collegamento '%s'; avete solo livello '%s'."
-#: server/stdinhand.c:1241
+#: server/stdinhand.c:1114
+#, 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:1163
#, fuzzy, c-format
msgid ""
"Anyone can now become game organizer '%s' by issuing the 'first' command."
@@ -5802,29 +5824,29 @@ msgstr ""
"chiunque può ora assumere il livello di accesso ai comandi '%s' eseguendo il "
"comando 'firstlevel'."
-#: server/stdinhand.c:1274
+#: server/stdinhand.c:1187
msgid "Command access levels in effect:"
msgstr "Livelli di accesso ai comandi attivi:"
-#: server/stdinhand.c:1282
+#: server/stdinhand.c:1194
#, c-format
msgid "Command access level for new connections: %s"
msgstr "Livello di accesso ai comandi per i nuovi collegamenti: %s"
-#: server/stdinhand.c:1285
+#: server/stdinhand.c:1197
#, c-format
msgid "Command access level for first player to take it: %s"
msgstr ""
"Livello di accesso ai comandi per il primo giocatore che lo richiede: %s"
-#: server/stdinhand.c:1294
+#: server/stdinhand.c:1206
msgid ""
"Error: command access level must be one of 'none', 'info', 'ctrl', or 'hack'."
msgstr ""
"Errore: il livello di accesso ai comandi deve essere 'none', 'info', 'ctrl' "
"o 'hack'."
-#: server/stdinhand.c:1299
+#: server/stdinhand.c:1211
#, c-format
msgid ""
"Cannot increase command access level to '%s'; you only have '%s' yourself."
@@ -5832,285 +5854,347 @@ msgstr ""
"Impossibile ampliare il livello di accesso ai comandi a '%s'; avete solo il "
"livello '%s'."
-#: 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: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:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
+#: server/stdinhand.c:1238 server/stdinhand.c:1252 server/stdinhand.c:1273
#, 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:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
+#: server/stdinhand.c:1243 server/stdinhand.c:1257 server/stdinhand.c:1267
#, 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:1402
+#: server/stdinhand.c:1302
#, 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:1406
+#: server/stdinhand.c:1306
#, 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:1411
+#: server/stdinhand.c:1311
#, 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:1416
+#: server/stdinhand.c:1316
#, c-format
msgid "Connection %s has opted to become the game organizer."
msgstr ""
-#: server/stdinhand.c:1467
+#: server/stdinhand.c:1367
#, c-format
msgid "Invalid argument %d."
msgstr "Argomento non consentito %d."
-#: server/stdinhand.c:1474
+#: server/stdinhand.c:1374
msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
msgstr "Uso: timeoutincrease <turn> <turnadd> <value> <valuemult>."
-#: server/stdinhand.c:1482
+#: server/stdinhand.c:1382
#, c-format
msgid "Dynamic timeout set to %d %d %d %d"
msgstr "Timeout dinamico settato a %d %d %d %d"
-#: server/stdinhand.c:1542 server/stdinhand.c:1545
+#: server/stdinhand.c:1442 server/stdinhand.c:1445
msgid "Option:"
msgstr "Opzione:"
-#: server/stdinhand.c:1555 server/stdinhand.c:4031
+#: server/stdinhand.c:1455 server/stdinhand.c:4079
msgid "Description:"
msgstr "Descrizione:"
-#: server/stdinhand.c:1560
+#: server/stdinhand.c:1460
#, c-format
msgid "Status: %s"
msgstr "Stato: %s"
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "changeable"
msgstr "modificabile"
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "fixed"
msgstr "fissato"
-#: server/stdinhand.c:1567
+#: server/stdinhand.c:1467
#, c-format
msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
msgstr "Valore: %d, minimo: 0, predefinito: %d, massimo: 1"
-#: server/stdinhand.c:1572
+#: server/stdinhand.c:1472
#, c-format
msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
msgstr "Valore: %d, minimo: %d, predefinito: %d, massimo: %d"
-#: server/stdinhand.c:1578
+#: server/stdinhand.c:1478
#, c-format
msgid "Value: \"%s\", Default: \"%s\""
msgstr "Valore: \"%s\", predefinito: \"%s\""
-#: server/stdinhand.c:1597
+#: server/stdinhand.c:1497
msgid "Explanations are available for the following server options:"
msgstr "Sono disponibili spiegazioni per le seguenti opzioni del server:"
-#: server/stdinhand.c:1643
+#: server/stdinhand.c:1537
msgid "No explanation for that yet."
msgstr "Nessuna spiegazione disponibile per questo."
-#: server/stdinhand.c:1646 server/stdinhand.c:2480
+#: server/stdinhand.c:1540 server/stdinhand.c:2468
msgid "Ambiguous option name."
msgstr "Nome di opzione ambiguo."
-#: server/stdinhand.c:1666
+#: server/stdinhand.c:1560
#, c-format
msgid "Server Operator: %s"
msgstr "Operatore Server: %s"
-#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
+#: server/stdinhand.c:1686 server/stdinhand.c:1713 server/stdinhand.c:1731
#, 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:1822
+#: server/stdinhand.c:1718
#, c-format
msgid "%s is not controlled by the AI."
msgstr "%s non è controllato da una IA."
-#: server/stdinhand.c:1842
+#: server/stdinhand.c:1738
#, c-format
msgid "Default AI skill level set to '%s'."
msgstr "Livello di gioco predefinito delle IA impostato a '%s'."
-#: server/stdinhand.c:1857 server/stdinhand.c:2162
+#: server/stdinhand.c:1753
msgid "This command is client only."
msgstr "Questo comando è consentito solo ai client."
-#: server/stdinhand.c:1860
+#: server/stdinhand.c:1756
msgid "Usage: away"
msgstr "Uso: away"
-#: server/stdinhand.c:1865
+#: server/stdinhand.c:1761
msgid "Only players may use the away command."
msgstr ""
-#: server/stdinhand.c:1869
+#: server/stdinhand.c:1765
#, c-format
msgid "%s set to away mode."
msgstr "%s impostato su modalità 'assente'"
-#: server/stdinhand.c:1877
+#: server/stdinhand.c:1772
#, c-format
msgid "%s returned to game."
msgstr "%s ritorna nella partita."
-#: server/stdinhand.c:1919
+#: server/stdinhand.c:1817
#, c-format
msgid "Sorry, you do not have access to view option '%s'."
msgstr "Spiacente, non avete accesso all'opzione '%s'."
-#: server/stdinhand.c:1925
+#: server/stdinhand.c:1823
#, c-format
msgid "Unknown option '%s'."
msgstr "Opzione '%s' sconosciuta."
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1848
#, fuzzy
msgid "All options with non-default values"
msgstr "= significa che l'opzione ha il suo valore predefinito"
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1851
msgid "All options"
msgstr "Tutte le opzioni"
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1854
msgid "Vital options"
msgstr "Opzione vitale"
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1857
msgid "Situational options"
msgstr "Opzioni specifiche"
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1860
msgid "Rarely used options"
msgstr "Opzioni raramente usate"
-#: server/stdinhand.c:1965
+#: server/stdinhand.c:1863
msgid "+ means you may change the option"
msgstr "+ significa che potete cambiare l'opzione"
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1864
msgid "= means the option is on its default value"
msgstr "= significa che l'opzione ha il suo valore predefinito"
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
#, c-format
msgid "%-*s value (min,max) "
msgstr "%-*s valore (min,max) "
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
msgid "Option"
msgstr "Opzione"
-#: server/stdinhand.c:1973
+#: server/stdinhand.c:1871
msgid "description"
msgstr "descrizione"
-#: server/stdinhand.c:2042
+#: server/stdinhand.c:1940
#, 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:2092
+#: server/stdinhand.c:1966
msgid "Cannot change teams once game has begun."
msgstr "Impossibile modificare le squadre dopo l'inizio della partita."
-#: server/stdinhand.c:2102
+#: server/stdinhand.c:1976
#, fuzzy
msgid "Undefined argument. Usage: team <player> <team>."
msgstr "Argomento non definito. Uso: team <giocatore> [squadra]."
-#: server/stdinhand.c:2122
+#: server/stdinhand.c:1996
#, c-format
msgid "No such team %s. Please give a valid team name or number."
msgstr ""
-#: server/stdinhand.c:2129
+#: server/stdinhand.c:2003
msgid "Cannot team a barbarian."
msgstr "Impossibile unire in squadra un giocatore barbaro."
-#: server/stdinhand.c:2135
+#: server/stdinhand.c:2009
#, c-format
msgid "Player %s set to team %s."
msgstr "Il giocatore %s assegnato alla squadra %s."
-#: 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:2035 server/voting.c:512
+#, fuzzy
+msgid "Teamvote"
+msgstr "Squadra"
-#: server/stdinhand.c:2165
-msgid "Observers cannot vote."
-msgstr "Gli osservatori non possono votare."
+#: server/stdinhand.c:2035 server/voting.c:516
+msgid "Vote"
+msgstr ""
-#: server/stdinhand.c:2168
+#: server/stdinhand.c:2037
+#, c-format
msgid ""
-"You can only vote in a running game. Use 'first' to become the game "
-"organizer if there currently is none."
+"%s %d \"%s\" (needs %0.0f%%%s): %d for, %d against, and %d abstained out of %"
+"d players."
msgstr ""
-#: 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:2041
+msgid " no dissent"
+msgstr ""
-#: server/stdinhand.c:2188
+#: server/stdinhand.c:2049
msgid "There are no votes going on."
msgstr "Non ci sono votazioni in corso."
-#: server/stdinhand.c:2208
-msgid "No legal last vote."
+#: server/stdinhand.c:2077
+#, fuzzy
+msgid "Invalid arguments. Usage: vote yes|no|abstain [vote number]."
+msgstr "Argomento non definito. Uso: vote yes/no [numero voto]."
+
+#: server/stdinhand.c:2095 server/stdinhand.c:2213 server/stdinhand.c:3714
+msgid "You are not allowed to use this command."
+msgstr "Non avete il permesso di usare questo comando."
+
+#: server/stdinhand.c:2104
+#, fuzzy, c-format
+msgid "The argument \"%s\" is ambigious."
+msgstr "L'argomento '%s' di 'help' è ambiguo."
+
+#: server/stdinhand.c:2119
+#, fuzzy
+msgid "There are no votes running."
+msgstr "Non ci sono votazioni in corso."
+
+#: server/stdinhand.c:2121
+#, fuzzy, c-format
+msgid "No legal last vote (%d %s)."
msgstr "L'ultimo voto non è legale."
-#: server/stdinhand.c:2213
-msgid "Value must be integer."
+#: server/stdinhand.c:2122
+msgid "other vote running"
+msgid_plural "other votes running"
+msgstr[0] ""
+msgstr[1] ""
+
+#: server/stdinhand.c:2129 server/stdinhand.c:2491 server/stdinhand.c:2532
+msgid "Value must be an integer."
msgstr "Il valore deve essere un intero."
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2135 server/stdinhand.c:2221
#, c-format
msgid "No such vote (%d)."
msgstr "Nessun voto (%d)."
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2141
+#, fuzzy
+msgid "You are not allowed to vote on that."
+msgstr "Non avete il permesso di modificare quest'opzione."
+
+#: server/stdinhand.c:2146
#, c-format
msgid "You voted for \"%s\""
msgstr "Hai votato a favore \"%s\""
-#: server/stdinhand.c:2232
+#: server/stdinhand.c:2150
#, c-format
msgid "You voted against \"%s\""
msgstr "Hai votato contro \"%s\""
-#: server/stdinhand.c:2259
+#: server/stdinhand.c:2155
+#, c-format
+msgid "You abstained from voting on \"%s\""
+msgstr ""
+
+#: server/stdinhand.c:2190
+msgid "Missing argument <vote number> or the string \"all\"."
+msgstr ""
+
+#: server/stdinhand.c:2197
+#, fuzzy
+msgid "You don't have any vote going on."
+msgstr "non c'è un lavoratore qui."
+
+#: server/stdinhand.c:2204
+#, fuzzy
+msgid "There isn't any vote going on."
+msgstr "Non ci sono votazioni in corso."
+
+#: server/stdinhand.c:2209
+msgid "Server: All votes have been removed."
+msgstr ""
+
+#: server/stdinhand.c:2226
+#, fuzzy, c-format
+msgid "You are not allowed to cancel this vote (%d)."
+msgstr "Non avete il permesso di modificare quest'opzione."
+
+#: server/stdinhand.c:2232
+msgid "Usage: /cancelvote [<vote number>|all]"
+msgstr ""
+
+#: server/stdinhand.c:2241
+#, c-format
+msgid "Server: %s cancelled the vote \"%s\" (number %d)."
+msgstr ""
+
+#: server/stdinhand.c:2247
+#, c-format
+msgid "Server: The vote \"%s\" (number %d) has been cancelled."
+msgstr ""
+
+#: server/stdinhand.c:2265
#, fuzzy
msgid ""
"Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
@@ -6119,134 +6203,130 @@ msgstr ""
"Argomento indefinito. Uso: debug <player <giocatore> | city <x> <y> | units "
"<x> <y> | unit <id>>."
-#: server/stdinhand.c:2265
+#: server/stdinhand.c:2271
msgid "Can only use this command once game has begun."
msgstr "Puoi usare questo comando solo dopo che la parita è iniziata."
-#: server/stdinhand.c:2294
+#: server/stdinhand.c:2300
#, fuzzy, c-format
msgid "%s diplomacy no longer debugged"
msgstr "%s non più debuggato"
-#: server/stdinhand.c:2298
+#: server/stdinhand.c:2304
#, fuzzy, c-format
msgid "%s diplomacy debugged"
msgstr "%s debuggato"
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2323
#, fuzzy, c-format
msgid "%s tech no longer debugged"
msgstr "%s non più debuggato"
-#: server/stdinhand.c:2321
+#: server/stdinhand.c:2327
#, fuzzy, c-format
msgid "%s tech debugged"
msgstr "%s debuggato"
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2358 server/stdinhand.c:2388
msgid "Value 2 & 3 must be integer."
msgstr "I secondo e terzo valore deve essere intero."
-#: server/stdinhand.c:2356 server/stdinhand.c:2386
+#: server/stdinhand.c:2362 server/stdinhand.c:2392
msgid "Bad map coordinates."
msgstr "Coordinate mappa errate."
-#: server/stdinhand.c:2361
+#: server/stdinhand.c:2367
msgid "No city at this coordinate."
msgstr "Nessuna città a queste coordinate."
-#: server/stdinhand.c:2366
+#: server/stdinhand.c:2372
#, c-format
msgid "%s no longer debugged"
msgstr "%s non più debuggato"
-#: server/stdinhand.c:2392 server/stdinhand.c:2422
+#: server/stdinhand.c:2398 server/stdinhand.c:2428
#, fuzzy, c-format
msgid "%s %s no longer debugged."
msgstr "%2$s di %1$s non più debuggato."
-#: server/stdinhand.c:2397 server/stdinhand.c:2427
+#: server/stdinhand.c:2403 server/stdinhand.c:2433
#, fuzzy, c-format
msgid "%s %s debugged."
msgstr "%2$s di %1$s debuggato."
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2419
msgid "Value 2 must be integer."
msgstr "Il secondo valore deve essere un intero."
-#: server/stdinhand.c:2417
+#: server/stdinhand.c:2423
#, c-format
msgid "Unit %d does not exist."
msgstr "L'unità %d non esiste."
-#: server/stdinhand.c:2475
+#: server/stdinhand.c:2464
msgid "Undefined argument. Usage: set <option> <value>."
msgstr "Argomento non definito. Uso: set <opzione> <valore>."
-#: server/stdinhand.c:2485
+#: server/stdinhand.c:2473
msgid "You are not allowed to set this option."
msgstr "Non avete il permesso di modificare quest'opzione."
-#: server/stdinhand.c:2490 server/stdinhand.c:3463
+#: server/stdinhand.c:2478 server/stdinhand.c:3501
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:2502 server/stdinhand.c:2543
-msgid "Value must be an integer."
-msgstr "Il valore deve essere un intero."
-
-#: server/stdinhand.c:2512
+#: server/stdinhand.c:2501
#, c-format
msgid "The parameter %s should only contain digits 0-1."
msgstr ""
-#: server/stdinhand.c:2519
+#: server/stdinhand.c:2508
msgid "Value out of range (minimum: 0, maximum: 1)."
msgstr "Valore fuori campo (minimo: 0, massimo: 1)."
-#: server/stdinhand.c:2534 server/stdinhand.c:2576
+#: server/stdinhand.c:2523 server/stdinhand.c:2565
#, c-format
msgid "Option: %s has been set to %d."
msgstr "Opzione: %s è stata impostata a %d."
-#: server/stdinhand.c:2554
+#: server/stdinhand.c:2543
#, c-format
msgid "The parameter %s should only contain +- and 0-9."
msgstr ""
-#: server/stdinhand.c:2561
+#: server/stdinhand.c:2550
#, c-format
msgid "Value out of range (minimum: %d, maximum: %d)."
msgstr "Valore fuori campo (minimo: %d, massimo: %d)."
-#: server/stdinhand.c:2586
+#: server/stdinhand.c:2575
msgid "String value too long. Usage: set <option> <value>."
msgstr "Stringa troppo lunga. Uso: set <opzione> <valore>."
-#: server/stdinhand.c:2600
+#: server/stdinhand.c:2589
#, c-format
msgid "Option: %s has been set to \"%s\"."
msgstr "Opzione: %s è stata impostata a \"%s\"."
-#: server/stdinhand.c:2658
+#: server/stdinhand.c:2652
msgid "Sorry, one can't observe globally in this game."
msgstr "Spiacente, l'osservazione globale non è permessa in questa partita."
-#: server/stdinhand.c:2661
+#: server/stdinhand.c:2655
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:2671
+#: server/stdinhand.c:2665
#, 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
+#: server/stdinhand.c:2673
#, c-format
msgid ""
"You cannot take a new player because the maximum of %d player has already "
@@ -6257,84 +6337,84 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: server/stdinhand.c:2691
+#: server/stdinhand.c:2685
msgid "You cannot take a new player because there are no free player slots."
msgstr ""
-#: server/stdinhand.c:2702
+#: server/stdinhand.c:2696
msgid "Sorry, one can't observe barbarians in this game."
msgstr ""
"Spiacente, l'osservazione dei barbari non è permessa in questa partita."
-#: server/stdinhand.c:2705
+#: server/stdinhand.c:2699
msgid "Sorry, one can't take barbarians in this game."
msgstr "Spiacente, il controllo dei barbari non è permesso in questa partita."
-#: server/stdinhand.c:2713
+#: server/stdinhand.c:2707
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:2716
+#: server/stdinhand.c:2710
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:2724
+#: server/stdinhand.c:2718
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:2727
+#: server/stdinhand.c:2721
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:2736
+#: server/stdinhand.c:2730
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:2739
+#: server/stdinhand.c:2733
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:2749
+#: server/stdinhand.c:2743
msgid "Sorry, one can't observe in this game."
msgstr "Spiacente, l'osservazione non è permessa in questa partita."
-#: server/stdinhand.c:2754
+#: server/stdinhand.c:2748
msgid "Sorry, one can't take players in this game."
msgstr "Spiacente, il controllo di giocatori non è pemesso in questa partita."
-#: server/stdinhand.c:2760
+#: server/stdinhand.c:2754
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:2791
+#: server/stdinhand.c:2785
msgid "Usage: observe [connection-name [player-name]]"
msgstr "Uso: observe [nome-connessione [nome-giocatore]]"
-#: server/stdinhand.c:2797
+#: server/stdinhand.c:2791
msgid "Usage: observe [player-name]"
msgstr "Uso: observe [nome-giocatore]"
-#: server/stdinhand.c:2847
+#: server/stdinhand.c:2841
#, c-format
msgid "%s already controls %s. Using 'observe' would remove %s"
msgstr "%s già controlla %s. Usare 'observe' rimuoverebbe %s"
-#: server/stdinhand.c:2858
+#: server/stdinhand.c:2852
#, c-format
msgid "%s is already observing %s."
msgstr "%s sta già osservando %s."
-#: server/stdinhand.c:2863
+#: server/stdinhand.c:2857
#, fuzzy, c-format
msgid "%s is already observing."
msgstr "%s sta già osservando %s."
@@ -6349,244 +6429,249 @@ msgstr "%s da ora osserva %s"
msgid "%s now observes"
msgstr "%s da ora osserva %s"
-#: server/stdinhand.c:2969
+#: server/stdinhand.c:2971
msgid "Usage: take <connection-name> <player-name>"
msgstr "Uso: take <nome-connessione> <nome-giocatore>"
-#: server/stdinhand.c:2974
+#: server/stdinhand.c:2976
msgid "Usage: take <player-name>"
msgstr "Uso: take <nome-giocatore>"
-#: server/stdinhand.c:2980
+#: server/stdinhand.c:2982
msgid "Usage: take [connection-name] <player-name>"
msgstr "Uso: take [nome-connessione] <nome-giocatore>"
-#: server/stdinhand.c:3010
+#: server/stdinhand.c:3012
#, fuzzy, c-format
msgid "%s already controls %s."
msgstr "%s già controlla %s"
-#: server/stdinhand.c:3024
+#: server/stdinhand.c:3026
#, 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:3059
+#: server/stdinhand.c:3061
#, c-format
msgid "being detached from %s."
msgstr "scollegato da %s."
-#: server/stdinhand.c:3135
+#: server/stdinhand.c:3146
#, fuzzy, c-format
msgid "%s now controls %s (%s, %s)."
msgstr "%s ora controlla %s (%s, %s)"
-#: server/stdinhand.c:3139 server/stdinhand.c:4260
+#: server/stdinhand.c:3150 server/stdinhand.c:4308
#: data/nation/barbarian.ruleset:3
msgid "Barbarian"
msgstr "Barbaro"
-#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
+#: server/stdinhand.c:3152 server/stdinhand.c:4310 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-sdl/plrdlg.c:645
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr "IA"
-#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-gtk-2.0/pages.c:2125
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
+#: server/stdinhand.c:3153 server/stdinhand.c:4312
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-gtk-2.0/pages.c:2127
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/connectdlg.c:215
msgid "Human"
msgstr "Umano"
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-gtk-2.0/pages.c:2124 client/gui-win32/connectdlg.c:200
-#: client/gui-win32/connectdlg.c:212
+#: server/stdinhand.c:3155 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-gtk-2.0/pages.c:2126 client/gui-win32/connectdlg.c:202
+#: client/gui-win32/connectdlg.c:214
msgid "Alive"
msgstr "Vivo"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3156 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-win32/connectdlg.c:202
msgid "Dead"
msgstr "Morto"
-#: server/stdinhand.c:3147
+#: server/stdinhand.c:3159
#, fuzzy, c-format
msgid "%s failed to attach to any player."
msgstr "%s non è collegato ad alcun giocatore."
-#: server/stdinhand.c:3182
+#: server/stdinhand.c:3194
msgid "Usage: detach <connection-name>"
msgstr "Uso: detach <nome-connessione>"
-#: server/stdinhand.c:3202
+#: server/stdinhand.c:3214
msgid "You can not detach other users."
msgstr "Non puoi disconnettere gli altri utenti."
-#: server/stdinhand.c:3211
+#: server/stdinhand.c:3223
#, c-format
msgid "%s is not attached to any player."
msgstr "%s non è collegato ad alcun giocatore."
-#: server/stdinhand.c:3234
+#: server/stdinhand.c:3246
#, c-format
msgid "%s detaching from %s"
msgstr "%s scollegato da %s"
-#: server/stdinhand.c:3240
+#: server/stdinhand.c:3252
#, fuzzy, c-format
msgid "%s no longer observing."
msgstr "%s non più debuggato"
-#: server/stdinhand.c:3259
+#: server/stdinhand.c:3271
#, c-format
msgid "detaching from %s."
msgstr "scollegato da %s."
-#: server/stdinhand.c:3345
+#: server/stdinhand.c:3361
#, fuzzy
msgid "Usage: load <game name>"
msgstr "Uso: load <nome-file>"
-#: server/stdinhand.c:3350
+#: server/stdinhand.c:3366
#, 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:3372
+#: server/stdinhand.c:3388
#, c-format
msgid "Cannot find savegame or scenario with the name \"%s\"."
msgstr ""
-#: server/stdinhand.c:3389
+#: server/stdinhand.c:3405
#, fuzzy, c-format
msgid "Could not load savefile: %s"
msgstr "Non ho potuto caricare il file salvato: %s"
-#: server/stdinhand.c:3458
+#: server/stdinhand.c:3496
#, c-format
msgid "Current ruleset directory is \"%s\""
msgstr "La directory dei ruleset corrente è: \"%s\""
-#: server/stdinhand.c:3478
+#: server/stdinhand.c:3516
#, c-format
msgid "Ruleset directory \"%s\" not found"
msgstr "Directory dei ruleset \"%s\" non trovata"
-#: server/stdinhand.c:3484
+#: server/stdinhand.c:3522
#, fuzzy, c-format
msgid "Ruleset directory is already \"%s\""
msgstr "Directory dei ruleset settata a \"%s\""
-#: server/stdinhand.c:3488
+#: server/stdinhand.c:3526
#, c-format
msgid "Ruleset directory set to \"%s\""
msgstr "Directory dei ruleset settata a \"%s\""
-#: server/stdinhand.c:3536
+#: server/stdinhand.c:3574
msgid "Goodbye."
msgstr "Arrivederci."
-#: server/stdinhand.c:3567
+#: server/stdinhand.c:3606
msgid "Sorry, you are not allowed to use server commands."
msgstr "Spiacente, non avete il permesso di usare comandi del server."
-#: server/stdinhand.c:3603
+#: server/stdinhand.c:3656
#, 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:3608
+#: server/stdinhand.c:3661
#, c-format
msgid "Unknown command. Try '%shelp'."
msgstr "Comando sconosciuto. Provate '%shelp'."
-#: server/stdinhand.c:3625
-msgid "Your new vote canceled your previous vote."
+#: server/stdinhand.c:3675
+#, fuzzy
+msgid "Your new vote cancelled your previous vote."
msgstr "Il tuo nuovo voto ha cancellato il tuo voto precedente."
-#: server/stdinhand.c:3633
+#: server/stdinhand.c:3688
+msgid "New teamvote"
+msgstr ""
+
+#: server/stdinhand.c:3691
+msgid "New vote"
+msgstr ""
+
+#: server/stdinhand.c:3695
#, fuzzy, c-format
-msgid "New vote (number %d) by %s: %s."
+msgid "%s (number %d) by %s: %s"
msgstr "Nuovo voto, numero %d, da parte di %s: %s"
-#: server/stdinhand.c:3645
+#: server/stdinhand.c:3704
#, c-format
msgid "Your new vote (\"%s\") was not legal or was not recognized."
msgstr ""
-#: 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:3680
+#: server/stdinhand.c:3726
msgid "(server prompt)"
msgstr " (linea di comando del server)"
-#: server/stdinhand.c:3787
+#: server/stdinhand.c:3835
#, fuzzy
msgid "Game ended in a draw."
msgstr "La partita è finita con un pareggio"
-#: server/stdinhand.c:3791
+#: server/stdinhand.c:3839
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:3796
+#: server/stdinhand.c:3844
msgid "Cannot end the game: no game running."
msgstr "Impossibile terminare la partita: nessuna partita in corso."
-#: server/stdinhand.c:3812
+#: server/stdinhand.c:3860
#, c-format
msgid "%s has conceded the game and can no longer win."
msgstr ""
-#: server/stdinhand.c:3817
+#: server/stdinhand.c:3865
#, fuzzy
msgid "You cannot surrender now."
msgstr "Non potete corrompere %s!"
-#: server/stdinhand.c:3883
+#: server/stdinhand.c:3931
#, fuzzy
msgid "Not enough human players, game will not start."
msgstr "Non ci sono abbastanza giocatori, partita non iniziata."
-#: server/stdinhand.c:3888
+#: server/stdinhand.c:3936
#, fuzzy
msgid "No players, game will not start."
msgstr "Non ci sono abbastanza giocatori, partita non iniziata."
-#: server/stdinhand.c:3892
+#: server/stdinhand.c:3940
#, fuzzy
msgid "Not enough nations for all players, game will not start."
msgstr "Non ci sono abbastanza giocatori, partita non iniziata."
-#: server/stdinhand.c:3901
+#: server/stdinhand.c:3949
#, fuzzy
msgid "All players are ready; starting game."
msgstr "Esiste già un giocatore con questo nome."
-#: server/stdinhand.c:3915
+#: server/stdinhand.c:3963
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:3922
+#: server/stdinhand.c:3970
msgid "Cannot start the game: it is already running."
msgstr "Impossibile iniziare la partita: è già in corso."
-#: server/stdinhand.c:3953
+#: server/stdinhand.c:4001
#, c-format
msgid "Cutting connection %s."
msgstr "Chiusura del collegamento %s."
-#: server/stdinhand.c:3972
+#: server/stdinhand.c:4020
msgid ""
"Welcome - this is the introductory help text for the Freeciv server.\n"
"\n"
@@ -6625,125 +6710,125 @@ msgstr ""
" save - per salvare la partita attuale\n"
" quit - per uscire"
-#: server/stdinhand.c:4007 server/stdinhand.c:4010
+#: server/stdinhand.c:4055 server/stdinhand.c:4058
msgid "Command:"
msgstr "Comando:"
-#: server/stdinhand.c:4014
+#: server/stdinhand.c:4062
msgid "Synopsis: "
msgstr "Sintassi: "
-#: server/stdinhand.c:4023
+#: server/stdinhand.c:4071
#, c-format
msgid "Level: %s"
msgstr "Livello: %s"
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4096
msgid "The following server commands are available:"
msgstr "Sono disponibili i seguenti comandi del server:"
-#: server/stdinhand.c:4123
+#: server/stdinhand.c:4171
#, c-format
msgid "Help argument '%s' is ambiguous."
msgstr "L'argomento '%s' di 'help' è ambiguo."
-#: server/stdinhand.c:4128
+#: server/stdinhand.c:4176
#, c-format
msgid "No match for help argument '%s'."
msgstr "Nessuna corrispondenza per l'argomento '%s' di 'help'."
-#: server/stdinhand.c:4194
+#: server/stdinhand.c:4242
#, c-format
msgid "Bad list argument: '%s'. Try '%shelp list'."
msgstr "Argomento errato per 'list': '%s'. Provate '%shelp list'."
-#: server/stdinhand.c:4234
+#: server/stdinhand.c:4282
msgid "List of players:"
msgstr "Elenco dei giocatori:"
-#: server/stdinhand.c:4239
+#: server/stdinhand.c:4287
msgid "<no players>"
msgstr "<nessun giocatore>"
-#: server/stdinhand.c:4256
+#: server/stdinhand.c:4304
#, c-format
msgid "user %s, "
msgstr "utente %s, "
-#: server/stdinhand.c:4267
+#: server/stdinhand.c:4315
msgid ", Dead"
msgstr ", Morto"
-#: server/stdinhand.c:4270
+#: server/stdinhand.c:4318
#, 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:4275 server/stdinhand.c:4279 client/helpdata.c:257
-#: client/helpdata.c:752 client/text.c:241 client/text.c:1224
-#: client/text.c:1262
+#: server/stdinhand.c:4323 server/stdinhand.c:4327 client/helpdata.c:257
+#: client/helpdata.c:752 client/text.c:241 client/text.c:1229
+#: client/text.c:1267
#, c-format
msgid "?clistmore:, %s"
msgstr ", %s"
-#: server/stdinhand.c:4283
+#: server/stdinhand.c:4331
#, fuzzy
msgid ", ready"
msgstr ", Morto"
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4333
msgid ", not ready"
msgstr ""
-#: server/stdinhand.c:4293
+#: server/stdinhand.c:4341
#, c-format
msgid " %d connection:"
msgid_plural " %d connections:"
msgstr[0] " %d collegamento:"
msgstr[1] " %d collegamenti:"
-#: server/stdinhand.c:4299
+#: server/stdinhand.c:4347
#, 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:4304
+#: server/stdinhand.c:4352
msgid " (observer mode)"
msgstr " (modalità osservatore)"
-#: server/stdinhand.c:4322
+#: server/stdinhand.c:4370
#, fuzzy
msgid "List of teams:"
msgstr "Elenco dei giocatori:"
#. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4332
+#: server/stdinhand.c:4380
#, c-format
msgid "%2d : '%s' : %d player"
msgid_plural "%2d : '%s' : %d players"
msgstr[0] ""
msgstr[1] ""
-#: server/stdinhand.c:4352
+#: server/stdinhand.c:4400
#, c-format
msgid "%2d : '%s' : 1 player : %s"
msgstr ""
-#: server/stdinhand.c:4360
+#: server/stdinhand.c:4408
#, c-format
msgid "Empty team: %s"
msgstr ""
-#: server/stdinhand.c:4371
+#: server/stdinhand.c:4419
msgid "List of connections to server:"
msgstr "Elenco dei collegamenti al server:"
-#: server/stdinhand.c:4375
+#: server/stdinhand.c:4423
msgid "<no connections>"
msgstr "<nessun collegamento>"
-#: server/stdinhand.c:4399
+#: server/stdinhand.c:4447
#, fuzzy
msgid "List of scenarios available:"
msgstr "Nessuna unità disponibile"
@@ -6763,7 +6848,7 @@ msgstr "gli %s hanno ricercato la Tecnologia Futura %d."
msgid "%s acquired from %s!"
msgstr "gli %s hanno acquisito %s dagli %s."
-#: server/techtools.c:220
+#: server/techtools.c:221
#, c-format
msgid ""
"Discovery of %s makes the government form %s available. You may want to "
@@ -6772,37 +6857,37 @@ msgstr ""
"la scoperta della %s rende disponibile la forma di governo %s. Potreste "
"voler iniziare una rivoluzione."
-#: server/techtools.c:301
+#: server/techtools.c:302
#, c-format
msgid "Discovery of %s OBSOLETES %s in %s!"
msgstr "la scoperta di %s rende OBSOLETO %s in %s!"
-#: server/techtools.c:351
+#: server/techtools.c:352
#, fuzzy, c-format
msgid "Learned %s. Our scientists focus on %s; goal is %s."
msgstr "appreso %s. I nostri scienziati si focalizzano su %s, lo scopo è %s."
-#: server/techtools.c:369
+#: server/techtools.c:370
#, c-format
msgid "Learned %s. Scientists choose to research %s."
msgstr "appreso %s. I nostri scienziati scelgono di ricercare %s."
-#: server/techtools.c:376
+#: server/techtools.c:377
#, c-format
msgid "Learned %s. "
msgstr "appreso %s. "
-#: server/techtools.c:379
+#: server/techtools.c:380
#, c-format
msgid "Researching %s."
msgstr "Ricerca %s."
-#: server/techtools.c:385
+#: server/techtools.c:386
#, c-format
msgid "Learned %s. Scientists do not know what to research next."
msgstr "appresa %s. I nostri scienziati ora non sanno cosa ricercare."
-#: server/techtools.c:402
+#: server/techtools.c:403
msgid ""
"Great scientists from all the world join your civilization: you get an "
"immediate advance."
@@ -6810,22 +6895,22 @@ msgstr ""
"grandi scienziati da tutto il mondo si uniscono alla vostra civiltà; "
"ottenete subito una nuova tecnologia."
-#: server/techtools.c:570
+#: server/techtools.c:571
#, c-format
msgid "Technology goal is %s."
msgstr "l'obiettivo Tecnologico è %s."
-#: server/techtools.c:700
+#: server/techtools.c:708
#, c-format
msgid "You steal %s from the %s."
msgstr "hai rubato %s dagli %s."
-#: server/techtools.c:705
+#: server/techtools.c:713
#, c-format
msgid "The %s stole %s from you!"
msgstr "gli %s hanno rubato %s a te!"
-#: server/techtools.c:710
+#: server/techtools.c:718
#, c-format
msgid "The %s have stolen %s from the %s."
msgstr "gli %s hanno rubato %s dagli %s."
@@ -6849,156 +6934,162 @@ msgstr "nessuna unit
msgid "%s upgraded to %s for %d gold."
msgstr "%s aggiornato a %s per %d auri."
-#: server/unithand.c:396
+#: server/unithand.c:402
#, c-format
msgid "%s refuses to disband!"
msgstr "%s rifiuta di essere congedata!"
-#: server/unithand.c:449
+#: server/unithand.c:455
msgid "Can't place city here."
msgstr "impossibile costruire una città qui."
-#: server/unithand.c:456
+#: server/unithand.c:462
#, c-format
msgid "Only %s can build a city."
msgstr "solo %s possono costruire una città."
-#: server/unithand.c:461
+#: server/unithand.c:467
msgid "Can't build a city."
msgstr "impossibile costruire una città."
-#: server/unithand.c:470
+#: server/unithand.c:476
#, c-format
msgid "Only %s can add to a city."
msgstr "solo %s possono aggiungersi ad una città."
-#: server/unithand.c:475
+#: server/unithand.c:481
msgid "Can't add to a city."
msgstr "impossibile aggiungersi ad una città."
-#: server/unithand.c:481
+#: server/unithand.c:487
#, c-format
msgid "%s unit has no moves left to add to %s."
msgstr "l'unità %s non ha mosse restanti per aggiungersi a %s."
-#: server/unithand.c:487
+#: server/unithand.c:493
#, c-format
msgid "%s unit has no moves left to build city."
msgstr "l'unità %s non ha mosse restanti per costruire una città."
-#: server/unithand.c:492
+#. TRANS: <city> is owned by <nation>, cannot add <unit>.
+#: server/unithand.c:499
+#, fuzzy, c-format
+msgid "%s is owned by %s, cannot add %s."
+msgstr "%s è troppo grande per aggiungere %s."
+
+#: server/unithand.c:506
#, c-format
msgid "%s is too big to add %s."
msgstr "%s è troppo grande per aggiungere %s."
-#: server/unithand.c:498
+#: server/unithand.c:512
#, c-format
msgid "%s needs an improvement to grow, so you cannot add %s."
msgstr ""
"%s ha bisogno di una struttura cittadina per crescere, quindi non potete "
"aggiungere %s."
-#: server/unithand.c:509
+#: server/unithand.c:523
#, c-format
msgid "Can't add %s to %s."
msgstr "non potete aggiungere %s a %s."
-#: server/unithand.c:531
+#: server/unithand.c:545
#, c-format
msgid "%s added to aid %s in growing."
msgstr "%s si aggiunge per aiutare la crescita di %s."
-#: server/unithand.c:828
+#: server/unithand.c:842
msgid "Your Nuclear missile was shot down by SDI defences, what a waste."
msgstr ""
"il vostro Missile Nucleare è stato abbattuto dalla Difesa SDI, che spreco."
-#: server/unithand.c:831
+#: server/unithand.c:845
#, c-format
msgid "The nuclear attack on %s was avoided by your SDI defense."
msgstr "l'attacco nucleare su %s è stato evitato dalla vostra Difesa SDI."
#. TRANS: "Your Cannon ... the Polish Destroyer."
-#: server/unithand.c:901
+#: server/unithand.c:915
#, fuzzy, c-format
msgid "Your %s survived the pathetic attack from the %s %s."
msgstr "il vostro %1$s è sopravvissuto al patetico attacco del %3$s di %2$s."
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unithand.c:910
+#: server/unithand.c:924
#, fuzzy, c-format
msgid "Your attacking %s failed against the %s %s!"
msgstr "l'attacco del vostro %1$s è fallito contro il %3$s di %2$s!"
-#: server/unithand.c:983
+#: server/unithand.c:997
#, c-format
msgid "Only %s can attack from sea."
msgstr "solo i %s possono attaccare dal mare."
-#: server/unithand.c:988
+#: server/unithand.c:1002
msgid "Cannot attack from sea."
msgstr "impossibile attaccare dal mare."
-#: server/unithand.c:996 server/unittools.c:2137
+#: server/unithand.c:1010 server/unittools.c:2142
msgid "Cannot attack unless you declare war first."
msgstr "impossibile attaccare finché non dichiarate guerra."
-#: server/unithand.c:1001
+#: server/unithand.c:1015
#, c-format
msgid "%s can only move into your own zone of control."
msgstr "%s si può spostare solo nella vostra zona di controllo."
-#: server/unithand.c:1007
+#: server/unithand.c:1021
#, fuzzy, c-format
msgid "Cannot invade unless you break peace with %s first."
msgstr "impossibile attaccare finché non dichiarate guerra."
-#: server/unithand.c:1052
+#: server/unithand.c:1066
msgid "This unit has no moves left."
msgstr "questa unità non ha altre mosse."
-#: server/unithand.c:1107
+#: server/unithand.c:1121
msgid "Unit must be on land to perform diplomatic action."
msgstr "l'unità deve essere sulla terra per compiere un'azione diplomatica."
-#: server/unithand.c:1109
+#: server/unithand.c:1123
msgid "No diplomat action possible."
msgstr "nessuna azione diplomatica possibile."
-#: server/unithand.c:1125
+#: server/unithand.c:1139
#, c-format
msgid "You must declare war on %s first. Try using players dialog (F3)."
msgstr ""
-#: server/unithand.c:1143
+#: server/unithand.c:1157
msgid "This unit is being transported, and so cannot bombard."
msgstr "questa unità non può bombardare durante il trasporto."
-#: server/unithand.c:1158
+#: server/unithand.c:1172
msgid "You can't attack there."
msgstr "non potete attaccare qui."
-#: server/unithand.c:1180
+#: server/unithand.c:1194
msgid "This type of troops cannot take over a city."
msgstr "questo tipo di truppe non può conquistare una città."
-#: server/unithand.c:1198
+#: server/unithand.c:1212
msgid "A transported unit is not allied to all units or city on target tile."
msgstr ""
"Un'unità trasportata non è alleata con tutte le unità o con la città nel "
"quadrante destinazione."
-#: server/unithand.c:1240
+#: server/unithand.c:1254
#, c-format
msgid "Your %s helps build the %s in %s (%d remaining)."
msgstr "il vostro %s ha aiutato a costruire il %s a %s (ne rimangono %d)."
-#: server/unithand.c:1242
+#: server/unithand.c:1256
#, c-format
msgid "Your %s helps build the %s in %s (%d surplus)."
msgstr "il vostro %s ha aiutato a costruire il %s a %s (surplus di %d)."
-#: server/unithand.c:1286
+#: server/unithand.c:1300
#, c-format
msgid ""
"Sorry, your %s cannot establish a trade route because it has no home city"
@@ -7006,29 +7097,29 @@ msgstr ""
"spiacente, il vostro %s non può stabilire una rotta commerciale perché non "
"ha una città d'origine"
-#: server/unithand.c:1296
+#: server/unithand.c:1310
#, c-format
msgid "Sorry, your %s cannot establish a trade route between %s and %s"
msgstr ""
"spiacente, il vostro %s non può stabilire una rotta commerciale tra %s e %s"
-#: server/unithand.c:1325 server/unithand.c:1344
+#: server/unithand.c:1339 server/unithand.c:1358
#, c-format
msgid "Sorry, your %s cannot establish a trade route here!"
msgstr "spiacente, il vostro %s non può stabilire una rotta commerciale qui!"
-#: server/unithand.c:1329 server/unithand.c:1348
+#: server/unithand.c:1343 server/unithand.c:1362
#, c-format
msgid " The city of %s already has %d better trade routes!"
msgstr " La città di %s ha già %d rotte commerciali migliori!"
-#: server/unithand.c:1361 server/unithand.c:1373
+#: server/unithand.c:1375 server/unithand.c:1387
#, c-format
msgid "Sorry, %s has canceled the trade route from %s to your city %s."
msgstr ""
"spiacente, %s ha cancellato la rotta commerciale da %s alla vostra città %s."
-#: server/unithand.c:1406
+#: server/unithand.c:1420
#, c-format
msgid ""
"Your %s from %s has arrived in %s, and revenues amount to %d in gold and "
@@ -7088,56 +7179,56 @@ msgid "Teleported your %s to %s."
msgstr "il vostro %s è stato teletrasportato a %s."
#. TRANS: A unit is moved to resolve stack conflicts.
-#: server/unittools.c:1065
+#: server/unittools.c:1070
#, fuzzy, c-format
msgid "Moved your %s."
msgstr "il vostro %s è stato congedato."
-#: server/unittools.c:1076
+#: server/unittools.c:1081
#, c-format
msgid "Disbanded your %s."
msgstr "il vostro %s è stato congedato."
-#: server/unittools.c:1397
+#: server/unittools.c:1402
#, c-format
msgid "Unable to defend %s, %s has lost the game."
msgstr "Incapace di difendere %s, %s ha perso la partita."
-#: server/unittools.c:1401
+#: server/unittools.c:1406
#, c-format
msgid "Losing %s meant losing the game! Be more careful next time!"
msgstr ""
"Perder %s significa perdere la partita! Fai più attenzione la prossima volta!"
-#: server/unittools.c:1503
+#: server/unittools.c:1508
#, c-format
msgid "%s escaped the destruction of %s, and fled to %s."
msgstr "il vostro %s è sfuggito alla distruzione di %s, ed è fuggito a %s."
-#: server/unittools.c:1512
+#: server/unittools.c:1517
#, c-format
msgid "%s lost when %s was lost."
msgstr "%s perso a causa della perdita di %s."
-#: server/unittools.c:1561
+#: server/unittools.c:1566
#, c-format
msgid "Barbarian leader captured, %d gold ransom paid."
msgstr "è stato catturato un capo tribù barbaro, riscatto di %d auri pagato."
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unittools.c:1579
+#: server/unittools.c:1584
#, fuzzy, c-format
msgid "Your attacking %s succeeded against the %s %s!"
msgstr "l'attacco del vostro %1$s è riuscito contro il %3$s di %2$s!"
#. TRANS: "Cannon ... the Polish Destroyer."
-#: server/unittools.c:1588 server/unittools.c:1646
+#: server/unittools.c:1593 server/unittools.c:1651
#, fuzzy, c-format
msgid "%s lost to an attack by the %s %s."
msgstr "avete perso un %1$s in un attacco dal %3$s di %2$s."
#. TRANS: "... Cannon ... the Polish Destroyer ...."
-#: server/unittools.c:1622
+#: server/unittools.c:1627
#, fuzzy, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -7147,14 +7238,14 @@ msgstr[1] "l'attacco del vostro %1$s
#. TRANS: "Cannon lost when the Polish Destroyer
#. * attacked the German Musketeers."
-#: server/unittools.c:1655
+#: server/unittools.c:1660
#, fuzzy, c-format
msgid "%s lost when the %s %s attacked the %s %s."
msgstr "avete perso un %1$s in un attacco del %3$s di %2$s."
#. TRANS: "Musketeers (and Cannon) lost to an
#. * attack from the Polish Destroyer."
-#: server/unittools.c:1670
+#: server/unittools.c:1675
#, fuzzy, c-format
msgid "%s (and %s) lost to an attack from the %s %s."
msgstr "avete perso un %1$s (%2$s) in un attacco del %4$s di %3$s."
@@ -7162,7 +7253,7 @@ msgstr "avete perso un %1$s (%2$s) in un attacco del %4$s di %3$s."
#. TRANS: "Musketeers and 3 other units lost to
#. * an attack from the Polish Destroyer."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1680
+#: server/unittools.c:1685
#, fuzzy, 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."
@@ -7172,183 +7263,226 @@ msgstr[1] "avete perso un %1$s (%2$d) in un attacco del %4$s di %3$s."
#. TRANS: "2 units lost when the Polish Destroyer
#. * attacked the German Musketeers."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1694
+#: server/unittools.c:1699
#, fuzzy, 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] "auto-attacco: %1$d il %3$s di %2$s sta attaccando il %5$s di %4$s"
msgstr[1] "auto-attacco: %1$d il %3$s di %2$s sta attaccando il %5$s di %4$s"
-#: server/unittools.c:1962
+#: server/unittools.c:1967
#, c-format
msgid "Your %s was nuked by %s."
msgstr "il vostro %s è stato ucciso con un ordigno nucleare da %s."
-#: server/unittools.c:1965 server/unittools.c:1981
+#: server/unittools.c:1970 server/unittools.c:1986
msgid "yourself"
msgstr "te stesso"
-#: server/unittools.c:1969
+#: server/unittools.c:1974
#, fuzzy, c-format
msgid "The %s %s was nuked."
msgstr "il %2$s di %1$s è stato ucciso con un ordigno nucleare."
-#: server/unittools.c:1978
+#: server/unittools.c:1983
#, c-format
msgid "%s was nuked by %s."
msgstr "%s è stata distrutta con un ordigno nucleare da %s."
-#: server/unittools.c:1986
+#: server/unittools.c:1991
#, c-format
msgid "You nuked %s."
msgstr "avete distrutto %s con un ordigno nucleare."
-#: server/unittools.c:2027
+#: server/unittools.c:2032
#, fuzzy, c-format
msgid "The %s detonated a nuke!"
msgstr "gli %s hanno fatto esplodere una bomba nucleare."
-#: server/unittools.c:2051
+#: server/unittools.c:2056
#, c-format
msgid "%s transported successfully."
msgstr "%s trasportato con successo."
-#: server/unittools.c:2103
+#: server/unittools.c:2108
msgid "This unit type can not be paradropped."
msgstr "questo tipo di unità non può essere paracadutato."
-#: server/unittools.c:2113
+#: server/unittools.c:2118
#, fuzzy
msgid "You cannot paradrop a unit that is transporting other units."
msgstr "impossibile paracadutare un'unità cargo."
-#: server/unittools.c:2119
+#: server/unittools.c:2124
msgid "The destination location is not known."
msgstr "la posizione della destinazione non è conosciuta."
-#: server/unittools.c:2126
+#: server/unittools.c:2131
#, fuzzy, c-format
msgid "This unit cannot paradrop into %s."
msgstr "impossibile paracadutare nell'oceano."
-#: server/unittools.c:2146
+#: server/unittools.c:2151
#, c-format
msgid "The distance to the target (%i) is greater than the unit's range (%i)."
msgstr ""
"la distanza fino al bersaglio (%i) è maggiore dell'autonomia dell'unità (%i)."
-#: server/unittools.c:2157
+#: server/unittools.c:2162
#, fuzzy, c-format
msgid "Your %s paradropped into the %s and was lost."
msgstr "il vostro %s è stato paracadutato nell'oceano ed è morto."
-#: server/unittools.c:2170
+#: server/unittools.c:2175
#, c-format
msgid "Your %s was killed by enemy units at the paradrop destination."
msgstr ""
"il vostro %s è stato ucciso da unità nemiche nella zona in cui è stato "
"paracadutato."
-#: server/unittools.c:2192
+#: server/unittools.c:2197
#, c-format
msgid "You found %d gold."
msgstr "avete trovato %d auri."
-#: server/unittools.c:2209
+#: server/unittools.c:2214
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr "avete trovato %s in delle antiche pergamene di saggezza."
-#: server/unittools.c:2216
+#: server/unittools.c:2221
#, c-format
msgid "The %s have acquired %s from ancient scrolls of wisdom."
msgstr "gli %s hanno acquisito %s da delle antiche pergamene di saggezza."
-#: server/unittools.c:2230
+#: server/unittools.c:2235
msgid "A band of friendly mercenaries joins your cause."
msgstr "una banda di mercenari amichevoli si unisce alla vostra causa."
-#: server/unittools.c:2248
+#: server/unittools.c:2253
msgid "An abandoned village is here."
msgstr "qui c'è un villaggio abbandonato."
-#: server/unittools.c:2258
+#: server/unittools.c:2263
msgid "You have unleashed a horde of barbarians!"
msgstr "avete scatenato un'orda di barbari!"
-#: server/unittools.c:2261
+#: server/unittools.c:2266
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr "il vostro %s è stato ucciso dai barbari!"
-#: server/unittools.c:2277
+#: server/unittools.c:2282
msgid "You found a friendly city."
msgstr "Avete fondato una città."
-#: server/unittools.c:2291
+#: server/unittools.c:2296
msgid "Friendly nomads are impressed by you, and join you."
msgstr "avete impressionato dei nomadi amichevoli, che si uniscono a voi."
-#: server/unittools.c:2316
+#: server/unittools.c:2321
msgid "Your overflight frightens the tribe; they scatter in terror."
msgstr "il vostro sorvolo ha atterrito la tribù, che fugge terrorizzata."
-#: server/unittools.c:2574
+#: server/unittools.c:2579
#, fuzzy, c-format
msgid "Orders for %s aborted after enemy movement was spotted."
msgstr "Ordini per %s abortiti dato che ci sono unità ostili nelle vicinanze."
-#: server/unittools.c:3023
+#: server/unittools.c:3028
#, c-format
msgid "Orders for %s aborted as there are units nearby."
msgstr "Ordini per %s abortiti dato che ci sono unità ostili nelle vicinanze."
-#: server/unittools.c:3075
+#: server/unittools.c:3080
#, fuzzy, c-format
msgid "Orders for %s aborted because building of city failed."
msgstr "Ordini per %s abortiti a causa di una mossa fallita."
-#: server/unittools.c:3088
+#: server/unittools.c:3093
#, c-format
msgid "Orders for %s aborted since they give an invalid activity."
msgstr "Ordini per %s abortiti dato che prevedono un'attività non consentita."
-#: server/unittools.c:3102
+#: server/unittools.c:3107
#, c-format
msgid "Orders for %s aborted since they give an invalid location."
msgstr ""
"Ordini per %s abortiti dato che prevedono una locazione non consentita."
-#: server/unittools.c:3112
+#: server/unittools.c:3117
#, c-format
msgid "Orders for %s aborted as there are units in the way."
msgstr "Ordini per %s abortiti dato che sono unità ostili sul suo percorso."
-#: server/unittools.c:3138
+#: server/unittools.c:3143
#, c-format
msgid "Orders for %s aborted because of failed move."
msgstr "Ordini per %s abortiti a causa di una mossa fallita."
-#: server/unittools.c:3179
+#: server/unittools.c:3184
#, fuzzy, c-format
msgid "Attempt to change homecity for %s failed."
msgstr "la città d'origine di %s è diventata %s."
-#: server/unittools.c:3190
+#: server/unittools.c:3195
#, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr ""
-#: server/unittools.c:3202
+#: server/unittools.c:3207
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr ""
-#: server/unittools.c:3211
+#: server/unittools.c:3216
#, c-format
msgid "Your %s has invalid orders."
msgstr "il vostro %s ha degli ordini non consentiti."
+#: server/voting.c:522
+#, fuzzy, c-format
+msgid ""
+"%s %d \"%s\" is passed %d to %d with %d abstentions and %d who did not vote."
+msgstr "Voto \"%s\" è passato %d a %d con %d astenuti."
+
+#: server/voting.c:528
+#, fuzzy, c-format
+msgid ""
+"%s %d \"%s\" failed with %d against, %d for, %d abstentions and %d who did "
+"not vote."
+msgstr ""
+"Voto \"%s\" non è passato con %d contrari, %d favorevoli e %d astenuti."
+
+#: server/voting.c:548
+#, c-format
+msgid "%s %d: %s voted yes."
+msgstr ""
+
+#: server/voting.c:553
+#, c-format
+msgid "%s %d: %s voted no."
+msgstr ""
+
+#: server/voting.c:558
+#, c-format
+msgid "%s %d: %s chose to abstain."
+msgstr ""
+
+#. TRANS: Describing a new vote that can only pass
+#. * if there are no dissenting votes.
+#: server/voting.c:726
+#, c-format
+msgid "%s (needs %0.0f%% and no dissent)."
+msgstr ""
+
+#. TRANS: Describing a new vote that can pass only if the
+#. * given percentage of players votes 'yes'.
+#: server/voting.c:732
+#, c-format
+msgid "%s (needs %0.0f%% in favor)."
+msgstr ""
+
#: server/generator/mapgen.c:1771
msgid "High landmass - this may take a few seconds."
msgstr "Valore di landmass alto - questo potrebbe richiedere alcuni secondi."
@@ -7381,7 +7515,7 @@ msgstr ""
"della mappa.\n"
"Per favore riportate questo bug a %s."
-#: client/attribute.c:363
+#: client/attribute.c:368
#, fuzzy
msgid ""
"There has been a CMA error. Your citizen governor settings may be broken."
@@ -7389,7 +7523,7 @@ msgstr ""
"Si è verificato un errore del GAC. I settaggi GAC potrebbero essere "
"incompatibili."
-#: client/attribute.c:367
+#: client/attribute.c:372
msgid "Old attributes detected and removed."
msgstr "Vecchi attributi rintracciati e rimossi."
@@ -7539,41 +7673,41 @@ msgstr "%s - %s cittadini"
msgid "%+4d : Taxed from trade\n"
msgstr ""
-#: client/citydlg_common.c:418
+#: client/citydlg_common.c:421
#, fuzzy, c-format
msgid "%+4d : Trade route with %s\n"
msgstr "Non c'è nessuna rotta commerciale.\n"
-#: client/citydlg_common.c:427
+#: client/citydlg_common.c:430
#, fuzzy, c-format
msgid "%+4d : Building tithes\n"
msgstr "Costruisci unità"
-#: client/citydlg_common.c:450
+#: client/citydlg_common.c:453
#, c-format
msgid "%+4d : Bonus from %s (%+d%%)\n"
msgstr ""
-#: client/citydlg_common.c:462
+#: client/citydlg_common.c:465
#, c-format
msgid "%+4d : Waste\n"
msgstr ""
-#: client/citydlg_common.c:468
+#: client/citydlg_common.c:471
#, c-format
msgid "%+4d : Disorder\n"
msgstr ""
-#: client/citydlg_common.c:474
+#: client/citydlg_common.c:477
#, c-format
msgid "%+4d : Used\n"
msgstr ""
-#: client/citydlg_common.c:479
+#: client/citydlg_common.c:482
msgid "==== : Adds up to\n"
msgstr ""
-#: client/citydlg_common.c:481
+#: client/citydlg_common.c:484
#, c-format
msgid "%4d : Total surplus"
msgstr ""
@@ -7896,53 +8030,53 @@ msgstr "?Risorse speciali:S"
msgid "Specialists"
msgstr "Risorse speciali"
-#: client/civclient.c:240
+#: client/civclient.c:241
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr " -a, --autoconnect\tSalta la finestra di collegamento\n"
-#: client/civclient.c:250
+#: client/civclient.c:251
msgid " -l, --log FILE\tUse FILE as logfile (spawned server also uses this)\n"
msgstr ""
" -l, --log FILE\tUsa FILE come file di log (anche gli eventuali server "
"creati useranno questo file)\n"
-#: client/civclient.c:252
+#: client/civclient.c:253
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr " -m, --meta HOST\tSi collega al metaserver HOST\n"
-#: client/civclient.c:254
+#: client/civclient.c:255
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr " -n, --name NOME\tUsa NOME come nome utente\n"
-#: client/civclient.c:256
+#: client/civclient.c:257
#, fuzzy
msgid " -p, --port PORT\tConnect to server port PORT (usually with -a)\n"
msgstr " -p, --port PORTA\tSi collega alla porta PORTA del server\n"
-#: client/civclient.c:258
+#: client/civclient.c:259
#, c-format
msgid " -P, --Plugin PLUGIN\tUse PLUGIN for sound output %s\n"
msgstr " -P, --Plugin PLUGIN\tUtilizza PLUGIN per l'uscita sonora %s\n"
-#: client/civclient.c:260
+#: client/civclient.c:261
msgid " -r, --read FILE\tRead startup script FILE (for spawned server only)\n"
msgstr ""
" -r, --read FILE\tLegge lo script iniziale FILE (solo per i server creati)\n"
-#: client/civclient.c:263
+#: client/civclient.c:264
#, fuzzy
msgid " -s, --server HOST\tConnect to the server at HOST (usually with -a)\n"
msgstr " -s, --server HOST\tSi collega al server HOST\n"
-#: client/civclient.c:265
+#: client/civclient.c:266
msgid " -S, --Sound FILE\tRead sound tags from FILE\n"
msgstr " -S, --Sound FILE\tCarica i tag dei suoni dal file FILE\n"
-#: client/civclient.c:266
+#: client/civclient.c:267
msgid " -t, --tiles FILE\tUse data file FILE.tilespec for tiles\n"
msgstr " -t, --tiles FILE\tUsa il file dati FILE.tilespec per la grafica\n"
-#: client/civclient.c:269
+#: client/civclient.c:270
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7952,46 +8086,46 @@ msgstr ""
"\t\t\tProva \"%s -- --help\" per maggiori informazioni.\n"
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:274
+#: client/civclient.c:275
#, fuzzy, c-format
msgid "Report bugs at %s\n"
msgstr "Riferite i bug a <%s>.\n"
-#: client/civclient.c:298
+#: client/civclient.c:299
#, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr "La porta \"%s\" specificata con l'opzione --port non è valida.\n"
-#: client/civclient.c:300 client/civclient.c:315
+#: client/civclient.c:301 client/civclient.c:316
msgid "Try using --help.\n"
msgstr "Prova ad usare --help.\n"
-#: client/civclient.c:313
+#: client/civclient.c:314
#, c-format
msgid "Invalid debug level \"%s\" specified with --debug option.\n"
msgstr ""
"Il livello di debug \"%s\" specificato con l'opzione --debug non è valida.\n"
-#: client/civclient.c:326
+#: client/civclient.c:327
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr "Opzione sconosciuta: \"%s\"\n"
-#: client/civclient.c:391
+#: client/civclient.c:393
#, fuzzy, c-format
msgid "Updating old metaserver address \"%s\"."
msgstr "metaserver <indirizzo>"
-#: client/civclient.c:394
+#: client/civclient.c:396
#, fuzzy, c-format
msgid "Default metaserver has been set to \"%s\"."
msgstr "Opzione: %s è stata impostata a \"%s\"."
-#: client/civclient.c:550
+#: client/civclient.c:540
msgid "Game started."
msgstr "Gioco iniziato"
-#: client/civclient.c:588
+#: client/civclient.c:606
msgid "There was an error while auto connecting; aborting."
msgstr "C'è stato un errore durante l'auto connessione; abortito."
@@ -8121,18 +8255,18 @@ msgstr "Connessione in avanzamento."
msgid "Disconnected from server."
msgstr "Disconnesso dal server."
-#: client/clinet.c:469
+#: client/clinet.c:473
#, c-format
msgid "Failed to contact server \"%s\" at port %d as \"%s\" after %d attempts"
msgstr ""
"Impossibile collegarsi al server \"%s\" alla porta %d come \"%s\" dopo %d "
"tentativi"
-#: client/clinet.c:484 client/clinet.c:486
+#: client/clinet.c:488 client/clinet.c:490
msgid "Connection to server refused. Please start the server."
msgstr "Connessione al server rifiutata. Verificare che il server sia partito."
-#: client/clinet.c:495 client/clinet.c:523
+#: client/clinet.c:499 client/clinet.c:527
#, c-format
msgid ""
"Error contacting server \"%s\" at port %d as \"%s\":\n"
@@ -8141,7 +8275,7 @@ msgstr ""
"Errore durante il collegamento al server \"%s\" alla porta %d come \"%s\":\n"
" %s\n"
-#: client/clinet.c:514
+#: client/clinet.c:518
#, c-format
msgid ""
"Auto-connecting to server \"%s\" at port %d as \"%s\" every %f second(s) for "
@@ -8150,53 +8284,53 @@ 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:1358
+#: client/connectdlg_common.c:78 client/gui-gtk-2.0/pages.c:1358
msgid "novice"
msgstr "novizio"
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1358
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
msgid "easy"
msgstr "facile"
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1359
msgid "normal"
msgstr "normale"
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr "difficile"
-#: client/connectdlg_common.c:83
+#: client/connectdlg_common.c:82
msgid "experimental"
msgstr "sperimentale"
-#: client/connectdlg_common.c:213
+#: client/connectdlg_common.c:212
msgid "Starting server..."
msgstr "Server in fase di inizializzazione..."
-#: client/connectdlg_common.c:332
+#: client/connectdlg_common.c:331
msgid "Couldn't start the server."
msgstr "Impossibile far partire il server."
-#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
+#: client/connectdlg_common.c:332 client/connectdlg_common.c:365
msgid "You'll have to start one manually. Sorry..."
msgstr "Dovrai farlo partire manualmente. Spiacenti..."
-#: client/connectdlg_common.c:364
+#: client/connectdlg_common.c:363
msgid "Couldn't connect to the server."
msgstr "Impossibile collegarsi al server."
-#: client/connectdlg_common.c:365
+#: client/connectdlg_common.c:364
msgid "We probably couldn't start it from here."
msgstr "Probabilmente non è possibile farlo partire da qui."
-#: client/connectdlg_common.c:470
+#: client/connectdlg_common.c:469
#, fuzzy
msgid ""
"Established control over the server. You have command access level 'hack'."
msgstr "Hai il controllo del server (livello hack di accesso ai comandi)"
-#: client/connectdlg_common.c:475
+#: client/connectdlg_common.c:474
msgid ""
"Failed to obtain the required access level to take control of the server. "
"The server will now be shutdown."
@@ -8206,30 +8340,30 @@ msgstr ""
msgid "Only transporter units can be unloaded."
msgstr "solo le unità cargo possono essere scaricate."
-#: client/control.c:1425
+#: client/control.c:1417
#, fuzzy
msgid "Only settler units can be put into auto mode."
msgstr ""
"solo le unità coloni ed i militari nelle città possono essere impostati in "
"modalità automatica."
-#: client/control.c:1516
+#: client/control.c:1511
msgid "Only nuclear units can do this."
msgstr "solo le unità nucleari possono farlo."
-#: client/control.c:1545
+#: client/control.c:1540
msgid "Only paratrooper units can do this."
msgstr "solo le unità paracadutate possono farlo."
-#: client/control.c:2020
+#: client/control.c:2015
msgid "Too far for this unit."
msgstr "troppo lontano per questa unità."
-#: client/control.c:2230 client/control.c:2260 client/control.c:2276
+#: client/control.c:2225 client/control.c:2255 client/control.c:2271
msgid "Didn't find a route to the destination!"
msgstr "impossibile trovare un percorso fino alla destinazione!"
-#: client/control.c:2320
+#: client/control.c:2315
msgid "Oh my! You seem to have no capital!"
msgstr "Attenzione! Sembra che la nazione non abbia una capitale!"
@@ -8643,27 +8777,34 @@ 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:1066 client/helpdata.c:1400
+#: client/helpdata.c:1066 client/helpdata.c:1408
msgid " or "
msgstr " o "
-#: client/helpdata.c:1068 client/helpdata.c:1388
+#: client/helpdata.c:1068 client/helpdata.c:1396
msgid "?or:, "
msgstr "?or:, "
-#: client/helpdata.c:1080
-#, 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"
+#: client/helpdata.c:1079
+#, fuzzy, c-format
+msgid "* Unit has to be in a city, or a base after %d turn.\n"
+msgid_plural "* Unit has to be in a city, or a base 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:1087
+#, fuzzy, c-format
+msgid "* Unit has to be in a city, a base, or on a %s after %d turn.\n"
+msgid_plural "* Unit has to be in a city, a base, 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:1122
+#: client/helpdata.c:1130
#, 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:1127
+#: client/helpdata.c:1135
#, c-format
msgid ""
"To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8672,93 +8813,93 @@ msgstr ""
"Per raggiungere %s dobbiamo ottenere %d altre tecnologie in precedenza. "
"L'intero progetto richiederà %d lampadine per essere completato."
-#: client/helpdata.c:1135
+#: client/helpdata.c:1143
msgid "You cannot research this technology."
msgstr "Non puoi ricercare questa tecnologia."
-#: client/helpdata.c:1139
+#: client/helpdata.c:1147
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:1151
+#: client/helpdata.c:1159
#, 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:1156
+#: client/helpdata.c:1164
#, 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:1159
+#: client/helpdata.c:1167
#, 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:1163
+#: client/helpdata.c:1171
msgid "* Increases the pollution generated by the population.\n"
msgstr "* Aumenta l'inquinamento prodotto dalla popolazione.\n"
-#: client/helpdata.c:1168
+#: client/helpdata.c:1176
#, 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:1175
+#: client/helpdata.c:1183
#, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr "* Permette ai %s di costruire fortezze.\n"
-#: client/helpdata.c:1183
+#: client/helpdata.c:1191
#, c-format
msgid "* Allows %s to build airbases.\n"
msgstr "* Permette ai %s di costruire basi aeree.\n"
-#: client/helpdata.c:1192
+#: client/helpdata.c:1200
#, 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:1200
+#: client/helpdata.c:1208
#, 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:1234
+#: client/helpdata.c:1242
msgid "* Pollution cannot be generated on this terrain."
msgstr "* L'inquinamento non può essere prodotto su questo tipo di terreno."
-#: client/helpdata.c:1239
+#: client/helpdata.c:1247
msgid "* You cannot build cities on this terrain."
msgstr "* non puoi costruire una città su questo tipo di terreno."
-#: client/helpdata.c:1245
+#: client/helpdata.c:1253
msgid "* The coastline of this terrain is unsafe."
msgstr "* La costa di questo tipo di terreno non è sicura."
-#: client/helpdata.c:1250
+#: client/helpdata.c:1258
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:1255
+#: client/helpdata.c:1263
msgid "* Land units cannot travel on oceanic terrains."
msgstr "* Unità terrestri non possono viaggiare su quadranti oceanici."
-#: client/helpdata.c:1305
+#: client/helpdata.c:1313
msgid "Features:\n"
msgstr ""
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1411 client/helpdata.c:1412
+#: client/helpdata.c:1419 client/helpdata.c:1420
msgid "?outputlist: Nothing "
msgstr ""
-#: client/helpdata.c:1419
+#: client/helpdata.c:1427
#, fuzzy, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -8769,7 +8910,7 @@ msgid_plural ""
msgstr[0] "Unità militari sul campo possono causare malcontento. "
msgstr[1] "Unità militari sul campo possono causare malcontento. "
-#: client/helpdata.c:1429
+#: client/helpdata.c:1437
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8777,48 +8918,48 @@ msgid ""
msgstr ""
#. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1437
+#: client/helpdata.c:1445
#, c-format
msgid "* You pay %d times normal %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1442
+#: client/helpdata.c:1450
#, 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:1447
+#: client/helpdata.c:1455
#, c-format
msgid "* You pay no %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1451
+#: client/helpdata.c:1459
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:1460
+#: client/helpdata.c:1468
#, 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:1468
+#: client/helpdata.c:1476
#, c-format
msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
msgstr ""
-#: client/helpdata.c:1475
+#: client/helpdata.c:1483
#, 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:1482
+#: client/helpdata.c:1490
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -8826,23 +8967,23 @@ msgid ""
msgstr ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1489
+#: client/helpdata.c:1497
#, 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:1497
+#: client/helpdata.c:1505
#, c-format
msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
msgstr ""
-#: client/helpdata.c:1502
+#: client/helpdata.c:1510
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr ""
-#: client/helpdata.c:1507
+#: client/helpdata.c:1515
#, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -8853,7 +8994,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1519
+#: client/helpdata.c:1527
#, 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"
@@ -8861,64 +9002,64 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1530
+#: client/helpdata.c:1538
#, 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:1536
+#: client/helpdata.c:1544
#, fuzzy
msgid "* Your units cannot be bribed.\n"
msgstr "Questa unità non può essere corrotta!"
-#: client/helpdata.c:1539
+#: client/helpdata.c:1547
#, fuzzy
msgid "* Your cities cannot be incited.\n"
msgstr "La città non può essere incitata alla rivolta!"
-#: client/helpdata.c:1543
+#: client/helpdata.c:1551
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:1549
+#: client/helpdata.c:1557
msgid "* Has a senate that may prevent declaration of war.\n"
msgstr ""
-#: client/helpdata.c:1553
+#: client/helpdata.c:1561
msgid "* Allows partisans when cities are taken by the enemy.\n"
msgstr ""
-#: client/helpdata.c:1557
+#: client/helpdata.c:1565
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
msgstr ""
-#: client/helpdata.c:1561
+#: client/helpdata.c:1569
msgid "* Pays no upkeep for fanatics.\n"
msgstr ""
-#: client/helpdata.c:1564
+#: client/helpdata.c:1572
#, fuzzy
msgid "* Has no unhappy citizens.\n"
msgstr "%d cittadini scontenti ulteriori."
-#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
+#: client/helpdata.c:1582 client/helpdata.c:1586 client/helpdata.c:1590
#, c-format
msgid "* Veteran %s units.\n"
msgstr ""
-#: client/helpdata.c:1585
+#: client/helpdata.c:1593
#, fuzzy
msgid "* Veteran units.\n"
msgstr "Unità di mare"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1591
+#: client/helpdata.c:1599
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8926,7 +9067,7 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1600
+#: client/helpdata.c:1608
#, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8934,71 +9075,71 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1608
+#: client/helpdata.c:1616
#, 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:1617
+#: client/helpdata.c:1625
#, c-format
msgid "* %s production is increased %d%%.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1625
+#: client/helpdata.c:1633
#, c-format
msgid "* %s production will suffer massive waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1630
+#: client/helpdata.c:1638
#, c-format
msgid "* %s production will suffer some waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1635
+#: client/helpdata.c:1643
#, 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:1643
+#: client/helpdata.c:1651
#, 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:1649
+#: client/helpdata.c:1657
#, 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:1655
+#: client/helpdata.c:1663
#, c-format
msgid "* %s waste will increase slowly with distance from capital.\n"
msgstr ""
-#: client/helpdata.c:1672
+#: client/helpdata.c:1680
#, 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:1699
+#: client/helpdata.c:1707
#, fuzzy, c-format
msgid "%s%d %s"
msgstr "%3d/%3d %s"
-#: client/helpdata.c:1700 client/helpdata.c:1708 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1708 client/helpdata.c:1716 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:1707
+#: client/helpdata.c:1715
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d malcontento"
@@ -9075,7 +9216,7 @@ msgid ""
"or with the -a command-line parameter."
msgstr ""
-#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:916 data/Freeciv.in:107
msgid "Metaserver"
msgstr "Metaserver"
@@ -9441,36 +9582,36 @@ msgstr "Salvataggio fallito, impossibile scrivere sul file %s"
msgid "Saved settings to file %s"
msgstr "Impostazioni salvate nel file %s"
-#: client/packhand.c:211 client/packhand.c:217
+#: client/packhand.c:212 client/packhand.c:218
#, fuzzy
msgid "You were rejected from the game...."
msgstr "Siete stati rimossi dalla partita:"
-#: client/packhand.c:229
+#: client/packhand.c:230
#, c-format
msgid "Client capability string: %s"
msgstr "Stringa delle capacità del client: %s"
-#: client/packhand.c:232
+#: client/packhand.c:233
#, c-format
msgid "Server capability string: %s"
msgstr "Stringa delle capacità del server: %s"
-#: client/packhand.c:850
+#: client/packhand.c:864
#, c-format
msgid "Start of turn %d"
msgstr "Inizio del %d turno"
-#: client/packhand.c:1591
+#: client/packhand.c:1621
#, c-format
msgid "AI Mode is now %s."
msgstr "La modalità IA ora è %s."
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "ON"
msgstr "attiva"
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "OFF"
msgstr "disattiva"
@@ -9502,15 +9643,15 @@ msgstr "?Player:Nome"
msgid "Username"
msgstr "Nome utente"
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
-#: client/gui-gtk-2.0/pages.c:2157
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:653
+#: client/gui-gtk-2.0/pages.c:1604 client/gui-gtk-2.0/pages.c:2159
msgid "Flag"
msgstr "Bandiera"
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1605
-#: client/gui-gtk-2.0/pages.c:2159 client/gui-sdl/repodlgs.c:2063
-#: client/gui-win32/connectdlg.c:990 client/gui-win32/dialogs.c:542
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:657
+#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1609
+#: client/gui-gtk-2.0/pages.c:2161 client/gui-sdl/repodlgs.c:2063
+#: client/gui-win32/connectdlg.c:992 client/gui-win32/dialogs.c:542
#: client/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "Nazione"
@@ -9523,7 +9664,7 @@ msgstr "Confine"
msgid "Score"
msgstr "Punteggio"
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1614
msgid "Team"
msgstr "Squadra"
@@ -9556,38 +9697,38 @@ msgstr "?Player_dlg:Inattivo"
msgid "Ping"
msgstr "Ping"
-#: client/repodlgs_common.c:375
+#: client/repodlgs_common.c:378
#, fuzzy
msgid "You cannot sell improvements."
msgstr "Vendi strutture cittadine"
-#: client/repodlgs_common.c:391
+#: client/repodlgs_common.c:394
#, fuzzy, c-format
msgid "Sold %d %s for %d gold."
msgstr "Vendere %s per %d auri?"
-#: client/repodlgs_common.c:396
+#: client/repodlgs_common.c:399
#, fuzzy, c-format
msgid "No %s could be sold."
msgstr "nessuna unità ha potuto essere aggiornata."
#. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:415
+#: client/repodlgs_common.c:418
#, fuzzy
msgid "You cannot disband units."
msgstr "Non potete corrompere %s!"
-#: client/repodlgs_common.c:420
+#: client/repodlgs_common.c:423
#, fuzzy, c-format
msgid "%s cannot be disbanded."
msgstr "* non può essere congedato.\n"
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:444
#, fuzzy, c-format
msgid "Disbanded %d %s."
msgstr "il vostro %s è stato congedato."
-#: client/repodlgs_common.c:445
+#: client/repodlgs_common.c:448
#, fuzzy, c-format
msgid "No %s could be disbanded."
msgstr "nessuna unità ha potuto essere aggiornata."
@@ -10195,47 +10336,47 @@ msgstr "?dys/hrs:%02dg %02dh"
msgid "?duration:overflow"
msgstr "?duration:troppo grande"
-#: client/text.c:1143
+#: client/text.c:1145
#, c-format
msgid "%6d.%02d ms"
msgstr "%6d.%02d ms"
#. TRANS: <nation adjective> <government name>.
#. * E.g. "Polish Republic".
-#: client/text.c:1188
+#: client/text.c:1193
#, fuzzy, c-format
msgid "?nationgovernment:%s %s"
msgstr "Governo: %s"
#. TRANS: "Observer: 1985"
-#: client/text.c:1198
+#: client/text.c:1203
#, fuzzy, c-format
msgid "Observer: %s"
msgstr "Osservatore"
-#: client/text.c:1216
+#: client/text.c:1221
msgid "Buildings: "
msgstr "Strutture: "
-#: client/text.c:1233 client/text.c:1272
+#: client/text.c:1238 client/text.c:1277
msgid "None. "
msgstr "Nessuno. "
-#: client/text.c:1235 client/text.c:1274
+#: client/text.c:1240 client/text.c:1279
msgid "?clistend:."
msgstr "."
-#: client/text.c:1253
+#: client/text.c:1258
msgid "Wonders: "
msgstr "Meraviglie: "
-#: client/text.c:1308
+#: client/text.c:1313
#, 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:1312
+#: client/text.c:1317
#, fuzzy, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
@@ -10243,19 +10384,19 @@ 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:1318
+#: client/text.c:1323
#, fuzzy, c-format
msgid "%d additional unhappy citizen."
msgid_plural "%d additional unhappy citizens."
msgstr[0] "%d cittadini scontenti ulteriori."
msgstr[1] "%d cittadini scontenti ulteriori."
-#: client/text.c:1339
+#: client/text.c:1344
#, fuzzy
msgid "Unlimited martial law in effect."
msgstr "Legge marziale in effetto ("
-#: client/text.c:1341
+#: client/text.c:1346
#, fuzzy, c-format
msgid "%d military unit may impose martial law."
msgid_plural "Up to %d military units may impose martial law."
@@ -10264,7 +10405,7 @@ msgstr[0] ""
msgstr[1] ""
"* Un'unità non militare (non può attaccare o imporre la legge marziale).\n"
-#: client/text.c:1345
+#: client/text.c:1350
#, fuzzy, c-format
msgid "Each military unit makes %d unhappy citizen content."
msgid_plural "Each military unit makes %d unhappy citizens content."
@@ -10275,32 +10416,32 @@ msgstr[1] ""
"Intrattiene i cittadini di una città, rendendo soddisfatti tre cittadini "
"scontenti."
-#: client/text.c:1352
+#: client/text.c:1357
msgid "Military units in the field may cause unhappiness. "
msgstr "Unità militari sul campo possono causare malcontento. "
-#: client/text.c:1355
+#: client/text.c:1360
msgid "Military units have no happiness effect. "
msgstr "Le unità militari non hanno effetti sul malcontento. "
-#: client/text.c:1370
+#: client/text.c:1375
#, c-format
msgid "Luxury: %d total."
msgstr "Lusso: %d totale."
-#: client/tilespec.c:865
+#: client/tilespec.c:882
msgid "No usable default tileset found, aborting!"
msgstr ""
"Non è stata trovata nessuna grafica predefinita utilizzabile, chiusura!"
-#: client/tilespec.c:1338
+#: client/tilespec.c:1355
msgid ""
"Client does not support isometric tilesets. Using default tileset instead."
msgstr ""
"Il client non supporta la grafica isometrica. Uso invece la grafica "
"predefinita."
-#: client/tilespec.c:1347
+#: client/tilespec.c:1364
msgid ""
"Client does not support overhead view tilesets. Using default tileset "
"instead."
@@ -10308,7 +10449,7 @@ msgstr ""
"Il client non supporta la grafica top-down. Uso invece la grafica "
"predefinita."
-#: client/tilespec.c:3966
+#: client/tilespec.c:3987
#, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -10997,7 +11138,7 @@ msgid "_Display"
msgstr "_Mostra"
#: client/gui-gtk-2.0/cityrep.c:1006 client/gui-gtk-2.0/menu.c:839
-#: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
+#: client/gui-sdl/diplodlg.c:692 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
#: client/gui-xaw/cityrep.c:533 client/gui-xaw/menu.c:156
@@ -11173,198 +11314,198 @@ msgstr "Qual'
msgid "Remove this preset?"
msgstr "Elimina questa preselezione?"
-#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:222
+#: client/gui-gtk-2.0/dialogs.c:197 client/gui-gtk-2.0/messagewin.c:222
msgid "Goto _Location"
msgstr "_Vai alla posizione"
-#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
+#: client/gui-gtk-2.0/dialogs.c:202 client/gui-gtk-2.0/messagewin.c:226
#, fuzzy
msgid "Inspect _City"
msgstr "Apri finestra _città"
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:258 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:258 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:259 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:311 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:312 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:312 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:313 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:506
+#: client/gui-gtk-2.0/dialogs.c:507
msgid "Unit"
msgstr "Unità"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:950
-#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2155
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:985
+#: client/gui-gtk-2.0/dialogs.c:508 client/gui-gtk-2.0/pages.c:950
+#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2157
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:987
#: 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:519 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:520 client/gui-sdl/dialogs.c:627
msgid "Unit selection"
msgstr "Scelta unità"
-#: client/gui-gtk-2.0/dialogs.c:582
+#: client/gui-gtk-2.0/dialogs.c:583
msgid "_Ready all"
msgstr "_Sveglia tutti"
-#: client/gui-gtk-2.0/dialogs.c:590
+#: client/gui-gtk-2.0/dialogs.c:591
msgid "_Sentry idle"
msgstr "Inattiva in _sentinella"
-#: client/gui-gtk-2.0/dialogs.c:719
+#: client/gui-gtk-2.0/dialogs.c:721
#, fuzzy
msgid "Nation _Groups:"
msgstr "_Nazioni:"
-#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:766 data/Freeciv.in:3128
msgid "What Nation Will You Be?"
msgstr "Che nazione volete essere?"
-#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
-#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
+#: client/gui-gtk-2.0/dialogs.c:768 client/gui-sdl/chatline.c:842
+#: client/gui-win32/connectdlg.c:1040 data/Freeciv.in:3371
#, fuzzy
msgid "Pick Nation"
msgstr "Centrale di polizia"
-#: client/gui-gtk-2.0/dialogs.c:774
+#: client/gui-gtk-2.0/dialogs.c:776
#, fuzzy
msgid "_Random Nation"
msgstr "Nazioni Unite"
-#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:792 client/gui-win32/dialogs.c:517
msgid "Select a nation"
msgstr "Scegliete una nazione"
-#: client/gui-gtk-2.0/dialogs.c:804
+#: client/gui-gtk-2.0/dialogs.c:810
msgid "_Properties"
msgstr "_Proprietà"
-#: client/gui-gtk-2.0/dialogs.c:824
+#: client/gui-gtk-2.0/dialogs.c:830
msgid "_Leader:"
msgstr "_Capo:"
-#: client/gui-gtk-2.0/dialogs.c:831
+#: client/gui-gtk-2.0/dialogs.c:837
msgid "_Female"
msgstr "_Femmina"
-#: client/gui-gtk-2.0/dialogs.c:836
+#: client/gui-gtk-2.0/dialogs.c:842
msgid "_Male"
msgstr "_Maschio"
-#: client/gui-gtk-2.0/dialogs.c:863
+#: client/gui-gtk-2.0/dialogs.c:869
#, fuzzy
msgid "City _Styles:"
msgstr "Stile delle _città:"
-#: client/gui-gtk-2.0/dialogs.c:902
+#: client/gui-gtk-2.0/dialogs.c:908
#, fuzzy
msgid "_Description"
msgstr "_Leggenda"
-#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1263 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:1253 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1268 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:1262 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1277 client/gui-sdl/dialogs.c:2204
#: 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:1306 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1318 client/gui-win32/citydlg.c:1454
#: data/Freeciv.in:2484
msgid "Upgrade Unit!"
msgstr "Aggiorna unità!"
-#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1327 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 "Aggiorna le unità obsolete"
-#: client/gui-gtk-2.0/diplodlg.c:231 client/gui-win32/diplodlg.c:151
+#: client/gui-gtk-2.0/diplodlg.c:222 client/gui-win32/diplodlg.c:151
#: client/gui-xaw/diplodlg.c:383 client/gui-xaw/diplodlg.c:401
msgid "World-map"
msgstr "Mappa del mondo"
-#: client/gui-gtk-2.0/diplodlg.c:237 client/gui-win32/diplodlg.c:146
+#: client/gui-gtk-2.0/diplodlg.c:228 client/gui-win32/diplodlg.c:146
#: client/gui-xaw/diplodlg.c:387 client/gui-xaw/diplodlg.c:405
msgid "Sea-map"
msgstr "Mappa dei mari"
-#: client/gui-gtk-2.0/diplodlg.c:243
+#: client/gui-gtk-2.0/diplodlg.c:234
msgid "_Maps"
msgstr "_Mappe"
-#: client/gui-gtk-2.0/diplodlg.c:274
+#: client/gui-gtk-2.0/diplodlg.c:265
msgid "_Advances"
msgstr "_Tecnologie"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/diplodlg.c:315 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "_Città"
-#: client/gui-gtk-2.0/diplodlg.c:333
+#: client/gui-gtk-2.0/diplodlg.c:324
msgid "_Give shared vision"
msgstr "Concedi _visione in comune"
-#: client/gui-gtk-2.0/diplodlg.c:346
+#: client/gui-gtk-2.0/diplodlg.c:337
msgid "Give _embassy"
msgstr "Concedi _ambasciata"
-#: client/gui-gtk-2.0/diplodlg.c:376
+#: client/gui-gtk-2.0/diplodlg.c:368
msgid "_Pacts"
msgstr "_Patti"
-#: client/gui-gtk-2.0/diplodlg.c:466
+#: client/gui-gtk-2.0/diplodlg.c:458
#, fuzzy, c-format
msgid "Diplomacy: %s"
msgstr "_Diplomazia"
-#: client/gui-gtk-2.0/diplodlg.c:473
+#: client/gui-gtk-2.0/diplodlg.c:465
msgid "_Cancel meeting"
msgstr "_Cancella incontro"
-#: client/gui-gtk-2.0/diplodlg.c:475
+#: client/gui-gtk-2.0/diplodlg.c:467
msgid "Accept _treaty"
msgstr "Accetta _trattato"
-#: client/gui-gtk-2.0/diplodlg.c:503
+#: client/gui-gtk-2.0/diplodlg.c:495
msgid "C_lauses:"
msgstr "C_lausole:"
-#: client/gui-gtk-2.0/diplodlg.c:568 client/gui-gtk-2.0/diplodlg.c:642
+#: client/gui-gtk-2.0/diplodlg.c:560 client/gui-gtk-2.0/diplodlg.c:634
msgid "_Gold:"
msgstr "_Auri:"
-#: client/gui-gtk-2.0/diplodlg.c:580 client/gui-gtk-2.0/diplodlg.c:654
+#: client/gui-gtk-2.0/diplodlg.c:572 client/gui-gtk-2.0/diplodlg.c:646
msgid "_Add Clause..."
msgstr "_Aggiungi clausola..."
-#: client/gui-gtk-2.0/diplodlg.c:699
+#: client/gui-gtk-2.0/diplodlg.c:691
msgid "--- This treaty is blank. Please add some clauses. ---"
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:905 client/gui-sdl/diplodlg.c:375
+#: client/gui-gtk-2.0/diplodlg.c:897 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 "è stata scelta una quantità di auri non valida."
@@ -11423,99 +11564,99 @@ msgstr "Scegliete una destinazione"
msgid "Show _All Cities"
msgstr "_Mostra tutte le città"
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:164
msgid "Show Map Scrollbars"
msgstr "Mostra barre di scorrimento per la mappa"
-#: client/gui-gtk-2.0/gui_main.c:163
+#: client/gui-gtk-2.0/gui_main.c:165
msgid "Disable this option to hide the scrollbars on the map view."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:169
msgid "Keyboardless goto"
msgstr "\"Vai a\" senza tastiera"
-#: client/gui-gtk-2.0/gui_main.c:168
+#: client/gui-gtk-2.0/gui_main.c:170
msgid ""
"If this option is set then a goto may be initiated by left-clicking and then "
"holding down the mouse button while dragging the mouse onto a different tile."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:173
+#: client/gui-gtk-2.0/gui_main.c:175
msgid "Keep dialogs on top"
msgstr "Mantieni finestre in vista"
-#: client/gui-gtk-2.0/gui_main.c:174
+#: client/gui-gtk-2.0/gui_main.c:176
msgid ""
"If this option is set then dialog windows will always remain in front of the "
"main Freeciv window. Disabling this has no effect in fullscreen mode."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:178
+#: client/gui-gtk-2.0/gui_main.c:180
msgid "Show worklist task icons"
msgstr "Mostra icone compiti della lista lavori"
-#: client/gui-gtk-2.0/gui_main.c:179
+#: client/gui-gtk-2.0/gui_main.c:181
msgid ""
"Disabling this will turn off the unit and building icons in the worklist "
"dialog and the production tab of the city dialog."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:183
+#: client/gui-gtk-2.0/gui_main.c:185
msgid "Enable status report tabs"
msgstr "Abilità i tab nel rapporto sullo stato"
-#: client/gui-gtk-2.0/gui_main.c:184
+#: client/gui-gtk-2.0/gui_main.c:186
msgid ""
"If this option is enabled then report dialogs will be shown as separate tabs "
"rather than in popup dialogs."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:189 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:191 client/gui-win32/gui_main.c:110
msgid "Better fog-of-war drawing"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:190 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:192 client/gui-win32/gui_main.c:111
msgid ""
"If this is enabled then a better method is used for drawing fog-of-war. It "
"is not any slower but will consume about twice as much memory."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:195
+#: client/gui-gtk-2.0/gui_main.c:197
msgid "Show time for each chat message"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:196
+#: client/gui-gtk-2.0/gui_main.c:198
msgid ""
"If this option is enabled then all chat messages will be prefixed by a time "
"string of the form [hour:minute:second]."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:201
+#: client/gui-gtk-2.0/gui_main.c:203
msgid "Split bottom notebook area"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:202
+#: client/gui-gtk-2.0/gui_main.c:204
msgid ""
"Enabling this option will split the bottom notebook into a left and right "
"notebook so that two tabs may be viewed at once."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:207
+#: client/gui-gtk-2.0/gui_main.c:209
msgid "New message events go to top of list"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:208
+#: client/gui-gtk-2.0/gui_main.c:210
msgid ""
"If this option is enabled, new events in the message window will appear at "
"the top of the list, rather than being appended at the bottom."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:213
+#: client/gui-gtk-2.0/gui_main.c:215
msgid "Show extra message window buttons"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:214
+#: client/gui-gtk-2.0/gui_main.c:216
msgid ""
"If this option is enabled, there will be two buttons displayed in the "
"message window for inspecting a city and going to a location. If this option "
@@ -11525,22 +11666,22 @@ msgid ""
"closed and reopened."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:224
+#: client/gui-gtk-2.0/gui_main.c:226
#, fuzzy
msgid "Metaserver tab first in network page"
msgstr "Stringa del soggetto del metaserver impostata a '%s'."
-#: client/gui-gtk-2.0/gui_main.c:225
+#: client/gui-gtk-2.0/gui_main.c:227
msgid ""
"If this option is enabled, the metaserver tab will be the first notebook tab "
"in the network page. This option requires a restart in order to take effect."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:230
+#: client/gui-gtk-2.0/gui_main.c:232
msgid "Plain chat messages are sent to allies only"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:231
+#: client/gui-gtk-2.0/gui_main.c:233
msgid ""
"If this option is enabled, then plain messages typed into the chat entry "
"while the game is running will only be sent to your allies. Otherwise plain "
@@ -11550,28 +11691,41 @@ msgid ""
"visible in multiplayer games)."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:340 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:245
+msgid "Arrange widgets for small displays"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:246
+msgid ""
+"If this option is enabled, widgets in the main window will be arrange so "
+"that they take up the least amount of total screen space. Specifically, the "
+"left panel containing the overview, player status, and the unit information "
+"box will be extended over the entire left side of the window. This option "
+"requires a restart in order to take effect."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:352 client/gui-xaw/gui_main.c:245
msgid ""
"This client has no special command line options\n"
"\n"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
+#: client/gui-gtk-2.0/gui_main.c:847 client/gui-gtk-2.0/gui_main.c:1542
msgid "Freeciv"
msgstr "Freeciv"
-#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
+#: client/gui-gtk-2.0/gui_main.c:1251 client/gui-gtk-2.0/gui_main.c:1258
#: client/gui-sdl/mapctrl.c:1566 client/gui-win32/gui_main.c:482
#: data/Freeciv.in:2618
msgid "Turn Done"
msgstr "Fine Turno"
-#: client/gui-gtk-2.0/gui_main.c:1232 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1258 client/gui-sdl/mapctrl.c:1566
#: client/gui-sdl/mapview.c:1082
msgid "Shift+Return"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1266 client/gui-gtk-2.0/menu.c:797
+#: client/gui-gtk-2.0/gui_main.c:1299 client/gui-gtk-2.0/menu.c:797
#: client/gui-gtk-2.0/menu.c:799 client/gui-gtk-2.0/menu.c:801
#: client/gui-gtk-2.0/menu.c:803 client/gui-gtk-2.0/menu.c:805
#: client/gui-gtk-2.0/menu.c:807 client/gui-gtk-2.0/menu.c:809
@@ -11590,11 +11744,11 @@ msgstr ""
msgid "View"
msgstr "Visualizza"
-#: client/gui-gtk-2.0/gui_main.c:1359
+#: client/gui-gtk-2.0/gui_main.c:1393
msgid "Chat"
msgstr "Chat"
-#: client/gui-gtk-2.0/gui_main.c:1377 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1411 client/gui-win32/gui_main.c:538
#: data/Freeciv.in:2809
msgid ""
"Freeciv is free software and you are welcome to distribute copies of it\n"
@@ -11605,88 +11759,88 @@ msgstr ""
"è benvenuta a certe condizioni; vedete la voce \"Licenza\" nel menù Aiuto.\n"
"Ora... spediteli all'inferno!"
-#: client/gui-gtk-2.0/gui_main.c:1392
+#: client/gui-gtk-2.0/gui_main.c:1426
msgid "Allies Only"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1657
+#: client/gui-gtk-2.0/gui_main.c:1691
msgid "Not _ready"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
+#: client/gui-gtk-2.0/gui_main.c:1702 client/gui-gtk-2.0/pages.c:1679
#, fuzzy
msgid "_Ready"
msgstr "_Sveglia tutti"
-#: client/gui-gtk-2.0/gui_main.c:1672 client/gui-gtk-2.0/gui_main.c:1678
-#: client/gui-gtk-2.0/pages.c:2204
+#: client/gui-gtk-2.0/gui_main.c:1706 client/gui-gtk-2.0/gui_main.c:1712
+#: client/gui-gtk-2.0/pages.c:2206
msgid "_Start"
msgstr "_Inizia"
-#: client/gui-gtk-2.0/gui_main.c:1686
+#: client/gui-gtk-2.0/gui_main.c:1720
#, fuzzy
msgid "_Take Player"
msgstr "Città"
-#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
+#: client/gui-gtk-2.0/gui_main.c:1723 client/gui-gtk-2.0/pages.c:1669
#, fuzzy
msgid "Pick _Nation"
msgstr "Centrale di polizia"
-#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
+#: client/gui-gtk-2.0/gui_main.c:1730 client/gui-gtk-2.0/pages.c:1674
#, fuzzy
msgid "_Observe"
msgstr "Osservatore"
-#: client/gui-gtk-2.0/gui_main.c:1698
+#: client/gui-gtk-2.0/gui_main.c:1732
#, fuzzy
msgid "Do not _observe"
msgstr "%s da ora osserva %s"
-#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1755 client/gui-xaw/pages.c:211
#, fuzzy
msgid "<AI>"
msgstr "IA"
-#: client/gui-gtk-2.0/gui_main.c:1723
+#: client/gui-gtk-2.0/gui_main.c:1758
msgid "<Novice AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1726
+#: client/gui-gtk-2.0/gui_main.c:1761
#, fuzzy
msgid "<Easy AI>"
msgstr "IA"
-#: client/gui-gtk-2.0/gui_main.c:1729
+#: client/gui-gtk-2.0/gui_main.c:1764
msgid "<Normal AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1732
+#: client/gui-gtk-2.0/gui_main.c:1767
#, fuzzy
msgid "<Hard AI>"
msgstr "IA"
-#: client/gui-gtk-2.0/gui_main.c:1742 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1777 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:1808
+#: client/gui-gtk-2.0/gui_main.c:1844 client/gui-gtk-2.0/gui_main.c:1858
#, fuzzy
msgid "Observer"
msgstr "Osservatore"
-#: client/gui-gtk-2.0/gui_main.c:1808
+#: client/gui-gtk-2.0/gui_main.c:1858
#, fuzzy
msgid "Detached"
msgstr "Morto"
-#: client/gui-gtk-2.0/gui_main.c:2073
+#: client/gui-gtk-2.0/gui_main.c:2117
msgid "Are you sure you want to quit?"
msgstr "Sei sicuro di voler terminare?"
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
#, c-format
msgid ""
"Close Tab:\n"
@@ -11695,7 +11849,7 @@ msgstr ""
"Chiudi tabella:\n"
"%s"
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
msgid "Ctrl+W"
msgstr "Ctrl+W"
@@ -11801,8 +11955,8 @@ msgid "Trans. Rslt/Time:"
msgstr "Trasf. Ris/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
-#: client/gui-win32/helpdlg.c:709 client/gui-win32/helpdlg.c:733
+#: client/gui-win32/helpdlg.c:502 client/gui-win32/helpdlg.c:550
+#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:739
#: client/gui-xaw/helpdlg.c:759 client/gui-xaw/helpdlg.c:808
#: client/gui-xaw/helpdlg.c:816 client/gui-xaw/helpdlg.c:853
#: client/gui-xaw/helpdlg.c:878
@@ -11849,34 +12003,34 @@ msgstr "con"
msgid "?techhelp:"
msgstr "?techhelp:"
-#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:591
+#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:597
#: client/gui-xaw/helpdlg.c:996
#, c-format
msgid "+%d Trade / %d"
msgstr "+%d commercio / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:595
+#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:601
#: client/gui-xaw/helpdlg.c:1000
#, c-format
msgid "no extra / %d"
msgstr "nessun bonus / %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
-#: client/gui-win32/helpdlg.c:602 client/gui-win32/helpdlg.c:616
-#: client/gui-win32/helpdlg.c:635 client/gui-xaw/helpdlg.c:1002
+#: client/gui-gtk-2.0/helpdlg.c:1085 client/gui-win32/helpdlg.c:604
+#: client/gui-win32/helpdlg.c:608 client/gui-win32/helpdlg.c:622
+#: client/gui-win32/helpdlg.c:641 client/gui-xaw/helpdlg.c:1002
#: client/gui-xaw/helpdlg.c:1006 client/gui-xaw/helpdlg.c:1020
#: client/gui-xaw/helpdlg.c:1039
msgid "n/a"
msgstr "-"
-#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:605
+#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:611
#: client/gui-xaw/helpdlg.c:1009
#, c-format
msgid "+%d Food / %d"
msgstr "+%d cibo / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:619
+#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:625
#: client/gui-xaw/helpdlg.c:1023
#, c-format
msgid "+%d Res. / %d"
@@ -12658,41 +12812,41 @@ 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:624 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:302
#: 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:779 client/gui-gtk-2.0/pages.c:820
-#: client/gui-win32/connectdlg.c:916
+#: client/gui-win32/connectdlg.c:918
msgid "Server Name"
msgstr "Nome server"
#: client/gui-gtk-2.0/pages.c:780 client/gui-gtk-2.0/pages.c:821
-#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:916
+#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:918
#: data/Freeciv.in:96
msgid "Port"
msgstr "Porta"
#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Version"
msgstr "Versione"
#: client/gui-gtk-2.0/pages.c:782 client/gui-gtk-2.0/pages.c:823
-#: client/gui-gtk-2.0/pages.c:2161 client/gui-win32/connectdlg.c:917
-#: client/gui-win32/connectdlg.c:995
+#: client/gui-gtk-2.0/pages.c:2163 client/gui-win32/connectdlg.c:919
+#: client/gui-win32/connectdlg.c:997
msgid "Status"
msgstr "Stato"
#: client/gui-gtk-2.0/pages.c:783 client/gui-gtk-2.0/pages.c:824
#: client/gui-sdl/connectdlg.c:318 client/gui-sdl/plrdlg.c:330
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Players"
msgstr "Giocatori"
#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
-#: client/gui-win32/connectdlg.c:918
+#: client/gui-win32/connectdlg.c:920
msgid "Comment"
msgstr "Commento"
@@ -12724,9 +12878,9 @@ msgstr "Pass_word:"
msgid "Conf_irm Password:"
msgstr "Conf_erma Password:"
-#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2165
#: 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:1000
+#: client/gui-win32/citydlg.c:1083 client/gui-win32/connectdlg.c:1002
#: client/gui-win32/wldlg.c:800 client/gui-win32/wldlg.c:806
msgid "Type"
msgstr "Tipo"
@@ -12828,7 +12982,7 @@ msgstr "livello _AI:"
msgid "Ruleset _Version:"
msgstr "Capo:"
-#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2195
msgid "_More Game Options..."
msgstr "Ulteriori _opzioni gioco..."
@@ -12847,49 +13001,49 @@ msgstr "Scrittura"
msgid "Ready"
msgstr "Tutti pronti"
-#: client/gui-gtk-2.0/pages.c:1601
+#: client/gui-gtk-2.0/pages.c:1600
#, fuzzy
msgid "?player:Leader"
msgstr "?Player:Nome"
-#: client/gui-gtk-2.0/pages.c:1732 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1734 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:1824
+#: client/gui-gtk-2.0/pages.c:1826
msgid "Choose Saved Game to _Load:"
msgstr "Scegli la partita salvata da _caricare"
-#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
-#: client/gui-gtk-2.0/pages.c:2451
+#: client/gui-gtk-2.0/pages.c:1846 client/gui-gtk-2.0/pages.c:2039
+#: client/gui-gtk-2.0/pages.c:2455
msgid "_Browse..."
msgstr "_Sfoglia..."
-#: client/gui-gtk-2.0/pages.c:1911
+#: client/gui-gtk-2.0/pages.c:1913
msgid "Choose a Scenario"
msgstr "Scegli uno scenario"
-#: client/gui-gtk-2.0/pages.c:1998
+#: client/gui-gtk-2.0/pages.c:2000
msgid "Choose a _Scenario:"
msgstr "Scegli uno _scenario:"
-#: client/gui-gtk-2.0/pages.c:2173
+#: client/gui-gtk-2.0/pages.c:2175
msgid "Choose a _nation to play:"
msgstr "Scegliete la _nazione con cui giocare:"
-#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2367 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:2448 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2452 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "Salva partita"
-#: client/gui-gtk-2.0/pages.c:2489
+#: client/gui-gtk-2.0/pages.c:2493
msgid "Saved _Games:"
msgstr "_Salva partita:"
-#: client/gui-gtk-2.0/pages.c:2516
+#: client/gui-gtk-2.0/pages.c:2520
msgid "Save _Filename:"
msgstr "Salva nome _file:"
@@ -13244,7 +13398,7 @@ msgstr "Chiudi dialogo"
msgid "Total users logged in : %d"
msgstr ""
-#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1098
msgid "Back"
msgstr "Indietro"
@@ -13254,7 +13408,7 @@ msgid "Start"
msgstr "_Inizia"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:777
+#: client/gui-win32/connectdlg.c:779
msgid "Load Game"
msgstr "Carica partita"
@@ -13296,9 +13450,9 @@ msgstr "Rendi citt
#: client/gui-sdl/connectdlg.c:308 client/gui-sdl/connectdlg.c:617
#: client/gui-sdl/connectdlg.c:803 client/gui-sdl/connectdlg.c:985
#: client/gui-sdl/dialogs.c:452 client/gui-sdl/dialogs.c:2095
-#: client/gui-sdl/dialogs.c:2893 client/gui-sdl/diplomat_dialog.c:731
+#: client/gui-sdl/dialogs.c:2902 client/gui-sdl/diplomat_dialog.c:731
#: client/gui-sdl/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1043
#: client/gui-win32/dialogs.c:1772 client/gui-win32/finddlg.c:127
#: client/gui-win32/gotodlg.c:171 client/gui-win32/inputdlg.c:146
#: client/gui-win32/messagedlg.c:216 client/gui-win32/ratesdlg.c:328
@@ -13343,7 +13497,7 @@ msgid "Buy it?"
msgstr "Compra!"
#: 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
+#: client/gui-sdl/diplodlg.c:1336 client/gui-sdl/diplomat_dialog.c:1211
#: client/gui-sdl/diplomat_dialog.c:1417 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:221 client/gui-sdl/repodlgs.c:1559
#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
@@ -13359,7 +13513,7 @@ msgid "No"
msgstr "No"
#: client/gui-sdl/citydlg.c:1215 client/gui-sdl/cma_fe.c:318
-#: client/gui-sdl/diplodlg.c:1345 client/gui-sdl/diplomat_dialog.c:1200
+#: client/gui-sdl/diplodlg.c:1346 client/gui-sdl/diplomat_dialog.c:1200
#: client/gui-sdl/diplomat_dialog.c:1407 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:232 client/gui-win32/repodlgs.c:578
#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
@@ -13693,7 +13847,7 @@ msgstr "Scelta del server per Freeciv"
msgid "Port :"
msgstr "Porta:"
-#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1100
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr "Collega"
@@ -13811,23 +13965,23 @@ msgstr "Il vostro nuovo governo"
msgid "REVOLUTION!"
msgstr "RIVOLUZIONE..."
-#: client/gui-sdl/dialogs.c:2232 client/gui-sdl/dialogs.c:2620
+#: client/gui-sdl/dialogs.c:2237 client/gui-sdl/dialogs.c:2625
#: client/gui-win32/dialogs.c:567 data/Freeciv.in:3159
msgid "Female"
msgstr "Femmina"
-#: client/gui-sdl/dialogs.c:2234 client/gui-sdl/dialogs.c:2618
-#: client/gui-sdl/dialogs.c:2830 client/gui-win32/dialogs.c:565
+#: client/gui-sdl/dialogs.c:2239 client/gui-sdl/dialogs.c:2623
+#: client/gui-sdl/dialogs.c:2839 client/gui-win32/dialogs.c:565
msgid "Male"
msgstr "Maschio"
-#: client/gui-sdl/dialogs.c:2478 client/gui-sdl/dialogs.c:2902
+#: client/gui-sdl/dialogs.c:2483 client/gui-sdl/dialogs.c:2911
#: 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 "OK"
-#: client/gui-sdl/dialogs.c:2685 client/gui-win32/dialogs.c:505
+#: client/gui-sdl/dialogs.c:2694 client/gui-win32/dialogs.c:505
msgid "What nation will you be?"
msgstr "Che nazione volete essere?"
@@ -13856,80 +14010,80 @@ msgstr "Mappa del mondo"
msgid "Sea map"
msgstr "Mappa dei mari"
-#: client/gui-sdl/diplodlg.c:563
+#: client/gui-sdl/diplodlg.c:564
#, fuzzy
msgid "Give embassy"
msgstr "Concedi _ambasciata"
-#: client/gui-sdl/diplodlg.c:579 client/gui-win32/diplodlg.c:614
+#: client/gui-sdl/diplodlg.c:580 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 "Auri (max %d)"
-#: client/gui-sdl/diplodlg.c:613 client/gui-sdl/helpdlg.c:1956
+#: client/gui-sdl/diplodlg.c:614 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 "Tecnologie"
-#: client/gui-sdl/diplodlg.c:831 client/gui-win32/diplodlg.c:598
+#: client/gui-sdl/diplodlg.c:832 client/gui-win32/diplodlg.c:598
#: data/Freeciv.in:269
msgid "Diplomacy meeting"
msgstr "Incontro diplomatico"
-#: client/gui-sdl/diplodlg.c:883 client/gui-win32/diplodlg.c:680
+#: client/gui-sdl/diplodlg.c:884 client/gui-win32/diplodlg.c:680
#: data/Freeciv.in:510
msgid "Cancel meeting"
msgstr "Cancella incontro"
-#: client/gui-sdl/diplodlg.c:895 client/gui-win32/diplodlg.c:679
+#: client/gui-sdl/diplodlg.c:896 client/gui-win32/diplodlg.c:679
#: data/Freeciv.in:501
msgid "Accept treaty"
msgstr "Accetta trattato"
#. TRANS: "Polish incident !" FIXME!!!
-#: client/gui-sdl/diplodlg.c:1304
+#: client/gui-sdl/diplodlg.c:1305
#, fuzzy, c-format
msgid "%s incident !"
msgstr "Scienziati"
-#: client/gui-sdl/diplodlg.c:1322
+#: client/gui-sdl/diplodlg.c:1323
msgid "Shall we declare WAR on them?"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1433
+#: client/gui-sdl/diplodlg.c:1434
#, fuzzy
msgid "Foreign Minister"
msgstr "Primo Ministro"
-#: client/gui-sdl/diplodlg.c:1449
+#: client/gui-sdl/diplodlg.c:1450
#, c-format
msgid ""
"Sir!, the %s ambassador has arrived\n"
"What are your wishes?"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1465
+#: client/gui-sdl/diplodlg.c:1466
msgid "Declare WAR"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1467 client/gui-win32/plrdlg.c:357
+#: client/gui-sdl/diplodlg.c:1468 client/gui-win32/plrdlg.c:357
msgid "Cancel Treaty"
msgstr "Cancella trattato"
-#: client/gui-sdl/diplodlg.c:1490 client/gui-win32/plrdlg.c:358
+#: client/gui-sdl/diplodlg.c:1491 client/gui-win32/plrdlg.c:358
#: data/Freeciv.in:3254
msgid "Withdraw vision"
msgstr "Ritira la visione"
-#: client/gui-sdl/diplodlg.c:1507
+#: client/gui-sdl/diplodlg.c:1508
#, fuzzy
msgid "Call Diplomatic Meeting"
msgstr "Incontro diplomatico"
-#: client/gui-sdl/diplodlg.c:1521
+#: client/gui-sdl/diplodlg.c:1522
msgid "Send him back"
msgstr ""
@@ -14690,12 +14844,12 @@ msgid "Leave Game"
msgstr "Salva partita"
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1100 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1102 client/gui-xaw/menu.c:121
#: data/Freeciv.in:115 data/Freeciv.in:3180
msgid "Quit"
msgstr "Abbandona"
-#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:967
msgid "Start New Game"
msgstr "Inizia nuova partita"
@@ -14822,8 +14976,8 @@ msgstr ""
msgid "%s max rate : %d%%"
msgstr "Tasso massimo per %s: %d%%"
-#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
-#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1085
+#: client/gui-win32/connectdlg.c:1093 data/Freeciv.in:155
msgid "Update"
msgstr "Aggiorna"
@@ -15292,68 +15446,68 @@ msgstr "_Nuova"
msgid "Delete"
msgstr "Elimina"
-#: client/gui-win32/connectdlg.c:147
+#: client/gui-win32/connectdlg.c:149
msgid "Password:"
msgstr "Password:"
-#: client/gui-win32/connectdlg.c:169
+#: client/gui-win32/connectdlg.c:171
msgid "Couldn't load the savegame"
msgstr "Impossibile caricare il file con la partita salvata"
-#: client/gui-win32/connectdlg.c:284 client/gui-xaw/connectdlg.c:311
+#: client/gui-win32/connectdlg.c:286 client/gui-xaw/connectdlg.c:311
msgid "Verify Password"
msgstr "Verifica password"
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:916 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr "Scelta del server per Freeciv"
-#: client/gui-win32/connectdlg.c:915
+#: client/gui-win32/connectdlg.c:917
msgid "Local Area Network"
msgstr "Rete locale"
-#: client/gui-win32/connectdlg.c:949
+#: client/gui-win32/connectdlg.c:951
msgid "Welcome to Freeciv"
msgstr "Benvenuto a Freeciv"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Load Saved Game"
msgstr "Carica partita salvata"
-#: client/gui-win32/connectdlg.c:969
+#: client/gui-win32/connectdlg.c:971
msgid "Connect To Network Game"
msgstr "Connessione a una partita in rete"
-#: client/gui-win32/connectdlg.c:979
+#: client/gui-win32/connectdlg.c:981
msgid "Choose a nation to play"
msgstr "Scegli una nazione con cui giocare"
-#: client/gui-win32/connectdlg.c:1014
+#: client/gui-win32/connectdlg.c:1016
msgid "Number of players (Including AI):"
msgstr "Numero di giocatori (incluse le IA):"
-#: client/gui-win32/connectdlg.c:1022
+#: client/gui-win32/connectdlg.c:1024
msgid "AI skill level:"
msgstr "livello AI:"
-#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1038 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr "Opzioni gioco"
-#: client/gui-win32/connectdlg.c:1040
+#: client/gui-win32/connectdlg.c:1042
#, fuzzy
msgid "Start Game"
msgstr "Inizia nuova partita"
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Login:"
msgstr "Ingresso:"
-#: client/gui-win32/connectdlg.c:1061
+#: client/gui-win32/connectdlg.c:1063
msgid "Host:"
msgstr "Server:"
-#: client/gui-win32/connectdlg.c:1062
+#: client/gui-win32/connectdlg.c:1064
msgid "Port:"
msgstr "Porta:"
@@ -15433,21 +15587,21 @@ msgid ""
"this is much slower."
msgstr ""
-#: client/gui-win32/helpdlg.c:769 client/gui-win32/helpdlg.c:792
-#: client/gui-win32/helpdlg.c:803 client/gui-win32/helpdlg.c:809
-#: client/gui-win32/helpdlg.c:822
+#: client/gui-win32/helpdlg.c:775 client/gui-win32/helpdlg.c:798
+#: client/gui-win32/helpdlg.c:809 client/gui-win32/helpdlg.c:815
+#: client/gui-win32/helpdlg.c:828
msgid "Allows "
msgstr "Permette "
-#: client/gui-win32/helpdlg.c:780
+#: client/gui-win32/helpdlg.c:786
msgid "Obsoletes "
msgstr "Rende obsoleto "
-#: client/gui-win32/helpdlg.c:812 client/gui-win32/helpdlg.c:825
+#: client/gui-win32/helpdlg.c:818 client/gui-win32/helpdlg.c:831
msgid " (with "
msgstr " (con "
-#: client/gui-win32/helpdlg.c:815 client/gui-win32/helpdlg.c:828
+#: client/gui-win32/helpdlg.c:821 client/gui-win32/helpdlg.c:834
msgid "?techhelp:)."
msgstr "?techhelp:)."
@@ -16565,7 +16719,7 @@ 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/"
+" https://gna.org/projects/freeciv/"
msgstr ""
"Se trovate un bug, per favore segnalatelo. Il modo migliore per farlo è "
"visitando il Freeciv Bug Tracking System, a:\n"
@@ -18941,6 +19095,7 @@ msgid "Hydro Plant"
msgstr "Centrale Idrica"
#: data/default/buildings.ruleset:378
+#, fuzzy
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 "
@@ -18948,9 +19103,7 @@ msgid ""
"a Factory, Mfg. Plant and Hydro Plant together give a 150% production "
"bonus.\n"
"\n"
-"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant. A city "
-"can only build a Hydro Plant if it is next to (or on) a Mountain or River "
-"tile."
+"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant."
msgstr ""
"Riduce l'inquinamento creato dalla produzione di una città del 50%. Inoltre "
"aumenta la produzione di risorse di una Fabbrica o di una Manifattura in una "
@@ -18959,36 +19112,35 @@ msgstr ""
"un aumento del 150%.\n"
"\n"
"Una città può avere solo una Centrale Idrica, una Centrale Elettrica o una "
-"Centrale Nucleare e può costruire una Centrale Idrica solo se si trova "
-"vicino o dentro un quadrante Montagna o Fiume."
+"Centrale Nucleare."
-#: data/default/buildings.ruleset:397 data/civ2/buildings.ruleset:373
+#: data/default/buildings.ruleset:396 data/civ2/buildings.ruleset:373
#: data/civ1/buildings.ruleset:297
msgid "Library"
msgstr "Biblioteca"
-#: data/default/buildings.ruleset:412
+#: data/default/buildings.ruleset:411
#, no-c-format
msgid "Increases the science output in a city by 100%."
msgstr "Aumenta l'apporto di scienza in una città del 100%."
-#: data/default/buildings.ruleset:417 data/civ2/buildings.ruleset:393
+#: data/default/buildings.ruleset:416 data/civ2/buildings.ruleset:393
#: data/civ1/buildings.ruleset:317
msgid "Marketplace"
msgstr "Mercato"
-#: data/default/buildings.ruleset:432 data/civ2/buildings.ruleset:408
+#: data/default/buildings.ruleset:431 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 "Aumenta l'apporto di lusso e imposte di una città del 50%."
-#: data/default/buildings.ruleset:437 data/civ2/buildings.ruleset:413
+#: data/default/buildings.ruleset:436 data/civ2/buildings.ruleset:413
#: data/civ1/buildings.ruleset:337
msgid "Mass Transit"
msgstr "Trasporto di massa"
-#: data/default/buildings.ruleset:451 data/civ2/buildings.ruleset:427
+#: data/default/buildings.ruleset:450 data/civ2/buildings.ruleset:427
#: data/civ1/buildings.ruleset:351
msgid ""
"Neutralizes the pollution generated by the population. The population "
@@ -18997,12 +19149,12 @@ msgstr ""
"Elimina l'inquinamento creato dalla popolazione, la quale semplicemente non "
"ha più effetto sull'inquinamento creato nella città."
-#: data/default/buildings.ruleset:458 data/civ2/buildings.ruleset:434
+#: data/default/buildings.ruleset:457 data/civ2/buildings.ruleset:434
#: data/civ1/buildings.ruleset:358
msgid "Mfg. Plant"
msgstr "Manifattura"
-#: data/default/buildings.ruleset:474 data/civ2/buildings.ruleset:450
+#: data/default/buildings.ruleset:473 data/civ2/buildings.ruleset:450
#: data/civ1/buildings.ruleset:374
#, no-c-format
msgid ""
@@ -19012,12 +19164,12 @@ msgstr ""
"Insieme ad una Fabbrica la Manifattura aumenta la produzione di risorse di "
"una città del 100%."
-#: data/default/buildings.ruleset:480 data/civ2/buildings.ruleset:456
+#: data/default/buildings.ruleset:479 data/civ2/buildings.ruleset:456
#: data/civ1/buildings.ruleset:380
msgid "Nuclear Plant"
msgstr "Centrale Nucleare"
-#: data/default/buildings.ruleset:495
+#: data/default/buildings.ruleset:494
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 "
@@ -19036,11 +19188,11 @@ msgstr ""
"Una città può avere solo una Centrale Idrica, una Centrale Elettrica o una "
"Centrale Nucleare."
-#: data/default/buildings.ruleset:515 data/civ2/buildings.ruleset:489
+#: data/default/buildings.ruleset:514 data/civ2/buildings.ruleset:489
msgid "Offshore Platform"
msgstr "Piattaforma Petrolifera"
-#: data/default/buildings.ruleset:530 data/civ2/buildings.ruleset:504
+#: data/default/buildings.ruleset:529 data/civ2/buildings.ruleset:504
msgid ""
"Adds 1 extra shield resource on all Ocean squares in a city. The city needs "
"to be coastal to build this improvement."
@@ -19049,12 +19201,12 @@ msgstr ""
"città, la quale deve essere costiera per poter costruire questa struttura "
"cittadina."
-#: data/default/buildings.ruleset:536 data/civ2/buildings.ruleset:510
+#: data/default/buildings.ruleset:535 data/civ2/buildings.ruleset:510
#: data/civ1/buildings.ruleset:411
msgid "Palace"
msgstr "Palazzo"
-#: data/default/buildings.ruleset:552
+#: data/default/buildings.ruleset:551
#, fuzzy, no-c-format
msgid ""
"Makes a city the capital and the center of your government. Corruption in "
@@ -19080,11 +19232,11 @@ msgstr ""
"di una guerra civile nel vostro impero. Perdere il vostro palazzo comporta "
"anche la perdità della vostra eventuale astronave (anche in costruzione)."
-#: data/default/buildings.ruleset:569 data/civ2/buildings.ruleset:539
+#: data/default/buildings.ruleset:568 data/civ2/buildings.ruleset:539
msgid "Police Station"
msgstr "Centrale di polizia"
-#: data/default/buildings.ruleset:583 data/civ2/buildings.ruleset:553
+#: data/default/buildings.ruleset:582 data/civ2/buildings.ruleset:553
msgid ""
"Reduces the unhappiness caused by military units outside the city by 2 under "
"Democracy and 1 under Republic. This improvement has no effect under other "
@@ -19094,11 +19246,11 @@ msgstr ""
"della città di 2 in Democrazia e di 1 in Repubblica. Questa struttura "
"cittadina non ha alcun effetto sotto altri tipi di governo."
-#: data/default/buildings.ruleset:593 data/civ2/buildings.ruleset:560
+#: data/default/buildings.ruleset:592 data/civ2/buildings.ruleset:560
msgid "Port Facility"
msgstr "Porto"
-#: data/default/buildings.ruleset:608 data/civ2/buildings.ruleset:575
+#: data/default/buildings.ruleset:607 data/civ2/buildings.ruleset:575
msgid ""
"Allows a city to build veteran sea units. Also, damaged sea units which "
"stay in town for one full turn without moving are completely restored."
@@ -19107,12 +19259,12 @@ msgstr ""
"marine danneggiate che sostano in città per un turno vengono riparate "
"completamente."
-#: data/default/buildings.ruleset:615 data/civ2/buildings.ruleset:582
+#: data/default/buildings.ruleset:614 data/civ2/buildings.ruleset:582
#: data/civ1/buildings.ruleset:440
msgid "Power Plant"
msgstr "Centrale Elettrica"
-#: data/default/buildings.ruleset:631
+#: data/default/buildings.ruleset:630
#, no-c-format
msgid ""
"Increases the shield production of a Factory or Mfg. Plant in a city: a "
@@ -19131,12 +19283,12 @@ msgstr ""
"Una città può avere solo una Centrale Idrica, una Centrale Elettrica o una "
"Centrale Nucleare."
-#: data/default/buildings.ruleset:646 data/civ2/buildings.ruleset:610
+#: data/default/buildings.ruleset:645 data/civ2/buildings.ruleset:610
#: data/civ1/buildings.ruleset:468
msgid "Recycling Center"
msgstr "Centro di Riciclaggio"
-#: data/default/buildings.ruleset:661 data/civ2/buildings.ruleset:625
+#: data/default/buildings.ruleset:660 data/civ2/buildings.ruleset:625
#: data/civ1/buildings.ruleset:483
#, no-c-format
msgid ""
@@ -19146,11 +19298,11 @@ msgstr ""
"Costruire un centro di riciclaggio riduce del 66% la quantità di "
"inquinamento generato a causa della produzione nella città"
-#: data/default/buildings.ruleset:667 data/civ2/buildings.ruleset:631
+#: data/default/buildings.ruleset:666 data/civ2/buildings.ruleset:631
msgid "Research Lab"
msgstr "Laboratorio di Ricerca"
-#: data/default/buildings.ruleset:682
+#: data/default/buildings.ruleset:681
msgid ""
"Together with a Library, a Research Lab increases the science production of "
"a city by 200%. Together with a Library and a University, a Research Lab "
@@ -19161,11 +19313,11 @@ msgstr ""
"un laboratorio di ricerca incrementa la produzione di scienza di una città "
"del 450%."
-#: data/default/buildings.ruleset:690 data/civ2/buildings.ruleset:654
+#: data/default/buildings.ruleset:689 data/civ2/buildings.ruleset:654
msgid "SAM Battery"
msgstr "Batteria missili SAM"
-#: data/default/buildings.ruleset:704 data/civ2/buildings.ruleset:668
+#: data/default/buildings.ruleset:703 data/civ2/buildings.ruleset:668
msgid ""
"Doubles the defense of all units inside the city when attacked by non-"
"nuclear air units."
@@ -19173,12 +19325,12 @@ msgstr ""
"Raddoppia la difesa di tutte le unità dentro una città quando questa viene "
"attaccata da unità aeree non nucleari."
-#: data/default/buildings.ruleset:710 data/civ2/buildings.ruleset:674
+#: data/default/buildings.ruleset:709 data/civ2/buildings.ruleset:674
#: data/civ1/buildings.ruleset:489
msgid "SDI Defense"
msgstr "Difesa SDI"
-#: data/default/buildings.ruleset:724 data/civ2/buildings.ruleset:688
+#: data/default/buildings.ruleset:723 data/civ2/buildings.ruleset:688
#: data/civ1/buildings.ruleset:503
msgid ""
"Protects a city from attacks from Nuclear units. Nuclear attacks simply "
@@ -19189,11 +19341,11 @@ msgstr ""
"semplicemente non hanno effetto sulla città. Inoltre raddoppia la difesa "
"contro attacchi di missili non nucleari."
-#: data/default/buildings.ruleset:733 data/civ2/buildings.ruleset:697
+#: data/default/buildings.ruleset:732 data/civ2/buildings.ruleset:697
msgid "Sewer System"
msgstr "Sistema Fognario"
-#: data/default/buildings.ruleset:748 data/civ2/buildings.ruleset:712
+#: data/default/buildings.ruleset:747 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."
@@ -19201,12 +19353,12 @@ msgstr ""
"Permette ad una città di crescere oltre la dimensione 12. Un Acquedotto è "
"richiesto prima perché una città cresca oltre la dimensione 8."
-#: data/default/buildings.ruleset:754 data/civ2/buildings.ruleset:749
+#: data/default/buildings.ruleset:753 data/civ2/buildings.ruleset:749
#: data/civ1/buildings.ruleset:512
msgid "Space Component"
msgstr "Componente Astronave"
-#: data/default/buildings.ruleset:769 data/civ2/buildings.ruleset:763
+#: data/default/buildings.ruleset:768 data/civ2/buildings.ruleset:763
#: data/civ1/buildings.ruleset:526
msgid ""
"Space Components can be differentiated into Propulsion and Fuel Components. "
@@ -19223,12 +19375,12 @@ msgstr ""
"Almeno un giocatore deve essere riuscito a costruire la meraviglia Programma "
"Apollo prima di poter costruire le parti di astronave."
-#: data/default/buildings.ruleset:779 data/civ2/buildings.ruleset:773
+#: data/default/buildings.ruleset:778 data/civ2/buildings.ruleset:773
#: data/civ1/buildings.ruleset:536
msgid "Space Module"
msgstr "Modulo Astronave"
-#: data/default/buildings.ruleset:794 data/civ2/buildings.ruleset:787
+#: data/default/buildings.ruleset:793 data/civ2/buildings.ruleset:787
#: data/civ1/buildings.ruleset:550
msgid ""
"Space Modules are the most expensive parts of spaceships. There are three "
@@ -19263,12 +19415,12 @@ msgstr ""
"Almeno un giocatore deve essere riuscito a costruire la meraviglia Programma "
"Apollo prima di poter costruire le parti dell'astronave."
-#: data/default/buildings.ruleset:813 data/civ2/buildings.ruleset:806
+#: data/default/buildings.ruleset:812 data/civ2/buildings.ruleset:806
#: data/civ1/buildings.ruleset:569
msgid "Space Structural"
msgstr "Strutturale Astronave"
-#: data/default/buildings.ruleset:828 data/civ2/buildings.ruleset:820
+#: data/default/buildings.ruleset:827 data/civ2/buildings.ruleset:820
#: data/civ1/buildings.ruleset:583
msgid ""
"Space Structurals form the base of your spaceship. All other spaceship "
@@ -19285,11 +19437,11 @@ msgstr ""
"Prima di poter costruire pezzi di astronave, la meraviglia Programma Apollo "
"deve essere stata costruita da un qualsiasi giocatore."
-#: data/default/buildings.ruleset:838 data/civ2/buildings.ruleset:830
+#: data/default/buildings.ruleset:837 data/civ2/buildings.ruleset:830
msgid "Stock Exchange"
msgstr "Borsa Valori"
-#: data/default/buildings.ruleset:854 data/civ2/buildings.ruleset:846
+#: data/default/buildings.ruleset:853 data/civ2/buildings.ruleset:846
#, no-c-format
msgid ""
"Together with a Marketplace and a Bank, a Stock Exchange boosts tax and "
@@ -19298,11 +19450,11 @@ msgstr ""
"Insieme ad un Mercato e ad una Banca, la Borsa Valori aumenta le imposte e "
"la produzione di lusso del 50% in una città."
-#: data/default/buildings.ruleset:860 data/civ2/buildings.ruleset:852
+#: data/default/buildings.ruleset:859 data/civ2/buildings.ruleset:852
msgid "Super Highways"
msgstr "Autostrada"
-#: data/default/buildings.ruleset:875 data/civ2/buildings.ruleset:867
+#: data/default/buildings.ruleset:874 data/civ2/buildings.ruleset:867
#, no-c-format
msgid ""
"Increases trade resources by 50% on all squares with roads or railroads."
@@ -19310,11 +19462,11 @@ msgstr ""
"Aumenta le risorse di commercio del 50% su tutti i quadranti con strade o "
"ferrovie."
-#: data/default/buildings.ruleset:883 data/civ2/buildings.ruleset:873
+#: data/default/buildings.ruleset:882 data/civ2/buildings.ruleset:873
msgid "Supermarket"
msgstr "Supermercato"
-#: data/default/buildings.ruleset:898 data/civ2/buildings.ruleset:888
+#: data/default/buildings.ruleset:897 data/civ2/buildings.ruleset:888
#, no-c-format
msgid ""
"Increases the food resources by 50% on each farmland square which is being "
@@ -19325,12 +19477,12 @@ msgstr ""
"intorno alla città. I quadranti con le fattorie sono quelli che sono stati "
"irrigati una seconda volta."
-#: data/default/buildings.ruleset:905 data/civ2/buildings.ruleset:895
+#: data/default/buildings.ruleset:904 data/civ2/buildings.ruleset:895
#: data/civ1/buildings.ruleset:593
msgid "Temple"
msgstr "Tempio"
-#: data/default/buildings.ruleset:919 data/civ2/buildings.ruleset:909
+#: data/default/buildings.ruleset:918 data/civ2/buildings.ruleset:909
#: data/civ1/buildings.ruleset:607
msgid ""
"Makes one unhappy citizen content. Both the Mysticism advance and the "
@@ -19341,13 +19493,13 @@ msgstr ""
"raddoppiano quest'effetto; con queste due meraviglie insieme vengono resi "
"soddisfatti quattro cittadini."
-#: data/default/buildings.ruleset:926 data/civ2/buildings.ruleset:916
+#: data/default/buildings.ruleset:925 data/civ2/buildings.ruleset:916
#: data/civ1/buildings.ruleset:614 data/default/techs.ruleset:742
#: data/civ2/techs.ruleset:727 data/civ1/techs.ruleset:723
msgid "University"
msgstr "Università"
-#: data/default/buildings.ruleset:942
+#: data/default/buildings.ruleset:941
#, no-c-format
msgid ""
"Together with a Library, a University increases the science production of a "
@@ -19356,12 +19508,12 @@ msgstr ""
"Insieme ad una Biblioteca, l'Università aumenta la produzione scientifica di "
"una città del 250%."
-#: data/default/buildings.ruleset:948 data/civ2/buildings.ruleset:938
+#: data/default/buildings.ruleset:947 data/civ2/buildings.ruleset:938
#: data/civ1/buildings.ruleset:636
msgid "Apollo Program"
msgstr "Programma Apollo"
-#: data/default/buildings.ruleset:962 data/civ2/buildings.ruleset:952
+#: data/default/buildings.ruleset:961 data/civ2/buildings.ruleset:952
msgid ""
"Entire map becomes visible for the player who owns it. It allows all "
"players to start building spaceship parts (assuming they have researched the "
@@ -19371,11 +19523,11 @@ msgstr ""
"inoltre a tutti i giocatori di cominciare a costruire le parti di astronave, "
"solo nel caso in cui abbiano già raggiunto tutte le tecnologie necessarie."
-#: data/default/buildings.ruleset:969 data/civ2/buildings.ruleset:959
+#: data/default/buildings.ruleset:968 data/civ2/buildings.ruleset:959
msgid "A.Smith's Trading Co."
msgstr "Soc. Commerciale di Adam Smith"
-#: data/default/buildings.ruleset:983
+#: data/default/buildings.ruleset:982
msgid ""
"City improvements which would normally have an upkeep of 1 are free of "
"upkeep, for all your cities."
@@ -19383,12 +19535,12 @@ msgstr ""
"Le strutture cittadine che hanno costo di mantenimento pari a 1 auro "
"diventano gratuite per tutte le città."
-#: data/default/buildings.ruleset:989 data/civ2/buildings.ruleset:979
+#: data/default/buildings.ruleset:988 data/civ2/buildings.ruleset:979
#: data/civ1/buildings.ruleset:655
msgid "Colossus"
msgstr "Colosso"
-#: data/default/buildings.ruleset:1003 data/civ2/buildings.ruleset:993
+#: data/default/buildings.ruleset:1002 data/civ2/buildings.ruleset:993
#: data/civ1/buildings.ruleset:669
msgid ""
"Each square around the city where this wonder is built that is already "
@@ -19397,24 +19549,24 @@ msgstr ""
"Ogni quadrante intorno alla città con questa meraviglia che genera già del "
"commercio aumenta di uno la sua produzione."
-#: data/default/buildings.ruleset:1009 data/civ2/buildings.ruleset:999
+#: data/default/buildings.ruleset:1008 data/civ2/buildings.ruleset:999
#: data/civ1/buildings.ruleset:675
msgid "Copernicus' Observatory"
msgstr "Osservatorio di Copernico"
-#: data/default/buildings.ruleset:1024 data/civ2/buildings.ruleset:1180
+#: data/default/buildings.ruleset:1023 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 ""
"Aumenta del 100% la produzione scientifica nella città dove viene costruito."
-#: data/default/buildings.ruleset:1029 data/civ2/buildings.ruleset:1019
+#: data/default/buildings.ruleset:1028 data/civ2/buildings.ruleset:1019
#: data/civ1/buildings.ruleset:695
msgid "Cure For Cancer"
msgstr "Cura per il Cancro"
-#: data/default/buildings.ruleset:1043
+#: data/default/buildings.ruleset:1042
msgid ""
"This stunning technological achievement makes one unhappy citizen content in "
"all your cities."
@@ -19422,12 +19574,12 @@ msgstr ""
"Questo incredibile obiettivo tecnologico rende soddisfatto un cittadino "
"scontento in ogni città."
-#: data/default/buildings.ruleset:1051 data/civ2/buildings.ruleset:1039
+#: data/default/buildings.ruleset:1050 data/civ2/buildings.ruleset:1039
#: data/civ1/buildings.ruleset:715
msgid "Darwin's Voyage"
msgstr "Viaggio di Darwin"
-#: data/default/buildings.ruleset:1065 data/civ2/buildings.ruleset:1053
+#: data/default/buildings.ruleset:1064 data/civ2/buildings.ruleset:1053
#: data/civ1/buildings.ruleset:729
msgid ""
"Charles Darwin's voyage sparked the discovery of the evolution of the "
@@ -19438,11 +19590,11 @@ msgstr ""
"specie, la quale stimolò una maggiore conoscenza nella scienza. Garantisce "
"la scoperta immediata di due nuove tecnologie."
-#: data/default/buildings.ruleset:1072 data/civ2/buildings.ruleset:1060
+#: data/default/buildings.ruleset:1071 data/civ2/buildings.ruleset:1060
msgid "Eiffel Tower"
msgstr "Torre Eiffel"
-#: data/default/buildings.ruleset:1087
+#: data/default/buildings.ruleset:1086
#, fuzzy, no-c-format
msgid ""
"Your reputation and goodwill among other nations is recovered twice as fast."
@@ -19451,12 +19603,12 @@ msgstr ""
"mentre sei in possesso di questa meraviglia. La reputazione è recuperata al "
"doppio della velocità normale."
-#: data/default/buildings.ruleset:1093 data/civ2/buildings.ruleset:1081
+#: data/default/buildings.ruleset:1092 data/civ2/buildings.ruleset:1081
#: data/civ1/buildings.ruleset:736
msgid "Great Library"
msgstr "Grande Biblioteca"
-#: data/default/buildings.ruleset:1107 data/civ2/buildings.ruleset:1095
+#: data/default/buildings.ruleset:1106 data/civ2/buildings.ruleset:1095
#: data/civ1/buildings.ruleset:750
msgid ""
"The civilization which builds the Great Library gets every advance that at "
@@ -19465,21 +19617,21 @@ msgstr ""
"La civiltà che costruisce la Grande Biblioteca ottiene ogni tecnologia "
"raggiunta da almeno altre due civiltà."
-#: data/default/buildings.ruleset:1113 data/civ2/buildings.ruleset:1101
+#: data/default/buildings.ruleset:1112 data/civ2/buildings.ruleset:1101
#: data/civ1/buildings.ruleset:756
msgid "Great Wall"
msgstr "Grande Muraglia"
-#: data/default/buildings.ruleset:1127
+#: data/default/buildings.ruleset:1126
msgid "Works as a City Wall in all your cities."
msgstr "Vale come avere una Cinta Muraria in ogni città."
-#: data/default/buildings.ruleset:1135 data/civ2/buildings.ruleset:1122
+#: data/default/buildings.ruleset:1134 data/civ2/buildings.ruleset:1122
#: data/civ1/buildings.ruleset:777
msgid "Hanging Gardens"
msgstr "Giardini Pensili"
-#: data/default/buildings.ruleset:1149 data/civ2/buildings.ruleset:1136
+#: data/default/buildings.ruleset:1148 data/civ2/buildings.ruleset:1136
#: data/civ1/buildings.ruleset:791
msgid ""
"Makes one content citizen happy in every city. Makes two extra content "
@@ -19494,12 +19646,12 @@ msgstr ""
"soddisfatti per godere degli effetti dei Giardini Pensili, la meraviglia ha "
"effetto sui cittadini scontenti rendendoli soddisfatti."
-#: data/default/buildings.ruleset:1158 data/civ2/buildings.ruleset:1145
+#: data/default/buildings.ruleset:1157 data/civ2/buildings.ruleset:1145
#: data/civ1/buildings.ruleset:800
msgid "Hoover Dam"
msgstr "Diga di Hoover"
-#: data/default/buildings.ruleset:1173 data/civ2/buildings.ruleset:1159
+#: data/default/buildings.ruleset:1172 data/civ2/buildings.ruleset:1159
msgid ""
"Works as if you had a Hydro Plant in every city. (This reduces pollution "
"and increases the effects of Factories and Mfg. Plants.)"
@@ -19507,12 +19659,12 @@ msgstr ""
"Vale come avere una Centrale Idrica in ogni città, il che riduce "
"l'inquinamento e aumenta gli effetti delle Fabbriche e delle Manifatture."
-#: data/default/buildings.ruleset:1179 data/civ2/buildings.ruleset:1165
+#: data/default/buildings.ruleset:1178 data/civ2/buildings.ruleset:1165
#: data/civ1/buildings.ruleset:822
msgid "Isaac Newton's College"
msgstr "College di Isaac Newton"
-#: data/default/buildings.ruleset:1194
+#: data/default/buildings.ruleset:1193
#, no-c-format
msgid ""
"Boosts science production by 100% in every city you control that has a "
@@ -19521,20 +19673,20 @@ msgstr ""
"Aumenta del 100% la produzione scientifica in ogni città che controlli che "
"ha un'università."
-#: data/default/buildings.ruleset:1200 data/civ2/buildings.ruleset:1185
+#: data/default/buildings.ruleset:1199 data/civ2/buildings.ruleset:1185
#: data/civ1/buildings.ruleset:842
msgid "J.S. Bach's Cathedral"
msgstr "Cattedrale di J.S. Bach"
-#: data/default/buildings.ruleset:1214 data/civ2/buildings.ruleset:1199
+#: data/default/buildings.ruleset:1213 data/civ2/buildings.ruleset:1199
msgid "Makes two unhappy citizens content in every city."
msgstr "Rende soddisfatti due cittadini scontenti in ogni città."
-#: data/default/buildings.ruleset:1219 data/civ2/buildings.ruleset:1204
+#: data/default/buildings.ruleset:1218 data/civ2/buildings.ruleset:1204
msgid "King Richard's Crusade"
msgstr "Crociata di Re Riccardo"
-#: data/default/buildings.ruleset:1233 data/civ2/buildings.ruleset:1218
+#: data/default/buildings.ruleset:1232 data/civ2/buildings.ruleset:1218
msgid ""
"Adds one extra shield resource on every square around the city where it is "
"built."
@@ -19542,20 +19694,20 @@ msgstr ""
"Aggiunge una risorsa di produzione extra a ogni quadrante della città dove "
"viene costruita."
-#: data/default/buildings.ruleset:1239 data/civ2/buildings.ruleset:1224
+#: data/default/buildings.ruleset:1238 data/civ2/buildings.ruleset:1224
msgid "Leonardo's Workshop"
msgstr "Laboratorio di Leonardo"
-#: data/default/buildings.ruleset:1253 data/civ2/buildings.ruleset:1238
+#: data/default/buildings.ruleset:1252 data/civ2/buildings.ruleset:1238
msgid "Upgrades one obsolete unit per game turn."
msgstr "Migliora una unità obsoleta per turno."
-#: data/default/buildings.ruleset:1258 data/civ2/buildings.ruleset:1243
+#: data/default/buildings.ruleset:1257 data/civ2/buildings.ruleset:1243
#: data/civ1/buildings.ruleset:862
msgid "Lighthouse"
msgstr "Faro"
-#: data/default/buildings.ruleset:1273
+#: data/default/buildings.ruleset:1272
msgid ""
"Gives all your sea units 1 additional movement point and eliminates the risk "
"of losing Triremes on the high seas. Makes all your new sea units veterans "
@@ -19565,36 +19717,36 @@ msgstr ""
"rischio di perdere le Triremi in alto mare. Rende veterane tutte le nuove "
"unità marine (per tutte le tue città)."
-#: data/default/buildings.ruleset:1280 data/civ2/buildings.ruleset:1264
+#: data/default/buildings.ruleset:1279 data/civ2/buildings.ruleset:1264
#: data/civ1/buildings.ruleset:885
msgid "Magellan's Expedition"
msgstr "Spedizione di Magellano"
-#: data/default/buildings.ruleset:1295
+#: data/default/buildings.ruleset:1294
msgid "Gives all your sea units 2 additional movement points."
msgstr "Dà a tutte le unità marine 2 movimenti aggiuntivi per turno."
-#: data/default/buildings.ruleset:1300 data/civ2/buildings.ruleset:1283
+#: data/default/buildings.ruleset:1299 data/civ2/buildings.ruleset:1283
#: data/civ1/buildings.ruleset:904
msgid "Manhattan Project"
msgstr "Progetto Manhattan"
-#: data/default/buildings.ruleset:1318 data/civ2/buildings.ruleset:1301
+#: data/default/buildings.ruleset:1317 data/civ2/buildings.ruleset:1301
msgid "Marco Polo's Embassy"
msgstr "Ambasciata di Marco Polo"
-#: data/default/buildings.ruleset:1332 data/civ2/buildings.ruleset:1315
+#: data/default/buildings.ruleset:1331 data/civ2/buildings.ruleset:1315
msgid "The player who owns it gets an embassy with all players."
msgstr ""
"Il giocatore che la possiede ottiene un'ambasciata con tutti gli altri "
"giocatori."
-#: data/default/buildings.ruleset:1337 data/civ2/buildings.ruleset:1320
+#: data/default/buildings.ruleset:1336 data/civ2/buildings.ruleset:1320
#: data/civ1/buildings.ruleset:922
msgid "Michelangelo's Chapel"
msgstr "Cappella di Michelangelo"
-#: data/default/buildings.ruleset:1351 data/civ2/buildings.ruleset:1334
+#: data/default/buildings.ruleset:1350 data/civ2/buildings.ruleset:1334
msgid ""
"Counts as having a Cathedral in each of your cities. This makes 3 unhappy "
"citizens content in each city. The discovery of Theology increases the "
@@ -19608,21 +19760,21 @@ msgstr ""
"scoperta del Comunismo attenua l'effetto di una Cattedrale, riducendo di uno "
"il numero dei cittadini resi soddisfatti."
-#: data/default/buildings.ruleset:1361 data/civ2/buildings.ruleset:1344
+#: data/default/buildings.ruleset:1360 data/civ2/buildings.ruleset:1344
#: data/civ1/buildings.ruleset:941
msgid "Oracle"
msgstr "Oracolo"
-#: data/default/buildings.ruleset:1375
+#: data/default/buildings.ruleset:1374
msgid "Makes two of your unhappy citizens content in every city with a temple."
msgstr "Rende soddisfatti due cittadini scontenti in ogni città con un tempio."
-#: data/default/buildings.ruleset:1380 data/civ2/buildings.ruleset:1363
+#: data/default/buildings.ruleset:1379 data/civ2/buildings.ruleset:1363
#: data/civ1/buildings.ruleset:960
msgid "Pyramids"
msgstr "Piramidi"
-#: data/default/buildings.ruleset:1394
+#: data/default/buildings.ruleset:1393
#, fuzzy
msgid ""
"The amount of stored food lost when one of your cities grows or shrinks is "
@@ -19633,33 +19785,33 @@ msgstr ""
"con un Granaio aumenta o diminuisce; questo aiuta la città a crescere più "
"velocemente e a sopportare più facilmente le carestie."
-#: data/default/buildings.ruleset:1401 data/civ2/buildings.ruleset:1382
+#: data/default/buildings.ruleset:1400 data/civ2/buildings.ruleset:1382
#: data/civ1/buildings.ruleset:981
msgid "SETI Program"
msgstr "Programma SETI"
-#: data/default/buildings.ruleset:1415
+#: data/default/buildings.ruleset:1414
msgid "Boosts science production in each city with a Research Lab by 100%. "
msgstr ""
"Aumenta la produzione scientifica del 100% in ogni città con un laboratorio "
"di ricerca."
-#: data/default/buildings.ruleset:1420 data/civ2/buildings.ruleset:1402
+#: data/default/buildings.ruleset:1419 data/civ2/buildings.ruleset:1402
#: data/civ1/buildings.ruleset:1001
msgid "Shakespeare's Theatre"
msgstr "Teatro di Shakespeare"
-#: data/default/buildings.ruleset:1434 data/civ2/buildings.ruleset:1416
+#: data/default/buildings.ruleset:1433 data/civ2/buildings.ruleset:1416
#: data/civ1/buildings.ruleset:1015
msgid "Makes all unhappy citizens content, in the city where it is located."
msgstr ""
"Rende soddisfatti tutti gli abitanti scontenti della città in cui si trova."
-#: data/default/buildings.ruleset:1439 data/civ2/buildings.ruleset:1421
+#: data/default/buildings.ruleset:1438 data/civ2/buildings.ruleset:1421
msgid "Statue of Liberty"
msgstr "Statua della Libertà"
-#: data/default/buildings.ruleset:1453 data/civ2/buildings.ruleset:1435
+#: data/default/buildings.ruleset:1452 data/civ2/buildings.ruleset:1435
#: data/civ1/buildings.ruleset:974 data/civ1/buildings.ruleset:1034
msgid ""
"Allows you to choose any government, including those that have not yet been "
@@ -19669,11 +19821,11 @@ msgstr ""
"Permette di scegliere qualsiasi tipo di governo, compresi quelli non ancora "
"raggiunti dalla vostra civiltà e senza il periodo transitorio di Anarchia."
-#: data/default/buildings.ruleset:1460 data/civ2/buildings.ruleset:1442
+#: data/default/buildings.ruleset:1459 data/civ2/buildings.ruleset:1442
msgid "Sun Tzu's War Academy"
msgstr "Accademia di Sun Tzu"
-#: data/default/buildings.ruleset:1474
+#: data/default/buildings.ruleset:1473
msgid ""
"All your new ground units start at the first veteran level. The chance of a "
"unit getting the next veteran level after a battle increases by half."
@@ -19682,21 +19834,21 @@ msgstr ""
"un'unità passi al successivo livello di esperienza dopo una battaglia "
"aumenta del 50%."
-#: data/default/buildings.ruleset:1481 data/civ2/buildings.ruleset:1463
+#: data/default/buildings.ruleset:1480 data/civ2/buildings.ruleset:1463
#: data/civ1/buildings.ruleset:1020
msgid "United Nations"
msgstr "Nazioni Unite"
-#: data/default/buildings.ruleset:1495
+#: data/default/buildings.ruleset:1494
msgid "All your units regain two extra hitpoints per turn."
msgstr "Le unità riacquistano due punti vita oltre il normale per ogni turno."
-#: data/default/buildings.ruleset:1508 data/civ2/buildings.ruleset:1490
+#: data/default/buildings.ruleset:1507 data/civ2/buildings.ruleset:1490
#: data/civ1/buildings.ruleset:1046
msgid "Women's Suffrage"
msgstr "Voto alle Donne"
-#: data/default/buildings.ruleset:1522 data/civ2/buildings.ruleset:1504
+#: data/default/buildings.ruleset:1521 data/civ2/buildings.ruleset:1504
msgid ""
"Counts as a Police Station in every city. (That is, for each city, reduces "
"unhappiness for military units outside the city by 2 under Democracy and 1 "
@@ -19707,11 +19859,11 @@ msgstr ""
"durante la Democrazia e di uno durante la Repubblica. Questa meraviglia non "
"ha alcun effetto durante altri tipi di governo."
-#: data/default/buildings.ruleset:1533
+#: data/default/buildings.ruleset:1532
msgid "Coinage"
msgstr "Conio"
-#: data/default/buildings.ruleset:1554
+#: data/default/buildings.ruleset:1553
msgid ""
"This is not a normal improvement. Instead, setting a city's production to "
"Coinage means its shield production is converted to tax output (money, "
@@ -20178,12 +20330,17 @@ msgstr "?city_state:Pace"
msgid "?citystyle:Industrial"
msgstr "?city:Neutrale"
-#: data/default/cities.ruleset:139 data/civ2/cities.ruleset:150
+#: data/default/cities.ruleset:139
+#, fuzzy
+msgid "?citystyle:ElectricAge"
+msgstr "?city_state:Pace"
+
+#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:150
#, fuzzy
msgid "?citystyle:Modern"
msgstr "?city_state:Sommossa"
-#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:161
+#: data/default/cities.ruleset:161 data/civ2/cities.ruleset:161
#, fuzzy
msgid "?citystyle:PostModern"
msgstr "?city_state:Sommossa"
@@ -25604,6 +25761,41 @@ msgstr "Squadra"
msgid "Team 31"
msgstr "Squadra"
+#~ 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."
+
+#~ msgid "Observers cannot vote."
+#~ msgstr "Gli osservatori non possono votare."
+
+#~ msgid "Vote %d \"%s\": %d for, %d against"
+#~ msgstr "Voto %d \"%s\": %d a favore, %d contro"
+
+#~ msgid "Value must be integer."
+#~ msgstr "Il valore deve essere un intero."
+
+#~ 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 Hydro Plant, Power Plant, or Nuclear Plant. A "
+#~ "city can only build a Hydro Plant if it is next to (or on) a Mountain or "
+#~ "River tile."
+#~ msgstr ""
+#~ "Riduce l'inquinamento creato dalla produzione di una città del 50%. "
+#~ "Inoltre aumenta la produzione di risorse di una Fabbrica o di una "
+#~ "Manifattura in una città: una Fabbrica e una Centrale Elettrica insieme "
+#~ "danno un aumento del 75%, e una Fabbrica, una Manifattura e una Centrale "
+#~ "Elettrica insieme danno un aumento del 150%.\n"
+#~ "\n"
+#~ "Una città può avere solo una Centrale Idrica, una Centrale Elettrica o "
+#~ "una Centrale Nucleare e può costruire una Centrale Idrica solo se si "
+#~ "trova vicino o dentro un quadrante Montagna o Fiume."
+
#, fuzzy
#~ msgid "Auth config filename \"%s\" not allowed!"
#~ msgstr "Quel nome non è permesso."
diff --git a/po/ja.gmo b/po/ja.gmo
index c238a2a..fd1f405 100644
Binary files a/po/ja.gmo and b/po/ja.gmo differ
diff --git a/po/ja.po b/po/ja.po
index 7eb6b5e..8002c79 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: 2009-03-29 21:13+0900\n"
+"POT-Creation-Date: 2009-11-22 21:37+0100\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"
@@ -201,21 +201,21 @@ msgstr "?obsolete:å¤"
msgid "?redundant:*"
msgstr "?redundant:*"
-#: common/connection.c:515
+#: common/connection.c:518
#, c-format
msgid "%s from %s"
msgstr "%2$sã‹ã‚‰ã®%1$s"
-#: common/connection.c:521
+#: common/connection.c:524
msgid " (connection incomplete)"
msgstr " (ä¸å®Œå…¨ãªæŽ¥ç¶š)"
-#: common/connection.c:525
+#: common/connection.c:528
#, c-format
msgid " (player %s)"
msgstr " (プレイヤー %s)"
-#: common/connection.c:529
+#: common/connection.c:532
msgid " (observer)"
msgstr " (観察者)"
@@ -634,87 +634,87 @@ msgid "AI Debug messages"
msgstr "AIã®ãƒ‡ãƒãƒƒã‚°ç”¨ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸"
# ntaka 何ã¦è¨³ã›ã°ã„ã„ã‚“ã よ
-#: common/player.c:732
+#: common/player.c:746
msgid "?attitude:Genocidal"
msgstr "憎悪"
-#: common/player.c:734
+#: common/player.c:748
msgid "?attitude:Belligerent"
msgstr "強硬"
-#: common/player.c:736
+#: common/player.c:750
msgid "?attitude:Hostile"
msgstr "敵対的"
-#: common/player.c:738
+#: common/player.c:752
msgid "?attitude:Uncooperative"
msgstr "éžå”力的"
# ntaka 変?
# clefs 「神経質ã€ã€ŒçŒœç–‘çš„ã€ã¨ã‹è€ƒãˆã‚‰ã‚Œã¾ã™ãŒï¼Œã€Œä¸å®‰ã€ã§è¡Œãã¾ã—ょã†
-#: common/player.c:740
+#: common/player.c:754
msgid "?attitude:Uneasy"
msgstr "ä¸å®‰"
-#: common/player.c:742
+#: common/player.c:756
msgid "?attitude:Neutral"
msgstr "ä¸ç«‹"
# ntaka Worshipful ã¨ã©ã†è¨³ã—分ã‘ã‚‹ã‚“ã よ?
# worshipã¯å´‡ã‚るよã†ã«ã™ã‚‹ã®ã«å¯¾ã—ã€respectã¯ä¸€ç›®ç½®ãã£ã¦ç¨‹åº¦ãªã‚“ã§ã™ã‘ã©
# 訳語ã¯é›£ã—ã„ã§ã™ã (clefs)
-#: common/player.c:744
+#: common/player.c:758
msgid "?attitude:Respectful"
msgstr "好æ„çš„"
-#: common/player.c:746
+#: common/player.c:760
msgid "?attitude:Helpful"
msgstr "å”力的"
-#: common/player.c:748
+#: common/player.c:762
msgid "?attitude:Enthusiastic"
msgstr "熱狂的"
-#: common/player.c:750
+#: common/player.c:764
msgid "?attitude:Admiring"
msgstr "賛美"
# was "尊敬"
-#: common/player.c:753
+#: common/player.c:767
msgid "?attitude:Worshipful"
msgstr "å´‡æ‹"
-#: common/player.c:764
+#: common/player.c:778
msgid "?diplomatic_state:Armistice"
msgstr "休戦"
-#: common/player.c:765
+#: common/player.c:779
msgid "?diplomatic_state:War"
msgstr "敵対"
-#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:780 client/gui-gtk-2.0/diplodlg.c:353
#: 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:767 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:781 client/gui-gtk-2.0/diplodlg.c:358
#: 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:768 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:782 client/gui-gtk-2.0/diplodlg.c:363
#: 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:769
+#: common/player.c:783
msgid "?diplomatic_state:Never met"
msgstr "未接触"
-#: common/player.c:770
+#: common/player.c:784
msgid "?diplomatic_state:Team"
msgstr "ãƒãƒ¼ãƒ "
@@ -749,7 +749,7 @@ msgstr ""
#. TRANS: "Resources: (none)".
#: common/requirements.c:1014 common/team.c:132
#: client/gui-gtk-2.0/helpdlg.c:1055 client/gui-gtk-2.0/inteldlg.c:390
-#: client/gui-win32/helpdlg.c:586 client/gui-xaw/helpdlg.c:991
+#: client/gui-win32/helpdlg.c:592 client/gui-xaw/helpdlg.c:991
#, c-format
msgid "(none)"
msgstr "(ãªã—)"
@@ -775,10 +775,11 @@ msgstr "先端技術 %d"
#: 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
#: client/gui-sdl/helpdlg.c:817 client/gui-sdl/mapview.c:962
-#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:545
-#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:735
-#: 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
+#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:544
+#: client/gui-win32/helpdlg.c:551 client/gui-win32/helpdlg.c:721
+#: client/gui-win32/helpdlg.c:741 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 "ãªã—"
@@ -791,29 +792,29 @@ msgstr "先端技術"
msgid "(Unknown)"
msgstr "(ãªã—)"
-#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:553
#: manual/civmanual.c:224
msgid "Road"
msgstr "é“è·¯"
-#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:557
#: client/gui-gtk-2.0/menu.c:829 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:394 common/terrain.c:572 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:567
#: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
#: data/civ1/techs.ruleset:563
msgid "Railroad"
msgstr "鉄é“"
-#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:555
msgid "Mine"
msgstr "資æº"
-#: common/terrain.c:396 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:551 server/report.c:124
#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "公害"
@@ -822,7 +823,7 @@ msgstr "公害"
msgid "Hut"
msgstr "å°å±‹"
-#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:563
#: manual/civmanual.c:226
msgid "Fortress"
msgstr "è¦å¡ž"
@@ -835,61 +836,61 @@ msgstr "å·"
msgid "Farmland"
msgstr "農地"
-#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:577
#: manual/civmanual.c:226
msgid "Airbase"
msgstr "é£›è¡Œå ´"
-#: common/terrain.c:402 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:579
msgid "Fallout"
msgstr "æ»ã®ç°"
-#: common/unit.c:546 client/gui-win32/plrdlg.c:337
+#: common/unit.c:549 client/gui-win32/plrdlg.c:337
msgid "Idle"
msgstr "アイドル"
# yasu
# clefs (防御姿勢→防御態勢)
-#: common/unit.c:556
+#: common/unit.c:559
msgid "Fortifying"
msgstr "防御態勢"
# yasu
-#: common/unit.c:558
+#: common/unit.c:561
msgid "Fortified"
msgstr "防御態勢をã¨ã£ãŸ"
-#: common/unit.c:562 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
+#: common/unit.c:565 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
msgid "Sentry"
msgstr "見張り番"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
+#: common/unit.c:569 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
#: client/gui-win32/menu.c:370 client/gui-xaw/menu.c:185
msgid "Pillage"
msgstr "略奪"
-#: common/unit.c:568 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
+#: common/unit.c:571 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
msgid "Goto"
msgstr "移動"
-#: common/unit.c:570
+#: common/unit.c:573
msgid "Explore"
msgstr "探索"
-#: common/unit.c:572 manual/civmanual.c:224
+#: common/unit.c:575 manual/civmanual.c:224
msgid "Transform"
msgstr "変更"
-#: common/unit.c:584 client/text.c:157 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:587 client/text.c:157 client/gui-sdl/citydlg.c:1972
#: client/gui-win32/citydlg.c:1257 client/gui-xaw/citydlg.c:1423
msgid "Unknown"
msgstr "ä¸æ˜Ž"
-#: common/unit.c:1022
+#: common/unit.c:1025
msgid "Moves"
msgstr "移動"
-#: common/unit.c:1571
+#: common/unit.c:1574
#, c-format
msgid ""
"Upgrade %s to %s for %d gold?\n"
@@ -899,13 +900,13 @@ msgstr ""
"ç¾åœ¨ã®è³‡é‡‘ã¯%dã§ã™ã€‚"
# clefs
-#: common/unit.c:1579
+#: common/unit.c:1582
#, c-format
msgid "Sorry, cannot upgrade %s (yet)."
msgstr "残念，%sã‚’(ã¾ã )æ–°åž‹ã«ã§ãã¾ã›ã‚“。"
# ama, clefs
-#: common/unit.c:1585
+#: common/unit.c:1588
#, c-format
msgid ""
"Upgrading %s to %s costs %d gold.\n"
@@ -914,14 +915,14 @@ msgstr ""
"%1$sã‚’%2$sã¸æ–°åž‹ã«ã™ã‚‹ã«ã¯é‡‘%3$dãŒå¿…è¦ã§ã™ã€‚\n"
"ç¾åœ¨ã®è³‡é‡‘ã¯%4$dã§ã™ã€‚"
-#: common/unit.c:1594
+#: common/unit.c:1597
msgid "You can only upgrade units in your cities."
msgstr "自分ã®éƒ½å¸‚ã§ã®ã¿éƒ¨éšŠã‚’アップグレードã§ãã¾ã™ã€‚"
# clefs
# strandを「座ç¤ã€ã«ã—ã¦ã‚‚矛盾ã¯å‡ºãªã„ã‹ãªï¼Ÿ
# フリゲートを装甲艦・駆é€è‰¦ã«ã™ã‚‹ã¨éƒ¨éšŠã‚’ç©ã‚ãªããªã‚Šã¾ã™
-#: common/unit.c:1598
+#: common/unit.c:1601
#, c-format
msgid "Upgrading this %s would strand units it transports."
msgstr ""
@@ -957,11 +958,11 @@ msgstr "æ ¸å…µå™¨"
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1404
+#: common/unittype.c:349 client/helpdata.c:1412
msgid " and "
msgstr "ã¨"
-#: common/unittype.c:355 client/helpdata.c:1390
+#: common/unittype.c:355 client/helpdata.c:1398
msgid "?and:, "
msgstr "ã¨"
@@ -1135,71 +1136,71 @@ msgstr "\"%s\"ã¸ã®å¼•æ•°ãŒç©ºã§ã™ã€‚\n"
msgid "Missing argument for \"%s\".\n"
msgstr "\"%s\"ã¸ã®å¼•æ•°ãŒã¿ã¤ã‹ã‚Šã¾ã›ã‚“。\n"
-#: utility/shared.c:501
+#: utility/shared.c:514
#, c-format
msgid "%d BC"
msgstr "%d BC"
-#: utility/shared.c:503
+#: utility/shared.c:516
#, c-format
msgid "%d AD"
msgstr "%d AD"
-#: utility/shared.c:924
+#: utility/shared.c:937
msgid "FREECIV_PATH is set but empty; using default path instead."
msgstr ""
"FREECIV_PATH ãŒã‚»ãƒƒãƒˆã•ã‚Œã¦ã„ã¾ã™ãŒç©ºã§ã™ã€‚ã‹ã‚ã‚Šã«ãƒ‡ã‚£ãƒ•ã‚©ãƒ«ãƒˆãƒ‘スを使ã„ã¾"
"ã™ã€‚"
-#: utility/shared.c:1028
+#: utility/shared.c:1041
#, c-format
msgid "Could not read data directory %s: %s."
msgstr "データディレクトリ %s ã‚’èªã‚€ã“ã¨ãŒã§ãã¾ã›ã‚“: %s。"
-#: utility/shared.c:1279
+#: utility/shared.c:1292
msgid "The data path may be set via the environment variable FREECIV_PATH."
msgstr "データパスã¯ç’°å¢ƒå¤‰æ•° FREECIV_PATH ã§è¨å®šã§ãã¾ã™ã€‚"
-#: utility/shared.c:1281
+#: utility/shared.c:1294
#, c-format
msgid "Current data path is: \"%s\""
msgstr "ç¾åœ¨ã®ãƒ‡ãƒ¼ã‚¿ãƒ‘スã¯: \"%s\""
-#: utility/shared.c:1283
+#: utility/shared.c:1296
#, c-format
msgid "The \"%s\" file is required ... aborting!"
msgstr "\"%s\" ファイルãŒå¿…è¦ã§ã™ ... ä¸æ¢ã—ã¦ã„ã¾ã™!"
-#: utility/shared.c:1460
+#: utility/shared.c:1485
#, c-format
msgid "%s: Fatal error: you're trying to run me as superuser!\n"
msgstr "%s: 致命的エラー: スーパーユーザã§èµ·å‹•ã—よã†ã¨ã—ã¦ã„ã¾ã™!\n"
-#: utility/shared.c:1462
+#: utility/shared.c:1487
msgid "Use a non-privileged account instead.\n"
msgstr "特権ã®ãªã„アカウントをã‹ã‚ã‚Šã«ä½¿ã£ã¦ä¸‹ã•ã„。\n"
-#: utility/shared.c:1478
+#: utility/shared.c:1503
msgid "exact match"
msgstr "完全一致"
-#: utility/shared.c:1479
+#: utility/shared.c:1504
msgid "only match"
msgstr "唯一ã®ä¸€è‡´"
-#: utility/shared.c:1480
+#: utility/shared.c:1505
msgid "ambiguous"
msgstr "ã‚ã„ã¾ã„"
-#: utility/shared.c:1481
+#: utility/shared.c:1506
msgid "empty"
msgstr "空"
-#: utility/shared.c:1482
+#: utility/shared.c:1507
msgid "too long"
msgstr "é•·ã™ãŽã‚‹"
-#: utility/shared.c:1483
+#: utility/shared.c:1508
msgid "non-match"
msgstr "ä¸ä¸€è‡´"
@@ -1230,17 +1231,17 @@ msgstr "%sã§(ä¸å¿…è¦ãª)%sを金%dã§å£²ã‚Šã¾ã™ã€‚"
# clefs
# XXX `away mode'
-#: ai/advdiplomacy.c:280
+#: ai/advdiplomacy.c:300
#, c-format
msgid "*%s (AI)* In away mode AI can't sign such a treaty."
msgstr "*%s (AI)* ä¸åœ¨ãƒ¢ãƒ¼ãƒ‰ã§ã¯AIã¯ãã®ã‚ˆã†ãªæ¡ç´„ã«ã¯ã‚µã‚¤ãƒ³ã§ãã¾ã›ã‚“。"
-#: ai/advdiplomacy.c:290
+#: ai/advdiplomacy.c:310
#, c-format
msgid "*%s (AI)* First break alliance with %s, %s."
msgstr "*%1$s (AI)* %3$sよ，ã¾ãšæœ€åˆã«%2$sã¨ã®åŒç›Ÿé–¢ä¿‚を絶ã£ã¦ã‹ã‚‰æ¥ã‚‹ã¹ãã 。"
-#: ai/advdiplomacy.c:303
+#: ai/advdiplomacy.c:322
#, c-format
msgid "*%s (AI)* Let us first cease hostilies, %s."
msgstr "*%s (AI)* %sよ，ã¾ãšã¯æ•µå¯¾é–¢ä¿‚ã‚’æ¢ã‚よã†ã§ã¯ãªã„ã‹ã€‚"
@@ -1248,7 +1249,7 @@ msgstr "*%s (AI)* %sよ，ã¾ãšã¯æ•µå¯¾é–¢ä¿‚ã‚’æ¢ã‚よã†ã§ã¯ãªã„ã‹ã€‚
# clefs
# AI外交ã®å°è©žã¯ã©ã†ã‚‚ç§ã«ã¯ã†ã¾ã訳ã›ãªã„ã®ã§
# ã©ã‚“ã©ã‚“より良ã„ã‚‚ã®ã«ç½®ãæ›ãˆã¦ã„ã£ã¦ãã ã•ã„。
-#: ai/advdiplomacy.c:308
+#: ai/advdiplomacy.c:327
#, c-format
msgid ""
"*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
@@ -1258,18 +1259,18 @@ msgstr ""
"ã‘ãŸã„ã¨æ€ã†ï¼Œ%sよ。"
# clefs XXX
-#: ai/advdiplomacy.c:331
+#: ai/advdiplomacy.c:350
#, 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:424
+#: ai/advdiplomacy.c:443
#, c-format
msgid "*%s (AI)* I do not know the city you mention."
msgstr "*%s (AI)* ãã®ã‚ˆã†ãªéƒ½å¸‚ã¯çŸ¥ã‚‰ãªã„。"
-#: ai/advdiplomacy.c:454
+#: ai/advdiplomacy.c:473
#, c-format
msgid "*%s (AI)* Sorry, sharing vision with you is not safe."
msgstr ""
@@ -1277,33 +1278,33 @@ msgstr ""
"る。"
# clefs
-#: ai/advdiplomacy.c:560
+#: ai/advdiplomacy.c:579
#, c-format
msgid "*%s (AI)* This deal was not very good for us, %s!"
msgstr "*%s (AI)* %sよ，ã“ã®å–引ã¯æˆ‘々ã«ã¨ã£ã¦ãã‚Œã»ã©è‰¯ã„ã‚‚ã®ã§ã¯ãªã•ãã†ã 。"
-#: ai/advdiplomacy.c:582
+#: ai/advdiplomacy.c:601
#, c-format
msgid "*%s (AI)* Welcome into our alliance %s!"
msgstr "*%s (AI)* %sよ，我ãŒåŒç›Ÿã«ã‚ˆã†ã“ã!"
-#: ai/advdiplomacy.c:586
+#: ai/advdiplomacy.c:605
#, c-format
msgid "*%s (AI)* Yes, may we forever stand united, %s."
msgstr "*%s (AI)* 了解ã—ãŸã€‚%sã¨æˆ‘ãŒå›½ã¨ã®åŒç›ŸãŒæ°¸é ã«ç¶šãã“ã¨ã‚’願ãŠã†ã€‚"
-#: ai/advdiplomacy.c:593
+#: ai/advdiplomacy.c:612
#, c-format
msgid "*%s (AI)* Yes, peace in our time!"
msgstr "*%s (AI)* 了解ã—ãŸã€‚我々ã«å¹³å’Œãªæ™‚ãŒè¨ªã‚ŒãŸã‚ˆã†ã 。"
-#: ai/advdiplomacy.c:598
+#: ai/advdiplomacy.c:617
#, c-format
msgid "*%s (AI)* Agreed. No more hostilities, %s."
msgstr "*%s (AI)* åŒæ„ã—ãŸã€‚%sよ，もã¯ã‚„敵対関係をæ¢ã‚よã†ã€‚"
# clefs
-#: ai/advdiplomacy.c:813
+#: ai/advdiplomacy.c:832
#, c-format
msgid ""
"*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
@@ -1314,14 +1315,14 @@ msgstr ""
# clefs
# 宇宙船を打ã¡ä¸Šã’ã‚‹ã¨é¦–都を奪ã„ã«ãã‚‹
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1116
#, c-format
msgid "*%s (AI)* Space will never be yours. "
msgstr "*%s (AI)* 宇宙ã¯è²´å›½ã®ã‚‚ã®ã«ã¯ã•ã›ãªã„。"
# clefs
# XXX `vicious antics'
-#: ai/advdiplomacy.c:1102
+#: ai/advdiplomacy.c:1121
#, c-format
msgid "*%s (AI)* I have tolerated your vicious antics long enough! To war!"
msgstr "*%s (AI)* 貴様ã®æ‚ªãµã–ã‘ã«ã¯ã‚‚ã†æˆ‘æ…¢ã®é™ç•Œã 。戦争ã ï¼"
@@ -1329,13 +1330,13 @@ msgstr "*%s (AI)* 貴様ã®æ‚ªãµã–ã‘ã«ã¯ã‚‚ã†æˆ‘æ…¢ã®é™ç•Œã 。戦争
# clefs
# was "*%s (AI)* 平和ãªæ™‚ã¯...終ã‚ã‚Šã !"
# some other timeã¨ã„ã†ã®ã¯éŽåŽ»ã§ãªã未æ¥ã®ã„ã¤ã‹ã€ä»Šã§ã¯ãªã„ã¨ã„ã†ã“ã¨ã§ã¯?
-#: ai/advdiplomacy.c:1108
+#: ai/advdiplomacy.c:1127
#, c-format
msgid "*%s (AI)* Peace in ... some other time."
msgstr "*%s (AI)* 平和を……ã„ã¤ã®æ—¥ã«ã‹ï¼Œãªã€‚"
# clefs
-#: ai/advdiplomacy.c:1113
+#: ai/advdiplomacy.c:1132
#, c-format
msgid ""
"*%s (AI)* Finally I get around to you! Did you really think you could get "
@@ -1345,20 +1346,20 @@ msgstr ""
"ã„ãŸã‚ã‘ã§ã¯ã‚ã‚‹ã¾ã„ãªï¼Ÿ"
# clefs
-#: ai/advdiplomacy.c:1119
+#: ai/advdiplomacy.c:1138
#, c-format
msgid "*%s (AI)* Your covert hostilities brought this war upon you!"
msgstr "*%s (AI)* ãŠã¾ãˆã®éš 然ãŸã‚‹æ•µå¯¾è¡Œç‚ºãŒã“ã®æˆ¦äº‰ã‚’ã‚‚ãŸã‚‰ã—ãŸã®ã ï¼"
# clefs
# was "*%s (AI)* 貴国ã®æˆ‘ãŒåŒç›Ÿå›½ã«å¯¾ã™ã‚‹è¡Œã„ã¯ã€è²´å›½ã®æœ€å¾Œã®éŽã¡ã !"
-#: ai/advdiplomacy.c:1126
+#: ai/advdiplomacy.c:1145
#, c-format
msgid "*%s (AI)* Your aggression against %s was your last mistake!"
msgstr "*%s (AI)* 貴国ã®%sã«å¯¾ã™ã‚‹è¡Œã„ã¯ï¼Œè²´å›½ã®æœ€å¾Œã®éŽã¡ã !"
# clefs
-#: ai/advdiplomacy.c:1209
+#: ai/advdiplomacy.c:1229
#, c-format
msgid ""
"*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1371,7 +1372,7 @@ msgstr[0] ""
"争ã«çªå…¥ã™ã‚‹ã€‚"
# clefs
-#: ai/advdiplomacy.c:1219
+#: ai/advdiplomacy.c:1239
#, c-format
msgid ""
"*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
@@ -1381,7 +1382,7 @@ msgstr ""
"ã‹ã‚“ã“ã¨ã‚’ï¼"
# clefs
-#: ai/advdiplomacy.c:1225
+#: ai/advdiplomacy.c:1245
#, c-format
msgid ""
"*%s (AI)* %s has grossly violated his treaties with us for own gain. We "
@@ -1396,7 +1397,7 @@ msgstr[0] ""
"る，貴国もåŒç›Ÿã‚’å°Šé‡ã—我々ã«ç¶šãよã†ã«ï¼"
# clefs
-#: ai/advdiplomacy.c:1238
+#: ai/advdiplomacy.c:1258
#, c-format
msgid ""
"*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1408,14 +1409,14 @@ msgstr[0] ""
"*%s (AI)* 我々ã¯%sã®è±Šã‹ãªæ–‡æ˜Žã‚’略奪ã—ã¦ã‚„ã‚‹ã¤ã‚‚ã‚Šã 。%dターン後ã«å®£æˆ¦ã™ã‚‹ã€‚"
# clefs
-#: ai/advdiplomacy.c:1246
+#: ai/advdiplomacy.c:1266
#, 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:1251
+#: ai/advdiplomacy.c:1271
#, c-format
msgid ""
"*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1428,7 +1429,7 @@ msgstr[0] ""
"れよã†ã§ã¯ãªã„ã‹ã€‚%dターン後ã«å®£æˆ¦ã™ã‚‹ã€‚"
# clefs
-#: ai/advdiplomacy.c:1261
+#: ai/advdiplomacy.c:1281
#, c-format
msgid "*%s (AI)* As our glorious allies, we expect your help in this war."
msgstr ""
@@ -1436,7 +1437,7 @@ msgstr ""
"る。"
# clefs
-#: ai/advdiplomacy.c:1267
+#: ai/advdiplomacy.c:1287
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance and declare war on %s in %d turn. "
@@ -1449,7 +1450,7 @@ msgstr[0] ""
"我々もã™ã駆ã‘ã¤ã‘ã‚‹ï¼"
# clefs
-#: ai/advdiplomacy.c:1276
+#: ai/advdiplomacy.c:1296
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1462,7 +1463,7 @@ msgstr[0] ""
"我々ã«ç¶šãã‚‚ã®ã¨æœŸå¾…ã™ã‚‹ã€‚"
# clefs
-#: ai/advdiplomacy.c:1344
+#: ai/advdiplomacy.c:1364
#, c-format
msgid ""
"*%s (AI)* Your attempt to conquer space for yourself alone betray your true "
@@ -1471,7 +1472,7 @@ msgstr ""
"*%s (AI)* 貴国ãŒå˜ç‹¬ã§å®‡å®™ã‚’å¾æœã—よã†ã¨ã—ã¦ã„ã‚‹ã®ã‚’見れã°è²´å›½ã®æ„図ã¯æ˜Žã‚‰ã‹"
"ã 。åŒç›Ÿã¯ç ´æ£„ã•ã›ã¦ã‚‚らã†ï¼"
-#: ai/advdiplomacy.c:1359
+#: ai/advdiplomacy.c:1379
#, c-format
msgid ""
"*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
@@ -1480,7 +1481,7 @@ msgstr ""
"*%s(AI)* 貴国ã®ä¸€æ–¹çš„ã«å®‡å®™ç©ºé–“を支é…ã—よã†ã¨ã™ã‚‹è©¦ã¿ã¯å¤§å¤‰æ”»æ’ƒçš„ãªã‚‚ã®ã§ã‚"
"る。"
-#: ai/advdiplomacy.c:1362
+#: ai/advdiplomacy.c:1382
#, c-format
msgid ""
"*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
@@ -1489,14 +1490,14 @@ msgstr ""
"*%s (AI)* ã‚‚ã—貴国ãŒå®‡å®™èˆ¹ã®å»ºè¨ã‚’ä¸æ¢ã—ãªã„ãªã‚‰ã°ï¼Œæˆ‘ãŒå›½ã¯ä½•ã‚‰ã‹ã®è¡Œå‹•ã«ã§"
"ã‚‹ã“ã¨ã‚‚辞ã•ãªã„!"
-#: ai/advdiplomacy.c:1474
+#: ai/advdiplomacy.c:1494
#, c-format
msgid "*%s (AI)* Sorry, sharing vision with you is no longer safe."
msgstr ""
"*%s (AI)* ã™ã¾ãªã„ãŒï¼Œè²´å›½ã¨è¦–野を共有ã™ã‚‹ã“ã¨ã¯æˆ‘ãŒå›½ã«ã¨ã£ã¦ã‚‚ã¯ã‚„安全ãªäº‹"
"ã§ã¯ãªã„。"
-#: ai/advdiplomacy.c:1549
+#: ai/advdiplomacy.c:1569
#, c-format
msgid ""
"*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
@@ -1505,7 +1506,7 @@ msgstr ""
"*%s (AI)* 我ãŒæœ€ã‚‚ä¿¡é ¼ã®ãŠã‘ã‚‹åŒç›Ÿå›½è«¸å›ã‚ˆï¼Œæˆ‘々ã¯%sを打倒ã™ã‚‹ãŸã‚ã«è²´å›½ã®åŠ›"
"ã‚’å¿…è¦ã¨ã—ã¦ã„る。"
-#: ai/advdiplomacy.c:1555
+#: ai/advdiplomacy.c:1575
#, c-format
msgid ""
"*%s (AI)* Greetings ally, I see you have not yet made war with our enemy, %"
@@ -1516,7 +1517,7 @@ msgstr ""
"らんã®ã ?"
# clefs
-#: ai/advdiplomacy.c:1562
+#: ai/advdiplomacy.c:1582
#, c-format
msgid ""
"*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1528,7 +1529,7 @@ msgstr ""
"ã ï¼"
# clefs
-#: ai/advdiplomacy.c:1592
+#: ai/advdiplomacy.c:1612
#, c-format
msgid ""
"*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
@@ -1536,13 +1537,13 @@ msgid ""
msgstr "*%s (AI)* 親愛ãªã‚‹å‹äººã‚ˆï¼Œå¤§ç¾©ã‚’共有ã—åŒç›Ÿã‚’çµã¼ã†ã§ã¯ãªã„ã‹ï¼Ÿ"
# clefs
-#: ai/advdiplomacy.c:1607
+#: ai/advdiplomacy.c:1627
#, c-format
msgid "*%s (AI)* Greetings neighbour, may we suggest more peaceful relations?"
msgstr "*%s (AI)* 親愛ãªã‚‹éš£äººã‚ˆï¼Œã‚ˆã‚Šå¹³å’Œçš„ãªé–¢ä¿‚ã‚’æŒã¨ã†ã§ã¯ãªã„ã‹ï¼Ÿ"
# clefs
-#: ai/advdiplomacy.c:1622
+#: ai/advdiplomacy.c:1642
#, c-format
msgid ""
"*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
@@ -1551,7 +1552,7 @@ msgstr "*%s (AI)* 相続ãæµè¡€ã«ã¯ã†ã‚“ã–ã‚Šã§ã™ã€‚åœæˆ¦ã‚’çµã¼ã†
# clefs
# msgstr "*%s (AI)* %sã¯æˆ‘々両国を脅ã‹ã—ã¦ã„る。我々ã¯åœæˆ¦ã‚’ã™ã¹ãã§ã¯ãªã„ã‹?"
-#: ai/advdiplomacy.c:1742
+#: ai/advdiplomacy.c:1762
#, c-format
msgid ""
"*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1721,18 +1722,18 @@ msgstr ""
"構æˆã•ã‚Œã¦ã„ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。もã†ä¸€åº¦ãŠé¡˜ã„ã—ã¾ã™ã€‚"
# clefs
-#: server/barbarian.c:183
+#: server/barbarian.c:184
#, c-format
msgid "%s gain a leader by the name %s. Dangerous times may lie ahead."
msgstr "%sã«%sãªã‚‹ãƒªãƒ¼ãƒ€ãƒ¼ãŒç«‹ã¡ã¾ã—ãŸã€‚物騒ãªæ™‚代ã«ãªã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。"
-#: server/barbarian.c:479
+#: server/barbarian.c:480
#, c-format
msgid "Native unrest near %s led by %s."
msgstr "%2$sã«ã‚ˆã£ã¦%1$sè¿‘ãã®ä½æ°‘ãŒå‹•æºã—ã¦ã„ã¾ã™"
# yasu
-#: server/barbarian.c:484
+#: server/barbarian.c:485
#, c-format
msgid "Sea raiders seen near %s!"
msgstr "海賊ãŒ%sã®ãã°ã«è¦‹ãˆã¾ã™!"
@@ -2148,7 +2149,7 @@ msgid_plural "%s boosts research; you gain %d immediate advances."
msgstr[0] "%sã¯ç ”ç©¶ã‚’åŠ é€Ÿã•ã›ã¾ã™ã€‚å³åº§ã«ç§‘å¦ã‚’%dã¤è¦šãˆã¾ã™ã€‚"
# Daniel
-#: server/cityturn.c:1158 server/techtools.c:176
+#: server/cityturn.c:1158 server/techtools.c:172
#, c-format
msgid "The %s have acquired %s from %s."
msgstr "%1$sã¯%3$sã‹ã‚‰%2$sã‚’å¾—ã¾ã—ãŸã€‚"
@@ -2235,22 +2236,22 @@ msgstr ""
"è¦å‘Š: %s オプションã¯æ™‚代é…ã‚Œã§ã™ã€‚メタサーãƒã‚’有効ã«ã™ã‚‹ã«ã¯ -m を使ã£ã¦ä¸‹ã•"
"ã„。\n"
-#: server/civserver.c:189
+#: server/civserver.c:193
#, c-format
msgid "Error: unknown option '%s'\n"
msgstr "エラー: 未知ã®ã‚ªãƒ—ション '%s'\n"
-#: server/civserver.c:200
+#: server/civserver.c:204
#, c-format
msgid "This is the server for %s"
msgstr "ã“れ㯠%s ã®ãŸã‚ã®ã‚µãƒ¼ãƒã§ã™ã€‚"
-#: server/civserver.c:201
+#: server/civserver.c:205
#, c-format
msgid "You can learn a lot about Freeciv at %s"
msgstr "Freeciv ã«ã¤ã„ã¦ã®æƒ…å ±ã‚’ %s ã§æä¾›ã—ã¦ã„ã¾ã™ã€‚"
-#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
+#: server/civserver.c:210 client/civclient.c:239 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -2260,7 +2261,7 @@ msgstr ""
"有効ãªã‚ªãƒ—ション:\n"
# clefs
-#: server/civserver.c:208
+#: server/civserver.c:212
#, fuzzy
msgid ""
" -a --auth FILE\tEnable server authentication with configuration from "
@@ -2268,104 +2269,109 @@ msgid ""
msgstr " -a --auth\t\tサーãƒèªè¨¼ã‚’有効ã«ã™ã‚‹.\n"
# clefs
-#: server/civserver.c:210
+#: server/civserver.c:214
msgid " -G --Guests\t\tAllow guests to login if auth is enabled.\n"
msgstr ""
" -G --Guests\t\tèªè¨¼ã‚’有効ã«ã—ã¦ã„ã‚‹å ´åˆã«ï¼Œã‚²ã‚¹ãƒˆã®ãƒã‚°ã‚¤ãƒ³ã‚’許å¯ã™ã‚‹ã€‚\n"
# clefs
-#: server/civserver.c:212
+#: server/civserver.c:216
msgid " -N --Newusers\tAllow new users to login if auth is enabled.\n"
msgstr ""
" -N --Guests\t\tèªè¨¼ã‚’有効ã«ã—ã¦ã„ã‚‹å ´åˆã«ï¼Œæ–°è¦ãƒ¦ãƒ¼ã‚¶ã®ãƒã‚°ã‚¤ãƒ³ã‚’許å¯ã™"
"る。\n"
-#: server/civserver.c:215
+#: server/civserver.c:219
msgid " -b --bind ADDR\tListen for clients on ADDR\n"
msgstr " -b, --bind ADDR\tアドレス ADDR ã§ã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆã‚’å¾…ã¤\n"
-#: server/civserver.c:217 client/civclient.c:242
+#: server/civserver.c:221 client/civclient.c:243
msgid ""
" -d, --debug NUM\tSet debug log level (0 to 4, or 4:file1,min,max:...)\n"
msgstr ""
" -d, --debug NUM\tデãƒãƒƒã‚¯ãƒã‚°ãƒ¬ãƒ™ãƒ«ã‚’セットã™ã‚‹(0 ã‹ã‚‰ 4, ã‚‚ã—ã㯠4:ファイ"
"ル1,最å°,最大:...)\n"
-#: server/civserver.c:221 client/civclient.c:246
+#: server/civserver.c:225 client/civclient.c:247
msgid " -d, --debug NUM\tSet debug log level (0 to 3)\n"
msgstr " -d, --debug NUM\tデãƒãƒƒã‚¯ãƒã‚°ãƒ¬ãƒ™ãƒ«ã‚’セットã™ã‚‹(0 ã‹ã‚‰ 3)\n"
-#: server/civserver.c:223
+#: server/civserver.c:227
msgid " -f, --file FILE\tLoad saved game FILE\n"
msgstr " -f, --file FILE\tä¿å˜ã•ã‚ŒãŸã‚²ãƒ¼ãƒ FILE ã‚’ãƒãƒ¼ãƒ‰ã™ã‚‹\n"
-#: server/civserver.c:225 client/civclient.c:249 manual/civmanual.c:382
+#: server/civserver.c:229 client/civclient.c:250 manual/civmanual.c:382
msgid " -h, --help\t\tPrint a summary of the options\n"
msgstr " -h, --help\t\tオプションã®ä¸€è¦§ã‚’表示\n"
-#: server/civserver.c:226
+#: server/civserver.c:230
+#, fuzzy
+msgid " -i, --identity ADDR\tBe known as ADDR at metaserver\n"
+msgstr " -M, --Metaserver ADDR\tメタサーãƒã®æ‰€åœ¨ã¨ã—㦠ADDR をセットã™ã‚‹\n"
+
+#: server/civserver.c:231
msgid " -l, --log FILE\tUse FILE as logfile\n"
msgstr " -l, --log FILE\t記録ファイルã¨ã—㦠FILE を使ã†\n"
-#: server/civserver.c:227
+#: server/civserver.c:232
msgid " -m, --meta\t\tNotify metaserver and send server's info\n"
msgstr " -m, --meta\t\tメタサーãƒã¸é€šçŸ¥ã—サーãƒã®æƒ…å ±ã‚’é€ã‚‹\n"
-#: server/civserver.c:229
+#: server/civserver.c:234
msgid " -M, --Metaserver ADDR\tSet ADDR as metaserver address\n"
msgstr " -M, --Metaserver ADDR\tメタサーãƒã®æ‰€åœ¨ã¨ã—㦠ADDR をセットã™ã‚‹\n"
-#: server/civserver.c:232
+#: server/civserver.c:237
msgid " -p, --port PORT\tListen for clients on port PORT\n"
msgstr " -p, --port PORT\tãƒãƒ¼ãƒˆ PORT ã§ã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆã‚’å¾…ã¤\n"
-#: server/civserver.c:234
+#: server/civserver.c:239
msgid " -q, --quitidle TIME\tQuit if no players for TIME seconds\n"
msgstr " -q, --quitidle TIME\tTIME 秒プレイヤーãŒå˜åœ¨ã—ãªã‚Œã‚Œã°çµ‚了ã™ã‚‹\n"
# clefs
-#: server/civserver.c:236
+#: server/civserver.c:241
msgid " -e, --exit-on-end\tWhen a game ends, exit instead of restarting\n"
msgstr " -e, --exit-on-end\tゲーム終了時ã«ï¼Œå†èµ·å‹•ã›ãšã«çµ‚了ã™ã‚‹\n"
# clefs
-#: server/civserver.c:239
+#: server/civserver.c:244
msgid " -s, --saves DIR\tSave games to directory DIR\n"
msgstr " -s, --saves DIR\tディレクトリ DIR ã«ã‚²ãƒ¼ãƒ ã‚’ä¿å˜ã™ã‚‹\n"
-#: server/civserver.c:241
+#: server/civserver.c:246
msgid " -S, --Serverid ID\tSets the server id to ID\n"
msgstr " -S, --Serverd ID\tサーãƒIDã‚’ ID ã«ã‚»ãƒƒãƒˆã™ã‚‹\n"
# XXX ppms?
-#: server/civserver.c:243
+#: server/civserver.c:248
msgid " -P, --Ppm\t\tSave ppms of the map when saving the game.\n"
msgstr ""
-#: server/civserver.c:244
+#: server/civserver.c:249
msgid " -r, --read FILE\tRead startup script FILE\n"
msgstr " -r, --read FILE\t起動スクリプト FILE ã‚’èªã‚€\n"
-#: server/civserver.c:246
+#: server/civserver.c:251
msgid " -R, --Ranklog FILE\tUse FILE as ranking logfile\n"
msgstr " -R, --Ranklog FILE\tランã‚ング記録ファイルã¨ã—㦠FILE を使ã†\n"
-#: server/civserver.c:247 client/civclient.c:268 manual/civmanual.c:383
+#: server/civserver.c:252 client/civclient.c:269 manual/civmanual.c:383
msgid " -v, --version\t\tPrint the version number\n"
msgstr " -v, --version\t\tãƒãƒ¼ã‚¸ãƒ§ãƒ³ç•ªå·ã‚’表示ã™ã‚‹\n"
-#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
+#: server/civserver.c:253 client/gui-gtk-2.0/gui_main.c:354
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, c-format
msgid "Report bugs at %s.\n"
msgstr "<%s>ã¸ãƒã‚°ã‚’å ±å‘Šã—ã¦ä¸‹ã•ã„。\n"
-#: server/commands.c:28
+#: server/commands.c:29
msgid "Start the game, or restart after loading a savegame."
msgstr "ゲームを開始ã—ã¾ã™ã€‚セーブゲームをãƒãƒ¼ãƒ‰ã—ãŸå¾Œãªã‚‰å†é–‹ã—ã¾ã™ã€‚"
-#: server/commands.c:29
+#: server/commands.c:30
msgid ""
"This command starts the game. When starting a new game, it should be used "
"after all human players have connected, and AI players have been created (if "
@@ -2383,7 +2389,7 @@ msgstr ""
"ãŒé–‹å§‹ã•ã‚ŒãŸã‚‰ï¼Œã“ã®ã‚³ãƒžãƒ³ãƒ‰ã¯ä¸è¦ãªã®ã§åˆ©ç”¨ã§ãã¾ã›ã‚“。"
#. TRANS: translate text between <> only
-#: server/commands.c:42
+#: server/commands.c:44
msgid ""
"help\n"
"help commands\n"
@@ -2397,11 +2403,11 @@ msgstr ""
"help <コマンドå>\n"
"help <オプションå>"
-#: server/commands.c:47
+#: server/commands.c:49
msgid "Show help about server commands and server options."
msgstr "サーãƒã‚³ãƒžãƒ³ãƒ‰ã¨ã‚µãƒ¼ãƒã‚ªãƒ—ションã«ã¤ã„ã¦ã®ãƒ˜ãƒ«ãƒ—を表示ã—ã¾ã™ã€‚"
-#: server/commands.c:48
+#: server/commands.c:50
msgid ""
"With no arguments gives some introductory help. With argument \"commands\" "
"or \"options\" gives respectively a list of all commands or all options. "
@@ -2417,12 +2423,12 @@ msgstr ""
"ã¾ã„ã§ãªã‘ã‚Œã°å¾Œã‚ã‚’çœç•¥ã§ãã¾ã™ã€‚"
# clefs
-#: server/commands.c:63
+#: server/commands.c:66
msgid "Show a list of players, teams, connections, or scenarios."
msgstr "プレイヤー，ãƒãƒ¼ãƒ ，接続もã—ãã¯ã‚·ãƒŠãƒªã‚ªã®ãƒªã‚¹ãƒˆã‚’表示ã—ã¾ã™ã€‚"
# clefs
-#: server/commands.c:64
+#: server/commands.c:67
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 "
@@ -2431,20 +2437,20 @@ msgstr ""
"プレイヤー，ãƒãƒ¼ãƒ ，接続もã—ãã¯ã‚·ãƒŠãƒªã‚ªã®ãƒªã‚¹ãƒˆã‚’表示ã—ã¾ã™ã€‚引数ã¯çŸç¸®å½¢ã§"
"も良ã，ã¾ãŸçœç•¥ã•ã‚ŒãŸã‚‰ 'players' ãŒæŒ‡å®šã•ã‚ŒãŸã‚‚ã®ã¨ã¿ãªã—ã¾ã™ã€‚"
-#: server/commands.c:70
+#: server/commands.c:74
msgid "Quit the game and shutdown the server."
msgstr "ゲームを終了ã—，サーãƒã‚’シャットダウンã™ã‚‹ã€‚"
#. TRANS: translate text between <> only
-#: server/commands.c:74
+#: server/commands.c:79
msgid "cut <connection-name>"
msgstr "cut <接続å>"
-#: server/commands.c:75
+#: server/commands.c:80
msgid "Cut a client's connection to server."
msgstr "クライアントã®æŽ¥ç¶šã‚’切りã¾ã™ã€‚"
-#: server/commands.c:76
+#: server/commands.c:81
msgid ""
"Cut specified client's connection to the server, removing that client from "
"the game. If the game has not yet started that client's player is removed "
@@ -2457,7 +2463,7 @@ msgstr ""
"å–ã‚‹ã“ã¨ã«æ³¨æ„ã—ã¦ä¸‹ã•ã„。"
#. TRANS: translate text between <> only
-#: server/commands.c:83
+#: server/commands.c:89
msgid ""
"explain\n"
"explain <option-name>"
@@ -2465,11 +2471,11 @@ msgstr ""
"explain\n"
"explain <オプションå>"
-#: server/commands.c:85
+#: server/commands.c:91
msgid "Explain server options."
msgstr "サーãƒã‚ªãƒ—ションを説明ã™ã‚‹ã€‚"
-#: server/commands.c:86
+#: server/commands.c:92
msgid ""
"The 'explain' command gives a subset of the functionality of 'help', and is "
"included for backward compatibility. With no arguments it gives a list of "
@@ -2482,7 +2488,7 @@ msgstr ""
"ã®ã‚ªãƒ—ションã®ãƒ˜ãƒ«ãƒ—を表示ã—ã¾ã™ã€‚"
#. TRANS: translate text between <> only
-#: server/commands.c:93
+#: server/commands.c:100
msgid ""
"show\n"
"show <option-name>\n"
@@ -2492,11 +2498,11 @@ msgstr ""
"show <オプションå>\n"
"show <オプションåã®å…ˆé 部分>"
-#: server/commands.c:96
+#: server/commands.c:103
msgid "Show server options."
msgstr "サーãƒã‚ªãƒ—ションを表示ã™ã‚‹ã€‚"
-#: server/commands.c:97
+#: server/commands.c:104
msgid ""
"With no arguments, shows all server options (or available options, when used "
"by clients). With an argument, show only the named option, or options with "
@@ -2506,15 +2512,15 @@ msgstr ""
"トã«ã‚ˆã£ã¦ä½¿ç”¨ã•ã‚ŒãŸæ™‚，利用å¯èƒ½ãªã‚ªãƒ—ションを表示ã—ã¾ã™ã€‚) 引数付ãã§å‘¼ã°ã‚Œ"
"ãŸã‚‰ï¼Œãã®åå‰ã‚‚ã—ãã¯ãã®åå‰ã§å§‹ã¾ã‚‹ã‚ªãƒ—ションã ã‘を表示ã—ã¾ã™ã€‚"
-#: server/commands.c:102
+#: server/commands.c:110
msgid "wall <message>"
msgstr "wall <メッセージ>"
-#: server/commands.c:103
+#: server/commands.c:111
msgid "Send message to all connections."
msgstr "å…¨ã¦ã®æŽ¥ç¶šã«ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’é€ã‚‹"
-#: server/commands.c:104
+#: server/commands.c:112
msgid ""
"For each connected client, pops up a window showing the message entered."
msgstr ""
@@ -2522,58 +2528,59 @@ msgstr ""
"アップã—ã¾ã™ã€‚"
# clefs
-#: server/commands.c:108
+#: server/commands.c:117
msgid "vote yes|no [vote number]"
msgstr "vote yes|no [投票番å·]"
-#: server/commands.c:109
+#: server/commands.c:118
msgid "Cast a vote."
msgstr "投票ã—ã¾ã™ã€‚"
-#: server/commands.c:111
+#: server/commands.c:120
#, 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."
+"A player with basic 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."
msgstr ""
-#: server/commands.c:121
+#: server/commands.c:131
msgid ""
"debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
"<player> | timing | info]"
msgstr ""
-#: server/commands.c:123
+#: server/commands.c:133
msgid "Turn on or off AI debugging of given entity."
msgstr ""
-#: server/commands.c:124
+#: server/commands.c:134
msgid ""
"Print AI debug information about given entity and turn continous debugging "
"output for this entity on or off."
msgstr ""
-#: server/commands.c:128
+#: server/commands.c:139
msgid "set <option-name> <value>"
msgstr "set <オプションå> <値>"
-#: server/commands.c:129
+#: server/commands.c:140
msgid "Set server option."
msgstr "サーãƒã‚ªãƒ—ションをè¨å®šã™ã‚‹ã€‚"
-#: server/commands.c:132
+#: server/commands.c:144
msgid "team <player> [team]"
msgstr "team <プレイヤー> [ãƒãƒ¼ãƒ ]"
-#: server/commands.c:133
+#: server/commands.c:145
msgid "Change, add or remove a player's team affiliation."
msgstr "プレイヤーã®æ‰€å±žãƒãƒ¼ãƒ ã‚’å¤‰æ›´ï¼Œè¿½åŠ ï¼Œå‰Šé™¤ã™ã‚‹ã€‚"
-#: server/commands.c:134
+#: server/commands.c:146
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 "
@@ -2586,16 +2593,16 @@ msgstr ""
"ã¾ã™ã€‚ãƒãƒ¼ãƒ ã®ãƒ—レイヤーã¯ï¼Œãƒ—レイヤーã®å¹³å‡å¾—点ã§æ±ºã¾ã‚‹ãƒãƒ¼ãƒ ã®å‹åˆ©ã‚’目指ã—"
"ã¦ä¸€ç·’ã«æˆ¦ã„ã¾ã™ã€‚"
-#: server/commands.c:141
+#: server/commands.c:154
msgid "rulesetdir <directory>"
msgstr "rulesetdir <ディレクトリ>"
# clefs
-#: server/commands.c:142
+#: server/commands.c:155
msgid "Choose new ruleset directory or modpack."
msgstr "ルールセット・ディレクトリã¾ãŸã¯modpackã‚’é¸æŠžã™ã‚‹ã€‚"
-#: server/commands.c:143
+#: server/commands.c:156
msgid ""
"Choose new ruleset directory or modpack. Calling this\n"
" without any arguments will show you the currently selected ruleset."
@@ -2604,15 +2611,15 @@ msgstr ""
" é¸æŠžã™ã‚‹ã€‚引数ãªã—ã§å‘¼ã‚“ã ら，ç¾åœ¨é¸æŠžã•ã‚Œã¦ã„るルールセットを表示ã—ã¾ã™ã€‚"
#. TRANS: translate text between <> only
-#: server/commands.c:149
+#: server/commands.c:163
msgid "metainfo <meta-line>"
msgstr "metainfo <メタサーãƒæƒ…å ±è¡Œ>"
-#: server/commands.c:150
+#: server/commands.c:164
msgid "Set metaserver info line."
msgstr "メタサーãƒæƒ…å ±è¡Œã‚’è¨å®šã™ã‚‹ã€‚"
-#: server/commands.c:151
+#: server/commands.c:165
msgid ""
"Set user defined metaserver info line. If parameter is omitted,\n"
"previously set metamessage will be removed. For most of the time\n"
@@ -2621,20 +2628,20 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:158
+#: server/commands.c:173
msgid "metapatch <meta-line>"
msgstr "metapath <メタサーãƒæƒ…å ±è¡Œ>"
# Daniel
-#: server/commands.c:159
+#: server/commands.c:174
msgid "Set metaserver patches line."
msgstr "メタサーãƒæƒ…å ±è¡Œã‚’è¨å®šã™ã‚‹ã€‚"
-#: server/commands.c:165
+#: server/commands.c:181
msgid "Control metaserver connection."
msgstr "メタサーãƒæŽ¥ç¶šã‚’æ“作ã™ã‚‹ã€‚"
-#: server/commands.c:166
+#: server/commands.c:182
msgid ""
"'metaconnection ?' reports on the status of the connection to metaserver.\n"
"'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2645,36 +2652,36 @@ msgstr ""
"'metaconnection up' ã‚‚ã—ã㯠'metac u' ã¯ï¼Œãƒ¡ã‚¿ã‚µãƒ¼ãƒã¸æŽ¥ç¶šã—ã¾ã™ã€‚"
#. TRANS: translate text between <> only
-#: server/commands.c:172
+#: server/commands.c:189
msgid "metaserver <address>"
msgstr "metaserver <所在>"
-#: server/commands.c:173
+#: server/commands.c:190
msgid "Set address (URL) for metaserver to report to."
msgstr "メタサーãƒã¸å ±å‘Šã™ã‚‹æ‰€åœ¨ã‚’è¨å®šã—ã¾ã™ã€‚"
#. TRANS: translate text between <> only
-#: server/commands.c:177
+#: server/commands.c:195
msgid "aitoggle <player-name>"
msgstr "aitoggle <プレイヤーå>"
-#: server/commands.c:178
+#: server/commands.c:196
msgid "Toggle AI status of player."
msgstr "プレイヤー㮠AI 状態を切り替ãˆã‚‹ã€‚"
# clefs
#. TRANS: translate text between [] and <> only
-#: server/commands.c:182
+#: server/commands.c:201
msgid "take [connection-name] <player-name>"
msgstr "take [接続å] <プレイヤーå>"
# clefs XXX
-#: server/commands.c:183
+#: server/commands.c:202
msgid "Take over a player's place in the game."
msgstr "ゲーム上ã§ãã®ãƒ—レイヤーã«ãªã‚‹ã€‚"
# clefs
-#: server/commands.c:184
+#: server/commands.c:203
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 "
@@ -2689,16 +2696,16 @@ msgstr ""
# Daniel
#. TRANS: translate text between [] only
-#: server/commands.c:192
+#: server/commands.c:212
msgid "observe [connection-name] [player-name]"
msgstr "observe [接続å] <プレイヤーå>"
# clefs
-#: server/commands.c:193
+#: server/commands.c:213
msgid "Observe a player or the whole game."
msgstr "プレイヤー，ã¾ãŸã¯ã‚²ãƒ¼ãƒ 全体を観察ã—ã¾ã™ã€‚"
-#: server/commands.c:194
+#: server/commands.c:214
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 "
@@ -2713,18 +2720,18 @@ msgstr ""
# Daniel
#. TRANS: translate text between <> only
-#: server/commands.c:202
+#: server/commands.c:223
msgid "detach <connection-name>"
msgstr "detach <接続å>"
# clefs
# was "プレイヤーã‹ã‚‰ãƒ‡ã‚¿ãƒƒãƒã™ã‚‹"
-#: server/commands.c:203
+#: server/commands.c:224
msgid "detach from a player."
msgstr "プレイヤーを放棄ã™ã‚‹ã€‚"
# clefs
-#: server/commands.c:204
+#: server/commands.c:225
msgid ""
"Only the console and connections with cmdlevel 'hack' can force other "
"connections to detach from a player."
@@ -2733,21 +2740,21 @@ msgstr ""
"ヤーã‹ã‚‰ãƒ‡ã‚¿ãƒƒãƒã•ã›ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚"
#. TRANS: translate text between <> only
-#: server/commands.c:209
+#: server/commands.c:231
msgid "create <player-name>"
msgstr "create <プレイヤーå>"
-#: server/commands.c:210
+#: server/commands.c:232
msgid "Create an AI player with a given name."
msgstr "与ãˆã‚‰ã‚ŒãŸåå‰ã§ AI プレイヤーを作る。"
-#: server/commands.c:211
+#: server/commands.c:233
msgid ""
"The 'create' command is only available before the game has been started."
msgstr "'create' コマンドã¯ï¼Œã‚²ãƒ¼ãƒ を開始ã™ã‚‹å‰ã ã‘利用ã§ãã¾ã™ã€‚"
# clefs
-#: server/commands.c:215
+#: server/commands.c:238
msgid ""
"away\n"
"away"
@@ -2757,18 +2764,18 @@ msgstr ""
# clefs
# 「(ãŠ)留守番モードã€ã¨ã§ã‚‚ã™ã‚Œã°ã‚ã‹ã‚Šã‚„ã™ã„ã®ã‹ãª
-#: server/commands.c:217
+#: server/commands.c:240
msgid "Set yourself in away mode. The AI will watch your back."
msgstr "ä¸åœ¨ãƒ¢ãƒ¼ãƒ‰ã«è¨å®šã—ã¾ã™ã€‚AIãŒé¢å€’を見ã¦ãã‚Œã¾ã™ã€‚"
# clefs
-#: server/commands.c:218
+#: server/commands.c:241
msgid "The AI will govern your nation but do minimal changes."
msgstr "AIãŒã‚ãªãŸã®å›½ã‚’統治ã—ã¾ã™ãŒï¼Œå¤‰åŒ–ã¯æœ€å°é™ã«ã¨ã©ã‚ã¾ã™ã€‚"
# Daniel
#. TRANS: translate text between <> only
-#: server/commands.c:222
+#: server/commands.c:246
msgid ""
"novice\n"
"novice <player-name>"
@@ -2777,12 +2784,12 @@ msgstr ""
"novice <プレイヤーå>"
# Daniel
-#: server/commands.c:224
+#: server/commands.c:248
msgid "Set one or all AI players to 'novice'."
msgstr "1人もã—ãã¯å…¨ã¦ã® AI プレイヤーを 'novice' ã«è¨å®šã™ã‚‹ã€‚"
# Daniel
-#: server/commands.c:225
+#: server/commands.c:249
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 "
@@ -2793,7 +2800,7 @@ msgstr ""
"ら，ãã®ãƒ—レイヤーã®æ‰‹è…•ã ã‘ã‚’è¨å®šã—ã¾ã™ã€‚"
#. TRANS: translate text between <> only
-#: server/commands.c:231
+#: server/commands.c:256
msgid ""
"easy\n"
"easy <player-name>"
@@ -2801,11 +2808,11 @@ msgstr ""
"easy\n"
"easy <プレイヤーå>"
-#: server/commands.c:233
+#: server/commands.c:258
msgid "Set one or all AI players to 'easy'."
msgstr "1人もã—ãã¯å…¨ã¦ã® AI プレイヤーを 'easy' ã«è¨å®šã™ã‚‹ã€‚"
-#: server/commands.c:234
+#: server/commands.c:259
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 "
@@ -2816,7 +2823,7 @@ msgstr ""
"ãã®ãƒ—レイヤーã®æ‰‹è…•ã ã‘ã‚’è¨å®šã—ã¾ã™ã€‚"
#. TRANS: translate text between <> only
-#: server/commands.c:240
+#: server/commands.c:266
msgid ""
"normal\n"
"normal <player-name>"
@@ -2824,11 +2831,11 @@ msgstr ""
"normal\n"
"normal <プレイヤーå>"
-#: server/commands.c:242
+#: server/commands.c:268
msgid "Set one or all AI players to 'normal'."
msgstr "1人もã—ãã¯å…¨ã¦ã® AI プレイヤーを 'normal' ã«è¨å®šã™ã‚‹ã€‚"
-#: server/commands.c:243
+#: server/commands.c:269
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 "
@@ -2839,7 +2846,7 @@ msgstr ""
"ら，ãã®ãƒ—レイヤーã®æ‰‹è…•ã ã‘ã‚’è¨å®šã—ã¾ã™ã€‚"
#. TRANS: translate text between <> only
-#: server/commands.c:249
+#: server/commands.c:276
msgid ""
"hard\n"
"hard <player-name>"
@@ -2847,11 +2854,11 @@ msgstr ""
"hard\n"
"hard <プレイヤーå>"
-#: server/commands.c:251
+#: server/commands.c:278
msgid "Set one or all AI players to 'hard'."
msgstr "1人もã—ãã¯å…¨ã¦ã® AI プレイヤーを 'hard' ã«è¨å®šã™ã‚‹ã€‚"
-#: server/commands.c:252
+#: server/commands.c:279
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 "
@@ -2862,7 +2869,7 @@ msgstr ""
"ãã®ãƒ—レイヤーã®æ‰‹è…•ã ã‘ã‚’è¨å®šã—ã¾ã™ã€‚"
#. TRANS: translate text between <> only
-#: server/commands.c:258
+#: server/commands.c:286
msgid ""
"experimental\n"
"experimental <player-name>"
@@ -2870,11 +2877,11 @@ msgstr ""
"experimental\n"
"experimental <プレイヤーå>"
-#: server/commands.c:260
+#: server/commands.c:288
msgid "Set one or all AI players to 'experimental'."
msgstr "1人もã—ãã¯å…¨ã¦ã® AI プレイヤーを 'experimental' ã«è¨å®šã™ã‚‹ã€‚"
-#: server/commands.c:261
+#: server/commands.c:289
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 "
@@ -2887,7 +2894,7 @@ msgstr ""
"ã§ã™!*** 通常ã®ã‚µãƒ¼ãƒã§ã¯ï¼Œã“ã®ã‚ªãƒ—ションã¯ç„¡åŠ¹ã§ã™ã€‚"
#. TRANS: translate text between <> only
-#: server/commands.c:269
+#: server/commands.c:298
msgid ""
"cmdlevel\n"
"cmdlevel <level>\n"
@@ -2901,17 +2908,20 @@ msgstr ""
"cmdlevel <レベル> first\n"
"cmdlevel <レベル> <接続å>"
-#: server/commands.c:274
+#: server/commands.c:303
msgid "Query or set command access level access."
msgstr "コマンド利用権レベルをå•ã„åˆã‚ã›ï¼Œã¾ãŸã¯è¨å®šã™ã‚‹ã€‚"
-#: server/commands.c:275
+#: server/commands.c:304
+#, fuzzy
msgid ""
"The command access level controls which server commands are available\n"
"to users via the client chatline. The available levels are:\n"
" none - no commands\n"
-" info - informational commands only\n"
+" info - informational or observer commands only\n"
+" basic - commands available to players in the game\n"
" ctrl - commands that affect the game and users\n"
+" admin - commands that affect server operation\n"
" hack - *all* commands - dangerous!\n"
"With no arguments, the current command access levels are reported.\n"
"With a single argument, the level is set for all existing connections,\n"
@@ -2948,20 +2958,20 @@ msgstr ""
"ã¨ã—ã¦ãƒ—レイヤーåã§ã¯ãªã接続åã‚’å–ã‚‹ã“ã¨ã«æ³¨æ„ã—ã¦ä¸‹ã•ã„。"
# clefs
-#: server/commands.c:296
+#: server/commands.c:328
msgid "If there is none, become the game organizer with increased permissions."
msgstr "ã¾ã ã„ãªã‘ã‚Œã°ï¼Œã‚ˆã‚Šå¼·ã„権é™ã‚’æŒã£ãŸã‚²ãƒ¼ãƒ 主催者ã«ãªã‚Šã¾ã™ã€‚"
#. TRANS: translate text between <> only
-#: server/commands.c:301
+#: server/commands.c:334
msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
msgstr "timeoutincrease <ターン> <ã‚¿ãƒ¼ãƒ³å¢—åŠ > <値> <乗値>"
-#: server/commands.c:302
+#: server/commands.c:335
msgid "See \"help timeoutincrease\"."
msgstr "\"help timeoutincrease\" を見ã¦ä¸‹ã•ã„。"
-#: server/commands.c:303
+#: server/commands.c:336
msgid ""
"Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
"<turn> and multiply <value> by <valuemult>. Use this command in concert "
@@ -2971,29 +2981,48 @@ msgstr ""
"åŠ >ã‚’åŠ ãˆï¼Œ<乗値>ã‚’<値>ã«æŽ›ã‘ã¾ã™ã€‚ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã¯ï¼Œã‚ªãƒ—ション \"timeout\" ã¨"
"å”調ã—ã¦ä½¿ã„ã¾ã™ã€‚デフォルト㯠0 0 0 1 ã§ã™ã€‚"
+#. TRANS: translate text between <> only
+#: server/commands.c:343
+msgid ""
+"cancelvote\n"
+"cancelvote <vote number>\n"
+"cancelvote all\n"
+msgstr ""
+
+#: server/commands.c:346
+msgid "Cancel a running vote.\n"
+msgstr ""
+
+#: server/commands.c:347
+msgid ""
+"With no arguments this command removes your own vote. If you have an admin "
+"access level, you can cancel any vote by vote number, or all votes with the "
+"'all' argument."
+msgstr ""
+
# then there's nothing left :) -clefs
#. TRANS: translate text between <> only
-#: server/commands.c:309
+#: server/commands.c:354
msgid "endgame"
msgstr "endgame"
# clefs
-#: server/commands.c:310
+#: server/commands.c:355
msgid "End the game immediately in a draw."
msgstr "ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã¯ï¼Œã‚²ãƒ¼ãƒ ã‚’å³åº§ã«å¼•ã分ã‘ã§çµ‚了ã—ã¾ã™ã€‚"
#. TRANS: translate text between <> only
-#: server/commands.c:314
+#: server/commands.c:360
msgid "surrender"
msgstr "surrender"
# clefs
-#: server/commands.c:315
+#: server/commands.c:361
msgid "Concede the game."
msgstr "敗北をèªã‚ã¾ã™ã€‚"
# clefs XXX
-#: server/commands.c:316
+#: server/commands.c:362
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."
@@ -3002,15 +3031,15 @@ msgstr ""
"全員ãŒåŒæ§˜ã«è² ã‘ã‚’èªã‚ã‚‹ã¨ãã‚Œã§ã‚²ãƒ¼ãƒ ã¯çµ‚了ã—ã¾ã™ã€‚"
#. TRANS: translate text between <> only
-#: server/commands.c:322
+#: server/commands.c:369
msgid "remove <player-name>"
msgstr "remove <プレイヤーå>"
-#: server/commands.c:323
+#: server/commands.c:370
msgid "Fully remove player from game."
msgstr "ゲームã‹ã‚‰ãƒ—レイヤーを完全ã«è¿½ã„出ã™ã€‚"
-#: server/commands.c:324
+#: server/commands.c:371
msgid ""
"This *completely* removes a player from the game, including all cities and "
"units etc. Use with care!"
@@ -3019,7 +3048,7 @@ msgstr ""
"ã—ã¦ä½¿ã£ã¦ä¸‹ã•ã„。"
#. TRANS: translate text between <> only
-#: server/commands.c:329
+#: server/commands.c:377
msgid ""
"save\n"
"save <file-name>"
@@ -3027,11 +3056,11 @@ msgstr ""
"save\n"
"save <ファイルå>"
-#: server/commands.c:331
+#: server/commands.c:379
msgid "Save game to file."
msgstr "ファイルã«ã‚²ãƒ¼ãƒ ã‚’ä¿å˜ã—ã¾ã™ã€‚"
-#: server/commands.c:332
+#: server/commands.c:380
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"
@@ -3048,7 +3077,7 @@ msgstr ""
"を使ã„èµ·å‹•ã—，一旦プレイヤーをå†æŽ¥ç¶šã—ã¦ã‚³ãƒžãƒ³ãƒ‰ 'start' を使ã£ã¦ä¸‹ã•ã„。"
#. TRANS: translate text between <> only
-#: server/commands.c:341
+#: server/commands.c:390
msgid ""
"load\n"
"load <file-name>"
@@ -3056,12 +3085,12 @@ msgstr ""
"load\n"
"load <ファイルå>"
-#: server/commands.c:343
+#: server/commands.c:392
msgid "Load game from file."
msgstr "ファイルã‹ã‚‰ã‚²ãƒ¼ãƒ ã‚’ãƒãƒ¼ãƒ‰ã—ã¾ã™ã€‚"
# clefs
-#: server/commands.c:344
+#: server/commands.c:393
msgid ""
"Load a game from <file-name>. Any current data including players, rulesets "
"and server options are lost.\n"
@@ -3070,75 +3099,75 @@ msgstr ""
"ã‚’å«ã‚€å…¨ã¦ã®ãƒ‡ãƒ¼ã‚¿ã¯å¤±ã‚ã‚Œã¾ã™ã€‚\n"
#. TRANS: translate text between <> only
-#: server/commands.c:349
+#: server/commands.c:399
msgid "read <file-name>"
msgstr "read <ファイルå>"
-#: server/commands.c:350
+#: server/commands.c:400
msgid "Process server commands from file."
msgstr "ファイルã‹ã‚‰ã®ã‚µãƒ¼ãƒã‚³ãƒžãƒ³ãƒ‰ã‚’処ç†ã™ã‚‹ã€‚"
#. TRANS: translate text between <> only
-#: server/commands.c:354
+#: server/commands.c:405
msgid "write <file-name>"
msgstr "write <ファイルå>"
-#: server/commands.c:355
+#: server/commands.c:406
msgid "Write current settings as server commands to file."
msgstr "ファイルã¸ã‚µãƒ¼ãƒã‚³ãƒžãƒ³ãƒ‰ã¨ã—ã¦ç¾åœ¨ã®è¨å®šã‚’ä¿å˜ã™ã‚‹ã€‚"
-#: server/commands.c:359
+#: server/commands.c:411
msgid "Switch server output between 'RFC-style' and normal style."
msgstr "サーãƒã®å‡ºåŠ›ã‚’，'RFC-style' ã¨é€šå¸¸ã®å½¢å¼ã¨ã§åˆ‡ã‚Šæ›¿ãˆã¾ã™ã€‚"
# clefs
-#: server/commands.c:363
+#: server/commands.c:416
msgid "Simply returns the id of the server."
msgstr "å˜ç´”ã«ã‚µãƒ¼ãƒã®IDã‚’è¿”ã—ã¾ã™ã€‚"
-#: server/connecthand.c:85
+#: server/connecthand.c:109
#, c-format
msgid "Welcome to the %s Server running at %s port %d."
msgstr "よã†ã“ã %s サーãƒã¸ã€‚ã“ã®ã‚µãƒ¼ãƒã¯ %s(ãƒãƒ¼ãƒˆ %d)ã§å®Ÿè¡Œã•ã‚Œã¦ã„ã¾ã™ã€‚"
-#: server/connecthand.c:89
+#: server/connecthand.c:113
#, c-format
msgid "Welcome to the %s Server at port %d."
msgstr "よã†ã“ã %s サーãƒ(ãƒãƒ¼ãƒˆ %d)ã¸ã€‚"
# clefs
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:97
+#: server/connecthand.c:121
#, fuzzy, c-format
msgid "(%d) %s: connected [%s]"
msgstr "(%d) %s 㯠%s ã‹ã‚‰æŽ¥ç¶šã—ã¦ã„ã¾ã™ã€‚"
# clefs
-#: server/connecthand.c:104
+#: server/connecthand.c:128
#, c-format
msgid "Server: %s has connected from %s."
msgstr "サーãƒ: %s 㯠%s ã‹ã‚‰æŽ¥ç¶šã—ã¦ã„ã¾ã™ã€‚"
# clefs XXX
-#: server/connecthand.c:145
+#: server/connecthand.c:175
msgid "Couldn't attach your connection to new player."
msgstr "æ–°ã—ã„プレイヤーã¨ã—ã¦æŽ¥ç¶šã§ãã¾ã›ã‚“ã§ã—ãŸã€‚"
# clefs XXX
-#: server/connecthand.c:165
+#: server/connecthand.c:199
#, c-format
msgid "You are logged in as '%s' connected to no player."
msgstr "ã‚ãªãŸã¯ãƒ¦ãƒ¼ã‚¶å '%s' ã§ï¼Œãƒ—レイヤー割り当ã¦ãªã—ã§æŽ¥ç¶šã—ã¦ã„ã¾ã™ã€‚"
# clefs XXX
-#: server/connecthand.c:169
+#: server/connecthand.c:203
#, c-format
msgid "You are logged in as '%s' connected to an anonymous player."
msgstr ""
"ã‚ãªãŸã¯ãƒ¦ãƒ¼ã‚¶å '%s' ã§ï¼Œç„¡åプレイヤーã«å‰²ã‚Šå½“ã¦ã‚‰ã‚Œã¦æŽ¥ç¶šã—ã¦ã„ã¾ã™ã€‚"
# clefs XXX
-#: server/connecthand.c:174
+#: server/connecthand.c:208
#, c-format
msgid "You are logged in as '%s' connected to %s."
msgstr ""
@@ -3146,58 +3175,58 @@ msgstr ""
# clefs
# 全員ãŒã€Œã‚¿ãƒ¼ãƒ³çµ‚了ã€ã‚’押ã™ã¾ã§æ¬¡ã®ã‚¿ãƒ¼ãƒ³ã«é€²ã¾ãªã„モード
-#: server/connecthand.c:187
+#: server/connecthand.c:221
#, c-format
msgid "Turn-blocking game play: waiting on %s to finish turn..."
msgstr "ターンブãƒãƒƒã‚ングモード: %sãŒã‚¿ãƒ¼ãƒ³çµ‚了ã™ã‚‹ã®ã‚’å¾…ã£ã¦ã„ã¾ã™â€¦â€¦"
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:240
+#: server/connecthand.c:274
#, fuzzy, c-format
msgid "(%d) %s: connection request [%s]"
msgstr "(%d) %2$s ã® %1$s ã‹ã‚‰æŽ¥ç¶šè¦è«‹"
-#: server/connecthand.c:266
+#: server/connecthand.c:300
#, fuzzy
msgid "The client is missing a capability that this server needs."
msgstr "クライアンドã¯ã‚µãƒ¼ãƒã®è¦æ±‚ã™ã‚‹æ©Ÿèƒ½ã‚’ç†è§£ã§ãã¾ã›ã‚“。"
-#: server/connecthand.c:268 server/connecthand.c:279
+#: server/connecthand.c:302 server/connecthand.c:313
#, fuzzy, c-format
msgid "(%d) %s rejected: mismatched capabilities!"
msgstr "(%d) %s ã¯æ‹’絶ã•ã‚Œã¾ã—ãŸ: 機能ã®ä¸ä¸€è‡´ã§ã™ã€‚"
-#: server/connecthand.c:277
+#: server/connecthand.c:311
#, fuzzy
msgid "This server is missing a capability that the client needs."
msgstr "サーãƒã¯ã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆã®è¦æ±‚ã™ã‚‹æ©Ÿèƒ½ã‚’ç†è§£ã§ãã¾ã›ã‚“。"
# Daniel
-#: server/connecthand.c:290
+#: server/connecthand.c:324
#, fuzzy
msgid "The username is invalid!"
msgstr "無効ãªåå‰"
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:292
+#: server/connecthand.c:326
#, fuzzy, c-format
msgid "(%d) %s rejected: invalid username [%s]"
msgstr "(%d) %s ã¯æ‹’絶ã•ã‚Œã¾ã—ãŸ: 無効ãªåå‰ã§ã™ [%s]。"
# Daniel
-#: server/connecthand.c:303
+#: server/connecthand.c:337
#, fuzzy
msgid "Your username is already connected!"
msgstr "ã¯æ—¢ã«æŽ¥ç¶šã•ã‚Œã¦ã„ã¾ã™ã€‚"
# clefs
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:305
+#: server/connecthand.c:339
#, fuzzy, c-format
msgid "(%d) %s rejected: duplicate username [%s]"
msgstr "(%d) %s ã¯æ‹’絶ã•ã‚Œã¾ã—ãŸ: ãƒã‚°ã‚¤ãƒ³åãŒé‡è¤‡ã—ã¦ã„ã¾ã™ [%s]。"
-#: server/connecthand.c:335 server/connecthand.c:344
+#: server/connecthand.c:369 server/connecthand.c:378
#, c-format
msgid "Lost connection: %s."
msgstr "接続消失: %s"
@@ -3217,127 +3246,127 @@ msgid "For introductory help, type 'help'."
msgstr "'help' ã¨å…¥åŠ›ã™ã‚‹ã¨åˆæ©çš„ãªãƒ˜ãƒ«ãƒ—ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚"
# clefs
-#: server/diplhand.c:164
+#: server/diplhand.c:167
#, c-format
msgid "The %s can't accept %s."
msgstr "%sã¯%sを承èªã§ãã¾ã›ã‚“。"
# yasu
-#: server/diplhand.c:176
+#: server/diplhand.c:179
#, c-format
msgid "You don't have tech %s, you can't accept treaty."
msgstr "技術%sã¯ã‚ã‚Šã¾ã›ã‚“。æ¡ç´„ã¯æ‰¿èªã§ãã¾ã›ã‚“。"
# yasu
-#: server/diplhand.c:185
+#: server/diplhand.c:188
msgid "City you are trying to give no longer exists, you can't accept treaty."
msgstr "æä¾›ã—よã†ã¨ã—ã¦ã„る都市ã¯ã‚‚ã†ã‚ã‚Šã¾ã›ã‚“。æ¡ç´„ã¯æ‰¿èªã§ãã¾ã›ã‚“。"
# yasu
-#: server/diplhand.c:191
+#: server/diplhand.c:194
#, c-format
msgid "You are not owner of %s, you can't accept treaty."
msgstr "%sã®æ‰€æœ‰è€…ã§ã¯ãªã„ã®ã§ï¼Œæ¡ç´„ã¯æ‰¿èªã§ãã¾ã›ã‚“。"
# yasu
-#: server/diplhand.c:197 server/diplhand.c:301
+#: server/diplhand.c:200 server/diplhand.c:304
#, c-format
msgid "Your capital (%s) is requested, you can't accept treaty."
msgstr "首都(%s)ãŒè¦æ±‚ã•ã‚Œã¾ã—ãŸã®ã§æ¡ç´„を承èªã§ãã¾ã›ã‚“。"
# yasu
-#: server/diplhand.c:224
+#: server/diplhand.c:227
msgid "You don't have enough gold, you can't accept treaty."
msgstr "ãŠé‡‘ãŒãªã„ã®ã§ï¼Œæ¡ç´„を承èªã§ãã¾ã›ã‚“。"
# yasu
-#: server/diplhand.c:256 server/diplhand.c:261
+#: server/diplhand.c:259 server/diplhand.c:264
#, c-format
msgid "A treaty containing %d clause was agreed upon."
msgid_plural "A treaty containing %d clauses was agreed upon."
msgstr[0] "%d æ¡é …ã‚’å«ã‚€æ¡ç´„ãŒåˆæ„ã•ã‚Œã¾ã—ãŸã€‚"
# yasu
-#: server/diplhand.c:277 server/diplhand.c:281
+#: server/diplhand.c:280 server/diplhand.c:284
#, c-format
msgid "One of the cities the %s are giving away is destroyed! Treaty canceled!"
msgstr ""
"%s ãŒæä¾›ã—よã†ã¨ã—ãŸéƒ½å¸‚ã®ä¸€ã¤ãŒç ´å£Šã•ã‚Œã¾ã—ãŸ! æ¡ç´„ã¯ç ´æ£„ã•ã‚Œã¾ã—ãŸã€‚"
# yasu
-#: server/diplhand.c:288 server/diplhand.c:293
+#: server/diplhand.c:291 server/diplhand.c:296
#, c-format
msgid "The %s no longer control %s! Treaty canceled!"
msgstr "%s ã¯ã‚‚ㆠ%s を所有ã—ã¦ã¾ã›ã‚“! æ¡ç´„ã¯ç ´æ£„ã•ã‚Œã¾ã—ãŸã€‚"
-#: server/diplhand.c:331 server/diplhand.c:335
+#: server/diplhand.c:334 server/diplhand.c:338
#, c-format
msgid "The %s don't have the promised amount of gold! Treaty canceled!"
msgstr "%sã¯ç´„æŸã—ãŸé‡‘ã‚’æŒã£ã¦ã„ã¾ã›ã‚“! æ¡ç´„ã¯ç ´æ£„ã•ã‚Œã¾ã—ãŸã€‚"
-#: server/diplhand.c:364
+#: server/diplhand.c:367
#, c-format
msgid "You gave an embassy to %s."
msgstr "%sã«å¤§ä½¿é¤¨ã®é–‹è¨ã‚’許å¯ã—ã¾ã—ãŸã€‚"
# yasu ntaka
-#: server/diplhand.c:367
+#: server/diplhand.c:370
#, c-format
msgid "%s allowed you to create an embassy!"
msgstr "%sã¯ã‚ãªãŸã«å¤§ä½¿é¤¨ã®é–‹è¨ã‚’許å¯ã—ã¾ã—ãŸã€‚"
# yasu
-#: server/diplhand.c:383
+#: server/diplhand.c:386
#, c-format
msgid "You are taught the knowledge of %s."
msgstr "%sã®çŸ¥è˜ã‚’å¾—ã¾ã—ãŸã€‚"
-#: server/diplhand.c:387
+#: server/diplhand.c:390
#, c-format
msgid "The %s have acquired %s from the %s."
msgstr "%1$sã¯%3$sã‹ã‚‰%2$sã‚’å¾—ã¾ã—ãŸã€‚"
# yasu
-#: server/diplhand.c:402
+#: server/diplhand.c:405
#, c-format
msgid "You get %d gold."
msgstr "金 %d ã‚’å¾—ã¾ã—ãŸã€‚"
# yasu
#. TRANS: ... Polish worldmap.
-#: server/diplhand.c:410
+#: server/diplhand.c:413
#, fuzzy, c-format
msgid "You receive the %s worldmap."
msgstr "%s ã®ä¸–界地図を得ã¾ã—ãŸã€‚"
# yasu
#. TRANS: ... Polish seamap.
-#: server/diplhand.c:419
+#: server/diplhand.c:422
#, fuzzy, c-format
msgid "You receive the %s seamap."
msgstr "%s ã®æµ·å›³ã‚’å¾—ã¾ã—ãŸã€‚"
# yasu
-#: server/diplhand.c:436
+#: server/diplhand.c:439
#, c-format
msgid "You receive city of %s from %s."
msgstr "都市 %s ã‚’ %s ã‹ã‚‰å¾—ã¾ã—ãŸã€‚"
# yasu
-#: server/diplhand.c:441
+#: server/diplhand.c:444
#, c-format
msgid "You give city of %s to %s."
msgstr "都市 %s ã‚’ %s ã«ä¸Žãˆã¾ã—ãŸã€‚"
# yasu
-#: server/diplhand.c:454 server/diplhand.c:457
+#: server/diplhand.c:457 server/diplhand.c:460
#, c-format
msgid "You agree on a cease-fire with %s."
msgstr "%s ã¨ã®åœæˆ¦ã«åˆæ„ã—ã¾ã—ãŸã€‚"
# clefs
#. TRANS: ... the Poles ... Polish territory.
-#: server/diplhand.c:476 server/diplhand.c:488
+#: server/diplhand.c:479 server/diplhand.c:491
#, fuzzy, c-format
msgid ""
"You agree on an armistice with the %s. In %d turn, it will become a peace "
@@ -3350,37 +3379,37 @@ msgstr[0] ""
"ã¾ã§ã«ã‚ãªãŸã®éƒ¨éšŠã‚’%sã®é ˜åœŸã‹ã‚‰æ’¤åŽã•ã›ã¦ãã ã•ã„。"
# yasu
-#: server/diplhand.c:512 server/diplhand.c:515
+#: server/diplhand.c:515 server/diplhand.c:518
#, c-format
msgid "You agree on an alliance with %s."
msgstr "%s ã¨ã®åŒç›Ÿã«åˆæ„ã—ã¾ã—ãŸã€‚"
# yasu
-#: server/diplhand.c:524
+#: server/diplhand.c:527
#, c-format
msgid "You give shared vision to %s."
msgstr "%s ã¨ã®è¦–ç•Œã®å…±æœ‰ã‚’許å¯ã—ã¾ã—ãŸã€‚"
# yasu
-#: server/diplhand.c:527
+#: server/diplhand.c:530
#, c-format
msgid "%s gives you shared vision."
msgstr "%s ã¨ã®è¦–ç•Œã®å…±æœ‰ã‚’許å¯ã•ã‚Œã¾ã—ãŸã€‚"
# yasu
-#: server/diplhand.c:663
+#: server/diplhand.c:666
#, c-format
msgid "%s canceled the meeting!"
msgstr "%s ã¯ä¼šåˆã‚’ä¸æ¢ã—ã¾ã—ãŸã€‚"
# yasu
-#: server/diplhand.c:670
+#: server/diplhand.c:673
#, c-format
msgid "Meeting with %s canceled."
msgstr "%s ã¨ã®ä¼šåˆã¯ä¸æ¢ã•ã‚Œã¾ã—ãŸã€‚"
# clefs
-#: server/diplhand.c:712
+#: server/diplhand.c:715
msgid "Your diplomatic envoy was decapitated!"
msgstr "ã‚ãªãŸã®å¤–交使節ã¯æ‰“ã¡é¦–ã«ãªã‚Šã¾ã—ãŸï¼"
@@ -3590,88 +3619,88 @@ msgid "The %s destroyed the %s in %s."
msgstr "%1$sã¯%3$sã®%2$sã‚’ç ´å£Šã—ã¾ã—ãŸã€‚"
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1091
+#: server/diplomats.c:1097
#, fuzzy, c-format
msgid "An enemy %s has been eliminated by your %s."
msgstr "敵ã®%sã¯%sを守ã‚ã†ã¨ã—ã¦æ¶ˆã•ã‚Œã¾ã—ãŸã€‚"
#. TRANS: <unit> ... <city> ... <diplomat>
-#: server/diplomats.c:1098
+#: server/diplomats.c:1104
#, c-format
msgid "Your %s has been eliminated defending %s against a %s."
msgstr "%1$sã¯%2$sã‹ã‚‰%3$sを守ã‚ã†ã¨ã—ã¦æ¶ˆã•ã‚Œã¾ã—ãŸã€‚"
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1106
+#: server/diplomats.c:1112
#, fuzzy, c-format
msgid "Your %s has been eliminated defending against a %s."
msgstr "%sã¯ã‹ã‚‰%sを守ã‚ã†ã¨ã—ã¦æ¶ˆã•ã‚Œã¾ã—ãŸã€‚"
-#: server/diplomats.c:1119
+#: server/diplomats.c:1125
#, c-format
msgid "Your %s was eliminated by a defending %s."
msgstr "%sã¯å®ˆã£ã¦ã„ã‚‹%sã«ã‚ˆã£ã¦æ¶ˆã•ã‚Œã¾ã—ãŸã€‚"
-#: server/diplomats.c:1127
+#: server/diplomats.c:1133
#, c-format
msgid "Eliminated %s %s while infiltrating %s."
msgstr "%3$sã¸æ½œå…¥ä¸ã®%1$sã®%2$sを消ã—ã¾ã—ãŸã€‚"
-#: server/diplomats.c:1134
+#: server/diplomats.c:1140
#, c-format
msgid "Eliminated %s %s while infiltrating our troops."
msgstr "我ãŒè»ã¸æ½œå…¥ä¸ã®%1$sã®%2$sを消ã—ã¾ã—ãŸã€‚"
-#: server/diplomats.c:1185
+#: server/diplomats.c:1191
#, fuzzy, c-format
msgid ""
"Your %s has successfully completed the mission and returned unharmed to %s."
msgstr "%sã¯ä»»å‹™ã‚’完了ã—，無事%sã¸æˆ»ã‚Šã¾ã—ãŸã€‚"
# 訳ã«ã¯åæ˜ ã§ãã¦ã„ã¾ã›ã‚“ãŒã€ã‚¹ãƒ‘イã¯å¥³ã¨ã„ã†è¨å®šã®ã‚ˆã†ã§ã™ (clefs)
-#: server/diplomats.c:1204
+#: server/diplomats.c:1210
#, fuzzy, c-format
msgid "Your %s was captured after completing the mission in %s."
msgstr "%sã¯%sã§ä»»å‹™ã‚’完了ã—ãŸå¾Œï¼Œé€®æ•ã•ã‚Œã¾ã—ãŸã€‚"
-#: server/diplomats.c:1210
+#: server/diplomats.c:1216
#, fuzzy, c-format
msgid "Your %s was captured after completing the mission."
msgstr "%sã¯ä»»å‹™ã‚’完了ã—ãŸå¾Œï¼Œé€®æ•ã•ã‚Œã¾ã—ãŸã€‚"
# clefs
# 'incident' => '事変'ã§è¨³ã—ã¦ã¿ã¾ã—ãŸ
-#: server/diplomats.c:1242
+#: server/diplomats.c:1248
#, fuzzy, c-format
msgid "You have caused an incident while bribing the %s %s."
msgstr "%sã®%sã‚’è²·åŽã™ã‚‹è©¦ã¿ã¯äº‹å¤‰ã«ç™ºå±•ã—ã¾ã—ãŸã€‚"
# clefs
-#: server/diplomats.c:1247
+#: server/diplomats.c:1253
#, c-format
msgid "%s has caused an incident while bribing your %s."
msgstr "%sã¯%sã‚’è²·åŽã—よã†ã¨ã—ã¦äº‹å¤‰ã‚’引ãèµ·ã“ã—ã¾ã—ãŸã€‚"
# clefs
-#: server/diplomats.c:1254
+#: server/diplomats.c:1260
#, c-format
msgid "You have caused an incident while attempting to steal tech from %s."
msgstr "%sã‹ã‚‰æŠ€è¡“を盗む試ã¿ã¯äº‹å¤‰ã«ç™ºå±•ã—ã¾ã—ãŸã€‚"
# clefs
-#: server/diplomats.c:1258
+#: server/diplomats.c:1264
#, c-format
msgid "%s has caused an incident while attempting to steal tech from you."
msgstr "%sã¯ã‚ãªãŸã‹ã‚‰æŠ€è¡“ã‚’ç›—ã‚‚ã†ã¨ã—ã¦äº‹å¤‰ã‚’引ãèµ·ã“ã—ã¾ã—ãŸã€‚"
# clefs
-#: server/diplomats.c:1264
+#: server/diplomats.c:1270
#, c-format
msgid "You have caused an incident while inciting a revolt in %s."
msgstr "%sã§å›ä¹±ã‚’煽動ã™ã‚‹è©¦ã¿ã¯äº‹å¤‰ã«ç™ºå±•ã—ã¾ã—ãŸã€‚"
# clefs
-#: server/diplomats.c:1268
+#: server/diplomats.c:1274
#, c-format
msgid "%s have caused an incident while inciting a revolt in %s."
msgstr "%sã¯%sã§å›ä¹±ã‚’煽動ã—よã†ã¨ã—ã¦äº‹å¤‰ã‚’引ãèµ·ã“ã—ã¾ã—ãŸã€‚"
@@ -3790,13 +3819,13 @@ msgstr ""
"労åƒè€…ã¯è‡ªç™ºçš„ã«é›†ã¾ã‚Šï¼Œå…¨ã¦ã®éƒ½å¸‚ã«é‰„é“を引ãã¾ã™ã€‚"
# clefs
-#: server/maphand.c:1418
+#: server/maphand.c:1425
#, c-format
msgid "Moved your %s due to changing terrain."
msgstr "地形ã®å¤‰æ›´ã«ä¼´ã„%sを移動ã—ã¾ã—ãŸã€‚"
# clefs
-#: server/maphand.c:1436
+#: server/maphand.c:1443
#, c-format
msgid "Disbanded your %s due to changing terrain."
msgstr "地形ã®å¤‰æ›´ã«ä¼´ã„%sを解散ã—ã¾ã—ãŸã€‚"
@@ -3805,7 +3834,7 @@ msgstr "地形ã®å¤‰æ›´ã«ä¼´ã„%sを解散ã—ã¾ã—ãŸã€‚"
msgid "Not reporting to the metaserver in this game."
msgstr "ã“ã®ã‚²ãƒ¼ãƒ ã§ã¯ãƒ¡ã‚¿ã‚µãƒ¼ãƒã¸ã¯å ±å‘Šã—ã¦ã„ã¾ã›ã‚“。"
-#: server/meta.c:430
+#: server/meta.c:432
#, c-format
msgid "Metaserver: bad address: [%s:%d]."
msgstr "メタサーãƒ: é–“é•ã£ãŸã‚¢ãƒ‰ãƒ¬ã‚¹: [%s:%d]"
@@ -3942,31 +3971,31 @@ msgstr ""
# yasu, clefs
# was "プレイヤー %s ã‚’ä¸æ¢ã•ã›ã¾ã™ã€‚"
-#: server/plrhand.c:1103
+#: server/plrhand.c:1115
#, c-format
msgid "Removing player %s."
msgstr "プレイヤー %s を除去ã—ã¾ã™ã€‚"
# yasu, clefs
# was "ã‚ãªãŸã¯ã‚²ãƒ¼ãƒ ã‚’ä¸æ¢ã•ã›ã‚‰ã‚Œã¾ã—ãŸã€‚"
-#: server/plrhand.c:1105
+#: server/plrhand.c:1117
msgid "You've been removed from the game!"
msgstr "ã‚ãªãŸã¯ã‚²ãƒ¼ãƒ ã‹ã‚‰é™¤åŽ»ã•ã‚Œã¾ã—ãŸï¼"
# yasu, clefs
# was "%sã¯ã‚²ãƒ¼ãƒ ã‚’ä¸æ¢ã•ã›ã‚‰ã‚Œã¾ã—ãŸã€‚"
-#: server/plrhand.c:1108
+#: server/plrhand.c:1120
#, c-format
msgid "%s has been removed from the game."
msgstr "%sã¯ã‚²ãƒ¼ãƒ ã‹ã‚‰é™¤åŽ»ã•ã‚Œã¾ã—ãŸã€‚"
-#: server/plrhand.c:1153 server/plrhand.c:1158
+#: server/plrhand.c:1167 server/plrhand.c:1172
#, c-format
msgid "You have made contact with the %s, ruled by %s."
msgstr "ã‚ãªãŸã¯ %2$s ã«ã‚ˆã£ã¦çµ±æ²»ã•ã‚ŒãŸ %1$s ã¨æŽ¥è§¦ã—ã¾ã—ãŸã€‚"
# clefs
-#: server/plrhand.c:1178
+#: server/plrhand.c:1192
#, c-format
msgid ""
"%s and %s meet and go to instant war. You cancel your alliance with both."
@@ -3974,20 +4003,20 @@ msgstr ""
"%s 㨠%s ã¯æŽ¥è§¦ã¨åŒæ™‚ã«æˆ¦äº‰çŠ¶æ…‹ã¨ãªã‚Šã¾ã—ãŸã€‚両国ã¨ã®åŒç›Ÿã‚’ç ´æ£„ã—ã¾ã™ã€‚"
# clefs
-#: server/plrhand.c:1656
+#: server/plrhand.c:1670
#, c-format
msgid "Could not throw %s into civil war - too many players"
msgstr "%sã«å†…戦を起ã“ã›ã¾ã›ã‚“ã§ã—ãŸâ€•â€•ãƒ—レイヤーãŒå¤šã™ãŽã¾ã™"
# clefs
-#: server/plrhand.c:1663
+#: server/plrhand.c:1677
#, fuzzy, c-format
msgid "Could not throw %s into civil war - no available nations"
msgstr "%sã«å†…戦を起ã“ã›ã¾ã›ã‚“ã§ã—ãŸâ€•â€•ãƒ—レイヤーãŒå¤šã™ãŽã¾ã™"
# yasu
# XXX
-#: server/plrhand.c:1686
+#: server/plrhand.c:1700
#, fuzzy, c-format
msgid ""
"Your nation is thrust into civil war! %s is declared the leader of the rebel "
@@ -3995,14 +4024,14 @@ msgid ""
msgstr "ã‚ãªãŸã®å›½ã¯å†…戦ã«ãªã‚Šã¾ã—ãŸã€‚%sãŒå›ä¹±è€…ã®ãƒªãƒ¼ãƒ€ãƒ¼å®£è¨€ã—ã¾ã—ãŸã€‚"
# yasu
-#: server/plrhand.c:1707
+#: server/plrhand.c:1721
#, c-format
msgid "%s declares allegiance to %s."
msgstr "%sã¯%sã«å¯¾ã™ã‚‹å¿ èª ã‚’å®£è¨€ã—ã¾ã—ãŸã€‚"
# clefs
# 原文ã®2行目以é™ã«è¡Œé ã®ã‚¹ãƒšãƒ¼ã‚¹ãŒã‚ã‚‹ã®ã¯ã€1行目ã®ã€ŒGame:ã€ã‚’消ã—ãŸå残りã‹
-#: server/plrhand.c:1722
+#: server/plrhand.c:1736
#, fuzzy, c-format
msgid ""
"Capture of the %s capital and destruction of the empire's administrative\n"
@@ -4193,67 +4222,67 @@ msgstr "(%2$s(%3$s)ã§%1$sを建築ä¸)\n"
msgid "Wonders of the World"
msgstr "世界ã®ä¸æ€è°"
-#: server/report.c:547
+#: server/report.c:552
msgid " sq. mi."
msgstr "平方マイル"
-#: server/report.c:557
+#: server/report.c:562
msgid " M tons"
msgstr "00万トン"
-#: server/report.c:562
+#: server/report.c:567
msgid " M goods"
msgstr "00万å“"
# clefs
# 科å¦æŠ€è¡“ã®ã€Œé›»çƒã€
-#: server/report.c:567
+#: server/report.c:572
msgid " bulbs"
msgstr "å˜ä½"
-#: server/report.c:572
+#: server/report.c:577
msgid " month"
msgid_plural " months"
msgstr[0] "ヶ月"
-#: server/report.c:577
+#: server/report.c:582
msgid " ton"
msgid_plural " tons"
msgstr[0] " トン"
-#: server/report.c:591
+#: server/report.c:596
msgid "st"
msgstr "ä½"
-#: server/report.c:593
+#: server/report.c:598
msgid "nd"
msgstr "ä½"
-#: server/report.c:595
+#: server/report.c:600
msgid "rd"
msgstr "ä½"
-#: server/report.c:597
+#: server/report.c:602
msgid "th"
msgstr "ä½"
# clefs
-#: server/report.c:700
+#: server/report.c:705
msgid "Demography string contains invalid characters. Try \"help demography\"."
msgstr ""
"人å£çµ±è¨ˆè¨å®šæ–‡å—列ã«ç„¡åŠ¹ãªæ–‡å—ãŒå«ã¾ã‚Œã¦ã„ã¾ã™ã€‚\"help demography\"å‚ç…§"
-#: server/report.c:743 server/report.c:768
+#: server/report.c:748 server/report.c:773
msgid "Demographics Report:"
msgstr "人å£çµ±è¨ˆå ±å‘Š:"
-#: server/report.c:744
+#: server/report.c:749
msgid "Sorry, the Demographics report is unavailable."
msgstr "ã™ã¿ã¾ã›ã‚“。人å£çµ±è¨ˆå ±å‘Šã¯åˆ©ç”¨ã§ãã¾ã›ã‚“。"
#. TRANS: <nation adjective> <government name> (<year>).
#. * E.g. "Polish Despotism (200 AD)".
-#: server/report.c:750
+#: server/report.c:755
#, fuzzy, c-format
msgid "%s %s (%s)"
msgstr "%s: %s(%s)\n"
@@ -4264,11 +4293,11 @@ msgstr "%s: %s(%s)\n"
msgid "Could not find a readable \"%s.%s\" ruleset file."
msgstr "ルールセットファイル \"%s.%s\" ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。"
-#: server/ruleset.c:2356
+#: server/ruleset.c:2366
msgid "No barbarian nation in rulesets, at least one required!"
msgstr ""
-#: server/ruleset.c:3166
+#: server/ruleset.c:3178
msgid "Loading rulesets"
msgstr "ルールセットをãƒãƒ¼ãƒ‰ã—ã¦ã„ã¾ã™"
@@ -4284,13 +4313,13 @@ msgstr ""
"ã“ã‚‹ã“ã¨ã‚‚ã‚ã‚‹ã—，ä¸æ£ãªã‚»ãƒ¼ãƒ–ゲームファイルを指定ã—ãŸã®ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。自分"
"ã®ãƒªã‚¹ã‚¯ã§ç¶šã‘ã¦ä¸‹ã•ã„。"
-#: server/savegame.c:3588
+#: server/savegame.c:3587
#, fuzzy
msgid "Saved game is too old, at least version 1.9.0 required."
msgstr "savegame ã¯å¤éŽãŽã¾ã™ã€‚1.9.0 以上ãŒå¿…è¦ã§ã™ã€‚"
#. TRANS: Fatal error message.
-#: server/savegame.c:3815
+#: server/savegame.c:3817
#, fuzzy
msgid ""
"Saved game uses the \"classic\" terrain ruleset, and is no longer supported."
@@ -4298,7 +4327,7 @@ msgstr ""
"savegame ã¯ã‚‚ã†ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ãªã„ classic terrain ルールセットを使ã£ã¦ã„ã¾"
"ã™ã€‚"
-#: server/savegame.c:3824
+#: server/savegame.c:3826
#, c-format
msgid ""
"Warning: Different rulesetdirs ('%s' and '%s') are no longer supported. "
@@ -4308,7 +4337,7 @@ msgstr ""
"使ã„ã¾ã™ã€‚"
#. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4051
+#: server/savegame.c:4055
#, c-format
msgid "%s had invalid nation; changing to %s."
msgstr ""
@@ -4341,7 +4370,7 @@ msgstr "内部è¨å®š"
msgid "Networking"
msgstr "ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯"
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:734
#: client/gui-win32/dialogs.c:532
msgid "All"
msgstr "å…¨ã¦"
@@ -5605,11 +5634,11 @@ msgstr ""
"ã“ã®å¤‰æ•°ã‚’ 1 ã«è¨å®šã™ã‚‹ã¨ï¼Œãƒ—レイヤー統計をターン毎ã«ãƒ•ã‚¡ã‚¤ãƒ«\"civscore.log"
"\" ã«è¿½åŠ ã—ã¾ã™ã€‚ã“れらã®çµ±è¨ˆã¯ï¼Œã‚²ãƒ¼ãƒ 後パワー・グラフを作るã®ã«ä½¿ã‚ã‚Œã¾ã™ã€‚"
-#: server/sernet.c:150
+#: server/sernet.c:151
msgid "Server cannot read standard input. Ignoring input."
msgstr "サーãƒã¯æ¨™æº–入力をèªã‚€ã“ã¨ãŒã§ãã¾ã›ã‚“。入力を無視ã—ã¦ã„ã¾ã™ã€‚"
-#: server/sernet.c:929
+#: server/sernet.c:933
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr "サーãƒ: é–“é•ã£ãŸã‚¢ãƒ‰ãƒ¬ã‚¹: [%s:%d]"
@@ -5693,52 +5722,52 @@ msgid "Without guidance from the capital, the %s spaceship is lost!"
msgstr "首都ã‹ã‚‰ã®èª˜å°ŽãŒãªã„ãŸã‚，%sã®å®‡å®™èˆ¹ã¯å¤±ã‚ã‚Œã¾ã—ãŸã€‚"
# clefs
-#: server/srv_main.c:240
+#: server/srv_main.c:242
msgid "Game ended in a draw as end year exceeded"
msgstr "終了年ã«é”ã—ãŸãŸã‚ゲームã¯å¼•ã分ã‘ã§çµ‚了ã—ã¾ã—ãŸ"
# yasu
-#: server/srv_main.c:274
+#: server/srv_main.c:276
#, c-format
msgid "The %s spaceship has arrived at Alpha Centauri."
msgstr "%sã®å®‡å®™èˆ¹ãŒã‚¢ãƒ«ãƒ•ã‚¡ã‚±ãƒ³ã‚¿ã‚¦ãƒªã«ç€ãã¾ã—ãŸã€‚"
# clefs
-#: server/srv_main.c:287 server/srv_main.c:322
+#: server/srv_main.c:289 server/srv_main.c:324
#, c-format
msgid "Team victory to %s"
msgstr "ãƒãƒ¼ãƒ %sãŒå‹åˆ©ã—ã¾ã—ãŸ"
-#: server/srv_main.c:297 server/srv_main.c:338
+#: server/srv_main.c:299 server/srv_main.c:340
#, c-format
msgid "Game ended in victory for %s"
msgstr "%sã®å‹åˆ©ã§ã‚²ãƒ¼ãƒ ã¯çµ‚了ã—ã¾ã—ãŸ"
# clefs
-#: server/srv_main.c:345
+#: server/srv_main.c:347
msgid "Game ended in a draw"
msgstr "ゲームã¯å¼•ã分ã‘ã§çµ‚了ã—ã¾ã—ãŸ"
-#: server/srv_main.c:461 server/srv_main.c:472
+#: server/srv_main.c:465 server/srv_main.c:476
#, fuzzy, c-format
msgid "Your %s was disbanded in accordance with your peace treaty with the %s."
msgstr "ã‚ãªãŸã®%s部隊ã¯%sã¨ã®å¹³å’Œæ¡ç´„ã«åŸºã¥ã解散ã•ã‚Œã¾ã—ãŸã€‚"
# yasu, clefs
-#: server/srv_main.c:512 server/srv_main.c:516
+#: server/srv_main.c:516 server/srv_main.c:520
#, c-format
msgid ""
"Concerned citizens point out that the cease-fire with %s will run out soon."
msgstr "憂慮ã—ãŸå¸‚æ°‘ãŒï¼Œ%sã¨ã®åœæˆ¦ã¯ã¾ã‚‚ãªã終了ã™ã‚‹ã¨æŒ‡æ‘˜ã—ã¦ã„ã¾ã™ã€‚"
# yasu, clefs
-#: server/srv_main.c:521 server/srv_main.c:525
+#: server/srv_main.c:525 server/srv_main.c:529
#, c-format
msgid "The cease-fire with %s has run out. You are now at war with the %s."
msgstr "%sã¨ã®åœæˆ¦ã¯çµ‚了ã—ã¾ã—ãŸã€‚以後，%sã¨ã¯äº¤æˆ¦çŠ¶æ…‹ã«ãªã‚Šã¾ã™ã€‚"
# clefs
-#: server/srv_main.c:542
+#: server/srv_main.c:546
#, c-format
msgid ""
"Ceasefire between %s and %s has run out. They are at war. You cancel your "
@@ -5747,235 +5776,223 @@ msgstr ""
"%sã¨%sã®åœæˆ¦æœŸé–“ã¯çµ‚了ã—ã¾ã—ãŸã€‚両国ã¯æˆ¦äº‰çŠ¶æ…‹ã¨ãªã‚Šã¾ã—ãŸã€‚両方ã¨ã®åŒç›Ÿã‚’ç ´"
"棄ã—ã¾ã™ã€‚"
-#: server/srv_main.c:961
+#: server/srv_main.c:997
#, c-format
msgid "Failed saving game as %s"
msgstr "%s ã¨ã„ã†åå‰ã§ã‚²ãƒ¼ãƒ ã‚’ä¿å˜å¤±æ•—ã—ã¾ã—ãŸã€‚"
-#: server/srv_main.c:963
+#: server/srv_main.c:999
#, c-format
msgid "Game saved as %s"
msgstr "%s ã¨ã„ã†åå‰ã§ã‚²ãƒ¼ãƒ をセーブã—ã¾ã—ãŸã€‚"
-#: server/srv_main.c:994
+#: server/srv_main.c:1030
msgid "The game is already running."
msgstr "ゲームã¯æ—¢ã«å§‹ã¾ã£ã¦ã„ã¾ã™ã€‚"
# clefs
-#: server/srv_main.c:1002
+#: server/srv_main.c:1038
#, c-format
msgid "%s lost control cmdlevel on game start. Use voting from now on."
msgstr ""
"%sã¯ã‚²ãƒ¼ãƒ 開始ã¨åŒæ™‚ã«controlコマンドレベルを失ã„ã¾ã—ãŸã€‚以後ã¯æŠ•ç¥¨ã‚·ã‚¹ãƒ†ãƒ ã‚’"
"使用ã—ã¦ãã ã•ã„。"
-#: server/srv_main.c:1009
+#: server/srv_main.c:1045
msgid "Starting game."
msgstr "ゲームを開始ã—ã¦ã„ã¾ã™ã€‚"
# clefs
-#: server/srv_main.c:1071
+#: server/srv_main.c:1112
#, c-format
msgid "request for unknown report (type %d)"
msgstr "ä¸æ˜Žãªå ±å‘Šã®è¦æ±‚ã§ã™ (タイプ %d)"
# clefs
-#: server/srv_main.c:1136
+#: server/srv_main.c:1177
#, c-format
msgid "Warning: rejecting old client %s"
msgstr "è¦å‘Š: 旧型ã®ã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆ%sã‚’æ‹’å¦ã—ã¾ã—ãŸ"
# yasu
-#: server/srv_main.c:1238
+#: server/srv_main.c:1279
#, c-format
msgid "Got a packet of type %d from a dead or observer player"
msgstr "%d タイプã®ãƒ‘ケットを全滅ã¾ãŸã¯è¦³å¯Ÿä¸ã®ãƒ—レイヤーã‹ã‚‰å—ã‘å–ã‚Šã¾ã—ãŸã€‚"
# yasu
-#: server/srv_main.c:1338
+#: server/srv_main.c:1381
msgid "Please choose a non-blank name."
msgstr "空白ã§ã¯ãªã„åå‰ã‚’é¸ã‚“ã§ä¸‹ã•ã„。"
# clefs
-#: server/srv_main.c:1354
+#: server/srv_main.c:1397
msgid "That nation is already in use."
msgstr "ãã®æ°‘æ—ã¯æ—¢ã«ä½¿ã‚ã‚Œã¦ã„ã¾ã™ã€‚"
# yasu, ama
-#: server/srv_main.c:1370
+#: server/srv_main.c:1413
#, c-format
msgid "Another player already has the name '%s'. Please choose another name."
msgstr ""
"ä»–ã®ãƒ—レイヤーãŒæ—¢ã«'%s'ã¨ã„ã†åå‰ã‚’é¸ã‚“ã§ã„ã¾ã™ã€‚ä»–ã®åå‰ã‚’é¸ã‚“ã§ãã ã•ã„。"
# yasu, clefs
-#: server/srv_main.c:1391
+#: server/srv_main.c:1434
msgid "Please choose a name containing only ASCII characters."
msgstr "ASCIIæ–‡å—ã ã‘ã§ç¶´ã‚‰ã‚ŒãŸåå‰ã«ã—ã¦ãã ã•ã„。"
# clefs
-#: server/srv_main.c:1490
+#: server/srv_main.c:1533
#, c-format
msgid "%s nation is not available in this scenario."
msgstr "ã“ã®ã‚·ãƒŠãƒªã‚ªã§ã¯%sã¯é¸æŠžã§ãã¾ã›ã‚“。"
-#: server/srv_main.c:1496
+#: server/srv_main.c:1539
#, c-format
msgid "%s nation is already in use."
msgstr "%sã¯ã‚‚ã†ä»–ã®èª°ã‹ãŒé¸æŠžã—ã¦ã„ã¾ã™ã€‚"
-#: server/srv_main.c:1514
+#: server/srv_main.c:1557
#, c-format
msgid "%s is the %s ruler %s."
msgstr "%sã¯%sã®æ”¯é…者%sã§ã™ã€‚"
# clefs
-#: server/srv_main.c:1570
+#: server/srv_main.c:1613
#, 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:1614 server/srv_main.c:1618
+#: server/srv_main.c:1657 server/srv_main.c:1661
#, c-format
msgid "%s has been added as %s level AI-controlled player."
msgstr "%s ã¯%sレベルã®AIプレイヤーã¨ã—ã¦åŠ ã‚ã‚Šã¾ã—ãŸã€‚"
-#: server/srv_main.c:1760
+#: server/srv_main.c:1803
#, c-format
msgid "Player %d"
msgstr "プレイヤー %d"
# clefs
-#: server/srv_main.c:1771 server/srv_main.c:1777
+#: server/srv_main.c:1814 server/srv_main.c:1820
#, c-format
msgid "%s rules the %s."
msgstr "%sã¯%sを統治ã—ã¾ã™ã€‚"
-#: server/srv_main.c:1942
+#: server/srv_main.c:1985
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
msgstr ""
-#: server/srv_main.c:1993
+#: server/srv_main.c:2037
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr "メタサーãƒã«æƒ…å ±ã‚’é€ã£ã¦ã„ã¾ã™ [%s]"
-#: server/srv_main.c:2024
+#: server/srv_main.c:2069
msgid "The game is over..."
msgstr "ゲームオーãƒãƒ¼ã§ã™!"
-#: server/srv_main.c:2237
+#: server/srv_main.c:2286
msgid "Now accepting new client connections."
msgstr "æ–°ã—ã„クライアント接続をå—ã‘付ã‘ã¦ã„ã¾ã™ã€‚"
-# clefs
-#: server/stdinhand.c:246
-#, c-format
-msgid "Vote \"%s\" is passed %d to %d with %d abstentions."
-msgstr "投票 \"%s\" ã¯è³›æˆ%d, å対%d, 棄権%d ã§å¯æ±ºã•ã‚Œã¾ã—ãŸã€‚"
-
-# clefs
-#: server/stdinhand.c:253
-#, c-format
-msgid "Vote \"%s\" failed with %d against, %d for and %d abstentions."
-msgstr "投票 \"%s\" ã¯å対%d, è³›æˆ%d, 棄権%d ã§å¦æ±ºã•ã‚Œã¾ã—ãŸã€‚"
-
#. TRANS: ambiguous command
-#: server/stdinhand.c:365
+#: server/stdinhand.c:284
msgid "(ambiguous)"
msgstr "(ã‚ã„ã¾ã„)"
#. TRANS: unrecognized command
#. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:416
+#: server/stdinhand.c:287 client/citydlg_common.c:419
#: 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 "(ä¸æ˜Ž)"
-#: server/stdinhand.c:458
+#: server/stdinhand.c:377
msgid "Name is empty, so cannot be a player."
msgstr "åå‰ãŒç©ºã§ã™ã€‚プレイヤーを入力ã—ã¦ä¸‹ã•ã„。"
-#: server/stdinhand.c:462
+#: server/stdinhand.c:381
msgid "Name is too long, so cannot be a player."
msgstr "åå‰ãŒé•·éŽãŽã¾ã™ã€‚プレイヤーをæ£ã—ã入力ã—ã¦ä¸‹ã•ã„。"
-#: server/stdinhand.c:466
+#: server/stdinhand.c:385
#, c-format
msgid "Player name prefix '%s' is ambiguous."
msgstr "プレイヤーåã®å…ˆé 部分 '%s' ã¯ä¸€æ„ã§ã¯ã‚ã‚Šã¾ã›ã‚“。"
-#: server/stdinhand.c:470
+#: server/stdinhand.c:389
#, c-format
msgid "No player by the name of '%s'."
msgstr "'%s' ã¨ã„ã†åå‰ã®ãƒ—レイヤーã¯ã„ã¾ã›ã‚“。"
-#: server/stdinhand.c:474 server/stdinhand.c:509
+#: server/stdinhand.c:393 server/stdinhand.c:428
#, c-format
msgid "Unexpected match_result %d (%s) for '%s'."
msgstr "'%3$s' ã«å¯¾ã—ã¦äºˆæœŸã—ãªã„ match_result %1$d (%2$s)。"
-#: server/stdinhand.c:493
+#: server/stdinhand.c:412
msgid "Name is empty, so cannot be a connection."
msgstr "åå‰ãŒç©ºãªã®ã§æŽ¥ç¶šã§ãã¾ã›ã‚“。"
-#: server/stdinhand.c:497
+#: server/stdinhand.c:416
msgid "Name is too long, so cannot be a connection."
msgstr "åå‰ãŒé•·éŽãŽã‚‹ã®ã§æŽ¥ç¶šã§ãã¾ã›ã‚“。"
-#: server/stdinhand.c:501
+#: server/stdinhand.c:420
#, c-format
msgid "Connection name prefix '%s' is ambiguous."
msgstr "接続åã®å…ˆé 部分 '%s' ã¯ä¸€æ„ã§ã¯ã‚ã‚Šã¾ã›ã‚“。"
-#: server/stdinhand.c:505
+#: server/stdinhand.c:424
#, c-format
msgid "No connection by the name of '%s'."
msgstr "'%s' ã¨ã„ã†åå‰ã®æŽ¥ç¶šã¯ã‚ã‚Šã¾ã›ã‚“。"
-#: server/stdinhand.c:525
+#: server/stdinhand.c:444
#, c-format
msgid "Open metaserver connection to [%s]."
msgstr "[%s]ã¸ã®ãƒ¡ã‚¿ã‚µãƒ¼ãƒæŽ¥ç¶šã‚’é–‹ãã¾ã™ã€‚"
-#: server/stdinhand.c:538
+#: server/stdinhand.c:457
#, c-format
msgid "Close metaserver connection to [%s]."
msgstr "[%s]ã¸ã®ãƒ¡ã‚¿ã‚µãƒ¼ãƒæŽ¥ç¶šã‚’é–‰ã˜ã¾ã™ã€‚"
-#: server/stdinhand.c:553
+#: server/stdinhand.c:472
msgid "Metaserver connection is open."
msgstr "メタサーãƒæŽ¥ç¶šã¯é–‹ã„ã¦ã„ã¾ã™ã€‚"
-#: server/stdinhand.c:556
+#: server/stdinhand.c:475
msgid "Metaserver connection is closed."
msgstr "メタサーãƒæŽ¥ç¶šã¯é–‰ã–ã•ã‚Œã¾ã—ãŸã€‚"
-#: server/stdinhand.c:566
+#: server/stdinhand.c:485
msgid "Metaserver connection is already open."
msgstr "メタサーãƒæŽ¥ç¶šã¯æ—¢ã«é–‹ã„ã¦ã„ã¾ã™ã€‚"
-#: server/stdinhand.c:577
+#: server/stdinhand.c:496
msgid "Metaserver connection is already closed."
msgstr "メタサーãƒæŽ¥ç¶šã¯æ—¢ã«é–‰ã˜ã¦ã„ã¾ã™ã€‚"
-#: server/stdinhand.c:582
+#: server/stdinhand.c:501
msgid "Argument must be 'u', 'up', 'd', 'down', or '?'."
msgstr "引数㯠'u', 'up', 'd', 'down', '?' ã®ã„ãšã‚Œã‹ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。"
# clefs
# patches stringã¯ã‚µãƒ¼ãƒã«é©ç”¨ã•ã‚Œã¦ã„るパッãƒã®ç¨®é¡žã‚’åºƒå ±ã™ã‚‹æ–‡å—列
-#: server/stdinhand.c:603
+#: server/stdinhand.c:522
#, c-format
msgid "Metaserver patches string set to '%s'."
msgstr "メタサーãƒã®ãƒ‘ッãƒæ–‡å—列を '%s' ã¸è¨å®šã—ã¾ã™ã€‚"
# clefs
-#: server/stdinhand.c:606
+#: server/stdinhand.c:525
#, c-format
msgid "Metaserver patches string set to '%s', not reporting to metaserver."
msgstr ""
@@ -5983,134 +6000,134 @@ msgstr ""
"ã›ã‚“。"
# clefs
-#: server/stdinhand.c:627
+#: server/stdinhand.c:546
#, c-format
msgid "Metaserver message string set to '%s'."
msgstr "メタサーãƒã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸æ–‡å—列を '%s' ã¸è¨å®šã—ã¾ã™ã€‚"
# clefs
-#: server/stdinhand.c:630
+#: server/stdinhand.c:549
#, c-format
msgid "Metaserver message string set to '%s', not reporting to metaserver."
msgstr ""
"メタサーãƒã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸æ–‡å—列を '%s' ã¸è¨å®šã—ã¾ã™ã€‚メタサーãƒã¸ã®é€šçŸ¥ã¯è¡Œã£ã¦"
"ã„ã¾ã›ã‚“。"
-#: server/stdinhand.c:650
+#: server/stdinhand.c:569
#, c-format
msgid "Metaserver is now [%s]."
msgstr "メタサーãƒã¯ä»Šã§ã¯[%s]ã§ã™ã€‚"
-#: server/stdinhand.c:660
+#: server/stdinhand.c:579
#, c-format
msgid "Server id: %s"
msgstr "サーãƒID: %s"
-#: server/stdinhand.c:757
+#: server/stdinhand.c:676
msgid "You cannot save games manually on this server."
msgstr "ã“ã®ã‚µãƒ¼ãƒã§ã¯ã‚²ãƒ¼ãƒ を手動ã§ã‚»ãƒ¼ãƒ–ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。"
-#: server/stdinhand.c:774
+#: server/stdinhand.c:693
msgid "Cannot toggle a barbarian player."
msgstr "ãƒãƒ¼ãƒãƒªã‚¢ãƒ³ãƒ»ãƒ—レイヤーã¯ãƒˆã‚°ãƒ«ã§ãã¾ã›ã‚“。"
-#: server/stdinhand.c:781
+#: server/stdinhand.c:700
#, c-format
msgid "%s is now under AI control."
msgstr "%s 㯠AI ãŒæ“作ã—ã¾ã™ã€‚"
-#: server/stdinhand.c:802
+#: server/stdinhand.c:721
#, c-format
msgid "%s is now under human control."
msgstr "%s ã¯äººé–“ãŒæ“作ã—ã¾ã™ã€‚"
-#: server/stdinhand.c:847
+#: server/stdinhand.c:766
msgid "Can't add AI players once the game has begun."
msgstr "一旦ゲームãŒå§‹ã¾ã‚‹ã¨ AI ãƒ—ãƒ¬ã‚¤ãƒ¤ãƒ¼ã‚’è¿½åŠ ã§ãã¾ã›ã‚“。"
-#: server/stdinhand.c:867
+#: server/stdinhand.c:786
msgid "Can't add more players, server is full."
msgstr "ãƒ—ãƒ¬ã‚¤ãƒ¤ãƒ¼ã‚’è¿½åŠ ã§ãã¾ã›ã‚“。サーãƒæº€å“¡ã§ã™ã€‚"
-#: server/stdinhand.c:874
+#: server/stdinhand.c:793
msgid "Can't use an empty name."
msgstr "空ã®åå‰ã¯ä½¿ãˆã¾ã›ã‚“。"
-#: server/stdinhand.c:881
+#: server/stdinhand.c:800
#, c-format
msgid "That name exceeds the maximum of %d chars."
msgstr "ãã®åå‰ã¯æœ€é•·ã®%dæ–‡å—を越ãˆã¦ã„ã¾ã™ã€‚"
# clefs
-#: server/stdinhand.c:887
+#: server/stdinhand.c:806
msgid "That name is not allowed."
msgstr "ãã®åå‰ã¯è¨±å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“。"
-#: server/stdinhand.c:893
+#: server/stdinhand.c:812
msgid "A player already exists by that name."
msgstr "ãã®åå‰ã®ãƒ—レイヤーã¯æ—¢ã«å˜åœ¨ã—ã¾ã™ã€‚"
-#: server/stdinhand.c:899
+#: server/stdinhand.c:818
msgid "A user already exists by that name."
msgstr "ãã®åå‰ã®ãƒ¦ãƒ¼ã‚¶ã¯æ—¢ã«å˜åœ¨ã—ã¾ã™ã€‚"
-#: server/stdinhand.c:925
+#: server/stdinhand.c:844
#, c-format
msgid "%s has been added as an AI-controlled player."
msgstr "%s 㯠AI プレイヤーã¨ã—ã¦åŠ ã‚ã‚Šã¾ã—ãŸã€‚"
-#: server/stdinhand.c:932
+#: server/stdinhand.c:851
#, c-format
msgid "Error creating new AI player: %s."
msgstr "æ–°ã—ã„ AI プレイヤー作æˆã‚¨ãƒ©ãƒ¼: %s"
-#: server/stdinhand.c:966
+#: server/stdinhand.c:885
msgid "Players cannot be removed once the game has started."
msgstr "一旦ゲームãŒé–‹å§‹ã•ã‚ŒãŸå¾Œã§ã¯ï¼Œãƒ—レイヤーを削除ã§ãã¾ã›ã‚“。"
-#: server/stdinhand.c:977
+#: server/stdinhand.c:896
#, c-format
msgid "Removed player %s from the game."
msgstr "ゲームã‹ã‚‰ãƒ—レイヤー %s を追ã„出ã—ã¾ã—ãŸã€‚"
# clefs
-#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
+#: server/stdinhand.c:935 server/stdinhand.c:3372 server/stdinhand.c:3507
#, c-format
msgid "Name \"%s\" disallowed for security reasons."
msgstr "\"%s\" ã¨ã„ã†åå‰ã¯ã‚»ã‚ュリティ上ã®ç†ç”±ã‹ã‚‰è¨±å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“。"
# clefs
-#: server/stdinhand.c:1029
+#: server/stdinhand.c:948
#, c-format
msgid "No command script found by the name \"%s\"."
msgstr "'%s' ã¨ã„ã†åå‰ã®ã‚³ãƒžãƒ³ãƒ‰ãƒ»ã‚¹ã‚¯ãƒªãƒ—トã¯ã‚ã‚Šã¾ã›ã‚“。"
-#: server/stdinhand.c:1037
+#: server/stdinhand.c:956
#, c-format
msgid "Loading script file: %s"
msgstr "スクリプトフィアルをãƒãƒ¼ãƒ‰ã—ã¦ã„ã¾ã™: %s"
-#: server/stdinhand.c:1052
+#: server/stdinhand.c:971
#, c-format
msgid "Cannot read command line scriptfile '%s'."
msgstr "コマンドライン・スクリプトファイル '%s' ã‚’èªã‚€ã“ã¨ãŒã§ãã¾ã›ã‚“。"
-#: server/stdinhand.c:1054
+#: server/stdinhand.c:973
#, c-format
msgid "Could not read script file '%s'."
msgstr "スクリプトファイル '%s' ã‚’èªã‚€ã“ã¨ãŒã§ãã¾ã›ã‚“ã§ã—ãŸã€‚"
-#: server/stdinhand.c:1146
+#: server/stdinhand.c:1065
#, c-format
msgid "Could not write script file '%s'."
msgstr "スクリプトファイル '%s' を書ãã“ã¨ãŒã§ãã¾ã›ã‚“ã§ã—ãŸã€‚"
# clefs
-#: server/stdinhand.c:1158
+#: server/stdinhand.c:1077
msgid "You cannot use the write command on this server for security reasons."
msgstr "ã‚»ã‚ュリティ上ã®ç†ç”±ã§ write コマンドã¯åˆ©ç”¨ã§ãã¾ã›ã‚“。"
-#: server/stdinhand.c:1186
+#: server/stdinhand.c:1105
#, c-format
msgid ""
"Cannot decrease command access level '%s' for connection '%s'; you only have "
@@ -6119,35 +6136,40 @@ msgstr ""
"接続 '%2$s' ã®ã‚³ãƒžãƒ³ãƒ‰åˆ©ç”¨æ¨©ãƒ¬ãƒ™ãƒ«ã‚’ '%1$s' ã¸ä¸‹ã’られã¾ã›ã‚“; 利用権 '%3$s' "
"ã—ã‹æŒã£ã¦ã„ã¾ã›ã‚“。"
+#: server/stdinhand.c:1114
+#, c-format
+msgid "Command access level set to '%s' for connection %s."
+msgstr "接続 %2$s ã®ã‚³ãƒžãƒ³ãƒ‰åˆ©ç”¨æ¨©ãƒ¬ãƒ™ãƒ«ã‚’ '%1$s' ã«è¨å®šã—ã¾ã—ãŸã€‚"
+
# clefs
-#: server/stdinhand.c:1241
+#: server/stdinhand.c:1163
#, c-format
msgid ""
"Anyone can now become game organizer '%s' by issuing the 'first' command."
msgstr "誰ã§ã‚‚ 'first' コマンドを発行ã™ã‚‹ã“ã¨ã§ã‚²ãƒ¼ãƒ 主催者 '%s' ã«ãªã‚Œã¾ã™ã€‚"
-#: server/stdinhand.c:1274
+#: server/stdinhand.c:1187
msgid "Command access levels in effect:"
msgstr "ç¾åœ¨ã®ã‚³ãƒžãƒ³ãƒ‰åˆ©ç”¨æ¨©ãƒ¬ãƒ™ãƒ«:"
-#: server/stdinhand.c:1282
+#: server/stdinhand.c:1194
#, c-format
msgid "Command access level for new connections: %s"
msgstr "æ–°è¦æŽ¥ç¶šè€…ã®ã‚³ãƒžãƒ³ãƒ‰åˆ©ç”¨æ¨©ãƒ¬ãƒ™ãƒ«: %s"
-#: server/stdinhand.c:1285
+#: server/stdinhand.c:1197
#, c-format
msgid "Command access level for first player to take it: %s"
msgstr "最åˆã®ãƒ—レイヤーãŒå–å¾—ã™ã‚‹ã‚³ãƒžãƒ³ãƒ‰åˆ©ç”¨æ¨©ãƒ¬ãƒ™ãƒ«: %s"
-#: server/stdinhand.c:1294
+#: server/stdinhand.c:1206
msgid ""
"Error: command access level must be one of 'none', 'info', 'ctrl', or 'hack'."
msgstr ""
"エラー: コマンド利用権レベル㯠'none', 'info', 'ctrl', 'hack' ã®ã„ãšã‚Œã‹ã§ãª"
"ã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。"
-#: server/stdinhand.c:1299
+#: server/stdinhand.c:1211
#, c-format
msgid ""
"Cannot increase command access level to '%s'; you only have '%s' yourself."
@@ -6155,198 +6177,188 @@ msgstr ""
"'%1$s' ã¸ã‚³ãƒžãƒ³ãƒ‰åˆ©ç”¨æ¨©ãƒ¬ãƒ™ãƒ«ã‚’上ã’られã¾ã›ã‚“; ã‚ãªãŸã¯åˆ©ç”¨æ¨© '%2$s' ã—ã‹æŒã£"
"ã¦ã„ã¾ã›ã‚“。"
-#: 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: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:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
+#: server/stdinhand.c:1238 server/stdinhand.c:1252 server/stdinhand.c:1273
#, c-format
msgid "Command access level set to '%s' for new players."
msgstr "æ–°è¦ãƒ—レイヤーã®ã‚³ãƒžãƒ³ãƒ‰åˆ©ç”¨æ¨©ãƒ¬ãƒ™ãƒ«ã‚’ '%s' ã«è¨å®šã—ã¾ã—ãŸã€‚"
-#: server/stdinhand.c:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
+#: server/stdinhand.c:1243 server/stdinhand.c:1257 server/stdinhand.c:1267
#, c-format
msgid "Command access level set to '%s' for first player to grab it."
msgstr "最åˆã®ãƒ—レイヤーãŒå–å¾—ã™ã‚‹ã‚³ãƒžãƒ³ãƒ‰åˆ©ç”¨æ¨©ãƒ¬ãƒ™ãƒ«ã‚’ '%s' ã«è¨å®šã—ã¾ã—ãŸã€‚"
-#: server/stdinhand.c:1402
+#: server/stdinhand.c:1302
msgid "The 'first' command makes no sense from the server command line."
msgstr ""
"サーãƒã®ã‚³ãƒžãƒ³ãƒ‰ãƒ©ã‚¤ãƒ³ã§ 'first' コマンドを利用ã—ã¦ã‚‚æ„味ãŒã‚ã‚Šã¾ã›ã‚“。"
-#: server/stdinhand.c:1406
+#: server/stdinhand.c:1306
#, c-format
msgid "You already have command access level '%s' or better."
msgstr "æ—¢ã«ã‚³ãƒžãƒ³ãƒ‰åˆ©ç”¨æ¨©ãƒ¬ãƒ™ãƒ«ã¯ '%s' 以上ã§ã™ã€‚"
# clefs
-#: server/stdinhand.c:1411
+#: server/stdinhand.c:1311
msgid "Someone else already is game organizer."
msgstr "ä»–ã®èª°ã‹ãŒæ—¢ã«ã‚²ãƒ¼ãƒ 主催者ã«ãªã£ã¦ã„ã¾ã™ã€‚"
# clefs
-#: server/stdinhand.c:1416
+#: server/stdinhand.c:1316
#, c-format
msgid "Connection %s has opted to become the game organizer."
msgstr "接続 %s ãŒã‚²ãƒ¼ãƒ 主催者ã«ãªã‚‹ã“ã¨ã‚’é¸æŠžã—ã¾ã—ãŸã€‚"
-#: server/stdinhand.c:1467
+#: server/stdinhand.c:1367
#, c-format
msgid "Invalid argument %d."
msgstr "無効ãªå¼•æ•° %d"
-#: server/stdinhand.c:1474
+#: server/stdinhand.c:1374
msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
msgstr "使用法: timeoutincrease <ターン> <ã‚¿ãƒ¼ãƒ³å¢—åŠ > <値> <乗値>"
-#: server/stdinhand.c:1482
+#: server/stdinhand.c:1382
#, c-format
msgid "Dynamic timeout set to %d %d %d %d"
msgstr "動的タイムアオウトを %d %d %d %d ã¸ã‚»ãƒƒãƒˆã—ã¾ã™"
-#: server/stdinhand.c:1542 server/stdinhand.c:1545
+#: server/stdinhand.c:1442 server/stdinhand.c:1445
msgid "Option:"
msgstr "オプション:"
-#: server/stdinhand.c:1555 server/stdinhand.c:4031
+#: server/stdinhand.c:1455 server/stdinhand.c:4079
msgid "Description:"
msgstr "説明:"
-#: server/stdinhand.c:1560
+#: server/stdinhand.c:1460
#, c-format
msgid "Status: %s"
msgstr "状態: %s"
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "changeable"
msgstr "変更å¯"
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "fixed"
msgstr "固定"
-#: server/stdinhand.c:1567
+#: server/stdinhand.c:1467
#, c-format
msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
msgstr "ç¾åœ¨å€¤: %d, 最å°å€¤: 0, 既定値: %d, 最大値: 1"
-#: server/stdinhand.c:1572
+#: server/stdinhand.c:1472
#, c-format
msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
msgstr "ç¾åœ¨å€¤: %d, 最å°å€¤: %d, 既定値: %d, 最大値: %d"
-#: server/stdinhand.c:1578
+#: server/stdinhand.c:1478
#, c-format
msgid "Value: \"%s\", Default: \"%s\""
msgstr "ç¾åœ¨å€¤: \"%s\", 既定値: \"%s\""
-#: server/stdinhand.c:1597
+#: server/stdinhand.c:1497
msgid "Explanations are available for the following server options:"
msgstr "以下ã«æŒ™ã’るサーãƒã‚ªãƒ—ションã«ã¯ï¼Œèª¬æ˜ŽãŒã‚ã‚Šã¾ã™:"
-#: server/stdinhand.c:1643
+#: server/stdinhand.c:1537
msgid "No explanation for that yet."
msgstr "ãã®èª¬æ˜Žã¯ã¾ã ã‚ã‚Šã¾ã›ã‚“。"
-#: server/stdinhand.c:1646 server/stdinhand.c:2480
+#: server/stdinhand.c:1540 server/stdinhand.c:2468
msgid "Ambiguous option name."
msgstr "オプションåã‚’çœç•¥ã—éŽãŽã§ã™ã€‚"
-#: server/stdinhand.c:1666
+#: server/stdinhand.c:1560
#, c-format
msgid "Server Operator: %s"
msgstr "サーãƒã‚ªãƒšãƒ¬ãƒ¼ã‚¿: %s"
# clefs
-#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
+#: server/stdinhand.c:1686 server/stdinhand.c:1713 server/stdinhand.c:1731
#, c-format
msgid "Player '%s' now has AI skill level '%s'."
msgstr "プレイヤー '%s' 㯠手腕 '%s' ã®AIã«ãªã‚Šã¾ã—ãŸã€‚"
-#: server/stdinhand.c:1822
+#: server/stdinhand.c:1718
#, c-format
msgid "%s is not controlled by the AI."
msgstr "%s 㯠AI ã§åˆ¶å¾¡ã•ã‚Œã¦ã„ã¾ã›ã‚“。"
-#: server/stdinhand.c:1842
+#: server/stdinhand.c:1738
#, c-format
msgid "Default AI skill level set to '%s'."
msgstr "デフォルト㮠AI 手腕を '%s' ã«è¨å®šã—ã¾ã—ãŸã€‚"
# clefs
-#: server/stdinhand.c:1857 server/stdinhand.c:2162
+#: server/stdinhand.c:1753
msgid "This command is client only."
msgstr "ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã¯ã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆã§ã—ã‹åˆ©ç”¨ã§ãã¾ã›ã‚“。"
-#: server/stdinhand.c:1860
+#: server/stdinhand.c:1756
msgid "Usage: away"
msgstr "使用法: away"
-#: server/stdinhand.c:1865
+#: server/stdinhand.c:1761
msgid "Only players may use the away command."
msgstr "プレイヤーã®ã¿ãŒawayコマンドを利用ã§ãã¾ã™ã€‚"
# clefs
-#: server/stdinhand.c:1869
+#: server/stdinhand.c:1765
#, c-format
msgid "%s set to away mode."
msgstr "%sã¯ä¸åœ¨ãƒ¢ãƒ¼ãƒ‰ã«ãªã‚Šã¾ã—ãŸã€‚"
-#: server/stdinhand.c:1877
+#: server/stdinhand.c:1772
#, c-format
msgid "%s returned to game."
msgstr "%sãŒã‚²ãƒ¼ãƒ ã«å¾©å¸°ã—ã¾ã—ãŸã€‚"
-#: server/stdinhand.c:1919
+#: server/stdinhand.c:1817
#, c-format
msgid "Sorry, you do not have access to view option '%s'."
msgstr "残念ãªãŒã‚‰ã‚ªãƒ—ション '%s' を閲覧ã™ã‚‹æ¨©é™ã‚’æŒã£ã¦ã„ã¾ã›ã‚“。"
-#: server/stdinhand.c:1925
+#: server/stdinhand.c:1823
#, c-format
msgid "Unknown option '%s'."
msgstr "未知ã®ã‚ªãƒ—ション '%s'。"
# ama, clefs
# was "= ã¯æ—¢å®šå€¤ã®ã¾ã¾ã®ã‚ªãƒ—ションをæ„味ã—ã¾ã™ã€‚"
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1848
msgid "All options with non-default values"
msgstr "デフォルトã‹ã‚‰å¤‰æ›´ã•ã‚Œã¦ã„ã‚‹å…¨ã¦ã®ã‚ªãƒ—ション"
# clefs
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1851
msgid "All options"
msgstr "å…¨ã¦ã®ã‚ªãƒ—ション"
# clefs
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1854
msgid "Vital options"
msgstr "特ã«é‡è¦ãªã‚ªãƒ—ション"
# situationalã£ã¦ã®ã¯ã‚ã‹ã‚Šã«ãã„ãŒã€è¦ã¯å¯¾æˆ¦ã®æ™‚ã«ã©ã‚Œã ã‘æ„味をæŒã¤ã‹ã«ã‚ˆã‚‹
# 分類ã®ã‚ˆã†ã§ã™ (clefs)
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1857
msgid "Situational options"
msgstr "状æ³ã«ã‚ˆã‚Šå¿…è¦ã«ãªã‚‹ã‚ªãƒ—ションè¨å®š"
# clefs
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1860
msgid "Rarely used options"
msgstr "ã‚ã£ãŸã«ä½¿ã‚ã‚Œãªã„オプション"
# ama, clefs
-#: server/stdinhand.c:1965
+#: server/stdinhand.c:1863
msgid "+ means you may change the option"
msgstr "+ ã¯å¤‰æ›´å¯èƒ½ãªã‚ªãƒ—ションをæ„味ã—ã¾ã™ã€‚"
# ama, clefs
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1864
msgid "= means the option is on its default value"
msgstr "= ã¯æ—¢å®šå€¤ã®ã¾ã¾ã®ã‚ªãƒ—ションをæ„味ã—ã¾ã™ã€‚"
@@ -6355,21 +6367,21 @@ msgstr "= ã¯æ—¢å®šå€¤ã®ã¾ã¾ã®ã‚ªãƒ—ションをæ„味ã—ã¾ã™ã€‚"
# /show: オプション 値 (最å°,最大) 説明
# /show: ----------------------------------------------------------------
# /show: separatepoles +=1 (0,1) 極地ãŒå¤§é™¸ã‹ã‚‰é›¢ã‚Œã¦
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
#, c-format
msgid "%-*s value (min,max) "
msgstr "%-*s 値 (最å°,最大) "
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
msgid "Option"
msgstr "オプション"
-#: server/stdinhand.c:1973
+#: server/stdinhand.c:1871
msgid "description"
msgstr "説明"
# clefs
-#: server/stdinhand.c:2042
+#: server/stdinhand.c:1940
msgid ""
"Try 'show situational' or 'show rare' to show more options.\n"
"Try 'show changed' to show settings with non-default values."
@@ -6378,219 +6390,286 @@ msgstr ""
"ã™ã€‚\n"
"'show changed' ã§ï¼Œå¤‰æ›´ã•ã‚ŒãŸã‚ªãƒ—ションã®ã¿ã‚’表示ã—ã¾ã™ã€‚"
-#: server/stdinhand.c:2092
+#: server/stdinhand.c:1966
msgid "Cannot change teams once game has begun."
msgstr "一旦ゲームãŒå§‹ã¾ã‚‹ã¨ãƒãƒ¼ãƒ を変更ã§ãã¾ã›ã‚“。"
# clefs
-#: server/stdinhand.c:2102
+#: server/stdinhand.c:1976
msgid "Undefined argument. Usage: team <player> <team>."
msgstr "定義ã•ã‚Œã¦ã„ãªã„引数ã§ã™ã€‚使用法: team <プレイヤー> [ãƒãƒ¼ãƒ ]"
# clefs
-#: server/stdinhand.c:2122
+#: server/stdinhand.c:1996
#, c-format
msgid "No such team %s. Please give a valid team name or number."
msgstr "%sã¨ã„ã†ãƒãƒ¼ãƒ ã¯ã‚ã‚Šã¾ã›ã‚“。æ£ã—ã„ãƒãƒ¼ãƒ åã‹ç•ªå·ã‚’入力ã—ã¦ãã ã•ã„。"
# clefs
-#: server/stdinhand.c:2129
+#: server/stdinhand.c:2003
msgid "Cannot team a barbarian."
msgstr "ãƒãƒ¼ãƒãƒªã‚¢ãƒ³ãƒ»ãƒ—レイヤーã¨ã¯ãƒãƒ¼ãƒ を組ã‚ã¾ã›ã‚“。"
-#: server/stdinhand.c:2135
+#: server/stdinhand.c:2009
#, c-format
msgid "Player %s set to team %s."
msgstr "プレイヤー %s ã‚’ãƒãƒ¼ãƒ %s ã«åŠ ãˆã¾ã—ãŸã€‚"
-# clefs
-#: server/stdinhand.c:2157
-msgid "Undefined arguments. Usage: vote yes|no [vote number]."
-msgstr "定義ã•ã‚Œã¦ã„ãªã„引数ã§ã™ã€‚使用法: vote yes|no [投票番å·]"
+#: server/stdinhand.c:2035 server/voting.c:512
+#, fuzzy
+msgid "Teamvote"
+msgstr "ãƒãƒ¼ãƒ "
-# clefs
-#: server/stdinhand.c:2165
-msgid "Observers cannot vote."
-msgstr "観察者ã¯æŠ•ç¥¨ã§ãã¾ã›ã‚“。"
+#: server/stdinhand.c:2035 server/voting.c:516
+msgid "Vote"
+msgstr ""
-# clefs
-#: server/stdinhand.c:2168
+#: server/stdinhand.c:2037
+#, c-format
msgid ""
-"You can only vote in a running game. Use 'first' to become the game "
-"organizer if there currently is none."
+"%s %d \"%s\" (needs %0.0f%%%s): %d for, %d against, and %d abstained out of %"
+"d players."
msgstr ""
-"投票ã¯å®Ÿè¡Œä¸ã®ã‚²ãƒ¼ãƒ ã§ã®ã¿è¡Œãˆã¾ã™ã€‚ã‚‚ã—ゲーム主催者ãŒã„ãªã„よã†ãª"
-"ら，'first' コマンドã§ã‚²ãƒ¼ãƒ 主催者ã«ãªã£ã¦ãã ã•ã„。"
-# clefs
-#: server/stdinhand.c:2181
-#, c-format
-msgid "Vote %d \"%s\": %d for, %d against"
-msgstr "投票 %d \"%s\": è³›æˆ %d , å対%d"
+#: server/stdinhand.c:2041
+msgid " no dissent"
+msgstr ""
# clefs
-#: server/stdinhand.c:2188
+#: server/stdinhand.c:2049
msgid "There are no votes going on."
msgstr "投票ã¯è¡Œã‚ã‚Œã¦ã„ã¾ã›ã‚“。"
# clefs
-#: server/stdinhand.c:2208
-msgid "No legal last vote."
+#: server/stdinhand.c:2077
+#, fuzzy
+msgid "Invalid arguments. Usage: vote yes|no|abstain [vote number]."
+msgstr "定義ã•ã‚Œã¦ã„ãªã„引数ã§ã™ã€‚使用法: vote yes|no [投票番å·]"
+
+#: server/stdinhand.c:2095 server/stdinhand.c:2213 server/stdinhand.c:3714
+msgid "You are not allowed to use this command."
+msgstr "ãã®ã‚³ãƒžãƒ³ãƒ‰ã‚’利用ã§ãã¾ã›ã‚“。"
+
+#: server/stdinhand.c:2104
+#, fuzzy, c-format
+msgid "The argument \"%s\" is ambigious."
+msgstr "ヘルプ引数 '%s' ã¯çœç•¥ã—ã™ãŽã§ã™ã€‚"
+
+# clefs
+#: server/stdinhand.c:2119
+#, fuzzy
+msgid "There are no votes running."
+msgstr "投票ã¯è¡Œã‚ã‚Œã¦ã„ã¾ã›ã‚“。"
+
+# clefs
+#: server/stdinhand.c:2121
+#, fuzzy, c-format
+msgid "No legal last vote (%d %s)."
msgstr "ã¾ã 有効ãªæŠ•ç¥¨ã¯ã‚ã‚Šã¾ã›ã‚“。"
-#: server/stdinhand.c:2213
-msgid "Value must be integer."
+#: server/stdinhand.c:2122
+msgid "other vote running"
+msgid_plural "other votes running"
+msgstr[0] ""
+
+#: server/stdinhand.c:2129 server/stdinhand.c:2491 server/stdinhand.c:2532
+msgid "Value must be an integer."
msgstr "値ã¯æ•´æ•°ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。"
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2135 server/stdinhand.c:2221
#, c-format
msgid "No such vote (%d)."
msgstr "ãã®ã‚ˆã†ãªæŠ•ç¥¨ã¯ã‚ã‚Šã¾ã›ã‚“ (%d)。"
+#: server/stdinhand.c:2141
+#, fuzzy
+msgid "You are not allowed to vote on that."
+msgstr "ã“ã®ã‚ªãƒ—ションã®è¨å®šã‚’許å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“。"
+
# clefs
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2146
#, c-format
msgid "You voted for \"%s\""
msgstr "\"%s\" ã«è³›æˆç¥¨ã‚’投ã˜ã¾ã—ãŸã€‚"
# clefs
-#: server/stdinhand.c:2232
+#: server/stdinhand.c:2150
#, c-format
msgid "You voted against \"%s\""
msgstr "\"%s\" ã«å対票を投ã˜ã¾ã—ãŸã€‚"
-#: server/stdinhand.c:2259
+#: server/stdinhand.c:2155
+#, c-format
+msgid "You abstained from voting on \"%s\""
+msgstr ""
+
+#: server/stdinhand.c:2190
+msgid "Missing argument <vote number> or the string \"all\"."
+msgstr ""
+
+# yasu, Daniel
+#: server/stdinhand.c:2197
+#, fuzzy
+msgid "You don't have any vote going on."
+msgstr "ã“ã“ã«ã¯åŠ´åƒè€…ã¯ã„ã¾ã›ã‚“。"
+
+# clefs
+#: server/stdinhand.c:2204
+#, fuzzy
+msgid "There isn't any vote going on."
+msgstr "投票ã¯è¡Œã‚ã‚Œã¦ã„ã¾ã›ã‚“。"
+
+#: server/stdinhand.c:2209
+msgid "Server: All votes have been removed."
+msgstr ""
+
+#: server/stdinhand.c:2226
+#, fuzzy, c-format
+msgid "You are not allowed to cancel this vote (%d)."
+msgstr "ã“ã®ã‚ªãƒ—ションã®è¨å®šã‚’許å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“。"
+
+#: server/stdinhand.c:2232
+msgid "Usage: /cancelvote [<vote number>|all]"
+msgstr ""
+
+#: server/stdinhand.c:2241
+#, c-format
+msgid "Server: %s cancelled the vote \"%s\" (number %d)."
+msgstr ""
+
+#: server/stdinhand.c:2247
+#, c-format
+msgid "Server: The vote \"%s\" (number %d) has been cancelled."
+msgstr ""
+
+#: server/stdinhand.c:2265
msgid ""
"Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
"<x> <y> | unit <id> | tech <player> | timing | info>."
msgstr ""
-#: server/stdinhand.c:2265
+#: server/stdinhand.c:2271
msgid "Can only use this command once game has begun."
msgstr "ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã¯ã‚²ãƒ¼ãƒ 開始後ã«ã®ã¿ä½¿ç”¨ã§ãã¾ã™ã€‚"
-#: server/stdinhand.c:2294
+#: server/stdinhand.c:2300
#, c-format
msgid "%s diplomacy no longer debugged"
msgstr ""
-#: server/stdinhand.c:2298
+#: server/stdinhand.c:2304
#, c-format
msgid "%s diplomacy debugged"
msgstr ""
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2323
#, c-format
msgid "%s tech no longer debugged"
msgstr ""
-#: server/stdinhand.c:2321
+#: server/stdinhand.c:2327
#, c-format
msgid "%s tech debugged"
msgstr ""
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2358 server/stdinhand.c:2388
msgid "Value 2 & 3 must be integer."
msgstr "値2・3ã¯æ•´æ•°ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。"
-#: server/stdinhand.c:2356 server/stdinhand.c:2386
+#: server/stdinhand.c:2362 server/stdinhand.c:2392
msgid "Bad map coordinates."
msgstr ""
-#: server/stdinhand.c:2361
+#: server/stdinhand.c:2367
msgid "No city at this coordinate."
msgstr ""
-#: server/stdinhand.c:2366
+#: server/stdinhand.c:2372
#, c-format
msgid "%s no longer debugged"
msgstr ""
-#: server/stdinhand.c:2392 server/stdinhand.c:2422
+#: server/stdinhand.c:2398 server/stdinhand.c:2428
#, c-format
msgid "%s %s no longer debugged."
msgstr ""
-#: server/stdinhand.c:2397 server/stdinhand.c:2427
+#: server/stdinhand.c:2403 server/stdinhand.c:2433
#, c-format
msgid "%s %s debugged."
msgstr ""
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2419
msgid "Value 2 must be integer."
msgstr "値2ã¯æ•´æ•°ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。"
-#: server/stdinhand.c:2417
+#: server/stdinhand.c:2423
#, c-format
msgid "Unit %d does not exist."
msgstr ""
-#: server/stdinhand.c:2475
+#: server/stdinhand.c:2464
msgid "Undefined argument. Usage: set <option> <value>."
msgstr "ä¸æ˜Žãªå¼•æ•°ã§ã™ã€‚使用法: set <オプションå> <値>"
-#: server/stdinhand.c:2485
+#: server/stdinhand.c:2473
msgid "You are not allowed to set this option."
msgstr "ã“ã®ã‚ªãƒ—ションã®è¨å®šã‚’許å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“。"
-#: server/stdinhand.c:2490 server/stdinhand.c:3463
+#: server/stdinhand.c:2478 server/stdinhand.c:3501
msgid "This setting can't be modified after the game has started."
msgstr "ゲームãŒé–‹å§‹ã•ã‚ŒãŸå¾Œï¼Œã“ã®è¨å®šã‚’変更ã§ãã¾ã›ã‚“。"
-#: server/stdinhand.c:2502 server/stdinhand.c:2543
-msgid "Value must be an integer."
-msgstr "値ã¯æ•´æ•°ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。"
-
-#: server/stdinhand.c:2512
+#: server/stdinhand.c:2501
#, c-format
msgid "The parameter %s should only contain digits 0-1."
msgstr ""
-#: server/stdinhand.c:2519
+#: server/stdinhand.c:2508
msgid "Value out of range (minimum: 0, maximum: 1)."
msgstr "範囲外ã®å€¤ã§ã™ (最å°å€¤: 0, 最大値: 1)"
-#: server/stdinhand.c:2534 server/stdinhand.c:2576
+#: server/stdinhand.c:2523 server/stdinhand.c:2565
#, c-format
msgid "Option: %s has been set to %d."
msgstr "オプション: %s 㯠%d ã«è¨å®šã•ã‚Œã¾ã—ãŸã€‚"
-#: server/stdinhand.c:2554
+#: server/stdinhand.c:2543
#, c-format
msgid "The parameter %s should only contain +- and 0-9."
msgstr ""
-#: server/stdinhand.c:2561
+#: server/stdinhand.c:2550
#, c-format
msgid "Value out of range (minimum: %d, maximum: %d)."
msgstr "範囲外ã®å€¤ã§ã™ (最å°å€¤: %d, 最大値: %d)"
-#: server/stdinhand.c:2586
+#: server/stdinhand.c:2575
msgid "String value too long. Usage: set <option> <value>."
msgstr "æ–‡å—列ã®å€¤ãŒé•·ã™ãŽã¾ã™ã€‚使用法: set <オプション> <値>"
-#: server/stdinhand.c:2600
+#: server/stdinhand.c:2589
#, c-format
msgid "Option: %s has been set to \"%s\"."
msgstr "オプション: %s 㯠\"%s\" ã«è¨å®šã•ã‚Œã¾ã—ãŸã€‚"
# clefs
-#: server/stdinhand.c:2658
+#: server/stdinhand.c:2652
msgid "Sorry, one can't observe globally in this game."
msgstr "残念ãªãŒã‚‰ã“ã®ã‚²ãƒ¼ãƒ ã§ã¯ã‚²ãƒ¼ãƒ 全体ã®è¦³å¯Ÿã‚’èªã‚ã¦ã„ã¾ã›ã‚“。"
# clefs
-#: server/stdinhand.c:2661
+#: server/stdinhand.c:2655
msgid "Sorry, you can't take a global observer. Observe it instead."
msgstr "残念ãªãŒã‚‰å…¨ä½“ã®è¦³å¯Ÿè€…ã‚’takeã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。observeã—ã¾ã—ょã†ã€‚"
-#: server/stdinhand.c:2671
+#: server/stdinhand.c:2665
#, fuzzy
msgid "You cannot take a new player at this time."
msgstr "残念ãªãŒã‚‰ã“ã®ã‚²ãƒ¼ãƒ ã§ã¯äººé–“モードプレイヤーã¸ã®å†æŽ¥ç¶šã¯ã§ãã¾ã›ã‚“。"
#. TRANS: Do not translate "maxplayers".
-#: server/stdinhand.c:2679
+#: server/stdinhand.c:2673
#, c-format
msgid ""
"You cannot take a new player because the maximum of %d player has already "
@@ -6600,83 +6679,83 @@ msgid_plural ""
"been reached (maxplayers setting)."
msgstr[0] ""
-#: server/stdinhand.c:2691
+#: server/stdinhand.c:2685
msgid "You cannot take a new player because there are no free player slots."
msgstr ""
# clefs
-#: server/stdinhand.c:2702
+#: server/stdinhand.c:2696
msgid "Sorry, one can't observe barbarians in this game."
msgstr "残念ãªãŒã‚‰ã“ã®ã‚²ãƒ¼ãƒ ã§ã¯ãƒãƒ¼ãƒãƒªã‚¢ãƒ³ã®è¦³å¯Ÿã¯ã§ãã¾ã›ã‚“。"
# clefs
-#: server/stdinhand.c:2705
+#: server/stdinhand.c:2699
msgid "Sorry, one can't take barbarians in this game."
msgstr "残念ãªãŒã‚‰ã“ã®ã‚²ãƒ¼ãƒ ã§ã¯ãƒãƒ¼ãƒãƒªã‚¢ãƒ³ã®æ“作ã¯ã§ãã¾ã›ã‚“。"
-#: server/stdinhand.c:2713
+#: server/stdinhand.c:2707
msgid "Sorry, one can't observe dead players in this game."
msgstr "残念ãªãŒã‚‰ã“ã®ã‚²ãƒ¼ãƒ ã§ã¯æ»ã‚“ã プレイヤーã®è¦³å¯Ÿã¯ã§ãã¾ã›ã‚“。"
# clefs
-#: server/stdinhand.c:2716
+#: server/stdinhand.c:2710
msgid "Sorry, one can't take dead players in this game."
msgstr "残念ãªãŒã‚‰ã“ã®ã‚²ãƒ¼ãƒ ã§ã¯æ»ã‚“ã プレイヤーã®æ“作ã¯ã§ãã¾ã›ã‚“。"
-#: server/stdinhand.c:2724
+#: server/stdinhand.c:2718
msgid "Sorry, one can't observe AI players in this game."
msgstr "残念ãªãŒã‚‰ã“ã®ã‚²ãƒ¼ãƒ ã§ã¯ AI プレイヤーã®è¦³å¯Ÿã¯ã§ãã¾ã›ã‚“。"
# clefs
-#: server/stdinhand.c:2727
+#: server/stdinhand.c:2721
msgid "Sorry, one can't take AI players in this game."
msgstr "残念ãªãŒã‚‰ã“ã®ã‚²ãƒ¼ãƒ ã§ã¯ AI プレイヤーã®æ“作ã¯ã§ãã¾ã›ã‚“。"
-#: server/stdinhand.c:2736
+#: server/stdinhand.c:2730
msgid "Sorry, one can't observe human players in this game."
msgstr "残念ãªãŒã‚‰ã“ã®ã‚²ãƒ¼ãƒ ã§ã¯äººé–“モードプレイヤーã®è¦³å¯Ÿã¯ã§ãã¾ã›ã‚“。"
-#: server/stdinhand.c:2739
+#: server/stdinhand.c:2733
msgid "Sorry, one can't take human players in this game."
msgstr "残念ãªãŒã‚‰ã“ã®ã‚²ãƒ¼ãƒ ã§ã¯äººé–“モードプレイヤーã¸ã®å†æŽ¥ç¶šã¯ã§ãã¾ã›ã‚“。"
# clefs
-#: server/stdinhand.c:2749
+#: server/stdinhand.c:2743
msgid "Sorry, one can't observe in this game."
msgstr "残念ãªãŒã‚‰ã“ã®ã‚²ãƒ¼ãƒ ã§ã¯è¦³å¯Ÿã‚’èªã‚ã¦ã„ã¾ã›ã‚“。"
-#: server/stdinhand.c:2754
+#: server/stdinhand.c:2748
msgid "Sorry, one can't take players in this game."
msgstr "残念ãªãŒã‚‰ã“ã®ã‚²ãƒ¼ãƒ ã§ã¯æ–°ã—ã„プレイヤーã®å‚åŠ ã‚’èªã‚ã¦ã„ã¾ã›ã‚“。"
# clefs
-#: server/stdinhand.c:2760
+#: server/stdinhand.c:2754
msgid "Sorry, one can't take players already connected in this game."
msgstr "残念ãªãŒã‚‰ã“ã®ã‚²ãƒ¼ãƒ ã§ã¯æŽ¥ç¶šæ¸ˆã®ãƒ—レイヤーã®ä¹—ã£å–ã‚Šã‚’èªã‚ã¦ã„ã¾ã›ã‚“。"
# clefs
-#: server/stdinhand.c:2791
+#: server/stdinhand.c:2785
msgid "Usage: observe [connection-name [player-name]]"
msgstr "使用法: observe [接続å [プレイヤーå]]"
-#: server/stdinhand.c:2797
+#: server/stdinhand.c:2791
msgid "Usage: observe [player-name]"
msgstr "使用法: observe [プレイヤーå]"
# clefs XXX
-#: server/stdinhand.c:2847
+#: server/stdinhand.c:2841
#, c-format
msgid "%s already controls %s. Using 'observe' would remove %s"
msgstr "%sãŒæ—¢ã«%sã‚’æ“作ã—ã¦ã„ã¾ã™ã€‚'observe'ã§%sを除去ã—ã¾ã™"
# clefs
-#: server/stdinhand.c:2858
+#: server/stdinhand.c:2852
#, c-format
msgid "%s is already observing %s."
msgstr "%sãŒæ—¢ã«%sを観察ã—ã¦ã„ã¾ã™ã€‚"
# clefs
-#: server/stdinhand.c:2863
+#: server/stdinhand.c:2857
#, c-format
msgid "%s is already observing."
msgstr "%sã¯æ—¢ã«è¦³å¯Ÿã—ã¦ã„ã¾ã™ã€‚"
@@ -6693,256 +6772,263 @@ msgstr "%s ㌠%s を観察ã—ã¦ã„ã¾ã™"
msgid "%s now observes"
msgstr "%s ã¯è¦³å¯Ÿã—ã¦ã„ã¾ã™"
-#: server/stdinhand.c:2969
+#: server/stdinhand.c:2971
msgid "Usage: take <connection-name> <player-name>"
msgstr "使用法: take <接続å> <プレイヤーå>"
-#: server/stdinhand.c:2974
+#: server/stdinhand.c:2976
msgid "Usage: take <player-name>"
msgstr "使用法: take <プレイヤーå>"
-#: server/stdinhand.c:2980
+#: server/stdinhand.c:2982
msgid "Usage: take [connection-name] <player-name>"
msgstr "使用法: take [接続å] <プレイヤーå>"
# clefs
-#: server/stdinhand.c:3010
+#: server/stdinhand.c:3012
#, fuzzy, c-format
msgid "%s already controls %s."
msgstr "%sãŒæ—¢ã«%sã‚’æ“作ã—ã¦ã„ã¾ã™"
-#: server/stdinhand.c:3024
+#: server/stdinhand.c:3026
#, fuzzy, c-format
msgid "There is no free player slot for %s."
msgstr "%s ã¨ã„ã†åå‰ã®ãƒ—レイヤーもã—ãã¯æŽ¥ç¶šã¯ã‚ã‚Šã¾ã›ã‚“。"
# clefs
-#: server/stdinhand.c:3059
+#: server/stdinhand.c:3061
#, c-format
msgid "being detached from %s."
msgstr "%sã®æ“作を放棄ã—ã¾ã™ã€‚"
-#: server/stdinhand.c:3135
+#: server/stdinhand.c:3146
#, fuzzy, c-format
msgid "%s now controls %s (%s, %s)."
msgstr "%s 㯠%s ã‚’æ“作ã—ã¾ã™(%s, %s)"
-#: server/stdinhand.c:3139 server/stdinhand.c:4260
+#: server/stdinhand.c:3150 server/stdinhand.c:4308
#: data/nation/barbarian.ruleset:3
msgid "Barbarian"
msgstr "ãƒãƒ¼ãƒãƒªã‚¢ãƒ³"
-#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
+#: server/stdinhand.c:3152 server/stdinhand.c:4310 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-sdl/plrdlg.c:645
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr "AI"
-#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-gtk-2.0/pages.c:2125
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
+#: server/stdinhand.c:3153 server/stdinhand.c:4312
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-gtk-2.0/pages.c:2127
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/connectdlg.c:215
msgid "Human"
msgstr "人間"
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-gtk-2.0/pages.c:2124 client/gui-win32/connectdlg.c:200
-#: client/gui-win32/connectdlg.c:212
+#: server/stdinhand.c:3155 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-gtk-2.0/pages.c:2126 client/gui-win32/connectdlg.c:202
+#: client/gui-win32/connectdlg.c:214
msgid "Alive"
msgstr "æ´»èºä¸"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3156 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-win32/connectdlg.c:202
msgid "Dead"
msgstr "æ»äº¡"
# clefs
-#: server/stdinhand.c:3147
+#: server/stdinhand.c:3159
#, fuzzy, c-format
msgid "%s failed to attach to any player."
msgstr "%sã¯èª°ã‹ã‚‰ã‚‚æ“作ã•ã‚Œã¦ã„ã¾ã›ã‚“。"
-#: server/stdinhand.c:3182
+#: server/stdinhand.c:3194
msgid "Usage: detach <connection-name>"
msgstr "使用法: detach <接続å>"
-#: server/stdinhand.c:3202
+#: server/stdinhand.c:3214
msgid "You can not detach other users."
msgstr "ä»–ã®ãƒ¦ãƒ¼ã‚¶ã¯detachã§ãã¾ã›ã‚“。"
# clefs
-#: server/stdinhand.c:3211
+#: server/stdinhand.c:3223
#, c-format
msgid "%s is not attached to any player."
msgstr "%sã¯èª°ã‹ã‚‰ã‚‚æ“作ã•ã‚Œã¦ã„ã¾ã›ã‚“。"
# clefs
# detachã®ã†ã¾ã„訳語ãªã„ã‹ãªã‚
-#: server/stdinhand.c:3234
+#: server/stdinhand.c:3246
#, c-format
msgid "%s detaching from %s"
msgstr "%sã¯%sを放棄ã—ã¦ã„ã¾ã™"
# clefs
-#: server/stdinhand.c:3240
+#: server/stdinhand.c:3252
#, c-format
msgid "%s no longer observing."
msgstr "%sã¯ã‚‚ã†è¦³å¯Ÿã—ã¦ã„ã¾ã›ã‚“。"
# clefs
-#: server/stdinhand.c:3259
+#: server/stdinhand.c:3271
#, c-format
msgid "detaching from %s."
msgstr "%sを放棄ã—ã¦ã„ã¾ã™ã€‚"
-#: server/stdinhand.c:3345
+#: server/stdinhand.c:3361
msgid "Usage: load <game name>"
msgstr "使用法: load <ゲームå>"
-#: server/stdinhand.c:3350
+#: server/stdinhand.c:3366
msgid "Cannot load a game while another is running."
msgstr "ä»–ã®ã‚²ãƒ¼ãƒ ã®å®Ÿè¡Œä¸ã¯ã‚²ãƒ¼ãƒ ã‚’ãƒãƒ¼ãƒ‰ã§ãã¾ã›ã‚“。"
# clefs
-#: server/stdinhand.c:3372
+#: server/stdinhand.c:3388
#, c-format
msgid "Cannot find savegame or scenario with the name \"%s\"."
msgstr "\"%s\"ã¨ã„ã†ã‚»ãƒ¼ãƒ–ゲームもシナリオも見当ãŸã‚Šã¾ã›ã‚“。"
-#: server/stdinhand.c:3389
+#: server/stdinhand.c:3405
#, c-format
msgid "Could not load savefile: %s"
msgstr "セーブファイルをãƒãƒ¼ãƒ‰ã§ãã¾ã›ã‚“: %s"
-#: server/stdinhand.c:3458
+#: server/stdinhand.c:3496
#, c-format
msgid "Current ruleset directory is \"%s\""
msgstr "ç¾åœ¨ã®ãƒ«ãƒ¼ãƒ«ã‚»ãƒƒãƒˆ=ディレクトリã¯: \"%s\""
-#: server/stdinhand.c:3478
+#: server/stdinhand.c:3516
#, c-format
msgid "Ruleset directory \"%s\" not found"
msgstr "ルールセット=ディレクトリ \"%s\" ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
# clefs
-#: server/stdinhand.c:3484
+#: server/stdinhand.c:3522
#, c-format
msgid "Ruleset directory is already \"%s\""
msgstr "ルールセット=ディレクトリã¯æ—¢ã« \"%s\" ã§ã™"
-#: server/stdinhand.c:3488
+#: server/stdinhand.c:3526
#, c-format
msgid "Ruleset directory set to \"%s\""
msgstr "ルールセット=ディレクトリを \"%s\" ã«ã‚»ãƒƒãƒˆã—ã¾ã™"
-#: server/stdinhand.c:3536
+#: server/stdinhand.c:3574
msgid "Goodbye."
msgstr "ã•ã‚ˆã†ãªã‚‰ã€‚"
-#: server/stdinhand.c:3567
+#: server/stdinhand.c:3606
msgid "Sorry, you are not allowed to use server commands."
msgstr "残念ã§ã™ãŒã‚µãƒ¼ãƒã‚³ãƒžãƒ³ãƒ‰ã‚’使ã†ã“ã¨ã‚’許å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“。"
-#: server/stdinhand.c:3603
+#: server/stdinhand.c:3656
#, 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:3608
+#: server/stdinhand.c:3661
#, c-format
msgid "Unknown command. Try '%shelp'."
msgstr "ä¸æ˜Žãªã‚³ãƒžãƒ³ãƒ‰ã§ã™ã€‚'%shelp'を見ã¦ä¸‹ã•ã„。"
# clefs
-#: server/stdinhand.c:3625
-msgid "Your new vote canceled your previous vote."
+#: server/stdinhand.c:3675
+#, fuzzy
+msgid "Your new vote cancelled your previous vote."
msgstr "å†æŠ•ç¥¨ã—ãŸã®ã§ï¼Œå‰å›žã®ç¥¨ã¯ç„¡åŠ¹ã«ãªã‚Šã¾ã™ã€‚"
+#: server/stdinhand.c:3688
+#, fuzzy
+msgid "New teamvote"
+msgstr "æ–°è¦ã‚²ãƒ¼ãƒ "
+
+#: server/stdinhand.c:3691
+#, fuzzy
+msgid "New vote"
+msgstr "æ–°è¦ã‚²ãƒ¼ãƒ "
+
# clefs
-#: server/stdinhand.c:3633
-#, c-format
-msgid "New vote (number %d) by %s: %s."
+#: server/stdinhand.c:3695
+#, fuzzy, c-format
+msgid "%s (number %d) by %s: %s"
msgstr "%2$sã«ã‚ˆã‚‹æ–°ãŸãªæŠ•ç¥¨(番å·%1$d): %3$s."
-#: server/stdinhand.c:3645
+#: server/stdinhand.c:3704
#, c-format
msgid "Your new vote (\"%s\") was not legal or was not recognized."
msgstr ""
-#: server/stdinhand.c:3655
-msgid "You are not allowed to use this command."
-msgstr "ãã®ã‚³ãƒžãƒ³ãƒ‰ã‚’利用ã§ãã¾ã›ã‚“。"
-
-#: server/stdinhand.c:3680
+#: server/stdinhand.c:3726
msgid "(server prompt)"
msgstr "(サーãƒãƒ»ãƒ—ãƒãƒ³ãƒ—ト)"
# clefs
-#: server/stdinhand.c:3787
+#: server/stdinhand.c:3835
msgid "Game ended in a draw."
msgstr "ゲームã¯å¼•ã分ã‘ã§çµ‚了ã—ã¾ã—ãŸã€‚"
# clefs
-#: server/stdinhand.c:3791
+#: server/stdinhand.c:3839
msgid ""
"Ending the game. The server will restart once all clients have disconnected."
msgstr ""
"ゲームを終了ã—ã¦ã„ã¾ã™ã€‚å…¨ã¦ã®ã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆãŒåˆ‡æ–ã—次第，サーãƒã¯å†èµ·å‹•ã—ã¾"
"ã™ã€‚"
-#: server/stdinhand.c:3796
+#: server/stdinhand.c:3844
msgid "Cannot end the game: no game running."
msgstr "ゲームを終了ã§ãã¾ã›ã‚“: ゲームã¯å§‹ã¾ã£ã¦ã„ã¾ã›ã‚“。"
# clefs
-#: server/stdinhand.c:3812
+#: server/stdinhand.c:3860
#, c-format
msgid "%s has conceded the game and can no longer win."
msgstr "%sã¯æ•—北宣言ã—ãŸã®ã§ã‚‚ã†å‹åˆ©è€…ã«ãªã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。"
-#: server/stdinhand.c:3817
+#: server/stdinhand.c:3865
msgid "You cannot surrender now."
msgstr "今ã¯é™å‚ã§ãã¾ã›ã‚“。"
-#: server/stdinhand.c:3883
+#: server/stdinhand.c:3931
#, fuzzy
msgid "Not enough human players, game will not start."
msgstr "å分ãªãƒ—レイヤーãŒã„ãªã„ã®ã§ï¼Œã‚²ãƒ¼ãƒ を開始ã§ãã¾ã›ã‚“。"
-#: server/stdinhand.c:3888
+#: server/stdinhand.c:3936
#, fuzzy
msgid "No players, game will not start."
msgstr "å分ãªãƒ—レイヤーãŒã„ãªã„ã®ã§ï¼Œã‚²ãƒ¼ãƒ を開始ã§ãã¾ã›ã‚“。"
-#: server/stdinhand.c:3892
+#: server/stdinhand.c:3940
#, fuzzy
msgid "Not enough nations for all players, game will not start."
msgstr "å分ãªãƒ—レイヤーãŒã„ãªã„ã®ã§ï¼Œã‚²ãƒ¼ãƒ を開始ã§ãã¾ã›ã‚“。"
# clefs
-#: server/stdinhand.c:3901
+#: server/stdinhand.c:3949
msgid "All players are ready; starting game."
msgstr "全員準備ãŒæ•´ã„ã¾ã—ãŸã€‚ゲームを開始ã—ã¾ã™ã€‚"
# clefs
-#: server/stdinhand.c:3915
+#: server/stdinhand.c:3963
msgid ""
"Cannot start the game: the game is waiting for all clients to disconnect."
msgstr ""
"ゲームを開始ã§ãã¾ã›ã‚“: ゲームã¯å…¨ã¦ã®ã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆãŒæŽ¥ç¶šã‚’切るã®ã‚’å¾…ã£ã¦ã„ã¾"
"ã™ã€‚"
-#: server/stdinhand.c:3922
+#: server/stdinhand.c:3970
msgid "Cannot start the game: it is already running."
msgstr "ゲームを開始ã§ãã¾ã›ã‚“: æ—¢ã«ã‚²ãƒ¼ãƒ ã¯å§‹ã¾ã£ã¦ã„ã¾ã™ã€‚"
-#: server/stdinhand.c:3953
+#: server/stdinhand.c:4001
#, c-format
msgid "Cutting connection %s."
msgstr "%sã¨ã®æŽ¥ç¶šã‚’切りã¾ã—ãŸã€‚"
-#: server/stdinhand.c:3972
+#: server/stdinhand.c:4020
msgid ""
"Welcome - this is the introductory help text for the Freeciv server.\n"
"\n"
@@ -6980,124 +7066,124 @@ msgstr ""
" save - ç¾åœ¨ã®ã‚²ãƒ¼ãƒ ã‚’ä¿å˜ã—ã¾ã™ã€‚\n"
" quit - 終了ã—ã¾ã™ã€‚"
-#: server/stdinhand.c:4007 server/stdinhand.c:4010
+#: server/stdinhand.c:4055 server/stdinhand.c:4058
msgid "Command:"
msgstr "コマンド:"
-#: server/stdinhand.c:4014
+#: server/stdinhand.c:4062
msgid "Synopsis: "
msgstr "æ„味: "
-#: server/stdinhand.c:4023
+#: server/stdinhand.c:4071
#, c-format
msgid "Level: %s"
msgstr "レベル: %s"
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4096
msgid "The following server commands are available:"
msgstr "以下ã®ã‚µãƒ¼ãƒã‚³ãƒžãƒ³ãƒ‰ãŒåˆ©ç”¨ã§ãã¾ã™:"
-#: server/stdinhand.c:4123
+#: server/stdinhand.c:4171
#, c-format
msgid "Help argument '%s' is ambiguous."
msgstr "ヘルプ引数 '%s' ã¯çœç•¥ã—ã™ãŽã§ã™ã€‚"
-#: server/stdinhand.c:4128
+#: server/stdinhand.c:4176
#, c-format
msgid "No match for help argument '%s'."
msgstr "ヘルプ引数 '%s' ã¯ç†è§£ã§ãã¾ã›ã‚“。"
-#: server/stdinhand.c:4194
+#: server/stdinhand.c:4242
#, c-format
msgid "Bad list argument: '%s'. Try '%shelp list'."
msgstr "list ã®å¼•æ•° '%s' ã¯é–“é•ã£ã¦ã„ã¾ã™ã€‚ '%shelp list' を試ã¿ã¦ä¸‹ã•ã„。"
-#: server/stdinhand.c:4234
+#: server/stdinhand.c:4282
msgid "List of players:"
msgstr "プレイヤーã®ãƒªã‚¹ãƒˆ:"
-#: server/stdinhand.c:4239
+#: server/stdinhand.c:4287
msgid "<no players>"
msgstr "<ãªã—>"
-#: server/stdinhand.c:4256
+#: server/stdinhand.c:4304
#, c-format
msgid "user %s, "
msgstr "ユーザå %s, "
-#: server/stdinhand.c:4267
+#: server/stdinhand.c:4315
msgid ", Dead"
msgstr ", æ»äº¡"
-#: server/stdinhand.c:4270
+#: server/stdinhand.c:4318
#, c-format
msgid ", difficulty level %s"
msgstr ", 難易度レベル %s"
#. TRANS: continue list, in case comma is not the separator of choice.
-#: server/stdinhand.c:4275 server/stdinhand.c:4279 client/helpdata.c:257
-#: client/helpdata.c:752 client/text.c:241 client/text.c:1224
-#: client/text.c:1262
+#: server/stdinhand.c:4323 server/stdinhand.c:4327 client/helpdata.c:257
+#: client/helpdata.c:752 client/text.c:241 client/text.c:1229
+#: client/text.c:1267
#, c-format
msgid "?clistmore:, %s"
msgstr ", %s"
# clefs
-#: server/stdinhand.c:4283
+#: server/stdinhand.c:4331
msgid ", ready"
msgstr ", 準備完了"
# clefs
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4333
msgid ", not ready"
msgstr ", 準備ä¸"
-#: server/stdinhand.c:4293
+#: server/stdinhand.c:4341
#, c-format
msgid " %d connection:"
msgid_plural " %d connections:"
msgstr[0] " %d接続:"
-#: server/stdinhand.c:4299
+#: server/stdinhand.c:4347
#, c-format
msgid " %s from %s (command access level %s), bufsize=%dkb"
msgstr " %s (%s ã‹ã‚‰, コマンド利用権レベル %s), bufsize=%dkb"
-#: server/stdinhand.c:4304
+#: server/stdinhand.c:4352
msgid " (observer mode)"
msgstr " (観察者モード)"
-#: server/stdinhand.c:4322
+#: server/stdinhand.c:4370
msgid "List of teams:"
msgstr "ãƒãƒ¼ãƒ ã®ãƒªã‚¹ãƒˆ:"
#. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4332
+#: server/stdinhand.c:4380
#, c-format
msgid "%2d : '%s' : %d player"
msgid_plural "%2d : '%s' : %d players"
msgstr[0] ""
-#: server/stdinhand.c:4352
+#: server/stdinhand.c:4400
#, c-format
msgid "%2d : '%s' : 1 player : %s"
msgstr ""
# clefs
-#: server/stdinhand.c:4360
+#: server/stdinhand.c:4408
#, c-format
msgid "Empty team: %s"
msgstr "空ã®ãƒãƒ¼ãƒ : %s"
-#: server/stdinhand.c:4371
+#: server/stdinhand.c:4419
msgid "List of connections to server:"
msgstr "サーãƒã¸ã®æŽ¥ç¶šã®ãƒªã‚¹ãƒˆ:"
-#: server/stdinhand.c:4375
+#: server/stdinhand.c:4423
msgid "<no connections>"
msgstr "<接続ãªã—>"
-#: server/stdinhand.c:4399
+#: server/stdinhand.c:4447
msgid "List of scenarios available:"
msgstr "利用å¯èƒ½ãªã‚·ãƒŠãƒªã‚ªä¸€è¦§:"
@@ -7119,7 +7205,7 @@ msgid "%s acquired from %s!"
msgstr "%2$sã‹ã‚‰%1$sã‚’å¾—ã¾ã—ãŸ!"
# ama, clefs
-#: server/techtools.c:220
+#: server/techtools.c:221
#, c-format
msgid ""
"Discovery of %s makes the government form %s available. You may want to "
@@ -7129,60 +7215,60 @@ msgstr ""
"ã†ã€‚"
# clefs
-#: server/techtools.c:301
+#: server/techtools.c:302
#, c-format
msgid "Discovery of %s OBSOLETES %s in %s!"
msgstr "%1$sã®ç™ºè¦‹ã«ã‚ˆã‚Šï¼Œ %3$s ã®%2$sã¯éŽåŽ»ã®éºç‰©ã«ãªã‚Šã¾ã™!"
-#: server/techtools.c:351
+#: server/techtools.c:352
#, c-format
msgid "Learned %s. Our scientists focus on %s; goal is %s."
msgstr "%sを覚ãˆã¾ã—ãŸã€‚科å¦ã®èˆˆå‘³ã¯%sã«å‘ã‹ã„ã¾ã™ã€‚目標ã¯%sã§ã™ã€‚"
-#: server/techtools.c:369
+#: server/techtools.c:370
#, c-format
msgid "Learned %s. Scientists choose to research %s."
msgstr "%sを覚ãˆã¾ã—ãŸã€‚科å¦è€…ã¯%sã®ç ”究をé¸æŠžã—ã¾ã—ãŸã€‚"
-#: server/techtools.c:376
+#: server/techtools.c:377
#, c-format
msgid "Learned %s. "
msgstr "%sを覚ãˆã¾ã—ãŸã€‚"
-#: server/techtools.c:379
+#: server/techtools.c:380
#, c-format
msgid "Researching %s."
msgstr "%sã‚’ç ”ç©¶ã—ã¦ã„ã¾ã™ã€‚"
-#: server/techtools.c:385
+#: server/techtools.c:386
#, c-format
msgid "Learned %s. Scientists do not know what to research next."
msgstr "%sを覚ãˆã¾ã—ãŸã€‚科å¦è€…ã¯æ¬¡ã«ä½•ã‚’ç ”ç©¶ã™ã‚‹ã¹ãã‹ã®æŒ‡ç¤ºã‚’求ã‚ã¦ã„ã¾ã™ã€‚"
-#: server/techtools.c:402
+#: server/techtools.c:403
msgid ""
"Great scientists from all the world join your civilization: you get an "
"immediate advance."
msgstr ""
"世界ä¸ã®å‰å¤§ãªç§‘å¦è€…ãŒã‚ãªãŸã®æ–‡æ˜Žã«åŠ ã‚ã‚Šã¾ã—ãŸã€‚å³åº§ã«ç§‘å¦ã‚’1ã¤å¾—ã¾ã—ãŸã€‚"
-#: server/techtools.c:570
+#: server/techtools.c:571
#, c-format
msgid "Technology goal is %s."
msgstr "科å¦ã®ç›®æ¨™ã¯%sã§ã™ã€‚"
-#: server/techtools.c:700
+#: server/techtools.c:708
#, c-format
msgid "You steal %s from the %s."
msgstr "%2$sã‹ã‚‰%1$sã‚’ç›—ã¿ã¾ã™ã€‚"
-#: server/techtools.c:705
+#: server/techtools.c:713
#, c-format
msgid "The %s stole %s from you!"
msgstr "%sã¯ã‚ãªãŸã‹ã‚‰%sã‚’ç›—ã¿ã¾ã—ãŸ!"
# yasu, ama
-#: server/techtools.c:710
+#: server/techtools.c:718
#, c-format
msgid "The %s have stolen %s from the %s."
msgstr "%1$sã¯%3$sã‹ã‚‰%2$sã‚’ç›—ã¿ã¾ã—ãŸã€‚"
@@ -7206,188 +7292,194 @@ msgstr "アップグレードã§ãる部隊ãŒã„ã¾ã›ã‚“。"
msgid "%s upgraded to %s for %d gold."
msgstr "%1$sを金%3$dã§%2$sã¸æ–°åž‹ã«ã—ã¾ã—ãŸã€‚"
-#: server/unithand.c:396
+#: server/unithand.c:402
#, c-format
msgid "%s refuses to disband!"
msgstr "%sã¯è§£æ•£ã‚’拒絶ã—ã¾ã—ãŸï¼"
-#: server/unithand.c:449
+#: server/unithand.c:455
msgid "Can't place city here."
msgstr "ã“ã“ã«éƒ½å¸‚ã¯é…ç½®ã§ãã¾ã›ã‚“。"
-#: server/unithand.c:456
+#: server/unithand.c:462
#, c-format
msgid "Only %s can build a city."
msgstr "%sã ã‘ãŒéƒ½å¸‚を作るã“ã¨ãŒã§ãã¾ã™ã€‚"
-#: server/unithand.c:461
+#: server/unithand.c:467
msgid "Can't build a city."
msgstr "都市を作れã¾ã›ã‚“。"
-#: server/unithand.c:470
+#: server/unithand.c:476
#, c-format
msgid "Only %s can add to a city."
msgstr "%sã ã‘ãŒéƒ½å¸‚ã«åŠ ã‚ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚"
-#: server/unithand.c:475
+#: server/unithand.c:481
msgid "Can't add to a city."
msgstr "都市ã«åŠ ãˆã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。"
-#: server/unithand.c:481
+#: server/unithand.c:487
#, c-format
msgid "%s unit has no moves left to add to %s."
msgstr "%s部隊ã¯%sã¸åŠ ã‚ã‚‹ãŸã‚ã®ç§»å‹•åŠ›ãŒæ®‹ã£ã¦ã„ã¾ã›ã‚“。"
-#: server/unithand.c:487
+#: server/unithand.c:493
#, c-format
msgid "%s unit has no moves left to build city."
msgstr "%s 部隊ã¯éƒ½å¸‚を建ã¦ã‚‹ãŸã‚ã®ç§»å‹•åŠ›ãŒæ®‹ã£ã¦ã„ã¾ã›ã‚“。"
-#: server/unithand.c:492
+#. TRANS: <city> is owned by <nation>, cannot add <unit>.
+#: server/unithand.c:499
+#, fuzzy, c-format
+msgid "%s is owned by %s, cannot add %s."
+msgstr "%sã¯å¤§ãã™ãŽã¦%sã¯åŠ ã‚ã‚Œã¾ã›ã‚“。"
+
+#: server/unithand.c:506
#, c-format
msgid "%s is too big to add %s."
msgstr "%sã¯å¤§ãã™ãŽã¦%sã¯åŠ ã‚ã‚Œã¾ã›ã‚“。"
-#: server/unithand.c:498
+#: server/unithand.c:512
#, c-format
msgid "%s needs an improvement to grow, so you cannot add %s."
msgstr "%sãŒå¤§ãããªã‚‹ãŸã‚ã«ã¯æ”¹ä¿®ãŒå¿…è¦ã§ã™ã€‚%sã¯åŠ ã‚ã‚Œã¾ã›ã‚“。"
-#: server/unithand.c:509
+#: server/unithand.c:523
#, c-format
msgid "Can't add %s to %s."
msgstr "%sã‚’%sã¸åŠ ãˆã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。"
-#: server/unithand.c:531
+#: server/unithand.c:545
#, c-format
msgid "%s added to aid %s in growing."
msgstr "%sã¯%sã®æ‹¡å¤§ã‚’助ã‘ã‚‹ãŸã‚ã«åŠ ã‚ã‚Šã¾ã—ãŸã€‚"
-#: server/unithand.c:828
+#: server/unithand.c:842
msgid "Your Nuclear missile was shot down by SDI defences, what a waste."
msgstr ""
"ã‚ãªãŸã®æ ¸ãƒŸã‚µã‚¤ãƒ«ã¯ SDI 防衛システムã«ã‚ˆã£ã¦æ’ƒã¡è½ã¨ã•ã‚Œã¾ã—ãŸã€‚ã‚ã。"
-#: server/unithand.c:831
+#: server/unithand.c:845
#, c-format
msgid "The nuclear attack on %s was avoided by your SDI defense."
msgstr "%s ã¸ã®æ ¸æ”»æ’ƒã¯ SDI 防衛システムã«ã‚ˆã£ã¦é¿ã‘られã¾ã—ãŸã€‚"
#. TRANS: "Your Cannon ... the Polish Destroyer."
-#: server/unithand.c:901
+#: server/unithand.c:915
#, fuzzy, c-format
msgid "Your %s survived the pathetic attack from the %s %s."
msgstr "%sã¯ï¼Œ%sã®%sã‹ã‚‰ã®æ”»æ’ƒã‚’切り抜ã‘ã¾ã—ãŸã€‚"
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unithand.c:910
+#: server/unithand.c:924
#, fuzzy, c-format
msgid "Your attacking %s failed against the %s %s!"
msgstr "%sã¯%sã®%sを攻撃ã—，失敗ã—ã¾ã—ãŸã€‚"
-#: server/unithand.c:983
+#: server/unithand.c:997
#, c-format
msgid "Only %s can attack from sea."
msgstr "%sã ã‘ãŒæµ·ã‹ã‚‰æ”»æ’ƒã§ãã¾ã™ã€‚"
-#: server/unithand.c:988
+#: server/unithand.c:1002
msgid "Cannot attack from sea."
msgstr "æµ·ã‹ã‚‰æ”»æ’ƒã§ãã¾ã›ã‚“。"
-#: server/unithand.c:996 server/unittools.c:2137
+#: server/unithand.c:1010 server/unittools.c:2142
msgid "Cannot attack unless you declare war first."
msgstr "戦争を宣言ã—ãªã‘ã‚Œã°æ”»æ’ƒã§ãã¾ã›ã‚“。"
-#: server/unithand.c:1001
+#: server/unithand.c:1015
#, c-format
msgid "%s can only move into your own zone of control."
msgstr "%sã¯ã‚ãªãŸã®ã‚¾ãƒ¼ãƒ³ã‚³ãƒ³ãƒˆãƒãƒ¼ãƒ«ã¸ã ã‘移動ã§ãã¾ã™ã€‚"
# Daniel
-#: server/unithand.c:1007
+#: server/unithand.c:1021
#, fuzzy, c-format
msgid "Cannot invade unless you break peace with %s first."
msgstr "%sã¨ã®å¹³å’Œæ¡ç´„ã‚’ç ´æ£„ã—ãªã‘ã‚Œã°æ”»æ’ƒã§ãã¾ã›ã‚“。"
-#: server/unithand.c:1052
+#: server/unithand.c:1066
msgid "This unit has no moves left."
msgstr "ã“ã®éƒ¨éšŠã¯ã‚‚ã†ç§»å‹•ã§ãã¾ã›ã‚“。"
-#: server/unithand.c:1107
+#: server/unithand.c:1121
msgid "Unit must be on land to perform diplomatic action."
msgstr "部隊ãŒå¤–交行為を行ã†ã«ã¯åœ°ä¸Šã«ã„ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。"
-#: server/unithand.c:1109
+#: server/unithand.c:1123
msgid "No diplomat action possible."
msgstr "外交行為を行ãˆã¾ã›ã‚“。"
# clefs
-#: server/unithand.c:1125
+#: server/unithand.c:1139
#, c-format
msgid "You must declare war on %s first. Try using players dialog (F3)."
msgstr "ã¾ãš%sã«å®£æˆ¦ã—ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。プレイヤーダイアãƒã‚°å‚ç…§(F3)。"
-#: server/unithand.c:1143
+#: server/unithand.c:1157
msgid "This unit is being transported, and so cannot bombard."
msgstr "ã“ã®éƒ¨éšŠã¯è¼¸é€ä¸ãªã®ã§çˆ†æ’ƒã¯ã§ãã¾ã›ã‚“。"
-#: server/unithand.c:1158
+#: server/unithand.c:1172
msgid "You can't attack there."
msgstr "ãã“ã¸æ”»æ’ƒã§ãã¾ã›ã‚“。"
# Daniel, clefs
# was "Game: 地上ã®è»éšŠã ã‘ãŒéƒ½å¸‚ã‚’å é ˜ã§ãã¾ã™ã€‚"
-#: server/unithand.c:1180
+#: server/unithand.c:1194
msgid "This type of troops cannot take over a city."
msgstr "ã“ã®ã‚¿ã‚¤ãƒ—ã®éƒ¨éšŠã§ã¯éƒ½å¸‚ã‚’å é ˜ã§ãã¾ã›ã‚“。"
# clefs
# æ„訳。ã“ã‚Œã§åˆã£ã¦ã‚‹ã®ã‹ãªã‚。
-#: server/unithand.c:1198
+#: server/unithand.c:1212
msgid "A transported unit is not allied to all units or city on target tile."
msgstr ""
"輸é€ã•ã‚Œã¦ã„る部隊ã®ä¸ã«ï¼Œç›®çš„地ã«å˜åœ¨ã™ã‚‹å…¨ã¦ã®éƒ¨éšŠãŠã‚ˆã³éƒ½å¸‚ã«å¯¾ã—ã¦åŒç›Ÿé–¢"
"ä¿‚ã«ãªã„ã‚‚ã®ãŒå«ã¾ã‚Œã¦ã„ã¾ã™ã€‚"
-#: server/unithand.c:1240
+#: server/unithand.c:1254
#, c-format
msgid "Your %s helps build the %s in %s (%d remaining)."
msgstr "%1$sã¯%3$sã®%2$s建築を手ä¼ã„ã¾ã—ãŸ(残り %4$d)。"
-#: server/unithand.c:1242
+#: server/unithand.c:1256
#, c-format
msgid "Your %s helps build the %s in %s (%d surplus)."
msgstr "%1$sã¯%3$sã®%2$s建築を手ä¼ã„ã¾ã—ãŸ(余剰 %4$d)。"
-#: server/unithand.c:1286
+#: server/unithand.c:1300
#, c-format
msgid ""
"Sorry, your %s cannot establish a trade route because it has no home city"
msgstr "残念ãªãŒã‚‰ï¼Œ%sã¯æœ¬æ‹ 地をæŒãŸãªã„ã®ã§ã“ã“ã«äº¤æ˜“路を確立ã§ãã¾ã›ã‚“!"
-#: server/unithand.c:1296
+#: server/unithand.c:1310
#, c-format
msgid "Sorry, your %s cannot establish a trade route between %s and %s"
msgstr "残念ãªãŒã‚‰ï¼Œ%sã¯%s・%sé–“ã«äº¤æ˜“路を確立ã§ãã¾ã›ã‚“!"
-#: server/unithand.c:1325 server/unithand.c:1344
+#: server/unithand.c:1339 server/unithand.c:1358
#, c-format
msgid "Sorry, your %s cannot establish a trade route here!"
msgstr "残念ãªãŒã‚‰ï¼Œ%sã¯ã“ã“ã«äº¤æ˜“路を確立ã§ãã¾ã›ã‚“!"
-#: server/unithand.c:1329 server/unithand.c:1348
+#: server/unithand.c:1343 server/unithand.c:1362
#, c-format
msgid " The city of %s already has %d better trade routes!"
msgstr " 都市%sã«ã¯æ—¢ã« %dã®ã‚ˆã‚Šè‰¯ã„交易路ãŒã‚ã‚Šã¾ã™!"
# clefs
-#: server/unithand.c:1361 server/unithand.c:1373
+#: server/unithand.c:1375 server/unithand.c:1387
#, c-format
msgid "Sorry, %s has canceled the trade route from %s to your city %s."
msgstr "残念ã§ã™ãŒï¼Œ%sã¯%sã‹ã‚‰ã‚ãªãŸã®%sã¸ã®äº¤æ˜“路をæ–絶ã•ã›ã¾ã—ãŸã€‚"
# ama, clefs
-#: server/unithand.c:1406
+#: server/unithand.c:1420
#, c-format
msgid ""
"Your %s from %s has arrived in %s, and revenues amount to %d in gold and "
@@ -7449,58 +7541,58 @@ msgid "Teleported your %s to %s."
msgstr "%sã‚’%sã¸ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã—ã¾ã—ãŸã€‚"
#. TRANS: A unit is moved to resolve stack conflicts.
-#: server/unittools.c:1065
+#: server/unittools.c:1070
#, fuzzy, c-format
msgid "Moved your %s."
msgstr "%sを解散ã—ã¾ã—ãŸã€‚"
-#: server/unittools.c:1076
+#: server/unittools.c:1081
#, c-format
msgid "Disbanded your %s."
msgstr "%sを解散ã—ã¾ã—ãŸã€‚"
# clefs
-#: server/unittools.c:1397
+#: server/unittools.c:1402
#, c-format
msgid "Unable to defend %s, %s has lost the game."
msgstr "%sを守り切れãªã‹ã£ãŸã®ã§ï¼Œ%sã¯è² ã‘ã«ãªã‚Šã¾ã—ãŸã€‚"
# clefs
-#: server/unittools.c:1401
+#: server/unittools.c:1406
#, c-format
msgid "Losing %s meant losing the game! Be more careful next time!"
msgstr "%sを失ã†ã¨è² ã‘ã§ã™ï¼æ¬¡ã¯ã‚‚ã£ã¨æ°—を付ã‘ã¦ï¼"
-#: server/unittools.c:1503
+#: server/unittools.c:1508
#, c-format
msgid "%s escaped the destruction of %s, and fled to %s."
msgstr "%1$sã¯%3$sã«ã‚ã‚‹%2$så»ºé€ ç‰©ã®ç ´å£Šã«æˆåŠŸã—ã¾ã—ãŸã€‚"
-#: server/unittools.c:1512
+#: server/unittools.c:1517
#, c-format
msgid "%s lost when %s was lost."
msgstr "%2$sを失ã£ãŸæ™‚ã«%1$sを失ã„ã¾ã—ãŸã€‚"
# ama, clefs
-#: server/unittools.c:1561
+#: server/unittools.c:1566
#, c-format
msgid "Barbarian leader captured, %d gold ransom paid."
msgstr "ãƒãƒ¼ãƒãƒªã‚¢ãƒ³ã®æŒ‡å°Žè€…ãŒæ•ãˆã‚‰ã‚Œï¼Œèº«ä»£é‡‘%dãŒæ”¯æ‰•ã‚ã‚Œã¾ã—ãŸã€‚"
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unittools.c:1579
+#: server/unittools.c:1584
#, fuzzy, c-format
msgid "Your attacking %s succeeded against the %s %s!"
msgstr "%1$sã¯%2$sã®%3$sを攻撃ã—，æˆåŠŸã—ã¾ã—ãŸã€‚"
#. TRANS: "Cannon ... the Polish Destroyer."
-#: server/unittools.c:1588 server/unittools.c:1646
+#: server/unittools.c:1593 server/unittools.c:1651
#, fuzzy, c-format
msgid "%s lost to an attack by the %s %s."
msgstr "%2$sã®%3$sã«ã‚ˆã‚‹æ”»æ’ƒã§%1$sを失ã„ã¾ã—ãŸã€‚"
#. TRANS: "... Cannon ... the Polish Destroyer ...."
-#: server/unittools.c:1622
+#: server/unittools.c:1627
#, fuzzy, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -7509,7 +7601,7 @@ msgstr[0] "%sã¯%sã®%s(ãŠã‚ˆã³ãã®ä»–%d部隊)ã¸ã®æ”»æ’ƒã«æˆåŠŸã—ã¾
#. TRANS: "Cannon lost when the Polish Destroyer
#. * attacked the German Musketeers."
-#: server/unittools.c:1655
+#: server/unittools.c:1660
#, fuzzy, c-format
msgid "%s lost when the %s %s attacked the %s %s."
msgstr "%2$sã®%3$sãŒ%4$sã®%5$sを攻撃ã—ãŸéš›ã«%1$sãŒå¤±ã‚ã‚Œã¾ã—ãŸã€‚"
@@ -7517,7 +7609,7 @@ msgstr "%2$sã®%3$sãŒ%4$sã®%5$sを攻撃ã—ãŸéš›ã«%1$sãŒå¤±ã‚ã‚Œã¾ã—ãŸ
# 射手 lost to an attack from Lluis Companys's ãƒãƒ£ãƒªã‚ªãƒƒãƒˆ.
#. TRANS: "Musketeers (and Cannon) lost to an
#. * attack from the Polish Destroyer."
-#: server/unittools.c:1670
+#: server/unittools.c:1675
#, fuzzy, c-format
msgid "%s (and %s) lost to an attack from the %s %s."
msgstr "%3$sã®%4$sã‹ã‚‰ã®æ”»æ’ƒã§%1$s(ã¨%2$s)を失ã„ã¾ã—ãŸã€‚"
@@ -7526,7 +7618,7 @@ msgstr "%3$sã®%4$sã‹ã‚‰ã®æ”»æ’ƒã§%1$s(ã¨%2$s)を失ã„ã¾ã—ãŸã€‚"
#. TRANS: "Musketeers and 3 other units lost to
#. * an attack from the Polish Destroyer."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1680
+#: server/unittools.c:1685
#, fuzzy, 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."
@@ -7535,193 +7627,238 @@ msgstr[0] "%3$sã®%4$sã‹ã‚‰ã®æ”»æ’ƒã§%1$sãŠã‚ˆã³ä»–%2$d部隊を失ã„ã¾
#. TRANS: "2 units lost when the Polish Destroyer
#. * attacked the German Musketeers."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1694
+#: server/unittools.c:1699
#, fuzzy, 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部隊ãŒï¼Œ%sã®%sãŒ%sã®%sを攻撃ã—ãŸéš›ã«å¤±ã‚ã‚Œã¾ã—ãŸã€‚"
-#: server/unittools.c:1962
+#: server/unittools.c:1967
#, c-format
msgid "Your %s was nuked by %s."
msgstr "%sã¯%sã«ã‚ˆã£ã¦æ ¸æ”»æ’ƒã•ã‚Œã¾ã—ãŸã€‚"
-#: server/unittools.c:1965 server/unittools.c:1981
+#: server/unittools.c:1970 server/unittools.c:1986
msgid "yourself"
msgstr "ã‚ãªãŸè‡ªèº«"
-#: server/unittools.c:1969
+#: server/unittools.c:1974
#, fuzzy, c-format
msgid "The %s %s was nuked."
msgstr "%sã®%sã¯æ ¸æ”»æ’ƒã•ã‚Œã¾ã—ãŸã€‚"
-#: server/unittools.c:1978
+#: server/unittools.c:1983
#, c-format
msgid "%s was nuked by %s."
msgstr "%sã¯%sã«ã‚ˆã£ã¦æ ¸æ”»æ’ƒã•ã‚Œã¾ã—ãŸã€‚"
-#: server/unittools.c:1986
+#: server/unittools.c:1991
#, c-format
msgid "You nuked %s."
msgstr "%sã‚’æ ¸æ”»æ’ƒã—ã¾ã—ãŸã€‚"
-#: server/unittools.c:2027
+#: server/unittools.c:2032
#, fuzzy, c-format
msgid "The %s detonated a nuke!"
msgstr "%sã¯æ ¸ã‚’爆発ã•ã›ã¾ã—ãŸï¼"
-#: server/unittools.c:2051
+#: server/unittools.c:2056
#, c-format
msgid "%s transported successfully."
msgstr "%sã¯é¦–尾よã輸é€ã—ã¾ã—ãŸã€‚"
-#: server/unittools.c:2103
+#: server/unittools.c:2108
msgid "This unit type can not be paradropped."
msgstr "ã“ã®éƒ¨éšŠã®ã‚¿ã‚¤ãƒ—ã¯è½ä¸‹å‚˜é™ä¸‹ã•ã›ã‚‰ã‚Œã¾ã›ã‚“。"
-#: server/unittools.c:2113
+#: server/unittools.c:2118
#, fuzzy
msgid "You cannot paradrop a unit that is transporting other units."
msgstr "æµ·ã¸ã¯è½ä¸‹å‚˜é™ä¸‹ã§ãã¾ã›ã‚“。"
-#: server/unittools.c:2119
+#: server/unittools.c:2124
msgid "The destination location is not known."
msgstr "目的地ã¯çŸ¥ã‚‰ã‚Œã¦ã„ã¾ã›ã‚“。"
-#: server/unittools.c:2126
+#: server/unittools.c:2131
#, c-format
msgid "This unit cannot paradrop into %s."
msgstr "%sã¸ã¯è½ä¸‹å‚˜é™ä¸‹ã§ãã¾ã›ã‚“。"
-#: server/unittools.c:2146
+#: server/unittools.c:2151
#, c-format
msgid "The distance to the target (%i) is greater than the unit's range (%i)."
msgstr "目的ã¸ã®è·é›¢(%i)ã¯ï¼Œéƒ¨éšŠã®è¡Œå‹•ç¯„囲(%i)を越ãˆã¦ã„ã¾ã™ã€‚"
# clefs
-#: server/unittools.c:2157
+#: server/unittools.c:2162
#, c-format
msgid "Your %s paradropped into the %s and was lost."
msgstr "%sã¯%sã«è½ä¸‹å‚˜é™ä¸‹ã—消æ¯ã‚’絶ã¡ã¾ã—ãŸã€‚"
-#: server/unittools.c:2170
+#: server/unittools.c:2175
#, c-format
msgid "Your %s was killed by enemy units at the paradrop destination."
msgstr "%sã¯é™ä¸‹ç›®æ¨™åœ°ã«ã„ãŸæ•µéƒ¨éšŠã«ã‚ˆã£ã¦æ®ºã•ã‚Œã¾ã—ãŸã€‚"
-#: server/unittools.c:2192
+#: server/unittools.c:2197
#, c-format
msgid "You found %d gold."
msgstr "金%dを見ã¤ã‘ã¾ã—ãŸã€‚"
-#: server/unittools.c:2209
+#: server/unittools.c:2214
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr "%sã‚’å¤ä»£ã®çŸ¥è˜ã®å·»ç‰©ã®ä¸ã‹ã‚‰è¦‹ã¤ã‘ã¾ã—ãŸã€‚"
-#: server/unittools.c:2216
+#: server/unittools.c:2221
#, c-format
msgid "The %s have acquired %s from ancient scrolls of wisdom."
msgstr "%sã¯å¤ä»£ã®çŸ¥è˜ã®å·»ç‰©ã‹ã‚‰%sã‚’å¾—ã¾ã—ãŸã€‚"
-#: server/unittools.c:2230
+#: server/unittools.c:2235
msgid "A band of friendly mercenaries joins your cause."
msgstr "å‹å¥½çš„ãªéƒ¨éšŠãŒåŠ ã‚ã‚Šã¾ã—ãŸã€‚"
-#: server/unittools.c:2248
+#: server/unittools.c:2253
msgid "An abandoned village is here."
msgstr "廃虚ã®æ‘ãŒã‚ã‚Šã¾ã™ã€‚"
-#: server/unittools.c:2258
+#: server/unittools.c:2263
msgid "You have unleashed a horde of barbarians!"
msgstr "ãƒãƒ¼ãƒãƒªã‚¢ãƒ³ã®å¤§ç¾¤ã‚’解放ã—ã¦ã—ã¾ã„ã¾ã—ãŸ!"
-#: server/unittools.c:2261
+#: server/unittools.c:2266
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr "%s ã¯ãƒãƒ¼ãƒãƒªã‚¢ãƒ³ã«ã‚ˆã£ã¦æ®ºã•ã‚Œã¾ã—ãŸã€‚"
-#: server/unittools.c:2277
+#: server/unittools.c:2282
msgid "You found a friendly city."
msgstr "å‹å¥½çš„ãªéƒ½å¸‚を見ã¤ã‘ã¾ã—ãŸã€‚"
-#: server/unittools.c:2291
+#: server/unittools.c:2296
msgid "Friendly nomads are impressed by you, and join you."
msgstr "å‹å¥½çš„ãªæ”¾æµªè€…ãŒã‚ãªãŸã«æ„ŸéŠ˜ã—，部隊ã«åŠ ã‚ã‚Šã¾ã—ãŸã€‚"
# clefs
-#: server/unittools.c:2316
+#: server/unittools.c:2321
msgid "Your overflight frightens the tribe; they scatter in terror."
msgstr "飛行物体を見ã¦éƒ¨æ—ã¯é©šã，æã‚ŒãŠã®ã®ã„ã¦å››æ•£ã—ã¦ã—ã¾ã„ã¾ã—ãŸã€‚"
# climb
-#: server/unittools.c:2574
+#: server/unittools.c:2579
#, c-format
msgid "Orders for %s aborted after enemy movement was spotted."
msgstr "é“ã‚’ãµã•ã„ã§ã„る部隊ãŒã„ã‚‹ã®ã§ï¼Œ%sã¯ç§»å‹•ã‚’ä¸æ–ã—ã¾ã—ãŸã€‚"
# climb
-#: server/unittools.c:3023
+#: server/unittools.c:3028
#, c-format
msgid "Orders for %s aborted as there are units nearby."
msgstr "è¿‘ãã«éƒ¨éšŠãŒã„ã‚‹ã®ã§ï¼Œ%sã¯å‘½ä»¤é‚行をä¸æ–ã—ã¾ã—ãŸã€‚"
# climb
-#: server/unittools.c:3075
+#: server/unittools.c:3080
#, c-format
msgid "Orders for %s aborted because building of city failed."
msgstr "都市を建è¨ã§ããªã‹ã£ãŸã®ã§ï¼Œ%sã¯å‘½ä»¤é‚行をä¸æ–ã—ã¾ã—ãŸã€‚"
# climb
-#: server/unittools.c:3088
+#: server/unittools.c:3093
#, c-format
msgid "Orders for %s aborted since they give an invalid activity."
msgstr "無効ãªæ´»å‹•ãŒæŒ‡å®šã•ã‚Œã¦ã„ã‚‹ã®ã§ï¼Œ%sã¯å‘½ä»¤é‚行をä¸æ–ã—ã¾ã—ãŸã€‚"
# climb
-#: server/unittools.c:3102
+#: server/unittools.c:3107
#, c-format
msgid "Orders for %s aborted since they give an invalid location."
msgstr "無効ãªä½ç½®ãŒæŒ‡å®šã•ã‚Œã¦ã„ã‚‹ã®ã§ï¼Œ%sã¯å‘½ä»¤é‚行をä¸æ–ã—ã¾ã—ãŸã€‚"
# climb
-#: server/unittools.c:3112
+#: server/unittools.c:3117
#, c-format
msgid "Orders for %s aborted as there are units in the way."
msgstr "é“ã‚’ãµã•ã„ã§ã„る部隊ãŒã„ã‚‹ã®ã§ï¼Œ%sã¯å‘½ä»¤é‚行をä¸æ–ã—ã¾ã—ãŸã€‚"
# climb
-#: server/unittools.c:3138
+#: server/unittools.c:3143
#, c-format
msgid "Orders for %s aborted because of failed move."
msgstr "移動ã«å¤±æ•—ã—ãŸãŸã‚，%sã¯å‘½ä»¤é‚行をä¸æ–ã—ã¾ã—ãŸã€‚"
# clefs
-#: server/unittools.c:3179
+#: server/unittools.c:3184
#, c-format
msgid "Attempt to change homecity for %s failed."
msgstr "帰属を%sã«å¤‰ãˆã‚‰ã‚Œã¾ã›ã‚“ã§ã—ãŸã€‚"
# clefs
-#: server/unittools.c:3190
+#: server/unittools.c:3195
#, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr "%sã¨ã®äº¤æ˜“è·¯ã®ç¢ºç«‹ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
# clefs
# 建è¨ä¸ã®ä¸æ€è°ãŒãªã‹ã£ãŸå ´åˆ
-#: server/unittools.c:3202
+#: server/unittools.c:3207
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr "%sã®ãŸã‚ã«ä¸æ€è°å»ºè¨ã‚’ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚"
# clefs
-#: server/unittools.c:3211
+#: server/unittools.c:3216
#, c-format
msgid "Your %s has invalid orders."
msgstr "%sã«ã¯ç„¡åŠ¹ãªå‘½ä»¤ãŒä¸Žãˆã‚‰ã‚Œã¦ã„ã¾ã™ã€‚"
# clefs
+#: server/voting.c:522
+#, fuzzy, c-format
+msgid ""
+"%s %d \"%s\" is passed %d to %d with %d abstentions and %d who did not vote."
+msgstr "投票 \"%s\" ã¯è³›æˆ%d, å対%d, 棄権%d ã§å¯æ±ºã•ã‚Œã¾ã—ãŸã€‚"
+
+# clefs
+#: server/voting.c:528
+#, fuzzy, c-format
+msgid ""
+"%s %d \"%s\" failed with %d against, %d for, %d abstentions and %d who did "
+"not vote."
+msgstr "投票 \"%s\" ã¯å対%d, è³›æˆ%d, 棄権%d ã§å¦æ±ºã•ã‚Œã¾ã—ãŸã€‚"
+
+# clefs
+#: server/voting.c:548
+#, fuzzy, c-format
+msgid "%s %d: %s voted yes."
+msgstr "%1$sã¯%3$sã«ã‚ˆã‚‹æ”»æ’ƒã§%2$sを失ã„ã¾ã—ãŸã€‚"
+
+#: server/voting.c:553
+#, c-format
+msgid "%s %d: %s voted no."
+msgstr ""
+
+#: server/voting.c:558
+#, c-format
+msgid "%s %d: %s chose to abstain."
+msgstr ""
+
+#. TRANS: Describing a new vote that can only pass
+#. * if there are no dissenting votes.
+#: server/voting.c:726
+#, c-format
+msgid "%s (needs %0.0f%% and no dissent)."
+msgstr ""
+
+#. TRANS: Describing a new vote that can pass only if the
+#. * given percentage of players votes 'yes'.
+#: server/voting.c:732
+#, c-format
+msgid "%s (needs %0.0f%% in favor)."
+msgstr ""
+
+# clefs
#: server/generator/mapgen.c:1771
msgid "High landmass - this may take a few seconds."
msgstr "広大ãªåœŸåœ°ã§ã™ - å°‘ã—時間ãŒã‹ã‹ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。"
@@ -7756,12 +7893,12 @@ msgstr ""
"ã“ã®ãƒã‚°ã‚’%sã«å ±å‘Šã—ã¦ãã ã•ã„。"
# XXX 原文:CMAãªã®ã‹Governorãªã®ã‹!?
-#: client/attribute.c:363
+#: client/attribute.c:368
msgid ""
"There has been a CMA error. Your citizen governor settings may be broken."
msgstr ""
-#: client/attribute.c:367
+#: client/attribute.c:372
msgid "Old attributes detected and removed."
msgstr ""
@@ -7916,45 +8053,45 @@ msgid "%+4d : Taxed from trade\n"
msgstr "%+4d : 交易ã‹ã‚‰ã®å¾´åŽ\n"
# clefs
-#: client/citydlg_common.c:418
+#: client/citydlg_common.c:421
#, c-format
msgid "%+4d : Trade route with %s\n"
msgstr "%+4d : %sã¨ã®äº¤æ˜“è·¯\n"
# clefs
# 都市一覧ã§ã®ã€Œé¸æŠžã€ãƒ¡ãƒ‹ãƒ¥ãƒ¼
-#: client/citydlg_common.c:427
+#: client/citydlg_common.c:430
#, c-format
msgid "%+4d : Building tithes\n"
msgstr "%+4d : å»ºé€ ç‰©ã‹ã‚‰ã®å分ã®ä¸€ç¨Ž\n"
-#: client/citydlg_common.c:450
+#: client/citydlg_common.c:453
#, c-format
msgid "%+4d : Bonus from %s (%+d%%)\n"
msgstr "%+4d : %s ã‹ã‚‰ã®ãƒœãƒ¼ãƒŠã‚¹ (%+d%%)\n"
# clefs
-#: client/citydlg_common.c:462
+#: client/citydlg_common.c:465
#, c-format
msgid "%+4d : Waste\n"
msgstr "%+4d : 浪費\n"
-#: client/citydlg_common.c:468
+#: client/citydlg_common.c:471
#, c-format
msgid "%+4d : Disorder\n"
msgstr "%+4d : æ··ä¹±\n"
-#: client/citydlg_common.c:474
+#: client/citydlg_common.c:477
#, c-format
msgid "%+4d : Used\n"
msgstr "%+4d : 消費\n"
# 下ã«`total'ã¨ã‚ã‚‹ã‹ã‚‰ã“ã®éƒ¨åˆ†ã¯æ—¥æœ¬èªžã§ã¯æ„味ãŒãªã„ (clefs)
-#: client/citydlg_common.c:479
+#: client/citydlg_common.c:482
msgid "==== : Adds up to\n"
msgstr ""
-#: client/citydlg_common.c:481
+#: client/citydlg_common.c:484
#, c-format
msgid "%4d : Total surplus"
msgstr "%4d : 剰余ç·è¨ˆ"
@@ -8269,54 +8406,54 @@ msgstr "専門家"
msgid "Specialists"
msgstr "専門家"
-#: client/civclient.c:240
+#: client/civclient.c:241
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr " -a, --autoconnect\t接続ダイアãƒã‚°ã‚’スã‚ップã™ã‚‹\n"
# spawned serverã£ã¦ä½•ã˜ã‚ƒã‚‰ã»ã„ (clefs)
# ãŸã¶ã‚“civclientãŒè‡ªå‹•ã§ç«‹ã¡ä¸Šã’るサーãƒã®ã“ã¨
-#: client/civclient.c:250
+#: client/civclient.c:251
msgid " -l, --log FILE\tUse FILE as logfile (spawned server also uses this)\n"
msgstr ""
" -l, --log FILE\t記録ファイルã¨ã—㦠FILE を使ㆠ(派生サーãƒã‚‚ã“れを使ã„ã¾"
"ã™\n"
-#: client/civclient.c:252
+#: client/civclient.c:253
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr " -m, --meta HOST\tHOST ã«ã‚るメタサーãƒã«æŽ¥ç¶šã™ã‚‹\n"
-#: client/civclient.c:254
+#: client/civclient.c:255
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr " -n, --name NAME\tåå‰ã¨ã—㦠NAME を使ã„ã¾ã™\n"
-#: client/civclient.c:256
+#: client/civclient.c:257
msgid " -p, --port PORT\tConnect to server port PORT (usually with -a)\n"
msgstr ""
" -p, --port PORT\tサーãƒã®ãƒãƒ¼ãƒˆ PORT ã«æŽ¥ç¶šã—ã¾ã™ (普通ã«ã€€-aã‚’ã¤ã‘ã¦)\n"
-#: client/civclient.c:258
+#: client/civclient.c:259
#, c-format
msgid " -P, --Plugin PLUGIN\tUse PLUGIN for sound output %s\n"
msgstr " -P, --Plugin PLUGIN\tPLUGIN をサウンド出力ã«ä½¿ã† %s\n"
-#: client/civclient.c:260
+#: client/civclient.c:261
msgid " -r, --read FILE\tRead startup script FILE (for spawned server only)\n"
msgstr " -r, --read FILE\t起動スクリプト FILE ã‚’èªã‚€ (派生サーãƒã®ã¿)\n"
-#: client/civclient.c:263
+#: client/civclient.c:264
msgid " -s, --server HOST\tConnect to the server at HOST (usually with -a)\n"
msgstr ""
" -s, --server HOST\tHOST ã«ã‚るサーãƒã«æŽ¥ç¶šã—ã¾ã™ (普通ã«ã€€-aã‚’ã¤ã‘ã¦)\n"
-#: client/civclient.c:265
+#: client/civclient.c:266
msgid " -S, --Sound FILE\tRead sound tags from FILE\n"
msgstr " -S, --Sound FILE\tFILE ã‹ã‚‰éŸ³æ¥½ã‚¿ã‚°ã‚’èªã‚€\n"
-#: client/civclient.c:266
+#: client/civclient.c:267
msgid " -t, --tiles FILE\tUse data file FILE.tilespec for tiles\n"
msgstr " -t, --tiles FILE\tタイルã¨ã—ã¦ãƒ‡ãƒ¼ã‚¿ãƒ•ã‚¡ã‚¤ãƒ« FILE.tilespec を使ã†\n"
-#: client/civclient.c:269
+#: client/civclient.c:270
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -8326,47 +8463,47 @@ msgstr ""
"\t\t\t詳ã—ã㯠\"%s -- --help\" を試ã¿ã¦ä¸‹ã•ã„。\n"
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:274
+#: client/civclient.c:275
#, fuzzy, c-format
msgid "Report bugs at %s\n"
msgstr "<%s>ã¸ãƒã‚°ã‚’å ±å‘Šã—ã¦ä¸‹ã•ã„。\n"
# clefs
-#: client/civclient.c:298
+#: client/civclient.c:299
#, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr "--port オプションã§ç„¡åŠ¹ãªãƒãƒ¼ãƒˆ \"%s\" ãŒæŒ‡å®šã•ã‚Œã¾ã—ãŸã€‚\n"
-#: client/civclient.c:300 client/civclient.c:315
+#: client/civclient.c:301 client/civclient.c:316
msgid "Try using --help.\n"
msgstr "--help を試ã¿ã¦ä¸‹ã•ã„。\n"
# clefs
-#: client/civclient.c:313
+#: client/civclient.c:314
#, c-format
msgid "Invalid debug level \"%s\" specified with --debug option.\n"
msgstr "--debug オプションã§ç„¡åŠ¹ãªãƒ‡ãƒãƒƒã‚°ãƒ¬ãƒ™ãƒ« \"%s\" ãŒæŒ‡å®šã•ã‚Œã¾ã—ãŸã€‚\n"
-#: client/civclient.c:326
+#: client/civclient.c:327
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr "èªè˜ã§ããªã„オプション: \"%s\"\n"
-#: client/civclient.c:391
+#: client/civclient.c:393
#, fuzzy, c-format
msgid "Updating old metaserver address \"%s\"."
msgstr "metaserver <所在>"
-#: client/civclient.c:394
+#: client/civclient.c:396
#, fuzzy, c-format
msgid "Default metaserver has been set to \"%s\"."
msgstr "オプション: %s 㯠\"%s\" ã«è¨å®šã•ã‚Œã¾ã—ãŸã€‚"
-#: client/civclient.c:550
+#: client/civclient.c:540
msgid "Game started."
msgstr "ゲームãŒå§‹ã¾ã‚Šã¾ã—ãŸã€‚"
-#: client/civclient.c:588
+#: client/civclient.c:606
msgid "There was an error while auto connecting; aborting."
msgstr "自動接続ä¸ã«ã‚¨ãƒ©ãƒ¼ãŒèµ·ã“ã‚Šã¾ã—ãŸã€‚ä¸æ–ã—ã¦ã„ã¾ã™ã€‚"
@@ -8508,18 +8645,18 @@ msgstr "接続ä¸ã€‚"
msgid "Disconnected from server."
msgstr "サーãƒã‹ã‚‰åˆ‡æ–ã—ã¦ã„ã¾ã™ã€‚"
-#: client/clinet.c:469
+#: client/clinet.c:473
#, c-format
msgid "Failed to contact server \"%s\" at port %d as \"%s\" after %d attempts"
msgstr ""
"サーム\"%s\"(ãƒãƒ¼ãƒˆ %d, ユーザ \"%s\")ã¸ã®æŽ¥ç¶šã‚’ %d 回試ã¿ã¾ã—ãŸãŒå¤±æ•—ã—ã¾ã—"
"ãŸã€‚"
-#: client/clinet.c:484 client/clinet.c:486
+#: client/clinet.c:488 client/clinet.c:490
msgid "Connection to server refused. Please start the server."
msgstr "サーãƒã¸ã®æŽ¥ç¶šãŒæ‹’絶ã•ã‚Œã¾ã—ãŸã€‚サーãƒã‚’スタートã•ã›ã¦ä¸‹ã•ã„。"
-#: client/clinet.c:495 client/clinet.c:523
+#: client/clinet.c:499 client/clinet.c:527
#, c-format
msgid ""
"Error contacting server \"%s\" at port %d as \"%s\":\n"
@@ -8528,7 +8665,7 @@ msgstr ""
"サーム\"%s\"(ãƒãƒ¼ãƒˆ %d, ユーザ \"%s\")ã¸æŽ¥ç¶šä¸ã«ã‚¨ãƒ©ãƒ¼:\n"
" %s\n"
-#: client/clinet.c:514
+#: client/clinet.c:518
#, c-format
msgid ""
"Auto-connecting to server \"%s\" at port %d as \"%s\" every %f second(s) for "
@@ -8537,60 +8674,60 @@ msgstr ""
"サーム\"%s\"(ãƒãƒ¼ãƒˆ %d, ユーザ \"%s\")㸠%f 秒毎㫠%d 回ã¾ã§è‡ªå‹•æŽ¥ç¶šã‚’試ã¿ã¦"
"ã„ã¾ã™ã€‚"
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
+#: client/connectdlg_common.c:78 client/gui-gtk-2.0/pages.c:1358
msgid "novice"
msgstr "åˆå¿ƒè€…用"
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1358
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
msgid "easy"
msgstr "ç°¡å˜"
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1359
msgid "normal"
msgstr "普通"
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr "難ã—ã„"
-#: client/connectdlg_common.c:83
+#: client/connectdlg_common.c:82
msgid "experimental"
msgstr "実験的"
# clefs
-#: client/connectdlg_common.c:213
+#: client/connectdlg_common.c:212
msgid "Starting server..."
msgstr "サーãƒã‚’èµ·å‹•ã—ã¦ã„ã¾ã™â€¦â€¦"
# clefs
-#: client/connectdlg_common.c:332
+#: client/connectdlg_common.c:331
msgid "Couldn't start the server."
msgstr "サーãƒã‚’èµ·å‹•ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚"
# clefs
-#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
+#: client/connectdlg_common.c:332 client/connectdlg_common.c:365
msgid "You'll have to start one manually. Sorry..."
msgstr "申ã—訳ã‚ã‚Šã¾ã›ã‚“ãŒï¼Œæ‰‹å‹•ã§èµ·å‹•ã—ã¦ãã ã•ã„。"
# clefs
-#: client/connectdlg_common.c:364
+#: client/connectdlg_common.c:363
msgid "Couldn't connect to the server."
msgstr "サーãƒã¨æŽ¥ç¶šã§ãã¾ã›ã‚“ã§ã—ãŸã€‚"
# clefs
# サーãƒã‚’ãƒãƒ¼ã‚«ãƒ«ã§èµ·å‹•ã—ãŸã¯ãšãªã®ã«æŽ¥ç¶šã§ããªã‹ã£ãŸã¨ãã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸
-#: client/connectdlg_common.c:365
+#: client/connectdlg_common.c:364
msgid "We probably couldn't start it from here."
msgstr "ã“ã“ã‹ã‚‰ã ã¨èµ·å‹•ã§ããªã„ã®ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。"
# clefs
-#: client/connectdlg_common.c:470
+#: client/connectdlg_common.c:469
#, fuzzy
msgid ""
"Established control over the server. You have command access level 'hack'."
msgstr "我々ãŒã‚µãƒ¼ãƒã‚’制御ã—ã¦ã„ã¾ã™ï¼ˆã‚³ãƒžãƒ³ãƒ‰ãƒ¬ãƒ™ãƒ«ã§æ“作ã§ãã¾ã™ï¼‰"
-#: client/connectdlg_common.c:475
+#: client/connectdlg_common.c:474
msgid ""
"Failed to obtain the required access level to take control of the server. "
"The server will now be shutdown."
@@ -8600,28 +8737,28 @@ msgstr ""
msgid "Only transporter units can be unloaded."
msgstr "輸é€éƒ¨éšŠã ã‘ãŒé™ã‚ã›ã¾ã™ã€‚"
-#: client/control.c:1425
+#: client/control.c:1417
msgid "Only settler units can be put into auto mode."
msgstr "開拓者部隊ã¨éƒ½å¸‚ã«æ‰€å±žã™ã‚‹è»äº‹éƒ¨éšŠã ã‘ãŒè‡ªå‹•ãƒ¢ãƒ¼ãƒ‰ã«ã§ãã¾ã™ã€‚"
-#: client/control.c:1516
+#: client/control.c:1511
msgid "Only nuclear units can do this."
msgstr "æ ¸å…µå™¨éƒ¨éšŠã ã‘ãŒã“れを行ãˆã¾ã™ã€‚"
-#: client/control.c:1545
+#: client/control.c:1540
msgid "Only paratrooper units can do this."
msgstr "è½ä¸‹å‚˜å…µéƒ¨éšŠã ã‘ãŒã“れを行ãˆã¾ã™ã€‚"
-#: client/control.c:2020
+#: client/control.c:2015
msgid "Too far for this unit."
msgstr "ã“ã®éƒ¨éšŠã‹ã‚‰é ã™ãŽã¾ã™ã€‚"
-#: client/control.c:2230 client/control.c:2260 client/control.c:2276
+#: client/control.c:2225 client/control.c:2255 client/control.c:2271
msgid "Didn't find a route to the destination!"
msgstr "目的地ã¾ã§ã®çµŒè·¯ã‚’探ã›ã¾ã›ã‚“。"
# clefs
-#: client/control.c:2320
+#: client/control.c:2315
msgid "Oh my! You seem to have no capital!"
msgstr "ã‚ã„ã‚„ï¼ã€€é¦–都ãŒãªã„ã¿ãŸã„ã§ã™ã‚ˆï¼"
@@ -9052,26 +9189,32 @@ msgstr "* %sを発見ã™ã‚‹ã¨é›£ç ´ã®ç¢ºçŽ‡ã¯12%%ã«ãªã‚Šã¾ã™ã€‚\n"
#. * last two elements
#. TRANS: List of possible output types has this between
#. * last two elements
-#: client/helpdata.c:1066 client/helpdata.c:1400
+#: client/helpdata.c:1066 client/helpdata.c:1408
msgid " or "
msgstr "ã‹"
-#: client/helpdata.c:1068 client/helpdata.c:1388
+#: client/helpdata.c:1068 client/helpdata.c:1396
msgid "?or:, "
msgstr "ã‹"
-#: client/helpdata.c:1080
-#, 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"
+#: client/helpdata.c:1079
+#, fuzzy, c-format
+msgid "* Unit has to be in a city, or a base after %d turn.\n"
+msgid_plural "* Unit has to be in a city, or a base after %d turns.\n"
+msgstr[0] "* %2$dターンéŽãŽãŸã‚‰éƒ¨éšŠã¯éƒ½å¸‚ã‹%1$sã«ã„ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。\n"
+
+#: client/helpdata.c:1087
+#, fuzzy, c-format
+msgid "* Unit has to be in a city, a base, or on a %s after %d turn.\n"
+msgid_plural "* Unit has to be in a city, a base, or on a %s after %d turns.\n"
msgstr[0] "* %2$dターンéŽãŽãŸã‚‰éƒ¨éšŠã¯éƒ½å¸‚ã‹%1$sã«ã„ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。\n"
-#: client/helpdata.c:1122
+#: client/helpdata.c:1130
#, c-format
msgid "If we would now start with %s we would need %d bulbs."
msgstr "今%sを開始ã—ãŸã‚‰ï¼Œ%då˜ä½å¿…è¦ã§ã™ã€‚"
-#: client/helpdata.c:1127
+#: client/helpdata.c:1135
#, c-format
msgid ""
"To reach %s we need to obtain %d other technologies first. The whole project "
@@ -9081,94 +9224,94 @@ msgstr ""
"らã›ã‚‹ã«ã¯ï¼Œ%då˜ä½å¿…è¦ã§ã™ã€‚"
# clefs
-#: client/helpdata.c:1135
+#: client/helpdata.c:1143
msgid "You cannot research this technology."
msgstr "ã“ã®æŠ€è¡“ã¯ç ”究ã§ãã¾ã›ã‚“。"
-#: client/helpdata.c:1139
+#: client/helpdata.c:1147
msgid " This number may vary depending on what other players will research.\n"
msgstr ""
" ã“ã®æ•°ã¯ä»–ã®ãƒ—レイヤーãŒç ”究ã—ã¦ã„る物ã«ã‚ˆã£ã¦ã¯ç•°ãªã‚‹ã“ã¨ãŒã‚ã‚Šã¾ã™ã€‚\n"
-#: client/helpdata.c:1151
+#: client/helpdata.c:1159
#, 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:1156
+#: client/helpdata.c:1164
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
msgstr "* 外海ã§å°èˆŸãŒé›£ç ´ã™ã‚‹ç¢ºçŽ‡ã‚’25%%ã«æŠ‘ãˆã¾ã™ã€‚\n"
-#: client/helpdata.c:1159
+#: client/helpdata.c:1167
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
msgstr "* 外海ã§å°èˆŸãŒé›£ç ´ã™ã‚‹ç¢ºçŽ‡ã‚’12%%ã«æŠ‘ãˆã¾ã™ã€‚\n"
-#: client/helpdata.c:1163
+#: client/helpdata.c:1171
msgid "* Increases the pollution generated by the population.\n"
msgstr "* 人å£ã«ã‚ˆã£ã¦å¼•ãèµ·ã“ã•ã‚Œã‚‹å…¬å®³ã‚’増やã—ã¾ã™ã€‚\n"
-#: client/helpdata.c:1168
+#: client/helpdata.c:1176
#, c-format
msgid "* Allows %s to build roads on river squares.\n"
msgstr "* %sã§å·ã®ä¸Šã«é“路を作れるよã†ã«ãªã‚Šã¾ã™ã€‚\n"
-#: client/helpdata.c:1175
+#: client/helpdata.c:1183
#, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr "* %sã§è¦å¡žã‚’作れるよã†ã«ãªã‚Šã¾ã™ã€‚\n"
-#: client/helpdata.c:1183
+#: client/helpdata.c:1191
#, c-format
msgid "* Allows %s to build airbases.\n"
msgstr "* %sã§é£›è¡Œå ´ã‚’作れるよã†ã«ãªã‚Šã¾ã™ã€‚\n"
-#: client/helpdata.c:1192
+#: client/helpdata.c:1200
#, c-format
msgid "* Allows %s to upgrade roads to railroads.\n"
msgstr "* %sã§é“路を鉄é“ã¸ã‚¢ãƒƒãƒ—グレードã§ãるよã†ã«ãªã‚Šã¾ã™ã€‚\n"
-#: client/helpdata.c:1200
+#: client/helpdata.c:1208
#, c-format
msgid "* Allows %s to upgrade irrigation to farmland.\n"
msgstr "* %sã§çŒæ¼‘を農地ã¸ã‚¢ãƒƒãƒ—グレードã§ãるよã†ã«ãªã‚Šã¾ã™ã€‚\n"
-#: client/helpdata.c:1234
+#: client/helpdata.c:1242
msgid "* Pollution cannot be generated on this terrain."
msgstr "* ã“ã®åœ°å½¢ã«ã¯å…¬å®³ã¯ç™ºç”Ÿã—ã¾ã›ã‚“。"
-#: client/helpdata.c:1239
+#: client/helpdata.c:1247
msgid "* You cannot build cities on this terrain."
msgstr "* ã“ã®åœ°å½¢ã«éƒ½å¸‚ã¯å»ºè¨ã§ãã¾ã›ã‚“。"
# clefs
# ã¾ã å˜åœ¨ã—ãªã„ãŒï¼Œå°†æ¥å°Žå…¥ã•ã‚Œã‚‹ã‚‰ã—ã„
-#: client/helpdata.c:1245
+#: client/helpdata.c:1253
msgid "* The coastline of this terrain is unsafe."
msgstr "* ã“ã®åœ°å½¢ã®æµ·å²¸ç·šã¯å±é™ºã§ã™ã€‚"
-#: client/helpdata.c:1250
+#: client/helpdata.c:1258
msgid "* This terrain is unsafe for units to travel on."
msgstr "* ã“ã®åœ°å½¢ã§ã®éƒ¨éšŠã®ç§»å‹•ã¯å±é™ºã§ã™ã€‚"
# clefs
-#: client/helpdata.c:1255
+#: client/helpdata.c:1263
msgid "* Land units cannot travel on oceanic terrains."
msgstr "* 陸上部隊ã¯æµ·æ´‹åœ°å½¢ã®ä¸Šã«ã¯ç§»å‹•ã§ãã¾ã›ã‚“。"
-#: client/helpdata.c:1305
+#: client/helpdata.c:1313
msgid "Features:\n"
msgstr ""
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1411 client/helpdata.c:1412
+#: client/helpdata.c:1419 client/helpdata.c:1420
msgid "?outputlist: Nothing "
msgstr ""
-#: client/helpdata.c:1419
+#: client/helpdata.c:1427
#, fuzzy, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -9180,7 +9323,7 @@ msgstr[0] ""
"æœ¬æ‹ åœ°ã‚’é›¢ã‚ŒãŸè»äº‹éƒ¨éšŠï¼ŒãŠã‚ˆã³å…¨ã¦ã®ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰éƒ¨éšŠã¯%d市民をä¸å¹¸ã«ã—ã¾ã™ã€‚\n"
# clefs
-#: client/helpdata.c:1429
+#: client/helpdata.c:1437
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -9190,26 +9333,26 @@ msgstr ""
# clefs
#. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1437
+#: client/helpdata.c:1445
#, c-format
msgid "* You pay %d times normal %s upkeep for your units.\n"
msgstr "* 部隊ç¶æŒã«å¿…è¦ãª%2$sã¯é€šå¸¸ã®%1$då€ã«ãªã‚Šã¾ã™ã€‚\n"
# clefs
-#: client/helpdata.c:1442
+#: client/helpdata.c:1450
#, 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:1447
+#: client/helpdata.c:1455
#, c-format
msgid "* You pay no %s upkeep for your units.\n"
msgstr "* 部隊ç¶æŒã«%sã®å¿…è¦ã¯ã‚ã‚Šã¾ã›ã‚“。\n"
# Daniel
-#: client/helpdata.c:1451
+#: client/helpdata.c:1459
msgid "* You pay no upkeep for your units.\n"
msgstr "* 部隊ç¶æŒã‚³ã‚¹ãƒˆã¯ã‚ã‚Šã¾ã›ã‚“。\n"
@@ -9217,7 +9360,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:1460
+#: client/helpdata.c:1468
#, c-format
msgid "* Each of your cities will avoid paying %d %s towards unit upkeep.\n"
msgstr "* å„都市ã§ï¼Œ%d%sã¾ã§ã®éƒ¨éšŠç¶æŒã‚³ã‚¹ãƒˆã¯å…除ã•ã‚Œã¾ã™ã€‚\n"
@@ -9225,13 +9368,13 @@ msgstr "* å„都市ã§ï¼Œ%d%sã¾ã§ã®éƒ¨éšŠç¶æŒã‚³ã‚¹ãƒˆã¯å…除ã•ã‚Œã¾ã™
# clefs
#. TRANS: Amount is subtracted from upkeep cost
#. * for each upkeep type.
-#: client/helpdata.c:1468
+#: client/helpdata.c:1476
#, c-format
msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
msgstr "* å„都市ã§ï¼Œ%dã¾ã§ã®éƒ¨éšŠç¶æŒã‚³ã‚¹ãƒˆã¯å…除ã•ã‚Œã¾ã™ã€‚\n"
# clefs
-#: client/helpdata.c:1475
+#: client/helpdata.c:1483
#, c-format
msgid "* Chance of civil war is %d%% if you lose your capital.\n"
msgstr "* 首都を失ã£ãŸå ´åˆï¼Œ%d%%ã®ç¢ºçŽ‡ã§å†…戦ã«ãªã‚Šã¾ã™ã€‚\n"
@@ -9239,7 +9382,7 @@ msgstr "* 首都を失ã£ãŸå ´åˆï¼Œ%d%%ã®ç¢ºçŽ‡ã§å†…戦ã«ãªã‚Šã¾ã™ã€‚\n"
# clefs
# XXX
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1482
+#: client/helpdata.c:1490
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -9250,7 +9393,7 @@ msgstr ""
# clefs
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1489
+#: client/helpdata.c:1497
#, c-format
msgid ""
"* After the first unhappy citizen due to city size, for each %d additional "
@@ -9260,18 +9403,18 @@ msgstr ""
"出ç¾ã—ã¾ã™ã€‚\n"
# clefs
-#: client/helpdata.c:1497
+#: client/helpdata.c:1505
#, c-format
msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
msgstr "科å¦ï¼ç¾é‡‘ï¼è´…æ²¢ã®æ¯”率ã¯æœ€å¤§%d%%ã¾ã§ã§ã™ã€‚\n"
# clefs
-#: client/helpdata.c:1502
+#: client/helpdata.c:1510
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr "科å¦ï¼ç¾é‡‘ï¼è´…æ²¢ã®æ¯”率ã«åˆ¶é™ã¯ã‚ã‚Šã¾ã›ã‚“。\n"
# clefs
-#: client/helpdata.c:1507
+#: client/helpdata.c:1515
#, fuzzy, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -9284,7 +9427,7 @@ msgstr[0] ""
"制的ã«æº€è¶³çŠ¶æ…‹ã«ã—ã¾ã™ã€‚\n"
# clefs
-#: client/helpdata.c:1519
+#: client/helpdata.c:1527
#, 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"
@@ -9292,7 +9435,7 @@ msgstr[0] "* 1ã¤ã®éƒ½å¸‚ã«ã¤ã最大%dã®éƒ¨éšŠã§æˆ’厳令を強ã„ã‚‹ã“
# clefs
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1530
+#: client/helpdata.c:1538
#, c-format
msgid ""
"* You may grow your cities by means of celebrations. Your cities must be at "
@@ -9302,18 +9445,18 @@ msgstr ""
"上ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。\n"
# clefs
-#: client/helpdata.c:1536
+#: client/helpdata.c:1544
msgid "* Your units cannot be bribed.\n"
msgstr "* ã‚ãªãŸã®éƒ¨éšŠã¯è²·åŽã‚’å—ã‘付ã‘ã¾ã›ã‚“。\n"
# clefs
-#: client/helpdata.c:1539
+#: client/helpdata.c:1547
msgid "* Your cities cannot be incited.\n"
msgstr "* ã‚ãªãŸã®éƒ½å¸‚ã¯ç…½å‹•ã‚’å—ã‘付ã‘ã¾ã›ã‚“。\n"
# clefs
# 「政府ã¯ç„¡æ”¿åºœã€ã„ã‚„ã‚“
-#: client/helpdata.c:1543
+#: client/helpdata.c:1551
msgid ""
"* Government will fall into anarchy if any city is in disorder for more than "
"two turns in a row.\n"
@@ -9321,48 +9464,48 @@ msgstr ""
"* 1ã¤ã®éƒ½å¸‚ãŒ2ターン以上続ã‘ã¦æ··ä¹±ã™ã‚‹ã¨ï¼Œæ”¿åºœã¯ç„¡æ”¿åºœçŠ¶æ…‹ã«é™¥ã‚Šã¾ã™ã€‚\n"
# clefs
-#: client/helpdata.c:1549
+#: client/helpdata.c:1557
msgid "* Has a senate that may prevent declaration of war.\n"
msgstr "* 上院ãŒå†…戦ã®å®£æˆ¦ã‚’防ãŽæ¢ã‚ã¦ãれるã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。\n"
# clefs
# ã‚„ã‚„æ„訳
-#: client/helpdata.c:1553
+#: client/helpdata.c:1561
msgid "* Allows partisans when cities are taken by the enemy.\n"
msgstr "* 都市ãŒæ•µã«å é ˜ã•ã‚ŒãŸéš›ã«ãƒ‘ルãƒã‚¶ãƒ³ã®èœ‚èµ·ãŒã‚ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。\n"
# clefs
-#: client/helpdata.c:1557
+#: client/helpdata.c:1565
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
msgstr "* 通常ã§ã¯ä¸å¹¸å¯¾ç–ã¨ãªã‚‹å»ºé€ 物ã¯ã‹ã‚ã‚Šã«ç¾é‡‘ã‚’ã‚‚ãŸã‚‰ã—ã¾ã™ã€‚\n"
# clefs
-#: client/helpdata.c:1561
+#: client/helpdata.c:1569
msgid "* Pays no upkeep for fanatics.\n"
msgstr "* 熱狂兵ã®ç¶æŒã«ã‚³ã‚¹ãƒˆãŒã‹ã‹ã‚Šã¾ã›ã‚“。\n"
# clefs
-#: client/helpdata.c:1564
+#: client/helpdata.c:1572
msgid "* Has no unhappy citizens.\n"
msgstr "* ä¸å¹¸ãªå¸‚æ°‘ã¯å˜åœ¨ã—ã¾ã›ã‚“。\n"
# clefs
-#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
+#: client/helpdata.c:1582 client/helpdata.c:1586 client/helpdata.c:1590
#, c-format
msgid "* Veteran %s units.\n"
msgstr "* %s部隊ã¯å…¨ã¦ãƒ™ãƒ†ãƒ©ãƒ³ã«ãªã‚Šã¾ã™ã€‚\n"
# clefs
-#: client/helpdata.c:1585
+#: client/helpdata.c:1593
msgid "* Veteran units.\n"
msgstr "* 部隊ã¯å…¨ã¦ãƒ™ãƒ†ãƒ©ãƒ³ã«ãªã‚Šã¾ã™ã€‚\n"
# clefs
# XXX %sãŒ"all"ã ã¨ãƒ˜ãƒœã„ã“ã¨ã«
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1591
+#: client/helpdata.c:1599
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -9373,7 +9516,7 @@ msgstr ""
# clefs
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1600
+#: client/helpdata.c:1608
#, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -9384,7 +9527,7 @@ msgstr ""
# clefs
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1608
+#: client/helpdata.c:1616
#, c-format
msgid "* Each worked tile with at least 1 %s will yield %d more of it.\n"
msgstr ""
@@ -9393,7 +9536,7 @@ msgstr ""
# Daniel
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1617
+#: client/helpdata.c:1625
#, c-format
msgid "* %s production is increased %d%%.\n"
msgstr "* %sã®ç”Ÿç”£ã¯%d%%増やã—ã¾ã™ã€‚\n"
@@ -9401,64 +9544,64 @@ msgstr "* %sã®ç”Ÿç”£ã¯%d%%増やã—ã¾ã™ã€‚\n"
# clefs
# 「交易ã®ç”Ÿç”£ã€ã¨ã‹ã«ãªã£ã¦ã—ã¾ã†ã®ã ã‘ã‚Œã©ã€ã¾ã‚仕方ãªã„ã‹
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1625
+#: client/helpdata.c:1633
#, 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:1630
+#: client/helpdata.c:1638
#, 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:1635
+#: client/helpdata.c:1643
#, 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:1643
+#: client/helpdata.c:1651
#, 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:1649
+#: client/helpdata.c:1657
#, 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:1655
+#: client/helpdata.c:1663
#, c-format
msgid "* %s waste will increase slowly with distance from capital.\n"
msgstr "* %sã®æµªè²»ã¯é¦–都ã‹ã‚‰é›¢ã‚Œã‚‹ã«ã¤ã‚Œå°‘ã—ãšã¤å¤šããªã‚Šã¾ã™ã€‚\n"
-#: client/helpdata.c:1672
+#: client/helpdata.c:1680
#, c-format
msgid "* Allows you to build %s.\n"
msgstr "* %sを作れるよã†ã«ãªã‚Šã¾ã™ã€‚\n"
#. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1699
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d %s"
msgstr ""
-#: client/helpdata.c:1700 client/helpdata.c:1708 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1708 client/helpdata.c:1716 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:1707
+#: client/helpdata.c:1715
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d ä¸å¹¸"
@@ -9539,7 +9682,7 @@ msgstr ""
"接続ダイアãƒã‚°ï¼ŒãŠã‚ˆã³ã‚³ãƒžãƒ³ãƒ‰ãƒ©ã‚¤ãƒ³ã§-aを指定ã—ãŸæ™‚ã«ä½¿ç”¨ã•ã‚Œã‚‹ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®"
"ãƒãƒ¼ãƒˆç•ªå·ã§ã™ã€‚"
-#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:916 data/Freeciv.in:107
msgid "Metaserver"
msgstr "メタサーãƒ"
@@ -9975,36 +10118,36 @@ msgstr "ä¿å˜ãŒå¤±æ•—ã—ã¾ã—ãŸã€‚ファイル %s ã¸æ›¸ãè¾¼ã‚ã¾ã›ã‚“"
msgid "Saved settings to file %s"
msgstr "è¨å®šã‚’ファイル %s ã¸ä¿å˜ã—ã¾ã—ãŸã€‚"
-#: client/packhand.c:211 client/packhand.c:217
+#: client/packhand.c:212 client/packhand.c:218
#, fuzzy
msgid "You were rejected from the game...."
msgstr "接続を拒絶ã•ã‚Œã¾ã—ãŸ:"
-#: client/packhand.c:229
+#: client/packhand.c:230
#, c-format
msgid "Client capability string: %s"
msgstr "クライアントã®æ©Ÿèƒ½: %s"
-#: client/packhand.c:232
+#: client/packhand.c:233
#, c-format
msgid "Server capability string: %s"
msgstr "サーãƒã®æ©Ÿèƒ½: %s"
-#: client/packhand.c:850
+#: client/packhand.c:864
#, c-format
msgid "Start of turn %d"
msgstr "ターン%d ã®é–‹å§‹"
-#: client/packhand.c:1591
+#: client/packhand.c:1621
#, c-format
msgid "AI Mode is now %s."
msgstr "AI モードã¯%sã§ã™ã€‚"
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "ON"
msgstr "オン"
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "OFF"
msgstr "オフ"
@@ -10037,15 +10180,15 @@ msgstr "?Player:å"
msgid "Username"
msgstr "ユーザå"
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
-#: client/gui-gtk-2.0/pages.c:2157
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:653
+#: client/gui-gtk-2.0/pages.c:1604 client/gui-gtk-2.0/pages.c:2159
msgid "Flag"
msgstr "æ——"
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1605
-#: client/gui-gtk-2.0/pages.c:2159 client/gui-sdl/repodlgs.c:2063
-#: client/gui-win32/connectdlg.c:990 client/gui-win32/dialogs.c:542
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:657
+#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1609
+#: client/gui-gtk-2.0/pages.c:2161 client/gui-sdl/repodlgs.c:2063
+#: client/gui-win32/connectdlg.c:992 client/gui-win32/dialogs.c:542
#: client/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "æ°‘æ—"
@@ -10059,7 +10202,7 @@ msgstr "国境線"
msgid "Score"
msgstr "スコア"
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1614
msgid "Team"
msgstr "ãƒãƒ¼ãƒ "
@@ -10095,37 +10238,37 @@ msgid "Ping"
msgstr "Ping"
# ã“ã®ã‚ãŸã‚Šã¯ã€äººæ§˜ã®éƒ½å¸‚ã§å‡ºã‚‹ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ãªã®ã‹ãª (clefs)
-#: client/repodlgs_common.c:375
+#: client/repodlgs_common.c:378
msgid "You cannot sell improvements."
msgstr "å»ºé€ ç‰©ã®å£²å´ã¯ã§ãã¾ã›ã‚“。"
-#: client/repodlgs_common.c:391
+#: client/repodlgs_common.c:394
#, c-format
msgid "Sold %d %s for %d gold."
msgstr "%dã®%sを金%dã§å£²ã‚Šã¾ã—ãŸ"
-#: client/repodlgs_common.c:396
+#: client/repodlgs_common.c:399
#, c-format
msgid "No %s could be sold."
msgstr "%sã¯å…¨ã売å´ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚"
#. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:415
+#: client/repodlgs_common.c:418
msgid "You cannot disband units."
msgstr "部隊ã®è§£æ•£ã¯ã§ãã¾ã›ã‚“。"
-#: client/repodlgs_common.c:420
+#: client/repodlgs_common.c:423
#, c-format
msgid "%s cannot be disbanded."
msgstr "%sã¯è§£æ•£ã•ã›ã‚‰ã‚Œã¾ã›ã‚“。"
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:444
#, c-format
msgid "Disbanded %d %s."
msgstr "%dã®%sを解散ã—ã¾ã—ãŸã€‚"
# XXX è¦ãƒã‚§ãƒƒã‚¯ (clefs)
-#: client/repodlgs_common.c:445
+#: client/repodlgs_common.c:448
#, c-format
msgid "No %s could be disbanded."
msgstr "%sã¯è§£æ•£ã•ã›ã‚‰ã‚Œã¾ã›ã‚“ã§ã—ãŸã€‚"
@@ -10743,49 +10886,49 @@ msgstr "%02d日%02d時間"
msgid "?duration:overflow"
msgstr "オーãƒãƒ¼ãƒ•ãƒãƒ¼"
-#: client/text.c:1143
+#: client/text.c:1145
#, c-format
msgid "%6d.%02d ms"
msgstr ""
#. TRANS: <nation adjective> <government name>.
#. * E.g. "Polish Republic".
-#: client/text.c:1188
+#: client/text.c:1193
#, fuzzy, c-format
msgid "?nationgovernment:%s %s"
msgstr "政治体制: %s"
# Daniel
#. TRANS: "Observer: 1985"
-#: client/text.c:1198
+#: client/text.c:1203
#, c-format
msgid "Observer: %s"
msgstr "観察者: %s"
-#: client/text.c:1216
+#: client/text.c:1221
msgid "Buildings: "
msgstr "å»ºé€ ç‰©: "
-#: client/text.c:1233 client/text.c:1272
+#: client/text.c:1238 client/text.c:1277
msgid "None. "
msgstr "ãªã—"
-#: client/text.c:1235 client/text.c:1274
+#: client/text.c:1240 client/text.c:1279
msgid "?clistend:."
msgstr "?clistend:"
-#: client/text.c:1253
+#: client/text.c:1258
msgid "Wonders: "
msgstr "ä¸æ€è°: "
-#: client/text.c:1308
+#: client/text.c:1313
#, 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:1312
+#: client/text.c:1317
#, fuzzy, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
@@ -10794,54 +10937,54 @@ msgstr[0] "%d番目ã®å¸‚æ°‘ã¾ã§ã¯æœ€åˆã‹ã‚‰åŸºæœ¬çš„ã«æº€è¶³ã—ã¦ã„ã¾
# clefs
# 都市ã®ç·æ•°ãŒå¢—ãˆã‚‹ã¨ãƒšãƒŠãƒ«ãƒ†ã‚£ãŒèª²ã›ã‚‰ã‚Œã¾ã™
#. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1318
+#: client/text.c:1323
#, fuzzy, c-format
msgid "%d additional unhappy citizen."
msgid_plural "%d additional unhappy citizens."
msgstr[0] "ã†ã¡%dã®å¸‚æ°‘ã¯ãƒšãƒŠãƒ«ãƒ†ã‚£ã§ä¸å¹¸ã«ãªã‚Šã¾ã™ã€‚"
-#: client/text.c:1339
+#: client/text.c:1344
#, fuzzy
msgid "Unlimited martial law in effect."
msgstr "戒厳令ãŒæœ‰åŠ¹("
-#: client/text.c:1341
+#: client/text.c:1346
#, fuzzy, c-format
msgid "%d military unit may impose martial law."
msgid_plural "Up to %d military units may impose martial law."
msgstr[0] "* éžæˆ¦é—˜éƒ¨éšŠã§ã™ã€‚(攻撃ã§ãã¾ã›ã‚“。戒厳令ã¯é©ç”¨ã•ã‚Œã¾ã›ã‚“。)\n"
-#: client/text.c:1345
+#: client/text.c:1350
#, fuzzy, c-format
msgid "Each military unit makes %d unhappy citizen content."
msgid_plural "Each military unit makes %d unhappy citizens content."
msgstr[0] "市民を楽ã—ã¾ã›ï¼Œä¸å¹¸å¸‚æ°‘3を満足ã•ã›ã¾ã™ã€‚"
-#: client/text.c:1352
+#: client/text.c:1357
msgid "Military units in the field may cause unhappiness. "
msgstr "æˆ¦å ´ã®è»äº‹éƒ¨éšŠã¯ä¸å¹¸ã®åŽŸå› ã«ãªã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。"
-#: client/text.c:1355
+#: client/text.c:1360
msgid "Military units have no happiness effect. "
msgstr "è»äº‹éƒ¨éšŠã¯å¹¸ç¦ã«å½±éŸ¿ã‚’与ãˆã¾ã›ã‚“。"
-#: client/text.c:1370
+#: client/text.c:1375
#, c-format
msgid "Luxury: %d total."
msgstr "è´…æ²¢: åˆè¨ˆ %d"
-#: client/tilespec.c:865
+#: client/tilespec.c:882
msgid "No usable default tileset found, aborting!"
msgstr "利用å¯èƒ½ãªãƒ‡ãƒ•ã‚©ãƒ«ãƒˆãƒ»ã‚¿ã‚¤ãƒ«ã‚»ãƒƒãƒˆãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。ä¸æ–ã—ã¦ã„ã¾ã™!"
-#: client/tilespec.c:1338
+#: client/tilespec.c:1355
msgid ""
"Client does not support isometric tilesets. Using default tileset instead."
msgstr ""
"クライアントã¯ç‰è§’タイルセットをサãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“。ã‹ã‚ã‚Šã«ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®ã‚¿"
"イルセットを使ã„ã¾ã™ã€‚"
-#: client/tilespec.c:1347
+#: client/tilespec.c:1364
msgid ""
"Client does not support overhead view tilesets. Using default tileset "
"instead."
@@ -10850,7 +10993,7 @@ msgstr ""
"ルトタイルセットを使ã„ã¾ã™ã€‚"
# clefs
-#: client/tilespec.c:3966
+#: client/tilespec.c:3987
#, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -11566,7 +11709,7 @@ msgid "_Display"
msgstr "表示è¨å®š(_D)..."
#: client/gui-gtk-2.0/cityrep.c:1006 client/gui-gtk-2.0/menu.c:839
-#: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
+#: client/gui-sdl/diplodlg.c:692 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
#: client/gui-xaw/cityrep.c:533 client/gui-xaw/menu.c:156
@@ -11742,205 +11885,205 @@ msgstr "æ–°ã—ã„プリセットを何ã¨åã¥ã‘ã¾ã™ã‹?"
msgid "Remove this preset?"
msgstr "ã“ã®ãƒ—リセットを削除ã—ã¦ã„ã„ã§ã™ã‹?"
-#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:222
+#: client/gui-gtk-2.0/dialogs.c:197 client/gui-gtk-2.0/messagewin.c:222
msgid "Goto _Location"
msgstr "ç¾å ´ã¸ç§»å‹•(_L)"
-#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
+#: client/gui-gtk-2.0/dialogs.c:202 client/gui-gtk-2.0/messagewin.c:226
#, fuzzy
msgid "Inspect _City"
msgstr "都市をãƒãƒƒãƒ—アップ(_C)"
# XXX J.Lennonã®ã‚‚ã˜ã‚Šã ãŒâ€¦
# 「カクメイã—ãŸã„ã‚“ã ã£ã¦ï¼Ÿã€
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:258 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:258 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:259 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:311 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:312 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:312 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:313 client/gui-win32/dialogs.c:1755
#: data/Freeciv.in:2502
msgid "Select what to pillage:"
msgstr "略奪対象をé¸æŠž:"
-#: client/gui-gtk-2.0/dialogs.c:506
+#: client/gui-gtk-2.0/dialogs.c:507
msgid "Unit"
msgstr "部隊"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:950
-#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2155
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:985
+#: client/gui-gtk-2.0/dialogs.c:508 client/gui-gtk-2.0/pages.c:950
+#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2157
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:987
#: client/gui-win32/plrdlg.c:335 manual/civmanual.c:302 data/Freeciv.in:80
msgid "Name"
msgstr "åå‰"
-#: client/gui-gtk-2.0/dialogs.c:519 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:520 client/gui-sdl/dialogs.c:627
msgid "Unit selection"
msgstr "部隊ã®é¸æŠž"
-#: client/gui-gtk-2.0/dialogs.c:582
+#: client/gui-gtk-2.0/dialogs.c:583
msgid "_Ready all"
msgstr "全準備(_R)"
-#: client/gui-gtk-2.0/dialogs.c:590
+#: client/gui-gtk-2.0/dialogs.c:591
msgid "_Sentry idle"
msgstr "手空ã部隊を見張り番ã¸(_S)"
-#: client/gui-gtk-2.0/dialogs.c:719
+#: client/gui-gtk-2.0/dialogs.c:721
#, fuzzy
msgid "Nation _Groups:"
msgstr "æ°‘æ—(_G):"
-#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:766 data/Freeciv.in:3128
msgid "What Nation Will You Be?"
msgstr "ã‚ãªãŸãŒãªã‚ŠãŸã„æ°‘æ—ã¯?"
-#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
-#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
+#: client/gui-gtk-2.0/dialogs.c:768 client/gui-sdl/chatline.c:842
+#: client/gui-win32/connectdlg.c:1040 data/Freeciv.in:3371
msgid "Pick Nation"
msgstr "æ°‘æ—é¸æŠž"
# clefs
-#: client/gui-gtk-2.0/dialogs.c:774
+#: client/gui-gtk-2.0/dialogs.c:776
#, fuzzy
msgid "_Random Nation"
msgstr "ランダムãªæ°‘æ— (_R)"
-#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:792 client/gui-win32/dialogs.c:517
msgid "Select a nation"
msgstr "æ°‘æ—ã®é¸æŠž"
# ntaka 属性より分ã‹ã‚Šæ˜“ãè¨å®šã¨ã™ã¹ãã‹?
# clefs æ°‘æ—ã®propertiesã¨ã„ã†æ–‡è„ˆã§ã™ã‹ã‚‰ããˆã€‚属性ã®ã¾ã¾ã«ã—ã¦ãŠãã¾ã—ょ
-#: client/gui-gtk-2.0/dialogs.c:804
+#: client/gui-gtk-2.0/dialogs.c:810
msgid "_Properties"
msgstr "属性(_P)"
-#: client/gui-gtk-2.0/dialogs.c:824
+#: client/gui-gtk-2.0/dialogs.c:830
msgid "_Leader:"
msgstr "指導者(_L):"
-#: client/gui-gtk-2.0/dialogs.c:831
+#: client/gui-gtk-2.0/dialogs.c:837
msgid "_Female"
msgstr "女(_F)"
-#: client/gui-gtk-2.0/dialogs.c:836
+#: client/gui-gtk-2.0/dialogs.c:842
msgid "_Male"
msgstr "ç”·(_M)"
-#: client/gui-gtk-2.0/dialogs.c:863
+#: client/gui-gtk-2.0/dialogs.c:869
#, fuzzy
msgid "City _Styles:"
msgstr "都市スタイル(_S):"
-#: client/gui-gtk-2.0/dialogs.c:902
+#: client/gui-gtk-2.0/dialogs.c:908
#, fuzzy
msgid "_Description"
msgstr "ä¼èª¬(_D)"
-#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1263 client/gui-xaw/dialogs.c:1480
msgid "You must select your sex."
msgstr "性別をé¸æŠžã—ã¦ä¸‹ã•ã„。"
-#: client/gui-gtk-2.0/dialogs.c:1253 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1268 client/gui-xaw/dialogs.c:1485
msgid "You must select your city style."
msgstr "都市スタイルををé¸æŠžã—ã¦ä¸‹ã•ã„。"
-#: client/gui-gtk-2.0/dialogs.c:1262 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1277 client/gui-sdl/dialogs.c:2204
#: 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:1306 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1318 client/gui-win32/citydlg.c:1454
#: data/Freeciv.in:2484
msgid "Upgrade Unit!"
msgstr "æ–°åž‹ã«ã™ã‚‹"
-#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1327 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 "旧型部隊を新型ã«ã™ã‚‹"
-#: client/gui-gtk-2.0/diplodlg.c:231 client/gui-win32/diplodlg.c:151
+#: client/gui-gtk-2.0/diplodlg.c:222 client/gui-win32/diplodlg.c:151
#: client/gui-xaw/diplodlg.c:383 client/gui-xaw/diplodlg.c:401
msgid "World-map"
msgstr "世界地図"
-#: client/gui-gtk-2.0/diplodlg.c:237 client/gui-win32/diplodlg.c:146
+#: client/gui-gtk-2.0/diplodlg.c:228 client/gui-win32/diplodlg.c:146
#: client/gui-xaw/diplodlg.c:387 client/gui-xaw/diplodlg.c:405
msgid "Sea-map"
msgstr "海洋地図"
-#: client/gui-gtk-2.0/diplodlg.c:243
+#: client/gui-gtk-2.0/diplodlg.c:234
msgid "_Maps"
msgstr "地図(_M)"
-#: client/gui-gtk-2.0/diplodlg.c:274
+#: client/gui-gtk-2.0/diplodlg.c:265
msgid "_Advances"
msgstr "科å¦(_A)"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/diplodlg.c:315 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "都市(_C)"
-#: client/gui-gtk-2.0/diplodlg.c:333
+#: client/gui-gtk-2.0/diplodlg.c:324
msgid "_Give shared vision"
msgstr "視界ã®å…±æœ‰ã‚’与ãˆã‚‹(_G)"
-#: client/gui-gtk-2.0/diplodlg.c:346
+#: client/gui-gtk-2.0/diplodlg.c:337
msgid "Give _embassy"
msgstr "大使館を与ãˆã‚‹(_E)"
-#: client/gui-gtk-2.0/diplodlg.c:376
+#: client/gui-gtk-2.0/diplodlg.c:368
msgid "_Pacts"
msgstr "æ¡ç´„(_P)"
# Daniel
-#: client/gui-gtk-2.0/diplodlg.c:466
+#: client/gui-gtk-2.0/diplodlg.c:458
#, c-format
msgid "Diplomacy: %s"
msgstr "外交: %s"
-#: client/gui-gtk-2.0/diplodlg.c:473
+#: client/gui-gtk-2.0/diplodlg.c:465
msgid "_Cancel meeting"
msgstr "会åˆä¸æ¢(_C)"
-#: client/gui-gtk-2.0/diplodlg.c:475
+#: client/gui-gtk-2.0/diplodlg.c:467
msgid "Accept _treaty"
msgstr "æ¡ç´„調å°(_T)"
-#: client/gui-gtk-2.0/diplodlg.c:503
+#: client/gui-gtk-2.0/diplodlg.c:495
msgid "C_lauses:"
msgstr "æ¡é …(_L):"
-#: client/gui-gtk-2.0/diplodlg.c:568 client/gui-gtk-2.0/diplodlg.c:642
+#: client/gui-gtk-2.0/diplodlg.c:560 client/gui-gtk-2.0/diplodlg.c:634
msgid "_Gold:"
msgstr "金(_G):"
-#: client/gui-gtk-2.0/diplodlg.c:580 client/gui-gtk-2.0/diplodlg.c:654
+#: client/gui-gtk-2.0/diplodlg.c:572 client/gui-gtk-2.0/diplodlg.c:646
msgid "_Add Clause..."
msgstr "æ¡é …ã‚’åŠ ãˆã‚‹(_A)"
# clefs
-#: client/gui-gtk-2.0/diplodlg.c:699
+#: client/gui-gtk-2.0/diplodlg.c:691
msgid "--- This treaty is blank. Please add some clauses. ---"
msgstr "―― ã¾ã 空白ã§ã™ã€‚何ã‹æ¡é …ã‚’åŠ ãˆã¦ãã ã•ã„。 ――"
# Game
-#: client/gui-gtk-2.0/diplodlg.c:905 client/gui-sdl/diplodlg.c:375
+#: client/gui-gtk-2.0/diplodlg.c:897 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 "無効ãªé‡‘é¡ãŒæŒ‡å®šã•ã‚Œã¾ã—ãŸã€‚"
@@ -11999,33 +12142,33 @@ msgstr "è¡Œãå…ˆã®é¸æŠž"
msgid "Show _All Cities"
msgstr "å…¨ã¦ã®éƒ½å¸‚を表示(_A)"
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:164
msgid "Show Map Scrollbars"
msgstr "地図ã®ã‚¹ã‚¯ãƒãƒ¼ãƒ«ãƒãƒ¼ã‚’表示"
# clefs
-#: client/gui-gtk-2.0/gui_main.c:163
+#: client/gui-gtk-2.0/gui_main.c:165
msgid "Disable this option to hide the scrollbars on the map view."
msgstr "無効ã«ã™ã‚‹ã¨åœ°å›³è„‡ã®ã‚¹ã‚¯ãƒãƒ¼ãƒ«ãƒãƒ¼ã‚’éžè¡¨ç¤ºã«ã—ã¾ã™ã€‚"
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:169
msgid "Keyboardless goto"
msgstr "ã‚ーボードãªã—ã§ã®gotoコマンド"
# clefs
-#: client/gui-gtk-2.0/gui_main.c:168
+#: client/gui-gtk-2.0/gui_main.c:170
msgid ""
"If this option is set then a goto may be initiated by left-clicking and then "
"holding down the mouse button while dragging the mouse onto a different tile."
msgstr "セットã™ã‚‹ã¨ï¼Œå·¦ãƒ‰ãƒ©ãƒƒã‚°ã™ã‚‹ã ã‘ã§gotoコマンドを実行ã§ãã¾ã™ã€‚"
# ntaka
-#: client/gui-gtk-2.0/gui_main.c:173
+#: client/gui-gtk-2.0/gui_main.c:175
msgid "Keep dialogs on top"
msgstr "ダイアãƒã‚°ã‚’トップレベルã«ä¿ã¤"
# clefs
-#: client/gui-gtk-2.0/gui_main.c:174
+#: client/gui-gtk-2.0/gui_main.c:176
msgid ""
"If this option is set then dialog windows will always remain in front of the "
"main Freeciv window. Disabling this has no effect in fullscreen mode."
@@ -12033,12 +12176,12 @@ msgstr ""
"ã“ã®ã‚ªãƒ—ションをセットã™ã‚‹ã¨ï¼Œãƒ€ã‚¤ã‚¢ãƒã‚°ã¯å¸¸ã«Freecivã®ãƒ¡ã‚¤ãƒ³ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã®å‰ã«"
"ã¨ã©ã¾ã‚Šã¾ã™ã€‚フルスクリーンモードã§ã¯ï¼Œã“れをオフã«ã—ã¦ã‚‚効果ã¯ã‚ã‚Šã¾ã›ã‚“。"
-#: client/gui-gtk-2.0/gui_main.c:178
+#: client/gui-gtk-2.0/gui_main.c:180
msgid "Show worklist task icons"
msgstr "作æ¥ãƒªã‚¹ãƒˆã«ã‚¢ã‚¤ã‚³ãƒ³ã‚’表示ã™ã‚‹"
# clefs
-#: client/gui-gtk-2.0/gui_main.c:179
+#: client/gui-gtk-2.0/gui_main.c:181
msgid ""
"Disabling this will turn off the unit and building icons in the worklist "
"dialog and the production tab of the city dialog."
@@ -12047,13 +12190,13 @@ msgstr ""
"éšŠã‚„å»ºé€ ç‰©ã®ã‚¢ã‚¤ã‚³ãƒ³ã‚’表示ã—ãªããªã‚Šã¾ã™ã€‚"
# clefs
-#: client/gui-gtk-2.0/gui_main.c:183
+#: client/gui-gtk-2.0/gui_main.c:185
msgid "Enable status report tabs"
msgstr "çŠ¶æ…‹å ±å‘Šã‚¿ãƒ–ã‚’ä½¿ç”¨ã™ã‚‹"
# clefs
# 便利
-#: client/gui-gtk-2.0/gui_main.c:184
+#: client/gui-gtk-2.0/gui_main.c:186
msgid ""
"If this option is enabled then report dialogs will be shown as separate tabs "
"rather than in popup dialogs."
@@ -12062,12 +12205,12 @@ msgstr ""
"ã，独立ã—ãŸã‚¿ãƒ–ã¨ã—ã¦è¡¨ç¤ºã•ã‚Œã‚‹ã‚ˆã†ã«ãªã‚Šã¾ã™ã€‚"
# clefs
-#: client/gui-gtk-2.0/gui_main.c:189 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:191 client/gui-win32/gui_main.c:110
msgid "Better fog-of-war drawing"
msgstr "改善ã•ã‚ŒãŸfog of war表示"
# clefs
-#: client/gui-gtk-2.0/gui_main.c:190 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:192 client/gui-win32/gui_main.c:111
msgid ""
"If this is enabled then a better method is used for drawing fog-of-war. It "
"is not any slower but will consume about twice as much memory."
@@ -12075,41 +12218,41 @@ msgstr ""
"オンã«ã™ã‚‹ã¨ï¼Œã‚ˆã‚Šçµæžœã®è‰¯ã„fog of war表示方法を使用ã—ã¾ã™ã€‚ã“ã‚Œã¯è¡¨ç¤ºã‚’é…ã"
"ã™ã‚‹ã“ã¨ã¯ã‚ã‚Šã¾ã›ã‚“ãŒï¼Œãƒ¡ãƒ¢ãƒªã‚’ãŠã‚ˆã2å€æ¶ˆè²»ã—ã¾ã™ã€‚"
-#: client/gui-gtk-2.0/gui_main.c:195
+#: client/gui-gtk-2.0/gui_main.c:197
msgid "Show time for each chat message"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:196
+#: client/gui-gtk-2.0/gui_main.c:198
msgid ""
"If this option is enabled then all chat messages will be prefixed by a time "
"string of the form [hour:minute:second]."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:201
+#: client/gui-gtk-2.0/gui_main.c:203
msgid "Split bottom notebook area"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:202
+#: client/gui-gtk-2.0/gui_main.c:204
msgid ""
"Enabling this option will split the bottom notebook into a left and right "
"notebook so that two tabs may be viewed at once."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:207
+#: client/gui-gtk-2.0/gui_main.c:209
msgid "New message events go to top of list"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:208
+#: client/gui-gtk-2.0/gui_main.c:210
msgid ""
"If this option is enabled, new events in the message window will appear at "
"the top of the list, rather than being appended at the bottom."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:213
+#: client/gui-gtk-2.0/gui_main.c:215
msgid "Show extra message window buttons"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:214
+#: client/gui-gtk-2.0/gui_main.c:216
msgid ""
"If this option is enabled, there will be two buttons displayed in the "
"message window for inspecting a city and going to a location. If this option "
@@ -12119,22 +12262,22 @@ msgid ""
"closed and reopened."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:224
+#: client/gui-gtk-2.0/gui_main.c:226
#, fuzzy
msgid "Metaserver tab first in network page"
msgstr "メタサーãƒã®æƒ…å ±æ–‡å—列を '%s' ã¸è¨å®šã—ã¾ã™ã€‚"
-#: client/gui-gtk-2.0/gui_main.c:225
+#: client/gui-gtk-2.0/gui_main.c:227
msgid ""
"If this option is enabled, the metaserver tab will be the first notebook tab "
"in the network page. This option requires a restart in order to take effect."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:230
+#: client/gui-gtk-2.0/gui_main.c:232
msgid "Plain chat messages are sent to allies only"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:231
+#: client/gui-gtk-2.0/gui_main.c:233
msgid ""
"If this option is enabled, then plain messages typed into the chat entry "
"while the game is running will only be sent to your allies. Otherwise plain "
@@ -12144,7 +12287,20 @@ msgid ""
"visible in multiplayer games)."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:340 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:245
+msgid "Arrange widgets for small displays"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:246
+msgid ""
+"If this option is enabled, widgets in the main window will be arrange so "
+"that they take up the least amount of total screen space. Specifically, the "
+"left panel containing the overview, player status, and the unit information "
+"box will be extended over the entire left side of the window. This option "
+"requires a restart in order to take effect."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:352 client/gui-xaw/gui_main.c:245
msgid ""
"This client has no special command line options\n"
"\n"
@@ -12154,22 +12310,22 @@ msgstr ""
# Should I try to translate "Freeciv"?
# No, just leave it "Freeciv" wherever you find it.
# (Also, note that the "c" in "Freeciv" is not capitalized.)
-#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
+#: client/gui-gtk-2.0/gui_main.c:847 client/gui-gtk-2.0/gui_main.c:1542
msgid "Freeciv"
msgstr "Freeciv"
-#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
+#: client/gui-gtk-2.0/gui_main.c:1251 client/gui-gtk-2.0/gui_main.c:1258
#: client/gui-sdl/mapctrl.c:1566 client/gui-win32/gui_main.c:482
#: data/Freeciv.in:2618
msgid "Turn Done"
msgstr "ターン終了"
-#: client/gui-gtk-2.0/gui_main.c:1232 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1258 client/gui-sdl/mapctrl.c:1566
#: client/gui-sdl/mapview.c:1082
msgid "Shift+Return"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1266 client/gui-gtk-2.0/menu.c:797
+#: client/gui-gtk-2.0/gui_main.c:1299 client/gui-gtk-2.0/menu.c:797
#: client/gui-gtk-2.0/menu.c:799 client/gui-gtk-2.0/menu.c:801
#: client/gui-gtk-2.0/menu.c:803 client/gui-gtk-2.0/menu.c:805
#: client/gui-gtk-2.0/menu.c:807 client/gui-gtk-2.0/menu.c:809
@@ -12188,14 +12344,14 @@ msgstr ""
msgid "View"
msgstr "ビュー(V)"
-#: client/gui-gtk-2.0/gui_main.c:1359
+#: client/gui-gtk-2.0/gui_main.c:1393
msgid "Chat"
msgstr "ãƒãƒ£ãƒƒãƒˆ"
# ama, clefs
# was "ã•ãã€åœ°ç„ã¸è½ã¡ã‚!"
# ã‹ã£ã“ã„ã„訳語募集ä¸
-#: client/gui-gtk-2.0/gui_main.c:1377 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1411 client/gui-win32/gui_main.c:538
#: data/Freeciv.in:2809
msgid ""
"Freeciv is free software and you are welcome to distribute copies of it\n"
@@ -12206,87 +12362,87 @@ msgstr ""
"ã‚’é…布ã™ã‚‹ã“ã¨ã‚’æ“è¿Žã—ã¾ã™ã€‚ヘルプメニューã®\"著作権\"ã®é …目を見ã¦ä¸‹ã•ã„。\n"
"……ã•ã，やã¤ã‚‰ã‚’地ç„ã¸é€ã£ã¦ã‚„ã‚ã†ãœ!"
-#: client/gui-gtk-2.0/gui_main.c:1392
+#: client/gui-gtk-2.0/gui_main.c:1426
msgid "Allies Only"
msgstr ""
# clefs
# XXX ãƒãƒƒãƒˆå¯¾æˆ¦ã§ã€Œã¾ã ã よã€ã¨å¾…ã£ã¦ã‚‚らã†ãƒœã‚¿ãƒ³
-#: client/gui-gtk-2.0/gui_main.c:1657
+#: client/gui-gtk-2.0/gui_main.c:1691
msgid "Not _ready"
msgstr "準備ä¸(_R)"
-#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
+#: client/gui-gtk-2.0/gui_main.c:1702 client/gui-gtk-2.0/pages.c:1679
msgid "_Ready"
msgstr "準備完了(_R)"
-#: client/gui-gtk-2.0/gui_main.c:1672 client/gui-gtk-2.0/gui_main.c:1678
-#: client/gui-gtk-2.0/pages.c:2204
+#: client/gui-gtk-2.0/gui_main.c:1706 client/gui-gtk-2.0/gui_main.c:1712
+#: client/gui-gtk-2.0/pages.c:2206
msgid "_Start"
msgstr "開始(_S)"
-#: client/gui-gtk-2.0/gui_main.c:1686
+#: client/gui-gtk-2.0/gui_main.c:1720
#, fuzzy
msgid "_Take Player"
msgstr "プレイヤー(_P)"
-#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
+#: client/gui-gtk-2.0/gui_main.c:1723 client/gui-gtk-2.0/pages.c:1669
msgid "Pick _Nation"
msgstr "æ°‘æ—ã‚’é¸æŠžã™ã‚‹(_N)"
# Daniel
-#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
+#: client/gui-gtk-2.0/gui_main.c:1730 client/gui-gtk-2.0/pages.c:1674
msgid "_Observe"
msgstr "観察ã™ã‚‹(_O)"
-#: client/gui-gtk-2.0/gui_main.c:1698
+#: client/gui-gtk-2.0/gui_main.c:1732
#, fuzzy
msgid "Do not _observe"
msgstr "観察をå–ã‚Šæ¢ã‚ã‚‹(_O)"
# 訳ã•ãªã„æ–¹ãŒã‚ã‹ã‚Šã‚„ã™ã„å ´åˆã‚‚ã‚ã‚‹ã‚‚ã®ã§ã™ (clefs)
-#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1755 client/gui-xaw/pages.c:211
msgid "<AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1723
+#: client/gui-gtk-2.0/gui_main.c:1758
msgid "<Novice AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1726
+#: client/gui-gtk-2.0/gui_main.c:1761
msgid "<Easy AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1729
+#: client/gui-gtk-2.0/gui_main.c:1764
msgid "<Normal AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1732
+#: client/gui-gtk-2.0/gui_main.c:1767
msgid "<Hard AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1742 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1777 client/gui-win32/dialogs.c:594
#: client/gui-xaw/pages.c:217
msgid "Random"
msgstr "ランダム"
# Daniel
-#: client/gui-gtk-2.0/gui_main.c:1808
+#: client/gui-gtk-2.0/gui_main.c:1844 client/gui-gtk-2.0/gui_main.c:1858
msgid "Observer"
msgstr "観察者"
# clefs XXX
-#: client/gui-gtk-2.0/gui_main.c:1808
+#: client/gui-gtk-2.0/gui_main.c:1858
msgid "Detached"
msgstr "未割当"
# Daniel
-#: client/gui-gtk-2.0/gui_main.c:2073
+#: client/gui-gtk-2.0/gui_main.c:2117
msgid "Are you sure you want to quit?"
msgstr "ゲームを終了ã—ã¦ã‚ˆã‚ã—ã„ã§ã™ã‹ï¼Ÿ"
# clefs
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
#, c-format
msgid ""
"Close Tab:\n"
@@ -12295,7 +12451,7 @@ msgstr ""
"タブを閉ã˜ã‚‹:\n"
"%s"
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
msgid "Ctrl+W"
msgstr ""
@@ -12402,8 +12558,8 @@ msgid "Trans. Rslt/Time:"
msgstr "変更 çµæžœ/時間:"
#: 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
-#: client/gui-win32/helpdlg.c:709 client/gui-win32/helpdlg.c:733
+#: client/gui-win32/helpdlg.c:502 client/gui-win32/helpdlg.c:550
+#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:739
#: client/gui-xaw/helpdlg.c:759 client/gui-xaw/helpdlg.c:808
#: client/gui-xaw/helpdlg.c:816 client/gui-xaw/helpdlg.c:853
#: client/gui-xaw/helpdlg.c:878
@@ -12452,34 +12608,34 @@ msgstr "å…±åŒ"
msgid "?techhelp:"
msgstr "?techhelp:"
-#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:591
+#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:597
#: client/gui-xaw/helpdlg.c:996
#, c-format
msgid "+%d Trade / %d"
msgstr "+%d 交易 / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:595
+#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:601
#: client/gui-xaw/helpdlg.c:1000
#, c-format
msgid "no extra / %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
-#: client/gui-win32/helpdlg.c:602 client/gui-win32/helpdlg.c:616
-#: client/gui-win32/helpdlg.c:635 client/gui-xaw/helpdlg.c:1002
+#: client/gui-gtk-2.0/helpdlg.c:1085 client/gui-win32/helpdlg.c:604
+#: client/gui-win32/helpdlg.c:608 client/gui-win32/helpdlg.c:622
+#: client/gui-win32/helpdlg.c:641 client/gui-xaw/helpdlg.c:1002
#: client/gui-xaw/helpdlg.c:1006 client/gui-xaw/helpdlg.c:1020
#: client/gui-xaw/helpdlg.c:1039
msgid "n/a"
msgstr "é©ç”¨ä¸å¯"
-#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:605
+#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:611
#: client/gui-xaw/helpdlg.c:1009
#, c-format
msgid "+%d Food / %d"
msgstr "+%d 食料 / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:619
+#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:625
#: client/gui-xaw/helpdlg.c:1023
#, c-format
msgid "+%d Res. / %d"
@@ -13274,41 +13430,41 @@ msgid "Connect to Gaming _Zone"
msgstr "Gaming _Zoneã¸æŽ¥ç¶š"
# clefs
-#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:302
#: client/gui-xaw/connectdlg.c:326
msgid "Passwords don't match, enter password."
msgstr "パスワードãŒä¸€è‡´ã—ã¾ã›ã‚“。パスワードを入力ã—ã¦ãã ã•ã„。"
#: client/gui-gtk-2.0/pages.c:779 client/gui-gtk-2.0/pages.c:820
-#: client/gui-win32/connectdlg.c:916
+#: client/gui-win32/connectdlg.c:918
msgid "Server Name"
msgstr "サーãƒå"
#: client/gui-gtk-2.0/pages.c:780 client/gui-gtk-2.0/pages.c:821
-#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:916
+#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:918
#: data/Freeciv.in:96
msgid "Port"
msgstr "ãƒãƒ¼ãƒˆ"
#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Version"
msgstr "ãƒãƒ¼ã‚¸ãƒ§ãƒ³"
#: client/gui-gtk-2.0/pages.c:782 client/gui-gtk-2.0/pages.c:823
-#: client/gui-gtk-2.0/pages.c:2161 client/gui-win32/connectdlg.c:917
-#: client/gui-win32/connectdlg.c:995
+#: client/gui-gtk-2.0/pages.c:2163 client/gui-win32/connectdlg.c:919
+#: client/gui-win32/connectdlg.c:997
msgid "Status"
msgstr "状態"
#: client/gui-gtk-2.0/pages.c:783 client/gui-gtk-2.0/pages.c:824
#: client/gui-sdl/connectdlg.c:318 client/gui-sdl/plrdlg.c:330
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Players"
msgstr "プレイヤー"
#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
-#: client/gui-win32/connectdlg.c:918
+#: client/gui-win32/connectdlg.c:920
msgid "Comment"
msgstr "コメント"
@@ -13344,9 +13500,9 @@ msgstr "パスワード(_W):"
msgid "Conf_irm Password:"
msgstr "パスワードã®ç¢ºèª(_I):"
-#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2165
#: 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:1000
+#: client/gui-win32/citydlg.c:1083 client/gui-win32/connectdlg.c:1002
#: client/gui-win32/wldlg.c:800 client/gui-win32/wldlg.c:806
msgid "Type"
msgstr "タイプ"
@@ -13456,7 +13612,7 @@ msgid "Ruleset _Version:"
msgstr "ルールセット(_V):"
# clefs
-#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2195
msgid "_More Game Options..."
msgstr "詳細ãªã‚²ãƒ¼ãƒ è¨å®š..."
@@ -13475,54 +13631,54 @@ msgid "Ready"
msgstr "準備完了"
# clefs
-#: client/gui-gtk-2.0/pages.c:1601
+#: client/gui-gtk-2.0/pages.c:1600
#, fuzzy
msgid "?player:Leader"
msgstr "指導者"
-#: client/gui-gtk-2.0/pages.c:1732 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1734 client/gui-sdl/chatline.c:185
msgid "Choose Saved Game to Load"
msgstr "ãƒãƒ¼ãƒ‰ã™ã‚‹ã‚»ãƒ¼ãƒ–ファイルをé¸æŠž"
# Daniel
-#: client/gui-gtk-2.0/pages.c:1824
+#: client/gui-gtk-2.0/pages.c:1826
msgid "Choose Saved Game to _Load:"
msgstr "ãƒãƒ¼ãƒ‰ã™ã‚‹ã‚»ãƒ¼ãƒ–ファイルをé¸æŠž(_L):"
# Daniel
-#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
-#: client/gui-gtk-2.0/pages.c:2451
+#: client/gui-gtk-2.0/pages.c:1846 client/gui-gtk-2.0/pages.c:2039
+#: client/gui-gtk-2.0/pages.c:2455
msgid "_Browse..."
msgstr "ブラウズ(_B)..."
# Daniel
-#: client/gui-gtk-2.0/pages.c:1911
+#: client/gui-gtk-2.0/pages.c:1913
msgid "Choose a Scenario"
msgstr "ãƒãƒ¼ãƒ‰ã™ã‚‹ã‚·ãƒŠãƒªã‚ªã‚’é¸æŠž"
# Daniel
-#: client/gui-gtk-2.0/pages.c:1998
+#: client/gui-gtk-2.0/pages.c:2000
msgid "Choose a _Scenario:"
msgstr "シナリオをé¸æŠž(_S):"
# Daniel
-#: client/gui-gtk-2.0/pages.c:2173
+#: client/gui-gtk-2.0/pages.c:2175
msgid "Choose a _nation to play:"
msgstr "ãªã‚ŠãŸã„æ°‘æ—ã‚’é¸æŠžã—ã¦ãã ã•ã„(_N)："
-#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2367 client/gui-win32/menu.c:581
msgid "Select Location to Save"
msgstr "ä¿å˜å…ˆã‚’é¸æŠžã—ã¦ãã ã•ã„"
-#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2452 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "ゲームä¿å˜"
-#: client/gui-gtk-2.0/pages.c:2489
+#: client/gui-gtk-2.0/pages.c:2493
msgid "Saved _Games:"
msgstr "ä¿å˜ã•ã‚ŒãŸã‚²ãƒ¼ãƒ (_G):"
-#: client/gui-gtk-2.0/pages.c:2516
+#: client/gui-gtk-2.0/pages.c:2520
msgid "Save _Filename:"
msgstr "ä¿å˜ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«å:"
@@ -13893,7 +14049,7 @@ msgid "Total users logged in : %d"
msgstr "ãƒã‚°ã‚¤ãƒ³ã—ã¦ã„るユーザ数: %d"
# clefs
-#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1098
msgid "Back"
msgstr "戻る"
@@ -13903,7 +14059,7 @@ msgid "Start"
msgstr "開始"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:777
+#: client/gui-win32/connectdlg.c:779
msgid "Load Game"
msgstr "ゲームをãƒãƒ¼ãƒ‰ã™ã‚‹"
@@ -13943,9 +14099,9 @@ msgstr "ä½äººã«ã™ã‚‹"
#: client/gui-sdl/connectdlg.c:308 client/gui-sdl/connectdlg.c:617
#: client/gui-sdl/connectdlg.c:803 client/gui-sdl/connectdlg.c:985
#: client/gui-sdl/dialogs.c:452 client/gui-sdl/dialogs.c:2095
-#: client/gui-sdl/dialogs.c:2893 client/gui-sdl/diplomat_dialog.c:731
+#: client/gui-sdl/dialogs.c:2902 client/gui-sdl/diplomat_dialog.c:731
#: client/gui-sdl/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1043
#: client/gui-win32/dialogs.c:1772 client/gui-win32/finddlg.c:127
#: client/gui-win32/gotodlg.c:171 client/gui-win32/inputdlg.c:146
#: client/gui-win32/messagedlg.c:216 client/gui-win32/ratesdlg.c:328
@@ -13989,7 +14145,7 @@ msgid "Buy it?"
msgstr "買�"
#: 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
+#: client/gui-sdl/diplodlg.c:1336 client/gui-sdl/diplomat_dialog.c:1211
#: client/gui-sdl/diplomat_dialog.c:1417 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:221 client/gui-sdl/repodlgs.c:1559
#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
@@ -14005,7 +14161,7 @@ msgid "No"
msgstr "ã„ã„ãˆ"
#: client/gui-sdl/citydlg.c:1215 client/gui-sdl/cma_fe.c:318
-#: client/gui-sdl/diplodlg.c:1345 client/gui-sdl/diplomat_dialog.c:1200
+#: client/gui-sdl/diplodlg.c:1346 client/gui-sdl/diplomat_dialog.c:1200
#: client/gui-sdl/diplomat_dialog.c:1407 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:232 client/gui-win32/repodlgs.c:578
#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
@@ -14316,7 +14472,7 @@ msgstr "Freeciv サーム:"
msgid "Port :"
msgstr "ãƒãƒ¼ãƒˆ:"
-#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1100
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr "接続"
@@ -14426,23 +14582,23 @@ msgstr "æ–°ã—ã„政治体制ã®é¸æŠž"
msgid "REVOLUTION!"
msgstr "é©å‘½!"
-#: client/gui-sdl/dialogs.c:2232 client/gui-sdl/dialogs.c:2620
+#: client/gui-sdl/dialogs.c:2237 client/gui-sdl/dialogs.c:2625
#: client/gui-win32/dialogs.c:567 data/Freeciv.in:3159
msgid "Female"
msgstr "女"
-#: client/gui-sdl/dialogs.c:2234 client/gui-sdl/dialogs.c:2618
-#: client/gui-sdl/dialogs.c:2830 client/gui-win32/dialogs.c:565
+#: client/gui-sdl/dialogs.c:2239 client/gui-sdl/dialogs.c:2623
+#: client/gui-sdl/dialogs.c:2839 client/gui-win32/dialogs.c:565
msgid "Male"
msgstr "ç”·"
-#: client/gui-sdl/dialogs.c:2478 client/gui-sdl/dialogs.c:2902
+#: client/gui-sdl/dialogs.c:2483 client/gui-sdl/dialogs.c:2911
#: 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 "了解"
-#: client/gui-sdl/dialogs.c:2685 client/gui-win32/dialogs.c:505
+#: client/gui-sdl/dialogs.c:2694 client/gui-win32/dialogs.c:505
msgid "What nation will you be?"
msgstr "ã‚ãªãŸãŒãªã‚ŠãŸã„æ°‘æ—ã¯?"
@@ -14470,77 +14626,77 @@ msgid "Sea map"
msgstr "海洋地図"
# Daniel
-#: client/gui-sdl/diplodlg.c:563
+#: client/gui-sdl/diplodlg.c:564
msgid "Give embassy"
msgstr "大使館を与ãˆã‚‹"
-#: client/gui-sdl/diplodlg.c:579 client/gui-win32/diplodlg.c:614
+#: client/gui-sdl/diplodlg.c:580 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 "金(最大 %d)"
-#: client/gui-sdl/diplodlg.c:613 client/gui-sdl/helpdlg.c:1956
+#: client/gui-sdl/diplodlg.c:614 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 "科å¦"
-#: client/gui-sdl/diplodlg.c:831 client/gui-win32/diplodlg.c:598
+#: client/gui-sdl/diplodlg.c:832 client/gui-win32/diplodlg.c:598
#: data/Freeciv.in:269
msgid "Diplomacy meeting"
msgstr "外交会åˆ"
-#: client/gui-sdl/diplodlg.c:883 client/gui-win32/diplodlg.c:680
+#: client/gui-sdl/diplodlg.c:884 client/gui-win32/diplodlg.c:680
#: data/Freeciv.in:510
msgid "Cancel meeting"
msgstr "会åˆä¸æ¢"
-#: client/gui-sdl/diplodlg.c:895 client/gui-win32/diplodlg.c:679
+#: client/gui-sdl/diplodlg.c:896 client/gui-win32/diplodlg.c:679
#: data/Freeciv.in:501
msgid "Accept treaty"
msgstr "æ¡ç´„調å°"
#. TRANS: "Polish incident !" FIXME!!!
-#: client/gui-sdl/diplodlg.c:1304
+#: client/gui-sdl/diplodlg.c:1305
#, c-format
msgid "%s incident !"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1322
+#: client/gui-sdl/diplodlg.c:1323
msgid "Shall we declare WAR on them?"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1433
+#: client/gui-sdl/diplodlg.c:1434
msgid "Foreign Minister"
msgstr "外務大臣"
-#: client/gui-sdl/diplodlg.c:1449
+#: client/gui-sdl/diplodlg.c:1450
#, c-format
msgid ""
"Sir!, the %s ambassador has arrived\n"
"What are your wishes?"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1465
+#: client/gui-sdl/diplodlg.c:1466
msgid "Declare WAR"
msgstr "宣戦布告"
-#: client/gui-sdl/diplodlg.c:1467 client/gui-win32/plrdlg.c:357
+#: client/gui-sdl/diplodlg.c:1468 client/gui-win32/plrdlg.c:357
msgid "Cancel Treaty"
msgstr "æ¡ç´„å–り消ã—"
-#: client/gui-sdl/diplodlg.c:1490 client/gui-win32/plrdlg.c:358
+#: client/gui-sdl/diplodlg.c:1491 client/gui-win32/plrdlg.c:358
#: data/Freeciv.in:3254
msgid "Withdraw vision"
msgstr "視野撤回"
-#: client/gui-sdl/diplodlg.c:1507
+#: client/gui-sdl/diplodlg.c:1508
msgid "Call Diplomatic Meeting"
msgstr "会åˆã‚’é–‹ã"
-#: client/gui-sdl/diplodlg.c:1521
+#: client/gui-sdl/diplodlg.c:1522
msgid "Send him back"
msgstr ""
@@ -15284,12 +15440,12 @@ msgid "Leave Game"
msgstr "ゲームä¿å˜"
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1100 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1102 client/gui-xaw/menu.c:121
#: data/Freeciv.in:115 data/Freeciv.in:3180
msgid "Quit"
msgstr "終了"
-#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:967
msgid "Start New Game"
msgstr "æ–°ã—ã„ゲームを開始ã™ã‚‹"
@@ -15403,8 +15559,8 @@ msgstr "実åŽå…¥: "
msgid "%s max rate : %d%%"
msgstr "%s 最大: %d%%"
-#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
-#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1085
+#: client/gui-win32/connectdlg.c:1093 data/Freeciv.in:155
msgid "Update"
msgstr "æ›´æ–°"
@@ -15899,72 +16055,72 @@ msgstr "æ–°è¦"
msgid "Delete"
msgstr "削除"
-#: client/gui-win32/connectdlg.c:147
+#: client/gui-win32/connectdlg.c:149
msgid "Password:"
msgstr "パスワード:"
-#: client/gui-win32/connectdlg.c:169
+#: client/gui-win32/connectdlg.c:171
msgid "Couldn't load the savegame"
msgstr "セーブファイルをãƒãƒ¼ãƒ‰ã§ãã¾ã›ã‚“"
# clefs
-#: client/gui-win32/connectdlg.c:284 client/gui-xaw/connectdlg.c:311
+#: client/gui-win32/connectdlg.c:286 client/gui-xaw/connectdlg.c:311
msgid "Verify Password"
msgstr "パスワード確èª"
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:916 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr "Freeciv サーãƒé¸æŠž"
# ntaka
-#: client/gui-win32/connectdlg.c:915
+#: client/gui-win32/connectdlg.c:917
msgid "Local Area Network"
msgstr "LAN"
-#: client/gui-win32/connectdlg.c:949
+#: client/gui-win32/connectdlg.c:951
msgid "Welcome to Freeciv"
msgstr "Freecivã®ä¸–ç•Œã¸ã‚ˆã†ã“ã!"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Load Saved Game"
msgstr "ä¿å˜ã•ã‚ŒãŸã‚²ãƒ¼ãƒ ã®ãƒãƒ¼ãƒ‰"
-#: client/gui-win32/connectdlg.c:969
+#: client/gui-win32/connectdlg.c:971
msgid "Connect To Network Game"
msgstr "ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚²ãƒ¼ãƒ ã¸æŽ¥ç¶š"
# Daniel
-#: client/gui-win32/connectdlg.c:979
+#: client/gui-win32/connectdlg.c:981
msgid "Choose a nation to play"
msgstr "ãªã‚ŠãŸã„æ°‘æ—ã‚’é¸æŠžã—ã¦ãã ã•ã„："
-#: client/gui-win32/connectdlg.c:1014
+#: client/gui-win32/connectdlg.c:1016
msgid "Number of players (Including AI):"
msgstr "プレイヤーã®æ•°(AIã‚‚å«ã‚€)"
-#: client/gui-win32/connectdlg.c:1022
+#: client/gui-win32/connectdlg.c:1024
msgid "AI skill level:"
msgstr "AIã®ãƒ¬ãƒ™ãƒ«"
# Daniel
-#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1038 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr "ゲームオプション"
-#: client/gui-win32/connectdlg.c:1040
+#: client/gui-win32/connectdlg.c:1042
msgid "Start Game"
msgstr "ゲーム開始"
# Daniel
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Login:"
msgstr "ãƒã‚°ã‚¤ãƒ³ï¼š"
-#: client/gui-win32/connectdlg.c:1061
+#: client/gui-win32/connectdlg.c:1063
msgid "Host:"
msgstr "ホスト:"
-#: client/gui-win32/connectdlg.c:1062
+#: client/gui-win32/connectdlg.c:1064
msgid "Port:"
msgstr "ãƒãƒ¼ãƒˆ:"
@@ -16044,21 +16200,21 @@ msgid ""
"this is much slower."
msgstr ""
-#: client/gui-win32/helpdlg.c:769 client/gui-win32/helpdlg.c:792
-#: client/gui-win32/helpdlg.c:803 client/gui-win32/helpdlg.c:809
-#: client/gui-win32/helpdlg.c:822
+#: client/gui-win32/helpdlg.c:775 client/gui-win32/helpdlg.c:798
+#: client/gui-win32/helpdlg.c:809 client/gui-win32/helpdlg.c:815
+#: client/gui-win32/helpdlg.c:828
msgid "Allows "
msgstr "å¯èƒ½ "
-#: client/gui-win32/helpdlg.c:780
+#: client/gui-win32/helpdlg.c:786
msgid "Obsoletes "
msgstr "å¤ã„"
-#: client/gui-win32/helpdlg.c:812 client/gui-win32/helpdlg.c:825
+#: client/gui-win32/helpdlg.c:818 client/gui-win32/helpdlg.c:831
msgid " (with "
msgstr " (å…±åŒ "
-#: client/gui-win32/helpdlg.c:815 client/gui-win32/helpdlg.c:828
+#: client/gui-win32/helpdlg.c:821 client/gui-win32/helpdlg.c:834
msgid "?techhelp:)."
msgstr ")"
@@ -17190,11 +17346,12 @@ msgstr " ç¾åœ¨ã®ç®¡ç†è€…: "
# Daniel
#: 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/"
+" https://gna.org/projects/freeciv/"
msgstr ""
"ãƒã‚°ã‚’見ã¤ã‘ãŸã‚‰ï¼Œãƒã‚°ãƒ¬ãƒãƒ¼ãƒˆã‚’é€ã£ã¦ä¸‹ã•ã„。最良ã®æ–¹æ³•ã¯ Freeciv ãƒã‚°è¿½è·¡ã‚·"
"ステムを使ã†ã“ã¨ã§ã™ã€‚\n"
@@ -19520,6 +19677,7 @@ msgid "Hydro Plant"
msgstr "水力発電所"
#: data/default/buildings.ruleset:378
+#, fuzzy
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 "
@@ -19527,47 +19685,44 @@ msgid ""
"a Factory, Mfg. Plant and Hydro Plant together give a 150% production "
"bonus.\n"
"\n"
-"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant. A city "
-"can only build a Hydro Plant if it is next to (or on) a Mountain or River "
-"tile."
+"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant."
msgstr ""
"都市ã®ç”Ÿç”£ã«ã‚ˆã£ã¦å¼•ãèµ·ã“ã•ã‚Œã‚‹å…¬å®³ã‚’ 50% 減らã—ã¾ã™ã€‚ã¾ãŸï¼Œãã®éƒ½å¸‚ã®å·¥å ´ã‚„"
-"è£½é€ å·¥å ´ã®ã‚·ãƒ¼ãƒ«ãƒ‰ç”Ÿç”£ç‰©ã‚’増やã—ã¾ã™ã€‚å³ã¡ï¼Œå·¥å ´ã¨æ°´åŠ›ç™ºé›»æ‰€ã ã¨åˆã‚ã›ã¦ 75% "
-"生産物ボーナス，ã¾ãŸè£½é€ å·¥å ´ã¨æ°´åŠ›ç™ºé›»æ‰€ã ã¨åˆã‚ã›ã¦ 150% 生産物ãƒãƒ¼ãƒŠã‚¹ã‚’å¾—"
-"ã¾ã™ã€‚\n"
+"è£½é€ å·¥å ´ã®ã‚·ãƒ¼ãƒ«ãƒ‰ç”Ÿç”£ç‰©ã‚’増やã—ã¾ã™ã€‚å³ã¡ï¼Œå·¥å ´ã¨åŽŸå力発電所をåˆã‚ã›ã¦ 75% "
+"生産物ボーナス，ã¾ãŸè£½é€ å·¥å ´ã¨åŽŸå力発電所ã ã¨åˆã‚ã›ã¦ 150% 生産物ãƒãƒ¼ãƒŠã‚¹ã‚’"
+"å¾—ã¾ã™ã€‚\n"
"\n"
-"都市ã«ã¯å¤ªé™½å…‰ç™ºé›»æ‰€ï¼Œæ°´åŠ›ç™ºé›»æ‰€ï¼Œç«åŠ›ç™ºé›»æ‰€ï¼ŒåŽŸå力発電所ã®ã„ãšã‚Œã‹ä¸€ã¤ã ã‘"
-"建ã¦ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚水力発電所ã¯ï¼Œéƒ½å¸‚ãŒå±±ã‚„å·ã®éš£ã‚Š(ã¾ãŸã¯ä¸Š)ã«ã‚る時ã ã‘"
-"建ã¦ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚"
+"都市ã«ã¯æ°´åŠ›ç™ºé›»æ‰€ï¼Œç«åŠ›ç™ºé›»æ‰€ï¼ŒåŽŸå力発電所ã®ã„ãšã‚Œã‹ä¸€ã¤ã ã‘建ã¦ã‚‹ã“ã¨ãŒã§"
+"ãã¾ã™ã€‚"
-#: data/default/buildings.ruleset:397 data/civ2/buildings.ruleset:373
+#: data/default/buildings.ruleset:396 data/civ2/buildings.ruleset:373
#: data/civ1/buildings.ruleset:297
msgid "Library"
msgstr "図書館"
# Daniel
-#: data/default/buildings.ruleset:412
+#: data/default/buildings.ruleset:411
#, no-c-format
msgid "Increases the science output in a city by 100%."
msgstr "都市ã®ç ”究æˆæžœã‚’ 100% 増やã—ã¾ã™ã€‚"
-#: data/default/buildings.ruleset:417 data/civ2/buildings.ruleset:393
+#: data/default/buildings.ruleset:416 data/civ2/buildings.ruleset:393
#: data/civ1/buildings.ruleset:317
msgid "Marketplace"
msgstr "å¸‚å ´"
-#: data/default/buildings.ruleset:432 data/civ2/buildings.ruleset:408
+#: data/default/buildings.ruleset:431 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 "都市ã®ç¨Žã¨è´…æ²¢å“ã®ç”Ÿç”£ã‚’ 50% 増やã—ã¾ã™ã€‚"
-#: data/default/buildings.ruleset:437 data/civ2/buildings.ruleset:413
+#: data/default/buildings.ruleset:436 data/civ2/buildings.ruleset:413
#: data/civ1/buildings.ruleset:337
msgid "Mass Transit"
msgstr "大é‡è¼¸é€"
-#: data/default/buildings.ruleset:451 data/civ2/buildings.ruleset:427
+#: data/default/buildings.ruleset:450 data/civ2/buildings.ruleset:427
#: data/civ1/buildings.ruleset:351
msgid ""
"Neutralizes the pollution generated by the population. The population "
@@ -19576,12 +19731,12 @@ msgstr ""
"人å£ã®å¢—åŠ ã«ã‚ˆã‚‹å…¬å®³ã‚’ä¸å’Œã—ã¾ã™ã€‚ã“ã®éƒ½å¸‚ã§ã®äººå£ã®å¢—åŠ ã¯ï¼Œå…¬å®³ã«å…¨ã影響を"
"与ãˆã¾ã›ã‚“。"
-#: data/default/buildings.ruleset:458 data/civ2/buildings.ruleset:434
+#: data/default/buildings.ruleset:457 data/civ2/buildings.ruleset:434
#: data/civ1/buildings.ruleset:358
msgid "Mfg. Plant"
msgstr "è£½é€ å·¥å ´"
-#: data/default/buildings.ruleset:474 data/civ2/buildings.ruleset:450
+#: data/default/buildings.ruleset:473 data/civ2/buildings.ruleset:450
#: data/civ1/buildings.ruleset:374
#, no-c-format
msgid ""
@@ -19589,12 +19744,12 @@ msgid ""
"production in a city by 100%."
msgstr "å·¥å ´ã¨é€£æºã—ã¦éƒ½å¸‚ã®ã‚·ãƒ¼ãƒ«ãƒ‰ç”Ÿç”£ç‰©è£½ä½œç‰©ã‚’ 100% 増やã—ã¾ã™ã€‚"
-#: data/default/buildings.ruleset:480 data/civ2/buildings.ruleset:456
+#: data/default/buildings.ruleset:479 data/civ2/buildings.ruleset:456
#: data/civ1/buildings.ruleset:380
msgid "Nuclear Plant"
msgstr "原å力発電所"
-#: data/default/buildings.ruleset:495
+#: data/default/buildings.ruleset:494
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 "
@@ -19612,11 +19767,11 @@ msgstr ""
"都市ã«ã¯æ°´åŠ›ç™ºé›»æ‰€ï¼Œç«åŠ›ç™ºé›»æ‰€ï¼ŒåŽŸå力発電所ã®ã„ãšã‚Œã‹ä¸€ã¤ã ã‘建ã¦ã‚‹ã“ã¨ãŒã§"
"ãã¾ã™ã€‚"
-#: data/default/buildings.ruleset:515 data/civ2/buildings.ruleset:489
+#: data/default/buildings.ruleset:514 data/civ2/buildings.ruleset:489
msgid "Offshore Platform"
msgstr "海上プラットフォーム"
-#: data/default/buildings.ruleset:530 data/civ2/buildings.ruleset:504
+#: data/default/buildings.ruleset:529 data/civ2/buildings.ruleset:504
msgid ""
"Adds 1 extra shield resource on all Ocean squares in a city. The city needs "
"to be coastal to build this improvement."
@@ -19624,13 +19779,13 @@ msgstr ""
"都市ã®æµ·åœ°å½¢ã§ã‚·ãƒ¼ãƒ«ãƒ‰è³‡æºã‚’1増やã—ã¾ã™ã€‚ã“れを建ã¦ã‚‹ã«ã¯ï¼Œæµ·å²¸ã«éƒ½å¸‚ãŒãªã‘ã‚Œ"
"ã°ãªã‚Šã¾ã›ã‚“。"
-#: data/default/buildings.ruleset:536 data/civ2/buildings.ruleset:510
+#: data/default/buildings.ruleset:535 data/civ2/buildings.ruleset:510
#: data/civ1/buildings.ruleset:411
msgid "Palace"
msgstr "宮殿"
# clefs
-#: data/default/buildings.ruleset:552
+#: data/default/buildings.ruleset:551
#, no-c-format
msgid ""
"Makes a city the capital and the center of your government. Corruption in "
@@ -19656,11 +19811,11 @@ msgstr ""
"\n"
"宮殿ã¯å°‚制政治下ã§ã¯+75%%，å›ä¸»æ”¿ä¸‹ã§ã¯50%%ã®ãƒœãƒ¼ãƒŠã‚¹ã‚’生産ã«ã‚‚ãŸã‚‰ã—ã¾ã™ã€‚"
-#: data/default/buildings.ruleset:569 data/civ2/buildings.ruleset:539
+#: data/default/buildings.ruleset:568 data/civ2/buildings.ruleset:539
msgid "Police Station"
msgstr "è¦å¯Ÿç½²"
-#: data/default/buildings.ruleset:583 data/civ2/buildings.ruleset:553
+#: data/default/buildings.ruleset:582 data/civ2/buildings.ruleset:553
msgid ""
"Reduces the unhappiness caused by military units outside the city by 2 under "
"Democracy and 1 under Republic. This improvement has no effect under other "
@@ -19670,11 +19825,11 @@ msgstr ""
"治体制下ã§ã¯åŠ¹åŠ›ãŒã‚ã‚Šã¾ã›ã‚“。"
# clefs
-#: data/default/buildings.ruleset:593 data/civ2/buildings.ruleset:560
+#: data/default/buildings.ruleset:592 data/civ2/buildings.ruleset:560
msgid "Port Facility"
msgstr "港湾施è¨"
-#: data/default/buildings.ruleset:608 data/civ2/buildings.ruleset:575
+#: data/default/buildings.ruleset:607 data/civ2/buildings.ruleset:575
msgid ""
"Allows a city to build veteran sea units. Also, damaged sea units which "
"stay in town for one full turn without moving are completely restored."
@@ -19682,12 +19837,12 @@ msgstr ""
"都市ã§ãƒ™ãƒ†ãƒ©ãƒ³æµ·ä¸Šéƒ¨éšŠã‚’作るã“ã¨ãŒã§ãã¾ã™ã€‚ã¾ãŸï¼Œå‚·ã¤ã„ãŸæµ·ä¸Šéƒ¨éšŠã‚’都市ã§ç§»"
"å‹•ã•ã›ãšã«ä¼‘ã¾ã›ã¦ãŠãã¨ï¼Œ1ターンã§å®Œæ²»ã—ã¾ã™ã€‚"
-#: data/default/buildings.ruleset:615 data/civ2/buildings.ruleset:582
+#: data/default/buildings.ruleset:614 data/civ2/buildings.ruleset:582
#: data/civ1/buildings.ruleset:440
msgid "Power Plant"
msgstr "ç«åŠ›ç™ºé›»æ‰€"
-#: data/default/buildings.ruleset:631
+#: data/default/buildings.ruleset:630
#, no-c-format
msgid ""
"Increases the shield production of a Factory or Mfg. Plant in a city: a "
@@ -19705,12 +19860,12 @@ msgstr ""
"都市ã«ã¯æ°´åŠ›ç™ºé›»æ‰€ï¼Œç«åŠ›ç™ºé›»æ‰€ï¼ŒåŽŸå力発電所ã®ã„ãšã‚Œã‹ä¸€ã¤ã ã‘建ã¦ã‚‹ã“ã¨ãŒã§"
"ãã¾ã™ã€‚"
-#: data/default/buildings.ruleset:646 data/civ2/buildings.ruleset:610
+#: data/default/buildings.ruleset:645 data/civ2/buildings.ruleset:610
#: data/civ1/buildings.ruleset:468
msgid "Recycling Center"
msgstr "リサイクル・センター"
-#: data/default/buildings.ruleset:661 data/civ2/buildings.ruleset:625
+#: data/default/buildings.ruleset:660 data/civ2/buildings.ruleset:625
#: data/civ1/buildings.ruleset:483
#, no-c-format
msgid ""
@@ -19720,11 +19875,11 @@ msgstr ""
"リサイクル・センターã¯ï¼Œéƒ½å¸‚ã§å·¥æ¥ç”Ÿç”£ã«ã‚ˆã‚Šå¼•ãèµ·ã“ã•ã‚Œã‚‹å…¬å®³ã‚’ 66% 減らã—ã¾"
"ã™ã€‚"
-#: data/default/buildings.ruleset:667 data/civ2/buildings.ruleset:631
+#: data/default/buildings.ruleset:666 data/civ2/buildings.ruleset:631
msgid "Research Lab"
msgstr "ç ”ç©¶æ‰€"
-#: data/default/buildings.ruleset:682
+#: data/default/buildings.ruleset:681
msgid ""
"Together with a Library, a Research Lab increases the science production of "
"a city by 200%. Together with a Library and a University, a Research Lab "
@@ -19733,23 +19888,23 @@ msgstr ""
"ç ”ç©¶æ‰€ã¯å›³æ›¸é¤¨ã¨é€£æºã—，都市ã®ç ”究æˆæžœã‚’ 200% 増やã—ã¾ã™ã€‚ã¾ãŸï¼Œç ”究所ã¯å›³æ›¸"
"館，大å¦ã¨é€£æºã—，都市ã®ç ”究æˆæžœã‚’ 450% 増やã—ã¾ã™ã€‚"
-#: data/default/buildings.ruleset:690 data/civ2/buildings.ruleset:654
+#: data/default/buildings.ruleset:689 data/civ2/buildings.ruleset:654
msgid "SAM Battery"
msgstr "対空ミサイル陣地"
-#: data/default/buildings.ruleset:704 data/civ2/buildings.ruleset:668
+#: data/default/buildings.ruleset:703 data/civ2/buildings.ruleset:668
msgid ""
"Doubles the defense of all units inside the city when attacked by non-"
"nuclear air units."
msgstr ""
"æ ¸å…µå™¨ä»¥å¤–ã®ç©ºä¸éƒ¨éšŠã«æ”»æ’ƒã•ã‚ŒãŸæ™‚，都市内ã®å…¨ã¦ã®éƒ¨éšŠã®é˜²å¾¡åŠ›ã‚’2å€ã«ã—ã¾ã™ã€‚"
-#: data/default/buildings.ruleset:710 data/civ2/buildings.ruleset:674
+#: data/default/buildings.ruleset:709 data/civ2/buildings.ruleset:674
#: data/civ1/buildings.ruleset:489
msgid "SDI Defense"
msgstr "SDI 防衛システム"
-#: data/default/buildings.ruleset:724 data/civ2/buildings.ruleset:688
+#: data/default/buildings.ruleset:723 data/civ2/buildings.ruleset:688
#: data/civ1/buildings.ruleset:503
msgid ""
"Protects a city from attacks from Nuclear units. Nuclear attacks simply "
@@ -19759,11 +19914,11 @@ msgstr ""
"æ ¸å…µå™¨ã«ã‚ˆã‚‹æ”»æ’ƒã‹ã‚‰éƒ½å¸‚を守りã¾ã™ã€‚ãã®éƒ½å¸‚ã§ã¯ï¼Œæ ¸å…µå™¨ã®æ”»æ’ƒã§å½±éŸ¿ã‚’å…¨ãå—"
"ã‘ã¾ã›ã‚“。ã¾ãŸï¼Œæ ¸å…µå™¨ä»¥å¤–ã®ãƒŸã‚µã‚¤ãƒ«ã«ã¯2å€ã®é˜²å¾¡åŠ›ã‚’発æ®ã—ã¾ã™ã€‚"
-#: data/default/buildings.ruleset:733 data/civ2/buildings.ruleset:697
+#: data/default/buildings.ruleset:732 data/civ2/buildings.ruleset:697
msgid "Sewer System"
msgstr "下水é“"
-#: data/default/buildings.ruleset:748 data/civ2/buildings.ruleset:712
+#: data/default/buildings.ruleset:747 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."
@@ -19771,13 +19926,13 @@ msgstr ""
"都市を12より大ããã§ãるよã†ã«ã—ã¾ã™ã€‚都市ãŒ8より大ãããªã‚‹ãŸã‚ã«ï¼Œã¾ãšæ°´é“ãŒ"
"å¿…è¦ã§ã™ã€‚"
-#: data/default/buildings.ruleset:754 data/civ2/buildings.ruleset:749
+#: data/default/buildings.ruleset:753 data/civ2/buildings.ruleset:749
#: data/civ1/buildings.ruleset:512
msgid "Space Component"
msgstr "宇宙コンãƒãƒ¼ãƒãƒ³ãƒˆ"
# yasu
-#: data/default/buildings.ruleset:769 data/civ2/buildings.ruleset:763
+#: data/default/buildings.ruleset:768 data/civ2/buildings.ruleset:763
#: data/civ1/buildings.ruleset:526
msgid ""
"Space Components can be differentiated into Propulsion and Fuel Components. "
@@ -19793,13 +19948,13 @@ msgstr ""
"宇宙船ã®éƒ¨å“を作るå‰ã«ã¯å¿…ãšèª°ã‹ãŒä¸æ€è°ã€Œã‚¢ãƒãƒè¨ˆç”»ã€ã‚’作ã£ã¦ãŠã‹ãªãã¦ã¯ã„"
"ã‘ã¾ã›ã‚“。"
-#: data/default/buildings.ruleset:779 data/civ2/buildings.ruleset:773
+#: data/default/buildings.ruleset:778 data/civ2/buildings.ruleset:773
#: data/civ1/buildings.ruleset:536
msgid "Space Module"
msgstr "宇宙モジュール"
# yasu
-#: data/default/buildings.ruleset:794 data/civ2/buildings.ruleset:787
+#: data/default/buildings.ruleset:793 data/civ2/buildings.ruleset:787
#: data/civ1/buildings.ruleset:550
msgid ""
"Space Modules are the most expensive parts of spaceships. There are three "
@@ -19832,13 +19987,13 @@ msgstr ""
"宇宙船ã®éƒ¨å“を作るå‰ã«ã¯å¿…ãšèª°ã‹ãŒä¸æ€è°ã€Œã‚¢ãƒãƒè¨ˆç”»ã€ã‚’作ã£ã¦ãŠã‹ãªãã¦ã¯ã„"
"ã‘ã¾ã›ã‚“。"
-#: data/default/buildings.ruleset:813 data/civ2/buildings.ruleset:806
+#: data/default/buildings.ruleset:812 data/civ2/buildings.ruleset:806
#: data/civ1/buildings.ruleset:569
msgid "Space Structural"
msgstr "å®‡å®™èˆ¹æ§‹é€ ç‰©"
# yasu
-#: data/default/buildings.ruleset:828 data/civ2/buildings.ruleset:820
+#: data/default/buildings.ruleset:827 data/civ2/buildings.ruleset:820
#: data/civ1/buildings.ruleset:583
msgid ""
"Space Structurals form the base of your spaceship. All other spaceship "
@@ -19856,11 +20011,11 @@ msgstr ""
# clefs
# was "æ ªå¼å–引所"
-#: data/default/buildings.ruleset:838 data/civ2/buildings.ruleset:830
+#: data/default/buildings.ruleset:837 data/civ2/buildings.ruleset:830
msgid "Stock Exchange"
msgstr "証券å–引所"
-#: data/default/buildings.ruleset:854 data/civ2/buildings.ruleset:846
+#: data/default/buildings.ruleset:853 data/civ2/buildings.ruleset:846
#, no-c-format
msgid ""
"Together with a Marketplace and a Bank, a Stock Exchange boosts tax and "
@@ -19869,21 +20024,21 @@ msgstr ""
"証券å–引所ã¯å¸‚å ´ï¼ŒéŠ€è¡Œã¨ä¸€ç·’ã«ãªã£ã¦ï¼Œéƒ½å¸‚ã®ç¨Žã¨è´…æ²¢å“ã®ç”Ÿç”£ã‚’ 150% 増やã—ã¾"
"ã™ã€‚"
-#: data/default/buildings.ruleset:860 data/civ2/buildings.ruleset:852
+#: data/default/buildings.ruleset:859 data/civ2/buildings.ruleset:852
msgid "Super Highways"
msgstr "高速幹線é“è·¯"
-#: data/default/buildings.ruleset:875 data/civ2/buildings.ruleset:867
+#: data/default/buildings.ruleset:874 data/civ2/buildings.ruleset:867
#, no-c-format
msgid ""
"Increases trade resources by 50% on all squares with roads or railroads."
msgstr "é“è·¯ã‹é‰„é“ã®ã‚る土地全ã¦ã®äº¤æ˜“資æºã‚’ 50% 増やã—ã¾ã™ã€‚"
-#: data/default/buildings.ruleset:883 data/civ2/buildings.ruleset:873
+#: data/default/buildings.ruleset:882 data/civ2/buildings.ruleset:873
msgid "Supermarket"
msgstr "スーパーマーケット"
-#: data/default/buildings.ruleset:898 data/civ2/buildings.ruleset:888
+#: data/default/buildings.ruleset:897 data/civ2/buildings.ruleset:888
#, no-c-format
msgid ""
"Increases the food resources by 50% on each farmland square which is being "
@@ -19893,12 +20048,12 @@ msgstr ""
"都市ã®ã¾ã‚ã‚Šã§ä½¿ã‚ã‚Œã¦ã„ã‚‹å„農地ã®é£Ÿæ–™ç”Ÿç”£ã‚’ 50% 増やã—ã¾ã™ã€‚農地ã¨ã¯ï¼ŒäºŒåº¦çŒ"
"漑を行ã£ãŸåœŸåœ°ã®ã“ã¨ã§ã™ã€‚"
-#: data/default/buildings.ruleset:905 data/civ2/buildings.ruleset:895
+#: data/default/buildings.ruleset:904 data/civ2/buildings.ruleset:895
#: data/civ1/buildings.ruleset:593
msgid "Temple"
msgstr "寺院"
-#: data/default/buildings.ruleset:919 data/civ2/buildings.ruleset:909
+#: data/default/buildings.ruleset:918 data/civ2/buildings.ruleset:909
#: data/civ1/buildings.ruleset:607
msgid ""
"Makes one unhappy citizen content. Both the Mysticism advance and the "
@@ -19908,28 +20063,28 @@ msgstr ""
"1ä¸å¹¸å¸‚民を満足ã«ã—ã¾ã™ã€‚神秘主義(科å¦)ã¨ç¥žè¨—所(ä¸æ€è°)ã®ä¸¡æ–¹ã¨ã‚‚，ã“ã®åŠ¹æžœã‚’"
"å€ã«ã—ã¾ã™ã€‚神秘主義ã¨ç¥žè¨—所ã®ä¸¡æ–¹ãŒã‚ã‚‹ã¨ï¼Œ4市民ãŒæº€è¶³ã—ã¾ã™ã€‚"
-#: data/default/buildings.ruleset:926 data/civ2/buildings.ruleset:916
+#: data/default/buildings.ruleset:925 data/civ2/buildings.ruleset:916
#: data/civ1/buildings.ruleset:614 data/default/techs.ruleset:742
#: data/civ2/techs.ruleset:727 data/civ1/techs.ruleset:723
msgid "University"
msgstr "大å¦"
# Daniel
-#: data/default/buildings.ruleset:942
+#: data/default/buildings.ruleset:941
#, no-c-format
msgid ""
"Together with a Library, a University increases the science production of a "
"city by 250%."
msgstr "大å¦ã¯å›³æ›¸é¤¨ã¨é€£æºã—，都市ã®ç ”究æˆæžœã‚’ 250% 増やã—ã¾ã™ã€‚"
-#: data/default/buildings.ruleset:948 data/civ2/buildings.ruleset:938
+#: data/default/buildings.ruleset:947 data/civ2/buildings.ruleset:938
#: data/civ1/buildings.ruleset:636
msgid "Apollo Program"
msgstr "ã‚¢ãƒãƒè¨ˆç”»"
# clefs
# was "ãŒç ”究ã•ã‚ŒãŸã¨è¦‹å€£ã—ã¾ã™ã€‚)"，ã“ã‚Œã¯èª¤è¨³ã§ã—ãŸ
-#: data/default/buildings.ruleset:962 data/civ2/buildings.ruleset:952
+#: data/default/buildings.ruleset:961 data/civ2/buildings.ruleset:952
msgid ""
"Entire map becomes visible for the player who owns it. It allows all "
"players to start building spaceship parts (assuming they have researched the "
@@ -19940,27 +20095,27 @@ msgstr ""
"ãŒç ”究ã•ã‚Œã¦ã„ã‚Œã°ã€‚)"
# clefs
-#: data/default/buildings.ruleset:969 data/civ2/buildings.ruleset:959
+#: data/default/buildings.ruleset:968 data/civ2/buildings.ruleset:959
msgid "A.Smith's Trading Co."
msgstr "アダム・スミスã®è²¿æ˜“会社"
# ama, clefs, Daniel
# was "å…¨ã¦ã®éƒ½å¸‚ã§ã€éƒ½å¸‚å»ºé€ ç‰©ã®ç¶æŒè²»1ã‚’ãªãã—ã¾ã™ã€‚"
-#: data/default/buildings.ruleset:983
+#: data/default/buildings.ruleset:982
msgid ""
"City improvements which would normally have an upkeep of 1 are free of "
"upkeep, for all your cities."
msgstr "å…¨ã¦ã®éƒ½å¸‚ã§ï¼ŒçµŒè²»ãŒ1ã‹ã‹ã‚‹éƒ½å¸‚å»ºé€ ç‰©ã®çµŒè²»ã‚’ãªãã—ã¾ã™ã€‚"
# 訳語ãŒã€Œã‚¢ãƒãƒè¨ˆç”»ã€ã¨ã‹ã¶ã£ã¦å°‘々紛らã‚ã—ã„ã®ã§ã™ãŒï¼Œä»–ã«è¨³ã—よã†ãŒã‚ã‚Šã¾ã›ã‚“
-#: data/default/buildings.ruleset:989 data/civ2/buildings.ruleset:979
+#: data/default/buildings.ruleset:988 data/civ2/buildings.ruleset:979
#: data/civ1/buildings.ruleset:655
msgid "Colossus"
msgstr "ã‚¢ãƒãƒå·¨åƒ"
# ama, clefs
# was "ã“ã®ä¸æ€è°ã®å»ºã¦ã‚‰ã‚ŒãŸéƒ½å¸‚ã®ã¾ã‚ã‚Šã®åœŸåœ°ã§ã¯ã€äº¤æ›è³‡æºã‚’1多ã生産ã§ãã¾ã™ã€‚"
-#: data/default/buildings.ruleset:1003 data/civ2/buildings.ruleset:993
+#: data/default/buildings.ruleset:1002 data/civ2/buildings.ruleset:993
#: data/civ1/buildings.ruleset:669
msgid ""
"Each square around the city where this wonder is built that is already "
@@ -19969,37 +20124,37 @@ msgstr ""
"ã“ã®ä¸æ€è°ã®å»ºã¦ã‚‰ã‚ŒãŸéƒ½å¸‚ã®ã¾ã‚ã‚Šã§ã¯ï¼Œã™ã§ã«å°‘ãªãã¨ã‚‚1å˜ä½ã®äº¤æ˜“ãŒã‚る土地"
"ã‹ã‚‰æ›´ã«1å˜ä½ã®äº¤æ˜“ã‚’å¾—ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚"
-#: data/default/buildings.ruleset:1009 data/civ2/buildings.ruleset:999
+#: data/default/buildings.ruleset:1008 data/civ2/buildings.ruleset:999
#: data/civ1/buildings.ruleset:675
msgid "Copernicus' Observatory"
msgstr "コペルニクスã®å¤©æ–‡å°"
-#: data/default/buildings.ruleset:1024 data/civ2/buildings.ruleset:1180
+#: data/default/buildings.ruleset:1023 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 "建ã¦ã‚‰ã‚ŒãŸéƒ½å¸‚ã®ç ”究æˆæžœã‚’ 100% 増やã—ã¾ã™ã€‚"
-#: data/default/buildings.ruleset:1029 data/civ2/buildings.ruleset:1019
+#: data/default/buildings.ruleset:1028 data/civ2/buildings.ruleset:1019
#: data/civ1/buildings.ruleset:695
msgid "Cure For Cancer"
msgstr "癌ã®æ²»ç™‚"
# Daniel
-#: data/default/buildings.ruleset:1043
+#: data/default/buildings.ruleset:1042
msgid ""
"This stunning technological achievement makes one unhappy citizen content in "
"all your cities."
msgstr ""
"ã“ã®ã™ã°ã‚‰ã—ã„科å¦ã®å‰æ¥ã¯ï¼Œå…¨ã¦ã®éƒ½å¸‚ã§å„々1人ã®ä¸å¹¸ãªå¸‚民を満足ã«ã—ã¾ã™ã€‚"
-#: data/default/buildings.ruleset:1051 data/civ2/buildings.ruleset:1039
+#: data/default/buildings.ruleset:1050 data/civ2/buildings.ruleset:1039
#: data/civ1/buildings.ruleset:715
msgid "Darwin's Voyage"
msgstr "ダーウィンã®èˆªæµ·"
# ama, clefs
-#: data/default/buildings.ruleset:1065 data/civ2/buildings.ruleset:1053
+#: data/default/buildings.ruleset:1064 data/civ2/buildings.ruleset:1053
#: data/civ1/buildings.ruleset:729
msgid ""
"Charles Darwin's voyage sparked the discovery of the evolution of the "
@@ -20009,13 +20164,13 @@ msgstr ""
"ãƒãƒ£ãƒ¼ãƒ«ã‚ºãƒ»ãƒ€ãƒ¼ã‚¦ã‚£ãƒ³ã®èˆªæµ·ã¯é€²åŒ–論発見ã®ãã£ã‹ã‘ã¨ãªã‚Šï¼Œã“ã‚Œã¯ç§‘å¦ã¸ã®ä¿¡é ¼"
"を大ãã高ã‚ã‚‹ã“ã¨ã«ãªã‚Šã¾ã—ãŸã€‚å³åº§ã«2ã¤ã®é€²ã‚“ã 技術を得ã¾ã™ã€‚"
-#: data/default/buildings.ruleset:1072 data/civ2/buildings.ruleset:1060
+#: data/default/buildings.ruleset:1071 data/civ2/buildings.ruleset:1060
msgid "Eiffel Tower"
msgstr "エッフェル塔"
# clefs
# ç¾çŠ¶ã§ã¯ã»ã¨ã‚“ã©æ„味ã®ãªã„ä¸æ€è°ãªã®ã§ã™
-#: data/default/buildings.ruleset:1087
+#: data/default/buildings.ruleset:1086
#, fuzzy, no-c-format
msgid ""
"Your reputation and goodwill among other nations is recovered twice as fast."
@@ -20023,12 +20178,12 @@ msgstr ""
"ã“ã®ä¸æ€è°ã‚’所æŒã—ã¦ã„ã‚‹ã¨ï¼Œ[訳註:AIã‹ã‚‰ã®]ã‚ãªãŸã®è©•åˆ¤ã¨å¥½æ„ãŒé«˜ã¾ã‚Šã¾ã™ã€‚ã¾"
"ãŸæ‚ªè©•ã¯ï¼Œãªã„å ´åˆã®2å€ã®é€Ÿã•ã§å›žå¾©ã—ã¾ã™ã€‚"
-#: data/default/buildings.ruleset:1093 data/civ2/buildings.ruleset:1081
+#: data/default/buildings.ruleset:1092 data/civ2/buildings.ruleset:1081
#: data/civ1/buildings.ruleset:736
msgid "Great Library"
msgstr "王立図書館"
-#: data/default/buildings.ruleset:1107 data/civ2/buildings.ruleset:1095
+#: data/default/buildings.ruleset:1106 data/civ2/buildings.ruleset:1095
#: data/civ1/buildings.ruleset:750
msgid ""
"The civilization which builds the Great Library gets every advance that at "
@@ -20037,21 +20192,21 @@ msgstr ""
"王立図書館を建ã¦ãŸæ–‡æ˜Žã¯ï¼Œä»–ã®2ã¤ä»¥ä¸Šã®æ–‡æ˜ŽãŒé”æˆã—ãŸç§‘å¦ã‚’å¾—ã‚‹ã“ã¨ãŒã§ãã¾"
"ã™ã€‚"
-#: data/default/buildings.ruleset:1113 data/civ2/buildings.ruleset:1101
+#: data/default/buildings.ruleset:1112 data/civ2/buildings.ruleset:1101
#: data/civ1/buildings.ruleset:756
msgid "Great Wall"
msgstr "万里ã®é•·åŸŽ"
-#: data/default/buildings.ruleset:1127
+#: data/default/buildings.ruleset:1126
msgid "Works as a City Wall in all your cities."
msgstr "å…¨ã¦ã®éƒ½å¸‚ã«åŸŽå£ãŒã‚ã‚‹ã‚‚ã®ã¨ã—ã¦æ©Ÿèƒ½ã—ã¾ã™ã€‚"
-#: data/default/buildings.ruleset:1135 data/civ2/buildings.ruleset:1122
+#: data/default/buildings.ruleset:1134 data/civ2/buildings.ruleset:1122
#: data/civ1/buildings.ruleset:777
msgid "Hanging Gardens"
msgstr "空ä¸åºåœ’"
-#: data/default/buildings.ruleset:1149 data/civ2/buildings.ruleset:1136
+#: data/default/buildings.ruleset:1148 data/civ2/buildings.ruleset:1136
#: data/civ1/buildings.ruleset:791
msgid ""
"Makes one content citizen happy in every city. Makes two extra content "
@@ -20064,12 +20219,12 @@ msgstr ""
"ã™(åˆè¨ˆ3)。ã‚ã‚Šãã†ã‚‚ãªã„ã“ã¨ã§ã™ãŒï¼Œç©ºä¸åºåœ’ã®å½±éŸ¿ã‚’å—ã‘る市民ãŒã„ãªã„å ´åˆï¼Œ"
"ä¸å¹¸å¸‚民を満足ã•ã›ã¾ã™ã€‚"
-#: data/default/buildings.ruleset:1158 data/civ2/buildings.ruleset:1145
+#: data/default/buildings.ruleset:1157 data/civ2/buildings.ruleset:1145
#: data/civ1/buildings.ruleset:800
msgid "Hoover Dam"
msgstr "フーãƒãƒ¼ãƒ€ãƒ "
-#: data/default/buildings.ruleset:1173 data/civ2/buildings.ruleset:1159
+#: data/default/buildings.ruleset:1172 data/civ2/buildings.ruleset:1159
msgid ""
"Works as if you had a Hydro Plant in every city. (This reduces pollution "
"and increases the effects of Factories and Mfg. Plants.)"
@@ -20077,54 +20232,54 @@ msgstr ""
"ã¾ã‚‹ã§æ°´åŠ›ç™ºé›»æ‰€ãŒå…¨éƒ½å¸‚ã«ã‚ã‚‹ã‹ã®ã‚ˆã†ã«ä½œç”¨ã—ã¾ã™ã€‚(公害を減らã—ï¼Œå·¥å ´ã¨è£½é€ "
"å·¥å ´ã®åŠ¹æžœã‚’増やã—ã¾ã™ã€‚)"
-#: data/default/buildings.ruleset:1179 data/civ2/buildings.ruleset:1165
+#: data/default/buildings.ruleset:1178 data/civ2/buildings.ruleset:1165
#: data/civ1/buildings.ruleset:822
msgid "Isaac Newton's College"
msgstr "ニュートンã®å¦å£«é™¢"
-#: data/default/buildings.ruleset:1194
+#: data/default/buildings.ruleset:1193
#, no-c-format
msgid ""
"Boosts science production by 100% in every city you control that has a "
"University."
msgstr "大å¦ã®ã‚ã‚‹å…¨ã¦ã®éƒ½å¸‚ã®ç ”究æˆæžœã‚’ 100% 増やã—ã¾ã™ã€‚"
-#: data/default/buildings.ruleset:1200 data/civ2/buildings.ruleset:1185
+#: data/default/buildings.ruleset:1199 data/civ2/buildings.ruleset:1185
#: data/civ1/buildings.ruleset:842
msgid "J.S. Bach's Cathedral"
msgstr "J.S.ãƒãƒƒãƒã®å¤§è–å ‚"
-#: data/default/buildings.ruleset:1214 data/civ2/buildings.ruleset:1199
+#: data/default/buildings.ruleset:1213 data/civ2/buildings.ruleset:1199
msgid "Makes two unhappy citizens content in every city."
msgstr "å„都市ã§ï¼Œä¸å¹¸å¸‚æ°‘2を満足ã•ã›ã¾ã™ã€‚"
# リãƒãƒ£ãƒ¼ãƒ‰1世ã®ç¬¬3回「åå—è»ã€ã®ã“ã¨ãªã‚“ã§ã™ã‘ã©ï¼Œ
# 「åå—è»ã€ã§ã¯ãªã‚“ã§é‰±å·¥æ¥ç”Ÿç”£ãŒå¢—ãˆã‚‹ã®ã‹ãƒ”ンã¨æ¥ãªã„ã®ã§ã“ã®ã¾ã¾
-#: data/default/buildings.ruleset:1219 data/civ2/buildings.ruleset:1204
+#: data/default/buildings.ruleset:1218 data/civ2/buildings.ruleset:1204
msgid "King Richard's Crusade"
msgstr "リãƒãƒ£ãƒ¼ãƒ‰çŽ‹ã®é å¾"
-#: data/default/buildings.ruleset:1233 data/civ2/buildings.ruleset:1218
+#: data/default/buildings.ruleset:1232 data/civ2/buildings.ruleset:1218
msgid ""
"Adds one extra shield resource on every square around the city where it is "
"built."
msgstr "ã“れを建ã¦ãŸéƒ½å¸‚ã®ã¾ã‚ã‚Šã®å…¨åœŸåœ°ã§ï¼Œè³‡æºç”Ÿç”£åŠ›ãŒ1増ãˆã¾ã™ã€‚"
-#: data/default/buildings.ruleset:1239 data/civ2/buildings.ruleset:1224
+#: data/default/buildings.ruleset:1238 data/civ2/buildings.ruleset:1224
msgid "Leonardo's Workshop"
msgstr "レオナルドã®å·¥æˆ¿"
-#: data/default/buildings.ruleset:1253 data/civ2/buildings.ruleset:1238
+#: data/default/buildings.ruleset:1252 data/civ2/buildings.ruleset:1238
msgid "Upgrades one obsolete unit per game turn."
msgstr "1ターンã«ã¤ã1部隊，旧å¼ã®éƒ¨éšŠãŒæ–°å¼ã«ãªã‚Šã¾ã™ã€‚"
-#: data/default/buildings.ruleset:1258 data/civ2/buildings.ruleset:1243
+#: data/default/buildings.ruleset:1257 data/civ2/buildings.ruleset:1243
#: data/civ1/buildings.ruleset:862
msgid "Lighthouse"
msgstr "大ç¯å°"
# Daniel
-#: data/default/buildings.ruleset:1273
+#: data/default/buildings.ruleset:1272
msgid ""
"Gives all your sea units 1 additional movement point and eliminates the risk "
"of losing Triremes on the high seas. Makes all your new sea units veterans "
@@ -20133,34 +20288,34 @@ msgstr ""
"å…¨ã¦ã®æµ·ä¸Š(ä¸)部隊ã®ç§»å‹•åŠ›ã‚’1増やã—，ã•ã‚‰ã«ãƒˆãƒ©ã‚¤ãƒªãƒ¼ãƒ を高波ã§å¤±ã†å±é™ºã‚’排除"
"ã—ã¾ã™ã€‚(å…¨ã¦ã®éƒ½å¸‚ã§)å…¨ã¦ã®æ–°ã—ã生産ã•ã‚Œã‚‹æµ·ä¸Š(ä¸)部隊をベテランã«ã—ã¾ã™ã€‚"
-#: data/default/buildings.ruleset:1280 data/civ2/buildings.ruleset:1264
+#: data/default/buildings.ruleset:1279 data/civ2/buildings.ruleset:1264
#: data/civ1/buildings.ruleset:885
msgid "Magellan's Expedition"
msgstr "マゼランã®æŽ¢æ¤œèˆªæµ·"
-#: data/default/buildings.ruleset:1295
+#: data/default/buildings.ruleset:1294
msgid "Gives all your sea units 2 additional movement points."
msgstr "å…¨ã¦ã®æµ·ä¸Šéƒ¨éšŠã®ç§»å‹•ãƒã‚¤ãƒ³ãƒˆã‚’ 2 増やã—ã¾ã™ã€‚"
-#: data/default/buildings.ruleset:1300 data/civ2/buildings.ruleset:1283
+#: data/default/buildings.ruleset:1299 data/civ2/buildings.ruleset:1283
#: data/civ1/buildings.ruleset:904
msgid "Manhattan Project"
msgstr "マンãƒãƒƒã‚¿ãƒ³è¨ˆç”»"
-#: data/default/buildings.ruleset:1318 data/civ2/buildings.ruleset:1301
+#: data/default/buildings.ruleset:1317 data/civ2/buildings.ruleset:1301
msgid "Marco Polo's Embassy"
msgstr "マルコ・ãƒãƒ¼ãƒã®å¤§ä½¿é¤¨"
-#: data/default/buildings.ruleset:1332 data/civ2/buildings.ruleset:1315
+#: data/default/buildings.ruleset:1331 data/civ2/buildings.ruleset:1315
msgid "The player who owns it gets an embassy with all players."
msgstr "ã“れをæŒã¤ãƒ—レイヤーã¯å…¨ãƒ—レイヤーã¨ã®å¤§ä½¿é¤¨ã‚’å¾—ã¾ã™ã€‚"
-#: data/default/buildings.ruleset:1337 data/civ2/buildings.ruleset:1320
+#: data/default/buildings.ruleset:1336 data/civ2/buildings.ruleset:1320
#: data/civ1/buildings.ruleset:922
msgid "Michelangelo's Chapel"
msgstr "ミケランジェãƒã®æ•™ä¼š"
-#: data/default/buildings.ruleset:1351 data/civ2/buildings.ruleset:1334
+#: data/default/buildings.ruleset:1350 data/civ2/buildings.ruleset:1334
msgid ""
"Counts as having a Cathedral in each of your cities. This makes 3 unhappy "
"citizens content in each city. The discovery of Theology increases the "
@@ -20172,22 +20327,22 @@ msgstr ""
"ã¾ã™ã€‚神å¦ã®ç™ºè¦‹ã«ã‚ˆã‚Šå¤§è–å ‚ã®åŠ¹æžœãŒå¢—ã—，ä¸å¹¸å¸‚æ°‘1ã‚’ã•ã‚‰ã«æº€è¶³ã•ã›ã¾ã™ã€‚共産"
"主義ã®ç™ºè¦‹ã«ã‚ˆã‚Šå¤§è–å ‚ã®åŠ¹æžœã¯è¡°ãˆï¼Œä¸å¹¸å¸‚æ°‘1ãŒè¿½ã„出ã•ã‚Œã¾ã™ã€‚"
-#: data/default/buildings.ruleset:1361 data/civ2/buildings.ruleset:1344
+#: data/default/buildings.ruleset:1360 data/civ2/buildings.ruleset:1344
#: data/civ1/buildings.ruleset:941
msgid "Oracle"
msgstr "神託所"
-#: data/default/buildings.ruleset:1375
+#: data/default/buildings.ruleset:1374
msgid "Makes two of your unhappy citizens content in every city with a temple."
msgstr "寺院ã®ã‚ã‚‹å…¨ã¦ã®éƒ½å¸‚ã§ï¼Œä¸å¹¸å¸‚æ°‘2を満足ã•ã›ã¾ã™ã€‚"
-#: data/default/buildings.ruleset:1380 data/civ2/buildings.ruleset:1363
+#: data/default/buildings.ruleset:1379 data/civ2/buildings.ruleset:1363
#: data/civ1/buildings.ruleset:960
msgid "Pyramids"
msgstr "ピラミッド"
# clefs
-#: data/default/buildings.ruleset:1394
+#: data/default/buildings.ruleset:1393
msgid ""
"The amount of stored food lost when one of your cities grows or shrinks is "
"reduced by 25%. This helps a city to grow faster and more easily withstand "
@@ -20196,30 +20351,30 @@ msgstr ""
"都市ã®å¤§ãã•ãŒå¤‰ã‚る時ã«ç™ºç”Ÿã™ã‚‹é£Ÿæ–™å‚™è“„ã®æ失を25%抑制ã—ã¾ã™ã€‚都市をæˆé•·ã—ã‚„"
"ã™ãã—，飢饉をé¿ã‘ã‚„ã™ããªã‚Šã¾ã™ã€‚穀物庫ã¨ç›¸ä¹—効果ãŒã‚ã‚Šã¾ã™ã€‚"
-#: data/default/buildings.ruleset:1401 data/civ2/buildings.ruleset:1382
+#: data/default/buildings.ruleset:1400 data/civ2/buildings.ruleset:1382
#: data/civ1/buildings.ruleset:981
msgid "SETI Program"
msgstr "SETI計画"
-#: data/default/buildings.ruleset:1415
+#: data/default/buildings.ruleset:1414
msgid "Boosts science production in each city with a Research Lab by 100%. "
msgstr "ç ”ç©¶æ‰€ã®ã‚ã‚‹å„都市ã®ç ”究æˆæžœã‚’ 100% 増やã—ã¾ã™ã€‚"
-#: data/default/buildings.ruleset:1420 data/civ2/buildings.ruleset:1402
+#: data/default/buildings.ruleset:1419 data/civ2/buildings.ruleset:1402
#: data/civ1/buildings.ruleset:1001
msgid "Shakespeare's Theatre"
msgstr "シェイクスピアã®åŠ‡å ´"
-#: data/default/buildings.ruleset:1434 data/civ2/buildings.ruleset:1416
+#: data/default/buildings.ruleset:1433 data/civ2/buildings.ruleset:1416
#: data/civ1/buildings.ruleset:1015
msgid "Makes all unhappy citizens content, in the city where it is located."
msgstr "建ã¦ã‚‰ã‚ŒãŸéƒ½å¸‚ã®ä¸å¹¸å¸‚æ°‘å…¨ã¦ã‚’満足ã•ã›ã¾ã™ã€‚"
-#: data/default/buildings.ruleset:1439 data/civ2/buildings.ruleset:1421
+#: data/default/buildings.ruleset:1438 data/civ2/buildings.ruleset:1421
msgid "Statue of Liberty"
msgstr "自由ã®å¥³ç¥žåƒ"
-#: data/default/buildings.ruleset:1453 data/civ2/buildings.ruleset:1435
+#: data/default/buildings.ruleset:1452 data/civ2/buildings.ruleset:1435
#: data/civ1/buildings.ruleset:974 data/civ1/buildings.ruleset:1034
msgid ""
"Allows you to choose any government, including those that have not yet been "
@@ -20229,12 +20384,12 @@ msgstr ""
"ã¾ã 発見ã—ã¦ã„ãªã„ã‚‚ã®ã‚’å«ã‚€å…¨ã¦ã®æ”¿æ²»ä½“制を，無政府状態ã®æœŸé–“を経ãšã«é¸æŠžã§"
"ãるよã†ã«ãªã‚Šã¾ã™ã€‚"
-#: data/default/buildings.ruleset:1460 data/civ2/buildings.ruleset:1442
+#: data/default/buildings.ruleset:1459 data/civ2/buildings.ruleset:1442
msgid "Sun Tzu's War Academy"
msgstr "å«åã®å…µæ³•å¦æ ¡"
# 50%ãªã‚‰75%ã«ãªã‚‹ã£ã¦ã“ã¨ãªã®ã‹ãª (clefs)
-#: data/default/buildings.ruleset:1474
+#: data/default/buildings.ruleset:1473
msgid ""
"All your new ground units start at the first veteran level. The chance of a "
"unit getting the next veteran level after a battle increases by half."
@@ -20242,22 +20397,22 @@ msgstr ""
"å…¨ã¦ã®éƒ½å¸‚ã§ï¼Œæ–°ã—ã作ã£ãŸåœ°ä¸Šéƒ¨éšŠãŒãƒ™ãƒ†ãƒ©ãƒ³ã«ãªã‚Šã¾ã™ã€‚部隊ãŒæˆ¦é—˜ã®å¾Œã«ãƒ™ãƒ†"
"ランã«ãªã‚‹ç¢ºçŽ‡ãŒ 50% 増ãˆã¾ã™ã€‚"
-#: data/default/buildings.ruleset:1481 data/civ2/buildings.ruleset:1463
+#: data/default/buildings.ruleset:1480 data/civ2/buildings.ruleset:1463
#: data/civ1/buildings.ruleset:1020
msgid "United Nations"
msgstr "国際連åˆ"
# Daniel
-#: data/default/buildings.ruleset:1495
+#: data/default/buildings.ruleset:1494
msgid "All your units regain two extra hitpoints per turn."
msgstr "ターンã”ã¨ã«éƒ¨éšŠã®ãƒ’ットãƒã‚¤ãƒ³ãƒˆãŒ2多ã回復ã—ã¾ã™ã€‚"
-#: data/default/buildings.ruleset:1508 data/civ2/buildings.ruleset:1490
+#: data/default/buildings.ruleset:1507 data/civ2/buildings.ruleset:1490
#: data/civ1/buildings.ruleset:1046
msgid "Women's Suffrage"
msgstr "婦人å‚政権"
-#: data/default/buildings.ruleset:1522 data/civ2/buildings.ruleset:1504
+#: data/default/buildings.ruleset:1521 data/civ2/buildings.ruleset:1504
msgid ""
"Counts as a Police Station in every city. (That is, for each city, reduces "
"unhappiness for military units outside the city by 2 under Democracy and 1 "
@@ -20269,11 +20424,11 @@ msgstr ""
# clefs
# was "貨幣"
-#: data/default/buildings.ruleset:1533
+#: data/default/buildings.ruleset:1532
msgid "Coinage"
msgstr "鋳貨"
-#: data/default/buildings.ruleset:1554
+#: data/default/buildings.ruleset:1553
msgid ""
"This is not a normal improvement. Instead, setting a city's production to "
"Coinage means its shield production is converted to tax output (money, "
@@ -20721,12 +20876,18 @@ msgid "?citystyle:Industrial"
msgstr "インダストリアル"
# clefs
-#: data/default/cities.ruleset:139 data/civ2/cities.ruleset:150
+#: data/default/cities.ruleset:139
+#, fuzzy
+msgid "?citystyle:ElectricAge"
+msgstr "ケルト調"
+
+# clefs
+#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:150
msgid "?citystyle:Modern"
msgstr "ç¾ä»£é¢¨"
# clefs
-#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:161
+#: data/default/cities.ruleset:161 data/civ2/cities.ruleset:161
msgid "?citystyle:PostModern"
msgstr "ãƒã‚¹ãƒˆãƒ¢ãƒ€ãƒ³"
@@ -26494,6 +26655,48 @@ msgstr "ãƒãƒ¼ãƒ 30"
msgid "Team 31"
msgstr "ãƒãƒ¼ãƒ 31"
+#~ msgid "Command access level could not be set to '%s' for connection %s."
+#~ msgstr "接続 %2$s ã®ã‚³ãƒžãƒ³ãƒ‰åˆ©ç”¨æ¨©ãƒ¬ãƒ™ãƒ«ã‚’ '%1$s' ã«è¨å®šã§ãã¾ã›ã‚“。"
+
+# clefs
+#~ msgid "Observers cannot vote."
+#~ msgstr "観察者ã¯æŠ•ç¥¨ã§ãã¾ã›ã‚“。"
+
+# clefs
+#~ msgid ""
+#~ "You can only vote in a running game. Use 'first' to become the game "
+#~ "organizer if there currently is none."
+#~ msgstr ""
+#~ "投票ã¯å®Ÿè¡Œä¸ã®ã‚²ãƒ¼ãƒ ã§ã®ã¿è¡Œãˆã¾ã™ã€‚ã‚‚ã—ゲーム主催者ãŒã„ãªã„よã†ãª"
+#~ "ら，'first' コマンドã§ã‚²ãƒ¼ãƒ 主催者ã«ãªã£ã¦ãã ã•ã„。"
+
+# clefs
+#~ msgid "Vote %d \"%s\": %d for, %d against"
+#~ msgstr "投票 %d \"%s\": è³›æˆ %d , å対%d"
+
+#~ msgid "Value must be integer."
+#~ msgstr "値ã¯æ•´æ•°ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。"
+
+#~ 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 Hydro Plant, Power Plant, or Nuclear Plant. A "
+#~ "city can only build a Hydro Plant if it is next to (or on) a Mountain or "
+#~ "River tile."
+#~ msgstr ""
+#~ "都市ã®ç”Ÿç”£ã«ã‚ˆã£ã¦å¼•ãèµ·ã“ã•ã‚Œã‚‹å…¬å®³ã‚’ 50% 減らã—ã¾ã™ã€‚ã¾ãŸï¼Œãã®éƒ½å¸‚ã®å·¥"
+#~ "å ´ã‚„è£½é€ å·¥å ´ã®ã‚·ãƒ¼ãƒ«ãƒ‰ç”Ÿç”£ç‰©ã‚’増やã—ã¾ã™ã€‚å³ã¡ï¼Œå·¥å ´ã¨æ°´åŠ›ç™ºé›»æ‰€ã ã¨åˆã‚ã›"
+#~ "㦠75% 生産物ボーナス，ã¾ãŸè£½é€ å·¥å ´ã¨æ°´åŠ›ç™ºé›»æ‰€ã ã¨åˆã‚ã›ã¦ 150% 生産物"
+#~ "ãƒãƒ¼ãƒŠã‚¹ã‚’å¾—ã¾ã™ã€‚\n"
+#~ "\n"
+#~ "都市ã«ã¯å¤ªé™½å…‰ç™ºé›»æ‰€ï¼Œæ°´åŠ›ç™ºé›»æ‰€ï¼Œç«åŠ›ç™ºé›»æ‰€ï¼ŒåŽŸå力発電所ã®ã„ãšã‚Œã‹ä¸€ã¤ã "
+#~ "ã‘建ã¦ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚水力発電所ã¯ï¼Œéƒ½å¸‚ãŒå±±ã‚„å·ã®éš£ã‚Š(ã¾ãŸã¯ä¸Š)ã«ã‚る時"
+#~ "ã ã‘建ã¦ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚"
+
# clefs
#, fuzzy
#~ msgid "Auth config filename \"%s\" not allowed!"
@@ -30081,10 +30284,6 @@ msgstr "ãƒãƒ¼ãƒ 31"
#~ msgid "%s lose %s when %s lost"
#~ msgstr "%1$sã¯%3$sを失ã£ãŸæ™‚ã«%2$sを失ã„ã¾ã—ãŸã€‚"
-# clefs
-#~ msgid "%s lose %s to the %s"
-#~ msgstr "%1$sã¯%3$sã«ã‚ˆã‚‹æ”»æ’ƒã§%2$sを失ã„ã¾ã—ãŸã€‚"
-
#~ msgid "%s discover %s (Hut)"
#~ msgstr "%sã¯%sを発見ã—ã¾ã—ãŸ(å°å±‹)"
@@ -30280,9 +30479,6 @@ msgstr "ãƒãƒ¼ãƒ 31"
#~ msgid "What do you wish to to?"
#~ msgstr "何を望ã¿ã¾ã™ã‹?"
-#~ msgid "New Game"
-#~ msgstr "æ–°è¦ã‚²ãƒ¼ãƒ "
-
#~ msgid "Quit Game"
#~ msgstr "ゲームã®çµ‚了"
diff --git a/po/ko.gmo b/po/ko.gmo
index 806e728..189d7df 100644
Binary files a/po/ko.gmo and b/po/ko.gmo differ
diff --git a/po/ko.po b/po/ko.po
index 08aa247..eda6dad 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: 2009-03-29 21:13+0900\n"
+"POT-Creation-Date: 2009-11-22 21:37+0100\n"
"PO-Revision-Date: 2007-12-10 21:13+0900\n"
"Last-Translator: Daniel\n"
"Language-Team: Korean language team\n"
@@ -64,21 +64,21 @@ msgstr "?í기:í"
msgid "?redundant:*"
msgstr "*"
-#: common/connection.c:515
+#: common/connection.c:518
#, c-format
msgid "%s from %s"
msgstr "%2$sì—ì„œ 오시는 %1$s"
-#: common/connection.c:521
+#: common/connection.c:524
msgid " (connection incomplete)"
msgstr " (미완성한 연결)"
-#: common/connection.c:525
+#: common/connection.c:528
#, c-format
msgid " (player %s)"
msgstr " (ì‚¬ìš©ìž %s)"
-#: common/connection.c:529
+#: common/connection.c:532
msgid " (observer)"
msgstr " (관찰ìž)"
@@ -482,81 +482,81 @@ msgstr "연결/미연결 메세지"
msgid "AI Debug messages"
msgstr "AI 디버그 메세지"
-#: common/player.c:732
+#: common/player.c:746
msgid "?attitude:Genocidal"
msgstr "대량 살육"
-#: common/player.c:734
+#: common/player.c:748
msgid "?attitude:Belligerent"
msgstr "ì¦ì˜¤"
-#: common/player.c:736
+#: common/player.c:750
msgid "?attitude:Hostile"
msgstr "ì 대"
-#: common/player.c:738
+#: common/player.c:752
msgid "?attitude:Uncooperative"
msgstr "비협조"
-#: common/player.c:740
+#: common/player.c:754
msgid "?attitude:Uneasy"
msgstr "불안"
-#: common/player.c:742
+#: common/player.c:756
msgid "?attitude:Neutral"
msgstr "중립"
-#: common/player.c:744
+#: common/player.c:758
msgid "?attitude:Respectful"
msgstr "ê³µì†"
-#: common/player.c:746
+#: common/player.c:760
msgid "?attitude:Helpful"
msgstr "ë„움"
-#: common/player.c:748
+#: common/player.c:762
msgid "?attitude:Enthusiastic"
msgstr "ì—´ê´‘"
-#: common/player.c:750
+#: common/player.c:764
msgid "?attitude:Admiring"
msgstr "찬미"
-#: common/player.c:753
+#: common/player.c:767
msgid "?attitude:Worshipful"
msgstr "ìˆë°°"
-#: common/player.c:764
+#: common/player.c:778
msgid "?diplomatic_state:Armistice"
msgstr "íœ´ì „"
-#: common/player.c:765
+#: common/player.c:779
msgid "?diplomatic_state:War"
msgstr "ì „ìŸ"
-#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:780 client/gui-gtk-2.0/diplodlg.c:353
#: 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:767 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:781 client/gui-gtk-2.0/diplodlg.c:358
#: 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:768 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:782 client/gui-gtk-2.0/diplodlg.c:363
#: 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:769
+#: common/player.c:783
msgid "?diplomatic_state:Never met"
msgstr "ë¯¸ì ‘ì´‰"
-#: common/player.c:770
+#: common/player.c:784
msgid "?diplomatic_state:Team"
msgstr "팀"
@@ -587,7 +587,7 @@ msgstr "ìƒì¡´ í•„ìš”ì¡°ê±´ì€ ì—¬ëŸ¬ì§€ì— ë¶„í¬ì— ì˜í•´ 지탱ë©ë‹ˆë‹¤."
#. TRANS: "Resources: (none)".
#: common/requirements.c:1014 common/team.c:132
#: client/gui-gtk-2.0/helpdlg.c:1055 client/gui-gtk-2.0/inteldlg.c:390
-#: client/gui-win32/helpdlg.c:586 client/gui-xaw/helpdlg.c:991
+#: client/gui-win32/helpdlg.c:592 client/gui-xaw/helpdlg.c:991
#, c-format
msgid "(none)"
msgstr "(ì—†ìŒ)"
@@ -613,10 +613,11 @@ msgstr "ë¯¸ëž˜ê¸°ìˆ %d"
#: 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
#: client/gui-sdl/helpdlg.c:817 client/gui-sdl/mapview.c:962
-#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:545
-#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:735
-#: 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
+#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:544
+#: client/gui-win32/helpdlg.c:551 client/gui-win32/helpdlg.c:721
+#: client/gui-win32/helpdlg.c:741 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 "ì—†ìŒ"
@@ -629,29 +630,29 @@ msgstr "ë¯¸ëž˜ê¸°ìˆ "
msgid "(Unknown)"
msgstr "(불명)"
-#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:553
#: manual/civmanual.c:224
msgid "Road"
msgstr "ë„ë¡œ"
-#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:557
#: client/gui-gtk-2.0/menu.c:829 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:394 common/terrain.c:572 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:567
#: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
#: data/civ1/techs.ruleset:563
msgid "Railroad"
msgstr "ì² ë„"
-#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:555
msgid "Mine"
msgstr "관갱"
-#: common/terrain.c:396 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:551 server/report.c:124
#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "공해"
@@ -660,7 +661,7 @@ msgstr "공해"
msgid "Hut"
msgstr "움막"
-#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:563
#: manual/civmanual.c:226
msgid "Fortress"
msgstr "요새"
@@ -673,58 +674,58 @@ msgstr "ê°•"
msgid "Farmland"
msgstr "ë†ì§€"
-#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:577
#: manual/civmanual.c:226
msgid "Airbase"
msgstr "공군 기지"
-#: common/terrain.c:402 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:579
msgid "Fallout"
msgstr "방사능 낙진"
-#: common/unit.c:546 client/gui-win32/plrdlg.c:337
+#: common/unit.c:549 client/gui-win32/plrdlg.c:337
msgid "Idle"
msgstr "한가함(idle)"
-#: common/unit.c:556
+#: common/unit.c:559
msgid "Fortifying"
msgstr "요새화"
-#: common/unit.c:558
+#: common/unit.c:561
msgid "Fortified"
msgstr "요새화ë¨"
-#: common/unit.c:562 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
+#: common/unit.c:565 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
msgid "Sentry"
msgstr "ë³´ì´ˆ"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
+#: common/unit.c:569 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
#: client/gui-win32/menu.c:370 client/gui-xaw/menu.c:185
msgid "Pillage"
msgstr "약탈"
-#: common/unit.c:568 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
+#: common/unit.c:571 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
msgid "Goto"
msgstr "ì´ë™"
-#: common/unit.c:570
+#: common/unit.c:573
msgid "Explore"
msgstr "íƒí—˜"
-#: common/unit.c:572 manual/civmanual.c:224
+#: common/unit.c:575 manual/civmanual.c:224
msgid "Transform"
msgstr "개조"
-#: common/unit.c:584 client/text.c:157 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:587 client/text.c:157 client/gui-sdl/citydlg.c:1972
#: client/gui-win32/citydlg.c:1257 client/gui-xaw/citydlg.c:1423
msgid "Unknown"
msgstr "ì•Œë ¤ì§€ì§€ ì•Šì€"
-#: common/unit.c:1022
+#: common/unit.c:1025
msgid "Moves"
msgstr "ì´ë™"
-#: common/unit.c:1571
+#: common/unit.c:1574
#, c-format
msgid ""
"Upgrade %s to %s for %d gold?\n"
@@ -733,12 +734,12 @@ msgstr ""
"%sì—ì„œ %s(으)ë¡œ %dì˜ ê¸ˆì´ í•„ìš”í•œë° ì—…ê·¸ë ˆì´ë“œ í•˜ì‹œê² ìŠµë‹ˆê¹Œ?\n"
"%dì˜ ê¸ˆì„ ìžê¸ˆìœ¼ë¡œ ê°–ê³ ìžˆìŠµë‹ˆë‹¤."
-#: common/unit.c:1579
+#: common/unit.c:1582
#, c-format
msgid "Sorry, cannot upgrade %s (yet)."
msgstr "미안하지만 %s를(ì„) ì—…ê·¸ë ˆì´ë“œ í• ìˆ˜ 없습니다(ì•„ì§)"
-#: common/unit.c:1585
+#: common/unit.c:1588
#, c-format
msgid ""
"Upgrading %s to %s costs %d gold.\n"
@@ -747,11 +748,11 @@ msgstr ""
"%sì—ì„œ %s(으)ë¡œ %dì˜ ê¸ˆì„ ì†Œë¹„í•˜ì—¬ ì—…ê·¸ë ˆì´ë“œ 합니다.\n"
"%dì˜ ê¸ˆì„ ìžê¸ˆìœ¼ë¡œ ê°–ê³ ìžˆìŠµë‹ˆë‹¤."
-#: common/unit.c:1594
+#: common/unit.c:1597
msgid "You can only upgrade units in your cities."
msgstr "ë‹¹ì‹ ì€ ì˜¤ì§ ë‹¹ì‹ ë„ì‹œ 안ì—ì„œ 부대를 ì—…ê·¸ë ˆì´ë“œ 시킬수 있습니다"
-#: common/unit.c:1598
+#: common/unit.c:1601
#, c-format
msgid "Upgrading this %s would strand units it transports."
msgstr "ì´ %sì˜ ì—…ê·¸ë ˆì´ë“œëŠ” 해안가로 ìš´ë°˜í• ê²ƒìž…ë‹ˆë‹¤"
@@ -784,11 +785,11 @@ msgstr "핵병기"
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1404
+#: common/unittype.c:349 client/helpdata.c:1412
msgid " and "
msgstr " ê·¸ë¦¬ê³ "
-#: common/unittype.c:355 client/helpdata.c:1390
+#: common/unittype.c:355 client/helpdata.c:1398
msgid "?and:, "
msgstr ", "
@@ -958,69 +959,69 @@ msgstr "\"%s\" 비어있는 ì¸ìˆ˜.\n"
msgid "Missing argument for \"%s\".\n"
msgstr "\"%s\" 놓친 ì¸ìˆ˜.\n"
-#: utility/shared.c:501
+#: utility/shared.c:514
#, c-format
msgid "%d BC"
msgstr "%d 기ì›ì „"
-#: utility/shared.c:503
+#: utility/shared.c:516
#, c-format
msgid "%d AD"
msgstr "%d 기ì›í›„"
-#: utility/shared.c:924
+#: utility/shared.c:937
msgid "FREECIV_PATH is set but empty; using default path instead."
msgstr "FREECIV_PATH는 ë°°ì¹˜ë˜ ìžˆì§€ë§Œ 비어있습니다; ëŒ€ì‹ ê¸°ë³¸ê²½ë¡œë¡œ 사용합니다"
-#: utility/shared.c:1028
+#: utility/shared.c:1041
#, c-format
msgid "Could not read data directory %s: %s."
msgstr "ë””ë ‰í† ë¦¬ %sì—ì„œ ë°ì´í„°ë¥¼ ì½ì„ 수 없습니다: %s."
-#: utility/shared.c:1279
+#: utility/shared.c:1292
msgid "The data path may be set via the environment variable FREECIV_PATH."
msgstr "ë°ì´í„° 경로는 ë³€ê²½í• ìˆ˜ 있는 FREECIV_PATHí™˜ê²½ì„ í†µí•´ ì„¸íŒ…í• ìˆ˜ 있습니다."
-#: utility/shared.c:1281
+#: utility/shared.c:1294
#, c-format
msgid "Current data path is: \"%s\""
msgstr "현재 ë°ì´í„° 경로는 : \"%s\""
-#: utility/shared.c:1283
+#: utility/shared.c:1296
#, c-format
msgid "The \"%s\" file is required ... aborting!"
msgstr " \"%s\"ì´ ìš”êµ¬ë©ë‹ˆë‹¤... 거부!"
-#: utility/shared.c:1460
+#: utility/shared.c:1485
#, c-format
msgid "%s: Fatal error: you're trying to run me as superuser!\n"
msgstr "%s:치명ì ì—러: ë‹¹ì‹ ì€ ê´€ë¦¬ìžë˜ë ¤ê³ ì‹œë„í•˜ë ¤ê³ í–ˆìŠµë‹ˆë‹¤!\n"
-#: utility/shared.c:1462
+#: utility/shared.c:1487
msgid "Use a non-privileged account instead.\n"
msgstr "ì¼ë°˜ê³„ì •ì„ ëŒ€ì‹ ì‚¬ìš©í•˜ì„¸ìš”\n"
-#: utility/shared.c:1478
+#: utility/shared.c:1503
msgid "exact match"
msgstr "ì •í™•í•œ 맞ìŒ(match)"
-#: utility/shared.c:1479
+#: utility/shared.c:1504
msgid "only match"
msgstr "ì˜¤ì§ ê²½ê¸°"
-#: utility/shared.c:1480
+#: utility/shared.c:1505
msgid "ambiguous"
msgstr "ì• ë§¤ëª¨í•œ"
-#: utility/shared.c:1481
+#: utility/shared.c:1506
msgid "empty"
msgstr "비어있ìŒ"
-#: utility/shared.c:1482
+#: utility/shared.c:1507
msgid "too long"
msgstr "너무 ê¹ë‹ˆë‹¤"
-#: utility/shared.c:1483
+#: utility/shared.c:1508
msgid "non-match"
msgstr "맞지 않습니다"
@@ -1049,91 +1050,91 @@ msgstr "%s(ì€)는 %sì˜ ê±´ì„¤ì„ %sì–´ì„œ 시작했습니다."
msgid "%s is selling %s (not needed) for %d."
msgstr ""
-#: ai/advdiplomacy.c:280
+#: ai/advdiplomacy.c:300
#, c-format
msgid "*%s (AI)* In away mode AI can't sign such a treaty."
msgstr ""
-#: ai/advdiplomacy.c:290
+#: ai/advdiplomacy.c:310
#, c-format
msgid "*%s (AI)* First break alliance with %s, %s."
msgstr ""
-#: ai/advdiplomacy.c:303
+#: ai/advdiplomacy.c:322
#, c-format
msgid "*%s (AI)* Let us first cease hostilies, %s."
msgstr ""
-#: ai/advdiplomacy.c:308
+#: ai/advdiplomacy.c:327
#, c-format
msgid ""
"*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
"first, %s."
msgstr ""
-#: ai/advdiplomacy.c:331
+#: ai/advdiplomacy.c:350
#, c-format
msgid "*%s (AI)* I simply do not trust you with an alliance yet, %s."
msgstr "*%s (AI)* ë‚œ ì•„ì§ ë™ë§¹ì„ í• ë§Œí¼ ë‹¹ì‹ ì„ ì‹ ë¢°í• ìˆ˜ 없소, %s."
-#: ai/advdiplomacy.c:424
+#: ai/advdiplomacy.c:443
#, c-format
msgid "*%s (AI)* I do not know the city you mention."
msgstr "*%s(AI)*ë‹¹ì‹ ì´ ì–¸ê¸‰í•˜ëŠ” ê·¸ ë„시는 ë‚œ 모릅니다"
-#: ai/advdiplomacy.c:454
+#: ai/advdiplomacy.c:473
#, c-format
msgid "*%s (AI)* Sorry, sharing vision with you is not safe."
msgstr "*%s (AI)* 미안하지만 시야를 ê³µìœ í•˜ëŠ” ê±´ ì•ˆì „í•˜ì§€ 않소."
-#: ai/advdiplomacy.c:560
+#: ai/advdiplomacy.c:579
#, c-format
msgid "*%s (AI)* This deal was not very good for us, %s!"
msgstr "*%s (AI)* ì´ ê±°ëž˜ëŠ” 우리ì—게 ìœ ìµí•˜ì§€ 않소, %s!"
-#: ai/advdiplomacy.c:582
+#: ai/advdiplomacy.c:601
#, c-format
msgid "*%s (AI)* Welcome into our alliance %s!"
msgstr "*%s (AI)* 우리 ë™ë§¹êµìœ¼ë¡œ 들어온걸 환ì˜í•˜ì˜¤ %s!"
-#: ai/advdiplomacy.c:586
+#: ai/advdiplomacy.c:605
#, c-format
msgid "*%s (AI)* Yes, may we forever stand united, %s."
msgstr "*%s (AI)* ê·¸ë ‡ì†Œ, 아마 우리는 ì˜ì›í•œ ì—°í•©ì²´ë¡œ 설 것ì´ì˜¤, %s"
-#: ai/advdiplomacy.c:593
+#: ai/advdiplomacy.c:612
#, c-format
msgid "*%s (AI)* Yes, peace in our time!"
msgstr "*%s (AI)* 맞소, í‰í™”는 ìš°ë¦¬ì˜ ì‹œê°„ì´ì˜¤"
-#: ai/advdiplomacy.c:598
+#: ai/advdiplomacy.c:617
#, c-format
msgid "*%s (AI)* Agreed. No more hostilities, %s."
msgstr "*%s (AI)* ë™ì˜í•˜ì˜¤. ë”ì˜ìƒì˜ ì ì˜ëŠ” 없소, %s"
-#: ai/advdiplomacy.c:813
+#: ai/advdiplomacy.c:832
#, 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:1097
+#: ai/advdiplomacy.c:1116
#, c-format
msgid "*%s (AI)* Space will never be yours. "
msgstr "*%s (AI)* 우주는 ê²°ì½” ë‹¹ì‹ ì˜ ê²ƒì´ ë 수 없어"
-#: ai/advdiplomacy.c:1102
+#: ai/advdiplomacy.c:1121
#, c-format
msgid "*%s (AI)* I have tolerated your vicious antics long enough! To war!"
msgstr "*%s (AI)* 나는 ë‹¹ì‹ ì˜ ê¸°ê´´í•œ ì‚¬ì•…í•¨ì€ ì¶©ë¶„ì´ ë¬µê³¼í–ˆì†Œ! ì „ìŸì´ë‹¤!"
-#: ai/advdiplomacy.c:1108
+#: ai/advdiplomacy.c:1127
#, c-format
msgid "*%s (AI)* Peace in ... some other time."
msgstr "*%s (AI)* í‰í™”는....다ìŒì—."
-#: ai/advdiplomacy.c:1113
+#: ai/advdiplomacy.c:1132
#, c-format
msgid ""
"*%s (AI)* Finally I get around to you! Did you really think you could get "
@@ -1142,17 +1143,17 @@ msgstr ""
"*%s (AI)* 마침내 ë‹¹ì‹ ì£¼ë³€ì— ì™”ì†Œ! ì •ë§ ë‹¹ì‹ ì€ ë‹¹ì‹ ì˜ ë²”ì£„ë“¤ë¡œë¶€í„°ë©€ì–´ì§ˆìˆ˜ 있"
"소?"
-#: ai/advdiplomacy.c:1119
+#: ai/advdiplomacy.c:1138
#, c-format
msgid "*%s (AI)* Your covert hostilities brought this war upon you!"
msgstr "*%s (AI)*ë‹¹ì‹ ì˜ ì‚¬ì•…í•¨ìœ¼ë¡œì˜ ì „í–¥ì€ ì´ ì „ìŸì„ 불러왔소!"
-#: ai/advdiplomacy.c:1126
+#: ai/advdiplomacy.c:1145
#, c-format
msgid "*%s (AI)* Your aggression against %s was your last mistake!"
msgstr "*%s (AI)* %sì— í–¥í•œ ë‹¹ì‹ ì˜ ê³µê²©ì„±ì€ ë‹¹ì‹ ì˜ ë§ˆì§€ë§‰ 실수였소!"
-#: ai/advdiplomacy.c:1209
+#: ai/advdiplomacy.c:1229
#, c-format
msgid ""
"*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1163,14 +1164,14 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1219
+#: ai/advdiplomacy.c:1239
#, c-format
msgid ""
"*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
"alliance!"
msgstr ""
-#: ai/advdiplomacy.c:1225
+#: ai/advdiplomacy.c:1245
#, c-format
msgid ""
"*%s (AI)* %s has grossly violated his treaties with us for own gain. We "
@@ -1183,7 +1184,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1238
+#: ai/advdiplomacy.c:1258
#, c-format
msgid ""
"*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1194,13 +1195,13 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1246
+#: ai/advdiplomacy.c:1266
#, c-format
msgid ""
"*%s (AI)* If you want a piece of the loot, feel free to join in the action!"
msgstr ""
-#: ai/advdiplomacy.c:1251
+#: ai/advdiplomacy.c:1271
#, c-format
msgid ""
"*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1211,12 +1212,12 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1261
+#: ai/advdiplomacy.c:1281
#, c-format
msgid "*%s (AI)* As our glorious allies, we expect your help in this war."
msgstr ""
-#: ai/advdiplomacy.c:1267
+#: ai/advdiplomacy.c:1287
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance and declare war on %s in %d turn. "
@@ -1227,7 +1228,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1276
+#: ai/advdiplomacy.c:1296
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1238,47 +1239,47 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1344
+#: ai/advdiplomacy.c:1364
#, 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:1359
+#: ai/advdiplomacy.c:1379
#, c-format
msgid ""
"*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
"offensive."
msgstr ""
-#: ai/advdiplomacy.c:1362
+#: ai/advdiplomacy.c:1382
#, c-format
msgid ""
"*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
"take action!"
msgstr ""
-#: ai/advdiplomacy.c:1474
+#: ai/advdiplomacy.c:1494
#, c-format
msgid "*%s (AI)* Sorry, sharing vision with you is no longer safe."
msgstr ""
-#: ai/advdiplomacy.c:1549
+#: ai/advdiplomacy.c:1569
#, c-format
msgid ""
"*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
"our enemy, %s."
msgstr ""
-#: ai/advdiplomacy.c:1555
+#: ai/advdiplomacy.c:1575
#, 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:1562
+#: ai/advdiplomacy.c:1582
#, c-format
msgid ""
"*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1286,26 +1287,26 @@ msgid ""
"more!"
msgstr ""
-#: ai/advdiplomacy.c:1592
+#: ai/advdiplomacy.c:1612
#, c-format
msgid ""
"*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
"an alliance?"
msgstr ""
-#: ai/advdiplomacy.c:1607
+#: ai/advdiplomacy.c:1627
#, c-format
msgid "*%s (AI)* Greetings neighbour, may we suggest more peaceful relations?"
msgstr ""
-#: ai/advdiplomacy.c:1622
+#: ai/advdiplomacy.c:1642
#, c-format
msgid ""
"*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
"cessation of hostilities?"
msgstr ""
-#: ai/advdiplomacy.c:1742
+#: ai/advdiplomacy.c:1762
#, c-format
msgid ""
"*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1455,17 +1456,17 @@ msgstr ""
"암호는 ì ì–´ë„ %d ê°œì˜ ëŒ€ë¬¸ìžê°€ 사용ë˜ì–´ì•¼ 합니다, %d 숫ìžë“¤, ê·¸ë¦¬ê³ ìµœì†Œ %d"
"[화면ìƒì— ì¶œë ¥ë˜ëŠ”] 문ìžê¸¸ì´ì—¬ì•¼ 합니다, 다시 ì‹œë„하세요"
-#: server/barbarian.c:183
+#: server/barbarian.c:184
#, c-format
msgid "%s gain a leader by the name %s. Dangerous times may lie ahead."
msgstr ""
-#: server/barbarian.c:479
+#: server/barbarian.c:480
#, c-format
msgid "Native unrest near %s led by %s."
msgstr "%sì— êµê°€ì ë¶ˆì•ˆì´ %sì— ì˜í•´ ì¸ì ‘하였습니다"
-#: server/barbarian.c:484
+#: server/barbarian.c:485
#, c-format
msgid "Sea raiders seen near %s!"
msgstr "바다수색ìžê°€ %sì—ì„œ 보였습니다!"
@@ -1839,7 +1840,7 @@ msgid_plural "%s boosts research; you gain %d immediate advances."
msgstr[0] ""
msgstr[1] ""
-#: server/cityturn.c:1158 server/techtools.c:176
+#: server/cityturn.c:1158 server/techtools.c:172
#, c-format
msgid "The %s have acquired %s from %s."
msgstr ""
@@ -1921,22 +1922,22 @@ msgid "Warning: the %s option is obsolete. Use -m to enable the metaserver.\n"
msgstr ""
"ê²½ê³ : %sì˜µì…˜ì€ ì“¸ëª¨ì—†ìŠµë‹ˆë‹¤. 메타서버를 가능하게 í•˜ë ¤ë©´ -mì„ ì‚¬ìš©í•˜ì„¸ìš”\n"
-#: server/civserver.c:189
+#: server/civserver.c:193
#, c-format
msgid "Error: unknown option '%s'\n"
msgstr "ì—러: ì•Œë ¤ì§€ì§€ ì•Šì€ ì˜µì…˜ '%s'\n"
-#: server/civserver.c:200
+#: server/civserver.c:204
#, c-format
msgid "This is the server for %s"
msgstr "여기는 %s 서버입니다"
-#: server/civserver.c:201
+#: server/civserver.c:205
#, c-format
msgid "You can learn a lot about Freeciv at %s"
msgstr ""
-#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
+#: server/civserver.c:210 client/civclient.c:239 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -1945,101 +1946,105 @@ msgstr ""
"사용법 : %s [옵션 ...] \n"
"가능한 ì˜µì…˜ì€ : \n"
-#: server/civserver.c:208
+#: server/civserver.c:212
msgid ""
" -a --auth FILE\tEnable server authentication with configuration from "
"FILE.\n"
msgstr ""
-#: server/civserver.c:210
+#: server/civserver.c:214
msgid " -G --Guests\t\tAllow guests to login if auth is enabled.\n"
msgstr ""
-#: server/civserver.c:212
+#: server/civserver.c:216
msgid " -N --Newusers\tAllow new users to login if auth is enabled.\n"
msgstr ""
-#: server/civserver.c:215
+#: server/civserver.c:219
msgid " -b --bind ADDR\tListen for clients on ADDR\n"
msgstr ""
-#: server/civserver.c:217 client/civclient.c:242
+#: server/civserver.c:221 client/civclient.c:243
msgid ""
" -d, --debug NUM\tSet debug log level (0 to 4, or 4:file1,min,max:...)\n"
msgstr ""
-#: server/civserver.c:221 client/civclient.c:246
+#: server/civserver.c:225 client/civclient.c:247
msgid " -d, --debug NUM\tSet debug log level (0 to 3)\n"
msgstr ""
-#: server/civserver.c:223
+#: server/civserver.c:227
msgid " -f, --file FILE\tLoad saved game FILE\n"
msgstr ""
-#: server/civserver.c:225 client/civclient.c:249 manual/civmanual.c:382
+#: server/civserver.c:229 client/civclient.c:250 manual/civmanual.c:382
msgid " -h, --help\t\tPrint a summary of the options\n"
msgstr ""
-#: server/civserver.c:226
+#: server/civserver.c:230
+msgid " -i, --identity ADDR\tBe known as ADDR at metaserver\n"
+msgstr ""
+
+#: server/civserver.c:231
msgid " -l, --log FILE\tUse FILE as logfile\n"
msgstr ""
-#: server/civserver.c:227
+#: server/civserver.c:232
msgid " -m, --meta\t\tNotify metaserver and send server's info\n"
msgstr ""
-#: server/civserver.c:229
+#: server/civserver.c:234
msgid " -M, --Metaserver ADDR\tSet ADDR as metaserver address\n"
msgstr ""
-#: server/civserver.c:232
+#: server/civserver.c:237
msgid " -p, --port PORT\tListen for clients on port PORT\n"
msgstr ""
-#: server/civserver.c:234
+#: server/civserver.c:239
msgid " -q, --quitidle TIME\tQuit if no players for TIME seconds\n"
msgstr ""
-#: server/civserver.c:236
+#: server/civserver.c:241
msgid " -e, --exit-on-end\tWhen a game ends, exit instead of restarting\n"
msgstr ""
-#: server/civserver.c:239
+#: server/civserver.c:244
msgid " -s, --saves DIR\tSave games to directory DIR\n"
msgstr ""
-#: server/civserver.c:241
+#: server/civserver.c:246
msgid " -S, --Serverid ID\tSets the server id to ID\n"
msgstr ""
-#: server/civserver.c:243
+#: server/civserver.c:248
msgid " -P, --Ppm\t\tSave ppms of the map when saving the game.\n"
msgstr ""
-#: server/civserver.c:244
+#: server/civserver.c:249
msgid " -r, --read FILE\tRead startup script FILE\n"
msgstr ""
-#: server/civserver.c:246
+#: server/civserver.c:251
msgid " -R, --Ranklog FILE\tUse FILE as ranking logfile\n"
msgstr ""
-#: server/civserver.c:247 client/civclient.c:268 manual/civmanual.c:383
+#: server/civserver.c:252 client/civclient.c:269 manual/civmanual.c:383
msgid " -v, --version\t\tPrint the version number\n"
msgstr ""
-#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
+#: server/civserver.c:253 client/gui-gtk-2.0/gui_main.c:354
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, c-format
msgid "Report bugs at %s.\n"
msgstr "%sì— ë²„ê·¸ë¦¬í¬íŠ¸.\n"
-#: server/commands.c:28
+#: server/commands.c:29
msgid "Start the game, or restart after loading a savegame."
msgstr "ê²Œìž„ì„ ì‹œìž‘í•˜ê±°ë‚˜, ë˜ëŠ” ì €ìž¥ëœ ê²Œìž„ì„ ë¡œë”©í›„ì— ìž¬ì‹œìž‘í•˜ì‹ì‹œìš”."
-#: server/commands.c:29
+#: server/commands.c:30
msgid ""
"This command starts the game. When starting a new game, it should be used "
"after all human players have connected, and AI players have been created (if "
@@ -2051,7 +2056,7 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:42
+#: server/commands.c:44
msgid ""
"help\n"
"help commands\n"
@@ -2065,11 +2070,11 @@ msgstr ""
"help <ëª…ë ¹ ì´ë¦„>\n"
"help <옵션 ì´ë¦„>"
-#: server/commands.c:47
+#: server/commands.c:49
msgid "Show help about server commands and server options."
msgstr "서버 ëª…ë ¹ê³¼ ì„œë²„ì˜µì…˜ì— ëŒ€í•´ ë„ì›€ë§ ë³´ê¸°"
-#: server/commands.c:48
+#: server/commands.c:50
msgid ""
"With no arguments gives some introductory help. With argument \"commands\" "
"or \"options\" gives respectively a list of all commands or all options. "
@@ -2079,31 +2084,31 @@ msgid ""
"be abbreviated where unambiguous."
msgstr ""
-#: server/commands.c:63
+#: server/commands.c:66
msgid "Show a list of players, teams, connections, or scenarios."
msgstr ""
-#: server/commands.c:64
+#: server/commands.c:67
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 ""
-#: server/commands.c:70
+#: server/commands.c:74
msgid "Quit the game and shutdown the server."
msgstr "ê²Œìž„ì„ ê·¸ë§Œë‘ê³ , 서버를 종료합니다."
#. TRANS: translate text between <> only
-#: server/commands.c:74
+#: server/commands.c:79
msgid "cut <connection-name>"
msgstr "cut <ì ‘ì† ì´ë¦„>"
-#: server/commands.c:75
+#: server/commands.c:80
msgid "Cut a client's connection to server."
msgstr "ì„œë²„ì— ì ‘ì†í•œ í´ë¼ì´ì–¸íŠ¸ ì ‘ì† ëŠê¸°"
-#: server/commands.c:76
+#: server/commands.c:81
msgid ""
"Cut specified client's connection to the server, removing that client from "
"the game. If the game has not yet started that client's player is removed "
@@ -2112,7 +2117,7 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:83
+#: server/commands.c:89
msgid ""
"explain\n"
"explain <option-name>"
@@ -2120,11 +2125,11 @@ msgstr ""
"explain\n"
"explain <옵션 ì´ë¦„>"
-#: server/commands.c:85
+#: server/commands.c:91
msgid "Explain server options."
msgstr "서버옵션 설명."
-#: server/commands.c:86
+#: server/commands.c:92
msgid ""
"The 'explain' command gives a subset of the functionality of 'help', and is "
"included for backward compatibility. With no arguments it gives a list of "
@@ -2133,7 +2138,7 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:93
+#: server/commands.c:100
msgid ""
"show\n"
"show <option-name>\n"
@@ -2143,50 +2148,51 @@ msgstr ""
"show <옵션 ì´ë¦„>\n"
"show <옵션 ì ‘ë‘사>"
-#: server/commands.c:96
+#: server/commands.c:103
msgid "Show server options."
msgstr "서버 옵션 보기."
-#: server/commands.c:97
+#: server/commands.c:104
msgid ""
"With no arguments, shows all server options (or available options, when used "
"by clients). With an argument, show only the named option, or options with "
"that prefix."
msgstr ""
-#: server/commands.c:102
+#: server/commands.c:110
msgid "wall <message>"
msgstr "wall <메세지>"
-#: server/commands.c:103
+#: server/commands.c:111
msgid "Send message to all connections."
msgstr "ëª¨ë“ ì ‘ì†ìžì—게 메세지를 보냅니다."
-#: server/commands.c:104
+#: server/commands.c:112
msgid ""
"For each connected client, pops up a window showing the message entered."
msgstr ""
-#: server/commands.c:108
+#: server/commands.c:117
msgid "vote yes|no [vote number]"
msgstr "투표 예|아니오[투표 수]"
-#: server/commands.c:109
+#: server/commands.c:118
msgid "Cast a vote."
msgstr "투표합니다"
-#: server/commands.c:111
+#: server/commands.c:120
#, 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."
+"A player with basic 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."
msgstr ""
-#: server/commands.c:121
+#: server/commands.c:131
msgid ""
"debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
"<player> | timing | info]"
@@ -2194,33 +2200,33 @@ msgstr ""
"debug [ player <사용ìž> | city <x> <y> | units <x> <y> | unit <id> | tech <사"
"ìš©ìž> | timing | info]"
-#: server/commands.c:123
+#: server/commands.c:133
msgid "Turn on or off AI debugging of given entity."
msgstr ""
-#: server/commands.c:124
+#: server/commands.c:134
msgid ""
"Print AI debug information about given entity and turn continous debugging "
"output for this entity on or off."
msgstr ""
-#: server/commands.c:128
+#: server/commands.c:139
msgid "set <option-name> <value>"
msgstr "set <옵션ì´ë¦„> <ê°’>"
-#: server/commands.c:129
+#: server/commands.c:140
msgid "Set server option."
msgstr "서버 옵션 ì„¤ì •."
-#: server/commands.c:132
+#: server/commands.c:144
msgid "team <player> [team]"
msgstr "팀 <í”Œë ˆì´ì–´> [팀]"
-#: server/commands.c:133
+#: server/commands.c:145
msgid "Change, add or remove a player's team affiliation."
msgstr ""
-#: server/commands.c:134
+#: server/commands.c:146
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 "
@@ -2228,30 +2234,30 @@ msgid ""
"to achieve team victory with averaged individual scores."
msgstr ""
-#: server/commands.c:141
+#: server/commands.c:154
msgid "rulesetdir <directory>"
msgstr "rulesetdir <ë””ë ‰í† ë¦¬>"
-#: server/commands.c:142
+#: server/commands.c:155
msgid "Choose new ruleset directory or modpack."
msgstr ""
-#: server/commands.c:143
+#: server/commands.c:156
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:149
+#: server/commands.c:163
msgid "metainfo <meta-line>"
msgstr "metainfo <메타ë¼ì¸>"
-#: server/commands.c:150
+#: server/commands.c:164
msgid "Set metaserver info line."
msgstr ""
-#: server/commands.c:151
+#: server/commands.c:165
msgid ""
"Set user defined metaserver info line. If parameter is omitted,\n"
"previously set metamessage will be removed. For most of the time\n"
@@ -2260,19 +2266,19 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:158
+#: server/commands.c:173
msgid "metapatch <meta-line>"
msgstr "metapatch <메타ë¼ì¸>"
-#: server/commands.c:159
+#: server/commands.c:174
msgid "Set metaserver patches line."
msgstr ""
-#: server/commands.c:165
+#: server/commands.c:181
msgid "Control metaserver connection."
msgstr ""
-#: server/commands.c:166
+#: server/commands.c:182
msgid ""
"'metaconnection ?' reports on the status of the connection to metaserver.\n"
"'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2280,33 +2286,33 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:172
+#: server/commands.c:189
msgid "metaserver <address>"
msgstr "metaserver <주소>"
-#: server/commands.c:173
+#: server/commands.c:190
msgid "Set address (URL) for metaserver to report to."
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:177
+#: server/commands.c:195
msgid "aitoggle <player-name>"
msgstr "aitoggle <ì‚¬ìš©ìž ì´ë¦„>"
-#: server/commands.c:178
+#: server/commands.c:196
msgid "Toggle AI status of player."
msgstr ""
#. TRANS: translate text between [] and <> only
-#: server/commands.c:182
+#: server/commands.c:201
msgid "take [connection-name] <player-name>"
msgstr "take [ì ‘ì†ì´ë¦„] <ì‚¬ìš©ìž ì´ë¦„>"
-#: server/commands.c:183
+#: server/commands.c:202
msgid "Take over a player's place in the game."
msgstr ""
-#: server/commands.c:184
+#: server/commands.c:203
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 "
@@ -2316,15 +2322,15 @@ msgid ""
msgstr ""
#. TRANS: translate text between [] only
-#: server/commands.c:192
+#: server/commands.c:212
msgid "observe [connection-name] [player-name]"
msgstr "observe [ì ‘ì†ì´ë¦„] [ì‚¬ìš©ìž ì´ë¦„]"
-#: server/commands.c:193
+#: server/commands.c:213
msgid "Observe a player or the whole game."
msgstr ""
-#: server/commands.c:194
+#: server/commands.c:214
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 "
@@ -2334,35 +2340,35 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:202
+#: server/commands.c:223
msgid "detach <connection-name>"
msgstr "detach <ì ‘ì†ì´ë¦„>"
-#: server/commands.c:203
+#: server/commands.c:224
msgid "detach from a player."
msgstr "사용ìžë¡œë¶€í„° 분리"
-#: server/commands.c:204
+#: server/commands.c:225
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:209
+#: server/commands.c:231
msgid "create <player-name>"
msgstr "create <ì‚¬ìš©ìž ì´ë¦„>"
-#: server/commands.c:210
+#: server/commands.c:232
msgid "Create an AI player with a given name."
msgstr ""
-#: server/commands.c:211
+#: server/commands.c:233
msgid ""
"The 'create' command is only available before the game has been started."
msgstr ""
-#: server/commands.c:215
+#: server/commands.c:238
msgid ""
"away\n"
"away"
@@ -2370,16 +2376,16 @@ msgstr ""
"away\n"
"away"
-#: server/commands.c:217
+#: server/commands.c:240
msgid "Set yourself in away mode. The AI will watch your back."
msgstr ""
-#: server/commands.c:218
+#: server/commands.c:241
msgid "The AI will govern your nation but do minimal changes."
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:222
+#: server/commands.c:246
msgid ""
"novice\n"
"novice <player-name>"
@@ -2387,11 +2393,11 @@ msgstr ""
"novice\n"
"novice <ì‚¬ìš©ìž ì´ë¦„>"
-#: server/commands.c:224
+#: server/commands.c:248
msgid "Set one or all AI players to 'novice'."
msgstr "하나 ë˜ëŠ” ëª¨ë“ AI 사용ìžë¥¼ '초보'으로 ì„¤ì •"
-#: server/commands.c:225
+#: server/commands.c:249
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 "
@@ -2399,7 +2405,7 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:231
+#: server/commands.c:256
msgid ""
"easy\n"
"easy <player-name>"
@@ -2407,11 +2413,11 @@ msgstr ""
"easy\n"
"easy <ì‚¬ìš©ìž ì´ë¦„>"
-#: server/commands.c:233
+#: server/commands.c:258
msgid "Set one or all AI players to 'easy'."
msgstr "하나 ë˜ëŠ” ëª¨ë“ AI 사용ìžë¥¼ '쉬움'으로 ì„¤ì •"
-#: server/commands.c:234
+#: server/commands.c:259
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 "
@@ -2419,7 +2425,7 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:240
+#: server/commands.c:266
msgid ""
"normal\n"
"normal <player-name>"
@@ -2427,11 +2433,11 @@ msgstr ""
"normal\n"
"normal <ì‚¬ìš©ìž ì´ë¦„>"
-#: server/commands.c:242
+#: server/commands.c:268
msgid "Set one or all AI players to 'normal'."
msgstr "하나 ë˜ëŠ” ëª¨ë“ AI 사용ìžë¥¼ '보통'으로 ì„¤ì •"
-#: server/commands.c:243
+#: server/commands.c:269
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 "
@@ -2439,7 +2445,7 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:249
+#: server/commands.c:276
msgid ""
"hard\n"
"hard <player-name>"
@@ -2447,11 +2453,11 @@ msgstr ""
"hard\n"
"hard <ì‚¬ìš©ìž ì´ë¦„>"
-#: server/commands.c:251
+#: server/commands.c:278
msgid "Set one or all AI players to 'hard'."
msgstr "하나 ë˜ëŠ” ëª¨ë“ AI 사용ìžë¥¼ 'ì–´ë ¤ì›€'으로 ì„¤ì •"
-#: server/commands.c:252
+#: server/commands.c:279
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 "
@@ -2459,7 +2465,7 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:258
+#: server/commands.c:286
msgid ""
"experimental\n"
"experimental <player-name>"
@@ -2467,11 +2473,11 @@ msgstr ""
"experimental\n"
"experimental <ì‚¬ìš©ìž ì´ë¦„>"
-#: server/commands.c:260
+#: server/commands.c:288
msgid "Set one or all AI players to 'experimental'."
msgstr "하나 ë˜ëŠ” ëª¨ë“ AI 사용ìžë¥¼ '실험ì '으로 ì„¤ì •"
-#: server/commands.c:261
+#: server/commands.c:289
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 "
@@ -2480,7 +2486,7 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:269
+#: server/commands.c:298
msgid ""
"cmdlevel\n"
"cmdlevel <level>\n"
@@ -2494,17 +2500,19 @@ msgstr ""
"cmdlevel <ë ˆë²¨> first\n"
"cmdlevel <ë ˆë²¨> <ì ‘ì† ì´ë¦„>"
-#: server/commands.c:274
+#: server/commands.c:303
msgid "Query or set command access level access."
msgstr ""
-#: server/commands.c:275
+#: server/commands.c:304
msgid ""
"The command access level controls which server commands are available\n"
"to users via the client chatline. The available levels are:\n"
" none - no commands\n"
-" info - informational commands only\n"
+" info - informational or observer commands only\n"
+" basic - commands available to players in the game\n"
" ctrl - commands that affect the game and users\n"
+" admin - commands that affect server operation\n"
" hack - *all* commands - dangerous!\n"
"With no arguments, the current command access levels are reported.\n"
"With a single argument, the level is set for all existing connections,\n"
@@ -2520,20 +2528,20 @@ msgid ""
"now takes connection names, not player names."
msgstr ""
-#: server/commands.c:296
+#: server/commands.c:328
msgid "If there is none, become the game organizer with increased permissions."
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:301
+#: server/commands.c:334
msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
msgstr ""
-#: server/commands.c:302
+#: server/commands.c:335
msgid "See \"help timeoutincrease\"."
msgstr ""
-#: server/commands.c:303
+#: server/commands.c:336
msgid ""
"Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
"<turn> and multiply <value> by <valuemult>. Use this command in concert "
@@ -2541,46 +2549,65 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:309
+#: server/commands.c:343
+msgid ""
+"cancelvote\n"
+"cancelvote <vote number>\n"
+"cancelvote all\n"
+msgstr ""
+
+#: server/commands.c:346
+msgid "Cancel a running vote.\n"
+msgstr ""
+
+#: server/commands.c:347
+msgid ""
+"With no arguments this command removes your own vote. If you have an admin "
+"access level, you can cancel any vote by vote number, or all votes with the "
+"'all' argument."
+msgstr ""
+
+#. TRANS: translate text between <> only
+#: server/commands.c:354
msgid "endgame"
msgstr "endgame"
-#: server/commands.c:310
+#: server/commands.c:355
msgid "End the game immediately in a draw."
msgstr "즉시 비기는 것으로 게임ë냄"
#. TRANS: translate text between <> only
-#: server/commands.c:314
+#: server/commands.c:360
msgid "surrender"
msgstr "surrender"
-#: server/commands.c:315
+#: server/commands.c:361
msgid "Concede the game."
msgstr "패배ì¸ì •"
-#: server/commands.c:316
+#: server/commands.c:362
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:322
+#: server/commands.c:369
msgid "remove <player-name>"
msgstr "remove <ì‚¬ìš©ìž ì´ë¦„>"
-#: server/commands.c:323
+#: server/commands.c:370
msgid "Fully remove player from game."
msgstr ""
-#: server/commands.c:324
+#: server/commands.c:371
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:329
+#: server/commands.c:377
msgid ""
"save\n"
"save <file-name>"
@@ -2588,11 +2615,11 @@ msgstr ""
"save\n"
"save <파ì¼ëª…>"
-#: server/commands.c:331
+#: server/commands.c:379
msgid "Save game to file."
msgstr ""
-#: server/commands.c:332
+#: server/commands.c:380
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"
@@ -2603,7 +2630,7 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:341
+#: server/commands.c:390
msgid ""
"load\n"
"load <file-name>"
@@ -2611,127 +2638,127 @@ msgstr ""
"load\n"
"load <파ì¼ëª…>"
-#: server/commands.c:343
+#: server/commands.c:392
msgid "Load game from file."
msgstr ""
-#: server/commands.c:344
+#: server/commands.c:393
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:349
+#: server/commands.c:399
msgid "read <file-name>"
msgstr "read <파ì¼ëª…>"
-#: server/commands.c:350
+#: server/commands.c:400
msgid "Process server commands from file."
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:354
+#: server/commands.c:405
msgid "write <file-name>"
msgstr "write <파ì¼ëª…>"
-#: server/commands.c:355
+#: server/commands.c:406
msgid "Write current settings as server commands to file."
msgstr ""
-#: server/commands.c:359
+#: server/commands.c:411
msgid "Switch server output between 'RFC-style' and normal style."
msgstr ""
-#: server/commands.c:363
+#: server/commands.c:416
msgid "Simply returns the id of the server."
msgstr ""
-#: server/connecthand.c:85
+#: server/connecthand.c:109
#, c-format
msgid "Welcome to the %s Server running at %s port %d."
msgstr "%s ì„œë²„ì— ì˜¤ì‹ ê²ƒì„ í™˜ì˜í•©ë‹ˆë‹¤ (%s í¬íŠ¸ %d)"
-#: server/connecthand.c:89
+#: server/connecthand.c:113
#, c-format
msgid "Welcome to the %s Server at port %d."
msgstr "서버 %sì˜ %d í¬íŠ¸ì— ì˜¤ì‹ ê²ƒì„ í™˜ì˜í•©ë‹ˆë‹¤"
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:97
+#: server/connecthand.c:121
#, c-format
msgid "(%d) %s: connected [%s]"
msgstr "(%d) %s: 연결했습니다 [%s]"
-#: server/connecthand.c:104
+#: server/connecthand.c:128
#, c-format
msgid "Server: %s has connected from %s."
msgstr "서버 : %s는 %s로부터 ì ‘ì†ë˜ì—ˆìŠµë‹ˆë‹¤"
-#: server/connecthand.c:145
+#: server/connecthand.c:175
msgid "Couldn't attach your connection to new player."
msgstr ""
-#: server/connecthand.c:165
+#: server/connecthand.c:199
#, c-format
msgid "You are logged in as '%s' connected to no player."
msgstr ""
-#: server/connecthand.c:169
+#: server/connecthand.c:203
#, c-format
msgid "You are logged in as '%s' connected to an anonymous player."
msgstr ""
-#: server/connecthand.c:174
+#: server/connecthand.c:208
#, c-format
msgid "You are logged in as '%s' connected to %s."
msgstr ""
-#: server/connecthand.c:187
+#: server/connecthand.c:221
#, c-format
msgid "Turn-blocking game play: waiting on %s to finish turn..."
msgstr ""
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:240
+#: server/connecthand.c:274
#, c-format
msgid "(%d) %s: connection request [%s]"
msgstr ""
-#: server/connecthand.c:266
+#: server/connecthand.c:300
msgid "The client is missing a capability that this server needs."
msgstr ""
-#: server/connecthand.c:268 server/connecthand.c:279
+#: server/connecthand.c:302 server/connecthand.c:313
#, c-format
msgid "(%d) %s rejected: mismatched capabilities!"
msgstr ""
-#: server/connecthand.c:277
+#: server/connecthand.c:311
msgid "This server is missing a capability that the client needs."
msgstr ""
-#: server/connecthand.c:290
+#: server/connecthand.c:324
msgid "The username is invalid!"
msgstr "ìœ íš¨í•œ ì‚¬ìš©ìž ì´ë¦„ì´ ì•„ë‹™ë‹ˆë‹¤"
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:292
+#: server/connecthand.c:326
#, c-format
msgid "(%d) %s rejected: invalid username [%s]"
msgstr ""
-#: server/connecthand.c:303
+#: server/connecthand.c:337
msgid "Your username is already connected!"
msgstr ""
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:305
+#: server/connecthand.c:339
#, c-format
msgid "(%d) %s rejected: duplicate username [%s]"
msgstr ""
-#: server/connecthand.c:335 server/connecthand.c:344
+#: server/connecthand.c:369 server/connecthand.c:378
#, c-format
msgid "Lost connection: %s."
msgstr "ì ‘ì† ëŠê¹€: %s"
@@ -2748,110 +2775,110 @@ msgstr ""
msgid "For introductory help, type 'help'."
msgstr "ë„움ë§ì„ 보기 ìœ„í•´ì„ , 'help'ë¼ê³ ìž…ë ¥í•˜ì„¸ìš”"
-#: server/diplhand.c:164
+#: server/diplhand.c:167
#, c-format
msgid "The %s can't accept %s."
msgstr "%s는 %s를 수ë½í• 수 없습니다"
-#: server/diplhand.c:176
+#: server/diplhand.c:179
#, c-format
msgid "You don't have tech %s, you can't accept treaty."
msgstr ""
-#: server/diplhand.c:185
+#: server/diplhand.c:188
msgid "City you are trying to give no longer exists, you can't accept treaty."
msgstr ""
-#: server/diplhand.c:191
+#: server/diplhand.c:194
#, c-format
msgid "You are not owner of %s, you can't accept treaty."
msgstr ""
-#: server/diplhand.c:197 server/diplhand.c:301
+#: server/diplhand.c:200 server/diplhand.c:304
#, c-format
msgid "Your capital (%s) is requested, you can't accept treaty."
msgstr ""
-#: server/diplhand.c:224
+#: server/diplhand.c:227
msgid "You don't have enough gold, you can't accept treaty."
msgstr "충분한 ê¸ˆì´ ì—†ìœ¼ë¯€ë¡œ ì¡°ì•½ì„ ë°›ì•„ë“¤ì¼ ìˆ˜ 없습니다"
-#: server/diplhand.c:256 server/diplhand.c:261
+#: server/diplhand.c:259 server/diplhand.c:264
#, c-format
msgid "A treaty containing %d clause was agreed upon."
msgid_plural "A treaty containing %d clauses was agreed upon."
msgstr[0] ""
msgstr[1] ""
-#: server/diplhand.c:277 server/diplhand.c:281
+#: server/diplhand.c:280 server/diplhand.c:284
#, c-format
msgid "One of the cities the %s are giving away is destroyed! Treaty canceled!"
msgstr ""
-#: server/diplhand.c:288 server/diplhand.c:293
+#: server/diplhand.c:291 server/diplhand.c:296
#, c-format
msgid "The %s no longer control %s! Treaty canceled!"
msgstr ""
-#: server/diplhand.c:331 server/diplhand.c:335
+#: server/diplhand.c:334 server/diplhand.c:338
#, c-format
msgid "The %s don't have the promised amount of gold! Treaty canceled!"
msgstr ""
-#: server/diplhand.c:364
+#: server/diplhand.c:367
#, c-format
msgid "You gave an embassy to %s."
msgstr "ë‹¹ì‹ ì€ %sì— ì‚¬ì ˆë‹¨ì„ ì£¼ì—ˆìŠµë‹ˆë‹¤"
-#: server/diplhand.c:367
+#: server/diplhand.c:370
#, c-format
msgid "%s allowed you to create an embassy!"
msgstr ""
-#: server/diplhand.c:383
+#: server/diplhand.c:386
#, c-format
msgid "You are taught the knowledge of %s."
msgstr ""
-#: server/diplhand.c:387
+#: server/diplhand.c:390
#, c-format
msgid "The %s have acquired %s from the %s."
msgstr ""
-#: server/diplhand.c:402
+#: server/diplhand.c:405
#, c-format
msgid "You get %d gold."
msgstr "%dì˜ ê¸ˆì„ ì–»ì—ˆìŠµë‹ˆë‹¤"
#. TRANS: ... Polish worldmap.
-#: server/diplhand.c:410
+#: server/diplhand.c:413
#, c-format
msgid "You receive the %s worldmap."
msgstr ""
#. TRANS: ... Polish seamap.
-#: server/diplhand.c:419
+#: server/diplhand.c:422
#, c-format
msgid "You receive the %s seamap."
msgstr ""
-#: server/diplhand.c:436
+#: server/diplhand.c:439
#, c-format
msgid "You receive city of %s from %s."
msgstr ""
-#: server/diplhand.c:441
+#: server/diplhand.c:444
#, c-format
msgid "You give city of %s to %s."
msgstr ""
-#: server/diplhand.c:454 server/diplhand.c:457
+#: server/diplhand.c:457 server/diplhand.c:460
#, c-format
msgid "You agree on a cease-fire with %s."
msgstr ""
#. TRANS: ... the Poles ... Polish territory.
-#: server/diplhand.c:476 server/diplhand.c:488
+#: server/diplhand.c:479 server/diplhand.c:491
#, c-format
msgid ""
"You agree on an armistice with the %s. In %d turn, it will become a peace "
@@ -2862,32 +2889,32 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: server/diplhand.c:512 server/diplhand.c:515
+#: server/diplhand.c:515 server/diplhand.c:518
#, c-format
msgid "You agree on an alliance with %s."
msgstr ""
-#: server/diplhand.c:524
+#: server/diplhand.c:527
#, c-format
msgid "You give shared vision to %s."
msgstr ""
-#: server/diplhand.c:527
+#: server/diplhand.c:530
#, c-format
msgid "%s gives you shared vision."
msgstr "%s ê°€(ì´) 시야를 ì œê³µí–ˆìŠµë‹ˆë‹¤"
-#: server/diplhand.c:663
+#: server/diplhand.c:666
#, c-format
msgid "%s canceled the meeting!"
msgstr ""
-#: server/diplhand.c:670
+#: server/diplhand.c:673
#, c-format
msgid "Meeting with %s canceled."
msgstr "%sì™€ì˜ ëª¨ìž„ì´ ì·¨ì†Œë˜ì—ˆìŠµë‹ˆë‹¤"
-#: server/diplhand.c:712
+#: server/diplhand.c:715
msgid "Your diplomatic envoy was decapitated!"
msgstr ""
@@ -3070,80 +3097,80 @@ msgid "The %s destroyed the %s in %s."
msgstr ""
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1091
+#: server/diplomats.c:1097
#, c-format
msgid "An enemy %s has been eliminated by your %s."
msgstr ""
#. TRANS: <unit> ... <city> ... <diplomat>
-#: server/diplomats.c:1098
+#: server/diplomats.c:1104
#, c-format
msgid "Your %s has been eliminated defending %s against a %s."
msgstr ""
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1106
+#: server/diplomats.c:1112
#, c-format
msgid "Your %s has been eliminated defending against a %s."
msgstr ""
-#: server/diplomats.c:1119
+#: server/diplomats.c:1125
#, c-format
msgid "Your %s was eliminated by a defending %s."
msgstr ""
-#: server/diplomats.c:1127
+#: server/diplomats.c:1133
#, c-format
msgid "Eliminated %s %s while infiltrating %s."
msgstr ""
-#: server/diplomats.c:1134
+#: server/diplomats.c:1140
#, c-format
msgid "Eliminated %s %s while infiltrating our troops."
msgstr ""
-#: server/diplomats.c:1185
+#: server/diplomats.c:1191
#, c-format
msgid ""
"Your %s has successfully completed the mission and returned unharmed to %s."
msgstr ""
-#: server/diplomats.c:1204
+#: server/diplomats.c:1210
#, c-format
msgid "Your %s was captured after completing the mission in %s."
msgstr ""
-#: server/diplomats.c:1210
+#: server/diplomats.c:1216
#, c-format
msgid "Your %s was captured after completing the mission."
msgstr ""
-#: server/diplomats.c:1242
+#: server/diplomats.c:1248
#, c-format
msgid "You have caused an incident while bribing the %s %s."
msgstr ""
-#: server/diplomats.c:1247
+#: server/diplomats.c:1253
#, c-format
msgid "%s has caused an incident while bribing your %s."
msgstr ""
-#: server/diplomats.c:1254
+#: server/diplomats.c:1260
#, c-format
msgid "You have caused an incident while attempting to steal tech from %s."
msgstr ""
-#: server/diplomats.c:1258
+#: server/diplomats.c:1264
#, c-format
msgid "%s has caused an incident while attempting to steal tech from you."
msgstr ""
-#: server/diplomats.c:1264
+#: server/diplomats.c:1270
#, c-format
msgid "You have caused an incident while inciting a revolt in %s."
msgstr ""
-#: server/diplomats.c:1268
+#: server/diplomats.c:1274
#, c-format
msgid "%s have caused an incident while inciting a revolt in %s."
msgstr ""
@@ -3250,12 +3277,12 @@ msgid ""
" Workers spontaneously gather and upgrade all cities with railroads."
msgstr ""
-#: server/maphand.c:1418
+#: server/maphand.c:1425
#, c-format
msgid "Moved your %s due to changing terrain."
msgstr ""
-#: server/maphand.c:1436
+#: server/maphand.c:1443
#, c-format
msgid "Disbanded your %s due to changing terrain."
msgstr ""
@@ -3264,7 +3291,7 @@ msgstr ""
msgid "Not reporting to the metaserver in this game."
msgstr ""
-#: server/meta.c:430
+#: server/meta.c:432
#, c-format
msgid "Metaserver: bad address: [%s:%d]."
msgstr ""
@@ -3379,54 +3406,54 @@ msgid ""
"with %s."
msgstr ""
-#: server/plrhand.c:1103
+#: server/plrhand.c:1115
#, c-format
msgid "Removing player %s."
msgstr " %sí”Œë ˆì´ì–´ 없앰"
-#: server/plrhand.c:1105
+#: server/plrhand.c:1117
msgid "You've been removed from the game!"
msgstr "ë‹¹ì‹ ì€ ê²Œìž„ìœ¼ë¡œ 부터 ì œê±° ë˜ì—ˆìŠµë‹ˆë‹¤"
-#: server/plrhand.c:1108
+#: server/plrhand.c:1120
#, c-format
msgid "%s has been removed from the game."
msgstr ""
-#: server/plrhand.c:1153 server/plrhand.c:1158
+#: server/plrhand.c:1167 server/plrhand.c:1172
#, c-format
msgid "You have made contact with the %s, ruled by %s."
msgstr ""
-#: server/plrhand.c:1178
+#: server/plrhand.c:1192
#, c-format
msgid ""
"%s and %s meet and go to instant war. You cancel your alliance with both."
msgstr ""
-#: server/plrhand.c:1656
+#: server/plrhand.c:1670
#, c-format
msgid "Could not throw %s into civil war - too many players"
msgstr ""
-#: server/plrhand.c:1663
+#: server/plrhand.c:1677
#, c-format
msgid "Could not throw %s into civil war - no available nations"
msgstr ""
-#: server/plrhand.c:1686
+#: server/plrhand.c:1700
#, c-format
msgid ""
"Your nation is thrust into civil war! %s is declared the leader of the rebel "
"states."
msgstr ""
-#: server/plrhand.c:1707
+#: server/plrhand.c:1721
#, c-format
msgid "%s declares allegiance to %s."
msgstr ""
-#: server/plrhand.c:1722
+#: server/plrhand.c:1736
#, c-format
msgid ""
"Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3615,65 +3642,65 @@ msgstr ""
msgid "Wonders of the World"
msgstr "세계 불가사ì˜"
-#: server/report.c:547
+#: server/report.c:552
msgid " sq. mi."
msgstr "ì œê³± 마ì¼"
-#: server/report.c:557
+#: server/report.c:562
msgid " M tons"
msgstr "백만 톤"
-#: server/report.c:562
+#: server/report.c:567
msgid " M goods"
msgstr "백만 ìƒí’ˆ"
-#: server/report.c:567
+#: server/report.c:572
msgid " bulbs"
msgstr "ì „êµ¬"
-#: server/report.c:572
+#: server/report.c:577
msgid " month"
msgid_plural " months"
msgstr[0] "개월"
msgstr[1] "개월"
-#: server/report.c:577
+#: server/report.c:582
msgid " ton"
msgid_plural " tons"
msgstr[0] "톤"
msgstr[1] "톤"
-#: server/report.c:591
+#: server/report.c:596
msgid "st"
msgstr "번"
-#: server/report.c:593
+#: server/report.c:598
msgid "nd"
msgstr "번"
-#: server/report.c:595
+#: server/report.c:600
msgid "rd"
msgstr "번"
-#: server/report.c:597
+#: server/report.c:602
msgid "th"
msgstr "번"
-#: server/report.c:700
+#: server/report.c:705
msgid "Demography string contains invalid characters. Try \"help demography\"."
msgstr ""
-#: server/report.c:743 server/report.c:768
+#: server/report.c:748 server/report.c:773
msgid "Demographics Report:"
msgstr "ì¸êµ¬ 통계 ë³´ê³ ì„œ:"
-#: server/report.c:744
+#: server/report.c:749
msgid "Sorry, the Demographics report is unavailable."
msgstr ""
#. TRANS: <nation adjective> <government name> (<year>).
#. * E.g. "Polish Despotism (200 AD)".
-#: server/report.c:750
+#: server/report.c:755
#, c-format
msgid "%s %s (%s)"
msgstr "%sì˜ %s êµê°€ (%s)"
@@ -3684,11 +3711,11 @@ msgstr "%sì˜ %s êµê°€ (%s)"
msgid "Could not find a readable \"%s.%s\" ruleset file."
msgstr "ì½ì„ 수 있는 \"%s.%s\" 룰세트 파ì¼ì„ 못 찾았습니다"
-#: server/ruleset.c:2356
+#: server/ruleset.c:2366
msgid "No barbarian nation in rulesets, at least one required!"
msgstr ""
-#: server/ruleset.c:3166
+#: server/ruleset.c:3178
msgid "Loading rulesets"
msgstr "룰세트를 ì½ëŠ” 중"
@@ -3700,17 +3727,17 @@ msgid ""
"risk."
msgstr ""
-#: server/savegame.c:3588
+#: server/savegame.c:3587
msgid "Saved game is too old, at least version 1.9.0 required."
msgstr ""
#. TRANS: Fatal error message.
-#: server/savegame.c:3815
+#: server/savegame.c:3817
msgid ""
"Saved game uses the \"classic\" terrain ruleset, and is no longer supported."
msgstr ""
-#: server/savegame.c:3824
+#: server/savegame.c:3826
#, c-format
msgid ""
"Warning: Different rulesetdirs ('%s' and '%s') are no longer supported. "
@@ -3718,7 +3745,7 @@ msgid ""
msgstr ""
#. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4051
+#: server/savegame.c:4055
#, c-format
msgid "%s had invalid nation; changing to %s."
msgstr ""
@@ -3751,7 +3778,7 @@ msgstr "내부"
msgid "Networking"
msgstr "네트워킹"
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:734
#: client/gui-win32/dialogs.c:532
msgid "All"
msgstr "모ë‘"
@@ -4671,11 +4698,11 @@ msgid ""
"the game."
msgstr ""
-#: server/sernet.c:150
+#: server/sernet.c:151
msgid "Server cannot read standard input. Ignoring input."
msgstr ""
-#: server/sernet.c:929
+#: server/sernet.c:933
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr ""
@@ -4748,820 +4775,873 @@ msgstr ""
msgid "Without guidance from the capital, the %s spaceship is lost!"
msgstr ""
-#: server/srv_main.c:240
+#: server/srv_main.c:242
msgid "Game ended in a draw as end year exceeded"
msgstr ""
-#: server/srv_main.c:274
+#: server/srv_main.c:276
#, c-format
msgid "The %s spaceship has arrived at Alpha Centauri."
msgstr ""
-#: server/srv_main.c:287 server/srv_main.c:322
+#: server/srv_main.c:289 server/srv_main.c:324
#, c-format
msgid "Team victory to %s"
msgstr "%sì´(ê°€) 팀승리함"
-#: server/srv_main.c:297 server/srv_main.c:338
+#: server/srv_main.c:299 server/srv_main.c:340
#, c-format
msgid "Game ended in victory for %s"
msgstr "%sê°€(ì´) 승리함으로 ê²Œìž„ì´ ë났습니다"
-#: server/srv_main.c:345
+#: server/srv_main.c:347
msgid "Game ended in a draw"
msgstr "ê²Œìž„ì´ ë¹„ê¹€ìœ¼ë¡œ ë났습니다"
-#: server/srv_main.c:461 server/srv_main.c:472
+#: server/srv_main.c:465 server/srv_main.c:476
#, c-format
msgid "Your %s was disbanded in accordance with your peace treaty with the %s."
msgstr ""
-#: server/srv_main.c:512 server/srv_main.c:516
+#: server/srv_main.c:516 server/srv_main.c:520
#, c-format
msgid ""
"Concerned citizens point out that the cease-fire with %s will run out soon."
msgstr ""
-#: server/srv_main.c:521 server/srv_main.c:525
+#: server/srv_main.c:525 server/srv_main.c:529
#, c-format
msgid "The cease-fire with %s has run out. You are now at war with the %s."
msgstr ""
-#: server/srv_main.c:542
+#: server/srv_main.c:546
#, c-format
msgid ""
"Ceasefire between %s and %s has run out. They are at war. You cancel your "
"alliance with both."
msgstr ""
-#: server/srv_main.c:961
+#: server/srv_main.c:997
#, c-format
msgid "Failed saving game as %s"
msgstr "%s ë¡œ ê²Œìž„ì €ìž¥ 실패"
-#: server/srv_main.c:963
+#: server/srv_main.c:999
#, c-format
msgid "Game saved as %s"
msgstr ""
-#: server/srv_main.c:994
+#: server/srv_main.c:1030
msgid "The game is already running."
msgstr "ê²Œìž„ì€ ì´ë¯¸ 진행중입니다."
-#: server/srv_main.c:1002
+#: server/srv_main.c:1038
#, c-format
msgid "%s lost control cmdlevel on game start. Use voting from now on."
msgstr ""
-#: server/srv_main.c:1009
+#: server/srv_main.c:1045
msgid "Starting game."
msgstr "게임 시작"
-#: server/srv_main.c:1071
+#: server/srv_main.c:1112
#, c-format
msgid "request for unknown report (type %d)"
msgstr ""
-#: server/srv_main.c:1136
+#: server/srv_main.c:1177
#, c-format
msgid "Warning: rejecting old client %s"
msgstr "ê²½ê³ : ì˜¤ëž˜ëœ í´ë¼ì´ì–¸íŠ¸ %s ê°€(ì´) 거부ë¨"
-#: server/srv_main.c:1238
+#: server/srv_main.c:1279
#, c-format
msgid "Got a packet of type %d from a dead or observer player"
msgstr ""
-#: server/srv_main.c:1338
+#: server/srv_main.c:1381
msgid "Please choose a non-blank name."
msgstr ""
-#: server/srv_main.c:1354
+#: server/srv_main.c:1397
msgid "That nation is already in use."
msgstr "ê·¸ êµê°€ëŠ” ì´ë¯¸ 사용ë˜ê³ 있습니다."
-#: server/srv_main.c:1370
+#: server/srv_main.c:1413
#, c-format
msgid "Another player already has the name '%s'. Please choose another name."
msgstr "ë˜ë‹¤ë¥¸ í”Œë ˆì´ì–´ê°€ ì´ë¯¸ %s ì´ë¦„ì„ ê°–ê³ ìžˆìŠµë‹ˆë‹¤. 다른 ì´ë¦„ì„ ì‚¬ìš©í•˜ì„¸ìš”"
-#: server/srv_main.c:1391
+#: server/srv_main.c:1434
msgid "Please choose a name containing only ASCII characters."
msgstr ""
-#: server/srv_main.c:1490
+#: server/srv_main.c:1533
#, c-format
msgid "%s nation is not available in this scenario."
msgstr "%s ì´ë¦„ì˜ ë‚˜ë¼ëŠ” ì´ ì‹œë‚˜ë¦¬ì˜¤ì—ì„œ 가능하지 않습니다"
-#: server/srv_main.c:1496
+#: server/srv_main.c:1539
#, c-format
msgid "%s nation is already in use."
msgstr ""
-#: server/srv_main.c:1514
+#: server/srv_main.c:1557
#, c-format
msgid "%s is the %s ruler %s."
msgstr "%s(ì€)는 %sì˜ í†µì¹˜ìž %s입니다."
-#: server/srv_main.c:1570
+#: server/srv_main.c:1613
#, c-format
msgid "Waiting to start game: %d out of %d players are ready to start."
msgstr "ê²Œìž„ì‹œìž‘ì„ ê¸°ë‹¤ë¦½ë‹ˆë‹¤: (%d 명 ì´ %d 명중) ì´ ì´ë¯¸ 시작하였습니다"
-#: server/srv_main.c:1614 server/srv_main.c:1618
+#: server/srv_main.c:1657 server/srv_main.c:1661
#, c-format
msgid "%s has been added as %s level AI-controlled player."
msgstr ""
-#: server/srv_main.c:1760
+#: server/srv_main.c:1803
#, c-format
msgid "Player %d"
msgstr "ì‚¬ìš©ìž %d"
-#: server/srv_main.c:1771 server/srv_main.c:1777
+#: server/srv_main.c:1814 server/srv_main.c:1820
#, c-format
msgid "%s rules the %s."
msgstr "%s(ì€)는 %s(ì„)를 통치합니다."
-#: server/srv_main.c:1942
+#: server/srv_main.c:1985
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
msgstr ""
-#: server/srv_main.c:1993
+#: server/srv_main.c:2037
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr ""
-#: server/srv_main.c:2024
+#: server/srv_main.c:2069
msgid "The game is over..."
msgstr "ê²Œìž„ì´ ë났습니다..."
-#: server/srv_main.c:2237
+#: server/srv_main.c:2286
msgid "Now accepting new client connections."
msgstr ""
-#: server/stdinhand.c:246
-#, c-format
-msgid "Vote \"%s\" is passed %d to %d with %d abstentions."
-msgstr ""
-
-#: server/stdinhand.c:253
-#, c-format
-msgid "Vote \"%s\" failed with %d against, %d for and %d abstentions."
-msgstr ""
-
#. TRANS: ambiguous command
-#: server/stdinhand.c:365
+#: server/stdinhand.c:284
msgid "(ambiguous)"
msgstr ""
#. TRANS: unrecognized command
#. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:416
+#: server/stdinhand.c:287 client/citydlg_common.c:419
#: 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 ""
-#: server/stdinhand.c:458
+#: server/stdinhand.c:377
msgid "Name is empty, so cannot be a player."
msgstr "ì´ë¦„ì´ ë¹„ì–´ìžˆìŠµë‹ˆë‹¤, ë”°ë¼ì„œ í”Œë ˆì´ì–´ê°€ ë 수 없습니다"
-#: server/stdinhand.c:462
+#: server/stdinhand.c:381
msgid "Name is too long, so cannot be a player."
msgstr "ì´ë¦„ì´ ë„ˆë¬´ ê¹ë‹ˆë‹¤, ë”°ë¼ì„œ í”Œë ˆì´ì–´ê°€ ë 수 없습니다"
-#: server/stdinhand.c:466
+#: server/stdinhand.c:385
#, c-format
msgid "Player name prefix '%s' is ambiguous."
msgstr ""
-#: server/stdinhand.c:470
+#: server/stdinhand.c:389
#, c-format
msgid "No player by the name of '%s'."
msgstr ""
-#: server/stdinhand.c:474 server/stdinhand.c:509
+#: server/stdinhand.c:393 server/stdinhand.c:428
#, c-format
msgid "Unexpected match_result %d (%s) for '%s'."
msgstr ""
-#: server/stdinhand.c:493
+#: server/stdinhand.c:412
msgid "Name is empty, so cannot be a connection."
msgstr "ì´ë¦„ì´ ë¹„ì–´ìžˆì–´ì„œ ì ‘ì†í• 수 없습니다"
-#: server/stdinhand.c:497
+#: server/stdinhand.c:416
msgid "Name is too long, so cannot be a connection."
msgstr "ì´ë¦„ì´ ë„ˆë¬´ 길어서 ì ‘ì†í• 수 없습니다"
-#: server/stdinhand.c:501
+#: server/stdinhand.c:420
#, c-format
msgid "Connection name prefix '%s' is ambiguous."
msgstr ""
-#: server/stdinhand.c:505
+#: server/stdinhand.c:424
#, c-format
msgid "No connection by the name of '%s'."
msgstr ""
-#: server/stdinhand.c:525
+#: server/stdinhand.c:444
#, c-format
msgid "Open metaserver connection to [%s]."
msgstr ""
-#: server/stdinhand.c:538
+#: server/stdinhand.c:457
#, c-format
msgid "Close metaserver connection to [%s]."
msgstr ""
-#: server/stdinhand.c:553
+#: server/stdinhand.c:472
msgid "Metaserver connection is open."
msgstr ""
-#: server/stdinhand.c:556
+#: server/stdinhand.c:475
msgid "Metaserver connection is closed."
msgstr ""
-#: server/stdinhand.c:566
+#: server/stdinhand.c:485
msgid "Metaserver connection is already open."
msgstr ""
-#: server/stdinhand.c:577
+#: server/stdinhand.c:496
msgid "Metaserver connection is already closed."
msgstr ""
-#: server/stdinhand.c:582
+#: server/stdinhand.c:501
msgid "Argument must be 'u', 'up', 'd', 'down', or '?'."
msgstr ""
-#: server/stdinhand.c:603
+#: server/stdinhand.c:522
#, c-format
msgid "Metaserver patches string set to '%s'."
msgstr ""
-#: server/stdinhand.c:606
+#: server/stdinhand.c:525
#, c-format
msgid "Metaserver patches string set to '%s', not reporting to metaserver."
msgstr ""
-#: server/stdinhand.c:627
+#: server/stdinhand.c:546
#, c-format
msgid "Metaserver message string set to '%s'."
msgstr ""
-#: server/stdinhand.c:630
+#: server/stdinhand.c:549
#, c-format
msgid "Metaserver message string set to '%s', not reporting to metaserver."
msgstr ""
-#: server/stdinhand.c:650
+#: server/stdinhand.c:569
#, c-format
msgid "Metaserver is now [%s]."
msgstr ""
-#: server/stdinhand.c:660
+#: server/stdinhand.c:579
#, c-format
msgid "Server id: %s"
msgstr ""
-#: server/stdinhand.c:757
+#: server/stdinhand.c:676
msgid "You cannot save games manually on this server."
msgstr ""
-#: server/stdinhand.c:774
+#: server/stdinhand.c:693
msgid "Cannot toggle a barbarian player."
msgstr ""
-#: server/stdinhand.c:781
+#: server/stdinhand.c:700
#, c-format
msgid "%s is now under AI control."
msgstr ""
-#: server/stdinhand.c:802
+#: server/stdinhand.c:721
#, c-format
msgid "%s is now under human control."
msgstr ""
-#: server/stdinhand.c:847
+#: server/stdinhand.c:766
msgid "Can't add AI players once the game has begun."
msgstr ""
-#: server/stdinhand.c:867
+#: server/stdinhand.c:786
msgid "Can't add more players, server is full."
msgstr ""
-#: server/stdinhand.c:874
+#: server/stdinhand.c:793
msgid "Can't use an empty name."
msgstr ""
-#: server/stdinhand.c:881
+#: server/stdinhand.c:800
#, c-format
msgid "That name exceeds the maximum of %d chars."
msgstr ""
-#: server/stdinhand.c:887
+#: server/stdinhand.c:806
msgid "That name is not allowed."
msgstr "ê·¸ ì´ë¦„ì€ í—ˆìš©ë˜ì§€ 않습니다"
-#: server/stdinhand.c:893
+#: server/stdinhand.c:812
msgid "A player already exists by that name."
msgstr "ê·¸ ì´ë¦„ì˜ í”Œë ˆì´ì–´ëŠ” ì´ë¯¸ 존재합니다"
-#: server/stdinhand.c:899
+#: server/stdinhand.c:818
msgid "A user already exists by that name."
msgstr "ê·¸ ì´ë¦„ì˜ ì‚¬ìš©ìžê°€ ì´ë¯¸ 존재합니다"
-#: server/stdinhand.c:925
+#: server/stdinhand.c:844
#, c-format
msgid "%s has been added as an AI-controlled player."
msgstr ""
-#: server/stdinhand.c:932
+#: server/stdinhand.c:851
#, c-format
msgid "Error creating new AI player: %s."
msgstr "AI í”Œë ˆì´ì–´ë¥¼ ìƒì„±í•˜ëŠ”ë° ì—ëŸ¬ë°œìƒ : %s"
-#: server/stdinhand.c:966
+#: server/stdinhand.c:885
msgid "Players cannot be removed once the game has started."
msgstr ""
-#: server/stdinhand.c:977
+#: server/stdinhand.c:896
#, c-format
msgid "Removed player %s from the game."
msgstr ""
-#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
+#: server/stdinhand.c:935 server/stdinhand.c:3372 server/stdinhand.c:3507
#, c-format
msgid "Name \"%s\" disallowed for security reasons."
msgstr ""
-#: server/stdinhand.c:1029
+#: server/stdinhand.c:948
#, c-format
msgid "No command script found by the name \"%s\"."
msgstr ""
-#: server/stdinhand.c:1037
+#: server/stdinhand.c:956
#, c-format
msgid "Loading script file: %s"
msgstr "스í¬ë¦½íŠ¸ 파ì¼ì„ 로딩중 : %s"
-#: server/stdinhand.c:1052
+#: server/stdinhand.c:971
#, c-format
msgid "Cannot read command line scriptfile '%s'."
msgstr ""
-#: server/stdinhand.c:1054
+#: server/stdinhand.c:973
#, c-format
msgid "Could not read script file '%s'."
msgstr "스í¬ë¦½íŠ¸ íŒŒì¼ '%s' ì„ ì½ìˆ ㅜ없습니다"
-#: server/stdinhand.c:1146
+#: server/stdinhand.c:1065
#, c-format
msgid "Could not write script file '%s'."
msgstr ""
-#: server/stdinhand.c:1158
+#: server/stdinhand.c:1077
msgid "You cannot use the write command on this server for security reasons."
msgstr ""
-#: server/stdinhand.c:1186
+#: server/stdinhand.c:1105
#, c-format
msgid ""
"Cannot decrease command access level '%s' for connection '%s'; you only have "
"'%s'."
msgstr ""
-#: server/stdinhand.c:1241
+#: server/stdinhand.c:1114
+#, c-format
+msgid "Command access level set to '%s' for connection %s."
+msgstr ""
+
+#: server/stdinhand.c:1163
#, c-format
msgid ""
"Anyone can now become game organizer '%s' by issuing the 'first' command."
msgstr ""
-#: server/stdinhand.c:1274
+#: server/stdinhand.c:1187
msgid "Command access levels in effect:"
msgstr ""
-#: server/stdinhand.c:1282
+#: server/stdinhand.c:1194
#, c-format
msgid "Command access level for new connections: %s"
msgstr ""
-#: server/stdinhand.c:1285
+#: server/stdinhand.c:1197
#, c-format
msgid "Command access level for first player to take it: %s"
msgstr ""
-#: server/stdinhand.c:1294
+#: server/stdinhand.c:1206
msgid ""
"Error: command access level must be one of 'none', 'info', 'ctrl', or 'hack'."
msgstr ""
-#: server/stdinhand.c:1299
+#: server/stdinhand.c:1211
#, c-format
msgid ""
"Cannot increase command access level to '%s'; you only have '%s' yourself."
msgstr ""
-#: server/stdinhand.c:1326 server/stdinhand.c:1375
-#, c-format
-msgid "Command access level set to '%s' for connection %s."
-msgstr ""
-
-#: 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:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
+#: server/stdinhand.c:1238 server/stdinhand.c:1252 server/stdinhand.c:1273
#, c-format
msgid "Command access level set to '%s' for new players."
msgstr ""
-#: server/stdinhand.c:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
+#: server/stdinhand.c:1243 server/stdinhand.c:1257 server/stdinhand.c:1267
#, c-format
msgid "Command access level set to '%s' for first player to grab it."
msgstr ""
-#: server/stdinhand.c:1402
+#: server/stdinhand.c:1302
msgid "The 'first' command makes no sense from the server command line."
msgstr ""
-#: server/stdinhand.c:1406
+#: server/stdinhand.c:1306
#, c-format
msgid "You already have command access level '%s' or better."
msgstr ""
-#: server/stdinhand.c:1411
+#: server/stdinhand.c:1311
msgid "Someone else already is game organizer."
msgstr ""
-#: server/stdinhand.c:1416
+#: server/stdinhand.c:1316
#, c-format
msgid "Connection %s has opted to become the game organizer."
msgstr ""
-#: server/stdinhand.c:1467
+#: server/stdinhand.c:1367
#, c-format
msgid "Invalid argument %d."
msgstr "ìœ íš¨í•˜ì§€ ì•Šì€ ì¸ìž %d."
-#: server/stdinhand.c:1474
+#: server/stdinhand.c:1374
msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
msgstr ""
-#: server/stdinhand.c:1482
+#: server/stdinhand.c:1382
#, c-format
msgid "Dynamic timeout set to %d %d %d %d"
msgstr ""
-#: server/stdinhand.c:1542 server/stdinhand.c:1545
+#: server/stdinhand.c:1442 server/stdinhand.c:1445
msgid "Option:"
msgstr "옵션:"
-#: server/stdinhand.c:1555 server/stdinhand.c:4031
+#: server/stdinhand.c:1455 server/stdinhand.c:4079
msgid "Description:"
msgstr "설명:"
-#: server/stdinhand.c:1560
+#: server/stdinhand.c:1460
#, c-format
msgid "Status: %s"
msgstr "ìƒíƒœ: %s"
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "changeable"
msgstr ""
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "fixed"
msgstr ""
-#: server/stdinhand.c:1567
+#: server/stdinhand.c:1467
#, c-format
msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
msgstr ""
-#: server/stdinhand.c:1572
+#: server/stdinhand.c:1472
#, c-format
msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
msgstr ""
-#: server/stdinhand.c:1578
+#: server/stdinhand.c:1478
#, c-format
msgid "Value: \"%s\", Default: \"%s\""
msgstr ""
-#: server/stdinhand.c:1597
+#: server/stdinhand.c:1497
msgid "Explanations are available for the following server options:"
msgstr ""
-#: server/stdinhand.c:1643
+#: server/stdinhand.c:1537
msgid "No explanation for that yet."
msgstr ""
-#: server/stdinhand.c:1646 server/stdinhand.c:2480
+#: server/stdinhand.c:1540 server/stdinhand.c:2468
msgid "Ambiguous option name."
msgstr ""
-#: server/stdinhand.c:1666
+#: server/stdinhand.c:1560
#, c-format
msgid "Server Operator: %s"
msgstr ""
-#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
+#: server/stdinhand.c:1686 server/stdinhand.c:1713 server/stdinhand.c:1731
#, c-format
msgid "Player '%s' now has AI skill level '%s'."
msgstr ""
-#: server/stdinhand.c:1822
+#: server/stdinhand.c:1718
#, c-format
msgid "%s is not controlled by the AI."
msgstr ""
-#: server/stdinhand.c:1842
+#: server/stdinhand.c:1738
#, c-format
msgid "Default AI skill level set to '%s'."
msgstr ""
-#: server/stdinhand.c:1857 server/stdinhand.c:2162
+#: server/stdinhand.c:1753
msgid "This command is client only."
msgstr "ì´ ëª…ë ¹ì€ ì˜¤ì§ í´ë¼ì´ì–¸íŠ¸ì—서만 ë©ë‹ˆë‹¤"
-#: server/stdinhand.c:1860
+#: server/stdinhand.c:1756
msgid "Usage: away"
msgstr "사용법 : away"
-#: server/stdinhand.c:1865
+#: server/stdinhand.c:1761
msgid "Only players may use the away command."
msgstr ""
-#: server/stdinhand.c:1869
+#: server/stdinhand.c:1765
#, c-format
msgid "%s set to away mode."
msgstr "%s(ì€)는 외출중입니다."
-#: server/stdinhand.c:1877
+#: server/stdinhand.c:1772
#, c-format
msgid "%s returned to game."
msgstr "%s(ì€)는 ëŒì•„왔습니다."
-#: server/stdinhand.c:1919
+#: server/stdinhand.c:1817
#, c-format
msgid "Sorry, you do not have access to view option '%s'."
msgstr ""
-#: server/stdinhand.c:1925
+#: server/stdinhand.c:1823
#, c-format
msgid "Unknown option '%s'."
msgstr ""
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1848
msgid "All options with non-default values"
msgstr ""
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1851
msgid "All options"
msgstr "ëª¨ë“ ì˜µì…˜ë“¤"
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1854
msgid "Vital options"
msgstr "중요한 옵션들"
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1857
msgid "Situational options"
msgstr "ìƒí™©ë³„ 옵션"
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1860
msgid "Rarely used options"
msgstr "ê±°ì˜ ì‚¬ìš©ë˜ì§€ 않는 옵션들"
-#: server/stdinhand.c:1965
+#: server/stdinhand.c:1863
msgid "+ means you may change the option"
msgstr ""
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1864
msgid "= means the option is on its default value"
msgstr ""
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
#, c-format
msgid "%-*s value (min,max) "
msgstr ""
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
msgid "Option"
msgstr "옵션"
-#: server/stdinhand.c:1973
+#: server/stdinhand.c:1871
msgid "description"
msgstr "묘사"
-#: server/stdinhand.c:2042
+#: server/stdinhand.c:1940
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:2092
+#: server/stdinhand.c:1966
msgid "Cannot change teams once game has begun."
msgstr ""
-#: server/stdinhand.c:2102
+#: server/stdinhand.c:1976
msgid "Undefined argument. Usage: team <player> <team>."
msgstr ""
-#: server/stdinhand.c:2122
+#: server/stdinhand.c:1996
#, c-format
msgid "No such team %s. Please give a valid team name or number."
msgstr ""
-#: server/stdinhand.c:2129
+#: server/stdinhand.c:2003
msgid "Cannot team a barbarian."
msgstr "미개ì¸ì„ 팀으로 í• ìˆ˜ 없습니다"
-#: server/stdinhand.c:2135
+#: server/stdinhand.c:2009
#, c-format
msgid "Player %s set to team %s."
msgstr ""
-#: server/stdinhand.c:2157
-msgid "Undefined arguments. Usage: vote yes|no [vote number]."
-msgstr ""
+#: server/stdinhand.c:2035 server/voting.c:512
+#, fuzzy
+msgid "Teamvote"
+msgstr "팀"
-#: server/stdinhand.c:2165
-msgid "Observers cannot vote."
-msgstr "관찰ìžëŠ” 투표를 못 합니다."
+#: server/stdinhand.c:2035 server/voting.c:516
+msgid "Vote"
+msgstr ""
-#: server/stdinhand.c:2168
+#: server/stdinhand.c:2037
+#, c-format
msgid ""
-"You can only vote in a running game. Use 'first' to become the game "
-"organizer if there currently is none."
+"%s %d \"%s\" (needs %0.0f%%%s): %d for, %d against, and %d abstained out of %"
+"d players."
msgstr ""
-#: server/stdinhand.c:2181
-#, c-format
-msgid "Vote %d \"%s\": %d for, %d against"
+#: server/stdinhand.c:2041
+msgid " no dissent"
msgstr ""
-#: server/stdinhand.c:2188
+#: server/stdinhand.c:2049
msgid "There are no votes going on."
msgstr ""
-#: server/stdinhand.c:2208
-msgid "No legal last vote."
+#: server/stdinhand.c:2077
+msgid "Invalid arguments. Usage: vote yes|no|abstain [vote number]."
+msgstr ""
+
+#: server/stdinhand.c:2095 server/stdinhand.c:2213 server/stdinhand.c:3714
+msgid "You are not allowed to use this command."
+msgstr ""
+
+#: server/stdinhand.c:2104
+#, c-format
+msgid "The argument \"%s\" is ambigious."
+msgstr ""
+
+#: server/stdinhand.c:2119
+#, fuzzy
+msgid "There are no votes running."
+msgstr "ê²Œìž„ì€ ì´ë¯¸ 진행중입니다."
+
+#: server/stdinhand.c:2121
+#, c-format
+msgid "No legal last vote (%d %s)."
msgstr ""
-#: server/stdinhand.c:2213
-msgid "Value must be integer."
+#: server/stdinhand.c:2122
+msgid "other vote running"
+msgid_plural "other votes running"
+msgstr[0] ""
+msgstr[1] ""
+
+#: server/stdinhand.c:2129 server/stdinhand.c:2491 server/stdinhand.c:2532
+msgid "Value must be an integer."
msgstr ""
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2135 server/stdinhand.c:2221
#, c-format
msgid "No such vote (%d)."
msgstr ""
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2141
+#, fuzzy
+msgid "You are not allowed to vote on that."
+msgstr "ë‹¹ì‹ ì€ ì´ ì˜µì…˜ì„ ì„¤ì •í•˜ë„ë¡ í—ˆìš©ë˜ì§€ 않았습니다"
+
+#: server/stdinhand.c:2146
#, c-format
msgid "You voted for \"%s\""
msgstr ""
-#: server/stdinhand.c:2232
+#: server/stdinhand.c:2150
#, c-format
msgid "You voted against \"%s\""
msgstr ""
-#: server/stdinhand.c:2259
+#: server/stdinhand.c:2155
+#, c-format
+msgid "You abstained from voting on \"%s\""
+msgstr ""
+
+#: server/stdinhand.c:2190
+msgid "Missing argument <vote number> or the string \"all\"."
+msgstr ""
+
+#: server/stdinhand.c:2197
+#, fuzzy
+msgid "You don't have any vote going on."
+msgstr "ì—¬ê¸°ì— ì¼ê¾¼ì„ 가질수 없습니다"
+
+#: server/stdinhand.c:2204
+msgid "There isn't any vote going on."
+msgstr ""
+
+#: server/stdinhand.c:2209
+msgid "Server: All votes have been removed."
+msgstr ""
+
+#: server/stdinhand.c:2226
+#, fuzzy, c-format
+msgid "You are not allowed to cancel this vote (%d)."
+msgstr "ë‹¹ì‹ ì€ ì´ ì˜µì…˜ì„ ì„¤ì •í•˜ë„ë¡ í—ˆìš©ë˜ì§€ 않았습니다"
+
+#: server/stdinhand.c:2232
+msgid "Usage: /cancelvote [<vote number>|all]"
+msgstr ""
+
+#: server/stdinhand.c:2241
+#, c-format
+msgid "Server: %s cancelled the vote \"%s\" (number %d)."
+msgstr ""
+
+#: server/stdinhand.c:2247
+#, c-format
+msgid "Server: The vote \"%s\" (number %d) has been cancelled."
+msgstr ""
+
+#: server/stdinhand.c:2265
msgid ""
"Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
"<x> <y> | unit <id> | tech <player> | timing | info>."
msgstr ""
-#: server/stdinhand.c:2265
+#: server/stdinhand.c:2271
msgid "Can only use this command once game has begun."
msgstr ""
-#: server/stdinhand.c:2294
+#: server/stdinhand.c:2300
#, c-format
msgid "%s diplomacy no longer debugged"
msgstr ""
-#: server/stdinhand.c:2298
+#: server/stdinhand.c:2304
#, c-format
msgid "%s diplomacy debugged"
msgstr ""
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2323
#, c-format
msgid "%s tech no longer debugged"
msgstr ""
-#: server/stdinhand.c:2321
+#: server/stdinhand.c:2327
#, c-format
msgid "%s tech debugged"
msgstr ""
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2358 server/stdinhand.c:2388
msgid "Value 2 & 3 must be integer."
msgstr ""
-#: server/stdinhand.c:2356 server/stdinhand.c:2386
+#: server/stdinhand.c:2362 server/stdinhand.c:2392
msgid "Bad map coordinates."
msgstr ""
-#: server/stdinhand.c:2361
+#: server/stdinhand.c:2367
msgid "No city at this coordinate."
msgstr "ì—¬ê¸°ì— ë™ë“±í•œ ë„시가 없습니다"
-#: server/stdinhand.c:2366
+#: server/stdinhand.c:2372
#, c-format
msgid "%s no longer debugged"
msgstr ""
-#: server/stdinhand.c:2392 server/stdinhand.c:2422
+#: server/stdinhand.c:2398 server/stdinhand.c:2428
#, c-format
msgid "%s %s no longer debugged."
msgstr ""
-#: server/stdinhand.c:2397 server/stdinhand.c:2427
+#: server/stdinhand.c:2403 server/stdinhand.c:2433
#, c-format
msgid "%s %s debugged."
msgstr ""
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2419
msgid "Value 2 must be integer."
msgstr "ê°’ 2는 반드시 ì •ìˆ˜ì—¬ì•¼ 합니다"
-#: server/stdinhand.c:2417
+#: server/stdinhand.c:2423
#, c-format
msgid "Unit %d does not exist."
msgstr "부대 %d는 존재하지 않습니다"
-#: server/stdinhand.c:2475
+#: server/stdinhand.c:2464
msgid "Undefined argument. Usage: set <option> <value>."
msgstr ""
-#: server/stdinhand.c:2485
+#: server/stdinhand.c:2473
msgid "You are not allowed to set this option."
msgstr "ë‹¹ì‹ ì€ ì´ ì˜µì…˜ì„ ì„¤ì •í•˜ë„ë¡ í—ˆìš©ë˜ì§€ 않았습니다"
-#: server/stdinhand.c:2490 server/stdinhand.c:3463
+#: server/stdinhand.c:2478 server/stdinhand.c:3501
msgid "This setting can't be modified after the game has started."
msgstr ""
-#: server/stdinhand.c:2502 server/stdinhand.c:2543
-msgid "Value must be an integer."
-msgstr ""
-
-#: server/stdinhand.c:2512
+#: server/stdinhand.c:2501
#, c-format
msgid "The parameter %s should only contain digits 0-1."
msgstr ""
-#: server/stdinhand.c:2519
+#: server/stdinhand.c:2508
msgid "Value out of range (minimum: 0, maximum: 1)."
msgstr ""
-#: server/stdinhand.c:2534 server/stdinhand.c:2576
+#: server/stdinhand.c:2523 server/stdinhand.c:2565
#, c-format
msgid "Option: %s has been set to %d."
msgstr ""
-#: server/stdinhand.c:2554
+#: server/stdinhand.c:2543
#, c-format
msgid "The parameter %s should only contain +- and 0-9."
msgstr ""
-#: server/stdinhand.c:2561
+#: server/stdinhand.c:2550
#, c-format
msgid "Value out of range (minimum: %d, maximum: %d)."
msgstr ""
-#: server/stdinhand.c:2586
+#: server/stdinhand.c:2575
msgid "String value too long. Usage: set <option> <value>."
msgstr "문ìžì—´ì´ 너무 ê¹ë‹ˆë‹¤. 사용법 : set <옵션> <ê°’>."
-#: server/stdinhand.c:2600
+#: server/stdinhand.c:2589
#, c-format
msgid "Option: %s has been set to \"%s\"."
msgstr ""
-#: server/stdinhand.c:2658
+#: server/stdinhand.c:2652
msgid "Sorry, one can't observe globally in this game."
msgstr ""
-#: server/stdinhand.c:2661
+#: server/stdinhand.c:2655
msgid "Sorry, you can't take a global observer. Observe it instead."
msgstr ""
-#: server/stdinhand.c:2671
+#: server/stdinhand.c:2665
msgid "You cannot take a new player at this time."
msgstr ""
#. TRANS: Do not translate "maxplayers".
-#: server/stdinhand.c:2679
+#: server/stdinhand.c:2673
#, c-format
msgid ""
"You cannot take a new player because the maximum of %d player has already "
@@ -5572,73 +5652,73 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: server/stdinhand.c:2691
+#: server/stdinhand.c:2685
msgid "You cannot take a new player because there are no free player slots."
msgstr ""
-#: server/stdinhand.c:2702
+#: server/stdinhand.c:2696
msgid "Sorry, one can't observe barbarians in this game."
msgstr ""
-#: server/stdinhand.c:2705
+#: server/stdinhand.c:2699
msgid "Sorry, one can't take barbarians in this game."
msgstr ""
-#: server/stdinhand.c:2713
+#: server/stdinhand.c:2707
msgid "Sorry, one can't observe dead players in this game."
msgstr ""
-#: server/stdinhand.c:2716
+#: server/stdinhand.c:2710
msgid "Sorry, one can't take dead players in this game."
msgstr ""
-#: server/stdinhand.c:2724
+#: server/stdinhand.c:2718
msgid "Sorry, one can't observe AI players in this game."
msgstr ""
-#: server/stdinhand.c:2727
+#: server/stdinhand.c:2721
msgid "Sorry, one can't take AI players in this game."
msgstr ""
-#: server/stdinhand.c:2736
+#: server/stdinhand.c:2730
msgid "Sorry, one can't observe human players in this game."
msgstr ""
-#: server/stdinhand.c:2739
+#: server/stdinhand.c:2733
msgid "Sorry, one can't take human players in this game."
msgstr ""
-#: server/stdinhand.c:2749
+#: server/stdinhand.c:2743
msgid "Sorry, one can't observe in this game."
msgstr ""
-#: server/stdinhand.c:2754
+#: server/stdinhand.c:2748
msgid "Sorry, one can't take players in this game."
msgstr ""
-#: server/stdinhand.c:2760
+#: server/stdinhand.c:2754
msgid "Sorry, one can't take players already connected in this game."
msgstr ""
-#: server/stdinhand.c:2791
+#: server/stdinhand.c:2785
msgid "Usage: observe [connection-name [player-name]]"
msgstr "사용법: observe [ì ‘ì† ì´ë¦„ [ì‚¬ìš©ìž ì´ë¦„]]"
-#: server/stdinhand.c:2797
+#: server/stdinhand.c:2791
msgid "Usage: observe [player-name]"
msgstr "사용법: observe [ì‚¬ìš©ìž ì´ë¦„]"
-#: server/stdinhand.c:2847
+#: server/stdinhand.c:2841
#, c-format
msgid "%s already controls %s. Using 'observe' would remove %s"
msgstr ""
-#: server/stdinhand.c:2858
+#: server/stdinhand.c:2852
#, c-format
msgid "%s is already observing %s."
msgstr "%s는 ì´ë¯¸ %s(ì„)를 ê´€ì°°í•˜ê³ ìžˆìŠµë‹ˆë‹¤."
-#: server/stdinhand.c:2863
+#: server/stdinhand.c:2857
#, c-format
msgid "%s is already observing."
msgstr "%s는 ì´ë¯¸ ê´€ì°°í•˜ê³ ìžˆìŠµë‹ˆë‹¤."
@@ -5653,230 +5733,234 @@ msgstr "%s는 ì´ì œ %s(ì„)를 관찰합니다"
msgid "%s now observes"
msgstr "%s는 ì´ì œ 관찰합니다"
-#: server/stdinhand.c:2969
+#: server/stdinhand.c:2971
msgid "Usage: take <connection-name> <player-name>"
msgstr "사용법 : take <ì ‘ì† ì´ë¦„> <ì‚¬ìš©ìž ì´ë¦„>"
-#: server/stdinhand.c:2974
+#: server/stdinhand.c:2976
msgid "Usage: take <player-name>"
msgstr "사용법 : take <ì‚¬ìš©ìž ì´ë¦„>"
-#: server/stdinhand.c:2980
+#: server/stdinhand.c:2982
msgid "Usage: take [connection-name] <player-name>"
msgstr "사용법 : take [ì ‘ì† ì´ë¦„] <ì‚¬ìš©ìž ì´ë¦„>"
-#: server/stdinhand.c:3010
+#: server/stdinhand.c:3012
#, c-format
msgid "%s already controls %s."
msgstr "%s는 ì´ë¯¸ %s(ì„)를 ì œì–´í•©ë‹ˆë‹¤."
-#: server/stdinhand.c:3024
+#: server/stdinhand.c:3026
#, c-format
msgid "There is no free player slot for %s."
msgstr ""
-#: server/stdinhand.c:3059
+#: server/stdinhand.c:3061
#, c-format
msgid "being detached from %s."
msgstr ""
-#: server/stdinhand.c:3135
+#: server/stdinhand.c:3146
#, c-format
msgid "%s now controls %s (%s, %s)."
msgstr "%s는 ì´ì œ %s(ì„)를 ì œì–´í•©ë‹ˆë‹¤ (%s, %s)."
-#: server/stdinhand.c:3139 server/stdinhand.c:4260
+#: server/stdinhand.c:3150 server/stdinhand.c:4308
#: data/nation/barbarian.ruleset:3
msgid "Barbarian"
msgstr "야만ì¸"
-#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
+#: server/stdinhand.c:3152 server/stdinhand.c:4310 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-sdl/plrdlg.c:645
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr "AI"
-#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-gtk-2.0/pages.c:2125
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
+#: server/stdinhand.c:3153 server/stdinhand.c:4312
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-gtk-2.0/pages.c:2127
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/connectdlg.c:215
msgid "Human"
msgstr "ì¸ê°„"
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-gtk-2.0/pages.c:2124 client/gui-win32/connectdlg.c:200
-#: client/gui-win32/connectdlg.c:212
+#: server/stdinhand.c:3155 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-gtk-2.0/pages.c:2126 client/gui-win32/connectdlg.c:202
+#: client/gui-win32/connectdlg.c:214
msgid "Alive"
msgstr "활약중"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3156 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-win32/connectdlg.c:202
msgid "Dead"
msgstr "사ë§"
-#: server/stdinhand.c:3147
+#: server/stdinhand.c:3159
#, c-format
msgid "%s failed to attach to any player."
msgstr "%s는 사용ìžì™€ í•©ì²´ 못 했습니다."
-#: server/stdinhand.c:3182
+#: server/stdinhand.c:3194
msgid "Usage: detach <connection-name>"
msgstr "사용법: detach <ì ‘ì† ì´ë¦„>"
-#: server/stdinhand.c:3202
+#: server/stdinhand.c:3214
msgid "You can not detach other users."
msgstr ""
-#: server/stdinhand.c:3211
+#: server/stdinhand.c:3223
#, c-format
msgid "%s is not attached to any player."
msgstr ""
-#: server/stdinhand.c:3234
+#: server/stdinhand.c:3246
#, c-format
msgid "%s detaching from %s"
msgstr "%s는 %s(으)로부터 분리"
-#: server/stdinhand.c:3240
+#: server/stdinhand.c:3252
#, c-format
msgid "%s no longer observing."
msgstr ""
-#: server/stdinhand.c:3259
+#: server/stdinhand.c:3271
#, c-format
msgid "detaching from %s."
msgstr "%s(으)로부터 분리."
-#: server/stdinhand.c:3345
+#: server/stdinhand.c:3361
msgid "Usage: load <game name>"
msgstr "사용법: load <개임 ì´ë¦„>"
-#: server/stdinhand.c:3350
+#: server/stdinhand.c:3366
msgid "Cannot load a game while another is running."
msgstr ""
-#: server/stdinhand.c:3372
+#: server/stdinhand.c:3388
#, c-format
msgid "Cannot find savegame or scenario with the name \"%s\"."
msgstr ""
-#: server/stdinhand.c:3389
+#: server/stdinhand.c:3405
#, c-format
msgid "Could not load savefile: %s"
msgstr ""
-#: server/stdinhand.c:3458
+#: server/stdinhand.c:3496
#, c-format
msgid "Current ruleset directory is \"%s\""
msgstr ""
-#: server/stdinhand.c:3478
+#: server/stdinhand.c:3516
#, c-format
msgid "Ruleset directory \"%s\" not found"
msgstr ""
-#: server/stdinhand.c:3484
+#: server/stdinhand.c:3522
#, c-format
msgid "Ruleset directory is already \"%s\""
msgstr ""
-#: server/stdinhand.c:3488
+#: server/stdinhand.c:3526
#, c-format
msgid "Ruleset directory set to \"%s\""
msgstr ""
-#: server/stdinhand.c:3536
+#: server/stdinhand.c:3574
msgid "Goodbye."
msgstr "ì•ˆë…•ì´ ê°€ì„¸ìš”"
-#: server/stdinhand.c:3567
+#: server/stdinhand.c:3606
msgid "Sorry, you are not allowed to use server commands."
msgstr ""
-#: server/stdinhand.c:3603
+#: server/stdinhand.c:3656
#, c-format
msgid "Warning: '%s' interpreted as '%s', but it is ambiguous. Try '%shelp'."
msgstr ""
-#: server/stdinhand.c:3608
+#: server/stdinhand.c:3661
#, c-format
msgid "Unknown command. Try '%shelp'."
msgstr ""
-#: server/stdinhand.c:3625
-msgid "Your new vote canceled your previous vote."
+#: server/stdinhand.c:3675
+msgid "Your new vote cancelled your previous vote."
msgstr ""
-#: server/stdinhand.c:3633
-#, c-format
-msgid "New vote (number %d) by %s: %s."
+#: server/stdinhand.c:3688
+msgid "New teamvote"
+msgstr ""
+
+#: server/stdinhand.c:3691
+msgid "New vote"
msgstr ""
-#: server/stdinhand.c:3645
+#: server/stdinhand.c:3695
#, c-format
-msgid "Your new vote (\"%s\") was not legal or was not recognized."
+msgid "%s (number %d) by %s: %s"
msgstr ""
-#: server/stdinhand.c:3655
-msgid "You are not allowed to use this command."
+#: server/stdinhand.c:3704
+#, c-format
+msgid "Your new vote (\"%s\") was not legal or was not recognized."
msgstr ""
-#: server/stdinhand.c:3680
+#: server/stdinhand.c:3726
msgid "(server prompt)"
msgstr ""
-#: server/stdinhand.c:3787
+#: server/stdinhand.c:3835
msgid "Game ended in a draw."
msgstr ""
-#: server/stdinhand.c:3791
+#: server/stdinhand.c:3839
msgid ""
"Ending the game. The server will restart once all clients have disconnected."
msgstr ""
-#: server/stdinhand.c:3796
+#: server/stdinhand.c:3844
msgid "Cannot end the game: no game running."
msgstr ""
-#: server/stdinhand.c:3812
+#: server/stdinhand.c:3860
#, c-format
msgid "%s has conceded the game and can no longer win."
msgstr ""
-#: server/stdinhand.c:3817
+#: server/stdinhand.c:3865
msgid "You cannot surrender now."
msgstr ""
-#: server/stdinhand.c:3883
+#: server/stdinhand.c:3931
msgid "Not enough human players, game will not start."
msgstr ""
-#: server/stdinhand.c:3888
+#: server/stdinhand.c:3936
msgid "No players, game will not start."
msgstr ""
-#: server/stdinhand.c:3892
+#: server/stdinhand.c:3940
msgid "Not enough nations for all players, game will not start."
msgstr ""
-#: server/stdinhand.c:3901
+#: server/stdinhand.c:3949
msgid "All players are ready; starting game."
msgstr ""
-#: server/stdinhand.c:3915
+#: server/stdinhand.c:3963
msgid ""
"Cannot start the game: the game is waiting for all clients to disconnect."
msgstr ""
-#: server/stdinhand.c:3922
+#: server/stdinhand.c:3970
msgid "Cannot start the game: it is already running."
msgstr ""
-#: server/stdinhand.c:3953
+#: server/stdinhand.c:4001
#, c-format
msgid "Cutting connection %s."
msgstr ""
-#: server/stdinhand.c:3972
+#: server/stdinhand.c:4020
msgid ""
"Welcome - this is the introductory help text for the Freeciv server.\n"
"\n"
@@ -5897,123 +5981,123 @@ msgid ""
" quit - to exit"
msgstr ""
-#: server/stdinhand.c:4007 server/stdinhand.c:4010
+#: server/stdinhand.c:4055 server/stdinhand.c:4058
msgid "Command:"
msgstr ""
-#: server/stdinhand.c:4014
+#: server/stdinhand.c:4062
msgid "Synopsis: "
msgstr ""
-#: server/stdinhand.c:4023
+#: server/stdinhand.c:4071
#, c-format
msgid "Level: %s"
msgstr ""
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4096
msgid "The following server commands are available:"
msgstr ""
-#: server/stdinhand.c:4123
+#: server/stdinhand.c:4171
#, c-format
msgid "Help argument '%s' is ambiguous."
msgstr ""
-#: server/stdinhand.c:4128
+#: server/stdinhand.c:4176
#, c-format
msgid "No match for help argument '%s'."
msgstr ""
-#: server/stdinhand.c:4194
+#: server/stdinhand.c:4242
#, c-format
msgid "Bad list argument: '%s'. Try '%shelp list'."
msgstr ""
-#: server/stdinhand.c:4234
+#: server/stdinhand.c:4282
msgid "List of players:"
msgstr "í”Œë ˆì´ì–´ì˜ 목ë¡:"
-#: server/stdinhand.c:4239
+#: server/stdinhand.c:4287
msgid "<no players>"
msgstr "<í”Œë ˆì´ì–´ ì—†ìŒ>"
-#: server/stdinhand.c:4256
+#: server/stdinhand.c:4304
#, c-format
msgid "user %s, "
msgstr "ì‚¬ìš©ìž %s, "
-#: server/stdinhand.c:4267
+#: server/stdinhand.c:4315
msgid ", Dead"
msgstr ", 사ë§"
-#: server/stdinhand.c:4270
+#: server/stdinhand.c:4318
#, c-format
msgid ", difficulty level %s"
msgstr ""
#. TRANS: continue list, in case comma is not the separator of choice.
-#: server/stdinhand.c:4275 server/stdinhand.c:4279 client/helpdata.c:257
-#: client/helpdata.c:752 client/text.c:241 client/text.c:1224
-#: client/text.c:1262
+#: server/stdinhand.c:4323 server/stdinhand.c:4327 client/helpdata.c:257
+#: client/helpdata.c:752 client/text.c:241 client/text.c:1229
+#: client/text.c:1267
#, c-format
msgid "?clistmore:, %s"
msgstr ", %s"
-#: server/stdinhand.c:4283
+#: server/stdinhand.c:4331
msgid ", ready"
msgstr ", 준비 ë슴"
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4333
msgid ", not ready"
msgstr ", 준비 안 ë슴"
-#: server/stdinhand.c:4293
+#: server/stdinhand.c:4341
#, c-format
msgid " %d connection:"
msgid_plural " %d connections:"
msgstr[0] " ì ‘ì†ìˆ˜ %dê°œ:"
msgstr[1] " ì ‘ì†ìˆ˜ %dê°œ:"
-#: server/stdinhand.c:4299
+#: server/stdinhand.c:4347
#, c-format
msgid " %s from %s (command access level %s), bufsize=%dkb"
msgstr ""
-#: server/stdinhand.c:4304
+#: server/stdinhand.c:4352
msgid " (observer mode)"
msgstr " (ê´€ì°°ìž ëª¨ë“œ)"
-#: server/stdinhand.c:4322
+#: server/stdinhand.c:4370
msgid "List of teams:"
msgstr "íŒ€ì˜ ëª©ë¡:"
#. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4332
+#: server/stdinhand.c:4380
#, 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:4352
+#: server/stdinhand.c:4400
#, c-format
msgid "%2d : '%s' : 1 player : %s"
msgstr "%2d : '%s' : ì‚¬ìš©ìž 1명 : %s"
-#: server/stdinhand.c:4360
+#: server/stdinhand.c:4408
#, c-format
msgid "Empty team: %s"
msgstr "공팀: %s"
-#: server/stdinhand.c:4371
+#: server/stdinhand.c:4419
msgid "List of connections to server:"
msgstr ""
-#: server/stdinhand.c:4375
+#: server/stdinhand.c:4423
msgid "<no connections>"
msgstr "<ì ‘ì† ì—†ìŒ>"
-#: server/stdinhand.c:4399
+#: server/stdinhand.c:4447
msgid "List of scenarios available:"
msgstr ""
@@ -6032,65 +6116,65 @@ msgstr ""
msgid "%s acquired from %s!"
msgstr ""
-#: server/techtools.c:220
+#: server/techtools.c:221
#, c-format
msgid ""
"Discovery of %s makes the government form %s available. You may want to "
"start a revolution."
msgstr ""
-#: server/techtools.c:301
+#: server/techtools.c:302
#, c-format
msgid "Discovery of %s OBSOLETES %s in %s!"
msgstr ""
-#: server/techtools.c:351
+#: server/techtools.c:352
#, c-format
msgid "Learned %s. Our scientists focus on %s; goal is %s."
msgstr ""
-#: server/techtools.c:369
+#: server/techtools.c:370
#, c-format
msgid "Learned %s. Scientists choose to research %s."
msgstr ""
-#: server/techtools.c:376
+#: server/techtools.c:377
#, c-format
msgid "Learned %s. "
msgstr ""
-#: server/techtools.c:379
+#: server/techtools.c:380
#, c-format
msgid "Researching %s."
msgstr ""
-#: server/techtools.c:385
+#: server/techtools.c:386
#, c-format
msgid "Learned %s. Scientists do not know what to research next."
msgstr ""
-#: server/techtools.c:402
+#: server/techtools.c:403
msgid ""
"Great scientists from all the world join your civilization: you get an "
"immediate advance."
msgstr ""
-#: server/techtools.c:570
+#: server/techtools.c:571
#, c-format
msgid "Technology goal is %s."
msgstr ""
-#: server/techtools.c:700
+#: server/techtools.c:708
#, c-format
msgid "You steal %s from the %s."
msgstr ""
-#: server/techtools.c:705
+#: server/techtools.c:713
#, c-format
msgid "The %s stole %s from you!"
msgstr ""
-#: server/techtools.c:710
+#: server/techtools.c:718
#, c-format
msgid "The %s have stolen %s from the %s."
msgstr ""
@@ -6114,177 +6198,183 @@ msgstr ""
msgid "%s upgraded to %s for %d gold."
msgstr ""
-#: server/unithand.c:396
+#: server/unithand.c:402
#, c-format
msgid "%s refuses to disband!"
msgstr ""
-#: server/unithand.c:449
+#: server/unithand.c:455
msgid "Can't place city here."
msgstr ""
-#: server/unithand.c:456
+#: server/unithand.c:462
#, c-format
msgid "Only %s can build a city."
msgstr ""
-#: server/unithand.c:461
+#: server/unithand.c:467
msgid "Can't build a city."
msgstr ""
-#: server/unithand.c:470
+#: server/unithand.c:476
#, c-format
msgid "Only %s can add to a city."
msgstr ""
-#: server/unithand.c:475
+#: server/unithand.c:481
msgid "Can't add to a city."
msgstr ""
-#: server/unithand.c:481
+#: server/unithand.c:487
#, c-format
msgid "%s unit has no moves left to add to %s."
msgstr ""
-#: server/unithand.c:487
+#: server/unithand.c:493
#, c-format
msgid "%s unit has no moves left to build city."
msgstr ""
-#: server/unithand.c:492
+#. TRANS: <city> is owned by <nation>, cannot add <unit>.
+#: server/unithand.c:499
+#, c-format
+msgid "%s is owned by %s, cannot add %s."
+msgstr ""
+
+#: server/unithand.c:506
#, c-format
msgid "%s is too big to add %s."
msgstr ""
-#: server/unithand.c:498
+#: server/unithand.c:512
#, c-format
msgid "%s needs an improvement to grow, so you cannot add %s."
msgstr ""
-#: server/unithand.c:509
+#: server/unithand.c:523
#, c-format
msgid "Can't add %s to %s."
msgstr ""
-#: server/unithand.c:531
+#: server/unithand.c:545
#, c-format
msgid "%s added to aid %s in growing."
msgstr ""
-#: server/unithand.c:828
+#: server/unithand.c:842
msgid "Your Nuclear missile was shot down by SDI defences, what a waste."
msgstr ""
-#: server/unithand.c:831
+#: server/unithand.c:845
#, c-format
msgid "The nuclear attack on %s was avoided by your SDI defense."
msgstr ""
#. TRANS: "Your Cannon ... the Polish Destroyer."
-#: server/unithand.c:901
+#: server/unithand.c:915
#, c-format
msgid "Your %s survived the pathetic attack from the %s %s."
msgstr ""
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unithand.c:910
+#: server/unithand.c:924
#, c-format
msgid "Your attacking %s failed against the %s %s!"
msgstr ""
-#: server/unithand.c:983
+#: server/unithand.c:997
#, c-format
msgid "Only %s can attack from sea."
msgstr ""
-#: server/unithand.c:988
+#: server/unithand.c:1002
msgid "Cannot attack from sea."
msgstr ""
-#: server/unithand.c:996 server/unittools.c:2137
+#: server/unithand.c:1010 server/unittools.c:2142
msgid "Cannot attack unless you declare war first."
msgstr ""
-#: server/unithand.c:1001
+#: server/unithand.c:1015
#, c-format
msgid "%s can only move into your own zone of control."
msgstr ""
-#: server/unithand.c:1007
+#: server/unithand.c:1021
#, c-format
msgid "Cannot invade unless you break peace with %s first."
msgstr ""
-#: server/unithand.c:1052
+#: server/unithand.c:1066
msgid "This unit has no moves left."
msgstr ""
-#: server/unithand.c:1107
+#: server/unithand.c:1121
msgid "Unit must be on land to perform diplomatic action."
msgstr ""
-#: server/unithand.c:1109
+#: server/unithand.c:1123
msgid "No diplomat action possible."
msgstr ""
-#: server/unithand.c:1125
+#: server/unithand.c:1139
#, c-format
msgid "You must declare war on %s first. Try using players dialog (F3)."
msgstr ""
-#: server/unithand.c:1143
+#: server/unithand.c:1157
msgid "This unit is being transported, and so cannot bombard."
msgstr ""
-#: server/unithand.c:1158
+#: server/unithand.c:1172
msgid "You can't attack there."
msgstr ""
-#: server/unithand.c:1180
+#: server/unithand.c:1194
msgid "This type of troops cannot take over a city."
msgstr ""
-#: server/unithand.c:1198
+#: server/unithand.c:1212
msgid "A transported unit is not allied to all units or city on target tile."
msgstr ""
-#: server/unithand.c:1240
+#: server/unithand.c:1254
#, c-format
msgid "Your %s helps build the %s in %s (%d remaining)."
msgstr ""
-#: server/unithand.c:1242
+#: server/unithand.c:1256
#, c-format
msgid "Your %s helps build the %s in %s (%d surplus)."
msgstr ""
-#: server/unithand.c:1286
+#: server/unithand.c:1300
#, c-format
msgid ""
"Sorry, your %s cannot establish a trade route because it has no home city"
msgstr ""
-#: server/unithand.c:1296
+#: server/unithand.c:1310
#, c-format
msgid "Sorry, your %s cannot establish a trade route between %s and %s"
msgstr ""
-#: server/unithand.c:1325 server/unithand.c:1344
+#: server/unithand.c:1339 server/unithand.c:1358
#, c-format
msgid "Sorry, your %s cannot establish a trade route here!"
msgstr ""
-#: server/unithand.c:1329 server/unithand.c:1348
+#: server/unithand.c:1343 server/unithand.c:1362
#, c-format
msgid " The city of %s already has %d better trade routes!"
msgstr ""
-#: server/unithand.c:1361 server/unithand.c:1373
+#: server/unithand.c:1375 server/unithand.c:1387
#, c-format
msgid "Sorry, %s has canceled the trade route from %s to your city %s."
msgstr ""
-#: server/unithand.c:1406
+#: server/unithand.c:1420
#, c-format
msgid ""
"Your %s from %s has arrived in %s, and revenues amount to %d in gold and "
@@ -6343,55 +6433,55 @@ msgid "Teleported your %s to %s."
msgstr ""
#. TRANS: A unit is moved to resolve stack conflicts.
-#: server/unittools.c:1065
+#: server/unittools.c:1070
#, c-format
msgid "Moved your %s."
msgstr "ë‹¹ì‹ ì˜ %s(ì„)를 ì´ë™ì‹œì¼°ìŠµë‹ˆë‹¤."
-#: server/unittools.c:1076
+#: server/unittools.c:1081
#, c-format
msgid "Disbanded your %s."
msgstr ""
-#: server/unittools.c:1397
+#: server/unittools.c:1402
#, c-format
msgid "Unable to defend %s, %s has lost the game."
msgstr ""
-#: server/unittools.c:1401
+#: server/unittools.c:1406
#, c-format
msgid "Losing %s meant losing the game! Be more careful next time!"
msgstr ""
-#: server/unittools.c:1503
+#: server/unittools.c:1508
#, c-format
msgid "%s escaped the destruction of %s, and fled to %s."
msgstr ""
-#: server/unittools.c:1512
+#: server/unittools.c:1517
#, c-format
msgid "%s lost when %s was lost."
msgstr ""
-#: server/unittools.c:1561
+#: server/unittools.c:1566
#, c-format
msgid "Barbarian leader captured, %d gold ransom paid."
msgstr ""
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unittools.c:1579
+#: server/unittools.c:1584
#, c-format
msgid "Your attacking %s succeeded against the %s %s!"
msgstr ""
#. TRANS: "Cannon ... the Polish Destroyer."
-#: server/unittools.c:1588 server/unittools.c:1646
+#: server/unittools.c:1593 server/unittools.c:1651
#, c-format
msgid "%s lost to an attack by the %s %s."
msgstr ""
#. TRANS: "... Cannon ... the Polish Destroyer ...."
-#: server/unittools.c:1622
+#: server/unittools.c:1627
#, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -6401,14 +6491,14 @@ msgstr[1] ""
#. TRANS: "Cannon lost when the Polish Destroyer
#. * attacked the German Musketeers."
-#: server/unittools.c:1655
+#: server/unittools.c:1660
#, c-format
msgid "%s lost when the %s %s attacked the %s %s."
msgstr ""
#. TRANS: "Musketeers (and Cannon) lost to an
#. * attack from the Polish Destroyer."
-#: server/unittools.c:1670
+#: server/unittools.c:1675
#, c-format
msgid "%s (and %s) lost to an attack from the %s %s."
msgstr ""
@@ -6416,7 +6506,7 @@ msgstr ""
#. TRANS: "Musketeers and 3 other units lost to
#. * an attack from the Polish Destroyer."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1680
+#: server/unittools.c:1685
#, 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."
@@ -6426,178 +6516,220 @@ msgstr[1] ""
#. TRANS: "2 units lost when the Polish Destroyer
#. * attacked the German Musketeers."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1694
+#: server/unittools.c:1699
#, 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] ""
-#: server/unittools.c:1962
+#: server/unittools.c:1967
#, c-format
msgid "Your %s was nuked by %s."
msgstr ""
-#: server/unittools.c:1965 server/unittools.c:1981
+#: server/unittools.c:1970 server/unittools.c:1986
msgid "yourself"
msgstr ""
-#: server/unittools.c:1969
+#: server/unittools.c:1974
#, c-format
msgid "The %s %s was nuked."
msgstr ""
-#: server/unittools.c:1978
+#: server/unittools.c:1983
#, c-format
msgid "%s was nuked by %s."
msgstr ""
-#: server/unittools.c:1986
+#: server/unittools.c:1991
#, c-format
msgid "You nuked %s."
msgstr ""
-#: server/unittools.c:2027
+#: server/unittools.c:2032
#, c-format
msgid "The %s detonated a nuke!"
msgstr ""
-#: server/unittools.c:2051
+#: server/unittools.c:2056
#, c-format
msgid "%s transported successfully."
msgstr ""
-#: server/unittools.c:2103
+#: server/unittools.c:2108
msgid "This unit type can not be paradropped."
msgstr ""
-#: server/unittools.c:2113
+#: server/unittools.c:2118
msgid "You cannot paradrop a unit that is transporting other units."
msgstr ""
-#: server/unittools.c:2119
+#: server/unittools.c:2124
msgid "The destination location is not known."
msgstr ""
-#: server/unittools.c:2126
+#: server/unittools.c:2131
#, c-format
msgid "This unit cannot paradrop into %s."
msgstr ""
-#: server/unittools.c:2146
+#: server/unittools.c:2151
#, c-format
msgid "The distance to the target (%i) is greater than the unit's range (%i)."
msgstr ""
-#: server/unittools.c:2157
+#: server/unittools.c:2162
#, c-format
msgid "Your %s paradropped into the %s and was lost."
msgstr ""
-#: server/unittools.c:2170
+#: server/unittools.c:2175
#, c-format
msgid "Your %s was killed by enemy units at the paradrop destination."
msgstr ""
-#: server/unittools.c:2192
+#: server/unittools.c:2197
#, c-format
msgid "You found %d gold."
msgstr "%dê¸ˆì„ ì°¾ì•˜ìŠµë‹ˆë‹¤."
-#: server/unittools.c:2209
+#: server/unittools.c:2214
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr ""
-#: server/unittools.c:2216
+#: server/unittools.c:2221
#, c-format
msgid "The %s have acquired %s from ancient scrolls of wisdom."
msgstr ""
-#: server/unittools.c:2230
+#: server/unittools.c:2235
msgid "A band of friendly mercenaries joins your cause."
msgstr ""
-#: server/unittools.c:2248
+#: server/unittools.c:2253
msgid "An abandoned village is here."
msgstr ""
-#: server/unittools.c:2258
+#: server/unittools.c:2263
msgid "You have unleashed a horde of barbarians!"
msgstr ""
-#: server/unittools.c:2261
+#: server/unittools.c:2266
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr ""
-#: server/unittools.c:2277
+#: server/unittools.c:2282
msgid "You found a friendly city."
msgstr ""
-#: server/unittools.c:2291
+#: server/unittools.c:2296
msgid "Friendly nomads are impressed by you, and join you."
msgstr ""
-#: server/unittools.c:2316
+#: server/unittools.c:2321
msgid "Your overflight frightens the tribe; they scatter in terror."
msgstr ""
-#: server/unittools.c:2574
+#: server/unittools.c:2579
#, c-format
msgid "Orders for %s aborted after enemy movement was spotted."
msgstr ""
-#: server/unittools.c:3023
+#: server/unittools.c:3028
#, c-format
msgid "Orders for %s aborted as there are units nearby."
msgstr ""
-#: server/unittools.c:3075
+#: server/unittools.c:3080
#, c-format
msgid "Orders for %s aborted because building of city failed."
msgstr ""
-#: server/unittools.c:3088
+#: server/unittools.c:3093
#, c-format
msgid "Orders for %s aborted since they give an invalid activity."
msgstr ""
-#: server/unittools.c:3102
+#: server/unittools.c:3107
#, c-format
msgid "Orders for %s aborted since they give an invalid location."
msgstr ""
-#: server/unittools.c:3112
+#: server/unittools.c:3117
#, c-format
msgid "Orders for %s aborted as there are units in the way."
msgstr ""
-#: server/unittools.c:3138
+#: server/unittools.c:3143
#, c-format
msgid "Orders for %s aborted because of failed move."
msgstr ""
-#: server/unittools.c:3179
+#: server/unittools.c:3184
#, c-format
msgid "Attempt to change homecity for %s failed."
msgstr ""
-#: server/unittools.c:3190
+#: server/unittools.c:3195
#, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr ""
-#: server/unittools.c:3202
+#: server/unittools.c:3207
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr ""
-#: server/unittools.c:3211
+#: server/unittools.c:3216
#, c-format
msgid "Your %s has invalid orders."
msgstr ""
+#: server/voting.c:522
+#, c-format
+msgid ""
+"%s %d \"%s\" is passed %d to %d with %d abstentions and %d who did not vote."
+msgstr ""
+
+#: server/voting.c:528
+#, c-format
+msgid ""
+"%s %d \"%s\" failed with %d against, %d for, %d abstentions and %d who did "
+"not vote."
+msgstr ""
+
+#: server/voting.c:548
+#, c-format
+msgid "%s %d: %s voted yes."
+msgstr ""
+
+#: server/voting.c:553
+#, c-format
+msgid "%s %d: %s voted no."
+msgstr ""
+
+#: server/voting.c:558
+#, c-format
+msgid "%s %d: %s chose to abstain."
+msgstr ""
+
+#. TRANS: Describing a new vote that can only pass
+#. * if there are no dissenting votes.
+#: server/voting.c:726
+#, c-format
+msgid "%s (needs %0.0f%% and no dissent)."
+msgstr ""
+
+#. TRANS: Describing a new vote that can pass only if the
+#. * given percentage of players votes 'yes'.
+#: server/voting.c:732
+#, c-format
+msgid "%s (needs %0.0f%% in favor)."
+msgstr ""
+
#: server/generator/mapgen.c:1771
msgid "High landmass - this may take a few seconds."
msgstr ""
@@ -6625,12 +6757,12 @@ msgid ""
"Please report this bug at %s."
msgstr ""
-#: client/attribute.c:363
+#: client/attribute.c:368
msgid ""
"There has been a CMA error. Your citizen governor settings may be broken."
msgstr ""
-#: client/attribute.c:367
+#: client/attribute.c:372
msgid "Old attributes detected and removed."
msgstr ""
@@ -6777,41 +6909,41 @@ msgstr ""
msgid "%+4d : Taxed from trade\n"
msgstr ""
-#: client/citydlg_common.c:418
+#: client/citydlg_common.c:421
#, c-format
msgid "%+4d : Trade route with %s\n"
msgstr ""
-#: client/citydlg_common.c:427
+#: client/citydlg_common.c:430
#, c-format
msgid "%+4d : Building tithes\n"
msgstr ""
-#: client/citydlg_common.c:450
+#: client/citydlg_common.c:453
#, c-format
msgid "%+4d : Bonus from %s (%+d%%)\n"
msgstr ""
-#: client/citydlg_common.c:462
+#: client/citydlg_common.c:465
#, c-format
msgid "%+4d : Waste\n"
msgstr ""
-#: client/citydlg_common.c:468
+#: client/citydlg_common.c:471
#, c-format
msgid "%+4d : Disorder\n"
msgstr ""
-#: client/citydlg_common.c:474
+#: client/citydlg_common.c:477
#, c-format
msgid "%+4d : Used\n"
msgstr ""
-#: client/citydlg_common.c:479
+#: client/citydlg_common.c:482
msgid "==== : Adds up to\n"
msgstr ""
-#: client/citydlg_common.c:481
+#: client/citydlg_common.c:484
#, c-format
msgid "%4d : Total surplus"
msgstr ""
@@ -7116,48 +7248,48 @@ msgstr "?ì „ë¬¸ê°€:ì „"
msgid "Specialists"
msgstr "ì „ë¬¸ê°€"
-#: client/civclient.c:240
+#: client/civclient.c:241
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr ""
-#: client/civclient.c:250
+#: client/civclient.c:251
msgid " -l, --log FILE\tUse FILE as logfile (spawned server also uses this)\n"
msgstr ""
-#: client/civclient.c:252
+#: client/civclient.c:253
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr ""
-#: client/civclient.c:254
+#: client/civclient.c:255
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr ""
-#: client/civclient.c:256
+#: client/civclient.c:257
msgid " -p, --port PORT\tConnect to server port PORT (usually with -a)\n"
msgstr ""
-#: client/civclient.c:258
+#: client/civclient.c:259
#, c-format
msgid " -P, --Plugin PLUGIN\tUse PLUGIN for sound output %s\n"
msgstr ""
-#: client/civclient.c:260
+#: client/civclient.c:261
msgid " -r, --read FILE\tRead startup script FILE (for spawned server only)\n"
msgstr ""
-#: client/civclient.c:263
+#: client/civclient.c:264
msgid " -s, --server HOST\tConnect to the server at HOST (usually with -a)\n"
msgstr ""
-#: client/civclient.c:265
+#: client/civclient.c:266
msgid " -S, --Sound FILE\tRead sound tags from FILE\n"
msgstr ""
-#: client/civclient.c:266
+#: client/civclient.c:267
msgid " -t, --tiles FILE\tUse data file FILE.tilespec for tiles\n"
msgstr ""
-#: client/civclient.c:269
+#: client/civclient.c:270
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7165,45 +7297,45 @@ msgid ""
msgstr ""
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:274
+#: client/civclient.c:275
#, c-format
msgid "Report bugs at %s\n"
msgstr "%sì— ë²„ê·¸ë¦¬í¬íŠ¸.\n"
-#: client/civclient.c:298
+#: client/civclient.c:299
#, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr ""
-#: client/civclient.c:300 client/civclient.c:315
+#: client/civclient.c:301 client/civclient.c:316
msgid "Try using --help.\n"
msgstr ""
-#: client/civclient.c:313
+#: client/civclient.c:314
#, c-format
msgid "Invalid debug level \"%s\" specified with --debug option.\n"
msgstr ""
-#: client/civclient.c:326
+#: client/civclient.c:327
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr ""
-#: client/civclient.c:391
+#: client/civclient.c:393
#, fuzzy, c-format
msgid "Updating old metaserver address \"%s\"."
msgstr "metaserver <주소>"
-#: client/civclient.c:394
+#: client/civclient.c:396
#, c-format
msgid "Default metaserver has been set to \"%s\"."
msgstr ""
-#: client/civclient.c:550
+#: client/civclient.c:540
msgid "Game started."
msgstr "ê²Œìž„ì´ ì‹œìž‘ë˜ì—ˆìŠµë‹ˆë‹¤"
-#: client/civclient.c:588
+#: client/civclient.c:606
msgid "There was an error while auto connecting; aborting."
msgstr "ìžë™ì—°ê²°ì¤‘ ì´ìƒì´ ë°œìƒë˜ì—ˆìŠµë‹ˆë‹¤; 중단"
@@ -7333,75 +7465,75 @@ msgstr "ì ‘ì†ì¤‘입니다"
msgid "Disconnected from server."
msgstr "서버로부터 ì—°ê²°ì´ ëŠê²¼ìŠµë‹ˆë‹¤"
-#: client/clinet.c:469
+#: client/clinet.c:473
#, c-format
msgid "Failed to contact server \"%s\" at port %d as \"%s\" after %d attempts"
msgstr ""
-#: client/clinet.c:484 client/clinet.c:486
+#: client/clinet.c:488 client/clinet.c:490
msgid "Connection to server refused. Please start the server."
msgstr "ì„œë²„ì˜ ì ‘ì†ì´ 거부당했습니다 서버를 시작하ì‹ì‹œìš”."
-#: client/clinet.c:495 client/clinet.c:523
+#: client/clinet.c:499 client/clinet.c:527
#, c-format
msgid ""
"Error contacting server \"%s\" at port %d as \"%s\":\n"
" %s\n"
msgstr ""
-#: client/clinet.c:514
+#: client/clinet.c:518
#, c-format
msgid ""
"Auto-connecting to server \"%s\" at port %d as \"%s\" every %f second(s) for "
"%d times"
msgstr ""
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
+#: client/connectdlg_common.c:78 client/gui-gtk-2.0/pages.c:1358
msgid "novice"
msgstr "초보"
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1358
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
msgid "easy"
msgstr "쉬움"
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1359
msgid "normal"
msgstr "보통"
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr "ì–´ë ¤ì›€"
-#: client/connectdlg_common.c:83
+#: client/connectdlg_common.c:82
msgid "experimental"
msgstr "실험ì ì¸"
-#: client/connectdlg_common.c:213
+#: client/connectdlg_common.c:212
msgid "Starting server..."
msgstr "서버를 ì‹œìž‘í•˜ê³ ìžˆìŠµë‹ˆë‹¤..."
-#: client/connectdlg_common.c:332
+#: client/connectdlg_common.c:331
msgid "Couldn't start the server."
msgstr "서버를 ì‹œìž‘í• ìˆ˜ 없습니다"
-#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
+#: client/connectdlg_common.c:332 client/connectdlg_common.c:365
msgid "You'll have to start one manually. Sorry..."
msgstr ""
-#: client/connectdlg_common.c:364
+#: client/connectdlg_common.c:363
msgid "Couldn't connect to the server."
msgstr "ì„œë²„ì— ì—°ê²°í• ìˆ˜ 없습니다"
-#: client/connectdlg_common.c:365
+#: client/connectdlg_common.c:364
msgid "We probably couldn't start it from here."
msgstr ""
-#: client/connectdlg_common.c:470
+#: client/connectdlg_common.c:469
msgid ""
"Established control over the server. You have command access level 'hack'."
msgstr ""
-#: client/connectdlg_common.c:475
+#: client/connectdlg_common.c:474
msgid ""
"Failed to obtain the required access level to take control of the server. "
"The server will now be shutdown."
@@ -7411,27 +7543,27 @@ msgstr ""
msgid "Only transporter units can be unloaded."
msgstr ""
-#: client/control.c:1425
+#: client/control.c:1417
msgid "Only settler units can be put into auto mode."
msgstr ""
-#: client/control.c:1516
+#: client/control.c:1511
msgid "Only nuclear units can do this."
msgstr "ì˜¤ì§ í•µ ë¶€ëŒ€ë§Œì´ ì´ê²ƒì„ í• ìˆ˜ 있습니다"
-#: client/control.c:1545
+#: client/control.c:1540
msgid "Only paratrooper units can do this."
msgstr ""
-#: client/control.c:2020
+#: client/control.c:2015
msgid "Too far for this unit."
msgstr "ì´ ë¶€ëŒ€ë¡œë¶€í„° 너무 멀리 있습니다"
-#: client/control.c:2230 client/control.c:2260 client/control.c:2276
+#: client/control.c:2225 client/control.c:2255 client/control.c:2271
msgid "Didn't find a route to the destination!"
msgstr ""
-#: client/control.c:2320
+#: client/control.c:2315
msgid "Oh my! You seem to have no capital!"
msgstr "오 세ìƒì—! ë‹¹ì‹ ì€ ìˆ˜ë„ê°€ 없어 보입니다."
@@ -7811,115 +7943,122 @@ msgstr ""
#. * last two elements
#. TRANS: List of possible output types has this between
#. * last two elements
-#: client/helpdata.c:1066 client/helpdata.c:1400
+#: client/helpdata.c:1066 client/helpdata.c:1408
msgid " or "
msgstr ""
-#: client/helpdata.c:1068 client/helpdata.c:1388
+#: client/helpdata.c:1068 client/helpdata.c:1396
msgid "?or:, "
msgstr ""
-#: client/helpdata.c:1080
+#: client/helpdata.c:1079
#, 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"
+msgid "* Unit has to be in a city, or a base after %d turn.\n"
+msgid_plural "* Unit has to be in a city, or a base after %d turns.\n"
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1122
+#: client/helpdata.c:1087
+#, c-format
+msgid "* Unit has to be in a city, a base, or on a %s after %d turn.\n"
+msgid_plural "* Unit has to be in a city, a base, or on a %s after %d turns.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: client/helpdata.c:1130
#, c-format
msgid "If we would now start with %s we would need %d bulbs."
msgstr ""
-#: client/helpdata.c:1127
+#: client/helpdata.c:1135
#, 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:1135
+#: client/helpdata.c:1143
msgid "You cannot research this technology."
msgstr ""
-#: client/helpdata.c:1139
+#: client/helpdata.c:1147
msgid " This number may vary depending on what other players will research.\n"
msgstr ""
-#: client/helpdata.c:1151
+#: client/helpdata.c:1159
#, c-format
msgid "* The first player to research %s gets an immediate advance.\n"
msgstr ""
-#: client/helpdata.c:1156
+#: client/helpdata.c:1164
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
msgstr ""
-#: client/helpdata.c:1159
+#: client/helpdata.c:1167
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
msgstr ""
-#: client/helpdata.c:1163
+#: client/helpdata.c:1171
msgid "* Increases the pollution generated by the population.\n"
msgstr ""
-#: client/helpdata.c:1168
+#: client/helpdata.c:1176
#, c-format
msgid "* Allows %s to build roads on river squares.\n"
msgstr ""
-#: client/helpdata.c:1175
+#: client/helpdata.c:1183
#, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr ""
-#: client/helpdata.c:1183
+#: client/helpdata.c:1191
#, c-format
msgid "* Allows %s to build airbases.\n"
msgstr ""
-#: client/helpdata.c:1192
+#: client/helpdata.c:1200
#, c-format
msgid "* Allows %s to upgrade roads to railroads.\n"
msgstr ""
-#: client/helpdata.c:1200
+#: client/helpdata.c:1208
#, c-format
msgid "* Allows %s to upgrade irrigation to farmland.\n"
msgstr ""
-#: client/helpdata.c:1234
+#: client/helpdata.c:1242
msgid "* Pollution cannot be generated on this terrain."
msgstr ""
-#: client/helpdata.c:1239
+#: client/helpdata.c:1247
msgid "* You cannot build cities on this terrain."
msgstr ""
-#: client/helpdata.c:1245
+#: client/helpdata.c:1253
msgid "* The coastline of this terrain is unsafe."
msgstr ""
-#: client/helpdata.c:1250
+#: client/helpdata.c:1258
msgid "* This terrain is unsafe for units to travel on."
msgstr ""
-#: client/helpdata.c:1255
+#: client/helpdata.c:1263
msgid "* Land units cannot travel on oceanic terrains."
msgstr ""
-#: client/helpdata.c:1305
+#: client/helpdata.c:1313
msgid "Features:\n"
msgstr ""
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1411 client/helpdata.c:1412
+#: client/helpdata.c:1419 client/helpdata.c:1420
msgid "?outputlist: Nothing "
msgstr ""
-#: client/helpdata.c:1419
+#: client/helpdata.c:1427
#, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -7930,7 +8069,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1429
+#: client/helpdata.c:1437
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -7938,48 +8077,48 @@ msgid ""
msgstr ""
#. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1437
+#: client/helpdata.c:1445
#, c-format
msgid "* You pay %d times normal %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1442
+#: client/helpdata.c:1450
#, 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:1447
+#: client/helpdata.c:1455
#, c-format
msgid "* You pay no %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1451
+#: client/helpdata.c:1459
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:1460
+#: client/helpdata.c:1468
#, 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:1468
+#: client/helpdata.c:1476
#, c-format
msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
msgstr ""
-#: client/helpdata.c:1475
+#: client/helpdata.c:1483
#, 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:1482
+#: client/helpdata.c:1490
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -7987,23 +8126,23 @@ msgid ""
msgstr ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1489
+#: client/helpdata.c:1497
#, 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:1497
+#: client/helpdata.c:1505
#, c-format
msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
msgstr ""
-#: client/helpdata.c:1502
+#: client/helpdata.c:1510
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr ""
-#: client/helpdata.c:1507
+#: client/helpdata.c:1515
#, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -8014,7 +8153,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1519
+#: client/helpdata.c:1527
#, 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"
@@ -8022,60 +8161,60 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1530
+#: client/helpdata.c:1538
#, 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:1536
+#: client/helpdata.c:1544
msgid "* Your units cannot be bribed.\n"
msgstr "※ ë‹¹ì‹ ì˜ ë¶€ëŒ€ë¥¼ 매수시킬 수 없습니다.\n"
-#: client/helpdata.c:1539
+#: client/helpdata.c:1547
msgid "* Your cities cannot be incited.\n"
msgstr ""
-#: client/helpdata.c:1543
+#: client/helpdata.c:1551
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:1549
+#: client/helpdata.c:1557
msgid "* Has a senate that may prevent declaration of war.\n"
msgstr ""
-#: client/helpdata.c:1553
+#: client/helpdata.c:1561
msgid "* Allows partisans when cities are taken by the enemy.\n"
msgstr ""
-#: client/helpdata.c:1557
+#: client/helpdata.c:1565
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
msgstr ""
-#: client/helpdata.c:1561
+#: client/helpdata.c:1569
msgid "* Pays no upkeep for fanatics.\n"
msgstr ""
-#: client/helpdata.c:1564
+#: client/helpdata.c:1572
msgid "* Has no unhappy citizens.\n"
msgstr ""
-#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
+#: client/helpdata.c:1582 client/helpdata.c:1586 client/helpdata.c:1590
#, c-format
msgid "* Veteran %s units.\n"
msgstr ""
-#: client/helpdata.c:1585
+#: client/helpdata.c:1593
msgid "* Veteran units.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1591
+#: client/helpdata.c:1599
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8083,7 +8222,7 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1600
+#: client/helpdata.c:1608
#, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8091,71 +8230,71 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1608
+#: client/helpdata.c:1616
#, 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:1617
+#: client/helpdata.c:1625
#, c-format
msgid "* %s production is increased %d%%.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1625
+#: client/helpdata.c:1633
#, c-format
msgid "* %s production will suffer massive waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1630
+#: client/helpdata.c:1638
#, c-format
msgid "* %s production will suffer some waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1635
+#: client/helpdata.c:1643
#, 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:1643
+#: client/helpdata.c:1651
#, 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:1649
+#: client/helpdata.c:1657
#, 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:1655
+#: client/helpdata.c:1663
#, c-format
msgid "* %s waste will increase slowly with distance from capital.\n"
msgstr ""
-#: client/helpdata.c:1672
+#: client/helpdata.c:1680
#, c-format
msgid "* Allows you to build %s.\n"
msgstr ""
#. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1699
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d %s"
msgstr ""
-#: client/helpdata.c:1700 client/helpdata.c:1708 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1708 client/helpdata.c:1716 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:1707
+#: client/helpdata.c:1715
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d 불만"
@@ -8224,7 +8363,7 @@ msgid ""
"or with the -a command-line parameter."
msgstr ""
-#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:916 data/Freeciv.in:107
msgid "Metaserver"
msgstr "메타 서버"
@@ -8573,35 +8712,35 @@ msgstr ""
msgid "Saved settings to file %s"
msgstr ""
-#: client/packhand.c:211 client/packhand.c:217
+#: client/packhand.c:212 client/packhand.c:218
msgid "You were rejected from the game...."
msgstr ""
-#: client/packhand.c:229
+#: client/packhand.c:230
#, c-format
msgid "Client capability string: %s"
msgstr ""
-#: client/packhand.c:232
+#: client/packhand.c:233
#, c-format
msgid "Server capability string: %s"
msgstr ""
-#: client/packhand.c:850
+#: client/packhand.c:864
#, c-format
msgid "Start of turn %d"
msgstr ""
-#: client/packhand.c:1591
+#: client/packhand.c:1621
#, c-format
msgid "AI Mode is now %s."
msgstr ""
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "ON"
msgstr ""
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "OFF"
msgstr ""
@@ -8632,15 +8771,15 @@ msgstr "ì´ë¦„"
msgid "Username"
msgstr "사용ìžëª…"
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
-#: client/gui-gtk-2.0/pages.c:2157
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:653
+#: client/gui-gtk-2.0/pages.c:1604 client/gui-gtk-2.0/pages.c:2159
msgid "Flag"
msgstr "êµê¸°"
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1605
-#: client/gui-gtk-2.0/pages.c:2159 client/gui-sdl/repodlgs.c:2063
-#: client/gui-win32/connectdlg.c:990 client/gui-win32/dialogs.c:542
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:657
+#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1609
+#: client/gui-gtk-2.0/pages.c:2161 client/gui-sdl/repodlgs.c:2063
+#: client/gui-win32/connectdlg.c:992 client/gui-win32/dialogs.c:542
#: client/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "민족"
@@ -8653,7 +8792,7 @@ msgstr "êµê²½"
msgid "Score"
msgstr "ë“ì "
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1614
msgid "Team"
msgstr "팀"
@@ -8686,36 +8825,36 @@ msgstr "대기"
msgid "Ping"
msgstr "í•‘"
-#: client/repodlgs_common.c:375
+#: client/repodlgs_common.c:378
msgid "You cannot sell improvements."
msgstr ""
-#: client/repodlgs_common.c:391
+#: client/repodlgs_common.c:394
#, c-format
msgid "Sold %d %s for %d gold."
msgstr ""
-#: client/repodlgs_common.c:396
+#: client/repodlgs_common.c:399
#, c-format
msgid "No %s could be sold."
msgstr ""
#. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:415
+#: client/repodlgs_common.c:418
msgid "You cannot disband units."
msgstr ""
-#: client/repodlgs_common.c:420
+#: client/repodlgs_common.c:423
#, c-format
msgid "%s cannot be disbanded."
msgstr ""
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:444
#, c-format
msgid "Disbanded %d %s."
msgstr ""
-#: client/repodlgs_common.c:445
+#: client/repodlgs_common.c:448
#, c-format
msgid "No %s could be disbanded."
msgstr ""
@@ -9299,47 +9438,47 @@ msgstr "%02dì¼ %02d시간"
msgid "?duration:overflow"
msgstr ""
-#: client/text.c:1143
+#: client/text.c:1145
#, c-format
msgid "%6d.%02d ms"
msgstr "%6d.%02d ms"
#. TRANS: <nation adjective> <government name>.
#. * E.g. "Polish Republic".
-#: client/text.c:1188
+#: client/text.c:1193
#, c-format
msgid "?nationgovernment:%s %s"
msgstr "%sì˜ %s êµê°€"
#. TRANS: "Observer: 1985"
-#: client/text.c:1198
+#: client/text.c:1203
#, c-format
msgid "Observer: %s"
msgstr "관찰ìž: %s"
-#: client/text.c:1216
+#: client/text.c:1221
msgid "Buildings: "
msgstr "건물: "
-#: client/text.c:1233 client/text.c:1272
+#: client/text.c:1238 client/text.c:1277
msgid "None. "
msgstr "ì—†ìŒ."
-#: client/text.c:1235 client/text.c:1274
+#: client/text.c:1240 client/text.c:1279
msgid "?clistend:."
msgstr "."
-#: client/text.c:1253
+#: client/text.c:1258
msgid "Wonders: "
msgstr "불가사ì˜: "
-#: client/text.c:1308
+#: client/text.c:1313
#, c-format
msgid "Cities: %d total, %d over threshold of %d cities."
msgstr ""
#. TRANS: 0-21 content [citizen(s)] ...
-#: client/text.c:1312
+#: client/text.c:1317
#, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
@@ -9347,60 +9486,60 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1318
+#: client/text.c:1323
#, c-format
msgid "%d additional unhappy citizen."
msgid_plural "%d additional unhappy citizens."
msgstr[0] ""
msgstr[1] ""
-#: client/text.c:1339
+#: client/text.c:1344
msgid "Unlimited martial law in effect."
msgstr ""
-#: client/text.c:1341
+#: client/text.c:1346
#, c-format
msgid "%d military unit may impose martial law."
msgid_plural "Up to %d military units may impose martial law."
msgstr[0] ""
msgstr[1] ""
-#: client/text.c:1345
+#: client/text.c:1350
#, c-format
msgid "Each military unit makes %d unhappy citizen content."
msgid_plural "Each military unit makes %d unhappy citizens content."
msgstr[0] ""
msgstr[1] ""
-#: client/text.c:1352
+#: client/text.c:1357
msgid "Military units in the field may cause unhappiness. "
msgstr "í‰ì§€ìƒì—ì„œ êµ° 부대는 ë¶ˆí–‰ì„ ì•¼ê¸°í• ìˆ˜ 있습니다."
-#: client/text.c:1355
+#: client/text.c:1360
msgid "Military units have no happiness effect. "
msgstr ""
-#: client/text.c:1370
+#: client/text.c:1375
#, c-format
msgid "Luxury: %d total."
msgstr "복지: ì´ì•¡ %d."
-#: client/tilespec.c:865
+#: client/tilespec.c:882
msgid "No usable default tileset found, aborting!"
msgstr ""
-#: client/tilespec.c:1338
+#: client/tilespec.c:1355
msgid ""
"Client does not support isometric tilesets. Using default tileset instead."
msgstr ""
-#: client/tilespec.c:1347
+#: client/tilespec.c:1364
msgid ""
"Client does not support overhead view tilesets. Using default tileset "
"instead."
msgstr ""
-#: client/tilespec.c:3966
+#: client/tilespec.c:3987
#, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -10061,7 +10200,7 @@ msgid "_Display"
msgstr "표시(_D)"
#: client/gui-gtk-2.0/cityrep.c:1006 client/gui-gtk-2.0/menu.c:839
-#: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
+#: client/gui-sdl/diplodlg.c:692 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
#: client/gui-xaw/cityrep.c:533 client/gui-xaw/menu.c:156
@@ -10229,192 +10368,192 @@ msgstr "ë¯¸ë¦¬ì„¤ì • ì´ë¦„ì„ ì§€ì–´ 주세요."
msgid "Remove this preset?"
msgstr "ì´ ë¯¸ë¦¬ì„¤ì •ì„ ì§€ìš°ì‹œê² ìŠµë‹ˆê¹Œ?"
-#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:222
+#: client/gui-gtk-2.0/dialogs.c:197 client/gui-gtk-2.0/messagewin.c:222
msgid "Goto _Location"
msgstr "장소로 ì´ë™í•˜ê¸°(_L)"
-#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
+#: client/gui-gtk-2.0/dialogs.c:202 client/gui-gtk-2.0/messagewin.c:226
msgid "Inspect _City"
msgstr "ë„ì‹œ 조사(_C)"
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:258 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:258 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:259 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:311 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:312 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:312 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:313 client/gui-win32/dialogs.c:1755
#: data/Freeciv.in:2502
msgid "Select what to pillage:"
msgstr "약탈 í• ê²ƒì„ ì„ íƒí•˜ì„¸ìš”:"
-#: client/gui-gtk-2.0/dialogs.c:506
+#: client/gui-gtk-2.0/dialogs.c:507
msgid "Unit"
msgstr "부대"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:950
-#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2155
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:985
+#: client/gui-gtk-2.0/dialogs.c:508 client/gui-gtk-2.0/pages.c:950
+#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2157
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:987
#: client/gui-win32/plrdlg.c:335 manual/civmanual.c:302 data/Freeciv.in:80
msgid "Name"
msgstr "ì´ë¦„"
-#: client/gui-gtk-2.0/dialogs.c:519 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:520 client/gui-sdl/dialogs.c:627
msgid "Unit selection"
msgstr "부대 ì„ íƒ"
-#: client/gui-gtk-2.0/dialogs.c:582
+#: client/gui-gtk-2.0/dialogs.c:583
msgid "_Ready all"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:590
+#: client/gui-gtk-2.0/dialogs.c:591
msgid "_Sentry idle"
msgstr "대기하는 부대 보초시킴(_S)"
-#: client/gui-gtk-2.0/dialogs.c:719
+#: client/gui-gtk-2.0/dialogs.c:721
msgid "Nation _Groups:"
msgstr "민족 그룹:(_G)"
-#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:766 data/Freeciv.in:3128
msgid "What Nation Will You Be?"
msgstr "어떤 민족으로 합니까?"
-#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
-#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
+#: client/gui-gtk-2.0/dialogs.c:768 client/gui-sdl/chatline.c:842
+#: client/gui-win32/connectdlg.c:1040 data/Freeciv.in:3371
msgid "Pick Nation"
msgstr "ë¯¼ì¡±ì„ ì„ íƒ"
-#: client/gui-gtk-2.0/dialogs.c:774
+#: client/gui-gtk-2.0/dialogs.c:776
msgid "_Random Nation"
msgstr "ë¬´ìž‘ìœ„ì˜ ë¯¼ì¡±(_R)"
-#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:792 client/gui-win32/dialogs.c:517
msgid "Select a nation"
msgstr "ë¯¼ì¡±ì„ ì„ íƒí•˜ì„¸ìš”"
-#: client/gui-gtk-2.0/dialogs.c:804
+#: client/gui-gtk-2.0/dialogs.c:810
msgid "_Properties"
msgstr "ì†ì„±(_P)"
-#: client/gui-gtk-2.0/dialogs.c:824
+#: client/gui-gtk-2.0/dialogs.c:830
msgid "_Leader:"
msgstr "지ë„ìž:(_L)"
-#: client/gui-gtk-2.0/dialogs.c:831
+#: client/gui-gtk-2.0/dialogs.c:837
msgid "_Female"
msgstr "ì—¬(_F)"
-#: client/gui-gtk-2.0/dialogs.c:836
+#: client/gui-gtk-2.0/dialogs.c:842
msgid "_Male"
msgstr "남(_M)"
-#: client/gui-gtk-2.0/dialogs.c:863
+#: client/gui-gtk-2.0/dialogs.c:869
msgid "City _Styles:"
msgstr "ë„시형:(_S)"
-#: client/gui-gtk-2.0/dialogs.c:902
+#: client/gui-gtk-2.0/dialogs.c:908
msgid "_Description"
msgstr "묘사(_D)"
-#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1263 client/gui-xaw/dialogs.c:1480
msgid "You must select your sex."
msgstr "ì„±ë³„ì„ ì„ íƒí•˜ìƒˆìš”."
-#: client/gui-gtk-2.0/dialogs.c:1253 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1268 client/gui-xaw/dialogs.c:1485
msgid "You must select your city style."
msgstr "ë„ì‹œí˜•ì„ ì„ íƒí•˜ìƒˆìš”."
-#: client/gui-gtk-2.0/dialogs.c:1262 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1277 client/gui-sdl/dialogs.c:2204
#: 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:1306 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1318 client/gui-win32/citydlg.c:1454
#: data/Freeciv.in:2484
msgid "Upgrade Unit!"
msgstr "부대를 ì—…ê·¸ë ˆì´ë“œ 하기"
-#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1327 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 ""
-#: client/gui-gtk-2.0/diplodlg.c:231 client/gui-win32/diplodlg.c:151
+#: client/gui-gtk-2.0/diplodlg.c:222 client/gui-win32/diplodlg.c:151
#: client/gui-xaw/diplodlg.c:383 client/gui-xaw/diplodlg.c:401
msgid "World-map"
msgstr "세계 지ë„"
-#: client/gui-gtk-2.0/diplodlg.c:237 client/gui-win32/diplodlg.c:146
+#: client/gui-gtk-2.0/diplodlg.c:228 client/gui-win32/diplodlg.c:146
#: client/gui-xaw/diplodlg.c:387 client/gui-xaw/diplodlg.c:405
msgid "Sea-map"
msgstr "í•´ì–‘ 지ë„"
-#: client/gui-gtk-2.0/diplodlg.c:243
+#: client/gui-gtk-2.0/diplodlg.c:234
msgid "_Maps"
msgstr "지ë„(_M)"
-#: client/gui-gtk-2.0/diplodlg.c:274
+#: client/gui-gtk-2.0/diplodlg.c:265
msgid "_Advances"
msgstr "ê¸°ìˆ (_A)"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/diplodlg.c:315 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "ë„ì‹œ(_C)"
-#: client/gui-gtk-2.0/diplodlg.c:333
+#: client/gui-gtk-2.0/diplodlg.c:324
msgid "_Give shared vision"
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:346
+#: client/gui-gtk-2.0/diplodlg.c:337
msgid "Give _embassy"
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:376
+#: client/gui-gtk-2.0/diplodlg.c:368
msgid "_Pacts"
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:466
+#: client/gui-gtk-2.0/diplodlg.c:458
#, c-format
msgid "Diplomacy: %s"
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:473
+#: client/gui-gtk-2.0/diplodlg.c:465
msgid "_Cancel meeting"
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:475
+#: client/gui-gtk-2.0/diplodlg.c:467
msgid "Accept _treaty"
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:503
+#: client/gui-gtk-2.0/diplodlg.c:495
msgid "C_lauses:"
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:568 client/gui-gtk-2.0/diplodlg.c:642
+#: client/gui-gtk-2.0/diplodlg.c:560 client/gui-gtk-2.0/diplodlg.c:634
msgid "_Gold:"
msgstr "금:(_G)"
-#: client/gui-gtk-2.0/diplodlg.c:580 client/gui-gtk-2.0/diplodlg.c:654
+#: client/gui-gtk-2.0/diplodlg.c:572 client/gui-gtk-2.0/diplodlg.c:646
msgid "_Add Clause..."
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:699
+#: client/gui-gtk-2.0/diplodlg.c:691
msgid "--- This treaty is blank. Please add some clauses. ---"
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:905 client/gui-sdl/diplodlg.c:375
+#: client/gui-gtk-2.0/diplodlg.c:897 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 ""
@@ -10473,99 +10612,99 @@ msgstr "목ì 지 ì„¤ì •"
msgid "Show _All Cities"
msgstr "ëª¨ë“ ë„ì‹œ 보기"
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:164
msgid "Show Map Scrollbars"
msgstr "맵 스í¬ë¡¤ ë°” ë³´ì´ê¸°"
-#: client/gui-gtk-2.0/gui_main.c:163
+#: client/gui-gtk-2.0/gui_main.c:165
msgid "Disable this option to hide the scrollbars on the map view."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:169
msgid "Keyboardless goto"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:168
+#: client/gui-gtk-2.0/gui_main.c:170
msgid ""
"If this option is set then a goto may be initiated by left-clicking and then "
"holding down the mouse button while dragging the mouse onto a different tile."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:173
+#: client/gui-gtk-2.0/gui_main.c:175
msgid "Keep dialogs on top"
msgstr "다ì´ì–¼ë¡œê·¸ í•ìƒ 위ì—"
-#: client/gui-gtk-2.0/gui_main.c:174
+#: client/gui-gtk-2.0/gui_main.c:176
msgid ""
"If this option is set then dialog windows will always remain in front of the "
"main Freeciv window. Disabling this has no effect in fullscreen mode."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:178
+#: client/gui-gtk-2.0/gui_main.c:180
msgid "Show worklist task icons"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:179
+#: client/gui-gtk-2.0/gui_main.c:181
msgid ""
"Disabling this will turn off the unit and building icons in the worklist "
"dialog and the production tab of the city dialog."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:183
+#: client/gui-gtk-2.0/gui_main.c:185
msgid "Enable status report tabs"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:184
+#: client/gui-gtk-2.0/gui_main.c:186
msgid ""
"If this option is enabled then report dialogs will be shown as separate tabs "
"rather than in popup dialogs."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:189 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:191 client/gui-win32/gui_main.c:110
msgid "Better fog-of-war drawing"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:190 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:192 client/gui-win32/gui_main.c:111
msgid ""
"If this is enabled then a better method is used for drawing fog-of-war. It "
"is not any slower but will consume about twice as much memory."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:195
+#: client/gui-gtk-2.0/gui_main.c:197
msgid "Show time for each chat message"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:196
+#: client/gui-gtk-2.0/gui_main.c:198
msgid ""
"If this option is enabled then all chat messages will be prefixed by a time "
"string of the form [hour:minute:second]."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:201
+#: client/gui-gtk-2.0/gui_main.c:203
msgid "Split bottom notebook area"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:202
+#: client/gui-gtk-2.0/gui_main.c:204
msgid ""
"Enabling this option will split the bottom notebook into a left and right "
"notebook so that two tabs may be viewed at once."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:207
+#: client/gui-gtk-2.0/gui_main.c:209
msgid "New message events go to top of list"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:208
+#: client/gui-gtk-2.0/gui_main.c:210
msgid ""
"If this option is enabled, new events in the message window will appear at "
"the top of the list, rather than being appended at the bottom."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:213
+#: client/gui-gtk-2.0/gui_main.c:215
msgid "Show extra message window buttons"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:214
+#: client/gui-gtk-2.0/gui_main.c:216
msgid ""
"If this option is enabled, there will be two buttons displayed in the "
"message window for inspecting a city and going to a location. If this option "
@@ -10575,21 +10714,21 @@ msgid ""
"closed and reopened."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:224
+#: client/gui-gtk-2.0/gui_main.c:226
msgid "Metaserver tab first in network page"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:225
+#: client/gui-gtk-2.0/gui_main.c:227
msgid ""
"If this option is enabled, the metaserver tab will be the first notebook tab "
"in the network page. This option requires a restart in order to take effect."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:230
+#: client/gui-gtk-2.0/gui_main.c:232
msgid "Plain chat messages are sent to allies only"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:231
+#: client/gui-gtk-2.0/gui_main.c:233
msgid ""
"If this option is enabled, then plain messages typed into the chat entry "
"while the game is running will only be sent to your allies. Otherwise plain "
@@ -10599,7 +10738,20 @@ msgid ""
"visible in multiplayer games)."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:340 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:245
+msgid "Arrange widgets for small displays"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:246
+msgid ""
+"If this option is enabled, widgets in the main window will be arrange so "
+"that they take up the least amount of total screen space. Specifically, the "
+"left panel containing the overview, player status, and the unit information "
+"box will be extended over the entire left side of the window. This option "
+"requires a restart in order to take effect."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:352 client/gui-xaw/gui_main.c:245
msgid ""
"This client has no special command line options\n"
"\n"
@@ -10607,22 +10759,22 @@ msgstr ""
"ì´ í´ë¼ì´ì–¸íŠ¸ëŠ” 특별한 ëª…ë ¹ì¤„ ì˜µì…˜ì´ ì—†ìŠµë‹ˆë‹¤\n"
"\n"
-#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
+#: client/gui-gtk-2.0/gui_main.c:847 client/gui-gtk-2.0/gui_main.c:1542
msgid "Freeciv"
msgstr "Freeciv"
-#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
+#: client/gui-gtk-2.0/gui_main.c:1251 client/gui-gtk-2.0/gui_main.c:1258
#: client/gui-sdl/mapctrl.c:1566 client/gui-win32/gui_main.c:482
#: data/Freeciv.in:2618
msgid "Turn Done"
msgstr "턴 종료"
-#: client/gui-gtk-2.0/gui_main.c:1232 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1258 client/gui-sdl/mapctrl.c:1566
#: client/gui-sdl/mapview.c:1082
msgid "Shift+Return"
msgstr "Shift+Return"
-#: client/gui-gtk-2.0/gui_main.c:1266 client/gui-gtk-2.0/menu.c:797
+#: client/gui-gtk-2.0/gui_main.c:1299 client/gui-gtk-2.0/menu.c:797
#: client/gui-gtk-2.0/menu.c:799 client/gui-gtk-2.0/menu.c:801
#: client/gui-gtk-2.0/menu.c:803 client/gui-gtk-2.0/menu.c:805
#: client/gui-gtk-2.0/menu.c:807 client/gui-gtk-2.0/menu.c:809
@@ -10641,11 +10793,11 @@ msgstr "Shift+Return"
msgid "View"
msgstr "보기"
-#: client/gui-gtk-2.0/gui_main.c:1359
+#: client/gui-gtk-2.0/gui_main.c:1393
msgid "Chat"
msgstr "대화"
-#: client/gui-gtk-2.0/gui_main.c:1377 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1411 client/gui-win32/gui_main.c:538
#: data/Freeciv.in:2809
msgid ""
"Freeciv is free software and you are welcome to distribute copies of it\n"
@@ -10657,77 +10809,77 @@ msgstr ""
"다.\n"
" ê·¸ë¦¬ê³ ... í•´ë³´ìžêµ¬ìš”."
-#: client/gui-gtk-2.0/gui_main.c:1392
+#: client/gui-gtk-2.0/gui_main.c:1426
msgid "Allies Only"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1657
+#: client/gui-gtk-2.0/gui_main.c:1691
msgid "Not _ready"
msgstr "준비 안 ë슴(_R)"
-#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
+#: client/gui-gtk-2.0/gui_main.c:1702 client/gui-gtk-2.0/pages.c:1679
msgid "_Ready"
msgstr "준비 ë슴(_R)"
-#: client/gui-gtk-2.0/gui_main.c:1672 client/gui-gtk-2.0/gui_main.c:1678
-#: client/gui-gtk-2.0/pages.c:2204
+#: client/gui-gtk-2.0/gui_main.c:1706 client/gui-gtk-2.0/gui_main.c:1712
+#: client/gui-gtk-2.0/pages.c:2206
msgid "_Start"
msgstr "시작(_S)"
-#: client/gui-gtk-2.0/gui_main.c:1686
+#: client/gui-gtk-2.0/gui_main.c:1720
msgid "_Take Player"
msgstr "ì´ ì‚¬ìš©ìž ë°ë ¤ì˜¤ê¸°(_T)"
-#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
+#: client/gui-gtk-2.0/gui_main.c:1723 client/gui-gtk-2.0/pages.c:1669
msgid "Pick _Nation"
msgstr "민족 ì„ íƒ(_N)"
-#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
+#: client/gui-gtk-2.0/gui_main.c:1730 client/gui-gtk-2.0/pages.c:1674
msgid "_Observe"
msgstr "관찰하기(_O)"
-#: client/gui-gtk-2.0/gui_main.c:1698
+#: client/gui-gtk-2.0/gui_main.c:1732
msgid "Do not _observe"
msgstr "ê´€ì°°ì„ ì·¨ì†Œí•˜ê¸°(_O)"
-#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1755 client/gui-xaw/pages.c:211
msgid "<AI>"
msgstr "<AI>"
-#: client/gui-gtk-2.0/gui_main.c:1723
+#: client/gui-gtk-2.0/gui_main.c:1758
msgid "<Novice AI>"
msgstr "<초보 AI>"
-#: client/gui-gtk-2.0/gui_main.c:1726
+#: client/gui-gtk-2.0/gui_main.c:1761
msgid "<Easy AI>"
msgstr "<쉬운 AI>"
-#: client/gui-gtk-2.0/gui_main.c:1729
+#: client/gui-gtk-2.0/gui_main.c:1764
msgid "<Normal AI>"
msgstr "<보통 AI>"
-#: client/gui-gtk-2.0/gui_main.c:1732
+#: client/gui-gtk-2.0/gui_main.c:1767
msgid "<Hard AI>"
msgstr "<ì–´ë ¤ìš´ AI>"
-#: client/gui-gtk-2.0/gui_main.c:1742 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1777 client/gui-win32/dialogs.c:594
#: client/gui-xaw/pages.c:217
msgid "Random"
msgstr "무작위"
-#: client/gui-gtk-2.0/gui_main.c:1808
+#: client/gui-gtk-2.0/gui_main.c:1844 client/gui-gtk-2.0/gui_main.c:1858
msgid "Observer"
msgstr "관찰ìž"
-#: client/gui-gtk-2.0/gui_main.c:1808
+#: client/gui-gtk-2.0/gui_main.c:1858
msgid "Detached"
msgstr "붙임"
-#: client/gui-gtk-2.0/gui_main.c:2073
+#: client/gui-gtk-2.0/gui_main.c:2117
msgid "Are you sure you want to quit?"
msgstr "ì •ë§ ëë‚´ì‹œê² ìŠµë‹ˆê¹Œ?"
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
#, c-format
msgid ""
"Close Tab:\n"
@@ -10736,7 +10888,7 @@ msgstr ""
"íƒ ë‹«ê¸°:\n"
"%s"
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
msgid "Ctrl+W"
msgstr "Ctrl+W"
@@ -10841,8 +10993,8 @@ msgid "Trans. Rslt/Time:"
msgstr ""
#: 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
-#: client/gui-win32/helpdlg.c:709 client/gui-win32/helpdlg.c:733
+#: client/gui-win32/helpdlg.c:502 client/gui-win32/helpdlg.c:550
+#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:739
#: client/gui-xaw/helpdlg.c:759 client/gui-xaw/helpdlg.c:808
#: client/gui-xaw/helpdlg.c:816 client/gui-xaw/helpdlg.c:853
#: client/gui-xaw/helpdlg.c:878
@@ -10889,34 +11041,34 @@ msgstr "ê³µë™"
msgid "?techhelp:"
msgstr "?techhelp:"
-#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:591
+#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:597
#: client/gui-xaw/helpdlg.c:996
#, c-format
msgid "+%d Trade / %d"
msgstr "+%d ë¬´ì— / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:595
+#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:601
#: client/gui-xaw/helpdlg.c:1000
#, c-format
msgid "no extra / %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
-#: client/gui-win32/helpdlg.c:602 client/gui-win32/helpdlg.c:616
-#: client/gui-win32/helpdlg.c:635 client/gui-xaw/helpdlg.c:1002
+#: client/gui-gtk-2.0/helpdlg.c:1085 client/gui-win32/helpdlg.c:604
+#: client/gui-win32/helpdlg.c:608 client/gui-win32/helpdlg.c:622
+#: client/gui-win32/helpdlg.c:641 client/gui-xaw/helpdlg.c:1002
#: client/gui-xaw/helpdlg.c:1006 client/gui-xaw/helpdlg.c:1020
#: client/gui-xaw/helpdlg.c:1039
msgid "n/a"
msgstr "ì—†ìŒ"
-#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:605
+#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:611
#: client/gui-xaw/helpdlg.c:1009
#, c-format
msgid "+%d Food / %d"
msgstr "+%d ì‹ëŸ‰ / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:619
+#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:625
#: client/gui-xaw/helpdlg.c:1023
#, c-format
msgid "+%d Res. / %d"
@@ -11672,41 +11824,41 @@ msgstr "ë„¤íŠ¸ì› ê²Œìž„ì— ì—°ê²°(_O)"
msgid "Connect to Gaming _Zone"
msgstr "Gaming Zone으로 연결(_Z)"
-#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:302
#: client/gui-xaw/connectdlg.c:326
msgid "Passwords don't match, enter password."
msgstr ""
#: client/gui-gtk-2.0/pages.c:779 client/gui-gtk-2.0/pages.c:820
-#: client/gui-win32/connectdlg.c:916
+#: client/gui-win32/connectdlg.c:918
msgid "Server Name"
msgstr "서버명"
#: client/gui-gtk-2.0/pages.c:780 client/gui-gtk-2.0/pages.c:821
-#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:916
+#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:918
#: data/Freeciv.in:96
msgid "Port"
msgstr "í¬íŠ¸"
#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Version"
msgstr "ë²„ì „"
#: client/gui-gtk-2.0/pages.c:782 client/gui-gtk-2.0/pages.c:823
-#: client/gui-gtk-2.0/pages.c:2161 client/gui-win32/connectdlg.c:917
-#: client/gui-win32/connectdlg.c:995
+#: client/gui-gtk-2.0/pages.c:2163 client/gui-win32/connectdlg.c:919
+#: client/gui-win32/connectdlg.c:997
msgid "Status"
msgstr "ìƒíƒœ"
#: client/gui-gtk-2.0/pages.c:783 client/gui-gtk-2.0/pages.c:824
#: client/gui-sdl/connectdlg.c:318 client/gui-sdl/plrdlg.c:330
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Players"
msgstr "사용ìž"
#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
-#: client/gui-win32/connectdlg.c:918
+#: client/gui-win32/connectdlg.c:920
msgid "Comment"
msgstr "비í‰"
@@ -11738,9 +11890,9 @@ msgstr "암호:(_W)"
msgid "Conf_irm Password:"
msgstr "암호 확ì¸:(_I)"
-#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2165
#: 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:1000
+#: client/gui-win32/citydlg.c:1083 client/gui-win32/connectdlg.c:1002
#: client/gui-win32/wldlg.c:800 client/gui-win32/wldlg.c:806
msgid "Type"
msgstr "형ì‹"
@@ -11832,7 +11984,7 @@ msgstr "AI ìˆ™ë ¨ ë ˆë²¨:(_L)"
msgid "Ruleset _Version:"
msgstr "룰세트:(_V)"
-#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2195
msgid "_More Game Options..."
msgstr "기타 게임 옵션...(_M)"
@@ -11848,48 +12000,48 @@ msgstr "비율"
msgid "Ready"
msgstr "준비"
-#: client/gui-gtk-2.0/pages.c:1601
+#: client/gui-gtk-2.0/pages.c:1600
msgid "?player:Leader"
msgstr "지ë„ìž"
-#: client/gui-gtk-2.0/pages.c:1732 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1734 client/gui-sdl/chatline.c:185
msgid "Choose Saved Game to Load"
msgstr "로드하기 위해 ì €ìž¥ëœ ê²Œìž„ì„ ì„ íƒí•˜ì„¸ìš”"
-#: client/gui-gtk-2.0/pages.c:1824
+#: client/gui-gtk-2.0/pages.c:1826
msgid "Choose Saved Game to _Load:"
msgstr "로드하기 위해 ì €ìž¥ëœ ê²Œìž„ì„ ì„ íƒí•˜ì„¸ìš”:"
-#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
-#: client/gui-gtk-2.0/pages.c:2451
+#: client/gui-gtk-2.0/pages.c:1846 client/gui-gtk-2.0/pages.c:2039
+#: client/gui-gtk-2.0/pages.c:2455
msgid "_Browse..."
msgstr "찾아보기(_B)"
-#: client/gui-gtk-2.0/pages.c:1911
+#: client/gui-gtk-2.0/pages.c:1913
msgid "Choose a Scenario"
msgstr "시나리오 ì„ íƒ"
-#: client/gui-gtk-2.0/pages.c:1998
+#: client/gui-gtk-2.0/pages.c:2000
msgid "Choose a _Scenario:"
msgstr "시나리오 ì„ íƒ:(_S)"
-#: client/gui-gtk-2.0/pages.c:2173
+#: client/gui-gtk-2.0/pages.c:2175
msgid "Choose a _nation to play:"
msgstr "ë¯¼ì¡±ì„ ì„ íƒí•˜ì„¸ìš”:(_N)"
-#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2367 client/gui-win32/menu.c:581
msgid "Select Location to Save"
msgstr "ì €ìž¥í•˜ê¸° 위한 장소 ì„ íƒ"
-#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2452 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "게임 ì €ìž¥"
-#: client/gui-gtk-2.0/pages.c:2489
+#: client/gui-gtk-2.0/pages.c:2493
msgid "Saved _Games:"
msgstr "ì €ìž¥ëœ ê²Œìž„ë“¤ :"
-#: client/gui-gtk-2.0/pages.c:2516
+#: client/gui-gtk-2.0/pages.c:2520
msgid "Save _Filename:"
msgstr "파ì¼ì´ë¦„ ì €ìž¥ :"
@@ -12230,7 +12382,7 @@ msgstr "창 닫기 (Esc)"
msgid "Total users logged in : %d"
msgstr ""
-#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1098
msgid "Back"
msgstr "뒤로"
@@ -12239,7 +12391,7 @@ msgid "Start"
msgstr "시작"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:777
+#: client/gui-win32/connectdlg.c:779
msgid "Load Game"
msgstr "로드 게임"
@@ -12279,9 +12431,9 @@ msgstr ""
#: client/gui-sdl/connectdlg.c:308 client/gui-sdl/connectdlg.c:617
#: client/gui-sdl/connectdlg.c:803 client/gui-sdl/connectdlg.c:985
#: client/gui-sdl/dialogs.c:452 client/gui-sdl/dialogs.c:2095
-#: client/gui-sdl/dialogs.c:2893 client/gui-sdl/diplomat_dialog.c:731
+#: client/gui-sdl/dialogs.c:2902 client/gui-sdl/diplomat_dialog.c:731
#: client/gui-sdl/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1043
#: client/gui-win32/dialogs.c:1772 client/gui-win32/finddlg.c:127
#: client/gui-win32/gotodlg.c:171 client/gui-win32/inputdlg.c:146
#: client/gui-win32/messagedlg.c:216 client/gui-win32/ratesdlg.c:328
@@ -12323,7 +12475,7 @@ msgid "Buy it?"
msgstr "êµ¬ìž…í•˜ì‹œê² ìŠµë‹ˆê¹Œ?"
#: 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
+#: client/gui-sdl/diplodlg.c:1336 client/gui-sdl/diplomat_dialog.c:1211
#: client/gui-sdl/diplomat_dialog.c:1417 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:221 client/gui-sdl/repodlgs.c:1559
#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
@@ -12339,7 +12491,7 @@ msgid "No"
msgstr "아니오"
#: client/gui-sdl/citydlg.c:1215 client/gui-sdl/cma_fe.c:318
-#: client/gui-sdl/diplodlg.c:1345 client/gui-sdl/diplomat_dialog.c:1200
+#: client/gui-sdl/diplodlg.c:1346 client/gui-sdl/diplomat_dialog.c:1200
#: client/gui-sdl/diplomat_dialog.c:1407 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:232 client/gui-win32/repodlgs.c:578
#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
@@ -12641,7 +12793,7 @@ msgstr "Freeciv 서버 :"
msgid "Port :"
msgstr "í¬íŠ¸ :"
-#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1100
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr "ì—°ê²°"
@@ -12748,23 +12900,23 @@ msgstr "새로운 ì •ë¶€ ì œë„를 ì„ íƒí•˜ì„¸ìš”"
msgid "REVOLUTION!"
msgstr "í˜ëª…!"
-#: client/gui-sdl/dialogs.c:2232 client/gui-sdl/dialogs.c:2620
+#: client/gui-sdl/dialogs.c:2237 client/gui-sdl/dialogs.c:2625
#: client/gui-win32/dialogs.c:567 data/Freeciv.in:3159
msgid "Female"
msgstr "ì—¬"
-#: client/gui-sdl/dialogs.c:2234 client/gui-sdl/dialogs.c:2618
-#: client/gui-sdl/dialogs.c:2830 client/gui-win32/dialogs.c:565
+#: client/gui-sdl/dialogs.c:2239 client/gui-sdl/dialogs.c:2623
+#: client/gui-sdl/dialogs.c:2839 client/gui-win32/dialogs.c:565
msgid "Male"
msgstr "남"
-#: client/gui-sdl/dialogs.c:2478 client/gui-sdl/dialogs.c:2902
+#: client/gui-sdl/dialogs.c:2483 client/gui-sdl/dialogs.c:2911
#: 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 "확ì¸"
-#: client/gui-sdl/dialogs.c:2685 client/gui-win32/dialogs.c:505
+#: client/gui-sdl/dialogs.c:2694 client/gui-win32/dialogs.c:505
msgid "What nation will you be?"
msgstr "어떤 민족으로 합니까?"
@@ -12791,77 +12943,77 @@ msgstr "세계 지ë„"
msgid "Sea map"
msgstr "í•´ì–‘ 지ë„"
-#: client/gui-sdl/diplodlg.c:563
+#: client/gui-sdl/diplodlg.c:564
msgid "Give embassy"
msgstr ""
-#: client/gui-sdl/diplodlg.c:579 client/gui-win32/diplodlg.c:614
+#: client/gui-sdl/diplodlg.c:580 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 "금화(최대 %d)"
-#: client/gui-sdl/diplodlg.c:613 client/gui-sdl/helpdlg.c:1956
+#: client/gui-sdl/diplodlg.c:614 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 "ê¸°ìˆ "
-#: client/gui-sdl/diplodlg.c:831 client/gui-win32/diplodlg.c:598
+#: client/gui-sdl/diplodlg.c:832 client/gui-win32/diplodlg.c:598
#: data/Freeciv.in:269
msgid "Diplomacy meeting"
msgstr ""
-#: client/gui-sdl/diplodlg.c:883 client/gui-win32/diplodlg.c:680
+#: client/gui-sdl/diplodlg.c:884 client/gui-win32/diplodlg.c:680
#: data/Freeciv.in:510
msgid "Cancel meeting"
msgstr ""
-#: client/gui-sdl/diplodlg.c:895 client/gui-win32/diplodlg.c:679
+#: client/gui-sdl/diplodlg.c:896 client/gui-win32/diplodlg.c:679
#: data/Freeciv.in:501
msgid "Accept treaty"
msgstr ""
#. TRANS: "Polish incident !" FIXME!!!
-#: client/gui-sdl/diplodlg.c:1304
+#: client/gui-sdl/diplodlg.c:1305
#, c-format
msgid "%s incident !"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1322
+#: client/gui-sdl/diplodlg.c:1323
msgid "Shall we declare WAR on them?"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1433
+#: client/gui-sdl/diplodlg.c:1434
msgid "Foreign Minister"
msgstr "외무 장관"
-#: client/gui-sdl/diplodlg.c:1449
+#: client/gui-sdl/diplodlg.c:1450
#, c-format
msgid ""
"Sir!, the %s ambassador has arrived\n"
"What are your wishes?"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1465
+#: client/gui-sdl/diplodlg.c:1466
msgid "Declare WAR"
msgstr "ì „ìŸ ì„ í¬"
-#: client/gui-sdl/diplodlg.c:1467 client/gui-win32/plrdlg.c:357
+#: client/gui-sdl/diplodlg.c:1468 client/gui-win32/plrdlg.c:357
msgid "Cancel Treaty"
msgstr "조약 파기"
-#: client/gui-sdl/diplodlg.c:1490 client/gui-win32/plrdlg.c:358
+#: client/gui-sdl/diplodlg.c:1491 client/gui-win32/plrdlg.c:358
#: data/Freeciv.in:3254
msgid "Withdraw vision"
msgstr "시야 ì œê±°"
-#: client/gui-sdl/diplodlg.c:1507
+#: client/gui-sdl/diplodlg.c:1508
msgid "Call Diplomatic Meeting"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1521
+#: client/gui-sdl/diplodlg.c:1522
msgid "Send him back"
msgstr "그를 ë˜ëŒë ¤ 보냄"
@@ -13587,12 +13739,12 @@ msgid "Leave Game"
msgstr "게임 나가기"
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1100 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1102 client/gui-xaw/menu.c:121
#: data/Freeciv.in:115 data/Freeciv.in:3180
msgid "Quit"
msgstr "종료"
-#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:967
msgid "Start New Game"
msgstr "새로운 게임 시작"
@@ -13704,8 +13856,8 @@ msgstr "순수입: "
msgid "%s max rate : %d%%"
msgstr "%s 최대율 : %d%%"
-#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
-#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1085
+#: client/gui-win32/connectdlg.c:1093 data/Freeciv.in:155
msgid "Update"
msgstr "세로 ê³ ì¹¨"
@@ -14188,67 +14340,67 @@ msgstr "새로운"
msgid "Delete"
msgstr "ì‚ì œ"
-#: client/gui-win32/connectdlg.c:147
+#: client/gui-win32/connectdlg.c:149
msgid "Password:"
msgstr "암호 :"
-#: client/gui-win32/connectdlg.c:169
+#: client/gui-win32/connectdlg.c:171
msgid "Couldn't load the savegame"
msgstr "세ì´ë¸Œëœ ê²Œìž„ì„ ì½ì„수가 없습니다"
-#: client/gui-win32/connectdlg.c:284 client/gui-xaw/connectdlg.c:311
+#: client/gui-win32/connectdlg.c:286 client/gui-xaw/connectdlg.c:311
msgid "Verify Password"
msgstr "암호 ìˆ˜ì •"
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:916 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr "Freeciv 서버 ì„ íƒ"
-#: client/gui-win32/connectdlg.c:915
+#: client/gui-win32/connectdlg.c:917
msgid "Local Area Network"
msgstr "ì§€ì— ë„¤íŠ¸ì›Œí¬"
-#: client/gui-win32/connectdlg.c:949
+#: client/gui-win32/connectdlg.c:951
msgid "Welcome to Freeciv"
msgstr "Freecivì— ì˜¤ì‹ ê±¸ 환ì˜í•©ë‹ˆë‹¤"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Load Saved Game"
msgstr "ì €ìž¥ëœ ê²Œìž„ 불러오기"
-#: client/gui-win32/connectdlg.c:969
+#: client/gui-win32/connectdlg.c:971
msgid "Connect To Network Game"
msgstr "ë„¤íŠ¸ì›Œí¬ ê²Œìž„ 연결하기"
-#: client/gui-win32/connectdlg.c:979
+#: client/gui-win32/connectdlg.c:981
msgid "Choose a nation to play"
msgstr "í”Œë ˆì´ë¥¼ 위한 êµê°€ì„ íƒ"
-#: client/gui-win32/connectdlg.c:1014
+#: client/gui-win32/connectdlg.c:1016
msgid "Number of players (Including AI):"
msgstr "í”Œë ˆì´ì–´ 수(AI í¬í•¨)"
-#: client/gui-win32/connectdlg.c:1022
+#: client/gui-win32/connectdlg.c:1024
msgid "AI skill level:"
msgstr "AI ìˆ™ë ¨ ë ˆë²¨ :"
-#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1038 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr "게임 ì„¤ì •"
-#: client/gui-win32/connectdlg.c:1040
+#: client/gui-win32/connectdlg.c:1042
msgid "Start Game"
msgstr "게임 시작"
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Login:"
msgstr "ë¡œê·¸ì¸ :"
-#: client/gui-win32/connectdlg.c:1061
+#: client/gui-win32/connectdlg.c:1063
msgid "Host:"
msgstr "호스트 :"
-#: client/gui-win32/connectdlg.c:1062
+#: client/gui-win32/connectdlg.c:1064
msgid "Port:"
msgstr "í¬íŠ¸ :"
@@ -14321,21 +14473,21 @@ msgid ""
"this is much slower."
msgstr ""
-#: client/gui-win32/helpdlg.c:769 client/gui-win32/helpdlg.c:792
-#: client/gui-win32/helpdlg.c:803 client/gui-win32/helpdlg.c:809
-#: client/gui-win32/helpdlg.c:822
+#: client/gui-win32/helpdlg.c:775 client/gui-win32/helpdlg.c:798
+#: client/gui-win32/helpdlg.c:809 client/gui-win32/helpdlg.c:815
+#: client/gui-win32/helpdlg.c:828
msgid "Allows "
msgstr "허용"
-#: client/gui-win32/helpdlg.c:780
+#: client/gui-win32/helpdlg.c:786
msgid "Obsoletes "
msgstr "í물"
-#: client/gui-win32/helpdlg.c:812 client/gui-win32/helpdlg.c:825
+#: client/gui-win32/helpdlg.c:818 client/gui-win32/helpdlg.c:831
msgid " (with "
msgstr " ("
-#: client/gui-win32/helpdlg.c:815 client/gui-win32/helpdlg.c:828
+#: client/gui-win32/helpdlg.c:821 client/gui-win32/helpdlg.c:834
msgid "?techhelp:)."
msgstr "?ê¸°ìˆ ë„움ë§:와 함께)."
@@ -15421,11 +15573,12 @@ msgid " Present administrators: "
msgstr " 현재 ê´€ë¦¬ìž : "
#: 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/"
+" https://gna.org/projects/freeciv/"
msgstr ""
"만약 ì–´ë–¤ 버그를 찾게 ëœë‹¤ë©´, 우리ì—게 버그리í¬íŠ¸ë¥¼ 보내주세요. ìµœì„ ë°©ë²•ì€ "
"ì•„ëž˜ì˜ Freeciv 버그 추ì ì‹œìŠ¤í…œì— ë°©ë¬¸í•˜ëŠ” 것입니다, :\n"
@@ -17034,50 +17187,48 @@ msgid ""
"a Factory, Mfg. Plant and Hydro Plant together give a 150% production "
"bonus.\n"
"\n"
-"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant. A city "
-"can only build a Hydro Plant if it is next to (or on) a Mountain or River "
-"tile."
+"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant."
msgstr ""
-#: data/default/buildings.ruleset:397 data/civ2/buildings.ruleset:373
+#: data/default/buildings.ruleset:396 data/civ2/buildings.ruleset:373
#: data/civ1/buildings.ruleset:297
msgid "Library"
msgstr "ë„서관"
-#: data/default/buildings.ruleset:412
+#: data/default/buildings.ruleset:411
#, no-c-format
msgid "Increases the science output in a city by 100%."
msgstr "ë„ì‹œì•ˆì˜ ê³¼í•™ ê²°ê³¼ë¬¼ì´ 100% ì¦ê°€í•©ë‹ˆë‹¤"
-#: data/default/buildings.ruleset:417 data/civ2/buildings.ruleset:393
+#: data/default/buildings.ruleset:416 data/civ2/buildings.ruleset:393
#: data/civ1/buildings.ruleset:317
msgid "Marketplace"
msgstr "시장"
-#: data/default/buildings.ruleset:432 data/civ2/buildings.ruleset:408
+#: data/default/buildings.ruleset:431 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 "ë„ì‹œì•ˆì˜ ë³µì§€ì™€ ì„¸ê¸ˆì´ 50% ì¦ê°€í•©ë‹ˆë‹¤"
-#: data/default/buildings.ruleset:437 data/civ2/buildings.ruleset:413
+#: data/default/buildings.ruleset:436 data/civ2/buildings.ruleset:413
#: data/civ1/buildings.ruleset:337
msgid "Mass Transit"
msgstr "대량 수송"
-#: data/default/buildings.ruleset:451 data/civ2/buildings.ruleset:427
+#: data/default/buildings.ruleset:450 data/civ2/buildings.ruleset:427
#: data/civ1/buildings.ruleset:351
msgid ""
"Neutralizes the pollution generated by the population. The population "
"simply has no effect on the pollution generated in the city."
msgstr ""
-#: data/default/buildings.ruleset:458 data/civ2/buildings.ruleset:434
+#: data/default/buildings.ruleset:457 data/civ2/buildings.ruleset:434
#: data/civ1/buildings.ruleset:358
msgid "Mfg. Plant"
msgstr "ì œì¡° 공장"
-#: data/default/buildings.ruleset:474 data/civ2/buildings.ruleset:450
+#: data/default/buildings.ruleset:473 data/civ2/buildings.ruleset:450
#: data/civ1/buildings.ruleset:374
#, no-c-format
msgid ""
@@ -17085,12 +17236,12 @@ msgid ""
"production in a city by 100%."
msgstr ""
-#: data/default/buildings.ruleset:480 data/civ2/buildings.ruleset:456
+#: data/default/buildings.ruleset:479 data/civ2/buildings.ruleset:456
#: data/civ1/buildings.ruleset:380
msgid "Nuclear Plant"
msgstr "ì›ìžë ¥ ë°œì „ì†Œ"
-#: data/default/buildings.ruleset:495
+#: data/default/buildings.ruleset:494
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 "
@@ -17101,22 +17252,22 @@ msgid ""
"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant."
msgstr ""
-#: data/default/buildings.ruleset:515 data/civ2/buildings.ruleset:489
+#: data/default/buildings.ruleset:514 data/civ2/buildings.ruleset:489
msgid "Offshore Platform"
msgstr "í•´ì–‘ 플랫í¼"
-#: data/default/buildings.ruleset:530 data/civ2/buildings.ruleset:504
+#: data/default/buildings.ruleset:529 data/civ2/buildings.ruleset:504
msgid ""
"Adds 1 extra shield resource on all Ocean squares in a city. The city needs "
"to be coastal to build this improvement."
msgstr ""
-#: data/default/buildings.ruleset:536 data/civ2/buildings.ruleset:510
+#: data/default/buildings.ruleset:535 data/civ2/buildings.ruleset:510
#: data/civ1/buildings.ruleset:411
msgid "Palace"
msgstr "ê¶ì „"
-#: data/default/buildings.ruleset:552
+#: data/default/buildings.ruleset:551
#, no-c-format
msgid ""
"Makes a city the capital and the center of your government. Corruption in "
@@ -17133,22 +17284,22 @@ msgid ""
"Monarchy a +50% production bonus."
msgstr ""
-#: data/default/buildings.ruleset:569 data/civ2/buildings.ruleset:539
+#: data/default/buildings.ruleset:568 data/civ2/buildings.ruleset:539
msgid "Police Station"
msgstr "경찰서"
-#: data/default/buildings.ruleset:583 data/civ2/buildings.ruleset:553
+#: data/default/buildings.ruleset:582 data/civ2/buildings.ruleset:553
msgid ""
"Reduces the unhappiness caused by military units outside the city by 2 under "
"Democracy and 1 under Republic. This improvement has no effect under other "
"governments."
msgstr ""
-#: data/default/buildings.ruleset:593 data/civ2/buildings.ruleset:560
+#: data/default/buildings.ruleset:592 data/civ2/buildings.ruleset:560
msgid "Port Facility"
msgstr "í•ë§Œ 시설"
-#: data/default/buildings.ruleset:608 data/civ2/buildings.ruleset:575
+#: data/default/buildings.ruleset:607 data/civ2/buildings.ruleset:575
msgid ""
"Allows a city to build veteran sea units. Also, damaged sea units which "
"stay in town for one full turn without moving are completely restored."
@@ -17156,12 +17307,12 @@ msgstr ""
"ìˆ™ë ¨ëœ í•´ìƒë¶€ëŒ€ë¥¼ 짓ë„ë¡ ë„시를허용하ì‹ì‹œìš”. ë˜í•œ 부ìƒë‹¹í•œ í•´ìƒë¶€ëŒ€ê°€ í•œ í„´ë™"
"안 아무런 ëª…ë ¹ì—†ì´ ì´ê³³ì— 머무르면 ì™„ì „ížˆ 회복ë©ë‹ˆë‹¤."
-#: data/default/buildings.ruleset:615 data/civ2/buildings.ruleset:582
+#: data/default/buildings.ruleset:614 data/civ2/buildings.ruleset:582
#: data/civ1/buildings.ruleset:440
msgid "Power Plant"
msgstr "ë°œì „ì†Œ"
-#: data/default/buildings.ruleset:631
+#: data/default/buildings.ruleset:630
#, no-c-format
msgid ""
"Increases the shield production of a Factory or Mfg. Plant in a city: a "
@@ -17172,12 +17323,12 @@ msgid ""
"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant."
msgstr ""
-#: data/default/buildings.ruleset:646 data/civ2/buildings.ruleset:610
+#: data/default/buildings.ruleset:645 data/civ2/buildings.ruleset:610
#: data/civ1/buildings.ruleset:468
msgid "Recycling Center"
msgstr "재활용 센터"
-#: data/default/buildings.ruleset:661 data/civ2/buildings.ruleset:625
+#: data/default/buildings.ruleset:660 data/civ2/buildings.ruleset:625
#: data/civ1/buildings.ruleset:483
#, no-c-format
msgid ""
@@ -17185,33 +17336,33 @@ msgid ""
"production in a city by 66%."
msgstr ""
-#: data/default/buildings.ruleset:667 data/civ2/buildings.ruleset:631
+#: data/default/buildings.ruleset:666 data/civ2/buildings.ruleset:631
msgid "Research Lab"
msgstr "연구소"
-#: data/default/buildings.ruleset:682
+#: data/default/buildings.ruleset:681
msgid ""
"Together with a Library, a Research Lab increases the science production of "
"a city by 200%. Together with a Library and a University, a Research Lab "
"increases the science production of a city by 450%."
msgstr ""
-#: data/default/buildings.ruleset:690 data/civ2/buildings.ruleset:654
+#: data/default/buildings.ruleset:689 data/civ2/buildings.ruleset:654
msgid "SAM Battery"
msgstr "ì§€ëŒ€ê³µë¯¸ì‚¬ì¼ í¬ëŒ€"
-#: data/default/buildings.ruleset:704 data/civ2/buildings.ruleset:668
+#: data/default/buildings.ruleset:703 data/civ2/buildings.ruleset:668
msgid ""
"Doubles the defense of all units inside the city when attacked by non-"
"nuclear air units."
msgstr ""
-#: data/default/buildings.ruleset:710 data/civ2/buildings.ruleset:674
+#: data/default/buildings.ruleset:709 data/civ2/buildings.ruleset:674
#: data/civ1/buildings.ruleset:489
msgid "SDI Defense"
msgstr "SDI 방위 시스템"
-#: data/default/buildings.ruleset:724 data/civ2/buildings.ruleset:688
+#: data/default/buildings.ruleset:723 data/civ2/buildings.ruleset:688
#: data/civ1/buildings.ruleset:503
msgid ""
"Protects a city from attacks from Nuclear units. Nuclear attacks simply "
@@ -17219,22 +17370,22 @@ msgid ""
"missiles."
msgstr ""
-#: data/default/buildings.ruleset:733 data/civ2/buildings.ruleset:697
+#: data/default/buildings.ruleset:732 data/civ2/buildings.ruleset:697
msgid "Sewer System"
msgstr "하수ë„"
-#: data/default/buildings.ruleset:748 data/civ2/buildings.ruleset:712
+#: data/default/buildings.ruleset:747 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 ""
-#: data/default/buildings.ruleset:754 data/civ2/buildings.ruleset:749
+#: data/default/buildings.ruleset:753 data/civ2/buildings.ruleset:749
#: data/civ1/buildings.ruleset:512
msgid "Space Component"
msgstr "우주 부품"
-#: data/default/buildings.ruleset:769 data/civ2/buildings.ruleset:763
+#: data/default/buildings.ruleset:768 data/civ2/buildings.ruleset:763
#: data/civ1/buildings.ruleset:526
msgid ""
"Space Components can be differentiated into Propulsion and Fuel Components. "
@@ -17245,12 +17396,12 @@ msgid ""
"have been built by any player."
msgstr ""
-#: data/default/buildings.ruleset:779 data/civ2/buildings.ruleset:773
+#: data/default/buildings.ruleset:778 data/civ2/buildings.ruleset:773
#: data/civ1/buildings.ruleset:536
msgid "Space Module"
msgstr "우주 모듈"
-#: data/default/buildings.ruleset:794 data/civ2/buildings.ruleset:787
+#: data/default/buildings.ruleset:793 data/civ2/buildings.ruleset:787
#: data/civ1/buildings.ruleset:550
msgid ""
"Space Modules are the most expensive parts of spaceships. There are three "
@@ -17270,12 +17421,12 @@ msgid ""
"have been built by any player."
msgstr ""
-#: data/default/buildings.ruleset:813 data/civ2/buildings.ruleset:806
+#: data/default/buildings.ruleset:812 data/civ2/buildings.ruleset:806
#: data/civ1/buildings.ruleset:569
msgid "Space Structural"
msgstr "ìš°ì£¼ì„ êµ¬ì¡°ë¬¼"
-#: data/default/buildings.ruleset:828 data/civ2/buildings.ruleset:820
+#: data/default/buildings.ruleset:827 data/civ2/buildings.ruleset:820
#: data/civ1/buildings.ruleset:583
msgid ""
"Space Structurals form the base of your spaceship. All other spaceship "
@@ -17286,32 +17437,32 @@ msgid ""
"have been built by any player."
msgstr ""
-#: data/default/buildings.ruleset:838 data/civ2/buildings.ruleset:830
+#: data/default/buildings.ruleset:837 data/civ2/buildings.ruleset:830
msgid "Stock Exchange"
msgstr "ì¦ê¶Œ 거래소"
-#: data/default/buildings.ruleset:854 data/civ2/buildings.ruleset:846
+#: data/default/buildings.ruleset:853 data/civ2/buildings.ruleset:846
#, no-c-format
msgid ""
"Together with a Marketplace and a Bank, a Stock Exchange boosts tax and "
"luxury production in a city by 150%."
msgstr "시장과 ì€í–‰ì´ 함께 있으면, 주ì‹ê±°ëž˜ì„¸ê¸ˆê³¼ 복지 ìƒì‚°ì´ 150%ì´ ë©ë‹ˆë‹¤."
-#: data/default/buildings.ruleset:860 data/civ2/buildings.ruleset:852
+#: data/default/buildings.ruleset:859 data/civ2/buildings.ruleset:852
msgid "Super Highways"
msgstr "ê³ ì† ë„ë¡œ"
-#: data/default/buildings.ruleset:875 data/civ2/buildings.ruleset:867
+#: data/default/buildings.ruleset:874 data/civ2/buildings.ruleset:867
#, no-c-format
msgid ""
"Increases trade resources by 50% on all squares with roads or railroads."
msgstr "ë„로와 ì² ë„ê°€ 있는 ëª¨ë“ ë©´ì ì€ êµì—ìžì›ì´ 50% ì¦ê°€í•©ë‹ˆë‹¤"
-#: data/default/buildings.ruleset:883 data/civ2/buildings.ruleset:873
+#: data/default/buildings.ruleset:882 data/civ2/buildings.ruleset:873
msgid "Supermarket"
msgstr "슈í¼ë§ˆì¼“"
-#: data/default/buildings.ruleset:898 data/civ2/buildings.ruleset:888
+#: data/default/buildings.ruleset:897 data/civ2/buildings.ruleset:888
#, no-c-format
msgid ""
"Increases the food resources by 50% on each farmland square which is being "
@@ -17319,12 +17470,12 @@ msgid ""
"a second time."
msgstr ""
-#: data/default/buildings.ruleset:905 data/civ2/buildings.ruleset:895
+#: data/default/buildings.ruleset:904 data/civ2/buildings.ruleset:895
#: data/civ1/buildings.ruleset:593
msgid "Temple"
msgstr "ì‹ ì „"
-#: data/default/buildings.ruleset:919 data/civ2/buildings.ruleset:909
+#: data/default/buildings.ruleset:918 data/civ2/buildings.ruleset:909
#: data/civ1/buildings.ruleset:607
msgid ""
"Makes one unhappy citizen content. Both the Mysticism advance and the "
@@ -17332,81 +17483,81 @@ msgid ""
"citizens are made content."
msgstr ""
-#: data/default/buildings.ruleset:926 data/civ2/buildings.ruleset:916
+#: data/default/buildings.ruleset:925 data/civ2/buildings.ruleset:916
#: data/civ1/buildings.ruleset:614 data/default/techs.ruleset:742
#: data/civ2/techs.ruleset:727 data/civ1/techs.ruleset:723
msgid "University"
msgstr "대학êµ"
-#: data/default/buildings.ruleset:942
+#: data/default/buildings.ruleset:941
#, no-c-format
msgid ""
"Together with a Library, a University increases the science production of a "
"city by 250%."
msgstr ""
-#: data/default/buildings.ruleset:948 data/civ2/buildings.ruleset:938
+#: data/default/buildings.ruleset:947 data/civ2/buildings.ruleset:938
#: data/civ1/buildings.ruleset:636
msgid "Apollo Program"
msgstr "ì•„í´ë¡œ 계íš"
-#: data/default/buildings.ruleset:962 data/civ2/buildings.ruleset:952
+#: data/default/buildings.ruleset:961 data/civ2/buildings.ruleset:952
msgid ""
"Entire map becomes visible for the player who owns it. It allows all "
"players to start building spaceship parts (assuming they have researched the "
"necessary technologies)."
msgstr ""
-#: data/default/buildings.ruleset:969 data/civ2/buildings.ruleset:959
+#: data/default/buildings.ruleset:968 data/civ2/buildings.ruleset:959
msgid "A.Smith's Trading Co."
msgstr "ìŠ¤ë¯¸ìŠ¤ì˜ ë¬´ì— íšŒì‚¬"
-#: data/default/buildings.ruleset:983
+#: data/default/buildings.ruleset:982
msgid ""
"City improvements which would normally have an upkeep of 1 are free of "
"upkeep, for all your cities."
msgstr ""
-#: data/default/buildings.ruleset:989 data/civ2/buildings.ruleset:979
+#: data/default/buildings.ruleset:988 data/civ2/buildings.ruleset:979
#: data/civ1/buildings.ruleset:655
msgid "Colossus"
msgstr "콜로서스"
-#: data/default/buildings.ruleset:1003 data/civ2/buildings.ruleset:993
+#: data/default/buildings.ruleset:1002 data/civ2/buildings.ruleset:993
#: data/civ1/buildings.ruleset:669
msgid ""
"Each square around the city where this wonder is built that is already "
"generating some trade produces one extra trade resource."
msgstr ""
-#: data/default/buildings.ruleset:1009 data/civ2/buildings.ruleset:999
+#: data/default/buildings.ruleset:1008 data/civ2/buildings.ruleset:999
#: data/civ1/buildings.ruleset:675
msgid "Copernicus' Observatory"
msgstr "ì½”íŽ˜ë¥´ë‹ˆì¿ ìŠ¤ì˜ ì²œë¬¸ëŒ€"
-#: data/default/buildings.ruleset:1024 data/civ2/buildings.ruleset:1180
+#: data/default/buildings.ruleset:1023 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 ""
-#: data/default/buildings.ruleset:1029 data/civ2/buildings.ruleset:1019
+#: data/default/buildings.ruleset:1028 data/civ2/buildings.ruleset:1019
#: data/civ1/buildings.ruleset:695
msgid "Cure For Cancer"
msgstr "ì•” ì¹˜ìœ "
-#: data/default/buildings.ruleset:1043
+#: data/default/buildings.ruleset:1042
msgid ""
"This stunning technological achievement makes one unhappy citizen content in "
"all your cities."
msgstr ""
-#: data/default/buildings.ruleset:1051 data/civ2/buildings.ruleset:1039
+#: data/default/buildings.ruleset:1050 data/civ2/buildings.ruleset:1039
#: data/civ1/buildings.ruleset:715
msgid "Darwin's Voyage"
msgstr "ë‹¤ìœˆì˜ í•í•´"
-#: data/default/buildings.ruleset:1065 data/civ2/buildings.ruleset:1053
+#: data/default/buildings.ruleset:1064 data/civ2/buildings.ruleset:1053
#: data/civ1/buildings.ruleset:729
msgid ""
"Charles Darwin's voyage sparked the discovery of the evolution of the "
@@ -17414,43 +17565,43 @@ msgid ""
"technology advances."
msgstr ""
-#: data/default/buildings.ruleset:1072 data/civ2/buildings.ruleset:1060
+#: data/default/buildings.ruleset:1071 data/civ2/buildings.ruleset:1060
msgid "Eiffel Tower"
msgstr "ì—íŽ íƒ‘"
-#: data/default/buildings.ruleset:1087
+#: data/default/buildings.ruleset:1086
#, no-c-format
msgid ""
"Your reputation and goodwill among other nations is recovered twice as fast."
msgstr ""
-#: data/default/buildings.ruleset:1093 data/civ2/buildings.ruleset:1081
+#: data/default/buildings.ruleset:1092 data/civ2/buildings.ruleset:1081
#: data/civ1/buildings.ruleset:736
msgid "Great Library"
msgstr "대형ë„서관"
-#: data/default/buildings.ruleset:1107 data/civ2/buildings.ruleset:1095
+#: data/default/buildings.ruleset:1106 data/civ2/buildings.ruleset:1095
#: data/civ1/buildings.ruleset:750
msgid ""
"The civilization which builds the Great Library gets every advance that at "
"least two other civilizations have achieved."
msgstr ""
-#: data/default/buildings.ruleset:1113 data/civ2/buildings.ruleset:1101
+#: data/default/buildings.ruleset:1112 data/civ2/buildings.ruleset:1101
#: data/civ1/buildings.ruleset:756
msgid "Great Wall"
msgstr "만리장성"
-#: data/default/buildings.ruleset:1127
+#: data/default/buildings.ruleset:1126
msgid "Works as a City Wall in all your cities."
msgstr "ëª¨ë“ ë‹¹ì‹ ì˜ ë„시성곽처럼 ë™ìž‘í•˜ê³ ìžˆìŠµë‹ˆë‹¤."
-#: data/default/buildings.ruleset:1135 data/civ2/buildings.ruleset:1122
+#: data/default/buildings.ruleset:1134 data/civ2/buildings.ruleset:1122
#: data/civ1/buildings.ruleset:777
msgid "Hanging Gardens"
msgstr "공중 ì •ì›"
-#: data/default/buildings.ruleset:1149 data/civ2/buildings.ruleset:1136
+#: data/default/buildings.ruleset:1148 data/civ2/buildings.ruleset:1136
#: data/civ1/buildings.ruleset:791
msgid ""
"Makes one content citizen happy in every city. Makes two extra content "
@@ -17460,96 +17611,96 @@ msgid ""
"them content instead)."
msgstr ""
-#: data/default/buildings.ruleset:1158 data/civ2/buildings.ruleset:1145
+#: data/default/buildings.ruleset:1157 data/civ2/buildings.ruleset:1145
#: data/civ1/buildings.ruleset:800
msgid "Hoover Dam"
msgstr "후버 ëŒ"
-#: data/default/buildings.ruleset:1173 data/civ2/buildings.ruleset:1159
+#: data/default/buildings.ruleset:1172 data/civ2/buildings.ruleset:1159
msgid ""
"Works as if you had a Hydro Plant in every city. (This reduces pollution "
"and increases the effects of Factories and Mfg. Plants.)"
msgstr ""
-#: data/default/buildings.ruleset:1179 data/civ2/buildings.ruleset:1165
+#: data/default/buildings.ruleset:1178 data/civ2/buildings.ruleset:1165
#: data/civ1/buildings.ruleset:822
msgid "Isaac Newton's College"
msgstr "ë‰´í„´ì˜ ëŒ€í•™ì›"
-#: data/default/buildings.ruleset:1194
+#: data/default/buildings.ruleset:1193
#, no-c-format
msgid ""
"Boosts science production by 100% in every city you control that has a "
"University."
msgstr ""
-#: data/default/buildings.ruleset:1200 data/civ2/buildings.ruleset:1185
+#: data/default/buildings.ruleset:1199 data/civ2/buildings.ruleset:1185
#: data/civ1/buildings.ruleset:842
msgid "J.S. Bach's Cathedral"
msgstr "ë°”íì˜ ëŒ€ì„±ë‹¹"
-#: data/default/buildings.ruleset:1214 data/civ2/buildings.ruleset:1199
+#: data/default/buildings.ruleset:1213 data/civ2/buildings.ruleset:1199
msgid "Makes two unhappy citizens content in every city."
msgstr "ëª¨ë“ ë„ì‹œì˜ ë¶ˆí–‰í•œ 2ë„시를 만족하게 만ë“니다"
-#: data/default/buildings.ruleset:1219 data/civ2/buildings.ruleset:1204
+#: data/default/buildings.ruleset:1218 data/civ2/buildings.ruleset:1204
msgid "King Richard's Crusade"
msgstr "ë¦¬ì²˜ë“œì™•ì˜ ì‹ìžêµ°"
-#: data/default/buildings.ruleset:1233 data/civ2/buildings.ruleset:1218
+#: data/default/buildings.ruleset:1232 data/civ2/buildings.ruleset:1218
msgid ""
"Adds one extra shield resource on every square around the city where it is "
"built."
msgstr ""
-#: data/default/buildings.ruleset:1239 data/civ2/buildings.ruleset:1224
+#: data/default/buildings.ruleset:1238 data/civ2/buildings.ruleset:1224
msgid "Leonardo's Workshop"
msgstr "ë ˆì˜¤ë‚˜ë¥´ë„ì˜ ìž‘ì—…ìž¥"
-#: data/default/buildings.ruleset:1253 data/civ2/buildings.ruleset:1238
+#: data/default/buildings.ruleset:1252 data/civ2/buildings.ruleset:1238
msgid "Upgrades one obsolete unit per game turn."
msgstr "게임턴당 쓸모없는 ìœ ë‹›ì„ ì—…ê·¸ë ˆì´ë“œ 합니다"
-#: data/default/buildings.ruleset:1258 data/civ2/buildings.ruleset:1243
+#: data/default/buildings.ruleset:1257 data/civ2/buildings.ruleset:1243
#: data/civ1/buildings.ruleset:862
msgid "Lighthouse"
msgstr "파로스등대"
-#: data/default/buildings.ruleset:1273
+#: data/default/buildings.ruleset:1272
msgid ""
"Gives all your sea units 1 additional movement point and eliminates the risk "
"of losing Triremes on the high seas. Makes all your new sea units veterans "
"(for all your cities)."
msgstr ""
-#: data/default/buildings.ruleset:1280 data/civ2/buildings.ruleset:1264
+#: data/default/buildings.ruleset:1279 data/civ2/buildings.ruleset:1264
#: data/civ1/buildings.ruleset:885
msgid "Magellan's Expedition"
msgstr "ë§ˆì ¤ëž€ì˜ íƒí—˜"
-#: data/default/buildings.ruleset:1295
+#: data/default/buildings.ruleset:1294
msgid "Gives all your sea units 2 additional movement points."
msgstr "ëª¨ë“ í•´ìƒë¶€ëŒ€ì—게 추가 2ì˜ ì´ë™í¬ì¸íŠ¸ë¥¼ ì¤ë‹ˆë‹¤."
-#: data/default/buildings.ruleset:1300 data/civ2/buildings.ruleset:1283
+#: data/default/buildings.ruleset:1299 data/civ2/buildings.ruleset:1283
#: data/civ1/buildings.ruleset:904
msgid "Manhattan Project"
msgstr "맨해튼 계íš"
-#: data/default/buildings.ruleset:1318 data/civ2/buildings.ruleset:1301
+#: data/default/buildings.ruleset:1317 data/civ2/buildings.ruleset:1301
msgid "Marco Polo's Embassy"
msgstr "마르코 í´ë¡œì˜ 대사관"
-#: data/default/buildings.ruleset:1332 data/civ2/buildings.ruleset:1315
+#: data/default/buildings.ruleset:1331 data/civ2/buildings.ruleset:1315
msgid "The player who owns it gets an embassy with all players."
msgstr ""
-#: data/default/buildings.ruleset:1337 data/civ2/buildings.ruleset:1320
+#: data/default/buildings.ruleset:1336 data/civ2/buildings.ruleset:1320
#: data/civ1/buildings.ruleset:922
msgid "Michelangelo's Chapel"
msgstr "ë¯¸ì¼ˆëž€ì ¤ë¡œì˜ ì„±ë‹¹"
-#: data/default/buildings.ruleset:1351 data/civ2/buildings.ruleset:1334
+#: data/default/buildings.ruleset:1350 data/civ2/buildings.ruleset:1334
msgid ""
"Counts as having a Cathedral in each of your cities. This makes 3 unhappy "
"citizens content in each city. The discovery of Theology increases the "
@@ -17558,51 +17709,51 @@ msgid ""
"the number of unhappy citizens made content."
msgstr ""
-#: data/default/buildings.ruleset:1361 data/civ2/buildings.ruleset:1344
+#: data/default/buildings.ruleset:1360 data/civ2/buildings.ruleset:1344
#: data/civ1/buildings.ruleset:941
msgid "Oracle"
msgstr "ì‹ íƒ"
-#: data/default/buildings.ruleset:1375
+#: data/default/buildings.ruleset:1374
msgid "Makes two of your unhappy citizens content in every city with a temple."
msgstr ""
-#: data/default/buildings.ruleset:1380 data/civ2/buildings.ruleset:1363
+#: data/default/buildings.ruleset:1379 data/civ2/buildings.ruleset:1363
#: data/civ1/buildings.ruleset:960
msgid "Pyramids"
msgstr "피ë¼ë¯¸ë“œ"
-#: data/default/buildings.ruleset:1394
+#: data/default/buildings.ruleset:1393
msgid ""
"The amount of stored food lost when one of your cities grows or shrinks is "
"reduced by 25%. This helps a city to grow faster and more easily withstand "
"famine. Cumulative with Granary."
msgstr ""
-#: data/default/buildings.ruleset:1401 data/civ2/buildings.ruleset:1382
+#: data/default/buildings.ruleset:1400 data/civ2/buildings.ruleset:1382
#: data/civ1/buildings.ruleset:981
msgid "SETI Program"
msgstr "SETI 계íš"
-#: data/default/buildings.ruleset:1415
+#: data/default/buildings.ruleset:1414
msgid "Boosts science production in each city with a Research Lab by 100%. "
msgstr ""
-#: data/default/buildings.ruleset:1420 data/civ2/buildings.ruleset:1402
+#: data/default/buildings.ruleset:1419 data/civ2/buildings.ruleset:1402
#: data/civ1/buildings.ruleset:1001
msgid "Shakespeare's Theatre"
msgstr "ì…°ìµìŠ¤í”¼ì–´ì˜ 극장"
-#: data/default/buildings.ruleset:1434 data/civ2/buildings.ruleset:1416
+#: data/default/buildings.ruleset:1433 data/civ2/buildings.ruleset:1416
#: data/civ1/buildings.ruleset:1015
msgid "Makes all unhappy citizens content, in the city where it is located."
msgstr ""
-#: data/default/buildings.ruleset:1439 data/civ2/buildings.ruleset:1421
+#: data/default/buildings.ruleset:1438 data/civ2/buildings.ruleset:1421
msgid "Statue of Liberty"
msgstr "ìžìœ ì˜ ì—¬ì‹ ìƒ"
-#: data/default/buildings.ruleset:1453 data/civ2/buildings.ruleset:1435
+#: data/default/buildings.ruleset:1452 data/civ2/buildings.ruleset:1435
#: data/civ1/buildings.ruleset:974 data/civ1/buildings.ruleset:1034
msgid ""
"Allows you to choose any government, including those that have not yet been "
@@ -17610,42 +17761,42 @@ msgid ""
"Anarchy."
msgstr ""
-#: data/default/buildings.ruleset:1460 data/civ2/buildings.ruleset:1442
+#: data/default/buildings.ruleset:1459 data/civ2/buildings.ruleset:1442
msgid "Sun Tzu's War Academy"
msgstr "ì†ìžë³‘법"
-#: data/default/buildings.ruleset:1474
+#: data/default/buildings.ruleset:1473
msgid ""
"All your new ground units start at the first veteran level. The chance of a "
"unit getting the next veteran level after a battle increases by half."
msgstr ""
-#: data/default/buildings.ruleset:1481 data/civ2/buildings.ruleset:1463
+#: data/default/buildings.ruleset:1480 data/civ2/buildings.ruleset:1463
#: data/civ1/buildings.ruleset:1020
msgid "United Nations"
msgstr "êµì œ ì—°í•©"
-#: data/default/buildings.ruleset:1495
+#: data/default/buildings.ruleset:1494
msgid "All your units regain two extra hitpoints per turn."
msgstr "ë‹¹ì‹ ì˜ ëª¨ë“ ë¶€ëŒ€ëŠ” 매 턴당 2ì˜ ì¶”ê°€ 타격í¬ì¸íŠ¸ë¥¼ 회복하였습니다"
-#: data/default/buildings.ruleset:1508 data/civ2/buildings.ruleset:1490
+#: data/default/buildings.ruleset:1507 data/civ2/buildings.ruleset:1490
#: data/civ1/buildings.ruleset:1046
msgid "Women's Suffrage"
msgstr "여성 ì°¸ì •ê¶Œ"
-#: data/default/buildings.ruleset:1522 data/civ2/buildings.ruleset:1504
+#: data/default/buildings.ruleset:1521 data/civ2/buildings.ruleset:1504
msgid ""
"Counts as a Police Station in every city. (That is, for each city, reduces "
"unhappiness for military units outside the city by 2 under Democracy and 1 "
"under Republic. This wonder has no effect under other governments.)"
msgstr ""
-#: data/default/buildings.ruleset:1533
+#: data/default/buildings.ruleset:1532
msgid "Coinage"
msgstr "í™”í주조"
-#: data/default/buildings.ruleset:1554
+#: data/default/buildings.ruleset:1553
msgid ""
"This is not a normal improvement. Instead, setting a city's production to "
"Coinage means its shield production is converted to tax output (money, "
@@ -17996,11 +18147,16 @@ msgstr "켈트 형"
msgid "?citystyle:Industrial"
msgstr "공업 형"
-#: data/default/cities.ruleset:139 data/civ2/cities.ruleset:150
+#: data/default/cities.ruleset:139
+#, fuzzy
+msgid "?citystyle:ElectricAge"
+msgstr "켈트 형"
+
+#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:150
msgid "?citystyle:Modern"
msgstr "현대 형"
-#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:161
+#: data/default/cities.ruleset:161 data/civ2/cities.ruleset:161
msgid "?citystyle:PostModern"
msgstr "미래 형"
@@ -22850,3 +23006,6 @@ msgstr "팀 30"
#: data/default/game.ruleset:160
msgid "Team 31"
msgstr "팀 31"
+
+#~ msgid "Observers cannot vote."
+#~ msgstr "관찰ìžëŠ” 투표를 못 합니다."
diff --git a/po/lt.gmo b/po/lt.gmo
index f39cd9b..9ed74b8 100644
Binary files a/po/lt.gmo and b/po/lt.gmo differ
diff --git a/po/lt.po b/po/lt.po
index cbc7a37..5d983c8 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: 2009-03-29 21:13+0900\n"
+"POT-Creation-Date: 2009-11-22 21:37+0100\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"
@@ -62,21 +62,21 @@ msgstr "?obsolete:S"
msgid "?redundant:*"
msgstr "?redundant:*"
-#: common/connection.c:515
+#: common/connection.c:518
#, c-format
msgid "%s from %s"
msgstr "%s iš %s"
-#: common/connection.c:521
+#: common/connection.c:524
msgid " (connection incomplete)"
msgstr " (nebaigta jungtis)"
-#: common/connection.c:525
+#: common/connection.c:528
#, c-format
msgid " (player %s)"
msgstr " (žaidėjas %s)"
-#: common/connection.c:529
+#: common/connection.c:532
msgid " (observer)"
msgstr " (stebÄ—tojas)"
@@ -482,81 +482,81 @@ msgstr "Prisijungimo/atsijungimo pranešimai"
msgid "AI Debug messages"
msgstr "DI testavimo pranešimai"
-#: common/player.c:732
+#: common/player.c:746
msgid "?attitude:Genocidal"
msgstr "?attitude:Genocidas"
-#: common/player.c:734
+#: common/player.c:748
msgid "?attitude:Belligerent"
msgstr "?attitude:Karingas"
-#: common/player.c:736
+#: common/player.c:750
msgid "?attitude:Hostile"
msgstr "?attitude:Priešiškas"
-#: common/player.c:738
+#: common/player.c:752
msgid "?attitude:Uncooperative"
msgstr "?attitude:Nekooperatyvus"
-#: common/player.c:740
+#: common/player.c:754
msgid "?attitude:Uneasy"
msgstr "?attitude:Neramus"
-#: common/player.c:742
+#: common/player.c:756
msgid "?attitude:Neutral"
msgstr "?attitude:Neutralus"
-#: common/player.c:744
+#: common/player.c:758
msgid "?attitude:Respectful"
msgstr "?attitude:Pagarbus"
-#: common/player.c:746
+#: common/player.c:760
msgid "?attitude:Helpful"
msgstr "?attitude:Paslaugus"
-#: common/player.c:748
+#: common/player.c:762
msgid "?attitude:Enthusiastic"
msgstr "?attitude:Entuziastingas"
-#: common/player.c:750
+#: common/player.c:764
msgid "?attitude:Admiring"
msgstr "?attitude:Žavisi"
-#: common/player.c:753
+#: common/player.c:767
msgid "?attitude:Worshipful"
msgstr "?attitude:Garbinantis"
-#: common/player.c:764
+#: common/player.c:778
msgid "?diplomatic_state:Armistice"
msgstr "?diplomatic_state:Paliaubos"
-#: common/player.c:765
+#: common/player.c:779
msgid "?diplomatic_state:War"
msgstr "?diplomatic_state:Karas"
-#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:780 client/gui-gtk-2.0/diplodlg.c:353
#: 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:767 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:781 client/gui-gtk-2.0/diplodlg.c:358
#: 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:768 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:782 client/gui-gtk-2.0/diplodlg.c:363
#: 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:769
+#: common/player.c:783
msgid "?diplomatic_state:Never met"
msgstr "?diplomatic_state:Niekada nesusitiko"
-#: common/player.c:770
+#: common/player.c:784
msgid "?diplomatic_state:Team"
msgstr "?diplomatic_state:Komanda"
@@ -587,7 +587,7 @@ msgstr "IÅ¡gyvenimo reikalavimai galioja tik visam pasauliui."
#. TRANS: "Resources: (none)".
#: common/requirements.c:1014 common/team.c:132
#: client/gui-gtk-2.0/helpdlg.c:1055 client/gui-gtk-2.0/inteldlg.c:390
-#: client/gui-win32/helpdlg.c:586 client/gui-xaw/helpdlg.c:991
+#: client/gui-win32/helpdlg.c:592 client/gui-xaw/helpdlg.c:991
#, c-format
msgid "(none)"
msgstr "(nÄ—ra)"
@@ -613,10 +613,11 @@ msgstr "Ateities technologija. %d"
#: 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
#: client/gui-sdl/helpdlg.c:817 client/gui-sdl/mapview.c:962
-#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:545
-#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:735
-#: 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
+#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:544
+#: client/gui-win32/helpdlg.c:551 client/gui-win32/helpdlg.c:721
+#: client/gui-win32/helpdlg.c:741 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"
@@ -629,29 +630,29 @@ msgstr "Ateities technologija"
msgid "(Unknown)"
msgstr "(Nežinoma)"
-#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:553
#: manual/civmanual.c:224
msgid "Road"
msgstr "Kelias"
-#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:557
#: client/gui-gtk-2.0/menu.c:829 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:394 common/terrain.c:572 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:567
#: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
#: data/civ1/techs.ruleset:563
msgid "Railroad"
msgstr "Geležinkelis"
-#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:555
msgid "Mine"
msgstr "Kasykla"
-#: common/terrain.c:396 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:551 server/report.c:124
#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "Tarša"
@@ -660,7 +661,7 @@ msgstr "Tarša"
msgid "Hut"
msgstr "Namelis"
-#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:563
#: manual/civmanual.c:226
msgid "Fortress"
msgstr "TvirtovÄ—"
@@ -673,58 +674,58 @@ msgstr "UpÄ—"
msgid "Farmland"
msgstr "Ferma"
-#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:577
#: manual/civmanual.c:226
msgid "Airbase"
msgstr "Oro bazÄ—"
-#: common/terrain.c:402 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:579
msgid "Fallout"
msgstr "Radiacijos padidÄ—jimas"
-#: common/unit.c:546 client/gui-win32/plrdlg.c:337
+#: common/unit.c:549 client/gui-win32/plrdlg.c:337
msgid "Idle"
msgstr "Laisvas"
-#: common/unit.c:556
+#: common/unit.c:559
msgid "Fortifying"
msgstr "Įtvirtinama"
-#: common/unit.c:558
+#: common/unit.c:561
msgid "Fortified"
msgstr "Įtvirtinta"
-#: common/unit.c:562 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
+#: common/unit.c:565 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
msgid "Sentry"
msgstr "Sargyba"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
+#: common/unit.c:569 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
#: client/gui-win32/menu.c:370 client/gui-xaw/menu.c:185
msgid "Pillage"
msgstr "PlÄ—Å¡imas"
-#: common/unit.c:568 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
+#: common/unit.c:571 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
msgid "Goto"
msgstr "Eiti į"
-#: common/unit.c:570
+#: common/unit.c:573
msgid "Explore"
msgstr "TyrinÄ—ti"
-#: common/unit.c:572 manual/civmanual.c:224
+#: common/unit.c:575 manual/civmanual.c:224
msgid "Transform"
msgstr "Keisti"
-#: common/unit.c:584 client/text.c:157 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:587 client/text.c:157 client/gui-sdl/citydlg.c:1972
#: client/gui-win32/citydlg.c:1257 client/gui-xaw/citydlg.c:1423
msgid "Unknown"
msgstr "Nežinoma"
-#: common/unit.c:1022
+#: common/unit.c:1025
msgid "Moves"
msgstr "Ä–jimai"
-#: common/unit.c:1571
+#: common/unit.c:1574
#, c-format
msgid ""
"Upgrade %s to %s for %d gold?\n"
@@ -733,12 +734,12 @@ msgstr ""
"Patobulinti %s į %s už %d aukso?\n"
"Ižde yra %d aukso."
-#: common/unit.c:1579
+#: common/unit.c:1582
#, c-format
msgid "Sorry, cannot upgrade %s (yet)."
msgstr "Atsiprašau, kol kas negalima modernizuoti %s."
-#: common/unit.c:1585
+#: common/unit.c:1588
#, c-format
msgid ""
"Upgrading %s to %s costs %d gold.\n"
@@ -747,11 +748,11 @@ msgstr ""
"%s modernizacija iki %s kainuoja %d aukso.\n"
"Ižde yra %d aukso."
-#: common/unit.c:1594
+#: common/unit.c:1597
msgid "You can only upgrade units in your cities."
msgstr "Patobulinti dalinius gali tik savo miestuose."
-#: common/unit.c:1598
+#: common/unit.c:1601
#, c-format
msgid "Upgrading this %s would strand units it transports."
msgstr "%s modernizacija sunaikins gabenamus dalinius."
@@ -784,11 +785,11 @@ msgstr "Branduolinis_ginklas"
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1404
+#: common/unittype.c:349 client/helpdata.c:1412
msgid " and "
msgstr " ir "
-#: common/unittype.c:355 client/helpdata.c:1390
+#: common/unittype.c:355 client/helpdata.c:1398
msgid "?and:, "
msgstr "?and:, "
@@ -959,74 +960,74 @@ msgstr "Nenurodytas \"%s\" parametras.\n"
msgid "Missing argument for \"%s\".\n"
msgstr "Trūksta \"%s\" parametro.\n"
-#: utility/shared.c:501
+#: utility/shared.c:514
#, c-format
msgid "%d BC"
msgstr "%d pr. Kr."
-#: utility/shared.c:503
+#: utility/shared.c:516
#, c-format
msgid "%d AD"
msgstr "%d po Kr."
-#: utility/shared.c:924
+#: utility/shared.c:937
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:1028
+#: utility/shared.c:1041
#, c-format
msgid "Could not read data directory %s: %s."
msgstr "Nepavyko perskaityti duomenų katalogo %s: %s."
-#: utility/shared.c:1279
+#: utility/shared.c:1292
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:1281
+#: utility/shared.c:1294
#, c-format
msgid "Current data path is: \"%s\""
msgstr "Dabartinis duomenų kelias yra: „%s“"
-#: utility/shared.c:1283
+#: utility/shared.c:1296
#, c-format
msgid "The \"%s\" file is required ... aborting!"
msgstr "Reikalingas failas „%s“ ... nutraukiama!"
-#: utility/shared.c:1460
+#: utility/shared.c:1485
#, 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:1462
+#: utility/shared.c:1487
msgid "Use a non-privileged account instead.\n"
msgstr "Naudokite neprivilegijuotÄ… vartotojÄ….\n"
-#: utility/shared.c:1478
+#: utility/shared.c:1503
msgid "exact match"
msgstr "tiksliai atitinka"
-#: utility/shared.c:1479
+#: utility/shared.c:1504
msgid "only match"
msgstr "tikslus atitikmuo"
-#: utility/shared.c:1480
+#: utility/shared.c:1505
msgid "ambiguous"
msgstr "dviprasmiškas"
-#: utility/shared.c:1481
+#: utility/shared.c:1506
msgid "empty"
msgstr "tuÅ¡Äias"
-#: utility/shared.c:1482
+#: utility/shared.c:1507
msgid "too long"
msgstr "per ilgas"
-#: utility/shared.c:1483
+#: utility/shared.c:1508
msgid "non-match"
msgstr "neatitinka"
@@ -1055,23 +1056,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:280
+#: ai/advdiplomacy.c:300
#, 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:290
+#: ai/advdiplomacy.c:310
#, c-format
msgid "*%s (AI)* First break alliance with %s, %s."
msgstr "*%s (DI)* Pirma nutrauk sÄ…junga su %s, %s."
-#: ai/advdiplomacy.c:303
+#: ai/advdiplomacy.c:322
#, c-format
msgid "*%s (AI)* Let us first cease hostilies, %s."
msgstr "*%s (DI)* Pirmiau nutraukime priešiškus veiksmus, %s."
-#: ai/advdiplomacy.c:308
+#: ai/advdiplomacy.c:327
#, c-format
msgid ""
"*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
@@ -1079,48 +1080,48 @@ msgid ""
msgstr ""
"*%s (DI)* NorÄ—Äiau ilgiau iÅ¡laikyti esamÄ… ugnies nutraukimo statusÄ…, %s."
-#: ai/advdiplomacy.c:331
+#: ai/advdiplomacy.c:350
#, 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:424
+#: ai/advdiplomacy.c:443
#, 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:454
+#: ai/advdiplomacy.c:473
#, 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:560
+#: ai/advdiplomacy.c:579
#, 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:582
+#: ai/advdiplomacy.c:601
#, c-format
msgid "*%s (AI)* Welcome into our alliance %s!"
msgstr "*%s (DI)* Sveikas atvykęs į mūsų sąjungą %s!"
-#: ai/advdiplomacy.c:586
+#: ai/advdiplomacy.c:605
#, 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:593
+#: ai/advdiplomacy.c:612
#, c-format
msgid "*%s (AI)* Yes, peace in our time!"
msgstr "*%s (DI)* Taip, tegyvuoja taika!"
-#: ai/advdiplomacy.c:598
+#: ai/advdiplomacy.c:617
#, c-format
msgid "*%s (AI)* Agreed. No more hostilities, %s."
msgstr "*%s (DI)* Sutarta. Jokių priešiškų veiksmų, %s."
-#: ai/advdiplomacy.c:813
+#: ai/advdiplomacy.c:832
#, c-format
msgid ""
"*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
@@ -1129,23 +1130,23 @@ msgstr ""
"*%s (DI)* Sveikinimai %s! Gal galÄ—tume sudaryti paliaubas, kol vieni kitus "
"geriau pažinsime?"
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1116
#, c-format
msgid "*%s (AI)* Space will never be yours. "
msgstr "*%s (DI)* Kosmosas niekada Jums nepriklausys. "
-#: ai/advdiplomacy.c:1102
+#: ai/advdiplomacy.c:1121
#, 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:1108
+#: ai/advdiplomacy.c:1127
#, c-format
msgid "*%s (AI)* Peace in ... some other time."
msgstr "*%s (DI)* Taika bus ... kada nors vÄ—liau."
-#: ai/advdiplomacy.c:1113
+#: ai/advdiplomacy.c:1132
#, c-format
msgid ""
"*%s (AI)* Finally I get around to you! Did you really think you could get "
@@ -1154,17 +1155,17 @@ msgstr ""
"*%s (DI)* Pagaliau aš Jus pergudravau! Negi manėte, galėsią pasprukti su "
"savo nusikaltimais?"
-#: ai/advdiplomacy.c:1119
+#: ai/advdiplomacy.c:1138
#, 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:1126
+#: ai/advdiplomacy.c:1145
#, 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:1209
+#: ai/advdiplomacy.c:1229
#, c-format
msgid ""
"*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1182,7 +1183,7 @@ msgstr[2] ""
"*%s (DI)* Mes pradėsime visapusį karą prieš %s per %d ėjimų, kad "
"sustabdytumÄ—me erdvÄ—laivio paleidimÄ…."
-#: ai/advdiplomacy.c:1219
+#: ai/advdiplomacy.c:1239
#, c-format
msgid ""
"*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
@@ -1191,7 +1192,7 @@ msgstr ""
"*%s (DI)* Šiame reikale tikimasi Jūsų pagalbos. Tegyvuoja mūsų šlovingoji "
"sÄ…junga!"
-#: ai/advdiplomacy.c:1225
+#: ai/advdiplomacy.c:1245
#, c-format
msgid ""
"*%s (AI)* %s has grossly violated his treaties with us for own gain. We "
@@ -1214,7 +1215,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:1238
+#: ai/advdiplomacy.c:1258
#, c-format
msgid ""
"*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1232,13 +1233,13 @@ msgstr[2] ""
"*%s (DI)* Mes ketiname apiplÄ—Å¡ti turtingÄ… %s civilizacijÄ…. Mes paskelbisme "
"karą per %d ėjimų."
-#: ai/advdiplomacy.c:1246
+#: ai/advdiplomacy.c:1266
#, 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:1251
+#: ai/advdiplomacy.c:1271
#, c-format
msgid ""
"*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1256,14 +1257,14 @@ msgstr[2] ""
"*%s (DI)* Mums jau atsibodo %s. Sunaikinkime Å¡iÄ… apgailÄ—tinÄ… civilizacijÄ…. "
"Mes skelbiame karą per %d ėjimų."
-#: ai/advdiplomacy.c:1261
+#: ai/advdiplomacy.c:1281
#, 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:1267
+#: ai/advdiplomacy.c:1287
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance and declare war on %s in %d turn. "
@@ -1281,7 +1282,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:1276
+#: ai/advdiplomacy.c:1296
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1299,7 +1300,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:1344
+#: ai/advdiplomacy.c:1364
#, c-format
msgid ""
"*%s (AI)* Your attempt to conquer space for yourself alone betray your true "
@@ -1308,7 +1309,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:1359
+#: ai/advdiplomacy.c:1379
#, c-format
msgid ""
"*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
@@ -1316,7 +1317,7 @@ msgid ""
msgstr ""
"*%s (DI)* Jūsų vienašališkas tikslas užvaldyti kosmosą yra labai priešiškas."
-#: ai/advdiplomacy.c:1362
+#: ai/advdiplomacy.c:1382
#, c-format
msgid ""
"*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
@@ -1325,14 +1326,14 @@ msgstr ""
"*%s (DI)* Jei Jūs nebaigsite konstruoti erdvėlaivio, aš būsiu priverstas "
"panaudoti jÄ—gÄ…!"
-#: ai/advdiplomacy.c:1474
+#: ai/advdiplomacy.c:1494
#, 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:1549
+#: ai/advdiplomacy.c:1569
#, c-format
msgid ""
"*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
@@ -1341,7 +1342,7 @@ msgstr ""
"*%s (DI)* Sveikinimai mÅ«sų labiausiai iÅ¡tikimas sÄ…jungininke. Mes kvieÄiame "
"Jus sunaikinti mūsų priešą %s."
-#: ai/advdiplomacy.c:1555
+#: ai/advdiplomacy.c:1575
#, c-format
msgid ""
"*%s (AI)* Greetings ally, I see you have not yet made war with our enemy, %"
@@ -1350,7 +1351,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:1562
+#: ai/advdiplomacy.c:1582
#, c-format
msgid ""
"*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1361,7 +1362,7 @@ msgstr ""
"taikoje su mÅ«sų mirtinu prieÅ¡u %s! Tai nepakenÄiama, todÄ—l mÅ«sų sÄ…junga "
"nutraukiama!"
-#: ai/advdiplomacy.c:1592
+#: ai/advdiplomacy.c:1612
#, c-format
msgid ""
"*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
@@ -1370,14 +1371,14 @@ msgstr ""
"*%s (DI)* Sveikinimai, drauge, gal galėtume pasiūlyti prisijungti prie "
"bendrų tikslų ir įstoti į sąjungą?"
-#: ai/advdiplomacy.c:1607
+#: ai/advdiplomacy.c:1627
#, 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:1622
+#: ai/advdiplomacy.c:1642
#, c-format
msgid ""
"*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
@@ -1386,7 +1387,7 @@ msgstr ""
"*%s (DI)* Mums jau įkyrėjo nuolatinis kraujo liejimas. Gal galėtume "
"pasiūlyti nutraukti karinius veiksmus?"
-#: ai/advdiplomacy.c:1742
+#: ai/advdiplomacy.c:1762
#, c-format
msgid ""
"*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1543,17 +1544,17 @@ 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ą."
-#: server/barbarian.c:183
+#: server/barbarian.c:184
#, 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."
-#: server/barbarian.c:479
+#: server/barbarian.c:480
#, c-format
msgid "Native unrest near %s led by %s."
msgstr "Vietinių sukilimas šalia %s, Juos į kovą veda %s."
-#: server/barbarian.c:484
+#: server/barbarian.c:485
#, c-format
msgid "Sea raiders seen near %s!"
msgstr "Jūrų piratai pastebėti prie %s!"
@@ -1949,7 +1950,7 @@ 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ų."
-#: server/cityturn.c:1158 server/techtools.c:176
+#: server/cityturn.c:1158 server/techtools.c:172
#, c-format
msgid "The %s have acquired %s from %s."
msgstr "%s gavo technologiją %s iš %s."
@@ -2034,124 +2035,129 @@ msgstr ""
"Dėmesio: %s parinktis yra pasenusi. Naudokite -m norėdami įjungti "
"metaserverį.\n"
-#: server/civserver.c:189
+#: server/civserver.c:193
#, c-format
msgid "Error: unknown option '%s'\n"
msgstr "Klaida: nežinomas parametras „%s“\n"
-#: server/civserver.c:200
+#: server/civserver.c:204
#, c-format
msgid "This is the server for %s"
msgstr "Tai yra %s serveris"
-#: server/civserver.c:201
+#: server/civserver.c:205
#, c-format
msgid "You can learn a lot about Freeciv at %s"
msgstr "Apie Freeciv daug galite sužinoti: %s"
-#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
+#: server/civserver.c:210 client/civclient.c:239 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
"Valid options are:\n"
msgstr ""
-#: server/civserver.c:208
+#: server/civserver.c:212
#, fuzzy
msgid ""
" -a --auth FILE\tEnable server authentication with configuration from "
"FILE.\n"
msgstr " -a --auth\t\tĮgalinti serverio autentifikavimą.\n"
-#: server/civserver.c:210
+#: server/civserver.c:214
msgid " -G --Guests\t\tAllow guests to login if auth is enabled.\n"
msgstr ""
-#: server/civserver.c:212
+#: server/civserver.c:216
msgid " -N --Newusers\tAllow new users to login if auth is enabled.\n"
msgstr ""
-#: server/civserver.c:215
+#: server/civserver.c:219
msgid " -b --bind ADDR\tListen for clients on ADDR\n"
msgstr ""
-#: server/civserver.c:217 client/civclient.c:242
+#: server/civserver.c:221 client/civclient.c:243
msgid ""
" -d, --debug NUM\tSet debug log level (0 to 4, or 4:file1,min,max:...)\n"
msgstr ""
-#: server/civserver.c:221 client/civclient.c:246
+#: server/civserver.c:225 client/civclient.c:247
msgid " -d, --debug NUM\tSet debug log level (0 to 3)\n"
msgstr ""
-#: server/civserver.c:223
+#: server/civserver.c:227
msgid " -f, --file FILE\tLoad saved game FILE\n"
msgstr " -f, --file FAILAS\tĮkelti išsaugotą žaidimą FAILAS\n"
-#: server/civserver.c:225 client/civclient.c:249 manual/civmanual.c:382
+#: server/civserver.c:229 client/civclient.c:250 manual/civmanual.c:382
msgid " -h, --help\t\tPrint a summary of the options\n"
msgstr ""
-#: server/civserver.c:226
+#: server/civserver.c:230
+#, fuzzy
+msgid " -i, --identity ADDR\tBe known as ADDR at metaserver\n"
+msgstr " -M, --Metaserver ADDR\tNustatyti ADDR kaip metaserverio adresÄ…\n"
+
+#: server/civserver.c:231
msgid " -l, --log FILE\tUse FILE as logfile\n"
msgstr ""
-#: server/civserver.c:227
+#: server/civserver.c:232
msgid " -m, --meta\t\tNotify metaserver and send server's info\n"
msgstr ""
-#: server/civserver.c:229
+#: server/civserver.c:234
msgid " -M, --Metaserver ADDR\tSet ADDR as metaserver address\n"
msgstr " -M, --Metaserver ADDR\tNustatyti ADDR kaip metaserverio adresÄ…\n"
-#: server/civserver.c:232
+#: server/civserver.c:237
msgid " -p, --port PORT\tListen for clients on port PORT\n"
msgstr " -p, --port PRIEVADAS\tKlausyti klientų prievade PRIEVADAS\n"
-#: server/civserver.c:234
+#: server/civserver.c:239
msgid " -q, --quitidle TIME\tQuit if no players for TIME seconds\n"
msgstr ""
-#: server/civserver.c:236
+#: server/civserver.c:241
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"
-#: server/civserver.c:239
+#: server/civserver.c:244
msgid " -s, --saves DIR\tSave games to directory DIR\n"
msgstr ""
-#: server/civserver.c:241
+#: server/civserver.c:246
msgid " -S, --Serverid ID\tSets the server id to ID\n"
msgstr " -S, --Serverid ID\tNustato serverio id į ID\n"
-#: server/civserver.c:243
+#: server/civserver.c:248
msgid " -P, --Ppm\t\tSave ppms of the map when saving the game.\n"
msgstr ""
-#: server/civserver.c:244
+#: server/civserver.c:249
msgid " -r, --read FILE\tRead startup script FILE\n"
msgstr ""
-#: server/civserver.c:246
+#: server/civserver.c:251
msgid " -R, --Ranklog FILE\tUse FILE as ranking logfile\n"
msgstr ""
-#: server/civserver.c:247 client/civclient.c:268 manual/civmanual.c:383
+#: server/civserver.c:252 client/civclient.c:269 manual/civmanual.c:383
msgid " -v, --version\t\tPrint the version number\n"
msgstr " -v, --version\t\tAtspausdinti versijos numerį\n"
-#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
+#: server/civserver.c:253 client/gui-gtk-2.0/gui_main.c:354
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, c-format
msgid "Report bugs at %s.\n"
msgstr "Pranešti apie klaidas į %s.\n"
-#: server/commands.c:28
+#: server/commands.c:29
msgid "Start the game, or restart after loading a savegame."
msgstr "Paleisti žaidimą arba pratęsti užsaugotą žaidimą."
-#: server/commands.c:29
+#: server/commands.c:30
msgid ""
"This command starts the game. When starting a new game, it should be used "
"after all human players have connected, and AI players have been created (if "
@@ -2163,7 +2169,7 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:42
+#: server/commands.c:44
msgid ""
"help\n"
"help commands\n"
@@ -2172,11 +2178,11 @@ msgid ""
"help <option-name>"
msgstr ""
-#: server/commands.c:47
+#: server/commands.c:49
msgid "Show help about server commands and server options."
msgstr ""
-#: server/commands.c:48
+#: server/commands.c:50
msgid ""
"With no arguments gives some introductory help. With argument \"commands\" "
"or \"options\" gives respectively a list of all commands or all options. "
@@ -2186,31 +2192,31 @@ msgid ""
"be abbreviated where unambiguous."
msgstr ""
-#: server/commands.c:63
+#: server/commands.c:66
msgid "Show a list of players, teams, connections, or scenarios."
msgstr "Parodyti žaidÄ—jų, komandų, jungÄių ar scenarijų sÄ…raÅ¡Ä…."
-#: server/commands.c:64
+#: server/commands.c:67
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 ""
-#: server/commands.c:70
+#: server/commands.c:74
msgid "Quit the game and shutdown the server."
msgstr "Išeiti iš žaidimo ir išjungti serverį"
#. TRANS: translate text between <> only
-#: server/commands.c:74
+#: server/commands.c:79
msgid "cut <connection-name>"
msgstr "cut <ryšio-vardas>"
-#: server/commands.c:75
+#: server/commands.c:80
msgid "Cut a client's connection to server."
msgstr "Ajungti klientÄ… nuo serverio."
-#: server/commands.c:76
+#: server/commands.c:81
msgid ""
"Cut specified client's connection to the server, removing that client from "
"the game. If the game has not yet started that client's player is removed "
@@ -2219,7 +2225,7 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:83
+#: server/commands.c:89
msgid ""
"explain\n"
"explain <option-name>"
@@ -2227,11 +2233,11 @@ msgstr ""
"explain\n"
"explain <parametro-pavadinimas>"
-#: server/commands.c:85
+#: server/commands.c:91
msgid "Explain server options."
msgstr "Paaiškinti serverio parinktis."
-#: server/commands.c:86
+#: server/commands.c:92
msgid ""
"The 'explain' command gives a subset of the functionality of 'help', and is "
"included for backward compatibility. With no arguments it gives a list of "
@@ -2240,89 +2246,90 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:93
+#: server/commands.c:100
msgid ""
"show\n"
"show <option-name>\n"
"show <option-prefix>"
msgstr ""
-#: server/commands.c:96
+#: server/commands.c:103
msgid "Show server options."
msgstr "Rodyti serverio nustatymus."
-#: server/commands.c:97
+#: server/commands.c:104
msgid ""
"With no arguments, shows all server options (or available options, when used "
"by clients). With an argument, show only the named option, or options with "
"that prefix."
msgstr ""
-#: server/commands.c:102
+#: server/commands.c:110
msgid "wall <message>"
msgstr "wall <žinutė>"
-#: server/commands.c:103
+#: server/commands.c:111
msgid "Send message to all connections."
msgstr "Pasiųsti žinutę visoms jungtims."
-#: server/commands.c:104
+#: server/commands.c:112
msgid ""
"For each connected client, pops up a window showing the message entered."
msgstr ""
-#: server/commands.c:108
+#: server/commands.c:117
msgid "vote yes|no [vote number]"
msgstr "vote yes|no [balso numeris]"
-#: server/commands.c:109
+#: server/commands.c:118
msgid "Cast a vote."
msgstr "Balsuoti."
-#: server/commands.c:111
+#: server/commands.c:120
#, 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."
+"A player with basic 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."
msgstr ""
-#: server/commands.c:121
+#: server/commands.c:131
msgid ""
"debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
"<player> | timing | info]"
msgstr ""
-#: server/commands.c:123
+#: server/commands.c:133
msgid "Turn on or off AI debugging of given entity."
msgstr ""
-#: server/commands.c:124
+#: server/commands.c:134
msgid ""
"Print AI debug information about given entity and turn continous debugging "
"output for this entity on or off."
msgstr ""
-#: server/commands.c:128
+#: server/commands.c:139
msgid "set <option-name> <value>"
msgstr ""
-#: server/commands.c:129
+#: server/commands.c:140
msgid "Set server option."
msgstr "Nustatyti serverio parinktį."
-#: server/commands.c:132
+#: server/commands.c:144
msgid "team <player> [team]"
msgstr ""
-#: server/commands.c:133
+#: server/commands.c:145
msgid "Change, add or remove a player's team affiliation."
msgstr ""
-#: server/commands.c:134
+#: server/commands.c:146
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 "
@@ -2330,30 +2337,30 @@ msgid ""
"to achieve team victory with averaged individual scores."
msgstr ""
-#: server/commands.c:141
+#: server/commands.c:154
msgid "rulesetdir <directory>"
msgstr ""
-#: server/commands.c:142
+#: server/commands.c:155
msgid "Choose new ruleset directory or modpack."
msgstr ""
-#: server/commands.c:143
+#: server/commands.c:156
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:149
+#: server/commands.c:163
msgid "metainfo <meta-line>"
msgstr "metainfo <meta-eilutÄ—>"
-#: server/commands.c:150
+#: server/commands.c:164
msgid "Set metaserver info line."
msgstr ""
-#: server/commands.c:151
+#: server/commands.c:165
msgid ""
"Set user defined metaserver info line. If parameter is omitted,\n"
"previously set metamessage will be removed. For most of the time\n"
@@ -2362,19 +2369,19 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:158
+#: server/commands.c:173
msgid "metapatch <meta-line>"
msgstr "metapatch <meta-eilutÄ—>"
-#: server/commands.c:159
+#: server/commands.c:174
msgid "Set metaserver patches line."
msgstr ""
-#: server/commands.c:165
+#: server/commands.c:181
msgid "Control metaserver connection."
msgstr ""
-#: server/commands.c:166
+#: server/commands.c:182
msgid ""
"'metaconnection ?' reports on the status of the connection to metaserver.\n"
"'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2382,33 +2389,33 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:172
+#: server/commands.c:189
msgid "metaserver <address>"
msgstr "metaserver <adresas>"
-#: server/commands.c:173
+#: server/commands.c:190
msgid "Set address (URL) for metaserver to report to."
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:177
+#: server/commands.c:195
msgid "aitoggle <player-name>"
msgstr "aitoggle <žaidėjo-vardas>"
-#: server/commands.c:178
+#: server/commands.c:196
msgid "Toggle AI status of player."
msgstr ""
#. TRANS: translate text between [] and <> only
-#: server/commands.c:182
+#: server/commands.c:201
msgid "take [connection-name] <player-name>"
msgstr "take [ryšio-vardas] <žaidėjo-vardas>"
-#: server/commands.c:183
+#: server/commands.c:202
msgid "Take over a player's place in the game."
msgstr "Užimti žaidėjo vietą žaidime."
-#: server/commands.c:184
+#: server/commands.c:203
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 "
@@ -2418,15 +2425,15 @@ msgid ""
msgstr ""
#. TRANS: translate text between [] only
-#: server/commands.c:192
+#: server/commands.c:212
msgid "observe [connection-name] [player-name]"
msgstr "observe [ryšio-pavadinimas] [žaidėjo-vardas]"
-#: server/commands.c:193
+#: server/commands.c:213
msgid "Observe a player or the whole game."
msgstr "Stebėti žaidėją arba visą žaidimą."
-#: server/commands.c:194
+#: server/commands.c:214
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 "
@@ -2436,50 +2443,50 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:202
+#: server/commands.c:223
msgid "detach <connection-name>"
msgstr "detach <ryšio-pavadinimas>"
-#: server/commands.c:203
+#: server/commands.c:224
msgid "detach from a player."
msgstr "atsijungti nuo žaidėjo."
-#: server/commands.c:204
+#: server/commands.c:225
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:209
+#: server/commands.c:231
msgid "create <player-name>"
msgstr "create <žaidėjo-vardas>"
-#: server/commands.c:210
+#: server/commands.c:232
msgid "Create an AI player with a given name."
msgstr "Sukuria DI žaidėją nurodytu vardu."
-#: server/commands.c:211
+#: server/commands.c:233
msgid ""
"The 'create' command is only available before the game has been started."
msgstr ""
-#: server/commands.c:215
+#: server/commands.c:238
msgid ""
"away\n"
"away"
msgstr ""
-#: server/commands.c:217
+#: server/commands.c:240
msgid "Set yourself in away mode. The AI will watch your back."
msgstr ""
-#: server/commands.c:218
+#: server/commands.c:241
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:222
+#: server/commands.c:246
msgid ""
"novice\n"
"novice <player-name>"
@@ -2487,11 +2494,11 @@ msgstr ""
"novice\n"
"novice <žaidėjo-vardas>"
-#: server/commands.c:224
+#: server/commands.c:248
msgid "Set one or all AI players to 'novice'."
msgstr ""
-#: server/commands.c:225
+#: server/commands.c:249
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 "
@@ -2499,7 +2506,7 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:231
+#: server/commands.c:256
msgid ""
"easy\n"
"easy <player-name>"
@@ -2507,11 +2514,11 @@ msgstr ""
"easy\n"
"easy <žaidėjo-vardas>"
-#: server/commands.c:233
+#: server/commands.c:258
msgid "Set one or all AI players to 'easy'."
msgstr ""
-#: server/commands.c:234
+#: server/commands.c:259
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 +2526,7 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:240
+#: server/commands.c:266
msgid ""
"normal\n"
"normal <player-name>"
@@ -2527,11 +2534,11 @@ msgstr ""
"normal\n"
"normal <žaidėjo-vardas>"
-#: server/commands.c:242
+#: server/commands.c:268
msgid "Set one or all AI players to 'normal'."
msgstr ""
-#: server/commands.c:243
+#: server/commands.c:269
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 "
@@ -2539,7 +2546,7 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:249
+#: server/commands.c:276
msgid ""
"hard\n"
"hard <player-name>"
@@ -2547,11 +2554,11 @@ msgstr ""
"hard\n"
"hard <žaidėjo-vardas>"
-#: server/commands.c:251
+#: server/commands.c:278
msgid "Set one or all AI players to 'hard'."
msgstr ""
-#: server/commands.c:252
+#: server/commands.c:279
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 "
@@ -2559,7 +2566,7 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:258
+#: server/commands.c:286
msgid ""
"experimental\n"
"experimental <player-name>"
@@ -2567,11 +2574,11 @@ msgstr ""
"experimental\n"
"experimental <žaidėjo-vardas>"
-#: server/commands.c:260
+#: server/commands.c:288
msgid "Set one or all AI players to 'experimental'."
msgstr ""
-#: server/commands.c:261
+#: server/commands.c:289
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 "
@@ -2580,7 +2587,7 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:269
+#: server/commands.c:298
msgid ""
"cmdlevel\n"
"cmdlevel <level>\n"
@@ -2594,17 +2601,19 @@ msgstr ""
"cmdlevel <lygis> first\n"
"cmdlevel <lygis> <ryšio-pavadinimas>"
-#: server/commands.c:274
+#: server/commands.c:303
msgid "Query or set command access level access."
msgstr ""
-#: server/commands.c:275
+#: server/commands.c:304
msgid ""
"The command access level controls which server commands are available\n"
"to users via the client chatline. The available levels are:\n"
" none - no commands\n"
-" info - informational commands only\n"
+" info - informational or observer commands only\n"
+" basic - commands available to players in the game\n"
" ctrl - commands that affect the game and users\n"
+" admin - commands that affect server operation\n"
" hack - *all* commands - dangerous!\n"
"With no arguments, the current command access levels are reported.\n"
"With a single argument, the level is set for all existing connections,\n"
@@ -2620,20 +2629,20 @@ msgid ""
"now takes connection names, not player names."
msgstr ""
-#: server/commands.c:296
+#: server/commands.c:328
msgid "If there is none, become the game organizer with increased permissions."
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:301
+#: server/commands.c:334
msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
msgstr ""
-#: server/commands.c:302
+#: server/commands.c:335
msgid "See \"help timeoutincrease\"."
msgstr ""
-#: server/commands.c:303
+#: server/commands.c:336
msgid ""
"Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
"<turn> and multiply <value> by <valuemult>. Use this command in concert "
@@ -2641,46 +2650,65 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:309
+#: server/commands.c:343
+msgid ""
+"cancelvote\n"
+"cancelvote <vote number>\n"
+"cancelvote all\n"
+msgstr ""
+
+#: server/commands.c:346
+msgid "Cancel a running vote.\n"
+msgstr ""
+
+#: server/commands.c:347
+msgid ""
+"With no arguments this command removes your own vote. If you have an admin "
+"access level, you can cancel any vote by vote number, or all votes with the "
+"'all' argument."
+msgstr ""
+
+#. TRANS: translate text between <> only
+#: server/commands.c:354
msgid "endgame"
msgstr "endgame"
-#: server/commands.c:310
+#: server/commands.c:355
msgid "End the game immediately in a draw."
msgstr "Iškart baigti žaidimą lygiosiomis."
#. TRANS: translate text between <> only
-#: server/commands.c:314
+#: server/commands.c:360
msgid "surrender"
msgstr "pasiduoti"
-#: server/commands.c:315
+#: server/commands.c:361
msgid "Concede the game."
msgstr ""
-#: server/commands.c:316
+#: server/commands.c:362
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:322
+#: server/commands.c:369
msgid "remove <player-name>"
msgstr "remove <žaidėjo-vardas>"
-#: server/commands.c:323
+#: server/commands.c:370
msgid "Fully remove player from game."
msgstr "Visiškai pašalina žaidėją iš žaidimo."
-#: server/commands.c:324
+#: server/commands.c:371
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:329
+#: server/commands.c:377
msgid ""
"save\n"
"save <file-name>"
@@ -2688,11 +2716,11 @@ msgstr ""
"save\n"
"save <failo-pavadinimas>"
-#: server/commands.c:331
+#: server/commands.c:379
msgid "Save game to file."
msgstr "Išsaugo žaidimą į failą."
-#: server/commands.c:332
+#: server/commands.c:380
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"
@@ -2703,7 +2731,7 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:341
+#: server/commands.c:390
msgid ""
"load\n"
"load <file-name>"
@@ -2711,130 +2739,130 @@ msgstr ""
"load\n"
"load <failo-pavadinimas>"
-#: server/commands.c:343
+#: server/commands.c:392
msgid "Load game from file."
msgstr "Įkelti žaidimą iš failo."
-#: server/commands.c:344
+#: server/commands.c:393
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:349
+#: server/commands.c:399
msgid "read <file-name>"
msgstr "read <failo-vardas>"
-#: server/commands.c:350
+#: server/commands.c:400
msgid "Process server commands from file."
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:354
+#: server/commands.c:405
msgid "write <file-name>"
msgstr "write <failo-vardas>"
-#: server/commands.c:355
+#: server/commands.c:406
msgid "Write current settings as server commands to file."
msgstr ""
-#: server/commands.c:359
+#: server/commands.c:411
msgid "Switch server output between 'RFC-style' and normal style."
msgstr ""
-#: server/commands.c:363
+#: server/commands.c:416
msgid "Simply returns the id of the server."
msgstr "PaprasÄiausiai grąžina serverio identfikacinį numerį."
-#: server/connecthand.c:85
+#: server/connecthand.c:109
#, c-format
msgid "Welcome to the %s Server running at %s port %d."
msgstr "Sveiki atvykę į %s serverį, paleistą %s %d prievade."
-#: server/connecthand.c:89
+#: server/connecthand.c:113
#, c-format
msgid "Welcome to the %s Server at port %d."
msgstr "Sveiki atvykę į %s serverį, prievadas %d"
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:97
+#: server/connecthand.c:121
#, fuzzy, c-format
msgid "(%d) %s: connected [%s]"
msgstr "(%d) %s prisijungė iš %s."
-#: server/connecthand.c:104
+#: server/connecthand.c:128
#, c-format
msgid "Server: %s has connected from %s."
msgstr "Serveris: %s prisijungė iš %s."
-#: server/connecthand.c:145
+#: server/connecthand.c:175
msgid "Couldn't attach your connection to new player."
msgstr "Negalime Jūsų prijungti prie naujo žaidėjo."
-#: server/connecthand.c:165
+#: server/connecthand.c:199
#, c-format
msgid "You are logged in as '%s' connected to no player."
msgstr ""
-#: server/connecthand.c:169
+#: server/connecthand.c:203
#, c-format
msgid "You are logged in as '%s' connected to an anonymous player."
msgstr ""
-#: server/connecthand.c:174
+#: server/connecthand.c:208
#, c-format
msgid "You are logged in as '%s' connected to %s."
msgstr ""
-#: server/connecthand.c:187
+#: server/connecthand.c:221
#, c-format
msgid "Turn-blocking game play: waiting on %s to finish turn..."
msgstr ""
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:240
+#: server/connecthand.c:274
#, c-format
msgid "(%d) %s: connection request [%s]"
msgstr ""
-#: server/connecthand.c:266
+#: server/connecthand.c:300
msgid "The client is missing a capability that this server needs."
msgstr ""
-#: server/connecthand.c:268 server/connecthand.c:279
+#: server/connecthand.c:302 server/connecthand.c:313
#, fuzzy, c-format
msgid "(%d) %s rejected: mismatched capabilities!"
msgstr "(%d) %s buvo atmestas dėl nesuderinamų galimybių."
-#: server/connecthand.c:277
+#: server/connecthand.c:311
msgid "This server is missing a capability that the client needs."
msgstr ""
-#: server/connecthand.c:290
+#: server/connecthand.c:324
#, fuzzy
msgid "The username is invalid!"
msgstr "Netinkamas vartotojo vardas"
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:292
+#: server/connecthand.c:326
#, fuzzy, c-format
msgid "(%d) %s rejected: invalid username [%s]"
msgstr "(%d) %s buvo atmestas: Neleistinas vardas [%s]."
-#: server/connecthand.c:303
+#: server/connecthand.c:337
#, fuzzy
msgid "Your username is already connected!"
msgstr "jau prisijungęs."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:305
+#: server/connecthand.c:339
#, fuzzy, c-format
msgid "(%d) %s rejected: duplicate username [%s]"
msgstr ""
"(%d) %sbuvo atmestas: antrÄ…kart jungiamasi tuo paÄiu prisijungimo vardu[%s]."
-#: server/connecthand.c:335 server/connecthand.c:344
+#: server/connecthand.c:369 server/connecthand.c:378
#, c-format
msgid "Lost connection: %s."
msgstr "Prarastas ryšys: %s."
@@ -2851,37 +2879,37 @@ msgstr ""
msgid "For introductory help, type 'help'."
msgstr "Norėdami gauti įžanginę pagalbą surinkite 'help'."
-#: server/diplhand.c:164
+#: server/diplhand.c:167
#, c-format
msgid "The %s can't accept %s."
msgstr "%s negali priimti %s."
-#: server/diplhand.c:176
+#: server/diplhand.c:179
#, c-format
msgid "You don't have tech %s, you can't accept treaty."
msgstr "JÅ«s neturite technologijos %s, negalite priimti sutarties."
-#: server/diplhand.c:185
+#: server/diplhand.c:188
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."
-#: server/diplhand.c:191
+#: server/diplhand.c:194
#, c-format
msgid "You are not owner of %s, you can't accept treaty."
msgstr "JÅ«s nesate %s savininkas, negalite priimti sutarties."
-#: server/diplhand.c:197 server/diplhand.c:301
+#: server/diplhand.c:200 server/diplhand.c:304
#, c-format
msgid "Your capital (%s) is requested, you can't accept treaty."
msgstr "Pareikalaute Jūsų sostinė (%s), negalite priimti sutarties."
-#: server/diplhand.c:224
+#: server/diplhand.c:227
msgid "You don't have enough gold, you can't accept treaty."
msgstr "Neturi pakankamai aukso, dÄ—l to negali priimti sutarties."
-#: server/diplhand.c:256 server/diplhand.c:261
+#: server/diplhand.c:259 server/diplhand.c:264
#, c-format
msgid "A treaty containing %d clause was agreed upon."
msgid_plural "A treaty containing %d clauses was agreed upon."
@@ -2889,76 +2917,76 @@ msgstr[0] "Suderinta sutartis turinti %d sÄ…lygÄ…"
msgstr[1] "Suderinta sutartis turinti %d sÄ…lygas"
msgstr[2] "Suderinta sutartis turinti %d sąlygų"
-#: server/diplhand.c:277 server/diplhand.c:281
+#: server/diplhand.c:280 server/diplhand.c:284
#, fuzzy, 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!"
-#: server/diplhand.c:288 server/diplhand.c:293
+#: server/diplhand.c:291 server/diplhand.c:296
#, c-format
msgid "The %s no longer control %s! Treaty canceled!"
msgstr "%s daugiau nebekontroliuoja %s! Sutartis nutraukta!"
-#: server/diplhand.c:331 server/diplhand.c:335
+#: server/diplhand.c:334 server/diplhand.c:338
#, 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!"
-#: server/diplhand.c:364
+#: server/diplhand.c:367
#, c-format
msgid "You gave an embassy to %s."
msgstr "JÅ«s davÄ—te ambasadÄ… %s."
-#: server/diplhand.c:367
+#: server/diplhand.c:370
#, c-format
msgid "%s allowed you to create an embassy!"
msgstr "%s leido jums įsteigti ambasadą!"
-#: server/diplhand.c:383
+#: server/diplhand.c:386
#, c-format
msgid "You are taught the knowledge of %s."
msgstr "Jūs esate išmokomas technologijos %s."
-#: server/diplhand.c:387
+#: server/diplhand.c:390
#, c-format
msgid "The %s have acquired %s from the %s."
msgstr "%s gavo %s iš %s."
-#: server/diplhand.c:402
+#: server/diplhand.c:405
#, c-format
msgid "You get %d gold."
msgstr "JÅ«s gavote %d aukso."
#. TRANS: ... Polish worldmap.
-#: server/diplhand.c:410
+#: server/diplhand.c:413
#, fuzzy, c-format
msgid "You receive the %s worldmap."
msgstr "Jūs gavote %s pasaulio žemėlapį."
#. TRANS: ... Polish seamap.
-#: server/diplhand.c:419
+#: server/diplhand.c:422
#, fuzzy, c-format
msgid "You receive the %s seamap."
msgstr "Jūs gavote %s jūros žemėlapį."
-#: server/diplhand.c:436
+#: server/diplhand.c:439
#, c-format
msgid "You receive city of %s from %s."
msgstr "Jūs gaunate miestą %s iš %s."
-#: server/diplhand.c:441
+#: server/diplhand.c:444
#, c-format
msgid "You give city of %s to %s."
msgstr "Jūs atiduodate miestą %s žaidėjui %s."
-#: server/diplhand.c:454 server/diplhand.c:457
+#: server/diplhand.c:457 server/diplhand.c:460
#, c-format
msgid "You agree on a cease-fire with %s."
msgstr "JÅ«s sutinkate su paliaubomis su %s."
#. TRANS: ... the Poles ... Polish territory.
-#: server/diplhand.c:476 server/diplhand.c:488
+#: server/diplhand.c:479 server/diplhand.c:491
#, c-format
msgid ""
"You agree on an armistice with the %s. In %d turn, it will become a peace "
@@ -2970,32 +2998,32 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: server/diplhand.c:512 server/diplhand.c:515
+#: server/diplhand.c:515 server/diplhand.c:518
#, c-format
msgid "You agree on an alliance with %s."
msgstr "Susitariate dÄ—l sÄ…jungos su %s."
-#: server/diplhand.c:524
+#: server/diplhand.c:527
#, c-format
msgid "You give shared vision to %s."
msgstr "JÅ«s duodate bendrÄ… regÄ—jimo laukÄ… %s."
-#: server/diplhand.c:527
+#: server/diplhand.c:530
#, c-format
msgid "%s gives you shared vision."
msgstr "%s duoda Jums bendrÄ… regÄ—jimo laukÄ…."
-#: server/diplhand.c:663
+#: server/diplhand.c:666
#, c-format
msgid "%s canceled the meeting!"
msgstr "%s atšaukė susitikimą!"
-#: server/diplhand.c:670
+#: server/diplhand.c:673
#, c-format
msgid "Meeting with %s canceled."
msgstr "Susitikimas su %s atšauktas."
-#: server/diplhand.c:712
+#: server/diplhand.c:715
msgid "Your diplomatic envoy was decapitated!"
msgstr "Jūsų diplomatijos pasiuntinui buvo nukirsta galva!"
@@ -3178,80 +3206,80 @@ msgid "The %s destroyed the %s in %s."
msgstr "%s sunaikino %s, esantį %s."
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1091
+#: server/diplomats.c:1097
#, c-format
msgid "An enemy %s has been eliminated by your %s."
msgstr ""
#. TRANS: <unit> ... <city> ... <diplomat>
-#: server/diplomats.c:1098
+#: server/diplomats.c:1104
#, c-format
msgid "Your %s has been eliminated defending %s against a %s."
msgstr ""
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1106
+#: server/diplomats.c:1112
#, c-format
msgid "Your %s has been eliminated defending against a %s."
msgstr ""
-#: server/diplomats.c:1119
+#: server/diplomats.c:1125
#, c-format
msgid "Your %s was eliminated by a defending %s."
msgstr "Jūsų %s sunaikino besiginantis %s."
-#: server/diplomats.c:1127
+#: server/diplomats.c:1133
#, c-format
msgid "Eliminated %s %s while infiltrating %s."
msgstr ""
-#: server/diplomats.c:1134
+#: server/diplomats.c:1140
#, c-format
msgid "Eliminated %s %s while infiltrating our troops."
msgstr ""
-#: server/diplomats.c:1185
+#: server/diplomats.c:1191
#, c-format
msgid ""
"Your %s has successfully completed the mission and returned unharmed to %s."
msgstr ""
-#: server/diplomats.c:1204
+#: server/diplomats.c:1210
#, fuzzy, c-format
msgid "Your %s was captured after completing the mission in %s."
msgstr "Jūsų %s buvo pagauta pabaigusi savo misiją mieste %s."
-#: server/diplomats.c:1210
+#: server/diplomats.c:1216
#, fuzzy, c-format
msgid "Your %s was captured after completing the mission."
msgstr "Jūsų %s buvo pagauta pabaigusi savo misiją."
-#: server/diplomats.c:1242
+#: server/diplomats.c:1248
#, fuzzy, c-format
msgid "You have caused an incident while bribing the %s %s."
msgstr "JÅ«s sukÄ—lÄ—te incidentÄ… bandydamas papirkti %s %s."
-#: server/diplomats.c:1247
+#: server/diplomats.c:1253
#, c-format
msgid "%s has caused an incident while bribing your %s."
msgstr "%s sukėlė incidentą bandydamas papirkti Jūsų %s."
-#: server/diplomats.c:1254
+#: server/diplomats.c:1260
#, 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ą."
-#: server/diplomats.c:1258
+#: server/diplomats.c:1264
#, 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ą."
-#: server/diplomats.c:1264
+#: server/diplomats.c:1270
#, 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."
-#: server/diplomats.c:1268
+#: server/diplomats.c:1274
#, c-format
msgid "%s have caused an incident while inciting a revolt in %s."
msgstr "%s sukÄ—lÄ— incidentÄ… bandydamas sukelti sukilimÄ… mieste %s."
@@ -3368,12 +3396,12 @@ msgstr ""
" Darbuotojai iš karto susirenka ir nutiesia geležinkelius visuose "
"miestuose."
-#: server/maphand.c:1418
+#: server/maphand.c:1425
#, c-format
msgid "Moved your %s due to changing terrain."
msgstr "JÅ«sų %s patrauktas dÄ—l besikeiÄianÄio reljefo."
-#: server/maphand.c:1436
+#: server/maphand.c:1443
#, c-format
msgid "Disbanded your %s due to changing terrain."
msgstr "JÅ«sų %s panaikintas dÄ—l besikeiÄianÄio reljefo."
@@ -3382,7 +3410,7 @@ msgstr "JÅ«sų %s panaikintas dÄ—l besikeiÄianÄio reljefo."
msgid "Not reporting to the metaserver in this game."
msgstr "Šiame žaidime metaserveriui nėra teikiama ataskaita."
-#: server/meta.c:430
+#: server/meta.c:432
#, c-format
msgid "Metaserver: bad address: [%s:%d]."
msgstr "Metaserveris: blogas adresas: [%s:%d]."
@@ -3507,26 +3535,26 @@ msgstr ""
"Jūsų komandos draugas %s paskelbė karą %s. Jūs privalote nutraukti sąjungą "
"su %s."
-#: server/plrhand.c:1103
+#: server/plrhand.c:1115
#, c-format
msgid "Removing player %s."
msgstr "Pašalinamas žaidėjas %s."
-#: server/plrhand.c:1105
+#: server/plrhand.c:1117
msgid "You've been removed from the game!"
msgstr "Jūs pašalintas iš žaidimo!"
-#: server/plrhand.c:1108
+#: server/plrhand.c:1120
#, c-format
msgid "%s has been removed from the game."
msgstr "%s pašalintas iš žaidimo."
-#: server/plrhand.c:1153 server/plrhand.c:1158
+#: server/plrhand.c:1167 server/plrhand.c:1172
#, 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:1178
+#: server/plrhand.c:1192
#, c-format
msgid ""
"%s and %s meet and go to instant war. You cancel your alliance with both."
@@ -3534,17 +3562,17 @@ msgstr ""
"%s ir %s susitiko ir vienas kitam paskelbÄ— karÄ…. JÅ«s nutraukiate sÄ…jungÄ… su "
"abiem."
-#: server/plrhand.c:1656
+#: server/plrhand.c:1670
#, 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:1663
+#: server/plrhand.c:1677
#, 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:1686
+#: server/plrhand.c:1700
#, fuzzy, c-format
msgid ""
"Your nation is thrust into civil war! %s is declared the leader of the rebel "
@@ -3553,12 +3581,12 @@ msgstr ""
"Jūsų valstybėje kilo pilietinis karas, %s pasiskelbė sukilusių valstijų "
"vadu."
-#: server/plrhand.c:1707
+#: server/plrhand.c:1721
#, c-format
msgid "%s declares allegiance to %s."
msgstr "%s paskelbia sÄ…jungÄ… su %s."
-#: server/plrhand.c:1722
+#: server/plrhand.c:1736
#, c-format
msgid ""
"Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3749,68 +3777,68 @@ msgstr "(statoma %s %s(%s))\n"
msgid "Wonders of the World"
msgstr "Pasaulio stebuklai"
-#: server/report.c:547
+#: server/report.c:552
msgid " sq. mi."
msgstr "kv. myl,"
-#: server/report.c:557
+#: server/report.c:562
msgid " M tons"
msgstr " mil. tonų"
-#: server/report.c:562
+#: server/report.c:567
msgid " M goods"
msgstr ""
-#: server/report.c:567
+#: server/report.c:572
msgid " bulbs"
msgstr "lemputÄ—s"
-#: server/report.c:572
+#: server/report.c:577
msgid " month"
msgid_plural " months"
msgstr[0] " mÄ—nuo"
msgstr[1] " mÄ—nesiai"
msgstr[2] " mėnesių"
-#: server/report.c:577
+#: server/report.c:582
msgid " ton"
msgid_plural " tons"
msgstr[0] " tona"
msgstr[1] " tonos"
msgstr[2] " tonų"
-#: server/report.c:591
+#: server/report.c:596
msgid "st"
msgstr "-mas"
-#: server/report.c:593
+#: server/report.c:598
msgid "nd"
msgstr "-ras"
-#: server/report.c:595
+#: server/report.c:600
msgid "rd"
msgstr "-Äias"
-#: server/report.c:597
+#: server/report.c:602
msgid "th"
msgstr "-tas"
-#: server/report.c:700
+#: server/report.c:705
msgid "Demography string contains invalid characters. Try \"help demography\"."
msgstr ""
"Demografijos eilutėje rasta negalimų simbolių. Bandykite \"help demography\"."
-#: server/report.c:743 server/report.c:768
+#: server/report.c:748 server/report.c:773
msgid "Demographics Report:"
msgstr "Demografų ataskaita:"
-#: server/report.c:744
+#: server/report.c:749
msgid "Sorry, the Demographics report is unavailable."
msgstr "Apgailestaujame, taÄiau demografinÄ— ataskaita negalima."
#. TRANS: <nation adjective> <government name> (<year>).
#. * E.g. "Polish Despotism (200 AD)".
-#: server/report.c:750
+#: server/report.c:755
#, fuzzy, c-format
msgid "%s %s (%s)"
msgstr "%s esantis %s (%s)\n"
@@ -3821,11 +3849,11 @@ msgstr "%s esantis %s (%s)\n"
msgid "Could not find a readable \"%s.%s\" ruleset file."
msgstr ""
-#: server/ruleset.c:2356
+#: server/ruleset.c:2366
msgid "No barbarian nation in rulesets, at least one required!"
msgstr ""
-#: server/ruleset.c:3166
+#: server/ruleset.c:3178
msgid "Loading rulesets"
msgstr "Įkeliamos taisyklės"
@@ -3837,13 +3865,13 @@ msgid ""
"risk."
msgstr ""
-#: server/savegame.c:3588
+#: server/savegame.c:3587
#, 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."
#. TRANS: Fatal error message.
-#: server/savegame.c:3815
+#: server/savegame.c:3817
#, fuzzy
msgid ""
"Saved game uses the \"classic\" terrain ruleset, and is no longer supported."
@@ -3851,7 +3879,7 @@ msgstr ""
"Šis išsaugotas žaidimas naudoja klasikines reljefo taisykles, kurios daugiau "
"nebepalaikomos."
-#: server/savegame.c:3824
+#: server/savegame.c:3826
#, c-format
msgid ""
"Warning: Different rulesetdirs ('%s' and '%s') are no longer supported. "
@@ -3859,7 +3887,7 @@ msgid ""
msgstr ""
#. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4051
+#: server/savegame.c:4055
#, c-format
msgid "%s had invalid nation; changing to %s."
msgstr ""
@@ -3892,7 +3920,7 @@ msgstr "Vidiniai"
msgid "Networking"
msgstr "Tinklo"
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:734
#: client/gui-win32/dialogs.c:532
msgid "All"
msgstr "Visos"
@@ -4821,12 +4849,12 @@ msgid ""
"the game."
msgstr ""
-#: server/sernet.c:150
+#: server/sernet.c:151
msgid "Server cannot read standard input. Ignoring input."
msgstr ""
"Serveris negali nuskaityti standartinės įvesties. Įvesties ignoruojama."
-#: server/sernet.c:929
+#: server/sernet.c:933
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr "Serveris: blogas adresas: [%s:%d]."
@@ -4900,46 +4928,46 @@ msgstr "JÅ«sų erdvÄ—laivis jau turi maksimalų skaiÄių saulÄ—s jÄ—gainių mod
msgid "Without guidance from the capital, the %s spaceship is lost!"
msgstr "Be sostinÄ—s vadovavimo %s erdvÄ—laivis prarastas!"
-#: server/srv_main.c:240
+#: server/srv_main.c:242
msgid "Game ended in a draw as end year exceeded"
msgstr "Žaidimas baigėsi lygiosiomis, nes pasiekti pabaigos metai."
-#: server/srv_main.c:274
+#: server/srv_main.c:276
#, c-format
msgid "The %s spaceship has arrived at Alpha Centauri."
msgstr "%s erdvėlaivis atvyko į Alfa Kentaura."
-#: server/srv_main.c:287 server/srv_main.c:322
+#: server/srv_main.c:289 server/srv_main.c:324
#, c-format
msgid "Team victory to %s"
msgstr "Komandos %s pergalÄ—"
-#: server/srv_main.c:297 server/srv_main.c:338
+#: server/srv_main.c:299 server/srv_main.c:340
#, c-format
msgid "Game ended in victory for %s"
msgstr "Žaidimas baigėsi %s pergale"
-#: server/srv_main.c:345
+#: server/srv_main.c:347
msgid "Game ended in a draw"
msgstr "Žaidimas baigėsi lygiosiomis"
-#: server/srv_main.c:461 server/srv_main.c:472
+#: server/srv_main.c:465 server/srv_main.c:476
#, c-format
msgid "Your %s was disbanded in accordance with your peace treaty with the %s."
msgstr ""
-#: server/srv_main.c:512 server/srv_main.c:516
+#: server/srv_main.c:516 server/srv_main.c:520
#, 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."
-#: server/srv_main.c:521 server/srv_main.c:525
+#: server/srv_main.c:525 server/srv_main.c:529
#, 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."
-#: server/srv_main.c:542
+#: server/srv_main.c:546
#, fuzzy, c-format
msgid ""
"Ceasefire between %s and %s has run out. They are at war. You cancel your "
@@ -4948,778 +4976,831 @@ msgstr ""
"%s ir %s susitiko ir vienas kitam paskelbÄ— karÄ…. JÅ«s nutraukiate sÄ…jungÄ… su "
"abiem."
-#: server/srv_main.c:961
+#: server/srv_main.c:997
#, c-format
msgid "Failed saving game as %s"
msgstr "Nepavyko išsaugoti žaidimo kaip %s"
-#: server/srv_main.c:963
+#: server/srv_main.c:999
#, c-format
msgid "Game saved as %s"
msgstr "Žaidimas išsaugotas kaip %s"
-#: server/srv_main.c:994
+#: server/srv_main.c:1030
msgid "The game is already running."
msgstr "Žaidimas jau paleistas."
-#: server/srv_main.c:1002
+#: server/srv_main.c:1038
#, c-format
msgid "%s lost control cmdlevel on game start. Use voting from now on."
msgstr ""
-#: server/srv_main.c:1009
+#: server/srv_main.c:1045
msgid "Starting game."
msgstr "Paleidžiamas žaidimas."
-#: server/srv_main.c:1071
+#: server/srv_main.c:1112
#, c-format
msgid "request for unknown report (type %d)"
msgstr ""
-#: server/srv_main.c:1136
+#: server/srv_main.c:1177
#, c-format
msgid "Warning: rejecting old client %s"
msgstr "DÄ—mesio: atmetamas senas klientas %s"
-#: server/srv_main.c:1238
+#: server/srv_main.c:1279
#, c-format
msgid "Got a packet of type %d from a dead or observer player"
msgstr ""
-#: server/srv_main.c:1338
+#: server/srv_main.c:1381
msgid "Please choose a non-blank name."
msgstr "Pasirinkite ne tuÅ¡ÄiÄ… vardÄ…"
-#: server/srv_main.c:1354
+#: server/srv_main.c:1397
msgid "That nation is already in use."
msgstr "Å i tauta jau pasirinkta."
-#: server/srv_main.c:1370
+#: server/srv_main.c:1413
#, 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:1391
+#: server/srv_main.c:1434
msgid "Please choose a name containing only ASCII characters."
msgstr ""
-#: server/srv_main.c:1490
+#: server/srv_main.c:1533
#, c-format
msgid "%s nation is not available in this scenario."
msgstr "%s tauta yra negalima Å¡iam scenarijuje."
-#: server/srv_main.c:1496
+#: server/srv_main.c:1539
#, c-format
msgid "%s nation is already in use."
msgstr "%s tauta jau pasirinkta."
-#: server/srv_main.c:1514
+#: server/srv_main.c:1557
#, c-format
msgid "%s is the %s ruler %s."
msgstr "%s yra %s valdovas %s."
-#: server/srv_main.c:1570
+#: server/srv_main.c:1613
#, c-format
msgid "Waiting to start game: %d out of %d players are ready to start."
msgstr ""
-#: server/srv_main.c:1614 server/srv_main.c:1618
+#: server/srv_main.c:1657 server/srv_main.c:1661
#, c-format
msgid "%s has been added as %s level AI-controlled player."
msgstr ""
-#: server/srv_main.c:1760
+#: server/srv_main.c:1803
#, c-format
msgid "Player %d"
msgstr "Žaidėjas %d"
-#: server/srv_main.c:1771 server/srv_main.c:1777
+#: server/srv_main.c:1814 server/srv_main.c:1820
#, c-format
msgid "%s rules the %s."
msgstr "%s valdo %s."
-#: server/srv_main.c:1942
+#: server/srv_main.c:1985
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
msgstr ""
-#: server/srv_main.c:1993
+#: server/srv_main.c:2037
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr "Informacija siunÄiama į metaserverį [%s]"
-#: server/srv_main.c:2024
+#: server/srv_main.c:2069
msgid "The game is over..."
msgstr "Žaidimas baigtas..."
-#: server/srv_main.c:2237
+#: server/srv_main.c:2286
msgid "Now accepting new client connections."
msgstr "Dabar priimami nauji klientų prisijungimai."
-#: server/stdinhand.c:246
-#, c-format
-msgid "Vote \"%s\" is passed %d to %d with %d abstentions."
-msgstr ""
-
-#: server/stdinhand.c:253
-#, c-format
-msgid "Vote \"%s\" failed with %d against, %d for and %d abstentions."
-msgstr ""
-
#. TRANS: ambiguous command
-#: server/stdinhand.c:365
+#: server/stdinhand.c:284
msgid "(ambiguous)"
msgstr "(dviprasmiškas)"
#. TRANS: unrecognized command
#. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:416
+#: server/stdinhand.c:287 client/citydlg_common.c:419
#: 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)"
-#: server/stdinhand.c:458
+#: server/stdinhand.c:377
msgid "Name is empty, so cannot be a player."
msgstr "Vardas tuÅ¡Äias, taigi negali bÅ«ti žaidÄ—jo."
-#: server/stdinhand.c:462
+#: server/stdinhand.c:381
msgid "Name is too long, so cannot be a player."
msgstr "Vardas per ilgas, taigi negali būti žaidėjo."
-#: server/stdinhand.c:466
+#: server/stdinhand.c:385
#, c-format
msgid "Player name prefix '%s' is ambiguous."
msgstr ""
-#: server/stdinhand.c:470
+#: server/stdinhand.c:389
#, c-format
msgid "No player by the name of '%s'."
msgstr "Nėra tokio žaidėjo, vardu '%s'."
-#: server/stdinhand.c:474 server/stdinhand.c:509
+#: server/stdinhand.c:393 server/stdinhand.c:428
#, c-format
msgid "Unexpected match_result %d (%s) for '%s'."
msgstr ""
-#: server/stdinhand.c:493
+#: server/stdinhand.c:412
msgid "Name is empty, so cannot be a connection."
msgstr "Vardas yra tuÅ¡Äias, todÄ—l jungtis negali bÅ«ti sukurta."
-#: server/stdinhand.c:497
+#: server/stdinhand.c:416
msgid "Name is too long, so cannot be a connection."
msgstr "Vardas yra per ilgas, todėl jungtis negali būti sukurta."
-#: server/stdinhand.c:501
+#: server/stdinhand.c:420
#, c-format
msgid "Connection name prefix '%s' is ambiguous."
msgstr "Jungties vardo priešdėlis „%s“ yra dviprasmiškas."
-#: server/stdinhand.c:505
+#: server/stdinhand.c:424
#, c-format
msgid "No connection by the name of '%s'."
msgstr "NÄ—ra tokios jungties, pavadinimu '%s'."
-#: server/stdinhand.c:525
+#: server/stdinhand.c:444
#, c-format
msgid "Open metaserver connection to [%s]."
msgstr ""
-#: server/stdinhand.c:538
+#: server/stdinhand.c:457
#, c-format
msgid "Close metaserver connection to [%s]."
msgstr ""
-#: server/stdinhand.c:553
+#: server/stdinhand.c:472
msgid "Metaserver connection is open."
msgstr "Metaserverio jungtis yra atvira."
-#: server/stdinhand.c:556
+#: server/stdinhand.c:475
msgid "Metaserver connection is closed."
msgstr "Metaserverio jungtis yra uždara."
-#: server/stdinhand.c:566
+#: server/stdinhand.c:485
msgid "Metaserver connection is already open."
msgstr "Metaserverio jungtis jau yra atvira."
-#: server/stdinhand.c:577
+#: server/stdinhand.c:496
msgid "Metaserver connection is already closed."
msgstr "Metaserverio jungtis jau yra uždara."
-#: server/stdinhand.c:582
+#: server/stdinhand.c:501
msgid "Argument must be 'u', 'up', 'd', 'down', or '?'."
msgstr "Argumentas turi būti 'u', 'up', 'd', 'down' arba '?'."
-#: server/stdinhand.c:603
+#: server/stdinhand.c:522
#, c-format
msgid "Metaserver patches string set to '%s'."
msgstr ""
-#: server/stdinhand.c:606
+#: server/stdinhand.c:525
#, c-format
msgid "Metaserver patches string set to '%s', not reporting to metaserver."
msgstr ""
-#: server/stdinhand.c:627
+#: server/stdinhand.c:546
#, c-format
msgid "Metaserver message string set to '%s'."
msgstr ""
-#: server/stdinhand.c:630
+#: server/stdinhand.c:549
#, c-format
msgid "Metaserver message string set to '%s', not reporting to metaserver."
msgstr ""
-#: server/stdinhand.c:650
+#: server/stdinhand.c:569
#, c-format
msgid "Metaserver is now [%s]."
msgstr "Metaserveris dabar yra [%s]."
-#: server/stdinhand.c:660
+#: server/stdinhand.c:579
#, c-format
msgid "Server id: %s"
msgstr "Serverio id: %s"
-#: server/stdinhand.c:757
+#: server/stdinhand.c:676
msgid "You cannot save games manually on this server."
msgstr "Rankiniu būdu šiame serveryje žaidmų išsaugoti negalite."
-#: server/stdinhand.c:774
+#: server/stdinhand.c:693
msgid "Cannot toggle a barbarian player."
msgstr "Negalite perjungti barbaro žaidėjo."
-#: server/stdinhand.c:781
+#: server/stdinhand.c:700
#, c-format
msgid "%s is now under AI control."
msgstr "%s dabar valdo DI."
-#: server/stdinhand.c:802
+#: server/stdinhand.c:721
#, c-format
msgid "%s is now under human control."
msgstr "%s dabar valdo žmogus."
-#: server/stdinhand.c:847
+#: server/stdinhand.c:766
msgid "Can't add AI players once the game has begun."
msgstr "Negalite įdėti DI žaidėjų žaidimui prasidėjus."
-#: server/stdinhand.c:867
+#: server/stdinhand.c:786
msgid "Can't add more players, server is full."
msgstr "Neįmanoma pridėti daugiau žaidėjų, serveris pilnas."
-#: server/stdinhand.c:874
+#: server/stdinhand.c:793
msgid "Can't use an empty name."
msgstr "Negaliu naudoti tuÅ¡Äio vardo."
-#: server/stdinhand.c:881
+#: server/stdinhand.c:800
#, c-format
msgid "That name exceeds the maximum of %d chars."
msgstr "Vardo ilgis viršija %d raidžių maksimumą."
-#: server/stdinhand.c:887
+#: server/stdinhand.c:806
msgid "That name is not allowed."
msgstr "Šis vardas neleidžiamas"
-#: server/stdinhand.c:893
+#: server/stdinhand.c:812
msgid "A player already exists by that name."
msgstr "Žaidėjas tokiu vardu jau egzistuoja."
-#: server/stdinhand.c:899
+#: server/stdinhand.c:818
msgid "A user already exists by that name."
msgstr "Vartotojas Å¡iuo vardu jau egzistuoja."
-#: server/stdinhand.c:925
+#: server/stdinhand.c:844
#, c-format
msgid "%s has been added as an AI-controlled player."
msgstr "%s buvo įtrauktas kaip DI kontroliuojamas žaidėjas."
-#: server/stdinhand.c:932
+#: server/stdinhand.c:851
#, c-format
msgid "Error creating new AI player: %s."
msgstr "Klaida kuriant naują DI žaidėją: %s."
-#: server/stdinhand.c:966
+#: server/stdinhand.c:885
msgid "Players cannot be removed once the game has started."
msgstr "Žaidėjai negali būti pašalinti prasidėjus žaidimui."
-#: server/stdinhand.c:977
+#: server/stdinhand.c:896
#, c-format
msgid "Removed player %s from the game."
msgstr "Žaidėjas %s pašalintas iš žaidimo"
-#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
+#: server/stdinhand.c:935 server/stdinhand.c:3372 server/stdinhand.c:3507
#, c-format
msgid "Name \"%s\" disallowed for security reasons."
msgstr "Vardas \"%s\" neleidžiamas dÄ—l saugumo priežasÄių."
-#: server/stdinhand.c:1029
+#: server/stdinhand.c:948
#, c-format
msgid "No command script found by the name \"%s\"."
msgstr ""
-#: server/stdinhand.c:1037
+#: server/stdinhand.c:956
#, c-format
msgid "Loading script file: %s"
msgstr "Įkeliamas scenarijaus failas: %s"
-#: server/stdinhand.c:1052
+#: server/stdinhand.c:971
#, c-format
msgid "Cannot read command line scriptfile '%s'."
msgstr ""
-#: server/stdinhand.c:1054
+#: server/stdinhand.c:973
#, c-format
msgid "Could not read script file '%s'."
msgstr "Negalima perskaityti scenarijaus failo „%s“."
-#: server/stdinhand.c:1146
+#: server/stdinhand.c:1065
#, c-format
msgid "Could not write script file '%s'."
msgstr "Negalima įrašyti scenarijaus failo „%s“."
-#: server/stdinhand.c:1158
+#: server/stdinhand.c:1077
msgid "You cannot use the write command on this server for security reasons."
msgstr ""
-#: server/stdinhand.c:1186
+#: server/stdinhand.c:1105
#, c-format
msgid ""
"Cannot decrease command access level '%s' for connection '%s'; you only have "
"'%s'."
msgstr ""
-#: server/stdinhand.c:1241
+#: server/stdinhand.c:1114
+#, c-format
+msgid "Command access level set to '%s' for connection %s."
+msgstr ""
+
+#: server/stdinhand.c:1163
#, c-format
msgid ""
"Anyone can now become game organizer '%s' by issuing the 'first' command."
msgstr ""
-#: server/stdinhand.c:1274
+#: server/stdinhand.c:1187
msgid "Command access levels in effect:"
msgstr ""
-#: server/stdinhand.c:1282
+#: server/stdinhand.c:1194
#, c-format
msgid "Command access level for new connections: %s"
msgstr ""
-#: server/stdinhand.c:1285
+#: server/stdinhand.c:1197
#, c-format
msgid "Command access level for first player to take it: %s"
msgstr ""
-#: server/stdinhand.c:1294
+#: server/stdinhand.c:1206
msgid ""
"Error: command access level must be one of 'none', 'info', 'ctrl', or 'hack'."
msgstr ""
-#: server/stdinhand.c:1299
+#: server/stdinhand.c:1211
#, c-format
msgid ""
"Cannot increase command access level to '%s'; you only have '%s' yourself."
msgstr ""
-#: server/stdinhand.c:1326 server/stdinhand.c:1375
-#, c-format
-msgid "Command access level set to '%s' for connection %s."
-msgstr ""
-
-#: 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:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
+#: server/stdinhand.c:1238 server/stdinhand.c:1252 server/stdinhand.c:1273
#, c-format
msgid "Command access level set to '%s' for new players."
msgstr ""
-#: server/stdinhand.c:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
+#: server/stdinhand.c:1243 server/stdinhand.c:1257 server/stdinhand.c:1267
#, c-format
msgid "Command access level set to '%s' for first player to grab it."
msgstr ""
-#: server/stdinhand.c:1402
+#: server/stdinhand.c:1302
msgid "The 'first' command makes no sense from the server command line."
msgstr ""
-#: server/stdinhand.c:1406
+#: server/stdinhand.c:1306
#, c-format
msgid "You already have command access level '%s' or better."
msgstr ""
-#: server/stdinhand.c:1411
+#: server/stdinhand.c:1311
msgid "Someone else already is game organizer."
msgstr "Žaidimo organizatorius jau yra kažkas kitas."
-#: server/stdinhand.c:1416
+#: server/stdinhand.c:1316
#, c-format
msgid "Connection %s has opted to become the game organizer."
msgstr ""
-#: server/stdinhand.c:1467
+#: server/stdinhand.c:1367
#, c-format
msgid "Invalid argument %d."
msgstr "Netinkamas argumentas %d."
-#: server/stdinhand.c:1474
+#: server/stdinhand.c:1374
msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
msgstr ""
-#: server/stdinhand.c:1482
+#: server/stdinhand.c:1382
#, c-format
msgid "Dynamic timeout set to %d %d %d %d"
msgstr ""
-#: server/stdinhand.c:1542 server/stdinhand.c:1545
+#: server/stdinhand.c:1442 server/stdinhand.c:1445
msgid "Option:"
msgstr "Parinktis:"
-#: server/stdinhand.c:1555 server/stdinhand.c:4031
+#: server/stdinhand.c:1455 server/stdinhand.c:4079
msgid "Description:"
msgstr "Aprašymas:"
-#: server/stdinhand.c:1560
+#: server/stdinhand.c:1460
#, c-format
msgid "Status: %s"
msgstr "BÅ«sena: %s"
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "changeable"
msgstr "keiÄiamas"
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "fixed"
msgstr "fiksuotas"
-#: server/stdinhand.c:1567
+#: server/stdinhand.c:1467
#, c-format
msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
msgstr ""
-#: server/stdinhand.c:1572
+#: server/stdinhand.c:1472
#, c-format
msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
msgstr ""
-#: server/stdinhand.c:1578
+#: server/stdinhand.c:1478
#, c-format
msgid "Value: \"%s\", Default: \"%s\""
msgstr "Vertė: „%s“, numatyta: „%s“"
-#: server/stdinhand.c:1597
+#: server/stdinhand.c:1497
msgid "Explanations are available for the following server options:"
msgstr "Paaiškinimai galimi šioms serverio parinktims:"
-#: server/stdinhand.c:1643
+#: server/stdinhand.c:1537
msgid "No explanation for that yet."
msgstr "Šitam dar nėra paaiškinimo."
-#: server/stdinhand.c:1646 server/stdinhand.c:2480
+#: server/stdinhand.c:1540 server/stdinhand.c:2468
msgid "Ambiguous option name."
msgstr "Dviprasmiškas parinkties vardas."
-#: server/stdinhand.c:1666
+#: server/stdinhand.c:1560
#, c-format
msgid "Server Operator: %s"
msgstr "Serverio operatorius: %s"
-#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
+#: server/stdinhand.c:1686 server/stdinhand.c:1713 server/stdinhand.c:1731
#, c-format
msgid "Player '%s' now has AI skill level '%s'."
msgstr "Žaidėjas „%s“ turi DI meistriškumo lygį „%s“."
-#: server/stdinhand.c:1822
+#: server/stdinhand.c:1718
#, c-format
msgid "%s is not controlled by the AI."
msgstr "DI nekontroliuoja %s."
-#: server/stdinhand.c:1842
+#: server/stdinhand.c:1738
#, c-format
msgid "Default AI skill level set to '%s'."
msgstr "Numatytas DI meistriškumo lygis nustatytas į „%s“."
-#: server/stdinhand.c:1857 server/stdinhand.c:2162
+#: server/stdinhand.c:1753
msgid "This command is client only."
msgstr "Å i komanda skirta tik klientui."
-#: server/stdinhand.c:1860
+#: server/stdinhand.c:1756
msgid "Usage: away"
msgstr "Naudojimas: away"
-#: server/stdinhand.c:1865
+#: server/stdinhand.c:1761
msgid "Only players may use the away command."
msgstr "Tik žaidėjai gali naudoti away komandą"
-#: server/stdinhand.c:1869
+#: server/stdinhand.c:1765
#, c-format
msgid "%s set to away mode."
msgstr "%s dabar yra nutolimo režime."
-#: server/stdinhand.c:1877
+#: server/stdinhand.c:1772
#, c-format
msgid "%s returned to game."
msgstr "%s grįžo į žaidimą."
-#: server/stdinhand.c:1919
+#: server/stdinhand.c:1817
#, c-format
msgid "Sorry, you do not have access to view option '%s'."
msgstr ""
-#: server/stdinhand.c:1925
+#: server/stdinhand.c:1823
#, c-format
msgid "Unknown option '%s'."
msgstr "Nežinomas parametras „%s“."
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1848
msgid "All options with non-default values"
msgstr "Visos parinktys su nestandartinėmis reikšmėmis"
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1851
msgid "All options"
msgstr "Visi nustatymai"
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1854
msgid "Vital options"
msgstr "Gyvybiškai svarbios nuostatos"
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1857
msgid "Situational options"
msgstr "Nuostatos, priklausomos nuo situacijos"
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1860
msgid "Rarely used options"
msgstr "Retai naudojamos nuostatos"
-#: server/stdinhand.c:1965
+#: server/stdinhand.c:1863
msgid "+ means you may change the option"
msgstr "+ reiškia, kad Jūs galite keisti parinktį"
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1864
msgid "= means the option is on its default value"
msgstr "= reikÅ¡kia, kad parinkÄiai nustatyta standartinÄ— reikÅ¡mÄ—"
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
#, c-format
msgid "%-*s value (min,max) "
msgstr ""
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
msgid "Option"
msgstr "Nuostata"
-#: server/stdinhand.c:1973
+#: server/stdinhand.c:1871
msgid "description"
msgstr "aprašymas"
-#: server/stdinhand.c:2042
+#: server/stdinhand.c:1940
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:2092
+#: server/stdinhand.c:1966
msgid "Cannot change teams once game has begun."
msgstr "Negalima pakeisti komandų žaidimui prasidėjus."
-#: server/stdinhand.c:2102
+#: server/stdinhand.c:1976
msgid "Undefined argument. Usage: team <player> <team>."
msgstr ""
-#: server/stdinhand.c:2122
+#: server/stdinhand.c:1996
#, 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:2129
+#: server/stdinhand.c:2003
msgid "Cannot team a barbarian."
msgstr "Negalite sudaryti komandos su barbaru."
-#: server/stdinhand.c:2135
+#: server/stdinhand.c:2009
#, c-format
msgid "Player %s set to team %s."
msgstr "Žaidėjas %s priskirtas komandai %s."
-#: server/stdinhand.c:2157
-msgid "Undefined arguments. Usage: vote yes|no [vote number]."
-msgstr ""
+#: server/stdinhand.c:2035 server/voting.c:512
+#, fuzzy
+msgid "Teamvote"
+msgstr "Komanda"
-#: server/stdinhand.c:2165
-msgid "Observers cannot vote."
-msgstr "StebÄ—tojai balsuoti negali."
+#: server/stdinhand.c:2035 server/voting.c:516
+msgid "Vote"
+msgstr ""
-#: server/stdinhand.c:2168
+#: server/stdinhand.c:2037
+#, c-format
msgid ""
-"You can only vote in a running game. Use 'first' to become the game "
-"organizer if there currently is none."
+"%s %d \"%s\" (needs %0.0f%%%s): %d for, %d against, and %d abstained out of %"
+"d players."
msgstr ""
-"Balsuoti galima tik vykstanÄiame žaidime. Ä®veskite 'first' norÄ—dami tapti "
-"žaidimo organizatoriumi, jei jo dabar nėra."
-#: server/stdinhand.c:2181
-#, c-format
-msgid "Vote %d \"%s\": %d for, %d against"
+#: server/stdinhand.c:2041
+msgid " no dissent"
msgstr ""
-#: server/stdinhand.c:2188
+#: server/stdinhand.c:2049
msgid "There are no votes going on."
msgstr "Nevyksta balsavimas."
-#: server/stdinhand.c:2208
-msgid "No legal last vote."
+#: server/stdinhand.c:2077
+msgid "Invalid arguments. Usage: vote yes|no|abstain [vote number]."
+msgstr ""
+
+#: server/stdinhand.c:2095 server/stdinhand.c:2213 server/stdinhand.c:3714
+msgid "You are not allowed to use this command."
+msgstr "Jums neleidžiama naudoti šios komandos."
+
+#: server/stdinhand.c:2104
+#, fuzzy, c-format
+msgid "The argument \"%s\" is ambigious."
+msgstr "Pagalbos argumentas „%s“ yra dviprasmiškas."
+
+#: server/stdinhand.c:2119
+#, fuzzy
+msgid "There are no votes running."
+msgstr "Nevyksta balsavimas."
+
+#: server/stdinhand.c:2121
+#, fuzzy, c-format
+msgid "No legal last vote (%d %s)."
msgstr "NÄ—ra tinkamo paskutinio balso."
-#: server/stdinhand.c:2213
-msgid "Value must be integer."
+#: server/stdinhand.c:2122
+msgid "other vote running"
+msgid_plural "other votes running"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: server/stdinhand.c:2129 server/stdinhand.c:2491 server/stdinhand.c:2532
+msgid "Value must be an integer."
msgstr "VertÄ— turi bÅ«ti sveikasis skaiÄius."
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2135 server/stdinhand.c:2221
#, c-format
msgid "No such vote (%d)."
msgstr "NÄ—ra tokio balso (%d)."
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2141
+#, fuzzy
+msgid "You are not allowed to vote on that."
+msgstr "Jums neleidžiama nustatyti šios parinkties."
+
+#: server/stdinhand.c:2146
#, c-format
msgid "You voted for \"%s\""
msgstr "Balsavai už „%s“"
-#: server/stdinhand.c:2232
+#: server/stdinhand.c:2150
#, c-format
msgid "You voted against \"%s\""
msgstr "Balsavai prieš „%s“"
-#: server/stdinhand.c:2259
+#: server/stdinhand.c:2155
+#, c-format
+msgid "You abstained from voting on \"%s\""
+msgstr ""
+
+#: server/stdinhand.c:2190
+msgid "Missing argument <vote number> or the string \"all\"."
+msgstr ""
+
+#: server/stdinhand.c:2197
+#, fuzzy
+msgid "You don't have any vote going on."
+msgstr "JÅ«s neturite Äia darbininko."
+
+#: server/stdinhand.c:2204
+#, fuzzy
+msgid "There isn't any vote going on."
+msgstr "Nevyksta balsavimas."
+
+#: server/stdinhand.c:2209
+msgid "Server: All votes have been removed."
+msgstr ""
+
+#: server/stdinhand.c:2226
+#, fuzzy, c-format
+msgid "You are not allowed to cancel this vote (%d)."
+msgstr "Jums neleidžiama nustatyti šios parinkties."
+
+#: server/stdinhand.c:2232
+msgid "Usage: /cancelvote [<vote number>|all]"
+msgstr ""
+
+#: server/stdinhand.c:2241
+#, c-format
+msgid "Server: %s cancelled the vote \"%s\" (number %d)."
+msgstr ""
+
+#: server/stdinhand.c:2247
+#, c-format
+msgid "Server: The vote \"%s\" (number %d) has been cancelled."
+msgstr ""
+
+#: server/stdinhand.c:2265
msgid ""
"Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
"<x> <y> | unit <id> | tech <player> | timing | info>."
msgstr ""
-#: server/stdinhand.c:2265
+#: server/stdinhand.c:2271
msgid "Can only use this command once game has begun."
msgstr ""
-#: server/stdinhand.c:2294
+#: server/stdinhand.c:2300
#, c-format
msgid "%s diplomacy no longer debugged"
msgstr ""
-#: server/stdinhand.c:2298
+#: server/stdinhand.c:2304
#, c-format
msgid "%s diplomacy debugged"
msgstr ""
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2323
#, c-format
msgid "%s tech no longer debugged"
msgstr ""
-#: server/stdinhand.c:2321
+#: server/stdinhand.c:2327
#, c-format
msgid "%s tech debugged"
msgstr ""
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2358 server/stdinhand.c:2388
msgid "Value 2 & 3 must be integer."
msgstr "VertÄ—s 2 ir 3 turi bÅ«ti sveikieji skaiÄiai."
-#: server/stdinhand.c:2356 server/stdinhand.c:2386
+#: server/stdinhand.c:2362 server/stdinhand.c:2392
msgid "Bad map coordinates."
msgstr "Blogos žemėlapio koordinatės."
-#: server/stdinhand.c:2361
+#: server/stdinhand.c:2367
msgid "No city at this coordinate."
msgstr "Nurodytomos koordinatÄ—mis miestas nerastas."
-#: server/stdinhand.c:2366
+#: server/stdinhand.c:2372
#, c-format
msgid "%s no longer debugged"
msgstr ""
-#: server/stdinhand.c:2392 server/stdinhand.c:2422
+#: server/stdinhand.c:2398 server/stdinhand.c:2428
#, c-format
msgid "%s %s no longer debugged."
msgstr ""
-#: server/stdinhand.c:2397 server/stdinhand.c:2427
+#: server/stdinhand.c:2403 server/stdinhand.c:2433
#, c-format
msgid "%s %s debugged."
msgstr ""
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2419
msgid "Value 2 must be integer."
msgstr "VertÄ— 2 turi bÅ«ti sveikasis skaiÄius."
-#: server/stdinhand.c:2417
+#: server/stdinhand.c:2423
#, c-format
msgid "Unit %d does not exist."
msgstr "Dalinys %d neegzistuoja."
-#: server/stdinhand.c:2475
+#: server/stdinhand.c:2464
msgid "Undefined argument. Usage: set <option> <value>."
msgstr ""
-#: server/stdinhand.c:2485
+#: server/stdinhand.c:2473
msgid "You are not allowed to set this option."
msgstr "Jums neleidžiama nustatyti šios parinkties."
-#: server/stdinhand.c:2490 server/stdinhand.c:3463
+#: server/stdinhand.c:2478 server/stdinhand.c:3501
msgid "This setting can't be modified after the game has started."
msgstr ""
-#: 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:2512
+#: server/stdinhand.c:2501
#, c-format
msgid "The parameter %s should only contain digits 0-1."
msgstr ""
-#: server/stdinhand.c:2519
+#: server/stdinhand.c:2508
msgid "Value out of range (minimum: 0, maximum: 1)."
msgstr "Reikšmė yra už ribų (minimali: 0, maksimali: 1)"
-#: server/stdinhand.c:2534 server/stdinhand.c:2576
+#: server/stdinhand.c:2523 server/stdinhand.c:2565
#, c-format
msgid "Option: %s has been set to %d."
msgstr "Parinktis %s buvo nustatyta į %d."
-#: server/stdinhand.c:2554
+#: server/stdinhand.c:2543
#, c-format
msgid "The parameter %s should only contain +- and 0-9."
msgstr ""
-#: server/stdinhand.c:2561
+#: server/stdinhand.c:2550
#, c-format
msgid "Value out of range (minimum: %d, maximum: %d)."
msgstr "Reikšmė yra už ribų (minimali: %d, maksimali: %d)"
-#: server/stdinhand.c:2586
+#: server/stdinhand.c:2575
msgid "String value too long. Usage: set <option> <value>."
msgstr ""
-#: server/stdinhand.c:2600
+#: server/stdinhand.c:2589
#, c-format
msgid "Option: %s has been set to \"%s\"."
msgstr "Parinktis %s buvo nustatyta į \"%s\"."
-#: server/stdinhand.c:2658
+#: server/stdinhand.c:2652
msgid "Sorry, one can't observe globally in this game."
msgstr ""
-#: server/stdinhand.c:2661
+#: server/stdinhand.c:2655
msgid "Sorry, you can't take a global observer. Observe it instead."
msgstr ""
-#: server/stdinhand.c:2671
+#: server/stdinhand.c:2665
#, 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
+#: server/stdinhand.c:2673
#, c-format
msgid ""
"You cannot take a new player because the maximum of %d player has already "
@@ -5731,73 +5812,73 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: server/stdinhand.c:2691
+#: server/stdinhand.c:2685
msgid "You cannot take a new player because there are no free player slots."
msgstr ""
-#: server/stdinhand.c:2702
+#: server/stdinhand.c:2696
msgid "Sorry, one can't observe barbarians in this game."
msgstr ""
-#: server/stdinhand.c:2705
+#: server/stdinhand.c:2699
msgid "Sorry, one can't take barbarians in this game."
msgstr ""
-#: server/stdinhand.c:2713
+#: server/stdinhand.c:2707
msgid "Sorry, one can't observe dead players in this game."
msgstr ""
-#: server/stdinhand.c:2716
+#: server/stdinhand.c:2710
msgid "Sorry, one can't take dead players in this game."
msgstr ""
-#: server/stdinhand.c:2724
+#: server/stdinhand.c:2718
msgid "Sorry, one can't observe AI players in this game."
msgstr ""
-#: server/stdinhand.c:2727
+#: server/stdinhand.c:2721
msgid "Sorry, one can't take AI players in this game."
msgstr ""
-#: server/stdinhand.c:2736
+#: server/stdinhand.c:2730
msgid "Sorry, one can't observe human players in this game."
msgstr ""
-#: server/stdinhand.c:2739
+#: server/stdinhand.c:2733
msgid "Sorry, one can't take human players in this game."
msgstr ""
-#: server/stdinhand.c:2749
+#: server/stdinhand.c:2743
msgid "Sorry, one can't observe in this game."
msgstr ""
-#: server/stdinhand.c:2754
+#: server/stdinhand.c:2748
msgid "Sorry, one can't take players in this game."
msgstr ""
-#: server/stdinhand.c:2760
+#: server/stdinhand.c:2754
msgid "Sorry, one can't take players already connected in this game."
msgstr ""
-#: server/stdinhand.c:2791
+#: server/stdinhand.c:2785
msgid "Usage: observe [connection-name [player-name]]"
msgstr ""
-#: server/stdinhand.c:2797
+#: server/stdinhand.c:2791
msgid "Usage: observe [player-name]"
msgstr ""
-#: server/stdinhand.c:2847
+#: server/stdinhand.c:2841
#, c-format
msgid "%s already controls %s. Using 'observe' would remove %s"
msgstr ""
-#: server/stdinhand.c:2858
+#: server/stdinhand.c:2852
#, c-format
msgid "%s is already observing %s."
msgstr "%s jau stebi %s."
-#: server/stdinhand.c:2863
+#: server/stdinhand.c:2857
#, c-format
msgid "%s is already observing."
msgstr "%s jau stebi."
@@ -5812,235 +5893,240 @@ msgstr "%s dabar stebi %s"
msgid "%s now observes"
msgstr "%s dabar stebi"
-#: server/stdinhand.c:2969
+#: server/stdinhand.c:2971
msgid "Usage: take <connection-name> <player-name>"
msgstr ""
-#: server/stdinhand.c:2974
+#: server/stdinhand.c:2976
msgid "Usage: take <player-name>"
msgstr "Naudojimas: take <žaidėjo-vardas>"
-#: server/stdinhand.c:2980
+#: server/stdinhand.c:2982
msgid "Usage: take [connection-name] <player-name>"
msgstr ""
-#: server/stdinhand.c:3010
+#: server/stdinhand.c:3012
#, fuzzy, c-format
msgid "%s already controls %s."
msgstr "%s jau kontroliuoja %s"
-#: server/stdinhand.c:3024
+#: server/stdinhand.c:3026
#, 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:3059
+#: server/stdinhand.c:3061
#, c-format
msgid "being detached from %s."
msgstr "yra atjungiamas nuo %s."
-#: server/stdinhand.c:3135
+#: server/stdinhand.c:3146
#, fuzzy, c-format
msgid "%s now controls %s (%s, %s)."
msgstr "%s dabar kontroliuoja %s (%s, %s)"
-#: server/stdinhand.c:3139 server/stdinhand.c:4260
+#: server/stdinhand.c:3150 server/stdinhand.c:4308
#: data/nation/barbarian.ruleset:3
msgid "Barbarian"
msgstr "Barbaras"
-#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
+#: server/stdinhand.c:3152 server/stdinhand.c:4310 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-sdl/plrdlg.c:645
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr "DI"
-#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-gtk-2.0/pages.c:2125
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
+#: server/stdinhand.c:3153 server/stdinhand.c:4312
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-gtk-2.0/pages.c:2127
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/connectdlg.c:215
msgid "Human"
msgstr "Žmogus"
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-gtk-2.0/pages.c:2124 client/gui-win32/connectdlg.c:200
-#: client/gui-win32/connectdlg.c:212
+#: server/stdinhand.c:3155 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-gtk-2.0/pages.c:2126 client/gui-win32/connectdlg.c:202
+#: client/gui-win32/connectdlg.c:214
msgid "Alive"
msgstr "Gyvas"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3156 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-win32/connectdlg.c:202
msgid "Dead"
msgstr "Miręs"
-#: server/stdinhand.c:3147
+#: server/stdinhand.c:3159
#, fuzzy, c-format
msgid "%s failed to attach to any player."
msgstr "%s nėra prisijungęs prie jokio žaidėjo."
-#: server/stdinhand.c:3182
+#: server/stdinhand.c:3194
msgid "Usage: detach <connection-name>"
msgstr "Naudojimas: detach <ryšio-pavadinimas>"
-#: server/stdinhand.c:3202
+#: server/stdinhand.c:3214
msgid "You can not detach other users."
msgstr "Jūs negalite atjungti kitų žaidėjų."
-#: server/stdinhand.c:3211
+#: server/stdinhand.c:3223
#, c-format
msgid "%s is not attached to any player."
msgstr "%s nėra prisijungęs prie jokio žaidėjo."
-#: server/stdinhand.c:3234
+#: server/stdinhand.c:3246
#, c-format
msgid "%s detaching from %s"
msgstr "%s atsijungia nuo %s"
-#: server/stdinhand.c:3240
+#: server/stdinhand.c:3252
#, c-format
msgid "%s no longer observing."
msgstr "%s daugiau nebestebi."
-#: server/stdinhand.c:3259
+#: server/stdinhand.c:3271
#, c-format
msgid "detaching from %s."
msgstr "atsijungiama nuo %s"
-#: server/stdinhand.c:3345
+#: server/stdinhand.c:3361
msgid "Usage: load <game name>"
msgstr "Naudojimas: load <žaidimo pavadinimas>"
-#: server/stdinhand.c:3350
+#: server/stdinhand.c:3366
msgid "Cannot load a game while another is running."
msgstr "Neįmanoma įkelti žaidimą, kol kitas veikia."
-#: server/stdinhand.c:3372
+#: server/stdinhand.c:3388
#, c-format
msgid "Cannot find savegame or scenario with the name \"%s\"."
msgstr ""
-#: server/stdinhand.c:3389
+#: server/stdinhand.c:3405
#, c-format
msgid "Could not load savefile: %s"
msgstr "Negalima įkelti išsaugoto žaidimo: %s"
-#: server/stdinhand.c:3458
+#: server/stdinhand.c:3496
#, c-format
msgid "Current ruleset directory is \"%s\""
msgstr ""
-#: server/stdinhand.c:3478
+#: server/stdinhand.c:3516
#, c-format
msgid "Ruleset directory \"%s\" not found"
msgstr ""
-#: server/stdinhand.c:3484
+#: server/stdinhand.c:3522
#, c-format
msgid "Ruleset directory is already \"%s\""
msgstr ""
-#: server/stdinhand.c:3488
+#: server/stdinhand.c:3526
#, c-format
msgid "Ruleset directory set to \"%s\""
msgstr ""
-#: server/stdinhand.c:3536
+#: server/stdinhand.c:3574
msgid "Goodbye."
msgstr "Viso."
-#: server/stdinhand.c:3567
+#: server/stdinhand.c:3606
msgid "Sorry, you are not allowed to use server commands."
msgstr "Apgailestaujame, bet Jums neleidžiama naudotis serverio komandomis."
-#: server/stdinhand.c:3603
+#: server/stdinhand.c:3656
#, c-format
msgid "Warning: '%s' interpreted as '%s', but it is ambiguous. Try '%shelp'."
msgstr ""
-#: server/stdinhand.c:3608
+#: server/stdinhand.c:3661
#, c-format
msgid "Unknown command. Try '%shelp'."
msgstr "Nežinoma komanda. Bandykite '%shelp'."
-#: server/stdinhand.c:3625
-msgid "Your new vote canceled your previous vote."
+#: server/stdinhand.c:3675
+#, fuzzy
+msgid "Your new vote cancelled your previous vote."
msgstr "Jūsų naujas balsas panaikino ankstesnį jūsų balsą."
-#: server/stdinhand.c:3633
-#, c-format
-msgid "New vote (number %d) by %s: %s."
+#: server/stdinhand.c:3688
+msgid "New teamvote"
+msgstr ""
+
+#: server/stdinhand.c:3691
+msgid "New vote"
msgstr ""
-#: server/stdinhand.c:3645
+#: server/stdinhand.c:3695
+#, fuzzy, c-format
+msgid "%s (number %d) by %s: %s"
+msgstr "Ant %s buvo numesta branduolinÄ— bomba. JÄ… numetÄ— %s."
+
+#: server/stdinhand.c:3704
#, c-format
msgid "Your new vote (\"%s\") was not legal or was not recognized."
msgstr ""
-#: server/stdinhand.c:3655
-msgid "You are not allowed to use this command."
-msgstr "Jums neleidžiama naudoti šios komandos."
-
-#: server/stdinhand.c:3680
+#: server/stdinhand.c:3726
msgid "(server prompt)"
msgstr "(serverio žinutė)"
-#: server/stdinhand.c:3787
+#: server/stdinhand.c:3835
msgid "Game ended in a draw."
msgstr "Žaidimas baigėsi lygiosiomis."
-#: server/stdinhand.c:3791
+#: server/stdinhand.c:3839
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:3796
+#: server/stdinhand.c:3844
msgid "Cannot end the game: no game running."
msgstr "Žaidimo baigti negalime, nes nevyksta joks žaidimas."
-#: server/stdinhand.c:3812
+#: server/stdinhand.c:3860
#, c-format
msgid "%s has conceded the game and can no longer win."
msgstr ""
-#: server/stdinhand.c:3817
+#: server/stdinhand.c:3865
msgid "You cannot surrender now."
msgstr "Å iuo metu negalite pasiduoti."
-#: server/stdinhand.c:3883
+#: server/stdinhand.c:3931
#, fuzzy
msgid "Not enough human players, game will not start."
msgstr "Žaidimas neprasidės, nes per mažai žaidėjų."
-#: server/stdinhand.c:3888
+#: server/stdinhand.c:3936
#, fuzzy
msgid "No players, game will not start."
msgstr "Žaidimas neprasidės, nes per mažai žaidėjų."
-#: server/stdinhand.c:3892
+#: server/stdinhand.c:3940
#, 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:3901
+#: server/stdinhand.c:3949
msgid "All players are ready; starting game."
msgstr "Visi žaidėjai pasiruošę; paleidžiamas žaidimas."
-#: server/stdinhand.c:3915
+#: server/stdinhand.c:3963
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:3922
+#: server/stdinhand.c:3970
msgid "Cannot start the game: it is already running."
msgstr "Negalime paleisti žaidimo, nes jis jau vyksta."
-#: server/stdinhand.c:3953
+#: server/stdinhand.c:4001
#, c-format
msgid "Cutting connection %s."
msgstr "Atjungiamas susijungimas %s."
-#: server/stdinhand.c:3972
+#: server/stdinhand.c:4020
msgid ""
"Welcome - this is the introductory help text for the Freeciv server.\n"
"\n"
@@ -6061,77 +6147,77 @@ msgid ""
" quit - to exit"
msgstr ""
-#: server/stdinhand.c:4007 server/stdinhand.c:4010
+#: server/stdinhand.c:4055 server/stdinhand.c:4058
msgid "Command:"
msgstr "Komanda:"
-#: server/stdinhand.c:4014
+#: server/stdinhand.c:4062
msgid "Synopsis: "
msgstr "ReziumÄ—: "
-#: server/stdinhand.c:4023
+#: server/stdinhand.c:4071
#, c-format
msgid "Level: %s"
msgstr "Lygis: %s"
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4096
msgid "The following server commands are available:"
msgstr "Å ios serverio komandos yra galimos:"
-#: server/stdinhand.c:4123
+#: server/stdinhand.c:4171
#, c-format
msgid "Help argument '%s' is ambiguous."
msgstr "Pagalbos argumentas „%s“ yra dviprasmiškas."
-#: server/stdinhand.c:4128
+#: server/stdinhand.c:4176
#, c-format
msgid "No match for help argument '%s'."
msgstr ""
-#: server/stdinhand.c:4194
+#: server/stdinhand.c:4242
#, c-format
msgid "Bad list argument: '%s'. Try '%shelp list'."
msgstr ""
-#: server/stdinhand.c:4234
+#: server/stdinhand.c:4282
msgid "List of players:"
msgstr "Žaidėjų sąrašas:"
-#: server/stdinhand.c:4239
+#: server/stdinhand.c:4287
msgid "<no players>"
msgstr "<nėra žaidėjų>"
-#: server/stdinhand.c:4256
+#: server/stdinhand.c:4304
#, c-format
msgid "user %s, "
msgstr "vartotojas %s, "
-#: server/stdinhand.c:4267
+#: server/stdinhand.c:4315
msgid ", Dead"
msgstr ", Miręs"
-#: server/stdinhand.c:4270
+#: server/stdinhand.c:4318
#, 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:4275 server/stdinhand.c:4279 client/helpdata.c:257
-#: client/helpdata.c:752 client/text.c:241 client/text.c:1224
-#: client/text.c:1262
+#: server/stdinhand.c:4323 server/stdinhand.c:4327 client/helpdata.c:257
+#: client/helpdata.c:752 client/text.c:241 client/text.c:1229
+#: client/text.c:1267
#, c-format
msgid "?clistmore:, %s"
msgstr ", %s"
-#: server/stdinhand.c:4283
+#: server/stdinhand.c:4331
msgid ", ready"
msgstr ", pasiruošęs"
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4333
msgid ", not ready"
msgstr ", nepasiruošęs"
-#: server/stdinhand.c:4293
+#: server/stdinhand.c:4341
#, c-format
msgid " %d connection:"
msgid_plural " %d connections:"
@@ -6139,21 +6225,21 @@ msgstr[0] " %d susijungimas:"
msgstr[1] " %d susijungimai:"
msgstr[2] " %d susijungimų:"
-#: server/stdinhand.c:4299
+#: server/stdinhand.c:4347
#, 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:4304
+#: server/stdinhand.c:4352
msgid " (observer mode)"
msgstr " (stebėjimo reežimas)"
-#: server/stdinhand.c:4322
+#: server/stdinhand.c:4370
msgid "List of teams:"
msgstr "Komandų sąrašas:"
#. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4332
+#: server/stdinhand.c:4380
#, c-format
msgid "%2d : '%s' : %d player"
msgid_plural "%2d : '%s' : %d players"
@@ -6161,25 +6247,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:4352
+#: server/stdinhand.c:4400
#, c-format
msgid "%2d : '%s' : 1 player : %s"
msgstr "%2d : '%s' : 1 žaidėjas : %s"
-#: server/stdinhand.c:4360
+#: server/stdinhand.c:4408
#, c-format
msgid "Empty team: %s"
msgstr "TuÅ¡Äia komanda: %s"
-#: server/stdinhand.c:4371
+#: server/stdinhand.c:4419
msgid "List of connections to server:"
msgstr "Prisijungimų prie serverio sąrašas:"
-#: server/stdinhand.c:4375
+#: server/stdinhand.c:4423
msgid "<no connections>"
msgstr "<nėra susijungimų>"
-#: server/stdinhand.c:4399
+#: server/stdinhand.c:4447
msgid "List of scenarios available:"
msgstr "Galimų scenarijų sąrašas:"
@@ -6198,7 +6284,7 @@ msgstr "%s išrado ateities technologiją %d."
msgid "%s acquired from %s!"
msgstr "%s gauta(s) iš %s!"
-#: server/techtools.c:220
+#: server/techtools.c:221
#, c-format
msgid ""
"Discovery of %s makes the government form %s available. You may want to "
@@ -6206,37 +6292,37 @@ msgid ""
msgstr ""
"%s atradimas padaro %s prieinamą. Jūs galbūt norėsite pradėti revoliuciją."
-#: server/techtools.c:301
+#: server/techtools.c:302
#, c-format
msgid "Discovery of %s OBSOLETES %s in %s!"
msgstr "%s atradimas PANAIKINA %s mieste %s veikimÄ…!"
-#: server/techtools.c:351
+#: server/techtools.c:352
#, 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."
-#: server/techtools.c:369
+#: server/techtools.c:370
#, c-format
msgid "Learned %s. Scientists choose to research %s."
msgstr "IÅ¡mokta(s) %s. Mokslininkai renkasi tyrinÄ—ti %s."
-#: server/techtools.c:376
+#: server/techtools.c:377
#, c-format
msgid "Learned %s. "
msgstr "Atrasta(s) %s. "
-#: server/techtools.c:379
+#: server/techtools.c:380
#, c-format
msgid "Researching %s."
msgstr "TyrinÄ—jama(s) %s."
-#: server/techtools.c:385
+#: server/techtools.c:386
#, c-format
msgid "Learned %s. Scientists do not know what to research next."
msgstr "Išmokta %s. Mokslininkai nežino, ką toliau tyrinėti."
-#: server/techtools.c:402
+#: server/techtools.c:403
msgid ""
"Great scientists from all the world join your civilization: you get an "
"immediate advance."
@@ -6244,22 +6330,22 @@ msgstr ""
"Didieji filosofai prisijungia prie tavęs iš viso pasaulio. Jūs iš karto "
"gaunate technologinį pasiekimą."
-#: server/techtools.c:570
+#: server/techtools.c:571
#, c-format
msgid "Technology goal is %s."
msgstr "Tyrimų tikslas yra %s."
-#: server/techtools.c:700
+#: server/techtools.c:708
#, c-format
msgid "You steal %s from the %s."
msgstr "Pavogei %s iš %s."
-#: server/techtools.c:705
+#: server/techtools.c:713
#, c-format
msgid "The %s stole %s from you!"
msgstr "%s iš tavęs pavogė %s!"
-#: server/techtools.c:710
+#: server/techtools.c:718
#, c-format
msgid "The %s have stolen %s from the %s."
msgstr "%s pavogė %s iš %s."
@@ -6283,155 +6369,161 @@ msgstr "Jokie daliniai negali būti patobulinti."
msgid "%s upgraded to %s for %d gold."
msgstr "%s patobulintas iki %s už %d aukso."
-#: server/unithand.c:396
+#: server/unithand.c:402
#, c-format
msgid "%s refuses to disband!"
msgstr "%s atsisako išsiformuoti!"
-#: server/unithand.c:449
+#: server/unithand.c:455
msgid "Can't place city here."
msgstr "Čia neįmanoma pastatyti miesto."
-#: server/unithand.c:456
+#: server/unithand.c:462
#, c-format
msgid "Only %s can build a city."
msgstr "Tik %s gali statyti miestÄ…."
-#: server/unithand.c:461
+#: server/unithand.c:467
msgid "Can't build a city."
msgstr "Negaliu statyti miesto."
-#: server/unithand.c:470
+#: server/unithand.c:476
#, c-format
msgid "Only %s can add to a city."
msgstr "Tik %s gali prisidÄ—ti prie miesto."
-#: server/unithand.c:475
+#: server/unithand.c:481
msgid "Can't add to a city."
msgstr "Negalime pridÄ—ti prie miesto."
-#: server/unithand.c:481
+#: server/unithand.c:487
#, 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."
-#: server/unithand.c:487
+#: server/unithand.c:493
#, c-format
msgid "%s unit has no moves left to build city."
msgstr "%s dalinys daugiau nebeturi ėjimų ir negali statyti miesto."
-#: server/unithand.c:492
+#. TRANS: <city> is owned by <nation>, cannot add <unit>.
+#: server/unithand.c:499
+#, fuzzy, c-format
+msgid "%s is owned by %s, cannot add %s."
+msgstr "%s nÄ—ra toks didelis kaip %s."
+
+#: server/unithand.c:506
#, c-format
msgid "%s is too big to add %s."
msgstr "%s nÄ—ra toks didelis kaip %s."
-#: server/unithand.c:498
+#: server/unithand.c:512
#, 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."
-#: server/unithand.c:509
+#: server/unithand.c:523
#, c-format
msgid "Can't add %s to %s."
msgstr "Negalime pridÄ—ti %s prie %s."
-#: server/unithand.c:531
+#: server/unithand.c:545
#, c-format
msgid "%s added to aid %s in growing."
msgstr "%s prisijungÄ— pagelbÄ—ti %s augti."
-#: server/unithand.c:828
+#: server/unithand.c:842
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."
-#: server/unithand.c:831
+#: server/unithand.c:845
#, 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."
#. TRANS: "Your Cannon ... the Polish Destroyer."
-#: server/unithand.c:901
+#: server/unithand.c:915
#, fuzzy, c-format
msgid "Your %s survived the pathetic attack from the %s %s."
msgstr "Jūsų %s išgyveno apgailėtiną %s %s ataką."
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unithand.c:910
+#: server/unithand.c:924
#, fuzzy, c-format
msgid "Your attacking %s failed against the %s %s!"
msgstr "Jūsų %s ataka prieš %s %s nepavyko!"
-#: server/unithand.c:983
+#: server/unithand.c:997
#, c-format
msgid "Only %s can attack from sea."
msgstr "Tik %s gali atakuoti iš jūros."
-#: server/unithand.c:988
+#: server/unithand.c:1002
msgid "Cannot attack from sea."
msgstr "Negali atakuoti iš jūros."
-#: server/unithand.c:996 server/unittools.c:2137
+#: server/unithand.c:1010 server/unittools.c:2142
msgid "Cannot attack unless you declare war first."
msgstr "Negalite atakuoti prieš tai nepasklebę karo."
-#: server/unithand.c:1001
+#: server/unithand.c:1015
#, c-format
msgid "%s can only move into your own zone of control."
msgstr "%s gali eiti tik į savo kontrolės zoną."
-#: server/unithand.c:1007
+#: server/unithand.c:1021
#, fuzzy, c-format
msgid "Cannot invade unless you break peace with %s first."
msgstr "Negalite atakuoti prieš tai nepasklebę karo."
-#: server/unithand.c:1052
+#: server/unithand.c:1066
msgid "This unit has no moves left."
msgstr "Daliniui nėra likusių ėjimų."
-#: server/unithand.c:1107
+#: server/unithand.c:1121
#, fuzzy
msgid "Unit must be on land to perform diplomatic action."
msgstr "Dalinys negali atlikti diplomatinių veiksmų iš %s."
-#: server/unithand.c:1109
+#: server/unithand.c:1123
msgid "No diplomat action possible."
msgstr "Neįmanomi jokie diplomato veiksmai."
-#: server/unithand.c:1125
+#: server/unithand.c:1139
#, 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)."
-#: server/unithand.c:1143
+#: server/unithand.c:1157
msgid "This unit is being transported, and so cannot bombard."
msgstr "Å is dalinys yra transportuojamas, todÄ—l negali bombarduoti."
-#: server/unithand.c:1158
+#: server/unithand.c:1172
msgid "You can't attack there."
msgstr "Negalite atakuoti Äia."
-#: server/unithand.c:1180
+#: server/unithand.c:1194
msgid "This type of troops cannot take over a city."
msgstr "Šio tipo daliniai negali užimti miesto"
-#: server/unithand.c:1198
+#: server/unithand.c:1212
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."
-#: server/unithand.c:1240
+#: server/unithand.c:1254
#, c-format
msgid "Your %s helps build the %s in %s (%d remaining)."
msgstr ""
-#: server/unithand.c:1242
+#: server/unithand.c:1256
#, c-format
msgid "Your %s helps build the %s in %s (%d surplus)."
msgstr ""
-#: server/unithand.c:1286
+#: server/unithand.c:1300
#, c-format
msgid ""
"Sorry, your %s cannot establish a trade route because it has no home city"
@@ -6439,30 +6531,30 @@ msgstr ""
"Apgailestaujame, taÄiau JÅ«sų %s negali įkurti prekybos kelio, nes jis neturi "
"namų miesto"
-#: server/unithand.c:1296
+#: server/unithand.c:1310
#, 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"
-#: server/unithand.c:1325 server/unithand.c:1344
+#: server/unithand.c:1339 server/unithand.c:1358
#, c-format
msgid "Sorry, your %s cannot establish a trade route here!"
msgstr "Apgailestaujame, taÄiau Äia JÅ«sų %s negali įkurti prekybos kelio!"
-#: server/unithand.c:1329 server/unithand.c:1348
+#: server/unithand.c:1343 server/unithand.c:1362
#, c-format
msgid " The city of %s already has %d better trade routes!"
msgstr " %s jau turi %d geresnius prekybos kelius!"
-#: server/unithand.c:1361 server/unithand.c:1373
+#: server/unithand.c:1375 server/unithand.c:1387
#, 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."
-#: server/unithand.c:1406
+#: server/unithand.c:1420
#, c-format
msgid ""
"Your %s from %s has arrived in %s, and revenues amount to %d in gold and "
@@ -6523,56 +6615,56 @@ msgid "Teleported your %s to %s."
msgstr "Jūsų %s teleportuotas į %s."
#. TRANS: A unit is moved to resolve stack conflicts.
-#: server/unittools.c:1065
+#: server/unittools.c:1070
#, fuzzy, c-format
msgid "Moved your %s."
msgstr "Išmontuotas Jūsų %s."
-#: server/unittools.c:1076
+#: server/unittools.c:1081
#, c-format
msgid "Disbanded your %s."
msgstr "Išmontuotas Jūsų %s."
-#: server/unittools.c:1397
+#: server/unittools.c:1402
#, c-format
msgid "Unable to defend %s, %s has lost the game."
msgstr "Negalime apginti %s, %s pralošė žaidimą."
-#: server/unittools.c:1401
+#: server/unittools.c:1406
#, 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!"
-#: server/unittools.c:1503
+#: server/unittools.c:1508
#, c-format
msgid "%s escaped the destruction of %s, and fled to %s."
msgstr "%s išsigelbėjo iš %s ir pabėgo į %s."
-#: server/unittools.c:1512
+#: server/unittools.c:1517
#, c-format
msgid "%s lost when %s was lost."
msgstr "%s prarastas, kai %s buvo prarastas."
-#: server/unittools.c:1561
+#: server/unittools.c:1566
#, c-format
msgid "Barbarian leader captured, %d gold ransom paid."
msgstr "SuÄiuptas barbarų vadas, gauta %d aukso iÅ¡pirka."
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unittools.c:1579
+#: server/unittools.c:1584
#, fuzzy, c-format
msgid "Your attacking %s succeeded against the %s %s!"
msgstr "Jūsų %s ataka prieš %s %s pavyko!"
#. TRANS: "Cannon ... the Polish Destroyer."
-#: server/unittools.c:1588 server/unittools.c:1646
+#: server/unittools.c:1593 server/unittools.c:1651
#, fuzzy, c-format
msgid "%s lost to an attack by the %s %s."
msgstr "%s prarastas atakuojant %s %s."
#. TRANS: "... Cannon ... the Polish Destroyer ...."
-#: server/unittools.c:1622
+#: server/unittools.c:1627
#, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -6583,14 +6675,14 @@ msgstr[2] ""
#. TRANS: "Cannon lost when the Polish Destroyer
#. * attacked the German Musketeers."
-#: server/unittools.c:1655
+#: server/unittools.c:1660
#, c-format
msgid "%s lost when the %s %s attacked the %s %s."
msgstr ""
#. TRANS: "Musketeers (and Cannon) lost to an
#. * attack from the Polish Destroyer."
-#: server/unittools.c:1670
+#: server/unittools.c:1675
#, c-format
msgid "%s (and %s) lost to an attack from the %s %s."
msgstr ""
@@ -6598,7 +6690,7 @@ msgstr ""
#. TRANS: "Musketeers and 3 other units lost to
#. * an attack from the Polish Destroyer."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1680
+#: server/unittools.c:1685
#, 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."
@@ -6609,7 +6701,7 @@ msgstr[2] ""
#. TRANS: "2 units lost when the Polish Destroyer
#. * attacked the German Musketeers."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1694
+#: server/unittools.c:1699
#, 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."
@@ -6617,173 +6709,215 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: server/unittools.c:1962
+#: server/unittools.c:1967
#, c-format
msgid "Your %s was nuked by %s."
msgstr "Ant Jūsų %s buvo numesta branduolinė bomba, kurią numetė %s."
-#: server/unittools.c:1965 server/unittools.c:1981
+#: server/unittools.c:1970 server/unittools.c:1986
msgid "yourself"
msgstr "patį save"
-#: server/unittools.c:1969
+#: server/unittools.c:1974
#, fuzzy, c-format
msgid "The %s %s was nuked."
msgstr "Ant %s %s buvo numesta branduolinÄ— bomba."
-#: server/unittools.c:1978
+#: server/unittools.c:1983
#, c-format
msgid "%s was nuked by %s."
msgstr "Ant %s buvo numesta branduolinÄ— bomba. JÄ… numetÄ— %s."
-#: server/unittools.c:1986
+#: server/unittools.c:1991
#, c-format
msgid "You nuked %s."
msgstr "JÅ«s numetÄ—te branduolinÄ™ bombÄ… ant %s."
-#: server/unittools.c:2027
+#: server/unittools.c:2032
#, fuzzy, c-format
msgid "The %s detonated a nuke!"
msgstr "%s susprogdino branduolinÄ™ bombÄ…!"
-#: server/unittools.c:2051
+#: server/unittools.c:2056
#, c-format
msgid "%s transported successfully."
msgstr "%s sÄ—kmingai transportuotas."
-#: server/unittools.c:2103
+#: server/unittools.c:2108
msgid "This unit type can not be paradropped."
msgstr "Šio tipo dalinys negali būti nuliestas parašiutu."
-#: server/unittools.c:2113
+#: server/unittools.c:2118
#, fuzzy
msgid "You cannot paradrop a unit that is transporting other units."
msgstr "Negalite nuleisti parašiutu trasportinio dalinio."
-#: server/unittools.c:2119
+#: server/unittools.c:2124
msgid "The destination location is not known."
msgstr "Tikslo vieta nežinoma."
-#: server/unittools.c:2126
+#: server/unittools.c:2131
#, c-format
msgid "This unit cannot paradrop into %s."
msgstr "Šitas dalinys negali nusileisti parašiutu į %s."
-#: server/unittools.c:2146
+#: server/unittools.c:2151
#, 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)."
-#: server/unittools.c:2157
+#: server/unittools.c:2162
#, c-format
msgid "Your %s paradropped into the %s and was lost."
msgstr "Jūsų %s nusileido parašiutu į %s ir buvo sunaikintas."
-#: server/unittools.c:2170
+#: server/unittools.c:2175
#, 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."
-#: server/unittools.c:2192
+#: server/unittools.c:2197
#, c-format
msgid "You found %d gold."
msgstr "JÅ«s radote %d aukso."
-#: server/unittools.c:2209
+#: server/unittools.c:2214
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr "JÅ«s atradote %s senoviniuose iÅ¡minties rankraÅ¡Äiuose."
-#: server/unittools.c:2216
+#: server/unittools.c:2221
#, c-format
msgid "The %s have acquired %s from ancient scrolls of wisdom."
msgstr "%s gavo %s iÅ¡ senovinių iÅ¡minties rankraÅ¡Äių."
-#: server/unittools.c:2230
+#: server/unittools.c:2235
msgid "A band of friendly mercenaries joins your cause."
msgstr "Prie Jūsų prisijungia draugiškų samdinių būrys."
-#: server/unittools.c:2248
+#: server/unittools.c:2253
msgid "An abandoned village is here."
msgstr "ÄŒia yra apleista gyvenvietÄ—."
-#: server/unittools.c:2258
+#: server/unittools.c:2263
msgid "You have unleashed a horde of barbarians!"
msgstr "Jūs išlaisvinote barbarų ordą."
-#: server/unittools.c:2261
+#: server/unittools.c:2266
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr "Jūsų %s buvo užmuštas barbarų!"
-#: server/unittools.c:2277
+#: server/unittools.c:2282
msgid "You found a friendly city."
msgstr "Jūs radote draugišką miestą."
-#: server/unittools.c:2291
+#: server/unittools.c:2296
msgid "Friendly nomads are impressed by you, and join you."
msgstr "Draugiški klajokliai yra sužavėti ir prisijungia prie Jūsų."
-#: server/unittools.c:2316
+#: server/unittools.c:2321
msgid "Your overflight frightens the tribe; they scatter in terror."
msgstr ""
-#: server/unittools.c:2574
+#: server/unittools.c:2579
#, c-format
msgid "Orders for %s aborted after enemy movement was spotted."
msgstr "Dalinio %s įsakymai nutraukti, nes pastebėtas priešo judėjimas."
-#: server/unittools.c:3023
+#: server/unittools.c:3028
#, c-format
msgid "Orders for %s aborted as there are units nearby."
msgstr "Dalinio %s įsakymai nutraukti, nes gretimais yra kitų dalinių."
-#: server/unittools.c:3075
+#: server/unittools.c:3080
#, c-format
msgid "Orders for %s aborted because building of city failed."
msgstr "Dalinio %s įsakymai nutraukti, nes žlugo miesto statyba."
-#: server/unittools.c:3088
+#: server/unittools.c:3093
#, c-format
msgid "Orders for %s aborted since they give an invalid activity."
msgstr "Dalinio %s įsakymai nutraukti, nes jiems netinkamai įsakyta."
-#: server/unittools.c:3102
+#: server/unittools.c:3107
#, c-format
msgid "Orders for %s aborted since they give an invalid location."
msgstr "Dalinio %s įsakymai nutraukti, nes jiems nurodyta netinkama vieta."
-#: server/unittools.c:3112
+#: server/unittools.c:3117
#, c-format
msgid "Orders for %s aborted as there are units in the way."
msgstr "Dalinio %s įsakymai nutraukti, nes kelyje yra kitų dalinių."
-#: server/unittools.c:3138
+#: server/unittools.c:3143
#, c-format
msgid "Orders for %s aborted because of failed move."
msgstr "Dalinio %s įsakymai nutraukti dėl blogo ėjimo."
-#: server/unittools.c:3179
+#: server/unittools.c:3184
#, c-format
msgid "Attempt to change homecity for %s failed."
msgstr "Bandymas daliniui %s pakeisti namų miestą žlugo."
-#: server/unittools.c:3190
+#: server/unittools.c:3195
#, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr "Bandymas sukurti prekybos kelią miestui %s žlugo."
-#: server/unittools.c:3202
+#: server/unittools.c:3207
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr "Pastangos pastatyti stebukla mieste %s žlugo."
-#: server/unittools.c:3211
+#: server/unittools.c:3216
#, c-format
msgid "Your %s has invalid orders."
msgstr "Jūsų %s gavo klaidingus nurodymus."
+#: server/voting.c:522
+#, c-format
+msgid ""
+"%s %d \"%s\" is passed %d to %d with %d abstentions and %d who did not vote."
+msgstr ""
+
+#: server/voting.c:528
+#, c-format
+msgid ""
+"%s %d \"%s\" failed with %d against, %d for, %d abstentions and %d who did "
+"not vote."
+msgstr ""
+
+#: server/voting.c:548
+#, c-format
+msgid "%s %d: %s voted yes."
+msgstr ""
+
+#: server/voting.c:553
+#, c-format
+msgid "%s %d: %s voted no."
+msgstr ""
+
+#: server/voting.c:558
+#, c-format
+msgid "%s %d: %s chose to abstain."
+msgstr ""
+
+#. TRANS: Describing a new vote that can only pass
+#. * if there are no dissenting votes.
+#: server/voting.c:726
+#, c-format
+msgid "%s (needs %0.0f%% and no dissent)."
+msgstr ""
+
+#. TRANS: Describing a new vote that can pass only if the
+#. * given percentage of players votes 'yes'.
+#: server/voting.c:732
+#, c-format
+msgid "%s (needs %0.0f%% in favor)."
+msgstr ""
+
#: server/generator/mapgen.c:1771
msgid "High landmass - this may take a few seconds."
msgstr "Didelis sausumos kiekis, todėl tai gali užtrukti kelias sekundes."
@@ -6811,12 +6945,12 @@ msgid ""
"Please report this bug at %s."
msgstr ""
-#: client/attribute.c:363
+#: client/attribute.c:368
msgid ""
"There has been a CMA error. Your citizen governor settings may be broken."
msgstr ""
-#: client/attribute.c:367
+#: client/attribute.c:372
msgid "Old attributes detected and removed."
msgstr ""
@@ -6965,41 +7099,41 @@ msgstr "%+4d : PilieÄiai\n"
msgid "%+4d : Taxed from trade\n"
msgstr ""
-#: client/citydlg_common.c:418
+#: client/citydlg_common.c:421
#, c-format
msgid "%+4d : Trade route with %s\n"
msgstr ""
-#: client/citydlg_common.c:427
+#: client/citydlg_common.c:430
#, c-format
msgid "%+4d : Building tithes\n"
msgstr ""
-#: client/citydlg_common.c:450
+#: client/citydlg_common.c:453
#, c-format
msgid "%+4d : Bonus from %s (%+d%%)\n"
msgstr ""
-#: client/citydlg_common.c:462
+#: client/citydlg_common.c:465
#, c-format
msgid "%+4d : Waste\n"
msgstr ""
-#: client/citydlg_common.c:468
+#: client/citydlg_common.c:471
#, c-format
msgid "%+4d : Disorder\n"
msgstr "%+4d : Netvarka\n"
-#: client/citydlg_common.c:474
+#: client/citydlg_common.c:477
#, c-format
msgid "%+4d : Used\n"
msgstr ""
-#: client/citydlg_common.c:479
+#: client/citydlg_common.c:482
msgid "==== : Adds up to\n"
msgstr ""
-#: client/citydlg_common.c:481
+#: client/citydlg_common.c:484
#, c-format
msgid "%4d : Total surplus"
msgstr ""
@@ -7312,51 +7446,51 @@ msgstr "?specialist:S"
msgid "Specialists"
msgstr "Specialistai"
-#: client/civclient.c:240
+#: client/civclient.c:241
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr " -a, --autoconnect\tPraleisti prisijungimo dialogÄ…\n"
-#: client/civclient.c:250
+#: client/civclient.c:251
msgid " -l, --log FILE\tUse FILE as logfile (spawned server also uses this)\n"
msgstr ""
-#: client/civclient.c:252
+#: client/civclient.c:253
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr ""
-#: client/civclient.c:254
+#: client/civclient.c:255
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr ""
-#: client/civclient.c:256
+#: client/civclient.c:257
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:258
+#: client/civclient.c:259
#, c-format
msgid " -P, --Plugin PLUGIN\tUse PLUGIN for sound output %s\n"
msgstr ""
-#: client/civclient.c:260
+#: client/civclient.c:261
msgid " -r, --read FILE\tRead startup script FILE (for spawned server only)\n"
msgstr ""
-#: client/civclient.c:263
+#: client/civclient.c:264
#, 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"
-#: client/civclient.c:265
+#: client/civclient.c:266
msgid " -S, --Sound FILE\tRead sound tags from FILE\n"
msgstr ""
-#: client/civclient.c:266
+#: client/civclient.c:267
msgid " -t, --tiles FILE\tUse data file FILE.tilespec for tiles\n"
msgstr ""
-#: client/civclient.c:269
+#: client/civclient.c:270
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7364,45 +7498,45 @@ msgid ""
msgstr ""
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:274
+#: client/civclient.c:275
#, fuzzy, c-format
msgid "Report bugs at %s\n"
msgstr "Pranešti apie klaidas į %s.\n"
-#: client/civclient.c:298
+#: client/civclient.c:299
#, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr "Su --port parametru nurodytas netinkamas prievadas „%s“.\n"
-#: client/civclient.c:300 client/civclient.c:315
+#: client/civclient.c:301 client/civclient.c:316
msgid "Try using --help.\n"
msgstr "Bandykite --help.\n"
-#: client/civclient.c:313
+#: client/civclient.c:314
#, c-format
msgid "Invalid debug level \"%s\" specified with --debug option.\n"
msgstr ""
-#: client/civclient.c:326
+#: client/civclient.c:327
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr "Neatpažintas parametras: „%s“\n"
-#: client/civclient.c:391
+#: client/civclient.c:393
#, fuzzy, c-format
msgid "Updating old metaserver address \"%s\"."
msgstr "metaserver <adresas>"
-#: client/civclient.c:394
+#: client/civclient.c:396
#, fuzzy, c-format
msgid "Default metaserver has been set to \"%s\"."
msgstr "Parinktis %s buvo nustatyta į \"%s\"."
-#: client/civclient.c:550
+#: client/civclient.c:540
msgid "Game started."
msgstr "Žaidimas paleistas."
-#: client/civclient.c:588
+#: client/civclient.c:606
msgid "There was an error while auto connecting; aborting."
msgstr ""
@@ -7532,75 +7666,75 @@ msgstr "Jungiamasi."
msgid "Disconnected from server."
msgstr "Atsijungta nuo serverio."
-#: client/clinet.c:469
+#: client/clinet.c:473
#, c-format
msgid "Failed to contact server \"%s\" at port %d as \"%s\" after %d attempts"
msgstr ""
-#: client/clinet.c:484 client/clinet.c:486
+#: client/clinet.c:488 client/clinet.c:490
msgid "Connection to server refused. Please start the server."
msgstr "Neįmanoma prisijungti prie serverio. Prašome paleisti serverį."
-#: client/clinet.c:495 client/clinet.c:523
+#: client/clinet.c:499 client/clinet.c:527
#, c-format
msgid ""
"Error contacting server \"%s\" at port %d as \"%s\":\n"
" %s\n"
msgstr ""
-#: client/clinet.c:514
+#: client/clinet.c:518
#, c-format
msgid ""
"Auto-connecting to server \"%s\" at port %d as \"%s\" every %f second(s) for "
"%d times"
msgstr ""
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
+#: client/connectdlg_common.c:78 client/gui-gtk-2.0/pages.c:1358
msgid "novice"
msgstr "pradedantis"
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1358
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
msgid "easy"
msgstr "lengvas"
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1359
msgid "normal"
msgstr "vidutinis"
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr "sunkus"
-#: client/connectdlg_common.c:83
+#: client/connectdlg_common.c:82
msgid "experimental"
msgstr "eksperimentinis"
-#: client/connectdlg_common.c:213
+#: client/connectdlg_common.c:212
msgid "Starting server..."
msgstr "Paleidžiamas serveris..."
-#: client/connectdlg_common.c:332
+#: client/connectdlg_common.c:331
msgid "Couldn't start the server."
msgstr "Negaliu paleisti serverio."
-#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
+#: client/connectdlg_common.c:332 client/connectdlg_common.c:365
msgid "You'll have to start one manually. Sorry..."
msgstr "Jūs turite paleisti vieną rankiniu būdu. Apgailestaujame..."
-#: client/connectdlg_common.c:364
+#: client/connectdlg_common.c:363
msgid "Couldn't connect to the server."
msgstr "Negalima prisijungti prie serverio."
-#: client/connectdlg_common.c:365
+#: client/connectdlg_common.c:364
msgid "We probably couldn't start it from here."
msgstr "Mes tikriausiai iÅ¡ Äia negalime jo paleisti."
-#: client/connectdlg_common.c:470
+#: client/connectdlg_common.c:469
msgid ""
"Established control over the server. You have command access level 'hack'."
msgstr ""
-#: client/connectdlg_common.c:475
+#: client/connectdlg_common.c:474
msgid ""
"Failed to obtain the required access level to take control of the server. "
"The server will now be shutdown."
@@ -7610,27 +7744,27 @@ msgstr ""
msgid "Only transporter units can be unloaded."
msgstr "Išlaipinti galima tik iš transporto dalinių."
-#: client/control.c:1425
+#: client/control.c:1417
msgid "Only settler units can be put into auto mode."
msgstr "Tik naujakuriai gali būti įvesti į auto būseną."
-#: client/control.c:1516
+#: client/control.c:1511
msgid "Only nuclear units can do this."
msgstr "Tik branduoliniai daliniai gali tai padaryti."
-#: client/control.c:1545
+#: client/control.c:1540
msgid "Only paratrooper units can do this."
msgstr "Tik parašiutininkai tai gali."
-#: client/control.c:2020
+#: client/control.c:2015
msgid "Too far for this unit."
msgstr "Per toli Å¡iam daliniui."
-#: client/control.c:2230 client/control.c:2260 client/control.c:2276
+#: client/control.c:2225 client/control.c:2255 client/control.c:2271
msgid "Didn't find a route to the destination!"
msgstr "Nerastas kelias iki tikslo."
-#: client/control.c:2320
+#: client/control.c:2315
msgid "Oh my! You seem to have no capital!"
msgstr "O ne! Atrodo, kad neturi sostinÄ—s!"
@@ -8028,118 +8162,126 @@ 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:1066 client/helpdata.c:1400
+#: client/helpdata.c:1066 client/helpdata.c:1408
msgid " or "
msgstr " arba "
-#: client/helpdata.c:1068 client/helpdata.c:1388
+#: client/helpdata.c:1068 client/helpdata.c:1396
msgid "?or:, "
msgstr "?or:, "
-#: client/helpdata.c:1080
-#, 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"
+#: client/helpdata.c:1079
+#, fuzzy, c-format
+msgid "* Unit has to be in a city, or a base after %d turn.\n"
+msgid_plural "* Unit has to be in a city, or a base 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"
+
+#: client/helpdata.c:1087
+#, fuzzy, c-format
+msgid "* Unit has to be in a city, a base, or on a %s after %d turn.\n"
+msgid_plural "* Unit has to be in a city, a base, 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"
-#: client/helpdata.c:1122
+#: client/helpdata.c:1130
#, 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:1127
+#: client/helpdata.c:1135
#, 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:1135
+#: client/helpdata.c:1143
msgid "You cannot research this technology."
msgstr "Jūs negalite išrasti šios technologijos."
-#: client/helpdata.c:1139
+#: client/helpdata.c:1147
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:1151
+#: client/helpdata.c:1159
#, 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:1156
+#: client/helpdata.c:1164
#, 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:1159
+#: client/helpdata.c:1167
#, 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:1163
+#: client/helpdata.c:1171
msgid "* Increases the pollution generated by the population.\n"
msgstr "* Padidina gyventojų sukuriamą taršą.\n"
-#: client/helpdata.c:1168
+#: client/helpdata.c:1176
#, c-format
msgid "* Allows %s to build roads on river squares.\n"
msgstr "* %s gali statyti kelius upių laukeliuose.\n"
-#: client/helpdata.c:1175
+#: client/helpdata.c:1183
#, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr "* Leidžia %s statyti fortus.\n"
-#: client/helpdata.c:1183
+#: client/helpdata.c:1191
#, c-format
msgid "* Allows %s to build airbases.\n"
msgstr "* Leidžia %s statyti oro bazes.\n"
-#: client/helpdata.c:1192
+#: client/helpdata.c:1200
#, c-format
msgid "* Allows %s to upgrade roads to railroads.\n"
msgstr "* Leidžia %s patobulinti kelius į geležinkelius.\n"
-#: client/helpdata.c:1200
+#: client/helpdata.c:1208
#, 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:1234
+#: client/helpdata.c:1242
msgid "* Pollution cannot be generated on this terrain."
msgstr "* Toks reljefas negali būti užterštas."
-#: client/helpdata.c:1239
+#: client/helpdata.c:1247
msgid "* You cannot build cities on this terrain."
msgstr "* Ant tokio reljefo negalite statyti miestų."
-#: client/helpdata.c:1245
+#: client/helpdata.c:1253
msgid "* The coastline of this terrain is unsafe."
msgstr "* Å io reljefo pakrantÄ— nesaugi."
-#: client/helpdata.c:1250
+#: client/helpdata.c:1258
msgid "* This terrain is unsafe for units to travel on."
msgstr "* Å is reljefas nesaugus keliauti daliniams."
-#: client/helpdata.c:1255
+#: client/helpdata.c:1263
msgid "* Land units cannot travel on oceanic terrains."
msgstr "Sausumos daliniai negali keliauti vandenynais."
-#: client/helpdata.c:1305
+#: client/helpdata.c:1313
msgid "Features:\n"
msgstr "SavybÄ—s:\n"
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1411 client/helpdata.c:1412
+#: client/helpdata.c:1419 client/helpdata.c:1420
msgid "?outputlist: Nothing "
msgstr "?outputlist: Nieko "
-#: client/helpdata.c:1419
+#: client/helpdata.c:1427
#, fuzzy, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -8157,7 +8299,7 @@ msgstr[2] ""
"* Kariniai daliniai toli nuo namų ir lauko daliniai %d gyventojus padarys "
"nelaimingÄ….\n"
-#: client/helpdata.c:1429
+#: client/helpdata.c:1437
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8165,23 +8307,23 @@ msgid ""
msgstr ""
#. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1437
+#: client/helpdata.c:1445
#, c-format
msgid "* You pay %d times normal %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1442
+#: client/helpdata.c:1450
#, 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:1447
+#: client/helpdata.c:1455
#, fuzzy, c-format
msgid "* You pay no %s upkeep for your units.\n"
msgstr "* Fanatikams nereikia išlaikymo.\n"
-#: client/helpdata.c:1451
+#: client/helpdata.c:1459
#, fuzzy
msgid "* You pay no upkeep for your units.\n"
msgstr "* Fanatikams nereikia išlaikymo.\n"
@@ -8189,25 +8331,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:1460
+#: client/helpdata.c:1468
#, 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:1468
+#: client/helpdata.c:1476
#, c-format
msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
msgstr ""
-#: client/helpdata.c:1475
+#: client/helpdata.c:1483
#, 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:1482
+#: client/helpdata.c:1490
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -8215,25 +8357,25 @@ msgid ""
msgstr ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1489
+#: client/helpdata.c:1497
#, 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:1497
+#: client/helpdata.c:1505
#, 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:1502
+#: client/helpdata.c:1510
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr "Turi neribotus mokslo/aukso/prabangos tarifus.\n"
-#: client/helpdata.c:1507
+#: client/helpdata.c:1515
#, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -8245,7 +8387,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: client/helpdata.c:1519
+#: client/helpdata.c:1527
#, 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"
@@ -8254,7 +8396,7 @@ msgstr[1] ""
msgstr[2] ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1530
+#: client/helpdata.c:1538
#, c-format
msgid ""
"* You may grow your cities by means of celebrations. Your cities must be at "
@@ -8263,53 +8405,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:1536
+#: client/helpdata.c:1544
msgid "* Your units cannot be bribed.\n"
msgstr "* Jūsų daliniai negali būti papirkti.\n"
-#: client/helpdata.c:1539
+#: client/helpdata.c:1547
msgid "* Your cities cannot be incited.\n"
msgstr "* Jūsų miestai negali būti pakurstyti.\n"
-#: client/helpdata.c:1543
+#: client/helpdata.c:1551
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:1549
+#: client/helpdata.c:1557
msgid "* Has a senate that may prevent declaration of war.\n"
msgstr "* Turi senatÄ…, kuris gali sutrukdyti karo paskelbimui.\n"
-#: client/helpdata.c:1553
+#: client/helpdata.c:1561
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:1557
+#: client/helpdata.c:1565
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
msgstr ""
-#: client/helpdata.c:1561
+#: client/helpdata.c:1569
msgid "* Pays no upkeep for fanatics.\n"
msgstr "* Fanatikams nereikia išlaikymo.\n"
-#: client/helpdata.c:1564
+#: client/helpdata.c:1572
msgid "* Has no unhappy citizens.\n"
msgstr "* Neturi nelaimingų pilieÄių.\n"
-#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
+#: client/helpdata.c:1582 client/helpdata.c:1586 client/helpdata.c:1590
#, c-format
msgid "* Veteran %s units.\n"
msgstr "* Veteranų daliniai %s.\n"
-#: client/helpdata.c:1585
+#: client/helpdata.c:1593
msgid "* Veteran units.\n"
msgstr "* Daliniai veteranai.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1591
+#: client/helpdata.c:1599
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8317,7 +8459,7 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1600
+#: client/helpdata.c:1608
#, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8325,71 +8467,71 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1608
+#: client/helpdata.c:1616
#, 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:1617
+#: client/helpdata.c:1625
#, c-format
msgid "* %s production is increased %d%%.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1625
+#: client/helpdata.c:1633
#, c-format
msgid "* %s production will suffer massive waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1630
+#: client/helpdata.c:1638
#, c-format
msgid "* %s production will suffer some waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1635
+#: client/helpdata.c:1643
#, 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:1643
+#: client/helpdata.c:1651
#, 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:1649
+#: client/helpdata.c:1657
#, 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:1655
+#: client/helpdata.c:1663
#, 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:1672
+#: client/helpdata.c:1680
#, 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:1699
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d %s"
msgstr "%s%d %s"
-#: client/helpdata.c:1700 client/helpdata.c:1708 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1708 client/helpdata.c:1716 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:1707
+#: client/helpdata.c:1715
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d nepatenkintų"
@@ -8458,7 +8600,7 @@ msgid ""
"or with the -a command-line parameter."
msgstr ""
-#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:916 data/Freeciv.in:107
msgid "Metaserver"
msgstr "Metaserveris"
@@ -8809,36 +8951,36 @@ msgstr ""
msgid "Saved settings to file %s"
msgstr "Išsaugoti nustatymus į failą %s"
-#: client/packhand.c:211 client/packhand.c:217
+#: client/packhand.c:212 client/packhand.c:218
#, fuzzy
msgid "You were rejected from the game...."
msgstr "Jūs buvote nepriimtas į žaidimą:"
-#: client/packhand.c:229
+#: client/packhand.c:230
#, c-format
msgid "Client capability string: %s"
msgstr ""
-#: client/packhand.c:232
+#: client/packhand.c:233
#, c-format
msgid "Server capability string: %s"
msgstr "Serverio galimybių eilutė: %s"
-#: client/packhand.c:850
+#: client/packhand.c:864
#, c-format
msgid "Start of turn %d"
msgstr "%d ėjimo pradžia"
-#: client/packhand.c:1591
+#: client/packhand.c:1621
#, c-format
msgid "AI Mode is now %s."
msgstr "DI režimas dabar yra %s."
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "ON"
msgstr "Įjungta"
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "OFF"
msgstr "IÅ¡jungta"
@@ -8869,15 +9011,15 @@ msgstr "?Player:Vardas"
msgid "Username"
msgstr "Vartotojo vardas"
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
-#: client/gui-gtk-2.0/pages.c:2157
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:653
+#: client/gui-gtk-2.0/pages.c:1604 client/gui-gtk-2.0/pages.c:2159
msgid "Flag"
msgstr "VÄ—liava"
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1605
-#: client/gui-gtk-2.0/pages.c:2159 client/gui-sdl/repodlgs.c:2063
-#: client/gui-win32/connectdlg.c:990 client/gui-win32/dialogs.c:542
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:657
+#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1609
+#: client/gui-gtk-2.0/pages.c:2161 client/gui-sdl/repodlgs.c:2063
+#: client/gui-win32/connectdlg.c:992 client/gui-win32/dialogs.c:542
#: client/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "Tauta"
@@ -8890,7 +9032,7 @@ msgstr "Siena"
msgid "Score"
msgstr "Taškai"
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1614
msgid "Team"
msgstr "Komanda"
@@ -8923,36 +9065,36 @@ msgstr ""
msgid "Ping"
msgstr ""
-#: client/repodlgs_common.c:375
+#: client/repodlgs_common.c:378
msgid "You cannot sell improvements."
msgstr "Jūs negalite parduoti patobulinimų."
-#: client/repodlgs_common.c:391
+#: client/repodlgs_common.c:394
#, c-format
msgid "Sold %d %s for %d gold."
msgstr "Parduota %d %s už %d aukso."
-#: client/repodlgs_common.c:396
+#: client/repodlgs_common.c:399
#, c-format
msgid "No %s could be sold."
msgstr "Joks %s negali būti parduotas."
#. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:415
+#: client/repodlgs_common.c:418
msgid "You cannot disband units."
msgstr "Negali išformuoti dalinių."
-#: client/repodlgs_common.c:420
+#: client/repodlgs_common.c:423
#, c-format
msgid "%s cannot be disbanded."
msgstr "%s negali būti išformuotas."
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:444
#, c-format
msgid "Disbanded %d %s."
msgstr "IÅ¡formuotas %d %s."
-#: client/repodlgs_common.c:445
+#: client/repodlgs_common.c:448
#, c-format
msgid "No %s could be disbanded."
msgstr "Joks %s negali būti išformuotas."
@@ -9559,47 +9701,47 @@ msgstr "?dys/hrs:%02dd %02dh"
msgid "?duration:overflow"
msgstr ""
-#: client/text.c:1143
+#: client/text.c:1145
#, c-format
msgid "%6d.%02d ms"
msgstr ""
#. TRANS: <nation adjective> <government name>.
#. * E.g. "Polish Republic".
-#: client/text.c:1188
+#: client/text.c:1193
#, fuzzy, c-format
msgid "?nationgovernment:%s %s"
msgstr "VyriausybÄ—: %s"
#. TRANS: "Observer: 1985"
-#: client/text.c:1198
+#: client/text.c:1203
#, c-format
msgid "Observer: %s"
msgstr "StebÄ—tojas: %s"
-#: client/text.c:1216
+#: client/text.c:1221
msgid "Buildings: "
msgstr "Pastatai: "
-#: client/text.c:1233 client/text.c:1272
+#: client/text.c:1238 client/text.c:1277
msgid "None. "
msgstr "NÄ—ra. "
-#: client/text.c:1235 client/text.c:1274
+#: client/text.c:1240 client/text.c:1279
msgid "?clistend:."
msgstr "."
-#: client/text.c:1253
+#: client/text.c:1258
msgid "Wonders: "
msgstr "Stebuklai: "
-#: client/text.c:1308
+#: client/text.c:1313
#, c-format
msgid "Cities: %d total, %d over threshold of %d cities."
msgstr ""
#. TRANS: 0-21 content [citizen(s)] ...
-#: client/text.c:1312
+#: client/text.c:1317
#, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
@@ -9608,7 +9750,7 @@ msgstr[1] ""
msgstr[2] ""
#. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1318
+#: client/text.c:1323
#, fuzzy, c-format
msgid "%d additional unhappy citizen."
msgid_plural "%d additional unhappy citizens."
@@ -9616,11 +9758,11 @@ msgstr[0] "* Neturi nelaimingų pilieÄių.\n"
msgstr[1] "* Neturi nelaimingų pilieÄių.\n"
msgstr[2] "* Neturi nelaimingų pilieÄių.\n"
-#: client/text.c:1339
+#: client/text.c:1344
msgid "Unlimited martial law in effect."
msgstr ""
-#: client/text.c:1341
+#: client/text.c:1346
#, c-format
msgid "%d military unit may impose martial law."
msgid_plural "Up to %d military units may impose martial law."
@@ -9628,7 +9770,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: client/text.c:1345
+#: client/text.c:1350
#, fuzzy, c-format
msgid "Each military unit makes %d unhappy citizen content."
msgid_plural "Each military unit makes %d unhappy citizens content."
@@ -9636,35 +9778,35 @@ msgstr[0] "Linksmina gyventojus padarydama 3 nelaimingus žmones patenkintais."
msgstr[1] "Linksmina gyventojus padarydama 3 nelaimingus žmones patenkintais."
msgstr[2] "Linksmina gyventojus padarydama 3 nelaimingus žmones patenkintais."
-#: client/text.c:1352
+#: client/text.c:1357
msgid "Military units in the field may cause unhappiness. "
msgstr "Kariniai daliniai lauke gali kelti nepasitenkinimÄ…."
-#: client/text.c:1355
+#: client/text.c:1360
msgid "Military units have no happiness effect. "
msgstr "Kariniai daliniai neveikia laimingumo efekto. "
-#: client/text.c:1370
+#: client/text.c:1375
#, c-format
msgid "Luxury: %d total."
msgstr "Prabanga: %d iš viso."
-#: client/tilespec.c:865
+#: client/tilespec.c:882
msgid "No usable default tileset found, aborting!"
msgstr "Nėra tinkamo laukelių rinkinio, todėl baigiamas darbas!"
-#: client/tilespec.c:1338
+#: client/tilespec.c:1355
msgid ""
"Client does not support isometric tilesets. Using default tileset instead."
msgstr ""
-#: client/tilespec.c:1347
+#: client/tilespec.c:1364
msgid ""
"Client does not support overhead view tilesets. Using default tileset "
"instead."
msgstr ""
-#: client/tilespec.c:3966
+#: client/tilespec.c:3987
#, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -10339,7 +10481,7 @@ msgid "_Display"
msgstr "_Rodyti"
#: client/gui-gtk-2.0/cityrep.c:1006 client/gui-gtk-2.0/menu.c:839
-#: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
+#: client/gui-sdl/diplodlg.c:692 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
#: client/gui-xaw/cityrep.c:533 client/gui-xaw/menu.c:156
@@ -10507,195 +10649,195 @@ msgstr ""
msgid "Remove this preset?"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:222
+#: client/gui-gtk-2.0/dialogs.c:197 client/gui-gtk-2.0/messagewin.c:222
msgid "Goto _Location"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
+#: client/gui-gtk-2.0/dialogs.c:202 client/gui-gtk-2.0/messagewin.c:226
msgid "Inspect _City"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:258 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:258 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:259 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:311 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:312 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:312 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:313 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:506
+#: client/gui-gtk-2.0/dialogs.c:507
msgid "Unit"
msgstr "Dalinys"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:950
-#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2155
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:985
+#: client/gui-gtk-2.0/dialogs.c:508 client/gui-gtk-2.0/pages.c:950
+#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2157
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:987
#: 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:519 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:520 client/gui-sdl/dialogs.c:627
msgid "Unit selection"
msgstr "Dalinio pasirinkimas"
-#: client/gui-gtk-2.0/dialogs.c:582
+#: client/gui-gtk-2.0/dialogs.c:583
msgid "_Ready all"
msgstr "_Paruošti visus"
-#: client/gui-gtk-2.0/dialogs.c:590
+#: client/gui-gtk-2.0/dialogs.c:591
msgid "_Sentry idle"
msgstr ""
-#: client/gui-gtk-2.0/dialogs.c:719
+#: client/gui-gtk-2.0/dialogs.c:721
msgid "Nation _Groups:"
msgstr "Tautų _grupės:"
-#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:766 data/Freeciv.in:3128
msgid "What Nation Will You Be?"
msgstr "Kokia tauta Jūs būsite?"
-#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
-#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
+#: client/gui-gtk-2.0/dialogs.c:768 client/gui-sdl/chatline.c:842
+#: client/gui-win32/connectdlg.c:1040 data/Freeciv.in:3371
msgid "Pick Nation"
msgstr "Pasirinkite tautÄ…"
-#: client/gui-gtk-2.0/dialogs.c:774
+#: client/gui-gtk-2.0/dialogs.c:776
#, fuzzy
msgid "_Random Nation"
msgstr "AtsitiktinÄ— tauta"
-#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:792 client/gui-win32/dialogs.c:517
msgid "Select a nation"
msgstr "IÅ¡sirinkite tautÄ…"
-#: client/gui-gtk-2.0/dialogs.c:804
+#: client/gui-gtk-2.0/dialogs.c:810
msgid "_Properties"
msgstr "_YpatybÄ—s"
-#: client/gui-gtk-2.0/dialogs.c:824
+#: client/gui-gtk-2.0/dialogs.c:830
msgid "_Leader:"
msgstr "_Vadovas"
-#: client/gui-gtk-2.0/dialogs.c:831
+#: client/gui-gtk-2.0/dialogs.c:837
msgid "_Female"
msgstr "_Moteris"
-#: client/gui-gtk-2.0/dialogs.c:836
+#: client/gui-gtk-2.0/dialogs.c:842
msgid "_Male"
msgstr "_Vyras"
-#: client/gui-gtk-2.0/dialogs.c:863
+#: client/gui-gtk-2.0/dialogs.c:869
#, fuzzy
msgid "City _Styles:"
msgstr "_Miestų stilius"
-#: client/gui-gtk-2.0/dialogs.c:902
+#: client/gui-gtk-2.0/dialogs.c:908
#, fuzzy
msgid "_Description"
msgstr "_Legenda"
-#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1263 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:1253 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1268 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:1262 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1277 client/gui-sdl/dialogs.c:2204
#: 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:1306 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1318 client/gui-win32/citydlg.c:1454
#: data/Freeciv.in:2484
msgid "Upgrade Unit!"
msgstr "Patobulinti dalinį!"
-#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1327 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."
-#: client/gui-gtk-2.0/diplodlg.c:231 client/gui-win32/diplodlg.c:151
+#: client/gui-gtk-2.0/diplodlg.c:222 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"
-#: client/gui-gtk-2.0/diplodlg.c:237 client/gui-win32/diplodlg.c:146
+#: client/gui-gtk-2.0/diplodlg.c:228 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"
-#: client/gui-gtk-2.0/diplodlg.c:243
+#: client/gui-gtk-2.0/diplodlg.c:234
msgid "_Maps"
msgstr "Že_mėlapiai"
-#: client/gui-gtk-2.0/diplodlg.c:274
+#: client/gui-gtk-2.0/diplodlg.c:265
msgid "_Advances"
msgstr "_Pasiekimai"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/diplodlg.c:315 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "_Miestai"
-#: client/gui-gtk-2.0/diplodlg.c:333
+#: client/gui-gtk-2.0/diplodlg.c:324
msgid "_Give shared vision"
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:346
+#: client/gui-gtk-2.0/diplodlg.c:337
msgid "Give _embassy"
msgstr "Duoti _ambasadÄ…"
-#: client/gui-gtk-2.0/diplodlg.c:376
+#: client/gui-gtk-2.0/diplodlg.c:368
msgid "_Pacts"
msgstr "_Paktai"
-#: client/gui-gtk-2.0/diplodlg.c:466
+#: client/gui-gtk-2.0/diplodlg.c:458
#, c-format
msgid "Diplomacy: %s"
msgstr "Diplomatija: %s"
-#: client/gui-gtk-2.0/diplodlg.c:473
+#: client/gui-gtk-2.0/diplodlg.c:465
msgid "_Cancel meeting"
msgstr "_Atšaukti susitikimą"
-#: client/gui-gtk-2.0/diplodlg.c:475
+#: client/gui-gtk-2.0/diplodlg.c:467
msgid "Accept _treaty"
msgstr "Primti _sutartį"
-#: client/gui-gtk-2.0/diplodlg.c:503
+#: client/gui-gtk-2.0/diplodlg.c:495
msgid "C_lauses:"
msgstr "_SÄ…lygos:"
-#: client/gui-gtk-2.0/diplodlg.c:568 client/gui-gtk-2.0/diplodlg.c:642
+#: client/gui-gtk-2.0/diplodlg.c:560 client/gui-gtk-2.0/diplodlg.c:634
msgid "_Gold:"
msgstr "_Auksas:"
-#: client/gui-gtk-2.0/diplodlg.c:580 client/gui-gtk-2.0/diplodlg.c:654
+#: client/gui-gtk-2.0/diplodlg.c:572 client/gui-gtk-2.0/diplodlg.c:646
msgid "_Add Clause..."
msgstr "_PridÄ—ti sÄ…lygÄ…"
-#: client/gui-gtk-2.0/diplodlg.c:699
+#: client/gui-gtk-2.0/diplodlg.c:691
msgid "--- This treaty is blank. Please add some clauses. ---"
msgstr "---Sutartis tuÅ¡Äia. PridÄ—k kokių nors sÄ…lygų. ---"
-#: client/gui-gtk-2.0/diplodlg.c:905 client/gui-sdl/diplodlg.c:375
+#: client/gui-gtk-2.0/diplodlg.c:897 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."
@@ -10754,99 +10896,99 @@ msgstr "Pasirinkti tikslÄ…"
msgid "Show _All Cities"
msgstr "Rodyti _visus miestus"
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:164
msgid "Show Map Scrollbars"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:163
+#: client/gui-gtk-2.0/gui_main.c:165
msgid "Disable this option to hide the scrollbars on the map view."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:169
msgid "Keyboardless goto"
msgstr "Nereikalaujantis klaviatūros eiti į"
-#: client/gui-gtk-2.0/gui_main.c:168
+#: client/gui-gtk-2.0/gui_main.c:170
msgid ""
"If this option is set then a goto may be initiated by left-clicking and then "
"holding down the mouse button while dragging the mouse onto a different tile."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:173
+#: client/gui-gtk-2.0/gui_main.c:175
msgid "Keep dialogs on top"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:174
+#: client/gui-gtk-2.0/gui_main.c:176
msgid ""
"If this option is set then dialog windows will always remain in front of the "
"main Freeciv window. Disabling this has no effect in fullscreen mode."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:178
+#: client/gui-gtk-2.0/gui_main.c:180
msgid "Show worklist task icons"
msgstr "Rodyti darbų sÄ…rašų užduoÄių ikonas"
-#: client/gui-gtk-2.0/gui_main.c:179
+#: client/gui-gtk-2.0/gui_main.c:181
msgid ""
"Disabling this will turn off the unit and building icons in the worklist "
"dialog and the production tab of the city dialog."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:183
+#: client/gui-gtk-2.0/gui_main.c:185
msgid "Enable status report tabs"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:184
+#: client/gui-gtk-2.0/gui_main.c:186
msgid ""
"If this option is enabled then report dialogs will be shown as separate tabs "
"rather than in popup dialogs."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:189 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:191 client/gui-win32/gui_main.c:110
msgid "Better fog-of-war drawing"
msgstr "Gerenis karo rūko piešimas"
-#: client/gui-gtk-2.0/gui_main.c:190 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:192 client/gui-win32/gui_main.c:111
msgid ""
"If this is enabled then a better method is used for drawing fog-of-war. It "
"is not any slower but will consume about twice as much memory."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:195
+#: client/gui-gtk-2.0/gui_main.c:197
msgid "Show time for each chat message"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:196
+#: client/gui-gtk-2.0/gui_main.c:198
msgid ""
"If this option is enabled then all chat messages will be prefixed by a time "
"string of the form [hour:minute:second]."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:201
+#: client/gui-gtk-2.0/gui_main.c:203
msgid "Split bottom notebook area"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:202
+#: client/gui-gtk-2.0/gui_main.c:204
msgid ""
"Enabling this option will split the bottom notebook into a left and right "
"notebook so that two tabs may be viewed at once."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:207
+#: client/gui-gtk-2.0/gui_main.c:209
msgid "New message events go to top of list"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:208
+#: client/gui-gtk-2.0/gui_main.c:210
msgid ""
"If this option is enabled, new events in the message window will appear at "
"the top of the list, rather than being appended at the bottom."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:213
+#: client/gui-gtk-2.0/gui_main.c:215
msgid "Show extra message window buttons"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:214
+#: client/gui-gtk-2.0/gui_main.c:216
msgid ""
"If this option is enabled, there will be two buttons displayed in the "
"message window for inspecting a city and going to a location. If this option "
@@ -10856,21 +10998,21 @@ msgid ""
"closed and reopened."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:224
+#: client/gui-gtk-2.0/gui_main.c:226
msgid "Metaserver tab first in network page"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:225
+#: client/gui-gtk-2.0/gui_main.c:227
msgid ""
"If this option is enabled, the metaserver tab will be the first notebook tab "
"in the network page. This option requires a restart in order to take effect."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:230
+#: client/gui-gtk-2.0/gui_main.c:232
msgid "Plain chat messages are sent to allies only"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:231
+#: client/gui-gtk-2.0/gui_main.c:233
msgid ""
"If this option is enabled, then plain messages typed into the chat entry "
"while the game is running will only be sent to your allies. Otherwise plain "
@@ -10880,28 +11022,41 @@ msgid ""
"visible in multiplayer games)."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:340 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:245
+msgid "Arrange widgets for small displays"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:246
+msgid ""
+"If this option is enabled, widgets in the main window will be arrange so "
+"that they take up the least amount of total screen space. Specifically, the "
+"left panel containing the overview, player status, and the unit information "
+"box will be extended over the entire left side of the window. This option "
+"requires a restart in order to take effect."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:352 client/gui-xaw/gui_main.c:245
msgid ""
"This client has no special command line options\n"
"\n"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
+#: client/gui-gtk-2.0/gui_main.c:847 client/gui-gtk-2.0/gui_main.c:1542
msgid "Freeciv"
msgstr "Freeciv"
-#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
+#: client/gui-gtk-2.0/gui_main.c:1251 client/gui-gtk-2.0/gui_main.c:1258
#: client/gui-sdl/mapctrl.c:1566 client/gui-win32/gui_main.c:482
#: data/Freeciv.in:2618
msgid "Turn Done"
msgstr "Ä–jimas baigtas"
-#: client/gui-gtk-2.0/gui_main.c:1232 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1258 client/gui-sdl/mapctrl.c:1566
#: client/gui-sdl/mapview.c:1082
msgid "Shift+Return"
msgstr "Shift+Return"
-#: client/gui-gtk-2.0/gui_main.c:1266 client/gui-gtk-2.0/menu.c:797
+#: client/gui-gtk-2.0/gui_main.c:1299 client/gui-gtk-2.0/menu.c:797
#: client/gui-gtk-2.0/menu.c:799 client/gui-gtk-2.0/menu.c:801
#: client/gui-gtk-2.0/menu.c:803 client/gui-gtk-2.0/menu.c:805
#: client/gui-gtk-2.0/menu.c:807 client/gui-gtk-2.0/menu.c:809
@@ -10920,11 +11075,11 @@ msgstr "Shift+Return"
msgid "View"
msgstr "Rodymas"
-#: client/gui-gtk-2.0/gui_main.c:1359
+#: client/gui-gtk-2.0/gui_main.c:1393
msgid "Chat"
msgstr "Pokalbis"
-#: client/gui-gtk-2.0/gui_main.c:1377 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1411 client/gui-win32/gui_main.c:538
#: data/Freeciv.in:2809
msgid ""
"Freeciv is free software and you are welcome to distribute copies of it\n"
@@ -10935,86 +11090,86 @@ msgstr ""
"pagal tam tikras sąlygas; Žiūrėk punktą „Kopijavimas“ pagalbos menu.\n"
"Dabar.. Eikite ir duokite jiems velnių!"
-#: client/gui-gtk-2.0/gui_main.c:1392
+#: client/gui-gtk-2.0/gui_main.c:1426
msgid "Allies Only"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1657
+#: client/gui-gtk-2.0/gui_main.c:1691
msgid "Not _ready"
msgstr "_Nepasiruošęs"
-#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
+#: client/gui-gtk-2.0/gui_main.c:1702 client/gui-gtk-2.0/pages.c:1679
msgid "_Ready"
msgstr "_Pasiruošęs"
-#: client/gui-gtk-2.0/gui_main.c:1672 client/gui-gtk-2.0/gui_main.c:1678
-#: client/gui-gtk-2.0/pages.c:2204
+#: client/gui-gtk-2.0/gui_main.c:1706 client/gui-gtk-2.0/gui_main.c:1712
+#: client/gui-gtk-2.0/pages.c:2206
msgid "_Start"
msgstr "_PradÄ—ti"
-#: client/gui-gtk-2.0/gui_main.c:1686
+#: client/gui-gtk-2.0/gui_main.c:1720
#, fuzzy
msgid "_Take Player"
msgstr "Pasiimti šitą žaidėją"
-#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
+#: client/gui-gtk-2.0/gui_main.c:1723 client/gui-gtk-2.0/pages.c:1669
msgid "Pick _Nation"
msgstr "IÅ¡sirink _tautÄ…"
-#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
+#: client/gui-gtk-2.0/gui_main.c:1730 client/gui-gtk-2.0/pages.c:1674
msgid "_Observe"
msgstr "_StebÄ—ti"
-#: client/gui-gtk-2.0/gui_main.c:1698
+#: client/gui-gtk-2.0/gui_main.c:1732
#, fuzzy
msgid "Do not _observe"
msgstr "_NebestebÄ—ti"
-#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1755 client/gui-xaw/pages.c:211
msgid "<AI>"
msgstr "<DI>"
-#: client/gui-gtk-2.0/gui_main.c:1723
+#: client/gui-gtk-2.0/gui_main.c:1758
msgid "<Novice AI>"
msgstr "<Pradedantysis DI>"
-#: client/gui-gtk-2.0/gui_main.c:1726
+#: client/gui-gtk-2.0/gui_main.c:1761
msgid "<Easy AI>"
msgstr "<Lengvas DI>"
-#: client/gui-gtk-2.0/gui_main.c:1729
+#: client/gui-gtk-2.0/gui_main.c:1764
msgid "<Normal AI>"
msgstr "<Vidutinis DI>"
-#: client/gui-gtk-2.0/gui_main.c:1732
+#: client/gui-gtk-2.0/gui_main.c:1767
msgid "<Hard AI>"
msgstr "<Sunkus DI>"
-#: client/gui-gtk-2.0/gui_main.c:1742 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1777 client/gui-win32/dialogs.c:594
#: client/gui-xaw/pages.c:217
msgid "Random"
msgstr "AtsitiktinÄ—"
-#: client/gui-gtk-2.0/gui_main.c:1808
+#: client/gui-gtk-2.0/gui_main.c:1844 client/gui-gtk-2.0/gui_main.c:1858
msgid "Observer"
msgstr "StebÄ—tojas"
-#: client/gui-gtk-2.0/gui_main.c:1808
+#: client/gui-gtk-2.0/gui_main.c:1858
msgid "Detached"
msgstr "Atsijungęs"
-#: client/gui-gtk-2.0/gui_main.c:2073
+#: client/gui-gtk-2.0/gui_main.c:2117
msgid "Are you sure you want to quit?"
msgstr "Ar tikrai norite išeiti?"
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
#, c-format
msgid ""
"Close Tab:\n"
"%s"
msgstr ""
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
msgid "Ctrl+W"
msgstr "Ctrl+W"
@@ -11119,8 +11274,8 @@ msgid "Trans. Rslt/Time:"
msgstr ""
#: 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
-#: client/gui-win32/helpdlg.c:709 client/gui-win32/helpdlg.c:733
+#: client/gui-win32/helpdlg.c:502 client/gui-win32/helpdlg.c:550
+#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:739
#: client/gui-xaw/helpdlg.c:759 client/gui-xaw/helpdlg.c:808
#: client/gui-xaw/helpdlg.c:816 client/gui-xaw/helpdlg.c:853
#: client/gui-xaw/helpdlg.c:878
@@ -11167,34 +11322,34 @@ msgstr "su"
msgid "?techhelp:"
msgstr "?techhelp:"
-#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:591
+#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:597
#: client/gui-xaw/helpdlg.c:996
#, c-format
msgid "+%d Trade / %d"
msgstr ""
-#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:595
+#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:601
#: client/gui-xaw/helpdlg.c:1000
#, c-format
msgid "no extra / %d"
msgstr ""
#: 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
-#: client/gui-win32/helpdlg.c:602 client/gui-win32/helpdlg.c:616
-#: client/gui-win32/helpdlg.c:635 client/gui-xaw/helpdlg.c:1002
+#: client/gui-gtk-2.0/helpdlg.c:1085 client/gui-win32/helpdlg.c:604
+#: client/gui-win32/helpdlg.c:608 client/gui-win32/helpdlg.c:622
+#: client/gui-win32/helpdlg.c:641 client/gui-xaw/helpdlg.c:1002
#: client/gui-xaw/helpdlg.c:1006 client/gui-xaw/helpdlg.c:1020
#: client/gui-xaw/helpdlg.c:1039
msgid "n/a"
msgstr "nÄ—ra"
-#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:605
+#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:611
#: client/gui-xaw/helpdlg.c:1009
#, c-format
msgid "+%d Food / %d"
msgstr "+%d maisto / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:619
+#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:625
#: client/gui-xaw/helpdlg.c:1023
#, c-format
msgid "+%d Res. / %d"
@@ -11962,41 +12117,41 @@ msgstr "_Prisijungti prie tinklo žaidimo"
msgid "Connect to Gaming _Zone"
msgstr "Prisijungti prie tinklo žaidimo"
-#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:302
#: 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:779 client/gui-gtk-2.0/pages.c:820
-#: client/gui-win32/connectdlg.c:916
+#: client/gui-win32/connectdlg.c:918
msgid "Server Name"
msgstr "Serverio pavadinimas"
#: client/gui-gtk-2.0/pages.c:780 client/gui-gtk-2.0/pages.c:821
-#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:916
+#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:918
#: data/Freeciv.in:96
msgid "Port"
msgstr "Prievadas"
#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Version"
msgstr "Versija"
#: client/gui-gtk-2.0/pages.c:782 client/gui-gtk-2.0/pages.c:823
-#: client/gui-gtk-2.0/pages.c:2161 client/gui-win32/connectdlg.c:917
-#: client/gui-win32/connectdlg.c:995
+#: client/gui-gtk-2.0/pages.c:2163 client/gui-win32/connectdlg.c:919
+#: client/gui-win32/connectdlg.c:997
msgid "Status"
msgstr "BÅ«sena"
#: client/gui-gtk-2.0/pages.c:783 client/gui-gtk-2.0/pages.c:824
#: client/gui-sdl/connectdlg.c:318 client/gui-sdl/plrdlg.c:330
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Players"
msgstr "Žaidėjai"
#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
-#: client/gui-win32/connectdlg.c:918
+#: client/gui-win32/connectdlg.c:920
msgid "Comment"
msgstr "Komentaras"
@@ -12028,9 +12183,9 @@ msgstr "_Slaptažodis"
msgid "Conf_irm Password:"
msgstr "_Patvirtinti slaptažodį"
-#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2165
#: 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:1000
+#: client/gui-win32/citydlg.c:1083 client/gui-win32/connectdlg.c:1002
#: client/gui-win32/wldlg.c:800 client/gui-win32/wldlg.c:806
msgid "Type"
msgstr "Tipas"
@@ -12124,7 +12279,7 @@ msgstr "_DI meistriškumo lygis:"
msgid "Ruleset _Version:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2195
msgid "_More Game Options..."
msgstr "Daugiau žaidimo _nustatymų"
@@ -12140,49 +12295,49 @@ msgstr "Reitingas"
msgid "Ready"
msgstr "Pasiruošęs"
-#: client/gui-gtk-2.0/pages.c:1601
+#: client/gui-gtk-2.0/pages.c:1600
#, fuzzy
msgid "?player:Leader"
msgstr "?Player:Vardas"
-#: client/gui-gtk-2.0/pages.c:1732 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1734 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:1824
+#: client/gui-gtk-2.0/pages.c:1826
msgid "Choose Saved Game to _Load:"
msgstr "Pasirinkite išsaugotą žaidimą į_kėlimui:"
-#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
-#: client/gui-gtk-2.0/pages.c:2451
+#: client/gui-gtk-2.0/pages.c:1846 client/gui-gtk-2.0/pages.c:2039
+#: client/gui-gtk-2.0/pages.c:2455
msgid "_Browse..."
msgstr "_Naršyti..."
-#: client/gui-gtk-2.0/pages.c:1911
+#: client/gui-gtk-2.0/pages.c:1913
msgid "Choose a Scenario"
msgstr "Pasirinkite scenarijų"
-#: client/gui-gtk-2.0/pages.c:1998
+#: client/gui-gtk-2.0/pages.c:2000
msgid "Choose a _Scenario:"
msgstr "Pasirinkite _scenarijų"
-#: client/gui-gtk-2.0/pages.c:2173
+#: client/gui-gtk-2.0/pages.c:2175
msgid "Choose a _nation to play:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2367 client/gui-win32/menu.c:581
msgid "Select Location to Save"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2452 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "Išsaugoti žaidimą"
-#: client/gui-gtk-2.0/pages.c:2489
+#: client/gui-gtk-2.0/pages.c:2493
msgid "Saved _Games:"
msgstr "_Išsaugoti žaidimai:"
-#: client/gui-gtk-2.0/pages.c:2516
+#: client/gui-gtk-2.0/pages.c:2520
msgid "Save _Filename:"
msgstr ""
@@ -12533,7 +12688,7 @@ msgstr ""
msgid "Total users logged in : %d"
msgstr "Iš viso prisijungusių vartotojų yra %d"
-#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1098
msgid "Back"
msgstr "Atgal"
@@ -12542,7 +12697,7 @@ msgid "Start"
msgstr "PradÄ—ti"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:777
+#: client/gui-win32/connectdlg.c:779
msgid "Load Game"
msgstr "Įkelti žaidimą"
@@ -12582,9 +12737,9 @@ msgstr ""
#: client/gui-sdl/connectdlg.c:308 client/gui-sdl/connectdlg.c:617
#: client/gui-sdl/connectdlg.c:803 client/gui-sdl/connectdlg.c:985
#: client/gui-sdl/dialogs.c:452 client/gui-sdl/dialogs.c:2095
-#: client/gui-sdl/dialogs.c:2893 client/gui-sdl/diplomat_dialog.c:731
+#: client/gui-sdl/dialogs.c:2902 client/gui-sdl/diplomat_dialog.c:731
#: client/gui-sdl/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1043
#: client/gui-win32/dialogs.c:1772 client/gui-win32/finddlg.c:127
#: client/gui-win32/gotodlg.c:171 client/gui-win32/inputdlg.c:146
#: client/gui-win32/messagedlg.c:216 client/gui-win32/ratesdlg.c:328
@@ -12629,7 +12784,7 @@ msgid "Buy it?"
msgstr "Ar pirkti?"
#: 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
+#: client/gui-sdl/diplodlg.c:1336 client/gui-sdl/diplomat_dialog.c:1211
#: client/gui-sdl/diplomat_dialog.c:1417 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:221 client/gui-sdl/repodlgs.c:1559
#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
@@ -12645,7 +12800,7 @@ msgid "No"
msgstr "Ne"
#: client/gui-sdl/citydlg.c:1215 client/gui-sdl/cma_fe.c:318
-#: client/gui-sdl/diplodlg.c:1345 client/gui-sdl/diplomat_dialog.c:1200
+#: client/gui-sdl/diplodlg.c:1346 client/gui-sdl/diplomat_dialog.c:1200
#: client/gui-sdl/diplomat_dialog.c:1407 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:232 client/gui-win32/repodlgs.c:578
#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
@@ -12953,7 +13108,7 @@ msgstr "Freeciv serveris :"
msgid "Port :"
msgstr "Prievadas:"
-#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1100
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr "Sujungti"
@@ -13061,23 +13216,23 @@ msgstr "Pasirinkite naujÄ… valdymo formÄ…"
msgid "REVOLUTION!"
msgstr "REVOLIUCIJA!"
-#: client/gui-sdl/dialogs.c:2232 client/gui-sdl/dialogs.c:2620
+#: client/gui-sdl/dialogs.c:2237 client/gui-sdl/dialogs.c:2625
#: client/gui-win32/dialogs.c:567 data/Freeciv.in:3159
msgid "Female"
msgstr "Moteris"
-#: client/gui-sdl/dialogs.c:2234 client/gui-sdl/dialogs.c:2618
-#: client/gui-sdl/dialogs.c:2830 client/gui-win32/dialogs.c:565
+#: client/gui-sdl/dialogs.c:2239 client/gui-sdl/dialogs.c:2623
+#: client/gui-sdl/dialogs.c:2839 client/gui-win32/dialogs.c:565
msgid "Male"
msgstr "Vyras"
-#: client/gui-sdl/dialogs.c:2478 client/gui-sdl/dialogs.c:2902
+#: client/gui-sdl/dialogs.c:2483 client/gui-sdl/dialogs.c:2911
#: 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"
-#: client/gui-sdl/dialogs.c:2685 client/gui-win32/dialogs.c:505
+#: client/gui-sdl/dialogs.c:2694 client/gui-win32/dialogs.c:505
msgid "What nation will you be?"
msgstr "Kokia tauta jūs būsite?"
@@ -13104,53 +13259,53 @@ msgstr "Pasaulio žemėlapis"
msgid "Sea map"
msgstr "Jūros žemėlapis"
-#: client/gui-sdl/diplodlg.c:563
+#: client/gui-sdl/diplodlg.c:564
msgid "Give embassy"
msgstr "Duoti ambasadÄ…"
-#: client/gui-sdl/diplodlg.c:579 client/gui-win32/diplodlg.c:614
+#: client/gui-sdl/diplodlg.c:580 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 ""
-#: client/gui-sdl/diplodlg.c:613 client/gui-sdl/helpdlg.c:1956
+#: client/gui-sdl/diplodlg.c:614 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"
-#: client/gui-sdl/diplodlg.c:831 client/gui-win32/diplodlg.c:598
+#: client/gui-sdl/diplodlg.c:832 client/gui-win32/diplodlg.c:598
#: data/Freeciv.in:269
msgid "Diplomacy meeting"
msgstr "Diplomatinis susitikimas"
-#: client/gui-sdl/diplodlg.c:883 client/gui-win32/diplodlg.c:680
+#: client/gui-sdl/diplodlg.c:884 client/gui-win32/diplodlg.c:680
#: data/Freeciv.in:510
msgid "Cancel meeting"
msgstr "Nutraukti susitikimÄ…"
-#: client/gui-sdl/diplodlg.c:895 client/gui-win32/diplodlg.c:679
+#: client/gui-sdl/diplodlg.c:896 client/gui-win32/diplodlg.c:679
#: data/Freeciv.in:501
msgid "Accept treaty"
msgstr "Priimti sutartį"
#. TRANS: "Polish incident !" FIXME!!!
-#: client/gui-sdl/diplodlg.c:1304
+#: client/gui-sdl/diplodlg.c:1305
#, c-format
msgid "%s incident !"
msgstr "%s incidentas !"
-#: client/gui-sdl/diplodlg.c:1322
+#: client/gui-sdl/diplodlg.c:1323
msgid "Shall we declare WAR on them?"
msgstr "Ar mes turime paskelbti jiems KARÄ„?"
-#: client/gui-sdl/diplodlg.c:1433
+#: client/gui-sdl/diplodlg.c:1434
msgid "Foreign Minister"
msgstr "Užsienio reikalų ministras"
-#: client/gui-sdl/diplodlg.c:1449
+#: client/gui-sdl/diplodlg.c:1450
#, c-format
msgid ""
"Sir!, the %s ambassador has arrived\n"
@@ -13159,24 +13314,24 @@ msgstr ""
"Pone! Atvyko %s ambasadorius\n"
"Kokie jūsų norai?"
-#: client/gui-sdl/diplodlg.c:1465
+#: client/gui-sdl/diplodlg.c:1466
msgid "Declare WAR"
msgstr "Paskelbti karÄ…"
-#: client/gui-sdl/diplodlg.c:1467 client/gui-win32/plrdlg.c:357
+#: client/gui-sdl/diplodlg.c:1468 client/gui-win32/plrdlg.c:357
msgid "Cancel Treaty"
msgstr "Atšaukti sutartį"
-#: client/gui-sdl/diplodlg.c:1490 client/gui-win32/plrdlg.c:358
+#: client/gui-sdl/diplodlg.c:1491 client/gui-win32/plrdlg.c:358
#: data/Freeciv.in:3254
msgid "Withdraw vision"
msgstr "Atsiimti bendro regÄ—jimo laukÄ…"
-#: client/gui-sdl/diplodlg.c:1507
+#: client/gui-sdl/diplodlg.c:1508
msgid "Call Diplomatic Meeting"
msgstr "Sušaukti diplomatinį susitikimą"
-#: client/gui-sdl/diplodlg.c:1521
+#: client/gui-sdl/diplodlg.c:1522
msgid "Send him back"
msgstr "Siųsti jį atgal"
@@ -13916,12 +14071,12 @@ msgid "Leave Game"
msgstr "Palikti žaidimą"
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1100 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1102 client/gui-xaw/menu.c:121
#: data/Freeciv.in:115 data/Freeciv.in:3180
msgid "Quit"
msgstr "IÅ¡eiti"
-#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:967
msgid "Start New Game"
msgstr "Pradėti naują žaidimą"
@@ -14032,8 +14187,8 @@ msgstr "Pelnas:"
msgid "%s max rate : %d%%"
msgstr ""
-#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
-#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1085
+#: client/gui-win32/connectdlg.c:1093 data/Freeciv.in:155
msgid "Update"
msgstr "Atnaujinti"
@@ -14520,67 +14675,67 @@ msgstr "Naujas"
msgid "Delete"
msgstr "Trinti"
-#: client/gui-win32/connectdlg.c:147
+#: client/gui-win32/connectdlg.c:149
msgid "Password:"
msgstr "Slaptažodis:"
-#: client/gui-win32/connectdlg.c:169
+#: client/gui-win32/connectdlg.c:171
msgid "Couldn't load the savegame"
msgstr "Negaliu įkelti išsaugoto žaidimo"
-#: client/gui-win32/connectdlg.c:284 client/gui-xaw/connectdlg.c:311
+#: client/gui-win32/connectdlg.c:286 client/gui-xaw/connectdlg.c:311
msgid "Verify Password"
msgstr "Patikrinti slaptažodį"
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:916 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr "Freeciv serverio pasirinkimas"
-#: client/gui-win32/connectdlg.c:915
+#: client/gui-win32/connectdlg.c:917
msgid "Local Area Network"
msgstr "Vietinis tinklas"
-#: client/gui-win32/connectdlg.c:949
+#: client/gui-win32/connectdlg.c:951
msgid "Welcome to Freeciv"
msgstr "Sveiki atvykę į Freeciv"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Load Saved Game"
msgstr "Įkelti išsaugotą žaidimą"
-#: client/gui-win32/connectdlg.c:969
+#: client/gui-win32/connectdlg.c:971
msgid "Connect To Network Game"
msgstr "Prisijungti prie tinklo žaidimo"
-#: client/gui-win32/connectdlg.c:979
+#: client/gui-win32/connectdlg.c:981
msgid "Choose a nation to play"
msgstr "Pasirinkite tautą, su kuria žaisite"
-#: client/gui-win32/connectdlg.c:1014
+#: client/gui-win32/connectdlg.c:1016
msgid "Number of players (Including AI):"
msgstr "ŽaidÄ—jų skaiÄius (įskaitant DI)"
-#: client/gui-win32/connectdlg.c:1022
+#: client/gui-win32/connectdlg.c:1024
msgid "AI skill level:"
msgstr "DI meistriškumo lygis:"
-#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1038 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr "Žaidimo nustatymai"
-#: client/gui-win32/connectdlg.c:1040
+#: client/gui-win32/connectdlg.c:1042
msgid "Start Game"
msgstr "Pradėti žaidimą"
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Login:"
msgstr "Prisijungimo vardas:"
-#: client/gui-win32/connectdlg.c:1061
+#: client/gui-win32/connectdlg.c:1063
msgid "Host:"
msgstr ""
-#: client/gui-win32/connectdlg.c:1062
+#: client/gui-win32/connectdlg.c:1064
msgid "Port:"
msgstr "Prievadas:"
@@ -14653,21 +14808,21 @@ msgid ""
"this is much slower."
msgstr ""
-#: client/gui-win32/helpdlg.c:769 client/gui-win32/helpdlg.c:792
-#: client/gui-win32/helpdlg.c:803 client/gui-win32/helpdlg.c:809
-#: client/gui-win32/helpdlg.c:822
+#: client/gui-win32/helpdlg.c:775 client/gui-win32/helpdlg.c:798
+#: client/gui-win32/helpdlg.c:809 client/gui-win32/helpdlg.c:815
+#: client/gui-win32/helpdlg.c:828
msgid "Allows "
msgstr "Leidžia"
-#: client/gui-win32/helpdlg.c:780
+#: client/gui-win32/helpdlg.c:786
msgid "Obsoletes "
msgstr "Pasensta"
-#: client/gui-win32/helpdlg.c:812 client/gui-win32/helpdlg.c:825
+#: client/gui-win32/helpdlg.c:818 client/gui-win32/helpdlg.c:831
msgid " (with "
msgstr " (su "
-#: client/gui-win32/helpdlg.c:815 client/gui-win32/helpdlg.c:828
+#: client/gui-win32/helpdlg.c:821 client/gui-win32/helpdlg.c:834
msgid "?techhelp:)."
msgstr "?techhelp:)."
@@ -15774,7 +15929,7 @@ 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/"
+" https://gna.org/projects/freeciv/"
msgstr ""
#: data/helpdata.txt:60
@@ -17391,50 +17546,48 @@ msgid ""
"a Factory, Mfg. Plant and Hydro Plant together give a 150% production "
"bonus.\n"
"\n"
-"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant. A city "
-"can only build a Hydro Plant if it is next to (or on) a Mountain or River "
-"tile."
+"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant."
msgstr ""
-#: data/default/buildings.ruleset:397 data/civ2/buildings.ruleset:373
+#: data/default/buildings.ruleset:396 data/civ2/buildings.ruleset:373
#: data/civ1/buildings.ruleset:297
msgid "Library"
msgstr "Biblioteka"
-#: data/default/buildings.ruleset:412
+#: data/default/buildings.ruleset:411
#, no-c-format
msgid "Increases the science output in a city by 100%."
msgstr "100% padidina mokslo produkcijÄ… mieste."
-#: data/default/buildings.ruleset:417 data/civ2/buildings.ruleset:393
+#: data/default/buildings.ruleset:416 data/civ2/buildings.ruleset:393
#: data/civ1/buildings.ruleset:317
msgid "Marketplace"
msgstr "Turgus"
-#: data/default/buildings.ruleset:432 data/civ2/buildings.ruleset:408
+#: data/default/buildings.ruleset:431 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%."
-#: data/default/buildings.ruleset:437 data/civ2/buildings.ruleset:413
+#: data/default/buildings.ruleset:436 data/civ2/buildings.ruleset:413
#: data/civ1/buildings.ruleset:337
msgid "Mass Transit"
msgstr "Masinis tranzitas"
-#: data/default/buildings.ruleset:451 data/civ2/buildings.ruleset:427
+#: data/default/buildings.ruleset:450 data/civ2/buildings.ruleset:427
#: data/civ1/buildings.ruleset:351
msgid ""
"Neutralizes the pollution generated by the population. The population "
"simply has no effect on the pollution generated in the city."
msgstr ""
-#: data/default/buildings.ruleset:458 data/civ2/buildings.ruleset:434
+#: data/default/buildings.ruleset:457 data/civ2/buildings.ruleset:434
#: data/civ1/buildings.ruleset:358
msgid "Mfg. Plant"
msgstr "Gamyb. kompleksas"
-#: data/default/buildings.ruleset:474 data/civ2/buildings.ruleset:450
+#: data/default/buildings.ruleset:473 data/civ2/buildings.ruleset:450
#: data/civ1/buildings.ruleset:374
#, no-c-format
msgid ""
@@ -17442,12 +17595,12 @@ msgid ""
"production in a city by 100%."
msgstr ""
-#: data/default/buildings.ruleset:480 data/civ2/buildings.ruleset:456
+#: data/default/buildings.ruleset:479 data/civ2/buildings.ruleset:456
#: data/civ1/buildings.ruleset:380
msgid "Nuclear Plant"
msgstr "BranduolinÄ— elektrinÄ—"
-#: data/default/buildings.ruleset:495
+#: data/default/buildings.ruleset:494
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 "
@@ -17458,22 +17611,22 @@ msgid ""
"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant."
msgstr ""
-#: data/default/buildings.ruleset:515 data/civ2/buildings.ruleset:489
+#: data/default/buildings.ruleset:514 data/civ2/buildings.ruleset:489
msgid "Offshore Platform"
msgstr "PakrantÄ—s platforma"
-#: data/default/buildings.ruleset:530 data/civ2/buildings.ruleset:504
+#: data/default/buildings.ruleset:529 data/civ2/buildings.ruleset:504
msgid ""
"Adds 1 extra shield resource on all Ocean squares in a city. The city needs "
"to be coastal to build this improvement."
msgstr ""
-#: data/default/buildings.ruleset:536 data/civ2/buildings.ruleset:510
+#: data/default/buildings.ruleset:535 data/civ2/buildings.ruleset:510
#: data/civ1/buildings.ruleset:411
msgid "Palace"
msgstr "RÅ«mai"
-#: data/default/buildings.ruleset:552
+#: data/default/buildings.ruleset:551
#, no-c-format
msgid ""
"Makes a city the capital and the center of your government. Corruption in "
@@ -17490,33 +17643,33 @@ msgid ""
"Monarchy a +50% production bonus."
msgstr ""
-#: data/default/buildings.ruleset:569 data/civ2/buildings.ruleset:539
+#: data/default/buildings.ruleset:568 data/civ2/buildings.ruleset:539
msgid "Police Station"
msgstr "Policijos būstinė"
-#: data/default/buildings.ruleset:583 data/civ2/buildings.ruleset:553
+#: data/default/buildings.ruleset:582 data/civ2/buildings.ruleset:553
msgid ""
"Reduces the unhappiness caused by military units outside the city by 2 under "
"Democracy and 1 under Republic. This improvement has no effect under other "
"governments."
msgstr ""
-#: data/default/buildings.ruleset:593 data/civ2/buildings.ruleset:560
+#: data/default/buildings.ruleset:592 data/civ2/buildings.ruleset:560
msgid "Port Facility"
msgstr "Dokai"
-#: data/default/buildings.ruleset:608 data/civ2/buildings.ruleset:575
+#: data/default/buildings.ruleset:607 data/civ2/buildings.ruleset:575
msgid ""
"Allows a city to build veteran sea units. Also, damaged sea units which "
"stay in town for one full turn without moving are completely restored."
msgstr ""
-#: data/default/buildings.ruleset:615 data/civ2/buildings.ruleset:582
+#: data/default/buildings.ruleset:614 data/civ2/buildings.ruleset:582
#: data/civ1/buildings.ruleset:440
msgid "Power Plant"
msgstr "JÄ—gainÄ—"
-#: data/default/buildings.ruleset:631
+#: data/default/buildings.ruleset:630
#, no-c-format
msgid ""
"Increases the shield production of a Factory or Mfg. Plant in a city: a "
@@ -17527,12 +17680,12 @@ msgid ""
"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant."
msgstr ""
-#: data/default/buildings.ruleset:646 data/civ2/buildings.ruleset:610
+#: data/default/buildings.ruleset:645 data/civ2/buildings.ruleset:610
#: data/civ1/buildings.ruleset:468
msgid "Recycling Center"
msgstr "Perdirbimo centras"
-#: data/default/buildings.ruleset:661 data/civ2/buildings.ruleset:625
+#: data/default/buildings.ruleset:660 data/civ2/buildings.ruleset:625
#: data/civ1/buildings.ruleset:483
#, no-c-format
msgid ""
@@ -17540,11 +17693,11 @@ msgid ""
"production in a city by 66%."
msgstr "PastaÄius perdirbimo centrÄ… iÅ¡metama tarÅ¡a mieste sumažėja 66%."
-#: data/default/buildings.ruleset:667 data/civ2/buildings.ruleset:631
+#: data/default/buildings.ruleset:666 data/civ2/buildings.ruleset:631
msgid "Research Lab"
msgstr "Tyrimų laboratorija"
-#: data/default/buildings.ruleset:682
+#: data/default/buildings.ruleset:681
msgid ""
"Together with a Library, a Research Lab increases the science production of "
"a city by 200%. Together with a Library and a University, a Research Lab "
@@ -17554,11 +17707,11 @@ msgstr ""
"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
+#: data/default/buildings.ruleset:689 data/civ2/buildings.ruleset:654
msgid "SAM Battery"
msgstr "Priešlėktuvinė gynyba"
-#: data/default/buildings.ruleset:704 data/civ2/buildings.ruleset:668
+#: data/default/buildings.ruleset:703 data/civ2/buildings.ruleset:668
msgid ""
"Doubles the defense of all units inside the city when attacked by non-"
"nuclear air units."
@@ -17566,12 +17719,12 @@ msgstr ""
"Padvigubina mieste esanÄių dalinių gynybÄ…, kai yra puolama su nebranduoline "
"aviacija."
-#: data/default/buildings.ruleset:710 data/civ2/buildings.ruleset:674
+#: data/default/buildings.ruleset:709 data/civ2/buildings.ruleset:674
#: data/civ1/buildings.ruleset:489
msgid "SDI Defense"
msgstr "SDI gynyba"
-#: data/default/buildings.ruleset:724 data/civ2/buildings.ruleset:688
+#: data/default/buildings.ruleset:723 data/civ2/buildings.ruleset:688
#: data/civ1/buildings.ruleset:503
msgid ""
"Protects a city from attacks from Nuclear units. Nuclear attacks simply "
@@ -17581,11 +17734,11 @@ 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
+#: data/default/buildings.ruleset:732 data/civ2/buildings.ruleset:697
msgid "Sewer System"
msgstr "Kanalizacija"
-#: data/default/buildings.ruleset:748 data/civ2/buildings.ruleset:712
+#: data/default/buildings.ruleset:747 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."
@@ -17593,12 +17746,12 @@ 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/default/buildings.ruleset:753 data/civ2/buildings.ruleset:749
#: data/civ1/buildings.ruleset:512
msgid "Space Component"
msgstr "Kosminis komponentas"
-#: data/default/buildings.ruleset:769 data/civ2/buildings.ruleset:763
+#: data/default/buildings.ruleset:768 data/civ2/buildings.ruleset:763
#: data/civ1/buildings.ruleset:526
msgid ""
"Space Components can be differentiated into Propulsion and Fuel Components. "
@@ -17609,12 +17762,12 @@ msgid ""
"have been built by any player."
msgstr ""
-#: data/default/buildings.ruleset:779 data/civ2/buildings.ruleset:773
+#: data/default/buildings.ruleset:778 data/civ2/buildings.ruleset:773
#: data/civ1/buildings.ruleset:536
msgid "Space Module"
msgstr "Kosminis modulis"
-#: data/default/buildings.ruleset:794 data/civ2/buildings.ruleset:787
+#: data/default/buildings.ruleset:793 data/civ2/buildings.ruleset:787
#: data/civ1/buildings.ruleset:550
msgid ""
"Space Modules are the most expensive parts of spaceships. There are three "
@@ -17648,12 +17801,12 @@ msgstr ""
"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/default/buildings.ruleset:812 data/civ2/buildings.ruleset:806
#: data/civ1/buildings.ruleset:569
msgid "Space Structural"
msgstr "Kosminė struktūra"
-#: data/default/buildings.ruleset:828 data/civ2/buildings.ruleset:820
+#: data/default/buildings.ruleset:827 data/civ2/buildings.ruleset:820
#: data/civ1/buildings.ruleset:583
msgid ""
"Space Structurals form the base of your spaceship. All other spaceship "
@@ -17670,32 +17823,32 @@ msgstr ""
"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
+#: data/default/buildings.ruleset:837 data/civ2/buildings.ruleset:830
msgid "Stock Exchange"
msgstr "Akcijų birža"
-#: data/default/buildings.ruleset:854 data/civ2/buildings.ruleset:846
+#: data/default/buildings.ruleset:853 data/civ2/buildings.ruleset:846
#, no-c-format
msgid ""
"Together with a Marketplace and a Bank, a Stock Exchange boosts tax and "
"luxury production in a city by 150%."
msgstr ""
-#: data/default/buildings.ruleset:860 data/civ2/buildings.ruleset:852
+#: data/default/buildings.ruleset:859 data/civ2/buildings.ruleset:852
msgid "Super Highways"
msgstr "AutomagistralÄ—s"
-#: data/default/buildings.ruleset:875 data/civ2/buildings.ruleset:867
+#: data/default/buildings.ruleset:874 data/civ2/buildings.ruleset:867
#, no-c-format
msgid ""
"Increases trade resources by 50% on all squares with roads or railroads."
msgstr ""
-#: data/default/buildings.ruleset:883 data/civ2/buildings.ruleset:873
+#: data/default/buildings.ruleset:882 data/civ2/buildings.ruleset:873
msgid "Supermarket"
msgstr "Prekybos centras"
-#: data/default/buildings.ruleset:898 data/civ2/buildings.ruleset:888
+#: data/default/buildings.ruleset:897 data/civ2/buildings.ruleset:888
#, no-c-format
msgid ""
"Increases the food resources by 50% on each farmland square which is being "
@@ -17703,12 +17856,12 @@ msgid ""
"a second time."
msgstr ""
-#: data/default/buildings.ruleset:905 data/civ2/buildings.ruleset:895
+#: data/default/buildings.ruleset:904 data/civ2/buildings.ruleset:895
#: data/civ1/buildings.ruleset:593
msgid "Temple"
msgstr "Å ventykla"
-#: data/default/buildings.ruleset:919 data/civ2/buildings.ruleset:909
+#: data/default/buildings.ruleset:918 data/civ2/buildings.ruleset:909
#: data/civ1/buildings.ruleset:607
msgid ""
"Makes one unhappy citizen content. Both the Mysticism advance and the "
@@ -17716,25 +17869,25 @@ msgid ""
"citizens are made content."
msgstr ""
-#: data/default/buildings.ruleset:926 data/civ2/buildings.ruleset:916
+#: data/default/buildings.ruleset:925 data/civ2/buildings.ruleset:916
#: data/civ1/buildings.ruleset:614 data/default/techs.ruleset:742
#: data/civ2/techs.ruleset:727 data/civ1/techs.ruleset:723
msgid "University"
msgstr "Universitetas"
-#: data/default/buildings.ruleset:942
+#: data/default/buildings.ruleset:941
#, 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%."
-#: data/default/buildings.ruleset:948 data/civ2/buildings.ruleset:938
+#: data/default/buildings.ruleset:947 data/civ2/buildings.ruleset:938
#: data/civ1/buildings.ruleset:636
msgid "Apollo Program"
msgstr "„Apollo“ programa"
-#: data/default/buildings.ruleset:962 data/civ2/buildings.ruleset:952
+#: data/default/buildings.ruleset:961 data/civ2/buildings.ruleset:952
msgid ""
"Entire map becomes visible for the player who owns it. It allows all "
"players to start building spaceship parts (assuming they have researched the "
@@ -17744,46 +17897,46 @@ msgstr ""
"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
+#: data/default/buildings.ruleset:968 data/civ2/buildings.ruleset:959
msgid "A.Smith's Trading Co."
msgstr "A. Smito prekybos korporacija"
-#: data/default/buildings.ruleset:983
+#: data/default/buildings.ruleset:982
msgid ""
"City improvements which would normally have an upkeep of 1 are free of "
"upkeep, for all your cities."
msgstr ""
-#: data/default/buildings.ruleset:989 data/civ2/buildings.ruleset:979
+#: data/default/buildings.ruleset:988 data/civ2/buildings.ruleset:979
#: data/civ1/buildings.ruleset:655
msgid "Colossus"
msgstr "Kolosas"
-#: data/default/buildings.ruleset:1003 data/civ2/buildings.ruleset:993
+#: data/default/buildings.ruleset:1002 data/civ2/buildings.ruleset:993
#: data/civ1/buildings.ruleset:669
msgid ""
"Each square around the city where this wonder is built that is already "
"generating some trade produces one extra trade resource."
msgstr ""
-#: data/default/buildings.ruleset:1009 data/civ2/buildings.ruleset:999
+#: data/default/buildings.ruleset:1008 data/civ2/buildings.ruleset:999
#: data/civ1/buildings.ruleset:675
msgid "Copernicus' Observatory"
msgstr "Koperniko observatorija"
-#: data/default/buildings.ruleset:1024 data/civ2/buildings.ruleset:1180
+#: data/default/buildings.ruleset:1023 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/default/buildings.ruleset:1028 data/civ2/buildings.ruleset:1019
#: data/civ1/buildings.ruleset:695
msgid "Cure For Cancer"
msgstr "Vaistai nuo vėžio"
-#: data/default/buildings.ruleset:1043
+#: data/default/buildings.ruleset:1042
msgid ""
"This stunning technological achievement makes one unhappy citizen content in "
"all your cities."
@@ -17791,12 +17944,12 @@ msgstr ""
"Stulbinantis technologinis pasiekimas vienÄ… nelaimingÄ… gyventojÄ… kiekviename "
"mieste padaro patenkintu."
-#: data/default/buildings.ruleset:1051 data/civ2/buildings.ruleset:1039
+#: data/default/buildings.ruleset:1050 data/civ2/buildings.ruleset:1039
#: data/civ1/buildings.ruleset:715
msgid "Darwin's Voyage"
msgstr "Darvino kelionÄ—"
-#: data/default/buildings.ruleset:1065 data/civ2/buildings.ruleset:1053
+#: data/default/buildings.ruleset:1064 data/civ2/buildings.ruleset:1053
#: data/civ1/buildings.ruleset:729
msgid ""
"Charles Darwin's voyage sparked the discovery of the evolution of the "
@@ -17806,11 +17959,11 @@ 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
+#: data/default/buildings.ruleset:1071 data/civ2/buildings.ruleset:1060
msgid "Eiffel Tower"
msgstr "Eifelio bokštas"
-#: data/default/buildings.ruleset:1087
+#: data/default/buildings.ruleset:1086
#, fuzzy, no-c-format
msgid ""
"Your reputation and goodwill among other nations is recovered twice as fast."
@@ -17818,12 +17971,12 @@ 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/default/buildings.ruleset:1092 data/civ2/buildings.ruleset:1081
#: data/civ1/buildings.ruleset:736
msgid "Great Library"
msgstr "Didžioji biblioteka"
-#: data/default/buildings.ruleset:1107 data/civ2/buildings.ruleset:1095
+#: data/default/buildings.ruleset:1106 data/civ2/buildings.ruleset:1095
#: data/civ1/buildings.ruleset:750
msgid ""
"The civilization which builds the Great Library gets every advance that at "
@@ -17832,21 +17985,21 @@ 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/default/buildings.ruleset:1112 data/civ2/buildings.ruleset:1101
#: data/civ1/buildings.ruleset:756
msgid "Great Wall"
msgstr "Didžioji siena "
-#: data/default/buildings.ruleset:1127
+#: data/default/buildings.ruleset:1126
msgid "Works as a City Wall in all your cities."
msgstr "Veikia kaip miesto sienos kiekviename mieste."
-#: data/default/buildings.ruleset:1135 data/civ2/buildings.ruleset:1122
+#: data/default/buildings.ruleset:1134 data/civ2/buildings.ruleset:1122
#: data/civ1/buildings.ruleset:777
msgid "Hanging Gardens"
msgstr "Kabantys sodai"
-#: data/default/buildings.ruleset:1149 data/civ2/buildings.ruleset:1136
+#: data/default/buildings.ruleset:1148 data/civ2/buildings.ruleset:1136
#: data/civ1/buildings.ruleset:791
msgid ""
"Makes one content citizen happy in every city. Makes two extra content "
@@ -17856,96 +18009,96 @@ msgid ""
"them content instead)."
msgstr ""
-#: data/default/buildings.ruleset:1158 data/civ2/buildings.ruleset:1145
+#: data/default/buildings.ruleset:1157 data/civ2/buildings.ruleset:1145
#: data/civ1/buildings.ruleset:800
msgid "Hoover Dam"
msgstr "Huverio užtvanka"
-#: data/default/buildings.ruleset:1173 data/civ2/buildings.ruleset:1159
+#: data/default/buildings.ruleset:1172 data/civ2/buildings.ruleset:1159
msgid ""
"Works as if you had a Hydro Plant in every city. (This reduces pollution "
"and increases the effects of Factories and Mfg. Plants.)"
msgstr ""
-#: data/default/buildings.ruleset:1179 data/civ2/buildings.ruleset:1165
+#: data/default/buildings.ruleset:1178 data/civ2/buildings.ruleset:1165
#: data/civ1/buildings.ruleset:822
msgid "Isaac Newton's College"
msgstr "Izaoko Niutono koledžas"
-#: data/default/buildings.ruleset:1194
+#: data/default/buildings.ruleset:1193
#, 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%."
-#: data/default/buildings.ruleset:1200 data/civ2/buildings.ruleset:1185
+#: data/default/buildings.ruleset:1199 data/civ2/buildings.ruleset:1185
#: data/civ1/buildings.ruleset:842
msgid "J.S. Bach's Cathedral"
msgstr "J.S. Bacho katedra"
-#: data/default/buildings.ruleset:1214 data/civ2/buildings.ruleset:1199
+#: data/default/buildings.ruleset:1213 data/civ2/buildings.ruleset:1199
msgid "Makes two unhappy citizens content in every city."
msgstr "Kiekviename mieste du nelaimingi gyventojai paverÄiami patenkintais."
-#: data/default/buildings.ruleset:1219 data/civ2/buildings.ruleset:1204
+#: data/default/buildings.ruleset:1218 data/civ2/buildings.ruleset:1204
msgid "King Richard's Crusade"
msgstr "Karaliaus RiÄardo kryžiaus žygis"
-#: data/default/buildings.ruleset:1233 data/civ2/buildings.ruleset:1218
+#: data/default/buildings.ruleset:1232 data/civ2/buildings.ruleset:1218
msgid ""
"Adds one extra shield resource on every square around the city where it is "
"built."
msgstr ""
-#: data/default/buildings.ruleset:1239 data/civ2/buildings.ruleset:1224
+#: data/default/buildings.ruleset:1238 data/civ2/buildings.ruleset:1224
msgid "Leonardo's Workshop"
msgstr "Leonardo dirbtuvÄ—"
-#: data/default/buildings.ruleset:1253 data/civ2/buildings.ruleset:1238
+#: data/default/buildings.ruleset:1252 data/civ2/buildings.ruleset:1238
msgid "Upgrades one obsolete unit per game turn."
msgstr "Patobulina vieną seną dalinį per ėjimą."
-#: data/default/buildings.ruleset:1258 data/civ2/buildings.ruleset:1243
+#: data/default/buildings.ruleset:1257 data/civ2/buildings.ruleset:1243
#: data/civ1/buildings.ruleset:862
msgid "Lighthouse"
msgstr "Å vyturys"
-#: data/default/buildings.ruleset:1273
+#: data/default/buildings.ruleset:1272
msgid ""
"Gives all your sea units 1 additional movement point and eliminates the risk "
"of losing Triremes on the high seas. Makes all your new sea units veterans "
"(for all your cities)."
msgstr ""
-#: data/default/buildings.ruleset:1280 data/civ2/buildings.ruleset:1264
+#: data/default/buildings.ruleset:1279 data/civ2/buildings.ruleset:1264
#: data/civ1/buildings.ruleset:885
msgid "Magellan's Expedition"
msgstr "Magelano ekspedicija"
-#: data/default/buildings.ruleset:1295
+#: data/default/buildings.ruleset:1294
msgid "Gives all your sea units 2 additional movement points."
msgstr ""
-#: data/default/buildings.ruleset:1300 data/civ2/buildings.ruleset:1283
+#: data/default/buildings.ruleset:1299 data/civ2/buildings.ruleset:1283
#: data/civ1/buildings.ruleset:904
msgid "Manhattan Project"
msgstr "Manheteno projektas"
-#: data/default/buildings.ruleset:1318 data/civ2/buildings.ruleset:1301
+#: data/default/buildings.ruleset:1317 data/civ2/buildings.ruleset:1301
msgid "Marco Polo's Embassy"
msgstr "Marko Polo ambasada"
-#: data/default/buildings.ruleset:1332 data/civ2/buildings.ruleset:1315
+#: data/default/buildings.ruleset:1331 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."
-#: data/default/buildings.ruleset:1337 data/civ2/buildings.ruleset:1320
+#: data/default/buildings.ruleset:1336 data/civ2/buildings.ruleset:1320
#: data/civ1/buildings.ruleset:922
msgid "Michelangelo's Chapel"
msgstr "Siksto koplyÄia"
-#: data/default/buildings.ruleset:1351 data/civ2/buildings.ruleset:1334
+#: data/default/buildings.ruleset:1350 data/civ2/buildings.ruleset:1334
msgid ""
"Counts as having a Cathedral in each of your cities. This makes 3 unhappy "
"citizens content in each city. The discovery of Theology increases the "
@@ -17954,55 +18107,55 @@ msgid ""
"the number of unhappy citizens made content."
msgstr ""
-#: data/default/buildings.ruleset:1361 data/civ2/buildings.ruleset:1344
+#: data/default/buildings.ruleset:1360 data/civ2/buildings.ruleset:1344
#: data/civ1/buildings.ruleset:941
msgid "Oracle"
msgstr "Orakulas"
-#: data/default/buildings.ruleset:1375
+#: data/default/buildings.ruleset:1374
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/default/buildings.ruleset:1379 data/civ2/buildings.ruleset:1363
#: data/civ1/buildings.ruleset:960
msgid "Pyramids"
msgstr "PiramidÄ—s"
-#: data/default/buildings.ruleset:1394
+#: data/default/buildings.ruleset:1393
msgid ""
"The amount of stored food lost when one of your cities grows or shrinks is "
"reduced by 25%. This helps a city to grow faster and more easily withstand "
"famine. Cumulative with Granary."
msgstr ""
-#: data/default/buildings.ruleset:1401 data/civ2/buildings.ruleset:1382
+#: data/default/buildings.ruleset:1400 data/civ2/buildings.ruleset:1382
#: data/civ1/buildings.ruleset:981
msgid "SETI Program"
msgstr "SETI programa"
-#: data/default/buildings.ruleset:1415
+#: data/default/buildings.ruleset:1414
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/default/buildings.ruleset:1419 data/civ2/buildings.ruleset:1402
#: data/civ1/buildings.ruleset:1001
msgid "Shakespeare's Theatre"
msgstr "Å ekspyro teatras"
-#: data/default/buildings.ruleset:1434 data/civ2/buildings.ruleset:1416
+#: data/default/buildings.ruleset:1433 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
+#: data/default/buildings.ruleset:1438 data/civ2/buildings.ruleset:1421
msgid "Statue of Liberty"
msgstr "LaisvÄ—s statula"
-#: data/default/buildings.ruleset:1453 data/civ2/buildings.ruleset:1435
+#: data/default/buildings.ruleset:1452 data/civ2/buildings.ruleset:1435
#: data/civ1/buildings.ruleset:974 data/civ1/buildings.ruleset:1034
msgid ""
"Allows you to choose any government, including those that have not yet been "
@@ -18012,42 +18165,42 @@ 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
+#: data/default/buildings.ruleset:1459 data/civ2/buildings.ruleset:1442
msgid "Sun Tzu's War Academy"
msgstr "Sun Tzu karo akademija"
-#: data/default/buildings.ruleset:1474
+#: data/default/buildings.ruleset:1473
msgid ""
"All your new ground units start at the first veteran level. The chance of a "
"unit getting the next veteran level after a battle increases by half."
msgstr ""
-#: data/default/buildings.ruleset:1481 data/civ2/buildings.ruleset:1463
+#: data/default/buildings.ruleset:1480 data/civ2/buildings.ruleset:1463
#: data/civ1/buildings.ruleset:1020
msgid "United Nations"
msgstr "JungtinÄ—s tautos"
-#: data/default/buildings.ruleset:1495
+#: data/default/buildings.ruleset:1494
msgid "All your units regain two extra hitpoints per turn."
msgstr "Visi Jūsų daliniai atgauna 2 papildomus gyvybės taškus per ėjimą."
-#: data/default/buildings.ruleset:1508 data/civ2/buildings.ruleset:1490
+#: data/default/buildings.ruleset:1507 data/civ2/buildings.ruleset:1490
#: data/civ1/buildings.ruleset:1046
msgid "Women's Suffrage"
msgstr "Moterų balsavimo teisė"
-#: data/default/buildings.ruleset:1522 data/civ2/buildings.ruleset:1504
+#: data/default/buildings.ruleset:1521 data/civ2/buildings.ruleset:1504
msgid ""
"Counts as a Police Station in every city. (That is, for each city, reduces "
"unhappiness for military units outside the city by 2 under Democracy and 1 "
"under Republic. This wonder has no effect under other governments.)"
msgstr ""
-#: data/default/buildings.ruleset:1533
+#: data/default/buildings.ruleset:1532
msgid "Coinage"
msgstr "Monetų kalimas"
-#: data/default/buildings.ruleset:1554
+#: data/default/buildings.ruleset:1553
msgid ""
"This is not a normal improvement. Instead, setting a city's production to "
"Coinage means its shield production is converted to tax output (money, "
@@ -18412,11 +18565,16 @@ msgstr "?citystyle:Keltiškas"
msgid "?citystyle:Industrial"
msgstr "?citystyle:Pramoninis"
-#: data/default/cities.ruleset:139 data/civ2/cities.ruleset:150
+#: data/default/cities.ruleset:139
+#, fuzzy
+msgid "?citystyle:ElectricAge"
+msgstr "?citystyle:Keltiškas"
+
+#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:150
msgid "?citystyle:Modern"
msgstr "?citystyle:Modernus"
-#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:161
+#: data/default/cities.ruleset:161 data/civ2/cities.ruleset:161
msgid "?citystyle:PostModern"
msgstr "?citystyle:Post Modernas"
@@ -23533,6 +23691,19 @@ msgstr "Komanda 30"
msgid "Team 31"
msgstr "Komanda 31"
+#~ msgid "Observers cannot vote."
+#~ msgstr "StebÄ—tojai balsuoti negali."
+
+#~ 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."
+
+#~ msgid "Value must be integer."
+#~ msgstr "VertÄ— turi bÅ«ti sveikasis skaiÄius."
+
#, fuzzy
#~ msgid "Auth config filename \"%s\" not allowed!"
#~ msgstr "Šis vardas neleidžiamas"
diff --git a/po/nb.gmo b/po/nb.gmo
index d107fe5..c15b0c5 100644
Binary files a/po/nb.gmo and b/po/nb.gmo differ
diff --git a/po/nb.po b/po/nb.po
index 9c53b5b..fb3295d 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: 2009-03-29 21:13+0900\n"
+"POT-Creation-Date: 2009-11-22 21:37+0100\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"
@@ -77,21 +77,21 @@ msgid "?redundant:*"
msgstr "?redundant:*"
# problem
-#: common/connection.c:515
+#: common/connection.c:518
#, c-format
msgid "%s from %s"
msgstr "%s fra %s"
-#: common/connection.c:521
+#: common/connection.c:524
msgid " (connection incomplete)"
msgstr " (forbindelse ikke opprettet)"
-#: common/connection.c:525
+#: common/connection.c:528
#, c-format
msgid " (player %s)"
msgstr " (spiller %s)"
-#: common/connection.c:529
+#: common/connection.c:532
msgid " (observer)"
msgstr " (observatør)"
@@ -504,82 +504,82 @@ msgstr "Tilkobling under opprettelse."
msgid "AI Debug messages"
msgstr ""
-#: common/player.c:732
+#: common/player.c:746
msgid "?attitude:Genocidal"
msgstr "Folkemorder"
-#: common/player.c:734
+#: common/player.c:748
msgid "?attitude:Belligerent"
msgstr "Ekstremt fiendtlig"
-#: common/player.c:736
+#: common/player.c:750
msgid "?attitude:Hostile"
msgstr "Fiendtlig"
-#: common/player.c:738
+#: common/player.c:752
msgid "?attitude:Uncooperative"
msgstr "Lite samarbeidsvillig"
-#: common/player.c:740
+#: common/player.c:754
msgid "?attitude:Uneasy"
msgstr "Vanskelig"
-#: common/player.c:742
+#: common/player.c:756
msgid "?attitude:Neutral"
msgstr "Nøytral"
-#: common/player.c:744
+#: common/player.c:758
msgid "?attitude:Respectful"
msgstr "Respektfull"
-#: common/player.c:746
+#: common/player.c:760
msgid "?attitude:Helpful"
msgstr "Hjelpsom"
-#: common/player.c:748
+#: common/player.c:762
msgid "?attitude:Enthusiastic"
msgstr "Entusiastisk"
-#: common/player.c:750
+#: common/player.c:764
msgid "?attitude:Admiring"
msgstr "Beundrende"
-#: common/player.c:753
+#: common/player.c:767
msgid "?attitude:Worshipful"
msgstr "Bønnfallende"
-#: common/player.c:764
+#: common/player.c:778
#, fuzzy
msgid "?diplomatic_state:Armistice"
msgstr "?diplomatic_state:Allianse"
-#: common/player.c:765
+#: common/player.c:779
msgid "?diplomatic_state:War"
msgstr "?diplomatic_state:Krig"
-#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:780 client/gui-gtk-2.0/diplodlg.c:353
#: 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:767 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:781 client/gui-gtk-2.0/diplodlg.c:358
#: 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:768 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:782 client/gui-gtk-2.0/diplodlg.c:363
#: 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:769
+#: common/player.c:783
msgid "?diplomatic_state:Never met"
msgstr "?diplomatic_state:Aldri møtt"
-#: common/player.c:770
+#: common/player.c:784
msgid "?diplomatic_state:Team"
msgstr "?diplomatic_state:Lag"
@@ -610,7 +610,7 @@ msgstr "Effekter som gjelder overlevelse er kun st
#. TRANS: "Resources: (none)".
#: common/requirements.c:1014 common/team.c:132
#: client/gui-gtk-2.0/helpdlg.c:1055 client/gui-gtk-2.0/inteldlg.c:390
-#: client/gui-win32/helpdlg.c:586 client/gui-xaw/helpdlg.c:991
+#: client/gui-win32/helpdlg.c:592 client/gui-xaw/helpdlg.c:991
#, fuzzy, c-format
msgid "(none)"
msgstr "ingen"
@@ -636,10 +636,11 @@ msgstr "Forsker p
#: 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
#: client/gui-sdl/helpdlg.c:817 client/gui-sdl/mapview.c:962
-#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:545
-#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:735
-#: 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
+#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:544
+#: client/gui-win32/helpdlg.c:551 client/gui-win32/helpdlg.c:721
+#: client/gui-win32/helpdlg.c:741 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 "Ingen"
@@ -653,30 +654,30 @@ msgstr "Forsker p
msgid "(Unknown)"
msgstr "(Ukjent)"
-#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:553
#: manual/civmanual.c:224
msgid "Road"
msgstr "Vei"
# irrigert er tillatt på norsk, men skulle gjerne hatt et bedre ord
-#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:557
#: client/gui-gtk-2.0/menu.c:829 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:394 common/terrain.c:572 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:567
#: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
#: data/civ1/techs.ruleset:563
msgid "Railroad"
msgstr "Jernbane"
-#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:555
msgid "Mine"
msgstr "Gruve"
-#: common/terrain.c:396 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:551 server/report.c:124
#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "Forurensning"
@@ -685,7 +686,7 @@ msgstr "Forurensning"
msgid "Hut"
msgstr "Hytte"
-#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:563
#: manual/civmanual.c:226
msgid "Fortress"
msgstr "Festning"
@@ -698,58 +699,58 @@ msgstr "Elv"
msgid "Farmland"
msgstr "Dyrket land"
-#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:577
#: manual/civmanual.c:226
msgid "Airbase"
msgstr "Flystripe"
-#: common/terrain.c:402 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:579
msgid "Fallout"
msgstr "Atomavfall"
-#: common/unit.c:546 client/gui-win32/plrdlg.c:337
+#: common/unit.c:549 client/gui-win32/plrdlg.c:337
msgid "Idle"
msgstr "Stille"
-#: common/unit.c:556
+#: common/unit.c:559
msgid "Fortifying"
msgstr "Befester posisjon"
-#: common/unit.c:558
+#: common/unit.c:561
msgid "Fortified"
msgstr "Befestet"
-#: common/unit.c:562 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
+#: common/unit.c:565 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
msgid "Sentry"
msgstr "Hold stand"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
+#: common/unit.c:569 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
#: client/gui-win32/menu.c:370 client/gui-xaw/menu.c:185
msgid "Pillage"
msgstr "Plyndre"
-#: common/unit.c:568 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
+#: common/unit.c:571 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
msgid "Goto"
msgstr "Gå til"
-#: common/unit.c:570
+#: common/unit.c:573
msgid "Explore"
msgstr "Utforske"
-#: common/unit.c:572 manual/civmanual.c:224
+#: common/unit.c:575 manual/civmanual.c:224
msgid "Transform"
msgstr "Endre"
-#: common/unit.c:584 client/text.c:157 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:587 client/text.c:157 client/gui-sdl/citydlg.c:1972
#: client/gui-win32/citydlg.c:1257 client/gui-xaw/citydlg.c:1423
msgid "Unknown"
msgstr "Ukjent"
-#: common/unit.c:1022
+#: common/unit.c:1025
msgid "Moves"
msgstr "Flytt"
-#: common/unit.c:1571
+#: common/unit.c:1574
#, c-format
msgid ""
"Upgrade %s to %s for %d gold?\n"
@@ -758,12 +759,12 @@ msgstr ""
"Oppgrader %s til %s for %d gull?\n"
"Skattkammeret har %d gull."
-#: common/unit.c:1579
+#: common/unit.c:1582
#, c-format
msgid "Sorry, cannot upgrade %s (yet)."
msgstr "Beklager, kan ikke oppgradere %s (enda)."
-#: common/unit.c:1585
+#: common/unit.c:1588
#, c-format
msgid ""
"Upgrading %s to %s costs %d gold.\n"
@@ -772,11 +773,11 @@ msgstr ""
"Å oppgradere %s til %s koster %d gull.\n"
"Skattkammeret har %d gold."
-#: common/unit.c:1594
+#: common/unit.c:1597
msgid "You can only upgrade units in your cities."
msgstr "Du kan kun oppgradere enheter i dine byer."
-#: common/unit.c:1598
+#: common/unit.c:1601
#, c-format
msgid "Upgrading this %s would strand units it transports."
msgstr "Oppgradering av %s vil landsette enheter den transporterer."
@@ -813,11 +814,11 @@ msgstr "Atombombe"
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1404
+#: common/unittype.c:349 client/helpdata.c:1412
msgid " and "
msgstr " og "
-#: common/unittype.c:355 client/helpdata.c:1390
+#: common/unittype.c:355 client/helpdata.c:1398
msgid "?and:, "
msgstr "?og:, "
@@ -987,69 +988,69 @@ msgstr "Mangler argument for \"%s\".\n"
msgid "Missing argument for \"%s\".\n"
msgstr "Mangler argument for \"%s\".\n"
-#: utility/shared.c:501
+#: utility/shared.c:514
#, c-format
msgid "%d BC"
msgstr "%d f.Kr"
-#: utility/shared.c:503
+#: utility/shared.c:516
#, c-format
msgid "%d AD"
msgstr "%d e.Kr"
-#: utility/shared.c:924
+#: utility/shared.c:937
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:1028
+#: utility/shared.c:1041
#, c-format
msgid "Could not read data directory %s: %s."
msgstr "Klarte ikke å lese fra datakatalogen %s: %s."
-#: utility/shared.c:1279
+#: utility/shared.c:1292
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:1281
+#: utility/shared.c:1294
#, c-format
msgid "Current data path is: \"%s\""
msgstr "Nåværende datasti er: \"%s\""
-#: utility/shared.c:1283
+#: utility/shared.c:1296
#, c-format
msgid "The \"%s\" file is required ... aborting!"
msgstr "Den nødvendige filen \"%s\" mangler... avslutter!"
-#: utility/shared.c:1460
+#: utility/shared.c:1485
#, 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:1462
+#: utility/shared.c:1487
msgid "Use a non-privileged account instead.\n"
msgstr "Bruk en ikke-priviligert konto istedet.\n"
-#: utility/shared.c:1478
+#: utility/shared.c:1503
msgid "exact match"
msgstr "eksakt treff"
-#: utility/shared.c:1479
+#: utility/shared.c:1504
msgid "only match"
msgstr "eneste treff"
-#: utility/shared.c:1480
+#: utility/shared.c:1505
msgid "ambiguous"
msgstr "uklar"
-#: utility/shared.c:1481
+#: utility/shared.c:1506
msgid "empty"
msgstr "tom"
-#: utility/shared.c:1482
+#: utility/shared.c:1507
msgid "too long"
msgstr "for lang"
-#: utility/shared.c:1483
+#: utility/shared.c:1508
msgid "non-match"
msgstr "ikke treff"
@@ -1078,91 +1079,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:280
+#: ai/advdiplomacy.c:300
#, 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:290
+#: ai/advdiplomacy.c:310
#, 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:303
+#: ai/advdiplomacy.c:322
#, 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:308
+#: ai/advdiplomacy.c:327
#, 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:331
+#: ai/advdiplomacy.c:350
#, 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:424
+#: ai/advdiplomacy.c:443
#, c-format
msgid "*%s (AI)* I do not know the city you mention."
msgstr ""
-#: ai/advdiplomacy.c:454
+#: ai/advdiplomacy.c:473
#, 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:560
+#: ai/advdiplomacy.c:579
#, c-format
msgid "*%s (AI)* This deal was not very good for us, %s!"
msgstr ""
-#: ai/advdiplomacy.c:582
+#: ai/advdiplomacy.c:601
#, c-format
msgid "*%s (AI)* Welcome into our alliance %s!"
msgstr "*%s (AI)* Velkommen til vår allianse %s!"
-#: ai/advdiplomacy.c:586
+#: ai/advdiplomacy.c:605
#, 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:593
+#: ai/advdiplomacy.c:612
#, c-format
msgid "*%s (AI)* Yes, peace in our time!"
msgstr "*%s (AI)* Ja, fred i vår tid!"
-#: ai/advdiplomacy.c:598
+#: ai/advdiplomacy.c:617
#, fuzzy, c-format
msgid "*%s (AI)* Agreed. No more hostilities, %s."
msgstr "*%s (AI)* Avtale. Ingen flere fiendtligheter, %s"
-#: ai/advdiplomacy.c:813
+#: ai/advdiplomacy.c:832
#, c-format
msgid ""
"*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
"other better?"
msgstr ""
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1116
#, fuzzy, c-format
msgid "*%s (AI)* Space will never be yours. "
msgstr "*%s (AI)* Ja, fred i vår tid!"
-#: ai/advdiplomacy.c:1102
+#: ai/advdiplomacy.c:1121
#, c-format
msgid "*%s (AI)* I have tolerated your vicious antics long enough! To war!"
msgstr ""
-#: ai/advdiplomacy.c:1108
+#: ai/advdiplomacy.c:1127
#, fuzzy, c-format
msgid "*%s (AI)* Peace in ... some other time."
msgstr "*%s (AI)* Fred i .... en annen gang"
-#: ai/advdiplomacy.c:1113
+#: ai/advdiplomacy.c:1132
#, c-format
msgid ""
"*%s (AI)* Finally I get around to you! Did you really think you could get "
@@ -1171,17 +1172,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:1119
+#: ai/advdiplomacy.c:1138
#, c-format
msgid "*%s (AI)* Your covert hostilities brought this war upon you!"
msgstr ""
-#: ai/advdiplomacy.c:1126
+#: ai/advdiplomacy.c:1145
#, 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:1209
+#: ai/advdiplomacy.c:1229
#, c-format
msgid ""
"*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1192,14 +1193,14 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1219
+#: ai/advdiplomacy.c:1239
#, c-format
msgid ""
"*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
"alliance!"
msgstr ""
-#: ai/advdiplomacy.c:1225
+#: ai/advdiplomacy.c:1245
#, c-format
msgid ""
"*%s (AI)* %s has grossly violated his treaties with us for own gain. We "
@@ -1212,7 +1213,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1238
+#: ai/advdiplomacy.c:1258
#, c-format
msgid ""
"*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1223,13 +1224,13 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1246
+#: ai/advdiplomacy.c:1266
#, c-format
msgid ""
"*%s (AI)* If you want a piece of the loot, feel free to join in the action!"
msgstr ""
-#: ai/advdiplomacy.c:1251
+#: ai/advdiplomacy.c:1271
#, c-format
msgid ""
"*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1240,12 +1241,12 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1261
+#: ai/advdiplomacy.c:1281
#, c-format
msgid "*%s (AI)* As our glorious allies, we expect your help in this war."
msgstr ""
-#: ai/advdiplomacy.c:1267
+#: ai/advdiplomacy.c:1287
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance and declare war on %s in %d turn. "
@@ -1256,7 +1257,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1276
+#: ai/advdiplomacy.c:1296
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1267,7 +1268,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1344
+#: ai/advdiplomacy.c:1364
#, c-format
msgid ""
"*%s (AI)* Your attempt to conquer space for yourself alone betray your true "
@@ -1276,7 +1277,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:1359
+#: ai/advdiplomacy.c:1379
#, c-format
msgid ""
"*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
@@ -1284,7 +1285,7 @@ msgid ""
msgstr ""
"*%s (AI)* Ditt forsøk på å alene dominere verdensrommet er meget truende."
-#: ai/advdiplomacy.c:1362
+#: ai/advdiplomacy.c:1382
#, c-format
msgid ""
"*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
@@ -1293,12 +1294,12 @@ msgstr ""
"*%s (AI)* Dersom du ikke slutter å bygge ditt romskip, kan jeg måtte ta "
"aksjon!"
-#: ai/advdiplomacy.c:1474
+#: ai/advdiplomacy.c:1494
#, 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:1549
+#: ai/advdiplomacy.c:1569
#, fuzzy, c-format
msgid ""
"*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
@@ -1307,7 +1308,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:1555
+#: ai/advdiplomacy.c:1575
#, c-format
msgid ""
"*%s (AI)* Greetings ally, I see you have not yet made war with our enemy, %"
@@ -1316,7 +1317,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:1562
+#: ai/advdiplomacy.c:1582
#, fuzzy, c-format
msgid ""
"*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1327,19 +1328,19 @@ msgstr ""
"fredsavtalen med vår fiende, %s! Dette er uakseptabelt, derfor oppløser jeg "
"vår allianse!"
-#: ai/advdiplomacy.c:1592
+#: ai/advdiplomacy.c:1612
#, 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:1607
+#: ai/advdiplomacy.c:1627
#, 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:1622
+#: ai/advdiplomacy.c:1642
#, fuzzy, c-format
msgid ""
"*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
@@ -1347,7 +1348,7 @@ msgid ""
msgstr ""
"*%s (AI)* %s truer oss begge, skal vi foreslå at fiendtlighetene opphører?"
-#: ai/advdiplomacy.c:1742
+#: ai/advdiplomacy.c:1762
#, c-format
msgid ""
"*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1497,18 +1498,18 @@ msgstr ""
"Passordet må ha minst %d store bokstaver, %d tall, og være minst %d "
"[skrivbare] bokstaver langt. Prøv igjen."
-#: server/barbarian.c:183
+#: server/barbarian.c:184
#, fuzzy, c-format
msgid "%s gain a leader by the name %s. Dangerous times may lie ahead."
msgstr ""
"Barbarene får en leder med navnet %s. Det kan bli farlige tider fremover."
-#: server/barbarian.c:479
+#: server/barbarian.c:480
#, c-format
msgid "Native unrest near %s led by %s."
msgstr "Uroligheter nær %s, ledet av %s."
-#: server/barbarian.c:484
+#: server/barbarian.c:485
#, c-format
msgid "Sea raiders seen near %s!"
msgstr "Pirater sett nær %s!"
@@ -1890,7 +1891,7 @@ msgstr[0] ""
msgstr[1] ""
"%s gir kjempeøkning av forskningen; du får %d umiddelbare fremskritt."
-#: server/cityturn.c:1158 server/techtools.c:176
+#: server/cityturn.c:1158 server/techtools.c:172
#, c-format
msgid "The %s have acquired %s from %s."
msgstr "%s har skaffet %s fra %s."
@@ -1973,22 +1974,22 @@ msgid "Warning: the %s option is obsolete. Use -m to enable the metaserver.\n"
msgstr ""
"Advarsel: alternativet %s er foreldet. Bruk -m for å benytte metaserveren.\n"
-#: server/civserver.c:189
+#: server/civserver.c:193
#, c-format
msgid "Error: unknown option '%s'\n"
msgstr "Feil: ukjent alternativ '%s'\n"
-#: server/civserver.c:200
+#: server/civserver.c:204
#, c-format
msgid "This is the server for %s"
msgstr "Dette er tjeneren for %s"
-#: server/civserver.c:201
+#: server/civserver.c:205
#, c-format
msgid "You can learn a lot about Freeciv at %s"
msgstr "Mer informasjon om Freeciv finnes på %s"
-#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
+#: server/civserver.c:210 client/civclient.c:239 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -1997,111 +1998,116 @@ msgstr ""
"Bruk: %s [alternativ ...]\n"
"Gyldige alternativ er:\n"
-#: server/civserver.c:208
+#: server/civserver.c:212
#, fuzzy
msgid ""
" -a --auth FILE\tEnable server authentication with configuration from "
"FILE.\n"
msgstr " -a --auth\t\tBenytte tjenerautentisering.\n"
-#: server/civserver.c:210
+#: server/civserver.c:214
msgid " -G --Guests\t\tAllow guests to login if auth is enabled.\n"
msgstr ""
" -G --Guests\t\tTillate gjester å logge inn hvis autentisering blir "
"brukt.\n"
-#: server/civserver.c:212
+#: server/civserver.c:216
msgid " -N --Newusers\tAllow new users to login if auth is enabled.\n"
msgstr ""
" -N --Newusers\tTillate nye brukere å logge inn hvis autentisering blir "
"brukt.\n"
-#: server/civserver.c:215
+#: server/civserver.c:219
msgid " -b --bind ADDR\tListen for clients on ADDR\n"
msgstr " -b --bind ADDR\tLytte etter klienter på ADDR\n"
-#: server/civserver.c:217 client/civclient.c:242
+#: server/civserver.c:221 client/civclient.c:243
msgid ""
" -d, --debug NUM\tSet debug log level (0 to 4, or 4:file1,min,max:...)\n"
msgstr ""
" -d, --debug NUM\tSett debuggings-loggnivå (0-4, eller 4:fil1,min,max:...)\n"
-#: server/civserver.c:221 client/civclient.c:246
+#: server/civserver.c:225 client/civclient.c:247
msgid " -d, --debug NUM\tSet debug log level (0 to 3)\n"
msgstr " -d, --debug NUM\tSett debug-loggnivå (0 til 3)\n"
-#: server/civserver.c:223
+#: server/civserver.c:227
msgid " -f, --file FILE\tLoad saved game FILE\n"
msgstr " -f, --file FILE\tLast inn lagret spill FILE\n"
-#: server/civserver.c:225 client/civclient.c:249 manual/civmanual.c:382
+#: server/civserver.c:229 client/civclient.c:250 manual/civmanual.c:382
msgid " -h, --help\t\tPrint a summary of the options\n"
msgstr " -h, --help\t\tSkriv ut sammendrag av alternativene\n"
-#: server/civserver.c:226
+#: server/civserver.c:230
+#, fuzzy
+msgid " -i, --identity ADDR\tBe known as ADDR at metaserver\n"
+msgstr " -M, --Metaserver ADDR Sett adressen for Metaserveren.\n"
+
+#: server/civserver.c:231
msgid " -l, --log FILE\tUse FILE as logfile\n"
msgstr " -l, --log FILE\tBruk FILE som loggfil.\n"
-#: server/civserver.c:227
+#: server/civserver.c:232
msgid " -m, --meta\t\tNotify metaserver and send server's info\n"
msgstr " -m, --meta\t\tInformer metaserveren og send tjenerens info\n"
-#: server/civserver.c:229
+#: server/civserver.c:234
msgid " -M, --Metaserver ADDR\tSet ADDR as metaserver address\n"
msgstr " -M, --Metaserver ADDR Sett adressen for Metaserveren.\n"
-#: server/civserver.c:232
+#: server/civserver.c:237
msgid " -p, --port PORT\tListen for clients on port PORT\n"
msgstr " -p, --port PORT\tKoble til PORT.\n"
-#: server/civserver.c:234
+#: server/civserver.c:239
msgid " -q, --quitidle TIME\tQuit if no players for TIME seconds\n"
msgstr ""
" -q, --quitidle TIME Avslutt hvis ingen spillere innen TIME sekunder\n"
-#: server/civserver.c:236
+#: server/civserver.c:241
msgid " -e, --exit-on-end\tWhen a game ends, exit instead of restarting\n"
msgstr ""
" -e, --exit-on-end\tAvslutte spillet i stedet for å starte det på nytt når "
"spillet er over.\n"
-#: server/civserver.c:239
+#: server/civserver.c:244
msgid " -s, --saves DIR\tSave games to directory DIR\n"
msgstr " -s, --saves DIR\tLagre spill til katalogen DIR\n"
-#: server/civserver.c:241
+#: server/civserver.c:246
msgid " -S, --Serverid ID\tSets the server id to ID\n"
msgstr " -S, --Serverid ID\tSetter tjenerens id til ID\n"
-#: server/civserver.c:243
+#: server/civserver.c:248
msgid " -P, --Ppm\t\tSave ppms of the map when saving the game.\n"
msgstr ""
-#: server/civserver.c:244
+#: server/civserver.c:249
msgid " -r, --read FILE\tRead startup script FILE\n"
msgstr " -r, --read FILE\tLes oppstartsmanus i FILE\n"
-#: server/civserver.c:246
+#: server/civserver.c:251
#, fuzzy
msgid " -R, --Ranklog FILE\tUse FILE as ranking logfile\n"
msgstr " -l, --log FILE\tBruk FILE som loggfil.\n"
-#: server/civserver.c:247 client/civclient.c:268 manual/civmanual.c:383
+#: server/civserver.c:252 client/civclient.c:269 manual/civmanual.c:383
msgid " -v, --version\t\tPrint the version number\n"
msgstr " -v, --version\t\tSkriv ut versjonsnummeret\n"
-#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
+#: server/civserver.c:253 client/gui-gtk-2.0/gui_main.c:354
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, fuzzy, c-format
msgid "Report bugs at %s.\n"
msgstr "Rapporter feil, unoter og/eller 'bugs' til <%s>.\n"
-#: server/commands.c:28
+#: server/commands.c:29
msgid "Start the game, or restart after loading a savegame."
msgstr "Start spillet, eller start på nytt etter å ha lastet inn lagret spill."
-#: server/commands.c:29
+#: server/commands.c:30
msgid ""
"This command starts the game. When starting a new game, it should be used "
"after all human players have connected, and AI players have been created (if "
@@ -2119,7 +2125,7 @@ msgstr ""
"lenger tilgjengelig."
#. TRANS: translate text between <> only
-#: server/commands.c:42
+#: server/commands.c:44
msgid ""
"help\n"
"help commands\n"
@@ -2133,11 +2139,11 @@ msgstr ""
"help <kommandonavn>\n"
"help <alternativsnavn>"
-#: server/commands.c:47
+#: server/commands.c:49
msgid "Show help about server commands and server options."
msgstr "Vis hjelp for tjenerkommandoer og tjeneralternativ."
-#: server/commands.c:48
+#: server/commands.c:50
msgid ""
"With no arguments gives some introductory help. With argument \"commands\" "
"or \"options\" gives respectively a list of all commands or all options. "
@@ -2154,12 +2160,12 @@ msgstr ""
"standardverdien. Forkortelser for argument kan benyttes dersom det ikke er "
"tvetydig."
-#: server/commands.c:63
+#: server/commands.c:66
#, fuzzy
msgid "Show a list of players, teams, connections, or scenarios."
msgstr "Vis en liste over spillerne eller forbindelsene."
-#: server/commands.c:64
+#: server/commands.c:67
#, fuzzy
msgid ""
"Show a list of players in the game, teams of players, connections to the "
@@ -2169,20 +2175,20 @@ msgstr ""
"Viser en liste over spillere, eller en liste over forbindelser til tjeneren. "
"Argumentet kan forkortes, og er \"players\" som standard dersom det mangler."
-#: server/commands.c:70
+#: server/commands.c:74
msgid "Quit the game and shutdown the server."
msgstr "Forlat spillet og avslutt tjeneren."
#. TRANS: translate text between <> only
-#: server/commands.c:74
+#: server/commands.c:79
msgid "cut <connection-name>"
msgstr "cut <forbindelsesnavn>"
-#: server/commands.c:75
+#: server/commands.c:80
msgid "Cut a client's connection to server."
msgstr "Avbryt en klients forbindelse til tjeneren."
-#: server/commands.c:76
+#: server/commands.c:81
msgid ""
"Cut specified client's connection to the server, removing that client from "
"the game. If the game has not yet started that client's player is removed "
@@ -2195,7 +2201,7 @@ msgstr ""
"imot forbindelsesnavn, ikke spillernavn."
#. TRANS: translate text between <> only
-#: server/commands.c:83
+#: server/commands.c:89
msgid ""
"explain\n"
"explain <option-name>"
@@ -2203,11 +2209,11 @@ msgstr ""
"explain\n"
"explain <alternativ-navn>"
-#: server/commands.c:85
+#: server/commands.c:91
msgid "Explain server options."
msgstr "Forklar tjeneralternativ."
-#: server/commands.c:86
+#: server/commands.c:92
msgid ""
"The 'explain' command gives a subset of the functionality of 'help', and is "
"included for backward compatibility. With no arguments it gives a list of "
@@ -2220,7 +2226,7 @@ msgstr ""
"en valgmulighet (som \"help <alternativsnavn>\")."
#. TRANS: translate text between <> only
-#: server/commands.c:93
+#: server/commands.c:100
msgid ""
"show\n"
"show <option-name>\n"
@@ -2230,11 +2236,11 @@ msgstr ""
"show <alternativsnavn>\n"
"show <alternativsprefiks>"
-#: server/commands.c:96
+#: server/commands.c:103
msgid "Show server options."
msgstr "Vis tjeneralternativ."
-#: server/commands.c:97
+#: server/commands.c:104
msgid ""
"With no arguments, shows all server options (or available options, when used "
"by clients). With an argument, show only the named option, or options with "
@@ -2244,36 +2250,37 @@ msgstr ""
"alternativene, når den er benyttet av klientene). Med et argument, vises kun "
"de valgte alternativene, eller alternativ med det prefikset."
-#: server/commands.c:102
+#: server/commands.c:110
msgid "wall <message>"
msgstr "wall <beskjed>"
-#: server/commands.c:103
+#: server/commands.c:111
msgid "Send message to all connections."
msgstr "Sender meldingen til alle klientene."
-#: server/commands.c:104
+#: server/commands.c:112
msgid ""
"For each connected client, pops up a window showing the message entered."
msgstr "For hver klient, vises et vindu med den angitte meldingen."
-#: server/commands.c:108
+#: server/commands.c:117
msgid "vote yes|no [vote number]"
msgstr "vote yes|no [valgnummer]"
-#: server/commands.c:109
+#: server/commands.c:118
msgid "Cast a vote."
msgstr "Stemme."
-#: server/commands.c:111
+#: server/commands.c:120
#, 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."
+"A player with basic 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."
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 "
@@ -2284,18 +2291,18 @@ msgstr ""
"Dersom en hel runde går uten at noen stemmer mot et valg, så blir det "
"vedtatt automatisk."
-#: server/commands.c:121
+#: server/commands.c:131
#, 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:123
+#: server/commands.c:133
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:124
+#: server/commands.c:134
msgid ""
"Print AI debug information about given entity and turn continous debugging "
"output for this entity on or off."
@@ -2303,23 +2310,23 @@ msgstr ""
"Skriver ut AI debug informasjon om en gitt entitet og skrur av eller på "
"kontinuerlig utskrift av denne entiteten."
-#: server/commands.c:128
+#: server/commands.c:139
msgid "set <option-name> <value>"
msgstr "set <alternativsnavn> <verdi>"
-#: server/commands.c:129
+#: server/commands.c:140
msgid "Set server option."
msgstr "Sett tjeneralternativ."
-#: server/commands.c:132
+#: server/commands.c:144
msgid "team <player> [team]"
msgstr "team <spiller> [lag]"
-#: server/commands.c:133
+#: server/commands.c:145
msgid "Change, add or remove a player's team affiliation."
msgstr "Endre, legg til eller fjerne en spillers lagtilhørighet."
-#: server/commands.c:134
+#: server/commands.c:146
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,15 +2339,15 @@ msgstr ""
"og ambassader, og sloss sammen for å oppnå lagseier med snittet av de "
"individuelle poengsummene."
-#: server/commands.c:141
+#: server/commands.c:154
msgid "rulesetdir <directory>"
msgstr "rulesetdir <katalog>"
-#: server/commands.c:142
+#: server/commands.c:155
msgid "Choose new ruleset directory or modpack."
msgstr "Velg en ny katalog for regeloppsett."
-#: server/commands.c:143
+#: server/commands.c:156
msgid ""
"Choose new ruleset directory or modpack. Calling this\n"
" without any arguments will show you the currently selected ruleset."
@@ -2349,15 +2356,15 @@ msgstr ""
"Å kalle denne uten argument vil vise deg det nåværende regeloppsettet."
#. TRANS: translate text between <> only
-#: server/commands.c:149
+#: server/commands.c:163
msgid "metainfo <meta-line>"
msgstr "metainfo <metalinje>"
-#: server/commands.c:150
+#: server/commands.c:164
msgid "Set metaserver info line."
msgstr "Sett metaserver infolinje."
-#: server/commands.c:151
+#: server/commands.c:165
msgid ""
"Set user defined metaserver info line. If parameter is omitted,\n"
"previously set metamessage will be removed. For most of the time\n"
@@ -2366,19 +2373,19 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:158
+#: server/commands.c:173
msgid "metapatch <meta-line>"
msgstr "metapatch <metalinje>"
-#: server/commands.c:159
+#: server/commands.c:174
msgid "Set metaserver patches line."
msgstr "Sett metaserver endringslinje."
-#: server/commands.c:165
+#: server/commands.c:181
msgid "Control metaserver connection."
msgstr "Kontroller metaserver forbindelse."
-#: server/commands.c:166
+#: server/commands.c:182
msgid ""
"'metaconnection ?' reports on the status of the connection to metaserver.\n"
"'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2391,33 +2398,33 @@ msgstr ""
"metaserveren."
#. TRANS: translate text between <> only
-#: server/commands.c:172
+#: server/commands.c:189
msgid "metaserver <address>"
msgstr "metaserver <addresse>"
-#: server/commands.c:173
+#: server/commands.c:190
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:177
+#: server/commands.c:195
msgid "aitoggle <player-name>"
msgstr "aitoggle <spillernavn>"
-#: server/commands.c:178
+#: server/commands.c:196
msgid "Toggle AI status of player."
msgstr "Bytt spillers AI-status."
#. TRANS: translate text between [] and <> only
-#: server/commands.c:182
+#: server/commands.c:201
msgid "take [connection-name] <player-name>"
msgstr "take [forbindelses-navn] <spillernavn>"
-#: server/commands.c:183
+#: server/commands.c:202
msgid "Take over a player's place in the game."
msgstr "Ta over en spillers plass i spillet."
-#: server/commands.c:184
+#: server/commands.c:203
#, fuzzy
msgid ""
"Only the console and connections with cmdlevel 'hack' can force other "
@@ -2433,15 +2440,15 @@ msgstr ""
"tilkoblet som global observatør."
#. TRANS: translate text between [] only
-#: server/commands.c:192
+#: server/commands.c:212
msgid "observe [connection-name] [player-name]"
msgstr "observe [forbindelses-navn] [spillernavn]"
-#: server/commands.c:193
+#: server/commands.c:213
msgid "Observe a player or the whole game."
msgstr "Observere en spiller eller hele spillet."
-#: server/commands.c:194
+#: server/commands.c:214
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 "
@@ -2456,15 +2463,15 @@ msgstr ""
"tilkoblet som global observatør."
#. TRANS: translate text between <> only
-#: server/commands.c:202
+#: server/commands.c:223
msgid "detach <connection-name>"
msgstr "detach <forbindelsesnavn>"
-#: server/commands.c:203
+#: server/commands.c:224
msgid "detach from a player."
msgstr "Fraskilles fra en spiller."
-#: server/commands.c:204
+#: server/commands.c:225
msgid ""
"Only the console and connections with cmdlevel 'hack' can force other "
"connections to detach from a player."
@@ -2473,20 +2480,20 @@ msgstr ""
"forbindelser til å ta over en spiller. "
#. TRANS: translate text between <> only
-#: server/commands.c:209
+#: server/commands.c:231
msgid "create <player-name>"
msgstr "create <spillernavn>"
-#: server/commands.c:210
+#: server/commands.c:232
msgid "Create an AI player with a given name."
msgstr "Opprett en AI spiller med gitt navn."
-#: server/commands.c:211
+#: server/commands.c:233
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:215
+#: server/commands.c:238
msgid ""
"away\n"
"away"
@@ -2494,16 +2501,16 @@ msgstr ""
"borte\n"
"borte"
-#: server/commands.c:217
+#: server/commands.c:240
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:218
+#: server/commands.c:241
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:222
+#: server/commands.c:246
msgid ""
"novice\n"
"novice <player-name>"
@@ -2511,11 +2518,11 @@ msgstr ""
"novice\n"
"novice <spillernavn>"
-#: server/commands.c:224
+#: server/commands.c:248
msgid "Set one or all AI players to 'novice'."
msgstr "Sett en eller alle AI-spillere til 'novice'."
-#: server/commands.c:225
+#: server/commands.c:249
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 +2534,7 @@ msgstr ""
"vanskelighetsgraden kun for en spiller."
#. TRANS: translate text between <> only
-#: server/commands.c:231
+#: server/commands.c:256
msgid ""
"easy\n"
"easy <player-name>"
@@ -2535,11 +2542,11 @@ msgstr ""
"easy\n"
"easy <spillernavn>"
-#: server/commands.c:233
+#: server/commands.c:258
msgid "Set one or all AI players to 'easy'."
msgstr "Sett en eller alle AI spillere til 'lett'."
-#: server/commands.c:234
+#: server/commands.c:259
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 "
@@ -2551,7 +2558,7 @@ msgstr ""
"vanskelighetsgraden kun for en spiller."
#. TRANS: translate text between <> only
-#: server/commands.c:240
+#: server/commands.c:266
msgid ""
"normal\n"
"normal <player-name>"
@@ -2559,11 +2566,11 @@ msgstr ""
"normal\n"
"normal <spillernavn>"
-#: server/commands.c:242
+#: server/commands.c:268
msgid "Set one or all AI players to 'normal'."
msgstr "Sett en eller alle AI-spillere til 'normal'."
-#: server/commands.c:243
+#: server/commands.c:269
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 "
@@ -2575,7 +2582,7 @@ msgstr ""
"kommandoen vanskelighetsgraden kun for en spiller."
#. TRANS: translate text between <> only
-#: server/commands.c:249
+#: server/commands.c:276
msgid ""
"hard\n"
"hard <player-name>"
@@ -2583,11 +2590,11 @@ msgstr ""
"hard\n"
"hard <spillernavn>"
-#: server/commands.c:251
+#: server/commands.c:278
msgid "Set one or all AI players to 'hard'."
msgstr "Sett en eller alle AI spillere til å være vanskelig (hard)."
-#: server/commands.c:252
+#: server/commands.c:279
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 +2606,7 @@ msgstr ""
"vanskelighetsgraden kun for en spiller."
#. TRANS: translate text between <> only
-#: server/commands.c:258
+#: server/commands.c:286
msgid ""
"experimental\n"
"experimental <player-name>"
@@ -2607,11 +2614,11 @@ msgstr ""
"experimental\n"
"experimental <spiller-navn>"
-#: server/commands.c:260
+#: server/commands.c:288
msgid "Set one or all AI players to 'experimental'."
msgstr "Setter en eller alle AI spillerne til 'experimental'."
-#: server/commands.c:261
+#: server/commands.c:289
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 "
@@ -2626,7 +2633,7 @@ msgstr ""
"ingen effekt."
#. TRANS: translate text between <> only
-#: server/commands.c:269
+#: server/commands.c:298
msgid ""
"cmdlevel\n"
"cmdlevel <level>\n"
@@ -2640,18 +2647,20 @@ msgstr ""
"cmdlevel <nivå> first\n"
"cmdlevel <nivå> <forbindelsesnavn>"
-#: server/commands.c:274
+#: server/commands.c:303
msgid "Query or set command access level access."
msgstr "Be om eller sett kommando tilgangsnivå."
-#: server/commands.c:275
+#: server/commands.c:304
#, fuzzy
msgid ""
"The command access level controls which server commands are available\n"
"to users via the client chatline. The available levels are:\n"
" none - no commands\n"
-" info - informational commands only\n"
+" info - informational or observer commands only\n"
+" basic - commands available to players in the game\n"
" ctrl - commands that affect the game and users\n"
+" admin - commands that affect server operation\n"
" hack - *all* commands - dangerous!\n"
"With no arguments, the current command access levels are reported.\n"
"With a single argument, the level is set for all existing connections,\n"
@@ -2684,20 +2693,20 @@ msgstr ""
"kan koble til med det samme navnet. Legg merke til at denne kommandoen nå "
"tar imot forbindelsesnavn, ikke spillernavn."
-#: server/commands.c:296
+#: server/commands.c:328
msgid "If there is none, become the game organizer with increased permissions."
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:301
+#: server/commands.c:334
msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
msgstr "timeoutincrease <runde> <rundetillegg> <verdi> <faktor>"
-#: server/commands.c:302
+#: server/commands.c:335
msgid "See \"help timeoutincrease\"."
msgstr "Se \"help timeoutincrease\"."
-#: server/commands.c:303
+#: server/commands.c:336
msgid ""
"Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
"<turn> and multiply <value> by <valuemult>. Use this command in concert "
@@ -2711,42 +2720,61 @@ msgstr ""
"Bruk denne kommandoen sammen med \"timeout\". Standardverdiene er 0 0 0 1."
#. TRANS: translate text between <> only
-#: server/commands.c:309
+#: server/commands.c:343
+msgid ""
+"cancelvote\n"
+"cancelvote <vote number>\n"
+"cancelvote all\n"
+msgstr ""
+
+#: server/commands.c:346
+msgid "Cancel a running vote.\n"
+msgstr ""
+
+#: server/commands.c:347
+msgid ""
+"With no arguments this command removes your own vote. If you have an admin "
+"access level, you can cancel any vote by vote number, or all votes with the "
+"'all' argument."
+msgstr ""
+
+#. TRANS: translate text between <> only
+#: server/commands.c:354
#, fuzzy
msgid "endgame"
msgstr "Endre navn"
-#: server/commands.c:310
+#: server/commands.c:355
#, fuzzy
msgid "End the game immediately in a draw."
msgstr "Spillet endte uavgjordt"
#. TRANS: translate text between <> only
-#: server/commands.c:314
+#: server/commands.c:360
msgid "surrender"
msgstr ""
-#: server/commands.c:315
+#: server/commands.c:361
#, fuzzy
msgid "Concede the game."
msgstr "Klarte ikke laste inn lagret spill."
-#: server/commands.c:316
+#: server/commands.c:362
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:322
+#: server/commands.c:369
msgid "remove <player-name>"
msgstr "remove <spillernavn>"
-#: server/commands.c:323
+#: server/commands.c:370
msgid "Fully remove player from game."
msgstr "Fjern spilleren fullstendig fra spillet."
-#: server/commands.c:324
+#: server/commands.c:371
msgid ""
"This *completely* removes a player from the game, including all cities and "
"units etc. Use with care!"
@@ -2755,7 +2783,7 @@ msgstr ""
"enheter. Brukes med måte!"
#. TRANS: translate text between <> only
-#: server/commands.c:329
+#: server/commands.c:377
msgid ""
"save\n"
"save <file-name>"
@@ -2763,11 +2791,11 @@ msgstr ""
"save\n"
"save <filnavn>"
-#: server/commands.c:331
+#: server/commands.c:379
msgid "Save game to file."
msgstr "Lagre spill til fil."
-#: server/commands.c:332
+#: server/commands.c:380
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"
@@ -2784,7 +2812,7 @@ msgstr ""
"og bruk 'start' kommandoen når alle spillerne har koblet til på nytt."
#. TRANS: translate text between <> only
-#: server/commands.c:341
+#: server/commands.c:390
msgid ""
"load\n"
"load <file-name>"
@@ -2792,11 +2820,11 @@ msgstr ""
"load\n"
"load <filnavn>"
-#: server/commands.c:343
+#: server/commands.c:392
msgid "Load game from file."
msgstr "Fortsette et spill fra fil."
-#: server/commands.c:344
+#: server/commands.c:393
msgid ""
"Load a game from <file-name>. Any current data including players, rulesets "
"and server options are lost.\n"
@@ -2805,121 +2833,121 @@ msgstr ""
"spillere, regeloppsett og tjeneralternativ vil forsvinne.\n"
#. TRANS: translate text between <> only
-#: server/commands.c:349
+#: server/commands.c:399
msgid "read <file-name>"
msgstr "read <filnavn>"
-#: server/commands.c:350
+#: server/commands.c:400
msgid "Process server commands from file."
msgstr "Utfør tjenerkommandoer fra fil."
#. TRANS: translate text between <> only
-#: server/commands.c:354
+#: server/commands.c:405
msgid "write <file-name>"
msgstr "write <filnavn>"
-#: server/commands.c:355
+#: server/commands.c:406
msgid "Write current settings as server commands to file."
msgstr "Skriv oppsettet som blir brukt nå til en fil som tjenerkommandoer."
-#: server/commands.c:359
+#: server/commands.c:411
msgid "Switch server output between 'RFC-style' and normal style."
msgstr "Endre tjener-utskrifter mellom 'RFC-style' og vanlig."
-#: server/commands.c:363
+#: server/commands.c:416
msgid "Simply returns the id of the server."
msgstr "Returnerer identiteten til tjeneren."
-#: server/connecthand.c:85
+#: server/connecthand.c:109
#, c-format
msgid "Welcome to the %s Server running at %s port %d."
msgstr "Velkommen til tjeneren %s som kjører på %s port nummer %d."
-#: server/connecthand.c:89
+#: server/connecthand.c:113
#, c-format
msgid "Welcome to the %s Server at port %d."
msgstr "Velkommen til tjeneren %s på port nummer %d."
# problem
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:97
+#: server/connecthand.c:121
#, fuzzy, c-format
msgid "(%d) %s: connected [%s]"
msgstr "(%d) %s har koblet til fra %s."
-#: server/connecthand.c:104
+#: server/connecthand.c:128
#, c-format
msgid "Server: %s has connected from %s."
msgstr "Tjener: %s har koblet til fra %s."
-#: server/connecthand.c:145
+#: server/connecthand.c:175
msgid "Couldn't attach your connection to new player."
msgstr "Kunne ikke binde din forbindelse til en ny spiller."
-#: server/connecthand.c:165
+#: server/connecthand.c:199
#, c-format
msgid "You are logged in as '%s' connected to no player."
msgstr "Du er logget inn som '%s', men ikke forbundet til en spiller."
-#: server/connecthand.c:169
+#: server/connecthand.c:203
#, c-format
msgid "You are logged in as '%s' connected to an anonymous player."
msgstr "Du er logget inn som '%s', forbundet til en anonym spiller."
-#: server/connecthand.c:174
+#: server/connecthand.c:208
#, c-format
msgid "You are logged in as '%s' connected to %s."
msgstr "Du er logget inn som '%s' forbundet til %s."
-#: server/connecthand.c:187
+#: server/connecthand.c:221
#, c-format
msgid "Turn-blocking game play: waiting on %s to finish turn..."
msgstr "Rundeblokkerende spill: venter på %s til å avslutte sin runde..."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:240
+#: server/connecthand.c:274
#, fuzzy, c-format
msgid "(%d) %s: connection request [%s]"
msgstr "(%d) Forespørsel om forbindelse fra %s fra %s."
-#: server/connecthand.c:266
+#: server/connecthand.c:300
#, fuzzy
msgid "The client is missing a capability that this server needs."
msgstr "Klienten mangler en egenskap som denne serveren trenger."
-#: server/connecthand.c:268 server/connecthand.c:279
+#: server/connecthand.c:302 server/connecthand.c:313
#, fuzzy, c-format
msgid "(%d) %s rejected: mismatched capabilities!"
msgstr "(%d) %s ble vist bort. Manglet egenskaper."
-#: server/connecthand.c:277
+#: server/connecthand.c:311
#, fuzzy
msgid "This server is missing a capability that the client needs."
msgstr "Tjener mangler en egenskap som denne klienten trenger."
-#: server/connecthand.c:290
+#: server/connecthand.c:324
#, fuzzy
msgid "The username is invalid!"
msgstr "Ugyldig brukernavn"
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:292
+#: server/connecthand.c:326
#, fuzzy, c-format
msgid "(%d) %s rejected: invalid username [%s]"
msgstr "(%d) %s ble vist bort. Manglet egenskaper [%s]"
-#: server/connecthand.c:303
+#: server/connecthand.c:337
#, fuzzy
msgid "Your username is already connected!"
msgstr "er allerede tilkoblet."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:305
+#: server/connecthand.c:339
#, fuzzy, c-format
msgid "(%d) %s rejected: duplicate username [%s]"
msgstr "(%d) %s ble vist bort. Manglet egenskaper [%s]"
-#: server/connecthand.c:335 server/connecthand.c:344
+#: server/connecthand.c:369 server/connecthand.c:378
#, c-format
msgid "Lost connection: %s."
msgstr "Mistet forbindelse: %s."
@@ -2936,113 +2964,113 @@ msgstr "Ok. Standard stil valgt."
msgid "For introductory help, type 'help'."
msgstr "For en introduksjon til spillet, skriv 'help'."
-#: server/diplhand.c:164
+#: server/diplhand.c:167
#, c-format
msgid "The %s can't accept %s."
msgstr "%s kan ikke akseptere %s."
-#: server/diplhand.c:176
+#: server/diplhand.c:179
#, c-format
msgid "You don't have tech %s, you can't accept treaty."
msgstr "Du har ikke teknologien %s, du kan ikke akseptere avtalen."
-#: server/diplhand.c:185
+#: server/diplhand.c:188
msgid "City you are trying to give no longer exists, you can't accept treaty."
msgstr ""
"Byen du forsøker å gi bort eksisterer ikke lengre, du kan ikke akseptere "
"avtalen."
-#: server/diplhand.c:191
+#: server/diplhand.c:194
#, c-format
msgid "You are not owner of %s, you can't accept treaty."
msgstr "Du er ikke eier av %s, du kan ikke akseptere avtalen."
-#: server/diplhand.c:197 server/diplhand.c:301
+#: server/diplhand.c:200 server/diplhand.c:304
#, c-format
msgid "Your capital (%s) is requested, you can't accept treaty."
msgstr "Din hovedstad (%s) er forlangt, du kan ikke akseptere avtalen."
-#: server/diplhand.c:224
+#: server/diplhand.c:227
msgid "You don't have enough gold, you can't accept treaty."
msgstr "Du har ikke nok gull, kan ikke akseptere avtalen."
# c-format
-#: server/diplhand.c:256 server/diplhand.c:261
+#: server/diplhand.c:259 server/diplhand.c:264
#, c-format
msgid "A treaty containing %d clause was agreed upon."
msgid_plural "A treaty containing %d clauses was agreed upon."
msgstr[0] "Det ble enighet om en avtale som inneholdt %d punkt."
msgstr[1] "Det ble enighet om en avtale som inneholdt %d punkt."
-#: server/diplhand.c:277 server/diplhand.c:281
+#: server/diplhand.c:280 server/diplhand.c:284
#, fuzzy, c-format
msgid "One of the cities the %s are giving away is destroyed! Treaty canceled!"
msgstr "En av byene %s gir bort er rasert! Avtale brutt!"
-#: server/diplhand.c:288 server/diplhand.c:293
+#: server/diplhand.c:291 server/diplhand.c:296
#, c-format
msgid "The %s no longer control %s! Treaty canceled!"
msgstr "%s kontrollerer ikke lengre %s! Avtalen brutt!"
-#: server/diplhand.c:331 server/diplhand.c:335
+#: server/diplhand.c:334 server/diplhand.c:338
#, c-format
msgid "The %s don't have the promised amount of gold! Treaty canceled!"
msgstr "%s har ikke så mye gull som de lovet! Avtalen kansellert!"
-#: server/diplhand.c:364
+#: server/diplhand.c:367
#, c-format
msgid "You gave an embassy to %s."
msgstr "Du gav en ambassade til %s."
-#: server/diplhand.c:367
+#: server/diplhand.c:370
#, c-format
msgid "%s allowed you to create an embassy!"
msgstr "%s lot deg opprette en ambassade!"
-#: server/diplhand.c:383
+#: server/diplhand.c:386
#, c-format
msgid "You are taught the knowledge of %s."
msgstr "Du får kunnskap om %s."
-#: server/diplhand.c:387
+#: server/diplhand.c:390
#, c-format
msgid "The %s have acquired %s from the %s."
msgstr "%s har skaffet %s fra %s."
-#: server/diplhand.c:402
+#: server/diplhand.c:405
#, c-format
msgid "You get %d gold."
msgstr "Du får %d gull."
#. TRANS: ... Polish worldmap.
-#: server/diplhand.c:410
+#: server/diplhand.c:413
#, fuzzy, c-format
msgid "You receive the %s worldmap."
msgstr "Du får %ss verdenskart."
#. TRANS: ... Polish seamap.
-#: server/diplhand.c:419
+#: server/diplhand.c:422
#, fuzzy, c-format
msgid "You receive the %s seamap."
msgstr "Du får %ss sjøkart."
-#: server/diplhand.c:436
+#: server/diplhand.c:439
#, c-format
msgid "You receive city of %s from %s."
msgstr "Du får byen %s av %s."
-#: server/diplhand.c:441
+#: server/diplhand.c:444
#, c-format
msgid "You give city of %s to %s."
msgstr "Du gir bort byen %s til %s."
-#: server/diplhand.c:454 server/diplhand.c:457
+#: server/diplhand.c:457 server/diplhand.c:460
#, c-format
msgid "You agree on a cease-fire with %s."
msgstr "Du blir enig om våpenhvile med %s."
#. TRANS: ... the Poles ... Polish territory.
-#: server/diplhand.c:476 server/diplhand.c:488
+#: server/diplhand.c:479 server/diplhand.c:491
#, c-format
msgid ""
"You agree on an armistice with the %s. In %d turn, it will become a peace "
@@ -3053,32 +3081,32 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: server/diplhand.c:512 server/diplhand.c:515
+#: server/diplhand.c:515 server/diplhand.c:518
#, c-format
msgid "You agree on an alliance with %s."
msgstr "Du inngår allianse med %s."
-#: server/diplhand.c:524
+#: server/diplhand.c:527
#, c-format
msgid "You give shared vision to %s."
msgstr "Du gir delt utsyn til %s."
-#: server/diplhand.c:527
+#: server/diplhand.c:530
#, c-format
msgid "%s gives you shared vision."
msgstr "%s gir deg delt utsyn."
-#: server/diplhand.c:663
+#: server/diplhand.c:666
#, c-format
msgid "%s canceled the meeting!"
msgstr "%s avbrøt møtet!"
-#: server/diplhand.c:670
+#: server/diplhand.c:673
#, c-format
msgid "Meeting with %s canceled."
msgstr "Møtet med %s avlyst."
-#: server/diplhand.c:712
+#: server/diplhand.c:715
msgid "Your diplomatic envoy was decapitated!"
msgstr "Din diplomatiske utsending ble halshugget!"
@@ -3264,84 +3292,84 @@ msgid "The %s destroyed the %s in %s."
msgstr "%s ødela %s i %s."
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1091
+#: server/diplomats.c:1097
#, fuzzy, c-format
msgid "An enemy %s has been eliminated by your %s."
msgstr "En fiendtlig %s har blitt eliminert da den forsvarte %s."
#. TRANS: <unit> ... <city> ... <diplomat>
-#: server/diplomats.c:1098
+#: server/diplomats.c:1104
#, c-format
msgid "Your %s has been eliminated defending %s against a %s."
msgstr "Din %s har blitt eliminert idet den forsvarte %s mot en %s."
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1106
+#: server/diplomats.c:1112
#, fuzzy, c-format
msgid "Your %s has been eliminated defending against a %s."
msgstr "Din %s har blitt eliminert idet den forsvarte mot en %s."
-#: server/diplomats.c:1119
+#: server/diplomats.c:1125
#, c-format
msgid "Your %s was eliminated by a defending %s."
msgstr "Din %s ble eliminert av en forsvarende %s."
# problem
-#: server/diplomats.c:1127
+#: server/diplomats.c:1133
#, c-format
msgid "Eliminated %s %s while infiltrating %s."
msgstr "En %s %s ble eliminert i et forsøk på å infiltrere %s."
# problem
-#: server/diplomats.c:1134
+#: server/diplomats.c:1140
#, c-format
msgid "Eliminated %s %s while infiltrating our troops."
msgstr "En %s %s ble eliminert i et forsøk på å infiltrere våre tropper."
-#: server/diplomats.c:1185
+#: server/diplomats.c:1191
#, fuzzy, c-format
msgid ""
"Your %s has successfully completed the mission and returned unharmed to %s."
msgstr "Din %s har klart sitt oppdrag og har returnert uskadet til %s."
-#: server/diplomats.c:1204
+#: server/diplomats.c:1210
#, fuzzy, c-format
msgid "Your %s was captured after completing the mission in %s."
msgstr "Din %s ble fanget etter å ha fullført sitt oppdrag i %s."
-#: server/diplomats.c:1210
+#: server/diplomats.c:1216
#, fuzzy, c-format
msgid "Your %s was captured after completing the mission."
msgstr "Din %s ble fanget etter å ha fullført sitt oppdrag."
-#: server/diplomats.c:1242
+#: server/diplomats.c:1248
#, fuzzy, c-format
msgid "You have caused an incident while bribing the %s %s."
msgstr "Du har forårsaket en skandale ved å bestikke %ss %s."
-#: server/diplomats.c:1247
+#: server/diplomats.c:1253
#, c-format
msgid "%s has caused an incident while bribing your %s."
msgstr "%s har forårsaket en skandale ved å bestikke din %s."
-#: server/diplomats.c:1254
+#: server/diplomats.c:1260
#, fuzzy, c-format
msgid "You have caused an incident while attempting to steal tech from %s."
msgstr "Du har skapt en skandale ved teknologityveriet fra %s."
-#: server/diplomats.c:1258
+#: server/diplomats.c:1264
#, fuzzy, c-format
msgid "%s has caused an incident while attempting to steal tech from you."
msgstr "%s har forårsaket en skandale ved å stjele teknologi fra deg."
# problem
-#: server/diplomats.c:1264
+#: server/diplomats.c:1270
#, c-format
msgid "You have caused an incident while inciting a revolt in %s."
msgstr "Du har forårsaket en skandale ved å oppmuntre til opprør i %s."
# problem
-#: server/diplomats.c:1268
+#: server/diplomats.c:1274
#, c-format
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."
@@ -3460,12 +3488,12 @@ msgstr ""
"jernbanen.\n"
" Arbeiderne samler seg til dugnad og bygger jernbane i samtlige byer."
-#: server/maphand.c:1418
+#: server/maphand.c:1425
#, 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:1436
+#: server/maphand.c:1443
#, fuzzy, c-format
msgid "Disbanded your %s due to changing terrain."
msgstr "Oppløste din %s på grunn av transformasjon fra land til sjø."
@@ -3474,7 +3502,7 @@ msgstr "Oppl
msgid "Not reporting to the metaserver in this game."
msgstr "Rapporterer ikke til Metaserver i dette spillet."
-#: server/meta.c:430
+#: server/meta.c:432
#, c-format
msgid "Metaserver: bad address: [%s:%d]."
msgstr "Metaserver: addressefeil: [%s: %d]."
@@ -3595,43 +3623,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:1103
+#: server/plrhand.c:1115
#, c-format
msgid "Removing player %s."
msgstr "Fjernet spiller %s."
-#: server/plrhand.c:1105
+#: server/plrhand.c:1117
msgid "You've been removed from the game!"
msgstr "Du har blitt fjernet fra spillet!"
-#: server/plrhand.c:1108
+#: server/plrhand.c:1120
#, c-format
msgid "%s has been removed from the game."
msgstr "%s har blitt fjernet fra spillet."
-#: server/plrhand.c:1153 server/plrhand.c:1158
+#: server/plrhand.c:1167 server/plrhand.c:1172
#, 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:1178
+#: server/plrhand.c:1192
#, 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:1656
+#: server/plrhand.c:1670
#, 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:1663
+#: server/plrhand.c:1677
#, 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:1686
+#: server/plrhand.c:1700
#, fuzzy, c-format
msgid ""
"Your nation is thrust into civil war! %s is declared the leader of the rebel "
@@ -3640,12 +3668,12 @@ msgstr ""
"Din nasjon er splittet i en borgerkrig.\n"
" %s er proklamert leder for de opprørske fylkene."
-#: server/plrhand.c:1707
+#: server/plrhand.c:1721
#, c-format
msgid "%s declares allegiance to %s."
msgstr "%s proklamerer allianse med %s."
-#: server/plrhand.c:1722
+#: server/plrhand.c:1736
#, fuzzy, c-format
msgid ""
"Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3838,67 +3866,67 @@ msgstr "(bygger %s i %s (%s))\n"
msgid "Wonders of the World"
msgstr "Verdens underverk"
-#: server/report.c:547
+#: server/report.c:552
msgid " sq. mi."
msgstr " kkm"
-#: server/report.c:557
+#: server/report.c:562
msgid " M tons"
msgstr " M t"
-#: server/report.c:562
+#: server/report.c:567
msgid " M goods"
msgstr " M varer"
-#: server/report.c:567
+#: server/report.c:572
msgid " bulbs"
msgstr ""
-#: server/report.c:572
+#: server/report.c:577
msgid " month"
msgid_plural " months"
msgstr[0] " måned"
msgstr[1] " måned"
-#: server/report.c:577
+#: server/report.c:582
msgid " ton"
msgid_plural " tons"
msgstr[0] " tonn"
msgstr[1] " tonn"
-#: server/report.c:591
+#: server/report.c:596
msgid "st"
msgstr "."
-#: server/report.c:593
+#: server/report.c:598
msgid "nd"
msgstr "."
-#: server/report.c:595
+#: server/report.c:600
msgid "rd"
msgstr "."
-#: server/report.c:597
+#: server/report.c:602
msgid "th"
msgstr "."
-#: server/report.c:700
+#: server/report.c:705
msgid "Demography string contains invalid characters. Try \"help demography\"."
msgstr ""
"Demografi tekststrengen inneholder ugyldige bokstaver. Prøv \"help demography"
"\"."
-#: server/report.c:743 server/report.c:768
+#: server/report.c:748 server/report.c:773
msgid "Demographics Report:"
msgstr "Demografi-rapport:"
-#: server/report.c:744
+#: server/report.c:749
msgid "Sorry, the Demographics report is unavailable."
msgstr "Beklager, demografirapport er ikke tilgjengelig."
#. TRANS: <nation adjective> <government name> (<year>).
#. * E.g. "Polish Despotism (200 AD)".
-#: server/report.c:750
+#: server/report.c:755
#, fuzzy, c-format
msgid "%s %s (%s)"
msgstr "%s i %s (%s)\n"
@@ -3909,11 +3937,11 @@ msgstr "%s i %s (%s)\n"
msgid "Could not find a readable \"%s.%s\" ruleset file."
msgstr "Kunne ikke finne en lesbar regeloppsettfil med navnet \"%s\"."
-#: server/ruleset.c:2356
+#: server/ruleset.c:2366
msgid "No barbarian nation in rulesets, at least one required!"
msgstr ""
-#: server/ruleset.c:3166
+#: server/ruleset.c:3178
msgid "Loading rulesets"
msgstr "Laster inn regeloppsett"
@@ -3929,14 +3957,14 @@ msgstr ""
"lagrede spill, eller det kan tyde på feil ved selve filen. Fortsett på eget "
"ansvar."
-#: server/savegame.c:3588
+#: server/savegame.c:3587
#, fuzzy
msgid "Saved game is too old, at least version 1.9.0 required."
msgstr ""
"Den lagrede filen er for gammel, versjoner fra og med 1.9.0 er støttet."
#. TRANS: Fatal error message.
-#: server/savegame.c:3815
+#: server/savegame.c:3817
#, fuzzy
msgid ""
"Saved game uses the \"classic\" terrain ruleset, and is no longer supported."
@@ -3944,7 +3972,7 @@ msgstr ""
"Den lagrede filen bruker det klassiske terreng regeloppsettet som ikke "
"lenger er støttet."
-#: server/savegame.c:3824
+#: server/savegame.c:3826
#, c-format
msgid ""
"Warning: Different rulesetdirs ('%s' and '%s') are no longer supported. "
@@ -3954,7 +3982,7 @@ msgstr ""
"støttet. Bruker '%s'."
#. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4051
+#: server/savegame.c:4055
#, c-format
msgid "%s had invalid nation; changing to %s."
msgstr ""
@@ -3987,7 +4015,7 @@ msgstr "Intern"
msgid "Networking"
msgstr "Nettverk"
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:734
#: client/gui-win32/dialogs.c:532
msgid "All"
msgstr "Alle"
@@ -5195,11 +5223,11 @@ msgstr ""
"log\" hver runde. Denne statistikken kan benyttes til å lage grafer over "
"spillerenes styrke etter at spillet er over."
-#: server/sernet.c:150
+#: server/sernet.c:151
msgid "Server cannot read standard input. Ignoring input."
msgstr "Serveren kan ikke lese fra tastaturet. Ignorerer det."
-#: server/sernet.c:929
+#: server/sernet.c:933
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr "Server: addressefeil: [%s: %d]."
@@ -5273,46 +5301,46 @@ msgstr "Romskipet ditt har allerede maksimalt antall Solcelle-moduler!"
msgid "Without guidance from the capital, the %s spaceship is lost!"
msgstr "Uten veiledning fra hovedstaden er %s romskipet tapt!"
-#: server/srv_main.c:240
+#: server/srv_main.c:242
msgid "Game ended in a draw as end year exceeded"
msgstr "Spillet ble uavgjordt siden sluttårstallet ble oversteget"
-#: server/srv_main.c:274
+#: server/srv_main.c:276
#, c-format
msgid "The %s spaceship has arrived at Alpha Centauri."
msgstr "%s romskip har landet på Alpha Centauri."
-#: server/srv_main.c:287 server/srv_main.c:322
+#: server/srv_main.c:289 server/srv_main.c:324
#, c-format
msgid "Team victory to %s"
msgstr "Lagseier til %s"
-#: server/srv_main.c:297 server/srv_main.c:338
+#: server/srv_main.c:299 server/srv_main.c:340
#, c-format
msgid "Game ended in victory for %s"
msgstr "Spillet endte med seier til %s"
-#: server/srv_main.c:345
+#: server/srv_main.c:347
msgid "Game ended in a draw"
msgstr "Spillet endte uavgjordt"
-#: server/srv_main.c:461 server/srv_main.c:472
+#: server/srv_main.c:465 server/srv_main.c:476
#, c-format
msgid "Your %s was disbanded in accordance with your peace treaty with the %s."
msgstr ""
-#: server/srv_main.c:512 server/srv_main.c:516
+#: server/srv_main.c:516 server/srv_main.c:520
#, c-format
msgid ""
"Concerned citizens point out that the cease-fire with %s will run out soon."
msgstr "Bekymrede borgere påpeker at våpenhvilen med %s snart utløper."
-#: server/srv_main.c:521 server/srv_main.c:525
+#: server/srv_main.c:525 server/srv_main.c:529
#, fuzzy, c-format
msgid "The cease-fire with %s has run out. You are now at war with the %s."
msgstr "Våpenhvilen med %s har utløpt. Du er nå nøytral til %s."
-#: server/srv_main.c:542
+#: server/srv_main.c:546
#, fuzzy, c-format
msgid ""
"Ceasefire between %s and %s has run out. They are at war. You cancel your "
@@ -5321,345 +5349,334 @@ msgstr ""
"Spilleren %s som du er på lag med har erklært krig mot %s. Du må avbryte "
"alliansen med %s."
-#: server/srv_main.c:961
+#: server/srv_main.c:997
#, c-format
msgid "Failed saving game as %s"
msgstr "Klarte ikke å lagre spill som %s"
-#: server/srv_main.c:963
+#: server/srv_main.c:999
#, c-format
msgid "Game saved as %s"
msgstr "Spill lagret som %s"
-#: server/srv_main.c:994
+#: server/srv_main.c:1030
msgid "The game is already running."
msgstr "Spillet er allerede i gang."
-#: server/srv_main.c:1002
+#: server/srv_main.c:1038
#, c-format
msgid "%s lost control cmdlevel on game start. Use voting from now on."
msgstr ""
-#: server/srv_main.c:1009
+#: server/srv_main.c:1045
msgid "Starting game."
msgstr "Starter spillet."
-#: server/srv_main.c:1071
+#: server/srv_main.c:1112
#, c-format
msgid "request for unknown report (type %d)"
msgstr "forespørsel etter ukjent rapport (type: %d)"
-#: server/srv_main.c:1136
+#: server/srv_main.c:1177
#, c-format
msgid "Warning: rejecting old client %s"
msgstr "Advarsel: forkastet gammel klient %s"
-#: server/srv_main.c:1238
+#: server/srv_main.c:1279
#, 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:1338
+#: server/srv_main.c:1381
msgid "Please choose a non-blank name."
msgstr "Vennligst velg et ikke-blankt navn."
-#: server/srv_main.c:1354
+#: server/srv_main.c:1397
msgid "That nation is already in use."
msgstr "Den nasjonen er allerede i bruk."
-#: server/srv_main.c:1370
+#: server/srv_main.c:1413
#, 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:1391
+#: server/srv_main.c:1434
msgid "Please choose a name containing only ASCII characters."
msgstr "Vennligst velg et navn som kun inneholder ASCII bokstaver."
-#: server/srv_main.c:1490
+#: server/srv_main.c:1533
#, c-format
msgid "%s nation is not available in this scenario."
msgstr ""
-#: server/srv_main.c:1496
+#: server/srv_main.c:1539
#, fuzzy, c-format
msgid "%s nation is already in use."
msgstr "Den nasjonen er allerede i bruk."
-#: server/srv_main.c:1514
+#: server/srv_main.c:1557
#, c-format
msgid "%s is the %s ruler %s."
msgstr "%s er den %se herskeren %s."
-#: server/srv_main.c:1570
+#: server/srv_main.c:1613
#, 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:1614 server/srv_main.c:1618
+#: server/srv_main.c:1657 server/srv_main.c:1661
#, 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:1760
+#: server/srv_main.c:1803
#, c-format
msgid "Player %d"
msgstr "Spiller %d"
-#: server/srv_main.c:1771 server/srv_main.c:1777
+#: server/srv_main.c:1814 server/srv_main.c:1820
#, c-format
msgid "%s rules the %s."
msgstr "%s styrer %s."
-#: server/srv_main.c:1942
+#: server/srv_main.c:1985
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
msgstr ""
-#: server/srv_main.c:1993
+#: server/srv_main.c:2037
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr "Sender info til metaserver [%s]"
-#: server/srv_main.c:2024
+#: server/srv_main.c:2069
msgid "The game is over..."
msgstr "Spillet er over..."
-#: server/srv_main.c:2237
+#: server/srv_main.c:2286
msgid "Now accepting new client connections."
msgstr "Aksepterer nå nye klientforbindelser."
-#: server/stdinhand.c:246
-#, c-format
-msgid "Vote \"%s\" is passed %d to %d with %d abstentions."
-msgstr "Valget \"%s\" ble vedtatt med %d mot %d stemmer (%d stemte ikke)."
-
-#: server/stdinhand.c:253
-#, c-format
-msgid "Vote \"%s\" failed with %d against, %d for and %d abstentions."
-msgstr ""
-"Valget \"%s\" ble ikke vedtatt med %d mot, %d for og %d som unnlot å stemme."
-
#. TRANS: ambiguous command
-#: server/stdinhand.c:365
+#: server/stdinhand.c:284
msgid "(ambiguous)"
msgstr "(uklar)"
#. TRANS: unrecognized command
#. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:416
+#: server/stdinhand.c:287 client/citydlg_common.c:419
#: 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 "(ukjent)"
-#: server/stdinhand.c:458
+#: server/stdinhand.c:377
msgid "Name is empty, so cannot be a player."
msgstr "Navnet er tomt, så det kan ikke være en spiller."
-#: server/stdinhand.c:462
+#: server/stdinhand.c:381
msgid "Name is too long, so cannot be a player."
msgstr "Navnet er for langt, så det kan ikke være en spiller."
-#: server/stdinhand.c:466
+#: server/stdinhand.c:385
#, c-format
msgid "Player name prefix '%s' is ambiguous."
msgstr "Spillernavn prefikset '%s' er ikke entydig."
-#: server/stdinhand.c:470
+#: server/stdinhand.c:389
#, c-format
msgid "No player by the name of '%s'."
msgstr "Ingen spiller med navn '%s'."
-#: server/stdinhand.c:474 server/stdinhand.c:509
+#: server/stdinhand.c:393 server/stdinhand.c:428
#, c-format
msgid "Unexpected match_result %d (%s) for '%s'."
msgstr "Uventet match_result %d (%s) for '%s'."
-#: server/stdinhand.c:493
+#: server/stdinhand.c:412
msgid "Name is empty, so cannot be a connection."
msgstr "Navnet er tomt, så det kan ikke være en forbindelse."
-#: server/stdinhand.c:497
+#: server/stdinhand.c:416
msgid "Name is too long, so cannot be a connection."
msgstr "Navnet er for langt, så det kan ikke være en forbindelse."
-#: server/stdinhand.c:501
+#: server/stdinhand.c:420
#, c-format
msgid "Connection name prefix '%s' is ambiguous."
msgstr "Spillernavn-prefikset '%s' er ikke-entydig."
-#: server/stdinhand.c:505
+#: server/stdinhand.c:424
#, c-format
msgid "No connection by the name of '%s'."
msgstr "Ingen forbindelse med navn '%s'."
-#: server/stdinhand.c:525
+#: server/stdinhand.c:444
#, c-format
msgid "Open metaserver connection to [%s]."
msgstr "Åpne metaserver kobling til [%s]."
-#: server/stdinhand.c:538
+#: server/stdinhand.c:457
#, c-format
msgid "Close metaserver connection to [%s]."
msgstr "Lukk metaserver-tilknytningen til [%s]."
-#: server/stdinhand.c:553
+#: server/stdinhand.c:472
msgid "Metaserver connection is open."
msgstr "Metaserver-tilknytning er åpen."
-#: server/stdinhand.c:556
+#: server/stdinhand.c:475
msgid "Metaserver connection is closed."
msgstr "Metaserver-tilknytning er lukket."
-#: server/stdinhand.c:566
+#: server/stdinhand.c:485
msgid "Metaserver connection is already open."
msgstr "Metaserver-tilknytning er allerede åpen."
-#: server/stdinhand.c:577
+#: server/stdinhand.c:496
msgid "Metaserver connection is already closed."
msgstr "Metaserver-tilknytning er allerede lukket."
-#: server/stdinhand.c:582
+#: server/stdinhand.c:501
msgid "Argument must be 'u', 'up', 'd', 'down', or '?'."
msgstr "Argumentet må være 'u', 'up', 'd', 'down', eller '?'."
-#: server/stdinhand.c:603
+#: server/stdinhand.c:522
#, c-format
msgid "Metaserver patches string set to '%s'."
msgstr "Metaserver endrings-streng satt til '%s'."
-#: server/stdinhand.c:606
+#: server/stdinhand.c:525
#, c-format
msgid "Metaserver patches string set to '%s', not reporting to metaserver."
msgstr ""
"Metaserver endringes-streng satt til '%s', ikke raportert til metaserver."
-#: server/stdinhand.c:627
+#: server/stdinhand.c:546
#, c-format
msgid "Metaserver message string set to '%s'."
msgstr "Metaserver meldingsstreng satt til '%s'."
-#: server/stdinhand.c:630
+#: server/stdinhand.c:549
#, c-format
msgid "Metaserver message string set to '%s', not reporting to metaserver."
msgstr ""
"Metaserver meldingsstreng satt til '%s', ikke rapportert til metaserver."
-#: server/stdinhand.c:650
+#: server/stdinhand.c:569
#, c-format
msgid "Metaserver is now [%s]."
msgstr "Metaserver er nå [%s]."
-#: server/stdinhand.c:660
+#: server/stdinhand.c:579
#, c-format
msgid "Server id: %s"
msgstr "Tjener id: %s"
-#: server/stdinhand.c:757
+#: server/stdinhand.c:676
#, fuzzy
msgid "You cannot save games manually on this server."
msgstr "Forlat spillet og avslutt tjeneren."
-#: server/stdinhand.c:774
+#: server/stdinhand.c:693
msgid "Cannot toggle a barbarian player."
msgstr "Kan ikke endre en 'barbar'-spiller."
-#: server/stdinhand.c:781
+#: server/stdinhand.c:700
#, c-format
msgid "%s is now under AI control."
msgstr "%s er nå under AI-kontroll."
-#: server/stdinhand.c:802
+#: server/stdinhand.c:721
#, c-format
msgid "%s is now under human control."
msgstr "%s er nå under menneskelig kontroll."
-#: server/stdinhand.c:847
+#: server/stdinhand.c:766
msgid "Can't add AI players once the game has begun."
msgstr "Kan ikke legge til AI spillere når spillet er startet."
-#: server/stdinhand.c:867
+#: server/stdinhand.c:786
msgid "Can't add more players, server is full."
msgstr "Kan ikke legge til flere spillere, serveren er full."
-#: server/stdinhand.c:874
+#: server/stdinhand.c:793
msgid "Can't use an empty name."
msgstr "Kan ikke bruke et tomt navn"
-#: server/stdinhand.c:881
+#: server/stdinhand.c:800
#, c-format
msgid "That name exceeds the maximum of %d chars."
msgstr "Det navnet er lenger enn det maksimale som er %d tegn."
-#: server/stdinhand.c:887
+#: server/stdinhand.c:806
msgid "That name is not allowed."
msgstr "Det navnet er ikke tillat."
-#: server/stdinhand.c:893
+#: server/stdinhand.c:812
msgid "A player already exists by that name."
msgstr "Der finnes allerede en spiller med det navnet."
-#: server/stdinhand.c:899
+#: server/stdinhand.c:818
msgid "A user already exists by that name."
msgstr "Der finnes allerede en bruker med det navnet."
-#: server/stdinhand.c:925
+#: server/stdinhand.c:844
#, c-format
msgid "%s has been added as an AI-controlled player."
msgstr "%s ble lagt til som en AI-styrt spiller."
-#: server/stdinhand.c:932
+#: server/stdinhand.c:851
#, c-format
msgid "Error creating new AI player: %s."
msgstr "Feil ved opprettelse av ny AI spiller: %s."
-#: server/stdinhand.c:966
+#: server/stdinhand.c:885
msgid "Players cannot be removed once the game has started."
msgstr "Spillere kan ikke fjernes etter at spillet har startet."
-#: server/stdinhand.c:977
+#: server/stdinhand.c:896
#, c-format
msgid "Removed player %s from the game."
msgstr "Fjernet spiller %s fra spillet."
-#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
+#: server/stdinhand.c:935 server/stdinhand.c:3372 server/stdinhand.c:3507
#, c-format
msgid "Name \"%s\" disallowed for security reasons."
msgstr ""
-#: server/stdinhand.c:1029
+#: server/stdinhand.c:948
#, fuzzy, c-format
msgid "No command script found by the name \"%s\"."
msgstr "Ingen forbindelse med navn '%s'."
-#: server/stdinhand.c:1037
+#: server/stdinhand.c:956
#, c-format
msgid "Loading script file: %s"
msgstr "Laster inn manus filen: %s"
-#: server/stdinhand.c:1052
+#: server/stdinhand.c:971
#, c-format
msgid "Cannot read command line scriptfile '%s'."
msgstr "Kunne ikke lese kommando manusfilen \"%s\"."
-#: server/stdinhand.c:1054
+#: server/stdinhand.c:973
#, c-format
msgid "Could not read script file '%s'."
msgstr "Klarte ikke å lese manusfilen '%s'."
-#: server/stdinhand.c:1146
+#: server/stdinhand.c:1065
#, c-format
msgid "Could not write script file '%s'."
msgstr "Klarte ikke å skrive til manusfilen '%s'."
-#: server/stdinhand.c:1158
+#: server/stdinhand.c:1077
msgid "You cannot use the write command on this server for security reasons."
msgstr ""
-#: server/stdinhand.c:1186
+#: server/stdinhand.c:1105
#, c-format
msgid ""
"Cannot decrease command access level '%s' for connection '%s'; you only have "
@@ -5667,7 +5684,12 @@ msgid ""
msgstr ""
"Kan ikke redusere tilgangsnivå '%s' for forbindelse '%s'; du har kun '%s'."
-#: server/stdinhand.c:1241
+#: server/stdinhand.c:1114
+#, c-format
+msgid "Command access level set to '%s' for connection %s."
+msgstr "Kommando tilgangsnivå satt til '%s' for forbindelse %s."
+
+#: server/stdinhand.c:1163
#, fuzzy, c-format
msgid ""
"Anyone can now become game organizer '%s' by issuing the 'first' command."
@@ -5675,230 +5697,220 @@ msgstr ""
"Alle kan få kommando tilgangsnivå '%s' nå ved å bruke 'firstlevel' "
"kommandoen."
-#: server/stdinhand.c:1274
+#: server/stdinhand.c:1187
msgid "Command access levels in effect:"
msgstr "Kommando tilgangsnivå i bruk:"
-#: server/stdinhand.c:1282
+#: server/stdinhand.c:1194
#, c-format
msgid "Command access level for new connections: %s"
msgstr "Kommando tilgangsnivå for nye forbindelser: %s"
-#: server/stdinhand.c:1285
+#: server/stdinhand.c:1197
#, c-format
msgid "Command access level for first player to take it: %s"
msgstr "Kommando tilgangsnivå for første spiller: %s."
-#: server/stdinhand.c:1294
+#: server/stdinhand.c:1206
msgid ""
"Error: command access level must be one of 'none', 'info', 'ctrl', or 'hack'."
msgstr ""
"Feil: kommando tilgangsnivå må være en av 'none', 'info', 'ctrl', eller "
"'hack'."
-#: server/stdinhand.c:1299
+#: server/stdinhand.c:1211
#, c-format
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: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: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:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
+#: server/stdinhand.c:1238 server/stdinhand.c:1252 server/stdinhand.c:1273
#, c-format
msgid "Command access level set to '%s' for new players."
msgstr "Kommando tilgangsnivå satt til '%s' for nye spillere."
-#: server/stdinhand.c:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
+#: server/stdinhand.c:1243 server/stdinhand.c:1257 server/stdinhand.c:1267
#, 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:1402
+#: server/stdinhand.c:1302
#, 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:1406
+#: server/stdinhand.c:1306
#, c-format
msgid "You already have command access level '%s' or better."
msgstr "Du har allerede tilgangsnivå '%s' eller bedre."
-#: server/stdinhand.c:1411
+#: server/stdinhand.c:1311
#, fuzzy
msgid "Someone else already is game organizer."
msgstr "Noen andre har allerede tilgangsnivå '%s' eller bedre."
-#: server/stdinhand.c:1416
+#: server/stdinhand.c:1316
#, c-format
msgid "Connection %s has opted to become the game organizer."
msgstr ""
-#: server/stdinhand.c:1467
+#: server/stdinhand.c:1367
#, c-format
msgid "Invalid argument %d."
msgstr "Ugyldig argument %d"
-#: server/stdinhand.c:1474
+#: server/stdinhand.c:1374
msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
msgstr "Bruk: timeoutincrease <runde> <rundetillegg> <verdi> <faktor>"
-#: server/stdinhand.c:1482
+#: server/stdinhand.c:1382
#, c-format
msgid "Dynamic timeout set to %d %d %d %d"
msgstr "Dynamisk rundetidsbegrensning satt til %d %d %d %d"
-#: server/stdinhand.c:1542 server/stdinhand.c:1545
+#: server/stdinhand.c:1442 server/stdinhand.c:1445
msgid "Option:"
msgstr "Alternativ:"
-#: server/stdinhand.c:1555 server/stdinhand.c:4031
+#: server/stdinhand.c:1455 server/stdinhand.c:4079
msgid "Description:"
msgstr "Beskrivelse:"
-#: server/stdinhand.c:1560
+#: server/stdinhand.c:1460
#, c-format
msgid "Status: %s"
msgstr "Status: %s"
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "changeable"
msgstr "kan endres"
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "fixed"
msgstr "fastsatt"
-#: server/stdinhand.c:1567
+#: server/stdinhand.c:1467
#, c-format
msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
msgstr "Verdi: %d, Minimum: 0, Std.verdi: %d, Maksimum: 1"
-#: server/stdinhand.c:1572
+#: server/stdinhand.c:1472
#, c-format
msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
msgstr "Verdi: %d, Minimum: %d, Std.verdi: %d, Maksimum: %d"
-#: server/stdinhand.c:1578
+#: server/stdinhand.c:1478
#, c-format
msgid "Value: \"%s\", Default: \"%s\""
msgstr "Verdi: \"%s\", Std.verdi: \"%s\""
-#: server/stdinhand.c:1597
+#: server/stdinhand.c:1497
msgid "Explanations are available for the following server options:"
msgstr "Forklaringer er tilgjengelige for følgende serveralternativ:"
-#: server/stdinhand.c:1643
+#: server/stdinhand.c:1537
msgid "No explanation for that yet."
msgstr "Ingen forklaring på det ennå."
-#: server/stdinhand.c:1646 server/stdinhand.c:2480
+#: server/stdinhand.c:1540 server/stdinhand.c:2468
msgid "Ambiguous option name."
msgstr "Alternativet har flere betydninger."
-#: server/stdinhand.c:1666
+#: server/stdinhand.c:1560
#, c-format
msgid "Server Operator: %s"
msgstr "Server Operatør: %s"
-#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
+#: server/stdinhand.c:1686 server/stdinhand.c:1713 server/stdinhand.c:1731
#, c-format
msgid "Player '%s' now has AI skill level '%s'."
msgstr "Spiller '%s' har nå AI vanskelighetsgrad '%s'."
-#: server/stdinhand.c:1822
+#: server/stdinhand.c:1718
#, c-format
msgid "%s is not controlled by the AI."
msgstr "%s er ikke kontrollert av AI'en."
-#: server/stdinhand.c:1842
+#: server/stdinhand.c:1738
#, c-format
msgid "Default AI skill level set to '%s'."
msgstr "Standard AI vanskelighetsgrad er satt til '%s'."
-#: server/stdinhand.c:1857 server/stdinhand.c:2162
+#: server/stdinhand.c:1753
msgid "This command is client only."
msgstr "Denne kommandoen er kun for klienten."
-#: server/stdinhand.c:1860
+#: server/stdinhand.c:1756
msgid "Usage: away"
msgstr "Bruk: borte"
-#: server/stdinhand.c:1865
+#: server/stdinhand.c:1761
msgid "Only players may use the away command."
msgstr ""
-#: server/stdinhand.c:1869
+#: server/stdinhand.c:1765
#, c-format
msgid "%s set to away mode."
msgstr "%s satt til borde-modus."
-#: server/stdinhand.c:1877
+#: server/stdinhand.c:1772
#, c-format
msgid "%s returned to game."
msgstr "%s har returnert til spillet."
-#: server/stdinhand.c:1919
+#: server/stdinhand.c:1817
#, 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:1925
+#: server/stdinhand.c:1823
#, c-format
msgid "Unknown option '%s'."
msgstr "Ukjent alternativ '%s'."
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1848
#, fuzzy
msgid "All options with non-default values"
msgstr "= betyr at alternativet har standardverdi"
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1851
msgid "All options"
msgstr "Alle alternativer"
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1854
msgid "Vital options"
msgstr "Viktige alternativer"
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1857
msgid "Situational options"
msgstr "Situasjonsbetingede alternativer"
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1860
msgid "Rarely used options"
msgstr "Sjeldent brukte innstillinger"
-#: server/stdinhand.c:1965
+#: server/stdinhand.c:1863
msgid "+ means you may change the option"
msgstr "+ betyr at du kan endre alternativet"
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1864
msgid "= means the option is on its default value"
msgstr "= betyr at alternativet har standardverdi"
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
#, c-format
msgid "%-*s value (min,max) "
msgstr "%-*s verdi (min,maks) "
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
msgid "Option"
msgstr "Alternativ"
-#: server/stdinhand.c:1973
+#: server/stdinhand.c:1871
msgid "description"
msgstr "beskrivelse"
-#: server/stdinhand.c:2042
+#: server/stdinhand.c:1940
#, fuzzy
msgid ""
"Try 'show situational' or 'show rare' to show more options.\n"
@@ -5906,76 +5918,150 @@ msgid ""
msgstr ""
"Prøv 'show situational' eller 'show rare' for å vise flere alternativer."
-#: server/stdinhand.c:2092
+#: server/stdinhand.c:1966
msgid "Cannot change teams once game has begun."
msgstr "Kan ikke endre lagene når spillet er startet."
-#: server/stdinhand.c:2102
+#: server/stdinhand.c:1976
#, fuzzy
msgid "Undefined argument. Usage: team <player> <team>."
msgstr "Udefinert argument. Bruk: team <spiller> [lag]."
-#: server/stdinhand.c:2122
+#: server/stdinhand.c:1996
#, c-format
msgid "No such team %s. Please give a valid team name or number."
msgstr ""
-#: server/stdinhand.c:2129
+#: server/stdinhand.c:2003
msgid "Cannot team a barbarian."
msgstr "Kan ikke tilordne lag til en barbar."
-#: server/stdinhand.c:2135
+#: server/stdinhand.c:2009
#, c-format
msgid "Player %s set to team %s."
msgstr "Spiller %s er med i laget %s."
-#: server/stdinhand.c:2157
-msgid "Undefined arguments. Usage: vote yes|no [vote number]."
-msgstr "Udefinert argument. Bruk: vote yes|no [valgnummer]."
+#: server/stdinhand.c:2035 server/voting.c:512
+#, fuzzy
+msgid "Teamvote"
+msgstr "Lag"
-#: server/stdinhand.c:2165
-msgid "Observers cannot vote."
-msgstr "Observatører kan ikke stemme."
+#: server/stdinhand.c:2035 server/voting.c:516
+msgid "Vote"
+msgstr ""
-#: server/stdinhand.c:2168
+#: server/stdinhand.c:2037
+#, c-format
msgid ""
-"You can only vote in a running game. Use 'first' to become the game "
-"organizer if there currently is none."
+"%s %d \"%s\" (needs %0.0f%%%s): %d for, %d against, and %d abstained out of %"
+"d players."
msgstr ""
-#: 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:2041
+msgid " no dissent"
+msgstr ""
-#: server/stdinhand.c:2188
+#: server/stdinhand.c:2049
msgid "There are no votes going on."
msgstr "Det er ingen aktive valg."
-#: server/stdinhand.c:2208
-msgid "No legal last vote."
+#: server/stdinhand.c:2077
+#, fuzzy
+msgid "Invalid arguments. Usage: vote yes|no|abstain [vote number]."
+msgstr "Udefinert argument. Bruk: vote yes|no [valgnummer]."
+
+#: server/stdinhand.c:2095 server/stdinhand.c:2213 server/stdinhand.c:3714
+msgid "You are not allowed to use this command."
+msgstr "Du har ikke lov å bruke denne kommandoen."
+
+#: server/stdinhand.c:2104
+#, fuzzy, c-format
+msgid "The argument \"%s\" is ambigious."
+msgstr "Hjelpeargument '%s' er ikke entydig."
+
+#: server/stdinhand.c:2119
+#, fuzzy
+msgid "There are no votes running."
+msgstr "Det er ingen aktive valg."
+
+#: server/stdinhand.c:2121
+#, fuzzy, c-format
+msgid "No legal last vote (%d %s)."
msgstr "Ingen tidligere gyldige valg."
-#: server/stdinhand.c:2213
-msgid "Value must be integer."
-msgstr "Verdien må være et heltall."
+#: server/stdinhand.c:2122
+msgid "other vote running"
+msgid_plural "other votes running"
+msgstr[0] ""
+msgstr[1] ""
+
+#: server/stdinhand.c:2129 server/stdinhand.c:2491 server/stdinhand.c:2532
+msgid "Value must be an integer."
+msgstr "Verdien må være heltall"
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2135 server/stdinhand.c:2221
#, c-format
msgid "No such vote (%d)."
msgstr "Ingen slik avstemning (%d)."
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2141
+#, fuzzy
+msgid "You are not allowed to vote on that."
+msgstr "Du har ikke lov å sette dette alternativet."
+
+#: server/stdinhand.c:2146
#, c-format
msgid "You voted for \"%s\""
msgstr "Du stemte for \"%s\""
-#: server/stdinhand.c:2232
+#: server/stdinhand.c:2150
#, c-format
msgid "You voted against \"%s\""
msgstr "Du stemte mot \"%s\""
-#: server/stdinhand.c:2259
+#: server/stdinhand.c:2155
+#, c-format
+msgid "You abstained from voting on \"%s\""
+msgstr ""
+
+#: server/stdinhand.c:2190
+msgid "Missing argument <vote number> or the string \"all\"."
+msgstr ""
+
+#: server/stdinhand.c:2197
+#, fuzzy
+msgid "You don't have any vote going on."
+msgstr "Du har ikke en arbeider her."
+
+#: server/stdinhand.c:2204
+#, fuzzy
+msgid "There isn't any vote going on."
+msgstr "Det er ingen aktive valg."
+
+#: server/stdinhand.c:2209
+msgid "Server: All votes have been removed."
+msgstr ""
+
+#: server/stdinhand.c:2226
+#, fuzzy, c-format
+msgid "You are not allowed to cancel this vote (%d)."
+msgstr "Du har ikke lov å sette dette alternativet."
+
+#: server/stdinhand.c:2232
+msgid "Usage: /cancelvote [<vote number>|all]"
+msgstr ""
+
+#: server/stdinhand.c:2241
+#, c-format
+msgid "Server: %s cancelled the vote \"%s\" (number %d)."
+msgstr ""
+
+#: server/stdinhand.c:2247
+#, c-format
+msgid "Server: The vote \"%s\" (number %d) has been cancelled."
+msgstr ""
+
+#: server/stdinhand.c:2265
#, fuzzy
msgid ""
"Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
@@ -5984,131 +6070,127 @@ msgstr ""
"Udefinert argument. Bruk: debug <diplomacy <spiller> | by <x> <y> | enhet "
"<x> <y> | enhet <id> | tech <spiller>>."
-#: server/stdinhand.c:2265
+#: server/stdinhand.c:2271
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:2294
+#: server/stdinhand.c:2300
#, c-format
msgid "%s diplomacy no longer debugged"
msgstr "%s diplomati blir ikke lenger feilsøkt"
-#: server/stdinhand.c:2298
+#: server/stdinhand.c:2304
#, c-format
msgid "%s diplomacy debugged"
msgstr "%s diplomati feilsøking"
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2323
#, c-format
msgid "%s tech no longer debugged"
msgstr "%s tech blir ikke lenger feilsøkt"
-#: server/stdinhand.c:2321
+#: server/stdinhand.c:2327
#, c-format
msgid "%s tech debugged"
msgstr "%s tech feilsøking"
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2358 server/stdinhand.c:2388
msgid "Value 2 & 3 must be integer."
msgstr "Verdi 2 og 3 må være heltall."
-#: server/stdinhand.c:2356 server/stdinhand.c:2386
+#: server/stdinhand.c:2362 server/stdinhand.c:2392
msgid "Bad map coordinates."
msgstr "Ugyldige kart koordinater."
-#: server/stdinhand.c:2361
+#: server/stdinhand.c:2367
msgid "No city at this coordinate."
msgstr "Ingen by på dette koordinatet."
-#: server/stdinhand.c:2366
+#: server/stdinhand.c:2372
#, c-format
msgid "%s no longer debugged"
msgstr "%s er ikke lenger debugget."
-#: server/stdinhand.c:2392 server/stdinhand.c:2422
+#: server/stdinhand.c:2398 server/stdinhand.c:2428
#, fuzzy, c-format
msgid "%s %s no longer debugged."
msgstr "%ss %s er ikke lenger debugget."
-#: server/stdinhand.c:2397 server/stdinhand.c:2427
+#: server/stdinhand.c:2403 server/stdinhand.c:2433
#, fuzzy, c-format
msgid "%s %s debugged."
msgstr "%ss %s debugget."
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2419
msgid "Value 2 must be integer."
msgstr "Verdi 2 må være heltall"
-#: server/stdinhand.c:2417
+#: server/stdinhand.c:2423
#, c-format
msgid "Unit %d does not exist."
msgstr "Enhet %d eksisterer ikke."
-#: server/stdinhand.c:2475
+#: server/stdinhand.c:2464
msgid "Undefined argument. Usage: set <option> <value>."
msgstr "Udefinert argument. Bruk: set <alternativ> <verdi>."
-#: server/stdinhand.c:2485
+#: server/stdinhand.c:2473
msgid "You are not allowed to set this option."
msgstr "Du har ikke lov å sette dette alternativet."
-#: server/stdinhand.c:2490 server/stdinhand.c:3463
+#: server/stdinhand.c:2478 server/stdinhand.c:3501
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:2502 server/stdinhand.c:2543
-msgid "Value must be an integer."
-msgstr "Verdien må være heltall"
-
-#: server/stdinhand.c:2512
+#: server/stdinhand.c:2501
#, c-format
msgid "The parameter %s should only contain digits 0-1."
msgstr ""
-#: server/stdinhand.c:2519
+#: server/stdinhand.c:2508
msgid "Value out of range (minimum: 0, maximum: 1)."
msgstr "Verdi utenfor område (minimum: 0, maksimum: 1)."
-#: server/stdinhand.c:2534 server/stdinhand.c:2576
+#: server/stdinhand.c:2523 server/stdinhand.c:2565
#, c-format
msgid "Option: %s has been set to %d."
msgstr "Alternativ: %s har blitt satt til %d."
-#: server/stdinhand.c:2554
+#: server/stdinhand.c:2543
#, c-format
msgid "The parameter %s should only contain +- and 0-9."
msgstr ""
-#: server/stdinhand.c:2561
+#: server/stdinhand.c:2550
#, c-format
msgid "Value out of range (minimum: %d, maximum: %d)."
msgstr "Verdi utenfor område (minimum: %d, maksimum: %d)."
-#: server/stdinhand.c:2586
+#: server/stdinhand.c:2575
msgid "String value too long. Usage: set <option> <value>."
msgstr "Streng verdi for lang. Bruk: set <alternativ> <verdi>."
-#: server/stdinhand.c:2600
+#: server/stdinhand.c:2589
#, c-format
msgid "Option: %s has been set to \"%s\"."
msgstr "Alternativ: %s har blitt satt til \"%s\"."
-#: server/stdinhand.c:2658
+#: server/stdinhand.c:2652
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:2661
+#: server/stdinhand.c:2655
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:2671
+#: server/stdinhand.c:2665
#, 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
+#: server/stdinhand.c:2673
#, c-format
msgid ""
"You cannot take a new player because the maximum of %d player has already "
@@ -6119,76 +6201,76 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: server/stdinhand.c:2691
+#: server/stdinhand.c:2685
msgid "You cannot take a new player because there are no free player slots."
msgstr ""
-#: server/stdinhand.c:2702
+#: server/stdinhand.c:2696
msgid "Sorry, one can't observe barbarians in this game."
msgstr "Beklager, man kan ikke observere barbarer i dette spillet."
-#: server/stdinhand.c:2705
+#: server/stdinhand.c:2699
msgid "Sorry, one can't take barbarians in this game."
msgstr "Beklager, man kan ikke styre barbarer i dette spillet."
-#: server/stdinhand.c:2713
+#: server/stdinhand.c:2707
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:2716
+#: server/stdinhand.c:2710
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:2724
+#: server/stdinhand.c:2718
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:2727
+#: server/stdinhand.c:2721
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:2736
+#: server/stdinhand.c:2730
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:2739
+#: server/stdinhand.c:2733
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:2749
+#: server/stdinhand.c:2743
msgid "Sorry, one can't observe in this game."
msgstr "Beklager, man kan ikke observere i dette spillet."
-#: server/stdinhand.c:2754
+#: server/stdinhand.c:2748
msgid "Sorry, one can't take players in this game."
msgstr "Beklager, man kan ikke overta spillere i dette spillet."
-#: server/stdinhand.c:2760
+#: server/stdinhand.c:2754
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:2791
+#: server/stdinhand.c:2785
msgid "Usage: observe [connection-name [player-name]]"
msgstr "Bruk: observe [forbindelses-navn] <spillernavn>"
-#: server/stdinhand.c:2797
+#: server/stdinhand.c:2791
msgid "Usage: observe [player-name]"
msgstr "Bruk: observe <spillernavn>"
-#: server/stdinhand.c:2847
+#: server/stdinhand.c:2841
#, 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:2858
+#: server/stdinhand.c:2852
#, c-format
msgid "%s is already observing %s."
msgstr "%s observerer allerede %s."
-#: server/stdinhand.c:2863
+#: server/stdinhand.c:2857
#, fuzzy, c-format
msgid "%s is already observing."
msgstr "%s observerer allerede %s."
@@ -6203,243 +6285,248 @@ msgstr "%s observerer n
msgid "%s now observes"
msgstr "%s observerer nå %s"
-#: server/stdinhand.c:2969
+#: server/stdinhand.c:2971
msgid "Usage: take <connection-name> <player-name>"
msgstr "Bruk: take <forbindelsesnavn> <spillernavn>"
-#: server/stdinhand.c:2974
+#: server/stdinhand.c:2976
msgid "Usage: take <player-name>"
msgstr "Bruk: take <spillernavn>"
-#: server/stdinhand.c:2980
+#: server/stdinhand.c:2982
msgid "Usage: take [connection-name] <player-name>"
msgstr "Bruk: take [forbindelsesnavn] <spillernavn>"
-#: server/stdinhand.c:3010
+#: server/stdinhand.c:3012
#, fuzzy, c-format
msgid "%s already controls %s."
msgstr "%s styrer allerede %s"
-#: server/stdinhand.c:3024
+#: server/stdinhand.c:3026
#, 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:3059
+#: server/stdinhand.c:3061
#, c-format
msgid "being detached from %s."
msgstr "kobles fra %s."
-#: server/stdinhand.c:3135
+#: server/stdinhand.c:3146
#, fuzzy, c-format
msgid "%s now controls %s (%s, %s)."
msgstr "%s styrer nå %s (%s, %s)"
-#: server/stdinhand.c:3139 server/stdinhand.c:4260
+#: server/stdinhand.c:3150 server/stdinhand.c:4308
#: data/nation/barbarian.ruleset:3
msgid "Barbarian"
msgstr "barbarsk"
-#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
+#: server/stdinhand.c:3152 server/stdinhand.c:4310 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-sdl/plrdlg.c:645
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr "AI"
-#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-gtk-2.0/pages.c:2125
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
+#: server/stdinhand.c:3153 server/stdinhand.c:4312
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-gtk-2.0/pages.c:2127
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/connectdlg.c:215
msgid "Human"
msgstr "Menneske"
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-gtk-2.0/pages.c:2124 client/gui-win32/connectdlg.c:200
-#: client/gui-win32/connectdlg.c:212
+#: server/stdinhand.c:3155 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-gtk-2.0/pages.c:2126 client/gui-win32/connectdlg.c:202
+#: client/gui-win32/connectdlg.c:214
msgid "Alive"
msgstr "Levende"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3156 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-win32/connectdlg.c:202
msgid "Dead"
msgstr "Død"
-#: server/stdinhand.c:3147
+#: server/stdinhand.c:3159
#, fuzzy, c-format
msgid "%s failed to attach to any player."
msgstr "%s er ikke tilordnet en spillet."
-#: server/stdinhand.c:3182
+#: server/stdinhand.c:3194
msgid "Usage: detach <connection-name>"
msgstr "Bruk: detach <forbindelsesnavn>"
-#: server/stdinhand.c:3202
+#: server/stdinhand.c:3214
msgid "You can not detach other users."
msgstr "Du kan ikke fjerne andre brukere."
-#: server/stdinhand.c:3211
+#: server/stdinhand.c:3223
#, c-format
msgid "%s is not attached to any player."
msgstr "%s er ikke tilordnet en spillet."
-#: server/stdinhand.c:3234
+#: server/stdinhand.c:3246
#, c-format
msgid "%s detaching from %s"
msgstr "%s kobler fra %s."
-#: server/stdinhand.c:3240
+#: server/stdinhand.c:3252
#, fuzzy, c-format
msgid "%s no longer observing."
msgstr "%s er ikke lenger debugget."
-#: server/stdinhand.c:3259
+#: server/stdinhand.c:3271
#, c-format
msgid "detaching from %s."
msgstr "fjernes fra %s."
-#: server/stdinhand.c:3345
+#: server/stdinhand.c:3361
#, fuzzy
msgid "Usage: load <game name>"
msgstr "Bruk: load <filnavn>"
-#: server/stdinhand.c:3350
+#: server/stdinhand.c:3366
#, 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:3372
+#: server/stdinhand.c:3388
#, c-format
msgid "Cannot find savegame or scenario with the name \"%s\"."
msgstr ""
-#: server/stdinhand.c:3389
+#: server/stdinhand.c:3405
#, fuzzy, c-format
msgid "Could not load savefile: %s"
msgstr "Klarte ikke laste inn lagret spill i: %s"
-#: server/stdinhand.c:3458
+#: server/stdinhand.c:3496
#, c-format
msgid "Current ruleset directory is \"%s\""
msgstr "Nåværende katalog for regeloppsettet er: \"%s\""
-#: server/stdinhand.c:3478
+#: server/stdinhand.c:3516
#, c-format
msgid "Ruleset directory \"%s\" not found"
msgstr "Kunne ikke finne regeloppsettskatalogen \"%s\""
-#: server/stdinhand.c:3484
+#: server/stdinhand.c:3522
#, fuzzy, c-format
msgid "Ruleset directory is already \"%s\""
msgstr "Regeloppsettkatalogen er \"%s\""
-#: server/stdinhand.c:3488
+#: server/stdinhand.c:3526
#, c-format
msgid "Ruleset directory set to \"%s\""
msgstr "Regeloppsettkatalogen er \"%s\""
-#: server/stdinhand.c:3536
+#: server/stdinhand.c:3574
msgid "Goodbye."
msgstr "Adjø."
-#: server/stdinhand.c:3567
+#: server/stdinhand.c:3606
msgid "Sorry, you are not allowed to use server commands."
msgstr "Beklager, du har ikke lov å benytte kommandoer på serveren."
-#: server/stdinhand.c:3603
+#: server/stdinhand.c:3656
#, 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:3608
+#: server/stdinhand.c:3661
#, c-format
msgid "Unknown command. Try '%shelp'."
msgstr "Ukjent kommando. Forsøk '%shelp'."
-#: server/stdinhand.c:3625
-msgid "Your new vote canceled your previous vote."
+#: server/stdinhand.c:3675
+#, fuzzy
+msgid "Your new vote cancelled your previous vote."
msgstr "Din nye stemme endret din tidligere stemme."
-#: server/stdinhand.c:3633
+#: server/stdinhand.c:3688
+msgid "New teamvote"
+msgstr ""
+
+#: server/stdinhand.c:3691
+msgid "New vote"
+msgstr ""
+
+#: server/stdinhand.c:3695
#, fuzzy, c-format
-msgid "New vote (number %d) by %s: %s."
+msgid "%s (number %d) by %s: %s"
msgstr "Ny stemme, nei. %d, av %s: %s."
-#: server/stdinhand.c:3645
+#: server/stdinhand.c:3704
#, c-format
msgid "Your new vote (\"%s\") was not legal or was not recognized."
msgstr ""
-#: server/stdinhand.c:3655
-msgid "You are not allowed to use this command."
-msgstr "Du har ikke lov å bruke denne kommandoen."
-
-#: server/stdinhand.c:3680
+#: server/stdinhand.c:3726
msgid "(server prompt)"
msgstr "(server kommandolinje)"
-#: server/stdinhand.c:3787
+#: server/stdinhand.c:3835
#, fuzzy
msgid "Game ended in a draw."
msgstr "Spillet endte uavgjordt"
-#: server/stdinhand.c:3791
+#: server/stdinhand.c:3839
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:3796
+#: server/stdinhand.c:3844
msgid "Cannot end the game: no game running."
msgstr "Kan ikke avslutte spill: det er ikke noe spill igang."
-#: server/stdinhand.c:3812
+#: server/stdinhand.c:3860
#, c-format
msgid "%s has conceded the game and can no longer win."
msgstr ""
-#: server/stdinhand.c:3817
+#: server/stdinhand.c:3865
#, fuzzy
msgid "You cannot surrender now."
msgstr "Du kan ikke oppløse enheter."
-#: server/stdinhand.c:3883
+#: server/stdinhand.c:3931
#, fuzzy
msgid "Not enough human players, game will not start."
msgstr "Ikke nok spillere, spillet vil ikke starte."
-#: server/stdinhand.c:3888
+#: server/stdinhand.c:3936
#, fuzzy
msgid "No players, game will not start."
msgstr "Ikke nok spillere, spillet vil ikke starte."
-#: server/stdinhand.c:3892
+#: server/stdinhand.c:3940
#, fuzzy
msgid "Not enough nations for all players, game will not start."
msgstr "Ikke nok spillere, spillet vil ikke starte."
-#: server/stdinhand.c:3901
+#: server/stdinhand.c:3949
#, fuzzy
msgid "All players are ready; starting game."
msgstr "Der finnes allerede en spiller med det navnet."
-#: server/stdinhand.c:3915
+#: server/stdinhand.c:3963
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:3922
+#: server/stdinhand.c:3970
msgid "Cannot start the game: it is already running."
msgstr "Kan ikke starte spill: det er allerede i gang."
-#: server/stdinhand.c:3953
+#: server/stdinhand.c:4001
#, c-format
msgid "Cutting connection %s."
msgstr "Avbryter forbindelse til %s."
-#: server/stdinhand.c:3972
+#: server/stdinhand.c:4020
msgid ""
"Welcome - this is the introductory help text for the Freeciv server.\n"
"\n"
@@ -6478,126 +6565,126 @@ msgstr ""
" save - lagre det nåværende spillet\n"
" quit - avslutte"
-#: server/stdinhand.c:4007 server/stdinhand.c:4010
+#: server/stdinhand.c:4055 server/stdinhand.c:4058
msgid "Command:"
msgstr "Kommando:"
-#: server/stdinhand.c:4014
+#: server/stdinhand.c:4062
msgid "Synopsis: "
msgstr "Betydning:"
-#: server/stdinhand.c:4023
+#: server/stdinhand.c:4071
#, c-format
msgid "Level: %s"
msgstr "Nivå: %s"
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4096
msgid "The following server commands are available:"
msgstr "Følgende serverkommandoer er tilgjengelige:"
-#: server/stdinhand.c:4123
+#: server/stdinhand.c:4171
#, c-format
msgid "Help argument '%s' is ambiguous."
msgstr "Hjelpeargument '%s' er ikke entydig."
-#: server/stdinhand.c:4128
+#: server/stdinhand.c:4176
#, c-format
msgid "No match for help argument '%s'."
msgstr "Ingen treff funnet for hjelpeargument '%s'."
-#: server/stdinhand.c:4194
+#: server/stdinhand.c:4242
#, c-format
msgid "Bad list argument: '%s'. Try '%shelp list'."
msgstr "Ulovlig listeargument: '%s'. Forsøk '%shelp list'."
-#: server/stdinhand.c:4234
+#: server/stdinhand.c:4282
msgid "List of players:"
msgstr "Liste over spillere:"
-#: server/stdinhand.c:4239
+#: server/stdinhand.c:4287
msgid "<no players>"
msgstr "<ingen spillere>"
-#: server/stdinhand.c:4256
+#: server/stdinhand.c:4304
#, c-format
msgid "user %s, "
msgstr "bruker %s, "
-#: server/stdinhand.c:4267
+#: server/stdinhand.c:4315
msgid ", Dead"
msgstr ", Død"
-#: server/stdinhand.c:4270
+#: server/stdinhand.c:4318
#, c-format
msgid ", difficulty level %s"
msgstr ", vanskelighetsgrad %s"
#. TRANS: continue list, in case comma is not the separator of choice.
-#: server/stdinhand.c:4275 server/stdinhand.c:4279 client/helpdata.c:257
-#: client/helpdata.c:752 client/text.c:241 client/text.c:1224
-#: client/text.c:1262
+#: server/stdinhand.c:4323 server/stdinhand.c:4327 client/helpdata.c:257
+#: client/helpdata.c:752 client/text.c:241 client/text.c:1229
+#: client/text.c:1267
#, c-format
msgid "?clistmore:, %s"
msgstr ", %s"
-#: server/stdinhand.c:4283
+#: server/stdinhand.c:4331
#, fuzzy
msgid ", ready"
msgstr ", Død"
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4333
msgid ", not ready"
msgstr ""
-#: server/stdinhand.c:4293
+#: server/stdinhand.c:4341
#, c-format
msgid " %d connection:"
msgid_plural " %d connections:"
msgstr[0] " %d forbindelse:"
msgstr[1] " %d forbindelse:"
-#: server/stdinhand.c:4299
+#: server/stdinhand.c:4347
#, 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:4304
+#: server/stdinhand.c:4352
msgid " (observer mode)"
msgstr " (observatør modus)"
-#: server/stdinhand.c:4322
+#: server/stdinhand.c:4370
#, fuzzy
msgid "List of teams:"
msgstr "Liste over spillere:"
#. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4332
+#: server/stdinhand.c:4380
#, c-format
msgid "%2d : '%s' : %d player"
msgid_plural "%2d : '%s' : %d players"
msgstr[0] ""
msgstr[1] ""
-#: server/stdinhand.c:4352
+#: server/stdinhand.c:4400
#, c-format
msgid "%2d : '%s' : 1 player : %s"
msgstr ""
-#: server/stdinhand.c:4360
+#: server/stdinhand.c:4408
#, c-format
msgid "Empty team: %s"
msgstr ""
-#: server/stdinhand.c:4371
+#: server/stdinhand.c:4419
msgid "List of connections to server:"
msgstr "List opp forbindelser til server:"
-#: server/stdinhand.c:4375
+#: server/stdinhand.c:4423
msgid "<no connections>"
msgstr "<ingen forbindelser>"
-#: server/stdinhand.c:4399
+#: server/stdinhand.c:4447
#, fuzzy
msgid "List of scenarios available:"
msgstr "Ingen enheter tilgjengelige"
@@ -6617,7 +6704,7 @@ msgstr "%s har forsket fram Framtidsteknologi %d."
msgid "%s acquired from %s!"
msgstr "%s har skaffet %s fra %s."
-#: server/techtools.c:220
+#: server/techtools.c:221
#, c-format
msgid ""
"Discovery of %s makes the government form %s available. You may want to "
@@ -6626,37 +6713,37 @@ msgstr ""
"Oppdagelsen av %s gjør styreformen %s tilgjengelig. Du vil kanskje starte en "
"revolusjon."
-#: server/techtools.c:301
+#: server/techtools.c:302
#, c-format
msgid "Discovery of %s OBSOLETES %s in %s!"
msgstr "Oppdagelsen av %s FORELDER %s i %s!"
-#: server/techtools.c:351
+#: server/techtools.c:352
#, fuzzy, c-format
msgid "Learned %s. Our scientists focus on %s; goal is %s."
msgstr "Oppdaget %s. Våre forskere fokuserer på %s, målet er %s."
-#: server/techtools.c:369
+#: server/techtools.c:370
#, c-format
msgid "Learned %s. Scientists choose to research %s."
msgstr "Lærte %s. Forskerne valgte å forske på %s."
-#: server/techtools.c:376
+#: server/techtools.c:377
#, c-format
msgid "Learned %s. "
msgstr "Du har lært %s."
-#: server/techtools.c:379
+#: server/techtools.c:380
#, c-format
msgid "Researching %s."
msgstr "Forsker på %s"
-#: server/techtools.c:385
+#: server/techtools.c:386
#, c-format
msgid "Learned %s. Scientists do not know what to research next."
msgstr "Lærte %s. Forskerne vet ikke hva de skal forske på videre."
-#: server/techtools.c:402
+#: server/techtools.c:403
msgid ""
"Great scientists from all the world join your civilization: you get an "
"immediate advance."
@@ -6664,22 +6751,22 @@ msgstr ""
"Kloke forskere fra hele verden flytter til din sivilisasjon; du får et "
"umiddelbart gjennombrudd."
-#: server/techtools.c:570
+#: server/techtools.c:571
#, c-format
msgid "Technology goal is %s."
msgstr "Teknologimålet er %s."
-#: server/techtools.c:700
+#: server/techtools.c:708
#, c-format
msgid "You steal %s from the %s."
msgstr "Du stjeler %s fra %s."
-#: server/techtools.c:705
+#: server/techtools.c:713
#, c-format
msgid "The %s stole %s from you!"
msgstr "%s stjal %s fra deg!"
-#: server/techtools.c:710
+#: server/techtools.c:718
#, c-format
msgid "The %s have stolen %s from the %s."
msgstr "Din %s stjal %s fra %s."
@@ -6703,153 +6790,159 @@ msgstr "Ingen enheter kunne oppgraderes."
msgid "%s upgraded to %s for %d gold."
msgstr "%s oppgradert til %s for %d gull."
-#: server/unithand.c:396
+#: server/unithand.c:402
#, c-format
msgid "%s refuses to disband!"
msgstr "%s nekter å oppløses!"
-#: server/unithand.c:449
+#: server/unithand.c:455
msgid "Can't place city here."
msgstr "Kan ikke plassere by her."
-#: server/unithand.c:456
+#: server/unithand.c:462
#, c-format
msgid "Only %s can build a city."
msgstr "Kun %s kan grunnlegge en by."
-#: server/unithand.c:461
+#: server/unithand.c:467
msgid "Can't build a city."
msgstr "Kan ikke grunnlegge en by."
-#: server/unithand.c:470
+#: server/unithand.c:476
#, c-format
msgid "Only %s can add to a city."
msgstr "Kun %s kan legge til på en by."
-#: server/unithand.c:475
+#: server/unithand.c:481
msgid "Can't add to a city."
msgstr "Kan ikke legge til på en by her."
-#: server/unithand.c:481
+#: server/unithand.c:487
#, c-format
msgid "%s unit has no moves left to add to %s."
msgstr "%s enhet har ikke flere flytt å legge til %s."
-#: server/unithand.c:487
+#: server/unithand.c:493
#, c-format
msgid "%s unit has no moves left to build city."
msgstr "%s enhet har ingen flytt igjen til å bygge by."
-#: server/unithand.c:492
+#. TRANS: <city> is owned by <nation>, cannot add <unit>.
+#: server/unithand.c:499
+#, fuzzy, c-format
+msgid "%s is owned by %s, cannot add %s."
+msgstr "%s er for stor til å legge til %s."
+
+#: server/unithand.c:506
#, c-format
msgid "%s is too big to add %s."
msgstr "%s er for stor til å legge til %s."
-#: server/unithand.c:498
+#: server/unithand.c:512
#, c-format
msgid "%s needs an improvement to grow, so you cannot add %s."
msgstr "%s trenger en forbedring for å vokse, så du kan ikke legge til %s."
-#: server/unithand.c:509
+#: server/unithand.c:523
#, c-format
msgid "Can't add %s to %s."
msgstr "kan ikke legge til %s til %s."
-#: server/unithand.c:531
+#: server/unithand.c:545
#, c-format
msgid "%s added to aid %s in growing."
msgstr "%s lagt til for å hjelpe %s å vokse."
-#: server/unithand.c:828
+#: server/unithand.c:842
msgid "Your Nuclear missile was shot down by SDI defences, what a waste."
msgstr "Din atomrakett ble skutt ned av SDI forsvar. For en sløsing."
-#: server/unithand.c:831
+#: server/unithand.c:845
#, c-format
msgid "The nuclear attack on %s was avoided by your SDI defense."
msgstr "Atomangrepet på %s ble unngått av ditt SDI-forsvar."
#. TRANS: "Your Cannon ... the Polish Destroyer."
-#: server/unithand.c:901
+#: server/unithand.c:915
#, fuzzy, c-format
msgid "Your %s survived the pathetic attack from the %s %s."
msgstr "Din %s overlevde det feige angrepet fra %s %s."
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unithand.c:910
+#: server/unithand.c:924
#, fuzzy, c-format
msgid "Your attacking %s failed against the %s %s!"
msgstr "Din %s mislykkes i sitt angrep mot %s %s!"
-#: server/unithand.c:983
+#: server/unithand.c:997
#, c-format
msgid "Only %s can attack from sea."
msgstr "Kun %s kan angripe fra sjøen."
-#: server/unithand.c:988
+#: server/unithand.c:1002
msgid "Cannot attack from sea."
msgstr "Kan ikke angripe fra sjøen."
-#: server/unithand.c:996 server/unittools.c:2137
+#: server/unithand.c:1010 server/unittools.c:2142
msgid "Cannot attack unless you declare war first."
msgstr "Kan ikke angripe hvis du ikke erklærer krig først."
-#: server/unithand.c:1001
+#: server/unithand.c:1015
#, c-format
msgid "%s can only move into your own zone of control."
msgstr "%s kan kun bevege seg i din kontrollsone."
-#: server/unithand.c:1007
+#: server/unithand.c:1021
#, fuzzy, c-format
msgid "Cannot invade unless you break peace with %s first."
msgstr "Kan ikke angripe hvis du ikke erklærer krig først."
-#: server/unithand.c:1052
+#: server/unithand.c:1066
msgid "This unit has no moves left."
msgstr "Denne enheten har ingen flytt igjen."
-#: server/unithand.c:1107
+#: server/unithand.c:1121
msgid "Unit must be on land to perform diplomatic action."
msgstr "Enheten må være på land for å utføre diplomatiske forhandlinger."
-#: server/unithand.c:1109
+#: server/unithand.c:1123
msgid "No diplomat action possible."
msgstr "Ikke mulig å utføre diplomattjenester."
-#: server/unithand.c:1125
+#: server/unithand.c:1139
#, c-format
msgid "You must declare war on %s first. Try using players dialog (F3)."
msgstr ""
-#: server/unithand.c:1143
+#: server/unithand.c:1157
msgid "This unit is being transported, and so cannot bombard."
msgstr "Denne enheten blir transportert, og kan dermed ikke bombardere."
-#: server/unithand.c:1158
+#: server/unithand.c:1172
msgid "You can't attack there."
msgstr "Du kan ikke angripe der."
-#: server/unithand.c:1180
+#: server/unithand.c:1194
msgid "This type of troops cannot take over a city."
msgstr "Denne typen enhet kan ikke ta over en by."
-#: server/unithand.c:1198
+#: server/unithand.c:1212
msgid "A transported unit is not allied to all units or city on target tile."
msgstr ""
"En transportert enhet er ikke alliert med alle enheter eller byer på "
"destinasjonen."
-#: server/unithand.c:1240
+#: server/unithand.c:1254
#, c-format
msgid "Your %s helps build the %s in %s (%d remaining)."
msgstr "Din %s hjelper å bygge %s i %s (%d gjenstående)."
-#: server/unithand.c:1242
+#: server/unithand.c:1256
#, c-format
msgid "Your %s helps build the %s in %s (%d surplus)."
msgstr "Din %s hjelper å bygge %s i %s (%d overskudd)."
-#: server/unithand.c:1286
+#: server/unithand.c:1300
#, c-format
msgid ""
"Sorry, your %s cannot establish a trade route because it has no home city"
@@ -6857,27 +6950,27 @@ msgstr ""
"Beklager, din %s kan ikke etablere en handelsrute her fordi den ikke har en "
"hjemby"
-#: server/unithand.c:1296
+#: server/unithand.c:1310
#, c-format
msgid "Sorry, your %s cannot establish a trade route between %s and %s"
msgstr "Beklager, din %s kan ikke etablere en handelsrute mellom %s og %s"
-#: server/unithand.c:1325 server/unithand.c:1344
+#: server/unithand.c:1339 server/unithand.c:1358
#, c-format
msgid "Sorry, your %s cannot establish a trade route here!"
msgstr "Beklager, din %s kan ikke etablere en handelsrute her!"
-#: server/unithand.c:1329 server/unithand.c:1348
+#: server/unithand.c:1343 server/unithand.c:1362
#, c-format
msgid " The city of %s already has %d better trade routes!"
msgstr " Byen %s har allerede %d bedre handelsruter!"
-#: server/unithand.c:1361 server/unithand.c:1373
+#: server/unithand.c:1375 server/unithand.c:1387
#, c-format
msgid "Sorry, %s has canceled the trade route from %s to your city %s."
msgstr "beklager, %s har avbrutt handelsruten fra %s til din by %s."
-#: server/unithand.c:1406
+#: server/unithand.c:1420
#, c-format
msgid ""
"Your %s from %s has arrived in %s, and revenues amount to %d in gold and "
@@ -6937,56 +7030,56 @@ msgid "Teleported your %s to %s."
msgstr "Teleportet din %s til %s."
#. TRANS: A unit is moved to resolve stack conflicts.
-#: server/unittools.c:1065
+#: server/unittools.c:1070
#, fuzzy, c-format
msgid "Moved your %s."
msgstr "Oppløste din %s."
-#: server/unittools.c:1076
+#: server/unittools.c:1081
#, c-format
msgid "Disbanded your %s."
msgstr "Oppløste din %s."
-#: server/unittools.c:1397
+#: server/unittools.c:1402
#, c-format
msgid "Unable to defend %s, %s has lost the game."
msgstr "Kan ikke forsvare %s, %s har tapt spillet."
-#: server/unittools.c:1401
+#: server/unittools.c:1406
#, c-format
msgid "Losing %s meant losing the game! Be more careful next time!"
msgstr "Ved å miste %s, så taper du spillet! Vær mer forsiktig neste gang!"
-#: server/unittools.c:1503
+#: server/unittools.c:1508
#, c-format
msgid "%s escaped the destruction of %s, and fled to %s."
msgstr "%s unnslapp ødeleggelsen av %s, og flyktet til %s."
# problem
-#: server/unittools.c:1512
+#: server/unittools.c:1517
#, c-format
msgid "%s lost when %s was lost."
msgstr "%s gikk tapt da %s gikk tapt."
-#: server/unittools.c:1561
+#: server/unittools.c:1566
#, c-format
msgid "Barbarian leader captured, %d gold ransom paid."
msgstr "Barbarleder fanget, %d gull betalt i løsepenger."
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unittools.c:1579
+#: server/unittools.c:1584
#, fuzzy, c-format
msgid "Your attacking %s succeeded against the %s %s!"
msgstr "Din %s lykkes i sitt angrep mot %s %s!"
#. TRANS: "Cannon ... the Polish Destroyer."
-#: server/unittools.c:1588 server/unittools.c:1646
+#: server/unittools.c:1593 server/unittools.c:1651
#, fuzzy, c-format
msgid "%s lost to an attack by the %s %s."
msgstr "%s gikk tapt i et angrep fra %s %s."
#. TRANS: "... Cannon ... the Polish Destroyer ...."
-#: server/unittools.c:1622
+#: server/unittools.c:1627
#, fuzzy, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -6997,7 +7090,7 @@ msgstr[1] "Din %s lykkes i sitt angrep mot %s %s %d!"
# problem
#. TRANS: "Cannon lost when the Polish Destroyer
#. * attacked the German Musketeers."
-#: server/unittools.c:1655
+#: server/unittools.c:1660
#, fuzzy, c-format
msgid "%s lost when the %s %s attacked the %s %s."
msgstr "%s gikk tapt i et angrep fra %ss %s."
@@ -7005,7 +7098,7 @@ msgstr "%s gikk tapt i et angrep fra %ss %s."
# problem
#. TRANS: "Musketeers (and Cannon) lost to an
#. * attack from the Polish Destroyer."
-#: server/unittools.c:1670
+#: server/unittools.c:1675
#, fuzzy, c-format
msgid "%s (and %s) lost to an attack from the %s %s."
msgstr "%s (%s) gikk tapt i et angrep fra %ss %s."
@@ -7014,7 +7107,7 @@ msgstr "%s (%s) gikk tapt i et angrep fra %ss %s."
#. TRANS: "Musketeers and 3 other units lost to
#. * an attack from the Polish Destroyer."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1680
+#: server/unittools.c:1685
#, fuzzy, 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."
@@ -7025,184 +7118,227 @@ msgstr[1] "%s (%d) gikk tapt i et angrep fra %ss %s."
#. TRANS: "2 units lost when the Polish Destroyer
#. * attacked the German Musketeers."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1694
+#: server/unittools.c:1699
#, fuzzy, 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 gikk tapt i et angrep fra %ss %s."
msgstr[1] "%d gikk tapt i et angrep fra %ss %s."
-#: server/unittools.c:1962
+#: server/unittools.c:1967
#, c-format
msgid "Your %s was nuked by %s."
msgstr "Din %s ble utsatt for atomangrep fra %s."
-#: server/unittools.c:1965 server/unittools.c:1981
+#: server/unittools.c:1970 server/unittools.c:1986
msgid "yourself"
msgstr "deg selv"
# problem
-#: server/unittools.c:1969
+#: server/unittools.c:1974
#, fuzzy, c-format
msgid "The %s %s was nuked."
msgstr "%ss %s ble utsatt for atomangrep."
-#: server/unittools.c:1978
+#: server/unittools.c:1983
#, c-format
msgid "%s was nuked by %s."
msgstr "%s ble utsatt for atomangrep fra %s."
-#: server/unittools.c:1986
+#: server/unittools.c:1991
#, c-format
msgid "You nuked %s."
msgstr "Du utførte et atomangrep mot %s."
-#: server/unittools.c:2027
+#: server/unittools.c:2032
#, fuzzy, c-format
msgid "The %s detonated a nuke!"
msgstr "%s detonerte en atombombe!"
-#: server/unittools.c:2051
+#: server/unittools.c:2056
#, c-format
msgid "%s transported successfully."
msgstr "%s ble transportert trygt fram."
-#: server/unittools.c:2103
+#: server/unittools.c:2108
msgid "This unit type can not be paradropped."
msgstr "Denne enheten kan ikke gjøre fallskjermhopp."
-#: server/unittools.c:2113
+#: server/unittools.c:2118
#, fuzzy
msgid "You cannot paradrop a unit that is transporting other units."
msgstr "Du kan ikke sende en transport-enhet med fallskjerm."
-#: server/unittools.c:2119
+#: server/unittools.c:2124
msgid "The destination location is not known."
msgstr "Bestemmelsesstedet er ukjent."
-#: server/unittools.c:2126
+#: server/unittools.c:2131
#, fuzzy, c-format
msgid "This unit cannot paradrop into %s."
msgstr "Denne enheten kan ikke ta fallskjermhopp ut i havet."
-#: server/unittools.c:2146
+#: server/unittools.c:2151
#, c-format
msgid "The distance to the target (%i) is greater than the unit's range (%i)."
msgstr "Lengden til målet (%i) er større enn enhetens rekkevidde (%i)."
-#: server/unittools.c:2157
+#: server/unittools.c:2162
#, fuzzy, c-format
msgid "Your %s paradropped into the %s and was lost."
msgstr "Dine %s utførte et fallskjermhopp ut i øde hav og druknet alle sammen."
-#: server/unittools.c:2170
+#: server/unittools.c:2175
#, c-format
msgid "Your %s was killed by enemy units at the paradrop destination."
msgstr "Dine %s ble slaktet på hoppstedet."
-#: server/unittools.c:2192
+#: server/unittools.c:2197
#, c-format
msgid "You found %d gold."
msgstr "Du fant %d gull."
-#: server/unittools.c:2209
+#: server/unittools.c:2214
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr "Du fant %s i eldgamle skriftruller med kunnskap."
-#: server/unittools.c:2216
+#: server/unittools.c:2221
#, c-format
msgid "The %s have acquired %s from ancient scrolls of wisdom."
msgstr "%s har tilegnet seg %s fra eldgamle skriftruller med kunnskap."
-#: server/unittools.c:2230
+#: server/unittools.c:2235
msgid "A band of friendly mercenaries joins your cause."
msgstr ""
"En gjeng med leiesoldater som ikke har sett penger på lenge slutter seg til "
"dine rekker."
-#: server/unittools.c:2248
+#: server/unittools.c:2253
msgid "An abandoned village is here."
msgstr "En forlatt landsby er her."
-#: server/unittools.c:2258
+#: server/unittools.c:2263
msgid "You have unleashed a horde of barbarians!"
msgstr "Du har fremprovosert en fiendtlig barbarhorde!"
-#: server/unittools.c:2261
+#: server/unittools.c:2266
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr "Dine %s har blitt slaktet av en gjeng med pinglete barbarer."
-#: server/unittools.c:2277
+#: server/unittools.c:2282
msgid "You found a friendly city."
msgstr "Du fant en vennlig by."
-#: server/unittools.c:2291
+#: server/unittools.c:2296
msgid "Friendly nomads are impressed by you, and join you."
msgstr ""
"Vennligsinnede nomader er imponert av at du kan spille munnspill under vann "
"og slutter seg til dine rekker."
-#: server/unittools.c:2316
+#: server/unittools.c:2321
msgid "Your overflight frightens the tribe; they scatter in terror."
msgstr "Din overflyvning skremmer stammen; de sprer seg i frykt."
-#: server/unittools.c:2574
+#: server/unittools.c:2579
#, fuzzy, c-format
msgid "Orders for %s aborted after enemy movement was spotted."
msgstr "Ordre for %s avbrutt, da der er enheter i veien."
-#: server/unittools.c:3023
+#: server/unittools.c:3028
#, c-format
msgid "Orders for %s aborted as there are units nearby."
msgstr "Ordre for %s avbrutt, da der er enheter i veien."
-#: server/unittools.c:3075
+#: server/unittools.c:3080
#, fuzzy, c-format
msgid "Orders for %s aborted because building of city failed."
msgstr "Ordre for %s ble avbrutt på grunn av et feilet flytt."
-#: server/unittools.c:3088
+#: server/unittools.c:3093
#, c-format
msgid "Orders for %s aborted since they give an invalid activity."
msgstr "Ordre for %s avbrutt, da da der er enheter i veien."
-#: server/unittools.c:3102
+#: server/unittools.c:3107
#, c-format
msgid "Orders for %s aborted since they give an invalid location."
msgstr "Ordre for %s avbrutt siden de angir en ugyldig plassering."
-#: server/unittools.c:3112
+#: server/unittools.c:3117
#, c-format
msgid "Orders for %s aborted as there are units in the way."
msgstr "%s avbrøt ordre da der er enheter i veien."
-#: server/unittools.c:3138
+#: server/unittools.c:3143
#, c-format
msgid "Orders for %s aborted because of failed move."
msgstr "Ordre for %s ble avbrutt på grunn av et feilet flytt."
-#: server/unittools.c:3179
+#: server/unittools.c:3184
#, fuzzy, c-format
msgid "Attempt to change homecity for %s failed."
msgstr "Forandret hjemby for %s i %s"
-#: server/unittools.c:3190
+#: server/unittools.c:3195
#, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr ""
-#: server/unittools.c:3202
+#: server/unittools.c:3207
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr ""
-#: server/unittools.c:3211
+#: server/unittools.c:3216
#, c-format
msgid "Your %s has invalid orders."
msgstr "Din %s har ugyldige ordre."
+#: server/voting.c:522
+#, fuzzy, c-format
+msgid ""
+"%s %d \"%s\" is passed %d to %d with %d abstentions and %d who did not vote."
+msgstr "Valget \"%s\" ble vedtatt med %d mot %d stemmer (%d stemte ikke)."
+
+#: server/voting.c:528
+#, fuzzy, c-format
+msgid ""
+"%s %d \"%s\" failed with %d against, %d for, %d abstentions and %d who did "
+"not vote."
+msgstr ""
+"Valget \"%s\" ble ikke vedtatt med %d mot, %d for og %d som unnlot å stemme."
+
+#: server/voting.c:548
+#, c-format
+msgid "%s %d: %s voted yes."
+msgstr ""
+
+#: server/voting.c:553
+#, c-format
+msgid "%s %d: %s voted no."
+msgstr ""
+
+#: server/voting.c:558
+#, c-format
+msgid "%s %d: %s chose to abstain."
+msgstr ""
+
+#. TRANS: Describing a new vote that can only pass
+#. * if there are no dissenting votes.
+#: server/voting.c:726
+#, c-format
+msgid "%s (needs %0.0f%% and no dissent)."
+msgstr ""
+
+#. TRANS: Describing a new vote that can pass only if the
+#. * given percentage of players votes 'yes'.
+#: server/voting.c:732
+#, c-format
+msgid "%s (needs %0.0f%% in favor)."
+msgstr ""
+
#: server/generator/mapgen.c:1771
msgid "High landmass - this may take a few seconds."
msgstr "Mye landmasse - dette kan ta noen sekunder."
@@ -7234,13 +7370,13 @@ msgstr ""
" Kanskje det er for mange spillere for dette kartet.\n"
"Vennligst rapporter denne feilen til %s."
-#: client/attribute.c:363
+#: client/attribute.c:368
#, fuzzy
msgid ""
"There has been a CMA error. Your citizen governor settings may be broken."
msgstr "Det har oppstått en Byforvaltningsfeil. Ditt oppsett kan være ødelagt."
-#: client/attribute.c:367
+#: client/attribute.c:372
msgid "Old attributes detected and removed."
msgstr "Gamle attributter oppdaget og fjernet."
@@ -7390,41 +7526,41 @@ msgstr "%s - %s innbyggere"
msgid "%+4d : Taxed from trade\n"
msgstr ""
-#: client/citydlg_common.c:418
+#: client/citydlg_common.c:421
#, fuzzy, c-format
msgid "%+4d : Trade route with %s\n"
msgstr "Handelsruter"
-#: client/citydlg_common.c:427
+#: client/citydlg_common.c:430
#, fuzzy, c-format
msgid "%+4d : Building tithes\n"
msgstr "Bygger enheter"
-#: client/citydlg_common.c:450
+#: client/citydlg_common.c:453
#, c-format
msgid "%+4d : Bonus from %s (%+d%%)\n"
msgstr ""
-#: client/citydlg_common.c:462
+#: client/citydlg_common.c:465
#, c-format
msgid "%+4d : Waste\n"
msgstr ""
-#: client/citydlg_common.c:468
+#: client/citydlg_common.c:471
#, c-format
msgid "%+4d : Disorder\n"
msgstr ""
-#: client/citydlg_common.c:474
+#: client/citydlg_common.c:477
#, c-format
msgid "%+4d : Used\n"
msgstr ""
-#: client/citydlg_common.c:479
+#: client/citydlg_common.c:482
msgid "==== : Adds up to\n"
msgstr ""
-#: client/citydlg_common.c:481
+#: client/citydlg_common.c:484
#, c-format
msgid "%4d : Total surplus"
msgstr ""
@@ -7748,50 +7884,50 @@ msgstr "?Spesielle:S"
msgid "Specialists"
msgstr "Spesielle"
-#: client/civclient.c:240
+#: client/civclient.c:241
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr " -a, --autoconnect\tHopper over Koble til dialogen\n"
-#: client/civclient.c:250
+#: client/civclient.c:251
msgid " -l, --log FILE\tUse FILE as logfile (spawned server also uses this)\n"
msgstr " -l, --log FILE\tBruk FILE som loggfil.\n"
-#: client/civclient.c:252
+#: client/civclient.c:253
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr " -m, --meta HOST\tKoble til metaserveren på HOST\n"
-#: client/civclient.c:254
+#: client/civclient.c:255
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr " -n, --name NAVN\tBruk NAVN som navn\n"
-#: client/civclient.c:256
+#: client/civclient.c:257
#, fuzzy
msgid " -p, --port PORT\tConnect to server port PORT (usually with -a)\n"
msgstr " -p, --port PORT\tKoble til PORT.\n"
-#: client/civclient.c:258
+#: client/civclient.c:259
#, c-format
msgid " -P, --Plugin PLUGIN\tUse PLUGIN for sound output %s\n"
msgstr " -P, --Plugin PLUGIN\tBenytter PLUGIN for lydstøtte %s\n"
-#: client/civclient.c:260
+#: client/civclient.c:261
msgid " -r, --read FILE\tRead startup script FILE (for spawned server only)\n"
msgstr " -r, --read FILE\tLes oppstartsmanus i FILE\n"
-#: client/civclient.c:263
+#: client/civclient.c:264
#, fuzzy
msgid " -s, --server HOST\tConnect to the server at HOST (usually with -a)\n"
msgstr " -s, --server S\tKoble til serveren S\n"
-#: client/civclient.c:265
+#: client/civclient.c:266
msgid " -S, --Sound FILE\tRead sound tags from FILE\n"
msgstr " -s, --sound FIL\tLes lyd-informasjon fra FIL\n"
-#: client/civclient.c:266
+#: client/civclient.c:267
msgid " -t, --tiles FILE\tUse data file FILE.tilespec for tiles\n"
msgstr " -t, --tiles FIL\tBruk datafile FIL.tilespec for grafikkoppsett\n"
-#: client/civclient.c:269
+#: client/civclient.c:270
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7801,45 +7937,45 @@ msgstr ""
"\t\t\tPrøv \"%s -- --help\" for mer info.\n"
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:274
+#: client/civclient.c:275
#, fuzzy, c-format
msgid "Report bugs at %s\n"
msgstr "Rapporter feil, unoter og/eller 'bugs' til <%s>.\n"
-#: client/civclient.c:298
+#: client/civclient.c:299
#, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr "Ugyldig portnummer \"%s\" spesifisert med --port valget.\n"
-#: client/civclient.c:300 client/civclient.c:315
+#: client/civclient.c:301 client/civclient.c:316
msgid "Try using --help.\n"
msgstr "Prøv --help.\n"
-#: client/civclient.c:313
+#: client/civclient.c:314
#, c-format
msgid "Invalid debug level \"%s\" specified with --debug option.\n"
msgstr "Ugyldig debuggingsnivå \"%s\" spesifisert med --debug valget.\n"
-#: client/civclient.c:326
+#: client/civclient.c:327
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr "Ukjent alternativ: \"%s\"\n"
-#: client/civclient.c:391
+#: client/civclient.c:393
#, fuzzy, c-format
msgid "Updating old metaserver address \"%s\"."
msgstr "metaserver <addresse>"
-#: client/civclient.c:394
+#: client/civclient.c:396
#, fuzzy, c-format
msgid "Default metaserver has been set to \"%s\"."
msgstr "Alternativ: %s har blitt satt til \"%s\"."
-#: client/civclient.c:550
+#: client/civclient.c:540
msgid "Game started."
msgstr "Spillet har startet."
-#: client/civclient.c:588
+#: client/civclient.c:606
msgid "There was an error while auto connecting; aborting."
msgstr "Det oppstod en feil under automatisk forbindelse, avbryter."
@@ -7969,17 +8105,17 @@ msgstr "Tilkobling under opprettelse."
msgid "Disconnected from server."
msgstr "Koblet fra tjeneren."
-#: client/clinet.c:469
+#: client/clinet.c:473
#, c-format
msgid "Failed to contact server \"%s\" at port %d as \"%s\" after %d attempts"
msgstr ""
"Kunne ikke koble til serveren \"%s\" på port %d som \"%s\" etter %d forsøk"
-#: client/clinet.c:484 client/clinet.c:486
+#: client/clinet.c:488 client/clinet.c:490
msgid "Connection to server refused. Please start the server."
msgstr "Forbindelse til serveren nektet. Vennligst start serveren."
-#: client/clinet.c:495 client/clinet.c:523
+#: client/clinet.c:499 client/clinet.c:527
#, c-format
msgid ""
"Error contacting server \"%s\" at port %d as \"%s\":\n"
@@ -7988,7 +8124,7 @@ msgstr ""
"Kunne ikke kontakte server \"%s\" på port %d som \"%s\":\n"
" %s\n"
-#: client/clinet.c:514
+#: client/clinet.c:518
#, c-format
msgid ""
"Auto-connecting to server \"%s\" at port %d as \"%s\" every %f second(s) for "
@@ -7997,53 +8133,53 @@ 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:1358
+#: client/connectdlg_common.c:78 client/gui-gtk-2.0/pages.c:1358
msgid "novice"
msgstr "nybegynner"
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1358
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
msgid "easy"
msgstr "lett"
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1359
msgid "normal"
msgstr "normal"
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr "vanskelig"
-#: client/connectdlg_common.c:83
+#: client/connectdlg_common.c:82
msgid "experimental"
msgstr "eksperimentell"
-#: client/connectdlg_common.c:213
+#: client/connectdlg_common.c:212
msgid "Starting server..."
msgstr "Starter tjeneren..."
-#: client/connectdlg_common.c:332
+#: client/connectdlg_common.c:331
msgid "Couldn't start the server."
msgstr "Klarte ikke å starte tjeneren."
-#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
+#: client/connectdlg_common.c:332 client/connectdlg_common.c:365
msgid "You'll have to start one manually. Sorry..."
msgstr "Du må starte en tjener selv. Beklager..."
-#: client/connectdlg_common.c:364
+#: client/connectdlg_common.c:363
msgid "Couldn't connect to the server."
msgstr "Klarte ikke å koble til tjeneren."
-#: client/connectdlg_common.c:365
+#: client/connectdlg_common.c:364
msgid "We probably couldn't start it from here."
msgstr "Vi kunne sannsynligvis ikke starte herfra."
-#: client/connectdlg_common.c:470
+#: client/connectdlg_common.c:469
#, fuzzy
msgid ""
"Established control over the server. You have command access level 'hack'."
msgstr "Vi har kontroll over tjeneren (hack tilgangsnivå)"
-#: client/connectdlg_common.c:475
+#: client/connectdlg_common.c:474
msgid ""
"Failed to obtain the required access level to take control of the server. "
"The server will now be shutdown."
@@ -8053,28 +8189,28 @@ msgstr ""
msgid "Only transporter units can be unloaded."
msgstr "Kun transportenheter kan lastes av."
-#: client/control.c:1425
+#: client/control.c:1417
#, fuzzy
msgid "Only settler units can be put into auto mode."
msgstr "Kun nybyggere og militære enheter i byer kan plasseres i auto-modus."
-#: client/control.c:1516
+#: client/control.c:1511
msgid "Only nuclear units can do this."
msgstr "Kun atombombe-enheter kan gjøre dette."
-#: client/control.c:1545
+#: client/control.c:1540
msgid "Only paratrooper units can do this."
msgstr "Kun fallskjermjegere kan gjøre dette."
-#: client/control.c:2020
+#: client/control.c:2015
msgid "Too far for this unit."
msgstr "For langt for denne enheten."
-#: client/control.c:2230 client/control.c:2260 client/control.c:2276
+#: client/control.c:2225 client/control.c:2255 client/control.c:2271
msgid "Didn't find a route to the destination!"
msgstr "Fant ingen rute til målet."
-#: client/control.c:2320
+#: client/control.c:2315
msgid "Oh my! You seem to have no capital!"
msgstr "Herregud! Du har ingen hovedstad!"
@@ -8470,27 +8606,34 @@ 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:1066 client/helpdata.c:1400
+#: client/helpdata.c:1066 client/helpdata.c:1408
msgid " or "
msgstr " eller "
-#: client/helpdata.c:1068 client/helpdata.c:1388
+#: client/helpdata.c:1068 client/helpdata.c:1396
msgid "?or:, "
msgstr "?eller:, "
-#: client/helpdata.c:1080
-#, 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"
+#: client/helpdata.c:1079
+#, fuzzy, c-format
+msgid "* Unit has to be in a city, or a base after %d turn.\n"
+msgid_plural "* Unit has to be in a city, or a base 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:1087
+#, fuzzy, c-format
+msgid "* Unit has to be in a city, a base, or on a %s after %d turn.\n"
+msgid_plural "* Unit has to be in a city, a base, 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:1122
+#: client/helpdata.c:1130
#, 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:1127
+#: client/helpdata.c:1135
#, c-format
msgid ""
"To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8499,91 +8642,91 @@ msgstr ""
"For å nå %s trenger vi å anskaffe %d andre teknologier først. Hele "
"prosjektet krever %d forskningspoeng for å fullføres."
-#: client/helpdata.c:1135
+#: client/helpdata.c:1143
msgid "You cannot research this technology."
msgstr "Du kan ikke forske på denne teknologien."
-#: client/helpdata.c:1139
+#: client/helpdata.c:1147
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:1151
+#: client/helpdata.c:1159
#, 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:1156
+#: client/helpdata.c:1164
#, 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:1159
+#: client/helpdata.c:1167
#, 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:1163
+#: client/helpdata.c:1171
msgid "* Increases the pollution generated by the population.\n"
msgstr "* Øker forurensningen skapt av befolkningen.\n"
-#: client/helpdata.c:1168
+#: client/helpdata.c:1176
#, c-format
msgid "* Allows %s to build roads on river squares.\n"
msgstr "* Tillater %s å bygge veier på elve-felt\n"
-#: client/helpdata.c:1175
+#: client/helpdata.c:1183
#, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr "* Tillater %s å bygge fort.\n"
-#: client/helpdata.c:1183
+#: client/helpdata.c:1191
#, c-format
msgid "* Allows %s to build airbases.\n"
msgstr "* Tillater %s å bygge flybaser.\n"
-#: client/helpdata.c:1192
+#: client/helpdata.c:1200
#, c-format
msgid "* Allows %s to upgrade roads to railroads.\n"
msgstr "* Tillater %s å oppgradere veier til jernbane.\n"
-#: client/helpdata.c:1200
+#: client/helpdata.c:1208
#, c-format
msgid "* Allows %s to upgrade irrigation to farmland.\n"
msgstr "* Tillater %s å oppgradere irrigert land til jordbruksland.\n"
-#: client/helpdata.c:1234
+#: client/helpdata.c:1242
msgid "* Pollution cannot be generated on this terrain."
msgstr "* Dette terrenget kan ikke bli forurenset."
-#: client/helpdata.c:1239
+#: client/helpdata.c:1247
msgid "* You cannot build cities on this terrain."
msgstr "* Kan ikke bygge byer på slikt terreng."
-#: client/helpdata.c:1245
+#: client/helpdata.c:1253
msgid "* The coastline of this terrain is unsafe."
msgstr "* Kystlinja til dette terrenget er utrygg."
-#: client/helpdata.c:1250
+#: client/helpdata.c:1258
msgid "* This terrain is unsafe for units to travel on."
msgstr "* Dette terrenget er utrygt for ferdsel."
-#: client/helpdata.c:1255
+#: client/helpdata.c:1263
msgid "* Land units cannot travel on oceanic terrains."
msgstr "* Landenheter kan ikke ferdes over havterreng."
-#: client/helpdata.c:1305
+#: client/helpdata.c:1313
msgid "Features:\n"
msgstr ""
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1411 client/helpdata.c:1412
+#: client/helpdata.c:1419 client/helpdata.c:1420
msgid "?outputlist: Nothing "
msgstr ""
-#: client/helpdata.c:1419
+#: client/helpdata.c:1427
#, fuzzy, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -8594,7 +8737,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:1429
+#: client/helpdata.c:1437
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8602,48 +8745,48 @@ msgid ""
msgstr ""
#. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1437
+#: client/helpdata.c:1445
#, c-format
msgid "* You pay %d times normal %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1442
+#: client/helpdata.c:1450
#, 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:1447
+#: client/helpdata.c:1455
#, c-format
msgid "* You pay no %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1451
+#: client/helpdata.c:1459
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:1460
+#: client/helpdata.c:1468
#, 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:1468
+#: client/helpdata.c:1476
#, c-format
msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
msgstr ""
-#: client/helpdata.c:1475
+#: client/helpdata.c:1483
#, 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:1482
+#: client/helpdata.c:1490
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -8651,23 +8794,23 @@ msgid ""
msgstr ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1489
+#: client/helpdata.c:1497
#, 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:1497
+#: client/helpdata.c:1505
#, c-format
msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
msgstr ""
-#: client/helpdata.c:1502
+#: client/helpdata.c:1510
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr ""
-#: client/helpdata.c:1507
+#: client/helpdata.c:1515
#, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -8678,7 +8821,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1519
+#: client/helpdata.c:1527
#, 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"
@@ -8686,64 +8829,64 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1530
+#: client/helpdata.c:1538
#, 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:1536
+#: client/helpdata.c:1544
#, fuzzy
msgid "* Your units cannot be bribed.\n"
msgstr "Denne enheten kan ikke bestikkes."
-#: client/helpdata.c:1539
+#: client/helpdata.c:1547
#, fuzzy
msgid "* Your cities cannot be incited.\n"
msgstr "Byen kan ikke bli infiltrert!"
-#: client/helpdata.c:1543
+#: client/helpdata.c:1551
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:1549
+#: client/helpdata.c:1557
msgid "* Has a senate that may prevent declaration of war.\n"
msgstr ""
-#: client/helpdata.c:1553
+#: client/helpdata.c:1561
msgid "* Allows partisans when cities are taken by the enemy.\n"
msgstr ""
-#: client/helpdata.c:1557
+#: client/helpdata.c:1565
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
msgstr ""
-#: client/helpdata.c:1561
+#: client/helpdata.c:1569
msgid "* Pays no upkeep for fanatics.\n"
msgstr ""
-#: client/helpdata.c:1564
+#: client/helpdata.c:1572
#, fuzzy
msgid "* Has no unhappy citizens.\n"
msgstr "%d ulykkelige innbyggere."
-#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
+#: client/helpdata.c:1582 client/helpdata.c:1586 client/helpdata.c:1590
#, c-format
msgid "* Veteran %s units.\n"
msgstr ""
-#: client/helpdata.c:1585
+#: client/helpdata.c:1593
#, fuzzy
msgid "* Veteran units.\n"
msgstr "Sjøenheter"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1591
+#: client/helpdata.c:1599
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8751,7 +8894,7 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1600
+#: client/helpdata.c:1608
#, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8759,71 +8902,71 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1608
+#: client/helpdata.c:1616
#, 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:1617
+#: client/helpdata.c:1625
#, c-format
msgid "* %s production is increased %d%%.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1625
+#: client/helpdata.c:1633
#, c-format
msgid "* %s production will suffer massive waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1630
+#: client/helpdata.c:1638
#, c-format
msgid "* %s production will suffer some waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1635
+#: client/helpdata.c:1643
#, 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:1643
+#: client/helpdata.c:1651
#, 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:1649
+#: client/helpdata.c:1657
#, 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:1655
+#: client/helpdata.c:1663
#, c-format
msgid "* %s waste will increase slowly with distance from capital.\n"
msgstr ""
-#: client/helpdata.c:1672
+#: client/helpdata.c:1680
#, 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:1699
+#: client/helpdata.c:1707
#, fuzzy, c-format
msgid "%s%d %s"
msgstr "%3d/%3d %s"
-#: client/helpdata.c:1700 client/helpdata.c:1708 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1708 client/helpdata.c:1716 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:1707
+#: client/helpdata.c:1715
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d ulykkelig"
@@ -8900,7 +9043,7 @@ msgid ""
"or with the -a command-line parameter."
msgstr ""
-#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:916 data/Freeciv.in:107
msgid "Metaserver"
msgstr "Metaserver"
@@ -9262,36 +9405,36 @@ msgstr "Lagring avbrutt; Klarer ikke skrive til fil %s"
msgid "Saved settings to file %s"
msgstr "Lagrer oppsett til filen %s"
-#: client/packhand.c:211 client/packhand.c:217
+#: client/packhand.c:212 client/packhand.c:218
#, fuzzy
msgid "You were rejected from the game...."
msgstr "Du ble vist bort fra spillet:"
-#: client/packhand.c:229
+#: client/packhand.c:230
#, c-format
msgid "Client capability string: %s"
msgstr "Klient egenskapsstreng: %s"
-#: client/packhand.c:232
+#: client/packhand.c:233
#, c-format
msgid "Server capability string: %s"
msgstr "Server egenskapsstreng: %s"
-#: client/packhand.c:850
+#: client/packhand.c:864
#, c-format
msgid "Start of turn %d"
msgstr "Runden begynner %d"
-#: client/packhand.c:1591
+#: client/packhand.c:1621
#, c-format
msgid "AI Mode is now %s."
msgstr "AI modus er nå %s."
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "ON"
msgstr "PÅ"
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "OFF"
msgstr "AV"
@@ -9323,15 +9466,15 @@ msgstr "Navn"
msgid "Username"
msgstr "Brukernavn"
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
-#: client/gui-gtk-2.0/pages.c:2157
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:653
+#: client/gui-gtk-2.0/pages.c:1604 client/gui-gtk-2.0/pages.c:2159
msgid "Flag"
msgstr "Flagg"
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1605
-#: client/gui-gtk-2.0/pages.c:2159 client/gui-sdl/repodlgs.c:2063
-#: client/gui-win32/connectdlg.c:990 client/gui-win32/dialogs.c:542
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:657
+#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1609
+#: client/gui-gtk-2.0/pages.c:2161 client/gui-sdl/repodlgs.c:2063
+#: client/gui-win32/connectdlg.c:992 client/gui-win32/dialogs.c:542
#: client/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "Nasjon"
@@ -9344,7 +9487,7 @@ msgstr "Grense"
msgid "Score"
msgstr "Poengsum"
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1614
msgid "Team"
msgstr "Lag"
@@ -9377,36 +9520,36 @@ msgstr "Ledig"
msgid "Ping"
msgstr "Ping"
-#: client/repodlgs_common.c:375
+#: client/repodlgs_common.c:378
msgid "You cannot sell improvements."
msgstr "Du kan ikke selge byforbedringer."
-#: client/repodlgs_common.c:391
+#: client/repodlgs_common.c:394
#, c-format
msgid "Sold %d %s for %d gold."
msgstr "Solgte %d %s for %d gull."
-#: client/repodlgs_common.c:396
+#: client/repodlgs_common.c:399
#, c-format
msgid "No %s could be sold."
msgstr "Ingen %s kunne selges."
#. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:415
+#: client/repodlgs_common.c:418
msgid "You cannot disband units."
msgstr "Du kan ikke oppløse enheter."
-#: client/repodlgs_common.c:420
+#: client/repodlgs_common.c:423
#, c-format
msgid "%s cannot be disbanded."
msgstr "%s kan ikke oppløses."
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:444
#, c-format
msgid "Disbanded %d %s."
msgstr "Oppløste %d %s."
-#: client/repodlgs_common.c:445
+#: client/repodlgs_common.c:448
#, c-format
msgid "No %s could be disbanded."
msgstr "Ingen %s kan oppløses."
@@ -10022,47 +10165,47 @@ msgstr "?dys/hrs:%02dd %02dt"
msgid "?duration:overflow"
msgstr "?duration:overflod"
-#: client/text.c:1143
+#: client/text.c:1145
#, c-format
msgid "%6d.%02d ms"
msgstr "%6d.%02d ms"
#. TRANS: <nation adjective> <government name>.
#. * E.g. "Polish Republic".
-#: client/text.c:1188
+#: client/text.c:1193
#, fuzzy, c-format
msgid "?nationgovernment:%s %s"
msgstr "Styreform: %s"
#. TRANS: "Observer: 1985"
-#: client/text.c:1198
+#: client/text.c:1203
#, fuzzy, c-format
msgid "Observer: %s"
msgstr "Observatør"
-#: client/text.c:1216
+#: client/text.c:1221
msgid "Buildings: "
msgstr "Bygninger:"
-#: client/text.c:1233 client/text.c:1272
+#: client/text.c:1238 client/text.c:1277
msgid "None. "
msgstr "Ingen. "
-#: client/text.c:1235 client/text.c:1274
+#: client/text.c:1240 client/text.c:1279
msgid "?clistend:."
msgstr "."
-#: client/text.c:1253
+#: client/text.c:1258
msgid "Wonders: "
msgstr "Underverk: "
-#: client/text.c:1308
+#: client/text.c:1313
#, 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:1312
+#: client/text.c:1317
#, fuzzy, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
@@ -10070,19 +10213,19 @@ msgstr[0] "%d forn
msgstr[1] "%d fornøyd før straff med "
#. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1318
+#: client/text.c:1323
#, fuzzy, c-format
msgid "%d additional unhappy citizen."
msgid_plural "%d additional unhappy citizens."
msgstr[0] "%d ulykkelige innbyggere."
msgstr[1] "%d ulykkelige innbyggere."
-#: client/text.c:1339
+#: client/text.c:1344
#, fuzzy
msgid "Unlimited martial law in effect."
msgstr "Unntakstilstand ("
-#: client/text.c:1341
+#: client/text.c:1346
#, fuzzy, c-format
msgid "%d military unit may impose martial law."
msgid_plural "Up to %d military units may impose martial law."
@@ -10091,7 +10234,7 @@ msgstr[0] ""
msgstr[1] ""
"* En ikke-militær enhet (kan ikke angripe; ingen unntakstilstand).\n"
-#: client/text.c:1345
+#: client/text.c:1350
#, fuzzy, c-format
msgid "Each military unit makes %d unhappy citizen content."
msgid_plural "Each military unit makes %d unhappy citizens content."
@@ -10100,31 +10243,31 @@ msgstr[0] ""
msgstr[1] ""
"Underholder borgerne i en by, ved å gjøre 3 ulykkelige borgere fornøyd."
-#: client/text.c:1352
+#: client/text.c:1357
msgid "Military units in the field may cause unhappiness. "
msgstr "Militære enheter i felten kan føre til ulykkelighet. "
-#: client/text.c:1355
+#: client/text.c:1360
msgid "Military units have no happiness effect. "
msgstr "Militære enheter har ingen innvirkning på lykkeligheten."
-#: client/text.c:1370
+#: client/text.c:1375
#, c-format
msgid "Luxury: %d total."
msgstr "Luksus: %d totalt"
-#: client/tilespec.c:865
+#: client/tilespec.c:882
msgid "No usable default tileset found, aborting!"
msgstr "Ingen standard grafikkoppsett funnet, avbryter!"
-#: client/tilespec.c:1338
+#: client/tilespec.c:1355
msgid ""
"Client does not support isometric tilesets. Using default tileset instead."
msgstr ""
"Klienten støtter ikke isometrisk grafikkoppsett. Bruker alminnelig grafikk "
"istedet."
-#: client/tilespec.c:1347
+#: client/tilespec.c:1364
msgid ""
"Client does not support overhead view tilesets. Using default tileset "
"instead."
@@ -10132,7 +10275,7 @@ msgstr ""
"Klienten støtter ikke grafikkoppsett sett ovenfra. Benytter standard grafikk "
"i stedet."
-#: client/tilespec.c:3966
+#: client/tilespec.c:3987
#, fuzzy, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -10825,7 +10968,7 @@ msgid "_Display"
msgstr "V_is"
#: client/gui-gtk-2.0/cityrep.c:1006 client/gui-gtk-2.0/menu.c:839
-#: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
+#: client/gui-sdl/diplodlg.c:692 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
#: client/gui-xaw/cityrep.c:533 client/gui-xaw/menu.c:156
@@ -11001,199 +11144,199 @@ msgstr "Hva skal vi kalle forh
msgid "Remove this preset?"
msgstr "Fjern denne innstillingen?"
-#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:222
+#: client/gui-gtk-2.0/dialogs.c:197 client/gui-gtk-2.0/messagewin.c:222
#, fuzzy
msgid "Goto _Location"
msgstr "_Gå til"
-#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
+#: client/gui-gtk-2.0/dialogs.c:202 client/gui-gtk-2.0/messagewin.c:226
#, fuzzy
msgid "Inspect _City"
msgstr "_Vis by"
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:258 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:258 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:259 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:311 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:312 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:312 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:313 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:506
+#: client/gui-gtk-2.0/dialogs.c:507
msgid "Unit"
msgstr "Enhet"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:950
-#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2155
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:985
+#: client/gui-gtk-2.0/dialogs.c:508 client/gui-gtk-2.0/pages.c:950
+#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2157
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:987
#: 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:519 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:520 client/gui-sdl/dialogs.c:627
msgid "Unit selection"
msgstr "Valg av enheter"
-#: client/gui-gtk-2.0/dialogs.c:582
+#: client/gui-gtk-2.0/dialogs.c:583
msgid "_Ready all"
msgstr "_Klargjør alle"
-#: client/gui-gtk-2.0/dialogs.c:590
+#: client/gui-gtk-2.0/dialogs.c:591
msgid "_Sentry idle"
msgstr "Inaktive enheter hold _stand"
-#: client/gui-gtk-2.0/dialogs.c:719
+#: client/gui-gtk-2.0/dialogs.c:721
#, fuzzy
msgid "Nation _Groups:"
msgstr "_Nasjoner:"
-#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:766 data/Freeciv.in:3128
msgid "What Nation Will You Be?"
msgstr "Hvilken nasjon vil du være?"
-#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
-#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
+#: client/gui-gtk-2.0/dialogs.c:768 client/gui-sdl/chatline.c:842
+#: client/gui-win32/connectdlg.c:1040 data/Freeciv.in:3371
#, fuzzy
msgid "Pick Nation"
msgstr "Politistasjon"
-#: client/gui-gtk-2.0/dialogs.c:774
+#: client/gui-gtk-2.0/dialogs.c:776
#, fuzzy
msgid "_Random Nation"
msgstr "Forente Nasjoner"
-#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:792 client/gui-win32/dialogs.c:517
msgid "Select a nation"
msgstr "Velg en nasjon"
-#: client/gui-gtk-2.0/dialogs.c:804
+#: client/gui-gtk-2.0/dialogs.c:810
msgid "_Properties"
msgstr "_Alternativer"
-#: client/gui-gtk-2.0/dialogs.c:824
+#: client/gui-gtk-2.0/dialogs.c:830
msgid "_Leader:"
msgstr "_Leder:"
-#: client/gui-gtk-2.0/dialogs.c:831
+#: client/gui-gtk-2.0/dialogs.c:837
msgid "_Female"
msgstr "_Kvinne"
-#: client/gui-gtk-2.0/dialogs.c:836
+#: client/gui-gtk-2.0/dialogs.c:842
msgid "_Male"
msgstr "_Mann"
-#: client/gui-gtk-2.0/dialogs.c:863
+#: client/gui-gtk-2.0/dialogs.c:869
#, fuzzy
msgid "City _Styles:"
msgstr "_Bystil:"
-#: client/gui-gtk-2.0/dialogs.c:902
+#: client/gui-gtk-2.0/dialogs.c:908
#, fuzzy
msgid "_Description"
msgstr "_Forklaring"
-#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1263 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:1253 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1268 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:1262 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1277 client/gui-sdl/dialogs.c:2204
#: 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:1306 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1318 client/gui-win32/citydlg.c:1454
#: data/Freeciv.in:2484
msgid "Upgrade Unit!"
msgstr "Oppgrader enhet!"
-#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1327 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 "Oppgrader foreldede enheter"
-#: client/gui-gtk-2.0/diplodlg.c:231 client/gui-win32/diplodlg.c:151
+#: client/gui-gtk-2.0/diplodlg.c:222 client/gui-win32/diplodlg.c:151
#: client/gui-xaw/diplodlg.c:383 client/gui-xaw/diplodlg.c:401
msgid "World-map"
msgstr "Verdenskart"
-#: client/gui-gtk-2.0/diplodlg.c:237 client/gui-win32/diplodlg.c:146
+#: client/gui-gtk-2.0/diplodlg.c:228 client/gui-win32/diplodlg.c:146
#: client/gui-xaw/diplodlg.c:387 client/gui-xaw/diplodlg.c:405
msgid "Sea-map"
msgstr "Sjøkart"
-#: client/gui-gtk-2.0/diplodlg.c:243
+#: client/gui-gtk-2.0/diplodlg.c:234
msgid "_Maps"
msgstr "_Kart"
-#: client/gui-gtk-2.0/diplodlg.c:274
+#: client/gui-gtk-2.0/diplodlg.c:265
msgid "_Advances"
msgstr "_Fremskritt"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/diplodlg.c:315 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "_Byer"
-#: client/gui-gtk-2.0/diplodlg.c:333
+#: client/gui-gtk-2.0/diplodlg.c:324
msgid "_Give shared vision"
msgstr "_Gi delt utsyn"
-#: client/gui-gtk-2.0/diplodlg.c:346
+#: client/gui-gtk-2.0/diplodlg.c:337
msgid "Give _embassy"
msgstr "Gi _ambassade"
-#: client/gui-gtk-2.0/diplodlg.c:376
+#: client/gui-gtk-2.0/diplodlg.c:368
msgid "_Pacts"
msgstr "_Avtaler"
-#: client/gui-gtk-2.0/diplodlg.c:466
+#: client/gui-gtk-2.0/diplodlg.c:458
#, fuzzy, c-format
msgid "Diplomacy: %s"
msgstr "Diplomati"
-#: client/gui-gtk-2.0/diplodlg.c:473
+#: client/gui-gtk-2.0/diplodlg.c:465
msgid "_Cancel meeting"
msgstr "Avlys mø_te"
-#: client/gui-gtk-2.0/diplodlg.c:475
+#: client/gui-gtk-2.0/diplodlg.c:467
msgid "Accept _treaty"
msgstr "_Aksepter avtale"
-#: client/gui-gtk-2.0/diplodlg.c:503
+#: client/gui-gtk-2.0/diplodlg.c:495
msgid "C_lauses:"
msgstr "_Klausul:"
-#: client/gui-gtk-2.0/diplodlg.c:568 client/gui-gtk-2.0/diplodlg.c:642
+#: client/gui-gtk-2.0/diplodlg.c:560 client/gui-gtk-2.0/diplodlg.c:634
msgid "_Gold:"
msgstr "_Gull:"
-#: client/gui-gtk-2.0/diplodlg.c:580 client/gui-gtk-2.0/diplodlg.c:654
+#: client/gui-gtk-2.0/diplodlg.c:572 client/gui-gtk-2.0/diplodlg.c:646
msgid "_Add Clause..."
msgstr "_Legg til klausul..."
-#: client/gui-gtk-2.0/diplodlg.c:699
+#: client/gui-gtk-2.0/diplodlg.c:691
msgid "--- This treaty is blank. Please add some clauses. ---"
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:905 client/gui-sdl/diplodlg.c:375
+#: client/gui-gtk-2.0/diplodlg.c:897 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 "Ugyldig mengde gull spesifisert"
@@ -11252,99 +11395,99 @@ msgstr "Velg destinasjon"
msgid "Show _All Cities"
msgstr "Vis _alle byer"
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:164
msgid "Show Map Scrollbars"
msgstr "Vis scrollbar på kart"
-#: client/gui-gtk-2.0/gui_main.c:163
+#: client/gui-gtk-2.0/gui_main.c:165
msgid "Disable this option to hide the scrollbars on the map view."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:169
msgid "Keyboardless goto"
msgstr "Tastaturløs gå-til"
-#: client/gui-gtk-2.0/gui_main.c:168
+#: client/gui-gtk-2.0/gui_main.c:170
msgid ""
"If this option is set then a goto may be initiated by left-clicking and then "
"holding down the mouse button while dragging the mouse onto a different tile."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:173
+#: client/gui-gtk-2.0/gui_main.c:175
msgid "Keep dialogs on top"
msgstr "Hold dialoger øverst"
-#: client/gui-gtk-2.0/gui_main.c:174
+#: client/gui-gtk-2.0/gui_main.c:176
msgid ""
"If this option is set then dialog windows will always remain in front of the "
"main Freeciv window. Disabling this has no effect in fullscreen mode."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:178
+#: client/gui-gtk-2.0/gui_main.c:180
msgid "Show worklist task icons"
msgstr "Vis arbeidsliste ikoner"
-#: client/gui-gtk-2.0/gui_main.c:179
+#: client/gui-gtk-2.0/gui_main.c:181
msgid ""
"Disabling this will turn off the unit and building icons in the worklist "
"dialog and the production tab of the city dialog."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:183
+#: client/gui-gtk-2.0/gui_main.c:185
msgid "Enable status report tabs"
msgstr "Gjør statusrapportark tilgjengelig"
-#: client/gui-gtk-2.0/gui_main.c:184
+#: client/gui-gtk-2.0/gui_main.c:186
msgid ""
"If this option is enabled then report dialogs will be shown as separate tabs "
"rather than in popup dialogs."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:189 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:191 client/gui-win32/gui_main.c:110
msgid "Better fog-of-war drawing"
msgstr "Bedre krigståke kvalitet"
-#: client/gui-gtk-2.0/gui_main.c:190 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:192 client/gui-win32/gui_main.c:111
msgid ""
"If this is enabled then a better method is used for drawing fog-of-war. It "
"is not any slower but will consume about twice as much memory."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:195
+#: client/gui-gtk-2.0/gui_main.c:197
msgid "Show time for each chat message"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:196
+#: client/gui-gtk-2.0/gui_main.c:198
msgid ""
"If this option is enabled then all chat messages will be prefixed by a time "
"string of the form [hour:minute:second]."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:201
+#: client/gui-gtk-2.0/gui_main.c:203
msgid "Split bottom notebook area"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:202
+#: client/gui-gtk-2.0/gui_main.c:204
msgid ""
"Enabling this option will split the bottom notebook into a left and right "
"notebook so that two tabs may be viewed at once."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:207
+#: client/gui-gtk-2.0/gui_main.c:209
msgid "New message events go to top of list"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:208
+#: client/gui-gtk-2.0/gui_main.c:210
msgid ""
"If this option is enabled, new events in the message window will appear at "
"the top of the list, rather than being appended at the bottom."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:213
+#: client/gui-gtk-2.0/gui_main.c:215
msgid "Show extra message window buttons"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:214
+#: client/gui-gtk-2.0/gui_main.c:216
msgid ""
"If this option is enabled, there will be two buttons displayed in the "
"message window for inspecting a city and going to a location. If this option "
@@ -11354,22 +11497,22 @@ msgid ""
"closed and reopened."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:224
+#: client/gui-gtk-2.0/gui_main.c:226
#, fuzzy
msgid "Metaserver tab first in network page"
msgstr "Metaserver emne-streng satt til '%s'."
-#: client/gui-gtk-2.0/gui_main.c:225
+#: client/gui-gtk-2.0/gui_main.c:227
msgid ""
"If this option is enabled, the metaserver tab will be the first notebook tab "
"in the network page. This option requires a restart in order to take effect."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:230
+#: client/gui-gtk-2.0/gui_main.c:232
msgid "Plain chat messages are sent to allies only"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:231
+#: client/gui-gtk-2.0/gui_main.c:233
msgid ""
"If this option is enabled, then plain messages typed into the chat entry "
"while the game is running will only be sent to your allies. Otherwise plain "
@@ -11379,28 +11522,41 @@ msgid ""
"visible in multiplayer games)."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:340 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:245
+msgid "Arrange widgets for small displays"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:246
+msgid ""
+"If this option is enabled, widgets in the main window will be arrange so "
+"that they take up the least amount of total screen space. Specifically, the "
+"left panel containing the overview, player status, and the unit information "
+"box will be extended over the entire left side of the window. This option "
+"requires a restart in order to take effect."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:352 client/gui-xaw/gui_main.c:245
msgid ""
"This client has no special command line options\n"
"\n"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
+#: client/gui-gtk-2.0/gui_main.c:847 client/gui-gtk-2.0/gui_main.c:1542
msgid "Freeciv"
msgstr "Freeciv"
-#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
+#: client/gui-gtk-2.0/gui_main.c:1251 client/gui-gtk-2.0/gui_main.c:1258
#: client/gui-sdl/mapctrl.c:1566 client/gui-win32/gui_main.c:482
#: data/Freeciv.in:2618
msgid "Turn Done"
msgstr "Runde over"
-#: client/gui-gtk-2.0/gui_main.c:1232 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1258 client/gui-sdl/mapctrl.c:1566
#: client/gui-sdl/mapview.c:1082
msgid "Shift+Return"
msgstr "Skift+Enter"
-#: client/gui-gtk-2.0/gui_main.c:1266 client/gui-gtk-2.0/menu.c:797
+#: client/gui-gtk-2.0/gui_main.c:1299 client/gui-gtk-2.0/menu.c:797
#: client/gui-gtk-2.0/menu.c:799 client/gui-gtk-2.0/menu.c:801
#: client/gui-gtk-2.0/menu.c:803 client/gui-gtk-2.0/menu.c:805
#: client/gui-gtk-2.0/menu.c:807 client/gui-gtk-2.0/menu.c:809
@@ -11419,11 +11575,11 @@ msgstr "Skift+Enter"
msgid "View"
msgstr "Kartvindu"
-#: client/gui-gtk-2.0/gui_main.c:1359
+#: client/gui-gtk-2.0/gui_main.c:1393
msgid "Chat"
msgstr "Beskjeder"
-#: client/gui-gtk-2.0/gui_main.c:1377 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1411 client/gui-win32/gui_main.c:538
#: data/Freeciv.in:2809
msgid ""
"Freeciv is free software and you are welcome to distribute copies of it\n"
@@ -11437,88 +11593,88 @@ msgstr ""
"Besøk http://www.freeciv.org/ for oppdaterte versjoner av Freeciv, \n"
"og for å rapportere feil ved Freeciv eller den norske oversettelsen."
-#: client/gui-gtk-2.0/gui_main.c:1392
+#: client/gui-gtk-2.0/gui_main.c:1426
msgid "Allies Only"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1657
+#: client/gui-gtk-2.0/gui_main.c:1691
msgid "Not _ready"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
+#: client/gui-gtk-2.0/gui_main.c:1702 client/gui-gtk-2.0/pages.c:1679
#, fuzzy
msgid "_Ready"
msgstr "_Klargjør alle"
-#: client/gui-gtk-2.0/gui_main.c:1672 client/gui-gtk-2.0/gui_main.c:1678
-#: client/gui-gtk-2.0/pages.c:2204
+#: client/gui-gtk-2.0/gui_main.c:1706 client/gui-gtk-2.0/gui_main.c:1712
+#: client/gui-gtk-2.0/pages.c:2206
msgid "_Start"
msgstr "_Start"
-#: client/gui-gtk-2.0/gui_main.c:1686
+#: client/gui-gtk-2.0/gui_main.c:1720
#, fuzzy
msgid "_Take Player"
msgstr "Byer"
-#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
+#: client/gui-gtk-2.0/gui_main.c:1723 client/gui-gtk-2.0/pages.c:1669
#, fuzzy
msgid "Pick _Nation"
msgstr "Politistasjon"
-#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
+#: client/gui-gtk-2.0/gui_main.c:1730 client/gui-gtk-2.0/pages.c:1674
#, fuzzy
msgid "_Observe"
msgstr "_Observatør"
-#: client/gui-gtk-2.0/gui_main.c:1698
+#: client/gui-gtk-2.0/gui_main.c:1732
#, fuzzy
msgid "Do not _observe"
msgstr "_observerer nå"
-#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1755 client/gui-xaw/pages.c:211
#, fuzzy
msgid "<AI>"
msgstr "AI"
-#: client/gui-gtk-2.0/gui_main.c:1723
+#: client/gui-gtk-2.0/gui_main.c:1758
msgid "<Novice AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1726
+#: client/gui-gtk-2.0/gui_main.c:1761
#, fuzzy
msgid "<Easy AI>"
msgstr "AI"
-#: client/gui-gtk-2.0/gui_main.c:1729
+#: client/gui-gtk-2.0/gui_main.c:1764
msgid "<Normal AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1732
+#: client/gui-gtk-2.0/gui_main.c:1767
#, fuzzy
msgid "<Hard AI>"
msgstr "AI"
-#: client/gui-gtk-2.0/gui_main.c:1742 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1777 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:1808
+#: client/gui-gtk-2.0/gui_main.c:1844 client/gui-gtk-2.0/gui_main.c:1858
#, fuzzy
msgid "Observer"
msgstr "Observatør"
-#: client/gui-gtk-2.0/gui_main.c:1808
+#: client/gui-gtk-2.0/gui_main.c:1858
#, fuzzy
msgid "Detached"
msgstr "Død"
-#: client/gui-gtk-2.0/gui_main.c:2073
+#: client/gui-gtk-2.0/gui_main.c:2117
msgid "Are you sure you want to quit?"
msgstr "Er du sikker på at du vil avslutte?"
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
#, c-format
msgid ""
"Close Tab:\n"
@@ -11527,7 +11683,7 @@ msgstr ""
"Lukke ark:\n"
"%s"
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
msgid "Ctrl+W"
msgstr "Ktrl+W"
@@ -11633,8 +11789,8 @@ msgid "Trans. Rslt/Time:"
msgstr "Trans. Rslt/Tid:"
#: 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
-#: client/gui-win32/helpdlg.c:709 client/gui-win32/helpdlg.c:733
+#: client/gui-win32/helpdlg.c:502 client/gui-win32/helpdlg.c:550
+#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:739
#: client/gui-xaw/helpdlg.c:759 client/gui-xaw/helpdlg.c:808
#: client/gui-xaw/helpdlg.c:816 client/gui-xaw/helpdlg.c:853
#: client/gui-xaw/helpdlg.c:878
@@ -11681,34 +11837,34 @@ msgstr "med"
msgid "?techhelp:"
msgstr "?techhelp:"
-#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:591
+#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:597
#: client/gui-xaw/helpdlg.c:996
#, c-format
msgid "+%d Trade / %d"
msgstr "+%d Handel / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:595
+#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:601
#: client/gui-xaw/helpdlg.c:1000
#, c-format
msgid "no extra / %d"
msgstr "ingen ekstra / %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
-#: client/gui-win32/helpdlg.c:602 client/gui-win32/helpdlg.c:616
-#: client/gui-win32/helpdlg.c:635 client/gui-xaw/helpdlg.c:1002
+#: client/gui-gtk-2.0/helpdlg.c:1085 client/gui-win32/helpdlg.c:604
+#: client/gui-win32/helpdlg.c:608 client/gui-win32/helpdlg.c:622
+#: client/gui-win32/helpdlg.c:641 client/gui-xaw/helpdlg.c:1002
#: client/gui-xaw/helpdlg.c:1006 client/gui-xaw/helpdlg.c:1020
#: client/gui-xaw/helpdlg.c:1039
msgid "n/a"
msgstr "-"
-#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:605
+#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:611
#: client/gui-xaw/helpdlg.c:1009
#, c-format
msgid "+%d Food / %d"
msgstr "+%d Mat / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:619
+#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:625
#: client/gui-xaw/helpdlg.c:1023
#, c-format
msgid "+%d Res. / %d"
@@ -12496,41 +12652,41 @@ msgstr "K_oble til nettverksspill"
msgid "Connect to Gaming _Zone"
msgstr "Koble til nettverksspill"
-#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:302
#: 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:779 client/gui-gtk-2.0/pages.c:820
-#: client/gui-win32/connectdlg.c:916
+#: client/gui-win32/connectdlg.c:918
msgid "Server Name"
msgstr "Servernavn"
#: client/gui-gtk-2.0/pages.c:780 client/gui-gtk-2.0/pages.c:821
-#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:916
+#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:918
#: data/Freeciv.in:96
msgid "Port"
msgstr "Port"
#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Version"
msgstr "Versjon"
#: client/gui-gtk-2.0/pages.c:782 client/gui-gtk-2.0/pages.c:823
-#: client/gui-gtk-2.0/pages.c:2161 client/gui-win32/connectdlg.c:917
-#: client/gui-win32/connectdlg.c:995
+#: client/gui-gtk-2.0/pages.c:2163 client/gui-win32/connectdlg.c:919
+#: client/gui-win32/connectdlg.c:997
msgid "Status"
msgstr "Status"
#: client/gui-gtk-2.0/pages.c:783 client/gui-gtk-2.0/pages.c:824
#: client/gui-sdl/connectdlg.c:318 client/gui-sdl/plrdlg.c:330
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Players"
msgstr "Spillere"
#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
-#: client/gui-win32/connectdlg.c:918
+#: client/gui-win32/connectdlg.c:920
msgid "Comment"
msgstr "Kommentar"
@@ -12562,9 +12718,9 @@ msgstr "Pass_ord:"
msgid "Conf_irm Password:"
msgstr "_Gjenta passord:"
-#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2165
#: 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:1000
+#: client/gui-win32/citydlg.c:1083 client/gui-win32/connectdlg.c:1002
#: client/gui-win32/wldlg.c:800 client/gui-win32/wldlg.c:806
msgid "Type"
msgstr "Type"
@@ -12666,7 +12822,7 @@ msgstr "Datastyrte spilleres _vanskelighetsgrad:"
msgid "Ruleset _Version:"
msgstr "Hersker:"
-#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2195
msgid "_More Game Options..."
msgstr "_Flere valg..."
@@ -12685,49 +12841,49 @@ msgstr "Skrivekunst"
msgid "Ready"
msgstr "Klargjør alle"
-#: client/gui-gtk-2.0/pages.c:1601
+#: client/gui-gtk-2.0/pages.c:1600
#, fuzzy
msgid "?player:Leader"
msgstr "Navn"
-#: client/gui-gtk-2.0/pages.c:1732 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1734 client/gui-sdl/chatline.c:185
msgid "Choose Saved Game to Load"
msgstr "Velg lagrefil å laste"
-#: client/gui-gtk-2.0/pages.c:1824
+#: client/gui-gtk-2.0/pages.c:1826
msgid "Choose Saved Game to _Load:"
msgstr "Velg lagrefil å _laste:"
-#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
-#: client/gui-gtk-2.0/pages.c:2451
+#: client/gui-gtk-2.0/pages.c:1846 client/gui-gtk-2.0/pages.c:2039
+#: client/gui-gtk-2.0/pages.c:2455
msgid "_Browse..."
msgstr "_Let etter fil..."
-#: client/gui-gtk-2.0/pages.c:1911
+#: client/gui-gtk-2.0/pages.c:1913
msgid "Choose a Scenario"
msgstr "Velg et ferdiglagd oppsett"
-#: client/gui-gtk-2.0/pages.c:1998
+#: client/gui-gtk-2.0/pages.c:2000
msgid "Choose a _Scenario:"
msgstr "Velg et ferdiglagd _oppsett:"
-#: client/gui-gtk-2.0/pages.c:2173
+#: client/gui-gtk-2.0/pages.c:2175
msgid "Choose a _nation to play:"
msgstr "Velg en _nasjon å spille:"
-#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2367 client/gui-win32/menu.c:581
msgid "Select Location to Save"
msgstr "Velg plassering for å lagre spillet"
-#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2452 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "Lagre spill"
-#: client/gui-gtk-2.0/pages.c:2489
+#: client/gui-gtk-2.0/pages.c:2493
msgid "Saved _Games:"
msgstr "_Lagrede spill:"
-#: client/gui-gtk-2.0/pages.c:2516
+#: client/gui-gtk-2.0/pages.c:2520
msgid "Save _Filename:"
msgstr "Lagre _filnavn:"
@@ -13082,7 +13238,7 @@ msgstr "Lukk dialog"
msgid "Total users logged in : %d"
msgstr ""
-#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1098
msgid "Back"
msgstr "Tilbake"
@@ -13092,7 +13248,7 @@ msgid "Start"
msgstr "_Start"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:777
+#: client/gui-win32/connectdlg.c:779
msgid "Load Game"
msgstr "Fortsette et spill"
@@ -13134,9 +13290,9 @@ msgstr "Lag ny hjemby"
#: client/gui-sdl/connectdlg.c:308 client/gui-sdl/connectdlg.c:617
#: client/gui-sdl/connectdlg.c:803 client/gui-sdl/connectdlg.c:985
#: client/gui-sdl/dialogs.c:452 client/gui-sdl/dialogs.c:2095
-#: client/gui-sdl/dialogs.c:2893 client/gui-sdl/diplomat_dialog.c:731
+#: client/gui-sdl/dialogs.c:2902 client/gui-sdl/diplomat_dialog.c:731
#: client/gui-sdl/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1043
#: client/gui-win32/dialogs.c:1772 client/gui-win32/finddlg.c:127
#: client/gui-win32/gotodlg.c:171 client/gui-win32/inputdlg.c:146
#: client/gui-win32/messagedlg.c:216 client/gui-win32/ratesdlg.c:328
@@ -13181,7 +13337,7 @@ msgid "Buy it?"
msgstr "Kjøp det!"
#: 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
+#: client/gui-sdl/diplodlg.c:1336 client/gui-sdl/diplomat_dialog.c:1211
#: client/gui-sdl/diplomat_dialog.c:1417 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:221 client/gui-sdl/repodlgs.c:1559
#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
@@ -13197,7 +13353,7 @@ msgid "No"
msgstr "Nei"
#: client/gui-sdl/citydlg.c:1215 client/gui-sdl/cma_fe.c:318
-#: client/gui-sdl/diplodlg.c:1345 client/gui-sdl/diplomat_dialog.c:1200
+#: client/gui-sdl/diplodlg.c:1346 client/gui-sdl/diplomat_dialog.c:1200
#: client/gui-sdl/diplomat_dialog.c:1407 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:232 client/gui-win32/repodlgs.c:578
#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
@@ -13530,7 +13686,7 @@ msgstr "Freeciv Server Liste"
msgid "Port :"
msgstr "Port:"
-#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1100
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr "Koble til"
@@ -13648,23 +13804,23 @@ msgstr "Din nye styreform"
msgid "REVOLUTION!"
msgstr "REVOLUSJON..."
-#: client/gui-sdl/dialogs.c:2232 client/gui-sdl/dialogs.c:2620
+#: client/gui-sdl/dialogs.c:2237 client/gui-sdl/dialogs.c:2625
#: client/gui-win32/dialogs.c:567 data/Freeciv.in:3159
msgid "Female"
msgstr "Kvinne"
-#: client/gui-sdl/dialogs.c:2234 client/gui-sdl/dialogs.c:2618
-#: client/gui-sdl/dialogs.c:2830 client/gui-win32/dialogs.c:565
+#: client/gui-sdl/dialogs.c:2239 client/gui-sdl/dialogs.c:2623
+#: client/gui-sdl/dialogs.c:2839 client/gui-win32/dialogs.c:565
msgid "Male"
msgstr "Mann"
-#: client/gui-sdl/dialogs.c:2478 client/gui-sdl/dialogs.c:2902
+#: client/gui-sdl/dialogs.c:2483 client/gui-sdl/dialogs.c:2911
#: 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 "OK"
-#: client/gui-sdl/dialogs.c:2685 client/gui-win32/dialogs.c:505
+#: client/gui-sdl/dialogs.c:2694 client/gui-win32/dialogs.c:505
msgid "What nation will you be?"
msgstr "Hvilken nasjon vil du være?"
@@ -13693,79 +13849,79 @@ msgstr "Verdenskart"
msgid "Sea map"
msgstr "Sjøkart"
-#: client/gui-sdl/diplodlg.c:563
+#: client/gui-sdl/diplodlg.c:564
msgid "Give embassy"
msgstr "Gi ambassade"
-#: client/gui-sdl/diplodlg.c:579 client/gui-win32/diplodlg.c:614
+#: client/gui-sdl/diplodlg.c:580 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 "Gull(maks %d)"
-#: client/gui-sdl/diplodlg.c:613 client/gui-sdl/helpdlg.c:1956
+#: client/gui-sdl/diplodlg.c:614 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 "Fremskritt"
-#: client/gui-sdl/diplodlg.c:831 client/gui-win32/diplodlg.c:598
+#: client/gui-sdl/diplodlg.c:832 client/gui-win32/diplodlg.c:598
#: data/Freeciv.in:269
msgid "Diplomacy meeting"
msgstr "Diplomatisk møte"
-#: client/gui-sdl/diplodlg.c:883 client/gui-win32/diplodlg.c:680
+#: client/gui-sdl/diplodlg.c:884 client/gui-win32/diplodlg.c:680
#: data/Freeciv.in:510
msgid "Cancel meeting"
msgstr "Avlys møte"
-#: client/gui-sdl/diplodlg.c:895 client/gui-win32/diplodlg.c:679
+#: client/gui-sdl/diplodlg.c:896 client/gui-win32/diplodlg.c:679
#: data/Freeciv.in:501
msgid "Accept treaty"
msgstr "Aksepter avtale"
#. TRANS: "Polish incident !" FIXME!!!
-#: client/gui-sdl/diplodlg.c:1304
+#: client/gui-sdl/diplodlg.c:1305
#, fuzzy, c-format
msgid "%s incident !"
msgstr "Forskere"
-#: client/gui-sdl/diplodlg.c:1322
+#: client/gui-sdl/diplodlg.c:1323
msgid "Shall we declare WAR on them?"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1433
+#: client/gui-sdl/diplodlg.c:1434
#, fuzzy
msgid "Foreign Minister"
msgstr "Førsteminister"
-#: client/gui-sdl/diplodlg.c:1449
+#: client/gui-sdl/diplodlg.c:1450
#, c-format
msgid ""
"Sir!, the %s ambassador has arrived\n"
"What are your wishes?"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1465
+#: client/gui-sdl/diplodlg.c:1466
msgid "Declare WAR"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1467 client/gui-win32/plrdlg.c:357
+#: client/gui-sdl/diplodlg.c:1468 client/gui-win32/plrdlg.c:357
msgid "Cancel Treaty"
msgstr "Avbryt avtale"
-#: client/gui-sdl/diplodlg.c:1490 client/gui-win32/plrdlg.c:358
+#: client/gui-sdl/diplodlg.c:1491 client/gui-win32/plrdlg.c:358
#: data/Freeciv.in:3254
msgid "Withdraw vision"
msgstr "Fjern utsyn"
-#: client/gui-sdl/diplodlg.c:1507
+#: client/gui-sdl/diplodlg.c:1508
#, fuzzy
msgid "Call Diplomatic Meeting"
msgstr "Diplomatisk møte"
-#: client/gui-sdl/diplodlg.c:1521
+#: client/gui-sdl/diplodlg.c:1522
msgid "Send him back"
msgstr ""
@@ -14528,12 +14684,12 @@ msgid "Leave Game"
msgstr "Lagre spill"
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1100 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1102 client/gui-xaw/menu.c:121
#: data/Freeciv.in:115 data/Freeciv.in:3180
msgid "Quit"
msgstr "Avslutt"
-#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:967
msgid "Start New Game"
msgstr "Start nytt spill"
@@ -14663,8 +14819,8 @@ msgstr ""
msgid "%s max rate : %d%%"
msgstr "%s maks nivå: %d%%"
-#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
-#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1085
+#: client/gui-win32/connectdlg.c:1093 data/Freeciv.in:155
msgid "Update"
msgstr "Oppdater"
@@ -15132,68 +15288,68 @@ msgstr "Ny"
msgid "Delete"
msgstr "Slett"
-#: client/gui-win32/connectdlg.c:147
+#: client/gui-win32/connectdlg.c:149
msgid "Password:"
msgstr "Passord:"
-#: client/gui-win32/connectdlg.c:169
+#: client/gui-win32/connectdlg.c:171
msgid "Couldn't load the savegame"
msgstr "Klarte ikke laste inn lagret spill."
-#: client/gui-win32/connectdlg.c:284 client/gui-xaw/connectdlg.c:311
+#: client/gui-win32/connectdlg.c:286 client/gui-xaw/connectdlg.c:311
msgid "Verify Password"
msgstr "Bekreft passord"
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:916 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr "Servervalg"
-#: client/gui-win32/connectdlg.c:915
+#: client/gui-win32/connectdlg.c:917
msgid "Local Area Network"
msgstr "Lokalt Nettverk"
-#: client/gui-win32/connectdlg.c:949
+#: client/gui-win32/connectdlg.c:951
msgid "Welcome to Freeciv"
msgstr "Velkommen til Freeciv"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Load Saved Game"
msgstr "Fortsette et spill"
-#: client/gui-win32/connectdlg.c:969
+#: client/gui-win32/connectdlg.c:971
msgid "Connect To Network Game"
msgstr "Koble til nettverksspill"
-#: client/gui-win32/connectdlg.c:979
+#: client/gui-win32/connectdlg.c:981
msgid "Choose a nation to play"
msgstr "Velg en nasjon å spille"
-#: client/gui-win32/connectdlg.c:1014
+#: client/gui-win32/connectdlg.c:1016
msgid "Number of players (Including AI):"
msgstr "Antall spillere (inkludert AI):"
-#: client/gui-win32/connectdlg.c:1022
+#: client/gui-win32/connectdlg.c:1024
msgid "AI skill level:"
msgstr "AI vanskelighetsgrad:"
-#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1038 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr "Spill-innstillinger"
-#: client/gui-win32/connectdlg.c:1040
+#: client/gui-win32/connectdlg.c:1042
#, fuzzy
msgid "Start Game"
msgstr "Start nytt spill"
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Login:"
msgstr "Navn:"
-#: client/gui-win32/connectdlg.c:1061
+#: client/gui-win32/connectdlg.c:1063
msgid "Host:"
msgstr "Tjener:"
-#: client/gui-win32/connectdlg.c:1062
+#: client/gui-win32/connectdlg.c:1064
msgid "Port:"
msgstr "Port:"
@@ -15274,21 +15430,21 @@ msgid ""
"this is much slower."
msgstr ""
-#: client/gui-win32/helpdlg.c:769 client/gui-win32/helpdlg.c:792
-#: client/gui-win32/helpdlg.c:803 client/gui-win32/helpdlg.c:809
-#: client/gui-win32/helpdlg.c:822
+#: client/gui-win32/helpdlg.c:775 client/gui-win32/helpdlg.c:798
+#: client/gui-win32/helpdlg.c:809 client/gui-win32/helpdlg.c:815
+#: client/gui-win32/helpdlg.c:828
msgid "Allows "
msgstr "Tillater "
-#: client/gui-win32/helpdlg.c:780
+#: client/gui-win32/helpdlg.c:786
msgid "Obsoletes "
msgstr "Forelder"
-#: client/gui-win32/helpdlg.c:812 client/gui-win32/helpdlg.c:825
+#: client/gui-win32/helpdlg.c:818 client/gui-win32/helpdlg.c:831
msgid " (with "
msgstr " (med "
-#: client/gui-win32/helpdlg.c:815 client/gui-win32/helpdlg.c:828
+#: client/gui-win32/helpdlg.c:821 client/gui-win32/helpdlg.c:834
msgid "?techhelp:)."
msgstr "?techhelp:)."
@@ -16438,7 +16594,7 @@ 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/"
+" https://gna.org/projects/freeciv/"
msgstr ""
"Hvis du finner noen feil ved spillet, vennligst send oss en feilrapport. "
"Dette gjøres mest hensiktsmessig ved å besøke Freeciv sitt "
@@ -18738,6 +18894,7 @@ msgid "Hydro Plant"
msgstr "Vannkraftverk"
#: data/default/buildings.ruleset:378
+#, fuzzy
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 "
@@ -18745,47 +18902,43 @@ msgid ""
"a Factory, Mfg. Plant and Hydro Plant together give a 150% production "
"bonus.\n"
"\n"
-"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant. A city "
-"can only build a Hydro Plant if it is next to (or on) a Mountain or River "
-"tile."
+"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant."
msgstr ""
-"Reduserer mengden forurensning generert av en by med 50%. Det øker "
-"produksjonen av skjold fra en fabrikk eller et fabrikk-kompleks i byen: en "
-"fabrikk og et fabrikk-kompleks gir til sammen 75% produksjonsbonus, og en "
-"fabrikk, et fabrikk-kompleks og et vannkraftverk gir tilsammen 150% "
+"Reduserer mengden forurensning fra produksjon i en by med 50%. Det øker også "
+"skjoldproduksjonen fra en fabrikk eller et fabrikk-kompleks i byen: en "
+"fabrikk og et atomkraftverk gir tilsammen 75% produksjonsbonus, og en "
+"fabrikk, et fabrikk-kompleks og et atomkraftverk gir tilsammen 150% "
"produksjonsbonus.\n"
"\n"
-"En by kan kun ha et vannkraftverk, kraftverk eller atomkraftverk. En by kan "
-"kun bygge vannkraftverk dersom den er ved siden av (eller på) et fjell eller "
-"en elv."
+"En by kan kun ha et vannkraftverk, kraftverk eller atomkreftverk."
-#: data/default/buildings.ruleset:397 data/civ2/buildings.ruleset:373
+#: data/default/buildings.ruleset:396 data/civ2/buildings.ruleset:373
#: data/civ1/buildings.ruleset:297
msgid "Library"
msgstr "Bibliotek"
-#: data/default/buildings.ruleset:412
+#: data/default/buildings.ruleset:411
#, no-c-format
msgid "Increases the science output in a city by 100%."
msgstr "Øker byen forskningsbidrag med 100%."
-#: data/default/buildings.ruleset:417 data/civ2/buildings.ruleset:393
+#: data/default/buildings.ruleset:416 data/civ2/buildings.ruleset:393
#: data/civ1/buildings.ruleset:317
msgid "Marketplace"
msgstr "Markedsplass"
-#: data/default/buildings.ruleset:432 data/civ2/buildings.ruleset:408
+#: data/default/buildings.ruleset:431 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 "Øker byens luksus- og skatte-bidrag med 50%."
-#: data/default/buildings.ruleset:437 data/civ2/buildings.ruleset:413
+#: data/default/buildings.ruleset:436 data/civ2/buildings.ruleset:413
#: data/civ1/buildings.ruleset:337
msgid "Mass Transit"
msgstr "Kollektivtrafikk"
-#: data/default/buildings.ruleset:451 data/civ2/buildings.ruleset:427
+#: data/default/buildings.ruleset:450 data/civ2/buildings.ruleset:427
#: data/civ1/buildings.ruleset:351
msgid ""
"Neutralizes the pollution generated by the population. The population "
@@ -18794,12 +18947,12 @@ msgstr ""
"Nøytraliserer forurensningen generert av befolkningen. Befolkningen har "
"absolutt ingen effekt på forurensningen fra byen."
-#: data/default/buildings.ruleset:458 data/civ2/buildings.ruleset:434
+#: data/default/buildings.ruleset:457 data/civ2/buildings.ruleset:434
#: data/civ1/buildings.ruleset:358
msgid "Mfg. Plant"
msgstr "Fabrikk-kompleks"
-#: data/default/buildings.ruleset:474 data/civ2/buildings.ruleset:450
+#: data/default/buildings.ruleset:473 data/civ2/buildings.ruleset:450
#: data/civ1/buildings.ruleset:374
#, no-c-format
msgid ""
@@ -18809,12 +18962,12 @@ msgstr ""
"Sammen med en fabrikk øker et fabrikk-kompleks skjoldproduksjonen i en by "
"med 100%."
-#: data/default/buildings.ruleset:480 data/civ2/buildings.ruleset:456
+#: data/default/buildings.ruleset:479 data/civ2/buildings.ruleset:456
#: data/civ1/buildings.ruleset:380
msgid "Nuclear Plant"
msgstr "Atomkraftverk"
-#: data/default/buildings.ruleset:495
+#: data/default/buildings.ruleset:494
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 "
@@ -18832,11 +18985,11 @@ msgstr ""
"\n"
"En by kan kun ha et vannkraftverk, kraftverk eller atomkreftverk."
-#: data/default/buildings.ruleset:515 data/civ2/buildings.ruleset:489
+#: data/default/buildings.ruleset:514 data/civ2/buildings.ruleset:489
msgid "Offshore Platform"
msgstr "Oljeplattform"
-#: data/default/buildings.ruleset:530 data/civ2/buildings.ruleset:504
+#: data/default/buildings.ruleset:529 data/civ2/buildings.ruleset:504
msgid ""
"Adds 1 extra shield resource on all Ocean squares in a city. The city needs "
"to be coastal to build this improvement."
@@ -18844,12 +18997,12 @@ msgstr ""
"Legger til 1 ekstra skjold ressurs på alle sjøruter i byen. Byen må være en "
"kystby for å bygge denne forbedringen."
-#: data/default/buildings.ruleset:536 data/civ2/buildings.ruleset:510
+#: data/default/buildings.ruleset:535 data/civ2/buildings.ruleset:510
#: data/civ1/buildings.ruleset:411
msgid "Palace"
msgstr "Slott"
-#: data/default/buildings.ruleset:552
+#: data/default/buildings.ruleset:551
#, fuzzy, no-c-format
msgid ""
"Makes a city the capital and the center of your government. Corruption in "
@@ -18875,11 +19028,11 @@ msgstr ""
"borgerkrig. Dersom du mister ditt palass så mister du også et eventuelt "
"romskip."
-#: data/default/buildings.ruleset:569 data/civ2/buildings.ruleset:539
+#: data/default/buildings.ruleset:568 data/civ2/buildings.ruleset:539
msgid "Police Station"
msgstr "Politistasjon"
-#: data/default/buildings.ruleset:583 data/civ2/buildings.ruleset:553
+#: data/default/buildings.ruleset:582 data/civ2/buildings.ruleset:553
msgid ""
"Reduces the unhappiness caused by military units outside the city by 2 under "
"Democracy and 1 under Republic. This improvement has no effect under other "
@@ -18889,11 +19042,11 @@ msgstr ""
"under demokrati og 1 under republikk. Denne forbedringen har ingen effekt "
"under andre styresett."
-#: data/default/buildings.ruleset:593 data/civ2/buildings.ruleset:560
+#: data/default/buildings.ruleset:592 data/civ2/buildings.ruleset:560
msgid "Port Facility"
msgstr "Havneområde"
-#: data/default/buildings.ruleset:608 data/civ2/buildings.ruleset:575
+#: data/default/buildings.ruleset:607 data/civ2/buildings.ruleset:575
msgid ""
"Allows a city to build veteran sea units. Also, damaged sea units which "
"stay in town for one full turn without moving are completely restored."
@@ -18901,12 +19054,12 @@ msgstr ""
"Tillater en by å bygge veterane sjøenheter. Dessuten blir skadede sjøenheter "
"som blir i byen en hel runde uten å bevege seg helt reparert."
-#: data/default/buildings.ruleset:615 data/civ2/buildings.ruleset:582
+#: data/default/buildings.ruleset:614 data/civ2/buildings.ruleset:582
#: data/civ1/buildings.ruleset:440
msgid "Power Plant"
msgstr "Kullkraftverk"
-#: data/default/buildings.ruleset:631
+#: data/default/buildings.ruleset:630
#, no-c-format
msgid ""
"Increases the shield production of a Factory or Mfg. Plant in a city: a "
@@ -18923,12 +19076,12 @@ msgstr ""
"\n"
"En by kan kun ha et vannkraftverk, kraftverk eller atomkraftverk. "
-#: data/default/buildings.ruleset:646 data/civ2/buildings.ruleset:610
+#: data/default/buildings.ruleset:645 data/civ2/buildings.ruleset:610
#: data/civ1/buildings.ruleset:468
msgid "Recycling Center"
msgstr "Resirkuleringsstasjon"
-#: data/default/buildings.ruleset:661 data/civ2/buildings.ruleset:625
+#: data/default/buildings.ruleset:660 data/civ2/buildings.ruleset:625
#: data/civ1/buildings.ruleset:483
#, no-c-format
msgid ""
@@ -18938,11 +19091,11 @@ msgstr ""
"Å bygge en resirkuleringsstasjon reduserer mengden forurensning som blir "
"laget i en by med 66%."
-#: data/default/buildings.ruleset:667 data/civ2/buildings.ruleset:631
+#: data/default/buildings.ruleset:666 data/civ2/buildings.ruleset:631
msgid "Research Lab"
msgstr "Forskningslaboratorium"
-#: data/default/buildings.ruleset:682
+#: data/default/buildings.ruleset:681
msgid ""
"Together with a Library, a Research Lab increases the science production of "
"a city by 200%. Together with a Library and a University, a Research Lab "
@@ -18952,11 +19105,11 @@ msgstr ""
"med 200%. Sammen med en bibliotek og et universitet øker et "
"forskningslaboratorium forskningen i en by med 450%."
-#: data/default/buildings.ruleset:690 data/civ2/buildings.ruleset:654
+#: data/default/buildings.ruleset:689 data/civ2/buildings.ruleset:654
msgid "SAM Battery"
msgstr "SAM rakettbatteri"
-#: data/default/buildings.ruleset:704 data/civ2/buildings.ruleset:668
+#: data/default/buildings.ruleset:703 data/civ2/buildings.ruleset:668
msgid ""
"Doubles the defense of all units inside the city when attacked by non-"
"nuclear air units."
@@ -18964,12 +19117,12 @@ msgstr ""
"Dobler forsvaret til alle enheter inne i en by når de blir angriper av "
"flyenheter uten atomkraft."
-#: data/default/buildings.ruleset:710 data/civ2/buildings.ruleset:674
+#: data/default/buildings.ruleset:709 data/civ2/buildings.ruleset:674
#: data/civ1/buildings.ruleset:489
msgid "SDI Defense"
msgstr "SDI forsvar"
-#: data/default/buildings.ruleset:724 data/civ2/buildings.ruleset:688
+#: data/default/buildings.ruleset:723 data/civ2/buildings.ruleset:688
#: data/civ1/buildings.ruleset:503
msgid ""
"Protects a city from attacks from Nuclear units. Nuclear attacks simply "
@@ -18979,12 +19132,12 @@ msgstr ""
"Beskytter en by mot angrep fra atomenheter. Atomangrep har ingen effekt i "
"byen. Og den dobler forsvaret mot ikke-atombaserte missiler."
-#: data/default/buildings.ruleset:733 data/civ2/buildings.ruleset:697
+#: data/default/buildings.ruleset:732 data/civ2/buildings.ruleset:697
msgid "Sewer System"
msgstr "Kloakksystem"
# problem
-#: data/default/buildings.ruleset:748 data/civ2/buildings.ruleset:712
+#: data/default/buildings.ruleset:747 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."
@@ -18992,12 +19145,12 @@ msgstr ""
"Tillater en by å vokse seg større enn størrelse 12. Akvedukt er først "
"nødvendig for at en by skal vokse seg større enn 8."
-#: data/default/buildings.ruleset:754 data/civ2/buildings.ruleset:749
+#: data/default/buildings.ruleset:753 data/civ2/buildings.ruleset:749
#: data/civ1/buildings.ruleset:512
msgid "Space Component"
msgstr "Romkomponent"
-#: data/default/buildings.ruleset:769 data/civ2/buildings.ruleset:763
+#: data/default/buildings.ruleset:768 data/civ2/buildings.ruleset:763
#: data/civ1/buildings.ruleset:526
msgid ""
"Space Components can be differentiated into Propulsion and Fuel Components. "
@@ -19013,12 +19166,12 @@ msgstr ""
"Før du kan bygge noen romkomponenter må en spiller ha bygget "
"Apolloprogrammet."
-#: data/default/buildings.ruleset:779 data/civ2/buildings.ruleset:773
+#: data/default/buildings.ruleset:778 data/civ2/buildings.ruleset:773
#: data/civ1/buildings.ruleset:536
msgid "Space Module"
msgstr "Rom-modul"
-#: data/default/buildings.ruleset:794 data/civ2/buildings.ruleset:787
+#: data/default/buildings.ruleset:793 data/civ2/buildings.ruleset:787
#: data/civ1/buildings.ruleset:550
msgid ""
"Space Modules are the most expensive parts of spaceships. There are three "
@@ -19051,12 +19204,12 @@ msgstr ""
"Før du kan bygge noen romskipsdeler må en spiller ha bygget underverket "
"Apolloprogrammet."
-#: data/default/buildings.ruleset:813 data/civ2/buildings.ruleset:806
+#: data/default/buildings.ruleset:812 data/civ2/buildings.ruleset:806
#: data/civ1/buildings.ruleset:569
msgid "Space Structural"
msgstr "Romstruktur"
-#: data/default/buildings.ruleset:828 data/civ2/buildings.ruleset:820
+#: data/default/buildings.ruleset:827 data/civ2/buildings.ruleset:820
#: data/civ1/buildings.ruleset:583
msgid ""
"Space Structurals form the base of your spaceship. All other spaceship "
@@ -19073,11 +19226,11 @@ msgstr ""
"Før du kan bygge noen romskipsdeler må en spiller ha bygget underverket "
"Apolloprogrammet."
-#: data/default/buildings.ruleset:838 data/civ2/buildings.ruleset:830
+#: data/default/buildings.ruleset:837 data/civ2/buildings.ruleset:830
msgid "Stock Exchange"
msgstr "Børs"
-#: data/default/buildings.ruleset:854 data/civ2/buildings.ruleset:846
+#: data/default/buildings.ruleset:853 data/civ2/buildings.ruleset:846
#, no-c-format
msgid ""
"Together with a Marketplace and a Bank, a Stock Exchange boosts tax and "
@@ -19086,22 +19239,22 @@ msgstr ""
"Sammen med en markedsplass og en bank, så øker børsen skatte- og luksus-"
"produksjonen i en by med 150%."
-#: data/default/buildings.ruleset:860 data/civ2/buildings.ruleset:852
+#: data/default/buildings.ruleset:859 data/civ2/buildings.ruleset:852
msgid "Super Highways"
msgstr "Motorveier"
-#: data/default/buildings.ruleset:875 data/civ2/buildings.ruleset:867
+#: data/default/buildings.ruleset:874 data/civ2/buildings.ruleset:867
#, no-c-format
msgid ""
"Increases trade resources by 50% on all squares with roads or railroads."
msgstr ""
"Øker handels ressursene med 50% på alle ruter med veier eller jernbaner."
-#: data/default/buildings.ruleset:883 data/civ2/buildings.ruleset:873
+#: data/default/buildings.ruleset:882 data/civ2/buildings.ruleset:873
msgid "Supermarket"
msgstr "Supermarked"
-#: data/default/buildings.ruleset:898 data/civ2/buildings.ruleset:888
+#: data/default/buildings.ruleset:897 data/civ2/buildings.ruleset:888
#, no-c-format
msgid ""
"Increases the food resources by 50% on each farmland square which is being "
@@ -19111,12 +19264,12 @@ msgstr ""
"Øker matressursene med 50% på hver rute med dyrket mark som blir brukt rundt "
"byen. Dyrket mark er de rutene som har blitt irrigert en ekstra gang."
-#: data/default/buildings.ruleset:905 data/civ2/buildings.ruleset:895
+#: data/default/buildings.ruleset:904 data/civ2/buildings.ruleset:895
#: data/civ1/buildings.ruleset:593
msgid "Temple"
msgstr "Tempel"
-#: data/default/buildings.ruleset:919 data/civ2/buildings.ruleset:909
+#: data/default/buildings.ruleset:918 data/civ2/buildings.ruleset:909
#: data/civ1/buildings.ruleset:607
msgid ""
"Makes one unhappy citizen content. Both the Mysticism advance and the "
@@ -19126,13 +19279,13 @@ msgstr ""
"Gjør en ulykkelig borger fornøyd. Både Mystisisme og Orakel underverket "
"dobler denne effekten. Med Mystisisme og Orakel blir 4 borgere fornøyd."
-#: data/default/buildings.ruleset:926 data/civ2/buildings.ruleset:916
+#: data/default/buildings.ruleset:925 data/civ2/buildings.ruleset:916
#: data/civ1/buildings.ruleset:614 data/default/techs.ruleset:742
#: data/civ2/techs.ruleset:727 data/civ1/techs.ruleset:723
msgid "University"
msgstr "Universitet"
-#: data/default/buildings.ruleset:942
+#: data/default/buildings.ruleset:941
#, no-c-format
msgid ""
"Together with a Library, a University increases the science production of a "
@@ -19141,12 +19294,12 @@ msgstr ""
"Sammen med bibliotek vil et universitet øke forskningsproduksjonen i en by "
"med 250%."
-#: data/default/buildings.ruleset:948 data/civ2/buildings.ruleset:938
+#: data/default/buildings.ruleset:947 data/civ2/buildings.ruleset:938
#: data/civ1/buildings.ruleset:636
msgid "Apollo Program"
msgstr "Apollo Programmet"
-#: data/default/buildings.ruleset:962 data/civ2/buildings.ruleset:952
+#: data/default/buildings.ruleset:961 data/civ2/buildings.ruleset:952
msgid ""
"Entire map becomes visible for the player who owns it. It allows all "
"players to start building spaceship parts (assuming they have researched the "
@@ -19156,11 +19309,11 @@ msgstr ""
"begynne å bygge romskipsdeler (dersom de har forsket på de nødvendige "
"teknologiene)."
-#: data/default/buildings.ruleset:969 data/civ2/buildings.ruleset:959
+#: data/default/buildings.ruleset:968 data/civ2/buildings.ruleset:959
msgid "A.Smith's Trading Co."
msgstr "Adam Smiths Handelsselskap"
-#: data/default/buildings.ruleset:983
+#: data/default/buildings.ruleset:982
msgid ""
"City improvements which would normally have an upkeep of 1 are free of "
"upkeep, for all your cities."
@@ -19168,12 +19321,12 @@ msgstr ""
"Byforbedringer som normalt vil ha utgifter på 1 vil bli uten "
"vedlikeholdskostnader i alle byer."
-#: data/default/buildings.ruleset:989 data/civ2/buildings.ruleset:979
+#: data/default/buildings.ruleset:988 data/civ2/buildings.ruleset:979
#: data/civ1/buildings.ruleset:655
msgid "Colossus"
msgstr "Kolossen"
-#: data/default/buildings.ruleset:1003 data/civ2/buildings.ruleset:993
+#: data/default/buildings.ruleset:1002 data/civ2/buildings.ruleset:993
#: data/civ1/buildings.ruleset:669
msgid ""
"Each square around the city where this wonder is built that is already "
@@ -19182,23 +19335,23 @@ msgstr ""
"Hver rute rundt byen som underverket er bygget som allerede genererer noe "
"handel produserer en ekstra handelsressurs."
-#: data/default/buildings.ruleset:1009 data/civ2/buildings.ruleset:999
+#: data/default/buildings.ruleset:1008 data/civ2/buildings.ruleset:999
#: data/civ1/buildings.ruleset:675
msgid "Copernicus' Observatory"
msgstr "Copernicus observatorium"
-#: data/default/buildings.ruleset:1024 data/civ2/buildings.ruleset:1180
+#: data/default/buildings.ruleset:1023 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 "Øker forskningen i byen det er bygget med 100%."
-#: data/default/buildings.ruleset:1029 data/civ2/buildings.ruleset:1019
+#: data/default/buildings.ruleset:1028 data/civ2/buildings.ruleset:1019
#: data/civ1/buildings.ruleset:695
msgid "Cure For Cancer"
msgstr "Løsning på kreftgåten"
-#: data/default/buildings.ruleset:1043
+#: data/default/buildings.ruleset:1042
msgid ""
"This stunning technological achievement makes one unhappy citizen content in "
"all your cities."
@@ -19206,12 +19359,12 @@ msgstr ""
"Denne imponerende teknologiske prestasjonen gjør en ulykkelig borger fornøyd "
"i alle byene dine."
-#: data/default/buildings.ruleset:1051 data/civ2/buildings.ruleset:1039
+#: data/default/buildings.ruleset:1050 data/civ2/buildings.ruleset:1039
#: data/civ1/buildings.ruleset:715
msgid "Darwin's Voyage"
msgstr "Darwins reise"
-#: data/default/buildings.ruleset:1065 data/civ2/buildings.ruleset:1053
+#: data/default/buildings.ruleset:1064 data/civ2/buildings.ruleset:1053
#: data/civ1/buildings.ruleset:729
msgid ""
"Charles Darwin's voyage sparked the discovery of the evolution of the "
@@ -19221,11 +19374,11 @@ msgstr ""
"Charles Darwins reise utløste oppdagelsen av artsutviklingen, som økte troen "
"på forskning. Gir to umiddelbare teknologiske fremskritt."
-#: data/default/buildings.ruleset:1072 data/civ2/buildings.ruleset:1060
+#: data/default/buildings.ruleset:1071 data/civ2/buildings.ruleset:1060
msgid "Eiffel Tower"
msgstr "Eiffeltårnet"
-#: data/default/buildings.ruleset:1087
+#: data/default/buildings.ruleset:1086
#, fuzzy, no-c-format
msgid ""
"Your reputation and goodwill among other nations is recovered twice as fast."
@@ -19233,12 +19386,12 @@ msgstr ""
"Ditt rykte hos de andre nasjonene blir bedre mens du eier dette underverket. "
"Ryktet blir forbedret dobbelt så fort som vanlig."
-#: data/default/buildings.ruleset:1093 data/civ2/buildings.ruleset:1081
+#: data/default/buildings.ruleset:1092 data/civ2/buildings.ruleset:1081
#: data/civ1/buildings.ruleset:736
msgid "Great Library"
msgstr "Verdensbiblioteket"
-#: data/default/buildings.ruleset:1107 data/civ2/buildings.ruleset:1095
+#: data/default/buildings.ruleset:1106 data/civ2/buildings.ruleset:1095
#: data/civ1/buildings.ruleset:750
msgid ""
"The civilization which builds the Great Library gets every advance that at "
@@ -19247,21 +19400,21 @@ msgstr ""
"Sivilisasjonen som bygger Verdensbiblioteket får alle fremskritt som minst "
"to andre sivilisasjoner har oppdaget."
-#: data/default/buildings.ruleset:1113 data/civ2/buildings.ruleset:1101
+#: data/default/buildings.ruleset:1112 data/civ2/buildings.ruleset:1101
#: data/civ1/buildings.ruleset:756
msgid "Great Wall"
msgstr "Den Enorme Muren"
-#: data/default/buildings.ruleset:1127
+#: data/default/buildings.ruleset:1126
msgid "Works as a City Wall in all your cities."
msgstr "Fungerer som bymur i alle byer."
-#: data/default/buildings.ruleset:1135 data/civ2/buildings.ruleset:1122
+#: data/default/buildings.ruleset:1134 data/civ2/buildings.ruleset:1122
#: data/civ1/buildings.ruleset:777
msgid "Hanging Gardens"
msgstr "Hengende Haver"
-#: data/default/buildings.ruleset:1149 data/civ2/buildings.ruleset:1136
+#: data/default/buildings.ruleset:1148 data/civ2/buildings.ruleset:1136
#: data/civ1/buildings.ruleset:791
msgid ""
"Makes one content citizen happy in every city. Makes two extra content "
@@ -19276,12 +19429,12 @@ msgstr ""
"Hengende Hager gjelder underverket i stedet ulykkelige borgere (og gjør de "
"fornøyde i stedet)."
-#: data/default/buildings.ruleset:1158 data/civ2/buildings.ruleset:1145
+#: data/default/buildings.ruleset:1157 data/civ2/buildings.ruleset:1145
#: data/civ1/buildings.ruleset:800
msgid "Hoover Dam"
msgstr "Hooverdemningen"
-#: data/default/buildings.ruleset:1173 data/civ2/buildings.ruleset:1159
+#: data/default/buildings.ruleset:1172 data/civ2/buildings.ruleset:1159
msgid ""
"Works as if you had a Hydro Plant in every city. (This reduces pollution "
"and increases the effects of Factories and Mfg. Plants.)"
@@ -19289,52 +19442,52 @@ msgstr ""
"Fungerer som om du hadde et vannkraftverk i hver by. (Dette reduserer "
"forurensningen og øker effekten av fabrikker og fabrikk-komplekser.)"
-#: data/default/buildings.ruleset:1179 data/civ2/buildings.ruleset:1165
+#: data/default/buildings.ruleset:1178 data/civ2/buildings.ruleset:1165
#: data/civ1/buildings.ruleset:822
msgid "Isaac Newton's College"
msgstr "Isak Newtons Universitet"
-#: data/default/buildings.ruleset:1194
+#: data/default/buildings.ruleset:1193
#, no-c-format
msgid ""
"Boosts science production by 100% in every city you control that has a "
"University."
msgstr "Øker forskningsbidraget med 100% i alle byer som har universitet."
-#: data/default/buildings.ruleset:1200 data/civ2/buildings.ruleset:1185
+#: data/default/buildings.ruleset:1199 data/civ2/buildings.ruleset:1185
#: data/civ1/buildings.ruleset:842
msgid "J.S. Bach's Cathedral"
msgstr "J.S. Bachs katedral"
-#: data/default/buildings.ruleset:1214 data/civ2/buildings.ruleset:1199
+#: data/default/buildings.ruleset:1213 data/civ2/buildings.ruleset:1199
msgid "Makes two unhappy citizens content in every city."
msgstr "Gjør to ulykkelige innbyggere fornøyde i hver by."
-#: data/default/buildings.ruleset:1219 data/civ2/buildings.ruleset:1204
+#: data/default/buildings.ruleset:1218 data/civ2/buildings.ruleset:1204
msgid "King Richard's Crusade"
msgstr "Rikard Løvehjertes Korstog"
-#: data/default/buildings.ruleset:1233 data/civ2/buildings.ruleset:1218
+#: data/default/buildings.ruleset:1232 data/civ2/buildings.ruleset:1218
msgid ""
"Adds one extra shield resource on every square around the city where it is "
"built."
msgstr ""
"Legger til en ekstra skjoldressurs på hver rute rundt byen hvor den bygges."
-#: data/default/buildings.ruleset:1239 data/civ2/buildings.ruleset:1224
+#: data/default/buildings.ruleset:1238 data/civ2/buildings.ruleset:1224
msgid "Leonardo's Workshop"
msgstr "Leonardos Arbeidsværelse"
-#: data/default/buildings.ruleset:1253 data/civ2/buildings.ruleset:1238
+#: data/default/buildings.ruleset:1252 data/civ2/buildings.ruleset:1238
msgid "Upgrades one obsolete unit per game turn."
msgstr "Oppgraderer en foreldet enhet hver spillrunde."
-#: data/default/buildings.ruleset:1258 data/civ2/buildings.ruleset:1243
+#: data/default/buildings.ruleset:1257 data/civ2/buildings.ruleset:1243
#: data/civ1/buildings.ruleset:862
msgid "Lighthouse"
msgstr "Fyrtårn"
-#: data/default/buildings.ruleset:1273
+#: data/default/buildings.ruleset:1272
msgid ""
"Gives all your sea units 1 additional movement point and eliminates the risk "
"of losing Triremes on the high seas. Makes all your new sea units veterans "
@@ -19344,34 +19497,34 @@ msgstr ""
"for å miste Triremer på sjøen. Gjør alle nye sjøenheter til veteran (i alle "
"dine byer)."
-#: data/default/buildings.ruleset:1280 data/civ2/buildings.ruleset:1264
+#: data/default/buildings.ruleset:1279 data/civ2/buildings.ruleset:1264
#: data/civ1/buildings.ruleset:885
msgid "Magellan's Expedition"
msgstr "Magellans ekspedisjon"
-#: data/default/buildings.ruleset:1295
+#: data/default/buildings.ruleset:1294
msgid "Gives all your sea units 2 additional movement points."
msgstr "Gir alle dine sjøenheter 2 ekstra forflytningspoeng."
-#: data/default/buildings.ruleset:1300 data/civ2/buildings.ruleset:1283
+#: data/default/buildings.ruleset:1299 data/civ2/buildings.ruleset:1283
#: data/civ1/buildings.ruleset:904
msgid "Manhattan Project"
msgstr "Manhattan prosjektet"
-#: data/default/buildings.ruleset:1318 data/civ2/buildings.ruleset:1301
+#: data/default/buildings.ruleset:1317 data/civ2/buildings.ruleset:1301
msgid "Marco Polo's Embassy"
msgstr "Marco Polos ambassade"
-#: data/default/buildings.ruleset:1332 data/civ2/buildings.ruleset:1315
+#: data/default/buildings.ruleset:1331 data/civ2/buildings.ruleset:1315
msgid "The player who owns it gets an embassy with all players."
msgstr "Spilleren som eier det får en ambassade hos alle spillerne."
-#: data/default/buildings.ruleset:1337 data/civ2/buildings.ruleset:1320
+#: data/default/buildings.ruleset:1336 data/civ2/buildings.ruleset:1320
#: data/civ1/buildings.ruleset:922
msgid "Michelangelo's Chapel"
msgstr "Det Sixtinske Kapell"
-#: data/default/buildings.ruleset:1351 data/civ2/buildings.ruleset:1334
+#: data/default/buildings.ruleset:1350 data/civ2/buildings.ruleset:1334
msgid ""
"Counts as having a Cathedral in each of your cities. This makes 3 unhappy "
"citizens content in each city. The discovery of Theology increases the "
@@ -19384,21 +19537,21 @@ msgstr ""
"katedral ved å gjør ytterligere en ulykkelig borger fornøyd. Oppdagelsen av "
"kommunisme minsker antallet med 1."
-#: data/default/buildings.ruleset:1361 data/civ2/buildings.ruleset:1344
+#: data/default/buildings.ruleset:1360 data/civ2/buildings.ruleset:1344
#: data/civ1/buildings.ruleset:941
msgid "Oracle"
msgstr "Orakel"
-#: data/default/buildings.ruleset:1375
+#: data/default/buildings.ruleset:1374
msgid "Makes two of your unhappy citizens content in every city with a temple."
msgstr "Gjør to ulykkelige innbyggere fornøyde i hver by som har tempel."
-#: data/default/buildings.ruleset:1380 data/civ2/buildings.ruleset:1363
+#: data/default/buildings.ruleset:1379 data/civ2/buildings.ruleset:1363
#: data/civ1/buildings.ruleset:960
msgid "Pyramids"
msgstr "Pyramidene"
-#: data/default/buildings.ruleset:1394
+#: data/default/buildings.ruleset:1393
#, fuzzy
msgid ""
"The amount of stored food lost when one of your cities grows or shrinks is "
@@ -19409,30 +19562,30 @@ msgstr ""
"vokser eller minker. Dette hjelper en by å vokse raskere og enklere motstå "
"sult."
-#: data/default/buildings.ruleset:1401 data/civ2/buildings.ruleset:1382
+#: data/default/buildings.ruleset:1400 data/civ2/buildings.ruleset:1382
#: data/civ1/buildings.ruleset:981
msgid "SETI Program"
msgstr "SETI programmet"
-#: data/default/buildings.ruleset:1415
+#: data/default/buildings.ruleset:1414
msgid "Boosts science production in each city with a Research Lab by 100%. "
msgstr "Øker forskningen i hver by som har forskningslaboratorium med 50%."
-#: data/default/buildings.ruleset:1420 data/civ2/buildings.ruleset:1402
+#: data/default/buildings.ruleset:1419 data/civ2/buildings.ruleset:1402
#: data/civ1/buildings.ruleset:1001
msgid "Shakespeare's Theatre"
msgstr "Shakespeares teater"
-#: data/default/buildings.ruleset:1434 data/civ2/buildings.ruleset:1416
+#: data/default/buildings.ruleset:1433 data/civ2/buildings.ruleset:1416
#: data/civ1/buildings.ruleset:1015
msgid "Makes all unhappy citizens content, in the city where it is located."
msgstr "Gjør alle ulykkelige borgere fornøyde i byen hvor den er plassert."
-#: data/default/buildings.ruleset:1439 data/civ2/buildings.ruleset:1421
+#: data/default/buildings.ruleset:1438 data/civ2/buildings.ruleset:1421
msgid "Statue of Liberty"
msgstr "Frihetsstatuen"
-#: data/default/buildings.ruleset:1453 data/civ2/buildings.ruleset:1435
+#: data/default/buildings.ruleset:1452 data/civ2/buildings.ruleset:1435
#: data/civ1/buildings.ruleset:974 data/civ1/buildings.ruleset:1034
msgid ""
"Allows you to choose any government, including those that have not yet been "
@@ -19442,11 +19595,11 @@ msgstr ""
"Lar deg velge hvilket som helst styresett, inkludert de som du ikke har "
"forsket frem enda, uten overgangstid med anarki."
-#: data/default/buildings.ruleset:1460 data/civ2/buildings.ruleset:1442
+#: data/default/buildings.ruleset:1459 data/civ2/buildings.ruleset:1442
msgid "Sun Tzu's War Academy"
msgstr "Sun Tzus Krigsakademi"
-#: data/default/buildings.ruleset:1474
+#: data/default/buildings.ruleset:1473
msgid ""
"All your new ground units start at the first veteran level. The chance of a "
"unit getting the next veteran level after a battle increases by half."
@@ -19455,21 +19608,21 @@ msgstr ""
"at en enhet oppnår det neste veteran-nivået etter en kamp øker med "
"halvparten."
-#: data/default/buildings.ruleset:1481 data/civ2/buildings.ruleset:1463
+#: data/default/buildings.ruleset:1480 data/civ2/buildings.ruleset:1463
#: data/civ1/buildings.ruleset:1020
msgid "United Nations"
msgstr "Forente Nasjoner"
-#: data/default/buildings.ruleset:1495
+#: data/default/buildings.ruleset:1494
msgid "All your units regain two extra hitpoints per turn."
msgstr "Alle enheter får tilbake to ekstra treffpoeng per runde."
-#: data/default/buildings.ruleset:1508 data/civ2/buildings.ruleset:1490
+#: data/default/buildings.ruleset:1507 data/civ2/buildings.ruleset:1490
#: data/civ1/buildings.ruleset:1046
msgid "Women's Suffrage"
msgstr "Stemmerett for kvinner"
-#: data/default/buildings.ruleset:1522 data/civ2/buildings.ruleset:1504
+#: data/default/buildings.ruleset:1521 data/civ2/buildings.ruleset:1504
msgid ""
"Counts as a Police Station in every city. (That is, for each city, reduces "
"unhappiness for military units outside the city by 2 under Democracy and 1 "
@@ -19479,11 +19632,11 @@ msgstr ""
"ulykkeligheten fra militære enheter utenfor byen med 2 under demokrati og 1 "
"under republikk. Dette underverket har ingen effekt under andre styresett.)"
-#: data/default/buildings.ruleset:1533
+#: data/default/buildings.ruleset:1532
msgid "Coinage"
msgstr "Kapitalisering"
-#: data/default/buildings.ruleset:1554
+#: data/default/buildings.ruleset:1553
msgid ""
"This is not a normal improvement. Instead, setting a city's production to "
"Coinage means its shield production is converted to tax output (money, "
@@ -19937,12 +20090,17 @@ msgstr "?city_state:Fred"
msgid "?citystyle:Industrial"
msgstr "?city:Nøytral"
-#: data/default/cities.ruleset:139 data/civ2/cities.ruleset:150
+#: data/default/cities.ruleset:139
+#, fuzzy
+msgid "?citystyle:ElectricAge"
+msgstr "?city_state:Fred"
+
+#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:150
#, fuzzy
msgid "?citystyle:Modern"
msgstr "?city_state:Uro"
-#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:161
+#: data/default/cities.ruleset:161 data/civ2/cities.ruleset:161
#, fuzzy
msgid "?citystyle:PostModern"
msgstr "?city_state:Uro"
@@ -25290,6 +25448,40 @@ msgstr "Lag"
msgid "Team 31"
msgstr "Lag"
+#~ msgid "Command access level could not be set to '%s' for connection %s."
+#~ msgstr ""
+#~ "Kommando tilgangsnivå kunne ikke settes til '%s' for forbinselse %s."
+
+#~ msgid "Observers cannot vote."
+#~ msgstr "Observatører kan ikke stemme."
+
+#~ msgid "Vote %d \"%s\": %d for, %d against"
+#~ msgstr "Valg %d \"%s\": %d for, %d mot"
+
+#~ msgid "Value must be integer."
+#~ msgstr "Verdien må være et heltall."
+
+#~ 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 Hydro Plant, Power Plant, or Nuclear Plant. A "
+#~ "city can only build a Hydro Plant if it is next to (or on) a Mountain or "
+#~ "River tile."
+#~ msgstr ""
+#~ "Reduserer mengden forurensning generert av en by med 50%. Det øker "
+#~ "produksjonen av skjold fra en fabrikk eller et fabrikk-kompleks i byen: "
+#~ "en fabrikk og et fabrikk-kompleks gir til sammen 75% produksjonsbonus, og "
+#~ "en fabrikk, et fabrikk-kompleks og et vannkraftverk gir tilsammen 150% "
+#~ "produksjonsbonus.\n"
+#~ "\n"
+#~ "En by kan kun ha et vannkraftverk, kraftverk eller atomkraftverk. En by "
+#~ "kan kun bygge vannkraftverk dersom den er ved siden av (eller på) et "
+#~ "fjell eller en elv."
+
#, fuzzy
#~ msgid "Auth config filename \"%s\" not allowed!"
#~ msgstr "Det navnet er ikke tillat."
diff --git a/po/nl.gmo b/po/nl.gmo
index 6cf4eb9..8580104 100644
Binary files a/po/nl.gmo and b/po/nl.gmo differ
diff --git a/po/nl.po b/po/nl.po
index 293c962..4182b0f 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: 2009-03-29 21:13+0900\n"
+"POT-Creation-Date: 2009-11-22 21:37+0100\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"
@@ -64,21 +64,21 @@ msgstr "?verouderd:O"
msgid "?redundant:*"
msgstr "?overtollig:*"
-#: common/connection.c:515
+#: common/connection.c:518
#, c-format
msgid "%s from %s"
msgstr "%s van %s"
-#: common/connection.c:521
+#: common/connection.c:524
msgid " (connection incomplete)"
msgstr " (verbinding onvolledig)"
-#: common/connection.c:525
+#: common/connection.c:528
#, c-format
msgid " (player %s)"
msgstr " (speler %s)"
-#: common/connection.c:529
+#: common/connection.c:532
msgid " (observer)"
msgstr " (waarnemer)"
@@ -483,81 +483,81 @@ msgstr "Verbind/verbreek boodschappen"
msgid "AI Debug messages"
msgstr "KI debug boodschappen"
-#: common/player.c:732
+#: common/player.c:746
msgid "?attitude:Genocidal"
msgstr "?attitude:Moordzuchtig"
-#: common/player.c:734
+#: common/player.c:748
msgid "?attitude:Belligerent"
msgstr "?attitude:Oorlogszuchtig"
-#: common/player.c:736
+#: common/player.c:750
msgid "?attitude:Hostile"
msgstr "?attitude:Vijandig"
-#: common/player.c:738
+#: common/player.c:752
msgid "?attitude:Uncooperative"
msgstr "?attitude:Tegendraads"
-#: common/player.c:740
+#: common/player.c:754
msgid "?attitude:Uneasy"
msgstr "?attitude:Ongemakkelijk"
-#: common/player.c:742
+#: common/player.c:756
msgid "?attitude:Neutral"
msgstr "?attitude:Neutraal"
-#: common/player.c:744
+#: common/player.c:758
msgid "?attitude:Respectful"
msgstr "?attitude:Respectvol"
-#: common/player.c:746
+#: common/player.c:760
msgid "?attitude:Helpful"
msgstr "?attitude:Behulpzaam"
-#: common/player.c:748
+#: common/player.c:762
msgid "?attitude:Enthusiastic"
msgstr "?attitude:Geestdriftig"
-#: common/player.c:750
+#: common/player.c:764
msgid "?attitude:Admiring"
msgstr "?attitude:Bewonderend"
-#: common/player.c:753
+#: common/player.c:767
msgid "?attitude:Worshipful"
msgstr "?attitude:Aanbiddend"
-#: common/player.c:764
+#: common/player.c:778
msgid "?diplomatic_state:Armistice"
msgstr "?diplomatic_state:Staakt-het-vuren"
-#: common/player.c:765
+#: common/player.c:779
msgid "?diplomatic_state:War"
msgstr "?diplomatic_state:Oorlog"
-#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:780 client/gui-gtk-2.0/diplodlg.c:353
#: 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:767 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:781 client/gui-gtk-2.0/diplodlg.c:358
#: 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:768 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:782 client/gui-gtk-2.0/diplodlg.c:363
#: 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:769
+#: common/player.c:783
msgid "?diplomatic_state:Never met"
msgstr "?diplomatic_state:Nooit ontmoet"
-#: common/player.c:770
+#: common/player.c:784
msgid "?diplomatic_state:Team"
msgstr "?diplomatic_state:Team"
@@ -590,7 +590,7 @@ msgstr "Overleef voorwaarden worden enkel op wereldschaal ondersteund."
#. TRANS: "Resources: (none)".
#: common/requirements.c:1014 common/team.c:132
#: client/gui-gtk-2.0/helpdlg.c:1055 client/gui-gtk-2.0/inteldlg.c:390
-#: client/gui-win32/helpdlg.c:586 client/gui-xaw/helpdlg.c:991
+#: client/gui-win32/helpdlg.c:592 client/gui-xaw/helpdlg.c:991
#, c-format
msgid "(none)"
msgstr "(geen)"
@@ -616,10 +616,11 @@ msgstr "Toekomst Tech. %d"
#: 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
#: client/gui-sdl/helpdlg.c:817 client/gui-sdl/mapview.c:962
-#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:545
-#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:735
-#: 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
+#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:544
+#: client/gui-win32/helpdlg.c:551 client/gui-win32/helpdlg.c:721
+#: client/gui-win32/helpdlg.c:741 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 "Geen"
@@ -632,29 +633,29 @@ msgstr "Toekomst Tech."
msgid "(Unknown)"
msgstr "(Onbekend)"
-#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:553
#: manual/civmanual.c:224
msgid "Road"
msgstr "Weg"
-#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:557
#: client/gui-gtk-2.0/menu.c:829 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:394 common/terrain.c:572 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:567
#: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
#: data/civ1/techs.ruleset:563
msgid "Railroad"
msgstr "Spoorlijn"
-#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:555
msgid "Mine"
msgstr "Mijn"
-#: common/terrain.c:396 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:551 server/report.c:124
#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "Verontreiniging"
@@ -663,7 +664,7 @@ msgstr "Verontreiniging"
msgid "Hut"
msgstr "Hut"
-#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:563
#: manual/civmanual.c:226
msgid "Fortress"
msgstr "Fort"
@@ -676,58 +677,58 @@ msgstr "Rivier"
msgid "Farmland"
msgstr "Landbouwgrond"
-#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:577
#: manual/civmanual.c:226
msgid "Airbase"
msgstr "Luchthaven"
-#: common/terrain.c:402 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:579
msgid "Fallout"
msgstr "Radioactief"
-#: common/unit.c:546 client/gui-win32/plrdlg.c:337
+#: common/unit.c:549 client/gui-win32/plrdlg.c:337
msgid "Idle"
msgstr "Stilstaand"
-#: common/unit.c:556
+#: common/unit.c:559
msgid "Fortifying"
msgstr "Fortificeren"
-#: common/unit.c:558
+#: common/unit.c:561
msgid "Fortified"
msgstr "Gefortificeerd"
-#: common/unit.c:562 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
+#: common/unit.c:565 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
msgid "Sentry"
msgstr "Op Wacht"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
+#: common/unit.c:569 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
#: client/gui-win32/menu.c:370 client/gui-xaw/menu.c:185
msgid "Pillage"
msgstr "Plunder"
-#: common/unit.c:568 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
+#: common/unit.c:571 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
msgid "Goto"
msgstr "Ga naar"
-#: common/unit.c:570
+#: common/unit.c:573
msgid "Explore"
msgstr "Verken"
-#: common/unit.c:572 manual/civmanual.c:224
+#: common/unit.c:575 manual/civmanual.c:224
msgid "Transform"
msgstr "Transformeer"
-#: common/unit.c:584 client/text.c:157 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:587 client/text.c:157 client/gui-sdl/citydlg.c:1972
#: client/gui-win32/citydlg.c:1257 client/gui-xaw/citydlg.c:1423
msgid "Unknown"
msgstr "Onbekend"
-#: common/unit.c:1022
+#: common/unit.c:1025
msgid "Moves"
msgstr "Beurten"
-#: common/unit.c:1571
+#: common/unit.c:1574
#, c-format
msgid ""
"Upgrade %s to %s for %d gold?\n"
@@ -736,12 +737,12 @@ msgstr ""
"Waardeer %s op naar %s voor %d goud?\n"
"Schatkist bevat %d goud."
-#: common/unit.c:1579
+#: common/unit.c:1582
#, c-format
msgid "Sorry, cannot upgrade %s (yet)."
msgstr "Sorry: kan %s (nog) niet opwaarderen."
-#: common/unit.c:1585
+#: common/unit.c:1588
#, c-format
msgid ""
"Upgrading %s to %s costs %d gold.\n"
@@ -750,11 +751,11 @@ msgstr ""
"Opwaarderen %s tot %s kost %d goud.\n"
"Schatkist bevat %d goud."
-#: common/unit.c:1594
+#: common/unit.c:1597
msgid "You can only upgrade units in your cities."
msgstr "U kunt alleen eenheden in uw steden opwaarderen."
-#: common/unit.c:1598
+#: common/unit.c:1601
#, c-format
msgid "Upgrading this %s would strand units it transports."
msgstr ""
@@ -792,11 +793,11 @@ msgstr "Kernraket"
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1404
+#: common/unittype.c:349 client/helpdata.c:1412
msgid " and "
msgstr " en "
-#: common/unittype.c:355 client/helpdata.c:1390
+#: common/unittype.c:355 client/helpdata.c:1398
msgid "?and:, "
msgstr "?en:, "
@@ -966,69 +967,69 @@ msgstr "Leeg argument voor \"%s\".\n"
msgid "Missing argument for \"%s\".\n"
msgstr "Ontbrekend argument voor \"%s\".\n"
-#: utility/shared.c:501
+#: utility/shared.c:514
#, c-format
msgid "%d BC"
msgstr "%d VC"
-#: utility/shared.c:503
+#: utility/shared.c:516
#, c-format
msgid "%d AD"
msgstr "%d AD"
-#: utility/shared.c:924
+#: utility/shared.c:937
msgid "FREECIV_PATH is set but empty; using default path instead."
msgstr "FREECIV_PATH is ingesteld maar leeg; gebruik standaardpad."
-#: utility/shared.c:1028
+#: utility/shared.c:1041
#, c-format
msgid "Could not read data directory %s: %s."
msgstr "Kon gegevensmap %s niet lezen: %s."
-#: utility/shared.c:1279
+#: utility/shared.c:1292
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:1281
+#: utility/shared.c:1294
#, c-format
msgid "Current data path is: \"%s\""
msgstr "Huidig data pad is: \"%s\""
-#: utility/shared.c:1283
+#: utility/shared.c:1296
#, c-format
msgid "The \"%s\" file is required ... aborting!"
msgstr "Het \"%s\" bestand is nodig ... breek af!"
-#: utility/shared.c:1460
+#: utility/shared.c:1485
#, 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:1462
+#: utility/shared.c:1487
msgid "Use a non-privileged account instead.\n"
msgstr "Gebruik inplaats daarvan een normaal account.\n"
-#: utility/shared.c:1478
+#: utility/shared.c:1503
msgid "exact match"
msgstr "exacte overeenkomst"
-#: utility/shared.c:1479
+#: utility/shared.c:1504
msgid "only match"
msgstr "komt alleen overeen met"
-#: utility/shared.c:1480
+#: utility/shared.c:1505
msgid "ambiguous"
msgstr "dubbelzinnig"
-#: utility/shared.c:1481
+#: utility/shared.c:1506
msgid "empty"
msgstr "leeg"
-#: utility/shared.c:1482
+#: utility/shared.c:1507
msgid "too long"
msgstr "te lang"
-#: utility/shared.c:1483
+#: utility/shared.c:1508
msgid "non-match"
msgstr "niet overeenkomend met"
@@ -1057,22 +1058,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:280
+#: ai/advdiplomacy.c:300
#, 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:290
+#: ai/advdiplomacy.c:310
#, c-format
msgid "*%s (AI)* First break alliance with %s, %s."
msgstr "*%s (AI)* Verbreek eerst de alliantie met %s, %s."
-#: ai/advdiplomacy.c:303
+#: ai/advdiplomacy.c:322
#, c-format
msgid "*%s (AI)* Let us first cease hostilies, %s."
msgstr "*%s (AI)* Laat ons eerst onze vijandelijkheden staken, %s."
-#: ai/advdiplomacy.c:308
+#: ai/advdiplomacy.c:327
#, c-format
msgid ""
"*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
@@ -1080,48 +1081,48 @@ msgid ""
msgstr ""
"*%s (AI)* Ik wil eerst zien of je ons staakt-het-vuren nog wat volhoudt, %s."
-#: ai/advdiplomacy.c:331
+#: ai/advdiplomacy.c:350
#, 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:424
+#: ai/advdiplomacy.c:443
#, 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:454
+#: ai/advdiplomacy.c:473
#, 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:560
+#: ai/advdiplomacy.c:579
#, 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:582
+#: ai/advdiplomacy.c:601
#, c-format
msgid "*%s (AI)* Welcome into our alliance %s!"
msgstr "*%s (AI)* Welkom in onze alliantie %s!"
-#: ai/advdiplomacy.c:586
+#: ai/advdiplomacy.c:605
#, 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:593
+#: ai/advdiplomacy.c:612
#, c-format
msgid "*%s (AI)* Yes, peace in our time!"
msgstr "*%s (AI)* Ja, vrede in onze tijd!"
-#: ai/advdiplomacy.c:598
+#: ai/advdiplomacy.c:617
#, c-format
msgid "*%s (AI)* Agreed. No more hostilities, %s."
msgstr "*%s (AI)* Akkoord. Geen vijandelijkheden meer, %s."
-#: ai/advdiplomacy.c:813
+#: ai/advdiplomacy.c:832
#, fuzzy, c-format
msgid ""
"*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
@@ -1130,23 +1131,23 @@ msgstr ""
"*%s·(AI)*·Gegroet %s!·Mogen we een staakt-het-vuren voorstellen terwijl we "
"elkaar leren kennen?"
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1116
#, c-format
msgid "*%s (AI)* Space will never be yours. "
msgstr "*%s (AI)* De ruimte zal je nooit kunnen beheersen."
-#: ai/advdiplomacy.c:1102
+#: ai/advdiplomacy.c:1121
#, 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:1108
+#: ai/advdiplomacy.c:1127
#, c-format
msgid "*%s (AI)* Peace in ... some other time."
msgstr "* %s (AI)* Vrede ... maar niet nu."
-#: ai/advdiplomacy.c:1113
+#: ai/advdiplomacy.c:1132
#, c-format
msgid ""
"*%s (AI)* Finally I get around to you! Did you really think you could get "
@@ -1155,18 +1156,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:1119
+#: ai/advdiplomacy.c:1138
#, 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:1126
+#: ai/advdiplomacy.c:1145
#, 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:1209
+#: ai/advdiplomacy.c:1229
#, c-format
msgid ""
"*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1181,14 +1182,14 @@ msgstr[1] ""
"*%s (AI)* We gaan volle oorlog verklaren tegen %s binnen %dbeurten om de "
"lancering te stoppen."
-#: ai/advdiplomacy.c:1219
+#: ai/advdiplomacy.c:1239
#, 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:1225
+#: ai/advdiplomacy.c:1245
#, c-format
msgid ""
"*%s (AI)* %s has grossly violated his treaties with us for own gain. We "
@@ -1207,7 +1208,7 @@ msgstr[1] ""
"dat betaald zetten binnen %d beurten. We verwachten dat u onze alliantie "
"respecteert en hetzelfde doet!"
-#: ai/advdiplomacy.c:1238
+#: ai/advdiplomacy.c:1258
#, c-format
msgid ""
"*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1222,13 +1223,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:1246
+#: ai/advdiplomacy.c:1266
#, 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:1251
+#: ai/advdiplomacy.c:1271
#, c-format
msgid ""
"*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1243,13 +1244,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:1261
+#: ai/advdiplomacy.c:1281
#, 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:1267
+#: ai/advdiplomacy.c:1287
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance and declare war on %s in %d turn. "
@@ -1264,7 +1265,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:1276
+#: ai/advdiplomacy.c:1296
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1279,7 +1280,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:1344
+#: ai/advdiplomacy.c:1364
#, c-format
msgid ""
"*%s (AI)* Your attempt to conquer space for yourself alone betray your true "
@@ -1288,7 +1289,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:1359
+#: ai/advdiplomacy.c:1379
#, c-format
msgid ""
"*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
@@ -1296,7 +1297,7 @@ msgid ""
msgstr ""
"*%s (AI)* Uw poging om eenzijdig de ruimte te domineren is zeer offensief."
-#: ai/advdiplomacy.c:1362
+#: ai/advdiplomacy.c:1382
#, c-format
msgid ""
"*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
@@ -1305,13 +1306,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:1474
+#: ai/advdiplomacy.c:1494
#, 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:1549
+#: ai/advdiplomacy.c:1569
#, c-format
msgid ""
"*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
@@ -1320,7 +1321,7 @@ msgstr ""
"*%s (AI)* Gegroet, onze meest vertrouwde geallieerde. We roepen u op onze "
"vijand %s te vernietigen."
-#: ai/advdiplomacy.c:1555
+#: ai/advdiplomacy.c:1575
#, c-format
msgid ""
"*%s (AI)* Greetings ally, I see you have not yet made war with our enemy, %"
@@ -1329,7 +1330,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:1562
+#: ai/advdiplomacy.c:1582
#, c-format
msgid ""
"*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1339,7 +1340,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:1592
+#: ai/advdiplomacy.c:1612
#, c-format
msgid ""
"*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
@@ -1348,13 +1349,13 @@ msgstr ""
"*%s (AI)* Gegroet vriend, wat vind je ervan mochten we samen sterk staan in "
"een alliantie?"
-#: ai/advdiplomacy.c:1607
+#: ai/advdiplomacy.c:1627
#, 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:1622
+#: ai/advdiplomacy.c:1642
#, c-format
msgid ""
"*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
@@ -1363,7 +1364,7 @@ msgstr ""
"*%s (AI)* We worden het gedurige bloedvergieten langzaam beu. Wat vind je "
"van een einde aan het gevecht?"
-#: ai/advdiplomacy.c:1742
+#: ai/advdiplomacy.c:1762
#, fuzzy, c-format
msgid ""
"*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1514,17 +1515,17 @@ msgstr ""
"Het wachtwoord moet tenminste %d hoofdletters en %d cijfers bevatten en "
"dient tenminste %d [afdrukbare] tekens lang te zijn. Probeer opnieuw"
-#: server/barbarian.c:183
+#: server/barbarian.c:184
#, fuzzy, c-format
msgid "%s gain a leader by the name %s. Dangerous times may lie ahead."
msgstr "De barbaren hebben nu een leider, %s. Er wachten gevaarlijke tijden."
-#: server/barbarian.c:479
+#: server/barbarian.c:480
#, c-format
msgid "Native unrest near %s led by %s."
msgstr "Inboorlingenopstand bij %s onder leiding van %s."
-#: server/barbarian.c:484
+#: server/barbarian.c:485
#, c-format
msgid "Sea raiders seen near %s!"
msgstr "Zeerovers gezien bij %s!"
@@ -1913,7 +1914,7 @@ msgid_plural "%s boosts research; you gain %d immediate advances."
msgstr[0] "%s versnelt onderzoek, u krijgt een onmiddelijke vooruitgang."
msgstr[1] "%s versnelt onderzoek, u krijgt %d onmiddelijke vooruitgangen."
-#: server/cityturn.c:1158 server/techtools.c:176
+#: server/cityturn.c:1158 server/techtools.c:172
#, c-format
msgid "The %s have acquired %s from %s."
msgstr "De %s hebben %s verkregen van %s."
@@ -1997,22 +1998,22 @@ msgstr ""
"Waarschuwing: de optie %s is verouderd. Gebruik -m om de metaserver te "
"activeren.\n"
-#: server/civserver.c:189
+#: server/civserver.c:193
#, c-format
msgid "Error: unknown option '%s'\n"
msgstr "Fout: onbekende optie '%s'\n"
-#: server/civserver.c:200
+#: server/civserver.c:204
#, c-format
msgid "This is the server for %s"
msgstr "Dit is de server voor %s"
-#: server/civserver.c:201
+#: server/civserver.c:205
#, c-format
msgid "You can learn a lot about Freeciv at %s"
msgstr "U kunt veel leren over Freeciv op %s"
-#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
+#: server/civserver.c:210 client/civclient.c:239 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -2021,105 +2022,110 @@ msgstr ""
"Gebruik: %s [optie ...]\n"
"Geldige opties zijn:\n"
-#: server/civserver.c:208
+#: server/civserver.c:212
#, fuzzy
msgid ""
" -a --auth FILE\tEnable server authentication with configuration from "
"FILE.\n"
msgstr " -a --auth\t\tZet server identificatie aan.\n"
-#: server/civserver.c:210
+#: server/civserver.c:214
msgid " -G --Guests\t\tAllow guests to login if auth is enabled.\n"
msgstr " -G --Guests\t\tLaat gasten toe terwijl auth uitstaat.\n"
-#: server/civserver.c:212
+#: server/civserver.c:216
msgid " -N --Newusers\tAllow new users to login if auth is enabled.\n"
msgstr " -N --Newusers\tLaat nieuwkomers toe terwijl auth uitstaat.\n"
-#: server/civserver.c:215
+#: server/civserver.c:219
msgid " -b --bind ADDR\tListen for clients on ADDR\n"
msgstr " -b, --bind ADDR\tLuister naar clients op ADDR\n"
-#: server/civserver.c:217 client/civclient.c:242
+#: server/civserver.c:221 client/civclient.c:243
msgid ""
" -d, --debug NUM\tSet debug log level (0 to 4, or 4:file1,min,max:...)\n"
msgstr ""
" -d, --debug GETAL\tZet debug-logniveau (0 tot 4,of 4:bestand1,min,"
"max:...)\n"
-#: server/civserver.c:221 client/civclient.c:246
+#: server/civserver.c:225 client/civclient.c:247
msgid " -d, --debug NUM\tSet debug log level (0 to 3)\n"
msgstr " -d, --debug GETAL\tZet debug-logniveau (0 tot 3)\n"
-#: server/civserver.c:223
+#: server/civserver.c:227
msgid " -f, --file FILE\tLoad saved game FILE\n"
msgstr " -f, --file BESTAND\tLaad opgeslagen spel BESTAND\n"
-#: server/civserver.c:225 client/civclient.c:249 manual/civmanual.c:382
+#: server/civserver.c:229 client/civclient.c:250 manual/civmanual.c:382
msgid " -h, --help\t\tPrint a summary of the options\n"
msgstr " -h, --help\t\tGeef een samenvatting van de opties\n"
-#: server/civserver.c:226
+#: server/civserver.c:230
+#, fuzzy
+msgid " -i, --identity ADDR\tBe known as ADDR at metaserver\n"
+msgstr " -M, --Metaserver ADDR\tGebruik ADDR als metaserver-adres\n"
+
+#: server/civserver.c:231
msgid " -l, --log FILE\tUse FILE as logfile\n"
msgstr " -l, --log BESTAND\tGebruik BESTAND als logbestand\n"
-#: server/civserver.c:227
+#: server/civserver.c:232
msgid " -m, --meta\t\tNotify metaserver and send server's info\n"
msgstr " -m, --meta\t\tInformeer metaserver en stuur serverinfo\n"
-#: server/civserver.c:229
+#: server/civserver.c:234
msgid " -M, --Metaserver ADDR\tSet ADDR as metaserver address\n"
msgstr " -M, --Metaserver ADDR\tGebruik ADDR als metaserver-adres\n"
-#: server/civserver.c:232
+#: server/civserver.c:237
msgid " -p, --port PORT\tListen for clients on port PORT\n"
msgstr " -p, --port POORT\tLuister naar clients op poort POORT\n"
-#: server/civserver.c:234
+#: server/civserver.c:239
msgid " -q, --quitidle TIME\tQuit if no players for TIME seconds\n"
msgstr ""
" -q, --quitidle DUUR\tAnnuleer indien geen spelers gedurende DUUR seconden\n"
-#: server/civserver.c:236
+#: server/civserver.c:241
msgid " -e, --exit-on-end\tWhen a game ends, exit instead of restarting\n"
msgstr " -e, --exit-on-end\tBij speleinde, niet herstarten maar sluiten \n"
-#: server/civserver.c:239
+#: server/civserver.c:244
msgid " -s, --saves DIR\tSave games to directory DIR\n"
msgstr " -s, --saves MAP\tBewaard spelen in map MAP\n"
-#: server/civserver.c:241
+#: server/civserver.c:246
msgid " -S, --Serverid ID\tSets the server id to ID\n"
msgstr " -S, --Server ID\tZet de server id op ID\n"
-#: server/civserver.c:243
+#: server/civserver.c:248
msgid " -P, --Ppm\t\tSave ppms of the map when saving the game.\n"
msgstr " -P, -Ppm\t\tBewaar foto van de kaart bij opslaan van het spel.\n"
-#: server/civserver.c:244
+#: server/civserver.c:249
msgid " -r, --read FILE\tRead startup script FILE\n"
msgstr " -r, --read BESTAND\tLees startscript BESTAND\n"
-#: server/civserver.c:246
+#: server/civserver.c:251
msgid " -R, --Ranklog FILE\tUse FILE as ranking logfile\n"
msgstr " -R, --Ranklog BESTAND\tGebruik BESTAND als ranglogbestand\n"
-#: server/civserver.c:247 client/civclient.c:268 manual/civmanual.c:383
+#: server/civserver.c:252 client/civclient.c:269 manual/civmanual.c:383
msgid " -v, --version\t\tPrint the version number\n"
msgstr " -v, --version\t\tToon het versienummer\n"
-#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
+#: server/civserver.c:253 client/gui-gtk-2.0/gui_main.c:354
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, fuzzy, c-format
msgid "Report bugs at %s.\n"
msgstr "Rapporteer fouten aan <%s>.\n"
-#: server/commands.c:28
+#: server/commands.c:29
msgid "Start the game, or restart after loading a savegame."
msgstr "Start het spel, of herstart na het laden van een bewaard spel."
-#: server/commands.c:29
+#: server/commands.c:30
msgid ""
"This command starts the game. When starting a new game, it should be used "
"after all human players have connected, and AI players have been created (if "
@@ -2139,7 +2145,7 @@ msgstr ""
"beschikbaar, aangezien het dan toch geen effect meer heeft."
#. TRANS: translate text between <> only
-#: server/commands.c:42
+#: server/commands.c:44
msgid ""
"help\n"
"help commands\n"
@@ -2153,11 +2159,11 @@ msgstr ""
"help <naam van de opdracht>\n"
"help <naam van de optie>"
-#: server/commands.c:47
+#: server/commands.c:49
msgid "Show help about server commands and server options."
msgstr "Toon help over server-oprachten en server-opties."
-#: server/commands.c:48
+#: server/commands.c:50
msgid ""
"With no arguments gives some introductory help. With argument \"commands\" "
"or \"options\" gives respectively a list of all commands or all options. "
@@ -2173,11 +2179,11 @@ msgstr ""
"standaardwaarde voor die optie. Het argument mag worden ingekort wanneer dat "
"ondubbelzinnig kan."
-#: server/commands.c:63
+#: server/commands.c:66
msgid "Show a list of players, teams, connections, or scenarios."
msgstr "Toon een lijst met spelers, teams, verbindingen of scenarios."
-#: server/commands.c:64
+#: server/commands.c:67
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 "
@@ -2187,20 +2193,20 @@ msgstr ""
"scenarios. Het argument mag worden ingekort en heeft indien niet opgegeven "
"de waarde 'players'."
-#: server/commands.c:70
+#: server/commands.c:74
msgid "Quit the game and shutdown the server."
msgstr "Beëindig het spel en stop de server."
#. TRANS: translate text between <> only
-#: server/commands.c:74
+#: server/commands.c:79
msgid "cut <connection-name>"
msgstr "cut <naam van de verbinding>"
-#: server/commands.c:75
+#: server/commands.c:80
msgid "Cut a client's connection to server."
msgstr "Verbreek de verbinding tussen een client en de server."
-#: server/commands.c:76
+#: server/commands.c:81
msgid ""
"Cut specified client's connection to the server, removing that client from "
"the game. If the game has not yet started that client's player is removed "
@@ -2214,7 +2220,7 @@ msgstr ""
"gebruikt, geen namen van spelers."
#. TRANS: translate text between <> only
-#: server/commands.c:83
+#: server/commands.c:89
msgid ""
"explain\n"
"explain <option-name>"
@@ -2222,11 +2228,11 @@ msgstr ""
"explain\n"
"explain <naam van de optie>"
-#: server/commands.c:85
+#: server/commands.c:91
msgid "Explain server options."
msgstr "Geef uitleg over server-opties."
-#: server/commands.c:86
+#: server/commands.c:92
msgid ""
"The 'explain' command gives a subset of the functionality of 'help', and is "
"included for backward compatibility. With no arguments it gives a list of "
@@ -2240,7 +2246,7 @@ msgstr ""
"van de optie>')."
#. TRANS: translate text between <> only
-#: server/commands.c:93
+#: server/commands.c:100
msgid ""
"show\n"
"show <option-name>\n"
@@ -2250,11 +2256,11 @@ msgstr ""
"show <optie-naam>\n"
"show <optie-inkorting>"
-#: server/commands.c:96
+#: server/commands.c:103
msgid "Show server options."
msgstr "Toon server-opties."
-#: server/commands.c:97
+#: server/commands.c:104
msgid ""
"With no arguments, shows all server options (or available options, when used "
"by clients). With an argument, show only the named option, or options with "
@@ -2264,37 +2270,38 @@ msgstr ""
"indien gebruikt bij clients). Met een argument wordt alleen de genoemde "
"optie getoond of opties die beginnen met deze letters."
-#: server/commands.c:102
+#: server/commands.c:110
msgid "wall <message>"
msgstr "wall <bericht>"
-#: server/commands.c:103
+#: server/commands.c:111
msgid "Send message to all connections."
msgstr "Stuur een bericht over alle verbindingen."
-#: server/commands.c:104
+#: server/commands.c:112
msgid ""
"For each connected client, pops up a window showing the message entered."
msgstr ""
"Voor elke verbonden client, toon een venster met het opgegeven bericht."
-#: server/commands.c:108
+#: server/commands.c:117
msgid "vote yes|no [vote number]"
msgstr "vote yes|no [stemmingnummer]"
-#: server/commands.c:109
+#: server/commands.c:118
msgid "Cast a vote."
msgstr "Breng uw stem uit."
-#: server/commands.c:111
+#: server/commands.c:120
#, 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."
+"A player with basic 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."
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 "
@@ -2304,7 +2311,7 @@ msgstr ""
"volledige beurt zonder tegenstemmen of nadat meer dan 50% van de stemmen "
"voor of tegen is."
-#: server/commands.c:121
+#: server/commands.c:131
msgid ""
"debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
"<player> | timing | info]"
@@ -2312,11 +2319,11 @@ msgstr ""
"debug [ player <speler> | city <x> <y> | units <x> <y> | unit <id> | tec "
"<spelers> | timing | info]"
-#: server/commands.c:123
+#: server/commands.c:133
msgid "Turn on or off AI debugging of given entity."
msgstr "Zet KI-debugging aan of uit voor gegeven entiteit."
-#: server/commands.c:124
+#: server/commands.c:134
msgid ""
"Print AI debug information about given entity and turn continous debugging "
"output for this entity on or off."
@@ -2324,23 +2331,23 @@ msgstr ""
"Toon KI-debug informatie over gegeven entiteit en zet doorlopende debugging "
"uitvoer voor deze entiteit aan of uit."
-#: server/commands.c:128
+#: server/commands.c:139
msgid "set <option-name> <value>"
msgstr "set <optie-naam> <waarde>"
-#: server/commands.c:129
+#: server/commands.c:140
msgid "Set server option."
msgstr "Stel server-optie in."
-#: server/commands.c:132
+#: server/commands.c:144
msgid "team <player> [team]"
msgstr "team <naam van de speler> [team]"
-#: server/commands.c:133
+#: server/commands.c:145
msgid "Change, add or remove a player's team affiliation."
msgstr "Wijzig, voeg toe aan of verwijder van een spelers teamdeelname."
-#: server/commands.c:134
+#: server/commands.c:146
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 "
@@ -2353,15 +2360,15 @@ msgstr ""
"en samen vechten om een teamoverwinning te behalen met gemiddelde "
"individuele scores."
-#: server/commands.c:141
+#: server/commands.c:154
msgid "rulesetdir <directory>"
msgstr "rulesetdir <map>"
-#: server/commands.c:142
+#: server/commands.c:155
msgid "Choose new ruleset directory or modpack."
msgstr "Kies nieuwe spelregelmap of modpack."
-#: server/commands.c:143
+#: server/commands.c:156
msgid ""
"Choose new ruleset directory or modpack. Calling this\n"
" without any arguments will show you the currently selected ruleset."
@@ -2370,15 +2377,15 @@ msgstr ""
" argumenten gebruikt zal het de in gebruik zijnde spelregelset tonen."
#. TRANS: translate text between <> only
-#: server/commands.c:149
+#: server/commands.c:163
msgid "metainfo <meta-line>"
msgstr "metainfo <meta-regel>"
-#: server/commands.c:150
+#: server/commands.c:164
msgid "Set metaserver info line."
msgstr "Stel metaserver-informatieregel in."
-#: server/commands.c:151
+#: server/commands.c:165
msgid ""
"Set user defined metaserver info line. If parameter is omitted,\n"
"previously set metamessage will be removed. For most of the time\n"
@@ -2387,19 +2394,19 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:158
+#: server/commands.c:173
msgid "metapatch <meta-line>"
msgstr "metapatch <meta-regel>"
-#: server/commands.c:159
+#: server/commands.c:174
msgid "Set metaserver patches line."
msgstr "Stel metaserver-patches-regel in."
-#: server/commands.c:165
+#: server/commands.c:181
msgid "Control metaserver connection."
msgstr "Beheer verbinding met metaserver."
-#: server/commands.c:166
+#: server/commands.c:182
msgid ""
"'metaconnection ?' reports on the status of the connection to metaserver.\n"
"'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2410,33 +2417,33 @@ msgstr ""
"'metaconnection up' of 'metac u' maakt/herstelt de verbinding met metaserver."
#. TRANS: translate text between <> only
-#: server/commands.c:172
+#: server/commands.c:189
msgid "metaserver <address>"
msgstr "metaserver <adres>"
-#: server/commands.c:173
+#: server/commands.c:190
msgid "Set address (URL) for metaserver to report to."
msgstr "Stel metaserver adres in voor rapportering."
#. TRANS: translate text between <> only
-#: server/commands.c:177
+#: server/commands.c:195
msgid "aitoggle <player-name>"
msgstr "aitoggle <naam van de speler>"
-#: server/commands.c:178
+#: server/commands.c:196
msgid "Toggle AI status of player."
msgstr "Verwissel de KI-modus van deze speler."
#. TRANS: translate text between [] and <> only
-#: server/commands.c:182
+#: server/commands.c:201
msgid "take [connection-name] <player-name>"
msgstr "take [verbindingsnaam] <naam van de speler>"
-#: server/commands.c:183
+#: server/commands.c:202
msgid "Take over a player's place in the game."
msgstr "Neem een spelers plaats in in het spel."
-#: server/commands.c:184
+#: server/commands.c:203
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 "
@@ -2451,15 +2458,15 @@ msgstr ""
"nieuwe speler aangemaakt en aan de verbinding toegewezen."
#. TRANS: translate text between [] only
-#: server/commands.c:192
+#: server/commands.c:212
msgid "observe [connection-name] [player-name]"
msgstr "observe [verbindingsnaam] [naam van de speler]"
-#: server/commands.c:193
+#: server/commands.c:213
msgid "Observe a player or the whole game."
msgstr "Neem een speler of het hele spel waar"
-#: server/commands.c:194
+#: server/commands.c:214
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 "
@@ -2474,15 +2481,15 @@ msgstr ""
"verbonden met een globale waarnemer."
#. TRANS: translate text between <> only
-#: server/commands.c:202
+#: server/commands.c:223
msgid "detach <connection-name>"
msgstr "detach <naam van de verbinding>"
-#: server/commands.c:203
+#: server/commands.c:224
msgid "detach from a player."
msgstr "ontkoppel van een speler"
-#: server/commands.c:204
+#: server/commands.c:225
msgid ""
"Only the console and connections with cmdlevel 'hack' can force other "
"connections to detach from a player."
@@ -2491,22 +2498,22 @@ msgstr ""
"verbindingen dwingen om van een speler los te koppelen."
#. TRANS: translate text between <> only
-#: server/commands.c:209
+#: server/commands.c:231
msgid "create <player-name>"
msgstr "create <naam van de speler>"
-#: server/commands.c:210
+#: server/commands.c:232
msgid "Create an AI player with a given name."
msgstr "Maak een KI-speler met deze naam."
-#: server/commands.c:211
+#: server/commands.c:233
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:215
+#: server/commands.c:238
msgid ""
"away\n"
"away"
@@ -2514,16 +2521,16 @@ msgstr ""
"away\n"
"afwezigheidsboodschap"
-#: server/commands.c:217
+#: server/commands.c:240
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:218
+#: server/commands.c:241
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:222
+#: server/commands.c:246
msgid ""
"novice\n"
"novice <player-name>"
@@ -2531,11 +2538,11 @@ msgstr ""
"novice\n"
"novice <spelernaam>"
-#: server/commands.c:224
+#: server/commands.c:248
msgid "Set one or all AI players to 'novice'."
msgstr "Maak één of alle KI-spelers 'novice' (=beginner)."
-#: server/commands.c:225
+#: server/commands.c:249
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 "
@@ -2547,7 +2554,7 @@ msgstr ""
"speler ingesteld."
#. TRANS: translate text between <> only
-#: server/commands.c:231
+#: server/commands.c:256
msgid ""
"easy\n"
"easy <player-name>"
@@ -2555,11 +2562,11 @@ msgstr ""
"easy\n"
"easy <naam van de speler>"
-#: server/commands.c:233
+#: server/commands.c:258
msgid "Set one or all AI players to 'easy'."
msgstr "Maak één of alle KI-spelers 'easy' (=gemakkelijk)."
-#: server/commands.c:234
+#: server/commands.c:259
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 "
@@ -2571,7 +2578,7 @@ msgstr ""
"ingesteld."
#. TRANS: translate text between <> only
-#: server/commands.c:240
+#: server/commands.c:266
msgid ""
"normal\n"
"normal <player-name>"
@@ -2579,11 +2586,11 @@ msgstr ""
"normal\n"
"normal <naam van de speler>"
-#: server/commands.c:242
+#: server/commands.c:268
msgid "Set one or all AI players to 'normal'."
msgstr "Maak één of alle KI-spelers 'normal' (=normaal)."
-#: server/commands.c:243
+#: server/commands.c:269
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 "
@@ -2595,7 +2602,7 @@ msgstr ""
"speler ingesteld."
#. TRANS: translate text between <> only
-#: server/commands.c:249
+#: server/commands.c:276
msgid ""
"hard\n"
"hard <player-name>"
@@ -2603,11 +2610,11 @@ msgstr ""
"hard\n"
"hard <naam van de speler>"
-#: server/commands.c:251
+#: server/commands.c:278
msgid "Set one or all AI players to 'hard'."
msgstr "Maak één of alle KI-spelers 'hard' (=moeilijk)."
-#: server/commands.c:252
+#: server/commands.c:279
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 "
@@ -2619,7 +2626,7 @@ msgstr ""
"ingesteld."
#. TRANS: translate text between <> only
-#: server/commands.c:258
+#: server/commands.c:286
msgid ""
"experimental\n"
"experimental <player-name>"
@@ -2627,11 +2634,11 @@ msgstr ""
"experimental\n"
"experimental <naam van de speler>"
-#: server/commands.c:260
+#: server/commands.c:288
msgid "Set one or all AI players to 'experimental'."
msgstr "Maak één of alle KI-spelers 'experimental' (=experimenteel)."
-#: server/commands.c:261
+#: server/commands.c:289
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 "
@@ -2645,7 +2652,7 @@ msgstr ""
"MOGELIJKHEDEN! Voor normale servers heeft deze optie geen effect."
#. TRANS: translate text between <> only
-#: server/commands.c:269
+#: server/commands.c:298
msgid ""
"cmdlevel\n"
"cmdlevel <level>\n"
@@ -2659,17 +2666,20 @@ msgstr ""
"cmdlevel <niveau> first\n"
"cmdlevel <niveau> <naam van de verbinding>"
-#: server/commands.c:274
+#: server/commands.c:303
msgid "Query or set command access level access."
msgstr "Bekijk of wijzig opdrachtniveau toegang."
-#: server/commands.c:275
+#: server/commands.c:304
+#, fuzzy
msgid ""
"The command access level controls which server commands are available\n"
"to users via the client chatline. The available levels are:\n"
" none - no commands\n"
-" info - informational commands only\n"
+" info - informational or observer commands only\n"
+" basic - commands available to players in the game\n"
" ctrl - commands that affect the game and users\n"
+" admin - commands that affect server operation\n"
" hack - *all* commands - dangerous!\n"
"With no arguments, the current command access levels are reported.\n"
"With a single argument, the level is set for all existing connections,\n"
@@ -2708,20 +2718,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:296
+#: server/commands.c:328
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:301
+#: server/commands.c:334
msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
msgstr "timeoutincrease <beurt> <beurtmeerwaarde> <waarde> <waardemult>."
-#: server/commands.c:302
+#: server/commands.c:335
msgid "See \"help timeoutincrease\"."
msgstr "Zie \"help timeoutincrease\"."
-#: server/commands.c:303
+#: server/commands.c:336
msgid ""
"Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
"<turn> and multiply <value> by <valuemult>. Use this command in concert "
@@ -2733,24 +2743,43 @@ msgstr ""
"Standaardwaarde is 0 0 0 1"
#. TRANS: translate text between <> only
-#: server/commands.c:309
+#: server/commands.c:343
+msgid ""
+"cancelvote\n"
+"cancelvote <vote number>\n"
+"cancelvote all\n"
+msgstr ""
+
+#: server/commands.c:346
+msgid "Cancel a running vote.\n"
+msgstr ""
+
+#: server/commands.c:347
+msgid ""
+"With no arguments this command removes your own vote. If you have an admin "
+"access level, you can cancel any vote by vote number, or all votes with the "
+"'all' argument."
+msgstr ""
+
+#. TRANS: translate text between <> only
+#: server/commands.c:354
msgid "endgame"
msgstr "speleinde"
-#: server/commands.c:310
+#: server/commands.c:355
msgid "End the game immediately in a draw."
msgstr "Eindig het spel nu in een gelijkspel."
#. TRANS: translate text between <> only
-#: server/commands.c:314
+#: server/commands.c:360
msgid "surrender"
msgstr "geef uzelf over"
-#: server/commands.c:315
+#: server/commands.c:361
msgid "Concede the game."
msgstr "Geef dit spel gewonnen."
-#: server/commands.c:316
+#: server/commands.c:362
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."
@@ -2759,15 +2788,15 @@ msgstr ""
"behalve 1 dit doen eindigt het spel."
#. TRANS: translate text between <> only
-#: server/commands.c:322
+#: server/commands.c:369
msgid "remove <player-name>"
msgstr "remove <naam van de speler>"
-#: server/commands.c:323
+#: server/commands.c:370
msgid "Fully remove player from game."
msgstr "Verwijder deze speler volledig uit het spel."
-#: server/commands.c:324
+#: server/commands.c:371
msgid ""
"This *completely* removes a player from the game, including all cities and "
"units etc. Use with care!"
@@ -2776,7 +2805,7 @@ msgstr ""
"eenheden, enz.. Gebruik dit voorzichtig!"
#. TRANS: translate text between <> only
-#: server/commands.c:329
+#: server/commands.c:377
msgid ""
"save\n"
"save <file-name>"
@@ -2784,11 +2813,11 @@ msgstr ""
"save\n"
"save <bestandsnaam>"
-#: server/commands.c:331
+#: server/commands.c:379
msgid "Save game to file."
msgstr "Bewaar spel in bestand."
-#: server/commands.c:332
+#: server/commands.c:380
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"
@@ -2808,7 +2837,7 @@ msgstr ""
"en gebruik de opdracht 'start' wanneer de spelers weer verbinding hebben."
#. TRANS: translate text between <> only
-#: server/commands.c:341
+#: server/commands.c:390
msgid ""
"load\n"
"load <file-name>"
@@ -2816,11 +2845,11 @@ msgstr ""
"load\n"
"load <bestandsnaam>"
-#: server/commands.c:343
+#: server/commands.c:392
msgid "Load game from file."
msgstr "Laad spel vanuit bestand."
-#: server/commands.c:344
+#: server/commands.c:393
msgid ""
"Load a game from <file-name>. Any current data including players, rulesets "
"and server options are lost.\n"
@@ -2829,120 +2858,120 @@ msgstr ""
"spelregels en server-opties, gaan verloren.\n"
#. TRANS: translate text between <> only
-#: server/commands.c:349
+#: server/commands.c:399
msgid "read <file-name>"
msgstr "read <bestandsnaam>"
-#: server/commands.c:350
+#: server/commands.c:400
msgid "Process server commands from file."
msgstr "Verwerk server opdrachten uit bestand."
#. TRANS: translate text between <> only
-#: server/commands.c:354
+#: server/commands.c:405
msgid "write <file-name>"
msgstr "write <bestandsnaam>"
-#: server/commands.c:355
+#: server/commands.c:406
msgid "Write current settings as server commands to file."
msgstr "Schrijf huidige instellingen als server opdrachten naar bestand."
-#: server/commands.c:359
+#: server/commands.c:411
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:363
+#: server/commands.c:416
msgid "Simply returns the id of the server."
msgstr "Geeft gewoon het kenteken van de server terug."
-#: server/connecthand.c:85
+#: server/connecthand.c:109
#, c-format
msgid "Welcome to the %s Server running at %s port %d."
msgstr "Welkom bij de %s Server, draaiend op %s, poort %d."
-#: server/connecthand.c:89
+#: server/connecthand.c:113
#, c-format
msgid "Welcome to the %s Server at port %d."
msgstr "Welkom bij de %s Server op poort %d."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:97
+#: server/connecthand.c:121
#, fuzzy, c-format
msgid "(%d) %s: connected [%s]"
msgstr "(%d) %s heeft verbinding vanaf %s."
-#: server/connecthand.c:104
+#: server/connecthand.c:128
#, c-format
msgid "Server: %s has connected from %s."
msgstr "Server: %s heeft verbinding vanaf %s."
-#: server/connecthand.c:145
+#: server/connecthand.c:175
msgid "Couldn't attach your connection to new player."
msgstr "Kon uw verbinding niet koppelen aan nieuwe speler."
-#: server/connecthand.c:165
+#: server/connecthand.c:199
#, c-format
msgid "You are logged in as '%s' connected to no player."
msgstr "U bent ingelogd als '%s' verbonden met geen speler."
-#: server/connecthand.c:169
+#: server/connecthand.c:203
#, c-format
msgid "You are logged in as '%s' connected to an anonymous player."
msgstr "U bent ingelogd als '%s' verbonden met een anonieme speler."
-#: server/connecthand.c:174
+#: server/connecthand.c:208
#, c-format
msgid "You are logged in as '%s' connected to %s."
msgstr "U bent ingelogd als '%s' verbonden met %s."
-#: server/connecthand.c:187
+#: server/connecthand.c:221
#, c-format
msgid "Turn-blocking game play: waiting on %s to finish turn..."
msgstr "Wissel-beurt spel: wacht tot %s zijn beurt heeft voltooid..."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:240
+#: server/connecthand.c:274
#, fuzzy, c-format
msgid "(%d) %s: connection request [%s]"
msgstr "(%d) Verzoek tot verbinding van %s van %s"
-#: server/connecthand.c:266
+#: server/connecthand.c:300
#, fuzzy
msgid "The client is missing a capability that this server needs."
msgstr "De client mist een mogelijkheid die deze server nodig heeft."
-#: server/connecthand.c:268 server/connecthand.c:279
+#: server/connecthand.c:302 server/connecthand.c:313
#, fuzzy, c-format
msgid "(%d) %s rejected: mismatched capabilities!"
msgstr "(%d) %s afgewezen: Afwijkende mogelijkheden."
-#: server/connecthand.c:277
+#: server/connecthand.c:311
#, fuzzy
msgid "This server is missing a capability that the client needs."
msgstr "De server mist een mogelijkheid die de client nodig heeft."
-#: server/connecthand.c:290
+#: server/connecthand.c:324
#, fuzzy
msgid "The username is invalid!"
msgstr "Ongeldige gebruikersnaam"
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:292
+#: server/connecthand.c:326
#, fuzzy, c-format
msgid "(%d) %s rejected: invalid username [%s]"
msgstr "(%d) %s afgewezen: Ongeldige naam [%s]."
-#: server/connecthand.c:303
+#: server/connecthand.c:337
#, fuzzy
msgid "Your username is already connected!"
msgstr "heeft al verbinding."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:305
+#: server/connecthand.c:339
#, fuzzy, c-format
msgid "(%d) %s rejected: duplicate username [%s]"
msgstr "(%d) %s afgewezen: Al gebruikte login naam [%s]."
-#: server/connecthand.c:335 server/connecthand.c:344
+#: server/connecthand.c:369 server/connecthand.c:378
#, c-format
msgid "Lost connection: %s."
msgstr "Verbinding verbroken: %s."
@@ -2959,112 +2988,112 @@ msgstr "Ok. Standaard stijl ingesteld."
msgid "For introductory help, type 'help'."
msgstr "Voor een introductie, type 'help'."
-#: server/diplhand.c:164
+#: server/diplhand.c:167
#, c-format
msgid "The %s can't accept %s."
msgstr "De %s kunnen %s niet accepteren."
-#: server/diplhand.c:176
+#: server/diplhand.c:179
#, c-format
msgid "You don't have tech %s, you can't accept treaty."
msgstr "U hebt ontwikkeling %s niet, u kunt het verdrag niet accepteren."
-#: server/diplhand.c:185
+#: server/diplhand.c:188
msgid "City you are trying to give no longer exists, you can't accept treaty."
msgstr ""
"De stad die u probeert te geven bestaat niet langer, u kunt het verdrag niet "
"accepteren."
-#: server/diplhand.c:191
+#: server/diplhand.c:194
#, c-format
msgid "You are not owner of %s, you can't accept treaty."
msgstr "U bent geen eigenaar van %s, u kunt het verdrag niet accepteren."
-#: server/diplhand.c:197 server/diplhand.c:301
+#: server/diplhand.c:200 server/diplhand.c:304
#, c-format
msgid "Your capital (%s) is requested, you can't accept treaty."
msgstr "Uw hoofdstad (%s) wordt gevraagd, u kunt het verdrag niet accepteren."
-#: server/diplhand.c:224
+#: server/diplhand.c:227
msgid "You don't have enough gold, you can't accept treaty."
msgstr "U hebt niet genoeg goud, u kunt het verdrag niet accepteren."
-#: server/diplhand.c:256 server/diplhand.c:261
+#: server/diplhand.c:259 server/diplhand.c:264
#, c-format
msgid "A treaty containing %d clause was agreed upon."
msgid_plural "A treaty containing %d clauses was agreed upon."
msgstr[0] "Men is een verdrag met %d clausule overeengekomen."
msgstr[1] "Men is een verdrag met %d clausules overeengekomen."
-#: server/diplhand.c:277 server/diplhand.c:281
+#: server/diplhand.c:280 server/diplhand.c:284
#, fuzzy, c-format
msgid "One of the cities the %s are giving away is destroyed! Treaty canceled!"
msgstr "Eén van de steden die %s weggeeft is vernietigd! Verdrag verbroken!"
-#: server/diplhand.c:288 server/diplhand.c:293
+#: server/diplhand.c:291 server/diplhand.c:296
#, c-format
msgid "The %s no longer control %s! Treaty canceled!"
msgstr "De %s besturen niet langer %s! Verdrag verbroken!"
-#: server/diplhand.c:331 server/diplhand.c:335
+#: server/diplhand.c:334 server/diplhand.c:338
#, c-format
msgid "The %s don't have the promised amount of gold! Treaty canceled!"
msgstr "De %s hebben de beloofde hoeveelheid goud niet! Verdrag verbroken!"
-#: server/diplhand.c:364
+#: server/diplhand.c:367
#, c-format
msgid "You gave an embassy to %s."
msgstr "U hebt een ambassade geschonken aan %s."
-#: server/diplhand.c:367
+#: server/diplhand.c:370
#, c-format
msgid "%s allowed you to create an embassy!"
msgstr "%s maakt het u mogelijk een ambassade te maken!"
-#: server/diplhand.c:383
+#: server/diplhand.c:386
#, c-format
msgid "You are taught the knowledge of %s."
msgstr "U bent onderwezen in de kennis van %s."
-#: server/diplhand.c:387
+#: server/diplhand.c:390
#, c-format
msgid "The %s have acquired %s from the %s."
msgstr "De %s hebben %s verkregen van de %s."
-#: server/diplhand.c:402
+#: server/diplhand.c:405
#, c-format
msgid "You get %d gold."
msgstr "U krijgt %d goud."
#. TRANS: ... Polish worldmap.
-#: server/diplhand.c:410
+#: server/diplhand.c:413
#, fuzzy, c-format
msgid "You receive the %s worldmap."
msgstr "U krijgt %s's wereldkaart."
#. TRANS: ... Polish seamap.
-#: server/diplhand.c:419
+#: server/diplhand.c:422
#, fuzzy, c-format
msgid "You receive the %s seamap."
msgstr "U krijgt %s's zeekaart."
-#: server/diplhand.c:436
+#: server/diplhand.c:439
#, c-format
msgid "You receive city of %s from %s."
msgstr "U ontvangt de stad %s van %s."
-#: server/diplhand.c:441
+#: server/diplhand.c:444
#, c-format
msgid "You give city of %s to %s."
msgstr "U geeft de stad %s aan %s."
-#: server/diplhand.c:454 server/diplhand.c:457
+#: server/diplhand.c:457 server/diplhand.c:460
#, c-format
msgid "You agree on a cease-fire with %s."
msgstr "U gaat akkoord met een wapenstilstand met %s."
#. TRANS: ... the Poles ... Polish territory.
-#: server/diplhand.c:476 server/diplhand.c:488
+#: server/diplhand.c:479 server/diplhand.c:491
#, fuzzy, c-format
msgid ""
"You agree on an armistice with the %s. In %d turn, it will become a peace "
@@ -3079,32 +3108,32 @@ msgstr[1] ""
"Je gaat akkoord met een wapenstilstand met %s. Binnen %d beurten wordt het "
"een vredesverdrag. Verwijder je eenheden uit het gebied van %s."
-#: server/diplhand.c:512 server/diplhand.c:515
+#: server/diplhand.c:515 server/diplhand.c:518
#, c-format
msgid "You agree on an alliance with %s."
msgstr "U gaat akkoord met het sluiten van een alliantie met %s."
-#: server/diplhand.c:524
+#: server/diplhand.c:527
#, c-format
msgid "You give shared vision to %s."
msgstr "U geeft gedeelde waarneming aan %s."
-#: server/diplhand.c:527
+#: server/diplhand.c:530
#, c-format
msgid "%s gives you shared vision."
msgstr "%s geeft u gedeelde waarneming."
-#: server/diplhand.c:663
+#: server/diplhand.c:666
#, c-format
msgid "%s canceled the meeting!"
msgstr "%s heeft de vergadering afgezegd!"
-#: server/diplhand.c:670
+#: server/diplhand.c:673
#, c-format
msgid "Meeting with %s canceled."
msgstr "Ontmoeting met %s afgezegd."
-#: server/diplhand.c:712
+#: server/diplhand.c:715
msgid "Your diplomatic envoy was decapitated!"
msgstr "Uw diplomatieke afgevaardigde werd onthoofd!"
@@ -3289,86 +3318,86 @@ msgid "The %s destroyed the %s in %s."
msgstr "De %s vernietigden de %s in %s."
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1091
+#: server/diplomats.c:1097
#, fuzzy, c-format
msgid "An enemy %s has been eliminated by your %s."
msgstr "Een vijandelijke %s is ge-elimineerd bij de verdediging van %s."
#. TRANS: <unit> ... <city> ... <diplomat>
-#: server/diplomats.c:1098
+#: server/diplomats.c:1104
#, c-format
msgid "Your %s has been eliminated defending %s against a %s."
msgstr "Uw %s is ge-elimineerd bij de verdediging van %s tegen %s."
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1106
+#: server/diplomats.c:1112
#, fuzzy, c-format
msgid "Your %s has been eliminated defending against a %s."
msgstr "Uw %s is ge-elimineerd bij de verdediging van tegen %s."
-#: server/diplomats.c:1119
+#: server/diplomats.c:1125
#, c-format
msgid "Your %s was eliminated by a defending %s."
msgstr "Uw %s is ge-elimineerd door een verdedigende %s."
-#: server/diplomats.c:1127
+#: server/diplomats.c:1133
#, c-format
msgid "Eliminated %s %s while infiltrating %s."
msgstr "Elimineerde %s %s tijdens het infiltreren van %s."
-#: server/diplomats.c:1134
+#: server/diplomats.c:1140
#, c-format
msgid "Eliminated %s %s while infiltrating our troops."
msgstr "Elimineerde %s %s tijdens het infiltreren van onze troepen."
-#: server/diplomats.c:1185
+#: server/diplomats.c:1191
#, fuzzy, c-format
msgid ""
"Your %s has successfully completed the mission and returned unharmed to %s."
msgstr ""
"Uw %s heeft haar missie met succes afgerond en keert ongedeerd terug naar %s."
-#: server/diplomats.c:1204
+#: server/diplomats.c:1210
#, fuzzy, c-format
msgid "Your %s was captured after completing the mission in %s."
msgstr "Uw %s is gevangengenomen na afronding van haar missie in %s."
-#: server/diplomats.c:1210
+#: server/diplomats.c:1216
#, fuzzy, c-format
msgid "Your %s was captured after completing the mission."
msgstr "Uw %s is gevangengenomen na afronding van haar missie."
-#: server/diplomats.c:1242
+#: server/diplomats.c:1248
#, fuzzy, c-format
msgid "You have caused an incident while bribing the %s %s."
msgstr "U hebt een schandaal veroorzaakt met het omkopen van %s's %s."
-#: server/diplomats.c:1247
+#: server/diplomats.c:1253
#, c-format
msgid "%s has caused an incident while bribing your %s."
msgstr "%s heeft een schandaal veroorzaakt met het omkopen van uw %s."
-#: server/diplomats.c:1254
+#: server/diplomats.c:1260
#, c-format
msgid "You have caused an incident while attempting to steal tech from %s."
msgstr ""
"U hebt een schandaal veroorzaakt in uw poging technologie van %s te stelen."
-#: server/diplomats.c:1258
+#: server/diplomats.c:1264
#, c-format
msgid "%s has caused an incident while attempting to steal tech from you."
msgstr ""
"%s heeft een schandaal veroorzaakt bij een poging tot stelen van uw "
"technologie."
-#: server/diplomats.c:1264
+#: server/diplomats.c:1270
#, c-format
msgid "You have caused an incident while inciting a revolt in %s."
msgstr ""
"U hebt een schandaal veroorzaakt met uw poging een opstand te ontketenen in %"
"s."
-#: server/diplomats.c:1268
+#: server/diplomats.c:1274
#, c-format
msgid "%s have caused an incident while inciting a revolt in %s."
msgstr ""
@@ -3487,12 +3516,12 @@ msgstr ""
" Arbeiders verzamelen zich spontaan en voorzien alle steden van "
"spoorwegen."
-#: server/maphand.c:1418
+#: server/maphand.c:1425
#, c-format
msgid "Moved your %s due to changing terrain."
msgstr "Verplaatste uw %s vanwege de terreinsverandering."
-#: server/maphand.c:1436
+#: server/maphand.c:1443
#, c-format
msgid "Disbanded your %s due to changing terrain."
msgstr "Ontbond uw %s vanwege de terreinsverandering."
@@ -3501,7 +3530,7 @@ msgstr "Ontbond uw %s vanwege de terreinsverandering."
msgid "Not reporting to the metaserver in this game."
msgstr "Rapporteer niet aan de metaserver in dit spel."
-#: server/meta.c:430
+#: server/meta.c:432
#, c-format
msgid "Metaserver: bad address: [%s:%d]."
msgstr "Metaserver: verkeerd adres: [%s:%d]."
@@ -3632,26 +3661,26 @@ msgstr ""
"Uw teamgenoot %s verklaarde de oorlog aan %s. U bent gehouden aan het "
"afbreken van uw alliantie met %s."
-#: server/plrhand.c:1103
+#: server/plrhand.c:1115
#, c-format
msgid "Removing player %s."
msgstr "Verwijder speler %s."
-#: server/plrhand.c:1105
+#: server/plrhand.c:1117
msgid "You've been removed from the game!"
msgstr "U bent uit het spel verwijderd!"
-#: server/plrhand.c:1108
+#: server/plrhand.c:1120
#, c-format
msgid "%s has been removed from the game."
msgstr "%s is uit het spel verwijderd."
-#: server/plrhand.c:1153 server/plrhand.c:1158
+#: server/plrhand.c:1167 server/plrhand.c:1172
#, 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:1178
+#: server/plrhand.c:1192
#, fuzzy, c-format
msgid ""
"%s and %s meet and go to instant war. You cancel your alliance with both."
@@ -3659,17 +3688,17 @@ msgstr ""
"%s heeft uw geallieerde %s aangevallen! Uw alliantie met de aanvaller is nu "
"verbroken."
-#: server/plrhand.c:1656
+#: server/plrhand.c:1670
#, 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:1663
+#: server/plrhand.c:1677
#, 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:1686
+#: server/plrhand.c:1700
#, fuzzy, c-format
msgid ""
"Your nation is thrust into civil war! %s is declared the leader of the rebel "
@@ -3678,12 +3707,12 @@ msgstr ""
"Uw natie is verzonken in burgeroorlog, %s is benoemd als de leider van de "
"rebellerende staten."
-#: server/plrhand.c:1707
+#: server/plrhand.c:1721
#, c-format
msgid "%s declares allegiance to %s."
msgstr "%s verklaart alliantie aan %s."
-#: server/plrhand.c:1722
+#: server/plrhand.c:1736
#, fuzzy, c-format
msgid ""
"Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3876,66 +3905,66 @@ msgstr "(%s wordt gebouwd in %s (%s))\n"
msgid "Wonders of the World"
msgstr "Wereldwonderen"
-#: server/report.c:547
+#: server/report.c:552
msgid " sq. mi."
msgstr " km2."
-#: server/report.c:557
+#: server/report.c:562
msgid " M tons"
msgstr " M ton"
-#: server/report.c:562
+#: server/report.c:567
msgid " M goods"
msgstr " M goederen"
-#: server/report.c:567
+#: server/report.c:572
msgid " bulbs"
msgstr " lampen"
-#: server/report.c:572
+#: server/report.c:577
msgid " month"
msgid_plural " months"
msgstr[0] " maand"
msgstr[1] " maanden"
-#: server/report.c:577
+#: server/report.c:582
msgid " ton"
msgid_plural " tons"
msgstr[0] " ton"
msgstr[1] " ton"
-#: server/report.c:591
+#: server/report.c:596
msgid "st"
msgstr "ste"
-#: server/report.c:593
+#: server/report.c:598
msgid "nd"
msgstr "de"
-#: server/report.c:595
+#: server/report.c:600
msgid "rd"
msgstr "de"
-#: server/report.c:597
+#: server/report.c:602
msgid "th"
msgstr "de"
-#: server/report.c:700
+#: server/report.c:705
msgid "Demography string contains invalid characters. Try \"help demography\"."
msgstr ""
"Volkenkundig formaat bevat ongeldige tekens. Probeer \"help demografie\"."
-#: server/report.c:743 server/report.c:768
+#: server/report.c:748 server/report.c:773
msgid "Demographics Report:"
msgstr "Volkenkundig Rapport:"
-#: server/report.c:744
+#: server/report.c:749
msgid "Sorry, the Demographics report is unavailable."
msgstr "Sorry, het Volkenkundig rapport is niet beschikbaar."
#. TRANS: <nation adjective> <government name> (<year>).
#. * E.g. "Polish Despotism (200 AD)".
-#: server/report.c:750
+#: server/report.c:755
#, fuzzy, c-format
msgid "%s %s (%s)"
msgstr "%s in %s (%s)\n"
@@ -3946,11 +3975,11 @@ msgstr "%s in %s (%s)\n"
msgid "Could not find a readable \"%s.%s\" ruleset file."
msgstr "Kon geen leesbaar spelregelbestand \"%s.%s\" vinden."
-#: server/ruleset.c:2356
+#: server/ruleset.c:2366
msgid "No barbarian nation in rulesets, at least one required!"
msgstr ""
-#: server/ruleset.c:3166
+#: server/ruleset.c:3178
msgid "Loading rulesets"
msgstr "Laad spelregels"
@@ -3966,13 +3995,13 @@ msgstr ""
"oudere opgeslagen spelen of het kan een beschadigd spelbestand betekenen. Ga "
"verder op eigen risico."
-#: server/savegame.c:3588
+#: server/savegame.c:3587
#, 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."
#. TRANS: Fatal error message.
-#: server/savegame.c:3815
+#: server/savegame.c:3817
#, fuzzy
msgid ""
"Saved game uses the \"classic\" terrain ruleset, and is no longer supported."
@@ -3980,7 +4009,7 @@ msgstr ""
"Het opgeslagen spel gebruikt de klassieke spelregelset die niet langer "
"ondersteund wordt."
-#: server/savegame.c:3824
+#: server/savegame.c:3826
#, c-format
msgid ""
"Warning: Different rulesetdirs ('%s' and '%s') are no longer supported. "
@@ -3990,7 +4019,7 @@ msgstr ""
"langer ondersteund. Gebruik '%s'."
#. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4051
+#: server/savegame.c:4055
#, c-format
msgid "%s had invalid nation; changing to %s."
msgstr ""
@@ -4023,7 +4052,7 @@ msgstr "Intern"
msgid "Networking"
msgstr "Netwerk"
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:734
#: client/gui-win32/dialogs.c:532
msgid "All"
msgstr "Alle "
@@ -5254,11 +5283,11 @@ msgstr ""
"het bestand \"civscore.log\" toegevoegd. Deze statistieken kunnen worden "
"gebruikt om kracht-grafieken te maken na afloop van het spel."
-#: server/sernet.c:150
+#: server/sernet.c:151
msgid "Server cannot read standard input. Ignoring input."
msgstr "Server kan standaard invoer niet lezen. Negeer invoer."
-#: server/sernet.c:929
+#: server/sernet.c:933
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr "Server: verkeerd adres: [%s:%d]."
@@ -5334,35 +5363,35 @@ msgstr "Uw ruimteschip heeft al het maximum aantal Zonnepaneelmodules!"
msgid "Without guidance from the capital, the %s spaceship is lost!"
msgstr "Zonder begeleiding vanuit de hoofdstad is het %s ruimteschip verloren!"
-#: server/srv_main.c:240
+#: server/srv_main.c:242
msgid "Game ended in a draw as end year exceeded"
msgstr "Spel eindigde in gelijkspel toen eindjaar verstreek"
-#: server/srv_main.c:274
+#: server/srv_main.c:276
#, c-format
msgid "The %s spaceship has arrived at Alpha Centauri."
msgstr "Het %s ruimteschip is aangekomen op Alfa Centauri."
-#: server/srv_main.c:287 server/srv_main.c:322
+#: server/srv_main.c:289 server/srv_main.c:324
#, c-format
msgid "Team victory to %s"
msgstr "Teamoverwinning naar %s"
-#: server/srv_main.c:297 server/srv_main.c:338
+#: server/srv_main.c:299 server/srv_main.c:340
#, c-format
msgid "Game ended in victory for %s"
msgstr "Spel eindigde in overwinning voor %s"
-#: server/srv_main.c:345
+#: server/srv_main.c:347
msgid "Game ended in a draw"
msgstr "Spel eindigde in een gelijkspel"
-#: server/srv_main.c:461 server/srv_main.c:472
+#: server/srv_main.c:465 server/srv_main.c:476
#, fuzzy, c-format
msgid "Your %s was disbanded in accordance with your peace treaty with the %s."
msgstr "Uw %s eenheid is ontbonden zoals volgens uw vredesverdrag met de %s."
-#: server/srv_main.c:512 server/srv_main.c:516
+#: server/srv_main.c:516 server/srv_main.c:520
#, c-format
msgid ""
"Concerned citizens point out that the cease-fire with %s will run out soon."
@@ -5370,12 +5399,12 @@ msgstr ""
"Bezorgde burgers wijzen u erop dat de wapenstilstand met %s binnenkort zal "
"aflopen."
-#: server/srv_main.c:521 server/srv_main.c:525
+#: server/srv_main.c:525 server/srv_main.c:529
#, c-format
msgid "The cease-fire with %s has run out. You are now at war with the %s."
msgstr "De wapenstilstand met %s is afgelopen. U bent nu in oorlog met de %s."
-#: server/srv_main.c:542
+#: server/srv_main.c:546
#, fuzzy, c-format
msgid ""
"Ceasefire between %s and %s has run out. They are at war. You cancel your "
@@ -5384,344 +5413,334 @@ msgstr ""
"Uw teamgenoot %s verklaarde de oorlog aan %s. U bent gehouden aan het "
"afbreken van uw alliantie met %s."
-#: server/srv_main.c:961
+#: server/srv_main.c:997
#, c-format
msgid "Failed saving game as %s"
msgstr "Kon spel niet als %s bewaren"
-#: server/srv_main.c:963
+#: server/srv_main.c:999
#, c-format
msgid "Game saved as %s"
msgstr "Spel bewaard als %s"
-#: server/srv_main.c:994
+#: server/srv_main.c:1030
msgid "The game is already running."
msgstr "Het spel is al begonnen."
-#: server/srv_main.c:1002
+#: server/srv_main.c:1038
#, 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:1009
+#: server/srv_main.c:1045
msgid "Starting game."
msgstr "Spel begint."
-#: server/srv_main.c:1071
+#: server/srv_main.c:1112
#, c-format
msgid "request for unknown report (type %d)"
msgstr "verzoek om onbekend rapport (type %d)"
-#: server/srv_main.c:1136
+#: server/srv_main.c:1177
#, c-format
msgid "Warning: rejecting old client %s"
msgstr "Waarschuwing: weiger oude client %s"
-#: server/srv_main.c:1238
+#: server/srv_main.c:1279
#, 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:1338
+#: server/srv_main.c:1381
msgid "Please choose a non-blank name."
msgstr "Kies alstublieft een niet-lege naam."
-#: server/srv_main.c:1354
+#: server/srv_main.c:1397
msgid "That nation is already in use."
msgstr "Die natie wordt al gespeeld."
-#: server/srv_main.c:1370
+#: server/srv_main.c:1413
#, 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:1391
+#: server/srv_main.c:1434
msgid "Please choose a name containing only ASCII characters."
msgstr "Kies alstublieft een naam met alleen ASCII tekens."
-#: server/srv_main.c:1490
+#: server/srv_main.c:1533
#, c-format
msgid "%s nation is not available in this scenario."
msgstr "%s natie niet beschikbaar in dit scenarie."
-#: server/srv_main.c:1496
+#: server/srv_main.c:1539
#, c-format
msgid "%s nation is already in use."
msgstr "De %s natie wordt al gespeeld."
-#: server/srv_main.c:1514
+#: server/srv_main.c:1557
#, c-format
msgid "%s is the %s ruler %s."
msgstr "%s is de %s heerser %s."
-#: server/srv_main.c:1570
+#: server/srv_main.c:1613
#, 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:1614 server/srv_main.c:1618
+#: server/srv_main.c:1657 server/srv_main.c:1661
#, 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:1760
+#: server/srv_main.c:1803
#, c-format
msgid "Player %d"
msgstr "Speler %d"
-#: server/srv_main.c:1771 server/srv_main.c:1777
+#: server/srv_main.c:1814 server/srv_main.c:1820
#, c-format
msgid "%s rules the %s."
msgstr "%s regeert de %s."
-#: server/srv_main.c:1942
+#: server/srv_main.c:1985
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
msgstr ""
-#: server/srv_main.c:1993
+#: server/srv_main.c:2037
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr "Zend info naar metaserver [%s]"
-#: server/srv_main.c:2024
+#: server/srv_main.c:2069
msgid "The game is over..."
msgstr "Het spel is voorbij..."
-#: server/srv_main.c:2237
+#: server/srv_main.c:2286
msgid "Now accepting new client connections."
msgstr "Accepteer nu nieuwe client-verbindingen."
-#: server/stdinhand.c:246
-#, c-format
-msgid "Vote \"%s\" is passed %d to %d with %d abstentions."
-msgstr "Stemming \"%s\" is aangenomen met %d tegen %d en %d onthoudingen."
-
-#: server/stdinhand.c:253
-#, c-format
-msgid "Vote \"%s\" failed with %d against, %d for and %d abstentions."
-msgstr "Stemming \"%s\" afgewezen met %d tegen, %d voor en %d onthoudingen."
-
#. TRANS: ambiguous command
-#: server/stdinhand.c:365
+#: server/stdinhand.c:284
msgid "(ambiguous)"
msgstr "(dubbelzinnig)"
#. TRANS: unrecognized command
#. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:416
+#: server/stdinhand.c:287 client/citydlg_common.c:419
#: 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 "(onbekend)"
-#: server/stdinhand.c:458
+#: server/stdinhand.c:377
msgid "Name is empty, so cannot be a player."
msgstr "Naam is leeg, dus kan geen speler zijn."
-#: server/stdinhand.c:462
+#: server/stdinhand.c:381
msgid "Name is too long, so cannot be a player."
msgstr "Naam is te lang, dus kan geen speler zijn."
-#: server/stdinhand.c:466
+#: server/stdinhand.c:385
#, c-format
msgid "Player name prefix '%s' is ambiguous."
msgstr "Spelers naam prefix '%s' is dubbelzinnig."
-#: server/stdinhand.c:470
+#: server/stdinhand.c:389
#, c-format
msgid "No player by the name of '%s'."
msgstr "Geen speler met de naam '%s'."
-#: server/stdinhand.c:474 server/stdinhand.c:509
+#: server/stdinhand.c:393 server/stdinhand.c:428
#, c-format
msgid "Unexpected match_result %d (%s) for '%s'."
msgstr "Onverwachte match_result %d (%s) voor '%s'."
-#: server/stdinhand.c:493
+#: server/stdinhand.c:412
msgid "Name is empty, so cannot be a connection."
msgstr "Naam is leeg, dus kan geen verbinding zijn."
-#: server/stdinhand.c:497
+#: server/stdinhand.c:416
msgid "Name is too long, so cannot be a connection."
msgstr "Naam is te lang, dus kan geen verbinding zijn."
-#: server/stdinhand.c:501
+#: server/stdinhand.c:420
#, c-format
msgid "Connection name prefix '%s' is ambiguous."
msgstr "Verbindingsnaam prefix '%s' is dubbelzinnig."
-#: server/stdinhand.c:505
+#: server/stdinhand.c:424
#, c-format
msgid "No connection by the name of '%s'."
msgstr "Geen verbinding met de naam '%s'."
-#: server/stdinhand.c:525
+#: server/stdinhand.c:444
#, c-format
msgid "Open metaserver connection to [%s]."
msgstr "Open metaserver verbinding met [%s]."
-#: server/stdinhand.c:538
+#: server/stdinhand.c:457
#, c-format
msgid "Close metaserver connection to [%s]."
msgstr "Verbreek metaserver verbinding met [%s]."
-#: server/stdinhand.c:553
+#: server/stdinhand.c:472
msgid "Metaserver connection is open."
msgstr "Verbinding met metaserver is open."
-#: server/stdinhand.c:556
+#: server/stdinhand.c:475
msgid "Metaserver connection is closed."
msgstr "Verbinding met metaserver is gesloten."
-#: server/stdinhand.c:566
+#: server/stdinhand.c:485
msgid "Metaserver connection is already open."
msgstr "Verbinding met metaserver is al open."
-#: server/stdinhand.c:577
+#: server/stdinhand.c:496
msgid "Metaserver connection is already closed."
msgstr "Verbinding met metaserver is al gesloten."
-#: server/stdinhand.c:582
+#: server/stdinhand.c:501
msgid "Argument must be 'u', 'up', 'd', 'down', or '?'."
msgstr "Argument moet 'u', 'up', 'd', 'down' of '?' zijn."
-#: server/stdinhand.c:603
+#: server/stdinhand.c:522
#, c-format
msgid "Metaserver patches string set to '%s'."
msgstr "Metaserver patches-regel ingesteld op '%s'."
-#: server/stdinhand.c:606
+#: server/stdinhand.c:525
#, c-format
msgid "Metaserver patches string set to '%s', not reporting to metaserver."
msgstr "Metaserver-patches-string is '%s', zal niet rapporteren aan meta."
-#: server/stdinhand.c:627
+#: server/stdinhand.c:546
#, c-format
msgid "Metaserver message string set to '%s'."
msgstr "Metaserver informatieregel ingesteld op '%s'."
-#: server/stdinhand.c:630
+#: server/stdinhand.c:549
#, c-format
msgid "Metaserver message string set to '%s', not reporting to metaserver."
msgstr "Metaserver-message-string is '%s'. zal niet rapporteren aan meta."
-#: server/stdinhand.c:650
+#: server/stdinhand.c:569
#, c-format
msgid "Metaserver is now [%s]."
msgstr "Metaserver is nu [%s]."
-#: server/stdinhand.c:660
+#: server/stdinhand.c:579
#, c-format
msgid "Server id: %s"
msgstr "Server id: %s"
-#: server/stdinhand.c:757
+#: server/stdinhand.c:676
msgid "You cannot save games manually on this server."
msgstr "Op deze server kan je spellen niet handmatig bewaren."
-#: server/stdinhand.c:774
+#: server/stdinhand.c:693
msgid "Cannot toggle a barbarian player."
msgstr "Kan status van barbaarse speler niet veranderen."
-#: server/stdinhand.c:781
+#: server/stdinhand.c:700
#, c-format
msgid "%s is now under AI control."
msgstr "%s is nu onder KI-besturing."
-#: server/stdinhand.c:802
+#: server/stdinhand.c:721
#, c-format
msgid "%s is now under human control."
msgstr "%s is nu onder menselijke besturing."
-#: server/stdinhand.c:847
+#: server/stdinhand.c:766
msgid "Can't add AI players once the game has begun."
msgstr "Kan geen KI-spelers meer toevoegen als het spel al begonnen is."
-#: server/stdinhand.c:867
+#: server/stdinhand.c:786
msgid "Can't add more players, server is full."
msgstr "Kan geen spelers meer toevoegen, server is vol."
-#: server/stdinhand.c:874
+#: server/stdinhand.c:793
msgid "Can't use an empty name."
msgstr "Kan geen lege naam gebruiken."
-#: server/stdinhand.c:881
+#: server/stdinhand.c:800
#, c-format
msgid "That name exceeds the maximum of %d chars."
msgstr "Die naam is langer dan het maximum van %d letters."
-#: server/stdinhand.c:887
+#: server/stdinhand.c:806
msgid "That name is not allowed."
msgstr "Die naam is niet toegelaten"
-#: server/stdinhand.c:893
+#: server/stdinhand.c:812
msgid "A player already exists by that name."
msgstr "Er is al een speler met die naam."
-#: server/stdinhand.c:899
+#: server/stdinhand.c:818
msgid "A user already exists by that name."
msgstr "Er is al een gebruiker met die naam."
-#: server/stdinhand.c:925
+#: server/stdinhand.c:844
#, c-format
msgid "%s has been added as an AI-controlled player."
msgstr "%s is toegevoegd als een KI-gestuurde speler."
-#: server/stdinhand.c:932
+#: server/stdinhand.c:851
#, c-format
msgid "Error creating new AI player: %s."
msgstr "Fout bij maken nieuwe KI-speler: %s."
-#: server/stdinhand.c:966
+#: server/stdinhand.c:885
msgid "Players cannot be removed once the game has started."
msgstr "Spelers kunnen niet worden verwijderd nadat het spel begonnen is."
-#: server/stdinhand.c:977
+#: server/stdinhand.c:896
#, c-format
msgid "Removed player %s from the game."
msgstr "Speler %s verwijderd uit het spel."
-#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
+#: server/stdinhand.c:935 server/stdinhand.c:3372 server/stdinhand.c:3507
#, c-format
msgid "Name \"%s\" disallowed for security reasons."
msgstr "Naam \"%s\" verboden wegens veiligheidsredenen"
-#: server/stdinhand.c:1029
+#: server/stdinhand.c:948
#, c-format
msgid "No command script found by the name \"%s\"."
msgstr "Geen opdracht script met de naam '\"%s\" gevonden."
-#: server/stdinhand.c:1037
+#: server/stdinhand.c:956
#, c-format
msgid "Loading script file: %s"
msgstr "Laad scriptbestand: %s"
-#: server/stdinhand.c:1052
+#: server/stdinhand.c:971
#, c-format
msgid "Cannot read command line scriptfile '%s'."
msgstr "Kon script bestand '%s' van opdrachtregel niet lezen."
-#: server/stdinhand.c:1054
+#: server/stdinhand.c:973
#, c-format
msgid "Could not read script file '%s'."
msgstr "Kon script bestand '%s' niet lezen."
-#: server/stdinhand.c:1146
+#: server/stdinhand.c:1065
#, c-format
msgid "Could not write script file '%s'."
msgstr "Kon script bestand '%s' niet schrijven."
-#: server/stdinhand.c:1158
+#: server/stdinhand.c:1077
msgid "You cannot use the write command on this server for security reasons."
msgstr ""
"U kan wegens veiligheidsredenen de schrijfopdract op deze server niet "
"gebruiken."
-#: server/stdinhand.c:1186
+#: server/stdinhand.c:1105
#, c-format
msgid ""
"Cannot decrease command access level '%s' for connection '%s'; you only have "
@@ -5730,34 +5749,39 @@ msgstr ""
"Kan opdracht toegangsniveau '%s' niet verlagen voor verbinding '%s'; u hebt "
"zelf slechts '%s'."
-#: server/stdinhand.c:1241
+#: server/stdinhand.c:1114
+#, c-format
+msgid "Command access level set to '%s' for connection %s."
+msgstr "Opdrachttoegangsniveau op '%s' gezet voor verbinding %s."
+
+#: server/stdinhand.c:1163
#, c-format
msgid ""
"Anyone can now become game organizer '%s' by issuing the 'first' command."
msgstr ""
"Iedereen kan nu spelleider %s worden door de 'first' opdract te gebruiken."
-#: server/stdinhand.c:1274
+#: server/stdinhand.c:1187
msgid "Command access levels in effect:"
msgstr "Opdrachttoegangsniveau's in gebruik:"
-#: server/stdinhand.c:1282
+#: server/stdinhand.c:1194
#, c-format
msgid "Command access level for new connections: %s"
msgstr "Opdrachtniveau voor nieuwe verbindingen: %s"
-#: server/stdinhand.c:1285
+#: server/stdinhand.c:1197
#, c-format
msgid "Command access level for first player to take it: %s"
msgstr "Opdrachttoegangsniveau voor eerste speler die het neemt: %s"
-#: server/stdinhand.c:1294
+#: server/stdinhand.c:1206
msgid ""
"Error: command access level must be one of 'none', 'info', 'ctrl', or 'hack'."
msgstr ""
"Fout: opdrachttoegangsniveau moet 'none', 'info', ctrl' of 'hack' zijn."
-#: server/stdinhand.c:1299
+#: server/stdinhand.c:1211
#, c-format
msgid ""
"Cannot increase command access level to '%s'; you only have '%s' yourself."
@@ -5765,202 +5789,191 @@ msgstr ""
"Kan opdrachttoegangsniveau niet opwaarderen naar '%s'; u hebt zelf slechts '%"
"s'."
-#: 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: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:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
+#: server/stdinhand.c:1238 server/stdinhand.c:1252 server/stdinhand.c:1273
#, c-format
msgid "Command access level set to '%s' for new players."
msgstr "Opdrachttoegangsniveau op '%s' gezet voor nieuwe spelers."
-#: server/stdinhand.c:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
+#: server/stdinhand.c:1243 server/stdinhand.c:1257 server/stdinhand.c:1267
#, 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:1402
+#: server/stdinhand.c:1302
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:1406
+#: server/stdinhand.c:1306
#, c-format
msgid "You already have command access level '%s' or better."
msgstr "U hebt al opdrachttoegangsniveau '%s' of beter."
-#: server/stdinhand.c:1411
+#: server/stdinhand.c:1311
msgid "Someone else already is game organizer."
msgstr "Iemand anders is al spel leider."
-#: server/stdinhand.c:1416
+#: server/stdinhand.c:1316
#, c-format
msgid "Connection %s has opted to become the game organizer."
msgstr "Verbinding %s heeft gekozen om spelleider te worden."
-#: server/stdinhand.c:1467
+#: server/stdinhand.c:1367
#, c-format
msgid "Invalid argument %d."
msgstr "Ongeldige parameter %d"
-#: server/stdinhand.c:1474
+#: server/stdinhand.c:1374
msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
msgstr ""
"Gebruik: timeoutincrease <beurt> <beurtmeerwaarde> <waarde> <waardemult>."
-#: server/stdinhand.c:1482
+#: server/stdinhand.c:1382
#, c-format
msgid "Dynamic timeout set to %d %d %d %d"
msgstr "Dynamische timeout ingesteld op %d %d %d %d"
-#: server/stdinhand.c:1542 server/stdinhand.c:1545
+#: server/stdinhand.c:1442 server/stdinhand.c:1445
msgid "Option:"
msgstr "Optie:"
-#: server/stdinhand.c:1555 server/stdinhand.c:4031
+#: server/stdinhand.c:1455 server/stdinhand.c:4079
msgid "Description:"
msgstr "Beschrijving:"
-#: server/stdinhand.c:1560
+#: server/stdinhand.c:1460
#, c-format
msgid "Status: %s"
msgstr "Status: %s"
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "changeable"
msgstr "veranderbaar"
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "fixed"
msgstr "vast"
-#: server/stdinhand.c:1567
+#: server/stdinhand.c:1467
#, c-format
msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
msgstr "Waarde: %d, Minimaal: 0, Standaard: %d, Maximaal: 1"
-#: server/stdinhand.c:1572
+#: server/stdinhand.c:1472
#, c-format
msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
msgstr "Waarde: %d, Minimaal: %d, Standaard: %d, Maximaal: %d"
-#: server/stdinhand.c:1578
+#: server/stdinhand.c:1478
#, c-format
msgid "Value: \"%s\", Default: \"%s\""
msgstr "Waarde: \"%s\", Standaard: \"%s\""
-#: server/stdinhand.c:1597
+#: server/stdinhand.c:1497
msgid "Explanations are available for the following server options:"
msgstr "Uitleg is beschibaar voor de volgende server-opties:"
-#: server/stdinhand.c:1643
+#: server/stdinhand.c:1537
msgid "No explanation for that yet."
msgstr "Nog geen uitleg daarvoor."
-#: server/stdinhand.c:1646 server/stdinhand.c:2480
+#: server/stdinhand.c:1540 server/stdinhand.c:2468
msgid "Ambiguous option name."
msgstr "Dubbelzinnige optienaam."
-#: server/stdinhand.c:1666
+#: server/stdinhand.c:1560
#, c-format
msgid "Server Operator: %s"
msgstr "Server Operator: %s"
-#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
+#: server/stdinhand.c:1686 server/stdinhand.c:1713 server/stdinhand.c:1731
#, c-format
msgid "Player '%s' now has AI skill level '%s'."
msgstr "Speler '%s' heeft nu KI-vaardigheidsniveau '%s'."
-#: server/stdinhand.c:1822
+#: server/stdinhand.c:1718
#, c-format
msgid "%s is not controlled by the AI."
msgstr "%s wordt niet gestuurd door een KI."
-#: server/stdinhand.c:1842
+#: server/stdinhand.c:1738
#, c-format
msgid "Default AI skill level set to '%s'."
msgstr "Standaard KI-vaardigheidsniveau op '%s' gezet."
-#: server/stdinhand.c:1857 server/stdinhand.c:2162
+#: server/stdinhand.c:1753
msgid "This command is client only."
msgstr "Deze opdracht is alleen voor een client."
-#: server/stdinhand.c:1860
+#: server/stdinhand.c:1756
msgid "Usage: away"
msgstr "Gebruik: away"
-#: server/stdinhand.c:1865
+#: server/stdinhand.c:1761
msgid "Only players may use the away command."
msgstr "Alleen spelers kunnen het away commando gebruiken."
-#: server/stdinhand.c:1869
+#: server/stdinhand.c:1765
#, c-format
msgid "%s set to away mode."
msgstr "%s ingesteld op afwezig-modus."
-#: server/stdinhand.c:1877
+#: server/stdinhand.c:1772
#, c-format
msgid "%s returned to game."
msgstr "%s is terug in het spel."
-#: server/stdinhand.c:1919
+#: server/stdinhand.c:1817
#, 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:1925
+#: server/stdinhand.c:1823
#, c-format
msgid "Unknown option '%s'."
msgstr "Onbekende optie '%s'."
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1848
msgid "All options with non-default values"
msgstr "Alle opties met aangepaste waarden"
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1851
msgid "All options"
msgstr "Alle opties"
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1854
msgid "Vital options"
msgstr "Belangrijke opties"
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1857
msgid "Situational options"
msgstr "Plaatsafhankelijke opties"
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1860
msgid "Rarely used options"
msgstr "Weinig gebruikte opties"
-#: server/stdinhand.c:1965
+#: server/stdinhand.c:1863
msgid "+ means you may change the option"
msgstr "+ betekent u mag deze optie wijzigen"
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1864
msgid "= means the option is on its default value"
msgstr "= betekent de optie is op zijn standaard waarde"
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
#, c-format
msgid "%-*s value (min,max) "
msgstr "%-*s waarde (min,max) "
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
msgid "Option"
msgstr "Optie"
-#: server/stdinhand.c:1973
+#: server/stdinhand.c:1871
msgid "description"
msgstr "beschrijving"
-#: server/stdinhand.c:2042
+#: server/stdinhand.c:1940
msgid ""
"Try 'show situational' or 'show rare' to show more options.\n"
"Try 'show changed' to show settings with non-default values."
@@ -5968,77 +5981,149 @@ 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:2092
+#: server/stdinhand.c:1966
msgid "Cannot change teams once game has begun."
msgstr "Kan geen teams meer wijzigen als het spel al begonnen is."
-#: server/stdinhand.c:2102
+#: server/stdinhand.c:1976
msgid "Undefined argument. Usage: team <player> <team>."
msgstr "Ongedefiniëerd argument. Gebruik: team <spelernaam> <team>."
-#: server/stdinhand.c:2122
+#: server/stdinhand.c:1996
#, 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:2129
+#: server/stdinhand.c:2003
msgid "Cannot team a barbarian."
msgstr "Een barbaarse speler kan niet aan een team worden toevoegd."
-#: server/stdinhand.c:2135
+#: server/stdinhand.c:2009
#, c-format
msgid "Player %s set to team %s."
msgstr "Speler %s is toegewezen aan team %s."
-#: 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:2035 server/voting.c:512
+#, fuzzy
+msgid "Teamvote"
+msgstr "Team"
-#: server/stdinhand.c:2165
-msgid "Observers cannot vote."
-msgstr "Waarnemers kunnen niet stemmen."
+#: server/stdinhand.c:2035 server/voting.c:516
+msgid "Vote"
+msgstr ""
-#: server/stdinhand.c:2168
+#: server/stdinhand.c:2037
+#, c-format
msgid ""
-"You can only vote in a running game. Use 'first' to become the game "
-"organizer if there currently is none."
+"%s %d \"%s\" (needs %0.0f%%%s): %d for, %d against, and %d abstained out of %"
+"d players."
msgstr ""
-"Je kan alleen stemmen in een draaiend spel. Gebruik 'first' om spelleider te "
-"worden als er nu geen is."
-#: 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:2041
+msgid " no dissent"
+msgstr ""
-#: server/stdinhand.c:2188
+#: server/stdinhand.c:2049
msgid "There are no votes going on."
msgstr "Er zijn geen stemmingen gaande."
-#: server/stdinhand.c:2208
-msgid "No legal last vote."
+#: server/stdinhand.c:2077
+#, fuzzy
+msgid "Invalid arguments. Usage: vote yes|no|abstain [vote number]."
+msgstr "Ongedefiniëerde argumenten. Gebruik: vote yes|no [stemnummer]."
+
+#: server/stdinhand.c:2095 server/stdinhand.c:2213 server/stdinhand.c:3714
+msgid "You are not allowed to use this command."
+msgstr "U mag deze opdracht niet gebruiken."
+
+#: server/stdinhand.c:2104
+#, fuzzy, c-format
+msgid "The argument \"%s\" is ambigious."
+msgstr "Help argument '%s' is dubbelzinnig."
+
+#: server/stdinhand.c:2119
+#, fuzzy
+msgid "There are no votes running."
+msgstr "Er zijn geen stemmingen gaande."
+
+#: server/stdinhand.c:2121
+#, fuzzy, c-format
+msgid "No legal last vote (%d %s)."
msgstr "Geen geldige laatste stem."
-#: server/stdinhand.c:2213
-msgid "Value must be integer."
+#: server/stdinhand.c:2122
+msgid "other vote running"
+msgid_plural "other votes running"
+msgstr[0] ""
+msgstr[1] ""
+
+#: server/stdinhand.c:2129 server/stdinhand.c:2491 server/stdinhand.c:2532
+msgid "Value must be an integer."
msgstr "Waarde moet een geheel getal zijn."
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2135 server/stdinhand.c:2221
#, c-format
msgid "No such vote (%d)."
msgstr "Stemming bestaat niet (%d)."
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2141
+#, fuzzy
+msgid "You are not allowed to vote on that."
+msgstr "U mag deze optie niet instellen."
+
+#: server/stdinhand.c:2146
#, c-format
msgid "You voted for \"%s\""
msgstr "U stemde voor \"%s\""
-#: server/stdinhand.c:2232
+#: server/stdinhand.c:2150
#, c-format
msgid "You voted against \"%s\""
msgstr "U stemde tegen \"%s\""
-#: server/stdinhand.c:2259
+#: server/stdinhand.c:2155
+#, c-format
+msgid "You abstained from voting on \"%s\""
+msgstr ""
+
+#: server/stdinhand.c:2190
+msgid "Missing argument <vote number> or the string \"all\"."
+msgstr ""
+
+#: server/stdinhand.c:2197
+#, fuzzy
+msgid "You don't have any vote going on."
+msgstr "U hebt hier geen arbeider."
+
+#: server/stdinhand.c:2204
+#, fuzzy
+msgid "There isn't any vote going on."
+msgstr "Er zijn geen stemmingen gaande."
+
+#: server/stdinhand.c:2209
+msgid "Server: All votes have been removed."
+msgstr ""
+
+#: server/stdinhand.c:2226
+#, fuzzy, c-format
+msgid "You are not allowed to cancel this vote (%d)."
+msgstr "U mag deze optie niet instellen."
+
+#: server/stdinhand.c:2232
+msgid "Usage: /cancelvote [<vote number>|all]"
+msgstr ""
+
+#: server/stdinhand.c:2241
+#, c-format
+msgid "Server: %s cancelled the vote \"%s\" (number %d)."
+msgstr ""
+
+#: server/stdinhand.c:2247
+#, c-format
+msgid "Server: The vote \"%s\" (number %d) has been cancelled."
+msgstr ""
+
+#: server/stdinhand.c:2265
msgid ""
"Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
"<x> <y> | unit <id> | tech <player> | timing | info>."
@@ -6046,130 +6131,126 @@ msgstr ""
"Ongedefinieerde argumenten. Gebruik: debug <diplomacy <player> | city <x> "
"<y> | units <x> <y> | unit <id> | tech <player> | timing | info>."
-#: server/stdinhand.c:2265
+#: server/stdinhand.c:2271
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:2294
+#: server/stdinhand.c:2300
#, c-format
msgid "%s diplomacy no longer debugged"
msgstr "%s diplomatie wordt niet langer gedebugged"
-#: server/stdinhand.c:2298
+#: server/stdinhand.c:2304
#, c-format
msgid "%s diplomacy debugged"
msgstr "%s diplomatie wordt gedebugged"
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2323
#, c-format
msgid "%s tech no longer debugged"
msgstr "%s tech wordt niet langer gedebugged"
-#: server/stdinhand.c:2321
+#: server/stdinhand.c:2327
#, c-format
msgid "%s tech debugged"
msgstr "%s tech wordt gedebugged"
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2358 server/stdinhand.c:2388
msgid "Value 2 & 3 must be integer."
msgstr "Waarde 2 & 3 moet een geheel getal zijn."
-#: server/stdinhand.c:2356 server/stdinhand.c:2386
+#: server/stdinhand.c:2362 server/stdinhand.c:2392
msgid "Bad map coordinates."
msgstr "Verkeerde kaart-coördinaten"
-#: server/stdinhand.c:2361
+#: server/stdinhand.c:2367
msgid "No city at this coordinate."
msgstr "Geen stad op deze coördinaten."
-#: server/stdinhand.c:2366
+#: server/stdinhand.c:2372
#, c-format
msgid "%s no longer debugged"
msgstr "%s niet langer debugged"
-#: server/stdinhand.c:2392 server/stdinhand.c:2422
+#: server/stdinhand.c:2398 server/stdinhand.c:2428
#, fuzzy, c-format
msgid "%s %s no longer debugged."
msgstr "%s's %s niet langer debugged."
-#: server/stdinhand.c:2397 server/stdinhand.c:2427
+#: server/stdinhand.c:2403 server/stdinhand.c:2433
#, fuzzy, c-format
msgid "%s %s debugged."
msgstr "%s's %s debugged"
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2419
msgid "Value 2 must be integer."
msgstr "Waarde 2 moet een geheel getal zijn."
-#: server/stdinhand.c:2417
+#: server/stdinhand.c:2423
#, c-format
msgid "Unit %d does not exist."
msgstr "Eenheid %d bestaat niet."
-#: server/stdinhand.c:2475
+#: server/stdinhand.c:2464
msgid "Undefined argument. Usage: set <option> <value>."
msgstr "Ongedefiniëerd argument. Gebruik: set <optie> <waarde>."
-#: server/stdinhand.c:2485
+#: server/stdinhand.c:2473
msgid "You are not allowed to set this option."
msgstr "U mag deze optie niet instellen."
-#: server/stdinhand.c:2490 server/stdinhand.c:3463
+#: server/stdinhand.c:2478 server/stdinhand.c:3501
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:2502 server/stdinhand.c:2543
-msgid "Value must be an integer."
-msgstr "Waarde moet een geheel getal zijn."
-
-#: server/stdinhand.c:2512
+#: server/stdinhand.c:2501
#, c-format
msgid "The parameter %s should only contain digits 0-1."
msgstr ""
-#: server/stdinhand.c:2519
+#: server/stdinhand.c:2508
msgid "Value out of range (minimum: 0, maximum: 1)."
msgstr "Waarde buiten bereik (minimaal: 0, maximaal: 1)."
-#: server/stdinhand.c:2534 server/stdinhand.c:2576
+#: server/stdinhand.c:2523 server/stdinhand.c:2565
#, c-format
msgid "Option: %s has been set to %d."
msgstr "Optie: %s is op %d gezet."
-#: server/stdinhand.c:2554
+#: server/stdinhand.c:2543
#, c-format
msgid "The parameter %s should only contain +- and 0-9."
msgstr ""
-#: server/stdinhand.c:2561
+#: server/stdinhand.c:2550
#, c-format
msgid "Value out of range (minimum: %d, maximum: %d)."
msgstr "Waarde buiten bereik (minimaal: %d, maximaal: %d)."
-#: server/stdinhand.c:2586
+#: server/stdinhand.c:2575
msgid "String value too long. Usage: set <option> <value>."
msgstr "Stringwaarde te lang. Gebruik: set <option> <value>."
-#: server/stdinhand.c:2600
+#: server/stdinhand.c:2589
#, c-format
msgid "Option: %s has been set to \"%s\"."
msgstr "Optie: %s is ingesteld op \"%s\"."
-#: server/stdinhand.c:2658
+#: server/stdinhand.c:2652
msgid "Sorry, one can't observe globally in this game."
msgstr "Sorry, men kan niet globaal waarnemen in dit spel."
-#: server/stdinhand.c:2661
+#: server/stdinhand.c:2655
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:2671
+#: server/stdinhand.c:2665
#, 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
+#: server/stdinhand.c:2673
#, c-format
msgid ""
"You cannot take a new player because the maximum of %d player has already "
@@ -6180,73 +6261,73 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: server/stdinhand.c:2691
+#: server/stdinhand.c:2685
msgid "You cannot take a new player because there are no free player slots."
msgstr ""
-#: server/stdinhand.c:2702
+#: server/stdinhand.c:2696
msgid "Sorry, one can't observe barbarians in this game."
msgstr "Sorry, men kan geen barbaren waarnemen in dit spel."
-#: server/stdinhand.c:2705
+#: server/stdinhand.c:2699
msgid "Sorry, one can't take barbarians in this game."
msgstr "Sorry, men kan geen barbaren 'take'-en in dit spel."
-#: server/stdinhand.c:2713
+#: server/stdinhand.c:2707
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:2716
+#: server/stdinhand.c:2710
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:2724
+#: server/stdinhand.c:2718
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:2727
+#: server/stdinhand.c:2721
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:2736
+#: server/stdinhand.c:2730
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:2739
+#: server/stdinhand.c:2733
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:2749
+#: server/stdinhand.c:2743
msgid "Sorry, one can't observe in this game."
msgstr "Sorry, men kan niet waarnemen in dit spel."
-#: server/stdinhand.c:2754
+#: server/stdinhand.c:2748
msgid "Sorry, one can't take players in this game."
msgstr "Sorry, men kan geen spelers 'take'-en in dit spel."
-#: server/stdinhand.c:2760
+#: server/stdinhand.c:2754
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:2791
+#: server/stdinhand.c:2785
msgid "Usage: observe [connection-name [player-name]]"
msgstr "Gebruik: observe [verbindingsnaam] <naam van de speler>"
-#: server/stdinhand.c:2797
+#: server/stdinhand.c:2791
msgid "Usage: observe [player-name]"
msgstr "Gebruik: observe <naam van de speler>"
-#: server/stdinhand.c:2847
+#: server/stdinhand.c:2841
#, 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:2858
+#: server/stdinhand.c:2852
#, c-format
msgid "%s is already observing %s."
msgstr "%s observeert %s al"
-#: server/stdinhand.c:2863
+#: server/stdinhand.c:2857
#, c-format
msgid "%s is already observing."
msgstr "%s is al een waarnemer."
@@ -6261,239 +6342,244 @@ msgstr "%s neemt nu %s waar"
msgid "%s now observes"
msgstr "%s neemt nu waar"
-#: server/stdinhand.c:2969
+#: server/stdinhand.c:2971
msgid "Usage: take <connection-name> <player-name>"
msgstr "Gebruik: take <verbindingsnaam> <naam van de speler>"
-#: server/stdinhand.c:2974
+#: server/stdinhand.c:2976
msgid "Usage: take <player-name>"
msgstr "Gebruik: take <naam van de speler>"
-#: server/stdinhand.c:2980
+#: server/stdinhand.c:2982
msgid "Usage: take [connection-name] <player-name>"
msgstr "Gebruik: take [verbindingsnaam] <naam van de speler>"
-#: server/stdinhand.c:3010
+#: server/stdinhand.c:3012
#, fuzzy, c-format
msgid "%s already controls %s."
msgstr "%s bestuurt %s al"
-#: server/stdinhand.c:3024
+#: server/stdinhand.c:3026
#, 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:3059
+#: server/stdinhand.c:3061
#, c-format
msgid "being detached from %s."
msgstr "wordt ontkoppeld van %s"
-#: server/stdinhand.c:3135
+#: server/stdinhand.c:3146
#, fuzzy, c-format
msgid "%s now controls %s (%s, %s)."
msgstr "%s bestuurt nu %s (%s, %s)"
-#: server/stdinhand.c:3139 server/stdinhand.c:4260
+#: server/stdinhand.c:3150 server/stdinhand.c:4308
#: data/nation/barbarian.ruleset:3
msgid "Barbarian"
msgstr "Barbaars"
-#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
+#: server/stdinhand.c:3152 server/stdinhand.c:4310 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-sdl/plrdlg.c:645
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr "KI"
-#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-gtk-2.0/pages.c:2125
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
+#: server/stdinhand.c:3153 server/stdinhand.c:4312
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-gtk-2.0/pages.c:2127
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/connectdlg.c:215
msgid "Human"
msgstr "Menselijk"
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-gtk-2.0/pages.c:2124 client/gui-win32/connectdlg.c:200
-#: client/gui-win32/connectdlg.c:212
+#: server/stdinhand.c:3155 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-gtk-2.0/pages.c:2126 client/gui-win32/connectdlg.c:202
+#: client/gui-win32/connectdlg.c:214
msgid "Alive"
msgstr "Actief"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3156 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-win32/connectdlg.c:202
msgid "Dead"
msgstr "Dood"
-#: server/stdinhand.c:3147
+#: server/stdinhand.c:3159
#, fuzzy, c-format
msgid "%s failed to attach to any player."
msgstr "%s is niet gekoppeld aan enige speler."
-#: server/stdinhand.c:3182
+#: server/stdinhand.c:3194
msgid "Usage: detach <connection-name>"
msgstr "Gebruik: detach <naam van de verbinding>"
-#: server/stdinhand.c:3202
+#: server/stdinhand.c:3214
msgid "You can not detach other users."
msgstr "U kunt andere spelers niet loskoppelen."
-#: server/stdinhand.c:3211
+#: server/stdinhand.c:3223
#, c-format
msgid "%s is not attached to any player."
msgstr "%s is niet gekoppeld aan enige speler."
-#: server/stdinhand.c:3234
+#: server/stdinhand.c:3246
#, c-format
msgid "%s detaching from %s"
msgstr "%s verbreekt verbinding vanaf %s"
-#: server/stdinhand.c:3240
+#: server/stdinhand.c:3252
#, c-format
msgid "%s no longer observing."
msgstr "%s neemt niet langer waar."
-#: server/stdinhand.c:3259
+#: server/stdinhand.c:3271
#, c-format
msgid "detaching from %s."
msgstr "ontkoppelen van %s."
-#: server/stdinhand.c:3345
+#: server/stdinhand.c:3361
msgid "Usage: load <game name>"
msgstr "Gebruik: load <spelnaam>"
-#: server/stdinhand.c:3350
+#: server/stdinhand.c:3366
msgid "Cannot load a game while another is running."
msgstr "Kan een spel niet laden terwijl een ander spel actief is."
-#: server/stdinhand.c:3372
+#: server/stdinhand.c:3388
#, 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:3389
+#: server/stdinhand.c:3405
#, c-format
msgid "Could not load savefile: %s"
msgstr "Kon opgeslagen spel niet laden: %s"
-#: server/stdinhand.c:3458
+#: server/stdinhand.c:3496
#, c-format
msgid "Current ruleset directory is \"%s\""
msgstr "Huidige spelregelfolder is \"%s\""
-#: server/stdinhand.c:3478
+#: server/stdinhand.c:3516
#, c-format
msgid "Ruleset directory \"%s\" not found"
msgstr "Spelregelfolder \"%s\" niet gevonden"
-#: server/stdinhand.c:3484
+#: server/stdinhand.c:3522
#, c-format
msgid "Ruleset directory is already \"%s\""
msgstr "Spelregelfolder is al \"%s\""
-#: server/stdinhand.c:3488
+#: server/stdinhand.c:3526
#, c-format
msgid "Ruleset directory set to \"%s\""
msgstr "Spelregelfolder ingesteld op \"%s\""
-#: server/stdinhand.c:3536
+#: server/stdinhand.c:3574
msgid "Goodbye."
msgstr "Tot ziens."
-#: server/stdinhand.c:3567
+#: server/stdinhand.c:3606
msgid "Sorry, you are not allowed to use server commands."
msgstr "Sorry, u mag geen serveropdrachten geven."
-#: server/stdinhand.c:3603
+#: server/stdinhand.c:3656
#, 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:3608
+#: server/stdinhand.c:3661
#, c-format
msgid "Unknown command. Try '%shelp'."
msgstr "Onbekende opdracht. Probeer '%shelp'."
-#: server/stdinhand.c:3625
-msgid "Your new vote canceled your previous vote."
+#: server/stdinhand.c:3675
+#, fuzzy
+msgid "Your new vote cancelled your previous vote."
msgstr "Uw nieuwe stem annuleerde uw vorige stem."
-#: server/stdinhand.c:3633
-#, c-format
-msgid "New vote (number %d) by %s: %s."
+#: server/stdinhand.c:3688
+msgid "New teamvote"
+msgstr ""
+
+#: server/stdinhand.c:3691
+msgid "New vote"
+msgstr ""
+
+#: server/stdinhand.c:3695
+#, fuzzy, c-format
+msgid "%s (number %d) by %s: %s"
msgstr "Nieuwe stem (nummer %d) door %s: %s."
-#: server/stdinhand.c:3645
+#: server/stdinhand.c:3704
#, c-format
msgid "Your new vote (\"%s\") was not legal or was not recognized."
msgstr ""
-#: server/stdinhand.c:3655
-msgid "You are not allowed to use this command."
-msgstr "U mag deze opdracht niet gebruiken."
-
-#: server/stdinhand.c:3680
+#: server/stdinhand.c:3726
msgid "(server prompt)"
msgstr "(server prompt)"
-#: server/stdinhand.c:3787
+#: server/stdinhand.c:3835
msgid "Game ended in a draw."
msgstr "Spel eindigde in een gelijkspel."
-#: server/stdinhand.c:3791
+#: server/stdinhand.c:3839
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:3796
+#: server/stdinhand.c:3844
msgid "Cannot end the game: no game running."
msgstr "Kan spel niet beëindigen: geen spel actief."
-#: server/stdinhand.c:3812
+#: server/stdinhand.c:3860
#, 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:3817
+#: server/stdinhand.c:3865
msgid "You cannot surrender now."
msgstr "U kan uzelf nu niet overgeven."
-#: server/stdinhand.c:3883
+#: server/stdinhand.c:3931
#, fuzzy
msgid "Not enough human players, game will not start."
msgstr "Niet genoeg spelers, spel zal niet beginnen."
-#: server/stdinhand.c:3888
+#: server/stdinhand.c:3936
#, fuzzy
msgid "No players, game will not start."
msgstr "Niet genoeg spelers, spel zal niet beginnen."
-#: server/stdinhand.c:3892
+#: server/stdinhand.c:3940
#, fuzzy
msgid "Not enough nations for all players, game will not start."
msgstr "Niet genoeg spelers, spel zal niet beginnen."
-#: server/stdinhand.c:3901
+#: server/stdinhand.c:3949
msgid "All players are ready; starting game."
msgstr "Alle spelers zijn klaar;het spel wordt gestart."
-#: server/stdinhand.c:3915
+#: server/stdinhand.c:3963
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:3922
+#: server/stdinhand.c:3970
msgid "Cannot start the game: it is already running."
msgstr "Kan spel niet starten: het is al begonnen."
-#: server/stdinhand.c:3953
+#: server/stdinhand.c:4001
#, c-format
msgid "Cutting connection %s."
msgstr "Verbreek verbinding met %s."
-#: server/stdinhand.c:3972
+#: server/stdinhand.c:4020
msgid ""
"Welcome - this is the introductory help text for the Freeciv server.\n"
"\n"
@@ -6533,123 +6619,123 @@ msgstr ""
" save - om het huidige spel te bewaren\n"
" quit - om de server te verlaten"
-#: server/stdinhand.c:4007 server/stdinhand.c:4010
+#: server/stdinhand.c:4055 server/stdinhand.c:4058
msgid "Command:"
msgstr "Opdracht:"
-#: server/stdinhand.c:4014
+#: server/stdinhand.c:4062
msgid "Synopsis: "
msgstr "Beknopt: "
-#: server/stdinhand.c:4023
+#: server/stdinhand.c:4071
#, c-format
msgid "Level: %s"
msgstr "Niveau: %s"
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4096
msgid "The following server commands are available:"
msgstr "De volgende serveropdrachten zijn beschikbaar:"
-#: server/stdinhand.c:4123
+#: server/stdinhand.c:4171
#, c-format
msgid "Help argument '%s' is ambiguous."
msgstr "Help argument '%s' is dubbelzinnig."
-#: server/stdinhand.c:4128
+#: server/stdinhand.c:4176
#, c-format
msgid "No match for help argument '%s'."
msgstr "Geen overeenkomst voor help argument '%s'."
-#: server/stdinhand.c:4194
+#: server/stdinhand.c:4242
#, c-format
msgid "Bad list argument: '%s'. Try '%shelp list'."
msgstr "Verkeerd argument voor list: '%s'. Probeer '%shelp list'."
-#: server/stdinhand.c:4234
+#: server/stdinhand.c:4282
msgid "List of players:"
msgstr "Lijst van spelers:"
-#: server/stdinhand.c:4239
+#: server/stdinhand.c:4287
msgid "<no players>"
msgstr "<geen spelers>"
-#: server/stdinhand.c:4256
+#: server/stdinhand.c:4304
#, c-format
msgid "user %s, "
msgstr "gebruiker %s, "
-#: server/stdinhand.c:4267
+#: server/stdinhand.c:4315
msgid ", Dead"
msgstr ", Dood"
-#: server/stdinhand.c:4270
+#: server/stdinhand.c:4318
#, c-format
msgid ", difficulty level %s"
msgstr ", moeilijkheidsniveau %s"
#. TRANS: continue list, in case comma is not the separator of choice.
-#: server/stdinhand.c:4275 server/stdinhand.c:4279 client/helpdata.c:257
-#: client/helpdata.c:752 client/text.c:241 client/text.c:1224
-#: client/text.c:1262
+#: server/stdinhand.c:4323 server/stdinhand.c:4327 client/helpdata.c:257
+#: client/helpdata.c:752 client/text.c:241 client/text.c:1229
+#: client/text.c:1267
#, c-format
msgid "?clistmore:, %s"
msgstr ", %s"
-#: server/stdinhand.c:4283
+#: server/stdinhand.c:4331
msgid ", ready"
msgstr ", klaar"
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4333
msgid ", not ready"
msgstr ", niet klaar"
-#: server/stdinhand.c:4293
+#: server/stdinhand.c:4341
#, c-format
msgid " %d connection:"
msgid_plural " %d connections:"
msgstr[0] " %d verbinding:"
msgstr[1] " %d verbindingen:"
-#: server/stdinhand.c:4299
+#: server/stdinhand.c:4347
#, c-format
msgid " %s from %s (command access level %s), bufsize=%dkb"
msgstr " %s van %s, (opdrachttoegangsniveau %s), buffergrootte=%dkb"
-#: server/stdinhand.c:4304
+#: server/stdinhand.c:4352
msgid " (observer mode)"
msgstr " (waarnemers modus)"
-#: server/stdinhand.c:4322
+#: server/stdinhand.c:4370
msgid "List of teams:"
msgstr "Lijst van teams:"
#. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4332
+#: server/stdinhand.c:4380
#, 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:4352
+#: server/stdinhand.c:4400
#, fuzzy, c-format
msgid "%2d : '%s' : 1 player : %s"
msgstr "%2d·:·'%s'·:·1·speler·:·%s"
-#: server/stdinhand.c:4360
+#: server/stdinhand.c:4408
#, c-format
msgid "Empty team: %s"
msgstr "Leeg team: %s"
-#: server/stdinhand.c:4371
+#: server/stdinhand.c:4419
msgid "List of connections to server:"
msgstr "Lijst met verbindingen met server:"
-#: server/stdinhand.c:4375
+#: server/stdinhand.c:4423
msgid "<no connections>"
msgstr "<geen verbindingen>"
-#: server/stdinhand.c:4399
+#: server/stdinhand.c:4447
msgid "List of scenarios available:"
msgstr "Lijst van beschikbare scenario's:"
@@ -6668,7 +6754,7 @@ msgstr "De %s hebben Toekomst Tech. %d onderzocht."
msgid "%s acquired from %s!"
msgstr "%s verworven via %s!"
-#: server/techtools.c:220
+#: server/techtools.c:221
#, c-format
msgid ""
"Discovery of %s makes the government form %s available. You may want to "
@@ -6677,37 +6763,37 @@ msgstr ""
"Ontdekking van %s maakt de bestuursvorm %s beschikbaar. U wilt misschien een "
"revolutie beginnen."
-#: server/techtools.c:301
+#: server/techtools.c:302
#, c-format
msgid "Discovery of %s OBSOLETES %s in %s!"
msgstr "Ontdekking van %s VEROUDERT %s in %s!"
-#: server/techtools.c:351
+#: server/techtools.c:352
#, c-format
msgid "Learned %s. Our scientists focus on %s; goal is %s."
msgstr "%s geleerd. Onze wetenschappers onderzoeken nu %s, doel is %s."
-#: server/techtools.c:369
+#: server/techtools.c:370
#, c-format
msgid "Learned %s. Scientists choose to research %s."
msgstr "%s geleerd. Wetenschappers kiezen %s voor verder onderzoek."
-#: server/techtools.c:376
+#: server/techtools.c:377
#, c-format
msgid "Learned %s. "
msgstr "Leerde %s."
-#: server/techtools.c:379
+#: server/techtools.c:380
#, c-format
msgid "Researching %s."
msgstr "Onderzoeken %s."
-#: server/techtools.c:385
+#: server/techtools.c:386
#, c-format
msgid "Learned %s. Scientists do not know what to research next."
msgstr "%s geleerd. Wetenschappers kunnen geen verdere keuze maken."
-#: server/techtools.c:402
+#: server/techtools.c:403
msgid ""
"Great scientists from all the world join your civilization: you get an "
"immediate advance."
@@ -6715,22 +6801,22 @@ msgstr ""
"Grote wetenschappers vanuit de hele wereld zoeken uw beschaving op; u krijgt "
"een onmiddelijke vooruitgang.."
-#: server/techtools.c:570
+#: server/techtools.c:571
#, c-format
msgid "Technology goal is %s."
msgstr "Technologisch doel is %s."
-#: server/techtools.c:700
+#: server/techtools.c:708
#, c-format
msgid "You steal %s from the %s."
msgstr "U steelt %s van de %s."
-#: server/techtools.c:705
+#: server/techtools.c:713
#, c-format
msgid "The %s stole %s from you!"
msgstr "De %s stalen %s van u!"
-#: server/techtools.c:710
+#: server/techtools.c:718
#, c-format
msgid "The %s have stolen %s from the %s."
msgstr "De %s hebben %s gestolen van de %s."
@@ -6754,182 +6840,188 @@ msgstr "Er konden geen eenheden opgewaardeerd worden."
msgid "%s upgraded to %s for %d gold."
msgstr "%s opgewaardeerd naar %s voor %d goud."
-#: server/unithand.c:396
+#: server/unithand.c:402
#, c-format
msgid "%s refuses to disband!"
msgstr "%s weigert te ontbinden!"
-#: server/unithand.c:449
+#: server/unithand.c:455
msgid "Can't place city here."
msgstr "Kan stad daar niet plaatsen."
-#: server/unithand.c:456
+#: server/unithand.c:462
#, c-format
msgid "Only %s can build a city."
msgstr "Alleen %s kan een stad bouwen."
-#: server/unithand.c:461
+#: server/unithand.c:467
msgid "Can't build a city."
msgstr "Kan geen stad bouwen."
-#: server/unithand.c:470
+#: server/unithand.c:476
#, c-format
msgid "Only %s can add to a city."
msgstr "Alleen %s kan aan een stad toevoegen."
-#: server/unithand.c:475
+#: server/unithand.c:481
msgid "Can't add to a city."
msgstr "Kan niet aan een stad toevoegen."
-#: server/unithand.c:481
+#: server/unithand.c:487
#, c-format
msgid "%s unit has no moves left to add to %s."
msgstr "%s eenheid heeft geen beweging over om aan %s toe te voegen."
-#: server/unithand.c:487
+#: server/unithand.c:493
#, c-format
msgid "%s unit has no moves left to build city."
msgstr "%s eenheid heeft geen beweging over om stad te bouwen."
-#: server/unithand.c:492
+#. TRANS: <city> is owned by <nation>, cannot add <unit>.
+#: server/unithand.c:499
+#, fuzzy, c-format
+msgid "%s is owned by %s, cannot add %s."
+msgstr "%s is te groot voor toevoegen van %s."
+
+#: server/unithand.c:506
#, c-format
msgid "%s is too big to add %s."
msgstr "%s is te groot voor toevoegen van %s."
-#: server/unithand.c:498
+#: server/unithand.c:512
#, c-format
msgid "%s needs an improvement to grow, so you cannot add %s."
msgstr ""
"%s heeft een verbetering nodig voor groei, dus u kunt%s niet toevoegen."
-#: server/unithand.c:509
+#: server/unithand.c:523
#, c-format
msgid "Can't add %s to %s."
msgstr "Kan %s niet toevoegen aan %s."
-#: server/unithand.c:531
+#: server/unithand.c:545
#, c-format
msgid "%s added to aid %s in growing."
msgstr "%s toegevoegd aan %s voor hulp bij groei."
-#: server/unithand.c:828
+#: server/unithand.c:842
msgid "Your Nuclear missile was shot down by SDI defences, what a waste."
msgstr ""
"Uw Kernraket is neergeschoten door een SDI verdediging, wat een verspilling."
-#: server/unithand.c:831
+#: server/unithand.c:845
#, c-format
msgid "The nuclear attack on %s was avoided by your SDI defense."
msgstr "De kernaanval op %s is voorkomen door uw SDI verdediging."
#. TRANS: "Your Cannon ... the Polish Destroyer."
-#: server/unithand.c:901
+#: server/unithand.c:915
#, fuzzy, c-format
msgid "Your %s survived the pathetic attack from the %s %s."
msgstr "Uw %s overleefden de zielige aanval van %s %s."
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unithand.c:910
+#: server/unithand.c:924
#, fuzzy, c-format
msgid "Your attacking %s failed against the %s %s!"
msgstr "Uw aanvallende %s faalden tegen %s %s!"
-#: server/unithand.c:983
+#: server/unithand.c:997
#, c-format
msgid "Only %s can attack from sea."
msgstr "Alleen %s kunnen aanvallen vanuit zee."
-#: server/unithand.c:988
+#: server/unithand.c:1002
msgid "Cannot attack from sea."
msgstr "Kan niet aanvallen vanuit zee."
-#: server/unithand.c:996 server/unittools.c:2137
+#: server/unithand.c:1010 server/unittools.c:2142
msgid "Cannot attack unless you declare war first."
msgstr "U kunt niet aanvallen voordat u de oorlog verklaard heeft."
-#: server/unithand.c:1001
+#: server/unithand.c:1015
#, c-format
msgid "%s can only move into your own zone of control."
msgstr "%s kan alleen binnen uw eigen invloedssfeer bewegen."
-#: server/unithand.c:1007
+#: server/unithand.c:1021
#, fuzzy, c-format
msgid "Cannot invade unless you break peace with %s first."
msgstr "U kunt niet aanvallen voordat u de oorlog verklaard heeft."
-#: server/unithand.c:1052
+#: server/unithand.c:1066
msgid "This unit has no moves left."
msgstr "Deze eenheid heeft geen beweging meer over."
-#: server/unithand.c:1107
+#: server/unithand.c:1121
msgid "Unit must be on land to perform diplomatic action."
msgstr "Eenheid moet zich op land bevinden voor diplomatieke acties."
-#: server/unithand.c:1109
+#: server/unithand.c:1123
msgid "No diplomat action possible."
msgstr "Geen diplomatieke actie mogelijk."
-#: server/unithand.c:1125
+#: server/unithand.c:1139
#, c-format
msgid "You must declare war on %s first. Try using players dialog (F3)."
msgstr ""
"U moet eerst oorlog verklaren aan %s. Gebruik het spelers venster (F3)."
-#: server/unithand.c:1143
+#: server/unithand.c:1157
msgid "This unit is being transported, and so cannot bombard."
msgstr "Deze eenheid wordt vervoerd en kan nu niet bombarderen."
-#: server/unithand.c:1158
+#: server/unithand.c:1172
msgid "You can't attack there."
msgstr "U kunt hier niet aanvallen."
-#: server/unithand.c:1180
+#: server/unithand.c:1194
msgid "This type of troops cannot take over a city."
msgstr "Dit type troepen kan een stad niet innemen."
-#: server/unithand.c:1198
+#: server/unithand.c:1212
msgid "A transported unit is not allied to all units or city on target tile."
msgstr ""
"Een getransporteerde eenheid is niet geallieerd aan alle eenheden of stad "
"van doelvlak."
-#: server/unithand.c:1240
+#: server/unithand.c:1254
#, c-format
msgid "Your %s helps build the %s in %s (%d remaining)."
msgstr "Uw %s help %s in %s te bouwen (%d resterend)."
-#: server/unithand.c:1242
+#: server/unithand.c:1256
#, c-format
msgid "Your %s helps build the %s in %s (%d surplus)."
msgstr "Uw %s help %s in %s te bouwen (%d overtollig)."
-#: server/unithand.c:1286
+#: server/unithand.c:1300
#, c-format
msgid ""
"Sorry, your %s cannot establish a trade route because it has no home city"
msgstr "Sorry, uw %s kan geen handelsroute maken want heeft geen thuis"
-#: server/unithand.c:1296
+#: server/unithand.c:1310
#, c-format
msgid "Sorry, your %s cannot establish a trade route between %s and %s"
msgstr "Sorry, uw %s kan geen handelsroute maken tussen %s en %s"
-#: server/unithand.c:1325 server/unithand.c:1344
+#: server/unithand.c:1339 server/unithand.c:1358
#, c-format
msgid "Sorry, your %s cannot establish a trade route here!"
msgstr "Sorry, uw %s kan hier geen handelsroute vestigen!"
-#: server/unithand.c:1329 server/unithand.c:1348
+#: server/unithand.c:1343 server/unithand.c:1362
#, c-format
msgid " The city of %s already has %d better trade routes!"
msgstr " De stad %s heeft al %d betere handelsroutes!"
-#: server/unithand.c:1361 server/unithand.c:1373
+#: server/unithand.c:1375 server/unithand.c:1387
#, c-format
msgid "Sorry, %s has canceled the trade route from %s to your city %s."
msgstr "Sorry, %s heeft de handelsroute tussen %s en uw stad %s gestaakt."
-#: server/unithand.c:1406
+#: server/unithand.c:1420
#, c-format
msgid ""
"Your %s from %s has arrived in %s, and revenues amount to %d in gold and "
@@ -6988,57 +7080,57 @@ msgid "Teleported your %s to %s."
msgstr "Teleporteerde uw %s naar %s."
#. TRANS: A unit is moved to resolve stack conflicts.
-#: server/unittools.c:1065
+#: server/unittools.c:1070
#, fuzzy, c-format
msgid "Moved your %s."
msgstr "Ontbond uw %s."
-#: server/unittools.c:1076
+#: server/unittools.c:1081
#, c-format
msgid "Disbanded your %s."
msgstr "Ontbond uw %s."
-#: server/unittools.c:1397
+#: server/unittools.c:1402
#, c-format
msgid "Unable to defend %s, %s has lost the game."
msgstr "Niet in staat %s te verdedigen - %s heeft het spel verloren."
-#: server/unittools.c:1401
+#: server/unittools.c:1406
#, c-format
msgid "Losing %s meant losing the game! Be more careful next time!"
msgstr ""
"Het verliezen van %s betekent het einde van het spel! Wees voorzichtiger "
"volgende keer!"
-#: server/unittools.c:1503
+#: server/unittools.c:1508
#, c-format
msgid "%s escaped the destruction of %s, and fled to %s."
msgstr "%s ontsnapte aan de vernietiging van %s en vluchtte naar %s"
-#: server/unittools.c:1512
+#: server/unittools.c:1517
#, c-format
msgid "%s lost when %s was lost."
msgstr "%s verloren toen %s verloren ging."
-#: server/unittools.c:1561
+#: server/unittools.c:1566
#, c-format
msgid "Barbarian leader captured, %d gold ransom paid."
msgstr "Barbaarse leider gevangengenomen, %d goud losgeld betaald."
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unittools.c:1579
+#: server/unittools.c:1584
#, fuzzy, c-format
msgid "Your attacking %s succeeded against the %s %s!"
msgstr "Uw aanvallende %s waren succesvol tegen %s %s!"
#. TRANS: "Cannon ... the Polish Destroyer."
-#: server/unittools.c:1588 server/unittools.c:1646
+#: server/unittools.c:1593 server/unittools.c:1651
#, fuzzy, c-format
msgid "%s lost to an attack by the %s %s."
msgstr "%s verloren onder een aanval van %s %s."
#. TRANS: "... Cannon ... the Polish Destroyer ...."
-#: server/unittools.c:1622
+#: server/unittools.c:1627
#, fuzzy, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -7050,14 +7142,14 @@ msgstr[1] ""
#. TRANS: "Cannon lost when the Polish Destroyer
#. * attacked the German Musketeers."
-#: server/unittools.c:1655
+#: server/unittools.c:1660
#, fuzzy, c-format
msgid "%s lost when the %s %s attacked the %s %s."
msgstr "%s verloren onder een aanval door %s's %s op %s's %s."
#. TRANS: "Musketeers (and Cannon) lost to an
#. * attack from the Polish Destroyer."
-#: server/unittools.c:1670
+#: server/unittools.c:1675
#, fuzzy, c-format
msgid "%s (and %s) lost to an attack from the %s %s."
msgstr "%s (en %s) verloren onder een aanval van %s's %s."
@@ -7065,7 +7157,7 @@ msgstr "%s (en %s) verloren onder een aanval van %s's %s."
#. TRANS: "Musketeers and 3 other units lost to
#. * an attack from the Polish Destroyer."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1680
+#: server/unittools.c:1685
#, fuzzy, 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."
@@ -7075,184 +7167,226 @@ msgstr[1] "%s en %d andere eenheden verloren onder een aanval van %s's %s."
#. TRANS: "2 units lost when the Polish Destroyer
#. * attacked the German Musketeers."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1694
+#: server/unittools.c:1699
#, fuzzy, 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 eenheid verloren bij een aanval door %s's %s op %s's %s"
msgstr[1] "%d eenheden verloren bij een aanval door %s's %s op %s's %s"
-#: server/unittools.c:1962
+#: server/unittools.c:1967
#, c-format
msgid "Your %s was nuked by %s."
msgstr "Uw %s is geatomiseerd door %s."
-#: server/unittools.c:1965 server/unittools.c:1981
+#: server/unittools.c:1970 server/unittools.c:1986
msgid "yourself"
msgstr "uzelf"
-#: server/unittools.c:1969
+#: server/unittools.c:1974
#, fuzzy, c-format
msgid "The %s %s was nuked."
msgstr "%s's %s is geatomiseerd."
-#: server/unittools.c:1978
+#: server/unittools.c:1983
#, c-format
msgid "%s was nuked by %s."
msgstr "%s is geatomiseerd door %s."
-#: server/unittools.c:1986
+#: server/unittools.c:1991
#, c-format
msgid "You nuked %s."
msgstr "U atomiseerde %s."
-#: server/unittools.c:2027
+#: server/unittools.c:2032
#, fuzzy, c-format
msgid "The %s detonated a nuke!"
msgstr "%s heeft een kernraket tot ontploffing gebracht."
-#: server/unittools.c:2051
+#: server/unittools.c:2056
#, c-format
msgid "%s transported successfully."
msgstr "%s succesvol overgeplaatst."
-#: server/unittools.c:2103
+#: server/unittools.c:2108
msgid "This unit type can not be paradropped."
msgstr "Deze eenheid kan niet worden geparadropt."
-#: server/unittools.c:2113
+#: server/unittools.c:2118
#, fuzzy
msgid "You cannot paradrop a unit that is transporting other units."
msgstr "Deze eenheid kan niet paradroppen op een transporteenheid."
-#: server/unittools.c:2119
+#: server/unittools.c:2124
msgid "The destination location is not known."
msgstr "De plaats van bestemming is onbekend."
-#: server/unittools.c:2126
+#: server/unittools.c:2131
#, c-format
msgid "This unit cannot paradrop into %s."
msgstr "Deze eenheid kan niet paradroppen in %s."
-#: server/unittools.c:2146
+#: server/unittools.c:2151
#, c-format
msgid "The distance to the target (%i) is greater than the unit's range (%i)."
msgstr ""
"De afstand naar het doel (%i) is groter dan het bereik van de eenheid (%i)."
-#: server/unittools.c:2157
+#: server/unittools.c:2162
#, c-format
msgid "Your %s paradropped into the %s and was lost."
msgstr "Uw %s is in %s geland en ging verloren."
-#: server/unittools.c:2170
+#: server/unittools.c:2175
#, c-format
msgid "Your %s was killed by enemy units at the paradrop destination."
msgstr "Uw %s is vermoord door vijandelijke eenheden in de landingszone."
-#: server/unittools.c:2192
+#: server/unittools.c:2197
#, c-format
msgid "You found %d gold."
msgstr "U vond %d goud."
-#: server/unittools.c:2209
+#: server/unittools.c:2214
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr "U hebt %s ontdekt in oude boekrollen met wijsheid."
-#: server/unittools.c:2216
+#: server/unittools.c:2221
#, c-format
msgid "The %s have acquired %s from ancient scrolls of wisdom."
msgstr "De %s hebben %s verkregen van oude boekrollen met wijsheid."
-#: server/unittools.c:2230
+#: server/unittools.c:2235
msgid "A band of friendly mercenaries joins your cause."
msgstr "Een troep vriendelijke huurlingen sluit zich bij u aan."
-#: server/unittools.c:2248
+#: server/unittools.c:2253
msgid "An abandoned village is here."
msgstr "Hier is een verlaten dorp."
-#: server/unittools.c:2258
+#: server/unittools.c:2263
msgid "You have unleashed a horde of barbarians!"
msgstr "U hebt een horde barbaren ontketend!"
-#: server/unittools.c:2261
+#: server/unittools.c:2266
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr "Uw %s is vermoord door barbaren!"
-#: server/unittools.c:2277
+#: server/unittools.c:2282
msgid "You found a friendly city."
msgstr "U heeft een bevriende stad gevonden."
-#: server/unittools.c:2291
+#: server/unittools.c:2296
msgid "Friendly nomads are impressed by you, and join you."
msgstr ""
"Vriendelijke nomaden zijn door u geïmponeerd en sluiten zich bij u aan."
-#: server/unittools.c:2316
+#: server/unittools.c:2321
msgid "Your overflight frightens the tribe; they scatter in terror."
msgstr ""
"Uw verkenningsvlucht beangstigt de stam; zij verspreiden zich in terreur."
-#: server/unittools.c:2574
+#: server/unittools.c:2579
#, c-format
msgid "Orders for %s aborted after enemy movement was spotted."
msgstr ""
"Orders voor %s afgebroken aangezien er vijandelijke eenheden gezien zijn."
-#: server/unittools.c:3023
+#: server/unittools.c:3028
#, c-format
msgid "Orders for %s aborted as there are units nearby."
msgstr "Orders voor %s afgebroken aangezien er eenheden in de buurt zijn."
-#: server/unittools.c:3075
+#: server/unittools.c:3080
#, c-format
msgid "Orders for %s aborted because building of city failed."
msgstr "Orders voor %s afgebroken omdat het stichten van een stad mislukte."
-#: server/unittools.c:3088
+#: server/unittools.c:3093
#, c-format
msgid "Orders for %s aborted since they give an invalid activity."
msgstr "Orders voor %s afgebroken aangezien de activiteit ongeldig is."
-#: server/unittools.c:3102
+#: server/unittools.c:3107
#, c-format
msgid "Orders for %s aborted since they give an invalid location."
msgstr ""
"Orders voor %s afgebroken aangezien ze een ongeldige locatie aanduiden."
-#: server/unittools.c:3112
+#: server/unittools.c:3117
#, c-format
msgid "Orders for %s aborted as there are units in the way."
msgstr "Orders voor %s afgebroken aangezien er eenheden in de weg staan."
-#: server/unittools.c:3138
+#: server/unittools.c:3143
#, c-format
msgid "Orders for %s aborted because of failed move."
msgstr "Orders voor %s afgebroken door een gefaalde verplaatsing."
-#: server/unittools.c:3179
+#: server/unittools.c:3184
#, c-format
msgid "Attempt to change homecity for %s failed."
msgstr "Hoofdstad verplaatsen voor %s is mislukt."
-#: server/unittools.c:3190
+#: server/unittools.c:3195
#, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr "Poging om handelsroute noor %s te vestigen mislukt."
-#: server/unittools.c:3202
+#: server/unittools.c:3207
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr "Poging om wonder te bouwen voor %s mislukt."
-#: server/unittools.c:3211
+#: server/unittools.c:3216
#, c-format
msgid "Your %s has invalid orders."
msgstr "Uw %s heeft ongeldige orders."
+#: server/voting.c:522
+#, fuzzy, c-format
+msgid ""
+"%s %d \"%s\" is passed %d to %d with %d abstentions and %d who did not vote."
+msgstr "Stemming \"%s\" is aangenomen met %d tegen %d en %d onthoudingen."
+
+#: server/voting.c:528
+#, fuzzy, c-format
+msgid ""
+"%s %d \"%s\" failed with %d against, %d for, %d abstentions and %d who did "
+"not vote."
+msgstr "Stemming \"%s\" afgewezen met %d tegen, %d voor en %d onthoudingen."
+
+#: server/voting.c:548
+#, c-format
+msgid "%s %d: %s voted yes."
+msgstr ""
+
+#: server/voting.c:553
+#, c-format
+msgid "%s %d: %s voted no."
+msgstr ""
+
+#: server/voting.c:558
+#, c-format
+msgid "%s %d: %s chose to abstain."
+msgstr ""
+
+#. TRANS: Describing a new vote that can only pass
+#. * if there are no dissenting votes.
+#: server/voting.c:726
+#, c-format
+msgid "%s (needs %0.0f%% and no dissent)."
+msgstr ""
+
+#. TRANS: Describing a new vote that can pass only if the
+#. * given percentage of players votes 'yes'.
+#: server/voting.c:732
+#, c-format
+msgid "%s (needs %0.0f%% in favor)."
+msgstr ""
+
#: server/generator/mapgen.c:1771
msgid "High landmass - this may take a few seconds."
msgstr "Grote landmassa - dit kan een paar seconden duren."
@@ -7284,14 +7418,14 @@ msgstr ""
"Misschien kan deze kaart het aantal spelers/ki niet aan.\n"
"Meld u alstublieft deze fout aan %s."
-#: client/attribute.c:363
+#: client/attribute.c:368
msgid ""
"There has been a CMA error. Your citizen governor settings may be broken."
msgstr ""
"Er is een CMA fout opgetreden. Uw burgemeester instellingen zijn misschien "
"beschadigd."
-#: client/attribute.c:367
+#: client/attribute.c:372
msgid "Old attributes detected and removed."
msgstr "Oude attributen gezien en verwijderd."
@@ -7438,41 +7572,41 @@ msgstr "%+4d·:·Stedelingen\n"
msgid "%+4d : Taxed from trade\n"
msgstr "%+4d : Handelsbelasting\n"
-#: client/citydlg_common.c:418
+#: client/citydlg_common.c:421
#, fuzzy, c-format
msgid "%+4d : Trade route with %s\n"
msgstr "%+4d·:·Handelsroute met %s\n"
-#: client/citydlg_common.c:427
+#: client/citydlg_common.c:430
#, fuzzy, c-format
msgid "%+4d : Building tithes\n"
msgstr "%+4d·: In belastingen\n"
-#: client/citydlg_common.c:450
+#: client/citydlg_common.c:453
#, c-format
msgid "%+4d : Bonus from %s (%+d%%)\n"
msgstr "%+4d : Bonus van %s (%+d%%)\n"
-#: client/citydlg_common.c:462
+#: client/citydlg_common.c:465
#, c-format
msgid "%+4d : Waste\n"
msgstr "%+4d : Verspilling\n"
-#: client/citydlg_common.c:468
+#: client/citydlg_common.c:471
#, c-format
msgid "%+4d : Disorder\n"
msgstr "%+4d : Onrust\n"
-#: client/citydlg_common.c:474
+#: client/citydlg_common.c:477
#, c-format
msgid "%+4d : Used\n"
msgstr "%+4d : Gebruikt\n"
-#: client/citydlg_common.c:479
+#: client/citydlg_common.c:482
msgid "==== : Adds up to\n"
msgstr "==== : In totaal\n"
-#: client/citydlg_common.c:481
+#: client/citydlg_common.c:484
#, c-format
msgid "%4d : Total surplus"
msgstr "%4d : Totaal overschot"
@@ -7793,52 +7927,52 @@ msgstr "?specialist:S"
msgid "Specialists"
msgstr "Specialisten"
-#: client/civclient.c:240
+#: client/civclient.c:241
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr " -a, --autoconnect\tSla verbindingsdialoog over\n"
-#: client/civclient.c:250
+#: client/civclient.c:251
msgid " -l, --log FILE\tUse FILE as logfile (spawned server also uses this)\n"
msgstr ""
" -l, --log BESTAND\tGebruik BESTAND als logbestand (ook zelfstartserver)\n"
-#: client/civclient.c:252
+#: client/civclient.c:253
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr " -m, --meta HOST\tVerbind met de metaserver op HOST\n"
-#: client/civclient.c:254
+#: client/civclient.c:255
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr " -n, --name NAAM\tGebruik NAAM als naam\n"
-#: client/civclient.c:256
+#: client/civclient.c:257
#, fuzzy
msgid " -p, --port PORT\tConnect to server port PORT (usually with -a)\n"
msgstr " -p, --port POORT\tVerbind met server poort POORT\n"
-#: client/civclient.c:258
+#: client/civclient.c:259
#, c-format
msgid " -P, --Plugin PLUGIN\tUse PLUGIN for sound output %s\n"
msgstr " -P, --Plugin PLUGIN\tGebruik PLUGIN voor geluidsuitvoer %s\n"
-#: client/civclient.c:260
+#: client/civclient.c:261
msgid " -r, --read FILE\tRead startup script FILE (for spawned server only)\n"
msgstr ""
" -r, --read BESTAND\tLees startscript BESTAND(enkel zelfstartserver)\n"
-#: client/civclient.c:263
+#: client/civclient.c:264
#, fuzzy
msgid " -s, --server HOST\tConnect to the server at HOST (usually with -a)\n"
msgstr " -s, --server HOST\tVerbind met de server op HOST\n"
-#: client/civclient.c:265
+#: client/civclient.c:266
msgid " -S, --Sound FILE\tRead sound tags from FILE\n"
msgstr " -S, --Sound BESTAND\tLees geluids info van BESTAND\n"
-#: client/civclient.c:266
+#: client/civclient.c:267
msgid " -t, --tiles FILE\tUse data file FILE.tilespec for tiles\n"
msgstr " -t, --tiles BESTAND\tKijk in data bestand BESTAND voor vlakken\n"
-#: client/civclient.c:269
+#: client/civclient.c:270
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7848,45 +7982,45 @@ msgstr ""
"\t\t\tProbeer \"%s -- --help\" voor details.\n"
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:274
+#: client/civclient.c:275
#, fuzzy, c-format
msgid "Report bugs at %s\n"
msgstr "Rapporteer fouten aan <%s>.\n"
-#: client/civclient.c:298
+#: client/civclient.c:299
#, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr "Ongeldige poort \"%s\" opgegeven met de --port optie.\n"
-#: client/civclient.c:300 client/civclient.c:315
+#: client/civclient.c:301 client/civclient.c:316
msgid "Try using --help.\n"
msgstr "Probeer met --help.\n"
-#: client/civclient.c:313
+#: client/civclient.c:314
#, c-format
msgid "Invalid debug level \"%s\" specified with --debug option.\n"
msgstr "Ongeldig debug niveau \"%s\" opgegeven met --debug option.\n"
-#: client/civclient.c:326
+#: client/civclient.c:327
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr "Niet-herkende optie: \"%s\"\n"
-#: client/civclient.c:391
+#: client/civclient.c:393
#, fuzzy, c-format
msgid "Updating old metaserver address \"%s\"."
msgstr "metaserver <adres>"
-#: client/civclient.c:394
+#: client/civclient.c:396
#, fuzzy, c-format
msgid "Default metaserver has been set to \"%s\"."
msgstr "Optie: %s is ingesteld op \"%s\"."
-#: client/civclient.c:550
+#: client/civclient.c:540
msgid "Game started."
msgstr "Spel begonnen."
-#: client/civclient.c:588
+#: client/civclient.c:606
msgid "There was an error while auto connecting; aborting."
msgstr ""
"Er trad een fout op bij het automatisch maken van een verbinding; afbreken."
@@ -8017,18 +8151,18 @@ msgstr "Bezig met verbinding maken."
msgid "Disconnected from server."
msgstr "Verbinding met server verbroken."
-#: client/clinet.c:469
+#: client/clinet.c:473
#, c-format
msgid "Failed to contact server \"%s\" at port %d as \"%s\" after %d attempts"
msgstr ""
"Verbinding maken met server \"%s\" op poort %d als \"%s\" mislukt na %d "
"pogingen"
-#: client/clinet.c:484 client/clinet.c:486
+#: client/clinet.c:488 client/clinet.c:490
msgid "Connection to server refused. Please start the server."
msgstr "Verbinding met server geweigerd. Herstart de server alstublieft."
-#: client/clinet.c:495 client/clinet.c:523
+#: client/clinet.c:499 client/clinet.c:527
#, c-format
msgid ""
"Error contacting server \"%s\" at port %d as \"%s\":\n"
@@ -8037,7 +8171,7 @@ msgstr ""
"Fout bij contact maken met server \"%s\" op poort %d als \"%s\":\n"
" %s\n"
-#: client/clinet.c:514
+#: client/clinet.c:518
#, c-format
msgid ""
"Auto-connecting to server \"%s\" at port %d as \"%s\" every %f second(s) for "
@@ -8046,53 +8180,53 @@ 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:1358
+#: client/connectdlg_common.c:78 client/gui-gtk-2.0/pages.c:1358
msgid "novice"
msgstr "beginner"
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1358
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
msgid "easy"
msgstr "gemakkelijk"
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1359
msgid "normal"
msgstr "normaal"
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr "moeilijk"
-#: client/connectdlg_common.c:83
+#: client/connectdlg_common.c:82
msgid "experimental"
msgstr "experimenteel"
-#: client/connectdlg_common.c:213
+#: client/connectdlg_common.c:212
msgid "Starting server..."
msgstr "Start server op ..."
-#: client/connectdlg_common.c:332
+#: client/connectdlg_common.c:331
msgid "Couldn't start the server."
msgstr "Kon de server niet opstarten."
-#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
+#: client/connectdlg_common.c:332 client/connectdlg_common.c:365
msgid "You'll have to start one manually. Sorry..."
msgstr "U zal manueel een server moeten opstarten. Sorry..."
-#: client/connectdlg_common.c:364
+#: client/connectdlg_common.c:363
msgid "Couldn't connect to the server."
msgstr "Kon niet verbinden met de server."
-#: client/connectdlg_common.c:365
+#: client/connectdlg_common.c:364
msgid "We probably couldn't start it from here."
msgstr "We zouden het waarschijnlijk niet van hieruit kunnen starten."
-#: client/connectdlg_common.c:470
+#: client/connectdlg_common.c:469
#, fuzzy
msgid ""
"Established control over the server. You have command access level 'hack'."
msgstr "We hebben serverbeheer (toegangsniveau hack)"
-#: client/connectdlg_common.c:475
+#: client/connectdlg_common.c:474
msgid ""
"Failed to obtain the required access level to take control of the server. "
"The server will now be shutdown."
@@ -8102,27 +8236,27 @@ msgstr ""
msgid "Only transporter units can be unloaded."
msgstr "Alleen vrachtschepen kunnen uitladen."
-#: client/control.c:1425
+#: client/control.c:1417
msgid "Only settler units can be put into auto mode."
msgstr "Alleen kolonisten kunnen in auto-modus worden gezet."
-#: client/control.c:1516
+#: client/control.c:1511
msgid "Only nuclear units can do this."
msgstr "Alleen nucleaire eenheden kunnen dit."
-#: client/control.c:1545
+#: client/control.c:1540
msgid "Only paratrooper units can do this."
msgstr "Alleen paratroepen eenheden kunnen dit."
-#: client/control.c:2020
+#: client/control.c:2015
msgid "Too far for this unit."
msgstr "Te ver voor deze eenheid."
-#: client/control.c:2230 client/control.c:2260 client/control.c:2276
+#: client/control.c:2225 client/control.c:2255 client/control.c:2271
msgid "Didn't find a route to the destination!"
msgstr "Kon geen route naar de bestemming vinden!"
-#: client/control.c:2320
+#: client/control.c:2315
msgid "Oh my! You seem to have no capital!"
msgstr "Nee maar! U lijkt geen hoofdstad te hebben!"
@@ -8539,27 +8673,34 @@ 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:1066 client/helpdata.c:1400
+#: client/helpdata.c:1066 client/helpdata.c:1408
msgid " or "
msgstr " of "
-#: client/helpdata.c:1068 client/helpdata.c:1388
+#: client/helpdata.c:1068 client/helpdata.c:1396
msgid "?or:, "
msgstr "?of:, "
-#: client/helpdata.c:1080
-#, 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"
+#: client/helpdata.c:1079
+#, fuzzy, c-format
+msgid "* Unit has to be in a city, or a base after %d turn.\n"
+msgid_plural "* Unit has to be in a city, or a base 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:1087
+#, fuzzy, c-format
+msgid "* Unit has to be in a city, a base, or on a %s after %d turn.\n"
+msgid_plural "* Unit has to be in a city, a base, 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:1122
+#: client/helpdata.c:1130
#, 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:1127
+#: client/helpdata.c:1135
#, c-format
msgid ""
"To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8568,91 +8709,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:1135
+#: client/helpdata.c:1143
msgid "You cannot research this technology."
msgstr "U kunt deze technologie niet onderzoeken."
-#: client/helpdata.c:1139
+#: client/helpdata.c:1147
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:1151
+#: client/helpdata.c:1159
#, 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:1156
+#: client/helpdata.c:1164
#, 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:1159
+#: client/helpdata.c:1167
#, 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:1163
+#: client/helpdata.c:1171
msgid "* Increases the pollution generated by the population.\n"
msgstr "* Verhoogt de vervuiling die de bevolking maakt.\n"
-#: client/helpdata.c:1168
+#: client/helpdata.c:1176
#, 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:1175
+#: client/helpdata.c:1183
#, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr "* Staat %s om forten te bouwen.\n"
-#: client/helpdata.c:1183
+#: client/helpdata.c:1191
#, c-format
msgid "* Allows %s to build airbases.\n"
msgstr "* Staat %s toe om luchtbases te bouwen.\n"
-#: client/helpdata.c:1192
+#: client/helpdata.c:1200
#, 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:1200
+#: client/helpdata.c:1208
#, 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:1234
+#: client/helpdata.c:1242
msgid "* Pollution cannot be generated on this terrain."
msgstr "* Op dit terrein kan geen vervuiling optreden."
-#: client/helpdata.c:1239
+#: client/helpdata.c:1247
msgid "* You cannot build cities on this terrain."
msgstr "* U kan op dit terrein geen steden stichten."
-#: client/helpdata.c:1245
+#: client/helpdata.c:1253
msgid "* The coastline of this terrain is unsafe."
msgstr "* De kustlijn van dit terrein is niet veilig."
-#: client/helpdata.c:1250
+#: client/helpdata.c:1258
msgid "* This terrain is unsafe for units to travel on."
msgstr "* Op dit terrein kunnen eenheden zich niet veilig verplaatsen."
-#: client/helpdata.c:1255
+#: client/helpdata.c:1263
msgid "* Land units cannot travel on oceanic terrains."
msgstr "* Land eenheden kunnen niet over zee reizen."
-#: client/helpdata.c:1305
+#: client/helpdata.c:1313
msgid "Features:\n"
msgstr "Mogelijkheden:\n"
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1411 client/helpdata.c:1412
+#: client/helpdata.c:1419 client/helpdata.c:1420
msgid "?outputlist: Nothing "
msgstr ""
-#: client/helpdata.c:1419
+#: client/helpdata.c:1427
#, fuzzy, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -8665,7 +8806,7 @@ msgstr[0] ""
msgstr[1] ""
"* Militaire eenheden in het veld zullen %d ontevreden bewoners veroorzaken.\n"
-#: client/helpdata.c:1429
+#: client/helpdata.c:1437
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8675,23 +8816,23 @@ msgstr ""
"zou veroorzaakt worden.\n"
#. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1437
+#: client/helpdata.c:1445
#, 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:1442
+#: client/helpdata.c:1450
#, 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:1447
+#: client/helpdata.c:1455
#, 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:1451
+#: client/helpdata.c:1459
#, fuzzy
msgid "* You pay no upkeep for your units.\n"
msgstr "* U betaalt %d keer normale onderhoudskost voor uw eenheden.\n"
@@ -8699,25 +8840,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:1460
+#: client/helpdata.c:1468
#, 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:1468
+#: client/helpdata.c:1476
#, 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:1475
+#: client/helpdata.c:1483
#, 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:1482
+#: client/helpdata.c:1490
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -8727,7 +8868,7 @@ msgstr ""
"land zal verschijnen als u %d steden heeft.\n"
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1489
+#: client/helpdata.c:1497
#, c-format
msgid ""
"* After the first unhappy citizen due to city size, for each %d additional "
@@ -8736,18 +8877,18 @@ msgstr ""
"* Na de eerste ongelukkige burger door stadsgrootte, komt er nog 1 bij per %"
"d extra steden.\n"
-#: client/helpdata.c:1497
+#: client/helpdata.c:1505
#, 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:1502
+#: client/helpdata.c:1510
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr "Heeft onbeperkte wetenschap/goud/luxegoederen normen.\n"
-#: client/helpdata.c:1507
+#: client/helpdata.c:1515
#, fuzzy, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -8762,7 +8903,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:1519
+#: client/helpdata.c:1527
#, 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"
@@ -8770,7 +8911,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:1530
+#: client/helpdata.c:1538
#, c-format
msgid ""
"* You may grow your cities by means of celebrations. Your cities must be at "
@@ -8779,15 +8920,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:1536
+#: client/helpdata.c:1544
msgid "* Your units cannot be bribed.\n"
msgstr "* Uw eenheden kunnen niet worden omgekocht.\n"
-#: client/helpdata.c:1539
+#: client/helpdata.c:1547
msgid "* Your cities cannot be incited.\n"
msgstr "* Uw eenheden en steden kunnen niet in oproer gebracht worden.\n"
-#: client/helpdata.c:1543
+#: client/helpdata.c:1551
msgid ""
"* Government will fall into anarchy if any city is in disorder for more than "
"two turns in a row.\n"
@@ -8795,16 +8936,16 @@ msgstr ""
"* De overheid vervalt tot anarchie wanneer eender welke stad meer dan twee "
"beurten op rij burgerlijke onrust kent.\n"
-#: client/helpdata.c:1549
+#: client/helpdata.c:1557
msgid "* Has a senate that may prevent declaration of war.\n"
msgstr "* Heeft een senaat die oorlogsverklaringen kan tegenhouden.\n"
-#: client/helpdata.c:1553
+#: client/helpdata.c:1561
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:1557
+#: client/helpdata.c:1565
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
@@ -8812,25 +8953,25 @@ msgstr ""
"* Gebouwen die normaal bonussen tegen ontevredenheid geven , geven nu extra "
"goud.\n"
-#: client/helpdata.c:1561
+#: client/helpdata.c:1569
msgid "* Pays no upkeep for fanatics.\n"
msgstr "* Betaalt geen onderhoudskost voor fanatici.\n"
-#: client/helpdata.c:1564
+#: client/helpdata.c:1572
msgid "* Has no unhappy citizens.\n"
msgstr "* Heeft geen ontevreden burgers.\n"
-#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
+#: client/helpdata.c:1582 client/helpdata.c:1586 client/helpdata.c:1590
#, fuzzy, c-format
msgid "* Veteran %s units.\n"
msgstr "*·Veteraan·%s·eenheden.\n"
-#: client/helpdata.c:1585
+#: client/helpdata.c:1593
msgid "* Veteran units.\n"
msgstr "* Veteranen.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1591
+#: client/helpdata.c:1599
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8840,7 +8981,7 @@ msgstr ""
"wanneer er niet gevierd wordt.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1600
+#: client/helpdata.c:1608
#, fuzzy, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8850,71 +8991,71 @@ msgstr ""
"gevierd wordt.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1608
+#: client/helpdata.c:1616
#, 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:1617
+#: client/helpdata.c:1625
#, 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:1625
+#: client/helpdata.c:1633
#, 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:1630
+#: client/helpdata.c:1638
#, 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:1635
+#: client/helpdata.c:1643
#, 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:1643
+#: client/helpdata.c:1651
#, 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:1649
+#: client/helpdata.c:1657
#, 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:1655
+#: client/helpdata.c:1663
#, 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:1672
+#: client/helpdata.c:1680
#, 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:1699
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d %s"
msgstr "%s%d %s"
-#: client/helpdata.c:1700 client/helpdata.c:1708 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1708 client/helpdata.c:1716 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:1707
+#: client/helpdata.c:1715
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d ontevreden"
@@ -8990,7 +9131,7 @@ msgstr ""
"Dit·is·de·standaard·server·poort·die·gebruikt·wordt·in·de·verbindingsvensters·of·met·de·-"
"a·parameter."
-#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:916 data/Freeciv.in:107
msgid "Metaserver"
msgstr "Metaserver"
@@ -9401,36 +9542,36 @@ msgstr "Opslaan mislukt, kan niet schrijven naar bestand %s"
msgid "Saved settings to file %s"
msgstr "Instellingen opgeslagen in bestand %s"
-#: client/packhand.c:211 client/packhand.c:217
+#: client/packhand.c:212 client/packhand.c:218
#, fuzzy
msgid "You were rejected from the game...."
msgstr "U werd uit het spel gezet:"
-#: client/packhand.c:229
+#: client/packhand.c:230
#, c-format
msgid "Client capability string: %s"
msgstr "Client capaciteits string: %s"
-#: client/packhand.c:232
+#: client/packhand.c:233
#, c-format
msgid "Server capability string: %s"
msgstr "Server capaciteits string: %s"
-#: client/packhand.c:850
+#: client/packhand.c:864
#, c-format
msgid "Start of turn %d"
msgstr "Begin van beurt %d"
-#: client/packhand.c:1591
+#: client/packhand.c:1621
#, c-format
msgid "AI Mode is now %s."
msgstr "KI-modus is nu %s."
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "ON"
msgstr "AAN"
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "OFF"
msgstr "UIT"
@@ -9461,15 +9602,15 @@ msgstr "?Player:Naam"
msgid "Username"
msgstr "Gebruikersnaam"
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
-#: client/gui-gtk-2.0/pages.c:2157
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:653
+#: client/gui-gtk-2.0/pages.c:1604 client/gui-gtk-2.0/pages.c:2159
msgid "Flag"
msgstr "Vlag"
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1605
-#: client/gui-gtk-2.0/pages.c:2159 client/gui-sdl/repodlgs.c:2063
-#: client/gui-win32/connectdlg.c:990 client/gui-win32/dialogs.c:542
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:657
+#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1609
+#: client/gui-gtk-2.0/pages.c:2161 client/gui-sdl/repodlgs.c:2063
+#: client/gui-win32/connectdlg.c:992 client/gui-win32/dialogs.c:542
#: client/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "Natie"
@@ -9482,7 +9623,7 @@ msgstr "Grens"
msgid "Score"
msgstr "Score"
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1614
msgid "Team"
msgstr "Team"
@@ -9515,36 +9656,36 @@ msgstr "?Player_dlg:Geen Reactie"
msgid "Ping"
msgstr "Ping"
-#: client/repodlgs_common.c:375
+#: client/repodlgs_common.c:378
msgid "You cannot sell improvements."
msgstr "U kan geen verbeteringen verkopen."
-#: client/repodlgs_common.c:391
+#: client/repodlgs_common.c:394
#, c-format
msgid "Sold %d %s for %d gold."
msgstr "%d %s verkocht voor %d goud."
-#: client/repodlgs_common.c:396
+#: client/repodlgs_common.c:399
#, c-format
msgid "No %s could be sold."
msgstr "Kon geen %s verkopen."
#. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:415
+#: client/repodlgs_common.c:418
msgid "You cannot disband units."
msgstr "U kan geen eenheden ontbinden."
-#: client/repodlgs_common.c:420
+#: client/repodlgs_common.c:423
#, c-format
msgid "%s cannot be disbanded."
msgstr "%s kan niet ontbonden worden."
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:444
#, c-format
msgid "Disbanded %d %s."
msgstr "Ontbond %d %s."
-#: client/repodlgs_common.c:445
+#: client/repodlgs_common.c:448
#, c-format
msgid "No %s could be disbanded."
msgstr "Kon geen %s ontbinden."
@@ -10134,47 +10275,47 @@ msgstr "?dagen/uren:%02dd %02du"
msgid "?duration:overflow"
msgstr "?duur:overschrijding"
-#: client/text.c:1143
+#: client/text.c:1145
#, c-format
msgid "%6d.%02d ms"
msgstr "%6d.%02d ms"
#. TRANS: <nation adjective> <government name>.
#. * E.g. "Polish Republic".
-#: client/text.c:1188
+#: client/text.c:1193
#, fuzzy, c-format
msgid "?nationgovernment:%s %s"
msgstr "Regering: %s"
#. TRANS: "Observer: 1985"
-#: client/text.c:1198
+#: client/text.c:1203
#, c-format
msgid "Observer: %s"
msgstr "Waarnemer: %s"
-#: client/text.c:1216
+#: client/text.c:1221
msgid "Buildings: "
msgstr "Gebouwen: "
-#: client/text.c:1233 client/text.c:1272
+#: client/text.c:1238 client/text.c:1277
msgid "None. "
msgstr "Geen."
-#: client/text.c:1235 client/text.c:1274
+#: client/text.c:1240 client/text.c:1279
msgid "?clistend:."
msgstr "."
-#: client/text.c:1253
+#: client/text.c:1258
msgid "Wonders: "
msgstr "Wereldwonderen: "
-#: client/text.c:1308
+#: client/text.c:1313
#, 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:1312
+#: client/text.c:1317
#, fuzzy, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
@@ -10182,19 +10323,19 @@ msgstr[0] "%d tevreden voor bezwaring met "
msgstr[1] "%d tevreden voor bezwaring met "
#. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1318
+#: client/text.c:1323
#, fuzzy, c-format
msgid "%d additional unhappy citizen."
msgid_plural "%d additional unhappy citizens."
msgstr[0] "%d toegevoegde ontevreden burgers."
msgstr[1] "%d toegevoegde ontevreden burgers."
-#: client/text.c:1339
+#: client/text.c:1344
#, fuzzy
msgid "Unlimited martial law in effect."
msgstr "Krijgswet van toepassing ("
-#: client/text.c:1341
+#: client/text.c:1346
#, fuzzy, c-format
msgid "%d military unit may impose martial law."
msgid_plural "Up to %d military units may impose martial law."
@@ -10203,7 +10344,7 @@ msgstr[0] ""
msgstr[1] ""
"* Een niet-militaire eenheid (kan niet aanvallen, geen krijgstucht).\n"
-#: client/text.c:1345
+#: client/text.c:1350
#, fuzzy, c-format
msgid "Each military unit makes %d unhappy citizen content."
msgid_plural "Each military unit makes %d unhappy citizens content."
@@ -10214,31 +10355,31 @@ msgstr[1] ""
"Vermaakt de inwoners van een stad en maakt daarbij drie ontevreden "
"stedelingen tevreden."
-#: client/text.c:1352
+#: client/text.c:1357
msgid "Military units in the field may cause unhappiness. "
msgstr "Militaire eenheden in het veld kunnen ontevredenheid veroorzaken. "
-#: client/text.c:1355
+#: client/text.c:1360
msgid "Military units have no happiness effect. "
msgstr "Militaire eenheden kunnen geen ontevredenheid veroorzaken. "
-#: client/text.c:1370
+#: client/text.c:1375
#, c-format
msgid "Luxury: %d total."
msgstr "Luxe: %d totaal."
-#: client/tilespec.c:865
+#: client/tilespec.c:882
msgid "No usable default tileset found, aborting!"
msgstr "Geen bruikbare standaard vlakkenset gevonden, breek af!"
-#: client/tilespec.c:1338
+#: client/tilespec.c:1355
msgid ""
"Client does not support isometric tilesets. Using default tileset instead."
msgstr ""
"Client ondersteunt geen isometrische vlakkensets. Val terug op standaard "
"vlakkenset."
-#: client/tilespec.c:1347
+#: client/tilespec.c:1364
msgid ""
"Client does not support overhead view tilesets. Using default tileset "
"instead."
@@ -10246,7 +10387,7 @@ msgstr ""
"Client ondersteunt geen bovenaanzicht-vlakkensets. Val terug op standaard "
"vlakkenset."
-#: client/tilespec.c:3966
+#: client/tilespec.c:3987
#, fuzzy, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -10937,7 +11078,7 @@ msgid "_Display"
msgstr "_Toon..."
#: client/gui-gtk-2.0/cityrep.c:1006 client/gui-gtk-2.0/menu.c:839
-#: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
+#: client/gui-sdl/diplodlg.c:692 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
#: client/gui-xaw/cityrep.c:533 client/gui-xaw/menu.c:156
@@ -11110,198 +11251,198 @@ msgstr "Hoe zullen we de snelkeuze noemen?"
msgid "Remove this preset?"
msgstr "Deze snelkeuze verwijderen?"
-#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:222
+#: client/gui-gtk-2.0/dialogs.c:197 client/gui-gtk-2.0/messagewin.c:222
#, fuzzy
msgid "Goto _Location"
msgstr "Ga naar _locatie"
-#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
+#: client/gui-gtk-2.0/dialogs.c:202 client/gui-gtk-2.0/messagewin.c:226
#, fuzzy
msgid "Inspect _City"
msgstr "Pop_up Stad"
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:258 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:258 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:259 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:311 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:312 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:312 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:313 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:506
+#: client/gui-gtk-2.0/dialogs.c:507
msgid "Unit"
msgstr "Eenheid"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:950
-#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2155
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:985
+#: client/gui-gtk-2.0/dialogs.c:508 client/gui-gtk-2.0/pages.c:950
+#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2157
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:987
#: 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:519 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:520 client/gui-sdl/dialogs.c:627
msgid "Unit selection"
msgstr "Eenheid keuze"
-#: client/gui-gtk-2.0/dialogs.c:582
+#: client/gui-gtk-2.0/dialogs.c:583
msgid "_Ready all"
msgstr "Activee_r alle"
-#: client/gui-gtk-2.0/dialogs.c:590
+#: client/gui-gtk-2.0/dialogs.c:591
msgid "_Sentry idle"
msgstr "Zet ongebruikte eenheden op _wacht"
-#: client/gui-gtk-2.0/dialogs.c:719
+#: client/gui-gtk-2.0/dialogs.c:721
#, fuzzy
msgid "Nation _Groups:"
msgstr "_Naties:"
-#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:766 data/Freeciv.in:3128
msgid "What Nation Will You Be?"
msgstr "Welke Natie Wilt U Zijn?"
-#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
-#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
+#: client/gui-gtk-2.0/dialogs.c:768 client/gui-sdl/chatline.c:842
+#: client/gui-win32/connectdlg.c:1040 data/Freeciv.in:3371
msgid "Pick Nation"
msgstr "Kies Natie"
-#: client/gui-gtk-2.0/dialogs.c:774
+#: client/gui-gtk-2.0/dialogs.c:776
#, fuzzy
msgid "_Random Nation"
msgstr "Willekeurig land"
-#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:792 client/gui-win32/dialogs.c:517
msgid "Select a nation"
msgstr "Kies een natie"
-#: client/gui-gtk-2.0/dialogs.c:804
+#: client/gui-gtk-2.0/dialogs.c:810
msgid "_Properties"
msgstr "Eigenschappen"
-#: client/gui-gtk-2.0/dialogs.c:824
+#: client/gui-gtk-2.0/dialogs.c:830
msgid "_Leader:"
msgstr "_Leider:"
-#: client/gui-gtk-2.0/dialogs.c:831
+#: client/gui-gtk-2.0/dialogs.c:837
msgid "_Female"
msgstr "_Vrouwelijk"
-#: client/gui-gtk-2.0/dialogs.c:836
+#: client/gui-gtk-2.0/dialogs.c:842
msgid "_Male"
msgstr "_Mannelijk"
-#: client/gui-gtk-2.0/dialogs.c:863
+#: client/gui-gtk-2.0/dialogs.c:869
#, fuzzy
msgid "City _Styles:"
msgstr "_Stadsstijlen:"
-#: client/gui-gtk-2.0/dialogs.c:902
+#: client/gui-gtk-2.0/dialogs.c:908
#, fuzzy
msgid "_Description"
msgstr "L_egenda"
-#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1263 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:1253 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1268 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:1262 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1277 client/gui-sdl/dialogs.c:2204
#: 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:1306 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1318 client/gui-win32/citydlg.c:1454
#: data/Freeciv.in:2484
msgid "Upgrade Unit!"
msgstr "Waardeer Eenheid Op!"
-#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1327 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 "Waardeer Verouderde Eenheden Op"
-#: client/gui-gtk-2.0/diplodlg.c:231 client/gui-win32/diplodlg.c:151
+#: client/gui-gtk-2.0/diplodlg.c:222 client/gui-win32/diplodlg.c:151
#: client/gui-xaw/diplodlg.c:383 client/gui-xaw/diplodlg.c:401
msgid "World-map"
msgstr "Wereldkaart"
-#: client/gui-gtk-2.0/diplodlg.c:237 client/gui-win32/diplodlg.c:146
+#: client/gui-gtk-2.0/diplodlg.c:228 client/gui-win32/diplodlg.c:146
#: client/gui-xaw/diplodlg.c:387 client/gui-xaw/diplodlg.c:405
msgid "Sea-map"
msgstr "Zeekaart"
-#: client/gui-gtk-2.0/diplodlg.c:243
+#: client/gui-gtk-2.0/diplodlg.c:234
msgid "_Maps"
msgstr "Kaarten"
-#: client/gui-gtk-2.0/diplodlg.c:274
+#: client/gui-gtk-2.0/diplodlg.c:265
msgid "_Advances"
msgstr "Vooruitg_angen"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/diplodlg.c:315 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "Steden (_C)"
-#: client/gui-gtk-2.0/diplodlg.c:333
+#: client/gui-gtk-2.0/diplodlg.c:324
msgid "_Give shared vision"
msgstr "_Geef gedeelde waarneming"
-#: client/gui-gtk-2.0/diplodlg.c:346
+#: client/gui-gtk-2.0/diplodlg.c:337
msgid "Give _embassy"
msgstr "G_eef ambassade"
-#: client/gui-gtk-2.0/diplodlg.c:376
+#: client/gui-gtk-2.0/diplodlg.c:368
msgid "_Pacts"
msgstr "Verdragen"
-#: client/gui-gtk-2.0/diplodlg.c:466
+#: client/gui-gtk-2.0/diplodlg.c:458
#, c-format
msgid "Diplomacy: %s"
msgstr "Diplomatie %s"
-#: client/gui-gtk-2.0/diplodlg.c:473
+#: client/gui-gtk-2.0/diplodlg.c:465
msgid "_Cancel meeting"
msgstr "Annuleer _ontmoeting"
-#: client/gui-gtk-2.0/diplodlg.c:475
+#: client/gui-gtk-2.0/diplodlg.c:467
msgid "Accept _treaty"
msgstr "Accep_teer verdrag"
-#: client/gui-gtk-2.0/diplodlg.c:503
+#: client/gui-gtk-2.0/diplodlg.c:495
msgid "C_lauses:"
msgstr "C_lausules:"
-#: client/gui-gtk-2.0/diplodlg.c:568 client/gui-gtk-2.0/diplodlg.c:642
+#: client/gui-gtk-2.0/diplodlg.c:560 client/gui-gtk-2.0/diplodlg.c:634
msgid "_Gold:"
msgstr "_Goud:"
-#: client/gui-gtk-2.0/diplodlg.c:580 client/gui-gtk-2.0/diplodlg.c:654
+#: client/gui-gtk-2.0/diplodlg.c:572 client/gui-gtk-2.0/diplodlg.c:646
msgid "_Add Clause..."
msgstr "Extra cl_ausule..."
-#: client/gui-gtk-2.0/diplodlg.c:699
+#: client/gui-gtk-2.0/diplodlg.c:691
msgid "--- This treaty is blank. Please add some clauses. ---"
msgstr "--- Dit is een leeg verdrag. Voeg clausules toe. ---"
-#: client/gui-gtk-2.0/diplodlg.c:905 client/gui-sdl/diplodlg.c:375
+#: client/gui-gtk-2.0/diplodlg.c:897 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 "Ongeldige hoeveelheid goud opgegeven."
@@ -11361,19 +11502,19 @@ msgstr "Kies bestemming"
msgid "Show _All Cities"
msgstr "Toon _alle steden"
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:164
msgid "Show Map Scrollbars"
msgstr "Toon kaartscrollbars"
-#: client/gui-gtk-2.0/gui_main.c:163
+#: client/gui-gtk-2.0/gui_main.c:165
msgid "Disable this option to hide the scrollbars on the map view."
msgstr "Zet deze optie af om de schuifbalken op de kaart te verbergen."
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:169
msgid "Keyboardless goto"
msgstr "Toetsenbordloos ga-naar"
-#: client/gui-gtk-2.0/gui_main.c:168
+#: client/gui-gtk-2.0/gui_main.c:170
msgid ""
"If this option is set then a goto may be initiated by left-clicking and then "
"holding down the mouse button while dragging the mouse onto a different tile."
@@ -11382,11 +11523,11 @@ msgstr ""
"klikken en dan met de muisknop ingedrukt de cursor naar een doelvak te "
"bewegen."
-#: client/gui-gtk-2.0/gui_main.c:173
+#: client/gui-gtk-2.0/gui_main.c:175
msgid "Keep dialogs on top"
msgstr "Houd dialogen bovenop"
-#: client/gui-gtk-2.0/gui_main.c:174
+#: client/gui-gtk-2.0/gui_main.c:176
msgid ""
"If this option is set then dialog windows will always remain in front of the "
"main Freeciv window. Disabling this has no effect in fullscreen mode."
@@ -11395,11 +11536,11 @@ msgstr ""
"hoofdvenster blijven hangen en kan u ze niet per ongeluk uit het oog "
"verliezen. Dit uitschakelen heeft geen effect in vol-scherm modus."
-#: client/gui-gtk-2.0/gui_main.c:178
+#: client/gui-gtk-2.0/gui_main.c:180
msgid "Show worklist task icons"
msgstr "Toon werklijst iconen"
-#: client/gui-gtk-2.0/gui_main.c:179
+#: client/gui-gtk-2.0/gui_main.c:181
msgid ""
"Disabling this will turn off the unit and building icons in the worklist "
"dialog and the production tab of the city dialog."
@@ -11407,11 +11548,11 @@ msgstr ""
"Dit uitschakelen zet de eenheid en gebouw prentjes uit in het werklijst "
"venster en de productie tab van het stadsvenster."
-#: client/gui-gtk-2.0/gui_main.c:183
+#: client/gui-gtk-2.0/gui_main.c:185
msgid "Enable status report tabs"
msgstr "Status-rapport-tabs aan"
-#: client/gui-gtk-2.0/gui_main.c:184
+#: client/gui-gtk-2.0/gui_main.c:186
msgid ""
"If this option is enabled then report dialogs will be shown as separate tabs "
"rather than in popup dialogs."
@@ -11419,11 +11560,11 @@ msgstr ""
"Als deze optie aanstaat zullen rapport-vensters getoond worden in aparte "
"tabs ipv in opspringende vensters."
-#: client/gui-gtk-2.0/gui_main.c:189 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:191 client/gui-win32/gui_main.c:110
msgid "Better fog-of-war drawing"
msgstr "Beter onbekend-gebied-schaduw tekenen"
-#: client/gui-gtk-2.0/gui_main.c:190 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:192 client/gui-win32/gui_main.c:111
msgid ""
"If this is enabled then a better method is used for drawing fog-of-war. It "
"is not any slower but will consume about twice as much memory."
@@ -11432,41 +11573,41 @@ msgstr ""
"schaduw te tekenen. Dit is niet trager maar verbruikt wel twee keer zoveel "
"geheugen."
-#: client/gui-gtk-2.0/gui_main.c:195
+#: client/gui-gtk-2.0/gui_main.c:197
msgid "Show time for each chat message"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:196
+#: client/gui-gtk-2.0/gui_main.c:198
msgid ""
"If this option is enabled then all chat messages will be prefixed by a time "
"string of the form [hour:minute:second]."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:201
+#: client/gui-gtk-2.0/gui_main.c:203
msgid "Split bottom notebook area"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:202
+#: client/gui-gtk-2.0/gui_main.c:204
msgid ""
"Enabling this option will split the bottom notebook into a left and right "
"notebook so that two tabs may be viewed at once."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:207
+#: client/gui-gtk-2.0/gui_main.c:209
msgid "New message events go to top of list"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:208
+#: client/gui-gtk-2.0/gui_main.c:210
msgid ""
"If this option is enabled, new events in the message window will appear at "
"the top of the list, rather than being appended at the bottom."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:213
+#: client/gui-gtk-2.0/gui_main.c:215
msgid "Show extra message window buttons"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:214
+#: client/gui-gtk-2.0/gui_main.c:216
msgid ""
"If this option is enabled, there will be two buttons displayed in the "
"message window for inspecting a city and going to a location. If this option "
@@ -11476,21 +11617,21 @@ msgid ""
"closed and reopened."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:224
+#: client/gui-gtk-2.0/gui_main.c:226
msgid "Metaserver tab first in network page"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:225
+#: client/gui-gtk-2.0/gui_main.c:227
msgid ""
"If this option is enabled, the metaserver tab will be the first notebook tab "
"in the network page. This option requires a restart in order to take effect."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:230
+#: client/gui-gtk-2.0/gui_main.c:232
msgid "Plain chat messages are sent to allies only"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:231
+#: client/gui-gtk-2.0/gui_main.c:233
msgid ""
"If this option is enabled, then plain messages typed into the chat entry "
"while the game is running will only be sent to your allies. Otherwise plain "
@@ -11500,28 +11641,41 @@ msgid ""
"visible in multiplayer games)."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:340 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:245
+msgid "Arrange widgets for small displays"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:246
+msgid ""
+"If this option is enabled, widgets in the main window will be arrange so "
+"that they take up the least amount of total screen space. Specifically, the "
+"left panel containing the overview, player status, and the unit information "
+"box will be extended over the entire left side of the window. This option "
+"requires a restart in order to take effect."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:352 client/gui-xaw/gui_main.c:245
msgid ""
"This client has no special command line options\n"
"\n"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
+#: client/gui-gtk-2.0/gui_main.c:847 client/gui-gtk-2.0/gui_main.c:1542
msgid "Freeciv"
msgstr "Freeciv"
-#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
+#: client/gui-gtk-2.0/gui_main.c:1251 client/gui-gtk-2.0/gui_main.c:1258
#: client/gui-sdl/mapctrl.c:1566 client/gui-win32/gui_main.c:482
#: data/Freeciv.in:2618
msgid "Turn Done"
msgstr "Beurt Klaar"
-#: client/gui-gtk-2.0/gui_main.c:1232 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1258 client/gui-sdl/mapctrl.c:1566
#: client/gui-sdl/mapview.c:1082
msgid "Shift+Return"
msgstr "Shift+Enter"
-#: client/gui-gtk-2.0/gui_main.c:1266 client/gui-gtk-2.0/menu.c:797
+#: client/gui-gtk-2.0/gui_main.c:1299 client/gui-gtk-2.0/menu.c:797
#: client/gui-gtk-2.0/menu.c:799 client/gui-gtk-2.0/menu.c:801
#: client/gui-gtk-2.0/menu.c:803 client/gui-gtk-2.0/menu.c:805
#: client/gui-gtk-2.0/menu.c:807 client/gui-gtk-2.0/menu.c:809
@@ -11540,11 +11694,11 @@ msgstr "Shift+Enter"
msgid "View"
msgstr "Bekijk"
-#: client/gui-gtk-2.0/gui_main.c:1359
+#: client/gui-gtk-2.0/gui_main.c:1393
msgid "Chat"
msgstr "Praat"
-#: client/gui-gtk-2.0/gui_main.c:1377 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1411 client/gui-win32/gui_main.c:538
#: data/Freeciv.in:2809
msgid ""
"Freeciv is free software and you are welcome to distribute copies of it\n"
@@ -11556,80 +11710,80 @@ msgstr ""
"menu.\n"
"Nu.. Geef ze van katoen!"
-#: client/gui-gtk-2.0/gui_main.c:1392
+#: client/gui-gtk-2.0/gui_main.c:1426
msgid "Allies Only"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1657
+#: client/gui-gtk-2.0/gui_main.c:1691
msgid "Not _ready"
msgstr "Niet klaa_r"
-#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
+#: client/gui-gtk-2.0/gui_main.c:1702 client/gui-gtk-2.0/pages.c:1679
msgid "_Ready"
msgstr "Klaa_r "
-#: client/gui-gtk-2.0/gui_main.c:1672 client/gui-gtk-2.0/gui_main.c:1678
-#: client/gui-gtk-2.0/pages.c:2204
+#: client/gui-gtk-2.0/gui_main.c:1706 client/gui-gtk-2.0/gui_main.c:1712
+#: client/gui-gtk-2.0/pages.c:2206
msgid "_Start"
msgstr "Begin (_S)"
-#: client/gui-gtk-2.0/gui_main.c:1686
+#: client/gui-gtk-2.0/gui_main.c:1720
#, fuzzy
msgid "_Take Player"
msgstr "Neem de controle over deze speler over"
-#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
+#: client/gui-gtk-2.0/gui_main.c:1723 client/gui-gtk-2.0/pages.c:1669
msgid "Pick _Nation"
msgstr "Kies _Natie"
-#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
+#: client/gui-gtk-2.0/gui_main.c:1730 client/gui-gtk-2.0/pages.c:1674
msgid "_Observe"
msgstr "_Observeer"
-#: client/gui-gtk-2.0/gui_main.c:1698
+#: client/gui-gtk-2.0/gui_main.c:1732
#, fuzzy
msgid "Do not _observe"
msgstr "_Niet Waarnemen"
-#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1755 client/gui-xaw/pages.c:211
msgid "<AI>"
msgstr "<KI>"
-#: client/gui-gtk-2.0/gui_main.c:1723
+#: client/gui-gtk-2.0/gui_main.c:1758
msgid "<Novice AI>"
msgstr "<Beginneling KI>"
-#: client/gui-gtk-2.0/gui_main.c:1726
+#: client/gui-gtk-2.0/gui_main.c:1761
msgid "<Easy AI>"
msgstr "<Makkelijke KI>"
-#: client/gui-gtk-2.0/gui_main.c:1729
+#: client/gui-gtk-2.0/gui_main.c:1764
msgid "<Normal AI>"
msgstr "<Normale KI>"
-#: client/gui-gtk-2.0/gui_main.c:1732
+#: client/gui-gtk-2.0/gui_main.c:1767
msgid "<Hard AI>"
msgstr "<Moeilijke KI>"
-#: client/gui-gtk-2.0/gui_main.c:1742 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1777 client/gui-win32/dialogs.c:594
#: client/gui-xaw/pages.c:217
msgid "Random"
msgstr "Willekeurig"
-#: client/gui-gtk-2.0/gui_main.c:1808
+#: client/gui-gtk-2.0/gui_main.c:1844 client/gui-gtk-2.0/gui_main.c:1858
#, fuzzy
msgid "Observer"
msgstr " (waarnemer)"
-#: client/gui-gtk-2.0/gui_main.c:1808
+#: client/gui-gtk-2.0/gui_main.c:1858
msgid "Detached"
msgstr "Losgekoppeld"
-#: client/gui-gtk-2.0/gui_main.c:2073
+#: client/gui-gtk-2.0/gui_main.c:2117
msgid "Are you sure you want to quit?"
msgstr "Ben je zeker dat je het spel wil verlaten?"
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
#, c-format
msgid ""
"Close Tab:\n"
@@ -11638,7 +11792,7 @@ msgstr ""
"Sluit Tab:\n"
"%s"
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
msgid "Ctrl+W"
msgstr "Ctrl+W"
@@ -11743,8 +11897,8 @@ msgid "Trans. Rslt/Time:"
msgstr "Trans. Res./Tijd:"
#: 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
-#: client/gui-win32/helpdlg.c:709 client/gui-win32/helpdlg.c:733
+#: client/gui-win32/helpdlg.c:502 client/gui-win32/helpdlg.c:550
+#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:739
#: client/gui-xaw/helpdlg.c:759 client/gui-xaw/helpdlg.c:808
#: client/gui-xaw/helpdlg.c:816 client/gui-xaw/helpdlg.c:853
#: client/gui-xaw/helpdlg.c:878
@@ -11791,34 +11945,34 @@ msgstr "met"
msgid "?techhelp:"
msgstr "?techhulp:"
-#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:591
+#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:597
#: client/gui-xaw/helpdlg.c:996
#, c-format
msgid "+%d Trade / %d"
msgstr "+%d Handel / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:595
+#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:601
#: client/gui-xaw/helpdlg.c:1000
#, c-format
msgid "no extra / %d"
msgstr "geen extra's / %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
-#: client/gui-win32/helpdlg.c:602 client/gui-win32/helpdlg.c:616
-#: client/gui-win32/helpdlg.c:635 client/gui-xaw/helpdlg.c:1002
+#: client/gui-gtk-2.0/helpdlg.c:1085 client/gui-win32/helpdlg.c:604
+#: client/gui-win32/helpdlg.c:608 client/gui-win32/helpdlg.c:622
+#: client/gui-win32/helpdlg.c:641 client/gui-xaw/helpdlg.c:1002
#: client/gui-xaw/helpdlg.c:1006 client/gui-xaw/helpdlg.c:1020
#: client/gui-xaw/helpdlg.c:1039
msgid "n/a"
msgstr "n/b"
-#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:605
+#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:611
#: client/gui-xaw/helpdlg.c:1009
#, c-format
msgid "+%d Food / %d"
msgstr "+%d Voeding / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:619
+#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:625
#: client/gui-xaw/helpdlg.c:1023
#, c-format
msgid "+%d Res. / %d"
@@ -12589,41 +12743,41 @@ msgstr "Verbind met netwerkspel (_O)"
msgid "Connect to Gaming _Zone"
msgstr "Verbind met Gaming _Zone"
-#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:302
#: 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:779 client/gui-gtk-2.0/pages.c:820
-#: client/gui-win32/connectdlg.c:916
+#: client/gui-win32/connectdlg.c:918
msgid "Server Name"
msgstr "Servernaam"
#: client/gui-gtk-2.0/pages.c:780 client/gui-gtk-2.0/pages.c:821
-#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:916
+#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:918
#: data/Freeciv.in:96
msgid "Port"
msgstr "Poort"
#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Version"
msgstr "Versie"
#: client/gui-gtk-2.0/pages.c:782 client/gui-gtk-2.0/pages.c:823
-#: client/gui-gtk-2.0/pages.c:2161 client/gui-win32/connectdlg.c:917
-#: client/gui-win32/connectdlg.c:995
+#: client/gui-gtk-2.0/pages.c:2163 client/gui-win32/connectdlg.c:919
+#: client/gui-win32/connectdlg.c:997
msgid "Status"
msgstr "Status"
#: client/gui-gtk-2.0/pages.c:783 client/gui-gtk-2.0/pages.c:824
#: client/gui-sdl/connectdlg.c:318 client/gui-sdl/plrdlg.c:330
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Players"
msgstr "Spelers"
#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
-#: client/gui-win32/connectdlg.c:918
+#: client/gui-win32/connectdlg.c:920
msgid "Comment"
msgstr "Commentaar"
@@ -12655,9 +12809,9 @@ msgstr "Wacht_woord:"
msgid "Conf_irm Password:"
msgstr "Bevest_ig Wachtwoord:"
-#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2165
#: 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:1000
+#: client/gui-win32/citydlg.c:1083 client/gui-win32/connectdlg.c:1002
#: client/gui-win32/wldlg.c:800 client/gui-win32/wldlg.c:806
msgid "Type"
msgstr "Type"
@@ -12752,7 +12906,7 @@ msgstr "KI sterkte: (_L)"
msgid "Ruleset _Version:"
msgstr "Regelset: (_V)"
-#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2195
msgid "_More Game Options..."
msgstr "_Meer Spel Opties"
@@ -12768,49 +12922,49 @@ msgstr "Score"
msgid "Ready"
msgstr "Klaar"
-#: client/gui-gtk-2.0/pages.c:1601
+#: client/gui-gtk-2.0/pages.c:1600
#, fuzzy
msgid "?player:Leader"
msgstr "?Player:Naam"
-#: client/gui-gtk-2.0/pages.c:1732 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1734 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:1824
+#: client/gui-gtk-2.0/pages.c:1826
msgid "Choose Saved Game to _Load:"
msgstr "Kies opgeslagen spel om te _Laden"
-#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
-#: client/gui-gtk-2.0/pages.c:2451
+#: client/gui-gtk-2.0/pages.c:1846 client/gui-gtk-2.0/pages.c:2039
+#: client/gui-gtk-2.0/pages.c:2455
msgid "_Browse..."
msgstr "_Bladeren..."
-#: client/gui-gtk-2.0/pages.c:1911
+#: client/gui-gtk-2.0/pages.c:1913
msgid "Choose a Scenario"
msgstr "Kies een Scenario"
-#: client/gui-gtk-2.0/pages.c:1998
+#: client/gui-gtk-2.0/pages.c:2000
msgid "Choose a _Scenario:"
msgstr "Kies een _Scenario:"
-#: client/gui-gtk-2.0/pages.c:2173
+#: client/gui-gtk-2.0/pages.c:2175
msgid "Choose a _nation to play:"
msgstr "Kies een natie om te spelen:"
-#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2367 client/gui-win32/menu.c:581
msgid "Select Location to Save"
msgstr "Kies opslag locatie"
-#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2452 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "Bewaar Spel"
-#: client/gui-gtk-2.0/pages.c:2489
+#: client/gui-gtk-2.0/pages.c:2493
msgid "Saved _Games:"
msgstr "Bewaarde Spelen: (_g)"
-#: client/gui-gtk-2.0/pages.c:2516
+#: client/gui-gtk-2.0/pages.c:2520
msgid "Save _Filename:"
msgstr "Bewaar Spel in Bestand: (_f)"
@@ -13159,7 +13313,7 @@ msgstr ""
msgid "Total users logged in : %d"
msgstr "Totaal aantal ingelogde gebruikers: %d"
-#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1098
msgid "Back"
msgstr "Terug"
@@ -13168,7 +13322,7 @@ msgid "Start"
msgstr "Begin"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:777
+#: client/gui-win32/connectdlg.c:779
msgid "Load Game"
msgstr "Laad Spel"
@@ -13212,9 +13366,9 @@ msgstr "Verhuis naar deze stad"
#: client/gui-sdl/connectdlg.c:308 client/gui-sdl/connectdlg.c:617
#: client/gui-sdl/connectdlg.c:803 client/gui-sdl/connectdlg.c:985
#: client/gui-sdl/dialogs.c:452 client/gui-sdl/dialogs.c:2095
-#: client/gui-sdl/dialogs.c:2893 client/gui-sdl/diplomat_dialog.c:731
+#: client/gui-sdl/dialogs.c:2902 client/gui-sdl/diplomat_dialog.c:731
#: client/gui-sdl/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1043
#: client/gui-win32/dialogs.c:1772 client/gui-win32/finddlg.c:127
#: client/gui-win32/gotodlg.c:171 client/gui-win32/inputdlg.c:146
#: client/gui-win32/messagedlg.c:216 client/gui-win32/ratesdlg.c:328
@@ -13261,7 +13415,7 @@ msgid "Buy it?"
msgstr "Kopen?"
#: 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
+#: client/gui-sdl/diplodlg.c:1336 client/gui-sdl/diplomat_dialog.c:1211
#: client/gui-sdl/diplomat_dialog.c:1417 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:221 client/gui-sdl/repodlgs.c:1559
#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
@@ -13277,7 +13431,7 @@ msgid "No"
msgstr "Nee"
#: client/gui-sdl/citydlg.c:1215 client/gui-sdl/cma_fe.c:318
-#: client/gui-sdl/diplodlg.c:1345 client/gui-sdl/diplomat_dialog.c:1200
+#: client/gui-sdl/diplodlg.c:1346 client/gui-sdl/diplomat_dialog.c:1200
#: client/gui-sdl/diplomat_dialog.c:1407 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:232 client/gui-win32/repodlgs.c:578
#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
@@ -13592,7 +13746,7 @@ msgstr "Freeciv Server :"
msgid "Port :"
msgstr "Poort :"
-#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1100
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr "Maak verbinding"
@@ -13700,23 +13854,23 @@ msgstr "Kies Uw Nieuwe Staatsvorm"
msgid "REVOLUTION!"
msgstr "REVOLUTIE!"
-#: client/gui-sdl/dialogs.c:2232 client/gui-sdl/dialogs.c:2620
+#: client/gui-sdl/dialogs.c:2237 client/gui-sdl/dialogs.c:2625
#: client/gui-win32/dialogs.c:567 data/Freeciv.in:3159
msgid "Female"
msgstr "Vrouwelijk"
-#: client/gui-sdl/dialogs.c:2234 client/gui-sdl/dialogs.c:2618
-#: client/gui-sdl/dialogs.c:2830 client/gui-win32/dialogs.c:565
+#: client/gui-sdl/dialogs.c:2239 client/gui-sdl/dialogs.c:2623
+#: client/gui-sdl/dialogs.c:2839 client/gui-win32/dialogs.c:565
msgid "Male"
msgstr "Mannelijk"
-#: client/gui-sdl/dialogs.c:2478 client/gui-sdl/dialogs.c:2902
+#: client/gui-sdl/dialogs.c:2483 client/gui-sdl/dialogs.c:2911
#: 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 "OK"
-#: client/gui-sdl/dialogs.c:2685 client/gui-win32/dialogs.c:505
+#: client/gui-sdl/dialogs.c:2694 client/gui-win32/dialogs.c:505
msgid "What nation will you be?"
msgstr "Welke natie zult u zijn?"
@@ -13743,53 +13897,53 @@ msgstr "Wereldkaart"
msgid "Sea map"
msgstr "Zeekaart"
-#: client/gui-sdl/diplodlg.c:563
+#: client/gui-sdl/diplodlg.c:564
msgid "Give embassy"
msgstr "Geef ambassade"
-#: client/gui-sdl/diplodlg.c:579 client/gui-win32/diplodlg.c:614
+#: client/gui-sdl/diplodlg.c:580 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 "Goud(max %d)"
-#: client/gui-sdl/diplodlg.c:613 client/gui-sdl/helpdlg.c:1956
+#: client/gui-sdl/diplodlg.c:614 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 "Vooruitgangen"
-#: client/gui-sdl/diplodlg.c:831 client/gui-win32/diplodlg.c:598
+#: client/gui-sdl/diplodlg.c:832 client/gui-win32/diplodlg.c:598
#: data/Freeciv.in:269
msgid "Diplomacy meeting"
msgstr "Diplomatieke ontmoeting"
-#: client/gui-sdl/diplodlg.c:883 client/gui-win32/diplodlg.c:680
+#: client/gui-sdl/diplodlg.c:884 client/gui-win32/diplodlg.c:680
#: data/Freeciv.in:510
msgid "Cancel meeting"
msgstr "Annuleer ontmoeting"
-#: client/gui-sdl/diplodlg.c:895 client/gui-win32/diplodlg.c:679
+#: client/gui-sdl/diplodlg.c:896 client/gui-win32/diplodlg.c:679
#: data/Freeciv.in:501
msgid "Accept treaty"
msgstr "Accepteer verdrag"
#. TRANS: "Polish incident !" FIXME!!!
-#: client/gui-sdl/diplodlg.c:1304
+#: client/gui-sdl/diplodlg.c:1305
#, c-format
msgid "%s incident !"
msgstr "%s voorval !"
-#: client/gui-sdl/diplodlg.c:1322
+#: client/gui-sdl/diplodlg.c:1323
msgid "Shall we declare WAR on them?"
msgstr "Zullen we ze de OORLOG verklaren?"
-#: client/gui-sdl/diplodlg.c:1433
+#: client/gui-sdl/diplodlg.c:1434
msgid "Foreign Minister"
msgstr "Minister van Buitenlandse Zaken"
-#: client/gui-sdl/diplodlg.c:1449
+#: client/gui-sdl/diplodlg.c:1450
#, fuzzy, c-format
msgid ""
"Sir!, the %s ambassador has arrived\n"
@@ -13798,24 +13952,24 @@ msgstr ""
"Heer!, %s ambassadeur is aangekomen\n"
"Wat zijn uw wensen?"
-#: client/gui-sdl/diplodlg.c:1465
+#: client/gui-sdl/diplodlg.c:1466
msgid "Declare WAR"
msgstr "Verklaar de OORLOG"
-#: client/gui-sdl/diplodlg.c:1467 client/gui-win32/plrdlg.c:357
+#: client/gui-sdl/diplodlg.c:1468 client/gui-win32/plrdlg.c:357
msgid "Cancel Treaty"
msgstr "Verbreek Verdrag"
-#: client/gui-sdl/diplodlg.c:1490 client/gui-win32/plrdlg.c:358
+#: client/gui-sdl/diplodlg.c:1491 client/gui-win32/plrdlg.c:358
#: data/Freeciv.in:3254
msgid "Withdraw vision"
msgstr "Ontneem waarneming"
-#: client/gui-sdl/diplodlg.c:1507
+#: client/gui-sdl/diplodlg.c:1508
msgid "Call Diplomatic Meeting"
msgstr "Beleg Diplomatieke ontmoeting"
-#: client/gui-sdl/diplodlg.c:1521
+#: client/gui-sdl/diplodlg.c:1522
msgid "Send him back"
msgstr "Stuur hem terug"
@@ -14578,12 +14732,12 @@ msgid "Leave Game"
msgstr "Bewaar Spel"
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1100 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1102 client/gui-xaw/menu.c:121
#: data/Freeciv.in:115 data/Freeciv.in:3180
msgid "Quit"
msgstr "Einde"
-#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:967
msgid "Start New Game"
msgstr "Begin nieuw spel"
@@ -14707,8 +14861,8 @@ msgstr "Netto inkomen: "
msgid "%s max rate : %d%%"
msgstr "%s max waarde: %d%%"
-#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
-#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1085
+#: client/gui-win32/connectdlg.c:1093 data/Freeciv.in:155
msgid "Update"
msgstr "Bijwerken"
@@ -15202,67 +15356,67 @@ msgstr "Nieuw"
msgid "Delete"
msgstr "Verwijderen"
-#: client/gui-win32/connectdlg.c:147
+#: client/gui-win32/connectdlg.c:149
msgid "Password:"
msgstr "Wachtwoord:"
-#: client/gui-win32/connectdlg.c:169
+#: client/gui-win32/connectdlg.c:171
msgid "Couldn't load the savegame"
msgstr "Kon opgeslagen spel niet laden"
-#: client/gui-win32/connectdlg.c:284 client/gui-xaw/connectdlg.c:311
+#: client/gui-win32/connectdlg.c:286 client/gui-xaw/connectdlg.c:311
msgid "Verify Password"
msgstr "Controleer wachtwoord"
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:916 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr "Freeciv Server Keuze"
-#: client/gui-win32/connectdlg.c:915
+#: client/gui-win32/connectdlg.c:917
msgid "Local Area Network"
msgstr "Lokaal netwerk"
-#: client/gui-win32/connectdlg.c:949
+#: client/gui-win32/connectdlg.c:951
msgid "Welcome to Freeciv"
msgstr "Welkom in Freeciv"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Load Saved Game"
msgstr "Laad Bewaard Spel"
-#: client/gui-win32/connectdlg.c:969
+#: client/gui-win32/connectdlg.c:971
msgid "Connect To Network Game"
msgstr "Verbind met netwerkspel"
-#: client/gui-win32/connectdlg.c:979
+#: client/gui-win32/connectdlg.c:981
msgid "Choose a nation to play"
msgstr "Kies een natie om te spelen"
-#: client/gui-win32/connectdlg.c:1014
+#: client/gui-win32/connectdlg.c:1016
msgid "Number of players (Including AI):"
msgstr "Aantal spelers (KI inbegrepen):"
-#: client/gui-win32/connectdlg.c:1022
+#: client/gui-win32/connectdlg.c:1024
msgid "AI skill level:"
msgstr "KI sterkte:"
-#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1038 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr "Spelopties"
-#: client/gui-win32/connectdlg.c:1040
+#: client/gui-win32/connectdlg.c:1042
msgid "Start Game"
msgstr "Begin Spel"
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Login:"
msgstr "Login:"
-#: client/gui-win32/connectdlg.c:1061
+#: client/gui-win32/connectdlg.c:1063
msgid "Host:"
msgstr "Server:"
-#: client/gui-win32/connectdlg.c:1062
+#: client/gui-win32/connectdlg.c:1064
msgid "Port:"
msgstr "Poort:"
@@ -15342,21 +15496,21 @@ msgstr ""
"Als dit aanstaat worden transparantie-effecten gebruikt ipv dithering. Als "
"de hardware dit niet ondersteund is dit veel trager."
-#: client/gui-win32/helpdlg.c:769 client/gui-win32/helpdlg.c:792
-#: client/gui-win32/helpdlg.c:803 client/gui-win32/helpdlg.c:809
-#: client/gui-win32/helpdlg.c:822
+#: client/gui-win32/helpdlg.c:775 client/gui-win32/helpdlg.c:798
+#: client/gui-win32/helpdlg.c:809 client/gui-win32/helpdlg.c:815
+#: client/gui-win32/helpdlg.c:828
msgid "Allows "
msgstr "Staat toe "
-#: client/gui-win32/helpdlg.c:780
+#: client/gui-win32/helpdlg.c:786
msgid "Obsoletes "
msgstr "Veroudert "
-#: client/gui-win32/helpdlg.c:812 client/gui-win32/helpdlg.c:825
+#: client/gui-win32/helpdlg.c:818 client/gui-win32/helpdlg.c:831
msgid " (with "
msgstr " (met "
-#: client/gui-win32/helpdlg.c:815 client/gui-win32/helpdlg.c:828
+#: client/gui-win32/helpdlg.c:821 client/gui-win32/helpdlg.c:834
msgid "?techhelp:)."
msgstr "?techhulp:)."
@@ -16478,7 +16632,7 @@ 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/"
+" https://gna.org/projects/freeciv/"
msgstr ""
"Als u een fout vindt, zend ons dan een foutenrapport. Dit is het "
"gemakkelijkst te doen door het Freeciv Fouten Tracerings Systeem te bezoeken "
@@ -18860,6 +19014,7 @@ msgid "Hydro Plant"
msgstr "Waterkracht Centrale"
#: data/default/buildings.ruleset:378
+#, fuzzy
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 "
@@ -18867,47 +19022,43 @@ msgid ""
"a Factory, Mfg. Plant and Hydro Plant together give a 150% production "
"bonus.\n"
"\n"
-"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant. A city "
-"can only build a Hydro Plant if it is next to (or on) a Mountain or River "
-"tile."
+"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant."
msgstr ""
"Vermindert de hoeveelheid verontreiniging die een stad maakt met 50%. Het "
"verhoogt ook de schild-productie van een Fabriek of Assemblagehal in de "
-"stad: een Fabriek en een Waterkrachtcentrale samen geven een bonus van 75% "
-"en een Fabriek, Assemblage Hal en een Waterkrachtcentrale samen geven een "
-"bonus van 150%.\n"
+"stad: een Fabriek en een Kerncentrale samen geven een bonus van 75% en een "
+"Fabriek, Assemblagehal en een Kerncentrale samen geven een bonus van 150%.\n"
"\n"
"Een stad kan slechts één Waterkrachtcentrale of één Electriciteitscentrale "
-"of één Kerncentrale bezitten. Een stad kan alleen een Waterkrachtcentrale "
-"bouwen als het op of naast een Berg- of Riviervlak ligt."
+"of één Kerncentrale bezitten."
-#: data/default/buildings.ruleset:397 data/civ2/buildings.ruleset:373
+#: data/default/buildings.ruleset:396 data/civ2/buildings.ruleset:373
#: data/civ1/buildings.ruleset:297
msgid "Library"
msgstr "Bibliotheek"
-#: data/default/buildings.ruleset:412
+#: data/default/buildings.ruleset:411
#, no-c-format
msgid "Increases the science output in a city by 100%."
msgstr "Verhoogt de wetenschapelijke opbrengsten van een stad met 100%."
-#: data/default/buildings.ruleset:417 data/civ2/buildings.ruleset:393
+#: data/default/buildings.ruleset:416 data/civ2/buildings.ruleset:393
#: data/civ1/buildings.ruleset:317
msgid "Marketplace"
msgstr "Marktplein"
-#: data/default/buildings.ruleset:432 data/civ2/buildings.ruleset:408
+#: data/default/buildings.ruleset:431 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 "Verhoogt de luxe- en belastingsopbrengsten in een stad met 50%."
-#: data/default/buildings.ruleset:437 data/civ2/buildings.ruleset:413
+#: data/default/buildings.ruleset:436 data/civ2/buildings.ruleset:413
#: data/civ1/buildings.ruleset:337
msgid "Mass Transit"
msgstr "Massavervoer"
-#: data/default/buildings.ruleset:451 data/civ2/buildings.ruleset:427
+#: data/default/buildings.ruleset:450 data/civ2/buildings.ruleset:427
#: data/civ1/buildings.ruleset:351
msgid ""
"Neutralizes the pollution generated by the population. The population "
@@ -18917,12 +19068,12 @@ msgstr ""
"grootte van de bevolking heeft eenvoudigweg geen invloed meer op de "
"hoeveelheid verontreiniging die een stad produceert."
-#: data/default/buildings.ruleset:458 data/civ2/buildings.ruleset:434
+#: data/default/buildings.ruleset:457 data/civ2/buildings.ruleset:434
#: data/civ1/buildings.ruleset:358
msgid "Mfg. Plant"
msgstr "Assemblagehal"
-#: data/default/buildings.ruleset:474 data/civ2/buildings.ruleset:450
+#: data/default/buildings.ruleset:473 data/civ2/buildings.ruleset:450
#: data/civ1/buildings.ruleset:374
#, no-c-format
msgid ""
@@ -18932,12 +19083,12 @@ msgstr ""
"Samen met een Fabriek verhoogt de Assemblagehal de schildproductie in een "
"stad met 100%."
-#: data/default/buildings.ruleset:480 data/civ2/buildings.ruleset:456
+#: data/default/buildings.ruleset:479 data/civ2/buildings.ruleset:456
#: data/civ1/buildings.ruleset:380
msgid "Nuclear Plant"
msgstr "Kerncentrale"
-#: data/default/buildings.ruleset:495
+#: data/default/buildings.ruleset:494
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 "
@@ -18955,11 +19106,11 @@ msgstr ""
"Een stad kan slechts één Waterkrachtcentrale of één Electriciteitscentrale "
"of één Kerncentrale bezitten."
-#: data/default/buildings.ruleset:515 data/civ2/buildings.ruleset:489
+#: data/default/buildings.ruleset:514 data/civ2/buildings.ruleset:489
msgid "Offshore Platform"
msgstr "Booreiland"
-#: data/default/buildings.ruleset:530 data/civ2/buildings.ruleset:504
+#: data/default/buildings.ruleset:529 data/civ2/buildings.ruleset:504
msgid ""
"Adds 1 extra shield resource on all Ocean squares in a city. The city needs "
"to be coastal to build this improvement."
@@ -18967,12 +19118,12 @@ msgstr ""
"Geeft één extra schild voor alle Oceaanvlakken in een stad. De stad moet aan "
"de kust liggen om deze verbetering te kunnen bouwen."
-#: data/default/buildings.ruleset:536 data/civ2/buildings.ruleset:510
+#: data/default/buildings.ruleset:535 data/civ2/buildings.ruleset:510
#: data/civ1/buildings.ruleset:411
msgid "Palace"
msgstr "Paleis"
-#: data/default/buildings.ruleset:552
+#: data/default/buildings.ruleset:551
#, no-c-format
msgid ""
"Makes a city the capital and the center of your government. Corruption in "
@@ -19000,11 +19151,11 @@ msgstr ""
"\n"
"Onder Despotisme geeft het paleis +75% op productie, onder Monarchie +50%."
-#: data/default/buildings.ruleset:569 data/civ2/buildings.ruleset:539
+#: data/default/buildings.ruleset:568 data/civ2/buildings.ruleset:539
msgid "Police Station"
msgstr "Politiebureau"
-#: data/default/buildings.ruleset:583 data/civ2/buildings.ruleset:553
+#: data/default/buildings.ruleset:582 data/civ2/buildings.ruleset:553
msgid ""
"Reduces the unhappiness caused by military units outside the city by 2 under "
"Democracy and 1 under Republic. This improvement has no effect under other "
@@ -19014,11 +19165,11 @@ msgstr ""
"wordt veroorzaakt met twee onder Democratie en met 1 onder een Republiek. "
"Deze verbetering heeft geen effect onder andere regeringsvormen."
-#: data/default/buildings.ruleset:593 data/civ2/buildings.ruleset:560
+#: data/default/buildings.ruleset:592 data/civ2/buildings.ruleset:560
msgid "Port Facility"
msgstr "Haven Faciliteiten"
-#: data/default/buildings.ruleset:608 data/civ2/buildings.ruleset:575
+#: data/default/buildings.ruleset:607 data/civ2/buildings.ruleset:575
msgid ""
"Allows a city to build veteran sea units. Also, damaged sea units which "
"stay in town for one full turn without moving are completely restored."
@@ -19027,12 +19178,12 @@ msgstr ""
"beschadigde zee-eenheden die een volle beurt zonder te bewegen in de stad "
"blijven in één enkele beurt volledig hersteld."
-#: data/default/buildings.ruleset:615 data/civ2/buildings.ruleset:582
+#: data/default/buildings.ruleset:614 data/civ2/buildings.ruleset:582
#: data/civ1/buildings.ruleset:440
msgid "Power Plant"
msgstr "Electriciteits Centrale"
-#: data/default/buildings.ruleset:631
+#: data/default/buildings.ruleset:630
#, no-c-format
msgid ""
"Increases the shield production of a Factory or Mfg. Plant in a city: a "
@@ -19050,12 +19201,12 @@ msgstr ""
"Een stad kan slechts één Waterkrachtcentrale of één Electriciteitscentrale "
"of één Kerncentrale bezitten."
-#: data/default/buildings.ruleset:646 data/civ2/buildings.ruleset:610
+#: data/default/buildings.ruleset:645 data/civ2/buildings.ruleset:610
#: data/civ1/buildings.ruleset:468
msgid "Recycling Center"
msgstr "Kringloopcentrum"
-#: data/default/buildings.ruleset:661 data/civ2/buildings.ruleset:625
+#: data/default/buildings.ruleset:660 data/civ2/buildings.ruleset:625
#: data/civ1/buildings.ruleset:483
#, no-c-format
msgid ""
@@ -19065,11 +19216,11 @@ msgstr ""
"Het bouwen van een Kringloopcentrum vermindert de hoeveelheid "
"verontreiniging die een stad maakt met 66%."
-#: data/default/buildings.ruleset:667 data/civ2/buildings.ruleset:631
+#: data/default/buildings.ruleset:666 data/civ2/buildings.ruleset:631
msgid "Research Lab"
msgstr "Onderzoeks Laboratorium"
-#: data/default/buildings.ruleset:682
+#: data/default/buildings.ruleset:681
msgid ""
"Together with a Library, a Research Lab increases the science production of "
"a city by 200%. Together with a Library and a University, a Research Lab "
@@ -19080,11 +19231,11 @@ msgstr ""
"Bibliotheek en een Universiteit wordt de wetenschappelijke opbrengst van een "
"stad met 450% verhoogt."
-#: data/default/buildings.ruleset:690 data/civ2/buildings.ruleset:654
+#: data/default/buildings.ruleset:689 data/civ2/buildings.ruleset:654
msgid "SAM Battery"
msgstr "SAM Batterij"
-#: data/default/buildings.ruleset:704 data/civ2/buildings.ruleset:668
+#: data/default/buildings.ruleset:703 data/civ2/buildings.ruleset:668
msgid ""
"Doubles the defense of all units inside the city when attacked by non-"
"nuclear air units."
@@ -19092,12 +19243,12 @@ msgstr ""
"Verdubbelt de verdedigingskracht van alle eenheden in een stad wanneer zij "
"worden aangevallen door niet-nucleaire eenheden."
-#: data/default/buildings.ruleset:710 data/civ2/buildings.ruleset:674
+#: data/default/buildings.ruleset:709 data/civ2/buildings.ruleset:674
#: data/civ1/buildings.ruleset:489
msgid "SDI Defense"
msgstr "SDI Verdediging"
-#: data/default/buildings.ruleset:724 data/civ2/buildings.ruleset:688
+#: data/default/buildings.ruleset:723 data/civ2/buildings.ruleset:688
#: data/civ1/buildings.ruleset:503
msgid ""
"Protects a city from attacks from Nuclear units. Nuclear attacks simply "
@@ -19108,11 +19259,11 @@ msgstr ""
"hebben domweg geen effect op de stad. Ook verdubbelt het de "
"verdedigingskracht tegen niet-nucleaire raketten."
-#: data/default/buildings.ruleset:733 data/civ2/buildings.ruleset:697
+#: data/default/buildings.ruleset:732 data/civ2/buildings.ruleset:697
msgid "Sewer System"
msgstr "Riolering"
-#: data/default/buildings.ruleset:748 data/civ2/buildings.ruleset:712
+#: data/default/buildings.ruleset:747 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."
@@ -19120,12 +19271,12 @@ msgstr ""
"Stelt een stad in staat om groter dan grootte 12 te groeien. Een Aquaduct is "
"eerst nodig om de stad groter dan grootte 8 te laten groeien."
-#: data/default/buildings.ruleset:754 data/civ2/buildings.ruleset:749
+#: data/default/buildings.ruleset:753 data/civ2/buildings.ruleset:749
#: data/civ1/buildings.ruleset:512
msgid "Space Component"
msgstr "Ruimtecomponent"
-#: data/default/buildings.ruleset:769 data/civ2/buildings.ruleset:763
+#: data/default/buildings.ruleset:768 data/civ2/buildings.ruleset:763
#: data/civ1/buildings.ruleset:526
msgid ""
"Space Components can be differentiated into Propulsion and Fuel Components. "
@@ -19142,12 +19293,12 @@ msgstr ""
"Voordat u ruimteschiponderdelen kunt bouwen moet het Apollo Programma wonder "
"door één van de spelers gebouwd zijn."
-#: data/default/buildings.ruleset:779 data/civ2/buildings.ruleset:773
+#: data/default/buildings.ruleset:778 data/civ2/buildings.ruleset:773
#: data/civ1/buildings.ruleset:536
msgid "Space Module"
msgstr "Ruimtemodule"
-#: data/default/buildings.ruleset:794 data/civ2/buildings.ruleset:787
+#: data/default/buildings.ruleset:793 data/civ2/buildings.ruleset:787
#: data/civ1/buildings.ruleset:550
msgid ""
"Space Modules are the most expensive parts of spaceships. There are three "
@@ -19178,12 +19329,12 @@ msgstr ""
"Voordat u ook maar een enkel onderdeel van uw ruimteschip kunt bouwen, moet "
"het Apollo Programma wonder door één van de spelers gebouwd zijn."
-#: data/default/buildings.ruleset:813 data/civ2/buildings.ruleset:806
+#: data/default/buildings.ruleset:812 data/civ2/buildings.ruleset:806
#: data/civ1/buildings.ruleset:569
msgid "Space Structural"
msgstr "Ruimtestruktuur"
-#: data/default/buildings.ruleset:828 data/civ2/buildings.ruleset:820
+#: data/default/buildings.ruleset:827 data/civ2/buildings.ruleset:820
#: data/civ1/buildings.ruleset:583
msgid ""
"Space Structurals form the base of your spaceship. All other spaceship "
@@ -19200,11 +19351,11 @@ msgstr ""
"Voordat u ook maar een enkel onderdeel van uw ruimteschip kunt bouwen, moet "
"het Apollo Programma wonder door één van de spelers gebouwd zijn."
-#: data/default/buildings.ruleset:838 data/civ2/buildings.ruleset:830
+#: data/default/buildings.ruleset:837 data/civ2/buildings.ruleset:830
msgid "Stock Exchange"
msgstr "Optiebeurs"
-#: data/default/buildings.ruleset:854 data/civ2/buildings.ruleset:846
+#: data/default/buildings.ruleset:853 data/civ2/buildings.ruleset:846
#, no-c-format
msgid ""
"Together with a Marketplace and a Bank, a Stock Exchange boosts tax and "
@@ -19213,22 +19364,22 @@ msgstr ""
"Samen met een Marktplein en een Bank vergroot de Optiebeurs de belastings- "
"en luxe-opbrengsten in een stad met 150%."
-#: data/default/buildings.ruleset:860 data/civ2/buildings.ruleset:852
+#: data/default/buildings.ruleset:859 data/civ2/buildings.ruleset:852
msgid "Super Highways"
msgstr "Snelwegen"
-#: data/default/buildings.ruleset:875 data/civ2/buildings.ruleset:867
+#: data/default/buildings.ruleset:874 data/civ2/buildings.ruleset:867
#, no-c-format
msgid ""
"Increases trade resources by 50% on all squares with roads or railroads."
msgstr ""
"Vergroot de handelsopbrengst met 50% op alle vlakken met wegen of spoorwegen."
-#: data/default/buildings.ruleset:883 data/civ2/buildings.ruleset:873
+#: data/default/buildings.ruleset:882 data/civ2/buildings.ruleset:873
msgid "Supermarket"
msgstr "Supermarkt"
-#: data/default/buildings.ruleset:898 data/civ2/buildings.ruleset:888
+#: data/default/buildings.ruleset:897 data/civ2/buildings.ruleset:888
#, no-c-format
msgid ""
"Increases the food resources by 50% on each farmland square which is being "
@@ -19238,12 +19389,12 @@ msgstr ""
"Vergroot de voedingsopbrengst met 50% op elk weilandvlak dat in gebruik is "
"rond de stad. Weilandvlakken zijn die vlakken die tweemaal geïrigeerd zijn."
-#: data/default/buildings.ruleset:905 data/civ2/buildings.ruleset:895
+#: data/default/buildings.ruleset:904 data/civ2/buildings.ruleset:895
#: data/civ1/buildings.ruleset:593
msgid "Temple"
msgstr "Tempel"
-#: data/default/buildings.ruleset:919 data/civ2/buildings.ruleset:909
+#: data/default/buildings.ruleset:918 data/civ2/buildings.ruleset:909
#: data/civ1/buildings.ruleset:607
msgid ""
"Makes one unhappy citizen content. Both the Mysticism advance and the "
@@ -19254,13 +19405,13 @@ msgstr ""
"werldwonder verdubbelen dit effect. Met zowel Mystiek als het Orakel worden "
"vier burgers tevreden."
-#: data/default/buildings.ruleset:926 data/civ2/buildings.ruleset:916
+#: data/default/buildings.ruleset:925 data/civ2/buildings.ruleset:916
#: data/civ1/buildings.ruleset:614 data/default/techs.ruleset:742
#: data/civ2/techs.ruleset:727 data/civ1/techs.ruleset:723
msgid "University"
msgstr "Universiteit"
-#: data/default/buildings.ruleset:942
+#: data/default/buildings.ruleset:941
#, no-c-format
msgid ""
"Together with a Library, a University increases the science production of a "
@@ -19269,12 +19420,12 @@ msgstr ""
"Samen met een Bibliotheek vergroot een Universiteit het wetenschappelijk "
"onderzoek van een stad met 250%."
-#: data/default/buildings.ruleset:948 data/civ2/buildings.ruleset:938
+#: data/default/buildings.ruleset:947 data/civ2/buildings.ruleset:938
#: data/civ1/buildings.ruleset:636
msgid "Apollo Program"
msgstr "Het Apollo Programma"
-#: data/default/buildings.ruleset:962 data/civ2/buildings.ruleset:952
+#: data/default/buildings.ruleset:961 data/civ2/buildings.ruleset:952
msgid ""
"Entire map becomes visible for the player who owns it. It allows all "
"players to start building spaceship parts (assuming they have researched the "
@@ -19285,11 +19436,11 @@ msgstr ""
"ruimteschepen (aangenomen dat zij alle benodigde technologieën verworven "
"hebben)."
-#: data/default/buildings.ruleset:969 data/civ2/buildings.ruleset:959
+#: data/default/buildings.ruleset:968 data/civ2/buildings.ruleset:959
msgid "A.Smith's Trading Co."
msgstr "De V.O.C."
-#: data/default/buildings.ruleset:983
+#: data/default/buildings.ruleset:982
msgid ""
"City improvements which would normally have an upkeep of 1 are free of "
"upkeep, for all your cities."
@@ -19297,12 +19448,12 @@ msgstr ""
"Stadsverbeteringen die normaal een onderhoud van 1 zouden hebben zijn vrij "
"van onderhoud voor alle steden."
-#: data/default/buildings.ruleset:989 data/civ2/buildings.ruleset:979
+#: data/default/buildings.ruleset:988 data/civ2/buildings.ruleset:979
#: data/civ1/buildings.ruleset:655
msgid "Colossus"
msgstr "De Colossus"
-#: data/default/buildings.ruleset:1003 data/civ2/buildings.ruleset:993
+#: data/default/buildings.ruleset:1002 data/civ2/buildings.ruleset:993
#: data/civ1/buildings.ruleset:669
msgid ""
"Each square around the city where this wonder is built that is already "
@@ -19311,12 +19462,12 @@ msgstr ""
"Elk vlak rond de stad waar dit wonder is gebouwd en die al enige handel "
"produceert krijgt een extra handelspunt."
-#: data/default/buildings.ruleset:1009 data/civ2/buildings.ruleset:999
+#: data/default/buildings.ruleset:1008 data/civ2/buildings.ruleset:999
#: data/civ1/buildings.ruleset:675
msgid "Copernicus' Observatory"
msgstr "Copernicus's Observatorium"
-#: data/default/buildings.ruleset:1024 data/civ2/buildings.ruleset:1180
+#: data/default/buildings.ruleset:1023 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."
@@ -19324,12 +19475,12 @@ msgstr ""
"Versterkt het wetenschappelijk onderzoek met 100% in de stad waar het "
"gebouwd is."
-#: data/default/buildings.ruleset:1029 data/civ2/buildings.ruleset:1019
+#: data/default/buildings.ruleset:1028 data/civ2/buildings.ruleset:1019
#: data/civ1/buildings.ruleset:695
msgid "Cure For Cancer"
msgstr "Genezing voor Kanker"
-#: data/default/buildings.ruleset:1043
+#: data/default/buildings.ruleset:1042
msgid ""
"This stunning technological achievement makes one unhappy citizen content in "
"all your cities."
@@ -19337,12 +19488,12 @@ msgstr ""
"Deze verbijsterende technologische prestatie maakt één ontevreden burger "
"tevreden in elke stad."
-#: data/default/buildings.ruleset:1051 data/civ2/buildings.ruleset:1039
+#: data/default/buildings.ruleset:1050 data/civ2/buildings.ruleset:1039
#: data/civ1/buildings.ruleset:715
msgid "Darwin's Voyage"
msgstr "Darwin's Reis"
-#: data/default/buildings.ruleset:1065 data/civ2/buildings.ruleset:1053
+#: data/default/buildings.ruleset:1064 data/civ2/buildings.ruleset:1053
#: data/civ1/buildings.ruleset:729
msgid ""
"Charles Darwin's voyage sparked the discovery of the evolution of the "
@@ -19353,11 +19504,11 @@ msgstr ""
"soorten, wat een groter vertrouwen in de wetenschap bewerkstelligde. Geeft "
"twee onmiddelijke technologische vooruitgangen."
-#: data/default/buildings.ruleset:1072 data/civ2/buildings.ruleset:1060
+#: data/default/buildings.ruleset:1071 data/civ2/buildings.ruleset:1060
msgid "Eiffel Tower"
msgstr "De Eiffeltoren"
-#: data/default/buildings.ruleset:1087
+#: data/default/buildings.ruleset:1086
#, fuzzy, no-c-format
msgid ""
"Your reputation and goodwill among other nations is recovered twice as fast."
@@ -19365,12 +19516,12 @@ msgstr ""
"Uw reputatie bij en de inschikkelijkheid van andere naties vergroot terwijl "
"u dit wonder hebt. Reputatieherstel gaat dubbel zo snel als normaal."
-#: data/default/buildings.ruleset:1093 data/civ2/buildings.ruleset:1081
+#: data/default/buildings.ruleset:1092 data/civ2/buildings.ruleset:1081
#: data/civ1/buildings.ruleset:736
msgid "Great Library"
msgstr "De Grote Bibliotheek"
-#: data/default/buildings.ruleset:1107 data/civ2/buildings.ruleset:1095
+#: data/default/buildings.ruleset:1106 data/civ2/buildings.ruleset:1095
#: data/civ1/buildings.ruleset:750
msgid ""
"The civilization which builds the Great Library gets every advance that at "
@@ -19379,21 +19530,21 @@ msgstr ""
"De beschaving die de Grote Bibliotheek bouwt krijgt elke vooruitgang die "
"tenminste twee andere beschavingen kregen."
-#: data/default/buildings.ruleset:1113 data/civ2/buildings.ruleset:1101
+#: data/default/buildings.ruleset:1112 data/civ2/buildings.ruleset:1101
#: data/civ1/buildings.ruleset:756
msgid "Great Wall"
msgstr "De Chinese Muur"
-#: data/default/buildings.ruleset:1127
+#: data/default/buildings.ruleset:1126
msgid "Works as a City Wall in all your cities."
msgstr "Werkt als Stadswallen in al uw steden."
-#: data/default/buildings.ruleset:1135 data/civ2/buildings.ruleset:1122
+#: data/default/buildings.ruleset:1134 data/civ2/buildings.ruleset:1122
#: data/civ1/buildings.ruleset:777
msgid "Hanging Gardens"
msgstr "De Hangende Tuinen"
-#: data/default/buildings.ruleset:1149 data/civ2/buildings.ruleset:1136
+#: data/default/buildings.ruleset:1148 data/civ2/buildings.ruleset:1136
#: data/civ1/buildings.ruleset:791
msgid ""
"Makes one content citizen happy in every city. Makes two extra content "
@@ -19408,12 +19559,12 @@ msgstr ""
"om het effect te voelen, geldt het wonder voor alle ontevreden burgers "
"(maakt ze in plaats daarvan tevreden)."
-#: data/default/buildings.ruleset:1158 data/civ2/buildings.ruleset:1145
+#: data/default/buildings.ruleset:1157 data/civ2/buildings.ruleset:1145
#: data/civ1/buildings.ruleset:800
msgid "Hoover Dam"
msgstr "De Hoover Dam"
-#: data/default/buildings.ruleset:1173 data/civ2/buildings.ruleset:1159
+#: data/default/buildings.ruleset:1172 data/civ2/buildings.ruleset:1159
msgid ""
"Works as if you had a Hydro Plant in every city. (This reduces pollution "
"and increases the effects of Factories and Mfg. Plants.)"
@@ -19421,12 +19572,12 @@ msgstr ""
"Werkt als een Waterkrachtcentrale in elke stad. (Dit vermindert de "
"verontreiniging en verhoogt het effect van Fabrieken en Assemblagehallen.)"
-#: data/default/buildings.ruleset:1179 data/civ2/buildings.ruleset:1165
+#: data/default/buildings.ruleset:1178 data/civ2/buildings.ruleset:1165
#: data/civ1/buildings.ruleset:822
msgid "Isaac Newton's College"
msgstr "Isaac Newton's School"
-#: data/default/buildings.ruleset:1194
+#: data/default/buildings.ruleset:1193
#, no-c-format
msgid ""
"Boosts science production by 100% in every city you control that has a "
@@ -19435,39 +19586,39 @@ msgstr ""
"Versterkt het wetenschappelijk onderzoek met 100% in al uw steden met "
"Universiteit."
-#: data/default/buildings.ruleset:1200 data/civ2/buildings.ruleset:1185
+#: data/default/buildings.ruleset:1199 data/civ2/buildings.ruleset:1185
#: data/civ1/buildings.ruleset:842
msgid "J.S. Bach's Cathedral"
msgstr "J.S. Bach's Kathedraal"
-#: data/default/buildings.ruleset:1214 data/civ2/buildings.ruleset:1199
+#: data/default/buildings.ruleset:1213 data/civ2/buildings.ruleset:1199
msgid "Makes two unhappy citizens content in every city."
msgstr "Maakt twee ontevreden burgers tevreden in elke stad."
-#: data/default/buildings.ruleset:1219 data/civ2/buildings.ruleset:1204
+#: data/default/buildings.ruleset:1218 data/civ2/buildings.ruleset:1204
msgid "King Richard's Crusade"
msgstr "Koning Richard's Kruistocht"
-#: data/default/buildings.ruleset:1233 data/civ2/buildings.ruleset:1218
+#: data/default/buildings.ruleset:1232 data/civ2/buildings.ruleset:1218
msgid ""
"Adds one extra shield resource on every square around the city where it is "
"built."
msgstr "Geeft een extra hulpbron op elk vlak rond de stad waar het gebouwd is."
-#: data/default/buildings.ruleset:1239 data/civ2/buildings.ruleset:1224
+#: data/default/buildings.ruleset:1238 data/civ2/buildings.ruleset:1224
msgid "Leonardo's Workshop"
msgstr "Leonardo's Werkplaats"
-#: data/default/buildings.ruleset:1253 data/civ2/buildings.ruleset:1238
+#: data/default/buildings.ruleset:1252 data/civ2/buildings.ruleset:1238
msgid "Upgrades one obsolete unit per game turn."
msgstr "Waardeert elke beurt een verouderde eenheid op."
-#: data/default/buildings.ruleset:1258 data/civ2/buildings.ruleset:1243
+#: data/default/buildings.ruleset:1257 data/civ2/buildings.ruleset:1243
#: data/civ1/buildings.ruleset:862
msgid "Lighthouse"
msgstr "De Vuurtoren"
-#: data/default/buildings.ruleset:1273
+#: data/default/buildings.ruleset:1272
msgid ""
"Gives all your sea units 1 additional movement point and eliminates the risk "
"of losing Triremes on the high seas. Makes all your new sea units veterans "
@@ -19477,34 +19628,34 @@ msgstr ""
"het verliezen van Triremen in de diepzee. Maakt alle nieuwe zee-eenheden "
"veteraan (voor alle steden)."
-#: data/default/buildings.ruleset:1280 data/civ2/buildings.ruleset:1264
+#: data/default/buildings.ruleset:1279 data/civ2/buildings.ruleset:1264
#: data/civ1/buildings.ruleset:885
msgid "Magellan's Expedition"
msgstr "Magellan's Expeditie"
-#: data/default/buildings.ruleset:1295
+#: data/default/buildings.ruleset:1294
msgid "Gives all your sea units 2 additional movement points."
msgstr "Geeft al uw zee-eenheden twee extra bewegingspunten."
-#: data/default/buildings.ruleset:1300 data/civ2/buildings.ruleset:1283
+#: data/default/buildings.ruleset:1299 data/civ2/buildings.ruleset:1283
#: data/civ1/buildings.ruleset:904
msgid "Manhattan Project"
msgstr "Het Manhattan Project"
-#: data/default/buildings.ruleset:1318 data/civ2/buildings.ruleset:1301
+#: data/default/buildings.ruleset:1317 data/civ2/buildings.ruleset:1301
msgid "Marco Polo's Embassy"
msgstr "Marco Polo's Ambassade"
-#: data/default/buildings.ruleset:1332 data/civ2/buildings.ruleset:1315
+#: data/default/buildings.ruleset:1331 data/civ2/buildings.ruleset:1315
msgid "The player who owns it gets an embassy with all players."
msgstr "De speler die dit bezit krijgt een ambassade bij alle spelers."
-#: data/default/buildings.ruleset:1337 data/civ2/buildings.ruleset:1320
+#: data/default/buildings.ruleset:1336 data/civ2/buildings.ruleset:1320
#: data/civ1/buildings.ruleset:922
msgid "Michelangelo's Chapel"
msgstr "Michelangelo's Kapel"
-#: data/default/buildings.ruleset:1351 data/civ2/buildings.ruleset:1334
+#: data/default/buildings.ruleset:1350 data/civ2/buildings.ruleset:1334
msgid ""
"Counts as having a Cathedral in each of your cities. This makes 3 unhappy "
"citizens content in each city. The discovery of Theology increases the "
@@ -19518,21 +19669,21 @@ msgstr ""
"maken. De ontdekking van het Communisme vermindert het effect van een "
"Kathedraal, er wordt dan één ontevreden burger minder tevreden."
-#: data/default/buildings.ruleset:1361 data/civ2/buildings.ruleset:1344
+#: data/default/buildings.ruleset:1360 data/civ2/buildings.ruleset:1344
#: data/civ1/buildings.ruleset:941
msgid "Oracle"
msgstr "Het Orakel"
-#: data/default/buildings.ruleset:1375
+#: data/default/buildings.ruleset:1374
msgid "Makes two of your unhappy citizens content in every city with a temple."
msgstr "Maakt twee ontevreden burgers tevreden in elke stad met een tempel."
-#: data/default/buildings.ruleset:1380 data/civ2/buildings.ruleset:1363
+#: data/default/buildings.ruleset:1379 data/civ2/buildings.ruleset:1363
#: data/civ1/buildings.ruleset:960
msgid "Pyramids"
msgstr "De Pyramiden"
-#: data/default/buildings.ruleset:1394
+#: data/default/buildings.ruleset:1393
msgid ""
"The amount of stored food lost when one of your cities grows or shrinks is "
"reduced by 25%. This helps a city to grow faster and more easily withstand "
@@ -19542,30 +19693,30 @@ msgstr ""
"vermindert met 25%. Dit helpt een stad om sneller en gemakkelijker te "
"groeien zonder angst voor hongersnood. Cumulatief met een Graanopslag"
-#: data/default/buildings.ruleset:1401 data/civ2/buildings.ruleset:1382
+#: data/default/buildings.ruleset:1400 data/civ2/buildings.ruleset:1382
#: data/civ1/buildings.ruleset:981
msgid "SETI Program"
msgstr "Het SETI Programma"
-#: data/default/buildings.ruleset:1415
+#: data/default/buildings.ruleset:1414
msgid "Boosts science production in each city with a Research Lab by 100%. "
msgstr "Versterkt de wetenschap in elke stad met een Onderzoekslabo met 100%."
-#: data/default/buildings.ruleset:1420 data/civ2/buildings.ruleset:1402
+#: data/default/buildings.ruleset:1419 data/civ2/buildings.ruleset:1402
#: data/civ1/buildings.ruleset:1001
msgid "Shakespeare's Theatre"
msgstr "Shakespeare's Theater"
-#: data/default/buildings.ruleset:1434 data/civ2/buildings.ruleset:1416
+#: data/default/buildings.ruleset:1433 data/civ2/buildings.ruleset:1416
#: data/civ1/buildings.ruleset:1015
msgid "Makes all unhappy citizens content, in the city where it is located."
msgstr "Maakt alle ontevreden burgers tevreden in de stad waar hij staat."
-#: data/default/buildings.ruleset:1439 data/civ2/buildings.ruleset:1421
+#: data/default/buildings.ruleset:1438 data/civ2/buildings.ruleset:1421
msgid "Statue of Liberty"
msgstr "Het Vrijheidsbeeld"
-#: data/default/buildings.ruleset:1453 data/civ2/buildings.ruleset:1435
+#: data/default/buildings.ruleset:1452 data/civ2/buildings.ruleset:1435
#: data/civ1/buildings.ruleset:974 data/civ1/buildings.ruleset:1034
msgid ""
"Allows you to choose any government, including those that have not yet been "
@@ -19575,11 +19726,11 @@ msgstr ""
"Staat u toe elke regeringsvorm te kiezen, inclusief degeen die u nog niet "
"onderzocht hebt en zonder de overgangsperiode van Anarchie."
-#: data/default/buildings.ruleset:1460 data/civ2/buildings.ruleset:1442
+#: data/default/buildings.ruleset:1459 data/civ2/buildings.ruleset:1442
msgid "Sun Tzu's War Academy"
msgstr "Sun Tzu's Militaire Academie"
-#: data/default/buildings.ruleset:1474
+#: data/default/buildings.ruleset:1473
msgid ""
"All your new ground units start at the first veteran level. The chance of a "
"unit getting the next veteran level after a battle increases by half."
@@ -19587,21 +19738,21 @@ msgstr ""
"Al uw nieuwe grond-eenheden worden 1ste niveau veteraan . De kans dat een "
"eenheid een veteraansniveau bijkrijgt na vechten wordt 50 %verhoogd."
-#: data/default/buildings.ruleset:1481 data/civ2/buildings.ruleset:1463
+#: data/default/buildings.ruleset:1480 data/civ2/buildings.ruleset:1463
#: data/civ1/buildings.ruleset:1020
msgid "United Nations"
msgstr "De Verenigde Naties"
-#: data/default/buildings.ruleset:1495
+#: data/default/buildings.ruleset:1494
msgid "All your units regain two extra hitpoints per turn."
msgstr "Al uw eenheden herstellen twee extra gevechtspunten per beurt."
-#: data/default/buildings.ruleset:1508 data/civ2/buildings.ruleset:1490
+#: data/default/buildings.ruleset:1507 data/civ2/buildings.ruleset:1490
#: data/civ1/buildings.ruleset:1046
msgid "Women's Suffrage"
msgstr "Vrouwen Kiesrecht"
-#: data/default/buildings.ruleset:1522 data/civ2/buildings.ruleset:1504
+#: data/default/buildings.ruleset:1521 data/civ2/buildings.ruleset:1504
msgid ""
"Counts as a Police Station in every city. (That is, for each city, reduces "
"unhappiness for military units outside the city by 2 under Democracy and 1 "
@@ -19612,11 +19763,11 @@ msgstr ""
"afneemt, en onder Republiek met 1. Dit wonder heeft geen effect onder andere "
"regeringsvormen.)"
-#: data/default/buildings.ruleset:1533
+#: data/default/buildings.ruleset:1532
msgid "Coinage"
msgstr "Munten"
-#: data/default/buildings.ruleset:1554
+#: data/default/buildings.ruleset:1553
msgid ""
"This is not a normal improvement. Instead, setting a city's production to "
"Coinage means its shield production is converted to tax output (money, "
@@ -20060,11 +20211,16 @@ msgstr "?citystyle:Keltisch"
msgid "?citystyle:Industrial"
msgstr "?citystyle:Industrieel"
-#: data/default/cities.ruleset:139 data/civ2/cities.ruleset:150
+#: data/default/cities.ruleset:139
+#, fuzzy
+msgid "?citystyle:ElectricAge"
+msgstr "?citystyle:Keltisch"
+
+#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:150
msgid "?citystyle:Modern"
msgstr "?citystyle:Modern"
-#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:161
+#: data/default/cities.ruleset:161 data/civ2/cities.ruleset:161
msgid "?citystyle:PostModern"
msgstr "?citystyle:Postmodern"
@@ -25542,6 +25698,48 @@ msgstr "Team 30"
msgid "Team 31"
msgstr "Team 31"
+#~ msgid "Command access level could not be set to '%s' for connection %s."
+#~ msgstr ""
+#~ "Opdrachttoegangsniveau kon niet op '%s' gezet worden voor verbinding '%s'."
+
+#~ msgid "Observers cannot vote."
+#~ msgstr "Waarnemers kunnen niet stemmen."
+
+#~ msgid ""
+#~ "You can only vote in a running game. Use 'first' to become the game "
+#~ "organizer if there currently is none."
+#~ msgstr ""
+#~ "Je kan alleen stemmen in een draaiend spel. Gebruik 'first' om spelleider "
+#~ "te worden als er nu geen is."
+
+#~ msgid "Vote %d \"%s\": %d for, %d against"
+#~ msgstr "Stemming %d \"%s\": %d voor, %d tegen"
+
+#~ msgid "Value must be integer."
+#~ msgstr "Waarde moet een geheel getal zijn."
+
+#~ 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 Hydro Plant, Power Plant, or Nuclear Plant. A "
+#~ "city can only build a Hydro Plant if it is next to (or on) a Mountain or "
+#~ "River tile."
+#~ msgstr ""
+#~ "Vermindert de hoeveelheid verontreiniging die een stad maakt met 50%. Het "
+#~ "verhoogt ook de schild-productie van een Fabriek of Assemblagehal in de "
+#~ "stad: een Fabriek en een Waterkrachtcentrale samen geven een bonus van "
+#~ "75% en een Fabriek, Assemblage Hal en een Waterkrachtcentrale samen geven "
+#~ "een bonus van 150%.\n"
+#~ "\n"
+#~ "Een stad kan slechts één Waterkrachtcentrale of één "
+#~ "Electriciteitscentrale of één Kerncentrale bezitten. Een stad kan alleen "
+#~ "een Waterkrachtcentrale bouwen als het op of naast een Berg- of "
+#~ "Riviervlak ligt."
+
#, fuzzy
#~ msgid "Auth config filename \"%s\" not allowed!"
#~ msgstr "Die naam is niet toegelaten"
diff --git a/po/no.gmo b/po/no.gmo
index d107fe5..c15b0c5 100644
Binary files a/po/no.gmo and b/po/no.gmo differ
diff --git a/po/no.po b/po/no.po
index 9c53b5b..fb3295d 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: 2009-03-29 21:13+0900\n"
+"POT-Creation-Date: 2009-11-22 21:37+0100\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"
@@ -77,21 +77,21 @@ msgid "?redundant:*"
msgstr "?redundant:*"
# problem
-#: common/connection.c:515
+#: common/connection.c:518
#, c-format
msgid "%s from %s"
msgstr "%s fra %s"
-#: common/connection.c:521
+#: common/connection.c:524
msgid " (connection incomplete)"
msgstr " (forbindelse ikke opprettet)"
-#: common/connection.c:525
+#: common/connection.c:528
#, c-format
msgid " (player %s)"
msgstr " (spiller %s)"
-#: common/connection.c:529
+#: common/connection.c:532
msgid " (observer)"
msgstr " (observatør)"
@@ -504,82 +504,82 @@ msgstr "Tilkobling under opprettelse."
msgid "AI Debug messages"
msgstr ""
-#: common/player.c:732
+#: common/player.c:746
msgid "?attitude:Genocidal"
msgstr "Folkemorder"
-#: common/player.c:734
+#: common/player.c:748
msgid "?attitude:Belligerent"
msgstr "Ekstremt fiendtlig"
-#: common/player.c:736
+#: common/player.c:750
msgid "?attitude:Hostile"
msgstr "Fiendtlig"
-#: common/player.c:738
+#: common/player.c:752
msgid "?attitude:Uncooperative"
msgstr "Lite samarbeidsvillig"
-#: common/player.c:740
+#: common/player.c:754
msgid "?attitude:Uneasy"
msgstr "Vanskelig"
-#: common/player.c:742
+#: common/player.c:756
msgid "?attitude:Neutral"
msgstr "Nøytral"
-#: common/player.c:744
+#: common/player.c:758
msgid "?attitude:Respectful"
msgstr "Respektfull"
-#: common/player.c:746
+#: common/player.c:760
msgid "?attitude:Helpful"
msgstr "Hjelpsom"
-#: common/player.c:748
+#: common/player.c:762
msgid "?attitude:Enthusiastic"
msgstr "Entusiastisk"
-#: common/player.c:750
+#: common/player.c:764
msgid "?attitude:Admiring"
msgstr "Beundrende"
-#: common/player.c:753
+#: common/player.c:767
msgid "?attitude:Worshipful"
msgstr "Bønnfallende"
-#: common/player.c:764
+#: common/player.c:778
#, fuzzy
msgid "?diplomatic_state:Armistice"
msgstr "?diplomatic_state:Allianse"
-#: common/player.c:765
+#: common/player.c:779
msgid "?diplomatic_state:War"
msgstr "?diplomatic_state:Krig"
-#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:780 client/gui-gtk-2.0/diplodlg.c:353
#: 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:767 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:781 client/gui-gtk-2.0/diplodlg.c:358
#: 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:768 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:782 client/gui-gtk-2.0/diplodlg.c:363
#: 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:769
+#: common/player.c:783
msgid "?diplomatic_state:Never met"
msgstr "?diplomatic_state:Aldri møtt"
-#: common/player.c:770
+#: common/player.c:784
msgid "?diplomatic_state:Team"
msgstr "?diplomatic_state:Lag"
@@ -610,7 +610,7 @@ msgstr "Effekter som gjelder overlevelse er kun st
#. TRANS: "Resources: (none)".
#: common/requirements.c:1014 common/team.c:132
#: client/gui-gtk-2.0/helpdlg.c:1055 client/gui-gtk-2.0/inteldlg.c:390
-#: client/gui-win32/helpdlg.c:586 client/gui-xaw/helpdlg.c:991
+#: client/gui-win32/helpdlg.c:592 client/gui-xaw/helpdlg.c:991
#, fuzzy, c-format
msgid "(none)"
msgstr "ingen"
@@ -636,10 +636,11 @@ msgstr "Forsker p
#: 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
#: client/gui-sdl/helpdlg.c:817 client/gui-sdl/mapview.c:962
-#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:545
-#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:735
-#: 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
+#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:544
+#: client/gui-win32/helpdlg.c:551 client/gui-win32/helpdlg.c:721
+#: client/gui-win32/helpdlg.c:741 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 "Ingen"
@@ -653,30 +654,30 @@ msgstr "Forsker p
msgid "(Unknown)"
msgstr "(Ukjent)"
-#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:553
#: manual/civmanual.c:224
msgid "Road"
msgstr "Vei"
# irrigert er tillatt på norsk, men skulle gjerne hatt et bedre ord
-#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:557
#: client/gui-gtk-2.0/menu.c:829 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:394 common/terrain.c:572 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:567
#: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
#: data/civ1/techs.ruleset:563
msgid "Railroad"
msgstr "Jernbane"
-#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:555
msgid "Mine"
msgstr "Gruve"
-#: common/terrain.c:396 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:551 server/report.c:124
#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "Forurensning"
@@ -685,7 +686,7 @@ msgstr "Forurensning"
msgid "Hut"
msgstr "Hytte"
-#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:563
#: manual/civmanual.c:226
msgid "Fortress"
msgstr "Festning"
@@ -698,58 +699,58 @@ msgstr "Elv"
msgid "Farmland"
msgstr "Dyrket land"
-#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:577
#: manual/civmanual.c:226
msgid "Airbase"
msgstr "Flystripe"
-#: common/terrain.c:402 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:579
msgid "Fallout"
msgstr "Atomavfall"
-#: common/unit.c:546 client/gui-win32/plrdlg.c:337
+#: common/unit.c:549 client/gui-win32/plrdlg.c:337
msgid "Idle"
msgstr "Stille"
-#: common/unit.c:556
+#: common/unit.c:559
msgid "Fortifying"
msgstr "Befester posisjon"
-#: common/unit.c:558
+#: common/unit.c:561
msgid "Fortified"
msgstr "Befestet"
-#: common/unit.c:562 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
+#: common/unit.c:565 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
msgid "Sentry"
msgstr "Hold stand"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
+#: common/unit.c:569 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
#: client/gui-win32/menu.c:370 client/gui-xaw/menu.c:185
msgid "Pillage"
msgstr "Plyndre"
-#: common/unit.c:568 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
+#: common/unit.c:571 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
msgid "Goto"
msgstr "Gå til"
-#: common/unit.c:570
+#: common/unit.c:573
msgid "Explore"
msgstr "Utforske"
-#: common/unit.c:572 manual/civmanual.c:224
+#: common/unit.c:575 manual/civmanual.c:224
msgid "Transform"
msgstr "Endre"
-#: common/unit.c:584 client/text.c:157 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:587 client/text.c:157 client/gui-sdl/citydlg.c:1972
#: client/gui-win32/citydlg.c:1257 client/gui-xaw/citydlg.c:1423
msgid "Unknown"
msgstr "Ukjent"
-#: common/unit.c:1022
+#: common/unit.c:1025
msgid "Moves"
msgstr "Flytt"
-#: common/unit.c:1571
+#: common/unit.c:1574
#, c-format
msgid ""
"Upgrade %s to %s for %d gold?\n"
@@ -758,12 +759,12 @@ msgstr ""
"Oppgrader %s til %s for %d gull?\n"
"Skattkammeret har %d gull."
-#: common/unit.c:1579
+#: common/unit.c:1582
#, c-format
msgid "Sorry, cannot upgrade %s (yet)."
msgstr "Beklager, kan ikke oppgradere %s (enda)."
-#: common/unit.c:1585
+#: common/unit.c:1588
#, c-format
msgid ""
"Upgrading %s to %s costs %d gold.\n"
@@ -772,11 +773,11 @@ msgstr ""
"Å oppgradere %s til %s koster %d gull.\n"
"Skattkammeret har %d gold."
-#: common/unit.c:1594
+#: common/unit.c:1597
msgid "You can only upgrade units in your cities."
msgstr "Du kan kun oppgradere enheter i dine byer."
-#: common/unit.c:1598
+#: common/unit.c:1601
#, c-format
msgid "Upgrading this %s would strand units it transports."
msgstr "Oppgradering av %s vil landsette enheter den transporterer."
@@ -813,11 +814,11 @@ msgstr "Atombombe"
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1404
+#: common/unittype.c:349 client/helpdata.c:1412
msgid " and "
msgstr " og "
-#: common/unittype.c:355 client/helpdata.c:1390
+#: common/unittype.c:355 client/helpdata.c:1398
msgid "?and:, "
msgstr "?og:, "
@@ -987,69 +988,69 @@ msgstr "Mangler argument for \"%s\".\n"
msgid "Missing argument for \"%s\".\n"
msgstr "Mangler argument for \"%s\".\n"
-#: utility/shared.c:501
+#: utility/shared.c:514
#, c-format
msgid "%d BC"
msgstr "%d f.Kr"
-#: utility/shared.c:503
+#: utility/shared.c:516
#, c-format
msgid "%d AD"
msgstr "%d e.Kr"
-#: utility/shared.c:924
+#: utility/shared.c:937
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:1028
+#: utility/shared.c:1041
#, c-format
msgid "Could not read data directory %s: %s."
msgstr "Klarte ikke å lese fra datakatalogen %s: %s."
-#: utility/shared.c:1279
+#: utility/shared.c:1292
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:1281
+#: utility/shared.c:1294
#, c-format
msgid "Current data path is: \"%s\""
msgstr "Nåværende datasti er: \"%s\""
-#: utility/shared.c:1283
+#: utility/shared.c:1296
#, c-format
msgid "The \"%s\" file is required ... aborting!"
msgstr "Den nødvendige filen \"%s\" mangler... avslutter!"
-#: utility/shared.c:1460
+#: utility/shared.c:1485
#, 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:1462
+#: utility/shared.c:1487
msgid "Use a non-privileged account instead.\n"
msgstr "Bruk en ikke-priviligert konto istedet.\n"
-#: utility/shared.c:1478
+#: utility/shared.c:1503
msgid "exact match"
msgstr "eksakt treff"
-#: utility/shared.c:1479
+#: utility/shared.c:1504
msgid "only match"
msgstr "eneste treff"
-#: utility/shared.c:1480
+#: utility/shared.c:1505
msgid "ambiguous"
msgstr "uklar"
-#: utility/shared.c:1481
+#: utility/shared.c:1506
msgid "empty"
msgstr "tom"
-#: utility/shared.c:1482
+#: utility/shared.c:1507
msgid "too long"
msgstr "for lang"
-#: utility/shared.c:1483
+#: utility/shared.c:1508
msgid "non-match"
msgstr "ikke treff"
@@ -1078,91 +1079,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:280
+#: ai/advdiplomacy.c:300
#, 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:290
+#: ai/advdiplomacy.c:310
#, 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:303
+#: ai/advdiplomacy.c:322
#, 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:308
+#: ai/advdiplomacy.c:327
#, 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:331
+#: ai/advdiplomacy.c:350
#, 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:424
+#: ai/advdiplomacy.c:443
#, c-format
msgid "*%s (AI)* I do not know the city you mention."
msgstr ""
-#: ai/advdiplomacy.c:454
+#: ai/advdiplomacy.c:473
#, 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:560
+#: ai/advdiplomacy.c:579
#, c-format
msgid "*%s (AI)* This deal was not very good for us, %s!"
msgstr ""
-#: ai/advdiplomacy.c:582
+#: ai/advdiplomacy.c:601
#, c-format
msgid "*%s (AI)* Welcome into our alliance %s!"
msgstr "*%s (AI)* Velkommen til vår allianse %s!"
-#: ai/advdiplomacy.c:586
+#: ai/advdiplomacy.c:605
#, 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:593
+#: ai/advdiplomacy.c:612
#, c-format
msgid "*%s (AI)* Yes, peace in our time!"
msgstr "*%s (AI)* Ja, fred i vår tid!"
-#: ai/advdiplomacy.c:598
+#: ai/advdiplomacy.c:617
#, fuzzy, c-format
msgid "*%s (AI)* Agreed. No more hostilities, %s."
msgstr "*%s (AI)* Avtale. Ingen flere fiendtligheter, %s"
-#: ai/advdiplomacy.c:813
+#: ai/advdiplomacy.c:832
#, c-format
msgid ""
"*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
"other better?"
msgstr ""
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1116
#, fuzzy, c-format
msgid "*%s (AI)* Space will never be yours. "
msgstr "*%s (AI)* Ja, fred i vår tid!"
-#: ai/advdiplomacy.c:1102
+#: ai/advdiplomacy.c:1121
#, c-format
msgid "*%s (AI)* I have tolerated your vicious antics long enough! To war!"
msgstr ""
-#: ai/advdiplomacy.c:1108
+#: ai/advdiplomacy.c:1127
#, fuzzy, c-format
msgid "*%s (AI)* Peace in ... some other time."
msgstr "*%s (AI)* Fred i .... en annen gang"
-#: ai/advdiplomacy.c:1113
+#: ai/advdiplomacy.c:1132
#, c-format
msgid ""
"*%s (AI)* Finally I get around to you! Did you really think you could get "
@@ -1171,17 +1172,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:1119
+#: ai/advdiplomacy.c:1138
#, c-format
msgid "*%s (AI)* Your covert hostilities brought this war upon you!"
msgstr ""
-#: ai/advdiplomacy.c:1126
+#: ai/advdiplomacy.c:1145
#, 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:1209
+#: ai/advdiplomacy.c:1229
#, c-format
msgid ""
"*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1192,14 +1193,14 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1219
+#: ai/advdiplomacy.c:1239
#, c-format
msgid ""
"*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
"alliance!"
msgstr ""
-#: ai/advdiplomacy.c:1225
+#: ai/advdiplomacy.c:1245
#, c-format
msgid ""
"*%s (AI)* %s has grossly violated his treaties with us for own gain. We "
@@ -1212,7 +1213,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1238
+#: ai/advdiplomacy.c:1258
#, c-format
msgid ""
"*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1223,13 +1224,13 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1246
+#: ai/advdiplomacy.c:1266
#, c-format
msgid ""
"*%s (AI)* If you want a piece of the loot, feel free to join in the action!"
msgstr ""
-#: ai/advdiplomacy.c:1251
+#: ai/advdiplomacy.c:1271
#, c-format
msgid ""
"*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1240,12 +1241,12 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1261
+#: ai/advdiplomacy.c:1281
#, c-format
msgid "*%s (AI)* As our glorious allies, we expect your help in this war."
msgstr ""
-#: ai/advdiplomacy.c:1267
+#: ai/advdiplomacy.c:1287
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance and declare war on %s in %d turn. "
@@ -1256,7 +1257,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1276
+#: ai/advdiplomacy.c:1296
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1267,7 +1268,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1344
+#: ai/advdiplomacy.c:1364
#, c-format
msgid ""
"*%s (AI)* Your attempt to conquer space for yourself alone betray your true "
@@ -1276,7 +1277,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:1359
+#: ai/advdiplomacy.c:1379
#, c-format
msgid ""
"*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
@@ -1284,7 +1285,7 @@ msgid ""
msgstr ""
"*%s (AI)* Ditt forsøk på å alene dominere verdensrommet er meget truende."
-#: ai/advdiplomacy.c:1362
+#: ai/advdiplomacy.c:1382
#, c-format
msgid ""
"*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
@@ -1293,12 +1294,12 @@ msgstr ""
"*%s (AI)* Dersom du ikke slutter å bygge ditt romskip, kan jeg måtte ta "
"aksjon!"
-#: ai/advdiplomacy.c:1474
+#: ai/advdiplomacy.c:1494
#, 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:1549
+#: ai/advdiplomacy.c:1569
#, fuzzy, c-format
msgid ""
"*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
@@ -1307,7 +1308,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:1555
+#: ai/advdiplomacy.c:1575
#, c-format
msgid ""
"*%s (AI)* Greetings ally, I see you have not yet made war with our enemy, %"
@@ -1316,7 +1317,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:1562
+#: ai/advdiplomacy.c:1582
#, fuzzy, c-format
msgid ""
"*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1327,19 +1328,19 @@ msgstr ""
"fredsavtalen med vår fiende, %s! Dette er uakseptabelt, derfor oppløser jeg "
"vår allianse!"
-#: ai/advdiplomacy.c:1592
+#: ai/advdiplomacy.c:1612
#, 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:1607
+#: ai/advdiplomacy.c:1627
#, 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:1622
+#: ai/advdiplomacy.c:1642
#, fuzzy, c-format
msgid ""
"*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
@@ -1347,7 +1348,7 @@ msgid ""
msgstr ""
"*%s (AI)* %s truer oss begge, skal vi foreslå at fiendtlighetene opphører?"
-#: ai/advdiplomacy.c:1742
+#: ai/advdiplomacy.c:1762
#, c-format
msgid ""
"*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1497,18 +1498,18 @@ msgstr ""
"Passordet må ha minst %d store bokstaver, %d tall, og være minst %d "
"[skrivbare] bokstaver langt. Prøv igjen."
-#: server/barbarian.c:183
+#: server/barbarian.c:184
#, fuzzy, c-format
msgid "%s gain a leader by the name %s. Dangerous times may lie ahead."
msgstr ""
"Barbarene får en leder med navnet %s. Det kan bli farlige tider fremover."
-#: server/barbarian.c:479
+#: server/barbarian.c:480
#, c-format
msgid "Native unrest near %s led by %s."
msgstr "Uroligheter nær %s, ledet av %s."
-#: server/barbarian.c:484
+#: server/barbarian.c:485
#, c-format
msgid "Sea raiders seen near %s!"
msgstr "Pirater sett nær %s!"
@@ -1890,7 +1891,7 @@ msgstr[0] ""
msgstr[1] ""
"%s gir kjempeøkning av forskningen; du får %d umiddelbare fremskritt."
-#: server/cityturn.c:1158 server/techtools.c:176
+#: server/cityturn.c:1158 server/techtools.c:172
#, c-format
msgid "The %s have acquired %s from %s."
msgstr "%s har skaffet %s fra %s."
@@ -1973,22 +1974,22 @@ msgid "Warning: the %s option is obsolete. Use -m to enable the metaserver.\n"
msgstr ""
"Advarsel: alternativet %s er foreldet. Bruk -m for å benytte metaserveren.\n"
-#: server/civserver.c:189
+#: server/civserver.c:193
#, c-format
msgid "Error: unknown option '%s'\n"
msgstr "Feil: ukjent alternativ '%s'\n"
-#: server/civserver.c:200
+#: server/civserver.c:204
#, c-format
msgid "This is the server for %s"
msgstr "Dette er tjeneren for %s"
-#: server/civserver.c:201
+#: server/civserver.c:205
#, c-format
msgid "You can learn a lot about Freeciv at %s"
msgstr "Mer informasjon om Freeciv finnes på %s"
-#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
+#: server/civserver.c:210 client/civclient.c:239 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -1997,111 +1998,116 @@ msgstr ""
"Bruk: %s [alternativ ...]\n"
"Gyldige alternativ er:\n"
-#: server/civserver.c:208
+#: server/civserver.c:212
#, fuzzy
msgid ""
" -a --auth FILE\tEnable server authentication with configuration from "
"FILE.\n"
msgstr " -a --auth\t\tBenytte tjenerautentisering.\n"
-#: server/civserver.c:210
+#: server/civserver.c:214
msgid " -G --Guests\t\tAllow guests to login if auth is enabled.\n"
msgstr ""
" -G --Guests\t\tTillate gjester å logge inn hvis autentisering blir "
"brukt.\n"
-#: server/civserver.c:212
+#: server/civserver.c:216
msgid " -N --Newusers\tAllow new users to login if auth is enabled.\n"
msgstr ""
" -N --Newusers\tTillate nye brukere å logge inn hvis autentisering blir "
"brukt.\n"
-#: server/civserver.c:215
+#: server/civserver.c:219
msgid " -b --bind ADDR\tListen for clients on ADDR\n"
msgstr " -b --bind ADDR\tLytte etter klienter på ADDR\n"
-#: server/civserver.c:217 client/civclient.c:242
+#: server/civserver.c:221 client/civclient.c:243
msgid ""
" -d, --debug NUM\tSet debug log level (0 to 4, or 4:file1,min,max:...)\n"
msgstr ""
" -d, --debug NUM\tSett debuggings-loggnivå (0-4, eller 4:fil1,min,max:...)\n"
-#: server/civserver.c:221 client/civclient.c:246
+#: server/civserver.c:225 client/civclient.c:247
msgid " -d, --debug NUM\tSet debug log level (0 to 3)\n"
msgstr " -d, --debug NUM\tSett debug-loggnivå (0 til 3)\n"
-#: server/civserver.c:223
+#: server/civserver.c:227
msgid " -f, --file FILE\tLoad saved game FILE\n"
msgstr " -f, --file FILE\tLast inn lagret spill FILE\n"
-#: server/civserver.c:225 client/civclient.c:249 manual/civmanual.c:382
+#: server/civserver.c:229 client/civclient.c:250 manual/civmanual.c:382
msgid " -h, --help\t\tPrint a summary of the options\n"
msgstr " -h, --help\t\tSkriv ut sammendrag av alternativene\n"
-#: server/civserver.c:226
+#: server/civserver.c:230
+#, fuzzy
+msgid " -i, --identity ADDR\tBe known as ADDR at metaserver\n"
+msgstr " -M, --Metaserver ADDR Sett adressen for Metaserveren.\n"
+
+#: server/civserver.c:231
msgid " -l, --log FILE\tUse FILE as logfile\n"
msgstr " -l, --log FILE\tBruk FILE som loggfil.\n"
-#: server/civserver.c:227
+#: server/civserver.c:232
msgid " -m, --meta\t\tNotify metaserver and send server's info\n"
msgstr " -m, --meta\t\tInformer metaserveren og send tjenerens info\n"
-#: server/civserver.c:229
+#: server/civserver.c:234
msgid " -M, --Metaserver ADDR\tSet ADDR as metaserver address\n"
msgstr " -M, --Metaserver ADDR Sett adressen for Metaserveren.\n"
-#: server/civserver.c:232
+#: server/civserver.c:237
msgid " -p, --port PORT\tListen for clients on port PORT\n"
msgstr " -p, --port PORT\tKoble til PORT.\n"
-#: server/civserver.c:234
+#: server/civserver.c:239
msgid " -q, --quitidle TIME\tQuit if no players for TIME seconds\n"
msgstr ""
" -q, --quitidle TIME Avslutt hvis ingen spillere innen TIME sekunder\n"
-#: server/civserver.c:236
+#: server/civserver.c:241
msgid " -e, --exit-on-end\tWhen a game ends, exit instead of restarting\n"
msgstr ""
" -e, --exit-on-end\tAvslutte spillet i stedet for å starte det på nytt når "
"spillet er over.\n"
-#: server/civserver.c:239
+#: server/civserver.c:244
msgid " -s, --saves DIR\tSave games to directory DIR\n"
msgstr " -s, --saves DIR\tLagre spill til katalogen DIR\n"
-#: server/civserver.c:241
+#: server/civserver.c:246
msgid " -S, --Serverid ID\tSets the server id to ID\n"
msgstr " -S, --Serverid ID\tSetter tjenerens id til ID\n"
-#: server/civserver.c:243
+#: server/civserver.c:248
msgid " -P, --Ppm\t\tSave ppms of the map when saving the game.\n"
msgstr ""
-#: server/civserver.c:244
+#: server/civserver.c:249
msgid " -r, --read FILE\tRead startup script FILE\n"
msgstr " -r, --read FILE\tLes oppstartsmanus i FILE\n"
-#: server/civserver.c:246
+#: server/civserver.c:251
#, fuzzy
msgid " -R, --Ranklog FILE\tUse FILE as ranking logfile\n"
msgstr " -l, --log FILE\tBruk FILE som loggfil.\n"
-#: server/civserver.c:247 client/civclient.c:268 manual/civmanual.c:383
+#: server/civserver.c:252 client/civclient.c:269 manual/civmanual.c:383
msgid " -v, --version\t\tPrint the version number\n"
msgstr " -v, --version\t\tSkriv ut versjonsnummeret\n"
-#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
+#: server/civserver.c:253 client/gui-gtk-2.0/gui_main.c:354
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, fuzzy, c-format
msgid "Report bugs at %s.\n"
msgstr "Rapporter feil, unoter og/eller 'bugs' til <%s>.\n"
-#: server/commands.c:28
+#: server/commands.c:29
msgid "Start the game, or restart after loading a savegame."
msgstr "Start spillet, eller start på nytt etter å ha lastet inn lagret spill."
-#: server/commands.c:29
+#: server/commands.c:30
msgid ""
"This command starts the game. When starting a new game, it should be used "
"after all human players have connected, and AI players have been created (if "
@@ -2119,7 +2125,7 @@ msgstr ""
"lenger tilgjengelig."
#. TRANS: translate text between <> only
-#: server/commands.c:42
+#: server/commands.c:44
msgid ""
"help\n"
"help commands\n"
@@ -2133,11 +2139,11 @@ msgstr ""
"help <kommandonavn>\n"
"help <alternativsnavn>"
-#: server/commands.c:47
+#: server/commands.c:49
msgid "Show help about server commands and server options."
msgstr "Vis hjelp for tjenerkommandoer og tjeneralternativ."
-#: server/commands.c:48
+#: server/commands.c:50
msgid ""
"With no arguments gives some introductory help. With argument \"commands\" "
"or \"options\" gives respectively a list of all commands or all options. "
@@ -2154,12 +2160,12 @@ msgstr ""
"standardverdien. Forkortelser for argument kan benyttes dersom det ikke er "
"tvetydig."
-#: server/commands.c:63
+#: server/commands.c:66
#, fuzzy
msgid "Show a list of players, teams, connections, or scenarios."
msgstr "Vis en liste over spillerne eller forbindelsene."
-#: server/commands.c:64
+#: server/commands.c:67
#, fuzzy
msgid ""
"Show a list of players in the game, teams of players, connections to the "
@@ -2169,20 +2175,20 @@ msgstr ""
"Viser en liste over spillere, eller en liste over forbindelser til tjeneren. "
"Argumentet kan forkortes, og er \"players\" som standard dersom det mangler."
-#: server/commands.c:70
+#: server/commands.c:74
msgid "Quit the game and shutdown the server."
msgstr "Forlat spillet og avslutt tjeneren."
#. TRANS: translate text between <> only
-#: server/commands.c:74
+#: server/commands.c:79
msgid "cut <connection-name>"
msgstr "cut <forbindelsesnavn>"
-#: server/commands.c:75
+#: server/commands.c:80
msgid "Cut a client's connection to server."
msgstr "Avbryt en klients forbindelse til tjeneren."
-#: server/commands.c:76
+#: server/commands.c:81
msgid ""
"Cut specified client's connection to the server, removing that client from "
"the game. If the game has not yet started that client's player is removed "
@@ -2195,7 +2201,7 @@ msgstr ""
"imot forbindelsesnavn, ikke spillernavn."
#. TRANS: translate text between <> only
-#: server/commands.c:83
+#: server/commands.c:89
msgid ""
"explain\n"
"explain <option-name>"
@@ -2203,11 +2209,11 @@ msgstr ""
"explain\n"
"explain <alternativ-navn>"
-#: server/commands.c:85
+#: server/commands.c:91
msgid "Explain server options."
msgstr "Forklar tjeneralternativ."
-#: server/commands.c:86
+#: server/commands.c:92
msgid ""
"The 'explain' command gives a subset of the functionality of 'help', and is "
"included for backward compatibility. With no arguments it gives a list of "
@@ -2220,7 +2226,7 @@ msgstr ""
"en valgmulighet (som \"help <alternativsnavn>\")."
#. TRANS: translate text between <> only
-#: server/commands.c:93
+#: server/commands.c:100
msgid ""
"show\n"
"show <option-name>\n"
@@ -2230,11 +2236,11 @@ msgstr ""
"show <alternativsnavn>\n"
"show <alternativsprefiks>"
-#: server/commands.c:96
+#: server/commands.c:103
msgid "Show server options."
msgstr "Vis tjeneralternativ."
-#: server/commands.c:97
+#: server/commands.c:104
msgid ""
"With no arguments, shows all server options (or available options, when used "
"by clients). With an argument, show only the named option, or options with "
@@ -2244,36 +2250,37 @@ msgstr ""
"alternativene, når den er benyttet av klientene). Med et argument, vises kun "
"de valgte alternativene, eller alternativ med det prefikset."
-#: server/commands.c:102
+#: server/commands.c:110
msgid "wall <message>"
msgstr "wall <beskjed>"
-#: server/commands.c:103
+#: server/commands.c:111
msgid "Send message to all connections."
msgstr "Sender meldingen til alle klientene."
-#: server/commands.c:104
+#: server/commands.c:112
msgid ""
"For each connected client, pops up a window showing the message entered."
msgstr "For hver klient, vises et vindu med den angitte meldingen."
-#: server/commands.c:108
+#: server/commands.c:117
msgid "vote yes|no [vote number]"
msgstr "vote yes|no [valgnummer]"
-#: server/commands.c:109
+#: server/commands.c:118
msgid "Cast a vote."
msgstr "Stemme."
-#: server/commands.c:111
+#: server/commands.c:120
#, 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."
+"A player with basic 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."
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 "
@@ -2284,18 +2291,18 @@ msgstr ""
"Dersom en hel runde går uten at noen stemmer mot et valg, så blir det "
"vedtatt automatisk."
-#: server/commands.c:121
+#: server/commands.c:131
#, 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:123
+#: server/commands.c:133
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:124
+#: server/commands.c:134
msgid ""
"Print AI debug information about given entity and turn continous debugging "
"output for this entity on or off."
@@ -2303,23 +2310,23 @@ msgstr ""
"Skriver ut AI debug informasjon om en gitt entitet og skrur av eller på "
"kontinuerlig utskrift av denne entiteten."
-#: server/commands.c:128
+#: server/commands.c:139
msgid "set <option-name> <value>"
msgstr "set <alternativsnavn> <verdi>"
-#: server/commands.c:129
+#: server/commands.c:140
msgid "Set server option."
msgstr "Sett tjeneralternativ."
-#: server/commands.c:132
+#: server/commands.c:144
msgid "team <player> [team]"
msgstr "team <spiller> [lag]"
-#: server/commands.c:133
+#: server/commands.c:145
msgid "Change, add or remove a player's team affiliation."
msgstr "Endre, legg til eller fjerne en spillers lagtilhørighet."
-#: server/commands.c:134
+#: server/commands.c:146
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,15 +2339,15 @@ msgstr ""
"og ambassader, og sloss sammen for å oppnå lagseier med snittet av de "
"individuelle poengsummene."
-#: server/commands.c:141
+#: server/commands.c:154
msgid "rulesetdir <directory>"
msgstr "rulesetdir <katalog>"
-#: server/commands.c:142
+#: server/commands.c:155
msgid "Choose new ruleset directory or modpack."
msgstr "Velg en ny katalog for regeloppsett."
-#: server/commands.c:143
+#: server/commands.c:156
msgid ""
"Choose new ruleset directory or modpack. Calling this\n"
" without any arguments will show you the currently selected ruleset."
@@ -2349,15 +2356,15 @@ msgstr ""
"Å kalle denne uten argument vil vise deg det nåværende regeloppsettet."
#. TRANS: translate text between <> only
-#: server/commands.c:149
+#: server/commands.c:163
msgid "metainfo <meta-line>"
msgstr "metainfo <metalinje>"
-#: server/commands.c:150
+#: server/commands.c:164
msgid "Set metaserver info line."
msgstr "Sett metaserver infolinje."
-#: server/commands.c:151
+#: server/commands.c:165
msgid ""
"Set user defined metaserver info line. If parameter is omitted,\n"
"previously set metamessage will be removed. For most of the time\n"
@@ -2366,19 +2373,19 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:158
+#: server/commands.c:173
msgid "metapatch <meta-line>"
msgstr "metapatch <metalinje>"
-#: server/commands.c:159
+#: server/commands.c:174
msgid "Set metaserver patches line."
msgstr "Sett metaserver endringslinje."
-#: server/commands.c:165
+#: server/commands.c:181
msgid "Control metaserver connection."
msgstr "Kontroller metaserver forbindelse."
-#: server/commands.c:166
+#: server/commands.c:182
msgid ""
"'metaconnection ?' reports on the status of the connection to metaserver.\n"
"'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2391,33 +2398,33 @@ msgstr ""
"metaserveren."
#. TRANS: translate text between <> only
-#: server/commands.c:172
+#: server/commands.c:189
msgid "metaserver <address>"
msgstr "metaserver <addresse>"
-#: server/commands.c:173
+#: server/commands.c:190
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:177
+#: server/commands.c:195
msgid "aitoggle <player-name>"
msgstr "aitoggle <spillernavn>"
-#: server/commands.c:178
+#: server/commands.c:196
msgid "Toggle AI status of player."
msgstr "Bytt spillers AI-status."
#. TRANS: translate text between [] and <> only
-#: server/commands.c:182
+#: server/commands.c:201
msgid "take [connection-name] <player-name>"
msgstr "take [forbindelses-navn] <spillernavn>"
-#: server/commands.c:183
+#: server/commands.c:202
msgid "Take over a player's place in the game."
msgstr "Ta over en spillers plass i spillet."
-#: server/commands.c:184
+#: server/commands.c:203
#, fuzzy
msgid ""
"Only the console and connections with cmdlevel 'hack' can force other "
@@ -2433,15 +2440,15 @@ msgstr ""
"tilkoblet som global observatør."
#. TRANS: translate text between [] only
-#: server/commands.c:192
+#: server/commands.c:212
msgid "observe [connection-name] [player-name]"
msgstr "observe [forbindelses-navn] [spillernavn]"
-#: server/commands.c:193
+#: server/commands.c:213
msgid "Observe a player or the whole game."
msgstr "Observere en spiller eller hele spillet."
-#: server/commands.c:194
+#: server/commands.c:214
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 "
@@ -2456,15 +2463,15 @@ msgstr ""
"tilkoblet som global observatør."
#. TRANS: translate text between <> only
-#: server/commands.c:202
+#: server/commands.c:223
msgid "detach <connection-name>"
msgstr "detach <forbindelsesnavn>"
-#: server/commands.c:203
+#: server/commands.c:224
msgid "detach from a player."
msgstr "Fraskilles fra en spiller."
-#: server/commands.c:204
+#: server/commands.c:225
msgid ""
"Only the console and connections with cmdlevel 'hack' can force other "
"connections to detach from a player."
@@ -2473,20 +2480,20 @@ msgstr ""
"forbindelser til å ta over en spiller. "
#. TRANS: translate text between <> only
-#: server/commands.c:209
+#: server/commands.c:231
msgid "create <player-name>"
msgstr "create <spillernavn>"
-#: server/commands.c:210
+#: server/commands.c:232
msgid "Create an AI player with a given name."
msgstr "Opprett en AI spiller med gitt navn."
-#: server/commands.c:211
+#: server/commands.c:233
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:215
+#: server/commands.c:238
msgid ""
"away\n"
"away"
@@ -2494,16 +2501,16 @@ msgstr ""
"borte\n"
"borte"
-#: server/commands.c:217
+#: server/commands.c:240
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:218
+#: server/commands.c:241
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:222
+#: server/commands.c:246
msgid ""
"novice\n"
"novice <player-name>"
@@ -2511,11 +2518,11 @@ msgstr ""
"novice\n"
"novice <spillernavn>"
-#: server/commands.c:224
+#: server/commands.c:248
msgid "Set one or all AI players to 'novice'."
msgstr "Sett en eller alle AI-spillere til 'novice'."
-#: server/commands.c:225
+#: server/commands.c:249
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 +2534,7 @@ msgstr ""
"vanskelighetsgraden kun for en spiller."
#. TRANS: translate text between <> only
-#: server/commands.c:231
+#: server/commands.c:256
msgid ""
"easy\n"
"easy <player-name>"
@@ -2535,11 +2542,11 @@ msgstr ""
"easy\n"
"easy <spillernavn>"
-#: server/commands.c:233
+#: server/commands.c:258
msgid "Set one or all AI players to 'easy'."
msgstr "Sett en eller alle AI spillere til 'lett'."
-#: server/commands.c:234
+#: server/commands.c:259
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 "
@@ -2551,7 +2558,7 @@ msgstr ""
"vanskelighetsgraden kun for en spiller."
#. TRANS: translate text between <> only
-#: server/commands.c:240
+#: server/commands.c:266
msgid ""
"normal\n"
"normal <player-name>"
@@ -2559,11 +2566,11 @@ msgstr ""
"normal\n"
"normal <spillernavn>"
-#: server/commands.c:242
+#: server/commands.c:268
msgid "Set one or all AI players to 'normal'."
msgstr "Sett en eller alle AI-spillere til 'normal'."
-#: server/commands.c:243
+#: server/commands.c:269
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 "
@@ -2575,7 +2582,7 @@ msgstr ""
"kommandoen vanskelighetsgraden kun for en spiller."
#. TRANS: translate text between <> only
-#: server/commands.c:249
+#: server/commands.c:276
msgid ""
"hard\n"
"hard <player-name>"
@@ -2583,11 +2590,11 @@ msgstr ""
"hard\n"
"hard <spillernavn>"
-#: server/commands.c:251
+#: server/commands.c:278
msgid "Set one or all AI players to 'hard'."
msgstr "Sett en eller alle AI spillere til å være vanskelig (hard)."
-#: server/commands.c:252
+#: server/commands.c:279
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 +2606,7 @@ msgstr ""
"vanskelighetsgraden kun for en spiller."
#. TRANS: translate text between <> only
-#: server/commands.c:258
+#: server/commands.c:286
msgid ""
"experimental\n"
"experimental <player-name>"
@@ -2607,11 +2614,11 @@ msgstr ""
"experimental\n"
"experimental <spiller-navn>"
-#: server/commands.c:260
+#: server/commands.c:288
msgid "Set one or all AI players to 'experimental'."
msgstr "Setter en eller alle AI spillerne til 'experimental'."
-#: server/commands.c:261
+#: server/commands.c:289
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 "
@@ -2626,7 +2633,7 @@ msgstr ""
"ingen effekt."
#. TRANS: translate text between <> only
-#: server/commands.c:269
+#: server/commands.c:298
msgid ""
"cmdlevel\n"
"cmdlevel <level>\n"
@@ -2640,18 +2647,20 @@ msgstr ""
"cmdlevel <nivå> first\n"
"cmdlevel <nivå> <forbindelsesnavn>"
-#: server/commands.c:274
+#: server/commands.c:303
msgid "Query or set command access level access."
msgstr "Be om eller sett kommando tilgangsnivå."
-#: server/commands.c:275
+#: server/commands.c:304
#, fuzzy
msgid ""
"The command access level controls which server commands are available\n"
"to users via the client chatline. The available levels are:\n"
" none - no commands\n"
-" info - informational commands only\n"
+" info - informational or observer commands only\n"
+" basic - commands available to players in the game\n"
" ctrl - commands that affect the game and users\n"
+" admin - commands that affect server operation\n"
" hack - *all* commands - dangerous!\n"
"With no arguments, the current command access levels are reported.\n"
"With a single argument, the level is set for all existing connections,\n"
@@ -2684,20 +2693,20 @@ msgstr ""
"kan koble til med det samme navnet. Legg merke til at denne kommandoen nå "
"tar imot forbindelsesnavn, ikke spillernavn."
-#: server/commands.c:296
+#: server/commands.c:328
msgid "If there is none, become the game organizer with increased permissions."
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:301
+#: server/commands.c:334
msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
msgstr "timeoutincrease <runde> <rundetillegg> <verdi> <faktor>"
-#: server/commands.c:302
+#: server/commands.c:335
msgid "See \"help timeoutincrease\"."
msgstr "Se \"help timeoutincrease\"."
-#: server/commands.c:303
+#: server/commands.c:336
msgid ""
"Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
"<turn> and multiply <value> by <valuemult>. Use this command in concert "
@@ -2711,42 +2720,61 @@ msgstr ""
"Bruk denne kommandoen sammen med \"timeout\". Standardverdiene er 0 0 0 1."
#. TRANS: translate text between <> only
-#: server/commands.c:309
+#: server/commands.c:343
+msgid ""
+"cancelvote\n"
+"cancelvote <vote number>\n"
+"cancelvote all\n"
+msgstr ""
+
+#: server/commands.c:346
+msgid "Cancel a running vote.\n"
+msgstr ""
+
+#: server/commands.c:347
+msgid ""
+"With no arguments this command removes your own vote. If you have an admin "
+"access level, you can cancel any vote by vote number, or all votes with the "
+"'all' argument."
+msgstr ""
+
+#. TRANS: translate text between <> only
+#: server/commands.c:354
#, fuzzy
msgid "endgame"
msgstr "Endre navn"
-#: server/commands.c:310
+#: server/commands.c:355
#, fuzzy
msgid "End the game immediately in a draw."
msgstr "Spillet endte uavgjordt"
#. TRANS: translate text between <> only
-#: server/commands.c:314
+#: server/commands.c:360
msgid "surrender"
msgstr ""
-#: server/commands.c:315
+#: server/commands.c:361
#, fuzzy
msgid "Concede the game."
msgstr "Klarte ikke laste inn lagret spill."
-#: server/commands.c:316
+#: server/commands.c:362
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:322
+#: server/commands.c:369
msgid "remove <player-name>"
msgstr "remove <spillernavn>"
-#: server/commands.c:323
+#: server/commands.c:370
msgid "Fully remove player from game."
msgstr "Fjern spilleren fullstendig fra spillet."
-#: server/commands.c:324
+#: server/commands.c:371
msgid ""
"This *completely* removes a player from the game, including all cities and "
"units etc. Use with care!"
@@ -2755,7 +2783,7 @@ msgstr ""
"enheter. Brukes med måte!"
#. TRANS: translate text between <> only
-#: server/commands.c:329
+#: server/commands.c:377
msgid ""
"save\n"
"save <file-name>"
@@ -2763,11 +2791,11 @@ msgstr ""
"save\n"
"save <filnavn>"
-#: server/commands.c:331
+#: server/commands.c:379
msgid "Save game to file."
msgstr "Lagre spill til fil."
-#: server/commands.c:332
+#: server/commands.c:380
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"
@@ -2784,7 +2812,7 @@ msgstr ""
"og bruk 'start' kommandoen når alle spillerne har koblet til på nytt."
#. TRANS: translate text between <> only
-#: server/commands.c:341
+#: server/commands.c:390
msgid ""
"load\n"
"load <file-name>"
@@ -2792,11 +2820,11 @@ msgstr ""
"load\n"
"load <filnavn>"
-#: server/commands.c:343
+#: server/commands.c:392
msgid "Load game from file."
msgstr "Fortsette et spill fra fil."
-#: server/commands.c:344
+#: server/commands.c:393
msgid ""
"Load a game from <file-name>. Any current data including players, rulesets "
"and server options are lost.\n"
@@ -2805,121 +2833,121 @@ msgstr ""
"spillere, regeloppsett og tjeneralternativ vil forsvinne.\n"
#. TRANS: translate text between <> only
-#: server/commands.c:349
+#: server/commands.c:399
msgid "read <file-name>"
msgstr "read <filnavn>"
-#: server/commands.c:350
+#: server/commands.c:400
msgid "Process server commands from file."
msgstr "Utfør tjenerkommandoer fra fil."
#. TRANS: translate text between <> only
-#: server/commands.c:354
+#: server/commands.c:405
msgid "write <file-name>"
msgstr "write <filnavn>"
-#: server/commands.c:355
+#: server/commands.c:406
msgid "Write current settings as server commands to file."
msgstr "Skriv oppsettet som blir brukt nå til en fil som tjenerkommandoer."
-#: server/commands.c:359
+#: server/commands.c:411
msgid "Switch server output between 'RFC-style' and normal style."
msgstr "Endre tjener-utskrifter mellom 'RFC-style' og vanlig."
-#: server/commands.c:363
+#: server/commands.c:416
msgid "Simply returns the id of the server."
msgstr "Returnerer identiteten til tjeneren."
-#: server/connecthand.c:85
+#: server/connecthand.c:109
#, c-format
msgid "Welcome to the %s Server running at %s port %d."
msgstr "Velkommen til tjeneren %s som kjører på %s port nummer %d."
-#: server/connecthand.c:89
+#: server/connecthand.c:113
#, c-format
msgid "Welcome to the %s Server at port %d."
msgstr "Velkommen til tjeneren %s på port nummer %d."
# problem
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:97
+#: server/connecthand.c:121
#, fuzzy, c-format
msgid "(%d) %s: connected [%s]"
msgstr "(%d) %s har koblet til fra %s."
-#: server/connecthand.c:104
+#: server/connecthand.c:128
#, c-format
msgid "Server: %s has connected from %s."
msgstr "Tjener: %s har koblet til fra %s."
-#: server/connecthand.c:145
+#: server/connecthand.c:175
msgid "Couldn't attach your connection to new player."
msgstr "Kunne ikke binde din forbindelse til en ny spiller."
-#: server/connecthand.c:165
+#: server/connecthand.c:199
#, c-format
msgid "You are logged in as '%s' connected to no player."
msgstr "Du er logget inn som '%s', men ikke forbundet til en spiller."
-#: server/connecthand.c:169
+#: server/connecthand.c:203
#, c-format
msgid "You are logged in as '%s' connected to an anonymous player."
msgstr "Du er logget inn som '%s', forbundet til en anonym spiller."
-#: server/connecthand.c:174
+#: server/connecthand.c:208
#, c-format
msgid "You are logged in as '%s' connected to %s."
msgstr "Du er logget inn som '%s' forbundet til %s."
-#: server/connecthand.c:187
+#: server/connecthand.c:221
#, c-format
msgid "Turn-blocking game play: waiting on %s to finish turn..."
msgstr "Rundeblokkerende spill: venter på %s til å avslutte sin runde..."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:240
+#: server/connecthand.c:274
#, fuzzy, c-format
msgid "(%d) %s: connection request [%s]"
msgstr "(%d) Forespørsel om forbindelse fra %s fra %s."
-#: server/connecthand.c:266
+#: server/connecthand.c:300
#, fuzzy
msgid "The client is missing a capability that this server needs."
msgstr "Klienten mangler en egenskap som denne serveren trenger."
-#: server/connecthand.c:268 server/connecthand.c:279
+#: server/connecthand.c:302 server/connecthand.c:313
#, fuzzy, c-format
msgid "(%d) %s rejected: mismatched capabilities!"
msgstr "(%d) %s ble vist bort. Manglet egenskaper."
-#: server/connecthand.c:277
+#: server/connecthand.c:311
#, fuzzy
msgid "This server is missing a capability that the client needs."
msgstr "Tjener mangler en egenskap som denne klienten trenger."
-#: server/connecthand.c:290
+#: server/connecthand.c:324
#, fuzzy
msgid "The username is invalid!"
msgstr "Ugyldig brukernavn"
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:292
+#: server/connecthand.c:326
#, fuzzy, c-format
msgid "(%d) %s rejected: invalid username [%s]"
msgstr "(%d) %s ble vist bort. Manglet egenskaper [%s]"
-#: server/connecthand.c:303
+#: server/connecthand.c:337
#, fuzzy
msgid "Your username is already connected!"
msgstr "er allerede tilkoblet."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:305
+#: server/connecthand.c:339
#, fuzzy, c-format
msgid "(%d) %s rejected: duplicate username [%s]"
msgstr "(%d) %s ble vist bort. Manglet egenskaper [%s]"
-#: server/connecthand.c:335 server/connecthand.c:344
+#: server/connecthand.c:369 server/connecthand.c:378
#, c-format
msgid "Lost connection: %s."
msgstr "Mistet forbindelse: %s."
@@ -2936,113 +2964,113 @@ msgstr "Ok. Standard stil valgt."
msgid "For introductory help, type 'help'."
msgstr "For en introduksjon til spillet, skriv 'help'."
-#: server/diplhand.c:164
+#: server/diplhand.c:167
#, c-format
msgid "The %s can't accept %s."
msgstr "%s kan ikke akseptere %s."
-#: server/diplhand.c:176
+#: server/diplhand.c:179
#, c-format
msgid "You don't have tech %s, you can't accept treaty."
msgstr "Du har ikke teknologien %s, du kan ikke akseptere avtalen."
-#: server/diplhand.c:185
+#: server/diplhand.c:188
msgid "City you are trying to give no longer exists, you can't accept treaty."
msgstr ""
"Byen du forsøker å gi bort eksisterer ikke lengre, du kan ikke akseptere "
"avtalen."
-#: server/diplhand.c:191
+#: server/diplhand.c:194
#, c-format
msgid "You are not owner of %s, you can't accept treaty."
msgstr "Du er ikke eier av %s, du kan ikke akseptere avtalen."
-#: server/diplhand.c:197 server/diplhand.c:301
+#: server/diplhand.c:200 server/diplhand.c:304
#, c-format
msgid "Your capital (%s) is requested, you can't accept treaty."
msgstr "Din hovedstad (%s) er forlangt, du kan ikke akseptere avtalen."
-#: server/diplhand.c:224
+#: server/diplhand.c:227
msgid "You don't have enough gold, you can't accept treaty."
msgstr "Du har ikke nok gull, kan ikke akseptere avtalen."
# c-format
-#: server/diplhand.c:256 server/diplhand.c:261
+#: server/diplhand.c:259 server/diplhand.c:264
#, c-format
msgid "A treaty containing %d clause was agreed upon."
msgid_plural "A treaty containing %d clauses was agreed upon."
msgstr[0] "Det ble enighet om en avtale som inneholdt %d punkt."
msgstr[1] "Det ble enighet om en avtale som inneholdt %d punkt."
-#: server/diplhand.c:277 server/diplhand.c:281
+#: server/diplhand.c:280 server/diplhand.c:284
#, fuzzy, c-format
msgid "One of the cities the %s are giving away is destroyed! Treaty canceled!"
msgstr "En av byene %s gir bort er rasert! Avtale brutt!"
-#: server/diplhand.c:288 server/diplhand.c:293
+#: server/diplhand.c:291 server/diplhand.c:296
#, c-format
msgid "The %s no longer control %s! Treaty canceled!"
msgstr "%s kontrollerer ikke lengre %s! Avtalen brutt!"
-#: server/diplhand.c:331 server/diplhand.c:335
+#: server/diplhand.c:334 server/diplhand.c:338
#, c-format
msgid "The %s don't have the promised amount of gold! Treaty canceled!"
msgstr "%s har ikke så mye gull som de lovet! Avtalen kansellert!"
-#: server/diplhand.c:364
+#: server/diplhand.c:367
#, c-format
msgid "You gave an embassy to %s."
msgstr "Du gav en ambassade til %s."
-#: server/diplhand.c:367
+#: server/diplhand.c:370
#, c-format
msgid "%s allowed you to create an embassy!"
msgstr "%s lot deg opprette en ambassade!"
-#: server/diplhand.c:383
+#: server/diplhand.c:386
#, c-format
msgid "You are taught the knowledge of %s."
msgstr "Du får kunnskap om %s."
-#: server/diplhand.c:387
+#: server/diplhand.c:390
#, c-format
msgid "The %s have acquired %s from the %s."
msgstr "%s har skaffet %s fra %s."
-#: server/diplhand.c:402
+#: server/diplhand.c:405
#, c-format
msgid "You get %d gold."
msgstr "Du får %d gull."
#. TRANS: ... Polish worldmap.
-#: server/diplhand.c:410
+#: server/diplhand.c:413
#, fuzzy, c-format
msgid "You receive the %s worldmap."
msgstr "Du får %ss verdenskart."
#. TRANS: ... Polish seamap.
-#: server/diplhand.c:419
+#: server/diplhand.c:422
#, fuzzy, c-format
msgid "You receive the %s seamap."
msgstr "Du får %ss sjøkart."
-#: server/diplhand.c:436
+#: server/diplhand.c:439
#, c-format
msgid "You receive city of %s from %s."
msgstr "Du får byen %s av %s."
-#: server/diplhand.c:441
+#: server/diplhand.c:444
#, c-format
msgid "You give city of %s to %s."
msgstr "Du gir bort byen %s til %s."
-#: server/diplhand.c:454 server/diplhand.c:457
+#: server/diplhand.c:457 server/diplhand.c:460
#, c-format
msgid "You agree on a cease-fire with %s."
msgstr "Du blir enig om våpenhvile med %s."
#. TRANS: ... the Poles ... Polish territory.
-#: server/diplhand.c:476 server/diplhand.c:488
+#: server/diplhand.c:479 server/diplhand.c:491
#, c-format
msgid ""
"You agree on an armistice with the %s. In %d turn, it will become a peace "
@@ -3053,32 +3081,32 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: server/diplhand.c:512 server/diplhand.c:515
+#: server/diplhand.c:515 server/diplhand.c:518
#, c-format
msgid "You agree on an alliance with %s."
msgstr "Du inngår allianse med %s."
-#: server/diplhand.c:524
+#: server/diplhand.c:527
#, c-format
msgid "You give shared vision to %s."
msgstr "Du gir delt utsyn til %s."
-#: server/diplhand.c:527
+#: server/diplhand.c:530
#, c-format
msgid "%s gives you shared vision."
msgstr "%s gir deg delt utsyn."
-#: server/diplhand.c:663
+#: server/diplhand.c:666
#, c-format
msgid "%s canceled the meeting!"
msgstr "%s avbrøt møtet!"
-#: server/diplhand.c:670
+#: server/diplhand.c:673
#, c-format
msgid "Meeting with %s canceled."
msgstr "Møtet med %s avlyst."
-#: server/diplhand.c:712
+#: server/diplhand.c:715
msgid "Your diplomatic envoy was decapitated!"
msgstr "Din diplomatiske utsending ble halshugget!"
@@ -3264,84 +3292,84 @@ msgid "The %s destroyed the %s in %s."
msgstr "%s ødela %s i %s."
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1091
+#: server/diplomats.c:1097
#, fuzzy, c-format
msgid "An enemy %s has been eliminated by your %s."
msgstr "En fiendtlig %s har blitt eliminert da den forsvarte %s."
#. TRANS: <unit> ... <city> ... <diplomat>
-#: server/diplomats.c:1098
+#: server/diplomats.c:1104
#, c-format
msgid "Your %s has been eliminated defending %s against a %s."
msgstr "Din %s har blitt eliminert idet den forsvarte %s mot en %s."
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1106
+#: server/diplomats.c:1112
#, fuzzy, c-format
msgid "Your %s has been eliminated defending against a %s."
msgstr "Din %s har blitt eliminert idet den forsvarte mot en %s."
-#: server/diplomats.c:1119
+#: server/diplomats.c:1125
#, c-format
msgid "Your %s was eliminated by a defending %s."
msgstr "Din %s ble eliminert av en forsvarende %s."
# problem
-#: server/diplomats.c:1127
+#: server/diplomats.c:1133
#, c-format
msgid "Eliminated %s %s while infiltrating %s."
msgstr "En %s %s ble eliminert i et forsøk på å infiltrere %s."
# problem
-#: server/diplomats.c:1134
+#: server/diplomats.c:1140
#, c-format
msgid "Eliminated %s %s while infiltrating our troops."
msgstr "En %s %s ble eliminert i et forsøk på å infiltrere våre tropper."
-#: server/diplomats.c:1185
+#: server/diplomats.c:1191
#, fuzzy, c-format
msgid ""
"Your %s has successfully completed the mission and returned unharmed to %s."
msgstr "Din %s har klart sitt oppdrag og har returnert uskadet til %s."
-#: server/diplomats.c:1204
+#: server/diplomats.c:1210
#, fuzzy, c-format
msgid "Your %s was captured after completing the mission in %s."
msgstr "Din %s ble fanget etter å ha fullført sitt oppdrag i %s."
-#: server/diplomats.c:1210
+#: server/diplomats.c:1216
#, fuzzy, c-format
msgid "Your %s was captured after completing the mission."
msgstr "Din %s ble fanget etter å ha fullført sitt oppdrag."
-#: server/diplomats.c:1242
+#: server/diplomats.c:1248
#, fuzzy, c-format
msgid "You have caused an incident while bribing the %s %s."
msgstr "Du har forårsaket en skandale ved å bestikke %ss %s."
-#: server/diplomats.c:1247
+#: server/diplomats.c:1253
#, c-format
msgid "%s has caused an incident while bribing your %s."
msgstr "%s har forårsaket en skandale ved å bestikke din %s."
-#: server/diplomats.c:1254
+#: server/diplomats.c:1260
#, fuzzy, c-format
msgid "You have caused an incident while attempting to steal tech from %s."
msgstr "Du har skapt en skandale ved teknologityveriet fra %s."
-#: server/diplomats.c:1258
+#: server/diplomats.c:1264
#, fuzzy, c-format
msgid "%s has caused an incident while attempting to steal tech from you."
msgstr "%s har forårsaket en skandale ved å stjele teknologi fra deg."
# problem
-#: server/diplomats.c:1264
+#: server/diplomats.c:1270
#, c-format
msgid "You have caused an incident while inciting a revolt in %s."
msgstr "Du har forårsaket en skandale ved å oppmuntre til opprør i %s."
# problem
-#: server/diplomats.c:1268
+#: server/diplomats.c:1274
#, c-format
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."
@@ -3460,12 +3488,12 @@ msgstr ""
"jernbanen.\n"
" Arbeiderne samler seg til dugnad og bygger jernbane i samtlige byer."
-#: server/maphand.c:1418
+#: server/maphand.c:1425
#, 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:1436
+#: server/maphand.c:1443
#, fuzzy, c-format
msgid "Disbanded your %s due to changing terrain."
msgstr "Oppløste din %s på grunn av transformasjon fra land til sjø."
@@ -3474,7 +3502,7 @@ msgstr "Oppl
msgid "Not reporting to the metaserver in this game."
msgstr "Rapporterer ikke til Metaserver i dette spillet."
-#: server/meta.c:430
+#: server/meta.c:432
#, c-format
msgid "Metaserver: bad address: [%s:%d]."
msgstr "Metaserver: addressefeil: [%s: %d]."
@@ -3595,43 +3623,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:1103
+#: server/plrhand.c:1115
#, c-format
msgid "Removing player %s."
msgstr "Fjernet spiller %s."
-#: server/plrhand.c:1105
+#: server/plrhand.c:1117
msgid "You've been removed from the game!"
msgstr "Du har blitt fjernet fra spillet!"
-#: server/plrhand.c:1108
+#: server/plrhand.c:1120
#, c-format
msgid "%s has been removed from the game."
msgstr "%s har blitt fjernet fra spillet."
-#: server/plrhand.c:1153 server/plrhand.c:1158
+#: server/plrhand.c:1167 server/plrhand.c:1172
#, 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:1178
+#: server/plrhand.c:1192
#, 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:1656
+#: server/plrhand.c:1670
#, 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:1663
+#: server/plrhand.c:1677
#, 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:1686
+#: server/plrhand.c:1700
#, fuzzy, c-format
msgid ""
"Your nation is thrust into civil war! %s is declared the leader of the rebel "
@@ -3640,12 +3668,12 @@ msgstr ""
"Din nasjon er splittet i en borgerkrig.\n"
" %s er proklamert leder for de opprørske fylkene."
-#: server/plrhand.c:1707
+#: server/plrhand.c:1721
#, c-format
msgid "%s declares allegiance to %s."
msgstr "%s proklamerer allianse med %s."
-#: server/plrhand.c:1722
+#: server/plrhand.c:1736
#, fuzzy, c-format
msgid ""
"Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3838,67 +3866,67 @@ msgstr "(bygger %s i %s (%s))\n"
msgid "Wonders of the World"
msgstr "Verdens underverk"
-#: server/report.c:547
+#: server/report.c:552
msgid " sq. mi."
msgstr " kkm"
-#: server/report.c:557
+#: server/report.c:562
msgid " M tons"
msgstr " M t"
-#: server/report.c:562
+#: server/report.c:567
msgid " M goods"
msgstr " M varer"
-#: server/report.c:567
+#: server/report.c:572
msgid " bulbs"
msgstr ""
-#: server/report.c:572
+#: server/report.c:577
msgid " month"
msgid_plural " months"
msgstr[0] " måned"
msgstr[1] " måned"
-#: server/report.c:577
+#: server/report.c:582
msgid " ton"
msgid_plural " tons"
msgstr[0] " tonn"
msgstr[1] " tonn"
-#: server/report.c:591
+#: server/report.c:596
msgid "st"
msgstr "."
-#: server/report.c:593
+#: server/report.c:598
msgid "nd"
msgstr "."
-#: server/report.c:595
+#: server/report.c:600
msgid "rd"
msgstr "."
-#: server/report.c:597
+#: server/report.c:602
msgid "th"
msgstr "."
-#: server/report.c:700
+#: server/report.c:705
msgid "Demography string contains invalid characters. Try \"help demography\"."
msgstr ""
"Demografi tekststrengen inneholder ugyldige bokstaver. Prøv \"help demography"
"\"."
-#: server/report.c:743 server/report.c:768
+#: server/report.c:748 server/report.c:773
msgid "Demographics Report:"
msgstr "Demografi-rapport:"
-#: server/report.c:744
+#: server/report.c:749
msgid "Sorry, the Demographics report is unavailable."
msgstr "Beklager, demografirapport er ikke tilgjengelig."
#. TRANS: <nation adjective> <government name> (<year>).
#. * E.g. "Polish Despotism (200 AD)".
-#: server/report.c:750
+#: server/report.c:755
#, fuzzy, c-format
msgid "%s %s (%s)"
msgstr "%s i %s (%s)\n"
@@ -3909,11 +3937,11 @@ msgstr "%s i %s (%s)\n"
msgid "Could not find a readable \"%s.%s\" ruleset file."
msgstr "Kunne ikke finne en lesbar regeloppsettfil med navnet \"%s\"."
-#: server/ruleset.c:2356
+#: server/ruleset.c:2366
msgid "No barbarian nation in rulesets, at least one required!"
msgstr ""
-#: server/ruleset.c:3166
+#: server/ruleset.c:3178
msgid "Loading rulesets"
msgstr "Laster inn regeloppsett"
@@ -3929,14 +3957,14 @@ msgstr ""
"lagrede spill, eller det kan tyde på feil ved selve filen. Fortsett på eget "
"ansvar."
-#: server/savegame.c:3588
+#: server/savegame.c:3587
#, fuzzy
msgid "Saved game is too old, at least version 1.9.0 required."
msgstr ""
"Den lagrede filen er for gammel, versjoner fra og med 1.9.0 er støttet."
#. TRANS: Fatal error message.
-#: server/savegame.c:3815
+#: server/savegame.c:3817
#, fuzzy
msgid ""
"Saved game uses the \"classic\" terrain ruleset, and is no longer supported."
@@ -3944,7 +3972,7 @@ msgstr ""
"Den lagrede filen bruker det klassiske terreng regeloppsettet som ikke "
"lenger er støttet."
-#: server/savegame.c:3824
+#: server/savegame.c:3826
#, c-format
msgid ""
"Warning: Different rulesetdirs ('%s' and '%s') are no longer supported. "
@@ -3954,7 +3982,7 @@ msgstr ""
"støttet. Bruker '%s'."
#. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4051
+#: server/savegame.c:4055
#, c-format
msgid "%s had invalid nation; changing to %s."
msgstr ""
@@ -3987,7 +4015,7 @@ msgstr "Intern"
msgid "Networking"
msgstr "Nettverk"
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:734
#: client/gui-win32/dialogs.c:532
msgid "All"
msgstr "Alle"
@@ -5195,11 +5223,11 @@ msgstr ""
"log\" hver runde. Denne statistikken kan benyttes til å lage grafer over "
"spillerenes styrke etter at spillet er over."
-#: server/sernet.c:150
+#: server/sernet.c:151
msgid "Server cannot read standard input. Ignoring input."
msgstr "Serveren kan ikke lese fra tastaturet. Ignorerer det."
-#: server/sernet.c:929
+#: server/sernet.c:933
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr "Server: addressefeil: [%s: %d]."
@@ -5273,46 +5301,46 @@ msgstr "Romskipet ditt har allerede maksimalt antall Solcelle-moduler!"
msgid "Without guidance from the capital, the %s spaceship is lost!"
msgstr "Uten veiledning fra hovedstaden er %s romskipet tapt!"
-#: server/srv_main.c:240
+#: server/srv_main.c:242
msgid "Game ended in a draw as end year exceeded"
msgstr "Spillet ble uavgjordt siden sluttårstallet ble oversteget"
-#: server/srv_main.c:274
+#: server/srv_main.c:276
#, c-format
msgid "The %s spaceship has arrived at Alpha Centauri."
msgstr "%s romskip har landet på Alpha Centauri."
-#: server/srv_main.c:287 server/srv_main.c:322
+#: server/srv_main.c:289 server/srv_main.c:324
#, c-format
msgid "Team victory to %s"
msgstr "Lagseier til %s"
-#: server/srv_main.c:297 server/srv_main.c:338
+#: server/srv_main.c:299 server/srv_main.c:340
#, c-format
msgid "Game ended in victory for %s"
msgstr "Spillet endte med seier til %s"
-#: server/srv_main.c:345
+#: server/srv_main.c:347
msgid "Game ended in a draw"
msgstr "Spillet endte uavgjordt"
-#: server/srv_main.c:461 server/srv_main.c:472
+#: server/srv_main.c:465 server/srv_main.c:476
#, c-format
msgid "Your %s was disbanded in accordance with your peace treaty with the %s."
msgstr ""
-#: server/srv_main.c:512 server/srv_main.c:516
+#: server/srv_main.c:516 server/srv_main.c:520
#, c-format
msgid ""
"Concerned citizens point out that the cease-fire with %s will run out soon."
msgstr "Bekymrede borgere påpeker at våpenhvilen med %s snart utløper."
-#: server/srv_main.c:521 server/srv_main.c:525
+#: server/srv_main.c:525 server/srv_main.c:529
#, fuzzy, c-format
msgid "The cease-fire with %s has run out. You are now at war with the %s."
msgstr "Våpenhvilen med %s har utløpt. Du er nå nøytral til %s."
-#: server/srv_main.c:542
+#: server/srv_main.c:546
#, fuzzy, c-format
msgid ""
"Ceasefire between %s and %s has run out. They are at war. You cancel your "
@@ -5321,345 +5349,334 @@ msgstr ""
"Spilleren %s som du er på lag med har erklært krig mot %s. Du må avbryte "
"alliansen med %s."
-#: server/srv_main.c:961
+#: server/srv_main.c:997
#, c-format
msgid "Failed saving game as %s"
msgstr "Klarte ikke å lagre spill som %s"
-#: server/srv_main.c:963
+#: server/srv_main.c:999
#, c-format
msgid "Game saved as %s"
msgstr "Spill lagret som %s"
-#: server/srv_main.c:994
+#: server/srv_main.c:1030
msgid "The game is already running."
msgstr "Spillet er allerede i gang."
-#: server/srv_main.c:1002
+#: server/srv_main.c:1038
#, c-format
msgid "%s lost control cmdlevel on game start. Use voting from now on."
msgstr ""
-#: server/srv_main.c:1009
+#: server/srv_main.c:1045
msgid "Starting game."
msgstr "Starter spillet."
-#: server/srv_main.c:1071
+#: server/srv_main.c:1112
#, c-format
msgid "request for unknown report (type %d)"
msgstr "forespørsel etter ukjent rapport (type: %d)"
-#: server/srv_main.c:1136
+#: server/srv_main.c:1177
#, c-format
msgid "Warning: rejecting old client %s"
msgstr "Advarsel: forkastet gammel klient %s"
-#: server/srv_main.c:1238
+#: server/srv_main.c:1279
#, 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:1338
+#: server/srv_main.c:1381
msgid "Please choose a non-blank name."
msgstr "Vennligst velg et ikke-blankt navn."
-#: server/srv_main.c:1354
+#: server/srv_main.c:1397
msgid "That nation is already in use."
msgstr "Den nasjonen er allerede i bruk."
-#: server/srv_main.c:1370
+#: server/srv_main.c:1413
#, 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:1391
+#: server/srv_main.c:1434
msgid "Please choose a name containing only ASCII characters."
msgstr "Vennligst velg et navn som kun inneholder ASCII bokstaver."
-#: server/srv_main.c:1490
+#: server/srv_main.c:1533
#, c-format
msgid "%s nation is not available in this scenario."
msgstr ""
-#: server/srv_main.c:1496
+#: server/srv_main.c:1539
#, fuzzy, c-format
msgid "%s nation is already in use."
msgstr "Den nasjonen er allerede i bruk."
-#: server/srv_main.c:1514
+#: server/srv_main.c:1557
#, c-format
msgid "%s is the %s ruler %s."
msgstr "%s er den %se herskeren %s."
-#: server/srv_main.c:1570
+#: server/srv_main.c:1613
#, 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:1614 server/srv_main.c:1618
+#: server/srv_main.c:1657 server/srv_main.c:1661
#, 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:1760
+#: server/srv_main.c:1803
#, c-format
msgid "Player %d"
msgstr "Spiller %d"
-#: server/srv_main.c:1771 server/srv_main.c:1777
+#: server/srv_main.c:1814 server/srv_main.c:1820
#, c-format
msgid "%s rules the %s."
msgstr "%s styrer %s."
-#: server/srv_main.c:1942
+#: server/srv_main.c:1985
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
msgstr ""
-#: server/srv_main.c:1993
+#: server/srv_main.c:2037
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr "Sender info til metaserver [%s]"
-#: server/srv_main.c:2024
+#: server/srv_main.c:2069
msgid "The game is over..."
msgstr "Spillet er over..."
-#: server/srv_main.c:2237
+#: server/srv_main.c:2286
msgid "Now accepting new client connections."
msgstr "Aksepterer nå nye klientforbindelser."
-#: server/stdinhand.c:246
-#, c-format
-msgid "Vote \"%s\" is passed %d to %d with %d abstentions."
-msgstr "Valget \"%s\" ble vedtatt med %d mot %d stemmer (%d stemte ikke)."
-
-#: server/stdinhand.c:253
-#, c-format
-msgid "Vote \"%s\" failed with %d against, %d for and %d abstentions."
-msgstr ""
-"Valget \"%s\" ble ikke vedtatt med %d mot, %d for og %d som unnlot å stemme."
-
#. TRANS: ambiguous command
-#: server/stdinhand.c:365
+#: server/stdinhand.c:284
msgid "(ambiguous)"
msgstr "(uklar)"
#. TRANS: unrecognized command
#. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:416
+#: server/stdinhand.c:287 client/citydlg_common.c:419
#: 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 "(ukjent)"
-#: server/stdinhand.c:458
+#: server/stdinhand.c:377
msgid "Name is empty, so cannot be a player."
msgstr "Navnet er tomt, så det kan ikke være en spiller."
-#: server/stdinhand.c:462
+#: server/stdinhand.c:381
msgid "Name is too long, so cannot be a player."
msgstr "Navnet er for langt, så det kan ikke være en spiller."
-#: server/stdinhand.c:466
+#: server/stdinhand.c:385
#, c-format
msgid "Player name prefix '%s' is ambiguous."
msgstr "Spillernavn prefikset '%s' er ikke entydig."
-#: server/stdinhand.c:470
+#: server/stdinhand.c:389
#, c-format
msgid "No player by the name of '%s'."
msgstr "Ingen spiller med navn '%s'."
-#: server/stdinhand.c:474 server/stdinhand.c:509
+#: server/stdinhand.c:393 server/stdinhand.c:428
#, c-format
msgid "Unexpected match_result %d (%s) for '%s'."
msgstr "Uventet match_result %d (%s) for '%s'."
-#: server/stdinhand.c:493
+#: server/stdinhand.c:412
msgid "Name is empty, so cannot be a connection."
msgstr "Navnet er tomt, så det kan ikke være en forbindelse."
-#: server/stdinhand.c:497
+#: server/stdinhand.c:416
msgid "Name is too long, so cannot be a connection."
msgstr "Navnet er for langt, så det kan ikke være en forbindelse."
-#: server/stdinhand.c:501
+#: server/stdinhand.c:420
#, c-format
msgid "Connection name prefix '%s' is ambiguous."
msgstr "Spillernavn-prefikset '%s' er ikke-entydig."
-#: server/stdinhand.c:505
+#: server/stdinhand.c:424
#, c-format
msgid "No connection by the name of '%s'."
msgstr "Ingen forbindelse med navn '%s'."
-#: server/stdinhand.c:525
+#: server/stdinhand.c:444
#, c-format
msgid "Open metaserver connection to [%s]."
msgstr "Åpne metaserver kobling til [%s]."
-#: server/stdinhand.c:538
+#: server/stdinhand.c:457
#, c-format
msgid "Close metaserver connection to [%s]."
msgstr "Lukk metaserver-tilknytningen til [%s]."
-#: server/stdinhand.c:553
+#: server/stdinhand.c:472
msgid "Metaserver connection is open."
msgstr "Metaserver-tilknytning er åpen."
-#: server/stdinhand.c:556
+#: server/stdinhand.c:475
msgid "Metaserver connection is closed."
msgstr "Metaserver-tilknytning er lukket."
-#: server/stdinhand.c:566
+#: server/stdinhand.c:485
msgid "Metaserver connection is already open."
msgstr "Metaserver-tilknytning er allerede åpen."
-#: server/stdinhand.c:577
+#: server/stdinhand.c:496
msgid "Metaserver connection is already closed."
msgstr "Metaserver-tilknytning er allerede lukket."
-#: server/stdinhand.c:582
+#: server/stdinhand.c:501
msgid "Argument must be 'u', 'up', 'd', 'down', or '?'."
msgstr "Argumentet må være 'u', 'up', 'd', 'down', eller '?'."
-#: server/stdinhand.c:603
+#: server/stdinhand.c:522
#, c-format
msgid "Metaserver patches string set to '%s'."
msgstr "Metaserver endrings-streng satt til '%s'."
-#: server/stdinhand.c:606
+#: server/stdinhand.c:525
#, c-format
msgid "Metaserver patches string set to '%s', not reporting to metaserver."
msgstr ""
"Metaserver endringes-streng satt til '%s', ikke raportert til metaserver."
-#: server/stdinhand.c:627
+#: server/stdinhand.c:546
#, c-format
msgid "Metaserver message string set to '%s'."
msgstr "Metaserver meldingsstreng satt til '%s'."
-#: server/stdinhand.c:630
+#: server/stdinhand.c:549
#, c-format
msgid "Metaserver message string set to '%s', not reporting to metaserver."
msgstr ""
"Metaserver meldingsstreng satt til '%s', ikke rapportert til metaserver."
-#: server/stdinhand.c:650
+#: server/stdinhand.c:569
#, c-format
msgid "Metaserver is now [%s]."
msgstr "Metaserver er nå [%s]."
-#: server/stdinhand.c:660
+#: server/stdinhand.c:579
#, c-format
msgid "Server id: %s"
msgstr "Tjener id: %s"
-#: server/stdinhand.c:757
+#: server/stdinhand.c:676
#, fuzzy
msgid "You cannot save games manually on this server."
msgstr "Forlat spillet og avslutt tjeneren."
-#: server/stdinhand.c:774
+#: server/stdinhand.c:693
msgid "Cannot toggle a barbarian player."
msgstr "Kan ikke endre en 'barbar'-spiller."
-#: server/stdinhand.c:781
+#: server/stdinhand.c:700
#, c-format
msgid "%s is now under AI control."
msgstr "%s er nå under AI-kontroll."
-#: server/stdinhand.c:802
+#: server/stdinhand.c:721
#, c-format
msgid "%s is now under human control."
msgstr "%s er nå under menneskelig kontroll."
-#: server/stdinhand.c:847
+#: server/stdinhand.c:766
msgid "Can't add AI players once the game has begun."
msgstr "Kan ikke legge til AI spillere når spillet er startet."
-#: server/stdinhand.c:867
+#: server/stdinhand.c:786
msgid "Can't add more players, server is full."
msgstr "Kan ikke legge til flere spillere, serveren er full."
-#: server/stdinhand.c:874
+#: server/stdinhand.c:793
msgid "Can't use an empty name."
msgstr "Kan ikke bruke et tomt navn"
-#: server/stdinhand.c:881
+#: server/stdinhand.c:800
#, c-format
msgid "That name exceeds the maximum of %d chars."
msgstr "Det navnet er lenger enn det maksimale som er %d tegn."
-#: server/stdinhand.c:887
+#: server/stdinhand.c:806
msgid "That name is not allowed."
msgstr "Det navnet er ikke tillat."
-#: server/stdinhand.c:893
+#: server/stdinhand.c:812
msgid "A player already exists by that name."
msgstr "Der finnes allerede en spiller med det navnet."
-#: server/stdinhand.c:899
+#: server/stdinhand.c:818
msgid "A user already exists by that name."
msgstr "Der finnes allerede en bruker med det navnet."
-#: server/stdinhand.c:925
+#: server/stdinhand.c:844
#, c-format
msgid "%s has been added as an AI-controlled player."
msgstr "%s ble lagt til som en AI-styrt spiller."
-#: server/stdinhand.c:932
+#: server/stdinhand.c:851
#, c-format
msgid "Error creating new AI player: %s."
msgstr "Feil ved opprettelse av ny AI spiller: %s."
-#: server/stdinhand.c:966
+#: server/stdinhand.c:885
msgid "Players cannot be removed once the game has started."
msgstr "Spillere kan ikke fjernes etter at spillet har startet."
-#: server/stdinhand.c:977
+#: server/stdinhand.c:896
#, c-format
msgid "Removed player %s from the game."
msgstr "Fjernet spiller %s fra spillet."
-#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
+#: server/stdinhand.c:935 server/stdinhand.c:3372 server/stdinhand.c:3507
#, c-format
msgid "Name \"%s\" disallowed for security reasons."
msgstr ""
-#: server/stdinhand.c:1029
+#: server/stdinhand.c:948
#, fuzzy, c-format
msgid "No command script found by the name \"%s\"."
msgstr "Ingen forbindelse med navn '%s'."
-#: server/stdinhand.c:1037
+#: server/stdinhand.c:956
#, c-format
msgid "Loading script file: %s"
msgstr "Laster inn manus filen: %s"
-#: server/stdinhand.c:1052
+#: server/stdinhand.c:971
#, c-format
msgid "Cannot read command line scriptfile '%s'."
msgstr "Kunne ikke lese kommando manusfilen \"%s\"."
-#: server/stdinhand.c:1054
+#: server/stdinhand.c:973
#, c-format
msgid "Could not read script file '%s'."
msgstr "Klarte ikke å lese manusfilen '%s'."
-#: server/stdinhand.c:1146
+#: server/stdinhand.c:1065
#, c-format
msgid "Could not write script file '%s'."
msgstr "Klarte ikke å skrive til manusfilen '%s'."
-#: server/stdinhand.c:1158
+#: server/stdinhand.c:1077
msgid "You cannot use the write command on this server for security reasons."
msgstr ""
-#: server/stdinhand.c:1186
+#: server/stdinhand.c:1105
#, c-format
msgid ""
"Cannot decrease command access level '%s' for connection '%s'; you only have "
@@ -5667,7 +5684,12 @@ msgid ""
msgstr ""
"Kan ikke redusere tilgangsnivå '%s' for forbindelse '%s'; du har kun '%s'."
-#: server/stdinhand.c:1241
+#: server/stdinhand.c:1114
+#, c-format
+msgid "Command access level set to '%s' for connection %s."
+msgstr "Kommando tilgangsnivå satt til '%s' for forbindelse %s."
+
+#: server/stdinhand.c:1163
#, fuzzy, c-format
msgid ""
"Anyone can now become game organizer '%s' by issuing the 'first' command."
@@ -5675,230 +5697,220 @@ msgstr ""
"Alle kan få kommando tilgangsnivå '%s' nå ved å bruke 'firstlevel' "
"kommandoen."
-#: server/stdinhand.c:1274
+#: server/stdinhand.c:1187
msgid "Command access levels in effect:"
msgstr "Kommando tilgangsnivå i bruk:"
-#: server/stdinhand.c:1282
+#: server/stdinhand.c:1194
#, c-format
msgid "Command access level for new connections: %s"
msgstr "Kommando tilgangsnivå for nye forbindelser: %s"
-#: server/stdinhand.c:1285
+#: server/stdinhand.c:1197
#, c-format
msgid "Command access level for first player to take it: %s"
msgstr "Kommando tilgangsnivå for første spiller: %s."
-#: server/stdinhand.c:1294
+#: server/stdinhand.c:1206
msgid ""
"Error: command access level must be one of 'none', 'info', 'ctrl', or 'hack'."
msgstr ""
"Feil: kommando tilgangsnivå må være en av 'none', 'info', 'ctrl', eller "
"'hack'."
-#: server/stdinhand.c:1299
+#: server/stdinhand.c:1211
#, c-format
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: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: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:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
+#: server/stdinhand.c:1238 server/stdinhand.c:1252 server/stdinhand.c:1273
#, c-format
msgid "Command access level set to '%s' for new players."
msgstr "Kommando tilgangsnivå satt til '%s' for nye spillere."
-#: server/stdinhand.c:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
+#: server/stdinhand.c:1243 server/stdinhand.c:1257 server/stdinhand.c:1267
#, 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:1402
+#: server/stdinhand.c:1302
#, 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:1406
+#: server/stdinhand.c:1306
#, c-format
msgid "You already have command access level '%s' or better."
msgstr "Du har allerede tilgangsnivå '%s' eller bedre."
-#: server/stdinhand.c:1411
+#: server/stdinhand.c:1311
#, fuzzy
msgid "Someone else already is game organizer."
msgstr "Noen andre har allerede tilgangsnivå '%s' eller bedre."
-#: server/stdinhand.c:1416
+#: server/stdinhand.c:1316
#, c-format
msgid "Connection %s has opted to become the game organizer."
msgstr ""
-#: server/stdinhand.c:1467
+#: server/stdinhand.c:1367
#, c-format
msgid "Invalid argument %d."
msgstr "Ugyldig argument %d"
-#: server/stdinhand.c:1474
+#: server/stdinhand.c:1374
msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
msgstr "Bruk: timeoutincrease <runde> <rundetillegg> <verdi> <faktor>"
-#: server/stdinhand.c:1482
+#: server/stdinhand.c:1382
#, c-format
msgid "Dynamic timeout set to %d %d %d %d"
msgstr "Dynamisk rundetidsbegrensning satt til %d %d %d %d"
-#: server/stdinhand.c:1542 server/stdinhand.c:1545
+#: server/stdinhand.c:1442 server/stdinhand.c:1445
msgid "Option:"
msgstr "Alternativ:"
-#: server/stdinhand.c:1555 server/stdinhand.c:4031
+#: server/stdinhand.c:1455 server/stdinhand.c:4079
msgid "Description:"
msgstr "Beskrivelse:"
-#: server/stdinhand.c:1560
+#: server/stdinhand.c:1460
#, c-format
msgid "Status: %s"
msgstr "Status: %s"
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "changeable"
msgstr "kan endres"
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "fixed"
msgstr "fastsatt"
-#: server/stdinhand.c:1567
+#: server/stdinhand.c:1467
#, c-format
msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
msgstr "Verdi: %d, Minimum: 0, Std.verdi: %d, Maksimum: 1"
-#: server/stdinhand.c:1572
+#: server/stdinhand.c:1472
#, c-format
msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
msgstr "Verdi: %d, Minimum: %d, Std.verdi: %d, Maksimum: %d"
-#: server/stdinhand.c:1578
+#: server/stdinhand.c:1478
#, c-format
msgid "Value: \"%s\", Default: \"%s\""
msgstr "Verdi: \"%s\", Std.verdi: \"%s\""
-#: server/stdinhand.c:1597
+#: server/stdinhand.c:1497
msgid "Explanations are available for the following server options:"
msgstr "Forklaringer er tilgjengelige for følgende serveralternativ:"
-#: server/stdinhand.c:1643
+#: server/stdinhand.c:1537
msgid "No explanation for that yet."
msgstr "Ingen forklaring på det ennå."
-#: server/stdinhand.c:1646 server/stdinhand.c:2480
+#: server/stdinhand.c:1540 server/stdinhand.c:2468
msgid "Ambiguous option name."
msgstr "Alternativet har flere betydninger."
-#: server/stdinhand.c:1666
+#: server/stdinhand.c:1560
#, c-format
msgid "Server Operator: %s"
msgstr "Server Operatør: %s"
-#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
+#: server/stdinhand.c:1686 server/stdinhand.c:1713 server/stdinhand.c:1731
#, c-format
msgid "Player '%s' now has AI skill level '%s'."
msgstr "Spiller '%s' har nå AI vanskelighetsgrad '%s'."
-#: server/stdinhand.c:1822
+#: server/stdinhand.c:1718
#, c-format
msgid "%s is not controlled by the AI."
msgstr "%s er ikke kontrollert av AI'en."
-#: server/stdinhand.c:1842
+#: server/stdinhand.c:1738
#, c-format
msgid "Default AI skill level set to '%s'."
msgstr "Standard AI vanskelighetsgrad er satt til '%s'."
-#: server/stdinhand.c:1857 server/stdinhand.c:2162
+#: server/stdinhand.c:1753
msgid "This command is client only."
msgstr "Denne kommandoen er kun for klienten."
-#: server/stdinhand.c:1860
+#: server/stdinhand.c:1756
msgid "Usage: away"
msgstr "Bruk: borte"
-#: server/stdinhand.c:1865
+#: server/stdinhand.c:1761
msgid "Only players may use the away command."
msgstr ""
-#: server/stdinhand.c:1869
+#: server/stdinhand.c:1765
#, c-format
msgid "%s set to away mode."
msgstr "%s satt til borde-modus."
-#: server/stdinhand.c:1877
+#: server/stdinhand.c:1772
#, c-format
msgid "%s returned to game."
msgstr "%s har returnert til spillet."
-#: server/stdinhand.c:1919
+#: server/stdinhand.c:1817
#, 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:1925
+#: server/stdinhand.c:1823
#, c-format
msgid "Unknown option '%s'."
msgstr "Ukjent alternativ '%s'."
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1848
#, fuzzy
msgid "All options with non-default values"
msgstr "= betyr at alternativet har standardverdi"
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1851
msgid "All options"
msgstr "Alle alternativer"
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1854
msgid "Vital options"
msgstr "Viktige alternativer"
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1857
msgid "Situational options"
msgstr "Situasjonsbetingede alternativer"
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1860
msgid "Rarely used options"
msgstr "Sjeldent brukte innstillinger"
-#: server/stdinhand.c:1965
+#: server/stdinhand.c:1863
msgid "+ means you may change the option"
msgstr "+ betyr at du kan endre alternativet"
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1864
msgid "= means the option is on its default value"
msgstr "= betyr at alternativet har standardverdi"
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
#, c-format
msgid "%-*s value (min,max) "
msgstr "%-*s verdi (min,maks) "
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
msgid "Option"
msgstr "Alternativ"
-#: server/stdinhand.c:1973
+#: server/stdinhand.c:1871
msgid "description"
msgstr "beskrivelse"
-#: server/stdinhand.c:2042
+#: server/stdinhand.c:1940
#, fuzzy
msgid ""
"Try 'show situational' or 'show rare' to show more options.\n"
@@ -5906,76 +5918,150 @@ msgid ""
msgstr ""
"Prøv 'show situational' eller 'show rare' for å vise flere alternativer."
-#: server/stdinhand.c:2092
+#: server/stdinhand.c:1966
msgid "Cannot change teams once game has begun."
msgstr "Kan ikke endre lagene når spillet er startet."
-#: server/stdinhand.c:2102
+#: server/stdinhand.c:1976
#, fuzzy
msgid "Undefined argument. Usage: team <player> <team>."
msgstr "Udefinert argument. Bruk: team <spiller> [lag]."
-#: server/stdinhand.c:2122
+#: server/stdinhand.c:1996
#, c-format
msgid "No such team %s. Please give a valid team name or number."
msgstr ""
-#: server/stdinhand.c:2129
+#: server/stdinhand.c:2003
msgid "Cannot team a barbarian."
msgstr "Kan ikke tilordne lag til en barbar."
-#: server/stdinhand.c:2135
+#: server/stdinhand.c:2009
#, c-format
msgid "Player %s set to team %s."
msgstr "Spiller %s er med i laget %s."
-#: server/stdinhand.c:2157
-msgid "Undefined arguments. Usage: vote yes|no [vote number]."
-msgstr "Udefinert argument. Bruk: vote yes|no [valgnummer]."
+#: server/stdinhand.c:2035 server/voting.c:512
+#, fuzzy
+msgid "Teamvote"
+msgstr "Lag"
-#: server/stdinhand.c:2165
-msgid "Observers cannot vote."
-msgstr "Observatører kan ikke stemme."
+#: server/stdinhand.c:2035 server/voting.c:516
+msgid "Vote"
+msgstr ""
-#: server/stdinhand.c:2168
+#: server/stdinhand.c:2037
+#, c-format
msgid ""
-"You can only vote in a running game. Use 'first' to become the game "
-"organizer if there currently is none."
+"%s %d \"%s\" (needs %0.0f%%%s): %d for, %d against, and %d abstained out of %"
+"d players."
msgstr ""
-#: 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:2041
+msgid " no dissent"
+msgstr ""
-#: server/stdinhand.c:2188
+#: server/stdinhand.c:2049
msgid "There are no votes going on."
msgstr "Det er ingen aktive valg."
-#: server/stdinhand.c:2208
-msgid "No legal last vote."
+#: server/stdinhand.c:2077
+#, fuzzy
+msgid "Invalid arguments. Usage: vote yes|no|abstain [vote number]."
+msgstr "Udefinert argument. Bruk: vote yes|no [valgnummer]."
+
+#: server/stdinhand.c:2095 server/stdinhand.c:2213 server/stdinhand.c:3714
+msgid "You are not allowed to use this command."
+msgstr "Du har ikke lov å bruke denne kommandoen."
+
+#: server/stdinhand.c:2104
+#, fuzzy, c-format
+msgid "The argument \"%s\" is ambigious."
+msgstr "Hjelpeargument '%s' er ikke entydig."
+
+#: server/stdinhand.c:2119
+#, fuzzy
+msgid "There are no votes running."
+msgstr "Det er ingen aktive valg."
+
+#: server/stdinhand.c:2121
+#, fuzzy, c-format
+msgid "No legal last vote (%d %s)."
msgstr "Ingen tidligere gyldige valg."
-#: server/stdinhand.c:2213
-msgid "Value must be integer."
-msgstr "Verdien må være et heltall."
+#: server/stdinhand.c:2122
+msgid "other vote running"
+msgid_plural "other votes running"
+msgstr[0] ""
+msgstr[1] ""
+
+#: server/stdinhand.c:2129 server/stdinhand.c:2491 server/stdinhand.c:2532
+msgid "Value must be an integer."
+msgstr "Verdien må være heltall"
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2135 server/stdinhand.c:2221
#, c-format
msgid "No such vote (%d)."
msgstr "Ingen slik avstemning (%d)."
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2141
+#, fuzzy
+msgid "You are not allowed to vote on that."
+msgstr "Du har ikke lov å sette dette alternativet."
+
+#: server/stdinhand.c:2146
#, c-format
msgid "You voted for \"%s\""
msgstr "Du stemte for \"%s\""
-#: server/stdinhand.c:2232
+#: server/stdinhand.c:2150
#, c-format
msgid "You voted against \"%s\""
msgstr "Du stemte mot \"%s\""
-#: server/stdinhand.c:2259
+#: server/stdinhand.c:2155
+#, c-format
+msgid "You abstained from voting on \"%s\""
+msgstr ""
+
+#: server/stdinhand.c:2190
+msgid "Missing argument <vote number> or the string \"all\"."
+msgstr ""
+
+#: server/stdinhand.c:2197
+#, fuzzy
+msgid "You don't have any vote going on."
+msgstr "Du har ikke en arbeider her."
+
+#: server/stdinhand.c:2204
+#, fuzzy
+msgid "There isn't any vote going on."
+msgstr "Det er ingen aktive valg."
+
+#: server/stdinhand.c:2209
+msgid "Server: All votes have been removed."
+msgstr ""
+
+#: server/stdinhand.c:2226
+#, fuzzy, c-format
+msgid "You are not allowed to cancel this vote (%d)."
+msgstr "Du har ikke lov å sette dette alternativet."
+
+#: server/stdinhand.c:2232
+msgid "Usage: /cancelvote [<vote number>|all]"
+msgstr ""
+
+#: server/stdinhand.c:2241
+#, c-format
+msgid "Server: %s cancelled the vote \"%s\" (number %d)."
+msgstr ""
+
+#: server/stdinhand.c:2247
+#, c-format
+msgid "Server: The vote \"%s\" (number %d) has been cancelled."
+msgstr ""
+
+#: server/stdinhand.c:2265
#, fuzzy
msgid ""
"Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
@@ -5984,131 +6070,127 @@ msgstr ""
"Udefinert argument. Bruk: debug <diplomacy <spiller> | by <x> <y> | enhet "
"<x> <y> | enhet <id> | tech <spiller>>."
-#: server/stdinhand.c:2265
+#: server/stdinhand.c:2271
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:2294
+#: server/stdinhand.c:2300
#, c-format
msgid "%s diplomacy no longer debugged"
msgstr "%s diplomati blir ikke lenger feilsøkt"
-#: server/stdinhand.c:2298
+#: server/stdinhand.c:2304
#, c-format
msgid "%s diplomacy debugged"
msgstr "%s diplomati feilsøking"
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2323
#, c-format
msgid "%s tech no longer debugged"
msgstr "%s tech blir ikke lenger feilsøkt"
-#: server/stdinhand.c:2321
+#: server/stdinhand.c:2327
#, c-format
msgid "%s tech debugged"
msgstr "%s tech feilsøking"
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2358 server/stdinhand.c:2388
msgid "Value 2 & 3 must be integer."
msgstr "Verdi 2 og 3 må være heltall."
-#: server/stdinhand.c:2356 server/stdinhand.c:2386
+#: server/stdinhand.c:2362 server/stdinhand.c:2392
msgid "Bad map coordinates."
msgstr "Ugyldige kart koordinater."
-#: server/stdinhand.c:2361
+#: server/stdinhand.c:2367
msgid "No city at this coordinate."
msgstr "Ingen by på dette koordinatet."
-#: server/stdinhand.c:2366
+#: server/stdinhand.c:2372
#, c-format
msgid "%s no longer debugged"
msgstr "%s er ikke lenger debugget."
-#: server/stdinhand.c:2392 server/stdinhand.c:2422
+#: server/stdinhand.c:2398 server/stdinhand.c:2428
#, fuzzy, c-format
msgid "%s %s no longer debugged."
msgstr "%ss %s er ikke lenger debugget."
-#: server/stdinhand.c:2397 server/stdinhand.c:2427
+#: server/stdinhand.c:2403 server/stdinhand.c:2433
#, fuzzy, c-format
msgid "%s %s debugged."
msgstr "%ss %s debugget."
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2419
msgid "Value 2 must be integer."
msgstr "Verdi 2 må være heltall"
-#: server/stdinhand.c:2417
+#: server/stdinhand.c:2423
#, c-format
msgid "Unit %d does not exist."
msgstr "Enhet %d eksisterer ikke."
-#: server/stdinhand.c:2475
+#: server/stdinhand.c:2464
msgid "Undefined argument. Usage: set <option> <value>."
msgstr "Udefinert argument. Bruk: set <alternativ> <verdi>."
-#: server/stdinhand.c:2485
+#: server/stdinhand.c:2473
msgid "You are not allowed to set this option."
msgstr "Du har ikke lov å sette dette alternativet."
-#: server/stdinhand.c:2490 server/stdinhand.c:3463
+#: server/stdinhand.c:2478 server/stdinhand.c:3501
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:2502 server/stdinhand.c:2543
-msgid "Value must be an integer."
-msgstr "Verdien må være heltall"
-
-#: server/stdinhand.c:2512
+#: server/stdinhand.c:2501
#, c-format
msgid "The parameter %s should only contain digits 0-1."
msgstr ""
-#: server/stdinhand.c:2519
+#: server/stdinhand.c:2508
msgid "Value out of range (minimum: 0, maximum: 1)."
msgstr "Verdi utenfor område (minimum: 0, maksimum: 1)."
-#: server/stdinhand.c:2534 server/stdinhand.c:2576
+#: server/stdinhand.c:2523 server/stdinhand.c:2565
#, c-format
msgid "Option: %s has been set to %d."
msgstr "Alternativ: %s har blitt satt til %d."
-#: server/stdinhand.c:2554
+#: server/stdinhand.c:2543
#, c-format
msgid "The parameter %s should only contain +- and 0-9."
msgstr ""
-#: server/stdinhand.c:2561
+#: server/stdinhand.c:2550
#, c-format
msgid "Value out of range (minimum: %d, maximum: %d)."
msgstr "Verdi utenfor område (minimum: %d, maksimum: %d)."
-#: server/stdinhand.c:2586
+#: server/stdinhand.c:2575
msgid "String value too long. Usage: set <option> <value>."
msgstr "Streng verdi for lang. Bruk: set <alternativ> <verdi>."
-#: server/stdinhand.c:2600
+#: server/stdinhand.c:2589
#, c-format
msgid "Option: %s has been set to \"%s\"."
msgstr "Alternativ: %s har blitt satt til \"%s\"."
-#: server/stdinhand.c:2658
+#: server/stdinhand.c:2652
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:2661
+#: server/stdinhand.c:2655
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:2671
+#: server/stdinhand.c:2665
#, 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
+#: server/stdinhand.c:2673
#, c-format
msgid ""
"You cannot take a new player because the maximum of %d player has already "
@@ -6119,76 +6201,76 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: server/stdinhand.c:2691
+#: server/stdinhand.c:2685
msgid "You cannot take a new player because there are no free player slots."
msgstr ""
-#: server/stdinhand.c:2702
+#: server/stdinhand.c:2696
msgid "Sorry, one can't observe barbarians in this game."
msgstr "Beklager, man kan ikke observere barbarer i dette spillet."
-#: server/stdinhand.c:2705
+#: server/stdinhand.c:2699
msgid "Sorry, one can't take barbarians in this game."
msgstr "Beklager, man kan ikke styre barbarer i dette spillet."
-#: server/stdinhand.c:2713
+#: server/stdinhand.c:2707
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:2716
+#: server/stdinhand.c:2710
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:2724
+#: server/stdinhand.c:2718
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:2727
+#: server/stdinhand.c:2721
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:2736
+#: server/stdinhand.c:2730
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:2739
+#: server/stdinhand.c:2733
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:2749
+#: server/stdinhand.c:2743
msgid "Sorry, one can't observe in this game."
msgstr "Beklager, man kan ikke observere i dette spillet."
-#: server/stdinhand.c:2754
+#: server/stdinhand.c:2748
msgid "Sorry, one can't take players in this game."
msgstr "Beklager, man kan ikke overta spillere i dette spillet."
-#: server/stdinhand.c:2760
+#: server/stdinhand.c:2754
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:2791
+#: server/stdinhand.c:2785
msgid "Usage: observe [connection-name [player-name]]"
msgstr "Bruk: observe [forbindelses-navn] <spillernavn>"
-#: server/stdinhand.c:2797
+#: server/stdinhand.c:2791
msgid "Usage: observe [player-name]"
msgstr "Bruk: observe <spillernavn>"
-#: server/stdinhand.c:2847
+#: server/stdinhand.c:2841
#, 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:2858
+#: server/stdinhand.c:2852
#, c-format
msgid "%s is already observing %s."
msgstr "%s observerer allerede %s."
-#: server/stdinhand.c:2863
+#: server/stdinhand.c:2857
#, fuzzy, c-format
msgid "%s is already observing."
msgstr "%s observerer allerede %s."
@@ -6203,243 +6285,248 @@ msgstr "%s observerer n
msgid "%s now observes"
msgstr "%s observerer nå %s"
-#: server/stdinhand.c:2969
+#: server/stdinhand.c:2971
msgid "Usage: take <connection-name> <player-name>"
msgstr "Bruk: take <forbindelsesnavn> <spillernavn>"
-#: server/stdinhand.c:2974
+#: server/stdinhand.c:2976
msgid "Usage: take <player-name>"
msgstr "Bruk: take <spillernavn>"
-#: server/stdinhand.c:2980
+#: server/stdinhand.c:2982
msgid "Usage: take [connection-name] <player-name>"
msgstr "Bruk: take [forbindelsesnavn] <spillernavn>"
-#: server/stdinhand.c:3010
+#: server/stdinhand.c:3012
#, fuzzy, c-format
msgid "%s already controls %s."
msgstr "%s styrer allerede %s"
-#: server/stdinhand.c:3024
+#: server/stdinhand.c:3026
#, 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:3059
+#: server/stdinhand.c:3061
#, c-format
msgid "being detached from %s."
msgstr "kobles fra %s."
-#: server/stdinhand.c:3135
+#: server/stdinhand.c:3146
#, fuzzy, c-format
msgid "%s now controls %s (%s, %s)."
msgstr "%s styrer nå %s (%s, %s)"
-#: server/stdinhand.c:3139 server/stdinhand.c:4260
+#: server/stdinhand.c:3150 server/stdinhand.c:4308
#: data/nation/barbarian.ruleset:3
msgid "Barbarian"
msgstr "barbarsk"
-#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
+#: server/stdinhand.c:3152 server/stdinhand.c:4310 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-sdl/plrdlg.c:645
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr "AI"
-#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-gtk-2.0/pages.c:2125
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
+#: server/stdinhand.c:3153 server/stdinhand.c:4312
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-gtk-2.0/pages.c:2127
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/connectdlg.c:215
msgid "Human"
msgstr "Menneske"
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-gtk-2.0/pages.c:2124 client/gui-win32/connectdlg.c:200
-#: client/gui-win32/connectdlg.c:212
+#: server/stdinhand.c:3155 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-gtk-2.0/pages.c:2126 client/gui-win32/connectdlg.c:202
+#: client/gui-win32/connectdlg.c:214
msgid "Alive"
msgstr "Levende"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3156 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-win32/connectdlg.c:202
msgid "Dead"
msgstr "Død"
-#: server/stdinhand.c:3147
+#: server/stdinhand.c:3159
#, fuzzy, c-format
msgid "%s failed to attach to any player."
msgstr "%s er ikke tilordnet en spillet."
-#: server/stdinhand.c:3182
+#: server/stdinhand.c:3194
msgid "Usage: detach <connection-name>"
msgstr "Bruk: detach <forbindelsesnavn>"
-#: server/stdinhand.c:3202
+#: server/stdinhand.c:3214
msgid "You can not detach other users."
msgstr "Du kan ikke fjerne andre brukere."
-#: server/stdinhand.c:3211
+#: server/stdinhand.c:3223
#, c-format
msgid "%s is not attached to any player."
msgstr "%s er ikke tilordnet en spillet."
-#: server/stdinhand.c:3234
+#: server/stdinhand.c:3246
#, c-format
msgid "%s detaching from %s"
msgstr "%s kobler fra %s."
-#: server/stdinhand.c:3240
+#: server/stdinhand.c:3252
#, fuzzy, c-format
msgid "%s no longer observing."
msgstr "%s er ikke lenger debugget."
-#: server/stdinhand.c:3259
+#: server/stdinhand.c:3271
#, c-format
msgid "detaching from %s."
msgstr "fjernes fra %s."
-#: server/stdinhand.c:3345
+#: server/stdinhand.c:3361
#, fuzzy
msgid "Usage: load <game name>"
msgstr "Bruk: load <filnavn>"
-#: server/stdinhand.c:3350
+#: server/stdinhand.c:3366
#, 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:3372
+#: server/stdinhand.c:3388
#, c-format
msgid "Cannot find savegame or scenario with the name \"%s\"."
msgstr ""
-#: server/stdinhand.c:3389
+#: server/stdinhand.c:3405
#, fuzzy, c-format
msgid "Could not load savefile: %s"
msgstr "Klarte ikke laste inn lagret spill i: %s"
-#: server/stdinhand.c:3458
+#: server/stdinhand.c:3496
#, c-format
msgid "Current ruleset directory is \"%s\""
msgstr "Nåværende katalog for regeloppsettet er: \"%s\""
-#: server/stdinhand.c:3478
+#: server/stdinhand.c:3516
#, c-format
msgid "Ruleset directory \"%s\" not found"
msgstr "Kunne ikke finne regeloppsettskatalogen \"%s\""
-#: server/stdinhand.c:3484
+#: server/stdinhand.c:3522
#, fuzzy, c-format
msgid "Ruleset directory is already \"%s\""
msgstr "Regeloppsettkatalogen er \"%s\""
-#: server/stdinhand.c:3488
+#: server/stdinhand.c:3526
#, c-format
msgid "Ruleset directory set to \"%s\""
msgstr "Regeloppsettkatalogen er \"%s\""
-#: server/stdinhand.c:3536
+#: server/stdinhand.c:3574
msgid "Goodbye."
msgstr "Adjø."
-#: server/stdinhand.c:3567
+#: server/stdinhand.c:3606
msgid "Sorry, you are not allowed to use server commands."
msgstr "Beklager, du har ikke lov å benytte kommandoer på serveren."
-#: server/stdinhand.c:3603
+#: server/stdinhand.c:3656
#, 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:3608
+#: server/stdinhand.c:3661
#, c-format
msgid "Unknown command. Try '%shelp'."
msgstr "Ukjent kommando. Forsøk '%shelp'."
-#: server/stdinhand.c:3625
-msgid "Your new vote canceled your previous vote."
+#: server/stdinhand.c:3675
+#, fuzzy
+msgid "Your new vote cancelled your previous vote."
msgstr "Din nye stemme endret din tidligere stemme."
-#: server/stdinhand.c:3633
+#: server/stdinhand.c:3688
+msgid "New teamvote"
+msgstr ""
+
+#: server/stdinhand.c:3691
+msgid "New vote"
+msgstr ""
+
+#: server/stdinhand.c:3695
#, fuzzy, c-format
-msgid "New vote (number %d) by %s: %s."
+msgid "%s (number %d) by %s: %s"
msgstr "Ny stemme, nei. %d, av %s: %s."
-#: server/stdinhand.c:3645
+#: server/stdinhand.c:3704
#, c-format
msgid "Your new vote (\"%s\") was not legal or was not recognized."
msgstr ""
-#: server/stdinhand.c:3655
-msgid "You are not allowed to use this command."
-msgstr "Du har ikke lov å bruke denne kommandoen."
-
-#: server/stdinhand.c:3680
+#: server/stdinhand.c:3726
msgid "(server prompt)"
msgstr "(server kommandolinje)"
-#: server/stdinhand.c:3787
+#: server/stdinhand.c:3835
#, fuzzy
msgid "Game ended in a draw."
msgstr "Spillet endte uavgjordt"
-#: server/stdinhand.c:3791
+#: server/stdinhand.c:3839
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:3796
+#: server/stdinhand.c:3844
msgid "Cannot end the game: no game running."
msgstr "Kan ikke avslutte spill: det er ikke noe spill igang."
-#: server/stdinhand.c:3812
+#: server/stdinhand.c:3860
#, c-format
msgid "%s has conceded the game and can no longer win."
msgstr ""
-#: server/stdinhand.c:3817
+#: server/stdinhand.c:3865
#, fuzzy
msgid "You cannot surrender now."
msgstr "Du kan ikke oppløse enheter."
-#: server/stdinhand.c:3883
+#: server/stdinhand.c:3931
#, fuzzy
msgid "Not enough human players, game will not start."
msgstr "Ikke nok spillere, spillet vil ikke starte."
-#: server/stdinhand.c:3888
+#: server/stdinhand.c:3936
#, fuzzy
msgid "No players, game will not start."
msgstr "Ikke nok spillere, spillet vil ikke starte."
-#: server/stdinhand.c:3892
+#: server/stdinhand.c:3940
#, fuzzy
msgid "Not enough nations for all players, game will not start."
msgstr "Ikke nok spillere, spillet vil ikke starte."
-#: server/stdinhand.c:3901
+#: server/stdinhand.c:3949
#, fuzzy
msgid "All players are ready; starting game."
msgstr "Der finnes allerede en spiller med det navnet."
-#: server/stdinhand.c:3915
+#: server/stdinhand.c:3963
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:3922
+#: server/stdinhand.c:3970
msgid "Cannot start the game: it is already running."
msgstr "Kan ikke starte spill: det er allerede i gang."
-#: server/stdinhand.c:3953
+#: server/stdinhand.c:4001
#, c-format
msgid "Cutting connection %s."
msgstr "Avbryter forbindelse til %s."
-#: server/stdinhand.c:3972
+#: server/stdinhand.c:4020
msgid ""
"Welcome - this is the introductory help text for the Freeciv server.\n"
"\n"
@@ -6478,126 +6565,126 @@ msgstr ""
" save - lagre det nåværende spillet\n"
" quit - avslutte"
-#: server/stdinhand.c:4007 server/stdinhand.c:4010
+#: server/stdinhand.c:4055 server/stdinhand.c:4058
msgid "Command:"
msgstr "Kommando:"
-#: server/stdinhand.c:4014
+#: server/stdinhand.c:4062
msgid "Synopsis: "
msgstr "Betydning:"
-#: server/stdinhand.c:4023
+#: server/stdinhand.c:4071
#, c-format
msgid "Level: %s"
msgstr "Nivå: %s"
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4096
msgid "The following server commands are available:"
msgstr "Følgende serverkommandoer er tilgjengelige:"
-#: server/stdinhand.c:4123
+#: server/stdinhand.c:4171
#, c-format
msgid "Help argument '%s' is ambiguous."
msgstr "Hjelpeargument '%s' er ikke entydig."
-#: server/stdinhand.c:4128
+#: server/stdinhand.c:4176
#, c-format
msgid "No match for help argument '%s'."
msgstr "Ingen treff funnet for hjelpeargument '%s'."
-#: server/stdinhand.c:4194
+#: server/stdinhand.c:4242
#, c-format
msgid "Bad list argument: '%s'. Try '%shelp list'."
msgstr "Ulovlig listeargument: '%s'. Forsøk '%shelp list'."
-#: server/stdinhand.c:4234
+#: server/stdinhand.c:4282
msgid "List of players:"
msgstr "Liste over spillere:"
-#: server/stdinhand.c:4239
+#: server/stdinhand.c:4287
msgid "<no players>"
msgstr "<ingen spillere>"
-#: server/stdinhand.c:4256
+#: server/stdinhand.c:4304
#, c-format
msgid "user %s, "
msgstr "bruker %s, "
-#: server/stdinhand.c:4267
+#: server/stdinhand.c:4315
msgid ", Dead"
msgstr ", Død"
-#: server/stdinhand.c:4270
+#: server/stdinhand.c:4318
#, c-format
msgid ", difficulty level %s"
msgstr ", vanskelighetsgrad %s"
#. TRANS: continue list, in case comma is not the separator of choice.
-#: server/stdinhand.c:4275 server/stdinhand.c:4279 client/helpdata.c:257
-#: client/helpdata.c:752 client/text.c:241 client/text.c:1224
-#: client/text.c:1262
+#: server/stdinhand.c:4323 server/stdinhand.c:4327 client/helpdata.c:257
+#: client/helpdata.c:752 client/text.c:241 client/text.c:1229
+#: client/text.c:1267
#, c-format
msgid "?clistmore:, %s"
msgstr ", %s"
-#: server/stdinhand.c:4283
+#: server/stdinhand.c:4331
#, fuzzy
msgid ", ready"
msgstr ", Død"
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4333
msgid ", not ready"
msgstr ""
-#: server/stdinhand.c:4293
+#: server/stdinhand.c:4341
#, c-format
msgid " %d connection:"
msgid_plural " %d connections:"
msgstr[0] " %d forbindelse:"
msgstr[1] " %d forbindelse:"
-#: server/stdinhand.c:4299
+#: server/stdinhand.c:4347
#, 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:4304
+#: server/stdinhand.c:4352
msgid " (observer mode)"
msgstr " (observatør modus)"
-#: server/stdinhand.c:4322
+#: server/stdinhand.c:4370
#, fuzzy
msgid "List of teams:"
msgstr "Liste over spillere:"
#. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4332
+#: server/stdinhand.c:4380
#, c-format
msgid "%2d : '%s' : %d player"
msgid_plural "%2d : '%s' : %d players"
msgstr[0] ""
msgstr[1] ""
-#: server/stdinhand.c:4352
+#: server/stdinhand.c:4400
#, c-format
msgid "%2d : '%s' : 1 player : %s"
msgstr ""
-#: server/stdinhand.c:4360
+#: server/stdinhand.c:4408
#, c-format
msgid "Empty team: %s"
msgstr ""
-#: server/stdinhand.c:4371
+#: server/stdinhand.c:4419
msgid "List of connections to server:"
msgstr "List opp forbindelser til server:"
-#: server/stdinhand.c:4375
+#: server/stdinhand.c:4423
msgid "<no connections>"
msgstr "<ingen forbindelser>"
-#: server/stdinhand.c:4399
+#: server/stdinhand.c:4447
#, fuzzy
msgid "List of scenarios available:"
msgstr "Ingen enheter tilgjengelige"
@@ -6617,7 +6704,7 @@ msgstr "%s har forsket fram Framtidsteknologi %d."
msgid "%s acquired from %s!"
msgstr "%s har skaffet %s fra %s."
-#: server/techtools.c:220
+#: server/techtools.c:221
#, c-format
msgid ""
"Discovery of %s makes the government form %s available. You may want to "
@@ -6626,37 +6713,37 @@ msgstr ""
"Oppdagelsen av %s gjør styreformen %s tilgjengelig. Du vil kanskje starte en "
"revolusjon."
-#: server/techtools.c:301
+#: server/techtools.c:302
#, c-format
msgid "Discovery of %s OBSOLETES %s in %s!"
msgstr "Oppdagelsen av %s FORELDER %s i %s!"
-#: server/techtools.c:351
+#: server/techtools.c:352
#, fuzzy, c-format
msgid "Learned %s. Our scientists focus on %s; goal is %s."
msgstr "Oppdaget %s. Våre forskere fokuserer på %s, målet er %s."
-#: server/techtools.c:369
+#: server/techtools.c:370
#, c-format
msgid "Learned %s. Scientists choose to research %s."
msgstr "Lærte %s. Forskerne valgte å forske på %s."
-#: server/techtools.c:376
+#: server/techtools.c:377
#, c-format
msgid "Learned %s. "
msgstr "Du har lært %s."
-#: server/techtools.c:379
+#: server/techtools.c:380
#, c-format
msgid "Researching %s."
msgstr "Forsker på %s"
-#: server/techtools.c:385
+#: server/techtools.c:386
#, c-format
msgid "Learned %s. Scientists do not know what to research next."
msgstr "Lærte %s. Forskerne vet ikke hva de skal forske på videre."
-#: server/techtools.c:402
+#: server/techtools.c:403
msgid ""
"Great scientists from all the world join your civilization: you get an "
"immediate advance."
@@ -6664,22 +6751,22 @@ msgstr ""
"Kloke forskere fra hele verden flytter til din sivilisasjon; du får et "
"umiddelbart gjennombrudd."
-#: server/techtools.c:570
+#: server/techtools.c:571
#, c-format
msgid "Technology goal is %s."
msgstr "Teknologimålet er %s."
-#: server/techtools.c:700
+#: server/techtools.c:708
#, c-format
msgid "You steal %s from the %s."
msgstr "Du stjeler %s fra %s."
-#: server/techtools.c:705
+#: server/techtools.c:713
#, c-format
msgid "The %s stole %s from you!"
msgstr "%s stjal %s fra deg!"
-#: server/techtools.c:710
+#: server/techtools.c:718
#, c-format
msgid "The %s have stolen %s from the %s."
msgstr "Din %s stjal %s fra %s."
@@ -6703,153 +6790,159 @@ msgstr "Ingen enheter kunne oppgraderes."
msgid "%s upgraded to %s for %d gold."
msgstr "%s oppgradert til %s for %d gull."
-#: server/unithand.c:396
+#: server/unithand.c:402
#, c-format
msgid "%s refuses to disband!"
msgstr "%s nekter å oppløses!"
-#: server/unithand.c:449
+#: server/unithand.c:455
msgid "Can't place city here."
msgstr "Kan ikke plassere by her."
-#: server/unithand.c:456
+#: server/unithand.c:462
#, c-format
msgid "Only %s can build a city."
msgstr "Kun %s kan grunnlegge en by."
-#: server/unithand.c:461
+#: server/unithand.c:467
msgid "Can't build a city."
msgstr "Kan ikke grunnlegge en by."
-#: server/unithand.c:470
+#: server/unithand.c:476
#, c-format
msgid "Only %s can add to a city."
msgstr "Kun %s kan legge til på en by."
-#: server/unithand.c:475
+#: server/unithand.c:481
msgid "Can't add to a city."
msgstr "Kan ikke legge til på en by her."
-#: server/unithand.c:481
+#: server/unithand.c:487
#, c-format
msgid "%s unit has no moves left to add to %s."
msgstr "%s enhet har ikke flere flytt å legge til %s."
-#: server/unithand.c:487
+#: server/unithand.c:493
#, c-format
msgid "%s unit has no moves left to build city."
msgstr "%s enhet har ingen flytt igjen til å bygge by."
-#: server/unithand.c:492
+#. TRANS: <city> is owned by <nation>, cannot add <unit>.
+#: server/unithand.c:499
+#, fuzzy, c-format
+msgid "%s is owned by %s, cannot add %s."
+msgstr "%s er for stor til å legge til %s."
+
+#: server/unithand.c:506
#, c-format
msgid "%s is too big to add %s."
msgstr "%s er for stor til å legge til %s."
-#: server/unithand.c:498
+#: server/unithand.c:512
#, c-format
msgid "%s needs an improvement to grow, so you cannot add %s."
msgstr "%s trenger en forbedring for å vokse, så du kan ikke legge til %s."
-#: server/unithand.c:509
+#: server/unithand.c:523
#, c-format
msgid "Can't add %s to %s."
msgstr "kan ikke legge til %s til %s."
-#: server/unithand.c:531
+#: server/unithand.c:545
#, c-format
msgid "%s added to aid %s in growing."
msgstr "%s lagt til for å hjelpe %s å vokse."
-#: server/unithand.c:828
+#: server/unithand.c:842
msgid "Your Nuclear missile was shot down by SDI defences, what a waste."
msgstr "Din atomrakett ble skutt ned av SDI forsvar. For en sløsing."
-#: server/unithand.c:831
+#: server/unithand.c:845
#, c-format
msgid "The nuclear attack on %s was avoided by your SDI defense."
msgstr "Atomangrepet på %s ble unngått av ditt SDI-forsvar."
#. TRANS: "Your Cannon ... the Polish Destroyer."
-#: server/unithand.c:901
+#: server/unithand.c:915
#, fuzzy, c-format
msgid "Your %s survived the pathetic attack from the %s %s."
msgstr "Din %s overlevde det feige angrepet fra %s %s."
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unithand.c:910
+#: server/unithand.c:924
#, fuzzy, c-format
msgid "Your attacking %s failed against the %s %s!"
msgstr "Din %s mislykkes i sitt angrep mot %s %s!"
-#: server/unithand.c:983
+#: server/unithand.c:997
#, c-format
msgid "Only %s can attack from sea."
msgstr "Kun %s kan angripe fra sjøen."
-#: server/unithand.c:988
+#: server/unithand.c:1002
msgid "Cannot attack from sea."
msgstr "Kan ikke angripe fra sjøen."
-#: server/unithand.c:996 server/unittools.c:2137
+#: server/unithand.c:1010 server/unittools.c:2142
msgid "Cannot attack unless you declare war first."
msgstr "Kan ikke angripe hvis du ikke erklærer krig først."
-#: server/unithand.c:1001
+#: server/unithand.c:1015
#, c-format
msgid "%s can only move into your own zone of control."
msgstr "%s kan kun bevege seg i din kontrollsone."
-#: server/unithand.c:1007
+#: server/unithand.c:1021
#, fuzzy, c-format
msgid "Cannot invade unless you break peace with %s first."
msgstr "Kan ikke angripe hvis du ikke erklærer krig først."
-#: server/unithand.c:1052
+#: server/unithand.c:1066
msgid "This unit has no moves left."
msgstr "Denne enheten har ingen flytt igjen."
-#: server/unithand.c:1107
+#: server/unithand.c:1121
msgid "Unit must be on land to perform diplomatic action."
msgstr "Enheten må være på land for å utføre diplomatiske forhandlinger."
-#: server/unithand.c:1109
+#: server/unithand.c:1123
msgid "No diplomat action possible."
msgstr "Ikke mulig å utføre diplomattjenester."
-#: server/unithand.c:1125
+#: server/unithand.c:1139
#, c-format
msgid "You must declare war on %s first. Try using players dialog (F3)."
msgstr ""
-#: server/unithand.c:1143
+#: server/unithand.c:1157
msgid "This unit is being transported, and so cannot bombard."
msgstr "Denne enheten blir transportert, og kan dermed ikke bombardere."
-#: server/unithand.c:1158
+#: server/unithand.c:1172
msgid "You can't attack there."
msgstr "Du kan ikke angripe der."
-#: server/unithand.c:1180
+#: server/unithand.c:1194
msgid "This type of troops cannot take over a city."
msgstr "Denne typen enhet kan ikke ta over en by."
-#: server/unithand.c:1198
+#: server/unithand.c:1212
msgid "A transported unit is not allied to all units or city on target tile."
msgstr ""
"En transportert enhet er ikke alliert med alle enheter eller byer på "
"destinasjonen."
-#: server/unithand.c:1240
+#: server/unithand.c:1254
#, c-format
msgid "Your %s helps build the %s in %s (%d remaining)."
msgstr "Din %s hjelper å bygge %s i %s (%d gjenstående)."
-#: server/unithand.c:1242
+#: server/unithand.c:1256
#, c-format
msgid "Your %s helps build the %s in %s (%d surplus)."
msgstr "Din %s hjelper å bygge %s i %s (%d overskudd)."
-#: server/unithand.c:1286
+#: server/unithand.c:1300
#, c-format
msgid ""
"Sorry, your %s cannot establish a trade route because it has no home city"
@@ -6857,27 +6950,27 @@ msgstr ""
"Beklager, din %s kan ikke etablere en handelsrute her fordi den ikke har en "
"hjemby"
-#: server/unithand.c:1296
+#: server/unithand.c:1310
#, c-format
msgid "Sorry, your %s cannot establish a trade route between %s and %s"
msgstr "Beklager, din %s kan ikke etablere en handelsrute mellom %s og %s"
-#: server/unithand.c:1325 server/unithand.c:1344
+#: server/unithand.c:1339 server/unithand.c:1358
#, c-format
msgid "Sorry, your %s cannot establish a trade route here!"
msgstr "Beklager, din %s kan ikke etablere en handelsrute her!"
-#: server/unithand.c:1329 server/unithand.c:1348
+#: server/unithand.c:1343 server/unithand.c:1362
#, c-format
msgid " The city of %s already has %d better trade routes!"
msgstr " Byen %s har allerede %d bedre handelsruter!"
-#: server/unithand.c:1361 server/unithand.c:1373
+#: server/unithand.c:1375 server/unithand.c:1387
#, c-format
msgid "Sorry, %s has canceled the trade route from %s to your city %s."
msgstr "beklager, %s har avbrutt handelsruten fra %s til din by %s."
-#: server/unithand.c:1406
+#: server/unithand.c:1420
#, c-format
msgid ""
"Your %s from %s has arrived in %s, and revenues amount to %d in gold and "
@@ -6937,56 +7030,56 @@ msgid "Teleported your %s to %s."
msgstr "Teleportet din %s til %s."
#. TRANS: A unit is moved to resolve stack conflicts.
-#: server/unittools.c:1065
+#: server/unittools.c:1070
#, fuzzy, c-format
msgid "Moved your %s."
msgstr "Oppløste din %s."
-#: server/unittools.c:1076
+#: server/unittools.c:1081
#, c-format
msgid "Disbanded your %s."
msgstr "Oppløste din %s."
-#: server/unittools.c:1397
+#: server/unittools.c:1402
#, c-format
msgid "Unable to defend %s, %s has lost the game."
msgstr "Kan ikke forsvare %s, %s har tapt spillet."
-#: server/unittools.c:1401
+#: server/unittools.c:1406
#, c-format
msgid "Losing %s meant losing the game! Be more careful next time!"
msgstr "Ved å miste %s, så taper du spillet! Vær mer forsiktig neste gang!"
-#: server/unittools.c:1503
+#: server/unittools.c:1508
#, c-format
msgid "%s escaped the destruction of %s, and fled to %s."
msgstr "%s unnslapp ødeleggelsen av %s, og flyktet til %s."
# problem
-#: server/unittools.c:1512
+#: server/unittools.c:1517
#, c-format
msgid "%s lost when %s was lost."
msgstr "%s gikk tapt da %s gikk tapt."
-#: server/unittools.c:1561
+#: server/unittools.c:1566
#, c-format
msgid "Barbarian leader captured, %d gold ransom paid."
msgstr "Barbarleder fanget, %d gull betalt i løsepenger."
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unittools.c:1579
+#: server/unittools.c:1584
#, fuzzy, c-format
msgid "Your attacking %s succeeded against the %s %s!"
msgstr "Din %s lykkes i sitt angrep mot %s %s!"
#. TRANS: "Cannon ... the Polish Destroyer."
-#: server/unittools.c:1588 server/unittools.c:1646
+#: server/unittools.c:1593 server/unittools.c:1651
#, fuzzy, c-format
msgid "%s lost to an attack by the %s %s."
msgstr "%s gikk tapt i et angrep fra %s %s."
#. TRANS: "... Cannon ... the Polish Destroyer ...."
-#: server/unittools.c:1622
+#: server/unittools.c:1627
#, fuzzy, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -6997,7 +7090,7 @@ msgstr[1] "Din %s lykkes i sitt angrep mot %s %s %d!"
# problem
#. TRANS: "Cannon lost when the Polish Destroyer
#. * attacked the German Musketeers."
-#: server/unittools.c:1655
+#: server/unittools.c:1660
#, fuzzy, c-format
msgid "%s lost when the %s %s attacked the %s %s."
msgstr "%s gikk tapt i et angrep fra %ss %s."
@@ -7005,7 +7098,7 @@ msgstr "%s gikk tapt i et angrep fra %ss %s."
# problem
#. TRANS: "Musketeers (and Cannon) lost to an
#. * attack from the Polish Destroyer."
-#: server/unittools.c:1670
+#: server/unittools.c:1675
#, fuzzy, c-format
msgid "%s (and %s) lost to an attack from the %s %s."
msgstr "%s (%s) gikk tapt i et angrep fra %ss %s."
@@ -7014,7 +7107,7 @@ msgstr "%s (%s) gikk tapt i et angrep fra %ss %s."
#. TRANS: "Musketeers and 3 other units lost to
#. * an attack from the Polish Destroyer."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1680
+#: server/unittools.c:1685
#, fuzzy, 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."
@@ -7025,184 +7118,227 @@ msgstr[1] "%s (%d) gikk tapt i et angrep fra %ss %s."
#. TRANS: "2 units lost when the Polish Destroyer
#. * attacked the German Musketeers."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1694
+#: server/unittools.c:1699
#, fuzzy, 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 gikk tapt i et angrep fra %ss %s."
msgstr[1] "%d gikk tapt i et angrep fra %ss %s."
-#: server/unittools.c:1962
+#: server/unittools.c:1967
#, c-format
msgid "Your %s was nuked by %s."
msgstr "Din %s ble utsatt for atomangrep fra %s."
-#: server/unittools.c:1965 server/unittools.c:1981
+#: server/unittools.c:1970 server/unittools.c:1986
msgid "yourself"
msgstr "deg selv"
# problem
-#: server/unittools.c:1969
+#: server/unittools.c:1974
#, fuzzy, c-format
msgid "The %s %s was nuked."
msgstr "%ss %s ble utsatt for atomangrep."
-#: server/unittools.c:1978
+#: server/unittools.c:1983
#, c-format
msgid "%s was nuked by %s."
msgstr "%s ble utsatt for atomangrep fra %s."
-#: server/unittools.c:1986
+#: server/unittools.c:1991
#, c-format
msgid "You nuked %s."
msgstr "Du utførte et atomangrep mot %s."
-#: server/unittools.c:2027
+#: server/unittools.c:2032
#, fuzzy, c-format
msgid "The %s detonated a nuke!"
msgstr "%s detonerte en atombombe!"
-#: server/unittools.c:2051
+#: server/unittools.c:2056
#, c-format
msgid "%s transported successfully."
msgstr "%s ble transportert trygt fram."
-#: server/unittools.c:2103
+#: server/unittools.c:2108
msgid "This unit type can not be paradropped."
msgstr "Denne enheten kan ikke gjøre fallskjermhopp."
-#: server/unittools.c:2113
+#: server/unittools.c:2118
#, fuzzy
msgid "You cannot paradrop a unit that is transporting other units."
msgstr "Du kan ikke sende en transport-enhet med fallskjerm."
-#: server/unittools.c:2119
+#: server/unittools.c:2124
msgid "The destination location is not known."
msgstr "Bestemmelsesstedet er ukjent."
-#: server/unittools.c:2126
+#: server/unittools.c:2131
#, fuzzy, c-format
msgid "This unit cannot paradrop into %s."
msgstr "Denne enheten kan ikke ta fallskjermhopp ut i havet."
-#: server/unittools.c:2146
+#: server/unittools.c:2151
#, c-format
msgid "The distance to the target (%i) is greater than the unit's range (%i)."
msgstr "Lengden til målet (%i) er større enn enhetens rekkevidde (%i)."
-#: server/unittools.c:2157
+#: server/unittools.c:2162
#, fuzzy, c-format
msgid "Your %s paradropped into the %s and was lost."
msgstr "Dine %s utførte et fallskjermhopp ut i øde hav og druknet alle sammen."
-#: server/unittools.c:2170
+#: server/unittools.c:2175
#, c-format
msgid "Your %s was killed by enemy units at the paradrop destination."
msgstr "Dine %s ble slaktet på hoppstedet."
-#: server/unittools.c:2192
+#: server/unittools.c:2197
#, c-format
msgid "You found %d gold."
msgstr "Du fant %d gull."
-#: server/unittools.c:2209
+#: server/unittools.c:2214
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr "Du fant %s i eldgamle skriftruller med kunnskap."
-#: server/unittools.c:2216
+#: server/unittools.c:2221
#, c-format
msgid "The %s have acquired %s from ancient scrolls of wisdom."
msgstr "%s har tilegnet seg %s fra eldgamle skriftruller med kunnskap."
-#: server/unittools.c:2230
+#: server/unittools.c:2235
msgid "A band of friendly mercenaries joins your cause."
msgstr ""
"En gjeng med leiesoldater som ikke har sett penger på lenge slutter seg til "
"dine rekker."
-#: server/unittools.c:2248
+#: server/unittools.c:2253
msgid "An abandoned village is here."
msgstr "En forlatt landsby er her."
-#: server/unittools.c:2258
+#: server/unittools.c:2263
msgid "You have unleashed a horde of barbarians!"
msgstr "Du har fremprovosert en fiendtlig barbarhorde!"
-#: server/unittools.c:2261
+#: server/unittools.c:2266
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr "Dine %s har blitt slaktet av en gjeng med pinglete barbarer."
-#: server/unittools.c:2277
+#: server/unittools.c:2282
msgid "You found a friendly city."
msgstr "Du fant en vennlig by."
-#: server/unittools.c:2291
+#: server/unittools.c:2296
msgid "Friendly nomads are impressed by you, and join you."
msgstr ""
"Vennligsinnede nomader er imponert av at du kan spille munnspill under vann "
"og slutter seg til dine rekker."
-#: server/unittools.c:2316
+#: server/unittools.c:2321
msgid "Your overflight frightens the tribe; they scatter in terror."
msgstr "Din overflyvning skremmer stammen; de sprer seg i frykt."
-#: server/unittools.c:2574
+#: server/unittools.c:2579
#, fuzzy, c-format
msgid "Orders for %s aborted after enemy movement was spotted."
msgstr "Ordre for %s avbrutt, da der er enheter i veien."
-#: server/unittools.c:3023
+#: server/unittools.c:3028
#, c-format
msgid "Orders for %s aborted as there are units nearby."
msgstr "Ordre for %s avbrutt, da der er enheter i veien."
-#: server/unittools.c:3075
+#: server/unittools.c:3080
#, fuzzy, c-format
msgid "Orders for %s aborted because building of city failed."
msgstr "Ordre for %s ble avbrutt på grunn av et feilet flytt."
-#: server/unittools.c:3088
+#: server/unittools.c:3093
#, c-format
msgid "Orders for %s aborted since they give an invalid activity."
msgstr "Ordre for %s avbrutt, da da der er enheter i veien."
-#: server/unittools.c:3102
+#: server/unittools.c:3107
#, c-format
msgid "Orders for %s aborted since they give an invalid location."
msgstr "Ordre for %s avbrutt siden de angir en ugyldig plassering."
-#: server/unittools.c:3112
+#: server/unittools.c:3117
#, c-format
msgid "Orders for %s aborted as there are units in the way."
msgstr "%s avbrøt ordre da der er enheter i veien."
-#: server/unittools.c:3138
+#: server/unittools.c:3143
#, c-format
msgid "Orders for %s aborted because of failed move."
msgstr "Ordre for %s ble avbrutt på grunn av et feilet flytt."
-#: server/unittools.c:3179
+#: server/unittools.c:3184
#, fuzzy, c-format
msgid "Attempt to change homecity for %s failed."
msgstr "Forandret hjemby for %s i %s"
-#: server/unittools.c:3190
+#: server/unittools.c:3195
#, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr ""
-#: server/unittools.c:3202
+#: server/unittools.c:3207
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr ""
-#: server/unittools.c:3211
+#: server/unittools.c:3216
#, c-format
msgid "Your %s has invalid orders."
msgstr "Din %s har ugyldige ordre."
+#: server/voting.c:522
+#, fuzzy, c-format
+msgid ""
+"%s %d \"%s\" is passed %d to %d with %d abstentions and %d who did not vote."
+msgstr "Valget \"%s\" ble vedtatt med %d mot %d stemmer (%d stemte ikke)."
+
+#: server/voting.c:528
+#, fuzzy, c-format
+msgid ""
+"%s %d \"%s\" failed with %d against, %d for, %d abstentions and %d who did "
+"not vote."
+msgstr ""
+"Valget \"%s\" ble ikke vedtatt med %d mot, %d for og %d som unnlot å stemme."
+
+#: server/voting.c:548
+#, c-format
+msgid "%s %d: %s voted yes."
+msgstr ""
+
+#: server/voting.c:553
+#, c-format
+msgid "%s %d: %s voted no."
+msgstr ""
+
+#: server/voting.c:558
+#, c-format
+msgid "%s %d: %s chose to abstain."
+msgstr ""
+
+#. TRANS: Describing a new vote that can only pass
+#. * if there are no dissenting votes.
+#: server/voting.c:726
+#, c-format
+msgid "%s (needs %0.0f%% and no dissent)."
+msgstr ""
+
+#. TRANS: Describing a new vote that can pass only if the
+#. * given percentage of players votes 'yes'.
+#: server/voting.c:732
+#, c-format
+msgid "%s (needs %0.0f%% in favor)."
+msgstr ""
+
#: server/generator/mapgen.c:1771
msgid "High landmass - this may take a few seconds."
msgstr "Mye landmasse - dette kan ta noen sekunder."
@@ -7234,13 +7370,13 @@ msgstr ""
" Kanskje det er for mange spillere for dette kartet.\n"
"Vennligst rapporter denne feilen til %s."
-#: client/attribute.c:363
+#: client/attribute.c:368
#, fuzzy
msgid ""
"There has been a CMA error. Your citizen governor settings may be broken."
msgstr "Det har oppstått en Byforvaltningsfeil. Ditt oppsett kan være ødelagt."
-#: client/attribute.c:367
+#: client/attribute.c:372
msgid "Old attributes detected and removed."
msgstr "Gamle attributter oppdaget og fjernet."
@@ -7390,41 +7526,41 @@ msgstr "%s - %s innbyggere"
msgid "%+4d : Taxed from trade\n"
msgstr ""
-#: client/citydlg_common.c:418
+#: client/citydlg_common.c:421
#, fuzzy, c-format
msgid "%+4d : Trade route with %s\n"
msgstr "Handelsruter"
-#: client/citydlg_common.c:427
+#: client/citydlg_common.c:430
#, fuzzy, c-format
msgid "%+4d : Building tithes\n"
msgstr "Bygger enheter"
-#: client/citydlg_common.c:450
+#: client/citydlg_common.c:453
#, c-format
msgid "%+4d : Bonus from %s (%+d%%)\n"
msgstr ""
-#: client/citydlg_common.c:462
+#: client/citydlg_common.c:465
#, c-format
msgid "%+4d : Waste\n"
msgstr ""
-#: client/citydlg_common.c:468
+#: client/citydlg_common.c:471
#, c-format
msgid "%+4d : Disorder\n"
msgstr ""
-#: client/citydlg_common.c:474
+#: client/citydlg_common.c:477
#, c-format
msgid "%+4d : Used\n"
msgstr ""
-#: client/citydlg_common.c:479
+#: client/citydlg_common.c:482
msgid "==== : Adds up to\n"
msgstr ""
-#: client/citydlg_common.c:481
+#: client/citydlg_common.c:484
#, c-format
msgid "%4d : Total surplus"
msgstr ""
@@ -7748,50 +7884,50 @@ msgstr "?Spesielle:S"
msgid "Specialists"
msgstr "Spesielle"
-#: client/civclient.c:240
+#: client/civclient.c:241
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr " -a, --autoconnect\tHopper over Koble til dialogen\n"
-#: client/civclient.c:250
+#: client/civclient.c:251
msgid " -l, --log FILE\tUse FILE as logfile (spawned server also uses this)\n"
msgstr " -l, --log FILE\tBruk FILE som loggfil.\n"
-#: client/civclient.c:252
+#: client/civclient.c:253
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr " -m, --meta HOST\tKoble til metaserveren på HOST\n"
-#: client/civclient.c:254
+#: client/civclient.c:255
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr " -n, --name NAVN\tBruk NAVN som navn\n"
-#: client/civclient.c:256
+#: client/civclient.c:257
#, fuzzy
msgid " -p, --port PORT\tConnect to server port PORT (usually with -a)\n"
msgstr " -p, --port PORT\tKoble til PORT.\n"
-#: client/civclient.c:258
+#: client/civclient.c:259
#, c-format
msgid " -P, --Plugin PLUGIN\tUse PLUGIN for sound output %s\n"
msgstr " -P, --Plugin PLUGIN\tBenytter PLUGIN for lydstøtte %s\n"
-#: client/civclient.c:260
+#: client/civclient.c:261
msgid " -r, --read FILE\tRead startup script FILE (for spawned server only)\n"
msgstr " -r, --read FILE\tLes oppstartsmanus i FILE\n"
-#: client/civclient.c:263
+#: client/civclient.c:264
#, fuzzy
msgid " -s, --server HOST\tConnect to the server at HOST (usually with -a)\n"
msgstr " -s, --server S\tKoble til serveren S\n"
-#: client/civclient.c:265
+#: client/civclient.c:266
msgid " -S, --Sound FILE\tRead sound tags from FILE\n"
msgstr " -s, --sound FIL\tLes lyd-informasjon fra FIL\n"
-#: client/civclient.c:266
+#: client/civclient.c:267
msgid " -t, --tiles FILE\tUse data file FILE.tilespec for tiles\n"
msgstr " -t, --tiles FIL\tBruk datafile FIL.tilespec for grafikkoppsett\n"
-#: client/civclient.c:269
+#: client/civclient.c:270
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7801,45 +7937,45 @@ msgstr ""
"\t\t\tPrøv \"%s -- --help\" for mer info.\n"
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:274
+#: client/civclient.c:275
#, fuzzy, c-format
msgid "Report bugs at %s\n"
msgstr "Rapporter feil, unoter og/eller 'bugs' til <%s>.\n"
-#: client/civclient.c:298
+#: client/civclient.c:299
#, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr "Ugyldig portnummer \"%s\" spesifisert med --port valget.\n"
-#: client/civclient.c:300 client/civclient.c:315
+#: client/civclient.c:301 client/civclient.c:316
msgid "Try using --help.\n"
msgstr "Prøv --help.\n"
-#: client/civclient.c:313
+#: client/civclient.c:314
#, c-format
msgid "Invalid debug level \"%s\" specified with --debug option.\n"
msgstr "Ugyldig debuggingsnivå \"%s\" spesifisert med --debug valget.\n"
-#: client/civclient.c:326
+#: client/civclient.c:327
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr "Ukjent alternativ: \"%s\"\n"
-#: client/civclient.c:391
+#: client/civclient.c:393
#, fuzzy, c-format
msgid "Updating old metaserver address \"%s\"."
msgstr "metaserver <addresse>"
-#: client/civclient.c:394
+#: client/civclient.c:396
#, fuzzy, c-format
msgid "Default metaserver has been set to \"%s\"."
msgstr "Alternativ: %s har blitt satt til \"%s\"."
-#: client/civclient.c:550
+#: client/civclient.c:540
msgid "Game started."
msgstr "Spillet har startet."
-#: client/civclient.c:588
+#: client/civclient.c:606
msgid "There was an error while auto connecting; aborting."
msgstr "Det oppstod en feil under automatisk forbindelse, avbryter."
@@ -7969,17 +8105,17 @@ msgstr "Tilkobling under opprettelse."
msgid "Disconnected from server."
msgstr "Koblet fra tjeneren."
-#: client/clinet.c:469
+#: client/clinet.c:473
#, c-format
msgid "Failed to contact server \"%s\" at port %d as \"%s\" after %d attempts"
msgstr ""
"Kunne ikke koble til serveren \"%s\" på port %d som \"%s\" etter %d forsøk"
-#: client/clinet.c:484 client/clinet.c:486
+#: client/clinet.c:488 client/clinet.c:490
msgid "Connection to server refused. Please start the server."
msgstr "Forbindelse til serveren nektet. Vennligst start serveren."
-#: client/clinet.c:495 client/clinet.c:523
+#: client/clinet.c:499 client/clinet.c:527
#, c-format
msgid ""
"Error contacting server \"%s\" at port %d as \"%s\":\n"
@@ -7988,7 +8124,7 @@ msgstr ""
"Kunne ikke kontakte server \"%s\" på port %d som \"%s\":\n"
" %s\n"
-#: client/clinet.c:514
+#: client/clinet.c:518
#, c-format
msgid ""
"Auto-connecting to server \"%s\" at port %d as \"%s\" every %f second(s) for "
@@ -7997,53 +8133,53 @@ 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:1358
+#: client/connectdlg_common.c:78 client/gui-gtk-2.0/pages.c:1358
msgid "novice"
msgstr "nybegynner"
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1358
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
msgid "easy"
msgstr "lett"
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1359
msgid "normal"
msgstr "normal"
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr "vanskelig"
-#: client/connectdlg_common.c:83
+#: client/connectdlg_common.c:82
msgid "experimental"
msgstr "eksperimentell"
-#: client/connectdlg_common.c:213
+#: client/connectdlg_common.c:212
msgid "Starting server..."
msgstr "Starter tjeneren..."
-#: client/connectdlg_common.c:332
+#: client/connectdlg_common.c:331
msgid "Couldn't start the server."
msgstr "Klarte ikke å starte tjeneren."
-#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
+#: client/connectdlg_common.c:332 client/connectdlg_common.c:365
msgid "You'll have to start one manually. Sorry..."
msgstr "Du må starte en tjener selv. Beklager..."
-#: client/connectdlg_common.c:364
+#: client/connectdlg_common.c:363
msgid "Couldn't connect to the server."
msgstr "Klarte ikke å koble til tjeneren."
-#: client/connectdlg_common.c:365
+#: client/connectdlg_common.c:364
msgid "We probably couldn't start it from here."
msgstr "Vi kunne sannsynligvis ikke starte herfra."
-#: client/connectdlg_common.c:470
+#: client/connectdlg_common.c:469
#, fuzzy
msgid ""
"Established control over the server. You have command access level 'hack'."
msgstr "Vi har kontroll over tjeneren (hack tilgangsnivå)"
-#: client/connectdlg_common.c:475
+#: client/connectdlg_common.c:474
msgid ""
"Failed to obtain the required access level to take control of the server. "
"The server will now be shutdown."
@@ -8053,28 +8189,28 @@ msgstr ""
msgid "Only transporter units can be unloaded."
msgstr "Kun transportenheter kan lastes av."
-#: client/control.c:1425
+#: client/control.c:1417
#, fuzzy
msgid "Only settler units can be put into auto mode."
msgstr "Kun nybyggere og militære enheter i byer kan plasseres i auto-modus."
-#: client/control.c:1516
+#: client/control.c:1511
msgid "Only nuclear units can do this."
msgstr "Kun atombombe-enheter kan gjøre dette."
-#: client/control.c:1545
+#: client/control.c:1540
msgid "Only paratrooper units can do this."
msgstr "Kun fallskjermjegere kan gjøre dette."
-#: client/control.c:2020
+#: client/control.c:2015
msgid "Too far for this unit."
msgstr "For langt for denne enheten."
-#: client/control.c:2230 client/control.c:2260 client/control.c:2276
+#: client/control.c:2225 client/control.c:2255 client/control.c:2271
msgid "Didn't find a route to the destination!"
msgstr "Fant ingen rute til målet."
-#: client/control.c:2320
+#: client/control.c:2315
msgid "Oh my! You seem to have no capital!"
msgstr "Herregud! Du har ingen hovedstad!"
@@ -8470,27 +8606,34 @@ 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:1066 client/helpdata.c:1400
+#: client/helpdata.c:1066 client/helpdata.c:1408
msgid " or "
msgstr " eller "
-#: client/helpdata.c:1068 client/helpdata.c:1388
+#: client/helpdata.c:1068 client/helpdata.c:1396
msgid "?or:, "
msgstr "?eller:, "
-#: client/helpdata.c:1080
-#, 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"
+#: client/helpdata.c:1079
+#, fuzzy, c-format
+msgid "* Unit has to be in a city, or a base after %d turn.\n"
+msgid_plural "* Unit has to be in a city, or a base 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:1087
+#, fuzzy, c-format
+msgid "* Unit has to be in a city, a base, or on a %s after %d turn.\n"
+msgid_plural "* Unit has to be in a city, a base, 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:1122
+#: client/helpdata.c:1130
#, 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:1127
+#: client/helpdata.c:1135
#, c-format
msgid ""
"To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8499,91 +8642,91 @@ msgstr ""
"For å nå %s trenger vi å anskaffe %d andre teknologier først. Hele "
"prosjektet krever %d forskningspoeng for å fullføres."
-#: client/helpdata.c:1135
+#: client/helpdata.c:1143
msgid "You cannot research this technology."
msgstr "Du kan ikke forske på denne teknologien."
-#: client/helpdata.c:1139
+#: client/helpdata.c:1147
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:1151
+#: client/helpdata.c:1159
#, 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:1156
+#: client/helpdata.c:1164
#, 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:1159
+#: client/helpdata.c:1167
#, 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:1163
+#: client/helpdata.c:1171
msgid "* Increases the pollution generated by the population.\n"
msgstr "* Øker forurensningen skapt av befolkningen.\n"
-#: client/helpdata.c:1168
+#: client/helpdata.c:1176
#, c-format
msgid "* Allows %s to build roads on river squares.\n"
msgstr "* Tillater %s å bygge veier på elve-felt\n"
-#: client/helpdata.c:1175
+#: client/helpdata.c:1183
#, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr "* Tillater %s å bygge fort.\n"
-#: client/helpdata.c:1183
+#: client/helpdata.c:1191
#, c-format
msgid "* Allows %s to build airbases.\n"
msgstr "* Tillater %s å bygge flybaser.\n"
-#: client/helpdata.c:1192
+#: client/helpdata.c:1200
#, c-format
msgid "* Allows %s to upgrade roads to railroads.\n"
msgstr "* Tillater %s å oppgradere veier til jernbane.\n"
-#: client/helpdata.c:1200
+#: client/helpdata.c:1208
#, c-format
msgid "* Allows %s to upgrade irrigation to farmland.\n"
msgstr "* Tillater %s å oppgradere irrigert land til jordbruksland.\n"
-#: client/helpdata.c:1234
+#: client/helpdata.c:1242
msgid "* Pollution cannot be generated on this terrain."
msgstr "* Dette terrenget kan ikke bli forurenset."
-#: client/helpdata.c:1239
+#: client/helpdata.c:1247
msgid "* You cannot build cities on this terrain."
msgstr "* Kan ikke bygge byer på slikt terreng."
-#: client/helpdata.c:1245
+#: client/helpdata.c:1253
msgid "* The coastline of this terrain is unsafe."
msgstr "* Kystlinja til dette terrenget er utrygg."
-#: client/helpdata.c:1250
+#: client/helpdata.c:1258
msgid "* This terrain is unsafe for units to travel on."
msgstr "* Dette terrenget er utrygt for ferdsel."
-#: client/helpdata.c:1255
+#: client/helpdata.c:1263
msgid "* Land units cannot travel on oceanic terrains."
msgstr "* Landenheter kan ikke ferdes over havterreng."
-#: client/helpdata.c:1305
+#: client/helpdata.c:1313
msgid "Features:\n"
msgstr ""
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1411 client/helpdata.c:1412
+#: client/helpdata.c:1419 client/helpdata.c:1420
msgid "?outputlist: Nothing "
msgstr ""
-#: client/helpdata.c:1419
+#: client/helpdata.c:1427
#, fuzzy, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -8594,7 +8737,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:1429
+#: client/helpdata.c:1437
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8602,48 +8745,48 @@ msgid ""
msgstr ""
#. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1437
+#: client/helpdata.c:1445
#, c-format
msgid "* You pay %d times normal %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1442
+#: client/helpdata.c:1450
#, 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:1447
+#: client/helpdata.c:1455
#, c-format
msgid "* You pay no %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1451
+#: client/helpdata.c:1459
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:1460
+#: client/helpdata.c:1468
#, 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:1468
+#: client/helpdata.c:1476
#, c-format
msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
msgstr ""
-#: client/helpdata.c:1475
+#: client/helpdata.c:1483
#, 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:1482
+#: client/helpdata.c:1490
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -8651,23 +8794,23 @@ msgid ""
msgstr ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1489
+#: client/helpdata.c:1497
#, 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:1497
+#: client/helpdata.c:1505
#, c-format
msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
msgstr ""
-#: client/helpdata.c:1502
+#: client/helpdata.c:1510
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr ""
-#: client/helpdata.c:1507
+#: client/helpdata.c:1515
#, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -8678,7 +8821,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1519
+#: client/helpdata.c:1527
#, 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"
@@ -8686,64 +8829,64 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1530
+#: client/helpdata.c:1538
#, 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:1536
+#: client/helpdata.c:1544
#, fuzzy
msgid "* Your units cannot be bribed.\n"
msgstr "Denne enheten kan ikke bestikkes."
-#: client/helpdata.c:1539
+#: client/helpdata.c:1547
#, fuzzy
msgid "* Your cities cannot be incited.\n"
msgstr "Byen kan ikke bli infiltrert!"
-#: client/helpdata.c:1543
+#: client/helpdata.c:1551
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:1549
+#: client/helpdata.c:1557
msgid "* Has a senate that may prevent declaration of war.\n"
msgstr ""
-#: client/helpdata.c:1553
+#: client/helpdata.c:1561
msgid "* Allows partisans when cities are taken by the enemy.\n"
msgstr ""
-#: client/helpdata.c:1557
+#: client/helpdata.c:1565
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
msgstr ""
-#: client/helpdata.c:1561
+#: client/helpdata.c:1569
msgid "* Pays no upkeep for fanatics.\n"
msgstr ""
-#: client/helpdata.c:1564
+#: client/helpdata.c:1572
#, fuzzy
msgid "* Has no unhappy citizens.\n"
msgstr "%d ulykkelige innbyggere."
-#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
+#: client/helpdata.c:1582 client/helpdata.c:1586 client/helpdata.c:1590
#, c-format
msgid "* Veteran %s units.\n"
msgstr ""
-#: client/helpdata.c:1585
+#: client/helpdata.c:1593
#, fuzzy
msgid "* Veteran units.\n"
msgstr "Sjøenheter"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1591
+#: client/helpdata.c:1599
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8751,7 +8894,7 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1600
+#: client/helpdata.c:1608
#, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8759,71 +8902,71 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1608
+#: client/helpdata.c:1616
#, 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:1617
+#: client/helpdata.c:1625
#, c-format
msgid "* %s production is increased %d%%.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1625
+#: client/helpdata.c:1633
#, c-format
msgid "* %s production will suffer massive waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1630
+#: client/helpdata.c:1638
#, c-format
msgid "* %s production will suffer some waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1635
+#: client/helpdata.c:1643
#, 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:1643
+#: client/helpdata.c:1651
#, 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:1649
+#: client/helpdata.c:1657
#, 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:1655
+#: client/helpdata.c:1663
#, c-format
msgid "* %s waste will increase slowly with distance from capital.\n"
msgstr ""
-#: client/helpdata.c:1672
+#: client/helpdata.c:1680
#, 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:1699
+#: client/helpdata.c:1707
#, fuzzy, c-format
msgid "%s%d %s"
msgstr "%3d/%3d %s"
-#: client/helpdata.c:1700 client/helpdata.c:1708 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1708 client/helpdata.c:1716 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:1707
+#: client/helpdata.c:1715
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d ulykkelig"
@@ -8900,7 +9043,7 @@ msgid ""
"or with the -a command-line parameter."
msgstr ""
-#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:916 data/Freeciv.in:107
msgid "Metaserver"
msgstr "Metaserver"
@@ -9262,36 +9405,36 @@ msgstr "Lagring avbrutt; Klarer ikke skrive til fil %s"
msgid "Saved settings to file %s"
msgstr "Lagrer oppsett til filen %s"
-#: client/packhand.c:211 client/packhand.c:217
+#: client/packhand.c:212 client/packhand.c:218
#, fuzzy
msgid "You were rejected from the game...."
msgstr "Du ble vist bort fra spillet:"
-#: client/packhand.c:229
+#: client/packhand.c:230
#, c-format
msgid "Client capability string: %s"
msgstr "Klient egenskapsstreng: %s"
-#: client/packhand.c:232
+#: client/packhand.c:233
#, c-format
msgid "Server capability string: %s"
msgstr "Server egenskapsstreng: %s"
-#: client/packhand.c:850
+#: client/packhand.c:864
#, c-format
msgid "Start of turn %d"
msgstr "Runden begynner %d"
-#: client/packhand.c:1591
+#: client/packhand.c:1621
#, c-format
msgid "AI Mode is now %s."
msgstr "AI modus er nå %s."
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "ON"
msgstr "PÅ"
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "OFF"
msgstr "AV"
@@ -9323,15 +9466,15 @@ msgstr "Navn"
msgid "Username"
msgstr "Brukernavn"
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
-#: client/gui-gtk-2.0/pages.c:2157
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:653
+#: client/gui-gtk-2.0/pages.c:1604 client/gui-gtk-2.0/pages.c:2159
msgid "Flag"
msgstr "Flagg"
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1605
-#: client/gui-gtk-2.0/pages.c:2159 client/gui-sdl/repodlgs.c:2063
-#: client/gui-win32/connectdlg.c:990 client/gui-win32/dialogs.c:542
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:657
+#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1609
+#: client/gui-gtk-2.0/pages.c:2161 client/gui-sdl/repodlgs.c:2063
+#: client/gui-win32/connectdlg.c:992 client/gui-win32/dialogs.c:542
#: client/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "Nasjon"
@@ -9344,7 +9487,7 @@ msgstr "Grense"
msgid "Score"
msgstr "Poengsum"
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1614
msgid "Team"
msgstr "Lag"
@@ -9377,36 +9520,36 @@ msgstr "Ledig"
msgid "Ping"
msgstr "Ping"
-#: client/repodlgs_common.c:375
+#: client/repodlgs_common.c:378
msgid "You cannot sell improvements."
msgstr "Du kan ikke selge byforbedringer."
-#: client/repodlgs_common.c:391
+#: client/repodlgs_common.c:394
#, c-format
msgid "Sold %d %s for %d gold."
msgstr "Solgte %d %s for %d gull."
-#: client/repodlgs_common.c:396
+#: client/repodlgs_common.c:399
#, c-format
msgid "No %s could be sold."
msgstr "Ingen %s kunne selges."
#. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:415
+#: client/repodlgs_common.c:418
msgid "You cannot disband units."
msgstr "Du kan ikke oppløse enheter."
-#: client/repodlgs_common.c:420
+#: client/repodlgs_common.c:423
#, c-format
msgid "%s cannot be disbanded."
msgstr "%s kan ikke oppløses."
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:444
#, c-format
msgid "Disbanded %d %s."
msgstr "Oppløste %d %s."
-#: client/repodlgs_common.c:445
+#: client/repodlgs_common.c:448
#, c-format
msgid "No %s could be disbanded."
msgstr "Ingen %s kan oppløses."
@@ -10022,47 +10165,47 @@ msgstr "?dys/hrs:%02dd %02dt"
msgid "?duration:overflow"
msgstr "?duration:overflod"
-#: client/text.c:1143
+#: client/text.c:1145
#, c-format
msgid "%6d.%02d ms"
msgstr "%6d.%02d ms"
#. TRANS: <nation adjective> <government name>.
#. * E.g. "Polish Republic".
-#: client/text.c:1188
+#: client/text.c:1193
#, fuzzy, c-format
msgid "?nationgovernment:%s %s"
msgstr "Styreform: %s"
#. TRANS: "Observer: 1985"
-#: client/text.c:1198
+#: client/text.c:1203
#, fuzzy, c-format
msgid "Observer: %s"
msgstr "Observatør"
-#: client/text.c:1216
+#: client/text.c:1221
msgid "Buildings: "
msgstr "Bygninger:"
-#: client/text.c:1233 client/text.c:1272
+#: client/text.c:1238 client/text.c:1277
msgid "None. "
msgstr "Ingen. "
-#: client/text.c:1235 client/text.c:1274
+#: client/text.c:1240 client/text.c:1279
msgid "?clistend:."
msgstr "."
-#: client/text.c:1253
+#: client/text.c:1258
msgid "Wonders: "
msgstr "Underverk: "
-#: client/text.c:1308
+#: client/text.c:1313
#, 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:1312
+#: client/text.c:1317
#, fuzzy, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
@@ -10070,19 +10213,19 @@ msgstr[0] "%d forn
msgstr[1] "%d fornøyd før straff med "
#. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1318
+#: client/text.c:1323
#, fuzzy, c-format
msgid "%d additional unhappy citizen."
msgid_plural "%d additional unhappy citizens."
msgstr[0] "%d ulykkelige innbyggere."
msgstr[1] "%d ulykkelige innbyggere."
-#: client/text.c:1339
+#: client/text.c:1344
#, fuzzy
msgid "Unlimited martial law in effect."
msgstr "Unntakstilstand ("
-#: client/text.c:1341
+#: client/text.c:1346
#, fuzzy, c-format
msgid "%d military unit may impose martial law."
msgid_plural "Up to %d military units may impose martial law."
@@ -10091,7 +10234,7 @@ msgstr[0] ""
msgstr[1] ""
"* En ikke-militær enhet (kan ikke angripe; ingen unntakstilstand).\n"
-#: client/text.c:1345
+#: client/text.c:1350
#, fuzzy, c-format
msgid "Each military unit makes %d unhappy citizen content."
msgid_plural "Each military unit makes %d unhappy citizens content."
@@ -10100,31 +10243,31 @@ msgstr[0] ""
msgstr[1] ""
"Underholder borgerne i en by, ved å gjøre 3 ulykkelige borgere fornøyd."
-#: client/text.c:1352
+#: client/text.c:1357
msgid "Military units in the field may cause unhappiness. "
msgstr "Militære enheter i felten kan føre til ulykkelighet. "
-#: client/text.c:1355
+#: client/text.c:1360
msgid "Military units have no happiness effect. "
msgstr "Militære enheter har ingen innvirkning på lykkeligheten."
-#: client/text.c:1370
+#: client/text.c:1375
#, c-format
msgid "Luxury: %d total."
msgstr "Luksus: %d totalt"
-#: client/tilespec.c:865
+#: client/tilespec.c:882
msgid "No usable default tileset found, aborting!"
msgstr "Ingen standard grafikkoppsett funnet, avbryter!"
-#: client/tilespec.c:1338
+#: client/tilespec.c:1355
msgid ""
"Client does not support isometric tilesets. Using default tileset instead."
msgstr ""
"Klienten støtter ikke isometrisk grafikkoppsett. Bruker alminnelig grafikk "
"istedet."
-#: client/tilespec.c:1347
+#: client/tilespec.c:1364
msgid ""
"Client does not support overhead view tilesets. Using default tileset "
"instead."
@@ -10132,7 +10275,7 @@ msgstr ""
"Klienten støtter ikke grafikkoppsett sett ovenfra. Benytter standard grafikk "
"i stedet."
-#: client/tilespec.c:3966
+#: client/tilespec.c:3987
#, fuzzy, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -10825,7 +10968,7 @@ msgid "_Display"
msgstr "V_is"
#: client/gui-gtk-2.0/cityrep.c:1006 client/gui-gtk-2.0/menu.c:839
-#: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
+#: client/gui-sdl/diplodlg.c:692 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
#: client/gui-xaw/cityrep.c:533 client/gui-xaw/menu.c:156
@@ -11001,199 +11144,199 @@ msgstr "Hva skal vi kalle forh
msgid "Remove this preset?"
msgstr "Fjern denne innstillingen?"
-#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:222
+#: client/gui-gtk-2.0/dialogs.c:197 client/gui-gtk-2.0/messagewin.c:222
#, fuzzy
msgid "Goto _Location"
msgstr "_Gå til"
-#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
+#: client/gui-gtk-2.0/dialogs.c:202 client/gui-gtk-2.0/messagewin.c:226
#, fuzzy
msgid "Inspect _City"
msgstr "_Vis by"
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:258 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:258 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:259 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:311 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:312 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:312 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:313 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:506
+#: client/gui-gtk-2.0/dialogs.c:507
msgid "Unit"
msgstr "Enhet"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:950
-#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2155
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:985
+#: client/gui-gtk-2.0/dialogs.c:508 client/gui-gtk-2.0/pages.c:950
+#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2157
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:987
#: 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:519 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:520 client/gui-sdl/dialogs.c:627
msgid "Unit selection"
msgstr "Valg av enheter"
-#: client/gui-gtk-2.0/dialogs.c:582
+#: client/gui-gtk-2.0/dialogs.c:583
msgid "_Ready all"
msgstr "_Klargjør alle"
-#: client/gui-gtk-2.0/dialogs.c:590
+#: client/gui-gtk-2.0/dialogs.c:591
msgid "_Sentry idle"
msgstr "Inaktive enheter hold _stand"
-#: client/gui-gtk-2.0/dialogs.c:719
+#: client/gui-gtk-2.0/dialogs.c:721
#, fuzzy
msgid "Nation _Groups:"
msgstr "_Nasjoner:"
-#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:766 data/Freeciv.in:3128
msgid "What Nation Will You Be?"
msgstr "Hvilken nasjon vil du være?"
-#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
-#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
+#: client/gui-gtk-2.0/dialogs.c:768 client/gui-sdl/chatline.c:842
+#: client/gui-win32/connectdlg.c:1040 data/Freeciv.in:3371
#, fuzzy
msgid "Pick Nation"
msgstr "Politistasjon"
-#: client/gui-gtk-2.0/dialogs.c:774
+#: client/gui-gtk-2.0/dialogs.c:776
#, fuzzy
msgid "_Random Nation"
msgstr "Forente Nasjoner"
-#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:792 client/gui-win32/dialogs.c:517
msgid "Select a nation"
msgstr "Velg en nasjon"
-#: client/gui-gtk-2.0/dialogs.c:804
+#: client/gui-gtk-2.0/dialogs.c:810
msgid "_Properties"
msgstr "_Alternativer"
-#: client/gui-gtk-2.0/dialogs.c:824
+#: client/gui-gtk-2.0/dialogs.c:830
msgid "_Leader:"
msgstr "_Leder:"
-#: client/gui-gtk-2.0/dialogs.c:831
+#: client/gui-gtk-2.0/dialogs.c:837
msgid "_Female"
msgstr "_Kvinne"
-#: client/gui-gtk-2.0/dialogs.c:836
+#: client/gui-gtk-2.0/dialogs.c:842
msgid "_Male"
msgstr "_Mann"
-#: client/gui-gtk-2.0/dialogs.c:863
+#: client/gui-gtk-2.0/dialogs.c:869
#, fuzzy
msgid "City _Styles:"
msgstr "_Bystil:"
-#: client/gui-gtk-2.0/dialogs.c:902
+#: client/gui-gtk-2.0/dialogs.c:908
#, fuzzy
msgid "_Description"
msgstr "_Forklaring"
-#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1263 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:1253 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1268 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:1262 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1277 client/gui-sdl/dialogs.c:2204
#: 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:1306 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1318 client/gui-win32/citydlg.c:1454
#: data/Freeciv.in:2484
msgid "Upgrade Unit!"
msgstr "Oppgrader enhet!"
-#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1327 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 "Oppgrader foreldede enheter"
-#: client/gui-gtk-2.0/diplodlg.c:231 client/gui-win32/diplodlg.c:151
+#: client/gui-gtk-2.0/diplodlg.c:222 client/gui-win32/diplodlg.c:151
#: client/gui-xaw/diplodlg.c:383 client/gui-xaw/diplodlg.c:401
msgid "World-map"
msgstr "Verdenskart"
-#: client/gui-gtk-2.0/diplodlg.c:237 client/gui-win32/diplodlg.c:146
+#: client/gui-gtk-2.0/diplodlg.c:228 client/gui-win32/diplodlg.c:146
#: client/gui-xaw/diplodlg.c:387 client/gui-xaw/diplodlg.c:405
msgid "Sea-map"
msgstr "Sjøkart"
-#: client/gui-gtk-2.0/diplodlg.c:243
+#: client/gui-gtk-2.0/diplodlg.c:234
msgid "_Maps"
msgstr "_Kart"
-#: client/gui-gtk-2.0/diplodlg.c:274
+#: client/gui-gtk-2.0/diplodlg.c:265
msgid "_Advances"
msgstr "_Fremskritt"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/diplodlg.c:315 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "_Byer"
-#: client/gui-gtk-2.0/diplodlg.c:333
+#: client/gui-gtk-2.0/diplodlg.c:324
msgid "_Give shared vision"
msgstr "_Gi delt utsyn"
-#: client/gui-gtk-2.0/diplodlg.c:346
+#: client/gui-gtk-2.0/diplodlg.c:337
msgid "Give _embassy"
msgstr "Gi _ambassade"
-#: client/gui-gtk-2.0/diplodlg.c:376
+#: client/gui-gtk-2.0/diplodlg.c:368
msgid "_Pacts"
msgstr "_Avtaler"
-#: client/gui-gtk-2.0/diplodlg.c:466
+#: client/gui-gtk-2.0/diplodlg.c:458
#, fuzzy, c-format
msgid "Diplomacy: %s"
msgstr "Diplomati"
-#: client/gui-gtk-2.0/diplodlg.c:473
+#: client/gui-gtk-2.0/diplodlg.c:465
msgid "_Cancel meeting"
msgstr "Avlys mø_te"
-#: client/gui-gtk-2.0/diplodlg.c:475
+#: client/gui-gtk-2.0/diplodlg.c:467
msgid "Accept _treaty"
msgstr "_Aksepter avtale"
-#: client/gui-gtk-2.0/diplodlg.c:503
+#: client/gui-gtk-2.0/diplodlg.c:495
msgid "C_lauses:"
msgstr "_Klausul:"
-#: client/gui-gtk-2.0/diplodlg.c:568 client/gui-gtk-2.0/diplodlg.c:642
+#: client/gui-gtk-2.0/diplodlg.c:560 client/gui-gtk-2.0/diplodlg.c:634
msgid "_Gold:"
msgstr "_Gull:"
-#: client/gui-gtk-2.0/diplodlg.c:580 client/gui-gtk-2.0/diplodlg.c:654
+#: client/gui-gtk-2.0/diplodlg.c:572 client/gui-gtk-2.0/diplodlg.c:646
msgid "_Add Clause..."
msgstr "_Legg til klausul..."
-#: client/gui-gtk-2.0/diplodlg.c:699
+#: client/gui-gtk-2.0/diplodlg.c:691
msgid "--- This treaty is blank. Please add some clauses. ---"
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:905 client/gui-sdl/diplodlg.c:375
+#: client/gui-gtk-2.0/diplodlg.c:897 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 "Ugyldig mengde gull spesifisert"
@@ -11252,99 +11395,99 @@ msgstr "Velg destinasjon"
msgid "Show _All Cities"
msgstr "Vis _alle byer"
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:164
msgid "Show Map Scrollbars"
msgstr "Vis scrollbar på kart"
-#: client/gui-gtk-2.0/gui_main.c:163
+#: client/gui-gtk-2.0/gui_main.c:165
msgid "Disable this option to hide the scrollbars on the map view."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:169
msgid "Keyboardless goto"
msgstr "Tastaturløs gå-til"
-#: client/gui-gtk-2.0/gui_main.c:168
+#: client/gui-gtk-2.0/gui_main.c:170
msgid ""
"If this option is set then a goto may be initiated by left-clicking and then "
"holding down the mouse button while dragging the mouse onto a different tile."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:173
+#: client/gui-gtk-2.0/gui_main.c:175
msgid "Keep dialogs on top"
msgstr "Hold dialoger øverst"
-#: client/gui-gtk-2.0/gui_main.c:174
+#: client/gui-gtk-2.0/gui_main.c:176
msgid ""
"If this option is set then dialog windows will always remain in front of the "
"main Freeciv window. Disabling this has no effect in fullscreen mode."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:178
+#: client/gui-gtk-2.0/gui_main.c:180
msgid "Show worklist task icons"
msgstr "Vis arbeidsliste ikoner"
-#: client/gui-gtk-2.0/gui_main.c:179
+#: client/gui-gtk-2.0/gui_main.c:181
msgid ""
"Disabling this will turn off the unit and building icons in the worklist "
"dialog and the production tab of the city dialog."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:183
+#: client/gui-gtk-2.0/gui_main.c:185
msgid "Enable status report tabs"
msgstr "Gjør statusrapportark tilgjengelig"
-#: client/gui-gtk-2.0/gui_main.c:184
+#: client/gui-gtk-2.0/gui_main.c:186
msgid ""
"If this option is enabled then report dialogs will be shown as separate tabs "
"rather than in popup dialogs."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:189 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:191 client/gui-win32/gui_main.c:110
msgid "Better fog-of-war drawing"
msgstr "Bedre krigståke kvalitet"
-#: client/gui-gtk-2.0/gui_main.c:190 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:192 client/gui-win32/gui_main.c:111
msgid ""
"If this is enabled then a better method is used for drawing fog-of-war. It "
"is not any slower but will consume about twice as much memory."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:195
+#: client/gui-gtk-2.0/gui_main.c:197
msgid "Show time for each chat message"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:196
+#: client/gui-gtk-2.0/gui_main.c:198
msgid ""
"If this option is enabled then all chat messages will be prefixed by a time "
"string of the form [hour:minute:second]."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:201
+#: client/gui-gtk-2.0/gui_main.c:203
msgid "Split bottom notebook area"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:202
+#: client/gui-gtk-2.0/gui_main.c:204
msgid ""
"Enabling this option will split the bottom notebook into a left and right "
"notebook so that two tabs may be viewed at once."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:207
+#: client/gui-gtk-2.0/gui_main.c:209
msgid "New message events go to top of list"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:208
+#: client/gui-gtk-2.0/gui_main.c:210
msgid ""
"If this option is enabled, new events in the message window will appear at "
"the top of the list, rather than being appended at the bottom."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:213
+#: client/gui-gtk-2.0/gui_main.c:215
msgid "Show extra message window buttons"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:214
+#: client/gui-gtk-2.0/gui_main.c:216
msgid ""
"If this option is enabled, there will be two buttons displayed in the "
"message window for inspecting a city and going to a location. If this option "
@@ -11354,22 +11497,22 @@ msgid ""
"closed and reopened."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:224
+#: client/gui-gtk-2.0/gui_main.c:226
#, fuzzy
msgid "Metaserver tab first in network page"
msgstr "Metaserver emne-streng satt til '%s'."
-#: client/gui-gtk-2.0/gui_main.c:225
+#: client/gui-gtk-2.0/gui_main.c:227
msgid ""
"If this option is enabled, the metaserver tab will be the first notebook tab "
"in the network page. This option requires a restart in order to take effect."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:230
+#: client/gui-gtk-2.0/gui_main.c:232
msgid "Plain chat messages are sent to allies only"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:231
+#: client/gui-gtk-2.0/gui_main.c:233
msgid ""
"If this option is enabled, then plain messages typed into the chat entry "
"while the game is running will only be sent to your allies. Otherwise plain "
@@ -11379,28 +11522,41 @@ msgid ""
"visible in multiplayer games)."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:340 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:245
+msgid "Arrange widgets for small displays"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:246
+msgid ""
+"If this option is enabled, widgets in the main window will be arrange so "
+"that they take up the least amount of total screen space. Specifically, the "
+"left panel containing the overview, player status, and the unit information "
+"box will be extended over the entire left side of the window. This option "
+"requires a restart in order to take effect."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:352 client/gui-xaw/gui_main.c:245
msgid ""
"This client has no special command line options\n"
"\n"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
+#: client/gui-gtk-2.0/gui_main.c:847 client/gui-gtk-2.0/gui_main.c:1542
msgid "Freeciv"
msgstr "Freeciv"
-#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
+#: client/gui-gtk-2.0/gui_main.c:1251 client/gui-gtk-2.0/gui_main.c:1258
#: client/gui-sdl/mapctrl.c:1566 client/gui-win32/gui_main.c:482
#: data/Freeciv.in:2618
msgid "Turn Done"
msgstr "Runde over"
-#: client/gui-gtk-2.0/gui_main.c:1232 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1258 client/gui-sdl/mapctrl.c:1566
#: client/gui-sdl/mapview.c:1082
msgid "Shift+Return"
msgstr "Skift+Enter"
-#: client/gui-gtk-2.0/gui_main.c:1266 client/gui-gtk-2.0/menu.c:797
+#: client/gui-gtk-2.0/gui_main.c:1299 client/gui-gtk-2.0/menu.c:797
#: client/gui-gtk-2.0/menu.c:799 client/gui-gtk-2.0/menu.c:801
#: client/gui-gtk-2.0/menu.c:803 client/gui-gtk-2.0/menu.c:805
#: client/gui-gtk-2.0/menu.c:807 client/gui-gtk-2.0/menu.c:809
@@ -11419,11 +11575,11 @@ msgstr "Skift+Enter"
msgid "View"
msgstr "Kartvindu"
-#: client/gui-gtk-2.0/gui_main.c:1359
+#: client/gui-gtk-2.0/gui_main.c:1393
msgid "Chat"
msgstr "Beskjeder"
-#: client/gui-gtk-2.0/gui_main.c:1377 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1411 client/gui-win32/gui_main.c:538
#: data/Freeciv.in:2809
msgid ""
"Freeciv is free software and you are welcome to distribute copies of it\n"
@@ -11437,88 +11593,88 @@ msgstr ""
"Besøk http://www.freeciv.org/ for oppdaterte versjoner av Freeciv, \n"
"og for å rapportere feil ved Freeciv eller den norske oversettelsen."
-#: client/gui-gtk-2.0/gui_main.c:1392
+#: client/gui-gtk-2.0/gui_main.c:1426
msgid "Allies Only"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1657
+#: client/gui-gtk-2.0/gui_main.c:1691
msgid "Not _ready"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
+#: client/gui-gtk-2.0/gui_main.c:1702 client/gui-gtk-2.0/pages.c:1679
#, fuzzy
msgid "_Ready"
msgstr "_Klargjør alle"
-#: client/gui-gtk-2.0/gui_main.c:1672 client/gui-gtk-2.0/gui_main.c:1678
-#: client/gui-gtk-2.0/pages.c:2204
+#: client/gui-gtk-2.0/gui_main.c:1706 client/gui-gtk-2.0/gui_main.c:1712
+#: client/gui-gtk-2.0/pages.c:2206
msgid "_Start"
msgstr "_Start"
-#: client/gui-gtk-2.0/gui_main.c:1686
+#: client/gui-gtk-2.0/gui_main.c:1720
#, fuzzy
msgid "_Take Player"
msgstr "Byer"
-#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
+#: client/gui-gtk-2.0/gui_main.c:1723 client/gui-gtk-2.0/pages.c:1669
#, fuzzy
msgid "Pick _Nation"
msgstr "Politistasjon"
-#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
+#: client/gui-gtk-2.0/gui_main.c:1730 client/gui-gtk-2.0/pages.c:1674
#, fuzzy
msgid "_Observe"
msgstr "_Observatør"
-#: client/gui-gtk-2.0/gui_main.c:1698
+#: client/gui-gtk-2.0/gui_main.c:1732
#, fuzzy
msgid "Do not _observe"
msgstr "_observerer nå"
-#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1755 client/gui-xaw/pages.c:211
#, fuzzy
msgid "<AI>"
msgstr "AI"
-#: client/gui-gtk-2.0/gui_main.c:1723
+#: client/gui-gtk-2.0/gui_main.c:1758
msgid "<Novice AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1726
+#: client/gui-gtk-2.0/gui_main.c:1761
#, fuzzy
msgid "<Easy AI>"
msgstr "AI"
-#: client/gui-gtk-2.0/gui_main.c:1729
+#: client/gui-gtk-2.0/gui_main.c:1764
msgid "<Normal AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1732
+#: client/gui-gtk-2.0/gui_main.c:1767
#, fuzzy
msgid "<Hard AI>"
msgstr "AI"
-#: client/gui-gtk-2.0/gui_main.c:1742 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1777 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:1808
+#: client/gui-gtk-2.0/gui_main.c:1844 client/gui-gtk-2.0/gui_main.c:1858
#, fuzzy
msgid "Observer"
msgstr "Observatør"
-#: client/gui-gtk-2.0/gui_main.c:1808
+#: client/gui-gtk-2.0/gui_main.c:1858
#, fuzzy
msgid "Detached"
msgstr "Død"
-#: client/gui-gtk-2.0/gui_main.c:2073
+#: client/gui-gtk-2.0/gui_main.c:2117
msgid "Are you sure you want to quit?"
msgstr "Er du sikker på at du vil avslutte?"
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
#, c-format
msgid ""
"Close Tab:\n"
@@ -11527,7 +11683,7 @@ msgstr ""
"Lukke ark:\n"
"%s"
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
msgid "Ctrl+W"
msgstr "Ktrl+W"
@@ -11633,8 +11789,8 @@ msgid "Trans. Rslt/Time:"
msgstr "Trans. Rslt/Tid:"
#: 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
-#: client/gui-win32/helpdlg.c:709 client/gui-win32/helpdlg.c:733
+#: client/gui-win32/helpdlg.c:502 client/gui-win32/helpdlg.c:550
+#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:739
#: client/gui-xaw/helpdlg.c:759 client/gui-xaw/helpdlg.c:808
#: client/gui-xaw/helpdlg.c:816 client/gui-xaw/helpdlg.c:853
#: client/gui-xaw/helpdlg.c:878
@@ -11681,34 +11837,34 @@ msgstr "med"
msgid "?techhelp:"
msgstr "?techhelp:"
-#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:591
+#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:597
#: client/gui-xaw/helpdlg.c:996
#, c-format
msgid "+%d Trade / %d"
msgstr "+%d Handel / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:595
+#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:601
#: client/gui-xaw/helpdlg.c:1000
#, c-format
msgid "no extra / %d"
msgstr "ingen ekstra / %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
-#: client/gui-win32/helpdlg.c:602 client/gui-win32/helpdlg.c:616
-#: client/gui-win32/helpdlg.c:635 client/gui-xaw/helpdlg.c:1002
+#: client/gui-gtk-2.0/helpdlg.c:1085 client/gui-win32/helpdlg.c:604
+#: client/gui-win32/helpdlg.c:608 client/gui-win32/helpdlg.c:622
+#: client/gui-win32/helpdlg.c:641 client/gui-xaw/helpdlg.c:1002
#: client/gui-xaw/helpdlg.c:1006 client/gui-xaw/helpdlg.c:1020
#: client/gui-xaw/helpdlg.c:1039
msgid "n/a"
msgstr "-"
-#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:605
+#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:611
#: client/gui-xaw/helpdlg.c:1009
#, c-format
msgid "+%d Food / %d"
msgstr "+%d Mat / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:619
+#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:625
#: client/gui-xaw/helpdlg.c:1023
#, c-format
msgid "+%d Res. / %d"
@@ -12496,41 +12652,41 @@ msgstr "K_oble til nettverksspill"
msgid "Connect to Gaming _Zone"
msgstr "Koble til nettverksspill"
-#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:302
#: 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:779 client/gui-gtk-2.0/pages.c:820
-#: client/gui-win32/connectdlg.c:916
+#: client/gui-win32/connectdlg.c:918
msgid "Server Name"
msgstr "Servernavn"
#: client/gui-gtk-2.0/pages.c:780 client/gui-gtk-2.0/pages.c:821
-#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:916
+#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:918
#: data/Freeciv.in:96
msgid "Port"
msgstr "Port"
#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Version"
msgstr "Versjon"
#: client/gui-gtk-2.0/pages.c:782 client/gui-gtk-2.0/pages.c:823
-#: client/gui-gtk-2.0/pages.c:2161 client/gui-win32/connectdlg.c:917
-#: client/gui-win32/connectdlg.c:995
+#: client/gui-gtk-2.0/pages.c:2163 client/gui-win32/connectdlg.c:919
+#: client/gui-win32/connectdlg.c:997
msgid "Status"
msgstr "Status"
#: client/gui-gtk-2.0/pages.c:783 client/gui-gtk-2.0/pages.c:824
#: client/gui-sdl/connectdlg.c:318 client/gui-sdl/plrdlg.c:330
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Players"
msgstr "Spillere"
#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
-#: client/gui-win32/connectdlg.c:918
+#: client/gui-win32/connectdlg.c:920
msgid "Comment"
msgstr "Kommentar"
@@ -12562,9 +12718,9 @@ msgstr "Pass_ord:"
msgid "Conf_irm Password:"
msgstr "_Gjenta passord:"
-#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2165
#: 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:1000
+#: client/gui-win32/citydlg.c:1083 client/gui-win32/connectdlg.c:1002
#: client/gui-win32/wldlg.c:800 client/gui-win32/wldlg.c:806
msgid "Type"
msgstr "Type"
@@ -12666,7 +12822,7 @@ msgstr "Datastyrte spilleres _vanskelighetsgrad:"
msgid "Ruleset _Version:"
msgstr "Hersker:"
-#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2195
msgid "_More Game Options..."
msgstr "_Flere valg..."
@@ -12685,49 +12841,49 @@ msgstr "Skrivekunst"
msgid "Ready"
msgstr "Klargjør alle"
-#: client/gui-gtk-2.0/pages.c:1601
+#: client/gui-gtk-2.0/pages.c:1600
#, fuzzy
msgid "?player:Leader"
msgstr "Navn"
-#: client/gui-gtk-2.0/pages.c:1732 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1734 client/gui-sdl/chatline.c:185
msgid "Choose Saved Game to Load"
msgstr "Velg lagrefil å laste"
-#: client/gui-gtk-2.0/pages.c:1824
+#: client/gui-gtk-2.0/pages.c:1826
msgid "Choose Saved Game to _Load:"
msgstr "Velg lagrefil å _laste:"
-#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
-#: client/gui-gtk-2.0/pages.c:2451
+#: client/gui-gtk-2.0/pages.c:1846 client/gui-gtk-2.0/pages.c:2039
+#: client/gui-gtk-2.0/pages.c:2455
msgid "_Browse..."
msgstr "_Let etter fil..."
-#: client/gui-gtk-2.0/pages.c:1911
+#: client/gui-gtk-2.0/pages.c:1913
msgid "Choose a Scenario"
msgstr "Velg et ferdiglagd oppsett"
-#: client/gui-gtk-2.0/pages.c:1998
+#: client/gui-gtk-2.0/pages.c:2000
msgid "Choose a _Scenario:"
msgstr "Velg et ferdiglagd _oppsett:"
-#: client/gui-gtk-2.0/pages.c:2173
+#: client/gui-gtk-2.0/pages.c:2175
msgid "Choose a _nation to play:"
msgstr "Velg en _nasjon å spille:"
-#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2367 client/gui-win32/menu.c:581
msgid "Select Location to Save"
msgstr "Velg plassering for å lagre spillet"
-#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2452 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "Lagre spill"
-#: client/gui-gtk-2.0/pages.c:2489
+#: client/gui-gtk-2.0/pages.c:2493
msgid "Saved _Games:"
msgstr "_Lagrede spill:"
-#: client/gui-gtk-2.0/pages.c:2516
+#: client/gui-gtk-2.0/pages.c:2520
msgid "Save _Filename:"
msgstr "Lagre _filnavn:"
@@ -13082,7 +13238,7 @@ msgstr "Lukk dialog"
msgid "Total users logged in : %d"
msgstr ""
-#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1098
msgid "Back"
msgstr "Tilbake"
@@ -13092,7 +13248,7 @@ msgid "Start"
msgstr "_Start"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:777
+#: client/gui-win32/connectdlg.c:779
msgid "Load Game"
msgstr "Fortsette et spill"
@@ -13134,9 +13290,9 @@ msgstr "Lag ny hjemby"
#: client/gui-sdl/connectdlg.c:308 client/gui-sdl/connectdlg.c:617
#: client/gui-sdl/connectdlg.c:803 client/gui-sdl/connectdlg.c:985
#: client/gui-sdl/dialogs.c:452 client/gui-sdl/dialogs.c:2095
-#: client/gui-sdl/dialogs.c:2893 client/gui-sdl/diplomat_dialog.c:731
+#: client/gui-sdl/dialogs.c:2902 client/gui-sdl/diplomat_dialog.c:731
#: client/gui-sdl/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1043
#: client/gui-win32/dialogs.c:1772 client/gui-win32/finddlg.c:127
#: client/gui-win32/gotodlg.c:171 client/gui-win32/inputdlg.c:146
#: client/gui-win32/messagedlg.c:216 client/gui-win32/ratesdlg.c:328
@@ -13181,7 +13337,7 @@ msgid "Buy it?"
msgstr "Kjøp det!"
#: 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
+#: client/gui-sdl/diplodlg.c:1336 client/gui-sdl/diplomat_dialog.c:1211
#: client/gui-sdl/diplomat_dialog.c:1417 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:221 client/gui-sdl/repodlgs.c:1559
#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
@@ -13197,7 +13353,7 @@ msgid "No"
msgstr "Nei"
#: client/gui-sdl/citydlg.c:1215 client/gui-sdl/cma_fe.c:318
-#: client/gui-sdl/diplodlg.c:1345 client/gui-sdl/diplomat_dialog.c:1200
+#: client/gui-sdl/diplodlg.c:1346 client/gui-sdl/diplomat_dialog.c:1200
#: client/gui-sdl/diplomat_dialog.c:1407 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:232 client/gui-win32/repodlgs.c:578
#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
@@ -13530,7 +13686,7 @@ msgstr "Freeciv Server Liste"
msgid "Port :"
msgstr "Port:"
-#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1100
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr "Koble til"
@@ -13648,23 +13804,23 @@ msgstr "Din nye styreform"
msgid "REVOLUTION!"
msgstr "REVOLUSJON..."
-#: client/gui-sdl/dialogs.c:2232 client/gui-sdl/dialogs.c:2620
+#: client/gui-sdl/dialogs.c:2237 client/gui-sdl/dialogs.c:2625
#: client/gui-win32/dialogs.c:567 data/Freeciv.in:3159
msgid "Female"
msgstr "Kvinne"
-#: client/gui-sdl/dialogs.c:2234 client/gui-sdl/dialogs.c:2618
-#: client/gui-sdl/dialogs.c:2830 client/gui-win32/dialogs.c:565
+#: client/gui-sdl/dialogs.c:2239 client/gui-sdl/dialogs.c:2623
+#: client/gui-sdl/dialogs.c:2839 client/gui-win32/dialogs.c:565
msgid "Male"
msgstr "Mann"
-#: client/gui-sdl/dialogs.c:2478 client/gui-sdl/dialogs.c:2902
+#: client/gui-sdl/dialogs.c:2483 client/gui-sdl/dialogs.c:2911
#: 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 "OK"
-#: client/gui-sdl/dialogs.c:2685 client/gui-win32/dialogs.c:505
+#: client/gui-sdl/dialogs.c:2694 client/gui-win32/dialogs.c:505
msgid "What nation will you be?"
msgstr "Hvilken nasjon vil du være?"
@@ -13693,79 +13849,79 @@ msgstr "Verdenskart"
msgid "Sea map"
msgstr "Sjøkart"
-#: client/gui-sdl/diplodlg.c:563
+#: client/gui-sdl/diplodlg.c:564
msgid "Give embassy"
msgstr "Gi ambassade"
-#: client/gui-sdl/diplodlg.c:579 client/gui-win32/diplodlg.c:614
+#: client/gui-sdl/diplodlg.c:580 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 "Gull(maks %d)"
-#: client/gui-sdl/diplodlg.c:613 client/gui-sdl/helpdlg.c:1956
+#: client/gui-sdl/diplodlg.c:614 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 "Fremskritt"
-#: client/gui-sdl/diplodlg.c:831 client/gui-win32/diplodlg.c:598
+#: client/gui-sdl/diplodlg.c:832 client/gui-win32/diplodlg.c:598
#: data/Freeciv.in:269
msgid "Diplomacy meeting"
msgstr "Diplomatisk møte"
-#: client/gui-sdl/diplodlg.c:883 client/gui-win32/diplodlg.c:680
+#: client/gui-sdl/diplodlg.c:884 client/gui-win32/diplodlg.c:680
#: data/Freeciv.in:510
msgid "Cancel meeting"
msgstr "Avlys møte"
-#: client/gui-sdl/diplodlg.c:895 client/gui-win32/diplodlg.c:679
+#: client/gui-sdl/diplodlg.c:896 client/gui-win32/diplodlg.c:679
#: data/Freeciv.in:501
msgid "Accept treaty"
msgstr "Aksepter avtale"
#. TRANS: "Polish incident !" FIXME!!!
-#: client/gui-sdl/diplodlg.c:1304
+#: client/gui-sdl/diplodlg.c:1305
#, fuzzy, c-format
msgid "%s incident !"
msgstr "Forskere"
-#: client/gui-sdl/diplodlg.c:1322
+#: client/gui-sdl/diplodlg.c:1323
msgid "Shall we declare WAR on them?"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1433
+#: client/gui-sdl/diplodlg.c:1434
#, fuzzy
msgid "Foreign Minister"
msgstr "Førsteminister"
-#: client/gui-sdl/diplodlg.c:1449
+#: client/gui-sdl/diplodlg.c:1450
#, c-format
msgid ""
"Sir!, the %s ambassador has arrived\n"
"What are your wishes?"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1465
+#: client/gui-sdl/diplodlg.c:1466
msgid "Declare WAR"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1467 client/gui-win32/plrdlg.c:357
+#: client/gui-sdl/diplodlg.c:1468 client/gui-win32/plrdlg.c:357
msgid "Cancel Treaty"
msgstr "Avbryt avtale"
-#: client/gui-sdl/diplodlg.c:1490 client/gui-win32/plrdlg.c:358
+#: client/gui-sdl/diplodlg.c:1491 client/gui-win32/plrdlg.c:358
#: data/Freeciv.in:3254
msgid "Withdraw vision"
msgstr "Fjern utsyn"
-#: client/gui-sdl/diplodlg.c:1507
+#: client/gui-sdl/diplodlg.c:1508
#, fuzzy
msgid "Call Diplomatic Meeting"
msgstr "Diplomatisk møte"
-#: client/gui-sdl/diplodlg.c:1521
+#: client/gui-sdl/diplodlg.c:1522
msgid "Send him back"
msgstr ""
@@ -14528,12 +14684,12 @@ msgid "Leave Game"
msgstr "Lagre spill"
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1100 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1102 client/gui-xaw/menu.c:121
#: data/Freeciv.in:115 data/Freeciv.in:3180
msgid "Quit"
msgstr "Avslutt"
-#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:967
msgid "Start New Game"
msgstr "Start nytt spill"
@@ -14663,8 +14819,8 @@ msgstr ""
msgid "%s max rate : %d%%"
msgstr "%s maks nivå: %d%%"
-#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
-#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1085
+#: client/gui-win32/connectdlg.c:1093 data/Freeciv.in:155
msgid "Update"
msgstr "Oppdater"
@@ -15132,68 +15288,68 @@ msgstr "Ny"
msgid "Delete"
msgstr "Slett"
-#: client/gui-win32/connectdlg.c:147
+#: client/gui-win32/connectdlg.c:149
msgid "Password:"
msgstr "Passord:"
-#: client/gui-win32/connectdlg.c:169
+#: client/gui-win32/connectdlg.c:171
msgid "Couldn't load the savegame"
msgstr "Klarte ikke laste inn lagret spill."
-#: client/gui-win32/connectdlg.c:284 client/gui-xaw/connectdlg.c:311
+#: client/gui-win32/connectdlg.c:286 client/gui-xaw/connectdlg.c:311
msgid "Verify Password"
msgstr "Bekreft passord"
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:916 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr "Servervalg"
-#: client/gui-win32/connectdlg.c:915
+#: client/gui-win32/connectdlg.c:917
msgid "Local Area Network"
msgstr "Lokalt Nettverk"
-#: client/gui-win32/connectdlg.c:949
+#: client/gui-win32/connectdlg.c:951
msgid "Welcome to Freeciv"
msgstr "Velkommen til Freeciv"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Load Saved Game"
msgstr "Fortsette et spill"
-#: client/gui-win32/connectdlg.c:969
+#: client/gui-win32/connectdlg.c:971
msgid "Connect To Network Game"
msgstr "Koble til nettverksspill"
-#: client/gui-win32/connectdlg.c:979
+#: client/gui-win32/connectdlg.c:981
msgid "Choose a nation to play"
msgstr "Velg en nasjon å spille"
-#: client/gui-win32/connectdlg.c:1014
+#: client/gui-win32/connectdlg.c:1016
msgid "Number of players (Including AI):"
msgstr "Antall spillere (inkludert AI):"
-#: client/gui-win32/connectdlg.c:1022
+#: client/gui-win32/connectdlg.c:1024
msgid "AI skill level:"
msgstr "AI vanskelighetsgrad:"
-#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1038 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr "Spill-innstillinger"
-#: client/gui-win32/connectdlg.c:1040
+#: client/gui-win32/connectdlg.c:1042
#, fuzzy
msgid "Start Game"
msgstr "Start nytt spill"
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Login:"
msgstr "Navn:"
-#: client/gui-win32/connectdlg.c:1061
+#: client/gui-win32/connectdlg.c:1063
msgid "Host:"
msgstr "Tjener:"
-#: client/gui-win32/connectdlg.c:1062
+#: client/gui-win32/connectdlg.c:1064
msgid "Port:"
msgstr "Port:"
@@ -15274,21 +15430,21 @@ msgid ""
"this is much slower."
msgstr ""
-#: client/gui-win32/helpdlg.c:769 client/gui-win32/helpdlg.c:792
-#: client/gui-win32/helpdlg.c:803 client/gui-win32/helpdlg.c:809
-#: client/gui-win32/helpdlg.c:822
+#: client/gui-win32/helpdlg.c:775 client/gui-win32/helpdlg.c:798
+#: client/gui-win32/helpdlg.c:809 client/gui-win32/helpdlg.c:815
+#: client/gui-win32/helpdlg.c:828
msgid "Allows "
msgstr "Tillater "
-#: client/gui-win32/helpdlg.c:780
+#: client/gui-win32/helpdlg.c:786
msgid "Obsoletes "
msgstr "Forelder"
-#: client/gui-win32/helpdlg.c:812 client/gui-win32/helpdlg.c:825
+#: client/gui-win32/helpdlg.c:818 client/gui-win32/helpdlg.c:831
msgid " (with "
msgstr " (med "
-#: client/gui-win32/helpdlg.c:815 client/gui-win32/helpdlg.c:828
+#: client/gui-win32/helpdlg.c:821 client/gui-win32/helpdlg.c:834
msgid "?techhelp:)."
msgstr "?techhelp:)."
@@ -16438,7 +16594,7 @@ 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/"
+" https://gna.org/projects/freeciv/"
msgstr ""
"Hvis du finner noen feil ved spillet, vennligst send oss en feilrapport. "
"Dette gjøres mest hensiktsmessig ved å besøke Freeciv sitt "
@@ -18738,6 +18894,7 @@ msgid "Hydro Plant"
msgstr "Vannkraftverk"
#: data/default/buildings.ruleset:378
+#, fuzzy
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 "
@@ -18745,47 +18902,43 @@ msgid ""
"a Factory, Mfg. Plant and Hydro Plant together give a 150% production "
"bonus.\n"
"\n"
-"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant. A city "
-"can only build a Hydro Plant if it is next to (or on) a Mountain or River "
-"tile."
+"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant."
msgstr ""
-"Reduserer mengden forurensning generert av en by med 50%. Det øker "
-"produksjonen av skjold fra en fabrikk eller et fabrikk-kompleks i byen: en "
-"fabrikk og et fabrikk-kompleks gir til sammen 75% produksjonsbonus, og en "
-"fabrikk, et fabrikk-kompleks og et vannkraftverk gir tilsammen 150% "
+"Reduserer mengden forurensning fra produksjon i en by med 50%. Det øker også "
+"skjoldproduksjonen fra en fabrikk eller et fabrikk-kompleks i byen: en "
+"fabrikk og et atomkraftverk gir tilsammen 75% produksjonsbonus, og en "
+"fabrikk, et fabrikk-kompleks og et atomkraftverk gir tilsammen 150% "
"produksjonsbonus.\n"
"\n"
-"En by kan kun ha et vannkraftverk, kraftverk eller atomkraftverk. En by kan "
-"kun bygge vannkraftverk dersom den er ved siden av (eller på) et fjell eller "
-"en elv."
+"En by kan kun ha et vannkraftverk, kraftverk eller atomkreftverk."
-#: data/default/buildings.ruleset:397 data/civ2/buildings.ruleset:373
+#: data/default/buildings.ruleset:396 data/civ2/buildings.ruleset:373
#: data/civ1/buildings.ruleset:297
msgid "Library"
msgstr "Bibliotek"
-#: data/default/buildings.ruleset:412
+#: data/default/buildings.ruleset:411
#, no-c-format
msgid "Increases the science output in a city by 100%."
msgstr "Øker byen forskningsbidrag med 100%."
-#: data/default/buildings.ruleset:417 data/civ2/buildings.ruleset:393
+#: data/default/buildings.ruleset:416 data/civ2/buildings.ruleset:393
#: data/civ1/buildings.ruleset:317
msgid "Marketplace"
msgstr "Markedsplass"
-#: data/default/buildings.ruleset:432 data/civ2/buildings.ruleset:408
+#: data/default/buildings.ruleset:431 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 "Øker byens luksus- og skatte-bidrag med 50%."
-#: data/default/buildings.ruleset:437 data/civ2/buildings.ruleset:413
+#: data/default/buildings.ruleset:436 data/civ2/buildings.ruleset:413
#: data/civ1/buildings.ruleset:337
msgid "Mass Transit"
msgstr "Kollektivtrafikk"
-#: data/default/buildings.ruleset:451 data/civ2/buildings.ruleset:427
+#: data/default/buildings.ruleset:450 data/civ2/buildings.ruleset:427
#: data/civ1/buildings.ruleset:351
msgid ""
"Neutralizes the pollution generated by the population. The population "
@@ -18794,12 +18947,12 @@ msgstr ""
"Nøytraliserer forurensningen generert av befolkningen. Befolkningen har "
"absolutt ingen effekt på forurensningen fra byen."
-#: data/default/buildings.ruleset:458 data/civ2/buildings.ruleset:434
+#: data/default/buildings.ruleset:457 data/civ2/buildings.ruleset:434
#: data/civ1/buildings.ruleset:358
msgid "Mfg. Plant"
msgstr "Fabrikk-kompleks"
-#: data/default/buildings.ruleset:474 data/civ2/buildings.ruleset:450
+#: data/default/buildings.ruleset:473 data/civ2/buildings.ruleset:450
#: data/civ1/buildings.ruleset:374
#, no-c-format
msgid ""
@@ -18809,12 +18962,12 @@ msgstr ""
"Sammen med en fabrikk øker et fabrikk-kompleks skjoldproduksjonen i en by "
"med 100%."
-#: data/default/buildings.ruleset:480 data/civ2/buildings.ruleset:456
+#: data/default/buildings.ruleset:479 data/civ2/buildings.ruleset:456
#: data/civ1/buildings.ruleset:380
msgid "Nuclear Plant"
msgstr "Atomkraftverk"
-#: data/default/buildings.ruleset:495
+#: data/default/buildings.ruleset:494
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 "
@@ -18832,11 +18985,11 @@ msgstr ""
"\n"
"En by kan kun ha et vannkraftverk, kraftverk eller atomkreftverk."
-#: data/default/buildings.ruleset:515 data/civ2/buildings.ruleset:489
+#: data/default/buildings.ruleset:514 data/civ2/buildings.ruleset:489
msgid "Offshore Platform"
msgstr "Oljeplattform"
-#: data/default/buildings.ruleset:530 data/civ2/buildings.ruleset:504
+#: data/default/buildings.ruleset:529 data/civ2/buildings.ruleset:504
msgid ""
"Adds 1 extra shield resource on all Ocean squares in a city. The city needs "
"to be coastal to build this improvement."
@@ -18844,12 +18997,12 @@ msgstr ""
"Legger til 1 ekstra skjold ressurs på alle sjøruter i byen. Byen må være en "
"kystby for å bygge denne forbedringen."
-#: data/default/buildings.ruleset:536 data/civ2/buildings.ruleset:510
+#: data/default/buildings.ruleset:535 data/civ2/buildings.ruleset:510
#: data/civ1/buildings.ruleset:411
msgid "Palace"
msgstr "Slott"
-#: data/default/buildings.ruleset:552
+#: data/default/buildings.ruleset:551
#, fuzzy, no-c-format
msgid ""
"Makes a city the capital and the center of your government. Corruption in "
@@ -18875,11 +19028,11 @@ msgstr ""
"borgerkrig. Dersom du mister ditt palass så mister du også et eventuelt "
"romskip."
-#: data/default/buildings.ruleset:569 data/civ2/buildings.ruleset:539
+#: data/default/buildings.ruleset:568 data/civ2/buildings.ruleset:539
msgid "Police Station"
msgstr "Politistasjon"
-#: data/default/buildings.ruleset:583 data/civ2/buildings.ruleset:553
+#: data/default/buildings.ruleset:582 data/civ2/buildings.ruleset:553
msgid ""
"Reduces the unhappiness caused by military units outside the city by 2 under "
"Democracy and 1 under Republic. This improvement has no effect under other "
@@ -18889,11 +19042,11 @@ msgstr ""
"under demokrati og 1 under republikk. Denne forbedringen har ingen effekt "
"under andre styresett."
-#: data/default/buildings.ruleset:593 data/civ2/buildings.ruleset:560
+#: data/default/buildings.ruleset:592 data/civ2/buildings.ruleset:560
msgid "Port Facility"
msgstr "Havneområde"
-#: data/default/buildings.ruleset:608 data/civ2/buildings.ruleset:575
+#: data/default/buildings.ruleset:607 data/civ2/buildings.ruleset:575
msgid ""
"Allows a city to build veteran sea units. Also, damaged sea units which "
"stay in town for one full turn without moving are completely restored."
@@ -18901,12 +19054,12 @@ msgstr ""
"Tillater en by å bygge veterane sjøenheter. Dessuten blir skadede sjøenheter "
"som blir i byen en hel runde uten å bevege seg helt reparert."
-#: data/default/buildings.ruleset:615 data/civ2/buildings.ruleset:582
+#: data/default/buildings.ruleset:614 data/civ2/buildings.ruleset:582
#: data/civ1/buildings.ruleset:440
msgid "Power Plant"
msgstr "Kullkraftverk"
-#: data/default/buildings.ruleset:631
+#: data/default/buildings.ruleset:630
#, no-c-format
msgid ""
"Increases the shield production of a Factory or Mfg. Plant in a city: a "
@@ -18923,12 +19076,12 @@ msgstr ""
"\n"
"En by kan kun ha et vannkraftverk, kraftverk eller atomkraftverk. "
-#: data/default/buildings.ruleset:646 data/civ2/buildings.ruleset:610
+#: data/default/buildings.ruleset:645 data/civ2/buildings.ruleset:610
#: data/civ1/buildings.ruleset:468
msgid "Recycling Center"
msgstr "Resirkuleringsstasjon"
-#: data/default/buildings.ruleset:661 data/civ2/buildings.ruleset:625
+#: data/default/buildings.ruleset:660 data/civ2/buildings.ruleset:625
#: data/civ1/buildings.ruleset:483
#, no-c-format
msgid ""
@@ -18938,11 +19091,11 @@ msgstr ""
"Å bygge en resirkuleringsstasjon reduserer mengden forurensning som blir "
"laget i en by med 66%."
-#: data/default/buildings.ruleset:667 data/civ2/buildings.ruleset:631
+#: data/default/buildings.ruleset:666 data/civ2/buildings.ruleset:631
msgid "Research Lab"
msgstr "Forskningslaboratorium"
-#: data/default/buildings.ruleset:682
+#: data/default/buildings.ruleset:681
msgid ""
"Together with a Library, a Research Lab increases the science production of "
"a city by 200%. Together with a Library and a University, a Research Lab "
@@ -18952,11 +19105,11 @@ msgstr ""
"med 200%. Sammen med en bibliotek og et universitet øker et "
"forskningslaboratorium forskningen i en by med 450%."
-#: data/default/buildings.ruleset:690 data/civ2/buildings.ruleset:654
+#: data/default/buildings.ruleset:689 data/civ2/buildings.ruleset:654
msgid "SAM Battery"
msgstr "SAM rakettbatteri"
-#: data/default/buildings.ruleset:704 data/civ2/buildings.ruleset:668
+#: data/default/buildings.ruleset:703 data/civ2/buildings.ruleset:668
msgid ""
"Doubles the defense of all units inside the city when attacked by non-"
"nuclear air units."
@@ -18964,12 +19117,12 @@ msgstr ""
"Dobler forsvaret til alle enheter inne i en by når de blir angriper av "
"flyenheter uten atomkraft."
-#: data/default/buildings.ruleset:710 data/civ2/buildings.ruleset:674
+#: data/default/buildings.ruleset:709 data/civ2/buildings.ruleset:674
#: data/civ1/buildings.ruleset:489
msgid "SDI Defense"
msgstr "SDI forsvar"
-#: data/default/buildings.ruleset:724 data/civ2/buildings.ruleset:688
+#: data/default/buildings.ruleset:723 data/civ2/buildings.ruleset:688
#: data/civ1/buildings.ruleset:503
msgid ""
"Protects a city from attacks from Nuclear units. Nuclear attacks simply "
@@ -18979,12 +19132,12 @@ msgstr ""
"Beskytter en by mot angrep fra atomenheter. Atomangrep har ingen effekt i "
"byen. Og den dobler forsvaret mot ikke-atombaserte missiler."
-#: data/default/buildings.ruleset:733 data/civ2/buildings.ruleset:697
+#: data/default/buildings.ruleset:732 data/civ2/buildings.ruleset:697
msgid "Sewer System"
msgstr "Kloakksystem"
# problem
-#: data/default/buildings.ruleset:748 data/civ2/buildings.ruleset:712
+#: data/default/buildings.ruleset:747 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."
@@ -18992,12 +19145,12 @@ msgstr ""
"Tillater en by å vokse seg større enn størrelse 12. Akvedukt er først "
"nødvendig for at en by skal vokse seg større enn 8."
-#: data/default/buildings.ruleset:754 data/civ2/buildings.ruleset:749
+#: data/default/buildings.ruleset:753 data/civ2/buildings.ruleset:749
#: data/civ1/buildings.ruleset:512
msgid "Space Component"
msgstr "Romkomponent"
-#: data/default/buildings.ruleset:769 data/civ2/buildings.ruleset:763
+#: data/default/buildings.ruleset:768 data/civ2/buildings.ruleset:763
#: data/civ1/buildings.ruleset:526
msgid ""
"Space Components can be differentiated into Propulsion and Fuel Components. "
@@ -19013,12 +19166,12 @@ msgstr ""
"Før du kan bygge noen romkomponenter må en spiller ha bygget "
"Apolloprogrammet."
-#: data/default/buildings.ruleset:779 data/civ2/buildings.ruleset:773
+#: data/default/buildings.ruleset:778 data/civ2/buildings.ruleset:773
#: data/civ1/buildings.ruleset:536
msgid "Space Module"
msgstr "Rom-modul"
-#: data/default/buildings.ruleset:794 data/civ2/buildings.ruleset:787
+#: data/default/buildings.ruleset:793 data/civ2/buildings.ruleset:787
#: data/civ1/buildings.ruleset:550
msgid ""
"Space Modules are the most expensive parts of spaceships. There are three "
@@ -19051,12 +19204,12 @@ msgstr ""
"Før du kan bygge noen romskipsdeler må en spiller ha bygget underverket "
"Apolloprogrammet."
-#: data/default/buildings.ruleset:813 data/civ2/buildings.ruleset:806
+#: data/default/buildings.ruleset:812 data/civ2/buildings.ruleset:806
#: data/civ1/buildings.ruleset:569
msgid "Space Structural"
msgstr "Romstruktur"
-#: data/default/buildings.ruleset:828 data/civ2/buildings.ruleset:820
+#: data/default/buildings.ruleset:827 data/civ2/buildings.ruleset:820
#: data/civ1/buildings.ruleset:583
msgid ""
"Space Structurals form the base of your spaceship. All other spaceship "
@@ -19073,11 +19226,11 @@ msgstr ""
"Før du kan bygge noen romskipsdeler må en spiller ha bygget underverket "
"Apolloprogrammet."
-#: data/default/buildings.ruleset:838 data/civ2/buildings.ruleset:830
+#: data/default/buildings.ruleset:837 data/civ2/buildings.ruleset:830
msgid "Stock Exchange"
msgstr "Børs"
-#: data/default/buildings.ruleset:854 data/civ2/buildings.ruleset:846
+#: data/default/buildings.ruleset:853 data/civ2/buildings.ruleset:846
#, no-c-format
msgid ""
"Together with a Marketplace and a Bank, a Stock Exchange boosts tax and "
@@ -19086,22 +19239,22 @@ msgstr ""
"Sammen med en markedsplass og en bank, så øker børsen skatte- og luksus-"
"produksjonen i en by med 150%."
-#: data/default/buildings.ruleset:860 data/civ2/buildings.ruleset:852
+#: data/default/buildings.ruleset:859 data/civ2/buildings.ruleset:852
msgid "Super Highways"
msgstr "Motorveier"
-#: data/default/buildings.ruleset:875 data/civ2/buildings.ruleset:867
+#: data/default/buildings.ruleset:874 data/civ2/buildings.ruleset:867
#, no-c-format
msgid ""
"Increases trade resources by 50% on all squares with roads or railroads."
msgstr ""
"Øker handels ressursene med 50% på alle ruter med veier eller jernbaner."
-#: data/default/buildings.ruleset:883 data/civ2/buildings.ruleset:873
+#: data/default/buildings.ruleset:882 data/civ2/buildings.ruleset:873
msgid "Supermarket"
msgstr "Supermarked"
-#: data/default/buildings.ruleset:898 data/civ2/buildings.ruleset:888
+#: data/default/buildings.ruleset:897 data/civ2/buildings.ruleset:888
#, no-c-format
msgid ""
"Increases the food resources by 50% on each farmland square which is being "
@@ -19111,12 +19264,12 @@ msgstr ""
"Øker matressursene med 50% på hver rute med dyrket mark som blir brukt rundt "
"byen. Dyrket mark er de rutene som har blitt irrigert en ekstra gang."
-#: data/default/buildings.ruleset:905 data/civ2/buildings.ruleset:895
+#: data/default/buildings.ruleset:904 data/civ2/buildings.ruleset:895
#: data/civ1/buildings.ruleset:593
msgid "Temple"
msgstr "Tempel"
-#: data/default/buildings.ruleset:919 data/civ2/buildings.ruleset:909
+#: data/default/buildings.ruleset:918 data/civ2/buildings.ruleset:909
#: data/civ1/buildings.ruleset:607
msgid ""
"Makes one unhappy citizen content. Both the Mysticism advance and the "
@@ -19126,13 +19279,13 @@ msgstr ""
"Gjør en ulykkelig borger fornøyd. Både Mystisisme og Orakel underverket "
"dobler denne effekten. Med Mystisisme og Orakel blir 4 borgere fornøyd."
-#: data/default/buildings.ruleset:926 data/civ2/buildings.ruleset:916
+#: data/default/buildings.ruleset:925 data/civ2/buildings.ruleset:916
#: data/civ1/buildings.ruleset:614 data/default/techs.ruleset:742
#: data/civ2/techs.ruleset:727 data/civ1/techs.ruleset:723
msgid "University"
msgstr "Universitet"
-#: data/default/buildings.ruleset:942
+#: data/default/buildings.ruleset:941
#, no-c-format
msgid ""
"Together with a Library, a University increases the science production of a "
@@ -19141,12 +19294,12 @@ msgstr ""
"Sammen med bibliotek vil et universitet øke forskningsproduksjonen i en by "
"med 250%."
-#: data/default/buildings.ruleset:948 data/civ2/buildings.ruleset:938
+#: data/default/buildings.ruleset:947 data/civ2/buildings.ruleset:938
#: data/civ1/buildings.ruleset:636
msgid "Apollo Program"
msgstr "Apollo Programmet"
-#: data/default/buildings.ruleset:962 data/civ2/buildings.ruleset:952
+#: data/default/buildings.ruleset:961 data/civ2/buildings.ruleset:952
msgid ""
"Entire map becomes visible for the player who owns it. It allows all "
"players to start building spaceship parts (assuming they have researched the "
@@ -19156,11 +19309,11 @@ msgstr ""
"begynne å bygge romskipsdeler (dersom de har forsket på de nødvendige "
"teknologiene)."
-#: data/default/buildings.ruleset:969 data/civ2/buildings.ruleset:959
+#: data/default/buildings.ruleset:968 data/civ2/buildings.ruleset:959
msgid "A.Smith's Trading Co."
msgstr "Adam Smiths Handelsselskap"
-#: data/default/buildings.ruleset:983
+#: data/default/buildings.ruleset:982
msgid ""
"City improvements which would normally have an upkeep of 1 are free of "
"upkeep, for all your cities."
@@ -19168,12 +19321,12 @@ msgstr ""
"Byforbedringer som normalt vil ha utgifter på 1 vil bli uten "
"vedlikeholdskostnader i alle byer."
-#: data/default/buildings.ruleset:989 data/civ2/buildings.ruleset:979
+#: data/default/buildings.ruleset:988 data/civ2/buildings.ruleset:979
#: data/civ1/buildings.ruleset:655
msgid "Colossus"
msgstr "Kolossen"
-#: data/default/buildings.ruleset:1003 data/civ2/buildings.ruleset:993
+#: data/default/buildings.ruleset:1002 data/civ2/buildings.ruleset:993
#: data/civ1/buildings.ruleset:669
msgid ""
"Each square around the city where this wonder is built that is already "
@@ -19182,23 +19335,23 @@ msgstr ""
"Hver rute rundt byen som underverket er bygget som allerede genererer noe "
"handel produserer en ekstra handelsressurs."
-#: data/default/buildings.ruleset:1009 data/civ2/buildings.ruleset:999
+#: data/default/buildings.ruleset:1008 data/civ2/buildings.ruleset:999
#: data/civ1/buildings.ruleset:675
msgid "Copernicus' Observatory"
msgstr "Copernicus observatorium"
-#: data/default/buildings.ruleset:1024 data/civ2/buildings.ruleset:1180
+#: data/default/buildings.ruleset:1023 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 "Øker forskningen i byen det er bygget med 100%."
-#: data/default/buildings.ruleset:1029 data/civ2/buildings.ruleset:1019
+#: data/default/buildings.ruleset:1028 data/civ2/buildings.ruleset:1019
#: data/civ1/buildings.ruleset:695
msgid "Cure For Cancer"
msgstr "Løsning på kreftgåten"
-#: data/default/buildings.ruleset:1043
+#: data/default/buildings.ruleset:1042
msgid ""
"This stunning technological achievement makes one unhappy citizen content in "
"all your cities."
@@ -19206,12 +19359,12 @@ msgstr ""
"Denne imponerende teknologiske prestasjonen gjør en ulykkelig borger fornøyd "
"i alle byene dine."
-#: data/default/buildings.ruleset:1051 data/civ2/buildings.ruleset:1039
+#: data/default/buildings.ruleset:1050 data/civ2/buildings.ruleset:1039
#: data/civ1/buildings.ruleset:715
msgid "Darwin's Voyage"
msgstr "Darwins reise"
-#: data/default/buildings.ruleset:1065 data/civ2/buildings.ruleset:1053
+#: data/default/buildings.ruleset:1064 data/civ2/buildings.ruleset:1053
#: data/civ1/buildings.ruleset:729
msgid ""
"Charles Darwin's voyage sparked the discovery of the evolution of the "
@@ -19221,11 +19374,11 @@ msgstr ""
"Charles Darwins reise utløste oppdagelsen av artsutviklingen, som økte troen "
"på forskning. Gir to umiddelbare teknologiske fremskritt."
-#: data/default/buildings.ruleset:1072 data/civ2/buildings.ruleset:1060
+#: data/default/buildings.ruleset:1071 data/civ2/buildings.ruleset:1060
msgid "Eiffel Tower"
msgstr "Eiffeltårnet"
-#: data/default/buildings.ruleset:1087
+#: data/default/buildings.ruleset:1086
#, fuzzy, no-c-format
msgid ""
"Your reputation and goodwill among other nations is recovered twice as fast."
@@ -19233,12 +19386,12 @@ msgstr ""
"Ditt rykte hos de andre nasjonene blir bedre mens du eier dette underverket. "
"Ryktet blir forbedret dobbelt så fort som vanlig."
-#: data/default/buildings.ruleset:1093 data/civ2/buildings.ruleset:1081
+#: data/default/buildings.ruleset:1092 data/civ2/buildings.ruleset:1081
#: data/civ1/buildings.ruleset:736
msgid "Great Library"
msgstr "Verdensbiblioteket"
-#: data/default/buildings.ruleset:1107 data/civ2/buildings.ruleset:1095
+#: data/default/buildings.ruleset:1106 data/civ2/buildings.ruleset:1095
#: data/civ1/buildings.ruleset:750
msgid ""
"The civilization which builds the Great Library gets every advance that at "
@@ -19247,21 +19400,21 @@ msgstr ""
"Sivilisasjonen som bygger Verdensbiblioteket får alle fremskritt som minst "
"to andre sivilisasjoner har oppdaget."
-#: data/default/buildings.ruleset:1113 data/civ2/buildings.ruleset:1101
+#: data/default/buildings.ruleset:1112 data/civ2/buildings.ruleset:1101
#: data/civ1/buildings.ruleset:756
msgid "Great Wall"
msgstr "Den Enorme Muren"
-#: data/default/buildings.ruleset:1127
+#: data/default/buildings.ruleset:1126
msgid "Works as a City Wall in all your cities."
msgstr "Fungerer som bymur i alle byer."
-#: data/default/buildings.ruleset:1135 data/civ2/buildings.ruleset:1122
+#: data/default/buildings.ruleset:1134 data/civ2/buildings.ruleset:1122
#: data/civ1/buildings.ruleset:777
msgid "Hanging Gardens"
msgstr "Hengende Haver"
-#: data/default/buildings.ruleset:1149 data/civ2/buildings.ruleset:1136
+#: data/default/buildings.ruleset:1148 data/civ2/buildings.ruleset:1136
#: data/civ1/buildings.ruleset:791
msgid ""
"Makes one content citizen happy in every city. Makes two extra content "
@@ -19276,12 +19429,12 @@ msgstr ""
"Hengende Hager gjelder underverket i stedet ulykkelige borgere (og gjør de "
"fornøyde i stedet)."
-#: data/default/buildings.ruleset:1158 data/civ2/buildings.ruleset:1145
+#: data/default/buildings.ruleset:1157 data/civ2/buildings.ruleset:1145
#: data/civ1/buildings.ruleset:800
msgid "Hoover Dam"
msgstr "Hooverdemningen"
-#: data/default/buildings.ruleset:1173 data/civ2/buildings.ruleset:1159
+#: data/default/buildings.ruleset:1172 data/civ2/buildings.ruleset:1159
msgid ""
"Works as if you had a Hydro Plant in every city. (This reduces pollution "
"and increases the effects of Factories and Mfg. Plants.)"
@@ -19289,52 +19442,52 @@ msgstr ""
"Fungerer som om du hadde et vannkraftverk i hver by. (Dette reduserer "
"forurensningen og øker effekten av fabrikker og fabrikk-komplekser.)"
-#: data/default/buildings.ruleset:1179 data/civ2/buildings.ruleset:1165
+#: data/default/buildings.ruleset:1178 data/civ2/buildings.ruleset:1165
#: data/civ1/buildings.ruleset:822
msgid "Isaac Newton's College"
msgstr "Isak Newtons Universitet"
-#: data/default/buildings.ruleset:1194
+#: data/default/buildings.ruleset:1193
#, no-c-format
msgid ""
"Boosts science production by 100% in every city you control that has a "
"University."
msgstr "Øker forskningsbidraget med 100% i alle byer som har universitet."
-#: data/default/buildings.ruleset:1200 data/civ2/buildings.ruleset:1185
+#: data/default/buildings.ruleset:1199 data/civ2/buildings.ruleset:1185
#: data/civ1/buildings.ruleset:842
msgid "J.S. Bach's Cathedral"
msgstr "J.S. Bachs katedral"
-#: data/default/buildings.ruleset:1214 data/civ2/buildings.ruleset:1199
+#: data/default/buildings.ruleset:1213 data/civ2/buildings.ruleset:1199
msgid "Makes two unhappy citizens content in every city."
msgstr "Gjør to ulykkelige innbyggere fornøyde i hver by."
-#: data/default/buildings.ruleset:1219 data/civ2/buildings.ruleset:1204
+#: data/default/buildings.ruleset:1218 data/civ2/buildings.ruleset:1204
msgid "King Richard's Crusade"
msgstr "Rikard Løvehjertes Korstog"
-#: data/default/buildings.ruleset:1233 data/civ2/buildings.ruleset:1218
+#: data/default/buildings.ruleset:1232 data/civ2/buildings.ruleset:1218
msgid ""
"Adds one extra shield resource on every square around the city where it is "
"built."
msgstr ""
"Legger til en ekstra skjoldressurs på hver rute rundt byen hvor den bygges."
-#: data/default/buildings.ruleset:1239 data/civ2/buildings.ruleset:1224
+#: data/default/buildings.ruleset:1238 data/civ2/buildings.ruleset:1224
msgid "Leonardo's Workshop"
msgstr "Leonardos Arbeidsværelse"
-#: data/default/buildings.ruleset:1253 data/civ2/buildings.ruleset:1238
+#: data/default/buildings.ruleset:1252 data/civ2/buildings.ruleset:1238
msgid "Upgrades one obsolete unit per game turn."
msgstr "Oppgraderer en foreldet enhet hver spillrunde."
-#: data/default/buildings.ruleset:1258 data/civ2/buildings.ruleset:1243
+#: data/default/buildings.ruleset:1257 data/civ2/buildings.ruleset:1243
#: data/civ1/buildings.ruleset:862
msgid "Lighthouse"
msgstr "Fyrtårn"
-#: data/default/buildings.ruleset:1273
+#: data/default/buildings.ruleset:1272
msgid ""
"Gives all your sea units 1 additional movement point and eliminates the risk "
"of losing Triremes on the high seas. Makes all your new sea units veterans "
@@ -19344,34 +19497,34 @@ msgstr ""
"for å miste Triremer på sjøen. Gjør alle nye sjøenheter til veteran (i alle "
"dine byer)."
-#: data/default/buildings.ruleset:1280 data/civ2/buildings.ruleset:1264
+#: data/default/buildings.ruleset:1279 data/civ2/buildings.ruleset:1264
#: data/civ1/buildings.ruleset:885
msgid "Magellan's Expedition"
msgstr "Magellans ekspedisjon"
-#: data/default/buildings.ruleset:1295
+#: data/default/buildings.ruleset:1294
msgid "Gives all your sea units 2 additional movement points."
msgstr "Gir alle dine sjøenheter 2 ekstra forflytningspoeng."
-#: data/default/buildings.ruleset:1300 data/civ2/buildings.ruleset:1283
+#: data/default/buildings.ruleset:1299 data/civ2/buildings.ruleset:1283
#: data/civ1/buildings.ruleset:904
msgid "Manhattan Project"
msgstr "Manhattan prosjektet"
-#: data/default/buildings.ruleset:1318 data/civ2/buildings.ruleset:1301
+#: data/default/buildings.ruleset:1317 data/civ2/buildings.ruleset:1301
msgid "Marco Polo's Embassy"
msgstr "Marco Polos ambassade"
-#: data/default/buildings.ruleset:1332 data/civ2/buildings.ruleset:1315
+#: data/default/buildings.ruleset:1331 data/civ2/buildings.ruleset:1315
msgid "The player who owns it gets an embassy with all players."
msgstr "Spilleren som eier det får en ambassade hos alle spillerne."
-#: data/default/buildings.ruleset:1337 data/civ2/buildings.ruleset:1320
+#: data/default/buildings.ruleset:1336 data/civ2/buildings.ruleset:1320
#: data/civ1/buildings.ruleset:922
msgid "Michelangelo's Chapel"
msgstr "Det Sixtinske Kapell"
-#: data/default/buildings.ruleset:1351 data/civ2/buildings.ruleset:1334
+#: data/default/buildings.ruleset:1350 data/civ2/buildings.ruleset:1334
msgid ""
"Counts as having a Cathedral in each of your cities. This makes 3 unhappy "
"citizens content in each city. The discovery of Theology increases the "
@@ -19384,21 +19537,21 @@ msgstr ""
"katedral ved å gjør ytterligere en ulykkelig borger fornøyd. Oppdagelsen av "
"kommunisme minsker antallet med 1."
-#: data/default/buildings.ruleset:1361 data/civ2/buildings.ruleset:1344
+#: data/default/buildings.ruleset:1360 data/civ2/buildings.ruleset:1344
#: data/civ1/buildings.ruleset:941
msgid "Oracle"
msgstr "Orakel"
-#: data/default/buildings.ruleset:1375
+#: data/default/buildings.ruleset:1374
msgid "Makes two of your unhappy citizens content in every city with a temple."
msgstr "Gjør to ulykkelige innbyggere fornøyde i hver by som har tempel."
-#: data/default/buildings.ruleset:1380 data/civ2/buildings.ruleset:1363
+#: data/default/buildings.ruleset:1379 data/civ2/buildings.ruleset:1363
#: data/civ1/buildings.ruleset:960
msgid "Pyramids"
msgstr "Pyramidene"
-#: data/default/buildings.ruleset:1394
+#: data/default/buildings.ruleset:1393
#, fuzzy
msgid ""
"The amount of stored food lost when one of your cities grows or shrinks is "
@@ -19409,30 +19562,30 @@ msgstr ""
"vokser eller minker. Dette hjelper en by å vokse raskere og enklere motstå "
"sult."
-#: data/default/buildings.ruleset:1401 data/civ2/buildings.ruleset:1382
+#: data/default/buildings.ruleset:1400 data/civ2/buildings.ruleset:1382
#: data/civ1/buildings.ruleset:981
msgid "SETI Program"
msgstr "SETI programmet"
-#: data/default/buildings.ruleset:1415
+#: data/default/buildings.ruleset:1414
msgid "Boosts science production in each city with a Research Lab by 100%. "
msgstr "Øker forskningen i hver by som har forskningslaboratorium med 50%."
-#: data/default/buildings.ruleset:1420 data/civ2/buildings.ruleset:1402
+#: data/default/buildings.ruleset:1419 data/civ2/buildings.ruleset:1402
#: data/civ1/buildings.ruleset:1001
msgid "Shakespeare's Theatre"
msgstr "Shakespeares teater"
-#: data/default/buildings.ruleset:1434 data/civ2/buildings.ruleset:1416
+#: data/default/buildings.ruleset:1433 data/civ2/buildings.ruleset:1416
#: data/civ1/buildings.ruleset:1015
msgid "Makes all unhappy citizens content, in the city where it is located."
msgstr "Gjør alle ulykkelige borgere fornøyde i byen hvor den er plassert."
-#: data/default/buildings.ruleset:1439 data/civ2/buildings.ruleset:1421
+#: data/default/buildings.ruleset:1438 data/civ2/buildings.ruleset:1421
msgid "Statue of Liberty"
msgstr "Frihetsstatuen"
-#: data/default/buildings.ruleset:1453 data/civ2/buildings.ruleset:1435
+#: data/default/buildings.ruleset:1452 data/civ2/buildings.ruleset:1435
#: data/civ1/buildings.ruleset:974 data/civ1/buildings.ruleset:1034
msgid ""
"Allows you to choose any government, including those that have not yet been "
@@ -19442,11 +19595,11 @@ msgstr ""
"Lar deg velge hvilket som helst styresett, inkludert de som du ikke har "
"forsket frem enda, uten overgangstid med anarki."
-#: data/default/buildings.ruleset:1460 data/civ2/buildings.ruleset:1442
+#: data/default/buildings.ruleset:1459 data/civ2/buildings.ruleset:1442
msgid "Sun Tzu's War Academy"
msgstr "Sun Tzus Krigsakademi"
-#: data/default/buildings.ruleset:1474
+#: data/default/buildings.ruleset:1473
msgid ""
"All your new ground units start at the first veteran level. The chance of a "
"unit getting the next veteran level after a battle increases by half."
@@ -19455,21 +19608,21 @@ msgstr ""
"at en enhet oppnår det neste veteran-nivået etter en kamp øker med "
"halvparten."
-#: data/default/buildings.ruleset:1481 data/civ2/buildings.ruleset:1463
+#: data/default/buildings.ruleset:1480 data/civ2/buildings.ruleset:1463
#: data/civ1/buildings.ruleset:1020
msgid "United Nations"
msgstr "Forente Nasjoner"
-#: data/default/buildings.ruleset:1495
+#: data/default/buildings.ruleset:1494
msgid "All your units regain two extra hitpoints per turn."
msgstr "Alle enheter får tilbake to ekstra treffpoeng per runde."
-#: data/default/buildings.ruleset:1508 data/civ2/buildings.ruleset:1490
+#: data/default/buildings.ruleset:1507 data/civ2/buildings.ruleset:1490
#: data/civ1/buildings.ruleset:1046
msgid "Women's Suffrage"
msgstr "Stemmerett for kvinner"
-#: data/default/buildings.ruleset:1522 data/civ2/buildings.ruleset:1504
+#: data/default/buildings.ruleset:1521 data/civ2/buildings.ruleset:1504
msgid ""
"Counts as a Police Station in every city. (That is, for each city, reduces "
"unhappiness for military units outside the city by 2 under Democracy and 1 "
@@ -19479,11 +19632,11 @@ msgstr ""
"ulykkeligheten fra militære enheter utenfor byen med 2 under demokrati og 1 "
"under republikk. Dette underverket har ingen effekt under andre styresett.)"
-#: data/default/buildings.ruleset:1533
+#: data/default/buildings.ruleset:1532
msgid "Coinage"
msgstr "Kapitalisering"
-#: data/default/buildings.ruleset:1554
+#: data/default/buildings.ruleset:1553
msgid ""
"This is not a normal improvement. Instead, setting a city's production to "
"Coinage means its shield production is converted to tax output (money, "
@@ -19937,12 +20090,17 @@ msgstr "?city_state:Fred"
msgid "?citystyle:Industrial"
msgstr "?city:Nøytral"
-#: data/default/cities.ruleset:139 data/civ2/cities.ruleset:150
+#: data/default/cities.ruleset:139
+#, fuzzy
+msgid "?citystyle:ElectricAge"
+msgstr "?city_state:Fred"
+
+#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:150
#, fuzzy
msgid "?citystyle:Modern"
msgstr "?city_state:Uro"
-#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:161
+#: data/default/cities.ruleset:161 data/civ2/cities.ruleset:161
#, fuzzy
msgid "?citystyle:PostModern"
msgstr "?city_state:Uro"
@@ -25290,6 +25448,40 @@ msgstr "Lag"
msgid "Team 31"
msgstr "Lag"
+#~ msgid "Command access level could not be set to '%s' for connection %s."
+#~ msgstr ""
+#~ "Kommando tilgangsnivå kunne ikke settes til '%s' for forbinselse %s."
+
+#~ msgid "Observers cannot vote."
+#~ msgstr "Observatører kan ikke stemme."
+
+#~ msgid "Vote %d \"%s\": %d for, %d against"
+#~ msgstr "Valg %d \"%s\": %d for, %d mot"
+
+#~ msgid "Value must be integer."
+#~ msgstr "Verdien må være et heltall."
+
+#~ 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 Hydro Plant, Power Plant, or Nuclear Plant. A "
+#~ "city can only build a Hydro Plant if it is next to (or on) a Mountain or "
+#~ "River tile."
+#~ msgstr ""
+#~ "Reduserer mengden forurensning generert av en by med 50%. Det øker "
+#~ "produksjonen av skjold fra en fabrikk eller et fabrikk-kompleks i byen: "
+#~ "en fabrikk og et fabrikk-kompleks gir til sammen 75% produksjonsbonus, og "
+#~ "en fabrikk, et fabrikk-kompleks og et vannkraftverk gir tilsammen 150% "
+#~ "produksjonsbonus.\n"
+#~ "\n"
+#~ "En by kan kun ha et vannkraftverk, kraftverk eller atomkraftverk. En by "
+#~ "kan kun bygge vannkraftverk dersom den er ved siden av (eller på) et "
+#~ "fjell eller en elv."
+
#, fuzzy
#~ msgid "Auth config filename \"%s\" not allowed!"
#~ msgstr "Det navnet er ikke tillat."
diff --git a/po/pl.gmo b/po/pl.gmo
index 1d40239..b2a68a4 100644
Binary files a/po/pl.gmo and b/po/pl.gmo differ
diff --git a/po/pl.po b/po/pl.po
index a7f9afc..02de438 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: 2009-03-29 21:13+0900\n"
+"POT-Creation-Date: 2009-11-22 21:37+0100\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"
@@ -74,21 +74,21 @@ msgstr "?obsolete:P"
msgid "?redundant:*"
msgstr "?redundant:*"
-#: common/connection.c:515
+#: common/connection.c:518
#, c-format
msgid "%s from %s"
msgstr "%s %s"
-#: common/connection.c:521
+#: common/connection.c:524
msgid " (connection incomplete)"
msgstr " (połączenie niekompletne)"
-#: common/connection.c:525
+#: common/connection.c:528
#, c-format
msgid " (player %s)"
msgstr " (gracz %s)"
-#: common/connection.c:529
+#: common/connection.c:532
msgid " (observer)"
msgstr " (obserwator)"
@@ -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:732
+#: common/player.c:746
msgid "?attitude:Genocidal"
msgstr "?attitude:Nienawiść"
-#: common/player.c:734
+#: common/player.c:748
msgid "?attitude:Belligerent"
msgstr "?attitude:Obrzydzenie"
-#: common/player.c:736
+#: common/player.c:750
msgid "?attitude:Hostile"
msgstr "?attitude:Wrogość"
-#: common/player.c:738
+#: common/player.c:752
msgid "?attitude:Uncooperative"
msgstr "?attitude:Niechęć"
-#: common/player.c:740
+#: common/player.c:754
msgid "?attitude:Uneasy"
msgstr "?attitude:Niepokój"
-#: common/player.c:742
+#: common/player.c:756
msgid "?attitude:Neutral"
msgstr "?nation:Obojętność"
-#: common/player.c:744
+#: common/player.c:758
msgid "?attitude:Respectful"
msgstr "?attitude:Uprzejmość"
-#: common/player.c:746
+#: common/player.c:760
msgid "?attitude:Helpful"
msgstr "?attitude:Zadowolenie"
-#: common/player.c:748
+#: common/player.c:762
msgid "?attitude:Enthusiastic"
msgstr "?attitude:Wdzięczność"
-#: common/player.c:750
+#: common/player.c:764
msgid "?attitude:Admiring"
msgstr "?attitude:Przyjaźń"
-#: common/player.c:753
+#: common/player.c:767
msgid "?attitude:Worshipful"
msgstr "?attitude:Harmonia"
-#: common/player.c:764
+#: common/player.c:778
msgid "?diplomatic_state:Armistice"
msgstr "?diplomatic_state:Rozejm"
-#: common/player.c:765
+#: common/player.c:779
msgid "?diplomatic_state:War"
msgstr "?diplomatic_state:Wojna"
-#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:780 client/gui-gtk-2.0/diplodlg.c:353
#: 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:767 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:781 client/gui-gtk-2.0/diplodlg.c:358
#: 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:768 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:782 client/gui-gtk-2.0/diplodlg.c:363
#: 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:769
+#: common/player.c:783
msgid "?diplomatic_state:Never met"
msgstr "?diplomatic_state:Brak kontaktu"
-#: common/player.c:770
+#: common/player.c:784
msgid "?diplomatic_state:Team"
msgstr "?diplomatic_state:Zespół"
@@ -655,7 +655,7 @@ msgstr "Efekty nieusuwalne muszą mieć zasięg globalny."
#. TRANS: "Resources: (none)".
#: common/requirements.c:1014 common/team.c:132
#: client/gui-gtk-2.0/helpdlg.c:1055 client/gui-gtk-2.0/inteldlg.c:390
-#: client/gui-win32/helpdlg.c:586 client/gui-xaw/helpdlg.c:991
+#: client/gui-win32/helpdlg.c:592 client/gui-xaw/helpdlg.c:991
#, c-format
msgid "(none)"
msgstr "(brak)"
@@ -681,10 +681,11 @@ msgstr "Tech. Przysz. %d"
#: 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
#: client/gui-sdl/helpdlg.c:817 client/gui-sdl/mapview.c:962
-#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:545
-#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:735
-#: 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
+#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:544
+#: client/gui-win32/helpdlg.c:551 client/gui-win32/helpdlg.c:721
+#: client/gui-win32/helpdlg.c:741 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 "Brak"
@@ -697,29 +698,29 @@ msgstr "Tech. Przysz."
msgid "(Unknown)"
msgstr "(nieznane)"
-#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:553
#: manual/civmanual.c:224
msgid "Road"
msgstr "Droga"
-#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:557
#: client/gui-gtk-2.0/menu.c:829 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:394 common/terrain.c:572 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:567
#: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
#: data/civ1/techs.ruleset:563
msgid "Railroad"
msgstr "Kolej"
-#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:555
msgid "Mine"
msgstr "Kopalnia"
-#: common/terrain.c:396 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:551 server/report.c:124
#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "Zanieczyszczenie"
@@ -729,7 +730,7 @@ msgstr "Zanieczyszczenie"
msgid "Hut"
msgstr "Wyj"
-#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:563
#: manual/civmanual.c:226
msgid "Fortress"
msgstr "Fort"
@@ -744,58 +745,58 @@ msgstr " Rzeki"
msgid "Farmland"
msgstr "Zbuduj farmÄ™"
-#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:577
#: manual/civmanual.c:226
msgid "Airbase"
msgstr "LÄ…dowisko"
-#: common/terrain.c:402 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:579
msgid "Fallout"
msgstr "Skażenie"
-#: common/unit.c:546 client/gui-win32/plrdlg.c:337
+#: common/unit.c:549 client/gui-win32/plrdlg.c:337
msgid "Idle"
msgstr "Bezczynność"
-#: common/unit.c:556
+#: common/unit.c:559
msgid "Fortifying"
msgstr "Umacnianie"
-#: common/unit.c:558
+#: common/unit.c:561
msgid "Fortified"
msgstr "Umocniony"
-#: common/unit.c:562 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
+#: common/unit.c:565 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
msgid "Sentry"
msgstr "Wartuj"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
+#: common/unit.c:569 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
#: client/gui-win32/menu.c:370 client/gui-xaw/menu.c:185
msgid "Pillage"
msgstr "Niszcz"
-#: common/unit.c:568 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
+#: common/unit.c:571 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
msgid "Goto"
msgstr "Idź do"
-#: common/unit.c:570
+#: common/unit.c:573
msgid "Explore"
msgstr "Zbadaj"
-#: common/unit.c:572 manual/civmanual.c:224
+#: common/unit.c:575 manual/civmanual.c:224
msgid "Transform"
msgstr "Zmień"
-#: common/unit.c:584 client/text.c:157 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:587 client/text.c:157 client/gui-sdl/citydlg.c:1972
#: client/gui-win32/citydlg.c:1257 client/gui-xaw/citydlg.c:1423
msgid "Unknown"
msgstr "Nieznane"
-#: common/unit.c:1022
+#: common/unit.c:1025
msgid "Moves"
msgstr "Punkty ruchu"
-#: common/unit.c:1571
+#: common/unit.c:1574
#, c-format
msgid ""
"Upgrade %s to %s for %d gold?\n"
@@ -804,12 +805,12 @@ msgstr ""
"Ulepszyć %s do %s za %d złota?\n"
"Skarbiec zawiera %d złota."
-#: common/unit.c:1579
+#: common/unit.c:1582
#, c-format
msgid "Sorry, cannot upgrade %s (yet)."
msgstr "Niestety: Nie można ulepszyć %s (jeszcze)."
-#: common/unit.c:1585
+#: common/unit.c:1588
#, c-format
msgid ""
"Upgrading %s to %s costs %d gold.\n"
@@ -818,11 +819,11 @@ msgstr ""
"Ulepszenie %s do %s kosztuje %d złota.\n"
"Skarbiec zawiera %d złota."
-#: common/unit.c:1594
+#: common/unit.c:1597
msgid "You can only upgrade units in your cities."
msgstr "Możesz ulepszać jednostki jedynie we własnych miastach."
-#: common/unit.c:1598
+#: common/unit.c:1601
#, c-format
msgid "Upgrading this %s would strand units it transports."
msgstr ""
@@ -860,11 +861,11 @@ msgstr "Bomba Atomowa"
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1404
+#: common/unittype.c:349 client/helpdata.c:1412
msgid " and "
msgstr " oraz "
-#: common/unittype.c:355 client/helpdata.c:1390
+#: common/unittype.c:355 client/helpdata.c:1398
msgid "?and:, "
msgstr "?and: oraz "
@@ -1038,71 +1039,71 @@ msgstr "Pusty argument dla \"%s\".\n"
msgid "Missing argument for \"%s\".\n"
msgstr "Brakuje argumentu dla \"%s\".\n"
-#: utility/shared.c:501
+#: utility/shared.c:514
#, c-format
msgid "%d BC"
msgstr "%d p.n.e."
-#: utility/shared.c:503
+#: utility/shared.c:516
#, c-format
msgid "%d AD"
msgstr "%d n.e."
-#: utility/shared.c:924
+#: utility/shared.c:937
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:1028
+#: utility/shared.c:1041
#, c-format
msgid "Could not read data directory %s: %s."
msgstr "Nie można czytać z katalogu danych %s: %s."
-#: utility/shared.c:1279
+#: utility/shared.c:1292
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:1281
+#: utility/shared.c:1294
#, c-format
msgid "Current data path is: \"%s\""
msgstr "Bieżący katalog danych to: \"%s\""
-#: utility/shared.c:1283
+#: utility/shared.c:1296
#, c-format
msgid "The \"%s\" file is required ... aborting!"
msgstr "Wymagany jest plik \"%s\"... kończę pracę!"
-#: utility/shared.c:1460
+#: utility/shared.c:1485
#, 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:1462
+#: utility/shared.c:1487
msgid "Use a non-privileged account instead.\n"
msgstr "Użyj do tego konta normalnego użytkownika.\n"
-#: utility/shared.c:1478
+#: utility/shared.c:1503
msgid "exact match"
msgstr "dokładnie pasujące"
-#: utility/shared.c:1479
+#: utility/shared.c:1504
msgid "only match"
msgstr "tylko pasujÄ…ce"
-#: utility/shared.c:1480
+#: utility/shared.c:1505
msgid "ambiguous"
msgstr "dwuznaczne"
-#: utility/shared.c:1481
+#: utility/shared.c:1506
msgid "empty"
msgstr "puste"
-#: utility/shared.c:1482
+#: utility/shared.c:1507
msgid "too long"
msgstr "za długie"
-#: utility/shared.c:1483
+#: utility/shared.c:1508
msgid "non-match"
msgstr "nie-pasuje"
@@ -1131,72 +1132,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:280
+#: ai/advdiplomacy.c:300
#, 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:290
+#: ai/advdiplomacy.c:310
#, c-format
msgid "*%s (AI)* First break alliance with %s, %s."
msgstr "*%s (AI)* Zerwij najpierw sojusz z %s, %s"
-#: ai/advdiplomacy.c:303
+#: ai/advdiplomacy.c:322
#, c-format
msgid "*%s (AI)* Let us first cease hostilies, %s."
msgstr "*%s (AI)* Na razie wystarczy mi zawieszenie broni, %s"
-#: ai/advdiplomacy.c:308
+#: ai/advdiplomacy.c:327
#, 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:331
+#: ai/advdiplomacy.c:350
#, 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:424
+#: ai/advdiplomacy.c:443
#, 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:454
+#: ai/advdiplomacy.c:473
#, 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:560
+#: ai/advdiplomacy.c:579
#, 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:582
+#: ai/advdiplomacy.c:601
#, c-format
msgid "*%s (AI)* Welcome into our alliance %s!"
msgstr "*%s (AI)* Witamy w naszym sojuszu %s!"
-#: ai/advdiplomacy.c:586
+#: ai/advdiplomacy.c:605
#, 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:593
+#: ai/advdiplomacy.c:612
#, c-format
msgid "*%s (AI)* Yes, peace in our time!"
msgstr "*%s (AI)* Pokój to dobre rozwiązanie dla nas!"
-#: ai/advdiplomacy.c:598
+#: ai/advdiplomacy.c:617
#, c-format
msgid "*%s (AI)* Agreed. No more hostilities, %s."
msgstr "*%s (AI)* Ok, zgoda. Dość już krwi, %s."
-#: ai/advdiplomacy.c:813
+#: ai/advdiplomacy.c:832
#, c-format
msgid ""
"*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
@@ -1205,22 +1206,22 @@ msgstr ""
"*%s (AI) Pozdrowienia %s! Czy mogę ci zaproponować zawieszenie broni? Może "
"siÄ™ poznamy i polubimy."
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1116
#, c-format
msgid "*%s (AI)* Space will never be yours. "
msgstr "*%s (AI)* Kosmos nigdy nie będzie twój."
-#: ai/advdiplomacy.c:1102
+#: ai/advdiplomacy.c:1121
#, 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:1108
+#: ai/advdiplomacy.c:1127
#, c-format
msgid "*%s (AI)* Peace in ... some other time."
msgstr "*%s (AI)* Pokój? ... raczej nie teraz."
-#: ai/advdiplomacy.c:1113
+#: ai/advdiplomacy.c:1132
#, c-format
msgid ""
"*%s (AI)* Finally I get around to you! Did you really think you could get "
@@ -1228,17 +1229,17 @@ msgid ""
msgstr ""
"*%s (AI)* Mam już ciebie dość, jak mogłem tak długo tolerować twoje zbrodnie?"
-#: ai/advdiplomacy.c:1119
+#: ai/advdiplomacy.c:1138
#, 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:1126
+#: ai/advdiplomacy.c:1145
#, 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:1209
+#: ai/advdiplomacy.c:1229
#, fuzzy, c-format
msgid ""
"*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1256,14 +1257,14 @@ msgstr[2] ""
"*%s (AI)* Totalna wojna przeciwko %s rozpocznie siÄ™ w ciÄ…gu %d tur. Musimy "
"zatrzymać ten statek kosmiczny."
-#: ai/advdiplomacy.c:1219
+#: ai/advdiplomacy.c:1239
#, 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:1225
+#: ai/advdiplomacy.c:1245
#, fuzzy, c-format
msgid ""
"*%s (AI)* %s has grossly violated his treaties with us for own gain. We "
@@ -1283,7 +1284,7 @@ msgstr[2] ""
"*%s (AI)* %s poważnie naruszył nasze traktaty. Odpowiemy siłą w ciągu %d "
"tur. Oczekujemy twojej pomocy!"
-#: ai/advdiplomacy.c:1238
+#: ai/advdiplomacy.c:1258
#, fuzzy, c-format
msgid ""
"*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1301,13 +1302,13 @@ msgstr[2] ""
"*%s (AI)* Zamierzamy złupić i zniszczyć cywilizację %s. Wojna rozpocznie się "
"w ciÄ…gu %d tur."
-#: ai/advdiplomacy.c:1246
+#: ai/advdiplomacy.c:1266
#, 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:1251
+#: ai/advdiplomacy.c:1271
#, fuzzy, c-format
msgid ""
"*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1325,12 +1326,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:1261
+#: ai/advdiplomacy.c:1281
#, 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:1267
+#: ai/advdiplomacy.c:1287
#, fuzzy, c-format
msgid ""
"*%s (AI)* We will honour our alliance and declare war on %s in %d turn. "
@@ -1348,7 +1349,7 @@ msgstr[2] ""
"*%s (AI)* Dotrzymamy warunków sojuszu i wypowiemy wojnę %s w ciągu %d tur. "
"Pomoc przybywa!"
-#: ai/advdiplomacy.c:1276
+#: ai/advdiplomacy.c:1296
#, fuzzy, c-format
msgid ""
"*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1366,7 +1367,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:1344
+#: ai/advdiplomacy.c:1364
#, c-format
msgid ""
"*%s (AI)* Your attempt to conquer space for yourself alone betray your true "
@@ -1375,14 +1376,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:1359
+#: ai/advdiplomacy.c:1379
#, 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:1362
+#: ai/advdiplomacy.c:1382
#, c-format
msgid ""
"*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
@@ -1391,14 +1392,14 @@ msgstr ""
"*%s (AI)* Jeśli nie przerwiesz konstrukcji statku, będę zmuszony powstrzymać "
"Cię wszelkimi dostępnymi sposobami!"
-#: ai/advdiplomacy.c:1474
+#: ai/advdiplomacy.c:1494
#, 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:1549
+#: ai/advdiplomacy.c:1569
#, c-format
msgid ""
"*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
@@ -1407,7 +1408,7 @@ msgstr ""
"*%s (AI)* Mój najbardziej zaufany przyjacielu, wzywam cię do zniszczenia "
"naszego wroga - %s."
-#: ai/advdiplomacy.c:1555
+#: ai/advdiplomacy.c:1575
#, c-format
msgid ""
"*%s (AI)* Greetings ally, I see you have not yet made war with our enemy, %"
@@ -1417,7 +1418,7 @@ msgstr ""
"wojny naszemu wrogowi %s. Czyżbyś zapomniał o naszych wzajemnych "
"zobowiÄ…zaniach?"
-#: ai/advdiplomacy.c:1562
+#: ai/advdiplomacy.c:1582
#, c-format
msgid ""
"*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1428,7 +1429,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:1592
+#: ai/advdiplomacy.c:1612
#, c-format
msgid ""
"*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
@@ -1437,12 +1438,12 @@ msgstr ""
"*%s (AI)* Pozdrowienia przyjacielu; razem będziemy silniejsi. Co sądzisz o "
"sojuszu?"
-#: ai/advdiplomacy.c:1607
+#: ai/advdiplomacy.c:1627
#, 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:1622
+#: ai/advdiplomacy.c:1642
#, fuzzy, c-format
msgid ""
"*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
@@ -1451,7 +1452,7 @@ msgstr ""
"*%s (AI)* Obaj wiele ucierpieliśmy w tym konflikcie. Co sądzisz o przerwaniu "
"przemocy?"
-#: ai/advdiplomacy.c:1742
+#: ai/advdiplomacy.c:1762
#, c-format
msgid ""
"*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1595,19 +1596,19 @@ msgid ""
"minimum %d [printable] characters long. Try again."
msgstr ""
-#: server/barbarian.c:183
+#: server/barbarian.c:184
#, fuzzy, c-format
msgid "%s gain a leader by the name %s. Dangerous times may lie ahead."
msgstr ""
"Barabarzyńcy zorganizowali się pod dowództwem %s. Nastają niebezpieczne "
"czasy."
-#: server/barbarian.c:479
+#: server/barbarian.c:480
#, c-format
msgid "Native unrest near %s led by %s."
msgstr "Powstanie w pobliżu miasta %s, przewodzi mu %s."
-#: server/barbarian.c:484
+#: server/barbarian.c:485
#, c-format
msgid "Sea raiders seen near %s!"
msgstr "Piraci w pobliżu miasta %s!"
@@ -2004,7 +2005,7 @@ msgstr[0] "%s przyspiesza badania, dostajesz natychmiast %d wynalazek."
msgstr[1] "%s przyspiesza badania, dostajesz natychmiast %d wynalazki."
msgstr[2] "%s przyspiesza badania, dostajesz natychmiast %d wynalazków."
-#: server/cityturn.c:1158 server/techtools.c:176
+#: server/cityturn.c:1158 server/techtools.c:172
#, c-format
msgid "The %s have acquired %s from %s."
msgstr "%s otrzymali %s od %s."
@@ -2089,22 +2090,22 @@ msgstr ""
"Ostrzeżenie: opcja %s jest przestarzała. Aby włączyć opcję metaserwera użyj -"
"m.\n"
-#: server/civserver.c:189
+#: server/civserver.c:193
#, c-format
msgid "Error: unknown option '%s'\n"
msgstr "BÅ‚Ä…d: nieznana opcja '%s'\n"
-#: server/civserver.c:200
+#: server/civserver.c:204
#, c-format
msgid "This is the server for %s"
msgstr "To jest serwer dla %s"
-#: server/civserver.c:201
+#: server/civserver.c:205
#, c-format
msgid "You can learn a lot about Freeciv at %s"
msgstr "Wiele o Freeciv możesz się dowiedzieć na %s"
-#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
+#: server/civserver.c:210 client/civclient.c:239 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -2113,109 +2114,114 @@ msgstr ""
"Składnia: %s [opcja ...]\n"
"Poprawnymi opcjami sÄ…:\n"
-#: server/civserver.c:208
+#: server/civserver.c:212
#, fuzzy
msgid ""
" -a --auth FILE\tEnable server authentication with configuration from "
"FILE.\n"
msgstr " -a --auth\t\tWÅ‚Ä…cz uwierzytelnienie.\n"
-#: server/civserver.c:210
+#: server/civserver.c:214
msgid " -G --Guests\t\tAllow guests to login if auth is enabled.\n"
msgstr " -G --Guests\t\tZezwalaj gościom na przyłączenie się do serwera.\n"
-#: server/civserver.c:212
+#: server/civserver.c:216
msgid " -N --Newusers\tAllow new users to login if auth is enabled.\n"
msgstr ""
" -N --Newusers\tZezwalaj nowym użytkownikom na przyłączanie się do "
"serwera.\n"
-#: server/civserver.c:215
+#: server/civserver.c:219
msgid " -b --bind ADDR\tListen for clients on ADDR\n"
msgstr " -b --bind ADDR\tPrzyjmuj klientów z adresu ADDR\n"
-#: server/civserver.c:217 client/civclient.c:242
+#: server/civserver.c:221 client/civclient.c:243
msgid ""
" -d, --debug NUM\tSet debug log level (0 to 4, or 4:file1,min,max:...)\n"
msgstr ""
" -d, --debug N\t\tUstaw poziom śledzenia (0,1,2,3,lub 3:plik1,min,"
"maks:...)\n"
-#: server/civserver.c:221 client/civclient.c:246
+#: server/civserver.c:225 client/civclient.c:247
msgid " -d, --debug NUM\tSet debug log level (0 to 3)\n"
msgstr " -d, --debug N\t\tUstaw poziom śledzenia (0,1,2)\n"
-#: server/civserver.c:223
+#: server/civserver.c:227
msgid " -f, --file FILE\tLoad saved game FILE\n"
msgstr " -f, --file PLIK\tWczytaj zachowanÄ… grÄ™ PLIK\n"
-#: server/civserver.c:225 client/civclient.c:249 manual/civmanual.c:382
+#: server/civserver.c:229 client/civclient.c:250 manual/civmanual.c:382
msgid " -h, --help\t\tPrint a summary of the options\n"
msgstr " -h, --help\t\tWypisz listÄ™ opcji.\n"
-#: server/civserver.c:226
+#: server/civserver.c:230
+#, fuzzy
+msgid " -i, --identity ADDR\tBe known as ADDR at metaserver\n"
+msgstr " -M, --Metaserver ADRES\tUstal ADRES jako adres metaserwera.\n"
+
+#: server/civserver.c:231
msgid " -l, --log FILE\tUse FILE as logfile\n"
msgstr " -l, --log PLIK\tUżyj PLIK jako pliku dziennika.\n"
#
-#: server/civserver.c:227
+#: server/civserver.c:232
msgid " -m, --meta\t\tNotify metaserver and send server's info\n"
msgstr " -m, --meta\t\tZamelduj się i wyślij info do metaserwera\n"
-#: server/civserver.c:229
+#: server/civserver.c:234
msgid " -M, --Metaserver ADDR\tSet ADDR as metaserver address\n"
msgstr " -M, --Metaserver ADRES\tUstal ADRES jako adres metaserwera.\n"
-#: server/civserver.c:232
+#: server/civserver.c:237
msgid " -p, --port PORT\tListen for clients on port PORT\n"
msgstr " -p, --port PORT\tNasłuchuj na klientów na porcie PORT\n"
-#: server/civserver.c:234
+#: server/civserver.c:239
msgid " -q, --quitidle TIME\tQuit if no players for TIME seconds\n"
msgstr " -q, --quitidle CZAS\tZakończ jeśli brak graczy po CZAS sekundach\n"
-#: server/civserver.c:236
+#: server/civserver.c:241
msgid " -e, --exit-on-end\tWhen a game ends, exit instead of restarting\n"
msgstr ""
" -e, --exit-on-end\tGdy gra się skończy, zakończ program zamiast "
"restartować\n"
-#: server/civserver.c:239
+#: server/civserver.c:244
msgid " -s, --saves DIR\tSave games to directory DIR\n"
msgstr " -s, --saves DIR\tZapisuje gry do katalogu DIR\n"
-#: server/civserver.c:241
+#: server/civserver.c:246
msgid " -S, --Serverid ID\tSets the server id to ID\n"
msgstr " -S, --Serverid ID\tUstawia id serwera na ID\n"
-#: server/civserver.c:243
+#: server/civserver.c:248
msgid " -P, --Ppm\t\tSave ppms of the map when saving the game.\n"
msgstr " -P, --Ppm\t\tZapisuj ppm'y dla mapy podczas zapisywania gry.\n"
-#: server/civserver.c:244
+#: server/civserver.c:249
msgid " -r, --read FILE\tRead startup script FILE\n"
msgstr " -r, --read PLIK\tUruchom skrypt startowy PLIK\n"
-#: server/civserver.c:246
+#: server/civserver.c:251
msgid " -R, --Ranklog FILE\tUse FILE as ranking logfile\n"
msgstr " -R, --Ranklog PLIK\tUżyj PLIK jako pliku dziennika rankingu.\n"
-#: server/civserver.c:247 client/civclient.c:268 manual/civmanual.c:383
+#: server/civserver.c:252 client/civclient.c:269 manual/civmanual.c:383
msgid " -v, --version\t\tPrint the version number\n"
msgstr " -v, --version\t\tWypisz numer wersji.\n"
-#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
+#: server/civserver.c:253 client/gui-gtk-2.0/gui_main.c:354
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, fuzzy, c-format
msgid "Report bugs at %s.\n"
msgstr "Zgłaszanie błędów na adres <%s>.\n"
-#: server/commands.c:28
+#: server/commands.c:29
msgid "Start the game, or restart after loading a savegame."
msgstr "Rozpoczyna grÄ™ lub wznawia po wczytaniu save'a."
-#: server/commands.c:29
+#: server/commands.c:30
msgid ""
"This command starts the game. When starting a new game, it should be used "
"after all human players have connected, and AI players have been created (if "
@@ -2231,7 +2237,7 @@ msgstr ""
"została wczytana, to komenda 'start' jest konieczna do kontynuowania gry."
#. TRANS: translate text between <> only
-#: server/commands.c:42
+#: server/commands.c:44
msgid ""
"help\n"
"help commands\n"
@@ -2245,11 +2251,11 @@ msgstr ""
"help <nazwa-komendy>\n"
"help <nazwa-opcji>"
-#: server/commands.c:47
+#: server/commands.c:49
msgid "Show help about server commands and server options."
msgstr "Wyświetla pomoc na temat komend i opcji serwera."
-#: server/commands.c:48
+#: server/commands.c:50
msgid ""
"With no arguments gives some introductory help. With argument \"commands\" "
"or \"options\" gives respectively a list of all commands or all options. "
@@ -2264,11 +2270,11 @@ msgstr ""
"wyświetlona pomoc. W przypadku opcji wyświetla także jej aktualną, minimalną "
"i maksymalną wartość. Nazwy mogą być skrócone jeśli skróty są jednoznacze."
-#: server/commands.c:63
+#: server/commands.c:66
msgid "Show a list of players, teams, connections, or scenarios."
msgstr "Wyświetla listę graczy, zespołów, połączeń lub scenariuszów."
-#: server/commands.c:64
+#: server/commands.c:67
#, fuzzy
msgid ""
"Show a list of players in the game, teams of players, connections to the "
@@ -2278,20 +2284,20 @@ msgstr ""
"Wyświetla listę graczy, zespołów, połączeń lub scenariuszów. Argumenty mogą "
"być skrócone, a domyślnym jest 'players'."
-#: server/commands.c:70
+#: server/commands.c:74
msgid "Quit the game and shutdown the server."
msgstr "Kończy grę i zamyka serwer."
#. TRANS: translate text between <> only
-#: server/commands.c:74
+#: server/commands.c:79
msgid "cut <connection-name>"
msgstr "cut <nazwa-połączenia>"
-#: server/commands.c:75
+#: server/commands.c:80
msgid "Cut a client's connection to server."
msgstr "Przerywa połączenie klienta z serwerem."
-#: server/commands.c:76
+#: server/commands.c:81
msgid ""
"Cut specified client's connection to the server, removing that client from "
"the game. If the game has not yet started that client's player is removed "
@@ -2305,7 +2311,7 @@ msgstr ""
"imienia uczestnika."
#. TRANS: translate text between <> only
-#: server/commands.c:83
+#: server/commands.c:89
msgid ""
"explain\n"
"explain <option-name>"
@@ -2313,11 +2319,11 @@ msgstr ""
"explain\n"
"explain <opcja>"
-#: server/commands.c:85
+#: server/commands.c:91
msgid "Explain server options."
msgstr "Wyjaśnia opcję serwera."
-#: server/commands.c:86
+#: server/commands.c:92
msgid ""
"The 'explain' command gives a subset of the functionality of 'help', and is "
"included for backward compatibility. With no arguments it gives a list of "
@@ -2329,7 +2335,7 @@ msgstr ""
"options' a z argumentem jak 'help <nazwa-opcji>'."
#. TRANS: translate text between <> only
-#: server/commands.c:93
+#: server/commands.c:100
msgid ""
"show\n"
"show <option-name>\n"
@@ -2339,11 +2345,11 @@ msgstr ""
"show <opcja>\n"
"show <prefix opcji>"
-#: server/commands.c:96
+#: server/commands.c:103
msgid "Show server options."
msgstr "Lista opcji serwera."
-#: server/commands.c:97
+#: server/commands.c:104
msgid ""
"With no arguments, shows all server options (or available options, when used "
"by clients). With an argument, show only the named option, or options with "
@@ -2353,38 +2359,39 @@ msgstr ""
"polecenie jest wydane przez klienta). PodajÄ…c argument ograniczamy listÄ™ "
"tylko do wybranej opcji lub zbioru opcji ze wskazanym przedrostkiem."
-#: server/commands.c:102
+#: server/commands.c:110
msgid "wall <message>"
msgstr "wall <wiadomość>"
-#: server/commands.c:103
+#: server/commands.c:111
msgid "Send message to all connections."
msgstr "Wysyła wiadomość do wszystkich połączeń."
-#: server/commands.c:104
+#: server/commands.c:112
msgid ""
"For each connected client, pops up a window showing the message entered."
msgstr ""
"Każdemu podłączonemu klientowi `wyrzuca' na ekran okienko z podanym "
"komunikatem."
-#: server/commands.c:108
+#: server/commands.c:117
msgid "vote yes|no [vote number]"
msgstr "vote yes|no [numer głosowania]"
-#: server/commands.c:109
+#: server/commands.c:118
msgid "Cast a vote."
msgstr "Oddaje głos."
-#: server/commands.c:111
+#: server/commands.c:120
#, 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."
+"A player with basic 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."
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 /"
@@ -2396,7 +2403,7 @@ msgstr ""
"głosowania, to głosowanie jest rozstrzygane pozytywnie o ile nikt nie "
"głosował przeciw."
-#: server/commands.c:121
+#: server/commands.c:131
msgid ""
"debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
"<player> | timing | info]"
@@ -2404,11 +2411,11 @@ msgstr ""
"debug [ player <gracz> | city <x> <y> | units <x> <y> | unit <id> ]tech "
"<gracz> | timing | info]"
-#: server/commands.c:123
+#: server/commands.c:133
msgid "Turn on or off AI debugging of given entity."
msgstr "Włącza lub wyłącza debugowanie AI w podanym obiekcie."
-#: server/commands.c:124
+#: server/commands.c:134
msgid ""
"Print AI debug information about given entity and turn continous debugging "
"output for this entity on or off."
@@ -2416,23 +2423,23 @@ msgstr ""
"Wypisuje informacje debugera AI o podanym obiekcie oraz włącza lub wyłącza "
"debugowanie AI w tym obiekcie."
-#: server/commands.c:128
+#: server/commands.c:139
msgid "set <option-name> <value>"
msgstr "set <opcja> <wartość>"
-#: server/commands.c:129
+#: server/commands.c:140
msgid "Set server option."
msgstr "Ustawia opcjÄ™ serwera."
-#: server/commands.c:132
+#: server/commands.c:144
msgid "team <player> [team]"
msgstr "team <gracz> [zespół]"
-#: server/commands.c:133
+#: server/commands.c:145
msgid "Change, add or remove a player's team affiliation."
msgstr "Dodaje lub usuwa gracza z zespołu."
-#: server/commands.c:134
+#: server/commands.c:146
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 "
@@ -2445,15 +2452,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:141
+#: server/commands.c:154
msgid "rulesetdir <directory>"
msgstr "rulesetdir <katalog>"
-#: server/commands.c:142
+#: server/commands.c:155
msgid "Choose new ruleset directory or modpack."
msgstr "Zmienia katalog z zasadami (modpack)."
-#: server/commands.c:143
+#: server/commands.c:156
msgid ""
"Choose new ruleset directory or modpack. Calling this\n"
" without any arguments will show you the currently selected ruleset."
@@ -2463,15 +2470,15 @@ msgstr ""
"zasadami."
#. TRANS: translate text between <> only
-#: server/commands.c:149
+#: server/commands.c:163
msgid "metainfo <meta-line>"
msgstr "metainfo <meta-linia>"
-#: server/commands.c:150
+#: server/commands.c:164
msgid "Set metaserver info line."
msgstr "Ustawia wiersz informacyjny metaserwera."
-#: server/commands.c:151
+#: server/commands.c:165
msgid ""
"Set user defined metaserver info line. If parameter is omitted,\n"
"previously set metamessage will be removed. For most of the time\n"
@@ -2480,19 +2487,19 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:158
+#: server/commands.c:173
msgid "metapatch <meta-line>"
msgstr "metapatch <meta-linia>"
-#: server/commands.c:159
+#: server/commands.c:174
msgid "Set metaserver patches line."
msgstr "Ustawia wiersz Å‚atek metaserwera."
-#: server/commands.c:165
+#: server/commands.c:181
msgid "Control metaserver connection."
msgstr "Kontroluje połączenia z metaserwerem."
-#: server/commands.c:166
+#: server/commands.c:182
msgid ""
"'metaconnection ?' reports on the status of the connection to metaserver.\n"
"'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2503,34 +2510,34 @@ msgstr ""
"'metaconnection up' lub 'metac u' ÅÄ…czy z metaserwerem."
#. TRANS: translate text between <> only
-#: server/commands.c:172
+#: server/commands.c:189
msgid "metaserver <address>"
msgstr "metaserver <adres>"
-#: server/commands.c:173
+#: server/commands.c:190
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:177
+#: server/commands.c:195
msgid "aitoggle <player-name>"
msgstr "aitoggle <gracz>"
-#: server/commands.c:178
+#: server/commands.c:196
msgid "Toggle AI status of player."
msgstr "Przełącza kontrolę nad graczem."
#
#. TRANS: translate text between [] and <> only
-#: server/commands.c:182
+#: server/commands.c:201
msgid "take [connection-name] <player-name>"
msgstr "take [nazwa-połączenia] <nazwa-gracza>"
-#: server/commands.c:183
+#: server/commands.c:202
msgid "Take over a player's place in the game."
msgstr "Przypisuje kontrolÄ™ nad graczem."
-#: server/commands.c:184
+#: server/commands.c:203
#, fuzzy
msgid ""
"Only the console and connections with cmdlevel 'hack' can force other "
@@ -2545,15 +2552,15 @@ msgstr ""
"konsoli, to używany jest globalny obserwator."
#. TRANS: translate text between [] only
-#: server/commands.c:192
+#: server/commands.c:212
msgid "observe [connection-name] [player-name]"
msgstr "observe [nazwa-połączenia] [nazwa-gracza]"
-#: server/commands.c:193
+#: server/commands.c:213
msgid "Observe a player or the whole game."
msgstr "Obserwuje gracza lub całą grę."
-#: server/commands.c:194
+#: server/commands.c:214
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 "
@@ -2567,15 +2574,15 @@ msgstr ""
"konsoli, to używany jest globalny obserwator."
#. TRANS: translate text between <> only
-#: server/commands.c:202
+#: server/commands.c:223
msgid "detach <connection-name>"
msgstr "detach <nazwa-połączenia>"
-#: server/commands.c:203
+#: server/commands.c:224
msgid "detach from a player."
msgstr "odłącza od gracza."
-#: server/commands.c:204
+#: server/commands.c:225
msgid ""
"Only the console and connections with cmdlevel 'hack' can force other "
"connections to detach from a player."
@@ -2584,21 +2591,21 @@ msgstr ""
"użytkownika od gracza."
#. TRANS: translate text between <> only
-#: server/commands.c:209
+#: server/commands.c:231
msgid "create <player-name>"
msgstr "create <gracz>"
-#: server/commands.c:210
+#: server/commands.c:232
msgid "Create an AI player with a given name."
msgstr "Tworzy gracza AI o danym imieniu."
#
-#: server/commands.c:211
+#: server/commands.c:233
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:215
+#: server/commands.c:238
msgid ""
"away\n"
"away"
@@ -2606,19 +2613,19 @@ msgstr ""
"away\n"
"away"
-#: server/commands.c:217
+#: server/commands.c:240
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:218
+#: server/commands.c:241
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:222
+#: server/commands.c:246
msgid ""
"novice\n"
"novice <player-name>"
@@ -2626,11 +2633,11 @@ msgstr ""
"novice\n"
"novice <gracz>"
-#: server/commands.c:224
+#: server/commands.c:248
msgid "Set one or all AI players to 'novice'."
msgstr "Ustawia jednego bądź wszystkich graczy AI na poziom 'novice'."
-#: server/commands.c:225
+#: server/commands.c:249
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 "
@@ -2641,7 +2648,7 @@ msgstr ""
"argument) ustawia poziom 'novice' tylko dla tego gracza."
#. TRANS: translate text between <> only
-#: server/commands.c:231
+#: server/commands.c:256
msgid ""
"easy\n"
"easy <player-name>"
@@ -2649,11 +2656,11 @@ msgstr ""
"easy\n"
"easy <gracz>"
-#: server/commands.c:233
+#: server/commands.c:258
msgid "Set one or all AI players to 'easy'."
msgstr "Ustawia jednego bądź wszystkich graczy AI na poziom 'easy'."
-#: server/commands.c:234
+#: server/commands.c:259
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 "
@@ -2664,7 +2671,7 @@ msgstr ""
"gracza (jako argument) ustawia poziom 'easy' tylko dla tego gracza."
#. TRANS: translate text between <> only
-#: server/commands.c:240
+#: server/commands.c:266
msgid ""
"normal\n"
"normal <player-name>"
@@ -2672,11 +2679,11 @@ msgstr ""
"normal\n"
"normal <gracz>"
-#: server/commands.c:242
+#: server/commands.c:268
msgid "Set one or all AI players to 'normal'."
msgstr "Ustawia jednego bądź wszystkich graczy AI na poziom 'normal'."
-#: server/commands.c:243
+#: server/commands.c:269
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 "
@@ -2687,7 +2694,7 @@ msgstr ""
"argument) ustawia poziom 'normal' tylko dla tego gracza."
#. TRANS: translate text between <> only
-#: server/commands.c:249
+#: server/commands.c:276
msgid ""
"hard\n"
"hard <player-name>"
@@ -2695,11 +2702,11 @@ msgstr ""
"hard\n"
"hard <gracz>"
-#: server/commands.c:251
+#: server/commands.c:278
msgid "Set one or all AI players to 'hard'."
msgstr "Ustawia jednego bądź wszystkich graczy AI na poziom 'hard'."
-#: server/commands.c:252
+#: server/commands.c:279
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 "
@@ -2710,7 +2717,7 @@ msgstr ""
"gracza(jako argument) ustawia poziom 'hard' tylko dla tego gracza."
#. TRANS: translate text between <> only
-#: server/commands.c:258
+#: server/commands.c:286
msgid ""
"experimental\n"
"experimental <player-name>"
@@ -2718,11 +2725,11 @@ msgstr ""
"experimental\n"
"experimental <gracz>"
-#: server/commands.c:260
+#: server/commands.c:288
msgid "Set one or all AI players to 'experimental'."
msgstr "Ustawia jednego bądź wszystkich graczy AI w tryb 'experimental'."
-#: server/commands.c:261
+#: server/commands.c:289
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 "
@@ -2736,7 +2743,7 @@ msgstr ""
"serwerów."
#. TRANS: translate text between <> only
-#: server/commands.c:269
+#: server/commands.c:298
msgid ""
"cmdlevel\n"
"cmdlevel <level>\n"
@@ -2750,17 +2757,20 @@ msgstr ""
"cmdlevel <poziom> first\n"
"cmdlevel <poziom> <gracz>"
-#: server/commands.c:274
+#: server/commands.c:303
msgid "Query or set command access level access."
msgstr "Pokazuje lub zmienia poziomy dostępu do operacji."
-#: server/commands.c:275
+#: server/commands.c:304
+#, fuzzy
msgid ""
"The command access level controls which server commands are available\n"
"to users via the client chatline. The available levels are:\n"
" none - no commands\n"
-" info - informational commands only\n"
+" info - informational or observer commands only\n"
+" basic - commands available to players in the game\n"
" ctrl - commands that affect the game and users\n"
+" admin - commands that affect server operation\n"
" hack - *all* commands - dangerous!\n"
"With no arguments, the current command access levels are reported.\n"
"With a single argument, the level is set for all existing connections,\n"
@@ -2792,20 +2802,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:296
+#: server/commands.c:328
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:301
+#: server/commands.c:334
msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
msgstr "timeoutincrease <liczba_tur> <inkrementator> <wartość> <mnożnik>"
-#: server/commands.c:302
+#: server/commands.c:335
msgid "See \"help timeoutincrease\"."
msgstr "Zobacz \"help timeoutincrease\"."
-#: server/commands.c:303
+#: server/commands.c:336
msgid ""
"Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
"<turn> and multiply <value> by <valuemult>. Use this command in concert "
@@ -2816,24 +2826,43 @@ msgstr ""
"razem z opcją \"timeout\". Wartości domyślne to 0 0 0 1"
#. TRANS: translate text between <> only
-#: server/commands.c:309
+#: server/commands.c:343
+msgid ""
+"cancelvote\n"
+"cancelvote <vote number>\n"
+"cancelvote all\n"
+msgstr ""
+
+#: server/commands.c:346
+msgid "Cancel a running vote.\n"
+msgstr ""
+
+#: server/commands.c:347
+msgid ""
+"With no arguments this command removes your own vote. If you have an admin "
+"access level, you can cancel any vote by vote number, or all votes with the "
+"'all' argument."
+msgstr ""
+
+#. TRANS: translate text between <> only
+#: server/commands.c:354
msgid "endgame"
msgstr "endgame"
-#: server/commands.c:310
+#: server/commands.c:355
msgid "End the game immediately in a draw."
msgstr "Kończy grę remisem."
#. TRANS: translate text between <> only
-#: server/commands.c:314
+#: server/commands.c:360
msgid "surrender"
msgstr "surrender"
-#: server/commands.c:315
+#: server/commands.c:361
msgid "Concede the game."
msgstr "Poddaje grÄ™."
-#: server/commands.c:316
+#: server/commands.c:362
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."
@@ -2842,15 +2871,15 @@ msgstr ""
"gracze oprócz jednego podadzą się, to zostanie zakończona."
#. TRANS: translate text between <> only
-#: server/commands.c:322
+#: server/commands.c:369
msgid "remove <player-name>"
msgstr "remove <gracz>"
-#: server/commands.c:323
+#: server/commands.c:370
msgid "Fully remove player from game."
msgstr "Całkowicie usuwa gracza z gry."
-#: server/commands.c:324
+#: server/commands.c:371
msgid ""
"This *completely* removes a player from the game, including all cities and "
"units etc. Use with care!"
@@ -2859,7 +2888,7 @@ msgstr ""
"rozwagÄ…!"
#. TRANS: translate text between <> only
-#: server/commands.c:329
+#: server/commands.c:377
msgid ""
"save\n"
"save <file-name>"
@@ -2867,11 +2896,11 @@ msgstr ""
"save\n"
"save <nazwa-pliku>"
-#: server/commands.c:331
+#: server/commands.c:379
msgid "Save game to file."
msgstr "Zapisuje stan gry do pliku."
-#: server/commands.c:332
+#: server/commands.c:380
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"
@@ -2887,7 +2916,7 @@ msgstr ""
"oraz użyć komendy 'start' po ponownym przyłączeniu się graczy."
#. TRANS: translate text between <> only
-#: server/commands.c:341
+#: server/commands.c:390
msgid ""
"load\n"
"load <file-name>"
@@ -2895,11 +2924,11 @@ msgstr ""
"load\n"
"load <nazwa-pliku>"
-#: server/commands.c:343
+#: server/commands.c:392
msgid "Load game from file."
msgstr "Wczytuje stan gry z pliku."
-#: server/commands.c:344
+#: server/commands.c:393
msgid ""
"Load a game from <file-name>. Any current data including players, rulesets "
"and server options are lost.\n"
@@ -2908,122 +2937,122 @@ msgstr ""
"graczy, zasad i opcji serwera sÄ… resetowane.\n"
#. TRANS: translate text between <> only
-#: server/commands.c:349
+#: server/commands.c:399
msgid "read <file-name>"
msgstr "read <plik>"
-#: server/commands.c:350
+#: server/commands.c:400
msgid "Process server commands from file."
msgstr "Wykonuje komendy serwera zapisane w podanym pliku."
#. TRANS: translate text between <> only
-#: server/commands.c:354
+#: server/commands.c:405
msgid "write <file-name>"
msgstr "write <plik>"
-#: server/commands.c:355
+#: server/commands.c:406
msgid "Write current settings as server commands to file."
msgstr "Zapisuje aktualne ustawienia jako komendy serwera do pliku."
-#: server/commands.c:359
+#: server/commands.c:411
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:363
+#: server/commands.c:416
msgid "Simply returns the id of the server."
msgstr "Zwraca id serwera."
-#: server/connecthand.c:85
+#: server/connecthand.c:109
#, c-format
msgid "Welcome to the %s Server running at %s port %d."
msgstr "Witamy na serwerze %s uruchomionym na maszynie %s port %d."
-#: server/connecthand.c:89
+#: server/connecthand.c:113
#, c-format
msgid "Welcome to the %s Server at port %d."
msgstr "Witamy na serwerze %s, na porcie %d."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:97
+#: server/connecthand.c:121
#, fuzzy, c-format
msgid "(%d) %s: connected [%s]"
msgstr "(%d) Połączył się %s z %s."
-#: server/connecthand.c:104
+#: server/connecthand.c:128
#, c-format
msgid "Server: %s has connected from %s."
msgstr "Serwer: Połączył się %s z %s."
#
-#: server/connecthand.c:145
+#: server/connecthand.c:175
msgid "Couldn't attach your connection to new player."
msgstr "Nie udało się przypisać Ci nowego gracza."
-#: server/connecthand.c:165
+#: server/connecthand.c:199
#, c-format
msgid "You are logged in as '%s' connected to no player."
msgstr ""
"Zostałeś zalogowany jako '%s'; nie jesteś przyłączony do żadnego gracza."
-#: server/connecthand.c:169
+#: server/connecthand.c:203
#, c-format
msgid "You are logged in as '%s' connected to an anonymous player."
msgstr "Zostałeś zalogowany jako '%s' i przyłączony do gracza anonimowego."
-#: server/connecthand.c:174
+#: server/connecthand.c:208
#, c-format
msgid "You are logged in as '%s' connected to %s."
msgstr "Zostałeś zalogowany jako '%s' i przyłączony do gracza %s."
-#: server/connecthand.c:187
+#: server/connecthand.c:221
#, c-format
msgid "Turn-blocking game play: waiting on %s to finish turn..."
msgstr "Blokada końca tury: Oczekiwanie na zakończenie tury przez %s..."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:240
+#: server/connecthand.c:274
#, fuzzy, c-format
msgid "(%d) %s: connection request [%s]"
msgstr "(%d) %s z %s domaga się połączenia"
-#: server/connecthand.c:266
+#: server/connecthand.c:300
#, fuzzy
msgid "The client is missing a capability that this server needs."
msgstr "Klientowi brakuje cech wymaganych przez serwer."
-#: server/connecthand.c:268 server/connecthand.c:279
+#: server/connecthand.c:302 server/connecthand.c:313
#, fuzzy, c-format
msgid "(%d) %s rejected: mismatched capabilities!"
msgstr "(%d) %s został odrzucony: Niezgodność protokołu."
-#: server/connecthand.c:277
+#: server/connecthand.c:311
#, fuzzy
msgid "This server is missing a capability that the client needs."
msgstr "Serwerowi brakuje cech wymaganych przez klienta."
-#: server/connecthand.c:290
+#: server/connecthand.c:324
#, fuzzy
msgid "The username is invalid!"
msgstr "Nieprawidłowa nazwa użytkownika"
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:292
+#: server/connecthand.c:326
#, fuzzy, c-format
msgid "(%d) %s rejected: invalid username [%s]"
msgstr "(%d) %s został odrzucony: Nieprawidłowa nazwa [%s]."
-#: server/connecthand.c:303
+#: server/connecthand.c:337
#, fuzzy
msgid "Your username is already connected!"
msgstr "jest już połączony."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:305
+#: server/connecthand.c:339
#, fuzzy, c-format
msgid "(%d) %s rejected: duplicate username [%s]"
msgstr "(%d) %s został odrzucony: Zduplikowany login [%s]."
-#: server/connecthand.c:335 server/connecthand.c:344
+#: server/connecthand.c:369 server/connecthand.c:378
#, c-format
msgid "Lost connection: %s."
msgstr "Utracono połączenie: %s."
@@ -3040,37 +3069,37 @@ msgstr "Ok. Ustawiony styl standardowy."
msgid "For introductory help, type 'help'."
msgstr "Aby uzyskać pomoc wpisz 'help'."
-#: server/diplhand.c:164
+#: server/diplhand.c:167
#, c-format
msgid "The %s can't accept %s."
msgstr "%s nie potrafią nauczyć się %s."
-#: server/diplhand.c:176
+#: server/diplhand.c:179
#, c-format
msgid "You don't have tech %s, you can't accept treaty."
msgstr "Nie masz technologii %s, nie możesz zaakceptować traktatu."
-#: server/diplhand.c:185
+#: server/diplhand.c:188
msgid "City you are trying to give no longer exists, you can't accept treaty."
msgstr ""
"Miasto które próbujesz przekazać już nie istnieje, nie możesz zaakceptować "
"traktatu."
-#: server/diplhand.c:191
+#: server/diplhand.c:194
#, c-format
msgid "You are not owner of %s, you can't accept treaty."
msgstr "Nie kontrolujesz miasta %s, nie możesz zaakceptować traktatu."
-#: server/diplhand.c:197 server/diplhand.c:301
+#: server/diplhand.c:200 server/diplhand.c:304
#, c-format
msgid "Your capital (%s) is requested, you can't accept treaty."
msgstr "Nie możesz przekazać stolicy (%s), nie możesz zaakceptować traktatu."
-#: server/diplhand.c:224
+#: server/diplhand.c:227
msgid "You don't have enough gold, you can't accept treaty."
msgstr "Nie masz wystarczająco złota, nie możesz zaakceptować traktatu."
-#: server/diplhand.c:256 server/diplhand.c:261
+#: server/diplhand.c:259 server/diplhand.c:264
#, c-format
msgid "A treaty containing %d clause was agreed upon."
msgid_plural "A treaty containing %d clauses was agreed upon."
@@ -3078,75 +3107,75 @@ msgstr[0] "Został uchwalony traktat zawierający %d klauzulę."
msgstr[1] "Został uchwalony traktat zawierający %d klauzule."
msgstr[2] "Został uchwalony traktat zawierający %d klauzul."
-#: server/diplhand.c:277 server/diplhand.c:281
+#: server/diplhand.c:280 server/diplhand.c:284
#, fuzzy, c-format
msgid "One of the cities the %s are giving away is destroyed! Treaty canceled!"
msgstr "%s przekazuje miasto, które zostało zniszczone! Traktat anulowany!"
-#: server/diplhand.c:288 server/diplhand.c:293
+#: server/diplhand.c:291 server/diplhand.c:296
#, c-format
msgid "The %s no longer control %s! Treaty canceled!"
msgstr "%s nie kontroluje już miasta %s! Traktat anulowany!"
-#: server/diplhand.c:331 server/diplhand.c:335
+#: server/diplhand.c:334 server/diplhand.c:338
#, c-format
msgid "The %s don't have the promised amount of gold! Treaty canceled!"
msgstr "%s nie mają zadeklarowanej ilości złota! Traktat anulowany!"
-#: server/diplhand.c:364
+#: server/diplhand.c:367
#, c-format
msgid "You gave an embassy to %s."
msgstr "Pozwoliłeś na to aby %s założył u ciebie ambasadę."
-#: server/diplhand.c:367
+#: server/diplhand.c:370
#, c-format
msgid "%s allowed you to create an embassy!"
msgstr "%s pozwolił(a) ci założyć ambasadę u siebie!"
-#: server/diplhand.c:383
+#: server/diplhand.c:386
#, c-format
msgid "You are taught the knowledge of %s."
msgstr "Zostałeś nauczony technologii: %s."
-#: server/diplhand.c:387
+#: server/diplhand.c:390
#, c-format
msgid "The %s have acquired %s from the %s."
msgstr "%s otrzymali %s od %s."
-#: server/diplhand.c:402
+#: server/diplhand.c:405
#, c-format
msgid "You get %d gold."
msgstr "Dostałeś %d złota."
#. TRANS: ... Polish worldmap.
-#: server/diplhand.c:410
+#: server/diplhand.c:413
#, fuzzy, c-format
msgid "You receive the %s worldmap."
msgstr "Otrzymałeś mapę świata od %s."
#. TRANS: ... Polish seamap.
-#: server/diplhand.c:419
+#: server/diplhand.c:422
#, fuzzy, c-format
msgid "You receive the %s seamap."
msgstr "Otrzymałeś mapę morza od %s."
-#: server/diplhand.c:436
+#: server/diplhand.c:439
#, c-format
msgid "You receive city of %s from %s."
msgstr "Otrzymałeś miasto %s od %s."
-#: server/diplhand.c:441
+#: server/diplhand.c:444
#, c-format
msgid "You give city of %s to %s."
msgstr "%2$s otrzymał(a) od ciebie miasto %1$s."
-#: server/diplhand.c:454 server/diplhand.c:457
+#: server/diplhand.c:457 server/diplhand.c:460
#, c-format
msgid "You agree on a cease-fire with %s."
msgstr "Zgodziłeś się na zawieszenie broni z %s."
#. TRANS: ... the Poles ... Polish territory.
-#: server/diplhand.c:476 server/diplhand.c:488
+#: server/diplhand.c:479 server/diplhand.c:491
#, fuzzy, c-format
msgid ""
"You agree on an armistice with the %s. In %d turn, it will become a peace "
@@ -3164,32 +3193,32 @@ msgstr[2] ""
"Zgodziłeś się na rozejm z %s. W ciągu %d tur zostanie on przekształcony na "
"pokój. Usuń swoje jednostki z terenów %s."
-#: server/diplhand.c:512 server/diplhand.c:515
+#: server/diplhand.c:515 server/diplhand.c:518
#, c-format
msgid "You agree on an alliance with %s."
msgstr "Zgodziłeś się na sojusz z %s."
-#: server/diplhand.c:524
+#: server/diplhand.c:527
#, c-format
msgid "You give shared vision to %s."
msgstr "%s otrzymał(a) od ciebie widok dzielony."
-#: server/diplhand.c:527
+#: server/diplhand.c:530
#, c-format
msgid "%s gives you shared vision."
msgstr "%s przekazał(a) ci widok dzielony."
-#: server/diplhand.c:663
+#: server/diplhand.c:666
#, c-format
msgid "%s canceled the meeting!"
msgstr "%s zerwał(a) spotkanie!"
-#: server/diplhand.c:670
+#: server/diplhand.c:673
#, c-format
msgid "Meeting with %s canceled."
msgstr "Spotkanie z %s zerwane."
-#: server/diplhand.c:712
+#: server/diplhand.c:715
msgid "Your diplomatic envoy was decapitated!"
msgstr "Twoi posłowie zostali zabici!"
@@ -3375,80 +3404,80 @@ msgid "The %s destroyed the %s in %s."
msgstr "%s zniszczyli %s w mieście %s."
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1091
+#: server/diplomats.c:1097
#, fuzzy, c-format
msgid "An enemy %s has been eliminated by your %s."
msgstr "Wrogi %s został wyeliminowany w mieście %s."
#. TRANS: <unit> ... <city> ... <diplomat>
-#: server/diplomats.c:1098
+#: server/diplomats.c:1104
#, c-format
msgid "Your %s has been eliminated defending %s against a %s."
msgstr "Twój %s został wyeliminowany broniąc miasta %s przed %s."
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1106
+#: server/diplomats.c:1112
#, fuzzy, c-format
msgid "Your %s has been eliminated defending against a %s."
msgstr "Twój %s został wyeliminowany broniąc miasta przed %s."
-#: server/diplomats.c:1119
+#: server/diplomats.c:1125
#, c-format
msgid "Your %s was eliminated by a defending %s."
msgstr "Twój %s wyeliminowany przez broniącego się %s."
-#: server/diplomats.c:1127
+#: server/diplomats.c:1133
#, c-format
msgid "Eliminated %s %s while infiltrating %s."
msgstr "Wyeliminowano %s %s w trakcie infiltracji m. %s."
-#: server/diplomats.c:1134
+#: server/diplomats.c:1140
#, c-format
msgid "Eliminated %s %s while infiltrating our troops."
msgstr "Wyeliminowano %s %s w trakcie infiltracji naszych oddziałów."
-#: server/diplomats.c:1185
+#: server/diplomats.c:1191
#, fuzzy, c-format
msgid ""
"Your %s has successfully completed the mission and returned unharmed to %s."
msgstr "Twój %s zakończył misję i wrócił nietknięty do miasta %s."
-#: server/diplomats.c:1204
+#: server/diplomats.c:1210
#, fuzzy, c-format
msgid "Your %s was captured after completing the mission in %s."
msgstr "Twój %s został złapany po wykonaniu misji w mieście %s."
-#: server/diplomats.c:1210
+#: server/diplomats.c:1216
#, fuzzy, c-format
msgid "Your %s was captured after completing the mission."
msgstr "Twój %s został złapany po spełnieniu misji."
-#: server/diplomats.c:1242
+#: server/diplomats.c:1248
#, fuzzy, c-format
msgid "You have caused an incident while bribing the %s %s."
msgstr "Spowodowałeś incydent przekupując %s %s."
-#: server/diplomats.c:1247
+#: server/diplomats.c:1253
#, c-format
msgid "%s has caused an incident while bribing your %s."
msgstr "%s spowodował incydent przekupując twoją jednostkę %s."
-#: server/diplomats.c:1254
+#: server/diplomats.c:1260
#, fuzzy, c-format
msgid "You have caused an incident while attempting to steal tech from %s."
msgstr "Kradnąc technologię z m. %s wywołałeś skandal dyplomatyczny."
-#: server/diplomats.c:1258
+#: server/diplomats.c:1264
#, fuzzy, c-format
msgid "%s has caused an incident while attempting to steal tech from you."
msgstr "%s wywołał skandal dyplomatyczny wykradając ci technologię."
-#: server/diplomats.c:1264
+#: server/diplomats.c:1270
#, c-format
msgid "You have caused an incident while inciting a revolt in %s."
msgstr "Wszczynając bunt w m. %s wywołałeś skandal dyplomatyczny."
-#: server/diplomats.c:1268
+#: server/diplomats.c:1274
#, c-format
msgid "%s have caused an incident while inciting a revolt in %s."
msgstr "%s wywołali skandal dyplomatyczny wszczynając bunt w m. %s."
@@ -3563,12 +3592,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:1418
+#: server/maphand.c:1425
#, c-format
msgid "Moved your %s due to changing terrain."
msgstr "Przesunięto jednostkę %s z powodu zmiany terenu."
-#: server/maphand.c:1436
+#: server/maphand.c:1443
#, c-format
msgid "Disbanded your %s due to changing terrain."
msgstr "Rozproszono jednostkÄ™ %s z powodu zmiany terenu."
@@ -3577,7 +3606,7 @@ msgstr "Rozproszono jednostkÄ™ %s z powodu zmiany terenu."
msgid "Not reporting to the metaserver in this game."
msgstr "Nie meldujÄ™ siÄ™ na metaserwerze w tej grze."
-#: server/meta.c:430
+#: server/meta.c:432
#, c-format
msgid "Metaserver: bad address: [%s:%d]."
msgstr "Metaserwer: zły adres: [%s:%d]."
@@ -3706,26 +3735,26 @@ msgstr ""
"Gracz z twojego zespołu %s wypowiedział wojnę %s. Jesteś zmuszony zerwać "
"sojusz z %s."
-#: server/plrhand.c:1103
+#: server/plrhand.c:1115
#, c-format
msgid "Removing player %s."
msgstr "Usuwam gracza %s."
-#: server/plrhand.c:1105
+#: server/plrhand.c:1117
msgid "You've been removed from the game!"
msgstr "Zostałeś usunięty z gry!"
-#: server/plrhand.c:1108
+#: server/plrhand.c:1120
#, c-format
msgid "%s has been removed from the game."
msgstr "%s został usunięty z gry."
-#: server/plrhand.c:1153 server/plrhand.c:1158
+#: server/plrhand.c:1167 server/plrhand.c:1172
#, c-format
msgid "You have made contact with the %s, ruled by %s."
msgstr "%s spotkani! RzÄ…dzi nimi %s."
-#: server/plrhand.c:1178
+#: server/plrhand.c:1192
#, fuzzy, c-format
msgid ""
"%s and %s meet and go to instant war. You cancel your alliance with both."
@@ -3733,29 +3762,29 @@ msgstr ""
"%s zaatakował twojego sojusznika %s! Warunki sojuszu zobowiązują cię do "
"natychmiastowej odpowiedzi."
-#: server/plrhand.c:1656
+#: server/plrhand.c:1670
#, 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:1663
+#: server/plrhand.c:1677
#, 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:1686
+#: server/plrhand.c:1700
#, fuzzy, 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:1707
+#: server/plrhand.c:1721
#, c-format
msgid "%s declares allegiance to %s."
msgstr "%s ogłasza sojusz z %s."
-#: server/plrhand.c:1722
+#: server/plrhand.c:1736
#, fuzzy, c-format
msgid ""
"Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3949,69 +3978,69 @@ msgstr "(w trakcie budowy: %s w mieście %s (%s))\n"
msgid "Wonders of the World"
msgstr "Cuda Åšwiata"
-#: server/report.c:547
+#: server/report.c:552
msgid " sq. mi."
msgstr " mil kw."
-#: server/report.c:557
+#: server/report.c:562
msgid " M tons"
msgstr " mln ton"
-#: server/report.c:562
+#: server/report.c:567
msgid " M goods"
msgstr " M dóbr"
-#: server/report.c:567
+#: server/report.c:572
msgid " bulbs"
msgstr " żarówek"
-#: server/report.c:572
+#: server/report.c:577
msgid " month"
msgid_plural " months"
msgstr[0] " miesiÄ…c"
msgstr[1] " miesiÄ…ce"
msgstr[2] " miesięcy"
-#: server/report.c:577
+#: server/report.c:582
msgid " ton"
msgid_plural " tons"
msgstr[0] " tona"
msgstr[1] " tony"
msgstr[2] " ton"
-#: server/report.c:591
+#: server/report.c:596
msgid "st"
msgstr "wszy"
-#: server/report.c:593
+#: server/report.c:598
msgid "nd"
msgstr "gi"
-#: server/report.c:595
+#: server/report.c:600
msgid "rd"
msgstr "ci"
-#: server/report.c:597
+#: server/report.c:602
msgid "th"
msgstr "ty"
-#: server/report.c:700
+#: server/report.c:705
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:743 server/report.c:768
+#: server/report.c:748 server/report.c:773
msgid "Demographics Report:"
msgstr "Raport Demograficzny:"
-#: server/report.c:744
+#: server/report.c:749
msgid "Sorry, the Demographics report is unavailable."
msgstr "Sorry, Raport Demograficzny nie jest dostępny."
#. TRANS: <nation adjective> <government name> (<year>).
#. * E.g. "Polish Despotism (200 AD)".
-#: server/report.c:750
+#: server/report.c:755
#, fuzzy, c-format
msgid "%s %s (%s)"
msgstr "%s w %s (%s)\n"
@@ -4022,11 +4051,11 @@ msgstr "%s w %s (%s)\n"
msgid "Could not find a readable \"%s.%s\" ruleset file."
msgstr "Nie mogłem znaleźć czytelnego pliku z zasadami \"%s.%s\"."
-#: server/ruleset.c:2356
+#: server/ruleset.c:2366
msgid "No barbarian nation in rulesets, at least one required!"
msgstr ""
-#: server/ruleset.c:3166
+#: server/ruleset.c:3178
msgid "Loading rulesets"
msgstr "WczytujÄ™ zasady"
@@ -4042,21 +4071,21 @@ msgstr ""
"zbyt stara wersja pliku lub uszkodzenie. Kontynuuj na własną "
"odpowiedzialność."
-#: server/savegame.c:3588
+#: server/savegame.c:3587
#, fuzzy
msgid "Saved game is too old, at least version 1.9.0 required."
msgstr ""
"Plik stanu gry jest zbyt stary, wymagana jest wersja co najmniej 1.9.0."
#. TRANS: Fatal error message.
-#: server/savegame.c:3815
+#: server/savegame.c:3817
#, fuzzy
msgid ""
"Saved game uses the \"classic\" terrain ruleset, and is no longer supported."
msgstr ""
"Plik stanu gry używa klasycznych zasad terenu, które nie są już wspierane."
-#: server/savegame.c:3824
+#: server/savegame.c:3826
#, c-format
msgid ""
"Warning: Different rulesetdirs ('%s' and '%s') are no longer supported. "
@@ -4066,7 +4095,7 @@ msgstr ""
"Używam: '%s'"
#. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4051
+#: server/savegame.c:4055
#, c-format
msgid "%s had invalid nation; changing to %s."
msgstr ""
@@ -4099,7 +4128,7 @@ msgstr "Wewnętrzne"
msgid "Networking"
msgstr "Sieciowe"
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:734
#: client/gui-win32/dialogs.c:532
msgid "All"
msgstr "Dowolny"
@@ -5318,11 +5347,11 @@ msgstr ""
"\"civscore.log\". Po zakończeniu gry te statystyki mogą być użyte do "
"stworzenia wykresów."
-#: server/sernet.c:150
+#: server/sernet.c:151
msgid "Server cannot read standard input. Ignoring input."
msgstr "Serwer nie może czytać ze standardowego wejścia. Wejście ignorowane."
-#: server/sernet.c:929
+#: server/sernet.c:933
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr "Serwer: zły adres: [%s:%d]."
@@ -5397,36 +5426,36 @@ msgstr "Twój statek ma już max. liczbę paneli fotoogniw!"
msgid "Without guidance from the capital, the %s spaceship is lost!"
msgstr "Naród %s stracił statek kosmiczny, po utracie stolicy!"
-#: server/srv_main.c:240
+#: server/srv_main.c:242
msgid "Game ended in a draw as end year exceeded"
msgstr "Gra zakończyła się remisem, minął czas gry"
-#: server/srv_main.c:274
+#: server/srv_main.c:276
#, c-format
msgid "The %s spaceship has arrived at Alpha Centauri."
msgstr "%s statek kosmiczny dotarł na Alpha Centauri."
-#: server/srv_main.c:287 server/srv_main.c:322
+#: server/srv_main.c:289 server/srv_main.c:324
#, c-format
msgid "Team victory to %s"
msgstr "Zwycięstwo zespołowe dla %s"
-#: server/srv_main.c:297 server/srv_main.c:338
+#: server/srv_main.c:299 server/srv_main.c:340
#, c-format
msgid "Game ended in victory for %s"
msgstr "Grę wygrał(a) %s"
-#: server/srv_main.c:345
+#: server/srv_main.c:347
msgid "Game ended in a draw"
msgstr "Gra zakończyła się remisem"
-#: server/srv_main.c:461 server/srv_main.c:472
+#: server/srv_main.c:465 server/srv_main.c:476
#, fuzzy, c-format
msgid "Your %s was disbanded in accordance with your peace treaty with the %s."
msgstr ""
"Twoja jednostka %s została rozwiązana zgodnie z układem pokojowym z %s."
-#: server/srv_main.c:512 server/srv_main.c:516
+#: server/srv_main.c:516 server/srv_main.c:520
#, c-format
msgid ""
"Concerned citizens point out that the cease-fire with %s will run out soon."
@@ -5434,12 +5463,12 @@ msgstr ""
"Zaniepokojeni obywatele przypominają, ze zawieszenie broni z %s wkrótce się "
"skończy."
-#: server/srv_main.c:521 server/srv_main.c:525
+#: server/srv_main.c:525 server/srv_main.c:529
#, c-format
msgid "The cease-fire with %s has run out. You are now at war with the %s."
msgstr "Rozejm z %s się skończył. Możesz teraz atakować %s."
-#: server/srv_main.c:542
+#: server/srv_main.c:546
#, fuzzy, c-format
msgid ""
"Ceasefire between %s and %s has run out. They are at war. You cancel your "
@@ -5448,350 +5477,337 @@ msgstr ""
"Gracz z twojego zespołu %s wypowiedział wojnę %s. Jesteś zmuszony zerwać "
"sojusz z %s."
-#: server/srv_main.c:961
+#: server/srv_main.c:997
#, c-format
msgid "Failed saving game as %s"
msgstr "Nie mogę zachować gry jako %s"
-#: server/srv_main.c:963
+#: server/srv_main.c:999
#, c-format
msgid "Game saved as %s"
msgstr "Gra zachowana jako %s"
-#: server/srv_main.c:994
+#: server/srv_main.c:1030
msgid "The game is already running."
msgstr "Gra jest już uruchomiona."
-#: server/srv_main.c:1002
+#: server/srv_main.c:1038
#, 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:1009
+#: server/srv_main.c:1045
msgid "Starting game."
msgstr "StartujÄ™ grÄ™."
-#: server/srv_main.c:1071
+#: server/srv_main.c:1112
#, c-format
msgid "request for unknown report (type %d)"
msgstr "Żądanie nieprawidłowego raportu (typ %d)"
-#: server/srv_main.c:1136
+#: server/srv_main.c:1177
#, c-format
msgid "Warning: rejecting old client %s"
msgstr "Ostrzeżenie: Odrzucam przestarzałego klienta %s"
-#: server/srv_main.c:1238
+#: server/srv_main.c:1279
#, 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:1338
+#: server/srv_main.c:1381
msgid "Please choose a non-blank name."
msgstr "Proszę wybrać niepustą nazwę."
-#: server/srv_main.c:1354
+#: server/srv_main.c:1397
msgid "That nation is already in use."
msgstr "Naród jest już używany."
-#: server/srv_main.c:1370
+#: server/srv_main.c:1413
#, 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:1391
+#: server/srv_main.c:1434
msgid "Please choose a name containing only ASCII characters."
msgstr "Proszę wybrać nazwę zawierającą jedynie znaki ASCII."
-#: server/srv_main.c:1490
+#: server/srv_main.c:1533
#, 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:1496
+#: server/srv_main.c:1539
#, c-format
msgid "%s nation is already in use."
msgstr "Naród %s jest już używany."
-#: server/srv_main.c:1514
+#: server/srv_main.c:1557
#, c-format
msgid "%s is the %s ruler %s."
msgstr "%s to %s przywódca %s."
-#: server/srv_main.c:1570
+#: server/srv_main.c:1613
#, 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:1614 server/srv_main.c:1618
+#: server/srv_main.c:1657 server/srv_main.c:1661
#, 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:1760
+#: server/srv_main.c:1803
#, c-format
msgid "Player %d"
msgstr "Gracz %d"
-#: server/srv_main.c:1771 server/srv_main.c:1777
+#: server/srv_main.c:1814 server/srv_main.c:1820
#, c-format
msgid "%s rules the %s."
msgstr "%s rzÄ…dzi %s."
-#: server/srv_main.c:1942
+#: server/srv_main.c:1985
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
msgstr ""
-#: server/srv_main.c:1993
+#: server/srv_main.c:2037
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr "Wysyłam informację do metaserwera [%s]"
-#: server/srv_main.c:2024
+#: server/srv_main.c:2069
msgid "The game is over..."
msgstr "Gra skończona..."
-#: server/srv_main.c:2237
+#: server/srv_main.c:2286
msgid "Now accepting new client connections."
msgstr "Teraz oczekuję nowych połączeń."
-#: server/stdinhand.c:246
-#, c-format
-msgid "Vote \"%s\" is passed %d to %d with %d abstentions."
-msgstr ""
-"Polecenie \"%s\" zostało przyjęte stosunkiem głosów %d:%d. Wstrzymało się od "
-"głosu: %d."
-
-#: server/stdinhand.c:253
-#, c-format
-msgid "Vote \"%s\" failed with %d against, %d for and %d abstentions."
-msgstr ""
-"Polecenie \"%s\" zostało odrzucone. %d przeciw, %d za, %d wstrzymało się."
-
#. TRANS: ambiguous command
-#: server/stdinhand.c:365
+#: server/stdinhand.c:284
msgid "(ambiguous)"
msgstr "(dwuznaczne)"
#. TRANS: unrecognized command
#. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:416
+#: server/stdinhand.c:287 client/citydlg_common.c:419
#: 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 "(nieznane)"
-#: server/stdinhand.c:458
+#: server/stdinhand.c:377
msgid "Name is empty, so cannot be a player."
msgstr "Nazwa pusta, to nie może być gracz."
-#: server/stdinhand.c:462
+#: server/stdinhand.c:381
msgid "Name is too long, so cannot be a player."
msgstr "Nazwa za długa, to nie może być gracz."
-#: server/stdinhand.c:466
+#: server/stdinhand.c:385
#, c-format
msgid "Player name prefix '%s' is ambiguous."
msgstr "Prefix nazwy gracza '%s' dwuznaczny."
-#: server/stdinhand.c:470
+#: server/stdinhand.c:389
#, c-format
msgid "No player by the name of '%s'."
msgstr "Nie ma gracza o imieniu '%s'."
-#: server/stdinhand.c:474 server/stdinhand.c:509
+#: server/stdinhand.c:393 server/stdinhand.c:428
#, c-format
msgid "Unexpected match_result %d (%s) for '%s'."
msgstr "Nieoczekiwana wartość match_result %d (%s) dla '%s'."
-#: server/stdinhand.c:493
+#: server/stdinhand.c:412
msgid "Name is empty, so cannot be a connection."
msgstr "Nazwa pusta, nieprawidłowa dla połączenia."
-#: server/stdinhand.c:497
+#: server/stdinhand.c:416
msgid "Name is too long, so cannot be a connection."
msgstr "Nazwa za długa jak na nazwę połączenia."
-#: server/stdinhand.c:501
+#: server/stdinhand.c:420
#, c-format
msgid "Connection name prefix '%s' is ambiguous."
msgstr "Prefix nazwy gracza '%s' jest dwuznaczny."
-#: server/stdinhand.c:505
+#: server/stdinhand.c:424
#, c-format
msgid "No connection by the name of '%s'."
msgstr "Nie ma połączenia o nazwie '%s'."
-#: server/stdinhand.c:525
+#: server/stdinhand.c:444
#, c-format
msgid "Open metaserver connection to [%s]."
msgstr "Otwieram połączenie z metaserwerem [%s]."
-#: server/stdinhand.c:538
+#: server/stdinhand.c:457
#, c-format
msgid "Close metaserver connection to [%s]."
msgstr "Zamykam połączenie z metaserwerem [%s]."
-#: server/stdinhand.c:553
+#: server/stdinhand.c:472
msgid "Metaserver connection is open."
msgstr "Połączenie z metaserwerem otwarte."
#
-#: server/stdinhand.c:556
+#: server/stdinhand.c:475
msgid "Metaserver connection is closed."
msgstr "Połączenie z metaserwerem zamknięte."
-#: server/stdinhand.c:566
+#: server/stdinhand.c:485
msgid "Metaserver connection is already open."
msgstr "Połączenie z metaserwerem jest już otwarte."
-#: server/stdinhand.c:577
+#: server/stdinhand.c:496
msgid "Metaserver connection is already closed."
msgstr "Połączenie z metaserwerem jest już zamknięte."
-#: server/stdinhand.c:582
+#: server/stdinhand.c:501
msgid "Argument must be 'u', 'up', 'd', 'down', or '?'."
msgstr "Argument musi mieć wartość 'u', 'up', 'd', 'down' lub '?'."
-#: server/stdinhand.c:603
+#: server/stdinhand.c:522
#, c-format
msgid "Metaserver patches string set to '%s'."
msgstr "Ustawiono liniÄ™ Å‚atek dla metaserwera na '%s'."
-#: server/stdinhand.c:606
+#: server/stdinhand.c:525
#, c-format
msgid "Metaserver patches string set to '%s', not reporting to metaserver."
msgstr ""
"Linia Å‚atek metaserwera ustawiona na '%s', nie reportujÄ™ na metaserwer."
-#: server/stdinhand.c:627
+#: server/stdinhand.c:546
#, c-format
msgid "Metaserver message string set to '%s'."
msgstr "Ustawiono linię wiadomości dla metaserwera na '%s'."
-#: server/stdinhand.c:630
+#: server/stdinhand.c:549
#, c-format
msgid "Metaserver message string set to '%s', not reporting to metaserver."
msgstr ""
"Linia wiadomości metaserwera ustawiona na '%s', nie reportuję na metaserwer."
-#: server/stdinhand.c:650
+#: server/stdinhand.c:569
#, c-format
msgid "Metaserver is now [%s]."
msgstr "Metaserwer jest teraz [%s]."
-#: server/stdinhand.c:660
+#: server/stdinhand.c:579
#, c-format
msgid "Server id: %s"
msgstr "Id serwera: %s"
-#: server/stdinhand.c:757
+#: server/stdinhand.c:676
msgid "You cannot save games manually on this server."
msgstr "Na tym serwerze nie wolno zapisywać gier."
-#: server/stdinhand.c:774
+#: server/stdinhand.c:693
msgid "Cannot toggle a barbarian player."
msgstr "Nie można zmienić statusu barbarzyńców."
-#: server/stdinhand.c:781
+#: server/stdinhand.c:700
#, c-format
msgid "%s is now under AI control."
msgstr "%s jest teraz kontrolowany przez AI."
-#: server/stdinhand.c:802
+#: server/stdinhand.c:721
#, c-format
msgid "%s is now under human control."
msgstr "%s jest teraz kontrolowany przez człowieka."
-#: server/stdinhand.c:847
+#: server/stdinhand.c:766
msgid "Can't add AI players once the game has begun."
msgstr "Po rozpoczęciu rozgrywki nie można dodawać 'robotów' (AI)"
-#: server/stdinhand.c:867
+#: server/stdinhand.c:786
msgid "Can't add more players, server is full."
msgstr "Więcej uczestników nie obsłużymy - serwer pracuje `pełną parą'."
-#: server/stdinhand.c:874
+#: server/stdinhand.c:793
msgid "Can't use an empty name."
msgstr "Nie można używać pustej nazwy."
-#: server/stdinhand.c:881
+#: server/stdinhand.c:800
#, c-format
msgid "That name exceeds the maximum of %d chars."
msgstr "Długość imienia przekracza dozwoloną wartość %d znaków."
-#: server/stdinhand.c:887
+#: server/stdinhand.c:806
msgid "That name is not allowed."
msgstr "To imiÄ™ nie jest dozwolone."
-#: server/stdinhand.c:893
+#: server/stdinhand.c:812
msgid "A player already exists by that name."
msgstr "Gracz o takim imieniu już bierze udział w grze."
-#: server/stdinhand.c:899
+#: server/stdinhand.c:818
msgid "A user already exists by that name."
msgstr "Użytkownik o takim imieniu już bierze udział w grze."
-#: server/stdinhand.c:925
+#: server/stdinhand.c:844
#, c-format
msgid "%s has been added as an AI-controlled player."
msgstr "%s został(a) dodany jako gracz AI."
-#: server/stdinhand.c:932
+#: server/stdinhand.c:851
#, c-format
msgid "Error creating new AI player: %s."
msgstr "BÅ‚Ä…d podczas tworzenia gracza AI: %s."
-#: server/stdinhand.c:966
+#: server/stdinhand.c:885
msgid "Players cannot be removed once the game has started."
msgstr "Gracz nie może być usunięty po rozpoczęciu gry."
-#: server/stdinhand.c:977
+#: server/stdinhand.c:896
#, c-format
msgid "Removed player %s from the game."
msgstr "Usunięto gracza %s z gry."
-#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
+#: server/stdinhand.c:935 server/stdinhand.c:3372 server/stdinhand.c:3507
#, c-format
msgid "Name \"%s\" disallowed for security reasons."
msgstr "Nazwa \"%s\" jest niedozwolona ze względów bezpieczeństwa."
-#: server/stdinhand.c:1029
+#: server/stdinhand.c:948
#, c-format
msgid "No command script found by the name \"%s\"."
msgstr "Nie znaleziono skryptu o nazwie \"%s\"."
-#: server/stdinhand.c:1037
+#: server/stdinhand.c:956
#, c-format
msgid "Loading script file: %s"
msgstr "WczytujÄ™ skrypt: %s"
-#: server/stdinhand.c:1052
+#: server/stdinhand.c:971
#, c-format
msgid "Cannot read command line scriptfile '%s'."
msgstr "Nie mogę obsłużyć skryptu '%s' podanego z linii poleceń."
-#: server/stdinhand.c:1054
+#: server/stdinhand.c:973
#, c-format
msgid "Could not read script file '%s'."
msgstr "Nie można odczytać skryptu '%s'."
-#: server/stdinhand.c:1146
+#: server/stdinhand.c:1065
#, c-format
msgid "Could not write script file '%s'."
msgstr "Nie można zapisać do pliku '%s'"
-#: server/stdinhand.c:1158
+#: server/stdinhand.c:1077
msgid "You cannot use the write command on this server for security reasons."
msgstr ""
"Na tym serwerze ze względu bezpieczeństwa nie można używać polecenia write."
-#: server/stdinhand.c:1186
+#: server/stdinhand.c:1105
#, c-format
msgid ""
"Cannot decrease command access level '%s' for connection '%s'; you only have "
@@ -5800,7 +5816,12 @@ msgstr ""
"Nie można zmniejszyć poziomu dostępu '%s' dla połączenia '%s'; twój poziom "
"to tylko '%s'."
-#: server/stdinhand.c:1241
+#: server/stdinhand.c:1114
+#, 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:1163
#, c-format
msgid ""
"Anyone can now become game organizer '%s' by issuing the 'first' command."
@@ -5808,231 +5829,220 @@ msgstr ""
"Jeśli chcesz zostać organizatorem z poziomem dostępu '%s', wykonaj polecenie "
"'first' (jako pierwszy)."
-#: server/stdinhand.c:1274
+#: server/stdinhand.c:1187
msgid "Command access levels in effect:"
msgstr "Aktualnie przyznane poziomy dostępu:"
-#: server/stdinhand.c:1282
+#: server/stdinhand.c:1194
#, c-format
msgid "Command access level for new connections: %s"
msgstr "Poziom dostępu do operacji dla nowych połączeń: %s"
-#: server/stdinhand.c:1285
+#: server/stdinhand.c:1197
#, c-format
msgid "Command access level for first player to take it: %s"
msgstr "Poziom dostępu do operacji dla pierwszego gracza: %s"
-#: server/stdinhand.c:1294
+#: server/stdinhand.c:1206
msgid ""
"Error: command access level must be one of 'none', 'info', 'ctrl', or 'hack'."
msgstr ""
"Błąd: Poziom dostępu musi mieć wartość: 'none', 'info', 'ctrl' lub 'hack'."
-#: server/stdinhand.c:1299
+#: server/stdinhand.c:1211
#, c-format
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: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: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:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
+#: server/stdinhand.c:1238 server/stdinhand.c:1252 server/stdinhand.c:1273
#, 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:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
+#: server/stdinhand.c:1243 server/stdinhand.c:1257 server/stdinhand.c:1267
#, 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:1402
+#: server/stdinhand.c:1302
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:1406
+#: server/stdinhand.c:1306
#, c-format
msgid "You already have command access level '%s' or better."
msgstr "Już masz poziom '%s' albo lepszy."
-#: server/stdinhand.c:1411
+#: server/stdinhand.c:1311
msgid "Someone else already is game organizer."
msgstr "Ktoś inny już jest organizatorem."
-#: server/stdinhand.c:1416
+#: server/stdinhand.c:1316
#, 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:1467
+#: server/stdinhand.c:1367
#, c-format
msgid "Invalid argument %d."
msgstr "Niewłaściwy argument %d."
-#: server/stdinhand.c:1474
+#: server/stdinhand.c:1374
msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
msgstr ""
"Składnia: timeoutincrease <liczba_tur> <inkrementator> <wartość> <mnożnik>."
-#: server/stdinhand.c:1482
+#: server/stdinhand.c:1382
#, c-format
msgid "Dynamic timeout set to %d %d %d %d"
msgstr "Dynamiczny timer ustawiony na %d %d %d %d"
-#: server/stdinhand.c:1542 server/stdinhand.c:1545
+#: server/stdinhand.c:1442 server/stdinhand.c:1445
msgid "Option:"
msgstr "Opcja:"
-#: server/stdinhand.c:1555 server/stdinhand.c:4031
+#: server/stdinhand.c:1455 server/stdinhand.c:4079
msgid "Description:"
msgstr "Opis:"
-#: server/stdinhand.c:1560
+#: server/stdinhand.c:1460
#, c-format
msgid "Status: %s"
msgstr "Status: %s"
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "changeable"
msgstr "zmienialne"
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "fixed"
msgstr "stałe"
-#: server/stdinhand.c:1567
+#: server/stdinhand.c:1467
#, c-format
msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
msgstr "Wartość: %d, Minimalna: 0, Domyślna: %d, Maksymalna: 1"
-#: server/stdinhand.c:1572
+#: server/stdinhand.c:1472
#, c-format
msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
msgstr "Wartość: %d, Minimalna: %d, Domyślna: %d, Maksymalna: %d"
-#: server/stdinhand.c:1578
+#: server/stdinhand.c:1478
#, c-format
msgid "Value: \"%s\", Default: \"%s\""
msgstr "Wartość: \"%s\", Domyślna: \"%s\""
-#: server/stdinhand.c:1597
+#: server/stdinhand.c:1497
msgid "Explanations are available for the following server options:"
msgstr "Opisy są dostępne dla poniższych opcji:"
-#: server/stdinhand.c:1643
+#: server/stdinhand.c:1537
msgid "No explanation for that yet."
msgstr "Opis jeszcze nieprzygotowany."
-#: server/stdinhand.c:1646 server/stdinhand.c:2480
+#: server/stdinhand.c:1540 server/stdinhand.c:2468
msgid "Ambiguous option name."
msgstr "Dwuznaczna nazwa opcji."
-#: server/stdinhand.c:1666
+#: server/stdinhand.c:1560
#, c-format
msgid "Server Operator: %s"
msgstr "Operator Serwera: %s"
-#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
+#: server/stdinhand.c:1686 server/stdinhand.c:1713 server/stdinhand.c:1731
#, c-format
msgid "Player '%s' now has AI skill level '%s'."
msgstr "Gracz '%s' ma teraz poziom trudności AI '%s'."
-#: server/stdinhand.c:1822
+#: server/stdinhand.c:1718
#, c-format
msgid "%s is not controlled by the AI."
msgstr "%s nie jest kontrolowany przez AI."
-#: server/stdinhand.c:1842
+#: server/stdinhand.c:1738
#, c-format
msgid "Default AI skill level set to '%s'."
msgstr "Domyślny poziom trudności AI ustawiony na '%s'."
#
-#: server/stdinhand.c:1857 server/stdinhand.c:2162
+#: server/stdinhand.c:1753
msgid "This command is client only."
msgstr "Ten rozkaz ma sens tylko z poziomu klienta."
-#: server/stdinhand.c:1860
+#: server/stdinhand.c:1756
msgid "Usage: away"
msgstr "Składnia: away"
-#: server/stdinhand.c:1865
+#: server/stdinhand.c:1761
msgid "Only players may use the away command."
msgstr "Tylko prawdziwi gracze mogą używać komendy away."
-#: server/stdinhand.c:1869
+#: server/stdinhand.c:1765
#, c-format
msgid "%s set to away mode."
msgstr "%s ustawiony(a) w tryb away."
-#: server/stdinhand.c:1877
+#: server/stdinhand.c:1772
#, c-format
msgid "%s returned to game."
msgstr "%s powrócił(a) do gry."
-#: server/stdinhand.c:1919
+#: server/stdinhand.c:1817
#, 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:1925
+#: server/stdinhand.c:1823
#, c-format
msgid "Unknown option '%s'."
msgstr "Nieznana opcja '%s'."
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1848
msgid "All options with non-default values"
msgstr "Opcje z innymi niż domyślne wartościami"
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1851
msgid "All options"
msgstr "Wszystkie opcje"
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1854
msgid "Vital options"
msgstr "Ważne opcje"
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1857
msgid "Situational options"
msgstr "Drugorzędne opcje"
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1860
msgid "Rarely used options"
msgstr "Rzadko używane opcje"
-#: server/stdinhand.c:1965
+#: server/stdinhand.c:1863
msgid "+ means you may change the option"
msgstr "+ znaczy że możesz zmienić tą opcję"
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1864
msgid "= means the option is on its default value"
msgstr "= znaczy że dana opcja jest ustawiona na swoją domyślną wartość"
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
#, c-format
msgid "%-*s value (min,max) "
msgstr "%-*s wartość (min,max) "
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
msgid "Option"
msgstr "Opcja"
-#: server/stdinhand.c:1973
+#: server/stdinhand.c:1871
msgid "description"
msgstr "opis"
-#: server/stdinhand.c:2042
+#: server/stdinhand.c:1940
msgid ""
"Try 'show situational' or 'show rare' to show more options.\n"
"Try 'show changed' to show settings with non-default values."
@@ -6041,78 +6051,152 @@ msgstr ""
"Spróbuj 'show changed' aby zobaczyć opcje z innymi niż domyślne wartościami."
#
-#: server/stdinhand.c:2092
+#: server/stdinhand.c:1966
msgid "Cannot change teams once game has begun."
msgstr "Po rozpoczęciu rozgrywki nie można zmieniać zespołów."
-#: server/stdinhand.c:2102
+#: server/stdinhand.c:1976
msgid "Undefined argument. Usage: team <player> <team>."
msgstr "Nieznany argument. Składnia: team <gracz> <zespół>."
-#: server/stdinhand.c:2122
+#: server/stdinhand.c:1996
#, 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:2129
+#: server/stdinhand.c:2003
msgid "Cannot team a barbarian."
msgstr "Nie można grać razem z barbarzyńcami."
-#: server/stdinhand.c:2135
+#: server/stdinhand.c:2009
#, c-format
msgid "Player %s set to team %s."
msgstr "Gracz %s gra teraz w zespole %s."
-#: 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:2035 server/voting.c:512
+#, fuzzy
+msgid "Teamvote"
+msgstr "Zespół"
-#: server/stdinhand.c:2165
-msgid "Observers cannot vote."
-msgstr "Obserwatorzy nie mogą głosować."
+#: server/stdinhand.c:2035 server/voting.c:516
+msgid "Vote"
+msgstr ""
-#: server/stdinhand.c:2168
+#: server/stdinhand.c:2037
+#, c-format
msgid ""
-"You can only vote in a running game. Use 'first' to become the game "
-"organizer if there currently is none."
+"%s %d \"%s\" (needs %0.0f%%%s): %d for, %d against, and %d abstained out of %"
+"d players."
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:2181
-#, c-format
-msgid "Vote %d \"%s\": %d for, %d against"
-msgstr "GÅ‚osowanie %d \"%s\": %d za, %d przeciw"
+#: server/stdinhand.c:2041
+msgid " no dissent"
+msgstr ""
-#: server/stdinhand.c:2188
+#: server/stdinhand.c:2049
msgid "There are no votes going on."
msgstr "Nie odbywa się żadne głosowanie."
-#: server/stdinhand.c:2208
-msgid "No legal last vote."
+#: server/stdinhand.c:2077
+#, fuzzy
+msgid "Invalid arguments. Usage: vote yes|no|abstain [vote number]."
+msgstr "Brak argumentów. Składnia: vote yes|no [numer głosowania]."
+
+#: server/stdinhand.c:2095 server/stdinhand.c:2213 server/stdinhand.c:3714
+msgid "You are not allowed to use this command."
+msgstr "Nie masz uprawnień do wydania tego polecenia."
+
+#: server/stdinhand.c:2104
+#, fuzzy, c-format
+msgid "The argument \"%s\" is ambigious."
+msgstr "Argument pomocy '%s' jest dwuznaczny."
+
+#: server/stdinhand.c:2119
+#, fuzzy
+msgid "There are no votes running."
+msgstr "Nie odbywa się żadne głosowanie."
+
+#: server/stdinhand.c:2121
+#, fuzzy, c-format
+msgid "No legal last vote (%d %s)."
msgstr "Nie ma głosowania."
-#: server/stdinhand.c:2213
-msgid "Value must be integer."
+#: server/stdinhand.c:2122
+msgid "other vote running"
+msgid_plural "other votes running"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: server/stdinhand.c:2129 server/stdinhand.c:2491 server/stdinhand.c:2532
+msgid "Value must be an integer."
msgstr "Wartość musi być liczbą całkowitą."
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2135 server/stdinhand.c:2221
#, c-format
msgid "No such vote (%d)."
msgstr "Nie ma takiego głosowania (%d)."
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2141
+#, fuzzy
+msgid "You are not allowed to vote on that."
+msgstr "Nie możesz zmienić tej opcji."
+
+#: server/stdinhand.c:2146
#, c-format
msgid "You voted for \"%s\""
msgstr "Zagłosowałeś za \"%s\""
-#: server/stdinhand.c:2232
+#: server/stdinhand.c:2150
#, c-format
msgid "You voted against \"%s\""
msgstr "Zagłosowałeś przeciwko \"%s\""
-#: server/stdinhand.c:2259
+#: server/stdinhand.c:2155
+#, c-format
+msgid "You abstained from voting on \"%s\""
+msgstr ""
+
+#: server/stdinhand.c:2190
+msgid "Missing argument <vote number> or the string \"all\"."
+msgstr ""
+
+#
+#: server/stdinhand.c:2197
+#, fuzzy
+msgid "You don't have any vote going on."
+msgstr "Nie masz tu pracownika."
+
+#: server/stdinhand.c:2204
+#, fuzzy
+msgid "There isn't any vote going on."
+msgstr "Nie odbywa się żadne głosowanie."
+
+#: server/stdinhand.c:2209
+msgid "Server: All votes have been removed."
+msgstr ""
+
+#: server/stdinhand.c:2226
+#, fuzzy, c-format
+msgid "You are not allowed to cancel this vote (%d)."
+msgstr "Nie możesz zmienić tej opcji."
+
+#: server/stdinhand.c:2232
+msgid "Usage: /cancelvote [<vote number>|all]"
+msgstr ""
+
+#: server/stdinhand.c:2241
+#, c-format
+msgid "Server: %s cancelled the vote \"%s\" (number %d)."
+msgstr ""
+
+#: server/stdinhand.c:2247
+#, c-format
+msgid "Server: The vote \"%s\" (number %d) has been cancelled."
+msgstr ""
+
+#: server/stdinhand.c:2265
msgid ""
"Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
"<x> <y> | unit <id> | tech <player> | timing | info>."
@@ -6121,132 +6205,128 @@ msgstr ""
"units <x> <y> | unit <id> | tech <gracz> | timing | info>."
#
-#: server/stdinhand.c:2265
+#: server/stdinhand.c:2271
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:2294
+#: server/stdinhand.c:2300
#, c-format
msgid "%s diplomacy no longer debugged"
msgstr "dyplomacja %s już nie jest debugowana"
-#: server/stdinhand.c:2298
+#: server/stdinhand.c:2304
#, c-format
msgid "%s diplomacy debugged"
msgstr "dyplomacja %s debugowana"
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2323
#, c-format
msgid "%s tech no longer debugged"
msgstr "Technologia %s już nie jest debugowana"
-#: server/stdinhand.c:2321
+#: server/stdinhand.c:2327
#, c-format
msgid "%s tech debugged"
msgstr "Technologia %s debugowana"
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2358 server/stdinhand.c:2388
msgid "Value 2 & 3 must be integer."
msgstr "Wartość druga i trzecia powinna być liczbą całkowitą."
-#: server/stdinhand.c:2356 server/stdinhand.c:2386
+#: server/stdinhand.c:2362 server/stdinhand.c:2392
msgid "Bad map coordinates."
msgstr "Złe współrzędne mapy."
-#: server/stdinhand.c:2361
+#: server/stdinhand.c:2367
msgid "No city at this coordinate."
msgstr "Nie ma miasta na podanych współrzędnych."
-#: server/stdinhand.c:2366
+#: server/stdinhand.c:2372
#, c-format
msgid "%s no longer debugged"
msgstr "%s już nie jest debugowany"
-#: server/stdinhand.c:2392 server/stdinhand.c:2422
+#: server/stdinhand.c:2398 server/stdinhand.c:2428
#, fuzzy, c-format
msgid "%s %s no longer debugged."
msgstr "Jednostka %s %s już nie jest debugowana."
-#: server/stdinhand.c:2397 server/stdinhand.c:2427
+#: server/stdinhand.c:2403 server/stdinhand.c:2433
#, fuzzy, c-format
msgid "%s %s debugged."
msgstr "Jednostka %s %s jest debugowana."
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2419
msgid "Value 2 must be integer."
msgstr "Wartość druga musi być liczbą całkowitą."
-#: server/stdinhand.c:2417
+#: server/stdinhand.c:2423
#, c-format
msgid "Unit %d does not exist."
msgstr "Jednostka %d nie istnieje."
-#: server/stdinhand.c:2475
+#: server/stdinhand.c:2464
msgid "Undefined argument. Usage: set <option> <value>."
msgstr "Nieznany argument. Składnia: set <opcja> <wartość>."
-#: server/stdinhand.c:2485
+#: server/stdinhand.c:2473
msgid "You are not allowed to set this option."
msgstr "Nie możesz zmienić tej opcji."
-#: server/stdinhand.c:2490 server/stdinhand.c:3463
+#: server/stdinhand.c:2478 server/stdinhand.c:3501
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:2502 server/stdinhand.c:2543
-msgid "Value must be an integer."
-msgstr "Wartość musi być liczbą całkowitą."
-
-#: server/stdinhand.c:2512
+#: server/stdinhand.c:2501
#, c-format
msgid "The parameter %s should only contain digits 0-1."
msgstr ""
-#: server/stdinhand.c:2519
+#: server/stdinhand.c:2508
msgid "Value out of range (minimum: 0, maximum: 1)."
msgstr "Wartość spoza zakresu (minimum: 0, maksimum: 1)."
-#: server/stdinhand.c:2534 server/stdinhand.c:2576
+#: server/stdinhand.c:2523 server/stdinhand.c:2565
#, c-format
msgid "Option: %s has been set to %d."
msgstr "Opcje: %s zostało ustawione na %d."
-#: server/stdinhand.c:2554
+#: server/stdinhand.c:2543
#, c-format
msgid "The parameter %s should only contain +- and 0-9."
msgstr ""
-#: server/stdinhand.c:2561
+#: server/stdinhand.c:2550
#, c-format
msgid "Value out of range (minimum: %d, maximum: %d)."
msgstr "Wartość spoza zakresu (minimum: %d, maksimum: %d)."
-#: server/stdinhand.c:2586
+#: server/stdinhand.c:2575
msgid "String value too long. Usage: set <option> <value>."
msgstr "Nazwa za długa. Składnia: set <opcja> <wartość>."
-#: server/stdinhand.c:2600
+#: server/stdinhand.c:2589
#, c-format
msgid "Option: %s has been set to \"%s\"."
msgstr "Opcje: %s zostało ustawione na \"%s\"."
-#: server/stdinhand.c:2658
+#: server/stdinhand.c:2652
msgid "Sorry, one can't observe globally in this game."
msgstr "Sorry, tej rozgrywki nie można obserwować globalnie."
-#: server/stdinhand.c:2661
+#: server/stdinhand.c:2655
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:2671
+#: server/stdinhand.c:2665
#, 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
+#: server/stdinhand.c:2673
#, c-format
msgid ""
"You cannot take a new player because the maximum of %d player has already "
@@ -6258,73 +6338,73 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: server/stdinhand.c:2691
+#: server/stdinhand.c:2685
msgid "You cannot take a new player because there are no free player slots."
msgstr ""
-#: server/stdinhand.c:2702
+#: server/stdinhand.c:2696
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:2705
+#: server/stdinhand.c:2699
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:2713
+#: server/stdinhand.c:2707
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:2716
+#: server/stdinhand.c:2710
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:2724
+#: server/stdinhand.c:2718
msgid "Sorry, one can't observe AI players in this game."
msgstr "Sorry, w tej rozgrywce nie można obserwować AI."
-#: server/stdinhand.c:2727
+#: server/stdinhand.c:2721
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:2736
+#: server/stdinhand.c:2730
msgid "Sorry, one can't observe human players in this game."
msgstr "Sorry, w tej rozgrywce nie można obserwować ludzi."
-#: server/stdinhand.c:2739
+#: server/stdinhand.c:2733
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:2749
+#: server/stdinhand.c:2743
msgid "Sorry, one can't observe in this game."
msgstr "Sorry, tej rozgrywki nie można obserwować."
-#: server/stdinhand.c:2754
+#: server/stdinhand.c:2748
msgid "Sorry, one can't take players in this game."
msgstr "Sorry, w tej rozgrywce nie można przejmować graczy."
-#: server/stdinhand.c:2760
+#: server/stdinhand.c:2754
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:2791
+#: server/stdinhand.c:2785
msgid "Usage: observe [connection-name [player-name]]"
msgstr "Składnia: observe [nazwa-połączenia [nazwa-gracza]]"
-#: server/stdinhand.c:2797
+#: server/stdinhand.c:2791
msgid "Usage: observe [player-name]"
msgstr "Składnia: observe [nazwa-gracza]"
-#: server/stdinhand.c:2847
+#: server/stdinhand.c:2841
#, 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:2858
+#: server/stdinhand.c:2852
#, c-format
msgid "%s is already observing %s."
msgstr "%s już kontroluje obserwuje %s"
-#: server/stdinhand.c:2863
+#: server/stdinhand.c:2857
#, c-format
msgid "%s is already observing."
msgstr "%s już obserwuje."
@@ -6339,239 +6419,244 @@ msgstr "użytkownik %s obserwuje teraz gracza %s"
msgid "%s now observes"
msgstr "%s teraz obserwuje"
-#: server/stdinhand.c:2969
+#: server/stdinhand.c:2971
msgid "Usage: take <connection-name> <player-name>"
msgstr "Składnia: take <nazwa-połączenia> <nazwa-gracza>"
-#: server/stdinhand.c:2974
+#: server/stdinhand.c:2976
msgid "Usage: take <player-name>"
msgstr "Składnia: take <nazwa-gracza>"
-#: server/stdinhand.c:2980
+#: server/stdinhand.c:2982
msgid "Usage: take [connection-name] <player-name>"
msgstr "Składnia: take [nazwa-połączenia] <nazwa-gracza>"
-#: server/stdinhand.c:3010
+#: server/stdinhand.c:3012
#, fuzzy, c-format
msgid "%s already controls %s."
msgstr "%s już kontroluje gracza %s"
-#: server/stdinhand.c:3024
+#: server/stdinhand.c:3026
#, 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:3059
+#: server/stdinhand.c:3061
#, c-format
msgid "being detached from %s."
msgstr "odłączam od gracza %s."
-#: server/stdinhand.c:3135
+#: server/stdinhand.c:3146
#, fuzzy, c-format
msgid "%s now controls %s (%s, %s)."
msgstr "użytkownik %s kontroluje teraz gracza %s (%s, %s)"
-#: server/stdinhand.c:3139 server/stdinhand.c:4260
+#: server/stdinhand.c:3150 server/stdinhand.c:4308
#: data/nation/barbarian.ruleset:3
msgid "Barbarian"
msgstr "Barbarzyński"
-#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
+#: server/stdinhand.c:3152 server/stdinhand.c:4310 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-sdl/plrdlg.c:645
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr "AI"
-#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-gtk-2.0/pages.c:2125
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
+#: server/stdinhand.c:3153 server/stdinhand.c:4312
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-gtk-2.0/pages.c:2127
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/connectdlg.c:215
msgid "Human"
msgstr "Człowiek"
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-gtk-2.0/pages.c:2124 client/gui-win32/connectdlg.c:200
-#: client/gui-win32/connectdlg.c:212
+#: server/stdinhand.c:3155 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-gtk-2.0/pages.c:2126 client/gui-win32/connectdlg.c:202
+#: client/gui-win32/connectdlg.c:214
msgid "Alive"
msgstr "Żywy"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3156 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-win32/connectdlg.c:202
msgid "Dead"
msgstr "Martwy"
-#: server/stdinhand.c:3147
+#: server/stdinhand.c:3159
#, fuzzy, c-format
msgid "%s failed to attach to any player."
msgstr "%s nie przyłączony do żadnego gracza."
-#: server/stdinhand.c:3182
+#: server/stdinhand.c:3194
msgid "Usage: detach <connection-name>"
msgstr "Składnia: detach <nazwa-połączenia>"
-#: server/stdinhand.c:3202
+#: server/stdinhand.c:3214
msgid "You can not detach other users."
msgstr "Nie możesz odłączać innych użytkowników."
-#: server/stdinhand.c:3211
+#: server/stdinhand.c:3223
#, c-format
msgid "%s is not attached to any player."
msgstr "%s nie przyłączony do żadnego gracza."
-#: server/stdinhand.c:3234
+#: server/stdinhand.c:3246
#, c-format
msgid "%s detaching from %s"
msgstr "Odłączam użytkownika %s od gracza %s"
-#: server/stdinhand.c:3240
+#: server/stdinhand.c:3252
#, c-format
msgid "%s no longer observing."
msgstr "%s już nie obserwuje."
-#: server/stdinhand.c:3259
+#: server/stdinhand.c:3271
#, c-format
msgid "detaching from %s."
msgstr "odłączam od %s."
-#: server/stdinhand.c:3345
+#: server/stdinhand.c:3361
msgid "Usage: load <game name>"
msgstr "Składnia: load <nazwa-gry>"
-#: server/stdinhand.c:3350
+#: server/stdinhand.c:3366
msgid "Cannot load a game while another is running."
msgstr "Nie można wczytać gry podczas trwania innej."
-#: server/stdinhand.c:3372
+#: server/stdinhand.c:3388
#, 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:3389
+#: server/stdinhand.c:3405
#, c-format
msgid "Could not load savefile: %s"
msgstr "Nie mogę wczytać zapisanej gry: %s"
-#: server/stdinhand.c:3458
+#: server/stdinhand.c:3496
#, c-format
msgid "Current ruleset directory is \"%s\""
msgstr "Bieżąca ścieżka zasad to: \"%s\""
-#: server/stdinhand.c:3478
+#: server/stdinhand.c:3516
#, c-format
msgid "Ruleset directory \"%s\" not found"
msgstr "Katalog z zasadami \"%s\" nieznaleziony"
-#: server/stdinhand.c:3484
+#: server/stdinhand.c:3522
#, c-format
msgid "Ruleset directory is already \"%s\""
msgstr "Katalog z zasadami już jest ustawiony na \"%s\""
-#: server/stdinhand.c:3488
+#: server/stdinhand.c:3526
#, c-format
msgid "Ruleset directory set to \"%s\""
msgstr "Katalog z zasadami ustawiony na \"%s\""
-#: server/stdinhand.c:3536
+#: server/stdinhand.c:3574
msgid "Goodbye."
msgstr "Dziękujemy za używanie serwera Freeciv."
-#: server/stdinhand.c:3567
+#: server/stdinhand.c:3606
msgid "Sorry, you are not allowed to use server commands."
msgstr "Nie masz uprawnień do sterowania pracą serwera."
-#: server/stdinhand.c:3603
+#: server/stdinhand.c:3656
#, 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:3608
+#: server/stdinhand.c:3661
#, c-format
msgid "Unknown command. Try '%shelp'."
msgstr "Nieznana komenda. Spróbuj '%shelp'."
-#: server/stdinhand.c:3625
-msgid "Your new vote canceled your previous vote."
+#: server/stdinhand.c:3675
+#, fuzzy
+msgid "Your new vote cancelled your previous vote."
msgstr "Twój nowy głos unieważnił poprzedni."
-#: server/stdinhand.c:3633
-#, c-format
-msgid "New vote (number %d) by %s: %s."
+#: server/stdinhand.c:3688
+msgid "New teamvote"
+msgstr ""
+
+#: server/stdinhand.c:3691
+msgid "New vote"
+msgstr ""
+
+#: server/stdinhand.c:3695
+#, fuzzy, c-format
+msgid "%s (number %d) by %s: %s"
msgstr "Nowe głosowanie nr %d zainicjowane przez %s: %s."
-#: server/stdinhand.c:3645
+#: server/stdinhand.c:3704
#, c-format
msgid "Your new vote (\"%s\") was not legal or was not recognized."
msgstr ""
-#: server/stdinhand.c:3655
-msgid "You are not allowed to use this command."
-msgstr "Nie masz uprawnień do wydania tego polecenia."
-
-#: server/stdinhand.c:3680
+#: server/stdinhand.c:3726
msgid "(server prompt)"
msgstr "(linia poleceń serwera)"
-#: server/stdinhand.c:3787
+#: server/stdinhand.c:3835
msgid "Game ended in a draw."
msgstr "Gra zakończyła się remisem."
-#: server/stdinhand.c:3791
+#: server/stdinhand.c:3839
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:3796
+#: server/stdinhand.c:3844
msgid "Cannot end the game: no game running."
msgstr "Nie mogę zakończyć gry: jeszcze nie rozpoczęta."
-#: server/stdinhand.c:3812
+#: server/stdinhand.c:3860
#, 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:3817
+#: server/stdinhand.c:3865
msgid "You cannot surrender now."
msgstr "Nie możesz się teraz poddać."
-#: server/stdinhand.c:3883
+#: server/stdinhand.c:3931
#, fuzzy
msgid "Not enough human players, game will not start."
msgstr "Brak graczy, gra nie wystartuje."
-#: server/stdinhand.c:3888
+#: server/stdinhand.c:3936
#, fuzzy
msgid "No players, game will not start."
msgstr "Brak graczy, gra nie wystartuje."
-#: server/stdinhand.c:3892
+#: server/stdinhand.c:3940
#, fuzzy
msgid "Not enough nations for all players, game will not start."
msgstr "Brak graczy, gra nie wystartuje."
-#: server/stdinhand.c:3901
+#: server/stdinhand.c:3949
msgid "All players are ready; starting game."
msgstr "Wszyscy gracze sÄ… gotowi; rozpoczynamy grÄ™!"
-#: server/stdinhand.c:3915
+#: server/stdinhand.c:3963
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:3922
+#: server/stdinhand.c:3970
msgid "Cannot start the game: it is already running."
msgstr "Nie mogę wystartować gry: jest już włączona."
-#: server/stdinhand.c:3953
+#: server/stdinhand.c:4001
#, c-format
msgid "Cutting connection %s."
msgstr "Przerywam połączenie %s."
-#: server/stdinhand.c:3972
+#: server/stdinhand.c:4020
msgid ""
"Welcome - this is the introductory help text for the Freeciv server.\n"
"\n"
@@ -6609,77 +6694,77 @@ msgstr ""
" save - aby zapisać grę\n"
" quit - aby zakończyć program"
-#: server/stdinhand.c:4007 server/stdinhand.c:4010
+#: server/stdinhand.c:4055 server/stdinhand.c:4058
msgid "Command:"
msgstr "Komenda:"
-#: server/stdinhand.c:4014
+#: server/stdinhand.c:4062
msgid "Synopsis: "
msgstr "Składnia: "
-#: server/stdinhand.c:4023
+#: server/stdinhand.c:4071
#, c-format
msgid "Level: %s"
msgstr "Poziom: %s"
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4096
msgid "The following server commands are available:"
msgstr "Poniższe komendy serwera są dostępne:"
-#: server/stdinhand.c:4123
+#: server/stdinhand.c:4171
#, c-format
msgid "Help argument '%s' is ambiguous."
msgstr "Argument pomocy '%s' jest dwuznaczny."
-#: server/stdinhand.c:4128
+#: server/stdinhand.c:4176
#, c-format
msgid "No match for help argument '%s'."
msgstr "Nieprawidłowy argument '%s'."
-#: server/stdinhand.c:4194
+#: server/stdinhand.c:4242
#, c-format
msgid "Bad list argument: '%s'. Try '%shelp list'."
msgstr "Zły argument komendy list: '%s'. Spróbuj '%shelp list'."
-#: server/stdinhand.c:4234
+#: server/stdinhand.c:4282
msgid "List of players:"
msgstr "Lista graczy:"
-#: server/stdinhand.c:4239
+#: server/stdinhand.c:4287
msgid "<no players>"
msgstr "<brak graczy>"
-#: server/stdinhand.c:4256
+#: server/stdinhand.c:4304
#, c-format
msgid "user %s, "
msgstr "użytkownik %s, "
-#: server/stdinhand.c:4267
+#: server/stdinhand.c:4315
msgid ", Dead"
msgstr ", Martwy"
-#: server/stdinhand.c:4270
+#: server/stdinhand.c:4318
#, 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:4275 server/stdinhand.c:4279 client/helpdata.c:257
-#: client/helpdata.c:752 client/text.c:241 client/text.c:1224
-#: client/text.c:1262
+#: server/stdinhand.c:4323 server/stdinhand.c:4327 client/helpdata.c:257
+#: client/helpdata.c:752 client/text.c:241 client/text.c:1229
+#: client/text.c:1267
#, c-format
msgid "?clistmore:, %s"
msgstr ", %s"
-#: server/stdinhand.c:4283
+#: server/stdinhand.c:4331
msgid ", ready"
msgstr ", gotowy"
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4333
msgid ", not ready"
msgstr ","
-#: server/stdinhand.c:4293
+#: server/stdinhand.c:4341
#, c-format
msgid " %d connection:"
msgid_plural " %d connections:"
@@ -6687,21 +6772,21 @@ msgstr[0] " %d połączenie:"
msgstr[1] " %d połączenia:"
msgstr[2] " %d połączeń:"
-#: server/stdinhand.c:4299
+#: server/stdinhand.c:4347
#, 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:4304
+#: server/stdinhand.c:4352
msgid " (observer mode)"
msgstr " (tryb obserwatora)"
-#: server/stdinhand.c:4322
+#: server/stdinhand.c:4370
msgid "List of teams:"
msgstr "Lista zespołów:"
#. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4332
+#: server/stdinhand.c:4380
#, c-format
msgid "%2d : '%s' : %d player"
msgid_plural "%2d : '%s' : %d players"
@@ -6709,25 +6794,25 @@ msgstr[0] "%2d : '%s' : %d gracz"
msgstr[1] "%2d : '%s' : %d graczy"
msgstr[2] "%2d : '%s' : %d graczy"
-#: server/stdinhand.c:4352
+#: server/stdinhand.c:4400
#, c-format
msgid "%2d : '%s' : 1 player : %s"
msgstr "%2d : '%s' : 1 gracz: %s"
-#: server/stdinhand.c:4360
+#: server/stdinhand.c:4408
#, c-format
msgid "Empty team: %s"
msgstr "Pusty zespół: %s"
-#: server/stdinhand.c:4371
+#: server/stdinhand.c:4419
msgid "List of connections to server:"
msgstr "Lista połączeń z serwerem:"
-#: server/stdinhand.c:4375
+#: server/stdinhand.c:4423
msgid "<no connections>"
msgstr "<brak połączeń>"
-#: server/stdinhand.c:4399
+#: server/stdinhand.c:4447
msgid "List of scenarios available:"
msgstr "Lista dostępnych scenariuszy:"
@@ -6746,44 +6831,44 @@ msgstr "%s rozpoczęli budowę %s w mieście %s."
msgid "%s acquired from %s!"
msgstr "%s otrzymali %s od %s."
-#: server/techtools.c:220
+#: server/techtools.c:221
#, c-format
msgid ""
"Discovery of %s makes the government form %s available. You may want to "
"start a revolution."
msgstr ""
-#: server/techtools.c:301
+#: server/techtools.c:302
#, c-format
msgid "Discovery of %s OBSOLETES %s in %s!"
msgstr ""
-#: server/techtools.c:351
+#: server/techtools.c:352
#, c-format
msgid "Learned %s. Our scientists focus on %s; goal is %s."
msgstr ""
-#: server/techtools.c:369
+#: server/techtools.c:370
#, c-format
msgid "Learned %s. Scientists choose to research %s."
msgstr ""
-#: server/techtools.c:376
+#: server/techtools.c:377
#, fuzzy, c-format
msgid "Learned %s. "
msgstr "koło miasta %s"
-#: server/techtools.c:379
+#: server/techtools.c:380
#, fuzzy, c-format
msgid "Researching %s."
msgstr "Badania: %s: %s"
-#: server/techtools.c:385
+#: server/techtools.c:386
#, c-format
msgid "Learned %s. Scientists do not know what to research next."
msgstr ""
-#: server/techtools.c:402
+#: server/techtools.c:403
#, fuzzy
msgid ""
"Great scientists from all the world join your civilization: you get an "
@@ -6792,22 +6877,22 @@ msgstr ""
"Wielcy Filozofowie z całego świata przyłączyli się do twej cywilizacji; "
"dostajesz natychmiastowy wynalazek."
-#: server/techtools.c:570
+#: server/techtools.c:571
#, fuzzy, c-format
msgid "Technology goal is %s."
msgstr "Nie znaleziono nowej technologii w mieście %s."
-#: server/techtools.c:700
+#: server/techtools.c:708
#, fuzzy, c-format
msgid "You steal %s from the %s."
msgstr "%s otrzymali %s od %s."
-#: server/techtools.c:705
+#: server/techtools.c:713
#, c-format
msgid "The %s stole %s from you!"
msgstr ""
-#: server/techtools.c:710
+#: server/techtools.c:718
#, fuzzy, c-format
msgid "The %s have stolen %s from the %s."
msgstr "%s otrzymali %s od %s."
@@ -6831,156 +6916,162 @@ msgstr "Nie można ulepszyć żadnej jednostki."
msgid "%s upgraded to %s for %d gold."
msgstr "%s ulepszeni do %s za %d złota."
-#: server/unithand.c:396
+#: server/unithand.c:402
#, c-format
msgid "%s refuses to disband!"
msgstr "%s nie chce się rozwiązać!"
-#: server/unithand.c:449
+#: server/unithand.c:455
msgid "Can't place city here."
msgstr "Tu nie da się założyć miasta."
-#: server/unithand.c:456
+#: server/unithand.c:462
#, c-format
msgid "Only %s can build a city."
msgstr "Tylko %s mogą zakładać miasta."
-#: server/unithand.c:461
+#: server/unithand.c:467
msgid "Can't build a city."
msgstr "Nie można założyć miasta."
-#: server/unithand.c:470
+#: server/unithand.c:476
#, c-format
msgid "Only %s can add to a city."
msgstr "Tylko %s mogą dodawać populację do miasta."
-#: server/unithand.c:475
+#: server/unithand.c:481
msgid "Can't add to a city."
msgstr "Nie można dodać do miasta."
-#: server/unithand.c:481
+#: server/unithand.c:487
#, c-format
msgid "%s unit has no moves left to add to %s."
msgstr "Jednostka %s nie ma już ruchu, by móc dodać do %s."
-#: server/unithand.c:487
+#: server/unithand.c:493
#, c-format
msgid "%s unit has no moves left to build city."
msgstr "Jednostka %s nie ma już ruchu w tej turze, by móc zbudować miasto."
-#: server/unithand.c:492
+#. TRANS: <city> is owned by <nation>, cannot add <unit>.
+#: server/unithand.c:499
+#, fuzzy, c-format
+msgid "%s is owned by %s, cannot add %s."
+msgstr "Miasto %s jest zbyt duże aby dodać %s."
+
+#: server/unithand.c:506
#, c-format
msgid "%s is too big to add %s."
msgstr "Miasto %s jest zbyt duże aby dodać %s."
-#: server/unithand.c:498
+#: server/unithand.c:512
#, c-format
msgid "%s needs an improvement to grow, so you cannot add %s."
msgstr "Miasto %s potrzebuje budynku do wzrostu, więc nie możesz dodać %s."
-#: server/unithand.c:509
+#: server/unithand.c:523
#, c-format
msgid "Can't add %s to %s."
msgstr "Nie można dodać jednostki %s do miasta %s."
-#: server/unithand.c:531
+#: server/unithand.c:545
#, c-format
msgid "%s added to aid %s in growing."
msgstr "%s dodano by wspomóc wzrost miasta %s."
-#: server/unithand.c:828
+#: server/unithand.c:842
msgid "Your Nuclear missile was shot down by SDI defences, what a waste."
msgstr ""
"Twój pocisk nuklearny został zestrzelony przez obronę SDI, co za strata."
-#: server/unithand.c:831
+#: server/unithand.c:845
#, c-format
msgid "The nuclear attack on %s was avoided by your SDI defense."
msgstr "Obrona SDI zapobiegła atakowi jądrowemu na miasto %s."
#. TRANS: "Your Cannon ... the Polish Destroyer."
-#: server/unithand.c:901
+#: server/unithand.c:915
#, fuzzy, c-format
msgid "Your %s survived the pathetic attack from the %s %s."
msgstr "Twoja jednostka %s stacjonująca obroniła się przed %s %s."
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unithand.c:910
+#: server/unithand.c:924
#, fuzzy, c-format
msgid "Your attacking %s failed against the %s %s!"
msgstr "Twoja jednostka %s zawiodła podczas ataku przeciwko %s %s!"
-#: server/unithand.c:983
+#: server/unithand.c:997
#, c-format
msgid "Only %s can attack from sea."
msgstr "Tylko %s mogą atakować z morza."
-#: server/unithand.c:988
+#: server/unithand.c:1002
msgid "Cannot attack from sea."
msgstr "Nie możesz atakować z morza."
-#: server/unithand.c:996 server/unittools.c:2137
+#: server/unithand.c:1010 server/unittools.c:2142
msgid "Cannot attack unless you declare war first."
msgstr "Nie możesz atakować zanim nie wypowiesz wojny."
-#: server/unithand.c:1001
+#: server/unithand.c:1015
#, c-format
msgid "%s can only move into your own zone of control."
msgstr "Jednostka %s może się poruszać tylko we własnej strefie kontroli."
-#: server/unithand.c:1007
+#: server/unithand.c:1021
#, fuzzy, c-format
msgid "Cannot invade unless you break peace with %s first."
msgstr "Nie możesz atakować zanim nie wypowiesz wojny."
-#: server/unithand.c:1052
+#: server/unithand.c:1066
msgid "This unit has no moves left."
msgstr "Tej jednostce nie pozostało wystarczająco dużo ruchu."
-#: server/unithand.c:1107
+#: server/unithand.c:1121
msgid "Unit must be on land to perform diplomatic action."
msgstr "Jednostka musi być na lądzie aby wykonywać czynności dyplomatyczne."
-#: server/unithand.c:1109
+#: server/unithand.c:1123
msgid "No diplomat action possible."
msgstr "Nie można wykonać żadnej czynności dyplomatycznej."
-#: server/unithand.c:1125
+#: server/unithand.c:1139
#, c-format
msgid "You must declare war on %s first. Try using players dialog (F3)."
msgstr ""
"Musisz najpierw wypowiedzieć wojnę przeciwko %s. Użyj raportu o graczach "
"(F3)."
-#: server/unithand.c:1143
+#: server/unithand.c:1157
msgid "This unit is being transported, and so cannot bombard."
msgstr "ta jednostka jest transportowana i dlatego nie może ostrzeliwać."
-#: server/unithand.c:1158
+#: server/unithand.c:1172
msgid "You can't attack there."
msgstr "Nie możesz tam atakować."
-#: server/unithand.c:1180
+#: server/unithand.c:1194
msgid "This type of troops cannot take over a city."
msgstr "Ta jednostka nie potrafi przejąć kontroli nad miastem."
-#: server/unithand.c:1198
+#: server/unithand.c:1212
msgid "A transported unit is not allied to all units or city on target tile."
msgstr ""
"Transportowana jednostka nie jest w sojuszu z wszystkimi jednostkami lub "
"miastem na polu docelowym."
-#: server/unithand.c:1240
+#: server/unithand.c:1254
#, c-format
msgid "Your %s helps build the %s in %s (%d remaining)."
msgstr "Twoja %s pomogła w budowie %s w mieście %s (pozostało: %d)."
-#: server/unithand.c:1242
+#: server/unithand.c:1256
#, c-format
msgid "Your %s helps build the %s in %s (%d surplus)."
msgstr "Twoja %s pomogła w budowie %s w mieście %s (nadwyżka: %d)."
-#: server/unithand.c:1286
+#: server/unithand.c:1300
#, c-format
msgid ""
"Sorry, your %s cannot establish a trade route because it has no home city"
@@ -6988,28 +7079,28 @@ msgstr ""
"Twoja %s nie może ustanowić tu trasy handlowej ponieważ nie należy do "
"żadnego miasta"
-#: server/unithand.c:1296
+#: server/unithand.c:1310
#, c-format
msgid "Sorry, your %s cannot establish a trade route between %s and %s"
msgstr "Twoja %s nie może ustanowić tu trasy handlowej pomiędzy %s i %s!"
-#: server/unithand.c:1325 server/unithand.c:1344
+#: server/unithand.c:1339 server/unithand.c:1358
#, c-format
msgid "Sorry, your %s cannot establish a trade route here!"
msgstr "Sorry, twoja %s nie może ustanowić tu trasy handlowej!"
-#: server/unithand.c:1329 server/unithand.c:1348
+#: server/unithand.c:1343 server/unithand.c:1362
#, c-format
msgid " The city of %s already has %d better trade routes!"
msgstr " Od miasta %s biegną już %d lepsze trasy handlowe!"
-#: server/unithand.c:1361 server/unithand.c:1373
+#: server/unithand.c:1375 server/unithand.c:1387
#, c-format
msgid "Sorry, %s has canceled the trade route from %s to your city %s."
msgstr ""
"Niestety, %s anulował(a) trasę handlową z miasta %s do twojego miasta %s."
-#: server/unithand.c:1406
+#: server/unithand.c:1420
#, c-format
msgid ""
"Your %s from %s has arrived in %s, and revenues amount to %d in gold and "
@@ -7072,58 +7163,58 @@ msgid "Teleported your %s to %s."
msgstr "Przeniesiono jednostkÄ™ %s do miasta %s."
#. TRANS: A unit is moved to resolve stack conflicts.
-#: server/unittools.c:1065
+#: server/unittools.c:1070
#, fuzzy, c-format
msgid "Moved your %s."
msgstr "RozwiÄ…zano twojÄ… jednostkÄ™ %s."
-#: server/unittools.c:1076
+#: server/unittools.c:1081
#, c-format
msgid "Disbanded your %s."
msgstr "RozwiÄ…zano twojÄ… jednostkÄ™ %s."
-#: server/unittools.c:1397
+#: server/unittools.c:1402
#, c-format
msgid "Unable to defend %s, %s has lost the game."
msgstr "%2$s nie mogł obronić %1$s i przegrał grę."
-#: server/unittools.c:1401
+#: server/unittools.c:1406
#, c-format
msgid "Losing %s meant losing the game! Be more careful next time!"
msgstr ""
"Utrata %s oznacza przegranie rozgrywki! Zachowaj większą ostrożność "
"następnym razem!"
-#: server/unittools.c:1503
+#: server/unittools.c:1508
#, c-format
msgid "%s escaped the destruction of %s, and fled to %s."
msgstr "Twój %s uratował podczas niszczenia %s, i przeleciał do %s."
-#: server/unittools.c:1512
+#: server/unittools.c:1517
#, c-format
msgid "%s lost when %s was lost."
msgstr "Jednostka %s utracona razem z %s."
-#: server/unittools.c:1561
+#: server/unittools.c:1566
#, c-format
msgid "Barbarian leader captured, %d gold ransom paid."
msgstr ""
"Ująłeś barbarzyńskiego przywódcę, otrzymałeś okup w wysokości %d złota."
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unittools.c:1579
+#: server/unittools.c:1584
#, fuzzy, c-format
msgid "Your attacking %s succeeded against the %s %s!"
msgstr "Twoja jednostka %1$s przeprowadziła udany atak przeciwko %2$s %3$s!"
#. TRANS: "Cannon ... the Polish Destroyer."
-#: server/unittools.c:1588 server/unittools.c:1646
+#: server/unittools.c:1593 server/unittools.c:1651
#, fuzzy, c-format
msgid "%s lost to an attack by the %s %s."
msgstr "Jednostka %s utracona w wyniku ataku %s %s."
#. TRANS: "... Cannon ... the Polish Destroyer ...."
-#: server/unittools.c:1622
+#: server/unittools.c:1627
#, fuzzy, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -7140,14 +7231,14 @@ msgstr[2] ""
#. TRANS: "Cannon lost when the Polish Destroyer
#. * attacked the German Musketeers."
-#: server/unittools.c:1655
+#: server/unittools.c:1660
#, fuzzy, c-format
msgid "%s lost when the %s %s attacked the %s %s."
msgstr "Jednostka %s utracona podczas ataku %s %s na %s %s."
#. TRANS: "Musketeers (and Cannon) lost to an
#. * attack from the Polish Destroyer."
-#: server/unittools.c:1670
+#: server/unittools.c:1675
#, fuzzy, c-format
msgid "%s (and %s) lost to an attack from the %s %s."
msgstr "Jednostka %s ( i %s) utracona podczas ataku %s %s."
@@ -7155,7 +7246,7 @@ msgstr "Jednostka %s ( i %s) utracona podczas ataku %s %s."
#. TRANS: "Musketeers and 3 other units lost to
#. * an attack from the Polish Destroyer."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1680
+#: server/unittools.c:1685
#, fuzzy, 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."
@@ -7169,7 +7260,7 @@ msgstr[2] ""
#. TRANS: "2 units lost when the Polish Destroyer
#. * attacked the German Musketeers."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1694
+#: server/unittools.c:1699
#, fuzzy, 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."
@@ -7177,182 +7268,227 @@ msgstr[0] "%d jednostka utracona podczas ataku %s %s na %s %s."
msgstr[1] "%d jednostki utracona podczas ataku %s %s na %s %s."
msgstr[2] "%d jednostek utraconych podczas ataku %s %s na %s %s."
-#: server/unittools.c:1962
+#: server/unittools.c:1967
#, c-format
msgid "Your %s was nuked by %s."
msgstr "Twoja jednostka %s została zbombardowana przez %s."
-#: server/unittools.c:1965 server/unittools.c:1981
+#: server/unittools.c:1970 server/unittools.c:1986
msgid "yourself"
msgstr "ciebie"
-#: server/unittools.c:1969
+#: server/unittools.c:1974
#, fuzzy, c-format
msgid "The %s %s was nuked."
msgstr "Jednostka %s %s zniszczona."
-#: server/unittools.c:1978
+#: server/unittools.c:1983
#, c-format
msgid "%s was nuked by %s."
msgstr "Miasto %s zostało zniszczone przez %s."
-#: server/unittools.c:1986
+#: server/unittools.c:1991
#, c-format
msgid "You nuked %s."
msgstr "Zniszczyłeś miasto %s."
-#: server/unittools.c:2027
+#: server/unittools.c:2032
#, fuzzy, c-format
msgid "The %s detonated a nuke!"
msgstr "%s użył(a) broni jądrowej!"
-#: server/unittools.c:2051
+#: server/unittools.c:2056
#, c-format
msgid "%s transported successfully."
msgstr "Jednostka %s bezpiecznie przetransportowana."
-#: server/unittools.c:2103
+#: server/unittools.c:2108
msgid "This unit type can not be paradropped."
msgstr "Ta jednostka nie może być przerzucona."
#
-#: server/unittools.c:2113
+#: server/unittools.c:2118
#, fuzzy
msgid "You cannot paradrop a unit that is transporting other units."
msgstr "Nie możesz przerzucać jednostki transportującej."
-#: server/unittools.c:2119
+#: server/unittools.c:2124
msgid "The destination location is not known."
msgstr "Cel jest nieznany."
#
-#: server/unittools.c:2126
+#: server/unittools.c:2131
#, c-format
msgid "This unit cannot paradrop into %s."
msgstr "Jednostki nie można przerzucić do %s."
-#: server/unittools.c:2146
+#: server/unittools.c:2151
#, c-format
msgid "The distance to the target (%i) is greater than the unit's range (%i)."
msgstr "Odległość do celu (%i) jest większa od zasięgu danej jednostki (%i)."
-#: server/unittools.c:2157
+#: server/unittools.c:2162
#, c-format
msgid "Your %s paradropped into the %s and was lost."
msgstr "Gra: Twoi %s zostali zrzuceni do %s i zginęli."
-#: server/unittools.c:2170
+#: server/unittools.c:2175
#, c-format
msgid "Your %s was killed by enemy units at the paradrop destination."
msgstr "Twoi %s zostali zabici przez jednostki wroga podczas lÄ…dowania."
-#: server/unittools.c:2192
+#: server/unittools.c:2197
#, c-format
msgid "You found %d gold."
msgstr "Znalazłeś %d złota."
-#: server/unittools.c:2209
+#: server/unittools.c:2214
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr "Odkryłeś technologię %s w pradawnych zbiorach wiedzy."
-#: server/unittools.c:2216
+#: server/unittools.c:2221
#, c-format
msgid "The %s have acquired %s from ancient scrolls of wisdom."
msgstr "%s znaleźli technologię %s w pradawnych zbiorach wiedzy."
-#: server/unittools.c:2230
+#: server/unittools.c:2235
msgid "A band of friendly mercenaries joins your cause."
msgstr "Przyjaźnie nastawieni najemnicy przyłączyli się do ciebie."
-#: server/unittools.c:2248
+#: server/unittools.c:2253
msgid "An abandoned village is here."
msgstr "Ta wioska jest opuszczona."
-#: server/unittools.c:2258
+#: server/unittools.c:2263
msgid "You have unleashed a horde of barbarians!"
msgstr "Sprowokowałeś barbarzyńców do ataku!"
-#: server/unittools.c:2261
+#: server/unittools.c:2266
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr "%s został(a) zabity przez barbarzyńców!"
-#: server/unittools.c:2277
+#: server/unittools.c:2282
msgid "You found a friendly city."
msgstr "Znalazłeś przyjazne miasto."
-#: server/unittools.c:2291
+#: server/unittools.c:2296
msgid "Friendly nomads are impressed by you, and join you."
msgstr "Przyjaźni koczownicy są zachwyceni tobą i przyłączają się."
-#: server/unittools.c:2316
+#: server/unittools.c:2321
msgid "Your overflight frightens the tribe; they scatter in terror."
msgstr "Twój przelot wystraszył tubylców; uciekli wystraszeni."
-#: server/unittools.c:2574
+#: server/unittools.c:2579
#, c-format
msgid "Orders for %s aborted after enemy movement was spotted."
msgstr ""
"Jednostka %s przerwała wykonywanie rozkazu gdy napotkała ruch wrogiej "
"jednostki."
-#: server/unittools.c:3023
+#: server/unittools.c:3028
#, c-format
msgid "Orders for %s aborted as there are units nearby."
msgstr ""
"Jednostka %s przerwała wykonywanie rozkazu gdy napotkała wrogie jednostki."
-#: server/unittools.c:3075
+#: server/unittools.c:3080
#, c-format
msgid "Orders for %s aborted because building of city failed."
msgstr "Jednostka %s nie wykonała rozkazu - nie udało się zbudować miasta."
-#: server/unittools.c:3088
+#: server/unittools.c:3093
#, c-format
msgid "Orders for %s aborted since they give an invalid activity."
msgstr ""
"Anulowano rozkaz dla jednostki %s ponieważ zawiera on nieprawidłową czynność."
-#: server/unittools.c:3102
+#: server/unittools.c:3107
#, c-format
msgid "Orders for %s aborted since they give an invalid location."
msgstr ""
"Anulowano rozkaz dla jednostki %s ponieważ zawiera on nieprawidłowe "
"współrzędne."
-#: server/unittools.c:3112
+#: server/unittools.c:3117
#, c-format
msgid "Orders for %s aborted as there are units in the way."
msgstr ""
"Jednostka %s przerwała wykonywanie rozkazu gdy napotkała wrogie jednostki na "
"swojej drodze."
-#: server/unittools.c:3138
+#: server/unittools.c:3143
#, c-format
msgid "Orders for %s aborted because of failed move."
msgstr "Jednostka %s nie wykonała rozkazu - ruch niemożliwy."
-#: server/unittools.c:3179
+#: server/unittools.c:3184
#, c-format
msgid "Attempt to change homecity for %s failed."
msgstr "Nie udało się zmienić miasta macierzystego jednostce %s."
-#: server/unittools.c:3190
+#: server/unittools.c:3195
#, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr "Nie udało się utworzyć szlaku handlowego za pomocą %s."
-#: server/unittools.c:3202
+#: server/unittools.c:3207
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr "Nie udało się wspomóc budowy cudu za pomocą %s."
-#: server/unittools.c:3211
+#: server/unittools.c:3216
#, c-format
msgid "Your %s has invalid orders."
msgstr "Twoja jednostka %s ma nieprawidłowe rozkazy."
+#: server/voting.c:522
+#, fuzzy, c-format
+msgid ""
+"%s %d \"%s\" is passed %d to %d with %d abstentions and %d who did not vote."
+msgstr ""
+"Polecenie \"%s\" zostało przyjęte stosunkiem głosów %d:%d. Wstrzymało się od "
+"głosu: %d."
+
+#: server/voting.c:528
+#, fuzzy, c-format
+msgid ""
+"%s %d \"%s\" failed with %d against, %d for, %d abstentions and %d who did "
+"not vote."
+msgstr ""
+"Polecenie \"%s\" zostało odrzucone. %d przeciw, %d za, %d wstrzymało się."
+
+#: server/voting.c:548
+#, c-format
+msgid "%s %d: %s voted yes."
+msgstr ""
+
+#: server/voting.c:553
+#, c-format
+msgid "%s %d: %s voted no."
+msgstr ""
+
+#: server/voting.c:558
+#, c-format
+msgid "%s %d: %s chose to abstain."
+msgstr ""
+
+#. TRANS: Describing a new vote that can only pass
+#. * if there are no dissenting votes.
+#: server/voting.c:726
+#, c-format
+msgid "%s (needs %0.0f%% and no dissent)."
+msgstr ""
+
+#. TRANS: Describing a new vote that can pass only if the
+#. * given percentage of players votes 'yes'.
+#: server/voting.c:732
+#, c-format
+msgid "%s (needs %0.0f%% in favor)."
+msgstr ""
+
#: server/generator/mapgen.c:1771
msgid "High landmass - this may take a few seconds."
msgstr "Duża ilość lądów(landmass) - może to zająć kilka sekund."
@@ -7384,14 +7520,14 @@ msgstr ""
"Byćmoże na tej mapie jest za dużo graczy.\n"
"Prosimy o zgłoszenie tego błędu (%s)."
-#: client/attribute.c:363
+#: client/attribute.c:368
msgid ""
"There has been a CMA error. Your citizen governor settings may be broken."
msgstr ""
"Wystąpił błąd wewnątrz CMA. Możliwe, że twoje ustawienia CMA zostały "
"zepsute."
-#: client/attribute.c:367
+#: client/attribute.c:372
msgid "Old attributes detected and removed."
msgstr "Stare atrybuty wykryte i usunięte."
@@ -7542,41 +7678,41 @@ msgstr "%+4d : Mieszkańcy\n"
msgid "%+4d : Taxed from trade\n"
msgstr "%+4d : Podatek z handlu\n"
-#: client/citydlg_common.c:418
+#: client/citydlg_common.c:421
#, c-format
msgid "%+4d : Trade route with %s\n"
msgstr "%+4d : Szlak handlowy z %s\n"
-#: client/citydlg_common.c:427
+#: client/citydlg_common.c:430
#, c-format
msgid "%+4d : Building tithes\n"
msgstr "%+4d : Datki generowane przez budynki\n"
-#: client/citydlg_common.c:450
+#: client/citydlg_common.c:453
#, c-format
msgid "%+4d : Bonus from %s (%+d%%)\n"
msgstr "%+4d : Bonus z %s (%+d%%)\n"
-#: client/citydlg_common.c:462
+#: client/citydlg_common.c:465
#, c-format
msgid "%+4d : Waste\n"
msgstr "%+4d : Straty\n"
-#: client/citydlg_common.c:468
+#: client/citydlg_common.c:471
#, c-format
msgid "%+4d : Disorder\n"
msgstr "%+4d : Zamieszki\n"
-#: client/citydlg_common.c:474
+#: client/citydlg_common.c:477
#, c-format
msgid "%+4d : Used\n"
msgstr "%+4d : Zużywane\n"
-#: client/citydlg_common.c:479
+#: client/citydlg_common.c:482
msgid "==== : Adds up to\n"
msgstr "==== W sumie\n"
-#: client/citydlg_common.c:481
+#: client/citydlg_common.c:484
#, c-format
msgid "%4d : Total surplus"
msgstr "%4d : Nadwyżka"
@@ -7904,55 +8040,55 @@ msgstr "?specialist:S"
msgid "Specialists"
msgstr "Specjaliści"
-#: client/civclient.c:240
+#: client/civclient.c:241
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr " -a, --autoconnect\tPomiń okno połączenia\n"
-#: client/civclient.c:250
+#: client/civclient.c:251
msgid " -l, --log FILE\tUse FILE as logfile (spawned server also uses this)\n"
msgstr ""
" -l, --log PLIK\tUżyj PLIK jako pliku dziennika (Wewnętrzny serwer też go "
"używa)\n"
-#: client/civclient.c:252
+#: client/civclient.c:253
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr " -m, --meta HOST\tPołącz z metaserwerem HOST\n"
-#: client/civclient.c:254
+#: client/civclient.c:255
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr " -n, --name NAME\tUżyj NAME jako imienia\n"
-#: client/civclient.c:256
+#: client/civclient.c:257
#, fuzzy
msgid " -p, --port PORT\tConnect to server port PORT (usually with -a)\n"
msgstr " -p, --port=PORT\tPołącz się z portem PORT.\n"
-#: client/civclient.c:258
+#: client/civclient.c:259
#, c-format
msgid " -P, --Plugin PLUGIN\tUse PLUGIN for sound output %s\n"
msgstr " -P, --Plugin WTYCZKA\tUżyj wtyczki dźwiękowej WTYCZKA %s\n"
-#: client/civclient.c:260
+#: client/civclient.c:261
msgid " -r, --read FILE\tRead startup script FILE (for spawned server only)\n"
msgstr ""
" -r, --read PLIK\tUruchom skrypt PLIK (tylko dla wewnętrznego serwera)\n"
-#: client/civclient.c:263
+#: client/civclient.c:264
#, fuzzy
msgid " -s, --server HOST\tConnect to the server at HOST (usually with -a)\n"
msgstr ""
" -s, --server HOST\tPołącz się z serwerem Freeciv na komputerze HOST\n"
-#: client/civclient.c:265
+#: client/civclient.c:266
msgid " -S, --Sound FILE\tRead sound tags from FILE\n"
msgstr " -r, --Sound PLIK\tWczytaj ustawienia dźwięków z PLIKU\n"
-#: client/civclient.c:266
+#: client/civclient.c:267
msgid " -t, --tiles FILE\tUse data file FILE.tilespec for tiles\n"
msgstr ""
" -t, --tiles PLIK\tUżyj pliku PLIK.tilespec ze specyfikacją grafiki.\n"
-#: client/civclient.c:269
+#: client/civclient.c:270
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7962,45 +8098,45 @@ msgstr ""
"\t\t\tSpróbuj \"%s -- --help\" po więcej informacji.\n"
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:274
+#: client/civclient.c:275
#, fuzzy, c-format
msgid "Report bugs at %s\n"
msgstr "Zgłaszanie błędów na adres <%s>.\n"
-#: client/civclient.c:298
+#: client/civclient.c:299
#, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr "Nieprawidłowy port \"%s\" podany w opcji --port.\n"
-#: client/civclient.c:300 client/civclient.c:315
+#: client/civclient.c:301 client/civclient.c:316
msgid "Try using --help.\n"
msgstr "Spróbuj --help.\n"
-#: client/civclient.c:313
+#: client/civclient.c:314
#, c-format
msgid "Invalid debug level \"%s\" specified with --debug option.\n"
msgstr "Nieprawidłowy poziom debugowania \"%s\" podany w opcji --debug.\n"
-#: client/civclient.c:326
+#: client/civclient.c:327
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr "Nierozpoznana opcja: \"%s\"\n"
-#: client/civclient.c:391
+#: client/civclient.c:393
#, fuzzy, c-format
msgid "Updating old metaserver address \"%s\"."
msgstr "metaserver <adres>"
-#: client/civclient.c:394
+#: client/civclient.c:396
#, fuzzy, c-format
msgid "Default metaserver has been set to \"%s\"."
msgstr "Opcje: %s zostało ustawione na \"%s\"."
-#: client/civclient.c:550
+#: client/civclient.c:540
msgid "Game started."
msgstr "Gra rozpoczęta."
-#: client/civclient.c:588
+#: client/civclient.c:606
msgid "There was an error while auto connecting; aborting."
msgstr "Wystąpił błąd podczas automatycznego łączenia; kończę pracę."
@@ -8130,17 +8266,17 @@ msgstr "Połączenie jest nawiązywane."
msgid "Disconnected from server."
msgstr "Rozłączono z serwerem."
-#: client/clinet.c:469
+#: client/clinet.c:473
#, c-format
msgid "Failed to contact server \"%s\" at port %d as \"%s\" after %d attempts"
msgstr ""
"Nieudane połączenie z serwerem \"%s\" przez port %d jako \"%s\" po %d próbach"
-#: client/clinet.c:484 client/clinet.c:486
+#: client/clinet.c:488 client/clinet.c:490
msgid "Connection to server refused. Please start the server."
msgstr "Odmówiono połączenia z serwerem. Może powinieneś uruchomić serwer?"
-#: client/clinet.c:495 client/clinet.c:523
+#: client/clinet.c:499 client/clinet.c:527
#, c-format
msgid ""
"Error contacting server \"%s\" at port %d as \"%s\":\n"
@@ -8149,7 +8285,7 @@ msgstr ""
"Wystąpił błąd podczas łączenia z serwerem \"%s\" przez port %d jako \"%s\":\n"
" %s\n"
-#: client/clinet.c:514
+#: client/clinet.c:518
#, c-format
msgid ""
"Auto-connecting to server \"%s\" at port %d as \"%s\" every %f second(s) for "
@@ -8158,53 +8294,53 @@ 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:1358
+#: client/connectdlg_common.c:78 client/gui-gtk-2.0/pages.c:1358
msgid "novice"
msgstr "nowicjusz"
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1358
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
msgid "easy"
msgstr "Å‚atwy"
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1359
msgid "normal"
msgstr "normalny"
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr "trudny"
-#: client/connectdlg_common.c:83
+#: client/connectdlg_common.c:82
msgid "experimental"
msgstr "eksperymentalny"
-#: client/connectdlg_common.c:213
+#: client/connectdlg_common.c:212
msgid "Starting server..."
msgstr "StartujÄ™ serwer..."
-#: client/connectdlg_common.c:332
+#: client/connectdlg_common.c:331
msgid "Couldn't start the server."
msgstr "Nie mogę wystartować serwera."
-#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
+#: client/connectdlg_common.c:332 client/connectdlg_common.c:365
msgid "You'll have to start one manually. Sorry..."
msgstr "Musisz uruchomić go ręcznie. Przepraszamy..."
-#: client/connectdlg_common.c:364
+#: client/connectdlg_common.c:363
msgid "Couldn't connect to the server."
msgstr "Nie można się połączyć z serwerem."
-#: client/connectdlg_common.c:365
+#: client/connectdlg_common.c:364
msgid "We probably couldn't start it from here."
msgstr "Prawdopodobnie nie można wystartować go w ten sposób."
-#: client/connectdlg_common.c:470
+#: client/connectdlg_common.c:469
#, fuzzy
msgid ""
"Established control over the server. You have command access level 'hack'."
msgstr "Mamy kontrolę nad serwerem (poziom dostępu hack)"
-#: client/connectdlg_common.c:475
+#: client/connectdlg_common.c:474
msgid ""
"Failed to obtain the required access level to take control of the server. "
"The server will now be shutdown."
@@ -8214,27 +8350,27 @@ msgstr ""
msgid "Only transporter units can be unloaded."
msgstr "Jedynie jednostki transportowe można rozładowywać."
-#: client/control.c:1425
+#: client/control.c:1417
msgid "Only settler units can be put into auto mode."
msgstr "Jedynie jednostki osadnicze mogą być przełączone w tryb auto."
-#: client/control.c:1516
+#: client/control.c:1511
msgid "Only nuclear units can do this."
msgstr "Mogą to zrobić tylko jednostki nuklearne."
-#: client/control.c:1545
+#: client/control.c:1540
msgid "Only paratrooper units can do this."
msgstr "Mogą to zrobić tylko jednostki spadochronowe."
-#: client/control.c:2020
+#: client/control.c:2015
msgid "Too far for this unit."
msgstr "Zbyt daleko dla tej jednostki."
-#: client/control.c:2230 client/control.c:2260 client/control.c:2276
+#: client/control.c:2225 client/control.c:2255 client/control.c:2271
msgid "Didn't find a route to the destination!"
msgstr "Nie znalazłem trasy do celu!"
-#: client/control.c:2320
+#: client/control.c:2315
msgid "Oh my! You seem to have no capital!"
msgstr "Co? Nie masz stolicy!??????"
@@ -8655,30 +8791,38 @@ 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:1066 client/helpdata.c:1400
+#: client/helpdata.c:1066 client/helpdata.c:1408
msgid " or "
msgstr " lub "
-#: client/helpdata.c:1068 client/helpdata.c:1388
+#: client/helpdata.c:1068 client/helpdata.c:1396
msgid "?or:, "
msgstr "?or:, "
-#: client/helpdata.c:1080
-#, 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"
+#: client/helpdata.c:1079
+#, fuzzy, c-format
+msgid "* Unit has to be in a city, or a base after %d turn.\n"
+msgid_plural "* Unit has to be in a city, or a base after %d turns.\n"
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:1122
+#: client/helpdata.c:1087
+#, fuzzy, c-format
+msgid "* Unit has to be in a city, a base, or on a %s after %d turn.\n"
+msgid_plural "* Unit has to be in a city, a base, or on a %s after %d turns.\n"
+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:1130
#, 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:1127
+#: client/helpdata.c:1135
#, c-format
msgid ""
"To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8687,88 +8831,88 @@ msgstr ""
"Aby osiągnąć %s potrzebujemy %d dodatkowych technologii. Cały projekt "
"wymagał będzie %d punktów odkryć."
-#: client/helpdata.c:1135
+#: client/helpdata.c:1143
msgid "You cannot research this technology."
msgstr "Nie możesz odkryć tej technologii."
-#: client/helpdata.c:1139
+#: client/helpdata.c:1147
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:1151
+#: client/helpdata.c:1159
#, 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:1156
+#: client/helpdata.c:1164
#, 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:1159
+#: client/helpdata.c:1167
#, 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:1163
+#: client/helpdata.c:1171
msgid "* Increases the pollution generated by the population.\n"
msgstr "* Zwiększa zanieczyszczenie powodowane przez populację.\n"
-#: client/helpdata.c:1168
+#: client/helpdata.c:1176
#, c-format
msgid "* Allows %s to build roads on river squares.\n"
msgstr "* Pozwala %s budować drogi na rzekach.\n"
-#: client/helpdata.c:1175
+#: client/helpdata.c:1183
#, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr "* Pozwala %s budować fortece.\n"
-#: client/helpdata.c:1183
+#: client/helpdata.c:1191
#, c-format
msgid "* Allows %s to build airbases.\n"
msgstr "* Pozwala %s budować bazy lotnicze.\n"
-#: client/helpdata.c:1192
+#: client/helpdata.c:1200
#, c-format
msgid "* Allows %s to upgrade roads to railroads.\n"
msgstr "* Pozwala %s ulepszać drogi do kolei.\n"
-#: client/helpdata.c:1200
+#: client/helpdata.c:1208
#, 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:1234
+#: client/helpdata.c:1242
msgid "* Pollution cannot be generated on this terrain."
msgstr "* Na tym terenie nie występują skażenia."
-#: client/helpdata.c:1239
+#: client/helpdata.c:1247
msgid "* You cannot build cities on this terrain."
msgstr "* Nie można budować miast na tym terenie."
-#: client/helpdata.c:1245
+#: client/helpdata.c:1253
msgid "* The coastline of this terrain is unsafe."
msgstr "* Linia brzegowa tego terenu nie jest bezpieczna."
-#: client/helpdata.c:1250
+#: client/helpdata.c:1258
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:1255
+#: client/helpdata.c:1263
msgid "* Land units cannot travel on oceanic terrains."
msgstr "* Jednostki lądowe nie mogą podróżować po polach morskich."
-#: client/helpdata.c:1305
+#: client/helpdata.c:1313
msgid "Features:\n"
msgstr "Właściwości:\n"
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1411 client/helpdata.c:1412
+#: client/helpdata.c:1419 client/helpdata.c:1420
msgid "?outputlist: Nothing "
msgstr ""
-#: client/helpdata.c:1419
+#: client/helpdata.c:1427
#, fuzzy, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -8786,7 +8930,7 @@ msgstr[2] ""
"* Jednostki militarne poza miastem i granicami będą powodować %d "
"niezadowolenia.\n"
-#: client/helpdata.c:1429
+#: client/helpdata.c:1437
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8796,23 +8940,23 @@ msgstr ""
"o %d.\n"
#. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1437
+#: client/helpdata.c:1445
#, 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:1442
+#: client/helpdata.c:1450
#, 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:1447
+#: client/helpdata.c:1455
#, 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:1451
+#: client/helpdata.c:1459
#, fuzzy
msgid "* You pay no upkeep for your units.\n"
msgstr "* PÅ‚acisz %d-krotnie stawki za swoje jednostki.\n"
@@ -8820,25 +8964,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:1460
+#: client/helpdata.c:1468
#, 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:1468
+#: client/helpdata.c:1476
#, 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:1475
+#: client/helpdata.c:1483
#, 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:1482
+#: client/helpdata.c:1490
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -8848,7 +8992,7 @@ msgstr ""
"pojawić się gdy masz %d miast.\n"
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1489
+#: client/helpdata.c:1497
#, c-format
msgid ""
"* After the first unhappy citizen due to city size, for each %d additional "
@@ -8857,18 +9001,18 @@ msgstr ""
"* Za każde dodatkowe %d miast jeden niezadowolony mieszkaniec będzie się "
"pojawiał w miastach.\n"
-#: client/helpdata.c:1497
+#: client/helpdata.c:1505
#, 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:1502
+#: client/helpdata.c:1510
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr "Nie posiada ograniczeń podatków na naukę/złoto/luksusy.\n"
-#: client/helpdata.c:1507
+#: client/helpdata.c:1515
#, fuzzy, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -8886,7 +9030,7 @@ msgstr[2] ""
"* Możesz wprowadzać stan wojenny. Jednostki militarne będą zadowalać po %d "
"mieszkańców.\n"
-#: client/helpdata.c:1519
+#: client/helpdata.c:1527
#, 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"
@@ -8895,7 +9039,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:1530
+#: client/helpdata.c:1538
#, c-format
msgid ""
"* You may grow your cities by means of celebrations. Your cities must be at "
@@ -8904,15 +9048,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:1536
+#: client/helpdata.c:1544
msgid "* Your units cannot be bribed.\n"
msgstr "* Twoje jednostki nie mogą zostać przekupione.\n"
-#: client/helpdata.c:1539
+#: client/helpdata.c:1547
msgid "* Your cities cannot be incited.\n"
msgstr "* Twoje miasta nie mogą zostać przekupione.\n"
-#: client/helpdata.c:1543
+#: client/helpdata.c:1551
msgid ""
"* Government will fall into anarchy if any city is in disorder for more than "
"two turns in a row.\n"
@@ -8920,16 +9064,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:1549
+#: client/helpdata.c:1557
msgid "* Has a senate that may prevent declaration of war.\n"
msgstr "* Senatu może blokować wypowiadanie wojen.\n"
-#: client/helpdata.c:1553
+#: client/helpdata.c:1561
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:1557
+#: client/helpdata.c:1565
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
@@ -8937,25 +9081,25 @@ msgstr ""
"* Budynki, które normalnie zmniejszają niezadowolenie będą produkować "
"złoto.\n"
-#: client/helpdata.c:1561
+#: client/helpdata.c:1569
msgid "* Pays no upkeep for fanatics.\n"
msgstr "* Nie płacisz utrzymania za fanatyków.\n"
-#: client/helpdata.c:1564
+#: client/helpdata.c:1572
msgid "* Has no unhappy citizens.\n"
msgstr "* Nie ma niezadowolonych mieszkańców.\n"
-#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
+#: client/helpdata.c:1582 client/helpdata.c:1586 client/helpdata.c:1590
#, c-format
msgid "* Veteran %s units.\n"
msgstr "* Czyni %s bardziej doświadoczonymi.\n"
-#: client/helpdata.c:1585
+#: client/helpdata.c:1593
msgid "* Veteran units.\n"
msgstr "* Czyni jednostki weteranami.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1591
+#: client/helpdata.c:1599
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8965,7 +9109,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:1600
+#: client/helpdata.c:1608
#, fuzzy, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8975,7 +9119,7 @@ msgstr ""
"%d dodatkowy %s podczas świętowania.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1608
+#: client/helpdata.c:1616
#, fuzzy, c-format
msgid "* Each worked tile with at least 1 %s will yield %d more of it.\n"
msgstr ""
@@ -8983,66 +9127,66 @@ msgstr ""
"%d dodatkowy %s.\n"
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1617
+#: client/helpdata.c:1625
#, 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:1625
+#: client/helpdata.c:1633
#, 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:1630
+#: client/helpdata.c:1638
#, 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:1635
+#: client/helpdata.c:1643
#, 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:1643
+#: client/helpdata.c:1651
#, 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:1649
+#: client/helpdata.c:1657
#, 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:1655
+#: client/helpdata.c:1663
#, 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:1672
+#: client/helpdata.c:1680
#, c-format
msgid "* Allows you to build %s.\n"
msgstr "* Pozwala budować %s.\n"
#. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1699
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d %s"
msgstr "%s%d %s"
-#: client/helpdata.c:1700 client/helpdata.c:1708 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1708 client/helpdata.c:1716 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:1707
+#: client/helpdata.c:1715
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d wzburzony"
@@ -9117,7 +9261,7 @@ msgstr ""
"To jest domyślny port serwera używany w oknie połączenia lub przy użyciu "
"opcji -a z lini poleceń."
-#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:916 data/Freeciv.in:107
msgid "Metaserver"
msgstr "Metaserwer"
@@ -9521,36 +9665,36 @@ msgstr "Zapis nieudany, nie można zapisać do pliku %s"
msgid "Saved settings to file %s"
msgstr "Zapisano ustawienia w pliku %s"
-#: client/packhand.c:211 client/packhand.c:217
+#: client/packhand.c:212 client/packhand.c:218
#, fuzzy
msgid "You were rejected from the game...."
msgstr "Próba przyłączenia do serwera nie powiodła się:"
-#: client/packhand.c:229
+#: client/packhand.c:230
#, c-format
msgid "Client capability string: %s"
msgstr "Napis określający funkcjonalność klienta: %s"
-#: client/packhand.c:232
+#: client/packhand.c:233
#, c-format
msgid "Server capability string: %s"
msgstr "Napis określający funkcjonalność serwera: %s"
-#: client/packhand.c:850
+#: client/packhand.c:864
#, c-format
msgid "Start of turn %d"
msgstr "PoczÄ…tek %d tury"
-#: client/packhand.c:1591
+#: client/packhand.c:1621
#, c-format
msgid "AI Mode is now %s."
msgstr "Tryb AI jest teraz %s."
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "ON"
msgstr "Aktywny"
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "OFF"
msgstr "Nieaktywny"
@@ -9581,15 +9725,15 @@ msgstr "?Player:ImiÄ™"
msgid "Username"
msgstr "Nazwa użytkownika"
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
-#: client/gui-gtk-2.0/pages.c:2157
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:653
+#: client/gui-gtk-2.0/pages.c:1604 client/gui-gtk-2.0/pages.c:2159
msgid "Flag"
msgstr "Flaga"
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1605
-#: client/gui-gtk-2.0/pages.c:2159 client/gui-sdl/repodlgs.c:2063
-#: client/gui-win32/connectdlg.c:990 client/gui-win32/dialogs.c:542
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:657
+#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1609
+#: client/gui-gtk-2.0/pages.c:2161 client/gui-sdl/repodlgs.c:2063
+#: client/gui-win32/connectdlg.c:992 client/gui-win32/dialogs.c:542
#: client/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "Naród"
@@ -9602,7 +9746,7 @@ msgstr "Granica"
msgid "Score"
msgstr "Punktacja"
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1614
msgid "Team"
msgstr "Zespół"
@@ -9635,36 +9779,36 @@ msgstr "?Player_dlg:Bezczynność"
msgid "Ping"
msgstr "Ping"
-#: client/repodlgs_common.c:375
+#: client/repodlgs_common.c:378
msgid "You cannot sell improvements."
msgstr "Nie możesz sprzedawać budynków."
-#: client/repodlgs_common.c:391
+#: client/repodlgs_common.c:394
#, c-format
msgid "Sold %d %s for %d gold."
msgstr "Sprzedana %d %s za %d złota."
-#: client/repodlgs_common.c:396
+#: client/repodlgs_common.c:399
#, 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:415
+#: client/repodlgs_common.c:418
msgid "You cannot disband units."
msgstr "Nie możesz rozpraszać jednostek."
-#: client/repodlgs_common.c:420
+#: client/repodlgs_common.c:423
#, c-format
msgid "%s cannot be disbanded."
msgstr "Jednostka %s nie może być rozproszona."
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:444
#, c-format
msgid "Disbanded %d %s."
msgstr "RozwiÄ…zano %d %s."
-#: client/repodlgs_common.c:445
+#: client/repodlgs_common.c:448
#, c-format
msgid "No %s could be disbanded."
msgstr "Nie udało się rozproszyć żadnej jednostki %s."
@@ -10269,47 +10413,47 @@ msgstr "?dys/hrs:%ddni %d godz"
msgid "?duration:overflow"
msgstr "?duration:błąd"
-#: client/text.c:1143
+#: client/text.c:1145
#, c-format
msgid "%6d.%02d ms"
msgstr "%6d.%02d ms"
#. TRANS: <nation adjective> <government name>.
#. * E.g. "Polish Republic".
-#: client/text.c:1188
+#: client/text.c:1193
#, fuzzy, c-format
msgid "?nationgovernment:%s %s"
msgstr "Ustrój: %s"
#. TRANS: "Observer: 1985"
-#: client/text.c:1198
+#: client/text.c:1203
#, c-format
msgid "Observer: %s"
msgstr "Obserwator: %s"
-#: client/text.c:1216
+#: client/text.c:1221
msgid "Buildings: "
msgstr "Budynki: "
-#: client/text.c:1233 client/text.c:1272
+#: client/text.c:1238 client/text.c:1277
msgid "None. "
msgstr "Brak. "
-#: client/text.c:1235 client/text.c:1274
+#: client/text.c:1240 client/text.c:1279
msgid "?clistend:."
msgstr "."
-#: client/text.c:1253
+#: client/text.c:1258
msgid "Wonders: "
msgstr "Cuda: "
-#: client/text.c:1308
+#: client/text.c:1313
#, 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:1312
+#: client/text.c:1317
#, fuzzy, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
@@ -10318,7 +10462,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:1318
+#: client/text.c:1323
#, fuzzy, c-format
msgid "%d additional unhappy citizen."
msgid_plural "%d additional unhappy citizens."
@@ -10326,12 +10470,12 @@ msgstr[0] "%d dodatkowi(y) nieszczęśliwy(i)."
msgstr[1] "%d dodatkowi(y) nieszczęśliwy(i)."
msgstr[2] "%d dodatkowi(y) nieszczęśliwy(i)."
-#: client/text.c:1339
+#: client/text.c:1344
#, fuzzy
msgid "Unlimited martial law in effect."
msgstr "Stan wojenny ("
-#: client/text.c:1341
+#: client/text.c:1346
#, fuzzy, c-format
msgid "%d military unit may impose martial law."
msgid_plural "Up to %d military units may impose martial law."
@@ -10342,7 +10486,7 @@ msgstr[1] ""
msgstr[2] ""
"* Jednostka niezmilitaryzowana (bez możliwości przeprowadzania ataku).\n"
-#: client/text.c:1345
+#: client/text.c:1350
#, fuzzy, c-format
msgid "Each military unit makes %d unhappy citizen content."
msgid_plural "Each military unit makes %d unhappy citizens content."
@@ -10356,35 +10500,35 @@ msgstr[2] ""
"Dostarcza rozrywki mieszkańcom, czyniąc 3 nieszczęśliwych obywateli "
"zadowolonymi."
-#: client/text.c:1352
+#: client/text.c:1357
msgid "Military units in the field may cause unhappiness. "
msgstr "Jednostki militarne w mieście mogą powodować niezadowolenie. "
-#: client/text.c:1355
+#: client/text.c:1360
msgid "Military units have no happiness effect. "
msgstr "Jednostki militarne nie mają wpływu na zadowolenie. "
-#: client/text.c:1370
+#: client/text.c:1375
#, c-format
msgid "Luxury: %d total."
msgstr "Luksus: ogółem %d."
-#: client/tilespec.c:865
+#: client/tilespec.c:882
msgid "No usable default tileset found, aborting!"
msgstr "Nie znalazłem odpowiedniego zestawu graficznego, kończę pracę!"
-#: client/tilespec.c:1338
+#: client/tilespec.c:1355
msgid ""
"Client does not support isometric tilesets. Using default tileset instead."
msgstr "Klient nie obsługuje izometrycznej grafiki. Używam domyślnego zestawu."
-#: client/tilespec.c:1347
+#: client/tilespec.c:1364
msgid ""
"Client does not support overhead view tilesets. Using default tileset "
"instead."
msgstr "Klient nie obsługuje 'wystającej' grafiki. Używam domyślnego zestawu."
-#: client/tilespec.c:3966
+#: client/tilespec.c:3987
#, fuzzy, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -11076,7 +11220,7 @@ msgid "_Display"
msgstr "Po_każ"
#: client/gui-gtk-2.0/cityrep.c:1006 client/gui-gtk-2.0/menu.c:839
-#: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
+#: client/gui-sdl/diplodlg.c:692 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
#: client/gui-xaw/cityrep.c:533 client/gui-xaw/menu.c:156
@@ -11249,197 +11393,197 @@ msgstr "Jaka powinna być nazwa nowego schematu?"
msgid "Remove this preset?"
msgstr "Usunąć ten schemat?"
-#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:222
+#: client/gui-gtk-2.0/dialogs.c:197 client/gui-gtk-2.0/messagewin.c:222
msgid "Goto _Location"
msgstr "_Idź do miejsca zdarzenia"
-#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
+#: client/gui-gtk-2.0/dialogs.c:202 client/gui-gtk-2.0/messagewin.c:226
#, fuzzy
msgid "Inspect _City"
msgstr "_Wyświetl miasto"
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:258 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:258 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:259 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:311 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:312 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:312 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:313 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:506
+#: client/gui-gtk-2.0/dialogs.c:507
msgid "Unit"
msgstr "Jednostka"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:950
-#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2155
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:985
+#: client/gui-gtk-2.0/dialogs.c:508 client/gui-gtk-2.0/pages.c:950
+#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2157
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:987
#: 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:519 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:520 client/gui-sdl/dialogs.c:627
msgid "Unit selection"
msgstr "Wybór jednostki"
-#: client/gui-gtk-2.0/dialogs.c:582
+#: client/gui-gtk-2.0/dialogs.c:583
msgid "_Ready all"
msgstr "Zaznacz _wszystkie"
-#: client/gui-gtk-2.0/dialogs.c:590
+#: client/gui-gtk-2.0/dialogs.c:591
msgid "_Sentry idle"
msgstr "W_artuj bezczynne jednostki"
-#: client/gui-gtk-2.0/dialogs.c:719
+#: client/gui-gtk-2.0/dialogs.c:721
#, fuzzy
msgid "Nation _Groups:"
msgstr "_Narody:"
-#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:766 data/Freeciv.in:3128
msgid "What Nation Will You Be?"
msgstr "Wybór narodu"
-#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
-#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
+#: client/gui-gtk-2.0/dialogs.c:768 client/gui-sdl/chatline.c:842
+#: client/gui-win32/connectdlg.c:1040 data/Freeciv.in:3371
msgid "Pick Nation"
msgstr "Wybierz naród"
-#: client/gui-gtk-2.0/dialogs.c:774
+#: client/gui-gtk-2.0/dialogs.c:776
#, fuzzy
msgid "_Random Nation"
msgstr "Losowy naród"
-#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:792 client/gui-win32/dialogs.c:517
msgid "Select a nation"
msgstr "Wybierz naród"
-#: client/gui-gtk-2.0/dialogs.c:804
+#: client/gui-gtk-2.0/dialogs.c:810
msgid "_Properties"
msgstr "_Właściwości"
-#: client/gui-gtk-2.0/dialogs.c:824
+#: client/gui-gtk-2.0/dialogs.c:830
msgid "_Leader:"
msgstr "_Przywódca:"
-#: client/gui-gtk-2.0/dialogs.c:831
+#: client/gui-gtk-2.0/dialogs.c:837
msgid "_Female"
msgstr "Kobiet_a"
-#: client/gui-gtk-2.0/dialogs.c:836
+#: client/gui-gtk-2.0/dialogs.c:842
msgid "_Male"
msgstr "_Mężczyzna"
-#: client/gui-gtk-2.0/dialogs.c:863
+#: client/gui-gtk-2.0/dialogs.c:869
#, fuzzy
msgid "City _Styles:"
msgstr "_Styl miast:"
-#: client/gui-gtk-2.0/dialogs.c:902
+#: client/gui-gtk-2.0/dialogs.c:908
#, fuzzy
msgid "_Description"
msgstr "O_pis"
-#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1263 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:1253 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1268 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:1262 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1277 client/gui-sdl/dialogs.c:2204
#: 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:1306 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1318 client/gui-win32/citydlg.c:1454
#: data/Freeciv.in:2484
msgid "Upgrade Unit!"
msgstr "Ulepsz jednostkÄ™!"
-#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1327 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 "Ulepsz przestarzałe jednostki"
-#: client/gui-gtk-2.0/diplodlg.c:231 client/gui-win32/diplodlg.c:151
+#: client/gui-gtk-2.0/diplodlg.c:222 client/gui-win32/diplodlg.c:151
#: client/gui-xaw/diplodlg.c:383 client/gui-xaw/diplodlg.c:401
msgid "World-map"
msgstr "Mapa Åšwiata"
-#: client/gui-gtk-2.0/diplodlg.c:237 client/gui-win32/diplodlg.c:146
+#: client/gui-gtk-2.0/diplodlg.c:228 client/gui-win32/diplodlg.c:146
#: client/gui-xaw/diplodlg.c:387 client/gui-xaw/diplodlg.c:405
msgid "Sea-map"
msgstr "Mapa morska"
-#: client/gui-gtk-2.0/diplodlg.c:243
+#: client/gui-gtk-2.0/diplodlg.c:234
msgid "_Maps"
msgstr "_Mapy"
-#: client/gui-gtk-2.0/diplodlg.c:274
+#: client/gui-gtk-2.0/diplodlg.c:265
msgid "_Advances"
msgstr "_Wynalazki"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/diplodlg.c:315 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "_Miasta"
-#: client/gui-gtk-2.0/diplodlg.c:333
+#: client/gui-gtk-2.0/diplodlg.c:324
msgid "_Give shared vision"
msgstr "Daj w_idok dzielony"
-#: client/gui-gtk-2.0/diplodlg.c:346
+#: client/gui-gtk-2.0/diplodlg.c:337
msgid "Give _embassy"
msgstr "Daj ambasadÄ™"
-#: client/gui-gtk-2.0/diplodlg.c:376
+#: client/gui-gtk-2.0/diplodlg.c:368
msgid "_Pacts"
msgstr "_Pakty"
-#: client/gui-gtk-2.0/diplodlg.c:466
+#: client/gui-gtk-2.0/diplodlg.c:458
#, c-format
msgid "Diplomacy: %s"
msgstr "Dyplomacja: %s"
-#: client/gui-gtk-2.0/diplodlg.c:473
+#: client/gui-gtk-2.0/diplodlg.c:465
msgid "_Cancel meeting"
msgstr "P_rzerwij spotkanie"
-#: client/gui-gtk-2.0/diplodlg.c:475
+#: client/gui-gtk-2.0/diplodlg.c:467
msgid "Accept _treaty"
msgstr "Zatwierdź _traktat"
-#: client/gui-gtk-2.0/diplodlg.c:503
+#: client/gui-gtk-2.0/diplodlg.c:495
msgid "C_lauses:"
msgstr "_Klauzule:"
-#: client/gui-gtk-2.0/diplodlg.c:568 client/gui-gtk-2.0/diplodlg.c:642
+#: client/gui-gtk-2.0/diplodlg.c:560 client/gui-gtk-2.0/diplodlg.c:634
msgid "_Gold:"
msgstr "ZÅ‚_oto:"
-#: client/gui-gtk-2.0/diplodlg.c:580 client/gui-gtk-2.0/diplodlg.c:654
+#: client/gui-gtk-2.0/diplodlg.c:572 client/gui-gtk-2.0/diplodlg.c:646
msgid "_Add Clause..."
msgstr "_Dodaj klauzulÄ™..."
-#: client/gui-gtk-2.0/diplodlg.c:699
+#: client/gui-gtk-2.0/diplodlg.c:691
msgid "--- This treaty is blank. Please add some clauses. ---"
msgstr "--- Ten traktat nie zawiera żadnych klauzul. ---"
-#: client/gui-gtk-2.0/diplodlg.c:905 client/gui-sdl/diplodlg.c:375
+#: client/gui-gtk-2.0/diplodlg.c:897 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 "Określono niepoprawną ilość złota."
@@ -11499,19 +11643,19 @@ msgstr "Wybierz cel"
msgid "Show _All Cities"
msgstr "Pokaż _wszystkie miasta"
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:164
msgid "Show Map Scrollbars"
msgstr "Pokazuj paski przewijania"
-#: client/gui-gtk-2.0/gui_main.c:163
+#: client/gui-gtk-2.0/gui_main.c:165
msgid "Disable this option to hide the scrollbars on the map view."
msgstr "Aby schować paski przewijania przy mapie, wyłącz tę opcję."
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:169
msgid "Keyboardless goto"
msgstr "Bezklawiaturowe GOTO"
-#: client/gui-gtk-2.0/gui_main.c:168
+#: client/gui-gtk-2.0/gui_main.c:170
msgid ""
"If this option is set then a goto may be initiated by left-clicking and then "
"holding down the mouse button while dragging the mouse onto a different tile."
@@ -11519,11 +11663,11 @@ msgstr ""
"Ta opcja pozwala na wydanie rozkazu Idż Do (GOTO) poprzez wciśnięcie lewego "
"przycisku myszy na jednostce i przeciągnięcia jej na wskazane pole."
-#: client/gui-gtk-2.0/gui_main.c:173
+#: client/gui-gtk-2.0/gui_main.c:175
msgid "Keep dialogs on top"
msgstr "Okna dialogowe na wierzchu"
-#: client/gui-gtk-2.0/gui_main.c:174
+#: client/gui-gtk-2.0/gui_main.c:176
msgid ""
"If this option is set then dialog windows will always remain in front of the "
"main Freeciv window. Disabling this has no effect in fullscreen mode."
@@ -11532,22 +11676,22 @@ msgstr ""
"na wierzchu okna głównego. W przypadku trybu pełnoekranowego nie ma ona "
"znaczenia."
-#: client/gui-gtk-2.0/gui_main.c:178
+#: client/gui-gtk-2.0/gui_main.c:180
msgid "Show worklist task icons"
msgstr "Pokazuj ikony na liście prac"
-#: client/gui-gtk-2.0/gui_main.c:179
+#: client/gui-gtk-2.0/gui_main.c:181
msgid ""
"Disabling this will turn off the unit and building icons in the worklist "
"dialog and the production tab of the city dialog."
msgstr ""
"Aby wyłączyć ikony budynków i jednostek w schemacie prac, wyłącz tę opję."
-#: client/gui-gtk-2.0/gui_main.c:183
+#: client/gui-gtk-2.0/gui_main.c:185
msgid "Enable status report tabs"
msgstr "Włącz zakładki statusu"
-#: client/gui-gtk-2.0/gui_main.c:184
+#: client/gui-gtk-2.0/gui_main.c:186
msgid ""
"If this option is enabled then report dialogs will be shown as separate tabs "
"rather than in popup dialogs."
@@ -11555,11 +11699,11 @@ msgstr ""
"Ta opcja sprawia, że różne raporty będą pokazane w osobnych zakładkach, a "
"nie w wyskakujÄ…cych okienkach."
-#: client/gui-gtk-2.0/gui_main.c:189 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:191 client/gui-win32/gui_main.c:110
msgid "Better fog-of-war drawing"
msgstr "Åadniejsza mgÅ‚a wojny"
-#: client/gui-gtk-2.0/gui_main.c:190 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:192 client/gui-win32/gui_main.c:111
msgid ""
"If this is enabled then a better method is used for drawing fog-of-war. It "
"is not any slower but will consume about twice as much memory."
@@ -11568,41 +11712,41 @@ msgstr ""
"wojny(FOW). Metoda ta nie jest wolniejsza, ale zużywa dwukrotnie więcej "
"pamięci."
-#: client/gui-gtk-2.0/gui_main.c:195
+#: client/gui-gtk-2.0/gui_main.c:197
msgid "Show time for each chat message"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:196
+#: client/gui-gtk-2.0/gui_main.c:198
msgid ""
"If this option is enabled then all chat messages will be prefixed by a time "
"string of the form [hour:minute:second]."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:201
+#: client/gui-gtk-2.0/gui_main.c:203
msgid "Split bottom notebook area"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:202
+#: client/gui-gtk-2.0/gui_main.c:204
msgid ""
"Enabling this option will split the bottom notebook into a left and right "
"notebook so that two tabs may be viewed at once."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:207
+#: client/gui-gtk-2.0/gui_main.c:209
msgid "New message events go to top of list"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:208
+#: client/gui-gtk-2.0/gui_main.c:210
msgid ""
"If this option is enabled, new events in the message window will appear at "
"the top of the list, rather than being appended at the bottom."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:213
+#: client/gui-gtk-2.0/gui_main.c:215
msgid "Show extra message window buttons"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:214
+#: client/gui-gtk-2.0/gui_main.c:216
msgid ""
"If this option is enabled, there will be two buttons displayed in the "
"message window for inspecting a city and going to a location. If this option "
@@ -11612,21 +11756,21 @@ msgid ""
"closed and reopened."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:224
+#: client/gui-gtk-2.0/gui_main.c:226
msgid "Metaserver tab first in network page"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:225
+#: client/gui-gtk-2.0/gui_main.c:227
msgid ""
"If this option is enabled, the metaserver tab will be the first notebook tab "
"in the network page. This option requires a restart in order to take effect."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:230
+#: client/gui-gtk-2.0/gui_main.c:232
msgid "Plain chat messages are sent to allies only"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:231
+#: client/gui-gtk-2.0/gui_main.c:233
msgid ""
"If this option is enabled, then plain messages typed into the chat entry "
"while the game is running will only be sent to your allies. Otherwise plain "
@@ -11636,28 +11780,41 @@ msgid ""
"visible in multiplayer games)."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:340 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:245
+msgid "Arrange widgets for small displays"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:246
+msgid ""
+"If this option is enabled, widgets in the main window will be arrange so "
+"that they take up the least amount of total screen space. Specifically, the "
+"left panel containing the overview, player status, and the unit information "
+"box will be extended over the entire left side of the window. This option "
+"requires a restart in order to take effect."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:352 client/gui-xaw/gui_main.c:245
msgid ""
"This client has no special command line options\n"
"\n"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
+#: client/gui-gtk-2.0/gui_main.c:847 client/gui-gtk-2.0/gui_main.c:1542
msgid "Freeciv"
msgstr "Freeciv"
-#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
+#: client/gui-gtk-2.0/gui_main.c:1251 client/gui-gtk-2.0/gui_main.c:1258
#: client/gui-sdl/mapctrl.c:1566 client/gui-win32/gui_main.c:482
#: data/Freeciv.in:2618
msgid "Turn Done"
msgstr "Koniec tury"
-#: client/gui-gtk-2.0/gui_main.c:1232 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1258 client/gui-sdl/mapctrl.c:1566
#: client/gui-sdl/mapview.c:1082
msgid "Shift+Return"
msgstr "Shift+Enter"
-#: client/gui-gtk-2.0/gui_main.c:1266 client/gui-gtk-2.0/menu.c:797
+#: client/gui-gtk-2.0/gui_main.c:1299 client/gui-gtk-2.0/menu.c:797
#: client/gui-gtk-2.0/menu.c:799 client/gui-gtk-2.0/menu.c:801
#: client/gui-gtk-2.0/menu.c:803 client/gui-gtk-2.0/menu.c:805
#: client/gui-gtk-2.0/menu.c:807 client/gui-gtk-2.0/menu.c:809
@@ -11676,11 +11833,11 @@ msgstr "Shift+Enter"
msgid "View"
msgstr "Widok"
-#: client/gui-gtk-2.0/gui_main.c:1359
+#: client/gui-gtk-2.0/gui_main.c:1393
msgid "Chat"
msgstr "Chat"
-#: client/gui-gtk-2.0/gui_main.c:1377 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1411 client/gui-win32/gui_main.c:538
#: data/Freeciv.in:2809
msgid ""
"Freeciv is free software and you are welcome to distribute copies of it\n"
@@ -11691,82 +11848,82 @@ msgstr ""
"określonymi warunkami; Zobacz \"Kopiowanie\" w menu Pomoc.\n"
"A teraz im dokop!!!"
-#: client/gui-gtk-2.0/gui_main.c:1392
+#: client/gui-gtk-2.0/gui_main.c:1426
msgid "Allies Only"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1657
+#: client/gui-gtk-2.0/gui_main.c:1691
msgid "Not _ready"
msgstr "Nie _przygotowany"
-#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
+#: client/gui-gtk-2.0/gui_main.c:1702 client/gui-gtk-2.0/pages.c:1679
msgid "_Ready"
msgstr "_Gotowy"
-#: client/gui-gtk-2.0/gui_main.c:1672 client/gui-gtk-2.0/gui_main.c:1678
-#: client/gui-gtk-2.0/pages.c:2204
+#: client/gui-gtk-2.0/gui_main.c:1706 client/gui-gtk-2.0/gui_main.c:1712
+#: client/gui-gtk-2.0/pages.c:2206
msgid "_Start"
msgstr "_Start"
-#: client/gui-gtk-2.0/gui_main.c:1686
+#: client/gui-gtk-2.0/gui_main.c:1720
#, fuzzy
msgid "_Take Player"
msgstr "Warstwa miast"
-#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
+#: client/gui-gtk-2.0/gui_main.c:1723 client/gui-gtk-2.0/pages.c:1669
msgid "Pick _Nation"
msgstr "Wybierz _naród"
-#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
+#: client/gui-gtk-2.0/gui_main.c:1730 client/gui-gtk-2.0/pages.c:1674
#, fuzzy
msgid "_Observe"
msgstr "_Obserwator"
-#: client/gui-gtk-2.0/gui_main.c:1698
+#: client/gui-gtk-2.0/gui_main.c:1732
#, fuzzy
msgid "Do not _observe"
msgstr "teraz _obserwuje"
-#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1755 client/gui-xaw/pages.c:211
msgid "<AI>"
msgstr "<AI>"
-#: client/gui-gtk-2.0/gui_main.c:1723
+#: client/gui-gtk-2.0/gui_main.c:1758
msgid "<Novice AI>"
msgstr "<AI - Nowicjusz>"
-#: client/gui-gtk-2.0/gui_main.c:1726
+#: client/gui-gtk-2.0/gui_main.c:1761
msgid "<Easy AI>"
msgstr "<AI - Åatwy>"
-#: client/gui-gtk-2.0/gui_main.c:1729
+#: client/gui-gtk-2.0/gui_main.c:1764
msgid "<Normal AI>"
msgstr "<AI - Normalny>"
-#: client/gui-gtk-2.0/gui_main.c:1732
+#: client/gui-gtk-2.0/gui_main.c:1767
msgid "<Hard AI>"
msgstr "<AI - Trudny>"
-#: client/gui-gtk-2.0/gui_main.c:1742 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1777 client/gui-win32/dialogs.c:594
#: client/gui-xaw/pages.c:217
msgid "Random"
msgstr "Losowy"
-#: client/gui-gtk-2.0/gui_main.c:1808
+#: client/gui-gtk-2.0/gui_main.c:1844 client/gui-gtk-2.0/gui_main.c:1858
#, fuzzy
msgid "Observer"
msgstr "Obserwator: %s"
-#: client/gui-gtk-2.0/gui_main.c:1808
+#: client/gui-gtk-2.0/gui_main.c:1858
#, fuzzy
msgid "Detached"
msgstr "Martwy"
-#: client/gui-gtk-2.0/gui_main.c:2073
+#: client/gui-gtk-2.0/gui_main.c:2117
msgid "Are you sure you want to quit?"
msgstr "Na pewno chcesz zakończyć?"
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
#, c-format
msgid ""
"Close Tab:\n"
@@ -11775,7 +11932,7 @@ msgstr ""
"Zamknij zakładkę:\n"
"%s"
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
msgid "Ctrl+W"
msgstr "Ctrl+W"
@@ -11880,8 +12037,8 @@ msgid "Trans. Rslt/Time:"
msgstr "Trans - wyn/czas:"
#: 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
-#: client/gui-win32/helpdlg.c:709 client/gui-win32/helpdlg.c:733
+#: client/gui-win32/helpdlg.c:502 client/gui-win32/helpdlg.c:550
+#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:739
#: client/gui-xaw/helpdlg.c:759 client/gui-xaw/helpdlg.c:808
#: client/gui-xaw/helpdlg.c:816 client/gui-xaw/helpdlg.c:853
#: client/gui-xaw/helpdlg.c:878
@@ -11929,34 +12086,34 @@ msgstr "razem z"
msgid "?techhelp:"
msgstr "?techhelp:"
-#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:591
+#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:597
#: client/gui-xaw/helpdlg.c:996
#, c-format
msgid "+%d Trade / %d"
msgstr "+%d handlu / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:595
+#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:601
#: client/gui-xaw/helpdlg.c:1000
#, c-format
msgid "no extra / %d"
msgstr "bez dodatków / %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
-#: client/gui-win32/helpdlg.c:602 client/gui-win32/helpdlg.c:616
-#: client/gui-win32/helpdlg.c:635 client/gui-xaw/helpdlg.c:1002
+#: client/gui-gtk-2.0/helpdlg.c:1085 client/gui-win32/helpdlg.c:604
+#: client/gui-win32/helpdlg.c:608 client/gui-win32/helpdlg.c:622
+#: client/gui-win32/helpdlg.c:641 client/gui-xaw/helpdlg.c:1002
#: client/gui-xaw/helpdlg.c:1006 client/gui-xaw/helpdlg.c:1020
#: client/gui-xaw/helpdlg.c:1039
msgid "n/a"
msgstr "n/d"
-#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:605
+#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:611
#: client/gui-xaw/helpdlg.c:1009
#, c-format
msgid "+%d Food / %d"
msgstr "+%d żywności / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:619
+#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:625
#: client/gui-xaw/helpdlg.c:1023
#, c-format
msgid "+%d Res. / %d"
@@ -12728,41 +12885,41 @@ 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:624 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:302
#: 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:779 client/gui-gtk-2.0/pages.c:820
-#: client/gui-win32/connectdlg.c:916
+#: client/gui-win32/connectdlg.c:918
msgid "Server Name"
msgstr "Nazwa serwera"
#: client/gui-gtk-2.0/pages.c:780 client/gui-gtk-2.0/pages.c:821
-#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:916
+#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:918
#: data/Freeciv.in:96
msgid "Port"
msgstr "Port"
#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Version"
msgstr "Wersja"
#: client/gui-gtk-2.0/pages.c:782 client/gui-gtk-2.0/pages.c:823
-#: client/gui-gtk-2.0/pages.c:2161 client/gui-win32/connectdlg.c:917
-#: client/gui-win32/connectdlg.c:995
+#: client/gui-gtk-2.0/pages.c:2163 client/gui-win32/connectdlg.c:919
+#: client/gui-win32/connectdlg.c:997
msgid "Status"
msgstr "Stan"
#: client/gui-gtk-2.0/pages.c:783 client/gui-gtk-2.0/pages.c:824
#: client/gui-sdl/connectdlg.c:318 client/gui-sdl/plrdlg.c:330
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Players"
msgstr "Gracze"
#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
-#: client/gui-win32/connectdlg.c:918
+#: client/gui-win32/connectdlg.c:920
msgid "Comment"
msgstr "Komentarz"
@@ -12794,9 +12951,9 @@ msgstr "Hasło:"
msgid "Conf_irm Password:"
msgstr "Potwierdź hasło:"
-#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2165
#: 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:1000
+#: client/gui-win32/citydlg.c:1083 client/gui-win32/connectdlg.c:1002
#: client/gui-win32/wldlg.c:800 client/gui-win32/wldlg.c:806
msgid "Type"
msgstr "Typ"
@@ -12897,7 +13054,7 @@ msgstr "Poziom trudności _AI:"
msgid "Ruleset _Version:"
msgstr "_Zestaw zasad:"
-#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2195
msgid "_More Game Options..."
msgstr "Więcej _opcji..."
@@ -12915,49 +13072,49 @@ msgstr "czeka"
msgid "Ready"
msgstr "Gotowy"
-#: client/gui-gtk-2.0/pages.c:1601
+#: client/gui-gtk-2.0/pages.c:1600
#, fuzzy
msgid "?player:Leader"
msgstr "?Player:ImiÄ™"
-#: client/gui-gtk-2.0/pages.c:1732 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1734 client/gui-sdl/chatline.c:185
msgid "Choose Saved Game to Load"
msgstr "Wybierz ZapisanÄ… GrÄ™"
-#: client/gui-gtk-2.0/pages.c:1824
+#: client/gui-gtk-2.0/pages.c:1826
msgid "Choose Saved Game to _Load:"
msgstr "Wybierz ZapisanÄ… GrÄ™:"
-#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
-#: client/gui-gtk-2.0/pages.c:2451
+#: client/gui-gtk-2.0/pages.c:1846 client/gui-gtk-2.0/pages.c:2039
+#: client/gui-gtk-2.0/pages.c:2455
msgid "_Browse..."
msgstr "_PrzeglÄ…daj..."
-#: client/gui-gtk-2.0/pages.c:1911
+#: client/gui-gtk-2.0/pages.c:1913
msgid "Choose a Scenario"
msgstr "Wybierz scenariusz"
-#: client/gui-gtk-2.0/pages.c:1998
+#: client/gui-gtk-2.0/pages.c:2000
msgid "Choose a _Scenario:"
msgstr "Wybierz _scenariusz:"
-#: client/gui-gtk-2.0/pages.c:2173
+#: client/gui-gtk-2.0/pages.c:2175
msgid "Choose a _nation to play:"
msgstr "Wybierz _naród:"
-#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2367 client/gui-win32/menu.c:581
msgid "Select Location to Save"
msgstr "Wybierz miejsce zapisu"
-#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2452 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "Zapisz _grÄ™"
-#: client/gui-gtk-2.0/pages.c:2489
+#: client/gui-gtk-2.0/pages.c:2493
msgid "Saved _Games:"
msgstr "Zapisane _gry:"
-#: client/gui-gtk-2.0/pages.c:2516
+#: client/gui-gtk-2.0/pages.c:2520
msgid "Save _Filename:"
msgstr "Zapisz w pliku:"
@@ -13308,7 +13465,7 @@ msgstr ""
msgid "Total users logged in : %d"
msgstr ""
-#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1098
msgid "Back"
msgstr "Cofnij"
@@ -13317,7 +13474,7 @@ msgid "Start"
msgstr "Start"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:777
+#: client/gui-win32/connectdlg.c:779
msgid "Load Game"
msgstr "Wczytać grę"
@@ -13359,9 +13516,9 @@ msgstr "Zmień pochodzenie"
#: client/gui-sdl/connectdlg.c:308 client/gui-sdl/connectdlg.c:617
#: client/gui-sdl/connectdlg.c:803 client/gui-sdl/connectdlg.c:985
#: client/gui-sdl/dialogs.c:452 client/gui-sdl/dialogs.c:2095
-#: client/gui-sdl/dialogs.c:2893 client/gui-sdl/diplomat_dialog.c:731
+#: client/gui-sdl/dialogs.c:2902 client/gui-sdl/diplomat_dialog.c:731
#: client/gui-sdl/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1043
#: client/gui-win32/dialogs.c:1772 client/gui-win32/finddlg.c:127
#: client/gui-win32/gotodlg.c:171 client/gui-win32/inputdlg.c:146
#: client/gui-win32/messagedlg.c:216 client/gui-win32/ratesdlg.c:328
@@ -13406,7 +13563,7 @@ msgid "Buy it?"
msgstr "Kup To!"
#: 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
+#: client/gui-sdl/diplodlg.c:1336 client/gui-sdl/diplomat_dialog.c:1211
#: client/gui-sdl/diplomat_dialog.c:1417 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:221 client/gui-sdl/repodlgs.c:1559
#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
@@ -13422,7 +13579,7 @@ msgid "No"
msgstr "Nie"
#: client/gui-sdl/citydlg.c:1215 client/gui-sdl/cma_fe.c:318
-#: client/gui-sdl/diplodlg.c:1345 client/gui-sdl/diplomat_dialog.c:1200
+#: client/gui-sdl/diplodlg.c:1346 client/gui-sdl/diplomat_dialog.c:1200
#: client/gui-sdl/diplomat_dialog.c:1407 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:232 client/gui-win32/repodlgs.c:578
#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
@@ -13756,7 +13913,7 @@ msgstr "Lista Serwerów Freeciv"
msgid "Port :"
msgstr "Port:"
-#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1100
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr "Połącz"
@@ -13874,23 +14031,23 @@ msgstr "Wybór nowego ustroju"
msgid "REVOLUTION!"
msgstr "REWOLUCJA..."
-#: client/gui-sdl/dialogs.c:2232 client/gui-sdl/dialogs.c:2620
+#: client/gui-sdl/dialogs.c:2237 client/gui-sdl/dialogs.c:2625
#: client/gui-win32/dialogs.c:567 data/Freeciv.in:3159
msgid "Female"
msgstr "Kobieta"
-#: client/gui-sdl/dialogs.c:2234 client/gui-sdl/dialogs.c:2618
-#: client/gui-sdl/dialogs.c:2830 client/gui-win32/dialogs.c:565
+#: client/gui-sdl/dialogs.c:2239 client/gui-sdl/dialogs.c:2623
+#: client/gui-sdl/dialogs.c:2839 client/gui-win32/dialogs.c:565
msgid "Male"
msgstr "Mężczyzna"
-#: client/gui-sdl/dialogs.c:2478 client/gui-sdl/dialogs.c:2902
+#: client/gui-sdl/dialogs.c:2483 client/gui-sdl/dialogs.c:2911
#: 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 "OK"
-#: client/gui-sdl/dialogs.c:2685 client/gui-win32/dialogs.c:505
+#: client/gui-sdl/dialogs.c:2694 client/gui-win32/dialogs.c:505
msgid "What nation will you be?"
msgstr "Jakim narodem chcesz grać?"
@@ -13919,81 +14076,81 @@ msgstr "Mapa Åšwiata"
msgid "Sea map"
msgstr "Mapa morska"
-#: client/gui-sdl/diplodlg.c:563
+#: client/gui-sdl/diplodlg.c:564
#, fuzzy
msgid "Give embassy"
msgstr "Daj ambasadÄ™"
-#: client/gui-sdl/diplodlg.c:579 client/gui-win32/diplodlg.c:614
+#: client/gui-sdl/diplodlg.c:580 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 "ZÅ‚oto(maks %d)"
-#: client/gui-sdl/diplodlg.c:613 client/gui-sdl/helpdlg.c:1956
+#: client/gui-sdl/diplodlg.c:614 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 "Wynalazki"
-#: client/gui-sdl/diplodlg.c:831 client/gui-win32/diplodlg.c:598
+#: client/gui-sdl/diplodlg.c:832 client/gui-win32/diplodlg.c:598
#: data/Freeciv.in:269
msgid "Diplomacy meeting"
msgstr "Spotkanie dyplomatyczne"
-#: client/gui-sdl/diplodlg.c:883 client/gui-win32/diplodlg.c:680
+#: client/gui-sdl/diplodlg.c:884 client/gui-win32/diplodlg.c:680
#: data/Freeciv.in:510
msgid "Cancel meeting"
msgstr "Przerwij spotkanie"
-#: client/gui-sdl/diplodlg.c:895 client/gui-win32/diplodlg.c:679
+#: client/gui-sdl/diplodlg.c:896 client/gui-win32/diplodlg.c:679
#: data/Freeciv.in:501
msgid "Accept treaty"
msgstr "Zatwierdź traktat"
#. TRANS: "Polish incident !" FIXME!!!
-#: client/gui-sdl/diplodlg.c:1304
+#: client/gui-sdl/diplodlg.c:1305
#, fuzzy, c-format
msgid "%s incident !"
msgstr "Starożytny"
-#: client/gui-sdl/diplodlg.c:1322
+#: client/gui-sdl/diplodlg.c:1323
msgid "Shall we declare WAR on them?"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1433
+#: client/gui-sdl/diplodlg.c:1434
#, fuzzy
msgid "Foreign Minister"
msgstr "Premier"
-#: client/gui-sdl/diplodlg.c:1449
+#: client/gui-sdl/diplodlg.c:1450
#, c-format
msgid ""
"Sir!, the %s ambassador has arrived\n"
"What are your wishes?"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1465
+#: client/gui-sdl/diplodlg.c:1466
msgid "Declare WAR"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1467 client/gui-win32/plrdlg.c:357
+#: client/gui-sdl/diplodlg.c:1468 client/gui-win32/plrdlg.c:357
msgid "Cancel Treaty"
msgstr "Anuluj Pakt"
#
-#: client/gui-sdl/diplodlg.c:1490 client/gui-win32/plrdlg.c:358
+#: client/gui-sdl/diplodlg.c:1491 client/gui-win32/plrdlg.c:358
#: data/Freeciv.in:3254
msgid "Withdraw vision"
msgstr "Cofni Widok dzielony"
-#: client/gui-sdl/diplodlg.c:1507
+#: client/gui-sdl/diplodlg.c:1508
#, fuzzy
msgid "Call Diplomatic Meeting"
msgstr "Spotkanie dyplomatyczne"
-#: client/gui-sdl/diplodlg.c:1521
+#: client/gui-sdl/diplodlg.c:1522
msgid "Send him back"
msgstr ""
@@ -14763,12 +14920,12 @@ msgid "Leave Game"
msgstr "Zapisz _grÄ™"
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1100 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1102 client/gui-xaw/menu.c:121
#: data/Freeciv.in:115 data/Freeciv.in:3180
msgid "Quit"
msgstr "Zakończ"
-#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:967
msgid "Start New Game"
msgstr "Rozpocznij nowÄ… grÄ™"
@@ -14896,8 +15053,8 @@ msgstr "Zysk: %d"
msgid "%s max rate : %d%%"
msgstr "Maksymalny wskaźnik %s: %d%%"
-#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
-#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1085
+#: client/gui-win32/connectdlg.c:1093 data/Freeciv.in:155
msgid "Update"
msgstr "Aktualizuj"
@@ -15366,67 +15523,67 @@ msgstr "Nowy"
msgid "Delete"
msgstr "Skasuj"
-#: client/gui-win32/connectdlg.c:147
+#: client/gui-win32/connectdlg.c:149
msgid "Password:"
msgstr "Hasło:"
-#: client/gui-win32/connectdlg.c:169
+#: client/gui-win32/connectdlg.c:171
msgid "Couldn't load the savegame"
msgstr "Nie mogę wczytać zapisanej gry"
-#: client/gui-win32/connectdlg.c:284 client/gui-xaw/connectdlg.c:311
+#: client/gui-win32/connectdlg.c:286 client/gui-xaw/connectdlg.c:311
msgid "Verify Password"
msgstr "Potwierdź hasło"
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:916 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr "Wybór Serwera Freeciv"
-#: client/gui-win32/connectdlg.c:915
+#: client/gui-win32/connectdlg.c:917
msgid "Local Area Network"
msgstr "Sieć Lokalna"
-#: client/gui-win32/connectdlg.c:949
+#: client/gui-win32/connectdlg.c:951
msgid "Welcome to Freeciv"
msgstr "Witamy we Freeciv"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Load Saved Game"
msgstr "Wczytaj zachowanÄ… grÄ™"
-#: client/gui-win32/connectdlg.c:969
+#: client/gui-win32/connectdlg.c:971
msgid "Connect To Network Game"
msgstr "Przyłącz się do gry _sieciowej"
-#: client/gui-win32/connectdlg.c:979
+#: client/gui-win32/connectdlg.c:981
msgid "Choose a nation to play"
msgstr "Wybierz naród, którym będziesz grał"
-#: client/gui-win32/connectdlg.c:1014
+#: client/gui-win32/connectdlg.c:1016
msgid "Number of players (Including AI):"
msgstr "Liczba graczy (ÅÄ…cznie z botami):"
-#: client/gui-win32/connectdlg.c:1022
+#: client/gui-win32/connectdlg.c:1024
msgid "AI skill level:"
msgstr "Poziom trudności AI:"
-#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1038 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr "Opcje gry"
-#: client/gui-win32/connectdlg.c:1040
+#: client/gui-win32/connectdlg.c:1042
msgid "Start Game"
msgstr "Rozpocznij grÄ™"
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Login:"
msgstr "Użytkownik:"
-#: client/gui-win32/connectdlg.c:1061
+#: client/gui-win32/connectdlg.c:1063
msgid "Host:"
msgstr "Serwer:"
-#: client/gui-win32/connectdlg.c:1062
+#: client/gui-win32/connectdlg.c:1064
msgid "Port:"
msgstr "Port:"
@@ -15506,21 +15663,21 @@ msgstr ""
"Ta opcja włącza alpha blending zamiast rozmywania. Jeśli sprzęt nie wspiera "
"alpha blendingu, to rysowanie grafiki może być znacznie wolniejsze."
-#: client/gui-win32/helpdlg.c:769 client/gui-win32/helpdlg.c:792
-#: client/gui-win32/helpdlg.c:803 client/gui-win32/helpdlg.c:809
-#: client/gui-win32/helpdlg.c:822
+#: client/gui-win32/helpdlg.c:775 client/gui-win32/helpdlg.c:798
+#: client/gui-win32/helpdlg.c:809 client/gui-win32/helpdlg.c:815
+#: client/gui-win32/helpdlg.c:828
msgid "Allows "
msgstr "Zezwala na "
-#: client/gui-win32/helpdlg.c:780
+#: client/gui-win32/helpdlg.c:786
msgid "Obsoletes "
msgstr "Czyni przestarzałym "
-#: client/gui-win32/helpdlg.c:812 client/gui-win32/helpdlg.c:825
+#: client/gui-win32/helpdlg.c:818 client/gui-win32/helpdlg.c:831
msgid " (with "
msgstr " (z "
-#: client/gui-win32/helpdlg.c:815 client/gui-win32/helpdlg.c:828
+#: client/gui-win32/helpdlg.c:821 client/gui-win32/helpdlg.c:834
msgid "?techhelp:)."
msgstr "?techhelp:)."
@@ -16646,7 +16803,7 @@ 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/"
+" https://gna.org/projects/freeciv/"
msgstr ""
"Jeżeli znajdziesz bład w programie wyślij nam raport. Najlepiej to zrobić "
"przez odwiedzenie systemu zgłaszania błędów Freeciv, pod adresem:\n"
@@ -18944,6 +19101,7 @@ msgid "Hydro Plant"
msgstr "Elektrownia wodna"
#: data/default/buildings.ruleset:378
+#, fuzzy
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 "
@@ -18951,45 +19109,42 @@ msgid ""
"a Factory, Mfg. Plant and Hydro Plant together give a 150% production "
"bonus.\n"
"\n"
-"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant. A city "
-"can only build a Hydro Plant if it is next to (or on) a Mountain or River "
-"tile."
+"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant."
msgstr ""
"Zmniejsza zanieczyszczenie tworzone przez miasto o 50% oraz zwiększa "
-"produkcjÄ™ fabryki lub fabryki zautomatyzowanej. Fabryka + elektrownia wodna "
-"dajÄ… 75% wzrost, a Fabryka + fabryka zautomatyzowana + elektrownia wodna "
-"dajÄ… w sumie 150% wzrost.\n"
+"produkcjÄ™ fabryki lub fabryki zautomatyzowanej. Fabryka + elektrownia "
+"atomowa dajÄ… 75% wzrost, a Fabryka + fabryka zautomatyzowana + elektrownia "
+"atomowa dajÄ… w sumie 150% wzrost.\n"
"\n"
-"Miasto może mieć tylko jedną elektrownię: wodną, cieplną lub atomową. "
-"Elektrownia wodna może być budowana tylko obok albo na polu z rzeką lub górą."
+"Miasto może mieć tylko jedną elektrownię: wodną, cieplną lub atomową."
-#: data/default/buildings.ruleset:397 data/civ2/buildings.ruleset:373
+#: data/default/buildings.ruleset:396 data/civ2/buildings.ruleset:373
#: data/civ1/buildings.ruleset:297
msgid "Library"
msgstr "Biblioteka"
-#: data/default/buildings.ruleset:412
+#: data/default/buildings.ruleset:411
#, no-c-format
msgid "Increases the science output in a city by 100%."
msgstr "Zwiększa produkcję naukową miasta o 100%."
-#: data/default/buildings.ruleset:417 data/civ2/buildings.ruleset:393
+#: data/default/buildings.ruleset:416 data/civ2/buildings.ruleset:393
#: data/civ1/buildings.ruleset:317
msgid "Marketplace"
msgstr "Targowisko"
-#: data/default/buildings.ruleset:432 data/civ2/buildings.ruleset:408
+#: data/default/buildings.ruleset:431 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 "Zwiększa produkcję luksusową i dochody podatkowe miasta o 50%."
-#: data/default/buildings.ruleset:437 data/civ2/buildings.ruleset:413
+#: data/default/buildings.ruleset:436 data/civ2/buildings.ruleset:413
#: data/civ1/buildings.ruleset:337
msgid "Mass Transit"
msgstr "Metro"
-#: data/default/buildings.ruleset:451 data/civ2/buildings.ruleset:427
+#: data/default/buildings.ruleset:450 data/civ2/buildings.ruleset:427
#: data/civ1/buildings.ruleset:351
msgid ""
"Neutralizes the pollution generated by the population. The population "
@@ -18998,12 +19153,12 @@ msgstr ""
"Neutralizuje zanieczyszczenie generowane przez populacjÄ™. Populacja po "
"prostu nie ma wpływu na generowane zanieczyszczenie."
-#: data/default/buildings.ruleset:458 data/civ2/buildings.ruleset:434
+#: data/default/buildings.ruleset:457 data/civ2/buildings.ruleset:434
#: data/civ1/buildings.ruleset:358
msgid "Mfg. Plant"
msgstr "Fabryka zautomatyzowana"
-#: data/default/buildings.ruleset:474 data/civ2/buildings.ruleset:450
+#: data/default/buildings.ruleset:473 data/civ2/buildings.ruleset:450
#: data/civ1/buildings.ruleset:374
#, no-c-format
msgid ""
@@ -19013,12 +19168,12 @@ msgstr ""
"Razem z Fabryką, fabryka zautomatyzowana zwiększa produkcję przemysłową "
"miasta o 100%."
-#: data/default/buildings.ruleset:480 data/civ2/buildings.ruleset:456
+#: data/default/buildings.ruleset:479 data/civ2/buildings.ruleset:456
#: data/civ1/buildings.ruleset:380
msgid "Nuclear Plant"
msgstr "Elektrownia Atomowa"
-#: data/default/buildings.ruleset:495
+#: data/default/buildings.ruleset:494
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 "
@@ -19035,11 +19190,11 @@ msgstr ""
"\n"
"Miasto może mieć tylko jedną elektrownię: wodną, cieplną lub atomową."
-#: data/default/buildings.ruleset:515 data/civ2/buildings.ruleset:489
+#: data/default/buildings.ruleset:514 data/civ2/buildings.ruleset:489
msgid "Offshore Platform"
msgstr "Platforma wiertnicza"
-#: data/default/buildings.ruleset:530 data/civ2/buildings.ruleset:504
+#: data/default/buildings.ruleset:529 data/civ2/buildings.ruleset:504
msgid ""
"Adds 1 extra shield resource on all Ocean squares in a city. The city needs "
"to be coastal to build this improvement."
@@ -19047,12 +19202,12 @@ msgstr ""
"Dodaje 1 dodatkową tarczkę (produkcję) do wszystkich pól morskich miasta. "
"Miasto musi być przybrzeżne aby mogło zbudować ten budynek."
-#: data/default/buildings.ruleset:536 data/civ2/buildings.ruleset:510
+#: data/default/buildings.ruleset:535 data/civ2/buildings.ruleset:510
#: data/civ1/buildings.ruleset:411
msgid "Palace"
msgstr "Pałac"
-#: data/default/buildings.ruleset:552
+#: data/default/buildings.ruleset:551
#, no-c-format
msgid ""
"Makes a city the capital and the center of your government. Corruption in "
@@ -19080,11 +19235,11 @@ msgstr ""
"Podczas despotyzmu pałac daje +75% bonusu do produkcji. W czasie monarchii "
"50% ."
-#: data/default/buildings.ruleset:569 data/civ2/buildings.ruleset:539
+#: data/default/buildings.ruleset:568 data/civ2/buildings.ruleset:539
msgid "Police Station"
msgstr "Komisariat"
-#: data/default/buildings.ruleset:583 data/civ2/buildings.ruleset:553
+#: data/default/buildings.ruleset:582 data/civ2/buildings.ruleset:553
msgid ""
"Reduces the unhappiness caused by military units outside the city by 2 under "
"Democracy and 1 under Republic. This improvement has no effect under other "
@@ -19093,11 +19248,11 @@ msgstr ""
"Redukuje niezadowolenie wynikające z obecności wojsk poza miastem o 2 w "
"Demokracji, a o 1 w Republice. Nie ma efektów w innych ustrojach."
-#: data/default/buildings.ruleset:593 data/civ2/buildings.ruleset:560
+#: data/default/buildings.ruleset:592 data/civ2/buildings.ruleset:560
msgid "Port Facility"
msgstr "Stocznia"
-#: data/default/buildings.ruleset:608 data/civ2/buildings.ruleset:575
+#: data/default/buildings.ruleset:607 data/civ2/buildings.ruleset:575
msgid ""
"Allows a city to build veteran sea units. Also, damaged sea units which "
"stay in town for one full turn without moving are completely restored."
@@ -19106,12 +19261,12 @@ msgstr ""
"uszkodzone jednostki morskie po przeczekaniu całej tury w mieście zostają "
"całkowicie naprawione."
-#: data/default/buildings.ruleset:615 data/civ2/buildings.ruleset:582
+#: data/default/buildings.ruleset:614 data/civ2/buildings.ruleset:582
#: data/civ1/buildings.ruleset:440
msgid "Power Plant"
msgstr "Elektrownia Cieplna"
-#: data/default/buildings.ruleset:631
+#: data/default/buildings.ruleset:630
#, no-c-format
msgid ""
"Increases the shield production of a Factory or Mfg. Plant in a city: a "
@@ -19128,12 +19283,12 @@ msgstr ""
"\n"
"Miasto może mieć tylko 1 Elektrownie : Wodną, Cieplną bądź Jądrową."
-#: data/default/buildings.ruleset:646 data/civ2/buildings.ruleset:610
+#: data/default/buildings.ruleset:645 data/civ2/buildings.ruleset:610
#: data/civ1/buildings.ruleset:468
msgid "Recycling Center"
msgstr "Oczyszczalnia"
-#: data/default/buildings.ruleset:661 data/civ2/buildings.ruleset:625
+#: data/default/buildings.ruleset:660 data/civ2/buildings.ruleset:625
#: data/civ1/buildings.ruleset:483
#, no-c-format
msgid ""
@@ -19142,12 +19297,12 @@ msgid ""
msgstr ""
"Oczyszczalnia redukuje ilość zanieczyszczeń wydzielanych przez miasto o 66%."
-#: data/default/buildings.ruleset:667 data/civ2/buildings.ruleset:631
+#: data/default/buildings.ruleset:666 data/civ2/buildings.ruleset:631
msgid "Research Lab"
msgstr "Laboratoria"
#
-#: data/default/buildings.ruleset:682
+#: data/default/buildings.ruleset:681
msgid ""
"Together with a Library, a Research Lab increases the science production of "
"a city by 200%. Together with a Library and a University, a Research Lab "
@@ -19157,11 +19312,11 @@ msgstr ""
"Razem z Biblioteką i Uniwersytetem, Laboratoria zwiększają produkcję naukową "
"miasta o 450%."
-#: data/default/buildings.ruleset:690 data/civ2/buildings.ruleset:654
+#: data/default/buildings.ruleset:689 data/civ2/buildings.ruleset:654
msgid "SAM Battery"
msgstr "Bateria rakiet p-lot."
-#: data/default/buildings.ruleset:704 data/civ2/buildings.ruleset:668
+#: data/default/buildings.ruleset:703 data/civ2/buildings.ruleset:668
msgid ""
"Doubles the defense of all units inside the city when attacked by non-"
"nuclear air units."
@@ -19169,12 +19324,12 @@ msgstr ""
"Podwaja obronę jednostek stacjonujących w mieście przeciw konwencjonalnym "
"wojskom lotniczym."
-#: data/default/buildings.ruleset:710 data/civ2/buildings.ruleset:674
+#: data/default/buildings.ruleset:709 data/civ2/buildings.ruleset:674
#: data/civ1/buildings.ruleset:489
msgid "SDI Defense"
msgstr "Obrona SDI"
-#: data/default/buildings.ruleset:724 data/civ2/buildings.ruleset:688
+#: data/default/buildings.ruleset:723 data/civ2/buildings.ruleset:688
#: data/civ1/buildings.ruleset:503
msgid ""
"Protects a city from attacks from Nuclear units. Nuclear attacks simply "
@@ -19184,11 +19339,11 @@ msgstr ""
"Chroni miasto przed atakami jądrowymi. Nie mają one po prostu żadnego "
"wpływu na miasto. Ponadto podwaja obronę przeciwko rakietom konwencjonalnym."
-#: data/default/buildings.ruleset:733 data/civ2/buildings.ruleset:697
+#: data/default/buildings.ruleset:732 data/civ2/buildings.ruleset:697
msgid "Sewer System"
msgstr "Kanalizacja"
-#: data/default/buildings.ruleset:748 data/civ2/buildings.ruleset:712
+#: data/default/buildings.ruleset:747 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."
@@ -19196,12 +19351,12 @@ msgstr ""
"Pozwala miastu osiągnąć rozmiary większe niż 12. Akwedukt jest wpierw "
"potrzebny by miasto mogło wzrosnąć powyżej 8."
-#: data/default/buildings.ruleset:754 data/civ2/buildings.ruleset:749
+#: data/default/buildings.ruleset:753 data/civ2/buildings.ruleset:749
#: data/civ1/buildings.ruleset:512
msgid "Space Component"
msgstr "Napęd statku kosmicznego"
-#: data/default/buildings.ruleset:769 data/civ2/buildings.ruleset:763
+#: data/default/buildings.ruleset:768 data/civ2/buildings.ruleset:763
#: data/civ1/buildings.ruleset:526
msgid ""
"Space Components can be differentiated into Propulsion and Fuel Components. "
@@ -19217,12 +19372,12 @@ msgstr ""
"Aby rozpocząć budowę statku kosmicznego, cud Program apollo musi być "
"zbudowany przez jednego z graczy."
-#: data/default/buildings.ruleset:779 data/civ2/buildings.ruleset:773
+#: data/default/buildings.ruleset:778 data/civ2/buildings.ruleset:773
#: data/civ1/buildings.ruleset:536
msgid "Space Module"
msgstr "Moduł statku kosmicznego"
-#: data/default/buildings.ruleset:794 data/civ2/buildings.ruleset:787
+#: data/default/buildings.ruleset:793 data/civ2/buildings.ruleset:787
#: data/civ1/buildings.ruleset:550
msgid ""
"Space Modules are the most expensive parts of spaceships. There are three "
@@ -19256,12 +19411,12 @@ msgstr ""
"Aby rozpocząć budowę statku kosmicznego, cud Program Apollo musi być "
"zbudowany przez jednego z graczy."
-#: data/default/buildings.ruleset:813 data/civ2/buildings.ruleset:806
+#: data/default/buildings.ruleset:812 data/civ2/buildings.ruleset:806
#: data/civ1/buildings.ruleset:569
msgid "Space Structural"
msgstr "Element konstr. statku kosm."
-#: data/default/buildings.ruleset:828 data/civ2/buildings.ruleset:820
+#: data/default/buildings.ruleset:827 data/civ2/buildings.ruleset:820
#: data/civ1/buildings.ruleset:583
msgid ""
"Space Structurals form the base of your spaceship. All other spaceship "
@@ -19278,11 +19433,11 @@ msgstr ""
"Aby rozpocząć budowę statku kosmicznego, cud Program Apollo musi być "
"zbudowany przez jednego z graczy."
-#: data/default/buildings.ruleset:838 data/civ2/buildings.ruleset:830
+#: data/default/buildings.ruleset:837 data/civ2/buildings.ruleset:830
msgid "Stock Exchange"
msgstr "Giełda"
-#: data/default/buildings.ruleset:854 data/civ2/buildings.ruleset:846
+#: data/default/buildings.ruleset:853 data/civ2/buildings.ruleset:846
#, no-c-format
msgid ""
"Together with a Marketplace and a Bank, a Stock Exchange boosts tax and "
@@ -19291,21 +19446,21 @@ msgstr ""
"Razem z Targowiskiem i Bankiem, Giełda zwiększa dochody podatkowe i "
"produkcjÄ™ luksusowÄ… miasta o 150%."
-#: data/default/buildings.ruleset:860 data/civ2/buildings.ruleset:852
+#: data/default/buildings.ruleset:859 data/civ2/buildings.ruleset:852
msgid "Super Highways"
msgstr "Autostrady"
-#: data/default/buildings.ruleset:875 data/civ2/buildings.ruleset:867
+#: data/default/buildings.ruleset:874 data/civ2/buildings.ruleset:867
#, no-c-format
msgid ""
"Increases trade resources by 50% on all squares with roads or railroads."
msgstr "Zwiększa handel o 50% na wszystkich polach z drogami lub kolejami."
-#: data/default/buildings.ruleset:883 data/civ2/buildings.ruleset:873
+#: data/default/buildings.ruleset:882 data/civ2/buildings.ruleset:873
msgid "Supermarket"
msgstr "Supermarket"
-#: data/default/buildings.ruleset:898 data/civ2/buildings.ruleset:888
+#: data/default/buildings.ruleset:897 data/civ2/buildings.ruleset:888
#, no-c-format
msgid ""
"Increases the food resources by 50% on each farmland square which is being "
@@ -19315,12 +19470,12 @@ msgstr ""
"Zwiększa zasoby żywności o połowę na wszystkich farmach wokół miasta. Uwaga: "
"do farm zaliczamy pola, które zostały poddane irygacji dwukrotnie."
-#: data/default/buildings.ruleset:905 data/civ2/buildings.ruleset:895
+#: data/default/buildings.ruleset:904 data/civ2/buildings.ruleset:895
#: data/civ1/buildings.ruleset:593
msgid "Temple"
msgstr "ÅšwiÄ…tynia"
-#: data/default/buildings.ruleset:919 data/civ2/buildings.ruleset:909
+#: data/default/buildings.ruleset:918 data/civ2/buildings.ruleset:909
#: data/civ1/buildings.ruleset:607
msgid ""
"Makes one unhappy citizen content. Both the Mysticism advance and the "
@@ -19331,13 +19486,13 @@ msgstr ""
"(technologia) jak i Wyrocznia (cud) podwajajÄ… ten efekt. ÅšwiÄ…tynia razem z "
"mistycyzmem i wyrocznią czyni czterech mieszkańców zadowolonymi."
-#: data/default/buildings.ruleset:926 data/civ2/buildings.ruleset:916
+#: data/default/buildings.ruleset:925 data/civ2/buildings.ruleset:916
#: data/civ1/buildings.ruleset:614 data/default/techs.ruleset:742
#: data/civ2/techs.ruleset:727 data/civ1/techs.ruleset:723
msgid "University"
msgstr "Uniwersytet"
-#: data/default/buildings.ruleset:942
+#: data/default/buildings.ruleset:941
#, no-c-format
msgid ""
"Together with a Library, a University increases the science production of a "
@@ -19346,12 +19501,12 @@ msgstr ""
"Razem z Biblioteką, Uniwersytetem zwiększa produkcję naukową w mieście o "
"250%."
-#: data/default/buildings.ruleset:948 data/civ2/buildings.ruleset:938
+#: data/default/buildings.ruleset:947 data/civ2/buildings.ruleset:938
#: data/civ1/buildings.ruleset:636
msgid "Apollo Program"
msgstr "Projekt Apollo"
-#: data/default/buildings.ruleset:962 data/civ2/buildings.ruleset:952
+#: data/default/buildings.ruleset:961 data/civ2/buildings.ruleset:952
msgid ""
"Entire map becomes visible for the player who owns it. It allows all "
"players to start building spaceship parts (assuming they have researched the "
@@ -19361,11 +19516,11 @@ msgstr ""
"graczom budować części do statku kosmicznego (pod warunkiem, że odkryli "
"odpowiednie technologie)."
-#: data/default/buildings.ruleset:969 data/civ2/buildings.ruleset:959
+#: data/default/buildings.ruleset:968 data/civ2/buildings.ruleset:959
msgid "A.Smith's Trading Co."
msgstr "Kompania Handlowa A.Smith'a"
-#: data/default/buildings.ruleset:983
+#: data/default/buildings.ruleset:982
msgid ""
"City improvements which would normally have an upkeep of 1 are free of "
"upkeep, for all your cities."
@@ -19373,12 +19528,12 @@ msgstr ""
"Obiekty w mieście, które normalnie kosztują 1 złota, są zwolnione z kosztów "
"utrzymania, w każdym twoim mieście."
-#: data/default/buildings.ruleset:989 data/civ2/buildings.ruleset:979
+#: data/default/buildings.ruleset:988 data/civ2/buildings.ruleset:979
#: data/civ1/buildings.ruleset:655
msgid "Colossus"
msgstr "Kolos"
-#: data/default/buildings.ruleset:1003 data/civ2/buildings.ruleset:993
+#: data/default/buildings.ruleset:1002 data/civ2/buildings.ruleset:993
#: data/civ1/buildings.ruleset:669
msgid ""
"Each square around the city where this wonder is built that is already "
@@ -19387,23 +19542,23 @@ msgstr ""
"Każda `płytka' terenu wokół miasta, gdzie zlokalizowany jest Kolos, i która "
"już daje jakieś dochody z handlu, daje wtedy dodatkową sztukę złota dochodu."
-#: data/default/buildings.ruleset:1009 data/civ2/buildings.ruleset:999
+#: data/default/buildings.ruleset:1008 data/civ2/buildings.ruleset:999
#: data/civ1/buildings.ruleset:675
msgid "Copernicus' Observatory"
msgstr "Obserwatorium Kopernika"
-#: data/default/buildings.ruleset:1024 data/civ2/buildings.ruleset:1180
+#: data/default/buildings.ruleset:1023 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 "Podwaja rozwój nauki w mieście, w którym zostało wybudowane."
-#: data/default/buildings.ruleset:1029 data/civ2/buildings.ruleset:1019
+#: data/default/buildings.ruleset:1028 data/civ2/buildings.ruleset:1019
#: data/civ1/buildings.ruleset:695
msgid "Cure For Cancer"
msgstr "Lek Na Raka"
-#: data/default/buildings.ruleset:1043
+#: data/default/buildings.ruleset:1042
msgid ""
"This stunning technological achievement makes one unhappy citizen content in "
"all your cities."
@@ -19411,12 +19566,12 @@ msgstr ""
"To wspaniałe odkrycie naukowe czyni jednego niezadowolonego mieszkańca "
"zadowolonym w każdym twoim mieście."
-#: data/default/buildings.ruleset:1051 data/civ2/buildings.ruleset:1039
+#: data/default/buildings.ruleset:1050 data/civ2/buildings.ruleset:1039
#: data/civ1/buildings.ruleset:715
msgid "Darwin's Voyage"
msgstr "Wyprawa Darwin'a"
-#: data/default/buildings.ruleset:1065 data/civ2/buildings.ruleset:1053
+#: data/default/buildings.ruleset:1064 data/civ2/buildings.ruleset:1053
#: data/civ1/buildings.ruleset:729
msgid ""
"Charles Darwin's voyage sparked the discovery of the evolution of the "
@@ -19427,11 +19582,11 @@ msgstr ""
"co z kolei wzbudziło większe zaufanie do nauki. Uzyskujesz dwa niezwłoczne "
"postępy technologiczne."
-#: data/default/buildings.ruleset:1072 data/civ2/buildings.ruleset:1060
+#: data/default/buildings.ruleset:1071 data/civ2/buildings.ruleset:1060
msgid "Eiffel Tower"
msgstr "Wieża Eiffla"
-#: data/default/buildings.ruleset:1087
+#: data/default/buildings.ruleset:1086
#, fuzzy, no-c-format
msgid ""
"Your reputation and goodwill among other nations is recovered twice as fast."
@@ -19439,12 +19594,12 @@ msgstr ""
"Cud ten pomaga powoli polepszać twoją reputację i nastawienie innych graczy "
"względem ciebie. Odzyskujesz reputację dwa razy szybciej niż normalnie."
-#: data/default/buildings.ruleset:1093 data/civ2/buildings.ruleset:1081
+#: data/default/buildings.ruleset:1092 data/civ2/buildings.ruleset:1081
#: data/civ1/buildings.ruleset:736
msgid "Great Library"
msgstr "Wielka Biblioteka"
-#: data/default/buildings.ruleset:1107 data/civ2/buildings.ruleset:1095
+#: data/default/buildings.ruleset:1106 data/civ2/buildings.ruleset:1095
#: data/civ1/buildings.ruleset:750
msgid ""
"The civilization which builds the Great Library gets every advance that at "
@@ -19453,21 +19608,21 @@ msgstr ""
"Cywilizacja, która posiada Wielką Bibliotekę otrzymuje każde odkrycie, które "
"zostało osiągnięte przez co najmniej dwie inne cywilizacje."
-#: data/default/buildings.ruleset:1113 data/civ2/buildings.ruleset:1101
+#: data/default/buildings.ruleset:1112 data/civ2/buildings.ruleset:1101
#: data/civ1/buildings.ruleset:756
msgid "Great Wall"
msgstr "Wielki Mur"
-#: data/default/buildings.ruleset:1127
+#: data/default/buildings.ruleset:1126
msgid "Works as a City Wall in all your cities."
msgstr "Działa jak Mury Obronne w każdym twoim mieście."
-#: data/default/buildings.ruleset:1135 data/civ2/buildings.ruleset:1122
+#: data/default/buildings.ruleset:1134 data/civ2/buildings.ruleset:1122
#: data/civ1/buildings.ruleset:777
msgid "Hanging Gardens"
msgstr "WiszÄ…ce Ogrody"
-#: data/default/buildings.ruleset:1149 data/civ2/buildings.ruleset:1136
+#: data/default/buildings.ruleset:1148 data/civ2/buildings.ruleset:1136
#: data/civ1/buildings.ruleset:791
msgid ""
"Makes one content citizen happy in every city. Makes two extra content "
@@ -19482,12 +19637,12 @@ msgstr ""
"mieszkańców, Cud ten działa wtedy na wzburzonych mieszkańców, czyniąc ich "
"zadowolonymi."
-#: data/default/buildings.ruleset:1158 data/civ2/buildings.ruleset:1145
+#: data/default/buildings.ruleset:1157 data/civ2/buildings.ruleset:1145
#: data/civ1/buildings.ruleset:800
msgid "Hoover Dam"
msgstr "Tama Hoover'a"
-#: data/default/buildings.ruleset:1173 data/civ2/buildings.ruleset:1159
+#: data/default/buildings.ruleset:1172 data/civ2/buildings.ruleset:1159
msgid ""
"Works as if you had a Hydro Plant in every city. (This reduces pollution "
"and increases the effects of Factories and Mfg. Plants.)"
@@ -19496,52 +19651,52 @@ msgstr ""
"skażenie środowiska i zwiększa poziom produkcji fabryk i fabryk "
"zautomatyzowanych."
-#: data/default/buildings.ruleset:1179 data/civ2/buildings.ruleset:1165
+#: data/default/buildings.ruleset:1178 data/civ2/buildings.ruleset:1165
#: data/civ1/buildings.ruleset:822
msgid "Isaac Newton's College"
msgstr "College Isaac'a Newton'a"
-#: data/default/buildings.ruleset:1194
+#: data/default/buildings.ruleset:1193
#, no-c-format
msgid ""
"Boosts science production by 100% in every city you control that has a "
"University."
msgstr "Podwaja rozwój nauki w każdym twoim mieście z Uniwersytetem."
-#: data/default/buildings.ruleset:1200 data/civ2/buildings.ruleset:1185
+#: data/default/buildings.ruleset:1199 data/civ2/buildings.ruleset:1185
#: data/civ1/buildings.ruleset:842
msgid "J.S. Bach's Cathedral"
msgstr "Katedra J.S. Bach'a"
-#: data/default/buildings.ruleset:1214 data/civ2/buildings.ruleset:1199
+#: data/default/buildings.ruleset:1213 data/civ2/buildings.ruleset:1199
msgid "Makes two unhappy citizens content in every city."
msgstr "Czyni 2 niezadowolonych obywateli zadowolonymi w każdym twoim mieście."
-#: data/default/buildings.ruleset:1219 data/civ2/buildings.ruleset:1204
+#: data/default/buildings.ruleset:1218 data/civ2/buildings.ruleset:1204
msgid "King Richard's Crusade"
msgstr "Wyprawy Krzyżowe"
-#: data/default/buildings.ruleset:1233 data/civ2/buildings.ruleset:1218
+#: data/default/buildings.ruleset:1232 data/civ2/buildings.ruleset:1218
msgid ""
"Adds one extra shield resource on every square around the city where it is "
"built."
msgstr ""
"Dodaje dodatkową tarcze do każdego pola wokół miasta gdzie zostało zbudowane."
-#: data/default/buildings.ruleset:1239 data/civ2/buildings.ruleset:1224
+#: data/default/buildings.ruleset:1238 data/civ2/buildings.ruleset:1224
msgid "Leonardo's Workshop"
msgstr "Pracownia Leonarda"
-#: data/default/buildings.ruleset:1253 data/civ2/buildings.ruleset:1238
+#: data/default/buildings.ruleset:1252 data/civ2/buildings.ruleset:1238
msgid "Upgrades one obsolete unit per game turn."
msgstr "Ulepsza 1 przestarzałą jednostkę na turę."
-#: data/default/buildings.ruleset:1258 data/civ2/buildings.ruleset:1243
+#: data/default/buildings.ruleset:1257 data/civ2/buildings.ruleset:1243
#: data/civ1/buildings.ruleset:862
msgid "Lighthouse"
msgstr "Latarnia"
-#: data/default/buildings.ruleset:1273
+#: data/default/buildings.ruleset:1272
msgid ""
"Gives all your sea units 1 additional movement point and eliminates the risk "
"of losing Triremes on the high seas. Makes all your new sea units veterans "
@@ -19551,34 +19706,34 @@ msgstr ""
"straty Trirem na otwartym morzu. Czyni wszystkie nowe jednostki morskie "
"weteranami (we wszystkich twoich miastach)."
-#: data/default/buildings.ruleset:1280 data/civ2/buildings.ruleset:1264
+#: data/default/buildings.ruleset:1279 data/civ2/buildings.ruleset:1264
#: data/civ1/buildings.ruleset:885
msgid "Magellan's Expedition"
msgstr "Wyprawa Magellana"
-#: data/default/buildings.ruleset:1295
+#: data/default/buildings.ruleset:1294
msgid "Gives all your sea units 2 additional movement points."
msgstr "Daje 2 dodatkowe punkty ruchu twoim jednostkom morskim."
-#: data/default/buildings.ruleset:1300 data/civ2/buildings.ruleset:1283
+#: data/default/buildings.ruleset:1299 data/civ2/buildings.ruleset:1283
#: data/civ1/buildings.ruleset:904
msgid "Manhattan Project"
msgstr "Projekt Manhattan"
-#: data/default/buildings.ruleset:1318 data/civ2/buildings.ruleset:1301
+#: data/default/buildings.ruleset:1317 data/civ2/buildings.ruleset:1301
msgid "Marco Polo's Embassy"
msgstr "Ambasada Marka Pola"
-#: data/default/buildings.ruleset:1332 data/civ2/buildings.ruleset:1315
+#: data/default/buildings.ruleset:1331 data/civ2/buildings.ruleset:1315
msgid "The player who owns it gets an embassy with all players."
msgstr "Posiadacz dostaje ambasadÄ™ u wszystkich graczy."
-#: data/default/buildings.ruleset:1337 data/civ2/buildings.ruleset:1320
+#: data/default/buildings.ruleset:1336 data/civ2/buildings.ruleset:1320
#: data/civ1/buildings.ruleset:922
msgid "Michelangelo's Chapel"
msgstr "Kaplica Michała Anioła"
-#: data/default/buildings.ruleset:1351 data/civ2/buildings.ruleset:1334
+#: data/default/buildings.ruleset:1350 data/civ2/buildings.ruleset:1334
msgid ""
"Counts as having a Cathedral in each of your cities. This makes 3 unhappy "
"citizens content in each city. The discovery of Theology increases the "
@@ -19592,23 +19747,23 @@ msgstr ""
"efektywność Katedr o 1 obywatela. Odkrycie Komunizmu zmniejsza efektywność "
"Katedr o 1 mieszkańca."
-#: data/default/buildings.ruleset:1361 data/civ2/buildings.ruleset:1344
+#: data/default/buildings.ruleset:1360 data/civ2/buildings.ruleset:1344
#: data/civ1/buildings.ruleset:941
msgid "Oracle"
msgstr "Wyrocznia"
-#: data/default/buildings.ruleset:1375
+#: data/default/buildings.ruleset:1374
msgid "Makes two of your unhappy citizens content in every city with a temple."
msgstr ""
"Czyni 2 niezadowolonych obywateli zadowolonymi w każdym twoim mieście ze "
"świątynią."
-#: data/default/buildings.ruleset:1380 data/civ2/buildings.ruleset:1363
+#: data/default/buildings.ruleset:1379 data/civ2/buildings.ruleset:1363
#: data/civ1/buildings.ruleset:960
msgid "Pyramids"
msgstr "Piramidy"
-#: data/default/buildings.ruleset:1394
+#: data/default/buildings.ruleset:1393
msgid ""
"The amount of stored food lost when one of your cities grows or shrinks is "
"reduced by 25%. This helps a city to grow faster and more easily withstand "
@@ -19618,32 +19773,32 @@ msgstr ""
"wzrośnie lub zmaleje. To pozwala miastu na szybszy wzrost i przetrzymać "
"głód. Efekt sumuje się ze spichlerzem."
-#: data/default/buildings.ruleset:1401 data/civ2/buildings.ruleset:1382
+#: data/default/buildings.ruleset:1400 data/civ2/buildings.ruleset:1382
#: data/civ1/buildings.ruleset:981
msgid "SETI Program"
msgstr "Program SETI"
-#: data/default/buildings.ruleset:1415
+#: data/default/buildings.ruleset:1414
msgid "Boosts science production in each city with a Research Lab by 100%. "
msgstr "Zwiększa rozwój nauki we wszystkich miastach z Laboratoriami o 100%."
-#: data/default/buildings.ruleset:1420 data/civ2/buildings.ruleset:1402
+#: data/default/buildings.ruleset:1419 data/civ2/buildings.ruleset:1402
#: data/civ1/buildings.ruleset:1001
msgid "Shakespeare's Theatre"
msgstr "Teatr Szekspira"
-#: data/default/buildings.ruleset:1434 data/civ2/buildings.ruleset:1416
+#: data/default/buildings.ruleset:1433 data/civ2/buildings.ruleset:1416
#: data/civ1/buildings.ruleset:1015
msgid "Makes all unhappy citizens content, in the city where it is located."
msgstr ""
"Czyni wszystkich niezadowolonych mieszkańców szczęśliwymi w mieście, w "
"którym go zbudowano."
-#: data/default/buildings.ruleset:1439 data/civ2/buildings.ruleset:1421
+#: data/default/buildings.ruleset:1438 data/civ2/buildings.ruleset:1421
msgid "Statue of Liberty"
msgstr "Statua Wolności"
-#: data/default/buildings.ruleset:1453 data/civ2/buildings.ruleset:1435
+#: data/default/buildings.ruleset:1452 data/civ2/buildings.ruleset:1435
#: data/civ1/buildings.ruleset:974 data/civ1/buildings.ruleset:1034
msgid ""
"Allows you to choose any government, including those that have not yet been "
@@ -19653,11 +19808,11 @@ msgstr ""
"Pozwala zmienić typ rządów na dowolny, także taki, którego jeszcze twoja "
"cywilizacja nie odkryła, bez przejściowego okresu anarchii."
-#: data/default/buildings.ruleset:1460 data/civ2/buildings.ruleset:1442
+#: data/default/buildings.ruleset:1459 data/civ2/buildings.ruleset:1442
msgid "Sun Tzu's War Academy"
msgstr "Akademia Wojny Sun Tzu"
-#: data/default/buildings.ruleset:1474
+#: data/default/buildings.ruleset:1473
msgid ""
"All your new ground units start at the first veteran level. The chance of a "
"unit getting the next veteran level after a battle increases by half."
@@ -19666,21 +19821,21 @@ msgstr ""
"(we wszystkich miastach). Szansa uzyskania nowego poziomu doświadczenia "
"zwiększana jest o połowę."
-#: data/default/buildings.ruleset:1481 data/civ2/buildings.ruleset:1463
+#: data/default/buildings.ruleset:1480 data/civ2/buildings.ruleset:1463
#: data/civ1/buildings.ruleset:1020
msgid "United Nations"
msgstr "ONZ"
-#: data/default/buildings.ruleset:1495
+#: data/default/buildings.ruleset:1494
msgid "All your units regain two extra hitpoints per turn."
msgstr "Twoje jednostki odzyskujÄ… dodatkowe 2 hitpointy na turÄ™."
-#: data/default/buildings.ruleset:1508 data/civ2/buildings.ruleset:1490
+#: data/default/buildings.ruleset:1507 data/civ2/buildings.ruleset:1490
#: data/civ1/buildings.ruleset:1046
msgid "Women's Suffrage"
msgstr "Równouprawnienie"
-#: data/default/buildings.ruleset:1522 data/civ2/buildings.ruleset:1504
+#: data/default/buildings.ruleset:1521 data/civ2/buildings.ruleset:1504
msgid ""
"Counts as a Police Station in every city. (That is, for each city, reduces "
"unhappiness for military units outside the city by 2 under Democracy and 1 "
@@ -19691,11 +19846,11 @@ msgstr ""
"uszczęśliwianych. Podczas republiki tylko jeden. W innych ustrojach ten cud "
"nie wpływa na nic.)"
-#: data/default/buildings.ruleset:1533
+#: data/default/buildings.ruleset:1532
msgid "Coinage"
msgstr "Kapitalizacja"
-#: data/default/buildings.ruleset:1554
+#: data/default/buildings.ruleset:1553
msgid ""
"This is not a normal improvement. Instead, setting a city's production to "
"Coinage means its shield production is converted to tax output (money, "
@@ -20146,12 +20301,17 @@ msgstr "?city_state:Spokój"
msgid "?citystyle:Industrial"
msgstr "?city:Neutralne"
-#: data/default/cities.ruleset:139 data/civ2/cities.ruleset:150
+#: data/default/cities.ruleset:139
+#, fuzzy
+msgid "?citystyle:ElectricAge"
+msgstr "?city_state:Spokój"
+
+#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:150
#, fuzzy
msgid "?citystyle:Modern"
msgstr "?city_state:Zamieszki"
-#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:161
+#: data/default/cities.ruleset:161 data/civ2/cities.ruleset:161
#, fuzzy
msgid "?citystyle:PostModern"
msgstr "?city_state:Zamieszki"
@@ -25465,6 +25625,47 @@ msgstr "Zespół"
msgid "Team 31"
msgstr "Zespół"
+#~ 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."
+
+#~ msgid "Observers cannot vote."
+#~ msgstr "Obserwatorzy nie mogą głosować."
+
+#~ msgid ""
+#~ "You can only vote in a running game. Use 'first' to become the game "
+#~ "organizer if there currently is none."
+#~ msgstr ""
+#~ "Głosować można jedynie w już wystartowanej grze. Użyj polecenia 'first' "
+#~ "aby zostać organizatorem gry, jeśli jeszcze takiego nie ma."
+
+#~ msgid "Vote %d \"%s\": %d for, %d against"
+#~ msgstr "GÅ‚osowanie %d \"%s\": %d za, %d przeciw"
+
+#~ msgid "Value must be integer."
+#~ msgstr "Wartość musi być liczbą całkowitą."
+
+#~ 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 Hydro Plant, Power Plant, or Nuclear Plant. A "
+#~ "city can only build a Hydro Plant if it is next to (or on) a Mountain or "
+#~ "River tile."
+#~ msgstr ""
+#~ "Zmniejsza zanieczyszczenie tworzone przez miasto o 50% oraz zwiększa "
+#~ "produkcjÄ™ fabryki lub fabryki zautomatyzowanej. Fabryka + elektrownia "
+#~ "wodna dajÄ… 75% wzrost, a Fabryka + fabryka zautomatyzowana + elektrownia "
+#~ "wodna dajÄ… w sumie 150% wzrost.\n"
+#~ "\n"
+#~ "Miasto może mieć tylko jedną elektrownię: wodną, cieplną lub atomową. "
+#~ "Elektrownia wodna może być budowana tylko obok albo na polu z rzeką lub "
+#~ "górą."
+
#, fuzzy
#~ msgid "Auth config filename \"%s\" not allowed!"
#~ msgstr "To imiÄ™ nie jest dozwolone."
diff --git a/po/pt.gmo b/po/pt.gmo
index 2473ca8..2d1b345 100644
Binary files a/po/pt.gmo and b/po/pt.gmo differ
diff --git a/po/pt.po b/po/pt.po
index f8782b4..a0f09ba 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: 2009-03-29 21:13+0900\n"
+"POT-Creation-Date: 2009-11-22 21:37+0100\n"
"PO-Revision-Date: 2007-09-01 22:56+0300\n"
"Last-Translator: Duarte Loreto <happyguy_pt at hotmail.com>\n"
"Language-Team: \n"
@@ -68,21 +68,21 @@ msgstr "?obsoleto:O"
msgid "?redundant:*"
msgstr "?redundante:*"
-#: common/connection.c:515
+#: common/connection.c:518
#, c-format
msgid "%s from %s"
msgstr "%s de %s"
-#: common/connection.c:521
+#: common/connection.c:524
msgid " (connection incomplete)"
msgstr " (ligação incompleta)"
-#: common/connection.c:525
+#: common/connection.c:528
#, c-format
msgid " (player %s)"
msgstr " (jogador %s)"
-#: common/connection.c:529
+#: common/connection.c:532
msgid " (observer)"
msgstr " (observador)"
@@ -497,83 +497,83 @@ msgstr "A Ligar"
msgid "AI Debug messages"
msgstr ""
-#: common/player.c:732
+#: common/player.c:746
msgid "?attitude:Genocidal"
msgstr ""
-#: common/player.c:734
+#: common/player.c:748
msgid "?attitude:Belligerent"
msgstr ""
-#: common/player.c:736
+#: common/player.c:750
msgid "?attitude:Hostile"
msgstr ""
-#: common/player.c:738
+#: common/player.c:752
msgid "?attitude:Uncooperative"
msgstr ""
-#: common/player.c:740
+#: common/player.c:754
msgid "?attitude:Uneasy"
msgstr ""
-#: common/player.c:742
+#: common/player.c:756
#, fuzzy
msgid "?attitude:Neutral"
msgstr "?diplomatic_state:Neutral"
-#: common/player.c:744
+#: common/player.c:758
msgid "?attitude:Respectful"
msgstr ""
-#: common/player.c:746
+#: common/player.c:760
msgid "?attitude:Helpful"
msgstr ""
-#: common/player.c:748
+#: common/player.c:762
msgid "?attitude:Enthusiastic"
msgstr ""
-#: common/player.c:750
+#: common/player.c:764
msgid "?attitude:Admiring"
msgstr ""
-#: common/player.c:753
+#: common/player.c:767
msgid "?attitude:Worshipful"
msgstr ""
-#: common/player.c:764
+#: common/player.c:778
#, fuzzy
msgid "?diplomatic_state:Armistice"
msgstr "?diplomatic_state:Aliança"
-#: common/player.c:765
+#: common/player.c:779
msgid "?diplomatic_state:War"
msgstr "?diplomatic_state:Guerra"
-#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:780 client/gui-gtk-2.0/diplodlg.c:353
#: 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:767 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:781 client/gui-gtk-2.0/diplodlg.c:358
#: 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:768 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:782 client/gui-gtk-2.0/diplodlg.c:363
#: 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:769
+#: common/player.c:783
msgid "?diplomatic_state:Never met"
msgstr "?diplomatic_state:Nunca se encontraram"
-#: common/player.c:770
+#: common/player.c:784
#, fuzzy
msgid "?diplomatic_state:Team"
msgstr "?diplomatic_state:Paz"
@@ -605,7 +605,7 @@ msgstr ""
#. TRANS: "Resources: (none)".
#: common/requirements.c:1014 common/team.c:132
#: client/gui-gtk-2.0/helpdlg.c:1055 client/gui-gtk-2.0/inteldlg.c:390
-#: client/gui-win32/helpdlg.c:586 client/gui-xaw/helpdlg.c:991
+#: client/gui-win32/helpdlg.c:592 client/gui-xaw/helpdlg.c:991
#, fuzzy, c-format
msgid "(none)"
msgstr "nada"
@@ -631,10 +631,11 @@ msgstr "Tecn. Futura %d"
#: 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
#: client/gui-sdl/helpdlg.c:817 client/gui-sdl/mapview.c:962
-#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:545
-#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:735
-#: 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
+#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:544
+#: client/gui-win32/helpdlg.c:551 client/gui-win32/helpdlg.c:721
+#: client/gui-win32/helpdlg.c:741 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 "Nenhum"
@@ -648,29 +649,29 @@ msgstr "Tecn. Futura %d"
msgid "(Unknown)"
msgstr "(Desconhecido)"
-#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:553
#: manual/civmanual.c:224
msgid "Road"
msgstr "Estrada"
-#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:557
#: client/gui-gtk-2.0/menu.c:829 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:394 common/terrain.c:572 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:567
#: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
#: data/civ1/techs.ruleset:563
msgid "Railroad"
msgstr "Caminho de Ferro"
-#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:555
msgid "Mine"
msgstr "Mina"
-#: common/terrain.c:396 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:551 server/report.c:124
#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "Poluição"
@@ -679,7 +680,7 @@ msgstr "Poluição"
msgid "Hut"
msgstr "Cabana"
-#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:563
#: manual/civmanual.c:226
msgid "Fortress"
msgstr "Fortaleza"
@@ -692,58 +693,58 @@ msgstr "Rio"
msgid "Farmland"
msgstr "Quinta"
-#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:577
#: manual/civmanual.c:226
msgid "Airbase"
msgstr "Base Aérea"
-#: common/terrain.c:402 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:579
msgid "Fallout"
msgstr "Chuva Nuclear"
-#: common/unit.c:546 client/gui-win32/plrdlg.c:337
+#: common/unit.c:549 client/gui-win32/plrdlg.c:337
msgid "Idle"
msgstr "Ocioso"
-#: common/unit.c:556
+#: common/unit.c:559
msgid "Fortifying"
msgstr "A Fortificar"
-#: common/unit.c:558
+#: common/unit.c:561
msgid "Fortified"
msgstr "Fortificado"
-#: common/unit.c:562 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
+#: common/unit.c:565 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
msgid "Sentry"
msgstr "Sentinela"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
+#: common/unit.c:569 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
#: client/gui-win32/menu.c:370 client/gui-xaw/menu.c:185
msgid "Pillage"
msgstr "Pilhar"
-#: common/unit.c:568 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
+#: common/unit.c:571 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
msgid "Goto"
msgstr "Ir Para"
-#: common/unit.c:570
+#: common/unit.c:573
msgid "Explore"
msgstr "Explorar"
-#: common/unit.c:572 manual/civmanual.c:224
+#: common/unit.c:575 manual/civmanual.c:224
msgid "Transform"
msgstr "Transformar"
-#: common/unit.c:584 client/text.c:157 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:587 client/text.c:157 client/gui-sdl/citydlg.c:1972
#: client/gui-win32/citydlg.c:1257 client/gui-xaw/citydlg.c:1423
msgid "Unknown"
msgstr "Desconhecido"
-#: common/unit.c:1022
+#: common/unit.c:1025
msgid "Moves"
msgstr "Movimentos"
-#: common/unit.c:1571
+#: common/unit.c:1574
#, c-format
msgid ""
"Upgrade %s to %s for %d gold?\n"
@@ -752,12 +753,12 @@ msgstr ""
"Actualizar %s para %s por %d moedas?\n"
"Tesouro contém %d moedas."
-#: common/unit.c:1579
+#: common/unit.c:1582
#, fuzzy, c-format
msgid "Sorry, cannot upgrade %s (yet)."
msgstr "Desculpe: incapaz de actualizar %s."
-#: common/unit.c:1585
+#: common/unit.c:1588
#, c-format
msgid ""
"Upgrading %s to %s costs %d gold.\n"
@@ -766,11 +767,11 @@ msgstr ""
"Actualizar %s para %s custa %d moedas.\n"
"Tesouro contém %d moedas."
-#: common/unit.c:1594
+#: common/unit.c:1597
msgid "You can only upgrade units in your cities."
msgstr ""
-#: common/unit.c:1598
+#: common/unit.c:1601
#, c-format
msgid "Upgrading this %s would strand units it transports."
msgstr ""
@@ -807,11 +808,11 @@ msgstr "MÃssil Nuclear"
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1404
+#: common/unittype.c:349 client/helpdata.c:1412
msgid " and "
msgstr " e "
-#: common/unittype.c:355 client/helpdata.c:1390
+#: common/unittype.c:355 client/helpdata.c:1398
msgid "?and:, "
msgstr "?e:, "
@@ -981,72 +982,72 @@ msgstr "Argumento vazio para \"%s\".\n"
msgid "Missing argument for \"%s\".\n"
msgstr "Argumento em falta para \"%s\".\n"
-#: utility/shared.c:501
+#: utility/shared.c:514
#, c-format
msgid "%d BC"
msgstr "%d AC"
-#: utility/shared.c:503
+#: utility/shared.c:516
#, c-format
msgid "%d AD"
msgstr "%d DC"
-#: utility/shared.c:924
+#: utility/shared.c:937
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:1028
+#: utility/shared.c:1041
#, c-format
msgid "Could not read data directory %s: %s."
msgstr "Incapaz de ler directório de dados %s: %s."
-#: utility/shared.c:1279
+#: utility/shared.c:1292
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:1281
+#: utility/shared.c:1294
#, c-format
msgid "Current data path is: \"%s\""
msgstr "Caminho de dados actual é: \"%s\""
-#: utility/shared.c:1283
+#: utility/shared.c:1296
#, c-format
msgid "The \"%s\" file is required ... aborting!"
msgstr "O ficheiro \"%s\" é requerido ... a abortar!"
-#: utility/shared.c:1460
+#: utility/shared.c:1485
#, 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:1462
+#: utility/shared.c:1487
msgid "Use a non-privileged account instead.\n"
msgstr "Utilize uma conta sem privilégios (não 'root').\n"
-#: utility/shared.c:1478
+#: utility/shared.c:1503
msgid "exact match"
msgstr "equivalência perfeita"
-#: utility/shared.c:1479
+#: utility/shared.c:1504
msgid "only match"
msgstr "única equivalência"
-#: utility/shared.c:1480
+#: utility/shared.c:1505
msgid "ambiguous"
msgstr "ambÃguo"
-#: utility/shared.c:1481
+#: utility/shared.c:1506
msgid "empty"
msgstr "vazio"
-#: utility/shared.c:1482
+#: utility/shared.c:1507
msgid "too long"
msgstr "demasiado longo"
-#: utility/shared.c:1483
+#: utility/shared.c:1508
msgid "non-match"
msgstr "não-equivalente"
@@ -1075,108 +1076,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:280
+#: ai/advdiplomacy.c:300
#, c-format
msgid "*%s (AI)* In away mode AI can't sign such a treaty."
msgstr ""
-#: ai/advdiplomacy.c:290
+#: ai/advdiplomacy.c:310
#, c-format
msgid "*%s (AI)* First break alliance with %s, %s."
msgstr ""
-#: ai/advdiplomacy.c:303
+#: ai/advdiplomacy.c:322
#, c-format
msgid "*%s (AI)* Let us first cease hostilies, %s."
msgstr ""
-#: ai/advdiplomacy.c:308
+#: ai/advdiplomacy.c:327
#, c-format
msgid ""
"*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
"first, %s."
msgstr ""
-#: ai/advdiplomacy.c:331
+#: ai/advdiplomacy.c:350
#, c-format
msgid "*%s (AI)* I simply do not trust you with an alliance yet, %s."
msgstr ""
-#: ai/advdiplomacy.c:424
+#: ai/advdiplomacy.c:443
#, c-format
msgid "*%s (AI)* I do not know the city you mention."
msgstr ""
-#: ai/advdiplomacy.c:454
+#: ai/advdiplomacy.c:473
#, c-format
msgid "*%s (AI)* Sorry, sharing vision with you is not safe."
msgstr ""
-#: ai/advdiplomacy.c:560
+#: ai/advdiplomacy.c:579
#, c-format
msgid "*%s (AI)* This deal was not very good for us, %s!"
msgstr ""
-#: ai/advdiplomacy.c:582
+#: ai/advdiplomacy.c:601
#, c-format
msgid "*%s (AI)* Welcome into our alliance %s!"
msgstr ""
-#: ai/advdiplomacy.c:586
+#: ai/advdiplomacy.c:605
#, c-format
msgid "*%s (AI)* Yes, may we forever stand united, %s."
msgstr ""
-#: ai/advdiplomacy.c:593
+#: ai/advdiplomacy.c:612
#, c-format
msgid "*%s (AI)* Yes, peace in our time!"
msgstr ""
-#: ai/advdiplomacy.c:598
+#: ai/advdiplomacy.c:617
#, c-format
msgid "*%s (AI)* Agreed. No more hostilities, %s."
msgstr ""
-#: ai/advdiplomacy.c:813
+#: ai/advdiplomacy.c:832
#, c-format
msgid ""
"*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
"other better?"
msgstr ""
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1116
#, c-format
msgid "*%s (AI)* Space will never be yours. "
msgstr ""
-#: ai/advdiplomacy.c:1102
+#: ai/advdiplomacy.c:1121
#, c-format
msgid "*%s (AI)* I have tolerated your vicious antics long enough! To war!"
msgstr ""
-#: ai/advdiplomacy.c:1108
+#: ai/advdiplomacy.c:1127
#, c-format
msgid "*%s (AI)* Peace in ... some other time."
msgstr ""
-#: ai/advdiplomacy.c:1113
+#: ai/advdiplomacy.c:1132
#, 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:1119
+#: ai/advdiplomacy.c:1138
#, c-format
msgid "*%s (AI)* Your covert hostilities brought this war upon you!"
msgstr ""
-#: ai/advdiplomacy.c:1126
+#: ai/advdiplomacy.c:1145
#, c-format
msgid "*%s (AI)* Your aggression against %s was your last mistake!"
msgstr ""
-#: ai/advdiplomacy.c:1209
+#: ai/advdiplomacy.c:1229
#, c-format
msgid ""
"*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1187,14 +1188,14 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1219
+#: ai/advdiplomacy.c:1239
#, c-format
msgid ""
"*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
"alliance!"
msgstr ""
-#: ai/advdiplomacy.c:1225
+#: ai/advdiplomacy.c:1245
#, c-format
msgid ""
"*%s (AI)* %s has grossly violated his treaties with us for own gain. We "
@@ -1207,7 +1208,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1238
+#: ai/advdiplomacy.c:1258
#, c-format
msgid ""
"*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1218,13 +1219,13 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1246
+#: ai/advdiplomacy.c:1266
#, c-format
msgid ""
"*%s (AI)* If you want a piece of the loot, feel free to join in the action!"
msgstr ""
-#: ai/advdiplomacy.c:1251
+#: ai/advdiplomacy.c:1271
#, c-format
msgid ""
"*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1235,12 +1236,12 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1261
+#: ai/advdiplomacy.c:1281
#, c-format
msgid "*%s (AI)* As our glorious allies, we expect your help in this war."
msgstr ""
-#: ai/advdiplomacy.c:1267
+#: ai/advdiplomacy.c:1287
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance and declare war on %s in %d turn. "
@@ -1251,7 +1252,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1276
+#: ai/advdiplomacy.c:1296
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1262,47 +1263,47 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1344
+#: ai/advdiplomacy.c:1364
#, 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:1359
+#: ai/advdiplomacy.c:1379
#, c-format
msgid ""
"*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
"offensive."
msgstr ""
-#: ai/advdiplomacy.c:1362
+#: ai/advdiplomacy.c:1382
#, c-format
msgid ""
"*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
"take action!"
msgstr ""
-#: ai/advdiplomacy.c:1474
+#: ai/advdiplomacy.c:1494
#, c-format
msgid "*%s (AI)* Sorry, sharing vision with you is no longer safe."
msgstr ""
-#: ai/advdiplomacy.c:1549
+#: ai/advdiplomacy.c:1569
#, c-format
msgid ""
"*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
"our enemy, %s."
msgstr ""
-#: ai/advdiplomacy.c:1555
+#: ai/advdiplomacy.c:1575
#, 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:1562
+#: ai/advdiplomacy.c:1582
#, c-format
msgid ""
"*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1310,26 +1311,26 @@ msgid ""
"more!"
msgstr ""
-#: ai/advdiplomacy.c:1592
+#: ai/advdiplomacy.c:1612
#, c-format
msgid ""
"*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
"an alliance?"
msgstr ""
-#: ai/advdiplomacy.c:1607
+#: ai/advdiplomacy.c:1627
#, c-format
msgid "*%s (AI)* Greetings neighbour, may we suggest more peaceful relations?"
msgstr ""
-#: ai/advdiplomacy.c:1622
+#: ai/advdiplomacy.c:1642
#, c-format
msgid ""
"*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
"cessation of hostilities?"
msgstr ""
-#: ai/advdiplomacy.c:1742
+#: ai/advdiplomacy.c:1762
#, c-format
msgid ""
"*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1471,17 +1472,17 @@ msgid ""
"minimum %d [printable] characters long. Try again."
msgstr ""
-#: server/barbarian.c:183
+#: server/barbarian.c:184
#, c-format
msgid "%s gain a leader by the name %s. Dangerous times may lie ahead."
msgstr ""
-#: server/barbarian.c:479
+#: server/barbarian.c:480
#, c-format
msgid "Native unrest near %s led by %s."
msgstr "Levantamento popular perto de %s liderado por %s."
-#: server/barbarian.c:484
+#: server/barbarian.c:485
#, c-format
msgid "Sea raiders seen near %s!"
msgstr "Piratas avistados próximo de %s!"
@@ -1874,7 +1875,7 @@ msgid_plural "%s boosts research; you gain %d immediate advances."
msgstr[0] "%s potencia a investigação, você ganha imediatamente 2 avanços."
msgstr[1] "%s potencia a investigação, você ganha imediatamente 2 avanços."
-#: server/cityturn.c:1158 server/techtools.c:176
+#: server/cityturn.c:1158 server/techtools.c:172
#, fuzzy, c-format
msgid "The %s have acquired %s from %s."
msgstr "Os %s adquiriram %s dos %s."
@@ -1958,22 +1959,22 @@ msgid "Warning: the %s option is obsolete. Use -m to enable the metaserver.\n"
msgstr ""
"Aviso: a opção %s está obsoleta. Utilize -m para activar o metaservidor.\n"
-#: server/civserver.c:189
+#: server/civserver.c:193
#, c-format
msgid "Error: unknown option '%s'\n"
msgstr "Erro: opção desconhecida '%s'\n"
-#: server/civserver.c:200
+#: server/civserver.c:204
#, c-format
msgid "This is the server for %s"
msgstr "Este é o servidor para %s"
-#: server/civserver.c:201
+#: server/civserver.c:205
#, c-format
msgid "You can learn a lot about Freeciv at %s"
msgstr "Pode aprender muito sobre o Freeciv em %s"
-#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
+#: server/civserver.c:210 client/civclient.c:239 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -1982,107 +1983,113 @@ msgstr ""
"Modo de utilização: %s [opção ...]\n"
"Opções válidas são:\n"
-#: server/civserver.c:208
+#: server/civserver.c:212
msgid ""
" -a --auth FILE\tEnable server authentication with configuration from "
"FILE.\n"
msgstr ""
-#: server/civserver.c:210
+#: server/civserver.c:214
msgid " -G --Guests\t\tAllow guests to login if auth is enabled.\n"
msgstr ""
-#: server/civserver.c:212
+#: server/civserver.c:216
msgid " -N --Newusers\tAllow new users to login if auth is enabled.\n"
msgstr ""
-#: server/civserver.c:215
+#: server/civserver.c:219
#, fuzzy
msgid " -b --bind ADDR\tListen for clients on ADDR\n"
msgstr " -p, --port PORTO\tEscuta por clientes no porto PORTO\n"
-#: server/civserver.c:217 client/civclient.c:242
+#: server/civserver.c:221 client/civclient.c:243
msgid ""
" -d, --debug NUM\tSet debug log level (0 to 4, or 4:file1,min,max:...)\n"
msgstr ""
" -d, --debug NUM\tDefine nÃvel log depuração (0 a 4, ou 4:ficheiro1,mÃn,"
"máx:...)\n"
-#: server/civserver.c:221 client/civclient.c:246
+#: server/civserver.c:225 client/civclient.c:247
msgid " -d, --debug NUM\tSet debug log level (0 to 3)\n"
msgstr " -d, --debug NUM\tDefine nÃvel log depuração (0 a 3)\n"
-#: server/civserver.c:223
+#: server/civserver.c:227
msgid " -f, --file FILE\tLoad saved game FILE\n"
msgstr " -f, --file FICHEIRO\tLer jogo gravado em FICHEIRO\n"
-#: server/civserver.c:225 client/civclient.c:249 manual/civmanual.c:382
+#: server/civserver.c:229 client/civclient.c:250 manual/civmanual.c:382
msgid " -h, --help\t\tPrint a summary of the options\n"
msgstr " -h, --help\t\tApresenta um resumo das opções\n"
-#: server/civserver.c:226
+#: server/civserver.c:230
+#, fuzzy
+msgid " -i, --identity ADDR\tBe known as ADDR at metaserver\n"
+msgstr ""
+" -M, --Metaserver ENDEREÇO\tDefine endereço do Metaservidor como ENDEREÇO\n"
+
+#: server/civserver.c:231
msgid " -l, --log FILE\tUse FILE as logfile\n"
msgstr " -l, --log FICHEIRO\tUtiliza FICHEIRO para o registo\n"
-#: server/civserver.c:227
+#: server/civserver.c:232
msgid " -m, --meta\t\tNotify metaserver and send server's info\n"
msgstr " -m, --meta\t\tNotificar metaservidor e enviar info de servidor\n"
-#: server/civserver.c:229
+#: server/civserver.c:234
msgid " -M, --Metaserver ADDR\tSet ADDR as metaserver address\n"
msgstr ""
" -M, --Metaserver ENDEREÇO\tDefine endereço do Metaservidor como ENDEREÇO\n"
-#: server/civserver.c:232
+#: server/civserver.c:237
msgid " -p, --port PORT\tListen for clients on port PORT\n"
msgstr " -p, --port PORTO\tEscuta por clientes no porto PORTO\n"
-#: server/civserver.c:234
+#: server/civserver.c:239
msgid " -q, --quitidle TIME\tQuit if no players for TIME seconds\n"
msgstr " -q, --quitidle TEMPO\tSair se sem jogadores após TEMPO segundos\n"
-#: server/civserver.c:236
+#: server/civserver.c:241
msgid " -e, --exit-on-end\tWhen a game ends, exit instead of restarting\n"
msgstr ""
-#: server/civserver.c:239
+#: server/civserver.c:244
msgid " -s, --saves DIR\tSave games to directory DIR\n"
msgstr ""
-#: server/civserver.c:241
+#: server/civserver.c:246
#, fuzzy
msgid " -S, --Serverid ID\tSets the server id to ID\n"
msgstr " -s, --server SERVIDOR\tLigar ao servidor em SERVIDOR\n"
-#: server/civserver.c:243
+#: server/civserver.c:248
msgid " -P, --Ppm\t\tSave ppms of the map when saving the game.\n"
msgstr ""
-#: server/civserver.c:244
+#: server/civserver.c:249
msgid " -r, --read FILE\tRead startup script FILE\n"
msgstr " -r, --read FICHEIRO\tLer ficheiro de arranque FICHEIRO\n"
-#: server/civserver.c:246
+#: server/civserver.c:251
#, fuzzy
msgid " -R, --Ranklog FILE\tUse FILE as ranking logfile\n"
msgstr " -l, --log FICHEIRO\tUtiliza FICHEIRO para o registo\n"
-#: server/civserver.c:247 client/civclient.c:268 manual/civmanual.c:383
+#: server/civserver.c:252 client/civclient.c:269 manual/civmanual.c:383
msgid " -v, --version\t\tPrint the version number\n"
msgstr " -v, --version\t\tApresenta o número de versão\n"
-#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
+#: server/civserver.c:253 client/gui-gtk-2.0/gui_main.c:354
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, fuzzy, c-format
msgid "Report bugs at %s.\n"
msgstr "Relate erros (bugs) para <%s> (em Inglês).\n"
-#: server/commands.c:28
+#: server/commands.c:29
msgid "Start the game, or restart after loading a savegame."
msgstr "Iniciar o jogo, ou reinicia-lo após ler um jogo gravado."
-#: server/commands.c:29
+#: server/commands.c:30
msgid ""
"This command starts the game. When starting a new game, it should be used "
"after all human players have connected, and AI players have been created (if "
@@ -2102,7 +2109,7 @@ msgstr ""
"efeito."
#. TRANS: translate text between <> only
-#: server/commands.c:42
+#: server/commands.c:44
msgid ""
"help\n"
"help commands\n"
@@ -2116,11 +2123,11 @@ msgstr ""
"help <nome-de-comando>\n"
"help <nome-de-opção>"
-#: server/commands.c:47
+#: server/commands.c:49
msgid "Show help about server commands and server options."
msgstr "Mostra ajuda sobre comandos e opções do servidor."
-#: server/commands.c:48
+#: server/commands.c:50
msgid ""
"With no arguments gives some introductory help. With argument \"commands\" "
"or \"options\" gives respectively a list of all commands or all options. "
@@ -2136,12 +2143,12 @@ msgstr ""
"valores actual e por omissão para essa opção. O argumento pode ser "
"abreviado quando não for ambÃguo."
-#: server/commands.c:63
+#: server/commands.c:66
#, fuzzy
msgid "Show a list of players, teams, connections, or scenarios."
msgstr "Mostra a lista de jogadores ou ligações."
-#: server/commands.c:64
+#: server/commands.c:67
#, fuzzy
msgid ""
"Show a list of players in the game, teams of players, connections to the "
@@ -2151,20 +2158,20 @@ msgstr ""
"Mostra uma lista de jogadores ou uma lista de ligações ao servidor. O "
"argumento pode ser abreviado, e por omissão é 'players' quando ausente."
-#: server/commands.c:70
+#: server/commands.c:74
msgid "Quit the game and shutdown the server."
msgstr "Termina o jogo e desliga o servidor."
#. TRANS: translate text between <> only
-#: server/commands.c:74
+#: server/commands.c:79
msgid "cut <connection-name>"
msgstr "cut <nome-ligação>"
-#: server/commands.c:75
+#: server/commands.c:80
msgid "Cut a client's connection to server."
msgstr "Corta a ligação de um cliente ao servidor."
-#: server/commands.c:76
+#: server/commands.c:81
msgid ""
"Cut specified client's connection to the server, removing that client from "
"the game. If the game has not yet started that client's player is removed "
@@ -2178,7 +2185,7 @@ msgstr ""
"jogadores."
#. TRANS: translate text between <> only
-#: server/commands.c:83
+#: server/commands.c:89
msgid ""
"explain\n"
"explain <option-name>"
@@ -2186,11 +2193,11 @@ msgstr ""
"explain\n"
"explain <nome-de-opção>"
-#: server/commands.c:85
+#: server/commands.c:91
msgid "Explain server options."
msgstr "Explica opções do servidor."
-#: server/commands.c:86
+#: server/commands.c:92
msgid ""
"The 'explain' command gives a subset of the functionality of 'help', and is "
"included for backward compatibility. With no arguments it gives a list of "
@@ -2203,7 +2210,7 @@ msgstr ""
"para uma opção especÃfica (tal como 'help <nome-opção>')."
#. TRANS: translate text between <> only
-#: server/commands.c:93
+#: server/commands.c:100
msgid ""
"show\n"
"show <option-name>\n"
@@ -2213,11 +2220,11 @@ msgstr ""
"show <nome-de-opção>\n"
"show <prefixo-de-opção>"
-#: server/commands.c:96
+#: server/commands.c:103
msgid "Show server options."
msgstr "Mostra as opções do servidor."
-#: server/commands.c:97
+#: server/commands.c:104
msgid ""
"With no arguments, shows all server options (or available options, when used "
"by clients). With an argument, show only the named option, or options with "
@@ -2227,72 +2234,73 @@ msgstr ""
"disponÃveis, quando utilizadas pelos clientes). Com um argumento, mostra "
"apenas a opção com esse nome, ou as opções com esse prefixo."
-#: server/commands.c:102
+#: server/commands.c:110
msgid "wall <message>"
msgstr "wall <mensagem>"
-#: server/commands.c:103
+#: server/commands.c:111
msgid "Send message to all connections."
msgstr "Envia uma mensagem para todas as ligações."
-#: server/commands.c:104
+#: server/commands.c:112
msgid ""
"For each connected client, pops up a window showing the message entered."
msgstr "Em cada cliente ligado, mostra uma janela com a mensagem introduzida."
-#: server/commands.c:108
+#: server/commands.c:117
msgid "vote yes|no [vote number]"
msgstr ""
-#: server/commands.c:109
+#: server/commands.c:118
#, fuzzy
msgid "Cast a vote."
msgstr "Cidades Costeiras"
-#: server/commands.c:111
+#: server/commands.c:120
#, 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."
+"A player with basic 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."
msgstr ""
-#: server/commands.c:121
+#: server/commands.c:131
msgid ""
"debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
"<player> | timing | info]"
msgstr ""
-#: server/commands.c:123
+#: server/commands.c:133
msgid "Turn on or off AI debugging of given entity."
msgstr ""
-#: server/commands.c:124
+#: server/commands.c:134
msgid ""
"Print AI debug information about given entity and turn continous debugging "
"output for this entity on or off."
msgstr ""
-#: server/commands.c:128
+#: server/commands.c:139
msgid "set <option-name> <value>"
msgstr "set <nome-de-opção> <valor>"
-#: server/commands.c:129
+#: server/commands.c:140
msgid "Set server option."
msgstr "Define opção do servidor."
-#: server/commands.c:132
+#: server/commands.c:144
msgid "team <player> [team]"
msgstr "team <nome-de-jogador> [equipa]"
-#: server/commands.c:133
+#: server/commands.c:145
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:134
+#: server/commands.c:146
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 +2313,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:141
+#: server/commands.c:154
msgid "rulesetdir <directory>"
msgstr "rulesetdir <directório>"
-#: server/commands.c:142
+#: server/commands.c:155
#, fuzzy
msgid "Choose new ruleset directory or modpack."
msgstr "Directório de conjunto de regras actual é \"%s\""
-#: server/commands.c:143
+#: server/commands.c:156
msgid ""
"Choose new ruleset directory or modpack. Calling this\n"
" without any arguments will show you the currently selected ruleset."
@@ -2323,15 +2331,15 @@ msgstr ""
"Invocar sem argumentos apresenta o conjunto de regras actual."
#. TRANS: translate text between <> only
-#: server/commands.c:149
+#: server/commands.c:163
msgid "metainfo <meta-line>"
msgstr "metainfo <meta-linha>"
-#: server/commands.c:150
+#: server/commands.c:164
msgid "Set metaserver info line."
msgstr "Define a linha de informação do metaservidor."
-#: server/commands.c:151
+#: server/commands.c:165
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 +2348,21 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:158
+#: server/commands.c:173
#, fuzzy
msgid "metapatch <meta-line>"
msgstr "metainfo <meta-linha>"
-#: server/commands.c:159
+#: server/commands.c:174
#, fuzzy
msgid "Set metaserver patches line."
msgstr "Define a linha de informação do metaservidor."
-#: server/commands.c:165
+#: server/commands.c:181
msgid "Control metaserver connection."
msgstr "Controla a ligação ao metaservidor."
-#: server/commands.c:166
+#: server/commands.c:182
msgid ""
"'metaconnection ?' reports on the status of the connection to metaserver.\n"
"'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2365,34 +2373,34 @@ msgstr ""
"'metaconnection up' ou 'metac u' estabelece ligação com o metaservidor."
#. TRANS: translate text between <> only
-#: server/commands.c:172
+#: server/commands.c:189
msgid "metaserver <address>"
msgstr "metaservidor <endereço>"
-#: server/commands.c:173
+#: server/commands.c:190
#, 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:177
+#: server/commands.c:195
msgid "aitoggle <player-name>"
msgstr "aitoggle <nome-de-jogador>"
-#: server/commands.c:178
+#: server/commands.c:196
msgid "Toggle AI status of player."
msgstr "Alterna estado IA do jogador."
#. TRANS: translate text between [] and <> only
-#: server/commands.c:182
+#: server/commands.c:201
msgid "take [connection-name] <player-name>"
msgstr "take [nome-ligação] <nome-de-jogador>"
-#: server/commands.c:183
+#: server/commands.c:202
msgid "Take over a player's place in the game."
msgstr "Tomar o lugar de um jogador no jogo."
-#: server/commands.c:184
+#: server/commands.c:203
#, fuzzy
msgid ""
"Only the console and connections with cmdlevel 'hack' can force other "
@@ -2406,17 +2414,17 @@ msgstr ""
"apenas é permitido o argumento <nome-de-jogador>"
#. TRANS: translate text between [] only
-#: server/commands.c:192
+#: server/commands.c:212
#, fuzzy
msgid "observe [connection-name] [player-name]"
msgstr "take [nome-ligação] <nome-de-jogador>"
-#: server/commands.c:193
+#: server/commands.c:213
#, fuzzy
msgid "Observe a player or the whole game."
msgstr "Removido do jogo o jogador %s."
-#: server/commands.c:194
+#: server/commands.c:214
#, fuzzy
msgid ""
"Only the console and connections with cmdlevel 'hack' can force other "
@@ -2430,16 +2438,16 @@ msgstr ""
"apenas é permitido o argumento <nome-de-jogador>"
#. TRANS: translate text between <> only
-#: server/commands.c:202
+#: server/commands.c:223
#, fuzzy
msgid "detach <connection-name>"
msgstr "cut <nome-ligação>"
-#: server/commands.c:203
+#: server/commands.c:224
msgid "detach from a player."
msgstr ""
-#: server/commands.c:204
+#: server/commands.c:225
#, fuzzy
msgid ""
"Only the console and connections with cmdlevel 'hack' can force other "
@@ -2450,20 +2458,20 @@ msgstr ""
"apenas é permitido o argumento <nome-de-jogador>"
#. TRANS: translate text between <> only
-#: server/commands.c:209
+#: server/commands.c:231
msgid "create <player-name>"
msgstr "create <nome-de-jogador>"
-#: server/commands.c:210
+#: server/commands.c:232
msgid "Create an AI player with a given name."
msgstr "Cria um jogador IA com o nome indicado."
-#: server/commands.c:211
+#: server/commands.c:233
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:215
+#: server/commands.c:238
msgid ""
"away\n"
"away"
@@ -2471,16 +2479,16 @@ msgstr ""
"away\n"
"away"
-#: server/commands.c:217
+#: server/commands.c:240
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:218
+#: server/commands.c:241
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:222
+#: server/commands.c:246
msgid ""
"novice\n"
"novice <player-name>"
@@ -2488,11 +2496,11 @@ msgstr ""
"novice\n"
"novice <nome-jogador>"
-#: server/commands.c:224
+#: server/commands.c:248
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:225
+#: server/commands.c:249
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 "
@@ -2504,7 +2512,7 @@ msgstr ""
"jogador."
#. TRANS: translate text between <> only
-#: server/commands.c:231
+#: server/commands.c:256
msgid ""
"easy\n"
"easy <player-name>"
@@ -2512,11 +2520,11 @@ msgstr ""
"easy\n"
"easy <nome-de-jogador>"
-#: server/commands.c:233
+#: server/commands.c:258
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:234
+#: server/commands.c:259
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 "
@@ -2528,7 +2536,7 @@ msgstr ""
"jogador."
#. TRANS: translate text between <> only
-#: server/commands.c:240
+#: server/commands.c:266
msgid ""
"normal\n"
"normal <player-name>"
@@ -2536,11 +2544,11 @@ msgstr ""
"normal\n"
"normal <nome-de-jogador>"
-#: server/commands.c:242
+#: server/commands.c:268
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:243
+#: server/commands.c:269
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 +2560,7 @@ msgstr ""
"jogador."
#. TRANS: translate text between <> only
-#: server/commands.c:249
+#: server/commands.c:276
msgid ""
"hard\n"
"hard <player-name>"
@@ -2560,11 +2568,11 @@ msgstr ""
"hard\n"
"hard <nome-de-jogador>"
-#: server/commands.c:251
+#: server/commands.c:278
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:252
+#: server/commands.c:279
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 "
@@ -2576,7 +2584,7 @@ msgstr ""
"jogador."
#. TRANS: translate text between <> only
-#: server/commands.c:258
+#: server/commands.c:286
msgid ""
"experimental\n"
"experimental <player-name>"
@@ -2584,11 +2592,11 @@ msgstr ""
"experimental\n"
"experimental <nome-de-jogador>"
-#: server/commands.c:260
+#: server/commands.c:288
msgid "Set one or all AI players to 'experimental'."
msgstr "Coloca um ou todos os jogadores IA em nÃvel 'experimental'."
-#: server/commands.c:261
+#: server/commands.c:289
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 +2610,7 @@ msgstr ""
"servidores normais, esta opção não tem qualquer efeito."
#. TRANS: translate text between <> only
-#: server/commands.c:269
+#: server/commands.c:298
msgid ""
"cmdlevel\n"
"cmdlevel <level>\n"
@@ -2616,18 +2624,20 @@ msgstr ""
"cmdlevel <nÃvel> first\n"
"cmdlevel <nÃvel> <nome-de-ligação>"
-#: server/commands.c:274
+#: server/commands.c:303
msgid "Query or set command access level access."
msgstr "Questiona ou define acesso a nÃvel de acesso de comandos."
-#: server/commands.c:275
+#: server/commands.c:304
#, fuzzy
msgid ""
"The command access level controls which server commands are available\n"
"to users via the client chatline. The available levels are:\n"
" none - no commands\n"
-" info - informational commands only\n"
+" info - informational or observer commands only\n"
+" basic - commands available to players in the game\n"
" ctrl - commands that affect the game and users\n"
+" admin - commands that affect server operation\n"
" hack - *all* commands - dangerous!\n"
"With no arguments, the current command access levels are reported.\n"
"With a single argument, the level is set for all existing connections,\n"
@@ -2667,20 +2677,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:296
+#: server/commands.c:328
msgid "If there is none, become the game organizer with increased permissions."
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:301
+#: server/commands.c:334
msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
msgstr "timeoutincrease <turno> <increm_turno> <valor> <mult_valor>"
-#: server/commands.c:302
+#: server/commands.c:335
msgid "See \"help timeoutincrease\"."
msgstr "Consulte \"help timeoutincrease\"."
-#: server/commands.c:303
+#: server/commands.c:336
msgid ""
"Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
"<turn> and multiply <value> by <valuemult>. Use this command in concert "
@@ -2692,42 +2702,61 @@ msgstr ""
"0 1"
#. TRANS: translate text between <> only
-#: server/commands.c:309
+#: server/commands.c:343
+msgid ""
+"cancelvote\n"
+"cancelvote <vote number>\n"
+"cancelvote all\n"
+msgstr ""
+
+#: server/commands.c:346
+msgid "Cancel a running vote.\n"
+msgstr ""
+
+#: server/commands.c:347
+msgid ""
+"With no arguments this command removes your own vote. If you have an admin "
+"access level, you can cancel any vote by vote number, or all votes with the "
+"'all' argument."
+msgstr ""
+
+#. TRANS: translate text between <> only
+#: server/commands.c:354
#, fuzzy
msgid "endgame"
msgstr "Renomear"
-#: server/commands.c:310
+#: server/commands.c:355
#, fuzzy
msgid "End the game immediately in a draw."
msgstr "Este comando termina imediatamente o jogo."
#. TRANS: translate text between <> only
-#: server/commands.c:314
+#: server/commands.c:360
msgid "surrender"
msgstr ""
-#: server/commands.c:315
+#: server/commands.c:361
#, fuzzy
msgid "Concede the game."
msgstr "Terminar o jogo."
-#: server/commands.c:316
+#: server/commands.c:362
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:322
+#: server/commands.c:369
msgid "remove <player-name>"
msgstr "remove <nome-de-jogador>"
-#: server/commands.c:323
+#: server/commands.c:370
msgid "Fully remove player from game."
msgstr "Remove completamente o jogador."
-#: server/commands.c:324
+#: server/commands.c:371
msgid ""
"This *completely* removes a player from the game, including all cities and "
"units etc. Use with care!"
@@ -2736,7 +2765,7 @@ msgstr ""
"etc. Utilizar com cautela!"
#. TRANS: translate text between <> only
-#: server/commands.c:329
+#: server/commands.c:377
msgid ""
"save\n"
"save <file-name>"
@@ -2744,11 +2773,11 @@ msgstr ""
"save\n"
"save <nome-de-ficheiro>"
-#: server/commands.c:331
+#: server/commands.c:379
msgid "Save game to file."
msgstr "Grava jogo para ficheiro."
-#: server/commands.c:332
+#: server/commands.c:380
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"
@@ -2765,7 +2794,7 @@ msgstr ""
"e utilize o comando 'start' após os jogadores se terem ligado novamente."
#. TRANS: translate text between <> only
-#: server/commands.c:341
+#: server/commands.c:390
msgid ""
"load\n"
"load <file-name>"
@@ -2773,11 +2802,11 @@ msgstr ""
"load\n"
"load <nome-de-ficheiro>"
-#: server/commands.c:343
+#: server/commands.c:392
msgid "Load game from file."
msgstr "Lê jogo do ficheiro."
-#: server/commands.c:344
+#: server/commands.c:393
msgid ""
"Load a game from <file-name>. Any current data including players, rulesets "
"and server options are lost.\n"
@@ -2786,120 +2815,120 @@ msgstr ""
"jogadores, conjuntos de regras e opções de servidor são perdidos.\n"
#. TRANS: translate text between <> only
-#: server/commands.c:349
+#: server/commands.c:399
msgid "read <file-name>"
msgstr "read <nome-de-ficheiro>"
-#: server/commands.c:350
+#: server/commands.c:400
msgid "Process server commands from file."
msgstr "Processa comandos do servidor a partir do ficheiro."
#. TRANS: translate text between <> only
-#: server/commands.c:354
+#: server/commands.c:405
msgid "write <file-name>"
msgstr "write <nome-de-ficheiro>"
-#: server/commands.c:355
+#: server/commands.c:406
msgid "Write current settings as server commands to file."
msgstr "Grava as opções do servidor como comandos para o ficheiro."
-#: server/commands.c:359
+#: server/commands.c:411
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:363
+#: server/commands.c:416
msgid "Simply returns the id of the server."
msgstr ""
-#: server/connecthand.c:85
+#: server/connecthand.c:109
#, c-format
msgid "Welcome to the %s Server running at %s port %d."
msgstr "Bem vindo ao Servidor %s em execução em %s no porto %d."
-#: server/connecthand.c:89
+#: server/connecthand.c:113
#, c-format
msgid "Welcome to the %s Server at port %d."
msgstr "Bem vindo ao Servidor %s no porto %d."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:97
+#: server/connecthand.c:121
#, fuzzy, c-format
msgid "(%d) %s: connected [%s]"
msgstr "(%d) %s ligou-se de %s."
-#: server/connecthand.c:104
+#: server/connecthand.c:128
#, c-format
msgid "Server: %s has connected from %s."
msgstr "Servidor: %s ligou-se de %s."
-#: server/connecthand.c:145
+#: server/connecthand.c:175
msgid "Couldn't attach your connection to new player."
msgstr "Incapaz de anexar a sua ligação a um novo jogador."
-#: server/connecthand.c:165
+#: server/connecthand.c:199
#, fuzzy, c-format
msgid "You are logged in as '%s' connected to no player."
msgstr "Incapaz de anexar a sua ligação a um novo jogador."
-#: server/connecthand.c:169
+#: server/connecthand.c:203
#, c-format
msgid "You are logged in as '%s' connected to an anonymous player."
msgstr ""
-#: server/connecthand.c:174
+#: server/connecthand.c:208
#, c-format
msgid "You are logged in as '%s' connected to %s."
msgstr ""
-#: server/connecthand.c:187
+#: server/connecthand.c:221
#, c-format
msgid "Turn-blocking game play: waiting on %s to finish turn..."
msgstr "Jogo bloqueia em turno: a aguardar que %s termine o turno..."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:240
+#: server/connecthand.c:274
#, fuzzy, c-format
msgid "(%d) %s: connection request [%s]"
msgstr "(%d) Pedido de ligação de %s a partir de %s"
-#: server/connecthand.c:266
+#: server/connecthand.c:300
#, fuzzy
msgid "The client is missing a capability that this server needs."
msgstr "O cliente não possui uma funcionalidade que este servidor necessita."
-#: server/connecthand.c:268 server/connecthand.c:279
+#: server/connecthand.c:302 server/connecthand.c:313
#, fuzzy, c-format
msgid "(%d) %s rejected: mismatched capabilities!"
msgstr "(%d) %s foi rejeitado: As funcionalidades não coincidiam."
-#: server/connecthand.c:277
+#: server/connecthand.c:311
#, fuzzy
msgid "This server is missing a capability that the client needs."
msgstr "O servidor não possui uma funcionalidade que o cliente necessita."
-#: server/connecthand.c:290
+#: server/connecthand.c:324
#, fuzzy
msgid "The username is invalid!"
msgstr "Nome de utilizador inválido"
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:292
+#: server/connecthand.c:326
#, fuzzy, c-format
msgid "(%d) %s rejected: invalid username [%s]"
msgstr "(%d) %s foi rejeitado: Nome inválido [%s]."
-#: server/connecthand.c:303
+#: server/connecthand.c:337
#, fuzzy
msgid "Your username is already connected!"
msgstr "já está ligado."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:305
+#: server/connecthand.c:339
#, fuzzy, c-format
msgid "(%d) %s rejected: duplicate username [%s]"
msgstr "(%d) %s foi rejeitado: Jogo já iniciado e nome %s desconhecido."
-#: server/connecthand.c:335 server/connecthand.c:344
+#: server/connecthand.c:369 server/connecthand.c:378
#, c-format
msgid "Lost connection: %s."
msgstr "Perdida a ligação: %s."
@@ -2916,112 +2945,112 @@ msgstr "Ok. Seleccionado estilo normal."
msgid "For introductory help, type 'help'."
msgstr "Para ajuda inicial, escreva 'help'."
-#: server/diplhand.c:164
+#: server/diplhand.c:167
#, fuzzy, c-format
msgid "The %s can't accept %s."
msgstr "Os %s aprenderam %s."
-#: server/diplhand.c:176
+#: server/diplhand.c:179
#, c-format
msgid "You don't have tech %s, you can't accept treaty."
msgstr "Você não possui a tecn. %s, não pode aceitar o tratado."
-#: server/diplhand.c:185
+#: server/diplhand.c:188
msgid "City you are trying to give no longer exists, you can't accept treaty."
msgstr ""
"A cidade que está a oferecer já não existe, não pode aceitar o tratado."
-#: server/diplhand.c:191
+#: server/diplhand.c:194
#, c-format
msgid "You are not owner of %s, you can't accept treaty."
msgstr "Você não é o senhor de %s, não pode aceitar o tratado."
-#: server/diplhand.c:197 server/diplhand.c:301
+#: server/diplhand.c:200 server/diplhand.c:304
#, c-format
msgid "Your capital (%s) is requested, you can't accept treaty."
msgstr "A sua capital (%s) é requerida, não pode aceitar o tratado."
-#: server/diplhand.c:224
+#: server/diplhand.c:227
msgid "You don't have enough gold, you can't accept treaty."
msgstr "Você não tem moedas suficientes, não pode aceitar o tratado."
-#: server/diplhand.c:256 server/diplhand.c:261
+#: server/diplhand.c:259 server/diplhand.c:264
#, c-format
msgid "A treaty containing %d clause was agreed upon."
msgid_plural "A treaty containing %d clauses was agreed upon."
msgstr[0] "Foi acordado um tratado contendo %d cláusula."
msgstr[1] "Foi acordado um tratado contendo %d cláusulas."
-#: server/diplhand.c:277 server/diplhand.c:281
+#: server/diplhand.c:280 server/diplhand.c:284
#, fuzzy, c-format
msgid "One of the cities the %s are giving away is destroyed! Treaty canceled!"
msgstr ""
" Uma das cidades que %s está a oferecer está cancelada! Tratado cancelado!"
-#: server/diplhand.c:288 server/diplhand.c:293
+#: server/diplhand.c:291 server/diplhand.c:296
#, c-format
msgid "The %s no longer control %s! Treaty canceled!"
msgstr "Os %s já não controlam %s! Tratado cancelado!"
-#: server/diplhand.c:331 server/diplhand.c:335
+#: server/diplhand.c:334 server/diplhand.c:338
#, c-format
msgid "The %s don't have the promised amount of gold! Treaty canceled!"
msgstr " Os %s não possuem a quantia de moedas prometida! Tratado cancelado!"
-#: server/diplhand.c:364
+#: server/diplhand.c:367
#, fuzzy, c-format
msgid "You gave an embassy to %s."
msgstr "Você criou uma embaixada em %s."
-#: server/diplhand.c:367
+#: server/diplhand.c:370
#, c-format
msgid "%s allowed you to create an embassy!"
msgstr ""
-#: server/diplhand.c:383
+#: server/diplhand.c:386
#, c-format
msgid "You are taught the knowledge of %s."
msgstr "É-lhe ensinado o conhecimento de %s."
-#: server/diplhand.c:387
+#: server/diplhand.c:390
#, c-format
msgid "The %s have acquired %s from the %s."
msgstr "Os %s adquiriram %s dos %s."
-#: server/diplhand.c:402
+#: server/diplhand.c:405
#, c-format
msgid "You get %d gold."
msgstr "Você obteve %d moedas."
#. TRANS: ... Polish worldmap.
-#: server/diplhand.c:410
+#: server/diplhand.c:413
#, fuzzy, c-format
msgid "You receive the %s worldmap."
msgstr "Você recebeu o mapa mundo de %s."
#. TRANS: ... Polish seamap.
-#: server/diplhand.c:419
+#: server/diplhand.c:422
#, fuzzy, c-format
msgid "You receive the %s seamap."
msgstr "Você recebeu o mapa marÃtimo de %s."
-#: server/diplhand.c:436
+#: server/diplhand.c:439
#, c-format
msgid "You receive city of %s from %s."
msgstr "Você recebeu a cidade %s dos %s."
-#: server/diplhand.c:441
+#: server/diplhand.c:444
#, c-format
msgid "You give city of %s to %s."
msgstr "Você dá a cidade de %s aos %s."
-#: server/diplhand.c:454 server/diplhand.c:457
+#: server/diplhand.c:457 server/diplhand.c:460
#, c-format
msgid "You agree on a cease-fire with %s."
msgstr "Você assina um acordo de cessar-fogo com %s."
#. TRANS: ... the Poles ... Polish territory.
-#: server/diplhand.c:476 server/diplhand.c:488
+#: server/diplhand.c:479 server/diplhand.c:491
#, c-format
msgid ""
"You agree on an armistice with the %s. In %d turn, it will become a peace "
@@ -3032,32 +3061,32 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: server/diplhand.c:512 server/diplhand.c:515
+#: server/diplhand.c:515 server/diplhand.c:518
#, c-format
msgid "You agree on an alliance with %s."
msgstr "Você forma uma aliança com %s."
-#: server/diplhand.c:524
+#: server/diplhand.c:527
#, c-format
msgid "You give shared vision to %s."
msgstr "Você partilha a visão com %s."
-#: server/diplhand.c:527
+#: server/diplhand.c:530
#, c-format
msgid "%s gives you shared vision."
msgstr "%s partilhou a visão consigo."
-#: server/diplhand.c:663
+#: server/diplhand.c:666
#, c-format
msgid "%s canceled the meeting!"
msgstr "%s cancelou o encontro!"
-#: server/diplhand.c:670
+#: server/diplhand.c:673
#, c-format
msgid "Meeting with %s canceled."
msgstr "Encontro com %s cancelado."
-#: server/diplhand.c:712
+#: server/diplhand.c:715
msgid "Your diplomatic envoy was decapitated!"
msgstr ""
@@ -3241,80 +3270,80 @@ msgid "The %s destroyed the %s in %s."
msgstr "Os %s destruÃram %s em %s."
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1091
+#: server/diplomats.c:1097
#, fuzzy, c-format
msgid "An enemy %s has been eliminated by your %s."
msgstr "Uma %s inimiga foi eliminada ao defender %s."
#. TRANS: <unit> ... <city> ... <diplomat>
-#: server/diplomats.c:1098
+#: server/diplomats.c:1104
#, fuzzy, c-format
msgid "Your %s has been eliminated defending %s against a %s."
msgstr "O seu %s foi eliminado ao defender-se contra %s em %s."
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1106
+#: server/diplomats.c:1112
#, fuzzy, c-format
msgid "Your %s has been eliminated defending against a %s."
msgstr "O seu %s foi eliminado ao defender-se contra em %s."
-#: server/diplomats.c:1119
+#: server/diplomats.c:1125
#, fuzzy, c-format
msgid "Your %s was eliminated by a defending %s."
msgstr "O seu %s foi eliminado por um %s em defesa de %s."
-#: server/diplomats.c:1127
+#: server/diplomats.c:1133
#, c-format
msgid "Eliminated %s %s while infiltrating %s."
msgstr "Eliminado %s %s ao infiltrar-se em %s."
-#: server/diplomats.c:1134
+#: server/diplomats.c:1140
#, fuzzy, c-format
msgid "Eliminated %s %s while infiltrating our troops."
msgstr "Eliminado %s %s ao infiltrar-se em %s."
-#: server/diplomats.c:1185
+#: server/diplomats.c:1191
#, fuzzy, c-format
msgid ""
"Your %s has successfully completed the mission and returned unharmed to %s."
msgstr " O seu %s completou a sua missão com sucesso e voltou ileso para %s."
-#: server/diplomats.c:1204
+#: server/diplomats.c:1210
#, fuzzy, c-format
msgid "Your %s was captured after completing the mission in %s."
msgstr "O seu %s foi capturado após completar a sua missão em %s."
-#: server/diplomats.c:1210
+#: server/diplomats.c:1216
#, fuzzy, c-format
msgid "Your %s was captured after completing the mission."
msgstr "O seu %s foi capturado após terminar a sua missão."
-#: server/diplomats.c:1242
+#: server/diplomats.c:1248
#, fuzzy, c-format
msgid "You have caused an incident while bribing the %s %s."
msgstr "Você causou um incidente ao subornar o %s de %s."
-#: server/diplomats.c:1247
+#: server/diplomats.c:1253
#, c-format
msgid "%s has caused an incident while bribing your %s."
msgstr "%s causou um incidente ao subornar o seu %s."
-#: server/diplomats.c:1254
+#: server/diplomats.c:1260
#, fuzzy, c-format
msgid "You have caused an incident while attempting to steal tech from %s."
msgstr "Você causou um incidente ao roubar tecnologia de %s."
-#: server/diplomats.c:1258
+#: server/diplomats.c:1264
#, fuzzy, c-format
msgid "%s has caused an incident while attempting to steal tech from you."
msgstr "%s causou um incidente ao roubar-lhe tecnologia."
-#: server/diplomats.c:1264
+#: server/diplomats.c:1270
#, c-format
msgid "You have caused an incident while inciting a revolt in %s."
msgstr "Você causou um incidente ao incitar uma revolta em %s."
-#: server/diplomats.c:1268
+#: server/diplomats.c:1274
#, c-format
msgid "%s have caused an incident while inciting a revolt in %s."
msgstr "%s causou um incidente ao incitar uma revolta em %s."
@@ -3434,12 +3463,12 @@ msgstr ""
" Os trabalhadores juntam-se espontâneamente e colocam carris em todas "
"as cidades."
-#: server/maphand.c:1418
+#: server/maphand.c:1425
#, 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:1436
+#: server/maphand.c:1443
#, fuzzy, c-format
msgid "Disbanded your %s due to changing terrain."
msgstr ""
@@ -3449,7 +3478,7 @@ msgstr ""
msgid "Not reporting to the metaserver in this game."
msgstr "A não reportar ao metaservidor neste jogo."
-#: server/meta.c:430
+#: server/meta.c:432
#, c-format
msgid "Metaserver: bad address: [%s:%d]."
msgstr "Metaservidor: endereço inválido: [%s:%d]."
@@ -3566,42 +3595,42 @@ msgid ""
"with %s."
msgstr ""
-#: server/plrhand.c:1103
+#: server/plrhand.c:1115
#, c-format
msgid "Removing player %s."
msgstr "A remover o jogador %s."
-#: server/plrhand.c:1105
+#: server/plrhand.c:1117
msgid "You've been removed from the game!"
msgstr "Você foi removido do jogo!"
-#: server/plrhand.c:1108
+#: server/plrhand.c:1120
#, c-format
msgid "%s has been removed from the game."
msgstr "%s foi removido do jogo."
-#: server/plrhand.c:1153 server/plrhand.c:1158
+#: server/plrhand.c:1167 server/plrhand.c:1172
#, 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:1178
+#: server/plrhand.c:1192
#, c-format
msgid ""
"%s and %s meet and go to instant war. You cancel your alliance with both."
msgstr ""
-#: server/plrhand.c:1656
+#: server/plrhand.c:1670
#, c-format
msgid "Could not throw %s into civil war - too many players"
msgstr ""
-#: server/plrhand.c:1663
+#: server/plrhand.c:1677
#, c-format
msgid "Could not throw %s into civil war - no available nations"
msgstr ""
-#: server/plrhand.c:1686
+#: server/plrhand.c:1700
#, fuzzy, c-format
msgid ""
"Your nation is thrust into civil war! %s is declared the leader of the rebel "
@@ -3610,12 +3639,12 @@ msgstr ""
" A sua nação caÃu numa guerra civil, %s é declarado lÃder dos estados "
"rebeldes."
-#: server/plrhand.c:1707
+#: server/plrhand.c:1721
#, c-format
msgid "%s declares allegiance to %s."
msgstr "%s forma uma aliança com %s."
-#: server/plrhand.c:1722
+#: server/plrhand.c:1736
#, fuzzy, c-format
msgid ""
"Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3808,67 +3837,67 @@ msgstr "(edifÃcio %s em %s (%s))\n"
msgid "Wonders of the World"
msgstr "Maravilhas do Mundo"
-#: server/report.c:547
+#: server/report.c:552
msgid " sq. mi."
msgstr " milhas quadradas"
-#: server/report.c:557
+#: server/report.c:562
msgid " M tons"
msgstr " M toneladas"
-#: server/report.c:562
+#: server/report.c:567
msgid " M goods"
msgstr " M bens"
-#: server/report.c:567
+#: server/report.c:572
msgid " bulbs"
msgstr ""
-#: server/report.c:572
+#: server/report.c:577
msgid " month"
msgid_plural " months"
msgstr[0] " mês"
msgstr[1] " meses"
-#: server/report.c:577
+#: server/report.c:582
msgid " ton"
msgid_plural " tons"
msgstr[0] " tonelada"
msgstr[1] " toneladas"
-#: server/report.c:591
+#: server/report.c:596
msgid "st"
msgstr "º"
-#: server/report.c:593
+#: server/report.c:598
msgid "nd"
msgstr "º"
-#: server/report.c:595
+#: server/report.c:600
msgid "rd"
msgstr "º"
-#: server/report.c:597
+#: server/report.c:602
msgid "th"
msgstr "º"
-#: server/report.c:700
+#: server/report.c:705
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:743 server/report.c:768
+#: server/report.c:748 server/report.c:773
msgid "Demographics Report:"
msgstr "Relatório Demográfico:"
-#: server/report.c:744
+#: server/report.c:749
msgid "Sorry, the Demographics report is unavailable."
msgstr "Desculpe, o relatório Demográfico não se encontra disponÃvel."
#. TRANS: <nation adjective> <government name> (<year>).
#. * E.g. "Polish Despotism (200 AD)".
-#: server/report.c:750
+#: server/report.c:755
#, fuzzy, c-format
msgid "%s %s (%s)"
msgstr "%s em %s (%s)\n"
@@ -3879,11 +3908,11 @@ msgstr "%s em %s (%s)\n"
msgid "Could not find a readable \"%s.%s\" ruleset file."
msgstr "Ficheiro legÃvel de regras \"%s\" não encontrado."
-#: server/ruleset.c:2356
+#: server/ruleset.c:2366
msgid "No barbarian nation in rulesets, at least one required!"
msgstr ""
-#: server/ruleset.c:3166
+#: server/ruleset.c:3178
msgid "Loading rulesets"
msgstr "A ler conjuntos de regras"
@@ -3899,13 +3928,13 @@ msgstr ""
"com jogos gravados antigos, ou pode indicar um jogo gravado inválido. "
"Prossiga por sua conta e risco."
-#: server/savegame.c:3588
+#: server/savegame.c:3587
#, 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."
#. TRANS: Fatal error message.
-#: server/savegame.c:3815
+#: server/savegame.c:3817
#, fuzzy
msgid ""
"Saved game uses the \"classic\" terrain ruleset, and is no longer supported."
@@ -3913,7 +3942,7 @@ msgstr ""
"O jogo gravado utiliza o conjunto de regras de terreno clássicas, que já não "
"é suportado."
-#: server/savegame.c:3824
+#: server/savegame.c:3826
#, c-format
msgid ""
"Warning: Different rulesetdirs ('%s' and '%s') are no longer supported. "
@@ -3923,7 +3952,7 @@ msgstr ""
"A utilizar '%s'."
#. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4051
+#: server/savegame.c:4055
#, c-format
msgid "%s had invalid nation; changing to %s."
msgstr ""
@@ -3960,7 +3989,7 @@ msgstr "Industrial"
msgid "Networking"
msgstr ""
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:734
#: client/gui-win32/dialogs.c:532
msgid "All"
msgstr "Todas"
@@ -5108,11 +5137,11 @@ msgstr ""
"turno ao ficheiro \"civscore.log\". Estas estatÃsticas podem ser utilizadas "
"após o jogo para gerar gráficos de poder."
-#: server/sernet.c:150
+#: server/sernet.c:151
msgid "Server cannot read standard input. Ignoring input."
msgstr "Servidor incapaz de ler da consola. A ignorar consola."
-#: server/sernet.c:929
+#: server/sernet.c:933
#, fuzzy, c-format
msgid "Server: bad address: [%s:%d]."
msgstr "Metaservidor: endereço inválido: [%s:%d]."
@@ -5188,35 +5217,35 @@ msgstr "A sua nave já possui o número máximo de Módulos de Painel Solar!"
msgid "Without guidance from the capital, the %s spaceship is lost!"
msgstr "Sem orientação da capital, a nave espacial %s foi perdida!"
-#: server/srv_main.c:240
+#: server/srv_main.c:242
msgid "Game ended in a draw as end year exceeded"
msgstr "Jogo terminou com um empate pois foi ultrapassado o ano final"
-#: server/srv_main.c:274
+#: server/srv_main.c:276
#, c-format
msgid "The %s spaceship has arrived at Alpha Centauri."
msgstr "A nave espacial dos %s chegou a Alfa Centauro."
-#: server/srv_main.c:287 server/srv_main.c:322
+#: server/srv_main.c:289 server/srv_main.c:324
#, c-format
msgid "Team victory to %s"
msgstr "Vitória de equipa para %s"
-#: server/srv_main.c:297 server/srv_main.c:338
+#: server/srv_main.c:299 server/srv_main.c:340
#, c-format
msgid "Game ended in victory for %s"
msgstr "Jogo terminou com a vitória de %s"
-#: server/srv_main.c:345
+#: server/srv_main.c:347
msgid "Game ended in a draw"
msgstr "Jogo terminou com um empate"
-#: server/srv_main.c:461 server/srv_main.c:472
+#: server/srv_main.c:465 server/srv_main.c:476
#, c-format
msgid "Your %s was disbanded in accordance with your peace treaty with the %s."
msgstr ""
-#: server/srv_main.c:512 server/srv_main.c:516
+#: server/srv_main.c:516 server/srv_main.c:520
#, c-format
msgid ""
"Concerned citizens point out that the cease-fire with %s will run out soon."
@@ -5224,13 +5253,13 @@ msgstr ""
" Cidadãos preocupados lembram-lhe que o cessar-fogo com %s vai expirar "
"brevemente."
-#: server/srv_main.c:521 server/srv_main.c:525
+#: server/srv_main.c:525 server/srv_main.c:529
#, fuzzy, c-format
msgid "The cease-fire with %s has run out. You are now at war with the %s."
msgstr ""
" O cessar-fogo com %s expirou. Você e os %s então agora em neutralidade."
-#: server/srv_main.c:542
+#: server/srv_main.c:546
#, fuzzy, c-format
msgid ""
"Ceasefire between %s and %s has run out. They are at war. You cancel your "
@@ -5238,345 +5267,335 @@ msgid ""
msgstr ""
" O cessar-fogo com %s expirou. Você e os %s então agora em neutralidade."
-#: server/srv_main.c:961
+#: server/srv_main.c:997
#, c-format
msgid "Failed saving game as %s"
msgstr "Falha ao gravar o jogo como %s"
-#: server/srv_main.c:963
+#: server/srv_main.c:999
#, c-format
msgid "Game saved as %s"
msgstr "Jogo gravado como %s"
-#: server/srv_main.c:994
+#: server/srv_main.c:1030
msgid "The game is already running."
msgstr "O jogo já foi iniciado."
-#: server/srv_main.c:1002
+#: server/srv_main.c:1038
#, c-format
msgid "%s lost control cmdlevel on game start. Use voting from now on."
msgstr ""
-#: server/srv_main.c:1009
+#: server/srv_main.c:1045
msgid "Starting game."
msgstr "A iniciar o jogo."
-#: server/srv_main.c:1071
+#: server/srv_main.c:1112
#, c-format
msgid "request for unknown report (type %d)"
msgstr "pedido de relatório desconhecido (tipo %d)"
-#: server/srv_main.c:1136
+#: server/srv_main.c:1177
#, fuzzy, c-format
msgid "Warning: rejecting old client %s"
msgstr "Aviso: Receia-se fome em %s."
-#: server/srv_main.c:1238
+#: server/srv_main.c:1279
#, 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:1338
+#: server/srv_main.c:1381
msgid "Please choose a non-blank name."
msgstr "Seleccione um nome não-vazio."
-#: server/srv_main.c:1354
+#: server/srv_main.c:1397
#, fuzzy
msgid "That nation is already in use."
msgstr "O jogo já foi iniciado."
-#: server/srv_main.c:1370
+#: server/srv_main.c:1413
#, 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:1391
+#: server/srv_main.c:1434
#, fuzzy
msgid "Please choose a name containing only ASCII characters."
msgstr "Seleccione um nome não-vazio."
-#: server/srv_main.c:1490
+#: server/srv_main.c:1533
#, c-format
msgid "%s nation is not available in this scenario."
msgstr ""
-#: server/srv_main.c:1496
+#: server/srv_main.c:1539
#, fuzzy, c-format
msgid "%s nation is already in use."
msgstr "O jogo já foi iniciado."
-#: server/srv_main.c:1514
+#: server/srv_main.c:1557
#, c-format
msgid "%s is the %s ruler %s."
msgstr "%s é o governante %s %s."
-#: server/srv_main.c:1570
+#: server/srv_main.c:1613
#, 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:1614 server/srv_main.c:1618
+#: server/srv_main.c:1657 server/srv_main.c:1661
#, 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:1760
+#: server/srv_main.c:1803
#, c-format
msgid "Player %d"
msgstr "Jogador %d"
-#: server/srv_main.c:1771 server/srv_main.c:1777
+#: server/srv_main.c:1814 server/srv_main.c:1820
#, c-format
msgid "%s rules the %s."
msgstr "%s governa os %s."
-#: server/srv_main.c:1942
+#: server/srv_main.c:1985
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
msgstr ""
-#: server/srv_main.c:1993
+#: server/srv_main.c:2037
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr "A enviar informação para o metaservidor [%s]"
-#: server/srv_main.c:2024
+#: server/srv_main.c:2069
msgid "The game is over..."
msgstr "O jogo terminou..."
-#: server/srv_main.c:2237
+#: server/srv_main.c:2286
msgid "Now accepting new client connections."
msgstr "A aceitar novas ligações de clientes."
-#: server/stdinhand.c:246
-#, c-format
-msgid "Vote \"%s\" is passed %d to %d with %d abstentions."
-msgstr ""
-
-#: server/stdinhand.c:253
-#, c-format
-msgid "Vote \"%s\" failed with %d against, %d for and %d abstentions."
-msgstr ""
-
#. TRANS: ambiguous command
-#: server/stdinhand.c:365
+#: server/stdinhand.c:284
msgid "(ambiguous)"
msgstr "(ambÃguo)"
#. TRANS: unrecognized command
#. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:416
+#: server/stdinhand.c:287 client/citydlg_common.c:419
#: 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 "(desconhecido)"
-#: server/stdinhand.c:458
+#: server/stdinhand.c:377
msgid "Name is empty, so cannot be a player."
msgstr "Nome está vazio, pelo que não pode ser um jogador."
-#: server/stdinhand.c:462
+#: server/stdinhand.c:381
msgid "Name is too long, so cannot be a player."
msgstr "Nome demasiado longo, pelo que não pode ser um jogador."
-#: server/stdinhand.c:466
+#: server/stdinhand.c:385
#, c-format
msgid "Player name prefix '%s' is ambiguous."
msgstr "Prefixo de nome de jogador '%s' é ambÃguo."
-#: server/stdinhand.c:470
+#: server/stdinhand.c:389
#, c-format
msgid "No player by the name of '%s'."
msgstr "Não existe nenhum jogador com o nome '%s'."
-#: server/stdinhand.c:474 server/stdinhand.c:509
+#: server/stdinhand.c:393 server/stdinhand.c:428
#, c-format
msgid "Unexpected match_result %d (%s) for '%s'."
msgstr "match_result %d (%s) inesperado para '%s'."
-#: server/stdinhand.c:493
+#: server/stdinhand.c:412
msgid "Name is empty, so cannot be a connection."
msgstr "Nome está vazio, pelo que não pode ser uma ligação."
-#: server/stdinhand.c:497
+#: server/stdinhand.c:416
msgid "Name is too long, so cannot be a connection."
msgstr "Nome demasiado longo, pelo que não pode ser uma ligação."
-#: server/stdinhand.c:501
+#: server/stdinhand.c:420
#, c-format
msgid "Connection name prefix '%s' is ambiguous."
msgstr "Prefixo de nome de ligação '%s' é ambÃguo."
-#: server/stdinhand.c:505
+#: server/stdinhand.c:424
#, c-format
msgid "No connection by the name of '%s'."
msgstr "Não existe nenhuma ligação de nome '%s'."
-#: server/stdinhand.c:525
+#: server/stdinhand.c:444
#, c-format
msgid "Open metaserver connection to [%s]."
msgstr "Estabelecer ligação com o metaservidor [%s]."
-#: server/stdinhand.c:538
+#: server/stdinhand.c:457
#, c-format
msgid "Close metaserver connection to [%s]."
msgstr "Terminar ligação com o metaservidor [%s]."
-#: server/stdinhand.c:553
+#: server/stdinhand.c:472
msgid "Metaserver connection is open."
msgstr "Ligação estabelecida ao metaservidor."
-#: server/stdinhand.c:556
+#: server/stdinhand.c:475
msgid "Metaserver connection is closed."
msgstr "Ligação terminada com metaservidor."
-#: server/stdinhand.c:566
+#: server/stdinhand.c:485
msgid "Metaserver connection is already open."
msgstr "Ligação ao metaservidor já foi estabelecida."
-#: server/stdinhand.c:577
+#: server/stdinhand.c:496
msgid "Metaserver connection is already closed."
msgstr "Ligação do metaservidor já foi terminada."
-#: server/stdinhand.c:582
+#: server/stdinhand.c:501
msgid "Argument must be 'u', 'up', 'd', 'down', or '?'."
msgstr "Argumento deve ser 'u', 'up', 'd', 'down', ou '?'."
-#: server/stdinhand.c:603
+#: server/stdinhand.c:522
#, fuzzy, c-format
msgid "Metaserver patches string set to '%s'."
msgstr "Expressão info no metaservidor definida para '%s'."
-#: server/stdinhand.c:606
+#: server/stdinhand.c:525
#, c-format
msgid "Metaserver patches string set to '%s', not reporting to metaserver."
msgstr ""
-#: server/stdinhand.c:627
+#: server/stdinhand.c:546
#, fuzzy, c-format
msgid "Metaserver message string set to '%s'."
msgstr "Expressão info no metaservidor definida para '%s'."
-#: server/stdinhand.c:630
+#: server/stdinhand.c:549
#, c-format
msgid "Metaserver message string set to '%s', not reporting to metaserver."
msgstr ""
-#: server/stdinhand.c:650
+#: server/stdinhand.c:569
#, c-format
msgid "Metaserver is now [%s]."
msgstr "O metaservidor é agora [%s]."
-#: server/stdinhand.c:660
+#: server/stdinhand.c:579
#, fuzzy, c-format
msgid "Server id: %s"
msgstr "Operador do Servidor: %s"
-#: server/stdinhand.c:757
+#: server/stdinhand.c:676
#, fuzzy
msgid "You cannot save games manually on this server."
msgstr "Termina o jogo e desliga o servidor."
-#: server/stdinhand.c:774
+#: server/stdinhand.c:693
msgid "Cannot toggle a barbarian player."
msgstr "ImpossÃvel alternar um jogador bárbaro."
-#: server/stdinhand.c:781
+#: server/stdinhand.c:700
#, c-format
msgid "%s is now under AI control."
msgstr "%s está agora sob o controlo IA."
-#: server/stdinhand.c:802
+#: server/stdinhand.c:721
#, c-format
msgid "%s is now under human control."
msgstr "%s está agora sob o controlo humano."
-#: server/stdinhand.c:847
+#: server/stdinhand.c:766
msgid "Can't add AI players once the game has begun."
msgstr "ImpossÃvel adicionar jogadores IA após ter iniciado o jogo."
-#: server/stdinhand.c:867
+#: server/stdinhand.c:786
msgid "Can't add more players, server is full."
msgstr "ImpossÃvel adicionar mais jogadores, o servidor está cheio."
-#: server/stdinhand.c:874
+#: server/stdinhand.c:793
msgid "Can't use an empty name."
msgstr "Não pode utilizar um nome vazio."
-#: server/stdinhand.c:881
+#: server/stdinhand.c:800
#, c-format
msgid "That name exceeds the maximum of %d chars."
msgstr "Esse nome excede o tamanho máximo de %d caracteres."
-#: server/stdinhand.c:887
+#: server/stdinhand.c:806
#, fuzzy
msgid "That name is not allowed."
msgstr "Que ligações são permitidas"
-#: server/stdinhand.c:893
+#: server/stdinhand.c:812
msgid "A player already exists by that name."
msgstr "Já existe um jogador com esse nome."
-#: server/stdinhand.c:899
+#: server/stdinhand.c:818
msgid "A user already exists by that name."
msgstr "Já existe um jogador com esse nome."
-#: server/stdinhand.c:925
+#: server/stdinhand.c:844
#, c-format
msgid "%s has been added as an AI-controlled player."
msgstr "%s foi acrescentado como um jogador controlado por IA."
-#: server/stdinhand.c:932
+#: server/stdinhand.c:851
#, c-format
msgid "Error creating new AI player: %s."
msgstr "Erro ao criar novo jogador IA: %s."
-#: server/stdinhand.c:966
+#: server/stdinhand.c:885
msgid "Players cannot be removed once the game has started."
msgstr "Não podem ser removidos jogadores após se ter iniciado o jogo."
-#: server/stdinhand.c:977
+#: server/stdinhand.c:896
#, c-format
msgid "Removed player %s from the game."
msgstr "Removido do jogo o jogador %s."
-#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
+#: server/stdinhand.c:935 server/stdinhand.c:3372 server/stdinhand.c:3507
#, c-format
msgid "Name \"%s\" disallowed for security reasons."
msgstr ""
-#: server/stdinhand.c:1029
+#: server/stdinhand.c:948
#, fuzzy, c-format
msgid "No command script found by the name \"%s\"."
msgstr "Não existe nenhuma ligação de nome '%s'."
-#: server/stdinhand.c:1037
+#: server/stdinhand.c:956
#, c-format
msgid "Loading script file: %s"
msgstr "A ler ficheiro de script: %s"
-#: server/stdinhand.c:1052
+#: server/stdinhand.c:971
#, c-format
msgid "Cannot read command line scriptfile '%s'."
msgstr "Incapaz de ler o ficheiro de script de linha de comando '%s'."
-#: server/stdinhand.c:1054
+#: server/stdinhand.c:973
#, c-format
msgid "Could not read script file '%s'."
msgstr "Incapaz de ler o ficheiro script '%s'."
-#: server/stdinhand.c:1146
+#: server/stdinhand.c:1065
#, c-format
msgid "Could not write script file '%s'."
msgstr "Incapaz de escrever o ficheiro de script '%s'."
-#: server/stdinhand.c:1158
+#: server/stdinhand.c:1077
msgid "You cannot use the write command on this server for security reasons."
msgstr ""
-#: server/stdinhand.c:1186
+#: server/stdinhand.c:1105
#, c-format
msgid ""
"Cannot decrease command access level '%s' for connection '%s'; you only have "
@@ -5585,7 +5604,12 @@ msgstr ""
"Incapaz de reduzir o nÃvel de acesso de comando '%s' para a ligação '%s'; "
"você apenas possui '%s'."
-#: server/stdinhand.c:1241
+#: server/stdinhand.c:1114
+#, 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:1163
#, fuzzy, c-format
msgid ""
"Anyone can now become game organizer '%s' by issuing the 'first' command."
@@ -5593,28 +5617,28 @@ msgstr ""
" Qualquer um pode agora assumir o nÃvel de acesso '%s' emitindo o comando "
"'firstlevel'."
-#: server/stdinhand.c:1274
+#: server/stdinhand.c:1187
msgid "Command access levels in effect:"
msgstr "NÃvel de acesso de comando efectivo:"
-#: server/stdinhand.c:1282
+#: server/stdinhand.c:1194
#, c-format
msgid "Command access level for new connections: %s"
msgstr "NÃvel de acesso de comando para novas ligações: %s"
-#: server/stdinhand.c:1285
+#: server/stdinhand.c:1197
#, c-format
msgid "Command access level for first player to take it: %s"
msgstr "NÃvel de acesso de comando para o primeiro jogador a obte-lo: %s"
-#: server/stdinhand.c:1294
+#: server/stdinhand.c:1206
msgid ""
"Error: command access level must be one of 'none', 'info', 'ctrl', or 'hack'."
msgstr ""
"Erro: nÃvel de acesso de comando tem de ser um de 'none', 'info', 'ctrl', ou "
"'hack'."
-#: server/stdinhand.c:1299
+#: server/stdinhand.c:1211
#, c-format
msgid ""
"Cannot increase command access level to '%s'; you only have '%s' yourself."
@@ -5622,424 +5646,480 @@ msgstr ""
"Não pode aumentar nÃvel de acesso de comando para '%s'; você apenas possui '%"
"s'."
-#: 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: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:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
+#: server/stdinhand.c:1238 server/stdinhand.c:1252 server/stdinhand.c:1273
#, 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:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
+#: server/stdinhand.c:1243 server/stdinhand.c:1257 server/stdinhand.c:1267
#, 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:1402
+#: server/stdinhand.c:1302
#, 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:1406
+#: server/stdinhand.c:1306
#, 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:1411
+#: server/stdinhand.c:1311
#, fuzzy
msgid "Someone else already is game organizer."
msgstr "Desculpe, mas já existe alguém com esse nome."
-#: server/stdinhand.c:1416
+#: server/stdinhand.c:1316
#, c-format
msgid "Connection %s has opted to become the game organizer."
msgstr ""
-#: server/stdinhand.c:1467
+#: server/stdinhand.c:1367
#, c-format
msgid "Invalid argument %d."
msgstr "Argumento inválido %d."
-#: server/stdinhand.c:1474
+#: server/stdinhand.c:1374
msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
msgstr ""
"Utilização: timeoutincrease <turno> <increm_turn> <valor> <mult_valor>."
-#: server/stdinhand.c:1482
+#: server/stdinhand.c:1382
#, 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:1542 server/stdinhand.c:1545
+#: server/stdinhand.c:1442 server/stdinhand.c:1445
msgid "Option:"
msgstr "Opção:"
-#: server/stdinhand.c:1555 server/stdinhand.c:4031
+#: server/stdinhand.c:1455 server/stdinhand.c:4079
msgid "Description:"
msgstr "Descrição:"
-#: server/stdinhand.c:1560
+#: server/stdinhand.c:1460
#, c-format
msgid "Status: %s"
msgstr "Estado: %s"
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "changeable"
msgstr "alterável"
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "fixed"
msgstr "fixo"
-#: server/stdinhand.c:1567
+#: server/stdinhand.c:1467
#, 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:1572
+#: server/stdinhand.c:1472
#, 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:1578
+#: server/stdinhand.c:1478
#, c-format
msgid "Value: \"%s\", Default: \"%s\""
msgstr "Valor: \"%s\", Por Omissão: \"%s\""
-#: server/stdinhand.c:1597
+#: server/stdinhand.c:1497
msgid "Explanations are available for the following server options:"
msgstr "Explicações disponÃveis para as seguintes opções do servidor:"
-#: server/stdinhand.c:1643
+#: server/stdinhand.c:1537
msgid "No explanation for that yet."
msgstr "Ainda não existe explicação para essa opção."
-#: server/stdinhand.c:1646 server/stdinhand.c:2480
+#: server/stdinhand.c:1540 server/stdinhand.c:2468
msgid "Ambiguous option name."
msgstr "Nome de opção ambÃgua."
-#: server/stdinhand.c:1666
+#: server/stdinhand.c:1560
#, c-format
msgid "Server Operator: %s"
msgstr "Operador do Servidor: %s"
-#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
+#: server/stdinhand.c:1686 server/stdinhand.c:1713 server/stdinhand.c:1731
#, 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:1822
+#: server/stdinhand.c:1718
#, c-format
msgid "%s is not controlled by the AI."
msgstr "%s não é controlado por IA."
-#: server/stdinhand.c:1842
+#: server/stdinhand.c:1738
#, 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:1857 server/stdinhand.c:2162
+#: server/stdinhand.c:1753
msgid "This command is client only."
msgstr "Este comando é apenas de cliente."
-#: server/stdinhand.c:1860
+#: server/stdinhand.c:1756
msgid "Usage: away"
msgstr "Utilização: away"
-#: server/stdinhand.c:1865
+#: server/stdinhand.c:1761
msgid "Only players may use the away command."
msgstr ""
-#: server/stdinhand.c:1869
+#: server/stdinhand.c:1765
#, c-format
msgid "%s set to away mode."
msgstr "%s colocado em modo ausente."
-#: server/stdinhand.c:1877
+#: server/stdinhand.c:1772
#, c-format
msgid "%s returned to game."
msgstr "%s voltou ao jogo."
-#: server/stdinhand.c:1919
+#: server/stdinhand.c:1817
#, 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:1925
+#: server/stdinhand.c:1823
#, c-format
msgid "Unknown option '%s'."
msgstr "Opção '%s' desconhecida."
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1848
#, fuzzy
msgid "All options with non-default values"
msgstr "= significa que a opção está com o valor por omissão"
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1851
#, fuzzy
msgid "All options"
msgstr "Definir opções locais"
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1854
#, fuzzy
msgid "Vital options"
msgstr "Opções da cidade"
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1857
#, fuzzy
msgid "Situational options"
msgstr "Definir opções locais"
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1860
msgid "Rarely used options"
msgstr ""
-#: server/stdinhand.c:1965
+#: server/stdinhand.c:1863
msgid "+ means you may change the option"
msgstr "+ significa que pode alterar a opção"
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1864
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:1969
+#: server/stdinhand.c:1867
#, c-format
msgid "%-*s value (min,max) "
msgstr "%-*s valor (mÃn,máx) "
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
msgid "Option"
msgstr "Opção"
-#: server/stdinhand.c:1973
+#: server/stdinhand.c:1871
msgid "description"
msgstr "descrição"
-#: server/stdinhand.c:2042
+#: server/stdinhand.c:1940
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:2092
+#: server/stdinhand.c:1966
msgid "Cannot change teams once game has begun."
msgstr "ImpossÃvel alterar equipas após iniciar o jogo."
-#: server/stdinhand.c:2102
+#: server/stdinhand.c:1976
#, fuzzy
msgid "Undefined argument. Usage: team <player> <team>."
msgstr "Argumento indefinido. Utilização: team <jogador> [equipa]."
-#: server/stdinhand.c:2122
+#: server/stdinhand.c:1996
#, c-format
msgid "No such team %s. Please give a valid team name or number."
msgstr ""
-#: server/stdinhand.c:2129
+#: server/stdinhand.c:2003
#, fuzzy
msgid "Cannot team a barbarian."
msgstr "ImpossÃvel alternar um jogador bárbaro."
-#: server/stdinhand.c:2135
+#: server/stdinhand.c:2009
#, c-format
msgid "Player %s set to team %s."
msgstr "Jogador %s incluida na equipa %s."
-#: server/stdinhand.c:2157
+#: server/stdinhand.c:2035 server/voting.c:512
#, fuzzy
-msgid "Undefined arguments. Usage: vote yes|no [vote number]."
-msgstr "Argumento indefinido. Utilização: team <jogador> [equipa]."
+msgid "Teamvote"
+msgstr "Equipa"
-#: server/stdinhand.c:2165
-msgid "Observers cannot vote."
+#: server/stdinhand.c:2035 server/voting.c:516
+msgid "Vote"
msgstr ""
-#: server/stdinhand.c:2168
+#: server/stdinhand.c:2037
+#, c-format
msgid ""
-"You can only vote in a running game. Use 'first' to become the game "
-"organizer if there currently is none."
+"%s %d \"%s\" (needs %0.0f%%%s): %d for, %d against, and %d abstained out of %"
+"d players."
msgstr ""
-#: server/stdinhand.c:2181
-#, c-format
-msgid "Vote %d \"%s\": %d for, %d against"
+#: server/stdinhand.c:2041
+msgid " no dissent"
msgstr ""
-#: server/stdinhand.c:2188
+#: server/stdinhand.c:2049
msgid "There are no votes going on."
msgstr ""
-#: server/stdinhand.c:2208
-msgid "No legal last vote."
-msgstr ""
+#: server/stdinhand.c:2077
+#, fuzzy
+msgid "Invalid arguments. Usage: vote yes|no|abstain [vote number]."
+msgstr "Argumento indefinido. Utilização: team <jogador> [equipa]."
-#: server/stdinhand.c:2213
+#: server/stdinhand.c:2095 server/stdinhand.c:2213 server/stdinhand.c:3714
+msgid "You are not allowed to use this command."
+msgstr "Você não está autorizado a utilizar este comando."
+
+#: server/stdinhand.c:2104
+#, fuzzy, c-format
+msgid "The argument \"%s\" is ambigious."
+msgstr "O argumento da ajuda '%s' é ambÃguo."
+
+#: server/stdinhand.c:2119
#, fuzzy
-msgid "Value must be integer."
+msgid "There are no votes running."
+msgstr "O jogo já foi iniciado."
+
+#: server/stdinhand.c:2121
+#, c-format
+msgid "No legal last vote (%d %s)."
+msgstr ""
+
+#: server/stdinhand.c:2122
+msgid "other vote running"
+msgid_plural "other votes running"
+msgstr[0] ""
+msgstr[1] ""
+
+#: server/stdinhand.c:2129 server/stdinhand.c:2491 server/stdinhand.c:2532
+msgid "Value must be an integer."
msgstr "Valor tem de ser um inteiro."
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2135 server/stdinhand.c:2221
#, c-format
msgid "No such vote (%d)."
msgstr ""
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2141
+#, fuzzy
+msgid "You are not allowed to vote on that."
+msgstr "Você não está autorizado a definir esta opção."
+
+#: server/stdinhand.c:2146
#, fuzzy, c-format
msgid "You voted for \"%s\""
msgstr "Você fundou %s"
-#: server/stdinhand.c:2232
+#: server/stdinhand.c:2150
#, c-format
msgid "You voted against \"%s\""
msgstr ""
-#: server/stdinhand.c:2259
+#: server/stdinhand.c:2155
+#, c-format
+msgid "You abstained from voting on \"%s\""
+msgstr ""
+
+#: server/stdinhand.c:2190
+msgid "Missing argument <vote number> or the string \"all\"."
+msgstr ""
+
+#: server/stdinhand.c:2197
+#, fuzzy
+msgid "You don't have any vote going on."
+msgstr "Você não possui um trabalhador aqui."
+
+#: server/stdinhand.c:2204
+msgid "There isn't any vote going on."
+msgstr ""
+
+#: server/stdinhand.c:2209
+msgid "Server: All votes have been removed."
+msgstr ""
+
+#: server/stdinhand.c:2226
+#, fuzzy, c-format
+msgid "You are not allowed to cancel this vote (%d)."
+msgstr "Você não está autorizado a definir esta opção."
+
+#: server/stdinhand.c:2232
+msgid "Usage: /cancelvote [<vote number>|all]"
+msgstr ""
+
+#: server/stdinhand.c:2241
+#, c-format
+msgid "Server: %s cancelled the vote \"%s\" (number %d)."
+msgstr ""
+
+#: server/stdinhand.c:2247
+#, c-format
+msgid "Server: The vote \"%s\" (number %d) has been cancelled."
+msgstr ""
+
+#: server/stdinhand.c:2265
msgid ""
"Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
"<x> <y> | unit <id> | tech <player> | timing | info>."
msgstr ""
-#: server/stdinhand.c:2265
+#: server/stdinhand.c:2271
#, fuzzy
msgid "Can only use this command once game has begun."
msgstr "ImpossÃvel alterar equipas após iniciar o jogo."
-#: server/stdinhand.c:2294
+#: server/stdinhand.c:2300
#, c-format
msgid "%s diplomacy no longer debugged"
msgstr ""
-#: server/stdinhand.c:2298
+#: server/stdinhand.c:2304
#, c-format
msgid "%s diplomacy debugged"
msgstr ""
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2323
#, c-format
msgid "%s tech no longer debugged"
msgstr ""
-#: server/stdinhand.c:2321
+#: server/stdinhand.c:2327
#, c-format
msgid "%s tech debugged"
msgstr ""
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2358 server/stdinhand.c:2388
#, fuzzy
msgid "Value 2 & 3 must be integer."
msgstr "Valor tem de ser um inteiro."
-#: server/stdinhand.c:2356 server/stdinhand.c:2386
+#: server/stdinhand.c:2362 server/stdinhand.c:2392
msgid "Bad map coordinates."
msgstr ""
-#: server/stdinhand.c:2361
+#: server/stdinhand.c:2367
msgid "No city at this coordinate."
msgstr ""
-#: server/stdinhand.c:2366
+#: server/stdinhand.c:2372
#, c-format
msgid "%s no longer debugged"
msgstr ""
-#: server/stdinhand.c:2392 server/stdinhand.c:2422
+#: server/stdinhand.c:2398 server/stdinhand.c:2428
#, fuzzy, c-format
msgid "%s %s no longer debugged."
msgstr "%s, unidade %s, sofreu um ataque nuclear."
-#: server/stdinhand.c:2397 server/stdinhand.c:2427
+#: server/stdinhand.c:2403 server/stdinhand.c:2433
#, fuzzy, c-format
msgid "%s %s debugged."
msgstr "%s, unidade %s, sofreu um ataque nuclear."
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2419
#, fuzzy
msgid "Value 2 must be integer."
msgstr "Valor tem de ser um inteiro."
-#: server/stdinhand.c:2417
+#: server/stdinhand.c:2423
#, c-format
msgid "Unit %d does not exist."
msgstr ""
-#: server/stdinhand.c:2475
+#: server/stdinhand.c:2464
msgid "Undefined argument. Usage: set <option> <value>."
msgstr "Argumento indefinido. Utilização: set <opção> <valor>."
-#: server/stdinhand.c:2485
+#: server/stdinhand.c:2473
msgid "You are not allowed to set this option."
msgstr "Você não está autorizado a definir esta opção."
-#: server/stdinhand.c:2490 server/stdinhand.c:3463
+#: server/stdinhand.c:2478 server/stdinhand.c:3501
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:2502 server/stdinhand.c:2543
-msgid "Value must be an integer."
-msgstr "Valor tem de ser um inteiro."
-
-#: server/stdinhand.c:2512
+#: server/stdinhand.c:2501
#, c-format
msgid "The parameter %s should only contain digits 0-1."
msgstr ""
-#: server/stdinhand.c:2519
+#: server/stdinhand.c:2508
msgid "Value out of range (minimum: 0, maximum: 1)."
msgstr "Valor fora do intervalo (mÃnimo: %d, máximo 1)."
-#: server/stdinhand.c:2534 server/stdinhand.c:2576
+#: server/stdinhand.c:2523 server/stdinhand.c:2565
#, c-format
msgid "Option: %s has been set to %d."
msgstr "Opção: %s foi alterada para %d."
-#: server/stdinhand.c:2554
+#: server/stdinhand.c:2543
#, c-format
msgid "The parameter %s should only contain +- and 0-9."
msgstr ""
-#: server/stdinhand.c:2561
+#: server/stdinhand.c:2550
#, 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:2586
+#: server/stdinhand.c:2575
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:2600
+#: server/stdinhand.c:2589
#, c-format
msgid "Option: %s has been set to \"%s\"."
msgstr "Opção: %s foi alterada para \"%s\"."
-#: server/stdinhand.c:2658
+#: server/stdinhand.c:2652
#, 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:2661
+#: server/stdinhand.c:2655
msgid "Sorry, you can't take a global observer. Observe it instead."
msgstr ""
-#: server/stdinhand.c:2671
+#: server/stdinhand.c:2665
#, 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
+#: server/stdinhand.c:2673
#, c-format
msgid ""
"You cannot take a new player because the maximum of %d player has already "
@@ -6050,86 +6130,86 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: server/stdinhand.c:2691
+#: server/stdinhand.c:2685
msgid "You cannot take a new player because there are no free player slots."
msgstr ""
-#: server/stdinhand.c:2702
+#: server/stdinhand.c:2696
#, fuzzy
msgid "Sorry, one can't observe barbarians in this game."
msgstr "Desculpe, não pode observar bárbaros neste jogo."
-#: server/stdinhand.c:2705
+#: server/stdinhand.c:2699
#, fuzzy
msgid "Sorry, one can't take barbarians in this game."
msgstr "Desculpe, não pode observar bárbaros neste jogo."
-#: server/stdinhand.c:2713
+#: server/stdinhand.c:2707
#, 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:2716
+#: server/stdinhand.c:2710
#, 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:2724
+#: server/stdinhand.c:2718
#, 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:2727
+#: server/stdinhand.c:2721
#, 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:2736
+#: server/stdinhand.c:2730
#, 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:2739
+#: server/stdinhand.c:2733
#, 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:2749
+#: server/stdinhand.c:2743
#, fuzzy
msgid "Sorry, one can't observe in this game."
msgstr "Desculpe, não são permitidos jogadores novos neste jogo."
-#: server/stdinhand.c:2754
+#: server/stdinhand.c:2748
#, 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:2760
+#: server/stdinhand.c:2754
#, 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:2791
+#: server/stdinhand.c:2785
#, fuzzy
msgid "Usage: observe [connection-name [player-name]]"
msgstr "Utilização: take [nome-ligação] <nome-de-jogador>"
-#: server/stdinhand.c:2797
+#: server/stdinhand.c:2791
#, fuzzy
msgid "Usage: observe [player-name]"
msgstr "Utilização: take <nome-de-jogador>"
-#: server/stdinhand.c:2847
+#: server/stdinhand.c:2841
#, fuzzy, c-format
msgid "%s already controls %s. Using 'observe' would remove %s"
msgstr "%s já controla ou observa %s"
-#: server/stdinhand.c:2858
+#: server/stdinhand.c:2852
#, fuzzy, c-format
msgid "%s is already observing %s."
msgstr "%s está a construir %s."
-#: server/stdinhand.c:2863
+#: server/stdinhand.c:2857
#, fuzzy, c-format
msgid "%s is already observing."
msgstr "%s está a construir %s."
@@ -6144,244 +6224,250 @@ msgstr "%s controla agora %s"
msgid "%s now observes"
msgstr "%s controla agora %s"
-#: server/stdinhand.c:2969
+#: server/stdinhand.c:2971
#, fuzzy
msgid "Usage: take <connection-name> <player-name>"
msgstr "Utilização: take [nome-ligação] <nome-de-jogador>"
-#: server/stdinhand.c:2974
+#: server/stdinhand.c:2976
msgid "Usage: take <player-name>"
msgstr "Utilização: take <nome-de-jogador>"
-#: server/stdinhand.c:2980
+#: server/stdinhand.c:2982
msgid "Usage: take [connection-name] <player-name>"
msgstr "Utilização: take [nome-ligação] <nome-de-jogador>"
-#: server/stdinhand.c:3010
+#: server/stdinhand.c:3012
#, fuzzy, c-format
msgid "%s already controls %s."
msgstr "%s já controla ou observa %s"
-#: server/stdinhand.c:3024
+#: server/stdinhand.c:3026
#, 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:3059
+#: server/stdinhand.c:3061
#, c-format
msgid "being detached from %s."
msgstr ""
-#: server/stdinhand.c:3135
+#: server/stdinhand.c:3146
#, fuzzy, c-format
msgid "%s now controls %s (%s, %s)."
msgstr "%s controla agora %s"
-#: server/stdinhand.c:3139 server/stdinhand.c:4260
+#: server/stdinhand.c:3150 server/stdinhand.c:4308
#: data/nation/barbarian.ruleset:3
msgid "Barbarian"
msgstr "Bárbaro"
-#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
+#: server/stdinhand.c:3152 server/stdinhand.c:4310 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-sdl/plrdlg.c:645
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr "IA"
-#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-gtk-2.0/pages.c:2125
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
+#: server/stdinhand.c:3153 server/stdinhand.c:4312
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-gtk-2.0/pages.c:2127
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/connectdlg.c:215
msgid "Human"
msgstr "Humano"
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-gtk-2.0/pages.c:2124 client/gui-win32/connectdlg.c:200
-#: client/gui-win32/connectdlg.c:212
+#: server/stdinhand.c:3155 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-gtk-2.0/pages.c:2126 client/gui-win32/connectdlg.c:202
+#: client/gui-win32/connectdlg.c:214
#, fuzzy
msgid "Alive"
msgstr "Activa"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3156 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-win32/connectdlg.c:202
#, fuzzy
msgid "Dead"
msgstr ", Morto"
-#: server/stdinhand.c:3147
+#: server/stdinhand.c:3159
#, fuzzy, c-format
msgid "%s failed to attach to any player."
msgstr "%s não é um nome válido."
-#: server/stdinhand.c:3182
+#: server/stdinhand.c:3194
#, fuzzy
msgid "Usage: detach <connection-name>"
msgstr "cut <nome-ligação>"
-#: server/stdinhand.c:3202
+#: server/stdinhand.c:3214
#, fuzzy
msgid "You can not detach other users."
msgstr "Não pode atacar aqui."
-#: server/stdinhand.c:3211
+#: server/stdinhand.c:3223
#, fuzzy, c-format
msgid "%s is not attached to any player."
msgstr "%s não é um nome válido."
-#: server/stdinhand.c:3234
+#: server/stdinhand.c:3246
#, fuzzy, c-format
msgid "%s detaching from %s"
msgstr "%s a desligar-se de %s"
-#: server/stdinhand.c:3240
+#: server/stdinhand.c:3252
#, fuzzy, c-format
msgid "%s no longer observing."
msgstr "%s está a construir %s."
-#: server/stdinhand.c:3259
+#: server/stdinhand.c:3271
#, fuzzy, c-format
msgid "detaching from %s."
msgstr "A pesquisar %s."
-#: server/stdinhand.c:3345
+#: server/stdinhand.c:3361
#, fuzzy
msgid "Usage: load <game name>"
msgstr "Utilização: ler <nome-de-ficheiro>"
-#: server/stdinhand.c:3350
+#: server/stdinhand.c:3366
#, 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:3372
+#: server/stdinhand.c:3388
#, c-format
msgid "Cannot find savegame or scenario with the name \"%s\"."
msgstr ""
-#: server/stdinhand.c:3389
+#: server/stdinhand.c:3405
#, fuzzy, c-format
msgid "Could not load savefile: %s"
msgstr "Incapaz de ler o ficheiro de jogo gravado: %s"
-#: server/stdinhand.c:3458
+#: server/stdinhand.c:3496
#, c-format
msgid "Current ruleset directory is \"%s\""
msgstr "Directório de conjunto de regras actual é \"%s\""
-#: server/stdinhand.c:3478
+#: server/stdinhand.c:3516
#, c-format
msgid "Ruleset directory \"%s\" not found"
msgstr "Directório de conjunto de regras \"%s\" não encontrado"
-#: server/stdinhand.c:3484
+#: server/stdinhand.c:3522
#, fuzzy, c-format
msgid "Ruleset directory is already \"%s\""
msgstr "Directório de conjunto de regras definido como \"%s\""
-#: server/stdinhand.c:3488
+#: server/stdinhand.c:3526
#, c-format
msgid "Ruleset directory set to \"%s\""
msgstr "Directório de conjunto de regras definido como \"%s\""
-#: server/stdinhand.c:3536
+#: server/stdinhand.c:3574
msgid "Goodbye."
msgstr "Adeus."
-#: server/stdinhand.c:3567
+#: server/stdinhand.c:3606
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:3603
+#: server/stdinhand.c:3656
#, 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:3608
+#: server/stdinhand.c:3661
#, c-format
msgid "Unknown command. Try '%shelp'."
msgstr "Comando desconhecido. Consulte '%shelp'."
-#: server/stdinhand.c:3625
-msgid "Your new vote canceled your previous vote."
+#: server/stdinhand.c:3675
+msgid "Your new vote cancelled your previous vote."
msgstr ""
-#: server/stdinhand.c:3633
-#, c-format
-msgid "New vote (number %d) by %s: %s."
-msgstr ""
+#: server/stdinhand.c:3688
+#, fuzzy
+msgid "New teamvote"
+msgstr "Novo Jogo"
+
+#: server/stdinhand.c:3691
+#, fuzzy
+msgid "New vote"
+msgstr "Novo Jogo"
-#: server/stdinhand.c:3645
+#: server/stdinhand.c:3695
+#, fuzzy, c-format
+msgid "%s (number %d) by %s: %s"
+msgstr "%s sofreu um ataque nuclear dos %s."
+
+#: server/stdinhand.c:3704
#, c-format
msgid "Your new vote (\"%s\") was not legal or was not recognized."
msgstr ""
-#: 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:3680
+#: server/stdinhand.c:3726
msgid "(server prompt)"
msgstr "(linha de comando do servidor)"
-#: server/stdinhand.c:3787
+#: server/stdinhand.c:3835
#, fuzzy
msgid "Game ended in a draw."
msgstr "Jogo terminou com um empate"
-#: server/stdinhand.c:3791
+#: server/stdinhand.c:3839
msgid ""
"Ending the game. The server will restart once all clients have disconnected."
msgstr ""
-#: server/stdinhand.c:3796
+#: server/stdinhand.c:3844
msgid "Cannot end the game: no game running."
msgstr "Incapaz de terminar o jogo: nenhum jogo em curso."
-#: server/stdinhand.c:3812
+#: server/stdinhand.c:3860
#, c-format
msgid "%s has conceded the game and can no longer win."
msgstr ""
-#: server/stdinhand.c:3817
+#: server/stdinhand.c:3865
#, fuzzy
msgid "You cannot surrender now."
msgstr "Sabotar Construções"
-#: server/stdinhand.c:3883
+#: server/stdinhand.c:3931
#, 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
+#: server/stdinhand.c:3936
#, fuzzy
msgid "No players, game will not start."
msgstr "Não existem jogadores suficientes, o jogo não pode começar."
-#: server/stdinhand.c:3892
+#: server/stdinhand.c:3940
#, 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:3901
+#: server/stdinhand.c:3949
#, fuzzy
msgid "All players are ready; starting game."
msgstr "Já existe um jogador com esse nome."
-#: server/stdinhand.c:3915
+#: server/stdinhand.c:3963
#, 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:3922
+#: server/stdinhand.c:3970
msgid "Cannot start the game: it is already running."
msgstr "Incapaz de iniciar o jogo: este já foi iniciado."
-#: server/stdinhand.c:3953
+#: server/stdinhand.c:4001
#, c-format
msgid "Cutting connection %s."
msgstr "A terminar a ligação %s."
-#: server/stdinhand.c:3972
+#: server/stdinhand.c:4020
msgid ""
"Welcome - this is the introductory help text for the Freeciv server.\n"
"\n"
@@ -6418,126 +6504,126 @@ msgstr ""
" save - para gravar o jogo actual\n"
" quit - para sair"
-#: server/stdinhand.c:4007 server/stdinhand.c:4010
+#: server/stdinhand.c:4055 server/stdinhand.c:4058
msgid "Command:"
msgstr "Comando:"
-#: server/stdinhand.c:4014
+#: server/stdinhand.c:4062
msgid "Synopsis: "
msgstr "Sinopse: "
-#: server/stdinhand.c:4023
+#: server/stdinhand.c:4071
#, c-format
msgid "Level: %s"
msgstr "NÃvel: %s"
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4096
msgid "The following server commands are available:"
msgstr "Os comandos de servidor disponÃveis são os seguintes:"
-#: server/stdinhand.c:4123
+#: server/stdinhand.c:4171
#, c-format
msgid "Help argument '%s' is ambiguous."
msgstr "O argumento da ajuda '%s' é ambÃguo."
-#: server/stdinhand.c:4128
+#: server/stdinhand.c:4176
#, c-format
msgid "No match for help argument '%s'."
msgstr "Não existe qualquer ocorrência na ajuda do argumento '%s'."
-#: server/stdinhand.c:4194
+#: server/stdinhand.c:4242
#, c-format
msgid "Bad list argument: '%s'. Try '%shelp list'."
msgstr "Lista de argumentos inválida: '%s'. Consulte '%shelp list'."
-#: server/stdinhand.c:4234
+#: server/stdinhand.c:4282
msgid "List of players:"
msgstr "Lista de jogadores:"
-#: server/stdinhand.c:4239
+#: server/stdinhand.c:4287
msgid "<no players>"
msgstr "<nenhum jogador>"
-#: server/stdinhand.c:4256
+#: server/stdinhand.c:4304
#, c-format
msgid "user %s, "
msgstr "utilizador %s, "
-#: server/stdinhand.c:4267
+#: server/stdinhand.c:4315
msgid ", Dead"
msgstr ", Morto"
-#: server/stdinhand.c:4270
+#: server/stdinhand.c:4318
#, 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:4275 server/stdinhand.c:4279 client/helpdata.c:257
-#: client/helpdata.c:752 client/text.c:241 client/text.c:1224
-#: client/text.c:1262
+#: server/stdinhand.c:4323 server/stdinhand.c:4327 client/helpdata.c:257
+#: client/helpdata.c:752 client/text.c:241 client/text.c:1229
+#: client/text.c:1267
#, c-format
msgid "?clistmore:, %s"
msgstr ", %s"
-#: server/stdinhand.c:4283
+#: server/stdinhand.c:4331
#, fuzzy
msgid ", ready"
msgstr ", pronto"
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4333
#, fuzzy
msgid ", not ready"
msgstr ", não pronto"
-#: server/stdinhand.c:4293
+#: server/stdinhand.c:4341
#, c-format
msgid " %d connection:"
msgid_plural " %d connections:"
msgstr[0] " %d ligação:"
msgstr[1] " %d ligações:"
-#: server/stdinhand.c:4299
+#: server/stdinhand.c:4347
#, 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:4304
+#: server/stdinhand.c:4352
msgid " (observer mode)"
msgstr " (modo observador)"
-#: server/stdinhand.c:4322
+#: server/stdinhand.c:4370
#, fuzzy
msgid "List of teams:"
msgstr "Lista de jogadores:"
#. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4332
+#: server/stdinhand.c:4380
#, c-format
msgid "%2d : '%s' : %d player"
msgid_plural "%2d : '%s' : %d players"
msgstr[0] ""
msgstr[1] ""
-#: server/stdinhand.c:4352
+#: server/stdinhand.c:4400
#, c-format
msgid "%2d : '%s' : 1 player : %s"
msgstr ""
-#: server/stdinhand.c:4360
+#: server/stdinhand.c:4408
#, c-format
msgid "Empty team: %s"
msgstr ""
-#: server/stdinhand.c:4371
+#: server/stdinhand.c:4419
msgid "List of connections to server:"
msgstr "Lista de ligações ao servidor:"
-#: server/stdinhand.c:4375
+#: server/stdinhand.c:4423
msgid "<no connections>"
msgstr "<nenhuma ligação>"
-#: server/stdinhand.c:4399
+#: server/stdinhand.c:4447
#, fuzzy
msgid "List of scenarios available:"
msgstr "Nenhuma Unidade DisponÃvel"
@@ -6557,7 +6643,7 @@ msgstr "Os %s aprenderam a Tecn. Futura %d."
msgid "%s acquired from %s!"
msgstr "Os %s adquiriram %s (Tratado) aos %s"
-#: server/techtools.c:220
+#: server/techtools.c:221
#, c-format
msgid ""
"Discovery of %s makes the government form %s available. You may want to "
@@ -6566,37 +6652,37 @@ msgstr ""
" Descoberta de %s torna disponÃvel a forma de governo %s. Poderá desejar "
"iniciar uma revolução."
-#: server/techtools.c:301
+#: server/techtools.c:302
#, c-format
msgid "Discovery of %s OBSOLETES %s in %s!"
msgstr "Descoberta de %s torna OBSOLETO %s em %s!"
-#: server/techtools.c:351
+#: server/techtools.c:352
#, fuzzy, c-format
msgid "Learned %s. Our scientists focus on %s; goal is %s."
msgstr " Descoberto %s. Os nossos cientistas focam-se em %s, objectivo é %s."
-#: server/techtools.c:369
+#: server/techtools.c:370
#, c-format
msgid "Learned %s. Scientists choose to research %s."
msgstr "Descoberto %s. Os cientistas decidem investigar %s."
-#: server/techtools.c:376
+#: server/techtools.c:377
#, c-format
msgid "Learned %s. "
msgstr "Descoberto %s. "
-#: server/techtools.c:379
+#: server/techtools.c:380
#, c-format
msgid "Researching %s."
msgstr "A pesquisar %s."
-#: server/techtools.c:385
+#: server/techtools.c:386
#, fuzzy, c-format
msgid "Learned %s. Scientists do not know what to research next."
msgstr "Descoberto %s. Os cientistas decidem investigar %s."
-#: server/techtools.c:402
+#: server/techtools.c:403
msgid ""
"Great scientists from all the world join your civilization: you get an "
"immediate advance."
@@ -6604,22 +6690,22 @@ msgstr ""
" Grandes cientistas de todo o mundo juntam-se à sua civilização: obtém um "
"avanço cientÃfico imediato."
-#: server/techtools.c:570
+#: server/techtools.c:571
#, c-format
msgid "Technology goal is %s."
msgstr "Objectivo tecnológico é %s."
-#: server/techtools.c:700
+#: server/techtools.c:708
#, c-format
msgid "You steal %s from the %s."
msgstr "Você roubou %s aos %s."
-#: server/techtools.c:705
+#: server/techtools.c:713
#, c-format
msgid "The %s stole %s from you!"
msgstr "Os %s roubaram-lhe %s!"
-#: server/techtools.c:710
+#: server/techtools.c:718
#, c-format
msgid "The %s have stolen %s from the %s."
msgstr "Os %s roubaram %s aos %s."
@@ -6643,179 +6729,185 @@ msgstr "Nenhuma unidade pode ser actualizada."
msgid "%s upgraded to %s for %d gold."
msgstr "%s actualizado para %s por %d moedas."
-#: server/unithand.c:396
+#: server/unithand.c:402
#, c-format
msgid "%s refuses to disband!"
msgstr ""
-#: server/unithand.c:449
+#: server/unithand.c:455
msgid "Can't place city here."
msgstr "ImpossÃvel fundar uma cidade aqui."
-#: server/unithand.c:456
+#: server/unithand.c:462
#, c-format
msgid "Only %s can build a city."
msgstr "Apenas %s podem construir uma cidade."
-#: server/unithand.c:461
+#: server/unithand.c:467
msgid "Can't build a city."
msgstr "Incapaz de fundar uma cidade."
-#: server/unithand.c:470
+#: server/unithand.c:476
#, c-format
msgid "Only %s can add to a city."
msgstr "Apenas %s podem juntar-se a uma cidade."
-#: server/unithand.c:475
+#: server/unithand.c:481
msgid "Can't add to a city."
msgstr "Incapaz de se juntar a uma cidade."
-#: server/unithand.c:481
+#: server/unithand.c:487
#, c-format
msgid "%s unit has no moves left to add to %s."
msgstr " Unidade %s não possui mais pontos de movimento para adicionar a %s."
-#: server/unithand.c:487
+#: server/unithand.c:493
#, c-format
msgid "%s unit has no moves left to build city."
msgstr " Unidade %s não possui mais pontos de movimento para fundar cidade."
-#: server/unithand.c:492
+#. TRANS: <city> is owned by <nation>, cannot add <unit>.
+#: server/unithand.c:499
+#, fuzzy, c-format
+msgid "%s is owned by %s, cannot add %s."
+msgstr "%s é demasiado grande para se juntar a %s."
+
+#: server/unithand.c:506
#, c-format
msgid "%s is too big to add %s."
msgstr "%s é demasiado grande para se juntar a %s."
-#: server/unithand.c:498
+#: server/unithand.c:512
#, fuzzy, c-format
msgid "%s needs an improvement to grow, so you cannot add %s."
msgstr "%s precisa de %s para crescer, pelo que não pode juntar %s."
-#: server/unithand.c:509
+#: server/unithand.c:523
#, c-format
msgid "Can't add %s to %s."
msgstr "Não pode juntar %s a %s."
-#: server/unithand.c:531
+#: server/unithand.c:545
#, c-format
msgid "%s added to aid %s in growing."
msgstr "%s adicionados para ajudar %s a crescer."
-#: server/unithand.c:828
+#: server/unithand.c:842
msgid "Your Nuclear missile was shot down by SDI defences, what a waste."
msgstr " O seu missÃl Nuclear foi abatido por defesas SDI, que desperdÃcio."
-#: server/unithand.c:831
+#: server/unithand.c:845
#, c-format
msgid "The nuclear attack on %s was avoided by your SDI defense."
msgstr "O ataque nuclear a %s foi evitado pelas suas defesas SDI."
#. TRANS: "Your Cannon ... the Polish Destroyer."
-#: server/unithand.c:901
+#: server/unithand.c:915
#, fuzzy, c-format
msgid "Your %s survived the pathetic attack from the %s %s."
msgstr "Os seus %s sobreviveram ao patético ataque dos %s, unidade %s."
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unithand.c:910
+#: server/unithand.c:924
#, fuzzy, c-format
msgid "Your attacking %s failed against the %s %s!"
msgstr "Os seus %s atacantes falharam contra os %s, %s!"
-#: server/unithand.c:983
+#: server/unithand.c:997
#, c-format
msgid "Only %s can attack from sea."
msgstr "Apenas %s podem atacar a partir do mar."
-#: server/unithand.c:988
+#: server/unithand.c:1002
msgid "Cannot attack from sea."
msgstr "Não pode atacar a partir do mar."
-#: server/unithand.c:996 server/unittools.c:2137
+#: server/unithand.c:1010 server/unittools.c:2142
msgid "Cannot attack unless you declare war first."
msgstr "Não pode atacar sem primeiro declarar guerra."
-#: server/unithand.c:1001
+#: server/unithand.c:1015
#, c-format
msgid "%s can only move into your own zone of control."
msgstr "%s apenas se podem mover para a sua zona de controlo."
-#: server/unithand.c:1007
+#: server/unithand.c:1021
#, fuzzy, c-format
msgid "Cannot invade unless you break peace with %s first."
msgstr "Não pode atacar sem primeiro declarar guerra."
-#: server/unithand.c:1052
+#: server/unithand.c:1066
msgid "This unit has no moves left."
msgstr "Esta unidade não possui mais pontos de movimento."
-#: server/unithand.c:1107
+#: server/unithand.c:1121
msgid "Unit must be on land to perform diplomatic action."
msgstr ""
" Unidade tem de estar em terra para poder executar acções diplomáticas."
-#: server/unithand.c:1109
+#: server/unithand.c:1123
msgid "No diplomat action possible."
msgstr "Nenhuma acção diplomática possÃvel."
-#: server/unithand.c:1125
+#: server/unithand.c:1139
#, c-format
msgid "You must declare war on %s first. Try using players dialog (F3)."
msgstr ""
-#: server/unithand.c:1143
+#: server/unithand.c:1157
msgid "This unit is being transported, and so cannot bombard."
msgstr ""
-#: server/unithand.c:1158
+#: server/unithand.c:1172
msgid "You can't attack there."
msgstr "Não pode atacar aqui."
-#: server/unithand.c:1180
+#: server/unithand.c:1194
#, fuzzy
msgid "This type of troops cannot take over a city."
msgstr "Apenas unidades terrestres podem invadir uma cidade."
-#: server/unithand.c:1198
+#: server/unithand.c:1212
msgid "A transported unit is not allied to all units or city on target tile."
msgstr ""
-#: server/unithand.c:1240
+#: server/unithand.c:1254
#, c-format
msgid "Your %s helps build the %s in %s (%d remaining)."
msgstr "A sua %s ajuda a construir %s em %s (faltam %d)."
-#: server/unithand.c:1242
+#: server/unithand.c:1256
#, c-format
msgid "Your %s helps build the %s in %s (%d surplus)."
msgstr "A sua %s ajuda a construir %s em %s (%d excedente)."
-#: server/unithand.c:1286
+#: server/unithand.c:1300
#, fuzzy, c-format
msgid ""
"Sorry, your %s cannot establish a trade route because it has no home city"
msgstr " Desculpe, os seus %s não podem estabelecer uma rota comercial aqui!"
-#: server/unithand.c:1296
+#: server/unithand.c:1310
#, fuzzy, c-format
msgid "Sorry, your %s cannot establish a trade route between %s and %s"
msgstr " Desculpe, os seus %s não podem estabelecer uma rota comercial aqui!"
-#: server/unithand.c:1325 server/unithand.c:1344
+#: server/unithand.c:1339 server/unithand.c:1358
#, c-format
msgid "Sorry, your %s cannot establish a trade route here!"
msgstr " Desculpe, os seus %s não podem estabelecer uma rota comercial aqui!"
-#: server/unithand.c:1329 server/unithand.c:1348
+#: server/unithand.c:1343 server/unithand.c:1362
#, fuzzy, c-format
msgid " The city of %s already has %d better trade routes!"
msgstr " A cidade de %s já possui %d rotas comerciais!"
-#: server/unithand.c:1361 server/unithand.c:1373
+#: server/unithand.c:1375 server/unithand.c:1387
#, c-format
msgid "Sorry, %s has canceled the trade route from %s to your city %s."
msgstr ""
-#: server/unithand.c:1406
+#: server/unithand.c:1420
#, c-format
msgid ""
"Your %s from %s has arrived in %s, and revenues amount to %d in gold and "
@@ -6876,55 +6968,55 @@ msgid "Teleported your %s to %s."
msgstr "Foi teleportada a sua %s de (%d, %d) para %s."
#. TRANS: A unit is moved to resolve stack conflicts.
-#: server/unittools.c:1065
+#: server/unittools.c:1070
#, fuzzy, c-format
msgid "Moved your %s."
msgstr "Foi dissolvida a sua %s em (%d, %d)."
-#: server/unittools.c:1076
+#: server/unittools.c:1081
#, fuzzy, c-format
msgid "Disbanded your %s."
msgstr "Foi dissolvida a sua %s em (%d, %d)."
-#: server/unittools.c:1397
+#: server/unittools.c:1402
#, c-format
msgid "Unable to defend %s, %s has lost the game."
msgstr ""
-#: server/unittools.c:1401
+#: server/unittools.c:1406
#, c-format
msgid "Losing %s meant losing the game! Be more careful next time!"
msgstr ""
-#: server/unittools.c:1503
+#: server/unittools.c:1508
#, c-format
msgid "%s escaped the destruction of %s, and fled to %s."
msgstr ""
-#: server/unittools.c:1512
+#: server/unittools.c:1517
#, c-format
msgid "%s lost when %s was lost."
msgstr "%s perdida quando %s foi perdida."
-#: server/unittools.c:1561
+#: server/unittools.c:1566
#, c-format
msgid "Barbarian leader captured, %d gold ransom paid."
msgstr "Lider bárbaro capturado, recebidas %d moedas de resgate."
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unittools.c:1579
+#: server/unittools.c:1584
#, fuzzy, c-format
msgid "Your attacking %s succeeded against the %s %s!"
msgstr "Os seus %s atacantes venceram contra os %s, %s!"
#. TRANS: "Cannon ... the Polish Destroyer."
-#: server/unittools.c:1588 server/unittools.c:1646
+#: server/unittools.c:1593 server/unittools.c:1651
#, fuzzy, c-format
msgid "%s lost to an attack by the %s %s."
msgstr "%s perdida num ataque dos %s, unidade %s."
#. TRANS: "... Cannon ... the Polish Destroyer ...."
-#: server/unittools.c:1622
+#: server/unittools.c:1627
#, fuzzy, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -6934,14 +7026,14 @@ msgstr[1] "Os seus %s atacantes venceram contra os %s, %s (%d)!"
#. TRANS: "Cannon lost when the Polish Destroyer
#. * attacked the German Musketeers."
-#: server/unittools.c:1655
+#: server/unittools.c:1660
#, fuzzy, c-format
msgid "%s lost when the %s %s attacked the %s %s."
msgstr "%s perdido %s %s num ataque dos %s, unidade %s."
#. TRANS: "Musketeers (and Cannon) lost to an
#. * attack from the Polish Destroyer."
-#: server/unittools.c:1670
+#: server/unittools.c:1675
#, fuzzy, c-format
msgid "%s (and %s) lost to an attack from the %s %s."
msgstr "%s (%s) perdido num ataque dos %s, unidade %s."
@@ -6949,7 +7041,7 @@ msgstr "%s (%s) perdido num ataque dos %s, unidade %s."
#. TRANS: "Musketeers and 3 other units lost to
#. * an attack from the Polish Destroyer."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1680
+#: server/unittools.c:1685
#, fuzzy, 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."
@@ -6959,182 +7051,224 @@ msgstr[1] "%s (%d) perdido num ataque dos %s, unidade %s."
#. TRANS: "2 units lost when the Polish Destroyer
#. * attacked the German Musketeers."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1694
+#: server/unittools.c:1699
#, fuzzy, 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] "Auto-Ataque: %d %s de %s a atacar %s de %s"
msgstr[1] "Auto-Ataque: %d %s de %s a atacar %s de %s"
-#: server/unittools.c:1962
+#: server/unittools.c:1967
#, c-format
msgid "Your %s was nuked by %s."
msgstr "O seu %s foi atacado com armas nucleares por %s."
-#: server/unittools.c:1965 server/unittools.c:1981
+#: server/unittools.c:1970 server/unittools.c:1986
msgid "yourself"
msgstr "você próprio"
-#: server/unittools.c:1969
+#: server/unittools.c:1974
#, fuzzy, c-format
msgid "The %s %s was nuked."
msgstr "%s, unidade %s, sofreu um ataque nuclear."
-#: server/unittools.c:1978
+#: server/unittools.c:1983
#, c-format
msgid "%s was nuked by %s."
msgstr "%s sofreu um ataque nuclear dos %s."
-#: server/unittools.c:1986
+#: server/unittools.c:1991
#, c-format
msgid "You nuked %s."
msgstr "Você atacou os %s com armas nucleares."
-#: server/unittools.c:2027
+#: server/unittools.c:2032
#, fuzzy, c-format
msgid "The %s detonated a nuke!"
msgstr "%s detonou uma arma nuclear!"
-#: server/unittools.c:2051
+#: server/unittools.c:2056
#, c-format
msgid "%s transported successfully."
msgstr "%s transportado com sucesso."
-#: server/unittools.c:2103
+#: server/unittools.c:2108
msgid "This unit type can not be paradropped."
msgstr "Este tipo de unidade não pode ser lançada de paraquedas."
-#: server/unittools.c:2113
+#: server/unittools.c:2118
#, fuzzy
msgid "You cannot paradrop a unit that is transporting other units."
msgstr "ImpossÃvel lançar de paraquedas no oceano."
-#: server/unittools.c:2119
+#: server/unittools.c:2124
msgid "The destination location is not known."
msgstr "O local de destino não é conhecido."
-#: server/unittools.c:2126
+#: server/unittools.c:2131
#, fuzzy, c-format
msgid "This unit cannot paradrop into %s."
msgstr "ImpossÃvel lançar de paraquedas no oceano."
-#: server/unittools.c:2146
+#: server/unittools.c:2151
#, c-format
msgid "The distance to the target (%i) is greater than the unit's range (%i)."
msgstr ""
" A distância para o alvo (%i) é maior do que o alcance da unidade (%i)."
-#: server/unittools.c:2157
+#: server/unittools.c:2162
#, fuzzy, c-format
msgid "Your %s paradropped into the %s and was lost."
msgstr " Os seus %s lançaram-se de paraquedas sobre o oceano e foram perdidos."
-#: server/unittools.c:2170
+#: server/unittools.c:2175
#, c-format
msgid "Your %s was killed by enemy units at the paradrop destination."
msgstr ""
" Os seus %s foram mortos por unidades inimigas no destino do lançamento de "
"paraquedas."
-#: server/unittools.c:2192
+#: server/unittools.c:2197
#, c-format
msgid "You found %d gold."
msgstr "Você encontrou %d moedas."
-#: server/unittools.c:2209
+#: server/unittools.c:2214
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr "Você encontrou %s em antigos pergaminhos de sabedoria."
-#: server/unittools.c:2216
+#: server/unittools.c:2221
#, c-format
msgid "The %s have acquired %s from ancient scrolls of wisdom."
msgstr "Os %s adquiriram %s em antigos pergaminhos de sabedoria."
-#: server/unittools.c:2230
+#: server/unittools.c:2235
msgid "A band of friendly mercenaries joins your cause."
msgstr "Um bando de mercenários amistosos juntam-se à sua causa."
-#: server/unittools.c:2248
+#: server/unittools.c:2253
msgid "An abandoned village is here."
msgstr "Existe aqui uma povoação abandonada."
-#: server/unittools.c:2258
+#: server/unittools.c:2263
msgid "You have unleashed a horde of barbarians!"
msgstr "Você incitou uma horda de bárbaros!"
-#: server/unittools.c:2261
+#: server/unittools.c:2266
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr "O seu %s foi morto por bárbaros!"
-#: server/unittools.c:2277
+#: server/unittools.c:2282
msgid "You found a friendly city."
msgstr "Você encontrou uma cidade amistosa."
-#: server/unittools.c:2291
+#: server/unittools.c:2296
msgid "Friendly nomads are impressed by you, and join you."
msgstr "Você impressiona nómadas amistosos, que se juntam à sua causa."
-#: server/unittools.c:2316
+#: server/unittools.c:2321
msgid "Your overflight frightens the tribe; they scatter in terror."
msgstr "O seu vôo rasante assusta a tribo; eles dispersam em terror."
-#: server/unittools.c:2574
+#: server/unittools.c:2579
#, fuzzy, c-format
msgid "Orders for %s aborted after enemy movement was spotted."
msgstr "%s abortaram IR PARA visto existirem unidades no caminho."
-#: server/unittools.c:3023
+#: server/unittools.c:3028
#, fuzzy, c-format
msgid "Orders for %s aborted as there are units nearby."
msgstr "%s abortaram IR PARA visto existirem unidades no caminho."
-#: server/unittools.c:3075
+#: server/unittools.c:3080
#, fuzzy, c-format
msgid "Orders for %s aborted because building of city failed."
msgstr "%s abortaram IR PARA visto existirem unidades no caminho."
-#: server/unittools.c:3088
+#: server/unittools.c:3093
#, c-format
msgid "Orders for %s aborted since they give an invalid activity."
msgstr ""
-#: server/unittools.c:3102
+#: server/unittools.c:3107
#, c-format
msgid "Orders for %s aborted since they give an invalid location."
msgstr ""
-#: server/unittools.c:3112
+#: server/unittools.c:3117
#, fuzzy, c-format
msgid "Orders for %s aborted as there are units in the way."
msgstr "%s abortaram IR PARA visto existirem unidades no caminho."
-#: server/unittools.c:3138
+#: server/unittools.c:3143
#, c-format
msgid "Orders for %s aborted because of failed move."
msgstr ""
-#: server/unittools.c:3179
+#: server/unittools.c:3184
#, fuzzy, c-format
msgid "Attempt to change homecity for %s failed."
msgstr "Alterada a cidade base de %s em %s."
-#: server/unittools.c:3190
+#: server/unittools.c:3195
#, fuzzy, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr "* Pode estabelecer rotas comerciais.\n"
-#: server/unittools.c:3202
+#: server/unittools.c:3207
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr ""
-#: server/unittools.c:3211
+#: server/unittools.c:3216
#, fuzzy, c-format
msgid "Your %s has invalid orders."
msgstr "O seu %s voltou para se reabastecer."
+#: server/voting.c:522
+#, c-format
+msgid ""
+"%s %d \"%s\" is passed %d to %d with %d abstentions and %d who did not vote."
+msgstr ""
+
+#: server/voting.c:528
+#, c-format
+msgid ""
+"%s %d \"%s\" failed with %d against, %d for, %d abstentions and %d who did "
+"not vote."
+msgstr ""
+
+#: server/voting.c:548
+#, fuzzy, c-format
+msgid "%s %d: %s voted yes."
+msgstr "%s perde %s com os %s"
+
+#: server/voting.c:553
+#, c-format
+msgid "%s %d: %s voted no."
+msgstr ""
+
+#: server/voting.c:558
+#, c-format
+msgid "%s %d: %s chose to abstain."
+msgstr ""
+
+#. TRANS: Describing a new vote that can only pass
+#. * if there are no dissenting votes.
+#: server/voting.c:726
+#, c-format
+msgid "%s (needs %0.0f%% and no dissent)."
+msgstr ""
+
+#. TRANS: Describing a new vote that can pass only if the
+#. * given percentage of players votes 'yes'.
+#: server/voting.c:732
+#, c-format
+msgid "%s (needs %0.0f%% in favor)."
+msgstr ""
+
#: server/generator/mapgen.c:1771
msgid "High landmass - this may take a few seconds."
msgstr "Massa terrestre elevada - isto pode levar alguns segundos."
@@ -7162,12 +7296,12 @@ msgid ""
"Please report this bug at %s."
msgstr ""
-#: client/attribute.c:363
+#: client/attribute.c:368
msgid ""
"There has been a CMA error. Your citizen governor settings may be broken."
msgstr ""
-#: client/attribute.c:367
+#: client/attribute.c:372
msgid "Old attributes detected and removed."
msgstr ""
@@ -7317,41 +7451,41 @@ msgstr "%s - %s cidadãos"
msgid "%+4d : Taxed from trade\n"
msgstr ""
-#: client/citydlg_common.c:418
+#: client/citydlg_common.c:421
#, fuzzy, c-format
msgid "%+4d : Trade route with %s\n"
msgstr "Não existem rotas comerciais.\n"
-#: client/citydlg_common.c:427
+#: client/citydlg_common.c:430
#, fuzzy, c-format
msgid "%+4d : Building tithes\n"
msgstr "Construir Unidades"
-#: client/citydlg_common.c:450
+#: client/citydlg_common.c:453
#, c-format
msgid "%+4d : Bonus from %s (%+d%%)\n"
msgstr ""
-#: client/citydlg_common.c:462
+#: client/citydlg_common.c:465
#, c-format
msgid "%+4d : Waste\n"
msgstr ""
-#: client/citydlg_common.c:468
+#: client/citydlg_common.c:471
#, c-format
msgid "%+4d : Disorder\n"
msgstr ""
-#: client/citydlg_common.c:474
+#: client/citydlg_common.c:477
#, c-format
msgid "%+4d : Used\n"
msgstr ""
-#: client/citydlg_common.c:479
+#: client/citydlg_common.c:482
msgid "==== : Adds up to\n"
msgstr ""
-#: client/citydlg_common.c:481
+#: client/citydlg_common.c:484
#, c-format
msgid "%4d : Total surplus"
msgstr ""
@@ -7672,52 +7806,52 @@ msgstr "?Especiais:E"
msgid "Specialists"
msgstr "Especiais"
-#: client/civclient.c:240
+#: client/civclient.c:241
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr " -a, --autoconnect\tSaltar diálogo de ligação\n"
-#: client/civclient.c:250
+#: client/civclient.c:251
#, fuzzy
msgid " -l, --log FILE\tUse FILE as logfile (spawned server also uses this)\n"
msgstr " -l, --log FICHEIRO\tUtiliza FICHEIRO para o registo\n"
-#: client/civclient.c:252
+#: client/civclient.c:253
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr " -m, --meta SERVIDOR\tLigar ao metaservidor em SERVIDOR\n"
-#: client/civclient.c:254
+#: client/civclient.c:255
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr " -n, --name NOME\tUtilizar NOME como nome\n"
-#: client/civclient.c:256
+#: client/civclient.c:257
#, fuzzy
msgid " -p, --port PORT\tConnect to server port PORT (usually with -a)\n"
msgstr " -p, --port PORTO\tLigar ao porto do servidor PORTO\n"
-#: client/civclient.c:258
+#: client/civclient.c:259
#, c-format
msgid " -P, --Plugin PLUGIN\tUse PLUGIN for sound output %s\n"
msgstr " -P, --Plugin PLUGIN\tUtilizar PLUGIN para saida de som %s\n"
-#: client/civclient.c:260
+#: client/civclient.c:261
#, fuzzy
msgid " -r, --read FILE\tRead startup script FILE (for spawned server only)\n"
msgstr " -r, --read FICHEIRO\tLer ficheiro de arranque FICHEIRO\n"
-#: client/civclient.c:263
+#: client/civclient.c:264
#, fuzzy
msgid " -s, --server HOST\tConnect to the server at HOST (usually with -a)\n"
msgstr " -s, --server SERVIDOR\tLigar ao servidor em SERVIDOR\n"
-#: client/civclient.c:265
+#: client/civclient.c:266
msgid " -S, --Sound FILE\tRead sound tags from FILE\n"
msgstr " -S, --Sound FICHEIRO\tLer etiquetas de som em FICHEIRO\n"
-#: client/civclient.c:266
+#: client/civclient.c:267
msgid " -t, --tiles FILE\tUse data file FILE.tilespec for tiles\n"
msgstr " -t, --tiles FICHEIRO\t\tUtilizar FICHEIRO.tilespec para mapa\n"
-#: client/civclient.c:269
+#: client/civclient.c:270
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7727,45 +7861,45 @@ msgstr ""
"\t\t\tTente \"%s -- --help\" para mais informações.\n"
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:274
+#: client/civclient.c:275
#, fuzzy, c-format
msgid "Report bugs at %s\n"
msgstr "Relate erros (bugs) para <%s> (em Inglês).\n"
-#: client/civclient.c:298
+#: client/civclient.c:299
#, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr ""
-#: client/civclient.c:300 client/civclient.c:315
+#: client/civclient.c:301 client/civclient.c:316
msgid "Try using --help.\n"
msgstr ""
-#: client/civclient.c:313
+#: client/civclient.c:314
#, c-format
msgid "Invalid debug level \"%s\" specified with --debug option.\n"
msgstr ""
-#: client/civclient.c:326
+#: client/civclient.c:327
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr "Opção desconhecida: \"%s\"\n"
-#: client/civclient.c:391
+#: client/civclient.c:393
#, fuzzy, c-format
msgid "Updating old metaserver address \"%s\"."
msgstr "metaservidor <endereço>"
-#: client/civclient.c:394
+#: client/civclient.c:396
#, fuzzy, c-format
msgid "Default metaserver has been set to \"%s\"."
msgstr "Opção: %s foi alterada para \"%s\"."
-#: client/civclient.c:550
+#: client/civclient.c:540
msgid "Game started."
msgstr "Jogo iniciado."
-#: client/civclient.c:588
+#: client/civclient.c:606
msgid "There was an error while auto connecting; aborting."
msgstr "Ocorreu um erro ao liga-se automaticamente; a abortar."
@@ -7899,17 +8033,17 @@ msgstr "A Ligar"
msgid "Disconnected from server."
msgstr "A desligar do servidor."
-#: client/clinet.c:469
+#: client/clinet.c:473
#, c-format
msgid "Failed to contact server \"%s\" at port %d as \"%s\" after %d attempts"
msgstr ""
"Falha ao contactar servidor \"%s\" no porto %d como \"%s\" após %d tentativas"
-#: client/clinet.c:484 client/clinet.c:486
+#: client/clinet.c:488 client/clinet.c:490
msgid "Connection to server refused. Please start the server."
msgstr "Ligação ao servidor recusada. Inicie o servidor."
-#: client/clinet.c:495 client/clinet.c:523
+#: client/clinet.c:499 client/clinet.c:527
#, c-format
msgid ""
"Error contacting server \"%s\" at port %d as \"%s\":\n"
@@ -7918,7 +8052,7 @@ msgstr ""
"Erro ao contactar servidor \"%s\" no porto %d como \"%s\":\n"
" %s\n"
-#: client/clinet.c:514
+#: client/clinet.c:518
#, fuzzy, c-format
msgid ""
"Auto-connecting to server \"%s\" at port %d as \"%s\" every %f second(s) for "
@@ -7927,58 +8061,58 @@ 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:1358
+#: client/connectdlg_common.c:78 client/gui-gtk-2.0/pages.c:1358
#, fuzzy
msgid "novice"
msgstr "nada"
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1358
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
msgid "easy"
msgstr "fácil"
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1359
#, fuzzy
msgid "normal"
msgstr "Honrosa"
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr "difÃcil"
-#: client/connectdlg_common.c:83
+#: client/connectdlg_common.c:82
msgid "experimental"
msgstr ""
-#: client/connectdlg_common.c:213
+#: client/connectdlg_common.c:212
#, fuzzy
msgid "Starting server..."
msgstr "A iniciar o jogo."
-#: client/connectdlg_common.c:332
+#: client/connectdlg_common.c:331
#, fuzzy
msgid "Couldn't start the server."
msgstr "Não pode atacar aqui."
-#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
+#: client/connectdlg_common.c:332 client/connectdlg_common.c:365
msgid "You'll have to start one manually. Sorry..."
msgstr ""
-#: client/connectdlg_common.c:364
+#: client/connectdlg_common.c:363
#, fuzzy
msgid "Couldn't connect to the server."
msgstr "Corta a ligação de um cliente ao servidor."
-#: client/connectdlg_common.c:365
+#: client/connectdlg_common.c:364
msgid "We probably couldn't start it from here."
msgstr ""
-#: client/connectdlg_common.c:470
+#: client/connectdlg_common.c:469
#, fuzzy
msgid ""
"Established control over the server. You have command access level 'hack'."
msgstr "Questiona ou define acesso a nÃvel de acesso de comandos."
-#: client/connectdlg_common.c:475
+#: client/connectdlg_common.c:474
msgid ""
"Failed to obtain the required access level to take control of the server. "
"The server will now be shutdown."
@@ -7988,30 +8122,30 @@ msgstr ""
msgid "Only transporter units can be unloaded."
msgstr "Apenas as unidades de transporte podem ser descarregadas."
-#: client/control.c:1425
+#: client/control.c:1417
#, fuzzy
msgid "Only settler units can be put into auto mode."
msgstr ""
" Apenas colonos e unidades militares em cidades podem ser colocadas em modo "
"automático."
-#: client/control.c:1516
+#: client/control.c:1511
msgid "Only nuclear units can do this."
msgstr "Apenas as unidades nucleares podem fazer isso."
-#: client/control.c:1545
+#: client/control.c:1540
msgid "Only paratrooper units can do this."
msgstr "Apenas as unidades páraquedistas podem fazer isso."
-#: client/control.c:2020
+#: client/control.c:2015
msgid "Too far for this unit."
msgstr "Demasiado longe para esta unidade."
-#: client/control.c:2230 client/control.c:2260 client/control.c:2276
+#: client/control.c:2225 client/control.c:2255 client/control.c:2271
msgid "Didn't find a route to the destination!"
msgstr "Incapaz de encontrar uma rota para o destino!"
-#: client/control.c:2320
+#: client/control.c:2315
msgid "Oh my! You seem to have no capital!"
msgstr "Oh! Parece que você não tem uma capital!"
@@ -8420,27 +8554,34 @@ msgstr ""
#. * last two elements
#. TRANS: List of possible output types has this between
#. * last two elements
-#: client/helpdata.c:1066 client/helpdata.c:1400
+#: client/helpdata.c:1066 client/helpdata.c:1408
msgid " or "
msgstr " ou "
-#: client/helpdata.c:1068 client/helpdata.c:1388
+#: client/helpdata.c:1068 client/helpdata.c:1396
msgid "?or:, "
msgstr "?or:, "
-#: client/helpdata.c:1080
-#, 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"
+#: client/helpdata.c:1079
+#, fuzzy, c-format
+msgid "* Unit has to be in a city, or a base after %d turn.\n"
+msgid_plural "* Unit has to be in a city, or a base 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:1087
+#, fuzzy, c-format
+msgid "* Unit has to be in a city, a base, or on a %s after %d turn.\n"
+msgid_plural "* Unit has to be in a city, a base, 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:1122
+#: client/helpdata.c:1130
#, 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:1127
+#: client/helpdata.c:1135
#, c-format
msgid ""
"To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8449,91 +8590,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:1135
+#: client/helpdata.c:1143
msgid "You cannot research this technology."
msgstr ""
-#: client/helpdata.c:1139
+#: client/helpdata.c:1147
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:1151
+#: client/helpdata.c:1159
#, 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:1156
+#: client/helpdata.c:1164
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
msgstr ""
-#: client/helpdata.c:1159
+#: client/helpdata.c:1167
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
msgstr ""
-#: client/helpdata.c:1163
+#: client/helpdata.c:1171
#, fuzzy
msgid "* Increases the pollution generated by the population.\n"
msgstr "Aumenta a poluição gerada pela população.\n"
-#: client/helpdata.c:1168
+#: client/helpdata.c:1176
#, 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:1175
+#: client/helpdata.c:1183
#, fuzzy, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr "Permite aos %s construir fortalezas.\n"
-#: client/helpdata.c:1183
+#: client/helpdata.c:1191
#, fuzzy, c-format
msgid "* Allows %s to build airbases.\n"
msgstr "Permite aos %s construir bases aéreas.\n"
-#: client/helpdata.c:1192
+#: client/helpdata.c:1200
#, 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:1200
+#: client/helpdata.c:1208
#, 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:1234
+#: client/helpdata.c:1242
msgid "* Pollution cannot be generated on this terrain."
msgstr ""
-#: client/helpdata.c:1239
+#: client/helpdata.c:1247
#, fuzzy
msgid "* You cannot build cities on this terrain."
msgstr "Você não pode subornar uma unidade desta nação."
-#: client/helpdata.c:1245
+#: client/helpdata.c:1253
msgid "* The coastline of this terrain is unsafe."
msgstr ""
-#: client/helpdata.c:1250
+#: client/helpdata.c:1258
msgid "* This terrain is unsafe for units to travel on."
msgstr ""
-#: client/helpdata.c:1255
+#: client/helpdata.c:1263
msgid "* Land units cannot travel on oceanic terrains."
msgstr ""
-#: client/helpdata.c:1305
+#: client/helpdata.c:1313
msgid "Features:\n"
msgstr ""
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1411 client/helpdata.c:1412
+#: client/helpdata.c:1419 client/helpdata.c:1420
msgid "?outputlist: Nothing "
msgstr ""
-#: client/helpdata.c:1419
+#: client/helpdata.c:1427
#, fuzzy, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -8544,7 +8685,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:1429
+#: client/helpdata.c:1437
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8552,48 +8693,48 @@ msgid ""
msgstr ""
#. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1437
+#: client/helpdata.c:1445
#, c-format
msgid "* You pay %d times normal %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1442
+#: client/helpdata.c:1450
#, 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:1447
+#: client/helpdata.c:1455
#, c-format
msgid "* You pay no %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1451
+#: client/helpdata.c:1459
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:1460
+#: client/helpdata.c:1468
#, 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:1468
+#: client/helpdata.c:1476
#, c-format
msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
msgstr ""
-#: client/helpdata.c:1475
+#: client/helpdata.c:1483
#, 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:1482
+#: client/helpdata.c:1490
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -8601,23 +8742,23 @@ msgid ""
msgstr ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1489
+#: client/helpdata.c:1497
#, 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:1497
+#: client/helpdata.c:1505
#, c-format
msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
msgstr ""
-#: client/helpdata.c:1502
+#: client/helpdata.c:1510
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr ""
-#: client/helpdata.c:1507
+#: client/helpdata.c:1515
#, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -8628,7 +8769,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1519
+#: client/helpdata.c:1527
#, 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"
@@ -8636,64 +8777,64 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1530
+#: client/helpdata.c:1538
#, 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:1536
+#: client/helpdata.c:1544
#, fuzzy
msgid "* Your units cannot be bribed.\n"
msgstr "Este tipo de unidade não pode ser lançada de paraquedas."
-#: client/helpdata.c:1539
+#: client/helpdata.c:1547
#, fuzzy
msgid "* Your cities cannot be incited.\n"
msgstr "Cidade não pode ser incitada!"
-#: client/helpdata.c:1543
+#: client/helpdata.c:1551
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:1549
+#: client/helpdata.c:1557
msgid "* Has a senate that may prevent declaration of war.\n"
msgstr ""
-#: client/helpdata.c:1553
+#: client/helpdata.c:1561
msgid "* Allows partisans when cities are taken by the enemy.\n"
msgstr ""
-#: client/helpdata.c:1557
+#: client/helpdata.c:1565
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
msgstr ""
-#: client/helpdata.c:1561
+#: client/helpdata.c:1569
msgid "* Pays no upkeep for fanatics.\n"
msgstr ""
-#: client/helpdata.c:1564
+#: client/helpdata.c:1572
#, fuzzy
msgid "* Has no unhappy citizens.\n"
msgstr "%d cidadãos descontentes adicionais."
-#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
+#: client/helpdata.c:1582 client/helpdata.c:1586 client/helpdata.c:1590
#, c-format
msgid "* Veteran %s units.\n"
msgstr ""
-#: client/helpdata.c:1585
+#: client/helpdata.c:1593
#, fuzzy
msgid "* Veteran units.\n"
msgstr "Unidades marÃtimas"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1591
+#: client/helpdata.c:1599
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8701,7 +8842,7 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1600
+#: client/helpdata.c:1608
#, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8709,71 +8850,71 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1608
+#: client/helpdata.c:1616
#, 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:1617
+#: client/helpdata.c:1625
#, c-format
msgid "* %s production is increased %d%%.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1625
+#: client/helpdata.c:1633
#, c-format
msgid "* %s production will suffer massive waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1630
+#: client/helpdata.c:1638
#, c-format
msgid "* %s production will suffer some waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1635
+#: client/helpdata.c:1643
#, 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:1643
+#: client/helpdata.c:1651
#, 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:1649
+#: client/helpdata.c:1657
#, 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:1655
+#: client/helpdata.c:1663
#, c-format
msgid "* %s waste will increase slowly with distance from capital.\n"
msgstr ""
-#: client/helpdata.c:1672
+#: client/helpdata.c:1680
#, 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:1699
+#: client/helpdata.c:1707
#, fuzzy, c-format
msgid "%s%d %s"
msgstr "%3d/%3d %s"
-#: client/helpdata.c:1700 client/helpdata.c:1708 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1708 client/helpdata.c:1716 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:1707
+#: client/helpdata.c:1715
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d descontente(es)"
@@ -8848,7 +8989,7 @@ msgid ""
"or with the -a command-line parameter."
msgstr ""
-#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:916 data/Freeciv.in:107
msgid "Metaserver"
msgstr "Metaservidor"
@@ -9217,36 +9358,36 @@ msgstr "Gravação falhou, incapaz de escrever no ficheiro %s"
msgid "Saved settings to file %s"
msgstr "Configurações gravadas para o ficheiro %s"
-#: client/packhand.c:211 client/packhand.c:217
+#: client/packhand.c:212 client/packhand.c:218
#, fuzzy
msgid "You were rejected from the game...."
msgstr "Você foi rejeitado do jogo:"
-#: client/packhand.c:229
+#: client/packhand.c:230
#, c-format
msgid "Client capability string: %s"
msgstr "Expressão de funcionalidade do cliente: %s"
-#: client/packhand.c:232
+#: client/packhand.c:233
#, c-format
msgid "Server capability string: %s"
msgstr "Expressão de funcionalidade do servidor: %s"
-#: client/packhand.c:850
+#: client/packhand.c:864
#, c-format
msgid "Start of turn %d"
msgstr "InÃcio do turno %d"
-#: client/packhand.c:1591
+#: client/packhand.c:1621
#, c-format
msgid "AI Mode is now %s."
msgstr "Modo IA é agora %s."
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "ON"
msgstr "ACTIVO"
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "OFF"
msgstr "INACTIVO"
@@ -9280,15 +9421,15 @@ msgstr "?city:Nome"
msgid "Username"
msgstr "Renomear"
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
-#: client/gui-gtk-2.0/pages.c:2157
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:653
+#: client/gui-gtk-2.0/pages.c:1604 client/gui-gtk-2.0/pages.c:2159
msgid "Flag"
msgstr "Bandeira"
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1605
-#: client/gui-gtk-2.0/pages.c:2159 client/gui-sdl/repodlgs.c:2063
-#: client/gui-win32/connectdlg.c:990 client/gui-win32/dialogs.c:542
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:657
+#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1609
+#: client/gui-gtk-2.0/pages.c:2161 client/gui-sdl/repodlgs.c:2063
+#: client/gui-win32/connectdlg.c:992 client/gui-win32/dialogs.c:542
#: client/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "Nação"
@@ -9303,7 +9444,7 @@ msgstr "Bóer"
msgid "Score"
msgstr "Obter Pontuação"
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1614
msgid "Team"
msgstr "Equipa"
@@ -9338,37 +9479,37 @@ msgstr ""
msgid "Ping"
msgstr "Ping"
-#: client/repodlgs_common.c:375
+#: client/repodlgs_common.c:378
#, fuzzy
msgid "You cannot sell improvements."
msgstr "Sabotar Construções"
-#: client/repodlgs_common.c:391
+#: client/repodlgs_common.c:394
#, fuzzy, c-format
msgid "Sold %d %s for %d gold."
msgstr "Vendido %d %s por %d moedas"
-#: client/repodlgs_common.c:396
+#: client/repodlgs_common.c:399
#, fuzzy, c-format
msgid "No %s could be sold."
msgstr "Nenhum %s pode ser vendido"
#. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:415
+#: client/repodlgs_common.c:418
msgid "You cannot disband units."
msgstr ""
-#: client/repodlgs_common.c:420
+#: client/repodlgs_common.c:423
#, fuzzy, c-format
msgid "%s cannot be disbanded."
msgstr "%s não pode manter %s, unidade dissolvida."
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:444
#, fuzzy, c-format
msgid "Disbanded %d %s."
msgstr "Foi dissolvida a sua %s em (%d, %d)."
-#: client/repodlgs_common.c:445
+#: client/repodlgs_common.c:448
#, fuzzy, c-format
msgid "No %s could be disbanded."
msgstr "Nenhum %s pode ser vendido"
@@ -9981,47 +10122,47 @@ msgstr "?dys/hrs:%02dd %02dh"
msgid "?duration:overflow"
msgstr "?duration:excedida"
-#: client/text.c:1143
+#: client/text.c:1145
#, c-format
msgid "%6d.%02d ms"
msgstr "%6d.%02d ms"
#. TRANS: <nation adjective> <government name>.
#. * E.g. "Polish Republic".
-#: client/text.c:1188
+#: client/text.c:1193
#, fuzzy, c-format
msgid "?nationgovernment:%s %s"
msgstr "Governo: %s"
#. TRANS: "Observer: 1985"
-#: client/text.c:1198
+#: client/text.c:1203
#, fuzzy, c-format
msgid "Observer: %s"
msgstr " (observador)"
-#: client/text.c:1216
+#: client/text.c:1221
msgid "Buildings: "
msgstr "EdifÃcios: "
-#: client/text.c:1233 client/text.c:1272
+#: client/text.c:1238 client/text.c:1277
msgid "None. "
msgstr "Nenhum. "
-#: client/text.c:1235 client/text.c:1274
+#: client/text.c:1240 client/text.c:1279
msgid "?clistend:."
msgstr "."
-#: client/text.c:1253
+#: client/text.c:1258
msgid "Wonders: "
msgstr "Maravilhas: "
-#: client/text.c:1308
+#: client/text.c:1313
#, 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:1312
+#: client/text.c:1317
#, fuzzy, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
@@ -10029,19 +10170,19 @@ 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:1318
+#: client/text.c:1323
#, fuzzy, c-format
msgid "%d additional unhappy citizen."
msgid_plural "%d additional unhappy citizens."
msgstr[0] "%d cidadãos descontentes adicionais."
msgstr[1] "%d cidadãos descontentes adicionais."
-#: client/text.c:1339
+#: client/text.c:1344
#, fuzzy
msgid "Unlimited martial law in effect."
msgstr "Lei marcial em prática ("
-#: client/text.c:1341
+#: client/text.c:1346
#, fuzzy, c-format
msgid "%d military unit may impose martial law."
msgid_plural "Up to %d military units may impose martial law."
@@ -10050,7 +10191,7 @@ msgstr[0] ""
msgstr[1] ""
"* Unidade não-militar (não pode atacar; não pode impôr lei marcial).\n"
-#: client/text.c:1345
+#: client/text.c:1350
#, fuzzy, c-format
msgid "Each military unit makes %d unhappy citizen content."
msgid_plural "Each military unit makes %d unhappy citizens content."
@@ -10061,32 +10202,32 @@ msgstr[1] ""
"Entretem os cidadãos de uma cidade, tornando 3 cidadãos descontentes em "
"contentes."
-#: client/text.c:1352
+#: client/text.c:1357
msgid "Military units in the field may cause unhappiness. "
msgstr "Unidades militares no campo poderão causar infelicidade. "
-#: client/text.c:1355
+#: client/text.c:1360
msgid "Military units have no happiness effect. "
msgstr "Unidades militares não têm qualquer efeito na felicidade. "
-#: client/text.c:1370
+#: client/text.c:1375
#, c-format
msgid "Luxury: %d total."
msgstr "Luxo: %d total."
-#: client/tilespec.c:865
+#: client/tilespec.c:882
msgid "No usable default tileset found, aborting!"
msgstr ""
"Nenhum conjunto de imagens por omissão utilizável encontrado, a abortar!"
-#: client/tilespec.c:1338
+#: client/tilespec.c:1355
msgid ""
"Client does not support isometric tilesets. Using default tileset instead."
msgstr ""
"Cliente não suporta gráficos isométricos. A utilizar conjunto de imagens por "
"omissão."
-#: client/tilespec.c:1347
+#: client/tilespec.c:1364
msgid ""
"Client does not support overhead view tilesets. Using default tileset "
"instead."
@@ -10094,7 +10235,7 @@ msgstr ""
"Cliente não suporta visão frontal com gráficos isométricos. A utilizar "
"conjunto de imagens por omissão."
-#: client/tilespec.c:3966
+#: client/tilespec.c:3987
#, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -10795,7 +10936,7 @@ msgid "_Display"
msgstr "_Mostrar"
#: client/gui-gtk-2.0/cityrep.c:1006 client/gui-gtk-2.0/menu.c:839
-#: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
+#: client/gui-sdl/diplodlg.c:692 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
#: client/gui-xaw/cityrep.c:533 client/gui-xaw/menu.c:156
@@ -10970,201 +11111,201 @@ 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:196 client/gui-gtk-2.0/messagewin.c:222
+#: client/gui-gtk-2.0/dialogs.c:197 client/gui-gtk-2.0/messagewin.c:222
#, fuzzy
msgid "Goto _Location"
msgstr "_Ir para localização"
-#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
+#: client/gui-gtk-2.0/dialogs.c:202 client/gui-gtk-2.0/messagewin.c:226
#, fuzzy
msgid "Inspect _City"
msgstr "Visualizar _Cidade"
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:258 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:258 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:259 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:311 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:312 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:312 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:313 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:506
+#: client/gui-gtk-2.0/dialogs.c:507
#, fuzzy
msgid "Unit"
msgstr "Unidades"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:950
-#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2155
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:985
+#: client/gui-gtk-2.0/dialogs.c:508 client/gui-gtk-2.0/pages.c:950
+#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2157
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:987
#: 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:519 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:520 client/gui-sdl/dialogs.c:627
msgid "Unit selection"
msgstr "Selecção de unidade"
-#: client/gui-gtk-2.0/dialogs.c:582
+#: client/gui-gtk-2.0/dialogs.c:583
msgid "_Ready all"
msgstr "P_reparar todas"
-#: client/gui-gtk-2.0/dialogs.c:590
+#: client/gui-gtk-2.0/dialogs.c:591
msgid "_Sentry idle"
msgstr "_Sentinela das inactivas"
-#: client/gui-gtk-2.0/dialogs.c:719
+#: client/gui-gtk-2.0/dialogs.c:721
#, fuzzy
msgid "Nation _Groups:"
msgstr "_Nações:"
-#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:766 data/Freeciv.in:3128
msgid "What Nation Will You Be?"
msgstr "Que Nação Irá Personificar?"
-#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
-#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
+#: client/gui-gtk-2.0/dialogs.c:768 client/gui-sdl/chatline.c:842
+#: client/gui-win32/connectdlg.c:1040 data/Freeciv.in:3371
#, fuzzy
msgid "Pick Nation"
msgstr "Esquadra de PolÃcia"
-#: client/gui-gtk-2.0/dialogs.c:774
+#: client/gui-gtk-2.0/dialogs.c:776
#, fuzzy
msgid "_Random Nation"
msgstr "Nações Unidas"
-#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:792 client/gui-win32/dialogs.c:517
msgid "Select a nation"
msgstr "Seleccione uma nação"
-#: client/gui-gtk-2.0/dialogs.c:804
+#: client/gui-gtk-2.0/dialogs.c:810
msgid "_Properties"
msgstr "_Propriedades"
-#: client/gui-gtk-2.0/dialogs.c:824
+#: client/gui-gtk-2.0/dialogs.c:830
msgid "_Leader:"
msgstr "_Lider:"
-#: client/gui-gtk-2.0/dialogs.c:831
+#: client/gui-gtk-2.0/dialogs.c:837
msgid "_Female"
msgstr "_Feminino"
-#: client/gui-gtk-2.0/dialogs.c:836
+#: client/gui-gtk-2.0/dialogs.c:842
msgid "_Male"
msgstr "_Masculino"
-#: client/gui-gtk-2.0/dialogs.c:863
+#: client/gui-gtk-2.0/dialogs.c:869
#, fuzzy
msgid "City _Styles:"
msgstr "_Estilo das Cidades:"
-#: client/gui-gtk-2.0/dialogs.c:902
+#: client/gui-gtk-2.0/dialogs.c:908
#, fuzzy
msgid "_Description"
msgstr "L_egenda"
-#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1263 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:1253 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1268 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:1262 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1277 client/gui-sdl/dialogs.c:2204
#: 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:1306 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1318 client/gui-win32/citydlg.c:1454
#: data/Freeciv.in:2484
msgid "Upgrade Unit!"
msgstr "Actualizar Unidade!"
-#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1327 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 "Actualizar Unidades Obsoletas"
-#: client/gui-gtk-2.0/diplodlg.c:231 client/gui-win32/diplodlg.c:151
+#: client/gui-gtk-2.0/diplodlg.c:222 client/gui-win32/diplodlg.c:151
#: client/gui-xaw/diplodlg.c:383 client/gui-xaw/diplodlg.c:401
msgid "World-map"
msgstr "Mapa-Mundo"
-#: client/gui-gtk-2.0/diplodlg.c:237 client/gui-win32/diplodlg.c:146
+#: client/gui-gtk-2.0/diplodlg.c:228 client/gui-win32/diplodlg.c:146
#: client/gui-xaw/diplodlg.c:387 client/gui-xaw/diplodlg.c:405
msgid "Sea-map"
msgstr "Mapa-MarÃtimo"
-#: client/gui-gtk-2.0/diplodlg.c:243
+#: client/gui-gtk-2.0/diplodlg.c:234
msgid "_Maps"
msgstr "_Mapas"
-#: client/gui-gtk-2.0/diplodlg.c:274
+#: client/gui-gtk-2.0/diplodlg.c:265
msgid "_Advances"
msgstr "_Avanços"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/diplodlg.c:315 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "_Cidades"
-#: client/gui-gtk-2.0/diplodlg.c:333
+#: client/gui-gtk-2.0/diplodlg.c:324
msgid "_Give shared vision"
msgstr "Dar visão partil_hada"
-#: client/gui-gtk-2.0/diplodlg.c:346
+#: client/gui-gtk-2.0/diplodlg.c:337
#, fuzzy
msgid "Give _embassy"
msgstr "Embaixada"
-#: client/gui-gtk-2.0/diplodlg.c:376
+#: client/gui-gtk-2.0/diplodlg.c:368
msgid "_Pacts"
msgstr "_Pactos"
-#: client/gui-gtk-2.0/diplodlg.c:466
+#: client/gui-gtk-2.0/diplodlg.c:458
#, fuzzy, c-format
msgid "Diplomacy: %s"
msgstr "Diplomata"
-#: client/gui-gtk-2.0/diplodlg.c:473
+#: client/gui-gtk-2.0/diplodlg.c:465
msgid "_Cancel meeting"
msgstr "_Cancelar encontro"
-#: client/gui-gtk-2.0/diplodlg.c:475
+#: client/gui-gtk-2.0/diplodlg.c:467
msgid "Accept _treaty"
msgstr "Aceitar _tratado"
-#: client/gui-gtk-2.0/diplodlg.c:503
+#: client/gui-gtk-2.0/diplodlg.c:495
msgid "C_lauses:"
msgstr "C_láusulas:"
-#: client/gui-gtk-2.0/diplodlg.c:568 client/gui-gtk-2.0/diplodlg.c:642
+#: client/gui-gtk-2.0/diplodlg.c:560 client/gui-gtk-2.0/diplodlg.c:634
msgid "_Gold:"
msgstr "_Moedas:"
-#: client/gui-gtk-2.0/diplodlg.c:580 client/gui-gtk-2.0/diplodlg.c:654
+#: client/gui-gtk-2.0/diplodlg.c:572 client/gui-gtk-2.0/diplodlg.c:646
msgid "_Add Clause..."
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:699
+#: client/gui-gtk-2.0/diplodlg.c:691
msgid "--- This treaty is blank. Please add some clauses. ---"
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:905 client/gui-sdl/diplodlg.c:375
+#: client/gui-gtk-2.0/diplodlg.c:897 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 "Quantia monetária especificada inválida."
@@ -11223,101 +11364,101 @@ msgstr "Seleccione o destino"
msgid "Show _All Cities"
msgstr "Mostrar _Todas Cidades"
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:164
#, fuzzy
msgid "Show Map Scrollbars"
msgstr "Mostrar Barras Rolamento de Mapa (apenas GTK+)"
-#: client/gui-gtk-2.0/gui_main.c:163
+#: client/gui-gtk-2.0/gui_main.c:165
msgid "Disable this option to hide the scrollbars on the map view."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:169
msgid "Keyboardless goto"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:168
+#: client/gui-gtk-2.0/gui_main.c:170
msgid ""
"If this option is set then a goto may be initiated by left-clicking and then "
"holding down the mouse button while dragging the mouse onto a different tile."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:173
+#: client/gui-gtk-2.0/gui_main.c:175
#, fuzzy
msgid "Keep dialogs on top"
msgstr "Manter diálogos no topo (apenas GTK+ 2.0)"
-#: client/gui-gtk-2.0/gui_main.c:174
+#: client/gui-gtk-2.0/gui_main.c:176
msgid ""
"If this option is set then dialog windows will always remain in front of the "
"main Freeciv window. Disabling this has no effect in fullscreen mode."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:178
+#: client/gui-gtk-2.0/gui_main.c:180
msgid "Show worklist task icons"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:179
+#: client/gui-gtk-2.0/gui_main.c:181
msgid ""
"Disabling this will turn off the unit and building icons in the worklist "
"dialog and the production tab of the city dialog."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:183
+#: client/gui-gtk-2.0/gui_main.c:185
msgid "Enable status report tabs"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:184
+#: client/gui-gtk-2.0/gui_main.c:186
msgid ""
"If this option is enabled then report dialogs will be shown as separate tabs "
"rather than in popup dialogs."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:189 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:191 client/gui-win32/gui_main.c:110
msgid "Better fog-of-war drawing"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:190 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:192 client/gui-win32/gui_main.c:111
msgid ""
"If this is enabled then a better method is used for drawing fog-of-war. It "
"is not any slower but will consume about twice as much memory."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:195
+#: client/gui-gtk-2.0/gui_main.c:197
msgid "Show time for each chat message"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:196
+#: client/gui-gtk-2.0/gui_main.c:198
msgid ""
"If this option is enabled then all chat messages will be prefixed by a time "
"string of the form [hour:minute:second]."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:201
+#: client/gui-gtk-2.0/gui_main.c:203
msgid "Split bottom notebook area"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:202
+#: client/gui-gtk-2.0/gui_main.c:204
msgid ""
"Enabling this option will split the bottom notebook into a left and right "
"notebook so that two tabs may be viewed at once."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:207
+#: client/gui-gtk-2.0/gui_main.c:209
msgid "New message events go to top of list"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:208
+#: client/gui-gtk-2.0/gui_main.c:210
msgid ""
"If this option is enabled, new events in the message window will appear at "
"the top of the list, rather than being appended at the bottom."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:213
+#: client/gui-gtk-2.0/gui_main.c:215
msgid "Show extra message window buttons"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:214
+#: client/gui-gtk-2.0/gui_main.c:216
msgid ""
"If this option is enabled, there will be two buttons displayed in the "
"message window for inspecting a city and going to a location. If this option "
@@ -11327,22 +11468,22 @@ msgid ""
"closed and reopened."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:224
+#: client/gui-gtk-2.0/gui_main.c:226
#, fuzzy
msgid "Metaserver tab first in network page"
msgstr "Expressão info no metaservidor definida para '%s'."
-#: client/gui-gtk-2.0/gui_main.c:225
+#: client/gui-gtk-2.0/gui_main.c:227
msgid ""
"If this option is enabled, the metaserver tab will be the first notebook tab "
"in the network page. This option requires a restart in order to take effect."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:230
+#: client/gui-gtk-2.0/gui_main.c:232
msgid "Plain chat messages are sent to allies only"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:231
+#: client/gui-gtk-2.0/gui_main.c:233
msgid ""
"If this option is enabled, then plain messages typed into the chat entry "
"while the game is running will only be sent to your allies. Otherwise plain "
@@ -11352,28 +11493,41 @@ msgid ""
"visible in multiplayer games)."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:340 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:245
+msgid "Arrange widgets for small displays"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:246
+msgid ""
+"If this option is enabled, widgets in the main window will be arrange so "
+"that they take up the least amount of total screen space. Specifically, the "
+"left panel containing the overview, player status, and the unit information "
+"box will be extended over the entire left side of the window. This option "
+"requires a restart in order to take effect."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:352 client/gui-xaw/gui_main.c:245
msgid ""
"This client has no special command line options\n"
"\n"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
+#: client/gui-gtk-2.0/gui_main.c:847 client/gui-gtk-2.0/gui_main.c:1542
msgid "Freeciv"
msgstr "Freeciv"
-#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
+#: client/gui-gtk-2.0/gui_main.c:1251 client/gui-gtk-2.0/gui_main.c:1258
#: client/gui-sdl/mapctrl.c:1566 client/gui-win32/gui_main.c:482
#: data/Freeciv.in:2618
msgid "Turn Done"
msgstr "Turno Terminado"
-#: client/gui-gtk-2.0/gui_main.c:1232 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1258 client/gui-sdl/mapctrl.c:1566
#: client/gui-sdl/mapview.c:1082
msgid "Shift+Return"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1266 client/gui-gtk-2.0/menu.c:797
+#: client/gui-gtk-2.0/gui_main.c:1299 client/gui-gtk-2.0/menu.c:797
#: client/gui-gtk-2.0/menu.c:799 client/gui-gtk-2.0/menu.c:801
#: client/gui-gtk-2.0/menu.c:803 client/gui-gtk-2.0/menu.c:805
#: client/gui-gtk-2.0/menu.c:807 client/gui-gtk-2.0/menu.c:809
@@ -11392,12 +11546,12 @@ msgstr ""
msgid "View"
msgstr "Visão"
-#: client/gui-gtk-2.0/gui_main.c:1359
+#: client/gui-gtk-2.0/gui_main.c:1393
#, fuzzy
msgid "Chat"
msgstr "Quadriga"
-#: client/gui-gtk-2.0/gui_main.c:1377 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1411 client/gui-win32/gui_main.c:538
#: data/Freeciv.in:2809
msgid ""
"Freeciv is free software and you are welcome to distribute copies of it\n"
@@ -11408,96 +11562,96 @@ msgstr ""
"sob certas condições; Consulte o item \"Licença\" no menu de Ajuda.\n"
"Agora... Rebente-os do mapa!"
-#: client/gui-gtk-2.0/gui_main.c:1392
+#: client/gui-gtk-2.0/gui_main.c:1426
msgid "Allies Only"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1657
+#: client/gui-gtk-2.0/gui_main.c:1691
msgid "Not _ready"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
+#: client/gui-gtk-2.0/gui_main.c:1702 client/gui-gtk-2.0/pages.c:1679
#, fuzzy
msgid "_Ready"
msgstr "P_reparar todas"
-#: client/gui-gtk-2.0/gui_main.c:1672 client/gui-gtk-2.0/gui_main.c:1678
-#: client/gui-gtk-2.0/pages.c:2204
+#: client/gui-gtk-2.0/gui_main.c:1706 client/gui-gtk-2.0/gui_main.c:1712
+#: client/gui-gtk-2.0/pages.c:2206
#, fuzzy
msgid "_Start"
msgstr "Estado"
-#: client/gui-gtk-2.0/gui_main.c:1686
+#: client/gui-gtk-2.0/gui_main.c:1720
#, fuzzy
msgid "_Take Player"
msgstr "Cidades"
-#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
+#: client/gui-gtk-2.0/gui_main.c:1723 client/gui-gtk-2.0/pages.c:1669
#, fuzzy
msgid "Pick _Nation"
msgstr "Esquadra de PolÃcia"
-#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
+#: client/gui-gtk-2.0/gui_main.c:1730 client/gui-gtk-2.0/pages.c:1674
#, fuzzy
msgid "_Observe"
msgstr " (observador)"
-#: client/gui-gtk-2.0/gui_main.c:1698
+#: client/gui-gtk-2.0/gui_main.c:1732
#, fuzzy
msgid "Do not _observe"
msgstr "controla agora"
-#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1755 client/gui-xaw/pages.c:211
#, fuzzy
msgid "<AI>"
msgstr "IA"
-#: client/gui-gtk-2.0/gui_main.c:1723
+#: client/gui-gtk-2.0/gui_main.c:1758
msgid "<Novice AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1726
+#: client/gui-gtk-2.0/gui_main.c:1761
#, fuzzy
msgid "<Easy AI>"
msgstr "IA"
-#: client/gui-gtk-2.0/gui_main.c:1729
+#: client/gui-gtk-2.0/gui_main.c:1764
msgid "<Normal AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1732
+#: client/gui-gtk-2.0/gui_main.c:1767
#, fuzzy
msgid "<Hard AI>"
msgstr "IA"
-#: client/gui-gtk-2.0/gui_main.c:1742 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1777 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:1808
+#: client/gui-gtk-2.0/gui_main.c:1844 client/gui-gtk-2.0/gui_main.c:1858
#, fuzzy
msgid "Observer"
msgstr " (observador)"
-#: client/gui-gtk-2.0/gui_main.c:1808
+#: client/gui-gtk-2.0/gui_main.c:1858
#, fuzzy
msgid "Detached"
msgstr ", Morto"
-#: client/gui-gtk-2.0/gui_main.c:2073
+#: client/gui-gtk-2.0/gui_main.c:2117
msgid "Are you sure you want to quit?"
msgstr ""
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
#, c-format
msgid ""
"Close Tab:\n"
"%s"
msgstr ""
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
msgid "Ctrl+W"
msgstr ""
@@ -11603,8 +11757,8 @@ msgid "Trans. Rslt/Time:"
msgstr "Resul/Data Transp:"
#: 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
-#: client/gui-win32/helpdlg.c:709 client/gui-win32/helpdlg.c:733
+#: client/gui-win32/helpdlg.c:502 client/gui-win32/helpdlg.c:550
+#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:739
#: client/gui-xaw/helpdlg.c:759 client/gui-xaw/helpdlg.c:808
#: client/gui-xaw/helpdlg.c:816 client/gui-xaw/helpdlg.c:853
#: client/gui-xaw/helpdlg.c:878
@@ -11651,34 +11805,34 @@ msgstr "com"
msgid "?techhelp:"
msgstr "?techhelp:"
-#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:591
+#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:597
#: client/gui-xaw/helpdlg.c:996
#, c-format
msgid "+%d Trade / %d"
msgstr "+%d Comércio / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:595
+#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:601
#: client/gui-xaw/helpdlg.c:1000
#, c-format
msgid "no extra / %d"
msgstr "sem extra / %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
-#: client/gui-win32/helpdlg.c:602 client/gui-win32/helpdlg.c:616
-#: client/gui-win32/helpdlg.c:635 client/gui-xaw/helpdlg.c:1002
+#: client/gui-gtk-2.0/helpdlg.c:1085 client/gui-win32/helpdlg.c:604
+#: client/gui-win32/helpdlg.c:608 client/gui-win32/helpdlg.c:622
+#: client/gui-win32/helpdlg.c:641 client/gui-xaw/helpdlg.c:1002
#: client/gui-xaw/helpdlg.c:1006 client/gui-xaw/helpdlg.c:1020
#: client/gui-xaw/helpdlg.c:1039
msgid "n/a"
msgstr "n/d"
-#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:605
+#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:611
#: client/gui-xaw/helpdlg.c:1009
#, c-format
msgid "+%d Food / %d"
msgstr "+%d Comida / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:619
+#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:625
#: client/gui-xaw/helpdlg.c:1023
#, c-format
msgid "+%d Res. / %d"
@@ -12483,41 +12637,41 @@ msgstr ""
msgid "Connect to Gaming _Zone"
msgstr "Ligar a esta localização"
-#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:302
#: client/gui-xaw/connectdlg.c:326
msgid "Passwords don't match, enter password."
msgstr ""
#: client/gui-gtk-2.0/pages.c:779 client/gui-gtk-2.0/pages.c:820
-#: client/gui-win32/connectdlg.c:916
+#: client/gui-win32/connectdlg.c:918
msgid "Server Name"
msgstr "Nome Servidor"
#: client/gui-gtk-2.0/pages.c:780 client/gui-gtk-2.0/pages.c:821
-#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:916
+#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:918
#: data/Freeciv.in:96
msgid "Port"
msgstr "Porto"
#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Version"
msgstr "Versão"
#: client/gui-gtk-2.0/pages.c:782 client/gui-gtk-2.0/pages.c:823
-#: client/gui-gtk-2.0/pages.c:2161 client/gui-win32/connectdlg.c:917
-#: client/gui-win32/connectdlg.c:995
+#: client/gui-gtk-2.0/pages.c:2163 client/gui-win32/connectdlg.c:919
+#: client/gui-win32/connectdlg.c:997
msgid "Status"
msgstr "Estado"
#: client/gui-gtk-2.0/pages.c:783 client/gui-gtk-2.0/pages.c:824
#: client/gui-sdl/connectdlg.c:318 client/gui-sdl/plrdlg.c:330
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Players"
msgstr "Jogadores"
#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
-#: client/gui-win32/connectdlg.c:918
+#: client/gui-win32/connectdlg.c:920
msgid "Comment"
msgstr "Observações"
@@ -12551,9 +12705,9 @@ msgstr ""
msgid "Conf_irm Password:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2165
#: 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:1000
+#: client/gui-win32/citydlg.c:1083 client/gui-win32/connectdlg.c:1002
#: client/gui-win32/wldlg.c:800 client/gui-win32/wldlg.c:806
msgid "Type"
msgstr "Tipo"
@@ -12654,7 +12808,7 @@ msgstr ""
msgid "Ruleset _Version:"
msgstr "_Pré-definições:"
-#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2195
#, fuzzy
msgid "_More Game Options..."
msgstr "Opções das Mensagens..."
@@ -12674,54 +12828,54 @@ msgstr "A aguardar"
msgid "Ready"
msgstr "Activar todas"
-#: client/gui-gtk-2.0/pages.c:1601
+#: client/gui-gtk-2.0/pages.c:1600
#, fuzzy
msgid "?player:Leader"
msgstr "?city:Nome"
-#: client/gui-gtk-2.0/pages.c:1732 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1734 client/gui-sdl/chatline.c:185
msgid "Choose Saved Game to Load"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1824
+#: client/gui-gtk-2.0/pages.c:1826
msgid "Choose Saved Game to _Load:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
-#: client/gui-gtk-2.0/pages.c:2451
+#: client/gui-gtk-2.0/pages.c:1846 client/gui-gtk-2.0/pages.c:2039
+#: client/gui-gtk-2.0/pages.c:2455
msgid "_Browse..."
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1911
+#: client/gui-gtk-2.0/pages.c:1913
#, fuzzy
msgid "Choose a Scenario"
msgstr "Ler Cenário"
-#: client/gui-gtk-2.0/pages.c:1998
+#: client/gui-gtk-2.0/pages.c:2000
#, fuzzy
msgid "Choose a _Scenario:"
msgstr "Ler Cenário"
-#: client/gui-gtk-2.0/pages.c:2173
+#: client/gui-gtk-2.0/pages.c:2175
#, fuzzy
msgid "Choose a _nation to play:"
msgstr "Seleccionar actividade da unidade:"
-#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2367 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:2448 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2452 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "Gravar Jogo"
-#: client/gui-gtk-2.0/pages.c:2489
+#: client/gui-gtk-2.0/pages.c:2493
#, fuzzy
msgid "Saved _Games:"
msgstr "Gravar Jogo"
-#: client/gui-gtk-2.0/pages.c:2516
+#: client/gui-gtk-2.0/pages.c:2520
#, fuzzy
msgid "Save _Filename:"
msgstr "Gravar Jogo"
@@ -13080,7 +13234,7 @@ msgstr "Fechar diálogo"
msgid "Total users logged in : %d"
msgstr ""
-#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1098
#, fuzzy
msgid "Back"
msgstr "Banco"
@@ -13091,7 +13245,7 @@ msgid "Start"
msgstr "Estado"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:777
+#: client/gui-win32/connectdlg.c:779
msgid "Load Game"
msgstr "Ler Jogo"
@@ -13133,9 +13287,9 @@ msgstr "Tornar cidade origem"
#: client/gui-sdl/connectdlg.c:308 client/gui-sdl/connectdlg.c:617
#: client/gui-sdl/connectdlg.c:803 client/gui-sdl/connectdlg.c:985
#: client/gui-sdl/dialogs.c:452 client/gui-sdl/dialogs.c:2095
-#: client/gui-sdl/dialogs.c:2893 client/gui-sdl/diplomat_dialog.c:731
+#: client/gui-sdl/dialogs.c:2902 client/gui-sdl/diplomat_dialog.c:731
#: client/gui-sdl/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1043
#: client/gui-win32/dialogs.c:1772 client/gui-win32/finddlg.c:127
#: client/gui-win32/gotodlg.c:171 client/gui-win32/inputdlg.c:146
#: client/gui-win32/messagedlg.c:216 client/gui-win32/ratesdlg.c:328
@@ -13180,7 +13334,7 @@ msgid "Buy it?"
msgstr "Comprar!"
#: 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
+#: client/gui-sdl/diplodlg.c:1336 client/gui-sdl/diplomat_dialog.c:1211
#: client/gui-sdl/diplomat_dialog.c:1417 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:221 client/gui-sdl/repodlgs.c:1559
#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
@@ -13196,7 +13350,7 @@ msgid "No"
msgstr "Não"
#: client/gui-sdl/citydlg.c:1215 client/gui-sdl/cma_fe.c:318
-#: client/gui-sdl/diplodlg.c:1345 client/gui-sdl/diplomat_dialog.c:1200
+#: client/gui-sdl/diplodlg.c:1346 client/gui-sdl/diplomat_dialog.c:1200
#: client/gui-sdl/diplomat_dialog.c:1407 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:232 client/gui-win32/repodlgs.c:578
#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
@@ -13530,7 +13684,7 @@ msgstr "Selecção Servidor Freeciv"
msgid "Port :"
msgstr "Porto:"
-#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1100
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr "Ligar"
@@ -13647,23 +13801,23 @@ msgstr "Seleccione o Seu Novo Tipo de Governo"
msgid "REVOLUTION!"
msgstr "REVOLUÇÃO..."
-#: client/gui-sdl/dialogs.c:2232 client/gui-sdl/dialogs.c:2620
+#: client/gui-sdl/dialogs.c:2237 client/gui-sdl/dialogs.c:2625
#: client/gui-win32/dialogs.c:567 data/Freeciv.in:3159
msgid "Female"
msgstr "Feminino"
-#: client/gui-sdl/dialogs.c:2234 client/gui-sdl/dialogs.c:2618
-#: client/gui-sdl/dialogs.c:2830 client/gui-win32/dialogs.c:565
+#: client/gui-sdl/dialogs.c:2239 client/gui-sdl/dialogs.c:2623
+#: client/gui-sdl/dialogs.c:2839 client/gui-win32/dialogs.c:565
msgid "Male"
msgstr "Masculino"
-#: client/gui-sdl/dialogs.c:2478 client/gui-sdl/dialogs.c:2902
+#: client/gui-sdl/dialogs.c:2483 client/gui-sdl/dialogs.c:2911
#: 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 "OK"
-#: client/gui-sdl/dialogs.c:2685 client/gui-win32/dialogs.c:505
+#: client/gui-sdl/dialogs.c:2694 client/gui-win32/dialogs.c:505
msgid "What nation will you be?"
msgstr "Que nação irá escolher?"
@@ -13692,80 +13846,80 @@ msgstr "Mapa-Mundo"
msgid "Sea map"
msgstr "Mapa-MarÃtimo"
-#: client/gui-sdl/diplodlg.c:563
+#: client/gui-sdl/diplodlg.c:564
#, fuzzy
msgid "Give embassy"
msgstr "Embaixada"
-#: client/gui-sdl/diplodlg.c:579 client/gui-win32/diplodlg.c:614
+#: client/gui-sdl/diplodlg.c:580 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 "Moedas(max %d)"
-#: client/gui-sdl/diplodlg.c:613 client/gui-sdl/helpdlg.c:1956
+#: client/gui-sdl/diplodlg.c:614 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 "Avanços"
-#: client/gui-sdl/diplodlg.c:831 client/gui-win32/diplodlg.c:598
+#: client/gui-sdl/diplodlg.c:832 client/gui-win32/diplodlg.c:598
#: data/Freeciv.in:269
msgid "Diplomacy meeting"
msgstr "Encontro diplomático"
-#: client/gui-sdl/diplodlg.c:883 client/gui-win32/diplodlg.c:680
+#: client/gui-sdl/diplodlg.c:884 client/gui-win32/diplodlg.c:680
#: data/Freeciv.in:510
msgid "Cancel meeting"
msgstr "Cancelar encontro"
-#: client/gui-sdl/diplodlg.c:895 client/gui-win32/diplodlg.c:679
+#: client/gui-sdl/diplodlg.c:896 client/gui-win32/diplodlg.c:679
#: data/Freeciv.in:501
msgid "Accept treaty"
msgstr "Aceitar tratado"
#. TRANS: "Polish incident !" FIXME!!!
-#: client/gui-sdl/diplodlg.c:1304
+#: client/gui-sdl/diplodlg.c:1305
#, fuzzy, c-format
msgid "%s incident !"
msgstr "Cientistas"
-#: client/gui-sdl/diplodlg.c:1322
+#: client/gui-sdl/diplodlg.c:1323
msgid "Shall we declare WAR on them?"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1433
+#: client/gui-sdl/diplodlg.c:1434
#, fuzzy
msgid "Foreign Minister"
msgstr "Primeiro Ministro"
-#: client/gui-sdl/diplodlg.c:1449
+#: client/gui-sdl/diplodlg.c:1450
#, c-format
msgid ""
"Sir!, the %s ambassador has arrived\n"
"What are your wishes?"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1465
+#: client/gui-sdl/diplodlg.c:1466
msgid "Declare WAR"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1467 client/gui-win32/plrdlg.c:357
+#: client/gui-sdl/diplodlg.c:1468 client/gui-win32/plrdlg.c:357
msgid "Cancel Treaty"
msgstr "Cancelar Tratado"
-#: client/gui-sdl/diplodlg.c:1490 client/gui-win32/plrdlg.c:358
+#: client/gui-sdl/diplodlg.c:1491 client/gui-win32/plrdlg.c:358
#: data/Freeciv.in:3254
msgid "Withdraw vision"
msgstr "Retirar visão"
-#: client/gui-sdl/diplodlg.c:1507
+#: client/gui-sdl/diplodlg.c:1508
#, fuzzy
msgid "Call Diplomatic Meeting"
msgstr "Encontro diplomático"
-#: client/gui-sdl/diplodlg.c:1521
+#: client/gui-sdl/diplodlg.c:1522
msgid "Send him back"
msgstr ""
@@ -14526,12 +14680,12 @@ msgid "Leave Game"
msgstr "Gravar Jogo"
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1100 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1102 client/gui-xaw/menu.c:121
#: data/Freeciv.in:115 data/Freeciv.in:3180
msgid "Quit"
msgstr "Sair"
-#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:967
msgid "Start New Game"
msgstr "Iniciar Novo Jogo"
@@ -14657,8 +14811,8 @@ msgstr ""
msgid "%s max rate : %d%%"
msgstr "taxa máxima de %s: %d%%"
-#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
-#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1085
+#: client/gui-win32/connectdlg.c:1093 data/Freeciv.in:155
msgid "Update"
msgstr "Actualizar"
@@ -15119,73 +15273,73 @@ msgstr "_Nova"
msgid "Delete"
msgstr "Apagar"
-#: client/gui-win32/connectdlg.c:147
+#: client/gui-win32/connectdlg.c:149
msgid "Password:"
msgstr ""
-#: client/gui-win32/connectdlg.c:169
+#: client/gui-win32/connectdlg.c:171
#, fuzzy
msgid "Couldn't load the savegame"
msgstr "Incapaz de ler o ficheiro de jogo gravado: %s"
-#: client/gui-win32/connectdlg.c:284 client/gui-xaw/connectdlg.c:311
+#: client/gui-win32/connectdlg.c:286 client/gui-xaw/connectdlg.c:311
msgid "Verify Password"
msgstr ""
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:916 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr "Selecção Servidor Freeciv"
-#: client/gui-win32/connectdlg.c:915
+#: client/gui-win32/connectdlg.c:917
msgid "Local Area Network"
msgstr ""
-#: client/gui-win32/connectdlg.c:949
+#: client/gui-win32/connectdlg.c:951
#, fuzzy
msgid "Welcome to Freeciv"
msgstr "Cliente para o Freeciv"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
#, fuzzy
msgid "Load Saved Game"
msgstr "Gravar Jogo"
-#: client/gui-win32/connectdlg.c:969
+#: client/gui-win32/connectdlg.c:971
msgid "Connect To Network Game"
msgstr ""
-#: client/gui-win32/connectdlg.c:979
+#: client/gui-win32/connectdlg.c:981
msgid "Choose a nation to play"
msgstr ""
-#: client/gui-win32/connectdlg.c:1014
+#: client/gui-win32/connectdlg.c:1016
#, fuzzy
msgid "Number of players (Including AI):"
msgstr "Número de jogadores a encher com IA's"
-#: client/gui-win32/connectdlg.c:1022
+#: client/gui-win32/connectdlg.c:1024
msgid "AI skill level:"
msgstr ""
-#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1038 client/gui-win32/repodlgs.c:931
#, fuzzy
msgid "Game Options"
msgstr "Opções das Mensagens"
-#: client/gui-win32/connectdlg.c:1040
+#: client/gui-win32/connectdlg.c:1042
msgid "Start Game"
msgstr "Iniciar Jogo"
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
#, fuzzy
msgid "Login:"
msgstr "Legião"
-#: client/gui-win32/connectdlg.c:1061
+#: client/gui-win32/connectdlg.c:1063
msgid "Host:"
msgstr "Máquina:"
-#: client/gui-win32/connectdlg.c:1062
+#: client/gui-win32/connectdlg.c:1064
msgid "Port:"
msgstr "Porto:"
@@ -15266,21 +15420,21 @@ msgid ""
"this is much slower."
msgstr ""
-#: client/gui-win32/helpdlg.c:769 client/gui-win32/helpdlg.c:792
-#: client/gui-win32/helpdlg.c:803 client/gui-win32/helpdlg.c:809
-#: client/gui-win32/helpdlg.c:822
+#: client/gui-win32/helpdlg.c:775 client/gui-win32/helpdlg.c:798
+#: client/gui-win32/helpdlg.c:809 client/gui-win32/helpdlg.c:815
+#: client/gui-win32/helpdlg.c:828
msgid "Allows "
msgstr "Permite "
-#: client/gui-win32/helpdlg.c:780
+#: client/gui-win32/helpdlg.c:786
msgid "Obsoletes "
msgstr "Torna Obsoleta "
-#: client/gui-win32/helpdlg.c:812 client/gui-win32/helpdlg.c:825
+#: client/gui-win32/helpdlg.c:818 client/gui-win32/helpdlg.c:831
msgid " (with "
msgstr " (com "
-#: client/gui-win32/helpdlg.c:815 client/gui-win32/helpdlg.c:828
+#: client/gui-win32/helpdlg.c:821 client/gui-win32/helpdlg.c:834
msgid "?techhelp:)."
msgstr "?techhelp:)."
@@ -16412,7 +16566,7 @@ 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/"
+" https://gna.org/projects/freeciv/"
msgstr ""
"Se encontrar quaisquer erros (bugs), envie-nos um relatório de erro. A "
"melhor forma é visitando o Sistema de Acompanhamento de Bugs do Freeciv, "
@@ -18736,6 +18890,7 @@ msgid "Hydro Plant"
msgstr "Barragem"
#: data/default/buildings.ruleset:378
+#, fuzzy
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 "
@@ -18743,47 +18898,43 @@ msgid ""
"a Factory, Mfg. Plant and Hydro Plant together give a 150% production "
"bonus.\n"
"\n"
-"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant. A city "
-"can only build a Hydro Plant if it is next to (or on) a Mountain or River "
-"tile."
+"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant."
msgstr ""
-"Reduz a quantidade de poluição gerada pela produção numa cidade em 50%. "
+"Reduz a quantidade de poluição gerada pela produção de uma cidade em 50%. "
"Também aumenta a produção de escudos de uma Fábrica ou Unidade "
-"Transformadora numa cidade: uma Fábrica e Barragem juntas dão um bónus de "
-"75% de produção e uma Fábrica, Unidade Transformadora e Barragem juntas dão "
-"um bónus produtivo de 150%.\n"
+"Transformadora na cidade: uma Fábrica e Central Nuclear juntas geram um "
+"bónus produtivo de 75%, e uma Fábrica, Unidade Transformadora e Central "
+"Nuclear juntas dão um bónus produtivo de 150%.\n"
"\n"
-"Uma cidade apenas pode ter uma Barragem, Central Térmica ou Central Nuclear. "
-"Uma cidade apenas pode construir uma Barragem se estiver junto a uma (ou "
-"numa) quadrÃcula de Montanha ou Rio."
+"Uma cidade apenas pode ter uma Barragem, Central Térmica ou Central Nuclear."
-#: data/default/buildings.ruleset:397 data/civ2/buildings.ruleset:373
+#: data/default/buildings.ruleset:396 data/civ2/buildings.ruleset:373
#: data/civ1/buildings.ruleset:297
msgid "Library"
msgstr "Biblioteca"
-#: data/default/buildings.ruleset:412
+#: data/default/buildings.ruleset:411
#, fuzzy, no-c-format
msgid "Increases the science output in a city by 100%."
msgstr "Aumenta a produção cientÃfica de uma cidade em 50%."
-#: data/default/buildings.ruleset:417 data/civ2/buildings.ruleset:393
+#: data/default/buildings.ruleset:416 data/civ2/buildings.ruleset:393
#: data/civ1/buildings.ruleset:317
msgid "Marketplace"
msgstr "Mercado"
-#: data/default/buildings.ruleset:432 data/civ2/buildings.ruleset:408
+#: data/default/buildings.ruleset:431 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 "Aumenta o luxo e colecta de impostos numa cidade em 50%."
-#: data/default/buildings.ruleset:437 data/civ2/buildings.ruleset:413
+#: data/default/buildings.ruleset:436 data/civ2/buildings.ruleset:413
#: data/civ1/buildings.ruleset:337
msgid "Mass Transit"
msgstr "Transportes Públicos"
-#: data/default/buildings.ruleset:451 data/civ2/buildings.ruleset:427
+#: data/default/buildings.ruleset:450 data/civ2/buildings.ruleset:427
#: data/civ1/buildings.ruleset:351
msgid ""
"Neutralizes the pollution generated by the population. The population "
@@ -18792,12 +18943,12 @@ msgstr ""
"Neutraliza a poluição gerada pela população. A população não tem qualquer "
"efeito na poluição gerada por uma cidade."
-#: data/default/buildings.ruleset:458 data/civ2/buildings.ruleset:434
+#: data/default/buildings.ruleset:457 data/civ2/buildings.ruleset:434
#: data/civ1/buildings.ruleset:358
msgid "Mfg. Plant"
msgstr "Unidade Transformadora"
-#: data/default/buildings.ruleset:474 data/civ2/buildings.ruleset:450
+#: data/default/buildings.ruleset:473 data/civ2/buildings.ruleset:450
#: data/civ1/buildings.ruleset:374
#, no-c-format
msgid ""
@@ -18807,12 +18958,12 @@ msgstr ""
"Junto com uma Fábrica, uma Unidade Transformadora aumenta a produção de "
"escudos de uma cidade em 100%."
-#: data/default/buildings.ruleset:480 data/civ2/buildings.ruleset:456
+#: data/default/buildings.ruleset:479 data/civ2/buildings.ruleset:456
#: data/civ1/buildings.ruleset:380
msgid "Nuclear Plant"
msgstr "Central Nuclear"
-#: data/default/buildings.ruleset:495
+#: data/default/buildings.ruleset:494
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 "
@@ -18830,11 +18981,11 @@ msgstr ""
"\n"
"Uma cidade apenas pode ter uma Barragem, Central Térmica ou Central Nuclear."
-#: data/default/buildings.ruleset:515 data/civ2/buildings.ruleset:489
+#: data/default/buildings.ruleset:514 data/civ2/buildings.ruleset:489
msgid "Offshore Platform"
msgstr "Plataforma PetrolÃfera"
-#: data/default/buildings.ruleset:530 data/civ2/buildings.ruleset:504
+#: data/default/buildings.ruleset:529 data/civ2/buildings.ruleset:504
msgid ""
"Adds 1 extra shield resource on all Ocean squares in a city. The city needs "
"to be coastal to build this improvement."
@@ -18842,12 +18993,12 @@ msgstr ""
"Aumenta 1 recurso de escudo a todas as quadrÃculas de Oceano de uma cidade. "
"A cidade tem de ser costeira para poder a construir."
-#: data/default/buildings.ruleset:536 data/civ2/buildings.ruleset:510
+#: data/default/buildings.ruleset:535 data/civ2/buildings.ruleset:510
#: data/civ1/buildings.ruleset:411
msgid "Palace"
msgstr "Palácio"
-#: data/default/buildings.ruleset:552
+#: data/default/buildings.ruleset:551
#, fuzzy, no-c-format
msgid ""
"Makes a city the capital and the center of your government. Corruption in "
@@ -18873,11 +19024,11 @@ msgstr ""
"guerra civil no seu império. Perder o seu palácio irá também resultar na "
"perca de qualquer nave espacial que possa possuir."
-#: data/default/buildings.ruleset:569 data/civ2/buildings.ruleset:539
+#: data/default/buildings.ruleset:568 data/civ2/buildings.ruleset:539
msgid "Police Station"
msgstr "Esquadra de PolÃcia"
-#: data/default/buildings.ruleset:583 data/civ2/buildings.ruleset:553
+#: data/default/buildings.ruleset:582 data/civ2/buildings.ruleset:553
msgid ""
"Reduces the unhappiness caused by military units outside the city by 2 under "
"Democracy and 1 under Republic. This improvement has no effect under other "
@@ -18887,11 +19038,11 @@ msgstr ""
"uma Democracia e em 1 sob uma República. Esta construção não tem qualquer "
"efeito sob outras formas de governo."
-#: data/default/buildings.ruleset:593 data/civ2/buildings.ruleset:560
+#: data/default/buildings.ruleset:592 data/civ2/buildings.ruleset:560
msgid "Port Facility"
msgstr "Porto"
-#: data/default/buildings.ruleset:608 data/civ2/buildings.ruleset:575
+#: data/default/buildings.ruleset:607 data/civ2/buildings.ruleset:575
msgid ""
"Allows a city to build veteran sea units. Also, damaged sea units which "
"stay in town for one full turn without moving are completely restored."
@@ -18900,12 +19051,12 @@ msgstr ""
"Adicionalmente, unidades marÃtimas danificadas que permaneçam na cidade por "
"um turno completo sem se movimentarem ficam completamente recuperadas."
-#: data/default/buildings.ruleset:615 data/civ2/buildings.ruleset:582
+#: data/default/buildings.ruleset:614 data/civ2/buildings.ruleset:582
#: data/civ1/buildings.ruleset:440
msgid "Power Plant"
msgstr "Central Térmica"
-#: data/default/buildings.ruleset:631
+#: data/default/buildings.ruleset:630
#, no-c-format
msgid ""
"Increases the shield production of a Factory or Mfg. Plant in a city: a "
@@ -18922,12 +19073,12 @@ msgstr ""
"\n"
"Uma cidade apenas pode ter uma Barragem, Central Térmica ou Central Nuclear."
-#: data/default/buildings.ruleset:646 data/civ2/buildings.ruleset:610
+#: data/default/buildings.ruleset:645 data/civ2/buildings.ruleset:610
#: data/civ1/buildings.ruleset:468
msgid "Recycling Center"
msgstr "Centro de Reciclagem"
-#: data/default/buildings.ruleset:661 data/civ2/buildings.ruleset:625
+#: data/default/buildings.ruleset:660 data/civ2/buildings.ruleset:625
#: data/civ1/buildings.ruleset:483
#, no-c-format
msgid ""
@@ -18937,11 +19088,11 @@ msgstr ""
"A construção de um Centro de Reciclagem reduz a quantidade de poluição "
"gerada pela produção de uma cidade em 66%."
-#: data/default/buildings.ruleset:667 data/civ2/buildings.ruleset:631
+#: data/default/buildings.ruleset:666 data/civ2/buildings.ruleset:631
msgid "Research Lab"
msgstr "Lab. de Investigação"
-#: data/default/buildings.ruleset:682
+#: data/default/buildings.ruleset:681
#, fuzzy
msgid ""
"Together with a Library, a Research Lab increases the science production of "
@@ -18953,11 +19104,11 @@ msgstr ""
"Universidade, um Lab. de Investigação aumenta a produção cientÃfica de uma "
"cidade em 150%."
-#: data/default/buildings.ruleset:690 data/civ2/buildings.ruleset:654
+#: data/default/buildings.ruleset:689 data/civ2/buildings.ruleset:654
msgid "SAM Battery"
msgstr "Bateria SAM"
-#: data/default/buildings.ruleset:704 data/civ2/buildings.ruleset:668
+#: data/default/buildings.ruleset:703 data/civ2/buildings.ruleset:668
msgid ""
"Doubles the defense of all units inside the city when attacked by non-"
"nuclear air units."
@@ -18965,12 +19116,12 @@ msgstr ""
"Duplica a defesa de todas as unidades dentro de uma cidade quando atacadas "
"por unidades aéreas não-nucleares."
-#: data/default/buildings.ruleset:710 data/civ2/buildings.ruleset:674
+#: data/default/buildings.ruleset:709 data/civ2/buildings.ruleset:674
#: data/civ1/buildings.ruleset:489
msgid "SDI Defense"
msgstr "Defesa SDI"
-#: data/default/buildings.ruleset:724 data/civ2/buildings.ruleset:688
+#: data/default/buildings.ruleset:723 data/civ2/buildings.ruleset:688
#: data/civ1/buildings.ruleset:503
msgid ""
"Protects a city from attacks from Nuclear units. Nuclear attacks simply "
@@ -18981,11 +19132,11 @@ msgstr ""
"têm qualquer efeito sobre a cidade. Adicionalmente, duplica a defesa contra "
"mÃsseis não-nucleares."
-#: data/default/buildings.ruleset:733 data/civ2/buildings.ruleset:697
+#: data/default/buildings.ruleset:732 data/civ2/buildings.ruleset:697
msgid "Sewer System"
msgstr "Sistema de Esgotos"
-#: data/default/buildings.ruleset:748 data/civ2/buildings.ruleset:712
+#: data/default/buildings.ruleset:747 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."
@@ -18993,12 +19144,12 @@ msgstr ""
"Permite que uma cidade cresça mais do que tamanho 12. Um Aqueduto é "
"necessário primeiro para que uma cidade cresça mais do que o tamanho 8."
-#: data/default/buildings.ruleset:754 data/civ2/buildings.ruleset:749
+#: data/default/buildings.ruleset:753 data/civ2/buildings.ruleset:749
#: data/civ1/buildings.ruleset:512
msgid "Space Component"
msgstr "Componente Espacial"
-#: data/default/buildings.ruleset:769 data/civ2/buildings.ruleset:763
+#: data/default/buildings.ruleset:768 data/civ2/buildings.ruleset:763
#: data/civ1/buildings.ruleset:526
msgid ""
"Space Components can be differentiated into Propulsion and Fuel Components. "
@@ -19015,12 +19166,12 @@ msgstr ""
"Antes de poder construir qualquer componente da nave espacial, a maravilha "
"do mundo Programa Apolo terá de ser construida por um qualquer jogador."
-#: data/default/buildings.ruleset:779 data/civ2/buildings.ruleset:773
+#: data/default/buildings.ruleset:778 data/civ2/buildings.ruleset:773
#: data/civ1/buildings.ruleset:536
msgid "Space Module"
msgstr "Módulo Espacial"
-#: data/default/buildings.ruleset:794 data/civ2/buildings.ruleset:787
+#: data/default/buildings.ruleset:793 data/civ2/buildings.ruleset:787
#: data/civ1/buildings.ruleset:550
msgid ""
"Space Modules are the most expensive parts of spaceships. There are three "
@@ -19056,12 +19207,12 @@ msgstr ""
"Antes de poder construir qualquer componente da nave espacial, a maravilha "
"do mundo Programa Apolo terá de ser construida por um qualquer jogador."
-#: data/default/buildings.ruleset:813 data/civ2/buildings.ruleset:806
+#: data/default/buildings.ruleset:812 data/civ2/buildings.ruleset:806
#: data/civ1/buildings.ruleset:569
msgid "Space Structural"
msgstr "Estrutura Espacial"
-#: data/default/buildings.ruleset:828 data/civ2/buildings.ruleset:820
+#: data/default/buildings.ruleset:827 data/civ2/buildings.ruleset:820
#: data/civ1/buildings.ruleset:583
msgid ""
"Space Structurals form the base of your spaceship. All other spaceship "
@@ -19078,11 +19229,11 @@ msgstr ""
"Antes de poder construir qualquer componente da nave espacial, a maravilha "
"do mundo Programa Apolo terá de ser construida por um qualquer jogador."
-#: data/default/buildings.ruleset:838 data/civ2/buildings.ruleset:830
+#: data/default/buildings.ruleset:837 data/civ2/buildings.ruleset:830
msgid "Stock Exchange"
msgstr "Bolsa"
-#: data/default/buildings.ruleset:854 data/civ2/buildings.ruleset:846
+#: data/default/buildings.ruleset:853 data/civ2/buildings.ruleset:846
#, no-c-format
msgid ""
"Together with a Marketplace and a Bank, a Stock Exchange boosts tax and "
@@ -19091,11 +19242,11 @@ msgstr ""
"Juntamente com um Mercado e um Banco, a Bolsa potencia a colecta de impostos "
"e a produção de luxo de uma cidade em 150%."
-#: data/default/buildings.ruleset:860 data/civ2/buildings.ruleset:852
+#: data/default/buildings.ruleset:859 data/civ2/buildings.ruleset:852
msgid "Super Highways"
msgstr "Auto Estradas"
-#: data/default/buildings.ruleset:875 data/civ2/buildings.ruleset:867
+#: data/default/buildings.ruleset:874 data/civ2/buildings.ruleset:867
#, no-c-format
msgid ""
"Increases trade resources by 50% on all squares with roads or railroads."
@@ -19103,11 +19254,11 @@ msgstr ""
"Aumenta os recursos comerciais em 50% em todas as quadrÃculas com estradas "
"ou ferrovias."
-#: data/default/buildings.ruleset:883 data/civ2/buildings.ruleset:873
+#: data/default/buildings.ruleset:882 data/civ2/buildings.ruleset:873
msgid "Supermarket"
msgstr "Supermercado"
-#: data/default/buildings.ruleset:898 data/civ2/buildings.ruleset:888
+#: data/default/buildings.ruleset:897 data/civ2/buildings.ruleset:888
#, no-c-format
msgid ""
"Increases the food resources by 50% on each farmland square which is being "
@@ -19118,12 +19269,12 @@ msgstr ""
"a ser utilizada nos arredores da cidade. QuadrÃculas de quinta são aqueles "
"que tiverem sido irrigados uma segunda vez."
-#: data/default/buildings.ruleset:905 data/civ2/buildings.ruleset:895
+#: data/default/buildings.ruleset:904 data/civ2/buildings.ruleset:895
#: data/civ1/buildings.ruleset:593
msgid "Temple"
msgstr "Templo"
-#: data/default/buildings.ruleset:919 data/civ2/buildings.ruleset:909
+#: data/default/buildings.ruleset:918 data/civ2/buildings.ruleset:909
#: data/civ1/buildings.ruleset:607
msgid ""
"Makes one unhappy citizen content. Both the Mysticism advance and the "
@@ -19134,13 +19285,13 @@ msgstr ""
"maravilha do Oráculo duplicam este efeito. Com ambos o Misticismo e "
"Oráculo, 4 cidadãos são tornados contentes."
-#: data/default/buildings.ruleset:926 data/civ2/buildings.ruleset:916
+#: data/default/buildings.ruleset:925 data/civ2/buildings.ruleset:916
#: data/civ1/buildings.ruleset:614 data/default/techs.ruleset:742
#: data/civ2/techs.ruleset:727 data/civ1/techs.ruleset:723
msgid "University"
msgstr "Universidade"
-#: data/default/buildings.ruleset:942
+#: data/default/buildings.ruleset:941
#, fuzzy, no-c-format
msgid ""
"Together with a Library, a University increases the science production of a "
@@ -19149,12 +19300,12 @@ msgstr ""
"Juntamente com uma Biblioteca, uma Universidade aumenta a produção "
"cientÃfica de uma cidade em 100%."
-#: data/default/buildings.ruleset:948 data/civ2/buildings.ruleset:938
+#: data/default/buildings.ruleset:947 data/civ2/buildings.ruleset:938
#: data/civ1/buildings.ruleset:636
msgid "Apollo Program"
msgstr "Programa Apolo"
-#: data/default/buildings.ruleset:962 data/civ2/buildings.ruleset:952
+#: data/default/buildings.ruleset:961 data/civ2/buildings.ruleset:952
msgid ""
"Entire map becomes visible for the player who owns it. It allows all "
"players to start building spaceship parts (assuming they have researched the "
@@ -19164,11 +19315,11 @@ msgstr ""
"todos os jogadores comecem a construir partes da nave espacial (desde que "
"tenham pesquisado as necessárias tecnologias)."
-#: data/default/buildings.ruleset:969 data/civ2/buildings.ruleset:959
+#: data/default/buildings.ruleset:968 data/civ2/buildings.ruleset:959
msgid "A.Smith's Trading Co."
msgstr "Companhia Comercial A.Smith"
-#: data/default/buildings.ruleset:983
+#: data/default/buildings.ruleset:982
#, fuzzy
msgid ""
"City improvements which would normally have an upkeep of 1 are free of "
@@ -19177,12 +19328,12 @@ msgstr ""
"Construções de cidade que normalmente teriam uma manutenção de 1 ficam "
"livres de qualquer manutenção, em todas as cidades."
-#: data/default/buildings.ruleset:989 data/civ2/buildings.ruleset:979
+#: data/default/buildings.ruleset:988 data/civ2/buildings.ruleset:979
#: data/civ1/buildings.ruleset:655
msgid "Colossus"
msgstr "Colosso"
-#: data/default/buildings.ruleset:1003 data/civ2/buildings.ruleset:993
+#: data/default/buildings.ruleset:1002 data/civ2/buildings.ruleset:993
#: data/civ1/buildings.ruleset:669
msgid ""
"Each square around the city where this wonder is built that is already "
@@ -19191,23 +19342,23 @@ msgstr ""
"Cada quadrÃcula em redor da cidade em que esta maravilha for construida e "
"que já gere algum comércio produz um recurso de comércio adicional."
-#: data/default/buildings.ruleset:1009 data/civ2/buildings.ruleset:999
+#: data/default/buildings.ruleset:1008 data/civ2/buildings.ruleset:999
#: data/civ1/buildings.ruleset:675
msgid "Copernicus' Observatory"
msgstr "Observatório de Copérnico"
-#: data/default/buildings.ruleset:1024 data/civ2/buildings.ruleset:1180
+#: data/default/buildings.ruleset:1023 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 "Aumenta a produção cientÃfica da cidade onde for construido em 100%."
-#: data/default/buildings.ruleset:1029 data/civ2/buildings.ruleset:1019
+#: data/default/buildings.ruleset:1028 data/civ2/buildings.ruleset:1019
#: data/civ1/buildings.ruleset:695
msgid "Cure For Cancer"
msgstr "Cura do Cancro"
-#: data/default/buildings.ruleset:1043
+#: data/default/buildings.ruleset:1042
#, fuzzy
msgid ""
"This stunning technological achievement makes one unhappy citizen content in "
@@ -19216,12 +19367,12 @@ msgstr ""
"Esta maravilhosa meta cientÃfica torna um cidadão descontente em contente em "
"todas as cidades."
-#: data/default/buildings.ruleset:1051 data/civ2/buildings.ruleset:1039
+#: data/default/buildings.ruleset:1050 data/civ2/buildings.ruleset:1039
#: data/civ1/buildings.ruleset:715
msgid "Darwin's Voyage"
msgstr "Viagem de Darwin"
-#: data/default/buildings.ruleset:1065 data/civ2/buildings.ruleset:1053
+#: data/default/buildings.ruleset:1064 data/civ2/buildings.ruleset:1053
#: data/civ1/buildings.ruleset:729
msgid ""
"Charles Darwin's voyage sparked the discovery of the evolution of the "
@@ -19232,22 +19383,22 @@ msgstr ""
"que inspirou grande confiança na ciência. Oferece dois avanços tecnológicos "
"imediatos."
-#: data/default/buildings.ruleset:1072 data/civ2/buildings.ruleset:1060
+#: data/default/buildings.ruleset:1071 data/civ2/buildings.ruleset:1060
msgid "Eiffel Tower"
msgstr "Torre Eiffel"
-#: data/default/buildings.ruleset:1087
+#: data/default/buildings.ruleset:1086
#, no-c-format
msgid ""
"Your reputation and goodwill among other nations is recovered twice as fast."
msgstr ""
-#: data/default/buildings.ruleset:1093 data/civ2/buildings.ruleset:1081
+#: data/default/buildings.ruleset:1092 data/civ2/buildings.ruleset:1081
#: data/civ1/buildings.ruleset:736
msgid "Great Library"
msgstr "Grande Biblioteca"
-#: data/default/buildings.ruleset:1107 data/civ2/buildings.ruleset:1095
+#: data/default/buildings.ruleset:1106 data/civ2/buildings.ruleset:1095
#: data/civ1/buildings.ruleset:750
msgid ""
"The civilization which builds the Great Library gets every advance that at "
@@ -19256,22 +19407,22 @@ msgstr ""
"A civilização que construir a Grande Biblioteca obtém qualquer avanço "
"cientÃfico que pelo menos duas outras civilizações tenham atingido."
-#: data/default/buildings.ruleset:1113 data/civ2/buildings.ruleset:1101
+#: data/default/buildings.ruleset:1112 data/civ2/buildings.ruleset:1101
#: data/civ1/buildings.ruleset:756
msgid "Great Wall"
msgstr "Grande Muralha"
-#: data/default/buildings.ruleset:1127
+#: data/default/buildings.ruleset:1126
#, fuzzy
msgid "Works as a City Wall in all your cities."
msgstr "Funciona como Muralhas em todas as cidades."
-#: data/default/buildings.ruleset:1135 data/civ2/buildings.ruleset:1122
+#: data/default/buildings.ruleset:1134 data/civ2/buildings.ruleset:1122
#: data/civ1/buildings.ruleset:777
msgid "Hanging Gardens"
msgstr "Jardins Suspensos"
-#: data/default/buildings.ruleset:1149 data/civ2/buildings.ruleset:1136
+#: data/default/buildings.ruleset:1148 data/civ2/buildings.ruleset:1136
#: data/civ1/buildings.ruleset:791
msgid ""
"Makes one content citizen happy in every city. Makes two extra content "
@@ -19286,12 +19437,12 @@ msgstr ""
"para obterem o efeito dos Jardins Suspensos, a maravilha aplica-se a "
"cidadãos descontentes (tornando-os contentes)."
-#: data/default/buildings.ruleset:1158 data/civ2/buildings.ruleset:1145
+#: data/default/buildings.ruleset:1157 data/civ2/buildings.ruleset:1145
#: data/civ1/buildings.ruleset:800
msgid "Hoover Dam"
msgstr "Barragem Hoover"
-#: data/default/buildings.ruleset:1173 data/civ2/buildings.ruleset:1159
+#: data/default/buildings.ruleset:1172 data/civ2/buildings.ruleset:1159
msgid ""
"Works as if you had a Hydro Plant in every city. (This reduces pollution "
"and increases the effects of Factories and Mfg. Plants.)"
@@ -19299,32 +19450,32 @@ msgstr ""
"Funciona como se possuisse uma Barragem em cada cidade. (Isto reduz a "
"poluição e aumenta o efeito das Fábricas e Unidades Transformadoras.)"
-#: data/default/buildings.ruleset:1179 data/civ2/buildings.ruleset:1165
+#: data/default/buildings.ruleset:1178 data/civ2/buildings.ruleset:1165
#: data/civ1/buildings.ruleset:822
msgid "Isaac Newton's College"
msgstr "Colégio de Isaac Newton"
-#: data/default/buildings.ruleset:1194
+#: data/default/buildings.ruleset:1193
#, fuzzy, no-c-format
msgid ""
"Boosts science production by 100% in every city you control that has a "
"University."
msgstr "Aumenta a produção cientÃfica da cidade onde for construido em 100%."
-#: data/default/buildings.ruleset:1200 data/civ2/buildings.ruleset:1185
+#: data/default/buildings.ruleset:1199 data/civ2/buildings.ruleset:1185
#: data/civ1/buildings.ruleset:842
msgid "J.S. Bach's Cathedral"
msgstr "Catedral de J.S. Bach"
-#: data/default/buildings.ruleset:1214 data/civ2/buildings.ruleset:1199
+#: data/default/buildings.ruleset:1213 data/civ2/buildings.ruleset:1199
msgid "Makes two unhappy citizens content in every city."
msgstr "Torna dois cidadãos descontentes em contentes em cada cidade."
-#: data/default/buildings.ruleset:1219 data/civ2/buildings.ruleset:1204
+#: data/default/buildings.ruleset:1218 data/civ2/buildings.ruleset:1204
msgid "King Richard's Crusade"
msgstr "Cruzada do Rei Ricardo"
-#: data/default/buildings.ruleset:1233 data/civ2/buildings.ruleset:1218
+#: data/default/buildings.ruleset:1232 data/civ2/buildings.ruleset:1218
msgid ""
"Adds one extra shield resource on every square around the city where it is "
"built."
@@ -19332,20 +19483,20 @@ msgstr ""
"Gera um recurso de escudo adicional em cada quadrÃcula em redor da cidade em "
"que for construida."
-#: data/default/buildings.ruleset:1239 data/civ2/buildings.ruleset:1224
+#: data/default/buildings.ruleset:1238 data/civ2/buildings.ruleset:1224
msgid "Leonardo's Workshop"
msgstr "Oficina do Leonardo"
-#: data/default/buildings.ruleset:1253 data/civ2/buildings.ruleset:1238
+#: data/default/buildings.ruleset:1252 data/civ2/buildings.ruleset:1238
msgid "Upgrades one obsolete unit per game turn."
msgstr "Actualiza uma unidade obsoleta por cada turno de jogo."
-#: data/default/buildings.ruleset:1258 data/civ2/buildings.ruleset:1243
+#: data/default/buildings.ruleset:1257 data/civ2/buildings.ruleset:1243
#: data/civ1/buildings.ruleset:862
msgid "Lighthouse"
msgstr "Farol"
-#: data/default/buildings.ruleset:1273
+#: data/default/buildings.ruleset:1272
#, fuzzy
msgid ""
"Gives all your sea units 1 additional movement point and eliminates the risk "
@@ -19356,36 +19507,36 @@ msgstr ""
"risco de perder triremes em alto mar. Torna todas as novas unidades "
"marÃtimas veteranas (em todas as cidades)."
-#: data/default/buildings.ruleset:1280 data/civ2/buildings.ruleset:1264
+#: data/default/buildings.ruleset:1279 data/civ2/buildings.ruleset:1264
#: data/civ1/buildings.ruleset:885
msgid "Magellan's Expedition"
msgstr "Expedição de Magalhães"
-#: data/default/buildings.ruleset:1295
+#: data/default/buildings.ruleset:1294
#, fuzzy
msgid "Gives all your sea units 2 additional movement points."
msgstr "Dá a todas as unidades marÃtimas dois pontos de movimento adicionais."
-#: data/default/buildings.ruleset:1300 data/civ2/buildings.ruleset:1283
+#: data/default/buildings.ruleset:1299 data/civ2/buildings.ruleset:1283
#: data/civ1/buildings.ruleset:904
msgid "Manhattan Project"
msgstr "Projecto Manhattan"
-#: data/default/buildings.ruleset:1318 data/civ2/buildings.ruleset:1301
+#: data/default/buildings.ruleset:1317 data/civ2/buildings.ruleset:1301
msgid "Marco Polo's Embassy"
msgstr "Embaixada de Marco Polo"
-#: data/default/buildings.ruleset:1332 data/civ2/buildings.ruleset:1315
+#: data/default/buildings.ruleset:1331 data/civ2/buildings.ruleset:1315
msgid "The player who owns it gets an embassy with all players."
msgstr ""
"O jogador que a possuir obtém uma embaixada junto de todos os jogadores."
-#: data/default/buildings.ruleset:1337 data/civ2/buildings.ruleset:1320
+#: data/default/buildings.ruleset:1336 data/civ2/buildings.ruleset:1320
#: data/civ1/buildings.ruleset:922
msgid "Michelangelo's Chapel"
msgstr "Capela Sistina"
-#: data/default/buildings.ruleset:1351 data/civ2/buildings.ruleset:1334
+#: data/default/buildings.ruleset:1350 data/civ2/buildings.ruleset:1334
msgid ""
"Counts as having a Cathedral in each of your cities. This makes 3 unhappy "
"citizens content in each city. The discovery of Theology increases the "
@@ -19399,22 +19550,22 @@ msgstr ""
"adicional. A descoberta do Comunismo reduz o efeito de uma Catedral, "
"reduzindo em um o número de cidadãos descontentes tornados contentes."
-#: data/default/buildings.ruleset:1361 data/civ2/buildings.ruleset:1344
+#: data/default/buildings.ruleset:1360 data/civ2/buildings.ruleset:1344
#: data/civ1/buildings.ruleset:941
msgid "Oracle"
msgstr "Oráculo"
-#: data/default/buildings.ruleset:1375
+#: data/default/buildings.ruleset:1374
#, fuzzy
msgid "Makes two of your unhappy citizens content in every city with a temple."
msgstr "Torna dois cidadãos descontentes em contentes em cada cidade."
-#: data/default/buildings.ruleset:1380 data/civ2/buildings.ruleset:1363
+#: data/default/buildings.ruleset:1379 data/civ2/buildings.ruleset:1363
#: data/civ1/buildings.ruleset:960
msgid "Pyramids"
msgstr "Pirâmides"
-#: data/default/buildings.ruleset:1394
+#: data/default/buildings.ruleset:1393
#, fuzzy
msgid ""
"The amount of stored food lost when one of your cities grows or shrinks is "
@@ -19425,33 +19576,33 @@ msgstr ""
"com Celeiro aumente ou diminua. Isto leva a que uma cidade cresca mais "
"rapidamente e melhor resista à fome."
-#: data/default/buildings.ruleset:1401 data/civ2/buildings.ruleset:1382
+#: data/default/buildings.ruleset:1400 data/civ2/buildings.ruleset:1382
#: data/civ1/buildings.ruleset:981
msgid "SETI Program"
msgstr "Programa SETI"
-#: data/default/buildings.ruleset:1415
+#: data/default/buildings.ruleset:1414
#, fuzzy
msgid "Boosts science production in each city with a Research Lab by 100%. "
msgstr "Aumenta a produção cientÃfica em cada cidade por 100%."
-#: data/default/buildings.ruleset:1420 data/civ2/buildings.ruleset:1402
+#: data/default/buildings.ruleset:1419 data/civ2/buildings.ruleset:1402
#: data/civ1/buildings.ruleset:1001
msgid "Shakespeare's Theatre"
msgstr "Teatro de Shakespeare"
-#: data/default/buildings.ruleset:1434 data/civ2/buildings.ruleset:1416
+#: data/default/buildings.ruleset:1433 data/civ2/buildings.ruleset:1416
#: data/civ1/buildings.ruleset:1015
msgid "Makes all unhappy citizens content, in the city where it is located."
msgstr ""
"Torna todos os cidadãos descontentes em contentes, na cidade onde estiver "
"localizado."
-#: data/default/buildings.ruleset:1439 data/civ2/buildings.ruleset:1421
+#: data/default/buildings.ruleset:1438 data/civ2/buildings.ruleset:1421
msgid "Statue of Liberty"
msgstr "Estátua da Liberdade"
-#: data/default/buildings.ruleset:1453 data/civ2/buildings.ruleset:1435
+#: data/default/buildings.ruleset:1452 data/civ2/buildings.ruleset:1435
#: data/civ1/buildings.ruleset:974 data/civ1/buildings.ruleset:1034
msgid ""
"Allows you to choose any government, including those that have not yet been "
@@ -19462,11 +19613,11 @@ msgstr ""
"sido ainda pesquisados pela sua civilização, e sem o perÃodo transitivo "
"Anárquico."
-#: data/default/buildings.ruleset:1460 data/civ2/buildings.ruleset:1442
+#: data/default/buildings.ruleset:1459 data/civ2/buildings.ruleset:1442
msgid "Sun Tzu's War Academy"
msgstr "Academia Militar de Sun Tzu"
-#: data/default/buildings.ruleset:1474
+#: data/default/buildings.ruleset:1473
#, fuzzy
msgid ""
"All your new ground units start at the first veteran level. The chance of a "
@@ -19476,22 +19627,22 @@ msgstr ""
"cidades). A probabilidade de uma unidade se tornar veterana após uma "
"batalha aumenta de 50% para 100%."
-#: data/default/buildings.ruleset:1481 data/civ2/buildings.ruleset:1463
+#: data/default/buildings.ruleset:1480 data/civ2/buildings.ruleset:1463
#: data/civ1/buildings.ruleset:1020
msgid "United Nations"
msgstr "Nações Unidas"
-#: data/default/buildings.ruleset:1495
+#: data/default/buildings.ruleset:1494
#, fuzzy
msgid "All your units regain two extra hitpoints per turn."
msgstr "Unidades recuperam dois pontos de resistência adicionais por turno."
-#: data/default/buildings.ruleset:1508 data/civ2/buildings.ruleset:1490
+#: data/default/buildings.ruleset:1507 data/civ2/buildings.ruleset:1490
#: data/civ1/buildings.ruleset:1046
msgid "Women's Suffrage"
msgstr "Sufrágio Feminino"
-#: data/default/buildings.ruleset:1522 data/civ2/buildings.ruleset:1504
+#: data/default/buildings.ruleset:1521 data/civ2/buildings.ruleset:1504
msgid ""
"Counts as a Police Station in every city. (That is, for each city, reduces "
"unhappiness for military units outside the city by 2 under Democracy and 1 "
@@ -19502,11 +19653,11 @@ msgstr ""
"em 2 sob uma Democracia e em 1 sob uma República. Esta maravilha não tem "
"qualquer efeito sob outras formas de governo.)"
-#: data/default/buildings.ruleset:1533
+#: data/default/buildings.ruleset:1532
msgid "Coinage"
msgstr "Cunhagem"
-#: data/default/buildings.ruleset:1554
+#: data/default/buildings.ruleset:1553
msgid ""
"This is not a normal improvement. Instead, setting a city's production to "
"Coinage means its shield production is converted to tax output (money, "
@@ -19964,12 +20115,17 @@ msgstr "?city_state:Paz"
msgid "?citystyle:Industrial"
msgstr "?city:Nome"
-#: data/default/cities.ruleset:139 data/civ2/cities.ruleset:150
+#: data/default/cities.ruleset:139
+#, fuzzy
+msgid "?citystyle:ElectricAge"
+msgstr "?city_state:Paz"
+
+#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:150
#, fuzzy
msgid "?citystyle:Modern"
msgstr "?city_state:Desordem"
-#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:161
+#: data/default/cities.ruleset:161 data/civ2/cities.ruleset:161
#, fuzzy
msgid "?citystyle:PostModern"
msgstr "?city_state:Desordem"
@@ -25404,6 +25560,36 @@ msgstr "Equipa 30"
msgid "Team 31"
msgstr "Equipa 31"
+#~ 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."
+
+#, fuzzy
+#~ msgid "Value must be integer."
+#~ msgstr "Valor tem de ser um inteiro."
+
+#~ 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 Hydro Plant, Power Plant, or Nuclear Plant. A "
+#~ "city can only build a Hydro Plant if it is next to (or on) a Mountain or "
+#~ "River tile."
+#~ msgstr ""
+#~ "Reduz a quantidade de poluição gerada pela produção numa cidade em 50%. "
+#~ "Também aumenta a produção de escudos de uma Fábrica ou Unidade "
+#~ "Transformadora numa cidade: uma Fábrica e Barragem juntas dão um bónus de "
+#~ "75% de produção e uma Fábrica, Unidade Transformadora e Barragem juntas "
+#~ "dão um bónus produtivo de 150%.\n"
+#~ "\n"
+#~ "Uma cidade apenas pode ter uma Barragem, Central Térmica ou Central "
+#~ "Nuclear. Uma cidade apenas pode construir uma Barragem se estiver junto a "
+#~ "uma (ou numa) quadrÃcula de Montanha ou Rio."
+
#, fuzzy
#~ msgid "Auth config filename \"%s\" not allowed!"
#~ msgstr "Que ligações são permitidas"
@@ -28451,9 +28637,6 @@ msgstr "Equipa 31"
#~ msgid "%s lose %s when %s lost"
#~ msgstr "%s perdeu %s quando %s foi perdida"
-#~ msgid "%s lose %s to the %s"
-#~ msgstr "%s perde %s com os %s"
-
#~ msgid "%s discover %s (Hut)"
#~ msgstr "%s descobrem %s (Cabana)"
@@ -28686,9 +28869,6 @@ msgstr "Equipa 31"
#~ msgid "What do you wish to to?"
#~ msgstr "O que deseja fazer?"
-#~ msgid "New Game"
-#~ msgstr "Novo Jogo"
-
#~ msgid "Quit Game"
#~ msgstr "Sair do Jogo"
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
index b616fdb..40de76c 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 5eb3438..78f347f 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: 2009-03-29 21:13+0900\n"
+"POT-Creation-Date: 2009-11-22 21:37+0100\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"
@@ -65,21 +65,21 @@ msgstr "O"
msgid "?redundant:*"
msgstr "*"
-#: common/connection.c:515
+#: common/connection.c:518
#, c-format
msgid "%s from %s"
msgstr "%s de %s"
-#: common/connection.c:521
+#: common/connection.c:524
msgid " (connection incomplete)"
msgstr "(conexão imcompleta)"
-#: common/connection.c:525
+#: common/connection.c:528
#, c-format
msgid " (player %s)"
msgstr " (jogador %s)"
-#: common/connection.c:529
+#: common/connection.c:532
msgid " (observer)"
msgstr " (observador)"
@@ -484,81 +484,81 @@ msgstr "Mensagens de conectar/desconectar"
msgid "AI Debug messages"
msgstr "Mensagens de depuração da IA"
-#: common/player.c:732
+#: common/player.c:746
msgid "?attitude:Genocidal"
msgstr "Adepto ao GenocÃdio"
-#: common/player.c:734
+#: common/player.c:748
msgid "?attitude:Belligerent"
msgstr "Guerreador"
-#: common/player.c:736
+#: common/player.c:750
msgid "?attitude:Hostile"
msgstr "Hostil"
-#: common/player.c:738
+#: common/player.c:752
msgid "?attitude:Uncooperative"
msgstr "Não Cooperativo"
-#: common/player.c:740
+#: common/player.c:754
msgid "?attitude:Uneasy"
msgstr "Desconfortável"
-#: common/player.c:742
+#: common/player.c:756
msgid "?attitude:Neutral"
msgstr "Neutro"
-#: common/player.c:744
+#: common/player.c:758
msgid "?attitude:Respectful"
msgstr "Respeitoso"
-#: common/player.c:746
+#: common/player.c:760
msgid "?attitude:Helpful"
msgstr "Ajudante"
-#: common/player.c:748
+#: common/player.c:762
msgid "?attitude:Enthusiastic"
msgstr "Entusiástico"
-#: common/player.c:750
+#: common/player.c:764
msgid "?attitude:Admiring"
msgstr "Admirador"
-#: common/player.c:753
+#: common/player.c:767
msgid "?attitude:Worshipful"
msgstr "Honrado"
-#: common/player.c:764
+#: common/player.c:778
msgid "?diplomatic_state:Armistice"
msgstr "ArmistÃcio"
-#: common/player.c:765
+#: common/player.c:779
msgid "?diplomatic_state:War"
msgstr "Guerra"
-#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:780 client/gui-gtk-2.0/diplodlg.c:353
#: 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:767 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:781 client/gui-gtk-2.0/diplodlg.c:358
#: 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:768 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:782 client/gui-gtk-2.0/diplodlg.c:363
#: 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:769
+#: common/player.c:783
msgid "?diplomatic_state:Never met"
msgstr "Nunca Vi"
-#: common/player.c:770
+#: common/player.c:784
msgid "?diplomatic_state:Team"
msgstr "Time"
@@ -589,7 +589,7 @@ msgstr "Suprimentos somente são suportados pelo mundo."
#. TRANS: "Resources: (none)".
#: common/requirements.c:1014 common/team.c:132
#: client/gui-gtk-2.0/helpdlg.c:1055 client/gui-gtk-2.0/inteldlg.c:390
-#: client/gui-win32/helpdlg.c:586 client/gui-xaw/helpdlg.c:991
+#: client/gui-win32/helpdlg.c:592 client/gui-xaw/helpdlg.c:991
#, c-format
msgid "(none)"
msgstr "(nada)"
@@ -615,10 +615,11 @@ msgstr "Tecn. Futura %d"
#: 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
#: client/gui-sdl/helpdlg.c:817 client/gui-sdl/mapview.c:962
-#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:545
-#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:735
-#: 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
+#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:544
+#: client/gui-win32/helpdlg.c:551 client/gui-win32/helpdlg.c:721
+#: client/gui-win32/helpdlg.c:741 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 "Nenhum"
@@ -631,29 +632,29 @@ msgstr "Tecn. Futura"
msgid "(Unknown)"
msgstr "(Desconhecido)"
-#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:553
#: manual/civmanual.c:224
msgid "Road"
msgstr "Estrada"
-#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:557
#: client/gui-gtk-2.0/menu.c:829 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:394 common/terrain.c:572 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:567
#: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
#: data/civ1/techs.ruleset:563
msgid "Railroad"
msgstr "Ferrovia"
-#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:555
msgid "Mine"
msgstr "Mina"
-#: common/terrain.c:396 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:551 server/report.c:124
#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "Poluição"
@@ -662,7 +663,7 @@ msgstr "Poluição"
msgid "Hut"
msgstr "Cabana"
-#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:563
#: manual/civmanual.c:226
msgid "Fortress"
msgstr "Fortaleza"
@@ -675,58 +676,58 @@ msgstr "Rio"
msgid "Farmland"
msgstr "Fazenda"
-#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:577
#: manual/civmanual.c:226
msgid "Airbase"
msgstr "Base aérea"
-#: common/terrain.c:402 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:579
msgid "Fallout"
msgstr "sobra"
-#: common/unit.c:546 client/gui-win32/plrdlg.c:337
+#: common/unit.c:549 client/gui-win32/plrdlg.c:337
msgid "Idle"
msgstr "Ocioso"
-#: common/unit.c:556
+#: common/unit.c:559
msgid "Fortifying"
msgstr "Guardando"
-#: common/unit.c:558
+#: common/unit.c:561
msgid "Fortified"
msgstr "Guardado"
-#: common/unit.c:562 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
+#: common/unit.c:565 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
msgid "Sentry"
msgstr "Sentinela"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
+#: common/unit.c:569 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
#: client/gui-win32/menu.c:370 client/gui-xaw/menu.c:185
msgid "Pillage"
msgstr "Pilhagem"
-#: common/unit.c:568 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
+#: common/unit.c:571 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
msgid "Goto"
msgstr "Ir"
-#: common/unit.c:570
+#: common/unit.c:573
msgid "Explore"
msgstr "Explorar"
-#: common/unit.c:572 manual/civmanual.c:224
+#: common/unit.c:575 manual/civmanual.c:224
msgid "Transform"
msgstr "Transformar"
-#: common/unit.c:584 client/text.c:157 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:587 client/text.c:157 client/gui-sdl/citydlg.c:1972
#: client/gui-win32/citydlg.c:1257 client/gui-xaw/citydlg.c:1423
msgid "Unknown"
msgstr "Desconhecido"
-#: common/unit.c:1022
+#: common/unit.c:1025
msgid "Moves"
msgstr "Movimento"
-#: common/unit.c:1571
+#: common/unit.c:1574
#, c-format
msgid ""
"Upgrade %s to %s for %d gold?\n"
@@ -735,12 +736,12 @@ msgstr ""
"Atualizar %s para %s por %d moedas?\n"
"O Tesouro contém %d moedas."
-#: common/unit.c:1579
+#: common/unit.c:1582
#, c-format
msgid "Sorry, cannot upgrade %s (yet)."
msgstr "Desculpe: incapaz de atualizar %s (agora)."
-#: common/unit.c:1585
+#: common/unit.c:1588
#, c-format
msgid ""
"Upgrading %s to %s costs %d gold.\n"
@@ -749,11 +750,11 @@ msgstr ""
"Atualizar %s para %s custa %d moedas.\n"
"O Tesouro contém %d moedas."
-#: common/unit.c:1594
+#: common/unit.c:1597
msgid "You can only upgrade units in your cities."
msgstr "Você pode apenas atualizar unidades em suas cidades."
-#: common/unit.c:1598
+#: common/unit.c:1601
#, c-format
msgid "Upgrading this %s would strand units it transports."
msgstr "Atualizar este %s poderá naufragar as unidades de seu transporte."
@@ -786,11 +787,11 @@ msgstr "Nuclear"
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1404
+#: common/unittype.c:349 client/helpdata.c:1412
msgid " and "
msgstr " e "
-#: common/unittype.c:355 client/helpdata.c:1390
+#: common/unittype.c:355 client/helpdata.c:1398
msgid "?and:, "
msgstr "?e:, "
@@ -960,71 +961,71 @@ msgstr "Argumento vazio para \"%s\".\n"
msgid "Missing argument for \"%s\".\n"
msgstr "Argumento em falta para \"%s\".\n"
-#: utility/shared.c:501
+#: utility/shared.c:514
#, c-format
msgid "%d BC"
msgstr "%d AC"
-#: utility/shared.c:503
+#: utility/shared.c:516
#, c-format
msgid "%d AD"
msgstr "%d DC"
-#: utility/shared.c:924
+#: utility/shared.c:937
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:1028
+#: utility/shared.c:1041
#, c-format
msgid "Could not read data directory %s: %s."
msgstr "Incapaz de ler o diretório de dados %s: %s."
-#: utility/shared.c:1279
+#: utility/shared.c:1292
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:1281
+#: utility/shared.c:1294
#, c-format
msgid "Current data path is: \"%s\""
msgstr "Caminho de dados atual é: \"%s\""
-#: utility/shared.c:1283
+#: utility/shared.c:1296
#, c-format
msgid "The \"%s\" file is required ... aborting!"
msgstr "O arquivo \"%s\" é requerido ... abortando!"
-#: utility/shared.c:1460
+#: utility/shared.c:1485
#, 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:1462
+#: utility/shared.c:1487
msgid "Use a non-privileged account instead.\n"
msgstr "Utilize uma conta sem privilégios (não 'root').\n"
-#: utility/shared.c:1478
+#: utility/shared.c:1503
msgid "exact match"
msgstr "equivalência perfeita"
-#: utility/shared.c:1479
+#: utility/shared.c:1504
msgid "only match"
msgstr "única equivalência"
-#: utility/shared.c:1480
+#: utility/shared.c:1505
msgid "ambiguous"
msgstr "ambÃguo"
-#: utility/shared.c:1481
+#: utility/shared.c:1506
msgid "empty"
msgstr "vazio"
-#: utility/shared.c:1482
+#: utility/shared.c:1507
msgid "too long"
msgstr "muito longo"
-#: utility/shared.c:1483
+#: utility/shared.c:1508
msgid "non-match"
msgstr "não-equivalente"
@@ -1053,22 +1054,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:280
+#: ai/advdiplomacy.c:300
#, 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:290
+#: ai/advdiplomacy.c:310
#, 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:303
+#: ai/advdiplomacy.c:322
#, c-format
msgid "*%s (AI)* Let us first cease hostilies, %s."
msgstr "*%s (IA)* Vamos primeiro cessar as hostilidades, %s."
-#: ai/advdiplomacy.c:308
+#: ai/advdiplomacy.c:327
#, c-format
msgid ""
"*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
@@ -1076,47 +1077,47 @@ msgid ""
msgstr ""
"*%s (IA)* Eu gostaria de ver você manter o cessar fogo um pouco mais, %s."
-#: ai/advdiplomacy.c:331
+#: ai/advdiplomacy.c:350
#, 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:424
+#: ai/advdiplomacy.c:443
#, 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:454
+#: ai/advdiplomacy.c:473
#, 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:560
+#: ai/advdiplomacy.c:579
#, 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:582
+#: ai/advdiplomacy.c:601
#, c-format
msgid "*%s (AI)* Welcome into our alliance %s!"
msgstr "*%s (AI)* Bem vindo a nossa aliança %s!"
-#: ai/advdiplomacy.c:586
+#: ai/advdiplomacy.c:605
#, 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:593
+#: ai/advdiplomacy.c:612
#, c-format
msgid "*%s (AI)* Yes, peace in our time!"
msgstr "*%s (AI)* Sim, paz em nosso tempo!"
-#: ai/advdiplomacy.c:598
+#: ai/advdiplomacy.c:617
#, c-format
msgid "*%s (AI)* Agreed. No more hostilities, %s."
msgstr "*%s (AI)* Aceito. Sem mais hostilidades, %s."
-#: ai/advdiplomacy.c:813
+#: ai/advdiplomacy.c:832
#, c-format
msgid ""
"*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
@@ -1125,23 +1126,23 @@ msgstr ""
"*%s (AI)* Parabéns %s! Podemos sugerir um cessar-fogo enquanto nós tentamos "
"encontrar outra solução?"
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1116
#, c-format
msgid "*%s (AI)* Space will never be yours. "
msgstr "*%s (AI)* O espaço nunca sera nosso. "
-#: ai/advdiplomacy.c:1102
+#: ai/advdiplomacy.c:1121
#, 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:1108
+#: ai/advdiplomacy.c:1127
#, c-format
msgid "*%s (AI)* Peace in ... some other time."
msgstr "*%s (AI)* Paz... talvez outra hora."
-#: ai/advdiplomacy.c:1113
+#: ai/advdiplomacy.c:1132
#, c-format
msgid ""
"*%s (AI)* Finally I get around to you! Did you really think you could get "
@@ -1150,17 +1151,17 @@ msgstr ""
"*%s (IA)* Finalmente estou perto de você! Você pensou realmente que "
"escaparia com seus crimes?"
-#: ai/advdiplomacy.c:1119
+#: ai/advdiplomacy.c:1138
#, 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:1126
+#: ai/advdiplomacy.c:1145
#, 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:1209
+#: ai/advdiplomacy.c:1229
#, fuzzy, c-format
msgid ""
"*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1177,7 +1178,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:1219
+#: ai/advdiplomacy.c:1239
#, c-format
msgid ""
"*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
@@ -1186,7 +1187,7 @@ msgstr ""
"*%s (IA)* Sua ajuda neste assunto é esperada. Longa vida a nossa gloriosa "
"aliança!"
-#: ai/advdiplomacy.c:1225
+#: ai/advdiplomacy.c:1245
#, fuzzy, c-format
msgid ""
"*%s (AI)* %s has grossly violated his treaties with us for own gain. We "
@@ -1209,7 +1210,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:1238
+#: ai/advdiplomacy.c:1258
#, c-format
msgid ""
"*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1220,13 +1221,13 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1246
+#: ai/advdiplomacy.c:1266
#, c-format
msgid ""
"*%s (AI)* If you want a piece of the loot, feel free to join in the action!"
msgstr ""
-#: ai/advdiplomacy.c:1251
+#: ai/advdiplomacy.c:1271
#, c-format
msgid ""
"*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1237,12 +1238,12 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1261
+#: ai/advdiplomacy.c:1281
#, c-format
msgid "*%s (AI)* As our glorious allies, we expect your help in this war."
msgstr ""
-#: ai/advdiplomacy.c:1267
+#: ai/advdiplomacy.c:1287
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance and declare war on %s in %d turn. "
@@ -1253,7 +1254,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1276
+#: ai/advdiplomacy.c:1296
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1264,47 +1265,47 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: ai/advdiplomacy.c:1344
+#: ai/advdiplomacy.c:1364
#, 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:1359
+#: ai/advdiplomacy.c:1379
#, c-format
msgid ""
"*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
"offensive."
msgstr ""
-#: ai/advdiplomacy.c:1362
+#: ai/advdiplomacy.c:1382
#, c-format
msgid ""
"*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
"take action!"
msgstr ""
-#: ai/advdiplomacy.c:1474
+#: ai/advdiplomacy.c:1494
#, c-format
msgid "*%s (AI)* Sorry, sharing vision with you is no longer safe."
msgstr ""
-#: ai/advdiplomacy.c:1549
+#: ai/advdiplomacy.c:1569
#, c-format
msgid ""
"*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
"our enemy, %s."
msgstr ""
-#: ai/advdiplomacy.c:1555
+#: ai/advdiplomacy.c:1575
#, 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:1562
+#: ai/advdiplomacy.c:1582
#, c-format
msgid ""
"*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1312,26 +1313,26 @@ msgid ""
"more!"
msgstr ""
-#: ai/advdiplomacy.c:1592
+#: ai/advdiplomacy.c:1612
#, c-format
msgid ""
"*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
"an alliance?"
msgstr ""
-#: ai/advdiplomacy.c:1607
+#: ai/advdiplomacy.c:1627
#, c-format
msgid "*%s (AI)* Greetings neighbour, may we suggest more peaceful relations?"
msgstr ""
-#: ai/advdiplomacy.c:1622
+#: ai/advdiplomacy.c:1642
#, c-format
msgid ""
"*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
"cessation of hostilities?"
msgstr ""
-#: ai/advdiplomacy.c:1742
+#: ai/advdiplomacy.c:1762
#, c-format
msgid ""
"*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1474,17 +1475,17 @@ msgid ""
"minimum %d [printable] characters long. Try again."
msgstr ""
-#: server/barbarian.c:183
+#: server/barbarian.c:184
#, c-format
msgid "%s gain a leader by the name %s. Dangerous times may lie ahead."
msgstr ""
-#: server/barbarian.c:479
+#: server/barbarian.c:480
#, c-format
msgid "Native unrest near %s led by %s."
msgstr "Intranquilidade dos nativos perto de %s liderada por %s."
-#: server/barbarian.c:484
+#: server/barbarian.c:485
#, c-format
msgid "Sea raiders seen near %s!"
msgstr "Piratas avistados próximo de %s!"
@@ -1875,7 +1876,7 @@ msgid_plural "%s boosts research; you gain %d immediate advances."
msgstr[0] "%s melhora a pesquisa, você ganha %d avanço imediato."
msgstr[1] "%s melhora a pesquisa, você ganha %d avanços imediatos."
-#: server/cityturn.c:1158 server/techtools.c:176
+#: server/cityturn.c:1158 server/techtools.c:172
#, c-format
msgid "The %s have acquired %s from %s."
msgstr "Os %s adquiriram %s dos %s."
@@ -1958,22 +1959,22 @@ msgstr ""
msgid "Warning: the %s option is obsolete. Use -m to enable the metaserver.\n"
msgstr "Aviso: a opção %s é obsoleta. Use -m para habilidar o metaservidor.\n"
-#: server/civserver.c:189
+#: server/civserver.c:193
#, c-format
msgid "Error: unknown option '%s'\n"
msgstr "Erro: opção '%s' desconhecida\n"
-#: server/civserver.c:200
+#: server/civserver.c:204
#, c-format
msgid "This is the server for %s"
msgstr "Este é o servidor do %s"
-#: server/civserver.c:201
+#: server/civserver.c:205
#, c-format
msgid "You can learn a lot about Freeciv at %s"
msgstr "Você pode aprender muito sobre Freeciv em %s"
-#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
+#: server/civserver.c:210 client/civclient.c:239 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -1982,106 +1983,112 @@ msgstr ""
"Modo de utilização: %s [opção ...]\n"
"Opções válidas são:\n"
-#: server/civserver.c:208
+#: server/civserver.c:212
msgid ""
" -a --auth FILE\tEnable server authentication with configuration from "
"FILE.\n"
msgstr ""
-#: server/civserver.c:210
+#: server/civserver.c:214
msgid " -G --Guests\t\tAllow guests to login if auth is enabled.\n"
msgstr ""
-#: server/civserver.c:212
+#: server/civserver.c:216
msgid " -N --Newusers\tAllow new users to login if auth is enabled.\n"
msgstr ""
-#: server/civserver.c:215
+#: server/civserver.c:219
msgid " -b --bind ADDR\tListen for clients on ADDR\n"
msgstr " -b --bind IP\tOuvir por clientes no IP\n"
-#: server/civserver.c:217 client/civclient.c:242
+#: server/civserver.c:221 client/civclient.c:243
msgid ""
" -d, --debug NUM\tSet debug log level (0 to 4, or 4:file1,min,max:...)\n"
msgstr ""
" -d, --debug NUM\tDefine nÃvel de depuração (0 a 4, ou 4:arquivo1,mÃn,"
"máx:...)\n"
-#: server/civserver.c:221 client/civclient.c:246
+#: server/civserver.c:225 client/civclient.c:247
msgid " -d, --debug NUM\tSet debug log level (0 to 3)\n"
msgstr " -d, --debug NUM\tDefine nÃvel de depuração (0 a 3)\n"
-#: server/civserver.c:223
+#: server/civserver.c:227
msgid " -f, --file FILE\tLoad saved game FILE\n"
msgstr " -f, --file ARQUIVO\tLer jogo gravado no ARQUIVO\n"
-#: server/civserver.c:225 client/civclient.c:249 manual/civmanual.c:382
+#: server/civserver.c:229 client/civclient.c:250 manual/civmanual.c:382
msgid " -h, --help\t\tPrint a summary of the options\n"
msgstr " -h, --help\t\tApresenta um resumo das opções\n"
-#: server/civserver.c:226
+#: server/civserver.c:230
+#, fuzzy
+msgid " -i, --identity ADDR\tBe known as ADDR at metaserver\n"
+msgstr ""
+" -M, --Metaserver ENDEREÇO\tDefine endereço do Metaservidor como ENDEREÇO\n"
+
+#: server/civserver.c:231
msgid " -l, --log FILE\tUse FILE as logfile\n"
msgstr " -l, --log ARQUIVO\tUtiliza ARQUIVO para o registo\n"
-#: server/civserver.c:227
+#: server/civserver.c:232
msgid " -m, --meta\t\tNotify metaserver and send server's info\n"
msgstr " -m, --meta\t\tNotificar metaservidor e enviar info de servidor\n"
-#: server/civserver.c:229
+#: server/civserver.c:234
msgid " -M, --Metaserver ADDR\tSet ADDR as metaserver address\n"
msgstr ""
" -M, --Metaserver ENDEREÇO\tDefine endereço do Metaservidor como ENDEREÇO\n"
-#: server/civserver.c:232
+#: server/civserver.c:237
msgid " -p, --port PORT\tListen for clients on port PORT\n"
msgstr " -p, --port PORTA\tEscuta por clientes na porta PORTA\n"
-#: server/civserver.c:234
+#: server/civserver.c:239
msgid " -q, --quitidle TIME\tQuit if no players for TIME seconds\n"
msgstr ""
" -q, --quitidle TEMPO\tSair se não tiver jogadores após TEMPO segundos\n"
-#: server/civserver.c:236
+#: server/civserver.c:241
msgid " -e, --exit-on-end\tWhen a game ends, exit instead of restarting\n"
msgstr ""
-#: server/civserver.c:239
+#: server/civserver.c:244
msgid " -s, --saves DIR\tSave games to directory DIR\n"
msgstr ""
-#: server/civserver.c:241
+#: server/civserver.c:246
msgid " -S, --Serverid ID\tSets the server id to ID\n"
msgstr " -S, --Serverid ID\tSeta o id do servidor para ID\n"
-#: server/civserver.c:243
+#: server/civserver.c:248
msgid " -P, --Ppm\t\tSave ppms of the map when saving the game.\n"
msgstr ""
-#: server/civserver.c:244
+#: server/civserver.c:249
msgid " -r, --read FILE\tRead startup script FILE\n"
msgstr " -r, --read ARQUIVO\tLer o arquivo ARQUIVO na inicialização\n"
-#: server/civserver.c:246
+#: server/civserver.c:251
msgid " -R, --Ranklog FILE\tUse FILE as ranking logfile\n"
msgstr ""
" -R, --Ranklog ARQUIVO\tUtilizar o ARQUIVO como registro de ganhadores\n"
-#: server/civserver.c:247 client/civclient.c:268 manual/civmanual.c:383
+#: server/civserver.c:252 client/civclient.c:269 manual/civmanual.c:383
msgid " -v, --version\t\tPrint the version number\n"
msgstr " -v, --version\tMostra o número de versão\n"
-#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
+#: server/civserver.c:253 client/gui-gtk-2.0/gui_main.c:354
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, fuzzy, c-format
msgid "Report bugs at %s.\n"
msgstr "Informe bugs a %s.\n"
-#: server/commands.c:28
+#: server/commands.c:29
msgid "Start the game, or restart after loading a savegame."
msgstr "Iniciar o jogo, ou reinicia-lo após ler um jogo gravado."
-#: server/commands.c:29
+#: server/commands.c:30
msgid ""
"This command starts the game. When starting a new game, it should be used "
"after all human players have connected, and AI players have been created (if "
@@ -2101,7 +2108,7 @@ msgstr ""
"efeito."
#. TRANS: translate text between <> only
-#: server/commands.c:42
+#: server/commands.c:44
msgid ""
"help\n"
"help commands\n"
@@ -2115,11 +2122,11 @@ msgstr ""
"help <nome-de-comando>\n"
"help <nome-de-opção>"
-#: server/commands.c:47
+#: server/commands.c:49
msgid "Show help about server commands and server options."
msgstr "Mostra ajuda sobre comandos e opções do servidor."
-#: server/commands.c:48
+#: server/commands.c:50
msgid ""
"With no arguments gives some introductory help. With argument \"commands\" "
"or \"options\" gives respectively a list of all commands or all options. "
@@ -2135,31 +2142,31 @@ msgstr ""
"valores atual e por omissão para essa opção. O argumento pode ser abreviado "
"quando não for ambÃguo."
-#: server/commands.c:63
+#: server/commands.c:66
msgid "Show a list of players, teams, connections, or scenarios."
msgstr ""
-#: server/commands.c:64
+#: server/commands.c:67
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 ""
-#: server/commands.c:70
+#: server/commands.c:74
msgid "Quit the game and shutdown the server."
msgstr "Termina o jogo e desliga o servidor."
#. TRANS: translate text between <> only
-#: server/commands.c:74
+#: server/commands.c:79
msgid "cut <connection-name>"
msgstr "cut <nome-da conexão>"
-#: server/commands.c:75
+#: server/commands.c:80
msgid "Cut a client's connection to server."
msgstr "Corta a conexão do cliente ao servidor."
-#: server/commands.c:76
+#: server/commands.c:81
msgid ""
"Cut specified client's connection to the server, removing that client from "
"the game. If the game has not yet started that client's player is removed "
@@ -2173,7 +2180,7 @@ msgstr ""
"jogadores."
#. TRANS: translate text between <> only
-#: server/commands.c:83
+#: server/commands.c:89
msgid ""
"explain\n"
"explain <option-name>"
@@ -2181,11 +2188,11 @@ msgstr ""
"explain\n"
"explain <nome-de-opção>"
-#: server/commands.c:85
+#: server/commands.c:91
msgid "Explain server options."
msgstr "Explica opções do servidor."
-#: server/commands.c:86
+#: server/commands.c:92
msgid ""
"The 'explain' command gives a subset of the functionality of 'help', and is "
"included for backward compatibility. With no arguments it gives a list of "
@@ -2198,7 +2205,7 @@ msgstr ""
"para uma opção especÃfica (tal como 'help <nome-opção>')."
#. TRANS: translate text between <> only
-#: server/commands.c:93
+#: server/commands.c:100
msgid ""
"show\n"
"show <option-name>\n"
@@ -2208,11 +2215,11 @@ msgstr ""
"show <nome-de-opção>\n"
"show <prefixo-de-opção>"
-#: server/commands.c:96
+#: server/commands.c:103
msgid "Show server options."
msgstr "Mostra as opções do servidor."
-#: server/commands.c:97
+#: server/commands.c:104
msgid ""
"With no arguments, shows all server options (or available options, when used "
"by clients). With an argument, show only the named option, or options with "
@@ -2222,40 +2229,41 @@ msgstr ""
"disponÃveis, quando utilizadas pelos clientes). Com um argumento, mostra "
"apenas a opção com esse nome, ou as opções com esse prefixo."
-#: server/commands.c:102
+#: server/commands.c:110
msgid "wall <message>"
msgstr "wall <mensagem>"
-#: server/commands.c:103
+#: server/commands.c:111
msgid "Send message to all connections."
msgstr "Envia uma mensagem para todas as conexões."
-#: server/commands.c:104
+#: server/commands.c:112
msgid ""
"For each connected client, pops up a window showing the message entered."
msgstr ""
"Em cada cliente conectado, mostra uma janela com a mensagem introduzida."
-#: server/commands.c:108
+#: server/commands.c:117
msgid "vote yes|no [vote number]"
msgstr "vote sim|não [número do voto]"
-#: server/commands.c:109
+#: server/commands.c:118
msgid "Cast a vote."
msgstr "Vota."
-#: server/commands.c:111
+#: server/commands.c:120
#, 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."
+"A player with basic 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."
msgstr ""
-#: server/commands.c:121
+#: server/commands.c:131
msgid ""
"debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
"<player> | timing | info]"
@@ -2263,34 +2271,34 @@ msgstr ""
"depuração [ jogador <player> | cidade <x> <y> | unidades <x> <y> | unidade "
"<id> | tecn <player> | tempo | info]"
-#: server/commands.c:123
+#: server/commands.c:133
msgid "Turn on or off AI debugging of given entity."
msgstr "Liga ou desliga a depuração de IA da entidade."
-#: server/commands.c:124
+#: server/commands.c:134
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:128
+#: server/commands.c:139
msgid "set <option-name> <value>"
msgstr "set <nome-de-opção> <valor>"
-#: server/commands.c:129
+#: server/commands.c:140
msgid "Set server option."
msgstr "Define opção do servidor."
-#: server/commands.c:132
+#: server/commands.c:144
msgid "team <player> [team]"
msgstr "team <nome-de-jogador> [time]"
-#: server/commands.c:133
+#: server/commands.c:145
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:134
+#: server/commands.c:146
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 "
@@ -2303,15 +2311,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:141
+#: server/commands.c:154
msgid "rulesetdir <directory>"
msgstr "rulesetdir <diretório>"
-#: server/commands.c:142
+#: server/commands.c:155
msgid "Choose new ruleset directory or modpack."
msgstr ""
-#: server/commands.c:143
+#: server/commands.c:156
msgid ""
"Choose new ruleset directory or modpack. Calling this\n"
" without any arguments will show you the currently selected ruleset."
@@ -2320,15 +2328,15 @@ msgstr ""
"Invocar sem argumentos apresenta o conjunto de regras atual."
#. TRANS: translate text between <> only
-#: server/commands.c:149
+#: server/commands.c:163
msgid "metainfo <meta-line>"
msgstr "metainfo <meta-linha>"
-#: server/commands.c:150
+#: server/commands.c:164
msgid "Set metaserver info line."
msgstr "Define a linha de informação do metaservidor."
-#: server/commands.c:151
+#: server/commands.c:165
msgid ""
"Set user defined metaserver info line. If parameter is omitted,\n"
"previously set metamessage will be removed. For most of the time\n"
@@ -2337,19 +2345,19 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:158
+#: server/commands.c:173
msgid "metapatch <meta-line>"
msgstr "metainfo <meta-linha>"
-#: server/commands.c:159
+#: server/commands.c:174
msgid "Set metaserver patches line."
msgstr "Define a linha de informação do metaservidor."
-#: server/commands.c:165
+#: server/commands.c:181
msgid "Control metaserver connection."
msgstr "Controla a conexão ao metaservidor."
-#: server/commands.c:166
+#: server/commands.c:182
msgid ""
"'metaconnection ?' reports on the status of the connection to metaserver.\n"
"'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2360,33 +2368,33 @@ msgstr ""
"'metaconnection up' ou 'metac u' estabelece conexão com o metaservidor."
#. TRANS: translate text between <> only
-#: server/commands.c:172
+#: server/commands.c:189
msgid "metaserver <address>"
msgstr "metaservidor <endereço>"
-#: server/commands.c:173
+#: server/commands.c:190
msgid "Set address (URL) for metaserver to report to."
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:177
+#: server/commands.c:195
msgid "aitoggle <player-name>"
msgstr "aitoggle <nome-de-jogador>"
-#: server/commands.c:178
+#: server/commands.c:196
msgid "Toggle AI status of player."
msgstr "Alterna estado IA do jogador."
#. TRANS: translate text between [] and <> only
-#: server/commands.c:182
+#: server/commands.c:201
msgid "take [connection-name] <player-name>"
msgstr "take [nome da conexão] <nome-de-jogador>"
-#: server/commands.c:183
+#: server/commands.c:202
msgid "Take over a player's place in the game."
msgstr "Tomar o lugar de um jogador no jogo."
-#: server/commands.c:184
+#: server/commands.c:203
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 "
@@ -2396,15 +2404,15 @@ msgid ""
msgstr ""
#. TRANS: translate text between [] only
-#: server/commands.c:192
+#: server/commands.c:212
msgid "observe [connection-name] [player-name]"
msgstr "observe [nome da conexão] [nome-de-jogador]"
-#: server/commands.c:193
+#: server/commands.c:213
msgid "Observe a player or the whole game."
msgstr ""
-#: server/commands.c:194
+#: server/commands.c:214
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 "
@@ -2414,35 +2422,35 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:202
+#: server/commands.c:223
msgid "detach <connection-name>"
msgstr "detach <nome-conexão>"
-#: server/commands.c:203
+#: server/commands.c:224
msgid "detach from a player."
msgstr "destaca de um jogador."
-#: server/commands.c:204
+#: server/commands.c:225
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:209
+#: server/commands.c:231
msgid "create <player-name>"
msgstr "create <nome-de-jogador>"
-#: server/commands.c:210
+#: server/commands.c:232
msgid "Create an AI player with a given name."
msgstr "Cria um jogador IA com o nome indicado."
-#: server/commands.c:211
+#: server/commands.c:233
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:215
+#: server/commands.c:238
msgid ""
"away\n"
"away"
@@ -2450,16 +2458,16 @@ msgstr ""
"away\n"
"away"
-#: server/commands.c:217
+#: server/commands.c:240
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:218
+#: server/commands.c:241
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:222
+#: server/commands.c:246
msgid ""
"novice\n"
"novice <player-name>"
@@ -2467,11 +2475,11 @@ msgstr ""
"novice\n"
"novice <nome-jogador>"
-#: server/commands.c:224
+#: server/commands.c:248
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:225
+#: server/commands.c:249
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 "
@@ -2482,7 +2490,7 @@ msgstr ""
"computador. Com um argumento, define o nÃvel apenas desse jogador."
#. TRANS: translate text between <> only
-#: server/commands.c:231
+#: server/commands.c:256
msgid ""
"easy\n"
"easy <player-name>"
@@ -2490,11 +2498,11 @@ msgstr ""
"easy\n"
"easy <nome-de-jogador>"
-#: server/commands.c:233
+#: server/commands.c:258
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:234
+#: server/commands.c:259
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 "
@@ -2505,7 +2513,7 @@ msgstr ""
"define o nÃvel de capacidade apenas desse jogador."
#. TRANS: translate text between <> only
-#: server/commands.c:240
+#: server/commands.c:266
msgid ""
"normal\n"
"normal <player-name>"
@@ -2513,11 +2521,11 @@ msgstr ""
"normal\n"
"normal <nome-de-jogador>"
-#: server/commands.c:242
+#: server/commands.c:268
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:243
+#: server/commands.c:269
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 "
@@ -2529,7 +2537,7 @@ msgstr ""
"jogador."
#. TRANS: translate text between <> only
-#: server/commands.c:249
+#: server/commands.c:276
msgid ""
"hard\n"
"hard <player-name>"
@@ -2537,11 +2545,11 @@ msgstr ""
"hard\n"
"hard <nome-de-jogador>"
-#: server/commands.c:251
+#: server/commands.c:278
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:252
+#: server/commands.c:279
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 "
@@ -2553,7 +2561,7 @@ msgstr ""
"jogador."
#. TRANS: translate text between <> only
-#: server/commands.c:258
+#: server/commands.c:286
msgid ""
"experimental\n"
"experimental <player-name>"
@@ -2561,11 +2569,11 @@ msgstr ""
"experimental\n"
"experimental <nome-de-jogador>"
-#: server/commands.c:260
+#: server/commands.c:288
msgid "Set one or all AI players to 'experimental'."
msgstr "Coloca um ou todos os jogadores IA em nÃvel 'experimental'."
-#: server/commands.c:261
+#: server/commands.c:289
#, fuzzy
msgid ""
"With no arguments, sets all AI players to skill 'experimental', and sets the "
@@ -2580,7 +2588,7 @@ msgstr ""
"servidores normais, esta opção não tem qualquer efeito."
#. TRANS: translate text between <> only
-#: server/commands.c:269
+#: server/commands.c:298
msgid ""
"cmdlevel\n"
"cmdlevel <level>\n"
@@ -2594,17 +2602,19 @@ msgstr ""
"cmdlevel <nÃvel> first\n"
"cmdlevel <nÃvel> <nome-de-conexão>"
-#: server/commands.c:274
+#: server/commands.c:303
msgid "Query or set command access level access."
msgstr "Questiona ou define acesso a nÃvel de acesso de comandos."
-#: server/commands.c:275
+#: server/commands.c:304
msgid ""
"The command access level controls which server commands are available\n"
"to users via the client chatline. The available levels are:\n"
" none - no commands\n"
-" info - informational commands only\n"
+" info - informational or observer commands only\n"
+" basic - commands available to players in the game\n"
" ctrl - commands that affect the game and users\n"
+" admin - commands that affect server operation\n"
" hack - *all* commands - dangerous!\n"
"With no arguments, the current command access levels are reported.\n"
"With a single argument, the level is set for all existing connections,\n"
@@ -2620,20 +2630,20 @@ msgid ""
"now takes connection names, not player names."
msgstr ""
-#: server/commands.c:296
+#: server/commands.c:328
msgid "If there is none, become the game organizer with increased permissions."
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:301
+#: server/commands.c:334
msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
msgstr "timeoutincrease <turno> <increm_turno> <valor> <mult_valor>"
-#: server/commands.c:302
+#: server/commands.c:335
msgid "See \"help timeoutincrease\"."
msgstr "Consulte \"help timeoutincrease\"."
-#: server/commands.c:303
+#: server/commands.c:336
#, fuzzy
msgid ""
"Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
@@ -2646,39 +2656,58 @@ msgstr ""
"0 1"
#. TRANS: translate text between <> only
-#: server/commands.c:309
+#: server/commands.c:343
+msgid ""
+"cancelvote\n"
+"cancelvote <vote number>\n"
+"cancelvote all\n"
+msgstr ""
+
+#: server/commands.c:346
+msgid "Cancel a running vote.\n"
+msgstr ""
+
+#: server/commands.c:347
+msgid ""
+"With no arguments this command removes your own vote. If you have an admin "
+"access level, you can cancel any vote by vote number, or all votes with the "
+"'all' argument."
+msgstr ""
+
+#. TRANS: translate text between <> only
+#: server/commands.c:354
msgid "endgame"
msgstr "fim de jogo"
-#: server/commands.c:310
+#: server/commands.c:355
msgid "End the game immediately in a draw."
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:314
+#: server/commands.c:360
msgid "surrender"
msgstr "rendeu-se"
-#: server/commands.c:315
+#: server/commands.c:361
msgid "Concede the game."
msgstr "Desiste do jogo."
-#: server/commands.c:316
+#: server/commands.c:362
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:322
+#: server/commands.c:369
msgid "remove <player-name>"
msgstr "remove <nome-de-jogador>"
-#: server/commands.c:323
+#: server/commands.c:370
msgid "Fully remove player from game."
msgstr "Remove completamente o jogador."
-#: server/commands.c:324
+#: server/commands.c:371
#, fuzzy
msgid ""
"This *completely* removes a player from the game, including all cities and "
@@ -2688,7 +2717,7 @@ msgstr ""
"etc. Utilizar com cautela!"
#. TRANS: translate text between <> only
-#: server/commands.c:329
+#: server/commands.c:377
msgid ""
"save\n"
"save <file-name>"
@@ -2696,11 +2725,11 @@ msgstr ""
"save\n"
"save <nome-de-arquivo>"
-#: server/commands.c:331
+#: server/commands.c:379
msgid "Save game to file."
msgstr "Salva o jogo num arquivo."
-#: server/commands.c:332
+#: server/commands.c:380
#, fuzzy
msgid ""
"Save the current game to file <file-name>. If no file-name argument is "
@@ -2718,7 +2747,7 @@ msgstr ""
"e utilize o comando 'start' após os jogadores se terem ligado novamente."
#. TRANS: translate text between <> only
-#: server/commands.c:341
+#: server/commands.c:390
msgid ""
"load\n"
"load <file-name>"
@@ -2726,11 +2755,11 @@ msgstr ""
"load\n"
"load <nome-de-arquivo>"
-#: server/commands.c:343
+#: server/commands.c:392
msgid "Load game from file."
msgstr "Lê jogo do arquivo."
-#: server/commands.c:344
+#: server/commands.c:393
#, fuzzy
msgid ""
"Load a game from <file-name>. Any current data including players, rulesets "
@@ -2740,121 +2769,121 @@ msgstr ""
"jogadores, conjuntos de regras e opções de servidor são perdidos.\n"
#. TRANS: translate text between <> only
-#: server/commands.c:349
+#: server/commands.c:399
msgid "read <file-name>"
msgstr "read <arquivo>"
-#: server/commands.c:350
+#: server/commands.c:400
msgid "Process server commands from file."
msgstr "Processa comandos do servidor a partir do arquivo."
#. TRANS: translate text between <> only
-#: server/commands.c:354
+#: server/commands.c:405
msgid "write <file-name>"
msgstr "write <arquivo>"
-#: server/commands.c:355
+#: server/commands.c:406
msgid "Write current settings as server commands to file."
msgstr "Grava as opções do servidor como comandos para o arquivo."
-#: server/commands.c:359
+#: server/commands.c:411
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:363
+#: server/commands.c:416
msgid "Simply returns the id of the server."
msgstr "Simplesmente retorna o id do servidor."
-#: server/connecthand.c:85
+#: server/connecthand.c:109
#, c-format
msgid "Welcome to the %s Server running at %s port %d."
msgstr "Bem vindo ao Servidor %s em execução em %s na porta %d."
-#: server/connecthand.c:89
+#: server/connecthand.c:113
#, c-format
msgid "Welcome to the %s Server at port %d."
msgstr "Bem vindo ao Servidor %s na porta %d."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:97
+#: server/connecthand.c:121
#, fuzzy, c-format
msgid "(%d) %s: connected [%s]"
msgstr "(%d) %s conectou-se de %s."
-#: server/connecthand.c:104
+#: server/connecthand.c:128
#, c-format
msgid "Server: %s has connected from %s."
msgstr "Servidor: %s conectou-se de %s."
-#: server/connecthand.c:145
+#: server/connecthand.c:175
#, fuzzy
msgid "Couldn't attach your connection to new player."
msgstr "Incapaz de anexar a sua ligação a um novo jogador."
-#: server/connecthand.c:165
+#: server/connecthand.c:199
#, c-format
msgid "You are logged in as '%s' connected to no player."
msgstr ""
-#: server/connecthand.c:169
+#: server/connecthand.c:203
#, c-format
msgid "You are logged in as '%s' connected to an anonymous player."
msgstr ""
-#: server/connecthand.c:174
+#: server/connecthand.c:208
#, c-format
msgid "You are logged in as '%s' connected to %s."
msgstr ""
-#: server/connecthand.c:187
+#: server/connecthand.c:221
#, fuzzy, c-format
msgid "Turn-blocking game play: waiting on %s to finish turn..."
msgstr "Jogo bloqueia em turno: a aguardar que %s termine o turno..."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:240
+#: server/connecthand.c:274
#, fuzzy, c-format
msgid "(%d) %s: connection request [%s]"
msgstr "(%d) Pedido de conexão de %s de %s"
-#: server/connecthand.c:266
+#: server/connecthand.c:300
#, fuzzy
msgid "The client is missing a capability that this server needs."
msgstr "O cliente não possui uma funcionalidade que este servidor necessita."
-#: server/connecthand.c:268 server/connecthand.c:279
+#: server/connecthand.c:302 server/connecthand.c:313
#, fuzzy, c-format
msgid "(%d) %s rejected: mismatched capabilities!"
msgstr "(%d) %s foi rejeitado: As funcionalidades não coincidiam."
-#: server/connecthand.c:277
+#: server/connecthand.c:311
#, fuzzy
msgid "This server is missing a capability that the client needs."
msgstr "O servidor não possui uma funcionalidade que o cliente necessita."
-#: server/connecthand.c:290
+#: server/connecthand.c:324
#, fuzzy
msgid "The username is invalid!"
msgstr "Nome de usuário inválido"
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:292
+#: server/connecthand.c:326
#, fuzzy, c-format
msgid "(%d) %s rejected: invalid username [%s]"
msgstr "(%d) %s foi rejeitado: Nome inválido [%s]."
-#: server/connecthand.c:303
+#: server/connecthand.c:337
#, fuzzy
msgid "Your username is already connected!"
msgstr "já está conectado."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:305
+#: server/connecthand.c:339
#, fuzzy, c-format
msgid "(%d) %s rejected: duplicate username [%s]"
msgstr "(%d) %s foi rejeitado: Jogo já iniciado e nome %s desconhecido."
-#: server/connecthand.c:335 server/connecthand.c:344
+#: server/connecthand.c:369 server/connecthand.c:378
#, c-format
msgid "Lost connection: %s."
msgstr "Conexão perdida: %s."
@@ -2871,114 +2900,114 @@ msgstr "Ok. Selecionado estilo normal."
msgid "For introductory help, type 'help'."
msgstr "Para ajuda inicial, escreva 'help'."
-#: server/diplhand.c:164
+#: server/diplhand.c:167
#, c-format
msgid "The %s can't accept %s."
msgstr "O %s não pode aceitar %s."
-#: server/diplhand.c:176
+#: server/diplhand.c:179
#, fuzzy, c-format
msgid "You don't have tech %s, you can't accept treaty."
msgstr "Você não possui a tecn. %s, não pode aceitar o tratado."
-#: server/diplhand.c:185
+#: server/diplhand.c:188
#, fuzzy
msgid "City you are trying to give no longer exists, you can't accept treaty."
msgstr ""
"A cidade que está a oferecer já não existe, não pode aceitar o tratado."
-#: server/diplhand.c:191
+#: server/diplhand.c:194
#, fuzzy, c-format
msgid "You are not owner of %s, you can't accept treaty."
msgstr "Você não é o senhor de %s, não pode aceitar o tratado."
-#: server/diplhand.c:197 server/diplhand.c:301
+#: server/diplhand.c:200 server/diplhand.c:304
#, fuzzy, c-format
msgid "Your capital (%s) is requested, you can't accept treaty."
msgstr "A sua capital (%s) é requerida, não pode aceitar o tratado."
-#: server/diplhand.c:224
+#: server/diplhand.c:227
#, fuzzy
msgid "You don't have enough gold, you can't accept treaty."
msgstr "Você não tem moedas suficientes, não pode aceitar o tratado."
-#: server/diplhand.c:256 server/diplhand.c:261
+#: server/diplhand.c:259 server/diplhand.c:264
#, fuzzy, c-format
msgid "A treaty containing %d clause was agreed upon."
msgid_plural "A treaty containing %d clauses was agreed upon."
msgstr[0] "Foi acordado um tratado contendo %d cláusula."
msgstr[1] "Foi acordado um tratado contendo %d cláusula."
-#: server/diplhand.c:277 server/diplhand.c:281
+#: server/diplhand.c:280 server/diplhand.c:284
#, fuzzy, c-format
msgid "One of the cities the %s are giving away is destroyed! Treaty canceled!"
msgstr ""
"Uma das cidades que %s está a oferecer está cancelada! Tratado cancelado!"
-#: server/diplhand.c:288 server/diplhand.c:293
+#: server/diplhand.c:291 server/diplhand.c:296
#, fuzzy, c-format
msgid "The %s no longer control %s! Treaty canceled!"
msgstr "Os %s já não controlam %s! Tratado cancelado!"
-#: server/diplhand.c:331 server/diplhand.c:335
+#: server/diplhand.c:334 server/diplhand.c:338
#, fuzzy, c-format
msgid "The %s don't have the promised amount of gold! Treaty canceled!"
msgstr "Os %s não possuem a quantia de moedas prometida! Tratado cancelado!"
-#: server/diplhand.c:364
+#: server/diplhand.c:367
#, fuzzy, c-format
msgid "You gave an embassy to %s."
msgstr "Você dá a cidade de %s aos %s."
-#: server/diplhand.c:367
+#: server/diplhand.c:370
#, fuzzy, c-format
msgid "%s allowed you to create an embassy!"
msgstr "Você necessita de uma embaixada para efectuar um encontro diplomático."
-#: server/diplhand.c:383
+#: server/diplhand.c:386
#, fuzzy, c-format
msgid "You are taught the knowledge of %s."
msgstr "É-lhe ensinado o conhecimento de %s."
-#: server/diplhand.c:387
+#: server/diplhand.c:390
#, fuzzy, c-format
msgid "The %s have acquired %s from the %s."
msgstr "Os %s adquiriram %s dos %s."
-#: server/diplhand.c:402
+#: server/diplhand.c:405
#, fuzzy, c-format
msgid "You get %d gold."
msgstr "Você obteve %d moedas."
#. TRANS: ... Polish worldmap.
-#: server/diplhand.c:410
+#: server/diplhand.c:413
#, fuzzy, c-format
msgid "You receive the %s worldmap."
msgstr "Você recebeu o mapa mundo de %s."
#. TRANS: ... Polish seamap.
-#: server/diplhand.c:419
+#: server/diplhand.c:422
#, fuzzy, c-format
msgid "You receive the %s seamap."
msgstr "Você recebeu o mapa marÃtimo de %s."
-#: server/diplhand.c:436
+#: server/diplhand.c:439
#, c-format
msgid "You receive city of %s from %s."
msgstr "Você recebeu a cidade %s dos %s."
-#: server/diplhand.c:441
+#: server/diplhand.c:444
#, c-format
msgid "You give city of %s to %s."
msgstr "Você dá a cidade de %s aos %s."
-#: server/diplhand.c:454 server/diplhand.c:457
+#: server/diplhand.c:457 server/diplhand.c:460
#, c-format
msgid "You agree on a cease-fire with %s."
msgstr "Você assina um acordo de cessar-fogo com %s."
#. TRANS: ... the Poles ... Polish territory.
-#: server/diplhand.c:476 server/diplhand.c:488
+#: server/diplhand.c:479 server/diplhand.c:491
#, c-format
msgid ""
"You agree on an armistice with the %s. In %d turn, it will become a peace "
@@ -2989,32 +3018,32 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: server/diplhand.c:512 server/diplhand.c:515
+#: server/diplhand.c:515 server/diplhand.c:518
#, c-format
msgid "You agree on an alliance with %s."
msgstr "Você forma uma aliança com %s."
-#: server/diplhand.c:524
+#: server/diplhand.c:527
#, c-format
msgid "You give shared vision to %s."
msgstr "Você compartilha a visão com %s."
-#: server/diplhand.c:527
+#: server/diplhand.c:530
#, c-format
msgid "%s gives you shared vision."
msgstr "%s compartilhou a visão com você."
-#: server/diplhand.c:663
+#: server/diplhand.c:666
#, c-format
msgid "%s canceled the meeting!"
msgstr "%s cancelou o encontro!"
-#: server/diplhand.c:670
+#: server/diplhand.c:673
#, c-format
msgid "Meeting with %s canceled."
msgstr "Encontro com %s cancelado."
-#: server/diplhand.c:712
+#: server/diplhand.c:715
msgid "Your diplomatic envoy was decapitated!"
msgstr ""
@@ -3197,80 +3226,80 @@ msgid "The %s destroyed the %s in %s."
msgstr "Os %s destruÃram %s em %s."
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1091
+#: server/diplomats.c:1097
#, fuzzy, c-format
msgid "An enemy %s has been eliminated by your %s."
msgstr "Uma %s inimiga foi eliminada ao defender %s."
#. TRANS: <unit> ... <city> ... <diplomat>
-#: server/diplomats.c:1098
+#: server/diplomats.c:1104
#, c-format
msgid "Your %s has been eliminated defending %s against a %s."
msgstr ""
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1106
+#: server/diplomats.c:1112
#, c-format
msgid "Your %s has been eliminated defending against a %s."
msgstr ""
-#: server/diplomats.c:1119
+#: server/diplomats.c:1125
#, c-format
msgid "Your %s was eliminated by a defending %s."
msgstr "O seu %s foi executado por um defensor %s."
-#: server/diplomats.c:1127
+#: server/diplomats.c:1133
#, c-format
msgid "Eliminated %s %s while infiltrating %s."
msgstr "Eliminado %s %s ao infiltrar-se em %s."
-#: server/diplomats.c:1134
+#: server/diplomats.c:1140
#, c-format
msgid "Eliminated %s %s while infiltrating our troops."
msgstr ""
-#: server/diplomats.c:1185
+#: server/diplomats.c:1191
#, fuzzy, c-format
msgid ""
"Your %s has successfully completed the mission and returned unharmed to %s."
msgstr "O seu %s completou a sua missão com sucesso e voltou ileso para %s."
-#: server/diplomats.c:1204
+#: server/diplomats.c:1210
#, fuzzy, c-format
msgid "Your %s was captured after completing the mission in %s."
msgstr "O seu %s foi capturado após completar a sua missão em %s."
-#: server/diplomats.c:1210
+#: server/diplomats.c:1216
#, fuzzy, c-format
msgid "Your %s was captured after completing the mission."
msgstr "O seu %s foi capturado após terminar a sua missão."
-#: server/diplomats.c:1242
+#: server/diplomats.c:1248
#, fuzzy, c-format
msgid "You have caused an incident while bribing the %s %s."
msgstr "Você causou um incidente ao subornar o %s de %s."
-#: server/diplomats.c:1247
+#: server/diplomats.c:1253
#, c-format
msgid "%s has caused an incident while bribing your %s."
msgstr "%s causou um incidente ao subornar o seu %s."
-#: server/diplomats.c:1254
+#: server/diplomats.c:1260
#, c-format
msgid "You have caused an incident while attempting to steal tech from %s."
msgstr "Você causou um incidente ao tentar roubar tecnologia dos %s."
-#: server/diplomats.c:1258
+#: server/diplomats.c:1264
#, c-format
msgid "%s has caused an incident while attempting to steal tech from you."
msgstr "%s causou um incidente ao tentar roubar tecnologia de você."
-#: server/diplomats.c:1264
+#: server/diplomats.c:1270
#, c-format
msgid "You have caused an incident while inciting a revolt in %s."
msgstr "Você causou um incidente ao incitar uma revolta em %s."
-#: server/diplomats.c:1268
+#: server/diplomats.c:1274
#, c-format
msgid "%s have caused an incident while inciting a revolt in %s."
msgstr "%s causou um incidente ao incitar uma revolta em %s."
@@ -3395,12 +3424,12 @@ msgstr ""
" Os trabalhadores juntam-se espontâneamente e colocam carris em todas "
"as cidades."
-#: server/maphand.c:1418
+#: server/maphand.c:1425
#, fuzzy, c-format
msgid "Moved your %s due to changing terrain."
msgstr "Transferido %s em (%d, %d) de %s para %s."
-#: server/maphand.c:1436
+#: server/maphand.c:1443
#, fuzzy, c-format
msgid "Disbanded your %s due to changing terrain."
msgstr "Transferido %s em (%d, %d) de %s para %s."
@@ -3410,7 +3439,7 @@ msgstr "Transferido %s em (%d, %d) de %s para %s."
msgid "Not reporting to the metaserver in this game."
msgstr "A não reportar ao metaservidor neste jogo."
-#: server/meta.c:430
+#: server/meta.c:432
#, fuzzy, c-format
msgid "Metaserver: bad address: [%s:%d]."
msgstr "Metaservidor: endereço inválido: [%s:%d]."
@@ -3528,55 +3557,55 @@ msgid ""
"with %s."
msgstr ""
-#: server/plrhand.c:1103
+#: server/plrhand.c:1115
#, fuzzy, c-format
msgid "Removing player %s."
msgstr "A remover o jogador %s."
-#: server/plrhand.c:1105
+#: server/plrhand.c:1117
#, fuzzy
msgid "You've been removed from the game!"
msgstr "Você foi removido do jogo!"
-#: server/plrhand.c:1108
+#: server/plrhand.c:1120
#, fuzzy, c-format
msgid "%s has been removed from the game."
msgstr "%s foi removido do jogo."
-#: server/plrhand.c:1153 server/plrhand.c:1158
+#: server/plrhand.c:1167 server/plrhand.c:1172
#, 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:1178
+#: server/plrhand.c:1192
#, c-format
msgid ""
"%s and %s meet and go to instant war. You cancel your alliance with both."
msgstr ""
-#: server/plrhand.c:1656
+#: server/plrhand.c:1670
#, c-format
msgid "Could not throw %s into civil war - too many players"
msgstr ""
-#: server/plrhand.c:1663
+#: server/plrhand.c:1677
#, c-format
msgid "Could not throw %s into civil war - no available nations"
msgstr ""
-#: server/plrhand.c:1686
+#: server/plrhand.c:1700
#, fuzzy, 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:1707
+#: server/plrhand.c:1721
#, c-format
msgid "%s declares allegiance to %s."
msgstr "%s declara lealdade a %s."
-#: server/plrhand.c:1722
+#: server/plrhand.c:1736
#, fuzzy, c-format
msgid ""
"Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3771,67 +3800,67 @@ msgstr "(edifÃcio %s em %s (%s))\n"
msgid "Wonders of the World"
msgstr "Maravilhas do Mundo"
-#: server/report.c:547
+#: server/report.c:552
msgid " sq. mi."
msgstr " sq. mi."
-#: server/report.c:557
+#: server/report.c:562
msgid " M tons"
msgstr " M toneladas"
-#: server/report.c:562
+#: server/report.c:567
msgid " M goods"
msgstr " M bens"
-#: server/report.c:567
+#: server/report.c:572
msgid " bulbs"
msgstr " lâmpadas"
-#: server/report.c:572
+#: server/report.c:577
msgid " month"
msgid_plural " months"
msgstr[0] " mês"
msgstr[1] "meses"
-#: server/report.c:577
+#: server/report.c:582
msgid " ton"
msgid_plural " tons"
msgstr[0] " tonelada"
msgstr[1] "toneladas"
-#: server/report.c:591
+#: server/report.c:596
msgid "st"
msgstr "º"
-#: server/report.c:593
+#: server/report.c:598
msgid "nd"
msgstr "º"
-#: server/report.c:595
+#: server/report.c:600
msgid "rd"
msgstr "º"
-#: server/report.c:597
+#: server/report.c:602
msgid "th"
msgstr "º"
-#: server/report.c:700
+#: server/report.c:705
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:743 server/report.c:768
+#: server/report.c:748 server/report.c:773
msgid "Demographics Report:"
msgstr "Relatório Demográfico:"
-#: server/report.c:744
+#: server/report.c:749
msgid "Sorry, the Demographics report is unavailable."
msgstr "Desculpe, o relatório Demográfico não se encontra disponÃvel."
#. TRANS: <nation adjective> <government name> (<year>).
#. * E.g. "Polish Despotism (200 AD)".
-#: server/report.c:750
+#: server/report.c:755
#, fuzzy, c-format
msgid "%s %s (%s)"
msgstr "%s em %s (%s)\n"
@@ -3842,11 +3871,11 @@ msgstr "%s em %s (%s)\n"
msgid "Could not find a readable \"%s.%s\" ruleset file."
msgstr "Não pude abrir arquivo de roteiro '%s'."
-#: server/ruleset.c:2356
+#: server/ruleset.c:2366
msgid "No barbarian nation in rulesets, at least one required!"
msgstr ""
-#: server/ruleset.c:3166
+#: server/ruleset.c:3178
msgid "Loading rulesets"
msgstr "Lendo o conjunto de regras"
@@ -3862,13 +3891,13 @@ msgstr ""
"com jogos gravados antigos, ou pode indicar um jogo gravado inválido. "
"Prossiga por sua conta e risco."
-#: server/savegame.c:3588
+#: server/savegame.c:3587
#, 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."
#. TRANS: Fatal error message.
-#: server/savegame.c:3815
+#: server/savegame.c:3817
#, fuzzy
msgid ""
"Saved game uses the \"classic\" terrain ruleset, and is no longer supported."
@@ -3876,7 +3905,7 @@ msgstr ""
"O jogo gravado utiliza o conjunto de regras de terreno clássicas, que já não "
"é suportado."
-#: server/savegame.c:3824
+#: server/savegame.c:3826
#, fuzzy, c-format
msgid ""
"Warning: Different rulesetdirs ('%s' and '%s') are no longer supported. "
@@ -3886,7 +3915,7 @@ msgstr ""
"A utilizar '%s'."
#. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4051
+#: server/savegame.c:4055
#, c-format
msgid "%s had invalid nation; changing to %s."
msgstr ""
@@ -3919,7 +3948,7 @@ msgstr "Interno"
msgid "Networking"
msgstr "Rede de Comunicação"
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:734
#: client/gui-win32/dialogs.c:532
msgid "All"
msgstr "Todas"
@@ -4866,12 +4895,12 @@ msgid ""
"the game."
msgstr ""
-#: server/sernet.c:150
+#: server/sernet.c:151
#, fuzzy
msgid "Server cannot read standard input. Ignoring input."
msgstr "Servidor incapaz de ler da consola. A ignorar consola."
-#: server/sernet.c:929
+#: server/sernet.c:933
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr "Servidor: endereço inválido: [%s:%d]."
@@ -4957,36 +4986,36 @@ msgstr "A sua nave já possui o número máximo de Módulos de Painel Solar!"
msgid "Without guidance from the capital, the %s spaceship is lost!"
msgstr "Sem orientação da capital, a nave espacial %s foi perdida!"
-#: server/srv_main.c:240
+#: server/srv_main.c:242
#, fuzzy
msgid "Game ended in a draw as end year exceeded"
msgstr "Jogo terminou com um empate pois foi ultrapassado o ano final"
-#: server/srv_main.c:274
+#: server/srv_main.c:276
#, fuzzy, c-format
msgid "The %s spaceship has arrived at Alpha Centauri."
msgstr "A nave espacial dos %s chegou a Alfa Centauro."
-#: server/srv_main.c:287 server/srv_main.c:322
+#: server/srv_main.c:289 server/srv_main.c:324
#, c-format
msgid "Team victory to %s"
msgstr "Vitória em equipe para %s"
-#: server/srv_main.c:297 server/srv_main.c:338
+#: server/srv_main.c:299 server/srv_main.c:340
#, c-format
msgid "Game ended in victory for %s"
msgstr "Jogo terminou com a vitória de %s"
-#: server/srv_main.c:345
+#: server/srv_main.c:347
msgid "Game ended in a draw"
msgstr "Jogo terminou com um empate"
-#: server/srv_main.c:461 server/srv_main.c:472
+#: server/srv_main.c:465 server/srv_main.c:476
#, c-format
msgid "Your %s was disbanded in accordance with your peace treaty with the %s."
msgstr ""
-#: server/srv_main.c:512 server/srv_main.c:516
+#: server/srv_main.c:516 server/srv_main.c:520
#, fuzzy, c-format
msgid ""
"Concerned citizens point out that the cease-fire with %s will run out soon."
@@ -4994,373 +5023,363 @@ msgstr ""
"Cidadãos preocupados lembram-lhe que o cessar-fogo com %s vai expirar "
"brevemente."
-#: server/srv_main.c:521 server/srv_main.c:525
+#: server/srv_main.c:525 server/srv_main.c:529
#, c-format
msgid "The cease-fire with %s has run out. You are now at war with the %s."
msgstr ""
-#: server/srv_main.c:542
+#: server/srv_main.c:546
#, c-format
msgid ""
"Ceasefire between %s and %s has run out. They are at war. You cancel your "
"alliance with both."
msgstr ""
-#: server/srv_main.c:961
+#: server/srv_main.c:997
#, c-format
msgid "Failed saving game as %s"
msgstr "Falha ao salvar jogo como %s"
-#: server/srv_main.c:963
+#: server/srv_main.c:999
#, c-format
msgid "Game saved as %s"
msgstr "Jogo salvo como %s"
-#: server/srv_main.c:994
+#: server/srv_main.c:1030
msgid "The game is already running."
msgstr "O jogo já está sendo jogado."
-#: server/srv_main.c:1002
+#: server/srv_main.c:1038
#, c-format
msgid "%s lost control cmdlevel on game start. Use voting from now on."
msgstr ""
-#: server/srv_main.c:1009
+#: server/srv_main.c:1045
msgid "Starting game."
msgstr "Iniciando jogo."
-#: server/srv_main.c:1071
+#: server/srv_main.c:1112
#, fuzzy, c-format
msgid "request for unknown report (type %d)"
msgstr "pedido de relatório desconhecido (tipo %d)"
-#: server/srv_main.c:1136
+#: server/srv_main.c:1177
#, c-format
msgid "Warning: rejecting old client %s"
msgstr "Aviso: rejeitando cliente antigo %s"
-#: server/srv_main.c:1238
+#: server/srv_main.c:1279
#, 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:1338
+#: server/srv_main.c:1381
#, fuzzy
msgid "Please choose a non-blank name."
msgstr "Seleccione um nome não-vazio."
-#: server/srv_main.c:1354
+#: server/srv_main.c:1397
#, fuzzy
msgid "That nation is already in use."
msgstr "O jogo já está sendo jogado."
-#: server/srv_main.c:1370
+#: server/srv_main.c:1413
#, 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:1391
+#: server/srv_main.c:1434
msgid "Please choose a name containing only ASCII characters."
msgstr ""
-#: server/srv_main.c:1490
+#: server/srv_main.c:1533
#, c-format
msgid "%s nation is not available in this scenario."
msgstr ""
-#: server/srv_main.c:1496
+#: server/srv_main.c:1539
#, fuzzy, c-format
msgid "%s nation is already in use."
msgstr "A sub-categoria esta em uso"
-#: server/srv_main.c:1514
+#: server/srv_main.c:1557
#, fuzzy, c-format
msgid "%s is the %s ruler %s."
msgstr "%s é o governante %s %s."
-#: server/srv_main.c:1570
+#: server/srv_main.c:1613
#, c-format
msgid "Waiting to start game: %d out of %d players are ready to start."
msgstr ""
-#: server/srv_main.c:1614 server/srv_main.c:1618
+#: server/srv_main.c:1657 server/srv_main.c:1661
#, c-format
msgid "%s has been added as %s level AI-controlled player."
msgstr ""
-#: server/srv_main.c:1760
+#: server/srv_main.c:1803
#, c-format
msgid "Player %d"
msgstr "Jogador %d"
-#: server/srv_main.c:1771 server/srv_main.c:1777
+#: server/srv_main.c:1814 server/srv_main.c:1820
#, c-format
msgid "%s rules the %s."
msgstr "%s regra o %s."
-#: server/srv_main.c:1942
+#: server/srv_main.c:1985
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
msgstr ""
-#: server/srv_main.c:1993
+#: server/srv_main.c:2037
#, fuzzy, c-format
msgid "Sending info to metaserver [%s]"
msgstr "A enviar informação para o metaservidor [%s]"
-#: server/srv_main.c:2024
+#: server/srv_main.c:2069
msgid "The game is over..."
msgstr "O jogo acabou..."
-#: server/srv_main.c:2237
+#: server/srv_main.c:2286
msgid "Now accepting new client connections."
msgstr "Agora aceitando novas conexões de clientes."
-#: server/stdinhand.c:246
-#, c-format
-msgid "Vote \"%s\" is passed %d to %d with %d abstentions."
-msgstr ""
-
-#: server/stdinhand.c:253
-#, c-format
-msgid "Vote \"%s\" failed with %d against, %d for and %d abstentions."
-msgstr ""
-
#. TRANS: ambiguous command
-#: server/stdinhand.c:365
+#: server/stdinhand.c:284
msgid "(ambiguous)"
msgstr "(ambÃguo)"
#. TRANS: unrecognized command
#. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:416
+#: server/stdinhand.c:287 client/citydlg_common.c:419
#: 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 "(desconhecido)"
-#: server/stdinhand.c:458
+#: server/stdinhand.c:377
#, fuzzy
msgid "Name is empty, so cannot be a player."
msgstr "Nome está vazio, pelo que não pode ser um jogador."
-#: server/stdinhand.c:462
+#: server/stdinhand.c:381
#, fuzzy
msgid "Name is too long, so cannot be a player."
msgstr "Nome demasiado longo, pelo que não pode ser um jogador."
-#: server/stdinhand.c:466
+#: server/stdinhand.c:385
#, fuzzy, c-format
msgid "Player name prefix '%s' is ambiguous."
msgstr "Prefixo de nome de jogador '%s' é ambÃguo."
-#: server/stdinhand.c:470
+#: server/stdinhand.c:389
#, fuzzy, c-format
msgid "No player by the name of '%s'."
msgstr "Não existe nenhum jogador com o nome '%s'."
-#: server/stdinhand.c:474 server/stdinhand.c:509
+#: server/stdinhand.c:393 server/stdinhand.c:428
#, fuzzy, c-format
msgid "Unexpected match_result %d (%s) for '%s'."
msgstr "match_result %d (%s) inesperado para '%s'."
-#: server/stdinhand.c:493
+#: server/stdinhand.c:412
#, fuzzy
msgid "Name is empty, so cannot be a connection."
msgstr "Nome está vazio, pelo que não pode ser uma ligação."
-#: server/stdinhand.c:497
+#: server/stdinhand.c:416
#, fuzzy
msgid "Name is too long, so cannot be a connection."
msgstr "Nome demasiado longo, pelo que não pode ser uma ligação."
-#: server/stdinhand.c:501
+#: server/stdinhand.c:420
#, fuzzy, c-format
msgid "Connection name prefix '%s' is ambiguous."
msgstr "Prefixo de nome de ligação '%s' é ambÃguo."
-#: server/stdinhand.c:505
+#: server/stdinhand.c:424
#, fuzzy, c-format
msgid "No connection by the name of '%s'."
msgstr "Não existe nenhuma ligação de nome '%s'."
-#: server/stdinhand.c:525
+#: server/stdinhand.c:444
#, fuzzy, c-format
msgid "Open metaserver connection to [%s]."
msgstr "Estabelecer ligação com o metaservidor [%s]."
-#: server/stdinhand.c:538
+#: server/stdinhand.c:457
#, fuzzy, c-format
msgid "Close metaserver connection to [%s]."
msgstr "Terminar ligação com o metaservidor [%s]."
-#: server/stdinhand.c:553
+#: server/stdinhand.c:472
#, fuzzy
msgid "Metaserver connection is open."
msgstr "Ligação estabelecida ao metaservidor."
-#: server/stdinhand.c:556
+#: server/stdinhand.c:475
#, fuzzy
msgid "Metaserver connection is closed."
msgstr "Ligação terminada com metaservidor."
-#: server/stdinhand.c:566
+#: server/stdinhand.c:485
#, fuzzy
msgid "Metaserver connection is already open."
msgstr "Ligação ao metaservidor já foi estabelecida."
-#: server/stdinhand.c:577
+#: server/stdinhand.c:496
#, fuzzy
msgid "Metaserver connection is already closed."
msgstr "Ligação do metaservidor já foi terminada."
-#: server/stdinhand.c:582
+#: server/stdinhand.c:501
#, fuzzy
msgid "Argument must be 'u', 'up', 'd', 'down', or '?'."
msgstr "Argumento deve ser 'u', 'up', 'd', 'down', ou '?'."
-#: server/stdinhand.c:603
+#: server/stdinhand.c:522
#, fuzzy, c-format
msgid "Metaserver patches string set to '%s'."
msgstr "Modo IA agora está %s."
-#: server/stdinhand.c:606
+#: server/stdinhand.c:525
#, c-format
msgid "Metaserver patches string set to '%s', not reporting to metaserver."
msgstr ""
-#: server/stdinhand.c:627
+#: server/stdinhand.c:546
#, fuzzy, c-format
msgid "Metaserver message string set to '%s'."
msgstr "Modo IA agora está %s."
-#: server/stdinhand.c:630
+#: server/stdinhand.c:549
#, c-format
msgid "Metaserver message string set to '%s', not reporting to metaserver."
msgstr ""
-#: server/stdinhand.c:650
+#: server/stdinhand.c:569
#, fuzzy, c-format
msgid "Metaserver is now [%s]."
msgstr "O metaservidor é agora [%s]."
-#: server/stdinhand.c:660
+#: server/stdinhand.c:579
#, c-format
msgid "Server id: %s"
msgstr "Id de servidor: %s"
-#: server/stdinhand.c:757
+#: server/stdinhand.c:676
#, fuzzy
msgid "You cannot save games manually on this server."
msgstr "Não é possÃvel comprar em uma cidade criada neste turno."
-#: server/stdinhand.c:774
+#: server/stdinhand.c:693
#, fuzzy
msgid "Cannot toggle a barbarian player."
msgstr "ImpossÃvel alternar um jogador bárbaro."
-#: server/stdinhand.c:781
+#: server/stdinhand.c:700
#, fuzzy, c-format
msgid "%s is now under AI control."
msgstr "%s está agora sob o controlo IA."
-#: server/stdinhand.c:802
+#: server/stdinhand.c:721
#, fuzzy, c-format
msgid "%s is now under human control."
msgstr "%s está agora sob o controlo humano."
-#: server/stdinhand.c:847
+#: server/stdinhand.c:766
#, fuzzy
msgid "Can't add AI players once the game has begun."
msgstr "ImpossÃvel adicionar jogadores IA após ter iniciado o jogo."
-#: server/stdinhand.c:867
+#: server/stdinhand.c:786
#, fuzzy
msgid "Can't add more players, server is full."
msgstr "ImpossÃvel adicionar mais jogadores, o servidor está cheio."
-#: server/stdinhand.c:874
+#: server/stdinhand.c:793
#, fuzzy
msgid "Can't use an empty name."
msgstr "Não pode utilizar um nome vazio."
-#: server/stdinhand.c:881
+#: server/stdinhand.c:800
#, fuzzy, c-format
msgid "That name exceeds the maximum of %d chars."
msgstr "Esse nome excede o tamanho máximo de %d caracteres."
-#: server/stdinhand.c:887
+#: server/stdinhand.c:806
#, fuzzy
msgid "That name is not allowed."
msgstr "Isso não é um nome válido, tente de novo.\n"
-#: server/stdinhand.c:893
+#: server/stdinhand.c:812
#, fuzzy
msgid "A player already exists by that name."
msgstr "Já existe um jogador com esse nome."
-#: server/stdinhand.c:899
+#: server/stdinhand.c:818
#, fuzzy
msgid "A user already exists by that name."
msgstr "Já existe um jogador com esse nome."
-#: server/stdinhand.c:925
+#: server/stdinhand.c:844
#, fuzzy, c-format
msgid "%s has been added as an AI-controlled player."
msgstr "%s foi acrescentado como um jogador controlado por IA."
-#: server/stdinhand.c:932
+#: server/stdinhand.c:851
#, fuzzy, c-format
msgid "Error creating new AI player: %s."
msgstr "Erro ao criar novo jogador IA: %s."
-#: server/stdinhand.c:966
+#: server/stdinhand.c:885
#, fuzzy
msgid "Players cannot be removed once the game has started."
msgstr "Não podem ser removidos jogadores após se ter iniciado o jogo."
-#: server/stdinhand.c:977
+#: server/stdinhand.c:896
#, fuzzy, c-format
msgid "Removed player %s from the game."
msgstr "Removido do jogo o jogador %s."
-#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
+#: server/stdinhand.c:935 server/stdinhand.c:3372 server/stdinhand.c:3507
#, fuzzy, c-format
msgid "Name \"%s\" disallowed for security reasons."
msgstr "Porta restringida por motivos de segurança"
-#: server/stdinhand.c:1029
+#: server/stdinhand.c:948
#, fuzzy, c-format
msgid "No command script found by the name \"%s\"."
msgstr "Perdi a ligação com o servidor!"
-#: server/stdinhand.c:1037
+#: server/stdinhand.c:956
#, fuzzy, c-format
msgid "Loading script file: %s"
msgstr "A ler ficheiro de script: %s"
-#: server/stdinhand.c:1052
+#: server/stdinhand.c:971
#, fuzzy, c-format
msgid "Cannot read command line scriptfile '%s'."
msgstr "Incapaz de ler o ficheiro de script de linha de comando '%s'."
-#: server/stdinhand.c:1054
+#: server/stdinhand.c:973
#, fuzzy, c-format
msgid "Could not read script file '%s'."
msgstr "Incapaz de ler o ficheiro script '%s'."
-#: server/stdinhand.c:1146
+#: server/stdinhand.c:1065
#, fuzzy, c-format
msgid "Could not write script file '%s'."
msgstr "Incapaz de escrever o ficheiro de script '%s'."
-#: server/stdinhand.c:1158
+#: server/stdinhand.c:1077
msgid "You cannot use the write command on this server for security reasons."
msgstr ""
-#: server/stdinhand.c:1186
+#: server/stdinhand.c:1105
#, fuzzy, c-format
msgid ""
"Cannot decrease command access level '%s' for connection '%s'; you only have "
@@ -5369,28 +5388,33 @@ msgstr ""
"Incapaz de reduzir o nÃvel de acesso de comando '%s' para a ligação '%s'; "
"você apenas possui '%s'."
-#: server/stdinhand.c:1241
+#: server/stdinhand.c:1114
+#, 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:1163
#, c-format
msgid ""
"Anyone can now become game organizer '%s' by issuing the 'first' command."
msgstr ""
-#: server/stdinhand.c:1274
+#: server/stdinhand.c:1187
#, fuzzy
msgid "Command access levels in effect:"
msgstr "NÃvel de acesso de comando efectivo:"
-#: server/stdinhand.c:1282
+#: server/stdinhand.c:1194
#, fuzzy, c-format
msgid "Command access level for new connections: %s"
msgstr "NÃvel de acesso de comando para novas ligações: %s"
-#: server/stdinhand.c:1285
+#: server/stdinhand.c:1197
#, fuzzy, c-format
msgid "Command access level for first player to take it: %s"
msgstr "NÃvel de acesso de comando para o primeiro jogador a obte-lo: %s"
-#: server/stdinhand.c:1294
+#: server/stdinhand.c:1206
#, fuzzy
msgid ""
"Error: command access level must be one of 'none', 'info', 'ctrl', or 'hack'."
@@ -5398,7 +5422,7 @@ msgstr ""
"Erro: nÃvel de acesso de comando tem de ser um de 'none', 'info', 'ctrl', ou "
"'hack'."
-#: server/stdinhand.c:1299
+#: server/stdinhand.c:1211
#, fuzzy, c-format
msgid ""
"Cannot increase command access level to '%s'; you only have '%s' yourself."
@@ -5406,435 +5430,492 @@ msgstr ""
"Não pode aumentar nÃvel de acesso de comando para '%s'; você apenas possui '%"
"s'."
-#: 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: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:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
+#: server/stdinhand.c:1238 server/stdinhand.c:1252 server/stdinhand.c:1273
#, 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:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
+#: server/stdinhand.c:1243 server/stdinhand.c:1257 server/stdinhand.c:1267
#, 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:1402
+#: server/stdinhand.c:1302
msgid "The 'first' command makes no sense from the server command line."
msgstr ""
-#: server/stdinhand.c:1406
+#: server/stdinhand.c:1306
#, 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:1411
+#: server/stdinhand.c:1311
msgid "Someone else already is game organizer."
msgstr ""
-#: server/stdinhand.c:1416
+#: server/stdinhand.c:1316
#, c-format
msgid "Connection %s has opted to become the game organizer."
msgstr ""
-#: server/stdinhand.c:1467
+#: server/stdinhand.c:1367
#, c-format
msgid "Invalid argument %d."
msgstr "Argumento inválido %d."
-#: server/stdinhand.c:1474
+#: server/stdinhand.c:1374
#, fuzzy
msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
msgstr ""
"Utilização: timeoutincrease <turno> <increm_turn> <valor> <mult_valor>."
-#: server/stdinhand.c:1482
+#: server/stdinhand.c:1382
#, 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:1542 server/stdinhand.c:1545
+#: server/stdinhand.c:1442 server/stdinhand.c:1445
msgid "Option:"
msgstr "Opção:"
-#: server/stdinhand.c:1555 server/stdinhand.c:4031
+#: server/stdinhand.c:1455 server/stdinhand.c:4079
msgid "Description:"
msgstr "Descrição:"
-#: server/stdinhand.c:1560
+#: server/stdinhand.c:1460
#, c-format
msgid "Status: %s"
msgstr "Estado: %s"
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "changeable"
msgstr "alterável"
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "fixed"
msgstr "fixo"
-#: server/stdinhand.c:1567
+#: server/stdinhand.c:1467
#, 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:1572
+#: server/stdinhand.c:1472
#, 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:1578
+#: server/stdinhand.c:1478
#, fuzzy, c-format
msgid "Value: \"%s\", Default: \"%s\""
msgstr "Valor: \"%s\", Por Omissão: \"%s\""
-#: server/stdinhand.c:1597
+#: server/stdinhand.c:1497
#, 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:1643
+#: server/stdinhand.c:1537
#, fuzzy
msgid "No explanation for that yet."
msgstr "Ainda não existe explicação para essa opção."
-#: server/stdinhand.c:1646 server/stdinhand.c:2480
+#: server/stdinhand.c:1540 server/stdinhand.c:2468
#, fuzzy
msgid "Ambiguous option name."
msgstr "Nome de opção ambÃgua."
-#: server/stdinhand.c:1666
+#: server/stdinhand.c:1560
#, fuzzy, c-format
msgid "Server Operator: %s"
msgstr "Operador do Servidor: %s"
-#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
+#: server/stdinhand.c:1686 server/stdinhand.c:1713 server/stdinhand.c:1731
#, 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:1822
+#: server/stdinhand.c:1718
#, fuzzy, c-format
msgid "%s is not controlled by the AI."
msgstr "%s não é controlado por IA."
-#: server/stdinhand.c:1842
+#: server/stdinhand.c:1738
#, 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:1857 server/stdinhand.c:2162
+#: server/stdinhand.c:1753
#, fuzzy
msgid "This command is client only."
msgstr "Este comando é apenas de cliente."
-#: server/stdinhand.c:1860
+#: server/stdinhand.c:1756
msgid "Usage: away"
msgstr "Utilização: away"
-#: server/stdinhand.c:1865
+#: server/stdinhand.c:1761
msgid "Only players may use the away command."
msgstr ""
-#: server/stdinhand.c:1869
+#: server/stdinhand.c:1765
#, c-format
msgid "%s set to away mode."
msgstr "%s colocado em modo ausente."
-#: server/stdinhand.c:1877
+#: server/stdinhand.c:1772
#, c-format
msgid "%s returned to game."
msgstr "%s voltou ao jogo."
-#: server/stdinhand.c:1919
+#: server/stdinhand.c:1817
#, 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:1925
+#: server/stdinhand.c:1823
#, c-format
msgid "Unknown option '%s'."
msgstr "Opção '%s' desconhecida."
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1848
msgid "All options with non-default values"
msgstr ""
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1851
msgid "All options"
msgstr "Todas as opções"
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1854
msgid "Vital options"
msgstr "Opções vitais"
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1857
#, fuzzy
msgid "Situational options"
msgstr "Opções de marcador"
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1860
#, fuzzy
msgid "Rarely used options"
msgstr ""
"\n"
"Uso: %s [opções] [nome dos ficheiros ...]\n"
-#: server/stdinhand.c:1965
+#: server/stdinhand.c:1863
#, fuzzy
msgid "+ means you may change the option"
msgstr "+ significa que pode alterar a opção"
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1864
#, 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:1969
+#: server/stdinhand.c:1867
#, fuzzy, c-format
msgid "%-*s value (min,max) "
msgstr "%-*s valor (mÃn,máx) "
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
msgid "Option"
msgstr "Opção"
-#: server/stdinhand.c:1973
+#: server/stdinhand.c:1871
msgid "description"
msgstr "descrição"
-#: server/stdinhand.c:2042
+#: server/stdinhand.c:1940
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:2092
+#: server/stdinhand.c:1966
#, fuzzy
msgid "Cannot change teams once game has begun."
msgstr "ImpossÃvel alterar equipas após iniciar o jogo."
-#: server/stdinhand.c:2102
+#: server/stdinhand.c:1976
#, fuzzy
msgid "Undefined argument. Usage: team <player> <team>."
msgstr "Argumento indefinido. Utilização: set <opção> <valor>."
-#: server/stdinhand.c:2122
+#: server/stdinhand.c:1996
#, c-format
msgid "No such team %s. Please give a valid team name or number."
msgstr ""
-#: server/stdinhand.c:2129
+#: server/stdinhand.c:2003
#, fuzzy
msgid "Cannot team a barbarian."
msgstr "ImpossÃvel alternar um jogador bárbaro."
-#: server/stdinhand.c:2135
+#: server/stdinhand.c:2009
#, fuzzy, c-format
msgid "Player %s set to team %s."
msgstr "Jogador %s incluida na equipa %s."
-#: server/stdinhand.c:2157
-msgid "Undefined arguments. Usage: vote yes|no [vote number]."
-msgstr ""
-
-#: server/stdinhand.c:2165
+#: server/stdinhand.c:2035 server/voting.c:512
#, fuzzy
-msgid "Observers cannot vote."
-msgstr "não pode aceder ao arquivo"
+msgid "Teamvote"
+msgstr "Time"
+
+#: server/stdinhand.c:2035 server/voting.c:516
+msgid "Vote"
+msgstr ""
-#: server/stdinhand.c:2168
+#: server/stdinhand.c:2037
+#, c-format
msgid ""
-"You can only vote in a running game. Use 'first' to become the game "
-"organizer if there currently is none."
+"%s %d \"%s\" (needs %0.0f%%%s): %d for, %d against, and %d abstained out of %"
+"d players."
msgstr ""
-#: server/stdinhand.c:2181
-#, fuzzy, c-format
-msgid "Vote %d \"%s\": %d for, %d against"
-msgstr "valor vazio para %s"
+#: server/stdinhand.c:2041
+msgid " no dissent"
+msgstr ""
-#: server/stdinhand.c:2188
+#: server/stdinhand.c:2049
#, fuzzy
msgid "There are no votes going on."
msgstr "Não há novas mensagens no servidor"
-#: server/stdinhand.c:2208
-msgid "No legal last vote."
+#: server/stdinhand.c:2077
+msgid "Invalid arguments. Usage: vote yes|no|abstain [vote number]."
msgstr ""
-#: server/stdinhand.c:2213
+#: server/stdinhand.c:2095 server/stdinhand.c:2213 server/stdinhand.c:3714
+#, fuzzy
+msgid "You are not allowed to use this command."
+msgstr "Você não está autorizado a utilizar este comando."
+
+#: server/stdinhand.c:2104
+#, fuzzy, c-format
+msgid "The argument \"%s\" is ambigious."
+msgstr "O argumento da ajuda '%s' é ambÃguo."
+
+#: server/stdinhand.c:2119
+#, fuzzy
+msgid "There are no votes running."
+msgstr "Não há novas mensagens no servidor"
+
+#: server/stdinhand.c:2121
+#, fuzzy, c-format
+msgid "No legal last vote (%d %s)."
+msgstr "(sem descrição disponÃvel)"
+
+#: server/stdinhand.c:2122
+msgid "other vote running"
+msgid_plural "other votes running"
+msgstr[0] ""
+msgstr[1] ""
+
+#: server/stdinhand.c:2129 server/stdinhand.c:2491 server/stdinhand.c:2532
#, fuzzy
-msgid "Value must be integer."
+msgid "Value must be an integer."
msgstr "Valor tem de ser um inteiro."
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2135 server/stdinhand.c:2221
#, fuzzy, c-format
msgid "No such vote (%d)."
msgstr "(sem descrição disponÃvel)"
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2141
+#, fuzzy
+msgid "You are not allowed to vote on that."
+msgstr "Você não está autorizado a definir esta opção."
+
+#: server/stdinhand.c:2146
#, fuzzy, c-format
msgid "You voted for \"%s\""
msgstr "Você vende %s em %s por %d moedas."
-#: server/stdinhand.c:2232
+#: server/stdinhand.c:2150
#, fuzzy, c-format
msgid "You voted against \"%s\""
msgstr "Tem a certeza?"
-#: server/stdinhand.c:2259
+#: server/stdinhand.c:2155
+#, c-format
+msgid "You abstained from voting on \"%s\""
+msgstr ""
+
+#: server/stdinhand.c:2190
+msgid "Missing argument <vote number> or the string \"all\"."
+msgstr ""
+
+#: server/stdinhand.c:2197
+#, fuzzy
+msgid "You don't have any vote going on."
+msgstr "Você não possui um trabalhador aqui."
+
+#: server/stdinhand.c:2204
+#, fuzzy
+msgid "There isn't any vote going on."
+msgstr "Não há novas mensagens no servidor"
+
+#: server/stdinhand.c:2209
+msgid "Server: All votes have been removed."
+msgstr ""
+
+#: server/stdinhand.c:2226
+#, fuzzy, c-format
+msgid "You are not allowed to cancel this vote (%d)."
+msgstr "Você não está autorizado a definir esta opção."
+
+#: server/stdinhand.c:2232
+msgid "Usage: /cancelvote [<vote number>|all]"
+msgstr ""
+
+#: server/stdinhand.c:2241
+#, c-format
+msgid "Server: %s cancelled the vote \"%s\" (number %d)."
+msgstr ""
+
+#: server/stdinhand.c:2247
+#, c-format
+msgid "Server: The vote \"%s\" (number %d) has been cancelled."
+msgstr ""
+
+#: server/stdinhand.c:2265
msgid ""
"Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
"<x> <y> | unit <id> | tech <player> | timing | info>."
msgstr ""
-#: server/stdinhand.c:2265
+#: server/stdinhand.c:2271
msgid "Can only use this command once game has begun."
msgstr ""
-#: server/stdinhand.c:2294
+#: server/stdinhand.c:2300
#, c-format
msgid "%s diplomacy no longer debugged"
msgstr "%s sem depuração para a diplomacia"
-#: server/stdinhand.c:2298
+#: server/stdinhand.c:2304
#, c-format
msgid "%s diplomacy debugged"
msgstr "%s depuração da diplomacia"
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2323
#, c-format
msgid "%s tech no longer debugged"
msgstr "%s sem depuração para a tecnologia"
-#: server/stdinhand.c:2321
+#: server/stdinhand.c:2327
#, c-format
msgid "%s tech debugged"
msgstr "%s depuração para a tecnologia"
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2358 server/stdinhand.c:2388
#, fuzzy
msgid "Value 2 & 3 must be integer."
msgstr "Valor tem de ser um inteiro."
-#: server/stdinhand.c:2356 server/stdinhand.c:2386
+#: server/stdinhand.c:2362 server/stdinhand.c:2392
#, fuzzy
msgid "Bad map coordinates."
msgstr "Efeito de Mapa da Janela"
-#: server/stdinhand.c:2361
+#: server/stdinhand.c:2367
msgid "No city at this coordinate."
msgstr ""
-#: server/stdinhand.c:2366
+#: server/stdinhand.c:2372
#, c-format
msgid "%s no longer debugged"
msgstr "%s sem depuração"
-#: server/stdinhand.c:2392 server/stdinhand.c:2422
+#: server/stdinhand.c:2398 server/stdinhand.c:2428
#, fuzzy, c-format
msgid "%s %s no longer debugged."
msgstr "%s de %s sem depuração."
-#: server/stdinhand.c:2397 server/stdinhand.c:2427
+#: server/stdinhand.c:2403 server/stdinhand.c:2433
#, fuzzy, c-format
msgid "%s %s debugged."
msgstr "%s do %s em depuração."
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2419
#, fuzzy
msgid "Value 2 must be integer."
msgstr "Valor tem de ser um inteiro."
-#: server/stdinhand.c:2417
+#: server/stdinhand.c:2423
#, fuzzy, c-format
msgid "Unit %d does not exist."
msgstr "Pasta %s não existe"
-#: server/stdinhand.c:2475
+#: server/stdinhand.c:2464
#, fuzzy
msgid "Undefined argument. Usage: set <option> <value>."
msgstr "Argumento indefinido. Utilização: set <opção> <valor>."
-#: server/stdinhand.c:2485
+#: server/stdinhand.c:2473
#, fuzzy
msgid "You are not allowed to set this option."
msgstr "Você não está autorizado a definir esta opção."
-#: server/stdinhand.c:2490 server/stdinhand.c:3463
+#: server/stdinhand.c:2478 server/stdinhand.c:3501
#, 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:2502 server/stdinhand.c:2543
-#, fuzzy
-msgid "Value must be an integer."
-msgstr "Valor tem de ser um inteiro."
-
-#: server/stdinhand.c:2512
+#: server/stdinhand.c:2501
#, c-format
msgid "The parameter %s should only contain digits 0-1."
msgstr ""
-#: server/stdinhand.c:2519
+#: server/stdinhand.c:2508
#, fuzzy
msgid "Value out of range (minimum: 0, maximum: 1)."
msgstr "Valor fora do intervalo (mÃnimo: %d, máximo 1)."
-#: server/stdinhand.c:2534 server/stdinhand.c:2576
+#: server/stdinhand.c:2523 server/stdinhand.c:2565
#, fuzzy, c-format
msgid "Option: %s has been set to %d."
msgstr "Opção: %s foi alterada para %d."
-#: server/stdinhand.c:2554
+#: server/stdinhand.c:2543
#, c-format
msgid "The parameter %s should only contain +- and 0-9."
msgstr ""
-#: server/stdinhand.c:2561
+#: server/stdinhand.c:2550
#, 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:2586
+#: server/stdinhand.c:2575
#, 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:2600
+#: server/stdinhand.c:2589
#, fuzzy, c-format
msgid "Option: %s has been set to \"%s\"."
msgstr "Opção: %s foi alterada para \"%s\"."
-#: server/stdinhand.c:2658
+#: server/stdinhand.c:2652
#, 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:2661
+#: server/stdinhand.c:2655
msgid "Sorry, you can't take a global observer. Observe it instead."
msgstr ""
-#: server/stdinhand.c:2671
+#: server/stdinhand.c:2665
#, 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
+#: server/stdinhand.c:2673
#, c-format
msgid ""
"You cannot take a new player because the maximum of %d player has already "
@@ -5845,86 +5926,86 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: server/stdinhand.c:2691
+#: server/stdinhand.c:2685
msgid "You cannot take a new player because there are no free player slots."
msgstr ""
-#: server/stdinhand.c:2702
+#: server/stdinhand.c:2696
#, 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:2705
+#: server/stdinhand.c:2699
#, 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:2713
+#: server/stdinhand.c:2707
#, 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:2716
+#: server/stdinhand.c:2710
#, 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:2724
+#: server/stdinhand.c:2718
#, 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:2727
+#: server/stdinhand.c:2721
#, 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:2736
+#: server/stdinhand.c:2730
#, 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:2739
+#: server/stdinhand.c:2733
#, 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:2749
+#: server/stdinhand.c:2743
#, 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:2754
+#: server/stdinhand.c:2748
#, 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:2760
+#: server/stdinhand.c:2754
#, 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:2791
+#: server/stdinhand.c:2785
#, fuzzy
msgid "Usage: observe [connection-name [player-name]]"
msgstr "Utilização: take [nome-ligação] <nome-de-jogador>"
-#: server/stdinhand.c:2797
+#: server/stdinhand.c:2791
#, fuzzy
msgid "Usage: observe [player-name]"
msgstr "Utilização: take <nome-de-jogador>"
-#: server/stdinhand.c:2847
+#: server/stdinhand.c:2841
#, c-format
msgid "%s already controls %s. Using 'observe' would remove %s"
msgstr ""
-#: server/stdinhand.c:2858
+#: server/stdinhand.c:2852
#, fuzzy, c-format
msgid "%s is already observing %s."
msgstr "%s já é a versão mais recente.\n"
-#: server/stdinhand.c:2863
+#: server/stdinhand.c:2857
#, fuzzy, c-format
msgid "%s is already observing."
msgstr "%s já é a versão mais recente.\n"
@@ -5939,245 +6020,248 @@ msgstr "Lançar agora?"
msgid "%s now observes"
msgstr "Lançar agora?"
-#: server/stdinhand.c:2969
+#: server/stdinhand.c:2971
#, fuzzy
msgid "Usage: take <connection-name> <player-name>"
msgstr "Utilização: take [nome-ligação] <nome-de-jogador>"
-#: server/stdinhand.c:2974
+#: server/stdinhand.c:2976
#, fuzzy
msgid "Usage: take <player-name>"
msgstr "Utilização: take <nome-de-jogador>"
-#: server/stdinhand.c:2980
+#: server/stdinhand.c:2982
#, fuzzy
msgid "Usage: take [connection-name] <player-name>"
msgstr "Utilização: take [nome-ligação] <nome-de-jogador>"
-#: server/stdinhand.c:3010
+#: server/stdinhand.c:3012
#, fuzzy, c-format
msgid "%s already controls %s."
msgstr "'%s' já está ligado."
-#: server/stdinhand.c:3024
+#: server/stdinhand.c:3026
#, 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:3059
+#: server/stdinhand.c:3061
#, fuzzy, c-format
msgid "being detached from %s."
msgstr "Remover da Barra Rápida"
-#: server/stdinhand.c:3135
+#: server/stdinhand.c:3146
#, fuzzy, c-format
msgid "%s now controls %s (%s, %s)."
msgstr "Lançar agora?"
-#: server/stdinhand.c:3139 server/stdinhand.c:4260
+#: server/stdinhand.c:3150 server/stdinhand.c:4308
#: data/nation/barbarian.ruleset:3
msgid "Barbarian"
msgstr "Bárbaro"
-#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
+#: server/stdinhand.c:3152 server/stdinhand.c:4310 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-sdl/plrdlg.c:645
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr "IA"
-#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-gtk-2.0/pages.c:2125
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
+#: server/stdinhand.c:3153 server/stdinhand.c:4312
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-gtk-2.0/pages.c:2127
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/connectdlg.c:215
msgid "Human"
msgstr "Humano"
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-gtk-2.0/pages.c:2124 client/gui-win32/connectdlg.c:200
-#: client/gui-win32/connectdlg.c:212
+#: server/stdinhand.c:3155 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-gtk-2.0/pages.c:2126 client/gui-win32/connectdlg.c:202
+#: client/gui-win32/connectdlg.c:214
msgid "Alive"
msgstr "Ativar unidade"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3156 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-win32/connectdlg.c:202
msgid "Dead"
msgstr "Morto"
-#: server/stdinhand.c:3147
+#: server/stdinhand.c:3159
#, fuzzy, c-format
msgid "%s failed to attach to any player."
msgstr "%s não é um nome válido."
-#: server/stdinhand.c:3182
+#: server/stdinhand.c:3194
msgid "Usage: detach <connection-name>"
msgstr "Uso: detach <conexão>"
-#: server/stdinhand.c:3202
+#: server/stdinhand.c:3214
#, fuzzy
msgid "You can not detach other users."
msgstr "Você apenas pode ?? unidades de transporte."
-#: server/stdinhand.c:3211
+#: server/stdinhand.c:3223
#, fuzzy, c-format
msgid "%s is not attached to any player."
msgstr "%s não é um nome válido."
-#: server/stdinhand.c:3234
+#: server/stdinhand.c:3246
#, fuzzy, c-format
msgid "%s detaching from %s"
msgstr "A descompactar %s (desde %s) ...\n"
-#: server/stdinhand.c:3240
+#: server/stdinhand.c:3252
#, fuzzy, c-format
msgid "%s no longer observing."
msgstr "Os %s já não controlam %s! Tratado cancelado!"
-#: server/stdinhand.c:3259
+#: server/stdinhand.c:3271
#, fuzzy, c-format
msgid "detaching from %s."
msgstr "A descompactar %s (desde %s) ...\n"
-#: server/stdinhand.c:3345
+#: server/stdinhand.c:3361
msgid "Usage: load <game name>"
msgstr "Uso: load <jogo>"
-#: server/stdinhand.c:3350
+#: server/stdinhand.c:3366
#, fuzzy
msgid "Cannot load a game while another is running."
msgstr "O jogo já está sendo jogado."
-#: server/stdinhand.c:3372
+#: server/stdinhand.c:3388
#, c-format
msgid "Cannot find savegame or scenario with the name \"%s\"."
msgstr ""
-#: server/stdinhand.c:3389
+#: server/stdinhand.c:3405
#, fuzzy, c-format
msgid "Could not load savefile: %s"
msgstr "incapaz de ler ficheiro de regras \"%s\"."
-#: server/stdinhand.c:3458
+#: server/stdinhand.c:3496
#, fuzzy, c-format
msgid "Current ruleset directory is \"%s\""
msgstr "Directório de conjunto de regras actual é \"%s\""
-#: server/stdinhand.c:3478
+#: server/stdinhand.c:3516
#, fuzzy, c-format
msgid "Ruleset directory \"%s\" not found"
msgstr "Directório de conjunto de regras \"%s\" não encontrado"
-#: server/stdinhand.c:3484
+#: server/stdinhand.c:3522
#, fuzzy, c-format
msgid "Ruleset directory is already \"%s\""
msgstr "Directório de conjunto de regras actual é \"%s\""
-#: server/stdinhand.c:3488
+#: server/stdinhand.c:3526
#, fuzzy, c-format
msgid "Ruleset directory set to \"%s\""
msgstr "Directório de conjunto de regras definido como \"%s\""
-#: server/stdinhand.c:3536
+#: server/stdinhand.c:3574
msgid "Goodbye."
msgstr "Adeus."
-#: server/stdinhand.c:3567
+#: server/stdinhand.c:3606
#, 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:3603
+#: server/stdinhand.c:3656
#, 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:3608
+#: server/stdinhand.c:3661
#, fuzzy, c-format
msgid "Unknown command. Try '%shelp'."
msgstr "Comando desconhecido. Consulte '%shelp'."
-#: server/stdinhand.c:3625
-msgid "Your new vote canceled your previous vote."
+#: server/stdinhand.c:3675
+msgid "Your new vote cancelled your previous vote."
msgstr ""
-#: server/stdinhand.c:3633
-#, c-format
-msgid "New vote (number %d) by %s: %s."
+#: server/stdinhand.c:3688
+msgid "New teamvote"
msgstr ""
-#: server/stdinhand.c:3645
+#: server/stdinhand.c:3691
+msgid "New vote"
+msgstr ""
+
+#: server/stdinhand.c:3695
+#, fuzzy, c-format
+msgid "%s (number %d) by %s: %s"
+msgstr "%s sofreu um ataque nuclear dos %s."
+
+#: server/stdinhand.c:3704
#, c-format
msgid "Your new vote (\"%s\") was not legal or was not recognized."
msgstr ""
-#: 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:3680
+#: server/stdinhand.c:3726
#, fuzzy
msgid "(server prompt)"
msgstr "(linha de comando do servidor)"
-#: server/stdinhand.c:3787
+#: server/stdinhand.c:3835
#, fuzzy
msgid "Game ended in a draw."
msgstr "Jogo terminou com um empate"
-#: server/stdinhand.c:3791
+#: server/stdinhand.c:3839
msgid ""
"Ending the game. The server will restart once all clients have disconnected."
msgstr ""
-#: server/stdinhand.c:3796
+#: server/stdinhand.c:3844
#, fuzzy
msgid "Cannot end the game: no game running."
msgstr "Incapaz de terminar o jogo: nenhum jogo em curso."
-#: server/stdinhand.c:3812
+#: server/stdinhand.c:3860
#, c-format
msgid "%s has conceded the game and can no longer win."
msgstr ""
-#: server/stdinhand.c:3817
+#: server/stdinhand.c:3865
#, fuzzy
msgid "You cannot surrender now."
msgstr "Não é possÃvel imprimir durante a visualização da impressão."
-#: server/stdinhand.c:3883
+#: server/stdinhand.c:3931
#, 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
+#: server/stdinhand.c:3936
#, fuzzy
msgid "No players, game will not start."
msgstr "Não existem jogadores suficientes, o jogo não pode começar."
-#: server/stdinhand.c:3892
+#: server/stdinhand.c:3940
#, 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:3901
+#: server/stdinhand.c:3949
msgid "All players are ready; starting game."
msgstr ""
-#: server/stdinhand.c:3915
+#: server/stdinhand.c:3963
msgid ""
"Cannot start the game: the game is waiting for all clients to disconnect."
msgstr ""
-#: server/stdinhand.c:3922
+#: server/stdinhand.c:3970
#, fuzzy
msgid "Cannot start the game: it is already running."
msgstr "Incapaz de iniciar o jogo: este já foi iniciado."
-#: server/stdinhand.c:3953
+#: server/stdinhand.c:4001
#, fuzzy, c-format
msgid "Cutting connection %s."
msgstr "A terminar a ligação %s."
-#: server/stdinhand.c:3972
+#: server/stdinhand.c:4020
#, fuzzy
msgid ""
"Welcome - this is the introductory help text for the Freeciv server.\n"
@@ -6215,124 +6299,124 @@ msgstr ""
" save - para gravar o jogo actual\n"
" quit - para sair"
-#: server/stdinhand.c:4007 server/stdinhand.c:4010
+#: server/stdinhand.c:4055 server/stdinhand.c:4058
msgid "Command:"
msgstr "Comando:"
-#: server/stdinhand.c:4014
+#: server/stdinhand.c:4062
msgid "Synopsis: "
msgstr "Sinopse: "
-#: server/stdinhand.c:4023
+#: server/stdinhand.c:4071
#, c-format
msgid "Level: %s"
msgstr "NÃvel: %s"
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4096
#, fuzzy
msgid "The following server commands are available:"
msgstr "Os comandos de servidor disponÃveis são os seguintes:"
-#: server/stdinhand.c:4123
+#: server/stdinhand.c:4171
#, fuzzy, c-format
msgid "Help argument '%s' is ambiguous."
msgstr "O argumento da ajuda '%s' é ambÃguo."
-#: server/stdinhand.c:4128
+#: server/stdinhand.c:4176
#, 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:4194
+#: server/stdinhand.c:4242
#, fuzzy, c-format
msgid "Bad list argument: '%s'. Try '%shelp list'."
msgstr "Lista de argumentos inválida: '%s'. Consulte '%shelp list'."
-#: server/stdinhand.c:4234
+#: server/stdinhand.c:4282
msgid "List of players:"
msgstr "Lista de jogadores:"
-#: server/stdinhand.c:4239
+#: server/stdinhand.c:4287
msgid "<no players>"
msgstr "<nenhum jogador>"
-#: server/stdinhand.c:4256
+#: server/stdinhand.c:4304
#, c-format
msgid "user %s, "
msgstr "utilizador %s, "
-#: server/stdinhand.c:4267
+#: server/stdinhand.c:4315
msgid ", Dead"
msgstr ", Morto"
-#: server/stdinhand.c:4270
+#: server/stdinhand.c:4318
#, 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:4275 server/stdinhand.c:4279 client/helpdata.c:257
-#: client/helpdata.c:752 client/text.c:241 client/text.c:1224
-#: client/text.c:1262
+#: server/stdinhand.c:4323 server/stdinhand.c:4327 client/helpdata.c:257
+#: client/helpdata.c:752 client/text.c:241 client/text.c:1229
+#: client/text.c:1267
#, c-format
msgid "?clistmore:, %s"
msgstr ", %s"
-#: server/stdinhand.c:4283
+#: server/stdinhand.c:4331
msgid ", ready"
msgstr ", pronto"
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4333
msgid ", not ready"
msgstr ", não pronto"
-#: server/stdinhand.c:4293
+#: server/stdinhand.c:4341
#, c-format
msgid " %d connection:"
msgid_plural " %d connections:"
msgstr[0] " %d conexão:"
msgstr[1] " %d conexões:"
-#: server/stdinhand.c:4299
+#: server/stdinhand.c:4347
#, 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:4304
+#: server/stdinhand.c:4352
msgid " (observer mode)"
msgstr " (modo observador)"
-#: server/stdinhand.c:4322
+#: server/stdinhand.c:4370
msgid "List of teams:"
msgstr "Lista dos times:"
#. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4332
+#: server/stdinhand.c:4380
#, 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:4352
+#: server/stdinhand.c:4400
#, c-format
msgid "%2d : '%s' : 1 player : %s"
msgstr "%2d : '%s' : 1 jogador : %s"
-#: server/stdinhand.c:4360
+#: server/stdinhand.c:4408
#, c-format
msgid "Empty team: %s"
msgstr "Time vazio: %s"
-#: server/stdinhand.c:4371
+#: server/stdinhand.c:4419
msgid "List of connections to server:"
msgstr "Lista de conexões ao servidor:"
-#: server/stdinhand.c:4375
+#: server/stdinhand.c:4423
msgid "<no connections>"
msgstr "<nenhuma conexão>"
-#: server/stdinhand.c:4399
+#: server/stdinhand.c:4447
msgid "List of scenarios available:"
msgstr "Lista de cenários disponÃveis:"
@@ -6351,44 +6435,44 @@ msgstr "Mostrar Objectivos _Futuros"
msgid "%s acquired from %s!"
msgstr "Os %s adquiriram %s dos %s."
-#: server/techtools.c:220
+#: server/techtools.c:221
#, c-format
msgid ""
"Discovery of %s makes the government form %s available. You may want to "
"start a revolution."
msgstr ""
-#: server/techtools.c:301
+#: server/techtools.c:302
#, fuzzy, c-format
msgid "Discovery of %s OBSOLETES %s in %s!"
msgstr "Erro no formato"
-#: server/techtools.c:351
+#: server/techtools.c:352
#, c-format
msgid "Learned %s. Our scientists focus on %s; goal is %s."
msgstr ""
-#: server/techtools.c:369
+#: server/techtools.c:370
#, c-format
msgid "Learned %s. Scientists choose to research %s."
msgstr ""
-#: server/techtools.c:376
+#: server/techtools.c:377
#, c-format
msgid "Learned %s. "
msgstr "Aprendido %s. "
-#: server/techtools.c:379
+#: server/techtools.c:380
#, c-format
msgid "Researching %s."
msgstr "Pesquisando %s."
-#: server/techtools.c:385
+#: server/techtools.c:386
#, c-format
msgid "Learned %s. Scientists do not know what to research next."
msgstr ""
-#: server/techtools.c:402
+#: server/techtools.c:403
#, fuzzy
msgid ""
"Great scientists from all the world join your civilization: you get an "
@@ -6397,22 +6481,22 @@ msgstr ""
"Grandes filósofos de todo o mundo juntam-se à sua civilização; obtém um "
"avanço cientÃfico imediato."
-#: server/techtools.c:570
+#: server/techtools.c:571
#, fuzzy, c-format
msgid "Technology goal is %s."
msgstr "Falta %s; deixando %s"
-#: server/techtools.c:700
+#: server/techtools.c:708
#, fuzzy, c-format
msgid "You steal %s from the %s."
msgstr "Você recebeu a cidade %s dos %s."
-#: server/techtools.c:705
+#: server/techtools.c:713
#, fuzzy, c-format
msgid "The %s stole %s from you!"
msgstr "Você recebeu a cidade %s dos %s."
-#: server/techtools.c:710
+#: server/techtools.c:718
#, fuzzy, c-format
msgid "The %s have stolen %s from the %s."
msgstr "A descompactar %s (desde %s) ...\n"
@@ -6437,188 +6521,194 @@ msgstr "Nenhuma unidade pode ser actualizada."
msgid "%s upgraded to %s for %d gold."
msgstr "%s actualizado para %s por %d moedas."
-#: server/unithand.c:396
+#: server/unithand.c:402
#, fuzzy, c-format
msgid "%s refuses to disband!"
msgstr "desviado por %s para: %s\n"
-#: server/unithand.c:449
+#: server/unithand.c:455
#, fuzzy
msgid "Can't place city here."
msgstr "ImpossÃvel fundar uma cidade aqui."
-#: server/unithand.c:456
+#: server/unithand.c:462
#, fuzzy, c-format
msgid "Only %s can build a city."
msgstr "Apenas %s podem construir uma cidade."
-#: server/unithand.c:461
+#: server/unithand.c:467
#, fuzzy
msgid "Can't build a city."
msgstr "Incapaz de fundar uma cidade."
-#: server/unithand.c:470
+#: server/unithand.c:476
#, fuzzy, c-format
msgid "Only %s can add to a city."
msgstr "Apenas %s podem juntar-se a uma cidade."
-#: server/unithand.c:475
+#: server/unithand.c:481
#, fuzzy
msgid "Can't add to a city."
msgstr "Incapaz de se juntar a uma cidade."
-#: server/unithand.c:481
+#: server/unithand.c:487
#, fuzzy, c-format
msgid "%s unit has no moves left to add to %s."
msgstr "Unidade %s não possui mais pontos de movimento para adicionar a %s."
-#: server/unithand.c:487
+#: server/unithand.c:493
#, fuzzy, c-format
msgid "%s unit has no moves left to build city."
msgstr "Unidade %s não possui mais pontos de movimento para fundar cidade."
-#: server/unithand.c:492
+#. TRANS: <city> is owned by <nation>, cannot add <unit>.
+#: server/unithand.c:499
+#, fuzzy, c-format
+msgid "%s is owned by %s, cannot add %s."
+msgstr "%s é demasiado grande para se juntar a %s."
+
+#: server/unithand.c:506
#, fuzzy, c-format
msgid "%s is too big to add %s."
msgstr "%s é demasiado grande para se juntar a %s."
-#: server/unithand.c:498
+#: server/unithand.c:512
#, c-format
msgid "%s needs an improvement to grow, so you cannot add %s."
msgstr ""
-#: server/unithand.c:509
+#: server/unithand.c:523
#, fuzzy, c-format
msgid "Can't add %s to %s."
msgstr "Não pode juntar %s a %s."
-#: server/unithand.c:531
+#: server/unithand.c:545
#, fuzzy, c-format
msgid "%s added to aid %s in growing."
msgstr "%s adicionados para ajudar %s a crescer."
-#: server/unithand.c:828
+#: server/unithand.c:842
#, fuzzy
msgid "Your Nuclear missile was shot down by SDI defences, what a waste."
msgstr "O seu missÃl Nuclear foi abatido por defesas SDI, que desperdÃcio."
-#: server/unithand.c:831
+#: server/unithand.c:845
#, fuzzy, c-format
msgid "The nuclear attack on %s was avoided by your SDI defense."
msgstr "O ataque nuclear a %s foi evitado pelas suas defesas SDI."
#. TRANS: "Your Cannon ... the Polish Destroyer."
-#: server/unithand.c:901
+#: server/unithand.c:915
#, fuzzy, c-format
msgid "Your %s survived the pathetic attack from the %s %s."
msgstr "Os seus %s sobreviveram ao patético ataque dos %s, unidade %s."
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unithand.c:910
+#: server/unithand.c:924
#, fuzzy, c-format
msgid "Your attacking %s failed against the %s %s!"
msgstr "Os seus %s atacantes falharam contra os %s, %s!"
-#: server/unithand.c:983
+#: server/unithand.c:997
#, fuzzy, c-format
msgid "Only %s can attack from sea."
msgstr "Apenas %s podem atacar a partir do mar."
-#: server/unithand.c:988
+#: server/unithand.c:1002
#, fuzzy
msgid "Cannot attack from sea."
msgstr "Não pode atacar a partir do mar."
-#: server/unithand.c:996 server/unittools.c:2137
+#: server/unithand.c:1010 server/unittools.c:2142
#, fuzzy
msgid "Cannot attack unless you declare war first."
msgstr "Não pode atacar sem primeiro declarar guerra."
-#: server/unithand.c:1001
+#: server/unithand.c:1015
#, fuzzy, c-format
msgid "%s can only move into your own zone of control."
msgstr "%s apenas se podem mover para a sua zona de controlo."
-#: server/unithand.c:1007
+#: server/unithand.c:1021
#, fuzzy, c-format
msgid "Cannot invade unless you break peace with %s first."
msgstr "Não pode atacar sem primeiro declarar guerra."
-#: server/unithand.c:1052
+#: server/unithand.c:1066
#, fuzzy
msgid "This unit has no moves left."
msgstr "Esta unidade não possui mais pontos de movimento."
-#: server/unithand.c:1107
+#: server/unithand.c:1121
#, fuzzy
msgid "Unit must be on land to perform diplomatic action."
msgstr "* Pode executar acções diplomáticas.\n"
-#: server/unithand.c:1109
+#: server/unithand.c:1123
#, fuzzy
msgid "No diplomat action possible."
msgstr "Nenhuma acção diplomática possÃvel."
-#: server/unithand.c:1125
+#: server/unithand.c:1139
#, c-format
msgid "You must declare war on %s first. Try using players dialog (F3)."
msgstr ""
-#: server/unithand.c:1143
+#: server/unithand.c:1157
msgid "This unit is being transported, and so cannot bombard."
msgstr ""
-#: server/unithand.c:1158
+#: server/unithand.c:1172
#, fuzzy
msgid "You can't attack there."
msgstr "Não pode atacar aqui."
-#: server/unithand.c:1180
+#: server/unithand.c:1194
#, fuzzy
msgid "This type of troops cannot take over a city."
msgstr "Só as unidades nucleares podem fazer isso."
-#: server/unithand.c:1198
+#: server/unithand.c:1212
msgid "A transported unit is not allied to all units or city on target tile."
msgstr ""
-#: server/unithand.c:1240
+#: server/unithand.c:1254
#, fuzzy, c-format
msgid "Your %s helps build the %s in %s (%d remaining)."
msgstr "A sua %s ajuda a construir %s em %s (faltam %d)."
-#: server/unithand.c:1242
+#: server/unithand.c:1256
#, fuzzy, c-format
msgid "Your %s helps build the %s in %s (%d surplus)."
msgstr "A sua %s ajuda a construir %s em %s (%d excedente)."
-#: server/unithand.c:1286
+#: server/unithand.c:1300
#, c-format
msgid ""
"Sorry, your %s cannot establish a trade route because it has no home city"
msgstr ""
-#: server/unithand.c:1296
+#: server/unithand.c:1310
#, c-format
msgid "Sorry, your %s cannot establish a trade route between %s and %s"
msgstr ""
-#: server/unithand.c:1325 server/unithand.c:1344
+#: server/unithand.c:1339 server/unithand.c:1358
#, fuzzy, c-format
msgid "Sorry, your %s cannot establish a trade route here!"
msgstr "Desculpe, os seus %s não podem estabelecer uma rota comercial aqui!"
-#: server/unithand.c:1329 server/unithand.c:1348
+#: server/unithand.c:1343 server/unithand.c:1362
#, c-format
msgid " The city of %s already has %d better trade routes!"
msgstr ""
-#: server/unithand.c:1361 server/unithand.c:1373
+#: server/unithand.c:1375 server/unithand.c:1387
#, c-format
msgid "Sorry, %s has canceled the trade route from %s to your city %s."
msgstr ""
-#: server/unithand.c:1406
+#: server/unithand.c:1420
#, fuzzy, c-format
msgid ""
"Your %s from %s has arrived in %s, and revenues amount to %d in gold and "
@@ -6679,55 +6769,55 @@ msgid "Teleported your %s to %s."
msgstr "O seu %s voltou para se reabastecer."
#. TRANS: A unit is moved to resolve stack conflicts.
-#: server/unittools.c:1065
+#: server/unittools.c:1070
#, fuzzy, c-format
msgid "Moved your %s."
msgstr "Seu nome:"
-#: server/unittools.c:1076
+#: server/unittools.c:1081
#, fuzzy, c-format
msgid "Disbanded your %s."
msgstr "Seu nome:"
-#: server/unittools.c:1397
+#: server/unittools.c:1402
#, c-format
msgid "Unable to defend %s, %s has lost the game."
msgstr ""
-#: server/unittools.c:1401
+#: server/unittools.c:1406
#, c-format
msgid "Losing %s meant losing the game! Be more careful next time!"
msgstr ""
-#: server/unittools.c:1503
+#: server/unittools.c:1508
#, c-format
msgid "%s escaped the destruction of %s, and fled to %s."
msgstr ""
-#: server/unittools.c:1512
+#: server/unittools.c:1517
#, fuzzy, c-format
msgid "%s lost when %s was lost."
msgstr "%s perdida quando %s foi perdida."
-#: server/unittools.c:1561
+#: server/unittools.c:1566
#, fuzzy, c-format
msgid "Barbarian leader captured, %d gold ransom paid."
msgstr "Lider bárbaro capturado, recebidas %d moedas de resgate."
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unittools.c:1579
+#: server/unittools.c:1584
#, fuzzy, c-format
msgid "Your attacking %s succeeded against the %s %s!"
msgstr "Os seus %s atacantes venceram contra os %s, %s!"
#. TRANS: "Cannon ... the Polish Destroyer."
-#: server/unittools.c:1588 server/unittools.c:1646
+#: server/unittools.c:1593 server/unittools.c:1651
#, fuzzy, c-format
msgid "%s lost to an attack by the %s %s."
msgstr "%s perdida num ataque dos %s, unidade %s."
#. TRANS: "... Cannon ... the Polish Destroyer ...."
-#: server/unittools.c:1622
+#: server/unittools.c:1627
#, fuzzy, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -6737,14 +6827,14 @@ msgstr[1] "Os seus %s atacantes venceram contra os %s, %s (%d)!"
#. TRANS: "Cannon lost when the Polish Destroyer
#. * attacked the German Musketeers."
-#: server/unittools.c:1655
+#: server/unittools.c:1660
#, fuzzy, c-format
msgid "%s lost when the %s %s attacked the %s %s."
msgstr "%s perdida quando %s foi perdida."
#. TRANS: "Musketeers (and Cannon) lost to an
#. * attack from the Polish Destroyer."
-#: server/unittools.c:1670
+#: server/unittools.c:1675
#, fuzzy, c-format
msgid "%s (and %s) lost to an attack from the %s %s."
msgstr "A conta de origem e a conta de destino não podem ser a mesma."
@@ -6752,7 +6842,7 @@ msgstr "A conta de origem e a conta de destino não podem ser a mesma."
#. TRANS: "Musketeers and 3 other units lost to
#. * an attack from the Polish Destroyer."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1680
+#: server/unittools.c:1685
#, fuzzy, 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."
@@ -6762,189 +6852,231 @@ msgstr[1] "Você apenas pode ?? unidades de transporte."
#. TRANS: "2 units lost when the Polish Destroyer
#. * attacked the German Musketeers."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1694
+#: server/unittools.c:1699
#, fuzzy, 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 Percentagem de comida perdida por necessitar de aqueduto"
msgstr[1] "%d Mudando a produção de todos os %s para %s."
-#: server/unittools.c:1962
+#: server/unittools.c:1967
#, fuzzy, c-format
msgid "Your %s was nuked by %s."
msgstr "O seu %s foi atacado com armas nucleares por %s."
-#: server/unittools.c:1965 server/unittools.c:1981
+#: server/unittools.c:1970 server/unittools.c:1986
msgid "yourself"
msgstr "você próprio"
-#: server/unittools.c:1969
+#: server/unittools.c:1974
#, fuzzy, c-format
msgid "The %s %s was nuked."
msgstr "%s, unidade %s, sofreu um ataque nuclear."
-#: server/unittools.c:1978
+#: server/unittools.c:1983
#, fuzzy, c-format
msgid "%s was nuked by %s."
msgstr "%s sofreu um ataque nuclear dos %s."
-#: server/unittools.c:1986
+#: server/unittools.c:1991
#, fuzzy, c-format
msgid "You nuked %s."
msgstr "Você atacou os %s com armas nucleares."
-#: server/unittools.c:2027
+#: server/unittools.c:2032
#, fuzzy, c-format
msgid "The %s detonated a nuke!"
msgstr "%s detonou uma arma nuclear!"
-#: server/unittools.c:2051
+#: server/unittools.c:2056
#, fuzzy, c-format
msgid "%s transported successfully."
msgstr "%s transportado com sucesso."
-#: server/unittools.c:2103
+#: server/unittools.c:2108
#, fuzzy
msgid "This unit type can not be paradropped."
msgstr "Este tipo de unidade não pode ser lançada de paraquedas."
-#: server/unittools.c:2113
+#: server/unittools.c:2118
#, fuzzy
msgid "You cannot paradrop a unit that is transporting other units."
msgstr "Você apenas pode ?? unidades de transporte."
-#: server/unittools.c:2119
+#: server/unittools.c:2124
#, fuzzy
msgid "The destination location is not known."
msgstr "O local de destino não é conhecido."
-#: server/unittools.c:2126
+#: server/unittools.c:2131
#, fuzzy, c-format
msgid "This unit cannot paradrop into %s."
msgstr "Você não possui mais pontos de movimento"
-#: server/unittools.c:2146
+#: server/unittools.c:2151
#, fuzzy, c-format
msgid "The distance to the target (%i) is greater than the unit's range (%i)."
msgstr "A distância para o alvo (%i) é maior do que o alcance da unidade (%i)."
-#: server/unittools.c:2157
+#: server/unittools.c:2162
#, fuzzy, c-format
msgid "Your %s paradropped into the %s and was lost."
msgstr "Mudando a produção de todos os %s para %s."
-#: server/unittools.c:2170
+#: server/unittools.c:2175
#, fuzzy, c-format
msgid "Your %s was killed by enemy units at the paradrop destination."
msgstr ""
"Os seus %s foram mortos por unidades inimigas no destino do lançamento de "
"paraquedas."
-#: server/unittools.c:2192
+#: server/unittools.c:2197
#, fuzzy, c-format
msgid "You found %d gold."
msgstr "Você encontrou %d moedas."
-#: server/unittools.c:2209
+#: server/unittools.c:2214
#, fuzzy, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr "Você encontrou %s em antigos pergaminhos de sabedoria."
-#: server/unittools.c:2216
+#: server/unittools.c:2221
#, fuzzy, c-format
msgid "The %s have acquired %s from ancient scrolls of wisdom."
msgstr "Os %s adquiriram %s em antigos pergaminhos de sabedoria."
-#: server/unittools.c:2230
+#: server/unittools.c:2235
#, fuzzy
msgid "A band of friendly mercenaries joins your cause."
msgstr "Um bando de mercenários amistosos juntam-se à sua causa."
-#: server/unittools.c:2248
+#: server/unittools.c:2253
#, fuzzy
msgid "An abandoned village is here."
msgstr "Existe aqui uma povoação abandonada."
-#: server/unittools.c:2258
+#: server/unittools.c:2263
#, fuzzy
msgid "You have unleashed a horde of barbarians!"
msgstr "Você incitou uma horda de bárbaros!"
-#: server/unittools.c:2261
+#: server/unittools.c:2266
#, fuzzy, c-format
msgid "Your %s has been killed by barbarians!"
msgstr "O seu %s foi morto por bárbaros!"
-#: server/unittools.c:2277
+#: server/unittools.c:2282
#, fuzzy
msgid "You found a friendly city."
msgstr "Você encontrou uma cidade amistosa."
-#: server/unittools.c:2291
+#: server/unittools.c:2296
#, fuzzy
msgid "Friendly nomads are impressed by you, and join you."
msgstr "Você impressiona nómadas amistosos, que se juntam à sua causa."
-#: server/unittools.c:2316
+#: server/unittools.c:2321
#, fuzzy
msgid "Your overflight frightens the tribe; they scatter in terror."
msgstr "O seu vôo rasante assusta a tribo; eles dispersam em terror."
-#: server/unittools.c:2574
+#: server/unittools.c:2579
#, c-format
msgid "Orders for %s aborted after enemy movement was spotted."
msgstr ""
-#: server/unittools.c:3023
+#: server/unittools.c:3028
#, c-format
msgid "Orders for %s aborted as there are units nearby."
msgstr ""
-#: server/unittools.c:3075
+#: server/unittools.c:3080
#, c-format
msgid "Orders for %s aborted because building of city failed."
msgstr ""
-#: server/unittools.c:3088
+#: server/unittools.c:3093
#, c-format
msgid "Orders for %s aborted since they give an invalid activity."
msgstr ""
-#: server/unittools.c:3102
+#: server/unittools.c:3107
#, c-format
msgid "Orders for %s aborted since they give an invalid location."
msgstr ""
-#: server/unittools.c:3112
+#: server/unittools.c:3117
#, c-format
msgid "Orders for %s aborted as there are units in the way."
msgstr ""
-#: server/unittools.c:3138
+#: server/unittools.c:3143
#, c-format
msgid "Orders for %s aborted because of failed move."
msgstr ""
-#: server/unittools.c:3179
+#: server/unittools.c:3184
#, fuzzy, c-format
msgid "Attempt to change homecity for %s failed."
msgstr "Mudando a cidade natal de %s em %s."
-#: server/unittools.c:3190
+#: server/unittools.c:3195
#, fuzzy, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr "Estabelece rota comercial"
-#: server/unittools.c:3202
+#: server/unittools.c:3207
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr ""
-#: server/unittools.c:3211
+#: server/unittools.c:3216
#, fuzzy, c-format
msgid "Your %s has invalid orders."
msgstr "A Sua Caravana Chegou"
+#: server/voting.c:522
+#, c-format
+msgid ""
+"%s %d \"%s\" is passed %d to %d with %d abstentions and %d who did not vote."
+msgstr ""
+
+#: server/voting.c:528
+#, c-format
+msgid ""
+"%s %d \"%s\" failed with %d against, %d for, %d abstentions and %d who did "
+"not vote."
+msgstr ""
+
+#: server/voting.c:548
+#, c-format
+msgid "%s %d: %s voted yes."
+msgstr ""
+
+#: server/voting.c:553
+#, c-format
+msgid "%s %d: %s voted no."
+msgstr ""
+
+#: server/voting.c:558
+#, c-format
+msgid "%s %d: %s chose to abstain."
+msgstr ""
+
+#. TRANS: Describing a new vote that can only pass
+#. * if there are no dissenting votes.
+#: server/voting.c:726
+#, c-format
+msgid "%s (needs %0.0f%% and no dissent)."
+msgstr ""
+
+#. TRANS: Describing a new vote that can pass only if the
+#. * given percentage of players votes 'yes'.
+#: server/voting.c:732
+#, c-format
+msgid "%s (needs %0.0f%% in favor)."
+msgstr ""
+
#: server/generator/mapgen.c:1771
#, fuzzy
msgid "High landmass - this may take a few seconds."
@@ -6974,12 +7106,12 @@ msgid ""
"Please report this bug at %s."
msgstr ""
-#: client/attribute.c:363
+#: client/attribute.c:368
msgid ""
"There has been a CMA error. Your citizen governor settings may be broken."
msgstr ""
-#: client/attribute.c:367
+#: client/attribute.c:372
msgid "Old attributes detected and removed."
msgstr ""
@@ -7132,42 +7264,42 @@ msgstr "Novos cidadãos são"
msgid "%+4d : Taxed from trade\n"
msgstr "Comércio total das rotas comerciais: %d"
-#: client/citydlg_common.c:418
+#: client/citydlg_common.c:421
#, fuzzy, c-format
msgid "%+4d : Trade route with %s\n"
msgstr "Estas rotas comerciais foram estabelecidas com %s:\n"
-#: client/citydlg_common.c:427
+#: client/citydlg_common.c:430
#, fuzzy, c-format
msgid "%+4d : Building tithes\n"
msgstr "Construindo Ãrvore de Dependências"
-#: client/citydlg_common.c:450
+#: client/citydlg_common.c:453
#, fuzzy, c-format
msgid "%+4d : Bonus from %s (%+d%%)\n"
msgstr "Remover da Barra Rápida"
-#: client/citydlg_common.c:462
+#: client/citydlg_common.c:465
#, fuzzy, c-format
msgid "%+4d : Waste\n"
msgstr "?waste:Des"
-#: client/citydlg_common.c:468
+#: client/citydlg_common.c:471
#, fuzzy, c-format
msgid "%+4d : Disorder\n"
msgstr "Desordem pública em %s."
-#: client/citydlg_common.c:474
+#: client/citydlg_common.c:477
#, fuzzy, c-format
msgid "%+4d : Used\n"
msgstr "Nome do tema utilizado"
-#: client/citydlg_common.c:479
+#: client/citydlg_common.c:482
#, fuzzy
msgid "==== : Adds up to\n"
msgstr "desviado por %s para: %s\n"
-#: client/citydlg_common.c:481
+#: client/citydlg_common.c:484
#, c-format
msgid "%4d : Total surplus"
msgstr "%4d : Excedente total"
@@ -7488,53 +7620,53 @@ msgstr "E"
msgid "Specialists"
msgstr "Especialistas"
-#: client/civclient.c:240
+#: client/civclient.c:241
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr " -a, --autoconnect\tSaltar diálogo de conexão\n"
-#: client/civclient.c:250
+#: client/civclient.c:251
msgid " -l, --log FILE\tUse FILE as logfile (spawned server also uses this)\n"
msgstr " -l, --log ARQUIVO\tUsa ARQUIVO como arquivo de registo\n"
-#: client/civclient.c:252
+#: client/civclient.c:253
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr " -m, --meta SERVIDOR\tConecta ao metaservidor em SERVIDOR\n"
-#: client/civclient.c:254
+#: client/civclient.c:255
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr " -n, --name NOME\tUtilizar NOME como nome\n"
-#: client/civclient.c:256
+#: client/civclient.c:257
#, fuzzy
msgid " -p, --port PORT\tConnect to server port PORT (usually with -a)\n"
msgstr " -p, --port PORTA\tConectar a porta do servidor PORTA\n"
-#: client/civclient.c:258
+#: client/civclient.c:259
#, c-format
msgid " -P, --Plugin PLUGIN\tUse PLUGIN for sound output %s\n"
msgstr " -P, --Plugin PLUGIN\tUtilizar PLUGIN para saida de som %s\n"
-#: client/civclient.c:260
+#: client/civclient.c:261
#, fuzzy
msgid " -r, --read FILE\tRead startup script FILE (for spawned server only)\n"
msgstr " -r, --read\t\tLê roteiro inicial\n"
-#: client/civclient.c:263
+#: client/civclient.c:264
#, fuzzy
msgid " -s, --server HOST\tConnect to the server at HOST (usually with -a)\n"
msgstr " -s, --server SERVIDOR\tLigar ao servidor em SERVIDOR\n"
-#: client/civclient.c:265
+#: client/civclient.c:266
#, fuzzy
msgid " -S, --Sound FILE\tRead sound tags from FILE\n"
msgstr " -S, --Sound FICHEIRO\tLer etiquetas de som em FICHEIRO\n"
-#: client/civclient.c:266
+#: client/civclient.c:267
#, fuzzy
msgid " -t, --tiles FILE\tUse data file FILE.tilespec for tiles\n"
msgstr " -t, --tiles FICHEIRO\t\tUtilizar FICHEIRO.tilespec para mapa\n"
-#: client/civclient.c:269
+#: client/civclient.c:270
#, fuzzy, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7544,45 +7676,45 @@ msgstr ""
"\t\t\tTente \"%s -- --help\" para mais informações.\n"
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:274
+#: client/civclient.c:275
#, fuzzy, c-format
msgid "Report bugs at %s\n"
msgstr "Informe bugs a %s.\n"
-#: client/civclient.c:298
+#: client/civclient.c:299
#, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr ""
-#: client/civclient.c:300 client/civclient.c:315
+#: client/civclient.c:301 client/civclient.c:316
msgid "Try using --help.\n"
msgstr "Tente usar --help.\n"
-#: client/civclient.c:313
+#: client/civclient.c:314
#, c-format
msgid "Invalid debug level \"%s\" specified with --debug option.\n"
msgstr "NÃvel de depuração inválido \"%s\" especificado com a opção --debug.\n"
-#: client/civclient.c:326
+#: client/civclient.c:327
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr "Opção desconhecida: \"%s\"\n"
-#: client/civclient.c:391
+#: client/civclient.c:393
#, fuzzy, c-format
msgid "Updating old metaserver address \"%s\"."
msgstr "metaservidor <endereço>"
-#: client/civclient.c:394
+#: client/civclient.c:396
#, fuzzy, c-format
msgid "Default metaserver has been set to \"%s\"."
msgstr "Opção: %s foi alterada para \"%s\"."
-#: client/civclient.c:550
+#: client/civclient.c:540
msgid "Game started."
msgstr "Jogo iniciado."
-#: client/civclient.c:588
+#: client/civclient.c:606
msgid "There was an error while auto connecting; aborting."
msgstr "Ocorreu um erro ao conectar automaticamente; abortando."
@@ -7714,18 +7846,18 @@ msgstr "Conexão em progresso."
msgid "Disconnected from server."
msgstr "Desconectado do servidor."
-#: client/clinet.c:469
+#: client/clinet.c:473
#, fuzzy, c-format
msgid "Failed to contact server \"%s\" at port %d as \"%s\" after %d attempts"
msgstr ""
"Falha ao contactar servidor \"%s\" no porto %d como \"%s\" após %d tentativas"
-#: client/clinet.c:484 client/clinet.c:486
+#: client/clinet.c:488 client/clinet.c:490
#, fuzzy
msgid "Connection to server refused. Please start the server."
msgstr "Ligação ao servidor recusada. Inicie o servidor."
-#: client/clinet.c:495 client/clinet.c:523
+#: client/clinet.c:499 client/clinet.c:527
#, fuzzy, c-format
msgid ""
"Error contacting server \"%s\" at port %d as \"%s\":\n"
@@ -7734,59 +7866,59 @@ msgstr ""
"Erro ao contactar servidor \"%s\" no porto %d como \"%s\":\n"
" %s\n"
-#: client/clinet.c:514
+#: client/clinet.c:518
#, c-format
msgid ""
"Auto-connecting to server \"%s\" at port %d as \"%s\" every %f second(s) for "
"%d times"
msgstr ""
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
+#: client/connectdlg_common.c:78 client/gui-gtk-2.0/pages.c:1358
msgid "novice"
msgstr "iniciante"
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1358
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
msgid "easy"
msgstr "fácil"
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1359
msgid "normal"
msgstr "normal"
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr "difÃcil"
-#: client/connectdlg_common.c:83
+#: client/connectdlg_common.c:82
msgid "experimental"
msgstr ""
-#: client/connectdlg_common.c:213
+#: client/connectdlg_common.c:212
msgid "Starting server..."
msgstr "Iniciando servidor..."
-#: client/connectdlg_common.c:332
+#: client/connectdlg_common.c:331
msgid "Couldn't start the server."
msgstr "ImpossÃvel iniciar o servidor."
-#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
+#: client/connectdlg_common.c:332 client/connectdlg_common.c:365
msgid "You'll have to start one manually. Sorry..."
msgstr ""
-#: client/connectdlg_common.c:364
+#: client/connectdlg_common.c:363
msgid "Couldn't connect to the server."
msgstr "ImpossÃvel conectar ao servidor."
-#: client/connectdlg_common.c:365
+#: client/connectdlg_common.c:364
msgid "We probably couldn't start it from here."
msgstr ""
-#: client/connectdlg_common.c:470
+#: client/connectdlg_common.c:469
msgid ""
"Established control over the server. You have command access level 'hack'."
msgstr ""
-#: client/connectdlg_common.c:475
+#: client/connectdlg_common.c:474
msgid ""
"Failed to obtain the required access level to take control of the server. "
"The server will now be shutdown."
@@ -7796,27 +7928,27 @@ msgstr ""
msgid "Only transporter units can be unloaded."
msgstr "Apenas as unidades de transporte podem ser descarregadas."
-#: client/control.c:1425
+#: client/control.c:1417
msgid "Only settler units can be put into auto mode."
msgstr "Somente colonos podem ser colocados em modo automático."
-#: client/control.c:1516
+#: client/control.c:1511
msgid "Only nuclear units can do this."
msgstr "Só as unidades nucleares podem fazer isso."
-#: client/control.c:1545
+#: client/control.c:1540
msgid "Only paratrooper units can do this."
msgstr "Apenas as unidades páraquedistas podem fazer isso."
-#: client/control.c:2020
+#: client/control.c:2015
msgid "Too far for this unit."
msgstr "Muito longe para esta unidade."
-#: client/control.c:2230 client/control.c:2260 client/control.c:2276
+#: client/control.c:2225 client/control.c:2255 client/control.c:2271
msgid "Didn't find a route to the destination!"
msgstr "Incapaz de encontrar uma rota para o destino!"
-#: client/control.c:2320
+#: client/control.c:2315
msgid "Oh my! You seem to have no capital!"
msgstr "Oh! Parece que você não tem uma capital!"
@@ -8242,27 +8374,34 @@ msgstr ""
#. * last two elements
#. TRANS: List of possible output types has this between
#. * last two elements
-#: client/helpdata.c:1066 client/helpdata.c:1400
+#: client/helpdata.c:1066 client/helpdata.c:1408
msgid " or "
msgstr " ou "
-#: client/helpdata.c:1068 client/helpdata.c:1388
+#: client/helpdata.c:1068 client/helpdata.c:1396
msgid "?or:, "
msgstr "?or:, "
-#: client/helpdata.c:1080
+#: client/helpdata.c:1079
+#, fuzzy, c-format
+msgid "* Unit has to be in a city, or a base after %d turn.\n"
+msgid_plural "* Unit has to be in a city, or a base 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:1087
#, 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"
+msgid "* Unit has to be in a city, a base, or on a %s after %d turn.\n"
+msgid_plural "* Unit has to be in a city, a base, 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:1122
+#: client/helpdata.c:1130
#, 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:1127
+#: client/helpdata.c:1135
#, fuzzy, c-format
msgid ""
"To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8271,95 +8410,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:1135
+#: client/helpdata.c:1143
#, fuzzy
msgid "You cannot research this technology."
msgstr "Você não pode assinar digitalmente esta mensagem."
-#: client/helpdata.c:1139
+#: client/helpdata.c:1147
#, 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:1151
+#: client/helpdata.c:1159
#, 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:1156
+#: client/helpdata.c:1164
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
msgstr ""
-#: client/helpdata.c:1159
+#: client/helpdata.c:1167
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
msgstr ""
-#: client/helpdata.c:1163
+#: client/helpdata.c:1171
#, fuzzy
msgid "* Increases the pollution generated by the population.\n"
msgstr "Aumenta a poluição gerada pela população.\n"
-#: client/helpdata.c:1168
+#: client/helpdata.c:1176
#, 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:1175
+#: client/helpdata.c:1183
#, fuzzy, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr "Falha ao processar as dependências de compilação"
-#: client/helpdata.c:1183
+#: client/helpdata.c:1191
#, fuzzy, c-format
msgid "* Allows %s to build airbases.\n"
msgstr "Falha ao processar as dependências de compilação"
-#: client/helpdata.c:1192
+#: client/helpdata.c:1200
#, 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:1200
+#: client/helpdata.c:1208
#, 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:1234
+#: client/helpdata.c:1242
msgid "* Pollution cannot be generated on this terrain."
msgstr ""
-#: client/helpdata.c:1239
+#: client/helpdata.c:1247
#, fuzzy
msgid "* You cannot build cities on this terrain."
msgstr "Não é possÃvel comprar em uma cidade criada neste turno."
-#: client/helpdata.c:1245
+#: client/helpdata.c:1253
msgid "* The coastline of this terrain is unsafe."
msgstr ""
-#: client/helpdata.c:1250
+#: client/helpdata.c:1258
msgid "* This terrain is unsafe for units to travel on."
msgstr ""
-#: client/helpdata.c:1255
+#: client/helpdata.c:1263
msgid "* Land units cannot travel on oceanic terrains."
msgstr ""
-#: client/helpdata.c:1305
+#: client/helpdata.c:1313
msgid "Features:\n"
msgstr "Recursos:\n"
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1411 client/helpdata.c:1412
+#: client/helpdata.c:1419 client/helpdata.c:1420
msgid "?outputlist: Nothing "
msgstr ""
-#: client/helpdata.c:1419
+#: client/helpdata.c:1427
#, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -8370,7 +8509,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1429
+#: client/helpdata.c:1437
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8378,48 +8517,48 @@ msgid ""
msgstr ""
#. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1437
+#: client/helpdata.c:1445
#, c-format
msgid "* You pay %d times normal %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1442
+#: client/helpdata.c:1450
#, 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:1447
+#: client/helpdata.c:1455
#, c-format
msgid "* You pay no %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1451
+#: client/helpdata.c:1459
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:1460
+#: client/helpdata.c:1468
#, 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:1468
+#: client/helpdata.c:1476
#, c-format
msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
msgstr ""
-#: client/helpdata.c:1475
+#: client/helpdata.c:1483
#, 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:1482
+#: client/helpdata.c:1490
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -8427,23 +8566,23 @@ msgid ""
msgstr ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1489
+#: client/helpdata.c:1497
#, 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:1497
+#: client/helpdata.c:1505
#, c-format
msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
msgstr ""
-#: client/helpdata.c:1502
+#: client/helpdata.c:1510
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr ""
-#: client/helpdata.c:1507
+#: client/helpdata.c:1515
#, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -8454,7 +8593,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: client/helpdata.c:1519
+#: client/helpdata.c:1527
#, 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"
@@ -8462,64 +8601,64 @@ msgstr[0] ""
msgstr[1] ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1530
+#: client/helpdata.c:1538
#, 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:1536
+#: client/helpdata.c:1544
#, fuzzy
msgid "* Your units cannot be bribed.\n"
msgstr "Você não possui mais pontos de movimento"
-#: client/helpdata.c:1539
+#: client/helpdata.c:1547
#, fuzzy
msgid "* Your cities cannot be incited.\n"
msgstr "%s não pode manter %s, unidade debandada."
-#: client/helpdata.c:1543
+#: client/helpdata.c:1551
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:1549
+#: client/helpdata.c:1557
msgid "* Has a senate that may prevent declaration of war.\n"
msgstr ""
-#: client/helpdata.c:1553
+#: client/helpdata.c:1561
msgid "* Allows partisans when cities are taken by the enemy.\n"
msgstr ""
-#: client/helpdata.c:1557
+#: client/helpdata.c:1565
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
msgstr ""
-#: client/helpdata.c:1561
+#: client/helpdata.c:1569
msgid "* Pays no upkeep for fanatics.\n"
msgstr ""
-#: client/helpdata.c:1564
+#: client/helpdata.c:1572
#, fuzzy
msgid "* Has no unhappy citizens.\n"
msgstr " %s não possui entrada override\n"
-#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
+#: client/helpdata.c:1582 client/helpdata.c:1586 client/helpdata.c:1590
#, fuzzy, c-format
msgid "* Veteran %s units.\n"
msgstr "Unidades suportadas %d"
-#: client/helpdata.c:1585
+#: client/helpdata.c:1593
#, fuzzy
msgid "* Veteran units.\n"
msgstr "Unidades suportadas %d"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1591
+#: client/helpdata.c:1599
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8527,7 +8666,7 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1600
+#: client/helpdata.c:1608
#, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8535,71 +8674,71 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1608
+#: client/helpdata.c:1616
#, 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:1617
+#: client/helpdata.c:1625
#, c-format
msgid "* %s production is increased %d%%.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1625
+#: client/helpdata.c:1633
#, c-format
msgid "* %s production will suffer massive waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1630
+#: client/helpdata.c:1638
#, c-format
msgid "* %s production will suffer some waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1635
+#: client/helpdata.c:1643
#, 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:1643
+#: client/helpdata.c:1651
#, 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:1649
+#: client/helpdata.c:1657
#, 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:1655
+#: client/helpdata.c:1663
#, c-format
msgid "* %s waste will increase slowly with distance from capital.\n"
msgstr ""
-#: client/helpdata.c:1672
+#: client/helpdata.c:1680
#, 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:1699
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d %s"
msgstr "%s%d %s"
-#: client/helpdata.c:1700 client/helpdata.c:1708 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1708 client/helpdata.c:1716 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:1707
+#: client/helpdata.c:1715
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d infelizes"
@@ -8668,7 +8807,7 @@ msgid ""
"or with the -a command-line parameter."
msgstr ""
-#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:916 data/Freeciv.in:107
msgid "Metaserver"
msgstr "Metaservidor"
@@ -9041,36 +9180,36 @@ msgstr "Gravação falhou, incapaz de escrever no ficheiro %s"
msgid "Saved settings to file %s"
msgstr "Configurações gravadas para o ficheiro %s"
-#: client/packhand.c:211 client/packhand.c:217
+#: client/packhand.c:212 client/packhand.c:218
#, fuzzy
msgid "You were rejected from the game...."
msgstr "Você foi rejeitado pelo jogo:"
-#: client/packhand.c:229
+#: client/packhand.c:230
#, c-format
msgid "Client capability string: %s"
msgstr "Capacidade do cliente: %s"
-#: client/packhand.c:232
+#: client/packhand.c:233
#, c-format
msgid "Server capability string: %s"
msgstr "Capacidade do servidor: %s"
-#: client/packhand.c:850
+#: client/packhand.c:864
#, c-format
msgid "Start of turn %d"
msgstr "InÃcio do turno %d"
-#: client/packhand.c:1591
+#: client/packhand.c:1621
#, c-format
msgid "AI Mode is now %s."
msgstr "Modo IA agora está %s."
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "ON"
msgstr "LIGADO"
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "OFF"
msgstr "DESLIGADO"
@@ -9101,15 +9240,15 @@ msgstr "Nome"
msgid "Username"
msgstr "Usuário"
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
-#: client/gui-gtk-2.0/pages.c:2157
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:653
+#: client/gui-gtk-2.0/pages.c:1604 client/gui-gtk-2.0/pages.c:2159
msgid "Flag"
msgstr "Bandeira"
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1605
-#: client/gui-gtk-2.0/pages.c:2159 client/gui-sdl/repodlgs.c:2063
-#: client/gui-win32/connectdlg.c:990 client/gui-win32/dialogs.c:542
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:657
+#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1609
+#: client/gui-gtk-2.0/pages.c:2161 client/gui-sdl/repodlgs.c:2063
+#: client/gui-win32/connectdlg.c:992 client/gui-win32/dialogs.c:542
#: client/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "Nação"
@@ -9122,7 +9261,7 @@ msgstr "Borda"
msgid "Score"
msgstr "Pontuação"
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1614
msgid "Team"
msgstr "Time"
@@ -9155,37 +9294,37 @@ msgstr "Ocioso"
msgid "Ping"
msgstr "Ping"
-#: client/repodlgs_common.c:375
+#: client/repodlgs_common.c:378
#, fuzzy
msgid "You cannot sell improvements."
msgstr "Você vende %s em %s por %d moedas."
-#: client/repodlgs_common.c:391
+#: client/repodlgs_common.c:394
#, fuzzy, c-format
msgid "Sold %d %s for %d gold."
msgstr "Vender %s por %d moedas?"
-#: client/repodlgs_common.c:396
+#: client/repodlgs_common.c:399
#, fuzzy, c-format
msgid "No %s could be sold."
msgstr "Nenhuma unidade pode ser actualizada."
#. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:415
+#: client/repodlgs_common.c:418
msgid "You cannot disband units."
msgstr "Você não pode dissolver as unidades."
-#: client/repodlgs_common.c:420
+#: client/repodlgs_common.c:423
#, c-format
msgid "%s cannot be disbanded."
msgstr "%s não pode ser dissolvida."
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:444
#, c-format
msgid "Disbanded %d %s."
msgstr "Dissolvido %d %s."
-#: client/repodlgs_common.c:445
+#: client/repodlgs_common.c:448
#, c-format
msgid "No %s could be disbanded."
msgstr "Nenhum %s pode ser dissolvido."
@@ -9778,47 +9917,47 @@ msgstr "%02dd %02dh"
msgid "?duration:overflow"
msgstr "excedida"
-#: client/text.c:1143
+#: client/text.c:1145
#, c-format
msgid "%6d.%02d ms"
msgstr "%6d.%02d ms"
#. TRANS: <nation adjective> <government name>.
#. * E.g. "Polish Republic".
-#: client/text.c:1188
+#: client/text.c:1193
#, fuzzy, c-format
msgid "?nationgovernment:%s %s"
msgstr "Governo: %s"
#. TRANS: "Observer: 1985"
-#: client/text.c:1198
+#: client/text.c:1203
#, c-format
msgid "Observer: %s"
msgstr "Observador: %s"
-#: client/text.c:1216
+#: client/text.c:1221
msgid "Buildings: "
msgstr "EdifÃcios: "
-#: client/text.c:1233 client/text.c:1272
+#: client/text.c:1238 client/text.c:1277
msgid "None. "
msgstr "Nenhum. "
-#: client/text.c:1235 client/text.c:1274
+#: client/text.c:1240 client/text.c:1279
msgid "?clistend:."
msgstr "."
-#: client/text.c:1253
+#: client/text.c:1258
msgid "Wonders: "
msgstr "Maravilhas: "
-#: client/text.c:1308
+#: client/text.c:1313
#, 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:1312
+#: client/text.c:1317
#, fuzzy, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
@@ -9826,19 +9965,19 @@ 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:1318
+#: client/text.c:1323
#, fuzzy, c-format
msgid "%d additional unhappy citizen."
msgid_plural "%d additional unhappy citizens."
msgstr[0] "%d cidadãos descontentes adicionais."
msgstr[1] "%d cidadãos descontentes adicionais."
-#: client/text.c:1339
+#: client/text.c:1344
#, fuzzy
msgid "Unlimited martial law in effect."
msgstr "Lei marcial em prática ("
-#: client/text.c:1341
+#: client/text.c:1346
#, fuzzy, c-format
msgid "%d military unit may impose martial law."
msgid_plural "Up to %d military units may impose martial law."
@@ -9847,7 +9986,7 @@ msgstr[0] ""
msgstr[1] ""
"* Uma unidade não-militar (não pode atacar; não pode impôr lei marcial).\n"
-#: client/text.c:1345
+#: client/text.c:1350
#, fuzzy, c-format
msgid "Each military unit makes %d unhappy citizen content."
msgid_plural "Each military unit makes %d unhappy citizens content."
@@ -9858,28 +9997,28 @@ msgstr[1] ""
"Entretem os cidadãos de uma cidade, tornando 3 cidadãos descontentes em "
"contentes."
-#: client/text.c:1352
+#: client/text.c:1357
#, fuzzy
msgid "Military units in the field may cause unhappiness. "
msgstr "Unidades militares no campo poderão causar infelicidade. "
-#: client/text.c:1355
+#: client/text.c:1360
#, fuzzy
msgid "Military units have no happiness effect. "
msgstr "Unidades militares não têm qualquer efeito na felicidade. "
-#: client/text.c:1370
+#: client/text.c:1375
#, fuzzy, c-format
msgid "Luxury: %d total."
msgstr "Luxo: %d total."
-#: client/tilespec.c:865
+#: client/tilespec.c:882
#, fuzzy
msgid "No usable default tileset found, aborting!"
msgstr ""
"Nenhum conjunto de imagens por omissão utilizável encontrado, a abortar!"
-#: client/tilespec.c:1338
+#: client/tilespec.c:1355
#, fuzzy
msgid ""
"Client does not support isometric tilesets. Using default tileset instead."
@@ -9887,7 +10026,7 @@ msgstr ""
"Cliente não suporta gráficos isométricos. A utilizar conjunto de imagens por "
"omissão."
-#: client/tilespec.c:1347
+#: client/tilespec.c:1364
#, fuzzy
msgid ""
"Client does not support overhead view tilesets. Using default tileset "
@@ -9896,7 +10035,7 @@ msgstr ""
"Cliente não suporta visão frontal com gráficos isométricos. A utilizar "
"conjunto de imagens por omissão."
-#: client/tilespec.c:3966
+#: client/tilespec.c:3987
#, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -10588,7 +10727,7 @@ msgid "_Display"
msgstr "_Mostrar"
#: client/gui-gtk-2.0/cityrep.c:1006 client/gui-gtk-2.0/menu.c:839
-#: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
+#: client/gui-sdl/diplodlg.c:692 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
#: client/gui-xaw/cityrep.c:533 client/gui-xaw/menu.c:156
@@ -10762,130 +10901,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:196 client/gui-gtk-2.0/messagewin.c:222
+#: client/gui-gtk-2.0/dialogs.c:197 client/gui-gtk-2.0/messagewin.c:222
#, fuzzy
msgid "Goto _Location"
msgstr "_Ir para localização"
-#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
+#: client/gui-gtk-2.0/dialogs.c:202 client/gui-gtk-2.0/messagewin.c:226
#, fuzzy
msgid "Inspect _City"
msgstr "Visualizar _Cidade"
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:258 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:258 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:259 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:311 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:312 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:312 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:313 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:506
+#: client/gui-gtk-2.0/dialogs.c:507
msgid "Unit"
msgstr "Unidade"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:950
-#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2155
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:985
+#: client/gui-gtk-2.0/dialogs.c:508 client/gui-gtk-2.0/pages.c:950
+#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2157
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:987
#: 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:519 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:520 client/gui-sdl/dialogs.c:627
msgid "Unit selection"
msgstr "Seleção de Unidade"
-#: client/gui-gtk-2.0/dialogs.c:582
+#: client/gui-gtk-2.0/dialogs.c:583
msgid "_Ready all"
msgstr "P_reparar todas"
-#: client/gui-gtk-2.0/dialogs.c:590
+#: client/gui-gtk-2.0/dialogs.c:591
msgid "_Sentry idle"
msgstr "_Sentinela das inativas"
-#: client/gui-gtk-2.0/dialogs.c:719
+#: client/gui-gtk-2.0/dialogs.c:721
#, fuzzy
msgid "Nation _Groups:"
msgstr "_Nações:"
-#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:766 data/Freeciv.in:3128
#, fuzzy
msgid "What Nation Will You Be?"
msgstr "Que Nação Irá Personificar?"
-#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
-#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
+#: client/gui-gtk-2.0/dialogs.c:768 client/gui-sdl/chatline.c:842
+#: client/gui-win32/connectdlg.c:1040 data/Freeciv.in:3371
#, fuzzy
msgid "Pick Nation"
msgstr "Seleccione uma nação"
-#: client/gui-gtk-2.0/dialogs.c:774
+#: client/gui-gtk-2.0/dialogs.c:776
#, fuzzy
msgid "_Random Nation"
msgstr "Nação Aleatória"
-#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:792 client/gui-win32/dialogs.c:517
msgid "Select a nation"
msgstr "Selecione uma nação"
-#: client/gui-gtk-2.0/dialogs.c:804
+#: client/gui-gtk-2.0/dialogs.c:810
msgid "_Properties"
msgstr "_Propriedades"
-#: client/gui-gtk-2.0/dialogs.c:824
+#: client/gui-gtk-2.0/dialogs.c:830
msgid "_Leader:"
msgstr "_Lider:"
-#: client/gui-gtk-2.0/dialogs.c:831
+#: client/gui-gtk-2.0/dialogs.c:837
msgid "_Female"
msgstr "_Feminino"
-#: client/gui-gtk-2.0/dialogs.c:836
+#: client/gui-gtk-2.0/dialogs.c:842
msgid "_Male"
msgstr "_Masculino"
-#: client/gui-gtk-2.0/dialogs.c:863
+#: client/gui-gtk-2.0/dialogs.c:869
#, fuzzy
msgid "City _Styles:"
msgstr "_Estilo das Cidades:"
-#: client/gui-gtk-2.0/dialogs.c:902
+#: client/gui-gtk-2.0/dialogs.c:908
#, fuzzy
msgid "_Description"
msgstr "L_egenda"
-#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1263 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:1253 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1268 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:1262 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1277 client/gui-sdl/dialogs.c:2204
#: 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:1306 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1318 client/gui-win32/citydlg.c:1454
#: data/Freeciv.in:2484
msgid "Upgrade Unit!"
msgstr "Atualizar Unidade!"
-#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1327 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
@@ -10893,75 +11032,75 @@ msgstr "Atualizar Unidade!"
msgid "Upgrade Obsolete Units"
msgstr "Actualizar Unidades Obsoletas"
-#: client/gui-gtk-2.0/diplodlg.c:231 client/gui-win32/diplodlg.c:151
+#: client/gui-gtk-2.0/diplodlg.c:222 client/gui-win32/diplodlg.c:151
#: client/gui-xaw/diplodlg.c:383 client/gui-xaw/diplodlg.c:401
msgid "World-map"
msgstr "Mapa-Múndi"
-#: client/gui-gtk-2.0/diplodlg.c:237 client/gui-win32/diplodlg.c:146
+#: client/gui-gtk-2.0/diplodlg.c:228 client/gui-win32/diplodlg.c:146
#: client/gui-xaw/diplodlg.c:387 client/gui-xaw/diplodlg.c:405
msgid "Sea-map"
msgstr "Mapa dos Oceanos"
-#: client/gui-gtk-2.0/diplodlg.c:243
+#: client/gui-gtk-2.0/diplodlg.c:234
msgid "_Maps"
msgstr "_Mapas"
-#: client/gui-gtk-2.0/diplodlg.c:274
+#: client/gui-gtk-2.0/diplodlg.c:265
msgid "_Advances"
msgstr "_Avanços"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/diplodlg.c:315 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "_Cidades"
-#: client/gui-gtk-2.0/diplodlg.c:333
+#: client/gui-gtk-2.0/diplodlg.c:324
#, fuzzy
msgid "_Give shared vision"
msgstr "Dar visão partil_hada"
-#: client/gui-gtk-2.0/diplodlg.c:346
+#: client/gui-gtk-2.0/diplodlg.c:337
#, fuzzy
msgid "Give _embassy"
msgstr "?embassy:Ambos"
-#: client/gui-gtk-2.0/diplodlg.c:376
+#: client/gui-gtk-2.0/diplodlg.c:368
msgid "_Pacts"
msgstr "_Pactos"
-#: client/gui-gtk-2.0/diplodlg.c:466
+#: client/gui-gtk-2.0/diplodlg.c:458
#, fuzzy, c-format
msgid "Diplomacy: %s"
msgstr "Encontro diplomático"
-#: client/gui-gtk-2.0/diplodlg.c:473
+#: client/gui-gtk-2.0/diplodlg.c:465
#, fuzzy
msgid "_Cancel meeting"
msgstr "_Cancelar encontro"
-#: client/gui-gtk-2.0/diplodlg.c:475
+#: client/gui-gtk-2.0/diplodlg.c:467
msgid "Accept _treaty"
msgstr "Aceitar _tratado"
-#: client/gui-gtk-2.0/diplodlg.c:503
+#: client/gui-gtk-2.0/diplodlg.c:495
msgid "C_lauses:"
msgstr "C_láusulas:"
-#: client/gui-gtk-2.0/diplodlg.c:568 client/gui-gtk-2.0/diplodlg.c:642
+#: client/gui-gtk-2.0/diplodlg.c:560 client/gui-gtk-2.0/diplodlg.c:634
msgid "_Gold:"
msgstr "_Moedas:"
-#: client/gui-gtk-2.0/diplodlg.c:580 client/gui-gtk-2.0/diplodlg.c:654
+#: client/gui-gtk-2.0/diplodlg.c:572 client/gui-gtk-2.0/diplodlg.c:646
#, fuzzy
msgid "_Add Clause..."
msgstr "Apagar cláusula"
-#: client/gui-gtk-2.0/diplodlg.c:699
+#: client/gui-gtk-2.0/diplodlg.c:691
msgid "--- This treaty is blank. Please add some clauses. ---"
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:905 client/gui-sdl/diplodlg.c:375
+#: client/gui-gtk-2.0/diplodlg.c:897 client/gui-sdl/diplodlg.c:375
#: client/gui-win32/diplodlg.c:263 client/gui-xaw/diplodlg.c:949
#, fuzzy
msgid "Invalid amount of gold specified."
@@ -11025,102 +11164,102 @@ msgstr "Selecione o destino"
msgid "Show _All Cities"
msgstr "Mostrar _Todas Cidades"
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:164
#, fuzzy
msgid "Show Map Scrollbars"
msgstr "Exibir mapa plano"
-#: client/gui-gtk-2.0/gui_main.c:163
+#: client/gui-gtk-2.0/gui_main.c:165
msgid "Disable this option to hide the scrollbars on the map view."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:169
#, fuzzy
msgid "Keyboardless goto"
msgstr "Ir para macador"
-#: client/gui-gtk-2.0/gui_main.c:168
+#: client/gui-gtk-2.0/gui_main.c:170
msgid ""
"If this option is set then a goto may be initiated by left-clicking and then "
"holding down the mouse button while dragging the mouse onto a different tile."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:173
+#: client/gui-gtk-2.0/gui_main.c:175
msgid "Keep dialogs on top"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:174
+#: client/gui-gtk-2.0/gui_main.c:176
msgid ""
"If this option is set then dialog windows will always remain in front of the "
"main Freeciv window. Disabling this has no effect in fullscreen mode."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:178
+#: client/gui-gtk-2.0/gui_main.c:180
msgid "Show worklist task icons"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:179
+#: client/gui-gtk-2.0/gui_main.c:181
msgid ""
"Disabling this will turn off the unit and building icons in the worklist "
"dialog and the production tab of the city dialog."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:183
+#: client/gui-gtk-2.0/gui_main.c:185
msgid "Enable status report tabs"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:184
+#: client/gui-gtk-2.0/gui_main.c:186
msgid ""
"If this option is enabled then report dialogs will be shown as separate tabs "
"rather than in popup dialogs."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:189 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:191 client/gui-win32/gui_main.c:110
#, fuzzy
msgid "Better fog-of-war drawing"
msgstr "Se activar ou não o nevoeiro de guerra"
-#: client/gui-gtk-2.0/gui_main.c:190 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:192 client/gui-win32/gui_main.c:111
msgid ""
"If this is enabled then a better method is used for drawing fog-of-war. It "
"is not any slower but will consume about twice as much memory."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:195
+#: client/gui-gtk-2.0/gui_main.c:197
msgid "Show time for each chat message"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:196
+#: client/gui-gtk-2.0/gui_main.c:198
msgid ""
"If this option is enabled then all chat messages will be prefixed by a time "
"string of the form [hour:minute:second]."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:201
+#: client/gui-gtk-2.0/gui_main.c:203
msgid "Split bottom notebook area"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:202
+#: client/gui-gtk-2.0/gui_main.c:204
msgid ""
"Enabling this option will split the bottom notebook into a left and right "
"notebook so that two tabs may be viewed at once."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:207
+#: client/gui-gtk-2.0/gui_main.c:209
msgid "New message events go to top of list"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:208
+#: client/gui-gtk-2.0/gui_main.c:210
msgid ""
"If this option is enabled, new events in the message window will appear at "
"the top of the list, rather than being appended at the bottom."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:213
+#: client/gui-gtk-2.0/gui_main.c:215
msgid "Show extra message window buttons"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:214
+#: client/gui-gtk-2.0/gui_main.c:216
msgid ""
"If this option is enabled, there will be two buttons displayed in the "
"message window for inspecting a city and going to a location. If this option "
@@ -11130,21 +11269,21 @@ msgid ""
"closed and reopened."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:224
+#: client/gui-gtk-2.0/gui_main.c:226
msgid "Metaserver tab first in network page"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:225
+#: client/gui-gtk-2.0/gui_main.c:227
msgid ""
"If this option is enabled, the metaserver tab will be the first notebook tab "
"in the network page. This option requires a restart in order to take effect."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:230
+#: client/gui-gtk-2.0/gui_main.c:232
msgid "Plain chat messages are sent to allies only"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:231
+#: client/gui-gtk-2.0/gui_main.c:233
msgid ""
"If this option is enabled, then plain messages typed into the chat entry "
"while the game is running will only be sent to your allies. Otherwise plain "
@@ -11154,28 +11293,41 @@ msgid ""
"visible in multiplayer games)."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:340 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:245
+msgid "Arrange widgets for small displays"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:246
+msgid ""
+"If this option is enabled, widgets in the main window will be arrange so "
+"that they take up the least amount of total screen space. Specifically, the "
+"left panel containing the overview, player status, and the unit information "
+"box will be extended over the entire left side of the window. This option "
+"requires a restart in order to take effect."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:352 client/gui-xaw/gui_main.c:245
msgid ""
"This client has no special command line options\n"
"\n"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
+#: client/gui-gtk-2.0/gui_main.c:847 client/gui-gtk-2.0/gui_main.c:1542
msgid "Freeciv"
msgstr "Freeciv"
-#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
+#: client/gui-gtk-2.0/gui_main.c:1251 client/gui-gtk-2.0/gui_main.c:1258
#: client/gui-sdl/mapctrl.c:1566 client/gui-win32/gui_main.c:482
#: data/Freeciv.in:2618
msgid "Turn Done"
msgstr "Acabei"
-#: client/gui-gtk-2.0/gui_main.c:1232 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1258 client/gui-sdl/mapctrl.c:1566
#: client/gui-sdl/mapview.c:1082
msgid "Shift+Return"
msgstr "Shift+Return"
-#: client/gui-gtk-2.0/gui_main.c:1266 client/gui-gtk-2.0/menu.c:797
+#: client/gui-gtk-2.0/gui_main.c:1299 client/gui-gtk-2.0/menu.c:797
#: client/gui-gtk-2.0/menu.c:799 client/gui-gtk-2.0/menu.c:801
#: client/gui-gtk-2.0/menu.c:803 client/gui-gtk-2.0/menu.c:805
#: client/gui-gtk-2.0/menu.c:807 client/gui-gtk-2.0/menu.c:809
@@ -11194,11 +11346,11 @@ msgstr "Shift+Return"
msgid "View"
msgstr "Visão"
-#: client/gui-gtk-2.0/gui_main.c:1359
+#: client/gui-gtk-2.0/gui_main.c:1393
msgid "Chat"
msgstr "Chat"
-#: client/gui-gtk-2.0/gui_main.c:1377 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1411 client/gui-win32/gui_main.c:538
#: data/Freeciv.in:2809
msgid ""
"Freeciv is free software and you are welcome to distribute copies of it\n"
@@ -11209,96 +11361,96 @@ msgstr ""
"sob certas condições; Veja o item \"Licença\" no menu de Ajuda.\n"
"Agora.. acabe com eles!"
-#: client/gui-gtk-2.0/gui_main.c:1392
+#: client/gui-gtk-2.0/gui_main.c:1426
msgid "Allies Only"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1657
+#: client/gui-gtk-2.0/gui_main.c:1691
#, fuzzy
msgid "Not _ready"
msgstr "P_reparar todas"
-#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
+#: client/gui-gtk-2.0/gui_main.c:1702 client/gui-gtk-2.0/pages.c:1679
msgid "_Ready"
msgstr "_Pronto"
-#: client/gui-gtk-2.0/gui_main.c:1672 client/gui-gtk-2.0/gui_main.c:1678
-#: client/gui-gtk-2.0/pages.c:2204
+#: client/gui-gtk-2.0/gui_main.c:1706 client/gui-gtk-2.0/gui_main.c:1712
+#: client/gui-gtk-2.0/pages.c:2206
#, fuzzy
msgid "_Start"
msgstr "Iniciar : "
-#: client/gui-gtk-2.0/gui_main.c:1686
+#: client/gui-gtk-2.0/gui_main.c:1720
#, fuzzy
msgid "_Take Player"
msgstr "take [nome-ligação] <nome-de-jogador>"
-#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
+#: client/gui-gtk-2.0/gui_main.c:1723 client/gui-gtk-2.0/pages.c:1669
#, fuzzy
msgid "Pick _Nation"
msgstr "Seleccione uma nação"
-#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
+#: client/gui-gtk-2.0/gui_main.c:1730 client/gui-gtk-2.0/pages.c:1674
msgid "_Observe"
msgstr "_Observar"
-#: client/gui-gtk-2.0/gui_main.c:1698
+#: client/gui-gtk-2.0/gui_main.c:1732
#, fuzzy
msgid "Do not _observe"
msgstr "Não _observar"
-#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1755 client/gui-xaw/pages.c:211
msgid "<AI>"
msgstr "<AI>"
-#: client/gui-gtk-2.0/gui_main.c:1723
+#: client/gui-gtk-2.0/gui_main.c:1758
#, fuzzy
msgid "<Novice AI>"
msgstr "Alterna estado IA do jogador."
-#: client/gui-gtk-2.0/gui_main.c:1726
+#: client/gui-gtk-2.0/gui_main.c:1761
#, fuzzy
msgid "<Easy AI>"
msgstr "Alterna estado IA do jogador."
-#: client/gui-gtk-2.0/gui_main.c:1729
+#: client/gui-gtk-2.0/gui_main.c:1764
#, fuzzy
msgid "<Normal AI>"
msgstr " Pacotes Normais: "
-#: client/gui-gtk-2.0/gui_main.c:1732
+#: client/gui-gtk-2.0/gui_main.c:1767
#, fuzzy
msgid "<Hard AI>"
msgstr "Disco RÃgido 3:"
-#: client/gui-gtk-2.0/gui_main.c:1742 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1777 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:1808
+#: client/gui-gtk-2.0/gui_main.c:1844 client/gui-gtk-2.0/gui_main.c:1858
#, fuzzy
msgid "Observer"
msgstr " (observador)"
-#: client/gui-gtk-2.0/gui_main.c:1808
+#: client/gui-gtk-2.0/gui_main.c:1858
#, fuzzy
msgid "Detached"
msgstr "Holandês"
-#: client/gui-gtk-2.0/gui_main.c:2073
+#: client/gui-gtk-2.0/gui_main.c:2117
#, fuzzy
msgid "Are you sure you want to quit?"
msgstr "Tem certeza que deseja apagar \"%s\" ?"
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
#, fuzzy, c-format
msgid ""
"Close Tab:\n"
"%s"
msgstr "Largura da tabulação"
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
msgid "Ctrl+W"
msgstr "Ctrl+W"
@@ -11411,8 +11563,8 @@ msgid "Trans. Rslt/Time:"
msgstr "Resul/Data Transp:"
#: 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
-#: client/gui-win32/helpdlg.c:709 client/gui-win32/helpdlg.c:733
+#: client/gui-win32/helpdlg.c:502 client/gui-win32/helpdlg.c:550
+#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:739
#: client/gui-xaw/helpdlg.c:759 client/gui-xaw/helpdlg.c:808
#: client/gui-xaw/helpdlg.c:816 client/gui-xaw/helpdlg.c:853
#: client/gui-xaw/helpdlg.c:878
@@ -11459,34 +11611,34 @@ msgstr "com"
msgid "?techhelp:"
msgstr "?techhelp:"
-#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:591
+#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:597
#: client/gui-xaw/helpdlg.c:996
#, c-format
msgid "+%d Trade / %d"
msgstr "+%d Comércio / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:595
+#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:601
#: client/gui-xaw/helpdlg.c:1000
#, c-format
msgid "no extra / %d"
msgstr "sem extra / %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
-#: client/gui-win32/helpdlg.c:602 client/gui-win32/helpdlg.c:616
-#: client/gui-win32/helpdlg.c:635 client/gui-xaw/helpdlg.c:1002
+#: client/gui-gtk-2.0/helpdlg.c:1085 client/gui-win32/helpdlg.c:604
+#: client/gui-win32/helpdlg.c:608 client/gui-win32/helpdlg.c:622
+#: client/gui-win32/helpdlg.c:641 client/gui-xaw/helpdlg.c:1002
#: client/gui-xaw/helpdlg.c:1006 client/gui-xaw/helpdlg.c:1020
#: client/gui-xaw/helpdlg.c:1039
msgid "n/a"
msgstr "n/d"
-#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:605
+#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:611
#: client/gui-xaw/helpdlg.c:1009
#, fuzzy, c-format
msgid "+%d Food / %d"
msgstr "+%d Comida / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:619
+#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:625
#: client/gui-xaw/helpdlg.c:1023
#, c-format
msgid "+%d Res. / %d"
@@ -12302,41 +12454,41 @@ 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:624 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:302
#: client/gui-xaw/connectdlg.c:326
msgid "Passwords don't match, enter password."
msgstr ""
#: client/gui-gtk-2.0/pages.c:779 client/gui-gtk-2.0/pages.c:820
-#: client/gui-win32/connectdlg.c:916
+#: client/gui-win32/connectdlg.c:918
msgid "Server Name"
msgstr "Servidor"
#: client/gui-gtk-2.0/pages.c:780 client/gui-gtk-2.0/pages.c:821
-#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:916
+#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:918
#: data/Freeciv.in:96
msgid "Port"
msgstr "Porta"
#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Version"
msgstr "Versão"
#: client/gui-gtk-2.0/pages.c:782 client/gui-gtk-2.0/pages.c:823
-#: client/gui-gtk-2.0/pages.c:2161 client/gui-win32/connectdlg.c:917
-#: client/gui-win32/connectdlg.c:995
+#: client/gui-gtk-2.0/pages.c:2163 client/gui-win32/connectdlg.c:919
+#: client/gui-win32/connectdlg.c:997
msgid "Status"
msgstr "Estado"
#: client/gui-gtk-2.0/pages.c:783 client/gui-gtk-2.0/pages.c:824
#: client/gui-sdl/connectdlg.c:318 client/gui-sdl/plrdlg.c:330
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Players"
msgstr "Jogadores"
#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
-#: client/gui-win32/connectdlg.c:918
+#: client/gui-win32/connectdlg.c:920
msgid "Comment"
msgstr "Comentário"
@@ -12372,9 +12524,9 @@ msgstr "Palavra errada:"
msgid "Conf_irm Password:"
msgstr "Digite a senha do pacote"
-#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2165
#: 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:1000
+#: client/gui-win32/citydlg.c:1083 client/gui-win32/connectdlg.c:1002
#: client/gui-win32/wldlg.c:800 client/gui-win32/wldlg.c:806
msgid "Type"
msgstr "Tipo"
@@ -12477,7 +12629,7 @@ msgstr "NÃvel de _depuração:"
msgid "Ruleset _Version:"
msgstr "Escolha o seu _sexo"
-#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2195
msgid "_More Game Options..."
msgstr "_Mais Opções..."
@@ -12494,55 +12646,55 @@ msgstr "Escrita"
msgid "Ready"
msgstr "Pronto"
-#: client/gui-gtk-2.0/pages.c:1601
+#: client/gui-gtk-2.0/pages.c:1600
#, fuzzy
msgid "?player:Leader"
msgstr "LÃder"
-#: client/gui-gtk-2.0/pages.c:1732 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1734 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:1824
+#: client/gui-gtk-2.0/pages.c:1826
#, fuzzy
msgid "Choose Saved Game to _Load:"
msgstr "Selecione um dispositivo PKCS#11 para carregar"
-#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
-#: client/gui-gtk-2.0/pages.c:2451
+#: client/gui-gtk-2.0/pages.c:1846 client/gui-gtk-2.0/pages.c:2039
+#: client/gui-gtk-2.0/pages.c:2455
msgid "_Browse..."
msgstr "_Navegar..."
-#: client/gui-gtk-2.0/pages.c:1911
+#: client/gui-gtk-2.0/pages.c:1913
#, fuzzy
msgid "Choose a Scenario"
msgstr "Escolha o senário"
-#: client/gui-gtk-2.0/pages.c:1998
+#: client/gui-gtk-2.0/pages.c:2000
#, fuzzy
msgid "Choose a _Scenario:"
msgstr "Escolha o senário"
-#: client/gui-gtk-2.0/pages.c:2173
+#: client/gui-gtk-2.0/pages.c:2175
#, fuzzy
msgid "Choose a _nation to play:"
msgstr "Escolha o tipo do pacote a ser criado"
-#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2367 client/gui-win32/menu.c:581
#, fuzzy
msgid "Select Location to Save"
msgstr "Grava jogo para ficheiro."
-#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2452 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "Salvar o Jogo"
-#: client/gui-gtk-2.0/pages.c:2489
+#: client/gui-gtk-2.0/pages.c:2493
msgid "Saved _Games:"
msgstr "_Jogos Salvos"
-#: client/gui-gtk-2.0/pages.c:2516
+#: client/gui-gtk-2.0/pages.c:2520
msgid "Save _Filename:"
msgstr "Salvar _Arquivo:"
@@ -12895,7 +13047,7 @@ msgstr ""
msgid "Total users logged in : %d"
msgstr "Número de mensagens do tópico"
-#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1098
msgid "Back"
msgstr "Anterior"
@@ -12904,7 +13056,7 @@ msgid "Start"
msgstr "Iniciar"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:777
+#: client/gui-win32/connectdlg.c:779
msgid "Load Game"
msgstr "Ler Jogo"
@@ -12946,9 +13098,9 @@ msgstr "Faz Terra Natal"
#: client/gui-sdl/connectdlg.c:308 client/gui-sdl/connectdlg.c:617
#: client/gui-sdl/connectdlg.c:803 client/gui-sdl/connectdlg.c:985
#: client/gui-sdl/dialogs.c:452 client/gui-sdl/dialogs.c:2095
-#: client/gui-sdl/dialogs.c:2893 client/gui-sdl/diplomat_dialog.c:731
+#: client/gui-sdl/dialogs.c:2902 client/gui-sdl/diplomat_dialog.c:731
#: client/gui-sdl/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1043
#: client/gui-win32/dialogs.c:1772 client/gui-win32/finddlg.c:127
#: client/gui-win32/gotodlg.c:171 client/gui-win32/inputdlg.c:146
#: client/gui-win32/messagedlg.c:216 client/gui-win32/ratesdlg.c:328
@@ -12994,7 +13146,7 @@ msgid "Buy it?"
msgstr "Comprar?"
#: 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
+#: client/gui-sdl/diplodlg.c:1336 client/gui-sdl/diplomat_dialog.c:1211
#: client/gui-sdl/diplomat_dialog.c:1417 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:221 client/gui-sdl/repodlgs.c:1559
#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
@@ -13010,7 +13162,7 @@ msgid "No"
msgstr "Não"
#: client/gui-sdl/citydlg.c:1215 client/gui-sdl/cma_fe.c:318
-#: client/gui-sdl/diplodlg.c:1345 client/gui-sdl/diplomat_dialog.c:1200
+#: client/gui-sdl/diplodlg.c:1346 client/gui-sdl/diplomat_dialog.c:1200
#: client/gui-sdl/diplomat_dialog.c:1407 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:232 client/gui-win32/repodlgs.c:578
#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
@@ -13325,7 +13477,7 @@ msgstr "Servidor Freeciv :"
msgid "Port :"
msgstr "Porta :"
-#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1100
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr "Ligar"
@@ -13435,23 +13587,23 @@ msgstr "Escolha Seu Novo Governo"
msgid "REVOLUTION!"
msgstr "REVOLUÇÃO!"
-#: client/gui-sdl/dialogs.c:2232 client/gui-sdl/dialogs.c:2620
+#: client/gui-sdl/dialogs.c:2237 client/gui-sdl/dialogs.c:2625
#: client/gui-win32/dialogs.c:567 data/Freeciv.in:3159
msgid "Female"
msgstr "Feminino"
-#: client/gui-sdl/dialogs.c:2234 client/gui-sdl/dialogs.c:2618
-#: client/gui-sdl/dialogs.c:2830 client/gui-win32/dialogs.c:565
+#: client/gui-sdl/dialogs.c:2239 client/gui-sdl/dialogs.c:2623
+#: client/gui-sdl/dialogs.c:2839 client/gui-win32/dialogs.c:565
msgid "Male"
msgstr "Masculino"
-#: client/gui-sdl/dialogs.c:2478 client/gui-sdl/dialogs.c:2902
+#: client/gui-sdl/dialogs.c:2483 client/gui-sdl/dialogs.c:2911
#: 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 "OK"
-#: client/gui-sdl/dialogs.c:2685 client/gui-win32/dialogs.c:505
+#: client/gui-sdl/dialogs.c:2694 client/gui-win32/dialogs.c:505
#, fuzzy
msgid "What nation will you be?"
msgstr "Que nação irá escolher?"
@@ -13479,81 +13631,81 @@ msgstr "Mapa-Mundo"
msgid "Sea map"
msgstr "Mapa-MarÃtimo"
-#: client/gui-sdl/diplodlg.c:563
+#: client/gui-sdl/diplodlg.c:564
#, fuzzy
msgid "Give embassy"
msgstr "?embassy:Ambos"
-#: client/gui-sdl/diplodlg.c:579 client/gui-win32/diplodlg.c:614
+#: client/gui-sdl/diplodlg.c:580 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 "Moedas(max %d)"
-#: client/gui-sdl/diplodlg.c:613 client/gui-sdl/helpdlg.c:1956
+#: client/gui-sdl/diplodlg.c:614 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 "Avanços"
-#: client/gui-sdl/diplodlg.c:831 client/gui-win32/diplodlg.c:598
+#: client/gui-sdl/diplodlg.c:832 client/gui-win32/diplodlg.c:598
#: data/Freeciv.in:269
msgid "Diplomacy meeting"
msgstr "Encontro diplomático"
-#: client/gui-sdl/diplodlg.c:883 client/gui-win32/diplodlg.c:680
+#: client/gui-sdl/diplodlg.c:884 client/gui-win32/diplodlg.c:680
#: data/Freeciv.in:510
msgid "Cancel meeting"
msgstr "Cancelar encontro"
-#: client/gui-sdl/diplodlg.c:895 client/gui-win32/diplodlg.c:679
+#: client/gui-sdl/diplodlg.c:896 client/gui-win32/diplodlg.c:679
#: data/Freeciv.in:501
msgid "Accept treaty"
msgstr "Aceitar tratado"
#. TRANS: "Polish incident !" FIXME!!!
-#: client/gui-sdl/diplodlg.c:1304
+#: client/gui-sdl/diplodlg.c:1305
#, c-format
msgid "%s incident !"
msgstr "%s incidente !"
-#: client/gui-sdl/diplodlg.c:1322
+#: client/gui-sdl/diplodlg.c:1323
msgid "Shall we declare WAR on them?"
msgstr "Vamos declarar guerra à eles?"
-#: client/gui-sdl/diplodlg.c:1433
+#: client/gui-sdl/diplodlg.c:1434
#, fuzzy
msgid "Foreign Minister"
msgstr "Primeiro Ministro"
-#: client/gui-sdl/diplodlg.c:1449
+#: client/gui-sdl/diplodlg.c:1450
#, c-format
msgid ""
"Sir!, the %s ambassador has arrived\n"
"What are your wishes?"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1465
+#: client/gui-sdl/diplodlg.c:1466
msgid "Declare WAR"
msgstr "Declarar GUERRA"
-#: client/gui-sdl/diplodlg.c:1467 client/gui-win32/plrdlg.c:357
+#: client/gui-sdl/diplodlg.c:1468 client/gui-win32/plrdlg.c:357
msgid "Cancel Treaty"
msgstr "Cancelar Tratado"
-#: client/gui-sdl/diplodlg.c:1490 client/gui-win32/plrdlg.c:358
+#: client/gui-sdl/diplodlg.c:1491 client/gui-win32/plrdlg.c:358
#: data/Freeciv.in:3254
#, fuzzy
msgid "Withdraw vision"
msgstr "Retirar visão"
-#: client/gui-sdl/diplodlg.c:1507
+#: client/gui-sdl/diplodlg.c:1508
#, fuzzy
msgid "Call Diplomatic Meeting"
msgstr "Encontro com %s cancelado."
-#: client/gui-sdl/diplodlg.c:1521
+#: client/gui-sdl/diplodlg.c:1522
msgid "Send him back"
msgstr "Traga-o de volta"
@@ -14309,12 +14461,12 @@ msgid "Leave Game"
msgstr "Salvar o Jogo"
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1100 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1102 client/gui-xaw/menu.c:121
#: data/Freeciv.in:115 data/Freeciv.in:3180
msgid "Quit"
msgstr "Sair"
-#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:967
msgid "Start New Game"
msgstr "Iniciar Novo Jogo"
@@ -14433,8 +14585,8 @@ msgstr "Taxa de Entrada"
msgid "%s max rate : %d%%"
msgstr "taxa máxima de %s: %d%%"
-#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
-#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1085
+#: client/gui-win32/connectdlg.c:1093 data/Freeciv.in:155
msgid "Update"
msgstr "Atualizar"
@@ -14922,67 +15074,67 @@ msgstr "Novo"
msgid "Delete"
msgstr "Apagar"
-#: client/gui-win32/connectdlg.c:147
+#: client/gui-win32/connectdlg.c:149
msgid "Password:"
msgstr "Senha:"
-#: client/gui-win32/connectdlg.c:169
+#: client/gui-win32/connectdlg.c:171
msgid "Couldn't load the savegame"
msgstr "Não pude abrir o jogo salvo"
-#: client/gui-win32/connectdlg.c:284 client/gui-xaw/connectdlg.c:311
+#: client/gui-win32/connectdlg.c:286 client/gui-xaw/connectdlg.c:311
msgid "Verify Password"
msgstr "Checar a Senha"
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:916 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr "Seleção do Servidor Freeciv"
-#: client/gui-win32/connectdlg.c:915
+#: client/gui-win32/connectdlg.c:917
msgid "Local Area Network"
msgstr "Rede Local"
-#: client/gui-win32/connectdlg.c:949
+#: client/gui-win32/connectdlg.c:951
msgid "Welcome to Freeciv"
msgstr "Bem-vindo ao Freeciv"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Load Saved Game"
msgstr "Abrir Jogo Salvo"
-#: client/gui-win32/connectdlg.c:969
+#: client/gui-win32/connectdlg.c:971
msgid "Connect To Network Game"
msgstr "Conectar ao Jogo em Rede"
-#: client/gui-win32/connectdlg.c:979
+#: client/gui-win32/connectdlg.c:981
msgid "Choose a nation to play"
msgstr "Escolha uma nação"
-#: client/gui-win32/connectdlg.c:1014
+#: client/gui-win32/connectdlg.c:1016
msgid "Number of players (Including AI):"
msgstr "Número de jogadores (Incluindo o CPU):"
-#: client/gui-win32/connectdlg.c:1022
+#: client/gui-win32/connectdlg.c:1024
msgid "AI skill level:"
msgstr "NÃvel de experiência IA:"
-#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1038 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr "Opções do Jogo"
-#: client/gui-win32/connectdlg.c:1040
+#: client/gui-win32/connectdlg.c:1042
msgid "Start Game"
msgstr "Iniciar Jogo"
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Login:"
msgstr "Conectar:"
-#: client/gui-win32/connectdlg.c:1061
+#: client/gui-win32/connectdlg.c:1063
msgid "Host:"
msgstr "Servidor:"
-#: client/gui-win32/connectdlg.c:1062
+#: client/gui-win32/connectdlg.c:1064
msgid "Port:"
msgstr "Porta:"
@@ -15060,21 +15212,21 @@ msgid ""
"this is much slower."
msgstr ""
-#: client/gui-win32/helpdlg.c:769 client/gui-win32/helpdlg.c:792
-#: client/gui-win32/helpdlg.c:803 client/gui-win32/helpdlg.c:809
-#: client/gui-win32/helpdlg.c:822
+#: client/gui-win32/helpdlg.c:775 client/gui-win32/helpdlg.c:798
+#: client/gui-win32/helpdlg.c:809 client/gui-win32/helpdlg.c:815
+#: client/gui-win32/helpdlg.c:828
msgid "Allows "
msgstr "Permite "
-#: client/gui-win32/helpdlg.c:780
+#: client/gui-win32/helpdlg.c:786
msgid "Obsoletes "
msgstr "Torna Obsoleta "
-#: client/gui-win32/helpdlg.c:812 client/gui-win32/helpdlg.c:825
+#: client/gui-win32/helpdlg.c:818 client/gui-win32/helpdlg.c:831
msgid " (with "
msgstr " (com "
-#: client/gui-win32/helpdlg.c:815 client/gui-win32/helpdlg.c:828
+#: client/gui-win32/helpdlg.c:821 client/gui-win32/helpdlg.c:834
msgid "?techhelp:)."
msgstr "?techhelp:)."
@@ -16219,7 +16371,7 @@ 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/"
+" https://gna.org/projects/freeciv/"
msgstr ""
"Se encontrar quaisquer erros (bugs), envie-nos um relatório de erro. A "
"melhor forma é visitando o Sistema de Acompanhamento de Bugs do Freeciv, "
@@ -18676,47 +18828,43 @@ msgid ""
"a Factory, Mfg. Plant and Hydro Plant together give a 150% production "
"bonus.\n"
"\n"
-"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant. A city "
-"can only build a Hydro Plant if it is next to (or on) a Mountain or River "
-"tile."
+"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant."
msgstr ""
-"Reduz a quantidade de poluição gerada pela produção numa cidade em 50%. "
+"Reduz a quantidade de poluição gerada pela produção de uma cidade em 50%. "
"Também aumenta a produção de escudos de uma Fábrica ou Unidade "
-"Transformadora numa cidade: uma Fábrica e Barragem juntas dão um bónus de "
-"75% de produção e uma Fábrica, Unidade Transformadora e Barragem juntas dão "
-"um bónus produtivo de 150%.\n"
+"Transformadora na cidade: uma Fábrica e Central Nuclear juntas geram um "
+"bónus produtivo de 75%, e uma Fábrica, Unidade Transformadora e Central "
+"Nuclear juntas dão um bónus produtivo de 150%.\n"
"\n"
-"Uma cidade apenas pode ter uma Barragem, Central Térmica ou Central Nuclear. "
-"Uma cidade apenas pode construir uma Barragem se estiver junto a uma (ou "
-"numa) quadrÃcula de Montanha ou Rio."
+"Uma cidade apenas pode ter uma Barragem, Central Térmica ou Central Nuclear."
-#: data/default/buildings.ruleset:397 data/civ2/buildings.ruleset:373
+#: data/default/buildings.ruleset:396 data/civ2/buildings.ruleset:373
#: data/civ1/buildings.ruleset:297
msgid "Library"
msgstr "Biblioteca"
-#: data/default/buildings.ruleset:412
+#: data/default/buildings.ruleset:411
#, fuzzy, no-c-format
msgid "Increases the science output in a city by 100%."
msgstr "Aumenta a produção cientÃfica de uma cidade em 50%."
-#: data/default/buildings.ruleset:417 data/civ2/buildings.ruleset:393
+#: data/default/buildings.ruleset:416 data/civ2/buildings.ruleset:393
#: data/civ1/buildings.ruleset:317
msgid "Marketplace"
msgstr "Mercado"
-#: data/default/buildings.ruleset:432 data/civ2/buildings.ruleset:408
+#: data/default/buildings.ruleset:431 data/civ2/buildings.ruleset:408
#: data/civ1/buildings.ruleset:332
#, fuzzy, no-c-format
msgid "Increases the luxury and tax output in a city by 50%."
msgstr "Aumenta o luxo e colecta de impostos numa cidade em 50%."
-#: data/default/buildings.ruleset:437 data/civ2/buildings.ruleset:413
+#: data/default/buildings.ruleset:436 data/civ2/buildings.ruleset:413
#: data/civ1/buildings.ruleset:337
msgid "Mass Transit"
msgstr "Transportes Públicos"
-#: data/default/buildings.ruleset:451 data/civ2/buildings.ruleset:427
+#: data/default/buildings.ruleset:450 data/civ2/buildings.ruleset:427
#: data/civ1/buildings.ruleset:351
#, fuzzy
msgid ""
@@ -18726,13 +18874,13 @@ msgstr ""
"Neutraliza a poluição gerada pela população. A população não tem qualquer "
"efeito na poluição gerada por uma cidade."
-#: data/default/buildings.ruleset:458 data/civ2/buildings.ruleset:434
+#: data/default/buildings.ruleset:457 data/civ2/buildings.ruleset:434
#: data/civ1/buildings.ruleset:358
#, fuzzy
msgid "Mfg. Plant"
msgstr "Unidade Transformadora"
-#: data/default/buildings.ruleset:474 data/civ2/buildings.ruleset:450
+#: data/default/buildings.ruleset:473 data/civ2/buildings.ruleset:450
#: data/civ1/buildings.ruleset:374
#, fuzzy, no-c-format
msgid ""
@@ -18742,12 +18890,12 @@ msgstr ""
"Junto com uma Fábrica, uma Unidade Transformadora aumenta a produção de "
"escudos de uma cidade em 100%."
-#: data/default/buildings.ruleset:480 data/civ2/buildings.ruleset:456
+#: data/default/buildings.ruleset:479 data/civ2/buildings.ruleset:456
#: data/civ1/buildings.ruleset:380
msgid "Nuclear Plant"
msgstr "Usina Nuclear"
-#: data/default/buildings.ruleset:495
+#: data/default/buildings.ruleset:494
#, fuzzy
msgid ""
"Reduces the amount of pollution generated by production in a city by 50%. "
@@ -18766,11 +18914,11 @@ msgstr ""
"\n"
"Uma cidade apenas pode ter uma Barragem, Central Térmica ou Central Nuclear."
-#: data/default/buildings.ruleset:515 data/civ2/buildings.ruleset:489
+#: data/default/buildings.ruleset:514 data/civ2/buildings.ruleset:489
msgid "Offshore Platform"
msgstr "Plataforma PetrolÃfera"
-#: data/default/buildings.ruleset:530 data/civ2/buildings.ruleset:504
+#: data/default/buildings.ruleset:529 data/civ2/buildings.ruleset:504
#, fuzzy
msgid ""
"Adds 1 extra shield resource on all Ocean squares in a city. The city needs "
@@ -18779,12 +18927,12 @@ msgstr ""
"Aumenta 1 recurso de escudo a todas as quadrÃculas de Oceano de uma cidade. "
"A cidade tem de ser costeira para poder a construir."
-#: data/default/buildings.ruleset:536 data/civ2/buildings.ruleset:510
+#: data/default/buildings.ruleset:535 data/civ2/buildings.ruleset:510
#: data/civ1/buildings.ruleset:411
msgid "Palace"
msgstr "Palácio"
-#: data/default/buildings.ruleset:552
+#: data/default/buildings.ruleset:551
#, fuzzy, no-c-format
msgid ""
"Makes a city the capital and the center of your government. Corruption in "
@@ -18810,11 +18958,11 @@ msgstr ""
"guerra civil no seu império. Perder o seu palácio irá também resultar na "
"perca de qualquer nave espacial que possa possuir."
-#: data/default/buildings.ruleset:569 data/civ2/buildings.ruleset:539
+#: data/default/buildings.ruleset:568 data/civ2/buildings.ruleset:539
msgid "Police Station"
msgstr "Delegacia de PolÃcia"
-#: data/default/buildings.ruleset:583 data/civ2/buildings.ruleset:553
+#: data/default/buildings.ruleset:582 data/civ2/buildings.ruleset:553
#, fuzzy
msgid ""
"Reduces the unhappiness caused by military units outside the city by 2 under "
@@ -18825,11 +18973,11 @@ msgstr ""
"uma Democracia e em 1 sob uma República. Esta construção não tem qualquer "
"efeito sob outras formas de governo."
-#: data/default/buildings.ruleset:593 data/civ2/buildings.ruleset:560
+#: data/default/buildings.ruleset:592 data/civ2/buildings.ruleset:560
msgid "Port Facility"
msgstr "Porto"
-#: data/default/buildings.ruleset:608 data/civ2/buildings.ruleset:575
+#: data/default/buildings.ruleset:607 data/civ2/buildings.ruleset:575
#, fuzzy
msgid ""
"Allows a city to build veteran sea units. Also, damaged sea units which "
@@ -18839,12 +18987,12 @@ msgstr ""
"Adicionalmente, unidades marÃtimas danificadas que permaneçam na cidade por "
"um turno completo sem se movimentarem ficam completamente recuperadas."
-#: data/default/buildings.ruleset:615 data/civ2/buildings.ruleset:582
+#: data/default/buildings.ruleset:614 data/civ2/buildings.ruleset:582
#: data/civ1/buildings.ruleset:440
msgid "Power Plant"
msgstr "Usina Elétrica"
-#: data/default/buildings.ruleset:631
+#: data/default/buildings.ruleset:630
#, fuzzy, no-c-format
msgid ""
"Increases the shield production of a Factory or Mfg. Plant in a city: a "
@@ -18861,12 +19009,12 @@ msgstr ""
"\n"
"Uma cidade apenas pode ter uma Barragem, Central Térmica ou Central Nuclear."
-#: data/default/buildings.ruleset:646 data/civ2/buildings.ruleset:610
+#: data/default/buildings.ruleset:645 data/civ2/buildings.ruleset:610
#: data/civ1/buildings.ruleset:468
msgid "Recycling Center"
msgstr "Centro de Reciclagem"
-#: data/default/buildings.ruleset:661 data/civ2/buildings.ruleset:625
+#: data/default/buildings.ruleset:660 data/civ2/buildings.ruleset:625
#: data/civ1/buildings.ruleset:483
#, fuzzy, no-c-format
msgid ""
@@ -18876,12 +19024,12 @@ msgstr ""
"A construção de um Centro de Reciclagem reduz a quantidade de poluição "
"gerada pela produção de uma cidade em 66%."
-#: data/default/buildings.ruleset:667 data/civ2/buildings.ruleset:631
+#: data/default/buildings.ruleset:666 data/civ2/buildings.ruleset:631
#, fuzzy
msgid "Research Lab"
msgstr "Lab. de Investigação"
-#: data/default/buildings.ruleset:682
+#: data/default/buildings.ruleset:681
#, fuzzy
msgid ""
"Together with a Library, a Research Lab increases the science production of "
@@ -18893,11 +19041,11 @@ msgstr ""
"Universidade, um Lab. de Investigação aumenta a produção cientÃfica de uma "
"cidade em 150%."
-#: data/default/buildings.ruleset:690 data/civ2/buildings.ruleset:654
+#: data/default/buildings.ruleset:689 data/civ2/buildings.ruleset:654
msgid "SAM Battery"
msgstr "Bateria SAM"
-#: data/default/buildings.ruleset:704 data/civ2/buildings.ruleset:668
+#: data/default/buildings.ruleset:703 data/civ2/buildings.ruleset:668
#, fuzzy
msgid ""
"Doubles the defense of all units inside the city when attacked by non-"
@@ -18906,12 +19054,12 @@ msgstr ""
"Duplica a defesa de todas as unidades dentro de uma cidade quando atacadas "
"por unidades aéreas não-nucleares."
-#: data/default/buildings.ruleset:710 data/civ2/buildings.ruleset:674
+#: data/default/buildings.ruleset:709 data/civ2/buildings.ruleset:674
#: data/civ1/buildings.ruleset:489
msgid "SDI Defense"
msgstr "Defesa SDI"
-#: data/default/buildings.ruleset:724 data/civ2/buildings.ruleset:688
+#: data/default/buildings.ruleset:723 data/civ2/buildings.ruleset:688
#: data/civ1/buildings.ruleset:503
#, fuzzy
msgid ""
@@ -18923,11 +19071,11 @@ msgstr ""
"têm qualquer efeito sobre a cidade. Adicionalmente, duplica a defesa contra "
"mÃsseis não-nucleares."
-#: data/default/buildings.ruleset:733 data/civ2/buildings.ruleset:697
+#: data/default/buildings.ruleset:732 data/civ2/buildings.ruleset:697
msgid "Sewer System"
msgstr "Sistema de Esgotos"
-#: data/default/buildings.ruleset:748 data/civ2/buildings.ruleset:712
+#: data/default/buildings.ruleset:747 data/civ2/buildings.ruleset:712
#, fuzzy
msgid ""
"Allows a city to grow larger than size 12. An Aqueduct is first required "
@@ -18936,12 +19084,12 @@ msgstr ""
"Permite que uma cidade cresça mais do que tamanho 12. Um Aqueduto é "
"necessário primeiro para que uma cidade cresça mais do que o tamanho 8."
-#: data/default/buildings.ruleset:754 data/civ2/buildings.ruleset:749
+#: data/default/buildings.ruleset:753 data/civ2/buildings.ruleset:749
#: data/civ1/buildings.ruleset:512
msgid "Space Component"
msgstr "Componente Espacial"
-#: data/default/buildings.ruleset:769 data/civ2/buildings.ruleset:763
+#: data/default/buildings.ruleset:768 data/civ2/buildings.ruleset:763
#: data/civ1/buildings.ruleset:526
#, fuzzy
msgid ""
@@ -18959,12 +19107,12 @@ msgstr ""
"Antes de poder construir qualquer componente da nave espacial, a maravilha "
"do mundo Programa Apolo terá de ser construida por um qualquer jogador."
-#: data/default/buildings.ruleset:779 data/civ2/buildings.ruleset:773
+#: data/default/buildings.ruleset:778 data/civ2/buildings.ruleset:773
#: data/civ1/buildings.ruleset:536
msgid "Space Module"
msgstr "Módulo Espacial"
-#: data/default/buildings.ruleset:794 data/civ2/buildings.ruleset:787
+#: data/default/buildings.ruleset:793 data/civ2/buildings.ruleset:787
#: data/civ1/buildings.ruleset:550
#, fuzzy
msgid ""
@@ -19001,12 +19149,12 @@ msgstr ""
"Antes de poder construir qualquer componente da nave espacial, a maravilha "
"do mundo Programa Apolo terá de ser construida por um qualquer jogador."
-#: data/default/buildings.ruleset:813 data/civ2/buildings.ruleset:806
+#: data/default/buildings.ruleset:812 data/civ2/buildings.ruleset:806
#: data/civ1/buildings.ruleset:569
msgid "Space Structural"
msgstr "Estrutura Espacial"
-#: data/default/buildings.ruleset:828 data/civ2/buildings.ruleset:820
+#: data/default/buildings.ruleset:827 data/civ2/buildings.ruleset:820
#: data/civ1/buildings.ruleset:583
#, fuzzy
msgid ""
@@ -19024,11 +19172,11 @@ msgstr ""
"Antes de poder construir qualquer componente da nave espacial, a maravilha "
"do mundo Programa Apolo terá de ser construida por um qualquer jogador."
-#: data/default/buildings.ruleset:838 data/civ2/buildings.ruleset:830
+#: data/default/buildings.ruleset:837 data/civ2/buildings.ruleset:830
msgid "Stock Exchange"
msgstr "Bolsa"
-#: data/default/buildings.ruleset:854 data/civ2/buildings.ruleset:846
+#: data/default/buildings.ruleset:853 data/civ2/buildings.ruleset:846
#, fuzzy, no-c-format
msgid ""
"Together with a Marketplace and a Bank, a Stock Exchange boosts tax and "
@@ -19037,11 +19185,11 @@ msgstr ""
"Juntamente com um Mercado e um Banco, a Bolsa potencia a colecta de impostos "
"e a produção de luxo de uma cidade em 150%."
-#: data/default/buildings.ruleset:860 data/civ2/buildings.ruleset:852
+#: data/default/buildings.ruleset:859 data/civ2/buildings.ruleset:852
msgid "Super Highways"
msgstr "Auto Estradas"
-#: data/default/buildings.ruleset:875 data/civ2/buildings.ruleset:867
+#: data/default/buildings.ruleset:874 data/civ2/buildings.ruleset:867
#, fuzzy, no-c-format
msgid ""
"Increases trade resources by 50% on all squares with roads or railroads."
@@ -19049,11 +19197,11 @@ msgstr ""
"Aumenta os recursos comerciais em 50% em todas as quadrÃculas com estradas "
"ou ferrovias."
-#: data/default/buildings.ruleset:883 data/civ2/buildings.ruleset:873
+#: data/default/buildings.ruleset:882 data/civ2/buildings.ruleset:873
msgid "Supermarket"
msgstr "Supermercado"
-#: data/default/buildings.ruleset:898 data/civ2/buildings.ruleset:888
+#: data/default/buildings.ruleset:897 data/civ2/buildings.ruleset:888
#, fuzzy, no-c-format
msgid ""
"Increases the food resources by 50% on each farmland square which is being "
@@ -19064,12 +19212,12 @@ msgstr ""
"a ser utilizada nos arredores da cidade. QuadrÃculas de quinta são aqueles "
"que tiverem sido irrigados uma segunda vez."
-#: data/default/buildings.ruleset:905 data/civ2/buildings.ruleset:895
+#: data/default/buildings.ruleset:904 data/civ2/buildings.ruleset:895
#: data/civ1/buildings.ruleset:593
msgid "Temple"
msgstr "Templo"
-#: data/default/buildings.ruleset:919 data/civ2/buildings.ruleset:909
+#: data/default/buildings.ruleset:918 data/civ2/buildings.ruleset:909
#: data/civ1/buildings.ruleset:607
#, fuzzy
msgid ""
@@ -19081,13 +19229,13 @@ msgstr ""
"maravilha do Oráculo duplicam este efeito. Com ambos o Misticismo e "
"Oráculo, 4 cidadãos são tornados contentes."
-#: data/default/buildings.ruleset:926 data/civ2/buildings.ruleset:916
+#: data/default/buildings.ruleset:925 data/civ2/buildings.ruleset:916
#: data/civ1/buildings.ruleset:614 data/default/techs.ruleset:742
#: data/civ2/techs.ruleset:727 data/civ1/techs.ruleset:723
msgid "University"
msgstr "Universidade"
-#: data/default/buildings.ruleset:942
+#: data/default/buildings.ruleset:941
#, fuzzy, no-c-format
msgid ""
"Together with a Library, a University increases the science production of a "
@@ -19096,12 +19244,12 @@ msgstr ""
"Juntamente com uma Biblioteca, uma Universidade aumenta a produção "
"cientÃfica de uma cidade em 100%."
-#: data/default/buildings.ruleset:948 data/civ2/buildings.ruleset:938
+#: data/default/buildings.ruleset:947 data/civ2/buildings.ruleset:938
#: data/civ1/buildings.ruleset:636
msgid "Apollo Program"
msgstr "Programa Apolo"
-#: data/default/buildings.ruleset:962 data/civ2/buildings.ruleset:952
+#: data/default/buildings.ruleset:961 data/civ2/buildings.ruleset:952
#, fuzzy
msgid ""
"Entire map becomes visible for the player who owns it. It allows all "
@@ -19112,11 +19260,11 @@ msgstr ""
"todos os jogadores comecem a construir partes da nave espacial (desde que "
"tenham pesquisado as necessárias tecnologias)."
-#: data/default/buildings.ruleset:969 data/civ2/buildings.ruleset:959
+#: data/default/buildings.ruleset:968 data/civ2/buildings.ruleset:959
msgid "A.Smith's Trading Co."
msgstr "Companhia Comercial A.Smith"
-#: data/default/buildings.ruleset:983
+#: data/default/buildings.ruleset:982
#, fuzzy
msgid ""
"City improvements which would normally have an upkeep of 1 are free of "
@@ -19125,12 +19273,12 @@ msgstr ""
"Construções de cidade que normalmente teriam uma manutenção de 1 ficam "
"livres de qualquer manutenção, em todas as cidades."
-#: data/default/buildings.ruleset:989 data/civ2/buildings.ruleset:979
+#: data/default/buildings.ruleset:988 data/civ2/buildings.ruleset:979
#: data/civ1/buildings.ruleset:655
msgid "Colossus"
msgstr "Colosso"
-#: data/default/buildings.ruleset:1003 data/civ2/buildings.ruleset:993
+#: data/default/buildings.ruleset:1002 data/civ2/buildings.ruleset:993
#: data/civ1/buildings.ruleset:669
#, fuzzy
msgid ""
@@ -19140,23 +19288,23 @@ msgstr ""
"Cada quadrÃcula em redor da cidade em que esta maravilha for construida e "
"que já gere algum comércio produz um recurso de comércio adicional."
-#: data/default/buildings.ruleset:1009 data/civ2/buildings.ruleset:999
+#: data/default/buildings.ruleset:1008 data/civ2/buildings.ruleset:999
#: data/civ1/buildings.ruleset:675
msgid "Copernicus' Observatory"
msgstr "Observatório de Copérnico"
-#: data/default/buildings.ruleset:1024 data/civ2/buildings.ruleset:1180
+#: data/default/buildings.ruleset:1023 data/civ2/buildings.ruleset:1180
#: data/civ1/buildings.ruleset:837
#, fuzzy, no-c-format
msgid "Boosts science production by 100% in the city where it is built."
msgstr "Aumenta a produção cientÃfica da cidade onde for construido em 100%."
-#: data/default/buildings.ruleset:1029 data/civ2/buildings.ruleset:1019
+#: data/default/buildings.ruleset:1028 data/civ2/buildings.ruleset:1019
#: data/civ1/buildings.ruleset:695
msgid "Cure For Cancer"
msgstr "Cura do Câncer"
-#: data/default/buildings.ruleset:1043
+#: data/default/buildings.ruleset:1042
#, fuzzy
msgid ""
"This stunning technological achievement makes one unhappy citizen content in "
@@ -19165,12 +19313,12 @@ msgstr ""
"Esta maravilhosa meta cientÃfica torna um cidadão descontente em contente em "
"todas as cidades."
-#: data/default/buildings.ruleset:1051 data/civ2/buildings.ruleset:1039
+#: data/default/buildings.ruleset:1050 data/civ2/buildings.ruleset:1039
#: data/civ1/buildings.ruleset:715
msgid "Darwin's Voyage"
msgstr "Viagem de Darwin"
-#: data/default/buildings.ruleset:1065 data/civ2/buildings.ruleset:1053
+#: data/default/buildings.ruleset:1064 data/civ2/buildings.ruleset:1053
#: data/civ1/buildings.ruleset:729
#, fuzzy
msgid ""
@@ -19182,22 +19330,22 @@ msgstr ""
"que inspirou grande confiança na ciência. Oferece dois avanços tecnológicos "
"imediatos."
-#: data/default/buildings.ruleset:1072 data/civ2/buildings.ruleset:1060
+#: data/default/buildings.ruleset:1071 data/civ2/buildings.ruleset:1060
msgid "Eiffel Tower"
msgstr "Torre Eiffel"
-#: data/default/buildings.ruleset:1087
+#: data/default/buildings.ruleset:1086
#, no-c-format
msgid ""
"Your reputation and goodwill among other nations is recovered twice as fast."
msgstr ""
-#: data/default/buildings.ruleset:1093 data/civ2/buildings.ruleset:1081
+#: data/default/buildings.ruleset:1092 data/civ2/buildings.ruleset:1081
#: data/civ1/buildings.ruleset:736
msgid "Great Library"
msgstr "Grande Biblioteca"
-#: data/default/buildings.ruleset:1107 data/civ2/buildings.ruleset:1095
+#: data/default/buildings.ruleset:1106 data/civ2/buildings.ruleset:1095
#: data/civ1/buildings.ruleset:750
#, fuzzy
msgid ""
@@ -19207,22 +19355,22 @@ msgstr ""
"A civilização que construir a Grande Biblioteca obtém qualquer avanço "
"cientÃfico que pelo menos duas outras civilizações tenham atingido."
-#: data/default/buildings.ruleset:1113 data/civ2/buildings.ruleset:1101
+#: data/default/buildings.ruleset:1112 data/civ2/buildings.ruleset:1101
#: data/civ1/buildings.ruleset:756
msgid "Great Wall"
msgstr "A Grande Muralha"
-#: data/default/buildings.ruleset:1127
+#: data/default/buildings.ruleset:1126
#, fuzzy
msgid "Works as a City Wall in all your cities."
msgstr "Funciona como Muralhas em todas as cidades."
-#: data/default/buildings.ruleset:1135 data/civ2/buildings.ruleset:1122
+#: data/default/buildings.ruleset:1134 data/civ2/buildings.ruleset:1122
#: data/civ1/buildings.ruleset:777
msgid "Hanging Gardens"
msgstr "Jardins Suspensos"
-#: data/default/buildings.ruleset:1149 data/civ2/buildings.ruleset:1136
+#: data/default/buildings.ruleset:1148 data/civ2/buildings.ruleset:1136
#: data/civ1/buildings.ruleset:791
#, fuzzy
msgid ""
@@ -19238,12 +19386,12 @@ msgstr ""
"para obterem o efeito dos Jardins Suspensos, a maravilha aplica-se a "
"cidadãos descontentes (tornando-os contentes)."
-#: data/default/buildings.ruleset:1158 data/civ2/buildings.ruleset:1145
+#: data/default/buildings.ruleset:1157 data/civ2/buildings.ruleset:1145
#: data/civ1/buildings.ruleset:800
msgid "Hoover Dam"
msgstr "Barragem Hoover"
-#: data/default/buildings.ruleset:1173 data/civ2/buildings.ruleset:1159
+#: data/default/buildings.ruleset:1172 data/civ2/buildings.ruleset:1159
#, fuzzy
msgid ""
"Works as if you had a Hydro Plant in every city. (This reduces pollution "
@@ -19252,32 +19400,32 @@ msgstr ""
"Funciona como se possuisse uma Barragem em cada cidade. (Isto reduz a "
"poluição e aumenta o efeito das Fábricas e Unidades Transformadoras.)"
-#: data/default/buildings.ruleset:1179 data/civ2/buildings.ruleset:1165
+#: data/default/buildings.ruleset:1178 data/civ2/buildings.ruleset:1165
#: data/civ1/buildings.ruleset:822
msgid "Isaac Newton's College"
msgstr "Colégio de Isaac Newton"
-#: data/default/buildings.ruleset:1194
+#: data/default/buildings.ruleset:1193
#, fuzzy, no-c-format
msgid ""
"Boosts science production by 100% in every city you control that has a "
"University."
msgstr "Aumenta a produção cientÃfica da cidade onde for construido em 100%."
-#: data/default/buildings.ruleset:1200 data/civ2/buildings.ruleset:1185
+#: data/default/buildings.ruleset:1199 data/civ2/buildings.ruleset:1185
#: data/civ1/buildings.ruleset:842
msgid "J.S. Bach's Cathedral"
msgstr "Catedral de J.S. Bach"
-#: data/default/buildings.ruleset:1214 data/civ2/buildings.ruleset:1199
+#: data/default/buildings.ruleset:1213 data/civ2/buildings.ruleset:1199
msgid "Makes two unhappy citizens content in every city."
msgstr "Torna dois cidadãos descontentes em contentes em cada cidade."
-#: data/default/buildings.ruleset:1219 data/civ2/buildings.ruleset:1204
+#: data/default/buildings.ruleset:1218 data/civ2/buildings.ruleset:1204
msgid "King Richard's Crusade"
msgstr "Cruzada do Rei Ricardo"
-#: data/default/buildings.ruleset:1233 data/civ2/buildings.ruleset:1218
+#: data/default/buildings.ruleset:1232 data/civ2/buildings.ruleset:1218
#, fuzzy
msgid ""
"Adds one extra shield resource on every square around the city where it is "
@@ -19286,20 +19434,20 @@ msgstr ""
"Gera um recurso de escudo adicional em cada quadrÃcula em redor da cidade em "
"que for construida."
-#: data/default/buildings.ruleset:1239 data/civ2/buildings.ruleset:1224
+#: data/default/buildings.ruleset:1238 data/civ2/buildings.ruleset:1224
msgid "Leonardo's Workshop"
msgstr "Oficina do Leonardo"
-#: data/default/buildings.ruleset:1253 data/civ2/buildings.ruleset:1238
+#: data/default/buildings.ruleset:1252 data/civ2/buildings.ruleset:1238
msgid "Upgrades one obsolete unit per game turn."
msgstr "Atualiza uma unidade obsoleta por cada turno de jogo."
-#: data/default/buildings.ruleset:1258 data/civ2/buildings.ruleset:1243
+#: data/default/buildings.ruleset:1257 data/civ2/buildings.ruleset:1243
#: data/civ1/buildings.ruleset:862
msgid "Lighthouse"
msgstr "Farol"
-#: data/default/buildings.ruleset:1273
+#: data/default/buildings.ruleset:1272
#, fuzzy
msgid ""
"Gives all your sea units 1 additional movement point and eliminates the risk "
@@ -19310,37 +19458,37 @@ msgstr ""
"risco de perder triremes em alto mar. Torna todas as novas unidades "
"marÃtimas veteranas (em todas as cidades)."
-#: data/default/buildings.ruleset:1280 data/civ2/buildings.ruleset:1264
+#: data/default/buildings.ruleset:1279 data/civ2/buildings.ruleset:1264
#: data/civ1/buildings.ruleset:885
msgid "Magellan's Expedition"
msgstr "Expedição de Magalhães"
-#: data/default/buildings.ruleset:1295
+#: data/default/buildings.ruleset:1294
#, fuzzy
msgid "Gives all your sea units 2 additional movement points."
msgstr "Dá a todas as unidades marÃtimas dois pontos de movimento adicionais."
-#: data/default/buildings.ruleset:1300 data/civ2/buildings.ruleset:1283
+#: data/default/buildings.ruleset:1299 data/civ2/buildings.ruleset:1283
#: data/civ1/buildings.ruleset:904
msgid "Manhattan Project"
msgstr "Projeto Manhattan"
-#: data/default/buildings.ruleset:1318 data/civ2/buildings.ruleset:1301
+#: data/default/buildings.ruleset:1317 data/civ2/buildings.ruleset:1301
msgid "Marco Polo's Embassy"
msgstr "Embaixada de Marco Polo"
-#: data/default/buildings.ruleset:1332 data/civ2/buildings.ruleset:1315
+#: data/default/buildings.ruleset:1331 data/civ2/buildings.ruleset:1315
#, fuzzy
msgid "The player who owns it gets an embassy with all players."
msgstr ""
"O jogador que a possuir obtém uma embaixada junto de todos os jogadores."
-#: data/default/buildings.ruleset:1337 data/civ2/buildings.ruleset:1320
+#: data/default/buildings.ruleset:1336 data/civ2/buildings.ruleset:1320
#: data/civ1/buildings.ruleset:922
msgid "Michelangelo's Chapel"
msgstr "Capela Sistina"
-#: data/default/buildings.ruleset:1351 data/civ2/buildings.ruleset:1334
+#: data/default/buildings.ruleset:1350 data/civ2/buildings.ruleset:1334
#, fuzzy
msgid ""
"Counts as having a Cathedral in each of your cities. This makes 3 unhappy "
@@ -19355,22 +19503,22 @@ msgstr ""
"adicional. A descoberta do Comunismo reduz o efeito de uma Catedral, "
"reduzindo em um o número de cidadãos descontentes tornados contentes."
-#: data/default/buildings.ruleset:1361 data/civ2/buildings.ruleset:1344
+#: data/default/buildings.ruleset:1360 data/civ2/buildings.ruleset:1344
#: data/civ1/buildings.ruleset:941
msgid "Oracle"
msgstr "Oráculo"
-#: data/default/buildings.ruleset:1375
+#: data/default/buildings.ruleset:1374
#, fuzzy
msgid "Makes two of your unhappy citizens content in every city with a temple."
msgstr "Torna dois cidadãos descontentes em contentes em cada cidade."
-#: data/default/buildings.ruleset:1380 data/civ2/buildings.ruleset:1363
+#: data/default/buildings.ruleset:1379 data/civ2/buildings.ruleset:1363
#: data/civ1/buildings.ruleset:960
msgid "Pyramids"
msgstr "Pirâmides"
-#: data/default/buildings.ruleset:1394
+#: data/default/buildings.ruleset:1393
#, fuzzy
msgid ""
"The amount of stored food lost when one of your cities grows or shrinks is "
@@ -19381,22 +19529,22 @@ msgstr ""
"com Celeiro aumente ou diminua. Isto leva a que uma cidade cresca mais "
"rapidamente e melhor resista à fome."
-#: data/default/buildings.ruleset:1401 data/civ2/buildings.ruleset:1382
+#: data/default/buildings.ruleset:1400 data/civ2/buildings.ruleset:1382
#: data/civ1/buildings.ruleset:981
msgid "SETI Program"
msgstr "Programa SETI"
-#: data/default/buildings.ruleset:1415
+#: data/default/buildings.ruleset:1414
#, fuzzy
msgid "Boosts science production in each city with a Research Lab by 100%. "
msgstr "Aumenta a produção cientÃfica em cada cidade por 100%."
-#: data/default/buildings.ruleset:1420 data/civ2/buildings.ruleset:1402
+#: data/default/buildings.ruleset:1419 data/civ2/buildings.ruleset:1402
#: data/civ1/buildings.ruleset:1001
msgid "Shakespeare's Theatre"
msgstr "Teatro de Shakespeare"
-#: data/default/buildings.ruleset:1434 data/civ2/buildings.ruleset:1416
+#: data/default/buildings.ruleset:1433 data/civ2/buildings.ruleset:1416
#: data/civ1/buildings.ruleset:1015
#, fuzzy
msgid "Makes all unhappy citizens content, in the city where it is located."
@@ -19404,11 +19552,11 @@ msgstr ""
"Torna todos os cidadãos descontentes em contentes, na cidade onde estiver "
"localizado."
-#: data/default/buildings.ruleset:1439 data/civ2/buildings.ruleset:1421
+#: data/default/buildings.ruleset:1438 data/civ2/buildings.ruleset:1421
msgid "Statue of Liberty"
msgstr "Estátua da Liberdade"
-#: data/default/buildings.ruleset:1453 data/civ2/buildings.ruleset:1435
+#: data/default/buildings.ruleset:1452 data/civ2/buildings.ruleset:1435
#: data/civ1/buildings.ruleset:974 data/civ1/buildings.ruleset:1034
#, fuzzy
msgid ""
@@ -19420,11 +19568,11 @@ msgstr ""
"sido ainda pesquisados pela sua civilização, e sem o perÃodo transitivo "
"Anárquico."
-#: data/default/buildings.ruleset:1460 data/civ2/buildings.ruleset:1442
+#: data/default/buildings.ruleset:1459 data/civ2/buildings.ruleset:1442
msgid "Sun Tzu's War Academy"
msgstr "Academia Militar de Sun Tzu"
-#: data/default/buildings.ruleset:1474
+#: data/default/buildings.ruleset:1473
#, fuzzy
msgid ""
"All your new ground units start at the first veteran level. The chance of a "
@@ -19434,22 +19582,22 @@ msgstr ""
"cidades). A probabilidade de uma unidade se tornar veterana após uma "
"batalha aumenta de 50% para 100%."
-#: data/default/buildings.ruleset:1481 data/civ2/buildings.ruleset:1463
+#: data/default/buildings.ruleset:1480 data/civ2/buildings.ruleset:1463
#: data/civ1/buildings.ruleset:1020
msgid "United Nations"
msgstr "Nações Unidas"
-#: data/default/buildings.ruleset:1495
+#: data/default/buildings.ruleset:1494
#, fuzzy
msgid "All your units regain two extra hitpoints per turn."
msgstr "Unidades recuperam dois pontos de resistência adicionais por turno."
-#: data/default/buildings.ruleset:1508 data/civ2/buildings.ruleset:1490
+#: data/default/buildings.ruleset:1507 data/civ2/buildings.ruleset:1490
#: data/civ1/buildings.ruleset:1046
msgid "Women's Suffrage"
msgstr "Sufrágio Feminino"
-#: data/default/buildings.ruleset:1522 data/civ2/buildings.ruleset:1504
+#: data/default/buildings.ruleset:1521 data/civ2/buildings.ruleset:1504
#, fuzzy
msgid ""
"Counts as a Police Station in every city. (That is, for each city, reduces "
@@ -19461,11 +19609,11 @@ msgstr ""
"em 2 sob uma Democracia e em 1 sob uma República. Esta maravilha não tem "
"qualquer efeito sob outras formas de governo.)"
-#: data/default/buildings.ruleset:1533
+#: data/default/buildings.ruleset:1532
msgid "Coinage"
msgstr "Cunhagem"
-#: data/default/buildings.ruleset:1554
+#: data/default/buildings.ruleset:1553
#, fuzzy
msgid ""
"This is not a normal improvement. Instead, setting a city's production to "
@@ -19937,11 +20085,16 @@ msgstr "Céltico"
msgid "?citystyle:Industrial"
msgstr "Industrial"
-#: data/default/cities.ruleset:139 data/civ2/cities.ruleset:150
+#: data/default/cities.ruleset:139
+#, fuzzy
+msgid "?citystyle:ElectricAge"
+msgstr "Céltico"
+
+#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:150
msgid "?citystyle:Modern"
msgstr "Moderno"
-#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:161
+#: data/default/cities.ruleset:161 data/civ2/cities.ruleset:161
msgid "?citystyle:PostModern"
msgstr "Pós-moderno"
@@ -25186,6 +25339,46 @@ msgid "Team 31"
msgstr "Time 31"
#, fuzzy
+#~ 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."
+
+#, fuzzy
+#~ msgid "Observers cannot vote."
+#~ msgstr "não pode aceder ao arquivo"
+
+#, fuzzy
+#~ msgid "Vote %d \"%s\": %d for, %d against"
+#~ msgstr "valor vazio para %s"
+
+#, fuzzy
+#~ msgid "Value must be integer."
+#~ msgstr "Valor tem de ser um inteiro."
+
+#, fuzzy
+#~ 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 Hydro Plant, Power Plant, or Nuclear Plant. A "
+#~ "city can only build a Hydro Plant if it is next to (or on) a Mountain or "
+#~ "River tile."
+#~ msgstr ""
+#~ "Reduz a quantidade de poluição gerada pela produção numa cidade em 50%. "
+#~ "Também aumenta a produção de escudos de uma Fábrica ou Unidade "
+#~ "Transformadora numa cidade: uma Fábrica e Barragem juntas dão um bónus de "
+#~ "75% de produção e uma Fábrica, Unidade Transformadora e Barragem juntas "
+#~ "dão um bónus produtivo de 150%.\n"
+#~ "\n"
+#~ "Uma cidade apenas pode ter uma Barragem, Central Térmica ou Central "
+#~ "Nuclear. Uma cidade apenas pode construir uma Barragem se estiver junto a "
+#~ "uma (ou numa) quadrÃcula de Montanha ou Rio."
+
+#, fuzzy
#~ msgid "Auth config filename \"%s\" not allowed!"
#~ msgstr "Isso não é um nome válido, tente de novo.\n"
diff --git a/po/ro.gmo b/po/ro.gmo
index 9ad85a7..e6d36a1 100644
Binary files a/po/ro.gmo and b/po/ro.gmo differ
diff --git a/po/ro.po b/po/ro.po
index d72e8c7..ac31618 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: 2009-03-29 21:13+0900\n"
+"POT-Creation-Date: 2009-11-22 21:37+0100\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"
@@ -66,21 +66,21 @@ msgstr "?obsolete:O"
msgid "?redundant:*"
msgstr "?redundant:*"
-#: common/connection.c:515
+#: common/connection.c:518
#, c-format
msgid "%s from %s"
msgstr "%s de la %s"
-#: common/connection.c:521
+#: common/connection.c:524
msgid " (connection incomplete)"
msgstr " (conexiune incompletă)"
-#: common/connection.c:525
+#: common/connection.c:528
#, c-format
msgid " (player %s)"
msgstr " (jucătorul %s)"
-#: common/connection.c:529
+#: common/connection.c:532
msgid " (observer)"
msgstr " (observator)"
@@ -485,81 +485,81 @@ msgstr "Mesaje de conectare/deconectare"
msgid "AI Debug messages"
msgstr "Mesaje de depanare de la AI"
-#: common/player.c:732
+#: common/player.c:746
msgid "?attitude:Genocidal"
msgstr "?attitude:Criminal"
-#: common/player.c:734
+#: common/player.c:748
msgid "?attitude:Belligerent"
msgstr "?attitude:Beligerant"
-#: common/player.c:736
+#: common/player.c:750
msgid "?attitude:Hostile"
msgstr "?attitude:Ostil"
-#: common/player.c:738
+#: common/player.c:752
msgid "?attitude:Uncooperative"
msgstr "?attitude:Necooperant"
-#: common/player.c:740
+#: common/player.c:754
msgid "?attitude:Uneasy"
msgstr "?attitude:Dificil"
-#: common/player.c:742
+#: common/player.c:756
msgid "?attitude:Neutral"
msgstr "?attitude:Neutru"
-#: common/player.c:744
+#: common/player.c:758
msgid "?attitude:Respectful"
msgstr "?attitude:Respectuos"
-#: common/player.c:746
+#: common/player.c:760
msgid "?attitude:Helpful"
msgstr "?attitude:Săritor"
-#: common/player.c:748
+#: common/player.c:762
msgid "?attitude:Enthusiastic"
msgstr "?attitude:Entuyiasmat"
-#: common/player.c:750
+#: common/player.c:764
msgid "?attitude:Admiring"
msgstr "?attitude:Admirativ"
-#: common/player.c:753
+#: common/player.c:767
msgid "?attitude:Worshipful"
msgstr "?attitude:Plin de adoraţie"
-#: common/player.c:764
+#: common/player.c:778
msgid "?diplomatic_state:Armistice"
msgstr "?diplomatic_state:Armistiţiu"
-#: common/player.c:765
+#: common/player.c:779
msgid "?diplomatic_state:War"
msgstr "?diplomatic_state:Război"
-#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:780 client/gui-gtk-2.0/diplodlg.c:353
#: 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:767 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:781 client/gui-gtk-2.0/diplodlg.c:358
#: 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:768 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:782 client/gui-gtk-2.0/diplodlg.c:363
#: 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:769
+#: common/player.c:783
msgid "?diplomatic_state:Never met"
msgstr "?diplomatic_state:Fără contact"
-#: common/player.c:770
+#: common/player.c:784
msgid "?diplomatic_state:Team"
msgstr "?diplomatic_state:Echipă"
@@ -590,7 +590,7 @@ msgstr "Cerinţele de supravieţuire sunt suportate numai la nivel mondial."
#. TRANS: "Resources: (none)".
#: common/requirements.c:1014 common/team.c:132
#: client/gui-gtk-2.0/helpdlg.c:1055 client/gui-gtk-2.0/inteldlg.c:390
-#: client/gui-win32/helpdlg.c:586 client/gui-xaw/helpdlg.c:991
+#: client/gui-win32/helpdlg.c:592 client/gui-xaw/helpdlg.c:991
#, c-format
msgid "(none)"
msgstr "(nimic)"
@@ -616,10 +616,11 @@ msgstr "Teh. Avansată %d"
#: 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
#: client/gui-sdl/helpdlg.c:817 client/gui-sdl/mapview.c:962
-#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:545
-#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:735
-#: 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
+#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:544
+#: client/gui-win32/helpdlg.c:551 client/gui-win32/helpdlg.c:721
+#: client/gui-win32/helpdlg.c:741 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 "NIci o"
@@ -632,29 +633,29 @@ msgstr "Teh. Avansată"
msgid "(Unknown)"
msgstr "(Necunoscută)"
-#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:553
#: manual/civmanual.c:224
msgid "Road"
msgstr "Drum"
-#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:557
#: client/gui-gtk-2.0/menu.c:829 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:394 common/terrain.c:572 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:567
#: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
#: data/civ1/techs.ruleset:563
msgid "Railroad"
msgstr "Calea ferată"
-#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:555
msgid "Mine"
msgstr "Mină"
-#: common/terrain.c:396 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:551 server/report.c:124
#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "Poluare"
@@ -663,7 +664,7 @@ msgstr "Poluare"
msgid "Hut"
msgstr "Cocioabă"
-#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:563
#: manual/civmanual.c:226
msgid "Fortress"
msgstr "Fortăreaţa"
@@ -676,58 +677,58 @@ msgstr "Râu"
msgid "Farmland"
msgstr "Teren arabil"
-#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:577
#: manual/civmanual.c:226
msgid "Airbase"
msgstr "Bază aeriană"
-#: common/terrain.c:402 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:579
msgid "Fallout"
msgstr "Contaminare Radioactivă"
-#: common/unit.c:546 client/gui-win32/plrdlg.c:337
+#: common/unit.c:549 client/gui-win32/plrdlg.c:337
msgid "Idle"
msgstr "Inactiv"
-#: common/unit.c:556
+#: common/unit.c:559
msgid "Fortifying"
msgstr "Fortifică."
-#: common/unit.c:558
+#: common/unit.c:561
msgid "Fortified"
msgstr "Fortificat"
-#: common/unit.c:562 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
+#: common/unit.c:565 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
msgid "Sentry"
msgstr "Pază"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
+#: common/unit.c:569 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
#: client/gui-win32/menu.c:370 client/gui-xaw/menu.c:185
msgid "Pillage"
msgstr "Prădează"
-#: common/unit.c:568 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
+#: common/unit.c:571 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
msgid "Goto"
msgstr "Mergi la"
-#: common/unit.c:570
+#: common/unit.c:573
msgid "Explore"
msgstr "Explorează"
-#: common/unit.c:572 manual/civmanual.c:224
+#: common/unit.c:575 manual/civmanual.c:224
msgid "Transform"
msgstr "Transformă"
-#: common/unit.c:584 client/text.c:157 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:587 client/text.c:157 client/gui-sdl/citydlg.c:1972
#: client/gui-win32/citydlg.c:1257 client/gui-xaw/citydlg.c:1423
msgid "Unknown"
msgstr "Necunoscut"
-#: common/unit.c:1022
+#: common/unit.c:1025
msgid "Moves"
msgstr "Mişcări"
-#: common/unit.c:1571
+#: common/unit.c:1574
#, c-format
msgid ""
"Upgrade %s to %s for %d gold?\n"
@@ -736,12 +737,12 @@ msgstr ""
"Modernizează %s în %s pentru %d galbeni?\n"
"Trezoreria conţine %d galbeni."
-#: common/unit.c:1579
+#: common/unit.c:1582
#, c-format
msgid "Sorry, cannot upgrade %s (yet)."
msgstr "Din păcate nu pot (încă) moderniza %s."
-#: common/unit.c:1585
+#: common/unit.c:1588
#, c-format
msgid ""
"Upgrading %s to %s costs %d gold.\n"
@@ -750,11 +751,11 @@ msgstr ""
"Modernizarea lui %s în %s costă %d galbeni.\n"
"Trezoreria conţine %d galbeni."
-#: common/unit.c:1594
+#: common/unit.c:1597
msgid "You can only upgrade units in your cities."
msgstr "Poţi îmbunătăţi unităţile doar într-un oraş."
-#: common/unit.c:1598
+#: common/unit.c:1601
#, c-format
msgid "Upgrading this %s would strand units it transports."
msgstr ""
@@ -793,11 +794,11 @@ msgstr "Bomba atomică"
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1404
+#: common/unittype.c:349 client/helpdata.c:1412
msgid " and "
msgstr " ÅŸi "
-#: common/unittype.c:355 client/helpdata.c:1390
+#: common/unittype.c:355 client/helpdata.c:1398
msgid "?and:, "
msgstr "?and:, "
@@ -967,74 +968,74 @@ msgstr "Argument gol pentru \"%s\".\n"
msgid "Missing argument for \"%s\".\n"
msgstr "Argument lipsă pentru \"%s\".\n"
-#: utility/shared.c:501
+#: utility/shared.c:514
#, c-format
msgid "%d BC"
msgstr "%d î.e.n."
-#: utility/shared.c:503
+#: utility/shared.c:516
#, c-format
msgid "%d AD"
msgstr "%d e.n."
-#: utility/shared.c:924
+#: utility/shared.c:937
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:1028
+#: utility/shared.c:1041
#, c-format
msgid "Could not read data directory %s: %s."
msgstr "Nu am putu citi directorul pentru date %s: %s."
-#: utility/shared.c:1279
+#: utility/shared.c:1292
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:1281
+#: utility/shared.c:1294
#, c-format
msgid "Current data path is: \"%s\""
msgstr "Calea curentă pentru date este: \"%s\""
-#: utility/shared.c:1283
+#: utility/shared.c:1296
#, c-format
msgid "The \"%s\" file is required ... aborting!"
msgstr "Este necesar fişierul \"%s\"...se abandonează!"
-#: utility/shared.c:1460
+#: utility/shared.c:1485
#, 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:1462
+#: utility/shared.c:1487
msgid "Use a non-privileged account instead.\n"
msgstr "Foloseşte în schimb un cont de utilizator fără privilegii.\n"
-#: utility/shared.c:1478
+#: utility/shared.c:1503
msgid "exact match"
msgstr "potrivire exactă"
-#: utility/shared.c:1479
+#: utility/shared.c:1504
msgid "only match"
msgstr "only match"
-#: utility/shared.c:1480
+#: utility/shared.c:1505
msgid "ambiguous"
msgstr "ambiguu"
-#: utility/shared.c:1481
+#: utility/shared.c:1506
msgid "empty"
msgstr "gol"
-#: utility/shared.c:1482
+#: utility/shared.c:1507
msgid "too long"
msgstr "prea lung"
-#: utility/shared.c:1483
+#: utility/shared.c:1508
msgid "non-match"
msgstr "nepotrivire"
@@ -1063,22 +1064,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:280
+#: ai/advdiplomacy.c:300
#, 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:290
+#: ai/advdiplomacy.c:310
#, 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:303
+#: ai/advdiplomacy.c:322
#, 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:308
+#: ai/advdiplomacy.c:327
#, c-format
msgid ""
"*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
@@ -1087,49 +1088,49 @@ msgstr ""
"*%s (AI)* Vreau să menţii starea curentă de încetare a focului ceva mai mult "
"timp, %s."
-#: ai/advdiplomacy.c:331
+#: ai/advdiplomacy.c:350
#, 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:424
+#: ai/advdiplomacy.c:443
#, 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:454
+#: ai/advdiplomacy.c:473
#, 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:560
+#: ai/advdiplomacy.c:579
#, 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:582
+#: ai/advdiplomacy.c:601
#, c-format
msgid "*%s (AI)* Welcome into our alliance %s!"
msgstr "*%s (AI)* Bun venit în alianţa noastră %s!"
-#: ai/advdiplomacy.c:586
+#: ai/advdiplomacy.c:605
#, 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:593
+#: ai/advdiplomacy.c:612
#, c-format
msgid "*%s (AI)* Yes, peace in our time!"
msgstr "*%s (AI)* Da, să fie pace în vremea noastră!"
-#: ai/advdiplomacy.c:598
+#: ai/advdiplomacy.c:617
#, c-format
msgid "*%s (AI)* Agreed. No more hostilities, %s."
msgstr "*%s (AI)*de acord. Sa încetăm ostilităţile, %s."
-#: ai/advdiplomacy.c:813
+#: ai/advdiplomacy.c:832
#, c-format
msgid ""
"*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
@@ -1138,23 +1139,23 @@ msgstr ""
"*%s (AI)* Salutare %s! Pot să propun încetarea focului pentru a ne cunoaşte "
"mai bine ?"
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1116
#, c-format
msgid "*%s (AI)* Space will never be yours. "
msgstr "*%s (AI)* Spaţiul nu va fi niciodată al vostru. "
-#: ai/advdiplomacy.c:1102
+#: ai/advdiplomacy.c:1121
#, 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:1108
+#: ai/advdiplomacy.c:1127
#, c-format
msgid "*%s (AI)* Peace in ... some other time."
msgstr "*%s (AI)* Pace ... altădată."
-#: ai/advdiplomacy.c:1113
+#: ai/advdiplomacy.c:1132
#, c-format
msgid ""
"*%s (AI)* Finally I get around to you! Did you really think you could get "
@@ -1163,17 +1164,17 @@ msgstr ""
"*%s (AI)* În sfârşit te+am ajuns! Chiar credeai că vei scăpa nepedepsit "
"pentru crimele comise?"
-#: ai/advdiplomacy.c:1119
+#: ai/advdiplomacy.c:1138
#, 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:1126
+#: ai/advdiplomacy.c:1145
#, 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:1209
+#: ai/advdiplomacy.c:1229
#, c-format
msgid ""
"*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1188,7 +1189,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:1219
+#: ai/advdiplomacy.c:1239
#, c-format
msgid ""
"*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
@@ -1197,7 +1198,7 @@ msgstr ""
"*%s (AI)* Ajutorul tău va fi aşteptat în această problemă.Fie ca glorioasa "
"noastră alianţă să dureze!"
-#: ai/advdiplomacy.c:1225
+#: ai/advdiplomacy.c:1245
#, c-format
msgid ""
"*%s (AI)* %s has grossly violated his treaties with us for own gain. We "
@@ -1216,7 +1217,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:1238
+#: ai/advdiplomacy.c:1258
#, c-format
msgid ""
"*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1231,13 +1232,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:1246
+#: ai/advdiplomacy.c:1266
#, 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:1251
+#: ai/advdiplomacy.c:1271
#, c-format
msgid ""
"*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1252,12 +1253,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:1261
+#: ai/advdiplomacy.c:1281
#, 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:1267
+#: ai/advdiplomacy.c:1287
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance and declare war on %s in %d turn. "
@@ -1272,7 +1273,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:1276
+#: ai/advdiplomacy.c:1296
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1287,7 +1288,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:1344
+#: ai/advdiplomacy.c:1364
#, c-format
msgid ""
"*%s (AI)* Your attempt to conquer space for yourself alone betray your true "
@@ -1296,7 +1297,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:1359
+#: ai/advdiplomacy.c:1379
#, c-format
msgid ""
"*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
@@ -1304,7 +1305,7 @@ msgid ""
msgstr ""
"*%s (AI)* Încercarea ta de a domina spaţiul de unul singur este insultătoare."
-#: ai/advdiplomacy.c:1362
+#: ai/advdiplomacy.c:1382
#, c-format
msgid ""
"*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
@@ -1313,12 +1314,12 @@ msgstr ""
"*%s (AI)* Dacă nu încetezi construcţia navei spaţiale, voi fi nevoit să iau "
"măsuri!"
-#: ai/advdiplomacy.c:1474
+#: ai/advdiplomacy.c:1494
#, 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:1549
+#: ai/advdiplomacy.c:1569
#, c-format
msgid ""
"*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
@@ -1327,7 +1328,7 @@ msgstr ""
"*%s (AI)* Salutări aliatul nostru de încredere. Îţi solicităm să distrugi "
"inamicul nostru, %s."
-#: ai/advdiplomacy.c:1555
+#: ai/advdiplomacy.c:1575
#, c-format
msgid ""
"*%s (AI)* Greetings ally, I see you have not yet made war with our enemy, %"
@@ -1336,7 +1337,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:1562
+#: ai/advdiplomacy.c:1582
#, c-format
msgid ""
"*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1347,7 +1348,7 @@ msgstr ""
"ataci duşmanul nostru de moarte, %s! Nu putem accepta acest lucru; alianţa "
"noastrâ nu mai existâ !"
-#: ai/advdiplomacy.c:1592
+#: ai/advdiplomacy.c:1612
#, c-format
msgid ""
"*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
@@ -1356,12 +1357,12 @@ msgstr ""
"*%s (AI)* Salutări prietene, pot sugera aderarea la o cauză comuna şi "
"formarea unei alianţe?"
-#: ai/advdiplomacy.c:1607
+#: ai/advdiplomacy.c:1627
#, 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:1622
+#: ai/advdiplomacy.c:1642
#, c-format
msgid ""
"*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
@@ -1370,7 +1371,7 @@ msgstr ""
"*%s (AI)* Această vărsare de sânge este obositoare. Sunteţii de acord cu "
"încetarea ostilităţilor?"
-#: ai/advdiplomacy.c:1742
+#: ai/advdiplomacy.c:1762
#, c-format
msgid ""
"*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1529,17 +1530,17 @@ msgstr ""
"Parola trebuie să aibă cel puţin %d litere mari, %d numere, şi trebuie să "
"aibă o lungime de cel puţin %d caractere [imprimabile]. Mai încearcă odată."
-#: server/barbarian.c:183
+#: server/barbarian.c:184
#, fuzzy, c-format
msgid "%s gain a leader by the name %s. Dangerous times may lie ahead."
msgstr "Barbarii au un nou lider pe nume %s. Ne aşteaptă vremuri periculoase."
-#: server/barbarian.c:479
+#: server/barbarian.c:480
#, c-format
msgid "Native unrest near %s led by %s."
msgstr "Revoltă a băştinaşilor lîngă %s sub conducerea lui %s."
-#: server/barbarian.c:484
+#: server/barbarian.c:485
#, c-format
msgid "Sea raiders seen near %s!"
msgstr "Au fost observaţi piraţi în apropiere de %s!"
@@ -1936,7 +1937,7 @@ msgstr[0] ""
msgstr[1] ""
"%s accelerează cercetările ştiinţifice. Aţi dobândit %d noi tehnologii."
-#: server/cityturn.c:1158 server/techtools.c:176
+#: server/cityturn.c:1158 server/techtools.c:172
#, c-format
msgid "The %s have acquired %s from %s."
msgstr "%si au obţinut %s de la %s."
@@ -2022,22 +2023,22 @@ msgstr ""
"Avertizment: opţiunea %s este învechită. Foloseşte opţiunea -m pentru a "
"activa metaserver-ul.\n"
-#: server/civserver.c:189
+#: server/civserver.c:193
#, c-format
msgid "Error: unknown option '%s'\n"
msgstr "Eroare: opţiune necunoscută '%s'\n"
-#: server/civserver.c:200
+#: server/civserver.c:204
#, c-format
msgid "This is the server for %s"
msgstr "Acesta este serverul %s"
-#: server/civserver.c:201
+#: server/civserver.c:205
#, c-format
msgid "You can learn a lot about Freeciv at %s"
msgstr "Puteţi învăţa multe lucruri despre Freeciv la %s"
-#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
+#: server/civserver.c:210 client/civclient.c:239 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -2046,115 +2047,120 @@ msgstr ""
"Mod de folosire: %s [opţiune ...]\n"
"Opţiunile valide sunt:\n"
-#: server/civserver.c:208
+#: server/civserver.c:212
#, fuzzy
msgid ""
" -a --auth FILE\tEnable server authentication with configuration from "
"FILE.\n"
msgstr " -a --auth\t\tActivează autentificarea server-ului.\n"
-#: server/civserver.c:210
+#: server/civserver.c:214
msgid " -G --Guests\t\tAllow guests to login if auth is enabled.\n"
msgstr ""
" -G --Guests\t\tPermite accesul oaspeţilor dacă este activată "
"autentificarea.\n"
-#: server/civserver.c:212
+#: server/civserver.c:216
msgid " -N --Newusers\tAllow new users to login if auth is enabled.\n"
msgstr ""
" -N --Newusers\tPermite accesul utilizatorilor noi dacă este activată "
"autentificarea.\n"
-#: server/civserver.c:215
+#: server/civserver.c:219
msgid " -b --bind ADDR\tListen for clients on ADDR\n"
msgstr " -b --bind ADDR\tAşteaptă conexiunile clienţilor la adresa ADDR\n"
-#: server/civserver.c:217 client/civclient.c:242
+#: server/civserver.c:221 client/civclient.c:243
msgid ""
" -d, --debug NUM\tSet debug log level (0 to 4, or 4:file1,min,max:...)\n"
msgstr ""
" -d, --debug NUM\tSet debug log level (0 to 4, or 4:file1,min,max:...)\n"
-#: server/civserver.c:221 client/civclient.c:246
+#: server/civserver.c:225 client/civclient.c:247
msgid " -d, --debug NUM\tSet debug log level (0 to 3)\n"
msgstr ""
" -d, --debug NUM\tSetează nivelul jurnalulul pentru depanare (de la 0 la "
"3)\n"
-#: server/civserver.c:223
+#: server/civserver.c:227
msgid " -f, --file FILE\tLoad saved game FILE\n"
msgstr " -f, --file FIŞIER\tÎncarcă un joc salvat cu numele FIŞIER\n"
-#: server/civserver.c:225 client/civclient.c:249 manual/civmanual.c:382
+#: server/civserver.c:229 client/civclient.c:250 manual/civmanual.c:382
msgid " -h, --help\t\tPrint a summary of the options\n"
msgstr " -h, --help\t\tAfişează sumarul opţiunilor\n"
-#: server/civserver.c:226
+#: server/civserver.c:230
+#, fuzzy
+msgid " -i, --identity ADDR\tBe known as ADDR at metaserver\n"
+msgstr " -M, --Metaserver ADDR\tSetează ADDR ca adresă pentru metaserver\n"
+
+#: server/civserver.c:231
msgid " -l, --log FILE\tUse FILE as logfile\n"
msgstr " -l, --log FIÅžIER\tFoloseÅŸte FIÅžIER ca fiÅŸier pentru jurnal\n"
-#: server/civserver.c:227
+#: server/civserver.c:232
msgid " -m, --meta\t\tNotify metaserver and send server's info\n"
msgstr ""
" -m, --meta\t\tAnunţă metaserver-ul şi trimite informaţiile despre server\n"
-#: server/civserver.c:229
+#: server/civserver.c:234
msgid " -M, --Metaserver ADDR\tSet ADDR as metaserver address\n"
msgstr " -M, --Metaserver ADDR\tSetează ADDR ca adresă pentru metaserver\n"
-#: server/civserver.c:232
+#: server/civserver.c:237
msgid " -p, --port PORT\tListen for clients on port PORT\n"
msgstr " -p, --port PORT\tAşteaptă conexiunile de la clienţi pe portul PORT\n"
-#: server/civserver.c:234
+#: server/civserver.c:239
msgid " -q, --quitidle TIME\tQuit if no players for TIME seconds\n"
msgstr ""
" -q, --quitidle TIMP\tAbandonează jocul dacă pentru TIMP secunde nu sunt "
"jucători \n"
-#: server/civserver.c:236
+#: server/civserver.c:241
msgid " -e, --exit-on-end\tWhen a game ends, exit instead of restarting\n"
msgstr ""
" -e, --exit-on-end\tCTermină programul când se termină jocul, în loc să "
"începi unul nou\n"
-#: server/civserver.c:239
+#: server/civserver.c:244
msgid " -s, --saves DIR\tSave games to directory DIR\n"
msgstr " -s, --saves DIR\tSalvează jocul în directorul DIR\n"
-#: server/civserver.c:241
+#: server/civserver.c:246
msgid " -S, --Serverid ID\tSets the server id to ID\n"
msgstr " -S, --Serverid ID\tSetează indicativul server-ului la ID\n"
-#: server/civserver.c:243
+#: server/civserver.c:248
msgid " -P, --Ppm\t\tSave ppms of the map when saving the game.\n"
msgstr ""
" -P, --Ppm\t\tSalvează ppms-ul hărţii atunci când se salvează jocul.\n"
-#: server/civserver.c:244
+#: server/civserver.c:249
msgid " -r, --read FILE\tRead startup script FILE\n"
msgstr " -r, --read FIŞIER\tCiteşte scriptul de început din FIŞIER\n"
-#: server/civserver.c:246
+#: server/civserver.c:251
msgid " -R, --Ranklog FILE\tUse FILE as ranking logfile\n"
msgstr " -R, --Ranklog FIÅžIER\tFoloseÅŸte FIÅžIER ca jurnal pentru clasamente\n"
-#: server/civserver.c:247 client/civclient.c:268 manual/civmanual.c:383
+#: server/civserver.c:252 client/civclient.c:269 manual/civmanual.c:383
msgid " -v, --version\t\tPrint the version number\n"
msgstr " -v, --version\t\tAfişează numărul versiunii\n"
-#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
+#: server/civserver.c:253 client/gui-gtk-2.0/gui_main.c:354
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, fuzzy, c-format
msgid "Report bugs at %s.\n"
msgstr "Raportează erorile la <%s>.\n"
-#: server/commands.c:28
+#: server/commands.c:29
msgid "Start the game, or restart after loading a savegame."
msgstr "Începe un joc nou sau continuă unul salvat anterior."
-#: server/commands.c:29
+#: server/commands.c:30
msgid ""
"This command starts the game. When starting a new game, it should be used "
"after all human players have connected, and AI players have been created (if "
@@ -2174,7 +2180,7 @@ msgstr ""
"deoarece nu va avea nici un efect."
#. TRANS: translate text between <> only
-#: server/commands.c:42
+#: server/commands.c:44
msgid ""
"help\n"
"help commands\n"
@@ -2188,11 +2194,11 @@ msgstr ""
"help <nume-comandă>\n"
"help <nume-opţiune>"
-#: server/commands.c:47
+#: server/commands.c:49
msgid "Show help about server commands and server options."
msgstr "Arată ajutorul pentru comenzile şi opţiunile serverului."
-#: server/commands.c:48
+#: server/commands.c:50
msgid ""
"With no arguments gives some introductory help. With argument \"commands\" "
"or \"options\" gives respectively a list of all commands or all options. "
@@ -2209,13 +2215,13 @@ msgstr ""
"şi implicite ale opţiunii respective. Argumentul poate fi abreviat dacă "
"acesta nu este ambiguu."
-#: server/commands.c:63
+#: server/commands.c:66
msgid "Show a list of players, teams, connections, or scenarios."
msgstr ""
"Arată o listă a jucătorilor, a echipelor, a legăturilor, sau a scenariilor "
"de joc."
-#: server/commands.c:64
+#: server/commands.c:67
#, fuzzy
msgid ""
"Show a list of players in the game, teams of players, connections to the "
@@ -2226,20 +2232,20 @@ msgstr ""
"scenariilor de joc disponibile. Argumentul poate fi abreviat, ÅŸi are "
"valoarea implicită 'players' (jucători) dacă lipseşte."
-#: server/commands.c:70
+#: server/commands.c:74
msgid "Quit the game and shutdown the server."
msgstr "Termină jocul şi opreşte serverul."
#. TRANS: translate text between <> only
-#: server/commands.c:74
+#: server/commands.c:79
msgid "cut <connection-name>"
msgstr "cut <nume-conexiune>"
-#: server/commands.c:75
+#: server/commands.c:80
msgid "Cut a client's connection to server."
msgstr "Taie conexiunea unui client cu serverul."
-#: server/commands.c:76
+#: server/commands.c:81
msgid ""
"Cut specified client's connection to the server, removing that client from "
"the game. If the game has not yet started that client's player is removed "
@@ -2252,7 +2258,7 @@ msgstr ""
"notat că această comandă primeşte acum numele conexiunilor nu al jucătorilor."
#. TRANS: translate text between <> only
-#: server/commands.c:83
+#: server/commands.c:89
msgid ""
"explain\n"
"explain <option-name>"
@@ -2260,11 +2266,11 @@ msgstr ""
"explain\n"
"explain <nume-opţiune>"
-#: server/commands.c:85
+#: server/commands.c:91
msgid "Explain server options."
msgstr "Explică opţiunile server."
-#: server/commands.c:86
+#: server/commands.c:92
msgid ""
"The 'explain' command gives a subset of the functionality of 'help', and is "
"included for backward compatibility. With no arguments it gives a list of "
@@ -2278,7 +2284,7 @@ msgstr ""
"(asemănător comenzii 'help <option-name>')."
#. TRANS: translate text between <> only
-#: server/commands.c:93
+#: server/commands.c:100
msgid ""
"show\n"
"show <option-name>\n"
@@ -2288,11 +2294,11 @@ msgstr ""
"show <nume-opţiune>\n"
"show <prefix-opţiune>"
-#: server/commands.c:96
+#: server/commands.c:103
msgid "Show server options."
msgstr "Arată opţiunile serverului."
-#: server/commands.c:97
+#: server/commands.c:104
msgid ""
"With no arguments, shows all server options (or available options, when used "
"by clients). With an argument, show only the named option, or options with "
@@ -2303,37 +2309,38 @@ msgstr ""
"afişează doar opţiunea respectivă sau opţiunea care începe cu prefixul "
"primit ca argument."
-#: server/commands.c:102
+#: server/commands.c:110
msgid "wall <message>"
msgstr "wall <mesaj>"
-#: server/commands.c:103
+#: server/commands.c:111
msgid "Send message to all connections."
msgstr "Trimite un mesaj la toţi clienţii."
-#: server/commands.c:104
+#: server/commands.c:112
msgid ""
"For each connected client, pops up a window showing the message entered."
msgstr ""
"Pentru fiecare client conectat afişează într-o fereastră mesajul introdus."
-#: server/commands.c:108
+#: server/commands.c:117
msgid "vote yes|no [vote number]"
msgstr "votează da|nu [numarul de voturi]"
-#: server/commands.c:109
+#: server/commands.c:118
msgid "Cast a vote."
msgstr "Votează."
-#: server/commands.c:111
+#: server/commands.c:120
#, 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."
+"A player with basic 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."
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 "
@@ -2344,7 +2351,7 @@ msgstr ""
"it. If one full turn elapses the vote may pass in any case if nobody votes "
"against it."
-#: server/commands.c:121
+#: server/commands.c:131
msgid ""
"debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
"<player> | timing | info]"
@@ -2352,12 +2359,12 @@ msgstr ""
"debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
"<player> | timing | info]"
-#: server/commands.c:123
+#: server/commands.c:133
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:124
+#: server/commands.c:134
msgid ""
"Print AI debug information about given entity and turn continous debugging "
"output for this entity on or off."
@@ -2366,23 +2373,23 @@ msgstr ""
"activează/dezactivează afişarea mesajelor de depanare continuă pentru "
"această entitate."
-#: server/commands.c:128
+#: server/commands.c:139
msgid "set <option-name> <value>"
msgstr "set <nume-opţiune> <valoare>"
-#: server/commands.c:129
+#: server/commands.c:140
msgid "Set server option."
msgstr "Setează opţiunile server."
-#: server/commands.c:132
+#: server/commands.c:144
msgid "team <player> [team]"
msgstr "team <jucător> [team]"
-#: server/commands.c:133
+#: server/commands.c:145
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:134
+#: server/commands.c:146
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 "
@@ -2395,15 +2402,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:141
+#: server/commands.c:154
msgid "rulesetdir <directory>"
msgstr "rulesetdir <director>"
-#: server/commands.c:142
+#: server/commands.c:155
msgid "Choose new ruleset directory or modpack."
msgstr "Alege un director nou pentru reguli de joc sau un nou mod(modpack)."
-#: server/commands.c:143
+#: server/commands.c:156
msgid ""
"Choose new ruleset directory or modpack. Calling this\n"
" without any arguments will show you the currently selected ruleset."
@@ -2412,15 +2419,15 @@ msgstr ""
"regulile de joc selectate."
#. TRANS: translate text between <> only
-#: server/commands.c:149
+#: server/commands.c:163
msgid "metainfo <meta-line>"
msgstr "metainfo <linie de meta informaţii>"
-#: server/commands.c:150
+#: server/commands.c:164
msgid "Set metaserver info line."
msgstr "Setează linia de informaţie a metaserver-ului."
-#: server/commands.c:151
+#: server/commands.c:165
msgid ""
"Set user defined metaserver info line. If parameter is omitted,\n"
"previously set metamessage will be removed. For most of the time\n"
@@ -2429,19 +2436,19 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:158
+#: server/commands.c:173
msgid "metapatch <meta-line>"
msgstr "metapatch <linie-meta>"
-#: server/commands.c:159
+#: server/commands.c:174
msgid "Set metaserver patches line."
msgstr "Setează linia metaserver-ului."
-#: server/commands.c:165
+#: server/commands.c:181
msgid "Control metaserver connection."
msgstr "Controlează conexiunea la metaserver."
-#: server/commands.c:166
+#: server/commands.c:182
msgid ""
"'metaconnection ?' reports on the status of the connection to metaserver.\n"
"'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2452,33 +2459,33 @@ msgstr ""
"'metaconnection up' sau 'metac u' realizează legătura cu metaserver-ul."
#. TRANS: translate text between <> only
-#: server/commands.c:172
+#: server/commands.c:189
msgid "metaserver <address>"
msgstr "metaserver <adresa>"
-#: server/commands.c:173
+#: server/commands.c:190
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:177
+#: server/commands.c:195
msgid "aitoggle <player-name>"
msgstr "aitoggle <nume-jucător>"
-#: server/commands.c:178
+#: server/commands.c:196
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:182
+#: server/commands.c:201
msgid "take [connection-name] <player-name>"
msgstr "take [nume-conexiune] <nume-jucător>"
-#: server/commands.c:183
+#: server/commands.c:202
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:184
+#: server/commands.c:203
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 "
@@ -2493,15 +2500,15 @@ msgstr ""
"un jucător, se crează unul şi se atribuie conexiunii."
#. TRANS: translate text between [] only
-#: server/commands.c:192
+#: server/commands.c:212
msgid "observe [connection-name] [player-name]"
msgstr "observe [nume-conexiune] [nume-jucător]"
-#: server/commands.c:193
+#: server/commands.c:213
msgid "Observe a player or the whole game."
msgstr "Urmareşte un jucător sau întregul joc."
-#: server/commands.c:194
+#: server/commands.c:214
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 "
@@ -2516,15 +2523,15 @@ msgstr ""
"argument, atunci conexiunea ca fi ataşată unui observator global."
#. TRANS: translate text between <> only
-#: server/commands.c:202
+#: server/commands.c:223
msgid "detach <connection-name>"
msgstr "detach <nume-conexiune>"
-#: server/commands.c:203
+#: server/commands.c:224
msgid "detach from a player."
msgstr "deataşează de la un jucător"
-#: server/commands.c:204
+#: server/commands.c:225
msgid ""
"Only the console and connections with cmdlevel 'hack' can force other "
"connections to detach from a player."
@@ -2533,20 +2540,20 @@ msgstr ""
"alte conexiuni să se deataşeze de la un jucător."
#. TRANS: translate text between <> only
-#: server/commands.c:209
+#: server/commands.c:231
msgid "create <player-name>"
msgstr "create <nume-jucător>"
-#: server/commands.c:210
+#: server/commands.c:232
msgid "Create an AI player with a given name."
msgstr "Crează un jucător AI cu acest nume."
-#: server/commands.c:211
+#: server/commands.c:233
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:215
+#: server/commands.c:238
msgid ""
"away\n"
"away"
@@ -2554,16 +2561,16 @@ msgstr ""
"away\n"
"away"
-#: server/commands.c:217
+#: server/commands.c:240
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:218
+#: server/commands.c:241
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:222
+#: server/commands.c:246
msgid ""
"novice\n"
"novice <player-name>"
@@ -2571,11 +2578,11 @@ msgstr ""
"novice\n"
"novice <nume-jucător>"
-#: server/commands.c:224
+#: server/commands.c:248
msgid "Set one or all AI players to 'novice'."
msgstr "Setează unul sau toţi jucătorii AI la nivelul 'novice'."
-#: server/commands.c:225
+#: server/commands.c:249
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 "
@@ -2586,7 +2593,7 @@ msgstr ""
"Cu argument, setează doar nivelul de dificultate al jucătorului respectiv."
#. TRANS: translate text between <> only
-#: server/commands.c:231
+#: server/commands.c:256
msgid ""
"easy\n"
"easy <player-name>"
@@ -2594,11 +2601,11 @@ msgstr ""
"easy\n"
"easy <nume-jucător>"
-#: server/commands.c:233
+#: server/commands.c:258
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:234
+#: server/commands.c:259
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 "
@@ -2609,7 +2616,7 @@ msgstr ""
"argument, setează doar nivelul de dificultate al jucătorului respectiv."
#. TRANS: translate text between <> only
-#: server/commands.c:240
+#: server/commands.c:266
msgid ""
"normal\n"
"normal <player-name>"
@@ -2617,11 +2624,11 @@ msgstr ""
"normal\n"
"normal <nume-jucător>"
-#: server/commands.c:242
+#: server/commands.c:268
msgid "Set one or all AI players to 'normal'."
msgstr "Setează unul sau toţi jucătorii AI la nivelul 'normal'."
-#: server/commands.c:243
+#: server/commands.c:269
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 "
@@ -2632,7 +2639,7 @@ msgstr ""
"Cu argument, setează doar nivelul de dificultate al jucătorului respectiv."
#. TRANS: translate text between <> only
-#: server/commands.c:249
+#: server/commands.c:276
msgid ""
"hard\n"
"hard <player-name>"
@@ -2640,11 +2647,11 @@ msgstr ""
"hard\n"
"hard <nume-jucător>"
-#: server/commands.c:251
+#: server/commands.c:278
msgid "Set one or all AI players to 'hard'."
msgstr "Setează unul sau toţi jucătorii AI la nivelul 'greu'."
-#: server/commands.c:252
+#: server/commands.c:279
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 "
@@ -2655,7 +2662,7 @@ msgstr ""
"argument, setează doar nivelul de dificultate al jucătorului respectiv."
#. TRANS: translate text between <> only
-#: server/commands.c:258
+#: server/commands.c:286
msgid ""
"experimental\n"
"experimental <player-name>"
@@ -2663,11 +2670,11 @@ msgstr ""
"experimental\n"
"experimental <nume-jucător>"
-#: server/commands.c:260
+#: server/commands.c:288
msgid "Set one or all AI players to 'experimental'."
msgstr "Setează unul sau toţi jucătorii AI la nivelul 'experimental'."
-#: server/commands.c:261
+#: server/commands.c:289
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 "
@@ -2681,7 +2688,7 @@ msgstr ""
"ului! Pentru servere normale, această opţiune nu are nici un efect."
#. TRANS: translate text between <> only
-#: server/commands.c:269
+#: server/commands.c:298
msgid ""
"cmdlevel\n"
"cmdlevel <level>\n"
@@ -2695,17 +2702,20 @@ msgstr ""
"cmdlevel <nivel> first\n"
"cmdlevel <nivel> <numele conexiunii>"
-#: server/commands.c:274
+#: server/commands.c:303
msgid "Query or set command access level access."
msgstr "Află sau setează acesul la nivelul accesului la comandă."
-#: server/commands.c:275
+#: server/commands.c:304
+#, fuzzy
msgid ""
"The command access level controls which server commands are available\n"
"to users via the client chatline. The available levels are:\n"
" none - no commands\n"
-" info - informational commands only\n"
+" info - informational or observer commands only\n"
+" basic - commands available to players in the game\n"
" ctrl - commands that affect the game and users\n"
+" admin - commands that affect server operation\n"
" hack - *all* commands - dangerous!\n"
"With no arguments, the current command access levels are reported.\n"
"With a single argument, the level is set for all existing connections,\n"
@@ -2743,20 +2753,20 @@ msgstr ""
"untrusted person could reconnect with the same name. Note that this command "
"now takes connection names, not player names."
-#: server/commands.c:296
+#: server/commands.c:328
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:301
+#: server/commands.c:334
msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
msgstr "timeoutincrease <rundă> <turninc> <value> <valuemult>"
-#: server/commands.c:302
+#: server/commands.c:335
msgid "See \"help timeoutincrease\"."
msgstr "Vezi \"help timeoutincrease\"."
-#: server/commands.c:303
+#: server/commands.c:336
msgid ""
"Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
"<turn> and multiply <value> by <valuemult>. Use this command in concert "
@@ -2768,24 +2778,43 @@ msgstr ""
"0 0 1"
#. TRANS: translate text between <> only
-#: server/commands.c:309
+#: server/commands.c:343
+msgid ""
+"cancelvote\n"
+"cancelvote <vote number>\n"
+"cancelvote all\n"
+msgstr ""
+
+#: server/commands.c:346
+msgid "Cancel a running vote.\n"
+msgstr ""
+
+#: server/commands.c:347
+msgid ""
+"With no arguments this command removes your own vote. If you have an admin "
+"access level, you can cancel any vote by vote number, or all votes with the "
+"'all' argument."
+msgstr ""
+
+#. TRANS: translate text between <> only
+#: server/commands.c:354
msgid "endgame"
msgstr "endgame"
-#: server/commands.c:310
+#: server/commands.c:355
msgid "End the game immediately in a draw."
msgstr "Termină jocul imediat cu o remiză."
#. TRANS: translate text between <> only
-#: server/commands.c:314
+#: server/commands.c:360
msgid "surrender"
msgstr "surrender"
-#: server/commands.c:315
+#: server/commands.c:361
msgid "Concede the game."
msgstr "Abandonează jocul."
-#: server/commands.c:316
+#: server/commands.c:362
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."
@@ -2795,15 +2824,15 @@ msgstr ""
"atunci jocul se termină."
#. TRANS: translate text between <> only
-#: server/commands.c:322
+#: server/commands.c:369
msgid "remove <player-name>"
msgstr "remove <nume-jucător>"
-#: server/commands.c:323
+#: server/commands.c:370
msgid "Fully remove player from game."
msgstr "Îndepărtează complet jucătorul din joc."
-#: server/commands.c:324
+#: server/commands.c:371
msgid ""
"This *completely* removes a player from the game, including all cities and "
"units etc. Use with care!"
@@ -2812,7 +2841,7 @@ msgstr ""
"oraşele şi unităţile sale. Folosiţi cu prudentă!"
#. TRANS: translate text between <> only
-#: server/commands.c:329
+#: server/commands.c:377
msgid ""
"save\n"
"save <file-name>"
@@ -2820,11 +2849,11 @@ msgstr ""
"save\n"
"save <nume-fiÅŸier>"
-#: server/commands.c:331
+#: server/commands.c:379
msgid "Save game to file."
msgstr "Salvează jocul într-un fişier."
-#: server/commands.c:332
+#: server/commands.c:380
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"
@@ -2842,7 +2871,7 @@ msgstr ""
"şi foloseşte comanda 'start' după ce s-au conectat toţi jucătorii."
#. TRANS: translate text between <> only
-#: server/commands.c:341
+#: server/commands.c:390
msgid ""
"load\n"
"load <file-name>"
@@ -2850,11 +2879,11 @@ msgstr ""
"load\n"
"load <nume-fiÅŸier>"
-#: server/commands.c:343
+#: server/commands.c:392
msgid "Load game from file."
msgstr "Încarcă jocul dintr-un fişier."
-#: server/commands.c:344
+#: server/commands.c:393
msgid ""
"Load a game from <file-name>. Any current data including players, rulesets "
"and server options are lost.\n"
@@ -2863,122 +2892,122 @@ msgstr ""
"inclusiv jucătorii regulile de joc şi opţinile serverului vor fi pierdute.\n"
#. TRANS: translate text between <> only
-#: server/commands.c:349
+#: server/commands.c:399
msgid "read <file-name>"
msgstr "read <nume-fiÅŸier>"
-#: server/commands.c:350
+#: server/commands.c:400
msgid "Process server commands from file."
msgstr "Execută comenzile server din fişier."
#. TRANS: translate text between <> only
-#: server/commands.c:354
+#: server/commands.c:405
msgid "write <file-name>"
msgstr "write <nume-fiÅŸier>"
-#: server/commands.c:355
+#: server/commands.c:406
msgid "Write current settings as server commands to file."
msgstr "Salvează setările curente în fişier."
-#: server/commands.c:359
+#: server/commands.c:411
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:363
+#: server/commands.c:416
msgid "Simply returns the id of the server."
msgstr "ÃŽntoarce pur ÅŸi simplu indicativul server-ului."
-#: server/connecthand.c:85
+#: server/connecthand.c:109
#, c-format
msgid "Welcome to the %s Server running at %s port %d."
msgstr "Bun venit pe Server-ul %s care rulează la adresa %s şi portul %d."
-#: server/connecthand.c:89
+#: server/connecthand.c:113
#, c-format
msgid "Welcome to the %s Server at port %d."
msgstr "Bun venit pe Server-ul %s care aşteaptă conexiuni pe portul %d."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:97
+#: server/connecthand.c:121
#, fuzzy, c-format
msgid "(%d) %s: connected [%s]"
msgstr "(%d) %s s-a conectat de la %s."
-#: server/connecthand.c:104
+#: server/connecthand.c:128
#, c-format
msgid "Server: %s has connected from %s."
msgstr "Server: %s s-a conectat de la %s."
-#: server/connecthand.c:145
+#: server/connecthand.c:175
msgid "Couldn't attach your connection to new player."
msgstr "Nu s-a putut ataşa legătura la jucătorul nou."
-#: server/connecthand.c:165
+#: server/connecthand.c:199
#, c-format
msgid "You are logged in as '%s' connected to no player."
msgstr "Eşti înregistrat ca '%s' şi nu eşti conectat la nici un jucător."
-#: server/connecthand.c:169
+#: server/connecthand.c:203
#, c-format
msgid "You are logged in as '%s' connected to an anonymous player."
msgstr "Sunteţi înregistrat ca '%s' şi sunteţi conectat la un jucător anonim."
-#: server/connecthand.c:174
+#: server/connecthand.c:208
#, c-format
msgid "You are logged in as '%s' connected to %s."
msgstr "Sunteţi înregistrat ca '%s' conectat la %s."
-#: server/connecthand.c:187
+#: server/connecthand.c:221
#, c-format
msgid "Turn-blocking game play: waiting on %s to finish turn..."
msgstr "Jocul este în modul Blocare a rundei: aştept ca %s să termine runda..."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:240
+#: server/connecthand.c:274
#, fuzzy, c-format
msgid "(%d) %s: connection request [%s]"
msgstr "(%d) Cerere de conectare de la %s de la %s"
-#: server/connecthand.c:266
+#: server/connecthand.c:300
#, fuzzy
msgid "The client is missing a capability that this server needs."
msgstr "Clientul nu are o capabilitate de care are nevoie server-ul."
-#: server/connecthand.c:268 server/connecthand.c:279
+#: server/connecthand.c:302 server/connecthand.c:313
#, fuzzy, c-format
msgid "(%d) %s rejected: mismatched capabilities!"
msgstr "(%d) %s a fost respins: Capabilităţi incompatibile."
-#: server/connecthand.c:277
+#: server/connecthand.c:311
#, fuzzy
msgid "This server is missing a capability that the client needs."
msgstr "Server-ul nu are o capabilitate de care are nevoie clientul."
-#: server/connecthand.c:290
+#: server/connecthand.c:324
#, fuzzy
msgid "The username is invalid!"
msgstr "Nume de jucător invalid"
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:292
+#: server/connecthand.c:326
#, fuzzy, c-format
msgid "(%d) %s rejected: invalid username [%s]"
msgstr "(%d) %s a fost respins: Nume invalid [%s]."
-#: server/connecthand.c:303
+#: server/connecthand.c:337
#, fuzzy
msgid "Your username is already connected!"
msgstr "este deja conectat."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:305
+#: server/connecthand.c:339
#, fuzzy, c-format
msgid "(%d) %s rejected: duplicate username [%s]"
msgstr "(%d) %s a fost respins: Nume de înregistrare dupicat [%s]."
-#: server/connecthand.c:335 server/connecthand.c:344
+#: server/connecthand.c:369 server/connecthand.c:378
#, c-format
msgid "Lost connection: %s."
msgstr "Legătura pierdută cu %s."
@@ -2995,111 +3024,111 @@ msgstr "Bine. A fost setat stilul standard."
msgid "For introductory help, type 'help'."
msgstr "Pentru ajutor introductiv scrie 'help'."
-#: server/diplhand.c:164
+#: server/diplhand.c:167
#, c-format
msgid "The %s can't accept %s."
msgstr "%si nu pot accepta %s."
-#: server/diplhand.c:176
+#: server/diplhand.c:179
#, c-format
msgid "You don't have tech %s, you can't accept treaty."
msgstr "Joc: Neavând tehnologia %s nu puteţi accepta tratatul."
-#: server/diplhand.c:185
+#: server/diplhand.c:188
msgid "City you are trying to give no longer exists, you can't accept treaty."
msgstr ""
"Nu poţi încheia tratatul, oraşul pe care încerci să-l dai nu mai există."
-#: server/diplhand.c:191
+#: server/diplhand.c:194
#, c-format
msgid "You are not owner of %s, you can't accept treaty."
msgstr "Nu poţi încheia tratatul, nu stăpâneşti %s."
-#: server/diplhand.c:197 server/diplhand.c:301
+#: server/diplhand.c:200 server/diplhand.c:304
#, c-format
msgid "Your capital (%s) is requested, you can't accept treaty."
msgstr "Nu poţi încheia tratatul, ţi se cere capitala, (%s)."
-#: server/diplhand.c:224
+#: server/diplhand.c:227
msgid "You don't have enough gold, you can't accept treaty."
msgstr "Neavând destui galbeni, nu puteţi accepta tratatul."
-#: server/diplhand.c:256 server/diplhand.c:261
+#: server/diplhand.c:259 server/diplhand.c:264
#, c-format
msgid "A treaty containing %d clause was agreed upon."
msgid_plural "A treaty containing %d clauses was agreed upon."
msgstr[0] "Aţi încheiat un tratat care conţine %d clauză."
msgstr[1] "Aţi încheiat un tratat care conţine %d clauze."
-#: server/diplhand.c:277 server/diplhand.c:281
+#: server/diplhand.c:280 server/diplhand.c:284
#, fuzzy, c-format
msgid "One of the cities the %s are giving away is destroyed! Treaty canceled!"
msgstr "Tratatul este anulat! Unul din oraşele pe care %s le dă este distrus!"
-#: server/diplhand.c:288 server/diplhand.c:293
+#: server/diplhand.c:291 server/diplhand.c:296
#, c-format
msgid "The %s no longer control %s! Treaty canceled!"
msgstr "Tratatul este anulat! %s nu mai controlează %s!"
-#: server/diplhand.c:331 server/diplhand.c:335
+#: server/diplhand.c:334 server/diplhand.c:338
#, c-format
msgid "The %s don't have the promised amount of gold! Treaty canceled!"
msgstr "Tratatul este anulat! %s nu au numărul de galbeni promişi!"
-#: server/diplhand.c:364
+#: server/diplhand.c:367
#, c-format
msgid "You gave an embassy to %s."
msgstr "Aţi dat o ambasadă lui %s."
-#: server/diplhand.c:367
+#: server/diplhand.c:370
#, c-format
msgid "%s allowed you to create an embassy!"
msgstr "%s v-a permis să creaţi o ambasadă!"
-#: server/diplhand.c:383
+#: server/diplhand.c:386
#, c-format
msgid "You are taught the knowledge of %s."
msgstr "Aţi învăţat %s."
-#: server/diplhand.c:387
+#: server/diplhand.c:390
#, c-format
msgid "The %s have acquired %s from the %s."
msgstr "%si au obţinut %s de la %s."
-#: server/diplhand.c:402
+#: server/diplhand.c:405
#, c-format
msgid "You get %d gold."
msgstr "AÅ£i primit %d galbeni."
#. TRANS: ... Polish worldmap.
-#: server/diplhand.c:410
+#: server/diplhand.c:413
#, fuzzy, c-format
msgid "You receive the %s worldmap."
msgstr "AÅ£i primit harta lumi a %slor."
#. TRANS: ... Polish seamap.
-#: server/diplhand.c:419
+#: server/diplhand.c:422
#, fuzzy, c-format
msgid "You receive the %s seamap."
msgstr "Aţi primit harta maritimă a %slor."
-#: server/diplhand.c:436
+#: server/diplhand.c:439
#, c-format
msgid "You receive city of %s from %s."
msgstr "Aţi obţinut oraşul %s de la %s."
-#: server/diplhand.c:441
+#: server/diplhand.c:444
#, c-format
msgid "You give city of %s to %s."
msgstr "AÅ£i cedat oraÅŸul %s %slor"
-#: server/diplhand.c:454 server/diplhand.c:457
+#: server/diplhand.c:457 server/diplhand.c:460
#, c-format
msgid "You agree on a cease-fire with %s."
msgstr "Sunteţi de acord cu încetarea focului cu %s."
#. TRANS: ... the Poles ... Polish territory.
-#: server/diplhand.c:476 server/diplhand.c:488
+#: server/diplhand.c:479 server/diplhand.c:491
#, fuzzy, c-format
msgid ""
"You agree on an armistice with the %s. In %d turn, it will become a peace "
@@ -3114,32 +3143,32 @@ msgstr[1] ""
"Aţi încheiat un armistiţiu cu %s. În %d runde va deveni un tratat de pace. "
"Mută-ţi unităţile afară din teritoruiul lui %s."
-#: server/diplhand.c:512 server/diplhand.c:515
+#: server/diplhand.c:515 server/diplhand.c:518
#, c-format
msgid "You agree on an alliance with %s."
msgstr "Tratat de alianză încheiat cu %s."
-#: server/diplhand.c:524
+#: server/diplhand.c:527
#, c-format
msgid "You give shared vision to %s."
msgstr "Ai dat vedere comună lui %s."
-#: server/diplhand.c:527
+#: server/diplhand.c:530
#, c-format
msgid "%s gives you shared vision."
msgstr "%s v-a dat vedere comună."
-#: server/diplhand.c:663
+#: server/diplhand.c:666
#, c-format
msgid "%s canceled the meeting!"
msgstr "%s a anulat întâlnirea!"
-#: server/diplhand.c:670
+#: server/diplhand.c:673
#, c-format
msgid "Meeting with %s canceled."
msgstr "Întâlnirea cu %s a fost anulată."
-#: server/diplhand.c:712
+#: server/diplhand.c:715
msgid "Your diplomatic envoy was decapitated!"
msgstr "Trimisul dumneavoastră diplomatic a fost decapitat!"
@@ -3326,40 +3355,40 @@ msgid "The %s destroyed the %s in %s."
msgstr "%si au distrus %s în %s."
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1091
+#: server/diplomats.c:1097
#, fuzzy, c-format
msgid "An enemy %s has been eliminated by your %s."
msgstr "Un %s inamic a fost ucis în timp ce apăra un %s."
#. TRANS: <unit> ... <city> ... <diplomat>
-#: server/diplomats.c:1098
+#: server/diplomats.c:1104
#, c-format
msgid "Your %s has been eliminated defending %s against a %s."
msgstr "%sul dvs a fost ucis în timpul ce apăra %s împotriva unui %s."
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1106
+#: server/diplomats.c:1112
#, fuzzy, c-format
msgid "Your %s has been eliminated defending against a %s."
msgstr "%sul dvs a fost ucis în timpul ce apăra împotriva unui %s."
-#: server/diplomats.c:1119
+#: server/diplomats.c:1125
#, c-format
msgid "Your %s was eliminated by a defending %s."
msgstr "%sul dumneavoastră a fost eliminat de un %s care se apăra."
-#: server/diplomats.c:1127
+#: server/diplomats.c:1133
#, c-format
msgid "Eliminated %s %s while infiltrating %s."
msgstr "Aţi eliminat al lui %s %s în timpul infiltrării în %s."
-#: server/diplomats.c:1134
+#: server/diplomats.c:1140
#, c-format
msgid "Eliminated %s %s while infiltrating our troops."
msgstr ""
"Aţi eliminat al lui %s %s în timpul infiltrării trupelor dumneavoastră."
-#: server/diplomats.c:1185
+#: server/diplomats.c:1191
#, fuzzy, c-format
msgid ""
"Your %s has successfully completed the mission and returned unharmed to %s."
@@ -3367,44 +3396,44 @@ msgstr ""
"%sul dumneavoastră şi-a terminat misiunea cu succes şi s-a întors nevătămat "
"la %s."
-#: server/diplomats.c:1204
+#: server/diplomats.c:1210
#, fuzzy, c-format
msgid "Your %s was captured after completing the mission in %s."
msgstr "%sul dumneavoastră a fost prins după ce şi-a terminat misiunea în %s."
-#: server/diplomats.c:1210
+#: server/diplomats.c:1216
#, fuzzy, c-format
msgid "Your %s was captured after completing the mission."
msgstr "%sul dumneavoastră a fost prins după ce şi-a terminat misiunea."
-#: server/diplomats.c:1242
+#: server/diplomats.c:1248
#, fuzzy, c-format
msgid "You have caused an incident while bribing the %s %s."
msgstr "Aţi cauzat un incident în timp ce l-aţi mituit pe al lui %s %s."
-#: server/diplomats.c:1247
+#: server/diplomats.c:1253
#, c-format
msgid "%s has caused an incident while bribing your %s."
msgstr "%s a cauzat un incident în timp ce vă mituia %sul."
-#: server/diplomats.c:1254
+#: server/diplomats.c:1260
#, c-format
msgid "You have caused an incident while attempting to steal tech from %s."
msgstr ""
"Aţi creat un incident în timp ce încercaţi să furaţi tehnologie de la %s."
-#: server/diplomats.c:1258
+#: server/diplomats.c:1264
#, c-format
msgid "%s has caused an incident while attempting to steal tech from you."
msgstr ""
"%s a fost prins în timp ce încerca să fure tehnologie de la dumneavoastră."
-#: server/diplomats.c:1264
+#: server/diplomats.c:1270
#, c-format
msgid "You have caused an incident while inciting a revolt in %s."
msgstr "Aţi cauzat un incident în timp ce incitaţi la revoltă în %s."
-#: server/diplomats.c:1268
+#: server/diplomats.c:1274
#, c-format
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."
@@ -3526,12 +3555,12 @@ msgstr ""
" Muncitorii se adună în mod spontan şi modernizează toate oraşele "
"construind căi ferate."
-#: server/maphand.c:1418
+#: server/maphand.c:1425
#, c-format
msgid "Moved your %s due to changing terrain."
msgstr "%sul dumneavoastră a fost mutat datorită schimbării terenului."
-#: server/maphand.c:1436
+#: server/maphand.c:1443
#, c-format
msgid "Disbanded your %s due to changing terrain."
msgstr "%s a fost dizolvat datorită modificării terenului."
@@ -3540,7 +3569,7 @@ msgstr "%s a fost dizolvat datorită modificării terenului."
msgid "Not reporting to the metaserver in this game."
msgstr "ÃŽn acest joc nu se va raporta la metaserver."
-#: server/meta.c:430
+#: server/meta.c:432
#, c-format
msgid "Metaserver: bad address: [%s:%d]."
msgstr "Metaserver: adresa invalida: [%s:%d]."
@@ -3667,26 +3696,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:1103
+#: server/plrhand.c:1115
#, c-format
msgid "Removing player %s."
msgstr "Se îndepărtează jucătorul %s."
-#: server/plrhand.c:1105
+#: server/plrhand.c:1117
msgid "You've been removed from the game!"
msgstr "Aţi fost îndepărtat din joc!"
-#: server/plrhand.c:1108
+#: server/plrhand.c:1120
#, c-format
msgid "%s has been removed from the game."
msgstr "%s a fost îndepărtat din joc."
-#: server/plrhand.c:1153 server/plrhand.c:1158
+#: server/plrhand.c:1167 server/plrhand.c:1172
#, 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:1178
+#: server/plrhand.c:1192
#, c-format
msgid ""
"%s and %s meet and go to instant war. You cancel your alliance with both."
@@ -3694,17 +3723,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:1656
+#: server/plrhand.c:1670
#, 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:1663
+#: server/plrhand.c:1677
#, 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:1686
+#: server/plrhand.c:1700
#, fuzzy, c-format
msgid ""
"Your nation is thrust into civil war! %s is declared the leader of the rebel "
@@ -3713,12 +3742,12 @@ msgstr ""
"Naţiunea dumneavoastră a fost aruncată într-un război civil, %s a fost "
"declarat liderul statelor rebele."
-#: server/plrhand.c:1707
+#: server/plrhand.c:1721
#, c-format
msgid "%s declares allegiance to %s."
msgstr "%s declară alianţă lui %s."
-#: server/plrhand.c:1722
+#: server/plrhand.c:1736
#, fuzzy, c-format
msgid ""
"Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3912,67 +3941,67 @@ msgstr "(în construcţie %s în %s (%s))\n"
msgid "Wonders of the World"
msgstr "Minunile lumii"
-#: server/report.c:547
+#: server/report.c:552
msgid " sq. mi."
msgstr "mile pătrate"
-#: server/report.c:557
+#: server/report.c:562
msgid " M tons"
msgstr " M tone"
-#: server/report.c:562
+#: server/report.c:567
msgid " M goods"
msgstr " M produse"
-#: server/report.c:567
+#: server/report.c:572
msgid " bulbs"
msgstr " bulbi"
-#: server/report.c:572
+#: server/report.c:577
msgid " month"
msgid_plural " months"
msgstr[0] " lună"
msgstr[1] " luni"
-#: server/report.c:577
+#: server/report.c:582
msgid " ton"
msgid_plural " tons"
msgstr[0] " tonă"
msgstr[1] " tone"
-#: server/report.c:591
+#: server/report.c:596
msgid "st"
msgstr "-ul"
-#: server/report.c:593
+#: server/report.c:598
msgid "nd"
msgstr "-lea"
-#: server/report.c:595
+#: server/report.c:600
msgid "rd"
msgstr "-lea"
-#: server/report.c:597
+#: server/report.c:602
msgid "th"
msgstr "-lea"
-#: server/report.c:700
+#: server/report.c:705
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:743 server/report.c:768
+#: server/report.c:748 server/report.c:773
msgid "Demographics Report:"
msgstr "Raport demografic:"
-#: server/report.c:744
+#: server/report.c:749
msgid "Sorry, the Demographics report is unavailable."
msgstr "Raportul demografic nu este disponibil."
#. TRANS: <nation adjective> <government name> (<year>).
#. * E.g. "Polish Despotism (200 AD)".
-#: server/report.c:750
+#: server/report.c:755
#, fuzzy, c-format
msgid "%s %s (%s)"
msgstr "%s în %s (%s)\n"
@@ -3983,11 +4012,11 @@ msgstr "%s în %s (%s)\n"
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:2356
+#: server/ruleset.c:2366
msgid "No barbarian nation in rulesets, at least one required!"
msgstr ""
-#: server/ruleset.c:3166
+#: server/ruleset.c:3178
msgid "Loading rulesets"
msgstr "Se încarcă setul de reguli"
@@ -4003,7 +4032,7 @@ msgstr ""
"salvări mai vechi, sau poate indica un fişier salvat invalid. Continuaţi pe "
"propria dumneavoastră raspundere."
-#: server/savegame.c:3588
+#: server/savegame.c:3587
#, fuzzy
msgid "Saved game is too old, at least version 1.9.0 required."
msgstr ""
@@ -4011,7 +4040,7 @@ msgstr ""
"sau mai nouă."
#. TRANS: Fatal error message.
-#: server/savegame.c:3815
+#: server/savegame.c:3817
#, fuzzy
msgid ""
"Saved game uses the \"classic\" terrain ruleset, and is no longer supported."
@@ -4019,7 +4048,7 @@ msgstr ""
"Salvarea foloseÅŸte setul clasic de reguli pentru teren care nu mai este "
"suportat."
-#: server/savegame.c:3824
+#: server/savegame.c:3826
#, c-format
msgid ""
"Warning: Different rulesetdirs ('%s' and '%s') are no longer supported. "
@@ -4029,7 +4058,7 @@ msgstr ""
"mai sunt suportate. Se foloseÅŸte '%s'."
#. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4051
+#: server/savegame.c:4055
#, c-format
msgid "%s had invalid nation; changing to %s."
msgstr ""
@@ -4062,7 +4091,7 @@ msgstr "Interne"
msgid "Networking"
msgstr "Reţelistic"
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:734
#: client/gui-win32/dialogs.c:532
msgid "All"
msgstr "Tot"
@@ -5329,11 +5358,11 @@ msgstr ""
"adăugate statistici despre jucători la fiecare rundă. Aceste statistici pot "
"fi folosite la final pentru a crea rapoarte despre evoluţia jocului."
-#: server/sernet.c:150
+#: server/sernet.c:151
msgid "Server cannot read standard input. Ignoring input."
msgstr "Serverul nu poate citi intrarea standard. Se ignoră intrarea."
-#: server/sernet.c:929
+#: server/sernet.c:933
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr "Server: adresă invalidă: [%s:%d]."
@@ -5412,36 +5441,36 @@ msgstr "Nava spatială are deja numărul maxim de module de panouri solare"
msgid "Without guidance from the capital, the %s spaceship is lost!"
msgstr "Pierzând legătura cu capitala, nava spaţială %să este pierdută!"
-#: server/srv_main.c:240
+#: server/srv_main.c:242
msgid "Game ended in a draw as end year exceeded"
msgstr "Jocul s-a terminat cu o remiză deoarece s-a depăşit anul de sfârşit"
-#: server/srv_main.c:274
+#: server/srv_main.c:276
#, c-format
msgid "The %s spaceship has arrived at Alpha Centauri."
msgstr "Nava spaţială %s a ajuns pe Alpha Centauri."
-#: server/srv_main.c:287 server/srv_main.c:322
+#: server/srv_main.c:289 server/srv_main.c:324
#, c-format
msgid "Team victory to %s"
msgstr "Victoria echipei %s"
-#: server/srv_main.c:297 server/srv_main.c:338
+#: server/srv_main.c:299 server/srv_main.c:340
#, c-format
msgid "Game ended in victory for %s"
msgstr "Jocul s-a terminat cu victorie pentru %s"
-#: server/srv_main.c:345
+#: server/srv_main.c:347
msgid "Game ended in a draw"
msgstr "Jocul s-a terminat cu o remiză"
-#: server/srv_main.c:461 server/srv_main.c:472
+#: server/srv_main.c:465 server/srv_main.c:476
#, fuzzy, c-format
msgid "Your %s was disbanded in accordance with your peace treaty with the %s."
msgstr ""
"Unitatea dumneavoastră %s din a fost dizolvată ca urmare a acordului cu %si"
-#: server/srv_main.c:512 server/srv_main.c:516
+#: server/srv_main.c:516 server/srv_main.c:520
#, c-format
msgid ""
"Concerned citizens point out that the cease-fire with %s will run out soon."
@@ -5449,14 +5478,14 @@ msgstr ""
"Cetăţenii îngrijoraţi amintesc faptul că starea de încetare a focului cu %s "
"se va termina în curând."
-#: server/srv_main.c:521 server/srv_main.c:525
+#: server/srv_main.c:525 server/srv_main.c:529
#, c-format
msgid "The cease-fire with %s has run out. You are now at war with the %s."
msgstr ""
"Starea de încetare a focului cu %s s-a terminat. Acum sunteţi în război cu %"
"s."
-#: server/srv_main.c:542
+#: server/srv_main.c:546
#, fuzzy, c-format
msgid ""
"Ceasefire between %s and %s has run out. They are at war. You cancel your "
@@ -5465,349 +5494,335 @@ msgstr ""
"Starea de încetare a focului dintre %s şi %s s-a terminat. Sunt în război. "
"Aţi anulat alianţa cu %s."
-#: server/srv_main.c:961
+#: server/srv_main.c:997
#, c-format
msgid "Failed saving game as %s"
msgstr "Salvarea jocului ca %s a eÅŸuat"
-#: server/srv_main.c:963
+#: server/srv_main.c:999
#, c-format
msgid "Game saved as %s"
msgstr "Jocul salvat ca %s"
-#: server/srv_main.c:994
+#: server/srv_main.c:1030
msgid "The game is already running."
msgstr "Jocul rulează deja."
-#: server/srv_main.c:1002
+#: server/srv_main.c:1038
#, 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:1009
+#: server/srv_main.c:1045
msgid "Starting game."
msgstr "Pornesc jocul."
-#: server/srv_main.c:1071
+#: server/srv_main.c:1112
#, c-format
msgid "request for unknown report (type %d)"
msgstr "cerere pentru raport necunoscut (tip %d)"
-#: server/srv_main.c:1136
+#: server/srv_main.c:1177
#, c-format
msgid "Warning: rejecting old client %s"
msgstr "Avertisment: refuz o versiune veche de client %s"
-#: server/srv_main.c:1238
+#: server/srv_main.c:1279
#, 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:1338
+#: server/srv_main.c:1381
msgid "Please choose a non-blank name."
msgstr "Alegeţi un nume diferit de spaţiu."
-#: server/srv_main.c:1354
+#: server/srv_main.c:1397
msgid "That nation is already in use."
msgstr "Naţiunea este deja aleasă de către cineva."
-#: server/srv_main.c:1370
+#: server/srv_main.c:1413
#, 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:1391
+#: server/srv_main.c:1434
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:1490
+#: server/srv_main.c:1533
#, 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:1496
+#: server/srv_main.c:1539
#, c-format
msgid "%s nation is already in use."
msgstr "Naţiunea %s este deja aleasă."
-#: server/srv_main.c:1514
+#: server/srv_main.c:1557
#, c-format
msgid "%s is the %s ruler %s."
msgstr "%s este conducătorul %s %s"
-#: server/srv_main.c:1570
+#: server/srv_main.c:1613
#, 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:1614 server/srv_main.c:1618
+#: server/srv_main.c:1657 server/srv_main.c:1661
#, 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:1760
+#: server/srv_main.c:1803
#, c-format
msgid "Player %d"
msgstr "Jucătorul %d"
-#: server/srv_main.c:1771 server/srv_main.c:1777
+#: server/srv_main.c:1814 server/srv_main.c:1820
#, c-format
msgid "%s rules the %s."
msgstr "%s îi conduce pe %s."
-#: server/srv_main.c:1942
+#: server/srv_main.c:1985
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
msgstr ""
-#: server/srv_main.c:1993
+#: server/srv_main.c:2037
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr "Se trimite informaţia la metaserver [%s]"
-#: server/srv_main.c:2024
+#: server/srv_main.c:2069
msgid "The game is over..."
msgstr "Jocul sa terminat ..."
-#: server/srv_main.c:2237
+#: server/srv_main.c:2286
msgid "Now accepting new client connections."
msgstr "Se acceptă jucători ..."
-#: server/stdinhand.c:246
-#, c-format
-msgid "Vote \"%s\" is passed %d to %d with %d abstentions."
-msgstr ""
-"Votarea \"%s\" a fost aprobată %d voturi pentru şi %d împotrivă cu %d "
-"abţineri."
-
-#: server/stdinhand.c:253
-#, c-format
-msgid "Vote \"%s\" failed with %d against, %d for and %d abstentions."
-msgstr ""
-"Votarea \"%s\" a fost respinsă cu %d voturi împotrivă, %d pentru şi %d "
-"abţineri."
-
#. TRANS: ambiguous command
-#: server/stdinhand.c:365
+#: server/stdinhand.c:284
msgid "(ambiguous)"
msgstr "(ambiguu)"
#. TRANS: unrecognized command
#. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:416
+#: server/stdinhand.c:287 client/citydlg_common.c:419
#: 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 "(necunoscut)"
-#: server/stdinhand.c:458
+#: server/stdinhand.c:377
msgid "Name is empty, so cannot be a player."
msgstr "Numele este gol aşa că nu poate fi un jucător."
-#: server/stdinhand.c:462
+#: server/stdinhand.c:381
msgid "Name is too long, so cannot be a player."
msgstr "Numele este prea lung aşa că nu poate fi un jucător."
-#: server/stdinhand.c:466
+#: server/stdinhand.c:385
#, c-format
msgid "Player name prefix '%s' is ambiguous."
msgstr "Prefixul jucătorului '%s' este ambiguu."
-#: server/stdinhand.c:470
+#: server/stdinhand.c:389
#, c-format
msgid "No player by the name of '%s'."
msgstr "Nu există jucător cu numele '%s'."
-#: server/stdinhand.c:474 server/stdinhand.c:509
+#: server/stdinhand.c:393 server/stdinhand.c:428
#, c-format
msgid "Unexpected match_result %d (%s) for '%s'."
msgstr "Potrivire match_result neaşteptată %d (%s) pentru %s."
-#: server/stdinhand.c:493
+#: server/stdinhand.c:412
msgid "Name is empty, so cannot be a connection."
msgstr "Numele este gol aşa că nu poate fi o conexiune."
-#: server/stdinhand.c:497
+#: server/stdinhand.c:416
msgid "Name is too long, so cannot be a connection."
msgstr "Numele este prea lung aşa că nu poate fi o conexiune."
-#: server/stdinhand.c:501
+#: server/stdinhand.c:420
#, c-format
msgid "Connection name prefix '%s' is ambiguous."
msgstr "Prefixul conexiuni '%s' este ambiguu."
-#: server/stdinhand.c:505
+#: server/stdinhand.c:424
#, c-format
msgid "No connection by the name of '%s'."
msgstr "Nu există conexiune cu numele '%s'."
-#: server/stdinhand.c:525
+#: server/stdinhand.c:444
#, c-format
msgid "Open metaserver connection to [%s]."
msgstr "Se deschide conexiunea cu metaserverul la [%s]."
-#: server/stdinhand.c:538
+#: server/stdinhand.c:457
#, c-format
msgid "Close metaserver connection to [%s]."
msgstr "Se închide conexiunea cu metaserverul la [%s]."
-#: server/stdinhand.c:553
+#: server/stdinhand.c:472
msgid "Metaserver connection is open."
msgstr "Conexiunea cu metaserverul este deschisă."
-#: server/stdinhand.c:556
+#: server/stdinhand.c:475
msgid "Metaserver connection is closed."
msgstr "Conexiunea cu metaserverul este închisă."
-#: server/stdinhand.c:566
+#: server/stdinhand.c:485
msgid "Metaserver connection is already open."
msgstr "Conexiunea cu metaserverul este deja deschisă."
-#: server/stdinhand.c:577
+#: server/stdinhand.c:496
msgid "Metaserver connection is already closed."
msgstr "Conexiunea cu metaserverul este deja închisă."
-#: server/stdinhand.c:582
+#: server/stdinhand.c:501
msgid "Argument must be 'u', 'up', 'd', 'down', or '?'."
msgstr "Argumentul trebuie să fie ''u', 'up', 'd', 'down', sau '?'."
-#: server/stdinhand.c:603
+#: server/stdinhand.c:522
#, fuzzy, c-format
msgid "Metaserver patches string set to '%s'."
msgstr "Metaserverul este acum '%s'."
-#: server/stdinhand.c:606
+#: server/stdinhand.c:525
#, fuzzy, c-format
msgid "Metaserver patches string set to '%s', not reporting to metaserver."
msgstr "Metaserverul este acum '%s'. nu se raportează la metaserver."
-#: server/stdinhand.c:627
+#: server/stdinhand.c:546
#, c-format
msgid "Metaserver message string set to '%s'."
msgstr "Mesajul metaserverului este acum '%s'."
-#: server/stdinhand.c:630
+#: server/stdinhand.c:549
#, c-format
msgid "Metaserver message string set to '%s', not reporting to metaserver."
msgstr "Mesajul metaserverului este acum '%s', nu se raportează la metaserver."
-#: server/stdinhand.c:650
+#: server/stdinhand.c:569
#, c-format
msgid "Metaserver is now [%s]."
msgstr "Metaserverul este acum [%s]."
-#: server/stdinhand.c:660
+#: server/stdinhand.c:579
#, c-format
msgid "Server id: %s"
msgstr "Indicativul serverului: %s"
-#: server/stdinhand.c:757
+#: server/stdinhand.c:676
msgid "You cannot save games manually on this server."
msgstr "Nu poţi salva jocul manual pe acest server."
-#: server/stdinhand.c:774
+#: server/stdinhand.c:693
msgid "Cannot toggle a barbarian player."
msgstr "Nu se poate trece un jucător sub controlul barbarilor."
-#: server/stdinhand.c:781
+#: server/stdinhand.c:700
#, c-format
msgid "%s is now under AI control."
msgstr "%s este controlat acum de AI."
-#: server/stdinhand.c:802
+#: server/stdinhand.c:721
#, c-format
msgid "%s is now under human control."
msgstr "%s este acum sub control uman."
-#: server/stdinhand.c:847
+#: server/stdinhand.c:766
msgid "Can't add AI players once the game has begun."
msgstr "Nu pot adăuga jucători AI odată ce jocul a început."
-#: server/stdinhand.c:867
+#: server/stdinhand.c:786
msgid "Can't add more players, server is full."
msgstr "Nu pot adăuga jucători noi, serverul este plin."
-#: server/stdinhand.c:874
+#: server/stdinhand.c:793
msgid "Can't use an empty name."
msgstr "Nu pot folosi un nume gol."
-#: server/stdinhand.c:881
+#: server/stdinhand.c:800
#, c-format
msgid "That name exceeds the maximum of %d chars."
msgstr "NUmele depăşeşte numărul maxim permis de caractere %d."
-#: server/stdinhand.c:887
+#: server/stdinhand.c:806
msgid "That name is not allowed."
msgstr "Numele acesta nu este permis."
-#: server/stdinhand.c:893
+#: server/stdinhand.c:812
msgid "A player already exists by that name."
msgstr "Un jucător cu acest nume deja există."
-#: server/stdinhand.c:899
+#: server/stdinhand.c:818
msgid "A user already exists by that name."
msgstr "Există deja un jucător cu acest nume."
-#: server/stdinhand.c:925
+#: server/stdinhand.c:844
#, c-format
msgid "%s has been added as an AI-controlled player."
msgstr "%s a fost adăugat ca jucător AI."
-#: server/stdinhand.c:932
+#: server/stdinhand.c:851
#, c-format
msgid "Error creating new AI player: %s."
msgstr "Eroare la crearea unui nou jucător AI: %s."
-#: server/stdinhand.c:966
+#: server/stdinhand.c:885
msgid "Players cannot be removed once the game has started."
msgstr "Jucătorii nu pot fi îndepărtaţi odată ce jocul a început."
-#: server/stdinhand.c:977
+#: server/stdinhand.c:896
#, c-format
msgid "Removed player %s from the game."
msgstr "Jucătorul %s a fost îndepărtat din joc."
-#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
+#: server/stdinhand.c:935 server/stdinhand.c:3372 server/stdinhand.c:3507
#, c-format
msgid "Name \"%s\" disallowed for security reasons."
msgstr "Numele \"%s\" nu este permis din motive de siguranţă."
-#: server/stdinhand.c:1029
+#: server/stdinhand.c:948
#, c-format
msgid "No command script found by the name \"%s\"."
msgstr "Nu există fişier de comenzi cu numele \"%s\"."
-#: server/stdinhand.c:1037
+#: server/stdinhand.c:956
#, c-format
msgid "Loading script file: %s"
msgstr "Se încarcă fişierul de comenzi: %s"
-#: server/stdinhand.c:1052
+#: server/stdinhand.c:971
#, c-format
msgid "Cannot read command line scriptfile '%s'."
msgstr "Nu se poate citi fişierul de comenzi dat prin linia de comandă '%s'."
-#: server/stdinhand.c:1054
+#: server/stdinhand.c:973
#, c-format
msgid "Could not read script file '%s'."
msgstr "Nu se poate citi fiÅŸierul de comenzi '%s'."
-#: server/stdinhand.c:1146
+#: server/stdinhand.c:1065
#, c-format
msgid "Could not write script file '%s'."
msgstr "Nu se poate scrie în fişierul de comenzi '%s'."
-#: server/stdinhand.c:1158
+#: server/stdinhand.c:1077
msgid "You cannot use the write command on this server for security reasons."
msgstr ""
"Nu puteţi folosi comanda de scriere pe acest server din motive de siguranţă."
-#: server/stdinhand.c:1186
+#: server/stdinhand.c:1105
#, c-format
msgid ""
"Cannot decrease command access level '%s' for connection '%s'; you only have "
@@ -5816,7 +5831,13 @@ msgstr ""
"Nu se poate micşora nivelul de acces la comandă '%s' pentru conexiunea '%s'; "
"aveţi doar '%s'."
-#: server/stdinhand.c:1241
+#: server/stdinhand.c:1114
+#, 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:1163
#, c-format
msgid ""
"Anyone can now become game organizer '%s' by issuing the 'first' command."
@@ -5824,28 +5845,28 @@ msgstr ""
"Oricine poate deveni acum organizatorul jocului '%s' folosind comanda "
"'first'."
-#: server/stdinhand.c:1274
+#: server/stdinhand.c:1187
msgid "Command access levels in effect:"
msgstr "Nivelurile de acces la comndă active:"
-#: server/stdinhand.c:1282
+#: server/stdinhand.c:1194
#, c-format
msgid "Command access level for new connections: %s"
msgstr "Nivelul de acces la comandă pentru conexiunile noi: %s"
-#: server/stdinhand.c:1285
+#: server/stdinhand.c:1197
#, c-format
msgid "Command access level for first player to take it: %s"
msgstr "Nivelul de acces la comandă primit de primul jucător: %s"
-#: server/stdinhand.c:1294
+#: server/stdinhand.c:1206
msgid ""
"Error: command access level must be one of 'none', 'info', 'ctrl', or 'hack'."
msgstr ""
"Eroare: nivelul de acces la comandă trebuie să fie unul dintre 'none', "
"'info', 'ctrl' sau 'hack'."
-#: server/stdinhand.c:1299
+#: server/stdinhand.c:1211
#, c-format
msgid ""
"Cannot increase command access level to '%s'; you only have '%s' yourself."
@@ -5853,204 +5874,191 @@ 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: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: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:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
+#: server/stdinhand.c:1238 server/stdinhand.c:1252 server/stdinhand.c:1273
#, 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:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
+#: server/stdinhand.c:1243 server/stdinhand.c:1257 server/stdinhand.c:1267
#, 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:1402
+#: server/stdinhand.c:1302
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:1406
+#: server/stdinhand.c:1306
#, 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:1411
+#: server/stdinhand.c:1311
msgid "Someone else already is game organizer."
msgstr "Este deja altcineva organizatorul jocului."
-#: server/stdinhand.c:1416
+#: server/stdinhand.c:1316
#, c-format
msgid "Connection %s has opted to become the game organizer."
msgstr "Conexiunea %s a optat să devină organizatorul jocului."
-#: server/stdinhand.c:1467
+#: server/stdinhand.c:1367
#, c-format
msgid "Invalid argument %d."
msgstr "Argument invalid %d."
-#: server/stdinhand.c:1474
+#: server/stdinhand.c:1374
msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
msgstr "Mod de folosire: timeoutincrease <turn> <turnadd> <value> <valuemult>."
-#: server/stdinhand.c:1482
+#: server/stdinhand.c:1382
#, 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:1542 server/stdinhand.c:1545
+#: server/stdinhand.c:1442 server/stdinhand.c:1445
msgid "Option:"
msgstr "Opţiunea:"
-#: server/stdinhand.c:1555 server/stdinhand.c:4031
+#: server/stdinhand.c:1455 server/stdinhand.c:4079
msgid "Description:"
msgstr "Descriere:"
-#: server/stdinhand.c:1560
+#: server/stdinhand.c:1460
#, c-format
msgid "Status: %s"
msgstr "Stare: %s"
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "changeable"
msgstr "modificabil"
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "fixed"
msgstr "fix"
-#: server/stdinhand.c:1567
+#: server/stdinhand.c:1467
#, c-format
msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
msgstr "Valoare: %d, Minim: 0, Implicit: %d, Maxim: 1"
-#: server/stdinhand.c:1572
+#: server/stdinhand.c:1472
#, c-format
msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
msgstr "Valoare: %d, Minim: %d, Implicit: %d, Maxim: %d"
-#: server/stdinhand.c:1578
+#: server/stdinhand.c:1478
#, c-format
msgid "Value: \"%s\", Default: \"%s\""
msgstr "Valoare: \"%s\", Implicit: \"%s\""
-#: server/stdinhand.c:1597
+#: server/stdinhand.c:1497
msgid "Explanations are available for the following server options:"
msgstr "Există explicaţii pentru următoarele opţiuni ale serverului:"
-#: server/stdinhand.c:1643
+#: server/stdinhand.c:1537
msgid "No explanation for that yet."
msgstr "Nu există încă explicaţie pentru aceasta."
-#: server/stdinhand.c:1646 server/stdinhand.c:2480
+#: server/stdinhand.c:1540 server/stdinhand.c:2468
msgid "Ambiguous option name."
msgstr "Numele opţiunii este ambiguu."
-#: server/stdinhand.c:1666
+#: server/stdinhand.c:1560
#, c-format
msgid "Server Operator: %s"
msgstr "Operatorul serverului: %s"
-#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
+#: server/stdinhand.c:1686 server/stdinhand.c:1713 server/stdinhand.c:1731
#, 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:1822
+#: server/stdinhand.c:1718
#, c-format
msgid "%s is not controlled by the AI."
msgstr "%s nu este controlat de AI."
-#: server/stdinhand.c:1842
+#: server/stdinhand.c:1738
#, 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:1857 server/stdinhand.c:2162
+#: server/stdinhand.c:1753
msgid "This command is client only."
msgstr "Această comandă este valabilă doar pentru client."
-#: server/stdinhand.c:1860
+#: server/stdinhand.c:1756
msgid "Usage: away"
msgstr "Mod de folosire: away"
-#: server/stdinhand.c:1865
+#: server/stdinhand.c:1761
msgid "Only players may use the away command."
msgstr "Doar jucătorii pot folosi comanda 'away'."
-#: server/stdinhand.c:1869
+#: server/stdinhand.c:1765
#, c-format
msgid "%s set to away mode."
msgstr "%s a intrat în modul plecat."
-#: server/stdinhand.c:1877
+#: server/stdinhand.c:1772
#, c-format
msgid "%s returned to game."
msgstr "%s s-a întors la joc."
-#: server/stdinhand.c:1919
+#: server/stdinhand.c:1817
#, 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:1925
+#: server/stdinhand.c:1823
#, c-format
msgid "Unknown option '%s'."
msgstr "Optiune necunoscută '%s'."
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1848
msgid "All options with non-default values"
msgstr "Toate opţiunile cu valori neimplicite"
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1851
msgid "All options"
msgstr "Toate opţiunile"
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1854
msgid "Vital options"
msgstr "Opţiuni vitale"
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1857
msgid "Situational options"
msgstr "Stabileşte opţiunile locale"
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1860
msgid "Rarely used options"
msgstr "Opţiuni folosite rar"
-#: server/stdinhand.c:1965
+#: server/stdinhand.c:1863
msgid "+ means you may change the option"
msgstr "+ înseamnă că puteţi schimba opţiunea"
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1864
msgid "= means the option is on its default value"
msgstr "= înseamnă că optiunea are valoarea ei implicită"
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
#, c-format
msgid "%-*s value (min,max) "
msgstr "%-*s valoare (min,max) "
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
msgid "Option"
msgstr "Opţiune"
-#: server/stdinhand.c:1973
+#: server/stdinhand.c:1871
msgid "description"
msgstr "deschriere"
-#: server/stdinhand.c:2042
+#: server/stdinhand.c:1940
msgid ""
"Try 'show situational' or 'show rare' to show more options.\n"
"Try 'show changed' to show settings with non-default values."
@@ -6059,77 +6067,149 @@ msgstr ""
"opţiuni.\n"
"Încercaţi 'show changed' pentru a vedea setările cu valori neimplicite."
-#: server/stdinhand.c:2092
+#: server/stdinhand.c:1966
msgid "Cannot change teams once game has begun."
msgstr "Echipele nu se mai pot schimba după începerea jocului."
-#: server/stdinhand.c:2102
+#: server/stdinhand.c:1976
msgid "Undefined argument. Usage: team <player> <team>."
msgstr "Argument nedefinit. Mod de folosire: team <player> <team>."
-#: server/stdinhand.c:2122
+#: server/stdinhand.c:1996
#, 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:2129
+#: server/stdinhand.c:2003
msgid "Cannot team a barbarian."
msgstr "Nu puteţi forma echipă cu un jucător barbar."
-#: server/stdinhand.c:2135
+#: server/stdinhand.c:2009
#, c-format
msgid "Player %s set to team %s."
msgstr "Jucătorul %s a fost adăugat la echipa %s."
-#: 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:2035 server/voting.c:512
+#, fuzzy
+msgid "Teamvote"
+msgstr "Echipa"
-#: server/stdinhand.c:2165
-msgid "Observers cannot vote."
-msgstr "Observatorii nu pot vota."
+#: server/stdinhand.c:2035 server/voting.c:516
+msgid "Vote"
+msgstr ""
-#: server/stdinhand.c:2168
+#: server/stdinhand.c:2037
+#, c-format
msgid ""
-"You can only vote in a running game. Use 'first' to become the game "
-"organizer if there currently is none."
+"%s %d \"%s\" (needs %0.0f%%%s): %d for, %d against, and %d abstained out of %"
+"d players."
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: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:2041
+msgid " no dissent"
+msgstr ""
-#: server/stdinhand.c:2188
+#: server/stdinhand.c:2049
msgid "There are no votes going on."
msgstr "Nu se votează nimic momentan."
-#: server/stdinhand.c:2208
-msgid "No legal last vote."
+#: server/stdinhand.c:2077
+#, fuzzy
+msgid "Invalid arguments. Usage: vote yes|no|abstain [vote number]."
+msgstr "Argumente nedefinite: Mod de folosire: vote yes|no [vote number]."
+
+#: server/stdinhand.c:2095 server/stdinhand.c:2213 server/stdinhand.c:3714
+msgid "You are not allowed to use this command."
+msgstr "Nu aveţi dreptul să folosiţi această comandă."
+
+#: server/stdinhand.c:2104
+#, fuzzy, c-format
+msgid "The argument \"%s\" is ambigious."
+msgstr "Argumentul '%s' al comenzi 'help' este ambiguu."
+
+#: server/stdinhand.c:2119
+#, fuzzy
+msgid "There are no votes running."
+msgstr "Nu se votează nimic momentan."
+
+#: server/stdinhand.c:2121
+#, fuzzy, c-format
+msgid "No legal last vote (%d %s)."
msgstr "Nici un ultim vot legal."
-#: server/stdinhand.c:2213
-msgid "Value must be integer."
-msgstr "Valoarea trebuie să fie un număr întreg."
+#: server/stdinhand.c:2122
+msgid "other vote running"
+msgid_plural "other votes running"
+msgstr[0] ""
+msgstr[1] ""
+
+#: server/stdinhand.c:2129 server/stdinhand.c:2491 server/stdinhand.c:2532
+msgid "Value must be an integer."
+msgstr "Valoarea trebuie să fie un întreg."
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2135 server/stdinhand.c:2221
#, c-format
msgid "No such vote (%d)."
msgstr "Nu există un asemenea vot (%d)."
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2141
+#, fuzzy
+msgid "You are not allowed to vote on that."
+msgstr "Nu puteţi modifica valoarea aceastei opţiuni."
+
+#: server/stdinhand.c:2146
#, c-format
msgid "You voted for \"%s\""
msgstr "AÅ£i votat pentru \"%s\""
-#: server/stdinhand.c:2232
+#: server/stdinhand.c:2150
#, c-format
msgid "You voted against \"%s\""
msgstr "Aţi votat împotriva \"%s\""
-#: server/stdinhand.c:2259
+#: server/stdinhand.c:2155
+#, c-format
+msgid "You abstained from voting on \"%s\""
+msgstr ""
+
+#: server/stdinhand.c:2190
+msgid "Missing argument <vote number> or the string \"all\"."
+msgstr ""
+
+#: server/stdinhand.c:2197
+#, fuzzy
+msgid "You don't have any vote going on."
+msgstr "Joc: Aici nu aveţi un lucrător."
+
+#: server/stdinhand.c:2204
+#, fuzzy
+msgid "There isn't any vote going on."
+msgstr "Nu se votează nimic momentan."
+
+#: server/stdinhand.c:2209
+msgid "Server: All votes have been removed."
+msgstr ""
+
+#: server/stdinhand.c:2226
+#, fuzzy, c-format
+msgid "You are not allowed to cancel this vote (%d)."
+msgstr "Nu puteţi modifica valoarea aceastei opţiuni."
+
+#: server/stdinhand.c:2232
+msgid "Usage: /cancelvote [<vote number>|all]"
+msgstr ""
+
+#: server/stdinhand.c:2241
+#, c-format
+msgid "Server: %s cancelled the vote \"%s\" (number %d)."
+msgstr ""
+
+#: server/stdinhand.c:2247
+#, c-format
+msgid "Server: The vote \"%s\" (number %d) has been cancelled."
+msgstr ""
+
+#: server/stdinhand.c:2265
msgid ""
"Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
"<x> <y> | unit <id> | tech <player> | timing | info>."
@@ -6137,132 +6217,128 @@ msgstr ""
"Argumente nedefinite. Mod de folosire: debug <diplomacy <player> | city <x> "
"<y> | units <x> <y> | unit <id> | tech <player> | timing | info>."
-#: server/stdinhand.c:2265
+#: server/stdinhand.c:2271
msgid "Can only use this command once game has begun."
msgstr "Comanda poate fi folosită după începerea jocului."
-#: server/stdinhand.c:2294
+#: server/stdinhand.c:2300
#, c-format
msgid "%s diplomacy no longer debugged"
msgstr "Nu se mai depanează diplomaţia lui %s"
-#: server/stdinhand.c:2298
+#: server/stdinhand.c:2304
#, c-format
msgid "%s diplomacy debugged"
msgstr "Se depanează diplomaţia lui %s."
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2323
#, c-format
msgid "%s tech no longer debugged"
msgstr "Nu se mai depanează tehnologia %s"
-#: server/stdinhand.c:2321
+#: server/stdinhand.c:2327
#, c-format
msgid "%s tech debugged"
msgstr "Se depanează tehnologia %s"
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2358 server/stdinhand.c:2388
msgid "Value 2 & 3 must be integer."
msgstr "Valoarile 2 şi 3 trebuie să fie numere întregi."
-#: server/stdinhand.c:2356 server/stdinhand.c:2386
+#: server/stdinhand.c:2362 server/stdinhand.c:2392
msgid "Bad map coordinates."
msgstr "Coordonate de hartă greşite."
-#: server/stdinhand.c:2361
+#: server/stdinhand.c:2367
msgid "No city at this coordinate."
msgstr "Nu există oraş la aceste coordonate."
-#: server/stdinhand.c:2366
+#: server/stdinhand.c:2372
#, c-format
msgid "%s no longer debugged"
msgstr "Nu se mai depanează %s"
-#: server/stdinhand.c:2392 server/stdinhand.c:2422
+#: server/stdinhand.c:2398 server/stdinhand.c:2428
#, fuzzy, c-format
msgid "%s %s no longer debugged."
msgstr "Nu se mai depanează a lui %s %s."
-#: server/stdinhand.c:2397 server/stdinhand.c:2427
+#: server/stdinhand.c:2403 server/stdinhand.c:2433
#, fuzzy, c-format
msgid "%s %s debugged."
msgstr "Se depanează a lui %s %s"
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2419
msgid "Value 2 must be integer."
msgstr "Valoarea 2 trebuie să fie un număr întreg."
-#: server/stdinhand.c:2417
+#: server/stdinhand.c:2423
#, c-format
msgid "Unit %d does not exist."
msgstr "Unitatea %d nu există."
-#: server/stdinhand.c:2475
+#: server/stdinhand.c:2464
msgid "Undefined argument. Usage: set <option> <value>."
msgstr "Argument nedefinit. Mod de folosire: set <option> <value>."
-#: server/stdinhand.c:2485
+#: server/stdinhand.c:2473
msgid "You are not allowed to set this option."
msgstr "Nu puteţi modifica valoarea aceastei opţiuni."
-#: server/stdinhand.c:2490 server/stdinhand.c:3463
+#: server/stdinhand.c:2478 server/stdinhand.c:3501
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:2502 server/stdinhand.c:2543
-msgid "Value must be an integer."
-msgstr "Valoarea trebuie să fie un întreg."
-
-#: server/stdinhand.c:2512
+#: server/stdinhand.c:2501
#, c-format
msgid "The parameter %s should only contain digits 0-1."
msgstr ""
-#: server/stdinhand.c:2519
+#: server/stdinhand.c:2508
msgid "Value out of range (minimum: 0, maximum: 1)."
msgstr "Valoare în afara limitelor (minim: 0, maxim: 1)."
-#: server/stdinhand.c:2534 server/stdinhand.c:2576
+#: server/stdinhand.c:2523 server/stdinhand.c:2565
#, c-format
msgid "Option: %s has been set to %d."
msgstr "Opţiunea: %s a fost setată la %d."
-#: server/stdinhand.c:2554
+#: server/stdinhand.c:2543
#, c-format
msgid "The parameter %s should only contain +- and 0-9."
msgstr ""
-#: server/stdinhand.c:2561
+#: server/stdinhand.c:2550
#, c-format
msgid "Value out of range (minimum: %d, maximum: %d)."
msgstr "Valoare în afara limitelor (minim: %d, maxim: %d)."
-#: server/stdinhand.c:2586
+#: server/stdinhand.c:2575
msgid "String value too long. Usage: set <option> <value>."
msgstr ""
"Lungimea ÅŸirului este prea mare. Mod de folosire: set <option> <value>."
-#: server/stdinhand.c:2600
+#: server/stdinhand.c:2589
#, c-format
msgid "Option: %s has been set to \"%s\"."
msgstr "Opţiunea: %s a fost setată la \"%s\"."
-#: server/stdinhand.c:2658
+#: server/stdinhand.c:2652
msgid "Sorry, one can't observe globally in this game."
msgstr "Nu se poate observa global jocul acesta."
-#: server/stdinhand.c:2661
+#: server/stdinhand.c:2655
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:2671
+#: server/stdinhand.c:2665
#, 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
+#: server/stdinhand.c:2673
#, c-format
msgid ""
"You cannot take a new player because the maximum of %d player has already "
@@ -6273,73 +6349,73 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: server/stdinhand.c:2691
+#: server/stdinhand.c:2685
msgid "You cannot take a new player because there are no free player slots."
msgstr ""
-#: server/stdinhand.c:2702
+#: server/stdinhand.c:2696
msgid "Sorry, one can't observe barbarians in this game."
msgstr "Nu se poat observa barbari în jocul acesta."
-#: server/stdinhand.c:2705
+#: server/stdinhand.c:2699
msgid "Sorry, one can't take barbarians in this game."
msgstr "Nu se poate alege naţiunea barbară în jocul acesta."
-#: server/stdinhand.c:2713
+#: server/stdinhand.c:2707
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:2716
+#: server/stdinhand.c:2710
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:2724
+#: server/stdinhand.c:2718
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:2727
+#: server/stdinhand.c:2721
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:2736
+#: server/stdinhand.c:2730
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:2739
+#: server/stdinhand.c:2733
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:2749
+#: server/stdinhand.c:2743
msgid "Sorry, one can't observe in this game."
msgstr "Nu se poate observa în acest joc."
-#: server/stdinhand.c:2754
+#: server/stdinhand.c:2748
msgid "Sorry, one can't take players in this game."
msgstr "Nu se pot prelua jucătorii în acest joc."
-#: server/stdinhand.c:2760
+#: server/stdinhand.c:2754
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:2791
+#: server/stdinhand.c:2785
msgid "Usage: observe [connection-name [player-name]]"
msgstr "Mod de folosire: observe [nume-conexiune [nume-jucător]]"
-#: server/stdinhand.c:2797
+#: server/stdinhand.c:2791
msgid "Usage: observe [player-name]"
msgstr "Mod de folosire: observe [nume-jucător]"
-#: server/stdinhand.c:2847
+#: server/stdinhand.c:2841
#, 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:2858
+#: server/stdinhand.c:2852
#, c-format
msgid "%s is already observing %s."
msgstr "%s observă deja %s."
-#: server/stdinhand.c:2863
+#: server/stdinhand.c:2857
#, c-format
msgid "%s is already observing."
msgstr "%s observă deja."
@@ -6354,236 +6430,241 @@ msgstr "%s observă acum %s."
msgid "%s now observes"
msgstr "%s observă acum"
-#: server/stdinhand.c:2969
+#: server/stdinhand.c:2971
msgid "Usage: take <connection-name> <player-name>"
msgstr "Mod de folosire: take <nume-conexiune> <nume-jucător>"
-#: server/stdinhand.c:2974
+#: server/stdinhand.c:2976
msgid "Usage: take <player-name>"
msgstr "Mod de folosire : take <nume-jucător>"
-#: server/stdinhand.c:2980
+#: server/stdinhand.c:2982
msgid "Usage: take [connection-name] <player-name>"
msgstr "Mod de folosire: take [nume-conexiune] <nume-jucător>"
-#: server/stdinhand.c:3010
+#: server/stdinhand.c:3012
#, fuzzy, c-format
msgid "%s already controls %s."
msgstr "%s controlează deja %s"
-#: server/stdinhand.c:3024
+#: server/stdinhand.c:3026
#, 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:3059
+#: server/stdinhand.c:3061
#, c-format
msgid "being detached from %s."
msgstr "se deataşează de la %s"
-#: server/stdinhand.c:3135
+#: server/stdinhand.c:3146
#, fuzzy, c-format
msgid "%s now controls %s (%s, %s)."
msgstr "%s controlează acum %s (%s, %s)"
-#: server/stdinhand.c:3139 server/stdinhand.c:4260
+#: server/stdinhand.c:3150 server/stdinhand.c:4308
#: data/nation/barbarian.ruleset:3
msgid "Barbarian"
msgstr "Barbar"
-#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
+#: server/stdinhand.c:3152 server/stdinhand.c:4310 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-sdl/plrdlg.c:645
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr "AI"
-#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-gtk-2.0/pages.c:2125
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
+#: server/stdinhand.c:3153 server/stdinhand.c:4312
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-gtk-2.0/pages.c:2127
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/connectdlg.c:215
msgid "Human"
msgstr "Om"
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-gtk-2.0/pages.c:2124 client/gui-win32/connectdlg.c:200
-#: client/gui-win32/connectdlg.c:212
+#: server/stdinhand.c:3155 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-gtk-2.0/pages.c:2126 client/gui-win32/connectdlg.c:202
+#: client/gui-win32/connectdlg.c:214
msgid "Alive"
msgstr "Activ"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3156 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-win32/connectdlg.c:202
msgid "Dead"
msgstr "Decedat"
-#: server/stdinhand.c:3147
+#: server/stdinhand.c:3159
#, fuzzy, c-format
msgid "%s failed to attach to any player."
msgstr "%s nu este ataşat nici unui jucător."
-#: server/stdinhand.c:3182
+#: server/stdinhand.c:3194
msgid "Usage: detach <connection-name>"
msgstr "Mod de folosire: detach <nume-conexiune>"
-#: server/stdinhand.c:3202
+#: server/stdinhand.c:3214
msgid "You can not detach other users."
msgstr "Nu poţi deataşa alţi utilizatori."
-#: server/stdinhand.c:3211
+#: server/stdinhand.c:3223
#, c-format
msgid "%s is not attached to any player."
msgstr "%s nu este ataşat nici unui jucător."
-#: server/stdinhand.c:3234
+#: server/stdinhand.c:3246
#, c-format
msgid "%s detaching from %s"
msgstr "%s se detaşează de %s"
-#: server/stdinhand.c:3240
+#: server/stdinhand.c:3252
#, c-format
msgid "%s no longer observing."
msgstr "%s nu mai observă."
-#: server/stdinhand.c:3259
+#: server/stdinhand.c:3271
#, c-format
msgid "detaching from %s."
msgstr "se deataşează de la %s"
-#: server/stdinhand.c:3345
+#: server/stdinhand.c:3361
msgid "Usage: load <game name>"
msgstr "Mod de folosire: load <nume joc>"
-#: server/stdinhand.c:3350
+#: server/stdinhand.c:3366
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:3372
+#: server/stdinhand.c:3388
#, 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:3389
+#: server/stdinhand.c:3405
#, c-format
msgid "Could not load savefile: %s"
msgstr "Nu am putut încărca salvarea: %s"
-#: server/stdinhand.c:3458
+#: server/stdinhand.c:3496
#, c-format
msgid "Current ruleset directory is \"%s\""
msgstr "Cirectorul curent pentru setul de reguli este \"%s\""
-#: server/stdinhand.c:3478
+#: server/stdinhand.c:3516
#, c-format
msgid "Ruleset directory \"%s\" not found"
msgstr "Directorul \"%s\" pentru setul de reguli nu a fost găsit"
-#: server/stdinhand.c:3484
+#: server/stdinhand.c:3522
#, c-format
msgid "Ruleset directory is already \"%s\""
msgstr "Directorul pentru setul de reguli este deja \"%s\""
-#: server/stdinhand.c:3488
+#: server/stdinhand.c:3526
#, c-format
msgid "Ruleset directory set to \"%s\""
msgstr "directorul pentru setul de reguli a fost stabilit la \"%s\""
-#: server/stdinhand.c:3536
+#: server/stdinhand.c:3574
msgid "Goodbye."
msgstr "La revedere."
-#: server/stdinhand.c:3567
+#: server/stdinhand.c:3606
msgid "Sorry, you are not allowed to use server commands."
msgstr "Nu puteţi folosi comenzile pentru server."
-#: server/stdinhand.c:3603
+#: server/stdinhand.c:3656
#, 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:3608
+#: server/stdinhand.c:3661
#, c-format
msgid "Unknown command. Try '%shelp'."
msgstr "Comandă necunoscută. Încearcaţi '%shelp'."
-#: server/stdinhand.c:3625
-msgid "Your new vote canceled your previous vote."
+#: server/stdinhand.c:3675
+#, fuzzy
+msgid "Your new vote cancelled your previous vote."
msgstr "Noul vot l-a anulat pe cel precedent."
-#: server/stdinhand.c:3633
-#, c-format
-msgid "New vote (number %d) by %s: %s."
+#: server/stdinhand.c:3688
+msgid "New teamvote"
+msgstr ""
+
+#: server/stdinhand.c:3691
+msgid "New vote"
+msgstr ""
+
+#: server/stdinhand.c:3695
+#, fuzzy, c-format
+msgid "%s (number %d) by %s: %s"
msgstr "Vot nou (numărul %d) de către %s: %s"
-#: server/stdinhand.c:3645
+#: server/stdinhand.c:3704
#, c-format
msgid "Your new vote (\"%s\") was not legal or was not recognized."
msgstr ""
-#: 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:3680
+#: server/stdinhand.c:3726
msgid "(server prompt)"
msgstr "(prompter server)"
-#: server/stdinhand.c:3787
+#: server/stdinhand.c:3835
msgid "Game ended in a draw."
msgstr "Jocul s-a terminat cu o remiză."
-#: server/stdinhand.c:3791
+#: server/stdinhand.c:3839
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:3796
+#: server/stdinhand.c:3844
msgid "Cannot end the game: no game running."
msgstr "Nu se poate încheia jocul: nu rulează nici un joc."
-#: server/stdinhand.c:3812
+#: server/stdinhand.c:3860
#, 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:3817
+#: server/stdinhand.c:3865
msgid "You cannot surrender now."
msgstr "Nu vă puteţi preda acum."
-#: server/stdinhand.c:3883
+#: server/stdinhand.c:3931
#, fuzzy
msgid "Not enough human players, game will not start."
msgstr "Prea puţini jucători; jocul nu va porni."
-#: server/stdinhand.c:3888
+#: server/stdinhand.c:3936
#, fuzzy
msgid "No players, game will not start."
msgstr "Prea puţini jucători; jocul nu va porni."
-#: server/stdinhand.c:3892
+#: server/stdinhand.c:3940
#, 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:3901
+#: server/stdinhand.c:3949
msgid "All players are ready; starting game."
msgstr "Toţi jucătorii sunt gata; înceape jocul."
-#: server/stdinhand.c:3915
+#: server/stdinhand.c:3963
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:3922
+#: server/stdinhand.c:3970
msgid "Cannot start the game: it is already running."
msgstr "Nu se pate porni jocul deoarece a fost deja pornit."
-#: server/stdinhand.c:3953
+#: server/stdinhand.c:4001
#, c-format
msgid "Cutting connection %s."
msgstr "ÃŽnchid conexiunea %s."
-#: server/stdinhand.c:3972
+#: server/stdinhand.c:4020
msgid ""
"Welcome - this is the introductory help text for the Freeciv server.\n"
"\n"
@@ -6620,123 +6701,123 @@ msgstr ""
" save - salvează jocul\n"
" quit - opreÅŸte serverul."
-#: server/stdinhand.c:4007 server/stdinhand.c:4010
+#: server/stdinhand.c:4055 server/stdinhand.c:4058
msgid "Command:"
msgstr "Comandă:"
-#: server/stdinhand.c:4014
+#: server/stdinhand.c:4062
msgid "Synopsis: "
msgstr "Rezumat: "
-#: server/stdinhand.c:4023
+#: server/stdinhand.c:4071
#, c-format
msgid "Level: %s"
msgstr "Nivel: %s"
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4096
msgid "The following server commands are available:"
msgstr "Serverul cunoaşte următoarele comenzi:"
-#: server/stdinhand.c:4123
+#: server/stdinhand.c:4171
#, c-format
msgid "Help argument '%s' is ambiguous."
msgstr "Argumentul '%s' al comenzi 'help' este ambiguu."
-#: server/stdinhand.c:4128
+#: server/stdinhand.c:4176
#, c-format
msgid "No match for help argument '%s'."
msgstr "Nici o potrivire pentru argumentul comenzii help: '%s'."
-#: server/stdinhand.c:4194
+#: server/stdinhand.c:4242
#, c-format
msgid "Bad list argument: '%s'. Try '%shelp list'."
msgstr "Argument de listă greşit: '%s'. Încercaţi '%shelp list'."
-#: server/stdinhand.c:4234
+#: server/stdinhand.c:4282
msgid "List of players:"
msgstr "Lista jucătorilor:"
-#: server/stdinhand.c:4239
+#: server/stdinhand.c:4287
msgid "<no players>"
msgstr "<nici un jucător>"
-#: server/stdinhand.c:4256
+#: server/stdinhand.c:4304
#, c-format
msgid "user %s, "
msgstr "jucător %s, "
-#: server/stdinhand.c:4267
+#: server/stdinhand.c:4315
msgid ", Dead"
msgstr ", Decedat"
-#: server/stdinhand.c:4270
+#: server/stdinhand.c:4318
#, 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:4275 server/stdinhand.c:4279 client/helpdata.c:257
-#: client/helpdata.c:752 client/text.c:241 client/text.c:1224
-#: client/text.c:1262
+#: server/stdinhand.c:4323 server/stdinhand.c:4327 client/helpdata.c:257
+#: client/helpdata.c:752 client/text.c:241 client/text.c:1229
+#: client/text.c:1267
#, c-format
msgid "?clistmore:, %s"
msgstr ", %s"
-#: server/stdinhand.c:4283
+#: server/stdinhand.c:4331
msgid ", ready"
msgstr ", pregătit"
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4333
msgid ", not ready"
msgstr ", nepregătit"
-#: server/stdinhand.c:4293
+#: server/stdinhand.c:4341
#, c-format
msgid " %d connection:"
msgid_plural " %d connections:"
msgstr[0] " %d conexiune:"
msgstr[1] " %d conexiuni:"
-#: server/stdinhand.c:4299
+#: server/stdinhand.c:4347
#, 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:4304
+#: server/stdinhand.c:4352
msgid " (observer mode)"
msgstr " (mod de observator)"
-#: server/stdinhand.c:4322
+#: server/stdinhand.c:4370
msgid "List of teams:"
msgstr "Lista echipelor:"
#. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4332
+#: server/stdinhand.c:4380
#, 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:4352
+#: server/stdinhand.c:4400
#, c-format
msgid "%2d : '%s' : 1 player : %s"
msgstr "%2d : '%s' : jucătorul 1: %s"
-#: server/stdinhand.c:4360
+#: server/stdinhand.c:4408
#, c-format
msgid "Empty team: %s"
msgstr "Echipă goală: %s"
-#: server/stdinhand.c:4371
+#: server/stdinhand.c:4419
msgid "List of connections to server:"
msgstr "Lista conexiunilor la server:"
-#: server/stdinhand.c:4375
+#: server/stdinhand.c:4423
msgid "<no connections>"
msgstr "<nici o conexiune>"
-#: server/stdinhand.c:4399
+#: server/stdinhand.c:4447
msgid "List of scenarios available:"
msgstr "Listă cu scenariile de joc disponibile:"
@@ -6755,7 +6836,7 @@ msgstr "%si au cercetat Teh. Avansată %d."
msgid "%s acquired from %s!"
msgstr "%s obţinută de la %s !"
-#: server/techtools.c:220
+#: server/techtools.c:221
#, c-format
msgid ""
"Discovery of %s makes the government form %s available. You may want to "
@@ -6764,39 +6845,39 @@ msgstr ""
"Descoperirea %s permite schimbarea formei de guvernământ în %s. Poate doriţi "
"să porniţi o revoluţie."
-#: server/techtools.c:301
+#: server/techtools.c:302
#, c-format
msgid "Discovery of %s OBSOLETES %s in %s!"
msgstr "Descoperirea %s ÎNVECHEŞTE %s în %s!"
-#: server/techtools.c:351
+#: server/techtools.c:352
#, c-format
msgid "Learned %s. Our scientists focus on %s; goal is %s."
msgstr ""
"Aţi învăţat %s. Oamenii de ştiinţă se concentrează pe %s, scopul fiind %s"
-#: server/techtools.c:369
+#: server/techtools.c:370
#, c-format
msgid "Learned %s. Scientists choose to research %s."
msgstr "Aţi învăţat %s. Oamenii de ştiinţă cercetează %s."
-#: server/techtools.c:376
+#: server/techtools.c:377
#, c-format
msgid "Learned %s. "
msgstr "Aţi învăţat %s."
-#: server/techtools.c:379
+#: server/techtools.c:380
#, c-format
msgid "Researching %s."
msgstr "Cercetând %s."
-#: server/techtools.c:385
+#: server/techtools.c:386
#, c-format
msgid "Learned %s. Scientists do not know what to research next."
msgstr ""
"Aţi învăţat %s. Oamenii de ştiinţă nu ştiu ce să cerceteze în continuare."
-#: server/techtools.c:402
+#: server/techtools.c:403
msgid ""
"Great scientists from all the world join your civilization: you get an "
"immediate advance."
@@ -6804,22 +6885,22 @@ msgstr ""
"Mari oameni de ştiinţă din toată lumea s-au alăturat civilizaţiei "
"dumneavoastră: aţi primit o nouă tehnologie."
-#: server/techtools.c:570
+#: server/techtools.c:571
#, c-format
msgid "Technology goal is %s."
msgstr "Scopul cercetărilor este %s."
-#: server/techtools.c:700
+#: server/techtools.c:708
#, c-format
msgid "You steal %s from the %s."
msgstr "AÅ£i furat %s de la %s."
-#: server/techtools.c:705
+#: server/techtools.c:713
#, c-format
msgid "The %s stole %s from you!"
msgstr "%si au furat %s de la dvs.!"
-#: server/techtools.c:710
+#: server/techtools.c:718
#, c-format
msgid "The %s have stolen %s from the %s."
msgstr "%si au furat %s de la %s."
@@ -6843,157 +6924,163 @@ msgstr "Nici o unitate n-a putut fi modernizată."
msgid "%s upgraded to %s for %d gold."
msgstr "%s modernizat în %s pentru %d galbeni."
-#: server/unithand.c:396
+#: server/unithand.c:402
#, c-format
msgid "%s refuses to disband!"
msgstr "%s a refuzat să fie dizolvată!"
-#: server/unithand.c:449
+#: server/unithand.c:455
msgid "Can't place city here."
msgstr "Nu poate fi construit un oraÅŸ aici."
-#: server/unithand.c:456
+#: server/unithand.c:462
#, c-format
msgid "Only %s can build a city."
msgstr "Doar %s poate construi un oraÅŸ."
-#: server/unithand.c:461
+#: server/unithand.c:467
msgid "Can't build a city."
msgstr "Nu pot construi un oraÅŸ."
-#: server/unithand.c:470
+#: server/unithand.c:476
#, c-format
msgid "Only %s can add to a city."
msgstr "Doar %s poate fi adăugat unui oraş."
-#: server/unithand.c:475
+#: server/unithand.c:481
msgid "Can't add to a city."
msgstr "Nu pot fi adăugată la un oraş."
-#: server/unithand.c:481
+#: server/unithand.c:487
#, c-format
msgid "%s unit has no moves left to add to %s."
msgstr ""
"Unitatea %s nu are unităţi de mişcare pe care le să le poată aduga oraşului %"
"s."
-#: server/unithand.c:487
+#: server/unithand.c:493
#, c-format
msgid "%s unit has no moves left to build city."
msgstr "Unitatea%s nu are unităţi de mişcare cu care să construiască un oraş."
-#: server/unithand.c:492
+#. TRANS: <city> is owned by <nation>, cannot add <unit>.
+#: server/unithand.c:499
+#, fuzzy, c-format
+msgid "%s is owned by %s, cannot add %s."
+msgstr "%s este prea mare pentru a adăuga %sul."
+
+#: server/unithand.c:506
#, c-format
msgid "%s is too big to add %s."
msgstr "%s este prea mare pentru a adăuga %sul."
-#: server/unithand.c:498
+#: server/unithand.c:512
#, c-format
msgid "%s needs an improvement to grow, so you cannot add %s."
msgstr ""
"%s are nevoie de o îmbunătăţire ca să crească, deci nu puteţi adăuga %s."
-#: server/unithand.c:509
+#: server/unithand.c:523
#, c-format
msgid "Can't add %s to %s."
msgstr "%s nu poate fi adăugat la %s."
-#: server/unithand.c:531
+#: server/unithand.c:545
#, c-format
msgid "%s added to aid %s in growing."
msgstr "%s a fost adăugat la oraşul %s pentru al ajuta la creştere."
-#: server/unithand.c:828
+#: server/unithand.c:842
msgid "Your Nuclear missile was shot down by SDI defences, what a waste."
msgstr "Bomba dvs. atomică a fost anihilată de apărarea SDI, ce risipă."
-#: server/unithand.c:831
+#: server/unithand.c:845
#, c-format
msgid "The nuclear attack on %s was avoided by your SDI defense."
msgstr "Atacul nuclear asupra %s a fost anihilat de apărarea dvs. SDI."
#. TRANS: "Your Cannon ... the Polish Destroyer."
-#: server/unithand.c:901
+#: server/unithand.c:915
#, fuzzy, c-format
msgid "Your %s survived the pathetic attack from the %s %s."
msgstr "Un %1$s al dvs a supravieţuit atacul patetic al unui %3$s a lui %2$s."
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unithand.c:910
+#: server/unithand.c:924
#, fuzzy, c-format
msgid "Your attacking %s failed against the %s %s!"
msgstr "Atacul unui %1$s al dvs împotriva unui %3$s a lui %2$s a eşuat!"
-#: server/unithand.c:983
+#: server/unithand.c:997
#, c-format
msgid "Only %s can attack from sea."
msgstr "Doar %s poate ataca de pe mare."
-#: server/unithand.c:988
+#: server/unithand.c:1002
msgid "Cannot attack from sea."
msgstr "Nu puteţi ataca de pe mare."
-#: server/unithand.c:996 server/unittools.c:2137
+#: server/unithand.c:1010 server/unittools.c:2142
msgid "Cannot attack unless you declare war first."
msgstr "Nu puteţi ataca înainte de a declara război."
-#: server/unithand.c:1001
+#: server/unithand.c:1015
#, c-format
msgid "%s can only move into your own zone of control."
msgstr "%s se poate mişca doar în zona dvs. de control."
-#: server/unithand.c:1007
+#: server/unithand.c:1021
#, fuzzy, c-format
msgid "Cannot invade unless you break peace with %s first."
msgstr "Nu puteţi ataca înainte de a declara război."
-#: server/unithand.c:1052
+#: server/unithand.c:1066
msgid "This unit has no moves left."
msgstr "Această unitate nu mai semai poate mişca runda aceasta."
-#: server/unithand.c:1107
+#: server/unithand.c:1121
msgid "Unit must be on land to perform diplomatic action."
msgstr "Unitatea trebuie să fie pe uscat pentru a executa acţiuni diplomatice."
-#: server/unithand.c:1109
+#: server/unithand.c:1123
msgid "No diplomat action possible."
msgstr "Nu este posibilă nici o acţiune diplomatica."
-#: server/unithand.c:1125
+#: server/unithand.c:1139
#, c-format
msgid "You must declare war on %s first. Try using players dialog (F3)."
msgstr ""
"Mai întâi trebuie să declareţi război %s. Încercaţi să folosiţi dialogul "
"Jucători (F3)."
-#: server/unithand.c:1143
+#: server/unithand.c:1157
msgid "This unit is being transported, and so cannot bombard."
msgstr "Această unitate este transportată, aşa că nu poate transporta."
-#: server/unithand.c:1158
+#: server/unithand.c:1172
msgid "You can't attack there."
msgstr "Nu puteţi ataca aici."
-#: server/unithand.c:1180
+#: server/unithand.c:1194
msgid "This type of troops cannot take over a city."
msgstr "Aceste unităţi nu pot cuceri un oraş."
-#: server/unithand.c:1198
+#: server/unithand.c:1212
msgid "A transported unit is not allied to all units or city on target tile."
msgstr ""
"O unitate transportată nu este aliată cu unităţile din zona destinaţie."
-#: server/unithand.c:1240
+#: server/unithand.c:1254
#, c-format
msgid "Your %s helps build the %s in %s (%d remaining)."
msgstr "%s dvs. ajută la construcţia %s în %s (%d rămase)."
-#: server/unithand.c:1242
+#: server/unithand.c:1256
#, c-format
msgid "Your %s helps build the %s in %s (%d surplus)."
msgstr "%s dumneavoastră ajută la construcţia %s în %s (%d surplus)."
-#: server/unithand.c:1286
+#: server/unithand.c:1300
#, c-format
msgid ""
"Sorry, your %s cannot establish a trade route because it has no home city"
@@ -7001,27 +7088,27 @@ msgstr ""
"%sul dvs nu poate stabili un schimb comercial deoarece nu are un oraÅŸ de "
"bază."
-#: server/unithand.c:1296
+#: server/unithand.c:1310
#, c-format
msgid "Sorry, your %s cannot establish a trade route between %s and %s"
msgstr "%s dvs nu poate stabili o rută comercială între %s şi %s"
-#: server/unithand.c:1325 server/unithand.c:1344
+#: server/unithand.c:1339 server/unithand.c:1358
#, c-format
msgid "Sorry, your %s cannot establish a trade route here!"
msgstr "%s dvs nu poate stabili un schimb comercial aici!"
-#: server/unithand.c:1329 server/unithand.c:1348
+#: server/unithand.c:1343 server/unithand.c:1362
#, c-format
msgid " The city of %s already has %d better trade routes!"
msgstr " OraÅŸul %s are deja %d rute comerciale mai bune!"
-#: server/unithand.c:1361 server/unithand.c:1373
+#: server/unithand.c:1375 server/unithand.c:1387
#, c-format
msgid "Sorry, %s has canceled the trade route from %s to your city %s."
msgstr "%s a anulat rutele comerciale dintre %s ÅŸi oraÅŸul dvs. %s"
-#: server/unithand.c:1406
+#: server/unithand.c:1420
#, c-format
msgid ""
"Your %s from %s has arrived in %s, and revenues amount to %d in gold and "
@@ -7082,57 +7169,57 @@ msgid "Teleported your %s to %s."
msgstr "Am Teleportat %s la %s."
#. TRANS: A unit is moved to resolve stack conflicts.
-#: server/unittools.c:1065
+#: server/unittools.c:1070
#, fuzzy, c-format
msgid "Moved your %s."
msgstr "%s a fost dizolvat."
-#: server/unittools.c:1076
+#: server/unittools.c:1081
#, c-format
msgid "Disbanded your %s."
msgstr "%s a fost dizolvat."
-#: server/unittools.c:1397
+#: server/unittools.c:1402
#, c-format
msgid "Unable to defend %s, %s has lost the game."
msgstr "Incăpabil să apere %s, %s a pierdut jocul."
-#: server/unittools.c:1401
+#: server/unittools.c:1406
#, c-format
msgid "Losing %s meant losing the game! Be more careful next time!"
msgstr ""
"Pierderea %s înseamnă pierdeerea jocului! Fiţi mai prdent data viitoare!"
-#: server/unittools.c:1503
+#: server/unittools.c:1508
#, c-format
msgid "%s escaped the destruction of %s, and fled to %s."
msgstr "%s a evitat distrugerea %s ÅŸi a fugit la %s."
-#: server/unittools.c:1512
+#: server/unittools.c:1517
#, c-format
msgid "%s lost when %s was lost."
msgstr "%s a fost pierdut după pierderea %s."
-#: server/unittools.c:1561
+#: server/unittools.c:1566
#, c-format
msgid "Barbarian leader captured, %d gold ransom paid."
msgstr ""
"Aţi capturat Şeful Barbarilor şi aţi primit %d galbeni ca răscumpărare."
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unittools.c:1579
+#: server/unittools.c:1584
#, fuzzy, c-format
msgid "Your attacking %s succeeded against the %s %s!"
msgstr "Atacul unui %1$s al dvs împotriva unui %3$s a lui %2$s a reuşit!"
#. TRANS: "Cannon ... the Polish Destroyer."
-#: server/unittools.c:1588 server/unittools.c:1646
+#: server/unittools.c:1593 server/unittools.c:1651
#, fuzzy, c-format
msgid "%s lost to an attack by the %s %s."
msgstr "%1$s pierdut într-un atac al unui %3$s a lui %2$s."
#. TRANS: "... Cannon ... the Polish Destroyer ...."
-#: server/unittools.c:1622
+#: server/unittools.c:1627
#, fuzzy, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -7146,14 +7233,14 @@ msgstr[1] ""
#. TRANS: "Cannon lost when the Polish Destroyer
#. * attacked the German Musketeers."
-#: server/unittools.c:1655
+#: server/unittools.c:1660
#, fuzzy, c-format
msgid "%s lost when the %s %s attacked the %s %s."
msgstr "%s pierdut când %s a atacat cu un %s o unitate a lui %s(%s)."
#. TRANS: "Musketeers (and Cannon) lost to an
#. * attack from the Polish Destroyer."
-#: server/unittools.c:1670
+#: server/unittools.c:1675
#, fuzzy, c-format
msgid "%s (and %s) lost to an attack from the %s %s."
msgstr "%s (şi %s) au fost pierdute în urma unui atac al lui %s cu un %s."
@@ -7161,7 +7248,7 @@ msgstr "%s (şi %s) au fost pierdute în urma unui atac al lui %s cu un %s."
#. TRANS: "Musketeers and 3 other units lost to
#. * an attack from the Polish Destroyer."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1680
+#: server/unittools.c:1685
#, fuzzy, 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."
@@ -7173,190 +7260,236 @@ msgstr[1] ""
#. TRANS: "2 units lost when the Polish Destroyer
#. * attacked the German Musketeers."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1694
+#: server/unittools.c:1699
#, fuzzy, 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 unitate pierdută când %s a atacat cu %s pe %s (%s)."
msgstr[1] "%d unităţi pierdute când %s a atacat cu %s pe %s (%s)."
-#: server/unittools.c:1962
+#: server/unittools.c:1967
#, c-format
msgid "Your %s was nuked by %s."
msgstr "%s dvs. a fost bombardata nuclear de către %s."
-#: server/unittools.c:1965 server/unittools.c:1981
+#: server/unittools.c:1970 server/unittools.c:1986
msgid "yourself"
msgstr "dumneavoastră"
-#: server/unittools.c:1969
+#: server/unittools.c:1974
#, fuzzy, c-format
msgid "The %s %s was nuked."
msgstr "%2$s a lui %1$s a fost bombardată nuclear."
-#: server/unittools.c:1978
+#: server/unittools.c:1983
#, c-format
msgid "%s was nuked by %s."
msgstr "%s a fost bombardată nuclear de %s."
-#: server/unittools.c:1986
+#: server/unittools.c:1991
#, c-format
msgid "You nuked %s."
msgstr "AÅ£i bombardat nuclear%s."
-#: server/unittools.c:2027
+#: server/unittools.c:2032
#, fuzzy, c-format
msgid "The %s detonated a nuke!"
msgstr "%si au explodat o bombă nucleară!"
-#: server/unittools.c:2051
+#: server/unittools.c:2056
#, c-format
msgid "%s transported successfully."
msgstr "%s a fost transportat cu succes."
-#: server/unittools.c:2103
+#: server/unittools.c:2108
msgid "This unit type can not be paradropped."
msgstr "Această unitate nu poate fi paraşutată."
-#: server/unittools.c:2113
+#: server/unittools.c:2118
#, fuzzy
msgid "You cannot paradrop a unit that is transporting other units."
msgstr "Nu se poate paraÅŸuta o unitate transportoare."
-#: server/unittools.c:2119
+#: server/unittools.c:2124
msgid "The destination location is not known."
msgstr "Locul destinaţiei nu este cunoscut."
-#: server/unittools.c:2126
+#: server/unittools.c:2131
#, c-format
msgid "This unit cannot paradrop into %s."
msgstr "Această unitate nu poate paraşuta în %s."
-#: server/unittools.c:2146
+#: server/unittools.c:2151
#, c-format
msgid "The distance to the target (%i) is greater than the unit's range (%i)."
msgstr ""
"Distanţa până la ţintă (%i) este mai mare decât raza de acţiune a unităţi (%"
"i)."
-#: server/unittools.c:2157
+#: server/unittools.c:2162
#, c-format
msgid "Your %s paradropped into the %s and was lost."
msgstr "%s dumneavoastră a paraşutat în %s şi a fost pierdut."
-#: server/unittools.c:2170
+#: server/unittools.c:2175
#, c-format
msgid "Your %s was killed by enemy units at the paradrop destination."
msgstr "%s dvs a fost ucis de trupe inamice la locul paraşutătri."
-#: server/unittools.c:2192
+#: server/unittools.c:2197
#, c-format
msgid "You found %d gold."
msgstr "Aţi găsit %d galbeni."
-#: server/unittools.c:2209
+#: server/unittools.c:2214
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr "Aţi găsit %s intr-o scriptură veche."
-#: server/unittools.c:2216
+#: server/unittools.c:2221
#, c-format
msgid "The %s have acquired %s from ancient scrolls of wisdom."
msgstr "%si au dobândit %s dintr-o scriptură veche."
-#: server/unittools.c:2230
+#: server/unittools.c:2235
msgid "A band of friendly mercenaries joins your cause."
msgstr "Un trup de mercenari vrea să lupte sub comanda dvs."
-#: server/unittools.c:2248
+#: server/unittools.c:2253
msgid "An abandoned village is here."
msgstr "Aici este o localitate abandonată."
-#: server/unittools.c:2258
+#: server/unittools.c:2263
msgid "You have unleashed a horde of barbarians!"
msgstr "Aţi dezlegat o hoardă de barbari!"
-#: server/unittools.c:2261
+#: server/unittools.c:2266
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr "%s dumneavoastră a fost ucis de barbari!"
-#: server/unittools.c:2277
+#: server/unittools.c:2282
msgid "You found a friendly city."
msgstr "Aţi găsit un oraş prietenos."
-#: server/unittools.c:2291
+#: server/unittools.c:2296
msgid "Friendly nomads are impressed by you, and join you."
msgstr "Un grup de nomazi vi se alătură."
-#: server/unittools.c:2316
+#: server/unittools.c:2321
msgid "Your overflight frightens the tribe; they scatter in terror."
msgstr ""
"Zborul dvs deasupra tribului i-a speriat pe locuitori, care în panică au "
"fugit în toate direcţile."
-#: server/unittools.c:2574
+#: server/unittools.c:2579
#, c-format
msgid "Orders for %s aborted after enemy movement was spotted."
msgstr ""
"Ordinele pentru %s au fost abandonate după ce s-a observat mişcarea "
"inamicului."
-#: server/unittools.c:3023
+#: server/unittools.c:3028
#, c-format
msgid "Orders for %s aborted as there are units nearby."
msgstr ""
"Ordinele pentru %s au fost abandonate deoarece sunt unităţi în apropiere."
-#: server/unittools.c:3075
+#: server/unittools.c:3080
#, c-format
msgid "Orders for %s aborted because building of city failed."
msgstr ""
"Ordinele pentru %s au fost abandonate deoarece construirea oraÅŸului a eÅŸuat."
-#: server/unittools.c:3088
+#: server/unittools.c:3093
#, c-format
msgid "Orders for %s aborted since they give an invalid activity."
msgstr ""
"Oridinele pentru %s au fost abandonate deoarece dau o activitate invalidă."
-#: server/unittools.c:3102
+#: server/unittools.c:3107
#, c-format
msgid "Orders for %s aborted since they give an invalid location."
msgstr ""
"Ordinele pentru %s au fost abandonate deoarece specifică o locaţie invalidă."
-#: server/unittools.c:3112
+#: server/unittools.c:3117
#, c-format
msgid "Orders for %s aborted as there are units in the way."
msgstr ""
"Ordinele pentru %s au fost abandonate deoarece sunt unităţi în drumul său."
-#: server/unittools.c:3138
+#: server/unittools.c:3143
#, c-format
msgid "Orders for %s aborted because of failed move."
msgstr "Ordinele pentru %s au fost abandonate datorită unei mişcări nereuşite."
-#: server/unittools.c:3179
+#: server/unittools.c:3184
#, c-format
msgid "Attempt to change homecity for %s failed."
msgstr "ÃŽncercarea de a schimba oraÅŸul natal pentru %s a eÅŸuat."
-#: server/unittools.c:3190
+#: server/unittools.c:3195
#, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr "Încercarea de a realiza o rută comercială pentru %s a eşuat."
-#: server/unittools.c:3202
+#: server/unittools.c:3207
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr "ÃŽncercarea de a construi o minune pentru %s a eÅŸuat."
-#: server/unittools.c:3211
+#: server/unittools.c:3216
#, c-format
msgid "Your %s has invalid orders."
msgstr "%s dvs a primit ordine invalide."
+#: server/voting.c:522
+#, fuzzy, c-format
+msgid ""
+"%s %d \"%s\" is passed %d to %d with %d abstentions and %d who did not vote."
+msgstr ""
+"Votarea \"%s\" a fost aprobată %d voturi pentru şi %d împotrivă cu %d "
+"abţineri."
+
+#: server/voting.c:528
+#, fuzzy, c-format
+msgid ""
+"%s %d \"%s\" failed with %d against, %d for, %d abstentions and %d who did "
+"not vote."
+msgstr ""
+"Votarea \"%s\" a fost respinsă cu %d voturi împotrivă, %d pentru şi %d "
+"abţineri."
+
+#: server/voting.c:548
+#, c-format
+msgid "%s %d: %s voted yes."
+msgstr ""
+
+#: server/voting.c:553
+#, c-format
+msgid "%s %d: %s voted no."
+msgstr ""
+
+#: server/voting.c:558
+#, c-format
+msgid "%s %d: %s chose to abstain."
+msgstr ""
+
+#. TRANS: Describing a new vote that can only pass
+#. * if there are no dissenting votes.
+#: server/voting.c:726
+#, c-format
+msgid "%s (needs %0.0f%% and no dissent)."
+msgstr ""
+
+#. TRANS: Describing a new vote that can pass only if the
+#. * given percentage of players votes 'yes'.
+#: server/voting.c:732
+#, c-format
+msgid "%s (needs %0.0f%% in favor)."
+msgstr ""
+
#: server/generator/mapgen.c:1771
msgid "High landmass - this may take a few seconds."
msgstr "Suprafaţă mare - posibil să dureze câteva secunde."
@@ -7388,14 +7521,14 @@ msgstr ""
"Se poate ca numărul de jucători să fie prea mare pentru harta aceasta.\n"
"Vă rugăm raportaţi această defecţiune la %s."
-#: client/attribute.c:363
+#: client/attribute.c:368
msgid ""
"There has been a CMA error. Your citizen governor settings may be broken."
msgstr ""
"S-a dectectat o eroare CMA. Este posibil ca setările pentru guvernatorul "
"cetăţenilor să nu fie potrivite."
-#: client/attribute.c:367
+#: client/attribute.c:372
msgid "Old attributes detected and removed."
msgstr "S-au detectat atribute vechi şi au fost îndepărtate."
@@ -7542,41 +7675,41 @@ msgstr "%+4d : Cetăţeni\n"
msgid "%+4d : Taxed from trade\n"
msgstr "%+4d : Taxe din comerţ\n"
-#: client/citydlg_common.c:418
+#: client/citydlg_common.c:421
#, c-format
msgid "%+4d : Trade route with %s\n"
msgstr "%+4d : Rută comercială cu %s\n"
-#: client/citydlg_common.c:427
+#: client/citydlg_common.c:430
#, c-format
msgid "%+4d : Building tithes\n"
msgstr "%+4d : Impozit pe clădire\n"
-#: client/citydlg_common.c:450
+#: client/citydlg_common.c:453
#, c-format
msgid "%+4d : Bonus from %s (%+d%%)\n"
msgstr "%+4d : Bonus de la %s (%+d%%)\n"
-#: client/citydlg_common.c:462
+#: client/citydlg_common.c:465
#, c-format
msgid "%+4d : Waste\n"
msgstr "%+4d : DeÅŸeuri\n"
-#: client/citydlg_common.c:468
+#: client/citydlg_common.c:471
#, c-format
msgid "%+4d : Disorder\n"
msgstr "%+4d : Dezordine\n"
-#: client/citydlg_common.c:474
+#: client/citydlg_common.c:477
#, c-format
msgid "%+4d : Used\n"
msgstr "%+4d : Folosiţi\n"
-#: client/citydlg_common.c:479
+#: client/citydlg_common.c:482
msgid "==== : Adds up to\n"
msgstr "==== : Se adaugă până la \n"
-#: client/citydlg_common.c:481
+#: client/citydlg_common.c:484
#, c-format
msgid "%4d : Total surplus"
msgstr "%4d : Surplus total"
@@ -7912,56 +8045,56 @@ msgstr "?Speciale:S"
msgid "Specialists"
msgstr "Speciale"
-#: client/civclient.c:240
+#: client/civclient.c:241
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr " -a, --autoconnect\tSări peste dialogul de conectare\n"
-#: client/civclient.c:250
+#: client/civclient.c:251
msgid " -l, --log FILE\tUse FILE as logfile (spawned server also uses this)\n"
msgstr ""
" -l, --log FIÅžIER\tFoloseÅŸte FIÅžIER ca fiÅŸier pentru jurnal (ÅŸi serverele "
"create folosesc acest fiÅŸier)\n"
-#: client/civclient.c:252
+#: client/civclient.c:253
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr " -m, --meta GAZDĂ\tConectează-te la metaserverul de la GAZDĂ\n"
-#: client/civclient.c:254
+#: client/civclient.c:255
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr " -n, --name NUME\tFoloseÅŸte NUME ca nume\n"
-#: client/civclient.c:256
+#: client/civclient.c:257
#, fuzzy
msgid " -p, --port PORT\tConnect to server port PORT (usually with -a)\n"
msgstr " -p, --port PORT\tConectează-te la server la portul PORT\n"
-#: client/civclient.c:258
+#: client/civclient.c:259
#, c-format
msgid " -P, --Plugin PLUGIN\tUse PLUGIN for sound output %s\n"
msgstr " -P, --Plugin MODUL:\tFoloseÅŸte MODUL pentru sunet %s\n"
-#: client/civclient.c:260
+#: client/civclient.c:261
msgid " -r, --read FILE\tRead startup script FILE (for spawned server only)\n"
msgstr ""
" -r, --read FIÅžIER\tCiteÅŸte sciptul de pornire FIÅžIER (doar pentru "
"serverele create)\n"
-#: client/civclient.c:263
+#: client/civclient.c:264
#, fuzzy
msgid " -s, --server HOST\tConnect to the server at HOST (usually with -a)\n"
msgstr " -s, --server GAZDĂ\tConectează-te la serverul de la GAZDĂ\n"
-#: client/civclient.c:265
+#: client/civclient.c:266
msgid " -S, --Sound FILE\tRead sound tags from FILE\n"
msgstr " -S, --Sound FIÅžIER\tCiteÅŸte etichetele de sunet din FIÅžIER\n"
-#: client/civclient.c:266
+#: client/civclient.c:267
msgid " -t, --tiles FILE\tUse data file FILE.tilespec for tiles\n"
msgstr ""
" -t, --tiles FIÅžIER\tFoloseÅŸte fiÅŸierul FIÅžIER.tilespec pentru formele "
"geometrice\n"
-#: client/civclient.c:269
+#: client/civclient.c:270
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7971,45 +8104,45 @@ msgstr ""
"\t\t\tTry \"%s -- --help\" pentru mai multe detalii.\n"
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:274
+#: client/civclient.c:275
#, fuzzy, c-format
msgid "Report bugs at %s\n"
msgstr "Raportează erorile la <%s>.\n"
-#: client/civclient.c:298
+#: client/civclient.c:299
#, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr "Port invalid \"%s\" specificat cu opţiunea --port.\n"
-#: client/civclient.c:300 client/civclient.c:315
+#: client/civclient.c:301 client/civclient.c:316
msgid "Try using --help.\n"
msgstr "Încercaţi să folosiţi --help.\n"
-#: client/civclient.c:313
+#: client/civclient.c:314
#, c-format
msgid "Invalid debug level \"%s\" specified with --debug option.\n"
msgstr "Nivel de depanare invalid \"%s\" specificat cu opţiunea --debug.\n"
-#: client/civclient.c:326
+#: client/civclient.c:327
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr "Opţiune nerecunoscută: \"%s\"\n"
-#: client/civclient.c:391
+#: client/civclient.c:393
#, fuzzy, c-format
msgid "Updating old metaserver address \"%s\"."
msgstr "metaserver <adresa>"
-#: client/civclient.c:394
+#: client/civclient.c:396
#, fuzzy, c-format
msgid "Default metaserver has been set to \"%s\"."
msgstr "Opţiunea: %s a fost setată la \"%s\"."
-#: client/civclient.c:550
+#: client/civclient.c:540
msgid "Game started."
msgstr "Jocul a pornit."
-#: client/civclient.c:588
+#: client/civclient.c:606
msgid "There was an error while auto connecting; aborting."
msgstr "S-a produs o eroare în timp ce se auto-conecta, se abandonează."
@@ -8139,18 +8272,18 @@ msgstr "(conexiune în progres)"
msgid "Disconnected from server."
msgstr "Deconectat de la server."
-#: client/clinet.c:469
+#: client/clinet.c:473
#, c-format
msgid "Failed to contact server \"%s\" at port %d as \"%s\" after %d attempts"
msgstr ""
"Nu s-a putut contacta serverul \"%s\" la portul %d ca \"%s\" după %d "
"încercări"
-#: client/clinet.c:484 client/clinet.c:486
+#: client/clinet.c:488 client/clinet.c:490
msgid "Connection to server refused. Please start the server."
msgstr "Conexiunea la server a fost refuzată. Porniţi serverul."
-#: client/clinet.c:495 client/clinet.c:523
+#: client/clinet.c:499 client/clinet.c:527
#, c-format
msgid ""
"Error contacting server \"%s\" at port %d as \"%s\":\n"
@@ -8159,7 +8292,7 @@ msgstr ""
"Eroare la contactarea serverului \"%s\" la portul %d ca \"%s\":\n"
" %s\n"
-#: client/clinet.c:514
+#: client/clinet.c:518
#, c-format
msgid ""
"Auto-connecting to server \"%s\" at port %d as \"%s\" every %f second(s) for "
@@ -8168,53 +8301,53 @@ 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:1358
+#: client/connectdlg_common.c:78 client/gui-gtk-2.0/pages.c:1358
msgid "novice"
msgstr "novice"
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1358
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
msgid "easy"
msgstr "uÅŸor"
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1359
msgid "normal"
msgstr "normal"
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr "greu"
-#: client/connectdlg_common.c:83
+#: client/connectdlg_common.c:82
msgid "experimental"
msgstr "experimental"
-#: client/connectdlg_common.c:213
+#: client/connectdlg_common.c:212
msgid "Starting server..."
msgstr "Se porneÅŸte serverul..."
-#: client/connectdlg_common.c:332
+#: client/connectdlg_common.c:331
msgid "Couldn't start the server."
msgstr "Nu s-a putut porni serverul."
-#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
+#: client/connectdlg_common.c:332 client/connectdlg_common.c:365
msgid "You'll have to start one manually. Sorry..."
msgstr "Va trebui să porniţi unul manual."
-#: client/connectdlg_common.c:364
+#: client/connectdlg_common.c:363
msgid "Couldn't connect to the server."
msgstr "Nu s-a putut face conexiunea la server."
-#: client/connectdlg_common.c:365
+#: client/connectdlg_common.c:364
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:470
+#: client/connectdlg_common.c:469
#, fuzzy
msgid ""
"Established control over the server. You have command access level 'hack'."
msgstr "Am preluat controlul serverului (cu nivelul hack de acces la comandă)"
-#: client/connectdlg_common.c:475
+#: client/connectdlg_common.c:474
msgid ""
"Failed to obtain the required access level to take control of the server. "
"The server will now be shutdown."
@@ -8224,27 +8357,27 @@ msgstr ""
msgid "Only transporter units can be unloaded."
msgstr "Doar unităţile transportatoare pot fi descărcate."
-#: client/control.c:1425
+#: client/control.c:1417
msgid "Only settler units can be put into auto mode."
msgstr "Doar coloniştii pot fi puşi în modul autonom."
-#: client/control.c:1516
+#: client/control.c:1511
msgid "Only nuclear units can do this."
msgstr "Doar unităţile nucleare pot face aşa ceva."
-#: client/control.c:1545
+#: client/control.c:1540
msgid "Only paratrooper units can do this."
msgstr "Doar paraÅŸutiÅŸti pot face aÅŸa ceva."
-#: client/control.c:2020
+#: client/control.c:2015
msgid "Too far for this unit."
msgstr "Prea departe pentru această unitate."
-#: client/control.c:2230 client/control.c:2260 client/control.c:2276
+#: client/control.c:2225 client/control.c:2255 client/control.c:2271
msgid "Didn't find a route to the destination!"
msgstr "N-am găsit o rută spre destinaţie!"
-#: client/control.c:2320
+#: client/control.c:2315
msgid "Oh my! You seem to have no capital!"
msgstr "Uliu maică! Se pare că nu aveţi o capitală!"
@@ -8669,29 +8802,38 @@ 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:1066 client/helpdata.c:1400
+#: client/helpdata.c:1066 client/helpdata.c:1408
msgid " or "
msgstr " sau "
-#: client/helpdata.c:1068 client/helpdata.c:1388
+#: client/helpdata.c:1068 client/helpdata.c:1396
msgid "?or:, "
msgstr "?or:, "
-#: client/helpdata.c:1080
-#, 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"
+#: client/helpdata.c:1079
+#, fuzzy, c-format
+msgid "* Unit has to be in a city, or a base after %d turn.\n"
+msgid_plural "* Unit has to be in a city, or a base after %d turns.\n"
msgstr[0] ""
"* Unitatea trebuie să fie într-un oraş sau pe un %s după %d rundă.\n"
msgstr[1] ""
"* Unitatea trebuie să fie într-un oraş sau pe un %s după %d runde.\n"
-#: client/helpdata.c:1122
+#: client/helpdata.c:1087
+#, fuzzy, c-format
+msgid "* Unit has to be in a city, a base, or on a %s after %d turn.\n"
+msgid_plural "* Unit has to be in a city, a base, or on a %s after %d turns.\n"
+msgstr[0] ""
+"* Unitatea trebuie să fie într-un oraş sau pe un %s după %d rundă.\n"
+msgstr[1] ""
+"* Unitatea trebuie să fie într-un oraş sau pe un %s după %d runde.\n"
+
+#: client/helpdata.c:1130
#, 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:1127
+#: client/helpdata.c:1135
#, c-format
msgid ""
"To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8700,92 +8842,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:1135
+#: client/helpdata.c:1143
msgid "You cannot research this technology."
msgstr "Nu puteţi cerceta această tehnologie."
-#: client/helpdata.c:1139
+#: client/helpdata.c:1147
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:1151
+#: client/helpdata.c:1159
#, 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:1156
+#: client/helpdata.c:1164
#, 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:1159
+#: client/helpdata.c:1167
#, 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:1163
+#: client/helpdata.c:1171
msgid "* Increases the pollution generated by the population.\n"
msgstr "* Creşte poluarea generată de populaţie.\n"
-#: client/helpdata.c:1168
+#: client/helpdata.c:1176
#, 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:1175
+#: client/helpdata.c:1183
#, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr "* Permite %silor construcţia de fortăreţe.\n"
-#: client/helpdata.c:1183
+#: client/helpdata.c:1191
#, c-format
msgid "* Allows %s to build airbases.\n"
msgstr "* Permite %silor să construiască baze aeriene.\n"
-#: client/helpdata.c:1192
+#: client/helpdata.c:1200
#, 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:1200
+#: client/helpdata.c:1208
#, 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:1234
+#: client/helpdata.c:1242
msgid "* Pollution cannot be generated on this terrain."
msgstr "* Acest teren nu poate produce poluare."
-#: client/helpdata.c:1239
+#: client/helpdata.c:1247
msgid "* You cannot build cities on this terrain."
msgstr "* Nu puteţi construi oraşe pe acest teren."
-#: client/helpdata.c:1245
+#: client/helpdata.c:1253
msgid "* The coastline of this terrain is unsafe."
msgstr "* Linia de coastă a acestui teren nu este sigură."
-#: client/helpdata.c:1250
+#: client/helpdata.c:1258
msgid "* This terrain is unsafe for units to travel on."
msgstr "* Terenul este nesigur pentru unităţi."
-#: client/helpdata.c:1255
+#: client/helpdata.c:1263
msgid "* Land units cannot travel on oceanic terrains."
msgstr "* Unităţile terestre nu pot merge pe ocean."
-#: client/helpdata.c:1305
+#: client/helpdata.c:1313
msgid "Features:\n"
msgstr "Caracteristici:\n"
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1411 client/helpdata.c:1412
+#: client/helpdata.c:1419 client/helpdata.c:1420
msgid "?outputlist: Nothing "
msgstr ""
-#: client/helpdata.c:1419
+#: client/helpdata.c:1427
#, fuzzy, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -8800,7 +8942,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:1429
+#: client/helpdata.c:1437
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8810,23 +8952,23 @@ msgstr ""
"unităţilor.\n"
#. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1437
+#: client/helpdata.c:1445
#, 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:1442
+#: client/helpdata.c:1450
#, 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:1447
+#: client/helpdata.c:1455
#, 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:1451
+#: client/helpdata.c:1459
#, 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"
@@ -8834,7 +8976,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:1460
+#: client/helpdata.c:1468
#, c-format
msgid "* Each of your cities will avoid paying %d %s towards unit upkeep.\n"
msgstr ""
@@ -8842,19 +8984,19 @@ msgstr ""
#. TRANS: Amount is subtracted from upkeep cost
#. * for each upkeep type.
-#: client/helpdata.c:1468
+#: client/helpdata.c:1476
#, 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:1475
+#: client/helpdata.c:1483
#, 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:1482
+#: client/helpdata.c:1490
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -8864,7 +9006,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:1489
+#: client/helpdata.c:1497
#, c-format
msgid ""
"* After the first unhappy citizen due to city size, for each %d additional "
@@ -8873,18 +9015,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:1497
+#: client/helpdata.c:1505
#, 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:1502
+#: client/helpdata.c:1510
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr "Rate nelimitate pentru ştiinţă/galbeni/lux.\n"
-#: client/helpdata.c:1507
+#: client/helpdata.c:1515
#, fuzzy, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -8899,7 +9041,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:1519
+#: client/helpdata.c:1527
#, 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"
@@ -8907,7 +9049,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:1530
+#: client/helpdata.c:1538
#, c-format
msgid ""
"* You may grow your cities by means of celebrations. Your cities must be at "
@@ -8916,15 +9058,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:1536
+#: client/helpdata.c:1544
msgid "* Your units cannot be bribed.\n"
msgstr "* Unităţile dumneavoastră nu pot fi mituite.\n"
-#: client/helpdata.c:1539
+#: client/helpdata.c:1547
msgid "* Your cities cannot be incited.\n"
msgstr "* Oraşele dumneavoastră nu pot fi incitate la revoltă.\n"
-#: client/helpdata.c:1543
+#: client/helpdata.c:1551
msgid ""
"* Government will fall into anarchy if any city is in disorder for more than "
"two turns in a row.\n"
@@ -8932,17 +9074,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:1549
+#: client/helpdata.c:1557
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:1553
+#: client/helpdata.c:1561
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:1557
+#: client/helpdata.c:1565
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
@@ -8950,25 +9092,25 @@ msgstr ""
"* Construcţiile care în mod normal ofereau bonusuri pentru fericire vor "
"oferi în schimb galbeni.\n"
-#: client/helpdata.c:1561
+#: client/helpdata.c:1569
msgid "* Pays no upkeep for fanatics.\n"
msgstr "* Nu se plăteşte întreţinere pentru fanatici.\n"
-#: client/helpdata.c:1564
+#: client/helpdata.c:1572
msgid "* Has no unhappy citizens.\n"
msgstr "* Nu are cetăţeni nefericiţi.\n"
-#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
+#: client/helpdata.c:1582 client/helpdata.c:1586 client/helpdata.c:1590
#, c-format
msgid "* Veteran %s units.\n"
msgstr "* Unităţi %s veterane.\n"
-#: client/helpdata.c:1585
+#: client/helpdata.c:1593
msgid "* Veteran units.\n"
msgstr "* Unităţi veterane.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1591
+#: client/helpdata.c:1599
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8978,7 +9120,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:1600
+#: client/helpdata.c:1608
#, fuzzy, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8988,7 +9130,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:1608
+#: client/helpdata.c:1616
#, fuzzy, c-format
msgid "* Each worked tile with at least 1 %s will yield %d more of it.\n"
msgstr ""
@@ -8996,66 +9138,66 @@ msgstr ""
"în plus %d %s.\n"
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1617
+#: client/helpdata.c:1625
#, 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:1625
+#: client/helpdata.c:1633
#, 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:1630
+#: client/helpdata.c:1638
#, 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:1635
+#: client/helpdata.c:1643
#, 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:1643
+#: client/helpdata.c:1651
#, 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:1649
+#: client/helpdata.c:1657
#, 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:1655
+#: client/helpdata.c:1663
#, 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:1672
+#: client/helpdata.c:1680
#, c-format
msgid "* Allows you to build %s.\n"
msgstr "* Permite contruirea %s.\n"
#. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1699
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d %s"
msgstr "%s%d %s "
-#: client/helpdata.c:1700 client/helpdata.c:1708 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1708 client/helpdata.c:1716 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:1707
+#: client/helpdata.c:1715
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d nemulţumiţi"
@@ -9132,7 +9274,7 @@ msgstr ""
"Acesta este portul impicit pentru server care va fi folosit în toate "
"dialogurile conexiunii sau cu parametrul '-a' pentru lina de comandă."
-#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:916 data/Freeciv.in:107
msgid "Metaserver"
msgstr "Metaserver"
@@ -9544,36 +9686,36 @@ msgstr "Salvarea a eşuat, nu pot scrie în fişierul %s"
msgid "Saved settings to file %s"
msgstr "S-au salvat setările în fişierul %s"
-#: client/packhand.c:211 client/packhand.c:217
+#: client/packhand.c:212 client/packhand.c:218
#, fuzzy
msgid "You were rejected from the game...."
msgstr "AÅ£i fost refuzat de la joc:"
-#: client/packhand.c:229
+#: client/packhand.c:230
#, c-format
msgid "Client capability string: %s"
msgstr "Şirul de capabilităţi al clientului: %s"
-#: client/packhand.c:232
+#: client/packhand.c:233
#, c-format
msgid "Server capability string: %s"
msgstr "Şirul de capabilităţi al serverului: %s"
-#: client/packhand.c:850
+#: client/packhand.c:864
#, c-format
msgid "Start of turn %d"
msgstr "ÃŽnceputul rundei %d"
-#: client/packhand.c:1591
+#: client/packhand.c:1621
#, c-format
msgid "AI Mode is now %s."
msgstr "Modul AI este acum %s."
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "ON"
msgstr "Activat"
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "OFF"
msgstr "Dezactivat"
@@ -9604,15 +9746,15 @@ msgstr "?Player:Nume"
msgid "Username"
msgstr "Nume utilizator"
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
-#: client/gui-gtk-2.0/pages.c:2157
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:653
+#: client/gui-gtk-2.0/pages.c:1604 client/gui-gtk-2.0/pages.c:2159
msgid "Flag"
msgstr "Drapel"
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1605
-#: client/gui-gtk-2.0/pages.c:2159 client/gui-sdl/repodlgs.c:2063
-#: client/gui-win32/connectdlg.c:990 client/gui-win32/dialogs.c:542
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:657
+#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1609
+#: client/gui-gtk-2.0/pages.c:2161 client/gui-sdl/repodlgs.c:2063
+#: client/gui-win32/connectdlg.c:992 client/gui-win32/dialogs.c:542
#: client/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "Naţiune"
@@ -9625,7 +9767,7 @@ msgstr "graniţă"
msgid "Score"
msgstr "Scor"
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1614
msgid "Team"
msgstr "Echipa"
@@ -9658,36 +9800,36 @@ msgstr "?Player_dlg:Inactiv"
msgid "Ping"
msgstr "Ping"
-#: client/repodlgs_common.c:375
+#: client/repodlgs_common.c:378
msgid "You cannot sell improvements."
msgstr "Nu puteţi vinde îmbunătăţirile."
-#: client/repodlgs_common.c:391
+#: client/repodlgs_common.c:394
#, c-format
msgid "Sold %d %s for %d gold."
msgstr "Aţi vândut %d %s pentru %d galbeni."
-#: client/repodlgs_common.c:396
+#: client/repodlgs_common.c:399
#, 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:415
+#: client/repodlgs_common.c:418
msgid "You cannot disband units."
msgstr "Nu puteţi dizolva unităţi."
-#: client/repodlgs_common.c:420
+#: client/repodlgs_common.c:423
#, c-format
msgid "%s cannot be disbanded."
msgstr "%s nu poate fi dizolvat."
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:444
#, c-format
msgid "Disbanded %d %s."
msgstr "AÅ£i dizolvat %d %s."
-#: client/repodlgs_common.c:445
+#: client/repodlgs_common.c:448
#, c-format
msgid "No %s could be disbanded."
msgstr "Nici un %s n-a putut fi dizolvat."
@@ -10279,47 +10421,47 @@ msgstr "?dys/hrs:%02dz %02dh"
msgid "?duration:overflow"
msgstr "?durată:depăşire"
-#: client/text.c:1143
+#: client/text.c:1145
#, c-format
msgid "%6d.%02d ms"
msgstr "%6d.%02d ms"
#. TRANS: <nation adjective> <government name>.
#. * E.g. "Polish Republic".
-#: client/text.c:1188
+#: client/text.c:1193
#, fuzzy, c-format
msgid "?nationgovernment:%s %s"
msgstr "Guvern: %s"
#. TRANS: "Observer: 1985"
-#: client/text.c:1198
+#: client/text.c:1203
#, c-format
msgid "Observer: %s"
msgstr "Observator: %s"
-#: client/text.c:1216
+#: client/text.c:1221
msgid "Buildings: "
msgstr "Edificii: "
-#: client/text.c:1233 client/text.c:1272
+#: client/text.c:1238 client/text.c:1277
msgid "None. "
msgstr "Nimic. "
-#: client/text.c:1235 client/text.c:1274
+#: client/text.c:1240 client/text.c:1279
msgid "?clistend:."
msgstr ". "
-#: client/text.c:1253
+#: client/text.c:1258
msgid "Wonders: "
msgstr "Minuni: "
-#: client/text.c:1308
+#: client/text.c:1313
#, 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:1312
+#: client/text.c:1317
#, fuzzy, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
@@ -10327,58 +10469,58 @@ 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:1318
+#: client/text.c:1323
#, fuzzy, c-format
msgid "%d additional unhappy citizen."
msgid_plural "%d additional unhappy citizens."
msgstr[0] "%d cetăţieni nemulţumiţi în plus."
msgstr[1] "%d cetăţieni nemulţumiţi în plus."
-#: client/text.c:1339
+#: client/text.c:1344
#, fuzzy
msgid "Unlimited martial law in effect."
msgstr "Legea marţială în efect ("
-#: client/text.c:1341
+#: client/text.c:1346
#, fuzzy, c-format
msgid "%d military unit may impose martial law."
msgid_plural "Up to %d military units may impose martial law."
msgstr[0] "* O unitate civilă (nu poate ataca; nu impune legea marţială).\n"
msgstr[1] "* O unitate civilă (nu poate ataca; nu impune legea marţială).\n"
-#: client/text.c:1345
+#: client/text.c:1350
#, fuzzy, c-format
msgid "Each military unit makes %d unhappy citizen content."
msgid_plural "Each military unit makes %d unhappy citizens content."
msgstr[0] "Distrează cetăţenii unui oraş mulţumind 3 cetăţeni nemulţumiţi."
msgstr[1] "Distrează cetăţenii unui oraş mulţumind 3 cetăţeni nemulţumiţi."
-#: client/text.c:1352
+#: client/text.c:1357
msgid "Military units in the field may cause unhappiness. "
msgstr "Unităţi militate în afara oraşului pot produce nefericire. "
-#: client/text.c:1355
+#: client/text.c:1360
msgid "Military units have no happiness effect. "
msgstr "Unităţi militare n-au efect asupra fericirii. "
-#: client/text.c:1370
+#: client/text.c:1375
#, c-format
msgid "Luxury: %d total."
msgstr "Lux: %d total."
-#: client/tilespec.c:865
+#: client/tilespec.c:882
msgid "No usable default tileset found, aborting!"
msgstr ""
"Nu s-a găsit nici un set implicit de forme folosibil, se anulează comanda!"
-#: client/tilespec.c:1338
+#: client/tilespec.c:1355
msgid ""
"Client does not support isometric tilesets. Using default tileset instead."
msgstr ""
"Clientul nu suportă setul de forme izometrice. Se foloseşte în schimb setul "
"de forme implicit."
-#: client/tilespec.c:1347
+#: client/tilespec.c:1364
msgid ""
"Client does not support overhead view tilesets. Using default tileset "
"instead."
@@ -10386,7 +10528,7 @@ msgstr ""
"Clientul nu suportă seturi de forme cu vedere de deasupra. Sefoloseşte în "
"schimb setul de forme implicit."
-#: client/tilespec.c:3966
+#: client/tilespec.c:3987
#, fuzzy, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -11077,7 +11219,7 @@ msgid "_Display"
msgstr "Ar_ată"
#: client/gui-gtk-2.0/cityrep.c:1006 client/gui-gtk-2.0/menu.c:839
-#: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
+#: client/gui-sdl/diplodlg.c:692 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
#: client/gui-xaw/cityrep.c:533 client/gui-xaw/menu.c:156
@@ -11250,198 +11392,198 @@ msgstr "Care să fie numele setării?"
msgid "Remove this preset?"
msgstr "Îndepărtaţi această presetare?"
-#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:222
+#: client/gui-gtk-2.0/dialogs.c:197 client/gui-gtk-2.0/messagewin.c:222
#, fuzzy
msgid "Goto _Location"
msgstr "Mergi la _locul"
-#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
+#: client/gui-gtk-2.0/dialogs.c:202 client/gui-gtk-2.0/messagewin.c:226
#, fuzzy
msgid "Inspect _City"
msgstr "Afişează oraşul"
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:258 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:258 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:259 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:311 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:312 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:312 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:313 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:506
+#: client/gui-gtk-2.0/dialogs.c:507
msgid "Unit"
msgstr "Unitate"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:950
-#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2155
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:985
+#: client/gui-gtk-2.0/dialogs.c:508 client/gui-gtk-2.0/pages.c:950
+#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2157
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:987
#: 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:519 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:520 client/gui-sdl/dialogs.c:627
msgid "Unit selection"
msgstr "Selectarea unităţi"
-#: client/gui-gtk-2.0/dialogs.c:582
+#: client/gui-gtk-2.0/dialogs.c:583
msgid "_Ready all"
msgstr "_Activează tot"
-#: client/gui-gtk-2.0/dialogs.c:590
+#: client/gui-gtk-2.0/dialogs.c:591
msgid "_Sentry idle"
msgstr "_Ţine poziţia"
-#: client/gui-gtk-2.0/dialogs.c:719
+#: client/gui-gtk-2.0/dialogs.c:721
#, fuzzy
msgid "Nation _Groups:"
msgstr "_Naţiuni:"
-#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:766 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:766 client/gui-sdl/chatline.c:842
-#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
+#: client/gui-gtk-2.0/dialogs.c:768 client/gui-sdl/chatline.c:842
+#: client/gui-win32/connectdlg.c:1040 data/Freeciv.in:3371
msgid "Pick Nation"
msgstr "Alegeţi naţiunea"
-#: client/gui-gtk-2.0/dialogs.c:774
+#: client/gui-gtk-2.0/dialogs.c:776
#, fuzzy
msgid "_Random Nation"
msgstr "Naţiune aleatoare"
-#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:792 client/gui-win32/dialogs.c:517
msgid "Select a nation"
msgstr "Alegeţi o naţie"
-#: client/gui-gtk-2.0/dialogs.c:804
+#: client/gui-gtk-2.0/dialogs.c:810
msgid "_Properties"
msgstr "_Proprietăţi"
-#: client/gui-gtk-2.0/dialogs.c:824
+#: client/gui-gtk-2.0/dialogs.c:830
msgid "_Leader:"
msgstr "_Conducător:"
-#: client/gui-gtk-2.0/dialogs.c:831
+#: client/gui-gtk-2.0/dialogs.c:837
msgid "_Female"
msgstr "_Feminin"
-#: client/gui-gtk-2.0/dialogs.c:836
+#: client/gui-gtk-2.0/dialogs.c:842
msgid "_Male"
msgstr "_Masculin"
-#: client/gui-gtk-2.0/dialogs.c:863
+#: client/gui-gtk-2.0/dialogs.c:869
#, fuzzy
msgid "City _Styles:"
msgstr "Stilul _OraÅŸelor:"
-#: client/gui-gtk-2.0/dialogs.c:902
+#: client/gui-gtk-2.0/dialogs.c:908
#, fuzzy
msgid "_Description"
msgstr "L_egendă"
-#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1263 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:1253 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1268 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:1262 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1277 client/gui-sdl/dialogs.c:2204
#: 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:1306 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1318 client/gui-win32/citydlg.c:1454
#: data/Freeciv.in:2484
msgid "Upgrade Unit!"
msgstr "Modernizează Unitatea!"
-#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1327 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 "Modernizează unităţile învechite"
-#: client/gui-gtk-2.0/diplodlg.c:231 client/gui-win32/diplodlg.c:151
+#: client/gui-gtk-2.0/diplodlg.c:222 client/gui-win32/diplodlg.c:151
#: client/gui-xaw/diplodlg.c:383 client/gui-xaw/diplodlg.c:401
msgid "World-map"
msgstr "Harta lumii"
-#: client/gui-gtk-2.0/diplodlg.c:237 client/gui-win32/diplodlg.c:146
+#: client/gui-gtk-2.0/diplodlg.c:228 client/gui-win32/diplodlg.c:146
#: client/gui-xaw/diplodlg.c:387 client/gui-xaw/diplodlg.c:405
msgid "Sea-map"
msgstr "Harta maritimă"
-#: client/gui-gtk-2.0/diplodlg.c:243
+#: client/gui-gtk-2.0/diplodlg.c:234
msgid "_Maps"
msgstr "_Hărţi"
-#: client/gui-gtk-2.0/diplodlg.c:274
+#: client/gui-gtk-2.0/diplodlg.c:265
msgid "_Advances"
msgstr "_Avansări"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/diplodlg.c:315 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "_OraÅŸe"
-#: client/gui-gtk-2.0/diplodlg.c:333
+#: client/gui-gtk-2.0/diplodlg.c:324
msgid "_Give shared vision"
msgstr "Oferiţi vedere comună"
-#: client/gui-gtk-2.0/diplodlg.c:346
+#: client/gui-gtk-2.0/diplodlg.c:337
msgid "Give _embassy"
msgstr "Dăruieşt_e ambasadă"
-#: client/gui-gtk-2.0/diplodlg.c:376
+#: client/gui-gtk-2.0/diplodlg.c:368
msgid "_Pacts"
msgstr "_Tratate"
-#: client/gui-gtk-2.0/diplodlg.c:466
+#: client/gui-gtk-2.0/diplodlg.c:458
#, c-format
msgid "Diplomacy: %s"
msgstr "Diplomaţie: %s"
-#: client/gui-gtk-2.0/diplodlg.c:473
+#: client/gui-gtk-2.0/diplodlg.c:465
msgid "_Cancel meeting"
msgstr "_Renunţă la Întrunire"
-#: client/gui-gtk-2.0/diplodlg.c:475
+#: client/gui-gtk-2.0/diplodlg.c:467
msgid "Accept _treaty"
msgstr "Acceptă _tratatul"
-#: client/gui-gtk-2.0/diplodlg.c:503
+#: client/gui-gtk-2.0/diplodlg.c:495
msgid "C_lauses:"
msgstr "C_lause:"
-#: client/gui-gtk-2.0/diplodlg.c:568 client/gui-gtk-2.0/diplodlg.c:642
+#: client/gui-gtk-2.0/diplodlg.c:560 client/gui-gtk-2.0/diplodlg.c:634
msgid "_Gold:"
msgstr "_Galbeni:"
-#: client/gui-gtk-2.0/diplodlg.c:580 client/gui-gtk-2.0/diplodlg.c:654
+#: client/gui-gtk-2.0/diplodlg.c:572 client/gui-gtk-2.0/diplodlg.c:646
msgid "_Add Clause..."
msgstr "_Adăugaţi clauză..."
-#: client/gui-gtk-2.0/diplodlg.c:699
+#: client/gui-gtk-2.0/diplodlg.c:691
msgid "--- This treaty is blank. Please add some clauses. ---"
msgstr "--- Acest tratat este gol. Vă rog adăugaţi cel puţin o clauză.. ---"
-#: client/gui-gtk-2.0/diplodlg.c:905 client/gui-sdl/diplodlg.c:375
+#: client/gui-gtk-2.0/diplodlg.c:897 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 "Joc: Un număr invalid de galbeni specificat."
@@ -11501,20 +11643,20 @@ msgstr "Aleget unitatea"
msgid "Show _All Cities"
msgstr "_Aratâ toate oraşele"
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:164
msgid "Show Map Scrollbars"
msgstr "Afişează barele de derulare a hărţii"
-#: client/gui-gtk-2.0/gui_main.c:163
+#: client/gui-gtk-2.0/gui_main.c:165
msgid "Disable this option to hide the scrollbars on the map view."
msgstr ""
"Dezactivează această opţiune pentru a ascunde barele de derulare a hărţii."
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:169
msgid "Keyboardless goto"
msgstr "Comanda „Du-te la†fără tastatură "
-#: client/gui-gtk-2.0/gui_main.c:168
+#: client/gui-gtk-2.0/gui_main.c:170
msgid ""
"If this option is set then a goto may be initiated by left-clicking and then "
"holding down the mouse button while dragging the mouse onto a different tile."
@@ -11523,11 +11665,11 @@ msgstr ""
"apăsând şi ţinând apăsat butonul stâng al mousului în timp ce se mişcă într-"
"o altă formă geometrică."
-#: client/gui-gtk-2.0/gui_main.c:173
+#: client/gui-gtk-2.0/gui_main.c:175
msgid "Keep dialogs on top"
msgstr "Păstrează ferestrele de dialog deasupra"
-#: client/gui-gtk-2.0/gui_main.c:174
+#: client/gui-gtk-2.0/gui_main.c:176
msgid ""
"If this option is set then dialog windows will always remain in front of the "
"main Freeciv window. Disabling this has no effect in fullscreen mode."
@@ -11536,11 +11678,11 @@ msgstr ""
"ferestrei principale a Freeciv. Dezactivând această opţiune nu are nici un "
"efect în modul pe tot ecranul."
-#: client/gui-gtk-2.0/gui_main.c:178
+#: client/gui-gtk-2.0/gui_main.c:180
msgid "Show worklist task icons"
msgstr "Arată pictogramele sarcinilor în planul de lucru"
-#: client/gui-gtk-2.0/gui_main.c:179
+#: client/gui-gtk-2.0/gui_main.c:181
msgid ""
"Disabling this will turn off the unit and building icons in the worklist "
"dialog and the production tab of the city dialog."
@@ -11548,11 +11690,11 @@ msgstr ""
"Dezactivând această opţiune va ascunde pictogramele unităţilor şi clădirilor "
"din fereastra de dialog a listei de lucru şi a filei cu producţia oraşului."
-#: client/gui-gtk-2.0/gui_main.c:183
+#: client/gui-gtk-2.0/gui_main.c:185
msgid "Enable status report tabs"
msgstr "Activaţi filele de raport a stării"
-#: client/gui-gtk-2.0/gui_main.c:184
+#: client/gui-gtk-2.0/gui_main.c:186
msgid ""
"If this option is enabled then report dialogs will be shown as separate tabs "
"rather than in popup dialogs."
@@ -11560,11 +11702,11 @@ msgstr ""
"Dacă această opţiune este activată atunci rapoartele vor fi afişate ca file "
"separate în loc de dialoguri popup."
-#: client/gui-gtk-2.0/gui_main.c:189 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:191 client/gui-win32/gui_main.c:110
msgid "Better fog-of-war drawing"
msgstr "Desenare mai bună a ceţii de război"
-#: client/gui-gtk-2.0/gui_main.c:190 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:192 client/gui-win32/gui_main.c:111
msgid ""
"If this is enabled then a better method is used for drawing fog-of-war. It "
"is not any slower but will consume about twice as much memory."
@@ -11573,41 +11715,41 @@ msgstr ""
"pentru desenarea ceţei de război. Metoda nu încetineşte jocul dar consumă "
"de două ori mai multă memorie."
-#: client/gui-gtk-2.0/gui_main.c:195
+#: client/gui-gtk-2.0/gui_main.c:197
msgid "Show time for each chat message"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:196
+#: client/gui-gtk-2.0/gui_main.c:198
msgid ""
"If this option is enabled then all chat messages will be prefixed by a time "
"string of the form [hour:minute:second]."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:201
+#: client/gui-gtk-2.0/gui_main.c:203
msgid "Split bottom notebook area"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:202
+#: client/gui-gtk-2.0/gui_main.c:204
msgid ""
"Enabling this option will split the bottom notebook into a left and right "
"notebook so that two tabs may be viewed at once."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:207
+#: client/gui-gtk-2.0/gui_main.c:209
msgid "New message events go to top of list"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:208
+#: client/gui-gtk-2.0/gui_main.c:210
msgid ""
"If this option is enabled, new events in the message window will appear at "
"the top of the list, rather than being appended at the bottom."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:213
+#: client/gui-gtk-2.0/gui_main.c:215
msgid "Show extra message window buttons"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:214
+#: client/gui-gtk-2.0/gui_main.c:216
msgid ""
"If this option is enabled, there will be two buttons displayed in the "
"message window for inspecting a city and going to a location. If this option "
@@ -11617,21 +11759,21 @@ msgid ""
"closed and reopened."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:224
+#: client/gui-gtk-2.0/gui_main.c:226
msgid "Metaserver tab first in network page"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:225
+#: client/gui-gtk-2.0/gui_main.c:227
msgid ""
"If this option is enabled, the metaserver tab will be the first notebook tab "
"in the network page. This option requires a restart in order to take effect."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:230
+#: client/gui-gtk-2.0/gui_main.c:232
msgid "Plain chat messages are sent to allies only"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:231
+#: client/gui-gtk-2.0/gui_main.c:233
msgid ""
"If this option is enabled, then plain messages typed into the chat entry "
"while the game is running will only be sent to your allies. Otherwise plain "
@@ -11641,28 +11783,41 @@ msgid ""
"visible in multiplayer games)."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:340 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:245
+msgid "Arrange widgets for small displays"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:246
+msgid ""
+"If this option is enabled, widgets in the main window will be arrange so "
+"that they take up the least amount of total screen space. Specifically, the "
+"left panel containing the overview, player status, and the unit information "
+"box will be extended over the entire left side of the window. This option "
+"requires a restart in order to take effect."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:352 client/gui-xaw/gui_main.c:245
msgid ""
"This client has no special command line options\n"
"\n"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
+#: client/gui-gtk-2.0/gui_main.c:847 client/gui-gtk-2.0/gui_main.c:1542
msgid "Freeciv"
msgstr "Freeciv"
-#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
+#: client/gui-gtk-2.0/gui_main.c:1251 client/gui-gtk-2.0/gui_main.c:1258
#: client/gui-sdl/mapctrl.c:1566 client/gui-win32/gui_main.c:482
#: data/Freeciv.in:2618
msgid "Turn Done"
msgstr "Termină Runda"
-#: client/gui-gtk-2.0/gui_main.c:1232 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1258 client/gui-sdl/mapctrl.c:1566
#: client/gui-sdl/mapview.c:1082
msgid "Shift+Return"
msgstr "Shift+Return"
-#: client/gui-gtk-2.0/gui_main.c:1266 client/gui-gtk-2.0/menu.c:797
+#: client/gui-gtk-2.0/gui_main.c:1299 client/gui-gtk-2.0/menu.c:797
#: client/gui-gtk-2.0/menu.c:799 client/gui-gtk-2.0/menu.c:801
#: client/gui-gtk-2.0/menu.c:803 client/gui-gtk-2.0/menu.c:805
#: client/gui-gtk-2.0/menu.c:807 client/gui-gtk-2.0/menu.c:809
@@ -11681,11 +11836,11 @@ msgstr "Shift+Return"
msgid "View"
msgstr "Vizualizare"
-#: client/gui-gtk-2.0/gui_main.c:1359
+#: client/gui-gtk-2.0/gui_main.c:1393
msgid "Chat"
msgstr "Discuţie"
-#: client/gui-gtk-2.0/gui_main.c:1377 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1411 client/gui-win32/gui_main.c:538
#: data/Freeciv.in:2809
msgid ""
"Freeciv is free software and you are welcome to distribute copies of it\n"
@@ -11696,79 +11851,79 @@ msgstr ""
"cu unele condiţii ; Vezi elementul \"Copying\" din meniul Help (Ajutor).\n"
"Acum.. sări pe ei!"
-#: client/gui-gtk-2.0/gui_main.c:1392
+#: client/gui-gtk-2.0/gui_main.c:1426
msgid "Allies Only"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1657
+#: client/gui-gtk-2.0/gui_main.c:1691
msgid "Not _ready"
msgstr "Nepregătit"
-#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
+#: client/gui-gtk-2.0/gui_main.c:1702 client/gui-gtk-2.0/pages.c:1679
msgid "_Ready"
msgstr "P_regătit"
-#: client/gui-gtk-2.0/gui_main.c:1672 client/gui-gtk-2.0/gui_main.c:1678
-#: client/gui-gtk-2.0/pages.c:2204
+#: client/gui-gtk-2.0/gui_main.c:1706 client/gui-gtk-2.0/gui_main.c:1712
+#: client/gui-gtk-2.0/pages.c:2206
msgid "_Start"
msgstr "_Start"
-#: client/gui-gtk-2.0/gui_main.c:1686
+#: client/gui-gtk-2.0/gui_main.c:1720
#, fuzzy
msgid "_Take Player"
msgstr "Preluaţi acest jucător"
-#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
+#: client/gui-gtk-2.0/gui_main.c:1723 client/gui-gtk-2.0/pages.c:1669
msgid "Pick _Nation"
msgstr "Alege _naţiunea"
-#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
+#: client/gui-gtk-2.0/gui_main.c:1730 client/gui-gtk-2.0/pages.c:1674
msgid "_Observe"
msgstr "_Observă"
-#: client/gui-gtk-2.0/gui_main.c:1698
+#: client/gui-gtk-2.0/gui_main.c:1732
#, fuzzy
msgid "Do not _observe"
msgstr "Nu _observa"
-#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1755 client/gui-xaw/pages.c:211
msgid "<AI>"
msgstr "<AI>"
-#: client/gui-gtk-2.0/gui_main.c:1723
+#: client/gui-gtk-2.0/gui_main.c:1758
msgid "<Novice AI>"
msgstr "<AI novice>"
-#: client/gui-gtk-2.0/gui_main.c:1726
+#: client/gui-gtk-2.0/gui_main.c:1761
msgid "<Easy AI>"
msgstr "<AI uÅŸor>"
-#: client/gui-gtk-2.0/gui_main.c:1729
+#: client/gui-gtk-2.0/gui_main.c:1764
msgid "<Normal AI>"
msgstr "<AI normal>"
-#: client/gui-gtk-2.0/gui_main.c:1732
+#: client/gui-gtk-2.0/gui_main.c:1767
msgid "<Hard AI>"
msgstr "<AI greu>"
-#: client/gui-gtk-2.0/gui_main.c:1742 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1777 client/gui-win32/dialogs.c:594
#: client/gui-xaw/pages.c:217
msgid "Random"
msgstr "Aleator"
-#: client/gui-gtk-2.0/gui_main.c:1808
+#: client/gui-gtk-2.0/gui_main.c:1844 client/gui-gtk-2.0/gui_main.c:1858
msgid "Observer"
msgstr " Observator"
-#: client/gui-gtk-2.0/gui_main.c:1808
+#: client/gui-gtk-2.0/gui_main.c:1858
msgid "Detached"
msgstr "DeataÅŸat"
-#: client/gui-gtk-2.0/gui_main.c:2073
+#: client/gui-gtk-2.0/gui_main.c:2117
msgid "Are you sure you want to quit?"
msgstr "Sigur vrei să renunţi?"
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
#, c-format
msgid ""
"Close Tab:\n"
@@ -11777,7 +11932,7 @@ msgstr ""
"ÃŽnchide fila:\n"
"%s"
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
msgid "Ctrl+W"
msgstr "Ctrl+W"
@@ -11882,8 +12037,8 @@ msgid "Trans. Rslt/Time:"
msgstr "Trans: Rslt/Timp:"
#: 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
-#: client/gui-win32/helpdlg.c:709 client/gui-win32/helpdlg.c:733
+#: client/gui-win32/helpdlg.c:502 client/gui-win32/helpdlg.c:550
+#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:739
#: client/gui-xaw/helpdlg.c:759 client/gui-xaw/helpdlg.c:808
#: client/gui-xaw/helpdlg.c:816 client/gui-xaw/helpdlg.c:853
#: client/gui-xaw/helpdlg.c:878
@@ -11930,34 +12085,34 @@ msgstr "cu"
msgid "?techhelp:"
msgstr "?techhelp:"
-#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:591
+#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:597
#: client/gui-xaw/helpdlg.c:996
#, c-format
msgid "+%d Trade / %d"
msgstr "+%d Negoţ / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:595
+#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:601
#: client/gui-xaw/helpdlg.c:1000
#, c-format
msgid "no extra / %d"
msgstr "nimic extra / %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
-#: client/gui-win32/helpdlg.c:602 client/gui-win32/helpdlg.c:616
-#: client/gui-win32/helpdlg.c:635 client/gui-xaw/helpdlg.c:1002
+#: client/gui-gtk-2.0/helpdlg.c:1085 client/gui-win32/helpdlg.c:604
+#: client/gui-win32/helpdlg.c:608 client/gui-win32/helpdlg.c:622
+#: client/gui-win32/helpdlg.c:641 client/gui-xaw/helpdlg.c:1002
#: client/gui-xaw/helpdlg.c:1006 client/gui-xaw/helpdlg.c:1020
#: client/gui-xaw/helpdlg.c:1039
msgid "n/a"
msgstr "?"
-#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:605
+#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:611
#: client/gui-xaw/helpdlg.c:1009
#, c-format
msgid "+%d Food / %d"
msgstr "+%d Hrană / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:619
+#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:625
#: client/gui-xaw/helpdlg.c:1023
#, c-format
msgid "+%d Res. / %d"
@@ -12728,41 +12883,41 @@ 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:624 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:302
#: 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:779 client/gui-gtk-2.0/pages.c:820
-#: client/gui-win32/connectdlg.c:916
+#: client/gui-win32/connectdlg.c:918
msgid "Server Name"
msgstr "Nume Server"
#: client/gui-gtk-2.0/pages.c:780 client/gui-gtk-2.0/pages.c:821
-#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:916
+#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:918
#: data/Freeciv.in:96
msgid "Port"
msgstr "Port"
#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Version"
msgstr "Versiune"
#: client/gui-gtk-2.0/pages.c:782 client/gui-gtk-2.0/pages.c:823
-#: client/gui-gtk-2.0/pages.c:2161 client/gui-win32/connectdlg.c:917
-#: client/gui-win32/connectdlg.c:995
+#: client/gui-gtk-2.0/pages.c:2163 client/gui-win32/connectdlg.c:919
+#: client/gui-win32/connectdlg.c:997
msgid "Status"
msgstr "Stare"
#: client/gui-gtk-2.0/pages.c:783 client/gui-gtk-2.0/pages.c:824
#: client/gui-sdl/connectdlg.c:318 client/gui-sdl/plrdlg.c:330
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Players"
msgstr "Jucători"
#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
-#: client/gui-win32/connectdlg.c:918
+#: client/gui-win32/connectdlg.c:920
msgid "Comment"
msgstr "Comentariu"
@@ -12794,9 +12949,9 @@ msgstr "Parola:"
msgid "Conf_irm Password:"
msgstr "Conf_irmaţi parola:"
-#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2165
#: 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:1000
+#: client/gui-win32/citydlg.c:1083 client/gui-win32/connectdlg.c:1002
#: client/gui-win32/wldlg.c:800 client/gui-win32/wldlg.c:806
msgid "Type"
msgstr "Tipul"
@@ -12891,7 +13046,7 @@ msgstr "Nivel de dificultate _AI:"
msgid "Ruleset _Version:"
msgstr "P_resetări:"
-#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2195
msgid "_More Game Options..."
msgstr "_Opţiuni suplimentare pentru joc..."
@@ -12907,49 +13062,49 @@ msgstr "Rating"
msgid "Ready"
msgstr "Gata"
-#: client/gui-gtk-2.0/pages.c:1601
+#: client/gui-gtk-2.0/pages.c:1600
#, fuzzy
msgid "?player:Leader"
msgstr "?Player:Nume"
-#: client/gui-gtk-2.0/pages.c:1732 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1734 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:1824
+#: client/gui-gtk-2.0/pages.c:1826
msgid "Choose Saved Game to _Load:"
msgstr "Alegeţi jocu_l pentru încărcat"
-#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
-#: client/gui-gtk-2.0/pages.c:2451
+#: client/gui-gtk-2.0/pages.c:1846 client/gui-gtk-2.0/pages.c:2039
+#: client/gui-gtk-2.0/pages.c:2455
msgid "_Browse..."
msgstr "Răsfoieşte..."
-#: client/gui-gtk-2.0/pages.c:1911
+#: client/gui-gtk-2.0/pages.c:1913
msgid "Choose a Scenario"
msgstr "Alegeţi un scenariu"
-#: client/gui-gtk-2.0/pages.c:1998
+#: client/gui-gtk-2.0/pages.c:2000
msgid "Choose a _Scenario:"
msgstr "Alegeţi un _scenariu:"
-#: client/gui-gtk-2.0/pages.c:2173
+#: client/gui-gtk-2.0/pages.c:2175
msgid "Choose a _nation to play:"
msgstr "Alegeţi o _naţiune cu care să jucaţi:"
-#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2367 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:2448 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2452 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "Salvează joc"
-#: client/gui-gtk-2.0/pages.c:2489
+#: client/gui-gtk-2.0/pages.c:2493
msgid "Saved _Games:"
msgstr "Jocuri salvate:"
-#: client/gui-gtk-2.0/pages.c:2516
+#: client/gui-gtk-2.0/pages.c:2520
msgid "Save _Filename:"
msgstr "Nume fiÅŸier salvare:"
@@ -13300,7 +13455,7 @@ msgstr ""
msgid "Total users logged in : %d"
msgstr "Număr total de utilizatori autentificaţi : %d"
-#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1098
msgid "Back"
msgstr "ÃŽnapoi"
@@ -13309,7 +13464,7 @@ msgid "Start"
msgstr "PorneÅŸte"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:777
+#: client/gui-win32/connectdlg.c:779
msgid "Load Game"
msgstr "Încarcă joc"
@@ -13353,9 +13508,9 @@ msgstr "Creaţi un nou oraş natal"
#: client/gui-sdl/connectdlg.c:308 client/gui-sdl/connectdlg.c:617
#: client/gui-sdl/connectdlg.c:803 client/gui-sdl/connectdlg.c:985
#: client/gui-sdl/dialogs.c:452 client/gui-sdl/dialogs.c:2095
-#: client/gui-sdl/dialogs.c:2893 client/gui-sdl/diplomat_dialog.c:731
+#: client/gui-sdl/dialogs.c:2902 client/gui-sdl/diplomat_dialog.c:731
#: client/gui-sdl/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1043
#: client/gui-win32/dialogs.c:1772 client/gui-win32/finddlg.c:127
#: client/gui-win32/gotodlg.c:171 client/gui-win32/inputdlg.c:146
#: client/gui-win32/messagedlg.c:216 client/gui-win32/ratesdlg.c:328
@@ -13402,7 +13557,7 @@ msgid "Buy it?"
msgstr "Cumparaţi?"
#: 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
+#: client/gui-sdl/diplodlg.c:1336 client/gui-sdl/diplomat_dialog.c:1211
#: client/gui-sdl/diplomat_dialog.c:1417 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:221 client/gui-sdl/repodlgs.c:1559
#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
@@ -13418,7 +13573,7 @@ msgid "No"
msgstr "Nu"
#: client/gui-sdl/citydlg.c:1215 client/gui-sdl/cma_fe.c:318
-#: client/gui-sdl/diplodlg.c:1345 client/gui-sdl/diplomat_dialog.c:1200
+#: client/gui-sdl/diplodlg.c:1346 client/gui-sdl/diplomat_dialog.c:1200
#: client/gui-sdl/diplomat_dialog.c:1407 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:232 client/gui-win32/repodlgs.c:578
#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
@@ -13733,7 +13888,7 @@ msgstr "Server Freeciv :"
msgid "Port :"
msgstr "Port :"
-#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1100
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr "Conectează"
@@ -13841,23 +13996,23 @@ msgstr "Alege un guvern nou"
msgid "REVOLUTION!"
msgstr "REVOLUÅ¢IE!"
-#: client/gui-sdl/dialogs.c:2232 client/gui-sdl/dialogs.c:2620
+#: client/gui-sdl/dialogs.c:2237 client/gui-sdl/dialogs.c:2625
#: client/gui-win32/dialogs.c:567 data/Freeciv.in:3159
msgid "Female"
msgstr "Feminin"
-#: client/gui-sdl/dialogs.c:2234 client/gui-sdl/dialogs.c:2618
-#: client/gui-sdl/dialogs.c:2830 client/gui-win32/dialogs.c:565
+#: client/gui-sdl/dialogs.c:2239 client/gui-sdl/dialogs.c:2623
+#: client/gui-sdl/dialogs.c:2839 client/gui-win32/dialogs.c:565
msgid "Male"
msgstr "Masculin"
-#: client/gui-sdl/dialogs.c:2478 client/gui-sdl/dialogs.c:2902
+#: client/gui-sdl/dialogs.c:2483 client/gui-sdl/dialogs.c:2911
#: 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 "OK"
-#: client/gui-sdl/dialogs.c:2685 client/gui-win32/dialogs.c:505
+#: client/gui-sdl/dialogs.c:2694 client/gui-win32/dialogs.c:505
msgid "What nation will you be?"
msgstr "Cărei naţii vreţi să-i aparţineţi?"
@@ -13884,53 +14039,53 @@ msgstr "Harta lumii"
msgid "Sea map"
msgstr "Harta maritimă"
-#: client/gui-sdl/diplodlg.c:563
+#: client/gui-sdl/diplodlg.c:564
msgid "Give embassy"
msgstr "Oferă ambasadă"
-#: client/gui-sdl/diplodlg.c:579 client/gui-win32/diplodlg.c:614
+#: client/gui-sdl/diplodlg.c:580 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 "Galbeni(max %d)"
-#: client/gui-sdl/diplodlg.c:613 client/gui-sdl/helpdlg.c:1956
+#: client/gui-sdl/diplodlg.c:614 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 "Avansuri"
-#: client/gui-sdl/diplodlg.c:831 client/gui-win32/diplodlg.c:598
+#: client/gui-sdl/diplodlg.c:832 client/gui-win32/diplodlg.c:598
#: data/Freeciv.in:269
msgid "Diplomacy meeting"
msgstr "Întrunire diplomatică"
-#: client/gui-sdl/diplodlg.c:883 client/gui-win32/diplodlg.c:680
+#: client/gui-sdl/diplodlg.c:884 client/gui-win32/diplodlg.c:680
#: data/Freeciv.in:510
msgid "Cancel meeting"
msgstr "Termină întrunirea"
-#: client/gui-sdl/diplodlg.c:895 client/gui-win32/diplodlg.c:679
+#: client/gui-sdl/diplodlg.c:896 client/gui-win32/diplodlg.c:679
#: data/Freeciv.in:501
msgid "Accept treaty"
msgstr "Acceptă tratatul"
#. TRANS: "Polish incident !" FIXME!!!
-#: client/gui-sdl/diplodlg.c:1304
+#: client/gui-sdl/diplodlg.c:1305
#, c-format
msgid "%s incident !"
msgstr "Incident %s!"
-#: client/gui-sdl/diplodlg.c:1322
+#: client/gui-sdl/diplodlg.c:1323
msgid "Shall we declare WAR on them?"
msgstr "Să le declarăm RĂZBOI?"
-#: client/gui-sdl/diplodlg.c:1433
+#: client/gui-sdl/diplodlg.c:1434
msgid "Foreign Minister"
msgstr "Ministrul afacerilor externe"
-#: client/gui-sdl/diplodlg.c:1449
+#: client/gui-sdl/diplodlg.c:1450
#, fuzzy, c-format
msgid ""
"Sir!, the %s ambassador has arrived\n"
@@ -13939,24 +14094,24 @@ msgstr ""
"Sire!, ambasadorul %s a sosit\n"
"Care vă sunt dorinţele?"
-#: client/gui-sdl/diplodlg.c:1465
+#: client/gui-sdl/diplodlg.c:1466
msgid "Declare WAR"
msgstr "Declară RĂZBOI"
-#: client/gui-sdl/diplodlg.c:1467 client/gui-win32/plrdlg.c:357
+#: client/gui-sdl/diplodlg.c:1468 client/gui-win32/plrdlg.c:357
msgid "Cancel Treaty"
msgstr "Anulează tratat"
-#: client/gui-sdl/diplodlg.c:1490 client/gui-win32/plrdlg.c:358
+#: client/gui-sdl/diplodlg.c:1491 client/gui-win32/plrdlg.c:358
#: data/Freeciv.in:3254
msgid "Withdraw vision"
msgstr "Retrage vedere comună"
-#: client/gui-sdl/diplodlg.c:1507
+#: client/gui-sdl/diplodlg.c:1508
msgid "Call Diplomatic Meeting"
msgstr "Organizează o întrunire diplomatică"
-#: client/gui-sdl/diplodlg.c:1521
+#: client/gui-sdl/diplodlg.c:1522
msgid "Send him back"
msgstr "Trimite-l înapoi"
@@ -14715,12 +14870,12 @@ msgid "Leave Game"
msgstr "Salvează joc"
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1100 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1102 client/gui-xaw/menu.c:121
#: data/Freeciv.in:115 data/Freeciv.in:3180
msgid "Quit"
msgstr "Termină"
-#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:967
msgid "Start New Game"
msgstr "PorneÅŸte joc nou"
@@ -14842,8 +14997,8 @@ msgstr "Venit net: "
msgid "%s max rate : %d%%"
msgstr "%s rată maximă: %d%%"
-#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
-#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1085
+#: client/gui-win32/connectdlg.c:1093 data/Freeciv.in:155
msgid "Update"
msgstr "Actualizează"
@@ -15338,67 +15493,67 @@ msgstr "Nou"
msgid "Delete"
msgstr "Åžterge"
-#: client/gui-win32/connectdlg.c:147
+#: client/gui-win32/connectdlg.c:149
msgid "Password:"
msgstr "Parola:"
-#: client/gui-win32/connectdlg.c:169
+#: client/gui-win32/connectdlg.c:171
msgid "Couldn't load the savegame"
msgstr "Nu s-a putut încărca jocul salvat."
-#: client/gui-win32/connectdlg.c:284 client/gui-xaw/connectdlg.c:311
+#: client/gui-win32/connectdlg.c:286 client/gui-xaw/connectdlg.c:311
msgid "Verify Password"
msgstr "Verificare parolă"
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:916 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr "Selectarea Serverului Freeciv"
-#: client/gui-win32/connectdlg.c:915
+#: client/gui-win32/connectdlg.c:917
msgid "Local Area Network"
msgstr "Reţea locală"
-#: client/gui-win32/connectdlg.c:949
+#: client/gui-win32/connectdlg.c:951
msgid "Welcome to Freeciv"
msgstr "Bun venit în Freeciv"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Load Saved Game"
msgstr "Încarcă joc salvat"
-#: client/gui-win32/connectdlg.c:969
+#: client/gui-win32/connectdlg.c:971
msgid "Connect To Network Game"
msgstr "Conectare la joc în reţea"
-#: client/gui-win32/connectdlg.c:979
+#: client/gui-win32/connectdlg.c:981
msgid "Choose a nation to play"
msgstr "Alegeţi o naţiune pentru a juca"
-#: client/gui-win32/connectdlg.c:1014
+#: client/gui-win32/connectdlg.c:1016
msgid "Number of players (Including AI):"
msgstr "Numărul de jucători (inclusiv AI)."
-#: client/gui-win32/connectdlg.c:1022
+#: client/gui-win32/connectdlg.c:1024
msgid "AI skill level:"
msgstr "Nivel de îndemânare AI:"
-#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1038 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr "Opţiuni joc"
-#: client/gui-win32/connectdlg.c:1040
+#: client/gui-win32/connectdlg.c:1042
msgid "Start Game"
msgstr "Pornesc jocul."
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Login:"
msgstr "Autentificare:"
-#: client/gui-win32/connectdlg.c:1061
+#: client/gui-win32/connectdlg.c:1063
msgid "Host:"
msgstr "Gazdă:"
-#: client/gui-win32/connectdlg.c:1062
+#: client/gui-win32/connectdlg.c:1064
msgid "Port:"
msgstr "Port:"
@@ -15479,21 +15634,21 @@ msgstr ""
"efectului de tremur ordonat. Dacă nu există suport în placa video pentru "
"pentru îmbinarea alfa, aceasta va fi foarte înceată."
-#: client/gui-win32/helpdlg.c:769 client/gui-win32/helpdlg.c:792
-#: client/gui-win32/helpdlg.c:803 client/gui-win32/helpdlg.c:809
-#: client/gui-win32/helpdlg.c:822
+#: client/gui-win32/helpdlg.c:775 client/gui-win32/helpdlg.c:798
+#: client/gui-win32/helpdlg.c:809 client/gui-win32/helpdlg.c:815
+#: client/gui-win32/helpdlg.c:828
msgid "Allows "
msgstr "Permite "
-#: client/gui-win32/helpdlg.c:780
+#: client/gui-win32/helpdlg.c:786
msgid "Obsoletes "
msgstr "ÃŽnvecheÅŸte "
-#: client/gui-win32/helpdlg.c:812 client/gui-win32/helpdlg.c:825
+#: client/gui-win32/helpdlg.c:818 client/gui-win32/helpdlg.c:831
msgid " (with "
msgstr " (cu "
-#: client/gui-win32/helpdlg.c:815 client/gui-win32/helpdlg.c:828
+#: client/gui-win32/helpdlg.c:821 client/gui-win32/helpdlg.c:834
msgid "?techhelp:)."
msgstr ")."
@@ -16624,7 +16779,7 @@ 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/"
+" https://gna.org/projects/freeciv/"
msgstr ""
"Dacă descoperiţi erori, trimiteţi un raport de eroare. Puteţi face acest "
"lucru cel mai uşor vizitând Sistemul Freeciv de urmărire a erorilor, la:\\n\n"
@@ -18377,40 +18532,38 @@ msgid ""
"a Factory, Mfg. Plant and Hydro Plant together give a 150% production "
"bonus.\n"
"\n"
-"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant. A city "
-"can only build a Hydro Plant if it is next to (or on) a Mountain or River "
-"tile."
+"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant."
msgstr "Reduce poluarea produsă de producţie cu 50%."
-#: data/default/buildings.ruleset:397 data/civ2/buildings.ruleset:373
+#: data/default/buildings.ruleset:396 data/civ2/buildings.ruleset:373
#: data/civ1/buildings.ruleset:297
msgid "Library"
msgstr "Bibliotecă"
-#: data/default/buildings.ruleset:412
+#: data/default/buildings.ruleset:411
#, fuzzy, no-c-format
msgid "Increases the science output in a city by 100%."
msgstr ""
"Universitatea măreşte împreună cu o bibliotecă randamentul de ştiintă al "
"unui oraÅŸ cu 100%."
-#: data/default/buildings.ruleset:417 data/civ2/buildings.ruleset:393
+#: data/default/buildings.ruleset:416 data/civ2/buildings.ruleset:393
#: data/civ1/buildings.ruleset:317
msgid "Marketplace"
msgstr "Târg"
-#: data/default/buildings.ruleset:432 data/civ2/buildings.ruleset:408
+#: data/default/buildings.ruleset:431 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 ""
-#: data/default/buildings.ruleset:437 data/civ2/buildings.ruleset:413
+#: data/default/buildings.ruleset:436 data/civ2/buildings.ruleset:413
#: data/civ1/buildings.ruleset:337
msgid "Mass Transit"
msgstr "Transport în Comun"
-#: data/default/buildings.ruleset:451 data/civ2/buildings.ruleset:427
+#: data/default/buildings.ruleset:450 data/civ2/buildings.ruleset:427
#: data/civ1/buildings.ruleset:351
msgid ""
"Neutralizes the pollution generated by the population. The population "
@@ -18419,12 +18572,12 @@ msgstr ""
"Neutralizează poluarea provocată de populaţie. Populaţia pur şi simplu nu "
"mai are efect asupra poluări într-un oraş."
-#: data/default/buildings.ruleset:458 data/civ2/buildings.ruleset:434
+#: data/default/buildings.ruleset:457 data/civ2/buildings.ruleset:434
#: data/civ1/buildings.ruleset:358
msgid "Mfg. Plant"
msgstr "Uzină"
-#: data/default/buildings.ruleset:474 data/civ2/buildings.ruleset:450
+#: data/default/buildings.ruleset:473 data/civ2/buildings.ruleset:450
#: data/civ1/buildings.ruleset:374
#, no-c-format
msgid ""
@@ -18432,12 +18585,12 @@ msgid ""
"production in a city by 100%."
msgstr ""
-#: data/default/buildings.ruleset:480 data/civ2/buildings.ruleset:456
+#: data/default/buildings.ruleset:479 data/civ2/buildings.ruleset:456
#: data/civ1/buildings.ruleset:380
msgid "Nuclear Plant"
msgstr "Centrală atomică"
-#: data/default/buildings.ruleset:495
+#: data/default/buildings.ruleset:494
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 "
@@ -18448,22 +18601,22 @@ msgid ""
"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant."
msgstr ""
-#: data/default/buildings.ruleset:515 data/civ2/buildings.ruleset:489
+#: data/default/buildings.ruleset:514 data/civ2/buildings.ruleset:489
msgid "Offshore Platform"
msgstr "Platformă Petrolieră"
-#: data/default/buildings.ruleset:530 data/civ2/buildings.ruleset:504
+#: data/default/buildings.ruleset:529 data/civ2/buildings.ruleset:504
msgid ""
"Adds 1 extra shield resource on all Ocean squares in a city. The city needs "
"to be coastal to build this improvement."
msgstr ""
-#: data/default/buildings.ruleset:536 data/civ2/buildings.ruleset:510
+#: data/default/buildings.ruleset:535 data/civ2/buildings.ruleset:510
#: data/civ1/buildings.ruleset:411
msgid "Palace"
msgstr "Palat"
-#: data/default/buildings.ruleset:552
+#: data/default/buildings.ruleset:551
#, fuzzy, no-c-format
msgid ""
"Makes a city the capital and the center of your government. Corruption in "
@@ -18489,11 +18642,11 @@ msgstr ""
"civil. Pierderea palatului curent duce totodată şi la pierderea navei "
"spaţiale."
-#: data/default/buildings.ruleset:569 data/civ2/buildings.ruleset:539
+#: data/default/buildings.ruleset:568 data/civ2/buildings.ruleset:539
msgid "Police Station"
msgstr "Staţie de Poliţie"
-#: data/default/buildings.ruleset:583 data/civ2/buildings.ruleset:553
+#: data/default/buildings.ruleset:582 data/civ2/buildings.ruleset:553
msgid ""
"Reduces the unhappiness caused by military units outside the city by 2 under "
"Democracy and 1 under Republic. This improvement has no effect under other "
@@ -18503,11 +18656,11 @@ msgstr ""
"sub Democraţie, respectiv cu 1 sub Republică. Acest edificiu nu are nici un "
"efect sub alte forme de guvernământ."
-#: data/default/buildings.ruleset:593 data/civ2/buildings.ruleset:560
+#: data/default/buildings.ruleset:592 data/civ2/buildings.ruleset:560
msgid "Port Facility"
msgstr "Åžantier naval"
-#: data/default/buildings.ruleset:608 data/civ2/buildings.ruleset:575
+#: data/default/buildings.ruleset:607 data/civ2/buildings.ruleset:575
msgid ""
"Allows a city to build veteran sea units. Also, damaged sea units which "
"stay in town for one full turn without moving are completely restored."
@@ -18516,12 +18669,12 @@ msgstr ""
"navală avariată, ce stă în oraş fară să se mişte timp de o rundă întreagă, "
"este refăcută complet."
-#: data/default/buildings.ruleset:615 data/civ2/buildings.ruleset:582
+#: data/default/buildings.ruleset:614 data/civ2/buildings.ruleset:582
#: data/civ1/buildings.ruleset:440
msgid "Power Plant"
msgstr "Uzină electrică"
-#: data/default/buildings.ruleset:631
+#: data/default/buildings.ruleset:630
#, no-c-format
msgid ""
"Increases the shield production of a Factory or Mfg. Plant in a city: a "
@@ -18532,12 +18685,12 @@ msgid ""
"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant."
msgstr ""
-#: data/default/buildings.ruleset:646 data/civ2/buildings.ruleset:610
+#: data/default/buildings.ruleset:645 data/civ2/buildings.ruleset:610
#: data/civ1/buildings.ruleset:468
msgid "Recycling Center"
msgstr "Centru de reciclare"
-#: data/default/buildings.ruleset:661 data/civ2/buildings.ruleset:625
+#: data/default/buildings.ruleset:660 data/civ2/buildings.ruleset:625
#: data/civ1/buildings.ruleset:483
#, no-c-format
msgid ""
@@ -18547,11 +18700,11 @@ msgstr ""
"Construcţia unui centru de reciclare reduce poluarea generată de producţie "
"într-un oraş cu 66%."
-#: data/default/buildings.ruleset:667 data/civ2/buildings.ruleset:631
+#: data/default/buildings.ruleset:666 data/civ2/buildings.ruleset:631
msgid "Research Lab"
msgstr "Laborator de Cercetare"
-#: data/default/buildings.ruleset:682
+#: data/default/buildings.ruleset:681
#, fuzzy
msgid ""
"Together with a Library, a Research Lab increases the science production of "
@@ -18561,11 +18714,11 @@ msgstr ""
"Universitatea măreşte împreună cu o bibliotecă randamentul de ştiintă al "
"unui oraÅŸ cu 100%."
-#: data/default/buildings.ruleset:690 data/civ2/buildings.ruleset:654
+#: data/default/buildings.ruleset:689 data/civ2/buildings.ruleset:654
msgid "SAM Battery"
msgstr "Baterie antiaeriană"
-#: data/default/buildings.ruleset:704 data/civ2/buildings.ruleset:668
+#: data/default/buildings.ruleset:703 data/civ2/buildings.ruleset:668
msgid ""
"Doubles the defense of all units inside the city when attacked by non-"
"nuclear air units."
@@ -18573,12 +18726,12 @@ msgstr ""
"Dublează apărarea fiecărei unităţi în oraş când este atacată de unităţi "
"aeriene exceptând unitătile nucleare."
-#: data/default/buildings.ruleset:710 data/civ2/buildings.ruleset:674
+#: data/default/buildings.ruleset:709 data/civ2/buildings.ruleset:674
#: data/civ1/buildings.ruleset:489
msgid "SDI Defense"
msgstr "Apărare SDI"
-#: data/default/buildings.ruleset:724 data/civ2/buildings.ruleset:688
+#: data/default/buildings.ruleset:723 data/civ2/buildings.ruleset:688
#: data/civ1/buildings.ruleset:503
msgid ""
"Protects a city from attacks from Nuclear units. Nuclear attacks simply "
@@ -18589,22 +18742,22 @@ msgstr ""
"nici un efect asupra acestui oraş. De asemenea dublează apărarea contra "
"rachete nenucleare."
-#: data/default/buildings.ruleset:733 data/civ2/buildings.ruleset:697
+#: data/default/buildings.ruleset:732 data/civ2/buildings.ruleset:697
msgid "Sewer System"
msgstr "Canalizaţie"
-#: data/default/buildings.ruleset:748 data/civ2/buildings.ruleset:712
+#: data/default/buildings.ruleset:747 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 ""
-#: data/default/buildings.ruleset:754 data/civ2/buildings.ruleset:749
+#: data/default/buildings.ruleset:753 data/civ2/buildings.ruleset:749
#: data/civ1/buildings.ruleset:512
msgid "Space Component"
msgstr ""
-#: data/default/buildings.ruleset:769 data/civ2/buildings.ruleset:763
+#: data/default/buildings.ruleset:768 data/civ2/buildings.ruleset:763
#: data/civ1/buildings.ruleset:526
msgid ""
"Space Components can be differentiated into Propulsion and Fuel Components. "
@@ -18615,12 +18768,12 @@ msgid ""
"have been built by any player."
msgstr ""
-#: data/default/buildings.ruleset:779 data/civ2/buildings.ruleset:773
+#: data/default/buildings.ruleset:778 data/civ2/buildings.ruleset:773
#: data/civ1/buildings.ruleset:536
msgid "Space Module"
msgstr ""
-#: data/default/buildings.ruleset:794 data/civ2/buildings.ruleset:787
+#: data/default/buildings.ruleset:793 data/civ2/buildings.ruleset:787
#: data/civ1/buildings.ruleset:550
msgid ""
"Space Modules are the most expensive parts of spaceships. There are three "
@@ -18640,12 +18793,12 @@ msgid ""
"have been built by any player."
msgstr ""
-#: data/default/buildings.ruleset:813 data/civ2/buildings.ruleset:806
+#: data/default/buildings.ruleset:812 data/civ2/buildings.ruleset:806
#: data/civ1/buildings.ruleset:569
msgid "Space Structural"
msgstr ""
-#: data/default/buildings.ruleset:828 data/civ2/buildings.ruleset:820
+#: data/default/buildings.ruleset:827 data/civ2/buildings.ruleset:820
#: data/civ1/buildings.ruleset:583
msgid ""
"Space Structurals form the base of your spaceship. All other spaceship "
@@ -18656,11 +18809,11 @@ msgid ""
"have been built by any player."
msgstr ""
-#: data/default/buildings.ruleset:838 data/civ2/buildings.ruleset:830
+#: data/default/buildings.ruleset:837 data/civ2/buildings.ruleset:830
msgid "Stock Exchange"
msgstr "Bursă"
-#: data/default/buildings.ruleset:854 data/civ2/buildings.ruleset:846
+#: data/default/buildings.ruleset:853 data/civ2/buildings.ruleset:846
#, no-c-format
msgid ""
"Together with a Marketplace and a Bank, a Stock Exchange boosts tax and "
@@ -18669,21 +18822,21 @@ msgstr ""
"Înpreună cu un Tărg şi cu o Bancă, Bursa măreşte venitul din impozit şi "
"producţia de bunuri de lux într-un oraş cu 150%."
-#: data/default/buildings.ruleset:860 data/civ2/buildings.ruleset:852
+#: data/default/buildings.ruleset:859 data/civ2/buildings.ruleset:852
msgid "Super Highways"
msgstr "Autostradă"
-#: data/default/buildings.ruleset:875 data/civ2/buildings.ruleset:867
+#: data/default/buildings.ruleset:874 data/civ2/buildings.ruleset:867
#, no-c-format
msgid ""
"Increases trade resources by 50% on all squares with roads or railroads."
msgstr ""
-#: data/default/buildings.ruleset:883 data/civ2/buildings.ruleset:873
+#: data/default/buildings.ruleset:882 data/civ2/buildings.ruleset:873
msgid "Supermarket"
msgstr "Magazin Universal"
-#: data/default/buildings.ruleset:898 data/civ2/buildings.ruleset:888
+#: data/default/buildings.ruleset:897 data/civ2/buildings.ruleset:888
#, no-c-format
msgid ""
"Increases the food resources by 50% on each farmland square which is being "
@@ -18691,12 +18844,12 @@ msgid ""
"a second time."
msgstr ""
-#: data/default/buildings.ruleset:905 data/civ2/buildings.ruleset:895
+#: data/default/buildings.ruleset:904 data/civ2/buildings.ruleset:895
#: data/civ1/buildings.ruleset:593
msgid "Temple"
msgstr "Templu"
-#: data/default/buildings.ruleset:919 data/civ2/buildings.ruleset:909
+#: data/default/buildings.ruleset:918 data/civ2/buildings.ruleset:909
#: data/civ1/buildings.ruleset:607
msgid ""
"Makes one unhappy citizen content. Both the Mysticism advance and the "
@@ -18706,13 +18859,13 @@ msgstr ""
"Mulţumeşte un jucător nemulţumit. Misticismul şi minunea Oraclul dublează "
"acest efect. Având Misticismul cât şi Oraclul, 4 cetăţeni sunt multumiţi."
-#: data/default/buildings.ruleset:926 data/civ2/buildings.ruleset:916
+#: data/default/buildings.ruleset:925 data/civ2/buildings.ruleset:916
#: data/civ1/buildings.ruleset:614 data/default/techs.ruleset:742
#: data/civ2/techs.ruleset:727 data/civ1/techs.ruleset:723
msgid "University"
msgstr "Universitatea"
-#: data/default/buildings.ruleset:942
+#: data/default/buildings.ruleset:941
#, fuzzy, no-c-format
msgid ""
"Together with a Library, a University increases the science production of a "
@@ -18721,12 +18874,12 @@ msgstr ""
"Universitatea măreşte împreună cu o bibliotecă randamentul de ştiintă al "
"unui oraÅŸ cu 100%."
-#: data/default/buildings.ruleset:948 data/civ2/buildings.ruleset:938
+#: data/default/buildings.ruleset:947 data/civ2/buildings.ruleset:938
#: data/civ1/buildings.ruleset:636
msgid "Apollo Program"
msgstr "Programul Apollo"
-#: data/default/buildings.ruleset:962 data/civ2/buildings.ruleset:952
+#: data/default/buildings.ruleset:961 data/civ2/buildings.ruleset:952
msgid ""
"Entire map becomes visible for the player who owns it. It allows all "
"players to start building spaceship parts (assuming they have researched the "
@@ -18736,11 +18889,11 @@ msgstr ""
"Permite tuturor jucătorilor să pornească construcţia unei nave spaţiale "
"(desigur doar dacă au cunoştinţele necesare)."
-#: data/default/buildings.ruleset:969 data/civ2/buildings.ruleset:959
+#: data/default/buildings.ruleset:968 data/civ2/buildings.ruleset:959
msgid "A.Smith's Trading Co."
msgstr "A.Smith's Trading Co."
-#: data/default/buildings.ruleset:983
+#: data/default/buildings.ruleset:982
#, fuzzy
msgid ""
"City improvements which would normally have an upkeep of 1 are free of "
@@ -18749,35 +18902,35 @@ msgstr ""
"Îmbunătăţirile de oraş care necesită 1 galben ca întreţinere pe rundă sunt "
"scutite de întreţinere. Afectează toate oraşele dvs."
-#: data/default/buildings.ruleset:989 data/civ2/buildings.ruleset:979
+#: data/default/buildings.ruleset:988 data/civ2/buildings.ruleset:979
#: data/civ1/buildings.ruleset:655
msgid "Colossus"
msgstr "Colosul din Rodos"
-#: data/default/buildings.ruleset:1003 data/civ2/buildings.ruleset:993
+#: data/default/buildings.ruleset:1002 data/civ2/buildings.ruleset:993
#: data/civ1/buildings.ruleset:669
msgid ""
"Each square around the city where this wonder is built that is already "
"generating some trade produces one extra trade resource."
msgstr ""
-#: data/default/buildings.ruleset:1009 data/civ2/buildings.ruleset:999
+#: data/default/buildings.ruleset:1008 data/civ2/buildings.ruleset:999
#: data/civ1/buildings.ruleset:675
msgid "Copernicus' Observatory"
msgstr "Observatorul lui Copernicus"
-#: data/default/buildings.ruleset:1024 data/civ2/buildings.ruleset:1180
+#: data/default/buildings.ruleset:1023 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 ""
-#: data/default/buildings.ruleset:1029 data/civ2/buildings.ruleset:1019
+#: data/default/buildings.ruleset:1028 data/civ2/buildings.ruleset:1019
#: data/civ1/buildings.ruleset:695
msgid "Cure For Cancer"
msgstr "Vindecarea Cancerului"
-#: data/default/buildings.ruleset:1043
+#: data/default/buildings.ruleset:1042
#, fuzzy
msgid ""
"This stunning technological achievement makes one unhappy citizen content in "
@@ -18786,12 +18939,12 @@ msgstr ""
"Această tehnologie avansată transformă în fiecare oraş un cetăţean "
"nemulţumit într-unul mulţumit."
-#: data/default/buildings.ruleset:1051 data/civ2/buildings.ruleset:1039
+#: data/default/buildings.ruleset:1050 data/civ2/buildings.ruleset:1039
#: data/civ1/buildings.ruleset:715
msgid "Darwin's Voyage"
msgstr "Călătoria lui Darwin"
-#: data/default/buildings.ruleset:1065 data/civ2/buildings.ruleset:1053
+#: data/default/buildings.ruleset:1064 data/civ2/buildings.ruleset:1053
#: data/civ1/buildings.ruleset:729
msgid ""
"Charles Darwin's voyage sparked the discovery of the evolution of the "
@@ -18799,22 +18952,22 @@ msgid ""
"technology advances."
msgstr ""
-#: data/default/buildings.ruleset:1072 data/civ2/buildings.ruleset:1060
+#: data/default/buildings.ruleset:1071 data/civ2/buildings.ruleset:1060
msgid "Eiffel Tower"
msgstr "Turnul Eiffel"
-#: data/default/buildings.ruleset:1087
+#: data/default/buildings.ruleset:1086
#, no-c-format
msgid ""
"Your reputation and goodwill among other nations is recovered twice as fast."
msgstr ""
-#: data/default/buildings.ruleset:1093 data/civ2/buildings.ruleset:1081
+#: data/default/buildings.ruleset:1092 data/civ2/buildings.ruleset:1081
#: data/civ1/buildings.ruleset:736
msgid "Great Library"
msgstr "Marea Bibliotecă"
-#: data/default/buildings.ruleset:1107 data/civ2/buildings.ruleset:1095
+#: data/default/buildings.ruleset:1106 data/civ2/buildings.ruleset:1095
#: data/civ1/buildings.ruleset:750
msgid ""
"The civilization which builds the Great Library gets every advance that at "
@@ -18823,22 +18976,22 @@ msgstr ""
"Civilizaţia care construieşte Marea Bibliotecă primeşte fiecare tehnologie "
"învăţată de cel puţin alte două civilizaţii."
-#: data/default/buildings.ruleset:1113 data/civ2/buildings.ruleset:1101
+#: data/default/buildings.ruleset:1112 data/civ2/buildings.ruleset:1101
#: data/civ1/buildings.ruleset:756
msgid "Great Wall"
msgstr "Marele Zid"
-#: data/default/buildings.ruleset:1127
+#: data/default/buildings.ruleset:1126
#, fuzzy
msgid "Works as a City Wall in all your cities."
msgstr "Contează în fiecare oraş ca 'Zidul oraşului'."
-#: data/default/buildings.ruleset:1135 data/civ2/buildings.ruleset:1122
+#: data/default/buildings.ruleset:1134 data/civ2/buildings.ruleset:1122
#: data/civ1/buildings.ruleset:777
msgid "Hanging Gardens"
msgstr "Grădinile Suspendate"
-#: data/default/buildings.ruleset:1149 data/civ2/buildings.ruleset:1136
+#: data/default/buildings.ruleset:1148 data/civ2/buildings.ruleset:1136
#: data/civ1/buildings.ruleset:791
msgid ""
"Makes one content citizen happy in every city. Makes two extra content "
@@ -18853,12 +19006,12 @@ msgstr ""
"cetăţean mulţumit pentru a fi fericit de Grădinile Suspendate, minunea se "
"aplică pe cetăţeni nemulţumiţi mulţumindui."
-#: data/default/buildings.ruleset:1158 data/civ2/buildings.ruleset:1145
+#: data/default/buildings.ruleset:1157 data/civ2/buildings.ruleset:1145
#: data/civ1/buildings.ruleset:800
msgid "Hoover Dam"
msgstr "Barajul Hoover"
-#: data/default/buildings.ruleset:1173 data/civ2/buildings.ruleset:1159
+#: data/default/buildings.ruleset:1172 data/civ2/buildings.ruleset:1159
msgid ""
"Works as if you had a Hydro Plant in every city. (This reduces pollution "
"and increases the effects of Factories and Mfg. Plants.)"
@@ -18866,51 +19019,51 @@ msgstr ""
"Contează ca Hidrocentrală în fiecare oraş. (Reduce poluarea şi măreşte "
"efectul Fabricilor ÅŸi Uzinelor.)"
-#: data/default/buildings.ruleset:1179 data/civ2/buildings.ruleset:1165
+#: data/default/buildings.ruleset:1178 data/civ2/buildings.ruleset:1165
#: data/civ1/buildings.ruleset:822
msgid "Isaac Newton's College"
msgstr "Colegiul lui Isaac Newton"
-#: data/default/buildings.ruleset:1194
+#: data/default/buildings.ruleset:1193
#, no-c-format
msgid ""
"Boosts science production by 100% in every city you control that has a "
"University."
msgstr ""
-#: data/default/buildings.ruleset:1200 data/civ2/buildings.ruleset:1185
+#: data/default/buildings.ruleset:1199 data/civ2/buildings.ruleset:1185
#: data/civ1/buildings.ruleset:842
msgid "J.S. Bach's Cathedral"
msgstr "Catedrala lui J.S. Bach"
-#: data/default/buildings.ruleset:1214 data/civ2/buildings.ruleset:1199
+#: data/default/buildings.ruleset:1213 data/civ2/buildings.ruleset:1199
msgid "Makes two unhappy citizens content in every city."
msgstr "Mulţumeşte doi cetăţeni nemulţumiţi în fiecare oraş."
-#: data/default/buildings.ruleset:1219 data/civ2/buildings.ruleset:1204
+#: data/default/buildings.ruleset:1218 data/civ2/buildings.ruleset:1204
msgid "King Richard's Crusade"
msgstr "Cruciada Regelui Richard"
-#: data/default/buildings.ruleset:1233 data/civ2/buildings.ruleset:1218
+#: data/default/buildings.ruleset:1232 data/civ2/buildings.ruleset:1218
msgid ""
"Adds one extra shield resource on every square around the city where it is "
"built."
msgstr ""
-#: data/default/buildings.ruleset:1239 data/civ2/buildings.ruleset:1224
+#: data/default/buildings.ruleset:1238 data/civ2/buildings.ruleset:1224
msgid "Leonardo's Workshop"
msgstr "Atelierul lui Leonardo"
-#: data/default/buildings.ruleset:1253 data/civ2/buildings.ruleset:1238
+#: data/default/buildings.ruleset:1252 data/civ2/buildings.ruleset:1238
msgid "Upgrades one obsolete unit per game turn."
msgstr "Modernizează o unitate învechită pe rundă."
-#: data/default/buildings.ruleset:1258 data/civ2/buildings.ruleset:1243
+#: data/default/buildings.ruleset:1257 data/civ2/buildings.ruleset:1243
#: data/civ1/buildings.ruleset:862
msgid "Lighthouse"
msgstr "Farul"
-#: data/default/buildings.ruleset:1273
+#: data/default/buildings.ruleset:1272
#, fuzzy
msgid ""
"Gives all your sea units 1 additional movement point and eliminates the risk "
@@ -18921,37 +19074,37 @@ msgstr ""
"o triremă în largul oceanului. Toate unităţile navale noi construite sunt "
"veterane (valabil pentru toate oraÅŸele)."
-#: data/default/buildings.ruleset:1280 data/civ2/buildings.ruleset:1264
+#: data/default/buildings.ruleset:1279 data/civ2/buildings.ruleset:1264
#: data/civ1/buildings.ruleset:885
msgid "Magellan's Expedition"
msgstr "Expediţia lui Magellan"
-#: data/default/buildings.ruleset:1295
+#: data/default/buildings.ruleset:1294
#, fuzzy
msgid "Gives all your sea units 2 additional movement points."
msgstr "Măreşte numarul de mişcări a unei nave cu doi."
-#: data/default/buildings.ruleset:1300 data/civ2/buildings.ruleset:1283
+#: data/default/buildings.ruleset:1299 data/civ2/buildings.ruleset:1283
#: data/civ1/buildings.ruleset:904
msgid "Manhattan Project"
msgstr "Proiectul Manhattan"
-#: data/default/buildings.ruleset:1318 data/civ2/buildings.ruleset:1301
+#: data/default/buildings.ruleset:1317 data/civ2/buildings.ruleset:1301
msgid "Marco Polo's Embassy"
msgstr "Ambasada lui Marco Polo"
-#: data/default/buildings.ruleset:1332 data/civ2/buildings.ruleset:1315
+#: data/default/buildings.ruleset:1331 data/civ2/buildings.ruleset:1315
msgid "The player who owns it gets an embassy with all players."
msgstr ""
"Jucătorul în posesia acestei minuni obţine ambasade cu toţi ceilalţi "
"jucători."
-#: data/default/buildings.ruleset:1337 data/civ2/buildings.ruleset:1320
+#: data/default/buildings.ruleset:1336 data/civ2/buildings.ruleset:1320
#: data/civ1/buildings.ruleset:922
msgid "Michelangelo's Chapel"
msgstr "Capela lui Michelangelo"
-#: data/default/buildings.ruleset:1351 data/civ2/buildings.ruleset:1334
+#: data/default/buildings.ruleset:1350 data/civ2/buildings.ruleset:1334
msgid ""
"Counts as having a Cathedral in each of your cities. This makes 3 unhappy "
"citizens content in each city. The discovery of Theology increases the "
@@ -18960,22 +19113,22 @@ msgid ""
"the number of unhappy citizens made content."
msgstr ""
-#: data/default/buildings.ruleset:1361 data/civ2/buildings.ruleset:1344
+#: data/default/buildings.ruleset:1360 data/civ2/buildings.ruleset:1344
#: data/civ1/buildings.ruleset:941
msgid "Oracle"
msgstr "Oraclul"
-#: data/default/buildings.ruleset:1375
+#: data/default/buildings.ruleset:1374
#, fuzzy
msgid "Makes two of your unhappy citizens content in every city with a temple."
msgstr "Mulţumeşte doi cetăţeni nemulţumiţi în fiecare oraş."
-#: data/default/buildings.ruleset:1380 data/civ2/buildings.ruleset:1363
+#: data/default/buildings.ruleset:1379 data/civ2/buildings.ruleset:1363
#: data/civ1/buildings.ruleset:960
msgid "Pyramids"
msgstr "Pyramidele"
-#: data/default/buildings.ruleset:1394
+#: data/default/buildings.ruleset:1393
#, fuzzy
msgid ""
"The amount of stored food lost when one of your cities grows or shrinks is "
@@ -18986,34 +19139,34 @@ msgstr ""
"la jumatate. Aceasta ajută la creşterea mai rapid~ a oraşului şi măreşte "
"rezistenţa contra foametei."
-#: data/default/buildings.ruleset:1401 data/civ2/buildings.ruleset:1382
+#: data/default/buildings.ruleset:1400 data/civ2/buildings.ruleset:1382
#: data/civ1/buildings.ruleset:981
msgid "SETI Program"
msgstr "Programul SETI"
-#: data/default/buildings.ruleset:1415
+#: data/default/buildings.ruleset:1414
#, fuzzy
msgid "Boosts science production in each city with a Research Lab by 100%. "
msgstr ""
"Măreşte randamentul ştiinţei cu 50% în fiecare oraş cu o Bibliotecă. "
"(Contează ca Laborator de cercetare în toate oraşele dumneavoastră.)"
-#: data/default/buildings.ruleset:1420 data/civ2/buildings.ruleset:1402
+#: data/default/buildings.ruleset:1419 data/civ2/buildings.ruleset:1402
#: data/civ1/buildings.ruleset:1001
msgid "Shakespeare's Theatre"
msgstr "Teatrul lui Shakespeare"
-#: data/default/buildings.ruleset:1434 data/civ2/buildings.ruleset:1416
+#: data/default/buildings.ruleset:1433 data/civ2/buildings.ruleset:1416
#: data/civ1/buildings.ruleset:1015
msgid "Makes all unhappy citizens content, in the city where it is located."
msgstr ""
"Mulţumeşte pe toţi cetăţeni nemulţumiţi ai oraşului în care este construit."
-#: data/default/buildings.ruleset:1439 data/civ2/buildings.ruleset:1421
+#: data/default/buildings.ruleset:1438 data/civ2/buildings.ruleset:1421
msgid "Statue of Liberty"
msgstr "Statuia Libertăţi"
-#: data/default/buildings.ruleset:1453 data/civ2/buildings.ruleset:1435
+#: data/default/buildings.ruleset:1452 data/civ2/buildings.ruleset:1435
#: data/civ1/buildings.ruleset:974 data/civ1/buildings.ruleset:1034
msgid ""
"Allows you to choose any government, including those that have not yet been "
@@ -19024,11 +19177,11 @@ msgstr ""
"civilizaţia dumneavostră nu le cunoaşte încă, fară a trece prin perioada de "
"Anarhie."
-#: data/default/buildings.ruleset:1460 data/civ2/buildings.ruleset:1442
+#: data/default/buildings.ruleset:1459 data/civ2/buildings.ruleset:1442
msgid "Sun Tzu's War Academy"
msgstr "Academia militară Sun Tzu"
-#: data/default/buildings.ruleset:1474
+#: data/default/buildings.ruleset:1473
#, fuzzy
msgid ""
"All your new ground units start at the first veteran level. The chance of a "
@@ -19038,32 +19191,32 @@ msgstr ""
"oraş. Şansa ca o unitate să devină veterană după o luptă creşte de la 50% la "
"100%."
-#: data/default/buildings.ruleset:1481 data/civ2/buildings.ruleset:1463
+#: data/default/buildings.ruleset:1480 data/civ2/buildings.ruleset:1463
#: data/civ1/buildings.ruleset:1020
msgid "United Nations"
msgstr "Naţiunile Unite"
-#: data/default/buildings.ruleset:1495
+#: data/default/buildings.ruleset:1494
msgid "All your units regain two extra hitpoints per turn."
msgstr ""
-#: data/default/buildings.ruleset:1508 data/civ2/buildings.ruleset:1490
+#: data/default/buildings.ruleset:1507 data/civ2/buildings.ruleset:1490
#: data/civ1/buildings.ruleset:1046
msgid "Women's Suffrage"
msgstr "Dreptul de vot al femeilor"
-#: data/default/buildings.ruleset:1522 data/civ2/buildings.ruleset:1504
+#: data/default/buildings.ruleset:1521 data/civ2/buildings.ruleset:1504
msgid ""
"Counts as a Police Station in every city. (That is, for each city, reduces "
"unhappiness for military units outside the city by 2 under Democracy and 1 "
"under Republic. This wonder has no effect under other governments.)"
msgstr ""
-#: data/default/buildings.ruleset:1533
+#: data/default/buildings.ruleset:1532
msgid "Coinage"
msgstr "Capitalizare"
-#: data/default/buildings.ruleset:1554
+#: data/default/buildings.ruleset:1553
#, fuzzy
msgid ""
"This is not a normal improvement. Instead, setting a city's production to "
@@ -19468,12 +19621,17 @@ msgstr "LiniÅŸte"
msgid "?citystyle:Industrial"
msgstr "?city:Nume"
-#: data/default/cities.ruleset:139 data/civ2/cities.ruleset:150
+#: data/default/cities.ruleset:139
+#, fuzzy
+msgid "?citystyle:ElectricAge"
+msgstr "LiniÅŸte"
+
+#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:150
#, fuzzy
msgid "?citystyle:Modern"
msgstr "Dezordine"
-#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:161
+#: data/default/cities.ruleset:161 data/civ2/cities.ruleset:161
#, fuzzy
msgid "?citystyle:PostModern"
msgstr "Dezordine"
@@ -24514,6 +24672,27 @@ msgstr "Echipa 30"
msgid "Team 31"
msgstr "Echipa 31"
+#~ 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."
+
+#~ msgid "Observers cannot vote."
+#~ msgstr "Observatorii nu pot vota."
+
+#~ msgid ""
+#~ "You can only vote in a running game. Use 'first' to become the game "
+#~ "organizer if there currently is none."
+#~ msgstr ""
+#~ "Puteţi vota doar într-un joc care rulează. Folosiţi comanda 'first' "
+#~ "pentru a deveni organizatorul jocului dacă nu există deja unul."
+
+#~ msgid "Vote %d \"%s\": %d for, %d against"
+#~ msgstr "Votaţi %d \"%s\": %d voturi pentru, %d voturi împotriva"
+
+#~ msgid "Value must be integer."
+#~ msgstr "Valoarea trebuie să fie un număr întreg."
+
#, fuzzy
#~ msgid "Auth config filename \"%s\" not allowed!"
#~ msgstr "Numele acesta nu este permis."
diff --git a/po/ru.gmo b/po/ru.gmo
index c77f9ab..f0baff6 100644
Binary files a/po/ru.gmo and b/po/ru.gmo differ
diff --git a/po/ru.po b/po/ru.po
index 1b3ed24..34bc878 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: 2009-03-29 21:13+0900\n"
+"POT-Creation-Date: 2009-11-22 21:37+0100\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"
@@ -68,21 +68,21 @@ msgstr "?уÑтарело:У"
msgid "?redundant:*"
msgstr "?лишнее:*"
-#: common/connection.c:515
+#: common/connection.c:518
#, c-format
msgid "%s from %s"
msgstr "%s Ñ %s"
-#: common/connection.c:521
+#: common/connection.c:524
msgid " (connection incomplete)"
msgstr " (Ñоединение не уÑтановлено)."
-#: common/connection.c:525
+#: common/connection.c:528
#, c-format
msgid " (player %s)"
msgstr " (игрок %s)"
-#: common/connection.c:529
+#: common/connection.c:532
msgid " (observer)"
msgstr " (наблюдатель)"
@@ -496,81 +496,81 @@ msgstr "Ð¡Ð¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ/отключениÑ"
msgid "AI Debug messages"
msgstr "Ð¡Ð¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¾Ñ‚Ð»Ð°Ð´ÐºÐ¸ AI"
-#: common/player.c:732
+#: common/player.c:746
msgid "?attitude:Genocidal"
msgstr "?attitude:Геноцид"
-#: common/player.c:734
+#: common/player.c:748
msgid "?attitude:Belligerent"
msgstr "?attitude:ВоинÑтвенные"
-#: common/player.c:736
+#: common/player.c:750
msgid "?attitude:Hostile"
msgstr "?attitude:Враждебные"
-#: common/player.c:738
+#: common/player.c:752
msgid "?attitude:Uncooperative"
msgstr "?attitude:ÐеÑговорчивые"
-#: common/player.c:740
+#: common/player.c:754
msgid "?attitude:Uneasy"
msgstr "?attitude:БеÑпокойные"
-#: common/player.c:742
+#: common/player.c:756
msgid "?attitude:Neutral"
msgstr "?attitude:Ðейтральные"
-#: common/player.c:744
+#: common/player.c:758
msgid "?attitude:Respectful"
msgstr "?attitude:Вежливые"
-#: common/player.c:746
+#: common/player.c:760
msgid "?attitude:Helpful"
msgstr "?attitude:Полезные"
-#: common/player.c:748
+#: common/player.c:762
msgid "?attitude:Enthusiastic"
msgstr "?attitude:ВоÑторженные"
-#: common/player.c:750
+#: common/player.c:764
msgid "?attitude:Admiring"
msgstr "?attitude:ВоÑхищённые"
-#: common/player.c:753
+#: common/player.c:767
msgid "?attitude:Worshipful"
msgstr "?attitude:Враждебные"
-#: common/player.c:764
+#: common/player.c:778
msgid "?diplomatic_state:Armistice"
msgstr "?дипÑоÑÑ‚:Перемирие"
-#: common/player.c:765
+#: common/player.c:779
msgid "?diplomatic_state:War"
msgstr "?дипÑоÑÑ‚:Война"
-#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:780 client/gui-gtk-2.0/diplodlg.c:353
#: 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:767 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:781 client/gui-gtk-2.0/diplodlg.c:358
#: 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:768 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:782 client/gui-gtk-2.0/diplodlg.c:363
#: 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:769
+#: common/player.c:783
msgid "?diplomatic_state:Never met"
msgstr "?дипÑоÑÑ‚:Ðе вÑтречал"
-#: common/player.c:770
+#: common/player.c:784
msgid "?diplomatic_state:Team"
msgstr "?дипÑоÑÑ‚:Союз"
@@ -601,7 +601,7 @@ msgstr "Ð¢Ñ€ÐµÐ±Ð¾Ð²Ð°Ð½Ð¸Ñ Ð´Ð»Ñ Ð²Ñ‹Ð¶Ð¸Ð²Ð°Ð½Ð¸Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶Ð¸Ð²Ð°ÑŽÑ‚
#. TRANS: "Resources: (none)".
#: common/requirements.c:1014 common/team.c:132
#: client/gui-gtk-2.0/helpdlg.c:1055 client/gui-gtk-2.0/inteldlg.c:390
-#: client/gui-win32/helpdlg.c:586 client/gui-xaw/helpdlg.c:991
+#: client/gui-win32/helpdlg.c:592 client/gui-xaw/helpdlg.c:991
#, c-format
msgid "(none)"
msgstr "(нет)"
@@ -627,10 +627,11 @@ msgstr "Ð¢ÐµÑ…Ð½Ð¾Ð»Ð¾Ð³Ð¸Ñ Ð±ÑƒÐ´ÑƒÑ‰ÐµÐ³Ð¾ %d"
#: 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
#: client/gui-sdl/helpdlg.c:817 client/gui-sdl/mapview.c:962
-#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:545
-#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:735
-#: 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
+#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:544
+#: client/gui-win32/helpdlg.c:551 client/gui-win32/helpdlg.c:721
+#: client/gui-win32/helpdlg.c:741 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 "Ðичего"
@@ -643,29 +644,29 @@ msgstr "Ð¢ÐµÑ…Ð½Ð¾Ð»Ð¾Ð³Ð¸Ñ Ð±ÑƒÐ´ÑƒÑ‰ÐµÐ³Ð¾"
msgid "(Unknown)"
msgstr "(ÐеизвеÑтно)"
-#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:553
#: manual/civmanual.c:224
msgid "Road"
msgstr "Дорога"
-#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:557
#: client/gui-gtk-2.0/menu.c:829 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:394 common/terrain.c:572 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:567
#: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
#: data/civ1/techs.ruleset:563
msgid "Railroad"
msgstr "Ð–ÐµÐ»ÐµÐ·Ð½Ð°Ñ Ð´Ð¾Ñ€Ð¾Ð³Ð°"
-#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:555
msgid "Mine"
msgstr "Шахта"
-#: common/terrain.c:396 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:551 server/report.c:124
#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "ЗагрÑзнение"
@@ -674,7 +675,7 @@ msgstr "ЗагрÑзнение"
msgid "Hut"
msgstr "Хижина"
-#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:563
#: manual/civmanual.c:226
msgid "Fortress"
msgstr "КрепоÑÑ‚ÑŒ"
@@ -687,58 +688,58 @@ msgstr "Река"
msgid "Farmland"
msgstr "Ферма"
-#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:577
#: manual/civmanual.c:226
msgid "Airbase"
msgstr "ÐÑродром"
-#: common/terrain.c:402 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:579
msgid "Fallout"
msgstr "РадиациÑ"
-#: common/unit.c:546 client/gui-win32/plrdlg.c:337
+#: common/unit.c:549 client/gui-win32/plrdlg.c:337
msgid "Idle"
msgstr "БездейÑтвует"
-#: common/unit.c:556
+#: common/unit.c:559
msgid "Fortifying"
msgstr "УкреплÑетÑÑ"
-#: common/unit.c:558
+#: common/unit.c:561
msgid "Fortified"
msgstr "Укреплен(ы)"
-#: common/unit.c:562 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
+#: common/unit.c:565 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
msgid "Sentry"
msgstr "Сторожить"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
+#: common/unit.c:569 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
#: client/gui-win32/menu.c:370 client/gui-xaw/menu.c:185
msgid "Pillage"
msgstr "Разрушать"
-#: common/unit.c:568 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
+#: common/unit.c:571 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
msgid "Goto"
msgstr "Идти к"
-#: common/unit.c:570
+#: common/unit.c:573
msgid "Explore"
msgstr "ИÑÑледовать"
-#: common/unit.c:572 manual/civmanual.c:224
+#: common/unit.c:575 manual/civmanual.c:224
msgid "Transform"
msgstr "Преобразовать"
-#: common/unit.c:584 client/text.c:157 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:587 client/text.c:157 client/gui-sdl/citydlg.c:1972
#: client/gui-win32/citydlg.c:1257 client/gui-xaw/citydlg.c:1423
msgid "Unknown"
msgstr "ÐеизвеÑтно"
-#: common/unit.c:1022
+#: common/unit.c:1025
msgid "Moves"
msgstr "Ходы"
-#: common/unit.c:1571
+#: common/unit.c:1574
#, c-format
msgid ""
"Upgrade %s to %s for %d gold?\n"
@@ -747,12 +748,12 @@ msgstr ""
"Модернизировать %s до %s за %d золота?\n"
"В казне %d золота."
-#: common/unit.c:1579
+#: common/unit.c:1582
#, c-format
msgid "Sorry, cannot upgrade %s (yet)."
msgstr "Извините, невозможно модернизировать %s (пока)."
-#: common/unit.c:1585
+#: common/unit.c:1588
#, c-format
msgid ""
"Upgrading %s to %s costs %d gold.\n"
@@ -761,11 +762,11 @@ msgstr ""
"ÐœÐ¾Ð´ÐµÑ€Ð½Ð¸Ð·Ð°Ñ†Ð¸Ñ %s до %s Ñтоит %d золота.\n"
"В казне %d золота."
-#: common/unit.c:1594
+#: common/unit.c:1597
msgid "You can only upgrade units in your cities."
msgstr "Ð’Ñ‹ можете модернизировать ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ в Ваших городах."
-#: common/unit.c:1598
+#: common/unit.c:1601
#, c-format
msgid "Upgrading this %s would strand units it transports."
msgstr ""
@@ -800,11 +801,11 @@ msgstr "ÐÑ‚Ð¾Ð¼Ð½Ð°Ñ Ñ€Ð°ÐºÐµÑ‚Ð°"
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1404
+#: common/unittype.c:349 client/helpdata.c:1412
msgid " and "
msgstr " и "
-#: common/unittype.c:355 client/helpdata.c:1390
+#: common/unittype.c:355 client/helpdata.c:1398
msgid "?and:, "
msgstr "?и:, "
@@ -975,72 +976,72 @@ msgstr "ПуÑтой аргумент Ð´Ð»Ñ \"%s\".\n"
msgid "Missing argument for \"%s\".\n"
msgstr "ОтÑутÑтвует аргумент Ð´Ð»Ñ \"%s\".\n"
-#: utility/shared.c:501
+#: utility/shared.c:514
#, c-format
msgid "%d BC"
msgstr "%d до н.Ñ."
-#: utility/shared.c:503
+#: utility/shared.c:516
#, c-format
msgid "%d AD"
msgstr "%d н.Ñ."
-#: utility/shared.c:924
+#: utility/shared.c:937
msgid "FREECIV_PATH is set but empty; using default path instead."
msgstr "FREECIV_PATH уÑтановлено, но пуÑто; иÑпользуем путь по умолчанию."
-#: utility/shared.c:1028
+#: utility/shared.c:1041
#, c-format
msgid "Could not read data directory %s: %s."
msgstr "Ðе удалоÑÑŒ прочитать каталог данных %s: %s."
-#: utility/shared.c:1279
+#: utility/shared.c:1292
msgid "The data path may be set via the environment variable FREECIV_PATH."
msgstr ""
"Путь Ð´Ð»Ñ Ð´Ð°Ð½Ð½Ñ‹Ñ… может быть уÑтановлен в переменной Ð¾ÐºÑ€ÑƒÐ¶ÐµÐ½Ð¸Ñ FREECIV_PATH"
-#: utility/shared.c:1281
+#: utility/shared.c:1294
#, c-format
msgid "Current data path is: \"%s\""
msgstr "Текущий путь Ð´Ð»Ñ Ð´Ð°Ð½Ð½Ñ‹Ñ…: \"%s\""
-#: utility/shared.c:1283
+#: utility/shared.c:1296
#, c-format
msgid "The \"%s\" file is required ... aborting!"
msgstr "Ðеобходим файл \"%s\" ... прерываем иÑполнение!"
-#: utility/shared.c:1460
+#: utility/shared.c:1485
#, c-format
msgid "%s: Fatal error: you're trying to run me as superuser!\n"
msgstr ""
"%s: Ð¤Ð°Ñ‚Ð°Ð»ÑŒÐ½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°: Ð’Ñ‹ пытаетеÑÑŒ запуÑтить Ð¼ÐµÐ½Ñ Ð±ÑƒÐ´ÑƒÑ‡Ð¸ "
"Ñуперпользователем!\n"
-#: utility/shared.c:1462
+#: utility/shared.c:1487
msgid "Use a non-privileged account instead.\n"
msgstr "ИÑпользуйте лучше непривелегированный Ñчет.\n"
-#: utility/shared.c:1478
+#: utility/shared.c:1503
msgid "exact match"
msgstr "точное Ñовпадение"
-#: utility/shared.c:1479
+#: utility/shared.c:1504
msgid "only match"
msgstr "единÑтвенное Ñовпадение"
-#: utility/shared.c:1480
+#: utility/shared.c:1505
msgid "ambiguous"
msgstr "неоднозначно"
-#: utility/shared.c:1481
+#: utility/shared.c:1506
msgid "empty"
msgstr "пуÑто"
-#: utility/shared.c:1482
+#: utility/shared.c:1507
msgid "too long"
msgstr "Ñлишком длинно"
-#: utility/shared.c:1483
+#: utility/shared.c:1508
msgid "non-match"
msgstr "не Ñовпадает"
@@ -1069,24 +1070,24 @@ msgstr "%s начали Ñтроить чудо %s в %s."
msgid "%s is selling %s (not needed) for %d."
msgstr "%s продают %s (не нужны) за %d."
-#: ai/advdiplomacy.c:280
+#: ai/advdiplomacy.c:300
#, c-format
msgid "*%s (AI)* In away mode AI can't sign such a treaty."
msgstr ""
"*%s (компьютер)* Ð’ режиме 'ушел от компьютера' компьютер не может подпиÑать "
"такой договор."
-#: ai/advdiplomacy.c:290
+#: ai/advdiplomacy.c:310
#, c-format
msgid "*%s (AI)* First break alliance with %s, %s."
msgstr "*%s (компьютер)* Сначала откажитеÑÑŒ от Ñоюза Ñ %s, %s."
-#: ai/advdiplomacy.c:303
+#: ai/advdiplomacy.c:322
#, c-format
msgid "*%s (AI)* Let us first cease hostilies, %s."
msgstr "*%s (компьютер)* Давайте Ñначала прекратим военные дейÑтвиÑ, %s."
-#: ai/advdiplomacy.c:308
+#: ai/advdiplomacy.c:327
#, c-format
msgid ""
"*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
@@ -1095,49 +1096,49 @@ msgstr ""
"*%s (компьютер)* Мне хотелоÑÑŒ бы вначале ещё немного поÑмотреть, как Ð’Ñ‹ "
"Ñоблюдаете текущее прекращение огнÑ, %s."
-#: ai/advdiplomacy.c:331
+#: ai/advdiplomacy.c:350
#, c-format
msgid "*%s (AI)* I simply do not trust you with an alliance yet, %s."
msgstr ""
"*%s (компьютер)* Я пока не наÑтолько доверÑÑŽ Вам, чтобы заключить альÑнÑ, %s."
-#: ai/advdiplomacy.c:424
+#: ai/advdiplomacy.c:443
#, c-format
msgid "*%s (AI)* I do not know the city you mention."
msgstr "*%s (Компьютер)* Я не знаю город, который Ð’Ñ‹ запроÑили."
-#: ai/advdiplomacy.c:454
+#: ai/advdiplomacy.c:473
#, c-format
msgid "*%s (AI)* Sorry, sharing vision with you is not safe."
msgstr ""
"*%s (компьютер)* Извините, но общее зрение Ñ Ð’Ð°Ð¼Ð¸ Ð´Ð»Ñ Ð¼ÐµÐ½Ñ Ð¾Ñ‡ÐµÐ½ÑŒ опаÑно."
-#: ai/advdiplomacy.c:560
+#: ai/advdiplomacy.c:579
#, c-format
msgid "*%s (AI)* This deal was not very good for us, %s!"
msgstr "*%s (компьютер)* Ðта Ñделка не Ñлишком хороша Ð´Ð»Ñ Ð½Ð°Ñ, %s!"
-#: ai/advdiplomacy.c:582
+#: ai/advdiplomacy.c:601
#, c-format
msgid "*%s (AI)* Welcome into our alliance %s!"
msgstr "*%s (компьютер)* ПриветÑтвую Ð’Ð°Ñ ÐºÐ°Ðº Ñоюзника, %s!"
-#: ai/advdiplomacy.c:586
+#: ai/advdiplomacy.c:605
#, c-format
msgid "*%s (AI)* Yes, may we forever stand united, %s."
msgstr "*%s (компьютер)* Хорошо, и пуÑÑ‚ÑŒ наш Ñоюз будет вечным, %s."
-#: ai/advdiplomacy.c:593
+#: ai/advdiplomacy.c:612
#, c-format
msgid "*%s (AI)* Yes, peace in our time!"
msgstr "*%s (компьютер)* Миру - мир!"
-#: ai/advdiplomacy.c:598
+#: ai/advdiplomacy.c:617
#, c-format
msgid "*%s (AI)* Agreed. No more hostilities, %s."
msgstr "*%s (компьютер)* ДоговорилиÑÑŒ, прекращаем военные дейÑтвиÑ, %s."
-#: ai/advdiplomacy.c:813
+#: ai/advdiplomacy.c:832
#, c-format
msgid ""
"*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
@@ -1146,24 +1147,24 @@ msgstr ""
"*%s (компьютер)* ПриветÑтвую ВаÑ, %s! Может быть нам Ñледует заключить "
"Ñоглашение о прекращении огнÑ, пока мы не узнаем друг друга получше?"
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1116
#, c-format
msgid "*%s (AI)* Space will never be yours. "
msgstr "*%s (компьютер)* КоÑÐ¼Ð¾Ñ Ð½Ð¸ÐºÐ¾Ð³Ð´Ð° не будет твоим! "
-#: ai/advdiplomacy.c:1102
+#: ai/advdiplomacy.c:1121
#, c-format
msgid "*%s (AI)* I have tolerated your vicious antics long enough! To war!"
msgstr ""
"%s (компьютер)* Я доÑтаточно долго терпел твои злобные выходки! ГотовьÑÑ Ðº "
"войне!"
-#: ai/advdiplomacy.c:1108
+#: ai/advdiplomacy.c:1127
#, c-format
msgid "*%s (AI)* Peace in ... some other time."
msgstr "*%s (компьютер)* Мир.. как-нибудь в другой раз."
-#: ai/advdiplomacy.c:1113
+#: ai/advdiplomacy.c:1132
#, c-format
msgid ""
"*%s (AI)* Finally I get around to you! Did you really think you could get "
@@ -1172,17 +1173,17 @@ msgstr ""
"*%s (компьютер)* Ðаконец у Ð¼ÐµÐ½Ñ Ð´Ð¾ÑˆÐ»Ð¸ до Ñ‚ÐµÐ±Ñ Ñ€ÑƒÐºÐ¸! Ты, небоÑÑŒ, думал - тебе "
"удаÑÑ‚ÑÑ ÑƒÐ²Ð¸Ð»ÑŒÐ½ÑƒÑ‚ÑŒ от ответÑтвенноÑти за Ñвои преÑтуплениÑ?"
-#: ai/advdiplomacy.c:1119
+#: ai/advdiplomacy.c:1138
#, c-format
msgid "*%s (AI)* Your covert hostilities brought this war upon you!"
msgstr "*%s (компьютер)* Ваши Ñкрытые военные дейÑÑ‚Ð²Ð¸Ñ Ð²Ð²ÐµÑ€Ð³Ð°ÑŽÑ‚ Ð½Ð°Ñ Ð² войну!"
-#: ai/advdiplomacy.c:1126
+#: ai/advdiplomacy.c:1145
#, c-format
msgid "*%s (AI)* Your aggression against %s was your last mistake!"
msgstr "*%s (компьютер)* ÐгреÑÑÐ¸Ñ Ð¿Ñ€Ð¾Ñ‚Ð¸Ð² %s была твоей поÑледней ошибкой!"
-#: ai/advdiplomacy.c:1209
+#: ai/advdiplomacy.c:1229
#, c-format
msgid ""
"*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1200,7 +1201,7 @@ msgstr[2] ""
"*%s (компьютер)* Мы начнём вÑеобщую войну против %s через %d ходов, чтобы "
"оÑтановить запуÑк коÑмичеÑкого кораблÑ."
-#: ai/advdiplomacy.c:1219
+#: ai/advdiplomacy.c:1239
#, c-format
msgid ""
"*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
@@ -1209,7 +1210,7 @@ msgstr ""
"*%s (компьютер)* Мы ждём от Ð’Ð°Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰Ð¸ в Ñтом вопроÑе. ПуÑÑ‚ÑŒ наш Ñлавный "
"Ñоюз будет вечен!"
-#: ai/advdiplomacy.c:1225
+#: ai/advdiplomacy.c:1245
#, c-format
msgid ""
"*%s (AI)* %s has grossly violated his treaties with us for own gain. We "
@@ -1232,7 +1233,7 @@ msgstr[2] ""
"ÑобÑтвенной выгоды. Мы ответим им Ñилой через %d ходов и ожидаем, что Ð’Ñ‹, "
"ÑƒÐ²Ð°Ð¶Ð°Ñ Ð½Ð°Ñˆ Ñоюз, поÑтупите так же!"
-#: ai/advdiplomacy.c:1238
+#: ai/advdiplomacy.c:1258
#, c-format
msgid ""
"*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1250,7 +1251,7 @@ msgstr[2] ""
"*%s (компьютер)* Мы ÑобираемÑÑ Ð¿Ð¾Ð³Ñ€Ð°Ð±Ð¸Ñ‚ÑŒ богатую цивилизацию народа %s. Мы "
"объÑвим им войну через %d ходов."
-#: ai/advdiplomacy.c:1246
+#: ai/advdiplomacy.c:1266
#, c-format
msgid ""
"*%s (AI)* If you want a piece of the loot, feel free to join in the action!"
@@ -1258,7 +1259,7 @@ msgstr ""
"*%s (компьютер)* ЕÑли Ð’Ñ‹ хотите получить Ñвой куÑок пирога - приÑоединÑйтеÑÑŒ "
"к нашей акции!"
-#: ai/advdiplomacy.c:1251
+#: ai/advdiplomacy.c:1271
#, c-format
msgid ""
"*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1276,14 +1277,14 @@ msgstr[2] ""
"*%s (компьютер)* Мы разобралиÑÑŒ Ñ %s. Дайте нам разорвать Ñту патетичную "
"цивилизацию в клочьÑ! Мы объÑвим им войну через %d ходов."
-#: ai/advdiplomacy.c:1261
+#: ai/advdiplomacy.c:1281
#, c-format
msgid "*%s (AI)* As our glorious allies, we expect your help in this war."
msgstr ""
"*%s (компьютер)* Мы ждём от ВаÑ, наших Ñлавных Ñоюзников, помощи в Ñтой "
"войне."
-#: ai/advdiplomacy.c:1267
+#: ai/advdiplomacy.c:1287
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance and declare war on %s in %d turn. "
@@ -1301,7 +1302,7 @@ msgstr[2] ""
"*%s (компьютер)* Мы чтим наш Ñоюз и объÑвлÑем войну народу %s через %d "
"ходов. ДержитеÑÑŒ - помощь идёт!"
-#: ai/advdiplomacy.c:1276
+#: ai/advdiplomacy.c:1296
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1319,7 +1320,7 @@ msgstr[2] ""
"*%s (компьютер)* Мы чтим наш Ñоюз Ñ Ð½Ð°Ñ€Ð¾Ð´Ð¾Ð¼ %s и объÑвлÑем войну народу %s "
"через %d ходов. Мы ожидаем, что Ð’Ñ‹ поÑтупите так же."
-#: ai/advdiplomacy.c:1344
+#: ai/advdiplomacy.c:1364
#, c-format
msgid ""
"*%s (AI)* Your attempt to conquer space for yourself alone betray your true "
@@ -1328,7 +1329,7 @@ msgstr ""
"*%s (компьютер)* Ваши попытки овладеть коÑмичеÑким проÑтранÑтвом только Ð´Ð»Ñ "
"Ð’Ð°Ñ Ñамих выдают Ваши иÑтинные замыÑлы. Я разрываю наш Ñоюз!"
-#: ai/advdiplomacy.c:1359
+#: ai/advdiplomacy.c:1379
#, c-format
msgid ""
"*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
@@ -1337,7 +1338,7 @@ msgstr ""
"*%s (компьютер)* Ваши попытки овладеть коÑмичеÑким проÑтранÑтвом вызывают в "
"Ð½Ð°Ñ Ñильное недовольÑтво."
-#: ai/advdiplomacy.c:1362
+#: ai/advdiplomacy.c:1382
#, c-format
msgid ""
"*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
@@ -1346,13 +1347,13 @@ msgstr ""
"*%s (компьютер)* ЕÑли Ð’Ñ‹ не прекратите Ñтроить коÑмичеÑкий корабль, мы будем "
"вынуждены принÑÑ‚ÑŒ меры!"
-#: ai/advdiplomacy.c:1474
+#: ai/advdiplomacy.c:1494
#, c-format
msgid "*%s (AI)* Sorry, sharing vision with you is no longer safe."
msgstr ""
"*%s (компьютер)* Извините, но общее зрение Ñ Ð’Ð°Ð¼Ð¸ Ð´Ð»Ñ Ð¼ÐµÐ½Ñ Ð½Ðµ безопаÑно."
-#: ai/advdiplomacy.c:1549
+#: ai/advdiplomacy.c:1569
#, c-format
msgid ""
"*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
@@ -1361,7 +1362,7 @@ msgstr ""
"*%s (компьютер)* ПриветÑтвуем нашего Ñамого надёжного Ñоюзника. Помогите нам "
"уничтожить нашего врага - %s."
-#: ai/advdiplomacy.c:1555
+#: ai/advdiplomacy.c:1575
#, c-format
msgid ""
"*%s (AI)* Greetings ally, I see you have not yet made war with our enemy, %"
@@ -1370,7 +1371,7 @@ msgstr ""
"*%s (компьютер)* ПриветÑтвую ВаÑ, Ñоюзник. Я вижу Ð’Ñ‹ вÑе ещё не напали на "
"нашего врага (%s). Ðеужели Ñ Ð´Ð¾Ð»Ð¶ÐµÐ½ напоминать Вам о Ваших обещаниÑÑ…?"
-#: ai/advdiplomacy.c:1562
+#: ai/advdiplomacy.c:1582
#, c-format
msgid ""
"*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1381,7 +1382,7 @@ msgstr ""
"прежнему в мире Ñ Ð½Ð°ÑˆÐ¸Ð¼Ð¸ Ñмертельными врагами (%s)! Ðто неприемлемо; нашего "
"Ñоюза Ñ Ð’Ð°Ð¼Ð¸ более не ÑущеÑтвует!"
-#: ai/advdiplomacy.c:1592
+#: ai/advdiplomacy.c:1612
#, c-format
msgid ""
"*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
@@ -1390,14 +1391,14 @@ msgstr ""
"*%s (компьютер)* ЗдравÑтвуйте, друг мой. Можем ли мы предложить Вам "
"объединить наши цели и вÑтупить в альÑнÑ?"
-#: ai/advdiplomacy.c:1607
+#: ai/advdiplomacy.c:1627
#, c-format
msgid "*%s (AI)* Greetings neighbour, may we suggest more peaceful relations?"
msgstr ""
"*%s (компьютер)* ПриветÑтвую ВаÑ, ÑоÑед. Ðе желаете ли перейти к более "
"мирным отношениÑм?"
-#: ai/advdiplomacy.c:1622
+#: ai/advdiplomacy.c:1642
#, c-format
msgid ""
"*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
@@ -1406,7 +1407,7 @@ msgstr ""
"*%s (компьютер)* Мы уÑтали от беÑконечного кровопролитиÑ. Давайте "
"приоÑтановим военные дейÑтвиÑ?"
-#: ai/advdiplomacy.c:1742
+#: ai/advdiplomacy.c:1762
#, c-format
msgid ""
"*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1569,17 +1570,17 @@ msgstr ""
"Пароль должен Ñодержать по крайней мере %d заглавные буквы, %d цифры и быть "
"длиной не менее %d [читабельных] Ñимволов. Попробуйте ещё раз."
-#: server/barbarian.c:183
+#: server/barbarian.c:184
#, c-format
msgid "%s gain a leader by the name %s. Dangerous times may lie ahead."
msgstr "%s получили лидера %s. ÐÐ°Ñ Ð¼Ð¾Ð³ÑƒÑ‚ поджидать опаÑные времена."
-#: server/barbarian.c:479
+#: server/barbarian.c:480
#, c-format
msgid "Native unrest near %s led by %s."
msgstr "МеÑтные беÑпорÑдки возле %s под руководÑтвом %s"
-#: server/barbarian.c:484
+#: server/barbarian.c:485
#, c-format
msgid "Sea raiders seen near %s!"
msgstr "МорÑкие рейдеры замечены возле %s"
@@ -1983,7 +1984,7 @@ msgstr[0] "%s уÑкорÑет иÑÑледованиÑ, Ð’Ñ‹ получаете
msgstr[1] "%s уÑкорÑет иÑÑледованиÑ, Ð’Ñ‹ получаете %d немедленных открытиÑ."
msgstr[2] "%s уÑкорÑет иÑÑледованиÑ, Ð’Ñ‹ получаете %d немедленных открытий."
-#: server/cityturn.c:1158 server/techtools.c:176
+#: server/cityturn.c:1158 server/techtools.c:172
#, c-format
msgid "The %s have acquired %s from %s."
msgstr "%s приобрели %s от %s."
@@ -2070,22 +2071,22 @@ msgstr ""
"Предупреждение: наÑтройка %s уÑтарела. ИÑпользуйте -m чтобы включить "
"метаÑервер.\n"
-#: server/civserver.c:189
+#: server/civserver.c:193
#, c-format
msgid "Error: unknown option '%s'\n"
msgstr "Ошибка: неизвеÑÑ‚Ð½Ð°Ñ Ð½Ð°Ñтройка '%s'\n"
-#: server/civserver.c:200
+#: server/civserver.c:204
#, c-format
msgid "This is the server for %s"
msgstr "Ðто Ñервер Ð´Ð»Ñ %s"
-#: server/civserver.c:201
+#: server/civserver.c:205
#, c-format
msgid "You can learn a lot about Freeciv at %s"
msgstr "Вы можете узнать больше о Freeciv на %s"
-#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
+#: server/civserver.c:210 client/civclient.c:239 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -2094,7 +2095,7 @@ msgstr ""
"ИÑпользование: %s [наÑтройка ...]\n"
"ДейÑтвующие наÑтройки:\n"
-#: server/civserver.c:208
+#: server/civserver.c:212
msgid ""
" -a --auth FILE\tEnable server authentication with configuration from "
"FILE.\n"
@@ -2102,102 +2103,107 @@ msgstr ""
" -a --auth ФÐЙЛ\tВключить авторизацию на Ñервере Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ð¾Ð½Ð½Ñ‹Ð¼ файлом "
"ФÐЙЛ.\n"
-#: server/civserver.c:210
+#: server/civserver.c:214
msgid " -G --Guests\t\tAllow guests to login if auth is enabled.\n"
msgstr ""
" -G --Guests\t\tРазрешить подключатьÑÑ Ð³Ð¾ÑÑ‚Ñм, еÑли Ð°Ð²Ñ‚Ð¾Ñ€Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ð°.\n"
-#: server/civserver.c:212
+#: server/civserver.c:216
msgid " -N --Newusers\tAllow new users to login if auth is enabled.\n"
msgstr ""
" -N --Newusers\tРазрешить подключатьÑÑ Ð½Ð¾Ð²Ñ‹Ð¼ пользователÑм, еÑли "
"Ð°Ð²Ñ‚Ð¾Ñ€Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ð°.\n"
-#: server/civserver.c:215
+#: server/civserver.c:219
msgid " -b --bind ADDR\tListen for clients on ADDR\n"
msgstr " -b --bind ADDR\tЖдать Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ ÐºÐ»Ð¸ÐµÐ½Ñ‚Ð¾Ð² по адреÑу ADDR\n"
-#: server/civserver.c:217 client/civclient.c:242
+#: server/civserver.c:221 client/civclient.c:243
msgid ""
" -d, --debug NUM\tSet debug log level (0 to 4, or 4:file1,min,max:...)\n"
msgstr ""
" -d, --debug NUM\tУÑтановить уровень журнала отладки (0 до 4,или 4:file1,"
"min,max:...)\n"
-#: server/civserver.c:221 client/civclient.c:246
+#: server/civserver.c:225 client/civclient.c:247
msgid " -d, --debug NUM\tSet debug log level (0 to 3)\n"
msgstr " -d, --debug NUM\tУÑтановить уровень журнала отладки (0 до 3)\n"
-#: server/civserver.c:223
+#: server/civserver.c:227
msgid " -f, --file FILE\tLoad saved game FILE\n"
msgstr " -f, --file FILE\tЗагрузить Ñохранённую игру FILE\n"
-#: server/civserver.c:225 client/civclient.c:249 manual/civmanual.c:382
+#: server/civserver.c:229 client/civclient.c:250 manual/civmanual.c:382
msgid " -h, --help\t\tPrint a summary of the options\n"
msgstr " -h, --help\t\tÐапечатать ÑпиÑок наÑтроек\n"
-#: server/civserver.c:226
+#: server/civserver.c:230
+#, fuzzy
+msgid " -i, --identity ADDR\tBe known as ADDR at metaserver\n"
+msgstr " -M, --Metaserver ADDR\tИÑпользовать ADDR как Ð°Ð´Ñ€ÐµÑ Ð¼ÐµÑ‚Ð°Ñервера\n"
+
+#: server/civserver.c:231
msgid " -l, --log FILE\tUse FILE as logfile\n"
msgstr " -l, --log FILE\tИÑпользовать FILE Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи журнала\n"
-#: server/civserver.c:227
+#: server/civserver.c:232
msgid " -m, --meta\t\tNotify metaserver and send server's info\n"
msgstr ""
" -m, --meta\t\tСвÑзатьÑÑ Ñ Ð¼ÐµÑ‚Ð°Ñервером и поÑлать информацию о Ñервере\n"
-#: server/civserver.c:229
+#: server/civserver.c:234
msgid " -M, --Metaserver ADDR\tSet ADDR as metaserver address\n"
msgstr " -M, --Metaserver ADDR\tИÑпользовать ADDR как Ð°Ð´Ñ€ÐµÑ Ð¼ÐµÑ‚Ð°Ñервера\n"
-#: server/civserver.c:232
+#: server/civserver.c:237
msgid " -p, --port PORT\tListen for clients on port PORT\n"
msgstr " -p, --port PORT\tЖдать Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ ÐºÐ»Ð¸ÐµÐ½Ñ‚Ð¾Ð² на порту PORT\n"
-#: server/civserver.c:234
+#: server/civserver.c:239
msgid " -q, --quitidle TIME\tQuit if no players for TIME seconds\n"
msgstr " -q, --quitidle TIME\tВыйти, еÑли нет игроков TIME Ñекунд\n"
-#: server/civserver.c:236
+#: server/civserver.c:241
msgid " -e, --exit-on-end\tWhen a game ends, exit instead of restarting\n"
msgstr ""
" -e, --exit-on-end\tКогда игра закончитÑÑ, окно закроетÑÑ Ð²Ð¼ÐµÑто реÑтарта\n"
-#: server/civserver.c:239
+#: server/civserver.c:244
msgid " -s, --saves DIR\tSave games to directory DIR\n"
msgstr " -s, --saves DIR\tСохранить игры в каталог DIR\n"
-#: server/civserver.c:241
+#: server/civserver.c:246
msgid " -S, --Serverid ID\tSets the server id to ID\n"
msgstr " -S, --Serverid ID\tУÑтанавливает идентификатор Ñервера в ID\n"
-#: server/civserver.c:243
+#: server/civserver.c:248
msgid " -P, --Ppm\t\tSave ppms of the map when saving the game.\n"
msgstr " -P, --Ppm\t\tСохранÑÑ‚ÑŒ ppm-файлы карты при Ñохранении игры.\n"
-#: server/civserver.c:244
+#: server/civserver.c:249
msgid " -r, --read FILE\tRead startup script FILE\n"
msgstr " -r, --read FILE\tПрочитать начальный Ñкрипт FILE\n"
-#: server/civserver.c:246
+#: server/civserver.c:251
msgid " -R, --Ranklog FILE\tUse FILE as ranking logfile\n"
msgstr " -R, --Ranklog FILE\tИÑпользовать FILE Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи рейтинга\n"
-#: server/civserver.c:247 client/civclient.c:268 manual/civmanual.c:383
+#: server/civserver.c:252 client/civclient.c:269 manual/civmanual.c:383
msgid " -v, --version\t\tPrint the version number\n"
msgstr " -v, --version\t\tВыдать номер верÑии\n"
-#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
+#: server/civserver.c:253 client/gui-gtk-2.0/gui_main.c:354
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, c-format
msgid "Report bugs at %s.\n"
msgstr "Сообщайте об ошибках по адреÑу %s.\n"
-#: server/commands.c:28
+#: server/commands.c:29
msgid "Start the game, or restart after loading a savegame."
msgstr "Ðачать игру или перезапуÑтить поÑле загрузки игры."
-#: server/commands.c:29
+#: server/commands.c:30
msgid ""
"This command starts the game. When starting a new game, it should be used "
"after all human players have connected, and AI players have been created (if "
@@ -2216,7 +2222,7 @@ msgstr ""
"недоÑтупной за ненадобноÑтью."
#. TRANS: translate text between <> only
-#: server/commands.c:42
+#: server/commands.c:44
msgid ""
"help\n"
"help commands\n"
@@ -2230,11 +2236,11 @@ msgstr ""
"help <имÑ-команды>\n"
"help <имÑ-наÑтройки>"
-#: server/commands.c:47
+#: server/commands.c:49
msgid "Show help about server commands and server options."
msgstr "Показать Ñправку о командах и наÑтройках Ñервера"
-#: server/commands.c:48
+#: server/commands.c:50
msgid ""
"With no arguments gives some introductory help. With argument \"commands\" "
"or \"options\" gives respectively a list of all commands or all options. "
@@ -2250,11 +2256,11 @@ msgstr ""
"текущее значение и значение по умолчанию. Ðргументы могут ÑокращатьÑÑ Ñ‚Ð°Ð¼, "
"где Ñто не вызывает конфликтов."
-#: server/commands.c:63
+#: server/commands.c:66
msgid "Show a list of players, teams, connections, or scenarios."
msgstr "Показывать ÑпиÑок игроков, команд, подключений или Ñценариев."
-#: server/commands.c:64
+#: server/commands.c:67
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 "
@@ -2263,20 +2269,20 @@ msgstr ""
"Показать ÑпиÑок игроков, команд игроков, подключений к Ñерверу или доÑтупных "
"Ñценариев. Ðргумент может быть Ñокращен, по умолчанию - 'players'."
-#: server/commands.c:70
+#: server/commands.c:74
msgid "Quit the game and shutdown the server."
msgstr "Закончить игру и выключить Ñервер."
#. TRANS: translate text between <> only
-#: server/commands.c:74
+#: server/commands.c:79
msgid "cut <connection-name>"
msgstr "cut <имÑ-ÑоединениÑ>"
-#: server/commands.c:75
+#: server/commands.c:80
msgid "Cut a client's connection to server."
msgstr "Прерывает подключение клиента к Ñерверу."
-#: server/commands.c:76
+#: server/commands.c:81
msgid ""
"Cut specified client's connection to the server, removing that client from "
"the game. If the game has not yet started that client's player is removed "
@@ -2289,7 +2295,7 @@ msgstr ""
"иÑпользует Ð¸Ð¼Ñ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ, не Ð¸Ð¼Ñ Ð¸Ð³Ñ€Ð¾ÐºÐ°."
#. TRANS: translate text between <> only
-#: server/commands.c:83
+#: server/commands.c:89
msgid ""
"explain\n"
"explain <option-name>"
@@ -2297,11 +2303,11 @@ msgstr ""
"explain\n"
"explain <имÑ-наÑтройки>"
-#: server/commands.c:85
+#: server/commands.c:91
msgid "Explain server options."
msgstr "ОбъÑÑнить наÑтройки Ñервера."
-#: server/commands.c:86
+#: server/commands.c:92
msgid ""
"The 'explain' command gives a subset of the functionality of 'help', and is "
"included for backward compatibility. With no arguments it gives a list of "
@@ -2314,7 +2320,7 @@ msgstr ""
"аргумент, как 'help <имÑ-наÑтройки>'."
#. TRANS: translate text between <> only
-#: server/commands.c:93
+#: server/commands.c:100
msgid ""
"show\n"
"show <option-name>\n"
@@ -2324,11 +2330,11 @@ msgstr ""
"show <имÑ-наÑтройки>\n"
"show <префикÑ-наÑтройки>"
-#: server/commands.c:96
+#: server/commands.c:103
msgid "Show server options."
msgstr "Показать наÑтройки Ñервера"
-#: server/commands.c:97
+#: server/commands.c:104
msgid ""
"With no arguments, shows all server options (or available options, when used "
"by clients). With an argument, show only the named option, or options with "
@@ -2338,36 +2344,37 @@ msgstr ""
"еÑли иÑпользуетÑÑ ÐºÐ»Ð¸ÐµÐ½Ñ‚Ð¾Ð¼). С аргументом показывает только названную "
"наÑтройку или найÑтройки Ñ Ñтим префикÑом."
-#: server/commands.c:102
+#: server/commands.c:110
msgid "wall <message>"
msgstr "wall <Ñообщение>"
-#: server/commands.c:103
+#: server/commands.c:111
msgid "Send message to all connections."
msgstr "ПоÑлать Ñообщение вÑем подключенным клиентам."
-#: server/commands.c:104
+#: server/commands.c:112
msgid ""
"For each connected client, pops up a window showing the message entered."
msgstr "Ð”Ð»Ñ ÐºÐ°Ð¶Ð´Ð¾Ð³Ð¾ подключенного клиента показать Ñообщение в новом окне."
-#: server/commands.c:108
+#: server/commands.c:117
msgid "vote yes|no [vote number]"
msgstr "vote yes|no [номер]"
-#: server/commands.c:109
+#: server/commands.c:118
msgid "Cast a vote."
msgstr "ПодÑчёт голоÑа."
-#: server/commands.c:111
+#: server/commands.c:120
#, 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."
+"A player with basic 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."
msgstr ""
"Игрок, имеющий уровень доÑтупа \"info\", иÑпользовав команду контролирующего "
"ÑƒÑ€Ð¾Ð²Ð½Ñ Ð½Ð°Ñ‡Ð¸Ð½Ð°ÐµÑ‚ голоÑование по поводу Ñтой команды. \"/vote yes [номер-"
@@ -2379,7 +2386,7 @@ msgstr ""
"половины голоÑует против. ЕÑли прошел один ход и никто не проголоÑовал "
"против, голоÑование также проходит Ñ Ð¿Ð¾Ð»Ð¾Ð¶Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ð¼ иÑходом."
-#: server/commands.c:121
+#: server/commands.c:131
msgid ""
"debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
"<player> | timing | info]"
@@ -2387,11 +2394,11 @@ msgstr ""
"debug [ player <имÑ-игрока> | city <x> <y> | units <x> <y> | unit <id> | "
"tech <имÑ-игрока> | timing | info]"
-#: server/commands.c:123
+#: server/commands.c:133
msgid "Turn on or off AI debugging of given entity."
msgstr "Включает или выключает AI отладку заданного предмета."
-#: server/commands.c:124
+#: server/commands.c:134
msgid ""
"Print AI debug information about given entity and turn continous debugging "
"output for this entity on or off."
@@ -2399,23 +2406,23 @@ msgstr ""
"Выводит информацию AI отладки заданного предмета и изменÑет дальнейший вывод "
"отладочной информации Ð´Ð»Ñ Ð·Ð°Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾ предмета на включенный или выключенный."
-#: server/commands.c:128
+#: server/commands.c:139
msgid "set <option-name> <value>"
msgstr "set <имÑ-наÑтройки> <значение>"
-#: server/commands.c:129
+#: server/commands.c:140
msgid "Set server option."
msgstr "УÑтановить наÑтройку Ñервера."
-#: server/commands.c:132
+#: server/commands.c:144
msgid "team <player> [team]"
msgstr "team <имÑ-игрока> [команда]"
-#: server/commands.c:133
+#: server/commands.c:145
msgid "Change, add or remove a player's team affiliation."
msgstr "Изменить, добавить или удалить принадлежноÑÑ‚ÑŒ игрока к команде."
-#: server/commands.c:134
+#: server/commands.c:146
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 "
@@ -2428,15 +2435,15 @@ msgstr ""
"поÑольÑтвами, и ведут войну вмеÑте Ð´Ð»Ñ Ð´Ð¾ÑÑ‚Ð¸Ð¶ÐµÐ½Ð¸Ñ ÐºÐ¾Ð°Ð¼Ð´Ð½Ð´Ð½Ð¾Ð¹ победы Ñ "
"уÑредненным индивидуальным Ñчетом."
-#: server/commands.c:141
+#: server/commands.c:154
msgid "rulesetdir <directory>"
msgstr "rulesetdir <каталог>"
-#: server/commands.c:142
+#: server/commands.c:155
msgid "Choose new ruleset directory or modpack."
msgstr "Выберите новую директорию или модуль."
-#: server/commands.c:143
+#: server/commands.c:156
msgid ""
"Choose new ruleset directory or modpack. Calling this\n"
" without any arguments will show you the currently selected ruleset."
@@ -2446,15 +2453,15 @@ msgstr ""
"момент."
#. TRANS: translate text between <> only
-#: server/commands.c:149
+#: server/commands.c:163
msgid "metainfo <meta-line>"
msgstr "metainfo <мета-Ñтрока>"
-#: server/commands.c:150
+#: server/commands.c:164
msgid "Set metaserver info line."
msgstr "УÑтановить Ñтроку информации метаÑервера."
-#: server/commands.c:151
+#: server/commands.c:165
msgid ""
"Set user defined metaserver info line. If parameter is omitted,\n"
"previously set metamessage will be removed. For most of the time\n"
@@ -2467,19 +2474,19 @@ msgstr ""
"метаÑообщение, а не автоÑгенерированное, еÑли оно доÑтупно."
#. TRANS: translate text between <> only
-#: server/commands.c:158
+#: server/commands.c:173
msgid "metapatch <meta-line>"
msgstr "metapatch <мета-Ñтрока>"
-#: server/commands.c:159
+#: server/commands.c:174
msgid "Set metaserver patches line."
msgstr "УÑтановить Ñтроку патчей метаÑервера."
-#: server/commands.c:165
+#: server/commands.c:181
msgid "Control metaserver connection."
msgstr "Контролировать ÑвÑзь Ñ Ð¼ÐµÑ‚Ð°Ñервером."
-#: server/commands.c:166
+#: server/commands.c:182
msgid ""
"'metaconnection ?' reports on the status of the connection to metaserver.\n"
"'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2490,33 +2497,33 @@ msgstr ""
"'metaconnection up' или 'metac u' подключаетÑÑ Ðº метаÑерверу."
#. TRANS: translate text between <> only
-#: server/commands.c:172
+#: server/commands.c:189
msgid "metaserver <address>"
msgstr "metaserver <адреÑ>"
-#: server/commands.c:173
+#: server/commands.c:190
msgid "Set address (URL) for metaserver to report to."
msgstr "УÑтановить Ð°Ð´Ñ€ÐµÑ (URL) метаÑервера, которому будем Ñлать ÑообщениÑ."
#. TRANS: translate text between <> only
-#: server/commands.c:177
+#: server/commands.c:195
msgid "aitoggle <player-name>"
msgstr "aitoggle <имÑ-игрока>"
-#: server/commands.c:178
+#: server/commands.c:196
msgid "Toggle AI status of player."
msgstr "Переключает компьютерное управление игроком на обычное и наоборот."
#. TRANS: translate text between [] and <> only
-#: server/commands.c:182
+#: server/commands.c:201
msgid "take [connection-name] <player-name>"
msgstr "take [имÑ-подключениÑ] <имÑ-игрока>"
-#: server/commands.c:183
+#: server/commands.c:202
msgid "Take over a player's place in the game."
msgstr "ЗанÑÑ‚ÑŒ меÑто игрока в игре."
-#: server/commands.c:184
+#: server/commands.c:203
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 "
@@ -2531,15 +2538,15 @@ msgstr ""
"будет Ñоздан и ÑвÑзан Ñ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸ÐµÐ¼."
#. TRANS: translate text between [] only
-#: server/commands.c:192
+#: server/commands.c:212
msgid "observe [connection-name] [player-name]"
msgstr "observe [имÑ-подключениÑ] [имÑ-игрока]"
-#: server/commands.c:193
+#: server/commands.c:213
msgid "Observe a player or the whole game."
msgstr "Ðаблюдать за игроком или за вÑей игрой."
-#: server/commands.c:194
+#: server/commands.c:214
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 "
@@ -2554,15 +2561,15 @@ msgstr ""
"подключаетÑÑ Ðº глобальному наблюдателю."
#. TRANS: translate text between <> only
-#: server/commands.c:202
+#: server/commands.c:223
msgid "detach <connection-name>"
msgstr "detach <имÑ-ÑоединениÑ>"
-#: server/commands.c:203
+#: server/commands.c:224
msgid "detach from a player."
msgstr "отключить от игрока."
-#: server/commands.c:204
+#: server/commands.c:225
msgid ""
"Only the console and connections with cmdlevel 'hack' can force other "
"connections to detach from a player."
@@ -2571,20 +2578,20 @@ msgstr ""
"заÑтавить чужие Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¿Ð¾Ñ‚ÐµÑ€ÑÑ‚ÑŒ контроль над игроком."
#. TRANS: translate text between <> only
-#: server/commands.c:209
+#: server/commands.c:231
msgid "create <player-name>"
msgstr "create <имÑ-игрока>"
-#: server/commands.c:210
+#: server/commands.c:232
msgid "Create an AI player with a given name."
msgstr "Создать компьютерного игрока Ñ Ð´Ð°Ð½Ð½Ñ‹Ð¼ именем."
-#: server/commands.c:211
+#: server/commands.c:233
msgid ""
"The 'create' command is only available before the game has been started."
msgstr "Команда 'create' доÑтупна только до начала игры."
-#: server/commands.c:215
+#: server/commands.c:238
msgid ""
"away\n"
"away"
@@ -2592,19 +2599,19 @@ msgstr ""
"away\n"
"away"
-#: server/commands.c:217
+#: server/commands.c:240
msgid "Set yourself in away mode. The AI will watch your back."
msgstr ""
"УÑтанавливает у Ð’Ð°Ñ Ñ€ÐµÐ¶Ð¸Ð¼ 'ушел от компьютера'. Компьютер будет пока играть "
"за ВаÑ."
-#: server/commands.c:218
+#: server/commands.c:241
msgid "The AI will govern your nation but do minimal changes."
msgstr ""
"Компьютер будет управлÑÑ‚ÑŒ Вашей Ñтраной, но поÑтараетÑÑ Ð½Ð¸Ñ‡ÐµÐ³Ð¾ не менÑÑ‚ÑŒ."
#. TRANS: translate text between <> only
-#: server/commands.c:222
+#: server/commands.c:246
msgid ""
"novice\n"
"novice <player-name>"
@@ -2612,11 +2619,11 @@ msgstr ""
"novice\n"
"novice <имÑ-игрока>"
-#: server/commands.c:224
+#: server/commands.c:248
msgid "Set one or all AI players to 'novice'."
msgstr "УÑтановить уровень одного или неÑкольких игроков в 'новичок'."
-#: server/commands.c:225
+#: server/commands.c:249
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 "
@@ -2627,7 +2634,7 @@ msgstr ""
"'новичок'. С аргументом уÑтанавливает уровень только Ñтого игрока."
#. TRANS: translate text between <> only
-#: server/commands.c:231
+#: server/commands.c:256
msgid ""
"easy\n"
"easy <player-name>"
@@ -2635,11 +2642,11 @@ msgstr ""
"easy\n"
"easy <Ð¸Ð¼Ñ Ð¸Ð³Ñ€Ð¾ÐºÐ°>"
-#: server/commands.c:233
+#: server/commands.c:258
msgid "Set one or all AI players to 'easy'."
msgstr "УÑтановить уровень одного или неÑкольких игроков как лёгкий."
-#: server/commands.c:234
+#: server/commands.c:259
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 "
@@ -2650,7 +2657,7 @@ msgstr ""
"аргументом уÑтанавливает уровень только Ñтого игрока."
#. TRANS: translate text between <> only
-#: server/commands.c:240
+#: server/commands.c:266
msgid ""
"normal\n"
"normal <player-name>"
@@ -2658,12 +2665,12 @@ msgstr ""
"normal\n"
"normal <Ð¸Ð¼Ñ Ð¸Ð³Ñ€Ð¾ÐºÐ°>"
-#: server/commands.c:242
+#: server/commands.c:268
msgid "Set one or all AI players to 'normal'."
msgstr ""
"УÑтановить уровень одного или неÑкольких компьютерных игроков в нормальный."
-#: server/commands.c:243
+#: server/commands.c:269
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 "
@@ -2674,7 +2681,7 @@ msgstr ""
"аргументом уÑтанавливает уровень только Ñтого игрока."
#. TRANS: translate text between <> only
-#: server/commands.c:249
+#: server/commands.c:276
msgid ""
"hard\n"
"hard <player-name>"
@@ -2682,11 +2689,11 @@ msgstr ""
"hard\n"
"hard <Ð¸Ð¼Ñ Ð¸Ð³Ñ€Ð¾ÐºÐ°>"
-#: server/commands.c:251
+#: server/commands.c:278
msgid "Set one or all AI players to 'hard'."
msgstr "УÑтановить уровень одного или неÑкольких игроков в Ñ‚Ñжелый."
-#: server/commands.c:252
+#: server/commands.c:279
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 "
@@ -2697,7 +2704,7 @@ msgstr ""
"аргументом уÑтанавливает уровень только Ñтого игрока."
#. TRANS: translate text between <> only
-#: server/commands.c:258
+#: server/commands.c:286
msgid ""
"experimental\n"
"experimental <player-name>"
@@ -2705,11 +2712,11 @@ msgstr ""
"experimental\n"
"experimental <Ð¸Ð¼Ñ Ð¸Ð³Ñ€Ð¾ÐºÐ°>"
-#: server/commands.c:260
+#: server/commands.c:288
msgid "Set one or all AI players to 'experimental'."
msgstr "Сделать одного или неÑкольких игроков 'ÑкÑпериментальным'."
-#: server/commands.c:261
+#: server/commands.c:289
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 "
@@ -2723,7 +2730,7 @@ msgstr ""
"Ñерверах, Ñта наÑтройка не играет никакой роли."
#. TRANS: translate text between <> only
-#: server/commands.c:269
+#: server/commands.c:298
msgid ""
"cmdlevel\n"
"cmdlevel <level>\n"
@@ -2737,17 +2744,20 @@ msgstr ""
"cmdlevel <уровень> first\n"
"cmdlevel <уровень> <имÑ-подключениÑ>"
-#: server/commands.c:274
+#: server/commands.c:303
msgid "Query or set command access level access."
msgstr "ЗапроÑить или уÑтановить уровень доÑтупа к командам."
-#: server/commands.c:275
+#: server/commands.c:304
+#, fuzzy
msgid ""
"The command access level controls which server commands are available\n"
"to users via the client chatline. The available levels are:\n"
" none - no commands\n"
-" info - informational commands only\n"
+" info - informational or observer commands only\n"
+" basic - commands available to players in the game\n"
" ctrl - commands that affect the game and users\n"
+" admin - commands that affect server operation\n"
" hack - *all* commands - dangerous!\n"
"With no arguments, the current command access levels are reported.\n"
"With a single argument, the level is set for all existing connections,\n"
@@ -2782,21 +2792,21 @@ msgstr ""
"другой может подключитьÑÑ Ð¿Ð¾Ð´ его именем. Обратите внимание, что указываетÑÑ "
"название подключениÑ, не Ð¸Ð¼Ñ Ð¸Ð³Ñ€Ð¾ÐºÐ°."
-#: server/commands.c:296
+#: server/commands.c:328
msgid "If there is none, become the game organizer with increased permissions."
msgstr ""
"ЕÑли никого нет, Ñтаньте организатором игры Ñ ÑƒÐ²ÐµÐ»Ð¸Ñ‡ÐµÐ½Ð½Ñ‹Ð¼Ð¸ полномочиÑми."
#. TRANS: translate text between <> only
-#: server/commands.c:301
+#: server/commands.c:334
msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
msgstr "timeoutincrease <ход> <инкремент-хода> <значение> <множитель-значениÑ>"
-#: server/commands.c:302
+#: server/commands.c:335
msgid "See \"help timeoutincrease\"."
msgstr "Смотрите \"help timeoutincrease\"."
-#: server/commands.c:303
+#: server/commands.c:336
msgid ""
"Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
"<turn> and multiply <value> by <valuemult>. Use this command in concert "
@@ -2808,24 +2818,43 @@ msgstr ""
"по умолчанию: 0 0 0 1"
#. TRANS: translate text between <> only
-#: server/commands.c:309
+#: server/commands.c:343
+msgid ""
+"cancelvote\n"
+"cancelvote <vote number>\n"
+"cancelvote all\n"
+msgstr ""
+
+#: server/commands.c:346
+msgid "Cancel a running vote.\n"
+msgstr ""
+
+#: server/commands.c:347
+msgid ""
+"With no arguments this command removes your own vote. If you have an admin "
+"access level, you can cancel any vote by vote number, or all votes with the "
+"'all' argument."
+msgstr ""
+
+#. TRANS: translate text between <> only
+#: server/commands.c:354
msgid "endgame"
msgstr "конец игры"
-#: server/commands.c:310
+#: server/commands.c:355
msgid "End the game immediately in a draw."
msgstr "Ðемедленно завершить игру вничью."
#. TRANS: translate text between <> only
-#: server/commands.c:314
+#: server/commands.c:360
msgid "surrender"
msgstr "ÑдалÑÑ"
-#: server/commands.c:315
+#: server/commands.c:361
msgid "Concede the game."
msgstr "СдатьÑÑ."
-#: server/commands.c:316
+#: server/commands.c:362
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."
@@ -2834,15 +2863,15 @@ msgstr ""
"учаÑтники, кроме одного (или одной команды), игра заканчиваетÑÑ."
#. TRANS: translate text between <> only
-#: server/commands.c:322
+#: server/commands.c:369
msgid "remove <player-name>"
msgstr "remove <имÑ-игрока>"
-#: server/commands.c:323
+#: server/commands.c:370
msgid "Fully remove player from game."
msgstr "Удалить игрока из игры полноÑтью."
-#: server/commands.c:324
+#: server/commands.c:371
msgid ""
"This *completely* removes a player from the game, including all cities and "
"units etc. Use with care!"
@@ -2851,7 +2880,7 @@ msgstr ""
"оÑторожны!"
#. TRANS: translate text between <> only
-#: server/commands.c:329
+#: server/commands.c:377
msgid ""
"save\n"
"save <file-name>"
@@ -2859,11 +2888,11 @@ msgstr ""
"save\n"
"save <имÑ-файла>"
-#: server/commands.c:331
+#: server/commands.c:379
msgid "Save game to file."
msgstr "Сохранить игру в файл."
-#: server/commands.c:332
+#: server/commands.c:380
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"
@@ -2880,7 +2909,7 @@ msgstr ""
"и иÑпользуйте команду start как только игроки подключилиÑÑŒ."
#. TRANS: translate text between <> only
-#: server/commands.c:341
+#: server/commands.c:390
msgid ""
"load\n"
"load <file-name>"
@@ -2888,11 +2917,11 @@ msgstr ""
"load\n"
"load <имÑ-файла>"
-#: server/commands.c:343
+#: server/commands.c:392
msgid "Load game from file."
msgstr "Загрузить игру из файла."
-#: server/commands.c:344
+#: server/commands.c:393
msgid ""
"Load a game from <file-name>. Any current data including players, rulesets "
"and server options are lost.\n"
@@ -2901,117 +2930,117 @@ msgstr ""
"правил и наÑтройки Ñервера, терÑÑŽÑ‚ÑÑ.\n"
#. TRANS: translate text between <> only
-#: server/commands.c:349
+#: server/commands.c:399
msgid "read <file-name>"
msgstr "read <имÑ-файла>"
-#: server/commands.c:350
+#: server/commands.c:400
msgid "Process server commands from file."
msgstr "Выполнить команды Ñервера из файла."
#. TRANS: translate text between <> only
-#: server/commands.c:354
+#: server/commands.c:405
msgid "write <file-name>"
msgstr "write <имÑ-файла>"
-#: server/commands.c:355
+#: server/commands.c:406
msgid "Write current settings as server commands to file."
msgstr "ЗапиÑать текущие наÑтройки в файл как команды Ñервера."
-#: server/commands.c:359
+#: server/commands.c:411
msgid "Switch server output between 'RFC-style' and normal style."
msgstr "Переключить Ñтиль иÑходÑщей информации Ñервера между нормальным и RFC."
-#: server/commands.c:363
+#: server/commands.c:416
msgid "Simply returns the id of the server."
msgstr "ПроÑто возвращает id код Ñервера."
-#: server/connecthand.c:85
+#: server/connecthand.c:109
#, c-format
msgid "Welcome to the %s Server running at %s port %d."
msgstr "Добро пожаловать на Ñервер %s работающий на %s, порт %d."
-#: server/connecthand.c:89
+#: server/connecthand.c:113
#, c-format
msgid "Welcome to the %s Server at port %d."
msgstr "Добро пожаловать на Ñервер %s, порт %d."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:97
+#: server/connecthand.c:121
#, fuzzy, c-format
msgid "(%d) %s: connected [%s]"
msgstr "(%d) %s подключилÑÑ Ð¸Ð· %s."
-#: server/connecthand.c:104
+#: server/connecthand.c:128
#, c-format
msgid "Server: %s has connected from %s."
msgstr "Сервер: %s подключилÑÑ Ð¸Ð· %s."
-#: server/connecthand.c:145
+#: server/connecthand.c:175
msgid "Couldn't attach your connection to new player."
msgstr "Ðе можем подключить Ð’Ð°Ñ Ðº новому игроку."
-#: server/connecthand.c:165
+#: server/connecthand.c:199
#, c-format
msgid "You are logged in as '%s' connected to no player."
msgstr "Вы подключены как \"%s\", не подключенный ни к какому игроку."
-#: server/connecthand.c:169
+#: server/connecthand.c:203
#, c-format
msgid "You are logged in as '%s' connected to an anonymous player."
msgstr "Вы подключены как \"%s\", подключенный к анонимному игроку."
-#: server/connecthand.c:174
+#: server/connecthand.c:208
#, c-format
msgid "You are logged in as '%s' connected to %s."
msgstr "Вы подключены как \"%s\", подключенный к %s."
-#: server/connecthand.c:187
+#: server/connecthand.c:221
#, c-format
msgid "Turn-blocking game play: waiting on %s to finish turn..."
msgstr "Игра блокирует ходы: ждем пока %s закончит Ñвой ход..."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:240
+#: server/connecthand.c:274
#, c-format
msgid "(%d) %s: connection request [%s]"
msgstr "(%d) %s: Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ [%s]"
-#: server/connecthand.c:266
+#: server/connecthand.c:300
msgid "The client is missing a capability that this server needs."
msgstr "Клиент не поддерживает возможноÑÑ‚ÑŒ, которую требует Ñтот Ñервер."
-#: server/connecthand.c:268 server/connecthand.c:279
+#: server/connecthand.c:302 server/connecthand.c:313
#, c-format
msgid "(%d) %s rejected: mismatched capabilities!"
msgstr "(%d) %s было отказано в подключении: возможноÑти не Ñовпадают."
-#: server/connecthand.c:277
+#: server/connecthand.c:311
msgid "This server is missing a capability that the client needs."
msgstr "Ðтот Ñервер не поддерживает возможноÑÑ‚ÑŒ которую требует клиент."
-#: server/connecthand.c:290
+#: server/connecthand.c:324
msgid "The username is invalid!"
msgstr "Ðеверное Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ!"
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:292
+#: server/connecthand.c:326
#, c-format
msgid "(%d) %s rejected: invalid username [%s]"
msgstr "(%d) %s отказано в подключении: недопуÑтимое Ð¸Ð¼Ñ [%s]."
-#: server/connecthand.c:303
+#: server/connecthand.c:337
#, fuzzy
msgid "Your username is already connected!"
msgstr "уже подключен."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:305
+#: server/connecthand.c:339
#, fuzzy, c-format
msgid "(%d) %s rejected: duplicate username [%s]"
msgstr "(%d) %s было отказано в подключении: Дублирующий логин [%s]."
-#: server/connecthand.c:335 server/connecthand.c:344
+#: server/connecthand.c:369 server/connecthand.c:378
#, c-format
msgid "Lost connection: %s."
msgstr "Соединение Ñ %s было потерÑно."
@@ -3028,36 +3057,36 @@ msgstr "Ok. УÑтановлен Ñтандартный Ñтиль."
msgid "For introductory help, type 'help'."
msgstr "Ð”Ð»Ñ Ð²Ð²Ð¾Ð´Ð½Ð¾Ð¹ помощи напишите 'help'."
-#: server/diplhand.c:164
+#: server/diplhand.c:167
#, c-format
msgid "The %s can't accept %s."
msgstr "%s не могут принÑÑ‚ÑŒ %s."
-#: server/diplhand.c:176
+#: server/diplhand.c:179
#, c-format
msgid "You don't have tech %s, you can't accept treaty."
msgstr "У Ð’Ð°Ñ Ð½ÐµÑ‚ технологии %s, невозможно заключить договор."
-#: server/diplhand.c:185
+#: server/diplhand.c:188
msgid "City you are trying to give no longer exists, you can't accept treaty."
msgstr ""
"Города, который Ð’Ñ‹ пытаетеÑÑŒ отдать, не ÑущеÑтвует. ÐÐµÐ»ÑŒÐ·Ñ Ð·Ð°ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ договор."
-#: server/diplhand.c:191
+#: server/diplhand.c:194
#, c-format
msgid "You are not owner of %s, you can't accept treaty."
msgstr "Ð’Ñ‹ не владеете %s, Ð½ÐµÐ»ÑŒÐ·Ñ Ð·Ð°ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ договор."
-#: server/diplhand.c:197 server/diplhand.c:301
+#: server/diplhand.c:200 server/diplhand.c:304
#, c-format
msgid "Your capital (%s) is requested, you can't accept treaty."
msgstr "Требуют Вашу Ñтолицу (%s), Ð½ÐµÐ»ÑŒÐ·Ñ Ð·Ð°ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ договор."
-#: server/diplhand.c:224
+#: server/diplhand.c:227
msgid "You don't have enough gold, you can't accept treaty."
msgstr "У Ð’Ð°Ñ Ð½ÐµÐ´Ð¾Ñтаточно денег, невозможно заключить договор."
-#: server/diplhand.c:256 server/diplhand.c:261
+#: server/diplhand.c:259 server/diplhand.c:264
#, c-format
msgid "A treaty containing %d clause was agreed upon."
msgid_plural "A treaty containing %d clauses was agreed upon."
@@ -3065,75 +3094,75 @@ msgstr[0] "Договор, Ñодержащий %d Ñтатью был подп
msgstr[1] "Договор, Ñодержащий %d Ñтатьи был подпиÑан."
msgstr[2] "Договор, Ñодержащий %d Ñтатей был подпиÑан."
-#: server/diplhand.c:277 server/diplhand.c:281
+#: server/diplhand.c:280 server/diplhand.c:284
#, c-format
msgid "One of the cities the %s are giving away is destroyed! Treaty canceled!"
msgstr "Один из городов, который отдаёт %s, уничтожен! Договор отменён!"
-#: server/diplhand.c:288 server/diplhand.c:293
+#: server/diplhand.c:291 server/diplhand.c:296
#, c-format
msgid "The %s no longer control %s! Treaty canceled!"
msgstr "%s более не контролируют %s! Договор отменен!"
-#: server/diplhand.c:331 server/diplhand.c:335
+#: server/diplhand.c:334 server/diplhand.c:338
#, c-format
msgid "The %s don't have the promised amount of gold! Treaty canceled!"
msgstr "%s не имеют обещанное количеÑтво денег! Договор отменен!"
-#: server/diplhand.c:364
+#: server/diplhand.c:367
#, c-format
msgid "You gave an embassy to %s."
msgstr "Ð’Ñ‹ Ñоздали поÑольÑтво в %s."
-#: server/diplhand.c:367
+#: server/diplhand.c:370
#, c-format
msgid "%s allowed you to create an embassy!"
msgstr "%s разрешил Вам Ñоздать поÑольÑтво!"
-#: server/diplhand.c:383
+#: server/diplhand.c:386
#, c-format
msgid "You are taught the knowledge of %s."
msgstr "Вам преподали знание %s."
-#: server/diplhand.c:387
+#: server/diplhand.c:390
#, c-format
msgid "The %s have acquired %s from the %s."
msgstr "%s приобрели %s от %s."
-#: server/diplhand.c:402
+#: server/diplhand.c:405
#, c-format
msgid "You get %d gold."
msgstr "Вы получили %d золотых."
#. TRANS: ... Polish worldmap.
-#: server/diplhand.c:410
+#: server/diplhand.c:413
#, c-format
msgid "You receive the %s worldmap."
msgstr "Вы получили карту мира от %s."
#. TRANS: ... Polish seamap.
-#: server/diplhand.c:419
+#: server/diplhand.c:422
#, c-format
msgid "You receive the %s seamap."
msgstr "Вы получили карту морей от %s."
-#: server/diplhand.c:436
+#: server/diplhand.c:439
#, c-format
msgid "You receive city of %s from %s."
msgstr "Вы захватили город %s у %s."
-#: server/diplhand.c:441
+#: server/diplhand.c:444
#, c-format
msgid "You give city of %s to %s."
msgstr "Ð’Ñ‹ Ñдали город %s. Захватчик - %s."
-#: server/diplhand.c:454 server/diplhand.c:457
+#: server/diplhand.c:457 server/diplhand.c:460
#, c-format
msgid "You agree on a cease-fire with %s."
msgstr "Ð’Ñ‹ договорилиÑÑŒ о прекращении Ð¾Ð³Ð½Ñ Ñ %s."
#. TRANS: ... the Poles ... Polish territory.
-#: server/diplhand.c:476 server/diplhand.c:488
+#: server/diplhand.c:479 server/diplhand.c:491
#, c-format
msgid ""
"You agree on an armistice with the %s. In %d turn, it will become a peace "
@@ -3151,32 +3180,32 @@ msgstr[2] ""
"Ð’Ñ‹ договорилиÑÑŒ о перемирии Ñ %s. Через %d ходов оно преобразуетÑÑ Ð² мирный "
"договор. Выведите Ñвои войÑка Ñ Ñ‚ÐµÑ€Ñ€Ð¸Ñ‚Ð¾Ñ€Ð¸Ð¸, принадлежащей %s."
-#: server/diplhand.c:512 server/diplhand.c:515
+#: server/diplhand.c:515 server/diplhand.c:518
#, c-format
msgid "You agree on an alliance with %s."
msgstr "Ð’Ñ‹ заключили Ñоюз Ñ %s."
-#: server/diplhand.c:524
+#: server/diplhand.c:527
#, c-format
msgid "You give shared vision to %s."
msgstr "Ð’Ñ‹ поделилиÑÑŒ Вашим зрением Ñ %s."
-#: server/diplhand.c:527
+#: server/diplhand.c:530
#, c-format
msgid "%s gives you shared vision."
msgstr "%s поделилиÑÑŒ Ñ Ð’Ð°Ð¼Ð¸ Ñвоим зрением."
-#: server/diplhand.c:663
+#: server/diplhand.c:666
#, c-format
msgid "%s canceled the meeting!"
msgstr "%s отказалиÑÑŒ от переговоров!"
-#: server/diplhand.c:670
+#: server/diplhand.c:673
#, c-format
msgid "Meeting with %s canceled."
msgstr "Ð’Ñтреча Ñ %s прекращена."
-#: server/diplhand.c:712
+#: server/diplhand.c:715
msgid "Your diplomatic envoy was decapitated!"
msgstr "Ваш дипломатичеÑкий поÑланник был обезглавлен!"
@@ -3361,80 +3390,80 @@ msgid "The %s destroyed the %s in %s."
msgstr "%s уничтожили %s в %s."
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1091
+#: server/diplomats.c:1097
#, fuzzy, c-format
msgid "An enemy %s has been eliminated by your %s."
msgstr "ВражеÑкий %s был учитожен Вашим %s."
#. TRANS: <unit> ... <city> ... <diplomat>
-#: server/diplomats.c:1098
+#: server/diplomats.c:1104
#, c-format
msgid "Your %s has been eliminated defending %s against a %s."
msgstr "Ваш %s погиб от руки %s защищаÑÑÑŒ в %s."
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1106
+#: server/diplomats.c:1112
#, fuzzy, c-format
msgid "Your %s has been eliminated defending against a %s."
msgstr "Ваш %s погиб, защищаÑÑÑŒ от %s."
-#: server/diplomats.c:1119
+#: server/diplomats.c:1125
#, c-format
msgid "Your %s was eliminated by a defending %s."
msgstr "Ваш %s погиб защищаÑÑÑŒ в %s."
-#: server/diplomats.c:1127
+#: server/diplomats.c:1133
#, c-format
msgid "Eliminated %s %s while infiltrating %s."
msgstr "%s %s был убит при попытке шпионажа в %s."
-#: server/diplomats.c:1134
+#: server/diplomats.c:1140
#, c-format
msgid "Eliminated %s %s while infiltrating our troops."
msgstr "%s %s был убит при попытке проникнуть в Ваш отрÑд."
-#: server/diplomats.c:1185
+#: server/diplomats.c:1191
#, fuzzy, c-format
msgid ""
"Your %s has successfully completed the mission and returned unharmed to %s."
msgstr "Ваш %s уÑпешно закончил Ñвою миÑÑию и вернулÑÑ Ð² %s."
-#: server/diplomats.c:1204
+#: server/diplomats.c:1210
#, fuzzy, c-format
msgid "Your %s was captured after completing the mission in %s."
msgstr "Ваш %s был пойман поÑле Ð¾ÐºÐ¾Ð½Ñ‡Ð°Ð½Ð¸Ñ Ñвоей миÑÑии в %s."
-#: server/diplomats.c:1210
+#: server/diplomats.c:1216
#, fuzzy, c-format
msgid "Your %s was captured after completing the mission."
msgstr "Ваш %s был пойман поÑле Ð¾ÐºÐ¾Ð½Ñ‡Ð°Ð½Ð¸Ñ Ñвоей миÑÑии."
-#: server/diplomats.c:1242
+#: server/diplomats.c:1248
#, fuzzy, c-format
msgid "You have caused an incident while bribing the %s %s."
msgstr "Вы вызвали инцидент при попытке подкупа %s %s."
-#: server/diplomats.c:1247
+#: server/diplomats.c:1253
#, c-format
msgid "%s has caused an incident while bribing your %s."
msgstr "%s вызвали инцидент при попытке подкупа Ваших %s."
-#: server/diplomats.c:1254
+#: server/diplomats.c:1260
#, c-format
msgid "You have caused an incident while attempting to steal tech from %s."
msgstr "Вы вызвали инцидент при попытке похитить технологию из %s."
-#: server/diplomats.c:1258
+#: server/diplomats.c:1264
#, c-format
msgid "%s has caused an incident while attempting to steal tech from you."
msgstr "%s вызвали инцидент при попытке похитить Вашу технологию."
-#: server/diplomats.c:1264
+#: server/diplomats.c:1270
#, c-format
msgid "You have caused an incident while inciting a revolt in %s."
msgstr "Вы вызвали инцидент при попытке взбунтовать город %s."
-#: server/diplomats.c:1268
+#: server/diplomats.c:1274
#, c-format
msgid "%s have caused an incident while inciting a revolt in %s."
msgstr "%s вызвали инцидент при попытке взбунтовать город %s."
@@ -3549,12 +3578,12 @@ msgstr ""
"Люди рады Ñлышать, что Ваши ученые наконец узнали о железных дорогах.\n"
" Рабочие неожиданно ÑобираютÑÑ Ð¸ ÑтроÑÑ‚ железные дороги во вÑех городах."
-#: server/maphand.c:1418
+#: server/maphand.c:1425
#, c-format
msgid "Moved your %s due to changing terrain."
msgstr "Передвинули Ваш %s в ÑвÑзи Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸ÐµÐ¼ рельефа."
-#: server/maphand.c:1436
+#: server/maphand.c:1443
#, c-format
msgid "Disbanded your %s due to changing terrain."
msgstr "РаÑпуÑтили Ваши %s в ÑвÑзи Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸ÐµÐ¼ рельефа."
@@ -3563,7 +3592,7 @@ msgstr "РаÑпуÑтили Ваши %s в ÑвÑзи Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸ÐµÐ¼
msgid "Not reporting to the metaserver in this game."
msgstr "Ðе ÑвÑзываемÑÑ Ñ Ð¼ÐµÑ‚Ð°Ñервером в Ñтой игре."
-#: server/meta.c:430
+#: server/meta.c:432
#, c-format
msgid "Metaserver: bad address: [%s:%d]."
msgstr "МетаÑервер: неправильный адреÑ: [%s:%d]."
@@ -3692,42 +3721,42 @@ msgid ""
msgstr ""
"Игрок из Вашей команды %s объÑвил войну %s. Ð’Ñ‹ обÑзаны отменить Ñоюз Ñ %s."
-#: server/plrhand.c:1103
+#: server/plrhand.c:1115
#, c-format
msgid "Removing player %s."
msgstr "Убираем игрока %s."
-#: server/plrhand.c:1105
+#: server/plrhand.c:1117
msgid "You've been removed from the game!"
msgstr "Вы были удалены из игры!"
-#: server/plrhand.c:1108
+#: server/plrhand.c:1120
#, c-format
msgid "%s has been removed from the game."
msgstr "%s был удален из игры."
-#: server/plrhand.c:1153 server/plrhand.c:1158
+#: server/plrhand.c:1167 server/plrhand.c:1172
#, c-format
msgid "You have made contact with the %s, ruled by %s."
msgstr "Ð’Ñ‹ вÑтупили в контакт Ñ Ð½Ð°Ñ€Ð¾Ð´Ð¾Ð¼, именуемым %s, их лидер - %s."
-#: server/plrhand.c:1178
+#: server/plrhand.c:1192
#, c-format
msgid ""
"%s and %s meet and go to instant war. You cancel your alliance with both."
msgstr "%s и %s вÑтретилиÑÑŒ и перешли к войне. Ð’Ñ‹ отменили Ваш Ñоюз Ñ Ð¾Ð±Ð¾Ð¸Ð¼Ð¸."
-#: server/plrhand.c:1656
+#: server/plrhand.c:1670
#, c-format
msgid "Could not throw %s into civil war - too many players"
msgstr "%s не могут начать гражданÑкой войны - Ñлишком много игроков"
-#: server/plrhand.c:1663
+#: server/plrhand.c:1677
#, fuzzy, c-format
msgid "Could not throw %s into civil war - no available nations"
msgstr "%s не могут начать гражданÑкой войны - Ñлишком много игроков"
-#: server/plrhand.c:1686
+#: server/plrhand.c:1700
#, fuzzy, c-format
msgid ""
"Your nation is thrust into civil war! %s is declared the leader of the rebel "
@@ -3735,12 +3764,12 @@ msgid ""
msgstr ""
"Ð’ Вашей Ñтране началаÑÑŒ гражданÑÐºÐ°Ñ Ð²Ð¾Ð¹Ð½Ð°, %s объÑвлен лидером повÑтанцев."
-#: server/plrhand.c:1707
+#: server/plrhand.c:1721
#, c-format
msgid "%s declares allegiance to %s."
msgstr "%s перешел на Ñторону %s."
-#: server/plrhand.c:1722
+#: server/plrhand.c:1736
#, c-format
msgid ""
"Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3933,69 +3962,69 @@ msgstr "(ÑтроитÑÑ %s в %s (%s))\n"
msgid "Wonders of the World"
msgstr "ЧудеÑа Света"
-#: server/report.c:547
+#: server/report.c:552
msgid " sq. mi."
msgstr " кв. миль"
-#: server/report.c:557
+#: server/report.c:562
msgid " M tons"
msgstr " M тонн"
-#: server/report.c:562
+#: server/report.c:567
msgid " M goods"
msgstr " М товара"
-#: server/report.c:567
+#: server/report.c:572
msgid " bulbs"
msgstr "лампочек"
-#: server/report.c:572
+#: server/report.c:577
msgid " month"
msgid_plural " months"
msgstr[0] " меÑÑц"
msgstr[1] " меÑÑца"
msgstr[2] " меÑÑцев"
-#: server/report.c:577
+#: server/report.c:582
msgid " ton"
msgid_plural " tons"
msgstr[0] " тонна"
msgstr[1] " тонны"
msgstr[2] " тонн"
-#: server/report.c:591
+#: server/report.c:596
msgid "st"
msgstr "-ый"
-#: server/report.c:593
+#: server/report.c:598
msgid "nd"
msgstr "-ой"
-#: server/report.c:595
+#: server/report.c:600
msgid "rd"
msgstr "-ий"
-#: server/report.c:597
+#: server/report.c:602
msgid "th"
msgstr "-ый"
-#: server/report.c:700
+#: server/report.c:705
msgid "Demography string contains invalid characters. Try \"help demography\"."
msgstr ""
"Строка демографии Ñодержит неправильные Ñимволы. Попробуйте \"help demography"
"\"."
-#: server/report.c:743 server/report.c:768
+#: server/report.c:748 server/report.c:773
msgid "Demographics Report:"
msgstr "ДемографичеÑкий отчет:"
-#: server/report.c:744
+#: server/report.c:749
msgid "Sorry, the Demographics report is unavailable."
msgstr "Извините, демографичеÑкий отчет недоÑтупен."
#. TRANS: <nation adjective> <government name> (<year>).
#. * E.g. "Polish Despotism (200 AD)".
-#: server/report.c:750
+#: server/report.c:755
#, fuzzy, c-format
msgid "%s %s (%s)"
msgstr "%s в %s (%s)\n"
@@ -4006,11 +4035,11 @@ msgstr "%s в %s (%s)\n"
msgid "Could not find a readable \"%s.%s\" ruleset file."
msgstr "Ðе могу найти читаемый файл Ñ Ð½Ð°Ð±Ð¾Ñ€Ð¾Ð¼ правил \"%s.%s\""
-#: server/ruleset.c:2356
+#: server/ruleset.c:2366
msgid "No barbarian nation in rulesets, at least one required!"
msgstr "Ð’ наборе правил нет варварÑких народов, необходим Ñ…Ð¾Ñ‚Ñ Ð±Ñ‹ один!"
-#: server/ruleset.c:3166
+#: server/ruleset.c:3178
msgid "Loading rulesets"
msgstr "Загрузка правил"
@@ -4025,19 +4054,19 @@ msgstr ""
"Ñо Ñтарыми Ñохранёнными играми, или может означать иÑпорченный файл. Будет "
"ли оно работать - неизвеÑтно."
-#: server/savegame.c:3588
+#: server/savegame.c:3587
msgid "Saved game is too old, at least version 1.9.0 required."
msgstr "Ð¡Ð¾Ñ…Ñ€Ð°Ð½Ñ‘Ð½Ð½Ð°Ñ Ð¸Ð³Ñ€Ð° Ñлишком ÑтараÑ, нужна по крайней мере верÑÐ¸Ñ 1.9.0."
#. TRANS: Fatal error message.
-#: server/savegame.c:3815
+#: server/savegame.c:3817
msgid ""
"Saved game uses the \"classic\" terrain ruleset, and is no longer supported."
msgstr ""
"Ð¡Ð¾Ñ…Ñ€Ð°Ð½Ñ‘Ð½Ð½Ð°Ñ Ð¸Ð³Ñ€Ð° иÑпользует \"клаÑÑичеÑкий\" набор рельефа, который больше "
"не поддерживаетÑÑ."
-#: server/savegame.c:3824
+#: server/savegame.c:3826
#, c-format
msgid ""
"Warning: Different rulesetdirs ('%s' and '%s') are no longer supported. "
@@ -4047,7 +4076,7 @@ msgstr ""
"ИÑпользуем '%s'."
#. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4051
+#: server/savegame.c:4055
#, c-format
msgid "%s had invalid nation; changing to %s."
msgstr "У %s - недопуÑтимый народ; изменÑем на %s."
@@ -4080,7 +4109,7 @@ msgstr "Внутренние"
msgid "Networking"
msgstr "Сетевые"
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:734
#: client/gui-win32/dialogs.c:532
msgid "All"
msgstr "Ð’Ñе"
@@ -5313,11 +5342,11 @@ msgstr ""
"log\" каждый ход. Ðта ÑтатиÑтика может быть иÑпользована Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ "
"графиков Ñилы поÑле игры."
-#: server/sernet.c:150
+#: server/sernet.c:151
msgid "Server cannot read standard input. Ignoring input."
msgstr "Сервер не может читать Ñо Ñтандартного ввода. Игнорируем ввод."
-#: server/sernet.c:929
+#: server/sernet.c:933
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr "Сервер: неправильный адреÑ: [%s:%d]."
@@ -5398,50 +5427,50 @@ msgstr ""
msgid "Without guidance from the capital, the %s spaceship is lost!"
msgstr "Без ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¸Ð· Ñтолицы, коÑмичеÑкий корабль %s был утрачен!"
-#: server/srv_main.c:240
+#: server/srv_main.c:242
msgid "Game ended in a draw as end year exceeded"
msgstr "Игра закончилаÑÑŒ вничью, так как Ð²Ñ€ÐµÐ¼Ñ Ð¸Ñтекло"
-#: server/srv_main.c:274
+#: server/srv_main.c:276
#, c-format
msgid "The %s spaceship has arrived at Alpha Centauri."
msgstr "КоÑмичеÑкий корабль %s доÑтиг Ðльфы Центавра."
-#: server/srv_main.c:287 server/srv_main.c:322
+#: server/srv_main.c:289 server/srv_main.c:324
#, c-format
msgid "Team victory to %s"
msgstr "ÐšÐ¾Ð¼Ð°Ð½Ð´Ð½Ð°Ñ Ð¿Ð¾Ð±ÐµÐ´Ð°: %s"
-#: server/srv_main.c:297 server/srv_main.c:338
+#: server/srv_main.c:299 server/srv_main.c:340
#, c-format
msgid "Game ended in victory for %s"
msgstr "Игра окончена. Победили %s"
-#: server/srv_main.c:345
+#: server/srv_main.c:347
msgid "Game ended in a draw"
msgstr "Игра окончена вничью"
-#: server/srv_main.c:461 server/srv_main.c:472
+#: server/srv_main.c:465 server/srv_main.c:476
#, c-format
msgid "Your %s was disbanded in accordance with your peace treaty with the %s."
msgstr ""
"Ваше Ñоединение %s было раÑпущено в ÑоответÑтвии Ñ Ð¼Ð¸Ñ€Ð½Ñ‹Ð¼ договором между "
"Вами и %s."
-#: server/srv_main.c:512 server/srv_main.c:516
+#: server/srv_main.c:516 server/srv_main.c:520
#, c-format
msgid ""
"Concerned citizens point out that the cease-fire with %s will run out soon."
msgstr ""
"Озабоченные граждане напоминают, что прекращение Ð¾Ð³Ð½Ñ Ñ %s Ñкоро закончитÑÑ"
-#: server/srv_main.c:521 server/srv_main.c:525
+#: server/srv_main.c:525 server/srv_main.c:529
#, c-format
msgid "The cease-fire with %s has run out. You are now at war with the %s."
msgstr ""
"Прекращение Ð¾Ð³Ð½Ñ Ñ Ð½Ð°Ñ€Ð¾Ð´Ð¾Ð¼ %s закончилоÑÑŒ. Теперь Ð’Ñ‹ в войне Ñ Ð½Ð°Ñ€Ð¾Ð´Ð¾Ð¼ %s."
-#: server/srv_main.c:542
+#: server/srv_main.c:546
#, c-format
msgid ""
"Ceasefire between %s and %s has run out. They are at war. You cancel your "
@@ -5450,100 +5479,100 @@ msgstr ""
"Прекращение Ð¾Ð³Ð½Ñ Ð¼ÐµÐ¶Ð´Ñƒ %s и %s завершилоÑÑŒ. Они воюют между Ñобой. Ð’Ñ‹ "
"отменили Ñоюз Ñ Ð¾Ð±Ð¾Ð¸Ð¼Ð¸."
-#: server/srv_main.c:961
+#: server/srv_main.c:997
#, c-format
msgid "Failed saving game as %s"
msgstr "Ðе удалоÑÑŒ Ñохранить игру как %s"
-#: server/srv_main.c:963
+#: server/srv_main.c:999
#, c-format
msgid "Game saved as %s"
msgstr "Игра Ñохранена как %s"
-#: server/srv_main.c:994
+#: server/srv_main.c:1030
msgid "The game is already running."
msgstr "Игра уже запущена."
-#: server/srv_main.c:1002
+#: server/srv_main.c:1038
#, c-format
msgid "%s lost control cmdlevel on game start. Use voting from now on."
msgstr ""
"%s лишилÑÑ ÑƒÑ€Ð¾Ð²Ð½Ñ Ð´Ð¾Ñтупа cmdlevel. С Ñтих пор иÑпользуйте голоÑование."
-#: server/srv_main.c:1009
+#: server/srv_main.c:1045
msgid "Starting game."
msgstr "ЗапуÑк игры."
-#: server/srv_main.c:1071
+#: server/srv_main.c:1112
#, c-format
msgid "request for unknown report (type %d)"
msgstr "запрошен неизвеÑтный отчёт (тип %d)"
-#: server/srv_main.c:1136
+#: server/srv_main.c:1177
#, c-format
msgid "Warning: rejecting old client %s"
msgstr "Внимание: отказываем Ñтарому клиенту (%s)"
-#: server/srv_main.c:1238
+#: server/srv_main.c:1279
#, c-format
msgid "Got a packet of type %d from a dead or observer player"
msgstr "Получен пакет типа %d от мёртвого игрока или наблюдателÑ"
-#: server/srv_main.c:1338
+#: server/srv_main.c:1381
msgid "Please choose a non-blank name."
msgstr "Выберите непуÑтое имÑ."
-#: server/srv_main.c:1354
+#: server/srv_main.c:1397
msgid "That nation is already in use."
msgstr "Ðтот народ уже иÑпользуетÑÑ."
-#: server/srv_main.c:1370
+#: server/srv_main.c:1413
#, c-format
msgid "Another player already has the name '%s'. Please choose another name."
msgstr ""
"Другой игрок, назвавший ÑÐµÐ±Ñ '%s', уже приÑоединилÑÑ Ðº игре. ПожалуйÑта, "
"выберите другое имÑ."
-#: server/srv_main.c:1391
+#: server/srv_main.c:1434
msgid "Please choose a name containing only ASCII characters."
msgstr "ПожалуйÑта, выберите имÑ, Ñодержащее только ASCII Ñимволы."
-#: server/srv_main.c:1490
+#: server/srv_main.c:1533
#, c-format
msgid "%s nation is not available in this scenario."
msgstr "Ðарод %s недоÑтупен в данном Ñценарии."
-#: server/srv_main.c:1496
+#: server/srv_main.c:1539
#, c-format
msgid "%s nation is already in use."
msgstr "Ðарод %s уже иÑпользуетÑÑ."
-#: server/srv_main.c:1514
+#: server/srv_main.c:1557
#, c-format
msgid "%s is the %s ruler %s."
msgstr "%s - %s правитель %s."
-#: server/srv_main.c:1570
+#: server/srv_main.c:1613
#, c-format
msgid "Waiting to start game: %d out of %d players are ready to start."
msgstr "Ждём начала игры: %d из %d игроков готовы начать."
-#: server/srv_main.c:1614 server/srv_main.c:1618
+#: server/srv_main.c:1657 server/srv_main.c:1661
#, c-format
msgid "%s has been added as %s level AI-controlled player."
msgstr "%s был добавлен как %s уровень игрока, управлÑемого компьютером."
-#: server/srv_main.c:1760
+#: server/srv_main.c:1803
#, c-format
msgid "Player %d"
msgstr "Игрок %d"
-#: server/srv_main.c:1771 server/srv_main.c:1777
+#: server/srv_main.c:1814 server/srv_main.c:1820
#, c-format
msgid "%s rules the %s."
msgstr "%s правит народом %s."
-#: server/srv_main.c:1942
+#: server/srv_main.c:1985
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
@@ -5551,249 +5580,239 @@ msgstr ""
"Ðта программа Ñервера freeciv поддерживает авторизацию пользователей, но "
"ÑÐµÐ¹Ñ‡Ð°Ñ Ð¾Ð½Ð° не иÑпользуетÑÑ."
-#: server/srv_main.c:1993
+#: server/srv_main.c:2037
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr "ПоÑылаем информацию на метаÑервер [%s]"
-#: server/srv_main.c:2024
+#: server/srv_main.c:2069
msgid "The game is over..."
msgstr "Игра закончена..."
-#: server/srv_main.c:2237
+#: server/srv_main.c:2286
msgid "Now accepting new client connections."
msgstr "ПринимаютÑÑ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð½Ð¾Ð²Ñ‹Ñ… клиентов."
-#: server/stdinhand.c:246
-#, c-format
-msgid "Vote \"%s\" is passed %d to %d with %d abstentions."
-msgstr "ГолоÑование \"%s\" прошло уÑпешно: %d за, %d против, %d воздержалоÑÑŒ."
-
-#: server/stdinhand.c:253
-#, c-format
-msgid "Vote \"%s\" failed with %d against, %d for and %d abstentions."
-msgstr "ГолоÑование \"%s\" не удалоÑÑŒ: %d против, %d за, %d воздержалоÑÑŒ."
-
#. TRANS: ambiguous command
-#: server/stdinhand.c:365
+#: server/stdinhand.c:284
msgid "(ambiguous)"
msgstr "(двуÑмыÑленно)"
#. TRANS: unrecognized command
#. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:416
+#: server/stdinhand.c:287 client/citydlg_common.c:419
#: 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 "(неизвеÑтно)"
-#: server/stdinhand.c:458
+#: server/stdinhand.c:377
msgid "Name is empty, so cannot be a player."
msgstr "Ð˜Ð¼Ñ Ð¿ÑƒÑто, не может быть игроком."
-#: server/stdinhand.c:462
+#: server/stdinhand.c:381
msgid "Name is too long, so cannot be a player."
msgstr "Ð˜Ð¼Ñ Ñлишком длинно, не может быть игроком."
-#: server/stdinhand.c:466
+#: server/stdinhand.c:385
#, c-format
msgid "Player name prefix '%s' is ambiguous."
msgstr "ÐŸÑ€ÐµÑ„Ð¸ÐºÑ Ð¸Ð¼ÐµÐ½Ð¸ игрока '%s' неоднозначен."
-#: server/stdinhand.c:470
+#: server/stdinhand.c:389
#, c-format
msgid "No player by the name of '%s'."
msgstr "Ðет игрока Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ '%s'."
-#: server/stdinhand.c:474 server/stdinhand.c:509
+#: server/stdinhand.c:393 server/stdinhand.c:428
#, c-format
msgid "Unexpected match_result %d (%s) for '%s'."
msgstr "Ðеожиданный результат ÑÑ€Ð°Ð²Ð½ÐµÐ½Ð¸Ñ %d (%s) Ð´Ð»Ñ '%s'."
-#: server/stdinhand.c:493
+#: server/stdinhand.c:412
msgid "Name is empty, so cannot be a connection."
msgstr "Ð˜Ð¼Ñ Ð¿ÑƒÑто, не может быть подключением."
-#: server/stdinhand.c:497
+#: server/stdinhand.c:416
msgid "Name is too long, so cannot be a connection."
msgstr "Ð˜Ð¼Ñ Ñлишком длинно, не может быть подключением."
-#: server/stdinhand.c:501
+#: server/stdinhand.c:420
#, c-format
msgid "Connection name prefix '%s' is ambiguous."
msgstr "ÐŸÑ€ÐµÑ„Ð¸ÐºÑ Ð¸Ð¼ÐµÐ½Ð¸ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ '%s' неоднозначен."
-#: server/stdinhand.c:505
+#: server/stdinhand.c:424
#, c-format
msgid "No connection by the name of '%s'."
msgstr "Ðет Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ '%s'."
-#: server/stdinhand.c:525
+#: server/stdinhand.c:444
#, c-format
msgid "Open metaserver connection to [%s]."
msgstr "Открыто подключение к метаÑерверу [%s]."
-#: server/stdinhand.c:538
+#: server/stdinhand.c:457
#, c-format
msgid "Close metaserver connection to [%s]."
msgstr "Закрыто подключение к метаÑерверу [%s]."
-#: server/stdinhand.c:553
+#: server/stdinhand.c:472
msgid "Metaserver connection is open."
msgstr "Открыто подключение к метаÑерверу."
-#: server/stdinhand.c:556
+#: server/stdinhand.c:475
msgid "Metaserver connection is closed."
msgstr "Закрыто подключение к метаÑерверу."
-#: server/stdinhand.c:566
+#: server/stdinhand.c:485
msgid "Metaserver connection is already open."
msgstr "Подключение к метаÑерверу уже открыто."
-#: server/stdinhand.c:577
+#: server/stdinhand.c:496
msgid "Metaserver connection is already closed."
msgstr "Подключение к метаÑерверу уже закрыто."
-#: server/stdinhand.c:582
+#: server/stdinhand.c:501
msgid "Argument must be 'u', 'up', 'd', 'down', or '?'."
msgstr "Ðргумент должен быть 'u','up','d','down' или '?'."
-#: server/stdinhand.c:603
+#: server/stdinhand.c:522
#, c-format
msgid "Metaserver patches string set to '%s'."
msgstr "Строка патчей Ð´Ð»Ñ Ð¼ÐµÑ‚Ð°Ñервера уÑтановлена в '%s'."
-#: server/stdinhand.c:606
+#: server/stdinhand.c:525
#, c-format
msgid "Metaserver patches string set to '%s', not reporting to metaserver."
msgstr ""
"Строка патчей Ð´Ð»Ñ Ð¼ÐµÑ‚Ð°Ñервера уÑтановлена в '%s', не ÑвÑзаны Ñ Ð¼ÐµÑ‚Ð°Ñервером."
-#: server/stdinhand.c:627
+#: server/stdinhand.c:546
#, c-format
msgid "Metaserver message string set to '%s'."
msgstr "ИнфоÑтрока Ð´Ð»Ñ Ð¼ÐµÑ‚Ð°Ñервера уÑтановлена в '%s'."
-#: server/stdinhand.c:630
+#: server/stdinhand.c:549
#, c-format
msgid "Metaserver message string set to '%s', not reporting to metaserver."
msgstr ""
"ИнфоÑтрока Ð´Ð»Ñ Ð¼ÐµÑ‚Ð°Ñервера уÑтановлена в '%s', не ÑвÑзаны Ñ Ð¼ÐµÑ‚Ð°Ñервером."
-#: server/stdinhand.c:650
+#: server/stdinhand.c:569
#, c-format
msgid "Metaserver is now [%s]."
msgstr "МетаÑервер ÑÐµÐ¹Ñ‡Ð°Ñ [%s]."
-#: server/stdinhand.c:660
+#: server/stdinhand.c:579
#, c-format
msgid "Server id: %s"
msgstr "Код Ñервера: %s"
-#: server/stdinhand.c:757
+#: server/stdinhand.c:676
msgid "You cannot save games manually on this server."
msgstr "Ð’Ñ‹ не можете Ñохранить игру вручную на Ñтом Ñервере."
-#: server/stdinhand.c:774
+#: server/stdinhand.c:693
msgid "Cannot toggle a barbarian player."
msgstr "Ðевозможно переключить варварÑкого игрока."
-#: server/stdinhand.c:781
+#: server/stdinhand.c:700
#, c-format
msgid "%s is now under AI control."
msgstr "%s ÑÐµÐ¹Ñ‡Ð°Ñ ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»Ð¸Ñ€ÑƒeÑ‚ÑÑ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€Ð¾Ð¼."
-#: server/stdinhand.c:802
+#: server/stdinhand.c:721
#, c-format
msgid "%s is now under human control."
msgstr "%s ÑÐµÐ¹Ñ‡Ð°Ñ ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»Ð¸Ñ€ÑƒeÑ‚ÑÑ Ñ‡ÐµÐ»Ð¾Ð²ÐµÐºÐ¾Ð¼"
-#: server/stdinhand.c:847
+#: server/stdinhand.c:766
msgid "Can't add AI players once the game has begun."
msgstr "Ðевозможно добавлÑÑ‚ÑŒ компьютерных игроков поÑле начала игры."
-#: server/stdinhand.c:867
+#: server/stdinhand.c:786
msgid "Can't add more players, server is full."
msgstr "Ðевозможно добавлÑÑ‚ÑŒ игроков, Ñервер полон."
-#: server/stdinhand.c:874
+#: server/stdinhand.c:793
msgid "Can't use an empty name."
msgstr "Ðе возможно иÑпользовать пуÑтое имÑ."
-#: server/stdinhand.c:881
+#: server/stdinhand.c:800
#, c-format
msgid "That name exceeds the maximum of %d chars."
msgstr "Ð˜Ð¼Ñ Ð´Ð»Ð¸Ð½Ð½ÐµÐµ, чем макÑимум из %d Ñимволов."
-#: server/stdinhand.c:887
+#: server/stdinhand.c:806
msgid "That name is not allowed."
msgstr "Ðто Ð¸Ð¼Ñ Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать."
-#: server/stdinhand.c:893
+#: server/stdinhand.c:812
msgid "A player already exists by that name."
msgstr "Игрок Ñ Ñ‚Ð°ÐºÐ¸Ð¼ именем уже ÑущеÑтвует."
-#: server/stdinhand.c:899
+#: server/stdinhand.c:818
msgid "A user already exists by that name."
msgstr "Игрок Ñ Ñ‚Ð°ÐºÐ¸Ð¼ именем уже ÑущеÑтвует."
-#: server/stdinhand.c:925
+#: server/stdinhand.c:844
#, c-format
msgid "%s has been added as an AI-controlled player."
msgstr "%s был добавлен как управлÑемый компьютером игрок."
-#: server/stdinhand.c:932
+#: server/stdinhand.c:851
#, c-format
msgid "Error creating new AI player: %s."
msgstr "Ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ компьютерного игрока: %s."
-#: server/stdinhand.c:966
+#: server/stdinhand.c:885
msgid "Players cannot be removed once the game has started."
msgstr "Игроки не могут быть удалены поÑле запуÑка игры."
-#: server/stdinhand.c:977
+#: server/stdinhand.c:896
#, c-format
msgid "Removed player %s from the game."
msgstr "Удален игрок %s из игры."
-#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
+#: server/stdinhand.c:935 server/stdinhand.c:3372 server/stdinhand.c:3507
#, c-format
msgid "Name \"%s\" disallowed for security reasons."
msgstr "Ð˜Ð¼Ñ \"%s\" запрещено по ÑоображениÑм безопаÑноÑти."
-#: server/stdinhand.c:1029
+#: server/stdinhand.c:948
#, c-format
msgid "No command script found by the name \"%s\"."
msgstr "Командный Ñкрипт Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ \"%s\" не найден."
-#: server/stdinhand.c:1037
+#: server/stdinhand.c:956
#, c-format
msgid "Loading script file: %s"
msgstr "Загрузка Ñкрипт-файла: %s"
-#: server/stdinhand.c:1052
+#: server/stdinhand.c:971
#, c-format
msgid "Cannot read command line scriptfile '%s'."
msgstr "Ðе удалоÑÑŒ прочитать Ñкрипт-файл командной Ñтроки '%s'."
-#: server/stdinhand.c:1054
+#: server/stdinhand.c:973
#, c-format
msgid "Could not read script file '%s'."
msgstr "Ðе удалоÑÑŒ прочитать Ñкрипт-файл '%s'."
-#: server/stdinhand.c:1146
+#: server/stdinhand.c:1065
#, c-format
msgid "Could not write script file '%s'."
msgstr "Ðе удалоÑÑŒ запиÑать Ñкрипт-файл '%s'."
-#: server/stdinhand.c:1158
+#: server/stdinhand.c:1077
msgid "You cannot use the write command on this server for security reasons."
msgstr ""
"Ð’Ñ‹ не можете иÑпользовать на Ñтом Ñервере команду write по ÑоображениÑм "
"безопаÑноÑти."
-#: server/stdinhand.c:1186
+#: server/stdinhand.c:1105
#, c-format
msgid ""
"Cannot decrease command access level '%s' for connection '%s'; you only have "
@@ -5802,236 +5821,231 @@ msgstr ""
"Ðевозможно уменьшить уровень команд '%s' Ð´Ð»Ñ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ '%s'; Ваш уровень "
"только '%s'."
-#: server/stdinhand.c:1241
+#: server/stdinhand.c:1114
+#, c-format
+msgid "Command access level set to '%s' for connection %s."
+msgstr "Уровень доÑтупа к командам уÑтановлен в '%s' Ð´Ð»Ñ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ %s."
+
+#: server/stdinhand.c:1163
#, c-format
msgid ""
"Anyone can now become game organizer '%s' by issuing the 'first' command."
msgstr ""
"Кто угодно может Ñтать организатором игры '%s', выполнив команду 'first'."
-#: server/stdinhand.c:1274
+#: server/stdinhand.c:1187
msgid "Command access levels in effect:"
msgstr "ДейÑтвующие уровни команд:"
-#: server/stdinhand.c:1282
+#: server/stdinhand.c:1194
#, c-format
msgid "Command access level for new connections: %s"
msgstr "Уровень команд Ð´Ð»Ñ Ð½Ð¾Ð²Ñ‹Ñ… подключений: %s"
-#: server/stdinhand.c:1285
+#: server/stdinhand.c:1197
#, c-format
msgid "Command access level for first player to take it: %s"
msgstr "Уровень команд Ð´Ð»Ñ Ð¿ÐµÑ€Ð²Ð¾Ð³Ð¾ взÑвшего его игрока: %s"
-#: server/stdinhand.c:1294
+#: server/stdinhand.c:1206
msgid ""
"Error: command access level must be one of 'none', 'info', 'ctrl', or 'hack'."
msgstr ""
"Ошибка: уровень команд должен быть один из 'none', 'info', 'ctrl', или "
"'hack'."
-#: server/stdinhand.c:1299
+#: server/stdinhand.c:1211
#, c-format
msgid ""
"Cannot increase command access level to '%s'; you only have '%s' yourself."
msgstr "Ðевозможно увеличить уровень команд до '%s'; у Ð’Ð°Ñ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ '%s'"
-#: 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: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:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
+#: server/stdinhand.c:1238 server/stdinhand.c:1252 server/stdinhand.c:1273
#, c-format
msgid "Command access level set to '%s' for new players."
msgstr "Уровень доÑтупа к командам уÑтановлен в '%s' Ð´Ð»Ñ Ð½Ð¾Ð²Ñ‹Ñ… игроков."
-#: server/stdinhand.c:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
+#: server/stdinhand.c:1243 server/stdinhand.c:1257 server/stdinhand.c:1267
#, c-format
msgid "Command access level set to '%s' for first player to grab it."
msgstr "Уровень команд Ð´Ð»Ñ Ð¿ÐµÑ€Ð²Ð¾Ð³Ð¾ взÑвшего его игрока: '%s'"
-#: server/stdinhand.c:1402
+#: server/stdinhand.c:1302
msgid "The 'first' command makes no sense from the server command line."
msgstr "Команда 'first' не имеет ÑмыÑла в командной Ñтроке Ñервера."
-#: server/stdinhand.c:1406
+#: server/stdinhand.c:1306
#, c-format
msgid "You already have command access level '%s' or better."
msgstr "Ð’Ñ‹ ÑÐµÐ¹Ñ‡Ð°Ñ Ð¸Ð¼ÐµÐµÑ‚Ðµ уровень доÑтупа '%s' или выше."
-#: server/stdinhand.c:1411
+#: server/stdinhand.c:1311
msgid "Someone else already is game organizer."
msgstr "Кто-то уже ÑвлÑетÑÑ Ð¾Ñ€Ð³Ð°Ð½Ð¸Ð·Ð°Ñ‚Ð¾Ñ€Ð¾Ð¼ игры."
-#: server/stdinhand.c:1416
+#: server/stdinhand.c:1316
#, c-format
msgid "Connection %s has opted to become the game organizer."
msgstr "Подключение %s выбрано в качеÑтве организатора игры."
-#: server/stdinhand.c:1467
+#: server/stdinhand.c:1367
#, c-format
msgid "Invalid argument %d."
msgstr "Ðеверный аргумент %d"
-#: server/stdinhand.c:1474
+#: server/stdinhand.c:1374
msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
msgstr ""
"ИÑпользование: timeoutincrease <ход> <инкремент-хода> <значение> <множитель-"
"значениÑ>."
-#: server/stdinhand.c:1482
+#: server/stdinhand.c:1382
#, c-format
msgid "Dynamic timeout set to %d %d %d %d"
msgstr "ДинамичеÑкий тайм-аут уÑтановлен в %d %d %d %d"
-#: server/stdinhand.c:1542 server/stdinhand.c:1545
+#: server/stdinhand.c:1442 server/stdinhand.c:1445
msgid "Option:"
msgstr "ÐаÑтройка:"
-#: server/stdinhand.c:1555 server/stdinhand.c:4031
+#: server/stdinhand.c:1455 server/stdinhand.c:4079
msgid "Description:"
msgstr "ОпиÑание:"
-#: server/stdinhand.c:1560
+#: server/stdinhand.c:1460
#, c-format
msgid "Status: %s"
msgstr "СоÑтоÑние: %s"
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "changeable"
msgstr "изменÑемый"
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "fixed"
msgstr "фикÑированный"
-#: server/stdinhand.c:1567
+#: server/stdinhand.c:1467
#, c-format
msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
msgstr "Значение:%d, Минимум: 0, По умолчанию: %d, МакÑимум: 1"
-#: server/stdinhand.c:1572
+#: server/stdinhand.c:1472
#, c-format
msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
msgstr "Значение:%d, Минимум: %d, По умолчанию: %d, МакÑимум: %d"
-#: server/stdinhand.c:1578
+#: server/stdinhand.c:1478
#, c-format
msgid "Value: \"%s\", Default: \"%s\""
msgstr "Значение: \"%s\", По умолчанию: \"%s\""
-#: server/stdinhand.c:1597
+#: server/stdinhand.c:1497
msgid "Explanations are available for the following server options:"
msgstr "ОбъÑÑÐ½ÐµÐ½Ð¸Ñ Ð´Ð¾Ñтупны Ð´Ð»Ñ Ñледующих наÑтроек Ñервера:"
-#: server/stdinhand.c:1643
+#: server/stdinhand.c:1537
msgid "No explanation for that yet."
msgstr "Пока нет объÑÑÐ½ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ñтого."
-#: server/stdinhand.c:1646 server/stdinhand.c:2480
+#: server/stdinhand.c:1540 server/stdinhand.c:2468
msgid "Ambiguous option name."
msgstr "ДвуÑмыÑленное Ð¸Ð¼Ñ Ð½Ð°Ñтройки."
-#: server/stdinhand.c:1666
+#: server/stdinhand.c:1560
#, c-format
msgid "Server Operator: %s"
msgstr "Оператор Сервера: %s"
-#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
+#: server/stdinhand.c:1686 server/stdinhand.c:1713 server/stdinhand.c:1731
#, c-format
msgid "Player '%s' now has AI skill level '%s'."
msgstr "Компьютерный игрок '%s' имеет уровень ÑложноÑти '%s'."
-#: server/stdinhand.c:1822
+#: server/stdinhand.c:1718
#, c-format
msgid "%s is not controlled by the AI."
msgstr "%s контролируетÑÑ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€Ð¾Ð¼."
-#: server/stdinhand.c:1842
+#: server/stdinhand.c:1738
#, c-format
msgid "Default AI skill level set to '%s'."
msgstr "Уровень компьютерных игроков по умолчанию уÑтановлен в '%s'"
-#: server/stdinhand.c:1857 server/stdinhand.c:2162
+#: server/stdinhand.c:1753
msgid "This command is client only."
msgstr "Ðта команда работает только в клиенте."
-#: server/stdinhand.c:1860
+#: server/stdinhand.c:1756
msgid "Usage: away"
msgstr "ИÑпользование: away"
-#: server/stdinhand.c:1865
+#: server/stdinhand.c:1761
msgid "Only players may use the away command."
msgstr "Только игроки могут иÑпользовать команду уйти."
-#: server/stdinhand.c:1869
+#: server/stdinhand.c:1765
#, c-format
msgid "%s set to away mode."
msgstr "%s в режиме 'ушел от компьютера'."
-#: server/stdinhand.c:1877
+#: server/stdinhand.c:1772
#, c-format
msgid "%s returned to game."
msgstr "%s вернулÑÑ Ðº игре."
-#: server/stdinhand.c:1919
+#: server/stdinhand.c:1817
#, c-format
msgid "Sorry, you do not have access to view option '%s'."
msgstr "Извините, Ð’Ñ‹ не имеете доÑтупа к проÑмотру наÑтройки '%s'."
-#: server/stdinhand.c:1925
+#: server/stdinhand.c:1823
#, c-format
msgid "Unknown option '%s'."
msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ Ð½Ð°Ñтройка '%s'."
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1848
msgid "All options with non-default values"
msgstr "Ð’Ñе наÑтройки Ñо значениÑми не по умолчанию"
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1851
msgid "All options"
msgstr "Ð’Ñе наÑтройки"
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1854
msgid "Vital options"
msgstr "ОÑновные наÑтройки"
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1857
msgid "Situational options"
msgstr "Ситуационные наÑтройки"
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1860
msgid "Rarely used options"
msgstr "РедкоиÑпользуемые наÑтройки"
-#: server/stdinhand.c:1965
+#: server/stdinhand.c:1863
msgid "+ means you may change the option"
msgstr "+ значит, что Ð’Ñ‹ можете менÑÑ‚ÑŒ наÑтройку"
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1864
msgid "= means the option is on its default value"
msgstr "= значит, что наÑтройка имеет значение по умолчанию"
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
#, c-format
msgid "%-*s value (min,max) "
msgstr "%-*s значение (мин,макÑ) "
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
msgid "Option"
msgstr "ÐаÑтройка"
-#: server/stdinhand.c:1973
+#: server/stdinhand.c:1871
msgid "description"
msgstr "опиÑание"
-#: server/stdinhand.c:2042
+#: server/stdinhand.c:1940
msgid ""
"Try 'show situational' or 'show rare' to show more options.\n"
"Try 'show changed' to show settings with non-default values."
@@ -6041,78 +6055,151 @@ msgstr ""
"Попробуйте 'show changed' Ð´Ð»Ñ Ð¿Ñ€Ð¾Ñмотра наÑтроек Ñо значениÑми не по "
"умолчанию."
-#: server/stdinhand.c:2092
+#: server/stdinhand.c:1966
msgid "Cannot change teams once game has begun."
msgstr "Ðевозможно Ñменить команду поÑле начала игры."
-#: server/stdinhand.c:2102
+#: server/stdinhand.c:1976
msgid "Undefined argument. Usage: team <player> <team>."
msgstr "Ðеопределённый аргумент. ИÑпользуйте: team <игрок> <команда>."
-#: server/stdinhand.c:2122
+#: server/stdinhand.c:1996
#, c-format
msgid "No such team %s. Please give a valid team name or number."
msgstr ""
"Ðет команды %s. ПожалуйÑта, выберите правильное название команды или номер."
-#: server/stdinhand.c:2129
+#: server/stdinhand.c:2003
msgid "Cannot team a barbarian."
msgstr "Ðевозможно включить варварÑкого игрока в команду."
-#: server/stdinhand.c:2135
+#: server/stdinhand.c:2009
#, c-format
msgid "Player %s set to team %s."
msgstr "Игрок %s в команде: %s"
-#: server/stdinhand.c:2157
-msgid "Undefined arguments. Usage: vote yes|no [vote number]."
-msgstr "Ðеопределённый аргумент. ИÑпользуйте: vote yes|no [номер]."
+#: server/stdinhand.c:2035 server/voting.c:512
+#, fuzzy
+msgid "Teamvote"
+msgstr "Команда"
-#: server/stdinhand.c:2165
-msgid "Observers cannot vote."
-msgstr "Ðаблюдатели не могут голоÑовать."
+#: server/stdinhand.c:2035 server/voting.c:516
+msgid "Vote"
+msgstr ""
-#: server/stdinhand.c:2168
+#: server/stdinhand.c:2037
+#, c-format
msgid ""
-"You can only vote in a running game. Use 'first' to become the game "
-"organizer if there currently is none."
+"%s %d \"%s\" (needs %0.0f%%%s): %d for, %d against, and %d abstained out of %"
+"d players."
msgstr ""
-"Ð’Ñ‹ можете голоÑовать только в начавшейÑÑ Ð¸Ð³Ñ€Ðµ. ИÑпользуйте команду 'first', "
-"чтобы Ñтать организатором игры, еÑли такового ещё нет."
-#: server/stdinhand.c:2181
-#, c-format
-msgid "Vote %d \"%s\": %d for, %d against"
-msgstr "ГолоÑование %d \"%s\": %d за, %d против"
+#: server/stdinhand.c:2041
+msgid " no dissent"
+msgstr ""
-#: server/stdinhand.c:2188
+#: server/stdinhand.c:2049
msgid "There are no votes going on."
msgstr "Ðет активных голоÑований."
-#: server/stdinhand.c:2208
-msgid "No legal last vote."
+#: server/stdinhand.c:2077
+#, fuzzy
+msgid "Invalid arguments. Usage: vote yes|no|abstain [vote number]."
+msgstr "Ðеопределённый аргумент. ИÑпользуйте: vote yes|no [номер]."
+
+#: server/stdinhand.c:2095 server/stdinhand.c:2213 server/stdinhand.c:3714
+msgid "You are not allowed to use this command."
+msgstr "Ð’Ñ‹ не можете пользоватьÑÑ Ñтой командой."
+
+#: server/stdinhand.c:2104
+#, fuzzy, c-format
+msgid "The argument \"%s\" is ambigious."
+msgstr "Ðргумент команды help '%s' неоднозначен."
+
+#: server/stdinhand.c:2119
+#, fuzzy
+msgid "There are no votes running."
+msgstr "Ðет активных голоÑований."
+
+#: server/stdinhand.c:2121
+#, fuzzy, c-format
+msgid "No legal last vote (%d %s)."
msgstr "Ðеверное поÑледнее голоÑование."
-#: server/stdinhand.c:2213
-msgid "Value must be integer."
+#: server/stdinhand.c:2122
+msgid "other vote running"
+msgid_plural "other votes running"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: server/stdinhand.c:2129 server/stdinhand.c:2491 server/stdinhand.c:2532
+msgid "Value must be an integer."
msgstr "Значение должно быть целым чиÑлом."
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2135 server/stdinhand.c:2221
#, c-format
msgid "No such vote (%d)."
msgstr "Ðет такого голоÑÐ¾Ð²Ð°Ð½Ð¸Ñ (%d)."
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2141
+#, fuzzy
+msgid "You are not allowed to vote on that."
+msgstr "Вам не позволено изменÑÑ‚ÑŒ Ñту наÑтройку."
+
+#: server/stdinhand.c:2146
#, c-format
msgid "You voted for \"%s\""
msgstr "Ð’Ñ‹ голоÑовали за \"%s\"."
-#: server/stdinhand.c:2232
+#: server/stdinhand.c:2150
#, c-format
msgid "You voted against \"%s\""
msgstr "Ð’Ñ‹ голоÑовали против \"%s\""
-#: server/stdinhand.c:2259
+#: server/stdinhand.c:2155
+#, c-format
+msgid "You abstained from voting on \"%s\""
+msgstr ""
+
+#: server/stdinhand.c:2190
+msgid "Missing argument <vote number> or the string \"all\"."
+msgstr ""
+
+#: server/stdinhand.c:2197
+#, fuzzy
+msgid "You don't have any vote going on."
+msgstr "У Ð’Ð°Ñ Ð½ÐµÑ‚ рабочего здеÑÑŒ."
+
+#: server/stdinhand.c:2204
+#, fuzzy
+msgid "There isn't any vote going on."
+msgstr "Ðет активных голоÑований."
+
+#: server/stdinhand.c:2209
+msgid "Server: All votes have been removed."
+msgstr ""
+
+#: server/stdinhand.c:2226
+#, fuzzy, c-format
+msgid "You are not allowed to cancel this vote (%d)."
+msgstr "Вам не позволено изменÑÑ‚ÑŒ Ñту наÑтройку."
+
+#: server/stdinhand.c:2232
+msgid "Usage: /cancelvote [<vote number>|all]"
+msgstr ""
+
+#: server/stdinhand.c:2241
+#, c-format
+msgid "Server: %s cancelled the vote \"%s\" (number %d)."
+msgstr ""
+
+#: server/stdinhand.c:2247
+#, c-format
+msgid "Server: The vote \"%s\" (number %d) has been cancelled."
+msgstr ""
+
+#: server/stdinhand.c:2265
msgid ""
"Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
"<x> <y> | unit <id> | tech <player> | timing | info>."
@@ -6121,134 +6208,130 @@ msgstr ""
"<y> | units <x> <y> | unit <идентификатор> | tech <Ð¸Ð¼Ñ Ð¸Ð³Ñ€Ð¾ÐºÐ°> | timing | "
"info>."
-#: server/stdinhand.c:2265
+#: server/stdinhand.c:2271
msgid "Can only use this command once game has begun."
msgstr "Ðту команду можно иÑпользовать только поÑле начала игры."
-#: server/stdinhand.c:2294
+#: server/stdinhand.c:2300
#, c-format
msgid "%s diplomacy no longer debugged"
msgstr "Отладка дипломатии %s выключена"
-#: server/stdinhand.c:2298
+#: server/stdinhand.c:2304
#, c-format
msgid "%s diplomacy debugged"
msgstr "Отладка дипломатии %s включена"
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2323
#, c-format
msgid "%s tech no longer debugged"
msgstr "Отладка технологии %s выключена"
-#: server/stdinhand.c:2321
+#: server/stdinhand.c:2327
#, c-format
msgid "%s tech debugged"
msgstr "Отладка технологии %s включена"
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2358 server/stdinhand.c:2388
msgid "Value 2 & 3 must be integer."
msgstr "Ð—Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ 2 и 3 должны быть целыми чиÑлами."
-#: server/stdinhand.c:2356 server/stdinhand.c:2386
+#: server/stdinhand.c:2362 server/stdinhand.c:2392
msgid "Bad map coordinates."
msgstr "Ðеверные координаты карты."
-#: server/stdinhand.c:2361
+#: server/stdinhand.c:2367
msgid "No city at this coordinate."
msgstr "Ðет города Ñ Ñ‚Ð°ÐºÐ¸Ð¼Ð¸ координатами."
-#: server/stdinhand.c:2366
+#: server/stdinhand.c:2372
#, c-format
msgid "%s no longer debugged"
msgstr "Отладка %s закончена"
-#: server/stdinhand.c:2392 server/stdinhand.c:2422
+#: server/stdinhand.c:2398 server/stdinhand.c:2428
#, c-format
msgid "%s %s no longer debugged."
msgstr "Отладка %s %s закончена."
-#: server/stdinhand.c:2397 server/stdinhand.c:2427
+#: server/stdinhand.c:2403 server/stdinhand.c:2433
#, c-format
msgid "%s %s debugged."
msgstr "Ðачата отладка %s %s."
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2419
msgid "Value 2 must be integer."
msgstr "Значение 2 должно быть целым чиÑлом."
-#: server/stdinhand.c:2417
+#: server/stdinhand.c:2423
#, c-format
msgid "Unit %d does not exist."
msgstr "Соединение %d не ÑущеÑтвует."
-#: server/stdinhand.c:2475
+#: server/stdinhand.c:2464
msgid "Undefined argument. Usage: set <option> <value>."
msgstr "Ðеопределённый аргумент. ИÑпользуйте: set <наÑтройка> <значение>."
-#: server/stdinhand.c:2485
+#: server/stdinhand.c:2473
msgid "You are not allowed to set this option."
msgstr "Вам не позволено изменÑÑ‚ÑŒ Ñту наÑтройку."
-#: server/stdinhand.c:2490 server/stdinhand.c:3463
+#: server/stdinhand.c:2478 server/stdinhand.c:3501
msgid "This setting can't be modified after the game has started."
msgstr "Ðта наÑтройка не может быть изменена поÑле запуÑка игры."
-#: server/stdinhand.c:2502 server/stdinhand.c:2543
-msgid "Value must be an integer."
-msgstr "Значение должно быть целым чиÑлом."
-
-#: server/stdinhand.c:2512
+#: server/stdinhand.c:2501
#, c-format
msgid "The parameter %s should only contain digits 0-1."
msgstr "Параметр %s должен Ñодержать только цифры 0-1."
-#: server/stdinhand.c:2519
+#: server/stdinhand.c:2508
msgid "Value out of range (minimum: 0, maximum: 1)."
msgstr "Значение вне допуÑтимых пределов (минимум: 0, макÑимум: 1)."
-#: server/stdinhand.c:2534 server/stdinhand.c:2576
+#: server/stdinhand.c:2523 server/stdinhand.c:2565
#, c-format
msgid "Option: %s has been set to %d."
msgstr "ÐаÑтройка: %s была уÑтановлена в %d."
-#: server/stdinhand.c:2554
+#: server/stdinhand.c:2543
#, c-format
msgid "The parameter %s should only contain +- and 0-9."
msgstr "Параметр %s должен Ñодержать только +- и 0-9."
-#: server/stdinhand.c:2561
+#: server/stdinhand.c:2550
#, c-format
msgid "Value out of range (minimum: %d, maximum: %d)."
msgstr "Значение вне допуÑтимых пределов (минимум: %d, макÑимум: %d)."
-#: server/stdinhand.c:2586
+#: server/stdinhand.c:2575
msgid "String value too long. Usage: set <option> <value>."
msgstr ""
"Строка Ñимволов Ñлишком длинна. ИÑпользуйте: set <наÑтройка> <значение>"
-#: server/stdinhand.c:2600
+#: server/stdinhand.c:2589
#, c-format
msgid "Option: %s has been set to \"%s\"."
msgstr "ÐаÑтройка: %s уÑтановлена в \"%s\"."
-#: server/stdinhand.c:2658
+#: server/stdinhand.c:2652
msgid "Sorry, one can't observe globally in this game."
msgstr "Извините, вы не можете наблюдать глобально в Ñтой игре."
-#: server/stdinhand.c:2661
+#: server/stdinhand.c:2655
msgid "Sorry, you can't take a global observer. Observe it instead."
msgstr ""
"Извините, вы не можете взÑÑ‚ÑŒ управление глобальным наблюдателем. ВмеÑто "
"Ñтого попробуйте проÑто наблюдать."
-#: server/stdinhand.c:2671
+#: server/stdinhand.c:2665
#, fuzzy
msgid "You cannot take a new player at this time."
msgstr ""
"Извините, в Ñтой игре Ð½ÐµÐ»ÑŒÐ·Ñ Ð±Ñ€Ð°Ñ‚ÑŒ управление игроками, управлÑемыми людьми."
#. TRANS: Do not translate "maxplayers".
-#: server/stdinhand.c:2679
+#: server/stdinhand.c:2673
#, c-format
msgid ""
"You cannot take a new player because the maximum of %d player has already "
@@ -6260,82 +6343,82 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: server/stdinhand.c:2691
+#: server/stdinhand.c:2685
msgid "You cannot take a new player because there are no free player slots."
msgstr ""
-#: server/stdinhand.c:2702
+#: server/stdinhand.c:2696
msgid "Sorry, one can't observe barbarians in this game."
msgstr "Извините, в Ñтой игре запрещено наблюдение за варварами."
-#: server/stdinhand.c:2705
+#: server/stdinhand.c:2699
msgid "Sorry, one can't take barbarians in this game."
msgstr "Извините, в Ñтой игре Ð½ÐµÐ»ÑŒÐ·Ñ Ð±Ñ€Ð°Ñ‚ÑŒ управление варварами."
-#: server/stdinhand.c:2713
+#: server/stdinhand.c:2707
msgid "Sorry, one can't observe dead players in this game."
msgstr "Извините, в Ñтой игре запрещено наблюдение за погибшими игроками."
-#: server/stdinhand.c:2716
+#: server/stdinhand.c:2710
msgid "Sorry, one can't take dead players in this game."
msgstr "Извините, в Ñтой игре Ð½ÐµÐ»ÑŒÐ·Ñ Ð±Ñ€Ð°Ñ‚ÑŒ управление погибшими игроками."
-#: server/stdinhand.c:2724
+#: server/stdinhand.c:2718
msgid "Sorry, one can't observe AI players in this game."
msgstr ""
"Извините, в Ñтой игре запрещено наблюдение за игроками, управлÑемыми "
"компьютером."
-#: server/stdinhand.c:2727
+#: server/stdinhand.c:2721
msgid "Sorry, one can't take AI players in this game."
msgstr ""
"Извините, в Ñтой игре Ð½ÐµÐ»ÑŒÐ·Ñ Ð±Ñ€Ð°Ñ‚ÑŒ управление игроками, управлÑемыми "
"компьютером."
-#: server/stdinhand.c:2736
+#: server/stdinhand.c:2730
msgid "Sorry, one can't observe human players in this game."
msgstr ""
"Извините, в Ñтой игре запрещено наблюдение за игроками, управлÑемыми людьми."
-#: server/stdinhand.c:2739
+#: server/stdinhand.c:2733
msgid "Sorry, one can't take human players in this game."
msgstr ""
"Извините, в Ñтой игре Ð½ÐµÐ»ÑŒÐ·Ñ Ð±Ñ€Ð°Ñ‚ÑŒ управление игроками, управлÑемыми людьми."
-#: server/stdinhand.c:2749
+#: server/stdinhand.c:2743
msgid "Sorry, one can't observe in this game."
msgstr "Извините, в Ñтой игре запрещено наблюдение за игроками."
-#: server/stdinhand.c:2754
+#: server/stdinhand.c:2748
msgid "Sorry, one can't take players in this game."
msgstr "Извините, в Ñтой игре Ð½ÐµÐ»ÑŒÐ·Ñ Ð±Ñ€Ð°Ñ‚ÑŒ управление игроками."
-#: server/stdinhand.c:2760
+#: server/stdinhand.c:2754
msgid "Sorry, one can't take players already connected in this game."
msgstr ""
"Извините, в Ñтой игре Ð½ÐµÐ»ÑŒÐ·Ñ Ð±Ñ€Ð°Ñ‚ÑŒ управление игроками, которые уже "
"подключены."
-#: server/stdinhand.c:2791
+#: server/stdinhand.c:2785
msgid "Usage: observe [connection-name [player-name]]"
msgstr "ИÑпользование: observe [имÑ-Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ [имÑ-игрока]]"
-#: server/stdinhand.c:2797
+#: server/stdinhand.c:2791
msgid "Usage: observe [player-name]"
msgstr "ИÑпользование: observe [имÑ-игрока]"
-#: server/stdinhand.c:2847
+#: server/stdinhand.c:2841
#, c-format
msgid "%s already controls %s. Using 'observe' would remove %s"
msgstr ""
"%s итак контролирует %s. ЕÑли Ð’Ñ‹ иÑпользуете команду 'observe', Ñто уберет %s"
-#: server/stdinhand.c:2858
+#: server/stdinhand.c:2852
#, c-format
msgid "%s is already observing %s."
msgstr "%s уже контролирует %s."
-#: server/stdinhand.c:2863
+#: server/stdinhand.c:2857
#, c-format
msgid "%s is already observing."
msgstr "%s уже ÑвлÑетÑÑ Ð½Ð°Ð±Ð»ÑŽÐ´Ð°Ñ‚ÐµÐ»ÐµÐ¼."
@@ -6350,236 +6433,241 @@ msgstr "%s ÑÐµÐ¹Ñ‡Ð°Ñ Ð½Ð°Ð±Ð»ÑŽÐ´Ð°ÐµÑ‚ за %s"
msgid "%s now observes"
msgstr "%s ÑÐµÐ¹Ñ‡Ð°Ñ ÑвлÑетÑÑ Ð½Ð°Ð±Ð»ÑŽÐ´Ð°Ñ‚ÐµÐ»ÐµÐ¼"
-#: server/stdinhand.c:2969
+#: server/stdinhand.c:2971
msgid "Usage: take <connection-name> <player-name>"
msgstr "ИÑпользуйте: take <имÑ-подключениÑ> <имÑ-игрока>"
-#: server/stdinhand.c:2974
+#: server/stdinhand.c:2976
msgid "Usage: take <player-name>"
msgstr "ИÑпользование: take <имÑ-игрока>"
-#: server/stdinhand.c:2980
+#: server/stdinhand.c:2982
msgid "Usage: take [connection-name] <player-name>"
msgstr "ИÑпользуйте: take [имÑ-подключениÑ] <имÑ-игрока>"
-#: server/stdinhand.c:3010
+#: server/stdinhand.c:3012
#, fuzzy, c-format
msgid "%s already controls %s."
msgstr "%s уже контролирует %s"
-#: server/stdinhand.c:3024
+#: server/stdinhand.c:3026
#, fuzzy, c-format
msgid "There is no free player slot for %s."
msgstr "Ðет игрока или Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ %s."
-#: server/stdinhand.c:3059
+#: server/stdinhand.c:3061
#, c-format
msgid "being detached from %s."
msgstr "отключаетÑÑ Ð¾Ñ‚ %s."
-#: server/stdinhand.c:3135
+#: server/stdinhand.c:3146
#, fuzzy, c-format
msgid "%s now controls %s (%s, %s)."
msgstr "%s ÑÐµÐ¹Ñ‡Ð°Ñ ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»Ð¸Ñ€ÑƒeÑ‚ %s (%s, %s)"
-#: server/stdinhand.c:3139 server/stdinhand.c:4260
+#: server/stdinhand.c:3150 server/stdinhand.c:4308
#: data/nation/barbarian.ruleset:3
msgid "Barbarian"
msgstr "Варвары"
-#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
+#: server/stdinhand.c:3152 server/stdinhand.c:4310 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-sdl/plrdlg.c:645
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr "Компьютер"
-#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-gtk-2.0/pages.c:2125
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
+#: server/stdinhand.c:3153 server/stdinhand.c:4312
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-gtk-2.0/pages.c:2127
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/connectdlg.c:215
msgid "Human"
msgstr "Человек"
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-gtk-2.0/pages.c:2124 client/gui-win32/connectdlg.c:200
-#: client/gui-win32/connectdlg.c:212
+#: server/stdinhand.c:3155 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-gtk-2.0/pages.c:2126 client/gui-win32/connectdlg.c:202
+#: client/gui-win32/connectdlg.c:214
msgid "Alive"
msgstr "Живой"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3156 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-win32/connectdlg.c:202
msgid "Dead"
msgstr "Умер"
-#: server/stdinhand.c:3147
+#: server/stdinhand.c:3159
#, fuzzy, c-format
msgid "%s failed to attach to any player."
msgstr "%s не подключен ни к каким игрокам."
-#: server/stdinhand.c:3182
+#: server/stdinhand.c:3194
msgid "Usage: detach <connection-name>"
msgstr "ИÑпользование: detach <имÑ-подключениÑ>"
-#: server/stdinhand.c:3202
+#: server/stdinhand.c:3214
msgid "You can not detach other users."
msgstr "Вы не можете отключать других пользователей."
-#: server/stdinhand.c:3211
+#: server/stdinhand.c:3223
#, c-format
msgid "%s is not attached to any player."
msgstr "%s не подключен ни к каким игрокам."
-#: server/stdinhand.c:3234
+#: server/stdinhand.c:3246
#, c-format
msgid "%s detaching from %s"
msgstr "%s отключаетÑÑ Ð¾Ñ‚ %s"
-#: server/stdinhand.c:3240
+#: server/stdinhand.c:3252
#, c-format
msgid "%s no longer observing."
msgstr "%s более не ÑвлÑетÑÑ Ð¾Ð±Ð¾Ð·Ñ€ÐµÐ²Ð°Ñ‚ÐµÐ»ÐµÐ¼."
-#: server/stdinhand.c:3259
+#: server/stdinhand.c:3271
#, c-format
msgid "detaching from %s."
msgstr "отключаетÑÑ Ð¾Ñ‚ %s."
-#: server/stdinhand.c:3345
+#: server/stdinhand.c:3361
msgid "Usage: load <game name>"
msgstr "ИÑпользование: load <имÑ-игры>"
-#: server/stdinhand.c:3350
+#: server/stdinhand.c:3366
msgid "Cannot load a game while another is running."
msgstr "Ðевозможно загрузить игру во Ð²Ñ€ÐµÐ¼Ñ Ñ€Ð°Ð±Ð¾Ñ‚Ñ‹ другой игры."
-#: server/stdinhand.c:3372
+#: server/stdinhand.c:3388
#, c-format
msgid "Cannot find savegame or scenario with the name \"%s\"."
msgstr "Ðевозможно найти игру или Ñценарий Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ \"%s\"."
-#: server/stdinhand.c:3389
+#: server/stdinhand.c:3405
#, c-format
msgid "Could not load savefile: %s"
msgstr "Ðевозможно загрузить файл: %s"
-#: server/stdinhand.c:3458
+#: server/stdinhand.c:3496
#, c-format
msgid "Current ruleset directory is \"%s\""
msgstr "Текущий путь Ð´Ð»Ñ Ð´Ð°Ð½Ð½Ñ‹Ñ…: \"%s\""
-#: server/stdinhand.c:3478
+#: server/stdinhand.c:3516
#, c-format
msgid "Ruleset directory \"%s\" not found"
msgstr "Каталог набора правил \"%s\" не найден"
-#: server/stdinhand.c:3484
+#: server/stdinhand.c:3522
#, c-format
msgid "Ruleset directory is already \"%s\""
msgstr "Каталог набора правил уже уÑтановлен в \"%s\""
-#: server/stdinhand.c:3488
+#: server/stdinhand.c:3526
#, c-format
msgid "Ruleset directory set to \"%s\""
msgstr "Каталог набора правил уÑтановлен в \"%s\""
-#: server/stdinhand.c:3536
+#: server/stdinhand.c:3574
msgid "Goodbye."
msgstr "Пока."
-#: server/stdinhand.c:3567
+#: server/stdinhand.c:3606
msgid "Sorry, you are not allowed to use server commands."
msgstr "Извините, Ð’Ñ‹ не можете иÑпользовать команды Ñервера."
-#: server/stdinhand.c:3603
+#: server/stdinhand.c:3656
#, c-format
msgid "Warning: '%s' interpreted as '%s', but it is ambiguous. Try '%shelp'."
msgstr ""
"Внимание: '%s' интерпретировано как '%s', но оно двуÑмыÑленно. Попробуйте '%"
"shelp'."
-#: server/stdinhand.c:3608
+#: server/stdinhand.c:3661
#, c-format
msgid "Unknown command. Try '%shelp'."
msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°. Попробуйте '%shelp'."
-#: server/stdinhand.c:3625
-msgid "Your new vote canceled your previous vote."
+#: server/stdinhand.c:3675
+#, fuzzy
+msgid "Your new vote cancelled your previous vote."
msgstr "Ваше новое голоÑование отменÑет предыдущее голоÑование."
-#: server/stdinhand.c:3633
-#, c-format
-msgid "New vote (number %d) by %s: %s."
+#: server/stdinhand.c:3688
+msgid "New teamvote"
+msgstr ""
+
+#: server/stdinhand.c:3691
+msgid "New vote"
+msgstr ""
+
+#: server/stdinhand.c:3695
+#, fuzzy, c-format
+msgid "%s (number %d) by %s: %s"
msgstr "Ðовое голоÑование (номер %d) от %s: %s."
-#: server/stdinhand.c:3645
+#: server/stdinhand.c:3704
#, c-format
msgid "Your new vote (\"%s\") was not legal or was not recognized."
msgstr "Ваше новое голоÑование (\"%s\") либо недопуÑтимо, либо не раÑпознано."
-#: server/stdinhand.c:3655
-msgid "You are not allowed to use this command."
-msgstr "Ð’Ñ‹ не можете пользоватьÑÑ Ñтой командой."
-
-#: server/stdinhand.c:3680
+#: server/stdinhand.c:3726
msgid "(server prompt)"
msgstr "(приглашение Ñервера)"
-#: server/stdinhand.c:3787
+#: server/stdinhand.c:3835
msgid "Game ended in a draw."
msgstr "Игра окончена вничью."
-#: server/stdinhand.c:3791
+#: server/stdinhand.c:3839
msgid ""
"Ending the game. The server will restart once all clients have disconnected."
msgstr ""
"Заканчиваем игру. Сервер перезагрузитÑÑ ÐºÐ°Ðº только вÑе клиенты отключатÑÑ."
-#: server/stdinhand.c:3796
+#: server/stdinhand.c:3844
msgid "Cannot end the game: no game running."
msgstr "Ðевозможно закончить игру, игра не запущена."
-#: server/stdinhand.c:3812
+#: server/stdinhand.c:3860
#, c-format
msgid "%s has conceded the game and can no longer win."
msgstr "%s покинул игру и теперь не Ñможет выиграть."
-#: server/stdinhand.c:3817
+#: server/stdinhand.c:3865
msgid "You cannot surrender now."
msgstr "Ð’Ñ‹ не можете ÑдатьÑÑ ÑейчаÑ."
-#: server/stdinhand.c:3883
+#: server/stdinhand.c:3931
#, fuzzy
msgid "Not enough human players, game will not start."
msgstr "ÐедоÑтаточно игроков, игра не начнетÑÑ."
-#: server/stdinhand.c:3888
+#: server/stdinhand.c:3936
#, fuzzy
msgid "No players, game will not start."
msgstr "ÐедоÑтаточно игроков, игра не начнетÑÑ."
-#: server/stdinhand.c:3892
+#: server/stdinhand.c:3940
#, fuzzy
msgid "Not enough nations for all players, game will not start."
msgstr "ÐедоÑтаточно игроков, игра не начнетÑÑ."
-#: server/stdinhand.c:3901
+#: server/stdinhand.c:3949
msgid "All players are ready; starting game."
msgstr "Ð’Ñе игроки готовы; начинаем игру."
-#: server/stdinhand.c:3915
+#: server/stdinhand.c:3963
msgid ""
"Cannot start the game: the game is waiting for all clients to disconnect."
msgstr "Ðевозможно начать игру: ждем пока вÑе клиенты отключатÑÑ."
-#: server/stdinhand.c:3922
+#: server/stdinhand.c:3970
msgid "Cannot start the game: it is already running."
msgstr "Ðевозможно начать игру: она уже идет."
-#: server/stdinhand.c:3953
+#: server/stdinhand.c:4001
#, c-format
msgid "Cutting connection %s."
msgstr "Прерываем подключение %s."
-#: server/stdinhand.c:3972
+#: server/stdinhand.c:4020
msgid ""
"Welcome - this is the introductory help text for the Freeciv server.\n"
"\n"
@@ -6618,77 +6706,77 @@ msgstr ""
" save - чтобы Ñохранить игру\n"
" quit - чтобы выйти"
-#: server/stdinhand.c:4007 server/stdinhand.c:4010
+#: server/stdinhand.c:4055 server/stdinhand.c:4058
msgid "Command:"
msgstr "Команда:"
-#: server/stdinhand.c:4014
+#: server/stdinhand.c:4062
msgid "Synopsis: "
msgstr "ÐšÑ€Ð°Ñ‚ÐºÐ°Ñ Ñправка:"
-#: server/stdinhand.c:4023
+#: server/stdinhand.c:4071
#, c-format
msgid "Level: %s"
msgstr "Уровень: %s"
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4096
msgid "The following server commands are available:"
msgstr "Следующие команды Ñервера доÑтупны:"
-#: server/stdinhand.c:4123
+#: server/stdinhand.c:4171
#, c-format
msgid "Help argument '%s' is ambiguous."
msgstr "Ðргумент команды help '%s' неоднозначен."
-#: server/stdinhand.c:4128
+#: server/stdinhand.c:4176
#, c-format
msgid "No match for help argument '%s'."
msgstr "Справка по '%s' не найдена."
-#: server/stdinhand.c:4194
+#: server/stdinhand.c:4242
#, c-format
msgid "Bad list argument: '%s'. Try '%shelp list'."
msgstr "Плохой аргумент команды list: '%s'. Попробуйте '%shelp list'."
-#: server/stdinhand.c:4234
+#: server/stdinhand.c:4282
msgid "List of players:"
msgstr "СпиÑок игроков:"
-#: server/stdinhand.c:4239
+#: server/stdinhand.c:4287
msgid "<no players>"
msgstr "<нет игроков>"
-#: server/stdinhand.c:4256
+#: server/stdinhand.c:4304
#, c-format
msgid "user %s, "
msgstr "пользователь %s, "
-#: server/stdinhand.c:4267
+#: server/stdinhand.c:4315
msgid ", Dead"
msgstr ", Умер"
-#: server/stdinhand.c:4270
+#: server/stdinhand.c:4318
#, c-format
msgid ", difficulty level %s"
msgstr ", уровень ÑложноÑти %s"
#. TRANS: continue list, in case comma is not the separator of choice.
-#: server/stdinhand.c:4275 server/stdinhand.c:4279 client/helpdata.c:257
-#: client/helpdata.c:752 client/text.c:241 client/text.c:1224
-#: client/text.c:1262
+#: server/stdinhand.c:4323 server/stdinhand.c:4327 client/helpdata.c:257
+#: client/helpdata.c:752 client/text.c:241 client/text.c:1229
+#: client/text.c:1267
#, c-format
msgid "?clistmore:, %s"
msgstr ", %s"
-#: server/stdinhand.c:4283
+#: server/stdinhand.c:4331
msgid ", ready"
msgstr ", готов"
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4333
msgid ", not ready"
msgstr ", не готов"
-#: server/stdinhand.c:4293
+#: server/stdinhand.c:4341
#, c-format
msgid " %d connection:"
msgid_plural " %d connections:"
@@ -6696,21 +6784,21 @@ msgstr[0] " %d Ñоединение:"
msgstr[1] " %d ÑоединениÑ:"
msgstr[2] " %d Ñоединений:"
-#: server/stdinhand.c:4299
+#: server/stdinhand.c:4347
#, c-format
msgid " %s from %s (command access level %s), bufsize=%dkb"
msgstr " %s из %s (уровень команд %s), размер буфера=%dкб"
-#: server/stdinhand.c:4304
+#: server/stdinhand.c:4352
msgid " (observer mode)"
msgstr " (наблюдатель)"
-#: server/stdinhand.c:4322
+#: server/stdinhand.c:4370
msgid "List of teams:"
msgstr "СпиÑок команд:"
#. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4332
+#: server/stdinhand.c:4380
#, c-format
msgid "%2d : '%s' : %d player"
msgid_plural "%2d : '%s' : %d players"
@@ -6718,25 +6806,25 @@ msgstr[0] "%2d : '%s' : %d игрок"
msgstr[1] "%2d : '%s' : %d игрока"
msgstr[2] "%2d : '%s' : %d игроков"
-#: server/stdinhand.c:4352
+#: server/stdinhand.c:4400
#, c-format
msgid "%2d : '%s' : 1 player : %s"
msgstr "%2d : '%s' : 1 игрок : %s"
-#: server/stdinhand.c:4360
+#: server/stdinhand.c:4408
#, c-format
msgid "Empty team: %s"
msgstr "ПуÑÑ‚Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°: %s"
-#: server/stdinhand.c:4371
+#: server/stdinhand.c:4419
msgid "List of connections to server:"
msgstr "СпиÑок Ñоединений Ñ Ñервером:"
-#: server/stdinhand.c:4375
+#: server/stdinhand.c:4423
msgid "<no connections>"
msgstr "<нет Ñоединений>"
-#: server/stdinhand.c:4399
+#: server/stdinhand.c:4447
msgid "List of scenarios available:"
msgstr "СпиÑок доÑтупных Ñценариев:"
@@ -6755,7 +6843,7 @@ msgstr "%s изучили Технологию Будущего %d."
msgid "%s acquired from %s!"
msgstr "%s приобретено от %s!"
-#: server/techtools.c:220
+#: server/techtools.c:221
#, c-format
msgid ""
"Discovery of %s makes the government form %s available. You may want to "
@@ -6764,37 +6852,37 @@ msgstr ""
"Открытие %s делает доÑтупной форму Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ %s. Ð’Ñ‹ можете захотеть начать "
"революцию."
-#: server/techtools.c:301
+#: server/techtools.c:302
#, c-format
msgid "Discovery of %s OBSOLETES %s in %s!"
msgstr "Открытие %s делает %s в %s УСТÐРЕВШИМ!"
-#: server/techtools.c:351
+#: server/techtools.c:352
#, c-format
msgid "Learned %s. Our scientists focus on %s; goal is %s."
msgstr "Изучено %s. Ðаши учёные концентрируютÑÑ Ð½Ð° %s; цель - %s."
-#: server/techtools.c:369
+#: server/techtools.c:370
#, c-format
msgid "Learned %s. Scientists choose to research %s."
msgstr "Изучено %s. Учёные выбрали Ð´Ð»Ñ Ð¸ÑÑÐ»ÐµÐ´Ð¾Ð²Ð°Ð½Ð¸Ñ %s."
-#: server/techtools.c:376
+#: server/techtools.c:377
#, c-format
msgid "Learned %s. "
msgstr "Изучено %s. "
-#: server/techtools.c:379
+#: server/techtools.c:380
#, c-format
msgid "Researching %s."
msgstr "ИзучаетÑÑ %s."
-#: server/techtools.c:385
+#: server/techtools.c:386
#, c-format
msgid "Learned %s. Scientists do not know what to research next."
msgstr "Изучено %s. Учёные не знают, что иÑÑледовать дальше."
-#: server/techtools.c:402
+#: server/techtools.c:403
msgid ""
"Great scientists from all the world join your civilization: you get an "
"immediate advance."
@@ -6802,22 +6890,22 @@ msgstr ""
"Величайшие учёные вÑего мира приÑоединилиÑÑŒ к Вашей цивилизации - Ð’Ñ‹ "
"получаете немедленное открытие."
-#: server/techtools.c:570
+#: server/techtools.c:571
#, c-format
msgid "Technology goal is %s."
msgstr "ТехнологичеÑÐºÐ°Ñ Ñ†ÐµÐ»ÑŒ - %s."
-#: server/techtools.c:700
+#: server/techtools.c:708
#, c-format
msgid "You steal %s from the %s."
msgstr "Вы украли %s у %s."
-#: server/techtools.c:705
+#: server/techtools.c:713
#, c-format
msgid "The %s stole %s from you!"
msgstr "%s украли у Ð’Ð°Ñ %s!"
-#: server/techtools.c:710
+#: server/techtools.c:718
#, c-format
msgid "The %s have stolen %s from the %s."
msgstr "%s украли %s у %s."
@@ -6841,156 +6929,162 @@ msgstr "Ðет Ñоединений Ð´Ð»Ñ Ð¼Ð¾Ð´ÐµÑ€Ð½Ð¸Ð·Ð°Ñ†Ð¸Ð¸."
msgid "%s upgraded to %s for %d gold."
msgstr "%s модернизирован до %s за %d золота."
-#: server/unithand.c:396
+#: server/unithand.c:402
#, c-format
msgid "%s refuses to disband!"
msgstr "%s отказываетÑÑ Ñ€Ð°ÑпуÑкатьÑÑ!"
-#: server/unithand.c:449
+#: server/unithand.c:455
msgid "Can't place city here."
msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð¿Ð¾Ñтроить здеÑÑŒ город."
-#: server/unithand.c:456
+#: server/unithand.c:462
#, c-format
msgid "Only %s can build a city."
msgstr "Только %s может Ñтроить город."
-#: server/unithand.c:461
+#: server/unithand.c:467
msgid "Can't build a city."
msgstr "Ðе могу поÑтроить город.."
-#: server/unithand.c:470
+#: server/unithand.c:476
#, c-format
msgid "Only %s can add to a city."
msgstr "Только %s может увеличивать город."
-#: server/unithand.c:475
+#: server/unithand.c:481
msgid "Can't add to a city."
msgstr "Ðе могу добавить к городу."
-#: server/unithand.c:481
+#: server/unithand.c:487
#, c-format
msgid "%s unit has no moves left to add to %s."
msgstr "У ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ %s не оÑталоÑÑŒ ходов, чтобы добавить к %s."
-#: server/unithand.c:487
+#: server/unithand.c:493
#, c-format
msgid "%s unit has no moves left to build city."
msgstr "У ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ %s не оÑталоÑÑŒ ходов, чтобы поÑтроить город."
-#: server/unithand.c:492
+#. TRANS: <city> is owned by <nation>, cannot add <unit>.
+#: server/unithand.c:499
+#, fuzzy, c-format
+msgid "%s is owned by %s, cannot add %s."
+msgstr "%s Ñлишком велик, чтобы добавить %s."
+
+#: server/unithand.c:506
#, c-format
msgid "%s is too big to add %s."
msgstr "%s Ñлишком велик, чтобы добавить %s."
-#: server/unithand.c:498
+#: server/unithand.c:512
#, c-format
msgid "%s needs an improvement to grow, so you cannot add %s."
msgstr ""
"Городу %s требуютÑÑ ÑƒÐ»ÑƒÑ‡ÑˆÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ñ€Ð¾Ñта, поÑтому Ð’Ñ‹ не можете добавить %s."
-#: server/unithand.c:509
+#: server/unithand.c:523
#, c-format
msgid "Can't add %s to %s."
msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ‚ÑŒ %s к %s."
-#: server/unithand.c:531
+#: server/unithand.c:545
#, c-format
msgid "%s added to aid %s in growing."
msgstr "%s добавлены, чтобы помочь роÑту города %s."
-#: server/unithand.c:828
+#: server/unithand.c:842
msgid "Your Nuclear missile was shot down by SDI defences, what a waste."
msgstr "Ваша Ð°Ñ‚Ð¾Ð¼Ð½Ð°Ñ Ñ€Ð°ÐºÐµÑ‚Ð° была Ñбита защитой СОИ."
-#: server/unithand.c:831
+#: server/unithand.c:845
#, c-format
msgid "The nuclear attack on %s was avoided by your SDI defense."
msgstr "ÐÑ‚Ð¾Ð¼Ð½Ð°Ñ Ð°Ñ‚Ð°ÐºÐ° на %s была уничтожена защитой СОИ."
#. TRANS: "Your Cannon ... the Polish Destroyer."
-#: server/unithand.c:901
+#: server/unithand.c:915
#, c-format
msgid "Your %s survived the pathetic attack from the %s %s."
msgstr "Ваши %s выжили в результате неудачной атаки %s %s."
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unithand.c:910
+#: server/unithand.c:924
#, c-format
msgid "Your attacking %s failed against the %s %s!"
msgstr "Ваши атакующие %s потерпели поражение от %s %s!"
-#: server/unithand.c:983
+#: server/unithand.c:997
#, c-format
msgid "Only %s can attack from sea."
msgstr "Только %s может атаковать Ñ Ð¼Ð¾Ñ€Ñ."
-#: server/unithand.c:988
+#: server/unithand.c:1002
msgid "Cannot attack from sea."
msgstr "Ðевозможно атаковать Ñ Ð¼Ð¾Ñ€Ñ."
-#: server/unithand.c:996 server/unittools.c:2137
+#: server/unithand.c:1010 server/unittools.c:2142
msgid "Cannot attack unless you declare war first."
msgstr "Ðевозможно атаковать пока не объÑвлена война."
-#: server/unithand.c:1001
+#: server/unithand.c:1015
#, c-format
msgid "%s can only move into your own zone of control."
msgstr "%s может двинутьÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ в ÑобÑтвенную зону контролÑ."
-#: server/unithand.c:1007
+#: server/unithand.c:1021
#, c-format
msgid "Cannot invade unless you break peace with %s first."
msgstr "Ðевозможно вторгатьÑÑ, пока не Ð’Ñ‹ не разорвали мирный договор Ñ %s."
-#: server/unithand.c:1052
+#: server/unithand.c:1066
msgid "This unit has no moves left."
msgstr "Ðто Ñоединение больше не имеет ходов."
-#: server/unithand.c:1107
+#: server/unithand.c:1121
msgid "Unit must be on land to perform diplomatic action."
msgstr ""
"Соединение должно быть на земле, чтобы выполнÑÑ‚ÑŒ дипломатичеÑкие функции."
-#: server/unithand.c:1109
+#: server/unithand.c:1123
msgid "No diplomat action possible."
msgstr "Ðевозможны никакие дипломатичеÑкие функции."
-#: server/unithand.c:1125
+#: server/unithand.c:1139
#, c-format
msgid "You must declare war on %s first. Try using players dialog (F3)."
msgstr "Ð’Ñ‹ должны первым объÑвить войну %s. ИÑпользуйте диалог Игроки (F3)."
-#: server/unithand.c:1143
+#: server/unithand.c:1157
msgid "This unit is being transported, and so cannot bombard."
msgstr ""
"Ðто Ñоединение уже было перемещено и не может быть Ñброшено на парашюте."
-#: server/unithand.c:1158
+#: server/unithand.c:1172
msgid "You can't attack there."
msgstr "Ð’Ñ‹ не можете атаковать здеÑÑŒ."
-#: server/unithand.c:1180
+#: server/unithand.c:1194
msgid "This type of troops cannot take over a city."
msgstr "Ðтот тип войÑк не может захватить город."
-#: server/unithand.c:1198
+#: server/unithand.c:1212
msgid "A transported unit is not allied to all units or city on target tile."
msgstr ""
"Перевозимое Ñоединение не ÑвлÑетÑÑ Ñоюзником вÑех Ñоединений или города на "
"заданном квадрате."
-#: server/unithand.c:1240
+#: server/unithand.c:1254
#, c-format
msgid "Your %s helps build the %s in %s (%d remaining)."
msgstr "Ваш %s помогает Ñтроить %s в %s (оÑталоÑÑŒ %d)."
-#: server/unithand.c:1242
+#: server/unithand.c:1256
#, c-format
msgid "Your %s helps build the %s in %s (%d surplus)."
msgstr "Ваш %s помогает Ñтроить %s в %s (%d - лишнее)."
-#: server/unithand.c:1286
+#: server/unithand.c:1300
#, c-format
msgid ""
"Sorry, your %s cannot establish a trade route because it has no home city"
@@ -6998,28 +7092,28 @@ msgstr ""
"Извините, Ваш %s не может уÑтановить торговый путь, потому что у него нет "
"домашнего города."
-#: server/unithand.c:1296
+#: server/unithand.c:1310
#, c-format
msgid "Sorry, your %s cannot establish a trade route between %s and %s"
msgstr "Извините, Ваш %s не может уÑтановить торговый путь между %s и %s"
-#: server/unithand.c:1325 server/unithand.c:1344
+#: server/unithand.c:1339 server/unithand.c:1358
#, c-format
msgid "Sorry, your %s cannot establish a trade route here!"
msgstr "Извините, Ваш %s не может уÑтановить здеÑÑŒ торговый путь!"
-#: server/unithand.c:1329 server/unithand.c:1348
+#: server/unithand.c:1343 server/unithand.c:1362
#, c-format
msgid " The city of %s already has %d better trade routes!"
msgstr " Город %s уже имеет %d лучших торговых путей!"
-#: server/unithand.c:1361 server/unithand.c:1373
+#: server/unithand.c:1375 server/unithand.c:1387
#, c-format
msgid "Sorry, %s has canceled the trade route from %s to your city %s."
msgstr ""
"Извините, %s отменил торговый маршрут от города %s до Вашего города %s."
-#: server/unithand.c:1406
+#: server/unithand.c:1420
#, c-format
msgid ""
"Your %s from %s has arrived in %s, and revenues amount to %d in gold and "
@@ -7080,56 +7174,56 @@ msgid "Teleported your %s to %s."
msgstr "ПеренеÑено Ваш %s в %s."
#. TRANS: A unit is moved to resolve stack conflicts.
-#: server/unittools.c:1065
+#: server/unittools.c:1070
#, fuzzy, c-format
msgid "Moved your %s."
msgstr "Ваши %s раÑпущены."
-#: server/unittools.c:1076
+#: server/unittools.c:1081
#, c-format
msgid "Disbanded your %s."
msgstr "Ваши %s раÑпущены."
-#: server/unittools.c:1397
+#: server/unittools.c:1402
#, c-format
msgid "Unable to defend %s, %s has lost the game."
msgstr "Ðевозможно защитить %s, %s проиграл игру."
-#: server/unittools.c:1401
+#: server/unittools.c:1406
#, c-format
msgid "Losing %s meant losing the game! Be more careful next time!"
msgstr ""
"ÐŸÐ¾Ñ‚ÐµÑ€Ñ %s означает поражение в игре! Будьте более оÑторожны в Ñледующий раз!"
-#: server/unittools.c:1503
+#: server/unittools.c:1508
#, c-format
msgid "%s escaped the destruction of %s, and fled to %s."
msgstr "Ваш %s избежал гибели в %s, и убежал в %s."
-#: server/unittools.c:1512
+#: server/unittools.c:1517
#, c-format
msgid "%s lost when %s was lost."
msgstr "Ð’Ñ‹ потерÑли %s когда %s был потерÑн."
-#: server/unittools.c:1561
+#: server/unittools.c:1566
#, c-format
msgid "Barbarian leader captured, %d gold ransom paid."
msgstr "Лидер варваров пойман, выкуп %d золотых."
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unittools.c:1579
+#: server/unittools.c:1584
#, c-format
msgid "Your attacking %s succeeded against the %s %s!"
msgstr "Ваши атакующие %s победили %s %s!"
#. TRANS: "Cannon ... the Polish Destroyer."
-#: server/unittools.c:1588 server/unittools.c:1646
+#: server/unittools.c:1593 server/unittools.c:1651
#, c-format
msgid "%s lost to an attack by the %s %s."
msgstr "Ð’Ñ‹ потерÑли %s в результате атаки %s %s."
#. TRANS: "... Cannon ... the Polish Destroyer ...."
-#: server/unittools.c:1622
+#: server/unittools.c:1627
#, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -7140,14 +7234,14 @@ msgstr[2] "Ваши атакующие %s победили %s %s (и %d друг
#. TRANS: "Cannon lost when the Polish Destroyer
#. * attacked the German Musketeers."
-#: server/unittools.c:1655
+#: server/unittools.c:1660
#, c-format
msgid "%s lost when the %s %s attacked the %s %s."
msgstr "%s потерÑны, когда %s %s атаковали %s %s."
#. TRANS: "Musketeers (and Cannon) lost to an
#. * attack from the Polish Destroyer."
-#: server/unittools.c:1670
+#: server/unittools.c:1675
#, c-format
msgid "%s (and %s) lost to an attack from the %s %s."
msgstr "%s (и %s) потерÑны в результате атаки %s %s."
@@ -7155,7 +7249,7 @@ msgstr "%s (и %s) потерÑны в результате атаки %s %s."
#. TRANS: "Musketeers and 3 other units lost to
#. * an attack from the Polish Destroyer."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1680
+#: server/unittools.c:1685
#, 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."
@@ -7166,7 +7260,7 @@ msgstr[2] "%s и %d других Ñоединений потерÑны в рез
#. TRANS: "2 units lost when the Polish Destroyer
#. * attacked the German Musketeers."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1694
+#: server/unittools.c:1699
#, 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."
@@ -7174,173 +7268,215 @@ msgstr[0] "%d Ñоединение потерÑно, когда %s %s атако
msgstr[1] "%d ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð¿Ð¾Ñ‚ÐµÑ€Ñны, когда %s %s атаковали %s %s."
msgstr[2] "%d Ñоединений потерÑно, когда %s %s атаковали %s %s."
-#: server/unittools.c:1962
+#: server/unittools.c:1967
#, c-format
msgid "Your %s was nuked by %s."
msgstr "Ваш %s был взорван атомной бомбой %s."
-#: server/unittools.c:1965 server/unittools.c:1981
+#: server/unittools.c:1970 server/unittools.c:1986
msgid "yourself"
msgstr "Ð’Ñ‹"
-#: server/unittools.c:1969
+#: server/unittools.c:1974
#, c-format
msgid "The %s %s was nuked."
msgstr "%s %s был взорван атомной бомбой."
-#: server/unittools.c:1978
+#: server/unittools.c:1983
#, c-format
msgid "%s was nuked by %s."
msgstr "%s был взорван атомной бомбой %s."
-#: server/unittools.c:1986
+#: server/unittools.c:1991
#, c-format
msgid "You nuked %s."
msgstr "Вы взорвали %s атомной бомбой."
-#: server/unittools.c:2027
+#: server/unittools.c:2032
#, c-format
msgid "The %s detonated a nuke!"
msgstr "%s взорвали атомную бомбу!"
-#: server/unittools.c:2051
+#: server/unittools.c:2056
#, c-format
msgid "%s transported successfully."
msgstr "%s перевезен уÑпешно."
-#: server/unittools.c:2103
+#: server/unittools.c:2108
msgid "This unit type can not be paradropped."
msgstr "Ðто Ñоединение не может быть Ñброшено на парашюте."
-#: server/unittools.c:2113
+#: server/unittools.c:2118
#, fuzzy
msgid "You cannot paradrop a unit that is transporting other units."
msgstr "Ð’Ñ‹ не можете деÑантировать транÑпортное Ñоединение."
-#: server/unittools.c:2119
+#: server/unittools.c:2124
msgid "The destination location is not known."
msgstr "Положение цели неизвеÑтно."
-#: server/unittools.c:2126
+#: server/unittools.c:2131
#, c-format
msgid "This unit cannot paradrop into %s."
msgstr "Ðевозможно ÑброÑить Ñто Ñоединение в %s."
-#: server/unittools.c:2146
+#: server/unittools.c:2151
#, c-format
msgid "The distance to the target (%i) is greater than the unit's range (%i)."
msgstr "РаÑÑтоÑние до цели (%i) больше чем возможноÑти ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ (%i)."
-#: server/unittools.c:2157
+#: server/unittools.c:2162
#, c-format
msgid "Your %s paradropped into the %s and was lost."
msgstr "Ваши %s были Ñброшены в %s и были потерÑны."
-#: server/unittools.c:2170
+#: server/unittools.c:2175
#, c-format
msgid "Your %s was killed by enemy units at the paradrop destination."
msgstr "Ваши %s были уничтожены врагами в точке парашютной выÑадки."
-#: server/unittools.c:2192
+#: server/unittools.c:2197
#, c-format
msgid "You found %d gold."
msgstr "Вы нашли %d золотых."
-#: server/unittools.c:2209
+#: server/unittools.c:2214
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr "Ð’Ñ‹ нашли опиÑание науки \"%s\" в древней рукопиÑи."
-#: server/unittools.c:2216
+#: server/unittools.c:2221
#, c-format
msgid "The %s have acquired %s from ancient scrolls of wisdom."
msgstr "%s получили %s из древних мануÑкриптов."
-#: server/unittools.c:2230
+#: server/unittools.c:2235
msgid "A band of friendly mercenaries joins your cause."
msgstr "Группа дружеÑтвенных наемников приÑоединÑетÑÑ Ðº Вам."
-#: server/unittools.c:2248
+#: server/unittools.c:2253
msgid "An abandoned village is here."
msgstr "Ðта Ð´ÐµÑ€ÐµÐ²Ð½Ñ Ð¾Ñтавлена жителÑми."
-#: server/unittools.c:2258
+#: server/unittools.c:2263
msgid "You have unleashed a horde of barbarians!"
msgstr "Ваше Ñоединение вÑтретило орды варваров!"
-#: server/unittools.c:2261
+#: server/unittools.c:2266
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr "Ваши %s были уничтожены варварами."
-#: server/unittools.c:2277
+#: server/unittools.c:2282
msgid "You found a friendly city."
msgstr "Ð’Ñ‹ нашли дружеÑтвенный город."
-#: server/unittools.c:2291
+#: server/unittools.c:2296
msgid "Friendly nomads are impressed by you, and join you."
msgstr ""
"К Вам приÑоединилиÑÑŒ дружеÑтвенные кочевники, потрÑÑённые Вашим могущеÑтвом."
-#: server/unittools.c:2316
+#: server/unittools.c:2321
msgid "Your overflight frightens the tribe; they scatter in terror."
msgstr "Ваш перелёт пугает племÑ, оно разбегаетÑÑ Ð² ужаÑе."
-#: server/unittools.c:2574
+#: server/unittools.c:2579
#, c-format
msgid "Orders for %s aborted after enemy movement was spotted."
msgstr "Приказы Ð´Ð»Ñ %s отменены поÑле Ð¾Ð±Ð½Ð°Ñ€ÑƒÐ¶ÐµÐ½Ð¸Ñ Ð´Ð²Ð¸Ð¶ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¾Ñ‚Ð¸Ð²Ð½Ð¸ÐºÐ°."
-#: server/unittools.c:3023
+#: server/unittools.c:3028
#, c-format
msgid "Orders for %s aborted as there are units nearby."
msgstr "Приказы Ð´Ð»Ñ %s отменены, так как поблизоÑти обнаружены ÑоединениÑ."
-#: server/unittools.c:3075
+#: server/unittools.c:3080
#, c-format
msgid "Orders for %s aborted because building of city failed."
msgstr "Приказы Ð´Ð»Ñ %s отменены, поÑкольку ÑтроительÑтво города прервалоÑÑŒ."
-#: server/unittools.c:3088
+#: server/unittools.c:3093
#, c-format
msgid "Orders for %s aborted since they give an invalid activity."
msgstr "Приказ Ð´Ð»Ñ %s отменён, невозможно выполнить приказ."
-#: server/unittools.c:3102
+#: server/unittools.c:3107
#, c-format
msgid "Orders for %s aborted since they give an invalid location."
msgstr "Приказ Ð´Ð»Ñ %s отменён, поÑкольку было указано неверное направление."
-#: server/unittools.c:3112
+#: server/unittools.c:3117
#, c-format
msgid "Orders for %s aborted as there are units in the way."
msgstr "%s отменил команду ИДТИ К, Ñ‚.к. другие ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð½Ð°Ñ…Ð¾Ð´ÑÑ‚ÑÑ Ð½Ð° дороге."
-#: server/unittools.c:3138
+#: server/unittools.c:3143
#, c-format
msgid "Orders for %s aborted because of failed move."
msgstr "Приказ Ð´Ð»Ñ %s отменён потому что Ñоединение не может двигатьÑÑ."
-#: server/unittools.c:3179
+#: server/unittools.c:3184
#, c-format
msgid "Attempt to change homecity for %s failed."
msgstr "Попытка поменÑÑ‚ÑŒ домашний город на %s провалилаÑÑŒ."
-#: server/unittools.c:3190
+#: server/unittools.c:3195
#, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr "Попытка уÑтановить торговый путь в %s провалилаÑÑŒ."
-#: server/unittools.c:3202
+#: server/unittools.c:3207
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr "Попытка поÑтроить чудо %s провалилаÑÑŒ."
-#: server/unittools.c:3211
+#: server/unittools.c:3216
#, c-format
msgid "Your %s has invalid orders."
msgstr "Ваш %s получил неверный приказ."
+#: server/voting.c:522
+#, fuzzy, c-format
+msgid ""
+"%s %d \"%s\" is passed %d to %d with %d abstentions and %d who did not vote."
+msgstr "ГолоÑование \"%s\" прошло уÑпешно: %d за, %d против, %d воздержалоÑÑŒ."
+
+#: server/voting.c:528
+#, fuzzy, c-format
+msgid ""
+"%s %d \"%s\" failed with %d against, %d for, %d abstentions and %d who did "
+"not vote."
+msgstr "ГолоÑование \"%s\" не удалоÑÑŒ: %d против, %d за, %d воздержалоÑÑŒ."
+
+#: server/voting.c:548
+#, c-format
+msgid "%s %d: %s voted yes."
+msgstr ""
+
+#: server/voting.c:553
+#, c-format
+msgid "%s %d: %s voted no."
+msgstr ""
+
+#: server/voting.c:558
+#, c-format
+msgid "%s %d: %s chose to abstain."
+msgstr ""
+
+#. TRANS: Describing a new vote that can only pass
+#. * if there are no dissenting votes.
+#: server/voting.c:726
+#, c-format
+msgid "%s (needs %0.0f%% and no dissent)."
+msgstr ""
+
+#. TRANS: Describing a new vote that can pass only if the
+#. * given percentage of players votes 'yes'.
+#: server/voting.c:732
+#, c-format
+msgid "%s (needs %0.0f%% in favor)."
+msgstr ""
+
#: server/generator/mapgen.c:1771
msgid "High landmass - this may take a few seconds."
msgstr "Ð’Ñ‹Ñокий процент земли - Ñто может занÑÑ‚ÑŒ неÑколько Ñекунд."
@@ -7372,14 +7508,14 @@ msgstr ""
"Возможно, количеÑтво игроков Ñлишком велико Ð´Ð»Ñ Ð´Ð°Ð½Ð½Ð¾Ð¹ карты.\n"
"ПожалуйÑта, Ñообщите об Ñтой ошибке по адреÑу %s."
-#: client/attribute.c:363
+#: client/attribute.c:368
msgid ""
"There has been a CMA error. Your citizen governor settings may be broken."
msgstr ""
"Произошла ошибка Губернатора. Ваши уÑтановки Губернатора могут быть "
"неправильными."
-#: client/attribute.c:367
+#: client/attribute.c:372
msgid "Old attributes detected and removed."
msgstr "Обнаружены и удалены Ñтарые атрибуты."
@@ -7528,41 +7664,41 @@ msgstr "%+4d : Граждане\n"
msgid "%+4d : Taxed from trade\n"
msgstr "%+4d : Ðалоги от торговли\n"
-#: client/citydlg_common.c:418
+#: client/citydlg_common.c:421
#, c-format
msgid "%+4d : Trade route with %s\n"
msgstr "%+4d : Торговые пути Ñ %s\n"
-#: client/citydlg_common.c:427
+#: client/citydlg_common.c:430
#, c-format
msgid "%+4d : Building tithes\n"
msgstr "%+4d : Зданий, деÑÑтки\n"
-#: client/citydlg_common.c:450
+#: client/citydlg_common.c:453
#, c-format
msgid "%+4d : Bonus from %s (%+d%%)\n"
msgstr "%+4d : Ð‘Ð¾Ð½ÑƒÑ Ð¾Ñ‚ %s (%+d%%)\n"
-#: client/citydlg_common.c:462
+#: client/citydlg_common.c:465
#, c-format
msgid "%+4d : Waste\n"
msgstr "%+4d : Потери\n"
-#: client/citydlg_common.c:468
+#: client/citydlg_common.c:471
#, c-format
msgid "%+4d : Disorder\n"
msgstr "%+4d : БеÑпорÑдки\n"
-#: client/citydlg_common.c:474
+#: client/citydlg_common.c:477
#, c-format
msgid "%+4d : Used\n"
msgstr "%+4d : ИÑпользовано\n"
-#: client/citydlg_common.c:479
+#: client/citydlg_common.c:482
msgid "==== : Adds up to\n"
msgstr "==== : Добавить до\n"
-#: client/citydlg_common.c:481
+#: client/citydlg_common.c:484
#, c-format
msgid "%4d : Total surplus"
msgstr "%4d : Ð’Ñего в оÑтатке"
@@ -7871,54 +8007,54 @@ msgstr "?ÑпециалиÑÑ‚:С"
msgid "Specialists"
msgstr "СпециалиÑÑ‚Ñ‹"
-#: client/civclient.c:240
+#: client/civclient.c:241
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr " -a, --autoconnect\tПропуÑтить диалог подключениÑ\n"
-#: client/civclient.c:250
+#: client/civclient.c:251
msgid " -l, --log FILE\tUse FILE as logfile (spawned server also uses this)\n"
msgstr ""
" -l, --log FILE\tИÑпользовать FILE Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи журнала (Ñервер также "
"иÑпользует Ñту команду)\n"
-#: client/civclient.c:252
+#: client/civclient.c:253
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr " -m, --meta HOST\tПодключитьÑÑ Ðº метаÑерверу HOST\n"
-#: client/civclient.c:254
+#: client/civclient.c:255
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr " -n, --name NAME\tИÑпользовать NAME как имÑ\n"
-#: client/civclient.c:256
+#: client/civclient.c:257
msgid " -p, --port PORT\tConnect to server port PORT (usually with -a)\n"
msgstr ""
" -p, --port PORT\tПодключитьÑÑ Ðº порту PORT Ñервера (обычно вмеÑте Ñ -a)\n"
-#: client/civclient.c:258
+#: client/civclient.c:259
#, c-format
msgid " -P, --Plugin PLUGIN\tUse PLUGIN for sound output %s\n"
msgstr " -P, --Plugin PLUGIN\tИÑпользовать PLUGIN Ð´Ð»Ñ Ð·Ð²ÑƒÐºÐ¾Ð²Ð¾Ð³Ð¾ вывода %s\n"
-#: client/civclient.c:260
+#: client/civclient.c:261
msgid " -r, --read FILE\tRead startup script FILE (for spawned server only)\n"
msgstr ""
" -r, --read FILE\tПрочитать начальный Ñкрипт FILE (только Ð´Ð»Ñ Ñервера)\n"
-#: client/civclient.c:263
+#: client/civclient.c:264
msgid " -s, --server HOST\tConnect to the server at HOST (usually with -a)\n"
msgstr ""
" -s, --server HOST\tПодключитьÑÑ Ðº Ñерверу HOST (обычно вмеÑте Ñ -a)\n"
-#: client/civclient.c:265
+#: client/civclient.c:266
msgid " -S, --Sound FILE\tRead sound tags from FILE\n"
msgstr " -S, --Sound FILE\tПрочитать звуковую информацию из FILE\n"
-#: client/civclient.c:266
+#: client/civclient.c:267
msgid " -t, --tiles FILE\tUse data file FILE.tilespec for tiles\n"
msgstr ""
" -t, --tiles FILE\tИÑпользовать файл данных FILE.tilespec Ð´Ð»Ñ Ñчеек карты\n"
-#: client/civclient.c:269
+#: client/civclient.c:270
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7929,45 +8065,45 @@ msgstr ""
"информациÑ.\n"
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:274
+#: client/civclient.c:275
#, fuzzy, c-format
msgid "Report bugs at %s\n"
msgstr "Сообщайте об ошибках по адреÑу %s.\n"
-#: client/civclient.c:298
+#: client/civclient.c:299
#, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr "Ðеверный порт \"%s\" указан наÑтройкой --port.\n"
-#: client/civclient.c:300 client/civclient.c:315
+#: client/civclient.c:301 client/civclient.c:316
msgid "Try using --help.\n"
msgstr "Попробуйте иÑпользовать --help.\n"
-#: client/civclient.c:313
+#: client/civclient.c:314
#, c-format
msgid "Invalid debug level \"%s\" specified with --debug option.\n"
msgstr "Ðеверный уровень наÑтройки \"%s\" указан наÑтройкой --debug.\n"
-#: client/civclient.c:326
+#: client/civclient.c:327
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr "ÐепонÑÑ‚Ð½Ð°Ñ Ð½Ð°Ñтройка: \"%s\"\n"
-#: client/civclient.c:391
+#: client/civclient.c:393
#, fuzzy, c-format
msgid "Updating old metaserver address \"%s\"."
msgstr "metaserver <адреÑ>"
-#: client/civclient.c:394
+#: client/civclient.c:396
#, fuzzy, c-format
msgid "Default metaserver has been set to \"%s\"."
msgstr "ÐаÑтройка: %s уÑтановлена в \"%s\"."
-#: client/civclient.c:550
+#: client/civclient.c:540
msgid "Game started."
msgstr "Игра началаÑÑŒ."
-#: client/civclient.c:588
+#: client/civclient.c:606
msgid "There was an error while auto connecting; aborting."
msgstr "Ошибка во Ð²Ñ€ÐµÐ¼Ñ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ, прерываем выполнение."
@@ -8097,18 +8233,18 @@ msgstr "Соединение в процеÑÑе."
msgid "Disconnected from server."
msgstr "ОтключилиÑÑŒ от Ñервера."
-#: client/clinet.c:469
+#: client/clinet.c:473
#, c-format
msgid "Failed to contact server \"%s\" at port %d as \"%s\" after %d attempts"
msgstr ""
"Ðе удалоÑÑŒ подключитьÑÑ Ðº Ñерверу \"%s\", порт %d, как \"%s\" поÑле %d "
"попыток"
-#: client/clinet.c:484 client/clinet.c:486
+#: client/clinet.c:488 client/clinet.c:490
msgid "Connection to server refused. Please start the server."
msgstr "Ð’ подключении к Ñерверу отказано. ПожалуйÑта запуÑтите Ñервер."
-#: client/clinet.c:495 client/clinet.c:523
+#: client/clinet.c:499 client/clinet.c:527
#, c-format
msgid ""
"Error contacting server \"%s\" at port %d as \"%s\":\n"
@@ -8117,7 +8253,7 @@ msgstr ""
"Ошибка Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ðº Ñерверу \"%s\", порт %d как \"%s\":\n"
" %s\n"
-#: client/clinet.c:514
+#: client/clinet.c:518
#, c-format
msgid ""
"Auto-connecting to server \"%s\" at port %d as \"%s\" every %f second(s) for "
@@ -8126,53 +8262,53 @@ msgstr ""
"ÐвтоматичеÑки подключаемÑÑ Ðº Ñерверу \"%s\", порт %d, как \"%s\", каждые %f "
"Ñекунд, %d раз"
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
+#: client/connectdlg_common.c:78 client/gui-gtk-2.0/pages.c:1358
msgid "novice"
msgstr "новичок"
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1358
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
msgid "easy"
msgstr "лёгкий"
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1359
msgid "normal"
msgstr "нормальный"
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr "Ñ‚Ñжёлый"
-#: client/connectdlg_common.c:83
+#: client/connectdlg_common.c:82
msgid "experimental"
msgstr "ÑкÑпериментальный"
-#: client/connectdlg_common.c:213
+#: client/connectdlg_common.c:212
msgid "Starting server..."
msgstr "ЗапуÑк Ñервера..."
-#: client/connectdlg_common.c:332
+#: client/connectdlg_common.c:331
msgid "Couldn't start the server."
msgstr "Ðевозможно Ñтартовать Ñервер."
-#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
+#: client/connectdlg_common.c:332 client/connectdlg_common.c:365
msgid "You'll have to start one manually. Sorry..."
msgstr "Ð’Ñ‹ должны запуÑтить Ñервер вручную. Извините..."
-#: client/connectdlg_common.c:364
+#: client/connectdlg_common.c:363
msgid "Couldn't connect to the server."
msgstr "Ðевозможно подключитьÑÑ Ðº Ñерверу."
-#: client/connectdlg_common.c:365
+#: client/connectdlg_common.c:364
msgid "We probably couldn't start it from here."
msgstr "Возможно, мы не Ñможем Ñтартовать отÑюда."
-#: client/connectdlg_common.c:470
+#: client/connectdlg_common.c:469
#, fuzzy
msgid ""
"Established control over the server. You have command access level 'hack'."
msgstr "У Ð’Ð°Ñ ÐµÑÑ‚ÑŒ доÑтуп к наÑтройкам Ñервера (ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð°Ñ Ñтрока)"
-#: client/connectdlg_common.c:475
+#: client/connectdlg_common.c:474
msgid ""
"Failed to obtain the required access level to take control of the server. "
"The server will now be shutdown."
@@ -8182,27 +8318,27 @@ msgstr ""
msgid "Only transporter units can be unloaded."
msgstr "Ð’Ñ‹ можете разгрузить только транÑпортирующие ÑоединениÑ."
-#: client/control.c:1425
+#: client/control.c:1417
msgid "Only settler units can be put into auto mode."
msgstr "Только колониÑÑ‚Ñ‹ могут быть уÑтановлены в авто-режим."
-#: client/control.c:1516
+#: client/control.c:1511
msgid "Only nuclear units can do this."
msgstr "Только атомные ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð¼Ð¾Ð³ÑƒÑ‚ делать Ñто."
-#: client/control.c:1545
+#: client/control.c:1540
msgid "Only paratrooper units can do this."
msgstr "Только парашютиÑÑ‚Ñ‹ могут делать Ñто."
-#: client/control.c:2020
+#: client/control.c:2015
msgid "Too far for this unit."
msgstr "Слишком далеко Ð´Ð»Ñ Ñтого ÑоединениÑ."
-#: client/control.c:2230 client/control.c:2260 client/control.c:2276
+#: client/control.c:2225 client/control.c:2255 client/control.c:2271
msgid "Didn't find a route to the destination!"
msgstr "Ðе найден путь к цели!"
-#: client/control.c:2320
+#: client/control.c:2315
msgid "Oh my! You seem to have no capital!"
msgstr "Ой! Ру Ð’Ð°Ñ Ð²Ñ€Ð¾Ð´Ðµ бы нет Ñтолицы!"
@@ -8608,28 +8744,36 @@ msgstr "* %s уменьшает риÑк до 12%%.\n"
#. * last two elements
#. TRANS: List of possible output types has this between
#. * last two elements
-#: client/helpdata.c:1066 client/helpdata.c:1400
+#: client/helpdata.c:1066 client/helpdata.c:1408
msgid " or "
msgstr " или "
-#: client/helpdata.c:1068 client/helpdata.c:1388
+#: client/helpdata.c:1068 client/helpdata.c:1396
msgid "?or:, "
msgstr "?или:, "
-#: client/helpdata.c:1080
-#, 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"
+#: client/helpdata.c:1079
+#, fuzzy, c-format
+msgid "* Unit has to be in a city, or a base after %d turn.\n"
+msgid_plural "* Unit has to be in a city, or a base after %d turns.\n"
+msgstr[0] "Соединение должно быть в городе или на %s поÑле %d хода.\n"
+msgstr[1] "Соединение должно быть в городе или на %s поÑле %d ходов.\n"
+msgstr[2] "Соединение должно быть в городе или на %s поÑле %d ходов.\n"
+
+#: client/helpdata.c:1087
+#, fuzzy, c-format
+msgid "* Unit has to be in a city, a base, or on a %s after %d turn.\n"
+msgid_plural "* Unit has to be in a city, a base, or on a %s after %d turns.\n"
msgstr[0] "Соединение должно быть в городе или на %s поÑле %d хода.\n"
msgstr[1] "Соединение должно быть в городе или на %s поÑле %d ходов.\n"
msgstr[2] "Соединение должно быть в городе или на %s поÑле %d ходов.\n"
-#: client/helpdata.c:1122
+#: client/helpdata.c:1130
#, c-format
msgid "If we would now start with %s we would need %d bulbs."
msgstr "ЕÑли мы начнем %s, нам потребуетÑÑ %d лампочек."
-#: client/helpdata.c:1127
+#: client/helpdata.c:1135
#, c-format
msgid ""
"To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8638,88 +8782,88 @@ msgstr ""
"Ð”Ð»Ñ Ñ‚Ð¾Ð³Ð¾, чтобы доÑтичь технологию %s, нам нужно приобреÑти еще %d "
"технологий. ВеÑÑŒ проект потребует %d лампочек Ð´Ð»Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ñ."
-#: client/helpdata.c:1135
+#: client/helpdata.c:1143
msgid "You cannot research this technology."
msgstr "Ð’Ñ‹ не можете иÑÑледовать Ñту технологию."
-#: client/helpdata.c:1139
+#: client/helpdata.c:1147
msgid " This number may vary depending on what other players will research.\n"
msgstr " Ðто чиÑло может завиÑеть от того, что изобретут другие игроки.\n"
-#: client/helpdata.c:1151
+#: client/helpdata.c:1159
#, c-format
msgid "* The first player to research %s gets an immediate advance.\n"
msgstr "* Первый игрок, открывший %s, получает немедленное открытие.\n"
-#: client/helpdata.c:1156
+#: client/helpdata.c:1164
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
msgstr "* Уменьшает вероÑтноÑÑ‚ÑŒ утери кораблей в океане до 25%%.\n"
-#: client/helpdata.c:1159
+#: client/helpdata.c:1167
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
msgstr "* Уменьшает вероÑтноÑÑ‚ÑŒ утери кораблей в океане до 12%%.\n"
-#: client/helpdata.c:1163
+#: client/helpdata.c:1171
msgid "* Increases the pollution generated by the population.\n"
msgstr "* Увеличивает загрÑзнениÑ, Ñоздаваемые наÑелением.\n"
-#: client/helpdata.c:1168
+#: client/helpdata.c:1176
#, c-format
msgid "* Allows %s to build roads on river squares.\n"
msgstr "* ПозволÑет Ñоединению %s Ñтроить дороги на речных квадратах.\n"
-#: client/helpdata.c:1175
+#: client/helpdata.c:1183
#, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr "* ПозволÑет Ñоединению %s Ñтроить крепоÑти.\n"
-#: client/helpdata.c:1183
+#: client/helpdata.c:1191
#, c-format
msgid "* Allows %s to build airbases.\n"
msgstr "* ПозволÑет Ñоединению %s Ñтроить аÑродромы.\n"
-#: client/helpdata.c:1192
+#: client/helpdata.c:1200
#, c-format
msgid "* Allows %s to upgrade roads to railroads.\n"
msgstr "* ПозволÑет Ñоединению %s обновлÑÑ‚ÑŒ дороги до железных дорог.\n"
-#: client/helpdata.c:1200
+#: client/helpdata.c:1208
#, c-format
msgid "* Allows %s to upgrade irrigation to farmland.\n"
msgstr "* ПозволÑет Ñоединению %s обновлÑÑ‚ÑŒ Ð¾Ñ€Ð¾ÑˆÐµÐ½Ð¸Ñ Ð´Ð¾ ферм.\n"
-#: client/helpdata.c:1234
+#: client/helpdata.c:1242
msgid "* Pollution cannot be generated on this terrain."
msgstr "* ЗагрÑзнение не проиÑходит в Ñтом рельефе."
-#: client/helpdata.c:1239
+#: client/helpdata.c:1247
msgid "* You cannot build cities on this terrain."
msgstr "* Ð’Ñ‹ не можете Ñтроить города в Ñтом рельефе."
-#: client/helpdata.c:1245
+#: client/helpdata.c:1253
msgid "* The coastline of this terrain is unsafe."
msgstr "* Берег Ñтого рельефа опаÑен."
-#: client/helpdata.c:1250
+#: client/helpdata.c:1258
msgid "* This terrain is unsafe for units to travel on."
msgstr "* Ðтот рельеф опаÑен Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ´Ð²Ð¸Ð³Ð°ÑŽÑ‰Ð¸Ñ…ÑÑ Ñоединений."
-#: client/helpdata.c:1255
+#: client/helpdata.c:1263
msgid "* Land units cannot travel on oceanic terrains."
msgstr "* Ðаземеные ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð½Ðµ могут перемещатьÑÑ Ð¿Ð¾ морÑкому рельефу."
-#: client/helpdata.c:1305
+#: client/helpdata.c:1313
msgid "Features:\n"
msgstr "ОÑобенноÑти:\n"
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1411 client/helpdata.c:1412
+#: client/helpdata.c:1419 client/helpdata.c:1420
msgid "?outputlist: Nothing "
msgstr " Ðичего "
-#: client/helpdata.c:1419
+#: client/helpdata.c:1427
#, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -8737,7 +8881,7 @@ msgstr[2] ""
"* Военные ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð²Ð½Ðµ города и полевые ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ñделают %d жителей "
"недовольными.\n"
-#: client/helpdata.c:1429
+#: client/helpdata.c:1437
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8747,30 +8891,30 @@ msgstr ""
"вызвано ÑоединениÑми.\n"
#. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1437
+#: client/helpdata.c:1445
#, c-format
msgid "* You pay %d times normal %s upkeep for your units.\n"
msgstr "* Ð’Ñ‹ платите %d раз по %s за Ñодержание Ваших Ñоединений.\n"
-#: client/helpdata.c:1442
+#: client/helpdata.c:1450
#, 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:1447
+#: client/helpdata.c:1455
#, c-format
msgid "* You pay no %s upkeep for your units.\n"
msgstr "* Ð’Ñ‹ не платите %s за Ñодержание Ваших Ñоединений.\n"
-#: client/helpdata.c:1451
+#: client/helpdata.c:1459
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:1460
+#: client/helpdata.c:1468
#, c-format
msgid "* Each of your cities will avoid paying %d %s towards unit upkeep.\n"
msgstr ""
@@ -8778,13 +8922,13 @@ msgstr ""
#. TRANS: Amount is subtracted from upkeep cost
#. * for each upkeep type.
-#: client/helpdata.c:1468
+#: client/helpdata.c:1476
#, c-format
msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
msgstr ""
"* Каждый из Ваших городов избежит платы %d золота за Ñодержание Ñоединений.\n"
-#: client/helpdata.c:1475
+#: client/helpdata.c:1483
#, c-format
msgid "* Chance of civil war is %d%% if you lose your capital.\n"
msgstr ""
@@ -8792,7 +8936,7 @@ msgstr ""
"d%%.\n"
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1482
+#: client/helpdata.c:1490
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -8802,7 +8946,7 @@ msgstr ""
"поÑвитÑÑ, когда у Ð²Ð°Ñ Ð±ÑƒÐ´ÐµÑ‚ %d городов.\n"
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1489
+#: client/helpdata.c:1497
#, c-format
msgid ""
"* After the first unhappy citizen due to city size, for each %d additional "
@@ -8811,18 +8955,18 @@ msgstr ""
"* ПоÑле первого неÑчаÑтного Ð¶Ð¸Ñ‚ÐµÐ»Ñ Ð² ÑвÑзи Ñ Ñ€Ð°Ð·Ð¼ÐµÑ€Ð¾Ð¼ цивилизации, на каждые "
"%d дополнительных городов ещё один житель Ñтанет неÑчаÑтным.\n"
-#: client/helpdata.c:1497
+#: client/helpdata.c:1505
#, c-format
msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
msgstr ""
"МакÑимальный уровень, который Ð’Ñ‹ можете уÑтановить Ð´Ð»Ñ Ð½Ð°ÑƒÐºÐ¸, золота, "
"роÑкоши - %d%%.\n"
-#: client/helpdata.c:1502
+#: client/helpdata.c:1510
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr "Ðет ограничений на Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ ÑƒÑ€Ð¾Ð²Ð½Ñ Ð½Ð°ÑƒÐºÐ¸/золота/роÑкоши.\n"
-#: client/helpdata.c:1507
+#: client/helpdata.c:1515
#, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -8840,7 +8984,7 @@ msgstr[2] ""
"* Ð’Ñ‹ можете ввеÑти военное положение. Каждое военное Ñоединение в городе "
"Ñделает %d недовольных жителей нейтральными.\n"
-#: client/helpdata.c:1519
+#: client/helpdata.c:1527
#, 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"
@@ -8855,7 +8999,7 @@ msgstr[2] ""
"военного положениÑ.\n"
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1530
+#: client/helpdata.c:1538
#, c-format
msgid ""
"* You may grow your cities by means of celebrations. Your cities must be at "
@@ -8865,15 +9009,15 @@ msgstr ""
"должны иметь размер как минимум %d, прежде чем они Ñмогут увеличитьÑÑ Ð´Ð°Ð½Ð½Ñ‹Ð¼ "
"ÑпоÑобом.\n"
-#: client/helpdata.c:1536
+#: client/helpdata.c:1544
msgid "* Your units cannot be bribed.\n"
msgstr "* Ваши ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð½Ðµ могут быть завербованы противником.\n"
-#: client/helpdata.c:1539
+#: client/helpdata.c:1547
msgid "* Your cities cannot be incited.\n"
msgstr "* Ваши города Ð½ÐµÐ»ÑŒÐ·Ñ Ð¿Ð¾Ð´Ñтрекать к мÑтежу.\n"
-#: client/helpdata.c:1543
+#: client/helpdata.c:1551
msgid ""
"* Government will fall into anarchy if any city is in disorder for more than "
"two turns in a row.\n"
@@ -8881,15 +9025,15 @@ msgstr ""
"* Форма Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ñтанет анархией, еÑли в любом городе гражданÑкие "
"беÑпорÑдки продолжаютÑÑ Ð±Ð¾Ð»ÐµÐµ 2 ходов.\n"
-#: client/helpdata.c:1549
+#: client/helpdata.c:1557
msgid "* Has a senate that may prevent declaration of war.\n"
msgstr "* ИмеетÑÑ Ñенат, который может воÑпрепÑÑ‚Ñтвовать объÑвлению войны.\n"
-#: client/helpdata.c:1553
+#: client/helpdata.c:1561
msgid "* Allows partisans when cities are taken by the enemy.\n"
msgstr "* Партизаны поÑвлÑÑŽÑ‚ÑÑ, когда города захватываютÑÑ Ð¿Ñ€Ð¾Ñ‚Ð¸Ð²Ð½Ð¸ÐºÐ¾Ð¼.\n"
-#: client/helpdata.c:1557
+#: client/helpdata.c:1565
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
@@ -8897,25 +9041,25 @@ msgstr ""
"* ЗданиÑ, которые обычно помогают против неÑчаÑтноÑти граждан, вмеÑто Ñтого "
"приноÑÑÑ‚ золото.\n"
-#: client/helpdata.c:1561
+#: client/helpdata.c:1569
msgid "* Pays no upkeep for fanatics.\n"
msgstr "* Ðе надо платить за Ñодержание фанатиков.\n"
-#: client/helpdata.c:1564
+#: client/helpdata.c:1572
msgid "* Has no unhappy citizens.\n"
msgstr "* Ðет неÑчаÑтных граждан.\n"
-#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
+#: client/helpdata.c:1582 client/helpdata.c:1586 client/helpdata.c:1590
#, c-format
msgid "* Veteran %s units.\n"
msgstr "* Ð¡Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ %s ÑоздаютÑÑ Ð²ÐµÑ‚ÐµÑ€Ð°Ð½Ð°Ð¼Ð¸.\n"
-#: client/helpdata.c:1585
+#: client/helpdata.c:1593
msgid "* Veteran units.\n"
msgstr "* Ð¡Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ ÑоздаютÑÑ Ð²ÐµÑ‚ÐµÑ€Ð°Ð½Ð°Ð¼Ð¸.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1591
+#: client/helpdata.c:1599
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8925,7 +9069,7 @@ msgstr ""
"1 единицу, когда не празднуют.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1600
+#: client/helpdata.c:1608
#, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8935,72 +9079,72 @@ msgstr ""
"когда празднуют.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1608
+#: client/helpdata.c:1616
#, 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:1617
+#: client/helpdata.c:1625
#, 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:1625
+#: client/helpdata.c:1633
#, 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:1630
+#: client/helpdata.c:1638
#, 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:1635
+#: client/helpdata.c:1643
#, 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:1643
+#: client/helpdata.c:1651
#, 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:1649
+#: client/helpdata.c:1657
#, 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:1655
+#: client/helpdata.c:1663
#, c-format
msgid "* %s waste will increase slowly with distance from capital.\n"
msgstr "* РаÑтраты %s медленно раÑтут по мере ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð¾Ñ‚ Ñтолицы.\n"
-#: client/helpdata.c:1672
+#: client/helpdata.c:1680
#, c-format
msgid "* Allows you to build %s.\n"
msgstr "* ПозволÑет Вам Ñтроить %s.\n"
#. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1699
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d %s"
msgstr "%s%d %s"
-#: client/helpdata.c:1700 client/helpdata.c:1708 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1708 client/helpdata.c:1716 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:1707
+#: client/helpdata.c:1715
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d неÑчаÑÑ‚ÑŒÑ"
@@ -9075,7 +9219,7 @@ msgstr ""
"Ðто порт Ñервера по умолчанию, который будет иÑпользоватьÑÑ Ð² диалоге "
"Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸ в командной Ñтроке Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¾Ð¼ -a"
-#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:916 data/Freeciv.in:107
msgid "Metaserver"
msgstr "МетаÑервер"
@@ -9476,35 +9620,35 @@ msgstr "Сохранение не удалоÑÑŒ, невозможно запи
msgid "Saved settings to file %s"
msgstr "Сохранили наÑтройки в файл %s"
-#: client/packhand.c:211 client/packhand.c:217
+#: client/packhand.c:212 client/packhand.c:218
msgid "You were rejected from the game...."
msgstr "Вы были отключены от игры..."
-#: client/packhand.c:229
+#: client/packhand.c:230
#, c-format
msgid "Client capability string: %s"
msgstr "Строка возможноÑтей клиента: %s"
-#: client/packhand.c:232
+#: client/packhand.c:233
#, c-format
msgid "Server capability string: %s"
msgstr "Строка возможноÑтей Ñервера: %s"
-#: client/packhand.c:850
+#: client/packhand.c:864
#, c-format
msgid "Start of turn %d"
msgstr "Ðачало хода %d"
-#: client/packhand.c:1591
+#: client/packhand.c:1621
#, c-format
msgid "AI Mode is now %s."
msgstr "Компьютерный режим %s."
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "ON"
msgstr "ВКЛ"
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "OFF"
msgstr "ВЫКЛ"
@@ -9535,15 +9679,15 @@ msgstr "?Игрок:ИмÑ"
msgid "Username"
msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
-#: client/gui-gtk-2.0/pages.c:2157
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:653
+#: client/gui-gtk-2.0/pages.c:1604 client/gui-gtk-2.0/pages.c:2159
msgid "Flag"
msgstr "Флаг"
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1605
-#: client/gui-gtk-2.0/pages.c:2159 client/gui-sdl/repodlgs.c:2063
-#: client/gui-win32/connectdlg.c:990 client/gui-win32/dialogs.c:542
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:657
+#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1609
+#: client/gui-gtk-2.0/pages.c:2161 client/gui-sdl/repodlgs.c:2063
+#: client/gui-win32/connectdlg.c:992 client/gui-win32/dialogs.c:542
#: client/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "Ðарод"
@@ -9556,7 +9700,7 @@ msgstr "Граница"
msgid "Score"
msgstr "Счет"
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1614
msgid "Team"
msgstr "Команда"
@@ -9589,36 +9733,36 @@ msgstr "?Player_dlg:СоÑтоÑние"
msgid "Ping"
msgstr "Пинг"
-#: client/repodlgs_common.c:375
+#: client/repodlgs_common.c:378
msgid "You cannot sell improvements."
msgstr "Ð’Ñ‹ не можете продать улучшениÑ"
-#: client/repodlgs_common.c:391
+#: client/repodlgs_common.c:394
#, c-format
msgid "Sold %d %s for %d gold."
msgstr "Продано %d %s за %d золота."
-#: client/repodlgs_common.c:396
+#: client/repodlgs_common.c:399
#, c-format
msgid "No %s could be sold."
msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð¿Ñ€Ð¾Ð´Ð°Ñ‚ÑŒ %s."
#. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:415
+#: client/repodlgs_common.c:418
msgid "You cannot disband units."
msgstr "Ð’Ñ‹ не можете раÑпуÑкать ÑоединениÑ."
-#: client/repodlgs_common.c:420
+#: client/repodlgs_common.c:423
#, c-format
msgid "%s cannot be disbanded."
msgstr "Соединение %s не может быть раÑпущено."
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:444
#, c-format
msgid "Disbanded %d %s."
msgstr "РаÑпуÑтить %d %s."
-#: client/repodlgs_common.c:445
+#: client/repodlgs_common.c:448
#, c-format
msgid "No %s could be disbanded."
msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ñ€Ð°ÑпуÑтить %s."
@@ -10225,47 +10369,47 @@ msgstr "?dys/hrs:%02dд %02dч"
msgid "?duration:overflow"
msgstr "?duration:переполнение"
-#: client/text.c:1143
+#: client/text.c:1145
#, c-format
msgid "%6d.%02d ms"
msgstr "%6d.%02d мÑ"
#. TRANS: <nation adjective> <government name>.
#. * E.g. "Polish Republic".
-#: client/text.c:1188
+#: client/text.c:1193
#, fuzzy, c-format
msgid "?nationgovernment:%s %s"
msgstr "Форма правлениÑ: %s"
#. TRANS: "Observer: 1985"
-#: client/text.c:1198
+#: client/text.c:1203
#, c-format
msgid "Observer: %s"
msgstr "Ðаблюдатель: %s"
-#: client/text.c:1216
+#: client/text.c:1221
msgid "Buildings: "
msgstr "ЗданиÑ: "
-#: client/text.c:1233 client/text.c:1272
+#: client/text.c:1238 client/text.c:1277
msgid "None. "
msgstr "Ðет. "
-#: client/text.c:1235 client/text.c:1274
+#: client/text.c:1240 client/text.c:1279
msgid "?clistend:."
msgstr "."
-#: client/text.c:1253
+#: client/text.c:1258
msgid "Wonders: "
msgstr "ЧудеÑа: "
-#: client/text.c:1308
+#: client/text.c:1313
#, 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:1312
+#: client/text.c:1317
#, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
@@ -10274,7 +10418,7 @@ msgstr[1] "%d нейтральных до штрафа."
msgstr[2] "%d нейтральных до штрафа."
#. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1318
+#: client/text.c:1323
#, c-format
msgid "%d additional unhappy citizen."
msgid_plural "%d additional unhappy citizens."
@@ -10282,12 +10426,12 @@ msgstr[0] "%d дополнительный неÑчаÑтный граждани
msgstr[1] "%d дополнительных неÑчаÑтных граждан."
msgstr[2] "%d дополнительных неÑчаÑтных граждан."
-#: client/text.c:1339
+#: client/text.c:1344
#, fuzzy
msgid "Unlimited martial law in effect."
msgstr "ДейÑтвует военное положение ("
-#: client/text.c:1341
+#: client/text.c:1346
#, fuzzy, c-format
msgid "%d military unit may impose martial law."
msgid_plural "Up to %d military units may impose martial law."
@@ -10298,7 +10442,7 @@ msgstr[1] ""
msgstr[2] ""
"* Ðе-военное Ñоединение (не может атаковать; нет военного положениÑ).\n"
-#: client/text.c:1345
+#: client/text.c:1350
#, fuzzy, c-format
msgid "Each military unit makes %d unhappy citizen content."
msgid_plural "Each military unit makes %d unhappy citizens content."
@@ -10309,31 +10453,31 @@ msgstr[1] ""
msgstr[2] ""
"Развелкает жителей города, Ð´ÐµÐ»Ð°Ñ 3 неÑчаÑтных жителей города нейтральными."
-#: client/text.c:1352
+#: client/text.c:1357
msgid "Military units in the field may cause unhappiness. "
msgstr "Военные ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð²Ð½Ðµ городов могут вызвать недовольÑтво. "
-#: client/text.c:1355
+#: client/text.c:1360
msgid "Military units have no happiness effect. "
msgstr "Военные ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð½Ðµ имеют Ñффекта на ÑчаÑтье."
-#: client/text.c:1370
+#: client/text.c:1375
#, c-format
msgid "Luxury: %d total."
msgstr "РоÑкошь: %d вÑего."
-#: client/tilespec.c:865
+#: client/tilespec.c:882
msgid "No usable default tileset found, aborting!"
msgstr "Ðе найдено ни одного набора рельефа, прерываем выполнение!"
-#: client/tilespec.c:1338
+#: client/tilespec.c:1355
msgid ""
"Client does not support isometric tilesets. Using default tileset instead."
msgstr ""
"Клиент не поддерживает изометричеÑкий набор полей. ИÑпользуем Ñтандартный "
"набор."
-#: client/tilespec.c:1347
+#: client/tilespec.c:1364
msgid ""
"Client does not support overhead view tilesets. Using default tileset "
"instead."
@@ -10341,7 +10485,7 @@ msgstr ""
"Клиент не поддерживает набор полей Ñ Ð²Ð¸Ð´Ð¾Ð¼ Ñверху. ИÑпользуем Ñтандартный "
"набор."
-#: client/tilespec.c:3966
+#: client/tilespec.c:3987
#, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -11025,7 +11169,7 @@ msgid "_Display"
msgstr "Показать (_D)"
#: client/gui-gtk-2.0/cityrep.c:1006 client/gui-gtk-2.0/menu.c:839
-#: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
+#: client/gui-sdl/diplodlg.c:692 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
#: client/gui-xaw/cityrep.c:533 client/gui-xaw/menu.c:156
@@ -11197,192 +11341,192 @@ msgstr "Как назвать пре-уÑтановку?"
msgid "Remove this preset?"
msgstr "Удалить Ñту уÑтановку?"
-#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:222
+#: client/gui-gtk-2.0/dialogs.c:197 client/gui-gtk-2.0/messagewin.c:222
msgid "Goto _Location"
msgstr "_Идти к"
-#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
+#: client/gui-gtk-2.0/dialogs.c:202 client/gui-gtk-2.0/messagewin.c:226
msgid "Inspect _City"
msgstr "ОÑмотреть город (_C)"
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:258 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:258 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:259 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:311 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:312 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:312 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:313 client/gui-win32/dialogs.c:1755
#: data/Freeciv.in:2502
msgid "Select what to pillage:"
msgstr "Выберите, что разрушать:"
-#: client/gui-gtk-2.0/dialogs.c:506
+#: client/gui-gtk-2.0/dialogs.c:507
msgid "Unit"
msgstr "Соединение"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:950
-#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2155
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:985
+#: client/gui-gtk-2.0/dialogs.c:508 client/gui-gtk-2.0/pages.c:950
+#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2157
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:987
#: client/gui-win32/plrdlg.c:335 manual/civmanual.c:302 data/Freeciv.in:80
msgid "Name"
msgstr "Ðазвание"
-#: client/gui-gtk-2.0/dialogs.c:519 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:520 client/gui-sdl/dialogs.c:627
msgid "Unit selection"
msgstr "Выбор Ñоединений"
-#: client/gui-gtk-2.0/dialogs.c:582
+#: client/gui-gtk-2.0/dialogs.c:583
msgid "_Ready all"
msgstr "Приготовить вÑех (_R)"
-#: client/gui-gtk-2.0/dialogs.c:590
+#: client/gui-gtk-2.0/dialogs.c:591
msgid "_Sentry idle"
msgstr "УÑыпить незанÑÑ‚Ñ‹Ñ… (_S)"
-#: client/gui-gtk-2.0/dialogs.c:719
+#: client/gui-gtk-2.0/dialogs.c:721
msgid "Nation _Groups:"
msgstr "Группы народов (_G):"
-#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:766 data/Freeciv.in:3128
msgid "What Nation Will You Be?"
msgstr "Каким народом Ð’Ñ‹ будете управлÑÑ‚ÑŒ?"
-#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
-#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
+#: client/gui-gtk-2.0/dialogs.c:768 client/gui-sdl/chatline.c:842
+#: client/gui-win32/connectdlg.c:1040 data/Freeciv.in:3371
msgid "Pick Nation"
msgstr "Выбрать народ"
-#: client/gui-gtk-2.0/dialogs.c:774
+#: client/gui-gtk-2.0/dialogs.c:776
msgid "_Random Nation"
msgstr "Случайный народ (_R)"
-#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:792 client/gui-win32/dialogs.c:517
msgid "Select a nation"
msgstr "Выберите народ"
-#: client/gui-gtk-2.0/dialogs.c:804
+#: client/gui-gtk-2.0/dialogs.c:810
msgid "_Properties"
msgstr "СвойÑтва (_P)"
-#: client/gui-gtk-2.0/dialogs.c:824
+#: client/gui-gtk-2.0/dialogs.c:830
msgid "_Leader:"
msgstr "Лидер (_L):"
-#: client/gui-gtk-2.0/dialogs.c:831
+#: client/gui-gtk-2.0/dialogs.c:837
msgid "_Female"
msgstr "ЖенÑкий (_F)"
-#: client/gui-gtk-2.0/dialogs.c:836
+#: client/gui-gtk-2.0/dialogs.c:842
msgid "_Male"
msgstr "МужÑкой (_M)"
-#: client/gui-gtk-2.0/dialogs.c:863
+#: client/gui-gtk-2.0/dialogs.c:869
msgid "City _Styles:"
msgstr "Стили городов (_S):"
-#: client/gui-gtk-2.0/dialogs.c:902
+#: client/gui-gtk-2.0/dialogs.c:908
msgid "_Description"
msgstr "ОпиÑание (_D)"
-#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1263 client/gui-xaw/dialogs.c:1480
msgid "You must select your sex."
msgstr "Ð’Ñ‹ должны указать Ñвой пол."
-#: client/gui-gtk-2.0/dialogs.c:1253 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1268 client/gui-xaw/dialogs.c:1485
msgid "You must select your city style."
msgstr "Ð’Ñ‹ должны выбрать Ñтиль Ваших городов."
-#: client/gui-gtk-2.0/dialogs.c:1262 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1277 client/gui-sdl/dialogs.c:2204
#: 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:1306 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1318 client/gui-win32/citydlg.c:1454
#: data/Freeciv.in:2484
msgid "Upgrade Unit!"
msgstr "Модернизировать Ñоединение!"
-#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1327 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 "Модернизировать уÑтаревшие войÑка"
-#: client/gui-gtk-2.0/diplodlg.c:231 client/gui-win32/diplodlg.c:151
+#: client/gui-gtk-2.0/diplodlg.c:222 client/gui-win32/diplodlg.c:151
#: client/gui-xaw/diplodlg.c:383 client/gui-xaw/diplodlg.c:401
msgid "World-map"
msgstr "Карта Мира"
-#: client/gui-gtk-2.0/diplodlg.c:237 client/gui-win32/diplodlg.c:146
+#: client/gui-gtk-2.0/diplodlg.c:228 client/gui-win32/diplodlg.c:146
#: client/gui-xaw/diplodlg.c:387 client/gui-xaw/diplodlg.c:405
msgid "Sea-map"
msgstr "Карта морей"
-#: client/gui-gtk-2.0/diplodlg.c:243
+#: client/gui-gtk-2.0/diplodlg.c:234
msgid "_Maps"
msgstr "Карты (_M)"
-#: client/gui-gtk-2.0/diplodlg.c:274
+#: client/gui-gtk-2.0/diplodlg.c:265
msgid "_Advances"
msgstr "ÐžÑ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ñ (_A)"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/diplodlg.c:315 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "Города (_C)"
-#: client/gui-gtk-2.0/diplodlg.c:333
+#: client/gui-gtk-2.0/diplodlg.c:324
msgid "_Give shared vision"
msgstr "ПоделитьÑÑ Ð·Ñ€ÐµÐ½Ð¸ÐµÐ¼ (_G)"
-#: client/gui-gtk-2.0/diplodlg.c:346
+#: client/gui-gtk-2.0/diplodlg.c:337
msgid "Give _embassy"
msgstr "Разрешить поÑольÑтво (_e)"
-#: client/gui-gtk-2.0/diplodlg.c:376
+#: client/gui-gtk-2.0/diplodlg.c:368
msgid "_Pacts"
msgstr "Договоры (_P)"
-#: client/gui-gtk-2.0/diplodlg.c:466
+#: client/gui-gtk-2.0/diplodlg.c:458
#, c-format
msgid "Diplomacy: %s"
msgstr "ДипломатиÑ: %s"
-#: client/gui-gtk-2.0/diplodlg.c:473
+#: client/gui-gtk-2.0/diplodlg.c:465
msgid "_Cancel meeting"
msgstr "Отменить переговоры (_C)"
-#: client/gui-gtk-2.0/diplodlg.c:475
+#: client/gui-gtk-2.0/diplodlg.c:467
msgid "Accept _treaty"
msgstr "ПодпиÑать (_t)"
-#: client/gui-gtk-2.0/diplodlg.c:503
+#: client/gui-gtk-2.0/diplodlg.c:495
msgid "C_lauses:"
msgstr "Статьи (_l):"
-#: client/gui-gtk-2.0/diplodlg.c:568 client/gui-gtk-2.0/diplodlg.c:642
+#: client/gui-gtk-2.0/diplodlg.c:560 client/gui-gtk-2.0/diplodlg.c:634
msgid "_Gold:"
msgstr "Золото (_G):"
-#: client/gui-gtk-2.0/diplodlg.c:580 client/gui-gtk-2.0/diplodlg.c:654
+#: client/gui-gtk-2.0/diplodlg.c:572 client/gui-gtk-2.0/diplodlg.c:646
msgid "_Add Clause..."
msgstr "Добавить Ñтатью... (_A)"
-#: client/gui-gtk-2.0/diplodlg.c:699
+#: client/gui-gtk-2.0/diplodlg.c:691
msgid "--- This treaty is blank. Please add some clauses. ---"
msgstr "--- Ðто Ñоглашение пуÑто. ПожалуйÑта, добавьте Ñтатьи. ---"
-#: client/gui-gtk-2.0/diplodlg.c:905 client/gui-sdl/diplodlg.c:375
+#: client/gui-gtk-2.0/diplodlg.c:897 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 "Указано неверное количеÑтво золота."
@@ -11441,19 +11585,19 @@ msgstr "Выбрать назначение"
msgid "Show _All Cities"
msgstr "Показать вÑе города (_A)"
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:164
msgid "Show Map Scrollbars"
msgstr "Показывать полоÑÑ‹ прокрутки на карте"
-#: client/gui-gtk-2.0/gui_main.c:163
+#: client/gui-gtk-2.0/gui_main.c:165
msgid "Disable this option to hide the scrollbars on the map view."
msgstr "Выключите Ñту наÑтройку, чтобы ÑпрÑтать полоÑÑ‹ прокрутки на карте."
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:169
msgid "Keyboardless goto"
msgstr "Команда \"Идти к\" без клавиатуры"
-#: client/gui-gtk-2.0/gui_main.c:168
+#: client/gui-gtk-2.0/gui_main.c:170
msgid ""
"If this option is set then a goto may be initiated by left-clicking and then "
"holding down the mouse button while dragging the mouse onto a different tile."
@@ -11462,11 +11606,11 @@ msgstr ""
"нажатии левой кнопкой мыши и перетаÑкивании мышью (при нажатой кнопке) на "
"другой квадрат."
-#: client/gui-gtk-2.0/gui_main.c:173
+#: client/gui-gtk-2.0/gui_main.c:175
msgid "Keep dialogs on top"
msgstr "Показывать диалоги Ñверху"
-#: client/gui-gtk-2.0/gui_main.c:174
+#: client/gui-gtk-2.0/gui_main.c:176
msgid ""
"If this option is set then dialog windows will always remain in front of the "
"main Freeciv window. Disabling this has no effect in fullscreen mode."
@@ -11475,11 +11619,11 @@ msgstr ""
"главным окном Freeciv. Выключение Ñтой наÑтройки не дейÑтвует в "
"полноÑкранном режиме."
-#: client/gui-gtk-2.0/gui_main.c:178
+#: client/gui-gtk-2.0/gui_main.c:180
msgid "Show worklist task icons"
msgstr "Показывать иконки в ÑпиÑке производÑтво"
-#: client/gui-gtk-2.0/gui_main.c:179
+#: client/gui-gtk-2.0/gui_main.c:181
msgid ""
"Disabling this will turn off the unit and building icons in the worklist "
"dialog and the production tab of the city dialog."
@@ -11487,11 +11631,11 @@ msgstr ""
"Выключение Ñтой наÑтройки выключит изображение иконок Ñоединений и зданий в "
"рабочем ÑпиÑке и вкладке \"производÑтво\" в городÑком диалоге."
-#: client/gui-gtk-2.0/gui_main.c:183
+#: client/gui-gtk-2.0/gui_main.c:185
msgid "Enable status report tabs"
msgstr "Включить панель доклада ÑоÑтоÑниÑ"
-#: client/gui-gtk-2.0/gui_main.c:184
+#: client/gui-gtk-2.0/gui_main.c:186
msgid ""
"If this option is enabled then report dialogs will be shown as separate tabs "
"rather than in popup dialogs."
@@ -11499,11 +11643,11 @@ msgstr ""
"ЕÑли Ð´Ð°Ð½Ð½Ð°Ñ Ð½Ð°Ñтройка включена, то отчёты будут открыватьÑÑ Ð² отдельных "
"вкладках, а не в поÑвлÑющихÑÑ Ð¾ÐºÐ½Ð°Ñ…."
-#: client/gui-gtk-2.0/gui_main.c:189 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:191 client/gui-win32/gui_main.c:110
msgid "Better fog-of-war drawing"
msgstr "Ð£Ð»ÑƒÑ‡ÑˆÐµÐ½Ð½Ð°Ñ Ð¿Ñ€Ð¾Ñ€Ð¸Ñовка дыма войны"
-#: client/gui-gtk-2.0/gui_main.c:190 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:192 client/gui-win32/gui_main.c:111
msgid ""
"If this is enabled then a better method is used for drawing fog-of-war. It "
"is not any slower but will consume about twice as much memory."
@@ -11511,41 +11655,41 @@ msgstr ""
"ЕÑли Ñта наÑтройка включена, тогда иÑпользуетÑÑ Ð»ÑƒÑ‡ÑˆÐ¸Ð¹ метод прориÑовки дыма "
"войны. Ðто не медленнее по ÑкороÑти, но раÑходуетÑÑ Ð² два раза больше памÑти."
-#: client/gui-gtk-2.0/gui_main.c:195
+#: client/gui-gtk-2.0/gui_main.c:197
msgid "Show time for each chat message"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:196
+#: client/gui-gtk-2.0/gui_main.c:198
msgid ""
"If this option is enabled then all chat messages will be prefixed by a time "
"string of the form [hour:minute:second]."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:201
+#: client/gui-gtk-2.0/gui_main.c:203
msgid "Split bottom notebook area"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:202
+#: client/gui-gtk-2.0/gui_main.c:204
msgid ""
"Enabling this option will split the bottom notebook into a left and right "
"notebook so that two tabs may be viewed at once."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:207
+#: client/gui-gtk-2.0/gui_main.c:209
msgid "New message events go to top of list"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:208
+#: client/gui-gtk-2.0/gui_main.c:210
msgid ""
"If this option is enabled, new events in the message window will appear at "
"the top of the list, rather than being appended at the bottom."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:213
+#: client/gui-gtk-2.0/gui_main.c:215
msgid "Show extra message window buttons"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:214
+#: client/gui-gtk-2.0/gui_main.c:216
msgid ""
"If this option is enabled, there will be two buttons displayed in the "
"message window for inspecting a city and going to a location. If this option "
@@ -11555,22 +11699,22 @@ msgid ""
"closed and reopened."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:224
+#: client/gui-gtk-2.0/gui_main.c:226
#, fuzzy
msgid "Metaserver tab first in network page"
msgstr "Тема Ð´Ð»Ñ Ð¼ÐµÑ‚Ð°Ñервера уÑтановлена в '%s'."
-#: client/gui-gtk-2.0/gui_main.c:225
+#: client/gui-gtk-2.0/gui_main.c:227
msgid ""
"If this option is enabled, the metaserver tab will be the first notebook tab "
"in the network page. This option requires a restart in order to take effect."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:230
+#: client/gui-gtk-2.0/gui_main.c:232
msgid "Plain chat messages are sent to allies only"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:231
+#: client/gui-gtk-2.0/gui_main.c:233
msgid ""
"If this option is enabled, then plain messages typed into the chat entry "
"while the game is running will only be sent to your allies. Otherwise plain "
@@ -11580,7 +11724,20 @@ msgid ""
"visible in multiplayer games)."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:340 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:245
+msgid "Arrange widgets for small displays"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:246
+msgid ""
+"If this option is enabled, widgets in the main window will be arrange so "
+"that they take up the least amount of total screen space. Specifically, the "
+"left panel containing the overview, player status, and the unit information "
+"box will be extended over the entire left side of the window. This option "
+"requires a restart in order to take effect."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:352 client/gui-xaw/gui_main.c:245
msgid ""
"This client has no special command line options\n"
"\n"
@@ -11588,22 +11745,22 @@ msgstr ""
"У Ñтого клиента нет Ñпециальных опций командной Ñтроки\n"
"\n"
-#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
+#: client/gui-gtk-2.0/gui_main.c:847 client/gui-gtk-2.0/gui_main.c:1542
msgid "Freeciv"
msgstr "Freeciv"
-#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
+#: client/gui-gtk-2.0/gui_main.c:1251 client/gui-gtk-2.0/gui_main.c:1258
#: client/gui-sdl/mapctrl.c:1566 client/gui-win32/gui_main.c:482
#: data/Freeciv.in:2618
msgid "Turn Done"
msgstr "Ход Ñделан"
-#: client/gui-gtk-2.0/gui_main.c:1232 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1258 client/gui-sdl/mapctrl.c:1566
#: client/gui-sdl/mapview.c:1082
msgid "Shift+Return"
msgstr "ÐšÐ¾Ð¼Ð±Ð¸Ð½Ð°Ñ†Ð¸Ñ Shift+Enter"
-#: client/gui-gtk-2.0/gui_main.c:1266 client/gui-gtk-2.0/menu.c:797
+#: client/gui-gtk-2.0/gui_main.c:1299 client/gui-gtk-2.0/menu.c:797
#: client/gui-gtk-2.0/menu.c:799 client/gui-gtk-2.0/menu.c:801
#: client/gui-gtk-2.0/menu.c:803 client/gui-gtk-2.0/menu.c:805
#: client/gui-gtk-2.0/menu.c:807 client/gui-gtk-2.0/menu.c:809
@@ -11622,11 +11779,11 @@ msgstr "ÐšÐ¾Ð¼Ð±Ð¸Ð½Ð°Ñ†Ð¸Ñ Shift+Enter"
msgid "View"
msgstr "Вид"
-#: client/gui-gtk-2.0/gui_main.c:1359
+#: client/gui-gtk-2.0/gui_main.c:1393
msgid "Chat"
msgstr "Общение"
-#: client/gui-gtk-2.0/gui_main.c:1377 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1411 client/gui-win32/gui_main.c:538
#: data/Freeciv.in:2809
msgid ""
"Freeciv is free software and you are welcome to distribute copies of it\n"
@@ -11638,78 +11795,78 @@ msgstr ""
"при определённых уÑловиÑÑ…; Ñмотрите пункт \"Копирование\" в меню Справка\n"
"Ртеперь... ПуÑÑ‚ÑŒ вÑем чертÑм Ñтанет тошно!"
-#: client/gui-gtk-2.0/gui_main.c:1392
+#: client/gui-gtk-2.0/gui_main.c:1426
msgid "Allies Only"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1657
+#: client/gui-gtk-2.0/gui_main.c:1691
msgid "Not _ready"
msgstr "Ðе готов (_r)"
-#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
+#: client/gui-gtk-2.0/gui_main.c:1702 client/gui-gtk-2.0/pages.c:1679
msgid "_Ready"
msgstr "Готов (_R)"
-#: client/gui-gtk-2.0/gui_main.c:1672 client/gui-gtk-2.0/gui_main.c:1678
-#: client/gui-gtk-2.0/pages.c:2204
+#: client/gui-gtk-2.0/gui_main.c:1706 client/gui-gtk-2.0/gui_main.c:1712
+#: client/gui-gtk-2.0/pages.c:2206
msgid "_Start"
msgstr "Ðачать (_S)"
-#: client/gui-gtk-2.0/gui_main.c:1686
+#: client/gui-gtk-2.0/gui_main.c:1720
#, fuzzy
msgid "_Take Player"
msgstr "УправлÑÑ‚ÑŒ Ñтим игроком"
-#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
+#: client/gui-gtk-2.0/gui_main.c:1723 client/gui-gtk-2.0/pages.c:1669
msgid "Pick _Nation"
msgstr "Выбрать народ (_N)"
-#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
+#: client/gui-gtk-2.0/gui_main.c:1730 client/gui-gtk-2.0/pages.c:1674
msgid "_Observe"
msgstr "Ðаблюдать (_O)"
-#: client/gui-gtk-2.0/gui_main.c:1698
+#: client/gui-gtk-2.0/gui_main.c:1732
msgid "Do not _observe"
msgstr "Ðе наблюдать (_o)"
-#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1755 client/gui-xaw/pages.c:211
msgid "<AI>"
msgstr "<Компьютер>"
-#: client/gui-gtk-2.0/gui_main.c:1723
+#: client/gui-gtk-2.0/gui_main.c:1758
msgid "<Novice AI>"
msgstr "<Компьютер новичок>"
-#: client/gui-gtk-2.0/gui_main.c:1726
+#: client/gui-gtk-2.0/gui_main.c:1761
msgid "<Easy AI>"
msgstr "<Компьютер лёгкий>"
-#: client/gui-gtk-2.0/gui_main.c:1729
+#: client/gui-gtk-2.0/gui_main.c:1764
msgid "<Normal AI>"
msgstr "<Компьютер нормальный>"
-#: client/gui-gtk-2.0/gui_main.c:1732
+#: client/gui-gtk-2.0/gui_main.c:1767
msgid "<Hard AI>"
msgstr "<Компьютер Ñложный>"
-#: client/gui-gtk-2.0/gui_main.c:1742 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1777 client/gui-win32/dialogs.c:594
#: client/gui-xaw/pages.c:217
msgid "Random"
msgstr "Случайный"
-#: client/gui-gtk-2.0/gui_main.c:1808
+#: client/gui-gtk-2.0/gui_main.c:1844 client/gui-gtk-2.0/gui_main.c:1858
msgid "Observer"
msgstr "Ðаблюдатель"
-#: client/gui-gtk-2.0/gui_main.c:1808
+#: client/gui-gtk-2.0/gui_main.c:1858
msgid "Detached"
msgstr "ОтÑоединён"
-#: client/gui-gtk-2.0/gui_main.c:2073
+#: client/gui-gtk-2.0/gui_main.c:2117
msgid "Are you sure you want to quit?"
msgstr "Ð’Ñ‹ дейÑтвительно хотите выйти?"
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
#, c-format
msgid ""
"Close Tab:\n"
@@ -11718,7 +11875,7 @@ msgstr ""
"Закрыть вкладку:\n"
"%s"
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
msgid "Ctrl+W"
msgstr "Ctrl+W"
@@ -11823,8 +11980,8 @@ msgid "Trans. Rslt/Time:"
msgstr "ТранÑ. Резлт/ВремÑ:"
#: 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
-#: client/gui-win32/helpdlg.c:709 client/gui-win32/helpdlg.c:733
+#: client/gui-win32/helpdlg.c:502 client/gui-win32/helpdlg.c:550
+#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:739
#: client/gui-xaw/helpdlg.c:759 client/gui-xaw/helpdlg.c:808
#: client/gui-xaw/helpdlg.c:816 client/gui-xaw/helpdlg.c:853
#: client/gui-xaw/helpdlg.c:878
@@ -11871,34 +12028,34 @@ msgstr "Ñ"
msgid "?techhelp:"
msgstr "?techhelp:"
-#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:591
+#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:597
#: client/gui-xaw/helpdlg.c:996
#, c-format
msgid "+%d Trade / %d"
msgstr "+%d Торговли / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:595
+#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:601
#: client/gui-xaw/helpdlg.c:1000
#, c-format
msgid "no extra / %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
-#: client/gui-win32/helpdlg.c:602 client/gui-win32/helpdlg.c:616
-#: client/gui-win32/helpdlg.c:635 client/gui-xaw/helpdlg.c:1002
+#: client/gui-gtk-2.0/helpdlg.c:1085 client/gui-win32/helpdlg.c:604
+#: client/gui-win32/helpdlg.c:608 client/gui-win32/helpdlg.c:622
+#: client/gui-win32/helpdlg.c:641 client/gui-xaw/helpdlg.c:1002
#: client/gui-xaw/helpdlg.c:1006 client/gui-xaw/helpdlg.c:1020
#: client/gui-xaw/helpdlg.c:1039
msgid "n/a"
msgstr "н/д"
-#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:605
+#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:611
#: client/gui-xaw/helpdlg.c:1009
#, c-format
msgid "+%d Food / %d"
msgstr "+%d Еды / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:619
+#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:625
#: client/gui-xaw/helpdlg.c:1023
#, c-format
msgid "+%d Res. / %d"
@@ -12667,41 +12824,41 @@ msgstr "ПодключитьÑÑ Ðº Ñетевой игре (_o)"
msgid "Connect to Gaming _Zone"
msgstr "ПодключитьÑÑ Ðº Gaming Zone (_Z)"
-#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:302
#: client/gui-xaw/connectdlg.c:326
msgid "Passwords don't match, enter password."
msgstr "Пароли не Ñовпадают, введите пароль."
#: client/gui-gtk-2.0/pages.c:779 client/gui-gtk-2.0/pages.c:820
-#: client/gui-win32/connectdlg.c:916
+#: client/gui-win32/connectdlg.c:918
msgid "Server Name"
msgstr "Ð˜Ð¼Ñ Ñервера"
#: client/gui-gtk-2.0/pages.c:780 client/gui-gtk-2.0/pages.c:821
-#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:916
+#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:918
#: data/Freeciv.in:96
msgid "Port"
msgstr "Порт"
#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Version"
msgstr "ВерÑиÑ"
#: client/gui-gtk-2.0/pages.c:782 client/gui-gtk-2.0/pages.c:823
-#: client/gui-gtk-2.0/pages.c:2161 client/gui-win32/connectdlg.c:917
-#: client/gui-win32/connectdlg.c:995
+#: client/gui-gtk-2.0/pages.c:2163 client/gui-win32/connectdlg.c:919
+#: client/gui-win32/connectdlg.c:997
msgid "Status"
msgstr "СоÑтоÑние"
#: client/gui-gtk-2.0/pages.c:783 client/gui-gtk-2.0/pages.c:824
#: client/gui-sdl/connectdlg.c:318 client/gui-sdl/plrdlg.c:330
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Players"
msgstr "Игроки"
#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
-#: client/gui-win32/connectdlg.c:918
+#: client/gui-win32/connectdlg.c:920
msgid "Comment"
msgstr "Комментарий"
@@ -12733,9 +12890,9 @@ msgstr "Пароль (_w):"
msgid "Conf_irm Password:"
msgstr "Повторите Пароль (_i):"
-#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2165
#: 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:1000
+#: client/gui-win32/citydlg.c:1083 client/gui-win32/connectdlg.c:1002
#: client/gui-win32/wldlg.c:800 client/gui-win32/wldlg.c:806
msgid "Type"
msgstr "Тип"
@@ -12828,7 +12985,7 @@ msgstr "Уровень компьютерного противника (AI) (_L)
msgid "Ruleset _Version:"
msgstr "_Правила:"
-#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2195
msgid "_More Game Options..."
msgstr "Доп. наÑтройки игры... (_M)"
@@ -12845,49 +13002,49 @@ msgstr "Рейтинг"
msgid "Ready"
msgstr "Готов"
-#: client/gui-gtk-2.0/pages.c:1601
+#: client/gui-gtk-2.0/pages.c:1600
#, fuzzy
msgid "?player:Leader"
msgstr "?Игрок:ИмÑ"
-#: client/gui-gtk-2.0/pages.c:1732 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1734 client/gui-sdl/chatline.c:185
msgid "Choose Saved Game to Load"
msgstr "Выберите Ñохранённую игру, которую Ð’Ñ‹ хотите загрузить"
-#: client/gui-gtk-2.0/pages.c:1824
+#: client/gui-gtk-2.0/pages.c:1826
msgid "Choose Saved Game to _Load:"
msgstr "Выберите игру, которую Вы хотите загрузить (_L):"
-#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
-#: client/gui-gtk-2.0/pages.c:2451
+#: client/gui-gtk-2.0/pages.c:1846 client/gui-gtk-2.0/pages.c:2039
+#: client/gui-gtk-2.0/pages.c:2455
msgid "_Browse..."
msgstr "Обзор... (_B)"
-#: client/gui-gtk-2.0/pages.c:1911
+#: client/gui-gtk-2.0/pages.c:1913
msgid "Choose a Scenario"
msgstr "Выберите Ñценарий"
-#: client/gui-gtk-2.0/pages.c:1998
+#: client/gui-gtk-2.0/pages.c:2000
msgid "Choose a _Scenario:"
msgstr "Выберите Ñценарий (_S):"
-#: client/gui-gtk-2.0/pages.c:2173
+#: client/gui-gtk-2.0/pages.c:2175
msgid "Choose a _nation to play:"
msgstr "Выберите народ, которым Вы будете играть (_n):"
-#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2367 client/gui-win32/menu.c:581
msgid "Select Location to Save"
msgstr "Выберите меÑто Ð´Ð»Ñ ÑохранениÑ"
-#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2452 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "Сохранить игру"
-#: client/gui-gtk-2.0/pages.c:2489
+#: client/gui-gtk-2.0/pages.c:2493
msgid "Saved _Games:"
msgstr "Сохранённые игры (_G):"
-#: client/gui-gtk-2.0/pages.c:2516
+#: client/gui-gtk-2.0/pages.c:2520
msgid "Save _Filename:"
msgstr "Ð˜Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ (_F):"
@@ -13236,7 +13393,7 @@ msgstr "Закрыть диалог (Esc)"
msgid "Total users logged in : %d"
msgstr "Ð’Ñего вошедших пользователей: %d"
-#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1098
msgid "Back"
msgstr "Ðазад"
@@ -13245,7 +13402,7 @@ msgid "Start"
msgstr "Ðачать"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:777
+#: client/gui-win32/connectdlg.c:779
msgid "Load Game"
msgstr "Загрузить игру"
@@ -13285,9 +13442,9 @@ msgstr "Сменить дом. город"
#: client/gui-sdl/connectdlg.c:308 client/gui-sdl/connectdlg.c:617
#: client/gui-sdl/connectdlg.c:803 client/gui-sdl/connectdlg.c:985
#: client/gui-sdl/dialogs.c:452 client/gui-sdl/dialogs.c:2095
-#: client/gui-sdl/dialogs.c:2893 client/gui-sdl/diplomat_dialog.c:731
+#: client/gui-sdl/dialogs.c:2902 client/gui-sdl/diplomat_dialog.c:731
#: client/gui-sdl/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1043
#: client/gui-win32/dialogs.c:1772 client/gui-win32/finddlg.c:127
#: client/gui-win32/gotodlg.c:171 client/gui-win32/inputdlg.c:146
#: client/gui-win32/messagedlg.c:216 client/gui-win32/ratesdlg.c:328
@@ -13331,7 +13488,7 @@ msgid "Buy it?"
msgstr "Купить?"
#: 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
+#: client/gui-sdl/diplodlg.c:1336 client/gui-sdl/diplomat_dialog.c:1211
#: client/gui-sdl/diplomat_dialog.c:1417 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:221 client/gui-sdl/repodlgs.c:1559
#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
@@ -13347,7 +13504,7 @@ msgid "No"
msgstr "Ðет"
#: client/gui-sdl/citydlg.c:1215 client/gui-sdl/cma_fe.c:318
-#: client/gui-sdl/diplodlg.c:1345 client/gui-sdl/diplomat_dialog.c:1200
+#: client/gui-sdl/diplodlg.c:1346 client/gui-sdl/diplomat_dialog.c:1200
#: client/gui-sdl/diplomat_dialog.c:1407 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:232 client/gui-win32/repodlgs.c:578
#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
@@ -13652,7 +13809,7 @@ msgstr "Сервер Freeciv :"
msgid "Port :"
msgstr "Порт :"
-#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1100
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr "ПодключитьÑÑ"
@@ -13760,23 +13917,23 @@ msgstr "Выбрать новую форму правлениÑ"
msgid "REVOLUTION!"
msgstr "РЕВОЛЮЦИЯ!"
-#: client/gui-sdl/dialogs.c:2232 client/gui-sdl/dialogs.c:2620
+#: client/gui-sdl/dialogs.c:2237 client/gui-sdl/dialogs.c:2625
#: client/gui-win32/dialogs.c:567 data/Freeciv.in:3159
msgid "Female"
msgstr "ЖенÑкий"
-#: client/gui-sdl/dialogs.c:2234 client/gui-sdl/dialogs.c:2618
-#: client/gui-sdl/dialogs.c:2830 client/gui-win32/dialogs.c:565
+#: client/gui-sdl/dialogs.c:2239 client/gui-sdl/dialogs.c:2623
+#: client/gui-sdl/dialogs.c:2839 client/gui-win32/dialogs.c:565
msgid "Male"
msgstr "МужÑкой"
-#: client/gui-sdl/dialogs.c:2478 client/gui-sdl/dialogs.c:2902
+#: client/gui-sdl/dialogs.c:2483 client/gui-sdl/dialogs.c:2911
#: 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 "Ок"
-#: client/gui-sdl/dialogs.c:2685 client/gui-win32/dialogs.c:505
+#: client/gui-sdl/dialogs.c:2694 client/gui-win32/dialogs.c:505
msgid "What nation will you be?"
msgstr "Каким народом Ð’Ñ‹ будете управлÑÑ‚ÑŒ?"
@@ -13803,53 +13960,53 @@ msgstr "Карта Мира"
msgid "Sea map"
msgstr "Карта морей"
-#: client/gui-sdl/diplodlg.c:563
+#: client/gui-sdl/diplodlg.c:564
msgid "Give embassy"
msgstr "Разрешить поÑольÑтво"
-#: client/gui-sdl/diplodlg.c:579 client/gui-win32/diplodlg.c:614
+#: client/gui-sdl/diplodlg.c:580 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 "Золото (макÑ. %d)"
-#: client/gui-sdl/diplodlg.c:613 client/gui-sdl/helpdlg.c:1956
+#: client/gui-sdl/diplodlg.c:614 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 "ОткрытиÑ"
-#: client/gui-sdl/diplodlg.c:831 client/gui-win32/diplodlg.c:598
+#: client/gui-sdl/diplodlg.c:832 client/gui-win32/diplodlg.c:598
#: data/Freeciv.in:269
msgid "Diplomacy meeting"
msgstr "ДипломатичеÑÐºÐ°Ñ Ð²Ñтреча"
-#: client/gui-sdl/diplodlg.c:883 client/gui-win32/diplodlg.c:680
+#: client/gui-sdl/diplodlg.c:884 client/gui-win32/diplodlg.c:680
#: data/Freeciv.in:510
msgid "Cancel meeting"
msgstr "Отменить переговоры"
-#: client/gui-sdl/diplodlg.c:895 client/gui-win32/diplodlg.c:679
+#: client/gui-sdl/diplodlg.c:896 client/gui-win32/diplodlg.c:679
#: data/Freeciv.in:501
msgid "Accept treaty"
msgstr "ПодпиÑать"
#. TRANS: "Polish incident !" FIXME!!!
-#: client/gui-sdl/diplodlg.c:1304
+#: client/gui-sdl/diplodlg.c:1305
#, c-format
msgid "%s incident !"
msgstr "Инцидент Ñ %s !"
-#: client/gui-sdl/diplodlg.c:1322
+#: client/gui-sdl/diplodlg.c:1323
msgid "Shall we declare WAR on them?"
msgstr "Должны ли мы объÑвить им ВОЙÐУ?"
-#: client/gui-sdl/diplodlg.c:1433
+#: client/gui-sdl/diplodlg.c:1434
msgid "Foreign Minister"
msgstr "МиниÑÑ‚Ñ€ иноÑтранных дел"
-#: client/gui-sdl/diplodlg.c:1449
+#: client/gui-sdl/diplodlg.c:1450
#, c-format
msgid ""
"Sir!, the %s ambassador has arrived\n"
@@ -13858,24 +14015,24 @@ msgstr ""
"Сир! Прибыл поÑол от %s\n"
"Каковы Ваши пожеланиÑ?"
-#: client/gui-sdl/diplodlg.c:1465
+#: client/gui-sdl/diplodlg.c:1466
msgid "Declare WAR"
msgstr "ОбъÑвить ВОЙÐУ"
-#: client/gui-sdl/diplodlg.c:1467 client/gui-win32/plrdlg.c:357
+#: client/gui-sdl/diplodlg.c:1468 client/gui-win32/plrdlg.c:357
msgid "Cancel Treaty"
msgstr "Отменить договор"
-#: client/gui-sdl/diplodlg.c:1490 client/gui-win32/plrdlg.c:358
+#: client/gui-sdl/diplodlg.c:1491 client/gui-win32/plrdlg.c:358
#: data/Freeciv.in:3254
msgid "Withdraw vision"
msgstr "Убрать зрение"
-#: client/gui-sdl/diplodlg.c:1507
+#: client/gui-sdl/diplodlg.c:1508
msgid "Call Diplomatic Meeting"
msgstr "Инициировать дипломатичеÑкую вÑтречу"
-#: client/gui-sdl/diplodlg.c:1521
+#: client/gui-sdl/diplodlg.c:1522
msgid "Send him back"
msgstr "Отправить его назад"
@@ -14625,12 +14782,12 @@ msgid "Leave Game"
msgstr "Покинуть игру"
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1100 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1102 client/gui-xaw/menu.c:121
#: data/Freeciv.in:115 data/Freeciv.in:3180
msgid "Quit"
msgstr "Выйти"
-#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:967
msgid "Start New Game"
msgstr "Ðачать новую игру"
@@ -14743,8 +14900,8 @@ msgstr "Ожидаемый доход: "
msgid "%s max rate : %d%%"
msgstr "%s макÑимальный уровень: %d%%"
-#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
-#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1085
+#: client/gui-win32/connectdlg.c:1093 data/Freeciv.in:155
msgid "Update"
msgstr "Обновить"
@@ -15237,67 +15394,67 @@ msgstr "Ðовый"
msgid "Delete"
msgstr "Удалить"
-#: client/gui-win32/connectdlg.c:147
+#: client/gui-win32/connectdlg.c:149
msgid "Password:"
msgstr "Пароль:"
-#: client/gui-win32/connectdlg.c:169
+#: client/gui-win32/connectdlg.c:171
msgid "Couldn't load the savegame"
msgstr "Ðевозможно загрузить Ñохранённую игру"
-#: client/gui-win32/connectdlg.c:284 client/gui-xaw/connectdlg.c:311
+#: client/gui-win32/connectdlg.c:286 client/gui-xaw/connectdlg.c:311
msgid "Verify Password"
msgstr "Подтвердите пароль"
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:916 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr "Выбор Ñервера Freeciv"
-#: client/gui-win32/connectdlg.c:915
+#: client/gui-win32/connectdlg.c:917
msgid "Local Area Network"
msgstr "Ð›Ð¾ÐºÐ°Ð»ÑŒÐ½Ð°Ñ Ñеть"
-#: client/gui-win32/connectdlg.c:949
+#: client/gui-win32/connectdlg.c:951
msgid "Welcome to Freeciv"
msgstr "Добро пожаловать"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Load Saved Game"
msgstr "Загрузить Ñохранённую игру"
-#: client/gui-win32/connectdlg.c:969
+#: client/gui-win32/connectdlg.c:971
msgid "Connect To Network Game"
msgstr "ПодключитьÑÑ Ðº Ñетевой игре"
-#: client/gui-win32/connectdlg.c:979
+#: client/gui-win32/connectdlg.c:981
msgid "Choose a nation to play"
msgstr "Выберите _народ, которым Вы будете играть:"
-#: client/gui-win32/connectdlg.c:1014
+#: client/gui-win32/connectdlg.c:1016
msgid "Number of players (Including AI):"
msgstr "ЧиÑло игроков (Ð’ÐºÐ»ÑŽÑ‡Ð°Ñ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€Ð½Ñ‹Ñ… игроков):"
-#: client/gui-win32/connectdlg.c:1022
+#: client/gui-win32/connectdlg.c:1024
msgid "AI skill level:"
msgstr "Уровень компьютерного противника (AI):"
-#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1038 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr "ÐаÑтройки игры"
-#: client/gui-win32/connectdlg.c:1040
+#: client/gui-win32/connectdlg.c:1042
msgid "Start Game"
msgstr "Ðачать игру"
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Login:"
msgstr "Логин:"
-#: client/gui-win32/connectdlg.c:1061
+#: client/gui-win32/connectdlg.c:1063
msgid "Host:"
msgstr "ХоÑÑ‚:"
-#: client/gui-win32/connectdlg.c:1062
+#: client/gui-win32/connectdlg.c:1064
msgid "Port:"
msgstr "Порт:"
@@ -15379,21 +15536,21 @@ msgstr ""
"оборудование не поддерживает альфа-Ñмешивание, то иÑпользование Ñтой "
"наÑтройки Ñильно замедлÑет игру."
-#: client/gui-win32/helpdlg.c:769 client/gui-win32/helpdlg.c:792
-#: client/gui-win32/helpdlg.c:803 client/gui-win32/helpdlg.c:809
-#: client/gui-win32/helpdlg.c:822
+#: client/gui-win32/helpdlg.c:775 client/gui-win32/helpdlg.c:798
+#: client/gui-win32/helpdlg.c:809 client/gui-win32/helpdlg.c:815
+#: client/gui-win32/helpdlg.c:828
msgid "Allows "
msgstr "ПозволÑет "
-#: client/gui-win32/helpdlg.c:780
+#: client/gui-win32/helpdlg.c:786
msgid "Obsoletes "
msgstr "УпразднÑет"
-#: client/gui-win32/helpdlg.c:812 client/gui-win32/helpdlg.c:825
+#: client/gui-win32/helpdlg.c:818 client/gui-win32/helpdlg.c:831
msgid " (with "
msgstr " (Ñ "
-#: client/gui-win32/helpdlg.c:815 client/gui-win32/helpdlg.c:828
+#: client/gui-win32/helpdlg.c:821 client/gui-win32/helpdlg.c:834
msgid "?techhelp:)."
msgstr "?techheelp:)."
@@ -16510,11 +16667,12 @@ msgid " Present administrators: "
msgstr " Ðынешние админиÑтраторы: "
#: 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/"
+" https://gna.org/projects/freeciv/"
msgstr ""
"ЕÑли Ð’Ñ‹ нашли ошибку, напишите нам об Ñтом (по-английÑки). Лучше вÑего Ñто "
"Ñделать, поÑетив ÑиÑтему отÑÐ»ÐµÐ¶Ð¸Ð²Ð°Ð½Ð¸Ñ Ð¾ÑˆÐ¸Ð±Ð¾Ðº Freeciv, по адреÑу:\n"
@@ -18853,6 +19011,7 @@ msgid "Hydro Plant"
msgstr "ГÐС"
#: data/default/buildings.ruleset:378
+#, fuzzy
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 "
@@ -18860,46 +19019,43 @@ msgid ""
"a Factory, Mfg. Plant and Hydro Plant together give a 150% production "
"bonus.\n"
"\n"
-"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant. A city "
-"can only build a Hydro Plant if it is next to (or on) a Mountain or River "
-"tile."
+"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant."
msgstr ""
-"Уменьшает количеÑтво загрÑзнений, Ñоздаваемых производÑтвом в городе на 50%. "
-"Также увеличивает производÑтво щитов Фабрикой или Заводом в городе: Фабрика "
-"и ГÐС вмеÑте дают 75% премию, а Фабрика, Завод и ГÐС вмеÑте дают 150% "
-"премию.\n"
+"Уменьшает количеÑтво загрÑзнений, производимых производÑтвом в городе на "
+"50%. Также увеличивает производÑтво щитов Фабрикой или Заводом в городе: "
+"Фабрика и ÐÐС вмеÑте дают 75% премию, а Фабрика, Завод и ÐÐС вмеÑте дают "
+"150% премию.\n"
"\n"
"Город может иметь только одну из ÑлектроÑтанций: Гидро, Тепловую(обычную) "
-"или Ðтомную. Город может поÑтроить ГÐС только еÑли он Ñ€Ñдом Ñ (или на) Горой "
-"или Рекой."
+"или Ðтомную."
-#: data/default/buildings.ruleset:397 data/civ2/buildings.ruleset:373
+#: data/default/buildings.ruleset:396 data/civ2/buildings.ruleset:373
#: data/civ1/buildings.ruleset:297
msgid "Library"
msgstr "Библиотека"
-#: data/default/buildings.ruleset:412
+#: data/default/buildings.ruleset:411
#, no-c-format
msgid "Increases the science output in a city by 100%."
msgstr "УÑкорÑет научные иÑÑÐ»ÐµÐ´Ð¾Ð²Ð°Ð½Ð¸Ñ Ð² городе на 100%."
-#: data/default/buildings.ruleset:417 data/civ2/buildings.ruleset:393
+#: data/default/buildings.ruleset:416 data/civ2/buildings.ruleset:393
#: data/civ1/buildings.ruleset:317
msgid "Marketplace"
msgstr "Рынок"
-#: data/default/buildings.ruleset:432 data/civ2/buildings.ruleset:408
+#: data/default/buildings.ruleset:431 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 "Увеличивает количеÑтво роÑкоши и налогов в городе на 50%."
-#: data/default/buildings.ruleset:437 data/civ2/buildings.ruleset:413
+#: data/default/buildings.ruleset:436 data/civ2/buildings.ruleset:413
#: data/civ1/buildings.ruleset:337
msgid "Mass Transit"
msgstr "ТранÑпорт"
-#: data/default/buildings.ruleset:451 data/civ2/buildings.ruleset:427
+#: data/default/buildings.ruleset:450 data/civ2/buildings.ruleset:427
#: data/civ1/buildings.ruleset:351
msgid ""
"Neutralizes the pollution generated by the population. The population "
@@ -18908,12 +19064,12 @@ msgstr ""
"Ðейтрализует загрÑзнение, производимое наÑелением. ÐаÑеление переÑтает "
"влиÑÑ‚ÑŒ на загрÑзнение, производимое городом."
-#: data/default/buildings.ruleset:458 data/civ2/buildings.ruleset:434
+#: data/default/buildings.ruleset:457 data/civ2/buildings.ruleset:434
#: data/civ1/buildings.ruleset:358
msgid "Mfg. Plant"
msgstr "Завод"
-#: data/default/buildings.ruleset:474 data/civ2/buildings.ruleset:450
+#: data/default/buildings.ruleset:473 data/civ2/buildings.ruleset:450
#: data/civ1/buildings.ruleset:374
#, no-c-format
msgid ""
@@ -18921,12 +19077,12 @@ msgid ""
"production in a city by 100%."
msgstr "ВмеÑте Ñ Ð¤Ð°Ð±Ñ€Ð¸ÐºÐ¾Ð¹, Завод увеличивает производÑтво щитов на 100%."
-#: data/default/buildings.ruleset:480 data/civ2/buildings.ruleset:456
+#: data/default/buildings.ruleset:479 data/civ2/buildings.ruleset:456
#: data/civ1/buildings.ruleset:380
msgid "Nuclear Plant"
msgstr "ÐÐС"
-#: data/default/buildings.ruleset:495
+#: data/default/buildings.ruleset:494
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 "
@@ -18944,11 +19100,11 @@ msgstr ""
"Город может иметь только одну из ÑлектроÑтанций: Гидро, Тепловую(обычную) "
"или Ðтомную."
-#: data/default/buildings.ruleset:515 data/civ2/buildings.ruleset:489
+#: data/default/buildings.ruleset:514 data/civ2/buildings.ruleset:489
msgid "Offshore Platform"
msgstr "Платформа"
-#: data/default/buildings.ruleset:530 data/civ2/buildings.ruleset:504
+#: data/default/buildings.ruleset:529 data/civ2/buildings.ruleset:504
msgid ""
"Adds 1 extra shield resource on all Ocean squares in a city. The city needs "
"to be coastal to build this improvement."
@@ -18956,12 +19112,12 @@ msgstr ""
"ДобавлÑет 1 лишний реÑÑƒÑ€Ñ ÐµÐ´Ñ‹ ко вÑем океанÑким квадратам. Ð”Ð»Ñ Ð¿Ð¾Ñтройки "
"Ñтого Ð·Ð´Ð°Ð½Ð¸Ñ Ð³Ð¾Ñ€Ð¾Ð´ должен быть на побережье."
-#: data/default/buildings.ruleset:536 data/civ2/buildings.ruleset:510
+#: data/default/buildings.ruleset:535 data/civ2/buildings.ruleset:510
#: data/civ1/buildings.ruleset:411
msgid "Palace"
msgstr "Дворец"
-#: data/default/buildings.ruleset:552
+#: data/default/buildings.ruleset:551
#, no-c-format
msgid ""
"Makes a city the capital and the center of your government. Corruption in "
@@ -18989,11 +19145,11 @@ msgstr ""
"При ДеÑпотизме дворец даёт 75%-ный, при Монархии - 50%-ный Ð±Ð¾Ð½ÑƒÑ "
"производÑтва."
-#: data/default/buildings.ruleset:569 data/civ2/buildings.ruleset:539
+#: data/default/buildings.ruleset:568 data/civ2/buildings.ruleset:539
msgid "Police Station"
msgstr "ПолициÑ"
-#: data/default/buildings.ruleset:583 data/civ2/buildings.ruleset:553
+#: data/default/buildings.ruleset:582 data/civ2/buildings.ruleset:553
msgid ""
"Reduces the unhappiness caused by military units outside the city by 2 under "
"Democracy and 1 under Republic. This improvement has no effect under other "
@@ -19002,11 +19158,11 @@ msgstr ""
"Уменьшает неÑчаÑтье, вызванное военными ÑоединениÑми за городом на 2 при "
"Демократии и на 1 при РеÑпублике. Ðе дейÑтвует при других формах правлениÑ."
-#: data/default/buildings.ruleset:593 data/civ2/buildings.ruleset:560
+#: data/default/buildings.ruleset:592 data/civ2/buildings.ruleset:560
msgid "Port Facility"
msgstr "Порт"
-#: data/default/buildings.ruleset:608 data/civ2/buildings.ruleset:575
+#: data/default/buildings.ruleset:607 data/civ2/buildings.ruleset:575
msgid ""
"Allows a city to build veteran sea units. Also, damaged sea units which "
"stay in town for one full turn without moving are completely restored."
@@ -19015,12 +19171,12 @@ msgstr ""
"Ñтого, повреждённые Ñоединение, оÑтающиеÑÑ Ð² городе в течение хода, "
"полноÑтью воÑÑтанавливаютÑÑ."
-#: data/default/buildings.ruleset:615 data/civ2/buildings.ruleset:582
+#: data/default/buildings.ruleset:614 data/civ2/buildings.ruleset:582
#: data/civ1/buildings.ruleset:440
msgid "Power Plant"
msgstr "ТÐС"
-#: data/default/buildings.ruleset:631
+#: data/default/buildings.ruleset:630
#, no-c-format
msgid ""
"Increases the shield production of a Factory or Mfg. Plant in a city: a "
@@ -19037,12 +19193,12 @@ msgstr ""
"Город может иметь только одну из ÑлектроÑтанций: Гидро, Тепловую(обычную) "
"или Ðтомную."
-#: data/default/buildings.ruleset:646 data/civ2/buildings.ruleset:610
+#: data/default/buildings.ruleset:645 data/civ2/buildings.ruleset:610
#: data/civ1/buildings.ruleset:468
msgid "Recycling Center"
msgstr "Переработка"
-#: data/default/buildings.ruleset:661 data/civ2/buildings.ruleset:625
+#: data/default/buildings.ruleset:660 data/civ2/buildings.ruleset:625
#: data/civ1/buildings.ruleset:483
#, no-c-format
msgid ""
@@ -19052,11 +19208,11 @@ msgstr ""
"ПоÑтройка перерабатывающего центра уменьшает количеÑтво загрÑзнений, "
"возникающих в городе в результате производÑтва, на 66%."
-#: data/default/buildings.ruleset:667 data/civ2/buildings.ruleset:631
+#: data/default/buildings.ruleset:666 data/civ2/buildings.ruleset:631
msgid "Research Lab"
msgstr "ЛабораториÑ"
-#: data/default/buildings.ruleset:682
+#: data/default/buildings.ruleset:681
msgid ""
"Together with a Library, a Research Lab increases the science production of "
"a city by 200%. Together with a Library and a University, a Research Lab "
@@ -19067,11 +19223,11 @@ msgstr ""
"ИÑÑледовательÑÐºÐ°Ñ Ð»Ð°Ð±Ð¾Ñ€Ð°Ñ‚Ð¾Ñ€Ð¸Ñ ÑƒÐ²ÐµÐ»Ð¸Ñ‡Ð¸Ð²Ð°ÐµÑ‚ ÑкороÑÑ‚ÑŒ Ñ€Ð°Ð·Ð²Ð¸Ñ‚Ð¸Ñ Ð½Ð°ÑƒÐºÐ¸ в городе "
"на 450%."
-#: data/default/buildings.ruleset:690 data/civ2/buildings.ruleset:654
+#: data/default/buildings.ruleset:689 data/civ2/buildings.ruleset:654
msgid "SAM Battery"
msgstr "Ð‘Ð°Ñ‚Ð°Ñ€ÐµÑ ÐŸÐ’Ðž"
-#: data/default/buildings.ruleset:704 data/civ2/buildings.ruleset:668
+#: data/default/buildings.ruleset:703 data/civ2/buildings.ruleset:668
msgid ""
"Doubles the defense of all units inside the city when attacked by non-"
"nuclear air units."
@@ -19079,12 +19235,12 @@ msgstr ""
"Удваивает защиту вÑех Ñоединений в городе против атак не-Ñдерных воздушных "
"Ñоедниений."
-#: data/default/buildings.ruleset:710 data/civ2/buildings.ruleset:674
+#: data/default/buildings.ruleset:709 data/civ2/buildings.ruleset:674
#: data/civ1/buildings.ruleset:489
msgid "SDI Defense"
msgstr "СиÑтема ПРО"
-#: data/default/buildings.ruleset:724 data/civ2/buildings.ruleset:688
+#: data/default/buildings.ruleset:723 data/civ2/buildings.ruleset:688
#: data/civ1/buildings.ruleset:503
msgid ""
"Protects a city from attacks from Nuclear units. Nuclear attacks simply "
@@ -19095,11 +19251,11 @@ msgstr ""
"бомбы) проÑто не дейÑтвуют против Ñтого города. Также удваивает защиту "
"против не-Ñдерных ракет."
-#: data/default/buildings.ruleset:733 data/civ2/buildings.ruleset:697
+#: data/default/buildings.ruleset:732 data/civ2/buildings.ruleset:697
msgid "Sewer System"
msgstr "КанализациÑ"
-#: data/default/buildings.ruleset:748 data/civ2/buildings.ruleset:712
+#: data/default/buildings.ruleset:747 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."
@@ -19107,12 +19263,12 @@ msgstr ""
"ПозволÑет городу выраÑти Ñверх 12 жителей. Ðкведук также необходим Ð´Ð»Ñ Ñ€Ð¾Ñта "
"Ñвыше 8 жителей."
-#: data/default/buildings.ruleset:754 data/civ2/buildings.ruleset:749
+#: data/default/buildings.ruleset:753 data/civ2/buildings.ruleset:749
#: data/civ1/buildings.ruleset:512
msgid "Space Component"
msgstr "КоÑм. компонент"
-#: data/default/buildings.ruleset:769 data/civ2/buildings.ruleset:763
+#: data/default/buildings.ruleset:768 data/civ2/buildings.ruleset:763
#: data/civ1/buildings.ruleset:526
msgid ""
"Space Components can be differentiated into Propulsion and Fuel Components. "
@@ -19129,12 +19285,12 @@ msgstr ""
"Прежде, чем Ð’Ñ‹ Ñможете Ñтроить любые чаÑти коÑмичеÑкого кораблÑ, чудо "
"Программа Ðполлон должно быть поÑтроено любым игроком."
-#: data/default/buildings.ruleset:779 data/civ2/buildings.ruleset:773
+#: data/default/buildings.ruleset:778 data/civ2/buildings.ruleset:773
#: data/civ1/buildings.ruleset:536
msgid "Space Module"
msgstr "КоÑм. модуль"
-#: data/default/buildings.ruleset:794 data/civ2/buildings.ruleset:787
+#: data/default/buildings.ruleset:793 data/civ2/buildings.ruleset:787
#: data/civ1/buildings.ruleset:550
msgid ""
"Space Modules are the most expensive parts of spaceships. There are three "
@@ -19165,12 +19321,12 @@ msgstr ""
"Прежде, чем Ð’Ñ‹ Ñможете Ñтроить какие-либо чаÑти коÑмичеÑкого кораблÑ, чудо "
"Программа Ðполлон должно быть поÑтроено любым из игроков."
-#: data/default/buildings.ruleset:813 data/civ2/buildings.ruleset:806
+#: data/default/buildings.ruleset:812 data/civ2/buildings.ruleset:806
#: data/civ1/buildings.ruleset:569
msgid "Space Structural"
msgstr "КоÑм. Ñтруктура"
-#: data/default/buildings.ruleset:828 data/civ2/buildings.ruleset:820
+#: data/default/buildings.ruleset:827 data/civ2/buildings.ruleset:820
#: data/civ1/buildings.ruleset:583
msgid ""
"Space Structurals form the base of your spaceship. All other spaceship "
@@ -19187,11 +19343,11 @@ msgstr ""
"Прежде, чем Ð’Ñ‹ Ñможете Ñтроить какие-либо чаÑти коÑмичеÑкого кораблÑ, чудо "
"Программа Ðполлон должно быть поÑтроено любым из игроков."
-#: data/default/buildings.ruleset:838 data/civ2/buildings.ruleset:830
+#: data/default/buildings.ruleset:837 data/civ2/buildings.ruleset:830
msgid "Stock Exchange"
msgstr "Биржа"
-#: data/default/buildings.ruleset:854 data/civ2/buildings.ruleset:846
+#: data/default/buildings.ruleset:853 data/civ2/buildings.ruleset:846
#, no-c-format
msgid ""
"Together with a Marketplace and a Bank, a Stock Exchange boosts tax and "
@@ -19200,11 +19356,11 @@ msgstr ""
"ВмеÑте Ñ Ð Ñ‹Ð½ÐºÐ¾Ð¼ и Банком, Биржа увеличивает налоги и роÑкошь в городе на "
"150%."
-#: data/default/buildings.ruleset:860 data/civ2/buildings.ruleset:852
+#: data/default/buildings.ruleset:859 data/civ2/buildings.ruleset:852
msgid "Super Highways"
msgstr "ÐвтомагиÑтрали"
-#: data/default/buildings.ruleset:875 data/civ2/buildings.ruleset:867
+#: data/default/buildings.ruleset:874 data/civ2/buildings.ruleset:867
#, no-c-format
msgid ""
"Increases trade resources by 50% on all squares with roads or railroads."
@@ -19212,11 +19368,11 @@ msgstr ""
"Увеличивает торговые реÑурÑÑ‹ на 50% на вÑех квадратах Ñ Ð´Ð¾Ñ€Ð¾Ð³Ð°Ð¼Ð¸ или "
"железными дорогами."
-#: data/default/buildings.ruleset:883 data/civ2/buildings.ruleset:873
+#: data/default/buildings.ruleset:882 data/civ2/buildings.ruleset:873
msgid "Supermarket"
msgstr "Супермаркет"
-#: data/default/buildings.ruleset:898 data/civ2/buildings.ruleset:888
+#: data/default/buildings.ruleset:897 data/civ2/buildings.ruleset:888
#, no-c-format
msgid ""
"Increases the food resources by 50% on each farmland square which is being "
@@ -19227,12 +19383,12 @@ msgstr ""
"иÑпользуемом вокруг города. Квадратами типа Ферма ÑвлÑÑŽÑ‚ÑÑ Ñ‚Ðµ, которые были "
"орошены дважды."
-#: data/default/buildings.ruleset:905 data/civ2/buildings.ruleset:895
+#: data/default/buildings.ruleset:904 data/civ2/buildings.ruleset:895
#: data/civ1/buildings.ruleset:593
msgid "Temple"
msgstr "Храм"
-#: data/default/buildings.ruleset:919 data/civ2/buildings.ruleset:909
+#: data/default/buildings.ruleset:918 data/civ2/buildings.ruleset:909
#: data/civ1/buildings.ruleset:607
msgid ""
"Makes one unhappy citizen content. Both the Mysticism advance and the "
@@ -19243,13 +19399,13 @@ msgstr ""
"удваивает Ñтот Ñффект, также поÑтройка чуда Оракул удваивает Ñтот Ñффект. "
"Оба вмеÑте делают нейтральными 4-x граждан."
-#: data/default/buildings.ruleset:926 data/civ2/buildings.ruleset:916
+#: data/default/buildings.ruleset:925 data/civ2/buildings.ruleset:916
#: data/civ1/buildings.ruleset:614 data/default/techs.ruleset:742
#: data/civ2/techs.ruleset:727 data/civ1/techs.ruleset:723
msgid "University"
msgstr "УниверÑитет"
-#: data/default/buildings.ruleset:942
+#: data/default/buildings.ruleset:941
#, no-c-format
msgid ""
"Together with a Library, a University increases the science production of a "
@@ -19258,12 +19414,12 @@ msgstr ""
"ВмеÑте Ñ Ð±Ð¸Ð±Ð»Ð¸Ð¾Ñ‚ÐµÐºÐ¾Ð¹, УниверÑитет увеличивает ÑкороÑÑ‚ÑŒ Ñ€Ð°Ð·Ð²Ð¸Ñ‚Ð¸Ñ Ð½Ð°ÑƒÐºÐ¸ в "
"городе на 250%"
-#: data/default/buildings.ruleset:948 data/civ2/buildings.ruleset:938
+#: data/default/buildings.ruleset:947 data/civ2/buildings.ruleset:938
#: data/civ1/buildings.ruleset:636
msgid "Apollo Program"
msgstr "Проект Aполлон"
-#: data/default/buildings.ruleset:962 data/civ2/buildings.ruleset:952
+#: data/default/buildings.ruleset:961 data/civ2/buildings.ruleset:952
msgid ""
"Entire map becomes visible for the player who owns it. It allows all "
"players to start building spaceship parts (assuming they have researched the "
@@ -19273,11 +19429,11 @@ msgstr ""
"позволÑет вÑем игрокам начать ÑтроительÑтво деталей коÑмичеÑкого ÐºÐ¾Ñ€Ð°Ð±Ð»Ñ "
"(предполагаетÑÑ, что они иÑÑледовали вÑе необходимые технологии)."
-#: data/default/buildings.ruleset:969 data/civ2/buildings.ruleset:959
+#: data/default/buildings.ruleset:968 data/civ2/buildings.ruleset:959
msgid "A.Smith's Trading Co."
msgstr "ÐšÐ¾Ð¼Ð¿Ð°Ð½Ð¸Ñ A.Смита"
-#: data/default/buildings.ruleset:983
+#: data/default/buildings.ruleset:982
msgid ""
"City improvements which would normally have an upkeep of 1 are free of "
"upkeep, for all your cities."
@@ -19285,12 +19441,12 @@ msgstr ""
"ГородÑкие улучшениÑ, обычно требующие 1 единицу золота на поддержку, "
"ÑтановÑÑ‚ÑÑ Ð±ÐµÑплатными, Ð´Ð»Ñ Ð²Ñех городов."
-#: data/default/buildings.ruleset:989 data/civ2/buildings.ruleset:979
+#: data/default/buildings.ruleset:988 data/civ2/buildings.ruleset:979
#: data/civ1/buildings.ruleset:655
msgid "Colossus"
msgstr "КолоÑÑ"
-#: data/default/buildings.ruleset:1003 data/civ2/buildings.ruleset:993
+#: data/default/buildings.ruleset:1002 data/civ2/buildings.ruleset:993
#: data/civ1/buildings.ruleset:669
msgid ""
"Each square around the city where this wonder is built that is already "
@@ -19299,23 +19455,23 @@ msgstr ""
"Каждый квадрат вокруг города Ñ Ñтим чудом, который производит торговые "
"реÑурÑÑ‹, производит один дополнительный торговый реÑурÑ"
-#: data/default/buildings.ruleset:1009 data/civ2/buildings.ruleset:999
+#: data/default/buildings.ruleset:1008 data/civ2/buildings.ruleset:999
#: data/civ1/buildings.ruleset:675
msgid "Copernicus' Observatory"
msgstr "ОбÑÐµÑ€Ð²Ð°Ñ‚Ð¾Ñ€Ð¸Ñ ÐšÐ¾Ð¿ÐµÑ€Ð½Ð¸ÐºÐ°"
-#: data/default/buildings.ruleset:1024 data/civ2/buildings.ruleset:1180
+#: data/default/buildings.ruleset:1023 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 "УÑкорÑет развитие науки на 100% в городе где поÑтроен."
-#: data/default/buildings.ruleset:1029 data/civ2/buildings.ruleset:1019
+#: data/default/buildings.ruleset:1028 data/civ2/buildings.ruleset:1019
#: data/civ1/buildings.ruleset:695
msgid "Cure For Cancer"
msgstr "ЛекарÑтво от рака"
-#: data/default/buildings.ruleset:1043
+#: data/default/buildings.ruleset:1042
msgid ""
"This stunning technological achievement makes one unhappy citizen content in "
"all your cities."
@@ -19323,12 +19479,12 @@ msgstr ""
"Ðто невероÑтное открытие делает одного недовольного гражданина довольным во "
"вÑех Ваших городах."
-#: data/default/buildings.ruleset:1051 data/civ2/buildings.ruleset:1039
+#: data/default/buildings.ruleset:1050 data/civ2/buildings.ruleset:1039
#: data/civ1/buildings.ruleset:715
msgid "Darwin's Voyage"
msgstr "ПутешеÑтвие Дарвина"
-#: data/default/buildings.ruleset:1065 data/civ2/buildings.ruleset:1053
+#: data/default/buildings.ruleset:1064 data/civ2/buildings.ruleset:1053
#: data/civ1/buildings.ruleset:729
msgid ""
"Charles Darwin's voyage sparked the discovery of the evolution of the "
@@ -19338,11 +19494,11 @@ msgstr ""
"ПутешеÑтвие Дарвина привело к открытию Ñволюции видов, что вызвало "
"увеличение веры в науку. Даёт два немедленных научных открытиÑ."
-#: data/default/buildings.ruleset:1072 data/civ2/buildings.ruleset:1060
+#: data/default/buildings.ruleset:1071 data/civ2/buildings.ruleset:1060
msgid "Eiffel Tower"
msgstr "Ðйфелева башнÑ"
-#: data/default/buildings.ruleset:1087
+#: data/default/buildings.ruleset:1086
#, no-c-format
msgid ""
"Your reputation and goodwill among other nations is recovered twice as fast."
@@ -19350,12 +19506,12 @@ msgstr ""
"Ваша Ñ€ÐµÐ¿ÑƒÑ‚Ð°Ñ†Ð¸Ñ Ð¸ доброе к Вам отношение других народов воÑÑтанавливаетÑÑ Ð² "
"два раза быÑтрее."
-#: data/default/buildings.ruleset:1093 data/civ2/buildings.ruleset:1081
+#: data/default/buildings.ruleset:1092 data/civ2/buildings.ruleset:1081
#: data/civ1/buildings.ruleset:736
msgid "Great Library"
msgstr "Ð’ÐµÐ»Ð¸ÐºÐ°Ñ Ð±Ð¸Ð±Ð»Ð¸Ð¾Ñ‚ÐµÐºÐ°"
-#: data/default/buildings.ruleset:1107 data/civ2/buildings.ruleset:1095
+#: data/default/buildings.ruleset:1106 data/civ2/buildings.ruleset:1095
#: data/civ1/buildings.ruleset:750
msgid ""
"The civilization which builds the Great Library gets every advance that at "
@@ -19364,21 +19520,21 @@ msgstr ""
"ЦивилизациÑ, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð¿Ð¾Ñтроила Великую Библиотеку узнает каждое открытие, "
"которое Ñделают Ñ…Ð¾Ñ‚Ñ Ð±Ñ‹ две другие цивилизации."
-#: data/default/buildings.ruleset:1113 data/civ2/buildings.ruleset:1101
+#: data/default/buildings.ruleset:1112 data/civ2/buildings.ruleset:1101
#: data/civ1/buildings.ruleset:756
msgid "Great Wall"
msgstr "Ð’ÐµÐ»Ð¸ÐºÐ°Ñ Ñтена"
-#: data/default/buildings.ruleset:1127
+#: data/default/buildings.ruleset:1126
msgid "Works as a City Wall in all your cities."
msgstr "ДейÑтвует как городÑÐºÐ°Ñ Ñтена Ð´Ð»Ñ Ð²Ñех городов."
-#: data/default/buildings.ruleset:1135 data/civ2/buildings.ruleset:1122
+#: data/default/buildings.ruleset:1134 data/civ2/buildings.ruleset:1122
#: data/civ1/buildings.ruleset:777
msgid "Hanging Gardens"
msgstr "ВиÑÑчие Ñады"
-#: data/default/buildings.ruleset:1149 data/civ2/buildings.ruleset:1136
+#: data/default/buildings.ruleset:1148 data/civ2/buildings.ruleset:1136
#: data/civ1/buildings.ruleset:791
msgid ""
"Makes one content citizen happy in every city. Makes two extra content "
@@ -19393,12 +19549,12 @@ msgstr ""
"нет нейтральных граждан, чудо дейÑтвует на недовольных граждан (Ð´ÐµÐ»Ð°Ñ Ð¸Ñ… "
"нейтральными)."
-#: data/default/buildings.ruleset:1158 data/civ2/buildings.ruleset:1145
+#: data/default/buildings.ruleset:1157 data/civ2/buildings.ruleset:1145
#: data/civ1/buildings.ruleset:800
msgid "Hoover Dam"
msgstr "Дамба Гувера"
-#: data/default/buildings.ruleset:1173 data/civ2/buildings.ruleset:1159
+#: data/default/buildings.ruleset:1172 data/civ2/buildings.ruleset:1159
msgid ""
"Works as if you had a Hydro Plant in every city. (This reduces pollution "
"and increases the effects of Factories and Mfg. Plants.)"
@@ -19406,12 +19562,12 @@ msgstr ""
"ДейÑтвует как еÑли бы в каждом городе было по ГÐС. (Ðто уменьшает "
"загрÑÐ·Ð½ÐµÐ½Ð¸Ñ Ð¾Ñ‚ Фабрик и Заводов.)"
-#: data/default/buildings.ruleset:1179 data/civ2/buildings.ruleset:1165
+#: data/default/buildings.ruleset:1178 data/civ2/buildings.ruleset:1165
#: data/civ1/buildings.ruleset:822
msgid "Isaac Newton's College"
msgstr "Колледж И.Ðьютона"
-#: data/default/buildings.ruleset:1194
+#: data/default/buildings.ruleset:1193
#, no-c-format
msgid ""
"Boosts science production by 100% in every city you control that has a "
@@ -19420,20 +19576,20 @@ msgstr ""
"УÑкорÑет развитие науки на 100% в каждом из ваших городов, где поÑтроен "
"УниверÑитет."
-#: data/default/buildings.ruleset:1200 data/civ2/buildings.ruleset:1185
+#: data/default/buildings.ruleset:1199 data/civ2/buildings.ruleset:1185
#: data/civ1/buildings.ruleset:842
msgid "J.S. Bach's Cathedral"
msgstr "Собор И.C.Баха"
-#: data/default/buildings.ruleset:1214 data/civ2/buildings.ruleset:1199
+#: data/default/buildings.ruleset:1213 data/civ2/buildings.ruleset:1199
msgid "Makes two unhappy citizens content in every city."
msgstr "Делает двух недовольных граждан в каждом городе нейтральными."
-#: data/default/buildings.ruleset:1219 data/civ2/buildings.ruleset:1204
+#: data/default/buildings.ruleset:1218 data/civ2/buildings.ruleset:1204
msgid "King Richard's Crusade"
msgstr "КреÑтовый поход"
-#: data/default/buildings.ruleset:1233 data/civ2/buildings.ruleset:1218
+#: data/default/buildings.ruleset:1232 data/civ2/buildings.ruleset:1218
msgid ""
"Adds one extra shield resource on every square around the city where it is "
"built."
@@ -19441,20 +19597,20 @@ msgstr ""
"ДобавлÑет один лишний реÑурÑ-щит на каждом квадрате вокруг города, где он "
"поÑтроен."
-#: data/default/buildings.ruleset:1239 data/civ2/buildings.ruleset:1224
+#: data/default/buildings.ruleset:1238 data/civ2/buildings.ruleset:1224
msgid "Leonardo's Workshop"
msgstr "МаÑтерÑÐºÐ°Ñ Ð›ÐµÐ¾Ð½Ð°Ñ€Ð´Ð¾"
-#: data/default/buildings.ruleset:1253 data/civ2/buildings.ruleset:1238
+#: data/default/buildings.ruleset:1252 data/civ2/buildings.ruleset:1238
msgid "Upgrades one obsolete unit per game turn."
msgstr "Модернизирует одно уÑтаревшее Ñоединение за ход игры."
-#: data/default/buildings.ruleset:1258 data/civ2/buildings.ruleset:1243
+#: data/default/buildings.ruleset:1257 data/civ2/buildings.ruleset:1243
#: data/civ1/buildings.ruleset:862
msgid "Lighthouse"
msgstr "МаÑк"
-#: data/default/buildings.ruleset:1273
+#: data/default/buildings.ruleset:1272
msgid ""
"Gives all your sea units 1 additional movement point and eliminates the risk "
"of losing Triremes on the high seas. Makes all your new sea units veterans "
@@ -19464,34 +19620,34 @@ msgstr ""
"потери Трирем в море. Делает вÑе новые морÑкие ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð²ÐµÑ‚ÐµÑ€Ð°Ð½Ð°Ð¼Ð¸ (во "
"вÑех городах)."
-#: data/default/buildings.ruleset:1280 data/civ2/buildings.ruleset:1264
+#: data/default/buildings.ruleset:1279 data/civ2/buildings.ruleset:1264
#: data/civ1/buildings.ruleset:885
msgid "Magellan's Expedition"
msgstr "ПутешеÑтвие Магеллана"
-#: data/default/buildings.ruleset:1295
+#: data/default/buildings.ruleset:1294
msgid "Gives all your sea units 2 additional movement points."
msgstr "Даёт вÑем морÑким ÑоединениÑм 2 дополнительных хода."
-#: data/default/buildings.ruleset:1300 data/civ2/buildings.ruleset:1283
+#: data/default/buildings.ruleset:1299 data/civ2/buildings.ruleset:1283
#: data/civ1/buildings.ruleset:904
msgid "Manhattan Project"
msgstr "Проект МанхÑÑ‚Ñ‚Ñн"
-#: data/default/buildings.ruleset:1318 data/civ2/buildings.ruleset:1301
+#: data/default/buildings.ruleset:1317 data/civ2/buildings.ruleset:1301
msgid "Marco Polo's Embassy"
msgstr "ПоÑольÑтво Марко Поло"
-#: data/default/buildings.ruleset:1332 data/civ2/buildings.ruleset:1315
+#: data/default/buildings.ruleset:1331 data/civ2/buildings.ruleset:1315
msgid "The player who owns it gets an embassy with all players."
msgstr "Игрок имеющий Ñто чудо, получает поÑольÑтвa Ñо вÑеми игроками."
-#: data/default/buildings.ruleset:1337 data/civ2/buildings.ruleset:1320
+#: data/default/buildings.ruleset:1336 data/civ2/buildings.ruleset:1320
#: data/civ1/buildings.ruleset:922
msgid "Michelangelo's Chapel"
msgstr "Капелла Микеланджело"
-#: data/default/buildings.ruleset:1351 data/civ2/buildings.ruleset:1334
+#: data/default/buildings.ruleset:1350 data/civ2/buildings.ruleset:1334
msgid ""
"Counts as having a Cathedral in each of your cities. This makes 3 unhappy "
"citizens content in each city. The discovery of Theology increases the "
@@ -19504,23 +19660,23 @@ msgstr ""
"увеличивает Ñффект на единицу, а открытие Коммунизма уменьшает его на "
"единицу.)"
-#: data/default/buildings.ruleset:1361 data/civ2/buildings.ruleset:1344
+#: data/default/buildings.ruleset:1360 data/civ2/buildings.ruleset:1344
#: data/civ1/buildings.ruleset:941
msgid "Oracle"
msgstr "Оракул"
-#: data/default/buildings.ruleset:1375
+#: data/default/buildings.ruleset:1374
msgid "Makes two of your unhappy citizens content in every city with a temple."
msgstr ""
"Делает двух недовольных граждан в каждом городе нейтральными в каждом "
"городе, где еÑÑ‚ÑŒ храм."
-#: data/default/buildings.ruleset:1380 data/civ2/buildings.ruleset:1363
+#: data/default/buildings.ruleset:1379 data/civ2/buildings.ruleset:1363
#: data/civ1/buildings.ruleset:960
msgid "Pyramids"
msgstr "Пирамиды"
-#: data/default/buildings.ruleset:1394
+#: data/default/buildings.ruleset:1393
msgid ""
"The amount of stored food lost when one of your cities grows or shrinks is "
"reduced by 25%. This helps a city to grow faster and more easily withstand "
@@ -19530,32 +19686,32 @@ msgstr ""
"уменьшаетÑÑ Ð½Ð° 25%. Ðто ÑпоÑобÑтвует более быÑтрому роÑту города. Ðффект "
"кумулÑтивен Ñ Ñффектом Ðмбара."
-#: data/default/buildings.ruleset:1401 data/civ2/buildings.ruleset:1382
+#: data/default/buildings.ruleset:1400 data/civ2/buildings.ruleset:1382
#: data/civ1/buildings.ruleset:981
msgid "SETI Program"
msgstr "Программа SETI"
-#: data/default/buildings.ruleset:1415
+#: data/default/buildings.ruleset:1414
msgid "Boosts science production in each city with a Research Lab by 100%. "
msgstr ""
"Увеличивает производÑтво науки в каждом городе Ñ Ð˜ÑÑледовательÑкой "
"лабораторией на 100%."
-#: data/default/buildings.ruleset:1420 data/civ2/buildings.ruleset:1402
+#: data/default/buildings.ruleset:1419 data/civ2/buildings.ruleset:1402
#: data/civ1/buildings.ruleset:1001
msgid "Shakespeare's Theatre"
msgstr "Театр ШекÑпира"
-#: data/default/buildings.ruleset:1434 data/civ2/buildings.ruleset:1416
+#: data/default/buildings.ruleset:1433 data/civ2/buildings.ruleset:1416
#: data/civ1/buildings.ruleset:1015
msgid "Makes all unhappy citizens content, in the city where it is located."
msgstr "Делает вÑех неÑчаÑтных граждан нейтральными в городе где уÑтановлено."
-#: data/default/buildings.ruleset:1439 data/civ2/buildings.ruleset:1421
+#: data/default/buildings.ruleset:1438 data/civ2/buildings.ruleset:1421
msgid "Statue of Liberty"
msgstr "Ð¡Ñ‚Ð°Ñ‚ÑƒÑ Ñвободы"
-#: data/default/buildings.ruleset:1453 data/civ2/buildings.ruleset:1435
+#: data/default/buildings.ruleset:1452 data/civ2/buildings.ruleset:1435
#: data/civ1/buildings.ruleset:974 data/civ1/buildings.ruleset:1034
msgid ""
"Allows you to choose any government, including those that have not yet been "
@@ -19565,11 +19721,11 @@ msgstr ""
"ПозволÑет Вам выбрать любую форму правлениÑ, в том чиÑле ту, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ ÐµÑ‰Ðµ не "
"была открыта Вашей цивилизацией без переходного периода анархии."
-#: data/default/buildings.ruleset:1460 data/civ2/buildings.ruleset:1442
+#: data/default/buildings.ruleset:1459 data/civ2/buildings.ruleset:1442
msgid "Sun Tzu's War Academy"
msgstr "Ð’Ð¾ÐµÐ½Ð½Ð°Ñ Ð°ÐºÐ°Ð´ÐµÐ¼Ð¸Ñ"
-#: data/default/buildings.ruleset:1474
+#: data/default/buildings.ruleset:1473
msgid ""
"All your new ground units start at the first veteran level. The chance of a "
"unit getting the next veteran level after a battle increases by half."
@@ -19578,21 +19734,21 @@ msgstr ""
"ШанÑÑ‹ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ñтать ветераном Ñледующего ÑƒÑ€Ð¾Ð²Ð½Ñ Ð¿Ð¾Ñле битвы увеличиваютÑÑ "
"на половину."
-#: data/default/buildings.ruleset:1481 data/civ2/buildings.ruleset:1463
+#: data/default/buildings.ruleset:1480 data/civ2/buildings.ruleset:1463
#: data/civ1/buildings.ruleset:1020
msgid "United Nations"
msgstr "ООÐ"
-#: data/default/buildings.ruleset:1495
+#: data/default/buildings.ruleset:1494
msgid "All your units regain two extra hitpoints per turn."
msgstr "Ð¡Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð»ÑƒÑ‡Ð°ÑŽÑ‚ две лишних единицы Ð·Ð´Ð¾Ñ€Ð¾Ð²ÑŒÑ Ð·Ð° ход."
-#: data/default/buildings.ruleset:1508 data/civ2/buildings.ruleset:1490
+#: data/default/buildings.ruleset:1507 data/civ2/buildings.ruleset:1490
#: data/civ1/buildings.ruleset:1046
msgid "Women's Suffrage"
msgstr "Избир. право женщин"
-#: data/default/buildings.ruleset:1522 data/civ2/buildings.ruleset:1504
+#: data/default/buildings.ruleset:1521 data/civ2/buildings.ruleset:1504
msgid ""
"Counts as a Police Station in every city. (That is, for each city, reduces "
"unhappiness for military units outside the city by 2 under Democracy and 1 "
@@ -19602,11 +19758,11 @@ msgstr ""
"неÑчаÑтье Ð´Ð»Ñ Ð²Ð¾ÐµÐ½Ð½Ñ‹Ñ… Ñоединений на 2 при Демократии и на 1 при РеÑпублике. "
"Ðе дейÑтвует при других формах правлениÑ."
-#: data/default/buildings.ruleset:1533
+#: data/default/buildings.ruleset:1532
msgid "Coinage"
msgstr "Монетный двор"
-#: data/default/buildings.ruleset:1554
+#: data/default/buildings.ruleset:1553
msgid ""
"This is not a normal improvement. Instead, setting a city's production to "
"Coinage means its shield production is converted to tax output (money, "
@@ -20039,11 +20195,16 @@ msgstr "?citystyle:КельтÑкий"
msgid "?citystyle:Industrial"
msgstr "?citystyle:ИндуÑтриальный"
-#: data/default/cities.ruleset:139 data/civ2/cities.ruleset:150
+#: data/default/cities.ruleset:139
+#, fuzzy
+msgid "?citystyle:ElectricAge"
+msgstr "?citystyle:КельтÑкий"
+
+#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:150
msgid "?citystyle:Modern"
msgstr "?citystyle:Модерн"
-#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:161
+#: data/default/cities.ruleset:161 data/civ2/cities.ruleset:161
msgid "?citystyle:PostModern"
msgstr "?citystyle:ПоÑтмодерн"
@@ -25271,6 +25432,45 @@ msgstr "Команда 30"
msgid "Team 31"
msgstr "Команда 31"
+#~ msgid "Command access level could not be set to '%s' for connection %s."
+#~ msgstr "Ðевозможно уÑтановить уровень команд в '%s' Ð´Ð»Ñ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ %s."
+
+#~ msgid "Observers cannot vote."
+#~ msgstr "Ðаблюдатели не могут голоÑовать."
+
+#~ msgid ""
+#~ "You can only vote in a running game. Use 'first' to become the game "
+#~ "organizer if there currently is none."
+#~ msgstr ""
+#~ "Ð’Ñ‹ можете голоÑовать только в начавшейÑÑ Ð¸Ð³Ñ€Ðµ. ИÑпользуйте команду "
+#~ "'first', чтобы Ñтать организатором игры, еÑли такового ещё нет."
+
+#~ msgid "Vote %d \"%s\": %d for, %d against"
+#~ msgstr "ГолоÑование %d \"%s\": %d за, %d против"
+
+#~ msgid "Value must be integer."
+#~ msgstr "Значение должно быть целым чиÑлом."
+
+#~ 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 Hydro Plant, Power Plant, or Nuclear Plant. A "
+#~ "city can only build a Hydro Plant if it is next to (or on) a Mountain or "
+#~ "River tile."
+#~ msgstr ""
+#~ "Уменьшает количеÑтво загрÑзнений, Ñоздаваемых производÑтвом в городе на "
+#~ "50%. Также увеличивает производÑтво щитов Фабрикой или Заводом в городе: "
+#~ "Фабрика и ГÐС вмеÑте дают 75% премию, а Фабрика, Завод и ГÐС вмеÑте дают "
+#~ "150% премию.\n"
+#~ "\n"
+#~ "Город может иметь только одну из ÑлектроÑтанций: Гидро, Тепловую(обычную) "
+#~ "или Ðтомную. Город может поÑтроить ГÐС только еÑли он Ñ€Ñдом Ñ (или на) "
+#~ "Горой или Рекой."
+
#~ msgid "Auth config filename \"%s\" not allowed!"
#~ msgstr "Ð˜Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° конфигурации авторизации \"%s\" не разрешено!"
diff --git a/po/sv.gmo b/po/sv.gmo
index 00caa9f..07927ed 100644
Binary files a/po/sv.gmo and b/po/sv.gmo differ
diff --git a/po/sv.po b/po/sv.po
index c55d3e6..bdef454 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: 2009-03-29 21:13+0900\n"
+"POT-Creation-Date: 2009-11-22 21:37+0100\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"
@@ -120,21 +120,21 @@ msgstr "?föråldrat:F"
msgid "?redundant:*"
msgstr "*"
-#: common/connection.c:515
+#: common/connection.c:518
#, c-format
msgid "%s from %s"
msgstr "%s från %s"
-#: common/connection.c:521
+#: common/connection.c:524
msgid " (connection incomplete)"
msgstr " (ofullständig anslutning)"
-#: common/connection.c:525
+#: common/connection.c:528
#, c-format
msgid " (player %s)"
msgstr " (spelare %s)"
-#: common/connection.c:529
+#: common/connection.c:532
msgid " (observer)"
msgstr " (iakttagare)"
@@ -539,81 +539,81 @@ msgstr "Anslutnings- och frånkopplingsmeddelanden"
msgid "AI Debug messages"
msgstr "Datorstyrningsavlusningsmeddelanden"
-#: common/player.c:732
+#: common/player.c:746
msgid "?attitude:Genocidal"
msgstr "?attitude:Massmordsbenägen"
-#: common/player.c:734
+#: common/player.c:748
msgid "?attitude:Belligerent"
msgstr "?attitude:Aggressiv"
-#: common/player.c:736
+#: common/player.c:750
msgid "?attitude:Hostile"
msgstr "?attitude:Fientlig"
-#: common/player.c:738
+#: common/player.c:752
msgid "?attitude:Uncooperative"
msgstr "?attitude:Ohjälpsam"
-#: common/player.c:740
+#: common/player.c:754
msgid "?attitude:Uneasy"
msgstr "?attitude:Nervös"
-#: common/player.c:742
+#: common/player.c:756
msgid "?attitude:Neutral"
msgstr "?attitude:Likgiltig"
-#: common/player.c:744
+#: common/player.c:758
msgid "?attitude:Respectful"
msgstr "?attitude:Vördsam"
-#: common/player.c:746
+#: common/player.c:760
msgid "?attitude:Helpful"
msgstr "?attitude:Hjälpsam"
-#: common/player.c:748
+#: common/player.c:762
msgid "?attitude:Enthusiastic"
msgstr "?attitude:Entusiastisk"
-#: common/player.c:750
+#: common/player.c:764
msgid "?attitude:Admiring"
msgstr "?attitude:Beundrande"
-#: common/player.c:753
+#: common/player.c:767
msgid "?attitude:Worshipful"
msgstr "?attitude:Dyrkande"
-#: common/player.c:764
+#: common/player.c:778
msgid "?diplomatic_state:Armistice"
msgstr "?diplomatic_state:vapenvila"
-#: common/player.c:765
+#: common/player.c:779
msgid "?diplomatic_state:War"
msgstr "?diplomatic_state:krig"
-#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:780 client/gui-gtk-2.0/diplodlg.c:353
#: 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:767 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:781 client/gui-gtk-2.0/diplodlg.c:358
#: 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:768 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:782 client/gui-gtk-2.0/diplodlg.c:363
#: 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:769
+#: common/player.c:783
msgid "?diplomatic_state:Never met"
msgstr "?diplomatic_state:aldrig mötts"
-#: common/player.c:770
+#: common/player.c:784
msgid "?diplomatic_state:Team"
msgstr "?diplomatic_state:lag"
@@ -644,7 +644,7 @@ msgstr "Överlevnadsbehov kan bara användas som världsomspännande."
#. TRANS: "Resources: (none)".
#: common/requirements.c:1014 common/team.c:132
#: client/gui-gtk-2.0/helpdlg.c:1055 client/gui-gtk-2.0/inteldlg.c:390
-#: client/gui-win32/helpdlg.c:586 client/gui-xaw/helpdlg.c:991
+#: client/gui-win32/helpdlg.c:592 client/gui-xaw/helpdlg.c:991
#, c-format
msgid "(none)"
msgstr "(ingen)"
@@ -671,10 +671,11 @@ msgstr "Framtidsteknologi %d"
#: 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
#: client/gui-sdl/helpdlg.c:817 client/gui-sdl/mapview.c:962
-#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:545
-#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:735
-#: 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
+#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:544
+#: client/gui-win32/helpdlg.c:551 client/gui-win32/helpdlg.c:721
+#: client/gui-win32/helpdlg.c:741 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 "Inget"
@@ -687,29 +688,29 @@ msgstr "Framtidsteknologi."
msgid "(Unknown)"
msgstr "(Okänd)"
-#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:553
#: manual/civmanual.c:224
msgid "Road"
msgstr "väg"
-#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:557
#: client/gui-gtk-2.0/menu.c:829 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:394 common/terrain.c:572 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:567
#: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
#: data/civ1/techs.ruleset:563
msgid "Railroad"
msgstr "järnväg"
-#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:555
msgid "Mine"
msgstr "gruva"
-#: common/terrain.c:396 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:551 server/report.c:124
#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "utsläpp"
@@ -718,7 +719,7 @@ msgstr "utsläpp"
msgid "Hut"
msgstr "hydda"
-#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:563
#: manual/civmanual.c:226
msgid "Fortress"
msgstr "fästning"
@@ -731,58 +732,58 @@ msgstr "flod"
msgid "Farmland"
msgstr "Ã¥kermark"
-#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:577
#: manual/civmanual.c:226
msgid "Airbase"
msgstr "flygbas"
-#: common/terrain.c:402 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:579
msgid "Fallout"
msgstr "nedfall"
-#: common/unit.c:546 client/gui-win32/plrdlg.c:337
+#: common/unit.c:549 client/gui-win32/plrdlg.c:337
msgid "Idle"
msgstr "Overksam"
-#: common/unit.c:556
+#: common/unit.c:559
msgid "Fortifying"
msgstr "Befästande"
-#: common/unit.c:558
+#: common/unit.c:561
msgid "Fortified"
msgstr "Befäst"
-#: common/unit.c:562 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
+#: common/unit.c:565 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
msgid "Sentry"
msgstr "Stå vakt"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
+#: common/unit.c:569 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
#: client/gui-win32/menu.c:370 client/gui-xaw/menu.c:185
msgid "Pillage"
msgstr "Plundra"
-#: common/unit.c:568 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
+#: common/unit.c:571 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
msgid "Goto"
msgstr "GÃ¥ till"
-#: common/unit.c:570
+#: common/unit.c:573
msgid "Explore"
msgstr "Utforska"
-#: common/unit.c:572 manual/civmanual.c:224
+#: common/unit.c:575 manual/civmanual.c:224
msgid "Transform"
msgstr "Förändra"
-#: common/unit.c:584 client/text.c:157 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:587 client/text.c:157 client/gui-sdl/citydlg.c:1972
#: client/gui-win32/citydlg.c:1257 client/gui-xaw/citydlg.c:1423
msgid "Unknown"
msgstr "Okänd"
-#: common/unit.c:1022
+#: common/unit.c:1025
msgid "Moves"
msgstr "Drag"
-#: common/unit.c:1571
+#: common/unit.c:1574
#, c-format
msgid ""
"Upgrade %s to %s for %d gold?\n"
@@ -791,12 +792,12 @@ msgstr ""
"Ersätt %s med %s för %d guld?\n"
"Skattkammaren innehåller %d guld."
-#: common/unit.c:1579
+#: common/unit.c:1582
#, c-format
msgid "Sorry, cannot upgrade %s (yet)."
msgstr "Kan (ännu) inte ersätta %s."
-#: common/unit.c:1585
+#: common/unit.c:1588
#, c-format
msgid ""
"Upgrading %s to %s costs %d gold.\n"
@@ -805,11 +806,11 @@ msgstr ""
"Att ersätta %s med %s kostar %d guld.\n"
"Skattkammaren innehåller %d guld."
-#: common/unit.c:1594
+#: common/unit.c:1597
msgid "You can only upgrade units in your cities."
msgstr "Kan endast uppgradera trupper i städer."
-#: common/unit.c:1598
+#: common/unit.c:1601
#, c-format
msgid "Upgrading this %s would strand units it transports."
msgstr "Ersättande av denna %s skulle strandsätta trupper ombord."
@@ -842,11 +843,11 @@ msgstr "kärnvapen"
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1404
+#: common/unittype.c:349 client/helpdata.c:1412
msgid " and "
msgstr " och "
-#: common/unittype.c:355 client/helpdata.c:1390
+#: common/unittype.c:355 client/helpdata.c:1398
msgid "?and:, "
msgstr "?and:, "
@@ -1016,71 +1017,71 @@ msgstr "Tomt argument för \"%s\".\n"
msgid "Missing argument for \"%s\".\n"
msgstr "Argument saknas för \"%s\".\n"
-#: utility/shared.c:501
+#: utility/shared.c:514
#, c-format
msgid "%d BC"
msgstr "%d f. Kr."
-#: utility/shared.c:503
+#: utility/shared.c:516
#, c-format
msgid "%d AD"
msgstr "%d e. Kr."
-#: utility/shared.c:924
+#: utility/shared.c:937
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:1028
+#: utility/shared.c:1041
#, c-format
msgid "Could not read data directory %s: %s."
msgstr "Kunde inte läsa datakatalogen %s: %s."
-#: utility/shared.c:1279
+#: utility/shared.c:1292
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:1281
+#: utility/shared.c:1294
#, c-format
msgid "Current data path is: \"%s\""
msgstr "Den nuvarande datasökvägen är \"%s\"."
-#: utility/shared.c:1283
+#: utility/shared.c:1296
#, c-format
msgid "The \"%s\" file is required ... aborting!"
msgstr "Filen \"%s\" krävs ... avbryter!"
-#: utility/shared.c:1460
+#: utility/shared.c:1485
#, 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:1462
+#: utility/shared.c:1487
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:1478
+#: utility/shared.c:1503
msgid "exact match"
msgstr "exakt träff"
-#: utility/shared.c:1479
+#: utility/shared.c:1504
msgid "only match"
msgstr "enda träff"
-#: utility/shared.c:1480
+#: utility/shared.c:1505
msgid "ambiguous"
msgstr "flertydigt"
-#: utility/shared.c:1481
+#: utility/shared.c:1506
msgid "empty"
msgstr "tom"
-#: utility/shared.c:1482
+#: utility/shared.c:1507
msgid "too long"
msgstr "för lång"
-#: utility/shared.c:1483
+#: utility/shared.c:1508
msgid "non-match"
msgstr "icketräff"
@@ -1109,24 +1110,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:280
+#: ai/advdiplomacy.c:300
#, 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:290
+#: ai/advdiplomacy.c:310
#, 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:303
+#: ai/advdiplomacy.c:322
#, 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:308
+#: ai/advdiplomacy.c:327
#, c-format
msgid ""
"*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
@@ -1135,51 +1136,51 @@ msgstr ""
"*%s (datorstyrd)* Jag vill se att du kan hålla vårt vapenstillestånd först, %"
"s."
-#: ai/advdiplomacy.c:331
+#: ai/advdiplomacy.c:350
#, 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:424
+#: ai/advdiplomacy.c:443
#, 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:454
+#: ai/advdiplomacy.c:473
#, 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:560
+#: ai/advdiplomacy.c:579
#, 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:582
+#: ai/advdiplomacy.c:601
#, c-format
msgid "*%s (AI)* Welcome into our alliance %s!"
msgstr "*%s (datorstyrd)* Välkommen i vårt förbund %s!"
-#: ai/advdiplomacy.c:586
+#: ai/advdiplomacy.c:605
#, 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:593
+#: ai/advdiplomacy.c:612
#, c-format
msgid "*%s (AI)* Yes, peace in our time!"
msgstr "*%s (datorstyrd)* Ja, fred i vår tid!"
-#: ai/advdiplomacy.c:598
+#: ai/advdiplomacy.c:617
#, c-format
msgid "*%s (AI)* Agreed. No more hostilities, %s."
msgstr "*%s (datorstyrd)* Avgjort. Inga fler fientligheter, %s"
-#: ai/advdiplomacy.c:813
+#: ai/advdiplomacy.c:832
#, c-format
msgid ""
"*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
@@ -1188,24 +1189,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:1097
+#: ai/advdiplomacy.c:1116
#, c-format
msgid "*%s (AI)* Space will never be yours. "
msgstr "*%s (datorstyrd)* Rymden må aldrig bli din."
-#: ai/advdiplomacy.c:1102
+#: ai/advdiplomacy.c:1121
#, 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:1108
+#: ai/advdiplomacy.c:1127
#, c-format
msgid "*%s (AI)* Peace in ... some other time."
msgstr "*%s (datorstyrd)* Fred i ... någon annan tid"
-#: ai/advdiplomacy.c:1113
+#: ai/advdiplomacy.c:1132
#, c-format
msgid ""
"*%s (AI)* Finally I get around to you! Did you really think you could get "
@@ -1214,17 +1215,17 @@ msgstr ""
"*%s (datorstyrd)* Slutligen möts vi! Trodde du verkligen att du skulle komma "
"undan med dina förbrytelser?"
-#: ai/advdiplomacy.c:1119
+#: ai/advdiplomacy.c:1138
#, 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:1126
+#: ai/advdiplomacy.c:1145
#, 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:1209
+#: ai/advdiplomacy.c:1229
#, c-format
msgid ""
"*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1239,7 +1240,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:1219
+#: ai/advdiplomacy.c:1239
#, c-format
msgid ""
"*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
@@ -1248,7 +1249,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:1225
+#: ai/advdiplomacy.c:1245
#, c-format
msgid ""
"*%s (AI)* %s has grossly violated his treaties with us for own gain. We "
@@ -1267,7 +1268,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:1238
+#: ai/advdiplomacy.c:1258
#, c-format
msgid ""
"*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1282,7 +1283,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:1246
+#: ai/advdiplomacy.c:1266
#, c-format
msgid ""
"*%s (AI)* If you want a piece of the loot, feel free to join in the action!"
@@ -1290,7 +1291,7 @@ msgstr ""
"*%s (datorstyrd)* Önskar du ha del i krigsbytet så varsågod att ta del i "
"striden också."
-#: ai/advdiplomacy.c:1251
+#: ai/advdiplomacy.c:1271
#, c-format
msgid ""
"*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1305,14 +1306,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:1261
+#: ai/advdiplomacy.c:1281
#, 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:1267
+#: ai/advdiplomacy.c:1287
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance and declare war on %s in %d turn. "
@@ -1327,7 +1328,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:1276
+#: ai/advdiplomacy.c:1296
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1342,7 +1343,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:1344
+#: ai/advdiplomacy.c:1364
#, c-format
msgid ""
"*%s (AI)* Your attempt to conquer space for yourself alone betray your true "
@@ -1351,7 +1352,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:1359
+#: ai/advdiplomacy.c:1379
#, c-format
msgid ""
"*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
@@ -1360,7 +1361,7 @@ msgstr ""
"*%s (datorstyrd)* Ditt försök att ensam härska i yttre rymden är mycket "
"anstötligt."
-#: ai/advdiplomacy.c:1362
+#: ai/advdiplomacy.c:1382
#, c-format
msgid ""
"*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
@@ -1369,14 +1370,14 @@ msgstr ""
"*%s (datorstyrd)* Såvida du inte avbrytter ditt rymdskeppsbygge måste jag "
"vidtaga åtgärder!"
-#: ai/advdiplomacy.c:1474
+#: ai/advdiplomacy.c:1494
#, 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:1549
+#: ai/advdiplomacy.c:1569
#, c-format
msgid ""
"*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
@@ -1385,7 +1386,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:1555
+#: ai/advdiplomacy.c:1575
#, c-format
msgid ""
"*%s (AI)* Greetings ally, I see you have not yet made war with our enemy, %"
@@ -1395,7 +1396,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:1562
+#: ai/advdiplomacy.c:1582
#, c-format
msgid ""
"*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1406,7 +1407,7 @@ msgstr ""
"fred med vår dödsfiende, %s! Detta är ej godtagbard, vårt förbund har "
"upphört."
-#: ai/advdiplomacy.c:1592
+#: ai/advdiplomacy.c:1612
#, c-format
msgid ""
"*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
@@ -1415,12 +1416,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:1607
+#: ai/advdiplomacy.c:1627
#, 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:1622
+#: ai/advdiplomacy.c:1642
#, c-format
msgid ""
"*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
@@ -1429,7 +1430,7 @@ msgstr ""
"*%s (datorstyrd)* All denna blodspillan leder ingen vart. Är det inte dags "
"att gräva ner stridsyxan?"
-#: ai/advdiplomacy.c:1742
+#: ai/advdiplomacy.c:1762
#, c-format
msgid ""
"*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1578,18 +1579,18 @@ msgstr ""
"Lösenordet måste ha åtminstone %d versaler, %d siffror, samt vara minst %d "
"[skrivbara] tecken långt. Försök igen."
-#: server/barbarian.c:183
+#: server/barbarian.c:184
#, c-format
msgid "%s gain a leader by the name %s. Dangerous times may lie ahead."
msgstr ""
"%2$s-ledaren %1$s sprider skräck i världen. Vi kan gå svåra år till mötes."
-#: server/barbarian.c:479
+#: server/barbarian.c:480
#, c-format
msgid "Native unrest near %s led by %s."
msgstr "Infödingsuppror nära %s under ledning av %s."
-#: server/barbarian.c:484
+#: server/barbarian.c:485
#, c-format
msgid "Sea raiders seen near %s!"
msgstr "Sjörövare siktade nära %s!"
@@ -1978,7 +1979,7 @@ msgid_plural "%s boosts research; you gain %d immediate advances."
msgstr[0] "%s ökar forskningen; vi få genast %d framsteg."
msgstr[1] "%s ökar forskningen; vi få genast %d framsteg."
-#: server/cityturn.c:1158 server/techtools.c:176
+#: server/cityturn.c:1158 server/techtools.c:172
#, c-format
msgid "The %s have acquired %s from %s."
msgstr "%s erhöll %s från %s."
@@ -2061,22 +2062,22 @@ msgid "Warning: the %s option is obsolete. Use -m to enable the metaserver.\n"
msgstr ""
"Varning: tillvalet %s är föråldrad. Använd -m för att aktivera metaservern.\n"
-#: server/civserver.c:189
+#: server/civserver.c:193
#, c-format
msgid "Error: unknown option '%s'\n"
msgstr "Fel: \"%s\" är inte ett känt tillval.\n"
-#: server/civserver.c:200
+#: server/civserver.c:204
#, c-format
msgid "This is the server for %s"
msgstr "Detta är servern för %s."
-#: server/civserver.c:201
+#: server/civserver.c:205
#, c-format
msgid "You can learn a lot about Freeciv at %s"
msgstr "Man kan lära sig mycket om Freeciv från %s."
-#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
+#: server/civserver.c:210 client/civclient.c:239 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -2085,106 +2086,111 @@ msgstr ""
"Användning: %s [tillval ...]\n"
"Giltiga tillval är:\n"
-#: server/civserver.c:208
+#: server/civserver.c:212
msgid ""
" -a --auth FILE\tEnable server authentication with configuration from "
"FILE.\n"
msgstr ""
" -a --auth FIL\tAktiverar serverautentisering med konfiguration från FIL.\n"
-#: server/civserver.c:210
+#: server/civserver.c:214
msgid " -G --Guests\t\tAllow guests to login if auth is enabled.\n"
msgstr " -G --Guests\t\tTillåter gäster att logga in om auth är aktiverat.\n"
-#: server/civserver.c:212
+#: server/civserver.c:216
msgid " -N --Newusers\tAllow new users to login if auth is enabled.\n"
msgstr ""
" -N --Newusers\tTillåter nya användare att logga in om auth är aktiverat.\n"
-#: server/civserver.c:215
+#: server/civserver.c:219
msgid " -b --bind ADDR\tListen for clients on ADDR\n"
msgstr " -b, --bind ADRESS\tLyssna efter klienter på ADRESS\n"
-#: server/civserver.c:217 client/civclient.c:242
+#: server/civserver.c:221 client/civclient.c:243
msgid ""
" -d, --debug NUM\tSet debug log level (0 to 4, or 4:file1,min,max:...)\n"
msgstr ""
" -d, --debug NUMMER\tSätt läge för debugloggning (0 till 4, eller 4:file1,"
"min,max:...)\n"
-#: server/civserver.c:221 client/civclient.c:246
+#: server/civserver.c:225 client/civclient.c:247
msgid " -d, --debug NUM\tSet debug log level (0 to 3)\n"
msgstr " -d, --debug NUMMER\tSätt läge för debugloggning (0 till 3)\n"
-#: server/civserver.c:223
+#: server/civserver.c:227
msgid " -f, --file FILE\tLoad saved game FILE\n"
msgstr " -f, --file FIL\tLäs in sparat spel FIL\n"
-#: server/civserver.c:225 client/civclient.c:249 manual/civmanual.c:382
+#: server/civserver.c:229 client/civclient.c:250 manual/civmanual.c:382
msgid " -h, --help\t\tPrint a summary of the options\n"
msgstr " -h , --help\t\tVisar en sammanfattning av tillvalen\n"
-#: server/civserver.c:226
+#: server/civserver.c:230
+#, fuzzy
+msgid " -i, --identity ADDR\tBe known as ADDR at metaserver\n"
+msgstr " -M, --Metaserver ADRESS\tSätt ADRESS som metaserveradress\n"
+
+#: server/civserver.c:231
msgid " -l, --log FILE\tUse FILE as logfile\n"
msgstr " -l, --log FIL\tAnvänd FIL som loggningsfil\n"
-#: server/civserver.c:227
+#: server/civserver.c:232
msgid " -m, --meta\t\tNotify metaserver and send server's info\n"
msgstr " -m, --meta\t\tMeddela metaservern och skicka serverupplysningar\n"
-#: server/civserver.c:229
+#: server/civserver.c:234
msgid " -M, --Metaserver ADDR\tSet ADDR as metaserver address\n"
msgstr " -M, --Metaserver ADRESS\tSätt ADRESS som metaserveradress\n"
-#: server/civserver.c:232
+#: server/civserver.c:237
msgid " -p, --port PORT\tListen for clients on port PORT\n"
msgstr " -p, --port PORT\tLyssna efter klienter på porten PORT\n"
-#: server/civserver.c:234
+#: server/civserver.c:239
msgid " -q, --quitidle TIME\tQuit if no players for TIME seconds\n"
msgstr " -q, --quitidle TID\tAvsluta om inga spelare på TID sekunder\n"
-#: server/civserver.c:236
+#: server/civserver.c:241
msgid " -e, --exit-on-end\tWhen a game ends, exit instead of restarting\n"
msgstr ""
" -e, --exit-on-end\tStäng av istället för starta om när spelet är slut\n"
-#: server/civserver.c:239
+#: server/civserver.c:244
msgid " -s, --saves DIR\tSave games to directory DIR\n"
msgstr " -s, --saves DIR\tSparspel hamnar i katalogen DIR\n"
-#: server/civserver.c:241
+#: server/civserver.c:246
msgid " -S, --Serverid ID\tSets the server id to ID\n"
msgstr " -S, --Serverid VÄRD\tAnslut till server vid VÄRD\n"
-#: server/civserver.c:243
+#: server/civserver.c:248
msgid " -P, --Ppm\t\tSave ppms of the map when saving the game.\n"
msgstr " -P, --Ppm\t\tSpara ppm-bilder av kartan när spelet sparas.\n"
-#: server/civserver.c:244
+#: server/civserver.c:249
msgid " -r, --read FILE\tRead startup script FILE\n"
msgstr " -r, --read FIL\tLäs FIL innehållande start-skript\n"
-#: server/civserver.c:246
+#: server/civserver.c:251
msgid " -R, --Ranklog FILE\tUse FILE as ranking logfile\n"
msgstr " -R, --Ranklog FIL\tAnvänd FIL som rankningsfil\n"
-#: server/civserver.c:247 client/civclient.c:268 manual/civmanual.c:383
+#: server/civserver.c:252 client/civclient.c:269 manual/civmanual.c:383
msgid " -v, --version\t\tPrint the version number\n"
msgstr " -v, --verison\t\tVisa versionsnumret\n"
-#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
+#: server/civserver.c:253 client/gui-gtk-2.0/gui_main.c:354
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, c-format
msgid "Report bugs at %s.\n"
msgstr "Anmäl buggar vid %s.\n"
-#: server/commands.c:28
+#: server/commands.c:29
msgid "Start the game, or restart after loading a savegame."
msgstr "Sätt i gång ett nytt eller sparat spel."
-#: server/commands.c:29
+#: server/commands.c:30
msgid ""
"This command starts the game. When starting a new game, it should be used "
"after all human players have connected, and AI players have been created (if "
@@ -2203,7 +2209,7 @@ msgstr ""
"inte skulle ha någon verkan."
#. TRANS: translate text between <> only
-#: server/commands.c:42
+#: server/commands.c:44
msgid ""
"help\n"
"help commands\n"
@@ -2217,11 +2223,11 @@ msgstr ""
"help <kommando>\n"
"help <tillval>"
-#: server/commands.c:47
+#: server/commands.c:49
msgid "Show help about server commands and server options."
msgstr "Visa hjälp om serverkommandon och servertillval."
-#: server/commands.c:48
+#: server/commands.c:50
msgid ""
"With no arguments gives some introductory help. With argument \"commands\" "
"or \"options\" gives respectively a list of all commands or all options. "
@@ -2237,11 +2243,11 @@ msgstr ""
"nuvarande värdet och standardvärdet. Förkortningar för argument kan användas "
"i entydiga fall."
-#: server/commands.c:63
+#: server/commands.c:66
msgid "Show a list of players, teams, connections, or scenarios."
msgstr "Visa en lista över spelare, lag, anslutningar eller scenarion."
-#: server/commands.c:64
+#: server/commands.c:67
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 "
@@ -2250,20 +2256,20 @@ msgstr ""
"Visa en lista över spelare, lag, anslutningar till servern, eller scenarion. "
"Argumentet kan förkortas, och visar spelare om inget annat angetts."
-#: server/commands.c:70
+#: server/commands.c:74
msgid "Quit the game and shutdown the server."
msgstr "Lämna spelet och stäng ner servern."
#. TRANS: translate text between <> only
-#: server/commands.c:74
+#: server/commands.c:79
msgid "cut <connection-name>"
msgstr "cut <anslutningsnamn>"
-#: server/commands.c:75
+#: server/commands.c:80
msgid "Cut a client's connection to server."
msgstr "Bryter en klients anslutning till servern."
-#: server/commands.c:76
+#: server/commands.c:81
msgid ""
"Cut specified client's connection to the server, removing that client from "
"the game. If the game has not yet started that client's player is removed "
@@ -2276,7 +2282,7 @@ msgstr ""
"tar emot anslutningsnamn, inte spelarnamn."
#. TRANS: translate text between <> only
-#: server/commands.c:83
+#: server/commands.c:89
msgid ""
"explain\n"
"explain <option-name>"
@@ -2284,11 +2290,11 @@ msgstr ""
"explain\n"
"explain <tillval>"
-#: server/commands.c:85
+#: server/commands.c:91
msgid "Explain server options."
msgstr "Förklara servertillval."
-#: server/commands.c:86
+#: server/commands.c:92
msgid ""
"The 'explain' command gives a subset of the functionality of 'help', and is "
"included for backward compatibility. With no arguments it gives a list of "
@@ -2301,7 +2307,7 @@ msgstr ""
"det hjälp för ett särskilt tillval (som \"help <tillval>\")."
#. TRANS: translate text between <> only
-#: server/commands.c:93
+#: server/commands.c:100
msgid ""
"show\n"
"show <option-name>\n"
@@ -2311,11 +2317,11 @@ msgstr ""
"show <tillval>\n"
"show <tillvalsprefix>"
-#: server/commands.c:96
+#: server/commands.c:103
msgid "Show server options."
msgstr "Visa servertillval."
-#: server/commands.c:97
+#: server/commands.c:104
msgid ""
"With no arguments, shows all server options (or available options, when used "
"by clients). With an argument, show only the named option, or options with "
@@ -2325,36 +2331,37 @@ msgstr ""
"när det används av klienter). Med ett argument visar kommandot endast den "
"nämnda tillval, eller tillval med nämnd förstavelse."
-#: server/commands.c:102
+#: server/commands.c:110
msgid "wall <message>"
msgstr "wall <meddelande>"
-#: server/commands.c:103
+#: server/commands.c:111
msgid "Send message to all connections."
msgstr "Skickar meddelanden till alla klienter."
-#: server/commands.c:104
+#: server/commands.c:112
msgid ""
"For each connected client, pops up a window showing the message entered."
msgstr "Öppnar ett fönster som visar meddelandet hos varje ansluten klient."
-#: server/commands.c:108
+#: server/commands.c:117
msgid "vote yes|no [vote number]"
msgstr "rösta yes|no [röstnummer]"
-#: server/commands.c:109
+#: server/commands.c:118
msgid "Cast a vote."
msgstr "Rösta"
-#: server/commands.c:111
+#: server/commands.c:120
#, 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."
+"A player with basic 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."
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"
@@ -2364,7 +2371,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:121
+#: server/commands.c:131
msgid ""
"debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
"<player> | timing | info]"
@@ -2372,11 +2379,11 @@ msgstr ""
"debug [ player <spelare> | city <x> <y> | units <x> <y> | unit <id> | tech "
"<spelare> | timing | info]"
-#: server/commands.c:123
+#: server/commands.c:133
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:124
+#: server/commands.c:134
msgid ""
"Print AI debug information about given entity and turn continous debugging "
"output for this entity on or off."
@@ -2384,23 +2391,23 @@ msgstr ""
"Skriv datorstyrningsavlusningsinformation om angiven del och sätt på eller "
"stäng av fortsatta utskrifter för objektet."
-#: server/commands.c:128
+#: server/commands.c:139
msgid "set <option-name> <value>"
msgstr "set <tillval> <värde>"
-#: server/commands.c:129
+#: server/commands.c:140
msgid "Set server option."
msgstr "Ställer in servertillval."
-#: server/commands.c:132
+#: server/commands.c:144
msgid "team <player> [team]"
msgstr "team <spelare> [lag]"
-#: server/commands.c:133
+#: server/commands.c:145
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:134
+#: server/commands.c:146
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 "
@@ -2412,15 +2419,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:141
+#: server/commands.c:154
msgid "rulesetdir <directory>"
msgstr "rulesetdir <katalog>"
-#: server/commands.c:142
+#: server/commands.c:155
msgid "Choose new ruleset directory or modpack."
msgstr "Välj katalog för regler eller modifikation."
-#: server/commands.c:143
+#: server/commands.c:156
msgid ""
"Choose new ruleset directory or modpack. Calling this\n"
" without any arguments will show you the currently selected ruleset."
@@ -2429,15 +2436,15 @@ msgstr ""
"argument visar den valda regeluppsättningen."
#. TRANS: translate text between <> only
-#: server/commands.c:149
+#: server/commands.c:163
msgid "metainfo <meta-line>"
msgstr "metainfo <metarad>"
-#: server/commands.c:150
+#: server/commands.c:164
msgid "Set metaserver info line."
msgstr "Ställ in upplysningsrad för metaservern."
-#: server/commands.c:151
+#: server/commands.c:165
msgid ""
"Set user defined metaserver info line. If parameter is omitted,\n"
"previously set metamessage will be removed. For most of the time\n"
@@ -2450,19 +2457,19 @@ msgstr ""
"genererade meddelanden om den är inställd."
#. TRANS: translate text between <> only
-#: server/commands.c:158
+#: server/commands.c:173
msgid "metapatch <meta-line>"
msgstr "metapatch <metarad>"
-#: server/commands.c:159
+#: server/commands.c:174
msgid "Set metaserver patches line."
msgstr "Sätt patchrad för pmetaservern."
-#: server/commands.c:165
+#: server/commands.c:181
msgid "Control metaserver connection."
msgstr "Styr metaserveranslutning."
-#: server/commands.c:166
+#: server/commands.c:182
msgid ""
"'metaconnection ?' reports on the status of the connection to metaserver.\n"
"'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2475,33 +2482,33 @@ msgstr ""
"metaservern."
#. TRANS: translate text between <> only
-#: server/commands.c:172
+#: server/commands.c:189
msgid "metaserver <address>"
msgstr "metaserver <adress>"
-#: server/commands.c:173
+#: server/commands.c:190
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:177
+#: server/commands.c:195
msgid "aitoggle <player-name>"
msgstr "aitoggle <spelarnamn>"
-#: server/commands.c:178
+#: server/commands.c:196
msgid "Toggle AI status of player."
msgstr "Växla datorstyrningsstatus för spelare."
#. TRANS: translate text between [] and <> only
-#: server/commands.c:182
+#: server/commands.c:201
msgid "take [connection-name] <player-name>"
msgstr "take [anslutningsnamn] <spelarnamn>"
-#: server/commands.c:183
+#: server/commands.c:202
msgid "Take over a player's place in the game."
msgstr "Ta över en spelares plats i spelet."
-#: server/commands.c:184
+#: server/commands.c:203
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 "
@@ -2516,15 +2523,15 @@ msgstr ""
"tilldelas denna anslutning."
#. TRANS: translate text between [] only
-#: server/commands.c:192
+#: server/commands.c:212
msgid "observe [connection-name] [player-name]"
msgstr "observe [anslutningsnamn] [spelarnamn]"
-#: server/commands.c:193
+#: server/commands.c:213
msgid "Observe a player or the whole game."
msgstr "Iakttag en spelare eller hela spelet."
-#: server/commands.c:194
+#: server/commands.c:214
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 "
@@ -2539,15 +2546,15 @@ msgstr ""
"kopplad till en global iakttagare."
#. TRANS: translate text between <> only
-#: server/commands.c:202
+#: server/commands.c:223
msgid "detach <connection-name>"
msgstr "detach <anslutningsnamn>"
-#: server/commands.c:203
+#: server/commands.c:224
msgid "detach from a player."
msgstr "skilj från en spelare."
-#: server/commands.c:204
+#: server/commands.c:225
msgid ""
"Only the console and connections with cmdlevel 'hack' can force other "
"connections to detach from a player."
@@ -2556,21 +2563,21 @@ msgstr ""
"anslutningar att överge en spelare."
#. TRANS: translate text between <> only
-#: server/commands.c:209
+#: server/commands.c:231
msgid "create <player-name>"
msgstr "create <spelarnamn>"
-#: server/commands.c:210
+#: server/commands.c:232
msgid "Create an AI player with a given name."
msgstr "Skapa en datorstyrd spelare med ett givet namn."
-#: server/commands.c:211
+#: server/commands.c:233
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:215
+#: server/commands.c:238
msgid ""
"away\n"
"away"
@@ -2578,16 +2585,16 @@ msgstr ""
"borta\n"
"borta"
-#: server/commands.c:217
+#: server/commands.c:240
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:218
+#: server/commands.c:241
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:222
+#: server/commands.c:246
msgid ""
"novice\n"
"novice <player-name>"
@@ -2595,11 +2602,11 @@ msgstr ""
"novice\n"
"novice <spelarnamn>"
-#: server/commands.c:224
+#: server/commands.c:248
msgid "Set one or all AI players to 'novice'."
msgstr "Sätter en eller alla datorstyrda spelare till \"novice\"."
-#: server/commands.c:225
+#: server/commands.c:249
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 "
@@ -2611,7 +2618,7 @@ msgstr ""
"kommandot skicklighetsläget för endast den spelaren."
#. TRANS: translate text between <> only
-#: server/commands.c:231
+#: server/commands.c:256
msgid ""
"easy\n"
"easy <player-name>"
@@ -2619,11 +2626,11 @@ msgstr ""
"easy\n"
"easy <spelarnamn>"
-#: server/commands.c:233
+#: server/commands.c:258
msgid "Set one or all AI players to 'easy'."
msgstr "Sätter en eller alla datorstyrda spelare till \"easy\"."
-#: server/commands.c:234
+#: server/commands.c:259
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 "
@@ -2635,7 +2642,7 @@ msgstr ""
"skicklighetsläget för endast den spelaren."
#. TRANS: translate text between <> only
-#: server/commands.c:240
+#: server/commands.c:266
msgid ""
"normal\n"
"normal <player-name>"
@@ -2643,11 +2650,11 @@ msgstr ""
"normal\n"
"normal <spelarnamn>"
-#: server/commands.c:242
+#: server/commands.c:268
msgid "Set one or all AI players to 'normal'."
msgstr "Sätter en eller alla datorstyrda spelare till \"normal\"."
-#: server/commands.c:243
+#: server/commands.c:269
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 +2666,7 @@ msgstr ""
"kommandot skicklighetsläget för endast den spelaren."
#. TRANS: translate text between <> only
-#: server/commands.c:249
+#: server/commands.c:276
msgid ""
"hard\n"
"hard <player-name>"
@@ -2667,11 +2674,11 @@ msgstr ""
"hard\n"
"hard <spelarnamn>"
-#: server/commands.c:251
+#: server/commands.c:278
msgid "Set one or all AI players to 'hard'."
msgstr "Sätter en eller alla datorstyrda spelare till \"hard\"."
-#: server/commands.c:252
+#: server/commands.c:279
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 "
@@ -2683,7 +2690,7 @@ msgstr ""
"skicklighetsläget för endast den spelaren."
#. TRANS: translate text between <> only
-#: server/commands.c:258
+#: server/commands.c:286
msgid ""
"experimental\n"
"experimental <player-name>"
@@ -2691,11 +2698,11 @@ msgstr ""
"experimental\n"
"experimental <spelarnamn>"
-#: server/commands.c:260
+#: server/commands.c:288
msgid "Set one or all AI players to 'experimental'."
msgstr "Sätter en eller alla datorstyrda spelare till \"experimental\"."
-#: server/commands.c:261
+#: server/commands.c:289
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 +2715,7 @@ msgstr ""
"sätter kommandot skicklighetsläget för endast den spelaren."
#. TRANS: translate text between <> only
-#: server/commands.c:269
+#: server/commands.c:298
msgid ""
"cmdlevel\n"
"cmdlevel <level>\n"
@@ -2722,17 +2729,20 @@ msgstr ""
"cmdlevel <läge> first\n"
"cmdlevel <läge> <anslutninsnamn>"
-#: server/commands.c:274
+#: server/commands.c:303
msgid "Query or set command access level access."
msgstr "Ansök om eller bestäm läge för kontrollnivå."
-#: server/commands.c:275
+#: server/commands.c:304
+#, fuzzy
msgid ""
"The command access level controls which server commands are available\n"
"to users via the client chatline. The available levels are:\n"
" none - no commands\n"
-" info - informational commands only\n"
+" info - informational or observer commands only\n"
+" basic - commands available to players in the game\n"
" ctrl - commands that affect the game and users\n"
+" admin - commands that affect server operation\n"
" hack - *all* commands - dangerous!\n"
"With no arguments, the current command access levels are reported.\n"
"With a single argument, the level is set for all existing connections,\n"
@@ -2765,20 +2775,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:296
+#: server/commands.c:328
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:301
+#: server/commands.c:334
msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
msgstr "timeoutincrease <omgång> <omgångsökning> <värde> <värdefaktor>"
-#: server/commands.c:302
+#: server/commands.c:335
msgid "See \"help timeoutincrease\"."
msgstr "Se \"help timeoutincrease\"."
-#: server/commands.c:303
+#: server/commands.c:336
msgid ""
"Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
"<turn> and multiply <value> by <valuemult>. Use this command in concert "
@@ -2793,24 +2803,43 @@ msgstr ""
"1."
#. TRANS: translate text between <> only
-#: server/commands.c:309
+#: server/commands.c:343
+msgid ""
+"cancelvote\n"
+"cancelvote <vote number>\n"
+"cancelvote all\n"
+msgstr ""
+
+#: server/commands.c:346
+msgid "Cancel a running vote.\n"
+msgstr ""
+
+#: server/commands.c:347
+msgid ""
+"With no arguments this command removes your own vote. If you have an admin "
+"access level, you can cancel any vote by vote number, or all votes with the "
+"'all' argument."
+msgstr ""
+
+#. TRANS: translate text between <> only
+#: server/commands.c:354
msgid "endgame"
msgstr "endgame"
-#: server/commands.c:310
+#: server/commands.c:355
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:314
+#: server/commands.c:360
msgid "surrender"
msgstr "surrender"
-#: server/commands.c:315
+#: server/commands.c:361
msgid "Concede the game."
msgstr "Erkänn sig besegrad."
-#: server/commands.c:316
+#: server/commands.c:362
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."
@@ -2819,15 +2848,15 @@ msgstr ""
"således endast en spelare (eller ett lag) kvar avslutas spelet."
#. TRANS: translate text between <> only
-#: server/commands.c:322
+#: server/commands.c:369
msgid "remove <player-name>"
msgstr "remove <spelarnamn>"
-#: server/commands.c:323
+#: server/commands.c:370
msgid "Fully remove player from game."
msgstr "Tag bort spelare fullständigt från spelet."
-#: server/commands.c:324
+#: server/commands.c:371
msgid ""
"This *completely* removes a player from the game, including all cities and "
"units etc. Use with care!"
@@ -2836,7 +2865,7 @@ msgstr ""
"städer och trupper. Använd med försiktighet!"
#. TRANS: translate text between <> only
-#: server/commands.c:329
+#: server/commands.c:377
msgid ""
"save\n"
"save <file-name>"
@@ -2844,11 +2873,11 @@ msgstr ""
"save\n"
"save <filnamn>"
-#: server/commands.c:331
+#: server/commands.c:379
msgid "Save game to file."
msgstr "Sparar spelet till fil."
-#: server/commands.c:332
+#: server/commands.c:380
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"
@@ -2865,7 +2894,7 @@ msgstr ""
"och använd kommandot \"start\" när alla spelare har återanslutit sig."
#. TRANS: translate text between <> only
-#: server/commands.c:341
+#: server/commands.c:390
msgid ""
"load\n"
"load <file-name>"
@@ -2873,11 +2902,11 @@ msgstr ""
"load\n"
"load <filnamn>"
-#: server/commands.c:343
+#: server/commands.c:392
msgid "Load game from file."
msgstr "Läser in spel från fil."
-#: server/commands.c:344
+#: server/commands.c:393
msgid ""
"Load a game from <file-name>. Any current data including players, rulesets "
"and server options are lost.\n"
@@ -2886,117 +2915,117 @@ msgstr ""
"servertillval går förlorade eftersom de ersätts med data från filen.\n"
#. TRANS: translate text between <> only
-#: server/commands.c:349
+#: server/commands.c:399
msgid "read <file-name>"
msgstr "read <filnamn>"
-#: server/commands.c:350
+#: server/commands.c:400
msgid "Process server commands from file."
msgstr "Utför serverkommandon från fil."
#. TRANS: translate text between <> only
-#: server/commands.c:354
+#: server/commands.c:405
msgid "write <file-name>"
msgstr "write <filnamn>"
-#: server/commands.c:355
+#: server/commands.c:406
msgid "Write current settings as server commands to file."
msgstr "Skriv nuvarande inställningar som serverkommandon till fil."
-#: server/commands.c:359
+#: server/commands.c:411
msgid "Switch server output between 'RFC-style' and normal style."
msgstr "Ändra serverutdata mellan \"RFC-stil\" och vanlig stil."
-#: server/commands.c:363
+#: server/commands.c:416
msgid "Simply returns the id of the server."
msgstr "Returnerar helt enkelt serverns id."
-#: server/connecthand.c:85
+#: server/connecthand.c:109
#, c-format
msgid "Welcome to the %s Server running at %s port %d."
msgstr "Välkommen till servern %s som körs vid %s port %d."
-#: server/connecthand.c:89
+#: server/connecthand.c:113
#, c-format
msgid "Welcome to the %s Server at port %d."
msgstr "Välkommen till servern %s på port %d."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:97
+#: server/connecthand.c:121
#, c-format
msgid "(%d) %s: connected [%s]"
msgstr "(%d) %s: ansluten [%s]"
-#: server/connecthand.c:104
+#: server/connecthand.c:128
#, c-format
msgid "Server: %s has connected from %s."
msgstr "Server: %s har anslutit sig från %s."
-#: server/connecthand.c:145
+#: server/connecthand.c:175
msgid "Couldn't attach your connection to new player."
msgstr "Kunde inte koppla din anslutning till ny spelare."
-#: server/connecthand.c:165
+#: server/connecthand.c:199
#, c-format
msgid "You are logged in as '%s' connected to no player."
msgstr "Du är inloggad som \"%s\" och inte ansluten till någon spelare."
-#: server/connecthand.c:169
+#: server/connecthand.c:203
#, c-format
msgid "You are logged in as '%s' connected to an anonymous player."
msgstr "Du är inloggad som \"%s\" och ansluten till en namnlös spelare."
-#: server/connecthand.c:174
+#: server/connecthand.c:208
#, c-format
msgid "You are logged in as '%s' connected to %s."
msgstr "Du är inloggad som \"%s\" och ansluten till %s."
-#: server/connecthand.c:187
+#: server/connecthand.c:221
#, c-format
msgid "Turn-blocking game play: waiting on %s to finish turn..."
msgstr ""
"Omgångshindrande spel: väntar på att %s skall göra färdigt sin omgång..."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:240
+#: server/connecthand.c:274
#, c-format
msgid "(%d) %s: connection request [%s]"
msgstr "(%d) %s: anslutning efterfrågad [%s]"
-#: server/connecthand.c:266
+#: server/connecthand.c:300
msgid "The client is missing a capability that this server needs."
msgstr "Klienten saknar en förmåga som servern behöver."
-#: server/connecthand.c:268 server/connecthand.c:279
+#: server/connecthand.c:302 server/connecthand.c:313
#, c-format
msgid "(%d) %s rejected: mismatched capabilities!"
msgstr "(%d) %s avvisades: opassande förmågor."
-#: server/connecthand.c:277
+#: server/connecthand.c:311
msgid "This server is missing a capability that the client needs."
msgstr "Servern saknar en förmåga som klienten behöver."
-#: server/connecthand.c:290
+#: server/connecthand.c:324
msgid "The username is invalid!"
msgstr "Användarnamnet är ogiltigt."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:292
+#: server/connecthand.c:326
#, c-format
msgid "(%d) %s rejected: invalid username [%s]"
msgstr "(%d) %s avvisades: otillåtet användarnamn [%s]"
-#: server/connecthand.c:303
+#: server/connecthand.c:337
msgid "Your username is already connected!"
msgstr "Ditt användarnamn är redan anslutet."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:305
+#: server/connecthand.c:339
#, c-format
msgid "(%d) %s rejected: duplicate username [%s]"
msgstr "(%d) %s avvisades: upptaget inloggningsnamn [%s]"
-#: server/connecthand.c:335 server/connecthand.c:344
+#: server/connecthand.c:369 server/connecthand.c:378
#, c-format
msgid "Lost connection: %s."
msgstr "Tappade anslutning: %s."
@@ -3013,111 +3042,111 @@ msgstr "Ok. Standardstil satt."
msgid "For introductory help, type 'help'."
msgstr "Skriv \"help\" för att få inledande hjälp."
-#: server/diplhand.c:164
+#: server/diplhand.c:167
#, c-format
msgid "The %s can't accept %s."
msgstr "%s kan ej godta %s."
-#: server/diplhand.c:176
+#: server/diplhand.c:179
#, c-format
msgid "You don't have tech %s, you can't accept treaty."
msgstr "Vi saknar teknologin %s, så vi kan inte godkänna avtalet."
-#: server/diplhand.c:185
+#: server/diplhand.c:188
msgid "City you are trying to give no longer exists, you can't accept treaty."
msgstr "Staden som vi försöker ge finns inte längre: Avtalet kan ej godkännas."
-#: server/diplhand.c:191
+#: server/diplhand.c:194
#, c-format
msgid "You are not owner of %s, you can't accept treaty."
msgstr "Vi äger inte %s, så vi kan inte godkänna avtalet."
-#: server/diplhand.c:197 server/diplhand.c:301
+#: server/diplhand.c:200 server/diplhand.c:304
#, c-format
msgid "Your capital (%s) is requested, you can't accept treaty."
msgstr "Vår huvudstad (%s) efterfrågas, så vi kan inte godkänna avtalet."
-#: server/diplhand.c:224
+#: server/diplhand.c:227
msgid "You don't have enough gold, you can't accept treaty."
msgstr "Vi har inte tillräckligt mycket guld för att kunna godkänna avtalet."
-#: server/diplhand.c:256 server/diplhand.c:261
+#: server/diplhand.c:259 server/diplhand.c:264
#, c-format
msgid "A treaty containing %d clause was agreed upon."
msgid_plural "A treaty containing %d clauses was agreed upon."
msgstr[0] "Parterna kom överens om ett avtal bestående av %d klausul."
msgstr[1] "Parterna kom överens om ett avtal bestående av %d klausuler."
-#: server/diplhand.c:277 server/diplhand.c:281
+#: server/diplhand.c:280 server/diplhand.c:284
#, c-format
msgid "One of the cities the %s are giving away is destroyed! Treaty canceled!"
msgstr ""
"En av städerna som %s erbjuder har förstörts! Avtalet träder inte i kraft!"
-#: server/diplhand.c:288 server/diplhand.c:293
+#: server/diplhand.c:291 server/diplhand.c:296
#, c-format
msgid "The %s no longer control %s! Treaty canceled!"
msgstr "%s regerar ej längre %s! Avtalet träder ej i kraft!"
-#: server/diplhand.c:331 server/diplhand.c:335
+#: server/diplhand.c:334 server/diplhand.c:338
#, c-format
msgid "The %s don't have the promised amount of gold! Treaty canceled!"
msgstr "%s äger ej den utlovade mängden guld! Avtalet träder inte i kraft!"
-#: server/diplhand.c:364
+#: server/diplhand.c:367
#, c-format
msgid "You gave an embassy to %s."
msgstr "Vi gav en ambassad till %s."
-#: server/diplhand.c:367
+#: server/diplhand.c:370
#, c-format
msgid "%s allowed you to create an embassy!"
msgstr "%s tillät oss inrätta en ambassad!"
-#: server/diplhand.c:383
+#: server/diplhand.c:386
#, c-format
msgid "You are taught the knowledge of %s."
msgstr "Vi blev undervisade i %s."
-#: server/diplhand.c:387
+#: server/diplhand.c:390
#, c-format
msgid "The %s have acquired %s from the %s."
msgstr "%s erhöll %s från %s."
-#: server/diplhand.c:402
+#: server/diplhand.c:405
#, c-format
msgid "You get %d gold."
msgstr "Vi mottog %d guld."
#. TRANS: ... Polish worldmap.
-#: server/diplhand.c:410
+#: server/diplhand.c:413
#, c-format
msgid "You receive the %s worldmap."
msgstr "Vi mottog den %s världskartan."
#. TRANS: ... Polish seamap.
-#: server/diplhand.c:419
+#: server/diplhand.c:422
#, c-format
msgid "You receive the %s seamap."
msgstr "Vi mottog det %s sjökortet."
-#: server/diplhand.c:436
+#: server/diplhand.c:439
#, c-format
msgid "You receive city of %s from %s."
msgstr "Vi mottog staden %s från %s."
-#: server/diplhand.c:441
+#: server/diplhand.c:444
#, c-format
msgid "You give city of %s to %s."
msgstr "Vi gav staden %s till %s."
-#: server/diplhand.c:454 server/diplhand.c:457
+#: server/diplhand.c:457 server/diplhand.c:460
#, c-format
msgid "You agree on a cease-fire with %s."
msgstr "Vi kom överens om vapenstillestånd med %s."
#. TRANS: ... the Poles ... Polish territory.
-#: server/diplhand.c:476 server/diplhand.c:488
+#: server/diplhand.c:479 server/diplhand.c:491
#, c-format
msgid ""
"You agree on an armistice with the %s. In %d turn, it will become a peace "
@@ -3132,33 +3161,33 @@ msgstr[1] ""
"Vi kom överens om vapenvila med %s. Om %d omgångar övergår det i ett "
"fredsavtal. Flytta snarast ut dina trupper ur det %s territoriet."
-#: server/diplhand.c:512 server/diplhand.c:515
+#: server/diplhand.c:515 server/diplhand.c:518
#, c-format
msgid "You agree on an alliance with %s."
msgstr "Vi kom överens om ett förbund med %s."
-#: server/diplhand.c:524
+#: server/diplhand.c:527
#, c-format
msgid "You give shared vision to %s."
msgstr "Vi ger delad anblick till %s."
-#: server/diplhand.c:527
+#: server/diplhand.c:530
#, c-format
msgid "%s gives you shared vision."
msgstr "%s ger oss delad anblick."
-#: server/diplhand.c:663
+#: server/diplhand.c:666
#, c-format
msgid "%s canceled the meeting!"
msgstr "%s avbröt mötet!"
# DM> Utvecklade prosan en smula
-#: server/diplhand.c:670
+#: server/diplhand.c:673
#, c-format
msgid "Meeting with %s canceled."
msgstr "Mötet med %s ledde ej till någon överenskommelse."
-#: server/diplhand.c:712
+#: server/diplhand.c:715
msgid "Your diplomatic envoy was decapitated!"
msgstr "Vårt diplomatiska ombud avrättades!"
@@ -3346,81 +3375,81 @@ msgstr "%s förstörde %s i %s."
# server/unitTerrain tiles that do not have alterationsfunc.c:1143
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1091
+#: server/diplomats.c:1097
#, c-format
msgid "An enemy %s has been eliminated by your %s."
msgstr "En fientlig %s har eliminerats av vår %s."
# server/unitTerrain tiles that do not have alterationsfunc.c:1143
#. TRANS: <unit> ... <city> ... <diplomat>
-#: server/diplomats.c:1098
+#: server/diplomats.c:1104
#, c-format
msgid "Your %s has been eliminated defending %s against a %s."
msgstr "Vår %s försvarade %s mot anfall från %s och utplånades."
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1106
+#: server/diplomats.c:1112
#, c-format
msgid "Your %s has been eliminated defending against a %s."
msgstr "Vår %s försvarade sig mot %s och utplånades."
-#: server/diplomats.c:1119
+#: server/diplomats.c:1125
#, c-format
msgid "Your %s was eliminated by a defending %s."
msgstr "Vår %s anföll %s och utplånades denna trupp."
-#: server/diplomats.c:1127
+#: server/diplomats.c:1133
#, c-format
msgid "Eliminated %s %s while infiltrating %s."
msgstr "En %s %s utplånades vid infiltrering av %s."
-#: server/diplomats.c:1134
+#: server/diplomats.c:1140
#, c-format
msgid "Eliminated %s %s while infiltrating our troops."
msgstr "En %s %s utplånades vid infiltrering av våra trupper."
-#: server/diplomats.c:1185
+#: server/diplomats.c:1191
#, c-format
msgid ""
"Your %s has successfully completed the mission and returned unharmed to %s."
msgstr "Vår %s lyckades med sitt uppdrag och återvände oskadd till %s."
-#: server/diplomats.c:1204
+#: server/diplomats.c:1210
#, c-format
msgid "Your %s was captured after completing the mission in %s."
msgstr "Vår %s tillfångatogs efter utfört uppdrag i %s."
-#: server/diplomats.c:1210
+#: server/diplomats.c:1216
#, c-format
msgid "Your %s was captured after completing the mission."
msgstr "Vår %s tillfångatogs efter utfört uppdrag."
-#: server/diplomats.c:1242
+#: server/diplomats.c:1248
#, c-format
msgid "You have caused an incident while bribing the %s %s."
msgstr "Vi har orsakat en incident vid mutandet av den %s truppen %s."
-#: server/diplomats.c:1247
+#: server/diplomats.c:1253
#, c-format
msgid "%s has caused an incident while bribing your %s."
msgstr "%s har orsakat en incident när de försökte muta vår trupp %s."
-#: server/diplomats.c:1254
+#: server/diplomats.c:1260
#, c-format
msgid "You have caused an incident while attempting to steal tech from %s."
msgstr "Vi har orsakat en incident när vi försökte stjäla teknologi från %s."
-#: server/diplomats.c:1258
+#: server/diplomats.c:1264
#, c-format
msgid "%s has caused an incident while attempting to steal tech from you."
msgstr "%s har orsakat en incident när de försökte stjäla teknologi från oss."
-#: server/diplomats.c:1264
+#: server/diplomats.c:1270
#, c-format
msgid "You have caused an incident while inciting a revolt in %s."
msgstr "Vi har orsakat en incident genom att anstifta ett uppror i %s."
-#: server/diplomats.c:1268
+#: server/diplomats.c:1274
#, c-format
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."
@@ -3535,12 +3564,12 @@ msgstr ""
"järnväg.\n"
" Arbetare samlas frivilligt och bygger järnvägar genom alla städer."
-#: server/maphand.c:1418
+#: server/maphand.c:1425
#, 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:1436
+#: server/maphand.c:1443
#, c-format
msgid "Disbanded your %s due to changing terrain."
msgstr "Vår %s har upplösts på grund av landskapsförändringar."
@@ -3549,7 +3578,7 @@ msgstr "Vår %s har upplösts på grund av landskapsförändringar."
msgid "Not reporting to the metaserver in this game."
msgstr "Underrättar inte metaservern under detta spel."
-#: server/meta.c:430
+#: server/meta.c:432
#, c-format
msgid "Metaserver: bad address: [%s:%d]."
msgstr "Metaserver: felaktig adress: [%s:%d]."
@@ -3678,26 +3707,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:1103
+#: server/plrhand.c:1115
#, c-format
msgid "Removing player %s."
msgstr "Avlägsnar spelare %s."
-#: server/plrhand.c:1105
+#: server/plrhand.c:1117
msgid "You've been removed from the game!"
msgstr "Du har blivit avlägsnad från spelet!"
-#: server/plrhand.c:1108
+#: server/plrhand.c:1120
#, c-format
msgid "%s has been removed from the game."
msgstr "%s har blivit avlägsnad från spelet."
-#: server/plrhand.c:1153 server/plrhand.c:1158
+#: server/plrhand.c:1167 server/plrhand.c:1172
#, 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:1178
+#: server/plrhand.c:1192
#, c-format
msgid ""
"%s and %s meet and go to instant war. You cancel your alliance with both."
@@ -3705,17 +3734,17 @@ msgstr ""
"%s och %s har mötts och omedelbart startat krig. Vi avbryter förbundet med "
"båda."
-#: server/plrhand.c:1656
+#: server/plrhand.c:1670
#, 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:1663
+#: server/plrhand.c:1677
#, 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:1686
+#: server/plrhand.c:1700
#, fuzzy, c-format
msgid ""
"Your nation is thrust into civil war! %s is declared the leader of the rebel "
@@ -3724,12 +3753,12 @@ msgstr ""
"Vår nation befinner sig i inbördeskrig; %s utropar sig till ledare över "
"upprorsmakarna."
-#: server/plrhand.c:1707
+#: server/plrhand.c:1721
#, c-format
msgid "%s declares allegiance to %s."
msgstr "%s svär trohet till %s."
-#: server/plrhand.c:1722
+#: server/plrhand.c:1736
#, c-format
msgid ""
"Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3925,67 +3954,67 @@ msgstr "(bygger %s i %s (%s))\n"
msgid "Wonders of the World"
msgstr "Världens underverk"
-#: server/report.c:547
+#: server/report.c:552
msgid " sq. mi."
msgstr " kv.mil"
-#: server/report.c:557
+#: server/report.c:562
msgid " M tons"
msgstr " milj. ton"
-#: server/report.c:562
+#: server/report.c:567
msgid " M goods"
msgstr " milj. varor"
-#: server/report.c:567
+#: server/report.c:572
msgid " bulbs"
msgstr " glödlampor"
-#: server/report.c:572
+#: server/report.c:577
msgid " month"
msgid_plural " months"
msgstr[0] " månad"
msgstr[1] " månader"
-#: server/report.c:577
+#: server/report.c:582
msgid " ton"
msgid_plural " tons"
msgstr[0] " ton"
msgstr[1] " ton"
-#: server/report.c:591
+#: server/report.c:596
msgid "st"
msgstr ":a plats"
-#: server/report.c:593
+#: server/report.c:598
msgid "nd"
msgstr ":a plats"
-#: server/report.c:595
+#: server/report.c:600
msgid "rd"
msgstr ":e plats"
-#: server/report.c:597
+#: server/report.c:602
msgid "th"
msgstr ":e plats"
-#: server/report.c:700
+#: server/report.c:705
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:743 server/report.c:768
+#: server/report.c:748 server/report.c:773
msgid "Demographics Report:"
msgstr "Demografi"
-#: server/report.c:744
+#: server/report.c:749
msgid "Sorry, the Demographics report is unavailable."
msgstr "Demografiredogörelsen är tyvärr ej tillgänglig."
#. TRANS: <nation adjective> <government name> (<year>).
#. * E.g. "Polish Despotism (200 AD)".
-#: server/report.c:750
+#: server/report.c:755
#, fuzzy, c-format
msgid "%s %s (%s)"
msgstr "%s i %s (%s)\n"
@@ -3996,11 +4025,11 @@ msgstr "%s i %s (%s)\n"
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:2356
+#: server/ruleset.c:2366
msgid "No barbarian nation in rulesets, at least one required!"
msgstr "Reglerna saknar en barbarnation: åtminstone en behövs!"
-#: server/ruleset.c:3166
+#: server/ruleset.c:3178
msgid "Loading rulesets"
msgstr "Läser in reglerna"
@@ -4014,19 +4043,19 @@ 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:3588
+#: server/savegame.c:3587
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."
#. TRANS: Fatal error message.
-#: server/savegame.c:3815
+#: server/savegame.c:3817
msgid ""
"Saved game uses the \"classic\" terrain ruleset, and is no longer supported."
msgstr ""
"Det sparade spelet använder sig av de \"klassiska\" terrängreglerna som ej "
"längre stöds."
-#: server/savegame.c:3824
+#: server/savegame.c:3826
#, c-format
msgid ""
"Warning: Different rulesetdirs ('%s' and '%s') are no longer supported. "
@@ -4036,7 +4065,7 @@ msgstr ""
"s'."
#. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4051
+#: server/savegame.c:4055
#, c-format
msgid "%s had invalid nation; changing to %s."
msgstr "%s har ogiltigt folkslag; byter till %s."
@@ -4069,7 +4098,7 @@ msgstr "Internt"
msgid "Networking"
msgstr "Nätverk"
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:734
#: client/gui-win32/dialogs.c:532
msgid "All"
msgstr "Alla"
@@ -5289,11 +5318,11 @@ msgstr ""
"Om satt till 1, läggs spelarstatistik till i filen \"civscore.log\" varje "
"omgång. Denna statistik kan användas för att skapa styrkegrafer efter spelet."
-#: server/sernet.c:150
+#: server/sernet.c:151
msgid "Server cannot read standard input. Ignoring input."
msgstr "Servern kan inte läsa standardinmatning. Bortser från inmatning."
-#: server/sernet.c:929
+#: server/sernet.c:933
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr "Server: felaktig adress: [%s:%d]."
@@ -5370,35 +5399,35 @@ msgstr "Vårt rymdskepp har redan det största möjliga antalet solpanelsmoduler
msgid "Without guidance from the capital, the %s spaceship is lost!"
msgstr "Utan vägledning från huvudstaden är det %s rymdskeppet förlorat!"
-#: server/srv_main.c:240
+#: server/srv_main.c:242
msgid "Game ended in a draw as end year exceeded"
msgstr "Spelet slutade oavgjort efter slutåret"
-#: server/srv_main.c:274
+#: server/srv_main.c:276
#, c-format
msgid "The %s spaceship has arrived at Alpha Centauri."
msgstr "Det %s rymdskeppet har anlänt vid Alfa Kentauri."
-#: server/srv_main.c:287 server/srv_main.c:322
+#: server/srv_main.c:289 server/srv_main.c:324
#, c-format
msgid "Team victory to %s"
msgstr "Lagseger för %s"
-#: server/srv_main.c:297 server/srv_main.c:338
+#: server/srv_main.c:299 server/srv_main.c:340
#, c-format
msgid "Game ended in victory for %s"
msgstr "Spelet slutade med seger för %s"
-#: server/srv_main.c:345
+#: server/srv_main.c:347
msgid "Game ended in a draw"
msgstr "Spelet slutade oavgjort"
-#: server/srv_main.c:461 server/srv_main.c:472
+#: server/srv_main.c:465 server/srv_main.c:476
#, c-format
msgid "Your %s was disbanded in accordance with your peace treaty with the %s."
msgstr "Vår/t %s upplöstes i enlighet med vårt fredsavtal med %s."
-#: server/srv_main.c:512 server/srv_main.c:516
+#: server/srv_main.c:516 server/srv_main.c:520
#, c-format
msgid ""
"Concerned citizens point out that the cease-fire with %s will run out soon."
@@ -5406,13 +5435,13 @@ msgstr ""
"Bekymrade medborgare påpekar att vapenstilleståndet med %s kommer att löpa "
"ut snart."
-#: server/srv_main.c:521 server/srv_main.c:525
+#: server/srv_main.c:525 server/srv_main.c:529
#, c-format
msgid "The cease-fire with %s has run out. You are now at war with the %s."
msgstr ""
"Vapenstilleståndet med %s har upphört. Vi befinner oss nu i krig med %s."
-#: server/srv_main.c:542
+#: server/srv_main.c:546
#, c-format
msgid ""
"Ceasefire between %s and %s has run out. They are at war. You cancel your "
@@ -5421,99 +5450,99 @@ msgstr ""
"Eldupphöret mellan %s och %s har upphört och de befinner sig nu i krig. Vi "
"avbryter vårt förbund med båda."
-#: server/srv_main.c:961
+#: server/srv_main.c:997
#, c-format
msgid "Failed saving game as %s"
msgstr "Misslyckades med att spara spel som %s"
-#: server/srv_main.c:963
+#: server/srv_main.c:999
#, c-format
msgid "Game saved as %s"
msgstr "Spelet har sparats som \"%s\"."
-#: server/srv_main.c:994
+#: server/srv_main.c:1030
msgid "The game is already running."
msgstr "Spelet pågår redan."
-#: server/srv_main.c:1002
+#: server/srv_main.c:1038
#, 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:1009
+#: server/srv_main.c:1045
msgid "Starting game."
msgstr "Sätter i gång spelet."
-#: server/srv_main.c:1071
+#: server/srv_main.c:1112
#, c-format
msgid "request for unknown report (type %d)"
msgstr "Okänd redogörelse efterfrågades (slag %d)"
-#: server/srv_main.c:1136
+#: server/srv_main.c:1177
#, c-format
msgid "Warning: rejecting old client %s"
msgstr "Varning: avvisar föråldrad klient %s"
-#: server/srv_main.c:1238
+#: server/srv_main.c:1279
#, 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:1338
+#: server/srv_main.c:1381
msgid "Please choose a non-blank name."
msgstr "Var god välj ett ickeblankt namn."
-#: server/srv_main.c:1354
+#: server/srv_main.c:1397
msgid "That nation is already in use."
msgstr "Folkslaget är upptaget."
-#: server/srv_main.c:1370
+#: server/srv_main.c:1413
#, 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:1391
+#: server/srv_main.c:1434
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:1490
+#: server/srv_main.c:1533
#, c-format
msgid "%s nation is not available in this scenario."
msgstr "Folkslaget %s är inte tillgängligt i scenariot"
-#: server/srv_main.c:1496
+#: server/srv_main.c:1539
#, c-format
msgid "%s nation is already in use."
msgstr "Folkslaget %s är upptaget."
-#: server/srv_main.c:1514
+#: server/srv_main.c:1557
#, c-format
msgid "%s is the %s ruler %s."
msgstr "%1$s styr %3$s (%2$s)."
-#: server/srv_main.c:1570
+#: server/srv_main.c:1613
#, 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:1614 server/srv_main.c:1618
+#: server/srv_main.c:1657 server/srv_main.c:1661
#, 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:1760
+#: server/srv_main.c:1803
#, c-format
msgid "Player %d"
msgstr "Spelare %d"
-#: server/srv_main.c:1771 server/srv_main.c:1777
+#: server/srv_main.c:1814 server/srv_main.c:1820
#, c-format
msgid "%s rules the %s."
msgstr "%s regerar %s."
-#: server/srv_main.c:1942
+#: server/srv_main.c:1985
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
@@ -5521,246 +5550,236 @@ msgstr ""
"Detta civserverprogram har stöd för spelarautentisering, men den är f.n. "
"inte aktiverad."
-#: server/srv_main.c:1993
+#: server/srv_main.c:2037
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr "Skickar upplysningar till metaservern [%s]"
-#: server/srv_main.c:2024
+#: server/srv_main.c:2069
msgid "The game is over..."
msgstr "Spelet är slut..."
-#: server/srv_main.c:2237
+#: server/srv_main.c:2286
msgid "Now accepting new client connections."
msgstr "Godtar nu nya klientanslutningar."
-#: server/stdinhand.c:246
-#, c-format
-msgid "Vote \"%s\" is passed %d to %d with %d abstentions."
-msgstr "Förslaget \"%s\" antogs med %d mot %d. %d avstod."
-
-#: server/stdinhand.c:253
-#, c-format
-msgid "Vote \"%s\" failed with %d against, %d for and %d abstentions."
-msgstr "Förslaget \"%s\" avslogs med %d mot %d. %d avstod."
-
#. TRANS: ambiguous command
-#: server/stdinhand.c:365
+#: server/stdinhand.c:284
msgid "(ambiguous)"
msgstr "(flertydigt)"
#. TRANS: unrecognized command
#. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:416
+#: server/stdinhand.c:287 client/citydlg_common.c:419
#: 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 "(okänd)"
-#: server/stdinhand.c:458
+#: server/stdinhand.c:377
msgid "Name is empty, so cannot be a player."
msgstr "Namnet är tomt, så det kan inte vara en spelare."
-#: server/stdinhand.c:462
+#: server/stdinhand.c:381
msgid "Name is too long, so cannot be a player."
msgstr "Namnet för långt, så det kan inte vara en spelare."
-#: server/stdinhand.c:466
+#: server/stdinhand.c:385
#, c-format
msgid "Player name prefix '%s' is ambiguous."
msgstr "Spelarnamnsförstavelsen \"%s\" är flertydig."
-#: server/stdinhand.c:470
+#: server/stdinhand.c:389
#, c-format
msgid "No player by the name of '%s'."
msgstr "Ingen spelare med namnet \"%s\"."
-#: server/stdinhand.c:474 server/stdinhand.c:509
+#: server/stdinhand.c:393 server/stdinhand.c:428
#, c-format
msgid "Unexpected match_result %d (%s) for '%s'."
msgstr "Oväntat match_result %d (%s) för \"%s\"."
-#: server/stdinhand.c:493
+#: server/stdinhand.c:412
msgid "Name is empty, so cannot be a connection."
msgstr "Namnet är tomt, så det kan inte vara en anslutning."
-#: server/stdinhand.c:497
+#: server/stdinhand.c:416
msgid "Name is too long, so cannot be a connection."
msgstr "Namnet är för långt, så det kan inte vara en anslutning."
-#: server/stdinhand.c:501
+#: server/stdinhand.c:420
#, c-format
msgid "Connection name prefix '%s' is ambiguous."
msgstr "Anslutningsnamnsförstavelsen \"%s\" är flertydig."
-#: server/stdinhand.c:505
+#: server/stdinhand.c:424
#, c-format
msgid "No connection by the name of '%s'."
msgstr "Ingen anslutning med namnet \"%s\"."
-#: server/stdinhand.c:525
+#: server/stdinhand.c:444
#, c-format
msgid "Open metaserver connection to [%s]."
msgstr "Öppna metaserveranslutning till [%s]."
-#: server/stdinhand.c:538
+#: server/stdinhand.c:457
#, c-format
msgid "Close metaserver connection to [%s]."
msgstr "Stäng metaserveranslutning till [%s]."
-#: server/stdinhand.c:553
+#: server/stdinhand.c:472
msgid "Metaserver connection is open."
msgstr "Metaserveranslutningen är öppen."
-#: server/stdinhand.c:556
+#: server/stdinhand.c:475
msgid "Metaserver connection is closed."
msgstr "Metaserveranslutningen är stängd."
-#: server/stdinhand.c:566
+#: server/stdinhand.c:485
msgid "Metaserver connection is already open."
msgstr "Metaserveranslutningen är redan öppen."
-#: server/stdinhand.c:577
+#: server/stdinhand.c:496
msgid "Metaserver connection is already closed."
msgstr "Metaserveranslutningen är redan stängd."
-#: server/stdinhand.c:582
+#: server/stdinhand.c:501
msgid "Argument must be 'u', 'up', 'd', 'down', or '?'."
msgstr "Argumentet måste vara 'u', 'up', 'down' eller '?'."
-#: server/stdinhand.c:603
+#: server/stdinhand.c:522
#, c-format
msgid "Metaserver patches string set to '%s'."
msgstr "Metaserverpatchsträng satt till '%s'."
-#: server/stdinhand.c:606
+#: server/stdinhand.c:525
#, c-format
msgid "Metaserver patches string set to '%s', not reporting to metaserver."
msgstr "Metaserverpatchsträng satt till '%s', rapporteras ej till metaservern."
-#: server/stdinhand.c:627
+#: server/stdinhand.c:546
#, c-format
msgid "Metaserver message string set to '%s'."
msgstr "Metaservermeddelandesträng satt till \"%s\"."
-#: server/stdinhand.c:630
+#: server/stdinhand.c:549
#, c-format
msgid "Metaserver message string set to '%s', not reporting to metaserver."
msgstr ""
"Metaservermeddelandesträng satt till \"%s\", rapporteras ej till metaservern."
-#: server/stdinhand.c:650
+#: server/stdinhand.c:569
#, c-format
msgid "Metaserver is now [%s]."
msgstr "Metaservern är nu [%s]."
-#: server/stdinhand.c:660
+#: server/stdinhand.c:579
#, c-format
msgid "Server id: %s"
msgstr "Server-id: %s"
-#: server/stdinhand.c:757
+#: server/stdinhand.c:676
msgid "You cannot save games manually on this server."
msgstr "Denna server tillåter inte manuellt spar av spel."
-#: server/stdinhand.c:774
+#: server/stdinhand.c:693
msgid "Cannot toggle a barbarian player."
msgstr "Kan inte växla en barbarspelare."
-#: server/stdinhand.c:781
+#: server/stdinhand.c:700
#, c-format
msgid "%s is now under AI control."
msgstr "%s är nu datorstyrd."
-#: server/stdinhand.c:802
+#: server/stdinhand.c:721
#, c-format
msgid "%s is now under human control."
msgstr "%s är nu under mänsklig styrning."
-#: server/stdinhand.c:847
+#: server/stdinhand.c:766
msgid "Can't add AI players once the game has begun."
msgstr "Kan inte lägga till datorstyrda spelare under spelets gång."
-#: server/stdinhand.c:867
+#: server/stdinhand.c:786
msgid "Can't add more players, server is full."
msgstr "Kan inte lägga till fler spelare, servern är full."
-#: server/stdinhand.c:874
+#: server/stdinhand.c:793
msgid "Can't use an empty name."
msgstr "Kan inte använda ett tomt namn."
-#: server/stdinhand.c:881
+#: server/stdinhand.c:800
#, c-format
msgid "That name exceeds the maximum of %d chars."
msgstr "Det namnet överskrider det högsta möjliga antalet tecken, %d."
-#: server/stdinhand.c:887
+#: server/stdinhand.c:806
msgid "That name is not allowed."
msgstr "Namnet ej tillåtet."
-#: server/stdinhand.c:893
+#: server/stdinhand.c:812
msgid "A player already exists by that name."
msgstr "En spelare med det namnet finns redan."
-#: server/stdinhand.c:899
+#: server/stdinhand.c:818
msgid "A user already exists by that name."
msgstr "En användare med det namnet finns redan."
-#: server/stdinhand.c:925
+#: server/stdinhand.c:844
#, c-format
msgid "%s has been added as an AI-controlled player."
msgstr "%s har lagts till som en datorstyrd spelare."
-#: server/stdinhand.c:932
+#: server/stdinhand.c:851
#, c-format
msgid "Error creating new AI player: %s."
msgstr "Fel vid skapande av ny datorstyrd spelare: %s."
-#: server/stdinhand.c:966
+#: server/stdinhand.c:885
msgid "Players cannot be removed once the game has started."
msgstr "Spelare kan inte borttagas under spelets gång."
-#: server/stdinhand.c:977
+#: server/stdinhand.c:896
#, c-format
msgid "Removed player %s from the game."
msgstr "Tog bort spelare %s från spelet."
-#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
+#: server/stdinhand.c:935 server/stdinhand.c:3372 server/stdinhand.c:3507
#, c-format
msgid "Name \"%s\" disallowed for security reasons."
msgstr "Namnet \"%s\" är otillåtet av säkerhetsskäl."
-#: server/stdinhand.c:1029
+#: server/stdinhand.c:948
#, c-format
msgid "No command script found by the name \"%s\"."
msgstr "Ingen kommandoskript med namnet \"%s\" kunde finnas."
-#: server/stdinhand.c:1037
+#: server/stdinhand.c:956
#, c-format
msgid "Loading script file: %s"
msgstr "Läser in skriptfil: %s"
-#: server/stdinhand.c:1052
+#: server/stdinhand.c:971
#, c-format
msgid "Cannot read command line scriptfile '%s'."
msgstr "Kunde inte läsa kommandoradsskriptfilen \"%s\"."
-#: server/stdinhand.c:1054
+#: server/stdinhand.c:973
#, c-format
msgid "Could not read script file '%s'."
msgstr "Kunde inte läsa skriptfilen \"%s\"."
-#: server/stdinhand.c:1146
+#: server/stdinhand.c:1065
#, c-format
msgid "Could not write script file '%s'."
msgstr "Kunde inte skriva skriptfilen \"%s\"."
-#: server/stdinhand.c:1158
+#: server/stdinhand.c:1077
msgid "You cannot use the write command on this server for security reasons."
msgstr "Man kan inte använda write-kommandot på denna server av säkerhetsskäl."
-#: server/stdinhand.c:1186
+#: server/stdinhand.c:1105
#, c-format
msgid ""
"Cannot decrease command access level '%s' for connection '%s'; you only have "
@@ -5769,235 +5788,230 @@ msgstr ""
"Kan inte sänka kontrollnivån \"%s\" för anslutningen \"%s\"; du har endast "
"\"%s\"."
-#: server/stdinhand.c:1241
+#: server/stdinhand.c:1114
+#, 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:1163
#, c-format
msgid ""
"Anyone can now become game organizer '%s' by issuing the 'first' command."
msgstr ""
"Vem som helst kan bli spelledare '%s' nu genom att ge kommandot 'first'."
-#: server/stdinhand.c:1274
+#: server/stdinhand.c:1187
msgid "Command access levels in effect:"
msgstr "Verksamma kontrollnivåer:"
-#: server/stdinhand.c:1282
+#: server/stdinhand.c:1194
#, c-format
msgid "Command access level for new connections: %s"
msgstr "Kontrollnivån för nya anslutningar: %s"
-#: server/stdinhand.c:1285
+#: server/stdinhand.c:1197
#, c-format
msgid "Command access level for first player to take it: %s"
msgstr "Kontrollnivån för den första spelaren som tar det: %s"
-#: server/stdinhand.c:1294
+#: server/stdinhand.c:1206
msgid ""
"Error: command access level must be one of 'none', 'info', 'ctrl', or 'hack'."
msgstr ""
"Fel: kontrollnivån måste vara en av \"none\", \"info\", \"ctrl\" eller \"hack"
"\"."
-#: server/stdinhand.c:1299
+#: server/stdinhand.c:1211
#, c-format
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: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: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:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
+#: server/stdinhand.c:1238 server/stdinhand.c:1252 server/stdinhand.c:1273
#, 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:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
+#: server/stdinhand.c:1243 server/stdinhand.c:1257 server/stdinhand.c:1267
#, 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:1402
+#: server/stdinhand.c:1302
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:1406
+#: server/stdinhand.c:1306
#, 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:1411
+#: server/stdinhand.c:1311
msgid "Someone else already is game organizer."
msgstr "Någon annan är redan spelledare."
-#: server/stdinhand.c:1416
+#: server/stdinhand.c:1316
#, 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:1467
+#: server/stdinhand.c:1367
#, c-format
msgid "Invalid argument %d."
msgstr "\"%d\" är ett ogiltigt argument."
-#: server/stdinhand.c:1474
+#: server/stdinhand.c:1374
msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
msgstr ""
"Användning: timeoutincrease <omgång> <omgångsökning> <värde> <värdefaktor>."
-#: server/stdinhand.c:1482
+#: server/stdinhand.c:1382
#, 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:1542 server/stdinhand.c:1545
+#: server/stdinhand.c:1442 server/stdinhand.c:1445
msgid "Option:"
msgstr "Tillval:"
-#: server/stdinhand.c:1555 server/stdinhand.c:4031
+#: server/stdinhand.c:1455 server/stdinhand.c:4079
msgid "Description:"
msgstr "Beskrivning:"
-#: server/stdinhand.c:1560
+#: server/stdinhand.c:1460
#, c-format
msgid "Status: %s"
msgstr "Status: %s"
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "changeable"
msgstr "ändringsbar"
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "fixed"
msgstr "fastlåst"
-#: server/stdinhand.c:1567
+#: server/stdinhand.c:1467
#, 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:1572
+#: server/stdinhand.c:1472
#, 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:1578
+#: server/stdinhand.c:1478
#, c-format
msgid "Value: \"%s\", Default: \"%s\""
msgstr "Värde \"%s\", Standard: \"%s\""
-#: server/stdinhand.c:1597
+#: server/stdinhand.c:1497
msgid "Explanations are available for the following server options:"
msgstr "Förklaringar är tillgängliga för följande servertillval:"
-#: server/stdinhand.c:1643
+#: server/stdinhand.c:1537
msgid "No explanation for that yet."
msgstr "Ingen förklaring för detta än."
-#: server/stdinhand.c:1646 server/stdinhand.c:2480
+#: server/stdinhand.c:1540 server/stdinhand.c:2468
msgid "Ambiguous option name."
msgstr "Flertydigt tillval."
-#: server/stdinhand.c:1666
+#: server/stdinhand.c:1560
#, c-format
msgid "Server Operator: %s"
msgstr "Serverhandhavare: %s"
-#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
+#: server/stdinhand.c:1686 server/stdinhand.c:1713 server/stdinhand.c:1731
#, c-format
msgid "Player '%s' now has AI skill level '%s'."
msgstr "Spelare \"%s\" har nu skicklighet \"%s\"."
-#: server/stdinhand.c:1822
+#: server/stdinhand.c:1718
#, c-format
msgid "%s is not controlled by the AI."
msgstr "%s är inte datorstyrd."
-#: server/stdinhand.c:1842
+#: server/stdinhand.c:1738
#, c-format
msgid "Default AI skill level set to '%s'."
msgstr "Standardskicklighet satt till '%s'."
-#: server/stdinhand.c:1857 server/stdinhand.c:2162
+#: server/stdinhand.c:1753
msgid "This command is client only."
msgstr "Detta kommando kan endast utföras i klienten."
-#: server/stdinhand.c:1860
+#: server/stdinhand.c:1756
msgid "Usage: away"
msgstr "Användning: away"
-#: server/stdinhand.c:1865
+#: server/stdinhand.c:1761
msgid "Only players may use the away command."
msgstr "Endast spelare kan använda kommandot away."
-#: server/stdinhand.c:1869
+#: server/stdinhand.c:1765
#, c-format
msgid "%s set to away mode."
msgstr "%s försatte sig i bortaläge."
-#: server/stdinhand.c:1877
+#: server/stdinhand.c:1772
#, c-format
msgid "%s returned to game."
msgstr "%s återvände till spel."
-#: server/stdinhand.c:1919
+#: server/stdinhand.c:1817
#, 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:1925
+#: server/stdinhand.c:1823
#, c-format
msgid "Unknown option '%s'."
msgstr "Okänt tillval '%s'."
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1848
msgid "All options with non-default values"
msgstr "Alla inställningar med ändrade värden"
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1851
msgid "All options"
msgstr "Samtliga inställningar"
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1854
msgid "Vital options"
msgstr "Viktiga inställningar"
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1857
msgid "Situational options"
msgstr "Situationsspecifika inställningar"
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1860
msgid "Rarely used options"
msgstr "Ovanliga inställningar"
-#: server/stdinhand.c:1965
+#: server/stdinhand.c:1863
msgid "+ means you may change the option"
msgstr "+ betyder att man kan ändra tillvalet"
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1864
msgid "= means the option is on its default value"
msgstr "= betyder att tillvalet har sitt standardvärde"
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
#, c-format
msgid "%-*s value (min,max) "
msgstr "%-*s värde (minsta,största)"
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
msgid "Option"
msgstr "Tillval"
-#: server/stdinhand.c:1973
+#: server/stdinhand.c:1871
msgid "description"
msgstr "beskrivning"
-#: server/stdinhand.c:2042
+#: server/stdinhand.c:1940
msgid ""
"Try 'show situational' or 'show rare' to show more options.\n"
"Try 'show changed' to show settings with non-default values."
@@ -6005,77 +6019,149 @@ 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:2092
+#: server/stdinhand.c:1966
msgid "Cannot change teams once game has begun."
msgstr "Kan inte ändra lag när spelet har börjat."
-#: server/stdinhand.c:2102
+#: server/stdinhand.c:1976
msgid "Undefined argument. Usage: team <player> <team>."
msgstr "Odefinierat argument. Användning: team <spelare> <lag>."
-#: server/stdinhand.c:2122
+#: server/stdinhand.c:1996
#, 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:2129
+#: server/stdinhand.c:2003
msgid "Cannot team a barbarian."
msgstr "Barbarspelare kan ej tillhöra ett lag."
-#: server/stdinhand.c:2135
+#: server/stdinhand.c:2009
#, c-format
msgid "Player %s set to team %s."
msgstr "Spelare %s satt till lag %s."
-#: 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:2035 server/voting.c:512
+#, fuzzy
+msgid "Teamvote"
+msgstr "Lag"
-#: server/stdinhand.c:2165
-msgid "Observers cannot vote."
-msgstr "Iakttagare kan ej rösta."
+#: server/stdinhand.c:2035 server/voting.c:516
+msgid "Vote"
+msgstr ""
-#: server/stdinhand.c:2168
+#: server/stdinhand.c:2037
+#, c-format
msgid ""
-"You can only vote in a running game. Use 'first' to become the game "
-"organizer if there currently is none."
+"%s %d \"%s\" (needs %0.0f%%%s): %d for, %d against, and %d abstained out of %"
+"d players."
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:2181
-#, c-format
-msgid "Vote %d \"%s\": %d for, %d against"
-msgstr "Omröstning %d \"%s\": %d för, %d emot"
+#: server/stdinhand.c:2041
+msgid " no dissent"
+msgstr ""
-#: server/stdinhand.c:2188
+#: server/stdinhand.c:2049
msgid "There are no votes going on."
msgstr "Ingen omröstning pågår."
-#: server/stdinhand.c:2208
-msgid "No legal last vote."
+#: server/stdinhand.c:2077
+#, fuzzy
+msgid "Invalid arguments. Usage: vote yes|no|abstain [vote number]."
+msgstr "Oklart argument. Användning: röst yes|no [röstnummer]."
+
+#: server/stdinhand.c:2095 server/stdinhand.c:2213 server/stdinhand.c:3714
+msgid "You are not allowed to use this command."
+msgstr "Du har inte tillåtelse att använda detta kommando."
+
+#: server/stdinhand.c:2104
+#, fuzzy, c-format
+msgid "The argument \"%s\" is ambigious."
+msgstr "Hjälpargumentet \"%s\" är flertydigt."
+
+#: server/stdinhand.c:2119
+#, fuzzy
+msgid "There are no votes running."
+msgstr "Ingen omröstning pågår."
+
+#: server/stdinhand.c:2121
+#, fuzzy, c-format
+msgid "No legal last vote (%d %s)."
msgstr "Inte tillåten sista röst."
-#: server/stdinhand.c:2213
-msgid "Value must be integer."
-msgstr "Värde måste vara heltal."
+#: server/stdinhand.c:2122
+msgid "other vote running"
+msgid_plural "other votes running"
+msgstr[0] ""
+msgstr[1] ""
+
+#: server/stdinhand.c:2129 server/stdinhand.c:2491 server/stdinhand.c:2532
+msgid "Value must be an integer."
+msgstr "Värdet måste vara ett heltal."
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2135 server/stdinhand.c:2221
#, c-format
msgid "No such vote (%d)."
msgstr "Sådan röst saknas (%d)."
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2141
+#, fuzzy
+msgid "You are not allowed to vote on that."
+msgstr "Du har inte tillåtelse att sätta detta tillval."
+
+#: server/stdinhand.c:2146
#, c-format
msgid "You voted for \"%s\""
msgstr "Du röstade för \"%s\"."
-#: server/stdinhand.c:2232
+#: server/stdinhand.c:2150
#, c-format
msgid "You voted against \"%s\""
msgstr "Du röstade emot \"%s\""
-#: server/stdinhand.c:2259
+#: server/stdinhand.c:2155
+#, c-format
+msgid "You abstained from voting on \"%s\""
+msgstr ""
+
+#: server/stdinhand.c:2190
+msgid "Missing argument <vote number> or the string \"all\"."
+msgstr ""
+
+#: server/stdinhand.c:2197
+#, fuzzy
+msgid "You don't have any vote going on."
+msgstr "Vi har ingen arbetare här."
+
+#: server/stdinhand.c:2204
+#, fuzzy
+msgid "There isn't any vote going on."
+msgstr "Ingen omröstning pågår."
+
+#: server/stdinhand.c:2209
+msgid "Server: All votes have been removed."
+msgstr ""
+
+#: server/stdinhand.c:2226
+#, fuzzy, c-format
+msgid "You are not allowed to cancel this vote (%d)."
+msgstr "Du har inte tillåtelse att sätta detta tillval."
+
+#: server/stdinhand.c:2232
+msgid "Usage: /cancelvote [<vote number>|all]"
+msgstr ""
+
+#: server/stdinhand.c:2241
+#, c-format
+msgid "Server: %s cancelled the vote \"%s\" (number %d)."
+msgstr ""
+
+#: server/stdinhand.c:2247
+#, c-format
+msgid "Server: The vote \"%s\" (number %d) has been cancelled."
+msgstr ""
+
+#: server/stdinhand.c:2265
msgid ""
"Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
"<x> <y> | unit <id> | tech <player> | timing | info>."
@@ -6083,130 +6169,126 @@ msgstr ""
"Odefinierade argument. Användning: debug <diplomacy <spelare> | city <x> <y> "
"| units <x> <y> | unit <id> | tech <spelare> | timing | info>."
-#: server/stdinhand.c:2265
+#: server/stdinhand.c:2271
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:2294
+#: server/stdinhand.c:2300
#, c-format
msgid "%s diplomacy no longer debugged"
msgstr "%s diplomati ej längre avlusad"
-#: server/stdinhand.c:2298
+#: server/stdinhand.c:2304
#, c-format
msgid "%s diplomacy debugged"
msgstr "%s diplomati avlusad"
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2323
#, c-format
msgid "%s tech no longer debugged"
msgstr "%s teknologi ej längre avlusad"
-#: server/stdinhand.c:2321
+#: server/stdinhand.c:2327
#, c-format
msgid "%s tech debugged"
msgstr "%s teknologi avlusad"
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2358 server/stdinhand.c:2388
msgid "Value 2 & 3 must be integer."
msgstr "Värde 2 & 3 måste vara heltal."
-#: server/stdinhand.c:2356 server/stdinhand.c:2386
+#: server/stdinhand.c:2362 server/stdinhand.c:2392
msgid "Bad map coordinates."
msgstr "Ogiltiga kartkoordinater."
-#: server/stdinhand.c:2361
+#: server/stdinhand.c:2367
msgid "No city at this coordinate."
msgstr "Ingen stad vid denna koordinat."
-#: server/stdinhand.c:2366
+#: server/stdinhand.c:2372
#, c-format
msgid "%s no longer debugged"
msgstr "%s ej längre avlusad"
-#: server/stdinhand.c:2392 server/stdinhand.c:2422
+#: server/stdinhand.c:2398 server/stdinhand.c:2428
#, c-format
msgid "%s %s no longer debugged."
msgstr "%s %s ej längre avlusad."
-#: server/stdinhand.c:2397 server/stdinhand.c:2427
+#: server/stdinhand.c:2403 server/stdinhand.c:2433
#, c-format
msgid "%s %s debugged."
msgstr "%s %s avlusad."
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2419
msgid "Value 2 must be integer."
msgstr "Värde 2 måste vara heltal."
-#: server/stdinhand.c:2417
+#: server/stdinhand.c:2423
#, c-format
msgid "Unit %d does not exist."
msgstr "Trupp %d finns ej."
-#: server/stdinhand.c:2475
+#: server/stdinhand.c:2464
msgid "Undefined argument. Usage: set <option> <value>."
msgstr "Oklart argument. Användning: set <tillval> <värde>."
-#: server/stdinhand.c:2485
+#: server/stdinhand.c:2473
msgid "You are not allowed to set this option."
msgstr "Du har inte tillåtelse att sätta detta tillval."
-#: server/stdinhand.c:2490 server/stdinhand.c:3463
+#: server/stdinhand.c:2478 server/stdinhand.c:3501
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:2502 server/stdinhand.c:2543
-msgid "Value must be an integer."
-msgstr "Värdet måste vara ett heltal."
-
-#: server/stdinhand.c:2512
+#: server/stdinhand.c:2501
#, 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:2519
+#: server/stdinhand.c:2508
msgid "Value out of range (minimum: 0, maximum: 1)."
msgstr "Värde utanför spännvidd (minsta: 0, största: 1)."
-#: server/stdinhand.c:2534 server/stdinhand.c:2576
+#: server/stdinhand.c:2523 server/stdinhand.c:2565
#, c-format
msgid "Option: %s has been set to %d."
msgstr "Tillval: %s har satts till %d."
-#: server/stdinhand.c:2554
+#: server/stdinhand.c:2543
#, 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:2561
+#: server/stdinhand.c:2550
#, 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:2586
+#: server/stdinhand.c:2575
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:2600
+#: server/stdinhand.c:2589
#, c-format
msgid "Option: %s has been set to \"%s\"."
msgstr "Tillval: %s har satts till \"%s\"."
-#: server/stdinhand.c:2658
+#: server/stdinhand.c:2652
msgid "Sorry, one can't observe globally in this game."
msgstr "Beklagar, man kan ej iakttaga globalt i detta spel."
-#: server/stdinhand.c:2661
+#: server/stdinhand.c:2655
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:2671
+#: server/stdinhand.c:2665
#, 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
+#: server/stdinhand.c:2673
#, c-format
msgid ""
"You cannot take a new player because the maximum of %d player has already "
@@ -6217,73 +6299,73 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: server/stdinhand.c:2691
+#: server/stdinhand.c:2685
msgid "You cannot take a new player because there are no free player slots."
msgstr ""
-#: server/stdinhand.c:2702
+#: server/stdinhand.c:2696
msgid "Sorry, one can't observe barbarians in this game."
msgstr "Beklagar, man kan ej iakttaga barbarer i detta spel."
-#: server/stdinhand.c:2705
+#: server/stdinhand.c:2699
msgid "Sorry, one can't take barbarians in this game."
msgstr "Beklagar, du kan ej taga barbarer i detta spel."
-#: server/stdinhand.c:2713
+#: server/stdinhand.c:2707
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:2716
+#: server/stdinhand.c:2710
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:2724
+#: server/stdinhand.c:2718
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:2727
+#: server/stdinhand.c:2721
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:2736
+#: server/stdinhand.c:2730
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:2739
+#: server/stdinhand.c:2733
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:2749
+#: server/stdinhand.c:2743
msgid "Sorry, one can't observe in this game."
msgstr "Beklagar, man kan ej iakttaga i detta spel."
-#: server/stdinhand.c:2754
+#: server/stdinhand.c:2748
msgid "Sorry, one can't take players in this game."
msgstr "Beklagar, man kan ej taga spelare i detta spel."
-#: server/stdinhand.c:2760
+#: server/stdinhand.c:2754
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:2791
+#: server/stdinhand.c:2785
msgid "Usage: observe [connection-name [player-name]]"
msgstr "Användning: observe [anslutningsnamn [spelarnamn]]"
-#: server/stdinhand.c:2797
+#: server/stdinhand.c:2791
msgid "Usage: observe [player-name]"
msgstr "Användning: observe [spelarnamn]"
-#: server/stdinhand.c:2847
+#: server/stdinhand.c:2841
#, 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:2858
+#: server/stdinhand.c:2852
#, c-format
msgid "%s is already observing %s."
msgstr "%s iaktar redan %s"
-#: server/stdinhand.c:2863
+#: server/stdinhand.c:2857
#, c-format
msgid "%s is already observing."
msgstr "%s iaktar redan."
@@ -6298,237 +6380,242 @@ msgstr "%s iakttager nu %s"
msgid "%s now observes"
msgstr "%s är nu iakttagare"
-#: server/stdinhand.c:2969
+#: server/stdinhand.c:2971
msgid "Usage: take <connection-name> <player-name>"
msgstr "Användning: take <anslutningsnamn> <spelarnamn>"
-#: server/stdinhand.c:2974
+#: server/stdinhand.c:2976
msgid "Usage: take <player-name>"
msgstr "Användning: take <spelarnamn>"
-#: server/stdinhand.c:2980
+#: server/stdinhand.c:2982
msgid "Usage: take [connection-name] <player-name>"
msgstr "Användning: take [anslutningsnamn] <spelarnamn>"
-#: server/stdinhand.c:3010
+#: server/stdinhand.c:3012
#, fuzzy, c-format
msgid "%s already controls %s."
msgstr "%s styr redan %s"
-#: server/stdinhand.c:3024
+#: server/stdinhand.c:3026
#, 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:3059
+#: server/stdinhand.c:3061
#, c-format
msgid "being detached from %s."
msgstr "kopplas bort från %s."
-#: server/stdinhand.c:3135
+#: server/stdinhand.c:3146
#, fuzzy, c-format
msgid "%s now controls %s (%s, %s)."
msgstr "%s styr nu %s (%s, %s)"
-#: server/stdinhand.c:3139 server/stdinhand.c:4260
+#: server/stdinhand.c:3150 server/stdinhand.c:4308
#: data/nation/barbarian.ruleset:3
msgid "Barbarian"
msgstr "barbar"
-#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
+#: server/stdinhand.c:3152 server/stdinhand.c:4310 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-sdl/plrdlg.c:645
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr "datorstyrd"
-#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-gtk-2.0/pages.c:2125
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
+#: server/stdinhand.c:3153 server/stdinhand.c:4312
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-gtk-2.0/pages.c:2127
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/connectdlg.c:215
msgid "Human"
msgstr "mänsklig"
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-gtk-2.0/pages.c:2124 client/gui-win32/connectdlg.c:200
-#: client/gui-win32/connectdlg.c:212
+#: server/stdinhand.c:3155 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-gtk-2.0/pages.c:2126 client/gui-win32/connectdlg.c:202
+#: client/gui-win32/connectdlg.c:214
msgid "Alive"
msgstr "levande"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3156 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-win32/connectdlg.c:202
msgid "Dead"
msgstr "död"
-#: server/stdinhand.c:3147
+#: server/stdinhand.c:3159
#, fuzzy, c-format
msgid "%s failed to attach to any player."
msgstr "%s misslyckades med att ansluta till någon spelare."
-#: server/stdinhand.c:3182
+#: server/stdinhand.c:3194
msgid "Usage: detach <connection-name>"
msgstr "Användning: detach <anslutningsnamn>"
-#: server/stdinhand.c:3202
+#: server/stdinhand.c:3214
msgid "You can not detach other users."
msgstr "Du kan ej koppla bort andra spelare."
-#: server/stdinhand.c:3211
+#: server/stdinhand.c:3223
#, c-format
msgid "%s is not attached to any player."
msgstr "%s är inte ansluten till någon spelare."
-#: server/stdinhand.c:3234
+#: server/stdinhand.c:3246
#, c-format
msgid "%s detaching from %s"
msgstr "%s kopplar bort från %s"
-#: server/stdinhand.c:3240
+#: server/stdinhand.c:3252
#, c-format
msgid "%s no longer observing."
msgstr "%s är ej längre iakttagare."
-#: server/stdinhand.c:3259
+#: server/stdinhand.c:3271
#, c-format
msgid "detaching from %s."
msgstr "kopplar bort från %s."
-#: server/stdinhand.c:3345
+#: server/stdinhand.c:3361
msgid "Usage: load <game name>"
msgstr "Användning: load <filnamn>"
-#: server/stdinhand.c:3350
+#: server/stdinhand.c:3366
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:3372
+#: server/stdinhand.c:3388
#, c-format
msgid "Cannot find savegame or scenario with the name \"%s\"."
msgstr "Fann varken sparspel eller scenario med namnet \"%s\"."
-#: server/stdinhand.c:3389
+#: server/stdinhand.c:3405
#, c-format
msgid "Could not load savefile: %s"
msgstr "Kunde inte öppna sparfil: %s"
-#: server/stdinhand.c:3458
+#: server/stdinhand.c:3496
#, c-format
msgid "Current ruleset directory is \"%s\""
msgstr "Den nuvarande katalogen för regler är \"%s\"."
-#: server/stdinhand.c:3478
+#: server/stdinhand.c:3516
#, c-format
msgid "Ruleset directory \"%s\" not found"
msgstr "Kunde inte hitta regelkatalogen \"%s\""
-#: server/stdinhand.c:3484
+#: server/stdinhand.c:3522
#, c-format
msgid "Ruleset directory is already \"%s\""
msgstr "Regelkatalog är redan \"%s\""
-#: server/stdinhand.c:3488
+#: server/stdinhand.c:3526
#, c-format
msgid "Ruleset directory set to \"%s\""
msgstr "Regelkatalog satt till \"%s\""
-#: server/stdinhand.c:3536
+#: server/stdinhand.c:3574
msgid "Goodbye."
msgstr "Hejdå."
-#: server/stdinhand.c:3567
+#: server/stdinhand.c:3606
msgid "Sorry, you are not allowed to use server commands."
msgstr "Du har inte tillåtelse att använda serverkommandon."
-#: server/stdinhand.c:3603
+#: server/stdinhand.c:3656
#, 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:3608
+#: server/stdinhand.c:3661
#, c-format
msgid "Unknown command. Try '%shelp'."
msgstr "Okänt kommando. Försök med \"%shelp\"."
-#: server/stdinhand.c:3625
-msgid "Your new vote canceled your previous vote."
+#: server/stdinhand.c:3675
+#, fuzzy
+msgid "Your new vote cancelled your previous vote."
msgstr "Din nya röst nollställde din tidigare röst."
-#: server/stdinhand.c:3633
-#, c-format
-msgid "New vote (number %d) by %s: %s."
+#: server/stdinhand.c:3688
+msgid "New teamvote"
+msgstr ""
+
+#: server/stdinhand.c:3691
+msgid "New vote"
+msgstr ""
+
+#: server/stdinhand.c:3695
+#, fuzzy, c-format
+msgid "%s (number %d) by %s: %s"
msgstr "Ny röst (nr. %d) av %s: %s."
-#: server/stdinhand.c:3645
+#: server/stdinhand.c:3704
#, 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:3655
-msgid "You are not allowed to use this command."
-msgstr "Du har inte tillåtelse att använda detta kommando."
-
-#: server/stdinhand.c:3680
+#: server/stdinhand.c:3726
msgid "(server prompt)"
msgstr "(serverinmatning)"
-#: server/stdinhand.c:3787
+#: server/stdinhand.c:3835
msgid "Game ended in a draw."
msgstr "Spelet slutade oavgjort."
-#: server/stdinhand.c:3791
+#: server/stdinhand.c:3839
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:3796
+#: server/stdinhand.c:3844
msgid "Cannot end the game: no game running."
msgstr "Kan inte avsluta spelet: inget spel pågår."
-#: server/stdinhand.c:3812
+#: server/stdinhand.c:3860
#, 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:3817
+#: server/stdinhand.c:3865
msgid "You cannot surrender now."
msgstr "Du kan ej ge upp nu."
-#: server/stdinhand.c:3883
+#: server/stdinhand.c:3931
#, 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:3888
+#: server/stdinhand.c:3936
#, 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
+#: server/stdinhand.c:3940
#, 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:3901
+#: server/stdinhand.c:3949
msgid "All players are ready; starting game."
msgstr "Alla spelare är redo; nu kör vi."
-#: server/stdinhand.c:3915
+#: server/stdinhand.c:3963
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:3922
+#: server/stdinhand.c:3970
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:3953
+#: server/stdinhand.c:4001
#, c-format
msgid "Cutting connection %s."
msgstr "Bryter anslutningen till %s."
-#: server/stdinhand.c:3972
+#: server/stdinhand.c:4020
msgid ""
"Welcome - this is the introductory help text for the Freeciv server.\n"
"\n"
@@ -6566,123 +6653,123 @@ msgstr ""
" save - spara nuvarande spel\n"
" quit - avsluta"
-#: server/stdinhand.c:4007 server/stdinhand.c:4010
+#: server/stdinhand.c:4055 server/stdinhand.c:4058
msgid "Command:"
msgstr "Kommando:"
-#: server/stdinhand.c:4014
+#: server/stdinhand.c:4062
msgid "Synopsis: "
msgstr "Sammanfattning: "
-#: server/stdinhand.c:4023
+#: server/stdinhand.c:4071
#, c-format
msgid "Level: %s"
msgstr "Läge: %s"
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4096
msgid "The following server commands are available:"
msgstr "Följande serverkommandon är tillgängliga:"
-#: server/stdinhand.c:4123
+#: server/stdinhand.c:4171
#, c-format
msgid "Help argument '%s' is ambiguous."
msgstr "Hjälpargumentet \"%s\" är flertydigt."
-#: server/stdinhand.c:4128
+#: server/stdinhand.c:4176
#, c-format
msgid "No match for help argument '%s'."
msgstr "Ingen träff för hjälpargument \"%s\"."
-#: server/stdinhand.c:4194
+#: server/stdinhand.c:4242
#, 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:4234
+#: server/stdinhand.c:4282
msgid "List of players:"
msgstr "Lista över spelare:"
-#: server/stdinhand.c:4239
+#: server/stdinhand.c:4287
msgid "<no players>"
msgstr "<inga spelare>"
-#: server/stdinhand.c:4256
+#: server/stdinhand.c:4304
#, c-format
msgid "user %s, "
msgstr "användare %s, "
-#: server/stdinhand.c:4267
+#: server/stdinhand.c:4315
msgid ", Dead"
msgstr ", besegrad"
-#: server/stdinhand.c:4270
+#: server/stdinhand.c:4318
#, 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:4275 server/stdinhand.c:4279 client/helpdata.c:257
-#: client/helpdata.c:752 client/text.c:241 client/text.c:1224
-#: client/text.c:1262
+#: server/stdinhand.c:4323 server/stdinhand.c:4327 client/helpdata.c:257
+#: client/helpdata.c:752 client/text.c:241 client/text.c:1229
+#: client/text.c:1267
#, c-format
msgid "?clistmore:, %s"
msgstr ", %s"
-#: server/stdinhand.c:4283
+#: server/stdinhand.c:4331
msgid ", ready"
msgstr ", redo"
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4333
msgid ", not ready"
msgstr ", ej redo"
-#: server/stdinhand.c:4293
+#: server/stdinhand.c:4341
#, c-format
msgid " %d connection:"
msgid_plural " %d connections:"
msgstr[0] " %d anslutning:"
msgstr[1] " %d anslutningar:"
-#: server/stdinhand.c:4299
+#: server/stdinhand.c:4347
#, c-format
msgid " %s from %s (command access level %s), bufsize=%dkb"
msgstr " %s från %s (kontrollnivå %s), bufsize=%dkb"
-#: server/stdinhand.c:4304
+#: server/stdinhand.c:4352
msgid " (observer mode)"
msgstr " (iakttagarläge)"
-#: server/stdinhand.c:4322
+#: server/stdinhand.c:4370
msgid "List of teams:"
msgstr "Lista över lag:"
#. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4332
+#: server/stdinhand.c:4380
#, 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:4352
+#: server/stdinhand.c:4400
#, c-format
msgid "%2d : '%s' : 1 player : %s"
msgstr "%2d : '%s' : 1 spelare : %s"
-#: server/stdinhand.c:4360
+#: server/stdinhand.c:4408
#, c-format
msgid "Empty team: %s"
msgstr "Tomt lag: %s"
-#: server/stdinhand.c:4371
+#: server/stdinhand.c:4419
msgid "List of connections to server:"
msgstr "Lista över anslutningar till servern:"
-#: server/stdinhand.c:4375
+#: server/stdinhand.c:4423
msgid "<no connections>"
msgstr "<inga anslutningar>"
-#: server/stdinhand.c:4399
+#: server/stdinhand.c:4447
msgid "List of scenarios available:"
msgstr "Lista över tillgängliga scenarion:"
@@ -6701,7 +6788,7 @@ msgstr "%s har forskat fram framtidsteknologi %d."
msgid "%s acquired from %s!"
msgstr "%s erhöll från %s!"
-#: server/techtools.c:220
+#: server/techtools.c:221
#, c-format
msgid ""
"Discovery of %s makes the government form %s available. You may want to "
@@ -6709,37 +6796,37 @@ msgid ""
msgstr ""
"Upptäckten av %s möjliggör statsskicket %s. Vi bör överväga en revolution."
-#: server/techtools.c:301
+#: server/techtools.c:302
#, c-format
msgid "Discovery of %s OBSOLETES %s in %s!"
msgstr "Upptäckten av %s FÖRÅLDRAR %s i %s!"
-#: server/techtools.c:351
+#: server/techtools.c:352
#, c-format
msgid "Learned %s. Our scientists focus on %s; goal is %s."
msgstr "Vi lärde oss %s. Våra vetenskapsmän forskar nu på %s med %s som mål."
-#: server/techtools.c:369
+#: server/techtools.c:370
#, c-format
msgid "Learned %s. Scientists choose to research %s."
msgstr "Vi lärde oss %s. Våra vetenskapsmän valde att forska på %s."
-#: server/techtools.c:376
+#: server/techtools.c:377
#, c-format
msgid "Learned %s. "
msgstr "Vi lärde oss %s."
-#: server/techtools.c:379
+#: server/techtools.c:380
#, c-format
msgid "Researching %s."
msgstr "Forskar fram %s."
-#: server/techtools.c:385
+#: server/techtools.c:386
#, c-format
msgid "Learned %s. Scientists do not know what to research next."
msgstr "Vi lärde oss %s. Våra vetenskapsmän vet inte vad de ska göra härnäst."
-#: server/techtools.c:402
+#: server/techtools.c:403
msgid ""
"Great scientists from all the world join your civilization: you get an "
"immediate advance."
@@ -6747,22 +6834,22 @@ msgstr ""
"Stora vetenskapsmän från hela världen flockas till vår civilisation: vi får "
"genast ett extra framsteg."
-#: server/techtools.c:570
+#: server/techtools.c:571
#, c-format
msgid "Technology goal is %s."
msgstr "Forskningsmålet är %s."
-#: server/techtools.c:700
+#: server/techtools.c:708
#, c-format
msgid "You steal %s from the %s."
msgstr "Vi stal %s från %s."
-#: server/techtools.c:705
+#: server/techtools.c:713
#, c-format
msgid "The %s stole %s from you!"
msgstr "%s stal %s från oss!"
-#: server/techtools.c:710
+#: server/techtools.c:718
#, c-format
msgid "The %s have stolen %s from the %s."
msgstr "%s stal %s från %s."
@@ -6786,180 +6873,186 @@ msgstr "Inga trupper kunde uppgraderas."
msgid "%s upgraded to %s for %d gold."
msgstr "%s ersatt med %s för %d guld."
-#: server/unithand.c:396
+#: server/unithand.c:402
#, c-format
msgid "%s refuses to disband!"
msgstr "%s vägrar att upplösas!"
-#: server/unithand.c:449
+#: server/unithand.c:455
msgid "Can't place city here."
msgstr "Kan inte förlägga stad hit."
-#: server/unithand.c:456
+#: server/unithand.c:462
#, c-format
msgid "Only %s can build a city."
msgstr "Endast %s kan grunda städer."
-#: server/unithand.c:461
+#: server/unithand.c:467
msgid "Can't build a city."
msgstr "Kan inte grundlägga en stad."
-#: server/unithand.c:470
+#: server/unithand.c:476
#, c-format
msgid "Only %s can add to a city."
msgstr "Endast %s kan utöka städer."
-#: server/unithand.c:475
+#: server/unithand.c:481
msgid "Can't add to a city."
msgstr "Kan inte utöka stad."
-#: server/unithand.c:481
+#: server/unithand.c:487
#, c-format
msgid "%s unit has no moves left to add to %s."
msgstr "%struppen har inga drag kvar för att utöka %s."
-#: server/unithand.c:487
+#: server/unithand.c:493
#, c-format
msgid "%s unit has no moves left to build city."
msgstr "Truppen %s har inga drag kvar för att grunda en stad."
-#: server/unithand.c:492
+#. TRANS: <city> is owned by <nation>, cannot add <unit>.
+#: server/unithand.c:499
+#, fuzzy, c-format
+msgid "%s is owned by %s, cannot add %s."
+msgstr "%s är för stor för att lägga till %s."
+
+#: server/unithand.c:506
#, c-format
msgid "%s is too big to add %s."
msgstr "%s är för stor för att lägga till %s."
-#: server/unithand.c:498
+#: server/unithand.c:512
#, c-format
msgid "%s needs an improvement to grow, so you cannot add %s."
msgstr ""
"%s behöver en stadsförbättring för att växa, så vi kan inte lägga till %s."
-#: server/unithand.c:509
+#: server/unithand.c:523
#, c-format
msgid "Can't add %s to %s."
msgstr "kan inte lägga %s till %s."
-#: server/unithand.c:531
+#: server/unithand.c:545
#, c-format
msgid "%s added to aid %s in growing."
msgstr "%s tillades för att hjälpa %s att växa."
-#: server/unithand.c:828
+#: server/unithand.c:842
msgid "Your Nuclear missile was shot down by SDI defences, what a waste."
msgstr "Vår kärnvapenmissil sköts ned av missilförsvar, vad synd."
-#: server/unithand.c:831
+#: server/unithand.c:845
#, c-format
msgid "The nuclear attack on %s was avoided by your SDI defense."
msgstr "Kärnvapenangreppet mot %s avvärjdes av vårt missilförsvar."
#. TRANS: "Your Cannon ... the Polish Destroyer."
-#: server/unithand.c:901
+#: server/unithand.c:915
#, c-format
msgid "Your %s survived the pathetic attack from the %s %s."
msgstr "Vår/t %s överlevde det löjliga angreppet från den/det %s %s/n/t."
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unithand.c:910
+#: server/unithand.c:924
#, c-format
msgid "Your attacking %s failed against the %s %s!"
msgstr "VÃ¥r/t angripande %s misslyckades mot den/det %s %s/n/t."
-#: server/unithand.c:983
+#: server/unithand.c:997
#, c-format
msgid "Only %s can attack from sea."
msgstr "Endast %s kan angripa från sjön."
-#: server/unithand.c:988
+#: server/unithand.c:1002
msgid "Cannot attack from sea."
msgstr "Kan inte angripa från sjön."
-#: server/unithand.c:996 server/unittools.c:2137
+#: server/unithand.c:1010 server/unittools.c:2142
msgid "Cannot attack unless you declare war first."
msgstr "Kan inte angripa utan att förklara krig först."
-#: server/unithand.c:1001
+#: server/unithand.c:1015
#, c-format
msgid "%s can only move into your own zone of control."
msgstr "Vår %s kan endast röra sig inom vårt eget kontrollområde."
-#: server/unithand.c:1007
+#: server/unithand.c:1021
#, c-format
msgid "Cannot invade unless you break peace with %s first."
msgstr "Kan inte invadera utan att förklara krig mot %s först."
-#: server/unithand.c:1052
+#: server/unithand.c:1066
msgid "This unit has no moves left."
msgstr "Denna trupp har inga drag kvar."
-#: server/unithand.c:1107
+#: server/unithand.c:1121
msgid "Unit must be on land to perform diplomatic action."
msgstr "Trupper måste vara på land för att utföra diplomathandlingar."
-#: server/unithand.c:1109
+#: server/unithand.c:1123
msgid "No diplomat action possible."
msgstr "Ingen diplomathandling kan utföras."
-#: server/unithand.c:1125
+#: server/unithand.c:1139
#, c-format
msgid "You must declare war on %s first. Try using players dialog (F3)."
msgstr "Vi måste förklara krig mot %s först. Prova med spelardialogen (F3)."
-#: server/unithand.c:1143
+#: server/unithand.c:1157
msgid "This unit is being transported, and so cannot bombard."
msgstr "Denna trupp är under transport och kan inte bombardera."
-#: server/unithand.c:1158
+#: server/unithand.c:1172
msgid "You can't attack there."
msgstr "Vi kan inte angripa här."
-#: server/unithand.c:1180
+#: server/unithand.c:1194
msgid "This type of troops cannot take over a city."
msgstr "Detta truppslag kan inte erövra städer."
-#: server/unithand.c:1198
+#: server/unithand.c:1212
msgid "A transported unit is not allied to all units or city on target tile."
msgstr ""
"En trupp ombord är inte allierad med alla trupper eller staden på målrutan."
-#: server/unithand.c:1240
+#: server/unithand.c:1254
#, c-format
msgid "Your %s helps build the %s in %s (%d remaining)."
msgstr "Vår %s hjälper till att bygga %s i %s (%d återstår)."
-#: server/unithand.c:1242
+#: server/unithand.c:1256
#, c-format
msgid "Your %s helps build the %s in %s (%d surplus)."
msgstr "Vår %s hjälper till att bygga %s i %s (%d i överskott)."
-#: server/unithand.c:1286
+#: server/unithand.c:1300
#, c-format
msgid ""
"Sorry, your %s cannot establish a trade route because it has no home city"
msgstr ""
"Vår %s kan tyvärr inte inrätta en handelsled hit eftersom den saknar hemstad"
-#: server/unithand.c:1296
+#: server/unithand.c:1310
#, c-format
msgid "Sorry, your %s cannot establish a trade route between %s and %s"
msgstr "Vår %s kan inte tyvärr inte inrätta en handelsled mellan %s och %s"
-#: server/unithand.c:1325 server/unithand.c:1344
+#: server/unithand.c:1339 server/unithand.c:1358
#, c-format
msgid "Sorry, your %s cannot establish a trade route here!"
msgstr "Vår %s kan tyvärr inte inrätta en handelsled hit!"
-#: server/unithand.c:1329 server/unithand.c:1348
+#: server/unithand.c:1343 server/unithand.c:1362
#, c-format
msgid " The city of %s already has %d better trade routes!"
msgstr " Staden %s har redan %d bättre handelsleder!"
-#: server/unithand.c:1361 server/unithand.c:1373
+#: server/unithand.c:1375 server/unithand.c:1387
#, c-format
msgid "Sorry, %s has canceled the trade route from %s to your city %s."
msgstr "%s har tyvärr sagt upp handelsleden från %s till din stad %s."
-#: server/unithand.c:1406
+#: server/unithand.c:1420
#, c-format
msgid ""
"Your %s from %s has arrived in %s, and revenues amount to %d in gold and "
@@ -7020,55 +7113,55 @@ msgid "Teleported your %s to %s."
msgstr "Vår %s har fjärrförflyttats till %s."
#. TRANS: A unit is moved to resolve stack conflicts.
-#: server/unittools.c:1065
+#: server/unittools.c:1070
#, fuzzy, c-format
msgid "Moved your %s."
msgstr "Vår %s har upplösts."
-#: server/unittools.c:1076
+#: server/unittools.c:1081
#, c-format
msgid "Disbanded your %s."
msgstr "Vår %s har upplösts."
-#: server/unittools.c:1397
+#: server/unittools.c:1402
#, c-format
msgid "Unable to defend %s, %s has lost the game."
msgstr "Kunde ej försvara %s, %s förlorade spelet."
-#: server/unittools.c:1401
+#: server/unittools.c:1406
#, c-format
msgid "Losing %s meant losing the game! Be more careful next time!"
msgstr "Att förlora %s innebär förlust av spelet! Var försiktigare nästa gång!"
-#: server/unittools.c:1503
+#: server/unittools.c:1508
#, c-format
msgid "%s escaped the destruction of %s, and fled to %s."
msgstr "%s undkom förstörelsen av %s och flydde till %s."
-#: server/unittools.c:1512
+#: server/unittools.c:1517
#, c-format
msgid "%s lost when %s was lost."
msgstr "Vi förlorade %s när %s förlorades."
-#: server/unittools.c:1561
+#: server/unittools.c:1566
#, c-format
msgid "Barbarian leader captured, %d gold ransom paid."
msgstr "Barbarledare tillfångatagen, %d guld erhållet som lösen."
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unittools.c:1579
+#: server/unittools.c:1584
#, c-format
msgid "Your attacking %s succeeded against the %s %s!"
msgstr "Vår/t angripande %s segrade över den/det %s %s/n/t!"
#. TRANS: "Cannon ... the Polish Destroyer."
-#: server/unittools.c:1588 server/unittools.c:1646
+#: server/unittools.c:1593 server/unittools.c:1651
#, c-format
msgid "%s lost to an attack by the %s %s."
msgstr "Vi förlorade %s under angrepp från den/det %s %s/n/t."
#. TRANS: "... Cannon ... the Polish Destroyer ...."
-#: server/unittools.c:1622
+#: server/unittools.c:1627
#, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -7082,14 +7175,14 @@ msgstr[1] ""
#. TRANS: "Cannon lost when the Polish Destroyer
#. * attacked the German Musketeers."
-#: server/unittools.c:1655
+#: server/unittools.c:1660
#, c-format
msgid "%s lost when the %s %s attacked the %s %s."
msgstr "Vi förlorade %s när den/det %s %s/n/t angrep den/det %s %s/n/t."
#. TRANS: "Musketeers (and Cannon) lost to an
#. * attack from the Polish Destroyer."
-#: server/unittools.c:1670
+#: server/unittools.c:1675
#, c-format
msgid "%s (and %s) lost to an attack from the %s %s."
msgstr "Vi förlorade %s (samt %s) under angrepp från den/det %s %s/n/t."
@@ -7097,7 +7190,7 @@ msgstr "Vi förlorade %s (samt %s) under angrepp från den/det %s %s/n/t."
#. TRANS: "Musketeers and 3 other units lost to
#. * an attack from the Polish Destroyer."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1680
+#: server/unittools.c:1685
#, 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."
@@ -7111,7 +7204,7 @@ msgstr[1] ""
#. TRANS: "2 units lost when the Polish Destroyer
#. * attacked the German Musketeers."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1694
+#: server/unittools.c:1699
#, 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."
@@ -7120,176 +7213,218 @@ msgstr[0] ""
msgstr[1] ""
"Vi förlorade %d trupper när den/det %s %s/n/t angrep den/det %s %s/n/t."
-#: server/unittools.c:1962
+#: server/unittools.c:1967
#, c-format
msgid "Your %s was nuked by %s."
msgstr "VÃ¥r %s atombombades av %s."
-#: server/unittools.c:1965 server/unittools.c:1981
+#: server/unittools.c:1970 server/unittools.c:1986
msgid "yourself"
msgstr "oss själva"
-#: server/unittools.c:1969
+#: server/unittools.c:1974
#, c-format
msgid "The %s %s was nuked."
msgstr "Den/det %s %s/n/t atombombades."
-#: server/unittools.c:1978
+#: server/unittools.c:1983
#, c-format
msgid "%s was nuked by %s."
msgstr "%s atombombades av %s."
-#: server/unittools.c:1986
+#: server/unittools.c:1991
#, c-format
msgid "You nuked %s."
msgstr "Vi atombombade %s."
-#: server/unittools.c:2027
+#: server/unittools.c:2032
#, c-format
msgid "The %s detonated a nuke!"
msgstr "%s utlöste en atombomb."
-#: server/unittools.c:2051
+#: server/unittools.c:2056
#, c-format
msgid "%s transported successfully."
msgstr "Frakten av %s genomfördes utan komplikationer."
-#: server/unittools.c:2103
+#: server/unittools.c:2108
msgid "This unit type can not be paradropped."
msgstr "Detta truppslag kan inte hoppa fallskärm."
-#: server/unittools.c:2113
+#: server/unittools.c:2118
msgid "You cannot paradrop a unit that is transporting other units."
msgstr "En trupp som transporterar en annan kan inte hoppa fallskärm."
-#: server/unittools.c:2119
+#: server/unittools.c:2124
msgid "The destination location is not known."
msgstr "Målets läge är okänt."
-#: server/unittools.c:2126
+#: server/unittools.c:2131
#, c-format
msgid "This unit cannot paradrop into %s."
msgstr "Denna trupp kan inte hoppa fallskärm i %s."
-#: server/unittools.c:2146
+#: server/unittools.c:2151
#, c-format
msgid "The distance to the target (%i) is greater than the unit's range (%i)."
msgstr "Avståndet till målet (%i) är större än truppens räckvidd (%i)."
-#: server/unittools.c:2157
+#: server/unittools.c:2162
#, c-format
msgid "Your %s paradropped into the %s and was lost."
msgstr "Vår %s hoppade fallskärm ner i %s och gick förlorad."
-#: server/unittools.c:2170
+#: server/unittools.c:2175
#, c-format
msgid "Your %s was killed by enemy units at the paradrop destination."
msgstr "Vår %s dödades av fiendetrupper där den landade."
-#: server/unittools.c:2192
+#: server/unittools.c:2197
#, c-format
msgid "You found %d gold."
msgstr "Vi fann %d guld."
# DM
-#: server/unittools.c:2209
+#: server/unittools.c:2214
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr "Vi fann kunskapen om %s i uråldriga skriftrullar."
-#: server/unittools.c:2216
+#: server/unittools.c:2221
#, c-format
msgid "The %s have acquired %s from ancient scrolls of wisdom."
msgstr "%s erhöll %s från uråldriga skriftrullar."
-#: server/unittools.c:2230
+#: server/unittools.c:2235
msgid "A band of friendly mercenaries joins your cause."
msgstr "En grupp vänligt sinnade legosoldater ställer sig till förfogande."
-#: server/unittools.c:2248
+#: server/unittools.c:2253
msgid "An abandoned village is here."
msgstr "Här ligger en övergiven boplats."
-#: server/unittools.c:2258
+#: server/unittools.c:2263
msgid "You have unleashed a horde of barbarians!"
msgstr "Vi har släppt lös en hord barbarer!"
# DM> Användandet av ordet "barbarer" i detta sammanhang är olyckligt..
-#: server/unittools.c:2261
+#: server/unittools.c:2266
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr "Vår %s blev slaktad av infödingar!"
-#: server/unittools.c:2277
+#: server/unittools.c:2282
msgid "You found a friendly city."
msgstr "Vi fann en vänligt sinnad stad."
# DM> Utvecklade prosan här också...
-#: server/unittools.c:2291
+#: server/unittools.c:2296
msgid "Friendly nomads are impressed by you, and join you."
msgstr ""
"Vänligt sinnade nomader är imponerade av vår kultur och ställer sig till "
"förfogande."
-#: server/unittools.c:2316
+#: server/unittools.c:2321
msgid "Your overflight frightens the tribe; they scatter in terror."
msgstr "Vår överflygning fick urbefolkningen att skingras i skräck."
-#: server/unittools.c:2574
+#: server/unittools.c:2579
#, c-format
msgid "Orders for %s aborted after enemy movement was spotted."
msgstr "Ordern för %s avbröts eftersom fiendetrupp siktats i närheten."
-#: server/unittools.c:3023
+#: server/unittools.c:3028
#, c-format
msgid "Orders for %s aborted as there are units nearby."
msgstr "Ordern för %s avbröts eftersom det finns trupper i närheten."
-#: server/unittools.c:3075
+#: server/unittools.c:3080
#, c-format
msgid "Orders for %s aborted because building of city failed."
msgstr "Ordern för %s avbröts eftersom grundandet av en stad misslyckades."
-#: server/unittools.c:3088
+#: server/unittools.c:3093
#, c-format
msgid "Orders for %s aborted since they give an invalid activity."
msgstr "Ordern för %s avbröts eftersom den var ogiltig."
-#: server/unittools.c:3102
+#: server/unittools.c:3107
#, c-format
msgid "Orders for %s aborted since they give an invalid location."
msgstr "Ordern för %s avbröts eftersom den angav en ogiltig position."
-#: server/unittools.c:3112
+#: server/unittools.c:3117
#, c-format
msgid "Orders for %s aborted as there are units in the way."
msgstr "Ordern för %s avbröts eftersom det finns trupper i vägen."
-#: server/unittools.c:3138
+#: server/unittools.c:3143
#, c-format
msgid "Orders for %s aborted because of failed move."
msgstr "Ordern för %s avbröts eftersom en förflyttning kunde ej utföras."
-#: server/unittools.c:3179
+#: server/unittools.c:3184
#, c-format
msgid "Attempt to change homecity for %s failed."
msgstr "Misslyckades ändra hemstad för %s."
-#: server/unittools.c:3190
+#: server/unittools.c:3195
#, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr "Misslyckades inrätta handelsled för %s."
-#: server/unittools.c:3202
+#: server/unittools.c:3207
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr "Misslyckades bygga underverk för %s."
-#: server/unittools.c:3211
+#: server/unittools.c:3216
#, c-format
msgid "Your %s has invalid orders."
msgstr "VÃ¥rt %s har ogiltliga order."
+#: server/voting.c:522
+#, fuzzy, c-format
+msgid ""
+"%s %d \"%s\" is passed %d to %d with %d abstentions and %d who did not vote."
+msgstr "Förslaget \"%s\" antogs med %d mot %d. %d avstod."
+
+#: server/voting.c:528
+#, fuzzy, c-format
+msgid ""
+"%s %d \"%s\" failed with %d against, %d for, %d abstentions and %d who did "
+"not vote."
+msgstr "Förslaget \"%s\" avslogs med %d mot %d. %d avstod."
+
+#: server/voting.c:548
+#, c-format
+msgid "%s %d: %s voted yes."
+msgstr ""
+
+#: server/voting.c:553
+#, c-format
+msgid "%s %d: %s voted no."
+msgstr ""
+
+#: server/voting.c:558
+#, c-format
+msgid "%s %d: %s chose to abstain."
+msgstr ""
+
+#. TRANS: Describing a new vote that can only pass
+#. * if there are no dissenting votes.
+#: server/voting.c:726
+#, c-format
+msgid "%s (needs %0.0f%% and no dissent)."
+msgstr ""
+
+#. TRANS: Describing a new vote that can pass only if the
+#. * given percentage of players votes 'yes'.
+#: server/voting.c:732
+#, c-format
+msgid "%s (needs %0.0f%% in favor)."
+msgstr ""
+
#: server/generator/mapgen.c:1771
msgid "High landmass - this may take a few seconds."
msgstr "Hög landmassa - detta kan ta några sekunder."
@@ -7321,14 +7456,14 @@ msgstr ""
"Det kan hända att antalet spelare är för stort för kartan.\n"
"Rapportera gärna detta till %s."
-#: client/attribute.c:363
+#: client/attribute.c:368
msgid ""
"There has been a CMA error. Your citizen governor settings may be broken."
msgstr ""
"Ett fel har inträffat i stadsförvaltningen. Det kan hända att dina val är "
"ogiltiga."
-#: client/attribute.c:367
+#: client/attribute.c:372
msgid "Old attributes detected and removed."
msgstr "Gamla attribut funna och borttagna."
@@ -7478,44 +7613,44 @@ msgstr "%+4d : Medborgare\n"
msgid "%+4d : Taxed from trade\n"
msgstr "%+4d : Beskattad handel\n"
-#: client/citydlg_common.c:418
+#: client/citydlg_common.c:421
#, c-format
msgid "%+4d : Trade route with %s\n"
msgstr "%+4d : Handelsled med %s\n"
# ?
-#: client/citydlg_common.c:427
+#: client/citydlg_common.c:430
#, c-format
msgid "%+4d : Building tithes\n"
msgstr "%+4d : Samlar kollekt\n"
-#: client/citydlg_common.c:450
+#: client/citydlg_common.c:453
#, c-format
msgid "%+4d : Bonus from %s (%+d%%)\n"
msgstr "%+4d : Bonus från %s (%+d%%)\n"
-#: client/citydlg_common.c:462
+#: client/citydlg_common.c:465
#, c-format
msgid "%+4d : Waste\n"
msgstr "%+4d : Spill\n"
-#: client/citydlg_common.c:468
+#: client/citydlg_common.c:471
#, c-format
msgid "%+4d : Disorder\n"
msgstr "%+4d : Uppror\n"
# ?
-#: client/citydlg_common.c:474
+#: client/citydlg_common.c:477
#, c-format
msgid "%+4d : Used\n"
msgstr "%+4d : Används\n"
# Blir detta rätt?
-#: client/citydlg_common.c:479
+#: client/citydlg_common.c:482
msgid "==== : Adds up to\n"
msgstr "==== : Sammanlagt\n"
-#: client/citydlg_common.c:481
+#: client/citydlg_common.c:484
#, c-format
msgid "%4d : Total surplus"
msgstr "%4d : Sammanlagt överskott"
@@ -7828,52 +7963,52 @@ msgstr "S"
msgid "Specialists"
msgstr "Specialister"
-#: client/civclient.c:240
+#: client/civclient.c:241
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr " -a, --autoconnect\tVisa inte anslutningsdialog\n"
-#: client/civclient.c:250
+#: client/civclient.c:251
msgid " -l, --log FILE\tUse FILE as logfile (spawned server also uses this)\n"
msgstr ""
" -l, --log FIL\tAnvänd FIL som loggningsfil (används även av spawnad "
"server)\n"
-#: client/civclient.c:252
+#: client/civclient.c:253
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr " -m, --meta VÄRD\tAnslut till metaservern vid VÄRD\n"
-#: client/civclient.c:254
+#: client/civclient.c:255
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr " -n, --name NAMN\tAnvänd NAMN som namn\n"
-#: client/civclient.c:256
+#: client/civclient.c:257
msgid " -p, --port PORT\tConnect to server port PORT (usually with -a)\n"
msgstr " -p, --port PORT\t\tAnslut till serverport PORT (vanligtvis med -a)\n"
-#: client/civclient.c:258
+#: client/civclient.c:259
#, c-format
msgid " -P, --Plugin PLUGIN\tUse PLUGIN for sound output %s\n"
msgstr " -P, --Plugin INSTICKSPROGRAM\tAnvänd INSTICKSPROGRAM för ljud %s\n"
-#: client/civclient.c:260
+#: client/civclient.c:261
msgid " -r, --read FILE\tRead startup script FILE (for spawned server only)\n"
msgstr ""
" -r, --read FIL\tLäs FIL innehållande skript vid programkörningens början "
"(endast för spawnad server)\n"
-#: client/civclient.c:263
+#: client/civclient.c:264
msgid " -s, --server HOST\tConnect to the server at HOST (usually with -a)\n"
msgstr " -s, --server VÄRD\tAnslut till server vid VÄRD (vanligtvis med -a)\n"
-#: client/civclient.c:265
+#: client/civclient.c:266
msgid " -S, --Sound FILE\tRead sound tags from FILE\n"
msgstr " -S, --Sound FIL\tLäs ljudmärken från FIL\n"
-#: client/civclient.c:266
+#: client/civclient.c:267
msgid " -t, --tiles FILE\tUse data file FILE.tilespec for tiles\n"
msgstr " -t, --tiles FIL\tAnvänd datafilen FIL.tilespec för rutbilder\n"
-#: client/civclient.c:269
+#: client/civclient.c:270
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7883,45 +8018,45 @@ msgstr ""
"\t\t\tProva \"%s -- --help\" för mer.\n"
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:274
+#: client/civclient.c:275
#, c-format
msgid "Report bugs at %s\n"
msgstr "Anmäl buggar vid %s\n"
-#: client/civclient.c:298
+#: client/civclient.c:299
#, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr "Invalid port \"%s\" specified with --port option.\n"
-#: client/civclient.c:300 client/civclient.c:315
+#: client/civclient.c:301 client/civclient.c:316
msgid "Try using --help.\n"
msgstr "Try using --help.\n"
-#: client/civclient.c:313
+#: client/civclient.c:314
#, c-format
msgid "Invalid debug level \"%s\" specified with --debug option.\n"
msgstr "Invalid debug level \"%s\" specified with --debug option.\n"
-#: client/civclient.c:326
+#: client/civclient.c:327
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr "Okänt tillval: \"%s\"\n"
-#: client/civclient.c:391
+#: client/civclient.c:393
#, fuzzy, c-format
msgid "Updating old metaserver address \"%s\"."
msgstr "metaserver <adress>"
-#: client/civclient.c:394
+#: client/civclient.c:396
#, fuzzy, c-format
msgid "Default metaserver has been set to \"%s\"."
msgstr "Tillval: %s har satts till \"%s\"."
-#: client/civclient.c:550
+#: client/civclient.c:540
msgid "Game started."
msgstr "Spelet är igång."
-#: client/civclient.c:588
+#: client/civclient.c:606
msgid "There was an error while auto connecting; aborting."
msgstr "Ett fel uppstod vid självständig anslutning; avbryter."
@@ -8051,18 +8186,18 @@ msgstr "Ansluter..."
msgid "Disconnected from server."
msgstr "Bortkopplad från servern."
-#: client/clinet.c:469
+#: client/clinet.c:473
#, c-format
msgid "Failed to contact server \"%s\" at port %d as \"%s\" after %d attempts"
msgstr ""
"Lyckades inte ansluta till servern \"%s\" vid port %d som \"%s\" efter %d "
"försök."
-#: client/clinet.c:484 client/clinet.c:486
+#: client/clinet.c:488 client/clinet.c:490
msgid "Connection to server refused. Please start the server."
msgstr "Anslutning till servern förvägrades. Var god sätt i gång servern."
-#: client/clinet.c:495 client/clinet.c:523
+#: client/clinet.c:499 client/clinet.c:527
#, c-format
msgid ""
"Error contacting server \"%s\" at port %d as \"%s\":\n"
@@ -8071,7 +8206,7 @@ msgstr ""
"Fel vid anslutning till servern \"%s\" vid port %d som \"%s\":\n"
" %s\n"
-#: client/clinet.c:514
+#: client/clinet.c:518
#, c-format
msgid ""
"Auto-connecting to server \"%s\" at port %d as \"%s\" every %f second(s) for "
@@ -8080,53 +8215,53 @@ 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:1358
+#: client/connectdlg_common.c:78 client/gui-gtk-2.0/pages.c:1358
msgid "novice"
msgstr "nybörjare"
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1358
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
msgid "easy"
msgstr "lätt"
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1359
msgid "normal"
msgstr "normal"
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr "svår"
-#: client/connectdlg_common.c:83
+#: client/connectdlg_common.c:82
msgid "experimental"
msgstr "experimentell"
-#: client/connectdlg_common.c:213
+#: client/connectdlg_common.c:212
msgid "Starting server..."
msgstr "Startar server..."
-#: client/connectdlg_common.c:332
+#: client/connectdlg_common.c:331
msgid "Couldn't start the server."
msgstr "Kunde ej starta server."
-#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
+#: client/connectdlg_common.c:332 client/connectdlg_common.c:365
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:364
+#: client/connectdlg_common.c:363
msgid "Couldn't connect to the server."
msgstr "Kunde ej skapa anslutning till server."
-#: client/connectdlg_common.c:365
+#: client/connectdlg_common.c:364
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:470
+#: client/connectdlg_common.c:469
#, fuzzy
msgid ""
"Established control over the server. You have command access level 'hack'."
msgstr "Vi har kontroll över servern (kontrollnivå 'hack')"
-#: client/connectdlg_common.c:475
+#: client/connectdlg_common.c:474
msgid ""
"Failed to obtain the required access level to take control of the server. "
"The server will now be shutdown."
@@ -8136,27 +8271,27 @@ msgstr ""
msgid "Only transporter units can be unloaded."
msgstr "Endast frakttrupper kan lastas ur."
-#: client/control.c:1425
+#: client/control.c:1417
msgid "Only settler units can be put into auto mode."
msgstr "Endast nybyggartrupper kan försättas i självständigt läge."
-#: client/control.c:1516
+#: client/control.c:1511
msgid "Only nuclear units can do this."
msgstr "Endast kärnvapen kan göra detta."
-#: client/control.c:1545
+#: client/control.c:1540
msgid "Only paratrooper units can do this."
msgstr "Endast fallskärmsjägare kan göra detta."
-#: client/control.c:2020
+#: client/control.c:2015
msgid "Too far for this unit."
msgstr "För långt för denna trupp."
-#: client/control.c:2230 client/control.c:2260 client/control.c:2276
+#: client/control.c:2225 client/control.c:2255 client/control.c:2271
msgid "Didn't find a route to the destination!"
msgstr "Hittade ingen väg till målet!"
-#: client/control.c:2320
+#: client/control.c:2315
msgid "Oh my! You seem to have no capital!"
msgstr "Hoppsan! Vi tycks sakna huvudstad!"
@@ -8555,27 +8690,34 @@ 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:1066 client/helpdata.c:1400
+#: client/helpdata.c:1066 client/helpdata.c:1408
msgid " or "
msgstr " eller "
-#: client/helpdata.c:1068 client/helpdata.c:1388
+#: client/helpdata.c:1068 client/helpdata.c:1396
msgid "?or:, "
msgstr "?or:, "
-#: client/helpdata.c:1080
-#, 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"
+#: client/helpdata.c:1079
+#, fuzzy, c-format
+msgid "* Unit has to be in a city, or a base after %d turn.\n"
+msgid_plural "* Unit has to be in a city, or a base 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:1087
+#, fuzzy, c-format
+msgid "* Unit has to be in a city, a base, or on a %s after %d turn.\n"
+msgid_plural "* Unit has to be in a city, a base, 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:1122
+#: client/helpdata.c:1130
#, 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:1127
+#: client/helpdata.c:1135
#, c-format
msgid ""
"To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8584,90 +8726,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:1135
+#: client/helpdata.c:1143
msgid "You cannot research this technology."
msgstr "Vi kan inte forska fram denna teknologi."
-#: client/helpdata.c:1139
+#: client/helpdata.c:1147
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:1151
+#: client/helpdata.c:1159
#, 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:1156
+#: client/helpdata.c:1164
#, 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:1159
+#: client/helpdata.c:1167
#, 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:1163
+#: client/helpdata.c:1171
msgid "* Increases the pollution generated by the population.\n"
msgstr "* Ökar mängden utsläpp som orsakas av befolkning.\n"
-#: client/helpdata.c:1168
+#: client/helpdata.c:1176
#, 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:1175
+#: client/helpdata.c:1183
#, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr "* Möjliggör %s att bygga fästningar.\n"
-#: client/helpdata.c:1183
+#: client/helpdata.c:1191
#, c-format
msgid "* Allows %s to build airbases.\n"
msgstr "* Möjliggör %s att bygga flygbaser.\n"
-#: client/helpdata.c:1192
+#: client/helpdata.c:1200
#, 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:1200
+#: client/helpdata.c:1208
#, 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:1234
+#: client/helpdata.c:1242
msgid "* Pollution cannot be generated on this terrain."
msgstr "* Utsläpp drabbar aldrig denna terräng."
-#: client/helpdata.c:1239
+#: client/helpdata.c:1247
msgid "* You cannot build cities on this terrain."
msgstr "* Det går inte att grunda nya städer här."
-#: client/helpdata.c:1245
+#: client/helpdata.c:1253
msgid "* The coastline of this terrain is unsafe."
msgstr "* Denna terrängs kust är riskabel."
-#: client/helpdata.c:1250
+#: client/helpdata.c:1258
msgid "* This terrain is unsafe for units to travel on."
msgstr "* Denna terräng är riskabel för trupper."
-#: client/helpdata.c:1255
+#: client/helpdata.c:1263
msgid "* Land units cannot travel on oceanic terrains."
msgstr "* Marktrupper kan ej färdas över havsrutor."
# ?
-#: client/helpdata.c:1305
+#: client/helpdata.c:1313
msgid "Features:\n"
msgstr "Innehåller:\n"
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1411 client/helpdata.c:1412
+#: client/helpdata.c:1419 client/helpdata.c:1420
msgid "?outputlist: Nothing "
msgstr " inget "
-#: client/helpdata.c:1419
+#: client/helpdata.c:1427
#, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -8682,7 +8824,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:1429
+#: client/helpdata.c:1437
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8691,48 +8833,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:1437
+#: client/helpdata.c:1445
#, 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:1442
+#: client/helpdata.c:1450
#, 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:1447
+#: client/helpdata.c:1455
#, 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:1451
+#: client/helpdata.c:1459
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:1460
+#: client/helpdata.c:1468
#, 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:1468
+#: client/helpdata.c:1476
#, 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:1475
+#: client/helpdata.c:1483
#, 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:1482
+#: client/helpdata.c:1490
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -8742,7 +8884,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:1489
+#: client/helpdata.c:1497
#, c-format
msgid ""
"* After the first unhappy citizen due to city size, for each %d additional "
@@ -8751,17 +8893,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:1497
+#: client/helpdata.c:1505
#, 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:1502
+#: client/helpdata.c:1510
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr "* Har obegränsade forsknings/skatte/välfärdssatser.\n"
-#: client/helpdata.c:1507
+#: client/helpdata.c:1515
#, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -8776,7 +8918,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:1519
+#: client/helpdata.c:1527
#, 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"
@@ -8785,7 +8927,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:1530
+#: client/helpdata.c:1538
#, c-format
msgid ""
"* You may grow your cities by means of celebrations. Your cities must be at "
@@ -8794,15 +8936,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:1536
+#: client/helpdata.c:1544
msgid "* Your units cannot be bribed.\n"
msgstr "* Dina trupper kan inte mutas.\n"
-#: client/helpdata.c:1539
+#: client/helpdata.c:1547
msgid "* Your cities cannot be incited.\n"
msgstr "* Dina städer kan inte försättas i revolt.\n"
-#: client/helpdata.c:1543
+#: client/helpdata.c:1551
msgid ""
"* Government will fall into anarchy if any city is in disorder for more than "
"two turns in a row.\n"
@@ -8810,39 +8952,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:1549
+#: client/helpdata.c:1557
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:1553
+#: client/helpdata.c:1561
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:1557
+#: client/helpdata.c:1565
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:1561
+#: client/helpdata.c:1569
msgid "* Pays no upkeep for fanatics.\n"
msgstr "* Betalar inget underhåll för fanatiker.\n"
-#: client/helpdata.c:1564
+#: client/helpdata.c:1572
msgid "* Has no unhappy citizens.\n"
msgstr "* Saknar missnöjda medborgare.\n"
-#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
+#: client/helpdata.c:1582 client/helpdata.c:1586 client/helpdata.c:1590
#, c-format
msgid "* Veteran %s units.\n"
msgstr "* Erfarna %s-trupper.\n"
-#: client/helpdata.c:1585
+#: client/helpdata.c:1593
msgid "* Veteran units.\n"
msgstr "* Erfarna trupper.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1591
+#: client/helpdata.c:1599
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8852,7 +8994,7 @@ msgstr ""
"folket inte firar.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1600
+#: client/helpdata.c:1608
#, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8862,72 +9004,72 @@ msgstr ""
"folket firar.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1608
+#: client/helpdata.c:1616
#, 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:1617
+#: client/helpdata.c:1625
#, 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:1625
+#: client/helpdata.c:1633
#, 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:1630
+#: client/helpdata.c:1638
#, 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:1635
+#: client/helpdata.c:1643
#, 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:1643
+#: client/helpdata.c:1651
#, 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:1649
+#: client/helpdata.c:1657
#, 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:1655
+#: client/helpdata.c:1663
#, 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:1672
+#: client/helpdata.c:1680
#, 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:1699
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d %s"
msgstr "%s%d %s"
-#: client/helpdata.c:1700 client/helpdata.c:1708 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1708 client/helpdata.c:1716 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:1707
+#: client/helpdata.c:1715
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d missnöjda"
@@ -9002,7 +9144,7 @@ msgstr ""
"Detta är den förvalda serverporten som kommer användas i anslutningsdialoger "
"samt med kommandoradsparametern -a."
-#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:916 data/Freeciv.in:107
msgid "Metaserver"
msgstr "Metaserver"
@@ -9391,35 +9533,35 @@ msgstr "Sparning misslyckades, kan inte skriva till fil %s"
msgid "Saved settings to file %s"
msgstr "Sparade inställningar i filen %s"
-#: client/packhand.c:211 client/packhand.c:217
+#: client/packhand.c:212 client/packhand.c:218
msgid "You were rejected from the game...."
msgstr "Du avvisades från spelet."
-#: client/packhand.c:229
+#: client/packhand.c:230
#, c-format
msgid "Client capability string: %s"
msgstr "Klientförmåga-sträng: %s"
-#: client/packhand.c:232
+#: client/packhand.c:233
#, c-format
msgid "Server capability string: %s"
msgstr "Serverförmåga-sträng: %s"
-#: client/packhand.c:850
+#: client/packhand.c:864
#, c-format
msgid "Start of turn %d"
msgstr "Början av omgång %d"
-#: client/packhand.c:1591
+#: client/packhand.c:1621
#, c-format
msgid "AI Mode is now %s."
msgstr "Datorstyrt läge är nu %s."
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "ON"
msgstr "PÃ…"
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "OFF"
msgstr "AV"
@@ -9451,15 +9593,15 @@ msgstr "Namn"
msgid "Username"
msgstr "Användarnamn"
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
-#: client/gui-gtk-2.0/pages.c:2157
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:653
+#: client/gui-gtk-2.0/pages.c:1604 client/gui-gtk-2.0/pages.c:2159
msgid "Flag"
msgstr "Flagga"
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1605
-#: client/gui-gtk-2.0/pages.c:2159 client/gui-sdl/repodlgs.c:2063
-#: client/gui-win32/connectdlg.c:990 client/gui-win32/dialogs.c:542
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:657
+#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1609
+#: client/gui-gtk-2.0/pages.c:2161 client/gui-sdl/repodlgs.c:2063
+#: client/gui-win32/connectdlg.c:992 client/gui-win32/dialogs.c:542
#: client/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "Folkslag"
@@ -9472,7 +9614,7 @@ msgstr "Gräns"
msgid "Score"
msgstr "Poäng"
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1614
msgid "Team"
msgstr "Lag"
@@ -9505,36 +9647,36 @@ msgstr "?Player_dlg:Overksam"
msgid "Ping"
msgstr "Ping"
-#: client/repodlgs_common.c:375
+#: client/repodlgs_common.c:378
msgid "You cannot sell improvements."
msgstr "Vi kunde ej sälja stadsförbättringar"
-#: client/repodlgs_common.c:391
+#: client/repodlgs_common.c:394
#, c-format
msgid "Sold %d %s for %d gold."
msgstr "Sålde %d %s för %d guld."
-#: client/repodlgs_common.c:396
+#: client/repodlgs_common.c:399
#, c-format
msgid "No %s could be sold."
msgstr "Inga %s kunde säljas."
#. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:415
+#: client/repodlgs_common.c:418
msgid "You cannot disband units."
msgstr "Du kan inte upplösa trupper."
-#: client/repodlgs_common.c:420
+#: client/repodlgs_common.c:423
#, c-format
msgid "%s cannot be disbanded."
msgstr "%s kunde ej upplösas"
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:444
#, c-format
msgid "Disbanded %d %s."
msgstr "Upplöste %d %s."
-#: client/repodlgs_common.c:445
+#: client/repodlgs_common.c:448
#, c-format
msgid "No %s could be disbanded."
msgstr "Inga %s kunde upplösas."
@@ -10130,47 +10272,47 @@ msgstr "%02dd %02dtim"
msgid "?duration:overflow"
msgstr "överflöde"
-#: client/text.c:1143
+#: client/text.c:1145
#, c-format
msgid "%6d.%02d ms"
msgstr "%6d.%02d ms"
#. TRANS: <nation adjective> <government name>.
#. * E.g. "Polish Republic".
-#: client/text.c:1188
+#: client/text.c:1193
#, fuzzy, c-format
msgid "?nationgovernment:%s %s"
msgstr "Statsskick: %s"
#. TRANS: "Observer: 1985"
-#: client/text.c:1198
+#: client/text.c:1203
#, c-format
msgid "Observer: %s"
msgstr "Iakttagare: %s"
-#: client/text.c:1216
+#: client/text.c:1221
msgid "Buildings: "
msgstr "Byggnader: "
-#: client/text.c:1233 client/text.c:1272
+#: client/text.c:1238 client/text.c:1277
msgid "None. "
msgstr "Inga. "
-#: client/text.c:1235 client/text.c:1274
+#: client/text.c:1240 client/text.c:1279
msgid "?clistend:."
msgstr "."
-#: client/text.c:1253
+#: client/text.c:1258
msgid "Wonders: "
msgstr "Underverk: "
-#: client/text.c:1308
+#: client/text.c:1313
#, 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:1312
+#: client/text.c:1317
#, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
@@ -10178,19 +10320,19 @@ 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:1318
+#: client/text.c:1323
#, c-format
msgid "%d additional unhappy citizen."
msgid_plural "%d additional unhappy citizens."
msgstr[0] "Ytterligare %d missnöjd medborgare."
msgstr[1] "Ytterligare %d missnöjda medborgare."
-#: client/text.c:1339
+#: client/text.c:1344
#, fuzzy
msgid "Unlimited martial law in effect."
msgstr "Undantagstillstånd råder ("
-#: client/text.c:1341
+#: client/text.c:1346
#, fuzzy, c-format
msgid "%d military unit may impose martial law."
msgid_plural "Up to %d military units may impose martial law."
@@ -10199,38 +10341,38 @@ msgstr[0] ""
msgstr[1] ""
"* Icke-stridande enhet (kan inte anfalla; inget undantagstillstånd).\n"
-#: client/text.c:1345
+#: client/text.c:1350
#, fuzzy, c-format
msgid "Each military unit makes %d unhappy citizen content."
msgid_plural "Each military unit makes %d unhappy citizens content."
msgstr[0] "Underhåller en stads medborgare. Gör 3 missnöjda medborgare nöjda."
msgstr[1] "Underhåller en stads medborgare. Gör 3 missnöjda medborgare nöjda."
-#: client/text.c:1352
+#: client/text.c:1357
msgid "Military units in the field may cause unhappiness. "
msgstr "Stridande enheter i fält kan orsaka missnöje. "
-#: client/text.c:1355
+#: client/text.c:1360
msgid "Military units have no happiness effect. "
msgstr "Stridande enheter påverkar inte belåtenhet."
-#: client/text.c:1370
+#: client/text.c:1375
#, c-format
msgid "Luxury: %d total."
msgstr "Välfärd: %d sammanlagt."
-#: client/tilespec.c:865
+#: client/tilespec.c:882
msgid "No usable default tileset found, aborting!"
msgstr "Hittade ingen användbar standardrutbildsuppsättning; avbryter!"
-#: client/tilespec.c:1338
+#: client/tilespec.c:1355
msgid ""
"Client does not support isometric tilesets. Using default tileset instead."
msgstr ""
"Klienten klarar inte av att visa isometriska rutbilder. Använder "
"standardrutbilder i stället."
-#: client/tilespec.c:1347
+#: client/tilespec.c:1364
msgid ""
"Client does not support overhead view tilesets. Using default tileset "
"instead."
@@ -10238,7 +10380,7 @@ msgstr ""
"Klienten klarar inte av att visa rätvinkliga rutbilder. Använder "
"standardrutbilder i stället."
-#: client/tilespec.c:3966
+#: client/tilespec.c:3987
#, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -10928,7 +11070,7 @@ msgid "_Display"
msgstr "Vi_sa"
#: client/gui-gtk-2.0/cityrep.c:1006 client/gui-gtk-2.0/menu.c:839
-#: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
+#: client/gui-sdl/diplodlg.c:692 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
#: client/gui-xaw/cityrep.c:533 client/gui-xaw/menu.c:156
@@ -11100,192 +11242,192 @@ 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:196 client/gui-gtk-2.0/messagewin.c:222
+#: client/gui-gtk-2.0/dialogs.c:197 client/gui-gtk-2.0/messagewin.c:222
msgid "Goto _Location"
msgstr "_GÃ¥ till plats"
-#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
+#: client/gui-gtk-2.0/dialogs.c:202 client/gui-gtk-2.0/messagewin.c:226
msgid "Inspect _City"
msgstr "Inspektera _stad"
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:258 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:258 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:259 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:311 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:312 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:312 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:313 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:506
+#: client/gui-gtk-2.0/dialogs.c:507
msgid "Unit"
msgstr "Trupp"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:950
-#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2155
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:985
+#: client/gui-gtk-2.0/dialogs.c:508 client/gui-gtk-2.0/pages.c:950
+#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2157
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:987
#: 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:519 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:520 client/gui-sdl/dialogs.c:627
msgid "Unit selection"
msgstr "Välj trupp"
-#: client/gui-gtk-2.0/dialogs.c:582
+#: client/gui-gtk-2.0/dialogs.c:583
msgid "_Ready all"
msgstr "Aktive_ra alla"
-#: client/gui-gtk-2.0/dialogs.c:590
+#: client/gui-gtk-2.0/dialogs.c:591
msgid "_Sentry idle"
msgstr "_Sätt overksamma i vakttjänst"
-#: client/gui-gtk-2.0/dialogs.c:719
+#: client/gui-gtk-2.0/dialogs.c:721
msgid "Nation _Groups:"
msgstr "_Grupper:"
-#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:766 data/Freeciv.in:3128
msgid "What Nation Will You Be?"
msgstr "Vilket folk ska du styra?"
-#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
-#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
+#: client/gui-gtk-2.0/dialogs.c:768 client/gui-sdl/chatline.c:842
+#: client/gui-win32/connectdlg.c:1040 data/Freeciv.in:3371
msgid "Pick Nation"
msgstr "Välj folkslag"
-#: client/gui-gtk-2.0/dialogs.c:774
+#: client/gui-gtk-2.0/dialogs.c:776
msgid "_Random Nation"
msgstr "Sl_umpvalt folkslag"
-#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:792 client/gui-win32/dialogs.c:517
msgid "Select a nation"
msgstr "Välj ett folkslag"
-#: client/gui-gtk-2.0/dialogs.c:804
+#: client/gui-gtk-2.0/dialogs.c:810
msgid "_Properties"
msgstr "Egenska_per"
-#: client/gui-gtk-2.0/dialogs.c:824
+#: client/gui-gtk-2.0/dialogs.c:830
msgid "_Leader:"
msgstr "_Ledare:"
-#: client/gui-gtk-2.0/dialogs.c:831
+#: client/gui-gtk-2.0/dialogs.c:837
msgid "_Female"
msgstr "_Kvinna"
-#: client/gui-gtk-2.0/dialogs.c:836
+#: client/gui-gtk-2.0/dialogs.c:842
msgid "_Male"
msgstr "_Man"
-#: client/gui-gtk-2.0/dialogs.c:863
+#: client/gui-gtk-2.0/dialogs.c:869
msgid "City _Styles:"
msgstr "_Stadstyper:"
-#: client/gui-gtk-2.0/dialogs.c:902
+#: client/gui-gtk-2.0/dialogs.c:908
msgid "_Description"
msgstr "_Beskrivning"
-#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1263 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:1253 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1268 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:1262 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1277 client/gui-sdl/dialogs.c:2204
#: 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:1306 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1318 client/gui-win32/citydlg.c:1454
#: data/Freeciv.in:2484
msgid "Upgrade Unit!"
msgstr "Uppgradera trupp!"
-#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1327 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 "Uppgradera föråldrade trupper"
-#: client/gui-gtk-2.0/diplodlg.c:231 client/gui-win32/diplodlg.c:151
+#: client/gui-gtk-2.0/diplodlg.c:222 client/gui-win32/diplodlg.c:151
#: client/gui-xaw/diplodlg.c:383 client/gui-xaw/diplodlg.c:401
msgid "World-map"
msgstr "Världskarta"
-#: client/gui-gtk-2.0/diplodlg.c:237 client/gui-win32/diplodlg.c:146
+#: client/gui-gtk-2.0/diplodlg.c:228 client/gui-win32/diplodlg.c:146
#: client/gui-xaw/diplodlg.c:387 client/gui-xaw/diplodlg.c:405
msgid "Sea-map"
msgstr "Sjökort"
-#: client/gui-gtk-2.0/diplodlg.c:243
+#: client/gui-gtk-2.0/diplodlg.c:234
msgid "_Maps"
msgstr "_Kartor"
-#: client/gui-gtk-2.0/diplodlg.c:274
+#: client/gui-gtk-2.0/diplodlg.c:265
msgid "_Advances"
msgstr "Fr_amsteg"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/diplodlg.c:315 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "Städe_r"
-#: client/gui-gtk-2.0/diplodlg.c:333
+#: client/gui-gtk-2.0/diplodlg.c:324
msgid "_Give shared vision"
msgstr "_Ge delad anblick"
-#: client/gui-gtk-2.0/diplodlg.c:346
+#: client/gui-gtk-2.0/diplodlg.c:337
msgid "Give _embassy"
msgstr "G_e ambassad"
-#: client/gui-gtk-2.0/diplodlg.c:376
+#: client/gui-gtk-2.0/diplodlg.c:368
msgid "_Pacts"
msgstr "F_örbund"
-#: client/gui-gtk-2.0/diplodlg.c:466
+#: client/gui-gtk-2.0/diplodlg.c:458
#, c-format
msgid "Diplomacy: %s"
msgstr "Möte med %s"
-#: client/gui-gtk-2.0/diplodlg.c:473
+#: client/gui-gtk-2.0/diplodlg.c:465
msgid "_Cancel meeting"
msgstr "_Avbryt möte"
-#: client/gui-gtk-2.0/diplodlg.c:475
+#: client/gui-gtk-2.0/diplodlg.c:467
msgid "Accept _treaty"
msgstr "God_ta avtal"
-#: client/gui-gtk-2.0/diplodlg.c:503
+#: client/gui-gtk-2.0/diplodlg.c:495
msgid "C_lauses:"
msgstr "_Klausuler:"
-#: client/gui-gtk-2.0/diplodlg.c:568 client/gui-gtk-2.0/diplodlg.c:642
+#: client/gui-gtk-2.0/diplodlg.c:560 client/gui-gtk-2.0/diplodlg.c:634
msgid "_Gold:"
msgstr "_Guld:"
-#: client/gui-gtk-2.0/diplodlg.c:580 client/gui-gtk-2.0/diplodlg.c:654
+#: client/gui-gtk-2.0/diplodlg.c:572 client/gui-gtk-2.0/diplodlg.c:646
msgid "_Add Clause..."
msgstr "Lägg till kl_ausul..."
-#: client/gui-gtk-2.0/diplodlg.c:699
+#: client/gui-gtk-2.0/diplodlg.c:691
msgid "--- This treaty is blank. Please add some clauses. ---"
msgstr "--- Avtalet är tomt. Lägg till några klausuler. ---"
-#: client/gui-gtk-2.0/diplodlg.c:905 client/gui-sdl/diplodlg.c:375
+#: client/gui-gtk-2.0/diplodlg.c:897 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 "Ogiltig guldmängd angiven."
@@ -11344,19 +11486,19 @@ msgstr "Välj mål"
msgid "Show _All Cities"
msgstr "_Alla städer"
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:164
msgid "Show Map Scrollbars"
msgstr "Visa rullningslister för karta"
-#: client/gui-gtk-2.0/gui_main.c:163
+#: client/gui-gtk-2.0/gui_main.c:165
msgid "Disable this option to hide the scrollbars on the map view."
msgstr "Avaktivera detta val för att gömma kartans rullningslister."
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:169
msgid "Keyboardless goto"
msgstr "Tangentbordslöst gå-till"
-#: client/gui-gtk-2.0/gui_main.c:168
+#: client/gui-gtk-2.0/gui_main.c:170
msgid ""
"If this option is set then a goto may be initiated by left-clicking and then "
"holding down the mouse button while dragging the mouse onto a different tile."
@@ -11364,11 +11506,11 @@ msgstr ""
"Detta tillval gör det möjligt att utfärda ett gå-till-kommando genom att "
"klicka och dra med vänsterknappen."
-#: client/gui-gtk-2.0/gui_main.c:173
+#: client/gui-gtk-2.0/gui_main.c:175
msgid "Keep dialogs on top"
msgstr "Behåll dialoger överst"
-#: client/gui-gtk-2.0/gui_main.c:174
+#: client/gui-gtk-2.0/gui_main.c:176
msgid ""
"If this option is set then dialog windows will always remain in front of the "
"main Freeciv window. Disabling this has no effect in fullscreen mode."
@@ -11376,11 +11518,11 @@ msgstr ""
"Med detta tillval stannar dialogfönster alltid ovanför Freecivs "
"huvudfönster. Tillvalet gör ingen skillnad i fullskärmsläge."
-#: client/gui-gtk-2.0/gui_main.c:178
+#: client/gui-gtk-2.0/gui_main.c:180
msgid "Show worklist task icons"
msgstr "Visa arbetslistsikoner"
-#: client/gui-gtk-2.0/gui_main.c:179
+#: client/gui-gtk-2.0/gui_main.c:181
msgid ""
"Disabling this will turn off the unit and building icons in the worklist "
"dialog and the production tab of the city dialog."
@@ -11388,11 +11530,11 @@ msgstr ""
"Genom att avaktivera detta göms trupp- och byggnadsikoner i arbetslistor och "
"stadsdialoger."
-#: client/gui-gtk-2.0/gui_main.c:183
+#: client/gui-gtk-2.0/gui_main.c:185
msgid "Enable status report tabs"
msgstr "Aktivera statusrapportsflikar"
-#: client/gui-gtk-2.0/gui_main.c:184
+#: client/gui-gtk-2.0/gui_main.c:186
msgid ""
"If this option is enabled then report dialogs will be shown as separate tabs "
"rather than in popup dialogs."
@@ -11400,11 +11542,11 @@ msgstr ""
"Slå på detta för att visa redogörelser som separata flikar istället för "
"separata fönster."
-#: client/gui-gtk-2.0/gui_main.c:189 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:191 client/gui-win32/gui_main.c:110
msgid "Better fog-of-war drawing"
msgstr "Bättre rendering av krigsdimma"
-#: client/gui-gtk-2.0/gui_main.c:190 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:192 client/gui-win32/gui_main.c:111
msgid ""
"If this is enabled then a better method is used for drawing fog-of-war. It "
"is not any slower but will consume about twice as much memory."
@@ -11412,41 +11554,41 @@ msgstr ""
"Detta aktiverar en bättre metod att generera krigsdimma. Metoden är inte "
"långsammare, men drar ungefär dubbelt så mycket minne."
-#: client/gui-gtk-2.0/gui_main.c:195
+#: client/gui-gtk-2.0/gui_main.c:197
msgid "Show time for each chat message"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:196
+#: client/gui-gtk-2.0/gui_main.c:198
msgid ""
"If this option is enabled then all chat messages will be prefixed by a time "
"string of the form [hour:minute:second]."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:201
+#: client/gui-gtk-2.0/gui_main.c:203
msgid "Split bottom notebook area"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:202
+#: client/gui-gtk-2.0/gui_main.c:204
msgid ""
"Enabling this option will split the bottom notebook into a left and right "
"notebook so that two tabs may be viewed at once."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:207
+#: client/gui-gtk-2.0/gui_main.c:209
msgid "New message events go to top of list"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:208
+#: client/gui-gtk-2.0/gui_main.c:210
msgid ""
"If this option is enabled, new events in the message window will appear at "
"the top of the list, rather than being appended at the bottom."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:213
+#: client/gui-gtk-2.0/gui_main.c:215
msgid "Show extra message window buttons"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:214
+#: client/gui-gtk-2.0/gui_main.c:216
msgid ""
"If this option is enabled, there will be two buttons displayed in the "
"message window for inspecting a city and going to a location. If this option "
@@ -11456,21 +11598,21 @@ msgid ""
"closed and reopened."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:224
+#: client/gui-gtk-2.0/gui_main.c:226
msgid "Metaserver tab first in network page"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:225
+#: client/gui-gtk-2.0/gui_main.c:227
msgid ""
"If this option is enabled, the metaserver tab will be the first notebook tab "
"in the network page. This option requires a restart in order to take effect."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:230
+#: client/gui-gtk-2.0/gui_main.c:232
msgid "Plain chat messages are sent to allies only"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:231
+#: client/gui-gtk-2.0/gui_main.c:233
msgid ""
"If this option is enabled, then plain messages typed into the chat entry "
"while the game is running will only be sent to your allies. Otherwise plain "
@@ -11480,7 +11622,20 @@ msgid ""
"visible in multiplayer games)."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:340 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:245
+msgid "Arrange widgets for small displays"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:246
+msgid ""
+"If this option is enabled, widgets in the main window will be arrange so "
+"that they take up the least amount of total screen space. Specifically, the "
+"left panel containing the overview, player status, and the unit information "
+"box will be extended over the entire left side of the window. This option "
+"requires a restart in order to take effect."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:352 client/gui-xaw/gui_main.c:245
msgid ""
"This client has no special command line options\n"
"\n"
@@ -11488,22 +11643,22 @@ msgstr ""
"Denna klient har inga speciella kommandoradstillval.\n"
"\n"
-#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
+#: client/gui-gtk-2.0/gui_main.c:847 client/gui-gtk-2.0/gui_main.c:1542
msgid "Freeciv"
msgstr "Freeciv"
-#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
+#: client/gui-gtk-2.0/gui_main.c:1251 client/gui-gtk-2.0/gui_main.c:1258
#: client/gui-sdl/mapctrl.c:1566 client/gui-win32/gui_main.c:482
#: data/Freeciv.in:2618
msgid "Turn Done"
msgstr "Avsluta omgång"
-#: client/gui-gtk-2.0/gui_main.c:1232 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1258 client/gui-sdl/mapctrl.c:1566
#: client/gui-sdl/mapview.c:1082
msgid "Shift+Return"
msgstr "Skift+Retur"
-#: client/gui-gtk-2.0/gui_main.c:1266 client/gui-gtk-2.0/menu.c:797
+#: client/gui-gtk-2.0/gui_main.c:1299 client/gui-gtk-2.0/menu.c:797
#: client/gui-gtk-2.0/menu.c:799 client/gui-gtk-2.0/menu.c:801
#: client/gui-gtk-2.0/menu.c:803 client/gui-gtk-2.0/menu.c:805
#: client/gui-gtk-2.0/menu.c:807 client/gui-gtk-2.0/menu.c:809
@@ -11522,11 +11677,11 @@ msgstr "Skift+Retur"
msgid "View"
msgstr "Visa"
-#: client/gui-gtk-2.0/gui_main.c:1359
+#: client/gui-gtk-2.0/gui_main.c:1393
msgid "Chat"
msgstr "Kommunikation"
-#: client/gui-gtk-2.0/gui_main.c:1377 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1411 client/gui-win32/gui_main.c:538
#: data/Freeciv.in:2809
msgid ""
"Freeciv is free software and you are welcome to distribute copies of it\n"
@@ -11537,78 +11692,78 @@ msgstr ""
"den under särskilda villkor; Se \"Kopiering\" under hjälpmenyn.\n"
"Nu får du ge dem vad de tål!"
-#: client/gui-gtk-2.0/gui_main.c:1392
+#: client/gui-gtk-2.0/gui_main.c:1426
msgid "Allies Only"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1657
+#: client/gui-gtk-2.0/gui_main.c:1691
msgid "Not _ready"
msgstr "Inte _redo"
-#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
+#: client/gui-gtk-2.0/gui_main.c:1702 client/gui-gtk-2.0/pages.c:1679
msgid "_Ready"
msgstr "_Redo"
-#: client/gui-gtk-2.0/gui_main.c:1672 client/gui-gtk-2.0/gui_main.c:1678
-#: client/gui-gtk-2.0/pages.c:2204
+#: client/gui-gtk-2.0/gui_main.c:1706 client/gui-gtk-2.0/gui_main.c:1712
+#: client/gui-gtk-2.0/pages.c:2206
msgid "_Start"
msgstr "_Sätt igång"
-#: client/gui-gtk-2.0/gui_main.c:1686
+#: client/gui-gtk-2.0/gui_main.c:1720
#, fuzzy
msgid "_Take Player"
msgstr "Ta spelaren"
-#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
+#: client/gui-gtk-2.0/gui_main.c:1723 client/gui-gtk-2.0/pages.c:1669
msgid "Pick _Nation"
msgstr "Välj ditt _folk"
-#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
+#: client/gui-gtk-2.0/gui_main.c:1730 client/gui-gtk-2.0/pages.c:1674
msgid "_Observe"
msgstr "_Iakttag"
-#: client/gui-gtk-2.0/gui_main.c:1698
+#: client/gui-gtk-2.0/gui_main.c:1732
msgid "Do not _observe"
msgstr "_Iakttag ej"
-#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1755 client/gui-xaw/pages.c:211
msgid "<AI>"
msgstr "<Datorstyrd>"
-#: client/gui-gtk-2.0/gui_main.c:1723
+#: client/gui-gtk-2.0/gui_main.c:1758
msgid "<Novice AI>"
msgstr "<nybörjar-dator>"
-#: client/gui-gtk-2.0/gui_main.c:1726
+#: client/gui-gtk-2.0/gui_main.c:1761
msgid "<Easy AI>"
msgstr "<lätt dator>"
-#: client/gui-gtk-2.0/gui_main.c:1729
+#: client/gui-gtk-2.0/gui_main.c:1764
msgid "<Normal AI>"
msgstr "<normal dator>"
-#: client/gui-gtk-2.0/gui_main.c:1732
+#: client/gui-gtk-2.0/gui_main.c:1767
msgid "<Hard AI>"
msgstr "<svår dator>"
-#: client/gui-gtk-2.0/gui_main.c:1742 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1777 client/gui-win32/dialogs.c:594
#: client/gui-xaw/pages.c:217
msgid "Random"
msgstr "Slumpvald"
-#: client/gui-gtk-2.0/gui_main.c:1808
+#: client/gui-gtk-2.0/gui_main.c:1844 client/gui-gtk-2.0/gui_main.c:1858
msgid "Observer"
msgstr "Iakttagare"
-#: client/gui-gtk-2.0/gui_main.c:1808
+#: client/gui-gtk-2.0/gui_main.c:1858
msgid "Detached"
msgstr "Frånkopplad"
-#: client/gui-gtk-2.0/gui_main.c:2073
+#: client/gui-gtk-2.0/gui_main.c:2117
msgid "Are you sure you want to quit?"
msgstr "Vill du verkligen avsluta?"
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
#, c-format
msgid ""
"Close Tab:\n"
@@ -11617,7 +11772,7 @@ msgstr ""
"Stäng flik:\n"
"%s"
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
msgid "Ctrl+W"
msgstr "Ctrl+W"
@@ -11722,8 +11877,8 @@ msgid "Trans. Rslt/Time:"
msgstr "Omvandling Verkan/Tid:"
#: 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
-#: client/gui-win32/helpdlg.c:709 client/gui-win32/helpdlg.c:733
+#: client/gui-win32/helpdlg.c:502 client/gui-win32/helpdlg.c:550
+#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:739
#: client/gui-xaw/helpdlg.c:759 client/gui-xaw/helpdlg.c:808
#: client/gui-xaw/helpdlg.c:816 client/gui-xaw/helpdlg.c:853
#: client/gui-xaw/helpdlg.c:878
@@ -11770,34 +11925,34 @@ msgstr "med"
msgid "?techhelp:"
msgstr "?techhelp:"
-#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:591
+#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:597
#: client/gui-xaw/helpdlg.c:996
#, c-format
msgid "+%d Trade / %d"
msgstr "+%d Handel / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:595
+#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:601
#: client/gui-xaw/helpdlg.c:1000
#, c-format
msgid "no extra / %d"
msgstr "inget extra / %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
-#: client/gui-win32/helpdlg.c:602 client/gui-win32/helpdlg.c:616
-#: client/gui-win32/helpdlg.c:635 client/gui-xaw/helpdlg.c:1002
+#: client/gui-gtk-2.0/helpdlg.c:1085 client/gui-win32/helpdlg.c:604
+#: client/gui-win32/helpdlg.c:608 client/gui-win32/helpdlg.c:622
+#: client/gui-win32/helpdlg.c:641 client/gui-xaw/helpdlg.c:1002
#: client/gui-xaw/helpdlg.c:1006 client/gui-xaw/helpdlg.c:1020
#: client/gui-xaw/helpdlg.c:1039
msgid "n/a"
msgstr "e/a"
-#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:605
+#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:611
#: client/gui-xaw/helpdlg.c:1009
#, c-format
msgid "+%d Food / %d"
msgstr "+%d Mat / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:619
+#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:625
#: client/gui-xaw/helpdlg.c:1023
#, c-format
msgid "+%d Res. / %d"
@@ -12565,41 +12720,41 @@ msgstr "Delta i _nätverksspel"
msgid "Connect to Gaming _Zone"
msgstr "Delta i nätverksspel (Gaming _Zone)"
-#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:302
#: 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:779 client/gui-gtk-2.0/pages.c:820
-#: client/gui-win32/connectdlg.c:916
+#: client/gui-win32/connectdlg.c:918
msgid "Server Name"
msgstr "Servernamn"
#: client/gui-gtk-2.0/pages.c:780 client/gui-gtk-2.0/pages.c:821
-#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:916
+#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:918
#: data/Freeciv.in:96
msgid "Port"
msgstr "Port"
#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Version"
msgstr "Version"
#: client/gui-gtk-2.0/pages.c:782 client/gui-gtk-2.0/pages.c:823
-#: client/gui-gtk-2.0/pages.c:2161 client/gui-win32/connectdlg.c:917
-#: client/gui-win32/connectdlg.c:995
+#: client/gui-gtk-2.0/pages.c:2163 client/gui-win32/connectdlg.c:919
+#: client/gui-win32/connectdlg.c:997
msgid "Status"
msgstr "Status"
#: client/gui-gtk-2.0/pages.c:783 client/gui-gtk-2.0/pages.c:824
#: client/gui-sdl/connectdlg.c:318 client/gui-sdl/plrdlg.c:330
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Players"
msgstr "Spelare"
#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
-#: client/gui-win32/connectdlg.c:918
+#: client/gui-win32/connectdlg.c:920
msgid "Comment"
msgstr "Anmärkning"
@@ -12631,9 +12786,9 @@ msgstr "L_ösenord:"
msgid "Conf_irm Password:"
msgstr "_Bekräfta lösenord:"
-#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2165
#: 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:1000
+#: client/gui-win32/citydlg.c:1083 client/gui-win32/connectdlg.c:1002
#: client/gui-win32/wldlg.c:800 client/gui-win32/wldlg.c:806
msgid "Type"
msgstr "Typ"
@@ -12725,7 +12880,7 @@ msgstr "Datorspe_larens färdighetsnivå"
msgid "Ruleset _Version:"
msgstr "_Regler:"
-#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2195
msgid "_More Game Options..."
msgstr "_Fler spelinställningar..."
@@ -12742,49 +12897,49 @@ msgstr "Grad"
msgid "Ready"
msgstr "Redo"
-#: client/gui-gtk-2.0/pages.c:1601
+#: client/gui-gtk-2.0/pages.c:1600
#, fuzzy
msgid "?player:Leader"
msgstr "Namn"
-#: client/gui-gtk-2.0/pages.c:1732 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1734 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:1824
+#: client/gui-gtk-2.0/pages.c:1826
msgid "Choose Saved Game to _Load:"
msgstr "Välj sparat spel att _läsa in:"
-#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
-#: client/gui-gtk-2.0/pages.c:2451
+#: client/gui-gtk-2.0/pages.c:1846 client/gui-gtk-2.0/pages.c:2039
+#: client/gui-gtk-2.0/pages.c:2455
msgid "_Browse..."
msgstr "_Bläddra..."
-#: client/gui-gtk-2.0/pages.c:1911
+#: client/gui-gtk-2.0/pages.c:1913
msgid "Choose a Scenario"
msgstr "Öppna scenario"
-#: client/gui-gtk-2.0/pages.c:1998
+#: client/gui-gtk-2.0/pages.c:2000
msgid "Choose a _Scenario:"
msgstr "Öppna _scenario:"
-#: client/gui-gtk-2.0/pages.c:2173
+#: client/gui-gtk-2.0/pages.c:2175
msgid "Choose a _nation to play:"
msgstr "Välj ett _folkslag att spela:"
-#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2367 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:2448 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2452 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "Spara spel"
-#: client/gui-gtk-2.0/pages.c:2489
+#: client/gui-gtk-2.0/pages.c:2493
msgid "Saved _Games:"
msgstr "Sparade spel:"
-#: client/gui-gtk-2.0/pages.c:2516
+#: client/gui-gtk-2.0/pages.c:2520
msgid "Save _Filename:"
msgstr "Filnamn:"
@@ -13137,7 +13292,7 @@ msgstr "Stäng fönstret (Esc)"
msgid "Total users logged in : %d"
msgstr "Inloggade användare : %d"
-#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1098
msgid "Back"
msgstr "Bakåt"
@@ -13146,7 +13301,7 @@ msgid "Start"
msgstr "Sätt igång"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:777
+#: client/gui-win32/connectdlg.c:779
msgid "Load Game"
msgstr "Öppna sparat spel"
@@ -13186,9 +13341,9 @@ msgstr "Gör till ny hemstad"
#: client/gui-sdl/connectdlg.c:308 client/gui-sdl/connectdlg.c:617
#: client/gui-sdl/connectdlg.c:803 client/gui-sdl/connectdlg.c:985
#: client/gui-sdl/dialogs.c:452 client/gui-sdl/dialogs.c:2095
-#: client/gui-sdl/dialogs.c:2893 client/gui-sdl/diplomat_dialog.c:731
+#: client/gui-sdl/dialogs.c:2902 client/gui-sdl/diplomat_dialog.c:731
#: client/gui-sdl/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1043
#: client/gui-win32/dialogs.c:1772 client/gui-win32/finddlg.c:127
#: client/gui-win32/gotodlg.c:171 client/gui-win32/inputdlg.c:146
#: client/gui-win32/messagedlg.c:216 client/gui-win32/ratesdlg.c:328
@@ -13232,7 +13387,7 @@ msgid "Buy it?"
msgstr "Köp den?"
#: 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
+#: client/gui-sdl/diplodlg.c:1336 client/gui-sdl/diplomat_dialog.c:1211
#: client/gui-sdl/diplomat_dialog.c:1417 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:221 client/gui-sdl/repodlgs.c:1559
#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
@@ -13248,7 +13403,7 @@ msgid "No"
msgstr "Nej"
#: client/gui-sdl/citydlg.c:1215 client/gui-sdl/cma_fe.c:318
-#: client/gui-sdl/diplodlg.c:1345 client/gui-sdl/diplomat_dialog.c:1200
+#: client/gui-sdl/diplodlg.c:1346 client/gui-sdl/diplomat_dialog.c:1200
#: client/gui-sdl/diplomat_dialog.c:1407 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:232 client/gui-win32/repodlgs.c:578
#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
@@ -13552,7 +13707,7 @@ msgstr "Server :"
msgid "Port :"
msgstr "Port :"
-#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1100
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr "Anslut"
@@ -13659,23 +13814,23 @@ msgstr "Välj vårt nya statsskick"
msgid "REVOLUTION!"
msgstr "REVOLUTION!"
-#: client/gui-sdl/dialogs.c:2232 client/gui-sdl/dialogs.c:2620
+#: client/gui-sdl/dialogs.c:2237 client/gui-sdl/dialogs.c:2625
#: client/gui-win32/dialogs.c:567 data/Freeciv.in:3159
msgid "Female"
msgstr "Kvinna"
-#: client/gui-sdl/dialogs.c:2234 client/gui-sdl/dialogs.c:2618
-#: client/gui-sdl/dialogs.c:2830 client/gui-win32/dialogs.c:565
+#: client/gui-sdl/dialogs.c:2239 client/gui-sdl/dialogs.c:2623
+#: client/gui-sdl/dialogs.c:2839 client/gui-win32/dialogs.c:565
msgid "Male"
msgstr "Man"
-#: client/gui-sdl/dialogs.c:2478 client/gui-sdl/dialogs.c:2902
+#: client/gui-sdl/dialogs.c:2483 client/gui-sdl/dialogs.c:2911
#: 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 "OK"
-#: client/gui-sdl/dialogs.c:2685 client/gui-win32/dialogs.c:505
+#: client/gui-sdl/dialogs.c:2694 client/gui-win32/dialogs.c:505
msgid "What nation will you be?"
msgstr "Vilket folk ska du styra?"
@@ -13702,54 +13857,54 @@ msgstr "Världskarta"
msgid "Sea map"
msgstr "Sjökort"
-#: client/gui-sdl/diplodlg.c:563
+#: client/gui-sdl/diplodlg.c:564
msgid "Give embassy"
msgstr "Ge ambassad"
-#: client/gui-sdl/diplodlg.c:579 client/gui-win32/diplodlg.c:614
+#: client/gui-sdl/diplodlg.c:580 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 "Guld(högst %d)"
-#: client/gui-sdl/diplodlg.c:613 client/gui-sdl/helpdlg.c:1956
+#: client/gui-sdl/diplodlg.c:614 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 "Framsteg"
-#: client/gui-sdl/diplodlg.c:831 client/gui-win32/diplodlg.c:598
+#: client/gui-sdl/diplodlg.c:832 client/gui-win32/diplodlg.c:598
#: data/Freeciv.in:269
msgid "Diplomacy meeting"
msgstr "Diplomatiskt möte"
-#: client/gui-sdl/diplodlg.c:883 client/gui-win32/diplodlg.c:680
+#: client/gui-sdl/diplodlg.c:884 client/gui-win32/diplodlg.c:680
#: data/Freeciv.in:510
msgid "Cancel meeting"
msgstr "Avbryt möte"
-#: client/gui-sdl/diplodlg.c:895 client/gui-win32/diplodlg.c:679
+#: client/gui-sdl/diplodlg.c:896 client/gui-win32/diplodlg.c:679
#: data/Freeciv.in:501
msgid "Accept treaty"
msgstr "Godkänn avtal"
# DM> FIXME
#. TRANS: "Polish incident !" FIXME!!!
-#: client/gui-sdl/diplodlg.c:1304
+#: client/gui-sdl/diplodlg.c:1305
#, c-format
msgid "%s incident !"
msgstr "%s-incident !"
-#: client/gui-sdl/diplodlg.c:1322
+#: client/gui-sdl/diplodlg.c:1323
msgid "Shall we declare WAR on them?"
msgstr "Ska vi förklara KRIG mot dem?"
-#: client/gui-sdl/diplodlg.c:1433
+#: client/gui-sdl/diplodlg.c:1434
msgid "Foreign Minister"
msgstr "Utrikesminister"
-#: client/gui-sdl/diplodlg.c:1449
+#: client/gui-sdl/diplodlg.c:1450
#, c-format
msgid ""
"Sir!, the %s ambassador has arrived\n"
@@ -13758,24 +13913,24 @@ msgstr ""
"Ers nåd, den %s ambassadören har anlänt!\n"
"Vad ska vi göra?"
-#: client/gui-sdl/diplodlg.c:1465
+#: client/gui-sdl/diplodlg.c:1466
msgid "Declare WAR"
msgstr "Förklara KRIG"
-#: client/gui-sdl/diplodlg.c:1467 client/gui-win32/plrdlg.c:357
+#: client/gui-sdl/diplodlg.c:1468 client/gui-win32/plrdlg.c:357
msgid "Cancel Treaty"
msgstr "Avbryt avtal"
-#: client/gui-sdl/diplodlg.c:1490 client/gui-win32/plrdlg.c:358
+#: client/gui-sdl/diplodlg.c:1491 client/gui-win32/plrdlg.c:358
#: data/Freeciv.in:3254
msgid "Withdraw vision"
msgstr "Ã…terkalla anblick"
-#: client/gui-sdl/diplodlg.c:1507
+#: client/gui-sdl/diplodlg.c:1508
msgid "Call Diplomatic Meeting"
msgstr "Kalla till diplomatiskt möte"
-#: client/gui-sdl/diplodlg.c:1521
+#: client/gui-sdl/diplodlg.c:1522
msgid "Send him back"
msgstr "Avvisa honom"
@@ -14523,12 +14678,12 @@ msgid "Leave Game"
msgstr "Hoppa av"
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1100 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1102 client/gui-xaw/menu.c:121
#: data/Freeciv.in:115 data/Freeciv.in:3180
msgid "Quit"
msgstr "Avsluta"
-#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:967
msgid "Start New Game"
msgstr "Påbörja nytt spel"
@@ -14648,8 +14803,8 @@ msgstr "Nettoinkomst: "
msgid "%s max rate : %d%%"
msgstr "%s högsta sats: %d%%"
-#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
-#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1085
+#: client/gui-win32/connectdlg.c:1093 data/Freeciv.in:155
msgid "Update"
msgstr "Uppdatera"
@@ -15144,68 +15299,68 @@ msgstr "Ny"
msgid "Delete"
msgstr "Radera"
-#: client/gui-win32/connectdlg.c:147
+#: client/gui-win32/connectdlg.c:149
msgid "Password:"
msgstr "Lösenord:"
-#: client/gui-win32/connectdlg.c:169
+#: client/gui-win32/connectdlg.c:171
msgid "Couldn't load the savegame"
msgstr "Kunde inte läsa in sparfil"
-#: client/gui-win32/connectdlg.c:284 client/gui-xaw/connectdlg.c:311
+#: client/gui-win32/connectdlg.c:286 client/gui-xaw/connectdlg.c:311
msgid "Verify Password"
msgstr "Bekräfta lösenord"
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:916 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr "Serverval"
-#: client/gui-win32/connectdlg.c:915
+#: client/gui-win32/connectdlg.c:917
msgid "Local Area Network"
msgstr "lokalt nätverk"
-#: client/gui-win32/connectdlg.c:949
+#: client/gui-win32/connectdlg.c:951
msgid "Welcome to Freeciv"
msgstr "Välkommen till Freeciv"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Load Saved Game"
msgstr "Ã…teruppta sparat spel"
-#: client/gui-win32/connectdlg.c:969
+#: client/gui-win32/connectdlg.c:971
msgid "Connect To Network Game"
msgstr "Delta i nätverksspel"
-#: client/gui-win32/connectdlg.c:979
+#: client/gui-win32/connectdlg.c:981
msgid "Choose a nation to play"
msgstr "Välj ett folkslag att spela"
-#: client/gui-win32/connectdlg.c:1014
+#: client/gui-win32/connectdlg.c:1016
msgid "Number of players (Including AI):"
msgstr "Antal spelare (inklusive datorstyrda):"
-#: client/gui-win32/connectdlg.c:1022
+#: client/gui-win32/connectdlg.c:1024
msgid "AI skill level:"
msgstr "Datorspelarens färdighetsnivå:"
-#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1038 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr "Spelinställningar"
# ? Stämmer detta?
-#: client/gui-win32/connectdlg.c:1040
+#: client/gui-win32/connectdlg.c:1042
msgid "Start Game"
msgstr "Sätt igång"
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Login:"
msgstr "Logga in som:"
-#: client/gui-win32/connectdlg.c:1061
+#: client/gui-win32/connectdlg.c:1063
msgid "Host:"
msgstr "Värd:"
-#: client/gui-win32/connectdlg.c:1062
+#: client/gui-win32/connectdlg.c:1064
msgid "Port:"
msgstr "Port:"
@@ -15285,21 +15440,21 @@ msgstr ""
"Är detta påslaget används alpha blending när bilden ritas upp. Saknas "
"hårdvarustöd för detta kan det sakta ner spelet."
-#: client/gui-win32/helpdlg.c:769 client/gui-win32/helpdlg.c:792
-#: client/gui-win32/helpdlg.c:803 client/gui-win32/helpdlg.c:809
-#: client/gui-win32/helpdlg.c:822
+#: client/gui-win32/helpdlg.c:775 client/gui-win32/helpdlg.c:798
+#: client/gui-win32/helpdlg.c:809 client/gui-win32/helpdlg.c:815
+#: client/gui-win32/helpdlg.c:828
msgid "Allows "
msgstr "Möjliggör "
-#: client/gui-win32/helpdlg.c:780
+#: client/gui-win32/helpdlg.c:786
msgid "Obsoletes "
msgstr "Föråldrar "
-#: client/gui-win32/helpdlg.c:812 client/gui-win32/helpdlg.c:825
+#: client/gui-win32/helpdlg.c:818 client/gui-win32/helpdlg.c:831
msgid " (with "
msgstr " (med "
-#: client/gui-win32/helpdlg.c:815 client/gui-win32/helpdlg.c:828
+#: client/gui-win32/helpdlg.c:821 client/gui-win32/helpdlg.c:834
msgid "?techhelp:)."
msgstr "?techhelp:)."
@@ -16419,11 +16574,12 @@ msgid " Present administrators: "
msgstr " Nuvarande förvaltare: "
#: 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/"
+" https://gna.org/projects/freeciv/"
msgstr ""
"Skicka gärna en buggrapport om du stöter på några buggar. Det görs bäst "
"genom att besöka Freecivs \"Bug Tracker\" vid:\n"
@@ -18809,6 +18965,7 @@ msgid "Hydro Plant"
msgstr "vattenkraftverk"
#: data/default/buildings.ruleset:378
+#, fuzzy
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 "
@@ -18816,47 +18973,44 @@ msgid ""
"a Factory, Mfg. Plant and Hydro Plant together give a 150% production "
"bonus.\n"
"\n"
-"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant. A city "
-"can only build a Hydro Plant if it is next to (or on) a Mountain or River "
-"tile."
+"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant."
msgstr ""
"Minskar mängden utsläpp som orsakas av tillverkningen i en stad med 50%. "
"Ökar även sköldtillverkningen i en fabrik eller en tillverkningsanläggning i "
-"staden: en fabrik och ett vattenkraftverk ger tillsammans 75% "
+"staden: en fabrik och ett kärnkraftverk ger tillsammans 75% "
"tillverkningsbonus, och en fabrik, en tillverkningsanläggning och ett "
-"vattenkraftverk ger tillsammans 150% tillverkningsbonus.\n"
+"kärnkraftverk ger tillsammans 150% tillverkningsbonus.\n"
"\n"
"En stad kan endast ha ett vattenkraftverk, ett kraftverk eller ett "
-"kärnkraftverk. En stad kan endast bygga ett vattenkraftverk om den är intill "
-"(eller på) en bergs- eller kullruta."
+"kärnkraftverk."
-#: data/default/buildings.ruleset:397 data/civ2/buildings.ruleset:373
+#: data/default/buildings.ruleset:396 data/civ2/buildings.ruleset:373
#: data/civ1/buildings.ruleset:297
msgid "Library"
msgstr "bibliotek"
-#: data/default/buildings.ruleset:412
+#: data/default/buildings.ruleset:411
#, no-c-format
msgid "Increases the science output in a city by 100%."
msgstr "Ökar forskningen i en stad med 100%."
-#: data/default/buildings.ruleset:417 data/civ2/buildings.ruleset:393
+#: data/default/buildings.ruleset:416 data/civ2/buildings.ruleset:393
#: data/civ1/buildings.ruleset:317
msgid "Marketplace"
msgstr "marknadsplats"
-#: data/default/buildings.ruleset:432 data/civ2/buildings.ruleset:408
+#: data/default/buildings.ruleset:431 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 "Ökar välfärden och skatteintäkterna för en stad med 50%."
-#: data/default/buildings.ruleset:437 data/civ2/buildings.ruleset:413
+#: data/default/buildings.ruleset:436 data/civ2/buildings.ruleset:413
#: data/civ1/buildings.ruleset:337
msgid "Mass Transit"
msgstr "kollektivtrafik"
-#: data/default/buildings.ruleset:451 data/civ2/buildings.ruleset:427
+#: data/default/buildings.ruleset:450 data/civ2/buildings.ruleset:427
#: data/civ1/buildings.ruleset:351
msgid ""
"Neutralizes the pollution generated by the population. The population "
@@ -18865,12 +19019,12 @@ msgstr ""
"Motverkar utsläpp som orsakas av befolkningen; gör helt enkelt så att "
"befolkningen i en stad inte smutsar ner alls."
-#: data/default/buildings.ruleset:458 data/civ2/buildings.ruleset:434
+#: data/default/buildings.ruleset:457 data/civ2/buildings.ruleset:434
#: data/civ1/buildings.ruleset:358
msgid "Mfg. Plant"
msgstr "tillverkningsanläggning"
-#: data/default/buildings.ruleset:474 data/civ2/buildings.ruleset:450
+#: data/default/buildings.ruleset:473 data/civ2/buildings.ruleset:450
#: data/civ1/buildings.ruleset:374
#, no-c-format
msgid ""
@@ -18880,12 +19034,12 @@ msgstr ""
"Tillsammans med en fabrik, ökar en tillverkningsanläggning en stads "
"tillverkning med 100%."
-#: data/default/buildings.ruleset:480 data/civ2/buildings.ruleset:456
+#: data/default/buildings.ruleset:479 data/civ2/buildings.ruleset:456
#: data/civ1/buildings.ruleset:380
msgid "Nuclear Plant"
msgstr "kärnkraftverk"
-#: data/default/buildings.ruleset:495
+#: data/default/buildings.ruleset:494
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 "
@@ -18905,11 +19059,11 @@ msgstr ""
"kärnkraftverk."
# DM> tidigare "plattform till havs"
-#: data/default/buildings.ruleset:515 data/civ2/buildings.ruleset:489
+#: data/default/buildings.ruleset:514 data/civ2/buildings.ruleset:489
msgid "Offshore Platform"
msgstr "oljeplattform"
-#: data/default/buildings.ruleset:530 data/civ2/buildings.ruleset:504
+#: data/default/buildings.ruleset:529 data/civ2/buildings.ruleset:504
msgid ""
"Adds 1 extra shield resource on all Ocean squares in a city. The city needs "
"to be coastal to build this improvement."
@@ -18917,12 +19071,12 @@ msgstr ""
"Ger en stad 1 mer sköld i varje havsruta. Endast kuststäder kan bygga "
"oljeplattformar."
-#: data/default/buildings.ruleset:536 data/civ2/buildings.ruleset:510
+#: data/default/buildings.ruleset:535 data/civ2/buildings.ruleset:510
#: data/civ1/buildings.ruleset:411
msgid "Palace"
msgstr "slott"
-#: data/default/buildings.ruleset:552
+#: data/default/buildings.ruleset:551
#, no-c-format
msgid ""
"Makes a city the capital and the center of your government. Corruption in "
@@ -18949,11 +19103,11 @@ msgstr ""
"Under envälde ger slottet en produktionsbonus på +75%, samt en på +50% under "
"monarki."
-#: data/default/buildings.ruleset:569 data/civ2/buildings.ruleset:539
+#: data/default/buildings.ruleset:568 data/civ2/buildings.ruleset:539
msgid "Police Station"
msgstr "polisstation"
-#: data/default/buildings.ruleset:583 data/civ2/buildings.ruleset:553
+#: data/default/buildings.ruleset:582 data/civ2/buildings.ruleset:553
msgid ""
"Reduces the unhappiness caused by military units outside the city by 2 under "
"Democracy and 1 under Republic. This improvement has no effect under other "
@@ -18962,11 +19116,11 @@ msgstr ""
"Minskar det missnöje som orsakas av stridande enheter utanför staden med 2 "
"under demokrati och 1 under republik. Verkningslös under andra statsskick."
-#: data/default/buildings.ruleset:593 data/civ2/buildings.ruleset:560
+#: data/default/buildings.ruleset:592 data/civ2/buildings.ruleset:560
msgid "Port Facility"
msgstr "hamnanläggning"
-#: data/default/buildings.ruleset:608 data/civ2/buildings.ruleset:575
+#: data/default/buildings.ruleset:607 data/civ2/buildings.ruleset:575
msgid ""
"Allows a city to build veteran sea units. Also, damaged sea units which "
"stay in town for one full turn without moving are completely restored."
@@ -18975,12 +19129,12 @@ msgstr ""
"återställs skadade marina enheter som vilar i staden en hel omgång "
"fullständigt."
-#: data/default/buildings.ruleset:615 data/civ2/buildings.ruleset:582
+#: data/default/buildings.ruleset:614 data/civ2/buildings.ruleset:582
#: data/civ1/buildings.ruleset:440
msgid "Power Plant"
msgstr "kraftverk"
-#: data/default/buildings.ruleset:631
+#: data/default/buildings.ruleset:630
#, no-c-format
msgid ""
"Increases the shield production of a Factory or Mfg. Plant in a city: a "
@@ -18998,12 +19152,12 @@ msgstr ""
"En stad kan endast ha ett solkraftverk, ett vattenkraftverk, ett kraftverk "
"eller ett kärnkraftverk."
-#: data/default/buildings.ruleset:646 data/civ2/buildings.ruleset:610
+#: data/default/buildings.ruleset:645 data/civ2/buildings.ruleset:610
#: data/civ1/buildings.ruleset:468
msgid "Recycling Center"
msgstr "återvinningsanläggning"
-#: data/default/buildings.ruleset:661 data/civ2/buildings.ruleset:625
+#: data/default/buildings.ruleset:660 data/civ2/buildings.ruleset:625
#: data/civ1/buildings.ruleset:483
#, no-c-format
msgid ""
@@ -19014,11 +19168,11 @@ msgstr ""
"i en stad med 66%."
# DM> tidigare "forskningslaboratorium"
-#: data/default/buildings.ruleset:667 data/civ2/buildings.ruleset:631
+#: data/default/buildings.ruleset:666 data/civ2/buildings.ruleset:631
msgid "Research Lab"
msgstr "forskningsanläggning"
-#: data/default/buildings.ruleset:682
+#: data/default/buildings.ruleset:681
msgid ""
"Together with a Library, a Research Lab increases the science production of "
"a city by 200%. Together with a Library and a University, a Research Lab "
@@ -19028,11 +19182,11 @@ msgstr ""
"stad med 200%. Tillsammans med ett bibliotek och ett universitet, ökar en "
"forskningsanläggning forskningen i en stad med 450%."
-#: data/default/buildings.ruleset:690 data/civ2/buildings.ruleset:654
+#: data/default/buildings.ruleset:689 data/civ2/buildings.ruleset:654
msgid "SAM Battery"
msgstr "luftvärn"
-#: data/default/buildings.ruleset:704 data/civ2/buildings.ruleset:668
+#: data/default/buildings.ruleset:703 data/civ2/buildings.ruleset:668
msgid ""
"Doubles the defense of all units inside the city when attacked by non-"
"nuclear air units."
@@ -19040,12 +19194,12 @@ msgstr ""
"Fördubblar försvarsförmågan för alla trupper i en stad när de angrips av "
"stridsflyg - gäller ej kärnvapen."
-#: data/default/buildings.ruleset:710 data/civ2/buildings.ruleset:674
+#: data/default/buildings.ruleset:709 data/civ2/buildings.ruleset:674
#: data/civ1/buildings.ruleset:489
msgid "SDI Defense"
msgstr "missilförsvar"
-#: data/default/buildings.ruleset:724 data/civ2/buildings.ruleset:688
+#: data/default/buildings.ruleset:723 data/civ2/buildings.ruleset:688
#: data/civ1/buildings.ruleset:503
msgid ""
"Protects a city from attacks from Nuclear units. Nuclear attacks simply "
@@ -19056,11 +19210,11 @@ msgstr ""
"staden. Fördubblar även försvarsstyrkan mot icke-kärnvapenbestyckade "
"missiler."
-#: data/default/buildings.ruleset:733 data/civ2/buildings.ruleset:697
+#: data/default/buildings.ruleset:732 data/civ2/buildings.ruleset:697
msgid "Sewer System"
msgstr "avloppssystem"
-#: data/default/buildings.ruleset:748 data/civ2/buildings.ruleset:712
+#: data/default/buildings.ruleset:747 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."
@@ -19069,7 +19223,7 @@ msgstr ""
"vattenledning kommer före. Den krävs för att en stad skall kunna växa sig "
"större än storlek 8."
-#: data/default/buildings.ruleset:754 data/civ2/buildings.ruleset:749
+#: data/default/buildings.ruleset:753 data/civ2/buildings.ruleset:749
#: data/civ1/buildings.ruleset:512
msgid "Space Component"
msgstr "rymdkomponent"
@@ -19077,7 +19231,7 @@ msgstr "rymdkomponent"
# DM>
# ändrade "framdrivningskomponent" till "motorkomponent" samt
# "drivmedelskomponent" till "bränslekomponent"
-#: data/default/buildings.ruleset:769 data/civ2/buildings.ruleset:763
+#: data/default/buildings.ruleset:768 data/civ2/buildings.ruleset:763
#: data/civ1/buildings.ruleset:526
msgid ""
"Space Components can be differentiated into Propulsion and Fuel Components. "
@@ -19093,12 +19247,12 @@ msgstr ""
"Innan man kan bygga rymdskeppsdelar måste någon spelare ha färdigställt "
"underverket Apolloprogrammet."
-#: data/default/buildings.ruleset:779 data/civ2/buildings.ruleset:773
+#: data/default/buildings.ruleset:778 data/civ2/buildings.ruleset:773
#: data/civ1/buildings.ruleset:536
msgid "Space Module"
msgstr "rymdmodul"
-#: data/default/buildings.ruleset:794 data/civ2/buildings.ruleset:787
+#: data/default/buildings.ruleset:793 data/civ2/buildings.ruleset:787
#: data/civ1/buildings.ruleset:550
msgid ""
"Space Modules are the most expensive parts of spaceships. There are three "
@@ -19130,12 +19284,12 @@ msgstr ""
"Innan man kan bygga rymdskeppsdelar, måste någon spelare ha färdigställt "
"underverket Apolloprogrammet."
-#: data/default/buildings.ruleset:813 data/civ2/buildings.ruleset:806
+#: data/default/buildings.ruleset:812 data/civ2/buildings.ruleset:806
#: data/civ1/buildings.ruleset:569
msgid "Space Structural"
msgstr "rymdstruktur"
-#: data/default/buildings.ruleset:828 data/civ2/buildings.ruleset:820
+#: data/default/buildings.ruleset:827 data/civ2/buildings.ruleset:820
#: data/civ1/buildings.ruleset:583
msgid ""
"Space Structurals form the base of your spaceship. All other spaceship "
@@ -19152,11 +19306,11 @@ msgstr ""
"Innan man kan bygga rymdskeppsdelar, måste någon spelare ha färdigställt "
"underverket Apolloprogrammet."
-#: data/default/buildings.ruleset:838 data/civ2/buildings.ruleset:830
+#: data/default/buildings.ruleset:837 data/civ2/buildings.ruleset:830
msgid "Stock Exchange"
msgstr "börs"
-#: data/default/buildings.ruleset:854 data/civ2/buildings.ruleset:846
+#: data/default/buildings.ruleset:853 data/civ2/buildings.ruleset:846
#, no-c-format
msgid ""
"Together with a Marketplace and a Bank, a Stock Exchange boosts tax and "
@@ -19165,21 +19319,21 @@ msgstr ""
"Tillsammans med en marknadsplats och en bank, ökar en börs en stads "
"skatteintäkter och välfärd med 150%."
-#: data/default/buildings.ruleset:860 data/civ2/buildings.ruleset:852
+#: data/default/buildings.ruleset:859 data/civ2/buildings.ruleset:852
msgid "Super Highways"
msgstr "motorvägar"
-#: data/default/buildings.ruleset:875 data/civ2/buildings.ruleset:867
+#: data/default/buildings.ruleset:874 data/civ2/buildings.ruleset:867
#, no-c-format
msgid ""
"Increases trade resources by 50% on all squares with roads or railroads."
msgstr "Ökar handeln i alla rutor med vägar eller järnvägar med 50%"
-#: data/default/buildings.ruleset:883 data/civ2/buildings.ruleset:873
+#: data/default/buildings.ruleset:882 data/civ2/buildings.ruleset:873
msgid "Supermarket"
msgstr "stormarknad"
-#: data/default/buildings.ruleset:898 data/civ2/buildings.ruleset:888
+#: data/default/buildings.ruleset:897 data/civ2/buildings.ruleset:888
#, no-c-format
msgid ""
"Increases the food resources by 50% on each farmland square which is being "
@@ -19189,12 +19343,12 @@ msgstr ""
"Ökar mängden mat som ges av varje åkerruta som används kring en stad med "
"50%. En åkerruta är en ruta med en förbättrad bevattningsanläggning."
-#: data/default/buildings.ruleset:905 data/civ2/buildings.ruleset:895
+#: data/default/buildings.ruleset:904 data/civ2/buildings.ruleset:895
#: data/civ1/buildings.ruleset:593
msgid "Temple"
msgstr "tempel"
-#: data/default/buildings.ruleset:919 data/civ2/buildings.ruleset:909
+#: data/default/buildings.ruleset:918 data/civ2/buildings.ruleset:909
#: data/civ1/buildings.ruleset:607
msgid ""
"Makes one unhappy citizen content. Both the Mysticism advance and the "
@@ -19205,13 +19359,13 @@ msgstr ""
"underverket Oraklet fördubblar denna verkan. \n"
"Med både spådomskonst och Oraklet blir 4 medborgare nöjda."
-#: data/default/buildings.ruleset:926 data/civ2/buildings.ruleset:916
+#: data/default/buildings.ruleset:925 data/civ2/buildings.ruleset:916
#: data/civ1/buildings.ruleset:614 data/default/techs.ruleset:742
#: data/civ2/techs.ruleset:727 data/civ1/techs.ruleset:723
msgid "University"
msgstr "universitet"
-#: data/default/buildings.ruleset:942
+#: data/default/buildings.ruleset:941
#, no-c-format
msgid ""
"Together with a Library, a University increases the science production of a "
@@ -19220,12 +19374,12 @@ msgstr ""
"Tillsammans med ett bibliotek, ökar ett universitet forskningen i en stad "
"med 250%."
-#: data/default/buildings.ruleset:948 data/civ2/buildings.ruleset:938
+#: data/default/buildings.ruleset:947 data/civ2/buildings.ruleset:938
#: data/civ1/buildings.ruleset:636
msgid "Apollo Program"
msgstr "Apolloprogrammet"
-#: data/default/buildings.ruleset:962 data/civ2/buildings.ruleset:952
+#: data/default/buildings.ruleset:961 data/civ2/buildings.ruleset:952
msgid ""
"Entire map becomes visible for the player who owns it. It allows all "
"players to start building spaceship parts (assuming they have researched the "
@@ -19236,11 +19390,11 @@ msgstr ""
"teknologierna)."
# DM> tidigare "Hansan" - passar inte med grafiken!
-#: data/default/buildings.ruleset:969 data/civ2/buildings.ruleset:959
+#: data/default/buildings.ruleset:968 data/civ2/buildings.ruleset:959
msgid "A.Smith's Trading Co."
msgstr "A.Smiths handelsbolag"
-#: data/default/buildings.ruleset:983
+#: data/default/buildings.ruleset:982
msgid ""
"City improvements which would normally have an upkeep of 1 are free of "
"upkeep, for all your cities."
@@ -19248,12 +19402,12 @@ msgstr ""
"Stadsförbättringar som annars skulle ha kostat 1 i underhåll blir "
"kostnadsbefriade för alla städer."
-#: data/default/buildings.ruleset:989 data/civ2/buildings.ruleset:979
+#: data/default/buildings.ruleset:988 data/civ2/buildings.ruleset:979
#: data/civ1/buildings.ruleset:655
msgid "Colossus"
msgstr "Kolossen"
-#: data/default/buildings.ruleset:1003 data/civ2/buildings.ruleset:993
+#: data/default/buildings.ruleset:1002 data/civ2/buildings.ruleset:993
#: data/civ1/buildings.ruleset:669
msgid ""
"Each square around the city where this wonder is built that is already "
@@ -19262,23 +19416,23 @@ msgstr ""
"Varje handelsgenererande ruta kring staden där underverket är byggt ger en "
"extra i handel."
-#: data/default/buildings.ruleset:1009 data/civ2/buildings.ruleset:999
+#: data/default/buildings.ruleset:1008 data/civ2/buildings.ruleset:999
#: data/civ1/buildings.ruleset:675
msgid "Copernicus' Observatory"
msgstr "Kopernikus observatorium"
-#: data/default/buildings.ruleset:1024 data/civ2/buildings.ruleset:1180
+#: data/default/buildings.ruleset:1023 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 "Ger en forskningsbonus på 100% i staden där den är."
-#: data/default/buildings.ruleset:1029 data/civ2/buildings.ruleset:1019
+#: data/default/buildings.ruleset:1028 data/civ2/buildings.ruleset:1019
#: data/civ1/buildings.ruleset:695
msgid "Cure For Cancer"
msgstr "Bot mot cancer"
-#: data/default/buildings.ruleset:1043
+#: data/default/buildings.ruleset:1042
msgid ""
"This stunning technological achievement makes one unhappy citizen content in "
"all your cities."
@@ -19286,12 +19440,12 @@ msgstr ""
"Denna häpnadsväckande teknologiska bedrift gör en missnöjd medborgare nöjd i "
"varje stad."
-#: data/default/buildings.ruleset:1051 data/civ2/buildings.ruleset:1039
+#: data/default/buildings.ruleset:1050 data/civ2/buildings.ruleset:1039
#: data/civ1/buildings.ruleset:715
msgid "Darwin's Voyage"
msgstr "Darwins resa"
-#: data/default/buildings.ruleset:1065 data/civ2/buildings.ruleset:1053
+#: data/default/buildings.ruleset:1064 data/civ2/buildings.ruleset:1053
#: data/civ1/buildings.ruleset:729
msgid ""
"Charles Darwin's voyage sparked the discovery of the evolution of the "
@@ -19301,23 +19455,23 @@ msgstr ""
"Charles Darwins resa utlöste upptäckten av evolutionen, som ökade "
"förtroendet för vetenskapen. Ger 2 omedelbara teknologiska framsteg."
-#: data/default/buildings.ruleset:1072 data/civ2/buildings.ruleset:1060
+#: data/default/buildings.ruleset:1071 data/civ2/buildings.ruleset:1060
msgid "Eiffel Tower"
msgstr "Eiffeltornet"
-#: data/default/buildings.ruleset:1087
+#: data/default/buildings.ruleset:1086
#, no-c-format
msgid ""
"Your reputation and goodwill among other nations is recovered twice as fast."
msgstr ""
"Ditt rykte och anseende hos de andra folken förbättras dubbelt så fort."
-#: data/default/buildings.ruleset:1093 data/civ2/buildings.ruleset:1081
+#: data/default/buildings.ruleset:1092 data/civ2/buildings.ruleset:1081
#: data/civ1/buildings.ruleset:736
msgid "Great Library"
msgstr "Stora Biblioteket"
-#: data/default/buildings.ruleset:1107 data/civ2/buildings.ruleset:1095
+#: data/default/buildings.ruleset:1106 data/civ2/buildings.ruleset:1095
#: data/civ1/buildings.ruleset:750
msgid ""
"The civilization which builds the Great Library gets every advance that at "
@@ -19326,21 +19480,21 @@ msgstr ""
"Den civilisation som färdigställer det stora biblioteket får varje teknologi "
"som minst 2 andra civilisationer har."
-#: data/default/buildings.ruleset:1113 data/civ2/buildings.ruleset:1101
+#: data/default/buildings.ruleset:1112 data/civ2/buildings.ruleset:1101
#: data/civ1/buildings.ruleset:756
msgid "Great Wall"
msgstr "Stora Muren"
-#: data/default/buildings.ruleset:1127
+#: data/default/buildings.ruleset:1126
msgid "Works as a City Wall in all your cities."
msgstr "Fungerar som stadsmurar i alla våra städer."
-#: data/default/buildings.ruleset:1135 data/civ2/buildings.ruleset:1122
+#: data/default/buildings.ruleset:1134 data/civ2/buildings.ruleset:1122
#: data/civ1/buildings.ruleset:777
msgid "Hanging Gardens"
msgstr "Hängande trädgårdarna"
-#: data/default/buildings.ruleset:1149 data/civ2/buildings.ruleset:1136
+#: data/default/buildings.ruleset:1148 data/civ2/buildings.ruleset:1136
#: data/civ1/buildings.ruleset:791
msgid ""
"Makes one content citizen happy in every city. Makes two extra content "
@@ -19357,12 +19511,12 @@ msgstr ""
# DM> tidigare "Harsprånget" - tydligare för den som inte känner till den
# SB>Tycker inte alls det är lämpligt att ersätta Hooverdammen med svenskt vattenkraftverk
-#: data/default/buildings.ruleset:1158 data/civ2/buildings.ruleset:1145
+#: data/default/buildings.ruleset:1157 data/civ2/buildings.ruleset:1145
#: data/civ1/buildings.ruleset:800
msgid "Hoover Dam"
msgstr "Harsprångsdammen"
-#: data/default/buildings.ruleset:1173 data/civ2/buildings.ruleset:1159
+#: data/default/buildings.ruleset:1172 data/civ2/buildings.ruleset:1159
msgid ""
"Works as if you had a Hydro Plant in every city. (This reduces pollution "
"and increases the effects of Factories and Mfg. Plants.)"
@@ -19371,12 +19525,12 @@ msgstr ""
"ökar tillverkningen i fabriker och tillverkningsanläggningar.)"
# College här är väl inte riktigt högskola, utan snarare en del av ett universitet?
-#: data/default/buildings.ruleset:1179 data/civ2/buildings.ruleset:1165
+#: data/default/buildings.ruleset:1178 data/civ2/buildings.ruleset:1165
#: data/civ1/buildings.ruleset:822
msgid "Isaac Newton's College"
msgstr "Isaac Newtons högskola"
-#: data/default/buildings.ruleset:1194
+#: data/default/buildings.ruleset:1193
#, no-c-format
msgid ""
"Boosts science production by 100% in every city you control that has a "
@@ -19384,39 +19538,39 @@ msgid ""
msgstr ""
"Ger en forskningsbonus på 100% i varje stad som också har ett universitet."
-#: data/default/buildings.ruleset:1200 data/civ2/buildings.ruleset:1185
+#: data/default/buildings.ruleset:1199 data/civ2/buildings.ruleset:1185
#: data/civ1/buildings.ruleset:842
msgid "J.S. Bach's Cathedral"
msgstr "J.S. Bachs katedral"
-#: data/default/buildings.ruleset:1214 data/civ2/buildings.ruleset:1199
+#: data/default/buildings.ruleset:1213 data/civ2/buildings.ruleset:1199
msgid "Makes two unhappy citizens content in every city."
msgstr "Gör 2 missnöjda medborgare nöjda i varje stad."
-#: data/default/buildings.ruleset:1219 data/civ2/buildings.ruleset:1204
+#: data/default/buildings.ruleset:1218 data/civ2/buildings.ruleset:1204
msgid "King Richard's Crusade"
msgstr "Kung Rickards korståg"
-#: data/default/buildings.ruleset:1233 data/civ2/buildings.ruleset:1218
+#: data/default/buildings.ruleset:1232 data/civ2/buildings.ruleset:1218
msgid ""
"Adds one extra shield resource on every square around the city where it is "
"built."
msgstr "Ger en till sköld i varje använd ruta kring staden."
-#: data/default/buildings.ruleset:1239 data/civ2/buildings.ruleset:1224
+#: data/default/buildings.ruleset:1238 data/civ2/buildings.ruleset:1224
msgid "Leonardo's Workshop"
msgstr "Leonardos verkstäder"
-#: data/default/buildings.ruleset:1253 data/civ2/buildings.ruleset:1238
+#: data/default/buildings.ruleset:1252 data/civ2/buildings.ruleset:1238
msgid "Upgrades one obsolete unit per game turn."
msgstr "Uppgraderar en föråldrad trupp varje omgång."
-#: data/default/buildings.ruleset:1258 data/civ2/buildings.ruleset:1243
+#: data/default/buildings.ruleset:1257 data/civ2/buildings.ruleset:1243
#: data/civ1/buildings.ruleset:862
msgid "Lighthouse"
msgstr "Fyrtornet"
-#: data/default/buildings.ruleset:1273
+#: data/default/buildings.ruleset:1272
msgid ""
"Gives all your sea units 1 additional movement point and eliminates the risk "
"of losing Triremes on the high seas. Makes all your new sea units veterans "
@@ -19426,34 +19580,34 @@ msgstr ""
"triremer på öppna havet. Gör alla nya marina enheter erfarna (gäller alla "
"städer)."
-#: data/default/buildings.ruleset:1280 data/civ2/buildings.ruleset:1264
+#: data/default/buildings.ruleset:1279 data/civ2/buildings.ruleset:1264
#: data/civ1/buildings.ruleset:885
msgid "Magellan's Expedition"
msgstr "Magellans världsomsegling"
-#: data/default/buildings.ruleset:1295
+#: data/default/buildings.ruleset:1294
msgid "Gives all your sea units 2 additional movement points."
msgstr "Ger alla marina enheter 2 ytterligare drag."
-#: data/default/buildings.ruleset:1300 data/civ2/buildings.ruleset:1283
+#: data/default/buildings.ruleset:1299 data/civ2/buildings.ruleset:1283
#: data/civ1/buildings.ruleset:904
msgid "Manhattan Project"
msgstr "Manhattanprojektet"
-#: data/default/buildings.ruleset:1318 data/civ2/buildings.ruleset:1301
+#: data/default/buildings.ruleset:1317 data/civ2/buildings.ruleset:1301
msgid "Marco Polo's Embassy"
msgstr "Marco Polos ambassad"
-#: data/default/buildings.ruleset:1332 data/civ2/buildings.ruleset:1315
+#: data/default/buildings.ruleset:1331 data/civ2/buildings.ruleset:1315
msgid "The player who owns it gets an embassy with all players."
msgstr "Den spelare som har undret får en ambassad hos varje annan spelare."
-#: data/default/buildings.ruleset:1337 data/civ2/buildings.ruleset:1320
+#: data/default/buildings.ruleset:1336 data/civ2/buildings.ruleset:1320
#: data/civ1/buildings.ruleset:922
msgid "Michelangelo's Chapel"
msgstr "Michelangelos kapell"
-#: data/default/buildings.ruleset:1351 data/civ2/buildings.ruleset:1334
+#: data/default/buildings.ruleset:1350 data/civ2/buildings.ruleset:1334
msgid ""
"Counts as having a Cathedral in each of your cities. This makes 3 unhappy "
"citizens content in each city. The discovery of Theology increases the "
@@ -19466,21 +19620,21 @@ msgstr ""
"verkningen av en katedral genom att göra ytterligare en missnöjd medborgare "
"nöjd. Upptäckten av kommunism minskar antalet med 1."
-#: data/default/buildings.ruleset:1361 data/civ2/buildings.ruleset:1344
+#: data/default/buildings.ruleset:1360 data/civ2/buildings.ruleset:1344
#: data/civ1/buildings.ruleset:941
msgid "Oracle"
msgstr "Oraklet"
-#: data/default/buildings.ruleset:1375
+#: data/default/buildings.ruleset:1374
msgid "Makes two of your unhappy citizens content in every city with a temple."
msgstr "Gör två missnöjda medborgare nöjda i varje stad med tempel."
-#: data/default/buildings.ruleset:1380 data/civ2/buildings.ruleset:1363
+#: data/default/buildings.ruleset:1379 data/civ2/buildings.ruleset:1363
#: data/civ1/buildings.ruleset:960
msgid "Pyramids"
msgstr "Pyramiderna"
-#: data/default/buildings.ruleset:1394
+#: data/default/buildings.ruleset:1393
msgid ""
"The amount of stored food lost when one of your cities grows or shrinks is "
"reduced by 25%. This helps a city to grow faster and more easily withstand "
@@ -19490,30 +19644,30 @@ msgstr ""
"med 25%. Detta ökar en stads motståndskraft mot hungersnöd samt hjälper dess "
"tillväxt. Kumulativt med sädeslager."
-#: data/default/buildings.ruleset:1401 data/civ2/buildings.ruleset:1382
+#: data/default/buildings.ruleset:1400 data/civ2/buildings.ruleset:1382
#: data/civ1/buildings.ruleset:981
msgid "SETI Program"
msgstr "SETI-programmet"
-#: data/default/buildings.ruleset:1415
+#: data/default/buildings.ruleset:1414
msgid "Boosts science production in each city with a Research Lab by 100%. "
msgstr "Ger 100% forskningsbonus i varje stad med forskningsanläggning."
-#: data/default/buildings.ruleset:1420 data/civ2/buildings.ruleset:1402
+#: data/default/buildings.ruleset:1419 data/civ2/buildings.ruleset:1402
#: data/civ1/buildings.ruleset:1001
msgid "Shakespeare's Theatre"
msgstr "Shakespeares teater"
-#: data/default/buildings.ruleset:1434 data/civ2/buildings.ruleset:1416
+#: data/default/buildings.ruleset:1433 data/civ2/buildings.ruleset:1416
#: data/civ1/buildings.ruleset:1015
msgid "Makes all unhappy citizens content, in the city where it is located."
msgstr "Gör alla missnöjda invånare nöjda i staden där den befinner sig."
-#: data/default/buildings.ruleset:1439 data/civ2/buildings.ruleset:1421
+#: data/default/buildings.ruleset:1438 data/civ2/buildings.ruleset:1421
msgid "Statue of Liberty"
msgstr "Frihetsgudinnan"
-#: data/default/buildings.ruleset:1453 data/civ2/buildings.ruleset:1435
+#: data/default/buildings.ruleset:1452 data/civ2/buildings.ruleset:1435
#: data/civ1/buildings.ruleset:974 data/civ1/buildings.ruleset:1034
msgid ""
"Allows you to choose any government, including those that have not yet been "
@@ -19524,11 +19678,11 @@ msgstr ""
"inte har forskat fram än - utan övergångstid med anarki."
# DM> tidigare "Sun Tzus Krigsakademi"
-#: data/default/buildings.ruleset:1460 data/civ2/buildings.ruleset:1442
+#: data/default/buildings.ruleset:1459 data/civ2/buildings.ruleset:1442
msgid "Sun Tzu's War Academy"
msgstr "Sun Tzus krigsskola"
-#: data/default/buildings.ruleset:1474
+#: data/default/buildings.ruleset:1473
msgid ""
"All your new ground units start at the first veteran level. The chance of a "
"unit getting the next veteran level after a battle increases by half."
@@ -19536,21 +19690,21 @@ msgstr ""
"Alla våra nya marktrupper blir erfarna. Sannolikheten att överlevande "
"trupper blir erfarna efter ett slag ökar med hälften"
-#: data/default/buildings.ruleset:1481 data/civ2/buildings.ruleset:1463
+#: data/default/buildings.ruleset:1480 data/civ2/buildings.ruleset:1463
#: data/civ1/buildings.ruleset:1020
msgid "United Nations"
msgstr "Förenta nationerna"
-#: data/default/buildings.ruleset:1495
+#: data/default/buildings.ruleset:1494
msgid "All your units regain two extra hitpoints per turn."
msgstr "Skadade trupper återfår två ytterligare träffpunkter varje omgång."
-#: data/default/buildings.ruleset:1508 data/civ2/buildings.ruleset:1490
+#: data/default/buildings.ruleset:1507 data/civ2/buildings.ruleset:1490
#: data/civ1/buildings.ruleset:1046
msgid "Women's Suffrage"
msgstr "Kvinnlig rösträtt"
-#: data/default/buildings.ruleset:1522 data/civ2/buildings.ruleset:1504
+#: data/default/buildings.ruleset:1521 data/civ2/buildings.ruleset:1504
msgid ""
"Counts as a Police Station in every city. (That is, for each city, reduces "
"unhappiness for military units outside the city by 2 under Democracy and 1 "
@@ -19561,11 +19715,11 @@ msgstr ""
"under demokrati och 1 under republik. Detta underverk är verkningslöst under "
"andra statsskick.)"
-#: data/default/buildings.ruleset:1533
+#: data/default/buildings.ruleset:1532
msgid "Coinage"
msgstr "myntning"
-#: data/default/buildings.ruleset:1554
+#: data/default/buildings.ruleset:1553
msgid ""
"This is not a normal improvement. Instead, setting a city's production to "
"Coinage means its shield production is converted to tax output (money, "
@@ -19997,11 +20151,16 @@ msgstr "keltisk"
msgid "?citystyle:Industrial"
msgstr "industriell"
-#: data/default/cities.ruleset:139 data/civ2/cities.ruleset:150
+#: data/default/cities.ruleset:139
+#, fuzzy
+msgid "?citystyle:ElectricAge"
+msgstr "keltisk"
+
+#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:150
msgid "?citystyle:Modern"
msgstr "modern"
-#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:161
+#: data/default/cities.ruleset:161 data/civ2/cities.ruleset:161
msgid "?citystyle:PostModern"
msgstr "senmodern"
@@ -25758,6 +25917,47 @@ msgstr "Lag 30"
msgid "Team 31"
msgstr "Lag 31"
+#~ 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."
+
+#~ msgid "Observers cannot vote."
+#~ msgstr "Iakttagare kan ej rösta."
+
+#~ msgid ""
+#~ "You can only vote in a running game. Use 'first' to become the game "
+#~ "organizer if there currently is none."
+#~ 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."
+
+#~ msgid "Vote %d \"%s\": %d for, %d against"
+#~ msgstr "Omröstning %d \"%s\": %d för, %d emot"
+
+#~ msgid "Value must be integer."
+#~ msgstr "Värde måste vara heltal."
+
+#~ 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 Hydro Plant, Power Plant, or Nuclear Plant. A "
+#~ "city can only build a Hydro Plant if it is next to (or on) a Mountain or "
+#~ "River tile."
+#~ msgstr ""
+#~ "Minskar mängden utsläpp som orsakas av tillverkningen i en stad med 50%. "
+#~ "Ökar även sköldtillverkningen i en fabrik eller en "
+#~ "tillverkningsanläggning i staden: en fabrik och ett vattenkraftverk ger "
+#~ "tillsammans 75% tillverkningsbonus, och en fabrik, en "
+#~ "tillverkningsanläggning och ett vattenkraftverk ger tillsammans 150% "
+#~ "tillverkningsbonus.\n"
+#~ "\n"
+#~ "En stad kan endast ha ett vattenkraftverk, ett kraftverk eller ett "
+#~ "kärnkraftverk. En stad kan endast bygga ett vattenkraftverk om den är "
+#~ "intill (eller på) en bergs- eller kullruta."
+
#~ msgid "Auth config filename \"%s\" not allowed!"
#~ msgstr "Rättighetskonfigfilnamn \"%s\" ej tillåtet!"
diff --git a/po/tr.gmo b/po/tr.gmo
index 1caa0f2..b46a7e3 100644
Binary files a/po/tr.gmo and b/po/tr.gmo differ
diff --git a/po/tr.po b/po/tr.po
index 8dac11d..7fc790b 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: 2009-03-29 21:13+0900\n"
+"POT-Creation-Date: 2009-11-22 21:37+0100\n"
"PO-Revision-Date: 2008-06-01 16:36+0300\n"
"Last-Translator: Uğur Çetin <jnmbk at users.sourceforge.net>\n"
"Language-Team: Turkish <yerellestirme at kde.org.tr>\n"
@@ -69,21 +69,21 @@ msgstr "G"
msgid "?redundant:*"
msgstr "*"
-#: common/connection.c:515
+#: common/connection.c:518
#, c-format
msgid "%s from %s"
msgstr "%s, adresi %s"
-#: common/connection.c:521
+#: common/connection.c:524
msgid " (connection incomplete)"
msgstr " (bağlantı tamamlanmadı)"
-#: common/connection.c:525
+#: common/connection.c:528
#, c-format
msgid " (player %s)"
msgstr " (oyuncu %s)"
-#: common/connection.c:529
+#: common/connection.c:532
msgid " (observer)"
msgstr " (seyirci)"
@@ -487,81 +487,81 @@ msgstr "Bağlantı kurma/kesme mesajları"
msgid "AI Debug messages"
msgstr "YZ Hata ayıklama mesajları"
-#: common/player.c:732
+#: common/player.c:746
msgid "?attitude:Genocidal"
msgstr "Soykırım peşinde"
-#: common/player.c:734
+#: common/player.c:748
msgid "?attitude:Belligerent"
msgstr "Savaşçıl"
-#: common/player.c:736
+#: common/player.c:750
msgid "?attitude:Hostile"
msgstr "Düşmancıl"
-#: common/player.c:738
+#: common/player.c:752
msgid "?attitude:Uncooperative"
msgstr "Söz Dinlemiyor"
-#: common/player.c:740
+#: common/player.c:754
msgid "?attitude:Uneasy"
msgstr "Huzursuz"
-#: common/player.c:742
+#: common/player.c:756
msgid "?attitude:Neutral"
msgstr "Tarafsız"
-#: common/player.c:744
+#: common/player.c:758
msgid "?attitude:Respectful"
msgstr "Saygılı"
-#: common/player.c:746
+#: common/player.c:760
msgid "?attitude:Helpful"
msgstr "Yardımsever"
-#: common/player.c:748
+#: common/player.c:762
msgid "?attitude:Enthusiastic"
msgstr "Hevesli"
-#: common/player.c:750
+#: common/player.c:764
msgid "?attitude:Admiring"
msgstr "Hayran"
-#: common/player.c:753
+#: common/player.c:767
msgid "?attitude:Worshipful"
msgstr "Tapıyor"
-#: common/player.c:764
+#: common/player.c:778
msgid "?diplomatic_state:Armistice"
msgstr "Mütareke"
-#: common/player.c:765
+#: common/player.c:779
msgid "?diplomatic_state:War"
msgstr "SavaÅŸ"
-#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:780 client/gui-gtk-2.0/diplodlg.c:353
#: 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:767 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:781 client/gui-gtk-2.0/diplodlg.c:358
#: 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:768 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:782 client/gui-gtk-2.0/diplodlg.c:363
#: 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:769
+#: common/player.c:783
msgid "?diplomatic_state:Never met"
msgstr "Tanışmadık"
-#: common/player.c:770
+#: common/player.c:784
msgid "?diplomatic_state:Team"
msgstr "Takım"
@@ -592,7 +592,7 @@ msgstr "Hayatta kalma gereksinimleri sadece dünya kapsamında geçerlidir."
#. TRANS: "Resources: (none)".
#: common/requirements.c:1014 common/team.c:132
#: client/gui-gtk-2.0/helpdlg.c:1055 client/gui-gtk-2.0/inteldlg.c:390
-#: client/gui-win32/helpdlg.c:586 client/gui-xaw/helpdlg.c:991
+#: client/gui-win32/helpdlg.c:592 client/gui-xaw/helpdlg.c:991
#, c-format
msgid "(none)"
msgstr "(yok)"
@@ -618,10 +618,11 @@ msgstr "GeleceÄŸin Teknolojisi %d"
#: 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
#: client/gui-sdl/helpdlg.c:817 client/gui-sdl/mapview.c:962
-#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:545
-#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:735
-#: 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
+#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:544
+#: client/gui-win32/helpdlg.c:551 client/gui-win32/helpdlg.c:721
+#: client/gui-win32/helpdlg.c:741 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 "Yok"
@@ -634,29 +635,29 @@ msgstr "GeleceÄŸin Teknolojisi"
msgid "(Unknown)"
msgstr "(Bilinmeyen)"
-#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:553
#: manual/civmanual.c:224
msgid "Road"
msgstr "Yol"
-#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:557
#: client/gui-gtk-2.0/menu.c:829 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:394 common/terrain.c:572 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:567
#: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
#: data/civ1/techs.ruleset:563
msgid "Railroad"
msgstr "Ray"
-#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:555
msgid "Mine"
msgstr "Mayın"
-#: common/terrain.c:396 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:551 server/report.c:124
#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "Kirlilik"
@@ -665,7 +666,7 @@ msgstr "Kirlilik"
msgid "Hut"
msgstr "Kulübe"
-#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:563
#: manual/civmanual.c:226
msgid "Fortress"
msgstr "Kale"
@@ -678,58 +679,58 @@ msgstr "Nehir"
msgid "Farmland"
msgstr "Tarla"
-#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:577
#: manual/civmanual.c:226
msgid "Airbase"
msgstr "Hava üssü"
-#: common/terrain.c:402 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:579
msgid "Fallout"
msgstr "Radyoaktif Serpinti"
-#: common/unit.c:546 client/gui-win32/plrdlg.c:337
+#: common/unit.c:549 client/gui-win32/plrdlg.c:337
msgid "Idle"
msgstr "BoÅŸta"
-#: common/unit.c:556
+#: common/unit.c:559
msgid "Fortifying"
msgstr "Savunuyor"
-#: common/unit.c:558
+#: common/unit.c:561
msgid "Fortified"
msgstr "Savunmada"
-#: common/unit.c:562 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
+#: common/unit.c:565 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
msgid "Sentry"
msgstr "Nöbet Tut"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
+#: common/unit.c:569 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
#: client/gui-win32/menu.c:370 client/gui-xaw/menu.c:185
msgid "Pillage"
msgstr "YaÄŸmala"
-#: common/unit.c:568 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
+#: common/unit.c:571 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
msgid "Goto"
msgstr "Git"
-#: common/unit.c:570
+#: common/unit.c:573
msgid "Explore"
msgstr "Keşfe Çık"
-#: common/unit.c:572 manual/civmanual.c:224
+#: common/unit.c:575 manual/civmanual.c:224
msgid "Transform"
msgstr "Dönüştür"
-#: common/unit.c:584 client/text.c:157 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:587 client/text.c:157 client/gui-sdl/citydlg.c:1972
#: client/gui-win32/citydlg.c:1257 client/gui-xaw/citydlg.c:1423
msgid "Unknown"
msgstr "Bilinmeyen"
-#: common/unit.c:1022
+#: common/unit.c:1025
msgid "Moves"
msgstr "Adım"
-#: common/unit.c:1571
+#: common/unit.c:1574
#, c-format
msgid ""
"Upgrade %s to %s for %d gold?\n"
@@ -738,12 +739,12 @@ msgstr ""
"%s -> %s geliştirmesi yapılsın mı? (%d altın)\n"
"Hazinede %d altın var."
-#: common/unit.c:1579
+#: common/unit.c:1582
#, c-format
msgid "Sorry, cannot upgrade %s (yet)."
msgstr "Üzgünüm, %s henüz yükseltilmez."
-#: common/unit.c:1585
+#: common/unit.c:1588
#, c-format
msgid ""
"Upgrading %s to %s costs %d gold.\n"
@@ -752,11 +753,11 @@ msgstr ""
"%s -> %s geliştirmesi %d altın karşılığında yapılsın mı?\n"
"Hazinede %d altın var."
-#: common/unit.c:1594
+#: common/unit.c:1597
msgid "You can only upgrade units in your cities."
msgstr "Birimlerin yükseltmesi sadece şehirdeyken yapılabilir."
-#: common/unit.c:1598
+#: common/unit.c:1601
#, c-format
msgid "Upgrading this %s would strand units it transports."
msgstr ""
@@ -790,11 +791,11 @@ msgstr "Atom bombası"
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1404
+#: common/unittype.c:349 client/helpdata.c:1412
msgid " and "
msgstr " ve "
-#: common/unittype.c:355 client/helpdata.c:1390
+#: common/unittype.c:355 client/helpdata.c:1398
msgid "?and:, "
msgstr ", "
@@ -962,69 +963,69 @@ msgstr "\"%s\" için boş değişken.\n"
msgid "Missing argument for \"%s\".\n"
msgstr "\"%s\" için eksik değişken.\n"
-#: utility/shared.c:501
+#: utility/shared.c:514
#, c-format
msgid "%d BC"
msgstr "MÖ %d"
-#: utility/shared.c:503
+#: utility/shared.c:516
#, c-format
msgid "%d AD"
msgstr "MS %d"
-#: utility/shared.c:924
+#: utility/shared.c:937
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:1028
+#: utility/shared.c:1041
#, c-format
msgid "Could not read data directory %s: %s."
msgstr "Veri dizini okunamadı %s: %s."
-#: utility/shared.c:1279
+#: utility/shared.c:1292
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:1281
+#: utility/shared.c:1294
#, c-format
msgid "Current data path is: \"%s\""
msgstr "Geçerli veri yolu: \"%s\""
-#: utility/shared.c:1283
+#: utility/shared.c:1296
#, c-format
msgid "The \"%s\" file is required ... aborting!"
msgstr "\"%s\" dosyası gerekli ... durduruluyor!"
-#: utility/shared.c:1460
+#: utility/shared.c:1485
#, 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:1462
+#: utility/shared.c:1487
msgid "Use a non-privileged account instead.\n"
msgstr "Normal bir kullanıcı olarak çalıştır.\n"
-#: utility/shared.c:1478
+#: utility/shared.c:1503
msgid "exact match"
msgstr "tam isabet"
-#: utility/shared.c:1479
+#: utility/shared.c:1504
msgid "only match"
msgstr "sadece isabet"
-#: utility/shared.c:1480
+#: utility/shared.c:1505
msgid "ambiguous"
msgstr "iki anlamlı"
-#: utility/shared.c:1481
+#: utility/shared.c:1506
msgid "empty"
msgstr "boÅŸ"
-#: utility/shared.c:1482
+#: utility/shared.c:1507
msgid "too long"
msgstr "fazla uzun"
-#: utility/shared.c:1483
+#: utility/shared.c:1508
msgid "non-match"
msgstr "birbirini tutmayan"
@@ -1053,22 +1054,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:280
+#: ai/advdiplomacy.c:300
#, 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:290
+#: ai/advdiplomacy.c:310
#, 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:303
+#: ai/advdiplomacy.c:322
#, c-format
msgid "*%s (AI)* Let us first cease hostilies, %s."
msgstr "*%s (YZ)* Önce ateşkes yapalım, %s."
-#: ai/advdiplomacy.c:308
+#: ai/advdiplomacy.c:327
#, c-format
msgid ""
"*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
@@ -1076,47 +1077,47 @@ msgid ""
msgstr ""
"*%s (YZ)* Öncelikle yaptığımız ateşkesi biraz uzunca tutacağını umuyorum, %s."
-#: ai/advdiplomacy.c:331
+#: ai/advdiplomacy.c:350
#, 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:424
+#: ai/advdiplomacy.c:443
#, 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:454
+#: ai/advdiplomacy.c:473
#, 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:560
+#: ai/advdiplomacy.c:579
#, 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:582
+#: ai/advdiplomacy.c:601
#, c-format
msgid "*%s (AI)* Welcome into our alliance %s!"
msgstr "*%s (AI)* İttifakımıza hoş geldin %s!"
-#: ai/advdiplomacy.c:586
+#: ai/advdiplomacy.c:605
#, 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:593
+#: ai/advdiplomacy.c:612
#, c-format
msgid "*%s (AI)* Yes, peace in our time!"
msgstr "*%s (YZ)* Yurtta barış, cihanda barış!"
-#: ai/advdiplomacy.c:598
+#: ai/advdiplomacy.c:617
#, c-format
msgid "*%s (AI)* Agreed. No more hostilities, %s."
msgstr "*%s (YZ)* Anlaştık. Savaşa son, %s."
-#: ai/advdiplomacy.c:813
+#: ai/advdiplomacy.c:832
#, c-format
msgid ""
"*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
@@ -1125,23 +1126,23 @@ msgstr ""
"*%s (YZ)* Merhaba %s! Birbirimizi daha iyi tanıyabilmek için bir ateşkes "
"yapabilir miyiz?"
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1116
#, c-format
msgid "*%s (AI)* Space will never be yours. "
msgstr "*%s (YZ)* Uzayı sana kaptırmayacağız. "
-#: ai/advdiplomacy.c:1102
+#: ai/advdiplomacy.c:1121
#, 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:1108
+#: ai/advdiplomacy.c:1127
#, c-format
msgid "*%s (AI)* Peace in ... some other time."
msgstr "*%s (YZ)* Başka zaman barışalım."
-#: ai/advdiplomacy.c:1113
+#: ai/advdiplomacy.c:1132
#, c-format
msgid ""
"*%s (AI)* Finally I get around to you! Did you really think you could get "
@@ -1150,17 +1151,17 @@ msgstr ""
"*%s (AI)* Sonunda senin hakkından geldim! Bu kadar sinirimi bozduktan sonra "
"benden kaçabileceğini mi sandın?"
-#: ai/advdiplomacy.c:1119
+#: ai/advdiplomacy.c:1138
#, 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:1126
+#: ai/advdiplomacy.c:1145
#, 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:1209
+#: ai/advdiplomacy.c:1229
#, c-format
msgid ""
"*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1172,14 +1173,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:1219
+#: ai/advdiplomacy.c:1239
#, 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:1225
+#: ai/advdiplomacy.c:1245
#, c-format
msgid ""
"*%s (AI)* %s has grossly violated his treaties with us for own gain. We "
@@ -1193,7 +1194,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:1238
+#: ai/advdiplomacy.c:1258
#, c-format
msgid ""
"*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1205,13 +1206,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:1246
+#: ai/advdiplomacy.c:1266
#, 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:1251
+#: ai/advdiplomacy.c:1271
#, c-format
msgid ""
"*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1223,13 +1224,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:1261
+#: ai/advdiplomacy.c:1281
#, 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:1267
+#: ai/advdiplomacy.c:1287
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance and declare war on %s in %d turn. "
@@ -1241,7 +1242,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:1276
+#: ai/advdiplomacy.c:1296
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1253,7 +1254,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:1344
+#: ai/advdiplomacy.c:1364
#, c-format
msgid ""
"*%s (AI)* Your attempt to conquer space for yourself alone betray your true "
@@ -1262,14 +1263,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:1359
+#: ai/advdiplomacy.c:1379
#, 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:1362
+#: ai/advdiplomacy.c:1382
#, c-format
msgid ""
"*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
@@ -1277,13 +1278,13 @@ msgid ""
msgstr ""
"*%s (AI)* Uzay gemisi yapmayı bırakmazsan biz sana ne yapacağımızı biliriz!"
-#: ai/advdiplomacy.c:1474
+#: ai/advdiplomacy.c:1494
#, 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:1549
+#: ai/advdiplomacy.c:1569
#, c-format
msgid ""
"*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
@@ -1292,7 +1293,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:1555
+#: ai/advdiplomacy.c:1575
#, c-format
msgid ""
"*%s (AI)* Greetings ally, I see you have not yet made war with our enemy, %"
@@ -1301,7 +1302,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:1562
+#: ai/advdiplomacy.c:1582
#, c-format
msgid ""
"*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1311,19 +1312,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:1592
+#: ai/advdiplomacy.c:1612
#, 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:1607
+#: ai/advdiplomacy.c:1627
#, 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:1622
+#: ai/advdiplomacy.c:1642
#, c-format
msgid ""
"*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
@@ -1332,7 +1333,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:1742
+#: ai/advdiplomacy.c:1762
#, c-format
msgid ""
"*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1483,19 +1484,19 @@ msgstr ""
"Parolanız en az %d büyük harf, %d rakam ve toplamda en az %d karakterden "
"oluşmalıdır. Tekrar deneyin."
-#: server/barbarian.c:183
+#: server/barbarian.c:184
#, c-format
msgid "%s gain a leader by the name %s. Dangerous times may lie ahead."
msgstr ""
"%s, %s adında bir liderin önderliğinde ayaklandı. Onlara karşı hazırlıklı "
"olmalıyız."
-#: server/barbarian.c:479
+#: server/barbarian.c:480
#, c-format
msgid "Native unrest near %s led by %s."
msgstr "%2$s önderliğindeki yerliler, %1$s yakınlarında ayaklandı."
-#: server/barbarian.c:484
+#: server/barbarian.c:485
#, c-format
msgid "Sea raiders seen near %s!"
msgstr "%s yakınlarında korsanlar görüldü!"
@@ -1886,7 +1887,7 @@ msgid_plural "%s boosts research; you gain %d immediate advances."
msgstr[0] ""
"%s araştırmalara ivme kazandırdı; %d tane teknolojiyi anında öğreneceksin."
-#: server/cityturn.c:1158 server/techtools.c:176
+#: server/cityturn.c:1158 server/techtools.c:172
#, c-format
msgid "The %s have acquired %s from %s."
msgstr "%s, %s teknolojisini %s tarafından öğrendi."
@@ -1969,22 +1970,22 @@ msgid "Warning: the %s option is obsolete. Use -m to enable the metaserver.\n"
msgstr ""
"Uyarı: %s seçeneği eskidi. Metasunucuyu aktif yapmak için -m kullanın.\n"
-#: server/civserver.c:189
+#: server/civserver.c:193
#, c-format
msgid "Error: unknown option '%s'\n"
msgstr "Hata: bilinmeyen seçenek '%s'\n"
-#: server/civserver.c:200
+#: server/civserver.c:204
#, c-format
msgid "This is the server for %s"
msgstr "Bu sunucu %s içindir"
-#: server/civserver.c:201
+#: server/civserver.c:205
#, c-format
msgid "You can learn a lot about Freeciv at %s"
msgstr "Freeciv hakkında bilgi edinmek için %s sitesine bakabilirsiniz"
-#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
+#: server/civserver.c:210 client/civclient.c:239 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -1993,7 +1994,7 @@ msgstr ""
"Kullanım: %s [seçenek ...]\n"
"Geçerli seçenekler:\n"
-#: server/civserver.c:208
+#: server/civserver.c:212
msgid ""
" -a --auth FILE\tEnable server authentication with configuration from "
"FILE.\n"
@@ -2001,103 +2002,108 @@ msgstr ""
" -a --auth DOSYA\tSunucu kimlik doğrulamasını DOSYA'dan okunan ayarlarla "
"yap.\n"
-#: server/civserver.c:210
+#: server/civserver.c:214
msgid " -G --Guests\t\tAllow guests to login if auth is enabled.\n"
msgstr ""
" -G --Misafirler\t\tKimlik doğrulama açıksa misafirlerin de giriş yapmasına "
"izin ver.\n"
-#: server/civserver.c:212
+#: server/civserver.c:216
msgid " -N --Newusers\tAllow new users to login if auth is enabled.\n"
msgstr ""
" -N --Newusers\tKimlik doğrulama açıksa yeni kullanıcıların giriş yapmasına "
"izin ver.\n"
-#: server/civserver.c:215
+#: server/civserver.c:219
msgid " -b --bind ADDR\tListen for clients on ADDR\n"
msgstr " -b --bind ADRES\tADRESten baÄŸlanacak istemcileri dinle\n"
-#: server/civserver.c:217 client/civclient.c:242
+#: server/civserver.c:221 client/civclient.c:243
msgid ""
" -d, --debug NUM\tSet debug log level (0 to 4, or 4:file1,min,max:...)\n"
msgstr ""
" -d, --debug SAYI\tKütük seviyesini ayarla (0-4 arası veya 4:dosya1,asg,"
"aza:...)\n"
-#: server/civserver.c:221 client/civclient.c:246
+#: server/civserver.c:225 client/civclient.c:247
msgid " -d, --debug NUM\tSet debug log level (0 to 3)\n"
msgstr ""
" -d, --debug SAYI\tHata ayıklama kütük seviyesini ayarla (0'dan 3'e kadar)\n"
-#: server/civserver.c:223
+#: server/civserver.c:227
msgid " -f, --file FILE\tLoad saved game FILE\n"
msgstr " -f, --file DOSYA\tDOSYA'dan Kayıtlı oyunu yükle\n"
-#: server/civserver.c:225 client/civclient.c:249 manual/civmanual.c:382
+#: server/civserver.c:229 client/civclient.c:250 manual/civmanual.c:382
msgid " -h, --help\t\tPrint a summary of the options\n"
msgstr " -h, --help\t\tAyarların bir özetini yazdır\n"
-#: server/civserver.c:226
+#: server/civserver.c:230
+#, fuzzy
+msgid " -i, --identity ADDR\tBe known as ADDR at metaserver\n"
+msgstr " -M, --Metaserver ADRES\tADRES'i metasunucunun adresi olarak ayarla\n"
+
+#: server/civserver.c:231
msgid " -l, --log FILE\tUse FILE as logfile\n"
msgstr " -l, --log DOSYA\tDOSYA'yı kütük dosyası olarak kullan\n"
-#: server/civserver.c:227
+#: server/civserver.c:232
msgid " -m, --meta\t\tNotify metaserver and send server's info\n"
msgstr ""
" -m, -meta\t\tmetasunucuyu bilgilendir ve sunucunun bilgisini gönder\n"
-#: server/civserver.c:229
+#: server/civserver.c:234
msgid " -M, --Metaserver ADDR\tSet ADDR as metaserver address\n"
msgstr " -M, --Metaserver ADRES\tADRES'i metasunucunun adresi olarak ayarla\n"
-#: server/civserver.c:232
+#: server/civserver.c:237
msgid " -p, --port PORT\tListen for clients on port PORT\n"
msgstr " -p, --port PORT\tÄ°stemcileri PORT portundan dinle\n"
-#: server/civserver.c:234
+#: server/civserver.c:239
msgid " -q, --quitidle TIME\tQuit if no players for TIME seconds\n"
msgstr " -q, --quitidle ZAMAN\tZAMAN saniye boyunca oyuncu gelmezse çık\n"
-#: server/civserver.c:236
+#: server/civserver.c:241
msgid " -e, --exit-on-end\tWhen a game ends, exit instead of restarting\n"
msgstr " -e, --exit-on-end\tOyun bitince baştan başlatmak yerine çık\n"
-#: server/civserver.c:239
+#: server/civserver.c:244
msgid " -s, --saves DIR\tSave games to directory DIR\n"
msgstr " -s, --saves DİZİN\tOyunları DİZİN'e kaydet\n"
-#: server/civserver.c:241
+#: server/civserver.c:246
msgid " -S, --Serverid ID\tSets the server id to ID\n"
msgstr " -S, --Serverid KÄ°MLÄ°K\tsunucunun kimliÄŸini KÄ°MLÄ°K yap\n"
-#: server/civserver.c:243
+#: server/civserver.c:248
msgid " -P, --Ppm\t\tSave ppms of the map when saving the game.\n"
msgstr " -P, --Ppm\t\tOyunu kaydederken haritanın ppmlerini de kaydet.\n"
-#: server/civserver.c:244
+#: server/civserver.c:249
msgid " -r, --read FILE\tRead startup script FILE\n"
msgstr " -r, --read DOSYA\tBaşlama betiği olarak DOSYA'yı oku\n"
-#: server/civserver.c:246
+#: server/civserver.c:251
msgid " -R, --Ranklog FILE\tUse FILE as ranking logfile\n"
msgstr " -R, --Ranklog DOSYA\tDOSYA'yı derece kaydını tutmada kullan\n"
-#: server/civserver.c:247 client/civclient.c:268 manual/civmanual.c:383
+#: server/civserver.c:252 client/civclient.c:269 manual/civmanual.c:383
msgid " -v, --version\t\tPrint the version number\n"
msgstr " -v, --version\t\tSürüm numarasını yazdır\n"
-#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
+#: server/civserver.c:253 client/gui-gtk-2.0/gui_main.c:354
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, c-format
msgid "Report bugs at %s.\n"
msgstr "Hataları %s adresine bildiriniz.\n"
-#: server/commands.c:28
+#: server/commands.c:29
msgid "Start the game, or restart after loading a savegame."
msgstr "Oyunu başlat veya kayıtlı bir oyunu yükleyip baştan başlat"
-#: server/commands.c:29
+#: server/commands.c:30
msgid ""
"This command starts the game. When starting a new game, it should be used "
"after all human players have connected, and AI players have been created (if "
@@ -2115,7 +2121,7 @@ msgstr ""
"hiçbir etkisi olmayacağı için kullanımdan kalkacaktır."
#. TRANS: translate text between <> only
-#: server/commands.c:42
+#: server/commands.c:44
msgid ""
"help\n"
"help commands\n"
@@ -2129,11 +2135,11 @@ msgstr ""
"help <komut-adı>\n"
"help <ayar-adı>"
-#: server/commands.c:47
+#: server/commands.c:49
msgid "Show help about server commands and server options."
msgstr "Sunucu komutları ve seçenekleri hakkında yardım göster."
-#: server/commands.c:48
+#: server/commands.c:50
msgid ""
"With no arguments gives some introductory help. With argument \"commands\" "
"or \"options\" gives respectively a list of all commands or all options. "
@@ -2149,12 +2155,12 @@ msgstr ""
"başlayan başka komut yoksa parametre olarak ilk birkaç harfini vermek "
"yeterlidir."
-#: server/commands.c:63
+#: server/commands.c:66
msgid "Show a list of players, teams, connections, or scenarios."
msgstr ""
"Oyuncuların, takımların bağlantıların veya senaryoların bir listesini ver."
-#: server/commands.c:64
+#: server/commands.c:67
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 "
@@ -2164,20 +2170,20 @@ msgstr ""
"Değişken kısaltılarak yazılabilir, verilmediğinde 'players' girilmiş olarak "
"kabul edilir."
-#: server/commands.c:70
+#: server/commands.c:74
msgid "Quit the game and shutdown the server."
msgstr "Oyundan çık ve sunucuyu kapat."
#. TRANS: translate text between <> only
-#: server/commands.c:74
+#: server/commands.c:79
msgid "cut <connection-name>"
msgstr "cut <bağlantı-adı>"
-#: server/commands.c:75
+#: server/commands.c:80
msgid "Cut a client's connection to server."
msgstr "Bir istemcinin sunucuyla olan bağlantısını kes."
-#: server/commands.c:76
+#: server/commands.c:81
msgid ""
"Cut specified client's connection to the server, removing that client from "
"the game. If the game has not yet started that client's player is removed "
@@ -2189,7 +2195,7 @@ msgstr ""
"bağlantı isimleriyle çalışır."
#. TRANS: translate text between <> only
-#: server/commands.c:83
+#: server/commands.c:89
msgid ""
"explain\n"
"explain <option-name>"
@@ -2197,11 +2203,11 @@ msgstr ""
"explain\n"
"explain <tercih-adı>"
-#: server/commands.c:85
+#: server/commands.c:91
msgid "Explain server options."
msgstr "Sunucu seçeneklerini açıkla."
-#: server/commands.c:86
+#: server/commands.c:92
msgid ""
"The 'explain' command gives a subset of the functionality of 'help', and is "
"included for backward compatibility. With no arguments it gives a list of "
@@ -2214,7 +2220,7 @@ msgstr ""
"(tıpkı 'help <ayar-adı>' komutu gibi)."
#. TRANS: translate text between <> only
-#: server/commands.c:93
+#: server/commands.c:100
msgid ""
"show\n"
"show <option-name>\n"
@@ -2224,11 +2230,11 @@ msgstr ""
"show <ayar-adı>\n"
"show <ayar-öneki>"
-#: server/commands.c:96
+#: server/commands.c:103
msgid "Show server options."
msgstr "Sunucu ayarlarını göster."
-#: server/commands.c:97
+#: server/commands.c:104
msgid ""
"With no arguments, shows all server options (or available options, when used "
"by clients). With an argument, show only the named option, or options with "
@@ -2238,36 +2244,37 @@ msgstr ""
"mümkün olanları). Parametre verilirse o parametreyle başlayan ayarlar "
"hakkında bilgi verir."
-#: server/commands.c:102
+#: server/commands.c:110
msgid "wall <message>"
msgstr "wall <mesaj>"
-#: server/commands.c:103
+#: server/commands.c:111
msgid "Send message to all connections."
msgstr "Bütün bağlantılara mesaj gönder."
-#: server/commands.c:104
+#: server/commands.c:112
msgid ""
"For each connected client, pops up a window showing the message entered."
msgstr "Bağlı olan her istemcide bu mesajı içeren bir pencere gösterir."
-#: server/commands.c:108
+#: server/commands.c:117
msgid "vote yes|no [vote number]"
msgstr "vote yes|no [oy numarası]"
-#: server/commands.c:109
+#: server/commands.c:118
msgid "Cast a vote."
msgstr "Oy ver."
-#: server/commands.c:111
+#: server/commands.c:120
#, 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."
+"A player with basic 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."
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 "
@@ -2278,7 +2285,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:121
+#: server/commands.c:131
msgid ""
"debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
"<player> | timing | info]"
@@ -2286,11 +2293,11 @@ msgstr ""
"debug [ player <oyuncu> | city <x> <y> | units <x> <y> | unit <tanım no> | "
"tech <oyuncu> | timing | info]"
-#: server/commands.c:123
+#: server/commands.c:133
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:124
+#: server/commands.c:134
msgid ""
"Print AI debug information about given entity and turn continous debugging "
"output for this entity on or off."
@@ -2298,23 +2305,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:128
+#: server/commands.c:139
msgid "set <option-name> <value>"
msgstr "set <ayar-adı> <değer>"
-#: server/commands.c:129
+#: server/commands.c:140
msgid "Set server option."
msgstr "Sunucu tercihini ayarla."
-#: server/commands.c:132
+#: server/commands.c:144
msgid "team <player> [team]"
msgstr "team <oyuncu> [takım]"
-#: server/commands.c:133
+#: server/commands.c:145
msgid "Change, add or remove a player's team affiliation."
msgstr "Oyuncunun takım bilgisini değiştirir."
-#: server/commands.c:134
+#: server/commands.c:146
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 "
@@ -2327,15 +2334,15 @@ msgstr ""
"elçilikler verilmiş, aynı zamanda takımın kazanması için birlikte savaşılan "
"ekiptir."
-#: server/commands.c:141
+#: server/commands.c:154
msgid "rulesetdir <directory>"
msgstr "rulesetdir <dizin>"
-#: server/commands.c:142
+#: server/commands.c:155
msgid "Choose new ruleset directory or modpack."
msgstr "Yeni bir kural seti dizini veya mod paketi seç."
-#: server/commands.c:143
+#: server/commands.c:156
msgid ""
"Choose new ruleset directory or modpack. Calling this\n"
" without any arguments will show you the currently selected ruleset."
@@ -2344,15 +2351,15 @@ msgstr ""
"hiçbir parametre olmadan verirseniz o an kullanılan kural setini gösterir."
#. TRANS: translate text between <> only
-#: server/commands.c:149
+#: server/commands.c:163
msgid "metainfo <meta-line>"
msgstr "metainfo <özet-satırı>"
-#: server/commands.c:150
+#: server/commands.c:164
msgid "Set metaserver info line."
msgstr "Metasunucu bilgi satırını ayarla."
-#: server/commands.c:151
+#: server/commands.c:165
msgid ""
"Set user defined metaserver info line. If parameter is omitted,\n"
"previously set metamessage will be removed. For most of the time\n"
@@ -2366,19 +2373,19 @@ msgstr ""
"yerine kullanılmaktadır. (mümkünse)"
#. TRANS: translate text between <> only
-#: server/commands.c:158
+#: server/commands.c:173
msgid "metapatch <meta-line>"
msgstr "metapatch <özet-satırı>"
-#: server/commands.c:159
+#: server/commands.c:174
msgid "Set metaserver patches line."
msgstr "Metasunucu yama satırını ayarla."
-#: server/commands.c:165
+#: server/commands.c:181
msgid "Control metaserver connection."
msgstr "Metasunucu bağlantısını yönet."
-#: server/commands.c:166
+#: server/commands.c:182
msgid ""
"'metaconnection ?' reports on the status of the connection to metaserver.\n"
"'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2391,33 +2398,33 @@ msgstr ""
"belirtir."
#. TRANS: translate text between <> only
-#: server/commands.c:172
+#: server/commands.c:189
msgid "metaserver <address>"
msgstr "metaserver <adres>"
-#: server/commands.c:173
+#: server/commands.c:190
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:177
+#: server/commands.c:195
msgid "aitoggle <player-name>"
msgstr "aitoggle <oyuncu-adı>"
-#: server/commands.c:178
+#: server/commands.c:196
msgid "Toggle AI status of player."
msgstr "Oyuncunun YZ durumunu deÄŸiÅŸtir."
#. TRANS: translate text between [] and <> only
-#: server/commands.c:182
+#: server/commands.c:201
msgid "take [connection-name] <player-name>"
msgstr "take [bağlantı-adı] <oyuncu-adı>"
-#: server/commands.c:183
+#: server/commands.c:202
msgid "Take over a player's place in the game."
msgstr "Oyundaki bir oyuncunun yerlerini kontrol altına al."
-#: server/commands.c:184
+#: server/commands.c:203
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 "
@@ -2432,15 +2439,15 @@ msgstr ""
"oluşturulmuş ve bağlantı yapmış demektir."
#. TRANS: translate text between [] only
-#: server/commands.c:192
+#: server/commands.c:212
msgid "observe [connection-name] [player-name]"
msgstr "observe [bağlantı-adı] [oyuncu-adı]"
-#: server/commands.c:193
+#: server/commands.c:213
msgid "Observe a player or the whole game."
msgstr "Bir oyuncuyu veya bütün oyunu gözlemle."
-#: server/commands.c:194
+#: server/commands.c:214
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 "
@@ -2455,15 +2462,15 @@ msgstr ""
"küresel gözlemciye (global observer) aktarılır."
#. TRANS: translate text between <> only
-#: server/commands.c:202
+#: server/commands.c:223
msgid "detach <connection-name>"
msgstr "detach <bağlantı-adı>"
-#: server/commands.c:203
+#: server/commands.c:224
msgid "detach from a player."
msgstr "bir oyuncuyla olan bağlantıyı kopar"
-#: server/commands.c:204
+#: server/commands.c:225
msgid ""
"Only the console and connections with cmdlevel 'hack' can force other "
"connections to detach from a player."
@@ -2472,20 +2479,20 @@ msgstr ""
"ayrılmasını sağlar."
#. TRANS: translate text between <> only
-#: server/commands.c:209
+#: server/commands.c:231
msgid "create <player-name>"
msgstr "create <oyuncu-adı>"
-#: server/commands.c:210
+#: server/commands.c:232
msgid "Create an AI player with a given name."
msgstr "Verilen isimde bir YZ oyuncusu oluÅŸturur."
-#: server/commands.c:211
+#: server/commands.c:233
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:215
+#: server/commands.c:238
msgid ""
"away\n"
"away"
@@ -2493,16 +2500,16 @@ msgstr ""
"away\n"
"away"
-#: server/commands.c:217
+#: server/commands.c:240
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:218
+#: server/commands.c:241
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:222
+#: server/commands.c:246
msgid ""
"novice\n"
"novice <player-name>"
@@ -2510,11 +2517,11 @@ msgstr ""
"novice\n"
"novice <oyuncu-adı>"
-#: server/commands.c:224
+#: server/commands.c:248
msgid "Set one or all AI players to 'novice'."
msgstr "Bir ya da birden fazla YZ oyuncusunu 'acemi' seviyesine ayarla."
-#: server/commands.c:225
+#: server/commands.c:249
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 "
@@ -2525,7 +2532,7 @@ msgstr ""
"ayarlar."
#. TRANS: translate text between <> only
-#: server/commands.c:231
+#: server/commands.c:256
msgid ""
"easy\n"
"easy <player-name>"
@@ -2533,11 +2540,11 @@ msgstr ""
"easy\n"
"easy <oyuncu-adı>"
-#: server/commands.c:233
+#: server/commands.c:258
msgid "Set one or all AI players to 'easy'."
msgstr "Bir ya da tüm YZ oyuncularını 'kolay' seviyesine ayarla."
-#: server/commands.c:234
+#: server/commands.c:259
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 "
@@ -2548,7 +2555,7 @@ msgstr ""
"ayarlar."
#. TRANS: translate text between <> only
-#: server/commands.c:240
+#: server/commands.c:266
msgid ""
"normal\n"
"normal <player-name>"
@@ -2556,11 +2563,11 @@ msgstr ""
"normal\n"
"normal <oyuncu-adı>"
-#: server/commands.c:242
+#: server/commands.c:268
msgid "Set one or all AI players to 'normal'."
msgstr "Bir ya da tüm YZ oyuncularını 'normal' seviyesine ayarla."
-#: server/commands.c:243
+#: server/commands.c:269
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 "
@@ -2571,7 +2578,7 @@ msgstr ""
"ayarlar."
#. TRANS: translate text between <> only
-#: server/commands.c:249
+#: server/commands.c:276
msgid ""
"hard\n"
"hard <player-name>"
@@ -2579,11 +2586,11 @@ msgstr ""
"hard\n"
"hard <oyuncu-adı>"
-#: server/commands.c:251
+#: server/commands.c:278
msgid "Set one or all AI players to 'hard'."
msgstr "Bir ya da tüm YZ oyuncularını 'zor' seviyesine ayarla."
-#: server/commands.c:252
+#: server/commands.c:279
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 "
@@ -2594,7 +2601,7 @@ msgstr ""
"ayarlar."
#. TRANS: translate text between <> only
-#: server/commands.c:258
+#: server/commands.c:286
msgid ""
"experimental\n"
"experimental <player-name>"
@@ -2602,11 +2609,11 @@ msgstr ""
"experimental\n"
"experimental <oyuncu-adı>"
-#: server/commands.c:260
+#: server/commands.c:288
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:261
+#: server/commands.c:289
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 "
@@ -2619,7 +2626,7 @@ msgstr ""
"sunucular için etkisi yoktur."
#. TRANS: translate text between <> only
-#: server/commands.c:269
+#: server/commands.c:298
msgid ""
"cmdlevel\n"
"cmdlevel <level>\n"
@@ -2633,17 +2640,20 @@ msgstr ""
"cmdlevel <level> first\n"
"cmdlevel <level> <bağlantı-adı>"
-#: server/commands.c:274
+#: server/commands.c:303
msgid "Query or set command access level access."
msgstr "Sorgu veya ayar komut giriÅŸ seviyesi giriÅŸi."
-#: server/commands.c:275
+#: server/commands.c:304
+#, fuzzy
msgid ""
"The command access level controls which server commands are available\n"
"to users via the client chatline. The available levels are:\n"
" none - no commands\n"
-" info - informational commands only\n"
+" info - informational or observer commands only\n"
+" basic - commands available to players in the game\n"
" ctrl - commands that affect the game and users\n"
+" admin - commands that affect server operation\n"
" hack - *all* commands - dangerous!\n"
"With no arguments, the current command access levels are reported.\n"
"With a single argument, the level is set for all existing connections,\n"
@@ -2677,20 +2687,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:296
+#: server/commands.c:328
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:301
+#: server/commands.c:334
msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
msgstr "timeoutincrease <sıra> <sıra-artışı> <değer> <değer-çarpanı>"
-#: server/commands.c:302
+#: server/commands.c:335
msgid "See \"help timeoutincrease\"."
msgstr "bkz. \"help timeoutincrease\"."
-#: server/commands.c:303
+#: server/commands.c:336
msgid ""
"Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
"<turn> and multiply <value> by <valuemult>. Use this command in concert "
@@ -2701,24 +2711,43 @@ msgstr ""
"kullanın. Öntanımlı değerleri şöyledir: 0 0 0 1"
#. TRANS: translate text between <> only
-#: server/commands.c:309
+#: server/commands.c:343
+msgid ""
+"cancelvote\n"
+"cancelvote <vote number>\n"
+"cancelvote all\n"
+msgstr ""
+
+#: server/commands.c:346
+msgid "Cancel a running vote.\n"
+msgstr ""
+
+#: server/commands.c:347
+msgid ""
+"With no arguments this command removes your own vote. If you have an admin "
+"access level, you can cancel any vote by vote number, or all votes with the "
+"'all' argument."
+msgstr ""
+
+#. TRANS: translate text between <> only
+#: server/commands.c:354
msgid "endgame"
msgstr "oyunu bitir"
-#: server/commands.c:310
+#: server/commands.c:355
msgid "End the game immediately in a draw."
msgstr "Oyunu berabere olarak bitir."
#. TRANS: translate text between <> only
-#: server/commands.c:314
+#: server/commands.c:360
msgid "surrender"
msgstr "teslim olan"
-#: server/commands.c:315
+#: server/commands.c:361
msgid "Concede the game."
msgstr "Yenilgiyi kabul ederek bitir."
-#: server/commands.c:316
+#: server/commands.c:362
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."
@@ -2727,15 +2756,15 @@ msgstr ""
"teslim olursa bu durumda oyun biter."
#. TRANS: translate text between <> only
-#: server/commands.c:322
+#: server/commands.c:369
msgid "remove <player-name>"
msgstr "remove <oyuncu-adı>"
-#: server/commands.c:323
+#: server/commands.c:370
msgid "Fully remove player from game."
msgstr "Oyuncuyu tamamen sil."
-#: server/commands.c:324
+#: server/commands.c:371
msgid ""
"This *completely* removes a player from the game, including all cities and "
"units etc. Use with care!"
@@ -2744,7 +2773,7 @@ msgstr ""
"haritadan silinir. Dikkatli kullanın!"
#. TRANS: translate text between <> only
-#: server/commands.c:329
+#: server/commands.c:377
msgid ""
"save\n"
"save <file-name>"
@@ -2752,11 +2781,11 @@ msgstr ""
"save\n"
"save <dosya-adı>"
-#: server/commands.c:331
+#: server/commands.c:379
msgid "Save game to file."
msgstr "Oyunu dosyaya kaydet."
-#: server/commands.c:332
+#: server/commands.c:380
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"
@@ -2773,7 +2802,7 @@ msgstr ""
"ve bir kez tekrar bağlandığında 'start' komutunu kullanın. "
#. TRANS: translate text between <> only
-#: server/commands.c:341
+#: server/commands.c:390
msgid ""
"load\n"
"load <file-name>"
@@ -2781,11 +2810,11 @@ msgstr ""
"load\n"
"load <dosya-adı>"
-#: server/commands.c:343
+#: server/commands.c:392
msgid "Load game from file."
msgstr "Oyunu dosyadan yükle."
-#: server/commands.c:344
+#: server/commands.c:393
msgid ""
"Load a game from <file-name>. Any current data including players, rulesets "
"and server options are lost.\n"
@@ -2794,116 +2823,116 @@ msgstr ""
"setleri ve sunucu ayarları kayıtlı oyundan tekrar yüklenecektir.\n"
#. TRANS: translate text between <> only
-#: server/commands.c:349
+#: server/commands.c:399
msgid "read <file-name>"
msgstr "read <dosya-adı>"
-#: server/commands.c:350
+#: server/commands.c:400
msgid "Process server commands from file."
msgstr "Dosyadan sunucu komutlarını çalıştır."
#. TRANS: translate text between <> only
-#: server/commands.c:354
+#: server/commands.c:405
msgid "write <file-name>"
msgstr "write <dosya-adı>"
-#: server/commands.c:355
+#: server/commands.c:406
msgid "Write current settings as server commands to file."
msgstr "Şimdiki ayarları sunucu komutları olarak dosyaya yaz."
-#: server/commands.c:359
+#: server/commands.c:411
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:363
+#: server/commands.c:416
msgid "Simply returns the id of the server."
msgstr "Sunucunun tanım numarasını verir."
-#: server/connecthand.c:85
+#: server/connecthand.c:109
#, c-format
msgid "Welcome to the %s Server running at %s port %d."
msgstr "%s Sunucusuna hoş geldiniz (%s üzerindeki %d portunda çalışıyor)."
-#: server/connecthand.c:89
+#: server/connecthand.c:113
#, c-format
msgid "Welcome to the %s Server at port %d."
msgstr "%s Sunucusuna hoş geldiniz (%d portunda çalışıyor)."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:97
+#: server/connecthand.c:121
#, c-format
msgid "(%d) %s: connected [%s]"
msgstr "(%d) %s, bağlandı [%s]"
-#: server/connecthand.c:104
+#: server/connecthand.c:128
#, c-format
msgid "Server: %s has connected from %s."
msgstr "Sunucu: %s, %s adresinden bağlandı."
-#: server/connecthand.c:145
+#: server/connecthand.c:175
msgid "Couldn't attach your connection to new player."
msgstr "Bağlantınız yeni oyuncuya bağlanamadı."
-#: server/connecthand.c:165
+#: server/connecthand.c:199
#, c-format
msgid "You are logged in as '%s' connected to no player."
msgstr "'%s' olarak giriş yaptınız, başka hiçbir oyuncu yok."
-#: server/connecthand.c:169
+#: server/connecthand.c:203
#, c-format
msgid "You are logged in as '%s' connected to an anonymous player."
msgstr "'%s' olarak giriş yaptınız, anonim bir oyuncuya bağlısınız."
-#: server/connecthand.c:174
+#: server/connecthand.c:208
#, c-format
msgid "You are logged in as '%s' connected to %s."
msgstr "'%s' olarak giriş yaptınız, %s oyuncusuna bağlısınız."
-#: server/connecthand.c:187
+#: server/connecthand.c:221
#, c-format
msgid "Turn-blocking game play: waiting on %s to finish turn..."
msgstr "Sıra tabanlı oyun: %s oyuncusunun sırasını geçirmesi bekleniyor..."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:240
+#: server/connecthand.c:274
#, c-format
msgid "(%d) %s: connection request [%s]"
msgstr "(%d) %s: bağlantı isteği [%s]"
-#: server/connecthand.c:266
+#: server/connecthand.c:300
msgid "The client is missing a capability that this server needs."
msgstr "Ä°stemci, sunucunun gerektirdiÄŸi bir yeteneÄŸe sahip deÄŸil."
-#: server/connecthand.c:268 server/connecthand.c:279
+#: server/connecthand.c:302 server/connecthand.c:313
#, c-format
msgid "(%d) %s rejected: mismatched capabilities!"
msgstr "(%d) %s reddedildi: yetenekler uyuÅŸmuyor!"
-#: server/connecthand.c:277
+#: server/connecthand.c:311
msgid "This server is missing a capability that the client needs."
msgstr "Sunucu, istemcinin gerektirdiÄŸi bir yeteneÄŸe sahip deÄŸil."
-#: server/connecthand.c:290
+#: server/connecthand.c:324
msgid "The username is invalid!"
msgstr "Kullanıcı adı geçersiz!"
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:292
+#: server/connecthand.c:326
#, c-format
msgid "(%d) %s rejected: invalid username [%s]"
msgstr "(%d) %s reddedildi: geçersiz isim [%s]."
-#: server/connecthand.c:303
+#: server/connecthand.c:337
msgid "Your username is already connected!"
msgstr "Sizin kullanıcı adınız zaten bağlı!"
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:305
+#: server/connecthand.c:339
#, c-format
msgid "(%d) %s rejected: duplicate username [%s]"
msgstr "(%d) %s reddedildi: tekrarlanan giriş adı [%s]."
-#: server/connecthand.c:335 server/connecthand.c:344
+#: server/connecthand.c:369 server/connecthand.c:378
#, c-format
msgid "Lost connection: %s."
msgstr "Bağlantı kesildi: %s."
@@ -2920,110 +2949,110 @@ msgstr "Tamam. Standart tarz ayarlandı"
msgid "For introductory help, type 'help'."
msgstr "Tanıtıcı yardım için 'help' yazın."
-#: server/diplhand.c:164
+#: server/diplhand.c:167
#, c-format
msgid "The %s can't accept %s."
msgstr "%s, %s kabul etmiyor."
-#: server/diplhand.c:176
+#: server/diplhand.c:179
#, c-format
msgid "You don't have tech %s, you can't accept treaty."
msgstr "%s teknolojiniz yok, antlaşma imzalayamazsınız."
-#: server/diplhand.c:185
+#: server/diplhand.c:188
msgid "City you are trying to give no longer exists, you can't accept treaty."
msgstr "Vermek istediğiniz şehir artık yok, antlaşmayı imzalayamazsınız."
-#: server/diplhand.c:191
+#: server/diplhand.c:194
#, c-format
msgid "You are not owner of %s, you can't accept treaty."
msgstr "%s şehrinin sahibi değilsiniz, antlaşmayı imzalayamazsınız."
-#: server/diplhand.c:197 server/diplhand.c:301
+#: server/diplhand.c:200 server/diplhand.c:304
#, c-format
msgid "Your capital (%s) is requested, you can't accept treaty."
msgstr "Başkentiniz (%s) isteniyor, antlaşmayı imzalayamazsınız."
-#: server/diplhand.c:224
+#: server/diplhand.c:227
msgid "You don't have enough gold, you can't accept treaty."
msgstr "Yeterli altınınız yok, antlaşmayı imzalayamazsınız."
-#: server/diplhand.c:256 server/diplhand.c:261
+#: server/diplhand.c:259 server/diplhand.c:264
#, c-format
msgid "A treaty containing %d clause was agreed upon."
msgid_plural "A treaty containing %d clauses was agreed upon."
msgstr[0] "%d maddeden oluşan bir antlaşma imzalandı."
-#: server/diplhand.c:277 server/diplhand.c:281
+#: server/diplhand.c:280 server/diplhand.c:284
#, c-format
msgid "One of the cities the %s are giving away is destroyed! Treaty canceled!"
msgstr ""
"%s tarafından verilen şehirlerden biri yıkılmış! Antlaşma iptal edildi!"
-#: server/diplhand.c:288 server/diplhand.c:293
+#: server/diplhand.c:291 server/diplhand.c:296
#, c-format
msgid "The %s no longer control %s! Treaty canceled!"
msgstr "%s artık %s şehrine sahip değil! Antlaşma iptal edildi!"
-#: server/diplhand.c:331 server/diplhand.c:335
+#: server/diplhand.c:334 server/diplhand.c:338
#, c-format
msgid "The %s don't have the promised amount of gold! Treaty canceled!"
msgstr "%s söz verdikleri kadar altına sahip değiller! Antlaşma iptal edildi!"
-#: server/diplhand.c:364
+#: server/diplhand.c:367
#, c-format
msgid "You gave an embassy to %s."
msgstr "%s tarafına elçilik verdiniz."
-#: server/diplhand.c:367
+#: server/diplhand.c:370
#, c-format
msgid "%s allowed you to create an embassy!"
msgstr "%s elçilik kurmanıza izin verdiler!"
-#: server/diplhand.c:383
+#: server/diplhand.c:386
#, c-format
msgid "You are taught the knowledge of %s."
msgstr "%s teknolojisini öğrendiniz."
-#: server/diplhand.c:387
+#: server/diplhand.c:390
#, c-format
msgid "The %s have acquired %s from the %s."
msgstr "%s, %s teknolojisini %s tarafından öğrendi."
-#: server/diplhand.c:402
+#: server/diplhand.c:405
#, c-format
msgid "You get %d gold."
msgstr "%d altın aldınız."
#. TRANS: ... Polish worldmap.
-#: server/diplhand.c:410
+#: server/diplhand.c:413
#, c-format
msgid "You receive the %s worldmap."
msgstr "%s dünya haritasını aldınız."
#. TRANS: ... Polish seamap.
-#: server/diplhand.c:419
+#: server/diplhand.c:422
#, c-format
msgid "You receive the %s seamap."
msgstr "%s deniz haritasını aldınız."
-#: server/diplhand.c:436
+#: server/diplhand.c:439
#, c-format
msgid "You receive city of %s from %s."
msgstr "%s şehrini %s tarafından aldınız."
-#: server/diplhand.c:441
+#: server/diplhand.c:444
#, c-format
msgid "You give city of %s to %s."
msgstr "%s şehrini %s tarafına verdiniz."
-#: server/diplhand.c:454 server/diplhand.c:457
+#: server/diplhand.c:457 server/diplhand.c:460
#, c-format
msgid "You agree on a cease-fire with %s."
msgstr "%s ile ateşkes imzalandı."
#. TRANS: ... the Poles ... Polish territory.
-#: server/diplhand.c:476 server/diplhand.c:488
+#: server/diplhand.c:479 server/diplhand.c:491
#, c-format
msgid ""
"You agree on an armistice with the %s. In %d turn, it will become a peace "
@@ -3035,32 +3064,32 @@ msgstr[0] ""
"%s ile mütareke imzaladınız. %d sıra sonra barış antlaşmasına dönüşecek. "
"Birimlerinizi %s sınırları dışına çıkarmalısınız."
-#: server/diplhand.c:512 server/diplhand.c:515
+#: server/diplhand.c:515 server/diplhand.c:518
#, c-format
msgid "You agree on an alliance with %s."
msgstr "%s ile ittifak kabul ettiniz."
-#: server/diplhand.c:524
+#: server/diplhand.c:527
#, c-format
msgid "You give shared vision to %s."
msgstr "%s ile görüş sahanı paylaşıyorsunuz."
-#: server/diplhand.c:527
+#: server/diplhand.c:530
#, c-format
msgid "%s gives you shared vision."
msgstr "%s sizinle görüş sahasını paylaşıyor."
-#: server/diplhand.c:663
+#: server/diplhand.c:666
#, c-format
msgid "%s canceled the meeting!"
msgstr "%s buluşmayı iptal etti!"
-#: server/diplhand.c:670
+#: server/diplhand.c:673
#, c-format
msgid "Meeting with %s canceled."
msgstr "%s ile buluÅŸma iptal edildi."
-#: server/diplhand.c:712
+#: server/diplhand.c:715
msgid "Your diplomatic envoy was decapitated!"
msgstr "Elçinizin kellesi uçuruldu!"
@@ -3249,81 +3278,81 @@ msgid "The %s destroyed the %s in %s."
msgstr "%1$s, %3$s şehrindeki %2$s yapısını yıktı."
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1091
+#: server/diplomats.c:1097
#, c-format
msgid "An enemy %s has been eliminated by your %s."
msgstr "Düşmana %s birimi, %s biriminize yenildi."
#. TRANS: <unit> ... <city> ... <diplomat>
-#: server/diplomats.c:1098
+#: server/diplomats.c:1104
#, c-format
msgid "Your %s has been eliminated defending %s against a %s."
msgstr "%s biriminiz %s şehrini savunurken bir %s tarafından öldürüldü."
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1106
+#: server/diplomats.c:1112
#, c-format
msgid "Your %s has been eliminated defending against a %s."
msgstr "%s biriminiz savunmadayken bir %s tarafından öldürüldü."
-#: server/diplomats.c:1119
+#: server/diplomats.c:1125
#, c-format
msgid "Your %s was eliminated by a defending %s."
msgstr "%s biriminiz, savunma yapan bir %s tarafından öldürüldü."
-#: server/diplomats.c:1127
+#: server/diplomats.c:1133
#, c-format
msgid "Eliminated %s %s while infiltrating %s."
msgstr "%s %s, %s şehrine sızarken yakalandı."
-#: server/diplomats.c:1134
+#: server/diplomats.c:1140
#, c-format
msgid "Eliminated %s %s while infiltrating our troops."
msgstr "%s %s birimlerimizin arasına sızarken yakalandı."
-#: server/diplomats.c:1185
+#: server/diplomats.c:1191
#, c-format
msgid ""
"Your %s has successfully completed the mission and returned unharmed to %s."
msgstr ""
"%s biriminiz görevi başarıyla tamamlayıp %s şehrine yara almadan döndü."
-#: server/diplomats.c:1204
+#: server/diplomats.c:1210
#, c-format
msgid "Your %s was captured after completing the mission in %s."
msgstr "%s biriminiz %s şehrinde görevi bitirdikten sonra yakalandı."
-#: server/diplomats.c:1210
+#: server/diplomats.c:1216
#, c-format
msgid "Your %s was captured after completing the mission."
msgstr "%s biriminiz görevi bitirdikten sonra yakalandı."
-#: server/diplomats.c:1242
+#: server/diplomats.c:1248
#, c-format
msgid "You have caused an incident while bribing the %s %s."
msgstr "%s %s birimine rüşvet verilirken bir skandala sebep oldunuz."
-#: server/diplomats.c:1247
+#: server/diplomats.c:1253
#, c-format
msgid "%s has caused an incident while bribing your %s."
msgstr "%s, %s biriminize rüşvet verirken bir skandal yaşandı."
-#: server/diplomats.c:1254
+#: server/diplomats.c:1260
#, c-format
msgid "You have caused an incident while attempting to steal tech from %s."
msgstr "%s tarafından bir teknoloji çalarken skandala sebep oldunuz."
-#: server/diplomats.c:1258
+#: server/diplomats.c:1264
#, c-format
msgid "%s has caused an incident while attempting to steal tech from you."
msgstr "%s, sizden bir teknoloji çalarken skandala sebep oldular."
-#: server/diplomats.c:1264
+#: server/diplomats.c:1270
#, c-format
msgid "You have caused an incident while inciting a revolt in %s."
msgstr "%s şehrinde ayaklanma başlatırken bir skandala sebep oldunuz."
-#: server/diplomats.c:1268
+#: server/diplomats.c:1274
#, c-format
msgid "%s have caused an incident while inciting a revolt in %s."
msgstr "%s, %s şehrinde ayaklanma başlatırken bir skandala sebep oldular."
@@ -3436,12 +3465,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:1418
+#: server/maphand.c:1425
#, 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:1436
+#: server/maphand.c:1443
#, 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."
@@ -3450,7 +3479,7 @@ msgstr "%s, bulunduğu arazinin türü değiştiği için terhis edildi."
msgid "Not reporting to the metaserver in this game."
msgstr "Bu oyunda metasunucuya rapor verilmiyor."
-#: server/meta.c:430
+#: server/meta.c:432
#, c-format
msgid "Metaserver: bad address: [%s:%d]."
msgstr "Metasunucu: kötü adres: [%s:%d]."
@@ -3573,26 +3602,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:1103
+#: server/plrhand.c:1115
#, c-format
msgid "Removing player %s."
msgstr "Oyuncu %s siliniyor."
-#: server/plrhand.c:1105
+#: server/plrhand.c:1117
msgid "You've been removed from the game!"
msgstr "Oyundan silindiniz!"
-#: server/plrhand.c:1108
+#: server/plrhand.c:1120
#, c-format
msgid "%s has been removed from the game."
msgstr "%s oyundan silindi."
-#: server/plrhand.c:1153 server/plrhand.c:1158
+#: server/plrhand.c:1167 server/plrhand.c:1172
#, 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:1178
+#: server/plrhand.c:1192
#, c-format
msgid ""
"%s and %s meet and go to instant war. You cancel your alliance with both."
@@ -3600,17 +3629,17 @@ msgstr ""
"%s ve %s karşılaştıkları anda savaşa başladılar. İkisiyle olan ittifakınız "
"bozuldu."
-#: server/plrhand.c:1656
+#: server/plrhand.c:1670
#, 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:1663
+#: server/plrhand.c:1677
#, 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:1686
+#: server/plrhand.c:1700
#, fuzzy, c-format
msgid ""
"Your nation is thrust into civil war! %s is declared the leader of the rebel "
@@ -3619,12 +3648,12 @@ msgstr ""
"Ulusunuzda bir iç savaş yaşandı, %s şehri bölünen tarafın başkenti ilan "
"edildi."
-#: server/plrhand.c:1707
+#: server/plrhand.c:1721
#, c-format
msgid "%s declares allegiance to %s."
msgstr "%s, %s ile müttefik oldu."
-#: server/plrhand.c:1722
+#: server/plrhand.c:1736
#, c-format
msgid ""
"Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3815,65 +3844,65 @@ msgstr "(%s, %s ÅŸehrinde inÅŸa ediliyor (%s))\n"
msgid "Wonders of the World"
msgstr "Dünyanın Harikaları"
-#: server/report.c:547
+#: server/report.c:552
msgid " sq. mi."
msgstr " milkare"
-#: server/report.c:557
+#: server/report.c:562
msgid " M tons"
msgstr " M ton"
-#: server/report.c:562
+#: server/report.c:567
msgid " M goods"
msgstr " M eÅŸya"
-#: server/report.c:567
+#: server/report.c:572
msgid " bulbs"
msgstr " puan"
-#: server/report.c:572
+#: server/report.c:577
msgid " month"
msgid_plural " months"
msgstr[0] " ay"
-#: server/report.c:577
+#: server/report.c:582
msgid " ton"
msgid_plural " tons"
msgstr[0] " ton"
-#: server/report.c:591
+#: server/report.c:596
msgid "st"
msgstr "."
-#: server/report.c:593
+#: server/report.c:598
msgid "nd"
msgstr "."
-#: server/report.c:595
+#: server/report.c:600
msgid "rd"
msgstr "."
-#: server/report.c:597
+#: server/report.c:602
msgid "th"
msgstr "."
-#: server/report.c:700
+#: server/report.c:705
msgid "Demography string contains invalid characters. Try \"help demography\"."
msgstr ""
"İstatistik dizgesi geçersiz karakterler içeriyor. \"help demography\" "
"komutunu deneyin."
-#: server/report.c:743 server/report.c:768
+#: server/report.c:748 server/report.c:773
msgid "Demographics Report:"
msgstr "Ä°statistikler:"
-#: server/report.c:744
+#: server/report.c:749
msgid "Sorry, the Demographics report is unavailable."
msgstr "Üzgünüm, istatistik çıkaramıyoruz."
#. TRANS: <nation adjective> <government name> (<year>).
#. * E.g. "Polish Despotism (200 AD)".
-#: server/report.c:750
+#: server/report.c:755
#, fuzzy, c-format
msgid "%s %s (%s)"
msgstr "%s %s ÅŸehrinde (%s)\n"
@@ -3884,11 +3913,11 @@ msgstr "%s %s ÅŸehrinde (%s)\n"
msgid "Could not find a readable \"%s.%s\" ruleset file."
msgstr "Okunabilir bir \"%s.%s\" kural seti dosyası bulunamadı."
-#: server/ruleset.c:2356
+#: server/ruleset.c:2366
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:3166
+#: server/ruleset.c:3178
msgid "Loading rulesets"
msgstr "Kural seti yükleniyor"
@@ -3903,19 +3932,19 @@ msgstr ""
"oyunlar, veya geçersiz kayıt edilmiş oyun sebebiyle olabilir. Riski göze "
"alma sorumluluÄŸu size aittir."
-#: server/savegame.c:3588
+#: server/savegame.c:3587
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."
#. TRANS: Fatal error message.
-#: server/savegame.c:3815
+#: server/savegame.c:3817
msgid ""
"Saved game uses the \"classic\" terrain ruleset, and is no longer supported."
msgstr ""
"Bu kayıtlı oyun artık desteklenmeyen \"klasik\" arazi kural setini "
"kullanıyor."
-#: server/savegame.c:3824
+#: server/savegame.c:3826
#, c-format
msgid ""
"Warning: Different rulesetdirs ('%s' and '%s') are no longer supported. "
@@ -3925,7 +3954,7 @@ msgstr ""
"desteklenmemektedir. '%s' kullanılmaktadır."
#. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4051
+#: server/savegame.c:4055
#, c-format
msgid "%s had invalid nation; changing to %s."
msgstr "%s geçersiz bir millete sahip; %s olarak değiştiriliyor."
@@ -3958,7 +3987,7 @@ msgstr "GeliÅŸmiÅŸ"
msgid "Networking"
msgstr "AÄŸ"
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:734
#: client/gui-win32/dialogs.c:532
msgid "All"
msgstr "Hepsi"
@@ -5110,11 +5139,11 @@ msgstr ""
"\"civscore.log\" dosyasına eklenecektir. Bu istatistikler oyundan sonra güç "
"grafiğini oluşturmak için kullanılabilir."
-#: server/sernet.c:150
+#: server/sernet.c:151
msgid "Server cannot read standard input. Ignoring input."
msgstr "Sunucu standart girdileri okuyamaz. Girdileri deÄŸerlendirmiyor."
-#: server/sernet.c:929
+#: server/sernet.c:933
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr "Sunucu: geçersiz adres: [%s:%d]."
@@ -5190,47 +5219,47 @@ msgid "Without guidance from the capital, the %s spaceship is lost!"
msgstr ""
"Başkentin yönlendirmesi olmadığı için %s tarafının uzay gemisi kayboldu."
-#: server/srv_main.c:240
+#: server/srv_main.c:242
msgid "Game ended in a draw as end year exceeded"
msgstr "Bitiş yılına geldik ve oyun berabere bitti"
-#: server/srv_main.c:274
+#: server/srv_main.c:276
#, c-format
msgid "The %s spaceship has arrived at Alpha Centauri."
msgstr "%s uzay gemisi Alpha Centauri'ye vardı."
-#: server/srv_main.c:287 server/srv_main.c:322
+#: server/srv_main.c:289 server/srv_main.c:324
#, c-format
msgid "Team victory to %s"
msgstr "Kazanan takım: %s"
-#: server/srv_main.c:297 server/srv_main.c:338
+#: server/srv_main.c:299 server/srv_main.c:340
#, c-format
msgid "Game ended in victory for %s"
msgstr "%s oyunu kazandı"
-#: server/srv_main.c:345
+#: server/srv_main.c:347
msgid "Game ended in a draw"
msgstr "Oyun berabere bitti"
-#: server/srv_main.c:461 server/srv_main.c:472
+#: server/srv_main.c:465 server/srv_main.c:476
#, c-format
msgid "Your %s was disbanded in accordance with your peace treaty with the %s."
msgstr "%s biriminiz; %s ile olan barış antlaşmanız gereğince terhis edildi."
-#: server/srv_main.c:512 server/srv_main.c:516
+#: server/srv_main.c:516 server/srv_main.c:520
#, c-format
msgid ""
"Concerned citizens point out that the cease-fire with %s will run out soon."
msgstr ""
"Vatandaşlarınız %s ile olan ateşkesin bitmek üzere olmasından endişe duyuyor."
-#: server/srv_main.c:521 server/srv_main.c:525
+#: server/srv_main.c:525 server/srv_main.c:529
#, c-format
msgid "The cease-fire with %s has run out. You are now at war with the %s."
msgstr "%s ile olan ateşkesin süresi doldu. Artık %s ile savaştasınız."
-#: server/srv_main.c:542
+#: server/srv_main.c:546
#, c-format
msgid ""
"Ceasefire between %s and %s has run out. They are at war. You cancel your "
@@ -5239,778 +5268,830 @@ msgstr ""
"%s ve %s arasındaki ateşkes bitti. Artık savaştalar. İkisiyle olan "
"ittifakınız iptal edildi."
-#: server/srv_main.c:961
+#: server/srv_main.c:997
#, c-format
msgid "Failed saving game as %s"
msgstr "Oyun %s olarak kaydedilemedi"
-#: server/srv_main.c:963
+#: server/srv_main.c:999
#, c-format
msgid "Game saved as %s"
msgstr "Oyun %s olarak kaydedildi"
-#: server/srv_main.c:994
+#: server/srv_main.c:1030
msgid "The game is already running."
msgstr "Oyun zaten başladı."
-#: server/srv_main.c:1002
+#: server/srv_main.c:1038
#, c-format
msgid "%s lost control cmdlevel on game start. Use voting from now on."
msgstr ""
-#: server/srv_main.c:1009
+#: server/srv_main.c:1045
msgid "Starting game."
msgstr "Oyun başlıyor."
-#: server/srv_main.c:1071
+#: server/srv_main.c:1112
#, c-format
msgid "request for unknown report (type %d)"
msgstr ""
-#: server/srv_main.c:1136
+#: server/srv_main.c:1177
#, c-format
msgid "Warning: rejecting old client %s"
msgstr "Uyarı: eski istemci %s reddedildi"
-#: server/srv_main.c:1238
+#: server/srv_main.c:1279
#, c-format
msgid "Got a packet of type %d from a dead or observer player"
msgstr ""
-#: server/srv_main.c:1338
+#: server/srv_main.c:1381
msgid "Please choose a non-blank name."
msgstr "Lütfen boş olmayan bir isim seçin."
-#: server/srv_main.c:1354
+#: server/srv_main.c:1397
msgid "That nation is already in use."
msgstr "Bu ulusu başkası almış."
-#: server/srv_main.c:1370
+#: server/srv_main.c:1413
#, 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:1391
+#: server/srv_main.c:1434
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:1490
+#: server/srv_main.c:1533
#, c-format
msgid "%s nation is not available in this scenario."
msgstr "Bu senaryoda %s ulusu yok."
-#: server/srv_main.c:1496
+#: server/srv_main.c:1539
#, c-format
msgid "%s nation is already in use."
msgstr "%s ulusunu başkası almış."
-#: server/srv_main.c:1514
+#: server/srv_main.c:1557
#, c-format
msgid "%s is the %s ruler %s."
msgstr "%s, %s ulusunun önderi %s."
-#: server/srv_main.c:1570
+#: server/srv_main.c:1613
#, 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:1614 server/srv_main.c:1618
+#: server/srv_main.c:1657 server/srv_main.c:1661
#, 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:1760
+#: server/srv_main.c:1803
#, c-format
msgid "Player %d"
msgstr "Oyuncu %d"
-#: server/srv_main.c:1771 server/srv_main.c:1777
+#: server/srv_main.c:1814 server/srv_main.c:1820
#, c-format
msgid "%s rules the %s."
msgstr "%2$s tarafına %1$s hükmediyor."
-#: server/srv_main.c:1942
+#: server/srv_main.c:1985
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
msgstr ""
-#: server/srv_main.c:1993
+#: server/srv_main.c:2037
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr "Bilgiler metasunucuya gönderiliyor [%s]"
-#: server/srv_main.c:2024
+#: server/srv_main.c:2069
msgid "The game is over..."
msgstr "Oyun bitti..."
-#: server/srv_main.c:2237
+#: server/srv_main.c:2286
msgid "Now accepting new client connections."
msgstr "Yeni istemcilerin bağlantıları kabul ediliyor."
-#: server/stdinhand.c:246
-#, c-format
-msgid "Vote \"%s\" is passed %d to %d with %d abstentions."
-msgstr ""
-
-#: server/stdinhand.c:253
-#, c-format
-msgid "Vote \"%s\" failed with %d against, %d for and %d abstentions."
-msgstr ""
-
#. TRANS: ambiguous command
-#: server/stdinhand.c:365
+#: server/stdinhand.c:284
msgid "(ambiguous)"
msgstr "(ikianlamlı)"
#. TRANS: unrecognized command
#. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:416
+#: server/stdinhand.c:287 client/citydlg_common.c:419
#: 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 "(bilinmeyen)"
-#: server/stdinhand.c:458
+#: server/stdinhand.c:377
msgid "Name is empty, so cannot be a player."
msgstr "Ä°sim boÅŸ, o zaman oyuncu olamaz."
-#: server/stdinhand.c:462
+#: server/stdinhand.c:381
msgid "Name is too long, so cannot be a player."
msgstr "İsim çok uzun, o zaman oyuncu olamaz."
-#: server/stdinhand.c:466
+#: server/stdinhand.c:385
#, c-format
msgid "Player name prefix '%s' is ambiguous."
msgstr ""
-#: server/stdinhand.c:470
+#: server/stdinhand.c:389
#, c-format
msgid "No player by the name of '%s'."
msgstr "'%s' isimli bir oyuncu yok."
-#: server/stdinhand.c:474 server/stdinhand.c:509
+#: server/stdinhand.c:393 server/stdinhand.c:428
#, c-format
msgid "Unexpected match_result %d (%s) for '%s'."
msgstr ""
-#: server/stdinhand.c:493
+#: server/stdinhand.c:412
msgid "Name is empty, so cannot be a connection."
msgstr "İsim boş olduğu için bağlantı kurulamaz."
-#: server/stdinhand.c:497
+#: server/stdinhand.c:416
msgid "Name is too long, so cannot be a connection."
msgstr "İsim çok uzun olduğu için bağlantı kurulamaz."
-#: server/stdinhand.c:501
+#: server/stdinhand.c:420
#, c-format
msgid "Connection name prefix '%s' is ambiguous."
msgstr ""
-#: server/stdinhand.c:505
+#: server/stdinhand.c:424
#, c-format
msgid "No connection by the name of '%s'."
msgstr ""
-#: server/stdinhand.c:525
+#: server/stdinhand.c:444
#, c-format
msgid "Open metaserver connection to [%s]."
msgstr "[%s] metasunucusuna baÄŸlan."
-#: server/stdinhand.c:538
+#: server/stdinhand.c:457
#, c-format
msgid "Close metaserver connection to [%s]."
msgstr "[%s] ile olan metasunucu bağlantısını kes."
-#: server/stdinhand.c:553
+#: server/stdinhand.c:472
msgid "Metaserver connection is open."
msgstr "Metasunucu bağlantısı açık."
-#: server/stdinhand.c:556
+#: server/stdinhand.c:475
msgid "Metaserver connection is closed."
msgstr "Metasunucu bağlantısı kapalı."
-#: server/stdinhand.c:566
+#: server/stdinhand.c:485
msgid "Metaserver connection is already open."
msgstr "Metasunucu bağlantısı zaten açık."
-#: server/stdinhand.c:577
+#: server/stdinhand.c:496
msgid "Metaserver connection is already closed."
msgstr "Metasunucu bağlantısı zaten kapalı."
-#: server/stdinhand.c:582
+#: server/stdinhand.c:501
msgid "Argument must be 'u', 'up', 'd', 'down', or '?'."
msgstr "Argüman şunlardan biri olmalıdır: 'u', 'up', 'd', 'down', '?'."
-#: server/stdinhand.c:603
+#: server/stdinhand.c:522
#, c-format
msgid "Metaserver patches string set to '%s'."
msgstr ""
-#: server/stdinhand.c:606
+#: server/stdinhand.c:525
#, c-format
msgid "Metaserver patches string set to '%s', not reporting to metaserver."
msgstr ""
-#: server/stdinhand.c:627
+#: server/stdinhand.c:546
#, c-format
msgid "Metaserver message string set to '%s'."
msgstr ""
-#: server/stdinhand.c:630
+#: server/stdinhand.c:549
#, c-format
msgid "Metaserver message string set to '%s', not reporting to metaserver."
msgstr ""
-#: server/stdinhand.c:650
+#: server/stdinhand.c:569
#, c-format
msgid "Metaserver is now [%s]."
msgstr "Metasunucu artık [%s]."
-#: server/stdinhand.c:660
+#: server/stdinhand.c:579
#, c-format
msgid "Server id: %s"
msgstr "Server id: %s"
-#: server/stdinhand.c:757
+#: server/stdinhand.c:676
msgid "You cannot save games manually on this server."
msgstr "Bu sunucuda elle oyun kaydedemezsiniz."
-#: server/stdinhand.c:774
+#: server/stdinhand.c:693
msgid "Cannot toggle a barbarian player."
msgstr "Barbara dönüştürülemez."
-#: server/stdinhand.c:781
+#: server/stdinhand.c:700
#, c-format
msgid "%s is now under AI control."
msgstr "%s artık YZ kontrolünde."
-#: server/stdinhand.c:802
+#: server/stdinhand.c:721
#, c-format
msgid "%s is now under human control."
msgstr "%s artık insan kontrolünde."
-#: server/stdinhand.c:847
+#: server/stdinhand.c:766
msgid "Can't add AI players once the game has begun."
msgstr "Oyun başladıktan sonra YZ oyuncu eklenemez."
-#: server/stdinhand.c:867
+#: server/stdinhand.c:786
msgid "Can't add more players, server is full."
msgstr "Daha fazla oyuncu eklenemez, sunucu dolu."
-#: server/stdinhand.c:874
+#: server/stdinhand.c:793
msgid "Can't use an empty name."
msgstr "Boş isim kullanılamaz."
-#: server/stdinhand.c:881
+#: server/stdinhand.c:800
#, c-format
msgid "That name exceeds the maximum of %d chars."
msgstr "İsim %d karakter sınırını aşıyor."
-#: server/stdinhand.c:887
+#: server/stdinhand.c:806
msgid "That name is not allowed."
msgstr "Ä°sime izin verilmiyor."
-#: server/stdinhand.c:893
+#: server/stdinhand.c:812
msgid "A player already exists by that name."
msgstr "Bu isimde bir oyuncu zaten var."
-#: server/stdinhand.c:899
+#: server/stdinhand.c:818
msgid "A user already exists by that name."
msgstr "Bu isimde bir kullanıcı zaten var."
-#: server/stdinhand.c:925
+#: server/stdinhand.c:844
#, c-format
msgid "%s has been added as an AI-controlled player."
msgstr "%s YZ kontrolündeki bir oyuncu olarak eklendi."
-#: server/stdinhand.c:932
+#: server/stdinhand.c:851
#, c-format
msgid "Error creating new AI player: %s."
msgstr "Yeni YZ oyuncusu oluÅŸturulurken hata: %s"
-#: server/stdinhand.c:966
+#: server/stdinhand.c:885
msgid "Players cannot be removed once the game has started."
msgstr "Oyun başladıktan sonra oyuncuları çıkartamazsınız."
-#: server/stdinhand.c:977
+#: server/stdinhand.c:896
#, c-format
msgid "Removed player %s from the game."
msgstr "Oyuncu %s oyundan çıkartıldı."
-#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
+#: server/stdinhand.c:935 server/stdinhand.c:3372 server/stdinhand.c:3507
#, c-format
msgid "Name \"%s\" disallowed for security reasons."
msgstr "\"%s\" ismi güvenlik nedeniyle yasaklanmıştır."
-#: server/stdinhand.c:1029
+#: server/stdinhand.c:948
#, c-format
msgid "No command script found by the name \"%s\"."
msgstr ""
-#: server/stdinhand.c:1037
+#: server/stdinhand.c:956
#, c-format
msgid "Loading script file: %s"
msgstr "Betik dosyası yükleniyor: %s"
-#: server/stdinhand.c:1052
+#: server/stdinhand.c:971
#, c-format
msgid "Cannot read command line scriptfile '%s'."
msgstr ""
-#: server/stdinhand.c:1054
+#: server/stdinhand.c:973
#, c-format
msgid "Could not read script file '%s'."
msgstr "Betik dosyası '%s' okunamadı."
-#: server/stdinhand.c:1146
+#: server/stdinhand.c:1065
#, c-format
msgid "Could not write script file '%s'."
msgstr ""
-#: server/stdinhand.c:1158
+#: server/stdinhand.c:1077
msgid "You cannot use the write command on this server for security reasons."
msgstr ""
-#: server/stdinhand.c:1186
+#: server/stdinhand.c:1105
#, c-format
msgid ""
"Cannot decrease command access level '%s' for connection '%s'; you only have "
"'%s'."
msgstr ""
-#: server/stdinhand.c:1241
+#: server/stdinhand.c:1114
+#, c-format
+msgid "Command access level set to '%s' for connection %s."
+msgstr ""
+
+#: server/stdinhand.c:1163
#, c-format
msgid ""
"Anyone can now become game organizer '%s' by issuing the 'first' command."
msgstr ""
-#: server/stdinhand.c:1274
+#: server/stdinhand.c:1187
msgid "Command access levels in effect:"
msgstr ""
-#: server/stdinhand.c:1282
+#: server/stdinhand.c:1194
#, c-format
msgid "Command access level for new connections: %s"
msgstr ""
-#: server/stdinhand.c:1285
+#: server/stdinhand.c:1197
#, c-format
msgid "Command access level for first player to take it: %s"
msgstr ""
-#: server/stdinhand.c:1294
+#: server/stdinhand.c:1206
msgid ""
"Error: command access level must be one of 'none', 'info', 'ctrl', or 'hack'."
msgstr ""
-#: server/stdinhand.c:1299
+#: server/stdinhand.c:1211
#, c-format
msgid ""
"Cannot increase command access level to '%s'; you only have '%s' yourself."
msgstr ""
-#: server/stdinhand.c:1326 server/stdinhand.c:1375
-#, c-format
-msgid "Command access level set to '%s' for connection %s."
-msgstr ""
-
-#: 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:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
+#: server/stdinhand.c:1238 server/stdinhand.c:1252 server/stdinhand.c:1273
#, c-format
msgid "Command access level set to '%s' for new players."
msgstr ""
-#: server/stdinhand.c:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
+#: server/stdinhand.c:1243 server/stdinhand.c:1257 server/stdinhand.c:1267
#, c-format
msgid "Command access level set to '%s' for first player to grab it."
msgstr ""
-#: server/stdinhand.c:1402
+#: server/stdinhand.c:1302
msgid "The 'first' command makes no sense from the server command line."
msgstr ""
-#: server/stdinhand.c:1406
+#: server/stdinhand.c:1306
#, c-format
msgid "You already have command access level '%s' or better."
msgstr ""
-#: server/stdinhand.c:1411
+#: server/stdinhand.c:1311
msgid "Someone else already is game organizer."
msgstr ""
-#: server/stdinhand.c:1416
+#: server/stdinhand.c:1316
#, c-format
msgid "Connection %s has opted to become the game organizer."
msgstr ""
-#: server/stdinhand.c:1467
+#: server/stdinhand.c:1367
#, c-format
msgid "Invalid argument %d."
msgstr ""
-#: server/stdinhand.c:1474
+#: server/stdinhand.c:1374
msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
msgstr ""
-#: server/stdinhand.c:1482
+#: server/stdinhand.c:1382
#, c-format
msgid "Dynamic timeout set to %d %d %d %d"
msgstr ""
-#: server/stdinhand.c:1542 server/stdinhand.c:1545
+#: server/stdinhand.c:1442 server/stdinhand.c:1445
msgid "Option:"
msgstr "Seçenek:"
-#: server/stdinhand.c:1555 server/stdinhand.c:4031
+#: server/stdinhand.c:1455 server/stdinhand.c:4079
msgid "Description:"
msgstr "Tanım:"
-#: server/stdinhand.c:1560
+#: server/stdinhand.c:1460
#, c-format
msgid "Status: %s"
msgstr "Durum: %s"
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "changeable"
msgstr "deÄŸiÅŸken"
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "fixed"
msgstr "sabit"
-#: server/stdinhand.c:1567
+#: server/stdinhand.c:1467
#, c-format
msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
msgstr "DeÄŸer: %d, Asgari: 0, Standart: %d, Azami: 1"
-#: server/stdinhand.c:1572
+#: server/stdinhand.c:1472
#, c-format
msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
msgstr "DeÄŸer: %d, Asgari: %d, Standart: %d, Azami: %d"
-#: server/stdinhand.c:1578
+#: server/stdinhand.c:1478
#, c-format
msgid "Value: \"%s\", Default: \"%s\""
msgstr "DeÄŸer: \"%s\", Standart: \"%s\""
-#: server/stdinhand.c:1597
+#: server/stdinhand.c:1497
msgid "Explanations are available for the following server options:"
msgstr ""
-#: server/stdinhand.c:1643
+#: server/stdinhand.c:1537
msgid "No explanation for that yet."
msgstr "Henüz bunun bir açıklaması yok."
-#: server/stdinhand.c:1646 server/stdinhand.c:2480
+#: server/stdinhand.c:1540 server/stdinhand.c:2468
msgid "Ambiguous option name."
msgstr "Birden fazla olabilecek ayar adı."
-#: server/stdinhand.c:1666
+#: server/stdinhand.c:1560
#, c-format
msgid "Server Operator: %s"
msgstr "Sunucu Yöneticisi: %s"
-#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
+#: server/stdinhand.c:1686 server/stdinhand.c:1713 server/stdinhand.c:1731
#, c-format
msgid "Player '%s' now has AI skill level '%s'."
msgstr "Oyuncu '%s' YZ derecesi artık '%s'."
-#: server/stdinhand.c:1822
+#: server/stdinhand.c:1718
#, c-format
msgid "%s is not controlled by the AI."
msgstr "%s YZ tarafından kontrol edilmiyor."
-#: server/stdinhand.c:1842
+#: server/stdinhand.c:1738
#, c-format
msgid "Default AI skill level set to '%s'."
msgstr "Öntanımlı YZ derecesi '%s' olarak ayarlandı."
-#: server/stdinhand.c:1857 server/stdinhand.c:2162
+#: server/stdinhand.c:1753
msgid "This command is client only."
msgstr "Bu komut sadece istemci tarafında verilebilir."
-#: server/stdinhand.c:1860
+#: server/stdinhand.c:1756
msgid "Usage: away"
msgstr "Kullanımı: away"
-#: server/stdinhand.c:1865
+#: server/stdinhand.c:1761
msgid "Only players may use the away command."
msgstr "Sadece oyuncular away komutunu kullanabilir."
-#: server/stdinhand.c:1869
+#: server/stdinhand.c:1765
#, c-format
msgid "%s set to away mode."
msgstr "%s uzakta moduna geçti."
-#: server/stdinhand.c:1877
+#: server/stdinhand.c:1772
#, c-format
msgid "%s returned to game."
msgstr "%s oyuna geri döndü."
-#: server/stdinhand.c:1919
+#: server/stdinhand.c:1817
#, 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:1925
+#: server/stdinhand.c:1823
#, c-format
msgid "Unknown option '%s'."
msgstr "Bilinmeyen ayar '%s'."
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1848
msgid "All options with non-default values"
msgstr "Bütün seçenekler öntanımlı olmayan değerlerde"
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1851
msgid "All options"
msgstr "Bütün seçenekler"
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1854
msgid "Vital options"
msgstr "Hayati seçenekler"
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1857
msgid "Situational options"
msgstr "Durumuna göre seçenekler"
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1860
msgid "Rarely used options"
msgstr "Nadiren kullanacak seçenekler"
-#: server/stdinhand.c:1965
+#: server/stdinhand.c:1863
msgid "+ means you may change the option"
msgstr "+ ayarı değiştirmişsiniz demektir"
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1864
msgid "= means the option is on its default value"
msgstr "= ayar öntanımlı değerinde demektir"
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
#, c-format
msgid "%-*s value (min,max) "
msgstr "%-*s deÄŸer (asg,aza) "
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
msgid "Option"
msgstr "Seçenek"
-#: server/stdinhand.c:1973
+#: server/stdinhand.c:1871
msgid "description"
msgstr "tanım"
-#: server/stdinhand.c:2042
+#: server/stdinhand.c:1940
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:2092
+#: server/stdinhand.c:1966
msgid "Cannot change teams once game has begun."
msgstr "Oyun başladıktan sonra takımlar değiştirilemez."
-#: server/stdinhand.c:2102
+#: server/stdinhand.c:1976
msgid "Undefined argument. Usage: team <player> <team>."
msgstr "Tanımlanmamış argüman. Kullanım: team <oyuncu> <takım>."
-#: server/stdinhand.c:2122
+#: server/stdinhand.c:1996
#, 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:2129
+#: server/stdinhand.c:2003
msgid "Cannot team a barbarian."
msgstr "Bir barbarla takım olunamaz."
-#: server/stdinhand.c:2135
+#: server/stdinhand.c:2009
#, c-format
msgid "Player %s set to team %s."
msgstr "%s, %s ile takım oldu."
-#: 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:2035 server/voting.c:512
+#, fuzzy
+msgid "Teamvote"
+msgstr "Takım"
-#: server/stdinhand.c:2165
-msgid "Observers cannot vote."
-msgstr "Seyirciler oy veremez."
+#: server/stdinhand.c:2035 server/voting.c:516
+msgid "Vote"
+msgstr ""
-#: server/stdinhand.c:2168
+#: server/stdinhand.c:2037
+#, c-format
msgid ""
-"You can only vote in a running game. Use 'first' to become the game "
-"organizer if there currently is none."
+"%s %d \"%s\" (needs %0.0f%%%s): %d for, %d against, and %d abstained out of %"
+"d players."
msgstr ""
-"Sadece çalışan bir oyunda oy kullanabilirsiniz. Eğer yönetici yoksa 'first' "
-"komutunu kullanarak yönetici olabilirsiniz."
-#: server/stdinhand.c:2181
-#, c-format
-msgid "Vote %d \"%s\": %d for, %d against"
+#: server/stdinhand.c:2041
+msgid " no dissent"
msgstr ""
-#: server/stdinhand.c:2188
+#: server/stdinhand.c:2049
msgid "There are no votes going on."
msgstr "Şu an oylama yapılmıyor."
-#: server/stdinhand.c:2208
-msgid "No legal last vote."
+#: server/stdinhand.c:2077
+#, fuzzy
+msgid "Invalid arguments. Usage: vote yes|no|abstain [vote number]."
+msgstr "Tanımlanmamış argümanlar. Kullanım: vote yes|no [oylama numarası]."
+
+#: server/stdinhand.c:2095 server/stdinhand.c:2213 server/stdinhand.c:3714
+msgid "You are not allowed to use this command."
+msgstr "Bu komutu kullanma izniniz yok."
+
+#: server/stdinhand.c:2104
+#, c-format
+msgid "The argument \"%s\" is ambigious."
msgstr ""
-#: server/stdinhand.c:2213
-msgid "Value must be integer."
-msgstr "Değer bir tamsayı olmalı"
+#: server/stdinhand.c:2119
+#, fuzzy
+msgid "There are no votes running."
+msgstr "Şu an oylama yapılmıyor."
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2121
+#, fuzzy, c-format
+msgid "No legal last vote (%d %s)."
+msgstr "Böyle bir oy yok (%d)."
+
+#: server/stdinhand.c:2122
+msgid "other vote running"
+msgid_plural "other votes running"
+msgstr[0] ""
+
+#: server/stdinhand.c:2129 server/stdinhand.c:2491 server/stdinhand.c:2532
+msgid "Value must be an integer."
+msgstr "Değer bir tamsayı olmalı."
+
+#: server/stdinhand.c:2135 server/stdinhand.c:2221
#, c-format
msgid "No such vote (%d)."
msgstr "Böyle bir oy yok (%d)."
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2141
+#, fuzzy
+msgid "You are not allowed to vote on that."
+msgstr "Bu ayarı değiştirmenize izin verilmiyor."
+
+#: server/stdinhand.c:2146
#, c-format
msgid "You voted for \"%s\""
msgstr "\"%s\" lehinde oy kullandınız"
-#: server/stdinhand.c:2232
+#: server/stdinhand.c:2150
#, c-format
msgid "You voted against \"%s\""
msgstr "\"%s\" aleyhinde oy kullandınız"
-#: server/stdinhand.c:2259
+#: server/stdinhand.c:2155
+#, c-format
+msgid "You abstained from voting on \"%s\""
+msgstr ""
+
+#: server/stdinhand.c:2190
+msgid "Missing argument <vote number> or the string \"all\"."
+msgstr ""
+
+#: server/stdinhand.c:2197
+#, fuzzy
+msgid "You don't have any vote going on."
+msgstr "Burada işçiniz yok."
+
+#: server/stdinhand.c:2204
+#, fuzzy
+msgid "There isn't any vote going on."
+msgstr "Şu an oylama yapılmıyor."
+
+#: server/stdinhand.c:2209
+msgid "Server: All votes have been removed."
+msgstr ""
+
+#: server/stdinhand.c:2226
+#, fuzzy, c-format
+msgid "You are not allowed to cancel this vote (%d)."
+msgstr "Bu ayarı değiştirmenize izin verilmiyor."
+
+#: server/stdinhand.c:2232
+msgid "Usage: /cancelvote [<vote number>|all]"
+msgstr ""
+
+#: server/stdinhand.c:2241
+#, c-format
+msgid "Server: %s cancelled the vote \"%s\" (number %d)."
+msgstr ""
+
+#: server/stdinhand.c:2247
+#, c-format
+msgid "Server: The vote \"%s\" (number %d) has been cancelled."
+msgstr ""
+
+#: server/stdinhand.c:2265
msgid ""
"Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
"<x> <y> | unit <id> | tech <player> | timing | info>."
msgstr ""
-#: server/stdinhand.c:2265
+#: server/stdinhand.c:2271
msgid "Can only use this command once game has begun."
msgstr "Bu komut oyun başladıktan sonra kullanılabilir."
-#: server/stdinhand.c:2294
+#: server/stdinhand.c:2300
#, c-format
msgid "%s diplomacy no longer debugged"
msgstr "%s diplomasisinde hata ayıklanmıyor"
-#: server/stdinhand.c:2298
+#: server/stdinhand.c:2304
#, c-format
msgid "%s diplomacy debugged"
msgstr "%s diplomasisinde hata ayıklanıyor"
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2323
#, c-format
msgid "%s tech no longer debugged"
msgstr "%s teknolojisinde hata ayıklanmıyor"
-#: server/stdinhand.c:2321
+#: server/stdinhand.c:2327
#, c-format
msgid "%s tech debugged"
msgstr "%s teknolojisinde hata ayıklanıyor"
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2358 server/stdinhand.c:2388
msgid "Value 2 & 3 must be integer."
msgstr "2. ve 3. değerler tamsayı olmalıdır."
-#: server/stdinhand.c:2356 server/stdinhand.c:2386
+#: server/stdinhand.c:2362 server/stdinhand.c:2392
msgid "Bad map coordinates."
msgstr "Yanlış koordinat."
-#: server/stdinhand.c:2361
+#: server/stdinhand.c:2367
msgid "No city at this coordinate."
msgstr "Bu koordinatlarda ÅŸehir yok."
-#: server/stdinhand.c:2366
+#: server/stdinhand.c:2372
#, c-format
msgid "%s no longer debugged"
msgstr "%s hata ayıklamada kullanılmıyor"
-#: server/stdinhand.c:2392 server/stdinhand.c:2422
+#: server/stdinhand.c:2398 server/stdinhand.c:2428
#, c-format
msgid "%s %s no longer debugged."
msgstr "%s %s hata ayıklamada kullanılmıyor."
-#: server/stdinhand.c:2397 server/stdinhand.c:2427
+#: server/stdinhand.c:2403 server/stdinhand.c:2433
#, c-format
msgid "%s %s debugged."
msgstr "%s %s hata ayıklamada kullanılıyor."
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2419
msgid "Value 2 must be integer."
msgstr "Değer 2 bir tamsayı olmalıdır."
-#: server/stdinhand.c:2417
+#: server/stdinhand.c:2423
#, c-format
msgid "Unit %d does not exist."
msgstr "%d birimi yok."
-#: server/stdinhand.c:2475
+#: server/stdinhand.c:2464
msgid "Undefined argument. Usage: set <option> <value>."
msgstr "Tanımlanmamış argüman. Kullanım: set <seçenek> <değer>."
-#: server/stdinhand.c:2485
+#: server/stdinhand.c:2473
msgid "You are not allowed to set this option."
msgstr "Bu ayarı değiştirmenize izin verilmiyor."
-#: server/stdinhand.c:2490 server/stdinhand.c:3463
+#: server/stdinhand.c:2478 server/stdinhand.c:3501
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:2502 server/stdinhand.c:2543
-msgid "Value must be an integer."
-msgstr "Değer bir tamsayı olmalı."
-
-#: server/stdinhand.c:2512
+#: server/stdinhand.c:2501
#, 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:2519
+#: server/stdinhand.c:2508
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:2534 server/stdinhand.c:2576
+#: server/stdinhand.c:2523 server/stdinhand.c:2565
#, c-format
msgid "Option: %s has been set to %d."
msgstr "Ayar: %s, %d olarak ayarlandı."
-#: server/stdinhand.c:2554
+#: server/stdinhand.c:2543
#, 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:2561
+#: server/stdinhand.c:2550
#, 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:2586
+#: server/stdinhand.c:2575
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:2600
+#: server/stdinhand.c:2589
#, c-format
msgid "Option: %s has been set to \"%s\"."
msgstr "Ayar: %s ayarı \"%s\" olarak değiştirildi."
-#: server/stdinhand.c:2658
+#: server/stdinhand.c:2652
msgid "Sorry, one can't observe globally in this game."
msgstr "Üzgünüm, bu oyunu tamamen gözlemleyemezsiniz."
-#: server/stdinhand.c:2661
+#: server/stdinhand.c:2655
msgid "Sorry, you can't take a global observer. Observe it instead."
msgstr ""
-#: server/stdinhand.c:2671
+#: server/stdinhand.c:2665
#, 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
+#: server/stdinhand.c:2673
#, c-format
msgid ""
"You cannot take a new player because the maximum of %d player has already "
@@ -6020,73 +6101,73 @@ msgid_plural ""
"been reached (maxplayers setting)."
msgstr[0] ""
-#: server/stdinhand.c:2691
+#: server/stdinhand.c:2685
msgid "You cannot take a new player because there are no free player slots."
msgstr ""
-#: server/stdinhand.c:2702
+#: server/stdinhand.c:2696
msgid "Sorry, one can't observe barbarians in this game."
msgstr ""
-#: server/stdinhand.c:2705
+#: server/stdinhand.c:2699
msgid "Sorry, one can't take barbarians in this game."
msgstr ""
-#: server/stdinhand.c:2713
+#: server/stdinhand.c:2707
msgid "Sorry, one can't observe dead players in this game."
msgstr ""
-#: server/stdinhand.c:2716
+#: server/stdinhand.c:2710
msgid "Sorry, one can't take dead players in this game."
msgstr ""
-#: server/stdinhand.c:2724
+#: server/stdinhand.c:2718
msgid "Sorry, one can't observe AI players in this game."
msgstr ""
-#: server/stdinhand.c:2727
+#: server/stdinhand.c:2721
msgid "Sorry, one can't take AI players in this game."
msgstr ""
-#: server/stdinhand.c:2736
+#: server/stdinhand.c:2730
msgid "Sorry, one can't observe human players in this game."
msgstr ""
-#: server/stdinhand.c:2739
+#: server/stdinhand.c:2733
msgid "Sorry, one can't take human players in this game."
msgstr ""
-#: server/stdinhand.c:2749
+#: server/stdinhand.c:2743
msgid "Sorry, one can't observe in this game."
msgstr ""
-#: server/stdinhand.c:2754
+#: server/stdinhand.c:2748
msgid "Sorry, one can't take players in this game."
msgstr ""
-#: server/stdinhand.c:2760
+#: server/stdinhand.c:2754
msgid "Sorry, one can't take players already connected in this game."
msgstr ""
-#: server/stdinhand.c:2791
+#: server/stdinhand.c:2785
msgid "Usage: observe [connection-name [player-name]]"
msgstr "Kullanım: observe [bağlantı-adı [oyuncu-adı]]"
-#: server/stdinhand.c:2797
+#: server/stdinhand.c:2791
msgid "Usage: observe [player-name]"
msgstr "Kullanım: observe [oyuncu-adı]"
-#: server/stdinhand.c:2847
+#: server/stdinhand.c:2841
#, c-format
msgid "%s already controls %s. Using 'observe' would remove %s"
msgstr ""
-#: server/stdinhand.c:2858
+#: server/stdinhand.c:2852
#, c-format
msgid "%s is already observing %s."
msgstr ""
-#: server/stdinhand.c:2863
+#: server/stdinhand.c:2857
#, c-format
msgid "%s is already observing."
msgstr ""
@@ -6101,235 +6182,240 @@ msgstr ""
msgid "%s now observes"
msgstr ""
-#: server/stdinhand.c:2969
+#: server/stdinhand.c:2971
msgid "Usage: take <connection-name> <player-name>"
msgstr "Kullanım: take <bağlantı-adı> <oyuncu-adı>"
-#: server/stdinhand.c:2974
+#: server/stdinhand.c:2976
msgid "Usage: take <player-name>"
msgstr "Kullanım: take <oyuncu-adı>"
-#: server/stdinhand.c:2980
+#: server/stdinhand.c:2982
msgid "Usage: take [connection-name] <player-name>"
msgstr ";Kullanım: take [bağlantı-adı] <oyuncu-adı>"
-#: server/stdinhand.c:3010
+#: server/stdinhand.c:3012
#, fuzzy, c-format
msgid "%s already controls %s."
msgstr "%s zaten %s tarafını kontrol ediyor"
-#: server/stdinhand.c:3024
+#: server/stdinhand.c:3026
#, 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:3059
+#: server/stdinhand.c:3061
#, c-format
msgid "being detached from %s."
msgstr ""
-#: server/stdinhand.c:3135
+#: server/stdinhand.c:3146
#, 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:3139 server/stdinhand.c:4260
+#: server/stdinhand.c:3150 server/stdinhand.c:4308
#: data/nation/barbarian.ruleset:3
msgid "Barbarian"
msgstr "Barbar"
-#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
+#: server/stdinhand.c:3152 server/stdinhand.c:4310 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-sdl/plrdlg.c:645
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr "YZ"
-#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-gtk-2.0/pages.c:2125
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
+#: server/stdinhand.c:3153 server/stdinhand.c:4312
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-gtk-2.0/pages.c:2127
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/connectdlg.c:215
msgid "Human"
msgstr "Ä°nsan"
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-gtk-2.0/pages.c:2124 client/gui-win32/connectdlg.c:200
-#: client/gui-win32/connectdlg.c:212
+#: server/stdinhand.c:3155 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-gtk-2.0/pages.c:2126 client/gui-win32/connectdlg.c:202
+#: client/gui-win32/connectdlg.c:214
msgid "Alive"
msgstr "Canlı"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3156 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-win32/connectdlg.c:202
msgid "Dead"
msgstr "Ölü"
-#: server/stdinhand.c:3147
+#: server/stdinhand.c:3159
#, fuzzy, c-format
msgid "%s failed to attach to any player."
msgstr "%s herhangi bir oyuncuya bağlanamadı."
-#: server/stdinhand.c:3182
+#: server/stdinhand.c:3194
msgid "Usage: detach <connection-name>"
msgstr "Kullanım: detach <bağlantı-adı>"
-#: server/stdinhand.c:3202
+#: server/stdinhand.c:3214
msgid "You can not detach other users."
msgstr ""
-#: server/stdinhand.c:3211
+#: server/stdinhand.c:3223
#, c-format
msgid "%s is not attached to any player."
msgstr ""
-#: server/stdinhand.c:3234
+#: server/stdinhand.c:3246
#, c-format
msgid "%s detaching from %s"
msgstr ""
-#: server/stdinhand.c:3240
+#: server/stdinhand.c:3252
#, c-format
msgid "%s no longer observing."
msgstr ""
-#: server/stdinhand.c:3259
+#: server/stdinhand.c:3271
#, c-format
msgid "detaching from %s."
msgstr ""
-#: server/stdinhand.c:3345
+#: server/stdinhand.c:3361
msgid "Usage: load <game name>"
msgstr "Kullanım: load <oyun-adı>"
-#: server/stdinhand.c:3350
+#: server/stdinhand.c:3366
msgid "Cannot load a game while another is running."
msgstr "Başka bir oyun çalışırken oyun yüklenemez."
-#: server/stdinhand.c:3372
+#: server/stdinhand.c:3388
#, 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:3389
+#: server/stdinhand.c:3405
#, c-format
msgid "Could not load savefile: %s"
msgstr "Kayıt dosyası yüklenemedi: %s"
-#: server/stdinhand.c:3458
+#: server/stdinhand.c:3496
#, c-format
msgid "Current ruleset directory is \"%s\""
msgstr "Geçerli kural seti dizini: \"%s\""
-#: server/stdinhand.c:3478
+#: server/stdinhand.c:3516
#, c-format
msgid "Ruleset directory \"%s\" not found"
msgstr "Kural seti dizini \"%s\" bulunmadı."
-#: server/stdinhand.c:3484
+#: server/stdinhand.c:3522
#, c-format
msgid "Ruleset directory is already \"%s\""
msgstr "Kural seti dizini zaten \"%s\""
-#: server/stdinhand.c:3488
+#: server/stdinhand.c:3526
#, c-format
msgid "Ruleset directory set to \"%s\""
msgstr "Kural seti dizini \"%s\" olarak ayarlandı"
-#: server/stdinhand.c:3536
+#: server/stdinhand.c:3574
msgid "Goodbye."
msgstr "Hoşçakal."
-#: server/stdinhand.c:3567
+#: server/stdinhand.c:3606
msgid "Sorry, you are not allowed to use server commands."
msgstr "Üzgünüm, sunucu komutları kullanma izniniz yok."
-#: server/stdinhand.c:3603
+#: server/stdinhand.c:3656
#, 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:3608
+#: server/stdinhand.c:3661
#, c-format
msgid "Unknown command. Try '%shelp'."
msgstr "Bilinmeyen komut. '%shelp' yazmayı deneyin."
-#: server/stdinhand.c:3625
-msgid "Your new vote canceled your previous vote."
+#: server/stdinhand.c:3675
+#, fuzzy
+msgid "Your new vote cancelled your previous vote."
msgstr "Yeni oyunuz önceki oyunuzu iptal etti."
-#: server/stdinhand.c:3633
-#, c-format
-msgid "New vote (number %d) by %s: %s."
+#: server/stdinhand.c:3688
+msgid "New teamvote"
+msgstr ""
+
+#: server/stdinhand.c:3691
+msgid "New vote"
msgstr ""
-#: server/stdinhand.c:3645
+#: server/stdinhand.c:3695
+#, fuzzy, c-format
+msgid "%s (number %d) by %s: %s"
+msgstr "%s, %s tarafından bombalandı."
+
+#: server/stdinhand.c:3704
#, c-format
msgid "Your new vote (\"%s\") was not legal or was not recognized."
msgstr ""
-#: server/stdinhand.c:3655
-msgid "You are not allowed to use this command."
-msgstr "Bu komutu kullanma izniniz yok."
-
-#: server/stdinhand.c:3680
+#: server/stdinhand.c:3726
msgid "(server prompt)"
msgstr "(sunucu istemi)"
-#: server/stdinhand.c:3787
+#: server/stdinhand.c:3835
msgid "Game ended in a draw."
msgstr "Oyun berabere bitti."
-#: server/stdinhand.c:3791
+#: server/stdinhand.c:3839
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:3796
+#: server/stdinhand.c:3844
msgid "Cannot end the game: no game running."
msgstr "Oyun bitirilemez: çalışan bir oyun yok."
-#: server/stdinhand.c:3812
+#: server/stdinhand.c:3860
#, 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:3817
+#: server/stdinhand.c:3865
msgid "You cannot surrender now."
msgstr "Şu anda teslim olamazsın."
-#: server/stdinhand.c:3883
+#: server/stdinhand.c:3931
#, fuzzy
msgid "Not enough human players, game will not start."
msgstr "Yeterli oyuncu sayısı olmadan oyun başlamayacak."
-#: server/stdinhand.c:3888
+#: server/stdinhand.c:3936
#, fuzzy
msgid "No players, game will not start."
msgstr "Yeterli oyuncu sayısı olmadan oyun başlamayacak."
-#: server/stdinhand.c:3892
+#: server/stdinhand.c:3940
#, fuzzy
msgid "Not enough nations for all players, game will not start."
msgstr "Yeterli oyuncu sayısı olmadan oyun başlamayacak."
-#: server/stdinhand.c:3901
+#: server/stdinhand.c:3949
msgid "All players are ready; starting game."
msgstr "Bütün oyuncular hazır; oyunu başlatılıyor."
-#: server/stdinhand.c:3915
+#: server/stdinhand.c:3963
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:3922
+#: server/stdinhand.c:3970
msgid "Cannot start the game: it is already running."
msgstr "Oyun başlatılamıyor: zaten başlatılmış"
-#: server/stdinhand.c:3953
+#: server/stdinhand.c:4001
#, c-format
msgid "Cutting connection %s."
msgstr "Bağlantı kesiliyor %s."
-#: server/stdinhand.c:3972
+#: server/stdinhand.c:4020
msgid ""
"Welcome - this is the introductory help text for the Freeciv server.\n"
"\n"
@@ -6368,121 +6454,121 @@ msgstr ""
" save - o anki oyunu kaydeder\n"
" quit - çıkar"
-#: server/stdinhand.c:4007 server/stdinhand.c:4010
+#: server/stdinhand.c:4055 server/stdinhand.c:4058
msgid "Command:"
msgstr "Komut:"
-#: server/stdinhand.c:4014
+#: server/stdinhand.c:4062
msgid "Synopsis: "
msgstr "Özet:"
-#: server/stdinhand.c:4023
+#: server/stdinhand.c:4071
#, c-format
msgid "Level: %s"
msgstr "Seviye: %s"
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4096
msgid "The following server commands are available:"
msgstr "Şu sunucu komutları kullanılabilir durumdadır:"
-#: server/stdinhand.c:4123
+#: server/stdinhand.c:4171
#, c-format
msgid "Help argument '%s' is ambiguous."
msgstr ""
-#: server/stdinhand.c:4128
+#: server/stdinhand.c:4176
#, c-format
msgid "No match for help argument '%s'."
msgstr ""
-#: server/stdinhand.c:4194
+#: server/stdinhand.c:4242
#, c-format
msgid "Bad list argument: '%s'. Try '%shelp list'."
msgstr ""
-#: server/stdinhand.c:4234
+#: server/stdinhand.c:4282
msgid "List of players:"
msgstr "Oyuncu listesi:"
-#: server/stdinhand.c:4239
+#: server/stdinhand.c:4287
msgid "<no players>"
msgstr "<oyuncu yok>"
-#: server/stdinhand.c:4256
+#: server/stdinhand.c:4304
#, c-format
msgid "user %s, "
msgstr "kullanıcı %s, "
-#: server/stdinhand.c:4267
+#: server/stdinhand.c:4315
msgid ", Dead"
msgstr ", Ölü"
-#: server/stdinhand.c:4270
+#: server/stdinhand.c:4318
#, 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:4275 server/stdinhand.c:4279 client/helpdata.c:257
-#: client/helpdata.c:752 client/text.c:241 client/text.c:1224
-#: client/text.c:1262
+#: server/stdinhand.c:4323 server/stdinhand.c:4327 client/helpdata.c:257
+#: client/helpdata.c:752 client/text.c:241 client/text.c:1229
+#: client/text.c:1267
#, c-format
msgid "?clistmore:, %s"
msgstr ", %s"
-#: server/stdinhand.c:4283
+#: server/stdinhand.c:4331
msgid ", ready"
msgstr ", hazır"
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4333
msgid ", not ready"
msgstr ", hazır değil"
-#: server/stdinhand.c:4293
+#: server/stdinhand.c:4341
#, c-format
msgid " %d connection:"
msgid_plural " %d connections:"
msgstr[0] " %d bağlantı:"
-#: server/stdinhand.c:4299
+#: server/stdinhand.c:4347
#, 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:4304
+#: server/stdinhand.c:4352
msgid " (observer mode)"
msgstr " (izleyici modu)"
-#: server/stdinhand.c:4322
+#: server/stdinhand.c:4370
msgid "List of teams:"
msgstr "Takım listesi:"
#. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4332
+#: server/stdinhand.c:4380
#, c-format
msgid "%2d : '%s' : %d player"
msgid_plural "%2d : '%s' : %d players"
msgstr[0] "%2d : '%s' : %d oyuncu"
-#: server/stdinhand.c:4352
+#: server/stdinhand.c:4400
#, c-format
msgid "%2d : '%s' : 1 player : %s"
msgstr "%2d : '%s' : 1 oyuncu : %s"
-#: server/stdinhand.c:4360
+#: server/stdinhand.c:4408
#, c-format
msgid "Empty team: %s"
msgstr "Boş takım: %s"
-#: server/stdinhand.c:4371
+#: server/stdinhand.c:4419
msgid "List of connections to server:"
msgstr "Sunucuya olan bağlantıların listesi:"
-#: server/stdinhand.c:4375
+#: server/stdinhand.c:4423
msgid "<no connections>"
msgstr "<hiç bağlantı yok>"
-#: server/stdinhand.c:4399
+#: server/stdinhand.c:4447
msgid "List of scenarios available:"
msgstr "Mümkün olan senaryolar:"
@@ -6501,7 +6587,7 @@ msgstr "%s Geleceğin Teknolojisi %d öğrenmişler."
msgid "%s acquired from %s!"
msgstr "%s teknolojisi %s tarafından öğrenildi!"
-#: server/techtools.c:220
+#: server/techtools.c:221
#, c-format
msgid ""
"Discovery of %s makes the government form %s available. You may want to "
@@ -6510,41 +6596,41 @@ msgstr ""
"%s sayesinde %s yönetim biçimi artık kullanılabilir durumda. Bir devrim "
"baÅŸlatmak isteyebilirsiniz."
-#: server/techtools.c:301
+#: server/techtools.c:302
#, c-format
msgid "Discovery of %s OBSOLETES %s in %s!"
msgstr "%s teknolojisi %s yapısını %s şehrinde ETKİSİZ hale getirdi!"
-#: server/techtools.c:351
+#: server/techtools.c:352
#, c-format
msgid "Learned %s. Our scientists focus on %s; goal is %s."
msgstr ""
"%s teknolojisini öğrendik. Bilim adamlarımız şimdi %s üzerinde çalışıyorlar; "
"hedefimiz: %s."
-#: server/techtools.c:369
+#: server/techtools.c:370
#, c-format
msgid "Learned %s. Scientists choose to research %s."
msgstr "%s öğrenildi. Bilim adamları %s üzerinde uğraşıyorlar."
-#: server/techtools.c:376
+#: server/techtools.c:377
#, c-format
msgid "Learned %s. "
msgstr "%s öğrenildi. "
-#: server/techtools.c:379
+#: server/techtools.c:380
#, c-format
msgid "Researching %s."
msgstr "%s üzerinde çalışılıyor."
-#: server/techtools.c:385
+#: server/techtools.c:386
#, c-format
msgid "Learned %s. Scientists do not know what to research next."
msgstr ""
"%s teknolojisi öğrenildi. Hedefimiz olmadığı için bilim adamları şimdi ne "
"üzerinde çalışacaklarını bilmiyorlar."
-#: server/techtools.c:402
+#: server/techtools.c:403
msgid ""
"Great scientists from all the world join your civilization: you get an "
"immediate advance."
@@ -6552,22 +6638,22 @@ msgstr ""
"Dünyanın dört bir yanından gelen bilim adamları sizin uygarlığınıza "
"katıldılar: bir tane teknolojiyi hemen öğrendiniz."
-#: server/techtools.c:570
+#: server/techtools.c:571
#, c-format
msgid "Technology goal is %s."
msgstr "Teknoloji hedefimiz %s."
-#: server/techtools.c:700
+#: server/techtools.c:708
#, c-format
msgid "You steal %s from the %s."
msgstr "%s teknolojisini %s tarafından çaldınız."
-#: server/techtools.c:705
+#: server/techtools.c:713
#, c-format
msgid "The %s stole %s from you!"
msgstr "%s sizden %s teknolojisini çaldı!"
-#: server/techtools.c:710
+#: server/techtools.c:718
#, c-format
msgid "The %s have stolen %s from the %s."
msgstr "%s, %s teknolojisini %s tarafından çaldı."
@@ -6591,70 +6677,76 @@ msgstr "Hiç bir birim yükseltilemedi."
msgid "%s upgraded to %s for %d gold."
msgstr "%1$s, %3$d altına %2$s birimine yükseltildi."
-#: server/unithand.c:396
+#: server/unithand.c:402
#, c-format
msgid "%s refuses to disband!"
msgstr "%s terhis edilmeyi kabul etmiyor!"
-#: server/unithand.c:449
+#: server/unithand.c:455
msgid "Can't place city here."
msgstr "Buraya şehir yapılamaz."
-#: server/unithand.c:456
+#: server/unithand.c:462
#, c-format
msgid "Only %s can build a city."
msgstr "Sadece %s ÅŸehir inÅŸa edebilir."
-#: server/unithand.c:461
+#: server/unithand.c:467
msgid "Can't build a city."
msgstr "Şehir yapılamaz."
-#: server/unithand.c:470
+#: server/unithand.c:476
#, c-format
msgid "Only %s can add to a city."
msgstr "Sadece %s şehre katılabilir."
-#: server/unithand.c:475
+#: server/unithand.c:481
msgid "Can't add to a city."
msgstr "Åžehre eklenemez."
-#: server/unithand.c:481
+#: server/unithand.c:487
#, c-format
msgid "%s unit has no moves left to add to %s."
msgstr "%s biriminin %s şehrine katılması için yeterli hareketi yok."
-#: server/unithand.c:487
+#: server/unithand.c:493
#, c-format
msgid "%s unit has no moves left to build city."
msgstr "%s biriminin şehir kurmak için yeterli hareketi yok."
-#: server/unithand.c:492
+#. TRANS: <city> is owned by <nation>, cannot add <unit>.
+#: server/unithand.c:499
+#, fuzzy, c-format
+msgid "%s is owned by %s, cannot add %s."
+msgstr "%s, %s şehrine eklenemeyecek kadar büyük."
+
+#: server/unithand.c:506
#, c-format
msgid "%s is too big to add %s."
msgstr "%s, %s şehrine eklenemeyecek kadar büyük."
-#: server/unithand.c:498
+#: server/unithand.c:512
#, c-format
msgid "%s needs an improvement to grow, so you cannot add %s."
msgstr "%s şehrinin büyümesi için bir yapı gerekiyor, %s eklenemez."
-#: server/unithand.c:509
+#: server/unithand.c:523
#, c-format
msgid "Can't add %s to %s."
msgstr "%s, %s ÅŸehrine eklenemedi."
-#: server/unithand.c:531
+#: server/unithand.c:545
#, c-format
msgid "%s added to aid %s in growing."
msgstr "%s, %s şehrinin büyümesi için eklendi."
-#: server/unithand.c:828
+#: server/unithand.c:842
msgid "Your Nuclear missile was shot down by SDI defences, what a waste."
msgstr ""
"Nükleer bombanız SDI savunması tarafından etkisiz hale getirildi, ne büyük "
"kayıp."
-#: server/unithand.c:831
+#: server/unithand.c:845
#, c-format
msgid "The nuclear attack on %s was avoided by your SDI defense."
msgstr ""
@@ -6662,114 +6754,114 @@ msgstr ""
"edildi."
#. TRANS: "Your Cannon ... the Polish Destroyer."
-#: server/unithand.c:901
+#: server/unithand.c:915
#, c-format
msgid "Your %s survived the pathetic attack from the %s %s."
msgstr "%s biriminiz %s %s birimi tarafından yapılan saldırıdan kurtuldu."
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unithand.c:910
+#: server/unithand.c:924
#, c-format
msgid "Your attacking %s failed against the %s %s!"
msgstr "%s biriminizin, %s %s birimine saldırısı başarısız oldu!"
-#: server/unithand.c:983
+#: server/unithand.c:997
#, c-format
msgid "Only %s can attack from sea."
msgstr "Sadece %s birimi denizden saldırabilir."
-#: server/unithand.c:988
+#: server/unithand.c:1002
msgid "Cannot attack from sea."
msgstr "Denizden saldırılamaz."
-#: server/unithand.c:996 server/unittools.c:2137
+#: server/unithand.c:1010 server/unittools.c:2142
msgid "Cannot attack unless you declare war first."
msgstr "Savaş ilan etmeden saldırılamaz."
-#: server/unithand.c:1001
+#: server/unithand.c:1015
#, c-format
msgid "%s can only move into your own zone of control."
msgstr "%s sadece sizin kontrolünüzdeki bölgelere gidebilir."
-#: server/unithand.c:1007
+#: server/unithand.c:1021
#, c-format
msgid "Cannot invade unless you break peace with %s first."
msgstr "%s ile olan barışı bozmadan sınır ihlal edilemez."
-#: server/unithand.c:1052
+#: server/unithand.c:1066
msgid "This unit has no moves left."
msgstr "Bu birimin hiç hareketi kalmadı."
-#: server/unithand.c:1107
+#: server/unithand.c:1121
msgid "Unit must be on land to perform diplomatic action."
msgstr "Birimin diplomatik iş yapabilmesi için karada olması gerekli."
-#: server/unithand.c:1109
+#: server/unithand.c:1123
msgid "No diplomat action possible."
msgstr "Diplomatik işler yapılamaz."
-#: server/unithand.c:1125
+#: server/unithand.c:1139
#, c-format
msgid "You must declare war on %s first. Try using players dialog (F3)."
msgstr ""
"Önce %s ile savaş içinde olmanız gerekiyor. Oyuncular penceresini "
"kullanmayı deneyin (F3)."
-#: server/unithand.c:1143
+#: server/unithand.c:1157
msgid "This unit is being transported, and so cannot bombard."
msgstr "Birim taşınıyor, bu yüzden bombardıman yapamaz."
-#: server/unithand.c:1158
+#: server/unithand.c:1172
msgid "You can't attack there."
msgstr "Burada saldıramazsın."
-#: server/unithand.c:1180
+#: server/unithand.c:1194
msgid "This type of troops cannot take over a city."
msgstr "Bu türdeki birimler şehir fethedemezler."
-#: server/unithand.c:1198
+#: server/unithand.c:1212
msgid "A transported unit is not allied to all units or city on target tile."
msgstr ""
"Taşınan bir birim hedef karedeki tüm birimlerle veya şehirlerle ittifak "
"içinde değil."
-#: server/unithand.c:1240
+#: server/unithand.c:1254
#, c-format
msgid "Your %s helps build the %s in %s (%d remaining)."
msgstr "%s birimi %s yapımına %s şehrinde yardım eder (%d kalıyor)."
-#: server/unithand.c:1242
+#: server/unithand.c:1256
#, c-format
msgid "Your %s helps build the %s in %s (%d surplus)."
msgstr "%s birimi %s yapımına %s şehrinde yardım eder (%d artıyor)."
-#: server/unithand.c:1286
+#: server/unithand.c:1300
#, c-format
msgid ""
"Sorry, your %s cannot establish a trade route because it has no home city"
msgstr "Üzgünüm, %s biriminiz ticaret yolu yapamaz çünkü memleketi yok"
-#: server/unithand.c:1296
+#: server/unithand.c:1310
#, c-format
msgid "Sorry, your %s cannot establish a trade route between %s and %s"
msgstr "Üzgünüm, %s biriminiz %s ve %s şehirleri arasında ticaret yolu yapamaz"
-#: server/unithand.c:1325 server/unithand.c:1344
+#: server/unithand.c:1339 server/unithand.c:1358
#, c-format
msgid "Sorry, your %s cannot establish a trade route here!"
msgstr "Üzgünüm, %s biriminiz buraya ticaret yolu yapamaz!"
-#: server/unithand.c:1329 server/unithand.c:1348
+#: server/unithand.c:1343 server/unithand.c:1362
#, c-format
msgid " The city of %s already has %d better trade routes!"
msgstr " %s şehrinin zaten %d daha kârlı ticaret yolları var!"
-#: server/unithand.c:1361 server/unithand.c:1373
+#: server/unithand.c:1375 server/unithand.c:1387
#, c-format
msgid "Sorry, %s has canceled the trade route from %s to your city %s."
msgstr "Üzgünüm, %s, %s şehrinden %s şehrinize olan ticaret yolunu iptal etti."
-#: server/unithand.c:1406
+#: server/unithand.c:1420
#, c-format
msgid ""
"Your %s from %s has arrived in %s, and revenues amount to %d in gold and "
@@ -6829,57 +6921,57 @@ msgid "Teleported your %s to %s."
msgstr "%s biriminiz %s şehrine taşındı."
#. TRANS: A unit is moved to resolve stack conflicts.
-#: server/unittools.c:1065
+#: server/unittools.c:1070
#, fuzzy, c-format
msgid "Moved your %s."
msgstr "%s biriminiz terhis edildi."
-#: server/unittools.c:1076
+#: server/unittools.c:1081
#, c-format
msgid "Disbanded your %s."
msgstr "%s biriminiz terhis edildi."
-#: server/unittools.c:1397
+#: server/unittools.c:1402
#, c-format
msgid "Unable to defend %s, %s has lost the game."
msgstr "%s savunması başarısız, %s oyunu kaybetti."
-#: server/unittools.c:1401
+#: server/unittools.c:1406
#, c-format
msgid "Losing %s meant losing the game! Be more careful next time!"
msgstr ""
"%s biriminin kaybedilmesi oyunu kaybetmek demektir! Bir dahaki sefere daha "
"dikkatli olun!"
-#: server/unittools.c:1503
+#: server/unittools.c:1508
#, c-format
msgid "%s escaped the destruction of %s, and fled to %s."
msgstr "%s, %s şehrinin yıkımından kurtuldu ve %s şehrine kaçtı."
-#: server/unittools.c:1512
+#: server/unittools.c:1517
#, c-format
msgid "%s lost when %s was lost."
msgstr "%s, %s ile birlikte kaybedildi."
-#: server/unittools.c:1561
+#: server/unittools.c:1566
#, c-format
msgid "Barbarian leader captured, %d gold ransom paid."
msgstr "Barbar lideri ele geçirildi, %d altın fidye alındı."
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unittools.c:1579
+#: server/unittools.c:1584
#, c-format
msgid "Your attacking %s succeeded against the %s %s!"
msgstr "Saldıran %s biriminiz %s %s birimini yendi!"
#. TRANS: "Cannon ... the Polish Destroyer."
-#: server/unittools.c:1588 server/unittools.c:1646
+#: server/unittools.c:1593 server/unittools.c:1651
#, c-format
msgid "%s lost to an attack by the %s %s."
msgstr "%s, %s %s birimine yenildi."
#. TRANS: "... Cannon ... the Polish Destroyer ...."
-#: server/unittools.c:1622
+#: server/unittools.c:1627
#, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -6888,7 +6980,7 @@ msgstr[0] "Saldıran %s biriminiz %s %s (ve %d diğer birimi) birimini yendi!"
#. TRANS: "Cannon lost when the Polish Destroyer
#. * attacked the German Musketeers."
-#: server/unittools.c:1655
+#: server/unittools.c:1660
#, c-format
msgid "%s lost when the %s %s attacked the %s %s."
msgstr ""
@@ -6896,7 +6988,7 @@ msgstr ""
#. TRANS: "Musketeers (and Cannon) lost to an
#. * attack from the Polish Destroyer."
-#: server/unittools.c:1670
+#: server/unittools.c:1675
#, c-format
msgid "%s (and %s) lost to an attack from the %s %s."
msgstr "%s (ve %s), %s %s birimine yenildi."
@@ -6904,7 +6996,7 @@ msgstr "%s (ve %s), %s %s birimine yenildi."
#. TRANS: "Musketeers and 3 other units lost to
#. * an attack from the Polish Destroyer."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1680
+#: server/unittools.c:1685
#, 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."
@@ -6913,7 +7005,7 @@ msgstr[0] "%s ve diÄŸer %d birim, %s %s birimine yenildi."
#. TRANS: "2 units lost when the Polish Destroyer
#. * attacked the German Musketeers."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1694
+#: server/unittools.c:1699
#, 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."
@@ -6921,173 +7013,215 @@ msgstr[0] ""
"%2$s %3$s biriminin %4$s %5$s birimine saldırması sonucu %1$d birim "
"kaybedildi."
-#: server/unittools.c:1962
+#: server/unittools.c:1967
#, c-format
msgid "Your %s was nuked by %s."
msgstr "%s biriminiz %s tarafından bombalandı."
-#: server/unittools.c:1965 server/unittools.c:1981
+#: server/unittools.c:1970 server/unittools.c:1986
msgid "yourself"
msgstr "kendiniz"
-#: server/unittools.c:1969
+#: server/unittools.c:1974
#, c-format
msgid "The %s %s was nuked."
msgstr "%s tarafındaki %s nükleer bomba ile vuruldu."
-#: server/unittools.c:1978
+#: server/unittools.c:1983
#, c-format
msgid "%s was nuked by %s."
msgstr "%s, %s tarafından bombalandı."
-#: server/unittools.c:1986
+#: server/unittools.c:1991
#, c-format
msgid "You nuked %s."
msgstr "%s şehrini bombaladınız."
-#: server/unittools.c:2027
+#: server/unittools.c:2032
#, c-format
msgid "The %s detonated a nuke!"
msgstr "%s nükleer bomba patlattı!"
-#: server/unittools.c:2051
+#: server/unittools.c:2056
#, c-format
msgid "%s transported successfully."
msgstr "%s başarıyla taşındı."
-#: server/unittools.c:2103
+#: server/unittools.c:2108
msgid "This unit type can not be paradropped."
msgstr "Bu tür birimler paraşütle inemez."
-#: server/unittools.c:2113
+#: server/unittools.c:2118
msgid "You cannot paradrop a unit that is transporting other units."
msgstr "Diğer birimleri taşıyan bir birime paraşütle iniş yapılamaz."
-#: server/unittools.c:2119
+#: server/unittools.c:2124
msgid "The destination location is not known."
msgstr "Hedef bölge bilinmiyor."
-#: server/unittools.c:2126
+#: server/unittools.c:2131
#, c-format
msgid "This unit cannot paradrop into %s."
msgstr "Bu birin %s içine atlayış yapamaz."
-#: server/unittools.c:2146
+#: server/unittools.c:2151
#, c-format
msgid "The distance to the target (%i) is greater than the unit's range (%i)."
msgstr "Hedefe olan mesafe (%i) birimin menzili (%i) dışında kalıyor."
-#: server/unittools.c:2157
+#: server/unittools.c:2162
#, c-format
msgid "Your %s paradropped into the %s and was lost."
msgstr "%s biriminiz %s içine düştü ve kayboldu."
-#: server/unittools.c:2170
+#: server/unittools.c:2175
#, c-format
msgid "Your %s was killed by enemy units at the paradrop destination."
msgstr "%s biriminiz paraşütle atlarken düşman tarafından vuruldu."
-#: server/unittools.c:2192
+#: server/unittools.c:2197
#, c-format
msgid "You found %d gold."
msgstr "Hazine buldunuz (%d altın)."
-#: server/unittools.c:2209
+#: server/unittools.c:2214
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr "Antik yazıtlardan %s teknolojisini öğrendiniz."
-#: server/unittools.c:2216
+#: server/unittools.c:2221
#, c-format
msgid "The %s have acquired %s from ancient scrolls of wisdom."
msgstr "%s antik yazıtlardan %s öğrenmişler."
-#: server/unittools.c:2230
+#: server/unittools.c:2235
msgid "A band of friendly mercenaries joins your cause."
msgstr "Paralı askerler size katıldı."
-#: server/unittools.c:2248
+#: server/unittools.c:2253
msgid "An abandoned village is here."
msgstr "Terk edinmiÅŸ bir ÅŸehir buldunuz."
-#: server/unittools.c:2258
+#: server/unittools.c:2263
msgid "You have unleashed a horde of barbarians!"
msgstr "Barbarların yuvasını buldunuz!"
-#: server/unittools.c:2261
+#: server/unittools.c:2266
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr "%s biriminiz barbarlar tarafından öldürüldü!"
-#: server/unittools.c:2277
+#: server/unittools.c:2282
msgid "You found a friendly city."
msgstr "KardeÅŸ ÅŸehir buldunuz."
-#: server/unittools.c:2291
+#: server/unittools.c:2296
msgid "Friendly nomads are impressed by you, and join you."
msgstr "Dost canlısı göçebeler size katıldılar."
-#: server/unittools.c:2316
+#: server/unittools.c:2321
msgid "Your overflight frightens the tribe; they scatter in terror."
msgstr "Uçaktan korkan kabile korku içinde saklanacak yer aradı."
-#: server/unittools.c:2574
+#: server/unittools.c:2579
#, c-format
msgid "Orders for %s aborted after enemy movement was spotted."
msgstr ""
"%s biriminin emirleri, yakınlarında düşman hareketi gördüğü için iptal "
"edildi."
-#: server/unittools.c:3023
+#: server/unittools.c:3028
#, c-format
msgid "Orders for %s aborted as there are units nearby."
msgstr "%s biriminin emirleri yakınlarında birimler olduğu için iptal edildi."
-#: server/unittools.c:3075
+#: server/unittools.c:3080
#, c-format
msgid "Orders for %s aborted because building of city failed."
msgstr "%s biriminin emirleri şehir yapımı başarısız olduğu için iptal edildi."
-#: server/unittools.c:3088
+#: server/unittools.c:3093
#, c-format
msgid "Orders for %s aborted since they give an invalid activity."
msgstr "%s biriminin emirleri geçersiz olduğu için iptal edildi."
-#: server/unittools.c:3102
+#: server/unittools.c:3107
#, c-format
msgid "Orders for %s aborted since they give an invalid location."
msgstr "%s biriminin emirleri yer geçersiz olduğu için iptal edildi."
-#: server/unittools.c:3112
+#: server/unittools.c:3117
#, c-format
msgid "Orders for %s aborted as there are units in the way."
msgstr "%s biriminin emirleri yolunda birimler olduğu için iptal edildi."
-#: server/unittools.c:3138
+#: server/unittools.c:3143
#, c-format
msgid "Orders for %s aborted because of failed move."
msgstr "%s biriminin emirleri başarısız hareket nedeniyle iptal edildi."
-#: server/unittools.c:3179
+#: server/unittools.c:3184
#, c-format
msgid "Attempt to change homecity for %s failed."
msgstr "%s biriminin memleketi deÄŸiÅŸtirilemedi."
-#: server/unittools.c:3190
+#: server/unittools.c:3195
#, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr "%s şehriyle ticaret yolu yapılamadı."
-#: server/unittools.c:3202
+#: server/unittools.c:3207
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr "%s şehrinde harika yapımı başarısız oldu."
-#: server/unittools.c:3211
+#: server/unittools.c:3216
#, c-format
msgid "Your %s has invalid orders."
msgstr "%s biriminiz geçersiz emirler almış."
+#: server/voting.c:522
+#, c-format
+msgid ""
+"%s %d \"%s\" is passed %d to %d with %d abstentions and %d who did not vote."
+msgstr ""
+
+#: server/voting.c:528
+#, c-format
+msgid ""
+"%s %d \"%s\" failed with %d against, %d for, %d abstentions and %d who did "
+"not vote."
+msgstr ""
+
+#: server/voting.c:548
+#, c-format
+msgid "%s %d: %s voted yes."
+msgstr ""
+
+#: server/voting.c:553
+#, c-format
+msgid "%s %d: %s voted no."
+msgstr ""
+
+#: server/voting.c:558
+#, c-format
+msgid "%s %d: %s chose to abstain."
+msgstr ""
+
+#. TRANS: Describing a new vote that can only pass
+#. * if there are no dissenting votes.
+#: server/voting.c:726
+#, c-format
+msgid "%s (needs %0.0f%% and no dissent)."
+msgstr ""
+
+#. TRANS: Describing a new vote that can pass only if the
+#. * given percentage of players votes 'yes'.
+#: server/voting.c:732
+#, c-format
+msgid "%s (needs %0.0f%% in favor)."
+msgstr ""
+
#: server/generator/mapgen.c:1771
msgid "High landmass - this may take a few seconds."
msgstr "Yüksek kara parçası - bu birkaç saniye alabilir."
@@ -7115,12 +7249,12 @@ msgid ""
"Please report this bug at %s."
msgstr ""
-#: client/attribute.c:363
+#: client/attribute.c:368
msgid ""
"There has been a CMA error. Your citizen governor settings may be broken."
msgstr "CMA hatası oluştu. Şehir valisi ayarlarınız bozuk olabilir."
-#: client/attribute.c:367
+#: client/attribute.c:372
msgid "Old attributes detected and removed."
msgstr "Eski parametreler bulundu ve silindi."
@@ -7265,41 +7399,41 @@ msgstr "%+4d : Nüfus\n"
msgid "%+4d : Taxed from trade\n"
msgstr "%+4d : Ticaretten gelen vergiler\n"
-#: client/citydlg_common.c:418
+#: client/citydlg_common.c:421
#, c-format
msgid "%+4d : Trade route with %s\n"
msgstr "%+4d : %s ile ticaret yolu\n"
-#: client/citydlg_common.c:427
+#: client/citydlg_common.c:430
#, c-format
msgid "%+4d : Building tithes\n"
msgstr "%+4d : İnşaat öşrü\n"
-#: client/citydlg_common.c:450
+#: client/citydlg_common.c:453
#, c-format
msgid "%+4d : Bonus from %s (%+d%%)\n"
msgstr "%+4d : %s'den gelen Bonus (%+d%%)\n"
-#: client/citydlg_common.c:462
+#: client/citydlg_common.c:465
#, c-format
msgid "%+4d : Waste\n"
msgstr "%+4d : Atık\n"
-#: client/citydlg_common.c:468
+#: client/citydlg_common.c:471
#, c-format
msgid "%+4d : Disorder\n"
msgstr "%+4d : KargaÅŸa\n"
-#: client/citydlg_common.c:474
+#: client/citydlg_common.c:477
#, c-format
msgid "%+4d : Used\n"
msgstr "%+4d : Kullanımda\n"
-#: client/citydlg_common.c:479
+#: client/citydlg_common.c:482
msgid "==== : Adds up to\n"
msgstr "==== : Toplam\n"
-#: client/citydlg_common.c:481
+#: client/citydlg_common.c:484
#, c-format
msgid "%4d : Total surplus"
msgstr "%4d : Bakiye"
@@ -7606,50 +7740,50 @@ msgstr "?Uzman:U"
msgid "Specialists"
msgstr "Uzmanlar"
-#: client/civclient.c:240
+#: client/civclient.c:241
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr " -a, --autoconnect\tBağlantı penceresini atla\n"
-#: client/civclient.c:250
+#: client/civclient.c:251
msgid " -l, --log FILE\tUse FILE as logfile (spawned server also uses this)\n"
msgstr ""
" -l, --log DOSYA\tKütük dosyası olarak DOSYA'yı kullan (yeni başlayan "
"sunucu da bunu kullanır)\n"
-#: client/civclient.c:252
+#: client/civclient.c:253
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr " -m, --meta ADRES\tADRES ile belirtilen metasunucuya baÄŸlan\n"
-#: client/civclient.c:254
+#: client/civclient.c:255
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr " -n, --name Ä°SÄ°M\tÄ°sim olarak Ä°SÄ°M'i kullan\n"
-#: client/civclient.c:256
+#: client/civclient.c:257
msgid " -p, --port PORT\tConnect to server port PORT (usually with -a)\n"
msgstr ""
-#: client/civclient.c:258
+#: client/civclient.c:259
#, c-format
msgid " -P, --Plugin PLUGIN\tUse PLUGIN for sound output %s\n"
msgstr ""
-#: client/civclient.c:260
+#: client/civclient.c:261
msgid " -r, --read FILE\tRead startup script FILE (for spawned server only)\n"
msgstr ""
-#: client/civclient.c:263
+#: client/civclient.c:264
msgid " -s, --server HOST\tConnect to the server at HOST (usually with -a)\n"
msgstr ""
-#: client/civclient.c:265
+#: client/civclient.c:266
msgid " -S, --Sound FILE\tRead sound tags from FILE\n"
msgstr ""
-#: client/civclient.c:266
+#: client/civclient.c:267
msgid " -t, --tiles FILE\tUse data file FILE.tilespec for tiles\n"
msgstr ""
-#: client/civclient.c:269
+#: client/civclient.c:270
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7657,45 +7791,45 @@ msgid ""
msgstr ""
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:274
+#: client/civclient.c:275
#, c-format
msgid "Report bugs at %s\n"
msgstr "Hataları %s adresine bildiriniz\n"
-#: client/civclient.c:298
+#: client/civclient.c:299
#, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr ""
-#: client/civclient.c:300 client/civclient.c:315
+#: client/civclient.c:301 client/civclient.c:316
msgid "Try using --help.\n"
msgstr "-- help kullanmaya bir dene\n"
-#: client/civclient.c:313
+#: client/civclient.c:314
#, c-format
msgid "Invalid debug level \"%s\" specified with --debug option.\n"
msgstr ""
-#: client/civclient.c:326
+#: client/civclient.c:327
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr "Tanınmayan ayar: \"%s\"\n"
-#: client/civclient.c:391
+#: client/civclient.c:393
#, fuzzy, c-format
msgid "Updating old metaserver address \"%s\"."
msgstr "metaserver <adres>"
-#: client/civclient.c:394
+#: client/civclient.c:396
#, fuzzy, c-format
msgid "Default metaserver has been set to \"%s\"."
msgstr "Ayar: %s ayarı \"%s\" olarak değiştirildi."
-#: client/civclient.c:550
+#: client/civclient.c:540
msgid "Game started."
msgstr "Oyun başladı."
-#: client/civclient.c:588
+#: client/civclient.c:606
msgid "There was an error while auto connecting; aborting."
msgstr "Otomatik bağlanırken bir hata oluştu, iptal ediliyor."
@@ -7825,76 +7959,76 @@ msgstr "Bağlantı sağlanıyor."
msgid "Disconnected from server."
msgstr "Sunucu bağlantısı kesildi"
-#: client/clinet.c:469
+#: client/clinet.c:473
#, c-format
msgid "Failed to contact server \"%s\" at port %d as \"%s\" after %d attempts"
msgstr ""
-#: client/clinet.c:484 client/clinet.c:486
+#: client/clinet.c:488 client/clinet.c:490
msgid "Connection to server refused. Please start the server."
msgstr "Sunucu bağlantısı kabul edilmedi. Lütfen sunucuyu başlatın."
-#: client/clinet.c:495 client/clinet.c:523
+#: client/clinet.c:499 client/clinet.c:527
#, c-format
msgid ""
"Error contacting server \"%s\" at port %d as \"%s\":\n"
" %s\n"
msgstr ""
-#: client/clinet.c:514
+#: client/clinet.c:518
#, c-format
msgid ""
"Auto-connecting to server \"%s\" at port %d as \"%s\" every %f second(s) for "
"%d times"
msgstr ""
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
+#: client/connectdlg_common.c:78 client/gui-gtk-2.0/pages.c:1358
msgid "novice"
msgstr "acemi"
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1358
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
msgid "easy"
msgstr "kolay"
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1359
msgid "normal"
msgstr "normal"
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr "zor"
-#: client/connectdlg_common.c:83
+#: client/connectdlg_common.c:82
msgid "experimental"
msgstr "deneysel"
-#: client/connectdlg_common.c:213
+#: client/connectdlg_common.c:212
msgid "Starting server..."
msgstr "Sunucuya bağlanıyor... "
-#: client/connectdlg_common.c:332
+#: client/connectdlg_common.c:331
msgid "Couldn't start the server."
msgstr "Sunucu başlatılamadı."
-#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
+#: client/connectdlg_common.c:332 client/connectdlg_common.c:365
msgid "You'll have to start one manually. Sorry..."
msgstr "Elle bir tane açmanız gerekecek. Üzgünüm..."
-#: client/connectdlg_common.c:364
+#: client/connectdlg_common.c:363
msgid "Couldn't connect to the server."
msgstr "Sunucuya bağlanılamadı."
-#: client/connectdlg_common.c:365
+#: client/connectdlg_common.c:364
msgid "We probably couldn't start it from here."
msgstr "Galiba buradan başlatamadık."
-#: client/connectdlg_common.c:470
+#: client/connectdlg_common.c:469
#, fuzzy
msgid ""
"Established control over the server. You have command access level 'hack'."
msgstr "Sunucu bizim kontrolümüzde (komut erişim seviyesi)"
-#: client/connectdlg_common.c:475
+#: client/connectdlg_common.c:474
msgid ""
"Failed to obtain the required access level to take control of the server. "
"The server will now be shutdown."
@@ -7904,27 +8038,27 @@ msgstr ""
msgid "Only transporter units can be unloaded."
msgstr "Sadece taşıyıcı birimler boşaltabilir."
-#: client/control.c:1425
+#: client/control.c:1417
msgid "Only settler units can be put into auto mode."
msgstr "Sadece göçmen birimleri otomatik moda alınabilir."
-#: client/control.c:1516
+#: client/control.c:1511
msgid "Only nuclear units can do this."
msgstr "Sadece nükleer birimler bunu yapabilir."
-#: client/control.c:1545
+#: client/control.c:1540
msgid "Only paratrooper units can do this."
msgstr "Sadece paraşütçü birimler bunu yapabilir."
-#: client/control.c:2020
+#: client/control.c:2015
msgid "Too far for this unit."
msgstr "Bu birim için fazla uzak."
-#: client/control.c:2230 client/control.c:2260 client/control.c:2276
+#: client/control.c:2225 client/control.c:2255 client/control.c:2271
msgid "Didn't find a route to the destination!"
msgstr "Hedefe giden yol bulunamadı!"
-#: client/control.c:2320
+#: client/control.c:2315
msgid "Oh my! You seem to have no capital!"
msgstr "Allah Allah! BaÅŸkentin yokmuÅŸ!"
@@ -8316,27 +8450,34 @@ 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:1066 client/helpdata.c:1400
+#: client/helpdata.c:1066 client/helpdata.c:1408
msgid " or "
msgstr " veya "
-#: client/helpdata.c:1068 client/helpdata.c:1388
+#: client/helpdata.c:1068 client/helpdata.c:1396
msgid "?or:, "
msgstr ", "
-#: client/helpdata.c:1080
-#, 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"
+#: client/helpdata.c:1079
+#, fuzzy, c-format
+msgid "* Unit has to be in a city, or a base after %d turn.\n"
+msgid_plural "* Unit has to be in a city, or a base 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:1087
+#, fuzzy, c-format
+msgid "* Unit has to be in a city, a base, or on a %s after %d turn.\n"
+msgid_plural "* Unit has to be in a city, a base, 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:1122
+#: client/helpdata.c:1130
#, 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:1127
+#: client/helpdata.c:1135
#, c-format
msgid ""
"To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8345,90 +8486,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:1135
+#: client/helpdata.c:1143
msgid "You cannot research this technology."
msgstr "Bu teknolojiyi araştıramazsınız."
-#: client/helpdata.c:1139
+#: client/helpdata.c:1147
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:1151
+#: client/helpdata.c:1159
#, 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:1156
+#: client/helpdata.c:1164
#, 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:1159
+#: client/helpdata.c:1167
#, 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:1163
+#: client/helpdata.c:1171
msgid "* Increases the pollution generated by the population.\n"
msgstr "* Nüfustan doğan kirliliği arttırır.\n"
-#: client/helpdata.c:1168
+#: client/helpdata.c:1176
#, 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:1175
+#: client/helpdata.c:1183
#, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr "* %s biriminin kale yapmasına imkân sağlar.\n"
-#: client/helpdata.c:1183
+#: client/helpdata.c:1191
#, c-format
msgid "* Allows %s to build airbases.\n"
msgstr "* %s biriminin hava üssü yapmasına imkân sağlar.\n"
-#: client/helpdata.c:1192
+#: client/helpdata.c:1200
#, c-format
msgid "* Allows %s to upgrade roads to railroads.\n"
msgstr "* %s biriminin yolları raya çevirmesine izin verir.\n"
-#: client/helpdata.c:1200
+#: client/helpdata.c:1208
#, 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:1234
+#: client/helpdata.c:1242
msgid "* Pollution cannot be generated on this terrain."
msgstr "* Bu arazide kirlilik oluÅŸturulamaz."
-#: client/helpdata.c:1239
+#: client/helpdata.c:1247
msgid "* You cannot build cities on this terrain."
msgstr "* Bu arazide şehir yapılamaz."
-#: client/helpdata.c:1245
+#: client/helpdata.c:1253
msgid "* The coastline of this terrain is unsafe."
msgstr "* Bu arazinin sahili güvenli değildir."
-#: client/helpdata.c:1250
+#: client/helpdata.c:1258
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:1255
+#: client/helpdata.c:1263
msgid "* Land units cannot travel on oceanic terrains."
msgstr "* Kara birimleri denizde gidemezler."
-#: client/helpdata.c:1305
+#: client/helpdata.c:1313
msgid "Features:\n"
msgstr "Özellik:\n"
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1411 client/helpdata.c:1412
+#: client/helpdata.c:1419 client/helpdata.c:1420
msgid "?outputlist: Nothing "
msgstr " Hiç "
-#: client/helpdata.c:1419
+#: client/helpdata.c:1427
#, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -8439,7 +8580,7 @@ msgid_plural ""
msgstr[0] ""
"* Sınır dışında bulunan veya savaşan her birim %d vatandaşı mutsuz eder.\n"
-#: client/helpdata.c:1429
+#: client/helpdata.c:1437
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8448,49 +8589,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:1437
+#: client/helpdata.c:1445
#, 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:1442
+#: client/helpdata.c:1450
#, 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:1447
+#: client/helpdata.c:1455
#, 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:1451
+#: client/helpdata.c:1459
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:1460
+#: client/helpdata.c:1468
#, 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:1468
+#: client/helpdata.c:1476
#, 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:1475
+#: client/helpdata.c:1483
#, 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:1482
+#: client/helpdata.c:1490
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -8500,7 +8641,7 @@ msgstr ""
"çıkmaya başlayacaktır.\n"
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1489
+#: client/helpdata.c:1497
#, c-format
msgid ""
"* After the first unhappy citizen due to city size, for each %d additional "
@@ -8509,17 +8650,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:1497
+#: client/helpdata.c:1505
#, 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:1502
+#: client/helpdata.c:1510
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr "bilim/vergi/lüks oranlarında sınır yoktur.\n"
-#: client/helpdata.c:1507
+#: client/helpdata.c:1515
#, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -8531,14 +8672,14 @@ msgstr[0] ""
"* Birimleriniz sıkıyönetim yapabilir. Bir şehirdeki her askeri birim %d "
"mutsuz vatandaşı memnun edecektir.\n"
-#: client/helpdata.c:1519
+#: client/helpdata.c:1527
#, 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:1530
+#: client/helpdata.c:1538
#, c-format
msgid ""
"* You may grow your cities by means of celebrations. Your cities must be at "
@@ -8547,15 +8688,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:1536
+#: client/helpdata.c:1544
msgid "* Your units cannot be bribed.\n"
msgstr "* Birimleriniz rüşvet kabul etmezler.\n"
-#: client/helpdata.c:1539
+#: client/helpdata.c:1547
msgid "* Your cities cannot be incited.\n"
msgstr "* Şehirlerinizde ayaklanma çıkartılamaz.\n"
-#: client/helpdata.c:1543
+#: client/helpdata.c:1551
msgid ""
"* Government will fall into anarchy if any city is in disorder for more than "
"two turns in a row.\n"
@@ -8563,39 +8704,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:1549
+#: client/helpdata.c:1557
msgid "* Has a senate that may prevent declaration of war.\n"
msgstr "* Senato, savaş kararını veto edebilir.\n"
-#: client/helpdata.c:1553
+#: client/helpdata.c:1561
msgid "* Allows partisans when cities are taken by the enemy.\n"
msgstr "* Şehri düşmanlar alınca partizan oluşturur.\n"
-#: client/helpdata.c:1557
+#: client/helpdata.c:1565
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:1561
+#: client/helpdata.c:1569
msgid "* Pays no upkeep for fanatics.\n"
msgstr "* Müfritler için bakım ücreti ödenmez.\n"
-#: client/helpdata.c:1564
+#: client/helpdata.c:1572
msgid "* Has no unhappy citizens.\n"
msgstr "* Hiç mutsuz vatandaşı yok.\n"
-#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
+#: client/helpdata.c:1582 client/helpdata.c:1586 client/helpdata.c:1590
#, c-format
msgid "* Veteran %s units.\n"
msgstr "* Kıdemli %s birimleri.\n"
-#: client/helpdata.c:1585
+#: client/helpdata.c:1593
msgid "* Veteran units.\n"
msgstr "* Kıdemli birimler.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1591
+#: client/helpdata.c:1599
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8605,7 +8746,7 @@ msgstr ""
"her arazinin geliri 1 azalır.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1600
+#: client/helpdata.c:1608
#, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8615,7 +8756,7 @@ msgstr ""
"yapıldığı zaman %d daha fazla gelir sağlar.\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1608
+#: client/helpdata.c:1616
#, c-format
msgid "* Each worked tile with at least 1 %s will yield %d more of it.\n"
msgstr ""
@@ -8623,65 +8764,65 @@ msgstr ""
"gelir saÄŸlar.\n"
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1617
+#: client/helpdata.c:1625
#, 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:1625
+#: client/helpdata.c:1633
#, 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:1630
+#: client/helpdata.c:1638
#, 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:1635
+#: client/helpdata.c:1643
#, 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:1643
+#: client/helpdata.c:1651
#, 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:1649
+#: client/helpdata.c:1657
#, 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:1655
+#: client/helpdata.c:1663
#, 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:1672
+#: client/helpdata.c:1680
#, 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:1699
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d %s"
msgstr "%s%d %s"
-#: client/helpdata.c:1700 client/helpdata.c:1708 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1708 client/helpdata.c:1716 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:1707
+#: client/helpdata.c:1715
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d mutsuz"
@@ -8750,7 +8891,7 @@ msgid ""
"or with the -a command-line parameter."
msgstr ""
-#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:916 data/Freeciv.in:107
msgid "Metaserver"
msgstr "Metasunucu"
@@ -9101,35 +9242,35 @@ msgstr ""
msgid "Saved settings to file %s"
msgstr "Ayarlar %s dosyasına yazıldı"
-#: client/packhand.c:211 client/packhand.c:217
+#: client/packhand.c:212 client/packhand.c:218
msgid "You were rejected from the game...."
msgstr "Oyuna kabul edilmediniz..."
-#: client/packhand.c:229
+#: client/packhand.c:230
#, c-format
msgid "Client capability string: %s"
msgstr ""
-#: client/packhand.c:232
+#: client/packhand.c:233
#, c-format
msgid "Server capability string: %s"
msgstr ""
-#: client/packhand.c:850
+#: client/packhand.c:864
#, c-format
msgid "Start of turn %d"
msgstr "%d. sıranın başlangıcı"
-#: client/packhand.c:1591
+#: client/packhand.c:1621
#, c-format
msgid "AI Mode is now %s."
msgstr "YZ Modu ÅŸimdi %s."
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "ON"
msgstr "AÇIK"
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "OFF"
msgstr "KAPALI"
@@ -9160,15 +9301,15 @@ msgstr "Ä°sim"
msgid "Username"
msgstr "Kullanıcı adı"
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
-#: client/gui-gtk-2.0/pages.c:2157
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:653
+#: client/gui-gtk-2.0/pages.c:1604 client/gui-gtk-2.0/pages.c:2159
msgid "Flag"
msgstr "Bayrak"
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1605
-#: client/gui-gtk-2.0/pages.c:2159 client/gui-sdl/repodlgs.c:2063
-#: client/gui-win32/connectdlg.c:990 client/gui-win32/dialogs.c:542
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:657
+#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1609
+#: client/gui-gtk-2.0/pages.c:2161 client/gui-sdl/repodlgs.c:2063
+#: client/gui-win32/connectdlg.c:992 client/gui-win32/dialogs.c:542
#: client/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "Millet"
@@ -9181,7 +9322,7 @@ msgstr "Sınır"
msgid "Score"
msgstr "Puan"
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1614
msgid "Team"
msgstr "Takım"
@@ -9214,36 +9355,36 @@ msgstr "BoÅŸta"
msgid "Ping"
msgstr "Ping"
-#: client/repodlgs_common.c:375
+#: client/repodlgs_common.c:378
msgid "You cannot sell improvements."
msgstr "Yapıları satamazsınız."
-#: client/repodlgs_common.c:391
+#: client/repodlgs_common.c:394
#, c-format
msgid "Sold %d %s for %d gold."
msgstr "%d tane %s, %d altına satıldı."
-#: client/repodlgs_common.c:396
+#: client/repodlgs_common.c:399
#, c-format
msgid "No %s could be sold."
msgstr "Hiçbir %s satılamadı."
#. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:415
+#: client/repodlgs_common.c:418
msgid "You cannot disband units."
msgstr "Birimleri terhis edemezsiniz."
-#: client/repodlgs_common.c:420
+#: client/repodlgs_common.c:423
#, c-format
msgid "%s cannot be disbanded."
msgstr "%s terhis edilemedi."
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:444
#, c-format
msgid "Disbanded %d %s."
msgstr "%d %s terhis edildi."
-#: client/repodlgs_common.c:445
+#: client/repodlgs_common.c:448
#, c-format
msgid "No %s could be disbanded."
msgstr "Hiçbir %s terhis edilemedi."
@@ -9816,101 +9957,101 @@ msgstr "%02dg %02ds"
msgid "?duration:overflow"
msgstr "zaman aşımı"
-#: client/text.c:1143
+#: client/text.c:1145
#, c-format
msgid "%6d.%02d ms"
msgstr "%6d.%02d ms"
#. TRANS: <nation adjective> <government name>.
#. * E.g. "Polish Republic".
-#: client/text.c:1188
+#: client/text.c:1193
#, fuzzy, c-format
msgid "?nationgovernment:%s %s"
msgstr "Yönetim biçimi: %s"
#. TRANS: "Observer: 1985"
-#: client/text.c:1198
+#: client/text.c:1203
#, c-format
msgid "Observer: %s"
msgstr "Seyirci: %s"
-#: client/text.c:1216
+#: client/text.c:1221
msgid "Buildings: "
msgstr "Yapılar: "
-#: client/text.c:1233 client/text.c:1272
+#: client/text.c:1238 client/text.c:1277
msgid "None. "
msgstr "Hiç. "
-#: client/text.c:1235 client/text.c:1274
+#: client/text.c:1240 client/text.c:1279
msgid "?clistend:."
msgstr "."
-#: client/text.c:1253
+#: client/text.c:1258
msgid "Wonders: "
msgstr "Harikalar: "
-#: client/text.c:1308
+#: client/text.c:1313
#, 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:1312
+#: client/text.c:1317
#, 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:1318
+#: client/text.c:1323
#, c-format
msgid "%d additional unhappy citizen."
msgid_plural "%d additional unhappy citizens."
msgstr[0] "%d fazladan mutsuz vatandaÅŸ."
-#: client/text.c:1339
+#: client/text.c:1344
#, fuzzy
msgid "Unlimited martial law in effect."
msgstr "Sıkıyönetim var ("
-#: client/text.c:1341
+#: client/text.c:1346
#, fuzzy, c-format
msgid "%d military unit may impose martial law."
msgid_plural "Up to %d military units may impose martial law."
msgstr[0] "* Sivil bir birimdir (saldırı yapamaz; sıkıyönetimi etkilemez).\n"
-#: client/text.c:1345
+#: client/text.c:1350
#, fuzzy, c-format
msgid "Each military unit makes %d unhappy citizen content."
msgid_plural "Each military unit makes %d unhappy citizens content."
msgstr[0] "Şehirdeki vatandaşları eğlendirir. 3 mutsuz vatandaş memnun olur."
-#: client/text.c:1352
+#: client/text.c:1357
msgid "Military units in the field may cause unhappiness. "
msgstr "Arazideki askeri birimler mutsuzluÄŸa neden olabilir. "
-#: client/text.c:1355
+#: client/text.c:1360
msgid "Military units have no happiness effect. "
msgstr "Askeri birimlerin mutsuzluÄŸa etkisi yok. "
-#: client/text.c:1370
+#: client/text.c:1375
#, c-format
msgid "Luxury: %d total."
msgstr "Lüks: toplam %d."
-#: client/tilespec.c:865
+#: client/tilespec.c:882
msgid "No usable default tileset found, aborting!"
msgstr "Kullanılabilir bir öntanımlı arazi seti bulunamadı, çıkıyor!"
-#: client/tilespec.c:1338
+#: client/tilespec.c:1355
msgid ""
"Client does not support isometric tilesets. Using default tileset instead."
msgstr ""
"İstemci izometrik arazi setlerini desteklemiyor. Öntanımlı arazi seti "
"kullanılıyor."
-#: client/tilespec.c:1347
+#: client/tilespec.c:1364
msgid ""
"Client does not support overhead view tilesets. Using default tileset "
"instead."
@@ -9918,7 +10059,7 @@ msgstr ""
"İstemci kuş bakışı arazi setlerini desteklemiyor. Öntanımlı arazi seti "
"kullanılıyor."
-#: client/tilespec.c:3966
+#: client/tilespec.c:3987
#, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -10601,7 +10742,7 @@ msgid "_Display"
msgstr "Gös_ter"
#: client/gui-gtk-2.0/cityrep.c:1006 client/gui-gtk-2.0/menu.c:839
-#: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
+#: client/gui-sdl/diplodlg.c:692 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
#: client/gui-xaw/cityrep.c:533 client/gui-xaw/menu.c:156
@@ -10773,192 +10914,192 @@ msgstr "Hedef şablonunun adı ne olsun?"
msgid "Remove this preset?"
msgstr "Hedef ÅŸablonu silinsin?"
-#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:222
+#: client/gui-gtk-2.0/dialogs.c:197 client/gui-gtk-2.0/messagewin.c:222
msgid "Goto _Location"
msgstr "_Oraya git"
-#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
+#: client/gui-gtk-2.0/dialogs.c:202 client/gui-gtk-2.0/messagewin.c:226
msgid "Inspect _City"
msgstr "_Åžehre Odaklan"
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:258 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:258 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:259 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:311 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:312 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:312 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:313 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:506
+#: client/gui-gtk-2.0/dialogs.c:507
msgid "Unit"
msgstr "Birim"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:950
-#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2155
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:985
+#: client/gui-gtk-2.0/dialogs.c:508 client/gui-gtk-2.0/pages.c:950
+#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2157
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:987
#: 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:519 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:520 client/gui-sdl/dialogs.c:627
msgid "Unit selection"
msgstr "Birim seçimi"
-#: client/gui-gtk-2.0/dialogs.c:582
+#: client/gui-gtk-2.0/dialogs.c:583
msgid "_Ready all"
msgstr "_Herkes Hazır Olsun"
-#: client/gui-gtk-2.0/dialogs.c:590
+#: client/gui-gtk-2.0/dialogs.c:591
msgid "_Sentry idle"
msgstr "_Boştakiler nöbet tutsun"
-#: client/gui-gtk-2.0/dialogs.c:719
+#: client/gui-gtk-2.0/dialogs.c:721
msgid "Nation _Groups:"
msgstr "Ulus _Grupları:"
-#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:766 data/Freeciv.in:3128
msgid "What Nation Will You Be?"
msgstr "Hangi Ulusu Yöneteceksiniz?"
-#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
-#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
+#: client/gui-gtk-2.0/dialogs.c:768 client/gui-sdl/chatline.c:842
+#: client/gui-win32/connectdlg.c:1040 data/Freeciv.in:3371
msgid "Pick Nation"
msgstr "Ulus Seçimi"
-#: client/gui-gtk-2.0/dialogs.c:774
+#: client/gui-gtk-2.0/dialogs.c:776
msgid "_Random Nation"
msgstr "_Rastgele Ulus"
-#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:792 client/gui-win32/dialogs.c:517
msgid "Select a nation"
msgstr "Ulus seç"
-#: client/gui-gtk-2.0/dialogs.c:804
+#: client/gui-gtk-2.0/dialogs.c:810
msgid "_Properties"
msgstr "Ö_zellikler"
-#: client/gui-gtk-2.0/dialogs.c:824
+#: client/gui-gtk-2.0/dialogs.c:830
msgid "_Leader:"
msgstr "Ö_nder:"
-#: client/gui-gtk-2.0/dialogs.c:831
+#: client/gui-gtk-2.0/dialogs.c:837
msgid "_Female"
msgstr "_Kadın"
-#: client/gui-gtk-2.0/dialogs.c:836
+#: client/gui-gtk-2.0/dialogs.c:842
msgid "_Male"
msgstr "_Erkek"
-#: client/gui-gtk-2.0/dialogs.c:863
+#: client/gui-gtk-2.0/dialogs.c:869
msgid "City _Styles:"
msgstr "Şehir _Tarzları:"
-#: client/gui-gtk-2.0/dialogs.c:902
+#: client/gui-gtk-2.0/dialogs.c:908
msgid "_Description"
msgstr "_Tanıtım"
-#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1263 client/gui-xaw/dialogs.c:1480
msgid "You must select your sex."
msgstr "Cinsiyetinizi seçmelisiniz."
-#: client/gui-gtk-2.0/dialogs.c:1253 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1268 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:1262 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1277 client/gui-sdl/dialogs.c:2204
#: 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:1306 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1318 client/gui-win32/citydlg.c:1454
#: data/Freeciv.in:2484
msgid "Upgrade Unit!"
msgstr "Birimi Yükselt!"
-#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1327 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 "Eski Birimleri Yükselt"
-#: client/gui-gtk-2.0/diplodlg.c:231 client/gui-win32/diplodlg.c:151
+#: client/gui-gtk-2.0/diplodlg.c:222 client/gui-win32/diplodlg.c:151
#: client/gui-xaw/diplodlg.c:383 client/gui-xaw/diplodlg.c:401
msgid "World-map"
msgstr "Dünya Haritası"
-#: client/gui-gtk-2.0/diplodlg.c:237 client/gui-win32/diplodlg.c:146
+#: client/gui-gtk-2.0/diplodlg.c:228 client/gui-win32/diplodlg.c:146
#: client/gui-xaw/diplodlg.c:387 client/gui-xaw/diplodlg.c:405
msgid "Sea-map"
msgstr "Deniz haritası"
-#: client/gui-gtk-2.0/diplodlg.c:243
+#: client/gui-gtk-2.0/diplodlg.c:234
msgid "_Maps"
msgstr "_Haritalar"
-#: client/gui-gtk-2.0/diplodlg.c:274
+#: client/gui-gtk-2.0/diplodlg.c:265
msgid "_Advances"
msgstr "_Teknolojiler"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/diplodlg.c:315 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "Åže_hirler"
-#: client/gui-gtk-2.0/diplodlg.c:333
+#: client/gui-gtk-2.0/diplodlg.c:324
msgid "_Give shared vision"
msgstr "_Görüş sahasını paylaş"
-#: client/gui-gtk-2.0/diplodlg.c:346
+#: client/gui-gtk-2.0/diplodlg.c:337
msgid "Give _embassy"
msgstr "_Elçilik Ver"
-#: client/gui-gtk-2.0/diplodlg.c:376
+#: client/gui-gtk-2.0/diplodlg.c:368
msgid "_Pacts"
msgstr "_AntlaÅŸmalar"
-#: client/gui-gtk-2.0/diplodlg.c:466
+#: client/gui-gtk-2.0/diplodlg.c:458
#, c-format
msgid "Diplomacy: %s"
msgstr "Diplomasi: %s"
-#: client/gui-gtk-2.0/diplodlg.c:473
+#: client/gui-gtk-2.0/diplodlg.c:465
msgid "_Cancel meeting"
msgstr "_Görüşmeyi iptal et"
-#: client/gui-gtk-2.0/diplodlg.c:475
+#: client/gui-gtk-2.0/diplodlg.c:467
msgid "Accept _treaty"
msgstr "Antlaşmayı kabul et"
-#: client/gui-gtk-2.0/diplodlg.c:503
+#: client/gui-gtk-2.0/diplodlg.c:495
msgid "C_lauses:"
msgstr "Åž_artlar:"
-#: client/gui-gtk-2.0/diplodlg.c:568 client/gui-gtk-2.0/diplodlg.c:642
+#: client/gui-gtk-2.0/diplodlg.c:560 client/gui-gtk-2.0/diplodlg.c:634
msgid "_Gold:"
msgstr "_Altın:"
-#: client/gui-gtk-2.0/diplodlg.c:580 client/gui-gtk-2.0/diplodlg.c:654
+#: client/gui-gtk-2.0/diplodlg.c:572 client/gui-gtk-2.0/diplodlg.c:646
msgid "_Add Clause..."
msgstr "Madde _Ekle..."
-#: client/gui-gtk-2.0/diplodlg.c:699
+#: client/gui-gtk-2.0/diplodlg.c:691
msgid "--- This treaty is blank. Please add some clauses. ---"
msgstr "--- Antlaşma boş. Lütfen madde ekleyin. ---"
-#: client/gui-gtk-2.0/diplodlg.c:905 client/gui-sdl/diplodlg.c:375
+#: client/gui-gtk-2.0/diplodlg.c:897 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 "İstenen altın miktarı geçersiz."
@@ -11017,99 +11158,99 @@ msgstr "Gidilecek yeri seç"
msgid "Show _All Cities"
msgstr "_Bütün Şehirleri Göster"
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:164
msgid "Show Map Scrollbars"
msgstr "Harita Kaydırma Çubuklarını Göster"
-#: client/gui-gtk-2.0/gui_main.c:163
+#: client/gui-gtk-2.0/gui_main.c:165
msgid "Disable this option to hide the scrollbars on the map view."
msgstr "Haritadaki kaydırma çubuklarını gizlemek için bunu kapatın."
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:169
msgid "Keyboardless goto"
msgstr "Klavyesiz git komutu"
-#: client/gui-gtk-2.0/gui_main.c:168
+#: client/gui-gtk-2.0/gui_main.c:170
msgid ""
"If this option is set then a goto may be initiated by left-clicking and then "
"holding down the mouse button while dragging the mouse onto a different tile."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:173
+#: client/gui-gtk-2.0/gui_main.c:175
msgid "Keep dialogs on top"
msgstr "Pencereleri üstte tut"
-#: client/gui-gtk-2.0/gui_main.c:174
+#: client/gui-gtk-2.0/gui_main.c:176
msgid ""
"If this option is set then dialog windows will always remain in front of the "
"main Freeciv window. Disabling this has no effect in fullscreen mode."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:178
+#: client/gui-gtk-2.0/gui_main.c:180
msgid "Show worklist task icons"
msgstr "İş listesinde görev simgelerini çiz"
-#: client/gui-gtk-2.0/gui_main.c:179
+#: client/gui-gtk-2.0/gui_main.c:181
msgid ""
"Disabling this will turn off the unit and building icons in the worklist "
"dialog and the production tab of the city dialog."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:183
+#: client/gui-gtk-2.0/gui_main.c:185
msgid "Enable status report tabs"
msgstr "Durum raporu sekmeleri etkin"
-#: client/gui-gtk-2.0/gui_main.c:184
+#: client/gui-gtk-2.0/gui_main.c:186
msgid ""
"If this option is enabled then report dialogs will be shown as separate tabs "
"rather than in popup dialogs."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:189 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:191 client/gui-win32/gui_main.c:110
msgid "Better fog-of-war drawing"
msgstr "Daha iyi savaş sisi çizimi"
-#: client/gui-gtk-2.0/gui_main.c:190 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:192 client/gui-win32/gui_main.c:111
msgid ""
"If this is enabled then a better method is used for drawing fog-of-war. It "
"is not any slower but will consume about twice as much memory."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:195
+#: client/gui-gtk-2.0/gui_main.c:197
msgid "Show time for each chat message"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:196
+#: client/gui-gtk-2.0/gui_main.c:198
msgid ""
"If this option is enabled then all chat messages will be prefixed by a time "
"string of the form [hour:minute:second]."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:201
+#: client/gui-gtk-2.0/gui_main.c:203
msgid "Split bottom notebook area"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:202
+#: client/gui-gtk-2.0/gui_main.c:204
msgid ""
"Enabling this option will split the bottom notebook into a left and right "
"notebook so that two tabs may be viewed at once."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:207
+#: client/gui-gtk-2.0/gui_main.c:209
msgid "New message events go to top of list"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:208
+#: client/gui-gtk-2.0/gui_main.c:210
msgid ""
"If this option is enabled, new events in the message window will appear at "
"the top of the list, rather than being appended at the bottom."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:213
+#: client/gui-gtk-2.0/gui_main.c:215
msgid "Show extra message window buttons"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:214
+#: client/gui-gtk-2.0/gui_main.c:216
msgid ""
"If this option is enabled, there will be two buttons displayed in the "
"message window for inspecting a city and going to a location. If this option "
@@ -11119,21 +11260,21 @@ msgid ""
"closed and reopened."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:224
+#: client/gui-gtk-2.0/gui_main.c:226
msgid "Metaserver tab first in network page"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:225
+#: client/gui-gtk-2.0/gui_main.c:227
msgid ""
"If this option is enabled, the metaserver tab will be the first notebook tab "
"in the network page. This option requires a restart in order to take effect."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:230
+#: client/gui-gtk-2.0/gui_main.c:232
msgid "Plain chat messages are sent to allies only"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:231
+#: client/gui-gtk-2.0/gui_main.c:233
msgid ""
"If this option is enabled, then plain messages typed into the chat entry "
"while the game is running will only be sent to your allies. Otherwise plain "
@@ -11143,7 +11284,20 @@ msgid ""
"visible in multiplayer games)."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:340 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:245
+msgid "Arrange widgets for small displays"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:246
+msgid ""
+"If this option is enabled, widgets in the main window will be arrange so "
+"that they take up the least amount of total screen space. Specifically, the "
+"left panel containing the overview, player status, and the unit information "
+"box will be extended over the entire left side of the window. This option "
+"requires a restart in order to take effect."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:352 client/gui-xaw/gui_main.c:245
msgid ""
"This client has no special command line options\n"
"\n"
@@ -11151,22 +11305,22 @@ msgstr ""
"Bu istemcinin hiç özel komut satırı ayarı yok\n"
"\n"
-#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
+#: client/gui-gtk-2.0/gui_main.c:847 client/gui-gtk-2.0/gui_main.c:1542
msgid "Freeciv"
msgstr "Freeciv"
-#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
+#: client/gui-gtk-2.0/gui_main.c:1251 client/gui-gtk-2.0/gui_main.c:1258
#: client/gui-sdl/mapctrl.c:1566 client/gui-win32/gui_main.c:482
#: data/Freeciv.in:2618
msgid "Turn Done"
msgstr "Sırayı Geçir"
-#: client/gui-gtk-2.0/gui_main.c:1232 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1258 client/gui-sdl/mapctrl.c:1566
#: client/gui-sdl/mapview.c:1082
msgid "Shift+Return"
msgstr "Shift+Return"
-#: client/gui-gtk-2.0/gui_main.c:1266 client/gui-gtk-2.0/menu.c:797
+#: client/gui-gtk-2.0/gui_main.c:1299 client/gui-gtk-2.0/menu.c:797
#: client/gui-gtk-2.0/menu.c:799 client/gui-gtk-2.0/menu.c:801
#: client/gui-gtk-2.0/menu.c:803 client/gui-gtk-2.0/menu.c:805
#: client/gui-gtk-2.0/menu.c:807 client/gui-gtk-2.0/menu.c:809
@@ -11185,11 +11339,11 @@ msgstr "Shift+Return"
msgid "View"
msgstr "Görünüm"
-#: client/gui-gtk-2.0/gui_main.c:1359
+#: client/gui-gtk-2.0/gui_main.c:1393
msgid "Chat"
msgstr "Sohbet"
-#: client/gui-gtk-2.0/gui_main.c:1377 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1411 client/gui-win32/gui_main.c:538
#: data/Freeciv.in:2809
msgid ""
"Freeciv is free software and you are welcome to distribute copies of it\n"
@@ -11201,78 +11355,78 @@ msgstr ""
"bölümüne bakınız.\n"
"Kolay Gelsin!"
-#: client/gui-gtk-2.0/gui_main.c:1392
+#: client/gui-gtk-2.0/gui_main.c:1426
msgid "Allies Only"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1657
+#: client/gui-gtk-2.0/gui_main.c:1691
msgid "Not _ready"
msgstr "Hazır _Değil"
-#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
+#: client/gui-gtk-2.0/gui_main.c:1702 client/gui-gtk-2.0/pages.c:1679
msgid "_Ready"
msgstr "_Hazır"
-#: client/gui-gtk-2.0/gui_main.c:1672 client/gui-gtk-2.0/gui_main.c:1678
-#: client/gui-gtk-2.0/pages.c:2204
+#: client/gui-gtk-2.0/gui_main.c:1706 client/gui-gtk-2.0/gui_main.c:1712
+#: client/gui-gtk-2.0/pages.c:2206
msgid "_Start"
msgstr "_BaÅŸlat"
-#: client/gui-gtk-2.0/gui_main.c:1686
+#: client/gui-gtk-2.0/gui_main.c:1720
#, fuzzy
msgid "_Take Player"
msgstr "Bu oyuncu al"
-#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
+#: client/gui-gtk-2.0/gui_main.c:1723 client/gui-gtk-2.0/pages.c:1669
msgid "Pick _Nation"
msgstr "Ulus _Seç"
-#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
+#: client/gui-gtk-2.0/gui_main.c:1730 client/gui-gtk-2.0/pages.c:1674
msgid "_Observe"
msgstr "Ä°_zle"
-#: client/gui-gtk-2.0/gui_main.c:1698
+#: client/gui-gtk-2.0/gui_main.c:1732
msgid "Do not _observe"
msgstr "Ä°_zleme"
-#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1755 client/gui-xaw/pages.c:211
msgid "<AI>"
msgstr "<YZ>"
-#: client/gui-gtk-2.0/gui_main.c:1723
+#: client/gui-gtk-2.0/gui_main.c:1758
msgid "<Novice AI>"
msgstr "<Acemi YZ>"
-#: client/gui-gtk-2.0/gui_main.c:1726
+#: client/gui-gtk-2.0/gui_main.c:1761
msgid "<Easy AI>"
msgstr "<Kolay YZ>"
-#: client/gui-gtk-2.0/gui_main.c:1729
+#: client/gui-gtk-2.0/gui_main.c:1764
msgid "<Normal AI>"
msgstr "<Normal YZ>"
-#: client/gui-gtk-2.0/gui_main.c:1732
+#: client/gui-gtk-2.0/gui_main.c:1767
msgid "<Hard AI>"
msgstr "<Zor YZ>"
-#: client/gui-gtk-2.0/gui_main.c:1742 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1777 client/gui-win32/dialogs.c:594
#: client/gui-xaw/pages.c:217
msgid "Random"
msgstr "Rastgele"
-#: client/gui-gtk-2.0/gui_main.c:1808
+#: client/gui-gtk-2.0/gui_main.c:1844 client/gui-gtk-2.0/gui_main.c:1858
msgid "Observer"
msgstr "Gözleyici"
-#: client/gui-gtk-2.0/gui_main.c:1808
+#: client/gui-gtk-2.0/gui_main.c:1858
msgid "Detached"
msgstr "Serbest"
-#: client/gui-gtk-2.0/gui_main.c:2073
+#: client/gui-gtk-2.0/gui_main.c:2117
msgid "Are you sure you want to quit?"
msgstr "Çıkmak istediğinizden emin misiniz?"
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
#, c-format
msgid ""
"Close Tab:\n"
@@ -11281,7 +11435,7 @@ msgstr ""
"Sekmeyi kapat:\n"
"%s"
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
msgid "Ctrl+W"
msgstr "Ctrl+W"
@@ -11386,8 +11540,8 @@ msgid "Trans. Rslt/Time:"
msgstr "Dönüş. Yap/Süre:"
#: 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
-#: client/gui-win32/helpdlg.c:709 client/gui-win32/helpdlg.c:733
+#: client/gui-win32/helpdlg.c:502 client/gui-win32/helpdlg.c:550
+#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:739
#: client/gui-xaw/helpdlg.c:759 client/gui-xaw/helpdlg.c:808
#: client/gui-xaw/helpdlg.c:816 client/gui-xaw/helpdlg.c:853
#: client/gui-xaw/helpdlg.c:878
@@ -11434,34 +11588,34 @@ msgstr "ile"
msgid "?techhelp:"
msgstr "?techhelp:"
-#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:591
+#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:597
#: client/gui-xaw/helpdlg.c:996
#, c-format
msgid "+%d Trade / %d"
msgstr "+%d Ticaret / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:595
+#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:601
#: client/gui-xaw/helpdlg.c:1000
#, c-format
msgid "no extra / %d"
msgstr "etkisiz / %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
-#: client/gui-win32/helpdlg.c:602 client/gui-win32/helpdlg.c:616
-#: client/gui-win32/helpdlg.c:635 client/gui-xaw/helpdlg.c:1002
+#: client/gui-gtk-2.0/helpdlg.c:1085 client/gui-win32/helpdlg.c:604
+#: client/gui-win32/helpdlg.c:608 client/gui-win32/helpdlg.c:622
+#: client/gui-win32/helpdlg.c:641 client/gui-xaw/helpdlg.c:1002
#: client/gui-xaw/helpdlg.c:1006 client/gui-xaw/helpdlg.c:1020
#: client/gui-xaw/helpdlg.c:1039
msgid "n/a"
msgstr "bilinmiyor"
-#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:605
+#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:611
#: client/gui-xaw/helpdlg.c:1009
#, c-format
msgid "+%d Food / %d"
msgstr "+%d Gıda / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:619
+#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:625
#: client/gui-xaw/helpdlg.c:1023
#, c-format
msgid "+%d Res. / %d"
@@ -12227,41 +12381,41 @@ msgstr "Ağ Oyununa Katıl"
msgid "Connect to Gaming _Zone"
msgstr "Bir Oyun Sitesine Katıl"
-#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:302
#: 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:779 client/gui-gtk-2.0/pages.c:820
-#: client/gui-win32/connectdlg.c:916
+#: client/gui-win32/connectdlg.c:918
msgid "Server Name"
msgstr "Sunucu Adı"
#: client/gui-gtk-2.0/pages.c:780 client/gui-gtk-2.0/pages.c:821
-#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:916
+#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:918
#: data/Freeciv.in:96
msgid "Port"
msgstr "Port"
#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Version"
msgstr "Sürüm"
#: client/gui-gtk-2.0/pages.c:782 client/gui-gtk-2.0/pages.c:823
-#: client/gui-gtk-2.0/pages.c:2161 client/gui-win32/connectdlg.c:917
-#: client/gui-win32/connectdlg.c:995
+#: client/gui-gtk-2.0/pages.c:2163 client/gui-win32/connectdlg.c:919
+#: client/gui-win32/connectdlg.c:997
msgid "Status"
msgstr "Durum"
#: client/gui-gtk-2.0/pages.c:783 client/gui-gtk-2.0/pages.c:824
#: client/gui-sdl/connectdlg.c:318 client/gui-sdl/plrdlg.c:330
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Players"
msgstr "Oyuncular"
#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
-#: client/gui-win32/connectdlg.c:918
+#: client/gui-win32/connectdlg.c:920
msgid "Comment"
msgstr "Yorum"
@@ -12293,9 +12447,9 @@ msgstr "_Parola:"
msgid "Conf_irm Password:"
msgstr "Parolayı _Doğrula:"
-#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2165
#: 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:1000
+#: client/gui-win32/citydlg.c:1083 client/gui-win32/connectdlg.c:1002
#: client/gui-win32/wldlg.c:800 client/gui-win32/wldlg.c:806
msgid "Type"
msgstr "Tür"
@@ -12387,7 +12541,7 @@ msgstr "YZ Beceri _Derecesi:"
msgid "Ruleset _Version:"
msgstr "_Kural Seti Sürümü:"
-#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2195
msgid "_More Game Options..."
msgstr "Diğ_er Oyun Ayarları..."
@@ -12403,49 +12557,49 @@ msgstr "Sıralama"
msgid "Ready"
msgstr "Hazır"
-#: client/gui-gtk-2.0/pages.c:1601
+#: client/gui-gtk-2.0/pages.c:1600
#, fuzzy
msgid "?player:Leader"
msgstr "Ä°sim"
-#: client/gui-gtk-2.0/pages.c:1732 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1734 client/gui-sdl/chatline.c:185
msgid "Choose Saved Game to Load"
msgstr "Kayıtlı Oyunu Seç"
-#: client/gui-gtk-2.0/pages.c:1824
+#: client/gui-gtk-2.0/pages.c:1826
msgid "Choose Saved Game to _Load:"
msgstr "Kayıtlı Oyunu _Seç:"
-#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
-#: client/gui-gtk-2.0/pages.c:2451
+#: client/gui-gtk-2.0/pages.c:1846 client/gui-gtk-2.0/pages.c:2039
+#: client/gui-gtk-2.0/pages.c:2455
msgid "_Browse..."
msgstr "_Gözat..."
-#: client/gui-gtk-2.0/pages.c:1911
+#: client/gui-gtk-2.0/pages.c:1913
msgid "Choose a Scenario"
msgstr "Senaryo Seç"
-#: client/gui-gtk-2.0/pages.c:1998
+#: client/gui-gtk-2.0/pages.c:2000
msgid "Choose a _Scenario:"
msgstr "Senaryo _Seç:"
-#: client/gui-gtk-2.0/pages.c:2173
+#: client/gui-gtk-2.0/pages.c:2175
msgid "Choose a _nation to play:"
msgstr "Bir _ulus seç:"
-#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2367 client/gui-win32/menu.c:581
msgid "Select Location to Save"
msgstr "Kaydedilecek Yeri Seç"
-#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2452 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "Oyunu Kaydet"
-#: client/gui-gtk-2.0/pages.c:2489
+#: client/gui-gtk-2.0/pages.c:2493
msgid "Saved _Games:"
msgstr "Kayıtlı _Oyunları:"
-#: client/gui-gtk-2.0/pages.c:2516
+#: client/gui-gtk-2.0/pages.c:2520
msgid "Save _Filename:"
msgstr "_Dosya Adı:"
@@ -12797,7 +12951,7 @@ msgstr "Pencereyi kapat (Esc)"
msgid "Total users logged in : %d"
msgstr "Giriş yapmış kullanıcı sayısı : %d"
-#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1098
msgid "Back"
msgstr "Geri"
@@ -12806,7 +12960,7 @@ msgid "Start"
msgstr "BaÅŸlat"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:777
+#: client/gui-win32/connectdlg.c:779
msgid "Load Game"
msgstr "Oyun Aç"
@@ -12846,9 +13000,9 @@ msgstr "Memleketi Yap"
#: client/gui-sdl/connectdlg.c:308 client/gui-sdl/connectdlg.c:617
#: client/gui-sdl/connectdlg.c:803 client/gui-sdl/connectdlg.c:985
#: client/gui-sdl/dialogs.c:452 client/gui-sdl/dialogs.c:2095
-#: client/gui-sdl/dialogs.c:2893 client/gui-sdl/diplomat_dialog.c:731
+#: client/gui-sdl/dialogs.c:2902 client/gui-sdl/diplomat_dialog.c:731
#: client/gui-sdl/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1043
#: client/gui-win32/dialogs.c:1772 client/gui-win32/finddlg.c:127
#: client/gui-win32/gotodlg.c:171 client/gui-win32/inputdlg.c:146
#: client/gui-win32/messagedlg.c:216 client/gui-win32/ratesdlg.c:328
@@ -12892,7 +13046,7 @@ msgid "Buy it?"
msgstr "Satın alınsın mı?"
#: 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
+#: client/gui-sdl/diplodlg.c:1336 client/gui-sdl/diplomat_dialog.c:1211
#: client/gui-sdl/diplomat_dialog.c:1417 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:221 client/gui-sdl/repodlgs.c:1559
#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
@@ -12908,7 +13062,7 @@ msgid "No"
msgstr "Hayır"
#: client/gui-sdl/citydlg.c:1215 client/gui-sdl/cma_fe.c:318
-#: client/gui-sdl/diplodlg.c:1345 client/gui-sdl/diplomat_dialog.c:1200
+#: client/gui-sdl/diplodlg.c:1346 client/gui-sdl/diplomat_dialog.c:1200
#: client/gui-sdl/diplomat_dialog.c:1407 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:232 client/gui-win32/repodlgs.c:578
#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
@@ -13211,7 +13365,7 @@ msgstr "Freeciv Sunucusu :"
msgid "Port :"
msgstr "Port :"
-#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1100
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr "BaÄŸlan"
@@ -13318,23 +13472,23 @@ msgstr "Yeni Yönetim Biçiminizi Seçin"
msgid "REVOLUTION!"
msgstr "DEVRÄ°M!"
-#: client/gui-sdl/dialogs.c:2232 client/gui-sdl/dialogs.c:2620
+#: client/gui-sdl/dialogs.c:2237 client/gui-sdl/dialogs.c:2625
#: client/gui-win32/dialogs.c:567 data/Freeciv.in:3159
msgid "Female"
msgstr "Kadın"
-#: client/gui-sdl/dialogs.c:2234 client/gui-sdl/dialogs.c:2618
-#: client/gui-sdl/dialogs.c:2830 client/gui-win32/dialogs.c:565
+#: client/gui-sdl/dialogs.c:2239 client/gui-sdl/dialogs.c:2623
+#: client/gui-sdl/dialogs.c:2839 client/gui-win32/dialogs.c:565
msgid "Male"
msgstr "Erkek"
-#: client/gui-sdl/dialogs.c:2478 client/gui-sdl/dialogs.c:2902
+#: client/gui-sdl/dialogs.c:2483 client/gui-sdl/dialogs.c:2911
#: 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 "Tamam"
-#: client/gui-sdl/dialogs.c:2685 client/gui-win32/dialogs.c:505
+#: client/gui-sdl/dialogs.c:2694 client/gui-win32/dialogs.c:505
msgid "What nation will you be?"
msgstr "Hangi ulusu istiyorsunuz?"
@@ -13361,53 +13515,53 @@ msgstr "Dünya Haritası"
msgid "Sea map"
msgstr "Deniz haritası"
-#: client/gui-sdl/diplodlg.c:563
+#: client/gui-sdl/diplodlg.c:564
msgid "Give embassy"
msgstr "Elçilik ver"
-#: client/gui-sdl/diplodlg.c:579 client/gui-win32/diplodlg.c:614
+#: client/gui-sdl/diplodlg.c:580 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 "Altın(azm. %d)"
-#: client/gui-sdl/diplodlg.c:613 client/gui-sdl/helpdlg.c:1956
+#: client/gui-sdl/diplodlg.c:614 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 "Ä°lerlemeler"
-#: client/gui-sdl/diplodlg.c:831 client/gui-win32/diplodlg.c:598
+#: client/gui-sdl/diplodlg.c:832 client/gui-win32/diplodlg.c:598
#: data/Freeciv.in:269
msgid "Diplomacy meeting"
msgstr "Diplomatik buluÅŸma"
-#: client/gui-sdl/diplodlg.c:883 client/gui-win32/diplodlg.c:680
+#: client/gui-sdl/diplodlg.c:884 client/gui-win32/diplodlg.c:680
#: data/Freeciv.in:510
msgid "Cancel meeting"
msgstr "Buluşmayı iptal et"
-#: client/gui-sdl/diplodlg.c:895 client/gui-win32/diplodlg.c:679
+#: client/gui-sdl/diplodlg.c:896 client/gui-win32/diplodlg.c:679
#: data/Freeciv.in:501
msgid "Accept treaty"
msgstr "Antlaşmayı kabul et"
#. TRANS: "Polish incident !" FIXME!!!
-#: client/gui-sdl/diplodlg.c:1304
+#: client/gui-sdl/diplodlg.c:1305
#, c-format
msgid "%s incident !"
msgstr "%s olayı !"
-#: client/gui-sdl/diplodlg.c:1322
+#: client/gui-sdl/diplodlg.c:1323
msgid "Shall we declare WAR on them?"
msgstr "SAVAÅž ilan edelim mi?"
-#: client/gui-sdl/diplodlg.c:1433
+#: client/gui-sdl/diplodlg.c:1434
msgid "Foreign Minister"
msgstr "Dışişleri Bakanı"
-#: client/gui-sdl/diplodlg.c:1449
+#: client/gui-sdl/diplodlg.c:1450
#, c-format
msgid ""
"Sir!, the %s ambassador has arrived\n"
@@ -13416,24 +13570,24 @@ msgstr ""
"Komutanım! %s büyükelçisi geldi\n"
"Emirlerinizi bekliyorum."
-#: client/gui-sdl/diplodlg.c:1465
+#: client/gui-sdl/diplodlg.c:1466
msgid "Declare WAR"
msgstr "SAVAÅž ilan et"
-#: client/gui-sdl/diplodlg.c:1467 client/gui-win32/plrdlg.c:357
+#: client/gui-sdl/diplodlg.c:1468 client/gui-win32/plrdlg.c:357
msgid "Cancel Treaty"
msgstr "Antlaşmayı Boz"
-#: client/gui-sdl/diplodlg.c:1490 client/gui-win32/plrdlg.c:358
+#: client/gui-sdl/diplodlg.c:1491 client/gui-win32/plrdlg.c:358
#: data/Freeciv.in:3254
msgid "Withdraw vision"
msgstr "Görüş sahasını paylaşma"
-#: client/gui-sdl/diplodlg.c:1507
+#: client/gui-sdl/diplodlg.c:1508
msgid "Call Diplomatic Meeting"
msgstr "Diplomatik Buluşmaya Çağır"
-#: client/gui-sdl/diplodlg.c:1521
+#: client/gui-sdl/diplodlg.c:1522
msgid "Send him back"
msgstr "Geri gönder"
@@ -14167,12 +14321,12 @@ msgid "Leave Game"
msgstr "Oyunu Terket"
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1100 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1102 client/gui-xaw/menu.c:121
#: data/Freeciv.in:115 data/Freeciv.in:3180
msgid "Quit"
msgstr "Çık"
-#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:967
msgid "Start New Game"
msgstr "Yeni Oyuna BaÅŸlat"
@@ -14289,8 +14443,8 @@ msgstr "Net Gelir: "
msgid "%s max rate : %d%%"
msgstr "%s azm. oran : %d%%"
-#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
-#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1085
+#: client/gui-win32/connectdlg.c:1093 data/Freeciv.in:155
msgid "Update"
msgstr "Güncelle"
@@ -14781,67 +14935,67 @@ msgstr "Yeni"
msgid "Delete"
msgstr "Sil"
-#: client/gui-win32/connectdlg.c:147
+#: client/gui-win32/connectdlg.c:149
msgid "Password:"
msgstr "Parola:"
-#: client/gui-win32/connectdlg.c:169
+#: client/gui-win32/connectdlg.c:171
msgid "Couldn't load the savegame"
msgstr "Kayıtlı oyun açılamadı"
-#: client/gui-win32/connectdlg.c:284 client/gui-xaw/connectdlg.c:311
+#: client/gui-win32/connectdlg.c:286 client/gui-xaw/connectdlg.c:311
msgid "Verify Password"
msgstr "Parolayı Doğrula"
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:916 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr "Freeciv Sunucusu Seçimi"
-#: client/gui-win32/connectdlg.c:915
+#: client/gui-win32/connectdlg.c:917
msgid "Local Area Network"
msgstr "Yerel AÄŸ (LAN)"
-#: client/gui-win32/connectdlg.c:949
+#: client/gui-win32/connectdlg.c:951
msgid "Welcome to Freeciv"
msgstr "Freeciv'e HoÅŸ Geldiniz"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Load Saved Game"
msgstr "Kayıtlı Oyun Aç"
-#: client/gui-win32/connectdlg.c:969
+#: client/gui-win32/connectdlg.c:971
msgid "Connect To Network Game"
msgstr "AÄŸ Oyununa BaÄŸlan"
-#: client/gui-win32/connectdlg.c:979
+#: client/gui-win32/connectdlg.c:981
msgid "Choose a nation to play"
msgstr "Bir ulus seçin"
-#: client/gui-win32/connectdlg.c:1014
+#: client/gui-win32/connectdlg.c:1016
msgid "Number of players (Including AI):"
msgstr "Oyuncu sayısı (YZ dahil):"
-#: client/gui-win32/connectdlg.c:1022
+#: client/gui-win32/connectdlg.c:1024
msgid "AI skill level:"
msgstr "YZ ustalık derecesi:"
-#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1038 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr "Oyun Ayarları"
-#: client/gui-win32/connectdlg.c:1040
+#: client/gui-win32/connectdlg.c:1042
msgid "Start Game"
msgstr "Oyunu BaÅŸlat"
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Login:"
msgstr "GiriÅŸ:"
-#: client/gui-win32/connectdlg.c:1061
+#: client/gui-win32/connectdlg.c:1063
msgid "Host:"
msgstr "Host:"
-#: client/gui-win32/connectdlg.c:1062
+#: client/gui-win32/connectdlg.c:1064
msgid "Port:"
msgstr "Port:"
@@ -14919,21 +15073,21 @@ msgid ""
"this is much slower."
msgstr ""
-#: client/gui-win32/helpdlg.c:769 client/gui-win32/helpdlg.c:792
-#: client/gui-win32/helpdlg.c:803 client/gui-win32/helpdlg.c:809
-#: client/gui-win32/helpdlg.c:822
+#: client/gui-win32/helpdlg.c:775 client/gui-win32/helpdlg.c:798
+#: client/gui-win32/helpdlg.c:809 client/gui-win32/helpdlg.c:815
+#: client/gui-win32/helpdlg.c:828
msgid "Allows "
msgstr "Sağladıkları "
-#: client/gui-win32/helpdlg.c:780
+#: client/gui-win32/helpdlg.c:786
msgid "Obsoletes "
msgstr "Eskittikleri "
-#: client/gui-win32/helpdlg.c:812 client/gui-win32/helpdlg.c:825
+#: client/gui-win32/helpdlg.c:818 client/gui-win32/helpdlg.c:831
msgid " (with "
msgstr " (bununla birlikte: "
-#: client/gui-win32/helpdlg.c:815 client/gui-win32/helpdlg.c:828
+#: client/gui-win32/helpdlg.c:821 client/gui-win32/helpdlg.c:834
msgid "?techhelp:)."
msgstr ")."
@@ -16049,11 +16203,12 @@ msgid " Present administrators: "
msgstr " Şimdiki yöneticiler: "
#: 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/"
+" https://gna.org/projects/freeciv/"
msgstr ""
"Hata bulursanız lütfen bize bir hata raporu gönderin. Bunu yapmanın en iyi "
"yolu ÅŸu adresteki Freeciv Hata Takip Sistemi'ni ziyaret etmektir:\n"
@@ -18190,6 +18345,7 @@ msgid "Hydro Plant"
msgstr "Hidroelektrik Santralı"
#: data/default/buildings.ruleset:378
+#, fuzzy
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 "
@@ -18197,45 +18353,42 @@ msgid ""
"a Factory, Mfg. Plant and Hydro Plant together give a 150% production "
"bonus.\n"
"\n"
-"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant. A city "
-"can only build a Hydro Plant if it is next to (or on) a Mountain or River "
-"tile."
+"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant."
msgstr ""
"Şehirde üretimden doğan kirliliği %50 azaltır. Ayrıca şehirdeki Fabrika ve "
"İmalathanenin kalkan üretimini arttırır: Fabrikayla birlikte %75 üretim "
"artışı, İmalathaneyle birlikte %150 üretim artışı sağlar.\n"
"\n"
"Bir ÅŸehirde ÅŸunlardan sadece biri bulunabilir: Hidroelektrik Santrali, "
-"Termik Santral, Nükleer Santral. Hidroelektrik Santrali, sadece bitişiğinde "
-"veya bulunduğu yerde dağ veya nehir olan şehirlere yapılabilir."
+"Termik Santral, Nükleer Santral"
-#: data/default/buildings.ruleset:397 data/civ2/buildings.ruleset:373
+#: data/default/buildings.ruleset:396 data/civ2/buildings.ruleset:373
#: data/civ1/buildings.ruleset:297
msgid "Library"
msgstr "Kütüphane"
-#: data/default/buildings.ruleset:412
+#: data/default/buildings.ruleset:411
#, no-c-format
msgid "Increases the science output in a city by 100%."
msgstr "Şehirdeki bilim üretimini %100 arttırır."
-#: data/default/buildings.ruleset:417 data/civ2/buildings.ruleset:393
+#: data/default/buildings.ruleset:416 data/civ2/buildings.ruleset:393
#: data/civ1/buildings.ruleset:317
msgid "Marketplace"
msgstr "Market"
-#: data/default/buildings.ruleset:432 data/civ2/buildings.ruleset:408
+#: data/default/buildings.ruleset:431 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 "Şehirdeki lüks ve vergi üretimini %50 arttırır."
-#: data/default/buildings.ruleset:437 data/civ2/buildings.ruleset:413
+#: data/default/buildings.ruleset:436 data/civ2/buildings.ruleset:413
#: data/civ1/buildings.ruleset:337
msgid "Mass Transit"
msgstr "Toplu Taşıma"
-#: data/default/buildings.ruleset:451 data/civ2/buildings.ruleset:427
+#: data/default/buildings.ruleset:450 data/civ2/buildings.ruleset:427
#: data/civ1/buildings.ruleset:351
msgid ""
"Neutralizes the pollution generated by the population. The population "
@@ -18244,12 +18397,12 @@ msgstr ""
"Nüfustan doğan kirliliği sıfırlar. Yani nüfusun kirliliğe hiçbir etkisi "
"kalmaz."
-#: data/default/buildings.ruleset:458 data/civ2/buildings.ruleset:434
+#: data/default/buildings.ruleset:457 data/civ2/buildings.ruleset:434
#: data/civ1/buildings.ruleset:358
msgid "Mfg. Plant"
msgstr "Ä°malathane"
-#: data/default/buildings.ruleset:474 data/civ2/buildings.ruleset:450
+#: data/default/buildings.ruleset:473 data/civ2/buildings.ruleset:450
#: data/civ1/buildings.ruleset:374
#, no-c-format
msgid ""
@@ -18257,12 +18410,12 @@ msgid ""
"production in a city by 100%."
msgstr "Fabrika ile birlikte şehrin kalkan üretimini %100 arttırır."
-#: data/default/buildings.ruleset:480 data/civ2/buildings.ruleset:456
+#: data/default/buildings.ruleset:479 data/civ2/buildings.ruleset:456
#: data/civ1/buildings.ruleset:380
msgid "Nuclear Plant"
msgstr "Nükleer Santral"
-#: data/default/buildings.ruleset:495
+#: data/default/buildings.ruleset:494
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 "
@@ -18279,11 +18432,11 @@ msgstr ""
"Bir ÅŸehirde ÅŸunlardan sadece biri bulunabilir: Hidroelektrik Santrali, "
"Termik Santral, Nükleer Santral"
-#: data/default/buildings.ruleset:515 data/civ2/buildings.ruleset:489
+#: data/default/buildings.ruleset:514 data/civ2/buildings.ruleset:489
msgid "Offshore Platform"
msgstr "Petrol Platformu"
-#: data/default/buildings.ruleset:530 data/civ2/buildings.ruleset:504
+#: data/default/buildings.ruleset:529 data/civ2/buildings.ruleset:504
msgid ""
"Adds 1 extra shield resource on all Ocean squares in a city. The city needs "
"to be coastal to build this improvement."
@@ -18291,12 +18444,12 @@ msgstr ""
"Şehir sınırlarındaki tüm okyanus bölgelerinde fazladan 1 kalkan üretimi "
"ekler. Bunun yapılabilmesi için şehir kıyıda olmalıdır."
-#: data/default/buildings.ruleset:536 data/civ2/buildings.ruleset:510
+#: data/default/buildings.ruleset:535 data/civ2/buildings.ruleset:510
#: data/civ1/buildings.ruleset:411
msgid "Palace"
msgstr "Saray"
-#: data/default/buildings.ruleset:552
+#: data/default/buildings.ruleset:551
#, no-c-format
msgid ""
"Makes a city the capital and the center of your government. Corruption in "
@@ -18322,11 +18475,11 @@ msgstr ""
"\n"
"Saray, Despotlukta %%75, Monarşide %50 üretim artışı sağlar."
-#: data/default/buildings.ruleset:569 data/civ2/buildings.ruleset:539
+#: data/default/buildings.ruleset:568 data/civ2/buildings.ruleset:539
msgid "Police Station"
msgstr "Karakol"
-#: data/default/buildings.ruleset:583 data/civ2/buildings.ruleset:553
+#: data/default/buildings.ruleset:582 data/civ2/buildings.ruleset:553
msgid ""
"Reduces the unhappiness caused by military units outside the city by 2 under "
"Democracy and 1 under Republic. This improvement has no effect under other "
@@ -18335,11 +18488,11 @@ msgstr ""
"Şehir dışındaki askeri birimlerden doğan mutsuzluğu Demokraside 2 "
"Cumhuriyette 1 azaltır. Diğer yönetim biçimlerinde hiç etkisi yoktur."
-#: data/default/buildings.ruleset:593 data/civ2/buildings.ruleset:560
+#: data/default/buildings.ruleset:592 data/civ2/buildings.ruleset:560
msgid "Port Facility"
msgstr "Tersane"
-#: data/default/buildings.ruleset:608 data/civ2/buildings.ruleset:575
+#: data/default/buildings.ruleset:607 data/civ2/buildings.ruleset:575
msgid ""
"Allows a city to build veteran sea units. Also, damaged sea units which "
"stay in town for one full turn without moving are completely restored."
@@ -18347,12 +18500,12 @@ msgstr ""
"Şehirde kıdemli deniz birimi yapmayı sağlar. Ayrıca şehirde bir sıra "
"boyunca duran deniz birimleri tamamen iyileÅŸir."
-#: data/default/buildings.ruleset:615 data/civ2/buildings.ruleset:582
+#: data/default/buildings.ruleset:614 data/civ2/buildings.ruleset:582
#: data/civ1/buildings.ruleset:440
msgid "Power Plant"
msgstr "Termik Santral"
-#: data/default/buildings.ruleset:631
+#: data/default/buildings.ruleset:630
#, no-c-format
msgid ""
"Increases the shield production of a Factory or Mfg. Plant in a city: a "
@@ -18369,12 +18522,12 @@ msgstr ""
"Bir ÅŸehirde ÅŸunlardan sadece biri bulunabilir: Hidroelektrik Santrali, "
"Termik Santral, Nükleer Santral"
-#: data/default/buildings.ruleset:646 data/civ2/buildings.ruleset:610
+#: data/default/buildings.ruleset:645 data/civ2/buildings.ruleset:610
#: data/civ1/buildings.ruleset:468
msgid "Recycling Center"
msgstr "Geri Dönüşüm Merkezi"
-#: data/default/buildings.ruleset:661 data/civ2/buildings.ruleset:625
+#: data/default/buildings.ruleset:660 data/civ2/buildings.ruleset:625
#: data/civ1/buildings.ruleset:483
#, no-c-format
msgid ""
@@ -18382,11 +18535,11 @@ msgid ""
"production in a city by 66%."
msgstr "Geri Dönüşüm Merkezi üretimden doğan kirliliği %66 oranında azaltır."
-#: data/default/buildings.ruleset:667 data/civ2/buildings.ruleset:631
+#: data/default/buildings.ruleset:666 data/civ2/buildings.ruleset:631
msgid "Research Lab"
msgstr "Araştırma Enstitüsü"
-#: data/default/buildings.ruleset:682
+#: data/default/buildings.ruleset:681
msgid ""
"Together with a Library, a Research Lab increases the science production of "
"a city by 200%. Together with a Library and a University, a Research Lab "
@@ -18396,11 +18549,11 @@ msgstr ""
"200 arttırır. Bir Kütüphane ve bir Üniversite ile birlikte bilim üretimini %"
"450 arttırır."
-#: data/default/buildings.ruleset:690 data/civ2/buildings.ruleset:654
+#: data/default/buildings.ruleset:689 data/civ2/buildings.ruleset:654
msgid "SAM Battery"
msgstr "Hava Savunması"
-#: data/default/buildings.ruleset:704 data/civ2/buildings.ruleset:668
+#: data/default/buildings.ruleset:703 data/civ2/buildings.ruleset:668
msgid ""
"Doubles the defense of all units inside the city when attacked by non-"
"nuclear air units."
@@ -18408,12 +18561,12 @@ msgstr ""
"Nükleer olmayan hava birimleri saldırırken şehir içindeki birimlerin "
"savunmasını ikiye katlar."
-#: data/default/buildings.ruleset:710 data/civ2/buildings.ruleset:674
+#: data/default/buildings.ruleset:709 data/civ2/buildings.ruleset:674
#: data/civ1/buildings.ruleset:489
msgid "SDI Defense"
msgstr "Nükleer Savunma"
-#: data/default/buildings.ruleset:724 data/civ2/buildings.ruleset:688
+#: data/default/buildings.ruleset:723 data/civ2/buildings.ruleset:688
#: data/civ1/buildings.ruleset:503
msgid ""
"Protects a city from attacks from Nuclear units. Nuclear attacks simply "
@@ -18424,11 +18577,11 @@ msgstr ""
"hiçbir etki yapmaz. Ayrıca nükleer olmayan füzelere karşı savunmayı da "
"ikiye katlar."
-#: data/default/buildings.ruleset:733 data/civ2/buildings.ruleset:697
+#: data/default/buildings.ruleset:732 data/civ2/buildings.ruleset:697
msgid "Sewer System"
msgstr "Kanalizasyon"
-#: data/default/buildings.ruleset:748 data/civ2/buildings.ruleset:712
+#: data/default/buildings.ruleset:747 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."
@@ -18436,12 +18589,12 @@ msgstr ""
"Şehrin 12'den daha büyük boyutlara çıkmasına izin verir. Daha önce şehrin "
"8'den yukarı çıkması için Su Kemeri gereklidir."
-#: data/default/buildings.ruleset:754 data/civ2/buildings.ruleset:749
+#: data/default/buildings.ruleset:753 data/civ2/buildings.ruleset:749
#: data/civ1/buildings.ruleset:512
msgid "Space Component"
msgstr "Uzay Gemisi Parçası"
-#: data/default/buildings.ruleset:769 data/civ2/buildings.ruleset:763
+#: data/default/buildings.ruleset:768 data/civ2/buildings.ruleset:763
#: data/civ1/buildings.ruleset:526
msgid ""
"Space Components can be differentiated into Propulsion and Fuel Components. "
@@ -18458,12 +18611,12 @@ msgstr ""
"Bir uzay gemisi yapmaya başlamadan önce mutlaka Apollo Programı harikasının "
"herhangi bir oyuncu tarafından yapılmış olması gereklidir."
-#: data/default/buildings.ruleset:779 data/civ2/buildings.ruleset:773
+#: data/default/buildings.ruleset:778 data/civ2/buildings.ruleset:773
#: data/civ1/buildings.ruleset:536
msgid "Space Module"
msgstr "Uzay Gemisi Modülü"
-#: data/default/buildings.ruleset:794 data/civ2/buildings.ruleset:787
+#: data/default/buildings.ruleset:793 data/civ2/buildings.ruleset:787
#: data/civ1/buildings.ruleset:550
msgid ""
"Space Modules are the most expensive parts of spaceships. There are three "
@@ -18496,12 +18649,12 @@ msgstr ""
"Bir uzay gemisi yapmaya başlamadan önce mutlaka Apollo Programı harikasının "
"herhangi bir oyuncu tarafından yapılmış olması gereklidir."
-#: data/default/buildings.ruleset:813 data/civ2/buildings.ruleset:806
+#: data/default/buildings.ruleset:812 data/civ2/buildings.ruleset:806
#: data/civ1/buildings.ruleset:569
msgid "Space Structural"
msgstr "Uzay Gemisi Ä°skelesi"
-#: data/default/buildings.ruleset:828 data/civ2/buildings.ruleset:820
+#: data/default/buildings.ruleset:827 data/civ2/buildings.ruleset:820
#: data/civ1/buildings.ruleset:583
msgid ""
"Space Structurals form the base of your spaceship. All other spaceship "
@@ -18518,11 +18671,11 @@ msgstr ""
"Uzay gemisi parçalarını yapmadan önce herhangi bir oyuncunun Apollo Programı "
"harikasını yapmış olması gereklidir."
-#: data/default/buildings.ruleset:838 data/civ2/buildings.ruleset:830
+#: data/default/buildings.ruleset:837 data/civ2/buildings.ruleset:830
msgid "Stock Exchange"
msgstr "Borsa"
-#: data/default/buildings.ruleset:854 data/civ2/buildings.ruleset:846
+#: data/default/buildings.ruleset:853 data/civ2/buildings.ruleset:846
#, no-c-format
msgid ""
"Together with a Marketplace and a Bank, a Stock Exchange boosts tax and "
@@ -18531,21 +18684,21 @@ msgstr ""
"Bir Market ve Banka ile birlikte Borsa, şehirdeki vergi ve lüks üretimini %"
"150 oranında arttırır."
-#: data/default/buildings.ruleset:860 data/civ2/buildings.ruleset:852
+#: data/default/buildings.ruleset:859 data/civ2/buildings.ruleset:852
msgid "Super Highways"
msgstr "Otoban"
-#: data/default/buildings.ruleset:875 data/civ2/buildings.ruleset:867
+#: data/default/buildings.ruleset:874 data/civ2/buildings.ruleset:867
#, no-c-format
msgid ""
"Increases trade resources by 50% on all squares with roads or railroads."
msgstr "Yol ve ray olan arazilerdeki ticaret gelirini %50 arttırır."
-#: data/default/buildings.ruleset:883 data/civ2/buildings.ruleset:873
+#: data/default/buildings.ruleset:882 data/civ2/buildings.ruleset:873
msgid "Supermarket"
msgstr "Süpermarket"
-#: data/default/buildings.ruleset:898 data/civ2/buildings.ruleset:888
+#: data/default/buildings.ruleset:897 data/civ2/buildings.ruleset:888
#, no-c-format
msgid ""
"Increases the food resources by 50% on each farmland square which is being "
@@ -18555,12 +18708,12 @@ msgstr ""
"Şehrin etrafındaki tarlalardan elde edilen gıdayı %50 arttırır. İkinci kez "
"sulama yapılan topraklar tarla olur."
-#: data/default/buildings.ruleset:905 data/civ2/buildings.ruleset:895
+#: data/default/buildings.ruleset:904 data/civ2/buildings.ruleset:895
#: data/civ1/buildings.ruleset:593
msgid "Temple"
msgstr "Tapınak"
-#: data/default/buildings.ruleset:919 data/civ2/buildings.ruleset:909
+#: data/default/buildings.ruleset:918 data/civ2/buildings.ruleset:909
#: data/civ1/buildings.ruleset:607
msgid ""
"Makes one unhappy citizen content. Both the Mysticism advance and the "
@@ -18570,25 +18723,25 @@ msgstr ""
"Mutsuz bir vatandaşı memnun eder. Tasavvuf ve Kehanet ile birlikte 4 "
"vatandaşı memnun eder."
-#: data/default/buildings.ruleset:926 data/civ2/buildings.ruleset:916
+#: data/default/buildings.ruleset:925 data/civ2/buildings.ruleset:916
#: data/civ1/buildings.ruleset:614 data/default/techs.ruleset:742
#: data/civ2/techs.ruleset:727 data/civ1/techs.ruleset:723
msgid "University"
msgstr "Ãœniversite"
-#: data/default/buildings.ruleset:942
+#: data/default/buildings.ruleset:941
#, no-c-format
msgid ""
"Together with a Library, a University increases the science production of a "
"city by 250%."
msgstr "Kütüphane ile birlikte şehrin bilim üretimini %250 arttırır."
-#: data/default/buildings.ruleset:948 data/civ2/buildings.ruleset:938
+#: data/default/buildings.ruleset:947 data/civ2/buildings.ruleset:938
#: data/civ1/buildings.ruleset:636
msgid "Apollo Program"
msgstr "Apollo Programı"
-#: data/default/buildings.ruleset:962 data/civ2/buildings.ruleset:952
+#: data/default/buildings.ruleset:961 data/civ2/buildings.ruleset:952
msgid ""
"Entire map becomes visible for the player who owns it. It allows all "
"players to start building spaceship parts (assuming they have researched the "
@@ -18597,22 +18750,22 @@ msgstr ""
"Buna sahip olan oyuncu bütün haritayı görebilir. Bütün oyuncuların uzay "
"gemisi yapabilmesini saÄŸlar (tabi gerekli teknolojileri keÅŸfetmiÅŸlerse)."
-#: data/default/buildings.ruleset:969 data/civ2/buildings.ruleset:959
+#: data/default/buildings.ruleset:968 data/civ2/buildings.ruleset:959
msgid "A.Smith's Trading Co."
msgstr "A.Smith Tic. Åžti."
-#: data/default/buildings.ruleset:983
+#: data/default/buildings.ruleset:982
msgid ""
"City improvements which would normally have an upkeep of 1 are free of "
"upkeep, for all your cities."
msgstr "Bütün şehirlerde 1 bakım gerektiren yapıların bakımı ücretsiz olur."
-#: data/default/buildings.ruleset:989 data/civ2/buildings.ruleset:979
+#: data/default/buildings.ruleset:988 data/civ2/buildings.ruleset:979
#: data/civ1/buildings.ruleset:655
msgid "Colossus"
msgstr "Büyük Heykel"
-#: data/default/buildings.ruleset:1003 data/civ2/buildings.ruleset:993
+#: data/default/buildings.ruleset:1002 data/civ2/buildings.ruleset:993
#: data/civ1/buildings.ruleset:669
msgid ""
"Each square around the city where this wonder is built that is already "
@@ -18621,35 +18774,35 @@ msgstr ""
"Bu harikanın yapıldığı şehirde zaten ticaret geliri getiren her bölge bir "
"tane fazladan gelir getirir."
-#: data/default/buildings.ruleset:1009 data/civ2/buildings.ruleset:999
+#: data/default/buildings.ruleset:1008 data/civ2/buildings.ruleset:999
#: data/civ1/buildings.ruleset:675
msgid "Copernicus' Observatory"
msgstr "Kopernik'in Gözlemevi"
-#: data/default/buildings.ruleset:1024 data/civ2/buildings.ruleset:1180
+#: data/default/buildings.ruleset:1023 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 "Yapıldığı şehirdeki bilim üretimini %100 arttırır."
-#: data/default/buildings.ruleset:1029 data/civ2/buildings.ruleset:1019
+#: data/default/buildings.ruleset:1028 data/civ2/buildings.ruleset:1019
#: data/civ1/buildings.ruleset:695
msgid "Cure For Cancer"
msgstr "Kansere Çare"
-#: data/default/buildings.ruleset:1043
+#: data/default/buildings.ruleset:1042
msgid ""
"This stunning technological achievement makes one unhappy citizen content in "
"all your cities."
msgstr ""
"Bu harika buluş, bütün şehirlerinizde bir mutsuz vatandaşı memnun eder."
-#: data/default/buildings.ruleset:1051 data/civ2/buildings.ruleset:1039
+#: data/default/buildings.ruleset:1050 data/civ2/buildings.ruleset:1039
#: data/civ1/buildings.ruleset:715
msgid "Darwin's Voyage"
msgstr "Darwin'in YolculuÄŸu"
-#: data/default/buildings.ruleset:1065 data/civ2/buildings.ruleset:1053
+#: data/default/buildings.ruleset:1064 data/civ2/buildings.ruleset:1053
#: data/civ1/buildings.ruleset:729
msgid ""
"Charles Darwin's voyage sparked the discovery of the evolution of the "
@@ -18659,11 +18812,11 @@ msgstr ""
"Charles Darwin'in yolculuğu evrim teorisinin oluşmasını sağlamıştır ve "
"bilime ilham vermiÅŸtir. BittiÄŸi anda iki tane teknoloji verir."
-#: data/default/buildings.ruleset:1072 data/civ2/buildings.ruleset:1060
+#: data/default/buildings.ruleset:1071 data/civ2/buildings.ruleset:1060
msgid "Eiffel Tower"
msgstr "Eyfel Kulesi"
-#: data/default/buildings.ruleset:1087
+#: data/default/buildings.ruleset:1086
#, no-c-format
msgid ""
"Your reputation and goodwill among other nations is recovered twice as fast."
@@ -18671,12 +18824,12 @@ msgstr ""
"Diğer milletlerin size karşı olan tutumu ve itibarınız normalden iki kat "
"daha hızlı düzelecektir."
-#: data/default/buildings.ruleset:1093 data/civ2/buildings.ruleset:1081
+#: data/default/buildings.ruleset:1092 data/civ2/buildings.ruleset:1081
#: data/civ1/buildings.ruleset:736
msgid "Great Library"
msgstr "Büyük Kütüphane"
-#: data/default/buildings.ruleset:1107 data/civ2/buildings.ruleset:1095
+#: data/default/buildings.ruleset:1106 data/civ2/buildings.ruleset:1095
#: data/civ1/buildings.ruleset:750
msgid ""
"The civilization which builds the Great Library gets every advance that at "
@@ -18685,21 +18838,21 @@ msgstr ""
"Büyük Kütüphanesi olan ulus, en az iki milletin bildiği teknolojileri hemen "
"öğrenir."
-#: data/default/buildings.ruleset:1113 data/civ2/buildings.ruleset:1101
+#: data/default/buildings.ruleset:1112 data/civ2/buildings.ruleset:1101
#: data/civ1/buildings.ruleset:756
msgid "Great Wall"
msgstr "Büyük Duvar"
-#: data/default/buildings.ruleset:1127
+#: data/default/buildings.ruleset:1126
msgid "Works as a City Wall in all your cities."
msgstr "Bütün şehirlerinizde surlar varmış gibi olur."
-#: data/default/buildings.ruleset:1135 data/civ2/buildings.ruleset:1122
+#: data/default/buildings.ruleset:1134 data/civ2/buildings.ruleset:1122
#: data/civ1/buildings.ruleset:777
msgid "Hanging Gardens"
msgstr "Asma Bahçeler"
-#: data/default/buildings.ruleset:1149 data/civ2/buildings.ruleset:1136
+#: data/default/buildings.ruleset:1148 data/civ2/buildings.ruleset:1136
#: data/civ1/buildings.ruleset:791
msgid ""
"Makes one content citizen happy in every city. Makes two extra content "
@@ -18713,12 +18866,12 @@ msgstr ""
"kalmadığı seyrek durum gerçekleşirse bu etki mutsuz vatandaşlara geçer "
"(onları memnun eder)."
-#: data/default/buildings.ruleset:1158 data/civ2/buildings.ruleset:1145
+#: data/default/buildings.ruleset:1157 data/civ2/buildings.ruleset:1145
#: data/civ1/buildings.ruleset:800
msgid "Hoover Dam"
msgstr "GAP Projesi"
-#: data/default/buildings.ruleset:1173 data/civ2/buildings.ruleset:1159
+#: data/default/buildings.ruleset:1172 data/civ2/buildings.ruleset:1159
msgid ""
"Works as if you had a Hydro Plant in every city. (This reduces pollution "
"and increases the effects of Factories and Mfg. Plants.)"
@@ -18726,51 +18879,51 @@ msgstr ""
"Her şehirde bir Hidroelektrik Santrali varmış gibi olur. Böylece kirlilik "
"azalırken Fabrika ve İmalathanelerin ekinliği artar."
-#: data/default/buildings.ruleset:1179 data/civ2/buildings.ruleset:1165
+#: data/default/buildings.ruleset:1178 data/civ2/buildings.ruleset:1165
#: data/civ1/buildings.ruleset:822
msgid "Isaac Newton's College"
msgstr "Newton'un Koleji"
-#: data/default/buildings.ruleset:1194
+#: data/default/buildings.ruleset:1193
#, no-c-format
msgid ""
"Boosts science production by 100% in every city you control that has a "
"University."
msgstr "Üniversitesi olan şehirlerinizdeki bilim üretimini %100 arttırır."
-#: data/default/buildings.ruleset:1200 data/civ2/buildings.ruleset:1185
+#: data/default/buildings.ruleset:1199 data/civ2/buildings.ruleset:1185
#: data/civ1/buildings.ruleset:842
msgid "J.S. Bach's Cathedral"
msgstr "J.S. Bach Katedrali"
-#: data/default/buildings.ruleset:1214 data/civ2/buildings.ruleset:1199
+#: data/default/buildings.ruleset:1213 data/civ2/buildings.ruleset:1199
msgid "Makes two unhappy citizens content in every city."
msgstr "Her şehirdeki iki mutsuz vatandaşı memnun eder."
-#: data/default/buildings.ruleset:1219 data/civ2/buildings.ruleset:1204
+#: data/default/buildings.ruleset:1218 data/civ2/buildings.ruleset:1204
msgid "King Richard's Crusade"
msgstr "Haçlı Seferleri"
-#: data/default/buildings.ruleset:1233 data/civ2/buildings.ruleset:1218
+#: data/default/buildings.ruleset:1232 data/civ2/buildings.ruleset:1218
msgid ""
"Adds one extra shield resource on every square around the city where it is "
"built."
msgstr "Yapıldığı şehirdeki her bölgeye fazladan bir kalkan üretimi ekler."
-#: data/default/buildings.ruleset:1239 data/civ2/buildings.ruleset:1224
+#: data/default/buildings.ruleset:1238 data/civ2/buildings.ruleset:1224
msgid "Leonardo's Workshop"
msgstr "Leonardo'nun Atölyesi"
-#: data/default/buildings.ruleset:1253 data/civ2/buildings.ruleset:1238
+#: data/default/buildings.ruleset:1252 data/civ2/buildings.ruleset:1238
msgid "Upgrades one obsolete unit per game turn."
msgstr "Her sırada bir eski birimi yeniler."
-#: data/default/buildings.ruleset:1258 data/civ2/buildings.ruleset:1243
+#: data/default/buildings.ruleset:1257 data/civ2/buildings.ruleset:1243
#: data/civ1/buildings.ruleset:862
msgid "Lighthouse"
msgstr "Deniz Feneri"
-#: data/default/buildings.ruleset:1273
+#: data/default/buildings.ruleset:1272
msgid ""
"Gives all your sea units 1 additional movement point and eliminates the risk "
"of losing Triremes on the high seas. Makes all your new sea units veterans "
@@ -18780,34 +18933,34 @@ msgstr ""
"denizde Kadırgaların kaybolmasını engeller. Bütün yeni deniz birimleriniz "
"kıdemli olur (her şehirde)."
-#: data/default/buildings.ruleset:1280 data/civ2/buildings.ruleset:1264
+#: data/default/buildings.ruleset:1279 data/civ2/buildings.ruleset:1264
#: data/civ1/buildings.ruleset:885
msgid "Magellan's Expedition"
msgstr "Macellan'ın Yolculuğu"
-#: data/default/buildings.ruleset:1295
+#: data/default/buildings.ruleset:1294
msgid "Gives all your sea units 2 additional movement points."
msgstr "Deniz birimlerinize 2 hareket puanı ekler."
-#: data/default/buildings.ruleset:1300 data/civ2/buildings.ruleset:1283
+#: data/default/buildings.ruleset:1299 data/civ2/buildings.ruleset:1283
#: data/civ1/buildings.ruleset:904
msgid "Manhattan Project"
msgstr "Manhattan Projesi"
-#: data/default/buildings.ruleset:1318 data/civ2/buildings.ruleset:1301
+#: data/default/buildings.ruleset:1317 data/civ2/buildings.ruleset:1301
msgid "Marco Polo's Embassy"
msgstr "Marko Polo'nun Elçiliği"
-#: data/default/buildings.ruleset:1332 data/civ2/buildings.ruleset:1315
+#: data/default/buildings.ruleset:1331 data/civ2/buildings.ruleset:1315
msgid "The player who owns it gets an embassy with all players."
msgstr "Buna sahip olan kullanıcı bütün oyuncularda elçilik sahibi olur."
-#: data/default/buildings.ruleset:1337 data/civ2/buildings.ruleset:1320
+#: data/default/buildings.ruleset:1336 data/civ2/buildings.ruleset:1320
#: data/civ1/buildings.ruleset:922
msgid "Michelangelo's Chapel"
msgstr "Mikalenjelo'nun Åžapeli"
-#: data/default/buildings.ruleset:1351 data/civ2/buildings.ruleset:1334
+#: data/default/buildings.ruleset:1350 data/civ2/buildings.ruleset:1334
msgid ""
"Counts as having a Cathedral in each of your cities. This makes 3 unhappy "
"citizens content in each city. The discovery of Theology increases the "
@@ -18820,21 +18973,21 @@ msgstr ""
"daha mutsuz vatandaşı memnun eder. Komünizmin keşfi Katedralin etkisini "
"azaltır, memnun edilen vatandaş sayısını bir azaltır."
-#: data/default/buildings.ruleset:1361 data/civ2/buildings.ruleset:1344
+#: data/default/buildings.ruleset:1360 data/civ2/buildings.ruleset:1344
#: data/civ1/buildings.ruleset:941
msgid "Oracle"
msgstr "Kehanet"
-#: data/default/buildings.ruleset:1375
+#: data/default/buildings.ruleset:1374
msgid "Makes two of your unhappy citizens content in every city with a temple."
msgstr "Tapınağı olan her şehirde iki mutsuz vatandaşı memnun eder."
-#: data/default/buildings.ruleset:1380 data/civ2/buildings.ruleset:1363
+#: data/default/buildings.ruleset:1379 data/civ2/buildings.ruleset:1363
#: data/civ1/buildings.ruleset:960
msgid "Pyramids"
msgstr "Piramitler"
-#: data/default/buildings.ruleset:1394
+#: data/default/buildings.ruleset:1393
msgid ""
"The amount of stored food lost when one of your cities grows or shrinks is "
"reduced by 25%. This helps a city to grow faster and more easily withstand "
@@ -18844,31 +18997,31 @@ msgstr ""
"gıdanın kaybı %25 oranında azalır. Böylece şehirler daha çabuk büyür ve "
"kıtlık riski azalır. Ambar ile birlikte etkisi artar."
-#: data/default/buildings.ruleset:1401 data/civ2/buildings.ruleset:1382
+#: data/default/buildings.ruleset:1400 data/civ2/buildings.ruleset:1382
#: data/civ1/buildings.ruleset:981
msgid "SETI Program"
msgstr "SETI Programı"
-#: data/default/buildings.ruleset:1415
+#: data/default/buildings.ruleset:1414
msgid "Boosts science production in each city with a Research Lab by 100%. "
msgstr ""
"Araştırma Laboratuvarı olan şehirlerdeki bilim üretimini %100 arttırır. "
-#: data/default/buildings.ruleset:1420 data/civ2/buildings.ruleset:1402
+#: data/default/buildings.ruleset:1419 data/civ2/buildings.ruleset:1402
#: data/civ1/buildings.ruleset:1001
msgid "Shakespeare's Theatre"
msgstr "Åžekspir'in Tiyatrosu"
-#: data/default/buildings.ruleset:1434 data/civ2/buildings.ruleset:1416
+#: data/default/buildings.ruleset:1433 data/civ2/buildings.ruleset:1416
#: data/civ1/buildings.ruleset:1015
msgid "Makes all unhappy citizens content, in the city where it is located."
msgstr "Yapıldığı şehirdeki tüm mutsuz vatandaşları memnun eder."
-#: data/default/buildings.ruleset:1439 data/civ2/buildings.ruleset:1421
+#: data/default/buildings.ruleset:1438 data/civ2/buildings.ruleset:1421
msgid "Statue of Liberty"
msgstr "Özgürlük Heykeli"
-#: data/default/buildings.ruleset:1453 data/civ2/buildings.ruleset:1435
+#: data/default/buildings.ruleset:1452 data/civ2/buildings.ruleset:1435
#: data/civ1/buildings.ruleset:974 data/civ1/buildings.ruleset:1034
msgid ""
"Allows you to choose any government, including those that have not yet been "
@@ -18878,11 +19031,11 @@ msgstr ""
"Henüz keşfedilmemiş olanlar dahil tüm yönetim biçimlerine anarşi olmadan "
"geçiş yapabilmenizi sağlar."
-#: data/default/buildings.ruleset:1460 data/civ2/buildings.ruleset:1442
+#: data/default/buildings.ruleset:1459 data/civ2/buildings.ruleset:1442
msgid "Sun Tzu's War Academy"
msgstr "Sun Tzu'nun SavaÅŸ Akademisi"
-#: data/default/buildings.ruleset:1474
+#: data/default/buildings.ruleset:1473
msgid ""
"All your new ground units start at the first veteran level. The chance of a "
"unit getting the next veteran level after a battle increases by half."
@@ -18890,21 +19043,21 @@ msgstr ""
"Bütün yeni kara birimleri kıdemli olarak başlarlar. Savaş sonucunda sonraki "
"kıdem seviyesine geçme şansları da yarı yarıya artar."
-#: data/default/buildings.ruleset:1481 data/civ2/buildings.ruleset:1463
+#: data/default/buildings.ruleset:1480 data/civ2/buildings.ruleset:1463
#: data/civ1/buildings.ruleset:1020
msgid "United Nations"
msgstr "BirleÅŸmiÅŸ Milletler"
-#: data/default/buildings.ruleset:1495
+#: data/default/buildings.ruleset:1494
msgid "All your units regain two extra hitpoints per turn."
msgstr "Birimlerinizin hepsi her tur fazladan iki sağlık kazanır."
-#: data/default/buildings.ruleset:1508 data/civ2/buildings.ruleset:1490
+#: data/default/buildings.ruleset:1507 data/civ2/buildings.ruleset:1490
#: data/civ1/buildings.ruleset:1046
msgid "Women's Suffrage"
msgstr "Kadın Hakları"
-#: data/default/buildings.ruleset:1522 data/civ2/buildings.ruleset:1504
+#: data/default/buildings.ruleset:1521 data/civ2/buildings.ruleset:1504
msgid ""
"Counts as a Police Station in every city. (That is, for each city, reduces "
"unhappiness for military units outside the city by 2 under Democracy and 1 "
@@ -18914,11 +19067,11 @@ msgstr ""
"birimlerden doğan mutsuzluğu Demokraside 2 Cumhuriyette 1 azaltır. Diğer "
"yönetim biçimlerinde hiç etkisi yoktur.)"
-#: data/default/buildings.ruleset:1533
+#: data/default/buildings.ruleset:1532
msgid "Coinage"
msgstr "Para Basımı"
-#: data/default/buildings.ruleset:1554
+#: data/default/buildings.ruleset:1553
msgid ""
"This is not a normal improvement. Instead, setting a city's production to "
"Coinage means its shield production is converted to tax output (money, "
@@ -19339,11 +19492,16 @@ msgstr "Kelt tarzı"
msgid "?citystyle:Industrial"
msgstr "Endüstriyel"
-#: data/default/cities.ruleset:139 data/civ2/cities.ruleset:150
+#: data/default/cities.ruleset:139
+#, fuzzy
+msgid "?citystyle:ElectricAge"
+msgstr "Kelt tarzı"
+
+#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:150
msgid "?citystyle:Modern"
msgstr "Modern"
-#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:161
+#: data/default/cities.ruleset:161 data/civ2/cities.ruleset:161
msgid "?citystyle:PostModern"
msgstr "Post Modern"
@@ -24598,6 +24756,39 @@ msgstr "Takım 30"
msgid "Team 31"
msgstr "Takım 31"
+#~ msgid "Observers cannot vote."
+#~ msgstr "Seyirciler oy veremez."
+
+#~ msgid ""
+#~ "You can only vote in a running game. Use 'first' to become the game "
+#~ "organizer if there currently is none."
+#~ msgstr ""
+#~ "Sadece çalışan bir oyunda oy kullanabilirsiniz. Eğer yönetici yoksa "
+#~ "'first' komutunu kullanarak yönetici olabilirsiniz."
+
+#~ msgid "Value must be integer."
+#~ msgstr "Değer bir tamsayı olmalı"
+
+#~ 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 Hydro Plant, Power Plant, or Nuclear Plant. A "
+#~ "city can only build a Hydro Plant if it is next to (or on) a Mountain or "
+#~ "River tile."
+#~ msgstr ""
+#~ "Şehirde üretimden doğan kirliliği %50 azaltır. Ayrıca şehirdeki Fabrika "
+#~ "ve İmalathanenin kalkan üretimini arttırır: Fabrikayla birlikte %75 "
+#~ "üretim artışı, İmalathaneyle birlikte %150 üretim artışı sağlar.\n"
+#~ "\n"
+#~ "Bir ÅŸehirde ÅŸunlardan sadece biri bulunabilir: Hidroelektrik Santrali, "
+#~ "Termik Santral, Nükleer Santral. Hidroelektrik Santrali, sadece "
+#~ "bitiÅŸiÄŸinde veya bulunduÄŸu yerde daÄŸ veya nehir olan ÅŸehirlere "
+#~ "yapılabilir."
+
#~ msgid "Auth config filename \"%s\" not allowed!"
#~ msgstr "Kimlik ayarı için dosya adı \"%s\" olamaz!"
diff --git a/po/uk.gmo b/po/uk.gmo
index 948ddcc..a958d8d 100644
Binary files a/po/uk.gmo and b/po/uk.gmo differ
diff --git a/po/uk.po b/po/uk.po
index ad4fbe6..9914d39 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: 2009-03-29 21:13+0900\n"
+"POT-Creation-Date: 2009-11-22 21:37+0100\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"
@@ -63,21 +63,21 @@ msgstr "?
msgid "?redundant:*"
msgstr "?ÚÁÊ×Å:*"
-#: common/connection.c:515
+#: common/connection.c:518
#, c-format
msgid "%s from %s"
msgstr "%s Ú %s"
-#: common/connection.c:521
+#: common/connection.c:524
msgid " (connection incomplete)"
msgstr " (Ú`¤ÄÎÁÎÎÑ ÎÅ ×ÓÔÁÎÏ×ÌÅÎÏ)"
-#: common/connection.c:525
+#: common/connection.c:528
#, c-format
msgid " (player %s)"
msgstr " (ÇÒÁ×ÅÃØ %s)"
-#: common/connection.c:529
+#: common/connection.c:532
msgid " (observer)"
msgstr " (ÓÐÏÓÔÅÒ¦ÇÁÞ)"
@@ -492,83 +492,83 @@ msgstr "
msgid "AI Debug messages"
msgstr ""
-#: common/player.c:732
+#: common/player.c:746
msgid "?attitude:Genocidal"
msgstr ""
-#: common/player.c:734
+#: common/player.c:748
msgid "?attitude:Belligerent"
msgstr ""
-#: common/player.c:736
+#: common/player.c:750
msgid "?attitude:Hostile"
msgstr ""
-#: common/player.c:738
+#: common/player.c:752
msgid "?attitude:Uncooperative"
msgstr ""
-#: common/player.c:740
+#: common/player.c:754
msgid "?attitude:Uneasy"
msgstr ""
-#: common/player.c:742
+#: common/player.c:756
#, fuzzy
msgid "?attitude:Neutral"
msgstr "?ĦÐÌÏÍÁÔÉÞÎÉÊ_ÓÔÁÎ:îÅÊÔÒÁÌØÎÉÊ"
-#: common/player.c:744
+#: common/player.c:758
msgid "?attitude:Respectful"
msgstr ""
-#: common/player.c:746
+#: common/player.c:760
msgid "?attitude:Helpful"
msgstr ""
-#: common/player.c:748
+#: common/player.c:762
msgid "?attitude:Enthusiastic"
msgstr ""
-#: common/player.c:750
+#: common/player.c:764
msgid "?attitude:Admiring"
msgstr ""
-#: common/player.c:753
+#: common/player.c:767
msgid "?attitude:Worshipful"
msgstr ""
-#: common/player.c:764
+#: common/player.c:778
#, fuzzy
msgid "?diplomatic_state:Armistice"
msgstr "?ĦÐÌÏÍÁÔÉÞÎÉÊ_ÓÔÁÎ:áÌØÑÎÓ"
-#: common/player.c:765
+#: common/player.c:779
msgid "?diplomatic_state:War"
msgstr "?ĦÐÌÏÍÁÔÉÞÎÉÊ_ÓÔÁÎ:÷¦ÊÎÁ"
-#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:780 client/gui-gtk-2.0/diplodlg.c:353
#: 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:767 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:781 client/gui-gtk-2.0/diplodlg.c:358
#: 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:768 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:782 client/gui-gtk-2.0/diplodlg.c:363
#: 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:769
+#: common/player.c:783
msgid "?diplomatic_state:Never met"
msgstr "?ĦÐÌÏÍÁÔÉÞÎÉÊ_ÓÔÁÎ:îÅ ÚÕÓÔÒ¦ÞÁÌÉÓÑ"
-#: common/player.c:770
+#: common/player.c:784
#, fuzzy
msgid "?diplomatic_state:Team"
msgstr "?ĦÐÌÏÍÁÔÉÞÎÉÊ_ÓÔÁÎ:íÉÒ"
@@ -600,7 +600,7 @@ msgstr ""
#. TRANS: "Resources: (none)".
#: common/requirements.c:1014 common/team.c:132
#: client/gui-gtk-2.0/helpdlg.c:1055 client/gui-gtk-2.0/inteldlg.c:390
-#: client/gui-win32/helpdlg.c:586 client/gui-xaw/helpdlg.c:991
+#: client/gui-win32/helpdlg.c:592 client/gui-xaw/helpdlg.c:991
#, fuzzy, c-format
msgid "(none)"
msgstr "ÎÅÍÁ¤"
@@ -626,10 +626,11 @@ msgstr "
#: 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
#: client/gui-sdl/helpdlg.c:817 client/gui-sdl/mapview.c:962
-#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:545
-#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:735
-#: 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
+#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:544
+#: client/gui-win32/helpdlg.c:551 client/gui-win32/helpdlg.c:721
+#: client/gui-win32/helpdlg.c:741 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 "îÅÍÁ¤"
@@ -643,29 +644,29 @@ msgstr "
msgid "(Unknown)"
msgstr "(îÅצÄÏÍÏ)"
-#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:553
#: manual/civmanual.c:224
msgid "Road"
msgstr "ûÌÑÈ"
-#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:557
#: client/gui-gtk-2.0/menu.c:829 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:394 common/terrain.c:572 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:567
#: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
#: data/civ1/techs.ruleset:563
msgid "Railroad"
msgstr "úÁ̦ÚÎÉÃÑ"
-#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:555
msgid "Mine"
msgstr "ûÁÈÔÁ"
-#: common/terrain.c:396 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:551 server/report.c:124
#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "úÁÂÒÕÄÎÅÎÎÑ"
@@ -674,7 +675,7 @@ msgstr "
msgid "Hut"
msgstr "èÕÔ¦Ò"
-#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:563
#: manual/civmanual.c:226
msgid "Fortress"
msgstr "õËÒ¦ÐÌÅÎÎÑ"
@@ -687,58 +688,58 @@ msgstr "
msgid "Farmland"
msgstr "æÅÒÍÁ"
-#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:577
#: manual/civmanual.c:226
msgid "Airbase"
msgstr "áצÁÂÁÚÁ"
-#: common/terrain.c:402 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:579
msgid "Fallout"
msgstr "òÁĦÁæÑ"
-#: common/unit.c:546 client/gui-win32/plrdlg.c:337
+#: common/unit.c:549 client/gui-win32/plrdlg.c:337
msgid "Idle"
msgstr "ðÒÏÓÔÏÀ¤"
-#: common/unit.c:556
+#: common/unit.c:559
msgid "Fortifying"
msgstr "õËÒ¦ÐÌÀ¤ÔØÓÑ"
-#: common/unit.c:558
+#: common/unit.c:561
msgid "Fortified"
msgstr "õËÒ¦ÐÌÅÎÉÊ"
-#: common/unit.c:562 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
+#: common/unit.c:565 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
msgid "Sentry"
msgstr "ïÈÏÒÏÎѤ"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
+#: common/unit.c:569 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
#: client/gui-win32/menu.c:370 client/gui-xaw/menu.c:185
msgid "Pillage"
msgstr "òÕÊÎÕ¤"
-#: common/unit.c:568 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
+#: common/unit.c:571 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
msgid "Goto"
msgstr "ðÅÒÅÊÔÉ"
-#: common/unit.c:570
+#: common/unit.c:573
msgid "Explore"
msgstr "÷É×ÞÉÔÉ"
-#: common/unit.c:572 manual/civmanual.c:224
+#: common/unit.c:575 manual/civmanual.c:224
msgid "Transform"
msgstr "ðÅÒÅÔ×ÏÒÉÔÉ"
-#: common/unit.c:584 client/text.c:157 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:587 client/text.c:157 client/gui-sdl/citydlg.c:1972
#: client/gui-win32/citydlg.c:1257 client/gui-xaw/citydlg.c:1423
msgid "Unknown"
msgstr "îÅצÄÏÍÉÊ"
-#: common/unit.c:1022
+#: common/unit.c:1025
msgid "Moves"
msgstr "òÕÈÉ"
-#: common/unit.c:1571
+#: common/unit.c:1574
#, c-format
msgid ""
"Upgrade %s to %s for %d gold?\n"
@@ -747,12 +748,12 @@ msgstr ""
"íÏÄÅÒΦÚÕ×ÁÔÉ %s ÄÏ %s ÚÁ %d ÇÒÉ×ÅÎØ?\n"
"âÀÄÖÅÔ ÎÁ̦ÞÕ¤ %d ÇÒÉ×ÅÎØ."
-#: common/unit.c:1579
+#: common/unit.c:1582
#, fuzzy, c-format
msgid "Sorry, cannot upgrade %s (yet)."
msgstr "÷ÉÂÁÞÔÅ: ÎÅ ÍÏÖÕ ÍÏÄÅÒΦÚÕ×ÁÔÉ %s."
-#: common/unit.c:1585
+#: common/unit.c:1588
#, c-format
msgid ""
"Upgrading %s to %s costs %d gold.\n"
@@ -761,11 +762,11 @@ msgstr ""
"íÏÄÅÒΦÚÁÃ¦Ñ %s ÄÏ %s ÚÁ %d ÇÒÉ×ÅÎØ?\n"
"âÀÄÖÅÔ ÎÁ̦ÞÕ¤ %d ÇÒÉ×ÅÎØ."
-#: common/unit.c:1594
+#: common/unit.c:1597
msgid "You can only upgrade units in your cities."
msgstr ""
-#: common/unit.c:1598
+#: common/unit.c:1601
#, c-format
msgid "Upgrading this %s would strand units it transports."
msgstr ""
@@ -802,11 +803,11 @@ msgstr "
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1404
+#: common/unittype.c:349 client/helpdata.c:1412
msgid " and "
msgstr " ÔÁ "
-#: common/unittype.c:355 client/helpdata.c:1390
+#: common/unittype.c:355 client/helpdata.c:1398
msgid "?and:, "
msgstr "?ÔÁ:, "
@@ -972,72 +973,72 @@ msgstr "
msgid "Missing argument for \"%s\".\n"
msgstr "÷¦ÄÓÕÔÎ¦Ê ÁÒÇÕÍÅÎÔ ÄÌÑ '%s'.\n"
-#: utility/shared.c:501
+#: utility/shared.c:514
#, c-format
msgid "%d BC"
msgstr "%d ÄÏ Î.Å."
-#: utility/shared.c:503
+#: utility/shared.c:516
#, c-format
msgid "%d AD"
msgstr "%d Î.Å."
-#: utility/shared.c:924
+#: utility/shared.c:937
msgid "FREECIV_PATH is set but empty; using default path instead."
msgstr ""
"úͦÎÎÕ FREECIV_PATH ×ÓÔÁÎÏ×ÌÅÎÎÏ, ÁÌÅ ×ÏÎÁ ÐÕÓÔÁ; ×ÉËÏÒÉÓÔÏ×Õ¤ÍÏ ÛÌÑÈ ÐÏ "
"ÚÁÍÏÞÕ×ÁÎÎÀ."
-#: utility/shared.c:1028
+#: utility/shared.c:1041
#, c-format
msgid "Could not read data directory %s: %s."
msgstr "îÅ ÍÏÖÕ ÐÒÏÞÉÔÁÔÉ ËÁÔÁÌÏÇ ÄÁÎÎÉÈ %s: %s."
-#: utility/shared.c:1279
+#: utility/shared.c:1292
msgid "The data path may be set via the environment variable FREECIV_PATH."
msgstr "ûÌÑÈ ÄÁÎÎÉÈ ÍÏÖÅ ÂÕÔÉ ×ÓÔÁÎÏ×ÌÅÎÎÏ ÚͦÎÎÏÀ FREECIV_PATH."
-#: utility/shared.c:1281
+#: utility/shared.c:1294
#, c-format
msgid "Current data path is: \"%s\""
msgstr "ðÏÔÏÞÎÉÊ ÛÌÑÈ ÄÁÎÎÉÈ: \"%s\""
-#: utility/shared.c:1283
+#: utility/shared.c:1296
#, c-format
msgid "The \"%s\" file is required ... aborting!"
msgstr "æÁÊÌ \"%s\" ¤ ÎÅÏÂȦÄÎÉÍ... ÐÅÒÅÒÉ×ÁÀÓØ!"
-#: utility/shared.c:1460
+#: utility/shared.c:1485
#, c-format
msgid "%s: Fatal error: you're trying to run me as superuser!\n"
msgstr ""
"%s: ëÒÉÔÉÞÎÁ ÐÏÍÉÌËÁ: ÷É ÎÁÍÁÇÁ¤ÔÅÓØ ÚÁÐÕÓÔÉÔÉ ÍÅÎÅ ÑË ÁÄͦΦÓÔÒÁÔÏÒ!\n"
-#: utility/shared.c:1462
+#: utility/shared.c:1487
msgid "Use a non-privileged account instead.\n"
msgstr "÷ÉËÏÒÉÓÔÏ×ÕÊÔÅ Ú×ÉÞÁÊÎÏÇÏ ËÏÒÉÓÔÕ×ÁÞÁ.\n"
-#: utility/shared.c:1478
+#: utility/shared.c:1503
msgid "exact match"
msgstr "ÔÏÞÎÅ ÓЦ×ÐÁĦÎÎÑ"
-#: utility/shared.c:1479
+#: utility/shared.c:1504
msgid "only match"
msgstr "¤ÄÉÎÅ ÓЦ×ÐÁĦÎÎÑ"
-#: utility/shared.c:1480
+#: utility/shared.c:1505
msgid "ambiguous"
msgstr "Ä×ÏÚÎÁÞÎÏ"
-#: utility/shared.c:1481
+#: utility/shared.c:1506
msgid "empty"
msgstr "ÐÕÓÔÏ"
-#: utility/shared.c:1482
+#: utility/shared.c:1507
msgid "too long"
msgstr "ÚÁÎÁÄÔÏ ÄÏ×ÇÅ"
-#: utility/shared.c:1483
+#: utility/shared.c:1508
msgid "non-match"
msgstr "ÎÅ ÓЦ×ÐÁÄÁ¤"
@@ -1066,108 +1067,108 @@ msgstr "%s
msgid "%s is selling %s (not needed) for %d."
msgstr "%s ÐÒÏÄÁ× %s (ÎÅ ÐÏÔÒ¦ÂÎÏ) ÄÌÑ %d."
-#: ai/advdiplomacy.c:280
+#: ai/advdiplomacy.c:300
#, c-format
msgid "*%s (AI)* In away mode AI can't sign such a treaty."
msgstr ""
-#: ai/advdiplomacy.c:290
+#: ai/advdiplomacy.c:310
#, c-format
msgid "*%s (AI)* First break alliance with %s, %s."
msgstr ""
-#: ai/advdiplomacy.c:303
+#: ai/advdiplomacy.c:322
#, c-format
msgid "*%s (AI)* Let us first cease hostilies, %s."
msgstr ""
-#: ai/advdiplomacy.c:308
+#: ai/advdiplomacy.c:327
#, c-format
msgid ""
"*%s (AI)* I wish to see you keep the current ceasefire for a bit longer "
"first, %s."
msgstr ""
-#: ai/advdiplomacy.c:331
+#: ai/advdiplomacy.c:350
#, c-format
msgid "*%s (AI)* I simply do not trust you with an alliance yet, %s."
msgstr ""
-#: ai/advdiplomacy.c:424
+#: ai/advdiplomacy.c:443
#, c-format
msgid "*%s (AI)* I do not know the city you mention."
msgstr ""
-#: ai/advdiplomacy.c:454
+#: ai/advdiplomacy.c:473
#, c-format
msgid "*%s (AI)* Sorry, sharing vision with you is not safe."
msgstr ""
-#: ai/advdiplomacy.c:560
+#: ai/advdiplomacy.c:579
#, c-format
msgid "*%s (AI)* This deal was not very good for us, %s!"
msgstr ""
-#: ai/advdiplomacy.c:582
+#: ai/advdiplomacy.c:601
#, c-format
msgid "*%s (AI)* Welcome into our alliance %s!"
msgstr ""
-#: ai/advdiplomacy.c:586
+#: ai/advdiplomacy.c:605
#, c-format
msgid "*%s (AI)* Yes, may we forever stand united, %s."
msgstr ""
-#: ai/advdiplomacy.c:593
+#: ai/advdiplomacy.c:612
#, c-format
msgid "*%s (AI)* Yes, peace in our time!"
msgstr ""
-#: ai/advdiplomacy.c:598
+#: ai/advdiplomacy.c:617
#, c-format
msgid "*%s (AI)* Agreed. No more hostilities, %s."
msgstr ""
-#: ai/advdiplomacy.c:813
+#: ai/advdiplomacy.c:832
#, c-format
msgid ""
"*%s (AI)* Greetings %s! May we suggest a ceasefire while we get to know each "
"other better?"
msgstr ""
-#: ai/advdiplomacy.c:1097
+#: ai/advdiplomacy.c:1116
#, c-format
msgid "*%s (AI)* Space will never be yours. "
msgstr ""
-#: ai/advdiplomacy.c:1102
+#: ai/advdiplomacy.c:1121
#, c-format
msgid "*%s (AI)* I have tolerated your vicious antics long enough! To war!"
msgstr ""
-#: ai/advdiplomacy.c:1108
+#: ai/advdiplomacy.c:1127
#, c-format
msgid "*%s (AI)* Peace in ... some other time."
msgstr ""
-#: ai/advdiplomacy.c:1113
+#: ai/advdiplomacy.c:1132
#, 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:1119
+#: ai/advdiplomacy.c:1138
#, c-format
msgid "*%s (AI)* Your covert hostilities brought this war upon you!"
msgstr ""
-#: ai/advdiplomacy.c:1126
+#: ai/advdiplomacy.c:1145
#, c-format
msgid "*%s (AI)* Your aggression against %s was your last mistake!"
msgstr ""
-#: ai/advdiplomacy.c:1209
+#: ai/advdiplomacy.c:1229
#, c-format
msgid ""
"*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1179,14 +1180,14 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ai/advdiplomacy.c:1219
+#: ai/advdiplomacy.c:1239
#, c-format
msgid ""
"*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
"alliance!"
msgstr ""
-#: ai/advdiplomacy.c:1225
+#: ai/advdiplomacy.c:1245
#, c-format
msgid ""
"*%s (AI)* %s has grossly violated his treaties with us for own gain. We "
@@ -1200,7 +1201,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ai/advdiplomacy.c:1238
+#: ai/advdiplomacy.c:1258
#, c-format
msgid ""
"*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1212,13 +1213,13 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ai/advdiplomacy.c:1246
+#: ai/advdiplomacy.c:1266
#, c-format
msgid ""
"*%s (AI)* If you want a piece of the loot, feel free to join in the action!"
msgstr ""
-#: ai/advdiplomacy.c:1251
+#: ai/advdiplomacy.c:1271
#, c-format
msgid ""
"*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1230,12 +1231,12 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ai/advdiplomacy.c:1261
+#: ai/advdiplomacy.c:1281
#, c-format
msgid "*%s (AI)* As our glorious allies, we expect your help in this war."
msgstr ""
-#: ai/advdiplomacy.c:1267
+#: ai/advdiplomacy.c:1287
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance and declare war on %s in %d turn. "
@@ -1247,7 +1248,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ai/advdiplomacy.c:1276
+#: ai/advdiplomacy.c:1296
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1259,47 +1260,47 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ai/advdiplomacy.c:1344
+#: ai/advdiplomacy.c:1364
#, 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:1359
+#: ai/advdiplomacy.c:1379
#, c-format
msgid ""
"*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
"offensive."
msgstr ""
-#: ai/advdiplomacy.c:1362
+#: ai/advdiplomacy.c:1382
#, c-format
msgid ""
"*%s (AI)* If you do not stop constructing your spaceship, I may be forced to "
"take action!"
msgstr ""
-#: ai/advdiplomacy.c:1474
+#: ai/advdiplomacy.c:1494
#, c-format
msgid "*%s (AI)* Sorry, sharing vision with you is no longer safe."
msgstr ""
-#: ai/advdiplomacy.c:1549
+#: ai/advdiplomacy.c:1569
#, c-format
msgid ""
"*%s (AI)* Greetings our most trustworthy ally. We call upon you to destroy "
"our enemy, %s."
msgstr ""
-#: ai/advdiplomacy.c:1555
+#: ai/advdiplomacy.c:1575
#, 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:1562
+#: ai/advdiplomacy.c:1582
#, c-format
msgid ""
"*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1307,26 +1308,26 @@ msgid ""
"more!"
msgstr ""
-#: ai/advdiplomacy.c:1592
+#: ai/advdiplomacy.c:1612
#, c-format
msgid ""
"*%s (AI)* Greetings friend, may we suggest making a common cause and join in "
"an alliance?"
msgstr ""
-#: ai/advdiplomacy.c:1607
+#: ai/advdiplomacy.c:1627
#, c-format
msgid "*%s (AI)* Greetings neighbour, may we suggest more peaceful relations?"
msgstr ""
-#: ai/advdiplomacy.c:1622
+#: ai/advdiplomacy.c:1642
#, c-format
msgid ""
"*%s (AI)* We grow weary of this constant bloodshed. May we suggest a "
"cessation of hostilities?"
msgstr ""
-#: ai/advdiplomacy.c:1742
+#: ai/advdiplomacy.c:1762
#, c-format
msgid ""
"*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1468,17 +1469,17 @@ msgid ""
"minimum %d [printable] characters long. Try again."
msgstr ""
-#: server/barbarian.c:183
+#: server/barbarian.c:184
#, c-format
msgid "%s gain a leader by the name %s. Dangerous times may lie ahead."
msgstr ""
-#: server/barbarian.c:479
+#: server/barbarian.c:480
#, c-format
msgid "Native unrest near %s led by %s."
msgstr "í¦ÓÃÅצ ÚÁ×ÏÒÕÛÅÎÎÑ Â¦ÌÑ %s Ð¦Ä ÐÒÏ×ÏÄÏÍ %s."
-#: server/barbarian.c:484
+#: server/barbarian.c:485
#, c-format
msgid "Sea raiders seen near %s!"
msgstr "ð¦ÒÁÔÉ Â¦ÌÑ %s!"
@@ -1874,7 +1875,7 @@ msgstr[0] "%s
msgstr[1] "%s ÐÒÉÓËÏÒÀ¤ ÄÏÓ̦ÄÖÅÎÎÑ, ×É ÎÅÇÁÊÎÏ ÏÔÒÉÍÕ¤ÔÅ 2 צÄËÒÉÔÔÑ."
msgstr[2] "%s ÐÒÉÓËÏÒÀ¤ ÄÏÓ̦ÄÖÅÎÎÑ, ×É ÎÅÇÁÊÎÏ ÏÔÒÉÍÕ¤ÔÅ 2 צÄËÒÉÔÔÑ."
-#: server/cityturn.c:1158 server/techtools.c:176
+#: server/cityturn.c:1158 server/techtools.c:172
#, fuzzy, c-format
msgid "The %s have acquired %s from %s."
msgstr "%s ÚÄÏÂÕ× %s ×¦Ä %s."
@@ -1958,22 +1959,22 @@ msgid "Warning: the %s option is obsolete. Use -m to enable the metaserver.\n"
msgstr ""
"õ×ÁÇÁ: ÏÐÃ¦Ñ %s ÚÁÓÔÁÒ¦ÌÁ. ÷ÉËÏÒÉÓÔÏ×ÕÊÔÅ -m ÄÌÑ ÚÁÐÕÓËÕ ÍÅÔÁÓÅÒ×ÅÒÁ.\n"
-#: server/civserver.c:189
+#: server/civserver.c:193
#, c-format
msgid "Error: unknown option '%s'\n"
msgstr "ðÏÍÉÌËÁ: ÎÅצÄÏÍÁ ÏÐÃ¦Ñ '%s'\n"
-#: server/civserver.c:200
+#: server/civserver.c:204
#, c-format
msgid "This is the server for %s"
msgstr "ãÅ ÓÅÒ×ÅÒ ÄÌÑ %s"
-#: server/civserver.c:201
+#: server/civserver.c:205
#, c-format
msgid "You can learn a lot about Freeciv at %s"
msgstr "÷É ÍÏÖÅÔÅ ÂÁÇÁÔÏ Ä¦ÚÎÁÔÉÓÑ ÐÒÏ Freeciv ÎÁ %s"
-#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
+#: server/civserver.c:210 client/civclient.c:239 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -1982,107 +1983,112 @@ msgstr ""
"÷ÉËÏÒÉÓÔÁÎÎÑ: %s [ÏÐÃ¦Ñ ...]\n"
"ä¦ÊÓÎÉÍÉ ÏÐæÑÍÉ ¤:\n"
-#: server/civserver.c:208
+#: server/civserver.c:212
msgid ""
" -a --auth FILE\tEnable server authentication with configuration from "
"FILE.\n"
msgstr ""
-#: server/civserver.c:210
+#: server/civserver.c:214
msgid " -G --Guests\t\tAllow guests to login if auth is enabled.\n"
msgstr ""
-#: server/civserver.c:212
+#: server/civserver.c:216
msgid " -N --Newusers\tAllow new users to login if auth is enabled.\n"
msgstr ""
-#: server/civserver.c:215
+#: server/civserver.c:219
#, fuzzy
msgid " -b --bind ADDR\tListen for clients on ADDR\n"
msgstr " -p, --port ðïòô\tïÞÉËÕ×ÁÔÉ ÎÁ Ú'¤ÄÎÁÎÎÑ ÎÁ ÐÏÒÔÕ ðïòô\n"
-#: server/civserver.c:217 client/civclient.c:242
+#: server/civserver.c:221 client/civclient.c:243
msgid ""
" -d, --debug NUM\tSet debug log level (0 to 4, or 4:file1,min,max:...)\n"
msgstr ""
" -d, --debug îïíåò\t÷ÓÔÁÎÏ×ÉÔÉ Ò¦×ÅÎØ ×¦ÄÌÁÄËÉ (Ú 0 ÐÏ 4, ÁÂÏ 4:ÆÁÊÌ1,ͦÎ,"
"ÍÁËÓ:...)\n"
-#: server/civserver.c:221 client/civclient.c:246
+#: server/civserver.c:225 client/civclient.c:247
msgid " -d, --debug NUM\tSet debug log level (0 to 3)\n"
msgstr " -d, --debug îïíåò\t÷ÓÔÁÎÏ×ÉÔÉ Ò¦×ÅÎØ ×¦ÄÌÁÄËÉ (Ú 0 ÐÏ 3)\n"
-#: server/civserver.c:223
+#: server/civserver.c:227
msgid " -f, --file FILE\tLoad saved game FILE\n"
msgstr " -f, --file æáêì\túÁ×ÁÎÔÁÖÉÔÉ ÇÒÕ ÚÂÅÒÅÖÅÎÕ Õ æáêì\n"
-#: server/civserver.c:225 client/civclient.c:249 manual/civmanual.c:382
+#: server/civserver.c:229 client/civclient.c:250 manual/civmanual.c:382
msgid " -h, --help\t\tPrint a summary of the options\n"
msgstr " -h, --help\t\t÷É×ÅÓÔÉ Ð¦ÄËÁÚËÕ ÐÏ ÏÐæÑÍ\n"
-#: server/civserver.c:226
+#: server/civserver.c:230
+#, fuzzy
+msgid " -i, --identity ADDR\tBe known as ADDR at metaserver\n"
+msgstr " -M, --Metaserver áäòåóá\t÷ÓÔÁÎÏ×ÉÔÉ áäòåóá ÑË ÁÄÒÅÓÕ ÍÅÔÁÓÅÒ×ÅÒÁ\n"
+
+#: server/civserver.c:231
msgid " -l, --log FILE\tUse FILE as logfile\n"
msgstr " -l, --log æáêì\t÷ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ æáêì ÑË ÖÕÒÎÁÌ\n"
-#: server/civserver.c:227
+#: server/civserver.c:232
msgid " -m, --meta\t\tNotify metaserver and send server's info\n"
msgstr ""
" -m, --meta\t\tðÏצÄÏÍÉÔÉ ÍÅÔÁÓÅÒ×ÅÒ ÔÁ צÄÐÒÁ×ÉÔÉ ¦ÎÆÏÒÍÁæÀ ÓÅÒ×ÅÒÁ\n"
-#: server/civserver.c:229
+#: server/civserver.c:234
msgid " -M, --Metaserver ADDR\tSet ADDR as metaserver address\n"
msgstr " -M, --Metaserver áäòåóá\t÷ÓÔÁÎÏ×ÉÔÉ áäòåóá ÑË ÁÄÒÅÓÕ ÍÅÔÁÓÅÒ×ÅÒÁ\n"
-#: server/civserver.c:232
+#: server/civserver.c:237
msgid " -p, --port PORT\tListen for clients on port PORT\n"
msgstr " -p, --port ðïòô\tïÞÉËÕ×ÁÔÉ ÎÁ Ú'¤ÄÎÁÎÎÑ ÎÁ ÐÏÒÔÕ ðïòô\n"
-#: server/civserver.c:234
+#: server/civserver.c:239
msgid " -q, --quitidle TIME\tQuit if no players for TIME seconds\n"
msgstr " -q, --quitidle þáó\túÁ˦ÎÞÉÔÉ ÑËÝÏ ÎÅ ÂÕÄÅ ÇÒÁ×Ã¦× ÚÁ þáó ÓÅËÕÎÄ\n"
-#: server/civserver.c:236
+#: server/civserver.c:241
msgid " -e, --exit-on-end\tWhen a game ends, exit instead of restarting\n"
msgstr ""
-#: server/civserver.c:239
+#: server/civserver.c:244
msgid " -s, --saves DIR\tSave games to directory DIR\n"
msgstr ""
-#: server/civserver.c:241
+#: server/civserver.c:246
#, fuzzy
msgid " -S, --Serverid ID\tSets the server id to ID\n"
msgstr " -s, --server áäòåóá\tðÒɤÄÎÁÔÉÓÑ ÄÏ ÓÅÒ×ÅÒÁ ÎÁ áäòåóá\n"
-#: server/civserver.c:243
+#: server/civserver.c:248
msgid " -P, --Ppm\t\tSave ppms of the map when saving the game.\n"
msgstr ""
-#: server/civserver.c:244
+#: server/civserver.c:249
msgid " -r, --read FILE\tRead startup script FILE\n"
msgstr " -r, --read æáêì\tþÉÔÁÔÉ æáêì ÓÔÁÒÔÏ×ÏÇÏ ÓËÒÉÐÔÁ\n"
-#: server/civserver.c:246
+#: server/civserver.c:251
#, fuzzy
msgid " -R, --Ranklog FILE\tUse FILE as ranking logfile\n"
msgstr " -l, --log æáêì\t÷ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ æáêì ÑË ÖÕÒÎÁÌ\n"
-#: server/civserver.c:247 client/civclient.c:268 manual/civmanual.c:383
+#: server/civserver.c:252 client/civclient.c:269 manual/civmanual.c:383
msgid " -v, --version\t\tPrint the version number\n"
msgstr " -v, --version\t\t÷É×ÅÓÔÉ ×ÅÒÓ¦À\n"
-#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
+#: server/civserver.c:253 client/gui-gtk-2.0/gui_main.c:354
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, fuzzy, c-format
msgid "Report bugs at %s.\n"
msgstr "ðÒÏ ÐÏÍÉÌËÉ ÐÏצÄÏÍÌÑÊÔÅ <%s>.\n"
-#: server/commands.c:28
+#: server/commands.c:29
msgid "Start the game, or restart after loading a savegame."
msgstr "óÔÁÒÔÕ×ÁÔÉ ÇÒÕ ÁÂÏ ÒÅÓÔÁÒÔÕ×ÁÔÉ Ð¦ÓÌÑ ÚÁ×ÁÎÔÁÖÅÎÎÑ ÚÂÅÒÅÖÅÎϧ ÇÒÉ."
-#: server/commands.c:29
+#: server/commands.c:30
msgid ""
"This command starts the game. When starting a new game, it should be used "
"after all human players have connected, and AI players have been created (if "
@@ -2101,7 +2107,7 @@ msgstr ""
"ÇÒÉ ÃÑ ËÏÍÁÎÄÁ ¤ ÎÅÄÏÓÔÕÐÎÏÀ, ÂÏ Ö ÚÒÏÚÕͦÌÏ ÝÏ ÔÅÐÅÒ ×ÏÎÁ ÎÅ ÍÁ¤ ÓÅÎÓÕ."
#. TRANS: translate text between <> only
-#: server/commands.c:42
+#: server/commands.c:44
msgid ""
"help\n"
"help commands\n"
@@ -2115,11 +2121,11 @@ msgstr ""
"help <ËÏÍÁÎÄÁ>\n"
"help <ÏÐæÑ>"
-#: server/commands.c:47
+#: server/commands.c:49
msgid "Show help about server commands and server options."
msgstr "ðÏËÁÚÁÔÉ ÄÏÐÏÍÏÇÕ ÐÏ ËÏÍÁÎÄÁÍ ÔÁ ÏÐæÑÍ ÓÅÒ×ÅÒÁ."
-#: server/commands.c:48
+#: server/commands.c:50
msgid ""
"With no arguments gives some introductory help. With argument \"commands\" "
"or \"options\" gives respectively a list of all commands or all options. "
@@ -2134,12 +2140,12 @@ msgstr ""
"ÁÂÏ ÏÐæ§. äÌÑ ÏÐÃ¦Ê ÄÏÐÏÍÏÇÁ ×ËÌÀÞÁ¤ ÐÏÔÏÞÎÅ ÚÎÁÞÅÎÎÑ ÔÁ ÚÎÁÞÅÎÎÑ ÐÏ "
"ÚÁÍÏ×ÞÕ×ÁÎÎÀ. áÒÇÕÍÅÎÔ ÍÏÖÅ ÂÕÔÉ ÓËÏÒÏÞÅÎÎÑÍ ÑËÝÏ ×ÏÎÏ ÏÄÎÏÚÎÁÞÎÅ."
-#: server/commands.c:63
+#: server/commands.c:66
#, fuzzy
msgid "Show a list of players, teams, connections, or scenarios."
msgstr "ðÏËÁÚÁÔÉ ÓÐÉÓÏË ÇÒÁ×Ã¦× ÁÂÏ Ú'¤ÄÎÁÎØ."
-#: server/commands.c:64
+#: server/commands.c:67
#, fuzzy
msgid ""
"Show a list of players in the game, teams of players, connections to the "
@@ -2150,20 +2156,20 @@ msgstr ""
"ÓËÏÒÏÞÅÎÎÑÍ, ÔÁ ÐÒÉ ×¦ÄÓÕÔÎÏÓÔ¦ ÐÒÉÊÍÁ¤ÔØÓÑ ÚÎÁÞÅÎÎÑ ÐÏ ÚÁÍÏ×ÞÕ×ÁÎÎÀ "
"'players'."
-#: server/commands.c:70
+#: server/commands.c:74
msgid "Quit the game and shutdown the server."
msgstr "÷ÉÊÔÉ Ú ÇÒÉ ÔÁ ×ÉÍËÎÕÔÉ ÓÅÒ×ÅÒ."
#. TRANS: translate text between <> only
-#: server/commands.c:74
+#: server/commands.c:79
msgid "cut <connection-name>"
msgstr "cut <¦Í'Ñ-Ú'¤ÄÎÁÎÎÑ>"
-#: server/commands.c:75
+#: server/commands.c:80
msgid "Cut a client's connection to server."
msgstr "òÏÚ¦Ò×ÁÔÉ Ú'¤ÄÎÁÎÎÑ Ë̦¤ÎÔÁ ÄÏ ÓÅÒ×ÅÒÁ."
-#: server/commands.c:76
+#: server/commands.c:81
msgid ""
"Cut specified client's connection to the server, removing that client from "
"the game. If the game has not yet started that client's player is removed "
@@ -2175,7 +2181,7 @@ msgstr ""
"ÍÁÊÔÅ ÎÁ Õ×ÁÚ¦ ÝÏ ÔÅÐÅÒ ÃÑ ËÏÍÁÎÄÁ ÐÏÔÒÅÂÕ¤ ¦Í'Ñ Ú'¤ÄÎÁÎÎÑ, Á ÎÅ ¦Í'Ñ ÇÒÁ×ÃÑ."
#. TRANS: translate text between <> only
-#: server/commands.c:83
+#: server/commands.c:89
msgid ""
"explain\n"
"explain <option-name>"
@@ -2183,11 +2189,11 @@ msgstr ""
"explain\n"
"explain <ÏÐæÑ>"
-#: server/commands.c:85
+#: server/commands.c:91
msgid "Explain server options."
msgstr "òÏÚÑÓÎÀ¤ ÏÐæ§ ÓÅÒ×ÅÒÁ"
-#: server/commands.c:86
+#: server/commands.c:92
msgid ""
"The 'explain' command gives a subset of the functionality of 'help', and is "
"included for backward compatibility. With no arguments it gives a list of "
@@ -2200,7 +2206,7 @@ msgstr ""
"<ÏÐæÑ>')."
#. TRANS: translate text between <> only
-#: server/commands.c:93
+#: server/commands.c:100
msgid ""
"show\n"
"show <option-name>\n"
@@ -2210,11 +2216,11 @@ msgstr ""
"show <ÏÐæÑ>\n"
"show <ÐÒÅƦËÓ-ÏÐæ§>"
-#: server/commands.c:96
+#: server/commands.c:103
msgid "Show server options."
msgstr "ðÏËÁÚÕ¤ ÏÐæ§ ÓÅÒ×ÅÒÁ."
-#: server/commands.c:97
+#: server/commands.c:104
msgid ""
"With no arguments, shows all server options (or available options, when used "
"by clients). With an argument, show only the named option, or options with "
@@ -2224,72 +2230,73 @@ msgstr ""
"×ÉÚÉ×Á¤ÔØÓÑ Ë̦¤ÎÔÁÍÉ). ú ÁÒÇÕÍÅÎÔÏÍ ÐÏËÁÚÕ¤ Ô¦ÌØ˦ ×ËÁÚÁÎÕ ÏÐæÀ ÁÂÏ ÏÐæ§ "
"Ú ÔÁËÉÍ ÐÒÅƦËÓÏÍ."
-#: server/commands.c:102
+#: server/commands.c:110
msgid "wall <message>"
msgstr "wall <ÐÏצÄÏÍÌÅÎÎÑ>"
-#: server/commands.c:103
+#: server/commands.c:111
msgid "Send message to all connections."
msgstr "÷¦Ä¦ÓÌÁÔÉ ÐÏצÄÏÍÌÅÎÎÑ ×Ó¦Í ÇÒÁ×ÃÑÍ."
-#: server/commands.c:104
+#: server/commands.c:112
msgid ""
"For each connected client, pops up a window showing the message entered."
msgstr "äÌÑ ËÏÖÎÏÇÏ Ð¦Ä'¤ÄÎÁÎÏÇÏ ÇÒÁ×ÃÑ ÄÅÍÏÎÓÔÒÕ¤ צËÏÎÃÅ Ú ÐÏצÄÏÍÌÅÎÎÑÍ."
-#: server/commands.c:108
+#: server/commands.c:117
msgid "vote yes|no [vote number]"
msgstr ""
-#: server/commands.c:109
+#: server/commands.c:118
#, fuzzy
msgid "Cast a vote."
msgstr "ðÒÉÂÅÒÅÖΦ ͦÓÔÁ"
-#: server/commands.c:111
+#: server/commands.c:120
#, 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."
+"A player with basic 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."
msgstr ""
-#: server/commands.c:121
+#: server/commands.c:131
msgid ""
"debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
"<player> | timing | info]"
msgstr ""
-#: server/commands.c:123
+#: server/commands.c:133
msgid "Turn on or off AI debugging of given entity."
msgstr ""
-#: server/commands.c:124
+#: server/commands.c:134
msgid ""
"Print AI debug information about given entity and turn continous debugging "
"output for this entity on or off."
msgstr ""
-#: server/commands.c:128
+#: server/commands.c:139
msgid "set <option-name> <value>"
msgstr "set <ÏÐæÑ> <ÚÎÁÞÅÎÎÑ>"
-#: server/commands.c:129
+#: server/commands.c:140
msgid "Set server option."
msgstr "÷ÓÔÁÎÏ×ÉÔÉ ÏÐæ§ ÓÅÒ×ÅÒÁ."
-#: server/commands.c:132
+#: server/commands.c:144
msgid "team <player> [team]"
msgstr "team <¦Í'Ñ-ÇÒÁ×ÃÑ> [¦Í'Ñ ËÏÍÁÎÄÉ]"
-#: server/commands.c:133
+#: server/commands.c:145
msgid "Change, add or remove a player's team affiliation."
msgstr "úͦÎÉÔÉ, ÄÏÄÁÔÉ ÞÉ ×ÉÄÁÌÉÔÉ ÇÒÁ×ÃÑ Ú ËÏÍÁÎÄÉ."
-#: server/commands.c:134
+#: server/commands.c:146
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 "
@@ -2302,16 +2309,16 @@ msgstr ""
"ÁÍÂÁÓÁÄÁÍÉ, ÔÁ ÇÒÁÀÔØ ÒÁÚÏÍ ÁÂÉ ÏÔÒÉÍÁÔÉ ÐÅÒÅÍÏÇÕ ËÏÍÁÎÄÉ Ú ¦ÎĦצÄÕÁÌØÎÉÍÉ "
"ÒÁÈÕÎËÁÍÉ."
-#: server/commands.c:141
+#: server/commands.c:154
msgid "rulesetdir <directory>"
msgstr "rulesetdir <ÔÅËÁ>"
-#: server/commands.c:142
+#: server/commands.c:155
#, fuzzy
msgid "Choose new ruleset directory or modpack."
msgstr "ðÏÔÏÞÎÉÊ ËÁÔÁÌÏÇ ÐÒÁ×ÉÌ \"%s\""
-#: server/commands.c:143
+#: server/commands.c:156
msgid ""
"Choose new ruleset directory or modpack. Calling this\n"
" without any arguments will show you the currently selected ruleset."
@@ -2320,15 +2327,15 @@ msgstr ""
"ÐÒÁ×ÉÌ."
#. TRANS: translate text between <> only
-#: server/commands.c:149
+#: server/commands.c:163
msgid "metainfo <meta-line>"
msgstr "metainfo <¦ÎÆÏ>"
-#: server/commands.c:150
+#: server/commands.c:164
msgid "Set metaserver info line."
msgstr "÷ÓÔÁÎÏ×ÉÔÉ ¦ÎÆÏ ÓÔÒ¦ÞËÕ ÍÅÔÁÓÅÒ×ÅÒÁ."
-#: server/commands.c:151
+#: server/commands.c:165
msgid ""
"Set user defined metaserver info line. If parameter is omitted,\n"
"previously set metamessage will be removed. For most of the time\n"
@@ -2337,21 +2344,21 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:158
+#: server/commands.c:173
#, fuzzy
msgid "metapatch <meta-line>"
msgstr "metainfo <¦ÎÆÏ>"
-#: server/commands.c:159
+#: server/commands.c:174
#, fuzzy
msgid "Set metaserver patches line."
msgstr "÷ÓÔÁÎÏ×ÉÔÉ ¦ÎÆÏ ÓÔÒ¦ÞËÕ ÍÅÔÁÓÅÒ×ÅÒÁ."
-#: server/commands.c:165
+#: server/commands.c:181
msgid "Control metaserver connection."
msgstr "õÐÒÁ×̦ÎÎÑ Ú'¤ÄÎÁÎÎÑÍÉ ÍÅÔÁÓÅÒ×ÅÒÁ."
-#: server/commands.c:166
+#: server/commands.c:182
msgid ""
"'metaconnection ?' reports on the status of the connection to metaserver.\n"
"'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2362,34 +2369,34 @@ msgstr ""
"'metaconnection up' ÁÂÏ 'metac u' ЦĦÊÍÁ¤ Ú'¤ÄÎÁÎÎÑ Ú ÍÅÔÁÓÅÒ×ÅÒÏÍ."
#. TRANS: translate text between <> only
-#: server/commands.c:172
+#: server/commands.c:189
msgid "metaserver <address>"
msgstr "metaserver <ÁÄÒÅÓÁ>"
-#: server/commands.c:173
+#: server/commands.c:190
#, fuzzy
msgid "Set address (URL) for metaserver to report to."
msgstr "÷ÓÔÁÎÏ×ÉÔÉ ÁÄÒÅÓÕ ÍÅÔÁÓÅÒ×ÅÒÁ ÄÌÑ ¦ÎÆÏÒÍÁæ§."
#. TRANS: translate text between <> only
-#: server/commands.c:177
+#: server/commands.c:195
msgid "aitoggle <player-name>"
msgstr "aitoggle <ÇÒÁ×ÅÃØ>"
-#: server/commands.c:178
+#: server/commands.c:196
msgid "Toggle AI status of player."
msgstr "÷ÓÔÁÎÏ×ÉÔÉ ÓÔÁÔÕÓ ËÏÍÐ'ÀÔÅÒÎÏÇÏ ÄÌÑ ÇÒÁ×ÃÑ."
#. TRANS: translate text between [] and <> only
-#: server/commands.c:182
+#: server/commands.c:201
msgid "take [connection-name] <player-name>"
msgstr "take [Ú'¤ÄÎÁÎÎÑ] <ÇÒÁ×ÅÃØ>"
-#: server/commands.c:183
+#: server/commands.c:202
msgid "Take over a player's place in the game."
msgstr "ðÅÒÅÈÏÐÌÅÎÏ Í¦ÓÃÅ ÇÒÁ×ÃÑ %s Õ ÇÒ¦."
-#: server/commands.c:184
+#: server/commands.c:203
#, fuzzy
msgid ""
"Only the console and connections with cmdlevel 'hack' can force other "
@@ -2403,17 +2410,17 @@ msgstr ""
"<ÇÒÁ×ÅÃØ> ÄÏÚ×ÏÌÅÎÉÊ"
#. TRANS: translate text between [] only
-#: server/commands.c:192
+#: server/commands.c:212
#, fuzzy
msgid "observe [connection-name] [player-name]"
msgstr "take [Ú'¤ÄÎÁÎÎÑ] <ÇÒÁ×ÅÃØ>"
-#: server/commands.c:193
+#: server/commands.c:213
#, fuzzy
msgid "Observe a player or the whole game."
msgstr "÷ÉÄÁÌÅÎÏ ÇÒÁ×ÃÑ player %s Ú ÇÒÉ."
-#: server/commands.c:194
+#: server/commands.c:214
#, fuzzy
msgid ""
"Only the console and connections with cmdlevel 'hack' can force other "
@@ -2427,16 +2434,16 @@ msgstr ""
"<ÇÒÁ×ÅÃØ> ÄÏÚ×ÏÌÅÎÉÊ"
#. TRANS: translate text between <> only
-#: server/commands.c:202
+#: server/commands.c:223
#, fuzzy
msgid "detach <connection-name>"
msgstr "cut <¦Í'Ñ-Ú'¤ÄÎÁÎÎÑ>"
-#: server/commands.c:203
+#: server/commands.c:224
msgid "detach from a player."
msgstr ""
-#: server/commands.c:204
+#: server/commands.c:225
#, fuzzy
msgid ""
"Only the console and connections with cmdlevel 'hack' can force other "
@@ -2447,20 +2454,20 @@ msgstr ""
"<ÇÒÁ×ÅÃØ> ÄÏÚ×ÏÌÅÎÉÊ"
#. TRANS: translate text between <> only
-#: server/commands.c:209
+#: server/commands.c:231
msgid "create <player-name>"
msgstr "create <ÇÒÁ×ÅÃØ>"
-#: server/commands.c:210
+#: server/commands.c:232
msgid "Create an AI player with a given name."
msgstr "óÔ×ÏÒÉÔÉ ËÏÍÐ'ÀÔÅÒÎÏÇÏ ÇÒÁ×ÃÑ Ú ÔÁËÉÍ ¦Í'ÑÍ"
-#: server/commands.c:211
+#: server/commands.c:233
msgid ""
"The 'create' command is only available before the game has been started."
msgstr "ëÏÍÁÎÄÁ 'create' ÄÏÓÔÕÐÎÁ ÌÉÛÅ ÄÏ ÓÔÁÒÔÕ ÇÒÉ."
-#: server/commands.c:215
+#: server/commands.c:238
msgid ""
"away\n"
"away"
@@ -2468,20 +2475,20 @@ msgstr ""
"away\n"
"away"
-#: server/commands.c:217
+#: server/commands.c:240
msgid "Set yourself in away mode. The AI will watch your back."
msgstr ""
"÷ÓÔÁÎÏ×ÉÔÉ ÓϦ ÒÅÖÉÍ ×¦ÄÓÕÔÎÏÓÔ¦. ëÏÍÐ'ÀÔÅÒÎÉÊ ÇÒÁ×ÅÃØ ÂÕÄÅ ÏÞÉËÕ×ÁÔÉ ÎÁ "
"÷ÁÛÅ ÐÏ×ÅÒÎÅÎÎÑ."
-#: server/commands.c:218
+#: server/commands.c:241
msgid "The AI will govern your nation but do minimal changes."
msgstr ""
"ëÏÍÐ'ÀÔÅÒÎÉÊ ÇÒÁ×ÅÃØ ÂÕÄÅ ÇÏÌÏ×Õ×ÁÔÉ ÷ÁÛÏÀ ÎÁæ¤À ÁÌÅ ÒÏÂÉÔÉ Í¦Î¦ÍÁÌØΦ "
"ÚͦÎÉ."
#. TRANS: translate text between <> only
-#: server/commands.c:222
+#: server/commands.c:246
msgid ""
"novice\n"
"novice <player-name>"
@@ -2489,11 +2496,11 @@ msgstr ""
"novice\n"
"novice <ÇÒÁ×ÅÃØ>"
-#: server/commands.c:224
+#: server/commands.c:248
msgid "Set one or all AI players to 'novice'."
msgstr "÷ÓÔÁÎÏ×ÉÔÉ Ò¦×ÅÎØ ÏÄÎÏÇÏ ÁÂÏ ÕÓ¦È ËÏÍÐ'ÀÔÅÒÎÉÈ ÇÒÁ×Ã¦× Õ ÐÏÞÁÔËÏ×ÉÊ."
-#: server/commands.c:225
+#: server/commands.c:249
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 "
@@ -2504,7 +2511,7 @@ msgstr ""
"ÇÒÁ×æ×. úÁ ÎÁÑ×ÎÏÓÔ¦ ÁÇÒÕÍÅÎÔÁ ×ÓÔÁÎÏ×ÌÀ¤ Ò¦×ÅÎØ ÌÉÛÅ ÃØÏÇÏ ÇÒÁ×ÃÑ."
#. TRANS: translate text between <> only
-#: server/commands.c:231
+#: server/commands.c:256
msgid ""
"easy\n"
"easy <player-name>"
@@ -2512,11 +2519,11 @@ msgstr ""
"easy\n"
"easy <¦Í'Ñ ÇÒÁ×ÃÑ>"
-#: server/commands.c:233
+#: server/commands.c:258
msgid "Set one or all AI players to 'easy'."
msgstr "÷ÓÔÁÎÏ×ÉÔÉ Ò¦×ÅÎØ ÏÄÎÏÇÏ ÁÂÏ ÕÓ¦È ËÏÍÐ'ÀÔÅÒÎÉÈ ÇÒÁ×Ã¦× Õ ÌÅÇËÉÊ."
-#: server/commands.c:234
+#: server/commands.c:259
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 "
@@ -2527,7 +2534,7 @@ msgstr ""
"ÎÁÑ×ÎÏÓÔ¦ ÁÇÒÕÍÅÎÔÁ ×ÓÔÁÎÏ×ÌÀ¤ Ò¦×ÅÎØ ÌÉÛÅ ÃØÏÇÏ ÇÒÁ×ÃÑ."
#. TRANS: translate text between <> only
-#: server/commands.c:240
+#: server/commands.c:266
msgid ""
"normal\n"
"normal <player-name>"
@@ -2535,11 +2542,11 @@ msgstr ""
"normal\n"
"normal <¦Í'Ñ ÇÒÁ×ÃÑ>"
-#: server/commands.c:242
+#: server/commands.c:268
msgid "Set one or all AI players to 'normal'."
msgstr "÷ÓÔÁÎÏ×ÉÔÉ Ò¦×ÅÎØ ÏÄÎÏÇÏ ÁÂÏ ÕÓ¦È ËÏÍÐ'ÀÔÅÒÎÉÈ ÇÒÁ×Ã¦× Õ ÎÏÒÍÁÌØÎÉÊ."
-#: server/commands.c:243
+#: server/commands.c:269
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 "
@@ -2550,7 +2557,7 @@ msgstr ""
"ÇÒÁ×æ×. úÁ ÎÁÑ×ÎÏÓÔ¦ ÁÇÒÕÍÅÎÔÁ ×ÓÔÁÎÏ×ÌÀ¤ Ò¦×ÅÎØ ÌÉÛÅ ÃØÏÇÏ ÇÒÁ×ÃÑ."
#. TRANS: translate text between <> only
-#: server/commands.c:249
+#: server/commands.c:276
msgid ""
"hard\n"
"hard <player-name>"
@@ -2558,11 +2565,11 @@ msgstr ""
"hard\n"
"hard <¦Í'Ñ ÇÒÁ×ÃÑ>"
-#: server/commands.c:251
+#: server/commands.c:278
msgid "Set one or all AI players to 'hard'."
msgstr "÷ÓÔÁÎÏ×ÉÔÉ Ò¦×ÅÎØ ÏÄÎÏÇÏ ÁÂÏ ÕÓ¦È ËÏÍÐ'ÀÔÅÒÎÉÈ ÇÒÁ×Ã¦× Õ ×ÁÖËÉÊ."
-#: server/commands.c:252
+#: server/commands.c:279
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 "
@@ -2573,7 +2580,7 @@ msgstr ""
"ÎÁÑ×ÎÏÓÔ¦ ÁÇÒÕÍÅÎÔÁ ×ÓÔÁÎÏ×ÌÀ¤ Ò¦×ÅÎØ ÌÉÛÅ ÃØÏÇÏ ÇÒÁ×ÃÑ."
#. TRANS: translate text between <> only
-#: server/commands.c:258
+#: server/commands.c:286
msgid ""
"experimental\n"
"experimental <player-name>"
@@ -2581,12 +2588,12 @@ msgstr ""
"experimental\n"
"experimental <ÇÒÁ×ÅÃØ>"
-#: server/commands.c:260
+#: server/commands.c:288
msgid "Set one or all AI players to 'experimental'."
msgstr ""
"÷ÓÔÁÎÏ×ÉÔÉ Ò¦×ÅÎØ ÏÄÎÏÇÏ ÁÂÏ ÕÓ¦È ËÏÍÐ'ÀÔÅÒÎÉÈ ÇÒÁ×Ã¦× Õ ÅËÓÐÅÒÅÍÅÎÔÁÌØÎÉÊ."
-#: server/commands.c:261
+#: server/commands.c:289
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 "
@@ -2600,7 +2607,7 @@ msgstr ""
"ËÏÍÐ'ÀÔÅÒÎÉÈ ÇÒÁ×æ×! äÌÑ ÎÏÒÍÁÌØÎÉÈ ÓÅÒ×ÅÒ¦× ÃÑ ÏÐÃ¦Ñ ÎÅ ÄÁ¤ ΦÑËÏÇÏ ÅÆÅËÔÕ."
#. TRANS: translate text between <> only
-#: server/commands.c:269
+#: server/commands.c:298
msgid ""
"cmdlevel\n"
"cmdlevel <level>\n"
@@ -2614,18 +2621,20 @@ msgstr ""
"cmdlevel <Ò¦×ÅÎØ> first\n"
"cmdlevel <Ò¦×ÅÎØ> <¦Í'Ñ>"
-#: server/commands.c:274
+#: server/commands.c:303
msgid "Query or set command access level access."
msgstr "÷É×ÏÄÉÔØ ÁÂÏ ×ÓÔÁÎÏ×ÌÀ¤ Ò¦×ÅÎØ ÄÏÓÔÕÐÕ ÄÏ ËÏÍÁÎÄ."
-#: server/commands.c:275
+#: server/commands.c:304
#, fuzzy
msgid ""
"The command access level controls which server commands are available\n"
"to users via the client chatline. The available levels are:\n"
" none - no commands\n"
-" info - informational commands only\n"
+" info - informational or observer commands only\n"
+" basic - commands available to players in the game\n"
" ctrl - commands that affect the game and users\n"
+" admin - commands that affect server operation\n"
" hack - *all* commands - dangerous!\n"
"With no arguments, the current command access levels are reported.\n"
"With a single argument, the level is set for all existing connections,\n"
@@ -2660,20 +2669,20 @@ msgstr ""
"ÈÔÏÓØ ¦ÎÛ¦Ê ÍÏÖÅ ÐÅÒÅÚ'¤ÄÎÁÔÉÓÑ Ú ÃÉÍ ÓÁÍÉÍ ¦Í'ÑÍ. ðÒÉͦÔËÁ: ÃÑ ËÏÍÁÎÄÁ "
"ÔÅÐÅÒ ÂÅÒÅ ¦Í'Ñ Ú'¤ÄÎÁÎÎÑ, Á ÎÅ ÇÒÁ×ÃÑ, ÑË ÁÒÇÕÍÅÎÔ."
-#: server/commands.c:296
+#: server/commands.c:328
msgid "If there is none, become the game organizer with increased permissions."
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:301
+#: server/commands.c:334
msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
msgstr "timeoutincrease <ÈÏÄÉ> <ȦÄ_ÐÒÉÒ¦ÓÔ> <ÚÎÁÞÅÎÎÑ> <ÚÎÁÞÅÎÎÑ_ÒÁÚÉ>"
-#: server/commands.c:302
+#: server/commands.c:335
msgid "See \"help timeoutincrease\"."
msgstr "äÉ×ÉÓØ 'help timeoutincrease'."
-#: server/commands.c:303
+#: server/commands.c:336
msgid ""
"Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
"<turn> and multiply <value> by <valuemult>. Use this command in concert "
@@ -2684,42 +2693,61 @@ msgstr ""
"÷ÉËÏÒÉÓÔÏ×ÕÊÔÅ ÃÀ ËÏÍÁÎÄÕ ÒÁÚÏÍ Ú ÏÐæ¤À 'timeout'. ðÏ ÚÁÍÏ×ÞÕ×ÁÎÎÀ 0 0 0 1"
#. TRANS: translate text between <> only
-#: server/commands.c:309
+#: server/commands.c:343
+msgid ""
+"cancelvote\n"
+"cancelvote <vote number>\n"
+"cancelvote all\n"
+msgstr ""
+
+#: server/commands.c:346
+msgid "Cancel a running vote.\n"
+msgstr ""
+
+#: server/commands.c:347
+msgid ""
+"With no arguments this command removes your own vote. If you have an admin "
+"access level, you can cancel any vote by vote number, or all votes with the "
+"'all' argument."
+msgstr ""
+
+#. TRANS: translate text between <> only
+#: server/commands.c:354
#, fuzzy
msgid "endgame"
msgstr "ðÅÒÅÊÍÅÎÕ×ÁÔÉ"
-#: server/commands.c:310
+#: server/commands.c:355
#, fuzzy
msgid "End the game immediately in a draw."
msgstr "ãÑ ËÏÍÁÎÄÁ ÎÅÇÁÊÎÏ ÐÒÉÐÉÎѤ ÇÒÕ."
#. TRANS: translate text between <> only
-#: server/commands.c:314
+#: server/commands.c:360
msgid "surrender"
msgstr ""
-#: server/commands.c:315
+#: server/commands.c:361
#, fuzzy
msgid "Concede the game."
msgstr "úÁ×ÅÒÛÉÔÉ ÇÒÕ."
-#: server/commands.c:316
+#: server/commands.c:362
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:322
+#: server/commands.c:369
msgid "remove <player-name>"
msgstr "remove <¦Í'Ñ-ÇÒÁ×ÃÑ>"
-#: server/commands.c:323
+#: server/commands.c:370
msgid "Fully remove player from game."
msgstr "ðÏ×ΦÓÔÀ ×ÉÄÁÌѤ ÇÒÁ×ÃÑ Ú ÇÒÉ."
-#: server/commands.c:324
+#: server/commands.c:371
msgid ""
"This *completely* removes a player from the game, including all cities and "
"units etc. Use with care!"
@@ -2728,7 +2756,7 @@ msgstr ""
"ЦÄÒÏÚĦÌÉ. úÁÓÔÏÓÏ×ÕÊÔÅ ÏÂÅÒÅÖÎÏ!"
#. TRANS: translate text between <> only
-#: server/commands.c:329
+#: server/commands.c:377
msgid ""
"save\n"
"save <file-name>"
@@ -2736,11 +2764,11 @@ msgstr ""
"save\n"
"save <ÆÁÊÌ>"
-#: server/commands.c:331
+#: server/commands.c:379
msgid "Save game to file."
msgstr "úÂÅÒÅÇÔÉ ÇÒÕ Õ ÆÁÊÌ."
-#: server/commands.c:332
+#: server/commands.c:380
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"
@@ -2757,7 +2785,7 @@ msgstr ""
"ÐÏÔ¦Í ×ÉËÏÎÁÊÔÅ ËÏÍÁÎÄÕ 'start' ÑË Ô¦ÌØ˦ ÕÓ¦ ÇÒÁ×æ ЦÄ'¤ÄÎÁÀÔØÓÑ."
#. TRANS: translate text between <> only
-#: server/commands.c:341
+#: server/commands.c:390
msgid ""
"load\n"
"load <file-name>"
@@ -2765,11 +2793,11 @@ msgstr ""
"load\n"
"load <ÆÁÊÌ>"
-#: server/commands.c:343
+#: server/commands.c:392
msgid "Load game from file."
msgstr "úÁ×ÁÎÔÁÖÕ¤ ÇÒÕ Ú ÆÁÊÌÕ."
-#: server/commands.c:344
+#: server/commands.c:393
msgid ""
"Load a game from <file-name>. Any current data including players, rulesets "
"and server options are lost.\n"
@@ -2778,120 +2806,120 @@ msgstr ""
"ÐÒÁ×ÉÌ ÔÁ ÏÐæ§ ÓÅÒ×ÅÒÁ ×ÔÒÁÞÁÀÔØÓÑ..\n"
#. TRANS: translate text between <> only
-#: server/commands.c:349
+#: server/commands.c:399
msgid "read <file-name>"
msgstr "read <ÆÁÊÌ>"
-#: server/commands.c:350
+#: server/commands.c:400
msgid "Process server commands from file."
msgstr "úÁ×ÁÎÔÁÖÉÔÉ ËÏÍÁÎÄÉ ÓÅÒ×ÅÒÁ Ú ÆÁÊÌÕ."
#. TRANS: translate text between <> only
-#: server/commands.c:354
+#: server/commands.c:405
msgid "write <file-name>"
msgstr "write <ÆÁÊÌ>"
-#: server/commands.c:355
+#: server/commands.c:406
msgid "Write current settings as server commands to file."
msgstr "úÁÐÉÓÁÔÉ ÐÏÔÏÞΦ ÕÓÔÁÎÏ×ËÉ ÑË ËÏÍÁÎÄÉ ÓÅÒ×ÅÒÁ Õ ÆÁÊÌ."
-#: server/commands.c:359
+#: server/commands.c:411
msgid "Switch server output between 'RFC-style' and normal style."
msgstr "ðÅÒÅÍÉËÁ¤ ×É×¦Ä ÓÅÒ×ÅÒÁ Í¦Ö 'RFC-ÓÔÉÌÅÍ' ÔÁ ÎÏÒÍÁÌØÎÉÍ ÓÔÉÌÅÍ."
-#: server/commands.c:363
+#: server/commands.c:416
msgid "Simply returns the id of the server."
msgstr ""
-#: server/connecthand.c:85
+#: server/connecthand.c:109
#, c-format
msgid "Welcome to the %s Server running at %s port %d."
msgstr "òÁÄÉ ÂÁÞÉÔÉ ÎÁ ÓÅÒ×ÅÒ¦ %s, ÝÏ ÚÁÐÕÝÅÎÉÊ ÎÁ %s ÐÏÒÔ %d."
-#: server/connecthand.c:89
+#: server/connecthand.c:113
#, c-format
msgid "Welcome to the %s Server at port %d."
msgstr "òÁÄÉ ÂÁÞÉÔÉ ÎÁ ÓÅÒ×ÅÒ¦ %s, ÝÏ ÚÁÐÕÝÅÎÉÊ ÎÁ ÐÏÒÔÕ %d."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:97
+#: server/connecthand.c:121
#, fuzzy, c-format
msgid "(%d) %s: connected [%s]"
msgstr "(%d) %s ÐÒɤÄÎÁ×ÓÑ Ú %s."
-#: server/connecthand.c:104
+#: server/connecthand.c:128
#, c-format
msgid "Server: %s has connected from %s."
msgstr "%s ÐÒɤÄÎÁ×ÓÑ Ú %s."
-#: server/connecthand.c:145
+#: server/connecthand.c:175
msgid "Couldn't attach your connection to new player."
msgstr "îÅÍÏÖÕ ÄÏÄÁÔÉ ÷ÁÛÅ Ú'¤ÄÎÁÎÎÑ ÄÏ ÎÏ×ÏÇÏ ÇÒÁ×ÃÑ."
-#: server/connecthand.c:165
+#: server/connecthand.c:199
#, fuzzy, c-format
msgid "You are logged in as '%s' connected to no player."
msgstr "îÅÍÏÖÕ ÄÏÄÁÔÉ ÷ÁÛÅ Ú'¤ÄÎÁÎÎÑ ÄÏ ÎÏ×ÏÇÏ ÇÒÁ×ÃÑ."
-#: server/connecthand.c:169
+#: server/connecthand.c:203
#, c-format
msgid "You are logged in as '%s' connected to an anonymous player."
msgstr ""
-#: server/connecthand.c:174
+#: server/connecthand.c:208
#, c-format
msgid "You are logged in as '%s' connected to %s."
msgstr ""
-#: server/connecthand.c:187
+#: server/connecthand.c:221
#, c-format
msgid "Turn-blocking game play: waiting on %s to finish turn..."
msgstr "çÒÕ ÚÁÂÌÏËÏ×ÁÎÏ ÈÏÄÏÍ: ÏÞÉËÕ¤ÍÏ ËÏÌÉ %s ÚÁ˦ÎÞÉÔØ È¦Ä..."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:240
+#: server/connecthand.c:274
#, fuzzy, c-format
msgid "(%d) %s: connection request [%s]"
msgstr "(%d) úÁÐÉÔ ÎÁ Ú'¤ÄÎÁÎÎÑ ×¦Ä %s Ú %s"
-#: server/connecthand.c:266
+#: server/connecthand.c:300
#, fuzzy
msgid "The client is missing a capability that this server needs."
msgstr "ë̦¤ÎÔ ÎÅ ÓÕͦÓÎÉÊ Ú ÓÅÒ×ÅÒÏÍ."
-#: server/connecthand.c:268 server/connecthand.c:279
+#: server/connecthand.c:302 server/connecthand.c:313
#, fuzzy, c-format
msgid "(%d) %s rejected: mismatched capabilities!"
msgstr "(%d) ÷¦ÄËÉÎÕÔÏ %s: ÎÅÓЦ×ÐÁÄÁÀÔØ ÍÏÖÌÉ×ÏÓÔ¦."
-#: server/connecthand.c:277
+#: server/connecthand.c:311
#, fuzzy
msgid "This server is missing a capability that the client needs."
msgstr "óÅÒ×ÅÒ ÎÅ ¤ ÓÕͦÓÎÉÊ Ú Ë̦¤ÎÔÏÍ."
-#: server/connecthand.c:290
+#: server/connecthand.c:324
#, fuzzy
msgid "The username is invalid!"
msgstr "îÅצÒÎÅ ¦Í'Ñ"
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:292
+#: server/connecthand.c:326
#, fuzzy, c-format
msgid "(%d) %s rejected: invalid username [%s]"
msgstr "(%d) ÷¦ÄËÉÎÕÔÏ %s: ÎÅÓЦ×ÐÁÄÁÀÔØ ÍÏÖÌÉ×ÏÓÔ¦. [%s]"
-#: server/connecthand.c:303
+#: server/connecthand.c:337
#, fuzzy
msgid "Your username is already connected!"
msgstr "×ÖÅ ÎÁ Ú'¤ÄÎÁÎΦ."
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:305
+#: server/connecthand.c:339
#, fuzzy, c-format
msgid "(%d) %s rejected: duplicate username [%s]"
msgstr "(%d) ÷¦ÄËÉÎÕÔÏ %s: ÎÅÓЦ×ÐÁÄÁÀÔØ ÍÏÖÌÉ×ÏÓÔ¦. [%s]"
-#: server/connecthand.c:335 server/connecthand.c:344
+#: server/connecthand.c:369 server/connecthand.c:378
#, c-format
msgid "Lost connection: %s."
msgstr "÷ÔÒÁÞÅÎÏ Ú'¤ÄÎÁÎÎÑ: %s."
@@ -2908,36 +2936,36 @@ msgstr "
msgid "For introductory help, type 'help'."
msgstr "äÌÑ ÐÏÞÁÔËÏ×ϧ ÄÏÐÏÍÏÇÉ ××ÅĦÔØ 'help'."
-#: server/diplhand.c:164
+#: server/diplhand.c:167
#, fuzzy, c-format
msgid "The %s can't accept %s."
msgstr "%s ×É×ÞÉÌÉ %s."
-#: server/diplhand.c:176
+#: server/diplhand.c:179
#, c-format
msgid "You don't have tech %s, you can't accept treaty."
msgstr "÷É ÝŠΊצÄËÒÉÌÉ %s, ÔÏÖ ÎÅ ÍÏÖÅÔŠЦÄÐÉÓÁÔÉ ÕÇÏÄÕ."
-#: server/diplhand.c:185
+#: server/diplhand.c:188
msgid "City you are trying to give no longer exists, you can't accept treaty."
msgstr ""
"í¦ÓÔÏ ÑËÅ ÷É ÎÁÍÁÇÁ¤ÔÅÓØ ×¦ÄÄÁÔÉ ÎÅ ¦ÓÎÕ¤, ÔÏÖ ÷É ÎÅ ÍÏÖÅÔŠЦÄÐÉÓÁÔÉ ÕÇÏÄÕ."
-#: server/diplhand.c:191
+#: server/diplhand.c:194
#, c-format
msgid "You are not owner of %s, you can't accept treaty."
msgstr "÷É ÎÅ ×ÏÌÏÄÁÒ %s, ÔÏÖ ÎÅ ÍÏÖÅÔŠЦÄÐÉÓÁÔÉ ÕÇÏÄÕ."
-#: server/diplhand.c:197 server/diplhand.c:301
+#: server/diplhand.c:200 server/diplhand.c:304
#, c-format
msgid "Your capital (%s) is requested, you can't accept treaty."
msgstr "÷ÉÍÁÇÁÀÔØ ÷ÁÛÕ ÓÔÏÌÉÃÀ (%s), ÷É ÎÅ ÍÏÖÅÔŠЦÄÐÉÓÁÔÉ ÕÇÏÄÕ."
-#: server/diplhand.c:224
+#: server/diplhand.c:227
msgid "You don't have enough gold, you can't accept treaty."
msgstr "÷É ÎÅ ÍÁ¤ÔÅ ÄÏÓÔÁÔÎØÏ ÇÒÏÛÅÊ, ÔÏÖ ÎÅ ÍÏÖÅÔŠЦÄÐÉÓÁÔÉ ÕÇÏÄÕ."
-#: server/diplhand.c:256 server/diplhand.c:261
+#: server/diplhand.c:259 server/diplhand.c:264
#, c-format
msgid "A treaty containing %d clause was agreed upon."
msgid_plural "A treaty containing %d clauses was agreed upon."
@@ -2945,75 +2973,75 @@ msgstr[0] "
msgstr[1] "õÇÏÄÁ ͦÓÔÉÔØ %d ÐÕÎËÔÉ, ÝÏ ÂÕÌÏ ÕÚÇÏÄÖÅÎÏ."
msgstr[2] "õÇÏÄÁ ͦÓÔÉÔØ %d ÐÕÎËÔ¦×, ÝÏ ÂÕÌÏ ÕÚÇÏÄÖÅÎÏ."
-#: server/diplhand.c:277 server/diplhand.c:281
+#: server/diplhand.c:280 server/diplhand.c:284
#, fuzzy, c-format
msgid "One of the cities the %s are giving away is destroyed! Treaty canceled!"
msgstr "ïÄÎÅ Ú ÐÅÒÅÄÁÎÉÈ Í¦ÓÔ %s ÚÎÉÝÅÎÏ! õÇÏÄÁ ÎÅĦÊÓÎÁ!"
-#: server/diplhand.c:288 server/diplhand.c:293
+#: server/diplhand.c:291 server/diplhand.c:296
#, c-format
msgid "The %s no longer control %s! Treaty canceled!"
msgstr "%s ÎÅ ËÏÎÔÒÏÌÀ¤ %s! õÇÏÄÁ ÎÅĦÊÓÎÁ!"
-#: server/diplhand.c:331 server/diplhand.c:335
+#: server/diplhand.c:334 server/diplhand.c:338
#, c-format
msgid "The %s don't have the promised amount of gold! Treaty canceled!"
msgstr "%s ÎÅ ÍÁ¤ ÄÏÓÔÁÔÎØÏ ÇÒÏÛÅÊ! õÇÏÄÁ ÎÅĦÊÓÎÁ!"
-#: server/diplhand.c:364
+#: server/diplhand.c:367
#, fuzzy, c-format
msgid "You gave an embassy to %s."
msgstr "÷É ×¦ÄËÒÉÌÉ ÁÍÂÁÓÁÄÕ Õ %s."
-#: server/diplhand.c:367
+#: server/diplhand.c:370
#, c-format
msgid "%s allowed you to create an embassy!"
msgstr ""
-#: server/diplhand.c:383
+#: server/diplhand.c:386
#, c-format
msgid "You are taught the knowledge of %s."
msgstr "÷É ÏÔÒÉÍÁÌÉ ÚÎÁÎÎÑ ÐÒÏ %s."
-#: server/diplhand.c:387
+#: server/diplhand.c:390
#, c-format
msgid "The %s have acquired %s from the %s."
msgstr "%s ÚÄÏÂÕ× %s ×¦Ä %s."
-#: server/diplhand.c:402
+#: server/diplhand.c:405
#, c-format
msgid "You get %d gold."
msgstr "÷É ÏÔÒÉÍÁÌÉ %d ÇÒÉ×ÅÎØ."
#. TRANS: ... Polish worldmap.
-#: server/diplhand.c:410
+#: server/diplhand.c:413
#, fuzzy, c-format
msgid "You receive the %s worldmap."
msgstr "÷É ÏÔÒÉÍÁÌÉ ËÁÒÔÕ ÓצÔÕ ×¦Ä %s."
#. TRANS: ... Polish seamap.
-#: server/diplhand.c:419
+#: server/diplhand.c:422
#, fuzzy, c-format
msgid "You receive the %s seamap."
msgstr "÷É ÏÔÒÉÍÁÌÉ ËÁÒÔÕ ÏËÅÁÎÕ ×¦Ä %s."
-#: server/diplhand.c:436
+#: server/diplhand.c:439
#, c-format
msgid "You receive city of %s from %s."
msgstr "÷É ÏÔÒÉÍÁÌÉ Í¦ÓÔÏ %s ×¦Ä %s."
-#: server/diplhand.c:441
+#: server/diplhand.c:444
#, c-format
msgid "You give city of %s to %s."
msgstr "÷É ÐÅÒÅÄÁÌÉ Í¦ÓÔÏ %s ÄÏ %s."
-#: server/diplhand.c:454 server/diplhand.c:457
+#: server/diplhand.c:457 server/diplhand.c:460
#, c-format
msgid "You agree on a cease-fire with %s."
msgstr "÷É ÄÏÓÑÇÌÉ ÚÁÍÉÒÅÎÎÑ Ú %s."
#. TRANS: ... the Poles ... Polish territory.
-#: server/diplhand.c:476 server/diplhand.c:488
+#: server/diplhand.c:479 server/diplhand.c:491
#, c-format
msgid ""
"You agree on an armistice with the %s. In %d turn, it will become a peace "
@@ -3025,32 +3053,32 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: server/diplhand.c:512 server/diplhand.c:515
+#: server/diplhand.c:515 server/diplhand.c:518
#, c-format
msgid "You agree on an alliance with %s."
msgstr "÷É ÄÏÓÑÇÌÉ ÁÌØÑÎÓÕ Ú %s."
-#: server/diplhand.c:524
+#: server/diplhand.c:527
#, c-format
msgid "You give shared vision to %s."
msgstr "÷É ÐÅÒÅÄÁÌÉ ÓЦÌØÎÅ ÂÁÞÅÎÎÑ %s."
-#: server/diplhand.c:527
+#: server/diplhand.c:530
#, c-format
msgid "%s gives you shared vision."
msgstr "%s ÎÁÄÁ× ÷ÁÍ ÓЦÌØÎÅ ÂÁÞÅÎÎÑ."
-#: server/diplhand.c:663
+#: server/diplhand.c:666
#, c-format
msgid "%s canceled the meeting!"
msgstr "%s ÚÁ×ÅÒÛÉ× ÚÕÓÔÒ¦Þ!"
-#: server/diplhand.c:670
+#: server/diplhand.c:673
#, c-format
msgid "Meeting with %s canceled."
msgstr "úÕÓÔÒ¦Þ Ú %s ÚÁ×ÅÒÛÅÎÏ."
-#: server/diplhand.c:712
+#: server/diplhand.c:715
msgid "Your diplomatic envoy was decapitated!"
msgstr ""
@@ -3237,80 +3265,80 @@ msgid "The %s destroyed the %s in %s."
msgstr "%s ÚÎÉÝÉ× %s Õ %s."
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1091
+#: server/diplomats.c:1097
#, fuzzy, c-format
msgid "An enemy %s has been eliminated by your %s."
msgstr "÷ÁÛ Ð¦ÄÒÏÚÄ¦Ì %s ÚÁÇÉÎÕ× ÚÁÈÉÝÁÀÞÉ %s."
#. TRANS: <unit> ... <city> ... <diplomat>
-#: server/diplomats.c:1098
+#: server/diplomats.c:1104
#, fuzzy, c-format
msgid "Your %s has been eliminated defending %s against a %s."
msgstr "÷ÁÛ Ð¦ÄÒÏÚÄ¦Ì %s ÚÁÇÉÎÕ× ÚÁÈÉÝÁÀÞÉÓØ ÐÒÏÔÉ %s Õ %s."
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1106
+#: server/diplomats.c:1112
#, fuzzy, c-format
msgid "Your %s has been eliminated defending against a %s."
msgstr "÷ÁÛ Ð¦ÄÒÏÚÄ¦Ì %s ÚÁÇÉÎÕ× ÚÁÈÉÝÁÀÞÉÓØ ÐÒÏÔÉ Õ %s."
-#: server/diplomats.c:1119
+#: server/diplomats.c:1125
#, fuzzy, c-format
msgid "Your %s was eliminated by a defending %s."
msgstr "÷ÁÛ Ð¦ÄÒÏÚÄ¦Ì %s ÚÁÇÉÎÕ× ÚÁÈÉÝÁÀÞÉ %s Õ %s."
-#: server/diplomats.c:1127
+#: server/diplomats.c:1133
#, c-format
msgid "Eliminated %s %s while infiltrating %s."
msgstr "úÎÉÝÅÎÏ Ð¦ÄÒÏÚÄ¦Ì ÎÁÐÒÁ×ÌÅÎÉÊ %s - %s ÐÒÉ ÓÐÒϦ ÛÐÉÇÕ×ÁÎÎÑ Õ %s."
-#: server/diplomats.c:1134
+#: server/diplomats.c:1140
#, fuzzy, c-format
msgid "Eliminated %s %s while infiltrating our troops."
msgstr "úÎÉÝÅÎÏ Ð¦ÄÒÏÚÄ¦Ì ÎÁÐÒÁ×ÌÅÎÉÊ %s - %s ÐÒÉ ÓÐÒϦ ÛÐÉÇÕ×ÁÎÎÑ Õ %s."
-#: server/diplomats.c:1185
+#: server/diplomats.c:1191
#, fuzzy, c-format
msgid ""
"Your %s has successfully completed the mission and returned unharmed to %s."
msgstr "÷ÁÛ %s ×ÄÁÌÏ ×ÉËÏÎÁ× Ó×Ϥ ÚÁ×ÄÁÎÎÑ ÔÁ ÐÏ×ÅÒÎÕ×ÓÑ ÎÅÕÛËÏÄÖÅÎÉÍ Õ %s."
-#: server/diplomats.c:1204
+#: server/diplomats.c:1210
#, fuzzy, c-format
msgid "Your %s was captured after completing the mission in %s."
msgstr "÷ÁÛ %s ÂÕ× ÚÁÈÏÐÌÅÎÉÊ Ð¦ÓÌÑ ÔÏÇÏ ÑË ×ÄÁÌÏ ×ÉËÏÎÁ× Ó×Ϥ ÚÁ×ÄÁÎÎÑ Õ %s."
-#: server/diplomats.c:1210
+#: server/diplomats.c:1216
#, fuzzy, c-format
msgid "Your %s was captured after completing the mission."
msgstr "÷ÁÛ %s ÂÕ× ÚÁÈÏÐÌÅÎÉÊ Ð¦ÓÌÑ ÔÏÇÏ ÑË ×ÄÁÌÏ ×ÉËÏÎÁ× Ó×Ϥ ÚÁ×ÄÁÎÎÑ."
-#: server/diplomats.c:1242
+#: server/diplomats.c:1248
#, fuzzy, c-format
msgid "You have caused an incident while bribing the %s %s."
msgstr "÷É ÐÒÉÚ×ÅÌÉ ÄÏ ¦ÎÃÉÄÅÎÔÕ ÐÒÉ ËÕЦ×̦ %s %s."
-#: server/diplomats.c:1247
+#: server/diplomats.c:1253
#, c-format
msgid "%s has caused an incident while bribing your %s."
msgstr "%s ÐÒÉÚ×¦× ÄÏ ¦ÎÃÉÄÅÎÔÕ ÐÒÉ ËÕЦ×̦ ×ÁÛÏÇÏ %s."
-#: server/diplomats.c:1254
+#: server/diplomats.c:1260
#, fuzzy, c-format
msgid "You have caused an incident while attempting to steal tech from %s."
msgstr "÷É ÐÒÉÚ×ÅÌÉ ÄÏ ¦ÎÃÉÄÅÎÔÕ ÐÒÉ ËÒÁĦÖæ ÔÅÈÎÏÌÏǦ§ Ú %s."
-#: server/diplomats.c:1258
+#: server/diplomats.c:1264
#, fuzzy, c-format
msgid "%s has caused an incident while attempting to steal tech from you."
msgstr "%s ÐÒÉÚ×¦× ÄÏ ¦ÎÃÉÄÅÎÔÕ ÐÒÉ ËÒÁĦÖæ ÔÅÈÎÏÌÏǦ§ Õ ÷ÁÓ."
-#: server/diplomats.c:1264
+#: server/diplomats.c:1270
#, c-format
msgid "You have caused an incident while inciting a revolt in %s."
msgstr "÷É ÐÒÉÚ×ÅÌÉ ÄÏ ¦ÎÃÉÄÅÎÔÕ ÐÒÉ ×ÌÁÛÔÕ×ÁÎΦ ÚÁËÏÌÏÔÕ Õ %s."
-#: server/diplomats.c:1268
+#: server/diplomats.c:1274
#, c-format
msgid "%s have caused an incident while inciting a revolt in %s."
msgstr "%s ÐÒÉÚ×¦× ÄÏ ¦ÎÃÉÄÅÎÔÕ ÐÒÉ ×ÌÁÛÔÕ×ÁÎΦ ÚÁËÏÌÏÔÕ Õ %s."
@@ -3427,12 +3455,12 @@ msgstr ""
"ÂÕĦ×ÎÉÃÔ×Ï ÚÁ̦ÚÎÉÃØ.\n"
" ðÒÁæ×ÎÉËÉ Ú¦ÂÒÁÌÉÓÑ ÔÁ ÐÏÂÕÄÕ×ÁÌÉ × ÕÓ¦È Í¦ÓÔÁÈ ÚÁ̦ÚÎÉÃÀ."
-#: server/maphand.c:1418
+#: server/maphand.c:1425
#, fuzzy, c-format
msgid "Moved your %s due to changing terrain."
msgstr "ðÅÒÅͦÝÅÎÏ ÷ÁÛ %s Ú ÐÒÉÞÉÎÉ ÚͦÎÉ ÍÏÒÑ ÎÁ ÓÕÛÕ Õ (%d, %d)."
-#: server/maphand.c:1436
+#: server/maphand.c:1443
#, fuzzy, c-format
msgid "Disbanded your %s due to changing terrain."
msgstr "òÏÚÐÕÝÅÎÏ ÷ÁÛ %s Ú ÐÒÉÞÉÎÉ ÚͦÎÉ ÓÕÛ¦ ÎÁ ÍÏÒÅ Õ (%d, %d)."
@@ -3441,7 +3469,7 @@ msgstr "
msgid "Not reporting to the metaserver in this game."
msgstr "îÅ ÚצÔÕ¤ÍÏ ÍÅÔÁÓÅÒ×ÅÒÕ Õ Ã¦Ê ÇÒ¦."
-#: server/meta.c:430
+#: server/meta.c:432
#, c-format
msgid "Metaserver: bad address: [%s:%d]."
msgstr "íÅÔÁÓÅÒ×ÅÒ: ÐÏÇÁÎÁ ÁÄÒÅÓÁ: [%s:%d]."
@@ -3558,42 +3586,42 @@ msgid ""
"with %s."
msgstr ""
-#: server/plrhand.c:1103
+#: server/plrhand.c:1115
#, c-format
msgid "Removing player %s."
msgstr "÷ÉÄÁÌÑÀ ÇÒÁ×ÃÑ %s."
-#: server/plrhand.c:1105
+#: server/plrhand.c:1117
msgid "You've been removed from the game!"
msgstr "÷ÁÓ ×ÉÄÁÌÅÎÏ Ú ÇÒÉ!"
-#: server/plrhand.c:1108
+#: server/plrhand.c:1120
#, c-format
msgid "%s has been removed from the game."
msgstr "%s ×ÉÄÁÌÅÎÏ Ú ÇÒÉ."
-#: server/plrhand.c:1153 server/plrhand.c:1158
+#: server/plrhand.c:1167 server/plrhand.c:1172
#, c-format
msgid "You have made contact with the %s, ruled by %s."
msgstr "÷É ÚÕÓÔÒ¦ÌÉÓÑ Ú ÎÁæ¤À %s ÑËÏÀ ËÅÒÕ¤ %s."
-#: server/plrhand.c:1178
+#: server/plrhand.c:1192
#, c-format
msgid ""
"%s and %s meet and go to instant war. You cancel your alliance with both."
msgstr ""
-#: server/plrhand.c:1656
+#: server/plrhand.c:1670
#, c-format
msgid "Could not throw %s into civil war - too many players"
msgstr ""
-#: server/plrhand.c:1663
+#: server/plrhand.c:1677
#, c-format
msgid "Could not throw %s into civil war - no available nations"
msgstr ""
-#: server/plrhand.c:1686
+#: server/plrhand.c:1700
#, fuzzy, c-format
msgid ""
"Your nation is thrust into civil war! %s is declared the leader of the rebel "
@@ -3602,12 +3630,12 @@ msgstr ""
"÷ÁÛÁ ÎÁÃ¦Ñ ×ÐÁÌÁ Õ ÇÒÏÍÁÄÑÎÓØËÕ ×¦ÊÎÕ, %s ÚÁÑ×É×, ÝÏ ×¦Î ¤ ̦ÄÅÒÏÍ ÂÕÎÔ¦×ÎÉÈ "
"ÏÂÌÁÓÔÅÊ."
-#: server/plrhand.c:1707
+#: server/plrhand.c:1721
#, c-format
msgid "%s declares allegiance to %s."
msgstr "%s ÐÒÏÇÏÌÏÓÉ× ×¦ÄĦΦÓÔØ %s."
-#: server/plrhand.c:1722
+#: server/plrhand.c:1736
#, fuzzy, c-format
msgid ""
"Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3800,68 +3828,68 @@ msgstr "(
msgid "Wonders of the World"
msgstr "äÉ×Á ÓצÔÕ"
-#: server/report.c:547
+#: server/report.c:552
msgid " sq. mi."
msgstr " Ë×. ËÍ."
-#: server/report.c:557
+#: server/report.c:562
msgid " M tons"
msgstr " í ÔÏÎ"
-#: server/report.c:562
+#: server/report.c:567
msgid " M goods"
msgstr " í ×ÉÒϦ×"
-#: server/report.c:567
+#: server/report.c:572
msgid " bulbs"
msgstr ""
-#: server/report.c:572
+#: server/report.c:577
msgid " month"
msgid_plural " months"
msgstr[0] "ͦÓÑÃØ"
msgstr[1] "ͦÓÑæ"
msgstr[2] "ͦÓÑæ×"
-#: server/report.c:577
+#: server/report.c:582
msgid " ton"
msgid_plural " tons"
msgstr[0] " ÔÏÎÁ"
msgstr[1] " ÔÏÎÉ"
msgstr[2] " ÔÏÎ"
-#: server/report.c:591
+#: server/report.c:596
msgid "st"
msgstr "Ê"
-#: server/report.c:593
+#: server/report.c:598
msgid "nd"
msgstr "Ê"
-#: server/report.c:595
+#: server/report.c:600
msgid "rd"
msgstr "Ê"
-#: server/report.c:597
+#: server/report.c:602
msgid "th"
msgstr "Ê"
-#: server/report.c:700
+#: server/report.c:705
msgid "Demography string contains invalid characters. Try \"help demography\"."
msgstr ""
"äÅÍÏÇÒÁƦÞÎÁ ÓÔÒÏËÁ ͦÓÔÉÔØ ÎÅצÒΦ ÓÉÍ×ÏÌÉ. óÐÒÏÂÕÊÔÅ \"help demography\"."
-#: server/report.c:743 server/report.c:768
+#: server/report.c:748 server/report.c:773
msgid "Demographics Report:"
msgstr "äÅÍÏÇÒÁƦÞÎÉÊ ÚצÔ:"
-#: server/report.c:744
+#: server/report.c:749
msgid "Sorry, the Demographics report is unavailable."
msgstr "÷ÉÂÁÞÔÅ, ÁÌÅ ÄÅÍÏÇÒÁƦÞÎÉÊ Ú×¦Ô ÎÅÄÏÓÔÕÐÎÉÊ."
#. TRANS: <nation adjective> <government name> (<year>).
#. * E.g. "Polish Despotism (200 AD)".
-#: server/report.c:750
+#: server/report.c:755
#, fuzzy, c-format
msgid "%s %s (%s)"
msgstr "%s Õ %s (%s)\n"
@@ -3872,11 +3900,11 @@ msgstr "%s
msgid "Could not find a readable \"%s.%s\" ruleset file."
msgstr "îÅ ÍÏÖÕ ÚÎÁÊÔÉ ÄÏÓÔÕÐÎÉÊ ÆÁÊÌ \"%s\" Ú ÐÒÁ×ÉÌÁÍÉ."
-#: server/ruleset.c:2356
+#: server/ruleset.c:2366
msgid "No barbarian nation in rulesets, at least one required!"
msgstr ""
-#: server/ruleset.c:3166
+#: server/ruleset.c:3178
msgid "Loading rulesets"
msgstr "úÁ×ÁÎÔÁÖÕÀ ÐÒÁ×ÉÌÁ"
@@ -3891,13 +3919,13 @@ msgstr ""
"úÂÅÒÅÖÅÎÁ ÇÒÁ ͦÓÔÉÔØ ÎÅÐÏ×Φ ÄÁΦ ÍÁÐÉ. ãÅ ÍÏÖÅ ×ËÁÚÕ×ÁÔÉ ÎÁ ÇÒÕ ÓÔÁÒϧ "
"×ÅÒÓ¦§ ÁÂÏ ÐÏÇÁÎÏ ÚÂÅÒÅÖÅÎÕ ÇÒÕ. ðÒÏÄÏ×ÖÕ¤ÍÏ ÎÁ ÷ÁÛ ÓÔÒÁÈ ÔÁ ÒÉÚÉË."
-#: server/savegame.c:3588
+#: server/savegame.c:3587
#, fuzzy
msgid "Saved game is too old, at least version 1.9.0 required."
msgstr "úÂÅÒÅÖÅÎÁ ÇÒÁ ÓÔÁÒÁ, ͦΦÍÁÌØÎÏ ÐÏÔÒ¦ÂÎÁ ×ÅÒÓ¦Ñ 1.9.0."
#. TRANS: Fatal error message.
-#: server/savegame.c:3815
+#: server/savegame.c:3817
#, fuzzy
msgid ""
"Saved game uses the \"classic\" terrain ruleset, and is no longer supported."
@@ -3905,7 +3933,7 @@ msgstr ""
"úÂÅÒÅÖÅÎÁ ÇÒÁ ×ÉËÏÒÉÓÔÏ×Õ¤ ÐÒÁ×ÉÌÁ ËÌÁÓÉÞÎÉÈ ÔÅÒ¦ÔÏÒ¦Ê, Ñ˦ ×ÖÅ ÎÅ "
"ЦÄÔÒÉÍÕÀ¤ÔØÓÑ."
-#: server/savegame.c:3824
+#: server/savegame.c:3826
#, c-format
msgid ""
"Warning: Different rulesetdirs ('%s' and '%s') are no longer supported. "
@@ -3915,7 +3943,7 @@ msgstr ""
"÷ÉËÏÒÉÓÔÏ×ÕÀ '%s'."
#. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4051
+#: server/savegame.c:4055
#, c-format
msgid "%s had invalid nation; changing to %s."
msgstr ""
@@ -3952,7 +3980,7 @@ msgstr "
msgid "Networking"
msgstr ""
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:734
#: client/gui-win32/dialogs.c:532
msgid "All"
msgstr "÷Ó¦"
@@ -5086,11 +5114,11 @@ msgstr ""
"ñËÝÏ 1, ÓÔÁÔÉÓÔÉËÁ ÇÒÁ×ÃÑ ÄÏÄÁ¤ÔØÓÑ ÄÏ ÆÁÊÌÕ 'civscore.log' ËÏÖÎÏÇÏ ÈÏÄÕ. ãÑ "
"ÓÔÁÔÉÓÔÉËÁ ÍÏÖÅ ÂÕÔÉ ×ÉËÏÒÉÓÔÁÎÁ ÄÌÑ ÓÔ×ÏÒÅÎÎÑ ÇÒÁÆ¦Ë¦× Ð¦ÓÌÑ ÇÒÉ."
-#: server/sernet.c:150
+#: server/sernet.c:151
msgid "Server cannot read standard input. Ignoring input."
msgstr "óÅÒ×ÅÒ ÎÅ ÍÏÖÅ ÐÒÏÞÉÔÁÔÉ ÓÔÁÎÄÁÒÔÎÉÊ ×צÄ. ¶ÇÎÏÒÕÀ ÊÏÇÏ."
-#: server/sernet.c:929
+#: server/sernet.c:933
#, fuzzy, c-format
msgid "Server: bad address: [%s:%d]."
msgstr "íÅÔÁÓÅÒ×ÅÒ: ÐÏÇÁÎÁ ÁÄÒÅÓÁ: [%s:%d]."
@@ -5169,392 +5197,382 @@ msgstr "
msgid "Without guidance from the capital, the %s spaceship is lost!"
msgstr "âÅÚ ËÅÒÕ×ÁÎÎÑ Ú¦ ÓÔÏÌÉæ, ËÏÓͦÞÎÉÊ ËÏÒÁÂÅÌØ %s ÚÁÇÕÂÌÅÎÏ!"
-#: server/srv_main.c:240
+#: server/srv_main.c:242
msgid "Game ended in a draw as end year exceeded"
msgstr "çÒÕ ÚÁ˦ÎÞÅÎÎÏ ÐÏ ÄÏÓÑÇÎÅÎΦ ˦ÎÃÅ×ÏÇÏ ÒÏËÕ"
-#: server/srv_main.c:274
+#: server/srv_main.c:276
#, c-format
msgid "The %s spaceship has arrived at Alpha Centauri."
msgstr "ëÏÓͦÞÎÉÊ ËÏÒÁÂÅÌØ %s ÄÏÓÑÇ áÌØÆÁ ãÅÎÔÁ×ÒÁ."
-#: server/srv_main.c:287 server/srv_main.c:322
+#: server/srv_main.c:289 server/srv_main.c:324
#, c-format
msgid "Team victory to %s"
msgstr "ëÏÍÁÎÄÎÁ ÐÅÒÅÍÏÇÁ %s"
-#: server/srv_main.c:297 server/srv_main.c:338
+#: server/srv_main.c:299 server/srv_main.c:340
#, c-format
msgid "Game ended in victory for %s"
msgstr "çÒÕ ÚÁ˦ÎÞÅÎÏ ÐÅÒÅÍÏÇÏÀ %s"
-#: server/srv_main.c:345
+#: server/srv_main.c:347
msgid "Game ended in a draw"
msgstr "çÒÕ ÚÁ˦ÎÞÅÎÏ"
-#: server/srv_main.c:461 server/srv_main.c:472
+#: server/srv_main.c:465 server/srv_main.c:476
#, c-format
msgid "Your %s was disbanded in accordance with your peace treaty with the %s."
msgstr ""
-#: server/srv_main.c:512 server/srv_main.c:516
+#: server/srv_main.c:516 server/srv_main.c:520
#, c-format
msgid ""
"Concerned citizens point out that the cease-fire with %s will run out soon."
msgstr ""
"óÈ×ÉÌØÏ×ÁΦ ÇÒÏÍÁÄÑÎÉ ÎÁÇÁÄÕÀÔØ ÝÏ ÚÁÍÉÒÅÎÎÑ Ú %s ÎÅÚÁÂÁÒÏÍ ÚÁ×ÅÒÛÕ¤ÔØÓÑ."
-#: server/srv_main.c:521 server/srv_main.c:525
+#: server/srv_main.c:525 server/srv_main.c:529
#, fuzzy, c-format
msgid "The cease-fire with %s has run out. You are now at war with the %s."
msgstr "úÁÍÉÒÅÎÎÑ Ú %s ÚÁ×ÅÒÛÅÎÏ. ôÅÐÅÒ ÷É ÎÅÊÔÒÁÌØΦ Ú %s."
-#: server/srv_main.c:542
+#: server/srv_main.c:546
#, fuzzy, c-format
msgid ""
"Ceasefire between %s and %s has run out. They are at war. You cancel your "
"alliance with both."
msgstr "úÁÍÉÒÅÎÎÑ Ú %s ÚÁ×ÅÒÛÅÎÏ. ôÅÐÅÒ ÷É ÎÅÊÔÒÁÌØΦ Ú %s."
-#: server/srv_main.c:961
+#: server/srv_main.c:997
#, c-format
msgid "Failed saving game as %s"
msgstr "ðÏÍÉÌËÁ ÚÂÅÒÅÖÅÎÎÑ ÇÒÉ Õ %s"
-#: server/srv_main.c:963
+#: server/srv_main.c:999
#, c-format
msgid "Game saved as %s"
msgstr "çÒÕ ÚÂÅÒÅÖÅÎÏ Õ %s"
-#: server/srv_main.c:994
+#: server/srv_main.c:1030
msgid "The game is already running."
msgstr "çÒÁ ×ÖÅ ÚÁÐÕÝÅÎÁ."
-#: server/srv_main.c:1002
+#: server/srv_main.c:1038
#, c-format
msgid "%s lost control cmdlevel on game start. Use voting from now on."
msgstr ""
-#: server/srv_main.c:1009
+#: server/srv_main.c:1045
msgid "Starting game."
msgstr "óÔÁÒÔÕÀ ÇÒÕ."
-#: server/srv_main.c:1071
+#: server/srv_main.c:1112
#, c-format
msgid "request for unknown report (type %d)"
msgstr "ÚÁÐÉÔ ÎÁ ÎÅצÄÏÍÉÊ Ú×¦Ô (ÔÉÐ %d)"
-#: server/srv_main.c:1136
+#: server/srv_main.c:1177
#, fuzzy, c-format
msgid "Warning: rejecting old client %s"
msgstr "õ×ÁÇÁ: õ %s ÏÞÉËÕÀÔØ ÇÏÌÏÄÏÍÏÒ."
-#: server/srv_main.c:1238
+#: server/srv_main.c:1279
#, c-format
msgid "Got a packet of type %d from a dead or observer player"
msgstr "ïÔÒÉÍÁÎÏ ÐÁËÅÔ ÔÉÐÕ %d ×¦Ä ÍÅÒÔ×ÏÇÏ ÇÒÁ×ÃÑ ÁÂÏ ÎÁÇÌÑÄÁÞÁ"
-#: server/srv_main.c:1338
+#: server/srv_main.c:1381
msgid "Please choose a non-blank name."
msgstr "ïÂÅÒ¦ÔØ ÎÅ ÐÕÓÔÅ ¦Í'Ñ."
-#: server/srv_main.c:1354
+#: server/srv_main.c:1397
#, fuzzy
msgid "That nation is already in use."
msgstr "çÒÁ ×ÖÅ ÚÁÐÕÝÅÎÁ."
-#: server/srv_main.c:1370
+#: server/srv_main.c:1413
#, c-format
msgid "Another player already has the name '%s'. Please choose another name."
msgstr "¶ÎÛ¦Ê ÇÒÁ×ÅÃØ ×ÖÅ ÏÂÒÁ× ¦Í'Ñ '%s'. ïÂÅÒ¦ÔØ ¦ÎÛÅ."
-#: server/srv_main.c:1391
+#: server/srv_main.c:1434
#, fuzzy
msgid "Please choose a name containing only ASCII characters."
msgstr "ïÂÅÒ¦ÔØ ÎÅ ÐÕÓÔÅ ¦Í'Ñ."
-#: server/srv_main.c:1490
+#: server/srv_main.c:1533
#, c-format
msgid "%s nation is not available in this scenario."
msgstr ""
-#: server/srv_main.c:1496
+#: server/srv_main.c:1539
#, fuzzy, c-format
msgid "%s nation is already in use."
msgstr "çÒÁ ×ÖÅ ÚÁÐÕÝÅÎÁ."
-#: server/srv_main.c:1514
+#: server/srv_main.c:1557
#, c-format
msgid "%s is the %s ruler %s."
msgstr "%s ¤ ̦ÄÅÒÏÍ ÎÁæ§ %s - %s."
-#: server/srv_main.c:1570
+#: server/srv_main.c:1613
#, fuzzy, c-format
msgid "Waiting to start game: %d out of %d players are ready to start."
msgstr "îÅ ÍÏÖÕ ÓÔÁÒÔÕ×ÁÔÉ ÇÒÕ: §§ ×ÖÅ ÚÁÐÕÝÅÎÏ."
-#: server/srv_main.c:1614 server/srv_main.c:1618
+#: server/srv_main.c:1657 server/srv_main.c:1661
#, fuzzy, c-format
msgid "%s has been added as %s level AI-controlled player."
msgstr "%s ÄÏÄÁÎÏ ÑË ËÏÍÐ'ÀÔÅÒÎÏÇÏ ÇÒÁ×ÃÑ."
-#: server/srv_main.c:1760
+#: server/srv_main.c:1803
#, c-format
msgid "Player %d"
msgstr "çÒÁ×ÅÃØ %d"
-#: server/srv_main.c:1771 server/srv_main.c:1777
+#: server/srv_main.c:1814 server/srv_main.c:1820
#, c-format
msgid "%s rules the %s."
msgstr "%s ÇÏÌÏ×Õ¤ ÎÁÄ %s."
-#: server/srv_main.c:1942
+#: server/srv_main.c:1985
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
msgstr ""
-#: server/srv_main.c:1993
+#: server/srv_main.c:2037
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr "÷¦ÄÐÒÁ×ÌÑÀ ¦ÎÆÏ ÎÁ ÍÅÔÁÓÅÒ×ÅÒ [%s]"
-#: server/srv_main.c:2024
+#: server/srv_main.c:2069
msgid "The game is over..."
msgstr "çÒÕ ÚÁ˦ÎÞÅÎÏ..."
-#: server/srv_main.c:2237
+#: server/srv_main.c:2286
msgid "Now accepting new client connections."
msgstr "ôÅÐÅÒ ÐÒÉÊÍÁ¤ÍÏ ÎÏצ Ú'¤ÄÎÁÎÎÑ."
-#: server/stdinhand.c:246
-#, c-format
-msgid "Vote \"%s\" is passed %d to %d with %d abstentions."
-msgstr ""
-
-#: server/stdinhand.c:253
-#, c-format
-msgid "Vote \"%s\" failed with %d against, %d for and %d abstentions."
-msgstr ""
-
#. TRANS: ambiguous command
-#: server/stdinhand.c:365
+#: server/stdinhand.c:284
msgid "(ambiguous)"
msgstr "(Ä×ÏÚÎÁÞÎÉÊ)"
#. TRANS: unrecognized command
#. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:416
+#: server/stdinhand.c:287 client/citydlg_common.c:419
#: 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 "(ÎÅצÄÏÍÉÊ)"
-#: server/stdinhand.c:458
+#: server/stdinhand.c:377
msgid "Name is empty, so cannot be a player."
msgstr "¶Í'Ñ ÐÕÓÔÅ - ÔÏÖ ÎÅ ÍÏÖÅ ÂÕÔÉ ÇÒÁ×ÃÅÍ."
-#: server/stdinhand.c:462
+#: server/stdinhand.c:381
msgid "Name is too long, so cannot be a player."
msgstr "¶Í'Ñ ÚÁÄÏ×ÇÅ - ÔÏÖ ÎÅ ÍÏÖÅ ÂÕÔÉ ÇÒÁ×ÃÅÍ."
-#: server/stdinhand.c:466
+#: server/stdinhand.c:385
#, c-format
msgid "Player name prefix '%s' is ambiguous."
msgstr "ðÒÅƦËÓ ¦ÍÅΦ ÇÒÁ×ÃÑ '%s' ÎÅÏÄÎÏÚÎÁÞÎÉÊ."
-#: server/stdinhand.c:470
+#: server/stdinhand.c:389
#, c-format
msgid "No player by the name of '%s'."
msgstr "îÅÍÁ ÇÒÁ×ÃÑ ÎÁ ¦Í'Ñ '%s'."
-#: server/stdinhand.c:474 server/stdinhand.c:509
+#: server/stdinhand.c:393 server/stdinhand.c:428
#, c-format
msgid "Unexpected match_result %d (%s) for '%s'."
msgstr "îÅÏÞÉËÕ×ÁÎÉÊ ÒÅÚÕÌØÔÁÔ ÓЦ×ÓÔÁ×ÌÅÎÎÑ %d (%s) ÄÌÑ '%s'."
-#: server/stdinhand.c:493
+#: server/stdinhand.c:412
msgid "Name is empty, so cannot be a connection."
msgstr "¶Í'Ñ ÐÕÓÔÅ - ÔÏÖ ÎÅ ÍÏÖÅ ÂÕÔÉ Ú'¤ÄÎÁÎÎÑÍ."
-#: server/stdinhand.c:497
+#: server/stdinhand.c:416
msgid "Name is too long, so cannot be a connection."
msgstr "¶Í'Ñ ÚÁÄÏ×ÇÅ - ÔÏÖ ÎÅ ÍÏÖÅ ÂÕÔÉ Ú'¤ÄÎÁÎÎÑÍ."
-#: server/stdinhand.c:501
+#: server/stdinhand.c:420
#, c-format
msgid "Connection name prefix '%s' is ambiguous."
msgstr "ðÒÅƦËÓ ¦ÍÅΦ Ú'¤ÄÎÁÎÎÑ '%s' Ä×ÏÚÎÁÞÎÉÊ."
-#: server/stdinhand.c:505
+#: server/stdinhand.c:424
#, c-format
msgid "No connection by the name of '%s'."
msgstr "îÅÍÁ¤ Ú'¤ÄÎÁÎÎÑ Ú ¦Í'ÑÍ '%s'."
-#: server/stdinhand.c:525
+#: server/stdinhand.c:444
#, c-format
msgid "Open metaserver connection to [%s]."
msgstr "÷¦ÄËÒÉ×Á¤ÍÏ Ú'¤ÄÎÁÎÎÑ ÍÅÔÁÓÅÒ×ÅÒÁ ÄÏ [%s]."
-#: server/stdinhand.c:538
+#: server/stdinhand.c:457
#, c-format
msgid "Close metaserver connection to [%s]."
msgstr "úÁËÒÉ×Á¤ÍÏ Ú'¤ÄÎÁÎÎÑ ÍÅÔÁÓÅÒ×ÅÒÁ ÄÏ [%s]."
-#: server/stdinhand.c:553
+#: server/stdinhand.c:472
msgid "Metaserver connection is open."
msgstr "ú'¤ÄÎÁÎÎÑ ÍÅÔÁÓÅÒ×ÅÒÁ צÄËÒÉÔÏ."
-#: server/stdinhand.c:556
+#: server/stdinhand.c:475
msgid "Metaserver connection is closed."
msgstr "ú'¤ÄÎÁÎÎÑ ÍÅÔÁÓÅÒ×ÅÒÁ ÚÁËÒÉÔÏ."
-#: server/stdinhand.c:566
+#: server/stdinhand.c:485
msgid "Metaserver connection is already open."
msgstr "ú'¤ÄÎÁÎÎÑ ÍÅÔÁÓÅÒ×ÅÒÁ ×ÖŠצÄËÒÉÔÏ."
-#: server/stdinhand.c:577
+#: server/stdinhand.c:496
msgid "Metaserver connection is already closed."
msgstr "ú'¤ÄÎÁÎÎÑ ÍÅÔÁÓÅÒ×ÅÒÁ ×ÖÅ ÚÁËÒÉÔÏ."
-#: server/stdinhand.c:582
+#: server/stdinhand.c:501
msgid "Argument must be 'u', 'up', 'd', 'down', or '?'."
msgstr "áÒÇÕÍÅÎÔ ÐÏ×ÉÎÅÎ ÂÕÔÉ 'u', 'up', 'd', 'down', ÁÂÏ '?'."
-#: server/stdinhand.c:603
+#: server/stdinhand.c:522
#, fuzzy, c-format
msgid "Metaserver patches string set to '%s'."
msgstr "¶ÎÆÏÒÍÁæÊÎÕ ÓÔÒÏËÕ ÍÅÔÁÓÅÒ×ÅÒÁ ×ÓÔÁÎÏ×ÌÅÎÏ Õ '%s'."
-#: server/stdinhand.c:606
+#: server/stdinhand.c:525
#, c-format
msgid "Metaserver patches string set to '%s', not reporting to metaserver."
msgstr ""
-#: server/stdinhand.c:627
+#: server/stdinhand.c:546
#, fuzzy, c-format
msgid "Metaserver message string set to '%s'."
msgstr "¶ÎÆÏÒÍÁæÊÎÕ ÓÔÒÏËÕ ÍÅÔÁÓÅÒ×ÅÒÁ ×ÓÔÁÎÏ×ÌÅÎÏ Õ '%s'."
-#: server/stdinhand.c:630
+#: server/stdinhand.c:549
#, c-format
msgid "Metaserver message string set to '%s', not reporting to metaserver."
msgstr ""
-#: server/stdinhand.c:650
+#: server/stdinhand.c:569
#, c-format
msgid "Metaserver is now [%s]."
msgstr "íÅÔÁÓÅÒ×ÅÒ ÔÅÐÅÒ [%s]."
-#: server/stdinhand.c:660
+#: server/stdinhand.c:579
#, fuzzy, c-format
msgid "Server id: %s"
msgstr "ïÐÅÒÁÔÏÒ ÓÅÒ×ÅÒÁ: %s"
-#: server/stdinhand.c:757
+#: server/stdinhand.c:676
#, fuzzy
msgid "You cannot save games manually on this server."
msgstr "÷ÉÊÔÉ Ú ÇÒÉ ÔÁ ×ÉÍËÎÕÔÉ ÓÅÒ×ÅÒ."
-#: server/stdinhand.c:774
+#: server/stdinhand.c:693
msgid "Cannot toggle a barbarian player."
msgstr "îÅ ÍÏÖÌÉ×Ï ÐÅÒÅÍÉËÎÕÔÉ ÇÒÁ×ÃÑ ÄÉËÕÎÁ."
-#: server/stdinhand.c:781
+#: server/stdinhand.c:700
#, c-format
msgid "%s is now under AI control."
msgstr "%s ÔÅÐÅÒ ËÏÎÔÒÏÌÀ¤ÔØÓÑ ËÏÍÐ'ÀÔÅÒÏÍ."
-#: server/stdinhand.c:802
+#: server/stdinhand.c:721
#, c-format
msgid "%s is now under human control."
msgstr "%s ÔÅÐÅÒ ËÏÎÔÒÏÌÀ¤ÔØÓÑ ÌÀÄÉÎÏÀ."
-#: server/stdinhand.c:847
+#: server/stdinhand.c:766
msgid "Can't add AI players once the game has begun."
msgstr "îÅ ÍÏÖÎÁ ÄÏÄÁÔÉ ËÏÍÐ'ÀÔÅÒÎÉÈ ÇÒÁ×Ã¦× Ð¦ÓÌÑ ÓÔÁÒÔÕ ÇÒÉ."
-#: server/stdinhand.c:867
+#: server/stdinhand.c:786
msgid "Can't add more players, server is full."
msgstr "îÅ ÍÏÖÎÁ ÄÏÄÁÔÉ ÎÏ×ÉÈ ÇÒÁ×Ã¦× - ÓÅÒ×ÅÒ ÚÁÐÏ×ÎÅÎÏ."
-#: server/stdinhand.c:874
+#: server/stdinhand.c:793
msgid "Can't use an empty name."
msgstr "îÅ ÍÏÖÎÏ ×ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ÐÕÓÔÅ ¦Í'Ñ."
-#: server/stdinhand.c:881
+#: server/stdinhand.c:800
#, c-format
msgid "That name exceeds the maximum of %d chars."
msgstr "¶Í'Ñ ÐÅÒÅ×ÉÝÉÌÏ ÍÁËÓÉÍÕÍ Õ %d ÓÉÍ×Ï̦×."
-#: server/stdinhand.c:887
+#: server/stdinhand.c:806
#, fuzzy
msgid "That name is not allowed."
msgstr "ñ˦ Ú'¤ÄÎÁÎÎÑ ÄÏÚ×ÏÌÅΦ."
-#: server/stdinhand.c:893
+#: server/stdinhand.c:812
msgid "A player already exists by that name."
msgstr "çÒÁ×ÅÃØ Ú ÔÁËÉÍ ¦Í'ÑÍ ×ÖÅ ¦ÓÎÕ¤."
-#: server/stdinhand.c:899
+#: server/stdinhand.c:818
msgid "A user already exists by that name."
msgstr "ëÏÒÉÓÔÕ×ÁÞ Ú ÔÁËÉÍ ¦Í'ÑÍ ×ÖÅ ¦ÓÎÕ¤."
-#: server/stdinhand.c:925
+#: server/stdinhand.c:844
#, c-format
msgid "%s has been added as an AI-controlled player."
msgstr "%s ÄÏÄÁÎÏ ÑË ËÏÍÐ'ÀÔÅÒÎÏÇÏ ÇÒÁ×ÃÑ."
-#: server/stdinhand.c:932
+#: server/stdinhand.c:851
#, c-format
msgid "Error creating new AI player: %s."
msgstr "ðÏÍÉÌËÁ ÓÔ×ÏÒÅÎÎÑ ÎÏ×ÏÇÏ ËÏÍÐ'ÀÔÅÒÎÏÇÏ ÇÒÁ×ÃÑ: %s."
-#: server/stdinhand.c:966
+#: server/stdinhand.c:885
msgid "Players cannot be removed once the game has started."
msgstr "çÒÁ×ÃÑ ÎÅ ÍÏÖÎÁ ×ÉÄÁÌÉÔÉ Ð¦ÓÌÑ ÓÔÁÒÔÕ ÇÒÉ."
-#: server/stdinhand.c:977
+#: server/stdinhand.c:896
#, c-format
msgid "Removed player %s from the game."
msgstr "÷ÉÄÁÌÅÎÏ ÇÒÁ×ÃÑ player %s Ú ÇÒÉ."
-#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
+#: server/stdinhand.c:935 server/stdinhand.c:3372 server/stdinhand.c:3507
#, c-format
msgid "Name \"%s\" disallowed for security reasons."
msgstr ""
-#: server/stdinhand.c:1029
+#: server/stdinhand.c:948
#, fuzzy, c-format
msgid "No command script found by the name \"%s\"."
msgstr "îÅÍÁ¤ Ú'¤ÄÎÁÎÎÑ Ú ¦Í'ÑÍ '%s'."
-#: server/stdinhand.c:1037
+#: server/stdinhand.c:956
#, c-format
msgid "Loading script file: %s"
msgstr "úÁ×ÁÎÔÁÖÕÀ ÆÁÊÌ ÓËÒÉÐÔÕ: %s"
-#: server/stdinhand.c:1052
+#: server/stdinhand.c:971
#, c-format
msgid "Cannot read command line scriptfile '%s'."
msgstr "îÅ ÍÏÖÕ ÐÒÏÞÉÔÁÔÉ ÆÁÊÌ ÓËÒÉÐÔÕ '%s'."
-#: server/stdinhand.c:1054
+#: server/stdinhand.c:973
#, c-format
msgid "Could not read script file '%s'."
msgstr "îÅ ÍÏÖÕ ÐÒÏÞÉÔÁÔÉ ÆÁÊÌ ÓËÒÉÐÔÕ '%s'."
-#: server/stdinhand.c:1146
+#: server/stdinhand.c:1065
#, c-format
msgid "Could not write script file '%s'."
msgstr "îÅ ÍÏÖÕ ÚÁÐÉÓÁÔÉ ÆÁÊÌ ÓËÒÉÐÔÕ '%s'."
-#: server/stdinhand.c:1158
+#: server/stdinhand.c:1077
msgid "You cannot use the write command on this server for security reasons."
msgstr ""
-#: server/stdinhand.c:1186
+#: server/stdinhand.c:1105
#, c-format
msgid ""
"Cannot decrease command access level '%s' for connection '%s'; you only have "
@@ -5563,7 +5581,12 @@ msgstr ""
"îÅ ÍÏÖÕ ÚÍÅÎÛÉÔÉ Ò¦×ÅÎØ ÄÏÓÔÕÐÕ ÄÏ ËÏÍÁÎÄ '%s' ÄÌÑ Ú'¤ÄÎÁÎÎÑ '%s'; ÷É ÍÁ¤ÔÅ "
"ÌÉÛÅ '%s'."
-#: server/stdinhand.c:1241
+#: server/stdinhand.c:1114
+#, c-format
+msgid "Command access level set to '%s' for connection %s."
+msgstr "ò¦×ÅÎØ ÄÏÓÔÕÐÕ ÄÏ ËÏÍÁÎÄ ×ÓÔÁÎÏ×ÌÅÎÏ Õ '%s' ÄÌÑ Ú'¤ÄÎÁÎÎÑ %s."
+
+#: server/stdinhand.c:1163
#, fuzzy, c-format
msgid ""
"Anyone can now become game organizer '%s' by issuing the 'first' command."
@@ -5571,447 +5594,505 @@ msgstr ""
"èÔÏ ÚÁ×ÇÏÄÎÏ ÍÏÖÅ ÚÁÒÁÚ ÏÔÒÉÍÁÔÉ Ò¦×ÅÎØ ÄÏÓÔÕÐÕ ÄÏ ËÏÍÁÎÄ '%s' ×ÉËÏÎÁ×ÛÉ "
"ËÏÍÁÎÄÕ 'firstlevel'."
-#: server/stdinhand.c:1274
+#: server/stdinhand.c:1187
msgid "Command access levels in effect:"
msgstr "ä¦ÊÓΦ Ò¦×Φ ÄÏÓÔÕÐÕ ÄÏ ËÏÍÁÎÄ:"
-#: server/stdinhand.c:1282
+#: server/stdinhand.c:1194
#, c-format
msgid "Command access level for new connections: %s"
msgstr "ò¦×ÅÎØ ÄÏÓÔÕÐÕ ÄÏ ËÏÍÁÎÄ ÄÌÑ ÎÏ×ÉÈ Ú'¤ÄÎÁÎØ: %s"
-#: server/stdinhand.c:1285
+#: server/stdinhand.c:1197
#, c-format
msgid "Command access level for first player to take it: %s"
msgstr "ò¦×ÅÎØ ÄÏÓÔÕÐÕ ÄÏ ËÏÍÁÎÄ ÄÌÑ ÐÅÒÛÏÇÏ ÇÒÁ×ÃÑ ÈÔÏ ÊÏÇÏ ×¦ÚØÍÅ: %s"
-#: server/stdinhand.c:1294
+#: server/stdinhand.c:1206
msgid ""
"Error: command access level must be one of 'none', 'info', 'ctrl', or 'hack'."
msgstr ""
"ðÏÍÉÌËÁ: Ò¦×ÅÎØ ÄÏÓÔÕÐÕ ÄÏ ËÏÍÁÎÄ ÍÏÖÅ ÂÕÔÉ ÏÄÉÎ Ú 'none', 'info', 'ctrl' "
"ÁÂÏ 'hack'."
-#: server/stdinhand.c:1299
+#: server/stdinhand.c:1211
#, c-format
msgid ""
"Cannot increase command access level to '%s'; you only have '%s' yourself."
msgstr ""
"îÅ ÍÏÖÕ Ú¦ÌØÛÉÔÉ Ò¦×ÅÎØ ÄÏÓÔÕÐÕ ÄÏ ËÏÍÁÎÄ ÎÁ '%s'; ÷É ÍÁ¤ÔÅ ÌÉÛÅ '%s'."
-#: 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: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:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
+#: server/stdinhand.c:1238 server/stdinhand.c:1252 server/stdinhand.c:1273
#, c-format
msgid "Command access level set to '%s' for new players."
msgstr "ò¦×ÅÎØ ÄÏÓÔÕÐÕ ÄÏ ËÏÍÁÎÄ ×ÓÔÁÎÏ×ÌÅÎÏ Õ '%s' ÄÌÑ ÎÏ×ÉÈ ÇÒÁ×æ×."
-#: server/stdinhand.c:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
+#: server/stdinhand.c:1243 server/stdinhand.c:1257 server/stdinhand.c:1267
#, c-format
msgid "Command access level set to '%s' for first player to grab it."
msgstr ""
"ò¦×ÅÎØ ÄÏÓÔÕÐÕ ÄÏ ËÏÍÁÎÄ ×ÓÔÁÎÏ×ÌÅÎÏ Õ '%s' ÄÌÑ ÐÅÒÛÏÇÏ ÈÔÏ ÚÁÂÅÒÅ ÊÏÇÏ."
-#: server/stdinhand.c:1402
+#: server/stdinhand.c:1302
#, fuzzy
msgid "The 'first' command makes no sense from the server command line."
msgstr "ëÏÍÁÎÄÁ 'firstlevel' ÎÅ ÍÁ¤ ÓÅÎÓÕ Ú ËÏÎÓÏ̦ ÓÅÒ×ÅÒÁ."
-#: server/stdinhand.c:1406
+#: server/stdinhand.c:1306
#, c-format
msgid "You already have command access level '%s' or better."
msgstr "÷É ×ÖÅ ÍÁ¤ÔÅ Ò¦×ÅÎØ ÄÏÓÔÕÐÕ ÄÏ ËÏÍÁÎÄ '%s' ÁÂÏ ËÒÁÝÅ."
-#: server/stdinhand.c:1411
+#: server/stdinhand.c:1311
#, fuzzy
msgid "Someone else already is game organizer."
msgstr "èÔÏÓØ ¦ÎÛ¦Ê ×ÖÅ ÍÁ¤ Ò¦×ÅÎØ ÄÏÓÔÕÐÕ ÄÏ ËÏÍÁÎÄ '%s' ÁÂÏ ËÒÁÝÅ."
-#: server/stdinhand.c:1416
+#: server/stdinhand.c:1316
#, c-format
msgid "Connection %s has opted to become the game organizer."
msgstr ""
-#: server/stdinhand.c:1467
+#: server/stdinhand.c:1367
#, c-format
msgid "Invalid argument %d."
msgstr "îÅצÒÎÉÊ ÁÒÇÕÍÅÎÔ %d."
-#: server/stdinhand.c:1474
+#: server/stdinhand.c:1374
msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
msgstr ""
"÷ÉËÏÒÉÓÔÁÎÎÑ: timeoutincrease <ÈÏÄÉ> <ȦÄ_ÐÒÉÒ¦ÓÔ> <ÚÎÁÞÅÎÎÑ> "
"<ÚÎÁÞÅÎÎÑ_ÒÁÚÉ>."
-#: server/stdinhand.c:1482
+#: server/stdinhand.c:1382
#, c-format
msgid "Dynamic timeout set to %d %d %d %d"
msgstr "ä¦ÎÁͦÞÎÉÊ ÔÁÊÍÁÕÔ ×ÓÔÁÎÏ×ÌÅÎÏ Õ %d %d %d %d"
-#: server/stdinhand.c:1542 server/stdinhand.c:1545
+#: server/stdinhand.c:1442 server/stdinhand.c:1445
msgid "Option:"
msgstr "ïÐæÑ:"
-#: server/stdinhand.c:1555 server/stdinhand.c:4031
+#: server/stdinhand.c:1455 server/stdinhand.c:4079
msgid "Description:"
msgstr "ïÐÉÓ:"
-#: server/stdinhand.c:1560
+#: server/stdinhand.c:1460
#, c-format
msgid "Status: %s"
msgstr "óÔÁÔÕÓ: %s"
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "changeable"
msgstr "ÚͦÎÀ×ÁÎÁ"
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "fixed"
msgstr "ƦËÓÏ×ÁÎÁ"
-#: server/stdinhand.c:1567
+#: server/stdinhand.c:1467
#, c-format
msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
msgstr "úÎÁÞÅÎÎÑ: %d, í¦Î¦ÍÕÍ: 0, úÁÍÏ×ÞÕ×ÁÎÎÑ: %d, íÁËÓÉÍÕÍ: 1"
-#: server/stdinhand.c:1572
+#: server/stdinhand.c:1472
#, c-format
msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
msgstr "úÎÁÞÅÎÎÑ: %d, í¦Î¦ÍÕÍ: %d, úÁÍÏ×ÞÕ×ÁÎÎÑ: %d, íÁËÓÉÍÕÍ: %d"
-#: server/stdinhand.c:1578
+#: server/stdinhand.c:1478
#, c-format
msgid "Value: \"%s\", Default: \"%s\""
msgstr "úÎÁÞÅÎÎÑ: '%s', úÁÍÏ×ÞÕ×ÁÎÎÑ: '%s'"
-#: server/stdinhand.c:1597
+#: server/stdinhand.c:1497
msgid "Explanations are available for the following server options:"
msgstr "òÏÚ'ÑÓÎÅÎÎÑ ÄÏÓÔÕÐΦ ÄÌÑ ÎÁÓÔÕÐÎÉÈ ÏÐÃ¦Ê ÓÅÒ×ÅÒÁ:"
-#: server/stdinhand.c:1643
+#: server/stdinhand.c:1537
msgid "No explanation for that yet."
msgstr "ðÏËÉÝÏ ÎÅÍÁ¤ ÐÏÑÓÎÅÎØ."
-#: server/stdinhand.c:1646 server/stdinhand.c:2480
+#: server/stdinhand.c:1540 server/stdinhand.c:2468
msgid "Ambiguous option name."
msgstr "îÅÏÄÎÏÚÎÁÞÎÅ ¦Í'Ñ ÏÐæ§."
-#: server/stdinhand.c:1666
+#: server/stdinhand.c:1560
#, c-format
msgid "Server Operator: %s"
msgstr "ïÐÅÒÁÔÏÒ ÓÅÒ×ÅÒÁ: %s"
-#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
+#: server/stdinhand.c:1686 server/stdinhand.c:1713 server/stdinhand.c:1731
#, c-format
msgid "Player '%s' now has AI skill level '%s'."
msgstr "çÒÁ×ÅÃØ '%s' ÔÅÐÅÒ ÍÁ¤ Ò¦×ÅÎØ ËÏÍÐ'ÀÔÅÒÎÏÇÏ ÇÒÁ×ÃÑ '%s'."
-#: server/stdinhand.c:1822
+#: server/stdinhand.c:1718
#, c-format
msgid "%s is not controlled by the AI."
msgstr "çÒÁ×ÅÃØ %s ÎÅ ËÏÎÔÒÏÌÀ¤ÔØÓÑ ËÏÍÐ'ÀÔÅÒÏÍ."
-#: server/stdinhand.c:1842
+#: server/stdinhand.c:1738
#, c-format
msgid "Default AI skill level set to '%s'."
msgstr "ò¦×ÅÎØ ËÏÍÐ'ÀÔÅÒÎÉÈ ÇÒÁ×Ã¦× ÐÏ ÚÁÍÏ×ÞÕ×ÁÎÎÀ ×ÓÔÁÎÏ×ÌÅÎÏ Õ '%s'."
-#: server/stdinhand.c:1857 server/stdinhand.c:2162
+#: server/stdinhand.c:1753
msgid "This command is client only."
msgstr "ãÅ ËÏÍÁÎÄÁ Ë̦¤ÎÔÁ."
-#: server/stdinhand.c:1860
+#: server/stdinhand.c:1756
msgid "Usage: away"
msgstr "÷ÉËÏÒÉÓÔÁÎÎÑ: away"
-#: server/stdinhand.c:1865
+#: server/stdinhand.c:1761
msgid "Only players may use the away command."
msgstr ""
-#: server/stdinhand.c:1869
+#: server/stdinhand.c:1765
#, c-format
msgid "%s set to away mode."
msgstr "%s ×ÓÔÁÎÏ×ÌÅÎÏ Õ ÓÔÁΠצÄÓÕÔΦÊ."
-#: server/stdinhand.c:1877
+#: server/stdinhand.c:1772
#, c-format
msgid "%s returned to game."
msgstr "%s ÐÏ×ÅÒÎÕ×ÓÑ ÄÏ ÇÒÉ."
-#: server/stdinhand.c:1919
+#: server/stdinhand.c:1817
#, c-format
msgid "Sorry, you do not have access to view option '%s'."
msgstr "÷ÉÂÁÞÔÅ, Õ ÷ÁÓ ÎÅ ÍÁ¤ ÄÏÓÔÕÐÕ ÄÌÑ ÐÅÒÅÇÌÑÄÕ ÏÐæ§ '%s'."
-#: server/stdinhand.c:1925
+#: server/stdinhand.c:1823
#, c-format
msgid "Unknown option '%s'."
msgstr "îÅצÄÏÍÁ ÏÐÃ¦Ñ '%s'."
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1848
#, fuzzy
msgid "All options with non-default values"
msgstr "= ×ËÁÚÕ¤, ÝÏ ÏÐÃ¦Ñ Í¦ÓÔÉÔØ ÚÎÁÞÅÎÎÑ ÐÏ ÚÁÍÏ×ÞÕ×ÁÎÎÀ"
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1851
#, fuzzy
msgid "All options"
msgstr "÷ÓÔÁÎÏ×ÉÔÉ ÌÏËÁÌØΦ ÏÐæ§"
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1854
#, fuzzy
msgid "Vital options"
msgstr "ïÐæ§ ͦÓÔÁ"
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1857
#, fuzzy
msgid "Situational options"
msgstr "÷ÓÔÁÎÏ×ÉÔÉ ÌÏËÁÌØΦ ÏÐæ§"
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1860
msgid "Rarely used options"
msgstr ""
-#: server/stdinhand.c:1965
+#: server/stdinhand.c:1863
msgid "+ means you may change the option"
msgstr "+ ×ËÁÚÕ¤, ÝÏ ÷É ÍÏÖÅÔÅ ÚͦÎÉÔÉ ÏÐæÀ"
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1864
msgid "= means the option is on its default value"
msgstr "= ×ËÁÚÕ¤, ÝÏ ÏÐÃ¦Ñ Í¦ÓÔÉÔØ ÚÎÁÞÅÎÎÑ ÐÏ ÚÁÍÏ×ÞÕ×ÁÎÎÀ"
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
#, c-format
msgid "%-*s value (min,max) "
msgstr "%-*s ÚÎÁÞÅÎÎÑ (ͦÎ,ÍÁËÓ) "
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
msgid "Option"
msgstr "ïÐæÑ"
-#: server/stdinhand.c:1973
+#: server/stdinhand.c:1871
msgid "description"
msgstr "ÏÐÉÓ"
-#: server/stdinhand.c:2042
+#: server/stdinhand.c:1940
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:2092
+#: server/stdinhand.c:1966
msgid "Cannot change teams once game has begun."
msgstr "îÅ ÍÏÖÎÁ ÚͦÎÉÔÉ ËÏÍÁÎÄÕ Ð¦ÓÌÑ ÓÔÁÒÔÕ ÇÒÉ."
-#: server/stdinhand.c:2102
+#: server/stdinhand.c:1976
#, fuzzy
msgid "Undefined argument. Usage: team <player> <team>."
msgstr "îÅצÄÏÍÉÊ ÁÒÇÕÍÅÎÔ. ÷ÉËÏÒÉÓÔÁÎÎÑ: team <ÇÒÁ×ÅÃØ> [ËÏÍÁÎÄÁ]."
-#: server/stdinhand.c:2122
+#: server/stdinhand.c:1996
#, c-format
msgid "No such team %s. Please give a valid team name or number."
msgstr ""
-#: server/stdinhand.c:2129
+#: server/stdinhand.c:2003
#, fuzzy
msgid "Cannot team a barbarian."
msgstr "îÅ ÍÏÖÌÉ×Ï ÐÅÒÅÍÉËÎÕÔÉ ÇÒÁ×ÃÑ ÄÉËÕÎÁ."
-#: server/stdinhand.c:2135
+#: server/stdinhand.c:2009
#, c-format
msgid "Player %s set to team %s."
msgstr "çÒÁ×ÅÃØ %s ÐÒɤÄÎÁ×ÓÑ ÄÏ ËÏÍÁÎÄÉ %s."
-#: server/stdinhand.c:2157
+#: server/stdinhand.c:2035 server/voting.c:512
#, fuzzy
-msgid "Undefined arguments. Usage: vote yes|no [vote number]."
-msgstr "îÅצÄÏÍÉÊ ÁÒÇÕÍÅÎÔ. ÷ÉËÏÒÉÓÔÁÎÎÑ: team <ÇÒÁ×ÅÃØ> [ËÏÍÁÎÄÁ]."
+msgid "Teamvote"
+msgstr "ëÏÍÁÎÄÁ"
-#: server/stdinhand.c:2165
-msgid "Observers cannot vote."
+#: server/stdinhand.c:2035 server/voting.c:516
+msgid "Vote"
msgstr ""
-#: server/stdinhand.c:2168
+#: server/stdinhand.c:2037
+#, c-format
msgid ""
-"You can only vote in a running game. Use 'first' to become the game "
-"organizer if there currently is none."
+"%s %d \"%s\" (needs %0.0f%%%s): %d for, %d against, and %d abstained out of %"
+"d players."
msgstr ""
-#: server/stdinhand.c:2181
-#, c-format
-msgid "Vote %d \"%s\": %d for, %d against"
+#: server/stdinhand.c:2041
+msgid " no dissent"
msgstr ""
-#: server/stdinhand.c:2188
+#: server/stdinhand.c:2049
msgid "There are no votes going on."
msgstr ""
-#: server/stdinhand.c:2208
-msgid "No legal last vote."
-msgstr ""
+#: server/stdinhand.c:2077
+#, fuzzy
+msgid "Invalid arguments. Usage: vote yes|no|abstain [vote number]."
+msgstr "îÅצÄÏÍÉÊ ÁÒÇÕÍÅÎÔ. ÷ÉËÏÒÉÓÔÁÎÎÑ: team <ÇÒÁ×ÅÃØ> [ËÏÍÁÎÄÁ]."
-#: server/stdinhand.c:2213
+#: server/stdinhand.c:2095 server/stdinhand.c:2213 server/stdinhand.c:3714
+msgid "You are not allowed to use this command."
+msgstr "÷ÁÍ ÎÅ ÄÏÚ×ÏÌÅÎÏ ×ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ÃÀ ËÏÍÁÎÄÕ."
+
+#: server/stdinhand.c:2104
+#, fuzzy, c-format
+msgid "The argument \"%s\" is ambigious."
+msgstr "áÒÇÕÍÅÎÔ ÄÏÐÏÍÏÇÉ '%s' Ä×ÏÚÎÁÞÎÉÊ."
+
+#: server/stdinhand.c:2119
#, fuzzy
-msgid "Value must be integer."
+msgid "There are no votes running."
+msgstr "çÒÁ ×ÖÅ ÚÁÐÕÝÅÎÁ."
+
+#: server/stdinhand.c:2121
+#, c-format
+msgid "No legal last vote (%d %s)."
+msgstr ""
+
+#: server/stdinhand.c:2122
+msgid "other vote running"
+msgid_plural "other votes running"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: server/stdinhand.c:2129 server/stdinhand.c:2491 server/stdinhand.c:2532
+msgid "Value must be an integer."
msgstr "úÎÁÞÅÎÎÑ ÐÏ×ÉÎÏ ÂÕÔÉ Ã¦ÌÉÍ."
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2135 server/stdinhand.c:2221
#, c-format
msgid "No such vote (%d)."
msgstr ""
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2141
+#, fuzzy
+msgid "You are not allowed to vote on that."
+msgstr "÷ÁÍ ÎÅ ÄÏÚ×ÏÌÅÎÏ ×ÓÔÁÎÏ×ÌÀ×ÁÔÉ ÃÀ ÏÐæÀ."
+
+#: server/stdinhand.c:2146
#, fuzzy, c-format
msgid "You voted for \"%s\""
msgstr "÷É ÚÁÓÎÕ×ÁÌÉ %s"
-#: server/stdinhand.c:2232
+#: server/stdinhand.c:2150
#, c-format
msgid "You voted against \"%s\""
msgstr ""
-#: server/stdinhand.c:2259
+#: server/stdinhand.c:2155
+#, c-format
+msgid "You abstained from voting on \"%s\""
+msgstr ""
+
+#: server/stdinhand.c:2190
+msgid "Missing argument <vote number> or the string \"all\"."
+msgstr ""
+
+#: server/stdinhand.c:2197
+#, fuzzy
+msgid "You don't have any vote going on."
+msgstr "÷É ÎÅ ÍÁ¤ÔÅ ÐÒÁæ×ÎÉË¦× ÔÕÔ."
+
+#: server/stdinhand.c:2204
+msgid "There isn't any vote going on."
+msgstr ""
+
+#: server/stdinhand.c:2209
+msgid "Server: All votes have been removed."
+msgstr ""
+
+#: server/stdinhand.c:2226
+#, fuzzy, c-format
+msgid "You are not allowed to cancel this vote (%d)."
+msgstr "÷ÁÍ ÎÅ ÄÏÚ×ÏÌÅÎÏ ×ÓÔÁÎÏ×ÌÀ×ÁÔÉ ÃÀ ÏÐæÀ."
+
+#: server/stdinhand.c:2232
+msgid "Usage: /cancelvote [<vote number>|all]"
+msgstr ""
+
+#: server/stdinhand.c:2241
+#, c-format
+msgid "Server: %s cancelled the vote \"%s\" (number %d)."
+msgstr ""
+
+#: server/stdinhand.c:2247
+#, c-format
+msgid "Server: The vote \"%s\" (number %d) has been cancelled."
+msgstr ""
+
+#: server/stdinhand.c:2265
msgid ""
"Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
"<x> <y> | unit <id> | tech <player> | timing | info>."
msgstr ""
-#: server/stdinhand.c:2265
+#: server/stdinhand.c:2271
#, fuzzy
msgid "Can only use this command once game has begun."
msgstr "îÅ ÍÏÖÎÁ ÚͦÎÉÔÉ ËÏÍÁÎÄÕ Ð¦ÓÌÑ ÓÔÁÒÔÕ ÇÒÉ."
-#: server/stdinhand.c:2294
+#: server/stdinhand.c:2300
#, c-format
msgid "%s diplomacy no longer debugged"
msgstr ""
-#: server/stdinhand.c:2298
+#: server/stdinhand.c:2304
#, c-format
msgid "%s diplomacy debugged"
msgstr ""
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2323
#, c-format
msgid "%s tech no longer debugged"
msgstr ""
-#: server/stdinhand.c:2321
+#: server/stdinhand.c:2327
#, c-format
msgid "%s tech debugged"
msgstr ""
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2358 server/stdinhand.c:2388
#, fuzzy
msgid "Value 2 & 3 must be integer."
msgstr "úÎÁÞÅÎÎÑ ÐÏ×ÉÎÏ ÂÕÔÉ Ã¦ÌÉÍ."
-#: server/stdinhand.c:2356 server/stdinhand.c:2386
+#: server/stdinhand.c:2362 server/stdinhand.c:2392
msgid "Bad map coordinates."
msgstr ""
-#: server/stdinhand.c:2361
+#: server/stdinhand.c:2367
msgid "No city at this coordinate."
msgstr ""
-#: server/stdinhand.c:2366
+#: server/stdinhand.c:2372
#, c-format
msgid "%s no longer debugged"
msgstr ""
-#: server/stdinhand.c:2392 server/stdinhand.c:2422
+#: server/stdinhand.c:2398 server/stdinhand.c:2428
#, fuzzy, c-format
msgid "%s %s no longer debugged."
msgstr "%s %s ÁÔÁËÏ×ÁÎÏ ÁÔÏÍÎÏÀ ÂÏÍÂÏÀ."
-#: server/stdinhand.c:2397 server/stdinhand.c:2427
+#: server/stdinhand.c:2403 server/stdinhand.c:2433
#, fuzzy, c-format
msgid "%s %s debugged."
msgstr "%s %s ÁÔÁËÏ×ÁÎÏ ÁÔÏÍÎÏÀ ÂÏÍÂÏÀ."
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2419
#, fuzzy
msgid "Value 2 must be integer."
msgstr "úÎÁÞÅÎÎÑ ÐÏ×ÉÎÏ ÂÕÔÉ Ã¦ÌÉÍ."
-#: server/stdinhand.c:2417
+#: server/stdinhand.c:2423
#, c-format
msgid "Unit %d does not exist."
msgstr ""
-#: server/stdinhand.c:2475
+#: server/stdinhand.c:2464
msgid "Undefined argument. Usage: set <option> <value>."
msgstr "îÅצÄÏÍÉÊ ÁÒÇÕÍÅÎÔ. ÷ÉËÏÒÉÓÔÁÎÎÑ: set <ÏÐæÑ> <ÚÎÁÞÅÎÎÑ>."
-#: server/stdinhand.c:2485
+#: server/stdinhand.c:2473
msgid "You are not allowed to set this option."
msgstr "÷ÁÍ ÎÅ ÄÏÚ×ÏÌÅÎÏ ×ÓÔÁÎÏ×ÌÀ×ÁÔÉ ÃÀ ÏÐæÀ."
-#: server/stdinhand.c:2490 server/stdinhand.c:3463
+#: server/stdinhand.c:2478 server/stdinhand.c:3501
msgid "This setting can't be modified after the game has started."
msgstr "ãÑ ÕÓÔÁÎÏ×ËÁ ÎÅ ÍÏÖÅ ÂÕÔÉ ÚͦÎÅÎÁ ËÏÌÉ ÇÒÕ ×ÖÅ ÓÔÁÒÔÏ×ÁÎÏ."
-#: server/stdinhand.c:2502 server/stdinhand.c:2543
-msgid "Value must be an integer."
-msgstr "úÎÁÞÅÎÎÑ ÐÏ×ÉÎÏ ÂÕÔÉ Ã¦ÌÉÍ."
-
-#: server/stdinhand.c:2512
+#: server/stdinhand.c:2501
#, c-format
msgid "The parameter %s should only contain digits 0-1."
msgstr ""
-#: server/stdinhand.c:2519
+#: server/stdinhand.c:2508
msgid "Value out of range (minimum: 0, maximum: 1)."
msgstr "úÎÁÞÅÎÎÑ ×ÉÈÏÄÉÔØ ÚÁ ÄÏÚ×ÏÌÅÎÉÊ Ä¦ÁÐÁÚÏÎ (ͦΦÍÕÍ: 0, ÍÁËÓÉÍÕÍ: 1)."
-#: server/stdinhand.c:2534 server/stdinhand.c:2576
+#: server/stdinhand.c:2523 server/stdinhand.c:2565
#, c-format
msgid "Option: %s has been set to %d."
msgstr "ïÐæÑ: %s ×ÓÔÁÎÏ×ÌÅÎÁ Õ %d."
-#: server/stdinhand.c:2554
+#: server/stdinhand.c:2543
#, c-format
msgid "The parameter %s should only contain +- and 0-9."
msgstr ""
-#: server/stdinhand.c:2561
+#: server/stdinhand.c:2550
#, c-format
msgid "Value out of range (minimum: %d, maximum: %d)."
msgstr "úÎÁÞÅÎÎÑ ×ÉÈÏÄÉÔØ ÚÁ ÄÏÚ×ÏÌÅÎÉÊ Ä¦ÁÐÁÚÏÎ (ͦΦÍÕÍ: %d, ÍÁËÓÉÍÕÍ: %d)."
-#: server/stdinhand.c:2586
+#: server/stdinhand.c:2575
msgid "String value too long. Usage: set <option> <value>."
msgstr "óÔÒÏËÏ×Å ÚÎÁÞÅÎÎÑ ÚÁÄÏ×ÇÅ. ÷ÉËÏÒÉÓÔÏ×ÕÊÔÅ: set <ÏÐæÑ> <ÚÎÁÞÅÎÎÑ>."
-#: server/stdinhand.c:2600
+#: server/stdinhand.c:2589
#, c-format
msgid "Option: %s has been set to \"%s\"."
msgstr "ïÐæÑ: %s ×ÓÔÁÎÏ×ÌÅÎÁ Õ \"%s\"."
-#: server/stdinhand.c:2658
+#: server/stdinhand.c:2652
msgid "Sorry, one can't observe globally in this game."
msgstr ""
-#: server/stdinhand.c:2661
+#: server/stdinhand.c:2655
msgid "Sorry, you can't take a global observer. Observe it instead."
msgstr ""
-#: server/stdinhand.c:2671
+#: server/stdinhand.c:2665
#, fuzzy
msgid "You cannot take a new player at this time."
msgstr "îÅ ÚצÔÕ¤ÍÏ ÍÅÔÁÓÅÒ×ÅÒÕ Õ Ã¦Ê ÇÒ¦."
#. TRANS: Do not translate "maxplayers".
-#: server/stdinhand.c:2679
+#: server/stdinhand.c:2673
#, c-format
msgid ""
"You cannot take a new player because the maximum of %d player has already "
@@ -6023,81 +6104,81 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: server/stdinhand.c:2691
+#: server/stdinhand.c:2685
msgid "You cannot take a new player because there are no free player slots."
msgstr ""
-#: server/stdinhand.c:2702
+#: server/stdinhand.c:2696
msgid "Sorry, one can't observe barbarians in this game."
msgstr ""
-#: server/stdinhand.c:2705
+#: server/stdinhand.c:2699
msgid "Sorry, one can't take barbarians in this game."
msgstr ""
-#: server/stdinhand.c:2713
+#: server/stdinhand.c:2707
#, fuzzy
msgid "Sorry, one can't observe dead players in this game."
msgstr "ðÅÒÅÈÏÐÌÅÎÏ Í¦ÓÃÅ ÇÒÁ×ÃÑ %s Õ ÇÒ¦."
-#: server/stdinhand.c:2716
+#: server/stdinhand.c:2710
#, fuzzy
msgid "Sorry, one can't take dead players in this game."
msgstr "îÅ ÚצÔÕ¤ÍÏ ÍÅÔÁÓÅÒ×ÅÒÕ Õ Ã¦Ê ÇÒ¦."
-#: server/stdinhand.c:2724
+#: server/stdinhand.c:2718
msgid "Sorry, one can't observe AI players in this game."
msgstr ""
-#: server/stdinhand.c:2727
+#: server/stdinhand.c:2721
#, fuzzy
msgid "Sorry, one can't take AI players in this game."
msgstr "óÔ×ÏÒÉÔÉ ËÏÍÐ'ÀÔÅÒÎÏÇÏ ÇÒÁ×ÃÑ Ú ÔÁËÉÍ ¦Í'ÑÍ"
-#: server/stdinhand.c:2736
+#: server/stdinhand.c:2730
msgid "Sorry, one can't observe human players in this game."
msgstr ""
-#: server/stdinhand.c:2739
+#: server/stdinhand.c:2733
msgid "Sorry, one can't take human players in this game."
msgstr ""
-#: server/stdinhand.c:2749
+#: server/stdinhand.c:2743
#, fuzzy
msgid "Sorry, one can't observe in this game."
msgstr "îÅ ÚצÔÕ¤ÍÏ ÍÅÔÁÓÅÒ×ÅÒÕ Õ Ã¦Ê ÇÒ¦."
-#: server/stdinhand.c:2754
+#: server/stdinhand.c:2748
#, fuzzy
msgid "Sorry, one can't take players in this game."
msgstr "îÅ ÚצÔÕ¤ÍÏ ÍÅÔÁÓÅÒ×ÅÒÕ Õ Ã¦Ê ÇÒ¦."
-#: server/stdinhand.c:2760
+#: server/stdinhand.c:2754
#, fuzzy
msgid "Sorry, one can't take players already connected in this game."
msgstr "ðÅÒÅÈÏÐÌÅÎÏ Í¦ÓÃÅ ÇÒÁ×ÃÑ %s Õ ÇÒ¦."
-#: server/stdinhand.c:2791
+#: server/stdinhand.c:2785
#, fuzzy
msgid "Usage: observe [connection-name [player-name]]"
msgstr "÷ÉËÏÒÉÓÔÁÎÎÑ: take [Ú'¤ÄÎÁÎÎÑ] <ÇÒÁ×ÅÃØ>"
-#: server/stdinhand.c:2797
+#: server/stdinhand.c:2791
#, fuzzy
msgid "Usage: observe [player-name]"
msgstr "÷ÉËÏÒÉÓÔÁÎÎÑ: take <ÇÒÁ×ÅÃØ>"
-#: server/stdinhand.c:2847
+#: server/stdinhand.c:2841
#, fuzzy, c-format
msgid "%s already controls %s. Using 'observe' would remove %s"
msgstr "%s ×ÖÅ ËÏÎÔÒÏÌÀ¤ ÁÂÏ ÎÁÇÌÑÄÁ¤ ÎÁÄ %s"
-#: server/stdinhand.c:2858
+#: server/stdinhand.c:2852
#, fuzzy, c-format
msgid "%s is already observing %s."
msgstr "%s ÂÕÄÕ¤ %s."
-#: server/stdinhand.c:2863
+#: server/stdinhand.c:2857
#, fuzzy, c-format
msgid "%s is already observing."
msgstr "%s ÂÕÄÕ¤ %s."
@@ -6112,246 +6193,252 @@ msgstr "%s
msgid "%s now observes"
msgstr "%s ÔÅÐÅÒ ËÏÎÔÒÏÌÀ¤ÔØÓÑ %s."
-#: server/stdinhand.c:2969
+#: server/stdinhand.c:2971
#, fuzzy
msgid "Usage: take <connection-name> <player-name>"
msgstr "÷ÉËÏÒÉÓÔÁÎÎÑ: take [Ú'¤ÄÎÁÎÎÑ] <ÇÒÁ×ÅÃØ>"
-#: server/stdinhand.c:2974
+#: server/stdinhand.c:2976
msgid "Usage: take <player-name>"
msgstr "÷ÉËÏÒÉÓÔÁÎÎÑ: take <ÇÒÁ×ÅÃØ>"
-#: server/stdinhand.c:2980
+#: server/stdinhand.c:2982
msgid "Usage: take [connection-name] <player-name>"
msgstr "÷ÉËÏÒÉÓÔÁÎÎÑ: take [Ú'¤ÄÎÁÎÎÑ] <ÇÒÁ×ÅÃØ>"
-#: server/stdinhand.c:3010
+#: server/stdinhand.c:3012
#, fuzzy, c-format
msgid "%s already controls %s."
msgstr "%s ×ÖÅ ËÏÎÔÒÏÌÀ¤ ÁÂÏ ÎÁÇÌÑÄÁ¤ ÎÁÄ %s"
-#: server/stdinhand.c:3024
+#: server/stdinhand.c:3026
#, fuzzy, c-format
msgid "There is no free player slot for %s."
msgstr "îÅÍÁ¤ Ú`¤ÄÎÁÎÎÑ ÁÂÏ ÇÒÁ×ÃÑ Ú ¦Í`ÑÍ %s."
-#: server/stdinhand.c:3059
+#: server/stdinhand.c:3061
#, c-format
msgid "being detached from %s."
msgstr ""
-#: server/stdinhand.c:3135
+#: server/stdinhand.c:3146
#, fuzzy, c-format
msgid "%s now controls %s (%s, %s)."
msgstr "%s ÔÅÐÅÒ ËÏÎÔÒÏÌÀ¤ÔØÓÑ %s."
-#: server/stdinhand.c:3139 server/stdinhand.c:4260
+#: server/stdinhand.c:3150 server/stdinhand.c:4308
#: data/nation/barbarian.ruleset:3
msgid "Barbarian"
msgstr "äÉËÕÎ"
-#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
+#: server/stdinhand.c:3152 server/stdinhand.c:4310 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-sdl/plrdlg.c:645
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr "ëÏÍÐ'ÀÔÅÒ"
-#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-gtk-2.0/pages.c:2125
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
+#: server/stdinhand.c:3153 server/stdinhand.c:4312
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-gtk-2.0/pages.c:2127
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/connectdlg.c:215
msgid "Human"
msgstr "ìÀÄÉÎÁ"
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-gtk-2.0/pages.c:2124 client/gui-win32/connectdlg.c:200
-#: client/gui-win32/connectdlg.c:212
+#: server/stdinhand.c:3155 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-gtk-2.0/pages.c:2126 client/gui-win32/connectdlg.c:202
+#: client/gui-win32/connectdlg.c:214
#, fuzzy
msgid "Alive"
msgstr "áËÔÉצÚÕ×ÁÔÉ"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3156 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-win32/connectdlg.c:202
#, fuzzy
msgid "Dead"
msgstr ", ðÏÍÅÒ"
-#: server/stdinhand.c:3147
+#: server/stdinhand.c:3159
#, fuzzy, c-format
msgid "%s failed to attach to any player."
msgstr "%s ÎÅ×ÄÁÌÁ ÎÁÚ×Á."
-#: server/stdinhand.c:3182
+#: server/stdinhand.c:3194
#, fuzzy
msgid "Usage: detach <connection-name>"
msgstr "cut <¦Í'Ñ-Ú'¤ÄÎÁÎÎÑ>"
-#: server/stdinhand.c:3202
+#: server/stdinhand.c:3214
#, fuzzy
msgid "You can not detach other users."
msgstr "÷É ÎÅ ÍÏÖÅÔÅ ÁÔÁËÕ×ÁÔÉ ÔÕÔ."
-#: server/stdinhand.c:3211
+#: server/stdinhand.c:3223
#, fuzzy, c-format
msgid "%s is not attached to any player."
msgstr "%s ÎÅ×ÄÁÌÁ ÎÁÚ×Á."
-#: server/stdinhand.c:3234
+#: server/stdinhand.c:3246
#, fuzzy, c-format
msgid "%s detaching from %s"
msgstr "%s צÄ'¤ÄÎÁ×ÓÑ ×¦Ä %s"
-#: server/stdinhand.c:3240
+#: server/stdinhand.c:3252
#, fuzzy, c-format
msgid "%s no longer observing."
msgstr "%s ÂÕÄÕ¤ %s."
-#: server/stdinhand.c:3259
+#: server/stdinhand.c:3271
#, fuzzy, c-format
msgid "detaching from %s."
msgstr "÷É×ÞÁ¤ÔØÓÑ %s."
-#: server/stdinhand.c:3345
+#: server/stdinhand.c:3361
#, fuzzy
msgid "Usage: load <game name>"
msgstr "÷ÉËÏÒÉÓÔÁÎÎÑ: load <ÆÁÊÌ>"
-#: server/stdinhand.c:3350
+#: server/stdinhand.c:3366
#, fuzzy
msgid "Cannot load a game while another is running."
msgstr "îÅ ÍÏÖÕ ÚÁ×ÁÎÔÁÖÉÔÉ ÇÒÕ ËÏÌÉ ¦ÎÛÕ ÚÁÐÕÝÅÎÏ."
-#: server/stdinhand.c:3372
+#: server/stdinhand.c:3388
#, c-format
msgid "Cannot find savegame or scenario with the name \"%s\"."
msgstr ""
-#: server/stdinhand.c:3389
+#: server/stdinhand.c:3405
#, fuzzy, c-format
msgid "Could not load savefile: %s"
msgstr "îÅ ÍÏÖÕ ÚÁ×ÁÎÔÁÖÉÔÉ ÇÒÕ: %s"
-#: server/stdinhand.c:3458
+#: server/stdinhand.c:3496
#, c-format
msgid "Current ruleset directory is \"%s\""
msgstr "ðÏÔÏÞÎÉÊ ËÁÔÁÌÏÇ ÐÒÁ×ÉÌ \"%s\""
-#: server/stdinhand.c:3478
+#: server/stdinhand.c:3516
#, c-format
msgid "Ruleset directory \"%s\" not found"
msgstr "ëÁÔÁÌÏÇ ÐÒÁ×ÉÌ \"%s\" ÎÅ ÚÎÁÊÄÅÎÏ"
-#: server/stdinhand.c:3484
+#: server/stdinhand.c:3522
#, fuzzy, c-format
msgid "Ruleset directory is already \"%s\""
msgstr "ëÁÔÁÌÏÇ ÐÒÁ×ÉÌ ×ÓÔÁÎÏ×ÌÅÎÏ Õ \"%s\""
-#: server/stdinhand.c:3488
+#: server/stdinhand.c:3526
#, c-format
msgid "Ruleset directory set to \"%s\""
msgstr "ëÁÔÁÌÏÇ ÐÒÁ×ÉÌ ×ÓÔÁÎÏ×ÌÅÎÏ Õ \"%s\""
-#: server/stdinhand.c:3536
+#: server/stdinhand.c:3574
msgid "Goodbye."
msgstr "äÏ ÐÏÂÁÞÅÎÎÑ."
-#: server/stdinhand.c:3567
+#: server/stdinhand.c:3606
msgid "Sorry, you are not allowed to use server commands."
msgstr "÷ÉÂÁÞÔÅ ÁÌÅ ÷ÁÍ ÎÅ ÄÏÚ×ÏÌÅÎÏ ×ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ËÏÍÁÎÄÉ ÓÅÒ×ÅÒÁ."
-#: server/stdinhand.c:3603
+#: server/stdinhand.c:3656
#, c-format
msgid "Warning: '%s' interpreted as '%s', but it is ambiguous. Try '%shelp'."
msgstr ""
"õ×ÁÇÁ: '%s' ÔÒÁËÔÏ×ÁÎÏ ÑË '%s', ÁÌÅ ÍÁ¤ ͦÓÃÅ Ä×ÏÚÎÁÞΦÓÔØ. óÐÒÏÂÕÊÔÅ '%"
"shelp'."
-#: server/stdinhand.c:3608
+#: server/stdinhand.c:3661
#, c-format
msgid "Unknown command. Try '%shelp'."
msgstr "îÅצÄÏÍÁ ËÏÍÁÎÄÁ. óÐÒÏÂÕÊÔÅ '%shelp'."
-#: server/stdinhand.c:3625
-msgid "Your new vote canceled your previous vote."
+#: server/stdinhand.c:3675
+msgid "Your new vote cancelled your previous vote."
msgstr ""
-#: server/stdinhand.c:3633
-#, c-format
-msgid "New vote (number %d) by %s: %s."
-msgstr ""
+#: server/stdinhand.c:3688
+#, fuzzy
+msgid "New teamvote"
+msgstr "îÏ×Á ÇÒÁ"
+
+#: server/stdinhand.c:3691
+#, fuzzy
+msgid "New vote"
+msgstr "îÏ×Á ÇÒÁ"
-#: server/stdinhand.c:3645
+#: server/stdinhand.c:3695
+#, fuzzy, c-format
+msgid "%s (number %d) by %s: %s"
+msgstr "%s ÁÔÁËÏ×ÁÎÏ ÁÔÏÍÎÏÀ ÂÏÍÂÏÀ %s."
+
+#: server/stdinhand.c:3704
#, c-format
msgid "Your new vote (\"%s\") was not legal or was not recognized."
msgstr ""
-#: server/stdinhand.c:3655
-msgid "You are not allowed to use this command."
-msgstr "÷ÁÍ ÎÅ ÄÏÚ×ÏÌÅÎÏ ×ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ÃÀ ËÏÍÁÎÄÕ."
-
-#: server/stdinhand.c:3680
+#: server/stdinhand.c:3726
msgid "(server prompt)"
msgstr "(ÓÅÒ×ÅÒ)"
-#: server/stdinhand.c:3787
+#: server/stdinhand.c:3835
#, fuzzy
msgid "Game ended in a draw."
msgstr "çÒÕ ÚÁ˦ÎÞÅÎÏ"
-#: server/stdinhand.c:3791
+#: server/stdinhand.c:3839
msgid ""
"Ending the game. The server will restart once all clients have disconnected."
msgstr ""
-#: server/stdinhand.c:3796
+#: server/stdinhand.c:3844
msgid "Cannot end the game: no game running."
msgstr "îÅ ÍÏÖÕ ÚÕÐÉÎÉÔÉ ÇÒÕ: §§ ÎÅ ÚÁÐÕÝÅÎÏ."
-#: server/stdinhand.c:3812
+#: server/stdinhand.c:3860
#, c-format
msgid "%s has conceded the game and can no longer win."
msgstr ""
-#: server/stdinhand.c:3817
+#: server/stdinhand.c:3865
#, fuzzy
msgid "You cannot surrender now."
msgstr "óÁÂÏÔÕ×ÁÔÉ ÂÕĦ×ÌÀ"
-#: server/stdinhand.c:3883
+#: server/stdinhand.c:3931
#, fuzzy
msgid "Not enough human players, game will not start."
msgstr "îÅ ×ÉÓÔÁÞÁ¤ ÇÒÁ×æ×, ÇÒÕ ÎÅ ÓÔÁÒÔÏ×ÁÎÏ."
-#: server/stdinhand.c:3888
+#: server/stdinhand.c:3936
#, fuzzy
msgid "No players, game will not start."
msgstr "îÅ ×ÉÓÔÁÞÁ¤ ÇÒÁ×æ×, ÇÒÕ ÎÅ ÓÔÁÒÔÏ×ÁÎÏ."
-#: server/stdinhand.c:3892
+#: server/stdinhand.c:3940
#, fuzzy
msgid "Not enough nations for all players, game will not start."
msgstr "îÅ ×ÉÓÔÁÞÁ¤ ÇÒÁ×æ×, ÇÒÕ ÎÅ ÓÔÁÒÔÏ×ÁÎÏ."
-#: server/stdinhand.c:3901
+#: server/stdinhand.c:3949
#, fuzzy
msgid "All players are ready; starting game."
msgstr "çÒÁ×ÅÃØ Ú ÔÁËÉÍ ¦Í'ÑÍ ×ÖÅ ¦ÓÎÕ¤."
-#: server/stdinhand.c:3915
+#: server/stdinhand.c:3963
#, fuzzy
msgid ""
"Cannot start the game: the game is waiting for all clients to disconnect."
msgstr "îÅ ÍÏÖÕ ÓÔÁÒÔÕ×ÁÔÉ ÇÒÕ: §§ ×ÖÅ ÚÁÐÕÝÅÎÏ."
-#: server/stdinhand.c:3922
+#: server/stdinhand.c:3970
msgid "Cannot start the game: it is already running."
msgstr "îÅ ÍÏÖÕ ÓÔÁÒÔÕ×ÁÔÉ ÇÒÕ: §§ ×ÖÅ ÚÁÐÕÝÅÎÏ."
-#: server/stdinhand.c:3953
+#: server/stdinhand.c:4001
#, c-format
msgid "Cutting connection %s."
msgstr "÷ÉÄÁÌÑÀ Ú'¤ÄÎÁÎÎÑ %s."
-#: server/stdinhand.c:3972
+#: server/stdinhand.c:4020
msgid ""
"Welcome - this is the introductory help text for the Freeciv server.\n"
"\n"
@@ -6389,78 +6476,78 @@ msgstr ""
" save - ÁÂÉ ÚÂÅÒÅÇÔÉ ÇÒÕ\n"
" quit - ÁÂÉ ×ÉÊÔÉ"
-#: server/stdinhand.c:4007 server/stdinhand.c:4010
+#: server/stdinhand.c:4055 server/stdinhand.c:4058
msgid "Command:"
msgstr "ëÏÍÁÎÄÁ:"
-#: server/stdinhand.c:4014
+#: server/stdinhand.c:4062
msgid "Synopsis: "
msgstr "óÉÎÔÁËÓÉÓ:"
-#: server/stdinhand.c:4023
+#: server/stdinhand.c:4071
#, c-format
msgid "Level: %s"
msgstr "ò¦×ÅÎØ: %s"
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4096
msgid "The following server commands are available:"
msgstr "äÏÓÔÕÐΦ ÎÁÓÔÕÐΦ ËÏÍÁÎÄÉ ÓÅÒ×ÅÒÁ:"
-#: server/stdinhand.c:4123
+#: server/stdinhand.c:4171
#, c-format
msgid "Help argument '%s' is ambiguous."
msgstr "áÒÇÕÍÅÎÔ ÄÏÐÏÍÏÇÉ '%s' Ä×ÏÚÎÁÞÎÉÊ."
-#: server/stdinhand.c:4128
+#: server/stdinhand.c:4176
#, c-format
msgid "No match for help argument '%s'."
msgstr "îÅÍÁ¤ ÓЦ×ÐÁĦÎØ ÄÌÑ ÁÒÇÕÍÅÎÔÁ ÄÏÐÏÍÏÇÉ '%s'."
-#: server/stdinhand.c:4194
+#: server/stdinhand.c:4242
#, c-format
msgid "Bad list argument: '%s'. Try '%shelp list'."
msgstr "ðÏÇÁÎÉÊ ÁÒÇÕÍÅÎÔ ÄÌÑ 'list': '%s'. óÐÒÏÂÕÊÔÅ '%shelp list'."
-#: server/stdinhand.c:4234
+#: server/stdinhand.c:4282
msgid "List of players:"
msgstr "óÐÉÓÏË ÇÒÁ×æ×:"
-#: server/stdinhand.c:4239
+#: server/stdinhand.c:4287
msgid "<no players>"
msgstr "<ÎÅÍÁ¤ ÇÒÁ×æ×>"
-#: server/stdinhand.c:4256
+#: server/stdinhand.c:4304
#, c-format
msgid "user %s, "
msgstr "¦Í'Ñ %s, "
-#: server/stdinhand.c:4267
+#: server/stdinhand.c:4315
msgid ", Dead"
msgstr ", ðÏÍÅÒ"
-#: server/stdinhand.c:4270
+#: server/stdinhand.c:4318
#, c-format
msgid ", difficulty level %s"
msgstr ", Ò¦×ÅÎØ ÓËÌÁÄÎÏÓÔ¦ %s"
#. TRANS: continue list, in case comma is not the separator of choice.
-#: server/stdinhand.c:4275 server/stdinhand.c:4279 client/helpdata.c:257
-#: client/helpdata.c:752 client/text.c:241 client/text.c:1224
-#: client/text.c:1262
+#: server/stdinhand.c:4323 server/stdinhand.c:4327 client/helpdata.c:257
+#: client/helpdata.c:752 client/text.c:241 client/text.c:1229
+#: client/text.c:1267
#, c-format
msgid "?clistmore:, %s"
msgstr ", %s"
-#: server/stdinhand.c:4283
+#: server/stdinhand.c:4331
#, fuzzy
msgid ", ready"
msgstr ", ðÏÍÅÒ"
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4333
msgid ", not ready"
msgstr ""
-#: server/stdinhand.c:4293
+#: server/stdinhand.c:4341
#, c-format
msgid " %d connection:"
msgid_plural " %d connections:"
@@ -6468,22 +6555,22 @@ msgstr[0] " %d
msgstr[1] " %d Ú'¤ÄÎÁÎÎÑ:"
msgstr[2] " %d Ú'¤ÄÎÁÎØ:"
-#: server/stdinhand.c:4299
+#: server/stdinhand.c:4347
#, c-format
msgid " %s from %s (command access level %s), bufsize=%dkb"
msgstr " %s ÐÒɤÄÎÁ×ÓÑ Ú %s (Ò¦×ÅÎØ ÄÏÓÔÕÐÕ ÄÏ ËÏÍÁÎÄ %s), ÒÏÚÍ¦Ò ÂÕÆÅÒÕ=%dëâ"
-#: server/stdinhand.c:4304
+#: server/stdinhand.c:4352
msgid " (observer mode)"
msgstr " (ÒÅÖÉÍ ÎÁÇÌÑÄÁÞÁ)"
-#: server/stdinhand.c:4322
+#: server/stdinhand.c:4370
#, fuzzy
msgid "List of teams:"
msgstr "óÐÉÓÏË ÇÒÁ×æ×:"
#. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4332
+#: server/stdinhand.c:4380
#, c-format
msgid "%2d : '%s' : %d player"
msgid_plural "%2d : '%s' : %d players"
@@ -6491,25 +6578,25 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: server/stdinhand.c:4352
+#: server/stdinhand.c:4400
#, c-format
msgid "%2d : '%s' : 1 player : %s"
msgstr ""
-#: server/stdinhand.c:4360
+#: server/stdinhand.c:4408
#, c-format
msgid "Empty team: %s"
msgstr ""
-#: server/stdinhand.c:4371
+#: server/stdinhand.c:4419
msgid "List of connections to server:"
msgstr "óÐÉÓÏË Ú'¤ÄÎÁÎØ ÓÅÒ×ÅÒÁ:"
-#: server/stdinhand.c:4375
+#: server/stdinhand.c:4423
msgid "<no connections>"
msgstr "<ÎÅÍÁ¤ Ú'¤ÄÎÁÎØ>"
-#: server/stdinhand.c:4399
+#: server/stdinhand.c:4447
#, fuzzy
msgid "List of scenarios available:"
msgstr "úÁÇÏÎ¦× ÎÅÍÁ¤"
@@ -6529,7 +6616,7 @@ msgstr "%s
msgid "%s acquired from %s!"
msgstr "%s ÚÄÏÂÕ× %s (õÇÏÄÁ) ×¦Ä %s"
-#: server/techtools.c:220
+#: server/techtools.c:221
#, c-format
msgid ""
"Discovery of %s makes the government form %s available. You may want to "
@@ -6538,37 +6625,37 @@ msgstr ""
"÷¦ÄËÒÉÔÔÑ %s ÒϦÔØ ÍÏÖÌÉ×ÏÀ ÆÉÒÍÕ ÐÒÁ×̦ÎÎÑ %s. íÏÖÌÉ×Ï ÷É ÒÏÚÐÏÞÎÅÔÅ "
"ÒÅ×ÏÌÀæÀ."
-#: server/techtools.c:301
+#: server/techtools.c:302
#, c-format
msgid "Discovery of %s OBSOLETES %s in %s!"
msgstr "÷¦ÄËÒÉÔÔÑ %s ÒÏÂÉÔØ úáóôáò¶ìéí %s Õ %s!"
-#: server/techtools.c:351
+#: server/techtools.c:352
#, fuzzy, c-format
msgid "Learned %s. Our scientists focus on %s; goal is %s."
msgstr "÷¦ÄËÒÉÔÏ %s. ÷ÞÅΦ ËÏÎÃÅÎÔÒÕÀÔØÓÑ ÎÁ %s, ÍÅÔÁ %s."
-#: server/techtools.c:369
+#: server/techtools.c:370
#, c-format
msgid "Learned %s. Scientists choose to research %s."
msgstr "÷¦ÄËÒÉÔÏ %s. îÁÕËÏ×æ ×ÉÂÒÁÌÉ ÄÌÑ ×É×ÞÅÎÎÑ %s."
-#: server/techtools.c:376
+#: server/techtools.c:377
#, c-format
msgid "Learned %s. "
msgstr "÷¦ÄËÒÉÔÏ %s. "
-#: server/techtools.c:379
+#: server/techtools.c:380
#, c-format
msgid "Researching %s."
msgstr "÷É×ÞÁ¤ÔØÓÑ %s."
-#: server/techtools.c:385
+#: server/techtools.c:386
#, fuzzy, c-format
msgid "Learned %s. Scientists do not know what to research next."
msgstr "÷¦ÄËÒÉÔÏ %s. îÁÕËÏ×æ ×ÉÂÒÁÌÉ ÄÌÑ ×É×ÞÅÎÎÑ %s."
-#: server/techtools.c:402
+#: server/techtools.c:403
msgid ""
"Great scientists from all the world join your civilization: you get an "
"immediate advance."
@@ -6576,22 +6663,22 @@ msgstr ""
"÷ÉÄÁÔΦ ×ÞÅΦ Ú ÕÓØÏÇÏ ÓצÔÕ ÐÒɤÄÎÁÌÉÓÑ ÄÏ ÷ÁÓ: ÷É ÏÔÒÉÍÕ¤ÔÅ ÎÅÇÁÊÎÅ "
"צÄËÒÉÔÔÑ."
-#: server/techtools.c:570
+#: server/techtools.c:571
#, c-format
msgid "Technology goal is %s."
msgstr "ôÅÈÎÏÌÏǦÞÎÁ æÌØ %s."
-#: server/techtools.c:700
+#: server/techtools.c:708
#, c-format
msgid "You steal %s from the %s."
msgstr "÷É ×ËÒÁÌÉ %s Õ ÃÉצ̦ÚÁæ§ %s."
-#: server/techtools.c:705
+#: server/techtools.c:713
#, c-format
msgid "The %s stole %s from you!"
msgstr "%s ×ËÒÁ× Õ ÷ÁÓ %s!"
-#: server/techtools.c:710
+#: server/techtools.c:718
#, c-format
msgid "The %s have stolen %s from the %s."
msgstr "%s ×ËÒÁ× %s Ú %s."
@@ -6615,178 +6702,184 @@ msgstr "
msgid "%s upgraded to %s for %d gold."
msgstr "%s ÍÏÄÅÒΦÚÏ×ÁÎÏ ÄÏ %s ÚÁ %d ÇÒÉ×ÅÎØ."
-#: server/unithand.c:396
+#: server/unithand.c:402
#, c-format
msgid "%s refuses to disband!"
msgstr ""
-#: server/unithand.c:449
+#: server/unithand.c:455
msgid "Can't place city here."
msgstr "îÅ ÍÏÖÕ ÒÏÚͦÓÔÉÔÉ Í¦ÓÔÏ ÔÕÔ."
-#: server/unithand.c:456
+#: server/unithand.c:462
#, c-format
msgid "Only %s can build a city."
msgstr "ìÉÛÅ %s ÍÏÖÅ ÂÕÄÕ×ÁÔÉ Í¦ÓÔÁ."
-#: server/unithand.c:461
+#: server/unithand.c:467
msgid "Can't build a city."
msgstr "îÅ ÍÏÖÕ ÂÕÄÕ×ÁÔÉ Í¦ÓÔÏ."
-#: server/unithand.c:470
+#: server/unithand.c:476
#, c-format
msgid "Only %s can add to a city."
msgstr "ìÉÛÅ %s ÍÏÖÅ ÄÏÄÁ×ÁÔÉ ÄÏ Í¦ÓÔÁ."
-#: server/unithand.c:475
+#: server/unithand.c:481
msgid "Can't add to a city."
msgstr "îÅ ÍÏÖÕ ÄÏÄÁÔÉ ÄÏ Í¦ÓÔÁ."
-#: server/unithand.c:481
+#: server/unithand.c:487
#, c-format
msgid "%s unit has no moves left to add to %s."
msgstr "ð¦ÄÒÏÚÄ¦Ì %s ÎÅ ÍÁ¤ ÒÕÈ¦× ÁÂÉ ÄÏÄÁÔÉ ÄÏ %s."
-#: server/unithand.c:487
+#: server/unithand.c:493
#, c-format
msgid "%s unit has no moves left to build city."
msgstr "ЦÄÒÏÚÄ¦Ì %s ÎÅ ÍÁ¤ ÈÏÄ¦× ÁÂÉ ÂÕÄÕ×ÁÔÉ Í¦ÓÔÏ."
-#: server/unithand.c:492
+#. TRANS: <city> is owned by <nation>, cannot add <unit>.
+#: server/unithand.c:499
+#, fuzzy, c-format
+msgid "%s is owned by %s, cannot add %s."
+msgstr "%s ÚÁ×ÅÌÉËÉÊ ÁÂÉ ÄÏÄÁÔÉ %s."
+
+#: server/unithand.c:506
#, c-format
msgid "%s is too big to add %s."
msgstr "%s ÚÁ×ÅÌÉËÉÊ ÁÂÉ ÄÏÄÁÔÉ %s."
-#: server/unithand.c:498
+#: server/unithand.c:512
#, fuzzy, c-format
msgid "%s needs an improvement to grow, so you cannot add %s."
msgstr "%s ÐÏÔÒÅÂÕ¤ %s ÄÌÑ ÒÏÓÔÕ, ÔÏÖ ÷É ÎÅ ÍÏÖÅÔÅ ÄÏÄÁÔÉ %s."
-#: server/unithand.c:509
+#: server/unithand.c:523
#, c-format
msgid "Can't add %s to %s."
msgstr "îÅ ÍÏÖÕ ÄÏÄÁÔÉ %s ÄÏ %s."
-#: server/unithand.c:531
+#: server/unithand.c:545
#, c-format
msgid "%s added to aid %s in growing."
msgstr "%s ÄÏÄÁÎÏ ÄÏ %s ÁÂÉ ÄÏÐÏÍÏÇÔÉ ÚÒÏÓÔÉ."
-#: server/unithand.c:828
+#: server/unithand.c:842
msgid "Your Nuclear missile was shot down by SDI defences, what a waste."
msgstr "÷ÁÛÕ áÔÏÍÎÕ òÁËÅÔÕ ÂÕÌÏ ÚÎÉÝÅÎÏ ÓÉÓÔÅÍÏÀ ÚÁÈÉÓÔÕ óï¶, ÃÅ ×ÔÒÁÔÁ. ."
-#: server/unithand.c:831
+#: server/unithand.c:845
#, c-format
msgid "The nuclear attack on %s was avoided by your SDI defense."
msgstr "áÔÏÍÎÕ ÁÔÁËÕ Õ %s ÂÕÌÏ ÎÅÊÔÒÁ̦ÚÏ×ÁÎÏ ÚÁ×ÄÑËÉ ÷ÁÛÏÍÕ óï¶."
#. TRANS: "Your Cannon ... the Polish Destroyer."
-#: server/unithand.c:901
+#: server/unithand.c:915
#, fuzzy, c-format
msgid "Your %s survived the pathetic attack from the %s %s."
msgstr "÷ÁÛ %s ×ÉÔÒÉÍÁ× ÎÅ×ÄÁÌÕ ÁÔÁËÕ ×¦Ä %s %s."
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unithand.c:910
+#: server/unithand.c:924
#, fuzzy, c-format
msgid "Your attacking %s failed against the %s %s!"
msgstr "÷ÁÛÁ ÁÔÁËÁ ЦÄÒÏÚĦÌÏÍ %s ÐÒÏÔÉ %s ЦÄÒÏÚĦÌÕ %s ÐÒÏ×ÁÌÉÌÁÓÑ!"
-#: server/unithand.c:983
+#: server/unithand.c:997
#, c-format
msgid "Only %s can attack from sea."
msgstr "ìÉÛÅ %s ÍÏÖÕÔØ ÁÔÁËÕ×ÁÔÉ Ú ÍÏÒÑ."
-#: server/unithand.c:988
+#: server/unithand.c:1002
msgid "Cannot attack from sea."
msgstr "îÅ ÍÏÖÕ ÁÔÁËÕ×ÁÔÉ Ú ÍÏÒÑ."
-#: server/unithand.c:996 server/unittools.c:2137
+#: server/unithand.c:1010 server/unittools.c:2142
msgid "Cannot attack unless you declare war first."
msgstr "îÅ ÍÏÖÕ ÁÔÁËÕ×ÁÔÉ ÄÏËÉ ÷É ÎÅ ÐÒÏÇÏÌÏÓÉÔŠצÊÎÕ."
-#: server/unithand.c:1001
+#: server/unithand.c:1015
#, c-format
msgid "%s can only move into your own zone of control."
msgstr "%s ÍÏÖÕÔØ ÒÕÈÁÔÉÓÑ ÌÉÛÅ Õ Ð¦ÄËÏÎÔÒÏÌØÎ¦Ê ÷ÁÍ ÚÏΦ."
-#: server/unithand.c:1007
+#: server/unithand.c:1021
#, fuzzy, c-format
msgid "Cannot invade unless you break peace with %s first."
msgstr "îÅ ÍÏÖÕ ÁÔÁËÕ×ÁÔÉ ÄÏËÉ ÷É ÎÅ ÐÒÏÇÏÌÏÓÉÔŠצÊÎÕ."
-#: server/unithand.c:1052
+#: server/unithand.c:1066
msgid "This unit has no moves left."
msgstr "ð¦ÄÒÏÚÄ¦Ì ÎÅ ÍÏÖÅ ÒÕÈÁÔÉÓÑ."
-#: server/unithand.c:1107
+#: server/unithand.c:1121
msgid "Unit must be on land to perform diplomatic action."
msgstr "ð¦ÄÒÏÚÄ¦Ì ÍÁ¤ ÂÕÔÉ ÎÁ ÓÕÛ¦ ÁÂÉ ×ÉËÏÎÕ×ÁÔÉ ÄÉÐÌÏÍÁÔÉÞΦ Ħ§."
-#: server/unithand.c:1109
+#: server/unithand.c:1123
msgid "No diplomat action possible."
msgstr "äÉÐÌÏÍÁÔÉÞΦ Ħ§ ÎÅ ÍÏÖÌÉצ."
-#: server/unithand.c:1125
+#: server/unithand.c:1139
#, c-format
msgid "You must declare war on %s first. Try using players dialog (F3)."
msgstr ""
-#: server/unithand.c:1143
+#: server/unithand.c:1157
msgid "This unit is being transported, and so cannot bombard."
msgstr ""
-#: server/unithand.c:1158
+#: server/unithand.c:1172
msgid "You can't attack there."
msgstr "÷É ÎÅ ÍÏÖÅÔÅ ÁÔÁËÕ×ÁÔÉ ÔÕÔ."
-#: server/unithand.c:1180
+#: server/unithand.c:1194
#, fuzzy
msgid "This type of troops cannot take over a city."
msgstr "ìÉÛÅ ÓÕÈÏÐÕÔΦ ЦÄÒÏÚĦÌÉ ÍÏÖÕÔØ ÚÁÈÏÐÉÔÉ Í¦ÓÔÏ."
-#: server/unithand.c:1198
+#: server/unithand.c:1212
msgid "A transported unit is not allied to all units or city on target tile."
msgstr ""
-#: server/unithand.c:1240
+#: server/unithand.c:1254
#, c-format
msgid "Your %s helps build the %s in %s (%d remaining)."
msgstr "÷ÁÛ¦ %s ÄÏÐÏÍÏÇÌÉ ÂÕÄÕ×ÁÔÉ %s Õ %s (ÚÁÌÉÛÉÌÏÓÑ %d)."
-#: server/unithand.c:1242
+#: server/unithand.c:1256
#, c-format
msgid "Your %s helps build the %s in %s (%d surplus)."
msgstr "÷ÁÛ¦ %s ÄÏÐÏÍÏÇÌÉ ÂÕÄÕ×ÁÔÉ %s Õ %s (ÚÁÌÉÛÉÌÏÓÑ %d)."
-#: server/unithand.c:1286
+#: server/unithand.c:1300
#, fuzzy, c-format
msgid ""
"Sorry, your %s cannot establish a trade route because it has no home city"
msgstr "÷ÉÂÁÞÔÅ, ÷ÁÛ %s ÎÅ ÍÏÖÅ ×ÓÔÁÎÏ×ÉÔÉ ÔÕÔ ÔÏÒÇÏ×ÉÊ ÛÌÑÈ!"
-#: server/unithand.c:1296
+#: server/unithand.c:1310
#, fuzzy, c-format
msgid "Sorry, your %s cannot establish a trade route between %s and %s"
msgstr "÷ÉÂÁÞÔÅ, ÷ÁÛ %s ÎÅ ÍÏÖÅ ×ÓÔÁÎÏ×ÉÔÉ ÔÕÔ ÔÏÒÇÏ×ÉÊ ÛÌÑÈ!"
-#: server/unithand.c:1325 server/unithand.c:1344
+#: server/unithand.c:1339 server/unithand.c:1358
#, c-format
msgid "Sorry, your %s cannot establish a trade route here!"
msgstr "÷ÉÂÁÞÔÅ, ÷ÁÛ %s ÎÅ ÍÏÖÅ ×ÓÔÁÎÏ×ÉÔÉ ÔÕÔ ÔÏÒÇÏ×ÉÊ ÛÌÑÈ!"
-#: server/unithand.c:1329 server/unithand.c:1348
+#: server/unithand.c:1343 server/unithand.c:1362
#, fuzzy, c-format
msgid " The city of %s already has %d better trade routes!"
msgstr " í¦ÓÔÏ %s ×ÖÅ ÍÁ¤ %d ÔÏÒÇÏצ ÛÌÑÈÉ!"
-#: server/unithand.c:1361 server/unithand.c:1373
+#: server/unithand.c:1375 server/unithand.c:1387
#, c-format
msgid "Sorry, %s has canceled the trade route from %s to your city %s."
msgstr ""
-#: server/unithand.c:1406
+#: server/unithand.c:1420
#, c-format
msgid ""
"Your %s from %s has arrived in %s, and revenues amount to %d in gold and "
@@ -6846,55 +6939,55 @@ msgid "Teleported your %s to %s."
msgstr "ôÅÌÅÐÏÒÔÏ×ÁÎÏ ÷ÁÛ %s Ú (%d, %d) ÄÏ %s."
#. TRANS: A unit is moved to resolve stack conflicts.
-#: server/unittools.c:1065
+#: server/unittools.c:1070
#, fuzzy, c-format
msgid "Moved your %s."
msgstr "òÏÚÐÕÝÅÎÏ ÷ÁÛ %s Õ (%d, %d)."
-#: server/unittools.c:1076
+#: server/unittools.c:1081
#, fuzzy, c-format
msgid "Disbanded your %s."
msgstr "òÏÚÐÕÝÅÎÏ ÷ÁÛ %s Õ (%d, %d)."
-#: server/unittools.c:1397
+#: server/unittools.c:1402
#, c-format
msgid "Unable to defend %s, %s has lost the game."
msgstr ""
-#: server/unittools.c:1401
+#: server/unittools.c:1406
#, c-format
msgid "Losing %s meant losing the game! Be more careful next time!"
msgstr ""
-#: server/unittools.c:1503
+#: server/unittools.c:1508
#, c-format
msgid "%s escaped the destruction of %s, and fled to %s."
msgstr ""
-#: server/unittools.c:1512
+#: server/unittools.c:1517
#, c-format
msgid "%s lost when %s was lost."
msgstr "÷ÓÔÒÁÞÅÎÏ %s ЦÓÌÑ ×ÔÒÁÔÉ %s."
-#: server/unittools.c:1561
+#: server/unittools.c:1566
#, c-format
msgid "Barbarian leader captured, %d gold ransom paid."
msgstr "çÏÌÏ×Õ ÄÉËÕÎ¦× ÓÈÏÐÌÅÎÏ, %d ÇÒÉ×ÅÎØ ÏÔÒÉÍÁÎÏ."
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unittools.c:1579
+#: server/unittools.c:1584
#, fuzzy, c-format
msgid "Your attacking %s succeeded against the %s %s!"
msgstr "÷ÁÛÁ ÁÔÁËÁ %s ÐÒÏÔÉ %s %s ×ÄÁÌÁÓÑ!"
#. TRANS: "Cannon ... the Polish Destroyer."
-#: server/unittools.c:1588 server/unittools.c:1646
+#: server/unittools.c:1593 server/unittools.c:1651
#, fuzzy, c-format
msgid "%s lost to an attack by the %s %s."
msgstr "%s ×ÔÒÁÞÅÎÏ Õ ÁÔÁæ ÎÁ %s %s."
#. TRANS: "... Cannon ... the Polish Destroyer ...."
-#: server/unittools.c:1622
+#: server/unittools.c:1627
#, fuzzy, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -6905,14 +6998,14 @@ msgstr[2] "
#. TRANS: "Cannon lost when the Polish Destroyer
#. * attacked the German Musketeers."
-#: server/unittools.c:1655
+#: server/unittools.c:1660
#, fuzzy, c-format
msgid "%s lost when the %s %s attacked the %s %s."
msgstr "%s ×ÔÒÁÞÅÎÏ Õ ÁÔÁæ ×¦Ä %s %s."
#. TRANS: "Musketeers (and Cannon) lost to an
#. * attack from the Polish Destroyer."
-#: server/unittools.c:1670
+#: server/unittools.c:1675
#, fuzzy, c-format
msgid "%s (and %s) lost to an attack from the %s %s."
msgstr "%s (%s) ×ÔÒÁÞÅÎÏ Õ ÁÔÁæ ×¦Ä %s %s."
@@ -6920,7 +7013,7 @@ msgstr "%s (%s)
#. TRANS: "Musketeers and 3 other units lost to
#. * an attack from the Polish Destroyer."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1680
+#: server/unittools.c:1685
#, fuzzy, 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."
@@ -6931,7 +7024,7 @@ msgstr[2] "%s (%d)
#. TRANS: "2 units lost when the Polish Destroyer
#. * attacked the German Musketeers."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1694
+#: server/unittools.c:1699
#, fuzzy, 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."
@@ -6939,172 +7032,214 @@ msgstr[0] "%d
msgstr[1] "%d á×ÔÏ-áÔÁËÁ: %s %s ÁÔÁËÕ×Á× %s %s"
msgstr[2] "%d á×ÔÏ-áÔÁËÁ: %s %s ÁÔÁËÕ×Á× %s %s"
-#: server/unittools.c:1962
+#: server/unittools.c:1967
#, c-format
msgid "Your %s was nuked by %s."
msgstr "÷ÁÛ %s ÁÔÁËÏ×ÁÎÏ ÁÔÏÍÎÏÀ ÂÏÍÂÏÀ %s."
-#: server/unittools.c:1965 server/unittools.c:1981
+#: server/unittools.c:1970 server/unittools.c:1986
msgid "yourself"
msgstr "×ÌÁÓÎÏÒÕÞ"
-#: server/unittools.c:1969
+#: server/unittools.c:1974
#, fuzzy, c-format
msgid "The %s %s was nuked."
msgstr "%s %s ÁÔÁËÏ×ÁÎÏ ÁÔÏÍÎÏÀ ÂÏÍÂÏÀ."
-#: server/unittools.c:1978
+#: server/unittools.c:1983
#, c-format
msgid "%s was nuked by %s."
msgstr "%s ÁÔÁËÏ×ÁÎÏ ÁÔÏÍÎÏÀ ÂÏÍÂÏÀ %s."
-#: server/unittools.c:1986
+#: server/unittools.c:1991
#, c-format
msgid "You nuked %s."
msgstr "÷ÁÍÉ ÁÔÁËÏ×ÁÎÏ ÁÔÏÍÎÏÀ ÂÏÍÂÏÀ %s."
-#: server/unittools.c:2027
+#: server/unittools.c:2032
#, fuzzy, c-format
msgid "The %s detonated a nuke!"
msgstr "%s ÁÔÁËÕ×Á× ÁÔÏÍÎÏÀ ÂÏÍÂÏÀ!"
-#: server/unittools.c:2051
+#: server/unittools.c:2056
#, c-format
msgid "%s transported successfully."
msgstr "%s ×ÄÁÌÏ ÔÒÁÎÓÐÏÒÔÏ×ÁÎÏ."
-#: server/unittools.c:2103
+#: server/unittools.c:2108
msgid "This unit type can not be paradropped."
msgstr "ãÅÊ Ð¦ÄÒÏÚÄ¦Ì ÎÅ ÍÏÖÅ ÂÕÔÉ ÐÁÒÁÛÕÔÏ×ÁÎÉÊ."
-#: server/unittools.c:2113
+#: server/unittools.c:2118
#, fuzzy
msgid "You cannot paradrop a unit that is transporting other units."
msgstr "îÅ ÍÏÖÕ ÐÁÒÁÛÕÔÕ×ÁÔÉ × ÏËÅÁÎ."
-#: server/unittools.c:2119
+#: server/unittools.c:2124
msgid "The destination location is not known."
msgstr "òÏÚͦÝÅÎÎÑ ÐÕÎËÔÕ ÐÒÉÚÎÁÞÅÎÎÑ ÎŠצÄÏÍÏ."
-#: server/unittools.c:2126
+#: server/unittools.c:2131
#, fuzzy, c-format
msgid "This unit cannot paradrop into %s."
msgstr "îÅ ÍÏÖÕ ÐÁÒÁÛÕÔÕ×ÁÔÉ × ÏËÅÁÎ."
-#: server/unittools.c:2146
+#: server/unittools.c:2151
#, c-format
msgid "The distance to the target (%i) is greater than the unit's range (%i)."
msgstr "÷¦ÄÓÔÁÎØ ÄÏ Ã¦Ì¦ (%i) ¦ÌØÛÁ Î¦Ö ÄÁÌØΦÓÔØ Ð¦ÄÒÏÚĦÌÕ (%i)."
-#: server/unittools.c:2157
+#: server/unittools.c:2162
#, fuzzy, c-format
msgid "Your %s paradropped into the %s and was lost."
msgstr "÷ÁÛÉÈ %s ÐÁÒÁÛÕÔÏ×ÁÎÏ Õ ÏËÅÁÎ ÔÁ ×ÔÒÁÞÅÎÏ."
-#: server/unittools.c:2170
+#: server/unittools.c:2175
#, c-format
msgid "Your %s was killed by enemy units at the paradrop destination."
msgstr "÷ÁÛÉÈ %s ×ÂÉÔÏ ×ÏÒÏÇÁÍÉ Õ ÔÏÞæ ÐÁÒÁÛÕÔÕ×ÁÎÎÑ."
-#: server/unittools.c:2192
+#: server/unittools.c:2197
#, c-format
msgid "You found %d gold."
msgstr "÷É ÚÎÁÊÛÌÉ %d ÇÒÉ×ÅÎØ."
-#: server/unittools.c:2209
+#: server/unittools.c:2214
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr "÷É ÚÎÁÊÛÌÉ ÚÎÁÎÎÑ ÐÒÏ %s Õ ÚÁÇÁÄËÏ×¦Ê ÓÈÏ×ÁÎæ ÚÎÉËÌϧ ÃÉצ̦ÚÁæ§."
-#: server/unittools.c:2216
+#: server/unittools.c:2221
#, c-format
msgid "The %s have acquired %s from ancient scrolls of wisdom."
msgstr "%s ĦÚÎÁ×ÓÑ ÐÒÏ %s Õ ÚÁÇÁÄËÏ×¦Ê ÓÈÏ×ÁÎæ ÚÎÉËÌϧ ÃÉצ̦ÚÁæ§."
-#: server/unittools.c:2230
+#: server/unittools.c:2235
msgid "A band of friendly mercenaries joins your cause."
msgstr "çÒÕÐÁ ÄÒÕÖÎ¦È ÎÁÊÍÁÎÃ¦× ÐÒɤÄÎÁÌÁÓÑ ÄÏ ÷ÁÓ."
-#: server/unittools.c:2248
+#: server/unittools.c:2253
msgid "An abandoned village is here."
msgstr "ðÕÓÔÉÊ ÈÕÔ¦Ò."
-#: server/unittools.c:2258
+#: server/unittools.c:2263
msgid "You have unleashed a horde of barbarians!"
msgstr "÷É ÚÎÁÊÛÌÉ ÁÒͦÀ ÄÉËÕΦ×!"
-#: server/unittools.c:2261
+#: server/unittools.c:2266
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr "÷ÁÛ ÚÁǦΠ%s ÚÎÉÝÅÎÏ ÄÉËÕÎÉ!"
-#: server/unittools.c:2277
+#: server/unittools.c:2282
msgid "You found a friendly city."
msgstr "÷É ÚÎÁÊÛÌÉ ÄÒÕÖΤ ͦÓÔÏ."
-#: server/unittools.c:2291
+#: server/unittools.c:2296
msgid "Friendly nomads are impressed by you, and join you."
msgstr "äÒÕÖΦ ËÏÞ¦×ÎÉËÉ ÐÒɤÄÎÕÀÔØÓÑ ÄÏ ÷ÁÓ."
-#: server/unittools.c:2316
+#: server/unittools.c:2321
msgid "Your overflight frightens the tribe; they scatter in terror."
msgstr "÷ÁÛ Ì¦ÔÁË ÎÁ×¦× ÖÁÈÕ ÎÁ ÔÕ¦ÌØæ×; ×ÏÎÉ ÒÏÚ¦ÇÌÉÓÑ."
-#: server/unittools.c:2574
+#: server/unittools.c:2579
#, fuzzy, c-format
msgid "Orders for %s aborted after enemy movement was spotted."
msgstr "%s ÐÅÒÅÒ×Á× ÐÅÒÅͦÝÅÎÎÑ Ú ÐÒÉÞÉÎÉ ÎÁÑ×ÎÏÓÔ¦ ЦÄÒÏÚÄ¦Ì¦× ÎÁ ÛÌÑÈÕ."
-#: server/unittools.c:3023
+#: server/unittools.c:3028
#, fuzzy, c-format
msgid "Orders for %s aborted as there are units nearby."
msgstr "%s ÐÅÒÅÒ×Á× ÐÅÒÅͦÝÅÎÎÑ Ú ÐÒÉÞÉÎÉ ÎÁÑ×ÎÏÓÔ¦ ЦÄÒÏÚÄ¦Ì¦× ÎÁ ÛÌÑÈÕ."
-#: server/unittools.c:3075
+#: server/unittools.c:3080
#, fuzzy, c-format
msgid "Orders for %s aborted because building of city failed."
msgstr "%s ÐÅÒÅÒ×Á× ÐÅÒÅͦÝÅÎÎÑ Ú ÐÒÉÞÉÎÉ ÎÁÑ×ÎÏÓÔ¦ ЦÄÒÏÚÄ¦Ì¦× ÎÁ ÛÌÑÈÕ."
-#: server/unittools.c:3088
+#: server/unittools.c:3093
#, c-format
msgid "Orders for %s aborted since they give an invalid activity."
msgstr ""
-#: server/unittools.c:3102
+#: server/unittools.c:3107
#, c-format
msgid "Orders for %s aborted since they give an invalid location."
msgstr ""
-#: server/unittools.c:3112
+#: server/unittools.c:3117
#, fuzzy, c-format
msgid "Orders for %s aborted as there are units in the way."
msgstr "%s ÐÅÒÅÒ×Á× ÐÅÒÅͦÝÅÎÎÑ Ú ÐÒÉÞÉÎÉ ÎÁÑ×ÎÏÓÔ¦ ЦÄÒÏÚÄ¦Ì¦× ÎÁ ÛÌÑÈÕ."
-#: server/unittools.c:3138
+#: server/unittools.c:3143
#, c-format
msgid "Orders for %s aborted because of failed move."
msgstr ""
-#: server/unittools.c:3179
+#: server/unittools.c:3184
#, fuzzy, c-format
msgid "Attempt to change homecity for %s failed."
msgstr "úͦÎÅÎÏ ÄÏͦ×ËÕ ÄÌÑ %s Õ %s."
-#: server/unittools.c:3190
+#: server/unittools.c:3195
#, fuzzy, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr "* íÏÖÕÔØ ×ÓÔÁÎÏ×ÌÀ×ÁÔÉ ÔÏÒÇÏצ ÛÌÑÈÉ.\n"
-#: server/unittools.c:3202
+#: server/unittools.c:3207
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr ""
-#: server/unittools.c:3211
+#: server/unittools.c:3216
#, fuzzy, c-format
msgid "Your %s has invalid orders."
msgstr "÷ÁÛ Ð¦ÄÒÏÚÄ¦Ì %s ÐÏ×ÅÒÎÕ×ÓÑ ÄÌÑ ÚÁÐÒÁ×ËÉ."
+#: server/voting.c:522
+#, c-format
+msgid ""
+"%s %d \"%s\" is passed %d to %d with %d abstentions and %d who did not vote."
+msgstr ""
+
+#: server/voting.c:528
+#, c-format
+msgid ""
+"%s %d \"%s\" failed with %d against, %d for, %d abstentions and %d who did "
+"not vote."
+msgstr ""
+
+#: server/voting.c:548
+#, fuzzy, c-format
+msgid "%s %d: %s voted yes."
+msgstr "%s ×ÔÒÁÔÉ× %s Õ %s"
+
+#: server/voting.c:553
+#, c-format
+msgid "%s %d: %s voted no."
+msgstr ""
+
+#: server/voting.c:558
+#, c-format
+msgid "%s %d: %s chose to abstain."
+msgstr ""
+
+#. TRANS: Describing a new vote that can only pass
+#. * if there are no dissenting votes.
+#: server/voting.c:726
+#, c-format
+msgid "%s (needs %0.0f%% and no dissent)."
+msgstr ""
+
+#. TRANS: Describing a new vote that can pass only if the
+#. * given percentage of players votes 'yes'.
+#: server/voting.c:732
+#, c-format
+msgid "%s (needs %0.0f%% in favor)."
+msgstr ""
+
#: server/generator/mapgen.c:1771
msgid "High landmass - this may take a few seconds."
msgstr "âÁÇÁÔÏ ÚÅÍ̦ - ÃÅ ÚÁÊÍÅ ÄÅ˦ÌØËÁ ÓÅËÕÎÄ."
@@ -7132,12 +7267,12 @@ msgid ""
"Please report this bug at %s."
msgstr ""
-#: client/attribute.c:363
+#: client/attribute.c:368
msgid ""
"There has been a CMA error. Your citizen governor settings may be broken."
msgstr ""
-#: client/attribute.c:367
+#: client/attribute.c:372
msgid "Old attributes detected and removed."
msgstr ""
@@ -7289,41 +7424,41 @@ msgstr "%s - %s
msgid "%+4d : Taxed from trade\n"
msgstr ""
-#: client/citydlg_common.c:418
+#: client/citydlg_common.c:421
#, fuzzy, c-format
msgid "%+4d : Trade route with %s\n"
msgstr "ôÏÒÇÏ×ÉÈ ÛÌÑÈ¦× ÎÅ ¦ÓÎÕ¤.\n"
-#: client/citydlg_common.c:427
+#: client/citydlg_common.c:430
#, fuzzy, c-format
msgid "%+4d : Building tithes\n"
msgstr "âÕÄÕÀÔØ Ð¦ÄÒÏÚĦÌÉ"
-#: client/citydlg_common.c:450
+#: client/citydlg_common.c:453
#, c-format
msgid "%+4d : Bonus from %s (%+d%%)\n"
msgstr ""
-#: client/citydlg_common.c:462
+#: client/citydlg_common.c:465
#, c-format
msgid "%+4d : Waste\n"
msgstr ""
-#: client/citydlg_common.c:468
+#: client/citydlg_common.c:471
#, c-format
msgid "%+4d : Disorder\n"
msgstr ""
-#: client/citydlg_common.c:474
+#: client/citydlg_common.c:477
#, c-format
msgid "%+4d : Used\n"
msgstr ""
-#: client/citydlg_common.c:479
+#: client/citydlg_common.c:482
msgid "==== : Adds up to\n"
msgstr ""
-#: client/citydlg_common.c:481
+#: client/citydlg_common.c:484
#, c-format
msgid "%4d : Total surplus"
msgstr ""
@@ -7646,53 +7781,53 @@ msgstr "
msgid "Specialists"
msgstr "óÐÅæÁÌØÎÅ"
-#: client/civclient.c:240
+#: client/civclient.c:241
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr " -a, --autoconnect\tðÒÏÐÕÓÔÉÔÉ Ä¦ÁÌÏÇ Ú'¤ÄÎÁÎÎÑ\n"
-#: client/civclient.c:250
+#: client/civclient.c:251
#, fuzzy
msgid " -l, --log FILE\tUse FILE as logfile (spawned server also uses this)\n"
msgstr " -l, --log æáêì\t÷ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ æáêì ÑË ÖÕÒÎÁÌ\n"
-#: client/civclient.c:252
+#: client/civclient.c:253
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr " -m, --meta áäòåóá\tðÒɤÄÎÁÔÉÓÑ ÄÏ ÍÅÔÁÓÅÒ×ÅÒÁ ÎÁ áäòåóá\n"
-#: client/civclient.c:254
+#: client/civclient.c:255
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr " -n, --name ¶í'ñ\t÷ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ¶í'ñ ÑË ¦Í'Ñ\n"
-#: client/civclient.c:256
+#: client/civclient.c:257
#, fuzzy
msgid " -p, --port PORT\tConnect to server port PORT (usually with -a)\n"
msgstr " -p, --port ðïòô\tðÒɤÄÎÁÔÉÓÑ ÄÏ ÓÅÒ×ÅÒÁ ÎÁ ÐÏÒÔÕ ðïòô\n"
-#: client/civclient.c:258
+#: client/civclient.c:259
#, c-format
msgid " -P, --Plugin PLUGIN\tUse PLUGIN for sound output %s\n"
msgstr " -P, --Plugin äïäáôïë\t÷ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ äïäáôïë ÄÌÑ ×É×ÏÄÕ Ú×ÕËÕ %s\n"
-#: client/civclient.c:260
+#: client/civclient.c:261
#, fuzzy
msgid " -r, --read FILE\tRead startup script FILE (for spawned server only)\n"
msgstr " -r, --read æáêì\tþÉÔÁÔÉ æáêì ÓÔÁÒÔÏ×ÏÇÏ ÓËÒÉÐÔÁ\n"
-#: client/civclient.c:263
+#: client/civclient.c:264
#, fuzzy
msgid " -s, --server HOST\tConnect to the server at HOST (usually with -a)\n"
msgstr " -s, --server áäòåóá\tðÒɤÄÎÁÔÉÓÑ ÄÏ ÓÅÒ×ÅÒÁ ÎÁ áäòåóá\n"
-#: client/civclient.c:265
+#: client/civclient.c:266
msgid " -S, --Sound FILE\tRead sound tags from FILE\n"
msgstr " -S, --Sound æáêì\tþÉÔÁÔÉ Ú×ÕË Ú ÆÁÊÌÕ æáêì\n"
-#: client/civclient.c:266
+#: client/civclient.c:267
msgid " -t, --tiles FILE\tUse data file FILE.tilespec for tiles\n"
msgstr ""
" -t, --tiles æáêì\t÷ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ÄÁÎΦ Ú ÆÁÊÌÕ æáêì.tilespec ÄÌÑ ÆÏΦ×\n"
-#: client/civclient.c:269
+#: client/civclient.c:270
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7702,45 +7837,45 @@ msgstr ""
"\t\t\tóÐÒÏÂÕÊÔÅ \"%s -- --help\" ÄÌÑ ÄÏÐÏÍÏÇÉ.\n"
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:274
+#: client/civclient.c:275
#, fuzzy, c-format
msgid "Report bugs at %s\n"
msgstr "ðÒÏ ÐÏÍÉÌËÉ ÐÏצÄÏÍÌÑÊÔÅ <%s>.\n"
-#: client/civclient.c:298
+#: client/civclient.c:299
#, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr ""
-#: client/civclient.c:300 client/civclient.c:315
+#: client/civclient.c:301 client/civclient.c:316
msgid "Try using --help.\n"
msgstr ""
-#: client/civclient.c:313
+#: client/civclient.c:314
#, c-format
msgid "Invalid debug level \"%s\" specified with --debug option.\n"
msgstr ""
-#: client/civclient.c:326
+#: client/civclient.c:327
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr "îÅצÄÏÍÁ ÏÐæÑ: '%s'\n"
-#: client/civclient.c:391
+#: client/civclient.c:393
#, fuzzy, c-format
msgid "Updating old metaserver address \"%s\"."
msgstr "metaserver <ÁÄÒÅÓÁ>"
-#: client/civclient.c:394
+#: client/civclient.c:396
#, fuzzy, c-format
msgid "Default metaserver has been set to \"%s\"."
msgstr "ïÐæÑ: %s ×ÓÔÁÎÏ×ÌÅÎÁ Õ \"%s\"."
-#: client/civclient.c:550
+#: client/civclient.c:540
msgid "Game started."
msgstr "çÒÕ ÓÔÁÒÔÏ×ÁÎÏ."
-#: client/civclient.c:588
+#: client/civclient.c:606
msgid "There was an error while auto connecting; aborting."
msgstr "ðÏÍÉÌËÁ ÓÔÁÌÁÓØ ÐÒÉ ÓÐÒϦ Á×ÔÏËÏÎÅËÔÕ; ÐÅÒÅÒÉ×ÁÀÓÑ."
@@ -7874,16 +8009,16 @@ msgstr "
msgid "Disconnected from server."
msgstr "òÏÚ'¤ÄÎÁÎÎÑ Ú ÓÅÒ×ÅÒÏÍ."
-#: client/clinet.c:469
+#: client/clinet.c:473
#, c-format
msgid "Failed to contact server \"%s\" at port %d as \"%s\" after %d attempts"
msgstr "ðÏÍÉÌËÁ ÄÏÓÔÕÐÕ ÄÏ ÓÅÒ×ÅÒÁ \"%s\" ÎÁ ÐÏÒÔÕ %d ÑË \"%s\" ЦÓÌÑ %d ÓÐÒÏÂ"
-#: client/clinet.c:484 client/clinet.c:486
+#: client/clinet.c:488 client/clinet.c:490
msgid "Connection to server refused. Please start the server."
msgstr "ú'¤ÄÎÁÎÎÑ Ú ÓÅÒ×ÅÒÏÍ ×¦ÄÈÉÌÅÎÏ. âÕÄØ ÌÁÓËÁ ÓÔÁÒÔÕÊÔÅ ÓÅÒ×ÅÒ."
-#: client/clinet.c:495 client/clinet.c:523
+#: client/clinet.c:499 client/clinet.c:527
#, c-format
msgid ""
"Error contacting server \"%s\" at port %d as \"%s\":\n"
@@ -7892,7 +8027,7 @@ msgstr ""
"ðÏÍÉÌËÁ ÄÏÓÔÕÐÕ ÄÏ ÓÅÒ×ÅÒÁ \"%s\" ÎÁ ÐÏÒÔÕ %d ÑË \"%s\":\n"
" %s\n"
-#: client/clinet.c:514
+#: client/clinet.c:518
#, fuzzy, c-format
msgid ""
"Auto-connecting to server \"%s\" at port %d as \"%s\" every %f second(s) for "
@@ -7901,58 +8036,58 @@ msgstr ""
"á×ÔÏÍÁÔÉÞÎÏ Ú'¤ÄÎÕ×ÁÔÉÓØ Ú ÓÅÒ×ÅÒÏÍ \"%s\" ÎÁ ÐÏÒÔÕ %d ÑË \"%s\" ËÏÖΦ %d.%d "
"ÓÅËÕÎÄ ÎÁÐÒÏÔÑÚ¦ %d ÒÁÚ¦×"
-#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
+#: client/connectdlg_common.c:78 client/gui-gtk-2.0/pages.c:1358
#, fuzzy
msgid "novice"
msgstr "ÎÅÍÁ¤"
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1358
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
msgid "easy"
msgstr "ÌÅÇËÁ"
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1359
#, fuzzy
msgid "normal"
msgstr "îÅÐÏÇÁÎÁ"
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr "×ÁÖËÁ"
-#: client/connectdlg_common.c:83
+#: client/connectdlg_common.c:82
msgid "experimental"
msgstr ""
-#: client/connectdlg_common.c:213
+#: client/connectdlg_common.c:212
#, fuzzy
msgid "Starting server..."
msgstr "óÔÁÒÔÕÀ ÇÒÕ."
-#: client/connectdlg_common.c:332
+#: client/connectdlg_common.c:331
#, fuzzy
msgid "Couldn't start the server."
msgstr "÷É ÎÅ ÍÏÖÅÔÅ ÁÔÁËÕ×ÁÔÉ ÔÕÔ."
-#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
+#: client/connectdlg_common.c:332 client/connectdlg_common.c:365
msgid "You'll have to start one manually. Sorry..."
msgstr ""
-#: client/connectdlg_common.c:364
+#: client/connectdlg_common.c:363
#, fuzzy
msgid "Couldn't connect to the server."
msgstr "òÏÚ¦Ò×ÁÔÉ Ú'¤ÄÎÁÎÎÑ Ë̦¤ÎÔÁ ÄÏ ÓÅÒ×ÅÒÁ."
-#: client/connectdlg_common.c:365
+#: client/connectdlg_common.c:364
msgid "We probably couldn't start it from here."
msgstr ""
-#: client/connectdlg_common.c:470
+#: client/connectdlg_common.c:469
#, fuzzy
msgid ""
"Established control over the server. You have command access level 'hack'."
msgstr "÷É×ÏÄÉÔØ ÁÂÏ ×ÓÔÁÎÏ×ÌÀ¤ Ò¦×ÅÎØ ÄÏÓÔÕÐÕ ÄÏ ËÏÍÁÎÄ."
-#: client/connectdlg_common.c:475
+#: client/connectdlg_common.c:474
msgid ""
"Failed to obtain the required access level to take control of the server. "
"The server will now be shutdown."
@@ -7962,30 +8097,30 @@ msgstr ""
msgid "Only transporter units can be unloaded."
msgstr "ìÉÛÅ ÔÒÁÎÓÐÏÒÔÏ×ÁΦ ЦÄÒÏÚĦÌÉ ÍÏÖÕÔØ ÂÕÔÉ ×É×ÁÎÔÁÖÅΦ."
-#: client/control.c:1425
+#: client/control.c:1417
#, fuzzy
msgid "Only settler units can be put into auto mode."
msgstr ""
"çÒÁ ÌÉÛÅ ëÏÌÏΦÓÔÉ ÔÁ צÊÓØËÏצ ÚÁÇÏÎÉ Õ Í¦ÓÔÁÈ ÍÏÖÕÔØ ÂÕÔÉ ÐÏÓÔÁ×ÌÅΦ Õ "
"Á×ÔÏÒÅÖÉÍ."
-#: client/control.c:1516
+#: client/control.c:1511
msgid "Only nuclear units can do this."
msgstr "ìÉÛÅ ÁÔÏÍΦ ÐÁÄÒÏÚĦÌÉ ÍÏÖÕÔØ ÚÒÏÂÉÔÉ ÃÅ."
-#: client/control.c:1545
+#: client/control.c:1540
msgid "Only paratrooper units can do this."
msgstr "ìÉÛÅ ÐÁÒÁÛÕÔ¦ÓÔÉ ÍÏÖÕÔØ ÒÏÂÉÔÉ ÃÅ."
-#: client/control.c:2020
+#: client/control.c:2015
msgid "Too far for this unit."
msgstr "úÁÄÁÌÅËÏ ÄÌÑ ÃØÏÇÏ Ð¦ÄÒÏÚĦÌÕ."
-#: client/control.c:2230 client/control.c:2260 client/control.c:2276
+#: client/control.c:2225 client/control.c:2255 client/control.c:2271
msgid "Didn't find a route to the destination!"
msgstr "îÅ ÚÎÁÊÄÅÎÏ ÛÌÑÈÕ ÄÏ Ã¦Ì¦!"
-#: client/control.c:2320
+#: client/control.c:2315
msgid "Oh my! You seem to have no capital!"
msgstr "ïÊ ×¤Ê! úÄÁ¤ÔØÓÑ Õ ÷ÁÓ ÎÅ ÍÁ¤ ÓÔÏÌÉæ!"
@@ -8395,28 +8530,36 @@ msgstr ""
#. * last two elements
#. TRANS: List of possible output types has this between
#. * last two elements
-#: client/helpdata.c:1066 client/helpdata.c:1400
+#: client/helpdata.c:1066 client/helpdata.c:1408
msgid " or "
msgstr " ÁÂÏ "
-#: client/helpdata.c:1068 client/helpdata.c:1388
+#: client/helpdata.c:1068 client/helpdata.c:1396
msgid "?or:, "
msgstr "?ÁÂÏ:, "
-#: client/helpdata.c:1080
-#, 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"
+#: client/helpdata.c:1079
+#, fuzzy, c-format
+msgid "* Unit has to be in a city, or a base after %d turn.\n"
+msgid_plural "* Unit has to be in a city, or a base after %d turns.\n"
+msgstr[0] "* ð¦ÄÒÏÚÄ¦Ì ÍÁ¤ ÂÕÔÉ Õ Í¦ÓÔ¦ ÁÂÏ ÎÁ ЦÄÒÏÚĦ̦ %s ЦÓÌÑ %d ÈÏÄÕ.\n"
+msgstr[1] "* ð¦ÄÒÏÚÄ¦Ì ÍÁ¤ ÂÕÔÉ Õ Í¦ÓÔ¦ ÁÂÏ ÎÁ ЦÄÒÏÚĦ̦ %s ЦÓÌÑ %d ÈÏĦ×.\n"
+msgstr[2] "* ð¦ÄÒÏÚÄ¦Ì ÍÁ¤ ÂÕÔÉ Õ Í¦ÓÔ¦ ÁÂÏ ÎÁ ЦÄÒÏÚĦ̦ %s ЦÓÌÑ %d ÈÏĦ×.\n"
+
+#: client/helpdata.c:1087
+#, fuzzy, c-format
+msgid "* Unit has to be in a city, a base, or on a %s after %d turn.\n"
+msgid_plural "* Unit has to be in a city, a base, or on a %s after %d turns.\n"
msgstr[0] "* ð¦ÄÒÏÚÄ¦Ì ÍÁ¤ ÂÕÔÉ Õ Í¦ÓÔ¦ ÁÂÏ ÎÁ ЦÄÒÏÚĦ̦ %s ЦÓÌÑ %d ÈÏÄÕ.\n"
msgstr[1] "* ð¦ÄÒÏÚÄ¦Ì ÍÁ¤ ÂÕÔÉ Õ Í¦ÓÔ¦ ÁÂÏ ÎÁ ЦÄÒÏÚĦ̦ %s ЦÓÌÑ %d ÈÏĦ×.\n"
msgstr[2] "* ð¦ÄÒÏÚÄ¦Ì ÍÁ¤ ÂÕÔÉ Õ Í¦ÓÔ¦ ÁÂÏ ÎÁ ЦÄÒÏÚĦ̦ %s ЦÓÌÑ %d ÈÏĦ×.\n"
-#: client/helpdata.c:1122
+#: client/helpdata.c:1130
#, c-format
msgid "If we would now start with %s we would need %d bulbs."
msgstr "ñËÝÏ ÒÏÚÐÏÞÎÅÍÏ Ú %s ÔÏ ÂÕÄÅÍÏ ÐÏÔÒÅÂÕ×ÁÔÉ %d ÂÁ̦×."
-#: client/helpdata.c:1127
+#: client/helpdata.c:1135
#, c-format
msgid ""
"To reach %s we need to obtain %d other technologies first. The whole project "
@@ -8425,90 +8568,90 @@ msgstr ""
"áÂÉ ÄÏÓ̦ÄÉÔÉ %s ÎÁÍ ÓÐÅÒÛÕ ÐÏÔÒ¦ÂÎÏ ÏÔÒÉÍÁÔÉ %d ¦ÎÛÉÈ ÔÅÈÎÏÌÏǦÊ. ÷æÌÏÍÕ "
"ÎÁÍ ÚÎÁÄÏÂÉÔØÓÑ %d ÂÁÌ¦× ÄÌÑ ÚÁ×ÅÒÛÅÎÎÑ."
-#: client/helpdata.c:1135
+#: client/helpdata.c:1143
msgid "You cannot research this technology."
msgstr ""
-#: client/helpdata.c:1139
+#: client/helpdata.c:1147
msgid " This number may vary depending on what other players will research.\n"
msgstr " ãÅ ÞÉÓÌÏ ÂÁÇÁÔÏ × ÞÏÍÕ ÚÁÌÅÖÉÔØ ×¦Ä ÔÏÇÏ, ÝÏ ×¦ÄËÒÉÀÔØ ¦ÎÛ¦ ÇÒÁ×æ.\n"
-#: client/helpdata.c:1151
+#: client/helpdata.c:1159
#, fuzzy, c-format
msgid "* The first player to research %s gets an immediate advance.\n"
msgstr "ðÅÒÛÉÊ ÇÒÁ×ÅÃØ ÝÏ ÄÏÓ̦ÄÉÔØ %s ÏÔÒÉÍÕ¤ ÎÅÇÁÊÎÅ ÚÎÁÎÎÑ.\n"
-#: client/helpdata.c:1156
+#: client/helpdata.c:1164
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
msgstr ""
-#: client/helpdata.c:1159
+#: client/helpdata.c:1167
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
msgstr ""
-#: client/helpdata.c:1163
+#: client/helpdata.c:1171
#, fuzzy
msgid "* Increases the pollution generated by the population.\n"
msgstr "ð¦Ä×ÉÝÕ¤ ÚÁÂÒÕÄÎÅÎÎÑ ÝÏ ÓÐÒÉÞÉÎÅÎÏ ÎÁÓÅÌÅÎÎÑÍ.\n"
-#: client/helpdata.c:1168
+#: client/helpdata.c:1176
#, fuzzy, c-format
msgid "* Allows %s to build roads on river squares.\n"
msgstr "%s - ÄÏÚ×ÏÌѤ ÂÕÄÕ×ÁÔÉ ÛÌÑÈÉ ÞÅÒÅÚ Ò¦ËÉ.\n"
-#: client/helpdata.c:1175
+#: client/helpdata.c:1183
#, fuzzy, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr "äÏÚ×ÏÌѤ %s ÂÕÄÕ×ÁÔÉ ÕËÒ¦ÐÌÅÎÎÑ.\n"
-#: client/helpdata.c:1183
+#: client/helpdata.c:1191
#, fuzzy, c-format
msgid "* Allows %s to build airbases.\n"
msgstr "äÏÚ×ÏÌѤ %s ÂÕÄÕ×ÁÔÉ ÁצÁÂÁÚÉ.\n"
-#: client/helpdata.c:1192
+#: client/helpdata.c:1200
#, fuzzy, c-format
msgid "* Allows %s to upgrade roads to railroads.\n"
msgstr "äÏÚ×ÏÌѤ %s ÍÏÄÅÒΦÚÕ×ÁÔÉ ûÌÑÈÉ ÄÏ úÁ̦ÚÎÉÃØ.\n"
-#: client/helpdata.c:1200
+#: client/helpdata.c:1208
#, fuzzy, c-format
msgid "* Allows %s to upgrade irrigation to farmland.\n"
msgstr "äÏÚ×ÏÌѤ %s ÐÅÒÅÔ×ÏÒÀ×ÁÔÉ ÚÒÏÛÅÎÎÑ ÎÁ ÆÅÒÍÉ.\n"
-#: client/helpdata.c:1234
+#: client/helpdata.c:1242
msgid "* Pollution cannot be generated on this terrain."
msgstr ""
-#: client/helpdata.c:1239
+#: client/helpdata.c:1247
#, fuzzy
msgid "* You cannot build cities on this terrain."
msgstr "÷É ÎÅ ÍÏÖÅÔÅ ÐÅÒÅÔÑÇÎÕÔÉ ÎÁ Ó×¦Ê Â¦Ë Ð¦ÄÒÏÚÄ¦Ì Ã¦¤§ ÎÁæ§."
-#: client/helpdata.c:1245
+#: client/helpdata.c:1253
msgid "* The coastline of this terrain is unsafe."
msgstr ""
-#: client/helpdata.c:1250
+#: client/helpdata.c:1258
msgid "* This terrain is unsafe for units to travel on."
msgstr ""
-#: client/helpdata.c:1255
+#: client/helpdata.c:1263
msgid "* Land units cannot travel on oceanic terrains."
msgstr ""
-#: client/helpdata.c:1305
+#: client/helpdata.c:1313
msgid "Features:\n"
msgstr ""
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1411 client/helpdata.c:1412
+#: client/helpdata.c:1419 client/helpdata.c:1420
msgid "?outputlist: Nothing "
msgstr ""
-#: client/helpdata.c:1419
+#: client/helpdata.c:1427
#, fuzzy, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -8520,7 +8663,7 @@ msgstr[0] "
msgstr[1] "÷¦ÊÓØËÏצ ЦÄÒÏÚĦÌÉ Õ ÐÏ̦ ÍÏÖÕÔØ ÓÐÒÉÞÉÎÉÔÉ ÎÅÝÁÓÔÑ."
msgstr[2] "÷¦ÊÓØËÏצ ЦÄÒÏÚĦÌÉ Õ ÐÏ̦ ÍÏÖÕÔØ ÓÐÒÉÞÉÎÉÔÉ ÎÅÝÁÓÔÑ."
-#: client/helpdata.c:1429
+#: client/helpdata.c:1437
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8528,48 +8671,48 @@ msgid ""
msgstr ""
#. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1437
+#: client/helpdata.c:1445
#, c-format
msgid "* You pay %d times normal %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1442
+#: client/helpdata.c:1450
#, 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:1447
+#: client/helpdata.c:1455
#, c-format
msgid "* You pay no %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1451
+#: client/helpdata.c:1459
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:1460
+#: client/helpdata.c:1468
#, 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:1468
+#: client/helpdata.c:1476
#, c-format
msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
msgstr ""
-#: client/helpdata.c:1475
+#: client/helpdata.c:1483
#, 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:1482
+#: client/helpdata.c:1490
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -8577,23 +8720,23 @@ msgid ""
msgstr ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1489
+#: client/helpdata.c:1497
#, 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:1497
+#: client/helpdata.c:1505
#, c-format
msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
msgstr ""
-#: client/helpdata.c:1502
+#: client/helpdata.c:1510
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr ""
-#: client/helpdata.c:1507
+#: client/helpdata.c:1515
#, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -8605,7 +8748,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: client/helpdata.c:1519
+#: client/helpdata.c:1527
#, 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"
@@ -8614,64 +8757,64 @@ msgstr[1] ""
msgstr[2] ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1530
+#: client/helpdata.c:1538
#, 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:1536
+#: client/helpdata.c:1544
#, fuzzy
msgid "* Your units cannot be bribed.\n"
msgstr "ãÅÊ Ð¦ÄÒÏÚÄ¦Ì ÎÅ ÍÏÖÅ ÂÕÔÉ ÐÁÒÁÛÕÔÏ×ÁÎÉÊ."
-#: client/helpdata.c:1539
+#: client/helpdata.c:1547
#, fuzzy
msgid "* Your cities cannot be incited.\n"
msgstr "í¦ÓÔÏ ÎÅ ÍÏÖÅ ÂÕÔÉ Ð¦ÄÂÕÒÅÎÏ!"
-#: client/helpdata.c:1543
+#: client/helpdata.c:1551
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:1549
+#: client/helpdata.c:1557
msgid "* Has a senate that may prevent declaration of war.\n"
msgstr ""
-#: client/helpdata.c:1553
+#: client/helpdata.c:1561
msgid "* Allows partisans when cities are taken by the enemy.\n"
msgstr ""
-#: client/helpdata.c:1557
+#: client/helpdata.c:1565
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
msgstr ""
-#: client/helpdata.c:1561
+#: client/helpdata.c:1569
msgid "* Pays no upkeep for fanatics.\n"
msgstr ""
-#: client/helpdata.c:1564
+#: client/helpdata.c:1572
#, fuzzy
msgid "* Has no unhappy citizens.\n"
msgstr "%d ÄÏÄÁÔËÏ×ÉÈ ÎÅÝÁÓÎÉÈ ÇÏÒÏÄÑÎ."
-#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
+#: client/helpdata.c:1582 client/helpdata.c:1586 client/helpdata.c:1590
#, c-format
msgid "* Veteran %s units.\n"
msgstr ""
-#: client/helpdata.c:1585
+#: client/helpdata.c:1593
#, fuzzy
msgid "* Veteran units.\n"
msgstr "íÏÒÓØ˦ ЦÄÒÏÚĦÌÉ"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1591
+#: client/helpdata.c:1599
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8679,7 +8822,7 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1600
+#: client/helpdata.c:1608
#, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8687,71 +8830,71 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1608
+#: client/helpdata.c:1616
#, 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:1617
+#: client/helpdata.c:1625
#, c-format
msgid "* %s production is increased %d%%.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1625
+#: client/helpdata.c:1633
#, c-format
msgid "* %s production will suffer massive waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1630
+#: client/helpdata.c:1638
#, c-format
msgid "* %s production will suffer some waste.\n"
msgstr ""
#. TRANS: %s is list of output types, with 'and'
-#: client/helpdata.c:1635
+#: client/helpdata.c:1643
#, 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:1643
+#: client/helpdata.c:1651
#, 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:1649
+#: client/helpdata.c:1657
#, 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:1655
+#: client/helpdata.c:1663
#, c-format
msgid "* %s waste will increase slowly with distance from capital.\n"
msgstr ""
-#: client/helpdata.c:1672
+#: client/helpdata.c:1680
#, fuzzy, c-format
msgid "* Allows you to build %s.\n"
msgstr "äÏÚ×ÏÌѤ %s ÂÕÄÕ×ÁÔÉ ÁצÁÂÁÚÉ.\n"
#. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1699
+#: client/helpdata.c:1707
#, fuzzy, c-format
msgid "%s%d %s"
msgstr "%3d/%3d %s"
-#: client/helpdata.c:1700 client/helpdata.c:1708 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1708 client/helpdata.c:1716 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:1707
+#: client/helpdata.c:1715
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d ÎÅÝÁÓÌÉצ"
@@ -8826,7 +8969,7 @@ msgid ""
"or with the -a command-line parameter."
msgstr ""
-#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:916 data/Freeciv.in:107
msgid "Metaserver"
msgstr "íÅÔÁÓÅÒ×ÅÒÉ"
@@ -9194,36 +9337,36 @@ msgstr "
msgid "Saved settings to file %s"
msgstr "úÂÅÒÅÖÅÎÏ ÏÐæ§ Õ ÆÁÊÌ %s"
-#: client/packhand.c:211 client/packhand.c:217
+#: client/packhand.c:212 client/packhand.c:218
#, fuzzy
msgid "You were rejected from the game...."
msgstr "÷ÁÍ ×¦ÄÍÏ×ÌÅÎÏ Õ ÇÒ¦:"
-#: client/packhand.c:229
+#: client/packhand.c:230
#, c-format
msgid "Client capability string: %s"
msgstr "óÔÒÏËÁ ÓÕͦÓÎÏÓÔ¦ Ë̦¤ÎÔÁ: %s"
-#: client/packhand.c:232
+#: client/packhand.c:233
#, c-format
msgid "Server capability string: %s"
msgstr "óÔÒÏËÁ ÓÕͦÓÎÏÓÔ¦ ÓÅÒ×ÅÒÁ: %s"
-#: client/packhand.c:850
+#: client/packhand.c:864
#, c-format
msgid "Start of turn %d"
msgstr "ðÏÞÁÔÏË ÈÏÄÕ %d"
-#: client/packhand.c:1591
+#: client/packhand.c:1621
#, c-format
msgid "AI Mode is now %s."
msgstr "ëÏÍÐ'ÀÔÅÒΦ ÇÒÁ×æ ÔÅÐÅÒ %s."
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "ON"
msgstr "ôáë"
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "OFF"
msgstr "î¶"
@@ -9257,15 +9400,15 @@ msgstr "?ͦ
msgid "Username"
msgstr "ðÅÒÅÊÍÅÎÕ×ÁÔÉ"
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
-#: client/gui-gtk-2.0/pages.c:2157
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:653
+#: client/gui-gtk-2.0/pages.c:1604 client/gui-gtk-2.0/pages.c:2159
msgid "Flag"
msgstr "æÌÁÇ"
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1605
-#: client/gui-gtk-2.0/pages.c:2159 client/gui-sdl/repodlgs.c:2063
-#: client/gui-win32/connectdlg.c:990 client/gui-win32/dialogs.c:542
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:657
+#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1609
+#: client/gui-gtk-2.0/pages.c:2161 client/gui-sdl/repodlgs.c:2063
+#: client/gui-win32/connectdlg.c:992 client/gui-win32/dialogs.c:542
#: client/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "îÁæÑ"
@@ -9280,7 +9423,7 @@ msgstr "
msgid "Score"
msgstr "ïÔÒÉÍÁÔÉ ÒÁÈÕÎËÉ"
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1614
msgid "Team"
msgstr "ëÏÍÁÎÄÁ"
@@ -9315,37 +9458,37 @@ msgstr ""
msgid "Ping"
msgstr "ð¦ÎÇ"
-#: client/repodlgs_common.c:375
+#: client/repodlgs_common.c:378
#, fuzzy
msgid "You cannot sell improvements."
msgstr "óÁÂÏÔÕ×ÁÔÉ ÂÕĦ×ÌÀ"
-#: client/repodlgs_common.c:391
+#: client/repodlgs_common.c:394
#, fuzzy, c-format
msgid "Sold %d %s for %d gold."
msgstr "ðÒÏÄÁÎÏ %d %s ÚÁ %d ÇÒÉ×ÅÎØ"
-#: client/repodlgs_common.c:396
+#: client/repodlgs_common.c:399
#, fuzzy, c-format
msgid "No %s could be sold."
msgstr "îÅÍÁ¤ %s ÄÌÑ ÐÒÏÄÁÖÕ"
#. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:415
+#: client/repodlgs_common.c:418
msgid "You cannot disband units."
msgstr ""
-#: client/repodlgs_common.c:420
+#: client/repodlgs_common.c:423
#, fuzzy, c-format
msgid "%s cannot be disbanded."
msgstr "%s ÎÅ ÍÏÖÅ ÕÔÒÉÍÕ×ÁÔÉ %s, ЦÄÒÏÚÄ¦Ì ÒÁÚÆÏÒÍÏ×ÁÎÏ."
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:444
#, fuzzy, c-format
msgid "Disbanded %d %s."
msgstr "òÏÚÐÕÝÅÎÏ ÷ÁÛ %s Õ (%d, %d)."
-#: client/repodlgs_common.c:445
+#: client/repodlgs_common.c:448
#, fuzzy, c-format
msgid "No %s could be disbanded."
msgstr "îÅÍÁ¤ %s ÄÌÑ ÐÒÏÄÁÖÕ"
@@ -9974,47 +10117,47 @@ msgstr "?
msgid "?duration:overflow"
msgstr "?ÔÒÉ×Á̦ÓÔØ:ΦËÏÌÉ"
-#: client/text.c:1143
+#: client/text.c:1145
#, c-format
msgid "%6d.%02d ms"
msgstr "%6d.%02d ÍÓ"
#. TRANS: <nation adjective> <government name>.
#. * E.g. "Polish Republic".
-#: client/text.c:1188
+#: client/text.c:1193
#, fuzzy, c-format
msgid "?nationgovernment:%s %s"
msgstr "ëÅÒ¦×ÎÉÃÔ×Ï: %s"
#. TRANS: "Observer: 1985"
-#: client/text.c:1198
+#: client/text.c:1203
#, fuzzy, c-format
msgid "Observer: %s"
msgstr " (ÓÐÏÓÔÅÒ¦ÇÁÞ)"
-#: client/text.c:1216
+#: client/text.c:1221
msgid "Buildings: "
msgstr "âÕĦ×̦:"
-#: client/text.c:1233 client/text.c:1272
+#: client/text.c:1238 client/text.c:1277
msgid "None. "
msgstr "î¦ÞÏÇÏ"
-#: client/text.c:1235 client/text.c:1274
+#: client/text.c:1240 client/text.c:1279
msgid "?clistend:."
msgstr "?blistend:"
-#: client/text.c:1253
+#: client/text.c:1258
msgid "Wonders: "
msgstr "äÉ×Á: "
-#: client/text.c:1308
+#: client/text.c:1313
#, 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:1312
+#: client/text.c:1317
#, fuzzy, c-format
msgid "%d content before penalty."
msgid_plural "%d content before penalty."
@@ -10023,7 +10166,7 @@ msgstr[1] "%d
msgstr[2] "%d ÎÅÊÔÒÁÌØÎÉÈ ÄÏ ÛÔÒÁÆÕ "
#. TRANS: 0-21 unhappy citizen(s).
-#: client/text.c:1318
+#: client/text.c:1323
#, fuzzy, c-format
msgid "%d additional unhappy citizen."
msgid_plural "%d additional unhappy citizens."
@@ -10031,12 +10174,12 @@ msgstr[0] "%d
msgstr[1] "%d ÄÏÄÁÔËÏ×ÉÈ ÎÅÝÁÓÎÉÈ ÇÏÒÏÄÑÎ."
msgstr[2] "%d ÄÏÄÁÔËÏ×ÉÈ ÎÅÝÁÓÎÉÈ ÇÏÒÏÄÑÎ."
-#: client/text.c:1339
+#: client/text.c:1344
#, fuzzy
msgid "Unlimited martial law in effect."
msgstr "䦤 צÊÓØËÏ×ÉÊ ÓÔÁÎ ("
-#: client/text.c:1341
+#: client/text.c:1346
#, fuzzy, c-format
msgid "%d military unit may impose martial law."
msgid_plural "Up to %d military units may impose martial law."
@@ -10047,7 +10190,7 @@ msgstr[1] ""
msgstr[2] ""
"* îŠצÊÓØËÏ×ÉÊ Ð¦ÄÒÏÚÄ¦Ì (ÎÅÍÏÖÅ ÁÔÁËÕ×ÁÔÉ; ÎÅÍÁ¤ צÊÓØËÏ×ÏÇÏ ÐÏÌÏÖÅÎÎÑ).\n"
-#: client/text.c:1345
+#: client/text.c:1350
#, fuzzy, c-format
msgid "Each military unit makes %d unhappy citizen content."
msgid_plural "Each military unit makes %d unhappy citizens content."
@@ -10055,36 +10198,36 @@ msgstr[0] "
msgstr[1] "òÏÚ×ÁÖÁ¤ ÇÏÒÏÄÑÎ, ÎÅÊÔÒÁ̦ÚÕ¤ 3 ÎÅÚÁÄÏ×ÏÌÅÎÉÈ Õ Í¦ÓÔ¦."
msgstr[2] "òÏÚ×ÁÖÁ¤ ÇÏÒÏÄÑÎ, ÎÅÊÔÒÁ̦ÚÕ¤ 3 ÎÅÚÁÄÏ×ÏÌÅÎÉÈ Õ Í¦ÓÔ¦."
-#: client/text.c:1352
+#: client/text.c:1357
msgid "Military units in the field may cause unhappiness. "
msgstr "÷¦ÊÓØËÏצ ЦÄÒÏÚĦÌÉ Õ ÐÏ̦ ÍÏÖÕÔØ ÓÐÒÉÞÉÎÉÔÉ ÎÅÝÁÓÔÑ."
-#: client/text.c:1355
+#: client/text.c:1360
msgid "Military units have no happiness effect. "
msgstr "÷¦ÊÓØËÏצ ЦÄÒÏÚĦÌÉ ÎÅ ×ÐÌÉ×ÁÀÔØ ÎÁ ÝÁÓÔÑ."
-#: client/text.c:1370
+#: client/text.c:1375
#, c-format
msgid "Luxury: %d total."
msgstr "òÏÚ˦Û: %d ÚÁÇÁÌÏÍ."
-#: client/tilespec.c:865
+#: client/tilespec.c:882
msgid "No usable default tileset found, aborting!"
msgstr "îÅ ÚÎÁÊÄÅÎÏ ÆÏÎ¦× ÐÏ ÚÁÍÏ×ÞÕ×ÁÎÎÀ, ÐÅÒÅÒÉ×ÁÀÓÑ! "
-#: client/tilespec.c:1338
+#: client/tilespec.c:1355
msgid ""
"Client does not support isometric tilesets. Using default tileset instead."
msgstr ""
"ë̦¤ÎÔ ÎŠЦÄÔÒÉÍÕ¤ ¦ÚÏÍÅÔÒÉÞΦ ÆÏÎÉ. ÷ÉËÏÒÉÓÔÏ×ÕÀ ÆÏÎÉ ÐÏ ÚÁÍÏ×ÞÕ×ÁÎÎÀ."
-#: client/tilespec.c:1347
+#: client/tilespec.c:1364
msgid ""
"Client does not support overhead view tilesets. Using default tileset "
"instead."
msgstr "ë̦¤ÎÔ ÎŠЦÄÔÒÉÍÕ¤ ÇÏÒ¦ÛΦ ÆÏÎÉ. ÷ÉËÏÒÉÓÔÏ×ÕÀ ÆÏÎÉ ÐÏ ÚÁÍÏ×ÞÕ×ÁÎÎÀ."
-#: client/tilespec.c:3966
+#: client/tilespec.c:3987
#, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -10784,7 +10927,7 @@ msgid "_Display"
msgstr "ðÏËÁÚÁÔÉ"
#: client/gui-gtk-2.0/cityrep.c:1006 client/gui-gtk-2.0/menu.c:839
-#: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
+#: client/gui-sdl/diplodlg.c:692 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
#: client/gui-xaw/cityrep.c:533 client/gui-xaw/menu.c:156
@@ -10959,201 +11102,201 @@ msgstr "
msgid "Remove this preset?"
msgstr "÷ÉÄÁÌÉÔÉ ÃÀ ÐÒÅÄÕÓÔÁÎÏ×ËÕ?"
-#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:222
+#: client/gui-gtk-2.0/dialogs.c:197 client/gui-gtk-2.0/messagewin.c:222
#, fuzzy
msgid "Goto _Location"
msgstr "êÔÉ ÄÏ"
-#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
+#: client/gui-gtk-2.0/dialogs.c:202 client/gui-gtk-2.0/messagewin.c:226
#, fuzzy
msgid "Inspect _City"
msgstr "÷¦ÄËÒÉÔÉ Í¦ÓÔÏ"
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:258 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:258 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:259 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:311 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:312 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:312 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:313 client/gui-win32/dialogs.c:1755
#: data/Freeciv.in:2502
msgid "Select what to pillage:"
msgstr "ïÂÅÒ¦ÔØ ÝÏ ÒÕÊÎÕ×ÁÔÉ:"
-#: client/gui-gtk-2.0/dialogs.c:506
+#: client/gui-gtk-2.0/dialogs.c:507
#, fuzzy
msgid "Unit"
msgstr "ð¦ÄÒÏÚĦÌÉ"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:950
-#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2155
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:985
+#: client/gui-gtk-2.0/dialogs.c:508 client/gui-gtk-2.0/pages.c:950
+#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2157
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:987
#: client/gui-win32/plrdlg.c:335 manual/civmanual.c:302 data/Freeciv.in:80
msgid "Name"
msgstr "îÁÚ×Á"
-#: client/gui-gtk-2.0/dialogs.c:519 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:520 client/gui-sdl/dialogs.c:627
msgid "Unit selection"
msgstr "÷ÉÂ¦Ò Ð¦ÄÒÏÚĦÌÕ"
-#: client/gui-gtk-2.0/dialogs.c:582
+#: client/gui-gtk-2.0/dialogs.c:583
msgid "_Ready all"
msgstr "çÏÔÏ×ΦÓÔØ ÕÓ¦È"
-#: client/gui-gtk-2.0/dialogs.c:590
+#: client/gui-gtk-2.0/dialogs.c:591
msgid "_Sentry idle"
msgstr "ðÒÉÓÐÁÔÉ ÂÅÚĦÑÌØΦ ЦÄÒÏÚĦÌÉ"
-#: client/gui-gtk-2.0/dialogs.c:719
+#: client/gui-gtk-2.0/dialogs.c:721
#, fuzzy
msgid "Nation _Groups:"
msgstr "_îÁæ§:"
-#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:766 data/Freeciv.in:3128
msgid "What Nation Will You Be?"
msgstr "ñËÏÀ ÎÁæ¤À ×É ÂÕÄÅÔÅ ËÅÒÕ×ÁÔÉ?"
-#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
-#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
+#: client/gui-gtk-2.0/dialogs.c:768 client/gui-sdl/chatline.c:842
+#: client/gui-win32/connectdlg.c:1040 data/Freeciv.in:3371
#, fuzzy
msgid "Pick Nation"
msgstr "÷¦ÄÄ¦Ì Í¦Ì¦Ã¦§"
-#: client/gui-gtk-2.0/dialogs.c:774
+#: client/gui-gtk-2.0/dialogs.c:776
#, fuzzy
msgid "_Random Nation"
msgstr "ïÂ'¤ÄÎÁÎΦ ÎÁæ§"
-#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:792 client/gui-win32/dialogs.c:517
msgid "Select a nation"
msgstr "ïÂÅÒ¦ÔØ ÎÁæÀ"
-#: client/gui-gtk-2.0/dialogs.c:804
+#: client/gui-gtk-2.0/dialogs.c:810
msgid "_Properties"
msgstr "÷ÌÁÓÔÉ×ÏÓÔ¦"
-#: client/gui-gtk-2.0/dialogs.c:824
+#: client/gui-gtk-2.0/dialogs.c:830
msgid "_Leader:"
msgstr "çÏÌÏ×Á:"
-#: client/gui-gtk-2.0/dialogs.c:831
+#: client/gui-gtk-2.0/dialogs.c:837
msgid "_Female"
msgstr "ö¦ÎËÁ"
-#: client/gui-gtk-2.0/dialogs.c:836
+#: client/gui-gtk-2.0/dialogs.c:842
msgid "_Male"
msgstr "þÏÌÏצË"
-#: client/gui-gtk-2.0/dialogs.c:863
+#: client/gui-gtk-2.0/dialogs.c:869
#, fuzzy
msgid "City _Styles:"
msgstr "óÔÉÌØ Í¦ÓÔ:"
-#: client/gui-gtk-2.0/dialogs.c:902
+#: client/gui-gtk-2.0/dialogs.c:908
#, fuzzy
msgid "_Description"
msgstr "ìÅÇÅÎÄÁ"
-#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1263 client/gui-xaw/dialogs.c:1480
msgid "You must select your sex."
msgstr "÷É ÐÏ×ÉΦ ×ËÁÚÁÔÉ ×ÁÛÕ ÓÔÁÔØ."
-#: client/gui-gtk-2.0/dialogs.c:1253 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1268 client/gui-xaw/dialogs.c:1485
msgid "You must select your city style."
msgstr "÷É ÐÏ×ÉΦ ÏÂÒÁÔÉ ÓÔÉÌØ Í¦ÓÔ."
-#: client/gui-gtk-2.0/dialogs.c:1262 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1277 client/gui-sdl/dialogs.c:2204
#: 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:1306 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1318 client/gui-win32/citydlg.c:1454
#: data/Freeciv.in:2484
msgid "Upgrade Unit!"
msgstr "íÏÄÅÒΦÚÁÃ¦Ñ Ð¦ÄÒÏÚĦÌÕ!"
-#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1327 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 "íÏÄÅÒΦÚÕ×ÁÔÉ ÚÁÓÔÁҦ̦ ЦÄÒÏÚĦÌÉ"
-#: client/gui-gtk-2.0/diplodlg.c:231 client/gui-win32/diplodlg.c:151
+#: client/gui-gtk-2.0/diplodlg.c:222 client/gui-win32/diplodlg.c:151
#: client/gui-xaw/diplodlg.c:383 client/gui-xaw/diplodlg.c:401
msgid "World-map"
msgstr "íÁÐÕ ÓצÔÕ"
-#: client/gui-gtk-2.0/diplodlg.c:237 client/gui-win32/diplodlg.c:146
+#: client/gui-gtk-2.0/diplodlg.c:228 client/gui-win32/diplodlg.c:146
#: client/gui-xaw/diplodlg.c:387 client/gui-xaw/diplodlg.c:405
msgid "Sea-map"
msgstr "íÁÐÕ ÏËÅÁÎÕ"
-#: client/gui-gtk-2.0/diplodlg.c:243
+#: client/gui-gtk-2.0/diplodlg.c:234
msgid "_Maps"
msgstr "íÁÐÉ"
-#: client/gui-gtk-2.0/diplodlg.c:274
+#: client/gui-gtk-2.0/diplodlg.c:265
msgid "_Advances"
msgstr "ôÅÈÎÏÌÏǦ§"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/diplodlg.c:315 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "í¦ÓÔÁ"
-#: client/gui-gtk-2.0/diplodlg.c:333
+#: client/gui-gtk-2.0/diplodlg.c:324
msgid "_Give shared vision"
msgstr "îÁÄÁÔÉ ÓЦÌØÎÅ ÂÁÞÅÎÎÑ"
-#: client/gui-gtk-2.0/diplodlg.c:346
+#: client/gui-gtk-2.0/diplodlg.c:337
#, fuzzy
msgid "Give _embassy"
msgstr "áÍÂÁÓÁÄÁ"
-#: client/gui-gtk-2.0/diplodlg.c:376
+#: client/gui-gtk-2.0/diplodlg.c:368
msgid "_Pacts"
msgstr "õÇÏÄÉ"
-#: client/gui-gtk-2.0/diplodlg.c:466
+#: client/gui-gtk-2.0/diplodlg.c:458
#, fuzzy, c-format
msgid "Diplomacy: %s"
msgstr "ä¦ÐÌÏÍÁÔ"
-#: client/gui-gtk-2.0/diplodlg.c:473
+#: client/gui-gtk-2.0/diplodlg.c:465
msgid "_Cancel meeting"
msgstr "úÁ˦ÎÞÉÔÉ ÚÕÓÔÒ¦Þ"
-#: client/gui-gtk-2.0/diplodlg.c:475
+#: client/gui-gtk-2.0/diplodlg.c:467
msgid "Accept _treaty"
msgstr "ð¦ÄÐÉÓÁÔÉ ÕÇÏÄÕ"
-#: client/gui-gtk-2.0/diplodlg.c:503
+#: client/gui-gtk-2.0/diplodlg.c:495
msgid "C_lauses:"
msgstr "ðÕÎËÔÉ:"
-#: client/gui-gtk-2.0/diplodlg.c:568 client/gui-gtk-2.0/diplodlg.c:642
+#: client/gui-gtk-2.0/diplodlg.c:560 client/gui-gtk-2.0/diplodlg.c:634
msgid "_Gold:"
msgstr "çÒÏÛ¦:"
-#: client/gui-gtk-2.0/diplodlg.c:580 client/gui-gtk-2.0/diplodlg.c:654
+#: client/gui-gtk-2.0/diplodlg.c:572 client/gui-gtk-2.0/diplodlg.c:646
msgid "_Add Clause..."
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:699
+#: client/gui-gtk-2.0/diplodlg.c:691
msgid "--- This treaty is blank. Please add some clauses. ---"
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:905 client/gui-sdl/diplodlg.c:375
+#: client/gui-gtk-2.0/diplodlg.c:897 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 "÷ËÁÚÁÎÁ ÎÅצÒÎÁ ˦ÌØ˦ÓÔØ ÇÒÏÛÅÊ."
@@ -11212,101 +11355,101 @@ msgstr "
msgid "Show _All Cities"
msgstr "õÓ¦ ͦÓÔÁ"
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:164
#, fuzzy
msgid "Show Map Scrollbars"
msgstr "ðÏËÁÚÕ×ÁÔÉ ÐÒÏËÒÕÔËÕ ÍÁÐÉ (Ô¦ÌØ˦ GTK+)"
-#: client/gui-gtk-2.0/gui_main.c:163
+#: client/gui-gtk-2.0/gui_main.c:165
msgid "Disable this option to hide the scrollbars on the map view."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:169
msgid "Keyboardless goto"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:168
+#: client/gui-gtk-2.0/gui_main.c:170
msgid ""
"If this option is set then a goto may be initiated by left-clicking and then "
"holding down the mouse button while dragging the mouse onto a different tile."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:173
+#: client/gui-gtk-2.0/gui_main.c:175
#, fuzzy
msgid "Keep dialogs on top"
msgstr "úÁ×ÖÄÉ ÐÏ×ÅÒÈ (ÌÉÛÅ GTK+ 2.0)"
-#: client/gui-gtk-2.0/gui_main.c:174
+#: client/gui-gtk-2.0/gui_main.c:176
msgid ""
"If this option is set then dialog windows will always remain in front of the "
"main Freeciv window. Disabling this has no effect in fullscreen mode."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:178
+#: client/gui-gtk-2.0/gui_main.c:180
msgid "Show worklist task icons"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:179
+#: client/gui-gtk-2.0/gui_main.c:181
msgid ""
"Disabling this will turn off the unit and building icons in the worklist "
"dialog and the production tab of the city dialog."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:183
+#: client/gui-gtk-2.0/gui_main.c:185
msgid "Enable status report tabs"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:184
+#: client/gui-gtk-2.0/gui_main.c:186
msgid ""
"If this option is enabled then report dialogs will be shown as separate tabs "
"rather than in popup dialogs."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:189 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:191 client/gui-win32/gui_main.c:110
msgid "Better fog-of-war drawing"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:190 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:192 client/gui-win32/gui_main.c:111
msgid ""
"If this is enabled then a better method is used for drawing fog-of-war. It "
"is not any slower but will consume about twice as much memory."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:195
+#: client/gui-gtk-2.0/gui_main.c:197
msgid "Show time for each chat message"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:196
+#: client/gui-gtk-2.0/gui_main.c:198
msgid ""
"If this option is enabled then all chat messages will be prefixed by a time "
"string of the form [hour:minute:second]."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:201
+#: client/gui-gtk-2.0/gui_main.c:203
msgid "Split bottom notebook area"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:202
+#: client/gui-gtk-2.0/gui_main.c:204
msgid ""
"Enabling this option will split the bottom notebook into a left and right "
"notebook so that two tabs may be viewed at once."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:207
+#: client/gui-gtk-2.0/gui_main.c:209
msgid "New message events go to top of list"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:208
+#: client/gui-gtk-2.0/gui_main.c:210
msgid ""
"If this option is enabled, new events in the message window will appear at "
"the top of the list, rather than being appended at the bottom."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:213
+#: client/gui-gtk-2.0/gui_main.c:215
msgid "Show extra message window buttons"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:214
+#: client/gui-gtk-2.0/gui_main.c:216
msgid ""
"If this option is enabled, there will be two buttons displayed in the "
"message window for inspecting a city and going to a location. If this option "
@@ -11316,22 +11459,22 @@ msgid ""
"closed and reopened."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:224
+#: client/gui-gtk-2.0/gui_main.c:226
#, fuzzy
msgid "Metaserver tab first in network page"
msgstr "¶ÎÆÏÒÍÁæÊÎÕ ÓÔÒÏËÕ ÍÅÔÁÓÅÒ×ÅÒÁ ×ÓÔÁÎÏ×ÌÅÎÏ Õ '%s'."
-#: client/gui-gtk-2.0/gui_main.c:225
+#: client/gui-gtk-2.0/gui_main.c:227
msgid ""
"If this option is enabled, the metaserver tab will be the first notebook tab "
"in the network page. This option requires a restart in order to take effect."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:230
+#: client/gui-gtk-2.0/gui_main.c:232
msgid "Plain chat messages are sent to allies only"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:231
+#: client/gui-gtk-2.0/gui_main.c:233
msgid ""
"If this option is enabled, then plain messages typed into the chat entry "
"while the game is running will only be sent to your allies. Otherwise plain "
@@ -11341,28 +11484,41 @@ msgid ""
"visible in multiplayer games)."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:340 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:245
+msgid "Arrange widgets for small displays"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:246
+msgid ""
+"If this option is enabled, widgets in the main window will be arrange so "
+"that they take up the least amount of total screen space. Specifically, the "
+"left panel containing the overview, player status, and the unit information "
+"box will be extended over the entire left side of the window. This option "
+"requires a restart in order to take effect."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:352 client/gui-xaw/gui_main.c:245
msgid ""
"This client has no special command line options\n"
"\n"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
+#: client/gui-gtk-2.0/gui_main.c:847 client/gui-gtk-2.0/gui_main.c:1542
msgid "Freeciv"
msgstr "Freeciv"
-#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
+#: client/gui-gtk-2.0/gui_main.c:1251 client/gui-gtk-2.0/gui_main.c:1258
#: client/gui-sdl/mapctrl.c:1566 client/gui-win32/gui_main.c:482
#: data/Freeciv.in:2618
msgid "Turn Done"
msgstr "úÁ×ÅÒÛÅÎÏ È¦Ä"
-#: client/gui-gtk-2.0/gui_main.c:1232 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1258 client/gui-sdl/mapctrl.c:1566
#: client/gui-sdl/mapview.c:1082
msgid "Shift+Return"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1266 client/gui-gtk-2.0/menu.c:797
+#: client/gui-gtk-2.0/gui_main.c:1299 client/gui-gtk-2.0/menu.c:797
#: client/gui-gtk-2.0/menu.c:799 client/gui-gtk-2.0/menu.c:801
#: client/gui-gtk-2.0/menu.c:803 client/gui-gtk-2.0/menu.c:805
#: client/gui-gtk-2.0/menu.c:807 client/gui-gtk-2.0/menu.c:809
@@ -11381,12 +11537,12 @@ msgstr ""
msgid "View"
msgstr "äÉ×ÉÔÉÓØ"
-#: client/gui-gtk-2.0/gui_main.c:1359
+#: client/gui-gtk-2.0/gui_main.c:1393
#, fuzzy
msgid "Chat"
msgstr "ëÏÌÅÓΦÃÑ"
-#: client/gui-gtk-2.0/gui_main.c:1377 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1411 client/gui-win32/gui_main.c:538
#: data/Freeciv.in:2809
msgid ""
"Freeciv is free software and you are welcome to distribute copies of it\n"
@@ -11398,96 +11554,96 @@ msgstr ""
"á ÔÅÐÅÒ ÚÁÄÁÊÔÅ §Í ÐÅÒÃÀ!\n"
"óÌÁ×Á õËÒÁ§Î¦! çÅÒÏÑÍ ÓÌÁ×Á!"
-#: client/gui-gtk-2.0/gui_main.c:1392
+#: client/gui-gtk-2.0/gui_main.c:1426
msgid "Allies Only"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1657
+#: client/gui-gtk-2.0/gui_main.c:1691
msgid "Not _ready"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
+#: client/gui-gtk-2.0/gui_main.c:1702 client/gui-gtk-2.0/pages.c:1679
#, fuzzy
msgid "_Ready"
msgstr "çÏÔÏ×ΦÓÔØ ÕÓ¦È"
-#: client/gui-gtk-2.0/gui_main.c:1672 client/gui-gtk-2.0/gui_main.c:1678
-#: client/gui-gtk-2.0/pages.c:2204
+#: client/gui-gtk-2.0/gui_main.c:1706 client/gui-gtk-2.0/gui_main.c:1712
+#: client/gui-gtk-2.0/pages.c:2206
#, fuzzy
msgid "_Start"
msgstr "óÔÁÎ"
-#: client/gui-gtk-2.0/gui_main.c:1686
+#: client/gui-gtk-2.0/gui_main.c:1720
#, fuzzy
msgid "_Take Player"
msgstr "í¦ÓÔÁ"
-#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
+#: client/gui-gtk-2.0/gui_main.c:1723 client/gui-gtk-2.0/pages.c:1669
#, fuzzy
msgid "Pick _Nation"
msgstr "÷¦ÄÄ¦Ì Í¦Ì¦Ã¦§"
-#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
+#: client/gui-gtk-2.0/gui_main.c:1730 client/gui-gtk-2.0/pages.c:1674
#, fuzzy
msgid "_Observe"
msgstr " (ÓÐÏÓÔÅÒ¦ÇÁÞ)"
-#: client/gui-gtk-2.0/gui_main.c:1698
+#: client/gui-gtk-2.0/gui_main.c:1732
#, fuzzy
msgid "Do not _observe"
msgstr "ÔÅÐÅÒ ËÏÎÔÒÏÌÀ¤ÔØÓÑ"
-#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1755 client/gui-xaw/pages.c:211
#, fuzzy
msgid "<AI>"
msgstr "ëÏÍÐ'ÀÔÅÒ"
-#: client/gui-gtk-2.0/gui_main.c:1723
+#: client/gui-gtk-2.0/gui_main.c:1758
msgid "<Novice AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1726
+#: client/gui-gtk-2.0/gui_main.c:1761
#, fuzzy
msgid "<Easy AI>"
msgstr "ëÏÍÐ'ÀÔÅÒ"
-#: client/gui-gtk-2.0/gui_main.c:1729
+#: client/gui-gtk-2.0/gui_main.c:1764
msgid "<Normal AI>"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1732
+#: client/gui-gtk-2.0/gui_main.c:1767
#, fuzzy
msgid "<Hard AI>"
msgstr "ëÏÍÐ'ÀÔÅÒ"
-#: client/gui-gtk-2.0/gui_main.c:1742 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1777 client/gui-win32/dialogs.c:594
#: client/gui-xaw/pages.c:217
#, fuzzy
msgid "Random"
msgstr "òÁĦÏ"
-#: client/gui-gtk-2.0/gui_main.c:1808
+#: client/gui-gtk-2.0/gui_main.c:1844 client/gui-gtk-2.0/gui_main.c:1858
#, fuzzy
msgid "Observer"
msgstr " (ÓÐÏÓÔÅÒ¦ÇÁÞ)"
-#: client/gui-gtk-2.0/gui_main.c:1808
+#: client/gui-gtk-2.0/gui_main.c:1858
#, fuzzy
msgid "Detached"
msgstr ", ðÏÍÅÒ"
-#: client/gui-gtk-2.0/gui_main.c:2073
+#: client/gui-gtk-2.0/gui_main.c:2117
msgid "Are you sure you want to quit?"
msgstr ""
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
#, c-format
msgid ""
"Close Tab:\n"
"%s"
msgstr ""
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
msgid "Ctrl+W"
msgstr ""
@@ -11593,8 +11749,8 @@ msgid "Trans. Rslt/Time:"
msgstr "ôÒÁÎÓ òÅÓ/þÁÓ:"
#: 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
-#: client/gui-win32/helpdlg.c:709 client/gui-win32/helpdlg.c:733
+#: client/gui-win32/helpdlg.c:502 client/gui-win32/helpdlg.c:550
+#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:739
#: client/gui-xaw/helpdlg.c:759 client/gui-xaw/helpdlg.c:808
#: client/gui-xaw/helpdlg.c:816 client/gui-xaw/helpdlg.c:853
#: client/gui-xaw/helpdlg.c:878
@@ -11641,34 +11797,34 @@ msgstr "
msgid "?techhelp:"
msgstr "?ÔÅÈÄÏÐÏÍÏÇÁ:"
-#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:591
+#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:597
#: client/gui-xaw/helpdlg.c:996
#, c-format
msgid "+%d Trade / %d"
msgstr "+%d ôÏÒǦ×ÌÑ / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:595
+#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:601
#: client/gui-xaw/helpdlg.c:1000
#, c-format
msgid "no extra / %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
-#: client/gui-win32/helpdlg.c:602 client/gui-win32/helpdlg.c:616
-#: client/gui-win32/helpdlg.c:635 client/gui-xaw/helpdlg.c:1002
+#: client/gui-gtk-2.0/helpdlg.c:1085 client/gui-win32/helpdlg.c:604
+#: client/gui-win32/helpdlg.c:608 client/gui-win32/helpdlg.c:622
+#: client/gui-win32/helpdlg.c:641 client/gui-xaw/helpdlg.c:1002
#: client/gui-xaw/helpdlg.c:1006 client/gui-xaw/helpdlg.c:1020
#: client/gui-xaw/helpdlg.c:1039
msgid "n/a"
msgstr "ÎÅÄÏÓÔÕÐÎÅ"
-#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:605
+#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:611
#: client/gui-xaw/helpdlg.c:1009
#, c-format
msgid "+%d Food / %d"
msgstr "+%d ·ÖÁ / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:619
+#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:625
#: client/gui-xaw/helpdlg.c:1023
#, c-format
msgid "+%d Res. / %d"
@@ -12473,41 +12629,41 @@ msgstr ""
msgid "Connect to Gaming _Zone"
msgstr "ð¦Ä'¤ÄÎÁÔÉÓÑ ÄÏ"
-#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:302
#: client/gui-xaw/connectdlg.c:326
msgid "Passwords don't match, enter password."
msgstr ""
#: client/gui-gtk-2.0/pages.c:779 client/gui-gtk-2.0/pages.c:820
-#: client/gui-win32/connectdlg.c:916
+#: client/gui-win32/connectdlg.c:918
msgid "Server Name"
msgstr "áÄÒÅÓÁ"
#: client/gui-gtk-2.0/pages.c:780 client/gui-gtk-2.0/pages.c:821
-#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:916
+#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:918
#: data/Freeciv.in:96
msgid "Port"
msgstr "ðÏÒÔ"
#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Version"
msgstr "÷ÅÒÓ¦Ñ"
#: client/gui-gtk-2.0/pages.c:782 client/gui-gtk-2.0/pages.c:823
-#: client/gui-gtk-2.0/pages.c:2161 client/gui-win32/connectdlg.c:917
-#: client/gui-win32/connectdlg.c:995
+#: client/gui-gtk-2.0/pages.c:2163 client/gui-win32/connectdlg.c:919
+#: client/gui-win32/connectdlg.c:997
msgid "Status"
msgstr "óÔÁÎ"
#: client/gui-gtk-2.0/pages.c:783 client/gui-gtk-2.0/pages.c:824
#: client/gui-sdl/connectdlg.c:318 client/gui-sdl/plrdlg.c:330
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Players"
msgstr "çÒÁ×æ×"
#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
-#: client/gui-win32/connectdlg.c:918
+#: client/gui-win32/connectdlg.c:920
msgid "Comment"
msgstr "ëÏÍÅÎÔÁÒ¦"
@@ -12541,9 +12697,9 @@ msgstr ""
msgid "Conf_irm Password:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2165
#: 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:1000
+#: client/gui-win32/citydlg.c:1083 client/gui-win32/connectdlg.c:1002
#: client/gui-win32/wldlg.c:800 client/gui-win32/wldlg.c:806
msgid "Type"
msgstr "ôÉÐ"
@@ -12644,7 +12800,7 @@ msgstr ""
msgid "Ruleset _Version:"
msgstr "ðÒÅÄÕÓÔÁÎÏ×ËÉ:"
-#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2195
#, fuzzy
msgid "_More Game Options..."
msgstr "ïÐæ§ ÐÏצÄÏÍÌÅÎØ..."
@@ -12664,54 +12820,54 @@ msgstr "
msgid "Ready"
msgstr "çÏÔÏ×ΦÓÔØ ÕÓ¦È"
-#: client/gui-gtk-2.0/pages.c:1601
+#: client/gui-gtk-2.0/pages.c:1600
#, fuzzy
msgid "?player:Leader"
msgstr "?ͦÓÔÏ:îÁÚ×Á"
-#: client/gui-gtk-2.0/pages.c:1732 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1734 client/gui-sdl/chatline.c:185
msgid "Choose Saved Game to Load"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1824
+#: client/gui-gtk-2.0/pages.c:1826
msgid "Choose Saved Game to _Load:"
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
-#: client/gui-gtk-2.0/pages.c:2451
+#: client/gui-gtk-2.0/pages.c:1846 client/gui-gtk-2.0/pages.c:2039
+#: client/gui-gtk-2.0/pages.c:2455
msgid "_Browse..."
msgstr ""
-#: client/gui-gtk-2.0/pages.c:1911
+#: client/gui-gtk-2.0/pages.c:1913
#, fuzzy
msgid "Choose a Scenario"
msgstr "úÁ×ÁÎÔÁÖÉÔÉ ÓÃÅÎÁÒ¦Ê"
-#: client/gui-gtk-2.0/pages.c:1998
+#: client/gui-gtk-2.0/pages.c:2000
#, fuzzy
msgid "Choose a _Scenario:"
msgstr "úÁ×ÁÎÔÁÖÉÔÉ ÓÃÅÎÁÒ¦Ê"
-#: client/gui-gtk-2.0/pages.c:2173
+#: client/gui-gtk-2.0/pages.c:2175
#, fuzzy
msgid "Choose a _nation to play:"
msgstr "ïÂÅÒ¦ÔØ Ä¦ÑÌØΦÓÔØ Ð¦ÄÒÏÚĦÌÕ"
-#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2367 client/gui-win32/menu.c:581
#, fuzzy
msgid "Select Location to Save"
msgstr "ïÂÅÒ¦ÔØ ÎÁæÀ ÔÁ ¦Í`Ñ"
-#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2452 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "úÂÅÒÅÇÔÉ ÇÒÕ"
-#: client/gui-gtk-2.0/pages.c:2489
+#: client/gui-gtk-2.0/pages.c:2493
#, fuzzy
msgid "Saved _Games:"
msgstr "úÂÅÒÅÇÔÉ ÇÒÕ"
-#: client/gui-gtk-2.0/pages.c:2516
+#: client/gui-gtk-2.0/pages.c:2520
#, fuzzy
msgid "Save _Filename:"
msgstr "úÂÅÒÅÇÔÉ ÇÒÕ"
@@ -13070,7 +13226,7 @@ msgstr "
msgid "Total users logged in : %d"
msgstr ""
-#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1098
#, fuzzy
msgid "Back"
msgstr "âÁÎË"
@@ -13081,7 +13237,7 @@ msgid "Start"
msgstr "óÔÁÎ"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:777
+#: client/gui-win32/connectdlg.c:779
msgid "Load Game"
msgstr "úÁ×ÁÎÔÁÖÉÔÉ ÇÒÕ"
@@ -13123,9 +13279,9 @@ msgstr "
#: client/gui-sdl/connectdlg.c:308 client/gui-sdl/connectdlg.c:617
#: client/gui-sdl/connectdlg.c:803 client/gui-sdl/connectdlg.c:985
#: client/gui-sdl/dialogs.c:452 client/gui-sdl/dialogs.c:2095
-#: client/gui-sdl/dialogs.c:2893 client/gui-sdl/diplomat_dialog.c:731
+#: client/gui-sdl/dialogs.c:2902 client/gui-sdl/diplomat_dialog.c:731
#: client/gui-sdl/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1043
#: client/gui-win32/dialogs.c:1772 client/gui-win32/finddlg.c:127
#: client/gui-win32/gotodlg.c:171 client/gui-win32/inputdlg.c:146
#: client/gui-win32/messagedlg.c:216 client/gui-win32/ratesdlg.c:328
@@ -13170,7 +13326,7 @@ msgid "Buy it?"
msgstr "ëÕÐÉÔÉ"
#: 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
+#: client/gui-sdl/diplodlg.c:1336 client/gui-sdl/diplomat_dialog.c:1211
#: client/gui-sdl/diplomat_dialog.c:1417 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:221 client/gui-sdl/repodlgs.c:1559
#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
@@ -13186,7 +13342,7 @@ msgid "No"
msgstr "î¦"
#: client/gui-sdl/citydlg.c:1215 client/gui-sdl/cma_fe.c:318
-#: client/gui-sdl/diplodlg.c:1345 client/gui-sdl/diplomat_dialog.c:1200
+#: client/gui-sdl/diplodlg.c:1346 client/gui-sdl/diplomat_dialog.c:1200
#: client/gui-sdl/diplomat_dialog.c:1407 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:232 client/gui-win32/repodlgs.c:578
#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
@@ -13521,7 +13677,7 @@ msgstr "
msgid "Port :"
msgstr "ðÏÒÔ:"
-#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1100
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr "ðÒɤ'ÄÎÁÔÉÓØ"
@@ -13638,23 +13794,23 @@ msgstr "
msgid "REVOLUTION!"
msgstr "òå÷ïìàã¶ñ..."
-#: client/gui-sdl/dialogs.c:2232 client/gui-sdl/dialogs.c:2620
+#: client/gui-sdl/dialogs.c:2237 client/gui-sdl/dialogs.c:2625
#: client/gui-win32/dialogs.c:567 data/Freeciv.in:3159
msgid "Female"
msgstr "ö¦ÎËÁ"
-#: client/gui-sdl/dialogs.c:2234 client/gui-sdl/dialogs.c:2618
-#: client/gui-sdl/dialogs.c:2830 client/gui-win32/dialogs.c:565
+#: client/gui-sdl/dialogs.c:2239 client/gui-sdl/dialogs.c:2623
+#: client/gui-sdl/dialogs.c:2839 client/gui-win32/dialogs.c:565
msgid "Male"
msgstr "þÏÌÏצË"
-#: client/gui-sdl/dialogs.c:2478 client/gui-sdl/dialogs.c:2902
+#: client/gui-sdl/dialogs.c:2483 client/gui-sdl/dialogs.c:2911
#: 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 "ïË"
-#: client/gui-sdl/dialogs.c:2685 client/gui-win32/dialogs.c:505
+#: client/gui-sdl/dialogs.c:2694 client/gui-win32/dialogs.c:505
msgid "What nation will you be?"
msgstr "ñËÏÀ ÎÁæ¤À ÷É ÂÕÄÅÔÅ ËÅÒÕ×ÁÔÉ?"
@@ -13683,80 +13839,80 @@ msgstr "
msgid "Sea map"
msgstr "íÁÐÕ ÏËÅÁÎÕ"
-#: client/gui-sdl/diplodlg.c:563
+#: client/gui-sdl/diplodlg.c:564
#, fuzzy
msgid "Give embassy"
msgstr "áÍÂÁÓÁÄÁ"
-#: client/gui-sdl/diplodlg.c:579 client/gui-win32/diplodlg.c:614
+#: client/gui-sdl/diplodlg.c:580 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 "çÒÏÛ¦(ÍÁËÓ %d)"
-#: client/gui-sdl/diplodlg.c:613 client/gui-sdl/helpdlg.c:1956
+#: client/gui-sdl/diplodlg.c:614 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 "ôÅÈÎÏÌÏǦ§"
-#: client/gui-sdl/diplodlg.c:831 client/gui-win32/diplodlg.c:598
+#: client/gui-sdl/diplodlg.c:832 client/gui-win32/diplodlg.c:598
#: data/Freeciv.in:269
msgid "Diplomacy meeting"
msgstr "ä¦ÐÌÏÍÁÔÉÞÎÁ ÚÕÓÔÒ¦Þ"
-#: client/gui-sdl/diplodlg.c:883 client/gui-win32/diplodlg.c:680
+#: client/gui-sdl/diplodlg.c:884 client/gui-win32/diplodlg.c:680
#: data/Freeciv.in:510
msgid "Cancel meeting"
msgstr "úÁ˦ÎÞÉÔÉ ÚÕÓÔÒ¦Þ"
-#: client/gui-sdl/diplodlg.c:895 client/gui-win32/diplodlg.c:679
+#: client/gui-sdl/diplodlg.c:896 client/gui-win32/diplodlg.c:679
#: data/Freeciv.in:501
msgid "Accept treaty"
msgstr "ð¦ÄÐÉÓÁÔÉ ÕÇÏÄÕ"
#. TRANS: "Polish incident !" FIXME!!!
-#: client/gui-sdl/diplodlg.c:1304
+#: client/gui-sdl/diplodlg.c:1305
#, fuzzy, c-format
msgid "%s incident !"
msgstr "îÁÕËÏ×æ"
-#: client/gui-sdl/diplodlg.c:1322
+#: client/gui-sdl/diplodlg.c:1323
msgid "Shall we declare WAR on them?"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1433
+#: client/gui-sdl/diplodlg.c:1434
#, fuzzy
msgid "Foreign Minister"
msgstr "ðÅÒÛÉÊ Í¦Î¦ÓÔÒ"
-#: client/gui-sdl/diplodlg.c:1449
+#: client/gui-sdl/diplodlg.c:1450
#, c-format
msgid ""
"Sir!, the %s ambassador has arrived\n"
"What are your wishes?"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1465
+#: client/gui-sdl/diplodlg.c:1466
msgid "Declare WAR"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1467 client/gui-win32/plrdlg.c:357
+#: client/gui-sdl/diplodlg.c:1468 client/gui-win32/plrdlg.c:357
msgid "Cancel Treaty"
msgstr "òÏÚ¦Ò×ÁÔÉ ÕÇÏÄÕ"
-#: client/gui-sdl/diplodlg.c:1490 client/gui-win32/plrdlg.c:358
+#: client/gui-sdl/diplodlg.c:1491 client/gui-win32/plrdlg.c:358
#: data/Freeciv.in:3254
msgid "Withdraw vision"
msgstr "úÁÂÒÁÔÉ ÂÁÞÅÎÎÑ"
-#: client/gui-sdl/diplodlg.c:1507
+#: client/gui-sdl/diplodlg.c:1508
#, fuzzy
msgid "Call Diplomatic Meeting"
msgstr "ä¦ÐÌÏÍÁÔÉÞÎÁ ÚÕÓÔÒ¦Þ"
-#: client/gui-sdl/diplodlg.c:1521
+#: client/gui-sdl/diplodlg.c:1522
msgid "Send him back"
msgstr ""
@@ -14522,12 +14678,12 @@ msgid "Leave Game"
msgstr "úÂÅÒÅÇÔÉ ÇÒÕ"
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1100 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1102 client/gui-xaw/menu.c:121
#: data/Freeciv.in:115 data/Freeciv.in:3180
msgid "Quit"
msgstr "÷ÉÊÔÉ"
-#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:967
msgid "Start New Game"
msgstr "óÔÁÒÔÕ×ÁÔÉ ÎÏ×Õ ÇÒÕ"
@@ -14654,8 +14810,8 @@ msgstr ""
msgid "%s max rate : %d%%"
msgstr "%s ÍÁËÓÉÍÁÌØÎÉÊ Ò¦×ÅÎØ: %d%%"
-#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
-#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1085
+#: client/gui-win32/connectdlg.c:1093 data/Freeciv.in:155
msgid "Update"
msgstr "ðÏÎÏ×ÉÔÉ"
@@ -15117,73 +15273,73 @@ msgstr "
msgid "Delete"
msgstr "÷ÉÄÁÌÉÔÉ"
-#: client/gui-win32/connectdlg.c:147
+#: client/gui-win32/connectdlg.c:149
msgid "Password:"
msgstr ""
-#: client/gui-win32/connectdlg.c:169
+#: client/gui-win32/connectdlg.c:171
#, fuzzy
msgid "Couldn't load the savegame"
msgstr "îÅ ÍÏÖÕ ÚÁ×ÁÎÔÁÖÉÔÉ ÇÒÕ: %s"
-#: client/gui-win32/connectdlg.c:284 client/gui-xaw/connectdlg.c:311
+#: client/gui-win32/connectdlg.c:286 client/gui-xaw/connectdlg.c:311
msgid "Verify Password"
msgstr ""
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:916 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr "÷ÉÂ¦Ò ÓÅÒ×ÅÒÁ Freeciv"
-#: client/gui-win32/connectdlg.c:915
+#: client/gui-win32/connectdlg.c:917
msgid "Local Area Network"
msgstr ""
-#: client/gui-win32/connectdlg.c:949
+#: client/gui-win32/connectdlg.c:951
#, fuzzy
msgid "Welcome to Freeciv"
msgstr "ë̦¤ÎÔ ÄÌÑ Freeciv"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
#, fuzzy
msgid "Load Saved Game"
msgstr "úÂÅÒÅÇÔÉ ÇÒÕ"
-#: client/gui-win32/connectdlg.c:969
+#: client/gui-win32/connectdlg.c:971
msgid "Connect To Network Game"
msgstr ""
-#: client/gui-win32/connectdlg.c:979
+#: client/gui-win32/connectdlg.c:981
msgid "Choose a nation to play"
msgstr ""
-#: client/gui-win32/connectdlg.c:1014
+#: client/gui-win32/connectdlg.c:1016
#, fuzzy
msgid "Number of players (Including AI):"
msgstr "ë¦ÌØ˦ÓÔØ ËÏÍÐ'ÀÔÅÒÎÉÈ ÇÒÁ×æ×."
-#: client/gui-win32/connectdlg.c:1022
+#: client/gui-win32/connectdlg.c:1024
msgid "AI skill level:"
msgstr ""
-#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1038 client/gui-win32/repodlgs.c:931
#, fuzzy
msgid "Game Options"
msgstr "ïÐæ§ ÐÏצÄÏÍÌÅÎØ"
-#: client/gui-win32/connectdlg.c:1040
+#: client/gui-win32/connectdlg.c:1042
msgid "Start Game"
msgstr "óÔÁÒÔÕ×ÁÔÉ ÇÒÕ"
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
#, fuzzy
msgid "Login:"
msgstr "ìÅǦÏÎ"
-#: client/gui-win32/connectdlg.c:1061
+#: client/gui-win32/connectdlg.c:1063
msgid "Host:"
msgstr "áÄÒÅÓÁ:"
-#: client/gui-win32/connectdlg.c:1062
+#: client/gui-win32/connectdlg.c:1064
msgid "Port:"
msgstr "ðÏÒÔ:"
@@ -15264,21 +15420,21 @@ msgid ""
"this is much slower."
msgstr ""
-#: client/gui-win32/helpdlg.c:769 client/gui-win32/helpdlg.c:792
-#: client/gui-win32/helpdlg.c:803 client/gui-win32/helpdlg.c:809
-#: client/gui-win32/helpdlg.c:822
+#: client/gui-win32/helpdlg.c:775 client/gui-win32/helpdlg.c:798
+#: client/gui-win32/helpdlg.c:809 client/gui-win32/helpdlg.c:815
+#: client/gui-win32/helpdlg.c:828
msgid "Allows "
msgstr "äÏÚ×ÏÌѤ "
-#: client/gui-win32/helpdlg.c:780
+#: client/gui-win32/helpdlg.c:786
msgid "Obsoletes "
msgstr "ú¦ÓÔÁÒÀ¤"
-#: client/gui-win32/helpdlg.c:812 client/gui-win32/helpdlg.c:825
+#: client/gui-win32/helpdlg.c:818 client/gui-win32/helpdlg.c:831
msgid " (with "
msgstr " (Ú "
-#: client/gui-win32/helpdlg.c:815 client/gui-win32/helpdlg.c:828
+#: client/gui-win32/helpdlg.c:821 client/gui-win32/helpdlg.c:834
msgid "?techhelp:)."
msgstr "?ÔÅÈÄÏÐÏÍÏÇÁ:)."
@@ -16404,7 +16560,7 @@ 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/"
+" https://gna.org/projects/freeciv/"
msgstr ""
"ñËÝÏ ÷É ÚÎÁÊÄÅÔÅ ÐÏÍÉÌËÕ, צÄÐÒÁ×ÔÅ Ú×¦Ô ÐÒÏ Îŧ. îÁÊËÒÁÝÅ ÃÅ ÒÏÂÉÔÉ "
"צÄצÄÁ×ÛÉ óÉÓÔÅÍÕ ×¦ÄÓ̦ÖÕ×ÁÎÎÑ ÐÏÍÉÌÏË Freeciv, ÎÁ:\n"
@@ -18635,6 +18791,7 @@ msgid "Hydro Plant"
msgstr "ç¦ÄÒÏÓÔÁÎæÑ"
#: data/default/buildings.ruleset:378
+#, fuzzy
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 "
@@ -18642,45 +18799,42 @@ msgid ""
"a Factory, Mfg. Plant and Hydro Plant together give a 150% production "
"bonus.\n"
"\n"
-"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant. A city "
-"can only build a Hydro Plant if it is next to (or on) a Mountain or River "
-"tile."
+"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant."
msgstr ""
"úÍÅÎÛÕ¤ ÚÁÂÒÕÄÎÅÎÎÑ, ÝÏ ×ÉÎÉËÁ¤ ×ÎÁÓ̦ÄÏË ×ÉÒÏÂÎÉÃÔ×Á Õ Í¦ÓÔ¦ ÎÁ 50%. ôÁËÏÖ "
-"Ú¦ÌØÛÕ¤ ×ÉÒÏÂÎÉÃÔ×Ï ÎÁ æÁÂÒÉËÁÈ ÔÁ úÁ×ÏÄÁÈ Õ Í¦ÓÔ¦: æÁÂÒÉËÁ ÔÁ ç¦ÄÒÏÓÔÁÎÃ¦Ñ "
-"ÒÁÚÏÍ ÄÁÀÔØ ÐÒÉÒ¦ÓÔ ×ÉÒÏÂÎÉÃÔ×Á 75%, æÁÂÒÉËÁ, úÁ×ÏÄ ÔÁ ç¦ÄÒÏÓÔÁÎÃ¦Ñ ÒÁÚÏÍ "
-"ÄÁÀÔØ 150% ÐÒÉÒ¦ÓÔÕ ×ÉÒÏÂÎÉÃÔ×Á.\n"
+"Ú¦ÌØÛÕ¤ ×ÉÒÏÂÎÉÃÔ×Ï ÎÁ æÁÂÒÉËÁÈ ÔÁ úÁ×ÏÄÁÈ Õ Í¦ÓÔ¦: æÁÂÒÉËÁ ÔÁ áÔÏÍÎÁ "
+"ÓÔÁÎÃ¦Ñ ÒÁÚÏÍ ÄÁÀÔØ ÐÒÉÒ¦ÓÔ ×ÉÒÏÂÎÉÃÔ×Á 75%, æÁÂÒÉËÁ, úÁ×ÏÄ ÔÁ áÔÏÍÎÁ "
+"ÓÔÁÎÃ¦Ñ ÒÁÚÏÍ ÄÁÀÔØ 150% ÐÒÉÒ¦ÓÔÕ ×ÉÒÏÂÎÉÃÔ×Á.\n"
"\n"
-"í¦ÓÔÏ ÍÏÖÅ ÍÁÔÉ ÌÉÛÅ ÏÄÎÕ ç¦ÄÒÏ, ôÅÐÌÏ ÞÉ AÔÏÍÎÕ ÓÔÁÎæÀ. í¦ÓÔÏ ÍÏÖÅ "
-"ÂÕÄÕ×ÁÔÉ ç¦ÄÒÏÓÔÁÎæÀ ÌÉÛÅ ÚÁ ÕÍÏ×É ÚÎÁÈÏÄÖÅÎÎÑ ÐÏÒÑÄ Ò¦ÞËÉ ÁÂÏ Ç¦Ò."
+"í¦ÓÔÏ ÍÏÖÅ ÍÁÔÉ ÌÉÛÅ ÏÄÎÕ ç¦ÄÒÏ, ôÅÐÌÏ ÞÉ AÔÏÍÎÕ ÓÔÁÎæÀ."
-#: data/default/buildings.ruleset:397 data/civ2/buildings.ruleset:373
+#: data/default/buildings.ruleset:396 data/civ2/buildings.ruleset:373
#: data/civ1/buildings.ruleset:297
msgid "Library"
msgstr "â¦Â̦ÏÔÅËÁ"
-#: data/default/buildings.ruleset:412
+#: data/default/buildings.ruleset:411
#, fuzzy, no-c-format
msgid "Increases the science output in a city by 100%."
msgstr "ð¦Ä×ÉÝÕÅ ÒÏÚ×ÉÔÏË ÎÁÕËÉ ÎÁ 50% Õ Í¦ÓÔ¦ ÄÅ §§ ÐÏÂÕÄÏ×ÁÎÏ."
-#: data/default/buildings.ruleset:417 data/civ2/buildings.ruleset:393
+#: data/default/buildings.ruleset:416 data/civ2/buildings.ruleset:393
#: data/civ1/buildings.ruleset:317
msgid "Marketplace"
msgstr "òÉÎÏË"
-#: data/default/buildings.ruleset:432 data/civ2/buildings.ruleset:408
+#: data/default/buildings.ruleset:431 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 "ú¦ÌØÛÕÅ ÒÏÚË¦Û ÔÁ ÓÂ¦Ò ÐÏÄÁÔË¦× Õ Í¦ÓÔ¦ ÎÁ 50%."
-#: data/default/buildings.ruleset:437 data/civ2/buildings.ruleset:413
+#: data/default/buildings.ruleset:436 data/civ2/buildings.ruleset:413
#: data/civ1/buildings.ruleset:337
msgid "Mass Transit"
msgstr "çÒÏÍÁÄÓØË¦Ê ÔÒÁÎÓÐÏÒÔ"
-#: data/default/buildings.ruleset:451 data/civ2/buildings.ruleset:427
+#: data/default/buildings.ruleset:450 data/civ2/buildings.ruleset:427
#: data/civ1/buildings.ruleset:351
msgid ""
"Neutralizes the pollution generated by the population. The population "
@@ -18689,12 +18843,12 @@ msgstr ""
"îÅÊÔÒÁ̦ÚÕ¤ ÚÁÂÒÕÄÎÅÎÎÑ ÝÏ ×ÉÎÉËÁ¤ ÚÁ×ÄÑËÉ ÎÁÓÅÌÅÎÎÀ. îÁÓÅÌÅÎÎÑ ÚÁÚ×ÉÞÁÊ ÎÅ "
"×ÐÌÉ×Á¤, ÑËÝÏ ÚÁÂÒÕÄÎÅÎÎÑ ×ÉÎÉËÁ¤ Õ Í¦ÓÔ¦."
-#: data/default/buildings.ruleset:458 data/civ2/buildings.ruleset:434
+#: data/default/buildings.ruleset:457 data/civ2/buildings.ruleset:434
#: data/civ1/buildings.ruleset:358
msgid "Mfg. Plant"
msgstr "úÁ×ÏÄ"
-#: data/default/buildings.ruleset:474 data/civ2/buildings.ruleset:450
+#: data/default/buildings.ruleset:473 data/civ2/buildings.ruleset:450
#: data/civ1/buildings.ruleset:374
#, no-c-format
msgid ""
@@ -18702,12 +18856,12 @@ msgid ""
"production in a city by 100%."
msgstr "òÁÚÏÍ Ú æÁÂÒÉËÏÀ, úÁ×ÏÄ Ú¦ÌØÛÕ¤ ×ÉÒÏÂÎÉÃÔ×Ï Õ Í¦ÓÔ¦ ÎÁ 100%."
-#: data/default/buildings.ruleset:480 data/civ2/buildings.ruleset:456
+#: data/default/buildings.ruleset:479 data/civ2/buildings.ruleset:456
#: data/civ1/buildings.ruleset:380
msgid "Nuclear Plant"
msgstr "áÔÏÍÎÁ ÅÌÅËÔÒÏÓÔÁÎæÑ"
-#: data/default/buildings.ruleset:495
+#: data/default/buildings.ruleset:494
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 "
@@ -18724,11 +18878,11 @@ msgstr ""
"\n"
"í¦ÓÔÏ ÍÏÖÅ ÍÁÔÉ ÌÉÛÅ ÏÄÎÕ ç¦ÄÒÏ, ôÅÐÌÏ ÞÉ AÔÏÍÎÕ ÓÔÁÎæÀ."
-#: data/default/buildings.ruleset:515 data/civ2/buildings.ruleset:489
+#: data/default/buildings.ruleset:514 data/civ2/buildings.ruleset:489
msgid "Offshore Platform"
msgstr "ïÆÛÏÒÎÁ ÐÌÁÔÆÏÒÍÁ"
-#: data/default/buildings.ruleset:530 data/civ2/buildings.ruleset:504
+#: data/default/buildings.ruleset:529 data/civ2/buildings.ruleset:504
msgid ""
"Adds 1 extra shield resource on all Ocean squares in a city. The city needs "
"to be coastal to build this improvement."
@@ -18736,12 +18890,12 @@ msgstr ""
"ú¦ÌØÛÕ¤ ÎÁ 1 ×ÉÒÏÂÎÉÃÔ×Ï Ú ÕÓ¦È ÏËÅÁÎÓØËÉÈ ÔÅÒÉÔÏÒ¦Ê Õ Í¦ÓÔ¦. áÂÉ "
"ÐÏÂÕÄÕ×ÁÔÉ ïÆÛÏÒÎÕ ÐÌÁÔÆÏÒÍÕ Í¦ÓÔÕ ÐÏÔÒ¦ÂÎÏ ÂÕÔÉ ÐÒÉÂÅÒÅÖÎÉÍ."
-#: data/default/buildings.ruleset:536 data/civ2/buildings.ruleset:510
+#: data/default/buildings.ruleset:535 data/civ2/buildings.ruleset:510
#: data/civ1/buildings.ruleset:411
msgid "Palace"
msgstr "ðÁÌÁÃ"
-#: data/default/buildings.ruleset:552
+#: data/default/buildings.ruleset:551
#, fuzzy, no-c-format
msgid ""
"Makes a city the capital and the center of your government. Corruption in "
@@ -18766,11 +18920,11 @@ msgstr ""
"צÊÎÉ Õ ÷ÁÛ¦Ê ¦ÍÐÅÒ¦§. ÷ÔÒÁÔÁ ÷ÁÛÏÇÏ ÐÏÔÏÞÎÏÇÏ ÐÁÌÁÃÕ ÔÁËÏÖ ÐÒÉ×ÏÄÉÔØ ÄÏ "
"×ÔÒÁÔÉ ËÏÓͦÞÎÏÇÏ ËÏÒÁÂÌÑ."
-#: data/default/buildings.ruleset:569 data/civ2/buildings.ruleset:539
+#: data/default/buildings.ruleset:568 data/civ2/buildings.ruleset:539
msgid "Police Station"
msgstr "÷¦ÄÄ¦Ì Í¦Ì¦Ã¦§"
-#: data/default/buildings.ruleset:583 data/civ2/buildings.ruleset:553
+#: data/default/buildings.ruleset:582 data/civ2/buildings.ruleset:553
msgid ""
"Reduces the unhappiness caused by military units outside the city by 2 under "
"Democracy and 1 under Republic. This improvement has no effect under other "
@@ -18780,11 +18934,11 @@ msgstr ""
"ͦÓÔ¦ ÎÁ 2 ÐÒÉ äÅÍÏËÒÁÔ¦§ ÔÁ ÎÁ 1 ÐÒÉ òÅÓÐÕÂ̦æ. ðÒÉ ¦ÎÛÉÈ ÆÏÒÍÁÈ ËÅÒÕ×ÁÎÎÑ "
"ÎÅ ÍÁ¤ ÅÆÅËÔÉ×ÎÏÓÔ¦."
-#: data/default/buildings.ruleset:593 data/civ2/buildings.ruleset:560
+#: data/default/buildings.ruleset:592 data/civ2/buildings.ruleset:560
msgid "Port Facility"
msgstr "ðÏÒÔ"
-#: data/default/buildings.ruleset:608 data/civ2/buildings.ruleset:575
+#: data/default/buildings.ruleset:607 data/civ2/buildings.ruleset:575
msgid ""
"Allows a city to build veteran sea units. Also, damaged sea units which "
"stay in town for one full turn without moving are completely restored."
@@ -18793,12 +18947,12 @@ msgstr ""
"ЦÄÒÏÚĦÌÉ ÝÏ ÚÁÌÉÛÁÀÔØÓÑ Õ Í¦ÓÔ¦ ÎÁ ÏÄÉÎ ÐÏ×ÎÉÊ È¦Ä ÐÏ×ΦÓÔÀ צÄÎÏ×ÌÀÀÔØ "
"ÓÉÌÉ."
-#: data/default/buildings.ruleset:615 data/civ2/buildings.ruleset:582
+#: data/default/buildings.ruleset:614 data/civ2/buildings.ruleset:582
#: data/civ1/buildings.ruleset:440
msgid "Power Plant"
msgstr "ôÅÐÌÏÓÔÁÎæÑ"
-#: data/default/buildings.ruleset:631
+#: data/default/buildings.ruleset:630
#, no-c-format
msgid ""
"Increases the shield production of a Factory or Mfg. Plant in a city: a "
@@ -18815,12 +18969,12 @@ msgstr ""
"\n"
"í¦ÓÔÏ ÍÏÖÅ ÍÁÔÉ ÌÉÛÅ ÏÄÎÕ ç¦ÄÒÏ, ôÅÐÌÏ ÞÉ AÔÏÍÎÕ ÓÔÁÎæÀ."
-#: data/default/buildings.ruleset:646 data/civ2/buildings.ruleset:610
+#: data/default/buildings.ruleset:645 data/civ2/buildings.ruleset:610
#: data/civ1/buildings.ruleset:468
msgid "Recycling Center"
msgstr "ðÅÒÅÒÏÂÎÉÊ ËÏͦÎÁÔ"
-#: data/default/buildings.ruleset:661 data/civ2/buildings.ruleset:625
+#: data/default/buildings.ruleset:660 data/civ2/buildings.ruleset:625
#: data/civ1/buildings.ruleset:483
#, no-c-format
msgid ""
@@ -18830,11 +18984,11 @@ msgstr ""
"âÕĦ×ÎÉÃÔ×Ï ÐÅÒÅÒÏÂÎÏÇÏ ËÏͦÎÁÔÕ ÚÍÅÎÛÕ¤ ÚÁÂÒÕÄÎÅÎÎÑ ×¦Ä ×ÉÒÏÂÎÉÃÔ×Á Õ "
"ͦÓÔ¦ ÎÁ 66%."
-#: data/default/buildings.ruleset:667 data/civ2/buildings.ruleset:631
+#: data/default/buildings.ruleset:666 data/civ2/buildings.ruleset:631
msgid "Research Lab"
msgstr "äÏÓ̦ÄÎÁ ÌÁÂÏÒÁÔÏÒ¦Ñ"
-#: data/default/buildings.ruleset:682
+#: data/default/buildings.ruleset:681
#, fuzzy
msgid ""
"Together with a Library, a Research Lab increases the science production of "
@@ -18845,11 +18999,11 @@ msgstr ""
"100%. òÁÚÏÍ Ú â¦Â̦ÏÔÅËÏÀ ÔÁ õΦ×ÅÒÓÉÔÅÔÏÍ äÏÓ̦ÄÎÁ ÌÁÂÏÒÁÔÏÒ¦Ñ Ú¦ÌØÛÕ¤ "
"ÒÏÚ×ÉÔÏË ÎÁÕËÉ Õ Í¦ÓÔ¦ ÎÁ 150%."
-#: data/default/buildings.ruleset:690 data/civ2/buildings.ruleset:654
+#: data/default/buildings.ruleset:689 data/civ2/buildings.ruleset:654
msgid "SAM Battery"
msgstr "ðÒÏÔÉÐÏצÔÒÑÎÁ ÏÂÏÒÏÎÁ"
-#: data/default/buildings.ruleset:704 data/civ2/buildings.ruleset:668
+#: data/default/buildings.ruleset:703 data/civ2/buildings.ruleset:668
msgid ""
"Doubles the defense of all units inside the city when attacked by non-"
"nuclear air units."
@@ -18857,12 +19011,12 @@ msgstr ""
"ðÏÄ×ÏÀ¤ ÚÁÈÉÓÔ ÕÓ¦È Ð¦ÄÒÏÚÄ¦Ì¦× Õ Í¦ÓÔ¦ ÐÒÉ ÁÔÁæ ÎÅÁÔÏÍÎÉÍ ÐÏצÔÒÑÎÉÍ "
"ЦÄÒÏÚĦÌÏÍ."
-#: data/default/buildings.ruleset:710 data/civ2/buildings.ruleset:674
+#: data/default/buildings.ruleset:709 data/civ2/buildings.ruleset:674
#: data/civ1/buildings.ruleset:489
msgid "SDI Defense"
msgstr "óï¶ úÁÈÉÓÔ"
-#: data/default/buildings.ruleset:724 data/civ2/buildings.ruleset:688
+#: data/default/buildings.ruleset:723 data/civ2/buildings.ruleset:688
#: data/civ1/buildings.ruleset:503
msgid ""
"Protects a city from attacks from Nuclear units. Nuclear attacks simply "
@@ -18872,11 +19026,11 @@ msgstr ""
"úÁÈÉÝÁ¤ ͦÓÔÏ ×¦Ä ÁÔÁË áÔÏÍÎÉÈ ÂÏÍÂ. áÔÏÍΦ ÁÔÁËÉ ÐÒÏÓÔÏ ÎÅ ÍÁÀÔØ ×ÐÌÉ×Õ ÎÁ "
"ͦÓÔÏ. ôÁËÏÖ ÐÏÄ×ÏÀ¤ ÚÁÈÉÓÔ ÐÒÏÔÉ ÎÅÁÔÏÍÎÉÈ ÒÁËÅÔ."
-#: data/default/buildings.ruleset:733 data/civ2/buildings.ruleset:697
+#: data/default/buildings.ruleset:732 data/civ2/buildings.ruleset:697
msgid "Sewer System"
msgstr "ëÁÎÁ̦ÚÁæÑ"
-#: data/default/buildings.ruleset:748 data/civ2/buildings.ruleset:712
+#: data/default/buildings.ruleset:747 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."
@@ -18884,12 +19038,12 @@ msgstr ""
"äÏÚ×ÏÌѤ ͦÓÔÕ ÚÒÏÓÔÁÔÉ ÐÏÎÁÄ 12. ÷ÏÄÏǦΠÓÐÅÒÛÕ ÐÏÔÒ¦ÂÅÎ ÄÌÑ ÒÏÓÔÕ Í¦ÓÔÁ "
"ÐÏÎÁÄ 8."
-#: data/default/buildings.ruleset:754 data/civ2/buildings.ruleset:749
+#: data/default/buildings.ruleset:753 data/civ2/buildings.ruleset:749
#: data/civ1/buildings.ruleset:512
msgid "Space Component"
msgstr "ëÏÓͦÞÎÉÊ ëÏÍÐÏÎÅÎÔ"
-#: data/default/buildings.ruleset:769 data/civ2/buildings.ruleset:763
+#: data/default/buildings.ruleset:768 data/civ2/buildings.ruleset:763
#: data/civ1/buildings.ruleset:526
msgid ""
"Space Components can be differentiated into Propulsion and Fuel Components. "
@@ -18905,12 +19059,12 @@ msgstr ""
"ðÅÒÅÄ ÔÉÍ ÑË ÷É ÚÍÏÖÅÔÅ ÂÕÄÕ×ÁÔÉ ÂÕÄØ Ñ˦ ÞÁÓÔÉÎÉ ËÏÓͦÞÎÏÇÏ ËÏÒÁÂÌÑ, ÄÉ×Ï "
"ðÒÏÇÒÁÍÁ áÐÏÌÏ ÐÏ×ÉÎÎÏ ÂÕÔÉ ÚÂÕÄÏ×ÁÎÏ ÏÄÎÉÍ Ú ÇÒÁ×æ×."
-#: data/default/buildings.ruleset:779 data/civ2/buildings.ruleset:773
+#: data/default/buildings.ruleset:778 data/civ2/buildings.ruleset:773
#: data/civ1/buildings.ruleset:536
msgid "Space Module"
msgstr "ëÏÓͦÞÎÉÊ íÏÄÕÌØ"
-#: data/default/buildings.ruleset:794 data/civ2/buildings.ruleset:787
+#: data/default/buildings.ruleset:793 data/civ2/buildings.ruleset:787
#: data/civ1/buildings.ruleset:550
msgid ""
"Space Modules are the most expensive parts of spaceships. There are three "
@@ -18944,12 +19098,12 @@ msgstr ""
"ðÅÒÅÄ ÔÉÍ ÑË ÷É ÚÍÏÖÅÔÅ ÂÕÄÕ×ÁÔÉ ÂÕÄØ Ñ˦ ÞÁÓÔÉÎÉ ËÏÓͦÞÎÏÇÏ ËÏÒÁÂÌÑ, ÄÉ×Ï "
"ðÒÏÇÒÁÍÁ áÐÏÌÏ ÐÏ×ÉÎÎÏ ÂÕÔÉ ÚÂÕÄÏ×ÁÎÏ ÏÄÎÉÍ Ú ÇÒÁ×æ×."
-#: data/default/buildings.ruleset:813 data/civ2/buildings.ruleset:806
+#: data/default/buildings.ruleset:812 data/civ2/buildings.ruleset:806
#: data/civ1/buildings.ruleset:569
msgid "Space Structural"
msgstr "ëÏÓͦÞÎÁ óÔÒÕËÔÕÒÁ"
-#: data/default/buildings.ruleset:828 data/civ2/buildings.ruleset:820
+#: data/default/buildings.ruleset:827 data/civ2/buildings.ruleset:820
#: data/civ1/buildings.ruleset:583
msgid ""
"Space Structurals form the base of your spaceship. All other spaceship "
@@ -18966,11 +19120,11 @@ msgstr ""
"ðÅÒÅÄ ÔÉÍ ÑË ÷É ÚÍÏÖÅÔÅ ÂÕÄÕ×ÁÔÉ ÂÕÄØ Ñ˦ ÞÁÓÔÉÎÉ ËÏÓͦÞÎÏÇÏ ËÏÒÁÂÌÑ, ÄÉ×Ï "
"ðÒÏÇÒÁÍÁ áÐÏÌÏ ÐÏ×ÉÎÎÏ ÂÕÔÉ ÚÂÕÄÏ×ÁÎÏ ÏÄÎÉÍ Ú ÇÒÁ×æ×."
-#: data/default/buildings.ruleset:838 data/civ2/buildings.ruleset:830
+#: data/default/buildings.ruleset:837 data/civ2/buildings.ruleset:830
msgid "Stock Exchange"
msgstr "â¦ÒÖÁ"
-#: data/default/buildings.ruleset:854 data/civ2/buildings.ruleset:846
+#: data/default/buildings.ruleset:853 data/civ2/buildings.ruleset:846
#, no-c-format
msgid ""
"Together with a Marketplace and a Bank, a Stock Exchange boosts tax and "
@@ -18979,22 +19133,22 @@ msgstr ""
"òÁÚÏÍ Ú òÉÎËÏÍ ÔÁ âÁÎËÏÍ â¦ÒÖÁ Ú¦ÌØÛÕ¤ ÚÂ¦Ò ÐÏÄÁÔË¦× ÔÁ ÒÏÚË¦Û Õ Í¦ÓÔ¦ ÎÁ "
"150%."
-#: data/default/buildings.ruleset:860 data/civ2/buildings.ruleset:852
+#: data/default/buildings.ruleset:859 data/civ2/buildings.ruleset:852
msgid "Super Highways"
msgstr "ûÏÓÅ"
-#: data/default/buildings.ruleset:875 data/civ2/buildings.ruleset:867
+#: data/default/buildings.ruleset:874 data/civ2/buildings.ruleset:867
#, no-c-format
msgid ""
"Increases trade resources by 50% on all squares with roads or railroads."
msgstr ""
"ú¦ÌØÛÕ¤ ÔÏÒÇÏצ ÒÅÓÕÒÓÉ ÎÁ 50% ÎÁ ÕÓ¦È Ë̦ÔÉÎÁÈ Ú ÛÌÑÈÁÍÉ ÔÁ ÚÁ̦ÚÎÉÃÑÍÉ."
-#: data/default/buildings.ruleset:883 data/civ2/buildings.ruleset:873
+#: data/default/buildings.ruleset:882 data/civ2/buildings.ruleset:873
msgid "Supermarket"
msgstr "óÕÐÅÒÍÁÒËÅÔ"
-#: data/default/buildings.ruleset:898 data/civ2/buildings.ruleset:888
+#: data/default/buildings.ruleset:897 data/civ2/buildings.ruleset:888
#, no-c-format
msgid ""
"Increases the food resources by 50% on each farmland square which is being "
@@ -19004,12 +19158,12 @@ msgstr ""
"ú¦ÌØÛÕ¤ ÏÔÒÉÍÁÎÎÑ ÐÒÏÄÏ×ÏÌØÓÔ×Á ÎÁ 50% ÎÁ ËÏÖÎ¦Ê ÆÅÒͦ ÎÁ×ËÏÌÏ Í¦ÓÔÁ. æÅÒÍÉ "
"- ÃÅ Ë̦ÔÉÎÉ Ñ˦ ÂÕÌÏ ÚÒÏÛÅÎÏ Äצަ."
-#: data/default/buildings.ruleset:905 data/civ2/buildings.ruleset:895
+#: data/default/buildings.ruleset:904 data/civ2/buildings.ruleset:895
#: data/civ1/buildings.ruleset:593
msgid "Temple"
msgstr "ãÅÒË×Á"
-#: data/default/buildings.ruleset:919 data/civ2/buildings.ruleset:909
+#: data/default/buildings.ruleset:918 data/civ2/buildings.ruleset:909
#: data/civ1/buildings.ruleset:607
msgid ""
"Makes one unhappy citizen content. Both the Mysticism advance and the "
@@ -19020,13 +19174,13 @@ msgstr ""
"ÐÏÄ×ÏÀÀÔØ §§ ÅÆÅËÔÉ×ΦÓÔØ. òÁÚÏÍ Ú í¦ÓÔÉÃÉÚÍÏÍ ÎÁ ïÒÁËÌÏÍ, 4 ÎÅÝÁÓÎÉÈ "
"ÎÅÊÔÒÁ̦ÚÕÀÔØÓÑ."
-#: data/default/buildings.ruleset:926 data/civ2/buildings.ruleset:916
+#: data/default/buildings.ruleset:925 data/civ2/buildings.ruleset:916
#: data/civ1/buildings.ruleset:614 data/default/techs.ruleset:742
#: data/civ2/techs.ruleset:727 data/civ1/techs.ruleset:723
msgid "University"
msgstr "õΦ×ÅÒÓ¦ÔÅÔ"
-#: data/default/buildings.ruleset:942
+#: data/default/buildings.ruleset:941
#, fuzzy, no-c-format
msgid ""
"Together with a Library, a University increases the science production of a "
@@ -19034,12 +19188,12 @@ msgid ""
msgstr ""
"òÁÚÏÍ Ú â¦Â̦ÏÔÅËÏÀ, õΦ×ÅÒÓ¦ÔÅÔ Ú¦ÌØÛÕ¤ ÎÁÕËÏ×Õ Ä¦ÑÌØΦÓÔØ Õ Í¦ÓÔ¦ ÎÁ 100%."
-#: data/default/buildings.ruleset:948 data/civ2/buildings.ruleset:938
+#: data/default/buildings.ruleset:947 data/civ2/buildings.ruleset:938
#: data/civ1/buildings.ruleset:636
msgid "Apollo Program"
msgstr "ðÒÏÇÒÁÍÁ áÐÏÌÏ"
-#: data/default/buildings.ruleset:962 data/civ2/buildings.ruleset:952
+#: data/default/buildings.ruleset:961 data/civ2/buildings.ruleset:952
msgid ""
"Entire map becomes visible for the player who owns it. It allows all "
"players to start building spaceship parts (assuming they have researched the "
@@ -19049,23 +19203,23 @@ msgstr ""
"ÇÒÁ×ÃÑÍ ÒÏÚÐÏÞÁÔÉ ÂÕĦ×ÎÉÃÔ×Ï ÞÁÓÔÉÎ ËÏÓͦÞÎÏÇÏ ËÏÒÁÂÌÑ (ÚÁ ÕÍÏ×É "
"ÄÏÓ̦ÄÖÅÎÎÑ ÎÉÍÉ ÎÅÏÂȦÄÎÉÈ ÔÅÈÎÏÌÏǦÊ)."
-#: data/default/buildings.ruleset:969 data/civ2/buildings.ruleset:959
+#: data/default/buildings.ruleset:968 data/civ2/buildings.ruleset:959
msgid "A.Smith's Trading Co."
msgstr "ëÏÍÐÁÎÉÑ áÄÁÍÁ óͦÔÁ"
-#: data/default/buildings.ruleset:983
+#: data/default/buildings.ruleset:982
#, fuzzy
msgid ""
"City improvements which would normally have an upkeep of 1 are free of "
"upkeep, for all your cities."
msgstr "ãÅ ÄÉ×Ï ÎÅÊÔÒÁ̦ÚÕ¤ ÏÄÎÏÇÏ ÎÅÝÁÓÎÏÇÏ × ÕÓ¦È Í¦ÓÔÁÈ."
-#: data/default/buildings.ruleset:989 data/civ2/buildings.ruleset:979
+#: data/default/buildings.ruleset:988 data/civ2/buildings.ruleset:979
#: data/civ1/buildings.ruleset:655
msgid "Colossus"
msgstr "ëÏÌÏÓ"
-#: data/default/buildings.ruleset:1003 data/civ2/buildings.ruleset:993
+#: data/default/buildings.ruleset:1002 data/civ2/buildings.ruleset:993
#: data/civ1/buildings.ruleset:669
msgid ""
"Each square around the city where this wonder is built that is already "
@@ -19074,35 +19228,35 @@ msgstr ""
"ëÏÖÎÁ Ë̦ÔÉÎÁ ÎÁ×ËÏÌÏ Í¦ÓÔÁ Ú ÃÉÍ äÉ×ÏÍ, ÝÏ ×ÖÅ ×ÉÒÏÂÌѤ ÄÅÑËÉÊ ÐÒÉÂÕÔÏË "
"Ú¦ÌØÛÕ¤ ÊÏÇÏ ÎÁ ÏÄÉÎÉÃÀ."
-#: data/default/buildings.ruleset:1009 data/civ2/buildings.ruleset:999
+#: data/default/buildings.ruleset:1008 data/civ2/buildings.ruleset:999
#: data/civ1/buildings.ruleset:675
msgid "Copernicus' Observatory"
msgstr "ïÂÓÅÒ×ÁÔÏÒ¦Ñ ëÏÐÅÒÎÉËÁ"
-#: data/default/buildings.ruleset:1024 data/civ2/buildings.ruleset:1180
+#: data/default/buildings.ruleset:1023 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 "ð¦Ä×ÉÝÕÅ ÒÏÚ×ÉÔÏË ÎÁÕËÉ ÎÁ 100% Õ Í¦ÓÔ¦ ÄÅ ÊÏÇÏ ÐÏÂÕÄÏ×ÁÎÏ."
-#: data/default/buildings.ruleset:1029 data/civ2/buildings.ruleset:1019
+#: data/default/buildings.ruleset:1028 data/civ2/buildings.ruleset:1019
#: data/civ1/buildings.ruleset:695
msgid "Cure For Cancer"
msgstr "ì¦ËÉ ×¦Ä ÒÁËÕ"
-#: data/default/buildings.ruleset:1043
+#: data/default/buildings.ruleset:1042
#, fuzzy
msgid ""
"This stunning technological achievement makes one unhappy citizen content in "
"all your cities."
msgstr "ãÅ ÄÉ×Ï ÎÅÊÔÒÁ̦ÚÕ¤ ÏÄÎÏÇÏ ÎÅÝÁÓÎÏÇÏ × ÕÓ¦È Í¦ÓÔÁÈ."
-#: data/default/buildings.ruleset:1051 data/civ2/buildings.ruleset:1039
+#: data/default/buildings.ruleset:1050 data/civ2/buildings.ruleset:1039
#: data/civ1/buildings.ruleset:715
msgid "Darwin's Voyage"
msgstr "ðÏÄÏÒÏÖ äÁÒצÎÁ"
-#: data/default/buildings.ruleset:1065 data/civ2/buildings.ruleset:1053
+#: data/default/buildings.ruleset:1064 data/civ2/buildings.ruleset:1053
#: data/civ1/buildings.ruleset:729
msgid ""
"Charles Darwin's voyage sparked the discovery of the evolution of the "
@@ -19112,22 +19266,22 @@ msgstr ""
"ðÏÄÏÒÏÖ þÁÒÌÚÁ äÁÒצÎÁ ÓÐÒÉÞÉÎÉÌÁ צÄËÒÉÔÔÑ ÐÏÈÏÄÖÅÎÎÑ ×ÉĦ×, ÝÏ ÂÕÄÏ "
"×ÅÌÉËÉÍ ÚÄÏÂÕÔËÏÍ Õ ÎÁÕæ. îÁÄÁ¤ Ä×Á ÐÏÚÁÞÅÒÇÏ×ÉÈ ×¦ÄËÒÉÔÔÑ."
-#: data/default/buildings.ruleset:1072 data/civ2/buildings.ruleset:1060
+#: data/default/buildings.ruleset:1071 data/civ2/buildings.ruleset:1060
msgid "Eiffel Tower"
msgstr "åÊÆÅÌÅ×Á ×ÅÖÁ"
-#: data/default/buildings.ruleset:1087
+#: data/default/buildings.ruleset:1086
#, no-c-format
msgid ""
"Your reputation and goodwill among other nations is recovered twice as fast."
msgstr ""
-#: data/default/buildings.ruleset:1093 data/civ2/buildings.ruleset:1081
+#: data/default/buildings.ruleset:1092 data/civ2/buildings.ruleset:1081
#: data/civ1/buildings.ruleset:736
msgid "Great Library"
msgstr "÷ÅÌÉËÁ â¦Â̦ÏÔÅËÁ"
-#: data/default/buildings.ruleset:1107 data/civ2/buildings.ruleset:1095
+#: data/default/buildings.ruleset:1106 data/civ2/buildings.ruleset:1095
#: data/civ1/buildings.ruleset:750
msgid ""
"The civilization which builds the Great Library gets every advance that at "
@@ -19136,22 +19290,22 @@ msgstr ""
"ãÉצ̦ÚÁÃ¦Ñ ÝÏ ÐÏÂÕÄÕ×ÁÌÁ ÷ÅÌÉËÕ â¦Â̦ÏÔÅËÕ ÏÔÒÉÍÕ¤ ÂÕÄØ ÑËÅ ÎÏ×Å ÚÎÁÎÎÑ, ÝÏ "
"§È צÄËÒÉÌÉ ÂÕÄØ Ñ˦ Äצ ¦ÎÛ¦ ÃÉצ̦ÚÁæ§."
-#: data/default/buildings.ruleset:1113 data/civ2/buildings.ruleset:1101
+#: data/default/buildings.ruleset:1112 data/civ2/buildings.ruleset:1101
#: data/civ1/buildings.ruleset:756
msgid "Great Wall"
msgstr "÷ÅÌÉËÁ ÓÔ¦ÎÁ"
-#: data/default/buildings.ruleset:1127
+#: data/default/buildings.ruleset:1126
#, fuzzy
msgid "Works as a City Wall in all your cities."
msgstr "ðÒÁÃÀ¤ ÑË í¦ÓØËÁ ÓÔ¦ÎÁ Õ ×Ó¦È Í¦ÓÔÁÈ."
-#: data/default/buildings.ruleset:1135 data/civ2/buildings.ruleset:1122
+#: data/default/buildings.ruleset:1134 data/civ2/buildings.ruleset:1122
#: data/civ1/buildings.ruleset:777
msgid "Hanging Gardens"
msgstr "÷¦ÓÑÞ¦ ÓÁÄÉ"
-#: data/default/buildings.ruleset:1149 data/civ2/buildings.ruleset:1136
+#: data/default/buildings.ruleset:1148 data/civ2/buildings.ruleset:1136
#: data/civ1/buildings.ruleset:791
msgid ""
"Makes one content citizen happy in every city. Makes two extra content "
@@ -19164,12 +19318,12 @@ msgstr ""
"Ä×ÏÈ ÇÏÒÏÄÑÎ Õ Í¦ÓÔ¦ ÄÅ §È ÚÂÕÄÏ×ÁÎÏ (ÚÁÇÁÌÏÍ 3). ñËÝÏ ÎÅ ÍÁ¤ ÎÅÊÔÒÁÌØÎÉÈ "
"ÇÏÒÏÄÑÎ ÄÌÑ ÔÏÇÏ ÝÏ ÒÏÂÉÔÉ §È ÝÁÓÌÉ×ÉÍÉ, äÉ×Ï ÎÅÊÔÒÁ̦ÚÕ¤ ÎÅÝÁÓÎÉÈ."
-#: data/default/buildings.ruleset:1158 data/civ2/buildings.ruleset:1145
+#: data/default/buildings.ruleset:1157 data/civ2/buildings.ruleset:1145
#: data/civ1/buildings.ruleset:800
msgid "Hoover Dam"
msgstr "äÁÍÂÁ çÕ×ÅÒÁ"
-#: data/default/buildings.ruleset:1173 data/civ2/buildings.ruleset:1159
+#: data/default/buildings.ruleset:1172 data/civ2/buildings.ruleset:1159
msgid ""
"Works as if you had a Hydro Plant in every city. (This reduces pollution "
"and increases the effects of Factories and Mfg. Plants.)"
@@ -19177,32 +19331,32 @@ msgstr ""
"ðÒÁæ¤ ÔÁË, ΦÂÉÔÏ ÷É ÍÁ¤ÔÅ ç¦ÄÒÏÓÔÁÎæÀ Õ ËÏÖÎÏÍÕ Í¦ÓÔ¦ (úÍÅÎÛÕ¤ "
"ÚÁÂÒÕÄÎÅÎÎÑ ÔÁ ЦÄ×ÉÝÕ¤ ÅÆÅËÔÉ×ΦÓÔØ æÁÂÒÉË ÔÁ úÁ×ÏĦ×.)"
-#: data/default/buildings.ruleset:1179 data/civ2/buildings.ruleset:1165
+#: data/default/buildings.ruleset:1178 data/civ2/buildings.ruleset:1165
#: data/civ1/buildings.ruleset:822
msgid "Isaac Newton's College"
msgstr "ëÏÌÅÄÖ ¶ÓÁËÁ îØÀÔÏÎÁ"
-#: data/default/buildings.ruleset:1194
+#: data/default/buildings.ruleset:1193
#, fuzzy, no-c-format
msgid ""
"Boosts science production by 100% in every city you control that has a "
"University."
msgstr "ð¦Ä×ÉÝÕÅ ÒÏÚ×ÉÔÏË ÎÁÕËÉ ÎÁ 100% Õ Í¦ÓÔ¦ ÄÅ ÊÏÇÏ ÐÏÂÕÄÏ×ÁÎÏ."
-#: data/default/buildings.ruleset:1200 data/civ2/buildings.ruleset:1185
+#: data/default/buildings.ruleset:1199 data/civ2/buildings.ruleset:1185
#: data/civ1/buildings.ruleset:842
msgid "J.S. Bach's Cathedral"
msgstr "óÏÂÏÒ ê.ó. âÁÈÁ"
-#: data/default/buildings.ruleset:1214 data/civ2/buildings.ruleset:1199
+#: data/default/buildings.ruleset:1213 data/civ2/buildings.ruleset:1199
msgid "Makes two unhappy citizens content in every city."
msgstr "îÅÊÔÒÁ̦ÚÕ¤ Ä×ÏÈ ÎÅÓÞÁÓÎÉÈ Õ ËÏÖÎÏÍÕ Í¦ÓÔ¦."
-#: data/default/buildings.ruleset:1219 data/civ2/buildings.ruleset:1204
+#: data/default/buildings.ruleset:1218 data/civ2/buildings.ruleset:1204
msgid "King Richard's Crusade"
msgstr "èÒÅÓÔÏ×ÉÊ ÐÏÈ¦Ä ëÏÒÏÌÑ ò¦ÞÁÒÄÁ "
-#: data/default/buildings.ruleset:1233 data/civ2/buildings.ruleset:1218
+#: data/default/buildings.ruleset:1232 data/civ2/buildings.ruleset:1218
msgid ""
"Adds one extra shield resource on every square around the city where it is "
"built."
@@ -19210,20 +19364,20 @@ msgstr ""
"äÏÄÁ¤ ÄÏÄÁÔËÏ×ÉÊ ×ÉÒÏÂÎÉÞÉÊ ÒÅÓÕÒÓ ÎÁ ËÏÖÎÕ Ë̦ÔÉÎËÕ Â¦ÌÑ Í¦ÓÔÁ ÄÅ ÊÏÇÏ "
"ÚÂÕÄÏ×ÁÎÏ."
-#: data/default/buildings.ruleset:1239 data/civ2/buildings.ruleset:1224
+#: data/default/buildings.ruleset:1238 data/civ2/buildings.ruleset:1224
msgid "Leonardo's Workshop"
msgstr "íÁÊÓÔÅÒÎÑ ìÅÏÎÁÒÄÏ"
-#: data/default/buildings.ruleset:1253 data/civ2/buildings.ruleset:1238
+#: data/default/buildings.ruleset:1252 data/civ2/buildings.ruleset:1238
msgid "Upgrades one obsolete unit per game turn."
msgstr "íÏÄÅÒΦÚÕ¤ ÏÄÉÎ ÚÁÓÔÁÒ¦ÌÉÊ Ð¦ÄÒÏÚÄ¦Ì ÚÁ ȦÄ."
-#: data/default/buildings.ruleset:1258 data/civ2/buildings.ruleset:1243
+#: data/default/buildings.ruleset:1257 data/civ2/buildings.ruleset:1243
#: data/civ1/buildings.ruleset:862
msgid "Lighthouse"
msgstr "íÁÑË"
-#: data/default/buildings.ruleset:1273
+#: data/default/buildings.ruleset:1272
#, fuzzy
msgid ""
"Gives all your sea units 1 additional movement point and eliminates the risk "
@@ -19234,35 +19388,35 @@ msgstr ""
"ôÒ¦¤ÍÉ Õ ÏËÅÁΦ. òÏÂÉÔØ ÕÓ¦ ÎÏצ ÍÏÒÓØ˦ ЦÄÒÏÚĦÌÉ ×ÅÔÅÒÁÎÁÍÉ (× ÕÓ¦È "
"ͦÓÔÁÈ)."
-#: data/default/buildings.ruleset:1280 data/civ2/buildings.ruleset:1264
+#: data/default/buildings.ruleset:1279 data/civ2/buildings.ruleset:1264
#: data/civ1/buildings.ruleset:885
msgid "Magellan's Expedition"
msgstr "åËÐÅÄÉÃ¦Ñ íÁÇÅÌÁÎÁ"
-#: data/default/buildings.ruleset:1295
+#: data/default/buildings.ruleset:1294
#, fuzzy
msgid "Gives all your sea units 2 additional movement points."
msgstr "äÁ¤ ÍÏÒÓØË¦Í Ð¦ÄÒÏÚĦÌÁÍ Ä×Á ÄÏÄÁÔËÏצ ÈÏÄÉ"
-#: data/default/buildings.ruleset:1300 data/civ2/buildings.ruleset:1283
+#: data/default/buildings.ruleset:1299 data/civ2/buildings.ruleset:1283
#: data/civ1/buildings.ruleset:904
msgid "Manhattan Project"
msgstr "íÁÎÈÅÔÅÎÓØË¦Ê ÐÒÏÅËÔ"
-#: data/default/buildings.ruleset:1318 data/civ2/buildings.ruleset:1301
+#: data/default/buildings.ruleset:1317 data/civ2/buildings.ruleset:1301
msgid "Marco Polo's Embassy"
msgstr "áÍÂÁÓÁÄÁ íÁÒËÏ ðÏÌÏ"
-#: data/default/buildings.ruleset:1332 data/civ2/buildings.ruleset:1315
+#: data/default/buildings.ruleset:1331 data/civ2/buildings.ruleset:1315
msgid "The player who owns it gets an embassy with all players."
msgstr "çÒÁ×ÅÃØ ÝÏ ÍÁ¤ ÃÅ ÄÉ×Ï - ÏÔÒÉÍÕ¤ ÁÍÂÁÓÁÄÉ Ú ÕÓ¦ÍÁ ÇÒÁ×ÃÑÍÉ."
-#: data/default/buildings.ruleset:1337 data/civ2/buildings.ruleset:1320
+#: data/default/buildings.ruleset:1336 data/civ2/buildings.ruleset:1320
#: data/civ1/buildings.ruleset:922
msgid "Michelangelo's Chapel"
msgstr "ëÁÐÅÌÌÁ í¦ËÅÌØÁÎÖÅÌÏ"
-#: data/default/buildings.ruleset:1351 data/civ2/buildings.ruleset:1334
+#: data/default/buildings.ruleset:1350 data/civ2/buildings.ruleset:1334
msgid ""
"Counts as having a Cathedral in each of your cities. This makes 3 unhappy "
"citizens content in each city. The discovery of Theology increases the "
@@ -19274,22 +19428,22 @@ msgstr ""
"÷¦ÄËÒÉÔÔÑ ôÅÏÌÏǦ§ Ú¦ÌØÛÕ¤ ÅÆÅËÔÉ×ΦÓÔØ óÏÂÏÒ¦×, ×Ô¦ÛÁÀÞÉ ÝÅ ÏÄÎÏÇÏ "
"ÎÅÝÁÓÎÏÇÏ. ÷¦ÄËÒÉÔÔÑ ëÏÍÕΦÚÍÕ ÚÍÅÎÛÕ¤ ÎÁ ÏÄÉÎÉÃÀ ÅÆÅËÔÉ×ΦÓÔØ óÏÂÏÒ¦×."
-#: data/default/buildings.ruleset:1361 data/civ2/buildings.ruleset:1344
+#: data/default/buildings.ruleset:1360 data/civ2/buildings.ruleset:1344
#: data/civ1/buildings.ruleset:941
msgid "Oracle"
msgstr "ïÒÁËÌ"
-#: data/default/buildings.ruleset:1375
+#: data/default/buildings.ruleset:1374
#, fuzzy
msgid "Makes two of your unhappy citizens content in every city with a temple."
msgstr "îÅÊÔÒÁ̦ÚÕ¤ Ä×ÏÈ ÎÅÓÞÁÓÎÉÈ Õ ËÏÖÎÏÍÕ Í¦ÓÔ¦."
-#: data/default/buildings.ruleset:1380 data/civ2/buildings.ruleset:1363
+#: data/default/buildings.ruleset:1379 data/civ2/buildings.ruleset:1363
#: data/civ1/buildings.ruleset:960
msgid "Pyramids"
msgstr "ð¦ÒÁͦÄÉ"
-#: data/default/buildings.ruleset:1394
+#: data/default/buildings.ruleset:1393
#, fuzzy
msgid ""
"The amount of stored food lost when one of your cities grows or shrinks is "
@@ -19300,31 +19454,31 @@ msgstr ""
"ÇÏÌÏĦ ÚÁ×ÄÑËÉ áÍÂÁÒÕ. ãÅ ÄÏÐÏÍÁÇÁ¤ ͦÓÔÕ Û×ÉÄÛÅ ÒÏÓÔÉ ÔÁ ÌÅÇÛÅ ÐÅÒÅÎÏÓÉÔÉ "
"ÇÏÌÏÄÏÍÏÒ."
-#: data/default/buildings.ruleset:1401 data/civ2/buildings.ruleset:1382
+#: data/default/buildings.ruleset:1400 data/civ2/buildings.ruleset:1382
#: data/civ1/buildings.ruleset:981
msgid "SETI Program"
msgstr "ðÒÏÇÒÁÍÁ SETI"
-#: data/default/buildings.ruleset:1415
+#: data/default/buildings.ruleset:1414
#, fuzzy
msgid "Boosts science production in each city with a Research Lab by 100%. "
msgstr "ú¦ÌØÛÕ¤ ÒÏÚ×ÉÔÏË ÎÁÕËÉ × ÕÓ¦È Í¦ÓÔÁÈ ÎÁ 50%."
-#: data/default/buildings.ruleset:1420 data/civ2/buildings.ruleset:1402
+#: data/default/buildings.ruleset:1419 data/civ2/buildings.ruleset:1402
#: data/civ1/buildings.ruleset:1001
msgid "Shakespeare's Theatre"
msgstr "ôÅÁÔÒ ûÅËÓЦÒÁ"
-#: data/default/buildings.ruleset:1434 data/civ2/buildings.ruleset:1416
+#: data/default/buildings.ruleset:1433 data/civ2/buildings.ruleset:1416
#: data/civ1/buildings.ruleset:1015
msgid "Makes all unhappy citizens content, in the city where it is located."
msgstr "îÅÊÔÒÁ̦ÚÕ¤ ÕÓ¦È ÎÅÓÞÁÓÎÉÈ Õ Í¦ÓÔ¦ ÄÅ ÊÏÇÏ ÒÏÚͦÝÅÎÏ."
-#: data/default/buildings.ruleset:1439 data/civ2/buildings.ruleset:1421
+#: data/default/buildings.ruleset:1438 data/civ2/buildings.ruleset:1421
msgid "Statue of Liberty"
msgstr "óÔÁÔÕÑ ó×ÏÂÏÄÉ"
-#: data/default/buildings.ruleset:1453 data/civ2/buildings.ruleset:1435
+#: data/default/buildings.ruleset:1452 data/civ2/buildings.ruleset:1435
#: data/civ1/buildings.ruleset:974 data/civ1/buildings.ruleset:1034
msgid ""
"Allows you to choose any government, including those that have not yet been "
@@ -19334,11 +19488,11 @@ msgstr ""
"äÏÚ×ÏÌѤ ÷ÁÍ ÏÂÉÒÁÔÉ ÂÕÄØ ÑËÕ ÆÏÒÍÕ ËÅÒÕ×ÁÎÎÑ, ×ËÌÀÞÁÀÞÉ Ô¦ ÝÏ ÎÅ ÄÏÓ̦ÄÖÅΦ "
"÷ÁÛÏÀ ÃÉצ̦ÚÁæ¤À, ÔÁ ÂÅÚ ÐÅÒÅȦÄÎÏÇÏ ÐÅÒ¦ÏÄÕ áÎÁÒȦ§."
-#: data/default/buildings.ruleset:1460 data/civ2/buildings.ruleset:1442
+#: data/default/buildings.ruleset:1459 data/civ2/buildings.ruleset:1442
msgid "Sun Tzu's War Academy"
msgstr "íÉÓÔÅÃÔ×Ï ÷¦ÊÎÉ óÕÎ äÚÕ"
-#: data/default/buildings.ruleset:1474
+#: data/default/buildings.ruleset:1473
#, fuzzy
msgid ""
"All your new ground units start at the first veteran level. The chance of a "
@@ -19348,22 +19502,22 @@ msgstr ""
"÷¦ÒÏǦÄΦÓÔØ ÔÏÇÏ, ÝÏ Ð¦ÄÒÏÚÄ¦Ì ÓÔÁÎÅ ×ÅÔÅÒÁÎÏÍ Ð¦ÓÌÑ ÂÉÔ×É Ú¦ÌØÛÕ¤ÔØÓÑ Ú "
"50% ÄÏ 100%."
-#: data/default/buildings.ruleset:1481 data/civ2/buildings.ruleset:1463
+#: data/default/buildings.ruleset:1480 data/civ2/buildings.ruleset:1463
#: data/civ1/buildings.ruleset:1020
msgid "United Nations"
msgstr "ïÂ'¤ÄÎÁÎΦ ÎÁæ§"
-#: data/default/buildings.ruleset:1495
+#: data/default/buildings.ruleset:1494
#, fuzzy
msgid "All your units regain two extra hitpoints per turn."
msgstr "úÁÇÏÎÉ ÏÔÒÉÍÕÀÔØ Ä×Á ÄÏÄÁÔËÏצ ÚÄÏÒÏ×'Ñ ÚÁ ȦÄ."
-#: data/default/buildings.ruleset:1508 data/civ2/buildings.ruleset:1490
+#: data/default/buildings.ruleset:1507 data/civ2/buildings.ruleset:1490
#: data/civ1/buildings.ruleset:1046
msgid "Women's Suffrage"
msgstr "ðÒÁ×Ï ÇÏÌÏÓÕ"
-#: data/default/buildings.ruleset:1522 data/civ2/buildings.ruleset:1504
+#: data/default/buildings.ruleset:1521 data/civ2/buildings.ruleset:1504
msgid ""
"Counts as a Police Station in every city. (That is, for each city, reduces "
"unhappiness for military units outside the city by 2 under Democracy and 1 "
@@ -19373,11 +19527,11 @@ msgstr ""
"˦ÌØ˦ÓÔØ ÎÅÝÁÓÎÉÈ Ú ÐÒÉÞÉÎÉ ×¦ÄÓÕÔÎÏÓÔ¦ צÊÓØËÏ×ÉÈ Ð¦ÄÒÏÚÄ¦Ì¦× Õ Í¦ÓÔ¦ ÎÁ 2 "
"ÚÁ äÅÍÏËÒÁÔ¦§ ÔÁ ÎÁ 1 ÚÁ òÅÓÐÕÂ̦˦. îŠĦ¤ ÚÁ ¦ÎÛÉÈ ÆÏÒÍ ÐÒÁ×̦ÎÎÑ.)"
-#: data/default/buildings.ruleset:1533
+#: data/default/buildings.ruleset:1532
msgid "Coinage"
msgstr "íÏÎÅÔÎÉÊ ÄצÒ"
-#: data/default/buildings.ruleset:1554
+#: data/default/buildings.ruleset:1553
msgid ""
"This is not a normal improvement. Instead, setting a city's production to "
"Coinage means its shield production is converted to tax output (money, "
@@ -19817,12 +19971,17 @@ msgstr "?
msgid "?citystyle:Industrial"
msgstr "?ͦÓÔÏ:îÁÚ×Á"
-#: data/default/cities.ruleset:139 data/civ2/cities.ruleset:150
+#: data/default/cities.ruleset:139
+#, fuzzy
+msgid "?citystyle:ElectricAge"
+msgstr "?ÓÔÁÎ_ͦÓÔÁ:óÐÏ˦Ê"
+
+#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:150
#, fuzzy
msgid "?citystyle:Modern"
msgstr "?ÓÔÁÎ_ͦÓÔÁ:úÁ×ÏÒÕÛÅÎÎÑ"
-#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:161
+#: data/default/cities.ruleset:161 data/civ2/cities.ruleset:161
#, fuzzy
msgid "?citystyle:PostModern"
msgstr "?ÓÔÁÎ_ͦÓÔÁ:úÁ×ÏÒÕÛÅÎÎÑ"
@@ -25232,6 +25391,32 @@ msgstr "
msgid "Team 31"
msgstr "ëÏÍÁÎÄÁ"
+#~ msgid "Command access level could not be set to '%s' for connection %s."
+#~ msgstr "ò¦×ÅÎØ ÄÏÓÔÕÐÕ ÄÏ ËÏÍÁÎÄ ÎÅ ×ÓÔÁÎÏ×ÌÅÎÏ Õ '%s' ÄÌÑ Ú'¤ÄÎÁÎÎÑ %s."
+
+#, fuzzy
+#~ msgid "Value must be integer."
+#~ msgstr "úÎÁÞÅÎÎÑ ÐÏ×ÉÎÏ ÂÕÔÉ Ã¦ÌÉÍ."
+
+#~ 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 Hydro Plant, Power Plant, or Nuclear Plant. A "
+#~ "city can only build a Hydro Plant if it is next to (or on) a Mountain or "
+#~ "River tile."
+#~ msgstr ""
+#~ "úÍÅÎÛÕ¤ ÚÁÂÒÕÄÎÅÎÎÑ, ÝÏ ×ÉÎÉËÁ¤ ×ÎÁÓ̦ÄÏË ×ÉÒÏÂÎÉÃÔ×Á Õ Í¦ÓÔ¦ ÎÁ 50%. "
+#~ "ôÁËÏÖ Ú¦ÌØÛÕ¤ ×ÉÒÏÂÎÉÃÔ×Ï ÎÁ æÁÂÒÉËÁÈ ÔÁ úÁ×ÏÄÁÈ Õ Í¦ÓÔ¦: æÁÂÒÉËÁ ÔÁ "
+#~ "ç¦ÄÒÏÓÔÁÎÃ¦Ñ ÒÁÚÏÍ ÄÁÀÔØ ÐÒÉÒ¦ÓÔ ×ÉÒÏÂÎÉÃÔ×Á 75%, æÁÂÒÉËÁ, úÁ×ÏÄ ÔÁ "
+#~ "ç¦ÄÒÏÓÔÁÎÃ¦Ñ ÒÁÚÏÍ ÄÁÀÔØ 150% ÐÒÉÒ¦ÓÔÕ ×ÉÒÏÂÎÉÃÔ×Á.\n"
+#~ "\n"
+#~ "í¦ÓÔÏ ÍÏÖÅ ÍÁÔÉ ÌÉÛÅ ÏÄÎÕ ç¦ÄÒÏ, ôÅÐÌÏ ÞÉ AÔÏÍÎÕ ÓÔÁÎæÀ. í¦ÓÔÏ ÍÏÖÅ "
+#~ "ÂÕÄÕ×ÁÔÉ ç¦ÄÒÏÓÔÁÎæÀ ÌÉÛÅ ÚÁ ÕÍÏ×É ÚÎÁÈÏÄÖÅÎÎÑ ÐÏÒÑÄ Ò¦ÞËÉ ÁÂÏ Ç¦Ò."
+
#, fuzzy
#~ msgid "Auth config filename \"%s\" not allowed!"
#~ msgstr "ñ˦ Ú'¤ÄÎÁÎÎÑ ÄÏÚ×ÏÌÅΦ."
@@ -28247,9 +28432,6 @@ msgstr "
#~ msgid "%s lose %s when %s lost"
#~ msgstr "%s ×ÔÒÁÞÁ¤ %s ÞÅÒÅÚ ×ÔÒÁÔÕ %s"
-#~ msgid "%s lose %s to the %s"
-#~ msgstr "%s ×ÔÒÁÔÉ× %s Õ %s"
-
#~ msgid "%s discover %s (Hut)"
#~ msgstr "%s צÄËÒÉ× %s (èÕÔ¦Ò)"
@@ -28481,9 +28663,6 @@ msgstr "
#~ msgid "What do you wish to to?"
#~ msgstr "ýÏ ×É ÐÌÁÎÕ¤ÔÅ ÒÏÂÉÔÉ?"
-#~ msgid "New Game"
-#~ msgstr "îÏ×Á ÇÒÁ"
-
#~ msgid "Quit Game"
#~ msgstr "÷ÉÊÔÉ Ú ÇÒÉ"
diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
index 4ad7842..f9f7af9 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 93c8d45..7b2cafc 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: 2009-03-29 21:13+0900\n"
+"POT-Creation-Date: 2009-11-22 21:37+0100\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"
@@ -66,21 +66,21 @@ msgstr "
msgid "?redundant:*"
msgstr "Èß"
-#: common/connection.c:515
+#: common/connection.c:518
#, c-format
msgid "%s from %s"
msgstr "%s À´×Ô %s"
-#: common/connection.c:521
+#: common/connection.c:524
msgid " (connection incomplete)"
msgstr " £¨Á¬½ÓδÍê³É£©"
-#: common/connection.c:525
+#: common/connection.c:528
#, c-format
msgid " (player %s)"
msgstr " £¨Íæ¼Ò %s£©"
-#: common/connection.c:529
+#: common/connection.c:532
msgid " (observer)"
msgstr " £¨ÅÔ¹ÛÕߣ©"
@@ -500,81 +500,81 @@ msgstr "
msgid "AI Debug messages"
msgstr ""
-#: common/player.c:732
+#: common/player.c:746
msgid "?attitude:Genocidal"
msgstr "ÖÖ×åÃð¾ø"
-#: common/player.c:734
+#: common/player.c:748
msgid "?attitude:Belligerent"
msgstr "½»Õ½ÖÐ"
-#: common/player.c:736
+#: common/player.c:750
msgid "?attitude:Hostile"
msgstr "µÐ¶Ô"
-#: common/player.c:738
+#: common/player.c:752
msgid "?attitude:Uncooperative"
msgstr "²»ºÏ×÷"
-#: common/player.c:740
+#: common/player.c:754
msgid "?attitude:Uneasy"
msgstr "²»°²"
-#: common/player.c:742
+#: common/player.c:756
msgid "?attitude:Neutral"
msgstr "ÖÐÁ¢"
-#: common/player.c:744
+#: common/player.c:758
msgid "?attitude:Respectful"
msgstr "Ç«¹§µÄ"
-#: common/player.c:746
+#: common/player.c:760
msgid "?attitude:Helpful"
msgstr "ÓÐÒæµÄ"
-#: common/player.c:748
+#: common/player.c:762
msgid "?attitude:Enthusiastic"
msgstr "¿ñÈȵÄ"
-#: common/player.c:750
+#: common/player.c:764
msgid "?attitude:Admiring"
msgstr "ÇÕÅåµÄ"
-#: common/player.c:753
+#: common/player.c:767
msgid "?attitude:Worshipful"
msgstr "³ç°ÝµÄ"
-#: common/player.c:764
+#: common/player.c:778
msgid "?diplomatic_state:Armistice"
msgstr "Í£»ð"
-#: common/player.c:765
+#: common/player.c:779
msgid "?diplomatic_state:War"
msgstr "Õ½Õù"
-#: common/player.c:766 client/gui-gtk-2.0/diplodlg.c:361
+#: common/player.c:780 client/gui-gtk-2.0/diplodlg.c:353
#: 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:767 client/gui-gtk-2.0/diplodlg.c:366
+#: common/player.c:781 client/gui-gtk-2.0/diplodlg.c:358
#: 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:768 client/gui-gtk-2.0/diplodlg.c:371
+#: common/player.c:782 client/gui-gtk-2.0/diplodlg.c:363
#: 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:769
+#: common/player.c:783
msgid "?diplomatic_state:Never met"
msgstr "δÓö"
-#: common/player.c:770
+#: common/player.c:784
msgid "?diplomatic_state:Team"
msgstr "ÍŶÓ"
@@ -605,7 +605,7 @@ msgstr "Ö»Ö§
#. TRANS: "Resources: (none)".
#: common/requirements.c:1014 common/team.c:132
#: client/gui-gtk-2.0/helpdlg.c:1055 client/gui-gtk-2.0/inteldlg.c:390
-#: client/gui-win32/helpdlg.c:586 client/gui-xaw/helpdlg.c:991
+#: client/gui-win32/helpdlg.c:592 client/gui-xaw/helpdlg.c:991
#, c-format
msgid "(none)"
msgstr "£¨ÎÞ£©"
@@ -631,10 +631,11 @@ msgstr "δ
#: 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
#: client/gui-sdl/helpdlg.c:817 client/gui-sdl/mapview.c:962
-#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:545
-#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:735
-#: 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
+#: client/gui-win32/helpdlg.c:165 client/gui-win32/helpdlg.c:544
+#: client/gui-win32/helpdlg.c:551 client/gui-win32/helpdlg.c:721
+#: client/gui-win32/helpdlg.c:741 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 "ÎÞ"
@@ -647,29 +648,29 @@ msgstr "δ
msgid "(Unknown)"
msgstr "£¨Î´Öª£©"
-#: common/terrain.c:392 common/terrain.c:574 common/unit.c:550
+#: common/terrain.c:392 common/terrain.c:574 common/unit.c:553
#: manual/civmanual.c:224
msgid "Road"
msgstr "¹«Â·"
-#: common/terrain.c:393 common/terrain.c:581 common/unit.c:554
+#: common/terrain.c:393 common/terrain.c:581 common/unit.c:557
#: client/gui-gtk-2.0/menu.c:829 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:394 common/terrain.c:572 common/unit.c:564
+#: common/terrain.c:394 common/terrain.c:572 common/unit.c:567
#: data/default/techs.ruleset:581 data/civ2/techs.ruleset:566
#: data/civ1/techs.ruleset:563
msgid "Railroad"
msgstr "Ìú·"
-#: common/terrain.c:395 common/terrain.c:585 common/unit.c:552
+#: common/terrain.c:395 common/terrain.c:585 common/unit.c:555
msgid "Mine"
msgstr "¿ó¾®"
-#: common/terrain.c:396 common/unit.c:548 server/report.c:124
+#: common/terrain.c:396 common/unit.c:551 server/report.c:124
#: client/cityrepdata.c:519 client/gui-sdl/optiondlg.c:1773
msgid "Pollution"
msgstr "ÎÛȾ"
@@ -678,7 +679,7 @@ msgstr "
msgid "Hut"
msgstr "éÎÝ"
-#: common/terrain.c:398 common/terrain.c:589 common/unit.c:560
+#: common/terrain.c:398 common/terrain.c:589 common/unit.c:563
#: manual/civmanual.c:226
msgid "Fortress"
msgstr "ÒªÈû"
@@ -691,58 +692,58 @@ msgstr "
msgid "Farmland"
msgstr "Å©³¡"
-#: common/terrain.c:401 common/terrain.c:593 common/unit.c:574
+#: common/terrain.c:401 common/terrain.c:593 common/unit.c:577
#: manual/civmanual.c:226
msgid "Airbase"
msgstr "¿Õ¾ü»ùµØ"
-#: common/terrain.c:402 common/unit.c:576
+#: common/terrain.c:402 common/unit.c:579
msgid "Fallout"
msgstr "·øÉä"
-#: common/unit.c:546 client/gui-win32/plrdlg.c:337
+#: common/unit.c:549 client/gui-win32/plrdlg.c:337
msgid "Idle"
msgstr "¿ÕÏÐ"
-#: common/unit.c:556
+#: common/unit.c:559
msgid "Fortifying"
msgstr "ÕýÔÚÐÞÖþ·ÀÓù¹¤ÊÂ"
-#: common/unit.c:558
+#: common/unit.c:561
msgid "Fortified"
msgstr "ÒÑÉè·À"
-#: common/unit.c:562 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
+#: common/unit.c:565 client/gui-sdl/menu.c:661 client/gui-xaw/menu.c:184
msgid "Sentry"
msgstr "·ÅÉÚ"
-#: common/unit.c:566 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
+#: common/unit.c:569 client/gui-gtk-2.0/menu.c:882 client/gui-sdl/menu.c:648
#: client/gui-win32/menu.c:370 client/gui-xaw/menu.c:185
msgid "Pillage"
msgstr "ÂÓ¶á"
-#: common/unit.c:568 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
+#: common/unit.c:571 client/gui-win32/gotodlg.c:165 data/Freeciv.in:1123
msgid "Goto"
msgstr "Ç°Íù"
-#: common/unit.c:570
+#: common/unit.c:573
msgid "Explore"
msgstr "¿±Ì½"
-#: common/unit.c:572 manual/civmanual.c:224
+#: common/unit.c:575 manual/civmanual.c:224
msgid "Transform"
msgstr "¸ÄÔì"
-#: common/unit.c:584 client/text.c:157 client/gui-sdl/citydlg.c:1972
+#: common/unit.c:587 client/text.c:157 client/gui-sdl/citydlg.c:1972
#: client/gui-win32/citydlg.c:1257 client/gui-xaw/citydlg.c:1423
msgid "Unknown"
msgstr "δ֪"
-#: common/unit.c:1022
+#: common/unit.c:1025
msgid "Moves"
msgstr "»ØºÏ"
-#: common/unit.c:1571
+#: common/unit.c:1574
#, c-format
msgid ""
"Upgrade %s to %s for %d gold?\n"
@@ -751,12 +752,12 @@ msgstr ""
"»¨·Ñ %3$d »Æ½ð½« %1$s Éý¼¶µ½ %2$s £¿\n"
"¹ú¿âÏÖÓÐ %4$d »Æ½ð¡£"
-#: common/unit.c:1579
+#: common/unit.c:1582
#, c-format
msgid "Sorry, cannot upgrade %s (yet)."
msgstr "±§Ç¸£¬£¨Ä¿Ç°£©ÎÞ·¨Éý¼¶ %s¡£"
-#: common/unit.c:1585
+#: common/unit.c:1588
#, c-format
msgid ""
"Upgrading %s to %s costs %d gold.\n"
@@ -765,11 +766,11 @@ msgstr ""
"½« %s Éý¼¶µ½ %s ÐèÒª»¨·Ñ %d »Æ½ð¡£\n"
"¹ú¿âÏÖÓÐ %d »Æ½ð¡£"
-#: common/unit.c:1594
+#: common/unit.c:1597
msgid "You can only upgrade units in your cities."
msgstr "ÄúÖ»ÄÜÔÚÄúµÄ³ÇÊÐÖÐÉý¼¶²¿¶Ó¡£"
-#: common/unit.c:1598
+#: common/unit.c:1601
#, c-format
msgid "Upgrading this %s would strand units it transports."
msgstr "Éý¼¶´Ë %s ½«Ê¹ËüËùÔËË͵IJ¿¶Ó¸édz¡£"
@@ -806,11 +807,11 @@ msgstr "
#. TRANS: List of possible output types has this between
#. * last two elements
-#: common/unittype.c:349 client/helpdata.c:1404
+#: common/unittype.c:349 client/helpdata.c:1412
msgid " and "
msgstr "£¬"
-#: common/unittype.c:355 client/helpdata.c:1390
+#: common/unittype.c:355 client/helpdata.c:1398
msgid "?and:, "
msgstr "£¬"
@@ -974,69 +975,69 @@ msgstr "
msgid "Missing argument for \"%s\".\n"
msgstr "ȱÉÙ²ÎÊý¡°%s¡±¡£\n"
-#: utility/shared.c:501
+#: utility/shared.c:514
#, c-format
msgid "%d BC"
msgstr "¹«ÔªÇ° %d"
-#: utility/shared.c:503
+#: utility/shared.c:516
#, c-format
msgid "%d AD"
msgstr "¹«Ôª %d"
-#: utility/shared.c:924
+#: utility/shared.c:937
msgid "FREECIV_PATH is set but empty; using default path instead."
msgstr "FREECIV_PATH ÒÑÉèÖõ«Îª¿Õ£»ÒÔĬÈÏ·¾¶´úÌæ¡£"
-#: utility/shared.c:1028
+#: utility/shared.c:1041
#, c-format
msgid "Could not read data directory %s: %s."
msgstr "ÎÞ·¨¶ÁÈ¡Êý¾ÝĿ¼ %s£º%s¡£"
-#: utility/shared.c:1279
+#: utility/shared.c:1292
msgid "The data path may be set via the environment variable FREECIV_PATH."
msgstr "¿ÉÒÔͨ¹ý»·¾³±äÁ¿ FREECIV_PATH À´ÉèÖÃÊý¾Ý·¾¶¡£"
-#: utility/shared.c:1281
+#: utility/shared.c:1294
#, c-format
msgid "Current data path is: \"%s\""
msgstr "µ±Ç°Êý¾Ý·¾¶Îª£º¡°%s¡±"
-#: utility/shared.c:1283
+#: utility/shared.c:1296
#, c-format
msgid "The \"%s\" file is required ... aborting!"
msgstr "Îļþ¡°%s¡±ÊDZØÐèµÄ ¡¡ ÖÐÖ¹£¡"
-#: utility/shared.c:1460
+#: utility/shared.c:1485
#, c-format
msgid "%s: Fatal error: you're trying to run me as superuser!\n"
msgstr "%s£ºÖÂÃü´íÎó£ºÄúÊÔͼÒÔ³¬¼¶Óû§È¨ÏÞÔËÐÐÓÎÏ·£¡\n"
-#: utility/shared.c:1462
+#: utility/shared.c:1487
msgid "Use a non-privileged account instead.\n"
msgstr "ÇëÓ÷ÇÌØȨÓû§¡£\n"
-#: utility/shared.c:1478
+#: utility/shared.c:1503
msgid "exact match"
msgstr "¾«È·Æ¥Åä"
-#: utility/shared.c:1479
+#: utility/shared.c:1504
msgid "only match"
msgstr "ΨһµÄÆ¥Åä"
-#: utility/shared.c:1480
+#: utility/shared.c:1505
msgid "ambiguous"
msgstr "Ä£ºý"
-#: utility/shared.c:1481
+#: utility/shared.c:1506
msgid "empty"
msgstr "¿Õ"
-#: utility/shared.c:1482
+#: utility/shared.c:1507
msgid "too long"
msgstr "Ì«³¤"
-#: utility/shared.c:1483
+#: utility/shared.c:1508
msgid "non-match"
msgstr "ÎÞÆ¥Åä"
@@ -1065,108 +1066,108 @@ msgstr " %1$s
msgid "%s is selling %s (not needed) for %d."
msgstr " %1$sÕýÔÚÒÔ %3$d ³öÊÛ %2$s £¨²»ÐèÒªµÄ£©¡£"
-#: ai/advdiplomacy.c:280
+#: ai/advdiplomacy.c:300
#, c-format
msgid "*%s (AI)* In away mode AI can't sign such a treaty."
msgstr "*%s (AI)* ÔÚÀ뿪ģʽÏ AI ²»ÄÜÇ©¶©ÕâÑùµÄÌõÔ¼¡£"
-#: ai/advdiplomacy.c:290
+#: ai/advdiplomacy.c:310
#, c-format
msgid "*%s (AI)* First break alliance with %s, %s."
msgstr "*%s (AI)* ÇëÊ×ÏÈÓë %s ½â³ýͬÃË£¬%s¡£"
-#: ai/advdiplomacy.c:303
+#: ai/advdiplomacy.c:322
#, c-format
msgid "*%s (AI)* Let us first cease hostilies, %s."
msgstr "*%s (AI)* Ê×ÏÈÈÃÎÒÃÇÍ£Ö¹µÐ¶Ô״̬°É£¬%s¡£"
-#: ai/advdiplomacy.c:308
+#: ai/advdiplomacy.c:327
#, 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:331
+#: ai/advdiplomacy.c:350
#, c-format
msgid "*%s (AI)* I simply do not trust you with an alliance yet, %s."
msgstr "*%s (AI)* ÎÒ»¹²»ÄÜÐÅÈÎÓëÄã½áÃË£¬%s¡£"
-#: ai/advdiplomacy.c:424
+#: ai/advdiplomacy.c:443
#, c-format
msgid "*%s (AI)* I do not know the city you mention."
msgstr "*%s (AI)* ÎÒ²»ÖªµÀÄã˵µÄÄǸö³ÇÊС£"
-#: ai/advdiplomacy.c:454
+#: ai/advdiplomacy.c:473
#, c-format
msgid "*%s (AI)* Sorry, sharing vision with you is not safe."
msgstr "* %s (AI)* ¶Ô²»Æ𣬺ÍÄã¹²ÏíÊÓÒ°²»°²È«¡£"
-#: ai/advdiplomacy.c:560
+#: ai/advdiplomacy.c:579
#, c-format
msgid "*%s (AI)* This deal was not very good for us, %s!"
msgstr "*%s (AI)* Õâ×Ú½»Ò׶ÔÎÒÃÇûÓкô¦£¬%s£¡"
-#: ai/advdiplomacy.c:582
+#: ai/advdiplomacy.c:601
#, c-format
msgid "*%s (AI)* Welcome into our alliance %s!"
msgstr "*%s (AI)* »¶Ó¼ÓÈëÎÒÃǵÄͬÃË£¬%s£¡"
-#: ai/advdiplomacy.c:586
+#: ai/advdiplomacy.c:605
#, c-format
msgid "*%s (AI)* Yes, may we forever stand united, %s."
msgstr "*%s (AI)* Êǵģ¬ÈÃÎÒÃÇÓÀԶ͎áÔÚÒ»Æð£¬%s"
-#: ai/advdiplomacy.c:593
+#: ai/advdiplomacy.c:612
#, c-format
msgid "*%s (AI)* Yes, peace in our time!"
msgstr "*%s (AI)* Êǵģ¬ÎÒÃǺÍƽÏà´¦£¡"
-#: ai/advdiplomacy.c:598
+#: ai/advdiplomacy.c:617
#, c-format
msgid "*%s (AI)* Agreed. No more hostilities, %s."
msgstr "*%s (AI)* ͬÒâ¡£²»Ôٵжԣ¬%s"
-#: ai/advdiplomacy.c:813
+#: ai/advdiplomacy.c:832
#, 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:1097
+#: ai/advdiplomacy.c:1116
#, c-format
msgid "*%s (AI)* Space will never be yours. "
msgstr "*%s (AI)* ÄãÓÀÔ¶¶¼µÃ²»µ½Ì«¿Õ¡£ "
-#: ai/advdiplomacy.c:1102
+#: ai/advdiplomacy.c:1121
#, c-format
msgid "*%s (AI)* I have tolerated your vicious antics long enough! To war!"
msgstr "*%s (AI)* ÎÒÒѾÈÌÊÜÄãа¶ñµÄÐÐΪºÜ¾ÃÁË£¡Õ½Õù£¡"
-#: ai/advdiplomacy.c:1108
+#: ai/advdiplomacy.c:1127
#, c-format
msgid "*%s (AI)* Peace in ... some other time."
msgstr "*%s (AI)* ºÍƽ¡¡ÔÙ˵°É"
-#: ai/advdiplomacy.c:1113
+#: ai/advdiplomacy.c:1132
#, 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:1119
+#: ai/advdiplomacy.c:1138
#, c-format
msgid "*%s (AI)* Your covert hostilities brought this war upon you!"
msgstr "*%s (AI)* Äã͵͵ÃþÃþµÄµÄµÐ¶ÔÐÐΪÒýÀ´ÁËÕⳡսÕù£¡"
-#: ai/advdiplomacy.c:1126
+#: ai/advdiplomacy.c:1145
#, c-format
msgid "*%s (AI)* Your aggression against %s was your last mistake!"
msgstr "*%s (AI)* ¶Ô %s µÄ¹¥»÷ÊÇÄã×îºóÒ»´Î´íÎó£¡"
-#: ai/advdiplomacy.c:1209
+#: ai/advdiplomacy.c:1229
#, c-format
msgid ""
"*%s (AI)* We will be launching an all-out war against %s in %d turn to stop "
@@ -1176,14 +1177,14 @@ msgid_plural ""
"the spaceship launch."
msgstr[0] ""
-#: ai/advdiplomacy.c:1219
+#: ai/advdiplomacy.c:1239
#, c-format
msgid ""
"*%s (AI)* Your aid in this matter will be expected. Long live our glorious "
"alliance!"
msgstr "*%s (AI)* ÔÚÕâ¼þÊÂÇéÉÏÎÒÃÇÆÚÍûµÃµ½ÄãµÄ°ïÖú¡£ÎÒÃǹâÈÙµÄͬÃËÍòË꣡"
-#: ai/advdiplomacy.c:1225
+#: ai/advdiplomacy.c:1245
#, c-format
msgid ""
"*%s (AI)* %s has grossly violated his treaties with us for own gain. We "
@@ -1195,7 +1196,7 @@ msgid_plural ""
"us and do likewise!"
msgstr[0] ""
-#: ai/advdiplomacy.c:1238
+#: ai/advdiplomacy.c:1258
#, c-format
msgid ""
"*%s (AI)* We intend to pillage and plunder the rich civilization of %s. We "
@@ -1205,13 +1206,13 @@ msgid_plural ""
"declare war in %d turns."
msgstr[0] "*%s (AI)* ÎÒÃÇÏëÂӶḻÓÐµÄ %s ÎÄÃ÷¡£ÎÒÃǽ«ÔÚ %d »ØºÏÄÚÐûÕ½¡£"
-#: ai/advdiplomacy.c:1246
+#: ai/advdiplomacy.c:1266
#, 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:1251
+#: ai/advdiplomacy.c:1271
#, c-format
msgid ""
"*%s (AI)* We have had it with %s. Let us tear this pathetic civilization "
@@ -1221,12 +1222,12 @@ msgid_plural ""
"apart. We declare war in %d turns."
msgstr[0] ""
-#: ai/advdiplomacy.c:1261
+#: ai/advdiplomacy.c:1281
#, c-format
msgid "*%s (AI)* As our glorious allies, we expect your help in this war."
msgstr "*%s (AI)* ×÷ΪΪÎÒÃǹâÈÙµÄÃËÓÑ£¬ÎÒÃÇÏ£ÍûÄúÄÜÔÚÕâ´ÎÕ½ÕùÖаïæ¡£"
-#: ai/advdiplomacy.c:1267
+#: ai/advdiplomacy.c:1287
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance and declare war on %s in %d turn. "
@@ -1238,7 +1239,7 @@ msgstr[0] ""
"*%1$s (AI)* ÎÒÃǽ«¶ÒÏÖͬÃ˵ijÐŵ£¬ÔÚ %3$d »ØºÏÄÚÏò %2$s ÐûÕ½¡£¼á³Öס££ÎÒÃÇ"
"À´ÁË£¡"
-#: ai/advdiplomacy.c:1276
+#: ai/advdiplomacy.c:1296
#, c-format
msgid ""
"*%s (AI)* We will honour our alliance with %s and declare war on %s in %d "
@@ -1250,40 +1251,40 @@ msgstr[0] ""
"*%1$s (AI)* ÎÒÃǽ«¶ÒÏÖÓë %2$s ͬÃ˵ijÐŵ²¢ÔÚ %4$d »ØºÏÄÚÏò %3$s ÐûÕ½¡£ÎÒÃÇÏ£"
"ÍûÄúÒ²ÕâÑù×ö¡£"
-#: ai/advdiplomacy.c:1344
+#: ai/advdiplomacy.c:1364
#, 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:1359
+#: ai/advdiplomacy.c:1379
#, c-format
msgid ""
"*%s (AI)* Your attempt to unilaterally dominate outer space is highly "
"offensive."
msgstr "*%s (AI)* ÄãÏëµ¥±ßµØͳÖÎÎÒÃÇÍⲿ̫¿ÕµÄÐÐΪ¾ßÓкܴóµÄð·¸ÐÔ¡£"
-#: ai/advdiplomacy.c:1362
+#: ai/advdiplomacy.c:1382
#, 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:1474
+#: ai/advdiplomacy.c:1494
#, c-format
msgid "*%s (AI)* Sorry, sharing vision with you is no longer safe."
msgstr "* %s (AI)* ¶Ô²»Æ𣬺ÍÄã¹²ÏíÊÓÒ°²»ÔÙ°²È«¡£"
-#: ai/advdiplomacy.c:1549
+#: ai/advdiplomacy.c:1569
#, 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:1555
+#: ai/advdiplomacy.c:1575
#, c-format
msgid ""
"*%s (AI)* Greetings ally, I see you have not yet made war with our enemy, %"
@@ -1292,7 +1293,7 @@ msgstr ""
"*%s (AI)* ÄúºÃ£¬ÃËÓÑ£¬ÎÒ·¢ÏÖÄú»¹Ã»ÓÐͬÎÒÃǵĵÐÈË %s ÐûÕ½¡£ÎªÊ²Ã´·ÇÒªÎÒÌáÐÑÄú"
"ËùÐíϵijÐŵÄØ£¿"
-#: ai/advdiplomacy.c:1562
+#: ai/advdiplomacy.c:1582
#, c-format
msgid ""
"*%s (AI)* Dishonoured one, we made a pact of alliance, and yet you remain at "
@@ -1302,26 +1303,26 @@ msgstr ""
"*%s (AI)* Î޳ܵļһÎÒÃǶ©Á¢ÁËͬÃËж¨£¬µ«ÊÇÄ㻹ͬÎÒÃǵÄËÀµÐ %s ±£³ÖºÍƽ£¡"
"ÕâÊDz»ÄÜÈÝÈ̵ģ¬ÎÒÃǵÄͬÃ˽áÊøÁË£¡"
-#: ai/advdiplomacy.c:1592
+#: ai/advdiplomacy.c:1612
#, 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:1607
+#: ai/advdiplomacy.c:1627
#, c-format
msgid "*%s (AI)* Greetings neighbour, may we suggest more peaceful relations?"
msgstr "*%s (AI)* ÄúºÃ£¬ÁÚ¾Ó£¬ÎÒÃÇ¿ÉÒÔ½¨Á¢¸ü¼ÓºÍƽµÄ¹ØϵÂð£¿"
-#: ai/advdiplomacy.c:1622
+#: ai/advdiplomacy.c:1642
#, 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:1742
+#: ai/advdiplomacy.c:1762
#, c-format
msgid ""
"*%s (AI)* We have been savagely attacked by %s, and we need your help! "
@@ -1466,17 +1467,17 @@ msgstr ""
"¿ÚÁî±ØÐëÖÁÉÙ°üº¬ %d ´óд×Öĸ£¬ %d Êý×Ö£¬²¢ÇÒÖÁÉÙ %d ¸ö£Û¿É´òÓ¡£Ý×Ö·û³¤¡£ÇëÔÙ"
"ÊÔÒ»´Î¡£"
-#: server/barbarian.c:183
+#: server/barbarian.c:184
#, fuzzy, c-format
msgid "%s gain a leader by the name %s. Dangerous times may lie ahead."
msgstr "Ò°ÈËÓÐÁËÒ»¸öÃû½Ð %s µÄÁìµ¼ÈË¡£¿Ö²ÀʱÆÚÒªÀ´ÁË¡£"
-#: server/barbarian.c:479
+#: server/barbarian.c:480
#, c-format
msgid "Native unrest near %s led by %s."
msgstr "¿¿½ü %s ·¢ÉúÓÉ %s Áìµ¼µÄ¹úÄÚ¶¯µ´¡£"
-#: server/barbarian.c:484
+#: server/barbarian.c:485
#, c-format
msgid "Sea raiders seen near %s!"
msgstr "%s ¸½½ü·¢ÏÖº£µÁ£¡"
@@ -1842,7 +1843,7 @@ msgid "%s boosts research; you gain %d immediate advance."
msgid_plural "%s boosts research; you gain %d immediate advances."
msgstr[0] "%s ÍƽøÁËÑо¿£¬ÄúÁ¢¿Ì»ñµÃ %d Ïî½øÕ¹¡£"
-#: server/cityturn.c:1158 server/techtools.c:176
+#: server/cityturn.c:1158 server/techtools.c:172
#, c-format
msgid "The %s have acquired %s from %s."
msgstr "%1$s ´Ó %3$s »ñµÃÁË %2$s¡£"
@@ -1923,22 +1924,22 @@ msgstr "
msgid "Warning: the %s option is obsolete. Use -m to enable the metaserver.\n"
msgstr "¾¯¸æ£º Ñ¡Ïî %s ÒѾ×÷·Ï¡£ÇëʹÓà -m À´Ê¹ÄÜÔª·þÎñÆ÷¡£\n"
-#: server/civserver.c:189
+#: server/civserver.c:193
#, c-format
msgid "Error: unknown option '%s'\n"
msgstr "´íÎó£ºÎ´ÖªµÄÑ¡Ïî¡°%s¡±\n"
-#: server/civserver.c:200
+#: server/civserver.c:204
#, c-format
msgid "This is the server for %s"
msgstr "ÕâÊÇ %s µÄ·þÎñÆ÷¡£"
-#: server/civserver.c:201
+#: server/civserver.c:205
#, c-format
msgid "You can learn a lot about Freeciv at %s"
msgstr "Äú¿ÉÒÔ´Ó %s »ñµÃ´óÁ¿¹ØÓÚ Freeciv µÄÐÅÏ¢¡£"
-#: server/civserver.c:206 client/civclient.c:238 manual/civmanual.c:380
+#: server/civserver.c:210 client/civclient.c:239 manual/civmanual.c:380
#, c-format
msgid ""
"Usage: %s [option ...]\n"
@@ -1947,103 +1948,108 @@ msgstr ""
"Ó÷¨£º%s [Ñ¡Ïî ...]\n"
"ºÏ·¨µÄÑ¡ÏîÓУº\n"
-#: server/civserver.c:208
+#: server/civserver.c:212
#, fuzzy
msgid ""
" -a --auth FILE\tEnable server authentication with configuration from "
"FILE.\n"
msgstr " -a --auth\t\tÔÊÐí·þÎñÆ÷ÈÏÖ¤¡£\n"
-#: server/civserver.c:210
+#: server/civserver.c:214
msgid " -G --Guests\t\tAllow guests to login if auth is enabled.\n"
msgstr " -G --Guests\t\tÔÚʹÓÃÈÏÖ¤µÄÇé¿öÏÂÔÊÐí·Ã¿ÍµÇ¼¡£\n"
-#: server/civserver.c:212
+#: server/civserver.c:216
msgid " -N --Newusers\tAllow new users to login if auth is enabled.\n"
msgstr " -N --Newusers\tÔÚʹÓÃÈÏÖ¤µÄÇé¿öÏÂÔÊÐíн¨Óû§µÇ¼¡£\n"
-#: server/civserver.c:215
+#: server/civserver.c:219
msgid " -b --bind ADDR\tListen for clients on ADDR\n"
msgstr " -b --bind ADDR\tÔÚµØÖ· ADDR ÉϼàÌý¿Í»§¶ËÁ¬½Ó\n"
-#: server/civserver.c:217 client/civclient.c:242
+#: server/civserver.c:221 client/civclient.c:243
msgid ""
" -d, --debug NUM\tSet debug log level (0 to 4, or 4:file1,min,max:...)\n"
msgstr ""
" -d, --debug NUM\tÉèÖõ÷ÊÔÈÕÖ¾¼¶±ð£¨0 µ½ 4£¬ »ò 4:file1,min,max:...£©\n"
-#: server/civserver.c:221 client/civclient.c:246
+#: server/civserver.c:225 client/civclient.c:247
msgid " -d, --debug NUM\tSet debug log level (0 to 3)\n"
msgstr " -d, --debug NUM\t½«µ÷ÊÔÈÕÖ¾¼¶±ðÉèÖÃΪ (0 µ½ 3)\n"
-#: server/civserver.c:223
+#: server/civserver.c:227
msgid " -f, --file FILE\tLoad saved game FILE\n"
msgstr " -f, --file FILE\t´Ó FILE ÖÐÔØÈë±£´æµÄÓÎÏ·\n"
-#: server/civserver.c:225 client/civclient.c:249 manual/civmanual.c:382
+#: server/civserver.c:229 client/civclient.c:250 manual/civmanual.c:382
msgid " -h, --help\t\tPrint a summary of the options\n"
msgstr " -h, --help\t\t´òÓ¡Ñ¡Ïî¸ÅÊö\n"
-#: server/civserver.c:226
+#: server/civserver.c:230
+#, fuzzy
+msgid " -i, --identity ADDR\tBe known as ADDR at metaserver\n"
+msgstr " -M, --Metaserver ADDR\t½« ADDR ÉèÖÃΪԪ·þÎñÆ÷µØÖ·\n"
+
+#: server/civserver.c:231
msgid " -l, --log FILE\tUse FILE as logfile\n"
msgstr " -l, --log FILE\tʹÓà FILE ×÷ΪÈÕÖ¾Îļþ\n"
-#: server/civserver.c:227
+#: server/civserver.c:232
msgid " -m, --meta\t\tNotify metaserver and send server's info\n"
msgstr " -m, --meta\t\t֪ͨԪ·þÎñÆ÷²¢·¢ËÍ·þÎñÆ÷µÄÐÅÏ¢\n"
-#: server/civserver.c:229
+#: server/civserver.c:234
msgid " -M, --Metaserver ADDR\tSet ADDR as metaserver address\n"
msgstr " -M, --Metaserver ADDR\t½« ADDR ÉèÖÃΪԪ·þÎñÆ÷µØÖ·\n"
-#: server/civserver.c:232
+#: server/civserver.c:237
msgid " -p, --port PORT\tListen for clients on port PORT\n"
msgstr " -p, --port PORT\tÔÚ¶Ë¿Ú PORT ¼àÌý¿Í»§¶ËµÄÁ¬½Ó\n"
-#: server/civserver.c:234
+#: server/civserver.c:239
msgid " -q, --quitidle TIME\tQuit if no players for TIME seconds\n"
msgstr " -q, --quitidle TIME\tÈç¹ûÔÚ TIME ÃëÄÚûÓÐÍæ¼Ò¾ÍÍ˳ö\n"
-#: server/civserver.c:236
+#: server/civserver.c:241
msgid " -e, --exit-on-end\tWhen a game ends, exit instead of restarting\n"
msgstr " -e, --exit-on-end\tµ±Ò»¾ÖÓÎÏ·½áÊøʱ£¬Í˳ö¶ø²»ÊÇÖØÐÂÆô¶¯\n"
-#: server/civserver.c:239
+#: server/civserver.c:244
msgid " -s, --saves DIR\tSave games to directory DIR\n"
msgstr " -s, --saves DIR\t½«ÓÎÏ·±£´æµ½Ä¿Â¼ DIR\n"
-#: server/civserver.c:241
+#: server/civserver.c:246
msgid " -S, --Serverid ID\tSets the server id to ID\n"
msgstr " -S, --Serverid ID\tÉèÖ÷þÎñÆ÷ id Ϊ ID\n"
-#: server/civserver.c:243
+#: server/civserver.c:248
msgid " -P, --Ppm\t\tSave ppms of the map when saving the game.\n"
msgstr " -P, --Ppm\t\t±£´æÓÎϷʱ±£´æµØͼµÄ ppm¡£\n"
-#: server/civserver.c:244
+#: server/civserver.c:249
msgid " -r, --read FILE\tRead startup script FILE\n"
msgstr " -r, --read FILE\t¶ÁÈ¡Æô¶¯½Å±¾ FILE\n"
-#: server/civserver.c:246
+#: server/civserver.c:251
msgid " -R, --Ranklog FILE\tUse FILE as ranking logfile\n"
msgstr " -R, --Ranklog FILE\tʹÓà FILE ×÷Ϊ¼¶±ðÈÕÖ¾Îļþ\n"
-#: server/civserver.c:247 client/civclient.c:268 manual/civmanual.c:383
+#: server/civserver.c:252 client/civclient.c:269 manual/civmanual.c:383
msgid " -v, --version\t\tPrint the version number\n"
msgstr " -v, --version\t\t´òÓ¡°æ±¾ºÅ\n"
-#: server/civserver.c:248 client/gui-gtk-2.0/gui_main.c:342
+#: server/civserver.c:253 client/gui-gtk-2.0/gui_main.c:354
#: client/gui-sdl/gui_main.c:209 client/gui-xaw/gui_main.c:247
#: manual/civmanual.c:384
#, c-format
msgid "Report bugs at %s.\n"
msgstr "½«´íÎ󱨸淢Ë͵½ <%s>¡£\n"
-#: server/commands.c:28
+#: server/commands.c:29
msgid "Start the game, or restart after loading a savegame."
msgstr "Æô¶¯ÓÎÏ·£¬»òÔÚÔØÈë±£´æµÄÓÎϷ֮ǰÖØÐÂÆô¶¯ÓÎÏ·¡£"
-#: server/commands.c:29
+#: server/commands.c:30
msgid ""
"This command starts the game. When starting a new game, it should be used "
"after all human players have connected, and AI players have been created (if "
@@ -2060,7 +2066,7 @@ msgstr ""
"Ðкó´ËÃüÁî¾Í²»ÔÙ¿ÉÓã¬ÒòΪËü½«Ã»ÓÐÈκÎ×÷Óá£"
#. TRANS: translate text between <> only
-#: server/commands.c:42
+#: server/commands.c:44
msgid ""
"help\n"
"help commands\n"
@@ -2074,11 +2080,11 @@ msgstr ""
"help <ÃüÁîÃû>\n"
"help <Ñ¡ÏîÃû>"
-#: server/commands.c:47
+#: server/commands.c:49
msgid "Show help about server commands and server options."
msgstr "ÏÔʾ¹ØÓÚ·þÎñÆ÷ÃüÁîºÍ·þÎñÆ÷Ñ¡ÏîµÄ°ïÖúÐÅÏ¢¡£"
-#: server/commands.c:48
+#: server/commands.c:50
msgid ""
"With no arguments gives some introductory help. With argument \"commands\" "
"or \"options\" gives respectively a list of all commands or all options. "
@@ -2092,11 +2098,11 @@ msgstr ""
"Ñ¡ÏîÃû£¬²¢ÇÒ¸ø³ö¸ÃÃüÁî»òÑ¡ÏîµÄ°ïÖú¡£¶ÔÓÚÑ¡Ï°ïÖúÐÅÏ¢°üÀ¨¸ÃÑ¡ÏîµÄ\n"
"µ±Ç°ÖµºÍĬÈÏÖµ¡£ÔÚûÓÐÆçÒåµÄÇé¿öϲÎÊý¿ÉÒÔËõд¡£"
-#: server/commands.c:63
+#: server/commands.c:66
msgid "Show a list of players, teams, connections, or scenarios."
msgstr "ÏÔʾÍæ¼Ò£¬ÍŶӣ¬Á¬½Ó»òÕßÇé¾°µÄÁÐ±í¡£"
-#: server/commands.c:64
+#: server/commands.c:67
#, fuzzy
msgid ""
"Show a list of players in the game, teams of players, connections to the "
@@ -2106,20 +2112,20 @@ msgstr ""
"ÏÔʾÍæ¼Ò£¬ÍŶӣ¬µ½·þÎñÆ÷µÄÁ¬½Ó£¬»òÕßÇé¾°µÄÁÐ±í¡£¿ÉÒÔʹÓÃËõд²ÎÊý£¬Ã»ÓвÎÊýʱ"
"ĬÈÏΪ¡°players¡±¡£"
-#: server/commands.c:70
+#: server/commands.c:74
msgid "Quit the game and shutdown the server."
msgstr "Í˳öÓÎÏ·²¢¹Ø±Õ·þÎñÆ÷¡£"
#. TRANS: translate text between <> only
-#: server/commands.c:74
+#: server/commands.c:79
msgid "cut <connection-name>"
msgstr "cut <Á¬½ÓÃû>"
-#: server/commands.c:75
+#: server/commands.c:80
msgid "Cut a client's connection to server."
msgstr "ÇжϿͻ§µ½·þÎñÆ÷µÄÁ¬½Ó¡£"
-#: server/commands.c:76
+#: server/commands.c:81
msgid ""
"Cut specified client's connection to the server, removing that client from "
"the game. If the game has not yet started that client's player is removed "
@@ -2131,7 +2137,7 @@ msgstr ""
"Êý£¬¶ø²»ÊÇÍæ¼ÒÃû×Ö¡£"
#. TRANS: translate text between <> only
-#: server/commands.c:83
+#: server/commands.c:89
msgid ""
"explain\n"
"explain <option-name>"
@@ -2139,11 +2145,11 @@ msgstr ""
"explain\n"
"explain <Ñ¡ÏîÃû>"
-#: server/commands.c:85
+#: server/commands.c:91
msgid "Explain server options."
msgstr "½âÊÍ·þÎñÆ÷Ñ¡Ïî¡£"
-#: server/commands.c:86
+#: server/commands.c:92
msgid ""
"The 'explain' command gives a subset of the functionality of 'help', and is "
"included for backward compatibility. With no arguments it gives a list of "
@@ -2155,7 +2161,7 @@ msgstr ""
"µÄ°ïÖúÐÅÏ¢£¨ÀàËÆ¡°help <Ñ¡ÏîÃû>¡±£©¡£"
#. TRANS: translate text between <> only
-#: server/commands.c:93
+#: server/commands.c:100
msgid ""
"show\n"
"show <option-name>\n"
@@ -2165,11 +2171,11 @@ msgstr ""
"show <Ñ¡ÏîÃû>\n"
"show <Ñ¡Ïîǰ׺>"
-#: server/commands.c:96
+#: server/commands.c:103
msgid "Show server options."
msgstr "ÏÔʾ·þÎñÆ÷Ñ¡Ïî¡£"
-#: server/commands.c:97
+#: server/commands.c:104
msgid ""
"With no arguments, shows all server options (or available options, when used "
"by clients). With an argument, show only the named option, or options with "
@@ -2178,36 +2184,37 @@ msgstr ""
"ûÓвÎÊýʱÏÔʾËùÓеķþÎñÆ÷Ñ¡Ï»ò¿ÉÓõÄÑ¡Ïµ±±»¿Í»§¶ËʹÓÃʱ£©¡£¸ø¶¨Ò»¸ö²Î"
"Êýʱ£¬Ö»ÏÔʾ¾ßÓиÃÃû×ÖµÄÑ¡Ï»ò¾ßÓиÃÃû×Öǰ׺µÄÑ¡Ïî¡£"
-#: server/commands.c:102
+#: server/commands.c:110
msgid "wall <message>"
msgstr "wall <ÏûÏ¢>"
-#: server/commands.c:103
+#: server/commands.c:111
msgid "Send message to all connections."
msgstr "ÏòËùÓÐÁ¬½Ó·¢ËÍÏûÏ¢¡£"
-#: server/commands.c:104
+#: server/commands.c:112
msgid ""
"For each connected client, pops up a window showing the message entered."
msgstr "¶ÔÓÚÿ¸öÁ¬½ÓÁ˵Ŀͻ§¶Ë£¬µ¯³öÏÔʾÊäÈëÏûÏ¢µÄ´°¿Ú¡£"
-#: server/commands.c:108
+#: server/commands.c:117
msgid "vote yes|no [vote number]"
msgstr "vote yes|no [ͶƱ±àºÅ]"
-#: server/commands.c:109
+#: server/commands.c:118
msgid "Cast a vote."
msgstr "½øÐÐͶƱ"
-#: server/commands.c:111
+#: server/commands.c:120
#, 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."
+"A player with basic 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."
msgstr ""
"¾ßÓÐinfo·ÃÎʼ¶±ðµÄÍæ¼Ò·¢³öÒ»¸ö¿ØÖƼ¶±ðµÄÃüÁîʱ½«Æô¶¯Ò»¸ö¹ØÓÚËù·¢³öÃüÁîµÄÐÂͶ"
"Ʊ¡£ºó¸ú¡°yes¡±»ò¡°no¡±£¬ÒÔ¼°¿ÉÑ¡µÄͶƱ±àÂëµÄ¡°/vote¡±ÃüÁͶ³öÄúµÄƱ¡£Èç¹û"
@@ -2215,7 +2222,7 @@ msgstr ""
"°ëÊýÍæ¼ÒÖ§³Ö£¬Í¶Æ±½«Á¢¼´Í¨¹ý£¬Èç¹û³¬¹ý°ëÊýÍæ¼Ò·´¶Ô£¬Í¶Æ±½«Á¢¼´±»·ñ¾ö¡£Èç¹ûÔÚ"
"Ò»¸öÍêÕûµÄ»ØºÏºóûÓÐÈκÎÈËͶƱ·´¶ÔÄÇôͶƱ½«»áͨ¹ý¡£"
-#: server/commands.c:121
+#: server/commands.c:131
msgid ""
"debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> | tech "
"<player> | timing | info]"
@@ -2223,33 +2230,33 @@ msgstr ""
"debug [player <Íæ¼Ò> | city <x> <y> | units <x> <y> | unit <id> | tech <Íæ¼Ò"
"> | timing | info]"
-#: server/commands.c:123
+#: server/commands.c:133
msgid "Turn on or off AI debugging of given entity."
msgstr "´ò¿ª»ò¹Ø±ÕÒ»¸ö¸ø¶¨ÊµÌåµÄ AI µ÷ÊÔ¡£"
-#: server/commands.c:124
+#: server/commands.c:134
msgid ""
"Print AI debug information about given entity and turn continous debugging "
"output for this entity on or off."
msgstr "´òÓ¡¸ø¶¨ÊµÌåµÄAIµ÷ÊÔÐÅÏ¢²¢´ò¿ª»ò¹Ø±Õ´ËʵÌåµÄÁ¬Ðøµ÷ÊÔÊä³ö¡£"
-#: server/commands.c:128
+#: server/commands.c:139
msgid "set <option-name> <value>"
msgstr "set <Ñ¡ÏîÃû> <Öµ>"
-#: server/commands.c:129
+#: server/commands.c:140
msgid "Set server option."
msgstr "É趨·þÎñÆ÷Ñ¡Ïî¡£"
-#: server/commands.c:132
+#: server/commands.c:144
msgid "team <player> [team]"
msgstr "team <Íæ¼ÒÃû³Æ> [ÍŶÓÃû]"
-#: server/commands.c:133
+#: server/commands.c:145
msgid "Change, add or remove a player's team affiliation."
msgstr "¸Ä±ä£¬Ìí¼Ó£¬»òÕßɾ³ýÒ»¸öÍæ¼ÒµÄÍŶÓÁ¥Êô¡£"
-#: server/commands.c:134
+#: server/commands.c:146
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 "
@@ -2261,15 +2268,15 @@ msgstr ""
"µÄ£¬ÓµÓй²ÏíÊÓÒ°ºÍʹ¹Ý£¬ËûÃǹ²Í¬×÷Õ½ÒÔ»ñµÃÍŶÓʤÀû£¬Ã¿¸öÍæ¼Ò½«¾ßÓÐƽ¾ù¸öÈ˵Ã"
"·Ö¡£"
-#: server/commands.c:141
+#: server/commands.c:154
msgid "rulesetdir <directory>"
msgstr "rulesetdir <Ŀ¼>"
-#: server/commands.c:142
+#: server/commands.c:155
msgid "Choose new ruleset directory or modpack."
msgstr "Ñ¡ÔñеĹæÔò¼¯Ä¿Â¼»ò modpack¡£"
-#: server/commands.c:143
+#: server/commands.c:156
msgid ""
"Choose new ruleset directory or modpack. Calling this\n"
" without any arguments will show you the currently selected ruleset."
@@ -2278,15 +2285,15 @@ msgstr ""
"ûÓÐÈκβÎÊýµ÷ÓôËÃüÁÏÔʾÏÖÔÚËùÑ¡ÔñµÄ¹æÔò¼¯ºÏ¡£"
#. TRANS: translate text between <> only
-#: server/commands.c:149
+#: server/commands.c:163
msgid "metainfo <meta-line>"
msgstr "metainfo <ÔªÐÅÏ¢ÐÐ>"
-#: server/commands.c:150
+#: server/commands.c:164
msgid "Set metaserver info line."
msgstr "É趨Ԫ·þÎñÆ÷ÐÅÏ¢ÐС£"
-#: server/commands.c:151
+#: server/commands.c:165
msgid ""
"Set user defined metaserver info line. If parameter is omitted,\n"
"previously set metamessage will be removed. For most of the time\n"
@@ -2295,19 +2302,19 @@ msgid ""
msgstr ""
#. TRANS: translate text between <> only
-#: server/commands.c:158
+#: server/commands.c:173
msgid "metapatch <meta-line>"
msgstr "metapatch <ÔªÐÅÏ¢ÐÐ>"
-#: server/commands.c:159
+#: server/commands.c:174
msgid "Set metaserver patches line."
msgstr "É趨Ԫ·þÎñÆ÷²¹¶¡ÐС£"
-#: server/commands.c:165
+#: server/commands.c:181
msgid "Control metaserver connection."
msgstr "¿ØÖÆÔª·þÎñÆ÷Á¬½Ó¡£"
-#: server/commands.c:166
+#: server/commands.c:182
msgid ""
"'metaconnection ?' reports on the status of the connection to metaserver.\n"
"'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
@@ -2318,33 +2325,33 @@ msgstr ""
"¡°metaconnection up¡± »ò ¡°metac u¡± ½«´ò¿ªµ½Ôª·þÎñÆ÷µÄÁ¬½Ó¡£"
#. TRANS: translate text between <> only
-#: server/commands.c:172
+#: server/commands.c:189
msgid "metaserver <address>"
msgstr "metaserver <µØÖ·>"
-#: server/commands.c:173
+#: server/commands.c:190
msgid "Set address (URL) for metaserver to report to."
msgstr "ÉèÖÃÔª·þÎñÆ÷±¨¸æµÄµØÖ·£¨URL£©µØÖ·¡£"
#. TRANS: translate text between <> only
-#: server/commands.c:177
+#: server/commands.c:195
msgid "aitoggle <player-name>"
msgstr "aitoggle <Íæ¼ÒÃû×Ö>"
-#: server/commands.c:178
+#: server/commands.c:196
msgid "Toggle AI status of player."
msgstr "Çл»Íæ¼ÒµÄ AI ״̬¡£"
#. TRANS: translate text between [] and <> only
-#: server/commands.c:182
+#: server/commands.c:201
msgid "take [connection-name] <player-name>"
msgstr "take [Á¬½ÓÃû³Æ] <Íæ¼ÒÃû³Æ>"
-#: server/commands.c:183
+#: server/commands.c:202
msgid "Take over a player's place in the game."
msgstr "½ÓÌæÓÎÏ·ÖÐÒ»¸öÍæ¼Ò¡£"
-#: server/commands.c:184
+#: server/commands.c:203
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 "
@@ -2357,15 +2364,15 @@ msgstr ""
"µÄÁ¬½Ó»¹Ã»ÓпØÖÆÈκÎÍæ¼Ò£¬Ôò´´½¨Ò»¸öÍæ¼Ò²¢·ÖÅä¸ø¸ÃÁ¬½Ó¡£"
#. TRANS: translate text between [] only
-#: server/commands.c:192
+#: server/commands.c:212
msgid "observe [connection-name] [player-name]"
msgstr "ovserve [Á¬½ÓÃû³Æ] [Íæ¼ÒÃû³Æ]"
-#: server/commands.c:193
+#: server/commands.c:213
msgid "Observe a player or the whole game."
msgstr "ÅÔ¹ÛÒ»¸öÍæ¼Ò»òÕû¸öÓÎÏ·¡£"
-#: server/commands.c:194
+#: server/commands.c:214
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 "
@@ -2378,15 +2385,15 @@ msgstr ""
"½ÓûÓÐʹÓòÎÊý£¬ÔòÁ¬½Ó±»¸½½Óµ½È«¾ÖÅÔ¹ÛÕß¡£"
#. TRANS: translate text between <> only
-#: server/commands.c:202
+#: server/commands.c:223
msgid "detach <connection-name>"
msgstr "detach <Á¬½ÓÃû>"
-#: server/commands.c:203
+#: server/commands.c:224
msgid "detach from a player."
msgstr "´ÓÒ»¸öÍæ¼ÒÍÑÀë¡£"
-#: server/commands.c:204
+#: server/commands.c:225
msgid ""
"Only the console and connections with cmdlevel 'hack' can force other "
"connections to detach from a player."
@@ -2394,20 +2401,20 @@ msgstr ""
"Ö»ÓпØÖÆ̨ºÍ¾ßÓÐÃüÁî·ÃÎʼ¶±ð¡°hack¡±µÄÁ¬½Ó¿ÉÒÔÇ¿ÖƱðµÄÁ¬½Ó´ÓÒ»¸öÍæ¼ÒÍÑÀë¡£"
#. TRANS: translate text between <> only
-#: server/commands.c:209
+#: server/commands.c:231
msgid "create <player-name>"
msgstr "create <Íæ¼ÒÃû³Æ>"
-#: server/commands.c:210
+#: server/commands.c:232
msgid "Create an AI player with a given name."
msgstr "ÒÔÖ¸¶¨µÄÃû³Æ´´½¨ AI Íæ¼Ò¡£"
-#: server/commands.c:211
+#: server/commands.c:233
msgid ""
"The 'create' command is only available before the game has been started."
msgstr "Ö»ÄÜÔÚÓÎÏ·¿ªÊ¼Ç°Ê¹Óá°create¡±ÃüÁî¡£"
-#: server/commands.c:215
+#: server/commands.c:238
msgid ""
"away\n"
"away"
@@ -2415,16 +2422,16 @@ msgstr ""
"away\n"
"À뿪"
-#: server/commands.c:217
+#: server/commands.c:240
msgid "Set yourself in away mode. The AI will watch your back."
msgstr "½«×Ô¼ºÉèÖÃΪÀ뿪ģʽ¡£AI½«ÊØ»¤Ö±µ½Äú»ØÀ´¡£"
-#: server/commands.c:218
+#: server/commands.c:241
msgid "The AI will govern your nation but do minimal changes."
msgstr "AI½«¹ÜÀíÄúµÄ¹ú¼Òµ«Êǽ«Ö»×÷ºÜÉٵı䶯¡£"
#. TRANS: translate text between <> only
-#: server/commands.c:222
+#: server/commands.c:246
msgid ""
"novice\n"
"novice <player-name>"
@@ -2432,11 +2439,11 @@ msgstr ""
"novice\n"
"novice <Íæ¼ÒÃû³Æ>"
-#: server/commands.c:224
+#: server/commands.c:248
msgid "Set one or all AI players to 'novice'."
msgstr "½«Ò»¸ö»ò¶à¸öAIÍæ¼ÒÉèÖÃΪ¡°ºÜÈÝÒס±¡£"
-#: server/commands.c:225
+#: server/commands.c:249
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 "
@@ -2446,7 +2453,7 @@ msgstr ""
"¼¶±ðÉèΪ¡°ºÜÈÝÒס±¡£ÓÐÒ»¸ö²ÎÊýµÄÇé¿öÏ£¬Ö»ÉèÖøÃÍæ¼ÒµÄ¼¶±ð¡£"
#. TRANS: translate text between <> only
-#: server/commands.c:231
+#: server/commands.c:256
msgid ""
"easy\n"
"easy <player-name>"
@@ -2454,11 +2461,11 @@ msgstr ""
"easy\n"
"easy <Íæ¼ÒÃû³Æ>"
-#: server/commands.c:233
+#: server/commands.c:258
msgid "Set one or all AI players to 'easy'."
msgstr "½«Ò»¸ö»ò¶à¸ö AI Íæ¼ÒÉèÖÃΪ¡°ÈÝÒס±¡£"
-#: server/commands.c:234
+#: server/commands.c:259
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 "
@@ -2468,7 +2475,7 @@ msgstr ""
"±ðÉèΪ¡°ÈÝÒס±¡£ÓÐÒ»¸ö²ÎÊýµÄÇé¿öÏ£¬Ö»ÉèÖøÃÍæ¼ÒµÄ¼¶±ð¡£"
#. TRANS: translate text between <> only
-#: server/commands.c:240
+#: server/commands.c:266
msgid ""
"normal\n"
"normal <player-name>"
@@ -2476,11 +2483,11 @@ msgstr ""
"normal\n"
"normal <Íæ¼ÒÃû³Æ>"
-#: server/commands.c:242
+#: server/commands.c:268
msgid "Set one or all AI players to 'normal'."
msgstr "½«Ò»¸ö»ò¶à¸ö AI Íæ¼ÒÉèÖÃΪ¡°ÆÕͨ¡±¡£"
-#: server/commands.c:243
+#: server/commands.c:269
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 "
@@ -2490,7 +2497,7 @@ msgstr ""
"±ðÉèΪ¡°ÆÕͨ¡±¡£ÓÐÒ»¸ö²ÎÊýµÄÇé¿öÏ£¬Ö»ÉèÖøÃÍæ¼ÒµÄ¼¶±ð¡£"
#. TRANS: translate text between <> only
-#: server/commands.c:249
+#: server/commands.c:276
msgid ""
"hard\n"
"hard <player-name>"
@@ -2498,11 +2505,11 @@ msgstr ""
"hard\n"
"hard <Íæ¼ÒÃû³Æ>"
-#: server/commands.c:251
+#: server/commands.c:278
msgid "Set one or all AI players to 'hard'."
msgstr "½«Ò»¸ö»ò¶à¸öÍæ¼ÒÉèÖÃΪ¡°ÄÑ¡±¡£"
-#: server/commands.c:252
+#: server/commands.c:279
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 "
@@ -2512,7 +2519,7 @@ msgstr ""
"ÉèΪ¡°ÄÑ¡±¡£ÓÐÒ»¸ö²ÎÊýµÄÇé¿öÏ£¬Ö»ÉèÖøÃÍæ¼ÒµÄ¼¶±ð¡£"
#. TRANS: translate text between <> only
-#: server/commands.c:258
+#: server/commands.c:286
msgid ""
"experimental\n"
"experimental <player-name>"
@@ -2520,11 +2527,11 @@ msgstr ""
"experimental\n"
"experimental <Íæ¼ÒÃû³Æ>"
-#: server/commands.c:260
+#: server/commands.c:288
msgid "Set one or all AI players to 'experimental'."
msgstr "½«Ò»¸ö»ò¶à¸öAIÍæ¼ÒÉèÖÃΪ¡°ÊµÑéÐÔ¡±¡£"
-#: server/commands.c:261
+#: server/commands.c:289
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 "
@@ -2536,7 +2543,7 @@ msgstr ""
"ÌØÐÔ£¡¶ÔÓÚÆÕͨ·þÎñÆ÷£¬´ËÑ¡ÏîûÓÐ×÷Óá£"
#. TRANS: translate text between <> only
-#: server/commands.c:269
+#: server/commands.c:298
msgid ""
"cmdlevel\n"
"cmdlevel <level>\n"
@@ -2550,17 +2557,20 @@ msgstr ""
"cmdlevel <¼¶±ð> first\n"
"cmdlevel <¼¶±ð> <Á¬½ÓÃû>"
-#: server/commands.c:274
+#: server/commands.c:303
msgid "Query or set command access level access."
msgstr "²éѯ»òÉèÖÃÃüÁî·ÃÎʼ¶±ð¡£"
-#: server/commands.c:275
+#: server/commands.c:304
+#, fuzzy
msgid ""
"The command access level controls which server commands are available\n"
"to users via the client chatline. The available levels are:\n"
" none - no commands\n"
-" info - informational commands only\n"
+" info - informational or observer commands only\n"
+" basic - commands available to players in the game\n"
" ctrl - commands that affect the game and users\n"
+" admin - commands that affect server operation\n"
" hack - *all* commands - dangerous!\n"
"With no arguments, the current command access levels are reported.\n"
"With a single argument, the level is set for all existing connections,\n"
@@ -2593,20 +2603,20 @@ msgstr ""
"Óв»¿ÉÐÅÈεÄÈËÓÃÏàͬµÄÃû×ÖÖØÐÂÁ¬½Ó½øÀ´¡£Çë×¢Òâ´ËÃüÁîÏÖÔÚ\n"
"È¡Á¬½ÓÃû³Æ¶ø²»ÊÇÍæ¼ÒÃû×Ö×÷²ÎÊý¡£"
-#: server/commands.c:296
+#: server/commands.c:328
msgid "If there is none, become the game organizer with increased permissions."
msgstr "Èç¹û»¹Ã»ÓÐÓÎÏ·×éÖ¯Õߣ¬Ôò³ÉΪÓÎÏ·×éÖ¯Õߣ¬¾ßÓиü¸ßµÄȨÏÞ¡£"
#. TRANS: translate text between <> only
-#: server/commands.c:301
+#: server/commands.c:334
msgid "timeoutincrease <turn> <turninc> <value> <valuemult>"
msgstr "timeoutincrease <»ØºÏ> <»ØºÏÔöÁ¿> <Öµ> <Öµ³ËÊý>"
-#: server/commands.c:302
+#: server/commands.c:335
msgid "See \"help timeoutincrease\"."
msgstr "²Î¼û¡°help timeoutincrease¡±"
-#: server/commands.c:303
+#: server/commands.c:336
msgid ""
"Every <turn> turns, add <value> to timeout timer, then add <turninc> to "
"<turn> and multiply <value> by <valuemult>. Use this command in concert "
@@ -2617,24 +2627,43 @@ msgstr ""
"ÈÏΪ 0 0 0 1¡£"
#. TRANS: translate text between <> only
-#: server/commands.c:309
+#: server/commands.c:343
+msgid ""
+"cancelvote\n"
+"cancelvote <vote number>\n"
+"cancelvote all\n"
+msgstr ""
+
+#: server/commands.c:346
+msgid "Cancel a running vote.\n"
+msgstr ""
+
+#: server/commands.c:347
+msgid ""
+"With no arguments this command removes your own vote. If you have an admin "
+"access level, you can cancel any vote by vote number, or all votes with the "
+"'all' argument."
+msgstr ""
+
+#. TRANS: translate text between <> only
+#: server/commands.c:354
msgid "endgame"
msgstr ""
-#: server/commands.c:310
+#: server/commands.c:355
msgid "End the game immediately in a draw."
msgstr "Á¢¼´½áÊøÓÎÏ·£¬²»·Öʤ¸º¡£"
#. TRANS: translate text between <> only
-#: server/commands.c:314
+#: server/commands.c:360
msgid "surrender"
msgstr ""
-#: server/commands.c:315
+#: server/commands.c:361
msgid "Concede the game."
msgstr "ÈÏÊä¡£"
-#: server/commands.c:316
+#: server/commands.c:362
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."
@@ -2643,22 +2672,22 @@ msgstr ""
"Ï·½áÊø¡£"
#. TRANS: translate text between <> only
-#: server/commands.c:322
+#: server/commands.c:369
msgid "remove <player-name>"
msgstr "remove <Íæ¼ÒÃû³Æ>"
-#: server/commands.c:323
+#: server/commands.c:370
msgid "Fully remove player from game."
msgstr "´ÓÓÎÏ·Öг¹µ×ɾ³ýÍæ¼Ò¡£"
-#: server/commands.c:324
+#: server/commands.c:371
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:329
+#: server/commands.c:377
msgid ""
"save\n"
"save <file-name>"
@@ -2666,11 +2695,11 @@ msgstr ""
"save\n"
"save <ÎļþÃû>"
-#: server/commands.c:331
+#: server/commands.c:379
msgid "Save game to file."
msgstr "½«ÓÎÏ·±£´æµ½ÎļþÖС£"
-#: server/commands.c:332
+#: server/commands.c:380
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"
@@ -2686,7 +2715,7 @@ msgstr ""
"Æô¶¯·þÎñÆ÷£¬²¢ÇÒµ±Íæ¼Ò¶¼ÖØÐÂÁ¬ÈëºóʹÓá°start¡±ÃüÁʼÓÎÏ·¡£"
#. TRANS: translate text between <> only
-#: server/commands.c:341
+#: server/commands.c:390
msgid ""
"load\n"
"load <file-name>"
@@ -2694,11 +2723,11 @@ msgstr ""
"load\n"
"load <ÎļþÃû>"
-#: server/commands.c:343
+#: server/commands.c:392
msgid "Load game from file."
msgstr "´ÓÎļþÖÐÔØÈëÓÎÏ·¡£"
-#: server/commands.c:344
+#: server/commands.c:393
msgid ""
"Load a game from <file-name>. Any current data including players, rulesets "
"and server options are lost.\n"
@@ -2707,120 +2736,120 @@ msgstr ""
"ʧ¡£\n"
#. TRANS: translate text between <> only
-#: server/commands.c:349
+#: server/commands.c:399
msgid "read <file-name>"
msgstr "read <ÎļþÃû>"
-#: server/commands.c:350
+#: server/commands.c:400
msgid "Process server commands from file."
msgstr "´¦ÀíÀ´×ÔÎļþµÄ·þÎñÆ÷ÃüÁî¡£"
#. TRANS: translate text between <> only
-#: server/commands.c:354
+#: server/commands.c:405
msgid "write <file-name>"
msgstr "write <ÎļþÃû>"
-#: server/commands.c:355
+#: server/commands.c:406
msgid "Write current settings as server commands to file."
msgstr "½«µ±Ç°ÉèÖÃ×÷Ϊ·þÎñÆ÷ÃüÁîдÈëÎļþ¡£"
-#: server/commands.c:359
+#: server/commands.c:411
msgid "Switch server output between 'RFC-style' and normal style."
msgstr "ÔÚ¡°RFC·ç¸ñ¡±ºÍ¡°ÆÕͨ·ç¸ñ¡±Ö®¼äÇл»·þÎñÆ÷Êä³ö¡£"
-#: server/commands.c:363
+#: server/commands.c:416
msgid "Simply returns the id of the server."
msgstr "·µ»Ø·þÎñÆ÷µÄ id¡£"
-#: server/connecthand.c:85
+#: server/connecthand.c:109
#, c-format
msgid "Welcome to the %s Server running at %s port %d."
msgstr "»¶ÓÀ´µ½ÔËÐÐÓÚ %2$s ¶Ë¿Ú %3$d µÄ·þÎñÆ÷ %1$s¡£"
-#: server/connecthand.c:89
+#: server/connecthand.c:113
#, c-format
msgid "Welcome to the %s Server at port %d."
msgstr "»¶ÓÀ´µ½ÔËÐÐÓÚ¶Ë¿Ú %2$d µÄ·þÎñÆ÷ %1$s¡£"
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:97
+#: server/connecthand.c:121
#, fuzzy, c-format
msgid "(%d) %s: connected [%s]"
msgstr "(%d) %s ÒÑ´Ó %s Á¬Èë¡£"
-#: server/connecthand.c:104
+#: server/connecthand.c:128
#, c-format
msgid "Server: %s has connected from %s."
msgstr "·þÎñÆ÷£º %s ÒÑ´Ó %s Á¬Èë¡£"
-#: server/connecthand.c:145
+#: server/connecthand.c:175
msgid "Couldn't attach your connection to new player."
msgstr "²»ÄÜ°ÑÄúµÄÁ¬½ÓÁªÏµµ½ÐÂÍæ¼Ò¡£"
-#: server/connecthand.c:165
+#: server/connecthand.c:199
#, c-format
msgid "You are logged in as '%s' connected to no player."
msgstr "ÄúÒÔ¡°%s¡±µÇ¼½øÀ´£¬Ã»ÓÐÁ¬½Óµ½ÈκÎÍæ¼Ò¡£"
-#: server/connecthand.c:169
+#: server/connecthand.c:203
#, c-format
msgid "You are logged in as '%s' connected to an anonymous player."
msgstr "ÄúÒÔ¡°%s¡±µÇ¼½øÀ´£¬ÄäÃûÁ¬Èë¡£"
-#: server/connecthand.c:174
+#: server/connecthand.c:208
#, c-format
msgid "You are logged in as '%s' connected to %s."
msgstr "ÄúÒÔ¡°%s¡±µÇ¼½øÀ´£¬Á¬½Óµ½¡°%s¡±¡£"
-#: server/connecthand.c:187
+#: server/connecthand.c:221
#, c-format
msgid "Turn-blocking game play: waiting on %s to finish turn..."
msgstr "»ØºÏ×èÖÍ£º µÈ´ý %s ½áÊø»ØºÏ¡¡"
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:240
+#: server/connecthand.c:274
#, fuzzy, c-format
msgid "(%d) %s: connection request [%s]"
msgstr "(%d) À´×ÔÀ´×Ô %2$s µÄ %1$s µÄÁ¬½ÓÇëÇó"
-#: server/connecthand.c:266
+#: server/connecthand.c:300
#, fuzzy
msgid "The client is missing a capability that this server needs."
msgstr "¿Í»§¶ËȱÉÙ´Ë·þÎñÆ÷ÐèÒªµÄÒ»ÏÄÜ¡£"
-#: server/connecthand.c:268 server/connecthand.c:279
+#: server/connecthand.c:302 server/connecthand.c:313
#, fuzzy, c-format
msgid "(%d) %s rejected: mismatched capabilities!"
msgstr "(%d) %s ±»¾Ü¾ø£º²»Æ¥ÅäµÄ¹¦ÄÜ¡£"
-#: server/connecthand.c:277
+#: server/connecthand.c:311
#, fuzzy
msgid "This server is missing a capability that the client needs."
msgstr "·þÎñÆ÷ȱÉÙ¿Í»§¶ËÐèÒªµÄÒ»ÏÄÜ¡£"
-#: server/connecthand.c:290
+#: server/connecthand.c:324
#, fuzzy
msgid "The username is invalid!"
msgstr "ÎÞЧµÄÃû×Ö"
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:292
+#: server/connecthand.c:326
#, fuzzy, c-format
msgid "(%d) %s rejected: invalid username [%s]"
msgstr "(%d) %s ±»¾Ü¾ø£ºÎÞЧµÄÃû×Ö [%s]¡£"
-#: server/connecthand.c:303
+#: server/connecthand.c:337
#, fuzzy
msgid "Your username is already connected!"
msgstr "ÒѾÁ¬ÈëÁË¡£"
#. TRANS: (connection) identifier: ... [network address]
-#: server/connecthand.c:305
+#: server/connecthand.c:339
#, fuzzy, c-format
msgid "(%d) %s rejected: duplicate username [%s]"
msgstr "(%d) %s ±»¾Ü¾ø£ºÖظ´µÄµÇ¼Ãû [%s]¡£"
-#: server/connecthand.c:335 server/connecthand.c:344
+#: server/connecthand.c:369 server/connecthand.c:378
#, c-format
msgid "Lost connection: %s."
msgstr "ʧȥÁ¬½Ó£º%s¡£"
@@ -2837,109 +2866,109 @@ msgstr "OK
msgid "For introductory help, type 'help'."
msgstr "ÒªµÃµ½½éÉÜÐÔ°ïÖú£¬ÇëÊäÈë¡°help¡±¡£"
-#: server/diplhand.c:164
+#: server/diplhand.c:167
#, c-format
msgid "The %s can't accept %s."
msgstr "%s ²»ÄܽÓÊÜ %s¡£"
-#: server/diplhand.c:176
+#: server/diplhand.c:179
#, c-format
msgid "You don't have tech %s, you can't accept treaty."
msgstr "Äú»¹Ã»ÓÐÕÆÎտƼ¼ %s£¬Äú²»ÄܽÓÊÜж¨¡£"
-#: server/diplhand.c:185
+#: server/diplhand.c:188
msgid "City you are trying to give no longer exists, you can't accept treaty."
msgstr "ÄúÕýÊÔͼÔùË͵ijÇÊÐÒѾ²»ÔÙ´æÔÚ£¬Äú²»ÄܽÓÊÜж¨¡£"
-#: server/diplhand.c:191
+#: server/diplhand.c:194
#, c-format
msgid "You are not owner of %s, you can't accept treaty."
msgstr "Äú²»ÊÇ %s µÄËùÓÐÕߣ¬Äú²»ÄܽÓÊÜж¨"
-#: server/diplhand.c:197 server/diplhand.c:301
+#: server/diplhand.c:200 server/diplhand.c:304
#, c-format
msgid "Your capital (%s) is requested, you can't accept treaty."
msgstr "Äú±»ÒªÇó¸îÈÃÊ׶¼£¨%s£©£¬Äú²»ÄܽÓÊÜж¨¡£"
-#: server/diplhand.c:224
+#: server/diplhand.c:227
msgid "You don't have enough gold, you can't accept treaty."
msgstr "ÄúûÓÐ×ã¹»µÄ»Æ½ð£¬Äú²»ÄܽÓÊÜж¨¡£"
-#: server/diplhand.c:256 server/diplhand.c:261
+#: server/diplhand.c:259 server/diplhand.c:264
#, c-format
msgid "A treaty containing %d clause was agreed upon."
msgid_plural "A treaty containing %d clauses was agreed upon."
msgstr[0] "ÒѶ©Á¢Ò»¸öº¬ %d Ìõ¿îµÄж¨¡£"
-#: server/diplhand.c:277 server/diplhand.c:281
+#: server/diplhand.c:280 server/diplhand.c:284
#, c-format
msgid "One of the cities the %s are giving away is destroyed! Treaty canceled!"
msgstr "Òª¸îÈõijÇÊÐÖ®Ò» %s ±»´Ý»ÙÁË£¡Ð¶¨È¡Ïû£¡"
-#: server/diplhand.c:288 server/diplhand.c:293
+#: server/diplhand.c:291 server/diplhand.c:296
#, c-format
msgid "The %s no longer control %s! Treaty canceled!"
msgstr "%s ÒѲ»ÔÙ¿ØÖÆ %s ÁË£¡Ð¶¨È¡Ïû£¡"
-#: server/diplhand.c:331 server/diplhand.c:335
+#: server/diplhand.c:334 server/diplhand.c:338
#, c-format
msgid "The %s don't have the promised amount of gold! Treaty canceled!"
msgstr "%s ûÓÐËüËù³ÐŵµÄÊýÁ¿µÄ»Æ½ð£¡Ð¶¨È¡Ïû£¡"
-#: server/diplhand.c:364
+#: server/diplhand.c:367
#, c-format
msgid "You gave an embassy to %s."
msgstr "ÄúÏò %s ÌṩÁËÒ»¸öʹ¹Ý¡£"
-#: server/diplhand.c:367
+#: server/diplhand.c:370
#, c-format
msgid "%s allowed you to create an embassy!"
msgstr "%s ÔÊÐíÄú½¨Á¢Ê¹¹Ý£¡"
-#: server/diplhand.c:383
+#: server/diplhand.c:386
#, c-format
msgid "You are taught the knowledge of %s."
msgstr "Äúѧµ½Á˹ØÓÚ %s µÄ֪ʶ¡£"
-#: server/diplhand.c:387
+#: server/diplhand.c:390
#, c-format
msgid "The %s have acquired %s from the %s."
msgstr "%1$s ´Ó %3$s »ñµÃÁË %2$s ¡£"
-#: server/diplhand.c:402
+#: server/diplhand.c:405
#, c-format
msgid "You get %d gold."
msgstr "ÄúµÃµ½ÁË %d »Æ½ð¡£"
#. TRANS: ... Polish worldmap.
-#: server/diplhand.c:410
+#: server/diplhand.c:413
#, fuzzy, c-format
msgid "You receive the %s worldmap."
msgstr "ÄúÊÕµ½ÁË %s µÄÊÀ½çµØͼ¡£"
#. TRANS: ... Polish seamap.
-#: server/diplhand.c:419
+#: server/diplhand.c:422
#, fuzzy, c-format
msgid "You receive the %s seamap."
msgstr "ÄúÊÕµ½ÁË %s µÄº£Í¼¡£"
-#: server/diplhand.c:436
+#: server/diplhand.c:439
#, c-format
msgid "You receive city of %s from %s."
msgstr "Äú´Ó %2$s ÊÕµ½³ÇÊÐ %1$s¡£"
-#: server/diplhand.c:441
+#: server/diplhand.c:444
#, c-format
msgid "You give city of %s to %s."
msgstr "Äú½«³ÇÊÐ %s Ë͸ø %s¡£"
-#: server/diplhand.c:454 server/diplhand.c:457
+#: server/diplhand.c:457 server/diplhand.c:460
#, c-format
msgid "You agree on a cease-fire with %s."
msgstr "ÄúͬÒâÓë %s Í£»ð¡£"
#. TRANS: ... the Poles ... Polish territory.
-#: server/diplhand.c:476 server/diplhand.c:488
+#: server/diplhand.c:479 server/diplhand.c:491
#, fuzzy, c-format
msgid ""
"You agree on an armistice with the %s. In %d turn, it will become a peace "
@@ -2951,32 +2980,32 @@ msgstr[0] ""
"ÄúͬÒâÓë %s Í£»ð£¬ÕâÔÚ %d ¸ö»ØºÏºó½«×ª±ä³ÉºÍƽж¨¡£Ç뽫ÄúµÄ²¿¶ÓÒƳö %s µÄÁì"
"ÍÁ¡£"
-#: server/diplhand.c:512 server/diplhand.c:515
+#: server/diplhand.c:515 server/diplhand.c:518
#, c-format
msgid "You agree on an alliance with %s."
msgstr "ÄúͬÒâÓë %s ½áÃË¡£"
-#: server/diplhand.c:524
+#: server/diplhand.c:527
#, c-format
msgid "You give shared vision to %s."
msgstr "ÄúÈà %s ¹²ÏíÄúµÄÊÓÒ°¡£"
-#: server/diplhand.c:527
+#: server/diplhand.c:530
#, c-format
msgid "%s gives you shared vision."
msgstr "%s ÈÃÄú¹²ÏíËûµÄÊÓÒ°¡£"
-#: server/diplhand.c:663
+#: server/diplhand.c:666
#, c-format
msgid "%s canceled the meeting!"
msgstr "%s È¡ÏûÁË»áÎ"
-#: server/diplhand.c:670
+#: server/diplhand.c:673
#, c-format
msgid "Meeting with %s canceled."
msgstr "Óë %s µÄ»áÎîÒÑÈ¡Ïû¡£"
-#: server/diplhand.c:712
+#: server/diplhand.c:715
msgid "Your diplomatic envoy was decapitated!"
msgstr "ÄúµÄÍ⽻ʹ½Ú±»É±Í·ÁË£¡"
@@ -3159,80 +3188,80 @@ msgid "The %s destroyed the %s in %s."
msgstr "%1$s ÔÚ´Ý»ÙÁË %3$s ÖÐµÄ %2$s ¡£"
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1091
+#: server/diplomats.c:1097
#, fuzzy, c-format
msgid "An enemy %s has been eliminated by your %s."
msgstr "ÔÚ·ÀÓù %2$s Öез½µÄ %1$s ±»ÏûÃðÁË¡£"
#. TRANS: <unit> ... <city> ... <diplomat>
-#: server/diplomats.c:1098
+#: server/diplomats.c:1104
#, c-format
msgid "Your %s has been eliminated defending %s against a %s."
msgstr "ÄúµÄ %s ÔÚ·ÀÊØ %s µÖ¿¹ %s µÄ¹ý³ÌÖб»ÏûÃðÁË¡£"
#. TRANS: <unit> ... <diplomat>
-#: server/diplomats.c:1106
+#: server/diplomats.c:1112
#, fuzzy, c-format
msgid "Your %s has been eliminated defending against a %s."
msgstr "ÄúµÄ %s ÔÚ·ÀÊØ µÖ¿¹ %s µÄ¹ý³ÌÖб»ÏûÃðÁË¡£"
-#: server/diplomats.c:1119
+#: server/diplomats.c:1125
#, c-format
msgid "Your %s was eliminated by a defending %s."
msgstr "ÄúµÄ %s ±»·ÀÓùµÄ %s ËùÏûÃð¡£"
-#: server/diplomats.c:1127
+#: server/diplomats.c:1133
#, c-format
msgid "Eliminated %s %s while infiltrating %s."
msgstr "ÏûÃðÁËÊÔͼDZÈë %3$s µÄ %1$s %2$s ¡£"
-#: server/diplomats.c:1134
+#: server/diplomats.c:1140
#, c-format
msgid "Eliminated %s %s while infiltrating our troops."
msgstr "ÏûÃðÁËÊÔͼDZÈëÎÒ·½²¿¶ÓµÄ %1$s %2$s ¡£"
-#: server/diplomats.c:1185
+#: server/diplomats.c:1191
#, fuzzy, c-format
msgid ""
"Your %s has successfully completed the mission and returned unharmed to %s."
msgstr "ÄúµÄ %s ³É¹¦µØÍê³ÉÁËʹÃü²¢ÍêºÃµØ·µ»ØÁË %s ¡£"
-#: server/diplomats.c:1204
+#: server/diplomats.c:1210
#, fuzzy, c-format
msgid "Your %s was captured after completing the mission in %s."
msgstr "ÄúµÄ %s ÔÚ %s Íê³ÉʹÃüºó±»×¥×¡ÁË¡£"
-#: server/diplomats.c:1210
+#: server/diplomats.c:1216
#, fuzzy, c-format
msgid "Your %s was captured after completing the mission."
msgstr "ÄúµÄ %s ÔÚÍê³ÉʹÃüºó±»×¥×¡ÁË¡£"
-#: server/diplomats.c:1242
+#: server/diplomats.c:1248
#, fuzzy, c-format
msgid "You have caused an incident while bribing the %s %s."
msgstr "ÄúÔڻ߸ %s µÄ %s ʱÒý·¢ÁËÒâÍâ¡£"
-#: server/diplomats.c:1247
+#: server/diplomats.c:1253
#, c-format
msgid "%s has caused an incident while bribing your %s."
msgstr "%s Ôڻ߸ÄúµÄ %s ʱÒý·¢ÁËÒâÍâ¡£"
-#: server/diplomats.c:1254
+#: server/diplomats.c:1260
#, c-format
msgid "You have caused an incident while attempting to steal tech from %s."
msgstr "ÄúÔÚ´Ó %s ÇÔÈ¡¿Æ¼¼Ê±Òý·¢ÁËÒâÍâ¡£"
-#: server/diplomats.c:1258
+#: server/diplomats.c:1264
#, c-format
msgid "%s has caused an incident while attempting to steal tech from you."
msgstr "%s ÔÚ´ÓÄúÕâÀïÇÔÈ¡¿Æ¼¼Ê±Òý·¢ÁËÒâÍâ¡£"
-#: server/diplomats.c:1264
+#: server/diplomats.c:1270
#, c-format
msgid "You have caused an incident while inciting a revolt in %s."
msgstr "ÄúÔÚ %s ÖÐÉ¿¶¯ÆðÒåʱÒý·¢ÁËÒâÍâ¡£"
-#: server/diplomats.c:1268
+#: server/diplomats.c:1274
#, c-format
msgid "%s have caused an incident while inciting a revolt in %s."
msgstr "%s ÔÚ %s ÖÐÉ¿¶¯ÆðÒåʱÒý·¢ÁËÒâÍâ¡£"
@@ -3343,12 +3372,12 @@ msgstr ""
"ÈËÃñΪÄúµÄ¿Æѧ¼Ò×îÖÕÕÆÎÕÁËÌú·¶ø¼¤Àø¡£\n"
" ¹¤ÈËÃÇ×Ô·¢µØ¼¯½áÆðÀ´²¢ÓÃÌú·Éý¼¶ÁËËùÓеijÇÊС£"
-#: server/maphand.c:1418
+#: server/maphand.c:1425
#, c-format
msgid "Moved your %s due to changing terrain."
msgstr "ÒòΪ¸Ä±äµØÐζøÒƶ¯ÁËÄúµÄ %s ¡£"
-#: server/maphand.c:1436
+#: server/maphand.c:1443
#, c-format
msgid "Disbanded your %s due to changing terrain."
msgstr "ÒòΪ¸Ä±äµØÐζø½âÉ¢ÁËÄúµÄ %s ¡£"
@@ -3357,7 +3386,7 @@ msgstr "
msgid "Not reporting to the metaserver in this game."
msgstr "´ËÓÎϷδÏòÔª·þÎñÆ÷±¨¸æ¡£"
-#: server/meta.c:430
+#: server/meta.c:432
#, c-format
msgid "Metaserver: bad address: [%s:%d]."
msgstr "Ôª·þÎñÆ÷£º´íÎóµÄµØÖ·£º[%s:%d]¡£"
@@ -3471,54 +3500,54 @@ msgid ""
"with %s."
msgstr "ÄúµÄÍŶӻï°é %s ¶Ô %s ÐûÕ½ÁË¡£Äú±»ÆÈÈ¡ÏûÁËÓë %s µÄͬÃË¡£"
-#: server/plrhand.c:1103
+#: server/plrhand.c:1115
#, c-format
msgid "Removing player %s."
msgstr "ÕýÔÚɾ³ýÍæ¼Ò %s¡£"
-#: server/plrhand.c:1105
+#: server/plrhand.c:1117
msgid "You've been removed from the game!"
msgstr "ÄúÒѾ±»´ÓÓÎÏ·ÖÐɾ³ýÁË£¡"
-#: server/plrhand.c:1108
+#: server/plrhand.c:1120
#, c-format
msgid "%s has been removed from the game."
msgstr "%s ÒѾ±»´ÓÓÎÏ·ÖÐɾ³ýÁË¡£"
-#: server/plrhand.c:1153 server/plrhand.c:1158
+#: server/plrhand.c:1167 server/plrhand.c:1172
#, c-format
msgid "You have made contact with the %s, ruled by %s."
msgstr "ÄúÁªÏµµ½ÁË %s £¬ËüÓÉ %s ËùͳÖΡ£"
-#: server/plrhand.c:1178
+#: server/plrhand.c:1192
#, 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:1656
+#: server/plrhand.c:1670
#, c-format
msgid "Could not throw %s into civil war - too many players"
msgstr "²»ÄÜ°Ñ %s Ç£ÈëÄÚÕ½ £ Íæ¼ÒÌ«¶à"
-#: server/plrhand.c:1663
+#: server/plrhand.c:1677
#, fuzzy, c-format
msgid "Could not throw %s into civil war - no available nations"
msgstr "²»ÄÜ°Ñ %s Ç£ÈëÄÚÕ½ £ Íæ¼ÒÌ«¶à"
-#: server/plrhand.c:1686
+#: server/plrhand.c:1700
#, fuzzy, c-format
msgid ""
"Your nation is thrust into civil war! %s is declared the leader of the rebel "
"states."
msgstr "ÄúµÄ¹ú¼Ò±»ÍÆÈëÄÚÕ½£¬%s ±»Ðû²¼ÎªÆðÒåÕþ¸®µÄÊ×Áì¡£"
-#: server/plrhand.c:1707
+#: server/plrhand.c:1721
#, c-format
msgid "%s declares allegiance to %s."
msgstr "%s Ïò %s ±íʾЧÖÒ¡£"
-#: server/plrhand.c:1722
+#: server/plrhand.c:1736
#, fuzzy, c-format
msgid ""
"Capture of the %s capital and destruction of the empire's administrative\n"
@@ -3708,63 +3737,63 @@ msgstr "
msgid "Wonders of the World"
msgstr "ÊÀ½çÆæ¼£"
-#: server/report.c:547
+#: server/report.c:552
msgid " sq. mi."
msgstr "ƽ·½Ó¢Àï"
-#: server/report.c:557
+#: server/report.c:562
msgid " M tons"
msgstr "°ÙÍò¶Ö"
-#: server/report.c:562
+#: server/report.c:567
msgid " M goods"
msgstr "°ÙÍò»õÎï"
-#: server/report.c:567
+#: server/report.c:572
msgid " bulbs"
msgstr "µã"
-#: server/report.c:572
+#: server/report.c:577
msgid " month"
msgid_plural " months"
msgstr[0] " ¸öÔÂ"
-#: server/report.c:577
+#: server/report.c:582
msgid " ton"
msgid_plural " tons"
msgstr[0] " ¶Ö"
-#: server/report.c:591
+#: server/report.c:596
msgid "st"
msgstr "ºÅ"
-#: server/report.c:593
+#: server/report.c:598
msgid "nd"
msgstr "ºÅ"
-#: server/report.c:595
+#: server/report.c:600
msgid "rd"
msgstr "ºÅ"
-#: server/report.c:597
+#: server/report.c:602
msgid "th"
msgstr "ºÅ"
-#: server/report.c:700
+#: server/report.c:705
msgid "Demography string contains invalid characters. Try \"help demography\"."
msgstr "ÈË¿Úͳ¼Æ´®°üº¬ÎÞЧµÄ×Ö·û¡£Çë³¢ÊÔ¡°help demography¡±¡£"
-#: server/report.c:743 server/report.c:768
+#: server/report.c:748 server/report.c:773
msgid "Demographics Report:"
msgstr "ÈË¿Úͳ¼Æ±¨¸æ£º"
-#: server/report.c:744
+#: server/report.c:749
msgid "Sorry, the Demographics report is unavailable."
msgstr "±§Ç¸£¬ÈË¿Úͳ¼Æ±¨¸æÉв»¿ÉÓá£"
#. TRANS: <nation adjective> <government name> (<year>).
#. * E.g. "Polish Despotism (200 AD)".
-#: server/report.c:750
+#: server/report.c:755
#, fuzzy, c-format
msgid "%s %s (%s)"
msgstr "%2$s £¨%3$s£© ÖÐµÄ %1$s\n"
@@ -3775,11 +3804,11 @@ msgstr "%2$s
msgid "Could not find a readable \"%s.%s\" ruleset file."
msgstr "ÎÞ·¨ÕÒµ½¿É¶ÁµÄ¡°%s.%s¡±¹æÔò¼¯Îļþ¡£"
-#: server/ruleset.c:2356
+#: server/ruleset.c:2366
msgid "No barbarian nation in rulesets, at least one required!"
msgstr ""
-#: server/ruleset.c:3166
+#: server/ruleset.c:3178
msgid "Loading rulesets"
msgstr "ÕýÔÚÔØÈë¹æÔò¼¯"
@@ -3794,19 +3823,19 @@ msgstr ""
"´æÅÌÎļþº¬Óв»ÍêÕûµÄµØͼÊý¾Ý¡£Õâ¿ÉÄÜÊǾɵĴæÅÌÓÎÏ·£¬»òÕß±íÃ÷ÕâÊÇÒ»¸öÎÞЧµÄ´æ"
"ÅÌÎļþ¡£Èç¹û¼ÌÐøµÄ»°ºó¹û×Ô¸º¡£"
-#: server/savegame.c:3588
+#: server/savegame.c:3587
#, fuzzy
msgid "Saved game is too old, at least version 1.9.0 required."
msgstr "Savegame Ì«³Â¾É£¬ÖÁÉÙÐèÒª 1.9.0 °æ±¾¡£"
#. TRANS: Fatal error message.
-#: server/savegame.c:3815
+#: server/savegame.c:3817
#, fuzzy
msgid ""
"Saved game uses the \"classic\" terrain ruleset, and is no longer supported."
msgstr "´æÅÌÓÎϷʹÓÃÁ˲»ÔÙÖ§³ÖµÄ¹ÅµäµØÐιæÔò¼¯ºÏ¡£"
-#: server/savegame.c:3824
+#: server/savegame.c:3826
#, c-format
msgid ""
"Warning: Different rulesetdirs ('%s' and '%s') are no longer supported. "
@@ -3814,7 +3843,7 @@ msgid ""
msgstr "¾¯¸æ£º ²»Í¬µÄ¹æÔò¼¯ºÏĿ¼£¨¡°%s¡±ºÍ¡°%s¡±£©²»ÔÙÖ§³Ö¡£½«Ê¹Óá°%s¡±¡£"
#. TRANS: Minor error message: <Leader> ... <Poles>.
-#: server/savegame.c:4051
+#: server/savegame.c:4055
#, c-format
msgid "%s had invalid nation; changing to %s."
msgstr ""
@@ -3847,7 +3876,7 @@ msgstr "
msgid "Networking"
msgstr "ÍøÂç"
-#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:732
+#: server/settings.c:42 client/gui-gtk-2.0/dialogs.c:734
#: client/gui-win32/dialogs.c:532
msgid "All"
msgstr "È«²¿"
@@ -4996,11 +5025,11 @@ msgstr ""
"Èç¹û±»ÖÃΪ1£¬Ôòÿ¸ö»ØºÏºó¶¼½«°ÑÍæ¼Òͳ¼ÆÐÅÏ¢Ìí¼Óµ½Îļþ¡°civscore.log¡±ÖС£ÕâЩ"
"ͳ¼ÆÐÅÏ¢¿ÉÒÔÔÚÓÎÏ·½áÊøºóÓÃÓÚ´´½¨ÊÆÁ¦Í¼¡£"
-#: server/sernet.c:150
+#: server/sernet.c:151
msgid "Server cannot read standard input. Ignoring input."
msgstr "·þÎñÆ÷ÎÞ·¨¶ÁÈë±ê×¼ÊäÈë¡£ºöÂÔÊäÈë¡£"
-#: server/sernet.c:929
+#: server/sernet.c:933
#, c-format
msgid "Server: bad address: [%s:%d]."
msgstr "·þÎñÆ÷£º´íÎóµÄµØÖ·£º[%s:%d]¡£"
@@ -5073,619 +5102,604 @@ msgstr "
msgid "Without guidance from the capital, the %s spaceship is lost!"
msgstr "ûÓÐÀ´×ÔÊ׶¼µÄÖ¸Òý£¬%s ÓîÖæ·É´¬Ê§×ÙÁË£¡"
-#: server/srv_main.c:240
+#: server/srv_main.c:242
msgid "Game ended in a draw as end year exceeded"
msgstr "ÓÎÏ·½áÊøδ·Öʤ¸º£¬³¬¹ýÁ˽áÊøÄê´ú"
-#: server/srv_main.c:274
+#: server/srv_main.c:276
#, c-format
msgid "The %s spaceship has arrived at Alpha Centauri."
msgstr "%s ÓîÖæ·É´¬ÒѾµ½´ï°ëÈËÂíÐÇ×ù¡£"
-#: server/srv_main.c:287 server/srv_main.c:322
+#: server/srv_main.c:289 server/srv_main.c:324
#, c-format
msgid "Team victory to %s"
msgstr "ÍŶÓʤÀûÊôÓÚ %s"
-#: server/srv_main.c:297 server/srv_main.c:338
+#: server/srv_main.c:299 server/srv_main.c:340
#, c-format
msgid "Game ended in victory for %s"
msgstr "ÓÎÏ·ÒÔ %s µÄʤÀû½áÊø"
-#: server/srv_main.c:345
+#: server/srv_main.c:347
msgid "Game ended in a draw"
msgstr "ÓÎÏ·½áÊøδ·Öʤ¸º"
-#: server/srv_main.c:461 server/srv_main.c:472
+#: server/srv_main.c:465 server/srv_main.c:476
#, fuzzy, c-format
msgid "Your %s was disbanded in accordance with your peace treaty with the %s."
msgstr "°´ÕÕÓë %2$s µÄºÍƽж¨£¬ÄúµÄ %1$s ²¿¶Ó ±»½âÉ¢ÁË¡£"
-#: server/srv_main.c:512 server/srv_main.c:516
+#: server/srv_main.c:516 server/srv_main.c:520
#, c-format
msgid ""
"Concerned citizens point out that the cease-fire with %s will run out soon."
msgstr "ÓÇÂǵÄÊÐÃñÖ¸³öºÍ %s µÄÍ£»ðж¨ºÜ¿ì¾Í»áµ½ÆÚÁË¡£"
-#: server/srv_main.c:521 server/srv_main.c:525
+#: server/srv_main.c:525 server/srv_main.c:529
#, c-format
msgid "The cease-fire with %s has run out. You are now at war with the %s."
msgstr "ºÍ %s µÄÍ£»ðж¨µ½ÆÚÁË¡£ÄúÏÖÔÚÓë %s ´¦ÓÚÕ½Õù״̬¡£"
-#: server/srv_main.c:542
+#: server/srv_main.c:546
#, fuzzy, c-format
msgid ""
"Ceasefire between %s and %s has run out. They are at war. You cancel your "
"alliance with both."
msgstr "ÄúµÄÍŶӻï°é %s ¶Ô %s ÐûÕ½ÁË¡£Äú±»ÆÈÈ¡ÏûÁËÓë %s µÄͬÃË¡£"
-#: server/srv_main.c:961
+#: server/srv_main.c:997
#, c-format
msgid "Failed saving game as %s"
msgstr "½«ÓÎÏ·±£´æΪ %s ʧ°Ü"
-#: server/srv_main.c:963
+#: server/srv_main.c:999
#, c-format
msgid "Game saved as %s"
msgstr "ÓÎÏ·ÒÑ´æΪ %s"
-#: server/srv_main.c:994
+#: server/srv_main.c:1030
msgid "The game is already running."
msgstr "ÓÎÏ·ÒѾÔËÐС£"
-#: server/srv_main.c:1002
+#: server/srv_main.c:1038
#, c-format
msgid "%s lost control cmdlevel on game start. Use voting from now on."
msgstr "ÓÎÏ·¿ªÊ¼Ê± %s ʧȥÁË¿ØÖÆÃüÁ±ð¡£´ÓÏÖÔÚ¿ªÊ¼Ê¹ÓÃͶƱ¡£"
-#: server/srv_main.c:1009
+#: server/srv_main.c:1045
msgid "Starting game."
msgstr "ÕýÔÚÆô¶¯ÓÎÏ·¡£"
-#: server/srv_main.c:1071
+#: server/srv_main.c:1112
#, c-format
msgid "request for unknown report (type %d)"
msgstr "δ֪µÄ±¨¸æÇëÇó£¨ÀàÐÍ %d£©"
-#: server/srv_main.c:1136
+#: server/srv_main.c:1177
#, c-format
msgid "Warning: rejecting old client %s"
msgstr "¾¯¸æ£º ¾Ü¾ø¾ÉµÄ¿Í»§¶Ë %s "
-#: server/srv_main.c:1238
+#: server/srv_main.c:1279
#, c-format
msgid "Got a packet of type %d from a dead or observer player"
msgstr "ÊÕµ½À´×ÔËÀÍö»ò¹Û²ìÕßÍæ¼ÒµÄÀàÐÍΪ %d µÄ±¨ÎÄ"
-#: server/srv_main.c:1338
+#: server/srv_main.c:1381
msgid "Please choose a non-blank name."
msgstr "ÇëÑ¡ÔñÒ»¸ö·Ç¿ÕµÄÃû×Ö¡£"
-#: server/srv_main.c:1354
+#: server/srv_main.c:1397
msgid "That nation is already in use."
msgstr "¸ÃÃñ×åÒѾ±»Ê¹ÓÃÁË¡£"
-#: server/srv_main.c:1370
+#: server/srv_main.c:1413
#, c-format
msgid "Another player already has the name '%s'. Please choose another name."
msgstr "ÆäËüµÄÍæ¼ÒÒѾʹÓÃÁËÃû×Ö¡°%s¡±¡£ÇëÑ¡ÔñÁíÒ»¸öÃû×Ö¡£"
-#: server/srv_main.c:1391
+#: server/srv_main.c:1434
msgid "Please choose a name containing only ASCII characters."
msgstr "ÇëÑ¡ÔñÒ»¸ö½ö°üº¬ ASCII ×Ö·ûµÄÃû×Ö¡£"
-#: server/srv_main.c:1490
+#: server/srv_main.c:1533
#, c-format
msgid "%s nation is not available in this scenario."
msgstr "Ãñ×å %s ÔÚÕâ¸öÇé¾°Öв»ÄÜʹÓá£"
-#: server/srv_main.c:1496
+#: server/srv_main.c:1539
#, c-format
msgid "%s nation is already in use."
msgstr "%s Ãñ×åÒѾ±»Ê¹ÓÃÁË¡£"
-#: server/srv_main.c:1514
+#: server/srv_main.c:1557
#, c-format
msgid "%s is the %s ruler %s."
msgstr "%s ³ÉΪ %s µÄͳÖÎÕß %s ¡£"
-#: server/srv_main.c:1570
+#: server/srv_main.c:1613
#, 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:1614 server/srv_main.c:1618
+#: server/srv_main.c:1657 server/srv_main.c:1661
#, c-format
msgid "%s has been added as %s level AI-controlled player."
msgstr "%s ÒѾ×÷Ϊ %s ¼¶±ðµÄ AI Íæ¼Ò¼ÓÈë¡£"
-#: server/srv_main.c:1760
+#: server/srv_main.c:1803
#, c-format
msgid "Player %d"
msgstr "Íæ¼Ò %d"
-#: server/srv_main.c:1771 server/srv_main.c:1777
+#: server/srv_main.c:1814 server/srv_main.c:1820
#, c-format
msgid "%s rules the %s."
msgstr "%s ͳÖÎ %s¡£"
-#: server/srv_main.c:1942
+#: server/srv_main.c:1985
msgid ""
"This civserver program has player authentication support, but it's currently "
"not in use."
msgstr ""
-#: server/srv_main.c:1993
+#: server/srv_main.c:2037
#, c-format
msgid "Sending info to metaserver [%s]"
msgstr "½«ÐÅÏ¢·¢Ë͵½Ôª·þÎñÆ÷ [%s]"
-#: server/srv_main.c:2024
+#: server/srv_main.c:2069
msgid "The game is over..."
msgstr "ÓÎÏ·½áÊø..."
-#: server/srv_main.c:2237
+#: server/srv_main.c:2286
msgid "Now accepting new client connections."
msgstr "ÏÖÔÚ½ÓÊÜпͻ§¶ËµÄÁ¬½Ó¡£"
-#: server/stdinhand.c:246
-#, c-format
-msgid "Vote \"%s\" is passed %d to %d with %d abstentions."
-msgstr "ͶƱ¡°%s¡±Í¨¹ý£¬%d Ö§³Ö£¬%d ·´¶Ô£¬%d ÆúȨ¡£"
-
-#: server/stdinhand.c:253
-#, c-format
-msgid "Vote \"%s\" failed with %d against, %d for and %d abstentions."
-msgstr "ͶƱ¡°%s¡±·ñ¾ö£¬%d ·´¶Ô£¬%d Ö§³Ö£¬ÒÔ¼° %d ÆúȨ¡£"
-
#. TRANS: ambiguous command
-#: server/stdinhand.c:365
+#: server/stdinhand.c:284
msgid "(ambiguous)"
msgstr "(Ä£ºý)"
#. TRANS: unrecognized command
#. TRANS: "unknown" location
-#: server/stdinhand.c:368 client/citydlg_common.c:416
+#: server/stdinhand.c:287 client/citydlg_common.c:419
#: 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 "(δ֪)"
-#: server/stdinhand.c:458
+#: server/stdinhand.c:377
msgid "Name is empty, so cannot be a player."
msgstr "Ãû³ÆΪ¿Õ£¬ËùÒÔ²»ÄÜ×÷ΪÍæ¼Ò¡£"
-#: server/stdinhand.c:462
+#: server/stdinhand.c:381
msgid "Name is too long, so cannot be a player."
msgstr "Ãû³ÆÌ«³¤£¬ËùÒÔ²»ÄÜ×÷ΪÍæ¼Ò¡£"
-#: server/stdinhand.c:466
+#: server/stdinhand.c:385
#, c-format
msgid "Player name prefix '%s' is ambiguous."
msgstr "Íæ¼ÒÃûǰ׺¡°%s¡±ÓÐÆçÒå¡£"
-#: server/stdinhand.c:470
+#: server/stdinhand.c:389
#, c-format
msgid "No player by the name of '%s'."
msgstr "ûÓÐÃûΪ¡°%s¡±µÄÍæ¼Ò¡£"
-#: server/stdinhand.c:474 server/stdinhand.c:509
+#: server/stdinhand.c:393 server/stdinhand.c:428
#, c-format
msgid "Unexpected match_result %d (%s) for '%s'."
msgstr "δԤÁϵġ°%3$s¡±µÄmatch_result %1$d (%2$s) ¡£"
-#: server/stdinhand.c:493
+#: server/stdinhand.c:412
msgid "Name is empty, so cannot be a connection."
msgstr "Ãû³ÆΪ¿Õ£¬ËùÒÔ²»ÄܳÉΪһ¸öÁ¬½Ó¡£"
-#: server/stdinhand.c:497
+#: server/stdinhand.c:416
msgid "Name is too long, so cannot be a connection."
msgstr "Ãû³ÆÌ«³¤£¬ËùÒÔ²»ÄܳÉΪһ¸öÁ¬½Ó¡£"
-#: server/stdinhand.c:501
+#: server/stdinhand.c:420
#, c-format
msgid "Connection name prefix '%s' is ambiguous."
msgstr "Á¬½ÓÃûǰ׺¡°%s¡±ÓÐÆçÒå¡£"
-#: server/stdinhand.c:505
+#: server/stdinhand.c:424
#, c-format
msgid "No connection by the name of '%s'."
msgstr "ûÓÐÃû×ÖΪ¡°%s¡±µÄÁ¬½Ó¡£"
-#: server/stdinhand.c:525
+#: server/stdinhand.c:444
#, c-format
msgid "Open metaserver connection to [%s]."
msgstr "´ò¿ªµ½ [%s] Ôª·þÎñÆ÷Á¬½Ó¡£"
-#: server/stdinhand.c:538
+#: server/stdinhand.c:457
#, c-format
msgid "Close metaserver connection to [%s]."
msgstr "¹Ø±Õµ½ [%s] µÄÔª·þÎñÆ÷Á¬½Ó¡£"
-#: server/stdinhand.c:553
+#: server/stdinhand.c:472
msgid "Metaserver connection is open."
msgstr "Ôª·þÎñÆ÷Á¬½ÓÒÑ´ò¿ª¡£"
-#: server/stdinhand.c:556
+#: server/stdinhand.c:475
msgid "Metaserver connection is closed."
msgstr "Ôª·þÎñÆ÷Á¬½ÓÒѹرա£"
-#: server/stdinhand.c:566
+#: server/stdinhand.c:485
msgid "Metaserver connection is already open."
msgstr "ÒѾ´ò¿ªµ½Ôª·þÎñÆ÷µÄÁ¬½Ó¡£"
-#: server/stdinhand.c:577
+#: server/stdinhand.c:496
msgid "Metaserver connection is already closed."
msgstr "ÒѾ¹Ø±Õµ½Ôª·þÎñÆ÷µÄÁ¬½Ó¡£"
-#: server/stdinhand.c:582
+#: server/stdinhand.c:501
msgid "Argument must be 'u', 'up', 'd', 'down', or '?'."
msgstr "²ÎÊý±ØÐëÊÇ¡°u¡±¡¢¡°up¡±¡¢¡°d¡±¡¢¡°down¡±»ò¡°?¡±¡£"
-#: server/stdinhand.c:603
+#: server/stdinhand.c:522
#, c-format
msgid "Metaserver patches string set to '%s'."
msgstr "Ôª·þÎñÆ÷²¹¶¡×Ö·û´®ÉèÖÃΪ¡°%s¡±¡£"
-#: server/stdinhand.c:606
+#: server/stdinhand.c:525
#, c-format
msgid "Metaserver patches string set to '%s', not reporting to metaserver."
msgstr "Ôª·þÎñÆ÷²¹¶¡×Ö·û´®ÉèÖÃΪ¡°%s¡±£¬²»ÏòÔª·þÎñÆ÷±¨¸æ¡£"
-#: server/stdinhand.c:627
+#: server/stdinhand.c:546
#, c-format
msgid "Metaserver message string set to '%s'."
msgstr "Ôª·þÎñÆ÷ÏûÏ¢×Ö·û´®ÉèÖÃΪ¡°%s¡±¡£"
-#: server/stdinhand.c:630
+#: server/stdinhand.c:549
#, c-format
msgid "Metaserver message string set to '%s', not reporting to metaserver."
msgstr "Ôª·þÎñÆ÷ÏûÏ¢×Ö·û´®ÉèÖÃΪ¡°%s¡±£¬²»ÏòÔª·þÎñÆ÷±¨¸æ¡£"
-#: server/stdinhand.c:650
+#: server/stdinhand.c:569
#, c-format
msgid "Metaserver is now [%s]."
msgstr "Ôª·þÎñÆ÷ÏÖÔÚÊÇ [%s]¡£"
-#: server/stdinhand.c:660
+#: server/stdinhand.c:579
#, c-format
msgid "Server id: %s"
msgstr "·þÎñÆ÷ id£º%s"
-#: server/stdinhand.c:757
+#: server/stdinhand.c:676
msgid "You cannot save games manually on this server."
msgstr "Äú²»ÄÜÔÚ´Ë·þÎñÆ÷ÉÏÊÖ¶¯±£´æÓÎÏ·¡£"
-#: server/stdinhand.c:774
+#: server/stdinhand.c:693
msgid "Cannot toggle a barbarian player."
msgstr "ÎÞ·¨Çл»Ò°ÈËÍæ¼Ò¡£"
-#: server/stdinhand.c:781
+#: server/stdinhand.c:700
#, c-format
msgid "%s is now under AI control."
msgstr "%s Ä¿Ç°´¦ÓÚ AI ¿ØÖÆ֮ϡ£"
-#: server/stdinhand.c:802
+#: server/stdinhand.c:721
#, c-format
msgid "%s is now under human control."
msgstr "%s Ä¿Ç°´¦ÓÚÕæÈËÍæ¼ÒµÄ¿ØÖÆ֮ϡ£"
-#: server/stdinhand.c:847
+#: server/stdinhand.c:766
msgid "Can't add AI players once the game has begun."
msgstr "²»ÄÜÔÚÓÎÏ·¿ªÊ¼ºóÔö¼Ó AI Íæ¼Ò¡£"
-#: server/stdinhand.c:867
+#: server/stdinhand.c:786
msgid "Can't add more players, server is full."
msgstr "ÎÞ·¨Ôö¼Ó¸ü¶àµÄÍæ¼Ò£¬·þÎñÆ÷ÒÑÂú¡£"
-#: server/stdinhand.c:874
+#: server/stdinhand.c:793
msgid "Can't use an empty name."
msgstr "²»ÄÜʹÓÿÕÃû³Æ¡£"
-#: server/stdinhand.c:881
+#: server/stdinhand.c:800
#, c-format
msgid "That name exceeds the maximum of %d chars."
msgstr "ÄǸöÃû³Æ³¬³öÁË×î¶àµÄ %d ¸ö×Ö·û¡£"
-#: server/stdinhand.c:887
+#: server/stdinhand.c:806
msgid "That name is not allowed."
msgstr "²»ÄÜʹÓøÃÃû×Ö¡£"
-#: server/stdinhand.c:893
+#: server/stdinhand.c:812
msgid "A player already exists by that name."
msgstr "ÒÔÓÐʹÓÃÄǸöÃû×ÖµÄÍæ¼Ò¡£"
-#: server/stdinhand.c:899
+#: server/stdinhand.c:818
msgid "A user already exists by that name."
msgstr "ÒÑÓÐʹÓÃÄǸöÃû×ÖµÄÍæ¼Ò¡£"
-#: server/stdinhand.c:925
+#: server/stdinhand.c:844
#, c-format
msgid "%s has been added as an AI-controlled player."
msgstr "%s ÒѾ×÷Ϊ AI Íæ¼Ò¼ÓÈë¡£"
-#: server/stdinhand.c:932
+#: server/stdinhand.c:851
#, c-format
msgid "Error creating new AI player: %s."
msgstr "´´½¨Ð AI Íæ¼Ò´íÎó£º%s¡£"
-#: server/stdinhand.c:966
+#: server/stdinhand.c:885
msgid "Players cannot be removed once the game has started."
msgstr "ÎÞ·¨ÔÚÓÎÏ·¿ªÊ¼ºóɾ³ýÍæ¼Ò¡£"
-#: server/stdinhand.c:977
+#: server/stdinhand.c:896
#, c-format
msgid "Removed player %s from the game."
msgstr "´ÓÓÎÏ·ÖÐɾ³ýÍæ¼Ò %s¡£"
-#: server/stdinhand.c:1016 server/stdinhand.c:3356 server/stdinhand.c:3469
+#: server/stdinhand.c:935 server/stdinhand.c:3372 server/stdinhand.c:3507
#, c-format
msgid "Name \"%s\" disallowed for security reasons."
msgstr "³öÓÚ°²È«µÄÔÒò²»ÔÊÐíʹÓÃÃû×Ö¡°%s¡±¡£"
-#: server/stdinhand.c:1029
+#: server/stdinhand.c:948
#, c-format
msgid "No command script found by the name \"%s\"."
msgstr "ûÓÐÃû×ÖΪ¡°%s¡±µÄÃüÁî½Å±¾¡£"
-#: server/stdinhand.c:1037
+#: server/stdinhand.c:956
#, c-format
msgid "Loading script file: %s"
msgstr "ÕýÔÚ×°Èë½Å±¾Îļþ£º%s"
-#: server/stdinhand.c:1052
+#: server/stdinhand.c:971
#, c-format
msgid "Cannot read command line scriptfile '%s'."
msgstr "ÎÞ·¨¶ÁÈëÃüÁîÐнű¾Îļþ¡°%s¡±¡£"
-#: server/stdinhand.c:1054
+#: server/stdinhand.c:973
#, c-format
msgid "Could not read script file '%s'."
msgstr "ÎÞ·¨¶ÁÈë½Å±¾Îļþ¡°%s¡±¡£"
-#: server/stdinhand.c:1146
+#: server/stdinhand.c:1065
#, c-format
msgid "Could not write script file '%s'."
msgstr "ÎÞ·¨Ð´Èë½Å±¾Îļþ¡°%s¡±¡£"
-#: server/stdinhand.c:1158
+#: server/stdinhand.c:1077
msgid "You cannot use the write command on this server for security reasons."
msgstr "³öÓÚ°²È«µÄÔÒòÄú²»ÄÜÔÚ´Ë·þÎñÆ÷ÉÏʹÓà write ÃüÁî¡£"
-#: server/stdinhand.c:1186
+#: server/stdinhand.c:1105
#, c-format
msgid ""
"Cannot decrease command access level '%s' for connection '%s'; you only have "
"'%s'."
msgstr "ÎÞ·¨ÎªÁ¬½Ó¡°%2$s¡±½µµÍÃüÁî·ÃÎʼ¶±ð¡°%1$s¡±£»ÄúÖ»ÓС°%3$s¡±¡£"
-#: server/stdinhand.c:1241
+#: server/stdinhand.c:1114
+#, c-format
+msgid "Command access level set to '%s' for connection %s."
+msgstr "½«Á¬½Ó %2$s µÄÃüÁî·ÃÎʼ¶±ðÉèÖÃΪ¡°%1$s¡±¡£"
+
+#: server/stdinhand.c:1163
#, c-format
msgid ""
"Anyone can now become game organizer '%s' by issuing the 'first' command."
msgstr "ÏÖÔÚÿ¸öÈ˶¼¿Éͨ¹ý·¢³ö¡°first¡±³ÉΪÓÎÏ·×éÖ¯Õß¡°%s¡±¡£"
-#: server/stdinhand.c:1274
+#: server/stdinhand.c:1187
msgid "Command access levels in effect:"
msgstr "ÓÐЧµÄÃüÁî·ÃÎʼ¶±ð£º"
-#: server/stdinhand.c:1282
+#: server/stdinhand.c:1194
#, c-format
msgid "Command access level for new connections: %s"
msgstr "ÐÂÁ¬½ÓµÄÃüÁî·ÃÎʼ¶±ð£º%s"
-#: server/stdinhand.c:1285
+#: server/stdinhand.c:1197
#, c-format
msgid "Command access level for first player to take it: %s"
msgstr "½«¸³ÓèµÚÒ»¸ö»ñµÃËüµÄÍæ¼ÒµÄÃüÁî·ÃÎʼ¶±ð£º%s"
-#: server/stdinhand.c:1294
+#: server/stdinhand.c:1206
msgid ""
"Error: command access level must be one of 'none', 'info', 'ctrl', or 'hack'."
msgstr ""
"´íÎó£ºÃüÁî·ÃÎʼ¶±ð±ØÐëÊÇ ¡°none¡±¡¢¡°info¡±¡¢¡°ctrl¡± »ò ¡°hack¡± Ö®Ò»¡£"
-#: server/stdinhand.c:1299
+#: server/stdinhand.c:1211
#, c-format
msgid ""
"Cannot increase command access level to '%s'; you only have '%s' yourself."
msgstr "ÎÞ·¨½«ÃüÁî·ÃÎʼ¶±ðÔö¼Óµ½¡°%s¡±£»Äú×Ô¼ºÖ»ÓС°%s¡±¡£"
-#: 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: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:1341 server/stdinhand.c:1351 server/stdinhand.c:1368
+#: server/stdinhand.c:1238 server/stdinhand.c:1252 server/stdinhand.c:1273
#, c-format
msgid "Command access level set to '%s' for new players."
msgstr "½«ÐÂÁ¬ÈëÍæ¼ÒµÄÃüÁî·ÃÎʼ¶±ðÉèÖÃΪ¡°%s¡±¡£"
-#: server/stdinhand.c:1345 server/stdinhand.c:1356 server/stdinhand.c:1363
+#: server/stdinhand.c:1243 server/stdinhand.c:1257 server/stdinhand.c:1267
#, c-format
msgid "Command access level set to '%s' for first player to grab it."
msgstr "½«µÚÒ»¸öÇÀµ½µÄÍæ¼ÒµÄÃüÁî·ÃÎʼ¶±ðÉèÖÃΪ¡°%s¡±¡£"
-#: server/stdinhand.c:1402
+#: server/stdinhand.c:1302
msgid "The 'first' command makes no sense from the server command line."
msgstr "´Ó·þÎñÆ÷ÃüÁîÐз¢³ö¡°first¡±ÃüÁîûÓÐÒâÒå¡£"
-#: server/stdinhand.c:1406
+#: server/stdinhand.c:1306
#, c-format
msgid "You already have command access level '%s' or better."
msgstr "ÄúÒѾӵÓÐÃüÁî·ÃÎʼ¶±ð¡°%s¡±»ò¸ü¸ß¡£"
-#: server/stdinhand.c:1411
+#: server/stdinhand.c:1311
msgid "Someone else already is game organizer."
msgstr "ÒѾÓÐÈËÊÇÓÎÏ·×éÖ¯ÕßÁË¡£"
-#: server/stdinhand.c:1416
+#: server/stdinhand.c:1316
#, c-format
msgid "Connection %s has opted to become the game organizer."
msgstr "Á¬½Ó %s ¾ö¶¨³ÉΪÓÎÏ·×éÖ¯Õß¡£"
-#: server/stdinhand.c:1467
+#: server/stdinhand.c:1367
#, c-format
msgid "Invalid argument %d."
msgstr "·Ç·¨²ÎÊý %d¡£"
-#: server/stdinhand.c:1474
+#: server/stdinhand.c:1374
msgid "Usage: timeoutincrease <turn> <turnadd> <value> <valuemult>."
msgstr "Ó÷¨£ºtimeoutincrease <»ØºÏ> <»ØºÏÔöÁ¿> <Öµ> <valuemult>¡£"
-#: server/stdinhand.c:1482
+#: server/stdinhand.c:1382
#, c-format
msgid "Dynamic timeout set to %d %d %d %d"
msgstr "¶¯Ì¬³¬Ê±ÉèÖÃΪ %d %d %d %d"
-#: server/stdinhand.c:1542 server/stdinhand.c:1545
+#: server/stdinhand.c:1442 server/stdinhand.c:1445
msgid "Option:"
msgstr "Ñ¡Ï"
-#: server/stdinhand.c:1555 server/stdinhand.c:4031
+#: server/stdinhand.c:1455 server/stdinhand.c:4079
msgid "Description:"
msgstr "ÃèÊö£º"
-#: server/stdinhand.c:1560
+#: server/stdinhand.c:1460
#, c-format
msgid "Status: %s"
msgstr "״̬£º%s"
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "changeable"
msgstr "¿É¸Ä±äµÄ"
-#: server/stdinhand.c:1561
+#: server/stdinhand.c:1461
msgid "fixed"
msgstr "¹Ì¶¨µÄ"
-#: server/stdinhand.c:1567
+#: server/stdinhand.c:1467
#, c-format
msgid "Value: %d, Minimum: 0, Default: %d, Maximum: 1"
msgstr "Öµ£º%d£¬×îС£º0£¬Ä¬ÈÏ£º%d£¬×î´ó£º1"
-#: server/stdinhand.c:1572
+#: server/stdinhand.c:1472
#, c-format
msgid "Value: %d, Minimum: %d, Default: %d, Maximum: %d"
msgstr "Öµ£º%d£¬×îС£º%d£¬Ä¬ÈÏ£º%d£¬×î´ó£º%d"
-#: server/stdinhand.c:1578
+#: server/stdinhand.c:1478
#, c-format
msgid "Value: \"%s\", Default: \"%s\""
msgstr "Öµ£º¡°%s¡±£¬Ä¬ÈÏ£º¡°%s¡±"
-#: server/stdinhand.c:1597
+#: server/stdinhand.c:1497
msgid "Explanations are available for the following server options:"
msgstr "¿ÉÒÔ»ñµÃÒÔÏ·þÎñÆ÷Ñ¡ÏîµÄ°ïÖúÐÅÏ¢£º"
-#: server/stdinhand.c:1643
+#: server/stdinhand.c:1537
msgid "No explanation for that yet."
msgstr "ÉÐÎÞ¹ØÓÚËüµÄ½âÊÍ¡£"
-#: server/stdinhand.c:1646 server/stdinhand.c:2480
+#: server/stdinhand.c:1540 server/stdinhand.c:2468
msgid "Ambiguous option name."
msgstr "ÓÐÆçÒåµÄÑ¡ÏîÃû³Æ¡£"
-#: server/stdinhand.c:1666
+#: server/stdinhand.c:1560
#, c-format
msgid "Server Operator: %s"
msgstr "·þÎñÆ÷²Ù×÷Ô±£º%s"
-#: server/stdinhand.c:1790 server/stdinhand.c:1817 server/stdinhand.c:1835
+#: server/stdinhand.c:1686 server/stdinhand.c:1713 server/stdinhand.c:1731
#, c-format
msgid "Player '%s' now has AI skill level '%s'."
msgstr "Íæ¼Ò¡°%s¡±ÏÖÔÚÓµÓÐAI¼¼Äܼ¶±ð¡°%s¡±¡£"
-#: server/stdinhand.c:1822
+#: server/stdinhand.c:1718
#, c-format
msgid "%s is not controlled by the AI."
msgstr "%s ²»ÊÇÓÉ AI ¿ØÖƵġ£"
-#: server/stdinhand.c:1842
+#: server/stdinhand.c:1738
#, c-format
msgid "Default AI skill level set to '%s'."
msgstr "ĬÈÏAI¼¼Äܼ¶±ðÉèÖÃΪ¡°%s¡±¡£"
-#: server/stdinhand.c:1857 server/stdinhand.c:2162
+#: server/stdinhand.c:1753
msgid "This command is client only."
msgstr "¸ÃÃüÁîÖ»ÄÜÔÚ¿Í»§¶ËʹÓá£"
-#: server/stdinhand.c:1860
+#: server/stdinhand.c:1756
msgid "Usage: away"
msgstr "Ó÷¨£º away"
-#: server/stdinhand.c:1865
+#: server/stdinhand.c:1761
msgid "Only players may use the away command."
msgstr "Ö»ÓÐÍæ¼Ò¿ÉÒÔʹÓÃÀ뿪ÃüÁî¡£"
-#: server/stdinhand.c:1869
+#: server/stdinhand.c:1765
#, c-format
msgid "%s set to away mode."
msgstr "%s ÉèÖÃΪÀ뿪ģʽ¡£"
-#: server/stdinhand.c:1877
+#: server/stdinhand.c:1772
#, c-format
msgid "%s returned to game."
msgstr "%s »Øµ½ÁËÓÎÏ·¡£"
-#: server/stdinhand.c:1919
+#: server/stdinhand.c:1817
#, c-format
msgid "Sorry, you do not have access to view option '%s'."
msgstr "±§Ç¸£¬ÄúÎÞȨ²é¿´Ñ¡Ïî¡°%s¡±¡£"
-#: server/stdinhand.c:1925
+#: server/stdinhand.c:1823
#, c-format
msgid "Unknown option '%s'."
msgstr "δ֪µÄÑ¡Ïî¡°%s¡±¡£"
-#: server/stdinhand.c:1950
+#: server/stdinhand.c:1848
msgid "All options with non-default values"
msgstr "ËùÓв»ÎªÈ±Ê¡ÖµµÄÑ¡Ïî¡£"
-#: server/stdinhand.c:1953
+#: server/stdinhand.c:1851
msgid "All options"
msgstr "ËùÓÐÑ¡Ïî"
-#: server/stdinhand.c:1956
+#: server/stdinhand.c:1854
msgid "Vital options"
msgstr "±ØÐèÑ¡Ïî"
-#: server/stdinhand.c:1959
+#: server/stdinhand.c:1857
msgid "Situational options"
msgstr "Çé¾°Ïà¹ØµÄÑ¡Ïî"
-#: server/stdinhand.c:1962
+#: server/stdinhand.c:1860
msgid "Rarely used options"
msgstr "ºÜÉÙʹÓõÄÑ¡Ïî"
-#: server/stdinhand.c:1965
+#: server/stdinhand.c:1863
msgid "+ means you may change the option"
msgstr "+ ±íʾÄú¿ÉÒԸıäÑ¡Ïî"
-#: server/stdinhand.c:1966
+#: server/stdinhand.c:1864
msgid "= means the option is on its default value"
msgstr "= ±íʾѡÏîµÄÖµÊÇËüµÄĬÈÏÖµ"
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
#, c-format
msgid "%-*s value (min,max) "
msgstr "%-*s Öµ £¨×îСֵ£¬×î´óÖµ£© "
-#: server/stdinhand.c:1969
+#: server/stdinhand.c:1867
msgid "Option"
msgstr "Ñ¡Ïî"
-#: server/stdinhand.c:1973
+#: server/stdinhand.c:1871
msgid "description"
msgstr "ÃèÊö"
-#: server/stdinhand.c:2042
+#: server/stdinhand.c:1940
msgid ""
"Try 'show situational' or 'show rare' to show more options.\n"
"Try 'show changed' to show settings with non-default values."
@@ -5693,77 +5707,148 @@ msgstr ""
"ÇëʹÓá°show situational¡±»ò¡°show rare¡±ÒÔÏÔʾ¸ü¶àÑ¡Ïî¡£\n"
"ÇëʹÓá°show changed¡±ÒÔÏÔʾ¾ßÓзÇȱʡֵµÄÉèÖá£"
-#: server/stdinhand.c:2092
+#: server/stdinhand.c:1966
msgid "Cannot change teams once game has begun."
msgstr "²»ÄÜÔÚÓÎÏ·¿ªÊ¼ºóÐÞ¸ÄÍŶӡ£"
-#: server/stdinhand.c:2102
+#: server/stdinhand.c:1976
msgid "Undefined argument. Usage: team <player> <team>."
msgstr "䶨ÒåµÄ²ÎÊý¡£Ó÷¨£ºteam <Íæ¼Ò> <ÍŶÓ> ¡£"
-#: server/stdinhand.c:2122
+#: server/stdinhand.c:1996
#, c-format
msgid "No such team %s. Please give a valid team name or number."
msgstr "ÍÅ¶Ó %s ²»´æÔÚ¡£Çë¸ø³öÓÐЧµÄÍŶÓÃû×Ö»ò±àºÅ¡£"
-#: server/stdinhand.c:2129
+#: server/stdinhand.c:2003
msgid "Cannot team a barbarian."
msgstr "²»ÄܺÍÒ°ÈË×é³ÉÍŶӡ£"
-#: server/stdinhand.c:2135
+#: server/stdinhand.c:2009
#, c-format
msgid "Player %s set to team %s."
msgstr "%s ¼ÓÈëÍÅ¶Ó %s¡£"
-#: server/stdinhand.c:2157
-msgid "Undefined arguments. Usage: vote yes|no [vote number]."
-msgstr "䶨ÒåµÄ²ÎÊý¡£Ó÷¨£ºvote yes|no [vote number] ¡£"
+#: server/stdinhand.c:2035 server/voting.c:512
+#, fuzzy
+msgid "Teamvote"
+msgstr "ÍŶÓ"
-#: server/stdinhand.c:2165
-msgid "Observers cannot vote."
-msgstr "ÅÔ¹ÛÕß²»ÄÜͶƱ¡£"
+#: server/stdinhand.c:2035 server/voting.c:516
+msgid "Vote"
+msgstr ""
-#: server/stdinhand.c:2168
+#: server/stdinhand.c:2037
+#, c-format
msgid ""
-"You can only vote in a running game. Use 'first' to become the game "
-"organizer if there currently is none."
+"%s %d \"%s\" (needs %0.0f%%%s): %d for, %d against, and %d abstained out of %"
+"d players."
msgstr ""
-"ÄúÖ»ÄÜÔÚÔËÐÐÖеÄÓÎÏ·ÖÐͶƱ¡£Èç¹ûµ±Ç°Ã»ÓÐÓÎÏ·×éÖ¯ÕßÇëʹÓá°first¡±ÃüÁî³ÉΪÓÎÏ·"
-"×éÖ¯Õß¡£"
-#: server/stdinhand.c:2181
-#, c-format
-msgid "Vote %d \"%s\": %d for, %d against"
-msgstr "ͶƱ %d ¡°%s¡±£º %d Ö§³Ö£¬ %d ·´¶Ô"
+#: server/stdinhand.c:2041
+msgid " no dissent"
+msgstr ""
-#: server/stdinhand.c:2188
+#: server/stdinhand.c:2049
msgid "There are no votes going on."
msgstr "µ±Ç°Ã»ÓоÙÐÐͶƱ¡£"
-#: server/stdinhand.c:2208
-msgid "No legal last vote."
+#: server/stdinhand.c:2077
+#, fuzzy
+msgid "Invalid arguments. Usage: vote yes|no|abstain [vote number]."
+msgstr "䶨ÒåµÄ²ÎÊý¡£Ó÷¨£ºvote yes|no [vote number] ¡£"
+
+#: server/stdinhand.c:2095 server/stdinhand.c:2213 server/stdinhand.c:3714
+msgid "You are not allowed to use this command."
+msgstr "²»ÔÊÐíÄúʹÓøÃÃüÁî¡£"
+
+#: server/stdinhand.c:2104
+#, fuzzy, c-format
+msgid "The argument \"%s\" is ambigious."
+msgstr "°ïÖú²ÎÊý¡°%s¡±ÓÐÆçÒå¡£"
+
+#: server/stdinhand.c:2119
+#, fuzzy
+msgid "There are no votes running."
+msgstr "µ±Ç°Ã»ÓоÙÐÐͶƱ¡£"
+
+#: server/stdinhand.c:2121
+#, fuzzy, c-format
+msgid "No legal last vote (%d %s)."
msgstr "ûÓкϷ¨µÄÉÏ´ÎͶƱ¡£"
-#: server/stdinhand.c:2213
-msgid "Value must be integer."
+#: server/stdinhand.c:2122
+msgid "other vote running"
+msgid_plural "other votes running"
+msgstr[0] ""
+
+#: server/stdinhand.c:2129 server/stdinhand.c:2491 server/stdinhand.c:2532
+msgid "Value must be an integer."
msgstr "Öµ±ØÐëÊÇÒ»¸öÕûÊý¡£"
-#: server/stdinhand.c:2224
+#: server/stdinhand.c:2135 server/stdinhand.c:2221
#, c-format
msgid "No such vote (%d)."
msgstr "ûÓÐÕâÑùµÄͶƱ£¨%d£©¡£"
-#: server/stdinhand.c:2228
+#: server/stdinhand.c:2141
+#, fuzzy
+msgid "You are not allowed to vote on that."
+msgstr "²»ÔÊÐíÄúÉèÖôËÑ¡Ïî¡£"
+
+#: server/stdinhand.c:2146
#, c-format
msgid "You voted for \"%s\""
msgstr "ÄúͶƱ֧³Ö¡°%s¡±"
-#: server/stdinhand.c:2232
+#: server/stdinhand.c:2150
#, c-format
msgid "You voted against \"%s\""
msgstr "ÄúͶƱ·´¶Ô¡°%s¡±"
-#: server/stdinhand.c:2259
+#: server/stdinhand.c:2155
+#, c-format
+msgid "You abstained from voting on \"%s\""
+msgstr ""
+
+#: server/stdinhand.c:2190
+msgid "Missing argument <vote number> or the string \"all\"."
+msgstr ""
+
+#: server/stdinhand.c:2197
+#, fuzzy
+msgid "You don't have any vote going on."
+msgstr "ÄúÔÚÕâÀïûÓй¤ÈË¡£"
+
+#: server/stdinhand.c:2204
+#, fuzzy
+msgid "There isn't any vote going on."
+msgstr "µ±Ç°Ã»ÓоÙÐÐͶƱ¡£"
+
+#: server/stdinhand.c:2209
+msgid "Server: All votes have been removed."
+msgstr ""
+
+#: server/stdinhand.c:2226
+#, fuzzy, c-format
+msgid "You are not allowed to cancel this vote (%d)."
+msgstr "²»ÔÊÐíÄúÉèÖôËÑ¡Ïî¡£"
+
+#: server/stdinhand.c:2232
+msgid "Usage: /cancelvote [<vote number>|all]"
+msgstr ""
+
+#: server/stdinhand.c:2241
+#, c-format
+msgid "Server: %s cancelled the vote \"%s\" (number %d)."
+msgstr ""
+
+#: server/stdinhand.c:2247
+#, c-format
+msgid "Server: The vote \"%s\" (number %d) has been cancelled."
+msgstr ""
+
+#: server/stdinhand.c:2265
msgid ""
"Undefined arguments. Usage: debug <diplomacy <player> | city <x> <y> | units "
"<x> <y> | unit <id> | tech <player> | timing | info>."
@@ -5771,130 +5856,126 @@ msgstr ""
"䶨ÒåµÄ²ÎÊý¡£Ó÷¨£ºdebug <diplomacy <Íæ¼Ò> | city <x> <y> | units <x> <y> | "
"unit <id> | tech <palyer> | timing | info> ¡£"
-#: server/stdinhand.c:2265
+#: server/stdinhand.c:2271
msgid "Can only use this command once game has begun."
msgstr "Ö»ÄÜÔÚÓÎÏ·¿ªÊ¼ºóʹÓôËÃüÁî¡£"
-#: server/stdinhand.c:2294
+#: server/stdinhand.c:2300
#, c-format
msgid "%s diplomacy no longer debugged"
msgstr "²»ÔÙµ÷ÊÔ %s Íâ½»"
-#: server/stdinhand.c:2298
+#: server/stdinhand.c:2304
#, c-format
msgid "%s diplomacy debugged"
msgstr "µ÷ÊÔ %s Íâ½»"
-#: server/stdinhand.c:2317
+#: server/stdinhand.c:2323
#, c-format
msgid "%s tech no longer debugged"
msgstr "²»ÔÙµ÷ÊÔ %s ¿Æ¼¼"
-#: server/stdinhand.c:2321
+#: server/stdinhand.c:2327
#, c-format
msgid "%s tech debugged"
msgstr "µ÷ÊÔ %s ¿Æ¼¼"
-#: server/stdinhand.c:2352 server/stdinhand.c:2382
+#: server/stdinhand.c:2358 server/stdinhand.c:2388
msgid "Value 2 & 3 must be integer."
msgstr "µÚ¶þºÍµÚÈý¸öÖµ±ØÐëÊÇÕûÊý¡£"
-#: server/stdinhand.c:2356 server/stdinhand.c:2386
+#: server/stdinhand.c:2362 server/stdinhand.c:2392
msgid "Bad map coordinates."
msgstr "´íÎóµÄµØͼ×ø±ê¡£"
-#: server/stdinhand.c:2361
+#: server/stdinhand.c:2367
msgid "No city at this coordinate."
msgstr "´Ë×ø±êûÓгÇÊС£"
-#: server/stdinhand.c:2366
+#: server/stdinhand.c:2372
#, c-format
msgid "%s no longer debugged"
msgstr "²»ÔÙµ÷ÊÔ %s"
-#: server/stdinhand.c:2392 server/stdinhand.c:2422
+#: server/stdinhand.c:2398 server/stdinhand.c:2428
#, fuzzy, c-format
msgid "%s %s no longer debugged."
msgstr "²»ÔÙµ÷ÊÔ %s µÄ %s ¡£"
-#: server/stdinhand.c:2397 server/stdinhand.c:2427
+#: server/stdinhand.c:2403 server/stdinhand.c:2433
#, fuzzy, c-format
msgid "%s %s debugged."
msgstr "µ÷ÊÔ %s µÄ %s ¡£"
-#: server/stdinhand.c:2413
+#: server/stdinhand.c:2419
msgid "Value 2 must be integer."
msgstr "µÚ¶þ¸öÖµ±ØÐëÊÇÕûÊý¡£"
-#: server/stdinhand.c:2417
+#: server/stdinhand.c:2423
#, c-format
msgid "Unit %d does not exist."
msgstr "²¿¶Ó %d ²»´æÔÚ¡£"
-#: server/stdinhand.c:2475
+#: server/stdinhand.c:2464
msgid "Undefined argument. Usage: set <option> <value>."
msgstr "䶨ÒåµÄ²ÎÊý¡£Ó÷¨£ºset <Ñ¡Ïî> <Öµ>¡£"
-#: server/stdinhand.c:2485
+#: server/stdinhand.c:2473
msgid "You are not allowed to set this option."
msgstr "²»ÔÊÐíÄúÉèÖôËÑ¡Ïî¡£"
-#: server/stdinhand.c:2490 server/stdinhand.c:3463
+#: server/stdinhand.c:2478 server/stdinhand.c:3501
msgid "This setting can't be modified after the game has started."
msgstr "ÔÚÓÎÏ·¿ªÊ¼Ö®ºó²»ÄÜÐ޸ĸÃÉèÖá£"
-#: server/stdinhand.c:2502 server/stdinhand.c:2543
-msgid "Value must be an integer."
-msgstr "Öµ±ØÐëÊÇÒ»¸öÕûÊý¡£"
-
-#: server/stdinhand.c:2512
+#: server/stdinhand.c:2501
#, c-format
msgid "The parameter %s should only contain digits 0-1."
msgstr ""
-#: server/stdinhand.c:2519
+#: server/stdinhand.c:2508
msgid "Value out of range (minimum: 0, maximum: 1)."
msgstr "Öµ³¬³ö·¶Î§ (×îС£º0£¬×î´ó£º1)¡£"
-#: server/stdinhand.c:2534 server/stdinhand.c:2576
+#: server/stdinhand.c:2523 server/stdinhand.c:2565
#, c-format
msgid "Option: %s has been set to %d."
msgstr "Ñ¡Ï%s Òѱ»ÉèÖÃΪ %d¡£"
-#: server/stdinhand.c:2554
+#: server/stdinhand.c:2543
#, c-format
msgid "The parameter %s should only contain +- and 0-9."
msgstr ""
-#: server/stdinhand.c:2561
+#: server/stdinhand.c:2550
#, c-format
msgid "Value out of range (minimum: %d, maximum: %d)."
msgstr "Öµ³¬³öÔ¤¶¨·¶Î§ (×îС£º%d£¬×î´ó£º%d)¡£"
-#: server/stdinhand.c:2586
+#: server/stdinhand.c:2575
msgid "String value too long. Usage: set <option> <value>."
msgstr "¹ý³¤µÄ×Ö·û´®Öµ¡£Ó÷¨£ºset <Ñ¡Ïî> <Öµ>¡£"
-#: server/stdinhand.c:2600
+#: server/stdinhand.c:2589
#, c-format
msgid "Option: %s has been set to \"%s\"."
msgstr "Ñ¡Ï%s Òѱ»ÉèÖÃΪ¡°%s¡±¡£"
-#: server/stdinhand.c:2658
+#: server/stdinhand.c:2652
msgid "Sorry, one can't observe globally in this game."
msgstr "±§Ç¸£¬±¾ÓÎÏ·Öв»ÄÜÅÔ¹ÛÈ«¾Ö¡£"
-#: server/stdinhand.c:2661
+#: server/stdinhand.c:2655
msgid "Sorry, you can't take a global observer. Observe it instead."
msgstr "±§Ç¸£¬Äú²»ÄÜÌæ´úÈ«¾ÖÅÔ¹ÛÕß¡£ÇëÅÔ¹ÛËû¡£"
-#: server/stdinhand.c:2671
+#: server/stdinhand.c:2665
#, fuzzy
msgid "You cannot take a new player at this time."
msgstr "±§Ç¸£¬±¾ÓÎÏ·Öв»ÄܽÓÌæÕæÈËÍæ¼Ò¡£"
#. TRANS: Do not translate "maxplayers".
-#: server/stdinhand.c:2679
+#: server/stdinhand.c:2673
#, c-format
msgid ""
"You cannot take a new player because the maximum of %d player has already "
@@ -5904,73 +5985,73 @@ msgid_plural ""
"been reached (maxplayers setting)."
msgstr[0] ""
-#: server/stdinhand.c:2691
+#: server/stdinhand.c:2685
msgid "You cannot take a new player because there are no free player slots."
msgstr ""
-#: server/stdinhand.c:2702
+#: server/stdinhand.c:2696
msgid "Sorry, one can't observe barbarians in this game."
msgstr "±§Ç¸£¬±¾ÓÎÏ·Öв»ÄÜÅÔ¹ÛÒ°ÈË¡£"
-#: server/stdinhand.c:2705
+#: server/stdinhand.c:2699
msgid "Sorry, one can't take barbarians in this game."
msgstr "±§Ç¸£¬±¾ÓÎÏ·Öв»ÄܽÓÌæÒ°ÈË¡£"
-#: server/stdinhand.c:2713
+#: server/stdinhand.c:2707
msgid "Sorry, one can't observe dead players in this game."
msgstr "±§Ç¸£¬±¾ÓÎÏ·Öв»ÄÜÅÔ¹ÛÒÑËÀÈ¥µÄÍæ¼Ò¡£"
-#: server/stdinhand.c:2716
+#: server/stdinhand.c:2710
msgid "Sorry, one can't take dead players in this game."
msgstr "±§Ç¸£¬±¾ÓÎÏ·Öв»ÄܽÓÌæÒÑËÀÈ¥µÄÍæ¼Ò¡£"
-#: server/stdinhand.c:2724
+#: server/stdinhand.c:2718
msgid "Sorry, one can't observe AI players in this game."
msgstr "±§Ç¸£¬±¾ÓÎÏ·Öв»ÄÜÅÔ¹Û AI Íæ¼Ò¡£"
-#: server/stdinhand.c:2727
+#: server/stdinhand.c:2721
msgid "Sorry, one can't take AI players in this game."
msgstr "±§Ç¸£¬±¾ÓÎÏ·Öв»ÄܽÓÌæ AI Íæ¼Ò¡£"
-#: server/stdinhand.c:2736
+#: server/stdinhand.c:2730
msgid "Sorry, one can't observe human players in this game."
msgstr "±§Ç¸£¬±¾ÓÎÏ·Öв»ÄÜÅÔ¹ÛÕæÈËÍæ¼Ò¡£"
-#: server/stdinhand.c:2739
+#: server/stdinhand.c:2733
msgid "Sorry, one can't take human players in this game."
msgstr "±§Ç¸£¬±¾ÓÎÏ·Öв»ÄܽÓÌæÕæÈËÍæ¼Ò¡£"
-#: server/stdinhand.c:2749
+#: server/stdinhand.c:2743
msgid "Sorry, one can't observe in this game."
msgstr "±§Ç¸£¬±¾ÓÎÏ·Öв»ÄÜÅÔ¹Û¡£"
-#: server/stdinhand.c:2754
+#: server/stdinhand.c:2748
msgid "Sorry, one can't take players in this game."
msgstr "±§Ç¸£¬±¾ÓÎÏ·Öв»ÄܽÓÌæÍæ¼Ò¡£"
-#: server/stdinhand.c:2760
+#: server/stdinhand.c:2754
msgid "Sorry, one can't take players already connected in this game."
msgstr "±§Ç¸£¬±¾ÓÎÏ·Öв»ÄܽÓÌæÒѾÁ¬ÈëµÄÍæ¼Ò¡£"
-#: server/stdinhand.c:2791
+#: server/stdinhand.c:2785
msgid "Usage: observe [connection-name [player-name]]"
msgstr "Ó÷¨£º observe [Á¬½ÓÃû³Æ [Íæ¼ÒÃû³Æ]]"
-#: server/stdinhand.c:2797
+#: server/stdinhand.c:2791
msgid "Usage: observe [player-name]"
msgstr "Ó÷¨£º observer [Íæ¼ÒÃû³Æ]"
-#: server/stdinhand.c:2847
+#: server/stdinhand.c:2841
#, c-format
msgid "%s already controls %s. Using 'observe' would remove %s"
msgstr "%s ÒѾ¿ØÖÆ %s ÁË¡£Ê¹Óá°observe¡±½«É¾³ý %s"
-#: server/stdinhand.c:2858
+#: server/stdinhand.c:2852
#, c-format
msgid "%s is already observing %s."
msgstr "%s ÒѾÅÔ¹Û %s ÁË¡£"
-#: server/stdinhand.c:2863
+#: server/stdinhand.c:2857
#, c-format
msgid "%s is already observing."
msgstr "%s ÒѾÔÚÅÔ¹ÛÁË¡£"
@@ -5985,233 +6066,238 @@ msgstr "%s
msgid "%s now observes"
msgstr "%s ÏÖÔÚÅÔ¹Û"
-#: server/stdinhand.c:2969
+#: server/stdinhand.c:2971
msgid "Usage: take <connection-name> <player-name>"
msgstr "Ó÷¨£º taken <Á¬½ÓÃû³Æ> <Íæ¼ÒÃû³Æ>"
-#: server/stdinhand.c:2974
+#: server/stdinhand.c:2976
msgid "Usage: take <player-name>"
msgstr "Ó÷¨£º take <Íæ¼ÒÃû³Æ>"
-#: server/stdinhand.c:2980
+#: server/stdinhand.c:2982
msgid "Usage: take [connection-name] <player-name>"
msgstr "Ó÷¨£º take [Á¬½ÓÃû³Æ] <Íæ¼ÒÃû³Æ>"
-#: server/stdinhand.c:3010
+#: server/stdinhand.c:3012
#, fuzzy, c-format
msgid "%s already controls %s."
msgstr "%s ÒѾ¿ØÖÆ %s ÁË"
-#: server/stdinhand.c:3024
+#: server/stdinhand.c:3026
#, fuzzy, c-format
msgid "There is no free player slot for %s."
msgstr "ûÓÐÃûΪ %s µÄÍæ¼Ò»òÁ¬½Ó¡£"
-#: server/stdinhand.c:3059
+#: server/stdinhand.c:3061
#, c-format
msgid "being detached from %s."
msgstr "´Ó %s ÍÑÀë ¡£"
-#: server/stdinhand.c:3135
+#: server/stdinhand.c:3146
#, fuzzy, c-format
msgid "%s now controls %s (%s, %s)."
msgstr "%s ÏÖÔÚ¿ØÖÆ %s £¨%s£¬%s£©"
-#: server/stdinhand.c:3139 server/stdinhand.c:4260
+#: server/stdinhand.c:3150 server/stdinhand.c:4308
#: data/nation/barbarian.ruleset:3
msgid "Barbarian"
msgstr "Ò°ÈË"
-#: server/stdinhand.c:3141 server/stdinhand.c:4262 client/plrdlg_common.c:256
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-sdl/plrdlg.c:645
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/plrdlg.c:335
+#: server/stdinhand.c:3152 server/stdinhand.c:4310 client/plrdlg_common.c:256
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-sdl/plrdlg.c:645
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/plrdlg.c:335
msgid "AI"
msgstr "AI"
-#: server/stdinhand.c:3142 server/stdinhand.c:4264
-#: client/gui-gtk-2.0/pages.c:2102 client/gui-gtk-2.0/pages.c:2125
-#: client/gui-win32/connectdlg.c:201 client/gui-win32/connectdlg.c:213
+#: server/stdinhand.c:3153 server/stdinhand.c:4312
+#: client/gui-gtk-2.0/pages.c:2104 client/gui-gtk-2.0/pages.c:2127
+#: client/gui-win32/connectdlg.c:203 client/gui-win32/connectdlg.c:215
msgid "Human"
msgstr "ÕæÈË"
-#: server/stdinhand.c:3144 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-gtk-2.0/pages.c:2124 client/gui-win32/connectdlg.c:200
-#: client/gui-win32/connectdlg.c:212
+#: server/stdinhand.c:3155 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-gtk-2.0/pages.c:2126 client/gui-win32/connectdlg.c:202
+#: client/gui-win32/connectdlg.c:214
msgid "Alive"
msgstr "»îµÄ"
-#: server/stdinhand.c:3145 client/gui-gtk-2.0/pages.c:2101
-#: client/gui-win32/connectdlg.c:200
+#: server/stdinhand.c:3156 client/gui-gtk-2.0/pages.c:2103
+#: client/gui-win32/connectdlg.c:202
msgid "Dead"
msgstr "ËÀµÄ"
-#: server/stdinhand.c:3147
+#: server/stdinhand.c:3159
#, fuzzy, c-format
msgid "%s failed to attach to any player."
msgstr "%s ûÓи½½Óµ½ÈκÎÍæ¼Ò¡£"
-#: server/stdinhand.c:3182
+#: server/stdinhand.c:3194
msgid "Usage: detach <connection-name>"
msgstr "Ó÷¨£º detach <Á¬½ÓÃû>"
-#: server/stdinhand.c:3202
+#: server/stdinhand.c:3214
msgid "You can not detach other users."
msgstr "Äã²»ÄÜʹ±ðµÄÓû§ÍÑÀë¡£"
-#: server/stdinhand.c:3211
+#: server/stdinhand.c:3223
#, c-format
msgid "%s is not attached to any player."
msgstr "%s ûÓи½½Óµ½ÈκÎÍæ¼Ò¡£"
-#: server/stdinhand.c:3234
+#: server/stdinhand.c:3246
#, c-format
msgid "%s detaching from %s"
msgstr "%s Õý´Ó %s ÍÑÀë"
-#: server/stdinhand.c:3240
+#: server/stdinhand.c:3252
#, c-format
msgid "%s no longer observing."
msgstr "%s ²»ÔÙÅÔ¹Û¡£"
-#: server/stdinhand.c:3259
+#: server/stdinhand.c:3271
#, c-format
msgid "detaching from %s."
msgstr "Õý´Ó %s ÍÑÀë¡£"
-#: server/stdinhand.c:3345
+#: server/stdinhand.c:3361
msgid "Usage: load <game name>"
msgstr "Ó÷¨£º load <ÓÎÏ·Ãû>"
-#: server/stdinhand.c:3350
+#: server/stdinhand.c:3366
msgid "Cannot load a game while another is running."
msgstr "²»ÄÜÔÚÓÎÏ·ÔËÐÐʱÔØÈëÁíÒ»¸öÓÎÏ·¡£"
-#: server/stdinhand.c:3372
+#: server/stdinhand.c:3388
#, c-format
msgid "Cannot find savegame or scenario with the name \"%s\"."
msgstr "ÎÞ·¨ÕÒµ½ÃûΪ¡°%s¡±µÄ´æÅÌÎļþ»òÇé¾°¡£"
-#: server/stdinhand.c:3389
+#: server/stdinhand.c:3405
#, c-format
msgid "Could not load savefile: %s"
msgstr "ÎÞ·¨ÔØÈë´æÅÌÎļþ£º%s"
-#: server/stdinhand.c:3458
+#: server/stdinhand.c:3496
#, c-format
msgid "Current ruleset directory is \"%s\""
msgstr "µ±Ç°¹æÔò¼¯ºÏĿ¼Ϊ¡°%s¡±"
-#: server/stdinhand.c:3478
+#: server/stdinhand.c:3516
#, c-format
msgid "Ruleset directory \"%s\" not found"
msgstr "ÕÒ²»µ½¹æÔò¼¯Ä¿Â¼¡°%s¡±"
-#: server/stdinhand.c:3484
+#: server/stdinhand.c:3522
#, c-format
msgid "Ruleset directory is already \"%s\""
msgstr "¹æÔò¼¯Ä¿Â¼ÒѾÊÇ¡°%s¡±ÁË"
-#: server/stdinhand.c:3488
+#: server/stdinhand.c:3526
#, c-format
msgid "Ruleset directory set to \"%s\""
msgstr "¹æÔò¼¯ºÏĿ¼±»ÉèÖÃΪ¡°%s¡±"
-#: server/stdinhand.c:3536
+#: server/stdinhand.c:3574
msgid "Goodbye."
msgstr "ÔÙ¼û¡£"
-#: server/stdinhand.c:3567
+#: server/stdinhand.c:3606
msgid "Sorry, you are not allowed to use server commands."
msgstr "±§Ç¸£¬²»ÔÊÐíÄúʹÓ÷þÎñÆ÷ÃüÁî¡£"
-#: server/stdinhand.c:3603
+#: server/stdinhand.c:3656
#, c-format
msgid "Warning: '%s' interpreted as '%s', but it is ambiguous. Try '%shelp'."
msgstr "¾¯¸æ£º¡°%s¡±±»½âÊÍΪ¡°%s¡±£¬µ«ÓÐÆçÒå¡£ÊÔÓá°%shelp¡±¡£"
-#: server/stdinhand.c:3608
+#: server/stdinhand.c:3661
#, c-format
msgid "Unknown command. Try '%shelp'."
msgstr "δ֪µÄÃüÁî¡£ÊÔÓá°%shelp¡±¡£"
-#: server/stdinhand.c:3625
-msgid "Your new vote canceled your previous vote."
+#: server/stdinhand.c:3675
+#, fuzzy
+msgid "Your new vote cancelled your previous vote."
msgstr "ÄúµÄÐÂͶƱȡÏûÁËÄúÒÔÇ°µÄͶƱ¡£"
-#: server/stdinhand.c:3633
-#, c-format
-msgid "New vote (number %d) by %s: %s."
+#: server/stdinhand.c:3688
+msgid "New teamvote"
+msgstr ""
+
+#: server/stdinhand.c:3691
+msgid "New vote"
+msgstr ""
+
+#: server/stdinhand.c:3695
+#, fuzzy, c-format
+msgid "%s (number %d) by %s: %s"
msgstr "ÐÂͶƱ£¨±àºÅ %d£©£¬ÓÉ %s£º%s ·¢Æð¡£"
-#: server/stdinhand.c:3645
+#: server/stdinhand.c:3704
#, c-format
msgid "Your new vote (\"%s\") was not legal or was not recognized."
msgstr ""
-#: server/stdinhand.c:3655
-msgid "You are not allowed to use this command."
-msgstr "²»ÔÊÐíÄúʹÓøÃÃüÁî¡£"
-
-#: server/stdinhand.c:3680
+#: server/stdinhand.c:3726
msgid "(server prompt)"
msgstr "£¨·þÎñÆ÷Ìáʾ£©"
-#: server/stdinhand.c:3787
+#: server/stdinhand.c:3835
msgid "Game ended in a draw."
msgstr "ÓÎÏ·½áÊøδ·Öʤ¸º"
-#: server/stdinhand.c:3791
+#: server/stdinhand.c:3839
msgid ""
"Ending the game. The server will restart once all clients have disconnected."
msgstr "½áÊøÓÎÏ·¡£·þÎñÆ÷½«ÔÚËùÓпͻ§¶Ë¶Ï¿ªÁ¬½ÓºóÁ¢¿ÌÖØÆô¶¯¡£"
-#: server/stdinhand.c:3796
+#: server/stdinhand.c:3844
msgid "Cannot end the game: no game running."
msgstr "ÎÞ·¨½áÊøÓÎÏ·£ºÓÎÏ·ÉÐδÔËÐС£"
-#: server/stdinhand.c:3812
+#: server/stdinhand.c:3860
#, c-format
msgid "%s has conceded the game and can no longer win."
msgstr "%s ÒѾÈÏÊ䣬²»¿ÉÄÜÓ®µÃÓÎÏ·ÁË¡£"
-#: server/stdinhand.c:3817
+#: server/stdinhand.c:3865
msgid "You cannot surrender now."
msgstr "ÄúÏÖÔÚ²»ÄÜͶ½µ¡£"
-#: server/stdinhand.c:3883
+#: server/stdinhand.c:3931
#, fuzzy
msgid "Not enough human players, game will not start."
msgstr "Íæ¼ÒÈËÊý²»×㣬²»ÄÜ¿ªÊ¼ÓÎÏ·¡£"
-#: server/stdinhand.c:3888
+#: server/stdinhand.c:3936
#, fuzzy
msgid "No players, game will not start."
msgstr "Íæ¼ÒÈËÊý²»×㣬²»ÄÜ¿ªÊ¼ÓÎÏ·¡£"
-#: server/stdinhand.c:3892
+#: server/stdinhand.c:3940
#, fuzzy
msgid "Not enough nations for all players, game will not start."
msgstr "Íæ¼ÒÈËÊý²»×㣬²»ÄÜ¿ªÊ¼ÓÎÏ·¡£"
-#: server/stdinhand.c:3901
+#: server/stdinhand.c:3949
msgid "All players are ready; starting game."
msgstr "ËùÓÐÍæ¼Ò¾ÍÐ÷£»Æô¶¯ÓÎÏ·¡£"
-#: server/stdinhand.c:3915
+#: server/stdinhand.c:3963
msgid ""
"Cannot start the game: the game is waiting for all clients to disconnect."
msgstr "ÎÞ·¨¿ªÊ¼ÓÎÏ·£ºÓÎÏ·ÕýÔڵȴýËùÓеĿͻ§¶Ë¶Ï¿ªÁ¬½Ó¡£"
-#: server/stdinhand.c:3922
+#: server/stdinhand.c:3970
msgid "Cannot start the game: it is already running."
msgstr "ÎÞ·¨¿ªÊ¼ÓÎÏ·£ºËüÒѾÔÚÔËÐÐÁË¡£"
-#: server/stdinhand.c:3953
+#: server/stdinhand.c:4001
#, c-format
msgid "Cutting connection %s."
msgstr "ÇжÏÁ¬½Ó %s¡£"
-#: server/stdinhand.c:3972
+#: server/stdinhand.c:4020
msgid ""
"Welcome - this is the introductory help text for the Freeciv server.\n"
"\n"
@@ -6249,121 +6335,121 @@ msgstr ""
" save - ±£´æµ±Ç°ÓÎÏ·\n"
" quit - Í˳ö"
-#: server/stdinhand.c:4007 server/stdinhand.c:4010
+#: server/stdinhand.c:4055 server/stdinhand.c:4058
msgid "Command:"
msgstr "ÃüÁ"
-#: server/stdinhand.c:4014
+#: server/stdinhand.c:4062
msgid "Synopsis: "
msgstr "ÌáÒª£º "
-#: server/stdinhand.c:4023
+#: server/stdinhand.c:4071
#, c-format
msgid "Level: %s"
msgstr "¼¶±ð£º %s"
-#: server/stdinhand.c:4048
+#: server/stdinhand.c:4096
msgid "The following server commands are available:"
msgstr "¿ÉÒÔʹÓÃÏÂÁзþÎñÆ÷ÃüÁ"
-#: server/stdinhand.c:4123
+#: server/stdinhand.c:4171
#, c-format
msgid "Help argument '%s' is ambiguous."
msgstr "°ïÖú²ÎÊý¡°%s¡±ÓÐÆçÒå¡£"
-#: server/stdinhand.c:4128
+#: server/stdinhand.c:4176
#, c-format
msgid "No match for help argument '%s'."
msgstr "ûÓÐÆ¥ÅäµÄ°ïÖú²ÎÊý¡°%s¡±¡£"
-#: server/stdinhand.c:4194
+#: server/stdinhand.c:4242
#, c-format
msgid "Bad list argument: '%s'. Try '%shelp list'."
msgstr "´íÎóµÄÁбí²ÎÊý£º¡°%s¡±¡£ÊÔÓá°%shelp list¡±¡£"
-#: server/stdinhand.c:4234
+#: server/stdinhand.c:4282
msgid "List of players:"
msgstr "Íæ¼ÒÁÐ±í£º"
-#: server/stdinhand.c:4239
+#: server/stdinhand.c:4287
msgid "<no players>"
msgstr "<ÎÞÍæ¼Ò>"
-#: server/stdinhand.c:4256
+#: server/stdinhand.c:4304
#, c-format
msgid "user %s, "
msgstr "Óû§ %s£¬"
-#: server/stdinhand.c:4267
+#: server/stdinhand.c:4315
msgid ", Dead"
msgstr "£¬ËÀÍö"
-#: server/stdinhand.c:4270
+#: server/stdinhand.c:4318
#, c-format
msgid ", difficulty level %s"
msgstr "£¬ÄѶȼ¶±ð %s"
#. TRANS: continue list, in case comma is not the separator of choice.
-#: server/stdinhand.c:4275 server/stdinhand.c:4279 client/helpdata.c:257
-#: client/helpdata.c:752 client/text.c:241 client/text.c:1224
-#: client/text.c:1262
+#: server/stdinhand.c:4323 server/stdinhand.c:4327 client/helpdata.c:257
+#: client/helpdata.c:752 client/text.c:241 client/text.c:1229
+#: client/text.c:1267
#, c-format
msgid "?clistmore:, %s"
msgstr " %s"
-#: server/stdinhand.c:4283
+#: server/stdinhand.c:4331
msgid ", ready"
msgstr "£¬¾ÍÐ÷"
-#: server/stdinhand.c:4285
+#: server/stdinhand.c:4333
msgid ", not ready"
msgstr "δ¾ÍÐ÷"
-#: server/stdinhand.c:4293
+#: server/stdinhand.c:4341
#, c-format
msgid " %d connection:"
msgid_plural " %d connections:"
msgstr[0] " %d ¸öÁ¬½Ó£º"
-#: server/stdinhand.c:4299
+#: server/stdinhand.c:4347
#, c-format
msgid " %s from %s (command access level %s), bufsize=%dkb"
msgstr " %s À´×Ô %s £¨ÃüÁî·ÃÎʼ¶±ð %s £©£¬»º³åÇø´óС £½ %d kb"
-#: server/stdinhand.c:4304
+#: server/stdinhand.c:4352
msgid " (observer mode)"
msgstr " £¨ÅÔ¹ÛÕßģʽ£©"
-#: server/stdinhand.c:4322
+#: server/stdinhand.c:4370
msgid "List of teams:"
msgstr "ÍŶÓÁÐ±í£º"
#. TRANS: There will always be at least 2 players here.
-#: server/stdinhand.c:4332
+#: server/stdinhand.c:4380
#, c-format
msgid "%2d : '%s' : %d player"
msgid_plural "%2d : '%s' : %d players"
msgstr[0] "%2d £º¡°%s¡± £º %d ¸öÍæ¼Ò"
-#: server/stdinhand.c:4352
+#: server/stdinhand.c:4400
#, c-format
msgid "%2d : '%s' : 1 player : %s"
msgstr "%2d £º ¡°%s¡± £º 1 ¸öÍæ¼Ò £º %s"
-#: server/stdinhand.c:4360
+#: server/stdinhand.c:4408
#, c-format
msgid "Empty team: %s"
msgstr "¿ÕÍŶӣº %s "
-#: server/stdinhand.c:4371
+#: server/stdinhand.c:4419
msgid "List of connections to server:"
msgstr "µ½·þÎñÆ÷µÄÁ¬½ÓÁÐ±í£º"
-#: server/stdinhand.c:4375
+#: server/stdinhand.c:4423
msgid "<no connections>"
msgstr "<ÎÞÁ¬½Ó>"
-#: server/stdinhand.c:4399
+#: server/stdinhand.c:4447
msgid "List of scenarios available:"
msgstr "¿ÉÓõÄÇé¾°ÁÐ±í£º"
@@ -6382,66 +6468,66 @@ msgstr "%s
msgid "%s acquired from %s!"
msgstr "ÓÎÏ·£º´Ó %2$s »ñµÃÁË %1$s £¡"
-#: server/techtools.c:220
+#: server/techtools.c:221
#, fuzzy, c-format
msgid ""
"Discovery of %s makes the government form %s available. You may want to "
"start a revolution."
msgstr "¶Ô %s µÄ·¢ÏÖʹÕþ¸®ÐÎʽ %s ³ÉΪ¿ÉÄÜ¡£Äú¿ÉÄÜÒª·¢¶¯Ò»³¡¸ïÃü¡£"
-#: server/techtools.c:301
+#: server/techtools.c:302
#, fuzzy, c-format
msgid "Discovery of %s OBSOLETES %s in %s!"
msgstr "%1$s µÄ·¢ÏÖÌÔÌÁË %3$s ÖÐµÄ %2$s £¡"
-#: server/techtools.c:351
+#: server/techtools.c:352
#, fuzzy, c-format
msgid "Learned %s. Our scientists focus on %s; goal is %s."
msgstr "ÒÑÕÆÎÕ %s¡£ÄúµÄ¿Æѧ¼Ò¼¯ÖÐÑо¿ %s£¬Ä¿±êΪ %s¡£"
-#: server/techtools.c:369
+#: server/techtools.c:370
#, fuzzy, c-format
msgid "Learned %s. Scientists choose to research %s."
msgstr "ÒÑÕÆÎÕ %s¡£¿Æѧ¼ÒÑ¡ÔñÑо¿ %s¡£"
-#: server/techtools.c:376
+#: server/techtools.c:377
#, fuzzy, c-format
msgid "Learned %s. "
msgstr "ÒÑÕÆÎÕ %s¡£"
-#: server/techtools.c:379
+#: server/techtools.c:380
#, c-format
msgid "Researching %s."
msgstr "ÕýÔÚÑо¿ %s¡£"
-#: server/techtools.c:385
+#: server/techtools.c:386
#, fuzzy, c-format
msgid "Learned %s. Scientists do not know what to research next."
msgstr "ÒÑÕÆÎÕ %s¡£¿Æѧ¼ÒÃDz»ÖªµÀ½ÓÏÂÀ´¸ÃÑо¿Ê²Ã´¡£"
-#: server/techtools.c:402
+#: server/techtools.c:403
#, fuzzy
msgid ""
"Great scientists from all the world join your civilization: you get an "
"immediate advance."
msgstr "È«ÊÀ½çµÄÖªÃû¿Æѧ¼Ò¼ÓÈëÄúµÄÎÄÃ÷£ºÄúÁ¢¿ÌµÃµ½Ò»Ïî½øÕ¹¡£"
-#: server/techtools.c:570
+#: server/techtools.c:571
#, fuzzy, c-format
msgid "Technology goal is %s."
msgstr "¿Æ¼¼Ä¿±êΪ %s¡£"
-#: server/techtools.c:700
+#: server/techtools.c:708
#, fuzzy, c-format
msgid "You steal %s from the %s."
msgstr "Äú´Ó %2$s ÖÐÇÔÈ¡ÁË %1$s¡£"
-#: server/techtools.c:705
+#: server/techtools.c:713
#, fuzzy, c-format
msgid "The %s stole %s from you!"
msgstr "%s ´ÓÄúÕâÀï͵ȥÁË %s£¡"
-#: server/techtools.c:710
+#: server/techtools.c:718
#, fuzzy, c-format
msgid "The %s have stolen %s from the %s."
msgstr "%1$s ´Ó %3$s ÇÔÈ¡ÁË %2$s ¡£"
@@ -6465,177 +6551,183 @@ msgstr "û
msgid "%s upgraded to %s for %d gold."
msgstr "Óà %3$d »Æ½ð½« %1$s Éý¼¶µ½ %2$s¡£"
-#: server/unithand.c:396
+#: server/unithand.c:402
#, c-format
msgid "%s refuses to disband!"
msgstr "%s ¾Ü¾ø½âÉ¢£¡"
-#: server/unithand.c:449
+#: server/unithand.c:455
msgid "Can't place city here."
msgstr "ÎÞ·¨ÔÚ´Ë´¦ÐÞ½¨³ÇÊС£"
-#: server/unithand.c:456
+#: server/unithand.c:462
#, c-format
msgid "Only %s can build a city."
msgstr "Ö»ÓÐ %s ¿ÉÒÔÐÞ½¨³ÇÊС£"
-#: server/unithand.c:461
+#: server/unithand.c:467
msgid "Can't build a city."
msgstr "ÎÞ·¨ÐÞ½¨³ÇÊС£"
-#: server/unithand.c:470
+#: server/unithand.c:476
#, c-format
msgid "Only %s can add to a city."
msgstr "Ö»ÓÐ %s ¿ÉÒÔ¼ÓÈëµ½³ÇÊÐÖС£"
-#: server/unithand.c:475
+#: server/unithand.c:481
msgid "Can't add to a city."
msgstr "ÎÞ·¨¼ÓÈë³ÇÊС£"
-#: server/unithand.c:481
+#: server/unithand.c:487
#, c-format
msgid "%s unit has no moves left to add to %s."
msgstr "²¿¶Ó %s ûÓÐÊ£ÓàµÄÒƶ¯Á¦ÒÔÓÃÓÚ¼ÓÈë %s¡£"
-#: server/unithand.c:487
+#: server/unithand.c:493
#, c-format
msgid "%s unit has no moves left to build city."
msgstr "²¿¶Ó %s ûÓÐÊ£ÓàµÄÒƶ¯Á¦ÒÔÐÞ½¨³ÇÊС£"
-#: server/unithand.c:492
+#. TRANS: <city> is owned by <nation>, cannot add <unit>.
+#: server/unithand.c:499
+#, fuzzy, c-format
+msgid "%s is owned by %s, cannot add %s."
+msgstr "%s Ì«´óÒÔÖÂÓÚÎÞ·¨¼ÓÈë %s¡£"
+
+#: server/unithand.c:506
#, c-format
msgid "%s is too big to add %s."
msgstr "%s Ì«´óÒÔÖÂÓÚÎÞ·¨¼ÓÈë %s¡£"
-#: server/unithand.c:498
+#: server/unithand.c:512
#, c-format
msgid "%s needs an improvement to grow, so you cannot add %s."
msgstr "%s ÐèÒªÒ»¸ö½¨ÖþÒÔ½øÐÐÔö³¤£¬ËùÒÔÄú²»ÄÜÌí¼Ó %s ¡£"
-#: server/unithand.c:509
+#: server/unithand.c:523
#, c-format
msgid "Can't add %s to %s."
msgstr "%s ÎÞ·¨¼ÓÈë %s¡£"
-#: server/unithand.c:531
+#: server/unithand.c:545
#, c-format
msgid "%s added to aid %s in growing."
msgstr "%s ÒѼÓÈë %s ÒÔ°ïÖúÆäÔö³¤¡£"
-#: server/unithand.c:828
+#: server/unithand.c:842
msgid "Your Nuclear missile was shot down by SDI defences, what a waste."
msgstr "ÄúµÄºËµ¼µ¯ÒѾ±» SDI ·ÀÓùϵͳ»÷Â䣬ÕæÀË·Ñ°¡¡£"
-#: server/unithand.c:831
+#: server/unithand.c:845
#, c-format
msgid "The nuclear attack on %s was avoided by your SDI defense."
msgstr "ÄúµÄ SDI ·ÀÓùϵͳ·ÀÖ¹ÁË¶Ô %s µÄºË¹¥»÷¡£"
#. TRANS: "Your Cannon ... the Polish Destroyer."
-#: server/unithand.c:901
+#: server/unithand.c:915
#, fuzzy, c-format
msgid "Your %s survived the pathetic attack from the %s %s."
msgstr "Äú µÄ %s ´Ó %s µÄ %s ¿ÉÁ¯µÄ¹¥»÷Öдæ»îÏÂÀ´¡£"
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unithand.c:910
+#: server/unithand.c:924
#, fuzzy, c-format
msgid "Your attacking %s failed against the %s %s!"
msgstr "ÄúµÄ %s ¶Ô %s µÄ %s µÄ¹¥»÷ʧ°Ü£¡"
-#: server/unithand.c:983
+#: server/unithand.c:997
#, c-format
msgid "Only %s can attack from sea."
msgstr "Ö»ÓÐ %s ¿ÉÒÔ´Óº£Ñó½øÐй¥»÷¡£"
-#: server/unithand.c:988
+#: server/unithand.c:1002
msgid "Cannot attack from sea."
msgstr "ÎÞ·¨´Óº£Ñó½øÐй¥»÷¡£"
-#: server/unithand.c:996 server/unittools.c:2137
+#: server/unithand.c:1010 server/unittools.c:2142
msgid "Cannot attack unless you declare war first."
msgstr "³ý·ÇÄúÊ×ÏÈÐûÕ½·ñÔòÎÞ·¨¹¥»÷¡£"
-#: server/unithand.c:1001
+#: server/unithand.c:1015
#, c-format
msgid "%s can only move into your own zone of control."
msgstr "%s Ö»ÄÜÒƶ¯µ½Äú×Ô¼º¿ØÖƵÄÇøÓò¡£"
-#: server/unithand.c:1007
+#: server/unithand.c:1021
#, fuzzy, c-format
msgid "Cannot invade unless you break peace with %s first."
msgstr "³ý·ÇÄúÊ×ÏÈÐûÕ½·ñÔòÎÞ·¨¹¥»÷¡£"
-#: server/unithand.c:1052
+#: server/unithand.c:1066
msgid "This unit has no moves left."
msgstr "¸Ã²¿¶ÓÒѾûÓÐÒƶ¯Á¦ÁË¡£"
-#: server/unithand.c:1107
+#: server/unithand.c:1121
msgid "Unit must be on land to perform diplomatic action."
msgstr "²¿¶Ó±ØÐëÔÚ½µØÉϽøÐÐÍâ½»»î¶¯¡£"
-#: server/unithand.c:1109
+#: server/unithand.c:1123
msgid "No diplomat action possible."
msgstr "ûÓпÉÄܵÄÍâ½»»î¶¯¡£"
-#: server/unithand.c:1125
+#: server/unithand.c:1139
#, c-format
msgid "You must declare war on %s first. Try using players dialog (F3)."
msgstr "Äú±ØÐëÏÈ¶Ô %s ÐûÕ½¡£ÇëʹÓÃÍæ¼Ò¶Ô»°¿ò£¨F3£©¡£"
-#: server/unithand.c:1143
+#: server/unithand.c:1157
msgid "This unit is being transported, and so cannot bombard."
msgstr "´Ë²¿¶ÓÕýÔÚ±»ÔËÊ䣬ËùÓв»ÄܽøÐй¥»÷¡£"
-#: server/unithand.c:1158
+#: server/unithand.c:1172
msgid "You can't attack there."
msgstr "Äú²»Äܹ¥»÷ÕâÀï¡£"
-#: server/unithand.c:1180
+#: server/unithand.c:1194
msgid "This type of troops cannot take over a city."
msgstr "ÕâÖÖÀàÐ͵IJ¿¶Ó²»ÄÜÕ¼Áì³ÇÊС£"
-#: server/unithand.c:1198
+#: server/unithand.c:1212
msgid "A transported unit is not allied to all units or city on target tile."
msgstr "Ò»¸öËùÔËÊäµÄ²¿¶ÓûÓÐÓëÄ¿±ê·½¸ñµÄËùÓв¿¶Ó»ò³ÇÊнáÃË¡£"
-#: server/unithand.c:1240
+#: server/unithand.c:1254
#, c-format
msgid "Your %s helps build the %s in %s (%d remaining)."
msgstr "ÄúµÄ %1$s ÔÚ %3$s ÖаïÖú½¨Ôì %2$s (»¹Ê£ %4$d)¡£"
-#: server/unithand.c:1242
+#: server/unithand.c:1256
#, c-format
msgid "Your %s helps build the %s in %s (%d surplus)."
msgstr "ÄúµÄ %1$s ÔÚ %3$s ÖаïÖú½¨Ôì %2$s £¨Ê£Óà %4$d £©¡£"
-#: server/unithand.c:1286
+#: server/unithand.c:1300
#, c-format
msgid ""
"Sorry, your %s cannot establish a trade route because it has no home city"
msgstr "±§Ç¸£¬ÄúµÄ %s ²»Äܽ¨Á¢Ã³Ò×·Ïߣ¬ÒòΪËüûÓлùµØ³ÇÊС£"
-#: server/unithand.c:1296
+#: server/unithand.c:1310
#, c-format
msgid "Sorry, your %s cannot establish a trade route between %s and %s"
msgstr "±§Ç¸£¬ÄúµÄ %s ÎÞ·¨ÔÚ %s ºÍ %s Ö®¼ä½¨Á¢Ã³Ò×·Ïߣ¡"
-#: server/unithand.c:1325 server/unithand.c:1344
+#: server/unithand.c:1339 server/unithand.c:1358
#, c-format
msgid "Sorry, your %s cannot establish a trade route here!"
msgstr "±§Ç¸£¬ÄúµÄ %s ÎÞ·¨ÔÚ´Ë´¦½¨Á¢Ã³Ò×·Ïߣ¡"
-#: server/unithand.c:1329 server/unithand.c:1348
+#: server/unithand.c:1343 server/unithand.c:1362
#, c-format
msgid " The city of %s already has %d better trade routes!"
msgstr " ³ÇÊÐ %s ÒѾÓÐ %d Ìõ¸üºÃµÄóÒ×·ÏßÁË£¡"
-#: server/unithand.c:1361 server/unithand.c:1373
+#: server/unithand.c:1375 server/unithand.c:1387
#, c-format
msgid "Sorry, %s has canceled the trade route from %s to your city %s."
msgstr "±§Ç¸£¬%s È¡ÏûÁË´Ó %s µ½ÄúµÄ³ÇÊÐ %s µÄóÒ×·Ïß¡£"
-#: server/unithand.c:1406
+#: server/unithand.c:1420
#, c-format
msgid ""
"Your %s from %s has arrived in %s, and revenues amount to %d in gold and "
@@ -6694,55 +6786,55 @@ msgid "Teleported your %s to %s."
msgstr "Òѽ«ÄúµÄ %s ´«Ë͵½ %s ¡£"
#. TRANS: A unit is moved to resolve stack conflicts.
-#: server/unittools.c:1065
+#: server/unittools.c:1070
#, fuzzy, c-format
msgid "Moved your %s."
msgstr "½âÉ¢ÁËÄúµÄ %s¡£"
-#: server/unittools.c:1076
+#: server/unittools.c:1081
#, c-format
msgid "Disbanded your %s."
msgstr "½âÉ¢ÁËÄúµÄ %s¡£"
-#: server/unittools.c:1397
+#: server/unittools.c:1402
#, c-format
msgid "Unable to defend %s, %s has lost the game."
msgstr "²»ÄÜ·ÀÓù %s £¬%s ÊäµôÁËÓÎÏ·¡£"
-#: server/unittools.c:1401
+#: server/unittools.c:1406
#, c-format
msgid "Losing %s meant losing the game! Be more careful next time!"
msgstr "¶ªµô %s ¾ÍÒâζ×ÅÊäµôÓÎÏ·£¡Ï´ÎСÐĵ㣡"
-#: server/unittools.c:1503
+#: server/unittools.c:1508
#, c-format
msgid "%s escaped the destruction of %s, and fled to %s."
msgstr "%s ´Ó %s µÄ½âÌåÖÐÌÓÍѳöÀ´£¬²¢Á÷Íöµ½ %s¡£"
-#: server/unittools.c:1512
+#: server/unittools.c:1517
#, c-format
msgid "%s lost when %s was lost."
msgstr "%s Ëæ %s µÄËðʧ¶øËðʧ¡£"
-#: server/unittools.c:1561
+#: server/unittools.c:1566
#, c-format
msgid "Barbarian leader captured, %d gold ransom paid."
msgstr "²¶»ñÒ°ÈËÍ·Á죬»ñµÃ %d Êê½ð¡£"
#. TRANS: "... Cannon ... the Polish Destroyer."
-#: server/unittools.c:1579
+#: server/unittools.c:1584
#, fuzzy, c-format
msgid "Your attacking %s succeeded against the %s %s!"
msgstr "ÄúµÄ %1$s ¶Ô %2$s µÄ %3$s µÄ¹¥»÷³É¹¦£¡"
#. TRANS: "Cannon ... the Polish Destroyer."
-#: server/unittools.c:1588 server/unittools.c:1646
+#: server/unittools.c:1593 server/unittools.c:1651
#, fuzzy, c-format
msgid "%s lost to an attack by the %s %s."
msgstr "ÔÚ %2$s µÄ %3$s µÄ¹¥»÷ÏÂËðʧÁË %1$s ¡£"
#. TRANS: "... Cannon ... the Polish Destroyer ...."
-#: server/unittools.c:1622
+#: server/unittools.c:1627
#, fuzzy, c-format
msgid "Your attacking %s succeeded against the %s %s (and %d other unit)!"
msgid_plural ""
@@ -6751,14 +6843,14 @@ msgstr[0] "
#. TRANS: "Cannon lost when the Polish Destroyer
#. * attacked the German Musketeers."
-#: server/unittools.c:1655
+#: server/unittools.c:1660
#, fuzzy, c-format
msgid "%s lost when the %s %s attacked the %s %s."
msgstr "ÔÚ %2$s µÄ %3$s ¹¥»÷ %4$s µÄ %5$s ʱËðʧÁË %1$s ¡£"
#. TRANS: "Musketeers (and Cannon) lost to an
#. * attack from the Polish Destroyer."
-#: server/unittools.c:1670
+#: server/unittools.c:1675
#, fuzzy, c-format
msgid "%s (and %s) lost to an attack from the %s %s."
msgstr "ÔÚ %3$s µÄ %4$s µÄ¹¥»÷ÏÂËðʧÁË %1$s %2$s ¡£"
@@ -6766,7 +6858,7 @@ msgstr "
#. TRANS: "Musketeers and 3 other units lost to
#. * an attack from the Polish Destroyer."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1680
+#: server/unittools.c:1685
#, fuzzy, 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."
@@ -6775,178 +6867,220 @@ msgstr[0] "
#. TRANS: "2 units lost when the Polish Destroyer
#. * attacked the German Musketeers."
#. * (only happens with at least 2 other units)
-#: server/unittools.c:1694
+#: server/unittools.c:1699
#, fuzzy, 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 ×Ô¶¯¹¥»÷£º %s µÄ %s ÕýÔÚ¹¥»÷ %s µÄ %s"
-#: server/unittools.c:1962
+#: server/unittools.c:1967
#, c-format
msgid "Your %s was nuked by %s."
msgstr "ÄúµÄ %s ±» %s ¡°ºË¡±ÁË¡£"
-#: server/unittools.c:1965 server/unittools.c:1981
+#: server/unittools.c:1970 server/unittools.c:1986
msgid "yourself"
msgstr "Äú×Ô¼º"
-#: server/unittools.c:1969
+#: server/unittools.c:1974
#, fuzzy, c-format
msgid "The %s %s was nuked."
msgstr "%s µÄ %s Ôâµ½ºËÎäÆ÷µÄ¹¥»÷¡£"
-#: server/unittools.c:1978
+#: server/unittools.c:1983
#, c-format
msgid "%s was nuked by %s."
msgstr "%s Ôâµ½ %s µÄºËÎäÆ÷µÄ¹¥»÷¡£"
-#: server/unittools.c:1986
+#: server/unittools.c:1991
#, c-format
msgid "You nuked %s."
msgstr "ÄúÒÔºËÎäÆ÷¹¥»÷ %s¡£"
-#: server/unittools.c:2027
+#: server/unittools.c:2032
#, fuzzy, c-format
msgid "The %s detonated a nuke!"
msgstr "%s Òý±¬Á˺˵¯£¡"
-#: server/unittools.c:2051
+#: server/unittools.c:2056
#, c-format
msgid "%s transported successfully."
msgstr "%s ÔËÊä³É¹¦¡£"
-#: server/unittools.c:2103
+#: server/unittools.c:2108
msgid "This unit type can not be paradropped."
msgstr "ÕâÖÖÀàÐ͵IJ¿¶Ó²»ÄÜ¿Õ½µ¡£"
-#: server/unittools.c:2113
+#: server/unittools.c:2118
#, fuzzy
msgid "You cannot paradrop a unit that is transporting other units."
msgstr "Äú²»ÄÜ¿Õ½µÒ»¸öÔËÊ䲿¶Ó¡£"
-#: server/unittools.c:2119
+#: server/unittools.c:2124
msgid "The destination location is not known."
msgstr "Ä¿µÄλÖÃδ֪¡£"
-#: server/unittools.c:2126
+#: server/unittools.c:2131
#, c-format
msgid "This unit cannot paradrop into %s."
msgstr "´Ë²¿¶Ó²»ÄÜ¿Õ½µµ½ %s¡£"
-#: server/unittools.c:2146
+#: server/unittools.c:2151
#, c-format
msgid "The distance to the target (%i) is greater than the unit's range (%i)."
msgstr "µ½Ä¿±êµÄ¾àÀ루%i£©³¬³öÁ˲¿¶ÓµÄ·¶Î§£¨%i£©¡£"
-#: server/unittools.c:2157
+#: server/unittools.c:2162
#, c-format
msgid "Your %s paradropped into the %s and was lost."
msgstr "ÄúµÄ %s ±»¿Õ½µµ½ %s ²¢È«²¿Ëðʧ¡£"
-#: server/unittools.c:2170
+#: server/unittools.c:2175
#, c-format
msgid "Your %s was killed by enemy units at the paradrop destination."
msgstr "ÄúµÄ %s ÔÚ¿Õ½µÄ¿µÄµØ±»µÐ·½²¿¶ÓɱËÀÁË¡£"
-#: server/unittools.c:2192
+#: server/unittools.c:2197
#, c-format
msgid "You found %d gold."
msgstr "ÄúÕÒµ½ %d »Æ½ð¡£"
-#: server/unittools.c:2209
+#: server/unittools.c:2214
#, c-format
msgid "You found %s in ancient scrolls of wisdom."
msgstr "ÄúÔڹŴú¾íÖáÖз¢ÏÖÁË %s¡£"
-#: server/unittools.c:2216
+#: server/unittools.c:2221
#, c-format
msgid "The %s have acquired %s from ancient scrolls of wisdom."
msgstr "%s ÔڹŴú¾íÖáÖеõ½ÁË %s¡£"
-#: server/unittools.c:2230
+#: server/unittools.c:2235
msgid "A band of friendly mercenaries joins your cause."
msgstr "Ò»Ö§ÓѺõĹÍÓ¶¾ü¼ÓÈëÁËÄúµÄ¶ÓÎé¡£"
-#: server/unittools.c:2248
+#: server/unittools.c:2253
msgid "An abandoned village is here."
msgstr "ÕâÀïÊÇÒ»×ù·ÏÆúµÄ´åׯ¡£"
-#: server/unittools.c:2258
+#: server/unittools.c:2263
msgid "You have unleashed a horde of barbarians!"
msgstr "Äú¼¤»îÁËһȺҰÈË£¡"
-#: server/unittools.c:2261
+#: server/unittools.c:2266
#, c-format
msgid "Your %s has been killed by barbarians!"
msgstr "ÄúµÄ %s ±»Ò°ÈËɱËÀÁË£¡"
-#: server/unittools.c:2277
+#: server/unittools.c:2282
msgid "You found a friendly city."
msgstr "ÄúÕÒµ½ÁËÒ»×ùÓѺóÇÊС£"
-#: server/unittools.c:2291
+#: server/unittools.c:2296
msgid "Friendly nomads are impressed by you, and join you."
msgstr "ÓѺõÄÁ÷ÀËÕß±»Äú¸Ð¶¯²¢¼ÓÈëÁËÄúµÄ¶ÓÎé¡£"
-#: server/unittools.c:2316
+#: server/unittools.c:2321
msgid "Your overflight frightens the tribe; they scatter in terror."
msgstr "ÄúÔÚ¿ÕÖеķɹý¾ªÏÅÁ˲¿Â䣻ËûÃDZ»ÏŵÃËÄÏÂÌÓ´Ü¡£"
-#: server/unittools.c:2574
+#: server/unittools.c:2579
#, c-format
msgid "Orders for %s aborted after enemy movement was spotted."
msgstr "Òò¸½½üÓв¿¶Ó¶øÈ¡Ïû¶Ô %s µÄÃüÁî¡£"
-#: server/unittools.c:3023
+#: server/unittools.c:3028
#, c-format
msgid "Orders for %s aborted as there are units nearby."
msgstr "Òò¸½½üÓв¿¶Ó¶øÈ¡Ïû¶Ô %s µÄÃüÁî¡£"
-#: server/unittools.c:3075
+#: server/unittools.c:3080
#, c-format
msgid "Orders for %s aborted because building of city failed."
msgstr "ÒòÐÞ½¨³ÇÊÐʧ°Ü¶øÈ¡Ïû¶Ô %s µÄÃüÁî¡£"
-#: server/unittools.c:3088
+#: server/unittools.c:3093
#, c-format
msgid "Orders for %s aborted since they give an invalid activity."
msgstr "%s µÄÃüÁȡÏûÒòΪËü¸ø³öÁËÎÞЧµÄ»î¶¯¡£"
-#: server/unittools.c:3102
+#: server/unittools.c:3107
#, c-format
msgid "Orders for %s aborted since they give an invalid location."
msgstr "%s µÄÃüÁȡÏûÒòΪËü¸ø³öÁËÎÞЧµÄλÖá£"
-#: server/unittools.c:3112
+#: server/unittools.c:3117
#, c-format
msgid "Orders for %s aborted as there are units in the way."
msgstr "ÒòÓв¿¶Óµ²ÔÚ·ÖжøÈ¡Ïû¶Ô %s µÄÃüÁî¡£"
-#: server/unittools.c:3138
+#: server/unittools.c:3143
#, c-format
msgid "Orders for %s aborted because of failed move."
msgstr "ÒòÒƶ¯ÎÞЧ¶øÈ¡Ïû¶Ô %s µÄÃüÁî¡£"
-#: server/unittools.c:3179
+#: server/unittools.c:3184
#, c-format
msgid "Attempt to change homecity for %s failed."
msgstr "ÊÔͼ¸Ä±ä %s µÄ»ùµØ³ÇÊÐʧ°Ü¡£"
-#: server/unittools.c:3190
+#: server/unittools.c:3195
#, c-format
msgid "Attempt to establish trade route for %s failed."
msgstr "ÊÔͼΪ %s ½¨Á¢Ã³Ò×·Ïßʧ°Ü¡£"
-#: server/unittools.c:3202
+#: server/unittools.c:3207
#, c-format
msgid "Attempt to build wonder for %s failed."
msgstr "ÊÔͼΪ %s ÐÞ½¨Æ漣ʧ°Ü¡£"
-#: server/unittools.c:3211
+#: server/unittools.c:3216
#, c-format
msgid "Your %s has invalid orders."
msgstr "ÄúµÄ %s µÃµ½ÁËÎÞЧµÄÃüÁî¡£"
+#: server/voting.c:522
+#, fuzzy, c-format
+msgid ""
+"%s %d \"%s\" is passed %d to %d with %d abstentions and %d who did not vote."
+msgstr "ͶƱ¡°%s¡±Í¨¹ý£¬%d Ö§³Ö£¬%d ·´¶Ô£¬%d ÆúȨ¡£"
+
+#: server/voting.c:528
+#, fuzzy, c-format
+msgid ""
+"%s %d \"%s\" failed with %d against, %d for, %d abstentions and %d who did "
+"not vote."
+msgstr "ͶƱ¡°%s¡±·ñ¾ö£¬%d ·´¶Ô£¬%d Ö§³Ö£¬ÒÔ¼° %d ÆúȨ¡£"
+
+#: server/voting.c:548
+#, c-format
+msgid "%s %d: %s voted yes."
+msgstr ""
+
+#: server/voting.c:553
+#, c-format
+msgid "%s %d: %s voted no."
+msgstr ""
+
+#: server/voting.c:558
+#, c-format
+msgid "%s %d: %s chose to abstain."
+msgstr ""
+
+#. TRANS: Describing a new vote that can only pass
+#. * if there are no dissenting votes.
+#: server/voting.c:726
+#, c-format
+msgid "%s (needs %0.0f%% and no dissent)."
+msgstr ""
+
+#. TRANS: Describing a new vote that can pass only if the
+#. * given percentage of players votes 'yes'.
+#: server/voting.c:732
+#, c-format
+msgid "%s (needs %0.0f%% in favor)."
+msgstr ""
+
#: server/generator/mapgen.c:1771
msgid "High landmass - this may take a few seconds."
msgstr "´óÐ͵ĽµØ £Õâ¿ÉÄÜÐèÒª¼¸ÃëÖÓ¡£"
@@ -6977,12 +7111,12 @@ msgstr ""
"»òÐí¶Ô´ËµØͼÀ´ËµÍæ¼ÒÊýÄ¿Ì«¶àÁË¡£\n"
"ÇëÏò %s ±¨¸æÕâ¸ö´íÎó¡£"
-#: client/attribute.c:363
+#: client/attribute.c:368
msgid ""
"There has been a CMA error. Your citizen governor settings may be broken."
msgstr "CMA´íÎó¡£ÄúµÄÊÐÃñ¹ÜÀíÉèÖÿÉÄܲ»ÍêÕû¡£"
-#: client/attribute.c:367
+#: client/attribute.c:372
msgid "Old attributes detected and removed."
msgstr "¼ì²âµ½¾ÉµÄÊôÐÔ²¢É¾³ýÖ®¡£"
@@ -7127,41 +7261,41 @@ msgstr "%+4d :
msgid "%+4d : Taxed from trade\n"
msgstr "%+4d : Taxed from trade\n"
-#: client/citydlg_common.c:418
+#: client/citydlg_common.c:421
#, fuzzy, c-format
msgid "%+4d : Trade route with %s\n"
msgstr "»¹Ã»ÓÐÉÌ·´æÔÚ¡£\n"
-#: client/citydlg_common.c:427
+#: client/citydlg_common.c:430
#, fuzzy, c-format
msgid "%+4d : Building tithes\n"
msgstr "ÕýÔÚ½¨Ô첿¶Ó"
-#: client/citydlg_common.c:450
+#: client/citydlg_common.c:453
#, c-format
msgid "%+4d : Bonus from %s (%+d%%)\n"
msgstr ""
-#: client/citydlg_common.c:462
+#: client/citydlg_common.c:465
#, c-format
msgid "%+4d : Waste\n"
msgstr ""
-#: client/citydlg_common.c:468
+#: client/citydlg_common.c:471
#, c-format
msgid "%+4d : Disorder\n"
msgstr ""
-#: client/citydlg_common.c:474
+#: client/citydlg_common.c:477
#, c-format
msgid "%+4d : Used\n"
msgstr ""
-#: client/citydlg_common.c:479
+#: client/citydlg_common.c:482
msgid "==== : Adds up to\n"
msgstr ""
-#: client/citydlg_common.c:481
+#: client/citydlg_common.c:484
#, c-format
msgid "%4d : Total surplus"
msgstr ""
@@ -7468,50 +7602,50 @@ msgstr "ר"
msgid "Specialists"
msgstr "רҵÈËÔ±£º"
-#: client/civclient.c:240
+#: client/civclient.c:241
msgid " -a, --autoconnect\tSkip connect dialog\n"
msgstr " -a, --autoconnect\tÌø¹ýÁ¬½Ó¶Ô»°¿ò\n"
-#: client/civclient.c:250
+#: client/civclient.c:251
msgid " -l, --log FILE\tUse FILE as logfile (spawned server also uses this)\n"
msgstr " -l, --log FILE\t½« FILE ×÷ΪÈÕÖ¾Îļþ£¨ÅÉÉúµÄ·þÎñÆ÷Ò²½«Ê¹ÓôËÎļþ£©\n"
-#: client/civclient.c:252
+#: client/civclient.c:253
msgid " -m, --meta HOST\tConnect to the metaserver at HOST\n"
msgstr " -m, --meta HOST\tÁ¬½Óµ½Î»ÓÚ HOST µÄÔª·þÎñÆ÷\n"
-#: client/civclient.c:254
+#: client/civclient.c:255
msgid " -n, --name NAME\tUse NAME as name\n"
msgstr " -n, --name NAME\tʹÓà NAME ×÷ΪÃû×Ö\n"
-#: client/civclient.c:256
+#: client/civclient.c:257
#, fuzzy
msgid " -p, --port PORT\tConnect to server port PORT (usually with -a)\n"
msgstr " -p, --port PORT\tÁ¬½Óµ½·þÎñÆ÷¶Ë¿Ú PORT\n"
-#: client/civclient.c:258
+#: client/civclient.c:259
#, c-format
msgid " -P, --Plugin PLUGIN\tUse PLUGIN for sound output %s\n"
msgstr " -P, --Plugin PLUGIN\tʹÓà PLUGIN ×÷ΪÉùЧ²å¼þ %s\n"
-#: client/civclient.c:260
+#: client/civclient.c:261
msgid " -r, --read FILE\tRead startup script FILE (for spawned server only)\n"
msgstr " -r, --read FILE\t¶ÁÈ¡Æô¶¯½Å±¾ FILE £¨½öÓÃÓÚÅÉÉúµÄ·þÎñÆ÷£©\n"
-#: client/civclient.c:263
+#: client/civclient.c:264
#, fuzzy
msgid " -s, --server HOST\tConnect to the server at HOST (usually with -a)\n"
msgstr " -s, --server HOST\tÁ¬½Óµ½Î»ÓÚ HOST µÄ·þÎñÆ÷\n"
-#: client/civclient.c:265
+#: client/civclient.c:266
msgid " -S, --Sound FILE\tRead sound tags from FILE\n"
msgstr " -S, --Sound FILE\t´Ó FILE ÖжÁÈ¡ÒôЧ±ê¼Ç\n"
-#: client/civclient.c:266
+#: client/civclient.c:267
msgid " -t, --tiles FILE\tUse data file FILE.tilespec for tiles\n"
msgstr " -t, --tiles FILE\tʹÓÃÊý¾ÝÎļþ FILE.tilespec ×÷ΪµØͼ·ç¸ñ\n"
-#: client/civclient.c:269
+#: client/civclient.c:270
#, c-format
msgid ""
" --\t\tPass any following options to the UI.\n"
@@ -7521,45 +7655,45 @@ msgstr ""
"\t\t\tÇë³¢ÊÔ¡°%s -- --help¡±ÒԵõ½¸ü¶àÐÅÏ¢¡£\n"
#. TRANS: No full stop after the URL, could cause confusion.
-#: client/civclient.c:274
+#: client/civclient.c:275
#, fuzzy, c-format
msgid "Report bugs at %s\n"
msgstr "½«´íÎ󱨸淢Ë͵½ <%s>¡£\n"
-#: client/civclient.c:298
+#: client/civclient.c:299
#, c-format
msgid "Invalid port \"%s\" specified with --port option.\n"
msgstr "--port Ñ¡ÏîÖ¸¶¨ÁËÎÞЧµÄ¶Ë¿Ú¡°%s¡±¡£\n"
-#: client/civclient.c:300 client/civclient.c:315
+#: client/civclient.c:301 client/civclient.c:316
msgid "Try using --help.\n"
msgstr "ÇëʹÓà --help Ñ¡Ïî¡£\n"
-#: client/civclient.c:313
+#: client/civclient.c:314
#, c-format
msgid "Invalid debug level \"%s\" specified with --debug option.\n"
msgstr "--debug Ñ¡ÏîÖ¸¶¨ÁËÎÞЧµÄµ÷ʽ¼¶±ð¡°%s¡±¡£\n"
-#: client/civclient.c:326
+#: client/civclient.c:327
#, c-format
msgid "Unrecognized option: \"%s\"\n"
msgstr "ÎÞ·¨Ê¶±ðµÄÑ¡Ï¡°%s¡±\n"
-#: client/civclient.c:391
+#: client/civclient.c:393
#, fuzzy, c-format
msgid "Updating old metaserver address \"%s\"."
msgstr "metaserver <µØÖ·>"
-#: client/civclient.c:394
+#: client/civclient.c:396
#, fuzzy, c-format
msgid "Default metaserver has been set to \"%s\"."
msgstr "Ñ¡Ï%s Òѱ»ÉèÖÃΪ¡°%s¡±¡£"
-#: client/civclient.c:550
+#: client/civclient.c:540
msgid "Game started."
msgstr "ÓÎÏ·ÒÑ¿ªÊ¼¡£"
-#: client/civclient.c:588
+#: client/civclient.c:606
msgid "There was an error while auto connecting; aborting."
msgstr "×Ô¶¯Á¬½Óʱ³öÏÖ´íÎó£»Öжϡ£"
@@ -7689,16 +7823,16 @@ msgstr "
msgid "Disconnected from server."
msgstr "´Ó·þÎñÆ÷¶Ï¿ªÁ¬½Ó"
-#: client/clinet.c:469
+#: client/clinet.c:473
#, c-format
msgid "Failed to contact server \"%s\" at port %d as \"%s\" after %d attempts"
msgstr " %4$d ´Î³¢ÊÔÒÔ¡°%3$s¡±ÁªÏµ·þÎñÆ÷¡°%1$s¡±¶Ë¿Ú %2$d ʧ°Ü"
-#: client/clinet.c:484 client/clinet.c:486
+#: client/clinet.c:488 client/clinet.c:490
msgid "Connection to server refused. Please start the server."
msgstr "Á¬½Ó·þÎñÆ÷±»¾Ý¡£ÇëÆô¶¯·þÎñÆ÷¡£"
-#: client/clinet.c:495 client/clinet.c:523
+#: client/clinet.c:499 client/clinet.c:527
#, c-format
msgid ""
"Error contacting server \"%s\" at port %d as \"%s\":\n"
@@ -7707,60 +7841,60 @@ msgstr ""
"³¢ÊÔÒÔ¡°%3$s¡±ÁªÏµ·þÎñÆ÷¡°%1$s¡±¶Ë¿Ú %2$d ʧ°Ü£º\n"
" %4$s\n"
-#: client/clinet.c:514
+#: client/clinet.c:518
#, c-format
msgid ""
"Auto-connecting to server \"%s\" at port %d as \"%s\" every %f second(s) for "
"%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:1358
+#: client/connectdlg_common.c:78 client/gui-gtk-2.0/pages.c:1358
msgid "novice"
msgstr "¼«Ò×"
-#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1358
+#: client/connectdlg_common.c:79 client/gui-gtk-2.0/pages.c:1358
msgid "easy"
msgstr "ÈÝÒ×"
-#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:80 client/gui-gtk-2.0/pages.c:1359
msgid "normal"
msgstr "ÆÕͨ"
-#: client/connectdlg_common.c:82 client/gui-gtk-2.0/pages.c:1359
+#: client/connectdlg_common.c:81 client/gui-gtk-2.0/pages.c:1359
msgid "hard"
msgstr "À§ÄÑ"
-#: client/connectdlg_common.c:83
+#: client/connectdlg_common.c:82
msgid "experimental"
msgstr "ʵÑéÐÔ"
-#: client/connectdlg_common.c:213
+#: client/connectdlg_common.c:212
msgid "Starting server..."
msgstr "ÕýÔÚÆô¶¯·þÎñÆ÷¡¡"
-#: client/connectdlg_common.c:332
+#: client/connectdlg_common.c:331
msgid "Couldn't start the server."
msgstr "ÎÞ·¨Æô¶¯·þÎñÆ÷¡£"
-#: client/connectdlg_common.c:333 client/connectdlg_common.c:366
+#: client/connectdlg_common.c:332 client/connectdlg_common.c:365
msgid "You'll have to start one manually. Sorry..."
msgstr "Äú±ØÐëÊÖ¹¤Æô¶¯Ò»¸öÓÎÏ·¡£±§Ç¸..."
-#: client/connectdlg_common.c:364
+#: client/connectdlg_common.c:363
msgid "Couldn't connect to the server."
msgstr "²»ÄÜÁ¬½Óµ½·þÎñÆ÷¡£"
-#: client/connectdlg_common.c:365
+#: client/connectdlg_common.c:364
msgid "We probably couldn't start it from here."
msgstr "»òÐíÎÒÃDz»ÄÜ´ÓÕâÀïÆô¶¯Ö®¡£"
-#: client/connectdlg_common.c:470
+#: client/connectdlg_common.c:469
#, fuzzy
msgid ""
"Established control over the server. You have command access level 'hack'."
msgstr "»ñµÃ¶Ô·þÎñÆ÷µÄ¿ØÖÆ£¨ÃüÁî·ÃÎʼ¶±ð hack£©¡£"
-#: client/connectdlg_common.c:475
+#: client/connectdlg_common.c:474
msgid ""
"Failed to obtain the required access level to take control of the server. "
"The server will now be shutdown."
@@ -7770,27 +7904,27 @@ msgstr ""
msgid "Only transporter units can be unloaded."
msgstr "Ö»ÓÐÔËÊ䲿¶Ó¿ÉÒÔ±»Ð¶ÔØ¡£"
-#: client/control.c:1425
+#: client/control.c:1417
msgid "Only settler units can be put into auto mode."
msgstr "Ö»ÓÐÒÆÃñÕß²¿¶Ó¿ÉÒÔ±»ÉèÖÃΪ×Ô¶¯Ä£Ê½¡£"
-#: client/control.c:1516
+#: client/control.c:1511
msgid "Only nuclear units can do this."
msgstr "Ö»ÓкË×Ó²¿¶Ó¿ÉÒÔÕâÑù×ö¡£"
-#: client/control.c:1545
+#: client/control.c:1540
msgid "Only paratrooper units can do this."
msgstr "Ö»ÓÐÉ¡±ø²¿¶Ó¿ÉÒÔÕâÑù×÷¡£"
-#: client/control.c:2020
+#: client/control.c:2015
msgid "Too far for this unit."
msgstr "¶Ô´Ë²¿¶ÓÀ´ËµÌ«Ô¶¡£"
-#: client/control.c:2230 client/control.c:2260 client/control.c:2276
+#: client/control.c:2225 client/control.c:2255 client/control.c:2271
msgid "Didn't find a route to the destination!"
msgstr "ûÓз¢ÏÖµ½´ïÄ¿µÄµØµÄµÀ·£¡"
-#: client/control.c:2320
+#: client/control.c:2315
msgid "Oh my! You seem to have no capital!"
msgstr "ÌìÄÄ£¡ÄãºÃÏñûÓÐÊ׶¼ÁË£¡"
@@ -8189,114 +8323,120 @@ msgstr "* %s
#. * last two elements
#. TRANS: List of possible output types has this between
#. * last two elements
-#: client/helpdata.c:1066 client/helpdata.c:1400
+#: client/helpdata.c:1066 client/helpdata.c:1408
msgid " or "
msgstr " »ò "
-#: client/helpdata.c:1068 client/helpdata.c:1388
+#: client/helpdata.c:1068 client/helpdata.c:1396
msgid "?or:, "
msgstr " »ò "
-#: client/helpdata.c:1080
-#, 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"
+#: client/helpdata.c:1079
+#, fuzzy, c-format
+msgid "* Unit has to be in a city, or a base after %d turn.\n"
+msgid_plural "* Unit has to be in a city, or a base after %d turns.\n"
msgstr[0] "* %2$d ¸ö»ØºÏÖ®ºó²¿¶Ó±ØÐëÔÚ³ÇÊÐÖлòÕß%1$sÉÏ¡£\n"
-#: client/helpdata.c:1122
+#: client/helpdata.c:1087
+#, fuzzy, c-format
+msgid "* Unit has to be in a city, a base, or on a %s after %d turn.\n"
+msgid_plural "* Unit has to be in a city, a base, or on a %s after %d turns.\n"
+msgstr[0] "* %2$d ¸ö»ØºÏÖ®ºó²¿¶Ó±ØÐëÔÚ³ÇÊÐÖлòÕß%1$sÉÏ¡£\n"
+
+#: client/helpdata.c:1130
#, c-format
msgid "If we would now start with %s we would need %d bulbs."
msgstr "Èç¹ûÏÖÔÚ¿ªÊ¼Ñо¿ %s ÄÇô½«ÐèÒª %d µã¡£"
-#: client/helpdata.c:1127
+#: client/helpdata.c:1135
#, 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:1135
+#: client/helpdata.c:1143
msgid "You cannot research this technology."
msgstr "Äú²»ÄÜÑо¿ÕâÏî¿Æ¼¼¡£"
-#: client/helpdata.c:1139
+#: client/helpdata.c:1147
msgid " This number may vary depending on what other players will research.\n"
msgstr " ´ËÊý×Ö¿ÉÄÜÒòÆäËûÍæ¼ÒµÄÑо¿ÄÚÈݶø¸Ä±ä¡£\n"
-#: client/helpdata.c:1151
+#: client/helpdata.c:1159
#, c-format
msgid "* The first player to research %s gets an immediate advance.\n"
msgstr "* µÚÒ»¸öÑо¿ %s µÄÍæ¼Ò¿ÉÒÔÁ¢¿Ì»ñµÃÒ»Ïî½øÕ¹¡£\n"
-#: client/helpdata.c:1156
+#: client/helpdata.c:1164
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 25%%.\n"
msgstr "* ½µµÍÔÚÔ¶ÑóÖÐʧȥ´¬Ö»µÄ»ú»áµ½ 25%% ¡£\n"
-#: client/helpdata.c:1159
+#: client/helpdata.c:1167
#, c-format
msgid "* Reduces the chance of losing boats on the high seas to 12%%.\n"
msgstr "* ½µµÍÔÚÔ¶ÑóÖÐʧȥ´¬Ö»µÄ»ú»áµ½ 12%% ¡£\n"
-#: client/helpdata.c:1163
+#: client/helpdata.c:1171
msgid "* Increases the pollution generated by the population.\n"
msgstr "* Ôö¼ÓÓÉÈË¿ÚÌ«¶àÔì³ÉµÄÎÛȾ¡£\n"
-#: client/helpdata.c:1168
+#: client/helpdata.c:1176
#, c-format
msgid "* Allows %s to build roads on river squares.\n"
msgstr "* ʹ %s Äܹ»ÔÚºÓÁ÷ÉÏÐÞ½¨µÀ·¡£\n"
-#: client/helpdata.c:1175
+#: client/helpdata.c:1183
#, c-format
msgid "* Allows %s to build fortresses.\n"
msgstr "* ʹ %s Äܹ»½¨ÖþÒªÈû¡£\n"
-#: client/helpdata.c:1183
+#: client/helpdata.c:1191
#, c-format
msgid "* Allows %s to build airbases.\n"
msgstr "* ʹ %s Äܹ»½¨Öþ¿Õ¾ü»ùµØ¡£\n"
-#: client/helpdata.c:1192
+#: client/helpdata.c:1200
#, c-format
msgid "* Allows %s to upgrade roads to railroads.\n"
msgstr "* ʹ %s Äܹ»½«¹«Â·Éý¼¶ÎªÌú·¡£\n"
-#: client/helpdata.c:1200
+#: client/helpdata.c:1208
#, c-format
msgid "* Allows %s to upgrade irrigation to farmland.\n"
msgstr "* ʹ %s Äܹ»½«Ë®ÀûÉý¼¶ÎªÅ©³¡¡£\n"
-#: client/helpdata.c:1234
+#: client/helpdata.c:1242
msgid "* Pollution cannot be generated on this terrain."
msgstr "* ÔÚÕâÖÖµØÐÎÉϲ»»á²úÉúÎÛȾ¡£"
-#: client/helpdata.c:1239
+#: client/helpdata.c:1247
msgid "* You cannot build cities on this terrain."
msgstr "* Äú²»ÄÜÔڴ˵ØÐÎÉϽ¨Ôì³ÇÊС£"
-#: client/helpdata.c:1245
+#: client/helpdata.c:1253
msgid "* The coastline of this terrain is unsafe."
msgstr "* ÕâÖÖµØÐεĺ£°¶Ïß²»°²È«¡£"
-#: client/helpdata.c:1250
+#: client/helpdata.c:1258
msgid "* This terrain is unsafe for units to travel on."
msgstr "* ²¿¶ÓÔÚÕâÖÖµØÐÎÉÏ´©Ðв»°²È«¡£"
-#: client/helpdata.c:1255
+#: client/helpdata.c:1263
msgid "* Land units cannot travel on oceanic terrains."
msgstr "* ½µØ²¿¶Ó²»ÄÜÔÚº£ÑóµØÐÎÉÏ´©ÐС£"
-#: client/helpdata.c:1305
+#: client/helpdata.c:1313
msgid "Features:\n"
msgstr ""
#. TRANS: Empty output type list, should never happen.
-#: client/helpdata.c:1411 client/helpdata.c:1412
+#: client/helpdata.c:1419 client/helpdata.c:1420
msgid "?outputlist: Nothing "
msgstr ""
-#: client/helpdata.c:1419
+#: client/helpdata.c:1427
#, c-format
msgid ""
"* Military units away from home and field units will cause %d citizen to "
@@ -8306,7 +8446,7 @@ msgid_plural ""
"become unhappy.\n"
msgstr[0] ""
-#: client/helpdata.c:1429
+#: client/helpdata.c:1437
#, c-format
msgid ""
"* Each of your cities will avoid %d unhappiness that would otherwise be "
@@ -8314,48 +8454,48 @@ msgid ""
msgstr ""
#. TRANS: %s is the output type, like 'shield' or 'gold'.
-#: client/helpdata.c:1437
+#: client/helpdata.c:1445
#, c-format
msgid "* You pay %d times normal %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1442
+#: client/helpdata.c:1450
#, 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:1447
+#: client/helpdata.c:1455
#, c-format
msgid "* You pay no %s upkeep for your units.\n"
msgstr ""
-#: client/helpdata.c:1451
+#: client/helpdata.c:1459
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:1460
+#: client/helpdata.c:1468
#, 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:1468
+#: client/helpdata.c:1476
#, c-format
msgid "* Each of your cities will avoid paying %d towards unit upkeep.\n"
msgstr ""
-#: client/helpdata.c:1475
+#: client/helpdata.c:1483
#, 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:1482
+#: client/helpdata.c:1490
#, c-format
msgid ""
"* The first unhappy citizen in each city due to civilization size will "
@@ -8363,23 +8503,23 @@ msgid ""
msgstr ""
#. TRANS: %d should always be greater than 2.
-#: client/helpdata.c:1489
+#: client/helpdata.c:1497
#, 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:1497
+#: client/helpdata.c:1505
#, c-format
msgid "The maximum rate you can set for science, gold, or luxuries is %d%%.\n"
msgstr ""
-#: client/helpdata.c:1502
+#: client/helpdata.c:1510
msgid "Has unlimited science/gold/luxuries rates.\n"
msgstr ""
-#: client/helpdata.c:1507
+#: client/helpdata.c:1515
#, c-format
msgid ""
"* Your units may impose martial law. Each military unit inside a city will "
@@ -8389,67 +8529,67 @@ msgid_plural ""
"force %d unhappy citizens to become content.\n"
msgstr[0] ""
-#: client/helpdata.c:1519
+#: client/helpdata.c:1527
#, 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:1530
+#: client/helpdata.c:1538
#, 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:1536
+#: client/helpdata.c:1544
msgid "* Your units cannot be bribed.\n"
msgstr "* ÄúµÄ²¿¶Ó²»Äܱ»»ß¸¡£\n"
-#: client/helpdata.c:1539
+#: client/helpdata.c:1547
msgid "* Your cities cannot be incited.\n"
msgstr "* ÄúµÄ³ÇÊв»Äܱ»É¿¶¯¡£\n"
-#: client/helpdata.c:1543
+#: client/helpdata.c:1551
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:1549
+#: client/helpdata.c:1557
msgid "* Has a senate that may prevent declaration of war.\n"
msgstr "* ÓµÓÐÒ»¸ö¿ÉÄÜ»á×èÖ¹ÐûÕ½µÄÒé»á¡£\n"
-#: client/helpdata.c:1553
+#: client/helpdata.c:1561
msgid "* Allows partisans when cities are taken by the enemy.\n"
msgstr ""
-#: client/helpdata.c:1557
+#: client/helpdata.c:1565
msgid ""
"* Buildings that normally confer bonuses against unhappiness will instead "
"give gold.\n"
msgstr ""
-#: client/helpdata.c:1561
+#: client/helpdata.c:1569
msgid "* Pays no upkeep for fanatics.\n"
msgstr ""
-#: client/helpdata.c:1564
+#: client/helpdata.c:1572
msgid "* Has no unhappy citizens.\n"
msgstr "* ûÓÐÓÇÓôµÄÊÐÃñ¡£\n"
-#: client/helpdata.c:1574 client/helpdata.c:1578 client/helpdata.c:1582
+#: client/helpdata.c:1582 client/helpdata.c:1586 client/helpdata.c:1590
#, c-format
msgid "* Veteran %s units.\n"
msgstr "* ÀÏÁ· %s ²¿¶Ó.\n"
-#: client/helpdata.c:1585
+#: client/helpdata.c:1593
msgid "* Veteran units.\n"
msgstr "* ÀÏÁ·²¿¶Ó¡£\n"
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1591
+#: client/helpdata.c:1599
#, c-format
msgid ""
"* Each worked tile that gives more than %d %s will suffer a -1 penalty when "
@@ -8457,7 +8597,7 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1600
+#: client/helpdata.c:1608
#, c-format
msgid ""
"* Each worked tile with at least 1 %s will yield %d more of it when "
@@ -8465,72 +8605,72 @@ msgid ""
msgstr ""
#. TRANS: %s is list of output types, with 'or'
-#: client/helpdata.c:1608
+#: client/helpdata.c:1616
#, 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:1617
+#: client/helpdata.c:1625
#, 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:1625
+#: client/helpdata.c:1633
#, 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:1630
+#: client/helpdata.c:1638
#, 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:1635
+#: client/helpdata.c:1643
#, 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:1643
+#: client/helpdata.c:1651
#, 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:1649
+#: client/helpdata.c:1657
#, 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:1655
+#: client/helpdata.c:1663
#, c-format
msgid "* %s waste will increase slowly with distance from capital.\n"
msgstr "* %s ËðºÄ½«Ëæ×ÅÓëÊ׶¼¾àÀëµÄÔö´ó¶ø»ºÂýÔö¼Ó¡£\n"
-#: client/helpdata.c:1672
+#: client/helpdata.c:1680
#, c-format
msgid "* Allows you to build %s.\n"
msgstr "* ʹÄúÄܹ»ÐÞ½¨ %s ¡£\n"
#. TRANS: "2 Food" or ", 1 shield"
-#: client/helpdata.c:1699
+#: client/helpdata.c:1707
#, c-format
msgid "%s%d %s"
msgstr "%s%d %s"
-#: client/helpdata.c:1700 client/helpdata.c:1708 client/gui-sdl/mapview.c:810
+#: client/helpdata.c:1708 client/helpdata.c:1716 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:1707
+#: client/helpdata.c:1715
#, c-format
msgid "%s%d unhappy"
msgstr "%s%d ÓÇÓô"
@@ -8599,7 +8739,7 @@ msgid ""
"or with the -a command-line parameter."
msgstr ""
-#: client/options.c:129 client/gui-win32/connectdlg.c:914 data/Freeciv.in:107
+#: client/options.c:129 client/gui-win32/connectdlg.c:916 data/Freeciv.in:107
msgid "Metaserver"
msgstr "Ôª·þÎñÆ÷"
@@ -8953,36 +9093,36 @@ msgstr "
msgid "Saved settings to file %s"
msgstr "ÉèÖÃÒѱ£´æµ½Îļþ %s ÖÐ"
-#: client/packhand.c:211 client/packhand.c:217
+#: client/packhand.c:212 client/packhand.c:218
#, fuzzy
msgid "You were rejected from the game...."
msgstr "Äã±»ÓÎÏ·¾Ü¾ø£º"
-#: client/packhand.c:229
+#: client/packhand.c:230
#, c-format
msgid "Client capability string: %s"
msgstr "¿Í»§¶ËÄÜÁ¦´®£º %s"
-#: client/packhand.c:232
+#: client/packhand.c:233
#, c-format
msgid "Server capability string: %s"
msgstr "·þÎñÆ÷ÄÜÁ¦´®£º %s"
-#: client/packhand.c:850
+#: client/packhand.c:864
#, c-format
msgid "Start of turn %d"
msgstr "»ØºÏ %d ¿ªÊ¼"
-#: client/packhand.c:1591
+#: client/packhand.c:1621
#, c-format
msgid "AI Mode is now %s."
msgstr "µ±Ç°µÄ AI ģʽΪ %s¡£"
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "ON"
msgstr "¿ª"
-#: client/packhand.c:1592
+#: client/packhand.c:1622
msgid "OFF"
msgstr "¹Ø"
@@ -9013,15 +9153,15 @@ msgstr "
msgid "Username"
msgstr "̞"
-#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:651
-#: client/gui-gtk-2.0/pages.c:2157
+#: client/plrdlg_common.c:251 client/gui-gtk-2.0/dialogs.c:653
+#: client/gui-gtk-2.0/pages.c:1604 client/gui-gtk-2.0/pages.c:2159
msgid "Flag"
msgstr "¹úÆì"
-#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:655
-#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1605
-#: client/gui-gtk-2.0/pages.c:2159 client/gui-sdl/repodlgs.c:2063
-#: client/gui-win32/connectdlg.c:990 client/gui-win32/dialogs.c:542
+#: client/plrdlg_common.c:252 client/gui-gtk-2.0/dialogs.c:657
+#: client/gui-gtk-2.0/pages.c:953 client/gui-gtk-2.0/pages.c:1609
+#: client/gui-gtk-2.0/pages.c:2161 client/gui-sdl/repodlgs.c:2063
+#: client/gui-win32/connectdlg.c:992 client/gui-win32/dialogs.c:542
#: client/gui-win32/plrdlg.c:335
msgid "Nation"
msgstr "Ãñ×å"
@@ -9034,7 +9174,7 @@ msgstr "
msgid "Score"
msgstr "·ÖÊý"
-#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1611
+#: client/plrdlg_common.c:255 client/gui-gtk-2.0/pages.c:1614
msgid "Team"
msgstr "ÍŶÓ"
@@ -9067,36 +9207,36 @@ msgstr "
msgid "Ping"
msgstr "PingÖµ"
-#: client/repodlgs_common.c:375
+#: client/repodlgs_common.c:378
msgid "You cannot sell improvements."
msgstr "Äú²»ÄÜÂô³ö½¨Öþ¡£"
-#: client/repodlgs_common.c:391
+#: client/repodlgs_common.c:394
#, c-format
msgid "Sold %d %s for %d gold."
msgstr "ÒÔ %3$d »Æ½ðÂô³ö %1$d %2$s"
-#: client/repodlgs_common.c:396
+#: client/repodlgs_common.c:399
#, c-format
msgid "No %s could be sold."
msgstr "ûÓÐ %s Äܱ»³öÊÛ¡£"
#. TRANS: Obscure observer error.
-#: client/repodlgs_common.c:415
+#: client/repodlgs_common.c:418
msgid "You cannot disband units."
msgstr "Äú²»ÄܽâÉ¢²¿¶Ó¡£"
-#: client/repodlgs_common.c:420
+#: client/repodlgs_common.c:423
#, c-format
msgid "%s cannot be disbanded."
msgstr "%s ²»Äܱ»½âÉ¢¡£"
-#: client/repodlgs_common.c:441
+#: client/repodlgs_common.c:444
#, c-format
msgid "Disbanded %d %s."
msgstr "ÒѽâÉ¢ %d %s ¡£"
-#: client/repodlgs_common.c:445
+#: client/repodlgs_common.c:448
#, c-format
msgid "No %s could be disbanded."
msgstr "ûÓÐ %s Äܱ»½âÉ¢¡£"
@@ -9666,105 +9806,105 @@ msgstr "?dys/hrs:%02d
msgid "?duration:overflow"
msgstr "?duration:Òç³ö"
-#: client/text.c:1143
+#: client/text.c:1145
#, c-format
msgid "%6d.%02d ms"
msgstr "%6d.%02d ms"
#. TRANS: <nation adjective> <government name>.
#. * E.g. "Polish Republic".
-#: client/text.c:1188
+#: client/text.c:1193
#, fuzzy, c-format
msgid "?nationgovernment:%s %s"
msgstr "Õþ¸®£º%s"
#. TRANS: "Observer: 1985"
-#: client/text.c:1198
+#: client/text.c:1203
#, c-format
msgid "Observer: %s"
msgstr "ÅÔ¹ÛÕߣº%s"
-#: client/text.c:1216
+#: client/text.c:1221
msgid "Buildings: "
msgstr "½¨Öþ£º"
-#: client/text.c:1233 client/text.c:1272
+#: client/text.c:1238 client/text.c:1277
msgid "None. "
msgstr "ÎÞ¡£ "
-#: client/text.c:1235 client/text.c:1274
+#: client/text.c:1240 client/text.c:1279
msgid "?clistend:."
msgstr "?blistend:"
-#: client/text.c:1253
+#: client/text.c:1258
msgid "Wonders: "
msgstr "Ææ¼££º"
-#: client/text.c:1308
+#: client/text.c:1313
#, 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:1312
+#: client/text.c:1317
#, 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:1318
+#: client/text.c:1323
#, fuzzy, c-format
msgid "%d additional unhappy citizen."
msgid_plural "%d additional unhappy citizens."
msgstr[0] "½«³öÏÖ¶îÍâ %d ¸öÓÇÓôÊÐÃñ¡£"
-#: client/text.c:1339
+#: client/text.c:1344
#, fuzzy
msgid "Unlimited martial law in effect."
msgstr "¾üʹÜÖÆÖУ¨"
-#: client/text.c:1341
+#: client/text.c:1346
#, fuzzy, c-format
msgid "%d military unit may impose martial law."
msgid_plural "Up to %d military units may impose martial law."
msgstr[0] "* ·Ç¾üʲ¿¶Ó£¨²»Äܹ¥»÷£»ÎÞ¾üʹÜÖÆ£©¡£\n"
-#: client/text.c:1345
+#: client/text.c:1350
#, fuzzy, c-format
msgid "Each military unit makes %d unhappy citizen content."
msgid_plural "Each military unit makes %d unhappy citizens content."
msgstr[0] "Ϊ³ÇÊеÄÊÐÃñÌṩÓéÀÖ£¬Ê¹¸Ã³ÇÊÐÖÐÈý¸öÓÇÓôÊÐÃñ±äµÃÂú×ã¡£"
-#: client/text.c:1352
+#: client/text.c:1357
msgid "Military units in the field may cause unhappiness. "
msgstr "¾üʲ¿¶ÓÔÚÕâÀï¿ÉÄÜÒýÆðÓÇÓô¡£"
-#: client/text.c:1355
+#: client/text.c:1360
msgid "Military units have no happiness effect. "
msgstr "¾üʲ¿¶Ó¶Ô»¶ÀÖûÓÐÓ°Ïì¡£"
-#: client/text.c:1370
+#: client/text.c:1375
#, c-format
msgid "Luxury: %d total."
msgstr "ÓéÀÖ£º×ܹ² %d ¡£"
-#: client/tilespec.c:865
+#: client/tilespec.c:882
msgid "No usable default tileset found, aborting!"
msgstr "δÄÜÕÒµ½¿ÉÓõÄĬÈϵØͼ·ç¸ñ£¬ÕýÔÚÖÐÖ¹£¡"
-#: client/tilespec.c:1338
+#: client/tilespec.c:1355
msgid ""
"Client does not support isometric tilesets. Using default tileset instead."
msgstr "¿Í»§¶Ë²»Ö§³Ö isometric µØͼ·ç¸ñ¡£Ê¹ÓÃĬÈϵØͼ·ç¸ñ´úÌæ¡£"
-#: client/tilespec.c:1347
+#: client/tilespec.c:1364
msgid ""
"Client does not support overhead view tilesets. Using default tileset "
"instead."
msgstr "¿Í»§¶Ë²»Ö§³ÖÉÏ·½ÊӽǵĵØͼ·ç¸ñ¡£Ê¹ÓÃĬÈϵØͼ·ç¸ñ´úÌæ¡£"
-#: client/tilespec.c:3966
+#: client/tilespec.c:3987
#, c-format
msgid ""
"Paths longer than 99 turns are not supported.\n"
@@ -10451,7 +10591,7 @@ msgid "_Display"
msgstr "ÏÔʾ(_D)"
#: client/gui-gtk-2.0/cityrep.c:1006 client/gui-gtk-2.0/menu.c:839
-#: client/gui-sdl/diplodlg.c:691 client/gui-sdl/optiondlg.c:1800
+#: client/gui-sdl/diplodlg.c:692 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
#: client/gui-xaw/cityrep.c:533 client/gui-xaw/menu.c:156
@@ -10627,199 +10767,199 @@ msgstr "
msgid "Remove this preset?"
msgstr "ɾ³ý´ËÔ¤É裿"
-#: client/gui-gtk-2.0/dialogs.c:196 client/gui-gtk-2.0/messagewin.c:222
+#: client/gui-gtk-2.0/dialogs.c:197 client/gui-gtk-2.0/messagewin.c:222
#, fuzzy
msgid "Goto _Location"
msgstr "Ç°ÍùµØµã(_L)"
-#: client/gui-gtk-2.0/dialogs.c:201 client/gui-gtk-2.0/messagewin.c:226
+#: client/gui-gtk-2.0/dialogs.c:202 client/gui-gtk-2.0/messagewin.c:226
#, fuzzy
msgid "Inspect _City"
msgstr "µ¯³ö³ÇÊжԻ°¿ò(_C)"
-#: client/gui-gtk-2.0/dialogs.c:257 client/gui-sdl/dialogs.c:2085
+#: client/gui-gtk-2.0/dialogs.c:258 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:258 client/gui-sdl/dialogs.c:2104
+#: client/gui-gtk-2.0/dialogs.c:259 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:311 client/gui-sdl/dialogs.c:1742
+#: client/gui-gtk-2.0/dialogs.c:312 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:312 client/gui-win32/dialogs.c:1755
+#: client/gui-gtk-2.0/dialogs.c:313 client/gui-win32/dialogs.c:1755
#: data/Freeciv.in:2502
msgid "Select what to pillage:"
msgstr "ÇëÑ¡ÔñÂÓ¶áʲô£º"
-#: client/gui-gtk-2.0/dialogs.c:506
+#: client/gui-gtk-2.0/dialogs.c:507
msgid "Unit"
msgstr "²¿¶Ó"
-#: client/gui-gtk-2.0/dialogs.c:507 client/gui-gtk-2.0/pages.c:950
-#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2155
-#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:985
+#: client/gui-gtk-2.0/dialogs.c:508 client/gui-gtk-2.0/pages.c:950
+#: client/gui-gtk-2.0/pages.c:1579 client/gui-gtk-2.0/pages.c:2157
+#: client/gui-gtk-2.0/wldlg.c:1035 client/gui-win32/connectdlg.c:987
#: client/gui-win32/plrdlg.c:335 manual/civmanual.c:302 data/Freeciv.in:80
msgid "Name"
msgstr "Ãû³Æ"
-#: client/gui-gtk-2.0/dialogs.c:519 client/gui-sdl/dialogs.c:627
+#: client/gui-gtk-2.0/dialogs.c:520 client/gui-sdl/dialogs.c:627
msgid "Unit selection"
msgstr "²¿¶ÓÑ¡Ôñ"
-#: client/gui-gtk-2.0/dialogs.c:582
+#: client/gui-gtk-2.0/dialogs.c:583
msgid "_Ready all"
msgstr "È«²¿¾ÍÐ÷(_R)"
-#: client/gui-gtk-2.0/dialogs.c:590
+#: client/gui-gtk-2.0/dialogs.c:591
msgid "_Sentry idle"
msgstr "¿ÕÏв¿¶Ó·ÅÉÚ(_S)"
-#: client/gui-gtk-2.0/dialogs.c:719
+#: client/gui-gtk-2.0/dialogs.c:721
#, fuzzy
msgid "Nation _Groups:"
msgstr "Ãñ×å(_G)£º"
-#: client/gui-gtk-2.0/dialogs.c:764 data/Freeciv.in:3128
+#: client/gui-gtk-2.0/dialogs.c:766 data/Freeciv.in:3128
msgid "What Nation Will You Be?"
msgstr "ÄúÏë³ÉΪÄǸöÃñ×壿"
-#: client/gui-gtk-2.0/dialogs.c:766 client/gui-sdl/chatline.c:842
-#: client/gui-win32/connectdlg.c:1038 data/Freeciv.in:3371
+#: client/gui-gtk-2.0/dialogs.c:768 client/gui-sdl/chatline.c:842
+#: client/gui-win32/connectdlg.c:1040 data/Freeciv.in:3371
#, fuzzy
msgid "Pick Nation"
msgstr "¾¯²ì¾Ö"
-#: client/gui-gtk-2.0/dialogs.c:774
+#: client/gui-gtk-2.0/dialogs.c:776
#, fuzzy
msgid "_Random Nation"
msgstr "Ëæ»úÃñ×å (_R)"
-#: client/gui-gtk-2.0/dialogs.c:786 client/gui-win32/dialogs.c:517
+#: client/gui-gtk-2.0/dialogs.c:792 client/gui-win32/dialogs.c:517
msgid "Select a nation"
msgstr "ÇëÑ¡ÔñÃñ×å"
-#: client/gui-gtk-2.0/dialogs.c:804
+#: client/gui-gtk-2.0/dialogs.c:810
msgid "_Properties"
msgstr "ÊôÐÔ(_P)"
-#: client/gui-gtk-2.0/dialogs.c:824
+#: client/gui-gtk-2.0/dialogs.c:830
msgid "_Leader:"
msgstr "Áìµ¼Õß(_L)£º"
-#: client/gui-gtk-2.0/dialogs.c:831
+#: client/gui-gtk-2.0/dialogs.c:837
msgid "_Female"
msgstr "Å®(_F)"
-#: client/gui-gtk-2.0/dialogs.c:836
+#: client/gui-gtk-2.0/dialogs.c:842
msgid "_Male"
msgstr "ÄÐ(_M)"
-#: client/gui-gtk-2.0/dialogs.c:863
+#: client/gui-gtk-2.0/dialogs.c:869
#, fuzzy
msgid "City _Styles:"
msgstr "³ÇÊзç¸ñ(_S)£º"
-#: client/gui-gtk-2.0/dialogs.c:902
+#: client/gui-gtk-2.0/dialogs.c:908
#, fuzzy
msgid "_Description"
msgstr "ÀúÊ·(_D)"
-#: client/gui-gtk-2.0/dialogs.c:1248 client/gui-xaw/dialogs.c:1480
+#: client/gui-gtk-2.0/dialogs.c:1263 client/gui-xaw/dialogs.c:1480
msgid "You must select your sex."
msgstr "Äú±ØÐëÑ¡ÔñÄúµÄÐÔ±ð¡£"
-#: client/gui-gtk-2.0/dialogs.c:1253 client/gui-xaw/dialogs.c:1485
+#: client/gui-gtk-2.0/dialogs.c:1268 client/gui-xaw/dialogs.c:1485
msgid "You must select your city style."
msgstr "Äú±ØÐëÑ¡ÔñÄúµÄ³ÇÊзç¸ñ¡£"
-#: client/gui-gtk-2.0/dialogs.c:1262 client/gui-sdl/dialogs.c:2203
+#: client/gui-gtk-2.0/dialogs.c:1277 client/gui-sdl/dialogs.c:2204
#: 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:1306 client/gui-win32/citydlg.c:1454
+#: client/gui-gtk-2.0/dialogs.c:1318 client/gui-win32/citydlg.c:1454
#: data/Freeciv.in:2484
msgid "Upgrade Unit!"
msgstr "Éý¼¶²¿¶Ó£¡"
-#: client/gui-gtk-2.0/dialogs.c:1315 client/gui-gtk-2.0/repodlgs.c:1164
+#: client/gui-gtk-2.0/dialogs.c:1327 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 "Éý¼¶³Â¾ÉµÄ²¿¶Ó"
-#: client/gui-gtk-2.0/diplodlg.c:231 client/gui-win32/diplodlg.c:151
+#: client/gui-gtk-2.0/diplodlg.c:222 client/gui-win32/diplodlg.c:151
#: client/gui-xaw/diplodlg.c:383 client/gui-xaw/diplodlg.c:401
msgid "World-map"
msgstr "ÊÀ½çµØͼ"
-#: client/gui-gtk-2.0/diplodlg.c:237 client/gui-win32/diplodlg.c:146
+#: client/gui-gtk-2.0/diplodlg.c:228 client/gui-win32/diplodlg.c:146
#: client/gui-xaw/diplodlg.c:387 client/gui-xaw/diplodlg.c:405
msgid "Sea-map"
msgstr "º£ÑóµØͼ"
-#: client/gui-gtk-2.0/diplodlg.c:243
+#: client/gui-gtk-2.0/diplodlg.c:234
msgid "_Maps"
msgstr "µØͼ(_M)"
-#: client/gui-gtk-2.0/diplodlg.c:274
+#: client/gui-gtk-2.0/diplodlg.c:265
msgid "_Advances"
msgstr "¿Æ¼¼½øÕ¹(_A)"
-#: client/gui-gtk-2.0/diplodlg.c:324 client/gui-gtk-2.0/menu.c:953
+#: client/gui-gtk-2.0/diplodlg.c:315 client/gui-gtk-2.0/menu.c:953
#: client/gui-win32/menu.c:399
msgid "_Cities"
msgstr "³ÇÊÐ(_C)"
-#: client/gui-gtk-2.0/diplodlg.c:333
+#: client/gui-gtk-2.0/diplodlg.c:324
msgid "_Give shared vision"
msgstr "Ìṩ¹²ÏíÊÓÒ°(_G)"
-#: client/gui-gtk-2.0/diplodlg.c:346
+#: client/gui-gtk-2.0/diplodlg.c:337
msgid "Give _embassy"
msgstr "Ìṩʹ¹Ý(_E)"
-#: client/gui-gtk-2.0/diplodlg.c:376
+#: client/gui-gtk-2.0/diplodlg.c:368
msgid "_Pacts"
msgstr "ж¨(_P)"
-#: client/gui-gtk-2.0/diplodlg.c:466
+#: client/gui-gtk-2.0/diplodlg.c:458
#, c-format
msgid "Diplomacy: %s"
msgstr "Íâ½»£º%s"
-#: client/gui-gtk-2.0/diplodlg.c:473
+#: client/gui-gtk-2.0/diplodlg.c:465
msgid "_Cancel meeting"
msgstr "È¡Ïû»áÎî(_C)"
-#: client/gui-gtk-2.0/diplodlg.c:475
+#: client/gui-gtk-2.0/diplodlg.c:467
msgid "Accept _treaty"
msgstr "½ÓÊÜж¨(_T)"
-#: client/gui-gtk-2.0/diplodlg.c:503
+#: client/gui-gtk-2.0/diplodlg.c:495
msgid "C_lauses:"
msgstr "Ìõ¿î(_L)£º"
-#: client/gui-gtk-2.0/diplodlg.c:568 client/gui-gtk-2.0/diplodlg.c:642
+#: client/gui-gtk-2.0/diplodlg.c:560 client/gui-gtk-2.0/diplodlg.c:634
msgid "_Gold:"
msgstr "»Æ½ð(_G)£º"
-#: client/gui-gtk-2.0/diplodlg.c:580 client/gui-gtk-2.0/diplodlg.c:654
+#: client/gui-gtk-2.0/diplodlg.c:572 client/gui-gtk-2.0/diplodlg.c:646
msgid "_Add Clause..."
msgstr "Ìí¼ÓÌõ¿î(_A)¡"
-#: client/gui-gtk-2.0/diplodlg.c:699
+#: client/gui-gtk-2.0/diplodlg.c:691
msgid "--- This treaty is blank. Please add some clauses. ---"
msgstr ""
-#: client/gui-gtk-2.0/diplodlg.c:905 client/gui-sdl/diplodlg.c:375
+#: client/gui-gtk-2.0/diplodlg.c:897 client/gui-sdl/diplodlg.c:375
#: client/gui-win32/diplodlg.c:263 client/gui-xaw/diplodlg.c:949
#, fuzzy
msgid "Invalid amount of gold specified."
@@ -10879,99 +11019,99 @@ msgstr "
msgid "Show _All Cities"
msgstr "ÏÔʾËùÓгÇÊÐ(_A)"
-#: client/gui-gtk-2.0/gui_main.c:162
+#: client/gui-gtk-2.0/gui_main.c:164
msgid "Show Map Scrollbars"
msgstr "ÏÔʾµØͼ¹ö¶¯Ìõ"
-#: client/gui-gtk-2.0/gui_main.c:163
+#: client/gui-gtk-2.0/gui_main.c:165
msgid "Disable this option to hide the scrollbars on the map view."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:167
+#: client/gui-gtk-2.0/gui_main.c:169
msgid "Keyboardless goto"
msgstr "ÓÃÊó±êÖ´ÐС°Ç°Íù¡±"
-#: client/gui-gtk-2.0/gui_main.c:168
+#: client/gui-gtk-2.0/gui_main.c:170
msgid ""
"If this option is set then a goto may be initiated by left-clicking and then "
"holding down the mouse button while dragging the mouse onto a different tile."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:173
+#: client/gui-gtk-2.0/gui_main.c:175
msgid "Keep dialogs on top"
msgstr "¶Ô»°¿ò±£³ÖÔÚ¶¥¶Ë"
-#: client/gui-gtk-2.0/gui_main.c:174
+#: client/gui-gtk-2.0/gui_main.c:176
msgid ""
"If this option is set then dialog windows will always remain in front of the "
"main Freeciv window. Disabling this has no effect in fullscreen mode."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:178
+#: client/gui-gtk-2.0/gui_main.c:180
msgid "Show worklist task icons"
msgstr "ÔÚ¹¤×÷ÁбíÖÐÏÔʾÈÎÎñͼ±ê"
-#: client/gui-gtk-2.0/gui_main.c:179
+#: client/gui-gtk-2.0/gui_main.c:181
msgid ""
"Disabling this will turn off the unit and building icons in the worklist "
"dialog and the production tab of the city dialog."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:183
+#: client/gui-gtk-2.0/gui_main.c:185
msgid "Enable status report tabs"
msgstr "ÔÊÐí״̬±¨¸æ·ÖÒ³"
-#: client/gui-gtk-2.0/gui_main.c:184
+#: client/gui-gtk-2.0/gui_main.c:186
msgid ""
"If this option is enabled then report dialogs will be shown as separate tabs "
"rather than in popup dialogs."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:189 client/gui-win32/gui_main.c:110
+#: client/gui-gtk-2.0/gui_main.c:191 client/gui-win32/gui_main.c:110
msgid "Better fog-of-war drawing"
msgstr "¸üºÃµÄÕ½Îí»æ»"
-#: client/gui-gtk-2.0/gui_main.c:190 client/gui-win32/gui_main.c:111
+#: client/gui-gtk-2.0/gui_main.c:192 client/gui-win32/gui_main.c:111
msgid ""
"If this is enabled then a better method is used for drawing fog-of-war. It "
"is not any slower but will consume about twice as much memory."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:195
+#: client/gui-gtk-2.0/gui_main.c:197
msgid "Show time for each chat message"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:196
+#: client/gui-gtk-2.0/gui_main.c:198
msgid ""
"If this option is enabled then all chat messages will be prefixed by a time "
"string of the form [hour:minute:second]."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:201
+#: client/gui-gtk-2.0/gui_main.c:203
msgid "Split bottom notebook area"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:202
+#: client/gui-gtk-2.0/gui_main.c:204
msgid ""
"Enabling this option will split the bottom notebook into a left and right "
"notebook so that two tabs may be viewed at once."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:207
+#: client/gui-gtk-2.0/gui_main.c:209
msgid "New message events go to top of list"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:208
+#: client/gui-gtk-2.0/gui_main.c:210
msgid ""
"If this option is enabled, new events in the message window will appear at "
"the top of the list, rather than being appended at the bottom."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:213
+#: client/gui-gtk-2.0/gui_main.c:215
msgid "Show extra message window buttons"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:214
+#: client/gui-gtk-2.0/gui_main.c:216
msgid ""
"If this option is enabled, there will be two buttons displayed in the "
"message window for inspecting a city and going to a location. If this option "
@@ -10981,22 +11121,22 @@ msgid ""
"closed and reopened."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:224
+#: client/gui-gtk-2.0/gui_main.c:226
#, fuzzy
msgid "Metaserver tab first in network page"
msgstr "Ôª·þÎñÆ÷±êÌâ×Ö·û´®ÉèÖÃΪ¡°%s¡±¡£"
-#: client/gui-gtk-2.0/gui_main.c:225
+#: client/gui-gtk-2.0/gui_main.c:227
msgid ""
"If this option is enabled, the metaserver tab will be the first notebook tab "
"in the network page. This option requires a restart in order to take effect."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:230
+#: client/gui-gtk-2.0/gui_main.c:232
msgid "Plain chat messages are sent to allies only"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:231
+#: client/gui-gtk-2.0/gui_main.c:233
msgid ""
"If this option is enabled, then plain messages typed into the chat entry "
"while the game is running will only be sent to your allies. Otherwise plain "
@@ -11006,28 +11146,41 @@ msgid ""
"visible in multiplayer games)."
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:340 client/gui-xaw/gui_main.c:245
+#: client/gui-gtk-2.0/gui_main.c:245
+msgid "Arrange widgets for small displays"
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:246
+msgid ""
+"If this option is enabled, widgets in the main window will be arrange so "
+"that they take up the least amount of total screen space. Specifically, the "
+"left panel containing the overview, player status, and the unit information "
+"box will be extended over the entire left side of the window. This option "
+"requires a restart in order to take effect."
+msgstr ""
+
+#: client/gui-gtk-2.0/gui_main.c:352 client/gui-xaw/gui_main.c:245
msgid ""
"This client has no special command line options\n"
"\n"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:835 client/gui-gtk-2.0/gui_main.c:1508
+#: client/gui-gtk-2.0/gui_main.c:847 client/gui-gtk-2.0/gui_main.c:1542
msgid "Freeciv"
msgstr "Freeciv"
-#: client/gui-gtk-2.0/gui_main.c:1225 client/gui-gtk-2.0/gui_main.c:1232
+#: client/gui-gtk-2.0/gui_main.c:1251 client/gui-gtk-2.0/gui_main.c:1258
#: client/gui-sdl/mapctrl.c:1566 client/gui-win32/gui_main.c:482
#: data/Freeciv.in:2618
msgid "Turn Done"
msgstr "»ØºÏ½áÊø"
-#: client/gui-gtk-2.0/gui_main.c:1232 client/gui-sdl/mapctrl.c:1566
+#: client/gui-gtk-2.0/gui_main.c:1258 client/gui-sdl/mapctrl.c:1566
#: client/gui-sdl/mapview.c:1082
msgid "Shift+Return"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1266 client/gui-gtk-2.0/menu.c:797
+#: client/gui-gtk-2.0/gui_main.c:1299 client/gui-gtk-2.0/menu.c:797
#: client/gui-gtk-2.0/menu.c:799 client/gui-gtk-2.0/menu.c:801
#: client/gui-gtk-2.0/menu.c:803 client/gui-gtk-2.0/menu.c:805
#: client/gui-gtk-2.0/menu.c:807 client/gui-gtk-2.0/menu.c:809
@@ -11046,11 +11199,11 @@ msgstr ""
msgid "View"
msgstr "²é¿´"
-#: client/gui-gtk-2.0/gui_main.c:1359
+#: client/gui-gtk-2.0/gui_main.c:1393
msgid "Chat"
msgstr "ÁÄÌì"
-#: client/gui-gtk-2.0/gui_main.c:1377 client/gui-win32/gui_main.c:538
+#: client/gui-gtk-2.0/gui_main.c:1411 client/gui-win32/gui_main.c:538
#: data/Freeciv.in:2809
msgid ""
"Freeciv is free software and you are welcome to distribute copies of it\n"
@@ -11061,80 +11214,80 @@ msgstr ""
"¡°°ïÖú¡±²Ëµ¥µÄ¡°°æȨ¡±Ïî¡£\n"
"ºÃÁË£¬ÏÖÔÚ¡¡ÈÃËûÃÇÈ¥ËÀ°É£¡"
-#: client/gui-gtk-2.0/gui_main.c:1392
+#: client/gui-gtk-2.0/gui_main.c:1426
msgid "Allies Only"
msgstr ""
-#: client/gui-gtk-2.0/gui_main.c:1657
+#: client/gui-gtk-2.0/gui_main.c:1691
msgid "Not _ready"
msgstr "δ¾ÍÐ÷(_r)"
-#: client/gui-gtk-2.0/gui_main.c:1668 client/gui-gtk-2.0/pages.c:1677
+#: client/gui-gtk-2.0/gui_main.c:1702 client/gui-gtk-2.0/pages.c:1679
msgid "_Ready"
msgstr "¾ÍÐ÷(_R)"
-#: client/gui-gtk-2.0/gui_main.c:1672 client/gui-gtk-2.0/gui_main.c:1678
-#: client/gui-gtk-2.0/pages.c:2204
+#: client/gui-gtk-2.0/gui_main.c:1706 client/gui-gtk-2.0/gui_main.c:1712
+#: client/gui-gtk-2.0/pages.c:2206
msgid "_Start"
msgstr "¿ªÊ¼(_S)"
-#: client/gui-gtk-2.0/gui_main.c:1686
+#: client/gui-gtk-2.0/gui_main.c:1720
#, fuzzy
msgid "_Take Player"
msgstr "È¡´ú´ËÍæ¼Ò"
-#: client/gui-gtk-2.0/gui_main.c:1689 client/gui-gtk-2.0/pages.c:1667
+#: client/gui-gtk-2.0/gui_main.c:1723 client/gui-gtk-2.0/pages.c:1669
msgid "Pick _Nation"
msgstr "Ñ¡ÔñÃñ×壨_N£©"
-#: client/gui-gtk-2.0/gui_main.c:1696 client/gui-gtk-2.0/pages.c:1672
+#: client/gui-gtk-2.0/gui_main.c:1730 client/gui-gtk-2.0/pages.c:1674
msgid "_Observe"
msgstr "ÅÔ¹Û(_O)"
-#: client/gui-gtk-2.0/gui_main.c:1698
+#: client/gui-gtk-2.0/gui_main.c:1732
#, fuzzy
msgid "Do not _observe"
msgstr "ÏÖÔÚÅÔ¹Û(_O)"
-#: client/gui-gtk-2.0/gui_main.c:1720 client/gui-xaw/pages.c:211
+#: client/gui-gtk-2.0/gui_main.c:1755 client/gui-xaw/pages.c:211
msgid "<AI>"
msgstr "<AI>"
-#: client/gui-gtk-2.0/gui_main.c:1723
+#: client/gui-gtk-2.0/gui_main.c:1758
msgid "<Novice AI>"
msgstr "<¼«Ò× AI>"
-#: client/gui-gtk-2.0/gui_main.c:1726
+#: client/gui-gtk-2.0/gui_main.c:1761
msgid "<Easy AI>"
msgstr "<ÈÝÒ× AI>"
-#: client/gui-gtk-2.0/gui_main.c:1729
+#: client/gui-gtk-2.0/gui_main.c:1764
msgid "<Normal AI>"
msgstr "<ÆÕͨ AI>"
-#: client/gui-gtk-2.0/gui_main.c:1732
+#: client/gui-gtk-2.0/gui_main.c:1767
msgid "<Hard AI>"
msgstr "<À§ÄÑ AI>"
-#: client/gui-gtk-2.0/gui_main.c:1742 client/gui-win32/dialogs.c:594
+#: client/gui-gtk-2.0/gui_main.c:1777 client/gui-win32/dialogs.c:594
#: client/gui-xaw/pages.c:217
msgid "Random"
msgstr "Ëæ»ú"
-#: client/gui-gtk-2.0/gui_main.c:1808
+#: client/gui-gtk-2.0/gui_main.c:1844 client/gui-gtk-2.0/gui_main.c:1858
msgid "Observer"
msgstr "ÅÔ¹ÛÕß"
-#: client/gui-gtk-2.0/gui_main.c:1808
+#: client/gui-gtk-2.0/gui_main.c:1858
#, fuzzy
msgid "Detached"
msgstr "ËÀµÄ"
-#: client/gui-gtk-2.0/gui_main.c:2073
+#: client/gui-gtk-2.0/gui_main.c:2117
msgid "Are you sure you want to quit?"
msgstr "È·ÈÏÏëÍ˳ö£¿"
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
#, c-format
msgid ""
"Close Tab:\n"
@@ -11143,7 +11296,7 @@ msgstr ""
"¹Ø±Õ·ÖÒ³£º\n"
"%s"
-#: client/gui-gtk-2.0/gui_stuff.c:577
+#: client/gui-gtk-2.0/gui_stuff.c:581
msgid "Ctrl+W"
msgstr ""
@@ -11248,8 +11401,8 @@ msgid "Trans. Rslt/Time:"
msgstr "¸ÄÔì ½á¹û/ʱ¼ä£º"
#: 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
-#: client/gui-win32/helpdlg.c:709 client/gui-win32/helpdlg.c:733
+#: client/gui-win32/helpdlg.c:502 client/gui-win32/helpdlg.c:550
+#: client/gui-win32/helpdlg.c:715 client/gui-win32/helpdlg.c:739
#: client/gui-xaw/helpdlg.c:759 client/gui-xaw/helpdlg.c:808
#: client/gui-xaw/helpdlg.c:816 client/gui-xaw/helpdlg.c:853
#: client/gui-xaw/helpdlg.c:878
@@ -11296,34 +11449,34 @@ msgstr "
msgid "?techhelp:"
msgstr "?techhelp:"
-#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:591
+#: client/gui-gtk-2.0/helpdlg.c:1060 client/gui-win32/helpdlg.c:597
#: client/gui-xaw/helpdlg.c:996
#, c-format
msgid "+%d Trade / %d"
msgstr "+%d óÒ× / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:595
+#: client/gui-gtk-2.0/helpdlg.c:1064 client/gui-win32/helpdlg.c:601
#: client/gui-xaw/helpdlg.c:1000
#, c-format
msgid "no extra / %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
-#: client/gui-win32/helpdlg.c:602 client/gui-win32/helpdlg.c:616
-#: client/gui-win32/helpdlg.c:635 client/gui-xaw/helpdlg.c:1002
+#: client/gui-gtk-2.0/helpdlg.c:1085 client/gui-win32/helpdlg.c:604
+#: client/gui-win32/helpdlg.c:608 client/gui-win32/helpdlg.c:622
+#: client/gui-win32/helpdlg.c:641 client/gui-xaw/helpdlg.c:1002
#: client/gui-xaw/helpdlg.c:1006 client/gui-xaw/helpdlg.c:1020
#: client/gui-xaw/helpdlg.c:1039
msgid "n/a"
msgstr "ÎÞ"
-#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:605
+#: client/gui-gtk-2.0/helpdlg.c:1074 client/gui-win32/helpdlg.c:611
#: client/gui-xaw/helpdlg.c:1009
#, c-format
msgid "+%d Food / %d"
msgstr "+%d ʳÎï / %d"
-#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:619
+#: client/gui-gtk-2.0/helpdlg.c:1088 client/gui-win32/helpdlg.c:625
#: client/gui-xaw/helpdlg.c:1023
#, c-format
msgid "+%d Res. / %d"
@@ -12093,41 +12246,41 @@ msgstr "
msgid "Connect to Gaming _Zone"
msgstr "Á¬½Óµ½ÍøÂçÓÎÏ·"
-#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:300
+#: client/gui-gtk-2.0/pages.c:624 client/gui-win32/connectdlg.c:302
#: client/gui-xaw/connectdlg.c:326
msgid "Passwords don't match, enter password."
msgstr "¿ÚÁî²»ÕýÈ·£¬ÇåÊäÈë¿ÚÁî¡£"
#: client/gui-gtk-2.0/pages.c:779 client/gui-gtk-2.0/pages.c:820
-#: client/gui-win32/connectdlg.c:916
+#: client/gui-win32/connectdlg.c:918
msgid "Server Name"
msgstr "·þÎñÆ÷Ãû³Æ"
#: client/gui-gtk-2.0/pages.c:780 client/gui-gtk-2.0/pages.c:821
-#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:916
+#: client/gui-sdl/mapview.c:814 client/gui-win32/connectdlg.c:918
#: data/Freeciv.in:96
msgid "Port"
msgstr "¶Ë¿Ú"
#: client/gui-gtk-2.0/pages.c:781 client/gui-gtk-2.0/pages.c:822
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Version"
msgstr "°æ±¾"
#: client/gui-gtk-2.0/pages.c:782 client/gui-gtk-2.0/pages.c:823
-#: client/gui-gtk-2.0/pages.c:2161 client/gui-win32/connectdlg.c:917
-#: client/gui-win32/connectdlg.c:995
+#: client/gui-gtk-2.0/pages.c:2163 client/gui-win32/connectdlg.c:919
+#: client/gui-win32/connectdlg.c:997
msgid "Status"
msgstr "״̬"
#: client/gui-gtk-2.0/pages.c:783 client/gui-gtk-2.0/pages.c:824
#: client/gui-sdl/connectdlg.c:318 client/gui-sdl/plrdlg.c:330
-#: client/gui-win32/connectdlg.c:917
+#: client/gui-win32/connectdlg.c:919
msgid "Players"
msgstr "Íæ¼Ò"
#: client/gui-gtk-2.0/pages.c:784 client/gui-gtk-2.0/pages.c:825
-#: client/gui-win32/connectdlg.c:918
+#: client/gui-win32/connectdlg.c:920
msgid "Comment"
msgstr "˵Ã÷"
@@ -12159,9 +12312,9 @@ msgstr "
msgid "Conf_irm Password:"
msgstr "È·ÈÏ¿ÚÁî(_I)£º"
-#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2163
+#: client/gui-gtk-2.0/pages.c:951 client/gui-gtk-2.0/pages.c:2165
#: 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:1000
+#: client/gui-win32/citydlg.c:1083 client/gui-win32/connectdlg.c:1002
#: client/gui-win32/wldlg.c:800 client/gui-win32/wldlg.c:806
msgid "Type"
msgstr "ÀàÐÍ"
@@ -12256,7 +12409,7 @@ msgstr "AI
msgid "Ruleset _Version:"
msgstr "¹æÔò¼¯£¨(_V)£º"
-#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2193
+#: client/gui-gtk-2.0/pages.c:1558 client/gui-gtk-2.0/pages.c:2195
msgid "_More Game Options..."
msgstr "¸ü¶àÓÎÏ·Ñ¡Ïî(_M)..."
@@ -12274,49 +12427,49 @@ msgstr "ɳ
msgid "Ready"
msgstr "¾ÍÐ÷"
-#: client/gui-gtk-2.0/pages.c:1601
+#: client/gui-gtk-2.0/pages.c:1600
#, fuzzy
msgid "?player:Leader"
msgstr "Ãû×Ö"
-#: client/gui-gtk-2.0/pages.c:1732 client/gui-sdl/chatline.c:185
+#: client/gui-gtk-2.0/pages.c:1734 client/gui-sdl/chatline.c:185
msgid "Choose Saved Game to Load"
msgstr "ÇëÑ¡ÔñÒªÔØÈëµÄ´æÅÌÓÎÏ·Îļþ"
-#: client/gui-gtk-2.0/pages.c:1824
+#: client/gui-gtk-2.0/pages.c:1826
msgid "Choose Saved Game to _Load:"
msgstr "ÇëÑ¡ÔñÒªÔØÈëµÄ´æÅÌÓÎÏ·Îļþ(_L)£º"
-#: client/gui-gtk-2.0/pages.c:1844 client/gui-gtk-2.0/pages.c:2037
-#: client/gui-gtk-2.0/pages.c:2451
+#: client/gui-gtk-2.0/pages.c:1846 client/gui-gtk-2.0/pages.c:2039
+#: client/gui-gtk-2.0/pages.c:2455
msgid "_Browse..."
msgstr "ä¯ÀÀ(_B)..."
-#: client/gui-gtk-2.0/pages.c:1911
+#: client/gui-gtk-2.0/pages.c:1913
msgid "Choose a Scenario"
msgstr "ÇëÑ¡Ôñ¾çÇé"
-#: client/gui-gtk-2.0/pages.c:1998
+#: client/gui-gtk-2.0/pages.c:2000
msgid "Choose a _Scenario:"
msgstr "ÇëÑ¡Ôñ¾çÇé(_S)£º"
-#: client/gui-gtk-2.0/pages.c:2173
+#: client/gui-gtk-2.0/pages.c:2175
msgid "Choose a _nation to play:"
msgstr "ÇëÑ¡ÔñÄúÒªÍæµÄÃñ×壺"
-#: client/gui-gtk-2.0/pages.c:2363 client/gui-win32/menu.c:581
+#: client/gui-gtk-2.0/pages.c:2367 client/gui-win32/menu.c:581
msgid "Select Location to Save"
msgstr "Ñ¡ÔñÒª±£´æµ½µÄλÖÃ"
-#: client/gui-gtk-2.0/pages.c:2448 client/gui-sdl/optiondlg.c:2273
+#: client/gui-gtk-2.0/pages.c:2452 client/gui-sdl/optiondlg.c:2273
msgid "Save Game"
msgstr "±£´æÓÎÏ·"
-#: client/gui-gtk-2.0/pages.c:2489
+#: client/gui-gtk-2.0/pages.c:2493
msgid "Saved _Games:"
msgstr "´æÅÌÓÎÏ·(_G)£º"
-#: client/gui-gtk-2.0/pages.c:2516
+#: client/gui-gtk-2.0/pages.c:2520
msgid "Save _Filename:"
msgstr "´æÅÌÎļþÃû(_F)£º"
@@ -12669,7 +12822,7 @@ msgstr "
msgid "Total users logged in : %d"
msgstr ""
-#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1096
+#: client/gui-sdl/chatline.c:821 client/gui-win32/connectdlg.c:1098
msgid "Back"
msgstr "ºóÍË"
@@ -12679,7 +12832,7 @@ msgid "Start"
msgstr "¿ªÊ¼(_S)"
#: client/gui-sdl/chatline.c:853 client/gui-sdl/pages.c:185
-#: client/gui-win32/connectdlg.c:777
+#: client/gui-win32/connectdlg.c:779
msgid "Load Game"
msgstr "×°ÈëÓÎÏ·"
@@ -12721,9 +12874,9 @@ msgstr "
#: client/gui-sdl/connectdlg.c:308 client/gui-sdl/connectdlg.c:617
#: client/gui-sdl/connectdlg.c:803 client/gui-sdl/connectdlg.c:985
#: client/gui-sdl/dialogs.c:452 client/gui-sdl/dialogs.c:2095
-#: client/gui-sdl/dialogs.c:2893 client/gui-sdl/diplomat_dialog.c:731
+#: client/gui-sdl/dialogs.c:2902 client/gui-sdl/diplomat_dialog.c:731
#: client/gui-sdl/mapctrl.c:2585 client/gui-win32/citydlg.c:1075
-#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1041
+#: client/gui-win32/cityrep.c:753 client/gui-win32/connectdlg.c:1043
#: client/gui-win32/dialogs.c:1772 client/gui-win32/finddlg.c:127
#: client/gui-win32/gotodlg.c:171 client/gui-win32/inputdlg.c:146
#: client/gui-win32/messagedlg.c:216 client/gui-win32/ratesdlg.c:328
@@ -12768,7 +12921,7 @@ msgid "Buy it?"
msgstr "ÂòÏÂËü£¡"
#: 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
+#: client/gui-sdl/diplodlg.c:1336 client/gui-sdl/diplomat_dialog.c:1211
#: client/gui-sdl/diplomat_dialog.c:1417 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:221 client/gui-sdl/repodlgs.c:1559
#: client/gui-win32/repodlgs.c:580 client/gui-xaw/citydlg.c:2431
@@ -12784,7 +12937,7 @@ msgid "No"
msgstr "·ñ"
#: client/gui-sdl/citydlg.c:1215 client/gui-sdl/cma_fe.c:318
-#: client/gui-sdl/diplodlg.c:1345 client/gui-sdl/diplomat_dialog.c:1200
+#: client/gui-sdl/diplodlg.c:1346 client/gui-sdl/diplomat_dialog.c:1200
#: client/gui-sdl/diplomat_dialog.c:1407 client/gui-sdl/plrdlg.c:222
#: client/gui-sdl/repodlgs.c:232 client/gui-win32/repodlgs.c:578
#: client/gui-xaw/citydlg.c:2431 client/gui-xaw/cityrep.c:666
@@ -13115,7 +13268,7 @@ msgstr "Freeciv
msgid "Port :"
msgstr "״̬£º"
-#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1098
+#: client/gui-sdl/connectdlg.c:609 client/gui-win32/connectdlg.c:1100
#: client/gui-win32/menu.c:379 data/Freeciv.in:104 data/Freeciv.in:2510
msgid "Connect"
msgstr "Á¬½Ó"
@@ -13233,23 +13386,23 @@ msgstr "
msgid "REVOLUTION!"
msgstr "¸ïÃü¡"
-#: client/gui-sdl/dialogs.c:2232 client/gui-sdl/dialogs.c:2620
+#: client/gui-sdl/dialogs.c:2237 client/gui-sdl/dialogs.c:2625
#: client/gui-win32/dialogs.c:567 data/Freeciv.in:3159
msgid "Female"
msgstr "Å®"
-#: client/gui-sdl/dialogs.c:2234 client/gui-sdl/dialogs.c:2618
-#: client/gui-sdl/dialogs.c:2830 client/gui-win32/dialogs.c:565
+#: client/gui-sdl/dialogs.c:2239 client/gui-sdl/dialogs.c:2623
+#: client/gui-sdl/dialogs.c:2839 client/gui-win32/dialogs.c:565
msgid "Male"
msgstr "ÄÐ"
-#: client/gui-sdl/dialogs.c:2478 client/gui-sdl/dialogs.c:2902
+#: client/gui-sdl/dialogs.c:2483 client/gui-sdl/dialogs.c:2911
#: 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 "È·¶¨"
-#: client/gui-sdl/dialogs.c:2685 client/gui-win32/dialogs.c:505
+#: client/gui-sdl/dialogs.c:2694 client/gui-win32/dialogs.c:505
msgid "What nation will you be?"
msgstr "ÄúÏë³ÉΪÄĸöÃñ×壿"
@@ -13278,79 +13431,79 @@ msgstr "
msgid "Sea map"
msgstr "º£ÑóµØͼ"
-#: client/gui-sdl/diplodlg.c:563
+#: client/gui-sdl/diplodlg.c:564
msgid "Give embassy"
msgstr "Ìṩʹ¹Ý"
-#: client/gui-sdl/diplodlg.c:579 client/gui-win32/diplodlg.c:614
+#: client/gui-sdl/diplodlg.c:580 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 "»Æ½ð(×î´ó %d)"
-#: client/gui-sdl/diplodlg.c:613 client/gui-sdl/helpdlg.c:1956
+#: client/gui-sdl/diplodlg.c:614 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 "¿Æ¼¼½øÕ¹"
-#: client/gui-sdl/diplodlg.c:831 client/gui-win32/diplodlg.c:598
+#: client/gui-sdl/diplodlg.c:832 client/gui-win32/diplodlg.c:598
#: data/Freeciv.in:269
msgid "Diplomacy meeting"
msgstr "Íâ½»»áÒé"
-#: client/gui-sdl/diplodlg.c:883 client/gui-win32/diplodlg.c:680
+#: client/gui-sdl/diplodlg.c:884 client/gui-win32/diplodlg.c:680
#: data/Freeciv.in:510
msgid "Cancel meeting"
msgstr "È¡Ïûж¨"
-#: client/gui-sdl/diplodlg.c:895 client/gui-win32/diplodlg.c:679
+#: client/gui-sdl/diplodlg.c:896 client/gui-win32/diplodlg.c:679
#: data/Freeciv.in:501
msgid "Accept treaty"
msgstr "½ÓÊÜж¨"
#. TRANS: "Polish incident !" FIXME!!!
-#: client/gui-sdl/diplodlg.c:1304
+#: client/gui-sdl/diplodlg.c:1305
#, fuzzy, c-format
msgid "%s incident !"
msgstr "Ô¶¹Å"
-#: client/gui-sdl/diplodlg.c:1322
+#: client/gui-sdl/diplodlg.c:1323
msgid "Shall we declare WAR on them?"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1433
+#: client/gui-sdl/diplodlg.c:1434
#, fuzzy
msgid "Foreign Minister"
msgstr "Ê×Ïà"
-#: client/gui-sdl/diplodlg.c:1449
+#: client/gui-sdl/diplodlg.c:1450
#, c-format
msgid ""
"Sir!, the %s ambassador has arrived\n"
"What are your wishes?"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1465
+#: client/gui-sdl/diplodlg.c:1466
msgid "Declare WAR"
msgstr ""
-#: client/gui-sdl/diplodlg.c:1467 client/gui-win32/plrdlg.c:357
+#: client/gui-sdl/diplodlg.c:1468 client/gui-win32/plrdlg.c:357
msgid "Cancel Treaty"
msgstr "È¡Ïûж¨"
-#: client/gui-sdl/diplodlg.c:1490 client/gui-win32/plrdlg.c:358
+#: client/gui-sdl/diplodlg.c:1491 client/gui-win32/plrdlg.c:358
#: data/Freeciv.in:3254
msgid "Withdraw vision"
msgstr "ÊÕ»ØÊÓÒ°"
-#: client/gui-sdl/diplodlg.c:1507
+#: client/gui-sdl/diplodlg.c:1508
#, fuzzy
msgid "Call Diplomatic Meeting"
msgstr "Íâ½»»áÒé"
-#: client/gui-sdl/diplodlg.c:1521
+#: client/gui-sdl/diplodlg.c:1522
msgid "Send him back"
msgstr ""
@@ -14105,12 +14258,12 @@ msgid "Leave Game"
msgstr "±£´æÓÎÏ·"
#: client/gui-sdl/optiondlg.c:2302 client/gui-sdl/pages.c:255
-#: client/gui-win32/connectdlg.c:1100 client/gui-xaw/menu.c:121
+#: client/gui-win32/connectdlg.c:1102 client/gui-xaw/menu.c:121
#: data/Freeciv.in:115 data/Freeciv.in:3180
msgid "Quit"
msgstr "Í˳ö"
-#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:965
+#: client/gui-sdl/pages.c:170 client/gui-win32/connectdlg.c:967
msgid "Start New Game"
msgstr "¿ªÊ¼ÐÂÓÎÏ·"
@@ -14238,8 +14391,8 @@ msgstr "
msgid "%s max rate : %d%%"
msgstr "%s ×î¸ß±ÈÂÊ£º%d%%"
-#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1083
-#: client/gui-win32/connectdlg.c:1091 data/Freeciv.in:155
+#: client/gui-sdl/repodlgs.c:1981 client/gui-win32/connectdlg.c:1085
+#: client/gui-win32/connectdlg.c:1093 data/Freeciv.in:155
msgid "Update"
msgstr "¸üÐÂ"
@@ -14707,68 +14860,68 @@ msgstr "
msgid "Delete"
msgstr "ɾ³ý"
-#: client/gui-win32/connectdlg.c:147
+#: client/gui-win32/connectdlg.c:149
msgid "Password:"
msgstr "¿ÚÁ"
-#: client/gui-win32/connectdlg.c:169
+#: client/gui-win32/connectdlg.c:171
msgid "Couldn't load the savegame"
msgstr "ÎÞ·¨×°Èë´æÅÌÓÎÏ·"
-#: client/gui-win32/connectdlg.c:284 client/gui-xaw/connectdlg.c:311
+#: client/gui-win32/connectdlg.c:286 client/gui-xaw/connectdlg.c:311
msgid "Verify Password"
msgstr "ÑéÖ¤¿ÚÁî"
-#: client/gui-win32/connectdlg.c:914 data/Freeciv.in:73
+#: client/gui-win32/connectdlg.c:916 data/Freeciv.in:73
msgid "Freeciv Server Selection"
msgstr "Ñ¡Ôñ Freeciv ·þÎñÆ÷"
-#: client/gui-win32/connectdlg.c:915
+#: client/gui-win32/connectdlg.c:917
msgid "Local Area Network"
msgstr "¾ÖÓòÍø"
-#: client/gui-win32/connectdlg.c:949
+#: client/gui-win32/connectdlg.c:951
msgid "Welcome to Freeciv"
msgstr "»¶Ó½øÈë Freeciv"
-#: client/gui-win32/connectdlg.c:967
+#: client/gui-win32/connectdlg.c:969
msgid "Load Saved Game"
msgstr "×°Èë´æÅÌÓÎÏ·"
-#: client/gui-win32/connectdlg.c:969
+#: client/gui-win32/connectdlg.c:971
msgid "Connect To Network Game"
msgstr "Á¬½Óµ½ÍøÂçÓÎÏ·"
-#: client/gui-win32/connectdlg.c:979
+#: client/gui-win32/connectdlg.c:981
msgid "Choose a nation to play"
msgstr "ÇëÑ¡ÔñÄúÒªÍæµÄÃñ×壺"
-#: client/gui-win32/connectdlg.c:1014
+#: client/gui-win32/connectdlg.c:1016
msgid "Number of players (Including AI):"
msgstr "Íæ¼ÒÊýÄ¿£¨°üÀ¨AI£©£º"
-#: client/gui-win32/connectdlg.c:1022
+#: client/gui-win32/connectdlg.c:1024
msgid "AI skill level:"
msgstr "AI¼¼Äܼ¶±ð£º"
-#: client/gui-win32/connectdlg.c:1036 client/gui-win32/repodlgs.c:931
+#: client/gui-win32/connectdlg.c:1038 client/gui-win32/repodlgs.c:931
msgid "Game Options"
msgstr "ÓÎÏ·Ñ¡Ïî"
-#: client/gui-win32/connectdlg.c:1040
+#: client/gui-win32/connectdlg.c:1042
#, fuzzy
msgid "Start Game"
msgstr "¿ªÊ¼ÐÂÓÎÏ·"
-#: client/gui-win32/connectdlg.c:1059
+#: client/gui-win32/connectdlg.c:1061
msgid "Login:"
msgstr "µÇ¼£º"
-#: client/gui-win32/connectdlg.c:1061
+#: client/gui-win32/connectdlg.c:1063
msgid "Host:"
msgstr "Ö÷»ú£º"
-#: client/gui-win32/connectdlg.c:1062
+#: client/gui-win32/connectdlg.c:1064
msgid "Port:"
msgstr "״̬£º"
@@ -14848,21 +15001,21 @@ msgid ""
"this is much slower."
msgstr ""
-#: client/gui-win32/helpdlg.c:769 client/gui-win32/helpdlg.c:792
-#: client/gui-win32/helpdlg.c:803 client/gui-win32/helpdlg.c:809
-#: client/gui-win32/helpdlg.c:822
+#: client/gui-win32/helpdlg.c:775 client/gui-win32/helpdlg.c:798
+#: client/gui-win32/helpdlg.c:809 client/gui-win32/helpdlg.c:815
+#: client/gui-win32/helpdlg.c:828
msgid "Allows "
msgstr "ʹÄÜ"
-#: client/gui-win32/helpdlg.c:780
+#: client/gui-win32/helpdlg.c:786
msgid "Obsoletes "
msgstr "ÌÔÌ"
-#: client/gui-win32/helpdlg.c:812 client/gui-win32/helpdlg.c:825
+#: client/gui-win32/helpdlg.c:818 client/gui-win32/helpdlg.c:831
msgid " (with "
msgstr " £¨ÈôÓÐ "
-#: client/gui-win32/helpdlg.c:815 client/gui-win32/helpdlg.c:828
+#: client/gui-win32/helpdlg.c:821 client/gui-win32/helpdlg.c:834
msgid "?techhelp:)."
msgstr "£©¡£"
@@ -15976,11 +16129,12 @@ msgid " Present administrators: "
msgstr " µ±Ç°¹ÜÀíÕߣº"
#: 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/"
+" https://gna.org/projects/freeciv/"
msgstr ""
"Èç¹ûÄú·¢ÏÖÈκδíÎó£¬ÇëÏòÎÒÃÇ·¢ËÍÒ»·Ý´íÎ󱨸档Õâ×îºÃͨ¹ý·ÃÎÊÈçϵØÖ·µÄ"
"Freeciv Bug¸ú×ÙϵͳÍê³É£º\n"
@@ -18034,6 +18188,7 @@ msgid "Hydro Plant"
msgstr "Ë®Á¦µç³§"
#: data/default/buildings.ruleset:378
+#, fuzzy
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 "
@@ -18041,56 +18196,53 @@ msgid ""
"a Factory, Mfg. Plant and Hydro Plant together give a 150% production "
"bonus.\n"
"\n"
-"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant. A city "
-"can only build a Hydro Plant if it is next to (or on) a Mountain or River "
-"tile."
+"A city can only have one Hydro Plant, Power Plant, or Nuclear Plant."
msgstr ""
-"½«³ÇÊÐÖÐÉú²úÒýÆðµÄÎÛȾ¼õÉÙ50%¡£Ëü»¹Ôö¼Ó³ÇÊÐÖй¤³§»òÖÆÔ쳧µÄÎï×ÊÉú²ú£º¹¤³§ºÍË®"
-"Á¦µç³§Ò»Æð½«Ìṩ75%µÄÎï×ʲú³ö½±Àø£¬ÖÆÔ쳧ºÍË®Á¦µç³§Ò»Æð½«Ìṩ150%µÄÎï×ʲú³ö½±"
+"½«³ÇÊÐÖÐÉú²úÒýÆðµÄÎÛȾ¼õÉÙ50%¡£Ëü»¹Ôö¼Ó³ÇÊÐÖй¤³§»òÖÆÔ쳧µÄÎï×ÊÉú²ú£º¹¤³§ºÍºË"
+"µç³§Ò»Æð½«Ìṩ75%µÄÎï×ʲú³ö½±Àø£¬ÖÆÔ쳧ºÍºËµç³§Ò»Æð½«Ìṩ150%µÄÎï×ʲú³ö½±"
"Àø¡£\n"
"\n"
-"Ò»¸ö³ÇÊÐÖ»ÄÜÓÐË®Á¦µç³§¡¢»ðÁ¦µç³§ºÍºËµç³§Ö®Ò»¡£Ò»¸ö³ÇÊÐÖ»Óнô¿¿£¨»òÔÚÆäÉÏ£©É½"
-"Âö»òºÓÁ÷·½¸ñ²ÅÄÜÐÞ½¨Ë®Á¦µç³§¡£"
+"Ò»¸ö³ÇÊÐÖ»ÄÜÓÐË®Á¦µç³§¡¢»ðÁ¦µç³§ºÍºËµç³§Ö®Ò»¡£"
-#: data/default/buildings.ruleset:397 data/civ2/buildings.ruleset:373
+#: data/default/buildings.ruleset:396 data/civ2/buildings.ruleset:373
#: data/civ1/buildings.ruleset:297
msgid "Library"
msgstr "ͼÊé¹Ý"
-#: data/default/buildings.ruleset:412
+#: data/default/buildings.ruleset:411
#, no-c-format
msgid "Increases the science output in a city by 100%."
msgstr "ʹ³ÇÊеĿÆÑвú³öÔö¼Ó 100%¡£"
-#: data/default/buildings.ruleset:417 data/civ2/buildings.ruleset:393
+#: data/default/buildings.ruleset:416 data/civ2/buildings.ruleset:393
#: data/civ1/buildings.ruleset:317
msgid "Marketplace"
msgstr "Êг¡"
-#: data/default/buildings.ruleset:432 data/civ2/buildings.ruleset:408
+#: data/default/buildings.ruleset:431 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 "ʹ³ÇÊеÄÓéÀÖºÍË°ÊÕ²ú³öÔö¼Ó 50%¡£"
-#: data/default/buildings.ruleset:437 data/civ2/buildings.ruleset:413
+#: data/default/buildings.ruleset:436 data/civ2/buildings.ruleset:413
#: data/civ1/buildings.ruleset:337
msgid "Mass Transit"
msgstr "´óÖÚÔËÊä"
-#: data/default/buildings.ruleset:451 data/civ2/buildings.ruleset:427
+#: data/default/buildings.ruleset:450 data/civ2/buildings.ruleset:427
#: data/civ1/buildings.ruleset:351
msgid ""
"Neutralizes the pollution generated by the population. The population "
"simply has no effect on the pollution generated in the city."
msgstr "ÖкÍÒòÈË¿ÚÓµ¼·ÒýÆðµÄÎÛȾ¡£ÈË¿Ú½«²»ÔÙ¶Ô³ÇÊвúÉúµÄÎÛȾÓÐÓ°Ïì¡£"
-#: data/default/buildings.ruleset:458 data/civ2/buildings.ruleset:434
+#: data/default/buildings.ruleset:457 data/civ2/buildings.ruleset:434
#: data/civ1/buildings.ruleset:358
msgid "Mfg. Plant"
msgstr "ÖÆÔ쳧"
-#: data/default/buildings.ruleset:474 data/civ2/buildings.ruleset:450
+#: data/default/buildings.ruleset:473 data/civ2/buildings.ruleset:450
#: data/civ1/buildings.ruleset:374
#, no-c-format
msgid ""
@@ -18098,12 +18250,12 @@ msgid ""
"production in a city by 100%."
msgstr "Ó빤³§Ò»Æð£¬ÖÆÔ쳧½«³ÇÊеÄÎï×ʲú³öÔö¼Ó100%¡£"
-#: data/default/buildings.ruleset:480 data/civ2/buildings.ruleset:456
+#: data/default/buildings.ruleset:479 data/civ2/buildings.ruleset:456
#: data/civ1/buildings.ruleset:380
msgid "Nuclear Plant"
msgstr "ºËµç³§"
-#: data/default/buildings.ruleset:495
+#: data/default/buildings.ruleset:494
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 "
@@ -18119,22 +18271,22 @@ msgstr ""
"\n"
"Ò»¸ö³ÇÊÐÖ»ÄÜÓÐË®Á¦µç³§¡¢»ðÁ¦µç³§ºÍºËµç³§Ö®Ò»¡£"
-#: data/default/buildings.ruleset:515 data/civ2/buildings.ruleset:489
+#: data/default/buildings.ruleset:514 data/civ2/buildings.ruleset:489
msgid "Offshore Platform"
msgstr "º£ÉÏƽ̨"
-#: data/default/buildings.ruleset:530 data/civ2/buildings.ruleset:504
+#: data/default/buildings.ruleset:529 data/civ2/buildings.ruleset:504
msgid ""
"Adds 1 extra shield resource on all Ocean squares in a city. The city needs "
"to be coastal to build this improvement."
msgstr "½«³ÇÊеÄËùÓк£Ñ󷽸ñµÄÎï×ʲú³öÔö¼Ó1µã¡£±ØÐëÊǺ£°¶³ÇÊвÅÄÜÐÞ½¨´Ë½¨Öþ¡£"
-#: data/default/buildings.ruleset:536 data/civ2/buildings.ruleset:510
+#: data/default/buildings.ruleset:535 data/civ2/buildings.ruleset:510
#: data/civ1/buildings.ruleset:411
msgid "Palace"
msgstr "»Ê¹¬"
-#: data/default/buildings.ruleset:552
+#: data/default/buildings.ruleset:551
#, fuzzy, no-c-format
msgid ""
"Makes a city the capital and the center of your government. Corruption in "
@@ -18157,11 +18309,11 @@ msgstr ""
"×ÐϸÕÕ¿´ÄúµÄÊ׶¼£¬ÕâÊÇÒòΪÈç¹ûʧȥËü¿ÉÄܵ¼ÖÂÄúµÄÍõ¹úÔÚÎÄÃ÷Õ½ÕùÖеÄÃðÍö¡£Ê§È¥"
"Äúµ±Ç°µÄ»Ê¹¬»¹¿ÉÄÜ»áʹÄúʧȥÄúÓµÓеÄËùÓÐÓîÖæ·É´¬¡£"
-#: data/default/buildings.ruleset:569 data/civ2/buildings.ruleset:539
+#: data/default/buildings.ruleset:568 data/civ2/buildings.ruleset:539
msgid "Police Station"
msgstr "¾¯²ì¾Ö"
-#: data/default/buildings.ruleset:583 data/civ2/buildings.ruleset:553
+#: data/default/buildings.ruleset:582 data/civ2/buildings.ruleset:553
msgid ""
"Reduces the unhappiness caused by military units outside the city by 2 under "
"Democracy and 1 under Republic. This improvement has no effect under other "
@@ -18170,11 +18322,11 @@ msgstr ""
"ÔÚÃñÖ÷ÖÆϽ«³ÇÊÐÍâÃæµÄ¾üʲ¿¶ÓÒýÆðµÄÓÇÓô¼õÉÙ2£¬ÔÚ¹²ºÍÖÆϼõÉÙ1¡£´Ë½¨ÖþÔÚÆäËü"
"Õþ¸®ÏÂûÓÐ×÷Óá£"
-#: data/default/buildings.ruleset:593 data/civ2/buildings.ruleset:560
+#: data/default/buildings.ruleset:592 data/civ2/buildings.ruleset:560
msgid "Port Facility"
msgstr "¸Û¿ÚÉèÊ©"
-#: data/default/buildings.ruleset:608 data/civ2/buildings.ruleset:575
+#: data/default/buildings.ruleset:607 data/civ2/buildings.ruleset:575
msgid ""
"Allows a city to build veteran sea units. Also, damaged sea units which "
"stay in town for one full turn without moving are completely restored."
@@ -18182,12 +18334,12 @@ msgstr ""
"ÊdzÇÊÐÄܹ»½¨ÔìÀÏÁ·µÄº£Ñ󲿶ӡ£Í¬Ê±£¬ÊÜÉ˵ĺ£Ñ󲿶ÓÈç¹ûÔڸóÇÊÐÖÐÍ£ÁôÒ»Õû¸ö»Ø"
"ºÏ¶øδÒƶ¯½«ÍêÈ«»Ö¸´¡£"
-#: data/default/buildings.ruleset:615 data/civ2/buildings.ruleset:582
+#: data/default/buildings.ruleset:614 data/civ2/buildings.ruleset:582
#: data/civ1/buildings.ruleset:440
msgid "Power Plant"
msgstr "»ðÁ¦µç³§"
-#: data/default/buildings.ruleset:631
+#: data/default/buildings.ruleset:630
#, no-c-format
msgid ""
"Increases the shield production of a Factory or Mfg. Plant in a city: a "
@@ -18203,12 +18355,12 @@ msgstr ""
"\n"
"Ò»¸ö³ÇÊÐÖ»ÄÜÓÐË®Á¦µç³§¡¢»ðÁ¦µç³§ºÍºËµç³§Ö®Ò»¡£"
-#: data/default/buildings.ruleset:646 data/civ2/buildings.ruleset:610
+#: data/default/buildings.ruleset:645 data/civ2/buildings.ruleset:610
#: data/civ1/buildings.ruleset:468
msgid "Recycling Center"
msgstr "»ØÊÕÖÐÐÄ"
-#: data/default/buildings.ruleset:661 data/civ2/buildings.ruleset:625
+#: data/default/buildings.ruleset:660 data/civ2/buildings.ruleset:625
#: data/civ1/buildings.ruleset:483
#, no-c-format
msgid ""
@@ -18216,11 +18368,11 @@ msgid ""
"production in a city by 66%."
msgstr "ÐÞ½¨Ò»¸ö»ØÊÕÖÐÐÄ¿ÉÒ԰ѳÇÊвúÉúµÄÎÛȾ¼õÉÙ66%¡£"
-#: data/default/buildings.ruleset:667 data/civ2/buildings.ruleset:631
+#: data/default/buildings.ruleset:666 data/civ2/buildings.ruleset:631
msgid "Research Lab"
msgstr "Ñо¿ÊµÑéÊÒ"
-#: data/default/buildings.ruleset:682
+#: data/default/buildings.ruleset:681
msgid ""
"Together with a Library, a Research Lab increases the science production of "
"a city by 200%. Together with a Library and a University, a Research Lab "
@@ -18229,22 +18381,22 @@ msgstr ""
"ÓëͼÊé¹ÝÒ»Æð£¬Ñо¿ÊµÑéÊÒ½«³ÇÊеĿÆÑвú³öÔö¼Ó200%¡£ÓëͼÊé¹ÝºÍ´óѧһÆð£¬Ñо¿Êµ"
"ÑéÊÒ½«³ÇÊеĿÆÑвú³öÔö¼Ó450%¡£"
-#: data/default/buildings.ruleset:690 data/civ2/buildings.ruleset:654
+#: data/default/buildings.ruleset:689 data/civ2/buildings.ruleset:654
msgid "SAM Battery"
msgstr "SAM µ¼µ¯»ùµØ"
-#: data/default/buildings.ruleset:704 data/civ2/buildings.ruleset:668
+#: data/default/buildings.ruleset:703 data/civ2/buildings.ruleset:668
msgid ""
"Doubles the defense of all units inside the city when attacked by non-"
"nuclear air units."
msgstr "ʹ³ÇÊÐÖÐËùÓв¿¶ÓÔÚÔâµ½·ÇºË¿ÕÖÐÎäÆ÷µÄ¹¥»÷ʱ£¬·ÀÓùÄÜÁ¦Ôö¼ÓÒ»±¶¡£"
-#: data/default/buildings.ruleset:710 data/civ2/buildings.ruleset:674
+#: data/default/buildings.ruleset:709 data/civ2/buildings.ruleset:674
#: data/civ1/buildings.ruleset:489
msgid "SDI Defense"
msgstr "SDI ·ÀÓùϵͳ"
-#: data/default/buildings.ruleset:724 data/civ2/buildings.ruleset:688
+#: data/default/buildings.ruleset:723 data/civ2/buildings.ruleset:688
#: data/civ1/buildings.ruleset:503
msgid ""
"Protects a city from attacks from Nuclear units. Nuclear attacks simply "
@@ -18254,23 +18406,23 @@ msgstr ""
"±£»¤³ÇÊÐÃâÊܺËÎäÆ÷²¿¶Ó¹¥»÷¡£ºË¹¥»÷¶Ô³ÇÊÐûÓÐ×÷Óá£Í¬Ê±£¬¶Ô·Ç\n"
"ºËµ¼µ¯µÄ·ÀÓùÄÜÁ¦·±¶¡£"
-#: data/default/buildings.ruleset:733 data/civ2/buildings.ruleset:697
+#: data/default/buildings.ruleset:732 data/civ2/buildings.ruleset:697
msgid "Sewer System"
msgstr "ÏÂË®µÀϵͳ"
-#: data/default/buildings.ruleset:748 data/civ2/buildings.ruleset:712
+#: data/default/buildings.ruleset:747 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 ""
"ʹ³ÇÊÐÄÜÔö³¤µ½¹æÄ£³¬¹ý 12 ¡£Ê×ÏÈÐèÒªÒûË®¹¤³ÌÒÔʹ³ÇÊÐÄÜÔö³¤µ½¹æÄ£³¬¹ý 8 ¡£"
-#: data/default/buildings.ruleset:754 data/civ2/buildings.ruleset:749
+#: data/default/buildings.ruleset:753 data/civ2/buildings.ruleset:749
#: data/civ1/buildings.ruleset:512
msgid "Space Component"
msgstr "Ì«¿Õ×é¼þ"
-#: data/default/buildings.ruleset:769 data/civ2/buildings.ruleset:763
+#: data/default/buildings.ruleset:768 data/civ2/buildings.ruleset:763
#: data/civ1/buildings.ruleset:526
msgid ""
"Space Components can be differentiated into Propulsion and Fuel Components. "
@@ -18285,12 +18437,12 @@ msgstr ""
"\n"
"ÔÚÄú¿ÉÒÔ½¨ÔìÈκÎÓîÖæ·É´¬²¿¼þ֮ǰ£¬±ØÐëÒѾÓÐÍæ¼ÒÐÞ½¨Á˼ƻ®°¢²¨Â޼ƻ®¡£"
-#: data/default/buildings.ruleset:779 data/civ2/buildings.ruleset:773
+#: data/default/buildings.ruleset:778 data/civ2/buildings.ruleset:773
#: data/civ1/buildings.ruleset:536
msgid "Space Module"
msgstr "Ì«¿ÕÄ£¿é"
-#: data/default/buildings.ruleset:794 data/civ2/buildings.ruleset:787
+#: data/default/buildings.ruleset:793 data/civ2/buildings.ruleset:787
#: data/civ1/buildings.ruleset:550
msgid ""
"Space Modules are the most expensive parts of spaceships. There are three "
@@ -18321,12 +18473,12 @@ msgstr ""
"\n"
"ÔÚÄú¿ÉÒÔ½¨ÔìÈκÎÓîÖæ·É´¬²¿¼þ֮ǰ£¬±ØÐëÒѾÓÐÍæ¼ÒÐÞ½¨Á˼ƻ®°¢²¨Â޼ƻ®¡£"
-#: data/default/buildings.ruleset:813 data/civ2/buildings.ruleset:806
+#: data/default/buildings.ruleset:812 data/civ2/buildings.ruleset:806
#: data/civ1/buildings.ruleset:569
msgid "Space Structural"
msgstr "Ì«¿Õ¼Ü¹¹"
-#: data/default/buildings.ruleset:828 data/civ2/buildings.ruleset:820
+#: data/default/buildings.ruleset:827 data/civ2/buildings.ruleset:820
#: data/civ1/buildings.ruleset:583
msgid ""
"Space Structurals form the base of your spaceship. All other spaceship "
@@ -18341,32 +18493,32 @@ msgstr ""
"\n"
"ÔÚÄú¿ÉÒÔ½¨ÔìÈκÎÓîÖæ·É´¬²¿¼þ֮ǰ£¬±ØÐëÒѾÓÐÍæ¼ÒÐÞ½¨Á˼ƻ®°¢²¨Â޼ƻ®¡£"
-#: data/default/buildings.ruleset:838 data/civ2/buildings.ruleset:830
+#: data/default/buildings.ruleset:837 data/civ2/buildings.ruleset:830
msgid "Stock Exchange"
msgstr "¹ÉƱ½»Ò×Ëù"
-#: data/default/buildings.ruleset:854 data/civ2/buildings.ruleset:846
+#: data/default/buildings.ruleset:853 data/civ2/buildings.ruleset:846
#, no-c-format
msgid ""
"Together with a Marketplace and a Bank, a Stock Exchange boosts tax and "
"luxury production in a city by 150%."
msgstr "ÓëÊг¡ºÍÒøÐÐÒ»Æ𣬹ÉƱ½»Ò×Ëù½«³ÇÊÐÖеÄË°ÊÕºÍÓéÀÖ²ú³öÔö¼Ó150%¡£"
-#: data/default/buildings.ruleset:860 data/civ2/buildings.ruleset:852
+#: data/default/buildings.ruleset:859 data/civ2/buildings.ruleset:852
msgid "Super Highways"
msgstr "³¬¸ßËÙ¹«Â·"
-#: data/default/buildings.ruleset:875 data/civ2/buildings.ruleset:867
+#: data/default/buildings.ruleset:874 data/civ2/buildings.ruleset:867
#, no-c-format
msgid ""
"Increases trade resources by 50% on all squares with roads or railroads."
msgstr "½«ËùÓÐÓµÓй«Â·»òÌú·µÄ·½¸ñµÄóÒײú³öÔö¼Ó50%¡£"
-#: data/default/buildings.ruleset:883 data/civ2/buildings.ruleset:873
+#: data/default/buildings.ruleset:882 data/civ2/buildings.ruleset:873
msgid "Supermarket"
msgstr "³¬¼¶Êг¡"
-#: data/default/buildings.ruleset:898 data/civ2/buildings.ruleset:888
+#: data/default/buildings.ruleset:897 data/civ2/buildings.ruleset:888
#, no-c-format
msgid ""
"Increases the food resources by 50% on each farmland square which is being "
@@ -18376,12 +18528,12 @@ msgstr ""
"½«±»¸Ã³ÇÊÐʹÓõÄÖÜΧµÄ¸ûµØ·½¸ñµÄʳÎï²ú³öÔö¼Ó50%¡£¸ûµØ·½¸ñÊÇÖ¸ÄÇЩ±»¹à¸È¹ýÁ½´Î"
"µÄ·½¸ñ¡£"
-#: data/default/buildings.ruleset:905 data/civ2/buildings.ruleset:895
+#: data/default/buildings.ruleset:904 data/civ2/buildings.ruleset:895
#: data/civ1/buildings.ruleset:593
msgid "Temple"
msgstr "ÃíÓî"
-#: data/default/buildings.ruleset:919 data/civ2/buildings.ruleset:909
+#: data/default/buildings.ruleset:918 data/civ2/buildings.ruleset:909
#: data/civ1/buildings.ruleset:607
msgid ""
"Makes one unhappy citizen content. Both the Mysticism advance and the "
@@ -18391,25 +18543,25 @@ msgstr ""
"ʹһ¸öÓÇÓôµÄÊÐÃñÂú×ã¡£¿Æ¼¼½øÕ¹ÉñÃØÖ÷ÒåºÍÆæ¼£ÉñÓ÷¶¼½«Ê¹Æä×÷Ó÷±¶¡£ÔÚͬʱÓÐÉñ"
"ÃØÖ÷ÒåºÍÉñÓ÷µÄÇé¿öÏ£¬4¸öÊÐÃñ±»±ä³ÉÂú×ãµÄ¡£"
-#: data/default/buildings.ruleset:926 data/civ2/buildings.ruleset:916
+#: data/default/buildings.ruleset:925 data/civ2/buildings.ruleset:916
#: data/civ1/buildings.ruleset:614 data/default/techs.ruleset:742
#: data/civ2/techs.ruleset:727 data/civ1/techs.ruleset:723
msgid "University"
msgstr "´óѧ"
-#: data/default/buildings.ruleset:942
+#: data/default/buildings.ruleset:941
#, no-c-format
msgid ""
"Together with a Library, a University increases the science production of a "
"city by 250%."
msgstr "ÓëͼÊé¹ÝÒ»Æ𣬴óѧ½«³ÇÊеĿÆÑвú³öÔö¼Ó250%¡£"
-#: data/default/buildings.ruleset:948 data/civ2/buildings.ruleset:938
+#: data/default/buildings.ruleset:947 data/civ2/buildings.ruleset:938
#: data/civ1/buildings.ruleset:636
msgid "Apollo Program"
msgstr "°¢²¨Â޼ƻ®"
-#: data/default/buildings.ruleset:962 data/civ2/buildings.ruleset:952
+#: data/default/buildings.ruleset:961 data/civ2/buildings.ruleset:952
msgid ""
"Entire map becomes visible for the player who owns it. It allows all "
"players to start building spaceship parts (assuming they have researched the "
@@ -18418,22 +18570,22 @@ msgstr ""
"ÓµÓÐËûµÄÍæ¼Ò½«¿ÉÒÔ¿´µ½È«²¿µØͼ¡£ËüÔÊÐíËùÓеÄÍæ¼Ò¿ªÊ¼½¨ÔìÓîÖæ·É´¬²¿¼þ£¨Èç¹ûËû"
"ÃÇÑо¿Á˱ØÐèµÄ¿Æ¼¼µÄ»°£©¡£"
-#: data/default/buildings.ruleset:969 data/civ2/buildings.ruleset:959
+#: data/default/buildings.ruleset:968 data/civ2/buildings.ruleset:959
msgid "A.Smith's Trading Co."
msgstr "Ñǵ±Ë¹ÃÜ˹óÒ×¹«Ë¾"
-#: data/default/buildings.ruleset:983
+#: data/default/buildings.ruleset:982
msgid ""
"City improvements which would normally have an upkeep of 1 are free of "
"upkeep, for all your cities."
msgstr "¶ÔÄúËùÓеijÇÊУ¬Õý³£Çé¿öÏÂÐèÒª1µãÎï×ʱ£ÑøµÄ½¨ÖþÏÖÔÚÃâ·Ñ±£Ñø¡£"
-#: data/default/buildings.ruleset:989 data/civ2/buildings.ruleset:979
+#: data/default/buildings.ruleset:988 data/civ2/buildings.ruleset:979
#: data/civ1/buildings.ruleset:655
msgid "Colossus"
msgstr "¾ÞÏñ"
-#: data/default/buildings.ruleset:1003 data/civ2/buildings.ruleset:993
+#: data/default/buildings.ruleset:1002 data/civ2/buildings.ruleset:993
#: data/civ1/buildings.ruleset:669
msgid ""
"Each square around the city where this wonder is built that is already "
@@ -18441,34 +18593,34 @@ msgid ""
msgstr ""
"ÐÞ½¨´ËÆæ¼£µÄ³ÇÊÐÖÜΧµÄ·½¸ñÈç¹ûÒѾÓÐóÒײú³ö£¬½«µÃµ½¶îÍâµÄ1µãóÒײú³ö¡£"
-#: data/default/buildings.ruleset:1009 data/civ2/buildings.ruleset:999
+#: data/default/buildings.ruleset:1008 data/civ2/buildings.ruleset:999
#: data/civ1/buildings.ruleset:675
msgid "Copernicus' Observatory"
msgstr "¸ç°×ÄáÌìÎĄ̈"
-#: data/default/buildings.ruleset:1024 data/civ2/buildings.ruleset:1180
+#: data/default/buildings.ruleset:1023 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 "½«½¨ÔìËüµÄ³ÇÊеĿÆÑвú³öÔö¼Ó100%¡£"
-#: data/default/buildings.ruleset:1029 data/civ2/buildings.ruleset:1019
+#: data/default/buildings.ruleset:1028 data/civ2/buildings.ruleset:1019
#: data/civ1/buildings.ruleset:695
msgid "Cure For Cancer"
msgstr "¹¥¿Ë°©Ö¢"
-#: data/default/buildings.ruleset:1043
+#: data/default/buildings.ruleset:1042
msgid ""
"This stunning technological achievement makes one unhappy citizen content in "
"all your cities."
msgstr "ÕâÏîÁ˲»ÆðµÄ¿ÆÑгɹûʹÄúËùÓгÇÊÐÖÐÒ»¸öÓÇÓôÊÐÃñ±ä³ÉÂú×ãµÄ¡£"
-#: data/default/buildings.ruleset:1051 data/civ2/buildings.ruleset:1039
+#: data/default/buildings.ruleset:1050 data/civ2/buildings.ruleset:1039
#: data/civ1/buildings.ruleset:715
msgid "Darwin's Voyage"
msgstr "´ï¶ûÎĺ½ÐÐ"
-#: data/default/buildings.ruleset:1065 data/civ2/buildings.ruleset:1053
+#: data/default/buildings.ruleset:1064 data/civ2/buildings.ruleset:1053
#: data/civ1/buildings.ruleset:729
msgid ""
"Charles Darwin's voyage sparked the discovery of the evolution of the "
@@ -18478,43 +18630,43 @@ msgstr ""
"²é¶û˹´ï¶ûÎĵĺ½ÐÐÍƶ¯ÁËÎïÖÖ½ø»¯µÄ·¢ÏÖ£¬Õ⼫´óµÄ¹ÄÎèÁË¿ÆÑÐÐÅÐÄ¡£Á¢¼´ÌṩÁ½Ïî"
"¿Æ¼¼½øÕ¹¡£"
-#: data/default/buildings.ruleset:1072 data/civ2/buildings.ruleset:1060
+#: data/default/buildings.ruleset:1071 data/civ2/buildings.ruleset:1060
msgid "Eiffel Tower"
msgstr "°£·Æ¶ûÌúËþ"
-#: data/default/buildings.ruleset:1087
+#: data/default/buildings.ruleset:1086
#, no-c-format
msgid ""
"Your reputation and goodwill among other nations is recovered twice as fast."
msgstr ""
-#: data/default/buildings.ruleset:1093 data/civ2/buildings.ruleset:1081
+#: data/default/buildings.ruleset:1092 data/civ2/buildings.ruleset:1081
#: data/civ1/buildings.ruleset:736
msgid "Great Library"
msgstr "´óͼÊé¹Ý"
-#: data/default/buildings.ruleset:1107 data/civ2/buildings.ruleset:1095
+#: data/default/buildings.ruleset:1106 data/civ2/buildings.ruleset:1095
#: data/civ1/buildings.ruleset:750
msgid ""
"The civilization which builds the Great Library gets every advance that at "
"least two other civilizations have achieved."
msgstr "ÐÞ½¨´óͼÊé¹ÝµÄÎÄÃ÷½«µÃµ½ÈκÎÒѾÖÁÉÙ±»ÆäËüÁ½¸öÎÄÃ÷ÕÆÎյĿƼ¼½øÕ¹¡£"
-#: data/default/buildings.ruleset:1113 data/civ2/buildings.ruleset:1101
+#: data/default/buildings.ruleset:1112 data/civ2/buildings.ruleset:1101
#: data/civ1/buildings.ruleset:756
msgid "Great Wall"
msgstr "³¤³Ç"
-#: data/default/buildings.ruleset:1127
+#: data/default/buildings.ruleset:1126
msgid "Works as a City Wall in all your cities."
msgstr "Ï൱ÓÚÔÚËùÓгÇÊÐÖж¼ÓгÇǽ¡£"
-#: data/default/buildings.ruleset:1135 data/civ2/buildings.ruleset:1122
+#: data/default/buildings.ruleset:1134 data/civ2/buildings.ruleset:1122
#: data/civ1/buildings.ruleset:777
msgid "Hanging Gardens"
msgstr "¿ÕÖл¨Ô°"
-#: data/default/buildings.ruleset:1149 data/civ2/buildings.ruleset:1136
+#: data/default/buildings.ruleset:1148 data/civ2/buildings.ruleset:1136
#: data/civ1/buildings.ruleset:791
msgid ""
"Makes one content citizen happy in every city. Makes two extra content "
@@ -18527,12 +18679,12 @@ msgstr ""
"¿ìÀÖ£¨Ò²¾ÍÊÇ£¬×ܹ²3¸ö£©¡£ÔÚ²»Ì«¿ÉÄܳöÏÖµÄÇé¿öÏ£¬Èç¹û³ÇÊÐÖÐûÓÐÂú×ãÊÐÃñÀ´»ñµÃ"
"¿ÕÖл¨Ô°µÄºÃ´¦£¬´ËÆæ¼£½«×÷Óõ½ÓÇÓôÊÐÃñÉíÉÏ£¨Ê¹ËûÃDZäµÃÂú×㣩¡£"
-#: data/default/buildings.ruleset:1158 data/civ2/buildings.ruleset:1145
+#: data/default/buildings.ruleset:1157 data/civ2/buildings.ruleset:1145
#: data/civ1/buildings.ruleset:800
msgid "Hoover Dam"
msgstr "ºú·ðË®°Ó"
-#: data/default/buildings.ruleset:1173 data/civ2/buildings.ruleset:1159
+#: data/default/buildings.ruleset:1172 data/civ2/buildings.ruleset:1159
msgid ""
"Works as if you had a Hydro Plant in every city. (This reduces pollution "
"and increases the effects of Factories and Mfg. Plants.)"
@@ -18540,51 +18692,51 @@ msgstr ""
"Ï൱ÓëÄúÔÚÿ¸ö³ÇÊÐÖж¼ÓÐÒ»×ùË®Á¦µç³§¡££¨Õ⽫¼õÉÙÎÛȾ²¢Ôö¼Ó¹¤³§ÓëÖÆÔ쳧µÄ×÷"
"Óᣣ©"
-#: data/default/buildings.ruleset:1179 data/civ2/buildings.ruleset:1165
+#: data/default/buildings.ruleset:1178 data/civ2/buildings.ruleset:1165
#: data/civ1/buildings.ruleset:822
msgid "Isaac Newton's College"
msgstr "Å£¶ÙѧԺ"
-#: data/default/buildings.ruleset:1194
+#: data/default/buildings.ruleset:1193
#, no-c-format
msgid ""
"Boosts science production by 100% in every city you control that has a "
"University."
msgstr "ʹÄú¿ØÖƵÄÿ¸öÓµÓдóѧµÄ³ÇÊеĿÆÑвú³öÔö¼Ó100%¡£"
-#: data/default/buildings.ruleset:1200 data/civ2/buildings.ruleset:1185
+#: data/default/buildings.ruleset:1199 data/civ2/buildings.ruleset:1185
#: data/civ1/buildings.ruleset:842
msgid "J.S. Bach's Cathedral"
msgstr "J.S.°ÍºÕ´ó½ÌÌÃ"
-#: data/default/buildings.ruleset:1214 data/civ2/buildings.ruleset:1199
+#: data/default/buildings.ruleset:1213 data/civ2/buildings.ruleset:1199
msgid "Makes two unhappy citizens content in every city."
msgstr "ʹÿ¸ö³ÇÊÐÖÐÁ½¸öÓÇÓôÊÐÃñÂú×ã¡£"
-#: data/default/buildings.ruleset:1219 data/civ2/buildings.ruleset:1204
+#: data/default/buildings.ruleset:1218 data/civ2/buildings.ruleset:1204
msgid "King Richard's Crusade"
msgstr "Àí²é¹úÍõÊ®×Ö¾ü"
-#: data/default/buildings.ruleset:1233 data/civ2/buildings.ruleset:1218
+#: data/default/buildings.ruleset:1232 data/civ2/buildings.ruleset:1218
msgid ""
"Adds one extra shield resource on every square around the city where it is "
"built."
msgstr "Ϊ½¨ÔìËüµÄ³ÇÊÐÖÜΧµÄÿ¸ö·½¸ñÔö¼Ó1µãµÄÎï×ʲú³ö¡£"
-#: data/default/buildings.ruleset:1239 data/civ2/buildings.ruleset:1224
+#: data/default/buildings.ruleset:1238 data/civ2/buildings.ruleset:1224
msgid "Leonardo's Workshop"
msgstr "´ï·ÒÆ湤×÷ÊÒ"
-#: data/default/buildings.ruleset:1253 data/civ2/buildings.ruleset:1238
+#: data/default/buildings.ruleset:1252 data/civ2/buildings.ruleset:1238
msgid "Upgrades one obsolete unit per game turn."
msgstr "ÿ¸ö»ØºÏÉý¼¶Ò»¸ö¹ýʱ²¿¶Ó¡£"
-#: data/default/buildings.ruleset:1258 data/civ2/buildings.ruleset:1243
+#: data/default/buildings.ruleset:1257 data/civ2/buildings.ruleset:1243
#: data/civ1/buildings.ruleset:862
msgid "Lighthouse"
msgstr "µÆËþ"
-#: data/default/buildings.ruleset:1273
+#: data/default/buildings.ruleset:1272
msgid ""
"Gives all your sea units 1 additional movement point and eliminates the risk "
"of losing Triremes on the high seas. Makes all your new sea units veterans "
@@ -18593,34 +18745,34 @@ msgstr ""
"ΪËùÓк£Ñ󲿶ÓÌṩ¶îÍâµÄ1µãÒƶ¯Á¦²¢Ïû³ýÈý²ã½°×ù·«´¬ÔÚÔ¶º£Ê§×ÙµÄΣÏÕ¡£Ê¹ËùÓÐÐÂ"
"½¨µÄ£¨¶ÔËùÓгÇÊУ©º£Ñ󲿶Ӷ¼ÊÇÀÏÁ·µÄ¡£"
-#: data/default/buildings.ruleset:1280 data/civ2/buildings.ruleset:1264
+#: data/default/buildings.ruleset:1279 data/civ2/buildings.ruleset:1264
#: data/civ1/buildings.ruleset:885
msgid "Magellan's Expedition"
msgstr "ÂóÕÜÂ׺½º£"
-#: data/default/buildings.ruleset:1295
+#: data/default/buildings.ruleset:1294
msgid "Gives all your sea units 2 additional movement points."
msgstr "ΪËùÓк£Ñ󲿶ÓÌṩ¶îÍâ2µãÒƶ¯Á¦¡£"
-#: data/default/buildings.ruleset:1300 data/civ2/buildings.ruleset:1283
+#: data/default/buildings.ruleset:1299 data/civ2/buildings.ruleset:1283
#: data/civ1/buildings.ruleset:904
msgid "Manhattan Project"
msgstr "Âü¹þ¶Ù¹¤³Ì"
-#: data/default/buildings.ruleset:1318 data/civ2/buildings.ruleset:1301
+#: data/default/buildings.ruleset:1317 data/civ2/buildings.ruleset:1301
msgid "Marco Polo's Embassy"
msgstr "Âí¿É²¨ÂÞʹ¹Ý"
-#: data/default/buildings.ruleset:1332 data/civ2/buildings.ruleset:1315
+#: data/default/buildings.ruleset:1331 data/civ2/buildings.ruleset:1315
msgid "The player who owns it gets an embassy with all players."
msgstr "ÓµÓÐËüµÄÍæ¼Ò´ÓËùÓÐÍæ¼Ò´¦µÃµ½Ò»¸öʹ¹Ý¡£"
-#: data/default/buildings.ruleset:1337 data/civ2/buildings.ruleset:1320
+#: data/default/buildings.ruleset:1336 data/civ2/buildings.ruleset:1320
#: data/civ1/buildings.ruleset:922
msgid "Michelangelo's Chapel"
msgstr "Ã׿ªÀÊ»ùÂÞ½ÌÌÃ"
-#: data/default/buildings.ruleset:1351 data/civ2/buildings.ruleset:1334
+#: data/default/buildings.ruleset:1350 data/civ2/buildings.ruleset:1334
msgid ""
"Counts as having a Cathedral in each of your cities. This makes 3 unhappy "
"citizens content in each city. The discovery of Theology increases the "
@@ -18632,21 +18784,21 @@ msgstr ""
"·¢ÏÖ½«Ôö¼Ó´ó½ÌÌõÄЧ¹û£¬Ê¹ÁíÍâÒ»¸öÓÇÓôÊÐÃñÂú×ã¡£¹²²úÖ÷ÒåµÄ·¢ÏÖ½«¼õÈõ´ó½ÌÌõÄ"
"Ч¹û£¬°ÑÓÇÓôÊÐÃñ±äµÃÂú×ãµÄÊýÄ¿½«±»¼õ1¡£"
-#: data/default/buildings.ruleset:1361 data/civ2/buildings.ruleset:1344
+#: data/default/buildings.ruleset:1360 data/civ2/buildings.ruleset:1344
#: data/civ1/buildings.ruleset:941
msgid "Oracle"
msgstr "ÉñÓ÷"
-#: data/default/buildings.ruleset:1375
+#: data/default/buildings.ruleset:1374
msgid "Makes two of your unhappy citizens content in every city with a temple."
msgstr "ʹÿ¸öÓÐÃíÓîµÄ³ÇÊÐÖÐʹÁ½¸öÓÇÓôÊÐÃñÂú×ã¡£"
-#: data/default/buildings.ruleset:1380 data/civ2/buildings.ruleset:1363
+#: data/default/buildings.ruleset:1379 data/civ2/buildings.ruleset:1363
#: data/civ1/buildings.ruleset:960
msgid "Pyramids"
msgstr "½ð×ÖËþ"
-#: data/default/buildings.ruleset:1394
+#: data/default/buildings.ruleset:1393
#, fuzzy
msgid ""
"The amount of stored food lost when one of your cities grows or shrinks is "
@@ -18656,30 +18808,30 @@ msgstr ""
"ÓйȲֵijÇÊз¢ÉúÔö³¤»òËõСʱ´¢´æµÄʳÎｫ±»ÉèΪ°ëÂú¡£ÕâÓÐÖúÓÚ³ÇÊиü¿ìÔö³¤ÒÔ¼°"
"¸üÈÝÒ׶ȹý¼¢»Ä¡£"
-#: data/default/buildings.ruleset:1401 data/civ2/buildings.ruleset:1382
+#: data/default/buildings.ruleset:1400 data/civ2/buildings.ruleset:1382
#: data/civ1/buildings.ruleset:981
msgid "SETI Program"
msgstr "Ì«¿Õ¼Æ»®"
-#: data/default/buildings.ruleset:1415
+#: data/default/buildings.ruleset:1414
msgid "Boosts science production in each city with a Research Lab by 100%. "
msgstr "½«Ã¿¸öÓÐÑо¿ÊµÑéÊҵijÇÊÐÖеĿÆÑвú³öÌáÉý 100% ¡£"
-#: data/default/buildings.ruleset:1420 data/civ2/buildings.ruleset:1402
+#: data/default/buildings.ruleset:1419 data/civ2/buildings.ruleset:1402
#: data/civ1/buildings.ruleset:1001
msgid "Shakespeare's Theatre"
msgstr "ɯʿ±ÈÑǾçÔº"
-#: data/default/buildings.ruleset:1434 data/civ2/buildings.ruleset:1416
+#: data/default/buildings.ruleset:1433 data/civ2/buildings.ruleset:1416
#: data/civ1/buildings.ruleset:1015
msgid "Makes all unhappy citizens content, in the city where it is located."
msgstr "ʹµÄËüËùÔÚ³ÇÊеÄËùÓÐÊÐÃñ±äµÃÂú×ã¡£"
-#: data/default/buildings.ruleset:1439 data/civ2/buildings.ruleset:1421
+#: data/default/buildings.ruleset:1438 data/civ2/buildings.ruleset:1421
msgid "Statue of Liberty"
msgstr "×ÔÓÉÅ®ÉñÏñ"
-#: data/default/buildings.ruleset:1453 data/civ2/buildings.ruleset:1435
+#: data/default/buildings.ruleset:1452 data/civ2/buildings.ruleset:1435
#: data/civ1/buildings.ruleset:974 data/civ1/buildings.ruleset:1034
msgid ""
"Allows you to choose any government, including those that have not yet been "
@@ -18689,11 +18841,11 @@ msgstr ""
"ÔÊÐíÄúÑ¡ÔñËùÓеÄÕþ¸®ÀàÐÍ£¬°üÀ¨ÄÇЩÄúµÄÎÄÃ÷»¹Ã»ÓÐÑо¿µÄ£¬²¢ÇÒ²»ÓþÀúÎÞÕþ¸®×´"
"̬µÄ¹ý¶ÉʱÆÚ¡£"
-#: data/default/buildings.ruleset:1460 data/civ2/buildings.ruleset:1442
+#: data/default/buildings.ruleset:1459 data/civ2/buildings.ruleset:1442
msgid "Sun Tzu's War Academy"
msgstr "Ëï×ÓÕ½ÕùѧԺ"
-#: data/default/buildings.ruleset:1474
+#: data/default/buildings.ruleset:1473
msgid ""
"All your new ground units start at the first veteran level. The chance of a "
"unit getting the next veteran level after a battle increases by half."
@@ -18701,21 +18853,21 @@ msgstr ""
"ÄúËùÓеÄн¨µÄµØÃ沿¶Ó½«ÊÇÒ»¼¶ÀÏÁ·µÄ¡£Ò»¸ö²¿¶ÓÔÚÕ½¶·Ö®ºó±ä³ÉÏÂÒ»¼¶ÀÏÁ·µÄµÄ»ú"
"»áÔö¼ÓÒ»°ë¡£"
-#: data/default/buildings.ruleset:1481 data/civ2/buildings.ruleset:1463
+#: data/default/buildings.ruleset:1480 data/civ2/buildings.ruleset:1463
#: data/civ1/buildings.ruleset:1020
msgid "United Nations"
msgstr "ÁªºÏ¹ú"
-#: data/default/buildings.ruleset:1495
+#: data/default/buildings.ruleset:1494
msgid "All your units regain two extra hitpoints per turn."
msgstr "ËùÓв¿¶Óÿ»ØºÏ¶îÍâ»Ö¸´2µãÉúÃüÖµ¡£"
-#: data/default/buildings.ruleset:1508 data/civ2/buildings.ruleset:1490
+#: data/default/buildings.ruleset:1507 data/civ2/buildings.ruleset:1490
#: data/civ1/buildings.ruleset:1046
msgid "Women's Suffrage"
msgstr "¸¾Å®Ñ¡¾ÙȨ"
-#: data/default/buildings.ruleset:1522 data/civ2/buildings.ruleset:1504
+#: data/default/buildings.ruleset:1521 data/civ2/buildings.ruleset:1504
msgid ""
"Counts as a Police Station in every city. (That is, for each city, reduces "
"unhappiness for military units outside the city by 2 under Democracy and 1 "
@@ -18724,11 +18876,11 @@ msgstr ""
"Ï൱ÓÚÿ¸ö³ÇÊж¼ÓÐÒ»×ù¾¯²ì¾Ö¡££¨Ò²¾ÍÊÇ£¬¶Ôÿ¸ö³ÇÊÐÀ´Ëµ£¬ÔÚÃñÖ÷ÖÆϽ«³ÇÊÐÍâÃæ"
"µÄ¾üʲ¿¶ÓÒýÆðµÄÓÇÓô¼õÉÙ2£¬¹²ºÍÖÆϼõÉÙ1¡£´ËÆæ¼£ÔÚÆäËüÕþ¸®ÀàÐÍÏÂûÓÐ×÷Óᣣ©"
-#: data/default/buildings.ruleset:1533
+#: data/default/buildings.ruleset:1532
msgid "Coinage"
msgstr "Ôì±Ò"
-#: data/default/buildings.ruleset:1554
+#: data/default/buildings.ruleset:1553
msgid ""
"This is not a normal improvement. Instead, setting a city's production to "
"Coinage means its shield production is converted to tax output (money, "
@@ -19133,11 +19285,16 @@ msgstr "
msgid "?citystyle:Industrial"
msgstr "¹¤Òµ»¯"
-#: data/default/cities.ruleset:139 data/civ2/cities.ruleset:150
+#: data/default/cities.ruleset:139
+#, fuzzy
+msgid "?citystyle:ElectricAge"
+msgstr "¿¶ûÌØ"
+
+#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:150
msgid "?citystyle:Modern"
msgstr "ÏÖ´ú"
-#: data/default/cities.ruleset:150 data/civ2/cities.ruleset:161
+#: data/default/cities.ruleset:161 data/civ2/cities.ruleset:161
msgid "?citystyle:PostModern"
msgstr "ºóÏÖ´ú"
@@ -24243,6 +24400,43 @@ msgstr "
msgid "Team 31"
msgstr "ÍŶÓ"
+#~ msgid "Command access level could not be set to '%s' for connection %s."
+#~ msgstr "ÎÞ·¨½«Á¬½Ó %2$s µÄÃüÁî·ÃÎʼ¶±ðÉèÖÃΪ¡°%1$s¡±¡£"
+
+#~ msgid "Observers cannot vote."
+#~ msgstr "ÅÔ¹ÛÕß²»ÄÜͶƱ¡£"
+
+#~ msgid ""
+#~ "You can only vote in a running game. Use 'first' to become the game "
+#~ "organizer if there currently is none."
+#~ msgstr ""
+#~ "ÄúÖ»ÄÜÔÚÔËÐÐÖеÄÓÎÏ·ÖÐͶƱ¡£Èç¹ûµ±Ç°Ã»ÓÐÓÎÏ·×éÖ¯ÕßÇëʹÓá°first¡±ÃüÁî³ÉΪ"
+#~ "ÓÎÏ·×éÖ¯Õß¡£"
+
+#~ msgid "Vote %d \"%s\": %d for, %d against"
+#~ msgstr "ͶƱ %d ¡°%s¡±£º %d Ö§³Ö£¬ %d ·´¶Ô"
+
+#~ msgid "Value must be integer."
+#~ msgstr "Öµ±ØÐëÊÇÒ»¸öÕûÊý¡£"
+
+#~ 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 Hydro Plant, Power Plant, or Nuclear Plant. A "
+#~ "city can only build a Hydro Plant if it is next to (or on) a Mountain or "
+#~ "River tile."
+#~ msgstr ""
+#~ "½«³ÇÊÐÖÐÉú²úÒýÆðµÄÎÛȾ¼õÉÙ50%¡£Ëü»¹Ôö¼Ó³ÇÊÐÖй¤³§»òÖÆÔ쳧µÄÎï×ÊÉú²ú£º¹¤³§"
+#~ "ºÍË®Á¦µç³§Ò»Æð½«Ìṩ75%µÄÎï×ʲú³ö½±Àø£¬ÖÆÔ쳧ºÍË®Á¦µç³§Ò»Æð½«Ìṩ150%µÄÎï"
+#~ "×ʲú³ö½±Àø¡£\n"
+#~ "\n"
+#~ "Ò»¸ö³ÇÊÐÖ»ÄÜÓÐË®Á¦µç³§¡¢»ðÁ¦µç³§ºÍºËµç³§Ö®Ò»¡£Ò»¸ö³ÇÊÐÖ»Óнô¿¿£¨»òÔÚÆäÉÏ£©"
+#~ "ɽÂö»òºÓÁ÷·½¸ñ²ÅÄÜÐÞ½¨Ë®Á¦µç³§¡£"
+
#, fuzzy
#~ msgid "Auth config filename \"%s\" not allowed!"
#~ msgstr "²»ÄÜʹÓøÃÃû×Ö¡£"
diff --git a/server/Makefile.am b/server/Makefile.am
index 163767c..dc3fd75 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -86,7 +86,9 @@ libcivserver_a_SOURCES = \
unithand.c \
unithand.h \
unittools.c \
- unittools.h
+ unittools.h \
+ voting.c \
+ voting.h
civserver_DEPENDENCIES = ../utility/libcivutility.a ../common/libcivcommon.a \
../ai/libcivai.a ../utility/libcivutility.a ./libcivserver.a \
diff --git a/server/Makefile.in b/server/Makefile.in
index aeb4c10..9cb3f45 100644
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,84 +14,194 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
+
+VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+bin_PROGRAMS = civserver$(EXEEXT)
+subdir = server
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ $(top_srcdir)/bootstrap/freeciv-server.desktop.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES = freeciv-server.desktop
+CONFIG_CLEAN_VPATH_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+libcivserver_a_AR = $(AR) $(ARFLAGS)
+libcivserver_a_LIBADD =
+am_libcivserver_a_OBJECTS = airgoto.$(OBJEXT) auth.$(OBJEXT) \
+ barbarian.$(OBJEXT) cityhand.$(OBJEXT) citytools.$(OBJEXT) \
+ cityturn.$(OBJEXT) commands.$(OBJEXT) connecthand.$(OBJEXT) \
+ console.$(OBJEXT) diplhand.$(OBJEXT) diplomats.$(OBJEXT) \
+ gamehand.$(OBJEXT) gotohand.$(OBJEXT) ggzserver.$(OBJEXT) \
+ handchat.$(OBJEXT) hand_gen.$(OBJEXT) maphand.$(OBJEXT) \
+ meta.$(OBJEXT) plrhand.$(OBJEXT) report.$(OBJEXT) \
+ ruleset.$(OBJEXT) sanitycheck.$(OBJEXT) savegame.$(OBJEXT) \
+ score.$(OBJEXT) sernet.$(OBJEXT) settings.$(OBJEXT) \
+ settlers.$(OBJEXT) spacerace.$(OBJEXT) srv_main.$(OBJEXT) \
+ stdinhand.$(OBJEXT) techtools.$(OBJEXT) unithand.$(OBJEXT) \
+ unittools.$(OBJEXT) voting.$(OBJEXT)
+libcivserver_a_OBJECTS = $(am_libcivserver_a_OBJECTS)
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopfiledir)"
+PROGRAMS = $(bin_PROGRAMS)
+am_civserver_OBJECTS = civserver.$(OBJEXT)
+civserver_OBJECTS = $(am_civserver_OBJECTS)
+am__DEPENDENCIES_1 =
+civserver_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(civserver_LDFLAGS) \
+ $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/bootstrap/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libcivserver_a_SOURCES) $(civserver_SOURCES)
+DIST_SOURCES = $(libcivserver_a_SOURCES) $(civserver_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+DATA = $(desktopfile_DATA)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+ distdir
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+ dir0=`pwd`; \
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+ sed_rest='s,^[^/]*/*,,'; \
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+ sed_butlast='s,/*[^/]*$$,,'; \
+ while test -n "$$dir1"; do \
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+ if test "$$first" != "."; then \
+ if test "$$first" = ".."; then \
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+ else \
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+ if test "$$first2" = "$$first"; then \
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+ else \
+ dir2="../$$dir2"; \
+ fi; \
+ dir0="$$dir0"/"$$first"; \
+ fi; \
+ fi; \
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+ done; \
+ reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -101,10 +212,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -112,27 +227,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -140,6 +267,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -150,17 +279,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -173,15 +323,38 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
SUBDIRS = generator scripting
-
-bin_PROGRAMS = civserver
noinst_LIBRARIES = libcivserver.a
AM_CPPFLAGS = \
-I$(top_srcdir)/utility -I$(srcdir)/../common -I$(srcdir)/../ai \
@@ -189,14 +362,11 @@ AM_CPPFLAGS = \
-I$(srcdir)/generator -I$(srcdir)/scripting \
$(LIBGGZ_INCLUDES) $(GGZDMOD_INCLUDES) @AUTH_CFLAGS@
-
@MINGW32_TRUE at SERVERICON = ../win32/servericon.o
-
civserver_SOURCES = \
civserver.c \
civserver.h
-
libcivserver_a_SOURCES = \
airgoto.c \
airgoto.h \
@@ -263,8 +433,9 @@ libcivserver_a_SOURCES = \
unithand.c \
unithand.h \
unittools.c \
- unittools.h
-
+ unittools.h \
+ voting.c \
+ voting.h
civserver_DEPENDENCIES = ../utility/libcivutility.a ../common/libcivcommon.a \
../ai/libcivai.a ../utility/libcivutility.a ./libcivserver.a \
@@ -287,87 +458,44 @@ civserver_LDADD = ../utility/libcivutility.a ../common/libcivcommon.a \
../dependencies/tolua/libtolua.a \
$(AUTH_LIBS) $(SERVER_LIBS) $(LIB_GGZDMOD) $(SERVERICON)
-
desktopfiledir = $(prefix)/share/applications
desktopfile_DATA = \
freeciv-server.desktop
-subdir = server
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = freeciv-server.desktop
-LIBRARIES = $(noinst_LIBRARIES)
-
-libcivserver_a_AR = $(AR) cru
-libcivserver_a_LIBADD =
-am_libcivserver_a_OBJECTS = airgoto.$(OBJEXT) auth.$(OBJEXT) \
- barbarian.$(OBJEXT) cityhand.$(OBJEXT) citytools.$(OBJEXT) \
- cityturn.$(OBJEXT) commands.$(OBJEXT) connecthand.$(OBJEXT) \
- console.$(OBJEXT) diplhand.$(OBJEXT) diplomats.$(OBJEXT) \
- gamehand.$(OBJEXT) gotohand.$(OBJEXT) ggzserver.$(OBJEXT) \
- handchat.$(OBJEXT) hand_gen.$(OBJEXT) maphand.$(OBJEXT) \
- meta.$(OBJEXT) plrhand.$(OBJEXT) report.$(OBJEXT) \
- ruleset.$(OBJEXT) sanitycheck.$(OBJEXT) savegame.$(OBJEXT) \
- score.$(OBJEXT) sernet.$(OBJEXT) settings.$(OBJEXT) \
- settlers.$(OBJEXT) spacerace.$(OBJEXT) srv_main.$(OBJEXT) \
- stdinhand.$(OBJEXT) techtools.$(OBJEXT) unithand.$(OBJEXT) \
- unittools.$(OBJEXT)
-libcivserver_a_OBJECTS = $(am_libcivserver_a_OBJECTS)
-bin_PROGRAMS = civserver$(EXEEXT)
-PROGRAMS = $(bin_PROGRAMS)
-
-am_civserver_OBJECTS = civserver.$(OBJEXT)
-civserver_OBJECTS = $(am_civserver_OBJECTS)
-
-DEFS = @DEFS@
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-depcomp = $(SHELL) $(top_srcdir)/bootstrap/depcomp
-am__depfiles_maybe = depfiles
- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/airgoto.Po ./$(DEPDIR)/auth.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/barbarian.Po ./$(DEPDIR)/cityhand.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/citytools.Po ./$(DEPDIR)/cityturn.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/civserver.Po ./$(DEPDIR)/commands.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/connecthand.Po ./$(DEPDIR)/console.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/diplhand.Po ./$(DEPDIR)/diplomats.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/gamehand.Po ./$(DEPDIR)/ggzserver.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/gotohand.Po ./$(DEPDIR)/hand_gen.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/handchat.Po ./$(DEPDIR)/maphand.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/meta.Po ./$(DEPDIR)/plrhand.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/report.Po ./$(DEPDIR)/ruleset.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/sanitycheck.Po ./$(DEPDIR)/savegame.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/score.Po ./$(DEPDIR)/sernet.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/settings.Po ./$(DEPDIR)/settlers.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/spacerace.Po ./$(DEPDIR)/srv_main.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/stdinhand.Po ./$(DEPDIR)/techtools.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/unithand.Po ./$(DEPDIR)/unittools.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-CFLAGS = @CFLAGS@
-DIST_SOURCES = $(libcivserver_a_SOURCES) $(civserver_SOURCES)
-DATA = $(desktopfile_DATA)
-
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
- uninstall-info-recursive all-recursive install-data-recursive \
- install-exec-recursive installdirs-recursive install-recursive \
- uninstall-recursive check-recursive installcheck-recursive
-DIST_COMMON = Makefile.am Makefile.in
-DIST_SUBDIRS = $(SUBDIRS)
-SOURCES = $(libcivserver_a_SOURCES) $(civserver_SOURCES)
-
all: all-recursive
.SUFFIXES:
.SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu server/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu server/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu server/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
freeciv-server.desktop: $(top_builddir)/config.status $(top_srcdir)/bootstrap/freeciv-server.desktop.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
@@ -377,36 +505,49 @@ libcivserver.a: $(libcivserver_a_OBJECTS) $(libcivserver_a_DEPENDENCIES)
-rm -f libcivserver.a
$(libcivserver_a_AR) libcivserver.a $(libcivserver_a_OBJECTS) $(libcivserver_a_LIBADD)
$(RANLIB) libcivserver.a
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(bindir)
- @list='$(bin_PROGRAMS)'; for p in $$list; do \
- p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
- if test -f $$p \
- ; then \
- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
- $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \
- else :; fi; \
- done
+ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p; \
+ then echo "$$p"; echo "$$p"; else :; fi; \
+ done | \
+ sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+ sed 'N;N;N;s,\n, ,g' | \
+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+ if ($$2 == $$4) files[d] = files[d] " " $$1; \
+ else { print "f", $$3 "/" $$4, $$1; } } \
+ END { for (d in files) print "f", d, files[d] }' | \
+ while read type dir files; do \
+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+ test -z "$$files" || { \
+ echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+ $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+ } \
+ ; done
uninstall-binPROGRAMS:
@$(NORMAL_UNINSTALL)
- @list='$(bin_PROGRAMS)'; for p in $$list; do \
- f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
- rm -f $(DESTDIR)$(bindir)/$$f; \
- done
+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ files=`for p in $$list; do echo "$$p"; done | \
+ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+ -e 's/$$/$(EXEEXT)/' `; \
+ test -n "$$list" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(bindir)" && rm -f $$files
clean-binPROGRAMS:
-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
civserver$(EXEEXT): $(civserver_OBJECTS) $(civserver_DEPENDENCIES)
@rm -f civserver$(EXEEXT)
- $(LINK) $(civserver_LDFLAGS) $(civserver_OBJECTS) $(civserver_LDADD) $(LIBS)
+ $(civserver_LINK) $(civserver_OBJECTS) $(civserver_LDADD) $(LIBS)
mostlyclean-compile:
- -rm -f *.$(OBJEXT) core *.core
+ -rm -f *.$(OBJEXT)
distclean-compile:
-rm -f *.tab.c
@@ -445,41 +586,41 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/techtools.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/unithand.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/unittools.Po at am__quote@
-
-distclean-depend:
- -rm -rf ./$(DEPDIR)
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/voting.Po at am__quote@
.c.o:
- at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
- at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- $(COMPILE) -c `cygpath -w $<`
-CCDEPMODE = @CCDEPMODE@
-uninstall-info-am:
-desktopfileDATA_INSTALL = $(INSTALL_DATA)
+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
install-desktopfileDATA: $(desktopfile_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(desktopfiledir)
- @list='$(desktopfile_DATA)'; for p in $$list; do \
+ test -z "$(desktopfiledir)" || $(MKDIR_P) "$(DESTDIR)$(desktopfiledir)"
+ @list='$(desktopfile_DATA)'; test -n "$(desktopfiledir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(desktopfileDATA_INSTALL) $$d$$p $(DESTDIR)$(desktopfiledir)/$$f"; \
- $(desktopfileDATA_INSTALL) $$d$$p $(DESTDIR)$(desktopfiledir)/$$f; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(desktopfiledir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(desktopfiledir)" || exit $$?; \
done
uninstall-desktopfileDATA:
@$(NORMAL_UNINSTALL)
- @list='$(desktopfile_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " rm -f $(DESTDIR)$(desktopfiledir)/$$f"; \
- rm -f $(DESTDIR)$(desktopfiledir)/$$f; \
- done
+ @list='$(desktopfile_DATA)'; test -n "$(desktopfiledir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(desktopfiledir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(desktopfiledir)" && rm -f $$files
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
@@ -488,7 +629,13 @@ uninstall-desktopfileDATA:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @set fnord $$MAKEFLAGS; amf=$$2; \
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -499,16 +646,21 @@ $(RECURSIVE_TARGETS):
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
- @set fnord $$MAKEFLAGS; amf=$$2; \
+$(RECURSIVE_CLEAN_TARGETS):
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -528,89 +680,137 @@ maintainer-clean-recursive:
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+ctags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
-
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ empty_fix=.; \
+ else \
+ include_option=--include; \
+ empty_fix=; \
+ fi; \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+ test ! -f $$subdir/TAGS || \
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
- list='$(SUBDIRS)'; for subdir in $$list; do \
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d $(distdir)/$$subdir \
- || mkdir $(distdir)/$$subdir \
+ test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
- (cd $$subdir && \
+ fi; \
+ done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+ dir1=$$subdir; dir2="$(top_distdir)"; \
+ $(am__relativize); \
+ new_top_distdir=$$reldir; \
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+ ($(am__cd) $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$(top_distdir)" \
- distdir=../$(distdir)/$$subdir \
+ top_distdir="$$new_top_distdir" \
+ distdir="$$new_distdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
+ am__skip_mode_fix=: \
distdir) \
|| exit 1; \
fi; \
@@ -620,8 +820,9 @@ check: check-recursive
all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(DATA)
installdirs: installdirs-recursive
installdirs-am:
- $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(desktopfiledir)
-
+ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopfiledir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
@@ -633,7 +834,7 @@ install-am: all-am
installcheck: installcheck-recursive
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -641,7 +842,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -652,58 +854,89 @@ clean-am: clean-binPROGRAMS clean-generic clean-noinstLIBRARIES \
mostlyclean-am
distclean: distclean-recursive
-
-distclean-am: clean-am distclean-compile distclean-depend \
- distclean-generic distclean-tags
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-tags
dvi: dvi-recursive
dvi-am:
+html: html-recursive
+
+html-am:
+
info: info-recursive
info-am:
install-data-am: install-desktopfileDATA
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
install-exec-am: install-binPROGRAMS
+install-html: install-html-recursive
+
+install-html-am:
+
install-info: install-info-recursive
+install-info-am:
+
install-man:
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-recursive
mostlyclean-am: mostlyclean-compile mostlyclean-generic
-uninstall-am: uninstall-binPROGRAMS uninstall-desktopfileDATA \
- uninstall-info-am
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
-uninstall-info: uninstall-info-recursive
+ps-am:
-.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
- clean-binPROGRAMS clean-generic clean-noinstLIBRARIES \
- clean-recursive distclean distclean-compile distclean-depend \
- distclean-generic distclean-recursive distclean-tags distdir \
- dvi dvi-am dvi-recursive info info-am info-recursive install \
+uninstall-am: uninstall-binPROGRAMS uninstall-desktopfileDATA
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+ install-am install-strip tags-recursive
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am check check-am clean clean-binPROGRAMS \
+ clean-generic clean-noinstLIBRARIES ctags ctags-recursive \
+ distclean distclean-compile distclean-generic distclean-tags \
+ distdir dvi dvi-am html html-am info info-am install \
install-am install-binPROGRAMS install-data install-data-am \
- install-data-recursive install-desktopfileDATA install-exec \
- install-exec-am install-exec-recursive install-info \
- install-info-am install-info-recursive install-man \
- install-recursive install-strip installcheck installcheck-am \
- installdirs installdirs-am installdirs-recursive \
- maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-recursive tags tags-recursive \
- uninstall uninstall-am uninstall-binPROGRAMS \
- uninstall-desktopfileDATA uninstall-info-am \
- uninstall-info-recursive uninstall-recursive
+ install-desktopfileDATA install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs installdirs-am \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
+ tags tags-recursive uninstall uninstall-am \
+ uninstall-binPROGRAMS uninstall-desktopfileDATA
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/server/barbarian.c b/server/barbarian.c
index ad78ee3..aa7b68b 100644
--- a/server/barbarian.c
+++ b/server/barbarian.c
@@ -166,7 +166,8 @@ static struct player *create_barbarian_player(bool land)
}
set_ai_level_directer(barbarians, game.info.skill_level);
init_tech(barbarians, TRUE);
- give_initial_techs(barbarians);
+ give_global_initial_techs(barbarians);
+ give_nation_initial_techs(barbarians);
/* Ensure that we are at war with everyone else */
players_iterate(pplayer) {
diff --git a/server/cityhand.c b/server/cityhand.c
index 7405105..adc25a6 100644
--- a/server/cityhand.c
+++ b/server/cityhand.c
@@ -292,7 +292,7 @@ void handle_city_worklist(struct player *pplayer, int city_id,
return;
}
- copy_worklist(&pcity->worklist, worklist);
+ worklist_copy(&pcity->worklist, worklist);
send_city_info(pplayer, pcity);
}
diff --git a/server/citytools.c b/server/citytools.c
index abbfd9e..1494f39 100644
--- a/server/citytools.c
+++ b/server/citytools.c
@@ -1699,7 +1699,7 @@ void package_city(struct city *pcity, struct packet_city_info *packet,
packet->caravan_shields=pcity->caravan_shields;
packet->last_turns_shield_surplus = pcity->last_turns_shield_surplus;
- copy_worklist(&packet->worklist, &pcity->worklist);
+ worklist_copy(&packet->worklist, &pcity->worklist);
packet->diplomat_investigate=dipl_invest;
packet->airlift = pcity->airlift;
diff --git a/server/civserver.c b/server/civserver.c
index ea27799..c375feb 100644
--- a/server/civserver.c
+++ b/server/civserver.c
@@ -134,13 +134,17 @@ int main(int argc, char *argv[])
fc_fprintf(stderr, _("Warning: the %s option is obsolete. "
"Use -m to enable the metaserver.\n"), argv[inx]);
showhelp = TRUE;
- } else if (is_option("--meta", argv[inx]))
+ } else if (is_option("--meta", argv[inx])) {
srvarg.metaserver_no_send = FALSE;
- else if ((option = get_option_malloc("--Metaserver",
+ } else if ((option = get_option_malloc("--Metaserver",
argv, &inx, argc))) {
sz_strlcpy(srvarg.metaserver_addr, option);
free(option);
srvarg.metaserver_no_send = FALSE; /* --Metaserver implies --meta */
+ } else if ((option = get_option_malloc("--identity",
+ argv, &inx, argc))) {
+ sz_strlcpy(srvarg.metaserver_name, option);
+ free(option);
} else if ((option = get_option_malloc("--port", argv, &inx, argc))) {
if (sscanf(option, "%d", &srvarg.port) != 1) {
showhelp = TRUE;
@@ -223,6 +227,7 @@ int main(int argc, char *argv[])
fc_fprintf(stderr, _(" -f, --file FILE\tLoad saved game FILE\n"));
fc_fprintf(stderr,
_(" -h, --help\t\tPrint a summary of the options\n"));
+ fc_fprintf(stderr, _(" -i, --identity ADDR\tBe known as ADDR at metaserver\n"));
fc_fprintf(stderr, _(" -l, --log FILE\tUse FILE as logfile\n"));
fc_fprintf(stderr, _(" -m, --meta\t\tNotify metaserver and "
"send server's info\n"));
diff --git a/server/commands.c b/server/commands.c
index 7542fb3..cca11cf 100644
--- a/server/commands.c
+++ b/server/commands.c
@@ -20,10 +20,11 @@
#include "connection.h"
#include "commands.h"
+#include "voting.h"
/* Commands must match the values in enum command_id. */
const struct command commands[] = {
- {"start", ALLOW_INFO,
+ {"start", ALLOW_BASIC,
"start",
N_("Start the game, or restart after loading a savegame."),
N_("This command starts the game. When starting a new game, "
@@ -34,7 +35,8 @@ const struct command commands[] = {
"choose their nation, and then the game will begin. "
"This command is also required after loading a savegame "
"for the game to recommence. Once the game is running this command "
- "is no longer available, since it would have no effect.")
+ "is no longer available, since it would have no effect."),
+ VCF_NONE, 0
},
{"help", ALLOW_INFO,
@@ -51,7 +53,8 @@ const struct command commands[] = {
"Otherwise the argument is taken as a command name or option name, "
"and help is given for that command or option. For options, the help "
"information includes the current and default values for that option. "
- "The argument may be abbreviated where unambiguous.")
+ "The argument may be abbreviated where unambiguous."),
+ VCF_NONE, 0
},
{"list", ALLOW_INFO,
@@ -63,11 +66,13 @@ const struct command commands[] = {
N_("Show a list of players, teams, connections, or scenarios."),
N_("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.")
+ " and defaults to 'players' if absent."),
+ VCF_NONE, 0
},
{"quit", ALLOW_HACK,
"quit",
- N_("Quit the game and shutdown the server."), NULL
+ N_("Quit the game and shutdown the server."), NULL,
+ VCF_NONE, 0
},
{"cut", ALLOW_CTRL,
/* TRANS: translate text between <> only */
@@ -76,7 +81,8 @@ const struct command commands[] = {
N_("Cut specified client's connection to the server, removing that client "
"from the game. If the game has not yet started that client's player "
"is removed from the game, otherwise there is no effect on the player. "
- "Note that this command now takes connection names, not player names.")
+ "Note that this command now takes connection names, not player names."),
+ VCF_NONE, 50
},
{"explain", ALLOW_INFO,
/* TRANS: translate text between <> only */
@@ -86,7 +92,8 @@ const struct command commands[] = {
N_("The 'explain' command gives a subset of the functionality of 'help', "
"and is included for backward compatibility. With no arguments it "
"gives a list of options (like 'help options'), and with an argument "
- "it gives help for a particular option (like 'help <option-name>').")
+ "it gives help for a particular option (like 'help <option-name>')."),
+ VCF_NONE, 0
},
{"show", ALLOW_INFO,
/* TRANS: translate text between <> only */
@@ -96,26 +103,29 @@ const struct command commands[] = {
N_("Show server options."),
N_("With no arguments, shows all server options (or available options, when "
"used by clients). With an argument, show only the named option, "
- "or options with that prefix.")
+ "or options with that prefix."),
+ VCF_NONE, 0
},
- {"wall", ALLOW_HACK,
+ {"wall", ALLOW_ADMIN,
N_("wall <message>"),
N_("Send message to all connections."),
N_("For each connected client, pops up a window showing the message "
- "entered.")
+ "entered."),
+ VCF_NONE, 0
},
- {"vote", ALLOW_INFO,
+ {"vote", ALLOW_BASIC,
N_("vote yes|no [vote number]"),
N_("Cast a vote."),
/* xgettext:no-c-format */
- N_("A player with info level access issuing a control level command "
+ N_("A player with basic 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.")
+ "vote against it."),
+ VCF_NONE, 0
},
{"debug", ALLOW_CTRL,
N_("debug [ player <player> | city <x> <y> | units <x> <y> | unit <id> "
@@ -123,10 +133,12 @@ const struct command commands[] = {
N_("Turn on or off AI debugging of given entity."),
N_("Print AI debug information about given entity and turn continous "
"debugging output for this entity on or off."),
+ VCF_NONE, 50
},
{"set", ALLOW_CTRL,
N_("set <option-name> <value>"),
- N_("Set server option."), NULL
+ N_("Set server option."), NULL,
+ VCF_NONE, 50
},
{"team", ALLOW_CTRL,
N_("team <player> [team]"),
@@ -135,14 +147,16 @@ const struct command commands[] = {
"player is set teamless. Use \"\" if names contain whitespace. "
"A team is a group of players that start out allied, with shared "
"vision and embassies, and fight together to achieve team victory "
- "with averaged individual scores.")
+ "with averaged individual scores."),
+ VCF_NONE, 50
},
{"rulesetdir", ALLOW_CTRL,
N_("rulesetdir <directory>"),
N_("Choose new ruleset directory or modpack."),
N_("Choose new ruleset directory or modpack. Calling this\n "
"without any arguments will show you the currently selected "
- "ruleset.")
+ "ruleset."),
+ VCF_NONE, 50
},
{"metamessage", ALLOW_CTRL,
/* TRANS: translate text between <> only */
@@ -151,31 +165,36 @@ const struct command commands[] = {
N_("Set user defined metaserver info line. If parameter is omitted,\n"
"previously set metamessage will be removed. For most of the time\n"
"user defined metamessage will be used instead of automatically\n"
- "generated messages, if it is available.")
+ "generated messages, if it is available."),
+ VCF_NONE, 50
},
{"metapatches", ALLOW_HACK,
/* TRANS: translate text between <> only */
N_("metapatch <meta-line>"),
- N_("Set metaserver patches line."), NULL
+ N_("Set metaserver patches line."), NULL,
+ VCF_NONE, 0
},
- {"metaconnection", ALLOW_HACK,
+ {"metaconnection", ALLOW_ADMIN,
"metaconnection u|up\n"
"metaconnection d|down\n"
"metaconnection ?",
N_("Control metaserver connection."),
N_("'metaconnection ?' reports on the status of the connection to metaserver.\n"
"'metaconnection down' or 'metac d' brings the metaserver connection down.\n"
- "'metaconnection up' or 'metac u' brings the metaserver connection up.")
+ "'metaconnection up' or 'metac u' brings the metaserver connection up."),
+ VCF_NONE, 0
},
- {"metaserver",ALLOW_HACK,
+ {"metaserver", ALLOW_ADMIN,
/* TRANS: translate text between <> only */
N_("metaserver <address>"),
- N_("Set address (URL) for metaserver to report to."), NULL
+ N_("Set address (URL) for metaserver to report to."), NULL,
+ VCF_NONE, 0
},
{"aitoggle", ALLOW_CTRL,
/* TRANS: translate text between <> only */
N_("aitoggle <player-name>"),
- N_("Toggle AI status of player."), NULL
+ N_("Toggle AI status of player."), NULL,
+ VCF_NONE, 50
},
{"take", ALLOW_INFO,
/* TRANS: translate text between [] and <> only */
@@ -185,7 +204,8 @@ const struct command commands[] = {
"other connections to take over a player. If you're not one of these, "
"only the <player-name> argument is allowed. If '-' is given for the "
"player name and the connection does not already control a player, one "
- "is created and assigned to the connection.")
+ "is created and assigned to the connection."),
+ VCF_NONE, 0
},
{"observe", ALLOW_INFO,
/* TRANS: translate text between [] only */
@@ -195,27 +215,31 @@ const struct command commands[] = {
"other connections to observe a player. If you're not one of these, "
"only the [player-name] argument is allowed. If the console gives no "
"player-name or the connection uses no arguments, then the connection "
- "is attached to a global observer.")
+ "is attached to a global observer."),
+ VCF_NONE, 0
},
{"detach", ALLOW_INFO,
/* TRANS: translate text between <> only */
N_("detach <connection-name>"),
N_("detach from a player."),
N_("Only the console and connections with cmdlevel 'hack' can force "
- "other connections to detach from a player.")
+ "other connections to detach from a player."),
+ VCF_NONE, 0
},
{"create", ALLOW_CTRL,
/* TRANS: translate text between <> only */
N_("create <player-name>"),
N_("Create an AI player with a given name."),
N_("The 'create' command is only available before the game has "
- "been started.")
+ "been started."),
+ VCF_NONE, 50
},
- {"away", ALLOW_INFO,
+ {"away", ALLOW_BASIC,
N_("away\n"
"away"),
N_("Set yourself in away mode. The AI will watch your back."),
N_("The AI will govern your nation but do minimal changes."),
+ VCF_NONE, 0
},
{"novice", ALLOW_CTRL,
/* TRANS: translate text between <> only */
@@ -224,7 +248,8 @@ const struct command commands[] = {
N_("Set one or all AI players to 'novice'."),
N_("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 the skill level for that player only.")
+ "argument, sets the skill level for that player only."),
+ VCF_NONE, 50
},
{"easy", ALLOW_CTRL,
/* TRANS: translate text between <> only */
@@ -233,7 +258,8 @@ const struct command commands[] = {
N_("Set one or all AI players to 'easy'."),
N_("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 skill level for that player only.")
+ "argument, sets the skill level for that player only."),
+ VCF_NONE, 50
},
{"normal", ALLOW_CTRL,
/* TRANS: translate text between <> only */
@@ -242,7 +268,8 @@ const struct command commands[] = {
N_("Set one or all AI players to 'normal'."),
N_("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 the skill level for that player only.")
+ "argument, sets the skill level for that player only."),
+ VCF_NONE, 50
},
{"hard", ALLOW_CTRL,
/* TRANS: translate text between <> only */
@@ -251,7 +278,8 @@ const struct command commands[] = {
N_("Set one or all AI players to 'hard'."),
N_("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 skill level for that player only.")
+ "argument, sets the skill level for that player only."),
+ VCF_NONE, 50
},
{"experimental", ALLOW_CTRL,
/* TRANS: translate text between <> only */
@@ -262,9 +290,10 @@ const struct command commands[] = {
"sets the default level for any new AI players to this. With an "
"argument, sets the skill level for that player only. THIS IS ONLY "
"FOR TESTING OF NEW AI FEATURES! For ordinary servers, this option "
- "has no effect.")
+ "has no effect."),
+ VCF_NONE, 50
},
- {"cmdlevel", ALLOW_HACK, /* confusing to leave this at ALLOW_CTRL */
+ {"cmdlevel", ALLOW_ADMIN,
/* TRANS: translate text between <> only */
N_("cmdlevel\n"
"cmdlevel <level>\n"
@@ -275,8 +304,10 @@ const struct command commands[] = {
N_("The command access level controls which server commands are available\n"
"to users via the client chatline. The available levels are:\n"
" none - no commands\n"
- " info - informational commands only\n"
+ " info - informational or observer commands only\n"
+ " basic - commands available to players in the game\n"
" ctrl - commands that affect the game and users\n"
+ " admin - commands that affect server operation\n"
" hack - *all* commands - dangerous!\n"
"With no arguments, the current command access levels are reported.\n"
"With a single argument, the level is set for all existing "
@@ -290,11 +321,13 @@ const struct command commands[] = {
"Command access levels do not persist if a client disconnects, "
"because some untrusted person could reconnect with the same name. "
"Note that this command now takes connection names, not player names."
- )
+ ),
+ VCF_NONE, 0
},
- {"first", ALLOW_INFO, "first",
+ {"first", ALLOW_BASIC, "first",
N_("If there is none, become the game organizer with increased permissions."),
NULL,
+ VCF_NONE, 0
},
{"timeoutincrease", ALLOW_CTRL,
/* TRANS: translate text between <> only */
@@ -302,29 +335,44 @@ const struct command commands[] = {
N_("See \"help timeoutincrease\"."),
N_("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")
+ "concert with the option \"timeout\". Defaults are 0 0 0 1"),
+ VCF_NONE, 50
},
- {"endgame", ALLOW_HACK,
+ {"cancelvote", ALLOW_BASIC,
+ /* TRANS: translate text between <> only */
+ N_("cancelvote\n"
+ "cancelvote <vote number>\n"
+ "cancelvote all\n"),
+ N_("Cancel a running vote.\n"),
+ N_("With no arguments this command removes your own vote. If you have "
+ "an admin access level, you can cancel any vote by vote number, or "
+ "all votes with the \'all\' argument."),
+ VCF_NONE, 0
+ },
+ {"endgame", ALLOW_ADMIN,
/* TRANS: translate text between <> only */
N_("endgame"),
N_("End the game immediately in a draw."), NULL,
+ VCF_NONE, 0
},
- {"surrender", ALLOW_INFO,
+ {"surrender", ALLOW_BASIC,
/* TRANS: translate text between <> only */
N_("surrender"),
N_("Concede the game."),
N_("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."),
+ VCF_NONE, 0
},
{"remove", ALLOW_CTRL,
/* TRANS: translate text between <> only */
N_("remove <player-name>"),
N_("Fully remove player from game."),
N_("This *completely* removes a player from the game, including "
- "all cities and units etc. Use with care!")
+ "all cities and units etc. Use with care!"),
+ VCF_NONE, 50
},
- {"save", ALLOW_HACK,
+ {"save", ALLOW_ADMIN,
/* TRANS: translate text between <> only */
N_("save\n"
"save <file-name>"),
@@ -334,7 +382,8 @@ const struct command commands[] = {
"To reload a savegame created by 'save', start the server with "
"the command-line argument:\n"
" --file <filename>\n"
- "and use the 'start' command once players have reconnected.")
+ "and use the 'start' command once players have reconnected."),
+ VCF_NONE, 0
},
{"load", ALLOW_CTRL,
/* TRANS: translate text between <> only */
@@ -342,25 +391,40 @@ const struct command commands[] = {
"load <file-name>"),
N_("Load game from file."),
N_("Load a game from <file-name>. Any current data including players, "
- "rulesets and server options are lost.\n")
+ "rulesets and server options are lost.\n"),
+ VCF_NONE, 50
},
{"read", ALLOW_CTRL,
/* TRANS: translate text between <> only */
N_("read <file-name>"),
- N_("Process server commands from file."), NULL
+ N_("Process server commands from file."), NULL,
+ VCF_NONE, 50
},
{"write", ALLOW_HACK,
/* TRANS: translate text between <> only */
N_("write <file-name>"),
- N_("Write current settings as server commands to file."), NULL
+ N_("Write current settings as server commands to file."), NULL,
+ VCF_NONE, 0
},
{"rfcstyle", ALLOW_HACK,
"rfcstyle",
- N_("Switch server output between 'RFC-style' and normal style."), NULL
+ N_("Switch server output between 'RFC-style' and normal style."), NULL,
+ VCF_NONE, 0
},
{"serverid", ALLOW_INFO,
"serverid",
N_("Simply returns the id of the server."),
+ VCF_NONE, 0
}
};
+/**************************************************************************
+ Returns the access level of a command, or ALLOW_NONE if 'cmd' is invalid.
+**************************************************************************/
+enum cmdlevel_id command_access_level(enum command_id cmd)
+{
+ if (!(0 <= cmd && cmd < CMD_NUM)) {
+ return ALLOW_NONE;
+ }
+ return commands[cmd].level;
+}
diff --git a/server/commands.h b/server/commands.h
index 0a7fff0..460ab25 100644
--- a/server/commands.h
+++ b/server/commands.h
@@ -25,6 +25,8 @@ struct command {
const char *synopsis; /* one or few-line summary of usage */
const char *short_help; /* one line (about 70 chars) description */
const char *extra_help; /* extra help information; will be line-wrapped */
+ int vote_flags; /* how to handle votes */
+ int vote_percent; /* percent required, meaning depends on flags */
};
/* Order here is important: for ambiguous abbreviations the first
@@ -70,6 +72,7 @@ enum command_id {
CMD_CMDLEVEL,
CMD_FIRSTLEVEL,
CMD_TIMEOUT,
+ CMD_CANCELVOTE,
/* potentially harmful: */
CMD_END_GAME,
@@ -92,4 +95,6 @@ enum command_id {
extern const struct command commands[];
+enum cmdlevel_id command_access_level(enum command_id cmd);
+
#endif /* FC__COMMANDS_H */
diff --git a/server/connecthand.c b/server/connecthand.c
index 910a096..94797b9 100644
--- a/server/connecthand.c
+++ b/server/connecthand.c
@@ -35,13 +35,37 @@
#include "maphand.h"
#include "meta.h"
#include "plrhand.h"
+#include "report.h"
#include "ruleset.h"
#include "sernet.h"
#include "srv_main.h"
#include "stdinhand.h"
+#include "voting.h"
#include "connecthand.h"
+
+/**************************************************************************
+ Restore access level for the given connection (user). Used when taking
+ a player, observing, or detaching.
+
+ NB: This function does not send updated connection information to other
+ clients, you need to do that yourself afterwards.
+**************************************************************************/
+void restore_access_level(struct connection *pconn)
+{
+ /* Restore previous privileges. */
+ pconn->access_level = pconn->server.granted_access_level;
+
+ /* Detached connections must have at most the same privileges
+ * as observers, unless they were granted something higher than
+ * ALLOW_BASIC in the first place. */
+ if ((pconn->observer || !pconn->player)
+ && pconn->access_level == ALLOW_BASIC) {
+ pconn->access_level = ALLOW_INFO;
+ }
+}
+
/**************************************************************************
This is used when a new player joins a server, before the game
has started. If pconn is NULL, is an AI, else a client.
@@ -126,6 +150,12 @@ void establish_new_connection(struct connection *pconn)
send_diplomatic_meetings(pconn);
send_packet_thaw_hint(pconn);
dsend_packet_start_phase(pconn, game.info.phase);
+ } else if (S_S_OVER == server_state()) {
+ send_packet_freeze_hint(pconn);
+ send_all_info(dest);
+ send_game_state(dest, C_S_OVER);
+ send_packet_thaw_hint(pconn);
+ report_final_scores(pconn->self);
} else {
/* send new player connection to everybody */
send_game_info(game.est_connections);
@@ -156,9 +186,13 @@ void establish_new_connection(struct connection *pconn)
}
send_conn_info(game.est_connections, dest);
}
- /* redundant self to self cannot be avoided */
+
+ restore_access_level(pconn);
send_conn_info(dest, game.est_connections);
+ send_running_votes(pconn);
+ send_updated_vote_totals(NULL);
+
/* remind the connection who he is */
if (!pconn->player) {
notify_conn(dest, NULL, E_CONNECTION,
@@ -478,6 +512,8 @@ bool attach_connection_to_player(struct connection *pconn,
pconn->player = pplayer;
conn_list_append(pplayer->connections, pconn);
+ restore_access_level(pconn);
+
aifill(game.info.aifill);
return TRUE;
@@ -511,5 +547,7 @@ bool unattach_connection_from_player(struct connection *pconn)
pconn->player = NULL;
+ restore_access_level(pconn);
+
return TRUE;
}
diff --git a/server/connecthand.h b/server/connecthand.h
index a61a313..2c6204f 100644
--- a/server/connecthand.h
+++ b/server/connecthand.h
@@ -33,5 +33,6 @@ void send_conn_info_remove(struct conn_list *src, struct conn_list *dest);
bool attach_connection_to_player(struct connection *pconn,
struct player *pplayer);
bool unattach_connection_from_player(struct connection *pconn);
+void restore_access_level(struct connection *pconn);
#endif /* FC__CONNECTHAND_H */
diff --git a/server/diplhand.c b/server/diplhand.c
index f1cf3a3..775b428 100644
--- a/server/diplhand.c
+++ b/server/diplhand.c
@@ -145,7 +145,10 @@ void handle_diplomacy_accept_treaty_req(struct player *pplayer,
if (pclause->from == pplayer) {
switch(pclause->type) {
case CLAUSE_EMBASSY:
- if (player_has_embassy(pother, pplayer)) {
+ /* Don't use player_has_embassy() here, because it also checks
+ * for the embassy effect, and we should always be able to make
+ * an embassy. */
+ if (BV_ISSET(pother->embassy, player_index(pplayer))) {
freelog(LOG_ERROR, "%s tried to give embassy to %s, who already "
"has an embassy",
player_name(pplayer),
diff --git a/server/diplomats.c b/server/diplomats.c
index 888e3a8..5c5a344 100644
--- a/server/diplomats.c
+++ b/server/diplomats.c
@@ -1024,18 +1024,23 @@ static void diplomat_charge_movement (struct unit *pdiplomat, struct tile *ptile
/**************************************************************************
This determines if a diplomat/spy succeeds against some defender,
- who is also a diplomat or spy.
+ who is also a diplomat or spy. Note: a superspy attacker always
+ succeeds, otherwise a superspy defender always wins.
Return TRUE if the "attacker" succeeds.
**************************************************************************/
-static bool diplomat_success_vs_defender (struct unit *pattacker,
- struct unit *pdefender, struct tile *pdefender_tile)
+static bool diplomat_success_vs_defender(struct unit *pattacker,
+ struct unit *pdefender,
+ struct tile *pdefender_tile)
{
int chance = 50; /* Base 50% chance */
- if (unit_has_type_flag(pdefender, F_SUPERSPY)) {
+ if (unit_has_type_flag(pattacker, F_SUPERSPY)) {
return TRUE;
}
+ if (unit_has_type_flag(pdefender, F_SUPERSPY)) {
+ return FALSE;
+ }
if (unit_has_type_flag(pattacker, F_SPY)) {
chance += 25;
}
@@ -1051,12 +1056,12 @@ static bool diplomat_success_vs_defender (struct unit *pattacker,
EFT_SPY_RESISTANT) / 100;
} else {
if (tile_has_special(pdefender_tile, S_FORTRESS)
- || tile_has_special(pdefender_tile, S_AIRBASE)) {
- chance -= chance * 25 / 100; /* 25% penalty */
+ || tile_has_special(pdefender_tile, S_AIRBASE)) {
+ chance -= chance * 25 / 100; /* 25% penalty */
}
}
- return myrand(100) > chance;
+ return myrand(100) < chance;
}
/**************************************************************************
@@ -1077,12 +1082,13 @@ static bool diplomat_infiltrate_tile(struct player *pplayer,
/* We don't need a _safe iterate since no transporters should be
* destroyed. */
unit_list_iterate(ptile->units, punit) {
- if (unit_has_type_flag(punit, F_DIPLOMAT) || unit_has_type_flag(punit, F_SUPERSPY)) {
- /* A F_SUPERSPY unit may not acutally be a spy, but a superboss which
- we cannot allow puny diplomats from getting the better of. Note that
- diplomat_success_vs_defender(punit) is always TRUE if the attacker
- is F_SUPERSPY. Hence F_SUPERSPY vs F_SUPERSPY in a diplomatic contest
- always kills the attacker. */
+ if (unit_has_type_flag(punit, F_DIPLOMAT)
+ || unit_has_type_flag(punit, F_SUPERSPY)) {
+ /* A F_SUPERSPY unit may not actually be a spy, but a superboss
+ * which we cannot allow puny diplomats from getting the better
+ * of. Note that diplomat_success_vs_defender() is always TRUE
+ * if the attacker is F_SUPERSPY. Hence F_SUPERSPY vs F_SUPERSPY
+ * in a diplomatic contest always kills the attacker. */
if (diplomat_success_vs_defender(pdiplomat, punit, ptile)
&& !unit_has_type_flag(punit, F_SUPERSPY)) {
/* Defending Spy/Diplomat dies. */
diff --git a/server/gamehand.c b/server/gamehand.c
index 781c723..4fe15a9 100644
--- a/server/gamehand.c
+++ b/server/gamehand.c
@@ -66,7 +66,7 @@ static void place_starting_unit(struct tile *ptile, struct player *pplayer,
char crole)
{
struct unit_type *utype;
- enum unit_flag_id role;
+ enum unit_role_id role;
assert(!is_non_allied_unit_tile(ptile, pplayer));
@@ -526,6 +526,7 @@ void handle_single_want_hack_req(struct connection *pc,
}
if (you_have_hack) {
+ pc->server.granted_access_level = ALLOW_HACK;
pc->access_level = ALLOW_HACK;
}
diff --git a/server/generator/Makefile.in b/server/generator/Makefile.in
index 7df97ee..8a72ab2 100644
--- a/server/generator/Makefile.in
+++ b/server/generator/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,84 +14,114 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = server/generator
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+libgenerator_a_AR = $(AR) $(ARFLAGS)
+libgenerator_a_LIBADD =
+am_libgenerator_a_OBJECTS = mapgen.$(OBJEXT) mapgen_topology.$(OBJEXT) \
+ utilities.$(OBJEXT) height_map.$(OBJEXT) startpos.$(OBJEXT) \
+ temperature_map.$(OBJEXT)
+libgenerator_a_OBJECTS = $(am_libgenerator_a_OBJECTS)
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/bootstrap/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libgenerator_a_SOURCES)
+DIST_SOURCES = $(libgenerator_a_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -101,10 +132,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -112,27 +147,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -140,6 +187,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -150,17 +199,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -173,15 +243,39 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
noinst_LIBRARIES = libgenerator.a
-
AM_CPPFLAGS = -I$(top_srcdir)/utility -I$(top_srcdir)/common -I$(top_srcdir)/server -I$(top_builddir)/intl -I$(top_srcdir)/server/generator
-
libgenerator_a_SOURCES = \
mapgen.c \
mapgen.h \
@@ -196,48 +290,40 @@ libgenerator_a_SOURCES = \
temperature_map.c \
temperature_map.h
-subdir = server/generator
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-libgenerator_a_AR = $(AR) cru
-libgenerator_a_LIBADD =
-am_libgenerator_a_OBJECTS = mapgen.$(OBJEXT) mapgen_topology.$(OBJEXT) \
- utilities.$(OBJEXT) height_map.$(OBJEXT) startpos.$(OBJEXT) \
- temperature_map.$(OBJEXT)
-libgenerator_a_OBJECTS = $(am_libgenerator_a_OBJECTS)
-
-DEFS = @DEFS@
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-depcomp = $(SHELL) $(top_srcdir)/bootstrap/depcomp
-am__depfiles_maybe = depfiles
- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/height_map.Po ./$(DEPDIR)/mapgen.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/mapgen_topology.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/startpos.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/temperature_map.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/utilities.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-CFLAGS = @CFLAGS@
-DIST_SOURCES = $(libgenerator_a_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(libgenerator_a_SOURCES)
-
all: all-am
.SUFFIXES:
.SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu server/generator/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu server/generator/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu server/generator/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
clean-noinstLIBRARIES:
-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
@@ -247,7 +333,7 @@ libgenerator.a: $(libgenerator_a_OBJECTS) $(libgenerator_a_DEPENDENCIES)
$(RANLIB) libgenerator.a
mostlyclean-compile:
- -rm -f *.$(OBJEXT) core *.core
+ -rm -f *.$(OBJEXT)
distclean-compile:
-rm -f *.tab.c
@@ -259,90 +345,106 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/temperature_map.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/utilities.Po at am__quote@
-distclean-depend:
- -rm -rf ./$(DEPDIR)
-
.c.o:
- at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
- at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- $(COMPILE) -c `cygpath -w $<`
-CCDEPMODE = @CCDEPMODE@
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: CTAGS
+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(LIBRARIES)
-
installdirs:
-
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -354,7 +456,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -362,7 +464,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -372,48 +475,85 @@ clean: clean-am
clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
distclean: distclean-am
-
-distclean-am: clean-am distclean-compile distclean-depend \
- distclean-generic distclean-tags
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-tags
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am:
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-compile mostlyclean-generic
-uninstall-am: uninstall-info-am
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
-.PHONY: GTAGS all all-am check check-am clean clean-generic \
- clean-noinstLIBRARIES distclean distclean-compile \
- distclean-depend distclean-generic distclean-tags distdir dvi \
- dvi-am info info-am install install-am install-data \
- install-data-am install-exec install-exec-am install-info \
- install-info-am install-man install-strip installcheck \
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ clean-noinstLIBRARIES ctags distclean distclean-compile \
+ distclean-generic distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic tags uninstall uninstall-am \
- uninstall-info-am
+ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+ uninstall-am
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/server/hand_gen.c b/server/hand_gen.c
index 35d28f5..0252d82 100644
--- a/server/hand_gen.c
+++ b/server/hand_gen.c
@@ -314,6 +314,12 @@ bool server_handle_packet(enum packet_type type, void *packet,
handle_single_want_hack_req(pconn, packet);
return TRUE;
+ case PACKET_VOTE_SUBMIT:
+ handle_vote_submit(pconn,
+ ((struct packet_vote_submit *)packet)->vote_no,
+ ((struct packet_vote_submit *)packet)->value);
+ return TRUE;
+
default:
return FALSE;
}
diff --git a/server/hand_gen.h b/server/hand_gen.h
index 0ad6ed6..d3da334 100644
--- a/server/hand_gen.h
+++ b/server/hand_gen.h
@@ -74,5 +74,6 @@ void handle_spaceship_launch(struct player *pplayer);
void handle_spaceship_place(struct player *pplayer, enum spaceship_place_type type, int num);
struct packet_single_want_hack_req;
void handle_single_want_hack_req(struct connection *pc, struct packet_single_want_hack_req *packet);
+void handle_vote_submit(struct connection *pc, int vote_no, int value);
#endif /* FC__HAND_GEN_H */
diff --git a/server/maphand.c b/server/maphand.c
index 6058d30..4b1aa97 100644
--- a/server/maphand.c
+++ b/server/maphand.c
@@ -588,8 +588,10 @@ static void map_unfog_tile(struct player *pplayer, struct tile *ptile,
if (pplayer2 == pplayer || really_gives_vision(pplayer, pplayer2)) {
bool known = map_is_known(ptile, pplayer2);
+ /* When fog of war is disabled, the seen count is always at least 1. */
if ((!known && can_reveal_tiles)
- || (known && map_get_seen(ptile, pplayer2, vlayer) == 1)) {
+ || (known && (map_get_seen(ptile, pplayer2, vlayer)
+ == 1 + !game.info.fogofwar))) {
really_unfog_tile(pplayer2, ptile, vlayer);
}
}
@@ -1241,7 +1243,11 @@ void give_shared_vision(struct player *pfrom, struct player *pto)
if (change != 0) {
map_change_seen(ptile, pplayer2, change, v);
- if (map_get_seen(ptile, pplayer2, v) == change
+ /* When fog of war is disabled, the seen count is always
+ * at least 1. Also when it's on the city radius, it has
+ * the same behaviour. */
+ if ((map_get_seen(ptile, pplayer2, v) == change
+ || !map_is_known(ptile, pplayer2))
&& map_is_known(ptile, pplayer)) {
really_unfog_tile(pplayer2, ptile, v);
}
@@ -1407,7 +1413,8 @@ static void bounce_units_on_terrain_change(struct tile *ptile)
/* look for a nearby safe tile */
adjc_iterate(ptile, ptile2) {
if (can_unit_exist_at_tile(punit, ptile2)
- && !is_non_allied_unit_tile(ptile2, unit_owner(punit))) {
+ && !is_non_allied_unit_tile(ptile2, unit_owner(punit))
+ && !is_non_allied_city_tile(ptile2, unit_owner(punit))) {
freelog(LOG_VERBOSE,
"Moved %s %s due to changing terrain at (%d,%d).",
nation_rule_name(nation_of_unit(punit)),
diff --git a/server/meta.c b/server/meta.c
index 757cd12..773625a 100644
--- a/server/meta.c
+++ b/server/meta.c
@@ -241,7 +241,9 @@ static bool send_to_metaserver(enum meta_flag flag)
}
/* get hostname */
- if (my_gethostname(host, sizeof(host)) != 0) {
+ if (srvarg.metaserver_name[0] != '\0') {
+ sz_strlcpy(host, srvarg.metaserver_name);
+ } else if (my_gethostname(host, sizeof(host)) != 0) {
sz_strlcpy(host, "unknown");
}
diff --git a/server/meta.h b/server/meta.h
index d7a02f8..f2017ee 100644
--- a/server/meta.h
+++ b/server/meta.h
@@ -16,7 +16,7 @@
#include "shared.h" /* bool type */
#define DEFAULT_META_SERVER_NO_SEND TRUE
-#define DEFAULT_META_SERVER_ADDR "http://www.cazfi.net/freeciv/metaserver/"
+#define DEFAULT_META_SERVER_ADDR "http://meta.freeciv.org/metaserver.phtml"
#define METASERVER_REFRESH_INTERVAL (3*60)
#define METASERVER_MIN_UPDATE_INTERVAL 7 /* not too short, not too long */
diff --git a/server/plrhand.c b/server/plrhand.c
index f96c822..badef4e 100644
--- a/server/plrhand.c
+++ b/server/plrhand.c
@@ -47,11 +47,11 @@
#include "settlers.h"
#include "srv_main.h"
#include "stdinhand.h"
-#include "techtools.h"
-#include "unittools.h"
#include "spaceship.h"
#include "spacerace.h"
+#include "techtools.h"
#include "unittools.h"
+#include "voting.h"
#include "advdiplomacy.h"
#include "advmilitary.h"
@@ -739,22 +739,34 @@ void notify_embassies(struct player *pplayer, struct player *exclude,
}
/**************************************************************************
- Sends a message to all players on pplayer's team
+ Sends a message to all players on pplayer's team. If 'pplayer' is NULL,
+ sends to all players.
**************************************************************************/
-void notify_team(struct player *pplayer,
- struct tile *ptile, enum event_type event,
- const char* format, ...)
+void notify_team(const struct player *pplayer, struct tile *ptile,
+ enum event_type event, const char* format, ...)
{
+ struct conn_list *dest = game.est_connections;
va_list args;
- players_iterate(other_player) {
- va_start(args, format);
- if (!players_on_same_team(pplayer, other_player)) {
- continue;
- }
- vnotify_conn(other_player->connections, ptile, event, format, args);
- va_end(args);
- } players_iterate_end;
+ if (pplayer) {
+ dest = conn_list_new();
+ players_iterate(other_player) {
+ if (!players_on_same_team(pplayer, other_player)) {
+ continue;
+ }
+ conn_list_iterate(other_player->connections, pconn) {
+ conn_list_append(dest, pconn);
+ } conn_list_iterate_end;
+ } players_iterate_end;
+ }
+
+ va_start(args, format);
+ vnotify_conn(dest, ptile, event, format, args);
+ va_end(args);
+
+ if (pplayer) {
+ conn_list_free(dest);
+ }
}
/****************************************************************************
@@ -1122,6 +1134,8 @@ void server_remove_player(struct player *pplayer)
game_renumber_players(player_number(pplayer));
aifill(game.info.aifill);
+
+ send_updated_vote_totals(NULL);
}
/**************************************************************************
diff --git a/server/plrhand.h b/server/plrhand.h
index a5e6380..02843c4 100644
--- a/server/plrhand.h
+++ b/server/plrhand.h
@@ -60,7 +60,7 @@ void notify_embassies(struct player *pplayer, struct player *exclude,
struct tile *ptile, enum event_type event,
const char *format, ...)
fc__attribute((__format__ (__printf__, 5, 6)));
-void notify_team(struct player* pplayer, struct tile *ptile,
+void notify_team(const struct player* pplayer, struct tile *ptile,
enum event_type event, const char *format, ...)
fc__attribute((__format__ (__printf__, 4, 5)));
void notify_research(struct player *pplayer,
diff --git a/server/report.c b/server/report.c
index ef64d6e..e63afe3 100644
--- a/server/report.c
+++ b/server/report.c
@@ -524,6 +524,11 @@ static int get_corruption(struct player *pplayer)
return result;
}
+static int get_total_score(struct player *pplayer)
+{
+ return pplayer->score.game;
+}
+
/**************************************************************************
...
**************************************************************************/
@@ -878,9 +883,9 @@ static bool scan_score_log(FILE * fp, int *last_turn, char *id,
}
/**************************************************************************
-Create a log file of the civilizations so you can see what was happening.
+ Create a log file of the civilizations so you can see what was happening.
**************************************************************************/
-static void log_civ_score(void)
+void log_civ_score(void)
{
static const char logname[] = "civscore.log";
static FILE *fp = NULL;
@@ -924,13 +929,19 @@ static void log_civ_score(void)
{"unhappypop", get_unhappypop},
{"specialists", get_specialists},
{"gov", get_gov},
- {"corruption", get_corruption} /* new 1.11.5 tags end here */
+ {"corruption", get_corruption}, /* new 1.11.5 tags end here */
+
+ {"score", get_total_score} /* New 2.1.10 tag */
};
enum { SL_CREATE, SL_APPEND, SL_UNSPEC } oper = SL_UNSPEC;
int i;
char id[MAX_ID_LEN];
+ if (!game.scorelog) {
+ return;
+ }
+
if (!player_name_ptrs[0]) {
int i;
@@ -1060,10 +1071,6 @@ log_civ_score_disable:
**************************************************************************/
void make_history_report(void)
{
- if (game.scorelog) {
- log_civ_score();
- }
-
if (player_count() == 1) {
return;
}
@@ -1081,12 +1088,16 @@ void make_history_report(void)
/**************************************************************************
Inform clients about player scores and statistics when the game ends.
**************************************************************************/
-void report_final_scores(void)
+void report_final_scores(struct conn_list *dest)
{
int i, j = 0;
struct player_score_entry size[player_count()];
struct packet_endgame_report packet;
+ if (!dest) {
+ dest = game.est_connections;
+ }
+
players_iterate(pplayer) {
if (GOOD_PLAYER(pplayer)) {
size[j].value = pplayer->score.game;
@@ -1105,7 +1116,7 @@ void report_final_scores(void)
packet.bnp[i] = get_economics(size[i].player);
packet.mfg[i] = get_production(size[i].player);
packet.cities[i] = get_cities(size[i].player);
- packet.techs[i] = get_techs(size[i].player) - 1;
+ packet.techs[i] = get_techs(size[i].player);
packet.mil_service[i] = get_mil_service(size[i].player);
packet.wonders[i] = get_wonders(size[i].player);
packet.research[i] = get_research(size[i].player);
@@ -1115,7 +1126,7 @@ void report_final_scores(void)
packet.spaceship[i] = get_spaceship(size[i].player);
}
- lsend_packet_endgame_report(game.est_connections, &packet);
+ lsend_packet_endgame_report(dest, &packet);
}
/**************************************************************************
diff --git a/server/report.h b/server/report.h
index 7a94fd2..0ef11ba 100644
--- a/server/report.h
+++ b/server/report.h
@@ -21,6 +21,7 @@ struct conn_list;
void page_conn(struct conn_list *dest, const char *caption, const char *headline,
const char *lines);
+void log_civ_score(void);
void make_history_report(void);
void report_wonders_of_the_world(struct conn_list *dest);
void report_top_five_cities(struct conn_list *dest);
@@ -28,7 +29,7 @@ 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);
+void report_final_scores(struct conn_list *dest);
/* See also report_server_options() in stdinhand.h */
diff --git a/server/ruleset.c b/server/ruleset.c
index d614b9a..297107e 100644
--- a/server/ruleset.c
+++ b/server/ruleset.c
@@ -242,7 +242,8 @@ static char *check_ruleset_capabilities(struct section_file *file,
**************************************************************************/
static struct requirement_vector *lookup_req_list(struct section_file *file,
const char *sec,
- const char *sub)
+ const char *sub,
+ const char *rfor)
{
char *type, *name;
int j;
@@ -281,6 +282,12 @@ static struct requirement_vector *lookup_req_list(struct section_file *file,
requirement_vector_append(&list, &req);
}
+ if (j > MAX_NUM_REQS) {
+ freelog(LOG_FATAL, "Too many (%d) requirements for %s. Max is %d",
+ j, rfor, MAX_NUM_REQS);
+ exit(EXIT_FAILURE);
+ }
+
return &list;
}
@@ -1328,8 +1335,10 @@ static void load_ruleset_buildings(struct section_file *file)
sec = secfile_get_secnames_prefix(file, BUILDING_SECTION_PREFIX, &nval);
for (i = 0; i < nval; i++) {
- struct requirement_vector *reqs = lookup_req_list(file, sec[i], "reqs");
struct impr_type *b = improvement_by_number(i);
+ struct requirement_vector *reqs =
+ lookup_req_list(file, sec[i], "reqs",
+ improvement_rule_name(i));
char *sval, **slist;
int j, nflags, ival;
@@ -1786,7 +1795,8 @@ static void load_ruleset_governments(struct section_file *file)
/* easy ones: */
government_iterate(g) {
int i = g->index;
- struct requirement_vector *reqs = lookup_req_list(file, sec[i], "reqs");
+ struct requirement_vector *reqs = lookup_req_list(file, sec[i], "reqs",
+ government_rule_name(g));
if (section_file_lookup(file, "%s.ai_better", sec[i])) {
char entry[100];
@@ -2406,7 +2416,7 @@ static void load_ruleset_cities(struct section_file *file)
item = secfile_lookup_str_default(file, s->name, "%s.short_name", sec[i]);
sz_strlcpy(s->short_name, item);
- reqs = lookup_req_list(file, sec[i], "reqs");
+ reqs = lookup_req_list(file, sec[i], "reqs", s->name);
requirement_vector_copy(&s->reqs, reqs);
if (requirement_vector_size(&s->reqs) == 0 && DEFAULT_SPECIALIST == -1) {
@@ -2466,7 +2476,7 @@ static void load_ruleset_cities(struct section_file *file)
secfile_lookup_str_default(file, "generic",
"%s.citizens_graphic_alt", styles[i]));
- reqs = lookup_req_list(file, styles[i], "reqs");
+ reqs = lookup_req_list(file, styles[i], "reqs", city_style_rule_name(i));
requirement_vector_copy(&city_styles[i].reqs, reqs);
replacement = secfile_lookup_str(file, "%s.replaced_by", styles[i]);
@@ -2521,13 +2531,15 @@ static void load_ruleset_effects(struct section_file *file)
peffect = effect_new(eff, value);
- requirement_vector_iterate(lookup_req_list(file, sec[i], "reqs"), req) {
+ requirement_vector_iterate(lookup_req_list(file, sec[i], "reqs", type),
+ req) {
struct requirement *preq = fc_malloc(sizeof(*preq));
*preq = *req;
effect_req_append(peffect, FALSE, preq);
} requirement_vector_iterate_end;
- requirement_vector_iterate(lookup_req_list(file, sec[i], "nreqs"), req) {
+ requirement_vector_iterate(lookup_req_list(file, sec[i], "nreqs", type),
+ req) {
struct requirement *preq = fc_malloc(sizeof(*preq));
*preq = *req;
diff --git a/server/savegame.c b/server/savegame.c
index 2037bac..2a6e5c7 100644
--- a/server/savegame.c
+++ b/server/savegame.c
@@ -2494,7 +2494,6 @@ static void player_load(struct player *plr, int plrno,
}
}
- init_worklist(&pcity->worklist);
worklist_load(file, &pcity->worklist, "player%d.c%d", plrno, i);
/* FIXME: remove this when the urgency is properly recalculated. */
@@ -3662,7 +3661,7 @@ void game_load(struct section_file *file)
if (has_capability("turn", savefile_options)) {
game.info.turn = secfile_lookup_int(file, "game.turn");
} else {
- game.info.turn = -2;
+ game.info.turn = 0;
}
game.info.simultaneous_phases
= secfile_lookup_bool_default(file, TRUE,
@@ -3732,8 +3731,11 @@ void game_load(struct section_file *file)
"game.diplomacy");
sz_strlcpy(game.save_name,
- secfile_lookup_str_default(file, GAME_DEFAULT_SAVE_NAME,
- "game.save_name"));
+ secfile_lookup_str_default(file, GAME_DEFAULT_SAVE_NAME,
+ "game.save_name"));
+ game.info.save_compress_level
+ = secfile_lookup_int_default(file, GAME_DEFAULT_COMPRESS_LEVEL,
+ "game.save_compress_level");
game.info.aifill = secfile_lookup_int_default(file, 0, "game.aifill");
@@ -3904,6 +3906,8 @@ void game_load(struct section_file *file)
map.riches = secfile_lookup_int(file, "map.riches");
map.huts = secfile_lookup_int(file, "map.huts");
map.generator = secfile_lookup_int(file, "map.generator");
+ map.startpos = secfile_lookup_int_default(file, MAP_DEFAULT_STARTPOS,
+ "map.startpos");
map.seed = secfile_lookup_int(file, "map.seed");
map.landpercent = secfile_lookup_int(file, "map.landpercent");
map.wetness = secfile_lookup_int_default(file, MAP_DEFAULT_WETNESS,
@@ -3980,7 +3984,7 @@ void game_load(struct section_file *file)
/* We're loading a running game without a seed (which is okay, if it's
* a scenario). We need to generate the game seed now because it will
* be needed later during the load. */
- if (S_S_RUNNING == tmp_server_state) {
+ if (S_S_GENERATING_WAITING < tmp_server_state) {
init_game_seed();
rstate = get_myrand_state();
}
@@ -4353,6 +4357,8 @@ void game_save(struct section_file *file, const char *save_reason)
secfile_insert_int(file, 2, "game.civstyle");
secfile_insert_int(file, game.info.save_nturns, "game.save_nturns");
secfile_insert_str(file, game.save_name, "game.save_name");
+ secfile_insert_int(file, game.info.save_compress_level,
+ "game.save_compress_level");
secfile_insert_int(file, game.info.aifill, "game.aifill");
secfile_insert_bool(file, game.scorelog, "game.scorelog");
secfile_insert_int(file, game.scoreturn, "game.scoreturn");
@@ -4408,6 +4414,7 @@ void game_save(struct section_file *file, const char *save_reason)
secfile_insert_int(file, map.steepness, "map.steepness");
secfile_insert_int(file, map.huts, "map.huts");
secfile_insert_int(file, map.generator, "map.generator");
+ secfile_insert_int(file, map.startpos, "map.startpos");
secfile_insert_bool(file, map.have_huts, "map.have_huts");
secfile_insert_int(file, map.temperature, "map.temperature");
secfile_insert_bool(file, map.alltemperate, "map.alltemperate");
diff --git a/server/score.c b/server/score.c
index 5e02115..d6939c4 100644
--- a/server/score.c
+++ b/server/score.c
@@ -34,6 +34,7 @@
#include "srv_main.h"
static int get_civ_score(const struct player *pplayer);
+static int get_spaceship_score(const struct player *pplayer);
/**************************************************************************
Allocates, fills and returns a land area claim map.
@@ -306,12 +307,7 @@ void calc_civ_score(struct player *pplayer)
}
} impr_type_iterate_end;
- /* How much should a spaceship be worth?
- * This gives 100 points per 10,000 citizens. */
- if (pplayer->spaceship.state == SSHIP_ARRIVED) {
- pplayer->score.spaceship += (int)(100 * pplayer->spaceship.habitation
- * pplayer->spaceship.success_rate);
- }
+ pplayer->score.spaceship = pplayer->spaceship.state;
pplayer->score.game = get_civ_score(pplayer);
}
@@ -326,7 +322,22 @@ static int get_civ_score(const struct player *pplayer)
return (total_player_citizens(pplayer)
+ pplayer->score.techs * 2
+ pplayer->score.wonders * 5
- + pplayer->score.spaceship);
+ + get_spaceship_score(pplayer));
+}
+
+/**************************************************************************
+ Return the spaceship score
+**************************************************************************/
+static int get_spaceship_score(const struct player *pplayer)
+{
+ if (pplayer->score.spaceship == SSHIP_ARRIVED) {
+ /* How much should a spaceship be worth?
+ * This gives 100 points per 10,000 citizens. */
+ return (int)(100 * pplayer->spaceship.habitation
+ * pplayer->spaceship.success_rate);
+ } else {
+ return 0;
+ }
}
/**************************************************************************
diff --git a/server/scripting/Makefile.in b/server/scripting/Makefile.in
index 22212fe..1713f89 100644
--- a/server/scripting/Makefile.in
+++ b/server/scripting/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,84 +14,115 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = server/scripting
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+libscripting_a_AR = $(AR) $(ARFLAGS)
+libscripting_a_LIBADD =
+dist_libscripting_a_OBJECTS = api_actions.$(OBJEXT) api_find.$(OBJEXT) \
+ api_gen.$(OBJEXT) api_intl.$(OBJEXT) api_methods.$(OBJEXT) \
+ api_notify.$(OBJEXT) api_utilities.$(OBJEXT) script.$(OBJEXT) \
+ script_signal.$(OBJEXT)
+libscripting_a_OBJECTS = $(dist_libscripting_a_OBJECTS)
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/bootstrap/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(dist_libscripting_a_SOURCES)
+DIST_SOURCES = $(dist_libscripting_a_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -101,10 +133,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -112,27 +148,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -140,6 +188,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -150,17 +200,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -173,14 +244,38 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
noinst_LIBRARIES = libscripting.a
-
AM_CPPFLAGS = \
-I$(top_srcdir)/utility -I$(top_srcdir)/common \
-I$(top_srcdir)/intl -I$(top_srcdir)/server \
@@ -210,54 +305,43 @@ dist_libscripting_a_SOURCES = \
script_signal.c \
script_signal.h
-
EXTRA_DIST = \
api.pkg
-subdir = server/scripting
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-libscripting_a_AR = $(AR) cru
-libscripting_a_LIBADD =
-dist_libscripting_a_OBJECTS = api_actions.$(OBJEXT) api_find.$(OBJEXT) \
- api_gen.$(OBJEXT) api_intl.$(OBJEXT) api_methods.$(OBJEXT) \
- api_notify.$(OBJEXT) api_utilities.$(OBJEXT) script.$(OBJEXT) \
- script_signal.$(OBJEXT)
-libscripting_a_OBJECTS = $(dist_libscripting_a_OBJECTS)
-
-DEFS = @DEFS@
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-depcomp = $(SHELL) $(top_srcdir)/bootstrap/depcomp
-am__depfiles_maybe = depfiles
- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/api_actions.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/api_find.Po ./$(DEPDIR)/api_gen.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/api_intl.Po ./$(DEPDIR)/api_methods.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/api_notify.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/api_utilities.Po ./$(DEPDIR)/script.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/script_signal.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-CFLAGS = @CFLAGS@
-DIST_SOURCES = $(dist_libscripting_a_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(dist_libscripting_a_SOURCES)
-
all: all-am
.SUFFIXES:
.SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu server/scripting/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu server/scripting/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu server/scripting/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
clean-noinstLIBRARIES:
-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
@@ -267,7 +351,7 @@ libscripting.a: $(libscripting_a_OBJECTS) $(libscripting_a_DEPENDENCIES)
$(RANLIB) libscripting.a
mostlyclean-compile:
- -rm -f *.$(OBJEXT) core *.core
+ -rm -f *.$(OBJEXT)
distclean-compile:
-rm -f *.tab.c
@@ -282,90 +366,106 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/script.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/script_signal.Po at am__quote@
-distclean-depend:
- -rm -rf ./$(DEPDIR)
-
.c.o:
- at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
- at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- $(COMPILE) -c `cygpath -w $<`
-CCDEPMODE = @CCDEPMODE@
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: CTAGS
+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(LIBRARIES)
-
installdirs:
-
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -377,7 +477,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -385,7 +485,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -395,52 +496,89 @@ clean: clean-am
clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
distclean: distclean-am
-
-distclean-am: clean-am distclean-compile distclean-depend \
- distclean-generic distclean-tags
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-tags
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am:
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-compile mostlyclean-generic
-uninstall-am: uninstall-info-am
+pdf: pdf-am
+
+pdf-am:
-.PHONY: GTAGS all all-am check check-am clean clean-generic \
- clean-noinstLIBRARIES distclean distclean-compile \
- distclean-depend distclean-generic distclean-tags distdir dvi \
- dvi-am info info-am install install-am install-data \
- install-data-am install-exec install-exec-am install-info \
- install-info-am install-man install-strip installcheck \
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ clean-noinstLIBRARIES ctags distclean distclean-compile \
+ distclean-generic distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic tags uninstall uninstall-am \
- uninstall-info-am
+ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+ uninstall-am
$(srcdir)/api_gen.c $(srcdir)/api_gen.h: $(srcdir)/api.pkg
$(top_builddir)/dependencies/tolua/tolua -n api -o $(srcdir)/api_gen.c -H $(srcdir)/api_gen.h $(srcdir)/api.pkg
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/server/scripting/api.pkg b/server/scripting/api.pkg
index 862cf27..cdd74f7 100644
--- a/server/scripting/api.pkg
+++ b/server/scripting/api.pkg
@@ -373,11 +373,11 @@ $[
-- Notify module implementation.
function notify.all(...)
- notify.event_msg(nil, nil, E.NOEVENT, string.format(unpack(arg)))
+ notify.event_msg(nil, nil, E.TUTORIAL, string.format(unpack(arg)))
end
function notify.player(player, ...)
- notify.event_msg(player, nil, E.NOEVENT, string.format(unpack(arg)))
+ notify.event_msg(player, nil, E.TUTORIAL, string.format(unpack(arg)))
end
function notify.event(player, tile, event, ...)
diff --git a/server/scripting/api_gen.c b/server/scripting/api_gen.c
index b139a06..0c38727 100644
--- a/server/scripting/api_gen.c
+++ b/server/scripting/api_gen.c
@@ -1,6 +1,6 @@
/*
** Lua binding: api
-** Generated automatically by tolua 5.0a on Wed Mar 25 09:24:49 2009.
+** Generated automatically by tolua 5.0a on Sat Oct 3 18:52:02 2009.
*/
#ifndef __cplusplus
@@ -1813,34 +1813,34 @@ TOLUA_API int tolua_api_open (lua_State* tolua_S)
10,102,117,110, 99,116,105,111,110, 32,110,111,116,105,102,
121, 46, 97,108,108, 40, 46, 46, 46, 41, 10,110,111,116,105,
102,121, 46,101,118,101,110,116, 95,109,115,103, 40,110,105,
- 108, 44, 32,110,105,108, 44, 32, 69, 46, 78, 79, 69, 86, 69,
- 78, 84, 44, 32,115,116,114,105,110,103, 46,102,111,114,109,
- 97,116, 40,117,110,112, 97, 99,107, 40, 97,114,103, 41, 41,
- 41, 10,101,110,100, 10,102,117,110, 99,116,105,111,110, 32,
- 110,111,116,105,102,121, 46,112,108, 97,121,101,114, 40,112,
- 108, 97,121,101,114, 44, 32, 46, 46, 46, 41, 10,110,111,116,
- 105,102,121, 46,101,118,101,110,116, 95,109,115,103, 40,112,
- 108, 97,121,101,114, 44, 32,110,105,108, 44, 32, 69, 46, 78,
- 79, 69, 86, 69, 78, 84, 44, 32,115,116,114,105,110,103, 46,
+ 108, 44, 32,110,105,108, 44, 32, 69, 46, 84, 85, 84, 79, 82,
+ 73, 65, 76, 44, 32,115,116,114,105,110,103, 46,102,111,114,
+ 109, 97,116, 40,117,110,112, 97, 99,107, 40, 97,114,103, 41,
+ 41, 41, 10,101,110,100, 10,102,117,110, 99,116,105,111,110,
+ 32,110,111,116,105,102,121, 46,112,108, 97,121,101,114, 40,
+ 112,108, 97,121,101,114, 44, 32, 46, 46, 46, 41, 10,110,111,
+ 116,105,102,121, 46,101,118,101,110,116, 95,109,115,103, 40,
+ 112,108, 97,121,101,114, 44, 32,110,105,108, 44, 32, 69, 46,
+ 84, 85, 84, 79, 82, 73, 65, 76, 44, 32,115,116,114,105,110,
+ 103, 46,102,111,114,109, 97,116, 40,117,110,112, 97, 99,107,
+ 40, 97,114,103, 41, 41, 41, 10,101,110,100, 10,102,117,110,
+ 99,116,105,111,110, 32,110,111,116,105,102,121, 46,101,118,
+ 101,110,116, 40,112,108, 97,121,101,114, 44, 32,116,105,108,
+ 101, 44, 32,101,118,101,110,116, 44, 32, 46, 46, 46, 41, 10,
+ 110,111,116,105,102,121, 46,101,118,101,110,116, 95,109,115,
+ 103, 40,112,108, 97,121,101,114, 44, 32,116,105,108,101, 44,
+ 32,101,118,101,110,116, 44, 32,115,116,114,105,110,103, 46,
102,111,114,109, 97,116, 40,117,110,112, 97, 99,107, 40, 97,
114,103, 41, 41, 41, 10,101,110,100, 10,102,117,110, 99,116,
- 105,111,110, 32,110,111,116,105,102,121, 46,101,118,101,110,
- 116, 40,112,108, 97,121,101,114, 44, 32,116,105,108,101, 44,
- 32,101,118,101,110,116, 44, 32, 46, 46, 46, 41, 10,110,111,
- 116,105,102,121, 46,101,118,101,110,116, 95,109,115,103, 40,
- 112,108, 97,121,101,114, 44, 32,116,105,108,101, 44, 32,101,
- 118,101,110,116, 44, 32,115,116,114,105,110,103, 46,102,111,
- 114,109, 97,116, 40,117,110,112, 97, 99,107, 40, 97,114,103,
- 41, 41, 41, 10,101,110,100, 10,102,117,110, 99,116,105,111,
- 110, 32,110,111,116,105,102,121, 46,101,109, 98, 97,115,115,
- 105,101,115, 40,112,108, 97,121,101,114, 44, 32,112,116,105,
- 108,101, 44, 32,101,118,101,110,116, 44, 32, 46, 46, 46, 41,
- 10,110,111,116,105,102,121, 46,101,109, 98, 97,115,115,105,
- 101,115, 95,109,115,103, 40,112,108, 97,121,101,114, 44, 32,
- 112,116,105,108,101, 44, 32,101,118,101,110,116, 44, 32,115,
- 116,114,105,110,103, 46,102,111,114,109, 97,116, 40,117,110,
- 112, 97, 99,107, 40, 97,114,103, 41, 41, 41, 10,101,110,100,
- 32
+ 105,111,110, 32,110,111,116,105,102,121, 46,101,109, 98, 97,
+ 115,115,105,101,115, 40,112,108, 97,121,101,114, 44, 32,112,
+ 116,105,108,101, 44, 32,101,118,101,110,116, 44, 32, 46, 46,
+ 46, 41, 10,110,111,116,105,102,121, 46,101,109, 98, 97,115,
+ 115,105,101,115, 95,109,115,103, 40,112,108, 97,121,101,114,
+ 44, 32,112,116,105,108,101, 44, 32,101,118,101,110,116, 44,
+ 32,115,116,114,105,110,103, 46,102,111,114,109, 97,116, 40,
+ 117,110,112, 97, 99,107, 40, 97,114,103, 41, 41, 41, 10,101,
+ 110,100,32
};
lua_dobuffer(tolua_S,(char*)B,sizeof(B),"tolua: embedded Lua code");
} /* end of embedded lua code */
diff --git a/server/scripting/api_gen.h b/server/scripting/api_gen.h
index c01b4bf..a3a5a44 100644
--- a/server/scripting/api_gen.h
+++ b/server/scripting/api_gen.h
@@ -1,6 +1,6 @@
/*
** Lua binding: api
-** Generated automatically by tolua 5.0a on Wed Mar 25 09:24:49 2009.
+** Generated automatically by tolua 5.0a on Sat Oct 3 18:52:02 2009.
*/
/* Exported function */
diff --git a/server/sernet.c b/server/sernet.c
index b7ab4a5..9c9956e 100644
--- a/server/sernet.c
+++ b/server/sernet.c
@@ -82,6 +82,7 @@
#include "plrhand.h"
#include "srv_main.h"
#include "stdinhand.h"
+#include "voting.h"
#include "sernet.h"
@@ -203,6 +204,8 @@ void close_connection(struct connection *pconn)
return;
}
+ cancel_connection_votes(pconn);
+
if (pconn->server.ping_timers != NULL) {
timer_list_iterate(pconn->server.ping_timers, timer) {
free_timer(timer);
@@ -219,6 +222,8 @@ void close_connection(struct connection *pconn)
pconn->player = NULL;
pconn->access_level = ALLOW_NONE;
connection_common_close(pconn);
+
+ send_updated_vote_totals(NULL);
}
/*****************************************************************************
@@ -495,7 +500,7 @@ enum server_events server_sniff_all_input(void)
if (connections && conn_list_size(game.est_connections) == 0) {
if (last_noplayers != 0) {
if (time(NULL) > last_noplayers + srvarg.quitidle) {
- save_game_auto("Lost all connections");
+ save_game_auto("Lost all connections", "quitidle");
set_meta_message_string("restarting for lack of players");
freelog(LOG_NORMAL, "%s", get_meta_message_string());
(void) send_server_info_to_metaserver(META_INFO);
@@ -566,7 +571,7 @@ enum server_events server_sniff_all_input(void)
} conn_list_iterate_end
/* Don't wait if timeout == -1 (i.e. on auto games) */
- if (S_S_INITIAL != server_state() && game.info.timeout == -1) {
+ if (S_S_RUNNING == server_state() && game.info.timeout == -1) {
(void) send_server_info_to_metaserver(META_REFRESH);
return S_E_END_OF_TURN_TIMEOUT;
}
@@ -877,9 +882,8 @@ int server_make_connection(int new_sock, const char *client_addr, const char *cl
pconn->server.auth_tries = 0;
pconn->server.auth_settime = 0;
pconn->server.status = AS_NOT_ESTABLISHED;
- pconn->server.ping_timers =
- fc_malloc(sizeof(*pconn->server.ping_timers));
pconn->server.ping_timers = timer_list_new();
+ pconn->server.granted_access_level = pconn->access_level;
pconn->ping_time = -1.0;
pconn->incoming_packet_notify = NULL;
pconn->outgoing_packet_notify = NULL;
diff --git a/server/srv_main.c b/server/srv_main.c
index 037de2f..9b0cb8a 100644
--- a/server/srv_main.c
+++ b/server/srv_main.c
@@ -99,6 +99,7 @@
#include "techtools.h"
#include "unithand.h"
#include "unittools.h"
+#include "voting.h"
#include "advdiplomacy.h"
#include "advmilitary.h"
@@ -172,6 +173,7 @@ void srv_init(void)
srvarg.metaserver_no_send = DEFAULT_META_SERVER_NO_SEND;
sz_strlcpy(srvarg.metaserver_addr, DEFAULT_META_SERVER_ADDR);
+ srvarg.metaserver_name[0] = '\0';
srvarg.bind_addr = NULL;
srvarg.port = DEFAULT_SOCK_PORT;
@@ -357,7 +359,9 @@ bool check_for_game_over(void)
void send_all_info(struct conn_list *dest)
{
conn_list_iterate(dest, pconn) {
- send_attribute_block(pconn->player,pconn);
+ if (conn_controls_player(pconn)) {
+ send_attribute_block(pconn->player, pconn);
+ }
}
conn_list_iterate_end;
@@ -568,20 +572,27 @@ static void update_diplomatics(void)
****************************************************************************/
static void kill_dying_players(void)
{
+ bool voter_died = FALSE;
+
players_iterate(pplayer) {
if (pplayer->is_alive) {
/* cities or units remain? */
if (0 == city_list_size(pplayer->cities)
- && 0 == unit_list_size(pplayer->units)) {
- pplayer->is_dying = TRUE;
+ && 0 == unit_list_size(pplayer->units)) {
+ pplayer->is_dying = TRUE;
}
/* also F_GAMELOSS in unittools server_remove_unit() */
if (pplayer->is_dying) {
- pplayer->is_dying = FALSE; /* Can't get more dead than this. */
- kill_player(pplayer);
+ pplayer->is_dying = FALSE; /* Can't get more dead than this. */
+ voter_died = voter_died || pplayer->is_connected;
+ kill_player(pplayer);
}
}
} players_iterate_end;
+
+ if (voter_died) {
+ send_updated_vote_totals(NULL);
+ }
}
/**************************************************************************
@@ -631,6 +642,7 @@ static void begin_turn(bool is_new_turn)
players_iterate(pplayer) {
calc_civ_score(pplayer);
} players_iterate_end;
+ log_civ_score();
}
/* find out if users attached to players have been attached to those players
@@ -847,6 +859,7 @@ static void end_turn(void)
update_diplomatics();
make_history_report();
stdinhand_turn();
+ voting_turn();
send_player_turn_notifications(NULL);
freelog(LOG_DEBUG, "Gamenextyear");
@@ -867,9 +880,11 @@ static void end_turn(void)
/**************************************************************************
Generate a default save file name and place it in the provided buffer.
- The name will be of the form "<prefix>-T<turn>-Y<year><suffix><m>" where:
+ The name will be of the form
+ "<prefix>-<reason>-T<turn>-Y<year><suffix><m>" where:
<prefix> = game.save_name
+ <reason> = save reason if not normal save
<turn> = game.info.turn (zero padded to 3 places)
<year> = game.info.year (not padded and no sign)
<suffix> = "BC" or "AD" for negative or positive year resp.
@@ -878,7 +893,8 @@ static void end_turn(void)
Returns the number of characters written, or the number of characters
that would have been written if truncation occurs.
**************************************************************************/
-static int generate_save_name(char *buf, int buflen, bool is_auto_save)
+static int generate_save_name(char *buf, int buflen, bool is_auto_save,
+ const char *reason)
{
int nb, year;
const char *year_suffix;
@@ -893,9 +909,15 @@ static int generate_save_name(char *buf, int buflen, bool is_auto_save)
/* NB: If you change the format here, be sure to update the above
* function comment and the help text for the 'savename' setting. */
- nb = my_snprintf(buf, buflen, "%s-T%03d-Y%d%s%s",
- game.save_name, game.info.turn, year,
- year_suffix, is_auto_save ? "" : "m");
+ if (reason == NULL) {
+ nb = my_snprintf(buf, buflen, "%s-T%03d-Y%d%s%s",
+ game.save_name, game.info.turn, year,
+ year_suffix, is_auto_save ? "" : "m");
+ } else {
+ nb = my_snprintf(buf, buflen, "%s-%s-T%03d-Y%d%s%s",
+ game.save_name, reason, game.info.turn, year,
+ year_suffix, is_auto_save ? "" : "m");
+ }
return nb;
}
@@ -908,42 +930,56 @@ become non-zero, so no need to check HAVE_LIBZ explicitly here as well.
**************************************************************************/
void save_game(char *orig_filename, const char *save_reason)
{
- char filename[600];
- char *dot;
+ char filepath[600];
+ char *dot, *filename;
struct section_file file;
struct timer *timer_cpu, *timer_user;
if (!orig_filename) {
- filename[0] = '\0';
+ filepath[0] = '\0';
+ filename = filepath;
} else {
- sz_strlcpy(filename, orig_filename);
- }
+ sz_strlcpy(filepath, orig_filename);
+ if ((filename = strrchr(filepath, '/'))) {
+ filename++;
+ } else {
+ filename = filepath;
+ }
- /* Strip extension. */
- if ((dot = strchr(filename, '.'))) {
- *dot = '\0';
+ /* Ignores the dot at the start of the filename. */
+ for (dot = filename; '.' == *dot; dot++) {
+ /* Nothing. */
+ }
+ if ('\0' == *dot) {
+ /* Only dots in this file name, consider it as empty. */
+ filename[0] = '\0';
+ } else if ((dot = strchr(dot, '.'))) {
+ /* Strikes extension. */
+ *dot = '\0';
+ }
}
/* If orig_filename is NULL or empty, use a generated default name. */
if (filename[0] == '\0'){
- generate_save_name(filename, sizeof(filename), FALSE);
+ generate_save_name(filename, sizeof(filepath) + filepath - filename,
+ FALSE, NULL);
}
-
+
timer_cpu = new_timer_start(TIMER_CPU, TIMER_ACTIVE);
timer_user = new_timer_start(TIMER_USER, TIMER_ACTIVE);
-
+
section_file_init(&file);
game_save(&file, save_reason);
/* Append ".sav" to filename. */
- sz_strlcat(filename, ".sav");
+ sz_strlcat(filepath, ".sav");
if (game.info.save_compress_level > 0) {
/* Append ".gz" to filename. */
- sz_strlcat(filename, ".gz");
+ sz_strlcat(filepath, ".gz");
}
- if (!path_is_absolute(filename)) {
+ if (!path_is_absolute(filepath)) {
char tmpname[600];
/* Ensure the saves directory exists. */
@@ -953,14 +989,14 @@ void save_game(char *orig_filename, const char *save_reason)
if (tmpname[0] != '\0') {
sz_strlcat(tmpname, "/");
}
- sz_strlcat(tmpname, filename);
- sz_strlcpy(filename, tmpname);
+ sz_strlcat(tmpname, filepath);
+ sz_strlcpy(filepath, tmpname);
}
- if(!section_file_save(&file, filename, game.info.save_compress_level))
- con_write(C_FAIL, _("Failed saving game as %s"), filename);
+ if(!section_file_save(&file, filepath, game.info.save_compress_level))
+ con_write(C_FAIL, _("Failed saving game as %s"), filepath);
else
- con_write(C_OK, _("Game saved as %s"), filename);
+ con_write(C_OK, _("Game saved as %s"), filepath);
section_file_free(&file);
@@ -968,19 +1004,19 @@ void save_game(char *orig_filename, const char *save_reason)
read_timer_seconds_free(timer_cpu),
read_timer_seconds_free(timer_user));
- ggz_game_saved(filename);
+ ggz_game_saved(filepath);
}
/**************************************************************************
Save game with autosave filename
**************************************************************************/
-void save_game_auto(const char *save_reason)
+void save_game_auto(const char *save_reason, const char *reason_filename)
{
char filename[512];
assert(strlen(game.save_name)<256);
- generate_save_name(filename, sizeof(filename), TRUE);
+ generate_save_name(filename, sizeof(filename), TRUE, reason_filename);
save_game(filename, save_reason);
save_ppm();
}
@@ -1002,12 +1038,15 @@ void start_game(void)
_("%s lost control cmdlevel on "
"game start. Use voting from now on."),
pconn->username);
- pconn->access_level = ALLOW_INFO;
+ pconn->access_level = ALLOW_BASIC;
}
} conn_list_iterate_end;
con_puts(C_OK, _("Starting game."));
+ /* Prevent problems with commands that only make sense in pregame. */
+ clear_all_votes();
+
set_server_state(S_S_GENERATING_WAITING); /* loaded ??? */
force_end_of_sniff = TRUE;
/* There's no stateful packet set to client until srv_ready(). */
@@ -1021,6 +1060,7 @@ void server_quit(void)
set_server_state(S_S_OVER);
server_game_free();
diplhand_free();
+ voting_free();
/* Free all the warmap arrays */
free_mapqueue();
@@ -1034,6 +1074,7 @@ void server_quit(void)
stdinhand_free();
close_connections_and_socket();
+ free_nls();
exit(EXIT_SUCCESS);
}
@@ -1278,7 +1319,9 @@ void check_for_full_turn_done(void)
* timeout is set to -1 this function call is skipped entirely and the
* server will run rampant. */
players_iterate(pplayer) {
- if (pplayer->is_connected) {
+ if (pplayer->is_connected
+ && !pplayer->ai.control
+ && pplayer->is_alive) {
connected = TRUE;
break;
}
@@ -1884,7 +1927,7 @@ static void srv_running(void)
if (game.info.phase == 0) {
if (save_counter >= game.info.save_nturns && game.info.save_nturns > 0) {
save_counter = 0;
- save_game_auto("Autosave");
+ save_game_auto("Autosave", NULL);
}
save_counter++;
}
@@ -1962,6 +2005,7 @@ static void srv_prepare(void)
stdinhand_init();
diplhand_init();
+ voting_init();
/* init network */
init_connections();
@@ -2017,9 +2061,10 @@ static void srv_scores(void)
players_iterate(pplayer) {
calc_civ_score(pplayer);
} players_iterate_end;
+ log_civ_score();
send_game_state(game.est_connections, C_S_OVER);
- report_final_scores();
+ report_final_scores(NULL);
show_map_to_all();
notify_player(NULL, NULL, E_GAME_END, _("The game is over..."));
send_server_info_to_metaserver(META_INFO);
@@ -2028,7 +2073,7 @@ static void srv_scores(void)
&& conn_list_size(game.est_connections) > 0) {
/* Save game on game_over, but not when the gameover was caused by
* the -q parameter. */
- save_game_auto("Game over");
+ save_game_auto("Game over", "final");
}
}
@@ -2111,10 +2156,11 @@ static void srv_ready(void)
pplayer->economic.gold = game.info.gold;
} players_iterate_end;
+ /* Give nation technologies, as specified in the ruleset. */
players_iterate(pplayer) {
- give_initial_techs(pplayer);
+ give_nation_initial_techs(pplayer);
} players_iterate_end;
-
+
players_iterate(pplayer) {
int i;
bool free_techs_already_given = FALSE;
@@ -2128,9 +2174,12 @@ static void srv_ready(void)
} players_iterate_end;
if (free_techs_already_given) {
- break;
+ continue;
}
+ /* Give global technologies, as specified in the ruleset. */
+ give_global_initial_techs(pplayer);
+ /* Give random free technologies thanks to the techlevel setting. */
for (i = 0; i < game.info.tech; i++) {
give_random_initial_tech(pplayer);
}
diff --git a/server/srv_main.h b/server/srv_main.h
index 328d257..706c56b 100644
--- a/server/srv_main.h
+++ b/server/srv_main.h
@@ -25,6 +25,7 @@ struct server_arguments {
/* metaserver information */
bool metaserver_no_send;
char metaserver_addr[256];
+ char metaserver_name[256];
unsigned short int metaserver_port;
/* address this server is to listen on (NULL => INADDR_ANY) */
char *bind_addr;
@@ -56,7 +57,7 @@ void init_game_seed(void);
void srv_init(void);
void srv_main(void);
void server_quit(void);
-void save_game_auto(const char *save_reason);
+void save_game_auto(const char *save_reason, const char *reason_filename);
enum server_states server_state(void);
void set_server_state(enum server_states newstate);
diff --git a/server/stdinhand.c b/server/stdinhand.c
index 7c10456..1cf06a2 100644
--- a/server/stdinhand.c
+++ b/server/stdinhand.c
@@ -68,6 +68,7 @@
#include "settings.h"
#include "srv_main.h"
#include "stdinhand.h"
+#include "voting.h"
#include "advmilitary.h" /* assess_danger_player() */
#include "ailog.h"
@@ -75,7 +76,7 @@
#define TOKEN_DELIMITERS " \t\n,"
-static enum cmdlevel_id default_access_level = ALLOW_INFO;
+static enum cmdlevel_id default_access_level = ALLOW_BASIC;
static enum cmdlevel_id first_access_level = ALLOW_CTRL;
static bool cut_client_connection(struct connection *caller, char *name,
@@ -95,17 +96,6 @@ static bool detach_command(struct connection *caller, char *name, bool check);
static bool end_command(struct connection *caller, char *str, bool check);
static bool surrender_command(struct connection *caller, char *str, bool check);
-enum vote_type {
- VOTE_NONE, VOTE_YES, VOTE_NO
-};
-struct voting {
- char command[MAX_LEN_CONSOLE_LINE]; /* [0] == \0 if none in action */
- enum vote_type votes_cast[MAX_NUM_PLAYERS]; /* see enum above */
- int vote_no; /* place in the queue */
- int yes, no;
-};
-static struct voting votes[MAX_NUM_PLAYERS];
-static int last_vote;
static const char horiz_line[] =
"------------------------------------------------------------------------------";
@@ -190,73 +180,7 @@ static enum command_id command_named(const char *token, bool accept_ambiguity)
**************************************************************************/
void stdinhand_init(void)
{
- int i;
-
- for (i = 0; i < MAX_NUM_PLAYERS; i++) {
- votes[i].command[0] = '\0';
- memset(votes[i].votes_cast, 0, sizeof(votes[i].votes_cast));
- votes[i].vote_no = -1;
- }
- last_vote = -1;
-}
-
-/**************************************************************************
- Check if we satisfy the criteria for resolving a vote, and resolve it
- if these critera are indeed met. Updates yes and no variables in voting
- struct as well.
-
- Criteria:
- Accepted immediately if: > 50% of votes for
- Rejected immediately if: >= 50% of votes against
-**************************************************************************/
-static void check_vote(struct voting *vote)
-{
- int i, num_cast = 0, num_voters = 0;
-
- vote->yes = 0;
- vote->no = 0;
-
- for (i = 0; i < MAX_NUM_PLAYERS; i++) {
- if (game.players[i].is_alive && game.players[i].is_connected) {
- num_voters++;
- } else {
- /* Disqualify already given vote (eg if disconnected after voting) */
- vote->votes_cast[i] = VOTE_NONE;
- }
- }
- for (i = 0; i < MAX_NUM_PLAYERS; i++) {
- num_cast = (vote->votes_cast[i] > VOTE_NONE) ? num_cast + 1 : num_cast;
- vote->yes = (vote->votes_cast[i] == VOTE_YES) ? vote->yes + 1 : vote->yes;
- vote->no = (vote->votes_cast[i] == VOTE_NO) ? vote->no + 1 : vote->no;
- }
-
- /* Check if we should resolve the vote */
- if (vote->command[0] != '\0'
- && num_voters > 0
- && (vote->yes > num_voters / 2
- || vote->no >= (num_voters + 1) / 2)) {
- /* Yep, resolve this one */
- vote->vote_no = -1;
- if (last_vote == vote->vote_no) {
- last_vote = -1;
- }
- if (vote->yes > num_voters / 2) {
- /* Do it! */
- notify_conn(NULL, NULL, E_SETTING,
- _("Vote \"%s\" is passed %d to %d with %d "
- "abstentions."),
- vote->command, vote->yes, vote->no,
- num_voters - vote->yes - vote->no);
- handle_stdin_input((struct connection *)NULL, vote->command, FALSE);
- } else {
- notify_conn(NULL, NULL, E_SETTING,
- _("Vote \"%s\" failed with %d against, %d for "
- "and %d abstentions."),
- vote->command, vote->no, vote->yes,
- num_voters - vote->yes - vote->no);
- }
- vote->command[0] = '\0';
- }
+ /* Nothing. */
}
/**************************************************************************
@@ -265,12 +189,7 @@ static void check_vote(struct voting *vote)
**************************************************************************/
void stdinhand_turn(void)
{
- int i;
-
- /* Check if any votes have passed */
- for (i = 0; i < MAX_NUM_PLAYERS; i++) {
- check_vote(&votes[i]);
- }
+ /* Nothing. */
}
/**************************************************************************
@@ -1183,14 +1102,17 @@ static bool set_cmdlevel(struct connection *caller,
* and thus this clause is never used.
*/
cmd_reply(CMD_CMDLEVEL, caller, C_FAIL,
- _("Cannot decrease command access level '%s' for connection '%s';"
- " you only have '%s'."),
- cmdlevel_name(ptarget->access_level),
- ptarget->username,
- cmdlevel_name(caller->access_level));
+ _("Cannot decrease command access level '%s' "
+ "for connection '%s'; you only have '%s'."),
+ cmdlevel_name(ptarget->access_level),
+ ptarget->username,
+ cmdlevel_name(caller->access_level));
return FALSE;
} else {
ptarget->access_level = level;
+ cmd_reply(CMD_CMDLEVEL, caller, C_OK,
+ _("Command access level set to '%s' for connection %s."),
+ cmdlevel_name(level), ptarget->username);
return TRUE;
}
}
@@ -1249,144 +1171,122 @@ void notify_if_first_access_level_is_available(void)
**************************************************************************/
static bool cmdlevel_command(struct connection *caller, char *str, bool check)
{
- char arg_level[MAX_LEN_CONSOLE_LINE]; /* info, ctrl etc */
- char arg_name[MAX_LEN_CONSOLE_LINE]; /* a player name, or "new" */
- char *cptr_s, *cptr_d; /* used for string ops */
-
+ char *arg[2];
+ int ntokens;
+ bool ret = FALSE;
enum m_pre_result match_result;
enum cmdlevel_id level;
struct connection *ptarget;
- /* find the start of the level: */
- for (cptr_s = str; *cptr_s != '\0' && !my_isalnum(*cptr_s); cptr_s++) {
- /* nothing */
- }
-
- /* copy the level into arg_level[] */
- for(cptr_d=arg_level; *cptr_s != '\0' && my_isalnum(*cptr_s); cptr_s++, cptr_d++) {
- *cptr_d=*cptr_s;
- }
- *cptr_d='\0';
-
- if (arg_level[0] == '\0') {
- /* no level name supplied; list the levels */
-
- cmd_reply(CMD_CMDLEVEL, caller, C_COMMENT, _("Command access levels in effect:"));
+ ntokens = get_tokens(str, arg, 2, TOKEN_DELIMITERS);
+ if (ntokens == 0) {
+ /* No argument supplied; list the levels */
+ cmd_reply(CMD_CMDLEVEL, caller, C_COMMENT, horiz_line);
+ cmd_reply(CMD_CMDLEVEL, caller, C_COMMENT,
+ _("Command access levels in effect:"));
+ cmd_reply(CMD_CMDLEVEL, caller, C_COMMENT, horiz_line);
conn_list_iterate(game.est_connections, pconn) {
cmd_reply(CMD_CMDLEVEL, caller, C_COMMENT, "cmdlevel %s %s",
- cmdlevel_name(pconn->access_level), pconn->username);
- }
- conn_list_iterate_end;
+ cmdlevel_name(conn_get_access(pconn)), pconn->username);
+ } conn_list_iterate_end;
cmd_reply(CMD_CMDLEVEL, caller, C_COMMENT,
- _("Command access level for new connections: %s"),
- cmdlevel_name(default_access_level));
+ _("Command access level for new connections: %s"),
+ cmdlevel_name(default_access_level));
cmd_reply(CMD_CMDLEVEL, caller, C_COMMENT,
- _("Command access level for first player to take it: %s"),
- cmdlevel_name(first_access_level));
+ _("Command access level for first player to take it: %s"),
+ cmdlevel_name(first_access_level));
+ cmd_reply(CMD_CMDLEVEL, caller, C_COMMENT, horiz_line);
return TRUE;
}
- /* a level name was supplied; set the level */
-
- if ((level = cmdlevel_named(arg_level)) == ALLOW_UNRECOGNIZED) {
+ /* A level name was supplied; set the level */
+ if ((level = cmdlevel_named(arg[0])) == ALLOW_UNRECOGNIZED) {
cmd_reply(CMD_CMDLEVEL, caller, C_SYNTAX,
- _("Error: command access level must be one of"
- " 'none', 'info', 'ctrl', or 'hack'."));
- return FALSE;
- } else if (caller && level > caller->access_level) {
+ _("Error: command access level must be one of"
+ " 'none', 'info', 'ctrl', or 'hack'."));
+ goto CLEAN_UP;
+ } else if (caller && level > conn_get_access(caller)) {
cmd_reply(CMD_CMDLEVEL, caller, C_FAIL,
- _("Cannot increase command access level to '%s';"
- " you only have '%s' yourself."),
- arg_level, cmdlevel_name(caller->access_level));
- return FALSE;
- }
- if (check) {
- return TRUE; /* looks good */
+ _("Cannot increase command access level to '%s';"
+ " you only have '%s' yourself."),
+ arg[0], cmdlevel_name(conn_get_access(caller)));
+ goto CLEAN_UP;
}
- /* find the start of the name: */
- for (; *cptr_s != '\0' && !my_isalnum(*cptr_s); cptr_s++) {
- /* nothing */
+ if (check) {
+ return TRUE; /* looks good */
}
- /* copy the name into arg_name[] */
- for(cptr_d=arg_name;
- *cptr_s != '\0' && (*cptr_s == '-' || *cptr_s == ' ' || my_isalnum(*cptr_s));
- cptr_s++ , cptr_d++) {
- *cptr_d=*cptr_s;
- }
- *cptr_d='\0';
-
- if (arg_name[0] == '\0') {
- /* no playername supplied: set for all connections, and set the default */
+ if (ntokens == 1) {
+ /* No playername supplied: set for all connections */
conn_list_iterate(game.est_connections, pconn) {
- if (set_cmdlevel(caller, pconn, level)) {
- 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 "
- "connection %s."),
- cmdlevel_name(level), pconn->username);
- return FALSE;
+ if (pconn != caller) {
+ (void) set_cmdlevel(caller, pconn, level);
}
+ } conn_list_iterate_end;
+
+ /* Set the caller access level at last, because it could make the
+ * previous operations impossible if set before. */
+ if (caller) {
+ (void) set_cmdlevel(caller, caller, level);
}
- conn_list_iterate_end;
-
+
+ /* Set default access for new connections. */
default_access_level = level;
cmd_reply(CMD_CMDLEVEL, caller, C_OK,
- _("Command access level set to '%s' for new players."),
- cmdlevel_name(level));
+ _("Command access level set to '%s' for new players."),
+ cmdlevel_name(level));
+ /* Set default access for first connection. */
first_access_level = level;
cmd_reply(CMD_CMDLEVEL, caller, C_OK,
- _("Command access level set to '%s' for first player to grab it."),
- cmdlevel_name(level));
- }
- else if (strcmp(arg_name,"new") == 0) {
+ _("Command access level set to '%s' "
+ "for first player to grab it."),
+ cmdlevel_name(level));
+
+ ret = TRUE;
+
+ } else if (mystrcasecmp(arg[1], "new") == 0) {
default_access_level = level;
cmd_reply(CMD_CMDLEVEL, caller, C_OK,
- _("Command access level set to '%s' for new players."),
- cmdlevel_name(level));
+ _("Command access level set to '%s' for new players."),
+ cmdlevel_name(level));
if (level > first_access_level) {
first_access_level = level;
cmd_reply(CMD_CMDLEVEL, caller, C_OK,
- _("Command access level set to '%s' for first player to grab it."),
- cmdlevel_name(level));
+ _("Command access level set to '%s' "
+ "for first player to grab it."),
+ cmdlevel_name(level));
}
- }
- else if (strcmp(arg_name,"first") == 0) {
+
+ ret = TRUE;
+
+ } else if (mystrcasecmp(arg[1], "first") == 0) {
first_access_level = level;
cmd_reply(CMD_CMDLEVEL, caller, C_OK,
- _("Command access level set to '%s' for first player to grab it."),
- cmdlevel_name(level));
+ _("Command access level set to '%s' "
+ "for first player to grab it."),
+ cmdlevel_name(level));
if (level < default_access_level) {
default_access_level = level;
cmd_reply(CMD_CMDLEVEL, caller, C_OK,
- _("Command access level set to '%s' for new players."),
- cmdlevel_name(level));
+ _("Command access level set to '%s' for new players."),
+ cmdlevel_name(level));
}
- }
- else if ((ptarget = find_conn_by_user_prefix(arg_name, &match_result))) {
+
+ ret = TRUE;
+
+ } else if ((ptarget = find_conn_by_user_prefix(arg[1], &match_result))) {
if (set_cmdlevel(caller, ptarget, level)) {
- 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'"
- " for connection %s."),
- cmdlevel_name(level), ptarget->username);
- return FALSE;
+ ret = TRUE;
}
} else {
- cmd_reply_no_such_conn(CMD_CMDLEVEL, caller, arg_name, match_result);
- return FALSE;
+ cmd_reply_no_such_conn(CMD_CMDLEVEL, caller, arg[1], match_result);
}
- return TRUE;
+
+CLEAN_UP:
+ free_tokens(arg, ntokens);
+ return ret;
}
/**************************************************************************
@@ -1624,18 +1524,12 @@ static void show_help_option_list(struct connection *caller,
**************************************************************************/
static bool explain_option(struct connection *caller, char *str, bool check)
{
- char command[MAX_LEN_CONSOLE_LINE], *cptr_s, *cptr_d;
int cmd;
- for (cptr_s = str; *cptr_s != '\0' && !my_isalnum(*cptr_s); cptr_s++) {
- /* nothing */
- }
- for (cptr_d = command; *cptr_s != '\0' && my_isalnum(*cptr_s); cptr_s++, cptr_d++)
- *cptr_d=*cptr_s;
- *cptr_d='\0';
+ remove_leading_trailing_spaces(str);
- if (*command != '\0') {
- cmd=lookup_option(command);
+ if (*str != '\0') {
+ cmd = lookup_option(str);
if (cmd >= 0 && cmd < SETTINGS_NUM) {
show_help_option(caller, CMD_EXPLAIN, cmd);
} else if (cmd == -1 || cmd == -3) {
@@ -1716,6 +1610,8 @@ static void send_server_setting(struct conn_list *dest, int setting_id)
};
}
+ packet.initial_setting = game.info.is_new_game;
+
send_packet_options_settable(pconn, &packet);
} conn_list_iterate_end;
}
@@ -1868,7 +1764,6 @@ static bool set_away(struct connection *caller, char *name, bool check)
notify_conn(game.est_connections, NULL, E_SETTING,
_("%s set to away mode."),
player_name(caller->player));
- send_player_info(caller->player, NULL);
set_ai_level_directer(caller->player, 1);
caller->player->ai.control = TRUE;
cancel_all_meetings(caller->player);
@@ -1881,6 +1776,9 @@ static bool set_away(struct connection *caller, char *name, bool check)
* dialogs for meetings in AI mode. */
cancel_all_meetings(caller->player);
}
+
+ send_player_info(caller->player, NULL);
+
return TRUE;
}
@@ -2051,30 +1949,6 @@ static bool show_command(struct connection *caller, char *str, bool check)
}
/******************************************************************
- Which characters are allowed within option names: (for 'set')
-******************************************************************/
-static bool is_ok_opt_name_char(char c)
-{
- return my_isalnum(c);
-}
-
-/******************************************************************
- Which characters are allowed within option values: (for 'set')
-******************************************************************/
-static bool is_ok_opt_value_char(char c)
-{
- return (c == '-') || (c == '*') || (c == '+') || (c == '=') || my_isalnum(c);
-}
-
-/******************************************************************
- Which characters are allowed between option names and values: (for 'set')
-******************************************************************/
-static bool is_ok_opt_name_value_sep_char(char c)
-{
- return (c == '=') || my_isspace(c);
-}
-
-/******************************************************************
...
******************************************************************/
static bool team_command(struct connection *caller, char *str, bool check)
@@ -2145,106 +2019,238 @@ static bool team_command(struct connection *caller, char *str, bool check)
return res;
}
-/******************************************************************
+/**************************************************************************
+ List all running votes. Moved from /vote command.
+**************************************************************************/
+static void show_votes(struct connection *caller)
+{
+ int count = 0;
+ const char *title;
+
+ if (vote_list != NULL) {
+ vote_list_iterate(vote_list, pvote) {
+ if (!conn_can_see_vote(caller, pvote)) {
+ continue;
+ }
+ title = vote_is_team_only(pvote) ? _("Teamvote") : _("Vote");
+ cmd_reply(CMD_VOTE, caller, C_COMMENT,
+ _("%s %d \"%s\" (needs %0.0f%%%s): %d for, "
+ "%d against, and %d abstained out of %d players."),
+ title, pvote->vote_no, pvote->cmdline,
+ MIN(100, pvote->need_pc * 100 + 1),
+ pvote->flags & VCF_NODISSENT ? _(" no dissent") : "",
+ pvote->yes, pvote->no, pvote->abstain, game.info.nplayers);
+ count++;
+ } vote_list_iterate_end;
+ }
+
+ if (count == 0) {
+ cmd_reply(CMD_VOTE, caller, C_COMMENT,
+ _("There are no votes going on."));
+ }
+}
+
+/**************************************************************************
+ Vote command argument definitions.
+**************************************************************************/
+static const char *const vote_args[] = {
+ "yes",
+ "no",
+ "abstain",
+ NULL
+};
+static const char *vote_arg_accessor(int i)
+{
+ return vote_args[i];
+}
+
+/**************************************************************************
Make or participate in a vote.
-******************************************************************/
-static bool vote_command(struct connection *caller, char *str,
- bool check)
+**************************************************************************/
+static bool vote_command(struct connection *caller, char *str, bool check)
{
char buf[MAX_LEN_CONSOLE_LINE];
- char *arg[3];
- int ntokens = 0, i;
- const char *usage = _("Undefined arguments. Usage: vote yes|no "
- "[vote number].");
+ char *arg[2];
+ int ntokens = 0, i = 0, which = -1;
+ enum m_pre_result match_result;
+ struct vote *pvote = NULL;
+ const char *usage = _("Invalid arguments. Usage: vote "
+ "yes|no|abstain [vote number].");
bool res = FALSE;
- if (caller == NULL || caller->player == NULL) {
- cmd_reply(CMD_VOTE, caller, C_FAIL, _("This command is client only."));
- return FALSE;
- } else if (caller->observer) {
- cmd_reply(CMD_VOTE, caller, C_FAIL, _("Observers cannot vote."));
- return FALSE;
- } else if (S_S_RUNNING != server_state()) {
- cmd_reply(CMD_VOTE, caller, C_FAIL, _("You can only vote in a "
- "running game. Use 'first' to become the game organizer "
- "if there currently is none."));
+ if (check) {
+ /* This should never happen, since /vote must always be
+ * set to ALLOW_BASIC or less. But just in case... */
return FALSE;
- } else if (!str || strlen(str) == 0) {
- int j = 0;
-
- for (i = 0; i < MAX_NUM_PLAYERS; i++) {
- struct voting *vote = &votes[i];
-
- if (vote->command[0] != '\0') {
- j++;
- cmd_reply(CMD_VOTE, caller, C_COMMENT,
- _("Vote %d \"%s\": %d for, %d against"),
- vote->vote_no, vote->command, vote->yes,
- vote->no);
- }
- }
- if (j == 0) {
- cmd_reply(CMD_VOTE, caller, C_COMMENT,
- _("There are no votes going on."));
- }
- return FALSE; /* see below */
- } if (check) {
- return FALSE; /* cannot vote over having vote! */
}
sz_strlcpy(buf, str);
ntokens = get_tokens(buf, arg, 2, TOKEN_DELIMITERS);
- if (strcmp(arg[0], "yes") == 0
- || strcmp(arg[0], "no") == 0) {
- int which = -1;
- struct voting *vote = NULL;
+ if (ntokens == 0) {
+ show_votes(caller);
+ goto CLEANUP;
+ } else if (!conn_can_vote(caller, NULL)) {
+ cmd_reply(CMD_VOTE, caller, C_FAIL,
+ _("You are not allowed to use this command."));
+ goto CLEANUP;
+ }
+
+ match_result = match_prefix(vote_arg_accessor, VOTE_NUM, 0,
+ mystrncasecmp, NULL, arg[0], &i);
+
+ if (match_result == M_PRE_AMBIGUOUS) {
+ cmd_reply(CMD_VOTE, caller, C_SYNTAX,
+ _("The argument \"%s\" is ambigious."), arg[0]);
+ goto CLEANUP;
+ } else if (match_result > M_PRE_AMBIGUOUS) {
+ /* Failed */
+ cmd_reply(CMD_VOTE, caller, C_SYNTAX, "%s", usage);
+ goto CLEANUP;
+ }
- if (ntokens == 1) {
- /* Applies to last vote */
- if (last_vote > -1) {
- which = last_vote;
- } else {
- cmd_reply(CMD_VOTE, caller, C_FAIL, _("No legal last vote."));
- goto cleanup;
- }
+ if (ntokens == 1) {
+ /* Applies to last vote */
+ if (vote_number_sequence > 0 && get_vote_by_no(vote_number_sequence)) {
+ which = vote_number_sequence;
} else {
- if (sscanf(arg[1], "%d", &which) <= 0) {
- cmd_reply(CMD_VOTE, caller, C_SYNTAX, _("Value must be integer."));
- goto cleanup;
+ int num_votes = vote_list_size(vote_list);
+ if (num_votes == 0) {
+ cmd_reply(CMD_VOTE, caller, C_FAIL, _("There are no votes running."));
+ } else {
+ cmd_reply(CMD_VOTE, caller, C_FAIL, _("No legal last vote (%d %s)."),
+ num_votes, PL_("other vote running", "other votes running",
+ num_votes));
}
+ goto CLEANUP;
}
- /* Ok, now try to find this vote */
- for (i = 0; i < MAX_NUM_PLAYERS; i++) {
- if (votes[i].vote_no == which) {
- vote = &votes[i];
- }
+ } else {
+ if (sscanf(arg[1], "%d", &which) <= 0) {
+ cmd_reply(CMD_VOTE, caller, C_SYNTAX, _("Value must be an integer."));
+ goto CLEANUP;
}
- if (which > last_vote || !vote || vote->command[0] == '\0') {
- cmd_reply(CMD_VOTE, caller, C_FAIL, _("No such vote (%d)."), which);
- goto cleanup;
+ }
+
+ if (!(pvote = get_vote_by_no(which))) {
+ cmd_reply(CMD_VOTE, caller, C_FAIL, _("No such vote (%d)."), which);
+ goto CLEANUP;
+ }
+
+ if (!conn_can_vote(caller, pvote)) {
+ cmd_reply(CMD_VOTE, caller, C_FAIL,
+ _("You are not allowed to vote on that."));
+ goto CLEANUP;
+ }
+
+ if (i == VOTE_YES) {
+ cmd_reply(CMD_VOTE, caller, C_COMMENT, _("You voted for \"%s\""),
+ pvote->cmdline);
+ connection_vote(caller, pvote, VOTE_YES);
+ } else if (i == VOTE_NO) {
+ cmd_reply(CMD_VOTE, caller, C_COMMENT, _("You voted against \"%s\""),
+ pvote->cmdline);
+ connection_vote(caller, pvote, VOTE_NO);
+ } else if (i == VOTE_ABSTAIN) {
+ cmd_reply(CMD_VOTE, caller, C_COMMENT,
+ _("You abstained from voting on \"%s\""), pvote->cmdline);
+ connection_vote(caller, pvote, VOTE_ABSTAIN);
+ } else {
+ assert(0); /* Must never happen */
+ }
+
+ res = TRUE;
+
+CLEANUP:
+ free_tokens(arg, ntokens);
+ return res;
+}
+
+/**************************************************************************
+ Cancel a vote... /cancelvote <vote number>|all.
+**************************************************************************/
+static bool cancelvote_command(struct connection *caller,
+ char *arg, bool check)
+{
+ struct vote *pvote = NULL;
+ int vote_no;
+
+ if (check) {
+ /* This should never happen anyway, since /cancelvote
+ * is set to ALLOW_BASIC in both pregame and while the
+ * game is running. */
+ return FALSE;
+ }
+
+ remove_leading_trailing_spaces(arg);
+
+ if (arg[0] == '\0') {
+ if (caller == NULL) {
+ /* Server prompt */
+ cmd_reply(CMD_CANCELVOTE, caller, C_SYNTAX,
+ _("Missing argument <vote number> or "
+ "the string \"all\"."));
+ return FALSE;
+ }
+ /* The caller cancel his/her own vote. */
+ if (!(pvote = get_vote_by_caller(caller))) {
+ cmd_reply(CMD_CANCELVOTE, caller, C_FAIL,
+ _("You don't have any vote going on."));
+ return FALSE;
+ }
+ } else if (mystrcasecmp(arg, "all") == 0) {
+ /* Cancel all votes (needs some privileges). */
+ if (vote_list_size(vote_list) == 0) {
+ cmd_reply(CMD_CANCELVOTE, caller, C_FAIL,
+ _("There isn't any vote going on."));
+ return FALSE;
+ } else if (!caller || conn_get_access(caller) >= ALLOW_ADMIN) {
+ clear_all_votes();
+ notify_conn(NULL, NULL, E_CHAT_MSG,
+ _("Server: All votes have been removed."));
+ return TRUE;
+ } else {
+ cmd_reply(CMD_CANCELVOTE, caller, C_FAIL,
+ _("You are not allowed to use this command."));
+ return FALSE;
}
- if (strcmp(arg[0], "yes") == 0) {
- cmd_reply(CMD_VOTE, caller, C_COMMENT, _("You voted for \"%s\""),
- vote->command);
- vote->votes_cast[player_index(caller->player)] = VOTE_YES;
- } else if (strcmp(arg[0], "no") == 0) {
- cmd_reply(CMD_VOTE, caller, C_COMMENT, _("You voted against \"%s\""),
- vote->command);
- vote->votes_cast[player_index(caller->player)] = VOTE_NO;
+ } else if (sscanf(arg, "%d", &vote_no) == 1) {
+ /* Cancel one particular vote (needs some privileges if the vote
+ * is not owned). */
+ if (!(pvote = get_vote_by_no(vote_no))) {
+ cmd_reply(CMD_CANCELVOTE, caller, C_FAIL,
+ _("No such vote (%d)."), vote_no);
+ return FALSE;
+ } else if (caller && conn_get_access(caller) < ALLOW_ADMIN
+ && caller->id != pvote->caller_id) {
+ cmd_reply(CMD_CANCELVOTE, caller, C_FAIL,
+ _("You are not allowed to cancel this vote (%d)."),
+ vote_no);
+ return FALSE;
}
- check_vote(vote);
} else {
- cmd_reply(CMD_VOTE, caller, C_SYNTAX, "%s", usage);
- goto cleanup;
+ cmd_reply(CMD_CANCELVOTE, caller, C_SYNTAX,
+ _("Usage: /cancelvote [<vote number>|all]"));
+ return FALSE;
}
- res = TRUE;
- cleanup:
- for (i = 0; i < ntokens; i++) {
- free(arg[i]);
+ assert(pvote != NULL);
+
+ if (caller) {
+ notify_team(conn_get_player(vote_get_caller(pvote)),
+ NULL, E_CHAT_MSG,
+ _("Server: %s cancelled the vote \"%s\" (number %d)."),
+ caller->username, pvote->cmdline, pvote->vote_no);
+ } else {
+ /* Server prompt */
+ notify_team(conn_get_player(vote_get_caller(pvote)),
+ NULL, E_CHAT_MSG,
+ _("Server: The vote \"%s\" (number %d) has been cancelled."),
+ pvote->cmdline, pvote->vote_no);
}
- return res;
+ /* Make it after, prevent crashs about a free pointer (pvote). */
+ remove_vote(pvote);
+
+ return TRUE;
}
/******************************************************************
@@ -2443,54 +2449,37 @@ static bool debug_command(struct connection *caller, char *str,
******************************************************************/
static bool set_command(struct connection *caller, char *str, bool check)
{
- char command[MAX_LEN_CONSOLE_LINE], arg[MAX_LEN_CONSOLE_LINE], *cptr_s, *cptr_d;
- int val, cmd, i;
+ char *args[2], *arg;
+ int val, cmd, i, nargs;
struct settings_s *op;
bool do_update;
char buffer[500];
+ bool ret = FALSE;
- for (cptr_s = str; *cptr_s != '\0' && !is_ok_opt_name_char(*cptr_s);
- cptr_s++) {
- /* nothing */
- }
+ /* '=' is also a valid delimiter for this function. */
+ nargs = get_tokens(str, args, ARRAY_SIZE(args), TOKEN_DELIMITERS "=");
- for(cptr_d=command;
- *cptr_s != '\0' && is_ok_opt_name_char(*cptr_s);
- cptr_s++, cptr_d++) {
- *cptr_d=*cptr_s;
- }
- *cptr_d='\0';
-
- for (; *cptr_s != '\0' && is_ok_opt_name_value_sep_char(*cptr_s); cptr_s++) {
- /* nothing */
- }
-
- for (cptr_d = arg; *cptr_s != '\0' && is_ok_opt_value_char(*cptr_s); cptr_s++, cptr_d++)
- *cptr_d=*cptr_s;
- *cptr_d='\0';
-
- cmd = lookup_option(command);
- if (cmd==-1) {
+ if (nargs < 2 || -1 == (cmd = lookup_option(args[0]))) {
cmd_reply(CMD_SET, caller, C_SYNTAX,
- _("Undefined argument. Usage: set <option> <value>."));
- return FALSE;
+ _("Undefined argument. Usage: set <option> <value>."));
+ goto cleanup;
}
- else if (cmd==-2) {
- cmd_reply(CMD_SET, caller, C_SYNTAX,
- _("Ambiguous option name."));
- return FALSE;
+ if (-2 == cmd) {
+ cmd_reply(CMD_SET, caller, C_SYNTAX, _("Ambiguous option name."));
+ goto cleanup;
}
if (!may_set_option(caller,cmd) && !check) {
cmd_reply(CMD_SET, caller, C_FAIL,
- _("You are not allowed to set this option."));
- return FALSE;
+ _("You are not allowed to set this option."));
+ goto cleanup;
}
if (!setting_is_changeable(cmd)) {
cmd_reply(CMD_SET, caller, C_BOUNCE,
- _("This setting can't be modified after the game has started."));
- return FALSE;
+ _("This setting can't be modified after the game has started."));
+ goto cleanup;
}
+ arg = args[1];
op = &settings[cmd];
do_update = FALSE;
@@ -2500,7 +2489,7 @@ static bool set_command(struct connection *caller, char *str, bool check)
case SSET_BOOL:
if (sscanf(arg, "%d", &val) != 1) {
cmd_reply(CMD_SET, caller, C_SYNTAX, _("Value must be an integer."));
- return FALSE;
+ goto cleanup;
}
/* make sure the input string only contains digits */
for (i = 0;; i++) {
@@ -2511,13 +2500,13 @@ static bool set_command(struct connection *caller, char *str, bool check)
cmd_reply(CMD_SET, caller, C_SYNTAX,
_("The parameter %s should only contain digits 0-1."),
op->name);
- return FALSE;
+ goto cleanup;
}
}
if (val != 0 && val != 1) {
cmd_reply(CMD_SET, caller, C_SYNTAX,
_("Value out of range (minimum: 0, maximum: 1)."));
- return FALSE;
+ goto cleanup;
} else {
const char *reject_message = NULL;
bool b_val = (val != 0);
@@ -2525,7 +2514,7 @@ static bool set_command(struct connection *caller, char *str, bool check)
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;
+ goto cleanup;
}
if (!check) {
@@ -2541,7 +2530,7 @@ static bool set_command(struct connection *caller, char *str, bool check)
case SSET_INT:
if (sscanf(arg, "%d", &val) != 1) {
cmd_reply(CMD_SET, caller, C_SYNTAX, _("Value must be an integer."));
- return FALSE;
+ goto cleanup;
}
/* make sure the input string only contains digits */
for (i = 0;; i++) {
@@ -2553,21 +2542,21 @@ static bool set_command(struct connection *caller, char *str, bool check)
cmd_reply(CMD_SET, caller, C_SYNTAX,
_("The parameter %s should only contain +- and 0-9."),
op->name);
- return FALSE;
+ goto cleanup;
}
}
if (val < op->int_min_value || val > op->int_max_value) {
cmd_reply(CMD_SET, caller, C_SYNTAX,
_("Value out of range (minimum: %d, maximum: %d)."),
op->int_min_value, op->int_max_value);
- return FALSE;
+ goto cleanup;
} else {
const char *reject_message = NULL;
if (op->int_validate != NULL
&& !op->int_validate(val, caller, &reject_message)) {
cmd_reply(CMD_SET, caller, C_SYNTAX, "%s", reject_message);
- return FALSE;
+ goto cleanup;
}
if (!check) {
@@ -2584,14 +2573,14 @@ static bool set_command(struct connection *caller, char *str, bool check)
if (strlen(arg) >= op->string_value_size) {
cmd_reply(CMD_SET, caller, C_SYNTAX,
_("String value too long. Usage: set <option> <value>."));
- return FALSE;
+ goto cleanup;
} else {
const char *reject_message = NULL;
if (op->string_validate != NULL
&& !op->string_validate(arg, caller, &reject_message)) {
cmd_reply(CMD_SET, caller, C_SYNTAX, "%s", reject_message);
- return FALSE;
+ goto cleanup;
}
if (!check) {
@@ -2605,6 +2594,8 @@ static bool set_command(struct connection *caller, char *str, bool check)
break;
}
+ ret = TRUE; /* Looks a success. */
+
if (!check && strlen(buffer) > 0 && sset_is_to_client(cmd)) {
notify_conn(NULL, NULL, E_SETTING, "%s", buffer);
}
@@ -2637,7 +2628,10 @@ static bool set_command(struct connection *caller, char *str, bool check)
reset_all_start_commands();
send_server_info_to_metaserver(META_INFO);
}
- return TRUE;
+
+ cleanup:
+ free_tokens(args, nargs);
+ return ret;
}
/**************************************************************************
@@ -2912,6 +2906,12 @@ static bool observe_command(struct connection *caller, char *str, bool check)
send_diplomatic_meetings(pconn);
send_packet_thaw_hint(pconn);
dsend_packet_start_phase(pconn, game.info.phase);
+ } else if (S_S_OVER == server_state()) {
+ send_packet_freeze_hint(pconn);
+ send_all_info(pconn->self);
+ send_game_state(pconn->self, C_S_OVER);
+ send_packet_thaw_hint(pconn);
+ report_final_scores(pconn->self);
} else {
/* send changed player connection to everybody */
send_game_info(game.est_connections);
@@ -2930,6 +2930,8 @@ static bool observe_command(struct connection *caller, char *str, bool check)
pconn->username);
}
+ send_updated_vote_totals(NULL);
+
end:;
/* free our args */
for (i = 0; i < ntokens; i++) {
@@ -3033,7 +3035,7 @@ static bool take_command(struct connection *caller, char *str, bool check)
}
/* if we want to take while the game is running, reset the client */
- if (S_S_RUNNING == server_state()) {
+ if (S_S_RUNNING <= server_state()) {
send_game_state(pconn->self, C_S_PREPARING);
send_rulesets(pconn->self);
send_server_settings(pconn->self);
@@ -3050,7 +3052,7 @@ static bool take_command(struct connection *caller, char *str, bool check)
if (pplayer) {
conn_list_iterate(pplayer->connections, aconn) {
if (!aconn->observer) {
- if (S_S_RUNNING == server_state()) {
+ if (S_S_RUNNING <= server_state()) {
send_game_state(aconn->self, C_S_PREPARING);
send_rulesets(aconn->self);
send_server_settings(aconn->self);
@@ -3100,6 +3102,8 @@ static bool take_command(struct connection *caller, char *str, bool check)
}
if (res) {
+ bool has_been_created = (pplayer == NULL);
+
/* Successfully attached */
pplayer = pconn->player; /* In case pplayer was NULL. */
@@ -3110,7 +3114,8 @@ static bool take_command(struct connection *caller, char *str, bool check)
}
/* aitoggle the player back to human as necessary. */
- if (pplayer->ai.control && game.info.auto_ai_toggle) {
+ if (pplayer->ai.control
+ && (game.info.auto_ai_toggle || has_been_created)) {
toggle_ai_player_direct(NULL, pplayer);
}
}
@@ -3122,6 +3127,12 @@ static bool take_command(struct connection *caller, char *str, bool check)
send_diplomatic_meetings(pconn);
send_packet_thaw_hint(pconn);
dsend_packet_start_phase(pconn, game.info.phase);
+ } else if (S_S_OVER == server_state()) {
+ send_packet_freeze_hint(pconn);
+ send_all_info(pconn->self);
+ send_game_state(pconn->self, C_S_OVER);
+ send_packet_thaw_hint(pconn);
+ report_final_scores(pconn->self);
} else {
/* send changed player connection to everybody */
send_game_info(game.est_connections);
@@ -3143,6 +3154,7 @@ static bool take_command(struct connection *caller, char *str, bool check)
pplayer->is_alive
? _("Alive")
: _("Dead"));
+ send_updated_vote_totals(NULL);
} else {
cmd_reply(CMD_TAKE, caller, C_FAIL, _("%s failed to attach to any player."),
pconn->username);
@@ -3218,7 +3230,7 @@ static bool detach_command(struct connection *caller, char *str, bool check)
}
/* if we want to detach while the game is running, reset the client */
- if (S_S_RUNNING == server_state()) {
+ if (S_S_RUNNING <= server_state()) {
send_game_state(pconn->self, C_S_PREPARING);
send_rulesets(pconn->self);
send_server_settings(pconn->self);
@@ -3251,7 +3263,7 @@ static bool detach_command(struct connection *caller, char *str, bool check)
/* detach any observers */
conn_list_iterate(pplayer->connections, aconn) {
if (aconn->observer) {
- if (S_S_RUNNING == server_state()) {
+ if (S_S_RUNNING <= server_state()) {
send_rulesets(aconn->self);
send_server_settings(aconn->self);
}
@@ -3270,6 +3282,9 @@ static bool detach_command(struct connection *caller, char *str, bool check)
}
if (pplayer && !pplayer->is_connected) {
+ cancel_connection_votes(pconn);
+ send_updated_vote_totals(NULL);
+
/* aitoggle the player if no longer connected. */
if (game.info.auto_ai_toggle && !pplayer->ai.control) {
toggle_ai_player_direct(NULL, pplayer);
@@ -3340,6 +3355,7 @@ bool load_command(struct connection *caller, const char *filename, bool check)
struct timer *loadtimer, *uloadtimer;
struct section_file file;
char arg[MAX_LEN_PATH];
+ struct conn_list *global_observers;
if (!filename || filename[0] == '\0') {
cmd_reply(CMD_LOAD, caller, C_FAIL, _("Usage: load <game name>"));
@@ -3405,6 +3421,19 @@ bool load_command(struct connection *caller, const char *filename, bool check)
sz_strlcpy(srvarg.load_filename, arg);
+ /* Detach all connections when loading the game, preventing that some
+ * infos are sent to clients which have have the most of the datas
+ * uninitialized. */
+ global_observers = conn_list_new();
+ conn_list_iterate(game.est_connections, pconn) {
+ if (pconn->player) {
+ unattach_connection_from_player(pconn);
+ } else if (pconn->observer) {
+ conn_list_append(global_observers, pconn);
+ pconn->observer = FALSE;
+ }
+ } conn_list_iterate_end;
+
game_load(&file);
section_file_check_unused(&file, arg);
section_file_free(&file);
@@ -3427,9 +3456,6 @@ bool load_command(struct connection *caller, const char *filename, bool check)
* to connections that have the correct username. Any attachments
* made before the game load are unattached. */
conn_list_iterate(game.est_connections, pconn) {
- if (pconn->player) {
- unattach_connection_from_player(pconn);
- }
players_iterate(pplayer) {
if (strcmp(pconn->username, pplayer->username) == 0) {
attach_connection_to_player(pconn, pplayer);
@@ -3438,6 +3464,18 @@ bool load_command(struct connection *caller, const char *filename, bool check)
}
} players_iterate_end;
} conn_list_iterate_end;
+
+ /* Reattach global observers. */
+ conn_list_iterate(global_observers, pconn) {
+ if (!pconn->player) {
+ /* May have been assigned to a player before. */
+ pconn->observer = TRUE;
+ }
+ } conn_list_iterate_end;
+ conn_list_free(global_observers);
+
+ send_conn_info(game.est_connections, game.est_connections);
+
return TRUE;
}
@@ -3458,7 +3496,7 @@ static bool set_rulesetdir(struct connection *caller, char *str, bool check)
_("Current ruleset directory is \"%s\""), game.rulesetdir);
return FALSE;
}
- if (S_S_INITIAL != server_state()) {
+ if (S_S_INITIAL != server_state() || !game.info.is_new_game) {
cmd_reply(CMD_RULESETDIR, caller, C_FAIL,
_("This setting can't be modified after the game has started."));
return FALSE;
@@ -3555,6 +3593,7 @@ bool handle_stdin_input(struct connection *caller, char *str, bool check)
*cptr_s, *cptr_d;
int i;
enum command_id cmd;
+ enum cmdlevel_id level;
/* notify to the server console */
if (!check && caller) {
@@ -3596,6 +3635,20 @@ bool handle_stdin_input(struct connection *caller, char *str, bool check)
*cptr_d=*cptr_s;
*cptr_d='\0';
+ cptr_s = skip_leading_spaces(cptr_s);
+
+ /* keep this before we cut everything after a space */
+ sz_strlcpy(allargs, cptr_s);
+ cut_comment(allargs);
+
+ sz_strlcpy(arg, cptr_s);
+ cut_comment(arg);
+
+ i = strlen(arg) - 1;
+ while (i > 0 && my_isspace(arg[i])) {
+ arg[i--] = '\0';
+ }
+
cmd = command_named(command, FALSE);
if (cmd == CMD_AMBIGUOUS) {
cmd = command_named(command, TRUE);
@@ -3609,67 +3662,60 @@ bool handle_stdin_input(struct connection *caller, char *str, bool check)
return FALSE;
}
- if (S_S_INITIAL != server_state()
- && caller
- && caller->player
- && !caller->observer /* don't allow observers to ask votes */
- && !check
- && caller->access_level == ALLOW_INFO
- && commands[cmd].level == ALLOW_CTRL) {
- int idx = player_index(caller->player);
+ level = command_access_level(cmd);
+
+ if (conn_can_vote(caller, NULL) && level == ALLOW_CTRL
+ && conn_get_access(caller) == ALLOW_BASIC && !check) {
+ struct vote *vote;
/* If we already have a vote going, cancel it in favour of the new
* vote command. You can only have one vote at a time. */
- if (votes[idx].command[0] != '\0') {
+ if (get_vote_by_caller(caller)) {
cmd_reply(CMD_VOTE, caller, C_COMMENT,
- _("Your new vote canceled your previous vote."));
- votes[idx].command[0] = '\0';
+ _("Your new vote cancelled your previous vote."));
}
/* Check if the vote command would succeed. */
- if (handle_stdin_input(caller, full_command, TRUE)) {
- last_vote++;
- notify_conn(NULL, NULL, E_SETTING,
- _("New vote (number %d) by %s: %s."),
- last_vote,
- player_name(caller->player),
- full_command);
- sz_strlcpy(votes[idx].command, full_command);
- votes[idx].vote_no = last_vote;
- memset(votes[idx].votes_cast, VOTE_NONE, sizeof(votes[idx].votes_cast));
- votes[idx].votes_cast[idx] = VOTE_YES; /* vote on your own suggestion */
- check_vote(&votes[idx]); /* update vote numbers, maybe auto-accept */
+ if (handle_stdin_input(caller, full_command, TRUE)
+ && (vote = vote_new(caller, allargs, cmd))) {
+ char votedesc[MAX_LEN_CONSOLE_LINE];
+ const struct player *teamplr;
+ const char *what;
+
+ describe_vote(vote, votedesc, sizeof(votedesc));
+
+ if (vote_is_team_only(vote)) {
+ what = _("New teamvote");
+ teamplr = conn_get_player(caller);
+ } else {
+ what = _("New vote");
+ teamplr = NULL;
+ }
+ notify_team(teamplr, NULL, E_CHAT_MSG,
+ _("%s (number %d) by %s: %s"), what,
+ vote->vote_no, caller->username, votedesc);
+
+ /* Vote on your own suggestion. */
+ connection_vote(caller, vote, VOTE_YES);
return TRUE;
+
} else {
cmd_reply(CMD_VOTE, caller, C_FAIL,
- _("Your new vote (\"%s\") was not legal or was not recognized."),
- full_command);
+ _("Your new vote (\"%s\") was not "
+ "legal or was not recognized."), full_command);
return FALSE;
}
}
- if (caller
- && !(check && caller->access_level >= ALLOW_INFO
- && commands[cmd].level == ALLOW_CTRL)
- && caller->access_level < commands[cmd].level) {
+
+ if (caller && !(check && conn_get_access(caller) >= ALLOW_BASIC
+ && level == ALLOW_CTRL)
+ && conn_get_access(caller) < level) {
cmd_reply(cmd, caller, C_FAIL,
_("You are not allowed to use this command."));
return FALSE;
}
- cptr_s = skip_leading_spaces(cptr_s);
- sz_strlcpy(arg, cptr_s);
-
- cut_comment(arg);
-
- /* keep this before we cut everything after a space */
- sz_strlcpy(allargs, cptr_s);
- cut_comment(allargs);
-
- i=strlen(arg)-1;
- while(i>0 && my_isspace(arg[i]))
- arg[i--]='\0';
-
- if (!check && commands[cmd].level > ALLOW_INFO) {
+ if (!check && level > ALLOW_INFO) {
/*
* this command will affect the game - inform all players
*
@@ -3743,6 +3789,8 @@ bool handle_stdin_input(struct connection *caller, char *str, bool check)
return wall(arg, check);
case CMD_VOTE:
return vote_command(caller, arg, check);
+ case CMD_CANCELVOTE:
+ return cancelvote_command(caller, arg, check);
case CMD_READ_SCRIPT:
return read_command(caller, arg, check);
case CMD_WRITE_SCRIPT:
diff --git a/server/techtools.c b/server/techtools.c
index a0f620d..2f9f3d3 100644
--- a/server/techtools.c
+++ b/server/techtools.c
@@ -118,16 +118,16 @@ static void tech_researched(struct player *plr)
research->future_tech);
}
- script_signal_emit("tech_researched", 3,
- API_TYPE_TECH_TYPE, tech, API_TYPE_PLAYER, plr,
- API_TYPE_STRING, "researched");
-
/* Deduct tech cost */
research->bulbs_researched =
MAX(research->bulbs_researched - total_bulbs_required(plr), 0);
/* do all the updates needed after finding new tech */
found_new_tech(plr, research->researching, TRUE, TRUE);
+
+ script_signal_emit("tech_researched", 3,
+ API_TYPE_TECH_TYPE, tech, API_TYPE_PLAYER, plr,
+ API_TYPE_STRING, "researched");
}
/****************************************************************************
@@ -168,10 +168,6 @@ void do_tech_parasite_effect(struct player *pplayer)
_("%s acquired from %s!"),
advance_name_for_player(pplayer, i),
buf);
- script_signal_emit("tech_researched", 3,
- API_TYPE_TECH_TYPE, &advances[i],
- API_TYPE_PLAYER, pplayer,
- API_TYPE_STRING, "stolen");
notify_embassies(pplayer, NULL, NULL, E_TECH_GAIN,
_("The %s have acquired %s from %s."),
nation_plural_for_player(pplayer),
@@ -180,6 +176,11 @@ void do_tech_parasite_effect(struct player *pplayer)
do_free_cost(pplayer, i);
found_new_tech(pplayer, i, FALSE, TRUE);
+
+ script_signal_emit("tech_researched", 3,
+ API_TYPE_TECH_TYPE, &advances[i],
+ API_TYPE_PLAYER, pplayer,
+ API_TYPE_STRING, "stolen");
break;
}
}
@@ -594,31 +595,42 @@ void init_tech(struct player *plr, bool update)
}
/****************************************************************************
- Gives initial techs to the player
+ Gives global initial techs to the player. The techs are read from the
+ game ruleset file.
****************************************************************************/
-void give_initial_techs(struct player* plr)
+void give_global_initial_techs(struct player *pplayer)
{
- struct nation_type *nation = nation_of_player(plr);
int i;
-
- /*
- * Give game wide initial techs
- */
+
for (i = 0; i < MAX_NUM_TECH_LIST; i++) {
if (game.rgame.global_init_techs[i] == A_LAST) {
break;
}
- found_new_tech(plr, game.rgame.global_init_techs[i], FALSE, TRUE);
+ /* Maybe the player already got this tech by an other way (e.g. team). */
+ if (get_invention(pplayer, game.rgame.global_init_techs[i])
+ != TECH_KNOWN) {
+ found_new_tech(pplayer, game.rgame.global_init_techs[i], FALSE, TRUE);
+ }
}
+}
+
+/****************************************************************************
+ Gives nation specific initial techs to the player. The techs are read
+ from the nation ruleset file.
+****************************************************************************/
+void give_nation_initial_techs(struct player *pplayer)
+{
+ const struct nation_type *nation = nation_of_player(pplayer);
+ int i;
- /*
- * Give nation specific initial techs
- */
for (i = 0; i < MAX_NUM_TECH_LIST; i++) {
if (nation->init_techs[i] == A_LAST) {
break;
}
- found_new_tech(plr, nation->init_techs[i], FALSE, TRUE);
+ /* Maybe the player already got this tech by an other way (e.g. team). */
+ if (get_invention(pplayer, nation->init_techs[i]) != TECH_KNOWN) {
+ found_new_tech(pplayer, nation->init_techs[i], FALSE, TRUE);
+ }
}
}
@@ -627,7 +639,7 @@ void give_initial_techs(struct player* plr)
Returns the tech. This differs from give_random_free_tech - it doesn't
apply free cost
****************************************************************************/
-Tech_type_id give_random_initial_tech(struct player* pplayer)
+Tech_type_id give_random_initial_tech(struct player *pplayer)
{
Tech_type_id tech;
@@ -691,10 +703,6 @@ Tech_type_id steal_a_tech(struct player *pplayer, struct player *victim,
&& get_invention(victim, preferred) == TECH_KNOWN));
stolen_tech = preferred;
}
- script_signal_emit("tech_researched", 3,
- API_TYPE_TECH_TYPE, &advances[stolen_tech],
- API_TYPE_PLAYER, pplayer,
- API_TYPE_STRING, "stolen");
notify_player(pplayer, NULL, E_TECH_GAIN,
_("You steal %s from the %s."),
@@ -714,6 +722,12 @@ Tech_type_id steal_a_tech(struct player *pplayer, struct player *victim,
do_conquer_cost(pplayer, stolen_tech);
found_new_tech(pplayer, stolen_tech, FALSE, TRUE);
+
+ script_signal_emit("tech_researched", 3,
+ API_TYPE_TECH_TYPE, &advances[stolen_tech],
+ API_TYPE_PLAYER, pplayer,
+ API_TYPE_STRING, "stolen");
+
return stolen_tech;
}
diff --git a/server/techtools.h b/server/techtools.h
index bab50a9..cb8473d 100644
--- a/server/techtools.h
+++ b/server/techtools.h
@@ -34,7 +34,8 @@ Tech_type_id steal_a_tech(struct player *pplayer, struct player *target,
Tech_type_id give_random_free_tech(struct player *pplayer);
Tech_type_id give_immediate_free_tech(struct player *pplayer);
-void give_initial_techs(struct player* plr);
-Tech_type_id give_random_initial_tech(struct player* pplayer);
+void give_global_initial_techs(struct player *pplayer);
+void give_nation_initial_techs(struct player *pplayer);
+Tech_type_id give_random_initial_tech(struct player *pplayer);
#endif
diff --git a/server/unithand.c b/server/unithand.c
index d5e8c8d..8a0f7e0 100644
--- a/server/unithand.c
+++ b/server/unithand.c
@@ -347,7 +347,13 @@ void real_unit_change_homecity(struct unit *punit, struct city *new_pcity)
unit_list_prepend(new_pcity->units_supported, punit);
punit->homecity = new_pcity->id;
- send_unit_info(unit_owner(punit), punit);
+ if (old_owner == new_owner) {
+ /* Only changed homecity only owner can see it. */
+ send_unit_info(new_owner, punit);
+ } else {
+ /* Player owner changed, send info to all able to see it. */
+ send_unit_info(NULL, punit);
+ }
}
city_refresh(new_pcity);
@@ -487,6 +493,14 @@ static void city_add_or_build_error(struct player *pplayer,
_("%s unit has no moves left to build city."),
unit_name_translation(punit));
break;
+ case AB_NOT_OWNER:
+ notify_player(pplayer, punit->tile, E_BAD_COMMAND,
+ /* TRANS: <city> is owned by <nation>, cannot add <unit>. */
+ _("%s is owned by %s, cannot add %s."),
+ city_name(pcity),
+ nation_plural_for_player(city_owner(pcity)),
+ unit_name_translation(punit));
+ break;
case AB_TOO_BIG:
notify_player(pplayer, punit->tile, E_BAD_COMMAND,
_("%s is too big to add %s."),
@@ -502,9 +516,9 @@ static void city_add_or_build_error(struct player *pplayer,
break;
default:
/* Shouldn't happen */
- freelog(LOG_ERROR, "Cannot add %s to %s for unknown reason",
+ freelog(LOG_ERROR, "Cannot add %s to %s for unknown reason (%d)",
unit_rule_name(punit),
- city_name(pcity));
+ city_name(pcity), res);
notify_player(pplayer, punit->tile, E_BAD_COMMAND,
_("Can't add %s to %s."),
unit_name_translation(punit),
@@ -1767,6 +1781,8 @@ void handle_unit_orders(struct player *pplayer,
}
free_unit_orders(punit);
+ /* If we waited on a tile, reset punit->done_moving */
+ punit->done_moving = (punit->moves_left <= 0);
if (packet->length == 0) {
assert(!unit_has_orders(punit));
diff --git a/server/unittools.c b/server/unittools.c
index 2bf579d..693d202 100644
--- a/server/unittools.c
+++ b/server/unittools.c
@@ -1050,6 +1050,11 @@ void bounce_unit(struct unit *punit, bool verbose)
if (count >= ARRAY_SIZE(tiles)) {
break;
}
+
+ if (ptile == punit_tile) {
+ continue;
+ }
+
if (can_unit_survive_at_tile(punit, ptile)
&& !is_non_allied_city_tile(ptile, pplayer)
&& !is_non_allied_unit_tile(ptile, pplayer)) {
diff --git a/server/voting.c b/server/voting.c
new file mode 100644
index 0000000..943a27f
--- /dev/null
+++ b/server/voting.c
@@ -0,0 +1,832 @@
+/***********************************************************************
+ Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+***********************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <math.h>
+
+#include "fcintl.h"
+#include "log.h"
+#include "support.h"
+
+#include "capability.h"
+#include "connection.h"
+#include "packets.h"
+#include "player.h"
+
+#include "commands.h"
+#include "console.h"
+#include "plrhand.h"
+#include "settings.h"
+#include "stdinhand.h"
+#include "voting.h"
+
+
+struct vote_list *vote_list = NULL;
+int vote_number_sequence = 0;
+
+
+/**************************************************************************
+ Helper function that returns the current number of eligible voters.
+**************************************************************************/
+static int count_voters(const struct vote *pvote)
+{
+ int num_voters = 0;
+
+ conn_list_iterate(game.est_connections, pconn) {
+ if (conn_can_vote(pconn, pvote)) {
+ num_voters++;
+ }
+ } conn_list_iterate_end;
+
+ return num_voters;
+}
+
+/**************************************************************************
+ Tell clients that a new vote has been created.
+**************************************************************************/
+static void lsend_vote_new(struct conn_list *dest, struct vote *pvote)
+{
+ struct packet_vote_new packet;
+ struct connection *pconn;
+
+ if (pvote == NULL) {
+ return;
+ }
+
+ pconn = find_conn_by_id(pvote->caller_id);
+ if (pconn == NULL) {
+ return;
+ }
+
+ freelog(LOG_DEBUG, "lsend_vote_new %p (%d) --> %p",
+ pvote, pvote->vote_no, dest);
+
+ packet.vote_no = pvote->vote_no;
+ sz_strlcpy(packet.user, pconn->username);
+ describe_vote(pvote, packet.desc, sizeof(packet.desc));
+
+ packet.percent_required = 100 * pvote->need_pc;
+ packet.flags = pvote->flags;
+
+ if (dest == NULL) {
+ dest = game.est_connections;
+ }
+
+ conn_list_iterate(dest, conn) {
+ if (!has_capability("voteinfo", conn->capability)
+ || !conn_can_vote(conn, pvote)) {
+ continue;
+ }
+ send_packet_vote_new(conn, &packet);
+ } conn_list_iterate_end;
+}
+
+/**************************************************************************
+ Send updated status information about the given vote.
+**************************************************************************/
+static void lsend_vote_update(struct conn_list *dest, struct vote *pvote,
+ int num_voters)
+{
+ struct packet_vote_update packet;
+ struct connection *pconn;
+
+ if (pvote == NULL) {
+ return;
+ }
+
+ pconn = find_conn_by_id(pvote->caller_id);
+ if (pconn == NULL) {
+ return;
+ }
+
+ freelog(LOG_DEBUG, "lsend_vote_update %p (%d) --> %p",
+ pvote, pvote->vote_no, dest);
+
+ packet.vote_no = pvote->vote_no;
+ packet.yes = pvote->yes;
+ packet.no = pvote->no;
+ packet.abstain = pvote->abstain;
+ packet.num_voters = num_voters;
+
+ if (dest == NULL) {
+ dest = game.est_connections;
+ }
+
+ conn_list_iterate(dest, aconn) {
+ if (!has_capability("voteinfo", aconn->capability)
+ || !conn_can_vote(aconn, pvote)) {
+ continue;
+ }
+ send_packet_vote_update(aconn, &packet);
+ } conn_list_iterate_end;
+}
+
+/**************************************************************************
+ Tell clients that the given vote no longer exists.
+**************************************************************************/
+static void lsend_vote_remove(struct conn_list *dest, struct vote *pvote)
+{
+ struct packet_vote_remove packet;
+
+ if (!pvote) {
+ return;
+ }
+
+ packet.vote_no = pvote->vote_no;
+
+ if (dest == NULL) {
+ dest = game.est_connections;
+ }
+
+ conn_list_iterate(dest, pconn) {
+ if (!has_capability("voteinfo", pconn->capability)) {
+ continue;
+ }
+ send_packet_vote_remove(pconn, &packet);
+ } conn_list_iterate_end;
+}
+
+/**************************************************************************
+ Tell clients that the given vote resolved.
+**************************************************************************/
+static void lsend_vote_resolve(struct conn_list *dest,
+ struct vote *pvote, bool passed)
+{
+ struct packet_vote_resolve packet;
+
+ if (!pvote) {
+ return;
+ }
+
+ packet.vote_no = pvote->vote_no;
+ packet.passed = passed;
+
+ if (dest == NULL) {
+ dest = game.est_connections;
+ }
+
+ conn_list_iterate(dest, pconn) {
+ if (!has_capability("voteinfo", pconn->capability)
+ || !conn_can_vote(pconn, pvote)) {
+ continue;
+ }
+ send_packet_vote_resolve(pconn, &packet);
+ } conn_list_iterate_end;
+}
+
+/**************************************************************************
+ Free all memory used by the vote structure.
+**************************************************************************/
+static void free_vote(struct vote *pvote)
+{
+ if (!pvote) {
+ return;
+ }
+
+ vote_cast_list_iterate(pvote->votes_cast, pvc) {
+ free(pvc);
+ } vote_cast_list_iterate_end;
+ vote_cast_list_free(pvote->votes_cast);
+ free(pvote);
+}
+
+/**************************************************************************
+ Remove the given vote and send a vote_remove packet to clients.
+**************************************************************************/
+void remove_vote(struct vote *pvote)
+{
+ if (!vote_list || !pvote) {
+ return;
+ }
+
+ vote_list_unlink(vote_list, pvote);
+ lsend_vote_remove(NULL, pvote);
+ free_vote(pvote);
+}
+
+/**************************************************************************
+ Remove all votes. Sends vote_remove packets to clients.
+**************************************************************************/
+void clear_all_votes(void)
+{
+ if (!vote_list) {
+ return;
+ }
+
+ vote_list_iterate(vote_list, pvote) {
+ lsend_vote_remove(NULL, pvote);
+ free_vote(pvote);
+ } vote_list_iterate_end;
+ vote_list_unlink_all(vote_list);
+}
+
+/***************************************************************************
+ Returns TRUE if this vote is a "teamvote".
+***************************************************************************/
+bool vote_is_team_only(const struct vote *pvote)
+{
+ return pvote && (pvote->flags & VCF_TEAMONLY);
+}
+
+/***************************************************************************
+ A user cannot vote if:
+ * is not connected
+ * access level < basic
+ * isn't a player
+ * the vote is a team vote and not on the caller's team
+ NB: If 'pvote' is NULL, then the team condition is not checked.
+***************************************************************************/
+bool conn_can_vote(const struct connection *pconn, const struct vote *pvote)
+{
+ if (!pconn || !conn_controls_player(pconn)
+ || conn_get_access(pconn) < ALLOW_BASIC) {
+ return FALSE;
+ }
+
+ if (vote_is_team_only(pvote)) {
+ const struct player *pplayer, *caller_plr;
+
+ pplayer = conn_get_player(pconn);
+ caller_plr = conn_get_player(vote_get_caller(pvote));
+ if (!pplayer || !caller_plr
+ || !players_on_same_team(pplayer, caller_plr)) {
+ return FALSE;
+ }
+ }
+
+ return TRUE;
+}
+
+/***************************************************************************
+ Usually, all users can see, except in the team vote case.
+***************************************************************************/
+bool conn_can_see_vote(const struct connection *pconn,
+ const struct vote *pvote)
+{
+ if (!pconn) {
+ return FALSE;
+ }
+
+ if (conn_is_global_observer(pconn)) {
+ /* All is visible for global observer. */
+ return TRUE;
+ }
+
+ if (vote_is_team_only(pvote)) {
+ const struct player *pplayer, *caller_plr;
+
+ pplayer = conn_get_player(pconn);
+ caller_plr = conn_get_player(vote_get_caller(pvote));
+ if (!pplayer || !caller_plr
+ || !players_on_same_team(pplayer, caller_plr)) {
+ return FALSE;
+ }
+ }
+
+ return TRUE;
+}
+
+/**************************************************************************
+ Returns the vote with vote number 'vote_no', or NULL.
+**************************************************************************/
+struct vote *get_vote_by_no(int vote_no)
+{
+ if (!vote_list) {
+ return NULL;
+ }
+
+ vote_list_iterate(vote_list, pvote) {
+ if (pvote->vote_no == vote_no) {
+ return pvote;
+ }
+ } vote_list_iterate_end;
+
+ return NULL;
+}
+
+/**************************************************************************
+ Returns the vote called by 'caller', or NULL if none exists.
+**************************************************************************/
+struct vote *get_vote_by_caller(const struct connection *caller)
+{
+ if (caller == NULL || !vote_list) {
+ return NULL;
+ }
+
+ vote_list_iterate(vote_list, pvote) {
+ if (pvote->caller_id == caller->id) {
+ return pvote;
+ }
+ } vote_list_iterate_end;
+
+ return NULL;
+}
+
+/**************************************************************************
+ Create and return a newly allocated vote for the command with id
+ 'command_id' and all arguments in the string 'allargs'.
+**************************************************************************/
+struct vote *vote_new(struct connection *caller,
+ const char *allargs,
+ int command_id)
+{
+ struct vote *pvote;
+ const struct command *pcmd;
+
+ if (!conn_can_vote(caller, NULL)) {
+ return NULL;
+ }
+
+ /* Cancel previous vote */
+ remove_vote(get_vote_by_caller(caller));
+
+ /* Make a new vote */
+ pvote = fc_malloc(sizeof(struct vote));
+ pvote->caller_id = caller->id;
+ pvote->command_id = command_id;
+ pcmd = &commands[command_id];
+
+ sz_strlcpy(pvote->cmdline, pcmd->name);
+ if (allargs != NULL && allargs[0] != '\0') {
+ sz_strlcat(pvote->cmdline, " ");
+ sz_strlcat(pvote->cmdline, allargs);
+ }
+
+ pvote->turn_count = 0;
+ pvote->votes_cast = vote_cast_list_new();
+ pvote->vote_no = ++vote_number_sequence;
+
+ vote_list_append(vote_list, pvote);
+
+ pvote->flags = pcmd->vote_flags;
+ pvote->need_pc = (double) pcmd->vote_percent / 100.0;
+
+ if (pvote->flags & VCF_NOPASSALONE) {
+ int num_voters = count_voters(pvote);
+ double min_pc = 1.0 / (double) num_voters;
+
+ if (num_voters > 1 && min_pc > pvote->need_pc) {
+ pvote->need_pc = MIN(0.5, 2.0 * min_pc);
+ }
+ }
+
+ lsend_vote_new(NULL, pvote);
+
+ return pvote;
+}
+
+/**************************************************************************
+ Check if we satisfy the criteria for resolving a vote, and resolve it
+ if these critera are indeed met. Updates yes and no variables in voting
+ struct as well.
+**************************************************************************/
+static void check_vote(struct vote *pvote)
+{
+ int num_cast = 0, num_voters = 0;
+ bool resolve = FALSE, passed = FALSE;
+ struct connection *pconn = NULL;
+ double yes_pc = 0.0, no_pc = 0.0, rem_pc = 0.0, base = 0.0;
+ int flags;
+ double need_pc;
+ char cmdline[MAX_LEN_CONSOLE_LINE];
+ const double MY_EPSILON = 0.000001;
+ const char *title;
+ const struct player *callplr;
+
+ if (!pvote) {
+ return;
+ }
+
+ pvote->yes = 0;
+ pvote->no = 0;
+ pvote->abstain = 0;
+
+ num_voters = count_voters(pvote);
+
+ vote_cast_list_iterate(pvote->votes_cast, pvc) {
+ if (!(pconn = find_conn_by_id(pvc->conn_id))
+ || !conn_can_vote(pconn, pvote)) {
+ continue;
+ }
+ num_cast++;
+
+ switch (pvc->vote_cast) {
+ case VOTE_YES:
+ pvote->yes++;
+ break;
+ case VOTE_NO:
+ pvote->no++;
+ break;
+ case VOTE_ABSTAIN:
+ pvote->abstain++;
+ break;
+ default:
+ assert(0);
+ break;
+ }
+ } vote_cast_list_iterate_end;
+
+ flags = pvote->flags;
+ need_pc = pvote->need_pc;
+
+ /* Check if we should resolve the vote. */
+ if (num_voters > 0) {
+
+ /* Players that abstain essentially remove themselves from
+ * the voting pool. */
+ base = num_voters - pvote->abstain;
+
+ if (base > MY_EPSILON) {
+ yes_pc = (double) pvote->yes / base;
+ no_pc = (double) pvote->no / base;
+
+ /* The fraction of people who have not voted at all. */
+ rem_pc = (double) (num_voters - num_cast) / base;
+ }
+
+ if (flags & VCF_NODISSENT && no_pc > MY_EPSILON) {
+ resolve = TRUE;
+ }
+
+ if (!resolve) {
+ resolve = (/* We have enough yes votes. */
+ (yes_pc - need_pc > MY_EPSILON)
+ /* We have too many no votes. */
+ || (no_pc - 1.0 + need_pc > MY_EPSILON
+ || fabs(no_pc - 1.0 + need_pc) < MY_EPSILON)
+ /* We can't get enough no votes. */
+ || (no_pc + rem_pc - 1.0 + need_pc < -MY_EPSILON)
+ /* We can't get enough yes votes. */
+ || (yes_pc + rem_pc - need_pc < -MY_EPSILON
+ || fabs(yes_pc + rem_pc - need_pc) < MY_EPSILON));
+ }
+
+ /* Resolve if everyone voted already. */
+ if (!resolve && fabs(rem_pc) < MY_EPSILON) {
+ resolve = TRUE;
+ }
+
+ /* Resolve this vote if it has been around long enough. */
+ if (!resolve && pvote->turn_count > 1) {
+ resolve = TRUE;
+ }
+
+ /* Resolve this vote if everyone tries to abstain. */
+ if (!resolve && fabs(base) < MY_EPSILON) {
+ resolve = TRUE;
+ }
+ }
+
+ freelog(LOG_DEBUG, "check_vote flags=%d need_pc=%0.2f yes_pc=%0.2f "
+ "no_pc=%0.2f rem_pc=%0.2f base=%0.2f resolve=%d",
+ flags, need_pc, yes_pc, no_pc, rem_pc, base, resolve);
+
+ lsend_vote_update(NULL, pvote, num_voters);
+
+ if (!resolve) {
+ return;
+ }
+
+ passed = yes_pc - need_pc > MY_EPSILON;
+
+ if (passed && flags & VCF_NODISSENT) {
+ passed = fabs(no_pc) < MY_EPSILON;
+ }
+
+ if (vote_is_team_only(pvote)) {
+ const struct connection *caller;
+
+ title = _("Teamvote");
+ caller = vote_get_caller(pvote);
+ callplr = conn_get_player(caller);
+ } else {
+ title = _("Vote");
+ callplr = NULL;
+ }
+
+ if (passed) {
+ notify_team(callplr, NULL, E_CHAT_MSG,
+ _("%s %d \"%s\" is passed %d to %d with "
+ "%d abstentions and %d who did not vote."),
+ title, pvote->vote_no, pvote->cmdline, pvote->yes,
+ pvote->no, pvote->abstain, num_voters - num_cast);
+ } else {
+ notify_team(callplr, NULL, E_CHAT_MSG,
+ _("%s %d \"%s\" failed with %d against, %d for, "
+ "%d abstentions and %d who did not vote."),
+ title, pvote->vote_no, pvote->cmdline, pvote->no,
+ pvote->yes, pvote->abstain, num_voters - num_cast);
+ }
+
+ lsend_vote_resolve(NULL, pvote, passed);
+
+ vote_cast_list_iterate(pvote->votes_cast, pvc) {
+ if (!(pconn = find_conn_by_id(pvc->conn_id))) {
+ freelog(LOG_ERROR, "Got a vote from a lost connection");
+ continue;
+ } else if (!conn_can_vote(pconn, pvote)) {
+ freelog(LOG_ERROR, "Got a vote from a non-voting connection");
+ continue;
+ }
+
+ switch (pvc->vote_cast) {
+ case VOTE_YES:
+ notify_team(callplr, NULL, E_CHAT_MSG,
+ _("%s %d: %s voted yes."),
+ title, pvote->vote_no, pconn->username);
+ break;
+ case VOTE_NO:
+ notify_team(callplr, NULL, E_CHAT_MSG,
+ _("%s %d: %s voted no."),
+ title, pvote->vote_no, pconn->username);
+ break;
+ case VOTE_ABSTAIN:
+ notify_team(callplr, NULL, E_CHAT_MSG,
+ _("%s %d: %s chose to abstain."),
+ title, pvote->vote_no, pconn->username);
+ break;
+ default:
+ break;
+ }
+ } vote_cast_list_iterate_end;
+
+ /* Remove the vote before executing the command because it's the
+ * cause of many crashes due to the /cut command:
+ * - If the caller is the target.
+ * - If the target votes on this vote. */
+ sz_strlcpy(cmdline, pvote->cmdline);
+ remove_vote(pvote);
+
+ if (passed) {
+ handle_stdin_input(NULL, cmdline, FALSE);
+ }
+}
+
+/**************************************************************************
+ Find the vote cast for the user id conn_id in a vote.
+**************************************************************************/
+static struct vote_cast *find_vote_cast(struct vote *pvote, int conn_id)
+{
+ if (!pvote) {
+ return NULL;
+ }
+
+ vote_cast_list_iterate(pvote->votes_cast, pvc) {
+ if (pvc->conn_id == conn_id) {
+ return pvc;
+ }
+ } vote_cast_list_iterate_end;
+
+ return NULL;
+}
+
+/**************************************************************************
+ Return a new vote cast.
+**************************************************************************/
+static struct vote_cast *vote_cast_new(struct vote *pvote)
+{
+ struct vote_cast *pvc;
+
+ if (!pvote) {
+ return NULL;
+ }
+
+ pvc = fc_malloc(sizeof(struct vote_cast));
+ pvc->conn_id = -1;
+ pvc->vote_cast = VOTE_ABSTAIN;
+
+ vote_cast_list_append(pvote->votes_cast, pvc);
+
+ return pvc;
+}
+
+/**************************************************************************
+ Remove a vote cast. This unlinks it and frees its memory.
+**************************************************************************/
+static void remove_vote_cast(struct vote *pvote, struct vote_cast *pvc)
+{
+ if (!pvote || !pvc) {
+ return;
+ }
+
+ vote_cast_list_unlink(pvote->votes_cast, pvc);
+ free(pvc);
+ check_vote(pvote); /* Maybe can pass */
+}
+
+/**************************************************************************
+ Make the given connection vote 'type' on 'pvote', and check the vote.
+**************************************************************************/
+void connection_vote(struct connection *pconn,
+ struct vote *pvote,
+ enum vote_type type)
+{
+ struct vote_cast *pvc;
+
+ if (!conn_can_vote(pconn, pvote)) {
+ return;
+ }
+
+ /* Try to find a previous vote */
+ if ((pvc = find_vote_cast(pvote, pconn->id))) {
+ pvc->vote_cast = type;
+ } else if ((pvc = vote_cast_new(pvote))) {
+ pvc->vote_cast = type;
+ pvc->conn_id = pconn->id;
+ } else {
+ /* Must never happen */
+ assert(0);
+ }
+ check_vote(pvote);
+}
+
+/**************************************************************************
+ Cancel the votes of a lost or a detached connection.
+**************************************************************************/
+void cancel_connection_votes(struct connection *pconn)
+{
+ if (!pconn || !vote_list) {
+ return;
+ }
+
+ remove_vote(get_vote_by_caller(pconn));
+
+ vote_list_iterate(vote_list, pvote) {
+ remove_vote_cast(pvote, find_vote_cast(pvote, pconn->id));
+ } vote_list_iterate_end;
+}
+
+/**************************************************************************
+ Initialize data structures used by this module.
+**************************************************************************/
+void voting_init(void)
+{
+ if (!vote_list) {
+ vote_list = vote_list_new();
+ vote_number_sequence = 0;
+ }
+}
+
+/**************************************************************************
+ Check running votes. This should be called every turn.
+**************************************************************************/
+void voting_turn(void)
+{
+ if (!vote_list) {
+ freelog(LOG_ERROR, "voting_turn() called before voting_init()");
+ return;
+ }
+
+ vote_list_iterate(vote_list, pvote) {
+ pvote->turn_count++;
+ check_vote(pvote);
+ } vote_list_iterate_end;
+}
+
+/**************************************************************************
+ Free all memory used by this module.
+**************************************************************************/
+void voting_free(void)
+{
+ clear_all_votes();
+ if (vote_list) {
+ vote_list_free(vote_list);
+ vote_list = NULL;
+ }
+}
+
+/**************************************************************************
+ Fills the supplied buffer with a string describing the given vote. This
+ includes the vote command line, the percent required to pass, and any
+ special conditions.
+**************************************************************************/
+int describe_vote(struct vote *pvote, char *buf, int buflen)
+{
+ int ret = 0;
+
+ /* NB We don't handle votes with multiple flags here. */
+
+ if (pvote->flags & VCF_NODISSENT) {
+ ret = my_snprintf(buf, buflen,
+ /* TRANS: Describing a new vote that can only pass
+ * if there are no dissenting votes. */
+ _("%s (needs %0.0f%% and no dissent)."),
+ pvote->cmdline, MIN(100.0, pvote->need_pc * 100.0 + 1));
+ } else {
+ ret = my_snprintf(buf, buflen,
+ /* TRANS: Describing a new vote that can pass only if the
+ * given percentage of players votes 'yes'. */
+ _("%s (needs %0.0f%% in favor)."),
+ pvote->cmdline, MIN(100.0, pvote->need_pc * 100.0 + 1));
+ }
+
+ return ret;
+}
+
+/**************************************************************************
+ Handle a vote submit packet sent from a client. This is basically just
+ a Wrapper around connection_vote().
+**************************************************************************/
+void handle_vote_submit(struct connection *pconn, int vote_no, int value)
+{
+ struct vote *pvote;
+ enum vote_type type;
+
+ freelog(LOG_DEBUG, "Got vote submit (%d %d) from %s.",
+ vote_no, value, conn_description(pconn));
+
+ pvote = get_vote_by_no(vote_no);
+ if (pvote == NULL) {
+ freelog(LOG_ERROR, "Submit request for unknown vote_no %d "
+ "from %s ignored.",
+ vote_no, conn_description(pconn));
+ return;
+ }
+
+ if (value == 1) {
+ type = VOTE_YES;
+ } else if (value == -1) {
+ type = VOTE_NO;
+ } else if (value == 0) {
+ type = VOTE_ABSTAIN;
+ } else {
+ freelog(LOG_ERROR, "Invalid packet data for submit of vote %d "
+ "from %s ignored.", vote_no, conn_description(pconn));
+ return;
+ }
+
+ connection_vote(pconn, pvote, type);
+}
+
+/**************************************************************************
+ Sends a packet_vote_new to pconn (if voteinfo capable) for every
+ currently running vote.
+**************************************************************************/
+void send_running_votes(struct connection *pconn)
+{
+ if (!pconn || !has_capability("voteinfo", pconn->capability)) {
+ return;
+ }
+
+ if (!vote_list || vote_list_size(vote_list) < 1) {
+ return;
+ }
+
+ freelog(LOG_DEBUG, "Sending running votes to %s.",
+ conn_description(pconn));
+
+ connection_do_buffer(pconn);
+ vote_list_iterate(vote_list, pvote) {
+ if (conn_can_vote(pconn, pvote)) {
+ lsend_vote_new(pconn->self, pvote);
+ }
+ } vote_list_iterate_end;
+ connection_do_unbuffer(pconn);
+}
+
+/**************************************************************************
+ Sends a packet_vote_update to every voteinfo-capabale conn in dest. If
+ dest is NULL, then sends to all established connections.
+**************************************************************************/
+void send_updated_vote_totals(struct conn_list *dest)
+{
+ int num_voters;
+
+ if (vote_list == NULL || vote_list_size(vote_list) <= 0) {
+ return;
+ }
+
+ freelog(LOG_DEBUG, "Sending updated vote totals to conn_list %p", dest);
+
+ if (dest == NULL) {
+ dest = game.est_connections;
+ }
+
+ conn_list_do_buffer(dest);
+ vote_list_iterate(vote_list, pvote) {
+ num_voters = count_voters(pvote);
+ lsend_vote_update(dest, pvote, num_voters);
+ } vote_list_iterate_end;
+ conn_list_do_unbuffer(dest);
+}
+
+/**************************************************************************
+ Returns the connection that called this vote.
+**************************************************************************/
+const struct connection *vote_get_caller(const struct vote *pvote)
+{
+ return find_conn_by_id(pvote->caller_id);
+}
diff --git a/server/voting.h b/server/voting.h
new file mode 100644
index 0000000..e7c0ac2
--- /dev/null
+++ b/server/voting.h
@@ -0,0 +1,95 @@
+/***********************************************************************
+ Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+***********************************************************************/
+#ifndef FC__VOTING_H
+#define FC__VOTING_H
+
+#include "shared.h" /* bool */
+
+enum vote_condition_flags {
+ VCF_NONE = 0,
+ VCF_NODISSENT = (1 << 0), /* No 'no' votes.' */
+ VCF_NOPASSALONE = (1 << 1), /* Can't pass with just one vote for,
+ * when there are multiple voters. */
+ VCF_TEAMONLY = (1 << 2) /* Only team members can vote on it. */
+};
+
+enum vote_type {
+ VOTE_YES, VOTE_NO, VOTE_ABSTAIN, VOTE_NUM
+};
+
+/* Forward declarations. */
+struct connection;
+struct conn_list;
+
+struct vote_cast {
+ enum vote_type vote_cast; /* see enum above */
+ int conn_id; /* user id */
+};
+
+#define SPECLIST_TAG vote_cast
+#define SPECLIST_TYPE struct vote_cast
+#include "speclist.h"
+#define vote_cast_list_iterate(alist, pvc) \
+ TYPED_LIST_ITERATE(struct vote_cast, alist, pvc)
+#define vote_cast_list_iterate_end LIST_ITERATE_END
+
+struct vote {
+ int caller_id; /* caller connection id */
+ int command_id;
+ char cmdline[512]; /* Must match MAX_LEN_CONSOLE_LINE. */
+ int turn_count; /* Number of turns active. */
+ struct vote_cast_list *votes_cast;
+ int vote_no; /* place in the queue */
+ int yes;
+ int no;
+ int abstain;
+ int flags;
+ double need_pc;
+};
+
+#define SPECLIST_TAG vote
+#define SPECLIST_TYPE struct vote
+#include "speclist.h"
+#define vote_list_iterate(alist, pvote) \
+ TYPED_LIST_ITERATE(struct vote, alist, pvote)
+#define vote_list_iterate_end LIST_ITERATE_END
+
+extern struct vote_list *vote_list;
+extern int vote_number_sequence;
+
+void voting_init(void);
+void voting_free(void);
+void voting_turn(void);
+
+void clear_all_votes(void);
+void cancel_connection_votes(struct connection *pconn);
+bool conn_can_vote(const struct connection *pconn,
+ const struct vote *pvote);
+bool conn_can_see_vote(const struct connection *pconn,
+ const struct vote *pvote);
+struct vote *get_vote_by_no(int vote_no);
+void connection_vote(struct connection *pconn,
+ struct vote *pvote,
+ enum vote_type type);
+struct vote *get_vote_by_caller(const struct connection *caller);
+void remove_vote(struct vote *pvote);
+struct vote *vote_new(struct connection *caller,
+ const char *allargs,
+ int command_id);
+const struct connection *vote_get_caller(const struct vote *pvote);
+bool vote_is_team_only(const struct vote *pvote);
+int describe_vote(struct vote *pvote, char *buf, int buflen);
+void send_running_votes(struct connection *pconn);
+void send_updated_vote_totals(struct conn_list *dest);
+
+#endif /* FC__VOTING_H */
diff --git a/tests/Makefile.in b/tests/Makefile.in
index edb7a5b..56d2721 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,84 +14,95 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = tests
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -101,10 +113,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -112,27 +128,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -140,6 +168,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -150,17 +180,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -173,69 +224,117 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
CLEANFILES = check-output
-
EXTRA_DIST = \
copyright.sh \
header_guard.sh \
va_list.sh
-subdir = tests
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DIST_COMMON = Makefile.am Makefile.in
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tests/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu tests/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
tags: TAGS
TAGS:
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ctags: CTAGS
+CTAGS:
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile
-
installdirs:
-
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -247,7 +346,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -256,7 +355,8 @@ clean-generic:
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -266,44 +366,78 @@ clean: clean-am
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am:
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic
-uninstall-am: uninstall-info-am
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic uninstall uninstall-am uninstall-info-am
+ mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am
# Currently the "src-check" directive creates a check-output file containing
@@ -318,6 +452,7 @@ src-check:
rm -f check-output_
.PHONY: src-check
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/utility/Makefile.in b/utility/Makefile.in
index 0b24b50..00ab293 100644
--- a/utility/Makefile.in
+++ b/utility/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,84 +14,156 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = utility
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+libcivutility_a_AR = $(AR) $(ARFLAGS)
+libcivutility_a_LIBADD =
+am_libcivutility_a_OBJECTS = astring.$(OBJEXT) capability.$(OBJEXT) \
+ fciconv.$(OBJEXT) distribute.$(OBJEXT) fcintl.$(OBJEXT) \
+ genlist.$(OBJEXT) hash.$(OBJEXT) inputfile.$(OBJEXT) \
+ ioz.$(OBJEXT) log.$(OBJEXT) netintf.$(OBJEXT) pqueue.$(OBJEXT) \
+ mem.$(OBJEXT) rand.$(OBJEXT) registry.$(OBJEXT) \
+ sbuffer.$(OBJEXT) shared.$(OBJEXT) support.$(OBJEXT) \
+ timing.$(OBJEXT) md5.$(OBJEXT)
+libcivutility_a_OBJECTS = $(am_libcivutility_a_OBJECTS)
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/bootstrap/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libcivutility_a_SOURCES)
+DIST_SOURCES = $(libcivutility_a_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+ distdir
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+ dir0=`pwd`; \
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+ sed_rest='s,^[^/]*/*,,'; \
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+ sed_butlast='s,/*[^/]*$$,,'; \
+ while test -n "$$dir1"; do \
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+ if test "$$first" != "."; then \
+ if test "$$first" = ".."; then \
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+ else \
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+ if test "$$first2" = "$$first"; then \
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+ else \
+ dir2="../$$dir2"; \
+ fi; \
+ dir0="$$dir0"/"$$first"; \
+ fi; \
+ fi; \
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+ done; \
+ reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -101,10 +174,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -112,27 +189,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -140,6 +229,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -150,17 +241,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -173,18 +285,40 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
SUBDIRS = ftwl
-
noinst_LIBRARIES = libcivutility.a
-
AM_CPPFLAGS = -I../intl
-
libcivutility_a_SOURCES = \
astring.c \
astring.h \
@@ -230,63 +364,40 @@ libcivutility_a_SOURCES = \
md5.c \
md5.h
-subdir = utility
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-libcivutility_a_AR = $(AR) cru
-libcivutility_a_LIBADD =
-am_libcivutility_a_OBJECTS = astring.$(OBJEXT) capability.$(OBJEXT) \
- fciconv.$(OBJEXT) distribute.$(OBJEXT) fcintl.$(OBJEXT) \
- genlist.$(OBJEXT) hash.$(OBJEXT) inputfile.$(OBJEXT) \
- ioz.$(OBJEXT) log.$(OBJEXT) netintf.$(OBJEXT) pqueue.$(OBJEXT) \
- mem.$(OBJEXT) rand.$(OBJEXT) registry.$(OBJEXT) \
- sbuffer.$(OBJEXT) shared.$(OBJEXT) support.$(OBJEXT) \
- timing.$(OBJEXT) md5.$(OBJEXT)
-libcivutility_a_OBJECTS = $(am_libcivutility_a_OBJECTS)
-
-DEFS = @DEFS@
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-depcomp = $(SHELL) $(top_srcdir)/bootstrap/depcomp
-am__depfiles_maybe = depfiles
- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/astring.Po ./$(DEPDIR)/capability.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/distribute.Po ./$(DEPDIR)/fciconv.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/fcintl.Po ./$(DEPDIR)/genlist.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/hash.Po ./$(DEPDIR)/inputfile.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/ioz.Po ./$(DEPDIR)/log.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/md5.Po ./$(DEPDIR)/mem.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/netintf.Po ./$(DEPDIR)/pqueue.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/rand.Po ./$(DEPDIR)/registry.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/sbuffer.Po ./$(DEPDIR)/shared.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/support.Po ./$(DEPDIR)/timing.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-CFLAGS = @CFLAGS@
-DIST_SOURCES = $(libcivutility_a_SOURCES)
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
- uninstall-info-recursive all-recursive install-data-recursive \
- install-exec-recursive installdirs-recursive install-recursive \
- uninstall-recursive check-recursive installcheck-recursive
-DIST_COMMON = Makefile.am Makefile.in
-DIST_SUBDIRS = $(SUBDIRS)
-SOURCES = $(libcivutility_a_SOURCES)
-
all: all-recursive
.SUFFIXES:
.SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu utility/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu utility/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu utility/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
clean-noinstLIBRARIES:
-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
@@ -296,7 +407,7 @@ libcivutility.a: $(libcivutility_a_OBJECTS) $(libcivutility_a_DEPENDENCIES)
$(RANLIB) libcivutility.a
mostlyclean-compile:
- -rm -f *.$(OBJEXT) core *.core
+ -rm -f *.$(OBJEXT)
distclean-compile:
-rm -f *.tab.c
@@ -322,22 +433,19 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/support.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/timing.Po at am__quote@
-distclean-depend:
- -rm -rf ./$(DEPDIR)
-
.c.o:
- at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
- at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- $(COMPILE) -c `cygpath -w $<`
-CCDEPMODE = @CCDEPMODE@
-uninstall-info-am:
+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
@@ -346,7 +454,13 @@ uninstall-info-am:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @set fnord $$MAKEFLAGS; amf=$$2; \
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -357,16 +471,21 @@ $(RECURSIVE_TARGETS):
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
- @set fnord $$MAKEFLAGS; amf=$$2; \
+$(RECURSIVE_CLEAN_TARGETS):
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
@@ -386,89 +505,137 @@ maintainer-clean-recursive:
else \
local_target="$$target"; \
fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+ctags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
-
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ empty_fix=.; \
+ else \
+ include_option=--include; \
+ empty_fix=; \
+ fi; \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+ test ! -f $$subdir/TAGS || \
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
- list='$(SUBDIRS)'; for subdir in $$list; do \
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d $(distdir)/$$subdir \
- || mkdir $(distdir)/$$subdir \
+ test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
- (cd $$subdir && \
+ fi; \
+ done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+ dir1=$$subdir; dir2="$(top_distdir)"; \
+ $(am__relativize); \
+ new_top_distdir=$$reldir; \
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+ ($(am__cd) $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$(top_distdir)" \
- distdir=../$(distdir)/$$subdir \
+ top_distdir="$$new_top_distdir" \
+ distdir="$$new_distdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
+ am__skip_mode_fix=: \
distdir) \
|| exit 1; \
fi; \
@@ -478,7 +645,6 @@ check: check-recursive
all-am: Makefile $(LIBRARIES)
installdirs: installdirs-recursive
installdirs-am:
-
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
@@ -490,7 +656,7 @@ install-am: all-am
installcheck: installcheck-recursive
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -498,7 +664,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -508,55 +675,87 @@ clean: clean-recursive
clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
distclean: distclean-recursive
-
-distclean-am: clean-am distclean-compile distclean-depend \
- distclean-generic distclean-tags
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-tags
dvi: dvi-recursive
dvi-am:
+html: html-recursive
+
+html-am:
+
info: info-recursive
info-am:
install-data-am:
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-recursive
+
+install-html-am:
+
install-info: install-info-recursive
+install-info-am:
+
install-man:
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-recursive
mostlyclean-am: mostlyclean-compile mostlyclean-generic
-uninstall-am: uninstall-info-am
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
- clean-generic clean-noinstLIBRARIES clean-recursive distclean \
- distclean-compile distclean-depend distclean-generic \
- distclean-recursive distclean-tags distdir dvi dvi-am \
- dvi-recursive info info-am info-recursive install install-am \
- install-data install-data-am install-data-recursive \
- install-exec install-exec-am install-exec-recursive \
- install-info install-info-am install-info-recursive install-man \
- install-recursive install-strip installcheck installcheck-am \
- installdirs installdirs-am installdirs-recursive \
- maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-recursive tags tags-recursive \
- uninstall uninstall-am uninstall-info-am \
- uninstall-info-recursive uninstall-recursive
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+ install-am install-strip tags-recursive
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am check check-am clean clean-generic \
+ clean-noinstLIBRARIES ctags ctags-recursive distclean \
+ distclean-compile distclean-generic distclean-tags distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs installdirs-am \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
+ tags tags-recursive uninstall uninstall-am
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/utility/ftwl/Makefile.in b/utility/ftwl/Makefile.in
index cc682af..5f344ed 100644
--- a/utility/ftwl/Makefile.in
+++ b/utility/ftwl/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,84 +14,134 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = utility/ftwl
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+libftwl_a_AR = $(AR) $(ARFLAGS)
+libftwl_a_LIBADD =
+am__libftwl_a_SOURCES_DIST = be_common_24.c be_common_24.h \
+ be_x11_ximage.c be_common_pixels.c be_sdl.c be_sdl_pixels.c \
+ back_end.h common_types.c common_types.h widget_p.h widget.h \
+ widget_timeout.c widget.c widget_button.c widget_edit.c \
+ widget_label.c widget_list.c widget_slider.c text_renderer.c \
+ text_renderer.h widget_core.c widget_window.c theme_engine.c \
+ theme_engine.h
+am__objects_1 = be_common_24.$(OBJEXT)
+am__objects_2 = $(am__objects_1) be_x11_ximage.$(OBJEXT) \
+ be_common_pixels.$(OBJEXT)
+ at FTWL_X11_TRUE@am__objects_3 = $(am__objects_2)
+am__objects_4 = $(am__objects_1) be_sdl.$(OBJEXT) \
+ be_common_pixels.$(OBJEXT) be_sdl_pixels.$(OBJEXT)
+ at FTWL_SDL_TRUE@am__objects_5 = $(am__objects_4)
+am__objects_6 = common_types.$(OBJEXT) widget_timeout.$(OBJEXT) \
+ widget.$(OBJEXT) widget_button.$(OBJEXT) widget_edit.$(OBJEXT) \
+ widget_label.$(OBJEXT) widget_list.$(OBJEXT) \
+ widget_slider.$(OBJEXT) text_renderer.$(OBJEXT) \
+ widget_core.$(OBJEXT) widget_window.$(OBJEXT) \
+ theme_engine.$(OBJEXT)
+ at FTWL_TRUE@am__objects_7 = $(am__objects_6)
+am_libftwl_a_OBJECTS = $(am__objects_3) $(am__objects_5) \
+ $(am__objects_7)
+libftwl_a_OBJECTS = $(am_libftwl_a_OBJECTS)
+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/bootstrap/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libftwl_a_SOURCES)
+DIST_SOURCES = $(am__libftwl_a_SOURCES_DIST)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -101,10 +152,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -112,27 +167,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -140,6 +207,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -150,17 +219,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -173,24 +263,45 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
- at FTWL_TRUE@FTWLLIB = libftwl.a
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
@FTWL_FALSE at FTWLLIB =
-
+ at FTWL_TRUE@FTWLLIB = libftwl.a
noinst_LIBRARIES = $(FTWLLIB)
-
AM_CPPFLAGS = -I. -I$(top_srcdir)/utility -I../../intl $(FTWL_CFLAGS)
-
BACKEND_COMMON_FILES = \
be_common_24.c \
be_common_24.h
-
ALL_BACKEND_X11_FILES = \
$(BACKEND_COMMON_FILES) \
be_x11_ximage.c \
@@ -228,79 +339,46 @@ ALL_OTHER_FILES = \
theme_engine.c \
theme_engine.h
-
@FTWL_X11_TRUE at BACKEND_X11_FILES = $(ALL_BACKEND_X11_FILES)
@FTWL_SDL_TRUE at BACKEND_SDL_FILES = $(ALL_BACKEND_SDL_FILES)
@FTWL_TRUE at OTHER_FILES = $(ALL_OTHER_FILES)
-
libftwl_a_SOURCES = $(BACKEND_X11_FILES) \
$(BACKEND_SDL_FILES) $(OTHER_FILES)
-subdir = utility/ftwl
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-libftwl_a_AR = $(AR) cru
-libftwl_a_LIBADD =
-am__objects_1 = be_common_24.$(OBJEXT)
-am__objects_2 = $(am__objects_1) be_x11_ximage.$(OBJEXT) \
- be_common_pixels.$(OBJEXT)
- at FTWL_X11_TRUE@am__objects_3 = $(am__objects_2)
-am__objects_4 = $(am__objects_1) be_sdl.$(OBJEXT) \
- be_common_pixels.$(OBJEXT) be_sdl_pixels.$(OBJEXT)
- at FTWL_SDL_TRUE@am__objects_5 = $(am__objects_4)
-am__objects_6 = common_types.$(OBJEXT) widget_timeout.$(OBJEXT) \
- widget.$(OBJEXT) widget_button.$(OBJEXT) widget_edit.$(OBJEXT) \
- widget_label.$(OBJEXT) widget_list.$(OBJEXT) \
- widget_slider.$(OBJEXT) text_renderer.$(OBJEXT) \
- widget_core.$(OBJEXT) widget_window.$(OBJEXT) \
- theme_engine.$(OBJEXT)
- at FTWL_TRUE@am__objects_7 = $(am__objects_6)
-am_libftwl_a_OBJECTS = $(am__objects_3) $(am__objects_5) \
- $(am__objects_7)
-libftwl_a_OBJECTS = $(am_libftwl_a_OBJECTS)
-
-DEFS = @DEFS@
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LIBS = @LIBS@
-depcomp = $(SHELL) $(top_srcdir)/bootstrap/depcomp
-am__depfiles_maybe = depfiles
- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/be_common_24.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/be_common_pixels.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/be_sdl.Po ./$(DEPDIR)/be_sdl_pixels.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/be_x11_ximage.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/common_types.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/text_renderer.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/theme_engine.Po ./$(DEPDIR)/widget.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/widget_button.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/widget_core.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/widget_edit.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/widget_label.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/widget_list.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/widget_slider.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/widget_timeout.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/widget_window.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-CFLAGS = @CFLAGS@
-DIST_SOURCES = $(libftwl_a_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(libftwl_a_SOURCES)
-
all: all-am
.SUFFIXES:
.SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu utility/ftwl/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu utility/ftwl/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu utility/ftwl/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
clean-noinstLIBRARIES:
-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
@@ -310,7 +388,7 @@ libftwl.a: $(libftwl_a_OBJECTS) $(libftwl_a_DEPENDENCIES)
$(RANLIB) libftwl.a
mostlyclean-compile:
- -rm -f *.$(OBJEXT) core *.core
+ -rm -f *.$(OBJEXT)
distclean-compile:
-rm -f *.tab.c
@@ -333,90 +411,106 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/widget_timeout.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/widget_window.Po at am__quote@
-distclean-depend:
- -rm -rf ./$(DEPDIR)
-
.c.o:
- at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
- at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- $(COMPILE) -c `cygpath -w $<`
-CCDEPMODE = @CCDEPMODE@
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
+tags: TAGS
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ set x; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: CTAGS
+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(LIBRARIES)
-
installdirs:
-
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -428,7 +522,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -436,7 +530,8 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -446,48 +541,85 @@ clean: clean-am
clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
distclean: distclean-am
-
-distclean-am: clean-am distclean-compile distclean-depend \
- distclean-generic distclean-tags
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-tags
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am:
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-compile mostlyclean-generic
-uninstall-am: uninstall-info-am
+pdf: pdf-am
+
+pdf-am:
-.PHONY: GTAGS all all-am check check-am clean clean-generic \
- clean-noinstLIBRARIES distclean distclean-compile \
- distclean-depend distclean-generic distclean-tags distdir dvi \
- dvi-am info info-am install install-am install-data \
- install-data-am install-exec install-exec-am install-info \
- install-info-am install-man install-strip installcheck \
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ clean-noinstLIBRARIES ctags distclean distclean-compile \
+ distclean-generic distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic tags uninstall uninstall-am \
- uninstall-info-am
+ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+ uninstall-am
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/utility/ftwl/back_end.h b/utility/ftwl/back_end.h
new file mode 100644
index 0000000..5d601ff
--- /dev/null
+++ b/utility/ftwl/back_end.h
@@ -0,0 +1,155 @@
+/**********************************************************************
+ Freeciv - Copyright (C) 2004 - The Freeciv Project
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+***********************************************************************/
+#ifndef FC__BACK_END_H
+#define FC__BACK_END_H
+
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_WINSOCK
+#include <winsock.h>
+#endif
+
+#include "common_types.h"
+
+#define MAX_OPACITY 255
+#define MIN_OPACITY 0
+
+#define DEPTH_MIN 100
+#define DEPTH_MAX 300
+#define DEPTH_HIDDEN (DEPTH_MIN-1)
+
+struct be_key {
+ bool alt;
+ bool shift;
+ bool control;
+ enum {
+ BE_KEY_NORMAL,
+ BE_KEY_LEFT,
+ BE_KEY_RIGHT,
+ BE_KEY_UP,
+ BE_KEY_DOWN,
+ BE_KEY_RETURN,
+ BE_KEY_ENTER,
+ BE_KEY_BACKSPACE,
+ BE_KEY_DELETE,
+ BE_KEY_ESCAPE,
+ BE_KEY_PRINT,
+ BE_KEY_SPACE,
+ BE_KEY_KP_0,
+ BE_KEY_KP_1,
+ BE_KEY_KP_2,
+ BE_KEY_KP_3,
+ BE_KEY_KP_4,
+ BE_KEY_KP_5,
+ BE_KEY_KP_6,
+ BE_KEY_KP_7,
+ BE_KEY_KP_8,
+ BE_KEY_KP_9,
+ NUM_BE_KEYS
+ } type;
+ char key;
+};
+
+enum be_mouse_button {
+ BE_MB_LEFT,
+ BE_MB_RIGHT,
+ BE_MB_MIDDLE,
+ BE_MB_LAST
+};
+
+enum be_event_type {
+ BE_NO_EVENT,
+ BE_DATA_OTHER_FD,
+ BE_TIMEOUT,
+ BE_EXPOSE,
+ BE_MOUSE_MOTION,
+ BE_MOUSE_PRESSED,
+ BE_MOUSE_RELEASED,
+ BE_KEY_PRESSED
+};
+
+struct be_event {
+ enum be_event_type type;
+ int socket; /* BE_DATA_OTHER_FD */
+ struct ct_point position; // for BE_MOUSE_*, BE_KEY_PRESSED
+ enum be_mouse_button button; // for BE_MOUSE_*
+ struct be_key key; // for BE_KEY_PRESSED
+ int state; // unused;
+};
+
+struct osda; /* Off-Screen Drawing Area */
+struct sprite;
+struct FT_Bitmap_;
+
+#include "text_renderer.h"
+
+/* ===== general osda ===== */
+struct osda *be_create_osda(int width, int height);
+void be_free_osda(struct osda *osda);
+
+/* ===== drawing to osda ===== */
+#define be_draw_string tr_draw_string
+
+void be_draw_bitmap(struct osda *target, be_color color,
+ const struct ct_point *position,
+ struct FT_Bitmap_ *bitmap);
+
+void be_draw_region(struct osda *target, const struct ct_rect *region,
+ be_color color);
+void be_draw_line(struct osda *target, const struct ct_point *start,
+ const struct ct_point *end, int line_width, bool dashed,
+ be_color color);
+void be_draw_rectangle(struct osda *target, const struct ct_rect *spec,
+ int line_width, be_color color);
+void be_draw_sprite(struct osda *target,
+ const struct sprite *sprite,
+ const struct ct_size *size,
+ const struct ct_point *dest_pos,
+ const struct ct_point *src_pos);
+void be_multiply_alphas(struct sprite *dest_sprite,
+ const struct sprite *src_sprite,
+ const struct ct_point *src_pos);
+void be_copy_osda_to_osda(struct osda *dest,
+ struct osda *src,
+ const struct ct_size *size,
+ const struct ct_point *dest_pos,
+ const struct ct_point *src_pos);
+
+/* ===== query info ===== */
+void be_screen_get_size(struct ct_size *size);
+#define be_string_get_size tr_string_get_size
+void be_sprite_get_size(struct ct_size *size,
+ const struct sprite *sprite);
+void be_osda_get_size(struct ct_size *size,
+ const struct osda *osda);
+bool be_is_transparent_pixel(struct osda *osda, const struct ct_point *pos);
+
+/* ===== graphics.c implementation ===== */
+struct sprite *be_load_gfxfile(const char *filename);
+struct sprite *be_crop_sprite(struct sprite *source,
+ int x, int y, int width, int height);
+void be_free_sprite(struct sprite *sprite);
+
+/* ===== other ===== */
+void be_init(const struct ct_size *screen_size, bool fullscreen);
+bool be_supports_fullscreen(void);
+void be_next_non_blocking_event(struct be_event *event);
+void be_next_blocking_event(struct be_event *event, struct timeval *timeout);
+void be_add_net_input(int sock);
+void be_remove_net_input(void);
+void be_copy_osda_to_screen(struct osda *src);
+void be_write_osda_to_file(struct osda *osda, const char *filename);
+be_color be_get_color(int red, int green, int blue, int alpha);
+
+#endif /* FC__BACK_END_H */
diff --git a/utility/ftwl/be_common_24.c b/utility/ftwl/be_common_24.c
new file mode 100644
index 0000000..662ab1a
--- /dev/null
+++ b/utility/ftwl/be_common_24.c
@@ -0,0 +1,475 @@
+/**********************************************************************
+ Freeciv - Copyright (C) 2005 - The Freeciv Project
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+***********************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <assert.h>
+#include <stdio.h>
+#include <png.h>
+
+#include "fcintl.h"
+#include "log.h"
+#include "mem.h"
+#include "support.h"
+
+#include "back_end.h"
+#include "be_common_24.h"
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
+#define ENABLE_TRANSPARENCY 1
+#define DO_CYCLE_MEASUREMENTS 0
+
+/* Blend the RGB values of two pixel 3-byte pixel arrays
+ * based on a source alpha value. */
+#define ALPHA_BLEND(d, A, s) \
+do { \
+ d[0] = (((s[0]-d[0])*(A))>>8)+d[0]; \
+ d[1] = (((s[1]-d[1])*(A))>>8)+d[1]; \
+ d[2] = (((s[2]-d[2])*(A))>>8)+d[2]; \
+} while(0)
+
+/*************************************************************************
+ Combine RGB colour values into a 24bpp colour value.
+*************************************************************************/
+be_color be_get_color(int red, int green, int blue, int alpha)
+{
+ assert(red >= 0 && red <= 255);
+ assert(green >= 0 && green <= 255);
+ assert(blue >= 0 && blue <= 255);
+ assert(alpha >= 0 && alpha <= 255);
+
+ return red << 24 | green << 16 | blue << 8 | alpha;
+}
+
+/*************************************************************************
+ Set a pixel in a given buffer (dest) to a given color (color).
+*************************************************************************/
+static void set_color(be_color color, unsigned char *dest)
+{
+ dest[0] = ((color >> 24) & 0xff);
+ dest[1] = ((color >> 16) & 0xff);
+ dest[2] = ((color >> 8) & 0xff);
+ dest[3] = ((color) & 0xff);
+}
+
+/*************************************************************************
+ Image blit with transparency. Alpha value lifted from src.
+ MIN_OPACITY means the pixel should not be drawn. MAX_OPACITY means
+ the pixels should not be blended.
+*************************************************************************/
+/* non static to prevent inlining */
+void image_blit_masked_trans(const struct ct_size *size,
+ const struct image *src,
+ const struct ct_point *src_pos,
+ struct image *dest,
+ const struct ct_point *dest_pos);
+void image_blit_masked_trans(const struct ct_size *size,
+ const struct image *src,
+ const struct ct_point *src_pos,
+ struct image *dest,
+ const struct ct_point *dest_pos)
+{
+ int x, y;
+
+ unsigned char *psrc = IMAGE_GET_ADDRESS(src, src_pos->x,
+ src_pos->y);
+ unsigned char *pdest = IMAGE_GET_ADDRESS(dest, dest_pos->x,
+ dest_pos->y);
+ int w = size->width;
+ int h = size->height;
+ int extra_src = (src->width - size->width) * 4;
+ int extra_dest = (dest->width - size->width) * 4;
+
+ //printf("BLITTING %dx%d",size->width,size->height);
+
+ for (y = h; y > 0; y--) {
+ for (x = w; x > 0; x--) {
+ unsigned char mask_value = psrc[3];
+
+#if ENABLE_TRANSPARENCY
+ if(mask_value == MAX_OPACITY) {
+ memcpy(pdest, psrc, 4);
+ } else if(mask_value == MIN_OPACITY) {
+ /*
+ * Empty since we never copy MAX_OPACITY pixels - that is why
+ * they exist!
+ */
+ } else {
+ /* We need to perform transparency */
+ ALPHA_BLEND(pdest, psrc[3], psrc);
+ }
+#else
+ if (mask_value != MIN_OPACITY) {
+ memcpy(pdest, psrc, 4);
+ }
+#endif
+ psrc += 4;
+ pdest += 4;
+ }
+ psrc += extra_src;
+ pdest += extra_dest;
+ }
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void clip_two_regions(const struct image *dest,
+ const struct image *src,
+ struct ct_size *size,
+ struct ct_point *dest_pos,
+ struct ct_point *src_pos)
+{
+ int dx, dy;
+ struct ct_point real_src_pos, real_dest_pos;
+ struct ct_size real_size;
+
+ struct ct_rect src_use =
+ { src_pos->x, src_pos->y, size->width, size->height };
+ struct ct_rect dest_use =
+ { dest_pos->x, dest_pos->y, size->width, size->height };
+
+ real_src_pos = *src_pos;
+ real_dest_pos = *dest_pos;
+
+ ct_clip_rect(&src_use, &src->full_rect);
+ ct_clip_rect(&dest_use, &dest->full_rect);
+
+ real_size.width = MIN(src_use.width, dest_use.width);
+ real_size.height = MIN(src_use.height, dest_use.height);
+
+ dx = MAX(src_use.x - src_pos->x, dest_use.x - dest_pos->x);
+ dy = MAX(src_use.y - src_pos->y, dest_use.y - dest_pos->y);
+
+ real_src_pos.x += dx;
+ real_src_pos.y += dy;
+
+ real_dest_pos.x += dx;
+ real_dest_pos.y += dy;
+
+ *size=real_size;
+ *src_pos=real_src_pos;
+ *dest_pos=real_dest_pos;
+}
+
+/*************************************************************************
+ Blit one image onto another, using transparency value given on all
+ pixels that have alpha mask set.
+*************************************************************************/
+void image_copy(struct image *dest, struct image *src,
+ const struct ct_size *size, const struct ct_point *dest_pos,
+ const struct ct_point *src_pos)
+{
+ struct ct_point real_src_pos = *src_pos, real_dest_pos = *dest_pos;
+ struct ct_size real_size = *size;
+
+ clip_two_regions(dest, src, &real_size, &real_dest_pos, &real_src_pos);
+
+ if (DO_CYCLE_MEASUREMENTS) {
+#define rdtscll(val) __asm__ __volatile__ ("rdtsc" : "=A" (val))
+ unsigned long long start, end;
+ static unsigned long long total_clocks = 0, total_pixels = 0;
+ static int total_blits = 0;
+
+ rdtscll(start);
+
+ image_blit_masked_trans(&real_size, src, &real_src_pos, dest,
+ &real_dest_pos);
+
+ rdtscll(end);
+ printf("BLITTING %dx%d %dx%d->%dx%d %lld %d\n", real_size.width,
+ real_size.height, src->width, src->height, dest->width, dest->height,
+ end - start, real_size.width * real_size.height);
+ total_clocks += (end - start);
+ total_pixels += (real_size.width * real_size.height);
+ total_blits++;
+ if ((total_blits % 1000) == 0) {
+ printf("%f cycles per pixel\n", (float) total_clocks / total_pixels);
+ }
+ } else {
+ image_blit_masked_trans(&real_size, src, &real_src_pos, dest,
+ &real_dest_pos);
+ }
+}
+
+/*************************************************************************
+ See be_draw_bitmap() below.
+*************************************************************************/
+void draw_mono_bitmap(struct image *image, be_color color,
+ const struct ct_point *position,
+ struct FT_Bitmap_ *bitmap)
+{
+ int x, y;
+ unsigned char *pbitmap = (unsigned char *) bitmap->buffer;
+ unsigned char tmp[4];
+ struct ct_point pos;
+
+ set_color(color, tmp);
+
+ for (y = 0; y < bitmap->rows; y++) {
+ pos.y = y + position->y;
+ for (x = 0; x < bitmap->width; x++) {
+ pos.x = x + position->x;
+ if (ct_point_in_rect(&pos, &image->full_rect)) {
+
+ unsigned char bv = bitmap->buffer[x / 8 + bitmap->pitch * y];
+ if (TEST_BIT(bv, 7 - (x % 8))) {
+ unsigned char *p =
+ IMAGE_GET_ADDRESS(image, x + position->x, y + position->y);
+
+ IMAGE_CHECK(image, x + position->x, y + position->y);
+ memcpy(p, tmp, 4);
+ }
+ }
+ }
+ pbitmap += bitmap->pitch;
+ }
+}
+
+/*************************************************************************
+ Draw the given bitmap (ie a 1bpp pixmap) in the given color and
+ position.
+*************************************************************************/
+void draw_alpha_bitmap(struct image *image, be_color color_,
+ const struct ct_point *position,
+ struct FT_Bitmap_ *bitmap)
+{
+ int x, y;
+ unsigned char color[4];
+ unsigned char *pbitmap = (unsigned char *) bitmap->buffer;
+ struct ct_point pos;
+
+ set_color(color_, color);
+
+ for (y = 0; y < bitmap->rows; y++) {
+ pos.y = y + position->y;
+ for (x = 0; x < bitmap->width; x++) {
+ pos.x = x + position->x;
+ if (ct_point_in_rect(&pos, &image->full_rect)) {
+ unsigned short transparency = pbitmap[x];
+ unsigned char tmp[4];
+ unsigned char *p =
+ IMAGE_GET_ADDRESS(image, position->x + x, position->y + y);
+
+ IMAGE_CHECK(image, x, y);
+ ALPHA_BLEND(tmp, transparency, p);
+ memcpy(p, tmp, 4);
+ }
+ }
+ pbitmap += bitmap->pitch;
+ }
+}
+
+/*************************************************************************
+ Set the alpha mask of pixels in a given region of an image.
+*************************************************************************/
+void image_set_alpha(const struct image *image, const struct ct_rect *rect,
+ unsigned char alpha)
+{
+ int x, y;
+
+ for (y = rect->y; y < rect->y + rect->height; y++) {
+ for (x = rect->x; x < rect->x + rect->width; x++) {
+ IMAGE_CHECK(image, x, y);
+ IMAGE_GET_ADDRESS(image, x, y)[3] = alpha;
+ }
+ }
+}
+
+/*************************************************************************
+ Perform
+ dest_alpha = (dest_alpha * src_alpha)/256
+*************************************************************************/
+void image_multiply_alphas(struct image *dest, const struct image *src,
+ const struct ct_point *src_pos)
+{
+ struct ct_point real_src_pos = *src_pos, real_dest_pos = { 0, 0 };
+ struct ct_size real_size = { dest->width, dest->height };
+
+ clip_two_regions(dest, src, &real_size, &real_dest_pos, &real_src_pos);
+ {
+ int x, y;
+
+ for (y = 0; y < real_size.height; y++) {
+ for (x = 0; x < real_size.width; x++) {
+ unsigned char *psrc = IMAGE_GET_ADDRESS(src, x + real_src_pos.x,
+ y + real_src_pos.y);
+ unsigned char *pdest =
+ IMAGE_GET_ADDRESS(dest, x + real_dest_pos.x,
+ y + real_dest_pos.y);
+
+ IMAGE_CHECK(src, x + real_src_pos.x, y + real_src_pos.y);
+ IMAGE_CHECK(dest, x + real_dest_pos.x, y + real_dest_pos.y);
+ pdest[3] = (psrc[3] * pdest[3]) / 256;
+ }
+ }
+ }
+}
+
+/*************************************************************************
+ Copy image buffer src to dest without doing any alpha-blending.
+*************************************************************************/
+void image_copy_full(struct image *src, struct image *dest,
+ struct ct_rect *region)
+{
+ int y;
+
+ for (y = 0; y < region->height; y++) {
+ unsigned char *psrc = IMAGE_GET_ADDRESS(src, region->x,
+ y + region->y);
+ unsigned char *pdest = IMAGE_GET_ADDRESS(dest, 0, y);
+
+ IMAGE_CHECK(src, region->x, y + region->y);
+ IMAGE_CHECK(src, region->x + region->width + -1, y + region->y);
+ IMAGE_CHECK(dest, 0, y);
+ IMAGE_CHECK(dest, region->width - 1, y);
+
+ memcpy(pdest, psrc, 4 * region->width);
+ }
+}
+
+/*************************************************************************
+ Allocate and initialize an image struct.
+*************************************************************************/
+struct image *image_create(int width, int height)
+{
+ struct image *result = fc_malloc(sizeof(*result));
+
+ result->pitch = width * 4;
+ result->data = fc_malloc(result->pitch * height);
+ result->width = width;
+ result->height = height;
+ result->full_rect.x = 0;
+ result->full_rect.y = 0;
+ result->full_rect.width = width;
+ result->full_rect.height = height;
+
+ return result;
+}
+
+/*************************************************************************
+ Free an image struct.
+*************************************************************************/
+void image_destroy(struct image *image)
+{
+ free(image->data);
+ free(image);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+struct image *image_load_gfxfile(const char *filename)
+{
+ png_structp pngp;
+ png_infop infop;
+ png_int_32 width, height, x, y;
+ FILE *fp;
+ struct image *xi;
+
+ fp = fopen(filename, "rb");
+ if (!fp) {
+ freelog(LOG_FATAL, _("Failed reading PNG file: %s"), filename);
+ exit(EXIT_FAILURE);
+ }
+
+ pngp = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+ if (!pngp) {
+ freelog(LOG_FATAL, _("Failed creating PNG struct"));
+ exit(EXIT_FAILURE);
+ }
+
+ infop = png_create_info_struct(pngp);
+ if (!infop) {
+ freelog(LOG_FATAL, _("Failed creating PNG struct"));
+ exit(EXIT_FAILURE);
+ }
+
+ if (setjmp(pngp->jmpbuf)) {
+ freelog(LOG_FATAL, _("Failed while reading PNG file: %s"), filename);
+ exit(EXIT_FAILURE);
+ }
+
+ png_init_io(pngp, fp);
+ png_read_info(pngp, infop);
+
+ width = png_get_image_width(pngp, infop);
+ height = png_get_image_height(pngp, infop);
+
+ freelog(LOG_DEBUG, "reading '%s' (%ldx%ld) bit depth=%d color_type=%d",
+ filename, width, height, png_get_bit_depth(pngp, infop),
+ png_get_color_type(pngp, infop));
+
+ if (png_get_color_type(pngp,infop) == PNG_COLOR_TYPE_PALETTE) {
+ png_set_palette_to_rgb(pngp);
+ }
+
+ if (png_get_valid(pngp, infop, PNG_INFO_tRNS)) {
+ png_set_tRNS_to_alpha(pngp);
+ }
+
+ if (png_get_bit_depth(pngp,infop) == 16) {
+ png_set_strip_16(pngp);
+ }
+
+ if (png_get_bit_depth(pngp,infop) < 8) {
+ png_set_packing(pngp);
+ }
+
+ /* Add an alpha channel for RGB images */
+ if ((png_get_color_type(pngp, infop) & PNG_COLOR_MASK_ALPHA) == 0) {
+ png_set_filler(pngp, 0xff, PNG_FILLER_AFTER);
+ }
+
+ xi = image_create(width, height);
+
+ png_read_update_info(pngp, infop);
+
+ {
+ png_bytep pb;
+ png_uint_32 stride = png_get_rowbytes(pngp, infop);
+ png_bytep buf = fc_malloc(stride * height);
+ png_bytep *row_pointers = fc_malloc(height * sizeof(png_bytep));
+
+ assert(stride >= width * 4);
+
+ for (y = 0, pb = buf; y < height; y++, pb += stride) {
+ row_pointers[y] = pb;
+ }
+
+ png_read_image(pngp, row_pointers);
+ png_read_end(pngp, infop);
+ free(row_pointers);
+ png_destroy_read_struct(&pngp, &infop, NULL);
+ fclose(fp);
+
+ pb = buf;
+
+ for (y = 0; y < height; y++) {
+ for (x = 0; x < width; x++) {
+ png_bytep src = pb + 4 * x;
+ unsigned char *dest = IMAGE_GET_ADDRESS(xi, x, y);
+
+ memcpy(dest, src, 4);
+ }
+ pb += stride;
+ }
+ free(buf);
+ }
+
+ return xi;
+}
diff --git a/utility/ftwl/be_common_24.h b/utility/ftwl/be_common_24.h
new file mode 100644
index 0000000..19163ff
--- /dev/null
+++ b/utility/ftwl/be_common_24.h
@@ -0,0 +1,64 @@
+/**********************************************************************
+ Freeciv - Copyright (C) 2004 - The Freeciv Project
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+***********************************************************************/
+
+#ifndef FC__BE_24_H
+#define FC__BE_24_H
+
+#include "common_types.h"
+
+#define ENABLE_IMAGE_ACCESS_CHECK 0
+
+/* Internal 32bpp format. */
+struct image {
+ int width, height;
+ int pitch;
+ unsigned char *data;
+ struct ct_rect full_rect;
+};
+
+void draw_mono_bitmap(struct image *image, be_color color,
+ const struct ct_point *position,
+ struct FT_Bitmap_ *bitmap);
+void draw_alpha_bitmap(struct image *image, be_color color_,
+ const struct ct_point *position,
+ struct FT_Bitmap_ *bitmap);
+
+struct image *image_create(int width, int height);
+void image_destroy(struct image *image);
+struct image *image_clone_sub(struct image *src, const struct ct_point *pos,
+ const struct ct_size *size);
+void image_copy_full(struct image *src, struct image *dest,
+ struct ct_rect *region);
+void image_copy(struct image *dest, struct image *src,
+ const struct ct_size *size, const struct ct_point *dest_pos,
+ const struct ct_point *src_pos);
+void image_set_alpha(const struct image *image, const struct ct_rect *rect,
+ unsigned char alpha);
+void image_multiply_alphas(struct image *dest, const struct image *src,
+ const struct ct_point *src_pos);
+struct image *image_load_gfxfile(const char *filename);
+
+#define IMAGE_GET_ADDRESS(image, x, y) ((image)->data + (image)->pitch * (y) + 4 * (x))
+
+#if ENABLE_IMAGE_ACCESS_CHECK
+#define IMAGE_CHECK(image, x, y) \
+if((image)->data==NULL || (x)<0 || (x)>=(image)->width || (y)<0 || (y)>=(image)->height) { \
+ printf("ERROR: image data=%p size=(%dx%d) pos=(%d,%d)\n",\
+ (image)->data, (image)->width,(image)->height,(x),(y));\
+ assert(0);\
+}
+#else
+#define IMAGE_CHECK(image, x, y)
+#endif
+
+#endif
diff --git a/utility/ftwl/be_common_pixels.c b/utility/ftwl/be_common_pixels.c
new file mode 100644
index 0000000..569a072
--- /dev/null
+++ b/utility/ftwl/be_common_pixels.c
@@ -0,0 +1,446 @@
+/**********************************************************************
+ Freeciv - Copyright (C) 2005 - The Freeciv Project
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+***********************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <assert.h>
+#include <stdio.h>
+
+#include "log.h"
+#include "mem.h"
+#include "support.h"
+
+#include "back_end.h"
+#include "be_common_pixels.h"
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
+/*************************************************************************
+ Set a pixel in a given buffer (dest) to a given color (color).
+*************************************************************************/
+static void set_color(be_color color, unsigned char *dest)
+{
+ dest[0] = ((color >> 24) & 0xff);
+ dest[1] = ((color >> 16) & 0xff);
+ dest[2] = ((color >> 8) & 0xff);
+ dest[3] = ((color) & 0xff);
+}
+
+/*************************************************************************
+ Blit one osda onto another, using transparency value given on all
+ pixels that have alpha mask set. dest_pos and src_pos can be NULL.
+*************************************************************************/
+void be_copy_osda_to_osda(struct osda *dest,
+ struct osda *src,
+ const struct ct_size *size,
+ const struct ct_point *dest_pos,
+ const struct ct_point *src_pos)
+{
+ struct ct_point tmp_pos = { 0, 0 };
+
+ if (!src_pos) {
+ src_pos = &tmp_pos;
+ }
+
+ if (!dest_pos) {
+ dest_pos = &tmp_pos;
+ }
+
+ if (!ct_size_empty(size)) {
+ image_copy(dest->image, src->image, size, dest_pos, src_pos);
+ }
+}
+
+/*************************************************************************
+ Draw the given bitmap (ie a 1bpp pixmap) on the given osda in the given
+ color and at the given position.
+*************************************************************************/
+void be_draw_bitmap(struct osda *target, be_color color,
+ const struct ct_point *position,
+ struct FT_Bitmap_ *bitmap)
+{
+ if (bitmap->pixel_mode == ft_pixel_mode_mono) {
+ draw_mono_bitmap(target->image, color, position, bitmap);
+ } else if (bitmap->pixel_mode == ft_pixel_mode_grays) {
+ assert(bitmap->num_grays == 256);
+ draw_alpha_bitmap(target->image, color, position, bitmap);
+ } else {
+ assert(0);
+ }
+}
+
+/*************************************************************************
+ Allocate and initialize an osda (off-screen drawing area).
+*************************************************************************/
+struct osda *be_create_osda(int width, int height)
+{
+ struct osda *result = fc_malloc(sizeof(*result));
+
+ result->image = image_create(width, height);
+ result->magic = 11223344;
+
+ return result;
+}
+
+/*************************************************************************
+ Free an allocated osda.
+*************************************************************************/
+void be_free_osda(struct osda *osda)
+{
+ /*
+ assert(osda->magic == 11223344);
+ osda->magic = 0;
+ image_destroy(osda->image);
+ free(osda);
+ */
+}
+
+/*************************************************************************
+ Put size of osda into size.
+*************************************************************************/
+void be_osda_get_size(struct ct_size *size, const struct osda *osda)
+{
+ size->width = osda->image->width;
+ size->height = osda->image->height;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void be_multiply_alphas(struct sprite *dest, const struct sprite *src,
+ const struct ct_point *src_pos)
+{
+ image_multiply_alphas(dest->image, src->image, src_pos);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static struct sprite *ctor_sprite(struct image *image)
+{
+ struct sprite *result = fc_malloc(sizeof(struct sprite));
+ result->image = image;
+ return result;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void be_free_sprite(struct sprite *sprite)
+{
+ free(sprite);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+struct sprite *be_crop_sprite(struct sprite *source,
+ int x, int y, int width, int height)
+{
+ struct sprite *result = ctor_sprite(image_create(width, height));
+ struct ct_rect region = { x, y, width, height };
+
+ ct_clip_rect(®ion, &source->image->full_rect);
+
+ image_copy_full(source->image, result->image, ®ion);
+
+ return result;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+struct sprite *be_load_gfxfile(const char *filename)
+{
+ struct image *gfx = image_load_gfxfile(filename);
+
+ return ctor_sprite(gfx);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void be_sprite_get_size(struct ct_size *size, const struct sprite *sprite)
+{
+ size->width = sprite->image->width;
+ size->height = sprite->image->height;
+}
+
+
+/* ========== drawing ================ */
+
+
+/*************************************************************************
+ Draw an empty rectangle in given osda with given drawing type.
+*************************************************************************/
+void be_draw_rectangle(struct osda *target, const struct ct_rect *spec,
+ int line_width, be_color color)
+{
+ int i;
+
+ for (i = 0; i < line_width; i++) {
+ struct ct_point nw = { spec->x + i, spec->y + i }, ne = nw, sw = ne, se =
+ nw;
+
+ ne.x += spec->width - 2 * i;
+ se.x += spec->width - 2 * i;
+
+ sw.y += spec->height - 2 * i;
+ se.y += spec->height - 2 * i;
+
+ be_draw_line(target, &nw, &ne, 1, FALSE, color);
+ be_draw_line(target, &sw, &se, 1, FALSE, color);
+ be_draw_line(target, &nw, &sw, 1, FALSE, color);
+ be_draw_line(target, &ne, &se, 1, FALSE, color);
+ }
+}
+
+/*************************************************************************
+ Draw a vertical line (only).
+*************************************************************************/
+static void draw_vline(struct image *image, unsigned char *src,
+ int x, int y0, int y1, int line_width, bool dashed)
+{
+ int y;
+
+ if (dashed) {
+ for (y = y0; y < y1; y++) {
+ if (y & (1 << 3)) {
+ IMAGE_CHECK(image, x, y);
+ memcpy(IMAGE_GET_ADDRESS(image, x, y), src, 4);
+ }
+ }
+ } else {
+ for (y = y0; y < y1; y++) {
+ IMAGE_CHECK(image, x, y);
+ memcpy(IMAGE_GET_ADDRESS(image, x, y), src, 4);
+ }
+ }
+}
+
+/*************************************************************************
+ Draw a horisontal line (only).
+*************************************************************************/
+static void draw_hline(struct image *image, unsigned char *src,
+ int y, int x0, int x1, int line_width, bool dashed)
+{
+ int x;
+
+ if (dashed) {
+ for (x = x0; x < x1; x++) {
+ if (x & (1 << 3)) {
+ IMAGE_CHECK(image, x, y);
+ memcpy(IMAGE_GET_ADDRESS(image, x, y), src, 4);
+ }
+ }
+ } else {
+ for (x = x0; x < x1; x++) {
+ IMAGE_CHECK(image, x, y);
+ memcpy(IMAGE_GET_ADDRESS(image, x, y), src, 4);
+ }
+ }
+}
+
+/*************************************************************************
+ Draw any line.
+*************************************************************************/
+static void draw_line(struct image *image, unsigned char *src,
+ int x1, int y1, int x2, int y2, int line_width,
+ bool dashed)
+{
+ int dx = abs(x2 - x1);
+ int dy = abs(y2 - y1);
+ int xinc1, xinc2, yinc1, yinc2;
+ int den, num, numadd, numpixels;
+ int x, y;
+ int curpixel;
+
+ xinc1 = xinc2 = (x2 >= x1) ? 1 : -1;
+ yinc1 = yinc2 = (y2 >= y1) ? 1 : -1;
+
+ if (dx >= dy) {
+ xinc1 = 0;
+ yinc2 = 0;
+ den = dx;
+ num = dx / 2;
+ numadd = dy;
+ numpixels = dx;
+ } else {
+ xinc2 = 0;
+ yinc1 = 0;
+ den = dy;
+ num = dy / 2;
+ numadd = dx;
+ numpixels = dy;
+ }
+
+ x = x1;
+ y = y1;
+
+ for (curpixel = 0; curpixel <= numpixels; curpixel++) {
+ struct ct_point pos = { x, y };
+
+ if (ct_point_in_rect(&pos, &image->full_rect)) {
+ IMAGE_CHECK(image, x, y);
+ memcpy(IMAGE_GET_ADDRESS(image, x, y), src, 4);
+ }
+ num += numadd;
+ if (num >= den) {
+ num -= den;
+ x += xinc1;
+ y += yinc1;
+ }
+ x += xinc2;
+ y += yinc2;
+ }
+}
+
+/*************************************************************************
+ Draw a line in given osda with given drawing type.
+*************************************************************************/
+void be_draw_line(struct osda *target,
+ const struct ct_point *start,
+ const struct ct_point *end,
+ int line_width, bool dashed, be_color color)
+{
+ unsigned char tmp[4];
+ struct ct_rect bounds =
+ { 0, 0, target->image->width, target->image->height };
+
+ set_color(color, tmp);
+
+ if (start->x == end->x) {
+ struct ct_point start2 = *start;
+ struct ct_point end2 = *end;
+
+ ct_clip_point(&start2, &bounds);
+ ct_clip_point(&end2, &bounds);
+
+ draw_vline(target->image, tmp, start2.x, MIN(start2.y, end2.y),
+ MAX(start2.y, end2.y), line_width, dashed);
+ } else if (start->y == end->y) {
+ struct ct_point start2 = *start;
+ struct ct_point end2 = *end;
+
+ ct_clip_point(&start2, &bounds);
+ ct_clip_point(&end2, &bounds);
+
+ draw_hline(target->image, tmp, start2.y, MIN(start2.x, end2.x),
+ MAX(start2.x, end2.x), line_width, dashed);
+ } else {
+ draw_line(target->image, tmp, start->x, start->y, end->x, end->y,
+ line_width, dashed);
+ }
+}
+
+/*************************************************************************
+ Fill a square region in given osda with given colour and drawing type.
+*************************************************************************/
+void be_draw_region(struct osda *target,
+ const struct ct_rect *region, be_color color)
+{
+ unsigned char tmp[4];
+ int x, y;
+ struct ct_rect actual = *region,
+ bounds = { 0, 0, target->image->width, target->image->height };
+ int width;
+
+ set_color(color, tmp);
+
+ ct_clip_rect(&actual, &bounds);
+
+ width = actual.width;
+ for (y = actual.y; y < actual.y + actual.height; y++) {
+ unsigned char *pdest = IMAGE_GET_ADDRESS(target->image, actual.x, y);
+ IMAGE_CHECK(target->image, actual.x, y);
+
+ for (x = 0; x < width; x++) {
+ memcpy(pdest, tmp, 4);
+ pdest += 4;
+ }
+ }
+}
+
+/*************************************************************************
+ Return TRUE iff pixel in given osda is transparent or out of bounds.
+*************************************************************************/
+bool be_is_transparent_pixel(struct osda *osda, const struct ct_point *pos)
+{
+ struct ct_rect bounds = { 0, 0, osda->image->width, osda->image->height };
+ if (!ct_point_in_rect(pos, &bounds)) {
+ return FALSE;
+ }
+
+ IMAGE_CHECK(osda->image, pos->x, pos->y);
+ return IMAGE_GET_ADDRESS(osda->image, pos->x, pos->y)[3] != MAX_OPACITY;
+}
+
+/*************************************************************************
+ size, dest_pos and src_pos can be NULL
+*************************************************************************/
+void be_draw_sprite(struct osda *target,
+ const struct sprite *sprite,
+ const struct ct_size *size,
+ const struct ct_point *dest_pos,
+ const struct ct_point *src_pos)
+{
+ struct ct_size tmp_size;
+ struct ct_point tmp_pos = { 0, 0 };
+
+ if (!src_pos) {
+ src_pos = &tmp_pos;
+ }
+
+ if (!dest_pos) {
+ dest_pos = &tmp_pos;
+ }
+
+ if (!size) {
+ tmp_size.width = sprite->image->width;
+ tmp_size.height = sprite->image->height;
+ size = &tmp_size;
+ }
+
+ image_copy(target->image, sprite->image, size, dest_pos, src_pos);
+}
+
+/*************************************************************************
+ Write an image buffer to file.
+*************************************************************************/
+void be_write_osda_to_file(struct osda *osda, const char *filename)
+{
+ FILE *file;
+ unsigned char *line_buffer = fc_malloc(3 * osda->image->width), *pout;
+ int x, y;
+
+ file = fopen(filename, "w");
+
+ fprintf(file, "P6\n");
+ fprintf(file, "%d %d\n", osda->image->width, osda->image->height);
+ fprintf(file, "255\n");
+
+ for (y = 0; y < osda->image->height; y++) {
+ pout = line_buffer;
+
+ for (x = 0; x < osda->image->width; x++) {
+ IMAGE_CHECK(osda->image, x, y);
+ memcpy(pout, IMAGE_GET_ADDRESS(osda->image, x, y), 3);
+ pout += 3;
+ }
+ fwrite(line_buffer, 3 * osda->image->width, 1, file);
+ }
+ free(line_buffer);
+ fclose(file);
+}
diff --git a/utility/ftwl/be_sdl.c b/utility/ftwl/be_sdl.c
new file mode 100644
index 0000000..d8f5773
--- /dev/null
+++ b/utility/ftwl/be_sdl.c
@@ -0,0 +1,220 @@
+/**********************************************************************
+ Freeciv - Copyright (C) 2005 - The Freeciv Project
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+***********************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+
+#include "SDL.h"
+
+#include "back_end.h"
+
+#include "shared.h"
+
+#include "fcintl.h"
+#include "log.h"
+#include "mem.h"
+#include "netintf.h"
+
+static int other_fd = -1;
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static inline bool copy_event(struct be_event *event, SDL_Event *sdl_event)
+{
+ switch (sdl_event->type) {
+ case SDL_VIDEOEXPOSE:
+ event->type = BE_EXPOSE;
+ break;
+
+ case SDL_MOUSEMOTION:
+ event->type = BE_MOUSE_MOTION;
+ event->position.x = sdl_event->motion.x;
+ event->position.y = sdl_event->motion.y;
+
+ break;
+ case SDL_MOUSEBUTTONUP:
+ case SDL_MOUSEBUTTONDOWN:
+ event->type =
+ sdl_event->type ==
+ SDL_MOUSEBUTTONDOWN ? BE_MOUSE_PRESSED : BE_MOUSE_RELEASED;
+ event->position.x = sdl_event->button.x;
+ event->position.y = sdl_event->button.y;
+ switch (sdl_event->button.button) {
+ case SDL_BUTTON_LEFT:
+ event->button = BE_MB_LEFT;
+ break;
+ case SDL_BUTTON_MIDDLE:
+ event->button = BE_MB_MIDDLE;
+ break;
+ case SDL_BUTTON_RIGHT:
+ event->button = BE_MB_RIGHT;
+ break;
+ default:
+ assert(0);
+ }
+ break;
+ case SDL_KEYDOWN:
+ {
+ SDLKey key = sdl_event->key.keysym.sym;
+
+ event->key.alt = sdl_event->key.keysym.mod & KMOD_ALT;
+ event->key.control = sdl_event->key.keysym.mod & KMOD_CTRL;
+ event->key.shift = sdl_event->key.keysym.mod & KMOD_SHIFT;
+
+ if (key == SDLK_BACKSPACE) {
+ event->key.type = BE_KEY_BACKSPACE;
+ } else if (key == SDLK_RETURN) {
+ event->key.type = BE_KEY_RETURN;
+ } else if (key == SDLK_KP_ENTER) {
+ event->key.type = BE_KEY_ENTER;
+ } else if (key == SDLK_DELETE) {
+ event->key.type = BE_KEY_DELETE;
+ } else if (key == SDLK_LEFT) {
+ event->key.type = BE_KEY_LEFT;
+ } else if (key == SDLK_RIGHT) {
+ event->key.type = BE_KEY_RIGHT;
+ } else if (key == SDLK_DOWN) {
+ event->key.type = BE_KEY_DOWN;
+ } else if (key == SDLK_UP) {
+ event->key.type = BE_KEY_UP;
+ } else if (key == SDLK_ESCAPE) {
+ event->key.type = BE_KEY_ESCAPE;
+ } else {
+ Uint16 unicode = sdl_event->key.keysym.unicode;
+
+ if (unicode == 0) {
+ freelog(LOG_NORMAL, "unicode == 0");
+ return FALSE;
+ }
+ if ((unicode & 0xFF80) != 0) {
+ printf("An International Character '%c' %d.\n", (char) unicode,
+ (char) unicode);
+ return FALSE;
+ }
+
+ event->key.type = BE_KEY_NORMAL;
+ event->key.key = unicode & 0x7F;
+ event->key.shift = FALSE;
+ }
+ event->type = BE_KEY_PRESSED;
+ SDL_GetMouseState(&event->position.x, &event->position.y);
+ }
+ break;
+ case SDL_QUIT:
+ exit(EXIT_SUCCESS);
+
+ default:
+ // freelog(LOG_NORMAL, "ignored event %d\n", sdl_event->type);
+ return FALSE;
+ }
+ return TRUE;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void be_next_non_blocking_event(struct be_event *event)
+{
+ SDL_Event sdl_event;
+
+ event->type = BE_NO_EVENT;
+
+ while (SDL_PollEvent(&sdl_event)) {
+ if (copy_event(event, &sdl_event)) {
+ break;
+ }
+ }
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void be_next_blocking_event(struct be_event *event, struct timeval *timeout)
+{
+ Uint32 timeout_end =
+ SDL_GetTicks() + timeout->tv_sec * 1000 + timeout->tv_usec / 1000;
+
+ for (;;) {
+
+ /* Test for already queued events like mouse and keyboard */
+ be_next_non_blocking_event(event);
+ if (event->type != BE_NO_EVENT) {
+ return;
+ }
+
+ /* Test the network socket. */
+ if (other_fd != -1) {
+ fd_set readfds, exceptfds;
+ int ret;
+ struct timeval zero_timeout;
+
+ FD_ZERO(&readfds);
+ FD_ZERO(&exceptfds);
+
+ FD_SET(other_fd, &readfds);
+ FD_SET(other_fd, &exceptfds);
+
+ zero_timeout.tv_sec = 0;
+ zero_timeout.tv_usec = 0;
+
+ ret = my_select(other_fd + 1, &readfds, NULL, &exceptfds, &zero_timeout);
+ if (ret > 0 && (FD_ISSET(other_fd, &readfds) ||
+ FD_ISSET(other_fd, &exceptfds))) {
+ event->type = BE_DATA_OTHER_FD;
+ event->socket = other_fd;
+ return;
+ }
+ }
+
+ /* Test for the timeout */
+ if (SDL_GetTicks() >= timeout_end) {
+ event->type = BE_TIMEOUT;
+ return;
+ }
+
+ /* Wait 10ms and do polling */
+ SDL_Delay(10);
+ assert(event->type == BE_NO_EVENT);
+ }
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void be_add_net_input(int sock)
+{
+ other_fd = sock;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void be_remove_net_input(void)
+{
+ other_fd = -1;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+bool be_supports_fullscreen(void)
+{
+ return TRUE;
+}
+
diff --git a/utility/ftwl/be_sdl_pixels.c b/utility/ftwl/be_sdl_pixels.c
new file mode 100644
index 0000000..2bc191d
--- /dev/null
+++ b/utility/ftwl/be_sdl_pixels.c
@@ -0,0 +1,144 @@
+/**********************************************************************
+ Freeciv - Copyright (C) 2004 - The Freeciv Project
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+***********************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+
+#include "SDL.h"
+
+#include "back_end.h"
+#include "be_common_24.h"
+#include "be_common_pixels.h"
+
+#include "shared.h"
+
+#include "fcintl.h"
+#include "log.h"
+#include "mem.h"
+
+static SDL_Surface *screen;
+
+/* SDL interprets each pixel as a 32-bit number, so our masks must depend
+ * on the endianness (byte order) of the machine */
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+static Uint32 rmask = 0xff000000;
+static Uint32 gmask = 0x00ff0000;
+static Uint32 bmask = 0x0000ff00;
+static Uint32 amask = 0x000000ff;
+#else
+static Uint32 rmask = 0x000000ff;
+static Uint32 gmask = 0x0000ff00;
+static Uint32 bmask = 0x00ff0000;
+static Uint32 amask = 0xff000000;
+#endif
+
+/*************************************************************************
+ Initialize video mode and SDL.
+*************************************************************************/
+void be_init(const struct ct_size *screen_size, bool fullscreen)
+{
+ Uint32 flags = SDL_SWSURFACE | (fullscreen ? SDL_FULLSCREEN : 0)
+ | SDL_ANYFORMAT;
+
+ char device[20];
+
+ /* auto center new windows in X enviroment */
+ putenv((char *) "SDL_VIDEO_CENTERED=yes");
+
+ if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE) < 0) {
+ freelog(LOG_FATAL, _("Unable to initialize SDL library: %s"),
+ SDL_GetError());
+ exit(EXIT_FAILURE);
+ }
+ atexit(SDL_Quit);
+
+ freelog(LOG_NORMAL, "Using Video Output: %s",
+ SDL_VideoDriverName(device, sizeof(device)));
+ {
+ const SDL_VideoInfo *info = SDL_GetVideoInfo();
+ freelog(LOG_NORMAL, "Video memory of driver: %dkb", info->video_mem);
+ freelog(LOG_NORMAL, "Preferred depth: %d bits per pixel",
+ info->vfmt->BitsPerPixel);
+ }
+
+#if 0
+ {
+ SDL_Rect **modes;
+ int i;
+
+ modes = SDL_ListModes(NULL, flags);
+ if (modes == (SDL_Rect **) 0) {
+ printf("No modes available!\n");
+ exit(-1);
+ }
+ if (modes == (SDL_Rect **) - 1) {
+ printf("All resolutions available.\n");
+ } else {
+ /* Print valid modes */
+ printf("Available Modes\n");
+ for (i = 0; modes[i]; ++i)
+ printf(" %d x %d\n", modes[i]->w, modes[i]->h);
+ }
+ }
+#endif
+
+ screen =
+ SDL_SetVideoMode(screen_size->width, screen_size->height, 32, flags);
+ if (screen == NULL) {
+ freelog(LOG_FATAL, _("Can't set video mode: %s"), SDL_GetError());
+ exit(1);
+ }
+
+ freelog(LOG_NORMAL, "Got a screen with size (%dx%d) and %d bits per pixel",
+ screen->w, screen->h, screen->format->BitsPerPixel);
+ freelog(LOG_NORMAL, " format: red=0x%x green=0x%x blue=0x%x mask=0x%x",
+ screen->format->Rmask, screen->format->Gmask,
+ screen->format->Bmask, screen->format->Amask);
+ freelog(LOG_NORMAL, " format: bits-per-pixel=%d bytes-per-pixel=%d",
+ screen->format->BitsPerPixel, screen->format->BytesPerPixel);
+ SDL_EnableUNICODE(1);
+ SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
+#if 0
+ SDL_EventState(SDL_KEYUP, SDL_IGNORE);
+ SDL_EventState(SDL_ACTIVEEVENT, SDL_IGNORE);
+#endif
+}
+
+/*************************************************************************
+ Copy our osda to the screen. No alpha-blending here.
+*************************************************************************/
+void be_copy_osda_to_screen(struct osda *src)
+{
+ SDL_Surface *buf;
+
+ buf = SDL_CreateRGBSurfaceFrom(src->image->data, src->image->width,
+ src->image->height, 32, src->image->pitch,
+ rmask, gmask, bmask, amask);
+ SDL_BlitSurface(buf, NULL, screen, NULL);
+ SDL_Flip(screen);
+ SDL_FreeSurface(buf);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void be_screen_get_size(struct ct_size *size)
+{
+ size->width = screen->w;
+ size->height = screen->h;
+}
diff --git a/utility/ftwl/be_x11_ximage.c b/utility/ftwl/be_x11_ximage.c
new file mode 100644
index 0000000..2fee24a
--- /dev/null
+++ b/utility/ftwl/be_x11_ximage.c
@@ -0,0 +1,438 @@
+/**********************************************************************
+ Freeciv - Copyright (C) 2004 - The Freeciv Project
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+***********************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+
+#include <X11/Xutil.h>
+#include <X11/Xos.h>
+#include <X11/Xatom.h>
+#include <X11/StringDefs.h>
+#include <X11/keysym.h>
+#include <X11/Shell.h>
+
+#include "back_end.h"
+#include "be_common_24.h"
+#include "be_common_pixels.h"
+
+#include "shared.h"
+
+#include "mem.h"
+#include "netintf.h"
+
+// fixme
+#include "timing.h"
+#include "widget.h"
+
+static Display *display;
+static Window window;
+static int screen_number;
+static int display_depth;
+static int x11fd;
+static int other_fd = -1;
+static XImage *root_image;
+static GC gc_plain;
+
+/*************************************************************************
+ Initialize video mode and window.
+*************************************************************************/
+void be_init(const struct ct_size *screen_size, bool fullscreen)
+{
+ XGCValues values;
+
+ _Xdebug = 0;
+ display = XOpenDisplay(NULL);
+ assert(display);
+
+ screen_number = DefaultScreen(display);
+ display_depth = DefaultDepth(display, screen_number);
+ x11fd = ConnectionNumber(display);
+
+ window =
+ XCreateSimpleWindow(display, XDefaultRootWindow(display), 200, 200,
+ screen_size->width, screen_size->height, 0, 0,
+ WhitePixel(display, screen_number));
+ XSelectInput(display, window,
+ ExposureMask | PointerMotionMask | ButtonPressMask |
+ ButtonReleaseMask | KeyPressMask);
+
+ {
+ Pixmap dummy_mask = XCreatePixmap(display, window, 1, 1, 1);
+
+ values.graphics_exposures = False;
+ values.foreground = BlackPixel(display, screen_number);
+
+ values.graphics_exposures = False;
+ gc_plain = XCreateGC(display, window, GCGraphicsExposures, &values);
+
+ XFreePixmap(display, dummy_mask);
+ }
+
+ /* pop this window up on the screen */
+ XMapRaised(display, window);
+
+ root_image =
+ XCreateImage(display, DefaultVisual(display, screen_number),
+ display_depth, ZPixmap, 0, NULL, screen_size->width,
+ screen_size->height, 32, 0);
+ root_image->data =
+ fc_malloc(root_image->bytes_per_line * root_image->height);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static bool copy_event(struct be_event *event, XEvent * xevent)
+{
+ switch (xevent->type) {
+ case NoExpose:
+ case GraphicsExpose:
+ return FALSE;
+ case Expose:
+ {
+ XExposeEvent *xev = &xevent->xexpose;
+
+ if (xev->count > 0) {
+ return FALSE;
+ }
+ event->type = BE_EXPOSE;
+ }
+ break;
+ case MotionNotify:
+ {
+ XMotionEvent *xev = &xevent->xmotion;
+
+ event->type = BE_MOUSE_MOTION;
+ event->position.x = xev->x;
+ event->position.y = xev->y;
+ }
+ break;
+ case ButtonPress:
+ case ButtonRelease:
+ {
+ XButtonEvent *xev = &xevent->xbutton;
+
+#if 0
+ printf("pos=(%d,%d) button=0x%x state=0x%x\n", xev->x, xev->y,
+ xev->button, xev->state);
+#endif
+ event->type =
+ xevent->type == ButtonPress ? BE_MOUSE_PRESSED : BE_MOUSE_RELEASED;
+ event->position.x = xev->x;
+ event->position.y = xev->y;
+ switch (xev->button) {
+ case 1:
+ event->button = BE_MB_LEFT;
+ break;
+ case 2:
+ event->button = BE_MB_MIDDLE;
+ break;
+ case 3:
+ event->button = BE_MB_RIGHT;
+ break;
+ default:
+ assert(0);
+ }
+ }
+ break;
+ case KeyPress:
+ {
+ XKeyEvent *xev = &xevent->xkey;
+ XKeyEvent copy_xev = *xev;
+ char string[10];
+ KeySym key;
+ struct be_key *k = &event->key;
+ int chars;
+
+ /* Mod2Mask is NumLock */
+ copy_xev.state = copy_xev.state & (ShiftMask | Mod2Mask);
+ chars = XLookupString(©_xev, string, sizeof(string), &key, NULL);
+
+ if (0)
+ printf("chars=%d string='%s' key=%ld cursor=%d\n", chars, string,
+ key, IsCursorKey(key));
+ k->shift = (xev->state & ShiftMask);
+ k->control = (xev->state & ControlMask);
+ k->alt = (xev->state & Mod1Mask);
+
+#define T(x,b) \
+ } else if (key == x) { \
+ k->type = b
+
+ if (FALSE) {
+ T(XK_BackSpace, BE_KEY_BACKSPACE);
+ T(XK_Return, BE_KEY_RETURN);
+ T(XK_KP_Enter, BE_KEY_ENTER);
+ T(XK_Delete, BE_KEY_DELETE);
+ T(XK_Left, BE_KEY_LEFT);
+ T(XK_Right, BE_KEY_RIGHT);
+ T(XK_Up, BE_KEY_UP);
+ T(XK_Down, BE_KEY_DOWN);
+ T(XK_Escape, BE_KEY_ESCAPE);
+ T(XK_Print, BE_KEY_PRINT);
+ T(XK_space, BE_KEY_SPACE);
+ T(XK_KP_0,BE_KEY_KP_0);
+ T(XK_KP_1,BE_KEY_KP_1);
+ T(XK_KP_2,BE_KEY_KP_2);
+ T(XK_KP_3,BE_KEY_KP_3);
+ T(XK_KP_4,BE_KEY_KP_4);
+ T(XK_KP_5,BE_KEY_KP_5);
+ T(XK_KP_6,BE_KEY_KP_6);
+ T(XK_KP_7,BE_KEY_KP_7);
+ T(XK_KP_8,BE_KEY_KP_8);
+ T(XK_KP_9,BE_KEY_KP_9);
+ } else if (chars == 1 && string[0] > ' ' && string[0] <= '~') {
+ k->type = BE_KEY_NORMAL;
+ k->key = string[0];
+ k->shift = FALSE;
+ } else {
+ printf
+ ("WARNING: BE-X11: unconverted KeyPress: chars=%d string='%s' key=0x%lx\n",
+ chars, string, key);
+ return FALSE;
+ }
+ event->type = BE_KEY_PRESSED;
+ event->position.x = xev->x;
+ event->position.y = xev->y;
+ }
+ break;
+ default:
+ printf("got event %d\n", xevent->type);
+ assert(0);
+ }
+ return TRUE;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void be_next_non_blocking_event(struct be_event *event)
+{
+ XEvent xevent;
+
+restart:
+ event->type = BE_NO_EVENT;
+
+ if (XCheckMaskEvent(display, -1 /*all events */ , &xevent)) {
+ if (copy_event(event, &xevent)) {
+ return;
+ } else {
+ /* discard event */
+ goto restart;
+ }
+ }
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void be_next_blocking_event(struct be_event *event, struct timeval *timeout)
+{
+ fd_set readfds, exceptfds;
+ int ret, highest = x11fd;
+
+restart:
+ event->type = BE_NO_EVENT;
+
+ /* No event available: block on input socket until one is */
+ FD_ZERO(&readfds);
+ FD_SET(x11fd, &readfds);
+
+ FD_ZERO(&exceptfds);
+
+ if (other_fd != -1) {
+ FD_SET(other_fd, &readfds);
+ FD_SET(other_fd, &exceptfds);
+ if (other_fd > highest) {
+ highest = other_fd;
+ }
+ }
+
+ ret = my_select(highest + 1, &readfds, NULL, &exceptfds, timeout);
+ if (ret == 0) {
+ // timed out
+ event->type = BE_TIMEOUT;
+ } else if (ret > 0) {
+ if (other_fd != -1 && (FD_ISSET(other_fd, &readfds) ||
+ FD_ISSET(other_fd, &exceptfds))) {
+ event->type = BE_DATA_OTHER_FD;
+ event->socket = other_fd;
+ }
+ /*
+ * New data on the x11 fd. return with BE_NO_EVENT and let the
+ * caller handle it.
+ */
+ } else if (errno == EINTR) {
+ goto restart;
+ } else {
+ assert(0);
+ }
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void be_add_net_input(int sock)
+{
+ other_fd = sock;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void be_remove_net_input(void)
+{
+ other_fd = -1;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void be_screen_get_size(struct ct_size *size)
+{
+ XWindowAttributes window_attributes;
+
+ XGetWindowAttributes(display, window, &window_attributes);
+
+ size->width = window_attributes.width;
+ size->height = window_attributes.height;
+}
+
+#define COMP_565_RED(x) ((((x)>>3)&0x1f)<<11)
+#define COMP_565_GREEN(x) ((((x)>>2)&0x3f)<< 5)
+#define COMP_565_BLUE(x) ((((x)>>3)&0x1f)<< 0)
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void fill_ximage_from_image_565(XImage * ximage,
+ const struct image *image)
+{
+ int x, y;
+ unsigned short *pdest = (unsigned short *) ximage->data;
+ int extra_per_line = ximage->bytes_per_line / 2 - ximage->width;
+
+ for (y = 0; y < ximage->height; y++) {
+ for (x = 0; x < ximage->width; x++) {
+ unsigned char *psrc = IMAGE_GET_ADDRESS(image, x, y);
+ unsigned short new_value =
+ (COMP_565_RED(psrc[0]) | COMP_565_GREEN(psrc[1]) |
+ COMP_565_BLUE(psrc[2]));
+ *pdest = new_value;
+ pdest++;
+ }
+ pdest += extra_per_line;
+ }
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+#define COMP_555_RED(x) ((((x)>>3)&0x1f)<<10)
+#define COMP_555_GREEN(x) ((((x)>>3)&0x1f)<< 5)
+#define COMP_555_BLUE(x) ((((x)>>3)&0x1f)<< 0)
+static void fill_ximage_from_image_555(XImage * ximage,
+ const struct image *image)
+{
+ int x, y;
+ unsigned short *pdest = (unsigned short *) ximage->data;
+ int extra_per_line = ximage->bytes_per_line / 2 - ximage->width;
+
+ for (y = 0; y < ximage->height; y++) {
+ for (x = 0; x < ximage->width; x++) {
+ unsigned char *psrc = IMAGE_GET_ADDRESS(image, x, y);
+ unsigned short new_value =
+ (COMP_555_RED(psrc[0]) | COMP_555_GREEN(psrc[1]) |
+ COMP_555_BLUE(psrc[2]));
+ *pdest = new_value;
+ pdest++;
+ }
+ pdest += extra_per_line;
+ }
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void fill_ximage_from_image_8888(XImage * ximage,
+ const struct image *image)
+{
+ int x, y;
+ unsigned char *pdest = (unsigned char *) ximage->data;
+ int extra_per_line = ximage->bytes_per_line - ximage->width*4;
+
+ for (y = 0; y < ximage->height; y++) {
+ for (x = 0; x < ximage->width; x++) {
+ unsigned char *psrc = IMAGE_GET_ADDRESS(image, x, y);
+
+ pdest[0] = psrc[2];
+ pdest[1] = psrc[1];
+ pdest[2] = psrc[0];
+ pdest += 4;
+ }
+ pdest += extra_per_line;
+ }
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void be_copy_osda_to_screen(struct osda *src)
+{
+ assert(root_image->width == src->image->width &&
+ root_image->height == src->image->height);
+
+ if (root_image->red_mask == 0xf800 &&
+ root_image->green_mask == 0x7e0 && root_image->blue_mask == 0x1f &&
+ root_image->depth == 16 && root_image->bits_per_pixel == 16
+ && root_image->byte_order == LSBFirst) {
+ fill_ximage_from_image_565(root_image, src->image);
+ } else if (root_image->red_mask == 0x7c00 &&
+ root_image->green_mask == 0x3e0 && root_image->blue_mask == 0x1f
+ && root_image->depth == 15 && root_image->bits_per_pixel == 16
+ && root_image->byte_order == LSBFirst) {
+ fill_ximage_from_image_555(root_image, src->image);
+ } else if (root_image->red_mask == 0xff0000 &&
+ root_image->green_mask == 0xff00
+ && root_image->blue_mask == 0xff && root_image->depth == 24
+ && root_image->bits_per_pixel == 32
+ && root_image->byte_order == LSBFirst) {
+ fill_ximage_from_image_8888(root_image, src->image);
+ } else {
+ fprintf(stderr, "ERROR: unknown screen format: red=0x%lx, "
+ "green=0x%lx, blue=0x%lx depth=%d bpp=%d "
+ "byte_order=%d (LSB=%d MSB=%d)\n",
+ root_image->red_mask, root_image->green_mask,
+ root_image->blue_mask, root_image->depth,
+ root_image->bits_per_pixel, root_image->byte_order, LSBFirst,
+ MSBFirst);
+ assert(0);
+ }
+
+ XPutImage(display, window, gc_plain, root_image, 0, 0, 0, 0,
+ root_image->width, root_image->height);
+ XFlush(display);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+bool be_supports_fullscreen(void)
+{
+ return FALSE;
+}
diff --git a/utility/ftwl/common_types.c b/utility/ftwl/common_types.c
new file mode 100644
index 0000000..1f28667
--- /dev/null
+++ b/utility/ftwl/common_types.c
@@ -0,0 +1,598 @@
+/**********************************************************************
+ Freeciv - Copyright (C) 2004 - The Freeciv Project
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+***********************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <assert.h>
+#include <stdio.h>
+
+#include "mem.h"
+#include "support.h"
+
+#include "back_end.h"
+#include "text_renderer.h"
+
+#include "common_types.h"
+
+static struct {
+ int type;
+ char *name;
+} keymap[] = {
+ {
+ BE_KEY_LEFT, "Left"}, {
+ BE_KEY_RIGHT, "Right"}, {
+ BE_KEY_UP, "Up"}, {
+ BE_KEY_DOWN, "Down"}, {
+ BE_KEY_RETURN, "Return"}, {
+ BE_KEY_ENTER, "Enter"}, {
+ BE_KEY_BACKSPACE, "Backspace"}, {
+ BE_KEY_DELETE, "Del"}, {
+ BE_KEY_ESCAPE, "Esc"}, {
+ BE_KEY_SPACE, "Space"}, {
+ BE_KEY_KP_0, "Kp0"}, {
+ BE_KEY_KP_1, "Kp1"}, {
+ BE_KEY_KP_2, "Kp2"}, {
+ BE_KEY_KP_3, "Kp3"}, {
+ BE_KEY_KP_4, "Kp4"}, {
+ BE_KEY_KP_5, "Kp5"}, {
+ BE_KEY_KP_6, "Kp6"}, {
+ BE_KEY_KP_7, "Kp7"}, {
+ BE_KEY_KP_8, "Kp8"}, {
+ BE_KEY_KP_9, "Kp9"}, {
+ BE_KEY_PRINT, "Print"}
+};
+
+/*************************************************************************
+ ...
+*************************************************************************/
+bool ct_rect_valid(const struct ct_rect *rect)
+{
+ return rect->x >= 0 && rect->y >= 0 && rect->width >= 0 && rect->height >= 0;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+bool ct_point_valid(const struct ct_point *point)
+{
+ return point->x >= 0 && point->y >= 0;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+bool ct_rect_in_rect_list(const struct ct_rect *item,
+ const struct region_list *region_list)
+{
+ region_list_iterate(region_list, container) {
+ if (ct_rect_in_rect(item, container)) {
+ return TRUE;
+ }
+ } region_list_iterate_end;
+ return FALSE;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+bool ct_rect_in_rect(const struct ct_rect *item,
+ const struct ct_rect *container)
+
+{
+ assert(ct_rect_valid(container) && ct_rect_valid(item));
+
+ return (item->x >= container->x && item->y >= container->y &&
+ item->x + item->width <= container->x + container->width &&
+ item->y + item->height <= container->y + container->height);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+bool ct_point_in_rect(const struct ct_point *item,
+ const struct ct_rect *container)
+{
+ return (item->x >= container->x && item->y >= container->y &&
+ item->x < container->x + container->width &&
+ item->y < container->y + container->height);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+struct ct_string *ct_string_create(const char *font, int size,
+ be_color foreground,
+ be_color background,
+ const char *text, bool anti_alias,
+ int outline_width,
+ be_color outline_color,
+ enum cts_transform transform)
+{
+ struct ct_string *result = fc_malloc(sizeof(*result));
+
+ result->font = mystrdup(font);
+ result->font_size = size;
+ result->foreground = foreground;
+ result->background = background;
+ result->text = mystrdup(text);
+ result->anti_alias = anti_alias;
+ result->outline_width = outline_width;
+ result->outline_color = outline_color;
+ result->transform = transform;
+
+ if (transform == CTS_TRANSFORM_NONE) {
+ /* nothing */
+ } else if (transform == CTS_TRANSFORM_UPPER) {
+ size_t len = strlen(result->text);
+ int i;
+
+ for (i = 0; i < len; i++) {
+ result->text[i] = my_toupper(result->text[i]);
+ }
+ } else {
+ assert(0);
+ }
+
+ /* split the string */
+ {
+ int row;
+ char *s, *tmp = mystrdup(result->text);
+
+ result->rows = 1;
+ for (s = tmp; *s != '\0'; s++) {
+ if (*s == '\n') {
+ result->rows++;
+ }
+ }
+ result->row = fc_malloc(sizeof(*result->row) * result->rows);
+ s = tmp;
+
+ for (row = 0; row < result->rows; row++) {
+ char *end = strchr(s, '\n');
+
+ if (end) {
+ *end = '\0';
+ result->row[row].text = mystrdup(s);
+ s = end + 1;
+ } else {
+ result->row[row].text = mystrdup(s);
+ }
+ //printf("[%d]='%s'\n", row, result->row[row].text);
+ }
+ free(tmp);
+ }
+
+ tr_prepare_string(result);
+ be_string_get_size(&result->size, result);
+
+ return result;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void ct_string_destroy(struct ct_string *string)
+{
+ int row;
+
+ free(string->font);
+ free(string->text);
+ tr_free_string(string);
+ for (row = 0; row < string->rows; row++) {
+ free(string->row[row].text);
+ }
+ free(string->row);
+ free(string);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+struct ct_string *ct_string_clone(const struct ct_string *orig)
+{
+ return ct_string_create(orig->font, orig->font_size, orig->foreground,
+ orig->background, orig->text, orig->anti_alias,
+ orig->outline_width, orig->outline_color,
+ orig->transform);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+struct ct_string *ct_string_clone1(const struct ct_string *orig,
+ int new_size)
+{
+ return ct_string_create(orig->font, new_size, orig->foreground,
+ orig->background, orig->text, orig->anti_alias,
+ orig->outline_width, orig->outline_color,
+ orig->transform);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+struct ct_string *ct_string_clone2(const struct ct_string *orig,
+ int new_size, const char *new_text)
+{
+ return ct_string_create(orig->font, new_size, orig->foreground,
+ orig->background, new_text, orig->anti_alias,
+ orig->outline_width, orig->outline_color,
+ orig->transform);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+struct ct_string *ct_string_clone3(const struct ct_string *orig,
+ const char *new_text)
+{
+ return ct_string_create(orig->font, orig->font_size, orig->foreground,
+ orig->background, new_text, orig->anti_alias,
+ orig->outline_width, orig->outline_color,
+ orig->transform);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+struct ct_string *ct_string_clone4(const struct ct_string *orig,
+ const char *new_text, be_color new_color)
+{
+ return ct_string_create(orig->font, orig->font_size, new_color,
+ orig->background, new_text, orig->anti_alias,
+ orig->outline_width, orig->outline_color,
+ orig->transform);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+struct ct_string *ct_string_wrap(const struct ct_string *orig, int max_width)
+{
+ struct ct_string *result;
+ int columns;
+
+ for (columns = 100; columns > 1; columns--) {
+ char *copy = mystrdup(orig->text);
+
+ wordwrap_string(copy, columns);
+ result = ct_string_clone3(orig, copy);
+ free(copy);
+ if (result->size.width <= max_width) {
+ return result;
+ }
+ }
+ assert(0);
+ return NULL;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+const char *ct_rect_to_string(const struct ct_rect *rect)
+{
+ static char buffer[100];
+
+ my_snprintf(buffer, 100, "{x=%d, y=%d, width=%d, height=%d}", rect->x,
+ rect->y, rect->width, rect->height);
+ return buffer;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+bool ct_rect_equal(const struct ct_rect *rect1, const struct ct_rect *rect2)
+{
+ return ct_rect_in_rect(rect1, rect2) && ct_rect_in_rect(rect2, rect1);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void ct_rect_intersect(struct ct_rect *dest, const struct ct_rect *src)
+{
+ int last_x = MIN(dest->x + dest->width, src->x + src->width);
+ int last_y = MIN(dest->y + dest->height, src->y + src->height);
+
+ assert(ct_rect_valid(dest) && ct_rect_valid(src));
+ dest->x = MAX(dest->x, src->x);
+ dest->y = MAX(dest->y, src->y);
+
+ dest->width = MAX(0, last_x - dest->x);
+ dest->height = MAX(0, last_y - dest->y);
+ assert(ct_rect_valid(dest));
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void ct_clip_point(struct ct_point *to_draw, const struct ct_rect *available)
+{
+ to_draw->x =
+ CLIP(available->x, to_draw->x, available->x + available->width-1);
+ to_draw->y =
+ CLIP(available->y, to_draw->y, available->y + available->height-1);
+ assert(ct_point_in_rect(to_draw, available));
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void ct_clip_rect(struct ct_rect *to_draw, const struct ct_rect *available)
+{
+ struct ct_point p1 = { to_draw->x, to_draw->y };
+ struct ct_point p2 =
+ { to_draw->x + to_draw->width-1, to_draw->y + to_draw->height-1 };
+
+ ct_clip_point(&p1, available);
+ ct_clip_point(&p2, available);
+
+ /* If after clipping the points are outside we have an empty area */
+ if (!ct_point_in_rect(&p1, to_draw) || !ct_point_in_rect(&p2, to_draw)) {
+ to_draw->x = 0;
+ to_draw->y = 0;
+ to_draw->width = 0;
+ to_draw->height = 0;
+ } else {
+ ct_rect_fill_on_2_points(to_draw, &p1, &p2);
+ }
+
+ assert(ct_rect_in_rect(to_draw, available));
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+struct ct_rect *ct_rect_clone(const struct ct_rect *src)
+{
+ struct ct_rect *result = fc_malloc(sizeof(*result));
+
+ *result = *src;
+ return result;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+bool ct_rect_empty(const struct ct_rect *rect)
+{
+ return rect->width == 0 || rect->height == 0;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+bool ct_size_empty(const struct ct_size *size)
+{
+ return size->width == 0 || size->height == 0;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void ct_rect_fill_on_2_points(struct ct_rect *rect,
+ const struct ct_point *point1,
+ const struct ct_point *point2)
+{
+ rect->x = MIN(point1->x, point2->x);
+ rect->y = MIN(point1->y, point2->y);
+ rect->width = MAX(point1->x, point2->x) - rect->x+1;
+ rect->height = MAX(point1->y, point2->y) - rect->y+1;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+struct ct_tooltip *ct_tooltip_create(const struct ct_string *text,
+ int delay, int shadow,
+ be_color shadow_color)
+{
+ struct ct_tooltip *result = fc_malloc(sizeof(*result));
+
+ result->text = ct_string_clone(text);
+ result->delay = delay;
+ result->shadow = shadow;
+ result->shadow_color = shadow_color;
+
+ return result;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void ct_tooltip_destroy(struct ct_tooltip *tooltip)
+{
+ ct_string_destroy(tooltip->text);
+ free(tooltip);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+struct ct_tooltip *ct_tooltip_clone(const struct ct_tooltip *orig)
+{
+ return ct_tooltip_create(orig->text, orig->delay, orig->shadow,
+ orig->shadow_color);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+struct ct_tooltip *ct_tooltip_clone1(const struct ct_tooltip *orig,
+ const char *new_text)
+{
+ struct ct_tooltip *result;
+ struct ct_string *s = ct_string_clone3(orig->text, new_text);
+
+ result = ct_tooltip_create(s, orig->delay, orig->shadow,
+ orig->shadow_color);
+ ct_string_destroy(s);
+ return result;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void ct_get_placement(const struct ct_placement *placement,
+ struct ct_point *dest, int i, int num)
+{
+ if (placement->type == PL_LINE) {
+ dest->x = placement->data.line.start_x + i * placement->data.line.dx;
+ dest->y = placement->data.line.start_y + i * placement->data.line.dy;
+ } else if (placement->type == PL_GRID) {
+ int x = i / placement->data.grid.height;
+ int y = i % placement->data.grid.height;
+
+ if (placement->data.grid.last == PL_S) {
+ y = placement->data.grid.height - y-1;
+ }
+ dest->x = placement->data.grid.x + x * placement->data.grid.dx;
+ dest->y = placement->data.grid.y + y * placement->data.grid.dy;
+ } else {
+ assert(0);
+ }
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+const char *ct_key_format(const struct be_key *key)
+{
+ static char out[100];
+ char buffer[100];
+
+ if (key->type == BE_KEY_NORMAL) {
+ my_snprintf(buffer, sizeof(buffer), "%c", key->key);
+ } else {
+ int i;
+ bool found = FALSE;
+
+ for (i = 0; i < ARRAY_SIZE(keymap); i++) {
+ if (keymap[i].type == key->type) {
+ my_snprintf(buffer, sizeof(buffer), "%s", keymap[i].name);
+ found = TRUE;
+ break;
+ }
+ }
+ assert(found);
+ }
+
+ my_snprintf(out, sizeof(out), "%s%s%s%s",
+ (key->alt ? "Alt-" : ""),
+ (key->control ? "Ctrl-" : ""),
+ (key->shift ? "Shift-" : ""), buffer);
+ return out;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+struct be_key *ct_key_parse(const char *string)
+{
+ struct be_key *result = fc_malloc(sizeof(*result));
+ const char alt[] = "Alt-";
+ const char ctrl[] = "Ctrl-";
+ const char shift[] = "Shift-";
+ const char *orig=string;
+ int i;
+ bool found = FALSE;
+
+
+ result->alt = FALSE;
+ result->control = FALSE;
+ result->shift = FALSE;
+
+ if (strncmp(string, alt, strlen(alt)) == 0) {
+ result->alt = TRUE;
+ string += strlen(alt);
+ }
+ if (strncmp(string, ctrl, strlen(ctrl)) == 0) {
+ result->control = TRUE;
+ string += strlen(ctrl);
+ }
+ if (strncmp(string, shift, strlen(shift)) == 0) {
+ result->shift = TRUE;
+ string += strlen(shift);
+ }
+
+ for (i = 0; i < ARRAY_SIZE(keymap); i++) {
+ if (strcmp(string, keymap[i].name) == 0) {
+ result->type = keymap[i].type;
+ found = TRUE;
+ break;
+ }
+ }
+ if (!found) {
+ if (strlen(string) != 1) {
+ die("key description '%s' can't be parsed", orig);
+ }
+ result->type = BE_KEY_NORMAL;
+ result->key = string[0];
+ }
+
+ if (!ct_key_is_valid(result)) {
+ die("key description '%s' isn't valid", orig);
+ }
+ return result;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+bool ct_key_matches(const struct be_key *template,
+ const struct be_key *actual_key)
+{
+ if (template->alt && !actual_key->alt)
+ return FALSE;
+ if (template->control && !actual_key->control)
+ return FALSE;
+ if (template->shift && !actual_key->shift)
+ return FALSE;
+ if (template->type != actual_key->type)
+ return FALSE;
+ if (template->type == BE_KEY_NORMAL && template->key != actual_key->key)
+ return FALSE;
+ return TRUE;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+struct be_key *ct_key_clone(const struct be_key *key)
+{
+ struct be_key *result = fc_malloc(sizeof(*result));
+ *result = *key;
+ return result;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void ct_key_destroy(struct be_key *key)
+{
+ free(key);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+bool ct_key_is_valid(const struct be_key *key)
+{
+ if (key->shift && key->type == BE_KEY_NORMAL && key->key != ' ') {
+ return FALSE;
+ }
+
+ return TRUE;
+}
diff --git a/utility/ftwl/common_types.h b/utility/ftwl/common_types.h
new file mode 100644
index 0000000..d52232c
--- /dev/null
+++ b/utility/ftwl/common_types.h
@@ -0,0 +1,149 @@
+/**********************************************************************
+ Freeciv - Copyright (C) 2004 - The Freeciv Project
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+***********************************************************************/
+
+#ifndef FC__TYPES_H
+#define FC__TYPES_H
+
+#include "shared.h"
+
+/* int is sometimes less than 32 bits */
+typedef unsigned long be_color;
+
+struct be_key;
+
+struct ct_rect;
+#define SPECLIST_TAG region
+#define SPECLIST_TYPE struct ct_rect
+#include "speclist.h"
+
+#define region_list_iterate(list, item) \
+ TYPED_LIST_ITERATE(struct ct_rect, list, item)
+#define region_list_iterate_end LIST_ITERATE_END
+
+struct ct_rect {
+ int x, y, width, height;
+};
+
+struct ct_size {
+ int width, height;
+};
+
+struct ct_point {
+ int x, y;
+};
+
+struct tr_string_data;
+
+struct ct_string {
+ char *font;
+ int font_size;
+ be_color foreground;
+ be_color background;
+ char *text;
+ bool anti_alias;
+ int outline_width;
+ be_color outline_color;
+ enum cts_transform {
+ CTS_TRANSFORM_NONE,
+ CTS_TRANSFORM_UPPER
+ } transform;
+
+ /* The following fields are cached. */
+ int rows;
+ struct {
+ char *text;
+ struct tr_string_data *data;
+ } *row;
+ struct ct_size size;
+};
+
+struct ct_tooltip {
+ struct ct_string *text;
+ int delay;
+ int shadow;
+ be_color shadow_color;
+};
+
+struct ct_placement {
+ enum ct_placement_type { PL_LINE,PL_GRID } type;
+ union {
+ struct {
+ int start_x, start_y, dx, dy;
+ } line;
+ struct {
+ int x, y, dx, dy,width,height;
+ enum ct_placement_align { PL_N,PL_S } last;
+ } grid;
+ } data;
+};
+
+struct ct_string *ct_string_create(const char *font, int size,
+ be_color foreground,
+ be_color background,
+ const char *text, bool anti_alias,
+ int outline_width,
+ be_color outline_color,
+ enum cts_transform transform);
+void ct_string_destroy(struct ct_string *string);
+struct ct_string *ct_string_clone(const struct ct_string *orig);
+struct ct_string *ct_string_clone1(const struct ct_string *orig, int new_size);
+struct ct_string *ct_string_clone2(const struct ct_string *orig,
+ int new_size, const char *new_text);
+struct ct_string *ct_string_clone3(const struct ct_string *orig,
+ const char *new_text);
+struct ct_string *ct_string_clone4(const struct ct_string *orig,
+ const char *new_text, be_color new_color);
+struct ct_string *ct_string_wrap(const struct ct_string *orig, int max_width);
+
+struct ct_tooltip *ct_tooltip_create(const struct ct_string *text,
+ int delay, int shadow,
+ be_color shadow_color);
+void ct_tooltip_destroy(struct ct_tooltip *tooltip);
+struct ct_tooltip *ct_tooltip_clone(const struct ct_tooltip *orig);
+struct ct_tooltip *ct_tooltip_clone1(const struct ct_tooltip *orig,
+ const char *new_text);
+
+bool ct_rect_valid(const struct ct_rect *container);
+bool ct_point_valid(const struct ct_point *point);
+void ct_clip_point(struct ct_point *to_draw, const struct ct_rect *available);
+
+bool ct_rect_in_rect_list(const struct ct_rect *item,
+ const struct region_list *list);
+bool ct_rect_in_rect(const struct ct_rect *item,
+ const struct ct_rect *container);
+bool ct_point_in_rect(const struct ct_point *item,
+ const struct ct_rect *container);
+const char *ct_rect_to_string(const struct ct_rect *rect);
+bool ct_rect_equal(const struct ct_rect *rect1,
+ const struct ct_rect *rect2);
+void ct_rect_intersect(struct ct_rect *dest, const struct ct_rect *src);
+struct ct_rect *ct_rect_clone(const struct ct_rect *src);
+bool ct_rect_empty(const struct ct_rect *rect);
+bool ct_size_empty(const struct ct_size *size);
+void ct_rect_fill_on_2_points(struct ct_rect *rect,
+ const struct ct_point *point1,
+ const struct ct_point *point2);
+void ct_clip_rect(struct ct_rect *to_draw, const struct ct_rect *available);
+
+void ct_get_placement(const struct ct_placement *placement,
+ struct ct_point *dest, int i, int num);
+
+struct be_key *ct_key_clone(const struct be_key *key);
+void ct_key_destroy(struct be_key *key);
+const char *ct_key_format(const struct be_key *key);
+struct be_key *ct_key_parse(const char *string);
+bool ct_key_matches(const struct be_key *template,
+ const struct be_key *actual_key);
+bool ct_key_is_valid(const struct be_key *key);
+
+#endif
diff --git a/utility/ftwl/text_renderer.c b/utility/ftwl/text_renderer.c
new file mode 100644
index 0000000..a06cbef
--- /dev/null
+++ b/utility/ftwl/text_renderer.c
@@ -0,0 +1,318 @@
+/**********************************************************************
+ Freeciv - Copyright (C) 2004 - The Freeciv Project
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+***********************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <assert.h>
+#include <stdio.h>
+
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
+#include "log.h"
+#include "mem.h"
+
+#include "widget_p.h"
+
+struct glyph_data {
+ struct ct_point offset;
+ struct FT_Bitmap_ *bitmap;
+};
+
+struct tr_string_data {
+ int num_glyphs;
+ struct glyph_data *glyphs;
+ struct ct_size size;
+};
+
+static FT_Library library;
+
+#define FT_CEIL(X) (((X + 63) & -64) / 64)
+
+static int HALO1_DX[] = { 0, -1, 1, 0};
+static int HALO1_DY[] = {-1, 0, 0, 1};
+#define HALO1_N 4
+static int HALO2_DX[] = {-1, 0, 1, -1, 1, -1, 0, 1};
+static int HALO2_DY[] = {-1, -1, -1, 0, 0, 1, 1, 1};
+#define HALO2_N 8
+static int HALO3_DX[] = { 0, -1, 0, 1, -2, -1, 1, 2, -1, 0, 1, 0};
+static int HALO3_DY[] = {-2, -1, -1, -1, 0, 0, 0, 0, 1, 1, 1, 2};
+#define HALO3_N 12
+static int HALO4_DX[] = {-1, 0, 1, -2, -1, 0, 1, 2, -2, -1, 1, 2, -2, -1, 0, 1, 2, -1, 0, 1};
+static int HALO4_DY[] = {-2, -2, -2, -1, -1, -1, -1, -1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2};
+#define HALO4_N 20
+static int HALO5_DX[] = { 0, -2, -1, 0, 1, 2, -2, -1, 0, 1, 2, -3, -2, -1, 1, 2, 3, -2, -1, 0, 1, 2, -2, -1, 0, 1, 2, 0};
+static int HALO5_DY[] = {-3, -2, -2, -2, -2, -2, -1, -1, -1, -1, -1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 3};
+#define HALO5_N 28
+static int HALO6_DX[] = {-1, 0, 1, -2, -1, 0, 1, 2, -3, -2, -1, 0, 1, 2, 3, -3, -2, -1, 1, 2, 3, -3, -2, -1, 0, 1, 2, 3, -2, -1, 0, 1, 2, -1, 0, 1};
+static int HALO6_DY[] = {-3, -3, -3, -2, -2, -2, -2, -2, -1, -1, -1, -1, -1, -1, -1, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3};
+#define HALO6_N 36
+
+static int *HALO_DX[] =
+ { NULL, HALO1_DX, HALO2_DX, HALO3_DX, HALO4_DX, HALO5_DX, HALO6_DX };
+static int *HALO_DY[] =
+ { NULL, HALO1_DY, HALO2_DY, HALO3_DY, HALO4_DY, HALO5_DY, HALO6_DY };
+static int HALO_N[]={0,HALO1_N,HALO2_N,HALO3_N,HALO4_N,HALO5_N,HALO6_N};
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static struct FT_Bitmap_ *clone_bitmap(const struct FT_Bitmap_ *orig)
+{
+ if (orig->rows == 0 || orig->width == 0) {
+ return NULL;
+ } else {
+ struct FT_Bitmap_ *result = fc_malloc(sizeof(*result));
+ size_t buffer_size = orig->rows * orig->pitch;
+
+ *result = *orig;
+ result->buffer = fc_malloc(buffer_size);
+ memcpy(result->buffer, orig->buffer, buffer_size);
+ return result;
+ }
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void free_bitmap(struct FT_Bitmap_ *bitmap)
+{
+ free(bitmap->buffer);
+ free(bitmap);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static int get_height(FT_Face face)
+{
+ FT_Fixed scale = face->size->metrics.y_scale;
+ int ascent = FT_CEIL(FT_MulFix(face->bbox.yMax, scale));
+ int descent = FT_CEIL(FT_MulFix(face->bbox.yMin, scale));
+
+ return ascent - descent + 1;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static int get_asc(FT_Face face)
+{
+ FT_Fixed scale = face->size->metrics.y_scale;
+ return FT_CEIL(FT_MulFix(face->bbox.yMax, scale));
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void tr_init(void)
+{
+ FT_Error error;
+
+ error = FT_Init_FreeType(&library);
+ assert(!error);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void tr_prepare_string(struct ct_string *string)
+{
+ FT_Face face;
+ FT_Error error;
+ FT_GlyphSlot slot;
+ FT_Bool use_kerning;
+ int row, asc;
+
+ /* Load face */
+ error = FT_New_Face(library, datafilename_required(string->font), 0, &face);
+
+ if (error == FT_Err_Unknown_File_Format) {
+ printf("unknown font format\n");
+ assert(0);
+ } else if (error) {
+ printf("error:%d while opening '%s'\n", error,string->font);
+ assert(0);
+ }
+
+ slot = face->glyph;
+ use_kerning = FT_HAS_KERNING(face);
+
+ /* Set size */
+ error = FT_Set_Pixel_Sizes(face, 0, string->font_size);
+ assert(!error);
+
+ asc = get_asc(face);
+
+ for (row = 0; row < string->rows; row++) {
+ FT_UInt previous = 0;
+ struct tr_string_data *result = fc_malloc(sizeof(*result));
+ struct ct_point pen = { 0, 0 };
+ int i;
+ char *text = string->row[row].text;
+
+ string->row[row].data = result;
+
+ /* Alloc memory */
+ result->num_glyphs = strlen(text);
+ result->glyphs=NULL;
+ if (result->num_glyphs > 0) {
+ result->glyphs =
+ fc_malloc(sizeof(*result->glyphs) * result->num_glyphs);
+
+ /* Go over all chars */
+ for (i = 0; i < result->num_glyphs; i++) {
+ unsigned char c = text[i];
+ struct ct_point real_pos;
+ FT_UInt glyph_index;
+
+ glyph_index = FT_Get_Char_Index(face, c);
+ if (glyph_index == 0) {
+ freelog(LOG_VERBOSE, "can't find glyph for %d '%c'", c, c);
+ }
+
+ if (use_kerning && previous && glyph_index) {
+ FT_Vector delta;
+
+ FT_Get_Kerning(face, previous, glyph_index,
+ ft_kerning_default, &delta);
+ pen.x += delta.x >> 6;
+ if (0 && delta.x)
+ freelog(LOG_NORMAL, "kerning between %c and %c is %ld in '%s'\n",
+ text[i - 1], c, delta.x >> 6, text);
+ }
+
+ error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT);
+ assert(!error);
+
+ error =
+ FT_Render_Glyph(slot,
+ string->
+ anti_alias ? ft_render_mode_normal :
+ ft_render_mode_mono);
+ if (error) {
+ freelog(LOG_ERROR, "can't render glyph for %d '%c': error=0x%x", c,
+ c, error);
+ assert(0);
+ }
+
+ if (0)
+ printf
+ ("rendered glyph '%c' of size %d: %dx%d adv=(%ld,%ld) asc=%d desc=%d\n",
+ c, string->font_size, slot->bitmap.width, slot->bitmap.rows,
+ slot->advance.x >> 6, slot->advance.y >> 6,
+ slot->bitmap_top, slot->bitmap.rows - slot->bitmap_top);
+
+ real_pos = pen;
+ real_pos.x += slot->bitmap_left;
+ real_pos.y += (asc - slot->bitmap_top);
+
+ result->glyphs[i].bitmap = clone_bitmap(&slot->bitmap);
+ result->glyphs[i].offset = real_pos;
+
+ pen.x += slot->advance.x >> 6;
+ pen.y += slot->advance.y >> 6;
+
+ //pen.x+=string->outline_width/2;
+ previous = glyph_index;
+ }
+ }
+ result->size.width = pen.x;
+ result->size.height = get_height(face);
+ }
+
+ error = FT_Done_Face(face);
+ assert(!error);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void tr_free_string(struct ct_string *string)
+{
+ int row,i;
+
+ for (row = 0; row < string->rows; row++) {
+ struct tr_string_data *data = string->row[row].data;
+
+ for (i = 0; i < data->num_glyphs; i++) {
+ if (data->glyphs[i].bitmap) {
+ free_bitmap(data->glyphs[i].bitmap);
+ }
+ }
+ free(data->glyphs);
+ free(data);
+ }
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void tr_string_get_size(struct ct_size *size, const struct ct_string *string)
+{
+ int row;
+
+ size->width = 0;
+ size->height = 0;
+ for (row = 0; row < string->rows; row++) {
+ size->width = MAX(size->width, string->row[row].data->size.width);
+ size->height = size->height + string->row[row].data->size.height;
+ }
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void tr_draw_string(struct osda *target,
+ const struct ct_point *position,
+ const struct ct_string *string)
+{
+ int row, offset_y = 0;
+
+ for (row = 0; row < string->rows; row++) {
+ int i, d;
+ struct tr_string_data *data = string->row[row].data;
+
+
+ for (i = 0; i < data->num_glyphs; i++) {
+ if (data->glyphs[i].bitmap) {
+ struct ct_point p = *position;
+
+ p.x += data->glyphs[i].offset.x;
+ p.y += data->glyphs[i].offset.y;
+ p.y += offset_y;
+
+ if (string->outline_width > 0) {
+ int w = string->outline_width;
+
+ assert(w > 0 && w <= 6);
+
+ for (d = 0; d < HALO_N[w]; d++) {
+ struct ct_point p2 = p;
+
+ p2.x += HALO_DX[w][d];
+ p2.y += HALO_DY[w][d];
+ be_draw_bitmap(target, string->outline_color, &p2,
+ data->glyphs[i].bitmap);
+ }
+ }
+
+ be_draw_bitmap(target, string->foreground, &p,
+ data->glyphs[i].bitmap);
+ }
+ }
+ offset_y += data->size.height;
+ }
+}
diff --git a/utility/ftwl/text_renderer.h b/utility/ftwl/text_renderer.h
new file mode 100644
index 0000000..ac61a99
--- /dev/null
+++ b/utility/ftwl/text_renderer.h
@@ -0,0 +1,30 @@
+/**********************************************************************
+ Freeciv - Copyright (C) 2004 - The Freeciv Project
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+***********************************************************************/
+
+#ifndef FC__TEXT_RENDERER_H
+#define FC__TEXT_RENDERER_H
+
+#include "common_types.h"
+
+struct tr_string_data;
+struct osda;
+
+void tr_init(void);
+void tr_draw_string(struct osda *target,
+ const struct ct_point *position,
+ const struct ct_string *string);
+void tr_string_get_size(struct ct_size *size, const struct ct_string *string);
+void tr_prepare_string(struct ct_string *string);
+void tr_free_string(struct ct_string *string);
+
+#endif /* FC__TEXT_RENDERER_H */
diff --git a/utility/ftwl/theme_engine.c b/utility/ftwl/theme_engine.c
new file mode 100644
index 0000000..c392baa
--- /dev/null
+++ b/utility/ftwl/theme_engine.c
@@ -0,0 +1,756 @@
+/**********************************************************************
+ Freeciv - Copyright (C) 2004 - The Freeciv Project
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+***********************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <assert.h>
+
+#include "fcintl.h"
+#include "log.h"
+#include "hash.h"
+#include "mem.h"
+#include "registry.h"
+#include "support.h"
+
+#include "widget.h"
+
+#include "theme_engine.h"
+
+struct keybinding {
+ struct be_key *key;
+ char *action;
+};
+
+#define SPECLIST_TAG keybinding
+#define SPECLIST_TYPE struct keybinding
+#include "speclist.h"
+
+#define keybinding_list_iterate(calllist, pcall) \
+ TYPED_LIST_ITERATE(struct keybinding, calllist, pcall)
+#define keybinding_list_iterate_end LIST_ITERATE_END
+
+struct info_data {
+ bool is_text;
+ struct ct_rect bounds;
+ struct ct_tooltip *tooltip;
+ struct sw_widget *widget;
+ struct {
+ enum ws_alignment alignment;
+ struct ct_string *template;
+ } text;
+};
+
+struct button_callback {
+ struct te_screen *screen;
+ char *id;
+};
+
+static char *current_theme;
+static char current_res[30];
+
+/*************************************************************************
+ Initialize theme engine and look for theme directory containing the
+ given example file.
+*************************************************************************/
+void te_init(const char *theme, char *example_file)
+{
+ struct ct_size size;
+ be_screen_get_size(&size);
+ char filename[512];
+
+ current_theme = mystrdup(theme);
+ my_snprintf(current_res, sizeof(current_res), "%dx%d", size.width,
+ size.height);
+
+ my_snprintf(filename, sizeof(filename), "themes/gui-ftwl/%s/%s/%s",
+ current_theme, current_res, example_file);
+ if (!datafilename(filename)) {
+ freelog(LOG_FATAL, "ERROR: There is no theme '%s' in resolution '%s'.",
+ current_theme, current_res);
+ exit(EXIT_FAILURE);
+ }
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+struct sprite *te_load_gfx(const char *filename)
+{
+ const int prefixes = 6;
+ char prefix[prefixes][512];
+ int i;
+
+ my_snprintf(prefix[0], sizeof(prefix[0]), "themes/gui-ftwl/%s/%s/", current_theme,
+ current_res);
+ my_snprintf(prefix[1], sizeof(prefix[1]), "themes/gui-ftwl/%s/", current_theme);
+ my_snprintf(prefix[2], sizeof(prefix[2]), "themes/gui-ftwl/common/%s/",
+ current_res);
+ my_snprintf(prefix[3], sizeof(prefix[3]), "themes/gui-ftwl/common/");
+ my_snprintf(prefix[4], sizeof(prefix[4]), "themes/gui-ftwl/");
+ my_snprintf(prefix[5], sizeof(prefix[5]), "%s", "");
+
+ for (i = 0; i < prefixes; i++) {
+ char fullname[512];
+ char *tmp;
+
+ my_snprintf(fullname, sizeof(fullname), "%s%s", prefix[i], filename);
+
+ tmp = datafilename(fullname);
+ if (tmp) {
+ return be_load_gfxfile(tmp);
+
+ }
+ }
+ die("Can't find %s",filename);
+ return NULL;
+}
+
+/*************************************************************************
+ Transform a colour string to a be_color primitive.
+*************************************************************************/
+static bool str_color_to_be_color(be_color *col, const char *s)
+{
+ int values[4] = {0, 0, 0, 255}; /* RGBA; set to black */
+ int i;
+ int len = (strlen(s) - 1) / 2;
+
+ if ((len != 3 && len != 4) || s[0] != '#') {
+ /* Neither RGB or RGBA value in appropriate form! */
+ return FALSE;
+ }
+
+ s++; /* ditch '#' */
+ for (i = 0; i < len; i++) {
+ char b[3];
+ int scanned;
+
+ b[0] = s[0];
+ b[1] = s[1];
+ b[2] = '\0';
+
+ scanned = sscanf(b, "%x", &values[i]);
+ assert(scanned == 1);
+ s += 2;
+ }
+ *col = be_get_color(values[0], values[1], values[2], values[3]);
+ return TRUE;
+}
+
+/*************************************************************************
+ Find a position in a theme file.
+*************************************************************************/
+struct ct_point te_read_point(struct section_file *file, const char *section,
+ const char *prefix)
+{
+ struct ct_point point;
+
+ point.x = secfile_lookup_int(file, "%s.%s.%s", section, prefix, "x");
+ point.y = secfile_lookup_int(file, "%s.%s.%s", section, prefix, "y");
+
+ return point;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+be_color te_read_color(struct section_file *file, const char *section,
+ const char *prefix, const char *suffix)
+{
+ be_color col;
+ if (str_color_to_be_color(&col, secfile_lookup_str(file,
+ "%s.%s%s", section, prefix, suffix))) {
+ return col;
+ } else {
+ freelog(LOG_FATAL, "Wrong colour string in %s, %s.%s%s",
+ file->filename, section, prefix, suffix);
+ assert(0);
+ exit(EXIT_FAILURE);
+ return (be_color)0;
+ }
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+struct be_key *te_read_key(struct section_file *file, const char *section,
+ const char *name)
+{
+ char *line =
+ secfile_lookup_str_default(file, NULL, "%s.%s", section, name);
+
+ if (line) {
+ return ct_key_parse(line);
+ } else {
+ return NULL;
+ }
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+struct ct_string *te_read_string(struct section_file *file,
+ const char *part1, const char *part2,
+ bool need_background, bool need_text)
+{
+ int size, outline_width;
+ char *text, *font,*transform_str;
+ bool anti_alias;
+ be_color color, background, outline_color;
+ be_color dummy_color = be_get_color(0, 0, 0, MAX_OPACITY);
+ enum cts_transform transform;
+
+ if (need_text) {
+ text = _(secfile_lookup_str(file, "%s.%s", part1, part2));
+ } else {
+ text = "unset text";
+ }
+ color = te_read_color(file, part1, part2, "-color");
+ font = secfile_lookup_str(file, "%s.%s-font", part1, part2);
+ size = secfile_lookup_int(file, "%s.%s-size", part1, part2);
+ anti_alias = secfile_lookup_bool(file, "%s.%s-antialias", part1, part2);
+ transform_str = secfile_lookup_str(file, "%s.%s-transform", part1, part2);
+
+ if (need_background) {
+ background = te_read_color(file, part1, part2, "-background");
+ } else {
+ background = dummy_color;
+ }
+
+ outline_width =
+ secfile_lookup_int(file, "%s.%s-outline-width", part1, part2);
+ if (outline_width != 0) {
+ outline_color = te_read_color(file, part1, part2, "-outline-color");
+ } else {
+ outline_color = dummy_color;
+ }
+
+ if (strcmp(transform_str, "") == 0 || strcmp(transform_str, "none") == 0) {
+ transform = CTS_TRANSFORM_NONE;
+ } else if (strcmp(transform_str, "upper") == 0) {
+ transform = CTS_TRANSFORM_UPPER;
+ } else {
+ assert(0);
+ transform = CTS_TRANSFORM_NONE;
+ }
+ return ct_string_create(font, size, color, background, text, anti_alias,
+ outline_width, outline_color, transform);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+struct ct_placement *te_read_placement(struct section_file *file,
+ const char *section)
+{
+ struct ct_placement *result = fc_malloc(sizeof(*result));
+ char *type =
+ secfile_lookup_str(file, "%s.placement", section);
+
+ if (strcmp(type, "line") == 0) {
+ result->type = PL_LINE;
+ result->data.line.start_x =
+ secfile_lookup_int(file, "%s.placement-line-start_x", section);
+ result->data.line.start_y =
+ secfile_lookup_int(file, "%s.placement-line-start_y", section);
+ result->data.line.dx =
+ secfile_lookup_int(file, "%s.placement-line-dx", section);
+ result->data.line.dy =
+ secfile_lookup_int(file, "%s.placement-line-dy", section);
+ } else if (strcmp(type, "grid") == 0) {
+ char *last = secfile_lookup_str(file, "%s.placement-grid-last", section);
+
+ result->type = PL_GRID;
+ result->data.grid.x =
+ secfile_lookup_int(file, "%s.placement-grid-x", section);
+ result->data.grid.y =
+ secfile_lookup_int(file, "%s.placement-grid-y", section);
+ result->data.grid.dx =
+ secfile_lookup_int(file, "%s.placement-grid-dx", section);
+ result->data.grid.dy =
+ secfile_lookup_int(file, "%s.placement-grid-dy", section);
+ result->data.grid.width =
+ secfile_lookup_int(file, "%s.placement-grid-width", section);
+ result->data.grid.height =
+ secfile_lookup_int(file, "%s.placement-grid-height", section);
+ if (strcmp(last, "n") == 0) {
+ result->data.grid.last = PL_N;
+ } else if (strcmp(last, "s") == 0) {
+ result->data.grid.last = PL_S;
+ } else {
+ assert(0);
+ }
+ } else {
+ assert(0);
+ }
+ return result;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void customize_window(struct section_file *file,
+ struct sw_widget *window)
+{
+ char *background =
+ secfile_lookup_str_default(file, NULL, "screen.background");
+
+ if (background) {
+ sw_widget_set_background_sprite(window, te_load_gfx(background));
+ }
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+struct ct_tooltip *te_read_tooltip(struct section_file *file,
+ const char *section, bool need_text)
+{
+ struct ct_tooltip *result = NULL;
+ char *text =
+ secfile_lookup_str_default(file, NULL, "%s.tooltip-color", section);
+
+ if (text) {
+ struct ct_string *string =
+ te_read_string(file, section, "tooltip", TRUE, need_text);
+ int delay = secfile_lookup_int(file, "%s.tooltip-delay", section);
+ int shadow = secfile_lookup_int(file, "%s.tooltip-shadow", section);
+ be_color color = be_get_color(0, 0, 0, MAX_OPACITY);
+
+ if (shadow > 0) {
+ color = te_read_color(file, section, "", "tooltip-shadow-color");
+ }
+
+ result = ct_tooltip_create(string, delay, shadow, color);
+ ct_string_destroy(string);
+ }
+ return result;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void customize_widget(struct section_file *file, const char *name,
+ struct sw_widget *widget)
+{
+ struct ct_tooltip *tooltip = te_read_tooltip(file, name, TRUE);
+
+ if (tooltip) {
+ sw_widget_set_tooltip(widget, tooltip);
+ ct_tooltip_destroy(tooltip);
+ }
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static enum ws_alignment str_alignment_to_enum(const char *s)
+{
+ if (mystrcasecmp(s, "n") == 0)
+ return A_N;
+ if (mystrcasecmp(s, "s") == 0)
+ return A_S;
+ if (mystrcasecmp(s, "w") == 0)
+ return A_W;
+ if (mystrcasecmp(s, "e") == 0)
+ return A_E;
+
+ if (mystrcasecmp(s, "nc") == 0)
+ return A_NC;
+ if (mystrcasecmp(s, "sc") == 0)
+ return A_SC;
+ if (mystrcasecmp(s, "wc") == 0)
+ return A_WC;
+ if (mystrcasecmp(s, "ec") == 0)
+ return A_EC;
+
+ if (mystrcasecmp(s, "nw") == 0)
+ return A_NW;
+ if (mystrcasecmp(s, "ne") == 0)
+ return A_NE;
+ if (mystrcasecmp(s, "sw") == 0)
+ return A_SW;
+ if (mystrcasecmp(s, "se") == 0)
+ return A_SE;
+
+ if (mystrcasecmp(s, "ns") == 0)
+ return A_NS;
+ if (mystrcasecmp(s, "we") == 0)
+ return A_WE;
+ if (mystrcasecmp(s, "center") == 0)
+ return A_CENTER;
+ assert(0);
+ return 0;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void te_read_bounds_alignment(struct section_file *file,
+ const char *part1, struct ct_rect *bounds,
+ enum ws_alignment *alignment)
+{
+ bounds->x = secfile_lookup_int(file, "%s.x", part1);
+ bounds->y = secfile_lookup_int(file, "%s.y", part1);
+ bounds->width = secfile_lookup_int(file, "%s.width", part1);
+ bounds->height = secfile_lookup_int(file, "%s.height", part1);
+ if (alignment) {
+ *alignment =
+ str_alignment_to_enum(secfile_lookup_str(file, "%s.align", part1));
+ }
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void construct_labels(struct section_file *file,
+ struct te_screen *screen)
+{
+ char **sec;
+ int num;
+ int i;
+
+ sec = secfile_get_secnames_prefix(file, "label_", &num);
+
+ for (i = 0; i < num; i++) {
+ struct ct_rect bounds;
+ enum ws_alignment alignment;
+ struct ct_string *string;
+ struct sw_widget *widget;
+
+ te_read_bounds_alignment(file, sec[i], &bounds, &alignment);
+ string = te_read_string(file, sec[i], "text", FALSE, TRUE);
+ widget =
+ sw_label_create_text_bounded(screen->window, string, &bounds,
+ alignment);
+ customize_widget(file, sec[i], widget);
+ }
+ free(sec);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void construct_infos_text(struct section_file *file,
+ struct te_screen *screen)
+{
+ char **sec;
+ int num;
+ int i;
+ const char prefix[] = "info_text_";
+
+ sec = secfile_get_secnames_prefix(file, prefix, &num);
+
+ for (i = 0; i < num; i++) {
+ struct info_data *data = fc_malloc(sizeof(*data));
+ char *id = mystrdup(sec[i] + strlen(prefix));
+ bool inserted;
+
+ data->is_text = TRUE;
+
+ te_read_bounds_alignment(file, sec[i], &data->bounds,
+ &data->text.alignment);
+ data->text.template = te_read_string(file, sec[i], "text", FALSE, FALSE);
+ data->tooltip = te_read_tooltip(file, sec[i], TRUE);
+ data->widget = NULL;
+ inserted = hash_insert(screen->widgets, id, data);
+ assert(inserted);
+
+ te_info_update(screen, id);
+ }
+ free(sec);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void construct_infos_tooltip(struct section_file *file,
+ struct te_screen *screen)
+{
+ char **sec;
+ int num;
+ int i;
+ const char prefix[] = "info_tooltip_";
+
+ sec = secfile_get_secnames_prefix(file, prefix, &num);
+
+ for (i = 0; i < num; i++) {
+ struct info_data *data = fc_malloc(sizeof(*data));
+ char *id = mystrdup(sec[i] + strlen(prefix));
+ bool inserted;
+
+ data->is_text = FALSE;
+
+ te_read_bounds_alignment(file, sec[i], &data->bounds, NULL);
+
+ data->tooltip = te_read_tooltip(file, sec[i], FALSE);
+ if (data->tooltip == NULL) {
+ printf("didn't found tooltip data for '%s'\n", sec[i]);
+ assert(0);
+ }
+ data->widget =
+ sw_window_create(screen->window, data->bounds.width,
+ data->bounds.height, NULL,
+ FALSE, DEPTH_MAX);
+ sw_widget_set_position(data->widget, data->bounds.x, data->bounds.y);
+ sw_window_set_draggable(data->widget, FALSE);
+ sw_widget_set_background_color(data->widget,
+ be_get_color(0, 0, 0, MIN_OPACITY));
+
+ inserted = hash_insert(screen->widgets, id, data);
+ assert(inserted);
+
+ te_info_update(screen, id);
+ }
+ free(sec);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void construct_edits(struct section_file *file,
+ struct te_screen *screen)
+{
+ char **sec;
+ int num;
+ int i;
+
+ sec = secfile_get_secnames_prefix(file, "edit_", &num);
+
+ for (i = 0; i < num; i++) {
+ struct ct_rect bounds;
+ enum ws_alignment alignment;
+ struct ct_string *template, *string;
+ struct sw_widget *widget;
+ char *id = mystrdup(strchr(sec[i], '_') + 1);
+ bool inserted;
+
+ te_read_bounds_alignment(file, sec[i], &bounds, &alignment);
+ template = te_read_string(file, sec[i], "text", TRUE, FALSE);
+ string =
+ ct_string_clone3(template, screen->env.edit_get_initial_value(id));
+ widget =
+ sw_edit_create_bounded(screen->window,
+ screen->env.edit_get_width(id), string,
+ &bounds, alignment);
+ customize_widget(file, sec[i], widget);
+ inserted = hash_insert(screen->widgets, id, widget);
+ assert(inserted);
+ }
+ free(sec);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void my_button_callback(struct sw_widget *list, void *data)
+{
+ struct button_callback *callback = data;
+
+ callback->screen->env.button_callback(callback->id);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void construct_buttons(struct section_file *file,
+ struct te_screen *screen)
+{
+ char **sec;
+ int num;
+ int i;
+
+ sec = secfile_get_secnames_prefix(file, "button_", &num);
+
+ for (i = 0; i < num; i++) {
+ struct ct_rect bounds;
+ enum ws_alignment alignment;
+ struct ct_string *string = NULL;
+ struct sw_widget *widget;
+ char *id = mystrdup(strchr(sec[i], '_') + 1);
+ char *background;
+ struct button_callback *callback = fc_malloc(sizeof(*callback));
+
+ te_read_bounds_alignment(file, sec[i], &bounds, &alignment);
+ if (secfile_lookup_str_default(file, NULL, "%s.text", sec[i])) {
+ string = te_read_string(file, sec[i], "text", FALSE, TRUE);
+ }
+ background = secfile_lookup_str(file, "%s.background", sec[i]);
+ widget =
+ sw_button_create_bounded(screen->window, string,
+ te_load_gfx(background), &bounds,
+ alignment);
+ customize_widget(file, sec[i], widget);
+
+ callback->screen = screen;
+ callback->id = id;
+ sw_button_set_callback(widget, my_button_callback, callback);
+ }
+ free(sec);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+struct section_file *te_open_themed_file(const char *name)
+{
+ struct section_file *result = fc_malloc(sizeof(*result));
+ char filename[512],*tmp;
+
+ my_snprintf(filename, sizeof(filename), "themes/gui-ftwl/%s/%s/%s",
+ current_theme, current_res, name);
+ tmp = datafilename_required(filename);
+
+ if (!section_file_load(result, tmp)) {
+ free(result);
+ freelog(LOG_FATAL, _("Could not load screen file \"%s\"."), filename);
+ exit(EXIT_FAILURE);
+ return NULL;
+ }
+ return result;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static bool my_key_handler(struct sw_widget *widget,
+ const struct be_key *key, void *data)
+{
+ struct te_screen *screen = data;
+
+ keybinding_list_iterate(screen->keybindings, pbinding) {
+ if (ct_key_matches(pbinding->key, key)) {
+ screen->env.action_callback(pbinding->action);
+ return TRUE;
+ }
+ } keybinding_list_iterate_end;
+
+ return FALSE;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void read_keybindings(struct section_file *file,
+ struct te_screen *screen)
+{
+ int num;
+ int i;
+ char **sec = secfile_get_section_entries(file, "key_bindings", &num);
+
+ screen->keybindings = fc_malloc(sizeof(*(screen->keybindings)));
+
+ screen->keybindings = keybinding_list_new();
+
+ for (i = 0; i < num; i++) {
+ char *key = sec[i];
+ char *action = secfile_lookup_str(file, "key_bindings.%s", sec[i]);
+ struct keybinding *binding = fc_malloc(sizeof(*binding));
+
+ binding->key = ct_key_parse(key);
+ binding->action = mystrdup(action);
+ keybinding_list_prepend(screen->keybindings, binding);
+ }
+
+ sw_window_set_key_notify(screen->window, my_key_handler, screen);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+struct te_screen *te_get_screen(struct sw_widget *parent_window,
+ const char *screen_name,
+ const struct te_screen_env *env, int depth)
+{
+ struct te_screen *result = fc_malloc(sizeof(*result));
+ struct section_file *file;
+ char filename[512];
+
+ result->env = *env;
+ result->window = sw_window_create_by_clone(parent_window, depth);
+ result->widgets = hash_new(hash_fval_string, hash_fcmp_string);
+ sw_widget_set_position(result->window, 0, 0);
+
+ my_snprintf(filename, sizeof(filename), "%s.screen", screen_name);
+
+ file = te_open_themed_file(filename);
+
+ customize_window(file, result->window);
+ construct_labels(file, result);
+ construct_infos_text(file, result);
+ construct_infos_tooltip(file, result);
+ construct_edits(file, result);
+ construct_buttons(file, result);
+ read_keybindings(file, result);
+
+ section_file_check_unused(file, filename);
+ section_file_free(file);
+ free(file);
+
+ return result;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void te_info_update(struct te_screen *screen, const char *id)
+{
+ struct info_data *data = hash_lookup_data(screen->widgets, id);
+
+ assert(data);
+
+ if (data->is_text) {
+ struct ct_string *string;
+
+ if (data->widget) {
+ sw_widget_destroy(data->widget);
+ data->widget = NULL;
+ }
+ string =
+ ct_string_clone3(data->text.template,
+ screen->env.info_get_value(id));
+
+ data->widget =
+ sw_label_create_text_bounded(screen->window, string, &data->bounds,
+ data->text.alignment);
+ if (data->tooltip) {
+ sw_widget_set_tooltip(data->widget, data->tooltip);
+ }
+ } else {
+ sw_widget_set_tooltip(data->widget,
+ ct_tooltip_clone1(data->tooltip,
+ screen->env.info_get_value(id)));
+ }
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+const char *te_edit_get_current_value(struct te_screen *screen,
+ const char *id)
+{
+ struct sw_widget *widget = hash_lookup_data(screen->widgets, id);
+ return sw_edit_get_text(widget);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void te_destroy_screen(struct te_screen *screen)
+{
+ // FIXME free info and button structs
+
+ sw_widget_destroy(screen->window);
+ free(screen);
+}
diff --git a/utility/ftwl/theme_engine.h b/utility/ftwl/theme_engine.h
new file mode 100644
index 0000000..d76a95b
--- /dev/null
+++ b/utility/ftwl/theme_engine.h
@@ -0,0 +1,70 @@
+/**********************************************************************
+ Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+***********************************************************************/
+
+#ifndef FC__THEME_ENGINE_H
+#define FC__THEME_ENGINE_H
+
+#include "common_types.h"
+#include "widget.h"
+
+struct section_file;
+struct keybinding_list;
+
+struct te_screen_env {
+ const char *(*info_get_value) (const char *id);
+ void (*button_callback) (const char *id);
+ const char *(*edit_get_initial_value) (const char *id);
+ int (*edit_get_width) (const char *id);
+ void (*action_callback) (const char *action);
+};
+
+struct te_screen {
+ struct sw_widget *window;
+
+ /* The following fields are private. */
+ struct hash_table *widgets;
+ struct te_screen_env env;
+ struct keybinding_list *keybindings;
+};
+
+void te_init(const char *theme, char *example_file);
+struct section_file *te_open_themed_file(const char *name);
+struct te_screen *te_get_screen(struct sw_widget *parent_window,
+ const char *screen_name,
+ const struct te_screen_env *env, int depth);
+void te_destroy_screen(struct te_screen *screen);
+
+void te_info_update(struct te_screen *screen, const char *id);
+const char *te_edit_get_current_value(struct te_screen *screen,
+ const char *id);
+struct sprite *te_load_gfx(const char *filename);
+
+/* Read various data from the files */
+struct ct_point te_read_point(struct section_file *file, const char *section,
+ const char *prefix);
+struct ct_string *te_read_string(struct section_file *file,
+ const char *section, const char *prefix,
+ bool need_background, bool need_text);
+struct ct_tooltip *te_read_tooltip(struct section_file *file,
+ const char *section, bool need_text);
+void te_read_bounds_alignment(struct section_file *file,
+ const char *section, struct ct_rect *bounds,
+ enum ws_alignment *alignment);
+be_color te_read_color(struct section_file *file, const char *section,
+ const char *prefix, const char *suffix);
+struct ct_placement *te_read_placement(struct section_file *file,
+ const char *section);
+struct be_key *te_read_key(struct section_file *file, const char *section,
+ const char *name);
+
+#endif
diff --git a/utility/ftwl/widget.c b/utility/ftwl/widget.c
new file mode 100644
index 0000000..a6a9614
--- /dev/null
+++ b/utility/ftwl/widget.c
@@ -0,0 +1,558 @@
+/**********************************************************************
+ Freeciv - Copyright (C) 2004 - The Freeciv Project
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+***********************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <assert.h>
+#include <stdio.h>
+
+#include "widget_p.h"
+
+#include "log.h"
+#include "mem.h"
+#include "text_renderer.h"
+
+/*************************************************************************
+ ...
+*************************************************************************/
+struct osda *get_osda(struct sw_widget *widget)
+{
+ if (widget->type == WT_WINDOW) {
+ return widget->data.window.target;
+ }
+ assert(widget->parent && widget->parent->type == WT_WINDOW);
+ return widget->parent->data.window.target;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+enum widget_face get_widget_face(struct sw_widget *widget)
+{
+ if (widget->disabled) {
+ return WF_DISABLED;
+ }
+ if (widget->pressed) {
+ return WF_PRESSED;
+ }
+ if (widget->selected) {
+ return WF_SELECTED;
+ }
+ return WF_NORMAL;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void untooltip(struct sw_widget *widget)
+{
+ if (widget->tooltip && widget->tooltip_callback_id != 0) {
+ sw_remove_timeout(widget->tooltip_callback_id);
+ widget->tooltip_callback_id = 0;
+ }
+
+ if (!widget->tooltip || (widget->tooltip && !widget->tooltip_shown)) {
+ return;
+ }
+ widget->tooltip_shown = FALSE;
+
+ parent_needs_paint(widget);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void popup_tooltip(void *data)
+{
+ struct sw_widget *widget = data;
+
+ widget->tooltip_shown = TRUE;
+
+ widget->tooltip_callback_id = 0;
+
+ parent_needs_paint(widget);
+}
+
+static struct sw_widget *dragged_widget = NULL;
+static enum be_mouse_button drag_button;
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void mouse_released(struct sw_widget *widget,
+ const struct ct_point *position,
+ bool released_inside)
+{
+ if (widget->can_be_pressed && widget->pressed) {
+ widget->pressed = FALSE;
+
+ if (released_inside) {
+ if (widget->click) {
+ widget->click(widget);
+ } else {
+ printf("WARNING: no callback set %p\n", widget);
+ }
+ }
+ }
+
+ if (widget->dragged) {
+ widget->dragged = FALSE;
+ widget->drag_end(widget, drag_button);
+ assert(dragged_widget == widget);
+ dragged_widget = NULL;
+ }
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void mouse_leaves(struct sw_widget *widget,
+ const struct ct_point *position)
+{
+ untooltip(widget);
+
+ mouse_released(widget, position, FALSE);
+
+ if (widget->selected || widget->left) {
+ widget_needs_paint(widget);
+ }
+ widget->selected = FALSE;
+ if (widget->left) {
+ widget->left(widget);
+ }
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void mouse_enters(struct sw_widget *widget,
+ const struct ct_point *position)
+{
+ if (widget->can_be_selected) {
+ widget->selected = TRUE;
+ widget_needs_paint(widget);
+ }
+ if (widget->entered) {
+ widget->entered(widget);
+ widget_needs_paint(widget);
+ }
+
+ if (widget->tooltip) {
+ assert(widget->tooltip_callback_id == 0);
+ widget->tooltip_callback_id =
+ sw_add_timeout(widget->tooltip->delay, popup_tooltip, widget);
+ }
+}
+
+static struct ct_point drag_start_pos;
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void mouse_pressed(struct sw_widget *widget,
+ const struct ct_point *position,
+ enum be_mouse_button button, int state)
+{
+ if (widget->click_start) {
+ struct ct_point pos = *position;
+
+ pos.x -= widget->outer_bounds.x;
+ pos.y -= widget->outer_bounds.y;
+
+ pos.x -= widget->parent->outer_bounds.x;
+ pos.y -= widget->parent->outer_bounds.y;
+
+ widget->click_start(widget, &pos, button, state,
+ widget->click_start_data);
+ }
+
+ if (widget->can_be_pressed) {
+ widget->pressed = TRUE;
+ widget_needs_paint(widget);
+ }
+
+ if (widget->can_be_dragged[button]) {
+ drag_start_pos = *position;
+ widget->dragged = TRUE;
+ assert(widget->drag_start);
+ widget->drag_start(widget, &drag_start_pos, button);
+ dragged_widget = widget;
+ drag_button = button;
+ }
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void mouse_moved(struct sw_widget *widget,
+ const struct ct_point *position)
+{
+ if (widget && widget->dragged) {
+ assert(widget == dragged_widget);
+ assert(widget->drag_move);
+ widget->drag_move(widget, &drag_start_pos, position, drag_button);
+ }
+}
+
+static struct sw_widget *selected_widget = NULL;
+static bool selected_widget_gets_keyboard = FALSE;
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void handle_mouse_motion(struct sw_widget *widget,
+ const struct ct_point *position)
+{
+ selected_widget_gets_keyboard = FALSE;
+
+ if (selected_widget == widget) {
+ mouse_moved(widget, position);
+ return;
+ }
+
+ if (selected_widget) {
+ mouse_leaves(selected_widget, position);
+ }
+ if (widget) {
+ mouse_enters(widget, position);
+ }
+ selected_widget = widget;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void sw_widget_select(struct sw_widget *widget)
+{
+ struct ct_point pos = { widget->outer_bounds.x, widget->outer_bounds.y };
+ if (widget->type != WT_WINDOW) {
+ assert(widget->parent);
+ pos.x += widget->parent->outer_bounds.x;
+ pos.y += widget->parent->outer_bounds.y;
+ }
+ handle_mouse_motion(widget, &pos);
+ selected_widget_gets_keyboard = TRUE;
+}
+
+static struct sw_widget *pressed_widget = NULL;
+static enum be_mouse_button pressed_button = 0;
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void handle_mouse_press(struct sw_widget *widget,
+ const struct ct_point *position,
+ enum be_mouse_button button, int state)
+{
+ if (pressed_widget == widget) {
+ /* another mouse button pressed */
+ return;
+ }
+
+ if (pressed_widget) {
+ mouse_released(pressed_widget, position, FALSE);
+ }
+ if (widget) {
+ mouse_pressed(widget, position, button, state);
+ }
+ pressed_widget = widget;
+ pressed_button = button;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void handle_mouse_release(struct sw_widget *widget,
+ const struct ct_point *position,
+ enum be_mouse_button button)
+{
+ if (pressed_widget == widget && pressed_button == button) {
+ mouse_released(pressed_widget, position, TRUE);
+ } else {
+ mouse_released(pressed_widget, position, FALSE);
+ }
+
+ pressed_widget = NULL;
+ pressed_button = 0;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void handle_destroyed_widgets(void)
+{
+ if (widget_list_size(deferred_destroyed_widgets) == 0) {
+ return;
+ }
+
+ widget_list_iterate(deferred_destroyed_widgets, pwidget) {
+ if ((pwidget->tooltip && pwidget->tooltip_shown)
+ || dragged_widget == pwidget || selected_widget == pwidget
+ || pressed_widget == pwidget) {
+ struct ct_point pos = { 32000, 32000 };
+
+ printf(" move mouse away tooltip=%d drag=%d select=%d press=%d\n",
+ (pwidget->tooltip
+ && pwidget->tooltip_shown), dragged_widget == pwidget,
+ selected_widget == pwidget, pressed_widget == pwidget);
+ //be_write_osda_to_file(get_osda(pwidget), "destroyed_widget.pnm");
+
+ handle_mouse_motion(NULL, &pos);
+ }
+
+ real_widget_destroy(pwidget);
+ widget_list_unlink(deferred_destroyed_widgets, pwidget);
+ } widget_list_iterate_end;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void handle_event(const struct be_event *event,
+ void (*input_callback) (int socket))
+{
+ switch (event->type) {
+ case BE_DATA_OTHER_FD:
+ input_callback(event->socket);
+ break;
+ case BE_EXPOSE:
+ flush_all_to_screen();
+ break;
+ case BE_TIMEOUT:
+ handle_callbacks();
+ break;
+
+ case BE_MOUSE_MOTION:
+ {
+ struct sw_widget *widget = search_widget(&event->position, EV_MOUSE);
+
+ handle_mouse_motion(widget, &event->position);
+ }
+ break;
+
+ case BE_MOUSE_PRESSED:
+ {
+ struct sw_widget *widget = search_widget(&event->position, EV_MOUSE);
+
+ handle_mouse_press(widget, &event->position, event->button,
+ event->state);
+ }
+ break;
+
+ case BE_MOUSE_RELEASED:
+ {
+ struct sw_widget *widget = search_widget(&event->position, EV_MOUSE);
+
+ handle_mouse_release(widget, &event->position, event->button);
+ }
+ break;
+
+ case BE_KEY_PRESSED:
+ {
+ bool handled = FALSE;
+ struct sw_widget *widget;
+
+ assert(ct_key_is_valid(&event->key));
+
+ if (selected_widget_gets_keyboard && selected_widget) {
+ widget = selected_widget;
+ } else {
+ widget = search_widget(&event->position, EV_KEYBOARD);
+ }
+ if (widget && widget->key) {
+ handled = widget->key(widget, &event->key, widget->key_data);
+ }
+ if (!handled) {
+ handled = deliver_key(&event->key);
+ }
+ if (!handled) {
+ printf("WARNING: unhandled key stroke\n");
+ }
+ }
+ break;
+ case BE_NO_EVENT:
+ break;
+ }
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void sw_mainloop(void (*input_callback)(int socket))
+{
+ sw_paint_all();
+
+ while (TRUE) {
+ struct be_event event;
+ struct timeval timeout;
+
+ while (TRUE) {
+ handle_callbacks();
+
+ be_next_non_blocking_event(&event);
+ if (event.type == BE_NO_EVENT) {
+ break;
+ }
+ handle_event(&event, input_callback);
+ }
+
+ /* No events queued. We are idle. */
+ handle_idle_callbacks();
+
+ /*
+ * Since the next step may take some while, we update the screen
+ * to make the user happy.
+ */
+ sw_paint_all();
+
+ /* Wait for the server, the network or the timeout */
+ get_select_timeout(&timeout);
+ be_next_blocking_event(&event, &timeout);
+
+ if (event.type != BE_NO_EVENT) {
+ handle_event(&event, input_callback);
+ }
+ }
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void parent_needs_paint(struct sw_widget *widget)
+{
+ if (widget->parent) {
+ widget->parent->needs_repaint = TRUE;
+ } else {
+ widget->needs_repaint = TRUE;
+ }
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void widget_needs_paint(struct sw_widget *widget)
+{
+ widget->needs_repaint = TRUE;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void real_widget_destroy(struct sw_widget *widget)
+{
+ assert(widget->type <= WT_LAST);
+ if (widget->destroy) {
+ widget->destroy(widget);
+ } else {
+ printf("WARNING: no destroy for type %d\n", widget->type);
+ }
+ if (widget->parent) {
+ sw_window_remove(widget);
+ }
+ memset(widget, 0x54, sizeof(*widget));
+
+ /* Ensure no dangling globals */
+ if (selected_widget == widget) {
+ selected_widget = NULL;
+ } else if (pressed_widget == widget) {
+ pressed_widget = NULL;
+ } else if (dragged_widget == widget) {
+ dragged_widget = NULL;
+ }
+
+ free(widget);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void sw_update_vslider_from_list(struct sw_widget *slider,
+ struct sw_widget *list)
+{
+ struct ct_size view_size, window_size;
+ struct ct_point position;
+
+ sw_list_get_view_size(list, &view_size);
+ sw_list_get_window_size(list, &window_size);
+ sw_list_get_offset(list, &position);
+
+ if(0)
+ printf("LIST width=%d offset=%d size=%d\n", view_size.height, position.y,
+ window_size.height);
+ sw_slider_set_width(slider, (float) view_size.height / window_size.height);
+ sw_slider_set_offset(slider, (float) position.y / window_size.height);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void sw_update_hslider_from_list(struct sw_widget *slider,
+ struct sw_widget *list)
+{
+ struct ct_size view_size, window_size;
+ struct ct_point position;
+
+ sw_list_get_view_size(list, &view_size);
+ sw_list_get_window_size(list, &window_size);
+ sw_list_get_offset(list, &position);
+
+ sw_slider_set_width(slider, (float) view_size.width / window_size.width);
+ sw_slider_set_offset(slider, (float) position.x / window_size.width);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void sw_update_list_from_vslider(struct sw_widget *list,
+ struct sw_widget *slider)
+{
+ float offset = sw_slider_get_offset(slider);
+ struct ct_size view_size, window_size;
+ struct ct_point position;
+
+ sw_list_get_view_size(list, &view_size);
+ sw_list_get_window_size(list, &window_size);
+ sw_list_get_offset(list, &position);
+ position.y = offset * window_size.height;
+ sw_list_set_offset(list, &position);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void sw_update_list_from_hslider(struct sw_widget *list,
+ struct sw_widget *slider)
+{
+ float offset = sw_slider_get_offset(slider);
+ struct ct_size view_size, window_size;
+ struct ct_point position;
+
+ sw_list_get_view_size(list, &view_size);
+ sw_list_get_window_size(list, &window_size);
+ sw_list_get_offset(list, &position);
+ position.x = offset * window_size.width;
+ sw_list_set_offset(list, &position);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void sw_init(void)
+{
+ tr_init();
+}
diff --git a/utility/ftwl/widget.h b/utility/ftwl/widget.h
new file mode 100644
index 0000000..c7bb2bc
--- /dev/null
+++ b/utility/ftwl/widget.h
@@ -0,0 +1,208 @@
+/**********************************************************************
+ Freeciv - Copyright (C) 2004 - The Freeciv Project
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+***********************************************************************/
+
+#ifndef FC__WIDGET_H
+#define FC__WIDGET_H
+
+struct sprite;
+struct sw_widget;
+
+#define SPECLIST_TAG widget
+#define SPECLIST_TYPE struct sw_widget
+#include "speclist.h"
+
+#define widget_list_iterate(list, item) \
+ TYPED_LIST_ITERATE(struct sw_widget, list, item)
+#define widget_list_iterate_end LIST_ITERATE_END
+
+#include "common_types.h"
+#include "back_end.h"
+
+enum ws_alignment {
+ A_N, A_S, A_W, A_E,
+ A_NC, A_SC, A_WC, A_EC,
+ A_NW, A_NE, A_SW, A_SE,
+ A_NS, A_WE, A_CENTER
+};
+
+/* ===== widget ==== */
+void sw_widget_set_position(struct sw_widget *widget, int x, int y);
+void sw_widget_get_bounds(struct sw_widget *widget, struct ct_rect *bounds);
+void sw_widget_align_parent(struct sw_widget *widget,
+ enum ws_alignment alignment);
+void sw_widget_align_box(struct sw_widget *widget,
+ enum ws_alignment alignment, const struct ct_rect
+ *box);
+void sw_widget_set_tooltip(struct sw_widget *widget,
+ const struct ct_tooltip *tooltip);
+void sw_widget_hcenter(struct sw_widget *widget);
+void sw_widget_vcenter(struct sw_widget *widget);
+void sw_widget_set_background_sprite(struct sw_widget *widget,
+ struct sprite *sprite);
+void sw_widget_set_background_color(struct sw_widget *widget,
+ be_color background_color);
+void sw_widget_set_border_color(struct sw_widget *widget,
+ be_color border_color);
+void sw_widget_destroy(struct sw_widget *widget);
+void sw_widget_disable_mouse_events(struct sw_widget *widget);
+void sw_widget_select(struct sw_widget *widget);
+void sw_widget_set_enabled(struct sw_widget *widget, bool enabled);
+
+/* ===== window ==== */
+struct sw_widget *sw_window_create(struct sw_widget *parent, int width,
+ int height, struct ct_string *title,
+ bool has_border, int depth);
+struct sw_widget *sw_window_create_by_clone(struct sw_widget *widget,
+ int depth);
+
+void sw_window_add(struct sw_widget *window, struct sw_widget *widget);
+void sw_window_remove(struct sw_widget *widget);
+void sw_window_resize(struct sw_widget *widget, int width, int height);
+void sw_window_set_draggable(struct sw_widget *widget, bool draggable);
+void sw_window_set_canvas_background(struct sw_widget *widget, bool yes);
+struct osda *sw_window_get_canvas_background(struct sw_widget *widget);
+void sw_window_set_mouse_press_notify(struct sw_widget *widget,
+ void (*callback) (struct sw_widget *
+ widget,
+ const struct ct_point
+ * pos, enum be_mouse_button button, int state,
+ void *data),
+ void *data);
+void sw_window_set_key_notify(struct sw_widget *widget,
+ bool(*callback) (struct sw_widget *
+ widget,
+ const struct be_key * key,
+ void *data), void *data);
+void sw_window_canvas_background_region_needs_repaint(struct sw_widget
+ *widget,
+ const struct ct_rect
+ *region);
+void sw_window_set_user_drag(struct sw_widget * widget,void (*drag_start)
+ (struct sw_widget * widget,
+ const struct ct_point * mouse,
+ enum be_mouse_button button),
+ void (*drag_move) (struct sw_widget * widget,
+ const struct ct_point *
+ start_position,
+ const struct ct_point *
+ current_position,
+ enum be_mouse_button button),
+ void (*drag_end) (struct sw_widget * widget,
+ enum be_mouse_button button));
+
+/* ===== button ==== */
+struct sw_widget *sw_button_create(struct sw_widget *parent,
+ struct ct_string *strings[4],
+ struct osda *foreground_faces[4],
+ struct osda *background_faces[4]);
+struct sw_widget *sw_button_create_text(struct sw_widget *parent,
+ struct ct_string *string);
+struct sw_widget *sw_button_create_bounded(struct sw_widget *parent,
+ struct ct_string *string,
+ struct sprite *background_faces,
+ const struct ct_rect *bounds,enum ws_alignment alignment);
+struct sw_widget *sw_button_create_text_and_background(struct sw_widget
+ *parent, struct ct_string
+ *string, struct sprite
+ *background_faces);
+
+void sw_button_set_callback(struct sw_widget *widget,
+ void (*callback) (struct sw_widget * widget,
+ void *data), void *data);
+void sw_button_set_shortcut(struct sw_widget *widget,
+ const struct be_key *key);
+
+/* ===== edit ==== */
+struct sw_widget *sw_edit_create(struct sw_widget *parent, int max_size,
+ struct ct_string *temp_and_initial_text);
+struct sw_widget *sw_edit_create_bounded(struct sw_widget *parent,
+ int max_size,
+ struct ct_string *temp_and_initial_text,
+ struct ct_rect *bounds,enum ws_alignment alignment);
+
+/* static buffer */
+const char *sw_edit_get_text(struct sw_widget *widget);
+
+/* ===== label ==== */
+struct sw_widget *sw_label_create_text(struct sw_widget *parent,
+ struct ct_string *string);
+struct sw_widget *sw_label_create_text_bounded(struct sw_widget *parent,
+ struct ct_string *string,
+ struct ct_rect *bounds,
+ enum ws_alignment alignment);
+
+/* ===== list ==== */
+struct sw_widget *sw_list_create(struct sw_widget *parent, int pixel_width,
+ int pixel_height);
+void sw_list_clear(struct sw_widget *widget);
+void sw_list_set_item(struct sw_widget *widget, int column, int row,
+ struct sw_widget *item);
+void sw_list_get_view_size(struct sw_widget *widget, struct ct_size *size);
+void sw_list_get_window_size(struct sw_widget *widget,struct ct_size *size);
+void sw_list_get_offset(struct sw_widget *widget, struct ct_point *pos);
+void sw_list_set_offset(struct sw_widget *widget, const struct ct_point *pos);
+void sw_list_set_selected_row(struct sw_widget *widget, int row, bool show);
+int sw_list_get_selected_row(struct sw_widget *widget);
+void sw_list_set_row_enabled(struct sw_widget *widget, int row, bool enabled);
+bool sw_list_is_row_enabled(struct sw_widget *widget, int row);
+void sw_list_add_buttons_and_vslider(struct sw_widget *widget,
+ struct sprite *up, struct sprite *down,
+ struct sprite *button_background,
+ struct sprite *scrollbar);
+void sw_list_set_content_changed_notify(struct sw_widget *widget,
+ void (*callback) (struct sw_widget
+ * widget,
+ void *data),
+ void *data);
+
+void sw_list_set_selection_changed_notify(struct sw_widget *widget,
+ void (*callback) (struct sw_widget
+ * widget,
+ void *data),
+ void *data);
+
+/* ===== slider ==== */
+struct sw_widget *sw_slider_create(struct sw_widget *parent, int width,
+ int height, struct sprite *top,
+ struct sprite *bottom,struct sprite *repeat,
+ struct sprite *center,
+ bool vertical);
+void sw_slider_set_slided_notify(struct sw_widget *widget,
+ void (*callback) (struct sw_widget * widget,
+ void *data), void *data);
+float sw_slider_get_offset(struct sw_widget *widget);
+float sw_slider_get_width(struct sw_widget *widget);
+void sw_slider_set_offset(struct sw_widget *widget, float offset);
+void sw_slider_set_width(struct sw_widget *widget, float width);
+
+/* ===== slider & list ==== */
+void sw_update_vslider_from_list(struct sw_widget *slider,
+ struct sw_widget *list);
+void sw_update_hslider_from_list(struct sw_widget *slider,
+ struct sw_widget *list);
+void sw_update_list_from_vslider(struct sw_widget *list,
+ struct sw_widget *slider);
+void sw_update_list_from_hslider(struct sw_widget *list,
+ struct sw_widget *slider);
+
+/* ===== other ==== */
+void sw_init(void);
+void sw_paint_all(void);
+struct sw_widget *sw_create_root_window(void);
+void sw_mainloop(void (*input_callback)(int socket));
+int sw_add_timeout(int msec, void (*callback) (void *data), void *data);
+void sw_remove_timeout(int id);
+void sw_set_dump_screen(bool dump_screen);
+bool sw_get_dump_screen(void);
+
+#endif /* FC__WIDGET_H */
diff --git a/utility/ftwl/widget_button.c b/utility/ftwl/widget_button.c
new file mode 100644
index 0000000..3c86402
--- /dev/null
+++ b/utility/ftwl/widget_button.c
@@ -0,0 +1,328 @@
+/**********************************************************************
+ Freeciv - Copyright (C) 2004 - The Freeciv Project
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+***********************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <assert.h>
+#include <stdio.h>
+
+#include "widget_p.h"
+
+#include "mem.h"
+
+#define STRING_PADDING 4
+#define ICON_PADDING 4
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void draw(struct sw_widget *widget)
+{
+ struct ct_point pos;
+ enum widget_face face = get_widget_face(widget);
+ struct ct_size size =
+ { widget->inner_bounds.width, widget->inner_bounds.height };
+
+ if (widget->data.button.background_faces[face]) {
+ pos.x = widget->inner_bounds.x;
+ pos.y = widget->inner_bounds.y;
+ be_copy_osda_to_osda(get_osda(widget),
+ widget->data.button.background_faces[face],
+ &size, &pos, NULL);
+ }
+
+ if (widget->data.button.text[face]) {
+ pos.x = widget->inner_bounds.x + widget->data.button.text_offset[face].x;
+ pos.y = widget->inner_bounds.y + widget->data.button.text_offset[face].y;
+
+ be_draw_string(get_osda(widget), &pos, widget->data.button.text[face]);
+ }
+
+ if (widget->data.button.foreground_faces[face]) {
+ pos.x =
+ widget->inner_bounds.x +
+ widget->data.button.foreground_faces_offset[face].x;
+ pos.y =
+ widget->inner_bounds.y +
+ widget->data.button.foreground_faces_offset[face].y;
+
+ be_copy_osda_to_osda(get_osda(widget),
+ widget->data.button.foreground_faces[face],
+ &size, &pos, NULL);
+ }
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void click(struct sw_widget *widget)
+{
+ if (widget->data.button.callback) {
+ widget->data.button.callback(widget, widget->data.button.callback_data);
+ }
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static bool key(struct sw_widget *widget, const struct be_key *key,
+ void *data)
+{
+ if (widget->data.button.shortcut
+ && ct_key_matches(widget->data.button.shortcut, key)) {
+ click(widget);
+ return TRUE;
+ }
+ return FALSE;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void destroy(struct sw_widget *widget)
+{
+ int i;
+
+ if (widget->data.button.text[WF_NORMAL]) {
+ ct_string_destroy(widget->data.button.text[WF_NORMAL]);
+ }
+
+ for (i = 0; i < 4; i++) {
+ if (widget->data.button.background_faces[i]) {
+ be_free_osda(widget->data.button.background_faces[i]);
+ }
+ }
+}
+
+
+/*************************************************************************
+ ...
+*************************************************************************/
+struct sw_widget *sw_button_create(struct sw_widget *parent,
+ struct ct_string *strings[4],
+ struct osda *foreground_faces[4],
+ struct osda *background_faces[4])
+{
+ struct sw_widget *result = create_widget(parent, WT_BUTTON);
+ int i;
+ struct ct_size size = { 0, 0 };
+
+ result->destroy = destroy;
+ result->draw = draw;
+ result->click = click;
+ result->key = key;
+ result->key_data = NULL;
+
+ result->can_be_pressed = TRUE;
+ result->can_be_selected = TRUE;
+
+ result->data.button.callback = NULL;
+ result->data.button.shortcut = NULL;
+
+ assert(!(strings && foreground_faces));
+ assert(strings || foreground_faces || background_faces);
+
+ /* First stage: set the fields and calculate the size */
+ if (strings) {
+ for (i = 0; i < 4; i++) {
+ result->data.button.text[i] = strings[i];
+ size.width =
+ MAX(size.width,
+ result->data.button.text[i]->size.width + 2 * STRING_PADDING);
+ size.height =
+ MAX(size.height,
+ result->data.button.text[i]->size.height + 2 * STRING_PADDING);
+ }
+ } else {
+ result->data.button.text[WF_NORMAL] = NULL;
+ result->data.button.text[WF_SELECTED] = NULL;
+ result->data.button.text[WF_PRESSED] = NULL;
+ result->data.button.text[WF_DISABLED] = NULL;
+ }
+
+ if (foreground_faces) {
+ for (i = 0; i < 4; i++) {
+ struct ct_size s;
+
+ result->data.button.foreground_faces[i] = foreground_faces[i];
+ be_osda_get_size(&s, foreground_faces[i]);
+ size.width = MAX(size.width, s.width + 2 * STRING_PADDING);
+ size.height = MAX(size.height, s.height + 2 * STRING_PADDING);
+ }
+ } else {
+ result->data.button.foreground_faces[WF_NORMAL] = NULL;
+ result->data.button.foreground_faces[WF_SELECTED] = NULL;
+ result->data.button.foreground_faces[WF_PRESSED] = NULL;
+ result->data.button.foreground_faces[WF_DISABLED] = NULL;
+ }
+
+
+ if (background_faces) {
+ int i;
+
+ for (i = 0; i < 4; i++) {
+ struct ct_size s;
+
+ result->data.button.background_faces[i] = background_faces[i];
+ be_osda_get_size(&s, background_faces[i]);
+ size.width = MAX(size.width, s.width);
+ size.height = MAX(size.height, s.height);
+ }
+ } else {
+ result->data.button.background_faces[WF_NORMAL] = NULL;
+ result->data.button.background_faces[WF_SELECTED] = NULL;
+ result->data.button.background_faces[WF_PRESSED] = NULL;
+ result->data.button.background_faces[WF_DISABLED] = NULL;
+ }
+
+ result->inner_bounds.width = size.width;
+ result->inner_bounds.height = size.height;
+
+ /* Second stage: center */
+
+ if (strings) {
+ int i;
+ struct ct_rect bbox = result->inner_bounds;
+
+ bbox.x = STRING_PADDING;
+ bbox.y = STRING_PADDING;
+ bbox.width -= 2 * STRING_PADDING;
+ bbox.height -= 2 * STRING_PADDING;
+
+ for (i = 0; i < 4; i++) {
+ struct ct_rect t = { 0, 0,
+ result->data.button.text[i]->size.width,
+ result->data.button.text[i]->size.height
+ };
+ align(&bbox, &t, A_CENTER);
+ result->data.button.text_offset[i].x = t.x;
+ result->data.button.text_offset[i].y = t.y;
+ }
+ }
+
+ if (foreground_faces) {
+ int i;
+ struct ct_rect bbox = result->inner_bounds;
+
+ bbox.x = ICON_PADDING;
+ bbox.y = ICON_PADDING;
+ bbox.width -= 2 * ICON_PADDING;
+ bbox.height -= 2 * ICON_PADDING;
+
+ for (i = 0; i < 4; i++) {
+ struct ct_size s;
+
+ be_osda_get_size(&s, result->data.button.foreground_faces[i]);
+
+ {
+ struct ct_rect t = { 0, 0, s.width, s.height };
+ align(&bbox, &t, A_CENTER);
+ result->data.button.foreground_faces_offset[i].x = t.x;
+ result->data.button.foreground_faces_offset[i].y = t.y;
+ }
+ }
+ }
+
+ return result;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+struct sw_widget *sw_button_create_text_and_background(struct sw_widget
+ *parent, struct ct_string
+ *string, struct sprite
+ *background_faces)
+{
+ struct ct_size whole_size, size;
+ struct ct_string *strings[4];
+ struct osda *faces[4];
+ int i;
+
+ be_sprite_get_size(&whole_size, background_faces);
+
+ assert((whole_size.height % 4) == 0);
+
+ size = whole_size;
+ size.height /= 4;
+
+ for (i = 0; i < 4; i++) {
+ struct osda *t = be_create_osda(size.width, size.height);
+ struct sprite *s = be_crop_sprite(background_faces, 0, i * size.height,
+ size.width, size.height);
+ struct ct_point point = { 0, 0 };
+
+ be_draw_sprite(t, s, &size, &point, &point);
+ faces[i] = t;
+ }
+
+ for (i = 0; i < 4; i++) {
+ strings[i] = string;
+ }
+ return sw_button_create(parent, string ? strings : NULL, NULL, faces);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+struct sw_widget *sw_button_create_bounded(struct sw_widget *parent,
+ struct ct_string *string,
+ struct sprite *background_faces,
+ const struct ct_rect *bounds,
+ enum ws_alignment alignment)
+{
+ int size;
+
+ for (size = string->font_size; size > 0; size--) {
+ struct ct_string *string2 = ct_string_clone1(string, size);
+ if (string2->size.width <= bounds->width &&
+ string2->size.height + 2 * STRING_PADDING <= bounds->height) {
+ struct sw_widget *result =
+ sw_button_create_text_and_background(parent, string2, background_faces);
+ sw_widget_align_box(result, alignment, bounds);
+ return result;
+ } else {
+ ct_string_destroy(string2);
+ }
+ }
+ assert(0);
+ return NULL;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void sw_button_set_callback(struct sw_widget *widget,
+ void (*callback) (struct sw_widget * widget,
+ void *data), void *data)
+{
+ widget->data.button.callback = callback;
+ widget->data.button.callback_data = data;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void sw_button_set_shortcut(struct sw_widget *widget,
+ const struct be_key *key)
+{
+ if (widget->data.button.shortcut) {
+ ct_key_destroy(widget->data.button.shortcut);
+ }
+ widget->data.button.shortcut = ct_key_clone(key);
+}
diff --git a/utility/ftwl/widget_core.c b/utility/ftwl/widget_core.c
new file mode 100644
index 0000000..d71b33d
--- /dev/null
+++ b/utility/ftwl/widget_core.c
@@ -0,0 +1,403 @@
+/**********************************************************************
+ Freeciv - Copyright (C) 2004 - The Freeciv Project
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+***********************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <assert.h>
+#include <stdio.h>
+
+#include "widget_p.h"
+
+#include "mem.h"
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static enum widget_type sw_widget_get_type(const struct sw_widget *widget)
+{
+ return widget->type;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+struct sw_widget *create_widget(struct sw_widget *parent,
+ enum widget_type type)
+{
+ struct sw_widget *result = fc_malloc(sizeof(*result));
+
+ result->parent = NULL;
+ if (parent) {
+ assert(sw_widget_get_type(parent) == WT_WINDOW);
+ sw_window_add(parent, result);
+ }
+
+ result->type = type;
+ result->pressed = FALSE;
+ result->selected = FALSE;
+ result->disabled = FALSE;
+ result->dragged=FALSE;
+ result->accepts_events[EV_MOUSE] = TRUE;
+ result->accepts_events[EV_KEYBOARD] = TRUE;
+
+ result->can_be_pressed = FALSE;
+ result->can_be_selected = FALSE;
+ result->can_be_dragged[BE_MB_LEFT] = FALSE;
+ result->can_be_dragged[BE_MB_RIGHT] = FALSE;
+ result->can_be_dragged[BE_MB_MIDDLE] = FALSE;
+
+ result->needs_repaint = TRUE;
+
+ result->pos.x = -1;
+ result->pos.y = -1;
+ result->inner_bounds.width = 0;
+ result->inner_bounds.height = 0;
+
+ result->destroy = NULL;
+ result->entered = NULL;
+ result->left = NULL;
+ result->click = NULL;
+ result->click_start = NULL;
+ result->key = NULL;
+ result->draw = NULL;
+ result->draw_extra_background = NULL;
+ result->drag_start=NULL;
+ result->drag_move=NULL;
+ result->drag_end=NULL;
+
+ result->tooltip = NULL;
+
+ result->has_background_color = FALSE;
+ result->background_sprite = NULL;
+ result->has_border_color = FALSE;
+
+ return result;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void sw_widget_set_tooltip(struct sw_widget *widget,
+ const struct ct_tooltip *tooltip)
+{
+ if (widget->tooltip) {
+ untooltip(widget);
+ ct_tooltip_destroy(widget->tooltip);
+ }
+
+ widget->tooltip = ct_tooltip_clone(tooltip);
+ widget->tooltip_shown = FALSE;
+ widget->tooltip_callback_id = 0;
+
+ widget_needs_paint(widget);
+}
+
+/*************************************************************************
+ input is pos and inner_bounds.{width,height}
+*************************************************************************/
+static void update_bounds(struct sw_widget *widget)
+{
+ int border = 0;
+
+ if (widget->pos.x == -1 && widget->pos.y == -1) {
+ return;
+ }
+
+ assert(ct_point_valid(&widget->pos));
+
+ if (widget->has_border_color) {
+ border = BORDER_WIDTH;
+ }
+
+ widget->outer_bounds.x = widget->pos.x;
+ widget->outer_bounds.y = widget->pos.y;
+ widget->outer_bounds.width = widget->inner_bounds.width + 2 * border;
+ widget->outer_bounds.height = widget->inner_bounds.height + 2 * border;
+
+ if (widget->type != WT_WINDOW) {
+ widget->inner_bounds.x = widget->pos.x + border;
+ widget->inner_bounds.y = widget->pos.y + border;
+ } else {
+ widget->inner_bounds.x = border;
+ widget->inner_bounds.y = border;
+
+ widget->data.window.children_bounds.x = border;
+ widget->data.window.children_bounds.y =
+ border + widget->data.window.inner_deco_height;
+ widget->data.window.children_bounds.width = widget->inner_bounds.width;
+ widget->data.window.children_bounds.height =
+ widget->inner_bounds.height - widget->data.window.inner_deco_height;
+ if (!ct_rect_valid(&widget->data.window.children_bounds)) {
+ printf("children bounds of %p are %s and so invalid\n", widget,
+ ct_rect_to_string(&widget->data.window.children_bounds));
+ assert(0);
+ }
+ }
+
+ if (!ct_rect_valid(&widget->outer_bounds)) {
+ printf("outer_bounds of %p are %s and so invalid\n", widget,
+ ct_rect_to_string(&widget->outer_bounds));
+ assert(0);
+ }
+ if (!ct_rect_valid(&widget->inner_bounds)) {
+ printf("inner_bounds of %p are %s and so invalid\n", widget,
+ ct_rect_to_string(&widget->inner_bounds));
+ assert(0);
+ }
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void border_changed(struct sw_widget *widget)
+{
+ update_bounds(widget);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void inner_size_changed(struct sw_widget *widget)
+{
+ update_bounds(widget);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void sw_widget_set_position(struct sw_widget *widget, int x, int y)
+{
+ widget->pos.x = x;
+ widget->pos.y = y;
+
+ assert(widget->pos.x >= 0 && widget->pos.y >= 0);
+
+ if (widget->parent) {
+ widget->pos.x += widget->parent->data.window.children_bounds.x;
+ widget->pos.y += widget->parent->data.window.children_bounds.y;
+ }
+ assert(widget->pos.x >= 0 && widget->pos.y >= 0);
+
+ update_bounds(widget);
+
+ assert(ct_rect_valid(&widget->outer_bounds));
+ assert(ct_rect_valid(&widget->inner_bounds));
+
+ if (widget->parent && !ct_rect_in_rect
+ (&widget->outer_bounds,
+ &widget->parent->data.window.children_bounds)) {
+ printf("child %p (%s) ", widget,
+ ct_rect_to_string(&widget->outer_bounds));
+ printf("is outside of parent %p (%s)\n", widget->parent,
+ ct_rect_to_string(&widget->parent->data.window.children_bounds));
+ }
+ parent_needs_paint(widget);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void sw_widget_hcenter(struct sw_widget *widget)
+{
+ sw_widget_set_position(widget,
+ (widget->parent->data.window.children_bounds.width -
+ widget->outer_bounds.width) / 2,
+ widget->outer_bounds.y);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void sw_widget_vcenter(struct sw_widget *widget)
+{
+ sw_widget_set_position(widget, widget->outer_bounds.x,
+ (widget->parent->data.window.children_bounds.
+ height - widget->outer_bounds.height) / 2);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void align(const struct ct_rect *bb, struct ct_rect *item,
+ enum ws_alignment alignment)
+{
+ switch (alignment) {
+ case A_W:
+ case A_NW:
+ case A_SW:
+ case A_WC:
+ item->x = bb->x;
+ break;
+ case A_E:
+ case A_NE:
+ case A_SE:
+ case A_EC:
+ item->x = bb->x+bb->width - item->width;
+ break;
+ case A_WE:
+ case A_CENTER:
+ case A_NC:
+ case A_SC:
+ item->x = bb->x+(bb->width - item->width) / 2;
+ break;
+ case A_N:
+ case A_S:
+ break;
+ default:
+ assert(0);
+ }
+
+ switch (alignment) {
+ case A_N:
+ case A_NW:
+ case A_NE:
+ case A_NC:
+ item->y = bb->y;
+ break;
+ case A_S:
+ case A_SW:
+ case A_SE:
+ case A_SC:
+ item->y = bb->y+bb->height - item->height;
+ break;
+ case A_NS:
+ case A_CENTER:
+ case A_WC:
+ case A_EC:
+ item->y = bb->y+(bb->height - item->height) / 2;
+ break;
+ case A_W:
+ case A_E:
+ break;
+ default:
+ assert(0);
+ }
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void sw_widget_align_parent(struct sw_widget *widget, enum ws_alignment alignment)
+{
+ struct sw_widget *window = widget->parent;
+ struct ct_rect rect, bb;
+
+ if (widget->pos.x == -1 && widget->pos.y == -1) {
+ sw_widget_set_position(widget, 0, 0);
+ }
+
+ update_bounds(widget);
+ rect = widget->outer_bounds;
+ bb = window->data.window.children_bounds;
+ bb.x = 0;
+ bb.y = 0;
+
+ align(&bb, &rect, alignment);
+ sw_widget_set_position(widget, rect.x, rect.y);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void sw_widget_align_box(struct sw_widget *widget,
+ enum ws_alignment alignment, const struct ct_rect
+ *box)
+{
+ struct ct_rect rect, bb;
+
+ if (widget->pos.x == -1 && widget->pos.y == -1) {
+ sw_widget_set_position(widget, 0, 0);
+ }
+
+ update_bounds(widget);
+ rect = widget->outer_bounds;
+ bb = *box;
+
+ align(&bb, &rect, alignment);
+ sw_widget_set_position(widget, rect.x, rect.y);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void sw_widget_set_background_sprite(struct sw_widget *widget,
+ struct sprite *sprite)
+{
+ widget->background_sprite = sprite;
+ widget_needs_paint(widget);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void sw_widget_set_background_color(struct sw_widget *widget,
+ be_color background_color)
+{
+ widget->has_background_color = TRUE;
+ widget->background_color = background_color;
+ widget_needs_paint(widget);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void sw_widget_set_border_color(struct sw_widget *widget,
+ be_color border_color)
+{
+ widget->has_border_color = TRUE;
+ widget->border_color = border_color;
+ border_changed(widget);
+ widget_needs_paint(widget);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void sw_widget_get_bounds(struct sw_widget *widget, struct ct_rect *bounds)
+{
+ *bounds = widget->outer_bounds;
+ bounds->y -= widget->parent->data.window.inner_deco_height;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void sw_widget_destroy(struct sw_widget *widget)
+{
+ assert(widget);
+ widget_list_prepend(deferred_destroyed_widgets, widget);
+ parent_needs_paint(widget);
+ // FIXME this is unsafe if
+ // widget_list_size(deferred_destroyed_widgets) > 1
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void sw_widget_disable_mouse_events(struct sw_widget *widget)
+{
+ widget->accepts_events[EV_MOUSE] = FALSE;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void sw_widget_set_enabled(struct sw_widget *widget, bool enabled)
+{
+ widget->disabled = !enabled;
+}
diff --git a/utility/ftwl/widget_edit.c b/utility/ftwl/widget_edit.c
new file mode 100644
index 0000000..ae913be
--- /dev/null
+++ b/utility/ftwl/widget_edit.c
@@ -0,0 +1,270 @@
+/**********************************************************************
+ Freeciv - Copyright (C) 2004 - The Freeciv Project
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+***********************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <assert.h>
+#include <stdio.h>
+
+#include "widget_p.h"
+
+#include "mem.h"
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static bool key(struct sw_widget *widget, const struct be_key *key,
+ void *data)
+{
+ int cursor = widget->data.edit.cursor;
+ int chars = strlen(widget->data.edit.buffer);
+
+ if (key->control && key->type == BE_KEY_NORMAL && key->key == 'a') {
+ widget->data.edit.cursor = 0;
+ } else if (key->control && key->type == BE_KEY_NORMAL && key->key == 'e') {
+ widget->data.edit.cursor = strlen(widget->data.edit.buffer);
+ } else if (key->type == BE_KEY_LEFT) {
+ widget->data.edit.cursor--;
+ } else if (key->type == BE_KEY_RIGHT) {
+ widget->data.edit.cursor++;
+ } else if (key->type == BE_KEY_BACKSPACE) {
+ if (cursor > 0) {
+ memmove(widget->data.edit.buffer + cursor - 1,
+ widget->data.edit.buffer + cursor, chars - cursor);
+ widget->data.edit.buffer[chars - 1] = '\0';
+ widget->data.edit.cursor--;
+ }
+ } else if (key->type == BE_KEY_DELETE) {
+ if (chars > 1 && cursor != chars - 1) {
+ memmove(widget->data.edit.buffer + cursor,
+ widget->data.edit.buffer + cursor + 1, chars - cursor);
+ widget->data.edit.buffer[chars - 1] = '\0';
+ }
+ } else if (key->type == BE_KEY_NORMAL) {
+ if (chars <= widget->data.edit.max_size) {
+ //printf("prev='%s' ", widget->data.edit.buffer);
+ memmove(widget->data.edit.buffer + cursor + 1,
+ widget->data.edit.buffer + cursor, chars - cursor);
+ widget->data.edit.buffer[chars + 1] = '\0';
+ widget->data.edit.buffer[cursor] = key->key;
+ widget->data.edit.cursor++;
+ //printf(" -> '%s'\n", widget->data.edit.buffer);
+ }
+ } else {
+ return FALSE;
+ }
+
+ if (widget->data.edit.cursor < 0) {
+ widget->data.edit.cursor = 0;
+ }
+
+ if (widget->data.edit.cursor >= strlen(widget->data.edit.buffer)) {
+ widget->data.edit.cursor = strlen(widget->data.edit.buffer) - 1;
+ }
+ widget_needs_paint(widget);
+ return TRUE;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void draw(struct sw_widget *widget)
+{
+ int chars = strlen(widget->data.edit.buffer);
+ struct ct_point pos;
+ struct ct_rect rect;
+ //const int PADDING = 5;
+ int i;
+ struct ct_string *all = ct_string_clone3(widget->data.edit.template,
+ widget->data.edit.buffer);
+
+ rect = widget->inner_bounds;
+
+ be_draw_region(get_osda(widget), &rect,
+ widget->data.edit.template->background);
+
+ pos.x =
+ widget->inner_bounds.x + (widget->inner_bounds.width -
+ all->size.width) / 2;
+ pos.y =
+ widget->inner_bounds.y + (widget->inner_bounds.height -
+ all->size.height) / 2;
+
+ for (i = 0; i < chars; i++) {
+ struct ct_string *t;
+ char one[2];
+
+ one[0] = widget->data.edit.buffer[i];
+ one[1] = '\0';
+
+ t = ct_string_clone3(widget->data.edit.template, one);
+
+ if (widget->data.edit.cursor == i && widget->selected) {
+ rect.x = pos.x;
+ rect.y = pos.y;
+ rect.width = t->size.width;
+ rect.height = t->size.height;
+
+ be_draw_region(get_osda(widget), &rect,
+ widget->data.edit.color1);
+ }
+
+ if (i != chars - 1) {
+ be_draw_string(get_osda(widget), &pos, t);
+ }
+
+ if (widget->data.edit.cursor == i && !widget->selected) {
+ rect.x = pos.x;
+ rect.y = pos.y;
+ rect.width = t->size.width;
+ rect.height = t->size.height;
+
+ be_draw_rectangle(get_osda(widget), &rect, 1,
+ widget->data.edit.color2);
+ }
+
+ pos.x += t->size.width;
+ ct_string_destroy(t);
+ }
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void entered(struct sw_widget *widget)
+{
+ sw_widget_set_border_color(widget, widget->data.edit.color_selected);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void left(struct sw_widget *widget)
+{
+ sw_widget_set_border_color(widget, widget->data.edit.color_noselected);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void destroy(struct sw_widget *widget)
+{
+ ct_string_destroy(widget->data.edit.template);
+ free(widget->data.edit.buffer);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+struct sw_widget *sw_edit_create(struct sw_widget *parent,int max_size,
+ struct ct_string *temp_and_initial_text)
+{
+ struct sw_widget *result = create_widget(parent, WT_EDIT);
+ char *tmp = fc_malloc(max_size + 2);
+ int i;
+ struct ct_string *all;
+
+ result->destroy = destroy;
+ result->entered=entered;
+ result->left=left;
+ result->draw = draw;
+ result->key = key;
+ result->key_data = NULL;
+ result->can_be_selected = TRUE;
+
+ // FIXME make configurable
+ result->data.edit.color1 = be_get_color(255, 0, 0, MAX_OPACITY);
+ result->data.edit.color2 = be_get_color(255, 0, 0, MAX_OPACITY);
+ result->data.edit.color_selected = be_get_color(255, 255, 255, MAX_OPACITY);
+ result->data.edit.color_noselected = be_get_color(0, 0, 0, MAX_OPACITY);
+
+ for (i = 0; i < max_size + 1; i++) {
+ tmp[i] = 'M';
+ }
+ tmp[i] = '\0';
+
+ result->data.edit.max_size = max_size;
+ result->data.edit.template = ct_string_clone(temp_and_initial_text);
+ assert(strlen(temp_and_initial_text->text) <= max_size);
+ result->data.edit.buffer = fc_malloc(max_size + 2);
+ strcpy(result->data.edit.buffer, temp_and_initial_text->text);
+ strcat(result->data.edit.buffer, "x");
+ result->data.edit.cursor = 0;
+
+ all = ct_string_clone3(result->data.edit.template, tmp);
+ free(tmp);
+ result->inner_bounds.width = all->size.width;
+ result->inner_bounds.height = 2 * all->size.height;
+ result->outer_bounds=result->inner_bounds;
+
+ sw_widget_set_background_color(result,
+ result->data.edit.template->background);
+ sw_widget_set_border_color(result, result->data.edit.color_noselected);
+
+ return result;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+struct sw_widget *sw_edit_create_bounded(struct sw_widget *parent,
+ int max_size,
+ struct ct_string *template,
+ struct ct_rect *bounds,
+ enum ws_alignment alignment)
+{
+ int i, size;
+ char *tmp = fc_malloc(max_size + 2);
+
+ for (i = 0; i < max_size + 1; i++) {
+ tmp[i] = 'M';
+ }
+ tmp[i] = '\0';
+
+ for (size = template->font_size; size > 0; size--) {
+ struct ct_string *string2 = ct_string_clone2(template, size, tmp);
+ if (string2->size.width <= bounds->width &&
+ 2 * string2->size.height+2 <= bounds->height) {
+ struct ct_string *real_template = ct_string_clone1(template, size);
+ struct sw_widget *result =
+ sw_edit_create(parent, max_size, real_template);
+
+ sw_widget_align_box(result, alignment,bounds);
+ ct_string_destroy(string2);
+ free(tmp);
+ return result;
+ } else {
+ ct_string_destroy(string2);
+ }
+ }
+ assert(0);
+ return NULL;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+const char *sw_edit_get_text(struct sw_widget *widget)
+{
+ static char *tmp;
+
+ tmp = fc_realloc(tmp, strlen(widget->data.edit.buffer) + 1);
+ strcpy(tmp, widget->data.edit.buffer);
+ tmp[strlen(tmp) - 1] = '\0';
+ return tmp;
+}
diff --git a/utility/ftwl/widget_label.c b/utility/ftwl/widget_label.c
new file mode 100644
index 0000000..a6e50fe
--- /dev/null
+++ b/utility/ftwl/widget_label.c
@@ -0,0 +1,93 @@
+/**********************************************************************
+ Freeciv - Copyright (C) 2004 - The Freeciv Project
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+***********************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <assert.h>
+#include <stdio.h>
+
+#include "widget_p.h"
+
+#include "mem.h"
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void draw(struct sw_widget *widget)
+{
+ struct ct_point pos;
+
+ pos.x = widget->inner_bounds.x + 1;
+ pos.y = widget->inner_bounds.y + 1;
+
+ be_draw_string(get_osda(widget), &pos, widget->data.label.text);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void destroy(struct sw_widget *widget)
+{
+ ct_string_destroy(widget->data.label.text);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+struct sw_widget *sw_label_create_text(struct sw_widget *parent,
+ struct ct_string *string)
+{
+ struct sw_widget *result = create_widget(parent, WT_LABEL);
+
+ result->destroy = destroy;
+ result->draw = draw;
+
+ result->data.label.text = string;
+
+ result->inner_bounds.width = string->size.width + 2;
+ result->inner_bounds.height = string->size.height + 2;
+ result->outer_bounds = result->inner_bounds;
+
+ return result;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+struct sw_widget *sw_label_create_text_bounded(struct sw_widget *parent,
+ struct ct_string *string,
+ struct ct_rect *bounds,
+ enum ws_alignment alignment)
+{
+ int size;
+
+ for (size = string->font_size; size > 0; size--) {
+ struct ct_string *string2 = ct_string_clone1(string, size);
+ if (string2->size.width <= bounds->width &&
+ string2->size.height <= bounds->height) {
+ struct sw_widget *result = sw_label_create_text(parent, string2);
+
+ sw_widget_align_box(result, alignment, bounds);
+ return result;
+ } else {
+ ct_string_destroy(string2);
+ }
+ }
+ assert(0);
+ return NULL;
+}
diff --git a/utility/ftwl/widget_list.c b/utility/ftwl/widget_list.c
new file mode 100644
index 0000000..3c47f50
--- /dev/null
+++ b/utility/ftwl/widget_list.c
@@ -0,0 +1,651 @@
+/**********************************************************************
+ Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+***********************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <assert.h>
+#include <stdio.h>
+
+#include "mem.h"
+#include "widget_p.h"
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static struct sw_widget **get_item(struct sw_widget *widget, int column,
+ int row)
+{
+ struct sw_widget **result =
+ widget->data.list.items + row * widget->data.list.columns + column;
+
+ assert(column >= 0 && column < widget->data.list.columns);
+ assert(row >= 0 && row < widget->data.list.rows);
+
+ return result;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void ensure_size(struct sw_widget *widget, int column, int row)
+{
+ assert(column >= -1 && row >= -1);
+
+ if (column > widget->data.list.columns - 1 ||
+ row > widget->data.list.rows - 1) {
+ int old_columns = widget->data.list.columns;
+ int old_rows = widget->data.list.rows;
+ int new_columns = MAX(column + 1, old_columns);
+ int new_rows = MAX(row + 1, old_rows);
+ int x, y;
+ struct sw_widget **new_items =
+ fc_malloc(sizeof(*new_items) * new_columns * new_rows);
+
+ if(0)
+ printf("resizing from %dx%d to %dx%d\n", old_columns, old_rows,
+ new_columns, new_rows);
+ for (x = 0; x < new_columns; x++) {
+ for (y = 0; y < new_rows; y++) {
+ new_items[y * new_columns + x] = NULL;
+ }
+ }
+
+ for (x = 0; x < old_columns; x++) {
+ for (y = 0; y < old_rows; y++) {
+ new_items[y * new_columns + x] = *get_item(widget, x, y);
+ }
+ }
+
+ free(widget->data.list.items);
+ widget->data.list.items = new_items;
+ widget->data.list.columns = new_columns;
+ widget->data.list.rows = new_rows;
+
+ if (new_columns != old_columns) {
+ enum ws_alignment *new_column_alignments =
+ fc_malloc(sizeof(*new_column_alignments) * new_columns);
+
+ for (x = 0; x < new_columns; x++) {
+ new_column_alignments[x] = A_WC;
+ }
+
+ for (x = 0; x < old_columns; x++) {
+ new_column_alignments[x] = widget->data.list.column_alignments[x];
+ }
+ free(widget->data.list.column_alignments);
+ widget->data.list.column_alignments = new_column_alignments;
+ }
+
+ if (new_rows != old_rows) {
+ bool *new_row_enabled = fc_malloc(sizeof(*new_row_enabled) * new_rows);
+
+ for (y = 0; y < new_rows; y++) {
+ new_row_enabled[y] = TRUE;
+ }
+
+ for (y = 0; y < old_rows; y++) {
+ new_row_enabled[y] = widget->data.list.row_enabled[y];
+ }
+ free(widget->data.list.row_enabled);
+ widget->data.list.row_enabled = new_row_enabled;
+ }
+ }
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void layout(struct sw_widget *widget)
+{
+ int x, y;
+
+ if (widget->data.list.columns == 0 && widget->data.list.rows == 0) {
+ return;
+ }
+ remove_all_from_window(widget->data.list.window);
+
+ widget->data.list.widths =
+ fc_realloc(widget->data.list.widths,
+ sizeof(*widget->data.list.widths) *
+ widget->data.list.columns);
+ widget->data.list.heights =
+ fc_realloc(widget->data.list.heights,
+ sizeof(*widget->data.list.heights) *
+ widget->data.list.rows);
+ widget->data.list.start_x =
+ fc_realloc(widget->data.list.start_x,
+ sizeof(*widget->data.list.start_x) *
+ widget->data.list.columns);
+ widget->data.list.start_y =
+ fc_realloc(widget->data.list.start_y,
+ sizeof(*widget->data.list.start_y) *
+ widget->data.list.rows);
+
+ for (x = 0; x < widget->data.list.columns; x++) {
+ int max = 0;
+
+ for (y = 0; y < widget->data.list.rows; y++) {
+ struct sw_widget *w = *get_item(widget, x, y);
+
+ if (w) {
+ max = MAX(max, w->outer_bounds.width);
+ }
+ }
+ widget->data.list.widths[x] = max;
+ }
+
+ for (y = 0; y < widget->data.list.rows; y++) {
+ int max = 0;
+
+ for (x = 0; x < widget->data.list.columns; x++) {
+ struct sw_widget *w = *get_item(widget, x, y);
+ if (w) {
+ max = MAX(max, w->outer_bounds.height);
+ }
+ }
+ widget->data.list.heights[y] = max;
+ }
+
+ widget->data.list.start_x[0] = 0;
+ for (x = 0; x < widget->data.list.columns - 1; x++) {
+ widget->data.list.start_x[x + 1] =
+ widget->data.list.start_x[x] + widget->data.list.widths[x];
+ }
+
+ widget->data.list.start_y[0] = 0;
+ for (y = 0; y < widget->data.list.rows - 1; y++) {
+ widget->data.list.start_y[y + 1] =
+ widget->data.list.start_y[y] + widget->data.list.heights[y];
+ }
+
+ if (1) {
+ for (x = 0; x < widget->data.list.columns; x++) {
+ printf("column[%d] starts at %d and has width %d\n", x,
+ widget->data.list.start_x[x], widget->data.list.widths[x]);
+ }
+
+ for (y = 0; y < widget->data.list.rows; y++) {
+ printf("row[%d] starts %d and has height %d\n", y,
+ widget->data.list.start_y[y], widget->data.list.heights[y]);
+ }
+ }
+
+ {
+ int new_width =
+ widget->data.list.start_x[widget->data.list.columns - 1] +
+ widget->data.list.widths[widget->data.list.columns - 1];
+ int new_height =
+ widget->data.list.start_y[widget->data.list.rows - 1] +
+ widget->data.list.heights[widget->data.list.rows - 1];
+ if (new_width < widget->inner_bounds.width) {
+ new_width = widget->inner_bounds.width;
+ }
+ if (new_height == 0) {
+ new_height = 1;
+ }
+
+ printf("resize to %dx%d\n", new_width, new_height);
+ sw_window_resize(widget->data.list.window, new_width, new_height);
+ }
+
+ for (x = 0; x < widget->data.list.columns; x++) {
+ for (y = 0; y < widget->data.list.rows; y++) {
+ struct sw_widget *w = *get_item(widget, x, y);
+
+ if (w) {
+ struct ct_rect bb;
+ struct ct_rect pos;
+
+ bb.x = widget->data.list.start_x[x];
+ bb.y = widget->data.list.start_y[y];
+ bb.width = widget->data.list.widths[x];
+ bb.height = widget->data.list.heights[y];
+
+ pos = w->outer_bounds;
+ pos.x = 0;
+ pos.y = 0;
+
+ align(&bb, &pos, widget->data.list.column_alignments[x]);
+
+ sw_window_add(widget->data.list.window, w);
+ sw_widget_set_position(w, pos.x, pos.y);
+ }
+ }
+ }
+
+ widget_needs_paint(widget);
+ widget->data.list.needs_layout = FALSE;
+ update_window(widget->data.list.window);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void ensure_valid_layout(struct sw_widget *widget)
+{
+ if (widget->data.list.needs_layout) {
+ layout(widget);
+ if (widget->data.list.callback1) {
+ widget->data.list.callback1(widget, widget->data.list.callback1_data);
+ }
+ }
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void draw(struct sw_widget *widget)
+{
+ struct ct_size size;
+ struct ct_point src_pos;
+ struct ct_point dest_pos;
+ struct sw_widget *window = widget->data.list.window;
+
+ ensure_valid_layout(widget);
+ size.width = MIN(window->inner_bounds.width, widget->inner_bounds.width);
+ size.height = MIN(window->inner_bounds.height,widget->inner_bounds.height);
+
+ src_pos = widget->data.list.offset;
+
+ dest_pos.x = widget->inner_bounds.x;
+ dest_pos.y = widget->inner_bounds.y;
+
+ be_copy_osda_to_osda(get_osda(widget), window->data.window.target, &size,
+ &dest_pos, &src_pos);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void draw_extra_background(struct sw_widget *widget,
+ const struct ct_rect *region)
+{
+ struct ct_rect rect;
+ struct sw_widget *list = widget->data.window.list;
+ int row = list->data.list.selected_row;
+
+ if (row == -1) {
+ return;
+ }
+
+ ensure_valid_layout(list);
+
+ rect.x = 0;
+ rect.y = list->data.list.start_y[row];
+ rect.width = widget->inner_bounds.width;
+ rect.height = list->data.list.heights[row];
+ ct_rect_intersect(&rect, region);
+ be_draw_region(get_osda(widget), &rect,
+ be_get_color(189, 210, 238, MAX_OPACITY));
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void click_start(struct sw_widget *widget,
+ const struct ct_point *mouse,
+ enum be_mouse_button button, int state, void *data)
+{
+ int y, row = -1;
+ struct ct_point pos = *mouse;
+
+ pos.y += widget->data.list.offset.y;
+
+ ensure_valid_layout(widget);
+
+ for (y = 0; y < widget->data.list.rows; y++) {
+ if (pos.y >= widget->data.list.start_y[y] &&
+ pos.y <
+ widget->data.list.start_y[y] + widget->data.list.heights[y]) {
+ row = y;
+ break;
+ }
+ }
+ sw_list_set_selected_row(widget, row, FALSE);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+struct sw_widget *sw_list_create(struct sw_widget *parent, int pixel_width,
+ int pixel_height)
+{
+ struct sw_widget *result = create_widget(parent, WT_LIST);
+
+ result->draw = draw;
+ result->click_start = click_start;
+
+ result->inner_bounds.width = pixel_width;
+ result->inner_bounds.height = pixel_height;
+ result->outer_bounds = result->inner_bounds;
+
+ result->data.list.callback1 = NULL;
+ result->data.list.callback2 = NULL;
+
+ result->data.list.window =
+ sw_window_create(NULL, 1, 1, NULL, FALSE, DEPTH_HIDDEN);
+ sw_widget_set_background_color(result->data.list.window,
+ be_get_color(255, 255, 255, MAX_OPACITY));
+ result->data.list.window->data.window.shown = FALSE;
+ result->data.list.window->data.window.list = result;
+ result->data.list.window->draw_extra_background = draw_extra_background;
+ sw_widget_set_position(result->data.list.window, 0, 0);
+ result->data.list.needs_layout = TRUE;
+ result->data.list.offset.x = 0;
+ result->data.list.offset.y = 0;
+ result->data.list.columns = 0;
+ result->data.list.rows = 0;
+ result->data.list.items = NULL;
+ result->data.list.column_alignments = NULL;
+ result->data.list.row_enabled = NULL;
+
+ result->data.list.widths = NULL;
+ result->data.list.heights = NULL;
+ result->data.list.start_x = NULL;
+ result->data.list.start_y = NULL;
+
+ result->data.list.selected_row = -1;
+
+ sw_widget_set_background_color(result,
+ be_get_color(255, 255, 255, MAX_OPACITY));
+ return result;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void sw_list_set_item(struct sw_widget *widget, int column, int row,
+ struct sw_widget *item)
+{
+ ensure_size(widget, column, row);
+ assert(widget && item);
+ assert(column >= 0 && column < widget->data.list.columns);
+ assert(row >= 0 && row < widget->data.list.rows);
+
+ item->can_be_pressed = FALSE;
+ item->can_be_selected = FALSE;
+ item->can_be_dragged[BE_MB_LEFT] = FALSE;
+ item->can_be_dragged[BE_MB_RIGHT] = FALSE;
+ item->can_be_dragged[BE_MB_MIDDLE] = FALSE;
+
+ sw_window_remove(item);
+ sw_widget_set_position(item, 0, 0);
+ widget->data.list.needs_layout = TRUE;
+ widget_needs_paint(widget);
+
+ *get_item(widget, column, row) = item;
+ widget->data.list.selected_row = 0;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void sw_list_get_offset(struct sw_widget *widget, struct ct_point *pos)
+{
+ *pos = widget->data.list.offset;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void sw_list_set_offset(struct sw_widget *widget,
+ const struct ct_point *position)
+{
+ struct sw_widget *window = widget->data.list.window;
+ struct ct_point pos = *position;
+ int diff;
+
+ if (pos.x < 0) {
+ pos.x = 0;
+ }
+
+ if (pos.y < 0) {
+ pos.y = 0;
+ }
+
+ diff = window->outer_bounds.width - widget->inner_bounds.width;
+ if (diff > 0 && pos.x > diff) {
+ pos.x = diff;
+ }
+
+ diff = window->outer_bounds.height - widget->inner_bounds.height;
+ if (diff > 0 && pos.y > diff) {
+ pos.y = diff;
+ }
+
+ if (widget->data.list.offset.x != pos.x ||
+ widget->data.list.offset.y != pos.y) {
+ widget->data.list.offset = pos;
+ widget_needs_paint(widget);
+
+ if (widget->data.list.callback1) {
+ widget->data.list.callback1(widget, widget->data.list.callback1_data);
+ }
+ }
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void sw_list_get_view_size(struct sw_widget *widget, struct ct_size *size)
+{
+ size->height = widget->inner_bounds.height;
+ size->width = widget->inner_bounds.width;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void sw_list_get_window_size(struct sw_widget *widget,struct ct_size *size)
+{
+ struct sw_widget *window = widget->data.list.window;
+
+ size->height = window->outer_bounds.height;
+ size->width = window->outer_bounds.width;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void sw_list_set_content_changed_notify(struct sw_widget *widget,
+ void (*callback) (struct sw_widget
+ * widget,
+ void *data),
+ void *data)
+{
+ widget->data.list.callback1 = callback;
+ widget->data.list.callback1_data = data;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void sw_list_set_selected_row(struct sw_widget *widget, int row, bool show)
+{
+ ensure_size(widget, -1, row);
+ widget->data.list.selected_row = row;
+ widget_needs_paint(widget);
+ widget_needs_paint(widget->data.list.window);
+ update_window(widget->data.list.window);
+ if (show) {
+ struct ct_point pos = widget->data.list.offset;
+
+ pos.y = widget->data.list.start_y[row];
+ sw_list_set_offset(widget, &pos);
+ }
+ if (widget->data.list.callback2) {
+ widget->data.list.callback2(widget, widget->data.list.callback2_data);
+ }
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+int sw_list_get_selected_row(struct sw_widget *widget)
+{
+ return widget->data.list.selected_row;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void sw_list_set_row_enabled(struct sw_widget *widget, int row, bool enabled)
+{
+ ensure_size(widget, -1, row);
+ widget->data.list.row_enabled[row] = enabled;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+bool sw_list_is_row_enabled(struct sw_widget *widget, int row)
+{
+ return widget->data.list.row_enabled[row];
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+#if 0
+static void vslider_changed(struct sw_widget *widget, void *data)
+{
+ sw_update_list_from_vslider(data, widget);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void list_changed(struct sw_widget *widget, void *data)
+{
+ //printf("WIDGET_LIST\n");
+ sw_update_vslider_from_list(data, widget);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void vscroll_button_up_callback(struct sw_widget *button, void *data)
+{
+ struct sw_widget *vslider = data;
+ float old = sw_slider_get_offset(vslider);
+ float width = sw_slider_get_width(vslider);
+
+ sw_slider_set_offset(vslider, old - 0.9 * width);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void vscroll_button_down_callback(struct sw_widget *button, void *data)
+{
+ struct sw_widget *vslider = data;
+ float old = sw_slider_get_offset(vslider);
+ float width = sw_slider_get_width(vslider);
+
+ sw_slider_set_offset(vslider, old + 0.9 * width);
+}
+#endif
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void sw_list_add_buttons_and_vslider(struct sw_widget *widget,
+ struct sprite *up, struct sprite *down,
+ struct sprite *button_background,
+ struct sprite *scrollbar)
+{
+ assert(0);
+ /*
+ struct sw_widget *window = widget->parent;
+ struct sw_widget *button_up, *button_down, *vslider;
+ struct ct_rect rect_list, rect_up, rect_down;
+
+ sw_widget_get_bounds(widget, &rect_list);
+
+ button_up = sw_button_create_text_and_background(window, NULL, up);
+ sw_widget_set_position(button_up, rect_list.x + rect_list.width,
+ rect_list.y);
+ sw_widget_get_bounds(button_up, &rect_up);
+
+ button_down = sw_button_create_text_and_background(window, NULL, down);
+
+ sw_widget_set_position(button_down, 0, 0);
+ sw_widget_get_bounds(button_down, &rect_down);
+ sw_widget_set_position(button_down, rect_list.x + rect_list.width,
+ rect_list.y + rect_list.height - rect_down.height);
+ sw_widget_get_bounds(button_down, &rect_down);
+
+ vslider =
+ sw_slider_create(window, rect_up.width - 2,
+ rect_down.y - (rect_up.y + rect_up.height) - 2,
+ scrollbar, TRUE);
+ sw_widget_set_position(vslider, rect_up.x - 1, rect_up.y + rect_up.height);
+ sw_widget_set_background_color(vslider, COLOR_STD_RACE2);
+ sw_slider_set_slided_notify(vslider, vslider_changed, widget);
+
+ sw_button_set_callback(button_up, vscroll_button_up_callback, vslider);
+ sw_button_set_callback(button_down, vscroll_button_down_callback, vslider);
+ sw_list_set_content_changed_notify(widget, list_changed, vslider);
+ */
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void sw_list_set_selection_changed_notify(struct sw_widget *widget,
+ void (*callback) (struct sw_widget
+ * widget,
+ void *data),
+ void *data)
+{
+ widget->data.list.callback2 = callback;
+ widget->data.list.callback2_data = data;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void sw_list_clear(struct sw_widget *widget)
+{
+ int x, y;
+
+ if (widget->data.list.columns == 0 && widget->data.list.rows == 0) {
+ return;
+ }
+
+ for (x = 0; x < widget->data.list.columns; x++) {
+ for (y = 0; y < widget->data.list.rows; y++) {
+ struct sw_widget *w = *get_item(widget, x, y);
+
+ if (w) {
+ real_widget_destroy(w);
+ }
+ }
+ }
+
+ widget->data.list.columns = 0;
+ widget->data.list.rows = 0;
+ free(widget->data.list.items);
+ widget->data.list.items = NULL;
+ free(widget->data.list.column_alignments);
+ widget->data.list.column_alignments = NULL;
+ free(widget->data.list.row_enabled);
+ widget->data.list.row_enabled = NULL;
+
+ widget->data.list.needs_layout = TRUE;
+}
diff --git a/utility/ftwl/widget_p.h b/utility/ftwl/widget_p.h
new file mode 100644
index 0000000..5cb7719
--- /dev/null
+++ b/utility/ftwl/widget_p.h
@@ -0,0 +1,218 @@
+/**********************************************************************
+ Freeciv - Copyright (C) 2004 - The Freeciv Project
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+***********************************************************************/
+
+#ifndef FC_WIDGET_P_H
+#define FC_WIDGET_P_H
+
+#include "shared.h"
+#include "widget.h"
+
+#define BORDER_WIDTH 1
+
+/* Widget Types */
+enum widget_type {
+ WT_WINDOW,
+ WT_BUTTON,
+ WT_EDIT,
+ WT_LABEL,
+ WT_LIST,
+ WT_CLIST,
+ WT_SLIDER,
+ WT_LAST = WT_SLIDER
+};
+
+enum widget_face {
+ WF_NORMAL,
+ WF_SELECTED,
+ WF_PRESSED,
+ WF_DISABLED,
+ WF_HIDDEN,
+ NUM_WIDGET_FACES
+};
+
+enum event_type {
+ EV_KEYBOARD,
+ EV_MOUSE,
+ EV_LAST
+};
+
+enum slider_part {
+ SP_TOP,
+ SP_BOTTOM,
+ SP_REPEAT,
+ SP_CENTER,
+ NUM_SP
+};
+
+struct sw_widget {
+ struct sw_widget *parent;
+ enum widget_type type;
+ bool pressed;
+ bool selected;
+ bool disabled;
+ bool dragged;
+ bool accepts_events[EV_LAST];
+
+ bool can_be_pressed;
+ bool can_be_selected;
+ bool can_be_dragged[BE_MB_LAST];
+
+ bool needs_repaint;
+
+ struct ct_point pos;
+ struct ct_rect inner_bounds, outer_bounds;
+
+ struct ct_tooltip *tooltip;
+ bool tooltip_shown;
+ int tooltip_callback_id;
+
+ bool has_background_color;
+ be_color background_color;
+ struct sprite *background_sprite; /* default NULL */
+ bool has_border_color;
+ be_color border_color;
+
+ void (*destroy) (struct sw_widget *widget);
+ void (*entered) (struct sw_widget *widget);
+ void (*left) (struct sw_widget *widget);
+ void (*click) (struct sw_widget *widget);
+ bool(*key) (struct sw_widget *widget, const struct be_key *key,
+ void *data);
+ void *key_data;
+ void (*draw) (struct sw_widget *widget);
+ void (*draw_extra_background) (struct sw_widget *widget,
+ const struct ct_rect* rect);
+ void (*drag_start) (struct sw_widget *widget,
+ const struct ct_point *mouse,
+ enum be_mouse_button button);
+ void (*drag_move) (struct sw_widget *widget,
+ const struct ct_point *start_position,
+ const struct ct_point *current_position,
+ enum be_mouse_button button);
+ void (*drag_end) (struct sw_widget *widget, enum be_mouse_button button);
+
+ void (*click_start) (struct sw_widget *widget,
+ const struct ct_point *mouse,
+ enum be_mouse_button button, int state, void *data);
+ void *click_start_data;
+
+ union {
+ struct {
+ struct widget_list *children;
+ struct osda *target;
+ struct ct_string *title;
+ struct ct_point pos_at_drag_start;
+ int transparency;
+ bool shown;
+ struct ct_rect children_bounds;
+ int inner_deco_height;
+ int depth;
+ struct sw_widget *list;
+ struct osda *canvas_background;
+ struct region_list *to_flush;
+ void (*user_drag_start) (struct sw_widget * widget,
+ const struct ct_point * mouse,
+ enum be_mouse_button button);
+ void (*user_drag_move) (struct sw_widget * widget,
+ const struct ct_point * start_position,
+ const struct ct_point * current_position,
+ enum be_mouse_button button);
+ void (*user_drag_end) (struct sw_widget * widget,
+ enum be_mouse_button button);
+ } window;
+ struct {
+ struct osda *gfx;
+ } icon;
+ struct {
+ struct ct_string *text[NUM_WIDGET_FACES];
+ struct ct_point text_offset[NUM_WIDGET_FACES];
+
+ struct osda *foreground_faces[NUM_WIDGET_FACES];
+ struct ct_point foreground_faces_offset[NUM_WIDGET_FACES];
+
+ struct osda *background_faces[NUM_WIDGET_FACES];
+
+ void (*callback) (struct sw_widget * widget, void *data);
+ void *callback_data;
+ struct be_key *shortcut;
+ } button;
+ struct {
+ struct ct_string *template;
+ char *buffer;
+ int cursor;
+ int max_size;
+ be_color color1, color2, color_selected, color_noselected;
+ } edit;
+ struct {
+ struct ct_string *text;
+ } label;
+ struct {
+ struct ct_point offset;
+ struct sw_widget *window;
+ void (*callback1) (struct sw_widget *widget, void *data);
+ void *callback1_data;
+ void (*callback2) (struct sw_widget *widget, void *data);
+ void *callback2_data;
+ int columns, rows;
+ struct sw_widget **items;
+ bool needs_layout;
+ int *widths, *heights;
+ int *start_x, *start_y;
+ int selected_row;
+ enum ws_alignment *column_alignments;
+ bool *row_enabled;
+ } list;
+ struct {
+ float width, offset, pos_at_drag_start;
+ bool vertical;
+ void (*callback) (struct sw_widget * widget, void *data);
+ void *callback_data;
+ struct sprite *faces[NUM_WIDGET_FACES][NUM_SP];
+ int cache_top_height, cache_center_height, cache_min_length;
+ be_color color_active, color_drag, color_nodrag;
+ } slider;
+ } data;
+};
+
+extern struct sw_widget *root_window;
+extern struct widget_list *deferred_destroyed_widgets;
+
+void handle_callbacks(void);
+void handle_idle_callbacks(void);
+void get_select_timeout(struct timeval *timeout);
+
+struct sw_widget *create_widget(struct sw_widget *parent,
+ enum widget_type type);
+struct osda *get_osda(struct sw_widget *widget);
+enum widget_face get_widget_face(struct sw_widget *widget);
+void translate_point(struct sw_widget *widget, struct ct_point *dest,
+ const struct ct_point *src);
+void inner_size_changed(struct sw_widget *widget);
+void flush_all_to_screen(void);
+
+void parent_needs_paint(struct sw_widget *widget);
+void widget_needs_paint(struct sw_widget *widget);
+
+void update_window(struct sw_widget *widget);
+struct sw_widget *search_widget(const struct ct_point *pos,
+ enum event_type event_type);
+void real_widget_destroy(struct sw_widget *widget);
+void remove_all_from_window(struct sw_widget *widget);
+
+void align(const struct ct_rect *bb, struct ct_rect *item,
+ enum ws_alignment alignment);
+void untooltip(struct sw_widget *widget);
+bool deliver_key(const struct be_key *key);
+void handle_destroyed_widgets(void);
+
+#endif
diff --git a/utility/ftwl/widget_slider.c b/utility/ftwl/widget_slider.c
new file mode 100644
index 0000000..74114c2
--- /dev/null
+++ b/utility/ftwl/widget_slider.c
@@ -0,0 +1,413 @@
+/**********************************************************************
+ Freeciv - Copyright (C) 2004 - The Freeciv Project
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+***********************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <assert.h>
+#include <stdio.h>
+
+#include "widget_p.h"
+
+#include "mem.h"
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void draw(struct sw_widget *widget)
+{
+ int max_length, length, m, offset;
+ enum widget_face face = get_widget_face(widget);
+
+ if (widget->dragged) {
+ face = WF_PRESSED;
+ }
+
+ if (widget->data.slider.vertical) {
+ m = widget->inner_bounds.width;
+ max_length = widget->inner_bounds.height;
+ } else {
+ m = widget->inner_bounds.height;
+ max_length = widget->inner_bounds.width;
+ }
+
+ length = widget->data.slider.width * max_length;
+ offset = widget->data.slider.offset * max_length;
+ if (length < widget->data.slider.cache_min_length) {
+ length = widget->data.slider.cache_min_length;
+ }
+
+ if (length + offset > max_length) {
+ length = max_length - offset;
+ }
+
+ if(0)
+ printf("width=%f offset=%f\n", widget->data.slider.width,
+ widget->data.slider.offset);
+ if(0)
+ printf(" %d + %d = %d\n",length,offset,max_length);
+
+ if (!widget->data.slider.faces[face]) {
+ struct ct_rect rect;
+
+ if (widget->data.slider.vertical) {
+ rect.x = widget->inner_bounds.x;
+ rect.y = widget->inner_bounds.y + offset;
+ rect.width = m;
+ rect.height = length;
+ } else {
+ rect.x = widget->inner_bounds.x + offset;
+ rect.y = widget->inner_bounds.y;
+ rect.width = length;
+ rect.height = m;
+ }
+
+ be_draw_region(get_osda(widget), &rect,
+ widget->data.slider.color_active);
+ } else {
+ struct ct_point dest_pos;
+ int center_height = widget->data.slider.cache_center_height;
+ int top_height = widget->data.slider.cache_top_height;
+ int repeat_height = length - 2 * top_height;
+ int i;
+
+ if (widget->data.slider.vertical) {
+ dest_pos.x = widget->inner_bounds.x;
+ dest_pos.y = widget->inner_bounds.y + offset;
+
+ be_draw_sprite(get_osda(widget),
+ widget->data.slider.faces[SP_TOP][face], NULL,
+ &dest_pos, NULL);
+
+ dest_pos.y += length - top_height;
+ be_draw_sprite(get_osda(widget),
+ widget->data.slider.faces[SP_BOTTOM][face], NULL,
+ &dest_pos, NULL);
+
+ dest_pos.y = widget->inner_bounds.y + offset + top_height;
+ for (i = 0; i < repeat_height; i++) {
+ be_draw_sprite(get_osda(widget),
+ widget->data.slider.faces[SP_REPEAT][face],NULL,
+ &dest_pos, NULL);
+ dest_pos.y++;
+ }
+
+ if (widget->data.slider.faces[SP_CENTER][face]) {
+ dest_pos.y =
+ widget->inner_bounds.y + offset + top_height +
+ (repeat_height - center_height) / 2;
+ be_draw_sprite(get_osda(widget),
+ widget->data.slider.faces[SP_CENTER][face], NULL,
+ &dest_pos, NULL);
+ }
+ } else {
+ dest_pos.x = widget->inner_bounds.x+offset;
+ dest_pos.y = widget->inner_bounds.y;
+
+ be_draw_sprite(get_osda(widget),
+ widget->data.slider.faces[SP_TOP][face], NULL,
+ &dest_pos, NULL);
+
+ dest_pos.x += length - top_height;
+ be_draw_sprite(get_osda(widget),
+ widget->data.slider.faces[SP_BOTTOM][face], NULL,
+ &dest_pos, NULL);
+
+ dest_pos.x = widget->inner_bounds.x + offset + top_height;
+ for (i = 0; i < repeat_height; i++) {
+ be_draw_sprite(get_osda(widget),
+ widget->data.slider.faces[SP_REPEAT][face],NULL,
+ &dest_pos, NULL);
+ dest_pos.x++;
+ }
+
+ if (widget->data.slider.faces[SP_CENTER][face]) {
+ dest_pos.x =
+ widget->inner_bounds.x + offset + top_height +
+ (repeat_height - center_height) / 2;
+ be_draw_sprite(get_osda(widget),
+ widget->data.slider.faces[SP_CENTER][face], NULL,
+ &dest_pos, NULL);
+ }
+ }
+ }
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void drag_start(struct sw_widget *widget,
+ const struct ct_point *mouse,
+ enum be_mouse_button button)
+{
+ widget->data.slider.pos_at_drag_start = widget->data.slider.offset;
+
+ if (!widget->data.slider.faces[0]) {
+ sw_widget_set_border_color(widget, widget->data.slider.color_drag);
+ }
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void drag_move(struct sw_widget *widget,
+ const struct ct_point *start_position,
+ const struct ct_point *current_position,
+ enum be_mouse_button button)
+{
+ int diff =
+ widget->data.slider.vertical ? (current_position->y -
+ start_position->
+ y) : (current_position->x -
+ start_position->x);
+ float diff_f =
+ (float) diff /
+ (widget->data.slider.vertical ? widget->inner_bounds.height : widget->
+ inner_bounds.width);
+ float new;
+
+ //printf("diff = %d = %f\n", diff, diff_f);
+ new = widget->data.slider.pos_at_drag_start + diff_f;
+
+ sw_slider_set_offset(widget, new);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void drag_end(struct sw_widget *widget, enum be_mouse_button button)
+{
+ if (!widget->data.slider.faces[0]) {
+ sw_widget_set_border_color(widget, widget->data.slider.color_nodrag);
+ }
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+struct sw_widget *sw_slider_create(struct sw_widget *parent, int width,
+ int height, struct sprite *top,
+ struct sprite *bottom,struct sprite *repeat,
+ struct sprite *center,
+ bool vertical)
+{
+ struct sw_widget *result = create_widget(parent, WT_SLIDER);
+ int i;
+
+ result->draw = draw;
+ result->drag_start = drag_start;
+ result->drag_move = drag_move;
+ result->drag_end = drag_end;
+
+ result->can_be_selected = TRUE;
+ result->can_be_dragged[BE_MB_LEFT] = TRUE;
+
+ result->inner_bounds.width = width;
+ result->inner_bounds.height = height;
+
+ result->data.slider.vertical = vertical;
+ result->data.slider.width = 1.0;
+ result->data.slider.offset = 0.0;
+ result->data.slider.callback = NULL;
+
+ result->data.slider.color_active = be_get_color(255, 0, 0, MAX_OPACITY);
+ result->data.slider.color_drag = be_get_color(255, 255, 255, MAX_OPACITY);
+ result->data.slider.color_nodrag = be_get_color(0, 0, 0, MAX_OPACITY);
+
+ if (!top && !bottom && !repeat && !center) {
+ int j;
+
+ sw_widget_set_border_color(result, result->data.slider.color_nodrag);
+ for (i = 0; i < 4; i++) {
+ for (j = 0; j < NUM_SP; j++) {
+ result->data.slider.faces[j][i] = NULL;
+ }
+ }
+ result->data.slider.cache_min_length = 10;
+ } else {
+ struct ct_size top_size;
+ struct ct_size bottom_size;
+ struct ct_size repeat_size;
+ struct ct_size center_size;
+
+ struct ct_size top_size2;
+ struct ct_size bottom_size2;
+ struct ct_size repeat_size2;
+ struct ct_size center_size2;
+
+ assert(top && bottom && repeat);
+
+ be_sprite_get_size(&top_size, top);
+ be_sprite_get_size(&bottom_size, bottom);
+ be_sprite_get_size(&repeat_size, repeat);
+ if (center) {
+ be_sprite_get_size(¢er_size, center);
+ }
+
+ assert((top_size.height % 4) == 0);
+ assert((bottom_size.height % 4) == 0);
+ assert((repeat_size.height % 4) == 0);
+ if (center) {
+ assert((center_size.height % 4) == 0);
+ }
+
+ top_size2 = top_size;
+ top_size2.height /= 4;
+
+ bottom_size2 = bottom_size;
+ bottom_size2.height /= 4;
+
+ repeat_size2 = repeat_size;
+ repeat_size2.height /= 4;
+
+ /* This is outside 'if (center)' -block to avoid
+ * '...might be used uninitialized...' warning from
+ * compiler that does not realize that it's never
+ * used if center == NULL. */
+ center_size2 = center_size;
+ if (center) {
+ center_size2.height /= 4;
+ }
+
+ for (i = 0; i < 4; i++) {
+ result->data.slider.faces[SP_TOP][i] =
+ be_crop_sprite(top, 0, i * top_size2.height,
+ top_size2.width, top_size2.height);
+ result->data.slider.faces[SP_BOTTOM][i] =
+ be_crop_sprite(bottom, 0, i * bottom_size2.height,
+ bottom_size2.width, bottom_size2.height);
+ result->data.slider.faces[SP_REPEAT][i] =
+ be_crop_sprite(repeat, 0, i * repeat_size2.height,
+ repeat_size2.width, repeat_size2.height);
+ if (center) {
+ result->data.slider.faces[SP_CENTER][i] =
+ be_crop_sprite(center, 0, i * center_size2.height,
+ center_size2.width, center_size2.height);
+ } else {
+ result->data.slider.faces[SP_CENTER][i] = NULL;
+ }
+ }
+
+ if (vertical) {
+ assert(top_size2.width == bottom_size2.width
+ && top_size2.width == repeat_size2.width
+ && top_size2.width == width);
+ assert(top_size2.height == bottom_size2.height);
+ assert(repeat_size2.height == 1);
+
+ if (center) {
+ assert(top_size2.width == center_size2.width);
+ }
+ result->data.slider.cache_top_height = top_size2.height;
+ if (center) {
+ result->data.slider.cache_center_height = center_size2.height;
+ } else {
+ result->data.slider.cache_center_height = 0;
+ }
+ } else {
+ assert(top_size2.height == bottom_size2.height);
+ assert(top_size2.height == repeat_size2.height);
+ printf("%d %d\n",top_size2.height, height);
+ assert(top_size2.height == height);
+ assert(top_size2.width == bottom_size2.width);
+ assert(repeat_size2.width == 1);
+
+ if (center) {
+ assert(top_size2.height == center_size2.height);
+ }
+ result->data.slider.cache_top_height = top_size2.width;
+ if (center) {
+ result->data.slider.cache_center_height = center_size2.width;
+ } else {
+ result->data.slider.cache_center_height = 0;
+ }
+ }
+
+ result->data.slider.cache_min_length =
+ MAX(2 * result->data.slider.cache_top_height,
+ result->data.slider.cache_center_height + 10);
+ }
+
+ return result;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void sw_slider_set_offset(struct sw_widget *widget, float offset)
+{
+ if (offset < 0.0) {
+ offset = 0.0;
+ }
+ if(0)
+ printf("set_offset(%f) width=%f\n", offset, widget->data.slider.width);
+ if (offset + widget->data.slider.width > 1.0) {
+ offset = 1.0 - widget->data.slider.width;
+ }
+ if(0)
+ printf(" %f -> %f\n",widget->data.slider.offset,offset);
+ widget->data.slider.offset = offset;
+ if (widget->data.slider.callback) {
+ widget->data.slider.callback(widget, widget->data.slider.callback_data);
+ }
+ widget_needs_paint(widget);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void sw_slider_set_width(struct sw_widget *widget, float width)
+{
+ if (width < 0.0) {
+ width = 0.0;
+ }
+ if (width > 1.0) {
+ width = 1.0;
+ }
+ widget->data.slider.width = width;
+ if (widget->data.slider.offset + width > 1.0) {
+ widget->data.slider.offset = 1.0 - width;
+ }
+ widget_needs_paint(widget);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+float sw_slider_get_offset(struct sw_widget *widget)
+{
+ return widget->data.slider.offset;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+float sw_slider_get_width(struct sw_widget *widget)
+{
+ return widget->data.slider.width;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void sw_slider_set_slided_notify(struct sw_widget *widget,
+ void (*callback) (struct sw_widget * widget,
+ void *data), void *data)
+{
+ widget->data.slider.callback = callback;
+ widget->data.slider.callback_data = data;
+}
diff --git a/utility/ftwl/widget_timeout.c b/utility/ftwl/widget_timeout.c
new file mode 100644
index 0000000..a053590
--- /dev/null
+++ b/utility/ftwl/widget_timeout.c
@@ -0,0 +1,257 @@
+/**********************************************************************
+ Freeciv - Copyright (C) 2004 - The Freeciv Project
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+***********************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <assert.h>
+#include <stdio.h>
+
+#ifdef HAVE_GETTIMEOFDAY
+#include <sys/time.h>
+#include <unistd.h>
+#endif
+
+#ifdef HAVE_FTIME
+# include <sys/timeb.h>
+#endif
+
+#include "widget_p.h"
+
+#include "mem.h"
+
+#ifndef HAVE_GETTIMEOFDAY
+#ifdef HAVE_FTIME
+static void gettimeofday(struct timeval *tv, void *dummy)
+{
+ struct timeb tp;
+ ftime(&tp);
+ tv->tv_usec = tp.millitm * 1000;
+ tv->tv_sec = tp.time;
+}
+#endif
+#endif
+
+struct callback {
+ int id;
+ struct timeval time;
+ void (*callback) (void *data);
+ void *data;
+};
+
+struct idle_callback {
+ struct timeval time;
+ void (*callback) (void *data);
+ void *data;
+};
+
+#define SPECLIST_TAG callback
+#define SPECLIST_TYPE struct callback
+#include "speclist.h"
+
+#define callback_list_iterate(list, item) \
+ TYPED_LIST_ITERATE(struct callback, list, item)
+#define callback_list_iterate_end LIST_ITERATE_END
+
+#define SPECLIST_TAG idle_callback
+#define SPECLIST_TYPE struct idle_callback
+#include "speclist.h"
+
+#define idle_callback_list_iterate(list, item) \
+ TYPED_LIST_ITERATE(struct idle_callback, list, item)
+#define idle_callback_list_iterate_end LIST_ITERATE_END
+
+static struct callback_list *callback_list = NULL;
+static struct idle_callback_list *idle_callback_list = NULL;
+static bool callback_lists_has_been_initialised = FALSE;
+static int id_counter = 1;
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void ensure_init(void)
+{
+ if (!callback_lists_has_been_initialised) {
+ callback_list = callback_list_new();
+ idle_callback_list = idle_callback_list_new();
+ callback_lists_has_been_initialised = TRUE;
+ }
+}
+
+/*************************************************************************
+ If msec equals -1 it is an idle callback. This means that it will
+ only executed if the system is idle. Also note that in this case the
+ return value will be -1. I.e. you can't remove idle timeouts.
+*************************************************************************/
+int sw_add_timeout(int msec, void (*callback) (void *data), void *data)
+{
+ if (msec == -1) {
+ struct idle_callback *p = fc_malloc(sizeof(*p));
+
+ p->callback = callback;
+ p->data = data;
+
+ ensure_init();
+ idle_callback_list_prepend(idle_callback_list, p);
+ return -1;
+ } else {
+ struct callback *p = fc_malloc(sizeof(*p));
+
+ assert(msec >= 0);
+
+ //printf("add_timeout(%dms)\n", msec);
+ gettimeofday(&p->time, NULL);
+
+ p->time.tv_sec += msec / 1000;
+ msec %= 1000;
+
+ p->time.tv_usec += msec * 1000;
+ while (p->time.tv_usec > 1000 * 1000) {
+ p->time.tv_usec -= 1000 * 1000;
+ p->time.tv_sec++;
+ }
+
+ p->callback = callback;
+ p->data = data;
+ p->id = id_counter;
+ id_counter++;
+
+ ensure_init();
+ callback_list_prepend(callback_list, p);
+ return p->id;
+ }
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void sw_remove_timeout(int id)
+{
+ assert(id > 0);
+ callback_list_iterate(callback_list, callback) {
+ if (callback->id == id) {
+ callback_list_unlink(callback_list, callback);
+ free(callback);
+ }
+ } callback_list_iterate_end;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void handle_callbacks(void)
+{
+ bool one_called = FALSE;
+ struct timeval now;
+
+ gettimeofday(&now, NULL);
+
+ /*printf("now = %ld.%ld\n",now.tv_sec,now.tv_usec);*/
+
+ ensure_init();
+
+ for (;;) {
+ bool change = FALSE;
+ callback_list_iterate(callback_list, callback) {
+ /*printf(" callback %ld.%ld\n", callback->time.tv_sec,
+ callback->time.tv_usec); */
+ if (timercmp(&callback->time, &now, <)) {
+ /*printf(" call\n"); */
+ callback_list_unlink(callback_list, callback);
+ callback->callback(callback->data);
+ free(callback);
+ one_called = TRUE;
+ change = TRUE;
+ break;
+ }
+ } callback_list_iterate_end;
+ if (!change) {
+ break;
+ }
+ }
+
+ if (one_called) {
+ sw_paint_all();
+ }
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void handle_idle_callbacks(void)
+{
+ ensure_init();
+
+ for (;;) {
+ bool change = FALSE;
+
+ idle_callback_list_iterate(idle_callback_list, callback) {
+ idle_callback_list_unlink(idle_callback_list, callback);
+ callback->callback(callback->data);
+ free(callback);
+ change = TRUE;
+ break;
+ } idle_callback_list_iterate_end;
+ if (!change) {
+ break;
+ }
+ }
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void get_select_timeout(struct timeval *timeout)
+{
+ struct callback *earliest = NULL;
+
+ ensure_init();
+
+ callback_list_iterate(callback_list, callback) {
+ if (!earliest || timercmp(&callback->time, &earliest->time, <)) {
+ earliest = callback;
+ }
+ }
+ callback_list_iterate_end;
+ if (!earliest) {
+ timeout->tv_sec = 100000;
+ timeout->tv_usec = 0;
+ } else {
+ struct timeval now;
+
+ gettimeofday(&now, NULL);
+
+ if (!timercmp(&now, &earliest->time, <)) {
+ timeout->tv_sec = 0;
+ timeout->tv_usec = 0;
+ } else {
+ int usec;
+
+ /* Note that on some platforms the field of timeval are defined as
+ * unsigned so we must enforce a signed type for usec */
+ timeout->tv_sec = earliest->time.tv_sec - now.tv_sec;
+ usec = earliest->time.tv_usec - now.tv_usec;
+ if (usec < 0) {
+ timeout->tv_sec++;
+ timeout->tv_usec = usec + 1000 * 1000;
+ } else {
+ timeout->tv_usec = usec;
+ }
+ }
+ assert(timeout->tv_sec >= 0 && timeout->tv_usec >= 0);
+ }
+}
diff --git a/utility/ftwl/widget_window.c b/utility/ftwl/widget_window.c
new file mode 100644
index 0000000..cda1ab4
--- /dev/null
+++ b/utility/ftwl/widget_window.c
@@ -0,0 +1,990 @@
+/**********************************************************************
+ Freeciv - Copyright (C) 2004 - The Freeciv Project
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+***********************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <assert.h>
+#include <stdio.h>
+
+#include "widget_p.h"
+
+#include "fcintl.h"
+#include "log.h"
+#include "mem.h"
+
+/* REMOVE ME */
+#include "timing.h"
+
+#define DEBUG_UPDATES 0
+#define DUMP_UPDATES 0
+#define DUMP_WINDOWS 0
+#define DEBUG_PAINT_ALL FALSE
+
+struct sw_widget *root_window;
+static struct widget_list *windows_back_to_front;
+static struct widget_list *windows_front_to_back;
+struct widget_list *deferred_destroyed_widgets;
+static bool dump_screen = FALSE;
+
+#define TITLE_PADDING 3
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void draw_extra_background(struct sw_widget *widget,
+ const struct ct_rect *region)
+{
+ if (widget->data.window.canvas_background) {
+ struct ct_size size = { region->width,
+ region->height };
+ struct ct_point pos = { region->x, region->y };
+
+ be_copy_osda_to_osda(get_osda(widget),
+ widget->data.window.canvas_background,
+ &size, &pos, &pos);
+ }
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void draw(struct sw_widget *widget)
+{
+ if (widget->data.window.title) {
+ struct ct_point pos;
+ struct ct_rect rect = widget->inner_bounds;
+
+ rect.height = widget->data.window.title->size.height + 2 * TITLE_PADDING;
+
+ be_draw_region(widget->data.window.target, &rect,
+ widget->data.window.title->background);
+ be_draw_rectangle(get_osda(widget), &rect, 1,
+ widget->data.window.title->foreground);
+ pos.x = widget->inner_bounds.x + TITLE_PADDING;
+ pos.y = widget->inner_bounds.y + TITLE_PADDING;
+ be_draw_string(get_osda(widget), &pos,
+ widget->data.window.title);
+ }
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void drag_start(struct sw_widget *widget,
+ const struct ct_point *mouse,
+ enum be_mouse_button button)
+{
+ if (button == BE_MB_LEFT) {
+ widget->data.window.pos_at_drag_start.x = widget->outer_bounds.x;
+ widget->data.window.pos_at_drag_start.y = widget->outer_bounds.y;
+
+ sw_widget_set_border_color(widget,
+ be_get_color(255, 255, 0, MAX_OPACITY));
+ } else if (widget->data.window.user_drag_start) {
+ widget->data.window.user_drag_start(widget, mouse, button);
+ }
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void drag_move(struct sw_widget *widget,
+ const struct ct_point *start_position,
+ const struct ct_point *current_position,
+ enum be_mouse_button button)
+{
+ if (button == BE_MB_LEFT) {
+ int dx = current_position->x - start_position->x;
+ int dy = current_position->y - start_position->y;
+ struct ct_rect new = widget->outer_bounds;
+
+ new.x = widget->data.window.pos_at_drag_start.x + dx;
+ new.y = widget->data.window.pos_at_drag_start.y + dy;
+
+ if (ct_rect_valid(&new)
+ && ct_rect_in_rect(&new, &root_window->data.window.children_bounds)) {
+ sw_widget_set_position(widget, new.x, new.y);
+ }
+ } else if (widget->data.window.user_drag_move) {
+ widget->data.window.user_drag_move(widget, start_position,
+ current_position, button);
+ }
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void drag_end(struct sw_widget *widget, enum be_mouse_button button)
+{
+ if (button == BE_MB_LEFT) {
+ sw_widget_set_border_color(widget,
+ be_get_color(255, 255, 255, MAX_OPACITY));
+ } else if (widget->data.window.user_drag_end) {
+ widget->data.window.user_drag_end(widget, button);
+ }
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void destroy(struct sw_widget *widget)
+{
+ widget_list_iterate(widget->data.window.children, pwidget) {
+ real_widget_destroy(pwidget);
+ } widget_list_iterate_end;
+
+
+ be_free_osda(widget->data.window.target);
+ if (widget->data.window.title) {
+ ct_string_destroy(widget->data.window.title);
+ }
+
+ widget_list_unlink(windows_front_to_back, widget);
+ widget_list_unlink(windows_back_to_front, widget);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static int my_sort_back_to_front(const void *p1, const void *p2)
+{
+ const struct sw_widget *w1 =
+ (const struct sw_widget *) *(const void **) p1;
+ const struct sw_widget *w2 =
+ (const struct sw_widget *) *(const void **) p2;
+
+ return w1->data.window.depth - w2->data.window.depth;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static int my_sort_front_to_back(const void *p1, const void *p2)
+{
+ const struct sw_widget *w1 =
+ (const struct sw_widget *) *(const void **) p1;
+ const struct sw_widget *w2 =
+ (const struct sw_widget *) *(const void **) p2;
+
+ return w2->data.window.depth - w1->data.window.depth;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void sort(void)
+{
+ widget_list_sort(windows_front_to_back, my_sort_front_to_back);
+ widget_list_sort(windows_back_to_front, my_sort_back_to_front);
+}
+
+static void sw_window_set_depth(struct sw_widget *widget, int depth)
+{
+ widget->data.window.depth = depth;
+ sort();
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+struct sw_widget *sw_window_create(struct sw_widget *parent, int width,
+ int height, struct ct_string *title,
+ bool has_border, int depth)
+{
+ struct sw_widget *result = create_widget(parent, WT_WINDOW);
+ int border_width = has_border ? BORDER_WIDTH : 0;
+
+ if (width == 0 && height == 0) {
+ struct ct_size size;
+
+ be_screen_get_size(&size);
+ width = size.width;
+ height = size.height;
+ }
+
+ if (depth == 0) {
+ depth = parent ? parent->data.window.depth + 1 : DEPTH_MIN;
+ }
+ assert(depth == DEPTH_HIDDEN
+ || (depth >= DEPTH_MIN && depth <= DEPTH_MAX));
+
+ result->destroy = destroy;
+ result->draw = draw;
+ result->draw_extra_background = draw_extra_background;
+ result->drag_start = drag_start;
+ result->drag_move = drag_move;
+ result->drag_end = drag_end;
+
+ result->can_be_dragged[BE_MB_LEFT] = TRUE;
+
+ result->data.window.children = widget_list_new();
+ widget_list_append(windows_front_to_back, result);
+ widget_list_append(windows_back_to_front, result);
+
+ result->data.window.to_flush = region_list_new();
+
+ result->inner_bounds.x = border_width;
+ result->inner_bounds.y = border_width;
+ result->inner_bounds.width = width;
+ result->inner_bounds.height = height;
+
+ result->outer_bounds.width = 2 * border_width + width;
+ result->outer_bounds.height = 2 * border_width + height;
+
+ result->data.window.target =
+ be_create_osda(2 * border_width + width, 2 * border_width + height);
+ result->data.window.title = title;
+ result->data.window.shown = TRUE;
+ result->data.window.list = NULL;
+
+ result->data.window.canvas_background = NULL;
+
+ result->data.window.inner_deco_height = 0;
+ if (title) {
+ result->data.window.inner_deco_height =
+ result->data.window.title->size.height + 2 * TITLE_PADDING;
+ }
+
+ if (has_border) {
+ sw_widget_set_border_color(result,
+ be_get_color(255, 255, 255, MAX_OPACITY));
+ }
+
+ sw_window_set_depth(result, depth);
+
+ return result;
+}
+
+static struct osda *whole_osda = NULL;
+
+/*************************************************************************
+ ...
+*************************************************************************/
+struct sw_widget *sw_create_root_window(void)
+{
+ struct ct_size size;
+ struct sw_widget *result;
+
+ assert(!root_window);
+ windows_front_to_back = widget_list_new();
+ windows_back_to_front = widget_list_new();
+ deferred_destroyed_widgets = widget_list_new();
+
+ be_screen_get_size(&size);
+
+ whole_osda = be_create_osda(size.width, size.height);
+
+ result =
+ sw_window_create(NULL, size.width, size.height, NULL, FALSE,
+ DEPTH_MIN + 1);
+ sw_widget_set_position(result, 0, 0);
+ sw_widget_set_background_color(result,
+ be_get_color(22, 44, 88, MAX_OPACITY));
+ sw_window_set_draggable(result, FALSE);
+
+ root_window = result;
+ return result;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void sw_window_add(struct sw_widget *window, struct sw_widget *widget)
+{
+ assert(window && widget);
+ assert(!widget->parent);
+
+ widget_list_iterate(window->data.window.children, pwidget) {
+ assert(pwidget != widget);
+ } widget_list_iterate_end;
+
+ widget_list_prepend(window->data.window.children, widget);
+ widget->parent = window;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void remove_all_from_window(struct sw_widget *widget)
+{
+ while (widget_list_size(widget->data.window.children) > 0) {
+ sw_window_remove(widget_list_get(widget->data.window.children, 0));
+ }
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void sw_window_remove(struct sw_widget *widget)
+{
+ struct sw_widget *old_parent = widget->parent;
+ int found = 0;
+
+ assert(old_parent);
+
+ widget_list_iterate(old_parent->data.window.children, pwidget) {
+ if (pwidget == widget) {
+ found++;
+ }
+ } widget_list_iterate_end;
+
+ assert(found == 1);
+ widget_list_unlink(old_parent->data.window.children, widget);
+ widget->parent = NULL;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void flush_one_window(struct sw_widget *widget,
+ const struct ct_rect *screen_rect)
+{
+ struct ct_size size;
+ struct ct_point src_pos, dest_pos;
+
+ if (!widget->data.window.shown) {
+ return;
+ }
+
+ size.width = screen_rect->width;
+ size.height = screen_rect->height;
+ dest_pos.x = screen_rect->x;
+ dest_pos.y = screen_rect->y;
+ src_pos.x = screen_rect->x - widget->outer_bounds.x;
+ src_pos.y = screen_rect->y - widget->outer_bounds.y;
+
+ be_copy_osda_to_osda(whole_osda, widget->data.window.target, &size,
+ &dest_pos, &src_pos);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void flush_all_to_screen(void)
+{
+ be_copy_osda_to_screen(whole_osda);
+
+ if (dump_screen) {
+ static int counter = -1;
+ char b[100];
+
+ counter++;
+
+ freelog(LOG_NORMAL, "flush to screen %d",counter);
+
+ sprintf(b, "screen-%04d.ppm", counter);
+ be_write_osda_to_file(whole_osda, b);
+ }
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void sw_window_resize(struct sw_widget *widget, int width, int height)
+{
+ be_free_osda(widget->data.window.target);
+ widget->data.window.target = be_create_osda(width, height);
+ widget->inner_bounds.width = width;
+ widget->inner_bounds.height = height;
+ inner_size_changed(widget);
+ parent_needs_paint(widget);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void draw_background_region(struct sw_widget *widget,
+ const struct ct_rect * rect)
+{
+ if (widget->draw_extra_background) {
+ widget->draw_extra_background(widget, rect);
+ }
+ if (widget->background_sprite) {
+ struct ct_point pos;
+ struct ct_size size;
+
+ pos.x = rect->x;
+ pos.y = rect->y;
+
+ size.width = rect->width;
+ size.height = rect->height;
+
+ be_draw_sprite(get_osda(widget), widget->background_sprite,
+ &size, &pos, &pos);
+ } else if (widget->has_background_color) {
+ be_draw_region(get_osda(widget), rect,
+ widget->background_color);
+ } else {
+ if (widget->parent && widget->type != WT_WINDOW) {
+ draw_background_region(widget->parent, rect);
+ }
+ }
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void draw_background(struct sw_widget *widget)
+{
+ draw_background_region(widget, &widget->inner_bounds);
+
+ if (widget->has_border_color) {
+ struct ct_rect rect = widget->outer_bounds;
+
+ if (widget->type == WT_WINDOW) {
+ rect.x = 0;
+ rect.y = 0;
+ }
+
+ be_draw_rectangle(get_osda(widget), &rect, BORDER_WIDTH,
+ widget->border_color);
+ }
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void add_flush_region(struct sw_widget *widget, const struct ct_rect
+ *region)
+{
+ struct sw_widget *window;
+
+ if (widget->type == WT_WINDOW) {
+ window = widget;
+ } else {
+ window = widget->parent;
+ }
+
+ region_list_iterate(window->data.window.to_flush, pregion) {
+ if (ct_rect_in_rect(region, pregion)) {
+ return;
+ }
+ } region_list_iterate_end;
+
+ region_list_prepend(window->data.window.to_flush, ct_rect_clone(region));
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void draw_tooltip(struct sw_widget *widget)
+{
+ struct ct_point pos;
+ struct ct_rect rect;
+ const int PADDING = 5;
+ struct osda *osda;
+ int i, extra = 2 * PADDING + widget->tooltip->shadow;
+
+ rect.width = widget->tooltip->text->size.width + extra;
+ rect.height = widget->tooltip->text->size.height + extra;
+
+ rect.x =
+ MAX(0,
+ widget->outer_bounds.x + (widget->outer_bounds.width -
+ rect.width) / 2);
+ rect.y = MAX(0,widget->outer_bounds.y - rect.height - PADDING);
+
+ pos.x = rect.x + PADDING;
+ pos.y = rect.y + PADDING;
+
+ if (widget->type == WT_WINDOW) {
+ osda = get_osda(widget->parent);
+ } else {
+ osda = get_osda(widget);
+ }
+
+ for (i = 1; i < widget->tooltip->shadow; i++) {
+ struct ct_rect rect2 = rect;
+
+ rect2.x += i;
+ rect2.y += i;
+ be_draw_region(osda, &rect2, widget->tooltip->shadow_color);
+ }
+
+ be_draw_region(osda, &rect, widget->tooltip->text->background);
+ be_draw_string(osda, &pos, widget->tooltip->text);
+ be_draw_rectangle(osda, &rect, 1, widget->tooltip->text->foreground);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void draw_one(struct sw_widget *widget)
+{
+ draw_background(widget);
+ assert(widget->draw);
+ widget->draw(widget);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void update_window(struct sw_widget *widget)
+{
+ assert(widget->type == WT_WINDOW);
+ if (widget->needs_repaint) {
+ draw_one(widget);
+
+ widget_list_iterate(widget->data.window.children, pwidget) {
+ if (pwidget->type != WT_WINDOW) {
+ draw_one(pwidget);
+ }
+ }
+ widget_list_iterate_end;
+
+ widget_list_iterate(widget->data.window.children, pwidget) {
+ if (pwidget->tooltip && pwidget->tooltip_shown) {
+ draw_tooltip(pwidget);
+ }
+ } widget_list_iterate_end;
+ if (widget->tooltip && widget->tooltip_shown) {
+ draw_tooltip(widget);
+ }
+
+ widget->needs_repaint = FALSE;
+
+ {
+ struct ct_rect tmp =
+ { 0, 0, widget->outer_bounds.width, widget->outer_bounds.height };
+ add_flush_region(widget, &tmp);
+ }
+ } else {
+ widget_list_iterate(widget->data.window.children, pwidget) {
+ if (pwidget->type != WT_WINDOW && pwidget->needs_repaint) {
+ draw_one(pwidget);
+ pwidget->needs_repaint = FALSE;
+ add_flush_region(widget, &pwidget->outer_bounds);
+ }
+ }
+ widget_list_iterate_end;
+ }
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+static void merge_regions(struct region_list *list)
+{
+ struct region_list *tmp, *orig, *copy;
+
+ tmp = region_list_new();
+
+ orig = list;
+ copy = tmp;
+
+ region_list_iterate(orig, region) {
+ if (ct_rect_in_rect_list(region, copy)) {
+ free(region);
+ } else {
+ region_list_prepend(copy, region);
+ }
+ } region_list_iterate_end;
+
+ orig = tmp;
+ copy = list;
+ region_list_unlink_all(copy);
+
+ region_list_iterate(orig, region) {
+ if (ct_rect_in_rect_list(region, copy)) {
+ free(region);
+ } else {
+ region_list_prepend(copy, region);
+ }
+ } region_list_iterate_end;
+
+ region_list_unlink_all(tmp);
+ region_list_free(tmp);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void sw_paint_all(void)
+{
+ int regions=0;
+ struct timer *timer1 = new_timer(TIMER_USER, TIMER_ACTIVE);
+ struct timer *timer2 = new_timer(TIMER_USER, TIMER_ACTIVE);
+ struct timer *timer3 = new_timer(TIMER_USER, TIMER_ACTIVE);
+ struct timer *timer4 = new_timer(TIMER_USER, TIMER_ACTIVE);
+ struct region_list *normalized_regions;
+ static int call = -1;
+#if DUMP_UPDATES
+ char filename[100];
+ int region_nr;
+#endif
+
+ call++;
+
+ handle_destroyed_widgets();
+
+ normalized_regions = region_list_new();
+
+ start_timer(timer1);
+ widget_list_iterate(windows_back_to_front, widget) {
+ update_window(widget);
+ regions += region_list_size(widget->data.window.to_flush);
+ } widget_list_iterate_end;
+ stop_timer(timer1);
+
+ if (regions == 0) {
+ return;
+ }
+
+ if (DEBUG_PAINT_ALL) {
+ printf("updated windows; %d regions have to be flushed\n", regions);
+ }
+
+ if (DUMP_WINDOWS) {
+ widget_list_iterate(windows_back_to_front, widget) {
+ char name[100];
+
+ if (widget->data.window.depth > -1) {
+ sprintf(name, "window-c%03d-%p.ppm", call, widget);
+ be_write_osda_to_file(widget->data.window.target, name);
+ }
+ } widget_list_iterate_end;
+ }
+
+ if (DEBUG_PAINT_ALL) {
+ start_timer(timer2);
+ }
+ widget_list_iterate(windows_back_to_front, widget) {
+#if 0
+ if (DEBUG_PAINT_ALL) {
+ region_list_iterate(widget->data.window.to_flush, region) {
+ printf(" region=%s\n", ct_rect_to_string(region));
+ } region_list_iterate_end;
+ }
+#endif
+
+ region_list_iterate(widget->data.window.to_flush, region) {
+ region->x += widget->outer_bounds.x;
+ region->y += widget->outer_bounds.y;
+ region_list_unlink(widget->data.window.to_flush, region);
+ region_list_prepend(normalized_regions, region);
+ } region_list_iterate_end;
+ } widget_list_iterate_end;
+ if (DEBUG_PAINT_ALL) {
+ stop_timer(timer2);
+ }
+
+#if 0
+ if (DEBUG_PAINT_ALL) {
+ printf(" normalized_regions\n");
+ region_list_iterate(normalized_regions, region) {
+ printf(" region=%s\n", ct_rect_to_string(region));
+ } region_list_iterate_end;
+ }
+#endif
+
+ merge_regions(normalized_regions);
+
+ if(DEBUG_PAINT_ALL) {
+ printf("starting flushing of %d regions\n",
+ region_list_size(normalized_regions));
+ }
+
+#if DUMP_UPDATES
+ sprintf(filename,"whole-c%03d-r000-before.ppm",call);
+ be_write_osda_to_file(whole_osda,filename);
+ region_nr = 1;
+#endif
+
+ if (DEBUG_PAINT_ALL) {
+ start_timer(timer3);
+ }
+ region_list_iterate(normalized_regions, region) {
+ int window_nr = 0;
+
+ if (DEBUG_UPDATES)
+ printf("region = %s\n", ct_rect_to_string(region));
+
+ widget_list_iterate(windows_back_to_front, widget) {
+ struct ct_rect rect = *region;
+
+ ct_rect_intersect(&rect, &widget->outer_bounds);
+ if (DEBUG_UPDATES)
+ printf(" window=%p %s depth=%d\n", widget,
+ ct_rect_to_string(&widget->outer_bounds),
+ widget->data.window.depth);
+ if (!ct_rect_empty(&rect)) {
+ if (DEBUG_UPDATES)
+ printf(" window intersects with dirty region = %s\n",
+ ct_rect_to_string(&rect));
+#if DUMP_UPDATES
+ sprintf(filename, "whole-c%03d-r%03d-w%03d-0-before.ppm", call,
+ region_nr, window_nr);
+ be_write_osda_to_file(whole_osda,filename);
+#endif
+ flush_one_window(widget, &rect);
+#if DUMP_UPDATES
+ sprintf(filename, "whole-c%03d-r%03d-w%03d-1-after.ppm", call,
+ region_nr, window_nr);
+ be_write_osda_to_file(whole_osda,filename);
+#endif
+ } else {
+ if (DEBUG_UPDATES) {
+ printf(" disjunkt\n");
+ }
+ }
+ window_nr++;
+ } widget_list_iterate_end;
+ region_list_unlink(normalized_regions, region);
+ free(region);
+#if DUMP_UPDATES
+ region_nr++;
+#endif
+ } region_list_iterate_end;
+ if (DEBUG_PAINT_ALL) {
+ stop_timer(timer3);
+ }
+#if DUMP_UPDATES
+ sprintf(filename,"whole-c%03d-r999-after.ppm",call);
+ be_write_osda_to_file(whole_osda,filename);
+#endif
+
+ if (DEBUG_PAINT_ALL) {
+ start_timer(timer4);
+ }
+ flush_all_to_screen();
+ if (DEBUG_PAINT_ALL) {
+ stop_timer(timer4);
+ }
+
+ if (DEBUG_PAINT_ALL) {
+ printf("PAINT-ALL: update=%fs normalize=%fs flushs=%fs flush-all=%fs\n",
+ read_timer_seconds(timer1), read_timer_seconds(timer2),
+ read_timer_seconds(timer3), read_timer_seconds(timer4));
+ }
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+struct sw_widget *search_widget(const struct ct_point *pos,
+ enum event_type event_type)
+{
+ struct ct_point tmp;
+ struct sw_widget *window = NULL;
+
+ if (!ct_point_valid(pos)) {
+ return NULL;
+ }
+
+ if (0) {
+ widget_list_iterate(windows_front_to_back, pwidget) {
+ printf("%p: shown=%d accepts=%d inside=%d depth=%d size=%dx%d\n",
+ pwidget, pwidget->data.window.shown,
+ pwidget->accepts_events[event_type], ct_point_in_rect(pos,
+ &pwidget->
+ outer_bounds),
+ pwidget->data.window.depth, pwidget->outer_bounds.width,
+ pwidget->outer_bounds.height);
+ } widget_list_iterate_end;
+ }
+
+ widget_list_iterate(windows_front_to_back, pwidget) {
+ if (pwidget->data.window.shown && pwidget->accepts_events[event_type]
+ && ct_point_in_rect(pos, &pwidget->outer_bounds)) {
+ bool is_transparent;
+ tmp = *pos;
+ tmp.x -= pwidget->outer_bounds.x;
+ tmp.y -= pwidget->outer_bounds.y;
+
+ is_transparent =
+ be_is_transparent_pixel(pwidget->data.window.target, &tmp);
+ if (!is_transparent) {
+ window = pwidget;
+ break;
+ }
+ }
+ } widget_list_iterate_end;
+
+ if (!window) {
+ return NULL;
+ }
+ assert(ct_point_valid(&tmp));
+
+ widget_list_iterate(window->data.window.children, pwidget) {
+ if (pwidget->type != WT_WINDOW && pwidget->accepts_events[event_type]
+ && ct_point_in_rect(&tmp, &pwidget->outer_bounds)) {
+ assert(pwidget->type<=WT_LAST);
+ return pwidget;
+ }
+ } widget_list_iterate_end;
+
+ assert(window->type<=WT_LAST);
+ return window;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+struct sw_widget *sw_window_create_by_clone(struct sw_widget *widget,
+ int depth)
+{
+ struct sw_widget *result =
+ sw_window_create(widget, widget->outer_bounds.width,
+ widget->outer_bounds.height, NULL, FALSE, depth);
+
+ result->can_be_dragged[BE_MB_LEFT] = widget->can_be_dragged;
+ return result;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void sw_window_set_canvas_background(struct sw_widget *widget, bool yes)
+{
+ if (widget->data.window.canvas_background) {
+ be_free_osda(widget->data.window.canvas_background);
+ widget->data.window.canvas_background = NULL;
+ }
+ if (yes) {
+ widget->data.window.canvas_background =
+ be_create_osda(widget->outer_bounds.width,
+ widget->outer_bounds.height);
+ }
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+struct osda *sw_window_get_canvas_background(struct sw_widget *widget)
+{
+ return widget->data.window.canvas_background;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void sw_window_set_mouse_press_notify(struct sw_widget *widget,
+ void (*callback) (struct sw_widget *
+ widget,
+ const struct ct_point
+ * pos, enum be_mouse_button button,
+ int state,
+ void *data),
+ void *data)
+{
+ widget->click_start = callback;
+ widget->click_start_data = data;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void sw_window_canvas_background_region_needs_repaint(struct sw_widget
+ *widget, const struct ct_rect
+ *region)
+{
+#if 0
+ struct ct_size size = { region->width,
+ region->height
+ };
+ struct ct_point pos = { region->x, region->y };
+
+ be_copy_osda_to_osda(get_osda(widget),
+ widget->data.window.canvas_background,
+ &size, &pos, &pos, 0);
+#endif
+ //add_flush_region(widget, region);
+ widget_needs_paint(widget);
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void sw_set_dump_screen(bool v)
+{
+ dump_screen = v;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+bool sw_get_dump_screen(void)
+{
+ return dump_screen;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void sw_window_set_draggable(struct sw_widget *widget, bool draggable)
+{
+ widget->can_be_dragged[BE_MB_LEFT] = draggable;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void sw_window_set_key_notify(struct sw_widget *widget,
+ bool(*callback) (struct sw_widget *
+ widget,
+ const struct be_key * key,
+ void *data), void *data)
+{
+ widget->key = callback;
+ widget->key_data = data;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+bool deliver_key(const struct be_key *key)
+{
+ widget_list_iterate(windows_front_to_back, pwidget) {
+ if (!pwidget->data.window.shown || !pwidget->accepts_events[EV_KEYBOARD]) {
+ continue;
+ }
+ if (pwidget->key && pwidget->key(pwidget, key,pwidget->key_data)) {
+ return TRUE;
+ }
+
+ widget_list_iterate(pwidget->data.window.children, pwidget2) {
+ if (pwidget2->key && pwidget2->key(pwidget2, key, pwidget2->key_data)) {
+ return TRUE;
+ }
+ } widget_list_iterate_end;
+ } widget_list_iterate_end;
+
+ return FALSE;
+}
+
+/*************************************************************************
+ ...
+*************************************************************************/
+void sw_window_set_user_drag(struct sw_widget * widget,void (*drag_start)
+ (struct sw_widget * widget,
+ const struct ct_point * mouse,
+ enum be_mouse_button button),
+ void (*drag_move) (struct sw_widget * widget,
+ const struct ct_point *
+ start_position,
+ const struct ct_point *
+ current_position,
+ enum be_mouse_button button),
+ void (*drag_end) (struct sw_widget * widget,
+ enum be_mouse_button button))
+{
+ widget->data.window.user_drag_start = drag_start;
+ widget->data.window.user_drag_move = drag_move;
+ widget->data.window.user_drag_end = drag_end;
+ widget->can_be_dragged[BE_MB_RIGHT] = TRUE;
+}
diff --git a/utility/iterator.h b/utility/iterator.h
index 738d019..8c5b31b 100644
--- a/utility/iterator.h
+++ b/utility/iterator.h
@@ -77,7 +77,8 @@ do {\
char MY_mem_##NAME_a[FUNC_size()];\
struct iterator *MY_it_##NAME_a;\
TYPE_a NAME_a;\
- MY_it_##NAME_a = FUNC_init((TYPE_it *) MY_mem_##NAME_a , ## __VA_ARGS__);\
+ MY_it_##NAME_a =\
+ FUNC_init((TYPE_it *) (void *) MY_mem_##NAME_a , ## __VA_ARGS__);\
for (; iterator_valid(MY_it_##NAME_a); iterator_next(MY_it_##NAME_a)) {\
NAME_a = (TYPE_a) iterator_get(MY_it_##NAME_a);\
diff --git a/utility/shared.c b/utility/shared.c
index c4d13ce..dc4f61c 100644
--- a/utility/shared.c
+++ b/utility/shared.c
@@ -291,6 +291,19 @@ int get_tokens(const char *str, char **tokens, size_t num_tokens,
}
/***************************************************************
+ Convenience function to cleanup the result of get_tokens().
+***************************************************************/
+void free_tokens(char **tokens, size_t ntokens)
+{
+ size_t i;
+ for (i = 0; i < ntokens; i++) {
+ if (tokens[i]) {
+ free(tokens[i]);
+ }
+ }
+}
+
+/***************************************************************
Returns a statically allocated string containing a nicely-formatted
version of the given number according to the user's locale. (Only
works for numbers >= zero.) The number is given in scientific notation
@@ -1385,7 +1398,7 @@ char *get_langname(void)
***************************************************************************/
void init_nls(void)
{
- /*
+ /*
* Setup the cached locale numeric formatting information. Defaults
* are as appropriate for the US.
*/
@@ -1422,8 +1435,9 @@ void init_nls(void)
if (lc->grouping[0] == '\0') {
/* This actually indicates no grouping at all. */
- static char m = CHAR_MAX;
- grouping = &m;
+ char *m = malloc(sizeof(char));
+ *m = CHAR_MAX;
+ grouping = m;
} else {
size_t len;
for (len = 0;
@@ -1442,6 +1456,17 @@ void init_nls(void)
}
/***************************************************************************
+ Free memory allocated by Native Language Support
+***************************************************************************/
+void free_nls(void)
+{
+ free(grouping);
+ grouping = NULL;
+ free(grouping_sep);
+ grouping_sep = NULL;
+}
+
+/***************************************************************************
If we have root privileges, die with an error.
(Eg, for security reasons.)
Param argv0 should be argv[0] or similar; fallback is
diff --git a/utility/shared.h b/utility/shared.h
index b3e0f0a..3b26623 100644
--- a/utility/shared.h
+++ b/utility/shared.h
@@ -140,6 +140,7 @@ char *get_option_malloc(const char *option_name,
bool is_option(const char *option_name,char *option);
int get_tokens(const char *str, char **tokens, size_t num_tokens,
const char *delimiterset);
+void free_tokens(char **tokens, size_t ntokens);
const char *big_int_to_text(unsigned int mantissa, unsigned int exponent);
const char *int_to_text(unsigned int number);
@@ -202,6 +203,7 @@ char *datafilename_required(const char *filename);
char *get_langname(void);
void init_nls(void);
+void free_nls(void);
void dont_run_as_root(const char *argv0, const char *fallback);
/*** matching prefixes: ***/
diff --git a/version.in b/version.in
index 279d11d..99baed7 100644
--- a/version.in
+++ b/version.in
@@ -6,12 +6,12 @@ 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,9,[""])
+FREECIV_VERSION_INFO(2,1,10,[""])
FREECIV_DEVEL_VERSION(0)
FREECIV_BETA_VERSION(0)
-FREECIV_NEXT_VERSION(["2.1.10"])
+FREECIV_NEXT_VERSION(["2.1.11"])
FREECIV_RELEASE_MONTH(5)
# Freeciv network capstring: see documentation in common/capstr.c
@@ -24,4 +24,4 @@ FREECIV_RELEASE_MONTH(5)
# - 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_CAPSTRINGS(["+2.1g"],["CreatedName"])
+FREECIV_NETWORK_CAPSTRINGS(["+2.1g"],["CreatedName voteinfo KeepSavedSetting"])
diff --git a/win32/Makefile.in b/win32/Makefile.in
index 671edaa..42a88c1 100644
--- a/win32/Makefile.in
+++ b/win32/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in 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.
@@ -13,84 +14,98 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-SHELL = @SHELL@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
+subdir = win32
+DIST_COMMON = $(dist_noinst_DATA) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/auth.m4 $(top_srcdir)/m4/c99.m4 \
+ $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/compiler.m4 \
+ $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/freetype2.m4 \
+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
+ $(top_srcdir)/m4/ggz.m4 $(top_srcdir)/m4/glibc21.m4 \
+ $(top_srcdir)/m4/gtk-2.0.m4 $(top_srcdir)/m4/gtk2-client.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
+ $(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/locale.m4 $(top_srcdir)/m4/ngettext.m4 \
+ $(top_srcdir)/m4/no-client.m4 $(top_srcdir)/m4/pkg.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+ $(top_srcdir)/m4/sdl-client.m4 $(top_srcdir)/m4/sdl.m4 \
+ $(top_srcdir)/m4/sound.m4 $(top_srcdir)/m4/vsnprintf.m4 \
+ $(top_srcdir)/m4/win32-client.m4 $(top_srcdir)/m4/x.m4 \
+ $(top_srcdir)/m4/xaw-client.m4 $(top_srcdir)/m4/version.m4 \
+ $(top_srcdir)/version.in $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+DATA = $(dist_noinst_DATA) $(nodist_noinst_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AR = @AR@
AUTH_CFLAGS = @AUTH_CFLAGS@
AUTH_LIBS = @AUTH_LIBS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
AUTO_DEPS = @AUTO_DEPS@
AWK = @AWK@
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
CLIENT_CFLAGS = @CLIENT_CFLAGS@
CLIENT_CXXFLAGS = @CLIENT_CXXFLAGS@
CLIENT_LDFLAGS = @CLIENT_LDFLAGS@
CLIENT_LIBS = @CLIENT_LIBS@
CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@
CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
FT2_CFLAGS = @FT2_CFLAGS@
FT2_CONFIG = @FT2_CONFIG@
FT2_LIBS = @FT2_LIBS@
FTWL_CFLAGS = @FTWL_CFLAGS@
GENCAT = @GENCAT@
-GGZCORE_INCLUDES = @GGZCORE_INCLUDES@
-GGZCORE_LDFLAGS = @GGZCORE_LDFLAGS@
GGZDMOD_INCLUDES = @GGZDMOD_INCLUDES@
GGZDMOD_LDFLAGS = @GGZDMOD_LDFLAGS@
GGZMOD_INCLUDES = @GGZMOD_INCLUDES@
@@ -101,10 +116,14 @@ GGZ_GTK_LDFLAGS = @GGZ_GTK_LDFLAGS@
GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
+GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GZIP = @GZIP@
-HAVE_LIB = @HAVE_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLBISON = @INTLBISON@
@@ -112,27 +131,39 @@ 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@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
LIB_GGZ = @LIB_GGZ@
-LIB_GGZCORE = @LIB_GGZCORE@
LIB_GGZDMOD = @LIB_GGZDMOD@
LIB_GGZMOD = @LIB_GGZMOD@
LIB_GGZ_GTK = @LIB_GGZ_GTK@
LN_S = @LN_S@
-LTLIB = @LTLIB@
LTLIBICONV = @LTLIBICONV@
+LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAJOR_VERSION = @MAJOR_VERSION@
+MAKEINFO = @MAKEINFO@
MINOR_VERSION = @MINOR_VERSION@
+MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NETWORK_CAPSTRING_MANDATORY = @NETWORK_CAPSTRING_MANDATORY@
NETWORK_CAPSTRING_OPTIONAL = @NETWORK_CAPSTRING_OPTIONAL@
+OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PNG_CFLAGS = @PNG_CFLAGS@
+PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -140,6 +171,8 @@ SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
SERVER_LIBS = @SERVER_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
SOUND_CFLAGS = @SOUND_CFLAGS@
SOUND_LIBS = @SOUND_LIBS@
STRIP = @STRIP@
@@ -150,17 +183,38 @@ VERSION = @VERSION@
VERSION_LABEL = @VERSION_LABEL@
VERSION_WITHOUT_LABEL = @VERSION_WITHOUT_LABEL@
WINDRES = @WINDRES@
+XGETTEXT = @XGETTEXT@
+XMKMF = @XMKMF@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
am__include = @am__include@
+am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
ggz_config = @ggz_config@
ggz_gtk_includes = @ggz_gtk_includes@
ggz_gtk_libraries = @ggz_gtk_libraries@
-ggzcore_includes = @ggzcore_includes@
-ggzcore_libraries = @ggzcore_libraries@
ggzdatadir = @ggzdatadir@
ggzdconfdir = @ggzdconfdir@
ggzddatadir = @ggzddatadir@
@@ -173,77 +227,122 @@ ggzmod_includes = @ggzmod_includes@
ggzmod_libraries = @ggzmod_libraries@
ggzmoduleconfdir = @ggzmoduleconfdir@
gui_sources = @gui_sources@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
libggz_includes = @libggz_includes@
libggz_libraries = @libggz_libraries@
localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
packagesrcdir = @packagesrcdir@
-
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
dist_noinst_DATA = \
client.ico \
server.ico \
clienticon.rc \
servericon.rc
-
@MINGW32_TRUE at nodist_noinst_DATA = \
@MINGW32_TRUE@ clienticon.o \
@MINGW32_TRUE@ servericon.o
-
@MINGW32_TRUE at CLEANFILES = $(nodist_noinst_DATA)
-subdir = win32
-mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(dist_noinst_DATA) $(nodist_noinst_DATA)
-
-DIST_COMMON = $(dist_noinst_DATA) Makefile.am Makefile.in
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu win32/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu win32/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu win32/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
tags: TAGS
TAGS:
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ctags: CTAGS
+CTAGS:
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @list='$(DISTFILES)'; for file in $$list; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(DATA)
-
installdirs:
-
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -255,7 +354,7 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- INSTALL_STRIP_FLAG=-s \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
@@ -264,7 +363,8 @@ clean-generic:
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -274,44 +374,78 @@ clean: clean-am
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
-
+ -rm -f Makefile
distclean-am: clean-am distclean-generic
dvi: dvi-am
dvi-am:
+html: html-am
+
+html-am:
+
info: info-am
info-am:
install-data-am:
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
install-exec-am:
+install-html: install-html-am
+
+install-html-am:
+
install-info: install-info-am
+install-info-am:
+
install-man:
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-am
-
+ -rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic
-uninstall-am: uninstall-info-am
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic uninstall uninstall-am uninstall-info-am
+ mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am
@MINGW32_TRUE at clienticon.o: clienticon.rc
@@ -319,6 +453,7 @@ uninstall-am: uninstall-info-am
@MINGW32_TRUE at servericon.o: servericon.rc
@MINGW32_TRUE@ $(WINDRES) -I$(srcdir) -i $(srcdir)/servericon.rc -o servericon.o
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
--
Civilization turn-based strategy game
More information about the Pkg-games-commits
mailing list